diff --git a/nix/docker/heptapod/image.json b/nix/docker/heptapod/image.json index b6383d0258..4c9481b755 100644 --- a/nix/docker/heptapod/image.json +++ b/nix/docker/heptapod/image.json @@ -1,7 +1,7 @@ { "imageName": "octobus/heptapod", - "imageDigest": "sha256:9c185b424273743964bc480a6cea7e0246a37cc71d9a90eec9d6d8c460bed3ab", - "sha256": "19jfdl17nycgls5f9vpknq4q5v9hfc6k02rwgy34flgv7llnnd95", + "imageDigest": "sha256:dc11f67809d3fa77514573219bf5167977c62500f44e0fde3c059cf1ac483d80", + "sha256": "11bgizm83im4hxyiad38pk6ffws8lfb8prgmx8wycwblcadrw2s7", "finalImageName": "octobus/heptapod", - "finalImageTag": "0.36.2" + "finalImageTag": "0.36.3" } diff --git a/nix/pkgs/authentik/goserver/default.nix b/nix/pkgs/authentik/goserver/default.nix index c49454e9fa..9cfe2e414e 100644 --- a/nix/pkgs/authentik/goserver/default.nix +++ b/nix/pkgs/authentik/goserver/default.nix @@ -4,6 +4,6 @@ pkgs.buildGoModule { pname = "authentik-server"; inherit src version; - vendorSha256 = "sha256:1jn30nca1g0853rj0wrmqc4x3pfvr2kf8kklnxzvqg471ywlhln4"; + vendorHash = "sha256:1jn30nca1g0853rj0wrmqc4x3pfvr2kf8kklnxzvqg471ywlhln4"; subPackages = "cmd/server"; } diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix index 1770cc4be1..197de1f283 100644 --- a/nix/pkgs/authentik/pythonapp/default.nix +++ b/nix/pkgs/authentik/pythonapp/default.nix @@ -1,7 +1,7 @@ { depot, src, pkgs, lib, ... }: let - inherit (pkgs) poetry2nix; + inherit (depot.third_party) poetry2nix; pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } '' sed 's/extras = \["standard"\],//' $src > $out ''; diff --git a/nix/pkgs/baserow/default.nix b/nix/pkgs/baserow/default.nix index cec870a200..6e1f4457e2 100644 --- a/nix/pkgs/baserow/default.nix +++ b/nix/pkgs/baserow/default.nix @@ -1,10 +1,10 @@ -{ fetchFromGitLab +{ depot +, fetchFromGitLab , pkgs , lib , stdenv , makeWrapper , python3 -, poetry2nix , nodejs-18_x , ossOnly ? true }: @@ -34,6 +34,7 @@ let }; nodejs = nodejs-18_x; + inherit (depot.third_party) poetry2nix; poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: { buildInputs = (old.buildInputs or []) ++ buildInputs; diff --git a/nix/pkgs/crane.nix b/nix/pkgs/crane.nix index 1a40bf5bbf..3e0f8076c3 100644 --- a/nix/pkgs/crane.nix +++ b/nix/pkgs/crane.nix @@ -14,6 +14,6 @@ pkgs.buildGoModule rec { sha256 = "sha256:07q4fjkjxn2qbqvj2him7p7rw1309yhc0mnlpnvfb2m9ias0infy"; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; } diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 1db86af820..53d8fd749a 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -44,8 +44,8 @@ sha256 = "18miswrdy3j2y59alqcw44pc2iv3kmsx7qmvak81z5bkmj2hjrss"; }; - baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; }; - baserow = pkgs.callPackages ./baserow { ossOnly = false; }; + baserow-oss = pkgs.callPackages ./baserow { ossOnly = true; inherit depot; }; + baserow = pkgs.callPackages ./baserow { ossOnly = false; inherit depot; }; common-updater-scripts = pkgs.common-updater-scripts.override { nix = pkgs.nix_2_3; diff --git a/nix/pkgs/flipperzero-firmware/version.json b/nix/pkgs/flipperzero-firmware/version.json index 73491198ef..a2819a105c 100644 --- a/nix/pkgs/flipperzero-firmware/version.json +++ b/nix/pkgs/flipperzero-firmware/version.json @@ -1,16 +1,16 @@ { "src": { "url": "https://github.com/RogueMaster/flipperzero-firmware-wPlugins", - "rev": "215b031ba8be0413c9c7b85f2a8b5a4cc1983a9a", - "date": "2023-09-14T16:08:31-04:00", - "path": "/nix/store/ykf4l73qfz1mf5y1qngwgpcg6vds99m8-flipperzero-firmware-wPlugins-215b031", - "sha256": "1xqh27p9yldjzabmbqacggj0dyb13kj78ir83iq1j8s26qd8hr8v", - "hash": "sha256-G2WIGjZCIxlwHChHdOQcYfkG5HtM4VWX+rJRn+4REPc=", + "rev": "5a8d754c12f7ae7f754a6ceb2a49a4188d7a270d", + "date": "2023-10-24T01:40:59-04:00", + "path": "/nix/store/amiaaijsw6z7zsblgkh2gfz973vw9pn6-flipperzero-firmware-wPlugins-5a8d754", + "sha256": "0v6w63a4n8bx4k94gxxik4p3ms1915715af2mpyjvbk6yshaia6b", + "hash": "sha256-y6iooPZmri39rcKpEk4JKeg6Lpmx90fSJH0hS9Qw3Gw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false }, - "version": "RM0914-1718-0.90.2-215b031", - "upstreamVersion": "0.90.2" + "version": "RM1024-0141-0.93.1-5a8d754", + "upstreamVersion": "0.93.1" } diff --git a/nix/pkgs/heptapod-runner/default.nix b/nix/pkgs/heptapod-runner/default.nix index 5c1fa858f5..a17256f862 100644 --- a/nix/pkgs/heptapod-runner/default.nix +++ b/nix/pkgs/heptapod-runner/default.nix @@ -24,7 +24,7 @@ in ]; src = newSrc; - vendorSha256 = null; + vendorHash = null; patches = [ ./fix-shell-path.patch ]; diff --git a/nix/pkgs/secretsync/default.nix b/nix/pkgs/secretsync/default.nix index ed41bf2eef..af24b93372 100644 --- a/nix/pkgs/secretsync/default.nix +++ b/nix/pkgs/secretsync/default.nix @@ -9,7 +9,7 @@ let version = "0.0.1"; src = ./.; - vendorSha256 = "0n8dvdgn6izb4qcjdcsqjzximkkpf5i2xb4ap5aa2n8c36w2dn5h"; + vendorHash = "sha256:0n8dvdgn6izb4qcjdcsqjzximkkpf5i2xb4ap5aa2n8c36w2dn5h"; subPackages = [ "." ]; diff --git a/nix/pkgs/vault-acme/default.nix b/nix/pkgs/vault-acme/default.nix index ec7bc82da4..181b52b4fe 100644 --- a/nix/pkgs/vault-acme/default.nix +++ b/nix/pkgs/vault-acme/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { patches = [ ./just-add-a-sleep.patch ]; - vendorSha256 = "sha256:1c58470n843yh9jd010xxaqzg9lrpaw9w969ygqb6h3x8k1my7jp"; + vendorHash = "sha256:1c58470n843yh9jd010xxaqzg9lrpaw9w969ygqb6h3x8k1my7jp"; subPackages = [ "cmd/acme" diff --git a/ops/nixos/cofractal-ams01/default.nix b/ops/nixos/cofractal-ams01/default.nix index 845f025bd5..a00c7c6053 100644 --- a/ops/nixos/cofractal-ams01/default.nix +++ b/ops/nixos/cofractal-ams01/default.nix @@ -151,7 +151,10 @@ in mode = "802.3ad"; }; }; - defaultGateway6.address = "2a09:a446:1337:ffff::1"; + defaultGateway6 = { + address = "2a09:a446:1337:ffff::1"; + interface = "bond0"; + }; interfaces.bond0 = { ipv6.addresses = [ { address = "2a09:a446:1337::10"; prefixLength = 64; } diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix index da2f65c1af..18a4a3a30f 100644 --- a/ops/nixos/etheroute-lon01/default.nix +++ b/ops/nixos/etheroute-lon01/default.nix @@ -84,8 +84,14 @@ "8.8.8.8" "8.8.4.4" ]; - defaultGateway.address = "103.141.25.49"; - defaultGateway6.address = "2a07:242:800:64::1"; + defaultGateway = { + address = "103.141.25.49"; + interface = "eno1"; + }; + defaultGateway6 = { + address = "2a07:242:800:64::1"; + interface = "eno1"; + }; interfaces.eno1 = { ipv4.addresses = [{ address = "103.141.25.50"; prefixLength = 30; }]; ipv6.addresses = [{ address = "2a07:242:800:64::68"; prefixLength = 64; }]; diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix index 905fe2409f..f4b723dc8d 100644 --- a/ops/nixos/lib/common.nix +++ b/ops/nixos/lib/common.nix @@ -158,7 +158,7 @@ in security.pam.ussh = { enable = true; control = "sufficient"; - caFile = ../../secrets/client-ca.pub; + caFile = toString ../../secrets/client-ca.pub; }; users.mutableUsers = false; diff --git a/ops/nixos/lib/home-manager/graphical-client.nix b/ops/nixos/lib/home-manager/graphical-client.nix index 8ab9838c17..98903e02f8 100644 --- a/ops/nixos/lib/home-manager/graphical-client.nix +++ b/ops/nixos/lib/home-manager/graphical-client.nix @@ -15,7 +15,7 @@ }; home.packages = lib.mkAfter (with pkgs; [ - google-chrome-beta + google-chrome firefox mpv dino diff --git a/ops/nixos/lib/zfs.nix b/ops/nixos/lib/zfs.nix index 64e2e05c85..631676dbf0 100644 --- a/ops/nixos/lib/zfs.nix +++ b/ops/nixos/lib/zfs.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -{ lib, config, ... }: +{ lib, pkgs, config, ... }: let inherit (lib) mkOption types mkAfter mkIf mkDefault; robCfg = config.services.zfs.rollbackOnBoot; @@ -33,10 +33,14 @@ in }; systemd.tmpfiles.rules = mkAfter (builtins.map (x: "L ${x} - - - - /persist{x}") robCfg.keepPaths); - boot.initrd.postDeviceCommands = mkIf robCfg.enable - (mkAfter '' + boot.initrd.systemd.services.zfs-rollback = { + wantedBy = [ "initrd.target" ]; + path = [ pkgs.zfs ]; + script = '' zfs rollback -r ${robCfg.snapshot} - ''); + ''; + after = [ "zfs-import.target" ]; + }; my.vault.bindMountStateTo = mkIf robCfg.enable (mkDefault "/persist/var/lib/vault-agent"); }; diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix index 5a9c316032..feeae4dfd5 100644 --- a/ops/nixos/porcorosso/default.nix +++ b/ops/nixos/porcorosso/default.nix @@ -188,7 +188,7 @@ in { sddm = { enable = true; settings = { - General.DisplayServer = "wayland"; + #General.DisplayServer = "wayland"; Users.HideUsers = "deployer"; }; }; diff --git a/third_party/default.nix b/third_party/default.nix index e2fce7cb7f..ffdcea6763 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -26,6 +26,10 @@ let }).overridePythonAttrs (oldAttrs: { doCheck = false; checkPhase = ""; + patches = oldAttrs.patches ++ [ + ./ntfy-0001-Swap-from-inspect.getargspec-to-inspect.signature-fo.patch + ./ntfy-0003-Swap-description-file-for-description_file-to-make-s.patch + ]; }); delve = pkgs.delve.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { @@ -66,6 +70,12 @@ let rev = "e0fe990b478a66178a58c69cf53daec0478ca6f9"; sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c"; }; + poetry2nixSrc = nixpkgs.fetchFromGitHub { + owner = "nix-community"; + repo = "poetry2nix"; + rev = "ec4364021900f8e0d425d901b6e6ff03cf201efb"; + sha256 = "02q3jwj3m78bxh9fdg33khx8w3bcxgsci5qa8ps76vkyhihy20py"; + }; tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; }; in @@ -106,4 +116,6 @@ rec { naersk = nixpkgs.callPackage naerskSrc {}; crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; }; + + poetry2nix = import "${poetry2nixSrc}" { pkgs = ch.depot.pkgs; }; } diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index ea2da0a5fe..47069c9a79 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -11,9 +11,6 @@ # This also holds true for GitHub teams. Since almost none of our teams have write # permissions, you need to list all members of the team with commit access individually. -# This file -/.github/CODEOWNERS @edolstra - # GitHub actions /.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/merge-staging @FRidh @@ -22,12 +19,12 @@ /.editorconfig @Mic92 @zowoq # Libraries -/lib @edolstra @infinisil +/lib @infinisil /lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs -/lib/generators.nix @edolstra @Profpatsch -/lib/cli.nix @edolstra @Profpatsch -/lib/debug.nix @edolstra @Profpatsch -/lib/asserts.nix @edolstra @Profpatsch +/lib/generators.nix @infinisil @Profpatsch +/lib/cli.nix @infinisil @Profpatsch +/lib/debug.nix @infinisil @Profpatsch +/lib/asserts.nix @infinisil @Profpatsch /lib/path.* @infinisil @fricklerhandwerk /lib/fileset @infinisil /doc/functions/fileset.section.md @infinisil @@ -48,18 +45,20 @@ /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil +## Format generators/serializers +/pkgs/pkgs-lib/formats/libconfig @ckiee # pkgs/by-name /pkgs/test/nixpkgs-check-by-name @infinisil /pkgs/by-name/README.md @infinisil /pkgs/top-level/by-name-overlay.nix @infinisil -/.github/workflows/check-by-name.nix @infinisil +/.github/workflows/check-by-name.yml @infinisil # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch # Nixpkgs make-disk-image -/doc/builders/images/makediskimage.section.md @raitobezarius +/doc/build-helpers/images/makediskimage.section.md @raitobezarius /nixos/lib/make-disk-image.nix @raitobezarius # Nixpkgs documentation @@ -116,7 +115,6 @@ /maintainers/scripts/update-python-libraries @FRidh /pkgs/development/interpreters/python @FRidh /doc/languages-frameworks/python.section.md @FRidh @mweinelt -/pkgs/development/tools/poetry2nix @adisbladis /pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell @@ -149,6 +147,8 @@ # C compilers /pkgs/development/compilers/gcc @amjoseph-nixpkgs /pkgs/development/compilers/llvm @RaitoBezarius +/pkgs/development/compilers/emscripten @raitobezarius +/doc/languages-frameworks/emscripten.section.md @raitobezarius # Audio /nixos/modules/services/audio/botamusique.nix @mweinelt @@ -216,7 +216,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/knot.nix @mweinelt # Web servers -/doc/builders/packages/nginx.section.md @raitobezarius +/doc/packages/nginx.section.md @raitobezarius /pkgs/servers/http/nginx/ @raitobezarius /nixos/modules/services/web-servers/nginx/ @raitobezarius @@ -269,7 +269,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Docker tools /pkgs/build-support/docker @roberth /nixos/tests/docker-tools* @roberth -/doc/builders/images/dockertools.section.md @roberth +/doc/build-helpers/images/dockertools.section.md @roberth # Blockchains /pkgs/applications/blockchains @mmahut @RaghavSood diff --git a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/unreproducible_package.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/unreproducible_package.md index a868c26ca5..8046e809a2 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/unreproducible_package.md +++ b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/unreproducible_package.md @@ -7,25 +7,81 @@ assignees: '' --- -Building this package twice does not produce the bit-by-bit identical result each time, making it harder to detect CI breaches. You can read more about this at https://reproducible-builds.org/ . + + +Building this package multiple times does not yield bit-by-bit identical +results, complicating the detection of Continuous Integration (CI) breaches. For +more information on this issue, visit +[reproducible-builds.org](https://reproducible-builds.org/). + +Fixing bit-by-bit reproducibility also has additional advantages, such as +avoiding hard-to-reproduce bugs, making content-addressed storage more effective +and reducing rebuilds in such systems. ### Steps To Reproduce -``` -nix-build '' -A ... --check --keep-failed -``` +In the following steps, replace `` with the canonical name of the +package. -You can use `diffoscope` to analyze the differences in the output of the two builds. +#### 1. Build the package -To view the build log of the build that produced the artifact in the binary cache: +This step will build the package. Specific arguments are passed to the command +to keep the build artifacts so we can compare them in case of differences. + +Execute the following command: ``` -nix-store --read-log $(nix-instantiate '' -A ...) +nix-build '' -A && nix-build '' -A --check --keep-failed +``` + +Or using the new command line style: + +``` +nix build nixpkgs# && nix build nixpkgs# --rebuild --keep-failed +``` + +#### 2. Compare the build artifacts + +If the previous command completes successfully, no differences were found and +there's nothing to do, builds are reproducible. +If it terminates with the error message `error: derivation '' may not be +deterministic: output '' differs from ''`, use `diffoscope` to investigate +the discrepancies between the two build outputs. You may need to add the +`--exclude-directory-metadata recursive` option to ignore files and directories +metadata (*e.g. timestamp*) differences. + +``` +nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive +``` + +#### 3. Examine the build log + +To examine the build log, use: + +``` +nix-store --read-log $(nix-instantiate '' -A ) +``` + +Or with the new command line style: + +``` +nix log $(nix path-info --derivation nixpkgs#) ``` ### Additional context -(please share the relevant fragment of the diffoscope output here, -and any additional analysis you may have done) +(please share the relevant fragment of the diffoscope output here, and any +additional analysis you may have done) diff --git a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 4517080bb3..a7d8a17865 100644 --- a/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,9 @@ For new packages please briefly describe the package or provide a link to its ho - [ ] aarch64-linux - [ ] x86_64-darwin - [ ] aarch64-darwin -- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html)) +- For non-Linux: Is sandboxing enabled in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html)) + - [ ] `sandbox = relaxed` + - [ ] `sandbox = true` - [ ] Tested, as applicable: - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index c05c496cb1..5822603122 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -37,6 +37,11 @@ "6.topic: fetch": - pkgs/build-support/fetch*/**/* +"6.topic: flakes": + - '**/flake.nix' + - lib/systems/flake-systems.nix + - nixos/modules/config/nix-flakes.nix + "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - nixos/modules/services/desktops/gnome/**/* diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index d174203238..9343e29d59 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.3.1 + uses: korthout/backport-action@v2.1.1 with: # Config README: https://github.com/korthout/backport-action#backport-action copy_labels_pattern: 'severity:\ssecurity' diff --git a/third_party/nixpkgs/.github/workflows/check-by-name.yml b/third_party/nixpkgs/.github/workflows/check-by-name.yml index 90ab843839..c6cd142bfa 100644 --- a/third_party/nixpkgs/.github/workflows/check-by-name.yml +++ b/third_party/nixpkgs/.github/workflows/check-by-name.yml @@ -18,12 +18,34 @@ jobs: runs-on: ubuntu-latest steps: - name: Resolving the merge commit + env: + GH_TOKEN: ${{ github.token }} run: | - if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then - mergedSha=$(cut -f1 <<< "$result") - echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha" + # This checks for mergeability of a pull request as recommended in + # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests + while true; do + echo "Checking whether the pull request can be merged" + prInfo=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) + mergeable=$(jq -r .mergeable <<< "$prInfo") + mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") + + if [[ "$mergeable" == "null" ]]; then + # null indicates that GitHub is still computing whether it's mergeable + # Wait a couple seconds before trying again + echo "GitHub is still computing whether this PR can be merged, waiting 5 seconds before trying again" + sleep 5 + else + break + fi + done + + if [[ "$mergeable" == "true" ]]; then + echo "The PR can be merged, checking the merge commit $mergedSha" else - echo "The PR may have a merge conflict" + echo "The PR cannot be merged, it has a merge conflict" exit 1 fi echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index e30a4bb0f9..0270094961 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -322,6 +322,8 @@ All the review template samples provided in this section are generic and meant a To get more information about how to review specific parts of Nixpkgs, refer to the documents linked to in the [overview section][overview]. +If a pull request contains documentation changes that might require feedback from the documentation team, ping @NixOS/documentation-team on the pull request. + If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints. Container system, boot system and library changes are some examples of the pull requests fitting this category. @@ -352,8 +354,8 @@ In a case a contributor definitively leaves the Nix community, they should creat # Flow of merged pull requests -After a pull requests is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/). -Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](http://channels.nixos.org/) when specific Hydra jobs succeeded. +After a pull request is merged, it eventually makes it to the [official Hydra CI](https://hydra.nixos.org/). +Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](https://channels.nixos.org/) when specific Hydra jobs succeeded. See [Nix Channel Status](https://status.nixos.org/) for the current channels and their state. Here's a brief overview of the main Git branches and what channels they're used for: @@ -465,7 +467,7 @@ Is the change [acceptable for releases][release-acceptable] and do you wish to h - No: Use the `master` branch, do not backport the pull request. - Yes: Can the change be implemented the same way on the `master` and release branches? For example, a packages major version might differ between the `master` and release branches, such that separate security patches are required. - - Yes: Use the `master` branch and [backport the pull request](#backporting-changes). + - Yes: Use the `master` branch and [backport the pull request](#how-to-backport-pull-requests). - No: Create separate pull requests to the `master` and `release-XX.YY` branches. Furthermore, if the change causes a [mass rebuild][mass-rebuild], use the appropriate staging branch instead: @@ -512,33 +514,18 @@ To get a sense for what changes are considered mass rebuilds, see [previously me - If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`. -- Format the commit messages in the following way: +- For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). - ``` - (pkg-name | nixos/): (from -> to | init at version | refactor | etc) - - (Motivation for change. Link to release notes. Additional information.) - ``` - - For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). - - Examples: - - * nginx: init at 2.0.1 - * firefox: 54.0.1 -> 55.0 - - https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ - * nixos/hydra: add bazBaz option - - Dual baz behavior is needed to do foo. - * nixos/nginx: refactor config generation - - The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). - - When adding yourself as maintainer, in the same pull request, make a separate +- When adding yourself as maintainer in the same pull request, make a separate commit with the message `maintainers: add `. Add the commit before those making changes to the package or module. - See [Nixpkgs Maintainers](../maintainers/README.md) for details. + See [Nixpkgs Maintainers](./maintainers/README.md) for details. + +- Make sure you read about any commit conventions specific to the area you're touching. See: + - [Commit conventions](./pkgs/README.md#commit-conventions) for changes to `pkgs`. + - [Commit conventions](./lib/README.md#commit-conventions) for changes to `lib`. + - [Commit conventions](./nixos/README.md#commit-conventions) for changes to `nixos`. + - [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual. ### Writing good commit messages @@ -565,7 +552,7 @@ Names of files and directories should be in lowercase, with dashes between words - Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble. -- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [](#sec-package-naming). +- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [package naming](./pkgs/README.md#package-naming). - Function calls with attribute set arguments are written as diff --git a/third_party/nixpkgs/doc/README.md b/third_party/nixpkgs/doc/README.md index 03df6ad611..9dee2d30d7 100644 --- a/third_party/nixpkgs/doc/README.md +++ b/third_party/nixpkgs/doc/README.md @@ -3,6 +3,7 @@ This directory houses the sources files for the Nixpkgs manual. You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/). +The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`. [Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available. @@ -113,3 +114,24 @@ pear watermelon : green fruit with red flesh ``` + +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- If creating a commit purely for documentation changes, format the commit message in the following way: + + ``` + doc: (documentation summary) + + (Motivation for change, relevant links, additional information.) + ``` + + Examples: + + * doc: update the kernel config documentation to use `nix-shell` + * doc: add information about `nix-update-script` + + Closes #216321. + +- If the commit contains more than just documentation changes, follow the commit message format relevant for the rest of the changes. diff --git a/third_party/nixpkgs/doc/build-helpers.md b/third_party/nixpkgs/doc/build-helpers.md new file mode 100644 index 0000000000..06737e1667 --- /dev/null +++ b/third_party/nixpkgs/doc/build-helpers.md @@ -0,0 +1,28 @@ +# Build helpers {#part-builders} + +A build helper is a function that produces derivations. + +:::{.warning} +This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable. +::: + +Such a function is usually designed to abstract over a typical workflow for a given programming language or framework. +This allows declaring a build recipe by setting a limited number of options relevant to the particular use case instead of using the `derivation` function directly. + +[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper, and serves as a basis for many others. +In addition, it offers various options to customize parts of the builds. + +There is no uniform interface for build helpers. +[Trivial build helpers](#chap-trivial-builders) and [fetchers](#chap-pkgs-fetchers) have various input types for convenience. +[Language- or framework-specific build helpers](#chap-language-support) usually follow the style of `stdenv.mkDerivation`, which accepts an attribute set or a fixed-point function taking an attribute set. + +```{=include=} chapters +build-helpers/fetchers.chapter.md +build-helpers/trivial-build-helpers.chapter.md +build-helpers/testers.chapter.md +build-helpers/special.md +build-helpers/images.md +hooks/index.md +languages-frameworks/index.md +packages/index.md +``` diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/build-helpers/fetchers.chapter.md similarity index 74% rename from third_party/nixpkgs/doc/builders/fetchers.chapter.md rename to third_party/nixpkgs/doc/build-helpers/fetchers.chapter.md index 75a261db8d..7bd1bbd6de 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/build-helpers/fetchers.chapter.md @@ -1,13 +1,28 @@ # Fetchers {#chap-pkgs-fetchers} Building software with Nix often requires downloading source code and other files from the internet. -`nixpkgs` provides *fetchers* for different protocols and services. Fetchers are functions that simplify downloading files. +To this end, Nixpkgs provides *fetchers*: functions to obtain remote sources via various protocols and services. + +Nixpkgs fetchers differ from built-in fetchers such as [`builtins.fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball): +- A built-in fetcher will download and cache files at evaluation time and produce a [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path). + A Nixpkgs fetcher will create a ([fixed-output](https://nixos.org/manual/nix/stable/glossary#gloss-fixed-output-derivation)) [derivation](https://nixos.org/manual/nix/stable/language/derivations), and files are downloaded at build time. +- Built-in fetchers will invalidate their cache after [`tarball-ttl`](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-tarball-ttl) expires, and will require network activity to check if the cache entry is up to date. + Nixpkgs fetchers only re-download if the specified hash changes or the store object is not otherwise available. +- Built-in fetchers do not use [substituters](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-substituters). + Derivations produced by Nixpkgs fetchers will use any configured binary cache transparently. + +This significantly reduces the time needed to evaluate the entirety of Nixpkgs, and allows [Hydra](https://nixos.org/hydra) to retain and re-distribute sources used by Nixpkgs in the [public binary cache](https://cache.nixos.org). +For these reasons, built-in fetchers are not allowed in Nixpkgs source code. + +The following table shows an overview of the differences: + +| Fetchers | Download | Output | Cache | Re-download when | +|-|-|-|-|-| +| `builtins.fetch*` | evaluation time | store path | `/nix/store`, `~/.cache/nix` | `tarball-ttl` expires, cache miss in `~/.cache/nix`, output store object not in local store | +| `pkgs.fetch*` | build time | derivation | `/nix/store`, substituters | output store object not available | ## Caveats {#chap-pkgs-fetchers-caveats} -Fetchers create [fixed output derivations](https://nixos.org/manual/nix/stable/#fixed-output-drvs) from downloaded files. -Nix can reuse the downloaded files via the hash of the resulting derivation. - The fact that the hash belongs to the Nix derivation output and not the file itself can lead to confusion. For example, consider the following fetcher: @@ -243,3 +258,26 @@ or *** ``` +## `fetchtorrent` {#fetchtorrent} + +`fetchtorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options) + +``` +{ fetchtorrent }: + +fetchtorrent { + config = { peer-limit-global = 100; }; + url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; + sha256 = ""; +} +``` + +### Parameters {#fetchtorrent-parameters} + +- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. + +- `backend`: Which bittorrent program to use. Default: `"transmission"`. Valid values are `"rqbit"` or `"transmission"`. These are the two most suitable torrent clients for fetching in a fixed-output derivation at the time of writing, as they can be easily exited after usage. `rqbit` is written in Rust and has a smaller closure size than `transmission`, and the performance and peer discovery properties differs between these clients, requiring experimentation to decide upon which is the best. + +- `config`: When using `transmission` as the `backend`, a json configuration can + be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure. + diff --git a/third_party/nixpkgs/doc/builders/images.md b/third_party/nixpkgs/doc/build-helpers/images.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images.md rename to third_party/nixpkgs/doc/build-helpers/images.md diff --git a/third_party/nixpkgs/doc/builders/images/appimagetools.section.md b/third_party/nixpkgs/doc/build-helpers/images/appimagetools.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/appimagetools.section.md rename to third_party/nixpkgs/doc/build-helpers/images/appimagetools.section.md diff --git a/third_party/nixpkgs/doc/builders/images/binarycache.section.md b/third_party/nixpkgs/doc/build-helpers/images/binarycache.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/binarycache.section.md rename to third_party/nixpkgs/doc/build-helpers/images/binarycache.section.md diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md similarity index 99% rename from third_party/nixpkgs/doc/builders/images/dockertools.section.md rename to third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md index 3ac4f224b5..42d6e297f5 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/build-helpers/images/dockertools.section.md @@ -275,7 +275,7 @@ pullImage { `nix-prefetch-docker` command can be used to get required image parameters: ```ShellSession -$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 +$ nix run nixpkgs#nix-prefetch-docker -- --image-name mysql --image-tag 5 ``` Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on. diff --git a/third_party/nixpkgs/doc/builders/images/makediskimage.section.md b/third_party/nixpkgs/doc/build-helpers/images/makediskimage.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/makediskimage.section.md rename to third_party/nixpkgs/doc/build-helpers/images/makediskimage.section.md diff --git a/third_party/nixpkgs/doc/builders/images/ocitools.section.md b/third_party/nixpkgs/doc/build-helpers/images/ocitools.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/ocitools.section.md rename to third_party/nixpkgs/doc/build-helpers/images/ocitools.section.md diff --git a/third_party/nixpkgs/doc/builders/images/portableservice.section.md b/third_party/nixpkgs/doc/build-helpers/images/portableservice.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/portableservice.section.md rename to third_party/nixpkgs/doc/build-helpers/images/portableservice.section.md diff --git a/third_party/nixpkgs/doc/builders/images/snaptools.section.md b/third_party/nixpkgs/doc/build-helpers/images/snaptools.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/images/snaptools.section.md rename to third_party/nixpkgs/doc/build-helpers/images/snaptools.section.md diff --git a/third_party/nixpkgs/doc/builders/special.md b/third_party/nixpkgs/doc/build-helpers/special.md similarity index 56% rename from third_party/nixpkgs/doc/builders/special.md rename to third_party/nixpkgs/doc/build-helpers/special.md index 6d07fa87f3..f88648207f 100644 --- a/third_party/nixpkgs/doc/builders/special.md +++ b/third_party/nixpkgs/doc/build-helpers/special.md @@ -1,11 +1,10 @@ -# Special builders {#chap-special} +# Special build helpers {#chap-special} -This chapter describes several special builders. +This chapter describes several special build helpers. ```{=include=} sections special/fhs-environments.section.md special/makesetuphook.section.md special/mkshell.section.md -special/darwin-builder.section.md special/vm-tools.section.md ``` diff --git a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md b/third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/special/fhs-environments.section.md rename to third_party/nixpkgs/doc/build-helpers/special/fhs-environments.section.md diff --git a/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md b/third_party/nixpkgs/doc/build-helpers/special/makesetuphook.section.md similarity index 91% rename from third_party/nixpkgs/doc/builders/special/makesetuphook.section.md rename to third_party/nixpkgs/doc/build-helpers/special/makesetuphook.section.md index eb04241213..e83164b7eb 100644 --- a/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md +++ b/third_party/nixpkgs/doc/build-helpers/special/makesetuphook.section.md @@ -1,6 +1,6 @@ # pkgs.makeSetupHook {#sec-pkgs.makeSetupHook} -`pkgs.makeSetupHook` is a builder that produces hooks that go in to `nativeBuildInputs` +`pkgs.makeSetupHook` is a build helper that produces hooks that go in to `nativeBuildInputs` ## Usage {#sec-pkgs.makeSetupHook-usage} diff --git a/third_party/nixpkgs/doc/builders/special/mkshell.section.md b/third_party/nixpkgs/doc/build-helpers/special/mkshell.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/special/mkshell.section.md rename to third_party/nixpkgs/doc/build-helpers/special/mkshell.section.md diff --git a/third_party/nixpkgs/doc/builders/special/vm-tools.section.md b/third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/special/vm-tools.section.md rename to third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md diff --git a/third_party/nixpkgs/doc/builders/testers.chapter.md b/third_party/nixpkgs/doc/build-helpers/testers.chapter.md similarity index 100% rename from third_party/nixpkgs/doc/builders/testers.chapter.md rename to third_party/nixpkgs/doc/build-helpers/testers.chapter.md diff --git a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md similarity index 99% rename from third_party/nixpkgs/doc/builders/trivial-builders.chapter.md rename to third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md index 2cb1f2debc..a0cda86a66 100644 --- a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md +++ b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md @@ -1,4 +1,4 @@ -# Trivial builders {#chap-trivial-builders} +# Trivial build helpers {#chap-trivial-builders} Nixpkgs provides a couple of functions that help with building derivations. The most important one, `stdenv.mkDerivation`, has already been documented above. The following functions wrap `stdenv.mkDerivation`, making it easier to use in certain cases. diff --git a/third_party/nixpkgs/doc/builders.md b/third_party/nixpkgs/doc/builders.md deleted file mode 100644 index 2e95942240..0000000000 --- a/third_party/nixpkgs/doc/builders.md +++ /dev/null @@ -1,12 +0,0 @@ -# Builders {#part-builders} - -```{=include=} chapters -builders/fetchers.chapter.md -builders/trivial-builders.chapter.md -builders/testers.chapter.md -builders/special.md -builders/images.md -hooks/index.md -languages-frameworks/index.md -builders/packages/index.md -``` diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index 18e12c1a8a..61bbd2ba8d 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -23,6 +23,7 @@ let { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } { name = "gvariant"; description = "GVariant formatted string serialization functions"; } + { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } ]; }; diff --git a/third_party/nixpkgs/doc/functions/fileset.section.md b/third_party/nixpkgs/doc/functions/fileset.section.md index 08b9ba9eae..c42337feab 100644 --- a/third_party/nixpkgs/doc/functions/fileset.section.md +++ b/third_party/nixpkgs/doc/functions/fileset.section.md @@ -6,11 +6,8 @@ The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work w A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. -These sections apply to the entire library. See the [function reference](#sec-functions-library-fileset) for function-specific documentation. -The file set library is currently somewhat limited but is being expanded to include more functions over time. - ## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. diff --git a/third_party/nixpkgs/doc/hooks/autopatchelf.section.md b/third_party/nixpkgs/doc/hooks/autopatchelf.section.md index 008a90d461..995204b902 100644 --- a/third_party/nixpkgs/doc/hooks/autopatchelf.section.md +++ b/third_party/nixpkgs/doc/hooks/autopatchelf.section.md @@ -6,6 +6,6 @@ You can also specify a `runtimeDependencies` variable which lists dependencies t In certain situations you may want to run the main command (`autoPatchelf`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchelf` environment variable to a non-empty value. -By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to simply `[ "*" ]` to ignore all missing dependencies. +By default `autoPatchelf` will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchelfIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchelfIgnoreMissingDeps` can be set to a list like `autoPatchelfIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to `[ "*" ]` to ignore all missing dependencies. The `autoPatchelf` command also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. diff --git a/third_party/nixpkgs/doc/hooks/index.md b/third_party/nixpkgs/doc/hooks/index.md index 363d627e52..1534ef85cc 100644 --- a/third_party/nixpkgs/doc/hooks/index.md +++ b/third_party/nixpkgs/doc/hooks/index.md @@ -25,7 +25,6 @@ perl.section.md pkg-config.section.md postgresql-test-hook.section.md python.section.md -qt-4.section.md scons.section.md tetex-tex-live.section.md unzip.section.md diff --git a/third_party/nixpkgs/doc/hooks/meson.section.md b/third_party/nixpkgs/doc/hooks/meson.section.md index fd7779e646..3a7fb50320 100644 --- a/third_party/nixpkgs/doc/hooks/meson.section.md +++ b/third_party/nixpkgs/doc/hooks/meson.section.md @@ -1,25 +1,83 @@ # Meson {#meson} -Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. +[Meson](https://mesonbuild.com/) is an open source meta build system meant to be +fast and user-friendly. -## Variables controlling Meson {#variables-controlling-meson} +In Nixpkgs, meson comes with a setup hook that overrides the configure, check, +and install phases. -### `mesonFlags` {#mesonflags} +Being a meta build system, meson needs an accompanying backend. In the context +of Nixpkgs, the typical companion backend is [Ninja](#ninja), that provides a +setup hook registering ninja-based build and install phases. -Controls the flags passed to meson. +## Variables controlling Meson {#meson-variables-controlling} -### `mesonBuildType` {#mesonbuildtype} +### Meson Exclusive Variables {#meson-exclusive-variables} -Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. +#### `mesonFlags` {#meson-flags} -### `mesonAutoFeatures` {#mesonautofeatures} +Controls the flags passed to `meson setup` during configure phase. -What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. +#### `mesonWrapMode` {#meson-wrap-mode} -### `mesonWrapMode` {#mesonwrapmode} +Which value is passed as +[`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) +to. In Nixpkgs the default value is `nodownload`, so that no subproject will be +downloaded (since network access is already disabled during deployment in +Nixpkgs). -What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. +Note: Meson allows pre-population of subprojects that would otherwise be +downloaded. -### `dontUseMesonConfigure` {#dontusemesonconfigure} +#### `mesonBuildType` {#meson-build-type} -Disables using Meson’s `configurePhase`. +Which value is passed as +[`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to +`meson setup` during configure phase. In Nixpkgs the default value is `plain`. + +#### `mesonAutoFeatures` {#meson-auto-features} + +Which value is passed as +[`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) +to `meson setup` during configure phase. In Nixpkgs the default value is +`enabled`, meaning that every feature declared as "auto" by the meson scripts +will be enabled. + +#### `mesonCheckFlags` {#meson-check-flags} + +Controls the flags passed to `meson test` during check phase. + +#### `mesonInstallFlags` {#meson-install-flags} + +Controls the flags passed to `meson install` during install phase. + +#### `mesonInstallTags` {#meson-install-tags} + +A list of installation tags passed to Meson's commandline option +[`--tags`](https://mesonbuild.com/Installing.html#installation-tags) during +install phase. + +Note: `mesonInstallTags` should be a list of strings, that will be converted to +a comma-separated string that is recognized to `--tags`. +Example: `mesonInstallTags = [ "emulator" "assembler" ];` will be converted to +`--tags emulator,assembler`. + +#### `dontUseMesonConfigure` {#dont-use-meson-configure} + +When set to true, don't use the predefined `mesonConfigurePhase`. + +#### `dontUseMesonCheck` {#dont-use-meson-check} + +When set to true, don't use the predefined `mesonCheckPhase`. + +#### `dontUseMesonInstall` {#dont-use-meson-install} + +When set to true, don't use the predefined `mesonInstallPhase`. + +### Honored variables {#meson-honored-variables} + +The following variables commonly used by `stdenv.mkDerivation` are honored by +Meson setup hook. + +- `prefixKey` +- `enableParallelBuilding` diff --git a/third_party/nixpkgs/doc/hooks/ninja.section.md b/third_party/nixpkgs/doc/hooks/ninja.section.md index 4b0e33feb5..bbc9481088 100644 --- a/third_party/nixpkgs/doc/hooks/ninja.section.md +++ b/third_party/nixpkgs/doc/hooks/ninja.section.md @@ -1,3 +1,5 @@ # ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. + +Note that if the [Meson setup hook](#meson) is also active, Ninja's install and check phases will be disabled in favor of Meson's. diff --git a/third_party/nixpkgs/doc/hooks/qt-4.section.md b/third_party/nixpkgs/doc/hooks/qt-4.section.md deleted file mode 100644 index 4b704df495..0000000000 --- a/third_party/nixpkgs/doc/hooks/qt-4.section.md +++ /dev/null @@ -1,3 +0,0 @@ -# Qt 4 {#qt-4} - -Sets the `QTDIR` environment variable to Qt’s path. diff --git a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md index ff3d70ef0c..cb1f12eec2 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md @@ -146,7 +146,7 @@ agdaPackages.mkDerivation { ### Building Agda packages {#building-agda-packages} -The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. +The default build phase for `agdaPackages.mkDerivation` runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. @@ -250,7 +250,7 @@ Usually, the maintainers will answer within a week or two with a new release. Bumping the version of that reverse dependency should be a further commit on your PR. In the rare case that a new release is not to be expected within an acceptable time, -simply mark the broken package as broken by setting `meta.broken = true;`. +mark the broken package as broken by setting `meta.broken = true;`. This will exclude it from the build test. It can be added later when it is fixed, and does not hinder the advancement of the whole package set in the meantime. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 2cb4863fc5..1e83d4b93c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -44,7 +44,7 @@ There is also a `buildMix` helper, whose behavior is closer to that of `buildErl ## How to Install BEAM Packages {#how-to-install-beam-packages} -BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. +BEAM builders are not registered at the top level, because they are not relevant to the vast majority of Nix users. To use any of those builders into your environment, refer to them by their attribute path under `beamPackages`, e.g. `beamPackages.rebar3`: ::: {.example #ex-beam-ephemeral-shell} diff --git a/third_party/nixpkgs/doc/languages-frameworks/dart.section.md b/third_party/nixpkgs/doc/languages-frameworks/dart.section.md index b00327b78e..9da43714a1 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dart.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dart.section.md @@ -8,10 +8,12 @@ It fetches its Dart dependencies automatically through `fetchDartDeps`, and (thr If you are packaging a Flutter desktop application, use [`buildFlutterApplication`](#ssec-dart-flutter) instead. -`vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, simply set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). +`vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). If the upstream source is missing a `pubspec.lock` file, you'll have to vendor one and specify it using `pubspecLockFile`. If it is needed, one will be generated for you and printed when attempting to build the derivation. +The `depsListFile` must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` only when outside of Nixpkgs, as it relies on import-from-derivation. + The `dart` commands run can be overridden through `pubGetScript` and `dartCompileCommand`, you can also add flags using `dartCompileFlags` or `dartJitFlags`. Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`. @@ -31,6 +33,7 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; } ``` @@ -39,9 +42,7 @@ buildDartApplication rec { The function `buildFlutterApplication` builds Flutter applications. -The deps.json file must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` when outside of Nixpkgs, as it relies on import-from-derivation. - -A `pubspec.lock` file must be available. See the [Dart documentation](#ssec-dart-applications) for more details. +See the [Dart documentation](#ssec-dart-applications) for more details on required files and arguments. ```nix { flutter, fetchFromGitHub }: diff --git a/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md index 7322a61687..83567ab17a 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md @@ -323,7 +323,7 @@ $ nix-shell -p haskellPackages.dhall-nixpkgs nix-prefetch-git ``` :::{.note} -`nix-prefetch-git` has to be in `$PATH` for `dhall-to-nixpkgs` to work. +`nix-prefetch-git` is added to the `nix-shell -p` invocation above, because it has to be in `$PATH` for `dhall-to-nixpkgs` to work. ::: The utility takes care of automatically detecting remote imports and converting diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 9ba0fef2a2..978ec07cb9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -138,7 +138,9 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`. + # File generated with `nix-build -A package.passthru.fetch-deps`. + # To run fetch-deps when this file does not yet exist, set nugetDeps to null + nugetDeps = ./deps.nix; projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. diff --git a/third_party/nixpkgs/doc/languages-frameworks/emscripten.section.md b/third_party/nixpkgs/doc/languages-frameworks/emscripten.section.md index 5f93dd5ff3..20d358f2e9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/emscripten.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/emscripten.section.md @@ -2,168 +2,159 @@ [Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler -This section of the manual covers how to use `emscripten` in nixpkgs. +If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions, -Minimal requirements: - -* nix -* nixpkgs - -Modes of use of `emscripten`: - -* **Imperative usage** (on the command line): - - If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands: - - * `nix-env -f "" -iA emscripten` - * `nix-shell -p emscripten` - -* **Declarative usage**: - - This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. From the root of the nixpkgs repository: - * build and install all packages: - * `nix-env -iA emscriptenPackages` - - * dev-shell for zlib implementation hacking: - * `nix-shell -A emscriptenPackages.zlib` - -## Imperative usage {#imperative-usage} +```console +nix-shell -p emscripten +``` A few things to note: * `export EMCC_DEBUG=2` is nice for debugging -* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time +* The build artifact cache in `~/.emscripten` sometimes creates issues and needs to be removed from time to time -## Declarative usage {#declarative-usage} +## Examples {#declarative-usage} Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`: * `pkgs.zlib.override` * `pkgs.buildEmscriptenPackage` -Both are interesting concepts. +A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true`. +This means each Emscripten package requires that a [`checkPhase`](#ssec-check-phase) is implemented. -A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented. +* Use `export EMCC_DEBUG=2` from within a phase to get more detailed debug output what is going wrong. +* The cache at `~/.emscripten` requires to set `HOME=$TMPDIR` in individual phases. + This makes compilation slower but also more deterministic. -* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong. -* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic. +::: {.example #usage-1-pkgs.zlib.override} -### Usage 1: pkgs.zlib.override {#usage-1-pkgs.zlib.override} +# Using `pkgs.zlib.override {}` -This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside... +This example uses `zlib` from Nixpkgs, but instead of compiling **C** to **ELF** it compiles **C** to **JavaScript** since we were using `pkgs.zlib.override` and changed `stdenv` to `pkgs.emscriptenStdenv`. -See the `zlib` example: +A few adaptions and hacks were put in place to make it work. +One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. - zlib = (pkgs.zlib.override { - stdenv = pkgs.emscriptenStdenv; - }).overrideAttrs - (old: rec { - buildInputs = old.buildInputs ++ [ pkg-config ]; - # we need to reset this setting! - env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; - configurePhase = '' - # FIXME: Some tests require writing at $HOME - HOME=$TMPDIR - runHook preConfigure - #export EMCC_DEBUG=2 - emconfigure ./configure --prefix=$out --shared +```nix +(pkgs.zlib.override { + stdenv = pkgs.emscriptenStdenv; +}).overrideAttrs +(old: rec { + buildInputs = old.buildInputs ++ [ pkg-config ]; + # we need to reset this setting! + env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; + configurePhase = '' + # FIXME: Some tests require writing at $HOME + HOME=$TMPDIR + runHook preConfigure - runHook postConfigure - ''; - dontStrip = true; - outputs = [ "out" ]; - buildPhase = '' - emmake make - ''; - installPhase = '' - emmake make install - ''; - checkPhase = '' - echo "================= testing zlib using node =================" + #export EMCC_DEBUG=2 + emconfigure ./configure --prefix=$out --shared - echo "Compiling a custom test" - set -x - emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js + runHook postConfigure + ''; + dontStrip = true; + outputs = [ "out" ]; + buildPhase = '' + emmake make + ''; + installPhase = '' + emmake make install + ''; + checkPhase = '' + echo "================= testing zlib using node =================" - echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + echo "Compiling a custom test" + set -x + emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ + libz.so.${old.version} -I . -o example.js - set +x - if [ $? -ne 0 ]; then - echo "test failed for some reason" - exit 1; - else - echo "it seems to work! very good." - fi - echo "================= /testing zlib using node =================" - ''; + echo "Using node to execute the test" + ${pkgs.nodejs}/bin/node ./example.js - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace configure \ - --replace '/usr/bin/libtool' 'ar' \ - --replace 'AR="libtool"' 'AR="ar"' \ - --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; - }); + set +x + if [ $? -ne 0 ]; then + echo "test failed for some reason" + exit 1; + else + echo "it seems to work! very good." + fi + echo "================= /testing zlib using node =================" + ''; -### Usage 2: pkgs.buildEmscriptenPackage {#usage-2-pkgs.buildemscriptenpackage} + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + substituteInPlace configure \ + --replace '/usr/bin/libtool' 'ar' \ + --replace 'AR="libtool"' 'AR="ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; +}) +``` -This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. +:::{.example #usage-2-pkgs.buildemscriptenpackage} - xmlmirror = pkgs.buildEmscriptenPackage rec { - name = "xmlmirror"; +# Using `pkgs.buildEmscriptenPackage {}` - buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkg-config zlib ]; +This `xmlmirror` example features an Emscripten package that is defined completely from this context and no `pkgs.zlib.override` is used. - src = pkgs.fetchgit { - url = "https://gitlab.com/odfplugfest/xmlmirror.git"; - rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; - hash = "sha256-i+QgY+5PYVg5pwhzcDnkfXAznBg3e8sWH2jZtixuWsk="; - }; +```nix +pkgs.buildEmscriptenPackage rec { + name = "xmlmirror"; - configurePhase = '' - rm -f fastXmlLint.js* - # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 - # https://gitlab.com/odfplugfest/xmlmirror/issues/8 - sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv - # https://github.com/kripken/emscripten/issues/6344 - # https://gitlab.com/odfplugfest/xmlmirror/issues/9 - sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv - # https://gitlab.com/odfplugfest/xmlmirror/issues/11 - sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv - ''; + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; - buildPhase = '' - HOME=$TMPDIR - make -f Makefile.emEnv - ''; + src = pkgs.fetchgit { + url = "https://gitlab.com/odfplugfest/xmlmirror.git"; + rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; + hash = "sha256-i+QgY+5PYVg5pwhzcDnkfXAznBg3e8sWH2jZtixuWsk="; + }; - outputs = [ "out" "doc" ]; + configurePhase = '' + rm -f fastXmlLint.js* + # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 + # https://gitlab.com/odfplugfest/xmlmirror/issues/8 + sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv + # https://github.com/kripken/emscripten/issues/6344 + # https://gitlab.com/odfplugfest/xmlmirror/issues/9 + sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv + # https://gitlab.com/odfplugfest/xmlmirror/issues/11 + sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv + ''; - installPhase = '' - mkdir -p $out/share - mkdir -p $doc/share/${name} + buildPhase = '' + HOME=$TMPDIR + make -f Makefile.emEnv + ''; - cp Demo* $out/share - cp -R codemirror-5.12 $out/share - cp fastXmlLint.js* $out/share - cp *.xsd $out/share - cp *.js $out/share - cp *.xhtml $out/share - cp *.html $out/share - cp *.json $out/share - cp *.rng $out/share - cp README.md $doc/share/${name} - ''; - checkPhase = '' + outputs = [ "out" "doc" ]; - ''; - }; + installPhase = '' + mkdir -p $out/share + mkdir -p $doc/share/${name} -### Declarative debugging {#declarative-debugging} + cp Demo* $out/share + cp -R codemirror-5.12 $out/share + cp fastXmlLint.js* $out/share + cp *.xsd $out/share + cp *.js $out/share + cp *.xhtml $out/share + cp *.html $out/share + cp *.json $out/share + cp *.rng $out/share + cp README.md $doc/share/${name} + ''; + checkPhase = '' + + ''; +} +``` + +::: + +## Debugging {#declarative-debugging} Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project. @@ -174,9 +165,3 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from 5. `configurePhase` 6. `buildPhase` 7. ... happy hacking... - -## Summary {#summary} - -Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from. - -If in trouble, ask the maintainers. diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index 7fd38a7d21..884ebcebf7 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -18,9 +18,9 @@ In the following is an example expression using `buildGoModule`, the following a To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` - To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). + To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. -- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. +- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`. Note that if you change this attribute, you need to update `vendorHash` attribute. ```nix pet = buildGoModule rec { diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index 6b9ce32d17..b0b5f5c3bb 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -177,7 +177,7 @@ exactly one version. Those versions need to satisfy all the version constraints given in the `.cabal` file of your package and all its dependencies. The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing. -It will simply take as input packages with names off the desired dependencies +It will take as input packages with names off the desired dependencies and just check whether they fulfill the version bounds and fail if they don’t (by default, see `jailbreak` to circumvent this). @@ -780,7 +780,7 @@ there instead. The top level `pkgs.haskell-language-server` attribute is just a convenience wrapper to make it possible to install HLS for multiple GHC versions at the same time. If you know, that you only use one GHC version, e.g., in a project -specific `nix-shell` you can simply use +specific `nix-shell` you can use `pkgs.haskellPackages.haskell-language-server` or `pkgs.haskell.packages.*.haskell-language-server` from the package set you use. diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md index f35fd83cc5..152974b465 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -13,7 +13,7 @@ If you find you are lacking inspiration for packing javascript applications, the ### Github {#javascript-finding-examples-github} - Searching Nix files for `mkYarnPackage`: -- Searching just `flake.nix` files for `mkYarnPackage`: +- Searching just `flake.nix` files for `mkYarnPackage`: ### Gitlab {#javascript-finding-examples-gitlab} @@ -209,6 +209,8 @@ In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json * `npmPackFlags`: Flags to pass to `npm pack`. * `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`. * `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`. +* `nodejs`: The `nodejs` package to build against, using the corresponding `npm` shipped with that version of `node`. Defaults to `pkgs.nodejs`. +* `npmDeps`: The dependencies used to build the npm package. Especially useful to not have to recompute workspace depedencies. #### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps} diff --git a/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md b/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md index 8712c34120..09193093b0 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md @@ -66,7 +66,7 @@ buildPhase = '' To save some work of writing Nix expressions, there is a script that imports all the packages distributed by Quicklisp into `imported.nix`. This works by parsing its `releases.txt` and `systems.txt` files, which are published every couple of -months on [quicklisp.org](http://beta.quicklisp.org/dist/quicklisp.txt). +months on [quicklisp.org](https://beta.quicklisp.org/dist/quicklisp.txt). The import process is implemented in the `import` directory as Common Lisp code in the `org.lispbuilds.nix` ASDF system. To run the script, one can @@ -268,7 +268,7 @@ getting an environment variable for `ext:getenv`. This will load the ### Loading systems {#lisp-loading-systems} -There, you can simply use `asdf:load-system`. This works by setting the right +There, you can use `asdf:load-system`. This works by setting the right values for the `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` environment variables, so that systems are found in the Nix store and pre-compiled FASLs are loaded. diff --git a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md index c5049326a7..310ea88a86 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md @@ -134,11 +134,11 @@ The site proposes two types of packages, the `rockspec` and the `src.rock` Luarocks-based packages are generated in [pkgs/development/lua-modules/generated-packages.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/generated-packages.nix) from the whitelist maintainers/scripts/luarocks-packages.csv and updated by running -the script -[maintainers/scripts/update-luarocks-packages](https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/update-luarocks-packages): +the package `luarocks-packages-updater`: ```sh -./maintainers/scripts/update-luarocks-packages update + +nix-shell -p luarocks-packages-updater --run luarocks-packages-updater ``` [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). diff --git a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md index 7e287a097c..b86733a758 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md @@ -53,7 +53,7 @@ After setting `maven.buildMavenPackage`, we then do standard Java `.jar` install Maven defines default versions for its core plugins, e.g. `maven-compiler-plugin`. If your project does not override these versions, an upgrade of Maven will change the version of the used plugins, and therefore the derivation and hash. -When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will simply be built on the derivation of old plugins, and fail because the requested plugins are missing. +When `maven` is upgraded, `mvnHash` for the derivation must be updated as well: otherwise, the project will be built on the derivation of old plugins, and fail because the requested plugins are missing. This clearly prevents automatic upgrades of Maven: a manual effort must be made throughout nixpkgs by any maintainer wishing to push the upgrades. diff --git a/third_party/nixpkgs/doc/languages-frameworks/php.section.md b/third_party/nixpkgs/doc/languages-frameworks/php.section.md index 377e3947b2..154d8174f9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/php.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/php.section.md @@ -58,7 +58,7 @@ php.withExtensions ({ enabled, all }: ++ [ all.imagick ]) ``` -To build your list of extensions from the ground up, you can simply +To build your list of extensions from the ground up, you can ignore `enabled`: ```nix @@ -140,7 +140,7 @@ Example of building `composer` with additional extensions: ### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} `php-packages.nix` form a scope, allowing us to override the packages defined -within. For example, to apply a patch to a `mysqlnd` extension, you can simply +within. For example, to apply a patch to a `mysqlnd` extension, you can pass an overlay-style function to `php`’s `packageOverrides` argument: ```nix @@ -191,7 +191,7 @@ using the `bin` attribute in `composer.json`, these binaries will be automatically linked and made accessible in the derivation. In this context, "binaries" refer to PHP scripts that are intended to be executable. -To use the helper effectively, simply add the `vendorHash` attribute, which +To use the helper effectively, add the `vendorHash` attribute, which enables the wrapper to handle the heavy lifting. Internally, the helper operates in three stages: diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 40236d141d..19d4496eef 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -9,9 +9,10 @@ | python27 | python2, python | CPython 2.7 | | python38 | | CPython 3.8 | | python39 | | CPython 3.9 | -| python310 | python3 | CPython 3.10 | -| python311 | | CPython 3.11 | +| python310 | | CPython 3.10 | +| python311 | python3 | CPython 3.11 | | python312 | | CPython 3.12 | +| python313 | | CPython 3.13 | | pypy27 | pypy2, pypy | PyPy2.7 | | pypy39 | pypy3 | PyPy 3.9 | @@ -63,12 +64,14 @@ sets are * `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` +* `pkgs.python312Packages` +* `pkgs.python313Packages` * `pkgs.pypyPackages` and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python310Packages` +* `pkgs.python3Packages` pointing to `pkgs.python311Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function {#buildpythonpackage-function} @@ -141,7 +144,7 @@ buildPythonPackage rec { The `buildPythonPackage` mainly does four things: -* In the [`buildPhase`](#build-phase), it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to +* In the [`buildPhase`](#build-phase), it calls `${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. * In the [`installPhase`](#ssec-install-phase), it installs the wheel file using `pip install *.whl`. * In the [`postFixup`](#var-stdenv-postFixup) phase, the `wrapPythonPrograms` bash function is called to @@ -261,7 +264,7 @@ python3MyBlas = pkgs.python3.override { ``` This is particularly useful for numpy and scipy users who want to gain speed with other blas implementations. -Note that using simply `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in +Note that using `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in compilation issues, because scipy dependencies need to use the same blas implementation as well. #### `buildPythonApplication` function {#buildpythonapplication-function} @@ -277,16 +280,16 @@ the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. When packaging a Python application with [`buildPythonApplication`](#buildpythonapplication-function), it should be -called with `callPackage` and passed `python` or `pythonPackages` (possibly +called with `callPackage` and passed `python3` or `python3Packages` (possibly specifying an interpreter version), like this: ```nix { lib -, python3 +, python3Packages , fetchPypi }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "luigi"; version = "2.7.9"; pyproject = true; @@ -297,13 +300,13 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel + python3Packages.setuptools + python3Packages.wheel ]; - propagatedBuildInputs = with python3.pkgs; [ - tornado - python-daemon + propagatedBuildInputs = [ + python3Packages.tornado + python3Packages.python-daemon ]; meta = with lib; { @@ -319,7 +322,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; ``` Since the package is an application, a consumer doesn't need to care about -Python versions or modules, which is why they don't go in `pythonPackages`. +Python versions or modules, which is why they don't go in `python3Packages`. #### `toPythonApplication` function {#topythonapplication-function} @@ -335,7 +338,7 @@ the attribute in `python-packages.nix`, and the `toPythonApplication` shall be applied to the reference: ```nix -youtube-dl = with pythonPackages; toPythonApplication youtube-dl; +youtube-dl = with python3Packages; toPythonApplication youtube-dl; ``` #### `toPythonModule` function {#topythonmodule-function} @@ -364,8 +367,8 @@ Saving the following as `default.nix` ```nix with import {}; -python.buildEnv.override { - extraLibs = [ pythonPackages.pyramid ]; +python3.buildEnv.override { + extraLibs = [ python3Packages.pyramid ]; ignoreCollisions = true; } ``` @@ -430,7 +433,7 @@ python3.withPackages (ps: [ ps.pyramid ]) Now, `ps` is set to `python3Packages`, matching the version of the interpreter. -As [`python.withPackages`](#python.withpackages-function) simply uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also +As [`python.withPackages`](#python.withpackages-function) uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: @@ -495,9 +498,9 @@ Given a `default.nix`: ```nix with import {}; -pythonPackages.buildPythonPackage { +python3Packages.buildPythonPackage { name = "myproject"; - buildInputs = with pythonPackages; [ pyramid ]; + buildInputs = with python3Packages; [ pyramid ]; src = ./.; } @@ -509,7 +512,7 @@ the package would be built with `nix-build`. Shortcut to setup environments with C headers/libraries and Python packages: ```shell -nix-shell -p pythonPackages.pyramid zlib libjpeg git +nix-shell -p python3Packages.pyramid zlib libjpeg git ``` ::: {.note} @@ -524,7 +527,7 @@ There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.10. The attribute `python` refers to +interpreter, which is currently CPython 3.11. The attribute `python` refers to CPython 2.7 for backwards-compatibility. It is also possible to refer to specific versions, e.g. `python311` refers to CPython 3.11, and `pypy` refers to the default PyPy interpreter. @@ -542,7 +545,7 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. +is `python3.pkgs.toolz`, and the CPython 3.11 version is `python311.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. `pythonPackages` refers to `python.pkgs` and `python311Packages` to `python311.pkgs`. @@ -679,7 +682,7 @@ b = np.array([3,4]) print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -Then we simply execute it, without requiring any environment setup at all! +Then we execute it, without requiring any environment setup at all! ```sh $ ./foo.py @@ -1681,7 +1684,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: ```shell -${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out +${python.pythonOnBuildForHost.interpreter} setup.py install_data --install-dir=$out --root=$out sed -i '/ = data\_files/d' setup.py ``` @@ -1710,7 +1713,7 @@ This is an example of a `default.nix` for a `nix-shell`, which allows to consume a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. -Create this `default.nix` file, together with a `requirements.txt` and simply +Create this `default.nix` file, together with a `requirements.txt` and execute `nix-shell`. ```nix @@ -1834,7 +1837,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul }; ``` -`pythonPackages.twisted` is now globally overridden. +`python3Packages.twisted` is now globally overridden. All packages and also all NixOS services that reference `twisted` (such as `services.buildbot-worker`) now use the new definition. Note that `python-super` refers to the old package set and `python-self` @@ -1844,7 +1847,7 @@ To modify only a Python package set instead of a whole Python derivation, use this snippet: ```nix - myPythonPackages = pythonPackages.override { + myPythonPackages = python3Packages.override { overrides = self: super: { twisted = ...; }; @@ -2024,7 +2027,9 @@ The following rules are desired to be respected: disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why. * Commit names of Python libraries should reflect that they are Python - libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`. + libraries, so write for example `python311Packages.numpy: 1.11 -> 1.12`. + It is highly recommended to specify the current default version to enable + automatic build by ofborg. * Attribute names in `python-packages.nix` as well as `pname`s should match the library's name on PyPI, but be normalized according to [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index d3b896686c..920c84eee6 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -94,7 +94,7 @@ $ bundle lock $ bundix ``` -If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same. +If you already have a `Gemfile.lock`, you can run `bundix` and it will work the same. To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification. @@ -251,7 +251,7 @@ source 'https://rubygems.org' do end ``` -If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. +If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by running the `bundle lock` and `bundix` steps again. Now you can also make a `default.nix` that looks like this: diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 67e23cc74d..d18b048b91 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -817,7 +817,7 @@ $ cargo test ## Using community maintained Rust toolchains {#using-community-maintained-rust-toolchains} ::: {.note} -Note: The following projects cannot be used within nixpkgs since [IFD](#ssec-import-from-derivation) is disallowed. +The following projects cannot be used within Nixpkgs since [Import From Derivation](https://nixos.org/manual/nix/unstable/language/import-from-derivation) (IFD) is disallowed in Nixpkgs. To package things that require Rust nightly, `RUSTC_BOOTSTRAP = true;` can sometimes be used as a hack. ::: @@ -939,3 +939,68 @@ Fenix also has examples with `buildRustPackage`, [crane](https://github.com/ipetkov/crane), [naersk](https://github.com/nix-community/naersk), and cross compilation in its [Examples](https://github.com/nix-community/fenix#examples) section. + +## Using `git bisect` on the Rust compiler {#using-git-bisect-on-the-rust-compiler} + +Sometimes an upgrade of the Rust compiler (`rustc`) will break a +downstream package. In these situations, being able to `git bisect` +the `rustc` version history to find the offending commit is quite +useful. Nixpkgs makes it easy to do this. + +First, roll back your nixpkgs to a commit in which its `rustc` used +*the most recent one which doesn't have the problem.* You'll need +to do this because of `rustc`'s extremely aggressive +version-pinning. + +Next, add the following overlay, updating the Rust version to the +one in your rolled-back nixpkgs, and replacing `/git/scratch/rust` +with the path into which you have `git clone`d the `rustc` git +repository: + +```nix + (final: prev: /*lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64*/ { + rust_1_72 = + lib.updateManyAttrsByPath [{ + path = [ "packages" "stable" ]; + update = old: old.overrideScope(final: prev: { + rustc = prev.rustc.overrideAttrs (_: { + src = lib.cleanSource /git/scratch/rust; + # do *not* put passthru.isReleaseTarball=true here + }); + }); + }] + prev.rust_1_72; + }) +``` + +If the problem you're troubleshooting only manifests when +cross-compiling you can uncomment the `lib.optionalAttrs` in the +example above, and replace `isAarch64` with the target that is +having problems. This will speed up your bisect quite a bit, since +the host compiler won't need to be rebuilt. + +Now, you can start a `git bisect` in the directory where you checked +out the `rustc` source code. It is recommended to select the +endpoint commits by searching backwards from `origin/master` for the +*commits which added the release notes for the versions in +question.* If you set the endpoints to commits on the release +branches (i.e. the release tags), git-bisect will often get confused +by the complex merge-commit structures it will need to traverse. + +The command loop you'll want to use for bisecting looks like this: + +```bash +git bisect {good,bad} # depending on result of last build +git submodule update --init +CARGO_NET_OFFLINE=false cargo vendor \ + --sync ./src/tools/cargo/Cargo.toml \ + --sync ./src/tools/rust-analyzer/Cargo.toml \ + --sync ./compiler/rustc_codegen_cranelift/Cargo.toml \ + --sync ./src/bootstrap/Cargo.toml +nix-build $NIXPKGS -A package-broken-by-rust-changes +``` + +The `git submodule update --init` and `cargo vendor` commands above +require network access, so they can't be performed from within the +`rustc` derivation, unfortunately. + diff --git a/third_party/nixpkgs/doc/languages-frameworks/swift.section.md b/third_party/nixpkgs/doc/languages-frameworks/swift.section.md index 1cc452cc9b..213d444f49 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/swift.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/swift.section.md @@ -32,7 +32,7 @@ look for the following directories: (If not targeting macOS, replace `macosx` with the Xcode platform name.) - On other platforms: `lib/swift/linux/x86_64` (Where `linux` and `x86_64` are from lowercase `uname -sm`.) -- For convenience, Nixpkgs also adds simply `lib/swift` to the search path. +- For convenience, Nixpkgs also adds `lib/swift` to the search path. This can save a bit of work packaging Swift modules, because many Nix builds will produce output for just one target any way. @@ -123,7 +123,7 @@ swiftpmFlags = [ "--disable-dead-strip" ]; The default `buildPhase` already passes `-j` for parallel building. -If these two customization options are insufficient, simply provide your own +If these two customization options are insufficient, provide your own `buildPhase` that invokes `swift build`. ### Running tests {#ssec-swiftpm-running-tests} diff --git a/third_party/nixpkgs/doc/languages-frameworks/texlive.section.md b/third_party/nixpkgs/doc/languages-frameworks/texlive.section.md index a4c81daa54..2ba846dc49 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/texlive.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/texlive.section.md @@ -2,6 +2,46 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`. +## User's guide (experimental new interface) {#sec-language-texlive-user-guide-experimental} + +Release 23.11 ships with a new interface that will eventually replace `texlive.combine`. + +- For basic usage, use some of the prebuilt environments available at the top level, such as `texliveBasic`, `texliveSmall`. For the full list of prebuilt environments, inspect `texlive.schemes`. + +- Packages cannot be used directly but must be assembled in an environment. To create or add packages to an environment, use + ```nix + texliveSmall.withPackages (ps: with ps; [ collection-langkorean algorithms cm-super ]) + ``` + The function `withPackages` can be called multiple times to add more packages. + + - **Note.** Within Nixpkgs, packages should only use prebuilt environments as inputs, such as `texliveSmall` or `texliveInfraOnly`, and should not depend directly on `texlive`. Further dependencies should be added by calling `withPackages`. This is to ensure that there is a consistent and simple way to override the inputs. + +- `texlive.withPackages` uses the same logic as `buildEnv`. Only parts of a package are installed in an environment: its 'runtime' files (`tex` output), binaries (`out` output), and support files (`tlpkg` output). Moreover, man and info pages are assembled into separate `man` and `info` outputs. To add only the TeX files of a package, or its documentation (`texdoc` output), just specify the outputs: + ```nix + texlive.withPackages (ps: with ps; [ + texdoc # recommended package to navigate the documentation + perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries + cm-super + cm-super.texdoc # documentation of cm-super + ]) + ``` + +- All packages distributed by TeX Live, which contains most of CTAN, are available and can be found under `texlive.pkgs`: + ```ShellSession + $ nix repl + nix-repl> :l + nix-repl> texlive.pkgs.[TAB] + ``` + Note that the packages in `texlive.pkgs` are only provided for search purposes and must not be used directly. + +- **Experimental and subject to change without notice:** to add the documentation for all packages in the environment, use + ```nix + texliveSmall.__overrideTeXConfig { withDocs = true; } + ``` + This can be applied before or after calling `withPackages`. + + The function currently support the parameters `withDocs`, `withSources`, and `requireTeXPackages`. + ## User's guide {#sec-language-texlive-user-guide} - For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. @@ -38,6 +78,24 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under - Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example `scheme-basic`, into the combination. +- TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use + + ```nix + stdenvNoCC.mkDerivation rec { + src = texlive.pkgs.iwona; + + inherit (src) pname version; + + installPhase = '' + runHook preInstall + install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + runHook postInstall + ''; + } + ``` + + See `biber`, `iwona` for complete examples. + ## Custom packages {#sec-language-texlive-custom-packages} You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`. diff --git a/third_party/nixpkgs/doc/manual.md.in b/third_party/nixpkgs/doc/manual.md.in index 6b8d351380..52971ff526 100644 --- a/third_party/nixpkgs/doc/manual.md.in +++ b/third_party/nixpkgs/doc/manual.md.in @@ -9,7 +9,7 @@ preface.chapter.md using-nixpkgs.md lib.md stdenv.md -builders.md +build-helpers.md development.md contributing.md ``` diff --git a/third_party/nixpkgs/doc/builders/packages/cataclysm-dda.section.md b/third_party/nixpkgs/doc/packages/cataclysm-dda.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/cataclysm-dda.section.md rename to third_party/nixpkgs/doc/packages/cataclysm-dda.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.section.md b/third_party/nixpkgs/doc/packages/citrix.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/citrix.section.md rename to third_party/nixpkgs/doc/packages/citrix.section.md diff --git a/third_party/nixpkgs/doc/builders/special/darwin-builder.section.md b/third_party/nixpkgs/doc/packages/darwin-builder.section.md similarity index 76% rename from third_party/nixpkgs/doc/builders/special/darwin-builder.section.md rename to third_party/nixpkgs/doc/packages/darwin-builder.section.md index 13d01a0e3a..89c2445667 100644 --- a/third_party/nixpkgs/doc/builders/special/darwin-builder.section.md +++ b/third_party/nixpkgs/doc/packages/darwin-builder.section.md @@ -1,10 +1,10 @@ # darwin.linux-builder {#sec-darwin-builder} -`darwin.linux-builder` provides a way to bootstrap a Linux builder on a macOS machine. +`darwin.linux-builder` provides a way to bootstrap a Linux remote builder on a macOS machine. This requires macOS version 12.4 or later. -The builder runs on host port 31022 by default. +The remote builder runs on host port 31022 by default. You can change it by overriding `virtualisation.darwin-builder.hostPort`. See the [example](#sec-darwin-builder-example-flake). @@ -15,7 +15,7 @@ words, your `/etc/nix/nix.conf` should have something like: extra-trusted-users = ``` -To launch the builder, run the following flake: +To launch the remote builder, run the following flake: ```ShellSession $ nix run nixpkgs#darwin.linux-builder @@ -57,7 +57,7 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519 builders-use-substitutes = true ``` -To allow Nix to connect to a builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: +To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: ``` Host linux-builder @@ -130,11 +130,11 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon } ``` -## Reconfiguring the builder {#sec-darwin-builder-reconfiguring} +## Reconfiguring the remote builder {#sec-darwin-builder-reconfiguring} -Initially you should not change the builder configuration else you will not be -able to use the binary cache. However, after you have the builder running locally -you may use it to build a modified builder with additional storage or memory. +Initially you should not change the remote builder configuration else you will not be +able to use the binary cache. However, after you have the remote builder running locally +you may use it to build a modified remote builder with additional storage or memory. To do this, you just need to set the `virtualisation.darwin-builder.*` parameters as in the example below and rebuild. @@ -157,3 +157,17 @@ in the example below and rebuild. You may make any other changes to your VM in this attribute set. For example, you could enable Docker or X11 forwarding to your Darwin host. +## Troubleshooting the generated configuration {#sec-darwin-builder-troubleshoot} + +The `linux-builder` package exposes the attributes `nixosConfig` and `nixosOptions` that allow you to inspect the generated NixOS configuration in the `nix repl`. For example: + +``` +$ nix repl --file ~/src/nixpkgs --argstr system aarch64-darwin + +nix-repl> darwin.linux-builder.nixosConfig.nix.package +«derivation /nix/store/...-nix-2.17.0.drv» + +nix-repl> :p darwin.linux-builder.nixosOptions.virtualisation.memorySize.definitionsWithLocations +[ { file = "/home/user/src/nixpkgs/nixos/modules/profiles/macos-builder.nix"; value = 3072; } ] + +``` diff --git a/third_party/nixpkgs/doc/builders/packages/dlib.section.md b/third_party/nixpkgs/doc/packages/dlib.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/dlib.section.md rename to third_party/nixpkgs/doc/packages/dlib.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/eclipse.section.md b/third_party/nixpkgs/doc/packages/eclipse.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/eclipse.section.md rename to third_party/nixpkgs/doc/packages/eclipse.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/elm.section.md b/third_party/nixpkgs/doc/packages/elm.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/elm.section.md rename to third_party/nixpkgs/doc/packages/elm.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/emacs.section.md b/third_party/nixpkgs/doc/packages/emacs.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/emacs.section.md rename to third_party/nixpkgs/doc/packages/emacs.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/etc-files.section.md b/third_party/nixpkgs/doc/packages/etc-files.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/etc-files.section.md rename to third_party/nixpkgs/doc/packages/etc-files.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/firefox.section.md b/third_party/nixpkgs/doc/packages/firefox.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/firefox.section.md rename to third_party/nixpkgs/doc/packages/firefox.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/fish.section.md b/third_party/nixpkgs/doc/packages/fish.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/fish.section.md rename to third_party/nixpkgs/doc/packages/fish.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/fuse.section.md b/third_party/nixpkgs/doc/packages/fuse.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/fuse.section.md rename to third_party/nixpkgs/doc/packages/fuse.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/packages/ibus.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/ibus.section.md rename to third_party/nixpkgs/doc/packages/ibus.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/index.md b/third_party/nixpkgs/doc/packages/index.md similarity index 95% rename from third_party/nixpkgs/doc/builders/packages/index.md rename to third_party/nixpkgs/doc/packages/index.md index 1f44357024..1f45018ffc 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.md +++ b/third_party/nixpkgs/doc/packages/index.md @@ -4,6 +4,7 @@ This chapter contains information about how to use and maintain the Nix expressi ```{=include=} sections citrix.section.md +darwin-builder.section.md dlib.section.md eclipse.section.md elm.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/kakoune.section.md b/third_party/nixpkgs/doc/packages/kakoune.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/kakoune.section.md rename to third_party/nixpkgs/doc/packages/kakoune.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/linux.section.md b/third_party/nixpkgs/doc/packages/linux.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/linux.section.md rename to third_party/nixpkgs/doc/packages/linux.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/locales.section.md b/third_party/nixpkgs/doc/packages/locales.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/locales.section.md rename to third_party/nixpkgs/doc/packages/locales.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/nginx.section.md b/third_party/nixpkgs/doc/packages/nginx.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/nginx.section.md rename to third_party/nixpkgs/doc/packages/nginx.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/opengl.section.md b/third_party/nixpkgs/doc/packages/opengl.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/opengl.section.md rename to third_party/nixpkgs/doc/packages/opengl.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/shell-helpers.section.md b/third_party/nixpkgs/doc/packages/shell-helpers.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/shell-helpers.section.md rename to third_party/nixpkgs/doc/packages/shell-helpers.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/steam.section.md b/third_party/nixpkgs/doc/packages/steam.section.md similarity index 89% rename from third_party/nixpkgs/doc/builders/packages/steam.section.md rename to third_party/nixpkgs/doc/packages/steam.section.md index 25728aa52a..a1e88b0d97 100644 --- a/third_party/nixpkgs/doc/builders/packages/steam.section.md +++ b/third_party/nixpkgs/doc/packages/steam.section.md @@ -11,7 +11,7 @@ Nix problems and constraints: - The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam. - The steam binary cannot be patched, it's also checked. -The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. +The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](https://sandervanderburg.blogspot.com/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. ## How to play {#sec-steam-play} diff --git a/third_party/nixpkgs/doc/builders/packages/urxvt.section.md b/third_party/nixpkgs/doc/packages/urxvt.section.md similarity index 97% rename from third_party/nixpkgs/doc/builders/packages/urxvt.section.md rename to third_party/nixpkgs/doc/packages/urxvt.section.md index 507feaa6fd..7aff0997dd 100644 --- a/third_party/nixpkgs/doc/builders/packages/urxvt.section.md +++ b/third_party/nixpkgs/doc/packages/urxvt.section.md @@ -34,7 +34,7 @@ $ nix repl map (p: p.name) pkgs.rxvt-unicode.plugins ``` -Alternatively, if your shell is bash or zsh and have completion enabled, simply type `nixpkgs.rxvt-unicode.plugins.`. +Alternatively, if your shell is bash or zsh and have completion enabled, type `nixpkgs.rxvt-unicode.plugins.`. In addition to `plugins` the options `extraDeps` and `perlDeps` can be used to install extra packages. `extraDeps` can be used, for example, to provide `xsel` (a clipboard manager) to the clipboard plugin, without installing it globally: diff --git a/third_party/nixpkgs/doc/builders/packages/weechat.section.md b/third_party/nixpkgs/doc/packages/weechat.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/weechat.section.md rename to third_party/nixpkgs/doc/packages/weechat.section.md diff --git a/third_party/nixpkgs/doc/builders/packages/xorg.section.md b/third_party/nixpkgs/doc/packages/xorg.section.md similarity index 100% rename from third_party/nixpkgs/doc/builders/packages/xorg.section.md rename to third_party/nixpkgs/doc/packages/xorg.section.md diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 366c519751..26c43bd9e9 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -101,25 +101,62 @@ genericBuild ### Building a `stdenv` package in `nix-shell` {#sec-building-stdenv-package-in-nix-shell} -To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), use +To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unstable/command-ref/nix-shell.html), enter a shell, find the [phases](#sec-stdenv-phases) you wish to build, then invoke `genericBuild` manually: + +Go to an empty directory, invoke `nix-shell` with the desired package, and from inside the shell, set the output variables to a writable directory: ```bash +cd "$(mktemp -d)" nix-shell '' -A some_package -eval "${unpackPhase:-unpackPhase}" -cd $sourceRoot -eval "${patchPhase:-patchPhase}" -eval "${configurePhase:-configurePhase}" -eval "${buildPhase:-buildPhase}" +export out=$(pwd)/out +``` + +Next, invoke the desired parts of the build. +First, run the phases that generate a working copy of the sources, which will change directory to the sources for you: + +```bash +phases="${prePhases[*]:-} unpackPhase patchPhase" genericBuild +``` + +Then, run more phases up until the failure is reached. +For example, if the failure is in the build phase, the following phases would be required: + +```bash +phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase" genericBuild +``` + +Re-run a single phase as many times as necessary to examine the failure like so: + +```bash +phases="buildPhase" genericBuild ``` To modify a [phase](#sec-stdenv-phases), first print it with +```bash +echo "$buildPhase" +``` + +Or, if that is empty, for instance, if it is using a function: + ```bash type buildPhase ``` then change it in a text editor, and paste it back to the terminal. +::: {.note} +This method may have some inconsistencies in environment variables and behaviour compared to a normal build within the [Nix build sandbox](https://nixos.org/manual/nix/unstable/language/derivations#builder-execution). +The following is a non-exhaustive list of such differences: + +- `TMP`, `TMPDIR`, and similar variables likely point to non-empty directories that the build might conflict with files in. +- Output store paths are not writable, so the variables for outputs need to be overridden to writable paths. +- Other environment variables may be inconsistent with a `nix-build` either due to `nix-shell`'s initialization script or due to the use of `nix-shell` without the `--pure` option. + +If the build fails differently inside the shell than in the sandbox, consider using [`breakpointHook`](#breakpointhook) and invoking `nix-build` instead. +The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#opt--keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build. +::: + ## Tools provided by `stdenv` {#sec-tools-of-stdenv} The standard environment provides the following packages: @@ -282,7 +319,7 @@ let f(h, h + 1, i) = i + (if i <= 0 then h else h) let f(h, h + 1, i) = i + h ``` -This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information. +This is where “sum-like” comes in from above: We can just sum all of the host offsets to get the host offset of the transitive dependency. The target offset is the transitive dependency is the host offset + 1, just as it was with the dependencies composed to make this transitive one; it can be ignored as it doesn’t add any new information. Because of the bounds checks, the uncommon cases are `h = t` and `h + 2 = t`. In the former case, the motivation for `mapOffset` is that since its host and target platforms are the same, no transitive dependency of it should be able to “discover” an offset greater than its reduced target offsets. `mapOffset` effectively “squashes” all its transitive dependencies’ offsets so that none will ever be greater than the target offset of the original `h = t` package. In the other case, `h + 1` is skipped over between the host and target offsets. Instead of squashing the offsets, we need to “rip” them apart so no transitive dependencies’ offset is that one. @@ -491,7 +528,7 @@ If the returned array contains exactly one object (e.g. `[{}]`), all values are ``` ::: -### Recursive attributes in `mkDerivation` {#mkderivation-recursive-attributes} +### Fixed-point arguments of `mkDerivation` {#mkderivation-recursive-attributes} If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example: @@ -612,7 +649,7 @@ Zip files are unpacked using `unzip`. However, `unzip` is not in the standard en #### Directories in the Nix store {#directories-in-the-nix-store} -These are simply copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. +These are copied to the current directory. The hash part of the file name is stripped, e.g. `/nix/store/1wydxgby13cz...-my-sources` would be copied to `my-sources`. Additional file types can be supported by setting the `unpackCmd` variable (see below). @@ -751,7 +788,7 @@ Hook executed at the end of the configure phase. ### The build phase {#build-phase} -The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` simply calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. +The build phase is responsible for actually building the package (e.g. compiling it). The default `buildPhase` calls `make` if a file named `Makefile`, `makefile` or `GNUmakefile` exists in the current directory (or the `makefile` is explicitly set); otherwise it does nothing. #### Variables controlling the build phase {#variables-controlling-the-build-phase} @@ -1280,7 +1317,7 @@ Nix itself considers a build-time dependency as merely something that should pre In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. -The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. +The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper’s setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of `envBuildBuildHooks`, `envBuildHostHooks`, `envBuildTargetHooks`, `envHostHostHooks`, `envHostTargetHooks`, or `envTargetTargetHooks`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there’s 12 total but we ignore the propagated/non-propagated axis). diff --git a/third_party/nixpkgs/doc/using/overlays.chapter.md b/third_party/nixpkgs/doc/using/overlays.chapter.md index 6ee52215a4..1bec6586f2 100644 --- a/third_party/nixpkgs/doc/using/overlays.chapter.md +++ b/third_party/nixpkgs/doc/using/overlays.chapter.md @@ -77,7 +77,7 @@ In Nixpkgs, we have multiple implementations of the BLAS/LAPACK numerical linear The Nixpkgs attribute is `openblas` for ILP64 (integer width = 64 bits) and `openblasCompat` for LP64 (integer width = 32 bits). `openblasCompat` is the default. -- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS) +- [LAPACK reference](https://www.netlib.org/lapack/) (also provides BLAS and CBLAS) The Nixpkgs attribute is `lapack-reference`. @@ -156,7 +156,7 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas - [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich` -To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay: +To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, use the following overlay: ```nix self: super: diff --git a/third_party/nixpkgs/lib/README.md b/third_party/nixpkgs/lib/README.md index 627086843d..220940bc21 100644 --- a/third_party/nixpkgs/lib/README.md +++ b/third_party/nixpkgs/lib/README.md @@ -74,3 +74,23 @@ path/tests/prop.sh # Run the lib.fileset tests fileset/tests.sh ``` + +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + lib.(section): (init | add additional argument | refactor | etc) + + (Motivation for change. Additional information.) + ``` + + Examples: + + * lib.getExe': check arguments + * lib.fileset: Add an additional argument in the design docs + + Closes #264537 + diff --git a/third_party/nixpkgs/lib/asserts.nix b/third_party/nixpkgs/lib/asserts.nix index 98e0b490ac..8d0a621f4c 100644 --- a/third_party/nixpkgs/lib/asserts.nix +++ b/third_party/nixpkgs/lib/asserts.nix @@ -50,4 +50,33 @@ rec { lib.generators.toPretty {} xs}, but is: ${ lib.generators.toPretty {} val}"; + /* Specialized `assertMsg` for checking if every one of `vals` is one of the elements + of the list `xs`. Useful for checking lists of supported attributes. + + Example: + let sslLibraries = [ "libressl" "bearssl" ]; + in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ] + stderr> error: each element in sslLibraries must be one of [ + stderr> "openssl" + stderr> "bearssl" + stderr> ], but is: [ + stderr> "libressl" + stderr> "bearssl" + stderr> ] + + Type: + assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool + */ + assertEachOneOf = + # The name of the variable the user entered `val` into, for inclusion in the error message + name: + # The list of values of what the user provided, to be compared against the values in `xs` + vals: + # The list of valid values + xs: + assertMsg + (lib.all (val: lib.elem val xs) vals) + "each element in ${name} must be one of ${ + lib.generators.toPretty {} xs}, but is: ${ + lib.generators.toPretty {} vals}"; } diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index b8960cf73f..b0460ab139 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -542,6 +542,36 @@ rec { attrs: map (name: f name attrs.${name}) (attrNames attrs); + /* + Deconstruct an attrset to a list of name-value pairs as expected by [`builtins.listToAttrs`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-listToAttrs). + Each element of the resulting list is an attribute set with these attributes: + - `name` (string): The name of the attribute + - `value` (any): The value of the attribute + + The following is always true: + ```nix + builtins.listToAttrs (attrsToList attrs) == attrs + ``` + + :::{.warning} + The opposite is not always true. In general expect that + ```nix + attrsToList (builtins.listToAttrs list) != list + ``` + + This is because the `listToAttrs` removes duplicate names and doesn't preserve the order of the list. + ::: + + Example: + attrsToList { foo = 1; bar = "asdf"; } + => [ { name = "bar"; value = "asdf"; } { name = "foo"; value = 1; } ] + + Type: + attrsToList :: AttrSet -> [ { name :: String; value :: Any; } ] + + */ + attrsToList = mapAttrsToList nameValuePair; + /* Like `mapAttrs`, except that it recursively applies itself to the *leaf* attributes of a potentially-nested attribute set: diff --git a/third_party/nixpkgs/lib/customisation.nix b/third_party/nixpkgs/lib/customisation.nix index ec2513021f..08fc5db061 100644 --- a/third_party/nixpkgs/lib/customisation.nix +++ b/third_party/nixpkgs/lib/customisation.nix @@ -13,16 +13,7 @@ rec { scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, if you want to "patch" the derivation returned by a package function in Nixpkgs to build another version than what the - function itself provides, you can do something like this: - - mySed = overrideDerivation pkgs.gnused (oldAttrs: { - name = "sed-4.2.2-pre"; - src = fetchurl { - url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; - }; - patches = []; - }); + function itself provides. For another application, see build-support/vm, where this function is used to build arbitrary derivations inside a QEMU @@ -35,6 +26,19 @@ rec { You should in general prefer `drv.overrideAttrs` over this function; see the nixpkgs manual for more information on overriding. + + Example: + mySed = overrideDerivation pkgs.gnused (oldAttrs: { + name = "sed-4.2.2-pre"; + src = fetchurl { + url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; + hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; + }; + patches = []; + }); + + Type: + overrideDerivation :: Derivation -> ( Derivation -> AttrSet ) -> Derivation */ overrideDerivation = drv: f: let @@ -55,6 +59,10 @@ rec { injects `override` attribute which can be used to override arguments of the function. + Please refer to documentation on [`.overrideDerivation`](#sec-pkg-overrideDerivation) to learn about `overrideDerivation` and caveats + related to its use. + + Example: nix-repl> x = {a, b}: { result = a + b; } nix-repl> y = lib.makeOverridable x { a = 1; b = 2; } @@ -65,23 +73,25 @@ rec { nix-repl> y.override { a = 10; } { override = «lambda»; overrideDerivation = «lambda»; result = 12; } - Please refer to "Nixpkgs Contributors Guide" section - ".overrideDerivation" to learn about `overrideDerivation` and caveats - related to its use. + Type: + makeOverridable :: (AttrSet -> a) -> AttrSet -> a */ - makeOverridable = f: origArgs: + makeOverridable = f: + let + # Creates a functor with the same arguments as f + mirrorArgs = lib.mirrorFunctionArgs f; + in + mirrorArgs (origArgs: let result = f origArgs; - # Creates a functor with the same arguments as f - copyArgs = g: lib.setFunctionArgs g (lib.functionArgs f); # Changes the original arguments with (potentially a function that returns) a set of new attributes overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs); # Re-call the function but with different arguments - overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs)); + overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs)); # Change the result of the function call by applying g to it - overrideResult = g: makeOverridable (copyArgs (args: g (f args))) origArgs; + overrideResult = g: makeOverridable (mirrorArgs (args: g (f args))) origArgs; in if builtins.isAttrs result then result // { @@ -95,7 +105,7 @@ rec { lib.setFunctionArgs result (lib.functionArgs result) // { override = overrideArgs; } - else result; + else result); /* Call the package function in the file `fn` with the required @@ -104,20 +114,29 @@ rec { `autoArgs`. This function is intended to be partially parameterised, e.g., + ```nix callPackage = callPackageWith pkgs; pkgs = { libfoo = callPackage ./foo.nix { }; libbar = callPackage ./bar.nix { }; }; + ``` If the `libbar` function expects an argument named `libfoo`, it is automatically passed as an argument. Overrides or missing arguments can be supplied in `args`, e.g. + ```nix libbar = callPackage ./bar.nix { libfoo = null; enableX11 = true; }; + ``` + + + + Type: + callPackageWith :: AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a */ callPackageWith = autoArgs: fn: args: let @@ -128,7 +147,7 @@ rec { # This includes automatic ones and ones passed explicitly allArgs = builtins.intersectAttrs fargs autoArgs // args; - # A list of argument names that the function requires, but + # a list of argument names that the function requires, but # wouldn't be passed to it missingArgs = lib.attrNames # Filter out arguments that have a default value @@ -175,7 +194,11 @@ rec { /* Like callPackage, but for a function that returns an attribute set of derivations. The override function is added to the - individual attributes. */ + individual attributes. + + Type: + callPackagesWith :: AttrSet -> ((AttrSet -> AttrSet) | Path) -> AttrSet -> AttrSet + */ callPackagesWith = autoArgs: fn: args: let f = if lib.isFunction fn then fn else import fn; @@ -192,7 +215,11 @@ rec { /* Add attributes to each output of a derivation without changing - the derivation itself and check a given condition when evaluating. */ + the derivation itself and check a given condition when evaluating. + + Type: + extendDerivation :: Bool -> Any -> Derivation -> Derivation + */ extendDerivation = condition: passthru: drv: let outputs = drv.outputs or [ "out" ]; @@ -226,7 +253,11 @@ rec { /* Strip a derivation of all non-essential attributes, returning only those needed by hydra-eval-jobs. Also strictly evaluate the result to ensure that there are no thunks kept alive to prevent - garbage collection. */ + garbage collection. + + Type: + hydraJob :: (Derivation | Null) -> (Derivation | Null) + */ hydraJob = drv: let outputs = drv.outputs or ["out"]; @@ -264,7 +295,11 @@ rec { called with the overridden packages. The package sets may be hierarchical: the packages in the set are called with the scope provided by `newScope` and the set provides a `newScope` attribute - which can form the parent scope for later package sets. */ + which can form the parent scope for later package sets. + + Type: + makeScope :: (AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a) -> (AttrSet -> AttrSet) -> AttrSet + */ makeScope = newScope: f: let self = f self // { newScope = scope: newScope (self // scope); @@ -286,13 +321,48 @@ rec { { inherit otherSplices keep extra f; }; /* Like makeScope, but aims to support cross compilation. It's still ugly, but - hopefully it helps a little bit. */ + hopefully it helps a little bit. + + Type: + makeScopeWithSplicing' :: + { splicePackages :: Splice -> AttrSet + , newScope :: AttrSet -> ((AttrSet -> a) | Path) -> AttrSet -> a + } + -> { otherSplices :: Splice, keep :: AttrSet -> AttrSet, extra :: AttrSet -> AttrSet } + -> AttrSet + + Splice :: + { pkgsBuildBuild :: AttrSet + , pkgsBuildHost :: AttrSet + , pkgsBuildTarget :: AttrSet + , pkgsHostHost :: AttrSet + , pkgsHostTarget :: AttrSet + , pkgsTargetTarget :: AttrSet + } + */ makeScopeWithSplicing' = { splicePackages , newScope }: { otherSplices + # Attrs from `self` which won't be spliced. + # Avoid using keep, it's only used for a python hook workaround, added in PR #104201. + # ex: `keep = (self: { inherit (self) aAttr; })` , keep ? (_self: {}) + # Additional attrs to add to the sets `callPackage`. + # When the package is from a subset (but not a subset within a package IS #211340) + # within `spliced0` it will be spliced. + # When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`. + # If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced + # ex: + # ``` + # nix-repl> darwin.apple_sdk.frameworks.CoreFoundation + # «derivation ...CoreFoundation-11.0.0.drv» + # nix-repl> darwin.CoreFoundation + # error: attribute 'CoreFoundation' missing + # nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { } + # «derivation ...CoreFoundation-11.0.0.drv» + # ``` , extra ? (_spliced0: {}) , f }: diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 169f013191..a2958e561c 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -74,15 +74,15 @@ let importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum info showWarnings nixpkgsVersion version isInOldestRelease mod compare splitByAndCompare - functionArgs setFunctionArgs isFunction toFunction + functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs toHexString toBaseDigits inPureEvalMode; inherit (self.fixedPoints) fix fix' converge extends composeExtensions composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs - mapAttrs' mapAttrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond - genAttrs isDerivation toDerivation optionalAttrs + mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive + mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip @@ -92,7 +92,7 @@ let concatMap flatten remove findSingle findFirst any all count optional optionals toList range replicate partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take - drop sublist last init crossLists unique intersectLists + drop sublist last init crossLists unique allUnique intersectLists subtractLists mutuallyExclusive groupBy groupBy'; inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep diff --git a/third_party/nixpkgs/lib/fileset/README.md b/third_party/nixpkgs/lib/fileset/README.md index 1aed7efec4..14b6877a90 100644 --- a/third_party/nixpkgs/lib/fileset/README.md +++ b/third_party/nixpkgs/lib/fileset/README.md @@ -58,7 +58,8 @@ An attribute set with these values: - `_internalBase` (path): Any files outside of this path cannot influence the set of files. - This is always a directory. + This is always a directory and should be as long as possible. + This is used by `lib.fileset.toSource` to check that all files are under the `root` argument - `_internalBaseRoot` (path): The filesystem root of `_internalBase`, same as `(lib.path.splitRoot _internalBase).root`. @@ -143,9 +144,37 @@ Arguments: - (-) Leaves us with no identity element for `union` and no reasonable return value for `unions []`. From a set theory perspective, which has a well-known notion of empty sets, this is unintuitive. +### No intersection for lists + +While there is `intersection a b`, there is no function `intersections [ a b c ]`. + +Arguments: +- (+) There is no known use case for such a function, it can be added later if a use case arises +- (+) There is no suitable return value for `intersections [ ]`, see also "Nullary intersections" [here](https://en.wikipedia.org/w/index.php?title=List_of_set_identities_and_relations&oldid=1177174035#Definitions) + - (-) Could throw an error for that case + - (-) Create a special value to represent "all the files" and return that + - (+) Such a value could then not be used with `fileFilter` unless the internal representation is changed considerably + - (-) Could return the empty file set + - (+) This would be wrong in set theory +- (-) Inconsistent with `union` and `unions` + +### Intersection base path + +The base path of the result of an `intersection` is the longest base path of the arguments. +E.g. the base path of `intersection ./foo ./foo/bar` is `./foo/bar`. +Meanwhile `intersection ./foo ./bar` returns the empty file set without a base path. + +Arguments: +- Alternative: Use the common prefix of all base paths as the resulting base path + - (-) This is unnecessarily strict, because the purpose of the base path is to track the directory under which files _could_ be in the file set. It should be as long as possible. + All files contained in `intersection ./foo ./foo/bar` will be under `./foo/bar` (never just under `./foo`), and `intersection ./foo ./bar` will never contain any files (never under `./.`). + This would lead to `toSource` having to unexpectedly throw errors for cases such as `toSource { root = ./foo; fileset = intersect ./foo base; }`, where `base` may be `./bar` or `./.`. + - (-) There is no benefit to the user, since base path is not directly exposed in the interface + ### Empty directories -File sets can only represent a _set_ of local files, directories on their own are not representable. +File sets can only represent a _set_ of local files. +Directories on their own are not representable. Arguments: - (+) There does not seem to be a sensible set of combinators when directories can be represented on their own. @@ -161,7 +190,7 @@ Arguments: - `./.` represents all files in `./.` _and_ the directory itself, but not its subdirectories, meaning that at least `./.` will be preserved even if it's empty. - In that case, `intersect ./. ./foo` should only include files and no directories themselves, since `./.` includes only `./.` as a directory, and same for `./foo`, so there's no overlap in directories. + In that case, `intersection ./. ./foo` should only include files and no directories themselves, since `./.` includes only `./.` as a directory, and same for `./foo`, so there's no overlap in directories. But intuitively this operation should result in the same as `./foo` – everything else is just confusing. - (+) This matches how Git only supports files, so developers should already be used to it. - (-) Empty directories (even if they contain nested directories) are neither representable nor preserved when coercing from paths. @@ -176,7 +205,7 @@ File sets do not support Nix store paths in strings such as `"/nix/store/...-sou Arguments: - (+) Such paths are usually produced by derivations, which means `toSource` would either: - - Require IFD if `builtins.path` is used as the underlying primitive + - Require [Import From Derivation](https://nixos.org/manual/nix/unstable/language/import-from-derivation) (IFD) if `builtins.path` is used as the underlying primitive - Require importing the entire `root` into the store such that derivations can be used to do the filtering - (+) The convenient path coercion like `union ./foo ./bar` wouldn't work for absolute paths, requiring more verbose alternate interfaces: - `let root = "/nix/store/...-source"; in union "${root}/foo" "${root}/bar"` @@ -196,6 +225,9 @@ Arguments: This use case makes little sense for files that are already in the store. This should be a separate abstraction as e.g. `pkgs.drvLayout` instead, which could have a similar interface but be specific to derivations. Additional capabilities could be supported that can't be done at evaluation time, such as renaming files, creating new directories, setting executable bits, etc. +- (+) An API for filtering/transforming Nix store paths could be much more powerful, + because it's not limited to just what is possible at evaluation time with `builtins.path`. + Operations such as moving and adding files would be supported. ### Single files @@ -206,11 +238,22 @@ Arguments: And it would be unclear how the library should behave if the one file wouldn't be added to the store: `toSource { root = ./file.nix; fileset = ; }` has no reasonable result because returing an empty store path wouldn't match the file type, and there's no way to have an empty file store path, whatever that would mean. +### `fileFilter` takes a path + +The `fileFilter` function takes a path, and not a file set, as its second argument. + +- (-) Makes it harder to compose functions, since the file set type, the return value, can't be passed to the function itself like `fileFilter predicate fileset` + - (+) It's still possible to use `intersection` to filter on file sets: `intersection fileset (fileFilter predicate ./.)` + - (-) This does need an extra `./.` argument that's not obvious + - (+) This could always be `/.` or the project directory, `intersection` will make it lazy +- (+) In the future this will allow `fileFilter` to support a predicate property like `subpath` and/or `components` in a reproducible way. + This wouldn't be possible if it took a file set, because file sets don't have a predictable absolute path. + - (-) What about the base path? + - (+) That can change depending on which files are included, so if it's used for `fileFilter` + it would change the `subpath`/`components` value depending on which files are included. +- (+) If necessary, this restriction can be relaxed later, the opposite wouldn't be possible + ## To update in the future Here's a list of places in the library that need to be updated in the future: -- > The file set library is currently somewhat limited but is being expanded to include more functions over time. - - in [the manual](../../doc/functions/fileset.section.md) -- If/Once a function to convert `lib.sources` values into file sets exists, the `_coerce` and `toSource` functions should be updated to mention that function in the error when such a value is passed - If/Once a function exists that can optionally include a path depending on whether it exists, the error message for the path not existing in `_coerce` should mention the new function diff --git a/third_party/nixpkgs/lib/fileset/default.nix b/third_party/nixpkgs/lib/fileset/default.nix index 93a552262b..15af0813ee 100644 --- a/third_party/nixpkgs/lib/fileset/default.nix +++ b/third_party/nixpkgs/lib/fileset/default.nix @@ -3,21 +3,31 @@ let inherit (import ./internal.nix { inherit lib; }) _coerce + _singleton _coerceMany _toSourceFilter + _fromSourceFilter _unionMany + _fileFilter _printFileset + _intersection + _difference + _mirrorStorePath + _fetchGitSubmodulesMinver ; inherit (builtins) + isBool isList isPath pathExists seq typeOf + nixVersion ; inherit (lib.lists) + elemAt imap0 ; @@ -28,6 +38,7 @@ let inherit (lib.strings) isStringLike + versionOlder ; inherit (lib.filesystem) @@ -39,7 +50,9 @@ let ; inherit (lib.trivial) + isFunction pipe + inPureEvalMode ; in { @@ -117,11 +130,10 @@ in { Paths in [strings](https://nixos.org/manual/nix/stable/language/values.html#type-string), including Nix store paths, cannot be passed as `root`. `root` has to be a directory. - -:::{.note} -Changing `root` only affects the directory structure of the resulting store path, it does not change which files are added to the store. -The only way to change which files get added to the store is by changing the `fileset` attribute. -::: + :::{.note} + Changing `root` only affects the directory structure of the resulting store path, it does not change which files are added to the store. + The only way to change which files get added to the store is by changing the `fileset` attribute. + ::: */ root, /* @@ -130,10 +142,9 @@ The only way to change which files get added to the store is by changing the `fi This argument can also be a path, which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). - -:::{.note} -If a directory does not recursively contain any file, it is omitted from the store path contents. -::: + :::{.note} + If a directory does not recursively contain any file, it is omitted from the store path contents. + ::: */ fileset, @@ -149,9 +160,14 @@ If a directory does not recursively contain any file, it is omitted from the sto sourceFilter = _toSourceFilter fileset; in if ! isPath root then - if isStringLike root then + if root ? _isLibCleanSourceWith then throw '' - lib.fileset.toSource: `root` ("${toString root}") is a string-like value, but it should be a path instead. + lib.fileset.toSource: `root` is a `lib.sources`-based value, but it should be a path instead. + To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. + Note that this only works for sources created from paths.'' + else if isStringLike root then + throw '' + lib.fileset.toSource: `root` (${toString root}) is a string-like value, but it should be a path instead. Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else throw '' @@ -160,13 +176,13 @@ If a directory does not recursively contain any file, it is omitted from the sto # See also ../path/README.md else if ! fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then throw '' - lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` ("${toString root}"): - `root`: root "${toString rootFilesystemRoot}" - `fileset`: root "${toString filesetFilesystemRoot}" - Different roots are not supported.'' + lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` (${toString root}): + `root`: Filesystem root is "${toString rootFilesystemRoot}" + `fileset`: Filesystem root is "${toString filesetFilesystemRoot}" + Different filesystem roots are not supported.'' else if ! pathExists root then throw '' - lib.fileset.toSource: `root` (${toString root}) does not exist.'' + lib.fileset.toSource: `root` (${toString root}) is a path that does not exist.'' else if pathType root != "directory" then throw '' lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: @@ -178,13 +194,82 @@ If a directory does not recursively contain any file, it is omitted from the sto - Set `root` to ${toString fileset._internalBase} or any directory higher up. This changes the layout of the resulting store path. - Set `fileset` to a file set that cannot contain files outside the `root` (${toString root}). This could change the files included in the result.'' else - builtins.seq sourceFilter + seq sourceFilter cleanSourceWith { name = "source"; src = root; filter = sourceFilter; }; + /* + Create a file set with the same files as a `lib.sources`-based value. + This does not import any of the files into the store. + + This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`. + + A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource). + + :::{.note} + File sets cannot represent empty directories. + Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories. + ::: + + Type: + fromSource :: SourceLike -> FileSet + + Example: + # There's no cleanSource-like function for file sets yet, + # but we can just convert cleanSource to a file set and use it that way + toSource { + root = ./.; + fileset = fromSource (lib.sources.cleanSource ./.); + } + + # Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`), + # but removing a subdirectory using file set functions + difference + (fromSource (lib.sources.sourceByRegex ./. [ + "^README\.md$" + # This regex includes everything in ./doc + "^doc(/.*)?$" + ]) + ./doc/generated + + # Use cleanSource, but limit it to only include ./Makefile and files under ./src + intersection + (fromSource (lib.sources.cleanSource ./.)) + (unions [ + ./Makefile + ./src + ]); + */ + fromSource = source: + let + # This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`, + # which are technically internal to lib.sources, + # but we'll allow this since both libraries are in the same code base + # and this function is a bridge between them. + isFiltered = source ? _isLibCleanSourceWith; + path = if isFiltered then source.origSrc else source; + in + # We can only support sources created from paths + if ! isPath path then + if isStringLike path then + throw '' + lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. + Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' + else + throw '' + lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' + else if ! pathExists path then + throw '' + lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.'' + else if isFiltered then + _fromSourceFilter path source.filter + else + # If there's no filter, no need to run the expensive conversion, all subpaths will be included + _singleton path; + /* The file set containing all files that are in either of two given file sets. This is the same as [`unions`](#function-library-lib.fileset.unions), @@ -218,11 +303,11 @@ If a directory does not recursively contain any file, it is omitted from the sto _unionMany (_coerceMany "lib.fileset.union" [ { - context = "first argument"; + context = "First argument"; value = fileset1; } { - context = "second argument"; + context = "Second argument"; value = fileset2; } ]); @@ -264,18 +349,170 @@ If a directory does not recursively contain any file, it is omitted from the sto # which get [implicitly coerced to file sets](#sec-fileset-path-coercion). filesets: if ! isList filesets then - throw "lib.fileset.unions: Expected argument to be a list, but got a ${typeOf filesets}." + throw '' + lib.fileset.unions: Argument is of type ${typeOf filesets}, but it should be a list instead.'' else pipe filesets [ # Annotate the elements with context, used by _coerceMany for better errors (imap0 (i: el: { - context = "element ${toString i}"; + context = "Element ${toString i}"; value = el; })) (_coerceMany "lib.fileset.unions") _unionMany ]; + /* + Filter a file set to only contain files matching some predicate. + + Type: + fileFilter :: + ({ + name :: String, + type :: String, + ... + } -> Bool) + -> Path + -> FileSet + + Example: + # Include all regular `default.nix` files in the current directory + fileFilter (file: file.name == "default.nix") ./. + + # Include all non-Nix files from the current directory + fileFilter (file: ! hasSuffix ".nix" file.name) ./. + + # Include all files that start with a "." in the current directory + fileFilter (file: hasPrefix "." file.name) ./. + + # Include all regular files (not symlinks or others) in the current directory + fileFilter (file: file.type == "regular") ./. + */ + fileFilter = + /* + The predicate function to call on all files contained in given file set. + A file is included in the resulting file set if this function returns true for it. + + This function is called with an attribute set containing these attributes: + + - `name` (String): The name of the file + + - `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file. + This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path. + + Other attributes may be added in the future. + */ + predicate: + # The path whose files to filter + path: + if ! isFunction predicate then + throw '' + lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' + else if ! isPath path then + if path._type or "" == "fileset" then + throw '' + lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. + If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' + else + throw '' + lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' + else if ! pathExists path then + throw '' + lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' + else + _fileFilter predicate path; + + /* + The file set containing all files that are in both of two given file sets. + See also [Intersection (set theory)](https://en.wikipedia.org/wiki/Intersection_(set_theory)). + + The given file sets are evaluated as lazily as possible, + with the first argument being evaluated first if needed. + + Type: + intersection :: FileSet -> FileSet -> FileSet + + Example: + # Limit the selected files to the ones in ./., so only ./src and ./Makefile + intersection ./. (unions [ ../LICENSE ./src ./Makefile ]) + */ + intersection = + # The first file set. + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + fileset1: + # The second file set. + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + fileset2: + let + filesets = _coerceMany "lib.fileset.intersection" [ + { + context = "First argument"; + value = fileset1; + } + { + context = "Second argument"; + value = fileset2; + } + ]; + in + _intersection + (elemAt filesets 0) + (elemAt filesets 1); + + /* + The file set containing all files from the first file set that are not in the second file set. + See also [Difference (set theory)](https://en.wikipedia.org/wiki/Complement_(set_theory)#Relative_complement). + + The given file sets are evaluated as lazily as possible, + with the first argument being evaluated first if needed. + + Type: + union :: FileSet -> FileSet -> FileSet + + Example: + # Create a file set containing all files from the current directory, + # except ones under ./tests + difference ./. ./tests + + let + # A set of Nix-related files + nixFiles = unions [ ./default.nix ./nix ./tests/default.nix ]; + in + # Create a file set containing all files under ./tests, except ones in `nixFiles`, + # meaning only without ./tests/default.nix + difference ./tests nixFiles + */ + difference = + # The positive file set. + # The result can only contain files that are also in this file set. + # + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + positive: + # The negative file set. + # The result will never contain files that are also in this file set. + # + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + negative: + let + filesets = _coerceMany "lib.fileset.difference" [ + { + context = "First argument (positive set)"; + value = positive; + } + { + context = "Second argument (negative set)"; + value = negative; + } + ]; + in + _difference + (elemAt filesets 0) + (elemAt filesets 1); + /* Incrementally evaluate and trace a file set in a pretty way. This function is only intended for debugging purposes. @@ -311,7 +548,7 @@ If a directory does not recursively contain any file, it is omitted from the sto let # "fileset" would be a better name, but that would clash with the argument name, # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.trace: argument" fileset; + actualFileset = _coerce "lib.fileset.trace: Argument" fileset; in seq (_printFileset actualFileset) @@ -358,11 +595,118 @@ If a directory does not recursively contain any file, it is omitted from the sto let # "fileset" would be a better name, but that would clash with the argument name, # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.traceVal: argument" fileset; + actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset; in seq (_printFileset actualFileset) # We could also return the original fileset argument here, # but that would then duplicate work for consumers of the fileset, because then they have to coerce it again actualFileset; + + /* + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + + This function behaves like [`gitTrackedWith { }`](#function-library-lib.fileset.gitTrackedWith) - using the defaults. + + Type: + gitTracked :: Path -> FileSet + + Example: + # Include all files tracked by the Git repository in the current directory + gitTracked ./. + + # Include only files tracked by the Git repository in the parent directory + # that are also in the current directory + intersection ./. (gitTracked ../.) + */ + gitTracked = + /* + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. + */ + path: + # See the gitTrackedWith implementation for more explanatory comments + let + fetchResult = builtins.fetchGit path; + in + if inPureEvalMode then + throw "lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isPath path then + throw "lib.fileset.gitTracked: Expected the argument to be a path, but it's a ${typeOf path} instead." + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTracked: Expected the argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; + + /* + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + The first argument allows configuration with an attribute set, + while the second argument is the path to the Git working tree. + If you don't need the configuration, + you can use [`gitTracked`](#function-library-lib.fileset.gitTracked) instead. + + This is equivalent to the result of [`unions`](#function-library-lib.fileset.unions) on all files returned by [`git ls-files`](https://git-scm.com/docs/git-ls-files) + (which uses [`--cached`](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--c) by default). + + :::{.warning} + Currently this function is based on [`builtins.fetchGit`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchGit) + As such, this function causes all Git-tracked files to be unnecessarily added to the Nix store, + without being re-usable by [`toSource`](#function-library-lib.fileset.toSource). + + This may change in the future. + ::: + + Type: + gitTrackedWith :: { recurseSubmodules :: Bool ? false } -> Path -> FileSet + + Example: + # Include all files tracked by the Git repository in the current directory + # and any submodules under it + gitTracked { recurseSubmodules = true; } ./. + */ + gitTrackedWith = + { + /* + (optional, default: `false`) Whether to recurse into [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to also include their tracked files. + + If `true`, this is equivalent to passing the [--recurse-submodules](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt---recurse-submodules) flag to `git ls-files`. + */ + recurseSubmodules ? false, + }: + /* + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. + */ + path: + let + # This imports the files unnecessarily, which currently can't be avoided + # because `builtins.fetchGit` is the only function exposing which files are tracked by Git. + # With the [lazy trees PR](https://github.com/NixOS/nix/pull/6530), + # the unnecessarily import could be avoided. + # However a simpler alternative still would be [a builtins.gitLsFiles](https://github.com/NixOS/nix/issues/2944). + fetchResult = builtins.fetchGit { + url = path; + + # This is the only `fetchGit` parameter that makes sense in this context. + # We can't just pass `submodules = recurseSubmodules` here because + # this would fail for Nix versions that don't support `submodules`. + ${if recurseSubmodules then "submodules" else null} = true; + }; + in + if inPureEvalMode then + throw "lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isBool recurseSubmodules then + throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead." + else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then + throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used." + else if ! isPath path then + throw "lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it's a ${typeOf path} instead." + # We can identify local working directories by checking for .git, + # see https://git-scm.com/docs/gitrepository-layout#_description. + # Note that `builtins.fetchGit` _does_ work for bare repositories (where there's no `.git`), + # even though `git ls-files` wouldn't return any files in that case. + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTrackedWith: Expected the second argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; } diff --git a/third_party/nixpkgs/lib/fileset/internal.nix b/third_party/nixpkgs/lib/fileset/internal.nix index d18e37e9d6..0769e654c8 100644 --- a/third_party/nixpkgs/lib/fileset/internal.nix +++ b/third_party/nixpkgs/lib/fileset/internal.nix @@ -7,7 +7,6 @@ let isString pathExists readDir - seq split trace typeOf @@ -17,7 +16,6 @@ let attrNames attrValues mapAttrs - setAttrByPath zipAttrsWith ; @@ -28,7 +26,6 @@ let inherit (lib.lists) all commonPrefix - drop elemAt filter findFirst @@ -170,16 +167,21 @@ rec { else value else if ! isPath value then - if isStringLike value then + if value ? _isLibCleanSourceWith then throw '' - ${context} ("${toString value}") is a string-like value, but it should be a path instead. + ${context} is a `lib.sources`-based value, but it should be a file set or a path instead. + To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. + Note that this only works for sources created from paths.'' + else if isStringLike value then + throw '' + ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead. Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' else throw '' - ${context} is of type ${typeOf value}, but it should be a path instead.'' + ${context} is of type ${typeOf value}, but it should be a file set or a path instead.'' else if ! pathExists value then throw '' - ${context} (${toString value}) does not exist.'' + ${context} (${toString value}) is a path that does not exist.'' else _singleton value; @@ -208,9 +210,9 @@ rec { if firstWithBase != null && differentIndex != null then throw '' ${functionContext}: Filesystem roots are not the same: - ${(head list).context}: root "${toString firstBaseRoot}" - ${(elemAt list differentIndex).context}: root "${toString (elemAt filesets differentIndex)._internalBaseRoot}" - Different roots are not supported.'' + ${(head list).context}: Filesystem root is "${toString firstBaseRoot}" + ${(elemAt list differentIndex).context}: Filesystem root is "${toString (elemAt filesets differentIndex)._internalBaseRoot}" + Different filesystem roots are not supported.'' else filesets; @@ -424,7 +426,7 @@ rec { # Filter suited when there's some files # This can't be used for when there's no files, because the base directory is always included nonEmpty = - path: _: + path: type: let # Add a slash to the path string, turning "/foo" to "/foo/", # making sure to not have any false prefix matches below. @@ -433,25 +435,37 @@ rec { # meaning this function can never receive "/" as an argument pathSlash = path + "/"; in - # Same as `hasPrefix pathSlash baseString`, but more efficient. - # With base /foo/bar we need to include /foo: - # hasPrefix "/foo/" "/foo/bar/" - if substring 0 (stringLength pathSlash) baseString == pathSlash then - true - # Same as `! hasPrefix baseString pathSlash`, but more efficient. - # With base /foo/bar we need to exclude /baz - # ! hasPrefix "/baz/" "/foo/bar/" - else if substring 0 baseLength pathSlash != baseString then - false - else - # Same as `removePrefix baseString path`, but more efficient. - # From the above code we know that hasPrefix baseString pathSlash holds, so this is safe. - # We don't use pathSlash here because we only needed the trailing slash for the prefix matching. - # With base /foo and path /foo/bar/baz this gives - # inTree (split "/" (removePrefix "/foo/" "/foo/bar/baz")) - # == inTree (split "/" "bar/baz") - # == inTree [ "bar" "baz" ] - inTree (split "/" (substring baseLength (-1) path)); + ( + # Same as `hasPrefix pathSlash baseString`, but more efficient. + # With base /foo/bar we need to include /foo: + # hasPrefix "/foo/" "/foo/bar/" + if substring 0 (stringLength pathSlash) baseString == pathSlash then + true + # Same as `! hasPrefix baseString pathSlash`, but more efficient. + # With base /foo/bar we need to exclude /baz + # ! hasPrefix "/baz/" "/foo/bar/" + else if substring 0 baseLength pathSlash != baseString then + false + else + # Same as `removePrefix baseString path`, but more efficient. + # From the above code we know that hasPrefix baseString pathSlash holds, so this is safe. + # We don't use pathSlash here because we only needed the trailing slash for the prefix matching. + # With base /foo and path /foo/bar/baz this gives + # inTree (split "/" (removePrefix "/foo/" "/foo/bar/baz")) + # == inTree (split "/" "bar/baz") + # == inTree [ "bar" "baz" ] + inTree (split "/" (substring baseLength (-1) path)) + ) + # This is a way have an additional check in case the above is true without any significant performance cost + && ( + # This relies on the fact that Nix only distinguishes path types "directory", "regular", "symlink" and "unknown", + # so everything except "unknown" is allowed, seems reasonable to rely on that + type != "unknown" + || throw '' + lib.fileset.toSource: `fileset` contains a file that cannot be added to the store: ${path} + This file is neither a regular file nor a symlink, the only file types supported by the Nix store. + Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.'' + ); in # Special case because the code below assumes that the _internalBase is always included in the result # which shouldn't be done when we have no files at all in the base @@ -461,6 +475,96 @@ rec { else nonEmpty; + # Turn a builtins.filterSource-based source filter on a root path into a file set + # containing only files included by the filter. + # The filter is lazily called as necessary to determine whether paths are included + # Type: Path -> (String -> String -> Bool) -> fileset + _fromSourceFilter = root: sourceFilter: + let + # During the recursion we need to track both: + # - The path value such that we can safely call `readDir` on it + # - The path string value such that we can correctly call the `filter` with it + # + # While we could just recurse with the path value, + # this would then require converting it to a path string for every path, + # which is a fairly expensive operation + + # Create a file set from a directory entry + fromDirEntry = path: pathString: type: + # The filter needs to run on the path as a string + if ! sourceFilter pathString type then + null + else if type == "directory" then + fromDir path pathString + else + type; + + # Create a file set from a directory + fromDir = path: pathString: + mapAttrs + # This looks a bit funny, but we need both the path-based and the path string-based values + (name: fromDirEntry (path + "/${name}") (pathString + "/${name}")) + # We need to readDir on the path value, because reading on a path string + # would be unspecified if there are multiple filesystem roots + (readDir path); + + rootPathType = pathType root; + + # We need to convert the path to a string to imitate what builtins.path calls the filter function with. + # We don't want to rely on `toString` for this though because it's not very well defined, see ../path/README.md + # So instead we use `lib.path.splitRoot` to safely deconstruct the path into its filesystem root and subpath + # We don't need the filesystem root though, builtins.path doesn't expose that in any way to the filter. + # So we only need the components, which we then turn into a string as one would expect. + rootString = "/" + concatStringsSep "/" (components (splitRoot root).subpath); + in + if rootPathType == "directory" then + # We imitate builtins.path not calling the filter on the root path + _create root (fromDir root rootString) + else + # Direct files are always included by builtins.path without calling the filter + # But we need to lift up the base path to its parent to satisfy the base path invariant + _create (dirOf root) + { + ${baseNameOf root} = rootPathType; + }; + + # Transforms the filesetTree of a file set to a shorter base path, e.g. + # _shortenTreeBase [ "foo" ] (_create /foo/bar null) + # => { bar = null; } + _shortenTreeBase = targetBaseComponents: fileset: + let + recurse = index: + # If we haven't reached the required depth yet + if index < length fileset._internalBaseComponents then + # Create an attribute set and recurse as the value, this can be lazily evaluated this way + { ${elemAt fileset._internalBaseComponents index} = recurse (index + 1); } + else + # Otherwise we reached the appropriate depth, here's the original tree + fileset._internalTree; + in + recurse (length targetBaseComponents); + + # Transforms the filesetTree of a file set to a longer base path, e.g. + # _lengthenTreeBase [ "foo" "bar" ] (_create /foo { bar.baz = "regular"; }) + # => { baz = "regular"; } + _lengthenTreeBase = targetBaseComponents: fileset: + let + recurse = index: tree: + # If the filesetTree is an attribute set and we haven't reached the required depth yet + if isAttrs tree && index < length targetBaseComponents then + # Recurse with the tree under the right component (which might not exist) + recurse (index + 1) (tree.${elemAt targetBaseComponents index} or null) + else + # For all values here we can just return the tree itself: + # tree == null -> the result is also null, everything is excluded + # tree == "directory" -> the result is also "directory", + # because the base path is always a directory and everything is included + # isAttrs tree -> the result is `tree` + # because we don't need to recurse any more since `index == length longestBaseComponents` + tree; + in + recurse (length fileset._internalBaseComponents) fileset._internalTree; + # Computes the union of a list of filesets. # The filesets must already be coerced and validated to be in the same filesystem root # Type: [ Fileset ] -> Fileset @@ -497,11 +601,7 @@ rec { # So the tree under `/foo/bar` gets nested under `{ bar = ...; ... }`, # while the tree under `/foo/baz` gets nested under `{ baz = ...; ... }` # Therefore allowing combined operations over them. - trees = map (fileset: - setAttrByPath - (drop (length commonBaseComponents) fileset._internalBaseComponents) - fileset._internalTree - ) filesetsWithBase; + trees = map (_shortenTreeBase commonBaseComponents) filesetsWithBase; # Folds all trees together into a single one using _unionTree # We do not use a fold here because it would cause a thunk build-up @@ -533,4 +633,219 @@ rec { # The non-null elements have to be attribute sets representing partial trees # We need to recurse into those zipAttrsWith (name: _unionTrees) withoutNull; + + # Computes the intersection of a list of filesets. + # The filesets must already be coerced and validated to be in the same filesystem root + # Type: Fileset -> Fileset -> Fileset + _intersection = fileset1: fileset2: + let + # The common base components prefix, e.g. + # (/foo/bar, /foo/bar/baz) -> /foo/bar + # (/foo/bar, /foo/baz) -> /foo + commonBaseComponentsLength = + # TODO: Have a `lib.lists.commonPrefixLength` function such that we don't need the list allocation from commonPrefix here + length ( + commonPrefix + fileset1._internalBaseComponents + fileset2._internalBaseComponents + ); + + # To be able to intersect filesetTree's together, they need to have the same base path. + # Base paths can be intersected by taking the longest one (if any) + + # The fileset with the longest base, if any, e.g. + # (/foo/bar, /foo/bar/baz) -> /foo/bar/baz + # (/foo/bar, /foo/baz) -> null + longestBaseFileset = + if commonBaseComponentsLength == length fileset1._internalBaseComponents then + # The common prefix is the same as the first path, so the second path is equal or longer + fileset2 + else if commonBaseComponentsLength == length fileset2._internalBaseComponents then + # The common prefix is the same as the second path, so the first path is longer + fileset1 + else + # The common prefix is neither the first nor the second path + # This means there's no overlap between the two sets + null; + + # Whether the result should be the empty value without a base + resultIsEmptyWithoutBase = + # If either fileset is the empty fileset without a base, the intersection is too + fileset1._internalIsEmptyWithoutBase + || fileset2._internalIsEmptyWithoutBase + # If there is no overlap between the base paths + || longestBaseFileset == null; + + # Lengthen each fileset's tree to the longest base prefix + tree1 = _lengthenTreeBase longestBaseFileset._internalBaseComponents fileset1; + tree2 = _lengthenTreeBase longestBaseFileset._internalBaseComponents fileset2; + + # With two filesetTree's with the same base, we can compute their intersection + resultTree = _intersectTree tree1 tree2; + in + if resultIsEmptyWithoutBase then + _emptyWithoutBase + else + _create longestBaseFileset._internalBase resultTree; + + # The intersection of two filesetTree's with the same base path + # The second element is only evaluated as much as necessary. + # Type: filesetTree -> filesetTree -> filesetTree + _intersectTree = lhs: rhs: + if isAttrs lhs && isAttrs rhs then + # Both sides are attribute sets, we can recurse for the attributes existing on both sides + mapAttrs + (name: _intersectTree lhs.${name}) + (builtins.intersectAttrs lhs rhs) + else if lhs == null || isString rhs then + # If the lhs is null, the result should also be null + # And if the rhs is the identity element + # (a string, aka it includes everything), then it's also the lhs + lhs + else + # In all other cases it's the rhs + rhs; + + # Compute the set difference between two file sets. + # The filesets must already be coerced and validated to be in the same filesystem root. + # Type: Fileset -> Fileset -> Fileset + _difference = positive: negative: + let + # The common base components prefix, e.g. + # (/foo/bar, /foo/bar/baz) -> /foo/bar + # (/foo/bar, /foo/baz) -> /foo + commonBaseComponentsLength = + # TODO: Have a `lib.lists.commonPrefixLength` function such that we don't need the list allocation from commonPrefix here + length ( + commonPrefix + positive._internalBaseComponents + negative._internalBaseComponents + ); + + # We need filesetTree's with the same base to be able to compute the difference between them + # This here is the filesetTree from the negative file set, but for a base path that matches the positive file set. + # Examples: + # For `difference /foo /foo/bar`, `negativeTreeWithPositiveBase = { bar = "directory"; }` + # because under the base path of `/foo`, only `bar` from the negative file set is included + # For `difference /foo/bar /foo`, `negativeTreeWithPositiveBase = "directory"` + # because under the base path of `/foo/bar`, everything from the negative file set is included + # For `difference /foo /bar`, `negativeTreeWithPositiveBase = null` + # because under the base path of `/foo`, nothing from the negative file set is included + negativeTreeWithPositiveBase = + if commonBaseComponentsLength == length positive._internalBaseComponents then + # The common prefix is the same as the positive base path, so the second path is equal or longer. + # We need to _shorten_ the negative filesetTree to the same base path as the positive one + # E.g. for `difference /foo /foo/bar` the common prefix is /foo, equal to the positive file set's base + # So we need to shorten the base of the tree for the negative argument from /foo/bar to just /foo + _shortenTreeBase positive._internalBaseComponents negative + else if commonBaseComponentsLength == length negative._internalBaseComponents then + # The common prefix is the same as the negative base path, so the first path is longer. + # We need to lengthen the negative filesetTree to the same base path as the positive one. + # E.g. for `difference /foo/bar /foo` the common prefix is /foo, equal to the negative file set's base + # So we need to lengthen the base of the tree for the negative argument from /foo to /foo/bar + _lengthenTreeBase positive._internalBaseComponents negative + else + # The common prefix is neither the first nor the second path. + # This means there's no overlap between the two file sets, + # and nothing from the negative argument should get removed from the positive one + # E.g for `difference /foo /bar`, we remove nothing to get the same as `/foo` + null; + + resultingTree = + _differenceTree + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; + in + # If the first file set is empty, we can never have any files in the result + if positive._internalIsEmptyWithoutBase then + _emptyWithoutBase + # If the second file set is empty, nothing gets removed, so the result is just the first file set + else if negative._internalIsEmptyWithoutBase then + positive + else + # We use the positive file set base for the result, + # because only files from the positive side may be included, + # which is what base path is for + _create positive._internalBase resultingTree; + + # Computes the set difference of two filesetTree's + # Type: Path -> filesetTree -> filesetTree + _differenceTree = path: lhs: rhs: + # If the lhs doesn't have any files, or the right hand side includes all files + if lhs == null || isString rhs then + # The result will always be empty + null + # If the right hand side has no files + else if rhs == null then + # The result is always the left hand side, because nothing gets removed + lhs + else + # Otherwise we always have two attribute sets to recurse into + mapAttrs (name: lhsValue: + _differenceTree (path + "/${name}") lhsValue (rhs.${name} or null) + ) (_directoryEntries path lhs); + + # Filters all files in a path based on a predicate + # Type: ({ name, type, ... } -> Bool) -> Path -> FileSet + _fileFilter = predicate: root: + let + # Check the predicate for a single file + # Type: String -> String -> filesetTree + fromFile = name: type: + if + predicate { + inherit name type; + # To ensure forwards compatibility with more arguments being added in the future, + # adding an attribute which can't be deconstructed :) + "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null; + } + then + type + else + null; + + # Check the predicate for all files in a directory + # Type: Path -> filesetTree + fromDir = path: + mapAttrs (name: type: + if type == "directory" then + fromDir (path + "/${name}") + else + fromFile name type + ) (readDir path); + + rootType = pathType root; + in + if rootType == "directory" then + _create root (fromDir root) + else + # Single files are turned into a directory containing that file or nothing. + _create (dirOf root) { + ${baseNameOf root} = + fromFile (baseNameOf root) rootType; + }; + + # Support for `builtins.fetchGit` with `submodules = true` was introduced in 2.4 + # https://github.com/NixOS/nix/commit/55cefd41d63368d4286568e2956afd535cb44018 + _fetchGitSubmodulesMinver = "2.4"; + + # Mirrors the contents of a Nix store path relative to a local path as a file set. + # Some notes: + # - The store path is read at evaluation time. + # - The store path must not include files that don't exist in the respective local path. + # + # Type: Path -> String -> FileSet + _mirrorStorePath = localPath: storePath: + let + recurse = focusedStorePath: + mapAttrs (name: type: + if type == "directory" then + recurse (focusedStorePath + "/${name}") + else + type + ) (builtins.readDir focusedStorePath); + in + _create localPath + (recurse storePath); } diff --git a/third_party/nixpkgs/lib/fileset/tests.sh b/third_party/nixpkgs/lib/fileset/tests.sh index 9e09da8092..3c88ebdd05 100755 --- a/third_party/nixpkgs/lib/fileset/tests.sh +++ b/third_party/nixpkgs/lib/fileset/tests.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash # shellcheck disable=SC2016 +# shellcheck disable=SC2317 +# shellcheck disable=SC2192 # Tests lib.fileset # Run: @@ -41,15 +43,29 @@ crudeUnquoteJSON() { cut -d \" -f2 } -prefixExpression='let - lib = import ; - internal = import { - inherit lib; - }; -in -with lib; -with internal; -with lib.fileset;' +prefixExpression() { + echo 'let + lib = + (import ) + ' + if [[ "${1:-}" == "--simulate-pure-eval" ]]; then + echo ' + .extend (final: prev: { + trivial = prev.trivial // { + inPureEvalMode = true; + }; + })' + fi + echo ' + ; + internal = import { + inherit lib; + }; + in + with lib; + with internal; + with lib.fileset;' +} # Check that two nix expression successfully evaluate to the same value. # The expressions have `lib.fileset` in scope. @@ -58,7 +74,7 @@ expectEqual() { local actualExpr=$1 local expectedExpr=$2 if actualResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/actualStderr \ - --expr "$prefixExpression ($actualExpr)"); then + --expr "$(prefixExpression) ($actualExpr)"); then actualExitCode=$? else actualExitCode=$? @@ -66,7 +82,7 @@ expectEqual() { actualStderr=$(< "$tmp"/actualStderr) if expectedResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/expectedStderr \ - --expr "$prefixExpression ($expectedExpr)"); then + --expr "$(prefixExpression) ($expectedExpr)"); then expectedExitCode=$? else expectedExitCode=$? @@ -93,8 +109,9 @@ expectEqual() { # Usage: expectStorePath NIX expectStorePath() { local expr=$1 - if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace \ - --expr "$prefixExpression ($expr)"); then + if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace 2>"$tmp"/stderr \ + --expr "$(prefixExpression) ($expr)"); then + cat "$tmp/stderr" >&2 die "$expr failed to evaluate, but it was expected to succeed" fi # This is safe because we assume to get back a store path in a string @@ -106,10 +123,16 @@ expectStorePath() { # The expression has `lib.fileset` in scope. # Usage: expectFailure NIX REGEX expectFailure() { + if [[ "$1" == "--simulate-pure-eval" ]]; then + maybePure="--simulate-pure-eval" + shift + else + maybePure="" + fi local expr=$1 local expectedErrorRegex=$2 if result=$(nix-instantiate --eval --strict --read-write-mode --show-trace 2>"$tmp/stderr" \ - --expr "$prefixExpression $expr"); then + --expr "$(prefixExpression $maybePure) $expr"); then die "$expr evaluated successfully to $result, but it was expected to fail" fi stderr=$(<"$tmp/stderr") @@ -126,12 +149,12 @@ expectTrace() { local expectedTrace=$2 nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTrace \ - --expr "$prefixExpression trace ($expr)" || true + --expr "$(prefixExpression) trace ($expr)" || true actualTrace=$(sed -n 's/^trace: //p' "$tmp/stderrTrace") nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTraceVal \ - --expr "$prefixExpression traceVal ($expr)" || true + --expr "$(prefixExpression) traceVal ($expr)" || true actualTraceVal=$(sed -n 's/^trace: //p' "$tmp/stderrTraceVal") @@ -224,23 +247,17 @@ withFileMonitor() { fi } -# Check whether a file set includes/excludes declared paths as expected, usage: + +# Create the tree structure declared in the tree variable, usage: # # tree=( -# [a/b] =1 # Declare that file a/b should exist and expect it to be included in the store path -# [c/a] = # Declare that file c/a should exist and expect it to be excluded in the store path -# [c/d/]= # Declare that directory c/d/ should exist and expect it to be excluded in the store path +# [a/b] = # Declare that file a/b should exist +# [c/a] = # Declare that file c/a should exist +# [c/d/]= # Declare that directory c/d/ should exist # ) -# checkFileset './a' # Pass the fileset as the argument +# createTree declare -A tree -checkFileset() { - # New subshell so that we can have a separate trap handler, see `trap` below - local fileset=$1 - - # Process the tree into separate arrays for included paths, excluded paths and excluded files. - local -a included=() - local -a excluded=() - local -a excludedFiles=() +createTree() { # Track which paths need to be created local -a dirsToCreate=() local -a filesToCreate=() @@ -248,24 +265,9 @@ checkFileset() { # If keys end with a `/` we treat them as directories, otherwise files if [[ "$p" =~ /$ ]]; then dirsToCreate+=("$p") - isFile= else filesToCreate+=("$p") - isFile=1 fi - case "${tree[$p]}" in - 1) - included+=("$p") - ;; - 0) - excluded+=("$p") - if [[ -n "$isFile" ]]; then - excludedFiles+=("$p") - fi - ;; - *) - die "Unsupported tree value: ${tree[$p]}" - esac done # Create all the necessary paths. @@ -280,6 +282,43 @@ checkFileset() { mkdir -p "${parentsToCreate[@]}" touch "${filesToCreate[@]}" fi +} + +# Check whether a file set includes/excludes declared paths as expected, usage: +# +# tree=( +# [a/b] =1 # Declare that file a/b should exist and expect it to be included in the store path +# [c/a] = # Declare that file c/a should exist and expect it to be excluded in the store path +# [c/d/]= # Declare that directory c/d/ should exist and expect it to be excluded in the store path +# ) +# checkFileset './a' # Pass the fileset as the argument +checkFileset() { + # New subshell so that we can have a separate trap handler, see `trap` below + local fileset=$1 + + # Create the tree + createTree + + # Process the tree into separate arrays for included paths, excluded paths and excluded files. + local -a included=() + local -a excluded=() + local -a excludedFiles=() + for p in "${!tree[@]}"; do + case "${tree[$p]}" in + 1) + included+=("$p") + ;; + 0) + excluded+=("$p") + # If keys end with a `/` we treat them as directories, otherwise files + if [[ ! "$p" =~ /$ ]]; then + excludedFiles+=("$p") + fi + ;; + *) + die "Unsupported tree value: ${tree[$p]}" + esac + done expression="toSource { root = ./.; fileset = $fileset; }" @@ -318,9 +357,13 @@ checkFileset() { #### Error messages ##### # Absolute paths in strings cannot be passed as `root` -expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \("/nix/store/foobar"\) is a string-like value, but it should be a path instead. +expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \(/nix/store/foobar\) is a string-like value, but it should be a path instead. \s*Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +expectFailure 'toSource { root = cleanSourceWith { src = ./.; }; fileset = ./.; }' 'lib.fileset.toSource: `root` is a `lib.sources`-based value, but it should be a path instead. +\s*To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. +\s*Note that this only works for sources created from paths.' + # Only paths are accepted as `root` expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `root` is of type int, but it should be a path instead.' @@ -328,21 +371,21 @@ expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `r mkdir -p {foo,bar}/mock-root expectFailure 'with ((import ).extend (import )).fileset; toSource { root = ./foo/mock-root; fileset = ./bar/mock-root; } -' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \("'"$work"'/foo/mock-root"\): -\s*`root`: root "'"$work"'/foo/mock-root" -\s*`fileset`: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' -rm -rf * +' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \('"$work"'/foo/mock-root\): +\s*`root`: Filesystem root is "'"$work"'/foo/mock-root" +\s*`fileset`: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' +rm -rf -- * # `root` needs to exist -expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a path that does not exist.' # `root` needs to be a file touch a expectFailure 'toSource { root = ./a; fileset = ./a; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a file, but it should be a directory instead. Potential solutions: \s*- If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. \s*- If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as '"$work"', and set `fileset` to the file path.' -rm -rf * +rm -rf -- * # The fileset argument should be evaluated, even if the directory is empty expectFailure 'toSource { root = ./.; fileset = abort "This should be evaluated"; }' 'evaluation aborted with the following error message: '\''This should be evaluated'\' @@ -352,15 +395,25 @@ mkdir a expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: \s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. \s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' -rm -rf * +rm -rf -- * + +# non-regular and non-symlink files cannot be added to the Nix store +mkfifo a +expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` contains a file that cannot be added to the store: '"$work"'/a +\s*This file is neither a regular file nor a symlink, the only file types supported by the Nix store. +\s*Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.' +rm -rf -- * # Path coercion only works for paths -expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a path instead.' -expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a path instead. +expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a file set or a path instead.' +expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a file set or a path instead. \s*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +expectFailure 'toSource { root = ./.; fileset = cleanSourceWith { src = ./.; }; }' 'lib.fileset.toSource: `fileset` is a `lib.sources`-based value, but it should be a file set or a path instead. +\s*To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. +\s*Note that this only works for sources created from paths.' # Path coercion errors for non-existent paths -expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) is a path that does not exist.' # File sets cannot be evaluated directly expectFailure 'union ./. ./.' 'lib.fileset: Directly evaluating a file set is not supported. @@ -483,26 +536,26 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import ).extend (import )).fileset; toSource { root = ./.; fileset = union ./foo/mock-root ./bar/mock-root; } ' 'lib.fileset.union: Filesystem roots are not the same: -\s*first argument: root "'"$work"'/foo/mock-root" -\s*second argument: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' +\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" +\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' expectFailure 'with ((import ).extend (import )).fileset; toSource { root = ./.; fileset = unions [ ./foo/mock-root ./bar/mock-root ]; } ' 'lib.fileset.unions: Filesystem roots are not the same: -\s*element 0: root "'"$work"'/foo/mock-root" -\s*element 1: root "'"$work"'/bar/mock-root" -\s*Different roots are not supported.' -rm -rf * +\s*Element 0: Filesystem root is "'"$work"'/foo/mock-root" +\s*Element 1: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' +rm -rf -- * # Coercion errors show the correct context -expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: first argument \('"$work"'/a\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.union: second argument \('"$work"'/b\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: element 0 \('"$work"'/a\) does not exist.' -expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: element 1 \('"$work"'/b\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: First argument \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.union: Second argument \('"$work"'/b\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: Element 0 \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: Element 1 \('"$work"'/b\) is a path that does not exist.' # unions needs a list -expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Expected argument to be a list, but got a null.' +expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Argument is of type null, but it should be a list instead.' # The tree of later arguments should not be evaluated if a former argument already includes all files tree=() @@ -587,6 +640,282 @@ done # So, just using 1000 files for now. checkFileset 'unions (mapAttrsToList (name: _: ./. + "/${name}/a") (builtins.readDir ./.))' + +## lib.fileset.intersection + + +# Different filesystem roots in root and fileset are not supported +mkdir -p {foo,bar}/mock-root +expectFailure 'with ((import ).extend (import )).fileset; + toSource { root = ./.; fileset = intersection ./foo/mock-root ./bar/mock-root; } +' 'lib.fileset.intersection: Filesystem roots are not the same: +\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" +\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +\s*Different filesystem roots are not supported.' +rm -rf -- * + +# Coercion errors show the correct context +expectFailure 'toSource { root = ./.; fileset = intersection ./a ./.; }' 'lib.fileset.intersection: First argument \('"$work"'/a\) is a path that does not exist.' +expectFailure 'toSource { root = ./.; fileset = intersection ./. ./b; }' 'lib.fileset.intersection: Second argument \('"$work"'/b\) is a path that does not exist.' + +# The tree of later arguments should not be evaluated if a former argument already excludes all files +tree=( + [a]=0 +) +checkFileset 'intersection _emptyWithoutBase (_create ./. (abort "This should not be used!"))' +# We don't have any combinators that can explicitly remove files yet, so we need to rely on internal functions to test this for now +checkFileset 'intersection (_create ./. { a = null; }) (_create ./. { a = abort "This should not be used!"; })' + +# If either side is empty, the result is empty +tree=( + [a]=0 +) +checkFileset 'intersection _emptyWithoutBase _emptyWithoutBase' +checkFileset 'intersection _emptyWithoutBase (_create ./. null)' +checkFileset 'intersection (_create ./. null) _emptyWithoutBase' +checkFileset 'intersection (_create ./. null) (_create ./. null)' + +# If the intersection base paths are not overlapping, the result is empty and has no base path +mkdir a b c +touch {a,b,c}/x +expectEqual 'toSource { root = ./c; fileset = intersection ./a ./b; }' 'toSource { root = ./c; fileset = _emptyWithoutBase; }' +rm -rf -- * + +# If the intersection exists, the resulting base path is the longest of them +mkdir a +touch x a/b +expectEqual 'toSource { root = ./a; fileset = intersection ./a ./.; }' 'toSource { root = ./a; fileset = ./a; }' +expectEqual 'toSource { root = ./a; fileset = intersection ./. ./a; }' 'toSource { root = ./a; fileset = ./a; }' +rm -rf -- * + +# Also finds the intersection with null'd filesetTree's +tree=( + [a]=0 + [b]=1 + [c]=0 +) +checkFileset 'intersection (_create ./. { a = "regular"; b = "regular"; c = null; }) (_create ./. { a = null; b = "regular"; c = "regular"; })' + +# Actually computes the intersection between files +tree=( + [a]=0 + [b]=0 + [c]=1 + [d]=1 + [e]=0 + [f]=0 +) +checkFileset 'intersection (unions [ ./a ./b ./c ./d ]) (unions [ ./c ./d ./e ./f ])' + +tree=( + [a/x]=0 + [a/y]=0 + [b/x]=1 + [b/y]=1 + [c/x]=0 + [c/y]=0 +) +checkFileset 'intersection ./b ./.' +checkFileset 'intersection ./b (unions [ ./a/x ./a/y ./b/x ./b/y ./c/x ./c/y ])' + +# Complicated case +tree=( + [a/x]=0 + [a/b/i]=1 + [c/d/x]=0 + [c/d/f]=1 + [c/x]=0 + [c/e/i]=1 + [c/e/j]=1 +) +checkFileset 'intersection (unions [ ./a/b ./c/d ./c/e ]) (unions [ ./a ./c/d/f ./c/e ])' + +## Difference + +# Subtracting something from itself results in nothing +tree=( + [a]=0 +) +checkFileset 'difference ./. ./.' + +# The tree of the second argument should not be evaluated if not needed +checkFileset 'difference _emptyWithoutBase (_create ./. (abort "This should not be used!"))' +checkFileset 'difference (_create ./. null) (_create ./. (abort "This should not be used!"))' + +# Subtracting nothing gives the same thing back +tree=( + [a]=1 +) +checkFileset 'difference ./. _emptyWithoutBase' +checkFileset 'difference ./. (_create ./. null)' + +# Subtracting doesn't influence the base path +mkdir a b +touch {a,b}/x +expectEqual 'toSource { root = ./a; fileset = difference ./a ./b; }' 'toSource { root = ./a; fileset = ./a; }' +rm -rf -- * + +# Also not the other way around +mkdir a +expectFailure 'toSource { root = ./a; fileset = difference ./. ./a; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: +\s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. +\s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' +rm -rf -- * + +# Difference actually works +# We test all combinations of ./., ./a, ./a/x and ./b +tree=( + [a/x]=0 + [a/y]=0 + [b]=0 + [c]=0 +) +checkFileset 'difference ./. ./.' +checkFileset 'difference ./a ./.' +checkFileset 'difference ./a/x ./.' +checkFileset 'difference ./b ./.' +checkFileset 'difference ./a ./a' +checkFileset 'difference ./a/x ./a' +checkFileset 'difference ./a/x ./a/x' +checkFileset 'difference ./b ./b' +tree=( + [a/x]=0 + [a/y]=0 + [b]=1 + [c]=1 +) +checkFileset 'difference ./. ./a' +tree=( + [a/x]=1 + [a/y]=1 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a ./b' +tree=( + [a/x]=1 + [a/y]=0 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a/x ./b' +tree=( + [a/x]=0 + [a/y]=1 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a ./a/x' +tree=( + [a/x]=0 + [a/y]=0 + [b]=1 + [c]=0 +) +checkFileset 'difference ./b ./a' +checkFileset 'difference ./b ./a/x' +tree=( + [a/x]=0 + [a/y]=1 + [b]=1 + [c]=1 +) +checkFileset 'difference ./. ./a/x' +tree=( + [a/x]=1 + [a/y]=1 + [b]=0 + [c]=1 +) +checkFileset 'difference ./. ./b' + +## File filter + +# The first argument needs to be a function +expectFailure 'fileFilter null (abort "this is not needed")' 'lib.fileset.fileFilter: First argument is of type null, but it should be a function instead.' + +# The second argument needs to be an existing path +expectFailure 'fileFilter (file: abort "this is not needed") _emptyWithoutBase' 'lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. +\s*If you need to filter files in a file set, use `intersection fileset \(fileFilter pred \./\.\)` instead.' +expectFailure 'fileFilter (file: abort "this is not needed") null' 'lib.fileset.fileFilter: Second argument is of type null, but it should be a path instead.' +expectFailure 'fileFilter (file: abort "this is not needed") ./a' 'lib.fileset.fileFilter: Second argument \('"$work"'/a\) is a path that does not exist.' + +# The predicate is not called when there's no files +tree=() +checkFileset 'fileFilter (file: abort "this is not needed") ./.' + +# The predicate must be able to handle extra attributes +touch a +expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file \}:`, use `\{ name, file, ... \}:` instead."'\' +rm -rf -- * + +# .name is the name, and it works correctly, even recursively +tree=( + [a]=1 + [b]=0 + [c/a]=1 + [c/b]=0 + [d/c/a]=1 + [d/c/b]=0 +) +checkFileset 'fileFilter (file: file.name == "a") ./.' +tree=( + [a]=0 + [b]=1 + [c/a]=0 + [c/b]=1 + [d/c/a]=0 + [d/c/b]=1 +) +checkFileset 'fileFilter (file: file.name != "a") ./.' + +# `.type` is the file type +mkdir d +touch d/a +ln -s d/b d/b +mkfifo d/c +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "regular") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/a; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "symlink") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/b; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type == "unknown") ./.; }' \ + 'toSource { root = ./.; fileset = ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "regular") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/b ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "symlink") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/a ./d/c; }' +expectEqual \ + 'toSource { root = ./.; fileset = fileFilter (file: file.type != "unknown") ./.; }' \ + 'toSource { root = ./.; fileset = union ./d/a ./d/b; }' +rm -rf -- * + +# It's lazy +tree=( + [b]=1 + [c/a]=1 +) +# Note that union evaluates the first argument first if necessary, that's why we can use ./c/a here +checkFileset 'union ./c/a (fileFilter (file: assert file.name != "a"; true) ./.)' +# but here we need to use ./c +checkFileset 'union (fileFilter (file: assert file.name != "a"; true) ./.) ./c' + +# Make sure single files are filtered correctly +tree=( + [a]=1 + [b]=0 +) +checkFileset 'fileFilter (file: assert file.name == "a"; true) ./a' +tree=( + [a]=0 + [b]=0 +) +checkFileset 'fileFilter (file: assert file.name == "a"; false) ./a' + ## Tracing # The second trace argument is returned @@ -609,6 +938,10 @@ rm -rf -- * # The empty file set without a base also prints as empty expectTrace '_emptyWithoutBase' '(empty)' expectTrace 'unions [ ]' '(empty)' +mkdir foo bar +touch {foo,bar}/x +expectTrace 'intersection ./foo ./bar' '(empty)' +rm -rf -- * # If a directory is fully included, print it as such touch a @@ -728,6 +1061,390 @@ touch 0 "${filesToCreate[@]}" expectTrace 'unions (mapAttrsToList (n: _: ./. + "/${n}") (removeAttrs (builtins.readDir ./.) [ "0" ]))' "$expectedTrace" rm -rf -- * +## lib.fileset.fromSource + +# Check error messages +expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' + +expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead. +\s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' + +expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' + +# fromSource on a path works and is the same as coercing that path +mkdir a +touch a/b c +expectEqual 'trace (fromSource ./.) null' 'trace ./. null' +rm -rf -- * + +# Check that converting to a file set doesn't read the included files +mkdir a +touch a/b +run() { + expectEqual "trace (fromSource (lib.cleanSourceWith { src = ./a; })) null" "builtins.trace \"$work/a (all files in directory)\" null" + rm a/b +} +withFileMonitor run a/b +rm -rf -- * + +# Check that converting to a file set doesn't read entries for directories that are filtered out +mkdir -p a/b +touch a/b/c +run() { + expectEqual "trace (fromSource (lib.cleanSourceWith { + src = ./a; + filter = pathString: type: false; + })) null" "builtins.trace \"(empty)\" null" + rm a/b/c + rmdir a/b +} +withFileMonitor run a/b +rm -rf -- * + +# The filter is not needed on empty directories +expectEqual 'trace (fromSource (lib.cleanSourceWith { + src = ./.; + filter = abort "filter should not be needed"; +})) null' 'trace _emptyWithoutBase null' + +# Single files also work +touch a b +expectEqual 'trace (fromSource (cleanSourceWith { src = ./a; })) null' 'trace ./a null' +rm -rf -- * + +# For a tree assigning each subpath true/false, +# check whether a source filter with those results includes the same files +# as a file set created using fromSource. Usage: +# +# tree=( +# [a]=1 # ./a is a file and the filter should return true for it +# [b/]=0 # ./b is a directory and the filter should return false for it +# ) +# checkSource +checkSource() { + createTree + + # Serialise the tree as JSON (there's only minimal savings with jq, + # and we don't need to handle escapes) + { + echo "{" + first=1 + for p in "${!tree[@]}"; do + if [[ -z "$first" ]]; then + echo "," + else + first= + fi + echo "\"$p\":" + case "${tree[$p]}" in + 1) + echo "true" + ;; + 0) + echo "false" + ;; + *) + die "Unsupported tree value: ${tree[$p]}" + esac + done + echo "}" + } > "$tmp/tree.json" + + # An expression to create a source value with a filter matching the tree + sourceExpr=' + let + tree = importJSON '"$tmp"'/tree.json; + in + cleanSourceWith { + src = ./.; + filter = + pathString: type: + let + stripped = removePrefix (toString ./. + "/") pathString; + key = stripped + optionalString (type == "directory") "/"; + in + tree.${key} or + (throw "tree key ${key} missing"); + } + ' + + filesetExpr=' + toSource { + root = ./.; + fileset = fromSource ('"$sourceExpr"'); + } + ' + + # Turn both into store paths + sourceStorePath=$(expectStorePath "$sourceExpr") + filesetStorePath=$(expectStorePath "$filesetExpr") + + # Loop through each path in the tree + while IFS= read -r -d $'\0' subpath; do + if [[ ! -e "$sourceStorePath"/"$subpath" ]]; then + # If it's not in the source store path, it's also not in the file set store path + if [[ -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr doesn't contain $subpath, but the corresponding store path $filesetStorePath created via fromSource does contain $subpath" + fi + elif [[ -z "$(find "$sourceStorePath"/"$subpath" -type f)" ]]; then + # If it's an empty directory in the source store path, it shouldn't be in the file set store path + if [[ -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr contains the path $subpath without any files, but the corresponding store path $filesetStorePath created via fromSource didn't omit it" + fi + else + # If it's non-empty directory or a file, it should be in the file set store path + if [[ ! -e "$filesetStorePath"/"$subpath" ]]; then + die "The store path $sourceStorePath created by $expr contains the non-empty path $subpath, but the corresponding store path $filesetStorePath created via fromSource doesn't include it" + fi + fi + done < <(find . -mindepth 1 -print0) + + rm -rf -- * +} + +# Check whether the filter is evaluated correctly +tree=( + [a]= + [b/]= + [b/c]= + [b/d]= + [e/]= + [e/e/]= +) +# We fill out the above tree values with all possible combinations of 0 and 1 +# Then check whether a filter based on those return values gets turned into the corresponding file set +for i in $(seq 0 $((2 ** ${#tree[@]} - 1 ))); do + for p in "${!tree[@]}"; do + tree[$p]=$(( i % 2 )) + (( i /= 2 )) || true + done + checkSource +done + +# The filter is called with the same arguments in the same order +mkdir a e +touch a/b a/c d e +expectEqual ' + trace (fromSource (cleanSourceWith { + src = ./.; + filter = pathString: type: builtins.trace "${pathString} ${toString type}" true; + })) null +' ' + builtins.seq (cleanSourceWith { + src = ./.; + filter = pathString: type: builtins.trace "${pathString} ${toString type}" true; + }).outPath + builtins.trace "'"$work"' (all files in directory)" + null +' +rm -rf -- * + +# Test that if a directory is not included, the filter isn't called on its contents +mkdir a b +touch a/c b/d +expectEqual 'trace (fromSource (cleanSourceWith { + src = ./.; + filter = pathString: type: + if pathString == toString ./a then + false + else if pathString == toString ./b then + true + else if pathString == toString ./b/d then + true + else + abort "This filter should not be called with path ${pathString}"; +})) null' 'trace (_create ./. { b = "directory"; }) null' +rm -rf -- * + +# The filter is called lazily: +# If a later say intersection removes a part of the tree, the filter won't run on it +mkdir a d +touch a/{b,c} d/e +expectEqual 'trace (intersection ./a (fromSource (lib.cleanSourceWith { + src = ./.; + filter = pathString: type: + if pathString == toString ./a || pathString == toString ./a/b then + true + else if pathString == toString ./a/c then + false + else + abort "filter should not be called on ${pathString}"; +}))) null' 'trace ./a/b null' +rm -rf -- * + +## lib.fileset.gitTracked/gitTrackedWith + +# The first/second argument has to be a path +expectFailure 'gitTracked null' 'lib.fileset.gitTracked: Expected the argument to be a path, but it'\''s a null instead.' +expectFailure 'gitTrackedWith {} null' 'lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it'\''s a null instead.' + +# The path has to contain a .git directory +expectFailure 'gitTracked ./.' 'lib.fileset.gitTracked: Expected the argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' +expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' + +# recurseSubmodules has to be a boolean +expectFailure 'gitTrackedWith { recurseSubmodules = null; } ./.' 'lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it'\''s a null instead.' + +# recurseSubmodules = true is not supported on all Nix versions +if [[ "$(nix-instantiate --eval --expr "$(prefixExpression) (versionAtLeast builtins.nixVersion _fetchGitSubmodulesMinver)")" == true ]]; then + fetchGitSupportsSubmodules=1 +else + fetchGitSupportsSubmodules= + expectFailure 'gitTrackedWith { recurseSubmodules = true; } ./.' 'lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version 2.4 and after, but Nix version [0-9.]+ is used.' +fi + +# Checks that `gitTrackedWith` contains the same files as `git ls-files` +# for the current working directory. +# If --recurse-submodules is passed, the flag is passed through to `git ls-files` +# and as `recurseSubmodules` to `gitTrackedWith` +checkGitTrackedWith() { + if [[ "${1:-}" == "--recurse-submodules" ]]; then + gitLsFlags="--recurse-submodules" + gitTrackedArg="{ recurseSubmodules = true; }" + else + gitLsFlags="" + gitTrackedArg="{ }" + fi + + # All files listed by `git ls-files` + expectedFiles=() + while IFS= read -r -d $'\0' file; do + # If there are submodules but --recurse-submodules isn't passed, + # `git ls-files` lists them as empty directories, + # we need to filter that out since we only want to check/count files + if [[ -f "$file" ]]; then + expectedFiles+=("$file") + fi + done < <(git ls-files -z $gitLsFlags) + + storePath=$(expectStorePath 'toSource { root = ./.; fileset = gitTrackedWith '"$gitTrackedArg"' ./.; }') + + # Check that each expected file is also in the store path with the same content + for expectedFile in "${expectedFiles[@]}"; do + if [[ ! -e "$storePath"/"$expectedFile" ]]; then + die "Expected file $expectedFile to exist in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + if ! diff "$expectedFile" "$storePath"/"$expectedFile"; then + die "Expected file $expectedFile to have the same contents as in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + done + + # This is a cheap way to verify the inverse: That all files in the store path are also expected + # We just count the number of files in both and verify they're the same + actualFileCount=$(find "$storePath" -type f -printf . | wc -c) + if [[ "${#expectedFiles[@]}" != "$actualFileCount" ]]; then + die "Expected ${#expectedFiles[@]} files in $storePath, but got $actualFileCount.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi +} + + +# Runs checkGitTrackedWith with and without --recurse-submodules +# Allows testing both variants together +checkGitTracked() { + checkGitTrackedWith + if [[ -n "$fetchGitSupportsSubmodules" ]]; then + checkGitTrackedWith --recurse-submodules + fi +} + +createGitRepo() { + git init -q "$1" + # Only repo-local config + git -C "$1" config user.name "Nixpkgs" + git -C "$1" config user.email "nixpkgs@nixos.org" + # Get at least a HEAD commit, needed for older Nix versions + git -C "$1" commit -q --allow-empty -m "Empty commit" +} + +# Check the error message for pure eval mode +createGitRepo . +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTracked ./.; }' 'lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTrackedWith {} ./.; }' 'lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +rm -rf -- * + +# Go through all stages of Git files +# See https://www.git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository + +# Empty repository +createGitRepo . +checkGitTracked + +# Untracked file +echo a > a +checkGitTracked + +# Staged file +git add a +checkGitTracked + +# Committed file +git commit -q -m "Added a" +checkGitTracked + +# Edited file +echo b > a +checkGitTracked + +# Removed file +git rm -f -q a +checkGitTracked + +rm -rf -- * + +# gitignored file +createGitRepo . +echo a > .gitignore +touch a +git add -A +checkGitTracked + +# Add it regardless (needs -f) +git add -f a +checkGitTracked +rm -rf -- * + +# Directory +createGitRepo . +mkdir -p d1/d2/d3 +touch d1/d2/d3/a +git add d1 +checkGitTracked +rm -rf -- * + +# Submodules +createGitRepo . +createGitRepo sub + +# Untracked submodule +git -C sub commit -q --allow-empty -m "Empty commit" +checkGitTracked + +# Tracked submodule +git submodule add ./sub sub >/dev/null +checkGitTracked + +# Untracked file +echo a > sub/a +checkGitTracked + +# Staged file +git -C sub add a +checkGitTracked + +# Committed file +git -C sub commit -q -m "Add a" +checkGitTracked + +# Changed file +echo b > sub/b +checkGitTracked + +# Removed file +git -C sub rm -f -q a +checkGitTracked + +rm -rf -- * + # TODO: Once we have combinators and a property testing library, derive property tests from https://en.wikipedia.org/wiki/Algebra_of_sets echo >&2 tests ok diff --git a/third_party/nixpkgs/lib/fixed-points.nix b/third_party/nixpkgs/lib/fixed-points.nix index a63f349b71..3b5fdc9e8e 100644 --- a/third_party/nixpkgs/lib/fixed-points.nix +++ b/third_party/nixpkgs/lib/fixed-points.nix @@ -1,26 +1,76 @@ { lib, ... }: rec { /* - Compute the fixed point of the given function `f`, which is usually an - attribute set that expects its final, non-recursive representation as an - argument: + `fix f` computes the fixed point of the given function `f`. In other words, the return value is `x` in `x = f x`. - ``` - f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } + `f` must be a lazy function. + This means that `x` must be a value that can be partially evaluated, + such as an attribute set, a list, or a function. + This way, `f` can use one part of `x` to compute another part. + + **Relation to syntactic recursion** + + This section explains `fix` by refactoring from syntactic recursion to a call of `fix` instead. + + For context, Nix lets you define attributes in terms of other attributes syntactically using the [`rec { }` syntax](https://nixos.org/manual/nix/stable/language/constructs.html#recursive-sets). + + ```nix + nix-repl> rec { + foo = "foo"; + bar = "bar"; + foobar = foo + bar; + } + { bar = "bar"; foo = "foo"; foobar = "foobar"; } ``` - Nix evaluates this recursion until all references to `self` have been - resolved. At that point, the final result is returned and `f x = x` holds: + This is convenient when constructing a value to pass to a function for example, + but an equivalent effect can be achieved with the `let` binding syntax: + ```nix + nix-repl> let self = { + foo = "foo"; + bar = "bar"; + foobar = self.foo + self.bar; + }; in self + { bar = "bar"; foo = "foo"; foobar = "foobar"; } ``` + + But in general you can get more reuse out of `let` bindings by refactoring them to a function. + + ```nix + nix-repl> f = self: { + foo = "foo"; + bar = "bar"; + foobar = self.foo + self.bar; + } + ``` + + This is where `fix` comes in, it contains the syntactic recursion that's not in `f` anymore. + + ```nix + nix-repl> fix = f: + let self = f self; in self; + ``` + + By applying `fix` we get the final result. + + ```nix nix-repl> fix f { bar = "bar"; foo = "foo"; foobar = "foobar"; } ``` + Such a refactored `f` using `fix` is not useful by itself. + See [`extends`](#function-library-lib.fixedPoints.extends) for an example use case. + There `self` is also often called `final`. + Type: fix :: (a -> a) -> a - See https://en.wikipedia.org/wiki/Fixed-point_combinator for further - details. + Example: + fix (self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }) + => { bar = "bar"; foo = "foo"; foobar = "foobar"; } + + fix (self: [ 1 2 (elemAt self 0 + elemAt self 1) ]) + => [ 1 2 3 ] */ fix = f: let x = f x; in x; diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index d9555ca66c..ad6922498a 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -516,17 +516,17 @@ in mkLicense lset) ({ generaluser = { fullName = "GeneralUser GS License v2.0"; - url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources + url = "https://www.schristiancollins.com/generaluser.php"; # license included in sources }; gfl = { fullName = "GUST Font License"; - url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt"; + url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt"; }; gfsl = { fullName = "GUST Font Source License"; - url = "http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt"; + url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-SOURCE-LICENSE.txt"; }; gpl1Only = { @@ -613,7 +613,7 @@ in mkLicense lset) ({ info-zip = { spdxId = "Info-ZIP"; fullName = "Info-ZIP License"; - url = "http://www.info-zip.org/pub/infozip/license.html"; + url = "https://infozip.sourceforge.net/license.html"; }; inria-compcert = { @@ -877,6 +877,21 @@ in mkLicense lset) ({ fullName = "Non-Profit Open Software License 3.0"; }; + nvidiaCuda = { + shortName = "CUDA EULA"; + fullName = "CUDA Toolkit End User License Agreement (EULA)"; + url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement"; + free = false; + }; + + nvidiaCudaRedist = { + shortName = "CUDA EULA"; + fullName = "CUDA Toolkit End User License Agreement (EULA)"; + url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement"; + free = false; + redistributable = true; + }; + obsidian = { fullName = "Obsidian End User Agreement"; url = "https://obsidian.md/eula"; @@ -1167,7 +1182,7 @@ in mkLicense lset) ({ xfig = { fullName = "xfig"; - url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken + url = "https://mcj.sourceforge.net/authors.html#xfig"; }; zlib = { diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 3835e3ba69..15047f488f 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -821,6 +821,19 @@ rec { */ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) []; + /* Check if list contains only unique elements. O(n^2) complexity. + + Type: allUnique :: [a] -> bool + + Example: + allUnique [ 3 2 3 4 ] + => false + allUnique [ 3 2 4 1 ] + => true + */ + allUnique = list: (length (unique list) == length list); + + /* Intersects list 'e' and another list. O(nm) complexity. Example: diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix index 44730a7155..2e817c4232 100644 --- a/third_party/nixpkgs/lib/meta.nix +++ b/third_party/nixpkgs/lib/meta.nix @@ -162,5 +162,12 @@ rec { getExe' pkgs.imagemagick "convert" => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" */ - getExe' = x: y: "${lib.getBin x}/bin/${y}"; + getExe' = x: y: + assert lib.assertMsg (lib.isDerivation x) + "lib.meta.getExe': The first argument is of type ${builtins.typeOf x}, but it should be a derivation instead."; + assert lib.assertMsg (lib.isString y) + "lib.meta.getExe': The second argument is of type ${builtins.typeOf y}, but it should be a string instead."; + assert lib.assertMsg (builtins.length (lib.splitString "/" y) == 1) + "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; + "${lib.getBin x}/bin/${y}"; } diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index c42bc1e6c6..7821924873 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -109,7 +109,13 @@ rec { The package is specified in the third argument under `default` as a list of strings representing its attribute path in nixpkgs (or another package set). - Because of this, you need to pass nixpkgs itself (or a subset) as the first argument. + Because of this, you need to pass nixpkgs itself (usually `pkgs` in a module; + alternatively to nixpkgs itself, another package set) as the first argument. + + If you pass another package set you should set the `pkgsText` option. + This option is used to display the expression for the package set. It is `"pkgs"` by default. + If your expression is complex you should parenthesize it, as the `pkgsText` argument + is usually immediately followed by an attribute lookup (`.`). The second argument may be either a string or a list of strings. It provides the display name of the package in the description of the generated option @@ -118,68 +124,100 @@ rec { To include extra information in the description, pass `extraDescription` to append arbitrary text to the generated description. + You can also pass an `example` value, either a literal string or an attribute path. - The default argument can be omitted if the provided name is - an attribute of pkgs (if name is a string) or a - valid attribute path in pkgs (if name is a list). + The `default` argument can be omitted if the provided name is + an attribute of pkgs (if `name` is a string) or a valid attribute path in pkgs (if `name` is a list). + You can also set `default` to just a string in which case it is interpreted as an attribute name + (a singleton attribute path, if you will). If you wish to explicitly provide no default, pass `null` as `default`. - Type: mkPackageOption :: pkgs -> (string|[string]) -> { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> option + If you want users to be able to set no package, pass `nullable = true`. + In this mode a `default = null` will not be interpreted as no default and is interpreted literally. + + Type: mkPackageOption :: pkgs -> (string|[string]) -> { nullable? :: bool, default? :: string|[string], example? :: null|string|[string], extraDescription? :: string, pkgsText? :: string } -> option Example: mkPackageOption pkgs "hello" { } - => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; } + => { ...; default = pkgs.hello; defaultText = literalExpression "pkgs.hello"; description = "The hello package to use."; type = package; } Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } - => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } + => { ...; default = pkgs.ghc; defaultText = literalExpression "pkgs.ghc"; description = "The GHC package to use."; example = literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; type = package; } Example: - mkPackageOption pkgs [ "python39Packages" "pytorch" ] { + mkPackageOption pkgs [ "python3Packages" "pytorch" ] { extraDescription = "This is an example and doesn't actually do anything."; } - => { _type = "option"; default = «derivation /nix/store/gvqgsnc4fif9whvwd9ppa568yxbkmvk8-python3.9-pytorch-1.10.2.drv»; defaultText = { ... }; description = "The pytorch package to use. This is an example and doesn't actually do anything."; type = { ... }; } + => { ...; default = pkgs.python3Packages.pytorch; defaultText = literalExpression "pkgs.python3Packages.pytorch"; description = "The pytorch package to use. This is an example and doesn't actually do anything."; type = package; } + Example: + mkPackageOption pkgs "nushell" { + nullable = true; + } + => { ...; default = pkgs.nushell; defaultText = literalExpression "pkgs.nushell"; description = "The nushell package to use."; type = nullOr package; } + + Example: + mkPackageOption pkgs "coreutils" { + default = null; + } + => { ...; description = "The coreutils package to use."; type = package; } + + Example: + mkPackageOption pkgs "dbus" { + nullable = true; + default = null; + } + => { ...; default = null; description = "The dbus package to use."; type = nullOr package; } + + Example: + mkPackageOption pkgs.javaPackages "OpenJFX" { + default = "openjfx20"; + pkgsText = "pkgs.javaPackages"; + } + => { ...; default = pkgs.javaPackages.openjfx20; defaultText = literalExpression "pkgs.javaPackages.openjfx20"; description = "The OpenJFX package to use."; type = package; } */ mkPackageOption = - # Package set (a specific version of nixpkgs or a subset) + # Package set (an instantiation of nixpkgs such as pkgs in modules or another package set) pkgs: # Name for the package, shown in option description name: { - # Whether the package can be null, for example to disable installing a package altogether. + # Whether the package can be null, for example to disable installing a package altogether (defaults to false) nullable ? false, - # The attribute path where the default package is located (may be omitted) + # The attribute path where the default package is located (may be omitted, in which case it is copied from `name`) default ? name, # A string or an attribute path to use as an example (may be omitted) example ? null, # Additional text to include in the option description (may be omitted) extraDescription ? "", + # Representation of the package set passed as pkgs (defaults to `"pkgs"`) + pkgsText ? "pkgs" }: let name' = if isList name then last name else name; - in mkOption ({ - type = with lib.types; (if nullable then nullOr else lib.id) package; + default' = if isList default then default else [ default ]; + defaultText = concatStringsSep "." default'; + defaultValue = attrByPath default' + (throw "${defaultText} cannot be found in ${pkgsText}") pkgs; + defaults = if default != null then { + default = defaultValue; + defaultText = literalExpression ("${pkgsText}." + defaultText); + } else optionalAttrs nullable { + default = null; + }; + in mkOption (defaults // { description = "The ${name'} package to use." + (if extraDescription == "" then "" else " ") + extraDescription; - } // (if default != null then let - default' = if isList default then default else [ default ]; - defaultPath = concatStringsSep "." default'; - defaultValue = attrByPath default' - (throw "${defaultPath} cannot be found in pkgs") pkgs; - in { - default = defaultValue; - defaultText = literalExpression ("pkgs." + defaultPath); - } else if nullable then { - default = null; - } else { }) // lib.optionalAttrs (example != null) { + type = with lib.types; (if nullable then nullOr else lib.id) package; + } // optionalAttrs (example != null) { example = literalExpression - (if isList example then "pkgs." + concatStringsSep "." example else example); + (if isList example then "${pkgsText}." + concatStringsSep "." example else example); }); /* Alias of mkPackageOption. Previously used to create options with markdown diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index d7642ce10f..695aaaacd3 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -144,6 +144,20 @@ rec { */ concatLines = concatMapStrings (s: s + "\n"); + /* + Replicate a string n times, + and concatenate the parts into a new string. + + Type: replicate :: int -> string -> string + + Example: + replicate 3 "v" + => "vvv" + replicate 5 "hello" + => "hellohellohellohellohello" + */ + replicate = n: s: concatStrings (lib.lists.replicate n s); + /* Construct a Unix-style, colon-separated search path consisting of the given `subDir` appended to each of the given paths. @@ -854,7 +868,7 @@ rec { assert (lib.isBool flag); mesonOption feature (if flag then "enabled" else "disabled"); - /* Create an --{enable,disable}- string that can be passed to + /* Create an --{enable,disable}- string that can be passed to standard GNU Autoconf scripts. Example: @@ -863,11 +877,12 @@ rec { enableFeature false "shared" => "--disable-shared" */ - enableFeature = enable: feat: - assert isString feat; # e.g. passing openssl instead of "openssl" - "--${if enable then "enable" else "disable"}-${feat}"; + enableFeature = flag: feature: + assert lib.isBool flag; + assert lib.isString feature; # e.g. passing openssl instead of "openssl" + "--${if flag then "enable" else "disable"}-${feature}"; - /* Create an --{enable-=,disable-} string that can be passed to + /* Create an --{enable-=,disable-} string that can be passed to standard GNU Autoconf scripts. Example: @@ -876,9 +891,10 @@ rec { enableFeatureAs false "shared" (throw "ignored") => "--disable-shared" */ - enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}"; + enableFeatureAs = flag: feature: value: + enableFeature flag feature + optionalString flag "=${value}"; - /* Create an --{with,without}- string that can be passed to + /* Create an --{with,without}- string that can be passed to standard GNU Autoconf scripts. Example: @@ -887,11 +903,11 @@ rec { withFeature false "shared" => "--without-shared" */ - withFeature = with_: feat: - assert isString feat; # e.g. passing openssl instead of "openssl" - "--${if with_ then "with" else "without"}-${feat}"; + withFeature = flag: feature: + assert isString feature; # e.g. passing openssl instead of "openssl" + "--${if flag then "with" else "without"}-${feature}"; - /* Create an --{with-=,without-} string that can be passed to + /* Create an --{with-=,without-} string that can be passed to standard GNU Autoconf scripts. Example: @@ -900,7 +916,8 @@ rec { withFeatureAs false "shared" (throw "ignored") => "--without-shared" */ - withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}"; + withFeatureAs = flag: feature: value: + withFeature flag feature + optionalString flag "=${value}"; /* Create a fixed width string with additional prefix to match required width. diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index 2790ea08d9..ada8c66e36 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -43,6 +43,10 @@ rec { elaborate = args': let args = if lib.isString args' then { system = args'; } else args'; + + # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. + rust = assert !(args ? rust && args ? rustc); args.rust or args.rustc or {}; + final = { # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); @@ -159,9 +163,101 @@ rec { ({ linux-kernel = args.linux-kernel or {}; gcc = args.gcc or {}; - rustc = args.rustc or {}; } // platforms.select final) - linux-kernel gcc rustc; + linux-kernel gcc; + + # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs. + rustc = args.rustc or {}; + + rust = rust // { + # Once args.rustc.platform.target-family is deprecated and + # removed, there will no longer be any need to modify any + # values from args.rust.platform, so we can drop all the + # "args ? rust" etc. checks, and merge args.rust.platform in + # /after/. + platform = rust.platform or {} // { + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch + arch = + /**/ if rust ? platform then rust.platform.arch + else if final.isAarch32 then "arm" + else if final.isMips64 then "mips64" # never add "el" suffix + else if final.isPower64 then "powerpc64" # never add "le" suffix + else final.parsed.cpu.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os + os = + /**/ if rust ? platform then rust.platform.os or "none" + else if final.isDarwin then "macos" + else final.parsed.kernel.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family + target-family = + /**/ if args ? rust.platform.target-family then args.rust.platform.target-family + else if args ? rustc.platform.target-family + then + ( + # Since https://github.com/rust-lang/rust/pull/84072 + # `target-family` is a list instead of single value. + let + f = args.rustc.platform.target-family; + in + if builtins.isList f then f else [ f ] + ) + else lib.optional final.isUnix "unix" + ++ lib.optional final.isWindows "windows"; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + vendor = let + inherit (final.parsed) vendor; + in rust.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + }; + + # The name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. + rustcTarget = let + inherit (final.parsed) cpu kernel abi; + cpu_ = rust.platform.arch or { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + "armv5tel" = "armv5te"; + "riscv64" = "riscv64gc"; + }.${cpu.name} or cpu.name; + vendor_ = final.rust.platform.vendor; + in rust.config + or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + + # The name of the rust target if it is standard, or the json file + # containing the custom target spec. + rustcTargetSpec = + /**/ if rust ? platform + then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform) + else final.rust.rustcTarget; + + # The name of the rust target if it is standard, or the + # basename of the file containing the custom target spec, + # without the .json extension. + # + # This is the name used by Cargo for target subdirectories. + cargoShortTarget = + lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}"); + + # When used as part of an environment variable name, triples are + # uppercased and have all hyphens replaced by underscores: + # + # https://github.com/rust-lang/cargo/pull/9169 + # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 + cargoEnvVarTarget = + lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.toUpper final.rust.cargoShortTarget); + + # True if the target is no_std + # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 + isNoStdTarget = + builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"]; + }; linuxArch = if final.isAarch32 then "arm" diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index 0e704b7d7d..75578b9749 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -115,6 +115,7 @@ rec { }; gnu64 = { config = "x86_64-unknown-linux-gnu"; }; + gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix gnu32 = { config = "i686-unknown-linux-gnu"; }; musl64 = { config = "x86_64-unknown-linux-musl"; }; diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix index 022e459c39..073df78797 100644 --- a/third_party/nixpkgs/lib/systems/inspect.nix +++ b/third_party/nixpkgs/lib/systems/inspect.nix @@ -100,6 +100,32 @@ rec { ]; }; + # given two patterns, return a pattern which is their logical AND. + # Since a pattern is a list-of-disjuncts, this needs to + patternLogicalAnd = pat1_: pat2_: + let + # patterns can be either a list or a (bare) singleton; turn + # them into singletons for uniform handling + pat1 = lib.toList pat1_; + pat2 = lib.toList pat2_; + in + lib.concatMap (attr1: + map (attr2: + lib.recursiveUpdateUntil + (path: subattr1: subattr2: + if (builtins.intersectAttrs subattr1 subattr2) == {} || subattr1 == subattr2 + then true + else throw '' + pattern conflict at path ${toString path}: + ${builtins.toJSON subattr1} + ${builtins.toJSON subattr2} + '') + attr1 + attr2 + ) + pat2) + pat1; + matchAnyAttrs = patterns: if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns else matchAttrs patterns; diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix index 34bfd94b3c..b69ad669e1 100644 --- a/third_party/nixpkgs/lib/systems/parse.nix +++ b/third_party/nixpkgs/lib/systems/parse.nix @@ -29,6 +29,15 @@ let assert type.check value; setType type.name ({ inherit name; } // value)); + # gnu-config will ignore the portion of a triple matching the + # regex `e?abi.*$` when determining the validity of a triple. In + # other words, `i386-linuxabichickenlips` is a valid triple. + removeAbiSuffix = x: + let match = builtins.match "(.*)e?abi.*" x; + in if match==null + then x + else lib.elemAt match 0; + in rec { @@ -466,7 +475,7 @@ rec { else vendors.unknown; kernel = if hasPrefix "darwin" args.kernel then getKernel "darwin" else if hasPrefix "netbsd" args.kernel then getKernel "netbsd" - else getKernel args.kernel; + else getKernel (removeAbiSuffix args.kernel); abi = /**/ if args ? abi then getAbi args.abi else if isLinux parsed || isWindows parsed then diff --git a/third_party/nixpkgs/lib/tests/filesystem.sh b/third_party/nixpkgs/lib/tests/filesystem.sh index cfd333d000..7e7e03bc66 100755 --- a/third_party/nixpkgs/lib/tests/filesystem.sh +++ b/third_party/nixpkgs/lib/tests/filesystem.sh @@ -64,8 +64,14 @@ expectSuccess "pathType $PWD/directory" '"directory"' expectSuccess "pathType $PWD/regular" '"regular"' expectSuccess "pathType $PWD/symlink" '"symlink"' expectSuccess "pathType $PWD/fifo" '"unknown"' -# Different errors depending on whether the builtins.readFilePath primop is available or not -expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)" + +# Only check error message when a Nixpkgs-specified error is thrown, +# which is only the case when `readFileType` is not available +# and the fallback implementation needs to be used. +if [[ "$(nix-instantiate --eval --expr 'builtins ? readFileType')" == false ]]; then + expectFailure "pathType $PWD/non-existent" \ + "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'" +fi expectSuccess "pathIsDirectory /." "true" expectSuccess "pathIsDirectory $PWD/directory" "true" diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index ec306acbb7..06cb5e763e 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -20,6 +20,10 @@ let expr = (builtins.tryEval (builtins.seq expr "didn't throw")); expected = { success = false; value = false; }; }; + testingEval = expr: { + expr = (builtins.tryEval expr).success; + expected = true; + }; testingDeepThrow = expr: testingThrow (builtins.deepSeq expr expr); testSanitizeDerivationName = { name, expected }: @@ -39,6 +43,18 @@ in runTests { +# CUSTOMIZATION + + testFunctionArgsMakeOverridable = { + expr = functionArgs (makeOverridable ({ a, b, c ? null}: {})); + expected = { a = false; b = false; c = true; }; + }; + + testFunctionArgsMakeOverridableOverride = { + expr = functionArgs (makeOverridable ({ a, b, c ? null }: {}) { a = 1; b = 2; }).override; + expected = { a = false; b = false; c = true; }; + }; + # TRIVIAL testId = { @@ -175,6 +191,11 @@ runTests { expected = "a\nb\nc\n"; }; + testReplicateString = { + expr = strings.replicate 5 "hello"; + expected = "hellohellohellohellohello"; + }; + testSplitStringsSimple = { expr = strings.splitString "." "a.b.c.d"; expected = [ "a" "b" "c" "d" ]; @@ -705,6 +726,15 @@ runTests { expected = 7; }; + testAllUnique_true = { + expr = allUnique [ 3 2 4 1 ]; + expected = true; + }; + testAllUnique_false = { + expr = allUnique [ 3 2 3 4 ]; + expected = false; + }; + # ATTRSETS testConcatMapAttrs = { @@ -816,6 +846,26 @@ runTests { expected = { a = 1; b = 2; }; }; + testListAttrsReverse = let + exampleAttrs = {foo=1; bar="asdf"; baz = [1 3 3 7]; fnord=null;}; + exampleSingletonList = [{name="foo"; value=1;}]; + in { + expr = { + isReverseToListToAttrs = builtins.listToAttrs (attrsToList exampleAttrs) == exampleAttrs; + isReverseToAttrsToList = attrsToList (builtins.listToAttrs exampleSingletonList) == exampleSingletonList; + testDuplicatePruningBehaviour = attrsToList (builtins.listToAttrs [{name="a"; value=2;} {name="a"; value=1;}]); + }; + expected = { + isReverseToAttrsToList = true; + isReverseToListToAttrs = true; + testDuplicatePruningBehaviour = [{name="a"; value=2;}]; + }; + }; + + testAttrsToListsCanDealWithFunctions = testingEval ( + attrsToList { someFunc= a: a + 1;} + ); + # GENERATORS # these tests assume attributes are converted to lists # in alphabetical order @@ -1870,4 +1920,32 @@ runTests { expr = (with types; either int (listOf (either bool str))).description; expected = "signed integer or list of (boolean or string)"; }; + +# Meta + testGetExe'Output = { + expr = getExe' { + type = "derivation"; + out = "somelonghash"; + bin = "somelonghash"; + } "executable"; + expected = "somelonghash/bin/executable"; + }; + + testGetExeOutput = { + expr = getExe { + type = "derivation"; + out = "somelonghash"; + bin = "somelonghash"; + meta.mainProgram = "mainProgram"; + }; + expected = "somelonghash/bin/mainProgram"; + }; + + testGetExe'FailureFirstArg = testingThrow ( + getExe' "not a derivation" "executable" + ); + + testGetExe'FailureSecondArg = testingThrow ( + getExe' { type = "derivation"; } "dir/executable" + ); } diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 05c99e6de8..21d4978a11 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -227,8 +227,16 @@ checkConfigOutput '^false$' config.enableAlias ./alias-with-priority-can-overrid # Check mkPackageOption checkConfigOutput '^"hello"$' config.package.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.namedPackage.pname ./declare-mkPackageOption.nix +checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix +checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix +checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix +checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix +checkConfigOutput '^"hello-other"$' options.packageFromOtherSet.default.pname ./declare-mkPackageOption.nix # submoduleWith diff --git a/third_party/nixpkgs/lib/tests/modules/declare-mkPackageOption.nix b/third_party/nixpkgs/lib/tests/modules/declare-mkPackageOption.nix index 640b19a7bf..e13e68447e 100644 --- a/third_party/nixpkgs/lib/tests/modules/declare-mkPackageOption.nix +++ b/third_party/nixpkgs/lib/tests/modules/declare-mkPackageOption.nix @@ -7,6 +7,28 @@ in { options = { package = lib.mkPackageOption pkgs "hello" { }; + namedPackage = lib.mkPackageOption pkgs "Hello" { + default = [ "hello" ]; + }; + + namedPackageSingletonDefault = lib.mkPackageOption pkgs "Hello" { + default = "hello"; + }; + + pathPackage = lib.mkPackageOption pkgs [ "hello" ] { }; + + packageWithExample = lib.mkPackageOption pkgs "hello" { + example = "pkgs.hello.override { stdenv = pkgs.clangStdenv; }"; + }; + + packageWithPathExample = lib.mkPackageOption pkgs "hello" { + example = [ "hello" ]; + }; + + packageWithExtraDescription = lib.mkPackageOption pkgs "hello" { + extraDescription = "Example extra description."; + }; + undefinedPackage = lib.mkPackageOption pkgs "hello" { default = null; }; @@ -15,5 +37,17 @@ in { nullable = true; default = null; }; + + nullablePackageWithDefault = lib.mkPackageOption pkgs "hello" { + nullable = true; + }; + + packageWithPkgsText = lib.mkPackageOption pkgs "hello" { + pkgsText = "myPkgs"; + }; + + packageFromOtherSet = let myPkgs = { + hello = pkgs.hello // { pname = "hello-other"; }; + }; in lib.mkPackageOption myPkgs "hello" { }; }; } diff --git a/third_party/nixpkgs/lib/tests/release.nix b/third_party/nixpkgs/lib/tests/release.nix index c8d6b81012..6e5b071173 100644 --- a/third_party/nixpkgs/lib/tests/release.nix +++ b/third_party/nixpkgs/lib/tests/release.nix @@ -25,11 +25,13 @@ let ]; nativeBuildInputs = [ nix + pkgs.gitMinimal ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; strictDeps = true; } '' datadir="${nix}/share" export TEST_ROOT=$(pwd)/test-tmp + export HOME=$(mktemp -d) export NIX_BUILD_HOOK= export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_LOCALSTATE_DIR=$TEST_ROOT/var diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index c23fc6070b..a89c1aa25b 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -448,6 +448,40 @@ rec { isFunction = f: builtins.isFunction f || (f ? __functor && isFunction (f.__functor f)); + /* + `mirrorFunctionArgs f g` creates a new function `g'` with the same behavior as `g` (`g' x == g x`) + but its function arguments mirroring `f` (`lib.functionArgs g' == lib.functionArgs f`). + + Type: + mirrorFunctionArgs :: (a -> b) -> (a -> c) -> (a -> c) + + Example: + addab = {a, b}: a + b + addab { a = 2; b = 4; } + => 6 + lib.functionArgs addab + => { a = false; b = false; } + addab1 = attrs: addab attrs + 1 + addab1 { a = 2; b = 4; } + => 7 + lib.functionArgs addab1 + => { } + addab1' = lib.mirrorFunctionArgs addab addab1 + addab1' { a = 2; b = 4; } + => 7 + lib.functionArgs addab1' + => { a = false; b = false; } + */ + mirrorFunctionArgs = + # Function to provide the argument metadata + f: + let + fArgs = functionArgs f; + in + # Function to set the argument metadata to + g: + setFunctionArgs g fArgs; + /* Turns any non-callable values into constant functions. Returns callable values as is. diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index bfbf5aa4cc..4a75aed9a6 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -371,6 +371,15 @@ githubId = 124545; name = "Anthony Cowley"; }; + acuteenvy = { + matrix = "@acuteenvy:matrix.org"; + github = "acuteenvy"; + githubId = 126529524; + name = "Lena"; + keys = [{ + fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; + }]; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -446,6 +455,13 @@ githubId = 25236206; name = "Adrian Dole"; }; + adriangl = { + email = "adrian@lauterer.it"; + matrix = "@adriangl:pvv.ntnu.no"; + github = "adrlau"; + githubId = 25004152; + name = "Adrian Gunnar Lauterer"; + }; AdsonCicilioti = { name = "Adson Cicilioti"; email = "adson.cicilioti@live.com"; @@ -533,6 +549,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahoneybun = { + email = "aaron@system76.com"; + github = "ahoneybun"; + githubId = 4884946; + name = "Aaron Honeycutt"; + }; ahrzb = { email = "ahrzb5@gmail.com"; github = "ahrzb"; @@ -793,6 +815,12 @@ githubId = 5053729; name = "Alias Gram"; }; + alias-dev = { + email = "alias-dev@protonmail.com"; + github = "alias-dev"; + githubId = 30437811; + name = "Alex Andrews"; + }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alistairbill"; @@ -1268,6 +1296,9 @@ github = "antonmosich"; githubId = 27223336; name = "Anton Mosich"; + keys = [ { + fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; + } ]; }; antono = { email = "self@antono.info"; @@ -1377,6 +1408,12 @@ githubId = 59743220; name = "Vinícius Müller"; }; + arcuru = { + email = "patrick@jackson.dev"; + github = "arcuru"; + githubId = 160646; + name = "Patrick Jackson"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1389,6 +1426,12 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + argrat = { + email = "n.bertazzo@protonmail.com"; + github = "argrat"; + githubId = 98821629; + name = "Nicolò Bertazzo"; + }; arian-d = { email = "arianxdehghani@gmail.com"; github = "arian-d"; @@ -1756,12 +1799,6 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; - aveltras = { - email = "romain.viallard@outlook.fr"; - github = "aveltras"; - githubId = 790607; - name = "Romain Viallard"; - }; averelld = { email = "averell+nixos@rxd4.com"; github = "averelld"; @@ -2602,12 +2639,6 @@ githubId = 200617; name = "Ben Sima"; }; - bstrik = { - email = "dutchman55@gmx.com"; - github = "bstrik"; - githubId = 7716744; - name = "Berno Strik"; - }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -2760,6 +2791,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + camelpunch = { + email = "me@andrewbruce.net"; + github = "camelpunch"; + githubId = 141733; + name = "Andrew Bruce"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -3039,6 +3076,9 @@ email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; githubId = 9590981; + keys = [{ + fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; + }]; matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; @@ -3048,6 +3088,12 @@ githubId = 1689801; name = "Mikhail Chekan"; }; + chen = { + email = "i@cuichen.cc"; + github = "cu1ch3n"; + githubId = 80438676; + name = "Chen Cui"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -3661,6 +3707,12 @@ githubId = 1222362; name = "Matías Lang"; }; + criyle = { + email = "i+nixos@goj.ac"; + name = "Yang Gao"; + githubId = 6821729; + github = "criyle"; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; @@ -3671,6 +3723,15 @@ fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; + Cryolitia = { + name = "Beiyan Cryolitia"; + email = "Cryolitia@gmail.com"; + github = "Cryolitia"; + githubId = 23723294; + keys = [{ + fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; + }]; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -3695,6 +3756,12 @@ githubId = 490965; name = "Craig Swank"; }; + ctron = { + email = "ctron@dentrassi.de"; + github = "ctron"; + githubId = 202474; + name = "Jens Reimann"; + }; cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; @@ -3868,12 +3935,25 @@ githubId = 50051176; name = "Daniel Rolls"; }; + danielsidhion = { + email = "nixpkgs@sidhion.com"; + github = "DanielSidhion"; + githubId = 160084; + name = "Daniel Sidhion"; + }; daniyalsuri6 = { email = "daniyal.suri@gmail.com"; github = "daniyalsuri6"; githubId = 107034852; name = "Daniyal Suri"; }; + dannixon = { + email = "dan@dan-nixon.com"; + github = "DanNixon"; + githubId = 4037377; + name = "Dan Nixon"; + matrix = "@dannixon:matrix.org"; + }; dansbandit = { github = "dansbandit"; githubId = 4530687; @@ -3962,7 +4042,7 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "davidarmstronglewis"; + github = "oceanlewis"; githubId = 6754950; name = "David Armstrong Lewis"; }; @@ -4162,6 +4242,12 @@ githubId = 12224254; name = "Delta"; }; + delta231 = { + email = "swstkbaranwal@gmail.com"; + github = "Delta456"; + githubId = 28479139; + name = "Swastik Baranwal"; + }; deltadelta = { email = "contact@libellules.eu"; name = "Dara Ly"; @@ -4180,6 +4266,12 @@ githubId = 5503422; name = "Dmitriy Demin"; }; + demine = { + email = "riches_tweaks0o@icloud.com"; + github = "demine0"; + githubId = 51992962; + name = "Nikita Demin"; + }; demize = { email = "johannes@kyriasis.com"; github = "kyrias"; @@ -4412,6 +4504,15 @@ githubId = 14034137; name = "Mostly Void"; }; + ditsuke = { + name = "Tushar"; + email = "hello@ditsuke.com"; + github = "ditsuke"; + githubId = 72784348; + keys = [{ + fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; + }]; + }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -4489,6 +4590,12 @@ githubId = 1708810; name = "Daniel Vianna"; }; + dmytrokyrychuk = { + email = "dmytro@kyrych.uk"; + github = "dmytrokyrychuk"; + githubId = 699961; + name = "Dmytro Kyrychuk"; + }; dnr = { email = "dnr@dnr.im"; github = "dnr"; @@ -5257,6 +5364,13 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + ericthemagician = { + email = "eric@ericyen.com"; + matrix = "@eric:jupiterbroadcasting.com"; + github = "EricTheMagician"; + githubId = 323436; + name = "Eric Yen"; + }; erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; @@ -5305,6 +5419,11 @@ githubId = 1855930; name = "Ertugrul Söylemez"; }; + esau79p = { + github = "EsAu79p"; + githubId = 21313906; + name = "EsAu"; + }; esclear = { github = "esclear"; githubId = 7432848; @@ -5912,6 +6031,11 @@ githubId = 119691; name = "Michael Gough"; }; + franciscod = { + github = "franciscod"; + githubId = 726447; + name = "Francisco Demartino"; + }; franzmondlichtmann = { name = "Franz Schroepf"; email = "franz-schroepf@t-online.de"; @@ -5988,6 +6112,10 @@ github = "frogamic"; githubId = 10263813; name = "Dominic Shelton"; + matrix = "@frogamic:beeper.com"; + keys = [{ + fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; + }]; }; frontsideair = { email = "photonia@gmail.com"; @@ -6054,7 +6182,7 @@ }; fugi = { email = "me@fugi.dev"; - github = "FugiMuffi"; + github = "fugidev"; githubId = 21362942; name = "Fugi"; }; @@ -6163,6 +6291,16 @@ githubId = 45048741; name = "Alwanga Oyango"; }; + galaxy = { + email = "galaxy@dmc.chat"; + matrix = "@galaxy:mozilla.org"; + name = "The Galaxy"; + github = "ga1aksy"; + githubId = 148551648; + keys = [{ + fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; + }]; + }; gal_bolle = { email = "florent.becker@ens-lyon.org"; github = "FlorentBecker"; @@ -6306,6 +6444,16 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + gepbird = { + email = "gutyina.gergo.2@gmail.com"; + github = "gepbird"; + githubId = 29818440; + name = "Gutyina Gergő"; + keys = [ + { fingerprint = "RoAfvqa6w1l8Vdm3W60TDXurYwJ6h03VEGD+wDNGEwc"; } + { fingerprint = "MP2UpIRtJpbFFqyucP431H/FPCfn58UhEUTro4lXtRs"; } + ]; + }; gerg-l = { email = "gregleyda@proton.me"; github = "Gerg-L"; @@ -6401,6 +6549,12 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giomf = { + email = "giomf@mailbox.org"; + github = "giomf"; + githubId = 35076723; + name = "Guillaume Fournier"; + }; giorgiga = { email = "giorgio.gallo@bitnic.it"; github = "giorgiga"; @@ -6458,6 +6612,10 @@ githubId = 1447245; name = "Robin Gloster"; }; + gm6k = { + email = "nix@quidecco.pl"; + name = "Isidor Zeuner"; + }; gmemstr = { email = "git@gmem.ca"; github = "gmemstr"; @@ -6581,6 +6739,12 @@ githubId = 4656860; name = "Gaute Ravndal"; }; + gray-heron = { + email = "ave+nix@cezar.info"; + github = "gray-heron"; + githubId = 7032646; + name = "Cezary Siwek"; + }; graysonhead = { email = "grayson@graysonhead.net"; github = "graysonhead"; @@ -7176,6 +7340,13 @@ fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; }]; }; + hubble = { + name = "Hubble the Wolverine"; + email = "hubblethewolverine@gmail.com"; + matrix = "@hubofeverything:bark.lgbt"; + github = "the-furry-hubofeverything"; + githubId = 53921912; + }; hufman = { email = "hufman@gmail.com"; github = "hufman"; @@ -7346,6 +7517,13 @@ githubId = 1550265; name = "Dominic Steinitz"; }; + iFreilicht = { + github = "iFreilicht"; + githubId = 9742635; + matrix = "@ifreilicht:matrix.org"; + email = "nixpkgs@mail.felix-uhl.de"; + name = "Felix Uhl"; + }; ifurther = { github = "ifurther"; githubId = 55025025; @@ -7375,6 +7553,12 @@ githubId = 25505957; name = "Ilian"; }; + iliayar = { + email = "iliayar3@gmail.com"; + github = "iliayar"; + githubId = 17529355; + name = "Ilya Yaroshevskiy"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -7543,6 +7727,12 @@ githubId = 88038050; name = "Souvik Sen"; }; + iogamaster = { + email = "iogamastercode+nixpkgs@gmail.com"; + name = "IogaMaster"; + github = "iogamaster"; + githubId = 67164465; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; @@ -7787,6 +7977,12 @@ githubId = 2212681; name = "Jakub Grzgorz Sokołowski"; }; + jakuzure = { + email = "shin@posteo.jp"; + github = "jakuzure"; + githubId = 11823547; + name = "jakuzure"; + }; jali-clarke = { email = "jinnah.ali-clarke@outlook.com"; name = "Jinnah Ali-Clarke"; @@ -7847,6 +8043,12 @@ githubId = 488556; name = "Javier Aguirre"; }; + javimerino = { + email = "merino.jav@gmail.com"; + name = "Javi Merino"; + github = "JaviMerino"; + githubId = 44926; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; @@ -8106,6 +8308,15 @@ githubId = 18501; name = "Julien Langlois"; }; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; @@ -8164,6 +8375,12 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jgoux = { + email = "hi@jgoux.dev"; + github = "jgoux"; + githubId = 1443499; + name = "Julien Goux"; + }; jhh = { email = "jeff@j3ff.io"; github = "jhh"; @@ -8237,6 +8454,12 @@ githubId = 3081095; name = "Jürgen Keck"; }; + jl178 = { + email = "jeredlittle1996@gmail.com"; + github = "jl178"; + githubId = 72664723; + name = "Jered Little"; + }; jlamur = { email = "contact@juleslamur.fr"; github = "jlamur"; @@ -8750,6 +8973,12 @@ githubId = 1189739; name = "Julio Borja Barra"; }; + jue89 = { + email = "me@jue.yt"; + github = "jue89"; + githubId = 6105784; + name = "Juergen Fitschen"; + }; jugendhacker = { name = "j.r"; email = "j.r@jugendhacker.de"; @@ -8894,6 +9123,15 @@ githubId = 386765; matrix = "@k900:0upti.me"; }; + kachick = { + email = "kachick1@gmail.com"; + github = "kachick"; + githubId = 1180335; + name = "Kenichi Kamiya"; + keys = [{ + fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; + }]; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -9670,6 +9908,11 @@ }]; name = "Joseph LaFreniere"; }; + lagoja = { + github = "Lagoja"; + githubId =750845; + name = "John Lago"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -9981,6 +10224,17 @@ githubId = 3696783; name = "Leroy Hopson"; }; + liketechnik = { + name = "Florian Warzecha"; + + email = "liketechnik@disroot.org"; + github = "liketechnik"; + githubId = 24209689; + + keys = [{ + fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; + }]; + }; lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332"; @@ -10310,6 +10564,12 @@ githubId = 2487922; name = "Lars Jellema"; }; + ludat = { + email = "lucas6246@gmail.com"; + github = "ludat"; + githubId = 4952044; + name = "Lucas David Traverso"; + }; ludo = { email = "ludo@gnu.org"; github = "civodul"; @@ -10844,6 +11104,12 @@ githubId = 29855073; name = "Michael Colicchia"; }; + massimogengarelli = { + email = "massimo.gengarelli@gmail.com"; + github = "massix"; + githubId = 585424; + name = "Massimo Gengarelli"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -10965,6 +11231,12 @@ githubId = 11810057; name = "Matt Snider"; }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -11019,12 +11291,6 @@ githubId = 4708337; name = "Marcelo A. de L. Santos"; }; - maxhille = { - email = "mh@lambdasoup.com"; - github = "maxhille"; - githubId = 693447; - name = "Max Hille"; - }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; @@ -11482,6 +11748,12 @@ githubId = 34864484; name = "Mikael Fangel"; }; + mikecm = { + email = "mikecmcleod@gmail.com"; + github = "MaxwellDupre"; + githubId = 14096356; + name = "Michael McLeod"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -11594,6 +11866,13 @@ githubId = 149558; name = "Merlin Gaillard"; }; + mirkolenz = { + name = "Mirko Lenz"; + email = "mirko@mirkolenz.com"; + matrix = "@mlenz:matrix.org"; + github = "mirkolenz"; + githubId = 5160954; + }; mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; @@ -11961,12 +12240,30 @@ github = "MrTarantoga"; githubId = 53876219; }; + mrtnvgr = { + name = "Egor Martynov"; + github = "mrtnvgr"; + githubId = 48406064; + keys = [{ + fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; + }]; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; githubId = 839693; name = "Ingolf Wanger"; }; + msanft = { + email = "moritz.sanft@outlook.de"; + matrix = "@msanft:matrix.org"; + name = "Moritz Sanft"; + github = "msanft"; + githubId = 58110325; + keys = [{ + fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; + }]; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -12197,6 +12494,11 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + nadir-ishiguro = { + github = "nadir-ishiguro"; + githubId = 23151917; + name = "nadir-ishiguro"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "Nadrieril"; @@ -12240,6 +12542,11 @@ githubId = 6709831; name = "Jake Hill"; }; + nasageek = { + github = "NasaGeek"; + githubId = 474937; + name = "Chris Roberts"; + }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; @@ -12630,13 +12937,6 @@ fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; - ninjatrappeur = { - email = "felix@alternativebit.fr"; - matrix = "@ninjatrappeur:matrix.org"; - github = "NinjaTrappeur"; - githubId = 1219785; - name = "Félix Baylac-Jacqué"; - }; nintron = { email = "nintron@sent.com"; github = "Nintron27"; @@ -12676,6 +12976,11 @@ githubId = 66913205; name = "Rick Sanchez"; }; + nix-julia = { + name = "nix-julia"; + github = "nix-julia"; + githubId = 149073815; + }; nixy = { email = "nixy@nixy.moe"; github = "nixy"; @@ -12835,6 +13140,12 @@ githubId = 9939720; name = "Philippe Nguyen"; }; + npulidomateo = { + matrix = "@npulidomateo:matrix.org"; + github = "npulidomateo"; + githubId = 13149442; + name = "Nico Pulido-Mateo"; + }; nrdxp = { email = "tim.deh@pm.me"; matrix = "@timdeh:matrix.org"; @@ -13173,6 +13484,15 @@ githubId = 75299; name = "Malcolm Matalka"; }; + orhun = { + email = "orhunparmaksiz@gmail.com"; + github = "orhun"; + githubId = 24392180; + name = "Orhun Parmaksız"; + keys = [{ + fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; + }]; + }; orichter = { email = "richter-oliver@gmx.net"; github = "ORichterSec"; @@ -13417,12 +13737,6 @@ githubId = 6931743; name = "pasqui23"; }; - patricksjackson = { - email = "patrick@jackson.dev"; - github = "patricksjackson"; - githubId = 160646; - name = "Patrick Jackson"; - }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; @@ -13444,6 +13758,11 @@ githubId = 15645854; name = "Brad Christensen"; }; + paumr = { + github = "paumr"; + name = "Michael Bergmeister"; + githubId = 53442728; + }; paveloom = { email = "paveloom@riseup.net"; github = "paveloom"; @@ -13505,6 +13824,7 @@ pbsds = { name = "Peder Bergebakken Sundt"; email = "pbsds@hotmail.com"; + matrix = "@pederbs:pvv.ntnu.no"; github = "pbsds"; githubId = 140964; }; @@ -13556,6 +13876,12 @@ githubId = 152312; name = "Periklis Tsirakidis"; }; + perstark = { + email = "perstark.se@gmail.com"; + github = "perstarkse"; + githubId = 63069986; + name = "Per Stark"; + }; petercommand = { email = "petercommand@gmail.com"; github = "petercommand"; @@ -13673,6 +13999,12 @@ githubId = 9267430; name = "Philipp Mildenberger"; }; + philiptaron = { + email = "philip.taron@gmail.com"; + github = "philiptaron"; + githubId = 43863; + name = "Philip Taron"; + }; phip1611 = { email = "phip1611@gmail.com"; github = "phip1611"; @@ -13709,6 +14041,13 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + picnoir = { + email = "felix@alternativebit.fr"; + matrix = "@picnoir:alternativebit.fr"; + github = "picnoir"; + githubId = 1219785; + name = "Félix Baylac-Jacqué"; + }; piegames = { name = "piegames"; email = "nix@piegames.de"; @@ -13824,6 +14163,12 @@ githubId = 610615; name = "Chih-Mao Chen"; }; + pks = { + email = "ps@pks.im"; + github = "pks-t"; + githubId = 4056630; + name = "Patrick Steinhardt"; + }; plabadens = { name = "Pierre Labadens"; email = "labadens.pierre+nixpkgs@gmail.com"; @@ -13860,12 +14205,25 @@ githubId = 7839004; name = "Dmitriy Pleshevskiy"; }; + pluiedev = { + email = "hi@pluie.me"; + github = "pluiedev"; + githubId = 22406910; + name = "Leah Amelia Chen"; + }; plumps = { email = "maks.bronsky@web.de"; github = "plumps"; githubId = 13000278; name = "Maksim Bronsky"; }; + plusgut = { + name = "Carlo Jeske"; + email = "carlo.jeske+nixpkgs@webentwickler2-0.de"; + github = "plusgut"; + githubId = 277935; + matrix = "@plusgut5:matrix.org"; + }; PlushBeaver = { name = "Dmitry Kozlyuk"; email = "dmitry.kozliuk+nixpkgs@gmail.com"; @@ -14143,6 +14501,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + prominentretail = { + email = "me@jakepark.me"; + github = "ProminentRetail"; + githubId = 94048404; + name = "Jake Park"; + }; proofconstruction = { email = "source@proof.construction"; github = "proofconstruction"; @@ -14352,7 +14716,7 @@ }; quantenzitrone = { email = "quantenzitrone@protonmail.com"; - github = "Quantenzitrone"; + github = "quantenzitrone"; githubId = 74491719; matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; @@ -14384,6 +14748,12 @@ githubId = 1332289; name = "Quentin Machu"; }; + quinn-dougherty = { + email = "quinnd@riseup.net"; + github = "quinn-dougherty"; + githubId = 39039420; + name = "Quinn Dougherty"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -14540,6 +14910,12 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.com"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "freeman42x"; @@ -14714,6 +15090,12 @@ githubId = 165283; name = "Alexey Kutepov"; }; + rexxDigital = { + email = "joellarssonpriv@gmail.com"; + github = "rexxDigital"; + githubId = 44014925; + name = "Rexx Larsson"; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; @@ -14786,6 +15168,12 @@ githubId = 42619; name = "Wei-Ming Yang"; }; + rickvanprim = { + email = "me@rickvanprim.com"; + github = "rickvanprim"; + githubId = 13792812; + name = "James Leitch"; + }; rickynils = { email = "rickynils@gmail.com"; github = "rickynils"; @@ -15106,15 +15494,6 @@ }]; name = "Rahul Butani"; }; - rs0vere = { - email = "rs0vere@proton.me"; - github = "rs0vere"; - githubId = 140035635; - keys = [{ - fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D"; - }]; - name = "Red Star Over Earth"; - }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -15139,6 +15518,12 @@ githubId = 47790121; name = "Ryan Burns"; }; + rtimush = { + email = "rtimush@gmail.com"; + github = "rtimush"; + githubId = 831307; + name = "Roman Timushev"; + }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; @@ -15255,6 +15640,12 @@ fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; }]; }; + ryangibb = { + email = "ryan@freumh.org"; + github = "ryangibb"; + githubId = 22669046; + name = "Ryan Gibb"; + }; ryanorendorff = { github = "ryanorendorff"; githubId = 12442942; @@ -15370,7 +15761,7 @@ }; SamirTalwar = { email = "lazy.git@functional.computer"; - github = "SamirTalwar"; + github = "abstracte"; githubId = 47852; name = "Samir Talwar"; }; @@ -15524,6 +15915,12 @@ githubId = 3958212; name = "Tom Sorlie"; }; + schinmai-akamai = { + email = "schinmai@akamai.com"; + github = "schinmai-akamai"; + githubId = 70169773; + name = "Tarun Chinmai Sekar"; + }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; @@ -15937,6 +16334,12 @@ fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; }]; }; + shivaraj-bh = { + email = "sbh69840@gmail.com"; + name = "Shivaraj B H"; + github = "shivaraj-bh"; + githubId = 23645788; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -16155,11 +16558,10 @@ githubId = 158321; name = "Stewart Mackenzie"; }; - skeidel = { - email = "svenkeidel@gmail.com"; - github = "svenkeidel"; - githubId = 266500; - name = "Sven Keidel"; + skovati = { + github = "skovati"; + githubId = 49844593; + name = "skovati"; }; skykanin = { github = "skykanin"; @@ -16281,6 +16683,16 @@ github = "SnO2WMaN"; githubId = 15155608; }; + snowflake = { + email = "snowflake@pissmail.com"; + name = "Snowflake"; + github = "snf1k"; + githubId = 149651684; + matrix = "@snowflake:mozilla.org"; + keys = [{ + fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; + }]; + }; snpschaaf = { email = "philipe.schaaf@secunet.com"; name = "Philippe Schaaf"; @@ -16320,6 +16732,16 @@ fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; }]; }; + soispha = { + name = "Soispha"; + email = "soispha@vhack.eu"; + matrix = "@soispha:vhack.eu"; + github = "soispha"; + githubId = 132207423; + keys = [{ + fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -16384,6 +16806,11 @@ fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; }]; }; + spacefault = { + github = "spacefault"; + githubId = 74156492; + name = "spacefault"; + }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -16897,6 +17324,12 @@ githubId = 7075751; name = "Patrick Hilhorst"; }; + sysedwinistrator = { + email = "edwin.mowen@gmail.com"; + github = "sysedwinistrator"; + githubId = 71331875; + name = "Edwin Mackenzie-Owen"; + }; szczyp = { email = "qb@szczyp.com"; github = "Szczyp"; @@ -17022,6 +17455,12 @@ githubId = 1901799; name = "Nathan van Doorn"; }; + taranarmo = { + email = "taranarmo@gmail.com"; + github = "taranarmo"; + githubId = 11619234; + name = "Sergey Volkov"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; @@ -17664,6 +18103,12 @@ githubId = 858790; name = "Tobias Mayer"; }; + tochiaha = { + email = "tochiahan@proton.me"; + github = "Tochiaha"; + githubId = 74688871; + name = "Tochukwu Ahanonu"; + }; tokudan = { email = "git@danielfrank.net"; github = "tokudan"; @@ -17709,6 +18154,10 @@ githubId = 13155277; name = "Tom Houle"; }; + tomkoid = { + email = "tomaszierl@outlook.com"; + name = "Tomkoid"; + }; tomodachi94 = { email = "tomodachi94+nixpkgs@protonmail.com"; matrix = "@tomodachi94:matrix.org"; @@ -17779,12 +18228,6 @@ githubId = 10110; name = "Travis B. Hartwell"; }; - travisdavis-ops = { - email = "travisdavismedia@gmail.com"; - github = "TravisDavis-ops"; - githubId = 52011418; - name = "Travis Davis"; - }; traxys = { email = "quentin+dev@familleboyer.net"; github = "traxys"; @@ -17870,6 +18313,12 @@ githubId = 15064765; name = "tshaynik"; }; + tsowell = { + email = "tom@ldtlb.com"; + github = "tsowell"; + githubId = 4044033; + name = "Thomas Sowell"; + }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; @@ -17994,6 +18443,12 @@ githubId = 1983821; name = "Eric Wolf"; }; + u2x1 = { + email = "u2x1@outlook.com"; + github = "u2x1"; + githubId = 30677291; + name = "u2x1"; + }; uakci = { name = "uakci"; email = "uakci@uakci.pl"; @@ -18012,6 +18467,16 @@ githubId = 1607770; name = "Ulrik Strid"; }; + unclamped = { + name = "Maru"; + email = "clear6860@tutanota.com"; + matrix = "@unhidden0174:matrix.org"; + github = "unclamped"; + githubId = 104658278; + keys = [{ + fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; + }]; + }; unclechu = { name = "Viacheslav Lotsmanov"; email = "lotsmanov89@gmail.com"; @@ -18303,6 +18768,15 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + vgskye = { + name = "Skye Green"; + email = "me@skye.vg"; + github = "vgskye"; + githubId = 116078858; + keys = [{ + fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; + }]; + }; victormeriqui = { name = "Victor Meriqui"; email = "victor.meriqui@ororatech.com"; @@ -18469,6 +18943,12 @@ githubId = 7038383; name = "Vojta Káně"; }; + volfyd = { + email = "lb.nix@lisbethmail.com"; + github = "volfyd"; + githubId = 3578382; + name = "Leif Huhn"; + }; volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm"; @@ -18574,6 +19054,13 @@ fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; }]; }; + wamirez = { + email = "wamirez@protonmail.com"; + matrix = "@wamirez:matrix.org"; + github = "wamirez"; + githubId = 24505474; + name = "Daniel Ramirez"; + }; wamserma = { name = "Markus S. Wamser"; email = "github-dev@mail2013.wamser.eu"; @@ -18689,6 +19176,12 @@ fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; }]; }; + whiteley = { + email = "mattwhiteley@gmail.com"; + github = "whiteley"; + githubId = 2215; + name = "Matt Whiteley"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -18802,11 +19295,11 @@ githubId = 168610; name = "Ricardo M. Correia"; }; - wjlroe = { - email = "willroe@gmail.com"; - github = "wjlroe"; - githubId = 43315; - name = "William Roe"; + wladmis = { + email = "dev@wladmis.org"; + github = "wladmis"; + githubId = 5000261; + name = "Wladmis"; }; wldhx = { email = "wldhx+nixpkgs@wldhx.me"; @@ -18986,11 +19479,11 @@ name = "Uli Baum"; }; xfix = { - email = "konrad@borowski.pw"; + email = "kamila@borowska.pw"; matrix = "@xfix:matrix.org"; github = "xfix"; githubId = 1297598; - name = "Konrad Borowski"; + name = "Kamila Borowska"; }; xfnw = { email = "xfnw+nixos@riseup.net"; @@ -19092,6 +19585,12 @@ github = "yanganto"; githubId = 10803111; }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -19136,6 +19635,13 @@ fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; }]; }; + YellowOnion = { + name = "Daniel Hill"; + email = "daniel@gluo.nz"; + github = "YellowOnion"; + githubId = 364160; + matrix = "@woobilicious:matrix.org"; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -19197,6 +19703,11 @@ github = "ymeister"; githubId = 47071325; }; + ymstnt = { + name = "YMSTNT"; + github = "ymstnt"; + githubId = 21342713; + }; yoavlavi = { email = "yoav@yoavlavi.com"; github = "yoav-lavi"; @@ -19229,6 +19740,13 @@ github = "YorikSar"; githubId = 428074; }; + YoshiRulz = { + name = "YoshiRulz"; + email = "OSSYoshiRulz+Nixpkgs@gmail.com"; + matrix = "@YoshiRulz:matrix.org"; + github = "YoshiRulz"; + githubId = 13409956; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; @@ -19269,6 +19787,12 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yunfachi = { + email = "yunfachi@gmail.com"; + github = "yunfachi"; + githubId = 73419713; + name = "Yunfachi"; + }; yureien = { email = "contact@sohamsen.me"; github = "Yureien"; @@ -19509,6 +20033,12 @@ github = "zmitchell"; githubId = 10246891; }; + znaniye = { + email = "zn4niye@proton.me"; + github = "znaniye"; + githubId = 134703788; + name = "Samuel Silva"; + }; znewman01 = { email = "znewman01@gmail.com"; github = "znewman01"; diff --git a/third_party/nixpkgs/maintainers/scripts/fix-maintainers.pl b/third_party/nixpkgs/maintainers/scripts/fix-maintainers.pl index a83df9ec0c..c953cff5cc 100755 --- a/third_party/nixpkgs/maintainers/scripts/fix-maintainers.pl +++ b/third_party/nixpkgs/maintainers/scripts/fix-maintainers.pl @@ -13,12 +13,15 @@ STDOUT->autoflush(1); my $ua = LWP::UserAgent->new(); +if (!defined $ENV{GH_TOKEN}) { + die "Set GH_TOKEN before running this script"; +} + keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; if (!defined $current_user) { print "$k has no github handle\n"; - next; } my $github_id = %$v{'githubId'}; if (!defined $github_id) { @@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) { sleep($ratelimit_reset - time() + 5); } if ($resp->code != 200) { - print $current_user . " likely deleted their github account\n"; + print "$k likely deleted their github account\n"; next; } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if (lc($current_user) ne lc($api_user)) { - print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + if (!defined $current_user) { + print "$k is known on github as $api_user.\n"; + } + elsif (lc($current_user) ne lc($api_user)) { + print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; $data =~ s/github = "$current_user";$/github = "$api_user";/m; diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 5573e5e5af..2ce3ecb2ae 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) getEvalBuilds NoHydraSlownessWorkaround id = - hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"] + hydraJSONQuery mempty ["eval", showT id, "builds"] getEvalBuilds HydraSlownessWorkaround id = do Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] forM builds $ \buildId -> do @@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do hydraJSONQuery mempty [ "build", showT buildId ] hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) -hydraQuery responseType option query = - responseBody - <$> req - GET - (foldl' (/:) (https "hydra.nixos.org") query) - NoReqBody - responseType - (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option) +hydraQuery responseType option query = do + let customHeaderOpt = + header + "User-Agent" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes + opts = customHeaderOpt <> customTimeoutOpt <> option + url = foldl' (/:) (https "hydra.nixos.org") query + responseBody <$> req GET url NoReqBody responseType opts hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a hydraJSONQuery = hydraQuery jsonResponse diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 86fecbc3d8..9130941a53 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -39,5 +39,5 @@ fi package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") -curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv echo diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 3ce3f3d734..78cfca24d9 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -12,8 +12,7 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 fifo,,,,,, @@ -24,7 +23,7 @@ http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -34,14 +33,13 @@ loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, lpeglabel,,,,1.6.0,, -lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -50,6 +48,7 @@ lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, lua-resty-openssl,,,,,, lua-resty-session,,,,,, +lua-rtoml,https://github.com/lblasc/lua-rtoml,,,,,lblasc lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, @@ -72,6 +71,7 @@ lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, +luarocks-build-rust-mlua,,,,,,mrcjkb luasec,,,,,,flosse luasocket,,,,,, luasql-sqlite3,,,,,,vyp @@ -82,32 +82,36 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc -magick,,,,,,donovanglover +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, +rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, telescope-manix,,,,,, tl,,,,,,mephistophiles +toml,,,,,,mrcjkb +toml-edit,,,,,5.1,mrcjkb vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py index 18b354f0be..cc0f4ef742 100644 --- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -26,7 +26,7 @@ import urllib.parse import urllib.request import xml.etree.ElementTree as ET from dataclasses import asdict, dataclass -from datetime import datetime +from datetime import UTC, datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path @@ -327,7 +327,6 @@ def run_nix_expr(expr, nixpkgs: str): :param expr nix expression to fetch current plugins :param nixpkgs Path towards a nixpkgs checkout ''' - # local_pkgs = str(Path(__file__).parent.parent.parent) with CleanEnvironment(nixpkgs) as nix_path: cmd = [ "nix", @@ -341,8 +340,8 @@ def run_nix_expr(expr, nixpkgs: str): "--nix-path", nix_path, ] - log.debug("Running command %s", " ".join(cmd)) - out = subprocess.check_output(cmd) + log.debug("Running command: %s", " ".join(cmd)) + out = subprocess.check_output(cmd, timeout=90) data = json.loads(out) return data @@ -469,6 +468,7 @@ class Editor: "--input-names", "-i", dest="input_file", + type=Path, default=self.default_in, help="A list of plugins in the form owner/repo", ) @@ -477,6 +477,7 @@ class Editor: "-o", dest="outfile", default=self.default_out, + type=Path, help="Filename to save generated nix code", ) common.add_argument( @@ -572,7 +573,6 @@ class CleanEnvironment(object): self.empty_config = NamedTemporaryFile() self.empty_config.write(b"{}") self.empty_config.flush() - # os.environ["NIXPKGS_CONFIG"] = self.empty_config.name return f"localpkgs={self.local_pkgs}" def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: @@ -788,8 +788,16 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) + try: + repo = git.Repo(os.getcwd()) + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') + print(args.outfile) + commit(repo, + f"{editor.attr_path}: update on {updated}", [args.outfile] + ) + except git.InvalidGitRepositoryError as e: + print(f"Not in a git repository: {e}", file=sys.stderr) + sys.exit(1) if redirects: update() diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix b/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix deleted file mode 100644 index 346b0319b0..0000000000 --- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ nixpkgs ? import ../.. { } -}: -with nixpkgs; -let - pyEnv = python3.withPackages(ps: [ ps.gitpython ]); -in -mkShell { - packages = [ - pyEnv - luarocks-nix - nix-prefetch-scripts - ]; -} diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 6b90ce3058..3ad43f2a34 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -324,12 +324,16 @@ with lib.maintainers; { geospatial = { members = [ imincik - sikmir nh2 + sikmir willcohen ]; + githubTeams = [ + "geospatial" + ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; + enableFeatureFreezePing = true; }; gitlab = { @@ -350,6 +354,7 @@ with lib.maintainers; { mic92 zowoq qbit + mfrw ]; githubTeams = [ "golang" @@ -406,7 +411,6 @@ with lib.maintainers; { home-assistant = { members = [ fab - globin hexa mic92 ]; @@ -430,6 +434,7 @@ with lib.maintainers; { members = [ cleeyv ryantm + lassulus ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; @@ -439,6 +444,7 @@ with lib.maintainers; { members = [ GaetanLepage natsukium + thomasjm ]; scope = "Maintain Jupyter and related packages."; shortName = "Jupyter"; @@ -611,6 +617,7 @@ with lib.maintainers; { minimal-bootstrap = { members = [ + alejandrosame artturin emilytrau ericson2314 @@ -682,6 +689,18 @@ with lib.maintainers; { shortName = "Numtide team"; }; + ocaml = { + members = [ + alizter + ]; + githubTeams = [ + "ocaml" + ]; + scope = "Maintain the OCaml compiler and package set."; + shortName = "OCaml"; + enableFeatureFreezePing = true; + }; + openstack = { members = [ SuperSandro2000 @@ -728,7 +747,6 @@ with lib.maintainers; { aanderse drupol etu - globin ma27 talyz ]; @@ -919,7 +937,6 @@ with lib.maintainers; { wdz = { members = [ n0emis - netali vidister johannwagner yuka diff --git a/third_party/nixpkgs/nixos/README.md b/third_party/nixpkgs/nixos/README.md index b3cd9d234f..07e82bf0ad 100644 --- a/third_party/nixpkgs/nixos/README.md +++ b/third_party/nixpkgs/nixos/README.md @@ -8,6 +8,27 @@ https://nixos.org/nixos and in the manual in doc/manual. You can add new module to your NixOS configuration file (usually it’s `/etc/nixos/configuration.nix`). And do `sudo nixos-rebuild test -I nixpkgs= --fast`. +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + nixos/(module): (init module | add setting | refactor | etc) + + (Motivation for change. Link to release notes. Additional information.) + ``` + + Examples: + + * nixos/hydra: add bazBaz option + + Dual baz behavior is needed to do foo. + * nixos/nginx: refactor config generation + + The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). + ## Reviewing contributions When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people’s installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from \@edolstra. @@ -21,12 +42,14 @@ Reviewing process: - Ensure that the module maintainers are notified. - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. - Ensure that the module tests, if any, are succeeding. + - You may invoke OfBorg with `@ofborg test ` to build `nixosTests.` - Ensure that the introduced options are correct. - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). - Description, default and example should be provided. - Ensure that option changes are backward compatible. - - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible. -- Ensure that removed options are declared with `mkRemovedOptionModule` + - `mkRenamedOptionModuleWith` provides a way to make renamed option backward compatible. + - Use `lib.versionAtLeast config.system.stateVersion "23.11"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups. +- Ensure that removed options are declared with `mkRemovedOptionModule`. - Ensure that changes that are not backward compatible are mentioned in release notes. - Ensure that documentations affected by the change is updated. @@ -55,6 +78,7 @@ New modules submissions introduce a new module to NixOS. Reviewing process: +- Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation). - Ensure that the module tests, if any, are succeeding. - Ensure that the introduced options are correct. - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated). @@ -76,9 +100,9 @@ Sample template for a new module review is provided below. - [ ] options have default - [ ] options have example - [ ] options have descriptions -- [ ] No unneeded package is added to environment.systemPackages -- [ ] meta.maintainers is set -- [ ] module documentation is declared in meta.doc +- [ ] No unneeded package is added to `environment.systemPackages` +- [ ] `meta.maintainers` is set +- [ ] module documentation is declared in `meta.doc` ##### Possible improvements diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md index 02eaa56192..480e250da8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/declarative-packages.section.md @@ -37,7 +37,7 @@ Note: the `nixos` prefix tells us that we want to get the package from the `nixos` channel and works only in CLI tools. In declarative configuration use `pkgs` prefix (variable). -To "uninstall" a package, simply remove it from +To "uninstall" a package, remove it from [](#opt-environment.systemPackages) and run `nixos-rebuild switch`. ```{=include=} sections diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md index 40878b5da4..dfccdf291b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -26,7 +26,7 @@ directory which is scanned by the ICL loader for ICD files. For example: ```ShellSession $ export \ - OCL_ICD_VENDORS=`nix-build '' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ + OCL_ICD_VENDORS=`nix-build '' --no-out-link -A rocmPackages.clr.icd`/etc/OpenCL/vendors/ ``` The second mechanism is to add the OpenCL driver package to @@ -50,13 +50,13 @@ Platform Vendor Advanced Micro Devices, Inc. Modern AMD [Graphics Core Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are -supported through the rocm-opencl-icd package. Adding this package to +supported through the rocmPackages.clr.icd package. Adding this package to [](#opt-hardware.opengl.extraPackages) enables OpenCL support: ```nix hardware.opengl.extraPackages = [ - rocm-opencl-icd + rocmPackages.clr.icd ]; ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md index 2eff153879..f4a566d669 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/modularity.section.md @@ -36,8 +36,8 @@ Here, we include two modules from the same directory, `vpn.nix` and Note that both `configuration.nix` and `kde.nix` define the option [](#opt-environment.systemPackages). When multiple modules define an option, NixOS will try to *merge* the definitions. In the case of -[](#opt-environment.systemPackages), that's easy: the lists of -packages can simply be concatenated. The value in `configuration.nix` is +[](#opt-environment.systemPackages) the lists of packages will be +concatenated. The value in `configuration.nix` is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use `mkBefore`: diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md index 84f9c27033..ff870f5c40 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/subversion.chapter.md @@ -2,7 +2,7 @@ [Subversion](https://subversion.apache.org/) is a centralized version-control system. It can use a [variety of -protocols](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) +protocols](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) for communication between client and server. ## Subversion inside Apache HTTP {#module-services-subversion-apache-httpd} @@ -14,7 +14,7 @@ for communication. For more information on the general setup, please refer to the [the appropriate section of the Subversion -book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). +book](https://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). To configure, include in `/etc/nixos/configuration.nix` code to activate Apache HTTP, setting [](#opt-services.httpd.adminAddr) diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md index bef35f4488..0451e4d252 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.chapter.md @@ -45,8 +45,8 @@ services.xserver.displayManager.gdm.enable = true; You can set the keyboard layout (and optionally the layout variant): ```nix -services.xserver.layout = "de"; -services.xserver.xkbVariant = "neo"; +services.xserver.xkb.layout = "de"; +services.xserver.xkb.variant = "neo"; ``` The X server is started automatically at boot time. If you don't want @@ -208,7 +208,7 @@ qt.style = "gtk2"; It is possible to install custom [ XKB ](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts -using the option `services.xserver.extraLayouts`. +using the option `services.xserver.xkb.extraLayouts`. As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by @@ -235,7 +235,7 @@ xkb_symbols "us-greek" A minimal layout specification must include the following: ```nix -services.xserver.extraLayouts.us-greek = { +services.xserver.xkb.extraLayouts.us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; symbolsFile = /yourpath/symbols/us-greek; @@ -266,7 +266,7 @@ Once the configuration is applied, and you did a logout/login cycle, the layout should be ready to use. You can try it by e.g. running `setxkbmap us-greek` and then type `+a` (it may not get applied in your terminal straight away). To change the default, the usual -`services.xserver.layout` option can still be used. +`services.xserver.xkb.layout` option can still be used. A layout can have several other components besides `xkb_symbols`, for example we will define new keycodes for some multimedia key and bind @@ -298,7 +298,7 @@ xkb_symbols "media" As before, to install the layout do ```nix -services.xserver.extraLayouts.media = { +services.xserver.xkb.extraLayouts.media = { description = "Multimedia keys remapping"; languages = [ "eng" ]; symbolsFile = /path/to/media-key; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md index a80be2b523..9ec4a51d6e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/xfce.chapter.md @@ -28,7 +28,7 @@ manually (system wide), put them into your Thunar (the Xfce file manager) is automatically enabled when Xfce is enabled. To enable Thunar without enabling Xfce, use the configuration -option [](#opt-programs.thunar.enable) instead of simply adding +option [](#opt-programs.thunar.enable) instead of adding `pkgs.xfce.thunar` to [](#opt-environment.systemPackages). If you'd like to add extra plugins to Thunar, add them to diff --git a/third_party/nixpkgs/nixos/doc/manual/development/activation-script.section.md b/third_party/nixpkgs/nixos/doc/manual/development/activation-script.section.md index c339258c6d..cc317a6a01 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/activation-script.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/activation-script.section.md @@ -69,4 +69,4 @@ do: `/etc/group` and `/etc/shadow`. This also creates home directories - `usrbinenv` creates `/usr/bin/env` - `var` creates some directories in `/var` that are not service-specific -- `wrappers` creates setuid wrappers like `ping` and `sudo` +- `wrappers` creates setuid wrappers like `sudo` diff --git a/third_party/nixpkgs/nixos/doc/manual/development/non-switchable-systems.section.md b/third_party/nixpkgs/nixos/doc/manual/development/non-switchable-systems.section.md new file mode 100644 index 0000000000..87bb46c789 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/development/non-switchable-systems.section.md @@ -0,0 +1,21 @@ +# Non Switchable Systems {#sec-non-switchable-system} + +In certain systems, most notably image based appliances, updates are handled +outside the system. This means that you do not need to rebuild your +configuration on the system itself anymore. + +If you want to build such a system, you can use the `image-based-appliance` +profile: + +```nix +{ modulesPath, ... }: { + imports = [ "${modulesPath}/profiles/image-based-appliance.nix" ] +} +``` + +The most notable deviation of this profile from a standard NixOS configuration +is that after building it, you cannot switch *to* the configuration anymore. +The profile sets `config.system.switch.enable = false;`, which excludes +`switch-to-configuration`, the central script called by `nixos-rebuild`, from +your system. Removing this script makes the image lighter and slightly more +secure. diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index 3448b07722..7620704161 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -90,7 +90,7 @@ lib.mkOption { ``` ::: -### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption} +### `mkPackageOption` {#sec-option-declarations-util-mkPackageOption} Usage: @@ -121,15 +121,13 @@ valid attribute path in pkgs (if name is a list). If you wish to explicitly provide no default, pass `null` as `default`. -During the transition to CommonMark documentation `mkPackageOption` creates an option with a DocBook description attribute, once the transition is completed it will create a CommonMark description instead. `mkPackageOptionMD` always creates an option with a CommonMark description attribute and will be removed some time after the transition is completed. - []{#ex-options-declarations-util-mkPackageOption} Examples: ::: {#ex-options-declarations-util-mkPackageOption-hello .example} ### Simple `mkPackageOption` usage ```nix -lib.mkPackageOptionMD pkgs "hello" { } +lib.mkPackageOption pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -143,7 +141,7 @@ lib.mkOption { ::: {#ex-options-declarations-util-mkPackageOption-ghc .example} ### `mkPackageOption` with explicit default and example ```nix -lib.mkPackageOptionMD pkgs "GHC" { +lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md index 44bb3b4782..2ad3d6c4f9 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md @@ -528,7 +528,7 @@ The only required parameter is `name`. : A string representation of the type function name. -`definition` +`description` : Description of the type used in documentation. Give information of the type and any of its arguments. diff --git a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 54002941d6..4b8385d7e0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -57,6 +57,27 @@ using: Once the connection is established, you can enter commands in the socat terminal where socat is running. +## Port forwarding to NixOS test VMs {#sec-nixos-test-port-forwarding} + +If your test has only a single VM, you may use e.g. + +```ShellSession +$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/nixos-test-driver +``` + +to port-forward a port in the VM (here `22`) to the host machine (here port `2222`). + +This naturally does not work when multiple machines are involved, +since a single port on the host cannot forward to multiple VMs. + +If the test defines multiple machines, you may opt to _temporarily_ set +`virtualisation.forwardPorts` in the test definition for debugging. + +Such port forwardings connect via the VM's virtual network interface. +Thus they cannot connect to ports that are only bound to the VM's +loopback interface (`127.0.0.1`), and the VM's NixOS firewall +must be configured to allow these connections. + ## Reuse VM state {#sec-nixos-test-reuse-vm-state} You can re-use the VM states coming from a previous run by setting the diff --git a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md index 5060dd98f5..3a4800742b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/settings-options.section.md @@ -58,7 +58,7 @@ have a predefined type and string generator already declared under and returning a set with YAML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). -`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \... } +`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } : A function taking an attribute set with values diff --git a/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md index 5d6d67f1aa..ccadb819e0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -44,6 +44,10 @@ of actions is always the same: - Inspect what changed during these actions and print units that failed and that were newly started +By default, some units are filtered from the outputs to make it less spammy. +This can be disabled for development or testing by setting the environment variable +`STC_DISPLAY_ALL_UNITS=1` + Most of these actions are either self-explaining but some of them have to do with our units or the activation script. For this reason, these topics are explained in the next sections. @@ -51,4 +55,5 @@ explained in the next sections. ```{=include=} sections unit-handling.section.md activation-script.section.md +non-switchable-systems.section.md ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md index 8d504dfb0b..3d9bd318cf 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.chapter.md @@ -16,7 +16,7 @@ You can quickly validate your edits with `make`: ```ShellSession $ cd /path/to/nixpkgs/nixos/doc/manual $ nix-shell -nix-shell$ make +nix-shell$ devmode ``` Once you are done making modifications to the manual, it's important to @@ -33,13 +33,13 @@ symlink at `./result/share/doc/nixos/index.html`. ## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml} For general information on how to write in DocBook, see [DocBook 5: The -Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html). +Definitive Guide](https://tdg.docbook.org/tdg/5.1/). Emacs nXML Mode is very helpful for editing DocBook XML because it validates the document as you write, and precisely locates errors. To use it, see [](#sec-emacs-docbook-xml). -[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of +[Pandoc](https://pandoc.org/) can generate DocBook XML from a multitude of formats, which makes a good starting point. Here is an example of Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML: @@ -50,7 +50,7 @@ pandoc -f markdown_github -t docbook5 docs.md -o my-section.md Pandoc can also quickly convert a single `section.xml` to HTML, which is helpful when drafting. -Sometimes writing valid DocBook is simply too difficult. In this case, +Sometimes writing valid DocBook is too difficult. In this case, submit your documentation updates in a [GitHub Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will handle the conversion to XML for you. @@ -62,9 +62,9 @@ topic from scratch. Keep the following guidelines in mind when you create and add a topic: -- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html) +- The NixOS [`book`](https://tdg.docbook.org/tdg/5.0/book.html) element is in `nixos/doc/manual/manual.xml`. It includes several - [`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in + [`parts`](https://tdg.docbook.org/tdg/5.0/book.html) which are in subdirectories. - Store the topic file in the same directory as the `part` to which it diff --git a/third_party/nixpkgs/nixos/modules/image/repart.md b/third_party/nixpkgs/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md similarity index 100% rename from third_party/nixpkgs/nixos/modules/image/repart.md rename to third_party/nixpkgs/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md index 11b49ccb1f..12abf90b71 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/changing-config.chapter.md @@ -89,7 +89,7 @@ guest. For instance, the following will forward host port 2222 to guest port 22 (SSH): ```ShellSession -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +$ QEMU_NET_OPTS="hostfwd=tcp:127.0.0.1:2222-:22" ./result/bin/run-*-vm ``` allowing you to log in via SSH (assuming you have set the appropriate @@ -98,3 +98,8 @@ passwords or SSH authorized keys): ```ShellSession $ ssh -p 2222 localhost ``` + +Such port forwardings connect via the VM's virtual network interface. +Thus they cannot connect to ports that are only bound to the VM's +loopback interface (`127.0.0.1`), and the VM's NixOS firewall +must be configured to allow these connections. diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installation.md b/third_party/nixpkgs/nixos/doc/manual/installation/installation.md index 1405942566..f3b1773d86 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installation.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installation.md @@ -8,4 +8,5 @@ installing.chapter.md changing-config.chapter.md upgrading.chapter.md building-nixos.chapter.md +building-images-via-systemd-repart.chapter.md ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md index 4fbd6525f8..c1cad99d39 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-pxe.section.md @@ -4,7 +4,7 @@ Advanced users may wish to install NixOS using an existing PXE or iPXE setup. These instructions assume that you have an existing PXE or iPXE -infrastructure and simply want to add the NixOS installer as another +infrastructure and want to add the NixOS installer as another option. To build the necessary files from your current version of nixpkgs, you can run: diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.section.md index 1422ae4c29..f47d130081 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1509.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) \-- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. +- The [Haskell](http://haskell.org/) packages infrastructure has been re-designed from the ground up ("Haskell NG"). NixOS now distributes the latest version of every single package registered on [Hackage](http://hackage.haskell.org/) -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the [User's Guide to the Haskell Infrastructure](https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure). Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional Haskell package sets that provide every single [LTS Haskell](http://www.stackage.org/) release since version 0.0 as well as the most recent [Stackage Nightly](http://www.stackage.org/) snapshot. The announcement ["Full Stackage Support in Nixpkgs"](https://nixos.org/nix-dev/2015-September/018138.html) gives additional details. - Nix has been updated to version 1.10, which among other improvements enables cryptographic signatures on binary caches for improved security. @@ -178,7 +178,7 @@ The new option `system.stateVersion` ensures that certain configuration changes - Nix now requires binary caches to be cryptographically signed. If you have unsigned binary caches that you want to continue to use, you should set `nix.requireSignedBinaryCaches = false`. -- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package \-- to `steamOriginal`. +- Steam now doesn't need root rights to work. Instead of using `*-steam-chrootenv`, you should now just run `steam`. `steamChrootEnv` package was renamed to `steam`, and old `steam` package -- to `steamOriginal`. - CMPlayer has been renamed to bomi upstream. Package `cmplayer` was accordingly renamed to `bomi` diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1609.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1609.section.md index ad3478d0ca..0cbabf58ca 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1609.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1609.section.md @@ -46,7 +46,7 @@ When upgrading from a previous release, please be aware of the following incompa Other notable improvements: -- Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to simply set +- Revamped grsecurity/PaX support. There is now only a single general-purpose distribution kernel and the configuration interface has been streamlined. Desktop users should be able to set ```nix { diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.section.md index 22cef05d4f..2bd04f8dd4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-1909.section.md @@ -198,7 +198,7 @@ When upgrading from a previous release, please be aware of the following incompa For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts..enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). -- The old deprecated `emacs` package sets have been dropped. What used to be called `emacsPackagesNg` is now simply called `emacsPackages`. +- The old deprecated `emacs` package sets have been dropped. What used to be called `emacsPackagesNg` is now called `emacsPackages`. - `services.xserver.desktopManager.xterm` is now disabled by default if `stateVersion` is 19.09 or higher. Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to have any desktopManager enabled default. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.section.md index 76cee8858e..695f8a2c95 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2003.section.md @@ -482,7 +482,7 @@ When upgrading from a previous release, please be aware of the following incompa - If you use `postgresql` on a different server, you don't need to change anything as well since this module was never designed to configure remote databases. - - If you use `postgresql` and configured your synapse initially on `19.09` or older, you simply need to enable postgresql-support explicitly: + - If you use `postgresql` and configured your synapse initially on `19.09` or older, you need to enable postgresql-support explicitly: ```nix { ... }: { diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md index 6bb75a04b3..eac02a8ff4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.section.md @@ -422,7 +422,7 @@ When upgrading from a previous release, please be aware of the following incompa - The `systemd-networkd` option `systemd.network.networks._name_.dhcpConfig` has been renamed to [systemd.network.networks._name_.dhcpV4Config](options.html#opt-systemd.network.networks._name_.dhcpV4Config) following upstream systemd's documentation change. See systemd.network 5 for details. -- In the `picom` module, several options that accepted floating point numbers encoded as strings (for example [services.picom.activeOpacity](options.html#opt-services.picom.activeOpacity)) have been changed to the (relatively) new native `float` type. To migrate your configuration simply remove the quotes around the numbers. +- In the `picom` module, several options that accepted floating point numbers encoded as strings (for example [services.picom.activeOpacity](options.html#opt-services.picom.activeOpacity)) have been changed to the (relatively) new native `float` type. To migrate your configuration remove the quotes around the numbers. - When using `buildBazelPackage` from Nixpkgs, `flat` hash mode is now used for dependencies instead of `recursive`. This is to better allow using hashed mirrors where needed. As a result, these hashes will have changed. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md index 97a3055735..1c73d0c979 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md @@ -14,7 +14,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - Support for algorithms that `libxcrypt` [does not consider strong](https://github.com/besser82/libxcrypt/blob/v4.4.28/lib/hashes.conf#L41) are **deprecated** as of this release, and will be removed in NixOS 23.05. - This includes system login passwords. Given this, we **strongly encourage** all users to update their system passwords, as you will be unable to login if password hashes are not migrated by the time their support is removed. - When using `users.users..hashedPassword` to configure user passwords, run `mkpasswd`, and use the yescrypt hash that is provided as the new value. - - On the other hand, for interactively configured user passwords, simply re-set the passwords for all users with `passwd`. + - On the other hand, for interactively configured user passwords, re-set the passwords for all users with `passwd`. - This release introduces warnings for the use of deprecated hash algorithms for both methods of configuring passwords. To make sure you migrated correctly, run `nixos-rebuild switch`. - The NixOS documentation is now generated from markdown. While docbook is still part of the documentation build process, it's a big step towards the full migration. @@ -130,7 +130,7 @@ In addition to numerous new and upgraded packages, this release includes the fol don't lose access to their files. In any other case, it's safe to use OpenSSL 3 for PHP's OpenSSL extension. This can be done by setting - [](#opt-services.nextcloud.enableBrokenCiphersForSSE) to `false`. + `services.nextcloud.enableBrokenCiphersForSSE` to `false`. - The `coq` package and versioned variants starting at `coq_8_14` no longer include CoqIDE, which is now available through diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index 3d27d3fef8..21c798b3b4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -611,7 +611,7 @@ If you are: - adding new rules with `*.rules` - running custom PulseAudio commands with `pulse.cmd` -Simply move the definitions into the drop-in. +Move the definitions into the drop-in. Note that the use of `context.exec` is not recommended and other methods of running your thing are likely a better option. @@ -660,5 +660,5 @@ If reloading the module is not an option, proceed to [Nuclear option](#sec-relea #### Nuclear option {#sec-release-23.05-migration-pipewire-nuclear} If all else fails, you can still manually copy the contents of the default configuration file -from `${pkgs.pipewire.lib}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. +from `${pkgs.pipewire}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. However, this should be done only as a last resort. Please talk to the Pipewire maintainers if you ever need to do this. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md index d1bbb5c389..5cb5fec230 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md @@ -4,6 +4,8 @@ - FoundationDB now defaults to major version 7. +- PostgreSQL now defaults to major version 15. + - Support for WiFi6 (IEEE 802.11ax) and WPA3-SAE-PK was enabled in the `hostapd` package, along with a significant rework of the hostapd module. - LXD now supports virtual machine instances to complement the existing container support @@ -24,8 +26,22 @@ - `root` and `wheel` are not given the ability to set (or preserve) arbitrary environment variables. +- [glibc](https://www.gnu.org/software/libc/) has been updated from version 2.37 to 2.38, see [the release notes](https://sourceware.org/glibc/wiki/Release/2.38) for what was changed. + [`sudo-rs`]: https://github.com/memorysafety/sudo-rs/ +- All [ROCm](https://rocm.docs.amd.com/en/latest/) packages have been updated to 5.7.0. + - [ROCm](https://rocm.docs.amd.com/en/latest/) package attribute sets are versioned: `rocmPackages` -> `rocmPackages_5`. + +- `yarn-berry` has been updated to 4.0.1. This means that NodeJS versions less than `18.12` are no longer supported by it. More details at the [upstream changelog](https://github.com/yarnpkg/berry/blob/master/CHANGELOG.md). + +- If the user has a custom shell enabled via `users.users.${USERNAME}.shell = ${CUSTOMSHELL}`, the + assertion will require them to also set `programs.${CUSTOMSHELL}.enable = + true`. This is generally safe behavior, but for anyone needing to opt out from + the check `users.users.${USERNAME}.ignoreShellProgramCheck = true` will do the job. + +- Cassandra now defaults to 4.x, updated from 3.11.x. + ## New Services {#sec-release-23.11-new-services} - [MCHPRS](https://github.com/MCHPR/MCHPRS), a multithreaded Minecraft server built for redstone. Available as [services.mchprs](#opt-services.mchprs.enable). @@ -58,16 +74,26 @@ - [Prometheus MySQL exporter](https://github.com/prometheus/mysqld_exporter), a MySQL server exporter for Prometheus. Available as [services.prometheus.exporters.mysqld](#opt-services.prometheus.exporters.mysqld.enable). +- [LibreNMS](https://www.librenms.org), a auto-discovering PHP/MySQL/SNMP based network monitoring. Available as [services.librenms](#opt-services.librenms.enable). + +- [Livebook](https://livebook.dev/), an interactive notebook with support for Elixir, graphs, machine learning, and more. + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). - [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable). +- [tang](https://github.com/latchset/tang), a server for binding data to network presence. Available as [services.tang](#opt-services.tang.enable). + - [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable). +- [Home Assistant Satellite], a streaming audio satellite for Home Assistant voice pipelines, where you can reuse existing mic/speaker hardware. Available as [services.homeassistant-satellite](#opt-services.homeassistant-satellite.enable). + - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. - [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable). +- [Goss](https://goss.rocks/), a YAML based serverspec alternative tool for validating a server's configuration. Available as [services.goss](#opt-services.goss.enable). + - [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe and secure from the ground up. Available as [services.trust-dns](#opt-services.trust-dns.enable). - [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics. @@ -80,19 +106,41 @@ - hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable). +- [zwave-js](https://github.com/zwave-js/zwave-js-server), a small server wrapper around Z-Wave JS to access it via a WebSocket. Available as [services.zwave-js](#opt-services.zwave-js.enable). + - [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs. Available as [services.honk](#opt-services.honk.enable). +- [ferretdb](https://www.ferretdb.io/), an open-source proxy, converting the MongoDB 6.0+ wire protocol queries to PostgreSQL or SQLite. Available as [services.ferretdb](options.html#opt-services.ferretdb.enable). + +- [MicroBin](https://microbin.eu/), a feature rich, performant and secure text and file sharing web application, a "paste bin". Available as [services.microbin](#opt-services.microbin.enable). + - [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable). +- [FastNetMon Advanced](https://fastnetmon.com/product-overview/), a commercial high performance DDoS detector / sensor. Available as [services.fastnetmon-advanced](#opt-services.fastnetmon-advanced.enable). + - [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers. +- [certspotter](https://github.com/SSLMate/certspotter), a certificate transparency log monitor. Available as [services.certspotter](#opt-services.certspotter.enable). + - [audiobookshelf](https://github.com/advplyr/audiobookshelf/), a self-hosted audiobook and podcast server. Available as [services.audiobookshelf](#opt-services.audiobookshelf.enable). - [ZITADEL](https://zitadel.com), a turnkey identity and access management platform. Available as [services.zitadel](#opt-services.zitadel.enable). +- [exportarr](https://github.com/onedr0p/exportarr), Prometheus Exporters for Bazarr, Lidarr, Prowlarr, Radarr, Readarr, and Sonarr. Available as [services.prometheus.exporters.exportarr-bazarr](#opt-services.prometheus.exporters.exportarr-bazarr.enable)/[services.prometheus.exporters.exportarr-lidarr](#opt-services.prometheus.exporters.exportarr-lidarr.enable)/[services.prometheus.exporters.exportarr-prowlarr](#opt-services.prometheus.exporters.exportarr-prowlarr.enable)/[services.prometheus.exporters.exportarr-radarr](#opt-services.prometheus.exporters.exportarr-radarr.enable)/[services.prometheus.exporters.exportarr-readarr](#opt-services.prometheus.exporters.exportarr-readarr.enable)/[services.prometheus.exporters.exportarr-sonarr](#opt-services.prometheus.exporters.exportarr-sonarr.enable). + - [netclient](https://github.com/gravitl/netclient), an automated WireGuard® Management Client. Available as [services.netclient](#opt-services.netclient.enable). +- [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web + +- [virt-manager](https://virt-manager.org/), an UI for managing virtual machines in libvirt, is now available as `programs.virt-manager`. + +- [Soft Serve](https://github.com/charmbracelet/soft-serve), a tasty, self-hostable Git server for the command line. Available as [services.soft-serve](#opt-services.soft-serve.enable). + +- [Rosenpass](https://rosenpass.eu/), a service for post-quantum-secure VPNs with WireGuard. Available as [services.rosenpass](#opt-services.rosenpass.enable). + +- [c2FmZQ](https://github.com/c2FmZQ/c2FmZQ/), an application that can securely encrypt, store, and share files, including but not limited to pictures and videos. Available as [services.c2fmzq-server](#opt-services.c2fmzq-server.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. @@ -106,6 +154,8 @@ - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. +- `services.mastodon` doesn't support providing a TCP port to its `streaming` component anymore, as upstream implemented parallelization by running multiple instances instead of running multiple processes in one instance. Please create a PR if you are interested in this feature. + - The `services.hostapd` module was rewritten to support `passwordFile` like options, WPA3-SAE, and management of multiple interfaces. This breaks compatibility with older configurations. - `hostapd` is now started with additional systemd sandbox/hardening options for better security. - `services.hostapd.interface` was replaced with a per-radio and per-bss configuration scheme using [services.hostapd.radios](#opt-services.hostapd.radios). @@ -124,8 +174,16 @@ - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). +- `maintainers/scripts/update-luarocks-packages` is now a proper package + `luarocks-packages-updater` that can be run to maintain out-of-tree luarocks + packages + - The `users.users..passwordFile` has been renamed to `users.users..hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. +- `chromiumBeta` and `chromiumDev` have been removed due to the lack of maintenance in nixpkgs. Consider using `chromium` instead. + +- `google-chrome-beta` and `google-chrome-dev` have been removed due to the lack of maintenance in nixpkgs. Consider using `google-chrome` instead. + - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. - `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now @@ -133,6 +191,8 @@ - JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools` +- The `waagent` service does provisioning now + - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though: - The option [`services.matrix-synapse.package`](#opt-services.matrix-synapse.package) is now read-only. For modifying the package, use an overlay which modifies `matrix-synapse-unwrapped` instead. More on that below. - The `enableSystemd` & `enableRedis` arguments have been removed and `matrix-synapse` has been renamed to `matrix-synapse-unwrapped`. Also, several optional dependencies (such as `psycopg2` or `authlib`) have been removed. @@ -148,6 +208,17 @@ - `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version. +- `llvmPackages_rocm` has been moved to `rocmPackages.llvm`. + +- `hip`, `rocm-opencl-runtime`, `rocm-opencl-icd`, and `rocclr` have been combined into `rocmPackages.clr`. + +- `clang-ocl`, `clr`, `composable_kernel`, `hipblas`, `hipcc`, `hip-common`, `hipcub`, + `hipfft`, `hipfort`, `hipify`, `hipsolver`, `hipsparse`, `migraphx`, `miopen`, `miopengemm`, + `rccl`, `rdc`, `rocalution`, `rocblas`, `rocdgbapi`, `rocfft`, `rocgdb`, `rocm-cmake`, + `rocm-comgr`, `rocm-core`, `rocm-device-libs`, `rocminfo`, `rocmlir`, `rocm-runtime`, + `rocm-smi`, `rocm-thunk`, `rocprim`, `rocprofiler`, `rocrand`, `rocr-debug-agent`, + `rocsolver`, `rocsparse`, `rocthrust`, `roctracer`, `rocwmma`, and `tensile` have been moved to `rocmPackages`. + - `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details. - `nix-prefetch-git` now ignores global and user git config, to improve reproducibility. @@ -185,20 +256,34 @@ - `odoo` now defaults to 16, updated from 15. +- `varnish` was upgraded from 7.2.x to 7.4.x, see https://varnish-cache.org/docs/7.3/whats-new/upgrading-7.3.html and https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html for upgrade notes. The current LTS version is still offered as `varnish60`. + - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `services.keyd` changed API. Now you can create multiple configuration files. - `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`. -- `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`. - - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. - `fileSystems..autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems..formatOptions` has been removed. - `fileSystems..autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be. +- `fuse3` has been updated from 3.11.0 to 3.16.2; see [ChangeLog.rst](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3162-2023-10-10) for an overview of the changes. + + Unsupported mount options are no longer silently accepted [(since 3.15.0)](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3150-2023-06-09). The [affected mount options](https://github.com/libfuse/libfuse/commit/dba6b3983af34f30de01cf532dff0b66f0ed6045) are: `atime`, `diratime`, `lazytime`, `nolazytime`, `relatime`, `norelatime`, `strictatime`. + + For example, + + ```bash + $ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime` + ``` + + would previously terminate successfully with the mount point established, now it outputs the error message ``fuse: unknown option(s): `-o atime'`` and terminates with exit status 1. + +- `nixos-rebuild {switch,boot,test,dry-activate}` now runs the system activation inside `systemd-run`, creating an ephemeral systemd service and protecting the system switch against issues like network disconnections during remote (e.g. SSH) sessions. This has the side effect of running the switch in an isolated environment, that could possible break post-switch scripts that depends on things like environment variables being set. If you want to opt-out from this behavior for now, you may set the `NIXOS_SWITCH_USE_DIRTY_ENV` environment variable before running `nixos-rebuild`. However, keep in mind that this option will be removed in the future. + - The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192). - `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details. @@ -217,6 +302,10 @@ - The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. +- Garage has been upgraded to 0.9.x. `services.garage.package` now needs to be explicitly set, so version upgrades can be done in a controlled fashion. For this, we expose `garage_x_y` attributes which can be set here. + +- `voms` and `xrootd` now moves the `$out/etc` content to the `$etc` output instead of `$out/etc.orig`, when input argument `externalEtc` is not `null`. + - The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations. - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. @@ -229,13 +318,13 @@ - The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped. -- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. +- `pharo` has been updated to latest stable (PharoVM 10.0.8), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. - Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`. - Emacs macport version 29 was introduced. -- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option simply did enable all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all. +- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option enabled all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all. - The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md). @@ -246,13 +335,19 @@ - Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`; see [#221181](https://github.com/NixOS/nixpkgs/issues/221181). +- Package `cloud-sql-proxy` was renamed to `google-cloud-sql-proxy` as it cannot be used with other cloud providers.; + - Package `pash` was removed due to being archived upstream. Use `powershell` as an alternative. +- The option `services.plausible.releaseCookiePath` has been removed: Plausible does not use any distributed Erlang features, and does not plan to (see [discussion](https://github.com/NixOS/nixpkgs/pull/130297#issuecomment-1805851333)), so NixOS now disables them, and the Erlang cookie becomes unnecessary. You may delete the file that `releaseCookiePath` was set to. + - `security.sudo.extraRules` now includes `root`'s default rule, with ordering priority 400. This is functionally identical for users not specifying rule order, or relying on `mkBefore` and `mkAfter`, but may impact users calling `mkOrder n` with n ≤ 400. +- X keyboard extension (XKB) options have been reorganized into a single attribute set, `services.xserver.xkb`. Specifically, `services.xserver.layout` is now `services.xserver.xkb.layout`, `services.xserver.extraLayouts` is now `services.xserver.xkb.extraLayouts`, `services.xserver.xkbModel` is now `services.xserver.xkb.model`, `services.xserver.xkbOptions` is now `services.xserver.xkb.options`, `services.xserver.xkbVariant` is now `services.xserver.xkb.variant`, and `services.xserver.xkbDir` is now `services.xserver.xkb.dir`. + - `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally. - [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first. @@ -262,12 +357,43 @@ - `rome` was removed because it is no longer maintained and is succeeded by `biome`. +- The `prometheus-knot-exporter` was migrated to a version maintained by CZ.NIC. Various metric names have changed, so checking existing rules is recommended. + - The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets. +- `blender-with-packages` has been deprecated in favor of `blender.withPackages`, for example `blender.withPackages (ps: [ps.bpycv])`. It behaves similarly to `python3.withPackages`. + - Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays. +- `service.borgmatic.settings.location` and `services.borgmatic.configurations..location` are deprecated, please move your options out of sections to the global scope. + +- `privacyidea` (and the corresponding `privacyidea-ldap-proxy`) has been removed from nixpkgs because it has severely outdated dependencies that became unmaintainable with nixpkgs' python package-set. + +- `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. + +- `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. + +- `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. + +- `ssm-agent` package and module were renamed to `amazon-ssm-agent` to be consistent with the upstream package name. + +- `services.kea.{ctrl-agent,dhcp-ddns,dhcp,dhcp6}` now use separate runtime directories instead of `/run/kea` to work around the runtime directory being cleared on service start. + +- `mkDerivation` now rejects MD5 hashes. + +- The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option. + +- The `prayer` package as well as `services.prayer` have been removed because it's been unmaintained for several years and the author's website has vanished. + +- The `chrony` NixOS module now tracks the Real-Time Clock drift from the System Clock with `rtcfile` and automatically adjusts it with `rtcautotrim` when it exceeds the maximum error specified in `services.chrony.autotrimThreshold` (default 30 seconds). If you enabled `rtcsync` in `extraConfig`, you should remove RTC related options from `extraConfig`. If you do not want chrony configured to keep the RTC in check, you can set `services.chrony.enableRTCTrimming = false;` + ## Other Notable Changes {#sec-release-23.11-notable-changes} +- A new option `system.switch.enable` was added. By default, this is option is + enabled. Disabling it makes the system unable to be reconfigured via + `nixos-rebuild`. This is good for image based appliances where updates are + handled outside the image. + - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. - GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream (specifically, Cinnamon now defaults to the gtk2 style instead, following the default in Linux Mint). If you still want it, you can add the following options to your configuration but it will probably be eventually removed: @@ -292,18 +418,36 @@ - `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7). +- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0). + +- Elixir now defaults to version + [v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/). + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - DocBook option documentation is no longer supported, all module documentation now uses markdown. +- `services.outline` can now be configured to use local filesystem storage instead of S3 storage using [services.outline.storage.storageType](#opt-services.outline.storage.storageType). + +- `paperwork` was updated to version 2.2. Documents scanned with this version will not be visible to previous versions if you downgrade. See the [upstream announcement](https://forum.openpaper.work/t/paperwork-2-2-testing-phase/316#important-switch-from-jpeg-to-png-for-new-pages-2) for details and workarounds. + - `buildGoModule` `go-modules` attrs have been renamed to `goModules`. - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. +- The `services.sslh` module has been updated to follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). As such, several options have been moved to the freeform attribute set [services.sslh.settings](#opt-services.sslh.settings), which allows to change any of the settings in {manpage}`sslh(8)`. + In addition, the newly added option [services.sslh.method](#opt-services.sslh.method) allows to switch between the {manpage}`fork(2)`, {manpage}`select(2)` and `libev`-based connection handling method; see the [sslh docs](https://github.com/yrutschle/sslh/blob/master/doc/INSTALL.md#binaries) for a comparison. + +- `pkgs.openvpn3` now optionally supports systemd-resolved. `programs.openvpn3` will automatically enable systemd-resolved support if `config.services.resolved.enable` is enabled. + - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. - The application firewall `opensnitch` now uses the process monitor method eBPF as default as recommended by upstream. The method can be changed with the setting [services.opensnitch.settings.ProcMonitorMethod](#opt-services.opensnitch.settings.ProcMonitorMethod). +- `services.hedgedoc` has been heavily refactored, reducing the amount of declared options in the module. Most of the options should still work without any changes. Some options have been deprecated, as they no longer have any effect. See [#244941](https://github.com/NixOS/nixpkgs/pull/244941) for more details. + +- The [services.woodpecker-server](#opt-services.woodpecker-server.environmentFile) type was changed to list of paths to be more consistent to the woodpecker-agent module + - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release. The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action. @@ -343,6 +487,8 @@ The module update takes care of the new config syntax and the data itself (user - Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details. +- Cloud support in the `netdata` package is now disabled by default. To enable it use the `netdataCloud` package. + - `networking.nftables` now has the option `networking.nftables.table.` to create tables and have them be updated atomically, instead of flushing the ruleset. @@ -365,6 +511,8 @@ The module update takes care of the new config syntax and the data itself (user - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved for `root` and the `wheel` group. +- `virtualisation.googleComputeImage` now provides `efi` option to support UEFI booting. + - CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this: ``` @@ -383,8 +531,18 @@ The module update takes care of the new config syntax and the data itself (user If you use this feature, updates to CoreDNS may require updating `vendorHash` by following these steps again. +- `postgresql_11` has been removed since it'll stop receiving fixes on November 9 2023. + +- `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`. + - `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl). +- `services.bitcoind` now properly respects the `enable` option. + +- The Home Assistant module now offers support for installing custom components and lovelace modules. Available at [`services.home-assistant.customComponents`](#opt-services.home-assistant.customComponents) and [`services.home-assistant.customLovelaceModules`](#opt-services.home-assistant.customLovelaceModules). + +- The argument `vendorSha256` of `buildGoModule` is deprecated. Use `vendorHash` instead. ([\#259999](https://github.com/NixOS/nixpkgs/pull/259999)) + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. @@ -415,6 +573,8 @@ The module update takes care of the new config syntax and the data itself (user - `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead. +- The `extend` function of `llvmPackages` has been removed due it coming from the `tools` attrset thus only extending the `tool` attrset. A possible replacement is to construct the set from `libraries` and `tools`, or patch nixpkgs. + - The `qemu-vm.nix` module now supports disabling overriding `fileSystems` with `virtualisation.fileSystems`. This enables the user to boot VMs from "external" disk images not created by the qemu-vm module. You can stop the @@ -425,3 +585,8 @@ The module update takes care of the new config syntax and the data itself (user - `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14). +- The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`. + +- Docker now defaults to 24, as 20.10 is stopping to receive security updates and bug fixes after [December 10, 2023](https://github.com/moby/moby/discussions/45104). + +- There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2. diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index 81a5ea1750..da099f86aa 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -34,9 +34,6 @@ evalConfigArgs@ in lib.optional (e != "") (import e) }: -let pkgs_ = pkgs; -in - let inherit (lib) optional; @@ -58,8 +55,9 @@ let nixpkgs.system = lib.mkDefault system; }) ++ - (optional (pkgs_ != null) { - _module.args.pkgs = lib.mkForce pkgs_; + (optional (pkgs != null) { + # This should be default priority, so it conflicts with any user-defined pkgs. + nixpkgs.pkgs = pkgs; }) ); }; @@ -109,10 +107,10 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; - withExtraArgs = nixosSystem: nixosSystem // { + withExtraAttrs = configuration: configuration // { inherit extraArgs; - inherit (nixosSystem._module.args) pkgs; - extendModules = args: withExtraArgs (nixosSystem.extendModules args); + inherit (configuration._module.args) pkgs; + extendModules = args: withExtraAttrs (configuration.extendModules args); }; in -withWarnings (withExtraArgs nixosWithUserModules) +withWarnings (withExtraAttrs nixosWithUserModules) diff --git a/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix b/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix index 225666f9a5..277ff6a4dc 100644 --- a/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix +++ b/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix @@ -15,6 +15,8 @@ , volumeLabel , uuid ? "44444444-4444-4444-8888-888888888888" , btrfs-progs +, libfaketime +, fakeroot }: let @@ -23,7 +25,7 @@ in pkgs.stdenv.mkDerivation { name = "btrfs-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [ btrfs-progs ] ++ lib.optional compressImage zstd; + nativeBuildInputs = [ btrfs-progs libfaketime fakeroot ] ++ lib.optional compressImage zstd; buildCommand = '' @@ -50,7 +52,7 @@ pkgs.stdenv.mkDerivation { cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration touch $img - mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img + faketime -f "1970-01-01 00:00:01" fakeroot mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img if ! btrfs check $img; then echo "--- 'btrfs check' failed for BTRFS image ---" diff --git a/third_party/nixpkgs/nixos/lib/make-squashfs.nix b/third_party/nixpkgs/nixos/lib/make-squashfs.nix index b7c7078b73..4b6b567399 100644 --- a/third_party/nixpkgs/nixos/lib/make-squashfs.nix +++ b/third_party/nixpkgs/nixos/lib/make-squashfs.nix @@ -1,15 +1,22 @@ { lib, stdenv, squashfsTools, closureInfo +, fileName ? "squashfs" , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. storeContents ? [] + # Pseudo files to be added to squashfs image +, pseudoFiles ? [] +, noStrip ? false , # Compression parameters. # For zstd compression you can use "zstd -Xcompression-level 6". comp ? "xz -Xdict-size 100%" }: +let + pseudoFilesArgs = lib.concatMapStrings (f: ''-p "${f}" '') pseudoFiles; +in stdenv.mkDerivation { - name = "squashfs.img"; + name = "${fileName}.img"; __structuredAttrs = true; nativeBuildInputs = [ squashfsTools ]; @@ -31,8 +38,8 @@ stdenv.mkDerivation { '' + '' # Generate the squashfs image. - mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ - -no-hardlinks -keep-as-directory -all-root -b 1048576 -comp ${comp} \ + mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out ${pseudoFilesArgs} \ + -no-hardlinks ${lib.optionalString noStrip "-no-strip"} -keep-as-directory -all-root -b 1048576 -comp ${comp} \ -processors $NIX_BUILD_CORES ''; } diff --git a/third_party/nixpkgs/nixos/lib/qemu-common.nix b/third_party/nixpkgs/nixos/lib/qemu-common.nix index 4fff2e0a6f..b946f62d93 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-common.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-common.nix @@ -40,6 +40,7 @@ rec { otherHostGuestMatrix = { aarch64-darwin = { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=hvf:tcg -cpu max"; + inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux; }; x86_64-darwin = { x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=hvf:tcg -cpu max"; diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index 5669aae0bc..820ccbcbf7 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -20,12 +20,16 @@ in rec { pkgs.runCommand "unit-${mkPathSafeName name}" { preferLocalBuild = true; allowSubstitutes = false; - inherit (unit) text; + # unit.text can be null. But variables that are null listed in + # passAsFile are ignored by nix, resulting in no file being created, + # making the mv operation fail. + text = optionalString (unit.text != null) unit.text; + passAsFile = [ "text" ]; } '' name=${shellEscape name} mkdir -p "$out/$(dirname -- "$name")" - echo -n "$text" > "$out/$name" + mv "$textPath" "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" @@ -372,24 +376,23 @@ in rec { serviceToUnit = name: def: { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; - text = commonUnitText def + - '' - [Service] - ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: - let s = optionalString (env.${n} != null) - "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; - # systemd max line length is now 1MiB - # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af - in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} - ${if def ? reloadIfChanged && def.reloadIfChanged then '' - X-ReloadIfChanged=true - '' else if (def ? restartIfChanged && !def.restartIfChanged) then '' - X-RestartIfChanged=false - '' else ""} - ${optionalString (def ? stopIfChanged && !def.stopIfChanged) "X-StopIfChanged=false"} - ${attrsToSection def.serviceConfig} - ''; + text = commonUnitText def + '' + [Service] + '' + (let env = cfg.globalEnvironment // def.environment; + in concatMapStrings (n: + let s = optionalString (env.${n} != null) + "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n"; + # systemd max line length is now 1MiB + # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af + in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)) + + (if def ? reloadIfChanged && def.reloadIfChanged then '' + X-ReloadIfChanged=true + '' else if (def ? restartIfChanged && !def.restartIfChanged) then '' + X-RestartIfChanged=false + '' else "") + + optionalString (def ? stopIfChanged && !def.stopIfChanged) '' + X-StopIfChanged=false + '' + attrsToSection def.serviceConfig; }; socketToUnit = name: def: diff --git a/third_party/nixpkgs/nixos/lib/systemd-network-units.nix b/third_party/nixpkgs/nixos/lib/systemd-network-units.nix index 14ff0b3742..8bda1a8bfd 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-network-units.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-network-units.nix @@ -65,6 +65,9 @@ in { '' + optionalString (def.vrfConfig != { }) '' [VRF] ${attrsToSection def.vrfConfig} + '' + optionalString (def.wlanConfig != { }) '' + [WLAN] + ${attrsToSection def.wlanConfig} '' + optionalString (def.batmanAdvancedConfig != { }) '' [BatmanAdvanced] ${attrsToSection def.batmanAdvancedConfig} diff --git a/third_party/nixpkgs/nixos/lib/test-driver/default.nix b/third_party/nixpkgs/nixos/lib/test-driver/default.nix index 6e01e00b43..09d80deb85 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/default.nix +++ b/third_party/nixpkgs/nixos/lib/test-driver/default.nix @@ -11,6 +11,7 @@ , tesseract4 , vde2 , extraPythonPackages ? (_ : []) +, nixosTests }: python3Packages.buildPythonApplication { @@ -31,6 +32,10 @@ python3Packages.buildPythonApplication { ++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ]) ++ extraPythonPackages python3Packages; + passthru.tests = { + inherit (nixosTests.nixos-test-driver) driver-timeout; + }; + doCheck = true; nativeCheckInputs = with python3Packages; [ mypy ruff black ]; checkPhase = '' diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py index 371719d7a9..9daae1e941 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py @@ -76,6 +76,14 @@ def main() -> None: nargs="*", help="vlans to span by the driver", ) + arg_parser.add_argument( + "--global-timeout", + type=int, + metavar="GLOBAL_TIMEOUT", + action=EnvDefault, + envvar="globalTimeout", + help="Timeout in seconds for the whole test", + ) arg_parser.add_argument( "-o", "--output_directory", @@ -103,6 +111,7 @@ def main() -> None: args.testscript.read_text(), args.output_directory.resolve(), args.keep_vm_state, + args.global_timeout, ) as driver: if args.interactive: history_dir = os.getcwd() diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py index 723c807178..786821b0cc 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py @@ -1,6 +1,8 @@ import os import re +import signal import tempfile +import threading from contextlib import contextmanager from pathlib import Path from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union @@ -41,6 +43,8 @@ class Driver: vlans: List[VLan] machines: List[Machine] polling_conditions: List[PollingCondition] + global_timeout: int + race_timer: threading.Timer def __init__( self, @@ -49,9 +53,12 @@ class Driver: tests: str, out_dir: Path, keep_vm_state: bool = False, + global_timeout: int = 24 * 60 * 60 * 7, ): self.tests = tests self.out_dir = out_dir + self.global_timeout = global_timeout + self.race_timer = threading.Timer(global_timeout, self.terminate_test) tmp_dir = get_tmp_dir() @@ -82,6 +89,7 @@ class Driver: def __exit__(self, *_: Any) -> None: with rootlog.nested("cleanup"): + self.race_timer.cancel() for machine in self.machines: machine.release() @@ -144,6 +152,10 @@ class Driver: def run_tests(self) -> None: """Run the test script (for non-interactive test runs)""" + rootlog.info( + f"Test will time out and terminate in {self.global_timeout} seconds" + ) + self.race_timer.start() self.test_script() # TODO: Collect coverage data for machine in self.machines: @@ -161,6 +173,19 @@ class Driver: with rootlog.nested("wait for all VMs to finish"): for machine in self.machines: machine.wait_for_shutdown() + self.race_timer.cancel() + + def terminate_test(self) -> None: + # This will be usually running in another thread than + # the thread actually executing the test script. + with rootlog.nested("timeout reached; test terminating..."): + for machine in self.machines: + machine.release() + # As we cannot `sys.exit` from another thread + # We can at least force the main thread to get SIGTERM'ed. + # This will prevent any user who caught all the exceptions + # to swallow them and prevent itself from terminating. + os.kill(os.getpid(), signal.SIGTERM) def create_machine(self, args: Dict[str, Any]) -> Machine: tmp_dir = get_tmp_dir() diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index 7ed001a1df..f430321bb6 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -19,6 +19,8 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple from test_driver.logger import rootlog +from .qmp import QMPSession + CHAR_TO_KEY = { "A": "shift-a", "N": "shift-n", @@ -144,6 +146,7 @@ class StartCommand: def cmd( self, monitor_socket_path: Path, + qmp_socket_path: Path, shell_socket_path: Path, allow_reboot: bool = False, ) -> str: @@ -167,6 +170,7 @@ class StartCommand: return ( f"{self._cmd}" + f" -qmp unix:{qmp_socket_path},server=on,wait=off" f" -monitor unix:{monitor_socket_path}" f" -chardev socket,id=shell,path={shell_socket_path}" f"{qemu_opts}" @@ -194,11 +198,14 @@ class StartCommand: state_dir: Path, shared_dir: Path, monitor_socket_path: Path, + qmp_socket_path: Path, shell_socket_path: Path, allow_reboot: bool, ) -> subprocess.Popen: return subprocess.Popen( - self.cmd(monitor_socket_path, shell_socket_path, allow_reboot), + self.cmd( + monitor_socket_path, qmp_socket_path, shell_socket_path, allow_reboot + ), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -309,6 +316,7 @@ class Machine: shared_dir: Path state_dir: Path monitor_path: Path + qmp_path: Path shell_path: Path start_command: StartCommand @@ -317,6 +325,7 @@ class Machine: process: Optional[subprocess.Popen] pid: Optional[int] monitor: Optional[socket.socket] + qmp_client: Optional[QMPSession] shell: Optional[socket.socket] serial_thread: Optional[threading.Thread] @@ -352,6 +361,7 @@ class Machine: self.state_dir = self.tmp_dir / f"vm-state-{self.name}" self.monitor_path = self.state_dir / "monitor" + self.qmp_path = self.state_dir / "qmp" self.shell_path = self.state_dir / "shell" if (not self.keep_vm_state) and self.state_dir.exists(): self.cleanup_statedir() @@ -360,6 +370,7 @@ class Machine: self.process = None self.pid = None self.monitor = None + self.qmp_client = None self.shell = None self.serial_thread = None @@ -791,6 +802,28 @@ class Machine: with self.nested(f"waiting for TCP port {port} on {addr}"): retry(port_is_open, timeout) + def wait_for_open_unix_socket( + self, addr: str, is_datagram: bool = False, timeout: int = 900 + ) -> None: + """ + Wait until a process is listening on the given UNIX-domain socket + (default to a UNIX-domain stream socket). + """ + + nc_flags = [ + "-z", + "-uU" if is_datagram else "-U", + ] + + def socket_is_open(_: Any) -> bool: + status, _ = self.execute(f"nc {' '.join(nc_flags)} {addr}") + return status == 0 + + with self.nested( + f"waiting for UNIX-domain {'datagram' if is_datagram else 'stream'} on '{addr}'" + ): + retry(socket_is_open, timeout) + def wait_for_closed_port( self, port: int, addr: str = "localhost", timeout: int = 900 ) -> None: @@ -1090,11 +1123,13 @@ class Machine: self.state_dir, self.shared_dir, self.monitor_path, + self.qmp_path, self.shell_path, allow_reboot, ) self.monitor, _ = monitor_socket.accept() self.shell, _ = shell_socket.accept() + self.qmp_client = QMPSession.from_path(self.qmp_path) # Store last serial console lines for use # of wait_for_console_text @@ -1243,3 +1278,19 @@ class Machine: def run_callbacks(self) -> None: for callback in self.callbacks: callback() + + def switch_root(self) -> None: + """ + Transition from stage 1 to stage 2. This requires the + machine to be configured with `testing.initrdBackdoor = true` + and `boot.initrd.systemd.enable = true`. + """ + self.wait_for_unit("initrd.target") + self.execute( + "systemctl isolate --no-block initrd-switch-root.target 2>/dev/null >/dev/null", + check_return=False, + check_output=False, + ) + self.wait_for_console_text(r"systemd\[1\]:.*Switching root\.") + self.connected = False + self.connect() diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py new file mode 100644 index 0000000000..62ca6d7d5b --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/qmp.py @@ -0,0 +1,98 @@ +import json +import logging +import os +import socket +from collections.abc import Iterator +from pathlib import Path +from queue import Queue +from typing import Any + +logger = logging.getLogger(__name__) + + +class QMPAPIError(RuntimeError): + def __init__(self, message: dict[str, Any]): + assert "error" in message, "Not an error message!" + try: + self.class_name = message["class"] + self.description = message["desc"] + # NOTE: Some errors can occur before the Server is able to read the + # id member; in these cases the id member will not be part of the + # error response, even if provided by the client. + self.transaction_id = message.get("id") + except KeyError: + raise RuntimeError("Malformed QMP API error response") + + def __str__(self) -> str: + return f"" + + +class QMPSession: + def __init__(self, sock: socket.socket) -> None: + self.sock = sock + self.results: Queue[dict[str, str]] = Queue() + self.pending_events: Queue[dict[str, Any]] = Queue() + self.reader = sock.makefile("r") + self.writer = sock.makefile("w") + # Make the reader non-blocking so we can kind of select on it. + os.set_blocking(self.reader.fileno(), False) + hello = self._wait_for_new_result() + logger.debug(f"Got greeting from QMP API: {hello}") + # The greeting message format is: + # { "QMP": { "version": json-object, "capabilities": json-array } } + assert "QMP" in hello, f"Unexpected result: {hello}" + self.send("qmp_capabilities") + + @classmethod + def from_path(cls, path: Path) -> "QMPSession": + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(str(path)) + return cls(sock) + + def __del__(self) -> None: + self.sock.close() + + def _wait_for_new_result(self) -> dict[str, str]: + assert self.results.empty(), "Results set is not empty, missed results!" + while self.results.empty(): + self.read_pending_messages() + return self.results.get() + + def read_pending_messages(self) -> None: + line = self.reader.readline() + if not line: + return + evt_or_result = json.loads(line) + logger.debug(f"Received a message: {evt_or_result}") + + # It's a result + if "return" in evt_or_result or "QMP" in evt_or_result: + self.results.put(evt_or_result) + # It's an event + elif "event" in evt_or_result: + self.pending_events.put(evt_or_result) + else: + raise QMPAPIError(evt_or_result) + + def wait_for_event(self, timeout: int = 10) -> dict[str, Any]: + while self.pending_events.empty(): + self.read_pending_messages() + + return self.pending_events.get(timeout=timeout) + + def events(self, timeout: int = 10) -> Iterator[dict[str, Any]]: + while not self.pending_events.empty(): + yield self.pending_events.get(timeout=timeout) + + def send(self, cmd: str, args: dict[str, str] = {}) -> dict[str, str]: + self.read_pending_messages() + assert self.results.empty(), "Results set is not empty, missed results!" + data: dict[str, Any] = dict(execute=cmd) + if args != {}: + data["arguments"] = args + + logger.debug(f"Sending {data} to QMP...") + json.dump(data, self.writer) + self.writer.write("\n") + self.writer.flush() + return self._wait_for_new_result() diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 4904ad6e35..f522235151 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -42,6 +42,7 @@ rec { , nodes ? {} , testScript , enableOCR ? false + , globalTimeout ? (60 * 60) , name ? "unnamed" , skipTypeCheck ? false # Skip linting (mainly intended for faster dev cycles) diff --git a/third_party/nixpkgs/nixos/lib/testing/driver.nix b/third_party/nixpkgs/nixos/lib/testing/driver.nix index cc97ca7208..b6f01c3819 100644 --- a/third_party/nixpkgs/nixos/lib/testing/driver.nix +++ b/third_party/nixpkgs/nixos/lib/testing/driver.nix @@ -94,6 +94,7 @@ let wrapProgram $out/bin/nixos-test-driver \ --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ + --set globalTimeout "${toString config.globalTimeout}" \ --set vlans '${toString vlans}' \ ${lib.escapeShellArgs (lib.concatMap (arg: ["--add-flags" arg]) config.extraDriverArgs)} ''; @@ -123,6 +124,18 @@ in defaultText = "hostPkgs.qemu_test"; }; + globalTimeout = mkOption { + description = mdDoc '' + A global timeout for the complete test, expressed in seconds. + Beyond that timeout, every resource will be killed and released and the test will fail. + + By default, we use a 1 hour timeout. + ''; + type = types.int; + default = 60 * 60; + example = 10 * 60; + }; + enableOCR = mkOption { description = mdDoc '' Whether to enable Optical Character Recognition functionality for diff --git a/third_party/nixpkgs/nixos/lib/testing/nodes.nix b/third_party/nixpkgs/nixos/lib/testing/nodes.nix index a47d1c98ec..73e6d386fd 100644 --- a/third_party/nixpkgs/nixos/lib/testing/nodes.nix +++ b/third_party/nixpkgs/nixos/lib/testing/nodes.nix @@ -32,9 +32,6 @@ let key = "nodes.nix-pkgs"; config = optionalAttrs (!config.node.pkgsReadOnly) ( mkIf (!options.nixpkgs.pkgs.isDefined) { - # Ensure we do not use aliases. Ideally this is only set - # when the test framework is used by Nixpkgs NixOS tests. - nixpkgs.config.allowAliases = false; # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; } diff --git a/third_party/nixpkgs/nixos/lib/testing/run.nix b/third_party/nixpkgs/nixos/lib/testing/run.nix index 0cd07d8afd..9440c1acdf 100644 --- a/third_party/nixpkgs/nixos/lib/testing/run.nix +++ b/third_party/nixpkgs/nixos/lib/testing/run.nix @@ -16,6 +16,15 @@ in ''; }; + rawTestDerivation = mkOption { + type = types.package; + description = mdDoc '' + Unfiltered version of `test`, for troubleshooting the test framework and `testBuildFailure` in the test framework's test suite. + This is not intended for general use. Use `test` instead. + ''; + internal = true; + }; + test = mkOption { type = types.package; # TODO: can the interactive driver be configured to access the network? @@ -29,25 +38,26 @@ in }; config = { + rawTestDerivation = hostPkgs.stdenv.mkDerivation { + name = "vm-test-run-${config.name}"; + + requiredSystemFeatures = [ "kvm" "nixos-test" ]; + + buildCommand = '' + mkdir -p $out + + # effectively mute the XMLLogger + export LOGFILE=/dev/null + + ${config.driver}/bin/nixos-test-driver -o $out + ''; + + passthru = config.passthru; + + meta = config.meta; + }; test = lib.lazyDerivation { # lazyDerivation improves performance when only passthru items and/or meta are used. - derivation = hostPkgs.stdenv.mkDerivation { - name = "vm-test-run-${config.name}"; - - requiredSystemFeatures = [ "kvm" "nixos-test" ]; - - buildCommand = '' - mkdir -p $out - - # effectively mute the XMLLogger - export LOGFILE=/dev/null - - ${config.driver}/bin/nixos-test-driver -o $out - ''; - - passthru = config.passthru; - - meta = config.meta; - }; + derivation = config.rawTestDerivation; inherit (config) passthru meta; }; diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix index d283742701..d1044802e1 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/examples/basic/system.nix @@ -21,7 +21,6 @@ in virtualisation.azureImage.diskSize = 2500; - system.stateVersion = "20.03"; boot.kernelPackages = pkgs.linuxPackages_latest; # test user doesn't have a password diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 7b743d170b..62a6e1f9aa 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -2,13 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }: { imports = [ # Include the default lxd configuration. - ../../../modules/virtualisation/lxc-container.nix + "${modulesPath}/modules/virtualisation/lxc-container.nix" # Include the container-specific autogenerated configuration. ./lxd.nix ]; @@ -16,5 +16,5 @@ networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - system.stateVersion = "21.05"; # Did you read the comment? + system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 3bd1320b2b..b77f9f5aab 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -13,11 +13,15 @@ }; # copy the config for nixos-rebuild - system.activationScripts.config = '' + system.activationScripts.config = let + config = pkgs.substituteAll { + src = ./lxd-container-image-inner.nix; + stateVersion = lib.trivial.release; + }; + in '' if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos - cat ${./lxd-container-image-inner.nix} > /etc/nixos/configuration.nix - ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxc-container.nix||g' -i /etc/nixos/configuration.nix + cp ${config} /etc/nixos/configuration.nix fi ''; diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index a8f2c63ac5..c1c50b32ff 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -2,13 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }: { imports = [ # Include the default lxd configuration. - ../../../modules/virtualisation/lxd-virtual-machine.nix + "${modulesPath}/virtualisation/lxd-virtual-machine.nix" # Include the container-specific autogenerated configuration. ./lxd.nix ]; @@ -16,5 +16,5 @@ networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - system.stateVersion = "23.05"; # Did you read the comment? + system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index eb0d9217d4..0d96eea0e2 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -13,11 +13,15 @@ }; # copy the config for nixos-rebuild - system.activationScripts.config = '' + system.activationScripts.config = let + config = pkgs.substituteAll { + src = ./lxd-virtual-machine-image-inner.nix; + stateVersion = lib.trivial.release; + }; + in '' if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos - cat ${./lxd-virtual-machine-image-inner.nix} > /etc/nixos/configuration.nix - ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxd-virtual-machine.nix||g' -i /etc/nixos/configuration.nix + cp ${config} /etc/nixos/configuration.nix fi ''; diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix index d06ec0051c..0a931c6918 100644 --- a/third_party/nixpkgs/nixos/modules/config/console.nix +++ b/third_party/nixpkgs/nixos/modules/config/console.nix @@ -127,8 +127,8 @@ in ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}" } \ - -model '${xkbModel}' -layout '${layout}' \ - -option '${xkbOptions}' -variant '${xkbVariant}' > "$out" + -model '${xkb.model}' -layout '${xkb.layout}' \ + -option '${xkb.options}' -variant '${xkb.variant}' > "$out" ''); } diff --git a/third_party/nixpkgs/nixos/modules/config/fanout.nix b/third_party/nixpkgs/nixos/modules/config/fanout.nix new file mode 100644 index 0000000000..60ee145f19 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/config/fanout.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.fanout; + mknodCmds = n: lib.lists.imap0 (i: s: + "mknod /dev/fanout${builtins.toString i} c $MAJOR ${builtins.toString i}" + ) (lib.lists.replicate n ""); +in +{ + options.services.fanout = { + enable = lib.mkEnableOption (lib.mdDoc "fanout"); + fanoutDevices = lib.mkOption { + type = lib.types.int; + default = 1; + description = "Number of /dev/fanout devices"; + }; + bufferSize = lib.mkOption { + type = lib.types.int; + default = 16384; + description = "Size of /dev/fanout buffer in bytes"; + }; + }; + + config = lib.mkIf cfg.enable { + boot.extraModulePackages = [ config.boot.kernelPackages.fanout.out ]; + + boot.kernelModules = [ "fanout" ]; + + boot.extraModprobeConfig = '' + options fanout buffersize=${builtins.toString cfg.bufferSize} + ''; + + systemd.services.fanout = { + description = "Bring up /dev/fanout devices"; + script = '' + MAJOR=$(${pkgs.gnugrep}/bin/grep fanout /proc/devices | ${pkgs.gawk}/bin/awk '{print $1}') + ${lib.strings.concatLines (mknodCmds cfg.fanoutDevices)} + ''; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "oneshot"; + User = "root"; + RemainAfterExit = "yes"; + Restart = "no"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/config/gnu.nix b/third_party/nixpkgs/nixos/modules/config/gnu.nix deleted file mode 100644 index a47d299b22..0000000000 --- a/third_party/nixpkgs/nixos/modules/config/gnu.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options = { - gnu = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - When enabled, GNU software is chosen by default whenever a there is - a choice between GNU and non-GNU software (e.g., GNU lsh - vs. OpenSSH). - ''; - }; - }; - - config = lib.mkIf config.gnu { - - environment.systemPackages = with pkgs; - # TODO: Adjust `requiredPackages' from `system-path.nix'. - # TODO: Add Inetutils once it has the new `ifconfig'. - [ parted - #fdisk # XXX: GNU fdisk currently fails to build and it's redundant - # with the `parted' command. - nano zile - texinfo # for the stand-alone Info reader - ] - ++ lib.optional (!stdenv.isAarch32) grub2; - - - # GNU GRUB, where available. - boot.loader.grub.enable = !pkgs.stdenv.isAarch32; - - # GNU lsh. - services.openssh.enable = false; - services.lshd.enable = true; - programs.ssh.startAgent = false; - services.xserver.startGnuPGAgent = true; - - # TODO: GNU dico. - # TODO: GNU Inetutils' inetd. - # TODO: GNU Pies. - }; -} diff --git a/third_party/nixpkgs/nixos/modules/config/iproute2.nix b/third_party/nixpkgs/nixos/modules/config/iproute2.nix index 8f49e7dbf7..78bd07d680 100644 --- a/third_party/nixpkgs/nixos/modules/config/iproute2.nix +++ b/third_party/nixpkgs/nixos/modules/config/iproute2.nix @@ -7,7 +7,7 @@ let in { options.networking.iproute2 = { - enable = mkEnableOption (lib.mdDoc "copy IP route configuration files"); + enable = mkEnableOption (lib.mdDoc "copying IP route configuration files"); rttablesExtraConfig = mkOption { type = types.lines; default = ""; @@ -18,15 +18,10 @@ in }; config = mkIf cfg.enable { - environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/bpf_pinning"; }; - environment.etc."iproute2/ematch_map" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/ematch_map"; }; - environment.etc."iproute2/group" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/group"; }; - environment.etc."iproute2/nl_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/nl_protos"; }; - environment.etc."iproute2/rt_dsfield" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_dsfield"; }; - environment.etc."iproute2/rt_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_protos"; }; - environment.etc."iproute2/rt_realms" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_realms"; }; - environment.etc."iproute2/rt_scopes" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_scopes"; }; - environment.etc."iproute2/rt_tables" = { mode = "0644"; text = (fileContents "${pkgs.iproute2}/etc/iproute2/rt_tables") - + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); }; + environment.etc."iproute2/rt_tables" = { + mode = "0644"; + text = (fileContents "${pkgs.iproute2}/lib/iproute2/rt_tables") + + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); + }; }; } diff --git a/third_party/nixpkgs/nixos/modules/config/mysql.nix b/third_party/nixpkgs/nixos/modules/config/mysql.nix index 2f13c56f2a..95c9ba7666 100644 --- a/third_party/nixpkgs/nixos/modules/config/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/config/mysql.nix @@ -429,11 +429,11 @@ in ''; }; - # Activation script to append the password from the password file + # preStart script to append the password from the password file # to the configuration files. It also fixes the owner of the # libnss-mysql-root.cfg because it is changed to root after the # password is appended. - system.activationScripts.mysql-auth-passwords = '' + systemd.services.mysql.preStart = '' if [[ -r ${cfg.passwordFile} ]]; then org_umask=$(umask) umask 0077 diff --git a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix index 3f8e088ede..a7ca7a5c74 100644 --- a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix +++ b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix @@ -97,12 +97,8 @@ in nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); - system.activationScripts.nix-channel = mkIf cfg.channel.enable - (stringAfter [ "etc" "users" ] '' - # Subscribe the root user to the NixOS channel by default. - if [ ! -e "/root/.nix-channels" ]; then - echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels" - fi - ''); + systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [ + ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n'' + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/config/qt.nix b/third_party/nixpkgs/nixos/modules/config/qt.nix index 2b09281e46..f82b7ab85a 100644 --- a/third_party/nixpkgs/nixos/modules/config/qt.nix +++ b/third_party/nixpkgs/nixos/modules/config/qt.nix @@ -1,121 +1,154 @@ { config, lib, pkgs, ... }: -with lib; - let - cfg = config.qt; - isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; - isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); - isQt5ct = cfg.platformTheme == "qt5ct"; - isLxqt = cfg.platformTheme == "lxqt"; - isKde = cfg.platformTheme == "kde"; + platformPackages = with pkgs; { + gnome = [ qgnomeplatform qgnomeplatform-qt6 ]; + gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ]; + kde = [ libsForQt5.plasma-integration libsForQt5.systemsettings ]; + lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ]; + qt5ct = [ libsForQt5.qt5ct qt6Packages.qt6ct ]; + }; - packages = - if isQGnome then [ - pkgs.qgnomeplatform - pkgs.adwaita-qt - pkgs.qgnomeplatform-qt6 - pkgs.adwaita-qt6 - ] - else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins pkgs.qt6Packages.qt6gtk2 ] - else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ] - else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] - else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] - else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible."; + stylePackages = with pkgs; { + bb10bright = [ libsForQt5.qtstyleplugins ]; + bb10dark = [ libsForQt5.qtstyleplugins ]; + cde = [ libsForQt5.qtstyleplugins ]; + cleanlooks = [ libsForQt5.qtstyleplugins ]; + gtk2 = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ]; + motif = [ libsForQt5.qtstyleplugins ]; + plastique = [ libsForQt5.qtstyleplugins ]; + adwaita = [ adwaita-qt adwaita-qt6 ]; + adwaita-dark = [ adwaita-qt adwaita-qt6 ]; + adwaita-highcontrast = [ adwaita-qt adwaita-qt6 ]; + adwaita-highcontrastinverse = [ adwaita-qt adwaita-qt6 ]; + + breeze = [ libsForQt5.breeze-qt5 ]; + + kvantum = [ libsForQt5.qtstyleplugin-kvantum qt6Packages.qtstyleplugin-kvantum ]; + }; in - { - meta.maintainers = [ maintainers.romildo ]; + meta.maintainers = with lib.maintainers; [ romildo thiagokokada ]; imports = [ - (mkRenamedOptionModule ["qt5" "enable" ] ["qt" "enable" ]) - (mkRenamedOptionModule ["qt5" "platformTheme" ] ["qt" "platformTheme" ]) - (mkRenamedOptionModule ["qt5" "style" ] ["qt" "style" ]) + (lib.mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ]) + (lib.mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ]) + (lib.mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ]) ]; options = { qt = { + enable = lib.mkEnableOption "" // { + description = lib.mdDoc '' + Whether to enable Qt configuration, including theming. - enable = mkEnableOption (lib.mdDoc "Qt theming configuration"); + Enabling this option is necessary for Qt plugins to work in the + installed profiles (e.g.: `nix-env -i` or `environment.systemPackages`). + ''; + }; - platformTheme = mkOption { - type = types.enum [ - "gtk2" - "gnome" - "lxqt" - "qt5ct" - "kde" - ]; + platformTheme = lib.mkOption { + type = with lib.types; nullOr (enum (lib.attrNames platformPackages)); + default = null; example = "gnome"; relatedPackages = [ "qgnomeplatform" "qgnomeplatform-qt6" - ["libsForQt5" "qtstyleplugins"] - ["libsForQt5" "qt5ct"] - ["lxqt" "lxqt-qtplugin"] - ["libsForQt5" "plasma-integration"] + [ "libsForQt5" "plasma-integration" ] + [ "libsForQt5" "qt5ct" ] + [ "libsForQt5" "qtstyleplugins" ] + [ "libsForQt5" "systemsettings" ] + [ "lxqt" "lxqt-config" ] + [ "lxqt" "lxqt-qtplugin" ] + [ "qt6Packages" "qt6ct" ] + [ "qt6Packages" "qt6gtk2" ] ]; description = lib.mdDoc '' Selects the platform theme to use for Qt applications. The options are - - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform) + - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `kde`: Use Qt settings from Plasma. - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config) application. - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/) - application. - - `kde`: Use Qt settings from Plasma. + and [qt6ct](https://github.com/trialuser02/qt6ct) applications. ''; }; - style = mkOption { - type = types.enum [ - "adwaita" - "adwaita-dark" - "cleanlooks" - "gtk2" - "motif" - "plastique" - ]; + style = lib.mkOption { + type = with lib.types; nullOr (enum (lib.attrNames stylePackages)); + default = null; example = "adwaita"; relatedPackages = [ "adwaita-qt" "adwaita-qt6" - ["libsForQt5" "qtstyleplugins"] - ["qt6Packages" "qt6gtk2"] + [ "libsForQt5" "breeze-qt5" ] + [ "libsForQt5" "qtstyleplugin-kvantum" ] + [ "libsForQt5" "qtstyleplugins" ] + [ "qt6Packages" "qt6gtk2" ] + [ "qt6Packages" "qtstyleplugin-kvantum" ] ]; description = lib.mdDoc '' Selects the style to use for Qt applications. The options are - - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with + - `adwaita`, `adwaita-dark`, `adwaita-highcontrast`, `adawaita-highcontrastinverse`: + Use Adwaita Qt style with [adwaita](https://github.com/FedoraQt/adwaita-qt) - - `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from + - `breeze`: Use the Breeze style from + [breeze](https://github.com/KDE/breeze) + - `bb10bright`, `bb10dark`, `cleanlooks`, `gtk2`, `motif`, `plastique`: + Use styles from [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `kvantum`: Use styles from + [kvantum](https://github.com/tsujan/Kvantum) ''; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + assertions = + let + gnomeStyles = [ + "adwaita" + "adwaita-dark" + "adwaita-highcontrast" + "adwaita-highcontrastinverse" + "breeze" + ]; + in + [ + { + assertion = cfg.platformTheme == "gnome" -> (builtins.elem cfg.style gnomeStyles); + message = '' + `qt.platformTheme` "gnome" must have `qt.style` set to a theme that supports both Qt and Gtk, + for example: ${lib.concatStringsSep ", " gnomeStyles}. + ''; + } + ]; environment.variables = { - QT_QPA_PLATFORMTHEME = cfg.platformTheme; - QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style; + QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme; + QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style; }; - environment.profileRelativeSessionVariables = let - qtVersions = with pkgs; [ qt5 qt6 ]; - in { - QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions; - QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions; - }; - - environment.systemPackages = packages; + environment.profileRelativeSessionVariables = + let + qtVersions = with pkgs; [ qt5 qt6 ]; + in + { + QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions; + QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions; + }; + environment.systemPackages = + lib.optionals (cfg.platformTheme != null) (platformPackages.${cfg.platformTheme}) + ++ lib.optionals (cfg.style != null) (stylePackages.${cfg.style}); }; } diff --git a/third_party/nixpkgs/nixos/modules/config/stevenblack.nix b/third_party/nixpkgs/nixos/modules/config/stevenblack.nix index 07a0aa339a..30ef7ff259 100644 --- a/third_party/nixpkgs/nixos/modules/config/stevenblack.nix +++ b/third_party/nixpkgs/nixos/modules/config/stevenblack.nix @@ -15,7 +15,7 @@ let in { options.networking.stevenblack = { - enable = mkEnableOption (mdDoc "Enable the stevenblack hosts file blocklist"); + enable = mkEnableOption (mdDoc "the stevenblack hosts file blocklist"); block = mkOption { type = types.listOf (types.enum [ "fakenews" "gambling" "porn" "social" ]); diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index 7e623dec4b..71274ea899 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -89,12 +89,6 @@ in for a running system, entries can be removed for a more minimal NixOS installation. - Note: If `pkgs.nano` is removed from this list, - make sure another editor is installed and the - `EDITOR` environment variable is set to it. - Environment variables can be set using - {option}`environment.variables`. - Like with systemPackages, packages are installed to {file}`/run/current-system/sw`. They are automatically available to all users, and are diff --git a/third_party/nixpkgs/nixos/modules/config/terminfo.nix b/third_party/nixpkgs/nixos/modules/config/terminfo.nix index d1dbc4e0d0..ebd1aaea8f 100644 --- a/third_party/nixpkgs/nixos/modules/config/terminfo.nix +++ b/third_party/nixpkgs/nixos/modules/config/terminfo.nix @@ -16,10 +16,7 @@ with lib; }; security.sudo.keepTerminfo = mkOption { - default = config.security.sudo.package.pname != "sudo-rs"; - defaultText = literalMD '' - `true` unless using `sudo-rs` - ''; + default = true; type = types.bool; description = lib.mdDoc '' Whether to preserve the `TERMINFO` and `TERMINFO_DIRS` diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index f11a1f82fc..39aac9fb82 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -153,7 +153,7 @@ let {file}`pam_mount.conf.xml`. Useful attributes might include `path`, `options`, `fstype`, and `server`. - See + See for more information. ''; }; @@ -172,6 +172,17 @@ let ''; }; + ignoreShellProgramCheck = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + By default, nixos will check that programs.SHELL.enable is set to + true if the user has a custom shell specified. If that behavior isn't + required and there are custom overrides in place to make sure that the + shell is functional, set this to true. + ''; + }; + subUidRanges = mkOption { type = with types; listOf (submodule subordinateUidRange); default = []; @@ -330,6 +341,20 @@ let administrator before being able to use the system again. ''; }; + + linger = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable lingering for this user. If true, systemd user + units will start at boot, rather than starting at login and stopping + at logout. This is the declarative equivalent of running + `loginctl enable-linger` for this user. + + If false, user units will not be started until the user logs in, and + may be stopped on logout depending on the settings in `logind.conf`. + ''; + }; }; config = mkMerge @@ -581,6 +606,14 @@ in { defaultText = literalExpression "config.users.users.\${name}.group"; default = cfg.users.${name}.group; }; + options.shell = mkOption { + type = types.passwdEntry types.path; + description = '' + The path to the user's shell in initrd. + ''; + default = "${pkgs.shadow}/bin/nologin"; + defaultText = literalExpression "\${pkgs.shadow}/bin/nologin"; + }; })); }; @@ -663,6 +696,20 @@ in { ''; }; + system.activationScripts.update-lingering = let + lingerDir = "/var/lib/systemd/linger"; + lingeringUsers = map (u: u.name) (attrValues (flip filterAttrs cfg.users (n: u: u.linger))); + lingeringUsersFile = builtins.toFile "lingering-users" + (concatStrings (map (s: "${s}\n") + (sort (a: b: a < b) lingeringUsers))); # this sorting is important for `comm` to work correctly + in stringAfter [ "users" ] '' + if [ -e ${lingerDir} ] ; then + cd ${lingerDir} + ls ${lingerDir} | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger + ls ${lingerDir} | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger + fi + ''; + # Warn about user accounts with deprecated password hashing schemes system.activationScripts.hashes = { deps = [ "users" ]; @@ -702,7 +749,8 @@ in { environment.profiles = [ "$HOME/.nix-profile" - "\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile" + "\${XDG_STATE_HOME}/nix/profile" + "$HOME/.local/state/nix/profile" "/etc/profiles/per-user/$USER" ]; @@ -710,17 +758,20 @@ in { boot.initrd.systemd = lib.mkIf config.boot.initrd.systemd.enable { contents = { "/etc/passwd".text = '' - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { uid, group }: let + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { uid, group, shell }: let g = config.boot.initrd.systemd.groups.${group}; - in "${n}:x:${toString uid}:${toString g.gid}::/var/empty:") config.boot.initrd.systemd.users)} + in "${n}:x:${toString uid}:${toString g.gid}::/var/empty:${shell}") config.boot.initrd.systemd.users)} ''; "/etc/group".text = '' ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { gid }: "${n}:x:${toString gid}:") config.boot.initrd.systemd.groups)} ''; + "/etc/shells".text = lib.concatStringsSep "\n" (lib.unique (lib.mapAttrsToList (_: u: u.shell) config.boot.initrd.systemd.users)) + "\n"; }; + storePaths = [ "${pkgs.shadow}/bin/nologin" ]; + users = { - root = {}; + root = { shell = lib.mkDefault "/bin/bash"; }; nobody = {}; }; @@ -824,13 +875,17 @@ in { ''; } ] ++ (map (shell: { - assertion = (user.shell == pkgs.${shell}) -> (config.programs.${shell}.enable == true); + assertion = !user.ignoreShellProgramCheck -> (user.shell == pkgs.${shell}) -> (config.programs.${shell}.enable == true); message = '' users.users.${user.name}.shell is set to ${shell}, but programs.${shell}.enable is not true. This will cause the ${shell} shell to lack the basic nix directories in its PATH and might make logging in as that user impossible. You can fix it with: programs.${shell}.enable = true; + + If you know what you're doing and you are fine with the behavior, + set users.users.${user.name}.ignoreShellProgramCheck = true; + instead. ''; }) [ "fish" diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 08141bb0e8..6f58e848b3 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -18,29 +18,16 @@ in { options = { - hardware.enableAllFirmware = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware. - ''; - }; + hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license"; - hardware.enableRedistributableFirmware = mkOption { + hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // { default = config.hardware.enableAllFirmware; defaultText = lib.literalExpression "config.hardware.enableAllFirmware"; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware with a license allowing redistribution. - ''; }; - hardware.wirelessRegulatoryDatabase = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Load the wireless regulatory database at boot. - ''; + hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // { + default = cfg.enableRedistributableFirmware || cfg.enableAllFirmware; + defaultText = literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`."; }; }; @@ -65,7 +52,6 @@ in { ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; - hardware.wirelessRegulatoryDatabase = true; }) (mkIf cfg.enableAllFirmware { assertions = [{ diff --git a/third_party/nixpkgs/nixos/modules/hardware/corectrl.nix b/third_party/nixpkgs/nixos/modules/hardware/corectrl.nix index 965cbe0267..8ef61a158d 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/corectrl.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/corectrl.nix @@ -8,13 +8,13 @@ in { options.programs.corectrl = { enable = mkEnableOption (lib.mdDoc '' - A tool to overclock amd graphics cards and processors. + CoreCtrl, a tool to overclock amd graphics cards and processors. Add your user to the corectrl group to run corectrl without needing to enter your password ''); gpuOverclock = { enable = mkEnableOption (lib.mdDoc '' - true + GPU overclocking ''); ppfeaturemask = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/x86-msr.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/x86-msr.nix new file mode 100644 index 0000000000..554bec1b7d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/x86-msr.nix @@ -0,0 +1,91 @@ +{ lib +, config +, options +, ... +}: +let + inherit (builtins) hasAttr; + inherit (lib) mkIf mdDoc; + cfg = config.hardware.cpu.x86.msr; + opt = options.hardware.cpu.x86.msr; + defaultGroup = "msr"; + isDefaultGroup = cfg.group == defaultGroup; + set = "to set for devices of the `msr` kernel subsystem."; + + # Generates `foo=bar` parameters to pass to the kernel. + # If `module = baz` is passed, generates `baz.foo=bar`. + # Adds double quotes on demand to handle `foo="bar baz"`. + kernelParam = { module ? null }: name: value: + assert lib.asserts.assertMsg (!lib.strings.hasInfix "=" name) "kernel parameter cannot have '=' in name"; + let + key = (if module == null then "" else module + ".") + name; + valueString = lib.generators.mkValueStringDefault {} value; + quotedValueString = if lib.strings.hasInfix " " valueString + then lib.strings.escape ["\""] valueString + else valueString; + in "${key}=${quotedValueString}"; + msrKernelParam = kernelParam { module = "msr"; }; +in +{ + options.hardware.cpu.x86.msr = with lib.options; with lib.types; { + enable = mkEnableOption (mdDoc "the `msr` (Model-Specific Registers) kernel module and configure `udev` rules for its devices (usually `/dev/cpu/*/msr`)"); + owner = mkOption { + type = str; + default = "root"; + example = "nobody"; + description = mdDoc "Owner ${set}"; + }; + group = mkOption { + type = str; + default = defaultGroup; + example = "nobody"; + description = mdDoc "Group ${set}"; + }; + mode = mkOption { + type = str; + default = "0640"; + example = "0660"; + description = mdDoc "Mode ${set}"; + }; + settings = mkOption { + type = submodule { + freeformType = attrsOf (oneOf [ bool int str ]); + options.allow-writes = mkOption { + type = nullOr (enum ["on" "off"]); + default = null; + description = "Whether to allow writes to MSRs (`\"on\"`) or not (`\"off\"`)."; + }; + }; + default = {}; + description = "Parameters for the `msr` kernel module."; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = hasAttr cfg.owner config.users.users; + message = "Owner '${cfg.owner}' set in `${opt.owner}` is not configured via `${options.users.users}.\"${cfg.owner}\"`."; + } + { + assertion = isDefaultGroup || (hasAttr cfg.group config.users.groups); + message = "Group '${cfg.group}' set in `${opt.group}` is not configured via `${options.users.groups}.\"${cfg.group}\"`."; + } + ]; + + boot = { + kernelModules = [ "msr" ]; + kernelParams = lib.attrsets.mapAttrsToList msrKernelParam (lib.attrsets.filterAttrs (_: value: value != null) cfg.settings); + }; + + users.groups.${cfg.group} = mkIf isDefaultGroup { }; + + services.udev.extraRules = '' + SUBSYSTEM=="msr", OWNER="${cfg.owner}", GROUP="${cfg.group}", MODE="${cfg.mode}" + ''; + }; + + meta = with lib; { + maintainers = with maintainers; [ lorenzleutgeb ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/i2c.nix b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix index 9a5a2e4481..bd4c4ebe21 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/i2c.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix @@ -11,7 +11,7 @@ in enable = mkEnableOption (lib.mdDoc '' i2c devices support. By default access is granted to users in the "i2c" group (will be created if non-existent) and any user with a seat, meaning - logged on the computer locally. + logged on the computer locally ''); group = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix b/third_party/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix index 17baff83d8..ff984fa5da 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/keyboard/uhk.nix @@ -11,7 +11,7 @@ in non-root access to the firmware of UHK keyboards. You need it when you want to flash a new firmware on the keyboard. Access to the keyboard is granted to users in the "input" group. - You may want to install the uhk-agent package. + You may want to install the uhk-agent package ''); }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix index a04b67b5c8..191fb12cca 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix @@ -11,7 +11,7 @@ in udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I. You need it when you want to flash a new configuration on the keyboard or use their live training in the browser. - You may want to install the wally-cli package. + You may want to install the wally-cli package ''); }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix index aaa4000e75..abbafaee89 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix @@ -50,7 +50,7 @@ in options = { hardware.openrazer = { enable = mkEnableOption (lib.mdDoc '' - OpenRazer drivers and userspace daemon. + OpenRazer drivers and userspace daemon ''); verboseLogging = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix b/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix index 3ae876bd1f..fd8b48a5e9 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix @@ -9,7 +9,7 @@ in { options.hardware.tuxedo-keyboard = { enable = mkEnableOption (lib.mdDoc '' - Enables the tuxedo-keyboard driver. + the tuxedo-keyboard driver. To configure the driver, pass the options to the {option}`boot.kernelParams` configuration. There are several parameters you can change. It's best to check at the source code description which options are supported. diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index a40713ac25..c36775dd24 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -24,7 +24,7 @@ in { options = { hardware.nvidia = { datacenter.enable = lib.mkEnableOption (lib.mdDoc '' - Data Center drivers for NVIDIA cards on a NVLink topology. + Data Center drivers for NVIDIA cards on a NVLink topology ''); datacenter.settings = lib.mkOption { type = settingsFormat.type; @@ -79,18 +79,18 @@ in { powerManagement.enable = lib.mkEnableOption (lib.mdDoc '' experimental power management through systemd. For more information, see - the NVIDIA docs, on Chapter 21. Configuring Power Management Support. + the NVIDIA docs, on Chapter 21. Configuring Power Management Support ''); powerManagement.finegrained = lib.mkEnableOption (lib.mdDoc '' experimental power management of PRIME offload. For more information, see - the NVIDIA docs, on Chapter 22. PCI-Express Runtime D3 (RTD3) Power Management. + the NVIDIA docs, on Chapter 22. PCI-Express Runtime D3 (RTD3) Power Management ''); dynamicBoost.enable = lib.mkEnableOption (lib.mdDoc '' dynamic Boost balances power between the CPU and the GPU for improved performance on supported laptops using the nvidia-powerd daemon. For more - information, see the NVIDIA docs, on Chapter 23. Dynamic Boost on Linux. + information, see the NVIDIA docs, on Chapter 23. Dynamic Boost on Linux ''); modesetting.enable = lib.mkEnableOption (lib.mdDoc '' @@ -99,7 +99,7 @@ in { Enabling this fixes screen tearing when using Optimus via PRIME (see {option}`hardware.nvidia.prime.sync.enable`. This is not enabled by default because it is not officially supported by NVIDIA and would not - work with SLI. + work with SLI ''); prime.nvidiaBusId = lib.mkOption { @@ -153,11 +153,11 @@ in { Note that this configuration will only be successful when a display manager for which the {option}`services.xserver.displayManager.setupCommands` - option is supported is used. + option is supported is used ''); prime.allowExternalGpu = lib.mkEnableOption (lib.mdDoc '' - configuring X to allow external NVIDIA GPUs when using Prime [Reverse] sync optimus. + configuring X to allow external NVIDIA GPUs when using Prime [Reverse] sync optimus ''); prime.offload.enable = lib.mkEnableOption (lib.mdDoc '' @@ -166,7 +166,7 @@ in { If this is enabled, then the bus IDs of the NVIDIA and Intel/AMD GPUs have to be specified ({option}`hardware.nvidia.prime.nvidiaBusId` and {option}`hardware.nvidia.prime.intelBusId` or - {option}`hardware.nvidia.prime.amdgpuBusId`). + {option}`hardware.nvidia.prime.amdgpuBusId`) ''); prime.offload.enableOffloadCmd = lib.mkEnableOption (lib.mdDoc '' @@ -174,7 +174,7 @@ in { for offloading programs to an nvidia device. To work, should have also enabled {option}`hardware.nvidia.prime.offload.enable` or {option}`hardware.nvidia.prime.reverseSync.enable`. - Example usage `nvidia-offload sauerbraten_client`. + Example usage `nvidia-offload sauerbraten_client` ''); prime.reverseSync.enable = lib.mkEnableOption (lib.mdDoc '' @@ -202,25 +202,25 @@ in { Note that this configuration will only be successful when a display manager for which the {option}`services.xserver.displayManager.setupCommands` - option is supported is used. + option is supported is used ''); nvidiaSettings = (lib.mkEnableOption (lib.mdDoc '' - nvidia-settings, NVIDIA's GUI configuration tool. + nvidia-settings, NVIDIA's GUI configuration tool '')) // {default = true;}; nvidiaPersistenced = lib.mkEnableOption (lib.mdDoc '' nvidia-persistenced a update for NVIDIA GPU headless mode, i.e. - It ensures all GPUs stay awake even during headless mode. + It ensures all GPUs stay awake even during headless mode ''); forceFullCompositionPipeline = lib.mkEnableOption (lib.mdDoc '' forcefully the full composition pipeline. This sometimes fixes screen tearing issues. This has been reported to reduce the performance of some OpenGL applications and may produce issues in WebGL. - It also drastically increases the time the driver needs to clock down after load. + It also drastically increases the time the driver needs to clock down after load ''); package = lib.mkOption { @@ -269,9 +269,9 @@ in { services.udev.extraRules = '' # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c 195 $${i}; done'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix index 480c636aa0..a0ec9c98a5 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -12,7 +12,7 @@ in { - options.hardware.facetimehd.enable = mkEnableOption (lib.mdDoc "facetimehd kernel module"); + options.hardware.facetimehd.enable = mkEnableOption (lib.mdDoc "the facetimehd kernel module"); options.hardware.facetimehd.withCalibration = mkOption { default = false; diff --git a/third_party/nixpkgs/nixos/modules/image/repart.nix b/third_party/nixpkgs/nixos/modules/image/repart.nix index e567485c9d..41e6110885 100644 --- a/third_party/nixpkgs/nixos/modules/image/repart.nix +++ b/third_party/nixpkgs/nixos/modules/image/repart.nix @@ -34,12 +34,13 @@ let }; }); default = { }; - example = lib.literalExpression '' { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + example = lib.literalExpression '' + { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - "/loader/entries/nixos.conf".source = systemdBootEntry; - } + "/loader/entries/nixos.conf".source = systemdBootEntry; + } ''; description = lib.mdDoc "The contents to end up in the filesystem image."; }; @@ -90,34 +91,33 @@ in package = lib.mkPackageOption pkgs "systemd-repart" { default = "systemd"; - example = lib.literalExpression '' - pkgs.systemdMinimal.override { withCryptsetup = true; } - ''; + example = "pkgs.systemdMinimal.override { withCryptsetup = true; }"; }; partitions = lib.mkOption { type = with lib.types; attrsOf (submodule partitionOptions); default = { }; - example = lib.literalExpression '' { - "10-esp" = { - contents = { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - } - repartConfig = { - Type = "esp"; - Format = "fat"; + example = lib.literalExpression '' + { + "10-esp" = { + contents = { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + } + repartConfig = { + Type = "esp"; + Format = "fat"; + }; + }; + "20-root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Minimize = "guess"; + }; }; }; - "20-root" = { - storePaths = [ config.system.build.toplevel ]; - repartConfig = { - Type = "root"; - Format = "ext4"; - Minimize = "guess"; - }; - }; - }; ''; description = lib.mdDoc '' Specify partitions as a set of the names of the partitions with their @@ -208,10 +208,7 @@ in | tee repart-output.json ''; - meta = { - maintainers = with lib.maintainers; [ nikstur ]; - doc = ./repart.md; - }; + meta.maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix index 8426ba8fac..bc70dc985f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix @@ -3,8 +3,6 @@ { config, lib, pkgs, ... }: -with lib; - let # This is copied into the installer image, so it's important that it is filtered # to avoid including a large .git directory. @@ -27,38 +25,40 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - ${optionalString (config.system.nixos.revision != null) '' + ${lib.optionalString (config.system.nixos.revision != null) '' echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision ''} echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; - in { - # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source. - # FIXME: this might be surprising and is really only needed for offline installations, - # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 - nix.registry.nixpkgs.to = { - type = "path"; - path = "${channelSources}/nixos"; - }; + options.system.installer.channel.enable = (lib.mkEnableOption "bundling NixOS/Nixpkgs channel in the installer") // { default = true; }; + config = lib.mkIf config.system.installer.channel.enable { + # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source. + # FIXME: this might be surprising and is really only needed for offline installations, + # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 + nix.registry.nixpkgs.to = { + type = "path"; + path = "${channelSources}/nixos"; + }; - # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required - # for nixos-install. - boot.postBootCommands = mkAfter - '' - if ! [ -e /var/lib/nixos/did-channel-init ]; then - echo "unpacking the NixOS/Nixpkgs sources..." - mkdir -p /nix/var/nix/profiles/per-user/root - ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ - -i ${channelSources} --quiet --option build-use-substitutes false \ - ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root - mkdir -m 0700 -p /root/.nix-defexpr - ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels - mkdir -m 0755 -p /var/lib/nixos - touch /var/lib/nixos/did-channel-init - fi - ''; + # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required + # for nixos-install. + boot.postBootCommands = lib.mkAfter + '' + if ! [ -e /var/lib/nixos/did-channel-init ]; then + echo "unpacking the NixOS/Nixpkgs sources..." + mkdir -p /nix/var/nix/profiles/per-user/root + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ + -i ${channelSources} --quiet --option build-use-substitutes false \ + ${lib.optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root + mkdir -m 0700 -p /root/.nix-defexpr + ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels + mkdir -m 0755 -p /var/lib/nixos + touch /var/lib/nixos/did-channel-init + fi + ''; + }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 10c37a46fd..e4241e9654 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0"; - i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0"; - aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0"; - x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0"; - aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0"; + x86_64-linux = "/nix/store/azvn85cras6xv4z5j85fiy406f24r1q0-nix-2.18.1"; + i686-linux = "/nix/store/9bnwy7f9h0kzdzmcnjjsjg0aak5waj40-nix-2.18.1"; + aarch64-linux = "/nix/store/hh65xwqm9s040s3cgn9vzcmrxj0sf5ij-nix-2.18.1"; + x86_64-darwin = "/nix/store/6zi5fqzn9n17wrk8r41rhdw4j7jqqsi3-nix-2.18.1"; + aarch64-darwin = "/nix/store/0pbq6wzr2f1jgpn5212knyxpwmkjgjah-nix-2.18.1"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 7d0c5898e2..2f9edba4f0 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -102,22 +102,6 @@ sub cpuManufacturer { return $cpuinfo =~ /^vendor_id\s*:.* $id$/m; } - -# Determine CPU governor to use -if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { - my $governors = read_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"); - # ondemand governor is not available on sandy bridge or later Intel CPUs - my @desired_governors = ("ondemand", "powersave"); - my $e; - - foreach $e (@desired_governors) { - if (index($governors, $e) != -1) { - last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";"); - } - } -} - - # Virtualization support? push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; @@ -146,7 +130,7 @@ sub pciCheck { debug "\n"; if (defined $module) { - # See the bottom of http://pciids.sourceforge.net/pci.ids for + # See the bottom of https://pciids.sourceforge.net/pci.ids for # device classes. if (# Mass-storage controller. Definitely important. $class =~ /^0x01/ || @@ -273,6 +257,7 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") { # Add bcache module, if needed. my @bcacheDevices = glob("/dev/bcache*"); +@bcacheDevices = grep(!qr#dev/bcachefs.*#, @bcacheDevices); if (scalar @bcacheDevices > 0) { push @initrdAvailableKernelModules, "bcache"; } @@ -483,6 +468,19 @@ EOF # boot.tmp.useTmpfs option in configuration.nix (managed declaratively). next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # This should work for single and multi-device systems. + # still needs subvolume support + if ($fsType eq "bcachefs") { + my ($status, @info) = runCommand("bcachefs fs usage $rootDir$mountPoint"); + my $UUID = $info[0]; + + if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) { + $stableDevPath = "UUID=$1"; + } else { + print STDERR "warning: can't find bcachefs mount UUID falling back to device-path"; + } + } + # Emit the filesystem. $fileSystems .= </dev/null + find $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null fi ''; in diff --git a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix index 4978c428ce..4ba156f2db 100644 --- a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix +++ b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix @@ -9,7 +9,7 @@ with lib; 1714 to 1764 as they are needed for it to function properly. You can use the {option}`package` to use `gnomeExtensions.gsconnect` as an alternative - implementation if you use Gnome. + implementation if you use Gnome ''); package = mkOption { default = pkgs.plasma5Packages.kdeconnect-kde; diff --git a/third_party/nixpkgs/nixos/modules/programs/nano.nix b/third_party/nixpkgs/nixos/modules/programs/nano.nix index 28ddb4aaf6..88404f3557 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nano.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nano.nix @@ -29,7 +29,7 @@ in syntaxHighlight = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = lib.mdDoc "Whether to enable syntax highlight for various languages."; }; }; @@ -40,6 +40,7 @@ in etc.nanorc.text = (lib.optionalString cfg.syntaxHighlight '' # load syntax highlighting files include "${cfg.package}/share/nano/*.nanorc" + include "${cfg.package}/share/nano/extra/*.nanorc" '') + cfg.nanorc; systemPackages = [ cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/npm.nix b/third_party/nixpkgs/nixos/modules/programs/npm.nix index 48dc48e668..c41fea3261 100644 --- a/third_party/nixpkgs/nixos/modules/programs/npm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/npm.nix @@ -34,7 +34,7 @@ in prefix = ''${HOME}/.npm https-proxy=proxy.example.com init-license=MIT - init-author-url=http://npmjs.org + init-author-url=https://www.npmjs.com/ color=true ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix index df7e9ef22c..37a1bfeb0c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix +++ b/third_party/nixpkgs/nixos/modules/programs/openvpn3.nix @@ -8,11 +8,23 @@ in { options.programs.openvpn3 = { enable = mkEnableOption (lib.mdDoc "the openvpn3 client"); + package = mkOption { + type = types.package; + default = pkgs.openvpn3.override { + enableSystemdResolved = config.services.resolved.enable; + }; + defaultText = literalExpression ''pkgs.openvpn3.override { + enableSystemdResolved = config.services.resolved.enable; + }''; + description = lib.mdDoc '' + Which package to use for `openvpn3`. + ''; + }; }; config = mkIf cfg.enable { - services.dbus.packages = with pkgs; [ - openvpn3 + services.dbus.packages = [ + cfg.package ]; users.users.openvpn = { @@ -25,8 +37,8 @@ in gid = config.ids.gids.openvpn; }; - environment.systemPackages = with pkgs; [ - openvpn3 + environment.systemPackages = [ + cfg.package ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/projecteur.nix b/third_party/nixpkgs/nixos/modules/programs/projecteur.nix new file mode 100644 index 0000000000..9fcd357d3b --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/projecteur.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.projecteur; +in +{ + options.programs.projecteur = { + enable = lib.mkEnableOption (lib.mdDoc "projecteur"); + package = lib.mkPackageOptionMD pkgs "projecteur" { }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; + + meta = { + maintainers = with lib.maintainers; [ benneti drupol ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/regreet.nix b/third_party/nixpkgs/nixos/modules/programs/regreet.nix index 640bc25957..0fd9cf2329 100644 --- a/third_party/nixpkgs/nixos/modules/programs/regreet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/regreet.nix @@ -36,6 +36,19 @@ in ''; }; + cageArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "-s" ]; + example = lib.literalExpression + '' + [ "-s" "-m" "last" ] + ''; + description = lib.mdDoc '' + Additional arguments to be passed to + [cage](https://github.com/cage-kiosk/cage). + ''; + }; + extraCss = lib.mkOption { type = lib.types.either lib.types.path lib.types.lines; default = ""; @@ -50,7 +63,7 @@ in config = lib.mkIf cfg.enable { services.greetd = { enable = lib.mkDefault true; - settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}"; + settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}"; }; environment.etc = { diff --git a/third_party/nixpkgs/nixos/modules/programs/virt-manager.nix b/third_party/nixpkgs/nixos/modules/programs/virt-manager.nix new file mode 100644 index 0000000000..095db7586a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/virt-manager.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.virt-manager; +in { + options.programs.virt-manager = { + enable = lib.mkEnableOption "virt-manager, an UI for managing virtual machines in libvirt"; + + package = lib.mkPackageOption pkgs "virt-manager" {}; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + programs.dconf.enable = true; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/cardboard.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/cardboard.nix new file mode 100644 index 0000000000..262c698c74 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/cardboard.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.cardboard; +in +{ + meta.maintainers = with lib.maintainers; [ AndersonTorres ]; + + options.programs.cardboard = { + enable = lib.mkEnableOption (lib.mdDoc "cardboard"); + + package = lib.mkPackageOptionMD pkgs "cardboard" { }; + }; + + config = lib.mkIf cfg.enable (lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; + + # To make a cardboard session available for certain DMs like SDDM + services.xserver.displayManager.sessionPackages = [ cfg.package ]; + } + (import ./wayland-session.nix { inherit lib pkgs; }) + ]); +} diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix index de739faabe..698d9c2b46 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix @@ -42,11 +42,6 @@ in { and "man 5 sway" for more information''); - enableRealtime = mkEnableOption (lib.mdDoc '' - add CAP_SYS_NICE capability on `sway` binary for realtime scheduling - privileges. This may improve latency and reduce stuttering, specially in - high load scenarios'') // { default = true; }; - package = mkOption { type = with types; nullOr package; default = defaultSwayPackage; @@ -154,14 +149,6 @@ in { "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; - security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) { - sway = { - owner = "root"; - group = "root"; - source = "${cfg.package}/bin/sway"; - capabilities = "cap_sys_nice+ep"; - }; - }; # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } (import ./wayland-session.nix { inherit lib pkgs; }) diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix index d0b280e394..9ea2010cf5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix @@ -6,7 +6,7 @@ in meta.maintainers = with lib.maintainers; [ rewine ]; options.programs.wayfire = { - enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots."); + enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots"); package = lib.mkPackageOptionMD pkgs "wayfire" { }; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.md b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.md index 73d425244c..6a310006ed 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.md +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.md @@ -78,7 +78,7 @@ If third-party customizations (e.g. new themes) are supposed to be added to - Completion scripts are supposed to be stored at `$out/share/zsh/site-functions`. This directory is part of the - [`fpath`](http://zsh.sourceforge.net/Doc/Release/Functions.html) + [`fpath`](https://zsh.sourceforge.io/Doc/Release/Functions.html) and the package should be compatible with pure `ZSH` setups. The module will automatically link the contents of `site-functions` to completions directory in the proper diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 408c515044..3fab863adb 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -54,7 +54,6 @@ in (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") - (mkRemovedOptionModule [ "services" "ddclient" ] "ddclient has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.") # Added 2023-07-04 (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") @@ -112,6 +111,7 @@ in (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") + (mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead") (mkRemovedOptionModule [ "services" "dhcpd4" ] '' diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix index 92bed172f4..7cc302969f 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix @@ -184,6 +184,7 @@ let certToConfig = cert: data: let acmeServer = data.server; useDns = data.dnsProvider != null; + useDnsOrS3 = useDns || data.s3Bucket != null; destPath = "/var/lib/acme/${cert}"; selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ]; @@ -219,7 +220,8 @@ let [ "--dns" data.dnsProvider ] ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] - ) else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] + ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ] + else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] else [ "--http" "--http.webroot" data.webroot ]; commonOpts = [ @@ -343,6 +345,10 @@ let serviceConfig = commonServiceConfig // { Group = data.group; + # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. + # This avoids eating them all up if something is misconfigured upon the first try. + RestartSec = 15 * 60; + # Keep in mind that these directories will be deleted if the user runs # systemctl clean --what=state # acme/.lego/${cert} is listed for this reason. @@ -362,13 +368,12 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - # Only try loading the environmentFile if the dns challenge is enabled - EnvironmentFile = mkIf useDns data.environmentFile; + EnvironmentFile = mkIf useDnsOrS3 data.environmentFile; - Environment = mkIf useDns + Environment = mkIf useDnsOrS3 (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); - LoadCredential = mkIf useDns + LoadCredential = mkIf useDnsOrS3 (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) @@ -592,7 +597,7 @@ let description = lib.mdDoc '' Key type to use for private keys. For an up to date list of supported values check the --key-type option - at . + at . ''; }; @@ -755,6 +760,15 @@ let ''; }; + s3Bucket = mkOption { + type = types.nullOr types.str; + default = null; + example = "acme"; + description = lib.mdDoc '' + S3 bucket name to use for HTTP-01 based challenges. Challenges will be written to the S3 bucket. + ''; + }; + inheritDefaults = mkOption { default = true; example = true; @@ -928,35 +942,20 @@ in { and remove the wildcard from the path. ''; } - { - assertion = data.dnsProvider == null || data.webroot == null; + (let exclusiveAttrs = { + inherit (data) dnsProvider webroot listenHTTP s3Bucket; + }; in { + assertion = lib.length (lib.filter (x: x != null) (builtins.attrValues exclusiveAttrs)) == 1; message = '' - Options `security.acme.certs.${cert}.dnsProvider` and - `security.acme.certs.${cert}.webroot` are mutually exclusive. + Exactly one of the options + `security.acme.certs.${cert}.dnsProvider`, + `security.acme.certs.${cert}.webroot`, + `security.acme.certs.${cert}.listenHTTP` and + `security.acme.certs.${cert}.s3Bucket` + is required. + Current values: ${(lib.generators.toPretty {} exclusiveAttrs)}. ''; - } - { - assertion = data.webroot == null || data.listenHTTP == null; - message = '' - Options `security.acme.certs.${cert}.webroot` and - `security.acme.certs.${cert}.listenHTTP` are mutually exclusive. - ''; - } - { - assertion = data.listenHTTP == null || data.dnsProvider == null; - message = '' - Options `security.acme.certs.${cert}.listenHTTP` and - `security.acme.certs.${cert}.dnsProvider` are mutually exclusive. - ''; - } - { - assertion = data.dnsProvider != null || data.webroot != null || data.listenHTTP != null; - message = '' - One of `security.acme.certs.${cert}.dnsProvider`, - `security.acme.certs.${cert}.webroot`, or - `security.acme.certs.${cert}.listenHTTP` must be provided. - ''; - } + }) { assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); message = '' diff --git a/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix b/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix index 8eb630b5a4..0bf90a0086 100644 --- a/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix +++ b/third_party/nixpkgs/nixos/modules/security/apparmor/profiles.nix @@ -2,10 +2,4 @@ let apparmor = config.security.apparmor; in { config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; -config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable '' - include "${pkgs.iputils.apparmor}/bin.ping" - include "${pkgs.inetutils.apparmor}/bin.ping" - # Note that including those two profiles in the same profile - # would not work if the second one were to re-include . -''; } diff --git a/third_party/nixpkgs/nixos/modules/security/duosec.nix b/third_party/nixpkgs/nixos/modules/security/duosec.nix index 02b11766b3..2a855a77e3 100644 --- a/third_party/nixpkgs/nixos/modules/security/duosec.nix +++ b/third_party/nixpkgs/nixos/modules/security/duosec.nix @@ -193,8 +193,11 @@ in source = "${pkgs.duo-unix.out}/bin/login_duo"; }; - system.activationScripts = { - login_duo = mkIf cfg.ssh.enable '' + systemd.services.login-duo = lib.mkIf cfg.ssh.enable { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' if test -f "${cfg.secretKeyFile}"; then mkdir -m 0755 -p /etc/duo @@ -209,7 +212,13 @@ in mv -fT "$conf" /etc/duo/login_duo.conf fi ''; - pam_duo = mkIf cfg.pam.enable '' + }; + + systemd.services.pam-duo = lib.mkIf cfg.ssh.enable { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' if test -f "${cfg.secretKeyFile}"; then mkdir -m 0755 -p /etc/duo diff --git a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix index f75b4df185..95975943ff 100644 --- a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix +++ b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix @@ -42,6 +42,10 @@ in security.sudo.extraConfig = '' #includedir /run/google-sudoers.d ''; + security.sudo-rs.extraConfig = '' + #includedir /run/google-sudoers.d + ''; + systemd.tmpfiles.rules = [ "d /run/google-sudoers.d 750 root root -" "d /var/google-users.d 750 root root -" diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index d83259ccbe..b7e1ea5265 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -6,6 +6,92 @@ with lib; let + + mkRulesTypeOption = type: mkOption { + # These options are experimental and subject to breaking changes without notice. + description = lib.mdDoc '' + PAM `${type}` rules for this service. + + Attribute keys are the name of each rule. + ''; + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options = { + name = mkOption { + type = types.str; + description = lib.mdDoc '' + Name of this rule. + ''; + internal = true; + readOnly = true; + }; + enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether this rule is added to the PAM service config file. + ''; + }; + order = mkOption { + type = types.int; + description = lib.mdDoc '' + Order of this rule in the service file. Rules are arranged in ascending order of this value. + + ::: {.warning} + The `order` values for the built-in rules are subject to change. If you assign a constant value to this option, a system update could silently reorder your rule. You could be locked out of your system, or your system could be left wide open. When using this option, set it to a relative offset from another rule's `order` value: + + ```nix + { + security.pam.services.login.rules.auth.foo.order = + config.security.pam.services.login.rules.auth.unix.order + 10; + } + ``` + ::: + ''; + }; + control = mkOption { + type = types.str; + description = lib.mdDoc '' + Indicates the behavior of the PAM-API should the module fail to succeed in its authentication task. See `control` in {manpage}`pam.conf(5)` for details. + ''; + }; + modulePath = mkOption { + type = types.str; + description = lib.mdDoc '' + Either the full filename of the PAM to be used by the application (it begins with a '/'), or a relative pathname from the default module location. See `module-path` in {manpage}`pam.conf(5)` for details. + ''; + }; + args = mkOption { + type = types.listOf types.str; + description = lib.mdDoc '' + Tokens that can be used to modify the specific behavior of the given PAM. Such arguments will be documented for each individual module. See `module-arguments` in {manpage}`pam.conf(5)` for details. + + Escaping rules for spaces and square brackets are automatically applied. + + {option}`settings` are automatically added as {option}`args`. It's recommended to use the {option}`settings` option whenever possible so that arguments can be overridden. + ''; + }; + settings = mkOption { + type = with types; attrsOf (nullOr (oneOf [ bool str int pathInStore ])); + default = {}; + description = lib.mdDoc '' + Settings to add as `module-arguments`. + + Boolean values render just the key if true, and nothing if false. Null values are ignored. All other values are rendered as key-value pairs. + ''; + }; + }; + config = { + inherit name; + # Formats an attrset of settings as args for use as `module-arguments`. + args = concatLists (flip mapAttrsToList config.settings (name: value: + if isBool value + then optional value name + else optional (value != null) "${name}=${toString value}" + )); + }; + })); + }; + parentConfig = config; pamOpts = { config, name, ... }: let cfg = config; in let config = parentConfig; in { @@ -18,6 +104,28 @@ let description = lib.mdDoc "Name of the PAM service."; }; + rules = mkOption { + # This option is experimental and subject to breaking changes without notice. + visible = false; + + description = lib.mdDoc '' + PAM rules for this service. + + ::: {.warning} + This option and its suboptions are experimental and subject to breaking changes without notice. + + If you use this option in your system configuration, you will need to manually monitor this module for any changes. Otherwise, failure to adjust your configuration properly could lead to you being locked out of your system, or worse, your system could be left wide open to attackers. + + If you share configuration examples that use this option, you MUST include this warning so that users are informed. + + You may freely use this option within `nixpkgs`, and future changes will account for those use sites. + ::: + ''; + type = types.submodule { + options = genAttrs [ "account" "auth" "password" "session" ] mkRulesTypeOption; + }; + }; + unixAuth = mkOption { default = true; type = types.bool; @@ -470,90 +578,114 @@ let setLoginUid = mkDefault cfg.startSession; limits = mkDefault config.security.pam.loginLimits; + text = let + ensureUniqueOrder = type: rules: + let + checkPair = a: b: assert assertMsg (a.order != b.order) "security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})"; b; + checked = zipListsWith checkPair rules (drop 1 rules); + in take 1 rules ++ checked; + # Formats a string for use in `module-arguments`. See `man pam.conf`. + formatModuleArgument = token: + if hasInfix " " token + then "[${replaceStrings ["]"] ["\\]"] token}]" + else token; + formatRules = type: pipe cfg.rules.${type} [ + attrValues + (filter (rule: rule.enable)) + (sort (a: b: a.order < b.order)) + (ensureUniqueOrder type) + (map (rule: concatStringsSep " " ( + [ type rule.control rule.modulePath ] + ++ map formatModuleArgument rule.args + ++ [ "# ${rule.name} (order ${toString rule.order})" ] + ))) + (concatStringsSep "\n") + ]; + in mkDefault '' + # Account management. + ${formatRules "account"} + + # Authentication management. + ${formatRules "auth"} + + # Password management. + ${formatRules "password"} + + # Session management. + ${formatRules "session"} + ''; + # !!! TODO: move the LDAP stuff to the LDAP module, and the # Samba stuff to the Samba module. This requires that the PAM # module provides the right hooks. - text = mkDefault - ( - '' - # Account management. - '' + - optionalString use_ldap '' - account sufficient ${pam_ldap}/lib/security/pam_ldap.so - '' + - optionalString cfg.mysqlAuth '' - account sufficient ${pkgs.pam_mysql}/lib/security/pam_mysql.so config_file=/etc/security/pam_mysql.conf - '' + - optionalString (config.services.kanidm.enablePam) '' - account sufficient ${pkgs.kanidm}/lib/pam_kanidm.so ignore_unknown_user - '' + - optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) '' - account sufficient ${pkgs.sssd}/lib/security/pam_sss.so - '' + - optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) '' - account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so - '' + - optionalString config.security.pam.krb5.enable '' - account sufficient ${pam_krb5}/lib/security/pam_krb5.so - '' + - optionalString cfg.googleOsLoginAccountVerification '' - account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so - account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so - '' + - optionalString config.services.homed.enable '' - account sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so - '' + + rules = let + autoOrderRules = flip pipe [ + (imap1 (index: rule: rule // { order = mkDefault (10000 + index * 100); } )) + (map (rule: nameValuePair rule.name (removeAttrs rule [ "name" ]))) + listToAttrs + ]; + in { + account = autoOrderRules [ + { name = "ldap"; enable = use_ldap; control = "sufficient"; modulePath = "${pam_ldap}/lib/security/pam_ldap.so"; } + { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = { + config_file = "/etc/security/pam_mysql.conf"; + }; } + { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; settings = { + ignore_unknown_user = true; + }; } + { name = "sss"; enable = config.services.sssd.enable; control = if cfg.sssdStrictAccess then "[default=bad success=ok user_unknown=ignore]" else "sufficient"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; } + { name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; } + { name = "oslogin_login"; enable = cfg.googleOsLoginAccountVerification; control = "[success=ok ignore=ignore default=die]"; modulePath = "${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so"; } + { name = "oslogin_admin"; enable = cfg.googleOsLoginAccountVerification; control = "[success=ok default=ignore]"; modulePath = "${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so"; } + { name = "systemd_home"; enable = config.services.homed.enable; control = "sufficient"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; } # The required pam_unix.so module has to come after all the sufficient modules # because otherwise, the account lookup will fail if the user does not exist # locally, for example with MySQL- or LDAP-auth. - '' - account required pam_unix.so + { name = "unix"; control = "required"; modulePath = "pam_unix.so"; } + ]; - # Authentication management. - '' + - optionalString cfg.googleOsLoginAuthentication '' - auth [success=done perm_denied=die default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so - '' + - optionalString cfg.rootOK '' - auth sufficient pam_rootok.so - '' + - optionalString cfg.requireWheel '' - auth required pam_wheel.so use_uid - '' + - optionalString cfg.logFailures '' - auth required pam_faillock.so - '' + - optionalString cfg.mysqlAuth '' - auth sufficient ${pkgs.pam_mysql}/lib/security/pam_mysql.so config_file=/etc/security/pam_mysql.conf - '' + - optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) '' - auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles} - '' + - (let p11 = config.security.pam.p11; in optionalString cfg.p11Auth '' - auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so - '') + - (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth ('' - auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} '' - + ''${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} ${optionalString (u2f.origin != null) "origin=${u2f.origin}"} - '')) + - optionalString cfg.usbAuth '' - auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so - '' + - (let ussh = config.security.pam.ussh; in optionalString (config.security.pam.ussh.enable && cfg.usshAuth) '' - auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"} - '') + - (let oath = config.security.pam.oath; in optionalString cfg.oathAuth '' - auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits} - '') + - (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth '' - auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"} - '') + - (let dp9ik = config.security.pam.dp9ik; in optionalString dp9ik.enable '' - auth ${dp9ik.control} ${pkgs.pam_dp9ik}/lib/security/pam_p9.so ${dp9ik.authserver} - '') + - optionalString cfg.fprintAuth '' - auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so - '' + + auth = autoOrderRules ([ + { name = "oslogin_login"; enable = cfg.googleOsLoginAuthentication; control = "[success=done perm_denied=die default=ignore]"; modulePath = "${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so"; } + { name = "rootok"; enable = cfg.rootOK; control = "sufficient"; modulePath = "pam_rootok.so"; } + { name = "wheel"; enable = cfg.requireWheel; control = "required"; modulePath = "pam_wheel.so"; settings = { + use_uid = true; + }; } + { name = "faillock"; enable = cfg.logFailures; control = "required"; modulePath = "pam_faillock.so"; } + { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = { + config_file = "/etc/security/pam_mysql.conf"; + }; } + { name = "ssh_agent_auth"; enable = config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth; control = "sufficient"; modulePath = "${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so"; settings = { + file = lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles; + }; } + (let p11 = config.security.pam.p11; in { name = "p11"; enable = cfg.p11Auth; control = p11.control; modulePath = "${pkgs.pam_p11}/lib/security/pam_p11.so"; args = [ + "${pkgs.opensc}/lib/opensc-pkcs11.so" + ]; }) + (let u2f = config.security.pam.u2f; in { name = "u2f"; enable = cfg.u2fAuth; control = u2f.control; modulePath = "${pkgs.pam_u2f}/lib/security/pam_u2f.so"; settings = { + inherit (u2f) debug interactive cue origin; + authfile = u2f.authFile; + appid = u2f.appId; + }; }) + { name = "usb"; enable = cfg.usbAuth; control = "sufficient"; modulePath = "${pkgs.pam_usb}/lib/security/pam_usb.so"; } + (let ussh = config.security.pam.ussh; in { name = "ussh"; enable = config.security.pam.ussh.enable && cfg.usshAuth; control = ussh.control; modulePath = "${pkgs.pam_ussh}/lib/security/pam_ussh.so"; settings = { + ca_file = ussh.caFile; + authorized_principals = ussh.authorizedPrincipals; + authorized_principals_file = ussh.authorizedPrincipalsFile; + inherit (ussh) group; + }; }) + (let oath = config.security.pam.oath; in { name = "oath"; enable = cfg.oathAuth; control = "requisite"; modulePath = "${pkgs.oath-toolkit}/lib/security/pam_oath.so"; settings = { + inherit (oath) window digits; + usersfile = oath.usersFile; + }; }) + (let yubi = config.security.pam.yubico; in { name = "yubico"; enable = cfg.yubicoAuth; control = yubi.control; modulePath = "${pkgs.yubico-pam}/lib/security/pam_yubico.so"; settings = { + inherit (yubi) mode debug; + chalresp_path = yubi.challengeResponsePath; + id = mkIf (yubi.mode == "client") yubi.id; + }; }) + (let dp9ik = config.security.pam.dp9ik; in { name = "p9"; enable = dp9ik.enable; control = dp9ik.control; modulePath = "${pkgs.pam_dp9ik}/lib/security/pam_p9.so"; args = [ + dp9ik.authserver + ]; }) + { name = "fprintd"; enable = cfg.fprintAuth; control = "sufficient"; modulePath = "${pkgs.fprintd}/lib/security/pam_fprintd.so"; } + ] ++ # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run # after it succeeds. Certain modules need to run after pam_unix @@ -562,7 +694,7 @@ let # We use try_first_pass the second time to avoid prompting password twice. # # The same principle applies to systemd-homed - (optionalString ((cfg.unixAuth || config.services.homed.enable) && + (optionals ((cfg.unixAuth || config.services.homed.enable) && (config.security.pam.enableEcryptfs || config.security.pam.enableFscrypt || cfg.pamMount @@ -573,199 +705,173 @@ let || cfg.failDelay.enable || cfg.duoSecurity.enable || cfg.zfs)) - ( - optionalString config.services.homed.enable '' - auth optional ${config.systemd.package}/lib/security/pam_systemd_home.so - '' + - optionalString cfg.unixAuth '' - auth optional pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth - '' + - optionalString config.security.pam.enableEcryptfs '' - auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap - '' + - optionalString config.security.pam.enableFscrypt '' - auth optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so - '' + - optionalString cfg.zfs '' - auth optional ${config.boot.zfs.package}/lib/security/pam_zfs_key.so homes=${config.security.pam.zfs.homes} - '' + - optionalString cfg.pamMount '' - auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive - '' + - optionalString cfg.enableKwallet '' - auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 - '' + - optionalString cfg.enableGnomeKeyring '' - auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so - '' + - optionalString cfg.gnupg.enable '' - auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} - '' + - optionalString cfg.failDelay.enable '' - auth optional ${pkgs.pam}/lib/security/pam_faildelay.so delay=${toString cfg.failDelay.delay} - '' + - optionalString cfg.googleAuthenticator.enable '' - auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp - '' + - optionalString cfg.duoSecurity.enable '' - auth required ${pkgs.duo-unix}/lib/security/pam_duo.so - '' - )) + - optionalString config.services.homed.enable '' - auth sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so - '' + - optionalString cfg.unixAuth '' - auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass - '' + - optionalString cfg.otpwAuth '' - auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so - '' + - optionalString use_ldap '' - auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass - '' + - optionalString config.services.kanidm.enablePam '' - auth sufficient ${pkgs.kanidm}/lib/pam_kanidm.so ignore_unknown_user use_first_pass - '' + - optionalString config.services.sssd.enable '' - auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass - '' + - optionalString config.security.pam.krb5.enable '' - auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass - auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass - auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass - '' + - '' - auth required pam_deny.so + [ + { name = "systemd_home-early"; enable = config.services.homed.enable; control = "optional"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; } + { name = "unix-early"; enable = cfg.unixAuth; control = "optional"; modulePath = "pam_unix.so"; settings = { + nullok = cfg.allowNullPassword; + inherit (cfg) nodelay; + likeauth = true; + }; } + { name = "ecryptfs"; enable = config.security.pam.enableEcryptfs; control = "optional"; modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"; settings = { + unwrap = true; + }; } + { name = "fscrypt"; enable = config.security.pam.enableFscrypt; control = "optional"; modulePath = "${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so"; } + { name = "zfs_key"; enable = cfg.zfs; control = "optional"; modulePath = "${config.boot.zfs.package}/lib/security/pam_zfs_key.so"; settings = { + inherit (config.security.pam.zfs) homes; + }; } + { name = "mount"; enable = cfg.pamMount; control = "optional"; modulePath = "${pkgs.pam_mount}/lib/security/pam_mount.so"; settings = { + disable_interactive = true; + }; } + { name = "kwallet5"; enable = cfg.enableKwallet; control = "optional"; modulePath = "${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so"; settings = { + kwalletd = "${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5"; + }; } + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; } + { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = { + store-only = cfg.gnupg.storeOnly; + }; } + { name = "faildelay"; enable = cfg.failDelay.enable; control = "optional"; modulePath = "${pkgs.pam}/lib/security/pam_faildelay.so"; settings = { + inherit (cfg.failDelay) delay; + }; } + { name = "google_authenticator"; enable = cfg.googleAuthenticator.enable; control = "required"; modulePath = "${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so"; settings = { + no_increment_hotp = true; + }; } + { name = "duo"; enable = cfg.duoSecurity.enable; control = "required"; modulePath = "${pkgs.duo-unix}/lib/security/pam_duo.so"; } + ]) ++ [ + { name = "systemd_home"; enable = config.services.homed.enable; control = "sufficient"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; } + { name = "unix"; enable = cfg.unixAuth; control = "sufficient"; modulePath = "pam_unix.so"; settings = { + nullok = cfg.allowNullPassword; + inherit (cfg) nodelay; + likeauth = true; + try_first_pass = true; + }; } + { name = "otpw"; enable = cfg.otpwAuth; control = "sufficient"; modulePath = "${pkgs.otpw}/lib/security/pam_otpw.so"; } + { name = "ldap"; enable = use_ldap; control = "sufficient"; modulePath = "${pam_ldap}/lib/security/pam_ldap.so"; settings = { + use_first_pass = true; + }; } + { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; settings = { + ignore_unknown_user = true; + use_first_pass = true; + }; } + { name = "sss"; enable = config.services.sssd.enable; control = "sufficient"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; settings = { + use_first_pass = true; + }; } + { name = "krb5"; enable = config.security.pam.krb5.enable; control = "[default=ignore success=1 service_err=reset]"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = { + use_first_pass = true; + }; } + { name = "ccreds-validate"; enable = config.security.pam.krb5.enable; control = "[default=die success=done]"; modulePath = "${pam_ccreds}/lib/security/pam_ccreds.so"; settings = { + action = "validate"; + use_first_pass = true; + }; } + { name = "ccreds-store"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_ccreds}/lib/security/pam_ccreds.so"; settings = { + action = "store"; + use_first_pass = true; + }; } + { name = "deny"; control = "required"; modulePath = "pam_deny.so"; } + ]); - # Password management. - '' + - optionalString config.services.homed.enable '' - password sufficient ${config.systemd.package}/lib/security/pam_systemd_home.so - '' + '' - password sufficient pam_unix.so nullok yescrypt - '' + - optionalString config.security.pam.enableEcryptfs '' - password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so - '' + - optionalString config.security.pam.enableFscrypt '' - password optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so - '' + - optionalString cfg.zfs '' - password optional ${config.boot.zfs.package}/lib/security/pam_zfs_key.so homes=${config.security.pam.zfs.homes} - '' + - optionalString cfg.pamMount '' - password optional ${pkgs.pam_mount}/lib/security/pam_mount.so - '' + - optionalString use_ldap '' - password sufficient ${pam_ldap}/lib/security/pam_ldap.so - '' + - optionalString cfg.mysqlAuth '' - password sufficient ${pkgs.pam_mysql}/lib/security/pam_mysql.so config_file=/etc/security/pam_mysql.conf - '' + - optionalString config.services.kanidm.enablePam '' - password sufficient ${pkgs.kanidm}/lib/pam_kanidm.so - '' + - optionalString config.services.sssd.enable '' - password sufficient ${pkgs.sssd}/lib/security/pam_sss.so - '' + - optionalString config.security.pam.krb5.enable '' - password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass - '' + - optionalString cfg.enableGnomeKeyring '' - password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok - '' + - '' + password = autoOrderRules [ + { name = "systemd_home"; enable = config.services.homed.enable; control = "sufficient"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; } + { name = "unix"; control = "sufficient"; modulePath = "pam_unix.so"; settings = { + nullok = true; + yescrypt = true; + }; } + { name = "ecryptfs"; enable = config.security.pam.enableEcryptfs; control = "optional"; modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"; } + { name = "fscrypt"; enable = config.security.pam.enableFscrypt; control = "optional"; modulePath = "${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so"; } + { name = "zfs_key"; enable = cfg.zfs; control = "optional"; modulePath = "${config.boot.zfs.package}/lib/security/pam_zfs_key.so"; settings = { + inherit (config.security.pam.zfs) homes; + }; } + { name = "mount"; enable = cfg.pamMount; control = "optional"; modulePath = "${pkgs.pam_mount}/lib/security/pam_mount.so"; } + { name = "ldap"; enable = use_ldap; control = "sufficient"; modulePath = "${pam_ldap}/lib/security/pam_ldap.so"; } + { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = { + config_file = "/etc/security/pam_mysql.conf"; + }; } + { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; } + { name = "sss"; enable = config.services.sssd.enable; control = "sufficient"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; } + { name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = { + use_first_pass = true; + }; } + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { + use_authtok = true; + }; } + ]; - # Session management. - '' + - optionalString cfg.setEnvironment '' - session required pam_env.so conffile=/etc/pam/environment readenv=0 - '' + - '' - session required pam_unix.so - '' + - optionalString cfg.setLoginUid '' - session ${if config.boot.isContainer then "optional" else "required"} pam_loginuid.so - '' + - optionalString cfg.ttyAudit.enable (concatStringsSep " \\\n " ([ - "session required ${pkgs.pam}/lib/security/pam_tty_audit.so" - ] ++ optional cfg.ttyAudit.openOnly "open_only" - ++ optional (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}" - ++ optional (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}" - )) + - optionalString config.services.homed.enable '' - session required ${config.systemd.package}/lib/security/pam_systemd_home.so - '' + - optionalString cfg.makeHomeDir '' - session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=${config.security.pam.makeHomeDir.umask} - '' + - optionalString cfg.updateWtmp '' - session required ${pkgs.pam}/lib/security/pam_lastlog.so silent - '' + - optionalString config.security.pam.enableEcryptfs '' - session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so - '' + - optionalString config.security.pam.enableFscrypt '' - # Work around https://github.com/systemd/systemd/issues/8598 - # Skips the pam_fscrypt module for systemd-user sessions which do not have a password - # anyways. - # See also https://github.com/google/fscrypt/issues/95 - session [success=1 default=ignore] pam_succeed_if.so service = systemd-user - session optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so - '' + - optionalString cfg.zfs '' - session [success=1 default=ignore] pam_succeed_if.so service = systemd-user - session optional ${config.boot.zfs.package}/lib/security/pam_zfs_key.so homes=${config.security.pam.zfs.homes} ${optionalString config.security.pam.zfs.noUnmount "nounmount"} - '' + - optionalString cfg.pamMount '' - session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive - '' + - optionalString use_ldap '' - session optional ${pam_ldap}/lib/security/pam_ldap.so - '' + - optionalString cfg.mysqlAuth '' - session optional ${pkgs.pam_mysql}/lib/security/pam_mysql.so config_file=/etc/security/pam_mysql.conf - '' + - optionalString config.services.kanidm.enablePam '' - session optional ${pkgs.kanidm}/lib/pam_kanidm.so - '' + - optionalString config.services.sssd.enable '' - session optional ${pkgs.sssd}/lib/security/pam_sss.so - '' + - optionalString config.security.pam.krb5.enable '' - session optional ${pam_krb5}/lib/security/pam_krb5.so - '' + - optionalString cfg.otpwAuth '' - session optional ${pkgs.otpw}/lib/security/pam_otpw.so - '' + - optionalString cfg.startSession '' - session optional ${config.systemd.package}/lib/security/pam_systemd.so - '' + - optionalString cfg.forwardXAuth '' - session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99 - '' + - optionalString (cfg.limits != []) '' - session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} - '' + - optionalString (cfg.showMotd && (config.users.motd != null || config.users.motdFile != null)) '' - session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} - '' + - optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' - session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug - '' + - optionalString (cfg.enableKwallet) '' - session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 - '' + - optionalString (cfg.enableGnomeKeyring) '' - session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start - '' + - optionalString cfg.gnupg.enable '' - session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.noAutostart " no-autostart"} - '' + - optionalString (config.virtualisation.lxc.lxcfs.enable) '' - session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all - '' - ); + session = autoOrderRules [ + { name = "env"; enable = cfg.setEnvironment; control = "required"; modulePath = "pam_env.so"; settings = { + conffile = "/etc/pam/environment"; + readenv = 0; + }; } + { name = "unix"; control = "required"; modulePath = "pam_unix.so"; } + { name = "loginuid"; enable = cfg.setLoginUid; control = if config.boot.isContainer then "optional" else "required"; modulePath = "pam_loginuid.so"; } + { name = "tty_audit"; enable = cfg.ttyAudit.enable; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_tty_audit.so"; settings = { + open_only = cfg.ttyAudit.openOnly; + enable = cfg.ttyAudit.enablePattern; + disable = cfg.ttyAudit.disablePattern; + }; } + { name = "systemd_home"; enable = config.services.homed.enable; control = "required"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; } + { name = "mkhomedir"; enable = cfg.makeHomeDir; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_mkhomedir.so"; settings = { + silent = true; + skel = config.security.pam.makeHomeDir.skelDirectory; + inherit (config.security.pam.makeHomeDir) umask; + }; } + { name = "lastlog"; enable = cfg.updateWtmp; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_lastlog.so"; settings = { + silent = true; + }; } + { name = "ecryptfs"; enable = config.security.pam.enableEcryptfs; control = "optional"; modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"; } + # Work around https://github.com/systemd/systemd/issues/8598 + # Skips the pam_fscrypt module for systemd-user sessions which do not have a password + # anyways. + # See also https://github.com/google/fscrypt/issues/95 + { name = "fscrypt-skip-systemd"; enable = config.security.pam.enableFscrypt; control = "[success=1 default=ignore]"; modulePath = "pam_succeed_if.so"; args = [ + "service" "=" "systemd-user" + ]; } + { name = "fscrypt"; enable = config.security.pam.enableFscrypt; control = "optional"; modulePath = "${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so"; } + { name = "zfs_key-skip-systemd"; enable = cfg.zfs; control = "[success=1 default=ignore]"; modulePath = "pam_succeed_if.so"; args = [ + "service" "=" "systemd-user" + ]; } + { name = "zfs_key"; enable = cfg.zfs; control = "optional"; modulePath = "${config.boot.zfs.package}/lib/security/pam_zfs_key.so"; settings = { + inherit (config.security.pam.zfs) homes; + nounmount = config.security.pam.zfs.noUnmount; + }; } + { name = "mount"; enable = cfg.pamMount; control = "optional"; modulePath = "${pkgs.pam_mount}/lib/security/pam_mount.so"; settings = { + disable_interactive = true; + }; } + { name = "ldap"; enable = use_ldap; control = "optional"; modulePath = "${pam_ldap}/lib/security/pam_ldap.so"; } + { name = "mysql"; enable = cfg.mysqlAuth; control = "optional"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = { + config_file = "/etc/security/pam_mysql.conf"; + }; } + { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "optional"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; } + { name = "sss"; enable = config.services.sssd.enable; control = "optional"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; } + { name = "krb5"; enable = config.security.pam.krb5.enable; control = "optional"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; } + { name = "otpw"; enable = cfg.otpwAuth; control = "optional"; modulePath = "${pkgs.otpw}/lib/security/pam_otpw.so"; } + { name = "systemd"; enable = cfg.startSession; control = "optional"; modulePath = "${config.systemd.package}/lib/security/pam_systemd.so"; } + { name = "xauth"; enable = cfg.forwardXAuth; control = "optional"; modulePath = "pam_xauth.so"; settings = { + xauthpath = "${pkgs.xorg.xauth}/bin/xauth"; + systemuser = 99; + }; } + { name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_limits.so"; settings = { + conf = "${makeLimitsConf cfg.limits}"; + }; } + { name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${pkgs.pam}/lib/security/pam_motd.so"; settings = { + inherit motd; + }; } + { name = "apparmor"; enable = cfg.enableAppArmor && config.security.apparmor.enable; control = "optional"; modulePath = "${pkgs.apparmor-pam}/lib/security/pam_apparmor.so"; settings = { + order = "user,group,default"; + debug = true; + }; } + { name = "kwallet5"; enable = cfg.enableKwallet; control = "optional"; modulePath = "${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so"; settings = { + kwalletd = "${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5"; + }; } + { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { + auto_start = true; + }; } + { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = { + no-autostart = cfg.gnupg.noAutostart; + }; } + { name = "cgfs"; enable = config.virtualisation.lxc.lxcfs.enable; control = "optional"; modulePath = "${pkgs.lxc}/lib/security/pam_cgfs.so"; args = [ + "-c" "all" + ]; } + ]; + }; }; }; @@ -841,6 +947,8 @@ in { + meta.maintainers = [ maintainers.majiir ]; + imports = [ (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) ]; @@ -1402,9 +1510,7 @@ in fscrypt = {}; }; - security.apparmor.includes."abstractions/pam" = let - isEnabled = test: fold or false (map test (attrValues config.security.pam.services)); - in + security.apparmor.includes."abstractions/pam" = lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") (attrNames config.security.pam.services) + @@ -1413,88 +1519,22 @@ in mr ${getLib pkgs.pam}/lib/security/pam_*.so, r ${getLib pkgs.pam}/lib/security/, '' + - optionalString use_ldap '' - mr ${pam_ldap}/lib/security/pam_ldap.so, - '' + - optionalString config.services.kanidm.enablePam '' - mr ${pkgs.kanidm}/lib/pam_kanidm.so, - '' + - optionalString config.services.sssd.enable '' - mr ${pkgs.sssd}/lib/security/pam_sss.so, - '' + - optionalString config.security.pam.krb5.enable '' - mr ${pam_krb5}/lib/security/pam_krb5.so, - mr ${pam_ccreds}/lib/security/pam_ccreds.so, - '' + - optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) '' - mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so, - mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so, - '' + - optionalString (isEnabled (cfg: cfg.googleOsLoginAuthentication)) '' - mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so, - '' + - optionalString (config.security.pam.enableSSHAgentAuth - && isEnabled (cfg: cfg.sshAgentAuth)) '' - mr ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so, - '' + - optionalString (isEnabled (cfg: cfg.fprintAuth)) '' - mr ${pkgs.fprintd}/lib/security/pam_fprintd.so, - '' + - optionalString (isEnabled (cfg: cfg.u2fAuth)) '' - mr ${pkgs.pam_u2f}/lib/security/pam_u2f.so, - '' + - optionalString (isEnabled (cfg: cfg.usbAuth)) '' - mr ${pkgs.pam_usb}/lib/security/pam_usb.so, - '' + - optionalString (isEnabled (cfg: cfg.usshAuth)) '' - mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so, - '' + - optionalString (isEnabled (cfg: cfg.oathAuth)) '' - "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so, - '' + - optionalString (isEnabled (cfg: cfg.mysqlAuth)) '' - mr ${pkgs.pam_mysql}/lib/security/pam_mysql.so, - '' + - optionalString (isEnabled (cfg: cfg.yubicoAuth)) '' - mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so, - '' + - optionalString (isEnabled (cfg: cfg.duoSecurity.enable)) '' - mr ${pkgs.duo-unix}/lib/security/pam_duo.so, - '' + - optionalString (isEnabled (cfg: cfg.otpwAuth)) '' - mr ${pkgs.otpw}/lib/security/pam_otpw.so, - '' + - optionalString config.security.pam.enableEcryptfs '' - mr ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so, - '' + - optionalString config.security.pam.enableFscrypt '' - mr ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so, - '' + - optionalString (isEnabled (cfg: cfg.pamMount)) '' - mr ${pkgs.pam_mount}/lib/security/pam_mount.so, - '' + - optionalString (isEnabled (cfg: cfg.enableGnomeKeyring)) '' - mr ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so, - '' + - optionalString (isEnabled (cfg: cfg.startSession)) '' - mr ${config.systemd.package}/lib/security/pam_systemd.so, - '' + - optionalString (isEnabled (cfg: cfg.enableAppArmor) - && config.security.apparmor.enable) '' - mr ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so, - '' + - optionalString (isEnabled (cfg: cfg.enableKwallet)) '' - mr ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so, - '' + - optionalString config.virtualisation.lxc.lxcfs.enable '' - mr ${pkgs.lxc}/lib/security/pam_cgfs.so, - '' + - optionalString (isEnabled (cfg: cfg.zfs)) '' - mr ${config.boot.zfs.package}/lib/security/pam_zfs_key.so, - '' + - optionalString config.services.homed.enable '' - mr ${config.systemd.package}/lib/security/pam_systemd_home.so - ''; - }; + (with lib; pipe config.security.pam.services [ + attrValues + (catAttrs "rules") + (concatMap attrValues) + (concatMap attrValues) + (filter (rule: rule.enable)) + (catAttrs "modulePath") + (filter (hasPrefix "/")) + unique + (map (module: "mr ${module},")) + concatLines + ]); + security.sudo.extraConfig = optionalString config.security.pam.enableSSHAgentAuth '' + # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. + Defaults env_keep+=SSH_AUTH_SOCK + ''; + }; } diff --git a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix index ad78f38b08..26f906f2a7 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix @@ -33,7 +33,7 @@ in default = []; description = lib.mdDoc '' List of volume definitions for pam_mount. - For more information, visit . + For more information, visit . ''; }; @@ -78,7 +78,7 @@ in description = lib.mdDoc '' Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, and 2 additionally enables tracing in mount.crypt. The default is 0. - For more information, visit . + For more information, visit . ''; }; @@ -88,7 +88,7 @@ in description = lib.mdDoc '' Amount of microseconds to wait until killing remaining processes after final logout. - For more information, visit . + For more information, visit . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index de427ccb29..327f49c0b6 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -35,7 +35,7 @@ in description = lib.mdDoc '' Any polkit rules to be added to config (in JavaScript ;-). See: - http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules + ''; }; @@ -117,4 +117,3 @@ in }; } - diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index d225442773..3dd5d2e525 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -6,7 +6,7 @@ let cfg = config.security.sudo; - inherit (pkgs) sudo; + inherit (config.security.pam) enableSSHAgentAuth; toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; @@ -30,9 +30,18 @@ in ###### interface - options = { + options.security.sudo = { - security.sudo.enable = mkOption { + defaultOptions = mkOption { + type = with types; listOf str; + default = [ "SETENV" ]; + description = mdDoc '' + Options used for the default rules, granting `root` and the + `wheel` group permission to run any command as any user. + ''; + }; + + enable = mkOption { type = types.bool; default = true; description = @@ -42,29 +51,21 @@ in ''; }; - security.sudo.package = mkOption { - type = types.package; - default = pkgs.sudo; - defaultText = literalExpression "pkgs.sudo"; - description = lib.mdDoc '' - Which package to use for `sudo`. - ''; - }; + package = mkPackageOption pkgs "sudo" { }; - security.sudo.wheelNeedsPassword = mkOption { + wheelNeedsPassword = mkOption { type = types.bool; default = true; - description = - lib.mdDoc '' - Whether users of the `wheel` group must - provide a password to run commands as super user via {command}`sudo`. - ''; + description = mdDoc '' + Whether users of the `wheel` group must + provide a password to run commands as super user via {command}`sudo`. + ''; }; - security.sudo.execWheelOnly = mkOption { + execWheelOnly = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Only allow members of the `wheel` group to execute sudo by setting the executable's permissions accordingly. This prevents users that are not members of `wheel` from @@ -72,19 +73,18 @@ in ''; }; - security.sudo.configFile = mkOption { + configFile = mkOption { type = types.lines; # Note: if syntax errors are detected in this file, the NixOS # configuration will fail to build. - description = - lib.mdDoc '' - This string contains the contents of the - {file}`sudoers` file. - ''; + description = mdDoc '' + This string contains the contents of the + {file}`sudoers` file. + ''; }; - security.sudo.extraRules = mkOption { - description = lib.mdDoc '' + extraRules = mkOption { + description = mdDoc '' Define specific rules to be in the {file}`sudoers` file. More specific rules should come after more general ones in order to yield the expected behavior. You can use mkBefore/mkAfter to ensure @@ -114,7 +114,7 @@ in options = { users = mkOption { type = with types; listOf (either str int); - description = lib.mdDoc '' + description = mdDoc '' The usernames / UIDs this rule should apply for. ''; default = []; @@ -122,7 +122,7 @@ in groups = mkOption { type = with types; listOf (either str int); - description = lib.mdDoc '' + description = mdDoc '' The groups / GIDs this rule should apply for. ''; default = []; @@ -131,7 +131,7 @@ in host = mkOption { type = types.str; default = "ALL"; - description = lib.mdDoc '' + description = mdDoc '' For what host this rule should apply. ''; }; @@ -139,7 +139,7 @@ in runAs = mkOption { type = with types; str; default = "ALL:ALL"; - description = lib.mdDoc '' + description = mdDoc '' Under which user/group the specified command is allowed to run. A user can be specified using just the username: `"foo"`. @@ -149,7 +149,7 @@ in }; commands = mkOption { - description = lib.mdDoc '' + description = mdDoc '' The commands for which the rule should apply. ''; type = with types; listOf (either str (submodule { @@ -157,7 +157,7 @@ in options = { command = mkOption { type = with types; str; - description = lib.mdDoc '' + description = mdDoc '' A command being either just a path to a binary to allow any arguments, the full command with arguments pre-set or with `""` used as the argument, not allowing arguments to the command at all. @@ -166,7 +166,7 @@ in options = mkOption { type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]); - description = lib.mdDoc '' + description = mdDoc '' Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/man/1.7.10/sudoers.man.html). ''; default = []; @@ -179,10 +179,10 @@ in }); }; - security.sudo.extraConfig = mkOption { + extraConfig = mkOption { type = types.lines; default = ""; - description = lib.mdDoc '' + description = mdDoc '' Extra configuration text appended to {file}`sudoers`. ''; }; @@ -192,44 +192,55 @@ in ###### implementation config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.package.pname != "sudo-rs"; - message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } - ]; + assertions = [ { + assertion = cfg.package.pname != "sudo-rs"; + message = '' + NixOS' `sudo` module does not support `sudo-rs`; see `security.sudo-rs` instead. + ''; + } ]; - # We `mkOrder 600` so that the default rule shows up first, but there is - # still enough room for a user to `mkBefore` it. - security.sudo.extraRules = mkOrder 600 [ - { groups = [ "wheel" ]; - commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; - } - ]; + security.sudo.extraRules = + let + defaultRule = { users ? [], groups ? [], opts ? [] }: [ { + inherit users groups; + commands = [ { + command = "ALL"; + options = opts ++ cfg.defaultOptions; + } ]; + } ]; + in mkMerge [ + # This is ordered before users' `mkBefore` rules, + # so as not to introduce unexpected changes. + (mkOrder 400 (defaultRule { users = [ "root" ]; })) - security.sudo.configFile = + # This is ordered to show before (most) other rules, but + # late-enough for a user to `mkBefore` it. + (mkOrder 600 (defaultRule { + groups = [ "wheel" ]; + opts = (optional (!cfg.wheelNeedsPassword) "NOPASSWD"); + })) + ]; + + security.sudo.configFile = concatStringsSep "\n" (filter (s: s != "") [ '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ # or ‘security.sudo.extraRules’ instead. - - # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. - Defaults env_keep+=SSH_AUTH_SOCK - - # "root" is allowed to do anything. - root ALL=(ALL:ALL) SETENV: ALL - - # extraRules - ${concatStringsSep "\n" ( - lists.flatten ( - map ( - rule: optionals (length rule.commands != 0) [ - (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) - (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) - ] - ) cfg.extraRules - ) - )} - + '' + (pipe cfg.extraRules [ + (filter (rule: length rule.commands != 0)) + (map (rule: [ + (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) + (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) + ])) + flatten + (concatStringsSep "\n") + ]) + "\n" + (optionalString (cfg.extraConfig != "") '' + # extraConfig ${cfg.extraConfig} - ''; + '') + ]); security.wrappers = let owner = "root"; @@ -247,7 +258,7 @@ in }; }; - environment.systemPackages = [ sudo ]; + environment.systemPackages = [ cfg.package ]; security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; }; diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index a8bb0650b1..250f9775be 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -275,33 +275,38 @@ in mrpx ${wrap.source}, '') wrappers; - ###### wrappers activation script - system.activationScripts.wrappers = - lib.stringAfter [ "specialfs" "users" ] - '' - chmod 755 "${parentWrapperDir}" + systemd.services.suid-sgid-wrappers = { + description = "Create SUID/SGID Wrappers"; + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + unitConfig.RequiresMountsFor = [ "/nix/store" "/run/wrappers" ]; + serviceConfig.Type = "oneshot"; + script = '' + chmod 755 "${parentWrapperDir}" - # We want to place the tmpdirs for the wrappers to the parent dir. - wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) - chmod a+rx "$wrapperDir" + # We want to place the tmpdirs for the wrappers to the parent dir. + wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) + chmod a+rx "$wrapperDir" - ${lib.concatStringsSep "\n" mkWrappedPrograms} + ${lib.concatStringsSep "\n" mkWrappedPrograms} - if [ -L ${wrapperDir} ]; then - # Atomically replace the symlink - # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ - old=$(readlink -f ${wrapperDir}) - if [ -e "${wrapperDir}-tmp" ]; then - rm --force --recursive "${wrapperDir}-tmp" - fi - ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" - mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" - rm --force --recursive "$old" - else - # For initial setup - ln --symbolic "$wrapperDir" "${wrapperDir}" + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink -f ${wrapperDir}) + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" fi - ''; + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" + else + # For initial setup + ln --symbolic "$wrapperDir" "${wrapperDir}" + fi + ''; + }; ###### wrappers consistency checks system.checks = lib.singleton (pkgs.runCommandLocal diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c index cf19c7a4aa..3277e7ef6f 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c @@ -26,8 +26,6 @@ // aborts when false, printing the failed expression #define ASSERT(expr) ((expr) ? (void) 0 : assert_failure(#expr)) -// aborts when returns non-zero, printing the failed expression and errno -#define MUSTSUCCEED(expr) ((expr) ? print_errno_and_die(#expr) : (void) 0) extern char **environ; @@ -48,12 +46,6 @@ static noreturn void assert_failure(const char *assertion) { abort(); } -static noreturn void print_errno_and_die(const char *assertion) { - fprintf(stderr, "Call `%s` in NixOS's wrapper.c failed: %s\n", assertion, strerror(errno)); - fflush(stderr); - abort(); -} - int get_last_cap(unsigned *last_cap) { FILE* file = fopen("/proc/sys/kernel/cap_last_cap", "r"); if (file == NULL) { diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix index da2fca98d5..27d46c630a 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation { name = "security-wrapper"; buildInputs = [ linuxHeaders ]; dontUnpack = true; - hardeningEnable = [ "pie" ]; CFLAGS = [ ''-DSOURCE_PROG="${sourceProg}"'' ] ++ (if debug then [ diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index 105e99cb2f..b51f2a78c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix @@ -225,7 +225,7 @@ in { description = "JACK Audio system service user"; isSystemUser = true; }; - # http://jackaudio.org/faq/linux_rt_config.html + # https://jackaudio.org/faq/linux_rt_config.html security.pam.loginLimits = [ { domain = "@jackaudio"; type = "-"; item = "rtprio"; value = "99"; } { domain = "@jackaudio"; type = "-"; item = "memlock"; value = "unlimited"; } diff --git a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix index e18e61eb6d..77a0e74af9 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix @@ -28,10 +28,17 @@ in { ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to open the TCP port in the firewall"; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [cfg.settings.Port]; + systemd.services.navidrome = { description = "Navidrome Media Server"; after = [ "network.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/wyoming/faster-whisper.nix b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/faster-whisper.nix index 1fb67ecfe5..2d56acdc1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/wyoming/faster-whisper.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/faster-whisper.nix @@ -37,6 +37,9 @@ in enable = mkEnableOption (mdDoc "Wyoming faster-whisper server"); model = mkOption { + # Intersection between available and referenced models here: + # https://github.com/rhasspy/models/releases/tag/v1.0 + # https://github.com/rhasspy/rhasspy3/blob/wyoming-v1/programs/asr/faster-whisper/server/wyoming_faster_whisper/download.py#L17-L27 type = enum [ "tiny" "tiny-int8" @@ -44,7 +47,6 @@ in "base-int8" "small" "small-int8" - "medium" "medium-int8" ]; default = "tiny-int8"; @@ -136,6 +138,7 @@ in --data-dir $STATE_DIRECTORY \ --download-dir $STATE_DIRECTORY \ --uri ${options.uri} \ + --device ${options.device} \ --model ${options.model} \ --language ${options.language} \ --beam-size ${options.beamSize} ${options.extraArgs} @@ -143,6 +146,8 @@ in CapabilityBoundingSet = ""; DeviceAllow = if builtins.elem options.device [ "cuda" "auto" ] then [ # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf + # CUDA not working? Check DeviceAllow and PrivateDevices first! + "/dev/nvidia0" "/dev/nvidia1" "/dev/nvidia2" "/dev/nvidia3" @@ -157,7 +162,6 @@ in DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; - PrivateDevices = true; PrivateUsers = true; ProtectHome = true; ProtectHostname = true; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix index e1993407da..987818246b 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix @@ -8,6 +8,7 @@ let cfg = config.services.wyoming.openwakeword; inherit (lib) + concatStringsSep concatMapStringsSep escapeShellArgs mkOption @@ -15,6 +16,7 @@ let mkEnableOption mkIf mkPackageOptionMD + mkRemovedOptionModule types ; @@ -22,18 +24,13 @@ let toString ; - models = [ - # wyoming_openwakeword/models/*.tflite - "alexa" - "hey_jarvis" - "hey_mycroft" - "hey_rhasspy" - "ok_nabu" - ]; - in { + imports = [ + (mkRemovedOptionModule [ "services" "wyoming" "openwakeword" "models" ] "Configuring models has been removed, they are now dynamically discovered and loaded at runtime") + ]; + meta.buildDocsInSandbox = false; options.services.wyoming.openwakeword = with types; { @@ -50,19 +47,27 @@ in ''; }; - models = mkOption { - type = listOf (enum models); - default = models; - description = mdDoc '' - List of wake word models that should be made available. + customModelsDirectories = mkOption { + type = listOf types.path; + default = []; + description = lib.mdDoc '' + Paths to directories with custom wake word models (*.tflite model files). ''; }; preloadModels = mkOption { - type = listOf (enum models); + type = listOf str; default = [ "ok_nabu" ]; + example = [ + # wyoming_openwakeword/models/*.tflite + "alexa" + "hey_jarvis" + "hey_mycroft" + "hey_rhasspy" + "ok_nabu" + ]; description = mdDoc '' List of wake word models to preload after startup. ''; @@ -114,14 +119,15 @@ in DynamicUser = true; User = "wyoming-openwakeword"; # https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run - ExecStart = '' - ${cfg.package}/bin/wyoming-openwakeword \ - --uri ${cfg.uri} \ - ${concatMapStringsSep " " (model: "--model ${model}") cfg.models} \ - ${concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels} \ - --threshold ${cfg.threshold} \ - --trigger-level ${cfg.triggerLevel} ${cfg.extraArgs} - ''; + ExecStart = concatStringsSep " " [ + "${cfg.package}/bin/wyoming-openwakeword" + "--uri ${cfg.uri}" + (concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels) + (concatMapStringsSep " " (dir: "--custom-model-dir ${toString dir}") cfg.customModelsDirectories) + "--threshold ${cfg.threshold}" + "--trigger-level ${cfg.triggerLevel}" + "${cfg.extraArgs}" + ]; CapabilityBoundingSet = ""; DeviceAllow = ""; DevicePolicy = "closed"; @@ -136,7 +142,7 @@ in ProtectKernelTunables = true; ProtectControlGroups = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; # reads /proc/cpuinfo RestrictAddressFamilies = [ "AF_INET" "AF_INET6" diff --git a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix index 0acbf1b3ea..5a75a46e52 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -15,16 +15,16 @@ let Client { Name = "${fd_cfg.name}"; FDPort = ${toString fd_cfg.port}; - WorkingDirectory = "${libDir}"; - Pid Directory = "/run"; + WorkingDirectory = ${libDir}; + Pid Directory = /run; ${fd_cfg.extraClientConfig} } ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Director { Name = "${name}"; - Password = "${value.password}"; - Monitor = "${value.monitor}"; + Password = ${value.password}; + Monitor = ${value.monitor}; } '') fd_cfg.director)} @@ -41,8 +41,8 @@ let Storage { Name = "${sd_cfg.name}"; SDPort = ${toString sd_cfg.port}; - WorkingDirectory = "${libDir}"; - Pid Directory = "/run"; + WorkingDirectory = ${libDir}; + Pid Directory = /run; ${sd_cfg.extraStorageConfig} } @@ -50,8 +50,8 @@ let Autochanger { Name = "${name}"; Device = ${concatStringsSep ", " (map (a: "\"${a}\"") value.devices)}; - Changer Device = "${value.changerDevice}"; - Changer Command = "${value.changerCommand}"; + Changer Device = ${value.changerDevice}; + Changer Command = ${value.changerCommand}; ${value.extraAutochangerConfig} } '') sd_cfg.autochanger)} @@ -59,8 +59,8 @@ let ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Device { Name = "${name}"; - Archive Device = "${value.archiveDevice}"; - Media Type = "${value.mediaType}"; + Archive Device = ${value.archiveDevice}; + Media Type = ${value.mediaType}; ${value.extraDeviceConfig} } '') sd_cfg.device)} @@ -68,8 +68,8 @@ let ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Director { Name = "${name}"; - Password = "${value.password}"; - Monitor = "${value.monitor}"; + Password = ${value.password}; + Monitor = ${value.monitor}; } '') sd_cfg.director)} @@ -85,18 +85,18 @@ let '' Director { Name = "${dir_cfg.name}"; - Password = "${dir_cfg.password}"; + Password = ${dir_cfg.password}; DirPort = ${toString dir_cfg.port}; - Working Directory = "${libDir}"; - Pid Directory = "/run/"; - QueryFile = "${pkgs.bacula}/etc/query.sql"; + Working Directory = ${libDir}; + Pid Directory = /run/; + QueryFile = ${pkgs.bacula}/etc/query.sql; ${dir_cfg.extraDirectorConfig} } Catalog { - Name = "PostgreSQL"; - dbname = "bacula"; - user = "bacula"; + Name = PostgreSQL; + dbname = bacula; + user = bacula; } Messages { @@ -533,7 +533,7 @@ in { }; }; - services.postgresql.enable = dir_cfg.enable == true; + services.postgresql.enable = lib.mkIf dir_cfg.enable true; systemd.services.bacula-dir = mkIf dir_cfg.enable { after = [ "network.target" "postgresql.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix index 5ee036e68c..b27dd28171 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix @@ -6,32 +6,50 @@ let cfg = config.services.borgmatic; settingsFormat = pkgs.formats.yaml { }; + repository = with types; submodule { + options = { + path = mkOption { + type = str; + description = mdDoc '' + Path to the repository + ''; + }; + label = mkOption { + type = str; + description = mdDoc '' + Label to the repository + ''; + }; + }; + }; cfgType = with types; submodule { freeformType = settingsFormat.type; - options.location = { + options = { source_directories = mkOption { - type = listOf str; + type = nullOr (listOf str); + default = null; description = mdDoc '' - List of source directories to backup (required). Globs and - tildes are expanded. + List of source directories and files to backup. Globs and tildes are + expanded. Do not backslash spaces in path names. ''; - example = [ "/home" "/etc" "/var/log/syslog*" ]; + example = [ "/home" "/etc" "/var/log/syslog*" "/home/user/path with spaces" ]; }; repositories = mkOption { - type = listOf str; + type = nullOr (listOf repository); + default = null; description = mdDoc '' - Paths to local or remote repositories (required). Tildes are - expanded. Multiple repositories are backed up to in - sequence. Borg placeholders can be used. See the output of - "borg help placeholders" for details. See ssh_command for - SSH options like identity file or port. If systemd service - is used, then add local repository paths in the systemd - service file to the ReadWritePaths list. + A required list of local or remote repositories with paths and + optional labels (which can be used with the --repository flag to + select a repository). Tildes are expanded. Multiple repositories are + backed up to in sequence. Borg placeholders can be used. See the + output of "borg help placeholders" for details. See ssh_command for + SSH options like identity file or port. If systemd service is used, + then add local repository paths in the systemd service file to the + ReadWritePaths list. ''; example = [ - "ssh://user@backupserver/./sourcehostname.borg" - "ssh://user@backupserver/./{fqdn}" - "/var/local/backups/local.borg" + { path="ssh://user@backupserver/./sourcehostname.borg"; label="backupserver"; } + { path="/mnt/backup"; label="local"; } ]; }; }; @@ -62,6 +80,13 @@ in config = mkIf cfg.enable { + warnings = [] + ++ optional (cfg.settings != null && cfg.settings ? location) + "`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope" + ++ optional (catAttrs "location" (attrValues cfg.configurations) != []) + "`services.borgmatic.configurations..location` is deprecated, please move your options out of sections to the global scope" + ; + environment.systemPackages = [ pkgs.borgmatic ]; environment.etc = (optionalAttrs (cfg.settings != null) { "borgmatic/config.yaml".source = cfgfile; }) // diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix index 01fd57f5c5..773dc0ba44 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -7,7 +7,7 @@ let options = { postgresqlPackage = mkOption { type = types.package; - example = literalExpression "pkgs.postgresql_11"; + example = literalExpression "pkgs.postgresql_15"; description = lib.mdDoc '' PostgreSQL package to use. ''; @@ -124,7 +124,7 @@ in { example = literalExpression '' { main = { - postgresqlPackage = pkgs.postgresql_11; + postgresqlPackage = pkgs.postgresql_15; directory = /mnt/pg_wal/main/; slot = "main_wal_receiver"; connection = "postgresql://user@somehost"; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 78220e99c3..87595f3979 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -23,25 +23,13 @@ in environmentFile = mkOption { type = with types; nullOr str; - # added on 2021-08-28, s3CredentialsFile should - # be removed in the future (+ remember the warning) - default = config.s3CredentialsFile; + default = null; description = lib.mdDoc '' file containing the credentials to access the repository, in the format of an EnvironmentFile as described by systemd.exec(5) ''; }; - s3CredentialsFile = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - for an S3-hosted repository, in the format of an EnvironmentFile - as described by systemd.exec(5) - ''; - }; - rcloneOptions = mkOption { type = with types; nullOr (attrsOf (oneOf [ str bool ])); default = null; @@ -113,12 +101,15 @@ in }; paths = mkOption { + # This is nullable for legacy reasons only. We should consider making it a pure listOf + # after some time has passed since this comment was added. type = types.nullOr (types.listOf types.str); - default = null; + default = [ ]; description = lib.mdDoc '' - Which paths to backup. If null or an empty array, no - backup command will be run. This can be used to create a - prune-only job. + Which paths to backup, in addition to ones specified via + `dynamicFilesFrom`. If null or an empty array and + `dynamicFilesFrom` is also null, no backup command will be run. + This can be used to create a prune-only job. ''; example = [ "/var/lib/postgresql" @@ -142,13 +133,15 @@ in }; timerConfig = mkOption { - type = types.attrsOf unitOption; + type = types.nullOr (types.attrsOf unitOption); default = { OnCalendar = "daily"; Persistent = true; }; description = lib.mdDoc '' - When to run the backup. See {manpage}`systemd.timer(5)` for details. + When to run the backup. See {manpage}`systemd.timer(5)` for + details. If null no timer is created and the backup will only + run when explicitly started. ''; example = { OnCalendar = "00:05"; @@ -231,7 +224,7 @@ in description = lib.mdDoc '' A script that produces a list of files to back up. The results of this command are given to the '--files-from' - option. + option. The result is merged with paths specified via `paths`. ''; example = "find /home/matt/git -type d -name .git"; }; @@ -297,7 +290,6 @@ in }; config = { - warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups); assertions = mapAttrsToList (n: v: { assertion = (v.repository == null) != (v.repositoryFile == null); message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; @@ -310,10 +302,7 @@ in resticCmd = "${backup.package}/bin/restic${extraOptions}"; excludeFlags = optional (backup.exclude != []) "--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"; filesFromTmpFile = "/run/restic-backups-${name}/includes"; - backupPaths = - if (backup.dynamicFilesFrom == null) - then optionalString (backup.paths != null) (concatStringsSep " " backup.paths) - else "--files-from ${filesFromTmpFile}"; + doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []); pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) (resticCmd + " check " + (concatStringsSep " " backup.checkOpts)) @@ -348,7 +337,7 @@ in after = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) + ExecStart = (optionals doBackup [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ]) ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; @@ -358,7 +347,7 @@ in } // optionalAttrs (backup.environmentFile != null) { EnvironmentFile = backup.environmentFile; }; - } // optionalAttrs (backup.initialize || backup.dynamicFilesFrom != null || backup.backupPrepareCommand != null) { + } // optionalAttrs (backup.initialize || doBackup || backup.backupPrepareCommand != null) { preStart = '' ${optionalString (backup.backupPrepareCommand != null) '' ${pkgs.writeScript "backupPrepareCommand" backup.backupPrepareCommand} @@ -366,16 +355,19 @@ in ${optionalString (backup.initialize) '' ${resticCmd} snapshots || ${resticCmd} init ''} + ${optionalString (backup.paths != null && backup.paths != []) '' + cat ${pkgs.writeText "staticPaths" (concatStringsSep "\n" backup.paths)} >> ${filesFromTmpFile} + ''} ${optionalString (backup.dynamicFilesFrom != null) '' - ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} > ${filesFromTmpFile} + ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile} ''} ''; - } // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) { + } // optionalAttrs (doBackup || backup.backupCleanupCommand != null) { postStop = '' ${optionalString (backup.backupCleanupCommand != null) '' ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand} ''} - ${optionalString (backup.dynamicFilesFrom != null) '' + ${optionalString doBackup '' rm ${filesFromTmpFile} ''} ''; @@ -388,7 +380,7 @@ in wantedBy = [ "timers.target" ]; timerConfig = backup.timerConfig; }) - config.services.restic.backups; + (filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups); # generate wrapper scripts, as described in the createWrapper option environment.systemPackages = lib.mapAttrsToList (name: backup: let diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 0f375455e7..1a1df38617 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -369,7 +369,7 @@ in PrivateDevices = true; PrivateMounts = true; PrivateNetwork = mkDefault false; - PrivateUsers = true; + PrivateUsers = false; # Enabling this breaks on zfs-2.2.0 ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix index 76f147c18a..2ebe8ad2f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -359,14 +359,14 @@ in }; features.oracleMode = mkEnableOption (lib.mdDoc '' - Destroy snapshots one by one instead of using one long argument list. + destroying snapshots one by one instead of using one long argument list. If source and destination are out of sync for a long time, you may have so many snapshots to destroy that the argument gets is too long and the - command fails. + command fails ''); features.recvu = mkEnableOption (lib.mdDoc '' recvu feature which uses `-u` on the receiving end to keep the destination - filesystem unmounted. + filesystem unmounted ''); features.compressed = mkEnableOption (lib.mdDoc '' compressed feature which adds the options `-Lce` to @@ -377,7 +377,7 @@ in support and -e is for embedded data support. see {manpage}`znapzend(1)` and {manpage}`zfs(8)` - for more info. + for more info ''); features.sendRaw = mkEnableOption (lib.mdDoc '' sendRaw feature which adds the options `-w` to the @@ -386,25 +386,25 @@ in backup that can't be read without the encryption key/passphrase, useful when the remote isn't fully trusted or not physically secure. This option must be used consistently, raw incrementals cannot be based on - non-raw snapshots and vice versa. + non-raw snapshots and vice versa ''); features.skipIntermediates = mkEnableOption (lib.mdDoc '' - Enable the skipIntermediates feature to send a single increment + the skipIntermediates feature to send a single increment between latest common snapshot and the newly made one. It may skip several source snaps if the destination was offline for some time, and it should skip snapshots not managed by znapzend. Normally for online destinations, the new snapshot is sent as soon as it is created on the - source, so there are no automatic increments to skip. + source, so there are no automatic increments to skip ''); features.lowmemRecurse = mkEnableOption (lib.mdDoc '' use lowmemRecurse on systems where you have too many datasets, so a recursive listing of attributes to find backup plans exhausts the memory available to {command}`znapzend`: instead, go the slower way to first list all impacted dataset names, and then query their - configs one by one. + configs one by one ''); features.zfsGetType = mkEnableOption (lib.mdDoc '' - use zfsGetType if your {command}`zfs get` supports a + using zfsGetType if your {command}`zfs get` supports a `-t` argument for filtering by dataset type at all AND lists properties for snapshots by default when recursing, so that there is too much data to process while searching for backup plans. @@ -412,7 +412,7 @@ in `--recursive` search for backup plans can literally differ by hundreds of times (depending on the amount of snapshots in that dataset tree... and a decent backup plan will ensure you have a lot - of those), so you would benefit from requesting this feature. + of those), so you would benefit from requesting this feature ''); }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix index 8ebe0fcaff..945a373d12 100644 --- a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix +++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -13,6 +13,8 @@ in { services.erigon = { enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier"); + package = mkPackageOptionMD pkgs "erigon" { }; + extraArgs = mkOption { type = types.listOf types.str; description = lib.mdDoc "Additional arguments passed to Erigon"; @@ -92,7 +94,7 @@ in { serviceConfig = { LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}"; - ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}"; + ExecStart = "${cfg.package}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "erigon"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix index 72bf25c211..ff6b4d5588 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix @@ -67,16 +67,16 @@ with lib; mapredSiteDefault = mkOption { default = { "mapreduce.framework.name" = "yarn"; - "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; - "mapreduce.map.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; - "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; + "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; + "mapreduce.map.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; + "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=${cfg.package}"; }; defaultText = literalExpression '' { "mapreduce.framework.name" = "yarn"; - "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; - "mapreduce.map.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; - "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}"; + "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; + "mapreduce.map.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; + "mapreduce.reduce.env" = "HADOOP_MAPRED_HOME=''${config.${opt.package}}"; } ''; type = types.attrsOf types.anything; @@ -154,13 +154,13 @@ with lib; }; log4jProperties = mkOption { - default = "${cfg.package}/lib/${cfg.package.untarDir}/etc/hadoop/log4j.properties"; + default = "${cfg.package}/etc/hadoop/log4j.properties"; defaultText = literalExpression '' - "''${config.${opt.package}}/lib/''${config.${opt.package}.untarDir}/etc/hadoop/log4j.properties" + "''${config.${opt.package}}/etc/hadoop/log4j.properties" ''; type = types.path; example = literalExpression '' - "''${pkgs.hadoop}/lib/''${pkgs.hadoop.untarDir}/etc/hadoop/log4j.properties"; + "''${pkgs.hadoop}/etc/hadoop/log4j.properties"; ''; description = lib.mdDoc "log4j.properties file added to HADOOP_CONF_DIR"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix index 26077f35fd..a49aafbd1d 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix @@ -160,7 +160,7 @@ in umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true rm -rf /run/wrappers/yarn-nodemanager/ || true mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop,cgroup/cpu} - cp ${cfg.package}/lib/${cfg.package.untarDir}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/ + cp ${cfg.package}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/ chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor cp ${hadoopConf}/container-executor.cfg /run/wrappers/yarn-nodemanager/etc/hadoop/ diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix index 51475171bf..ff16795c82 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix @@ -54,7 +54,7 @@ in only the hosts listed in {var}`dataDir`/remote_hosts.cfg will be allowed to connect. - See also: + See also: ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index 344c43a429..1cbe7b893f 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -6,7 +6,7 @@ let cfg = config.services.slurm; opt = options.services.slurm; - # configuration file can be generated by http://slurm.schedmd.com/configurator.html + # configuration file can be generated by https://slurm.schedmd.com/configurator.html defaultUser = "slurm"; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix index cae5ed7cf1..38b42f7288 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/server.nix @@ -31,9 +31,9 @@ in description = lib.mdDoc "woodpecker-server config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)"; }; environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/root/woodpecker-server.env"; + type = with lib.types; coercedTo path (f: [ f ]) (listOf path); + default = [ ]; + example = [ "/root/woodpecker-server.env" ]; description = lib.mdDoc '' File to load environment variables from. This is helpful for specifying secrets. @@ -61,7 +61,7 @@ in StateDirectoryMode = "0700"; UMask = "0007"; ConfigurationDirectory = "woodpecker-server"; - EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + EnvironmentFile = cfg.environmentFile; ExecStart = "${cfg.package}/bin/woodpecker-server"; Restart = "on-failure"; RestartSec = 15; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix index e26acb88d8..cd816ffaf0 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix @@ -122,7 +122,7 @@ in options.services.cassandra = { enable = mkEnableOption (lib.mdDoc '' - Apache Cassandra – Scalable and highly available database. + Apache Cassandra – Scalable and highly available database ''); clusterName = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index 0a81a8dcee..bfecfbb366 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -79,7 +79,7 @@ in { ''; }; - # couchdb options: http://docs.couchdb.org/en/latest/config/index.html + # couchdb options: https://docs.couchdb.org/en/latest/config/index.html databaseDir = mkOption { type = types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/ferretdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/ferretdb.nix new file mode 100644 index 0000000000..ab55e22bf2 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/databases/ferretdb.nix @@ -0,0 +1,79 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.ferretdb; +in +{ + + meta.maintainers = with lib.maintainers; [ julienmalka camillemndn ]; + + options = { + services.ferretdb = { + enable = mkEnableOption "FerretDB, an Open Source MongoDB alternative"; + + package = mkOption { + type = types.package; + example = literalExpression "pkgs.ferretdb"; + default = pkgs.ferretdb; + defaultText = "pkgs.ferretdb"; + description = "FerretDB package to use."; + }; + + settings = lib.mkOption { + type = + lib.types.submodule { freeformType = with lib.types; attrsOf str; }; + example = { + FERRETDB_LOG_LEVEL = "warn"; + FERRETDB_MODE = "normal"; + }; + description = '' + Additional configuration for FerretDB, see + + for supported values. + ''; + }; + }; + }; + + config = mkIf cfg.enable + { + + services.ferretdb.settings = { + FERRETDB_HANDLER = lib.mkDefault "sqlite"; + FERRETDB_SQLITE_URL = lib.mkDefault "file:/var/lib/ferretdb/"; + }; + + systemd.services.ferretdb = { + description = "FerretDB"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = cfg.settings; + serviceConfig = { + Type = "simple"; + StateDirectory = "ferretdb"; + WorkingDirectory = "/var/lib/ferretdb"; + ExecStart = "${cfg.package}/bin/ferretdb"; + Restart = "on-failure"; + ProtectHome = true; + ProtectSystem = "strict"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + NoNewPrivileges = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + DynamicUser = true; + }; + }; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix index 26ed46f0e6..3927c81d95 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix @@ -17,7 +17,7 @@ # There are at least two ways to run firebird. superserver has been chosen # however there are no strong reasons to prefer this or the other one AFAIK # Eg superserver is said to be most efficiently using resources according to -# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html +# https://www.firebirdsql.org/manual/qsg25-classic-or-super.html with lib; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix index 12c8253ab4..a0933a5ffc 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -66,7 +66,7 @@ in { pgmanage requires at least one PostgreSQL server be defined. Detailed information about PostgreSQL connection strings is available at: - + Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md index 4d66ee38be..d65d9616e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md @@ -5,7 +5,7 @@ *Source:* {file}`modules/services/databases/postgresql.nix` -*Upstream documentation:* +*Upstream documentation:* @@ -17,9 +17,9 @@ PostgreSQL is an advanced, free relational database. To enable PostgreSQL, add the following to your {file}`configuration.nix`: ``` services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql_11; +services.postgresql.package = pkgs.postgresql_15; ``` -Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_11`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. +Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. only update database and cache config + ${pkgs.gnused}/bin/sed -i /^DB_/d ${cfg.dataDir}/.env + ${pkgs.gnused}/bin/sed -i /^CACHE_DRIVER/d ${cfg.dataDir}/.env + fi + ${lib.optionalString (cfg.useDistributedPollers || cfg.distributedPoller.enable) '' + echo "CACHE_DRIVER=memcached" >> ${cfg.dataDir}/.env + ''} + echo "DB_HOST=${cfg.database.host}" >> ${cfg.dataDir}/.env + echo "DB_PORT=${toString cfg.database.port}" >> ${cfg.dataDir}/.env + echo "DB_DATABASE=${cfg.database.database}" >> ${cfg.dataDir}/.env + echo "DB_USERNAME=${cfg.database.username}" >> ${cfg.dataDir}/.env + echo -n "DB_PASSWORD=" >> ${cfg.dataDir}/.env + cat ${cfg.database.passwordFile} >> ${cfg.dataDir}/.env + + # clear cache after update + OLD_VERSION=$(cat ${cfg.dataDir}/version) + if [[ $OLD_VERSION != "${package.version}" ]]; then + rm -r ${cfg.dataDir}/cache/* + echo "${package.version}" > ${cfg.dataDir}/version + fi + + # convert rrd files when the oneMinutePolling option is changed + OLD_ENABLED=$(cat ${cfg.dataDir}/one_minute_enabled) + if [[ $OLD_ENABLED != "${lib.boolToString cfg.enableOneMinutePolling}" ]]; then + ${package}/scripts/rrdstep.php -h all + echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled + fi + + # migrate db + ${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction + ''; + }; + + programs.mtr.enable = true; + + services.logrotate = { + enable = true; + settings."${cfg.logDir}/librenms.log" = { + su = "${cfg.user} ${cfg.group}"; + create = "0640 ${cfg.user} ${cfg.group}"; + rotate = 6; + frequency = "weekly"; + compress = true; + delaycompress = true; + missingok = true; + notifempty = true; + }; + }; + + services.cron = { + enable = true; + systemCronJobs = let + env = "PHPRC=${phpIni}"; + in [ + # based on crontab provided by LibreNMS + "33 */6 * * * ${cfg.user} ${env} ${package}/cronic ${package}/discovery-wrapper.py 1" + "*/5 * * * * ${cfg.user} ${env} ${package}/discovery.php -h new >> /dev/null 2>&1" + + "${if cfg.enableOneMinutePolling then "*" else "*/5"} * * * * ${cfg.user} ${env} ${package}/cronic ${package}/poller-wrapper.py ${toString cfg.pollerThreads}" + "* * * * * ${cfg.user} ${env} ${package}/alerts.php >> /dev/null 2>&1" + + "*/5 * * * * ${cfg.user} ${env} ${package}/poll-billing.php >> /dev/null 2>&1" + "01 * * * * ${cfg.user} ${env} ${package}/billing-calculate.php >> /dev/null 2>&1" + "*/5 * * * * ${cfg.user} ${env} ${package}/check-services.php >> /dev/null 2>&1" + + # extra: fast ping + "* * * * * ${cfg.user} ${env} ${package}/ping.php >> /dev/null 2>&1" + + # daily.sh tasks are split to exclude update + "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh cleanup >> /dev/null 2>&1" + "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh notifications >> /dev/null 2>&1" + "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh peeringdb >> /dev/null 2>&1" + "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh mac_oui >> /dev/null 2>&1" + ]; + }; + + security.wrappers = { + fping = { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; + }; + + environment.systemPackages = [ artisanWrapper lnmsWrapper ]; + + systemd.tmpfiles.rules = [ + "d ${cfg.logDir} 0750 ${cfg.user} ${cfg.group} - -" + "f ${cfg.logDir}/librenms.log 0640 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" + "f ${cfg.dataDir}/.env 0600 ${cfg.user} ${cfg.group} - -" + "f ${cfg.dataDir}/version 0600 ${cfg.user} ${cfg.group} - -" + "f ${cfg.dataDir}/one_minute_enabled 0600 ${cfg.user} ${cfg.group} - -" + "f ${cfg.dataDir}/config.json 0600 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/app 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/debugbar 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/framework 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/framework/cache 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/framework/sessions 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/framework/views 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/storage/logs 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/rrd 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -" + ] ++ lib.optionals cfg.useDistributedPollers [ + "d ${cfg.dataDir}/rrdcached-journal 0700 ${cfg.user} ${cfg.group} - -" + ]; + + }; + + meta.maintainers = lib.teams.wdz.members; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix index 67dc1bc19e..62a7858500 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix @@ -11,10 +11,10 @@ in { # the upstream package runs as root, but doesn't seem to be strictly # necessary for basic functionality - runAsRoot = mkEnableOption (lib.mdDoc "Whether to run as root"); + runAsRoot = mkEnableOption (lib.mdDoc "running as root"); autoRetirement = mkEnableOption (lib.mdDoc '' - Whether to automatically retire the host upon OS shutdown. + retiring the host upon OS shutdown ''); apiKeyFile = mkOption { @@ -59,7 +59,7 @@ in { }; options.diagnostic = - mkEnableOption (lib.mdDoc "Collect memory usage for the agent itself"); + mkEnableOption (lib.mdDoc "collecting memory usage for the agent itself"); }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix index f37f268992..5ed7cac48a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix @@ -4,7 +4,7 @@ # TODO: LWP/Pg perl libs aren't recognized # TODO: support fastcgi -# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html +# https://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html # spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph # spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum @@ -83,42 +83,47 @@ let # Copy one Munin plugin into the Nix store with a specific name. # This is suitable for use with plugins going directly into /etc/munin/plugins, # i.e. munin.extraPlugins. - internOnePlugin = name: path: + internOnePlugin = { name, path }: "cp -a '${path}' '${name}'"; # Copy an entire tree of Munin plugins into a single directory in the Nix - # store, with no renaming. - # This is suitable for use with munin-node-configure --suggest, i.e. - # munin.extraAutoPlugins. - internManyPlugins = name: path: + # store, with no renaming. The output is suitable for use with + # munin-node-configure --suggest, i.e. munin.extraAutoPlugins. + # Note that this flattens the input; this is intentional, as + # munin-node-configure won't recurse into subdirectories. + internManyPlugins = path: "find '${path}' -type f -perm /a+x -exec cp -a -t . '{}' '+'"; # Use the appropriate intern-fn to copy the plugins into the store and patch # them afterwards in an attempt to get them to run on NixOS. + # This is a bit hairy because we can't just fix shebangs; lots of munin plugins + # hardcode paths like /sbin/mount rather than trusting $PATH, so we have to + # look for and update those throughout the script. At the same time, if the + # plugin comes from a package that is already nixified, we don't want to + # rewrite paths like /nix/store/foo/sbin/mount. + # For now we make the simplifying assumption that no file will contain lines + # which mix store paths and FHS paths, and thus run our substitution only on + # lines which do not contain store paths. internAndFixPlugins = name: intern-fn: paths: pkgs.runCommand name {} '' mkdir -p "$out" cd "$out" - ${lib.concatStringsSep "\n" - (lib.attrsets.mapAttrsToList intern-fn paths)} + ${lib.concatStringsSep "\n" (map intern-fn paths)} chmod -R u+w . - find . -type f -exec sed -E -i ' - s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g - ' '{}' '+' + ${pkgs.findutils}/bin/find . -type f -exec ${pkgs.gnused}/bin/sed -E -i " + \%''${NIX_STORE}/%! s,(/usr)?/s?bin/,/run/current-system/sw/bin/,g + " '{}' '+' ''; # TODO: write a derivation for munin-contrib, so that for contrib plugins # you can just refer to them by name rather than needing to include a copy # of munin-contrib in your nixos configuration. extraPluginDir = internAndFixPlugins "munin-extra-plugins.d" - internOnePlugin nodeCfg.extraPlugins; + internOnePlugin + (lib.attrsets.mapAttrsToList (k: v: { name = k; path = v; }) nodeCfg.extraPlugins); extraAutoPluginDir = internAndFixPlugins "munin-extra-auto-plugins.d" - internManyPlugins - (builtins.listToAttrs - (map - (path: { name = baseNameOf path; value = path; }) - nodeCfg.extraAutoPlugins)); + internManyPlugins nodeCfg.extraAutoPlugins; customStaticDir = pkgs.runCommand "munin-custom-static-data" {} '' cp -a "${pkgs.munin}/etc/opt/munin/static" "$out" @@ -142,7 +147,7 @@ in Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; @@ -151,7 +156,7 @@ in type = types.lines; description = lib.mdDoc '' {file}`munin-node.conf` extra configuration. See - + ''; }; @@ -160,7 +165,7 @@ in type = types.lines; description = lib.mdDoc '' {file}`plugin-conf.d` extra plugin configuration. See - + ''; example = '' [fail2ban_*] @@ -268,9 +273,9 @@ in type = types.lines; description = lib.mdDoc '' {file}`munin.conf` extra global configuration. - See . + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -283,7 +288,7 @@ in description = lib.mdDoc '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See - + ''; example = literalExpression '' ''' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix index 8feff22c11..dc5fa1be29 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix @@ -88,7 +88,7 @@ in options = { services.nagios = { - enable = mkEnableOption (lib.mdDoc ''[Nagios](http://www.nagios.org/) to monitor your system or network.''); + enable = mkEnableOption (lib.mdDoc ''[Nagios](https://www.nagios.org/) to monitor your system or network.''); objectDefs = mkOption { description = lib.mdDoc '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 3833418b5a..de0e044453 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -12,6 +12,7 @@ let ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin + ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin ''; plugins = [ @@ -254,7 +255,7 @@ in { # Capabilities CapabilityBoundingSet = [ "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins - "CAP_DAC_READ_SEARCH" # is required for apps plugin + "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin "CAP_FOWNER" # is required for freeipmi plugin "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins "CAP_SYS_ADMIN" # is required for perf plugin @@ -263,6 +264,7 @@ in { "CAP_NET_RAW" # is required for fping app "CAP_SYS_CHROOT" # is required for cgroups plugin "CAP_SETUID" # is required for cgroups and cgroups-network plugins + "CAP_SYSLOG" # is required for systemd-journal plugin ]; # Sandboxing ProtectSystem = "full"; @@ -318,6 +320,14 @@ in { permissions = "u+rx,g+x,o-rwx"; }; + "systemd-journal.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; + capabilities = "cap_dac_read_search,cap_syslog+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; + "slabinfo.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; capabilities = "cap_dac_override+ep"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix index 44fc359b6a..a146e7ab95 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -301,6 +301,7 @@ in description = lib.mdDoc '' The addresses to send outgoing mail to. ''; + apply = x: if x == [] then null else lib.concatStringsSep "," x; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 987f17c2c6..5fb543ec61 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -8,7 +8,7 @@ let checkedConfig = file: if cfg.checkConfig then - pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } '' + pkgs.runCommand "checked-config" { nativeBuildInputs = [ cfg.package ]; } '' ln -s ${file} $out amtool check-config $out '' else file; 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 19ee3ae6f7..a38855ccd4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -31,7 +31,7 @@ let if checkConfigEnabled then pkgs.runCommandLocal "${name}-${replaceStrings [" "] [""] what}-checked" - { buildInputs = [ cfg.package.cli ]; } '' + { nativeBuildInputs = [ cfg.package.cli ]; } '' ln -s ${file} $out promtool ${what} $out '' else file; 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 b423624290..f89522c098 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -2,8 +2,8 @@ let inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers - mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption - optional types mkOptionDefault flip attrNames; + mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption + optional types mkOptionDefault flip attrNames; cfg = config.services.prometheus.exporters; @@ -20,7 +20,7 @@ let # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` - exporterOpts = genAttrs [ + exporterOpts = (genAttrs [ "apcupsd" "artifactory" "bind" @@ -34,13 +34,15 @@ let "domain" "dovecot" "fastly" + "flow" "fritzbox" "graphite" "idrac" + "imap-mailstat" "influxdb" "ipmi" - "json" "jitsi" + "json" "junos-czerwonk" "kea" "keylight" @@ -73,9 +75,9 @@ let "scaphandre" "script" "shelly" - "snmp" "smartctl" "smokeping" + "snmp" "sql" "statsd" "surfboard" @@ -87,10 +89,39 @@ let "v2ray" "varnish" "wireguard" - "flow" "zfs" - ] (name: - import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + ] + (name: + import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + )) // (mapAttrs + (name: params: + import (./. + "/exporters/${params.name}.nix") { inherit config lib pkgs options; type = params.type ; }) + { + exportarr-bazarr = { + name = "exportarr"; + type = "bazarr"; + }; + exportarr-lidarr = { + name = "exportarr"; + type = "lidarr"; + }; + exportarr-prowlarr = { + name = "exportarr"; + type = "prowlarr"; + }; + exportarr-radarr = { + name = "exportarr"; + type = "radarr"; + }; + exportarr-readarr = { + name = "exportarr"; + type = "readarr"; + }; + exportarr-sonarr = { + name = "exportarr"; + type = "sonarr"; + }; + } ); mkExporterOpts = ({ name, port }: { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index 407bff1d62..ce2c391de5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -25,7 +25,7 @@ let checkConfig = file: pkgs.runCommand "checked-blackbox-exporter.conf" { preferLocalBuild = true; - buildInputs = [ pkgs.buildPackages.prometheus-blackbox-exporter ]; + nativeBuildInputs = [ pkgs.buildPackages.prometheus-blackbox-exporter ]; } '' ln -s ${coerceConfigFile file} $out blackbox_exporter --config.check --config.file $out diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix new file mode 100644 index 0000000000..1322093354 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix @@ -0,0 +1,55 @@ +{ config, lib, pkgs, options, type }: + +let + cfg = config.services.prometheus.exporters."exportarr-${type}"; + exportarrEnvironment = ( + lib.mapAttrs (_: toString) cfg.environment + ) // { + PORT = toString cfg.port; + URL = cfg.url; + API_KEY_FILE = lib.mkIf (cfg.apiKeyFile != null) "%d/api-key"; + }; +in +{ + port = 9708; + extraOpts = { + url = lib.mkOption { + type = lib.types.str; + default = "http://127.0.0.1"; + description = lib.mdDoc '' + The full URL to Sonarr, Radarr, or Lidarr. + ''; + }; + + apiKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + File containing the api-key. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "exportarr" { }; + + environment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = lib.mdDoc '' + See [the configuration guide](https://github.com/onedr0p/exportarr#configuration) for available options. + ''; + example = { + PROWLARR__BACKFILL = true; + }; + }; + }; + serviceOpts = { + serviceConfig = { + LoadCredential = lib.optionalString (cfg.apiKeyFile != null) "api-key:${cfg.apiKeyFile}"; + ExecStart = ''${cfg.package}/bin/exportarr ${type} "$@"''; + ProcSubset = "pid"; + ProtectProc = "invisible"; + SystemCallFilter = ["@system-service" "~@privileged"]; + }; + environment = exportarrEnvironment; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix new file mode 100644 index 0000000000..c5024a258e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.imap-mailstat; + valueToString = value: + if (builtins.typeOf value == "string") then "\"${value}\"" + else ( + if (builtins.typeOf value == "int") then "${toString value}" + else ( + if (builtins.typeOf value == "bool") then (if value then "true" else "false") + else "XXX ${toString value}" + ) + ); + createConfigFile = accounts: + # unfortunately on toTOML yet + # https://github.com/NixOS/nix/issues/3929 + pkgs.writeText "imap-mailstat-exporter.conf" '' + ${concatStrings (attrValues (mapAttrs (name: config: "[[Accounts]]\nname = \"${name}\"\n${concatStrings (attrValues (mapAttrs (k: v: "${k} = ${valueToString v}\n") config))}") accounts))} + ''; + mkOpt = type: description: mkOption { + type = types.nullOr type; + default = null; + description = lib.mdDoc description; + }; + accountOptions.options = { + mailaddress = mkOpt types.str "Your email address (at the moment used as login name)"; + username = mkOpt types.str "If empty string mailaddress value is used"; + password = mkOpt types.str ""; + serveraddress = mkOpt types.str "mailserver name or address"; + serverport = mkOpt types.int "imap port number (at the moment only tls connection is supported)"; + starttls = mkOpt types.bool "set to true for using STARTTLS to start a TLS connection"; + }; +in +{ + port = 8081; + extraOpts = { + oldestUnseenDate = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable metric with timestamp of oldest unseen mail + ''; + }; + accounts = mkOption { + type = types.attrsOf (types.submodule accountOptions); + default = {}; + description = lib.mdDoc '' + Accounts to monitor + ''; + }; + configurationFile = mkOption { + type = types.path; + example = "/path/to/config-file"; + description = lib.mdDoc '' + File containing the configuration + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-imap-mailstat-exporter}/bin/imap-mailstat-exporter \ + -config ${createConfigFile cfg.accounts} \ + ${optionalString cfg.oldestUnseenDate "-oldestunseendate"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index ed33c72f64..8b1cd47d0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -15,8 +15,8 @@ in { type = types.listOf types.str; example = literalExpression '' [ - "/run/kea/kea-dhcp4.socket" - "/run/kea/kea-dhcp6.socket" + "/run/kea-dhcp4/kea-dhcp4.socket" + "/run/kea-dhcp6/kea-dhcp6.socket" ] ''; description = lib.mdDoc '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix index a73425b37d..7758487508 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix @@ -8,9 +8,9 @@ in { port = 9433; extraOpts = { knotLibraryPath = mkOption { - type = types.str; - default = "${pkgs.knot-dns.out}/lib/libknot.so"; - defaultText = literalExpression ''"''${pkgs.knot-dns.out}/lib/libknot.so"''; + type = types.nullOr types.str; + default = null; + example = literalExpression ''"''${pkgs.knot-dns.out}/lib/libknot.so"''; description = lib.mdDoc '' Path to the library of `knot-dns`. ''; @@ -25,7 +25,7 @@ in { }; knotSocketTimeout = mkOption { - type = types.int; + type = types.ints.positive; default = 2000; description = lib.mdDoc '' Timeout in seconds. @@ -33,17 +33,22 @@ in { }; }; serviceOpts = { + path = with pkgs; [ + procps + ]; serviceConfig = { ExecStart = '' - ${pkgs.prometheus-knot-exporter}/bin/knot_exporter \ + ${pkgs.prometheus-knot-exporter}/bin/knot-exporter \ --web-listen-addr ${cfg.listenAddress} \ --web-listen-port ${toString cfg.port} \ - --knot-library-path ${cfg.knotLibraryPath} \ --knot-socket-path ${cfg.knotSocketPath} \ --knot-socket-timeout ${toString cfg.knotSocketTimeout} \ + ${lib.optionalString (cfg.knotLibraryPath != null) "--knot-library-path ${cfg.knotLibraryPath}"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; - SupplementaryGroups = [ "knot" ]; + SupplementaryGroups = [ + "knot" + ]; RestrictAddressFamilies = [ # Need AF_UNIX to collect data "AF_UNIX" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index c98dcd9f64..9b75903149 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -11,7 +11,7 @@ in { ({ options.warnings = options.warnings; options.assertions = options.assertions; }) ]; extraOpts = { - verbose = mkEnableOption (lib.mdDoc "Verbose logging mode for prometheus-wireguard-exporter"); + verbose = mkEnableOption (lib.mdDoc "verbose logging mode for prometheus-wireguard-exporter"); wireguardConfig = mkOption { type = with types; nullOr (either path str); diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix index 1e654cad5d..8b79ac0e0c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix @@ -19,7 +19,7 @@ let { ${pkgs.coreutils}/bin/cat << EOF From: smartd on ${host} <${nm.sender}> - To: undisclosed-recipients:; + To: ${nm.recipient} Subject: $SMARTD_SUBJECT $SMARTD_FULLMESSAGE diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix index bb11b6a1c1..efef2d777a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix @@ -239,11 +239,9 @@ in power.ups.schedulerRules = mkDefault "${pkgs.nut}/etc/upssched.conf.sample"; - system.activationScripts.upsSetup = stringAfter [ "users" "groups" ] - '' - # Used to store pid files of drivers. - mkdir -p /var/state/ups - ''; + systemd.tmpfiles.rules = [ + "d /var/state/ups -" + ]; /* diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix index 5a355f3441..bc746bed31 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix @@ -203,10 +203,8 @@ in default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" - "/ip4/0.0.0.0/udp/4001/quic" "/ip4/0.0.0.0/udp/4001/quic-v1" "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport" - "/ip6/::/udp/4001/quic" "/ip6/::/udp/4001/quic-v1" "/ip6/::/udp/4001/quic-v1/webtransport" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix index ad0fd78356..fbaa7cfc19 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/server.nix @@ -177,13 +177,13 @@ in { backup = { enable = mkEnableOption (lib.mdDoc '' - Backup server role. When using OpenAFS built-in buserver, use in conjunction with the + the backup server role. When using OpenAFS built-in buserver, use in conjunction with the `database` role to maintain the Backup Database. Normally only used in conjunction with tape storage or IBM's Tivoli Storage Manager. For a modern backup server, enable this role and see - {option}`enableFabs`. + {option}`enableFabs` ''); enableFabs = mkEnableOption (lib.mdDoc '' diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 1310a374ab..0b22302c0b 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -39,7 +39,7 @@ let daemonService = appName: args: { description = "Samba Service Daemon ${appName}"; - after = [ (mkIf (cfg.enableNmbd && "${appName}" == "smbd") "samba-nmbd.service") ]; + after = [ (mkIf (cfg.enableNmbd && "${appName}" == "smbd") "samba-nmbd.service") "network.target" ]; requiredBy = [ "samba.target" ]; partOf = [ "samba.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix index 926c3c3bd5..866661cf4e 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -176,7 +176,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS DIR service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; replication = { @@ -218,7 +218,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS DIR replication plugin. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; @@ -319,7 +319,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS MRC service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; replication = { @@ -361,7 +361,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS MRC replication plugin. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; @@ -438,7 +438,7 @@ in description = lib.mdDoc '' Configuration of XtreemFS OSD service. WARNING: configuration is saved as plaintext inside nix store. - For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + For more options: https://www.xtreemfs.org/xtfs-guide-1.5.1/index.html ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix index 5a1d03f072..279927781e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix @@ -139,7 +139,7 @@ in path. See - + for more examples of what is possible here. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix index a86d52b720..a48066b43b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix @@ -3,8 +3,7 @@ with lib; let - - eachBitcoind = config.services.bitcoind; + eachBitcoind = filterAttrs (bitcoindName: cfg: cfg.enable) config.services.bitcoind; rpcUserOpts = { name, ... }: { options = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix index 4989914195..c626945ccd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix @@ -1,55 +1,59 @@ { config, lib, pkgs, ... }: -with pkgs; -with lib; - let cfg = config.services.connman; configFile = pkgs.writeText "connman.conf" '' [General] - NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist} + NetworkInterfaceBlacklist=${lib.concatStringsSep "," cfg.networkInterfaceBlacklist} ${cfg.extraConfig} ''; enableIwd = cfg.wifi.backend == "iwd"; in { + meta.maintainers = with lib.maintainers; [ AndersonTorres ]; imports = [ - (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ]) + (lib.mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ]) ]; ###### interface options = { - services.connman = { - - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether to use ConnMan for managing your network connections. ''; }; - enableVPN = mkOption { - type = types.bool; + package = lib.mkOption { + type = lib.types.package; + description = lib.mdDoc "The connman package / build flavor"; + default = pkgs.connman; + defaultText = lib.literalExpression "pkgs.connman"; + example = lib.literalExpression "pkgs.connmanFull"; + }; + + enableVPN = lib.mkOption { + type = lib.types.bool; default = true; description = lib.mdDoc '' Whether to enable ConnMan VPN service. ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' Configuration lines appended to the generated connman configuration file. ''; }; - networkInterfaceBlacklist = mkOption { - type = with types; listOf str; + networkInterfaceBlacklist = lib.mkOption { + type = with lib.types; listOf str; default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ]; description = lib.mdDoc '' Default blacklisted interfaces, this includes NixOS containers interfaces (ve). @@ -57,8 +61,8 @@ in { }; wifi = { - backend = mkOption { - type = types.enum [ "wpa_supplicant" "iwd" ]; + backend = lib.mkOption { + type = lib.types.enum [ "wpa_supplicant" "iwd" ]; default = "wpa_supplicant"; description = lib.mdDoc '' Specify the Wi-Fi backend used. @@ -67,31 +71,20 @@ in { }; }; - extraFlags = mkOption { - type = with types; listOf str; + extraFlags = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; example = [ "--nodnsproxy" ]; description = lib.mdDoc '' Extra flags to pass to connmand ''; }; - - package = mkOption { - type = types.package; - description = lib.mdDoc "The connman package / build flavor"; - default = connman; - defaultText = literalExpression "pkgs.connman"; - example = literalExpression "pkgs.connmanFull"; - }; - }; - }; ###### implementation - config = mkIf cfg.enable { - + config = lib.mkIf cfg.enable { assertions = [{ assertion = !config.networking.useDHCP; message = "You can not use services.connman with networking.useDHCP"; @@ -107,8 +100,8 @@ in { systemd.services.connman = { description = "Connection service"; wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" ] ++ optional enableIwd "iwd.service"; - requires = optional enableIwd "iwd.service"; + after = [ "syslog.target" ] ++ lib.optional enableIwd "iwd.service"; + requires = lib.optional enableIwd "iwd.service"; serviceConfig = { Type = "dbus"; BusName = "net.connman"; @@ -117,13 +110,13 @@ in { "${cfg.package}/sbin/connmand" "--config=${configFile}" "--nodaemon" - ] ++ optional enableIwd "--wifi=iwd_agent" + ] ++ lib.optional enableIwd "--wifi=iwd_agent" ++ cfg.extraFlags); StandardOutput = "null"; }; }; - systemd.services.connman-vpn = mkIf cfg.enableVPN { + systemd.services.connman-vpn = lib.mkIf cfg.enableVPN { description = "ConnMan VPN service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; @@ -136,7 +129,7 @@ in { }; }; - systemd.services.net-connman-vpn = mkIf cfg.enableVPN { + systemd.services.net-connman-vpn = lib.mkIf cfg.enableVPN { description = "D-BUS Service"; serviceConfig = { Name = "net.connman.vpn"; @@ -150,9 +143,9 @@ in { networking = { useDHCP = false; wireless = { - enable = mkIf (!enableIwd) true; + enable = lib.mkIf (!enableIwd) true; dbusControlled = true; - iwd = mkIf enableIwd { + iwd = lib.mkIf enableIwd { enable = true; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/create_ap.nix b/third_party/nixpkgs/nixos/modules/services/networking/create_ap.nix index e772cf21ec..994aa6d36d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/create_ap.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/create_ap.nix @@ -8,7 +8,7 @@ let in { options = { services.create_ap = { - enable = mkEnableOption (lib.mdDoc "setup wifi hotspots using create_ap"); + enable = mkEnableOption (lib.mdDoc "setting up wifi hotspots using create_ap"); settings = mkOption { type = with types; attrsOf (oneOf [ int bool str ]); default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dae.nix b/third_party/nixpkgs/nixos/modules/services/networking/dae.nix index 42ed3c7f8d..cf3fead19b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dae.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dae.nix @@ -14,10 +14,11 @@ in options = { services.dae = with lib;{ enable = mkEnableOption - (mdDoc "A Linux high-performance transparent proxy solution based on eBPF"); + (mdDoc "dae, a Linux high-performance transparent proxy solution based on eBPF"); package = mkPackageOptionMD pkgs "dae" { }; + assets = mkOption { type = with types;(listOf path); default = with pkgs; [ v2ray-geoip v2ray-domain-list-community ]; @@ -45,9 +46,9 @@ in openFirewall = mkOption { type = with types; submodule { options = { - enable = mkEnableOption "enable"; + enable = mkEnableOption (mdDoc "opening {option}`port` in the firewall"); port = mkOption { - type = types.int; + type = types.port; description = '' Port to be opened. Consist with field `tproxy_port` in config file. ''; @@ -70,8 +71,8 @@ in }; configFile = mkOption { - type = types.path; - default = "/etc/dae/config.dae"; + type = with types; (nullOr path); + default = null; example = "/path/to/your/config.dae"; description = mdDoc '' The path of dae config file, end with `.dae`. @@ -79,12 +80,10 @@ in }; config = mkOption { - type = types.str; - default = '' - global{} - routing{} - ''; + type = with types; (nullOr str); + default = null; description = mdDoc '' + WARNING: This option will expose store your config unencrypted world-readable in the nix store. Config text for dae. See . @@ -92,7 +91,7 @@ in }; disableTxChecksumIpGeneric = - mkEnableOption (mdDoc "See "); + mkEnableOption "" // { description = mdDoc "See "; }; }; }; @@ -103,11 +102,6 @@ in environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; - environment.etc."dae/config.dae" = { - mode = "0400"; - source = pkgs.writeText "config.dae" cfg.config; - }; - networking = lib.mkIf cfg.openFirewall.enable { firewall = let portToOpen = cfg.openFirewall.port; @@ -121,20 +115,27 @@ in systemd.services.dae = let daeBin = lib.getExe cfg.package; - TxChecksumIpGenericWorkaround = with lib;(getExe pkgs.writeShellApplication { - name = "disable-tx-checksum-ip-generic"; - text = with pkgs; '' - iface=$(${iproute2}/bin/ip route | ${lib.getExe gawk} '/default/ {print $5}') - ${lib.getExe ethtool} -K "$iface" tx-checksum-ip-generic off - ''; - }); + + configPath = + if cfg.configFile != null + then cfg.configFile else pkgs.writeText "config.dae" cfg.config; + + TxChecksumIpGenericWorkaround = with lib; + (getExe pkgs.writeShellApplication { + name = "disable-tx-checksum-ip-generic"; + text = with pkgs; '' + iface=$(${iproute2}/bin/ip route | ${lib.getExe gawk} '/default/ {print $5}') + ${lib.getExe ethtool} -K "$iface" tx-checksum-ip-generic off + ''; + }); in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStartPre = [ "" "${daeBin} validate -c ${cfg.configFile}" ] + LoadCredential = [ "config.dae:${configPath}" ]; + ExecStartPre = [ "" "${daeBin} validate -c \${CREDENTIALS_DIRECTORY}/config.dae" ] ++ (with lib; optional cfg.disableTxChecksumIpGeneric TxChecksumIpGenericWorkaround); - ExecStart = [ "" "${daeBin} run --disable-timestamp -c ${cfg.configFile}" ]; + ExecStart = [ "" "${daeBin} run --disable-timestamp -c \${CREDENTIALS_DIRECTORY}/config.dae" ]; Environment = "DAE_LOCATION_ASSET=${cfg.assetsPath}"; }; }; @@ -149,13 +150,21 @@ in } { - assertion = !((config.services.dae.config != "global{}\nrouting{}\n") - && (config.services.dae.configFile != "/etc/dae/config.dae")); + assertion = !((config.services.dae.config != null) + && (config.services.dae.configFile != null)); message = '' Option `config` and `configFile` could not be set at the same time. ''; } + + { + assertion = !((config.services.dae.config == null) + && (config.services.dae.configFile == null)); + message = '' + Either `config` or `configFile` should be set. + ''; + } ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix new file mode 100644 index 0000000000..8f4fb0bc78 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix @@ -0,0 +1,234 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.ddclient; + boolToStr = bool: if bool then "yes" else "no"; + dataDir = "/var/lib/ddclient"; + StateDirectory = builtins.baseNameOf dataDir; + RuntimeDirectory = StateDirectory; + + configFile' = pkgs.writeText "ddclient.conf" '' + # This file can be used as a template for configFile or is automatically generated by Nix options. + cache=${dataDir}/ddclient.cache + foreground=YES + use=${cfg.use} + login=${cfg.username} + password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"} + protocol=${cfg.protocol} + ${lib.optionalString (cfg.script != "") "script=${cfg.script}"} + ${lib.optionalString (cfg.server != "") "server=${cfg.server}"} + ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} + ssl=${boolToStr cfg.ssl} + wildcard=YES + quiet=${boolToStr cfg.quiet} + verbose=${boolToStr cfg.verbose} + ${cfg.extraConfig} + ${lib.concatStringsSep "," cfg.domains} + ''; + configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; + + preStart = '' + install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf + ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then '' + install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key + '' else if (cfg.passwordFile != null) then '' + "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf" + '' else '' + sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf + '')} + ''; + +in + +with lib; + +{ + + imports = [ + (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ] + (config: + let value = getAttrFromPath [ "services" "ddclient" "domain" ] config; + in optional (value != "") value)) + (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "") + (mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.") + (mkRemovedOptionModule [ "services" "ddclient" "ipv6" ] "") + ]; + + ###### interface + + options = { + + services.ddclient = with lib.types; { + + enable = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org). + ''; + }; + + package = mkOption { + type = package; + default = pkgs.ddclient; + defaultText = lib.literalExpression "pkgs.ddclient"; + description = lib.mdDoc '' + The ddclient executable package run by the service. + ''; + }; + + domains = mkOption { + default = [ "" ]; + type = listOf str; + description = lib.mdDoc '' + Domain name(s) to synchronize. + ''; + }; + + username = mkOption { + # For `nsupdate` username contains the path to the nsupdate executable + default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate"; + defaultText = ""; + type = str; + description = lib.mdDoc '' + User name. + ''; + }; + + passwordFile = mkOption { + default = null; + type = nullOr str; + description = lib.mdDoc '' + A file containing the password or a TSIG key in named format when using the nsupdate protocol. + ''; + }; + + interval = mkOption { + default = "10min"; + type = str; + description = lib.mdDoc '' + The interval at which to run the check and update. + See {command}`man 7 systemd.time` for the format. + ''; + }; + + configFile = mkOption { + default = null; + type = nullOr path; + description = lib.mdDoc '' + Path to configuration file. + When set this overrides the generated configuration from module options. + ''; + example = "/root/nixos/secrets/ddclient.conf"; + }; + + protocol = mkOption { + default = "dyndns2"; + type = str; + description = lib.mdDoc '' + Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). + ''; + }; + + server = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + Server address. + ''; + }; + + ssl = mkOption { + default = true; + type = bool; + description = lib.mdDoc '' + Whether to use SSL/TLS to connect to dynamic DNS provider. + ''; + }; + + quiet = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Print no messages for unnecessary updates. + ''; + }; + + script = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + script as required by some providers. + ''; + }; + + use = mkOption { + default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; + type = str; + description = lib.mdDoc '' + Method to determine the IP address to send to the dynamic DNS provider. + ''; + }; + + verbose = mkOption { + default = false; + type = bool; + description = lib.mdDoc '' + Print verbose information. + ''; + }; + + zone = mkOption { + default = ""; + type = str; + description = lib.mdDoc '' + zone as required by some providers. + ''; + }; + + extraConfig = mkOption { + default = ""; + type = lines; + description = lib.mdDoc '' + Extra configuration. Contents will be added verbatim to the configuration file. + + ::: {.note} + `daemon` should not be added here because it does not work great with the systemd-timer approach the service uses. + ::: + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf config.services.ddclient.enable { + systemd.services.ddclient = { + description = "Dynamic DNS Client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + restartTriggers = optional (cfg.configFile != null) cfg.configFile; + path = lib.optional (lib.hasPrefix "if," cfg.use) pkgs.iproute2; + + serviceConfig = { + DynamicUser = true; + RuntimeDirectoryMode = "0700"; + inherit RuntimeDirectory; + inherit StateDirectory; + Type = "oneshot"; + ExecStartPre = "!${pkgs.writeShellScript "ddclient-prestart" preStart}"; + ExecStart = "${lib.getExe cfg.package} -file /run/${RuntimeDirectory}/ddclient.conf"; + }; + }; + + systemd.timers.ddclient = { + description = "Run ddclient"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = cfg.interval; + OnUnitInactiveSec = cfg.interval; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/deconz.nix b/third_party/nixpkgs/nixos/modules/services/networking/deconz.nix new file mode 100644 index 0000000000..05b7247087 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/deconz.nix @@ -0,0 +1,125 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.deconz; + name = "deconz"; + stateDir = "/var/lib/${name}"; + # ref. upstream deconz.service + capabilities = + lib.optionals (cfg.httpPort < 1024 || cfg.wsPort < 1024) [ "CAP_NET_BIND_SERVICE" ] + ++ lib.optionals (cfg.allowRebootSystem) [ "CAP_SYS_BOOT" ] + ++ lib.optionals (cfg.allowRestartService) [ "CAP_KILL" ] + ++ lib.optionals (cfg.allowSetSystemTime) [ "CAP_SYS_TIME" ]; +in +{ + options.services.deconz = { + + enable = lib.mkEnableOption "deCONZ, a Zigbee gateway for use with ConBee hardware (https://phoscon.de/en/conbee2)"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.deconz; + defaultText = lib.literalExpression "pkgs.deconz"; + description = "Which deCONZ package to use."; + }; + + device = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Force deCONZ to use a specific USB device (e.g. /dev/ttyACM0). By + default it does a search. + ''; + }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = '' + Pin deCONZ to the network interface specified through the provided IP + address. This applies for the webserver as well as the websocket + notifications. + ''; + }; + + httpPort = lib.mkOption { + type = lib.types.port; + default = 80; + description = "TCP port for the web server."; + }; + + wsPort = lib.mkOption { + type = lib.types.port; + default = 443; + description = "TCP port for the WebSocket."; + }; + + openFirewall = lib.mkEnableOption "opening up the service ports in the firewall"; + + allowRebootSystem = lib.mkEnableOption "rebooting the system"; + + allowRestartService = lib.mkEnableOption "killing/restarting processes"; + + allowSetSystemTime = lib.mkEnableOption "setting the system time"; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ + "--dbg-info=1" + "--dbg-err=2" + ]; + description = '' + Extra command line arguments for deCONZ, see + https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/deCONZ-command-line-parameters. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.httpPort + cfg.wsPort + ]; + + services.udev.packages = [ cfg.package ]; + + systemd.services.deconz = { + description = "deCONZ Zigbee gateway"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + # The service puts a nix store path reference in here, and that path can + # be garbage collected. Ensure the file gets "refreshed" on every start. + rm -f ${stateDir}/.local/share/dresden-elektronik/deCONZ/zcldb.txt + ''; + environment = { + HOME = stateDir; + XDG_RUNTIME_DIR = "/run/${name}"; + }; + serviceConfig = { + ExecStart = + "${lib.getExe cfg.package}" + + " -platform minimal" + + " --http-listen=${cfg.listenAddress}" + + " --http-port=${toString cfg.httpPort}" + + " --ws-port=${toString cfg.wsPort}" + + " --auto-connect=1" + + (lib.optionalString (cfg.device != null) " --dev=${cfg.device}") + + " " + (lib.escapeShellArgs cfg.extraArgs); + Restart = "on-failure"; + AmbientCapabilities = capabilities; + CapabilityBoundingSet = capabilities; + UMask = "0027"; + DynamicUser = true; + RuntimeDirectory = name; + RuntimeDirectoryMode = "0700"; + StateDirectory = name; + WorkingDirectory = stateDir; + # For access to /dev/ttyACM0 (ConBee). + SupplementaryGroups = [ "dialout" ]; + ProtectHome = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix b/third_party/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix new file mode 100644 index 0000000000..26e8ad8b76 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/fastnetmon-advanced.nix @@ -0,0 +1,222 @@ +{ config, lib, pkgs, ... }: + +let + # Background information: FastNetMon requires a MongoDB to start. This is because + # it uses MongoDB to store its configuration. That is, in a normal setup there is + # one collection with one document. + # To provide declarative configuration in our NixOS module, this database is + # completely emptied and replaced on each boot by the fastnetmon-setup service + # using the configuration backup functionality. + + cfg = config.services.fastnetmon-advanced; + settingsFormat = pkgs.formats.yaml { }; + + # obtain the default configs by starting up ferretdb and fcli in a derivation + default_configs = pkgs.runCommand "default-configs" { + nativeBuildInputs = [ + pkgs.ferretdb + pkgs.fastnetmon-advanced # for fcli + pkgs.proot + ]; + } '' + mkdir ferretdb fastnetmon $out + FERRETDB_TELEMETRY="disable" FERRETDB_HANDLER="sqlite" FERRETDB_STATE_DIR="$PWD/ferretdb" FERRETDB_SQLITE_URL="file:$PWD/ferretdb/" ferretdb & + + cat << EOF > fastnetmon/fastnetmon.conf + ${builtins.toJSON { + mongodb_username = ""; + }} + EOF + proot -b fastnetmon:/etc/fastnetmon -0 fcli create_configuration + proot -b fastnetmon:/etc/fastnetmon -0 fcli set bgp default + proot -b fastnetmon:/etc/fastnetmon -0 fcli export_configuration backup.tar + tar -C $out --no-same-owner -xvf backup.tar + ''; + + # merge the user configs into the default configs + config_tar = pkgs.runCommand "fastnetmon-config.tar" { + nativeBuildInputs = with pkgs; [ jq ]; + } '' + jq -s add ${default_configs}/main.json ${pkgs.writeText "main-add.json" (builtins.toJSON cfg.settings)} > main.json + mkdir hostgroup + ${lib.concatImapStringsSep "\n" (pos: hostgroup: '' + jq -s add ${default_configs}/hostgroup/0.json ${pkgs.writeText "hostgroup-${toString (pos - 1)}-add.json" (builtins.toJSON hostgroup)} > hostgroup/${toString (pos - 1)}.json + '') hostgroups} + mkdir bgp + ${lib.concatImapStringsSep "\n" (pos: bgp: '' + jq -s add ${default_configs}/bgp/0.json ${pkgs.writeText "bgp-${toString (pos - 1)}-add.json" (builtins.toJSON bgp)} > bgp/${toString (pos - 1)}.json + '') bgpPeers} + tar -cf $out main.json ${lib.concatImapStringsSep " " (pos: _: "hostgroup/${toString (pos - 1)}.json") hostgroups} ${lib.concatImapStringsSep " " (pos: _: "bgp/${toString (pos - 1)}.json") bgpPeers} + ''; + + hostgroups = lib.mapAttrsToList (name: hostgroup: { inherit name; } // hostgroup) cfg.hostgroups; + bgpPeers = lib.mapAttrsToList (name: bgpPeer: { inherit name; } // bgpPeer) cfg.bgpPeers; + +in { + options.services.fastnetmon-advanced = with lib; { + enable = mkEnableOption "the fastnetmon-advanced DDoS Protection daemon"; + + settings = mkOption { + description = '' + Extra configuration options to declaratively load into FastNetMon Advanced. + + See the [FastNetMon Advanced Configuration options reference](https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-configuration-options/) for more details. + ''; + type = settingsFormat.type; + default = {}; + example = literalExpression '' + { + networks_list = [ "192.0.2.0/24" ]; + gobgp = true; + gobgp_flow_spec_announces = true; + } + ''; + }; + hostgroups = mkOption { + description = "Hostgroups to declaratively load into FastNetMon Advanced"; + type = types.attrsOf settingsFormat.type; + default = {}; + }; + bgpPeers = mkOption { + description = "BGP Peers to declaratively load into FastNetMon Advanced"; + type = types.attrsOf settingsFormat.type; + default = {}; + }; + + enableAdvancedTrafficPersistence = mkOption { + description = "Store historical flow data in clickhouse"; + type = types.bool; + default = false; + }; + + traffic_db.settings = mkOption { + type = settingsFormat.type; + description = "Additional settings for /etc/fastnetmon/traffic_db.conf"; + }; + }; + + config = lib.mkMerge [ (lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + fastnetmon-advanced # for fcli + ]; + + environment.etc."fastnetmon/license.lic".source = "/var/lib/fastnetmon/license.lic"; + environment.etc."fastnetmon/gobgpd.conf".source = "/run/fastnetmon/gobgpd.conf"; + environment.etc."fastnetmon/fastnetmon.conf".source = pkgs.writeText "fastnetmon.conf" (builtins.toJSON { + mongodb_username = ""; + }); + + services.ferretdb.enable = true; + + systemd.services.fastnetmon-setup = { + wantedBy = [ "multi-user.target" ]; + after = [ "ferretdb.service" ]; + path = with pkgs; [ fastnetmon-advanced config.systemd.package ]; + script = '' + fcli create_configuration + fcli delete hostgroup global + fcli import_configuration ${config_tar} + systemctl --no-block try-restart fastnetmon + ''; + serviceConfig.Type = "oneshot"; + }; + + systemd.services.fastnetmon = { + wantedBy = [ "multi-user.target" ]; + after = [ "ferretdb.service" "fastnetmon-setup.service" "polkit.service" ]; + path = with pkgs; [ iproute2 ]; + unitConfig = { + # Disable logic which shuts service when we do too many restarts + # We do restarts from sudo fcli commit and it's expected that we may have many restarts + # Details: https://github.com/systemd/systemd/issues/2416 + StartLimitInterval = 0; + }; + serviceConfig = { + ExecStart = "${pkgs.fastnetmon-advanced}/bin/fastnetmon --log_to_console"; + + LimitNOFILE = 65535; + # Restart service when it fails due to any reasons, we need to keep processing traffic no matter what happened + Restart= "on-failure"; + RestartSec= "5s"; + + DynamicUser = true; + CacheDirectory = "fastnetmon"; + RuntimeDirectory = "fastnetmon"; # for gobgpd config + StateDirectory = "fastnetmon"; # for license file + }; + }; + + security.polkit.enable = true; + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && + subject.isInGroup("fastnetmon")) { + if (action.lookup("unit") == "gobgp.service") { + var verb = action.lookup("verb"); + if (verb == "start" || verb == "stop" || verb == "restart") { + return polkit.Result.YES; + } + } + } + }); + ''; + + # We don't use the existing gobgp NixOS module and package, because the gobgp + # version might not be compatible with fastnetmon. Also, the service name + # _must_ be 'gobgp' and not 'gobgpd', so that fastnetmon can reload the config. + systemd.services.gobgp = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "GoBGP Routing Daemon"; + unitConfig = { + ConditionPathExists = "/run/fastnetmon/gobgpd.conf"; + }; + serviceConfig = { + Type = "notify"; + ExecStartPre = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -f /run/fastnetmon/gobgpd.conf -d"; + SupplementaryGroups = [ "fastnetmon" ]; + ExecStart = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -f /run/fastnetmon/gobgpd.conf --sdnotify"; + ExecReload = "${pkgs.fastnetmon-advanced}/bin/fnm-gobgpd -r"; + DynamicUser = true; + AmbientCapabilities = "cap_net_bind_service"; + }; + }; + }) + + (lib.mkIf (cfg.enable && cfg.enableAdvancedTrafficPersistence) { + ## Advanced Traffic persistence + ## https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-traffic-persistency/ + + services.clickhouse.enable = true; + + services.fastnetmon-advanced.settings.traffic_db = true; + + services.fastnetmon-advanced.traffic_db.settings = { + clickhouse_batch_size = lib.mkDefault 1000; + clickhouse_batch_delay = lib.mkDefault 1; + traffic_db_host = lib.mkDefault "127.0.0.1"; + traffic_db_port = lib.mkDefault 8100; + clickhouse_host = lib.mkDefault "127.0.0.1"; + clickhouse_port = lib.mkDefault 9000; + clickhouse_user = lib.mkDefault "default"; + clickhouse_password = lib.mkDefault ""; + }; + environment.etc."fastnetmon/traffic_db.conf".text = builtins.toJSON cfg.traffic_db.settings; + + systemd.services.traffic_db = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.fastnetmon-advanced}/bin/traffic_db"; + # Restart service when it fails due to any reasons, we need to keep processing traffic no matter what happened + Restart= "on-failure"; + RestartSec= "5s"; + + DynamicUser = true; + }; + }; + + }) ]; + + meta.maintainers = lib.teams.wdz.members; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md index 3ee863343e..4d8777d204 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md @@ -45,7 +45,7 @@ this instance, and `url`, which holds the URL under which the sync server can be accessed. The `url` can be configured automatically when using nginx. Options that affect the surroundings of the sync server are `enableNginx`, -`enableTLS` and `hostnam`. If `enableNginx` is set the sync server module will +`enableTLS` and `hostname`. If `enableNginx` is set the sync server module will automatically add an nginx virtual host to the system using `hostname` as the domain and set `url` accordingly. If `enableTLS` is set the module will also enable ACME certificates on the new virtual host and force all connections to diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix index 42924d7f69..71eb2f537a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix @@ -224,10 +224,12 @@ in Settings for the sync server. These take priority over values computed from NixOS options. - See the doc comments on the `Settings` structs in - + See the example config in + + and the doc comments on the `Settings` structs in + and - + for available options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix index b65bb5f548..78d24ecf17 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix @@ -9,7 +9,7 @@ let configFile = settingsFormat.generate "config.yaml" cfg.config; in { options.services.go-neb = { - enable = mkEnableOption (lib.mdDoc "Extensible matrix bot written in Go"); + enable = mkEnableOption (lib.mdDoc "an extensible matrix bot written in Go"); bindAddress = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix b/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix index 2279ceee2f..558f499022 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix @@ -29,7 +29,7 @@ let export PATH=$PATH:${pkgs.iproute2}/sbin - ip link set $IFNAME up + ip link set dev $IFNAME up ip address add ${cfg.ipAddress} dev $IFNAME ip route add ${cfg.subnet} dev $IFNAME diff --git a/third_party/nixpkgs/nixos/modules/services/networking/harmonia.nix b/third_party/nixpkgs/nixos/modules/services/networking/harmonia.nix index 144fa6c708..4733165cf7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/harmonia.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/harmonia.nix @@ -28,6 +28,8 @@ in }; config = lib.mkIf cfg.enable { + nix.settings.extra-allowed-users = [ "harmonia" ]; + systemd.services.harmonia = { description = "harmonia binary cache service"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix index 4ec066c2ec..5bd8e1d4d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -116,10 +116,10 @@ in { options = { services.hostapd = { enable = mkEnableOption (mdDoc '' - Whether to enable hostapd. hostapd is a user space daemon for access point and + hostapd, a user space daemon for access point and authentication servers. It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and RADIUS - authentication server. + authentication server ''); package = mkPackageOption pkgs "hostapd" {}; @@ -899,25 +899,6 @@ in { ''; }; }; - - managementFrameProtection = mkOption { - default = "required"; - type = types.enum ["disabled" "optional" "required"]; - apply = x: - getAttr x { - "disabled" = 0; - "optional" = 1; - "required" = 2; - }; - description = mdDoc '' - Management frame protection (MFP) authenticates management frames - to prevent deauthentication (or related) attacks. - - - {var}`"disabled"`: No management frame protection - - {var}`"optional"`: Use MFP if a connection allows it - - {var}`"required"`: Force MFP for all clients - ''; - }; }; config = let @@ -943,7 +924,8 @@ in { # IEEE 802.11i (authentication) related configuration # Encrypt management frames to protect against deauthentication and similar attacks - ieee80211w = bssCfg.managementFrameProtection; + ieee80211w = mkDefault 1; + sae_require_mfp = mkDefault 1; # Only allow WPA by default and disable insecure WEP auth_algs = mkDefault 1; @@ -1184,14 +1166,6 @@ in { assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null); message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.''; } - { - assertion = auth.mode == "wpa3-sae" -> bssCfg.managementFrameProtection == 2; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires managementFrameProtection="required"''; - } - { - assertion = auth.mode == "wpa3-sae-transition" -> bssCfg.managementFrameProtection != 0; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode with WPA2-SHA256, which requires managementFrameProtection="optional" or ="required"''; - } { assertion = countWpaPasswordDefinitions <= 1; message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix index 82c144236f..49b2bef90a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix @@ -272,18 +272,18 @@ in }; faxcron.enable.spoolInit = mkEnableOption (lib.mdDoc '' - Purge old files from the spooling area with + purging old files from the spooling area with {file}`faxcron` - each time the spooling area is initialized. + each time the spooling area is initialized ''); faxcron.enable.frequency = mkOption { type = nullOr nonEmptyStr; default = null; example = "daily"; description = lib.mdDoc '' - Purge old files from the spooling area with + purging old files from the spooling area with {file}`faxcron` with the given frequency - (see systemd.time(7)). + (see systemd.time(7)) ''; }; faxcron.infoDays = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix index c940324ad0..808e7b66d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix @@ -239,7 +239,7 @@ in enable = mkEnableOption (lib.mdDoc "I2Pd daemon") // { description = lib.mdDoc '' Enables I2Pd as a running service upon activation. - Please read http://i2pd.readthedocs.io/en/latest/ for further + Please read for further configuration help. ''; }; @@ -265,7 +265,7 @@ in ''; }; - logCLFTime = mkEnableOption (lib.mdDoc "Full CLF-formatted date and time to log"); + logCLFTime = mkEnableOption (lib.mdDoc "full CLF-formatted date and time to log"); address = mkOption { type = with types; nullOr str; @@ -456,7 +456,7 @@ in ''; }; - trust.enable = mkEnableOption (lib.mdDoc "Explicit trust options"); + trust.enable = mkEnableOption (lib.mdDoc "explicit trust options"); trust.family = mkOption { type = with types; nullOr str; @@ -474,7 +474,7 @@ in ''; }; - trust.hidden = mkEnableOption (lib.mdDoc "Router concealment"); + trust.hidden = mkEnableOption (lib.mdDoc "router concealment"); websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666; @@ -552,7 +552,7 @@ in proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // { - auth = mkEnableOption (lib.mdDoc "Webconsole authentication"); + auth = mkEnableOption (lib.mdDoc "webconsole authentication"); user = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh index d9d2e4264d..07a3788abf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/third_party/nixpkgs/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup doSub() { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix index d2865a660e..6c30f89b79 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix @@ -7,7 +7,7 @@ in enable = mkEnableOption (lib.mdDoc "the openiscsi iscsi daemon"); enableAutoLoginOut = mkEnableOption (lib.mdDoc '' automatic login and logout of all automatic targets. - You probably do not want this. + You probably do not want this ''); discoverPortal = mkOption { type = nullOr str; @@ -52,25 +52,27 @@ in ''; environment.etc."iscsi/initiatorname.iscsi".text = "InitiatorName=${cfg.name}"; - system.activationScripts.iscsid = let - extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' - if [ -f "${cfg.extraConfigFile}" ]; then - printf "\n# The following is from ${cfg.extraConfigFile}:\n" - cat "${cfg.extraConfigFile}" - else - echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 - fi - ''; - in '' - ( - cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source} - ${extraCfgDumper} - ) > /etc/iscsi/iscsid.conf - ''; - systemd.packages = [ cfg.package ]; - systemd.services."iscsid".wantedBy = [ "multi-user.target" ]; + systemd.services."iscsid" = { + wantedBy = [ "multi-user.target" ]; + preStart = + let + extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' + if [ -f "${cfg.extraConfigFile}" ]; then + printf "\n# The following is from ${cfg.extraConfigFile}:\n" + cat "${cfg.extraConfigFile}" + else + echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 + fi + ''; + in '' + ( + cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source} + ${extraCfgDumper} + ) > /etc/iscsi/iscsid.conf + ''; + }; systemd.sockets."iscsid".wantedBy = [ "sockets.target" ]; systemd.services."iscsi" = mkIf cfg.enableAutoLoginOut { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix index 945f4113bd..2f922a026a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix @@ -254,7 +254,6 @@ in DynamicUser = true; User = "kea"; ConfigurationDirectory = "kea"; - RuntimeDirectory = "kea"; StateDirectory = "kea"; UMask = "0077"; }; @@ -289,8 +288,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-ctrl-agent"; + KEA_LOCKFILE_DIR = "/run/kea-ctrl-agent"; }; restartTriggers = [ @@ -301,6 +300,7 @@ in ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}"; KillMode = "process"; Restart = "on-failure"; + RuntimeDirectory = "kea-ctrl-agent"; } // commonServiceConfig; }; }) @@ -329,8 +329,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp4"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp4"; }; restartTriggers = [ @@ -348,6 +348,7 @@ in "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" ]; + RuntimeDirectory = "kea-dhcp4"; } // commonServiceConfig; }; }) @@ -376,8 +377,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp6"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp6"; }; restartTriggers = [ @@ -393,6 +394,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + RuntimeDirectory = "kea-dhcp6"; } // commonServiceConfig; }; }) @@ -421,8 +423,8 @@ in ]; environment = { - KEA_PIDFILE_DIR = "/run/kea"; - KEA_LOCKFILE_DIR = "/run/kea"; + KEA_PIDFILE_DIR = "/run/kea-dhcp-ddns"; + KEA_LOCKFILE_DIR = "/run/kea-dhcp-ddns"; }; restartTriggers = [ @@ -437,6 +439,7 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + RuntimeDirectory = "kea-dhcp-ddns"; } // commonServiceConfig; }; }) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix index 82e68bf92a..99ffbf56cc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix @@ -76,5 +76,5 @@ with lib; }; }; - meta.maintainers = with maintainers; [ patricksjackson ymarkus ]; + meta.maintainers = with maintainers; [ arcuru ymarkus ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix index bd403e109c..9099cbe0cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix @@ -546,8 +546,9 @@ in { # We do not have systemd in stage-1 boot so must invoke `multipathd` # with the `-1` argument which disables systemd calls. Invoke `multipath` # to display the multipath mappings in the output of `journalctl -b`. + # TODO: Implement for systemd stage 1 boot.initrd.kernelModules = [ "dm-multipath" "dm-service-time" ]; - boot.initrd.postDeviceCommands = '' + boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) '' modprobe -a dm-multipath dm-service-time multipathd -s (set -x && sleep 1 && multipath -ll) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix index beee53c8a2..b8b76120e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix @@ -10,7 +10,7 @@ in }; options = { services.nar-serve = { - enable = mkEnableOption (lib.mdDoc "Serve NAR file contents via HTTP"); + enable = mkEnableOption (lib.mdDoc "serving NAR file contents via HTTP"); port = mkOption { type = types.port; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 53c847ee3c..d32712c824 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.networking.networkmanager; + ini = pkgs.formats.ini { }; delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [ ]; @@ -379,6 +380,74 @@ in https://modemmanager.org/docs/modemmanager/fcc-unlock/#integration-with-third-party-fcc-unlock-tools. ''; }; + ensureProfiles = { + profiles = with lib.types; mkOption { + type = attrsOf (submodule { + freeformType = ini.type; + + options = { + connection = { + id = lib.mkOption { + type = str; + description = "This is the name that will be displayed by NetworkManager and GUIs."; + }; + type = lib.mkOption { + type = str; + description = "The connection type defines the connection kind, like vpn, wireguard, gsm, wifi and more."; + example = "vpn"; + }; + }; + }; + }); + apply = (lib.filterAttrsRecursive (n: v: v != { })); + default = { }; + example = { + home-wifi = { + connection = { + id = "home-wifi"; + type = "wifi"; + permissions = ""; + }; + wifi = { + mac-address-blacklist = ""; + mode = "infrastructure"; + ssid = "Home Wi-Fi"; + }; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI_PASSWORD"; + }; + ipv4 = { + dns-search = ""; + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + dns-search = ""; + method = "auto"; + }; + }; + }; + description = lib.mdDoc '' + Declaratively define NetworkManager profiles. You can find information about the generated file format [here](https://networkmanager.dev/docs/api/latest/nm-settings-keyfile.html) and [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_networking/assembly_networkmanager-connection-profiles-in-keyfile-format_configuring-and-managing-networking). + You current profiles which are most likely stored in `/etc/NetworkManager/system-connections` and there is [a tool](https://github.com/janik-haag/nm2nix) to convert them to the needed nix code. + If you add a new ad-hoc connection via a GUI or nmtui or anything similar it should just work together with the declarative ones. + And if you edit a declarative profile NetworkManager will move it to the persistent storage and treat it like a ad-hoc one, + but there will be two profiles as soon as the systemd unit from this option runs again which can be confusing since NetworkManager tools will start displaying two profiles with the same name and probably a bit different settings depending on what you edited. + A profile won't be deleted even if it's removed from the config until the system reboots because that's when NetworkManager clears it's temp directory. + ''; + }; + environmentFiles = mkOption { + default = []; + type = types.listOf types.path; + example = [ "/run/secrets/network-manager.env" ]; + description = lib.mdDoc '' + Files to load as environment file. Environment variables from this file + will be substituted into the static configuration file using [envsubst](https://github.com/a8m/envsubst). + ''; + }; + }; }; }; @@ -507,6 +576,30 @@ in aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; }; + systemd.services.NetworkManager-ensure-profiles = mkIf (cfg.ensureProfiles.profiles != { }) { + description = "Ensure that NetworkManager declarative profiles are created"; + wantedBy = [ "multi-user.target" ]; + before = [ "network-online.target" ]; + script = let + path = id: "/run/NetworkManager/system-connections/${id}.nmconnection"; + in '' + mkdir -p /run/NetworkManager/system-connections + '' + lib.concatMapStringsSep "\n" + (profile: '' + ${pkgs.envsubst}/bin/envsubst -i ${ini.generate (lib.escapeShellArg profile.n) profile.v} > ${path (lib.escapeShellArg profile.n)} + '') (lib.mapAttrsToList (n: v: { inherit n v; }) cfg.ensureProfiles.profiles) + + '' + if systemctl is-active --quiet NetworkManager; then + ${pkgs.networkmanager}/bin/nmcli connection reload + fi + ''; + serviceConfig = { + EnvironmentFile = cfg.ensureProfiles.environmentFiles; + UMask = "0177"; + Type = "oneshot"; + }; + }; + # Turn off NixOS' network management when networking is managed entirely by NetworkManager networking = mkMerge [ (mkIf (!delegateWireless) { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index a0afdb4527..424d005dc0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -103,7 +103,7 @@ in ''; }; - networking.nftables.flushRuleset = mkEnableOption (lib.mdDoc "Flush the entire ruleset on each reload."); + networking.nftables.flushRuleset = mkEnableOption (lib.mdDoc "flushing the entire ruleset on each reload"); networking.nftables.extraDeletions = mkOption { type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix index f37be31270..8c4352bc95 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix @@ -67,6 +67,8 @@ in }; config = mkIf cfg.enable { + nix.settings.extra-allowed-users = [ "nix-serve" ]; + systemd.services.nix-serve = { description = "nix-serve binary cache server"; after = [ "network.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index afd721e34d..d370e6946d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -9,6 +9,7 @@ let stateDir = cfg.directory; driftFile = "${stateDir}/chrony.drift"; keyFile = "${stateDir}/chrony.keys"; + rtcFile = "${stateDir}/chrony.rtc"; configFile = pkgs.writeText "chrony.conf" '' ${concatMapStringsSep "\n" (server: "server " + server + " " + cfg.serverOption + optionalString (cfg.enableNTS) " nts") cfg.servers} @@ -20,8 +21,10 @@ let driftfile ${driftFile} keyfile ${keyFile} + ${optionalString (cfg.enableRTCTrimming) "rtcfile ${rtcFile}"} ${optionalString (cfg.enableNTS) "ntsdumpdir ${stateDir}"} + ${optionalString (cfg.enableRTCTrimming) "rtcautotrim ${builtins.toString cfg.autotrimThreshold}"} ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} ${cfg.extraConfig} @@ -85,6 +88,33 @@ in ''; }; + enableRTCTrimming = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Enable tracking of the RTC offset to the system clock and automatic trimming. + See also [](#opt-services.chrony.autotrimThreshold) + + ::: {.note} + This is not compatible with the `rtcsync` directive, which naively syncs the RTC time every 11 minutes. + + Tracking the RTC drift will allow more precise timekeeping, + especially on intermittently running devices, where the RTC is very relevant. + ::: + ''; + }; + + autotrimThreshold = mkOption { + type = types.ints.positive; + default = 30; + example = 10; + description = '' + Maximum estimated error threshold for the `rtcautotrim` command. + When reached, the RTC will be trimmed. + Only used when [](#opt-services.chrony.enableRTCTrimming) is enabled. + ''; + }; + enableNTS = mkOption { type = types.bool; default = false; @@ -141,7 +171,7 @@ in }; config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + meta.maintainers = with lib.maintainers; [ thoughtpolice vifino ]; environment.systemPackages = [ chronyPkg ]; @@ -156,12 +186,19 @@ in services.timesyncd.enable = mkForce false; + # If chrony controls and tracks the RTC, writing it externally causes clock error. + systemd.services.save-hwclock = lib.mkIf cfg.enableRTCTrimming { + enable = lib.mkForce false; + }; + systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; }; systemd.tmpfiles.rules = [ "d ${stateDir} 0750 chrony chrony - -" "f ${driftFile} 0640 chrony chrony - -" "f ${keyFile} 0640 chrony chrony - -" + ] ++ lib.optionals cfg.enableRTCTrimming [ + "f ${rtcFile} 0640 chrony chrony - -" ]; systemd.services.chronyd = 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 036a8df635..2bc690cacf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix @@ -56,7 +56,7 @@ in The default flags prevent external hosts from using ntpd as a DDoS reflector, setting system time, and querying OS/ntpd version. As recommended in section 6.5.1.1.3, answer "No" of - http://support.ntp.org/bin/view/Support/AccessRestrictions + https://support.ntp.org/Support/AccessRestrictions ''; default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix index e9db7f3eab..89e64d36c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -146,6 +146,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; + meta.maintainers = with lib.maintainers; [ picnoir ]; meta.doc = ./pleroma.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix b/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix deleted file mode 100644 index 197aa8a6f4..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (pkgs) prayer; - - cfg = config.services.prayer; - - stateDir = "/var/lib/prayer"; - - prayerUser = "prayer"; - prayerGroup = "prayer"; - - prayerExtraCfg = pkgs.writeText "extraprayer.cf" '' - prefix = "${prayer}" - var_prefix = "${stateDir}" - prayer_user = "${prayerUser}" - prayer_group = "${prayerGroup}" - sendmail_path = "/run/wrappers/bin/sendmail" - - use_http_port ${cfg.port} - - ${cfg.extraConfig} - ''; - - prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } '' - # We have to remove the http_port 80, or it will start a server there - cat ${prayer}/etc/prayer.cf | grep -v http_port > $out - cat ${prayerExtraCfg} >> $out - ''; - -in - -{ - - ###### interface - - options = { - - services.prayer = { - - enable = mkEnableOption (lib.mdDoc "the prayer webmail http server"); - - port = mkOption { - default = 2080; - type = types.port; - description = lib.mdDoc '' - Port the prayer http server is listening to. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = "" ; - description = lib.mdDoc '' - Extra configuration. Contents will be added verbatim to the configuration file. - ''; - }; - }; - - }; - - - ###### implementation - - config = mkIf config.services.prayer.enable { - environment.systemPackages = [ prayer ]; - - users.users.${prayerUser} = - { uid = config.ids.uids.prayer; - description = "Prayer daemon user"; - home = stateDir; - }; - - users.groups.${prayerGroup} = - { gid = config.ids.gids.prayer; }; - - systemd.services.prayer = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "forking"; - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${prayerUser}:${prayerGroup} ${stateDir} - ''; - script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index 0066c77438..038d574bd8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -779,9 +779,6 @@ in admins = ${toLua cfg.admins} - -- we already build with libevent, so we can just enable it for a more performant server - use_libevent = true - modules_enabled = { ${ lib.concatStringsSep "\n " (lib.mapAttrsToList diff --git a/third_party/nixpkgs/nixos/modules/services/networking/rosenpass.nix b/third_party/nixpkgs/nixos/modules/services/networking/rosenpass.nix new file mode 100644 index 0000000000..d2a264b83d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/rosenpass.nix @@ -0,0 +1,233 @@ +{ config +, lib +, options +, pkgs +, ... +}: +let + inherit (lib) + attrValues + concatLines + concatMap + filter + filterAttrsRecursive + flatten + getExe + mdDoc + mkIf + optional + ; + + cfg = config.services.rosenpass; + opt = options.services.rosenpass; + settingsFormat = pkgs.formats.toml { }; +in +{ + options.services.rosenpass = + let + inherit (lib) + literalExpression + mdDoc + mkOption + ; + inherit (lib.types) + enum + listOf + nullOr + path + str + submodule + ; + in + { + enable = lib.mkEnableOption (mdDoc "Rosenpass"); + + package = lib.mkPackageOption pkgs "rosenpass" { }; + + defaultDevice = mkOption { + type = nullOr str; + description = mdDoc "Name of the network interface to use for all peers by default."; + example = "wg0"; + }; + + settings = mkOption { + type = submodule { + freeformType = settingsFormat.type; + + options = { + public_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the public key of the local Rosenpass peer. Generate this by running {command}`rosenpass gen-keys`."; + }; + + secret_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the secret key of the local Rosenpass peer. Generate this by running {command}`rosenpass gen-keys`."; + }; + + listen = mkOption { + type = listOf str; + description = mdDoc "List of local endpoints to listen for connections."; + default = [ ]; + example = literalExpression "[ \"0.0.0.0:10000\" ]"; + }; + + verbosity = mkOption { + type = enum [ "Verbose" "Quiet" ]; + default = "Quiet"; + description = mdDoc "Verbosity of output produced by the service."; + }; + + peers = + let + peer = submodule { + freeformType = settingsFormat.type; + + options = { + public_key = mkOption { + type = path; + description = mdDoc "Path to a file containing the public key of the remote Rosenpass peer."; + }; + + endpoint = mkOption { + type = nullOr str; + default = null; + description = mdDoc "Endpoint of the remote Rosenpass peer."; + }; + + device = mkOption { + type = str; + default = cfg.defaultDevice; + defaultText = literalExpression "config.${opt.defaultDevice}"; + description = mdDoc "Name of the local WireGuard interface to use for this peer."; + }; + + peer = mkOption { + type = str; + description = mdDoc "WireGuard public key corresponding to the remote Rosenpass peer."; + }; + }; + }; + in + mkOption { + type = listOf peer; + description = mdDoc "List of peers to exchange keys with."; + default = [ ]; + }; + }; + }; + default = { }; + description = mdDoc "Configuration for Rosenpass, see for further information."; + }; + }; + + config = mkIf cfg.enable { + warnings = + let + # NOTE: In the descriptions below, we tried to refer to e.g. + # options.systemd.network.netdevs."".wireguardPeers.*.PublicKey + # directly, but don't know how to traverse "" and * in this path. + extractions = [ + { + relevant = config.systemd.network.enable; + root = config.systemd.network.netdevs; + peer = (x: x.wireguardPeers); + key = (x: if x.wireguardPeerConfig ? PublicKey then x.wireguardPeerConfig.PublicKey else null); + description = mdDoc "${options.systemd.network.netdevs}.\"\".wireguardPeers.*.wireguardPeerConfig.PublicKey"; + } + { + relevant = config.networking.wireguard.enable; + root = config.networking.wireguard.interfaces; + peer = (x: x.peers); + key = (x: x.publicKey); + description = mdDoc "${options.networking.wireguard.interfaces}.\"\".peers.*.publicKey"; + } + rec { + relevant = root != { }; + root = config.networking.wg-quick.interfaces; + peer = (x: x.peers); + key = (x: x.publicKey); + description = mdDoc "${options.networking.wg-quick.interfaces}.\"\".peers.*.publicKey"; + } + ]; + relevantExtractions = filter (x: x.relevant) extractions; + extract = { root, peer, key, ... }: + filter (x: x != null) (flatten (concatMap (x: (map key (peer x))) (attrValues root))); + configuredKeys = flatten (map extract relevantExtractions); + itemize = xs: concatLines (map (x: " - ${x}") xs); + descriptions = map (x: "`${x.description}`"); + missingKeys = filter (key: !builtins.elem key configuredKeys) (map (x: x.peer) cfg.settings.peers); + unusual = '' + While this may work as expected, e.g. you want to manually configure WireGuard, + such a scenario is unusual. Please double-check your configuration. + ''; + in + (optional (relevantExtractions != [ ] && missingKeys != [ ]) '' + You have configured Rosenpass peers with the WireGuard public keys: + ${itemize missingKeys} + But there is no corresponding active Wireguard peer configuration in any of: + ${itemize (descriptions relevantExtractions)} + ${unusual} + '') + ++ + optional (relevantExtractions == [ ]) '' + You have configured Rosenpass, but you have not configured Wireguard via any of: + ${itemize (descriptions extractions)} + ${unusual} + ''; + + environment.systemPackages = [ cfg.package pkgs.wireguard-tools ]; + + systemd.services.rosenpass = + let + filterNonNull = filterAttrsRecursive (_: v: v != null); + config = settingsFormat.generate "config.toml" ( + filterNonNull (cfg.settings + // + ( + let + credentialPath = id: "$CREDENTIALS_DIRECTORY/${id}"; + # NOTE: We would like to remove all `null` values inside `cfg.settings` + # recursively, since `settingsFormat.generate` cannot handle `null`. + # This would require to traverse both attribute sets and lists recursively. + # `filterAttrsRecursive` only recurses into attribute sets, but not + # into values that might contain other attribute sets (such as lists, + # e.g. `cfg.settings.peers`). Here, we just specialize on `cfg.settings.peers`, + # and this may break unexpectedly whenever a `null` value is contained + # in a list in `cfg.settings`, other than `cfg.settings.peers`. + peersWithoutNulls = map filterNonNull cfg.settings.peers; + in + { + secret_key = credentialPath "pqsk"; + public_key = credentialPath "pqpk"; + peers = peersWithoutNulls; + } + ) + ) + ); + in + rec { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + path = [ cfg.package pkgs.wireguard-tools ]; + + serviceConfig = { + User = "rosenpass"; + Group = "rosenpass"; + RuntimeDirectory = "rosenpass"; + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + LoadCredential = [ + "pqsk:${cfg.settings.secret_key}" + "pqpk:${cfg.settings.public_key}" + ]; + }; + + # See + environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml"; + + preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\""; + script = "rosenpass exchange-config \"$CONFIG\""; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix index 40648c7248..8054f01d70 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix @@ -43,12 +43,8 @@ in [ "services" "searx" "settingsFile" ]) ]; - ###### interface - options = { - services.searx = { - enable = mkOption { type = types.bool; default = false; @@ -149,8 +145,8 @@ in package = mkOption { type = types.package; - default = pkgs.searx; - defaultText = literalExpression "pkgs.searx"; + default = pkgs.searxng; + defaultText = literalExpression "pkgs.searxng"; description = lib.mdDoc "searx package to use."; }; @@ -190,21 +186,7 @@ in }; - - ###### implementation - config = mkIf cfg.enable { - assertions = [ - { - assertion = (cfg.limiterSettings != { }) -> cfg.package.pname == "searxng"; - message = "services.searx.limiterSettings requires services.searx.package to be searxng."; - } - { - assertion = cfg.redisCreateLocally -> cfg.package.pname == "searxng"; - message = "services.searx.redisCreateLocally requires services.searx.package to be searxng."; - } - ]; - environment.systemPackages = [ cfg.package ]; users.users.searx = @@ -245,10 +227,10 @@ in }; }; - systemd.services.uwsgi = mkIf (cfg.runInUwsgi) - { requires = [ "searx-init.service" ]; - after = [ "searx-init.service" ]; - }; + systemd.services.uwsgi = mkIf cfg.runInUwsgi { + requires = [ "searx-init.service" ]; + after = [ "searx-init.service" ]; + }; services.searx.settings = { # merge NixOS settings with defaults settings.yml @@ -256,7 +238,7 @@ in redis.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}"; }; - services.uwsgi = mkIf (cfg.runInUwsgi) { + services.uwsgi = mkIf cfg.runInUwsgi { enable = true; plugins = [ "python3" ]; @@ -270,6 +252,7 @@ in enable-threads = true; module = "searx.webapp"; env = [ + # TODO: drop this as it is only required for searx "SEARX_SETTINGS_PATH=${cfg.settingsFile}" # searxng compatibility https://github.com/searxng/searxng/issues/1519 "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix index ca015ed9d4..19b68f1e20 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix @@ -8,7 +8,7 @@ in { options = { services.snowflake-proxy = { - enable = mkEnableOption (lib.mdDoc "System to defeat internet censorship"); + enable = mkEnableOption (lib.mdDoc "snowflake-proxy, a system to defeat internet censorship"); broker = mkOption { description = lib.mdDoc "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix index 3e01ace54a..547317dbcb 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix @@ -197,8 +197,9 @@ in script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`"; }; - system.activationScripts.spiped = optionalString (cfg.config != {}) - "mkdir -p /var/lib/spiped"; + systemd.tmpfiles.rules = lib.mkIf (cfg.config != { }) [ + "d /var/lib/spiped -" + ]; # Setup spiped config files environment.etc = mapAttrs' (name: cfg: nameValuePair "spiped/${name}.spec" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 327d19daca..f54ce59174 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -12,22 +12,44 @@ let then cfgc.package else pkgs.buildPackages.openssh; - # reports boolean as yes / no - mkValueStringSshd = with lib; v: - if isInt v then toString v - else if isString v then v - else if true == v then "yes" - else if false == v then "no" - else if isList v then concatStringsSep "," v - else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; - # dont use the "=" operator - settingsFormat = (pkgs.formats.keyValue { - mkKeyValue = lib.generators.mkKeyValueDefault { - mkValueString = mkValueStringSshd; - } " ";}); + settingsFormat = + let + # reports boolean as yes / no + mkValueString = with lib; v: + if isInt v then toString v + else if isString v then v + else if true == v then "yes" + else if false == v then "no" + else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; - configFile = settingsFormat.generate "sshd.conf-settings" cfg.settings; + base = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { inherit mkValueString; } " "; + }; + # OpenSSH is very inconsistent with options that can take multiple values. + # For some of them, they can simply appear multiple times and are appended, for others the + # values must be separated by whitespace or even commas. + # Consult either sshd_config(5) or, as last resort, the OpehSSH source for parsing + # the options at servconf.c:process_server_config_line_depth() to determine the right "mode" + # for each. But fortunaly this fact is documented for most of them in the manpage. + commaSeparated = [ "Ciphers" "KexAlgorithms" "Macs" ]; + spaceSeparated = [ "AuthorizedKeysFile" "AllowGroups" "AllowUsers" "DenyGroups" "DenyUsers" ]; + in { + inherit (base) type; + generate = name: value: + let transformedValue = mapAttrs (key: val: + if isList val then + if elem key commaSeparated then concatStringsSep "," val + else if elem key spaceSeparated then concatStringsSep " " val + else throw "list value for unknown key ${key}: ${(lib.generators.toPretty {}) val}" + else + val + ) value; + in + base.generate name transformedValue; + }; + + configFile = settingsFormat.generate "sshd.conf-settings" (filterAttrs (n: v: v != null) cfg.settings); sshconf = pkgs.runCommand "sshd.conf-final" { } '' cat ${configFile} - >$out < ''; }; + AllowUsers = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is allowed only for the listed users. + See {manpage}`sshd_config(5)` for details. + ''; + }; + DenyUsers = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is denied for all listed users. Takes + precedence over [](#opt-services.openssh.settings.AllowUsers). + See {manpage}`sshd_config(5)` for details. + ''; + }; + AllowGroups = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is allowed only for users part of the + listed groups. + See {manpage}`sshd_config(5)` for details. + ''; + }; + DenyGroups = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is denied for all users part of the listed + groups. Takes precedence over + [](#opt-services.openssh.settings.AllowGroups). See + {manpage}`sshd_config(5)` for details. + ''; + }; }; }); }; @@ -444,7 +533,7 @@ in services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; services.openssh.sftpServerExecutable = mkDefault "${cfgc.package}/libexec/sftp-server"; - environment.etc = authKeysFiles // + environment.etc = authKeysFiles // authPrincipalsFiles // { "ssh/moduli".source = cfg.moduliFile; "ssh/sshd_config".source = sshconf; }; @@ -541,6 +630,8 @@ in services.openssh.authorizedKeysFiles = [ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ]; + services.openssh.settings.AuthorizedPrincipalsFile = mkIf (authPrincipalsFiles != {}) "/etc/ssh/authorized_principals.d/%u"; + services.openssh.extraConfig = mkOrder 0 '' UsePAM yes diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix index daf2f2f366..dd29db5100 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix @@ -5,81 +5,131 @@ with lib; let cfg = config.services.sslh; user = "sslh"; - configFile = pkgs.writeText "sslh.conf" '' - verbose: ${boolToString cfg.verbose}; - foreground: true; - inetd: false; - numeric: false; - transparent: ${boolToString cfg.transparent}; - timeout: "${toString cfg.timeout}"; - listen: - ( - ${ - concatMapStringsSep ",\n" - (addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'') - cfg.listenAddresses - } - ); - - ${cfg.appendConfig} - ''; - defaultAppendConfig = '' - protocols: - ( - { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, - { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; }, - { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; }, - { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - { name: "tls"; host: "localhost"; port: "443"; probe: "builtin"; }, - { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; } - ); - ''; + configFormat = pkgs.formats.libconfig {}; + configFile = configFormat.generate "sslh.conf" cfg.settings; in + { imports = [ (mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ]) + (mkRenamedOptionModule [ "services" "sslh" "timeout" ] [ "services" "sslh" "settings" "timeout" ]) + (mkRenamedOptionModule [ "services" "sslh" "transparent" ] [ "services" "sslh" "settings" "transparent" ]) + (mkRemovedOptionModule [ "services" "sslh" "appendConfig" ] "Use services.sslh.settings instead") + (mkChangedOptionModule [ "services" "sslh" "verbose" ] [ "services" "sslh" "settings" "verbose-connections" ] + (config: if config.services.sslh.verbose then 1 else 0)) ]; - options = { - services.sslh = { - enable = mkEnableOption (lib.mdDoc "sslh"); + meta.buildDocsInSandbox = false; - verbose = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Verbose logs."; - }; + options.services.sslh = { + enable = mkEnableOption (lib.mdDoc "sslh, protocol demultiplexer"); - timeout = mkOption { - type = types.int; - default = 2; - description = lib.mdDoc "Timeout in seconds."; - }; + method = mkOption { + type = types.enum [ "fork" "select" "ev" ]; + default = "fork"; + description = lib.mdDoc '' + The method to use for handling connections: - transparent = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; - }; + - `fork` forks a new process for each incoming connection. It is + well-tested and very reliable, but incurs the overhead of many + processes. - listenAddresses = mkOption { - type = types.coercedTo types.str singleton (types.listOf types.str); - default = [ "0.0.0.0" "[::]" ]; - description = lib.mdDoc "Listening addresses or hostnames."; - }; + - `select` uses only one thread, which monitors all connections at once. + It has lower overhead per connection, but if it stops, you'll lose all + connections. - port = mkOption { - type = types.port; - default = 443; - description = lib.mdDoc "Listening port."; - }; + - `ev` is implemented using libev, it's similar to `select` but + scales better to a large number of connections. + ''; + }; - appendConfig = mkOption { - type = types.str; - default = defaultAppendConfig; - description = lib.mdDoc "Verbatim configuration file."; + listenAddresses = mkOption { + type = with types; coercedTo str singleton (listOf str); + default = [ "0.0.0.0" "[::]" ]; + description = lib.mdDoc "Listening addresses or hostnames."; + }; + + port = mkOption { + type = types.port; + default = 443; + description = lib.mdDoc "Listening port."; + }; + + settings = mkOption { + type = types.submodule { + freeformType = configFormat.type; + + options.timeout = mkOption { + type = types.ints.unsigned; + default = 2; + description = lib.mdDoc "Timeout in seconds."; + }; + + options.transparent = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether the services behind sslh (Apache, sshd and so on) will see the + external IP and ports as if the external world connected directly to + them. + ''; + }; + + options.verbose-connections = mkOption { + type = types.ints.between 0 4; + default = 0; + description = lib.mdDoc '' + Where to log connections information. Possible values are: + + 0. don't log anything + 1. write log to stdout + 2. write log to syslog + 3. write log to both stdout and syslog + 4. write to a log file ({option}`sslh.settings.logfile`) + ''; + }; + + options.numeric = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to disable reverse DNS lookups, thus keeping IP + address literals in the log. + ''; + }; + + options.protocols = mkOption { + type = types.listOf configFormat.type; + default = [ + { name = "ssh"; host = "localhost"; port = "22"; service= "ssh"; } + { name = "openvpn"; host = "localhost"; port = "1194"; } + { name = "xmpp"; host = "localhost"; port = "5222"; } + { name = "http"; host = "localhost"; port = "80"; } + { name = "tls"; host = "localhost"; port = "443"; } + { name = "anyprot"; host = "localhost"; port = "443"; } + ]; + description = lib.mdDoc '' + List of protocols sslh will probe for and redirect. + Each protocol entry consists of: + + - `name`: name of the probe. + + - `service`: libwrap service name (see {manpage}`hosts_access(5)`), + + - `host`, `port`: where to connect when this probe succeeds, + + - `log_level`: to log incoming connections, + + - `transparent`: proxy this protocol transparently, + + - etc. + + See the documentation for all options, including probe-specific ones. + ''; + }; }; + description = lib.mdDoc "sslh configuration. See {manpage}`sslh(8)` for available settings."; }; }; @@ -96,20 +146,29 @@ in PermissionsStartOnly = true; Restart = "always"; RestartSec = "1s"; - ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}"; + ExecStart = "${pkgs.sslh}/bin/sslh-${cfg.method} -F${configFile}"; KillMode = "process"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID"; + AmbientCapabilities = ["CAP_NET_BIND_SERVICE" "CAP_NET_ADMIN" "CAP_SETGID" "CAP_SETUID"]; PrivateTmp = true; PrivateDevices = true; ProtectSystem = "full"; ProtectHome = true; }; }; + + services.sslh.settings = { + # Settings defined here are not supposed to be changed: doing so will + # break the module, as such you need `lib.mkForce` to override them. + foreground = true; + inetd = false; + listen = map (addr: { host = addr; port = toString cfg.port; }) cfg.listenAddresses; + }; + }) # code from https://github.com/yrutschle/sslh#transparent-proxy-support # the only difference is using iptables mark 0x2 instead of 0x1 to avoid conflicts with nixos/nat module - (mkIf (cfg.enable && cfg.transparent) { + (mkIf (cfg.enable && cfg.settings.transparent) { # Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination boot.kernel.sysctl."net.ipv4.conf.default.route_localnet" = 1; boot.kernel.sysctl."net.ipv4.conf.all.route_localnet" = 1; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix index c51e8ad9f5..bfea899697 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -43,21 +43,21 @@ in { # The swanctl command complains when the following directories don't exist: # See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctldirectory - system.activationScripts.strongswan-swanctl-etc = stringAfter ["etc"] '' - mkdir -p '/etc/swanctl/x509' # Trusted X.509 end entity certificates - mkdir -p '/etc/swanctl/x509ca' # Trusted X.509 Certificate Authority certificates - mkdir -p '/etc/swanctl/x509ocsp' - mkdir -p '/etc/swanctl/x509aa' # Trusted X.509 Attribute Authority certificates - mkdir -p '/etc/swanctl/x509ac' # Attribute Certificates - mkdir -p '/etc/swanctl/x509crl' # Certificate Revocation Lists - mkdir -p '/etc/swanctl/pubkey' # Raw public keys - mkdir -p '/etc/swanctl/private' # Private keys in any format - mkdir -p '/etc/swanctl/rsa' # PKCS#1 encoded RSA private keys - mkdir -p '/etc/swanctl/ecdsa' # Plain ECDSA private keys - mkdir -p '/etc/swanctl/bliss' - mkdir -p '/etc/swanctl/pkcs8' # PKCS#8 encoded private keys of any type - mkdir -p '/etc/swanctl/pkcs12' # PKCS#12 containers - ''; + systemd.tmpfiles.rules = [ + "d /etc/swanctl/x509 -" # Trusted X.509 end entity certificates + "d /etc/swanctl/x509ca -" # Trusted X.509 Certificate Authority certificates + "d /etc/swanctl/x509ocsp -" + "d /etc/swanctl/x509aa -" # Trusted X.509 Attribute Authority certificates + "d /etc/swanctl/x509ac -" # Attribute Certificates + "d /etc/swanctl/x509crl -" # Certificate Revocation Lists + "d /etc/swanctl/pubkey -" # Raw public keys + "d /etc/swanctl/private -" # Private keys in any format + "d /etc/swanctl/rsa -" # PKCS#1 encoded RSA private keys + "d /etc/swanctl/ecdsa -" # Plain ECDSA private keys + "d /etc/swanctl/bliss -" + "d /etc/swanctl/pkcs8 -" # PKCS#8 encoded private keys of any type + "d /etc/swanctl/pkcs12 -" # PKCS#12 containers + ]; systemd.services.strongswan-swanctl = { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index d3f6853424..bdcdaf056d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -10,6 +10,21 @@ let settingsFormat = pkgs.formats.json { }; cleanedConfig = converge (filterAttrsRecursive (_: v: v != null && v != {})) cfg.settings; + isUnixGui = (builtins.substring 0 1 cfg.guiAddress) == "/"; + + # Syncthing supports serving the GUI over Unix sockets. If that happens, the + # API is served over the Unix socket as well. This function returns the correct + # curl arguments for the address portion of the curl command for both network + # and Unix socket addresses. + curlAddressArgs = path: if isUnixGui + # if cfg.guiAddress is a unix socket, tell curl explicitly about it + # note that the dot in front of `${path}` is the hostname, which is + # required. + then "--unix-socket ${cfg.guiAddress} http://.${path}" + # no adjustements are needed if cfg.guiAddress is a network address + else "${cfg.guiAddress}${path}" + ; + devices = mapAttrsToList (_: device: device // { deviceID = device.id; }) cfg.settings.devices; @@ -36,17 +51,15 @@ let # be careful not to leak secrets in the filesystem or in process listings umask 0077 - # get the api key by parsing the config.xml - while - ! ${pkgs.libxml2}/bin/xmllint \ - --xpath 'string(configuration/gui/apikey)' \ - ${cfg.configDir}/config.xml \ - >"$RUNTIME_DIRECTORY/api_key" - do sleep 1; done - - (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" - curl() { + # get the api key by parsing the config.xml + while + ! ${pkgs.libxml2}/bin/xmllint \ + --xpath 'string(configuration/gui/apikey)' \ + ${cfg.configDir}/config.xml \ + >"$RUNTIME_DIRECTORY/api_key" + do sleep 1; done + (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" @@ -64,14 +77,14 @@ let GET_IdAttrName = "deviceID"; override = cfg.overrideDevices; conf = devices; - baseAddress = "${cfg.guiAddress}/rest/config/devices"; + baseAddress = curlAddressArgs "/rest/config/devices"; }; dirs = { new_conf_IDs = map (v: v.id) folders; GET_IdAttrName = "id"; override = cfg.overrideFolders; conf = folders; - baseAddress = "${cfg.guiAddress}/rest/config/folders"; + baseAddress = curlAddressArgs "/rest/config/folders"; }; } [ # Now for each of these attributes, write the curl commands that are @@ -119,15 +132,14 @@ let builtins.attrNames (lib.subtractLists ["folders" "devices"]) (map (subOption: '' - curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} \ - ${cfg.guiAddress}/rest/config/${subOption} + curl -X PUT -d ${lib.escapeShellArg (builtins.toJSON cleanedConfig.${subOption})} ${curlAddressArgs "/rest/config/${subOption}"} '')) (lib.concatStringsSep "\n") ]) + '' # restart Syncthing if required - if curl ${cfg.guiAddress}/rest/config/restart-required | + if curl ${curlAddressArgs "/rest/config/restart-required"} | ${jq} -e .requiresRestart > /dev/null; then - curl -X POST ${cfg.guiAddress}/rest/system/restart + curl -X POST ${curlAddressArgs "/rest/system/restart"} fi ''); in { @@ -653,7 +665,7 @@ in { ExecStart = '' ${cfg.package}/bin/syncthing \ -no-browser \ - -gui-address=${cfg.guiAddress} \ + -gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \ -home=${cfg.configDir} ${escapeShellArgs cfg.extraFlags} ''; MemoryDenyWriteExecute = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 8b35cc8d66..a5d171e0ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -31,6 +31,12 @@ in { package = lib.mkPackageOptionMD pkgs "tailscale" {}; + openFirewall = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Whether to open the firewall for the specified port."; + }; + useRoutingFeatures = mkOption { type = types.enum [ "none" "client" "server" "both" ]; default = "none"; @@ -113,6 +119,8 @@ in { "net.ipv6.conf.all.forwarding" = mkOverride 97 true; }; + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose"; networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinyproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinyproxy.nix new file mode 100644 index 0000000000..9bcd8bfd81 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinyproxy.nix @@ -0,0 +1,103 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.tinyproxy; + mkValueStringTinyproxy = with lib; v: + if true == v then "yes" + else if false == v then "no" + else generators.mkValueStringDefault {} v; + mkKeyValueTinyproxy = { + mkValueString ? mkValueStringDefault {} + }: sep: k: v: + if null == v then "" + else "${lib.strings.escape [sep] k}${sep}${mkValueString v}"; + + settingsFormat = (pkgs.formats.keyValue { + mkKeyValue = mkKeyValueTinyproxy { + mkValueString = mkValueStringTinyproxy; + } " "; + listsAsDuplicateKeys= true; + }); + configFile = settingsFormat.generate "tinyproxy.conf" cfg.settings; + +in +{ + + options = { + services.tinyproxy = { + enable = mkEnableOption (lib.mdDoc "Tinyproxy daemon"); + package = mkPackageOptionMD pkgs "tinyproxy" {}; + settings = mkOption { + description = lib.mdDoc "Configuration for [tinyproxy](https://tinyproxy.github.io/)."; + default = { }; + example = literalExpression ''{ + Port 8888; + Listen 127.0.0.1; + Timeout 600; + Allow 127.0.0.1; + Anonymous = ['"Host"' '"Authorization"']; + ReversePath = '"/example/" "http://www.example.com/"'; + }''; + type = types.submodule ({name, ...}: { + freeformType = settingsFormat.type; + options = { + Listen = mkOption { + type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Specify which address to listen to. + ''; + }; + Port = mkOption { + type = types.int; + default = 8888; + description = lib.mdDoc '' + Specify which port to listen to. + ''; + }; + Anonymous = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + If an `Anonymous` keyword is present, then anonymous proxying is enabled. The headers listed with `Anonymous` are allowed through, while all others are denied. If no Anonymous keyword is present, then all headers are allowed through. You must include quotes around the headers. + ''; + }; + Filter = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Tinyproxy supports filtering of web sites based on URLs or domains. This option specifies the location of the file containing the filter rules, one rule per line. + ''; + }; + }; + }); + }; + }; + }; + config = mkIf cfg.enable { + systemd.services.tinyproxy = { + description = "TinyProxy daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "tinyproxy"; + Group = "tinyproxy"; + Type = "simple"; + ExecStart = "${getExe pkgs.tinyproxy} -d -c ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; + KillSignal = "SIGINT"; + TimeoutStopSec = "30s"; + Restart = "on-failure"; + }; + }; + + users.users.tinyproxy = { + group = "tinyproxy"; + isSystemUser = true; + }; + users.groups.tinyproxy = {}; + }; + meta.maintainers = with maintainers; [ tcheronneau ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix index 5c7e7a4c22..0f310a28d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix @@ -47,7 +47,7 @@ in lib.mdDoc '' Configuration for bootstrap daemon. See - and . + and . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix index 4196d124a2..758e33f16d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix @@ -54,7 +54,7 @@ in defaultText = "pkgs.trust-dns"; description = mdDoc '' Trust-dns package to use. - Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ''; }; quiet = mkOption { @@ -135,7 +135,7 @@ in flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); flagsStr = builtins.concatStringsSep " " flags; in '' - ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} + ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr} ''; Type = "simple"; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix index 0426dbb0c8..b6579af10a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix @@ -166,7 +166,7 @@ in { services.unbound.settings = { server = { directory = mkDefault cfg.stateDir; - username = cfg.user; + username = ''""''; chroot = ''""''; pidfile = ''""''; # when running under systemd there is no need to daemonize @@ -245,14 +245,13 @@ in { NotifyAccess = "main"; Type = "notify"; - # FIXME: Which of these do we actually need, can we drop the chroot flag? AmbientCapabilities = [ + "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" # needed if ip-transparent is set to true + ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" - "CAP_SETGID" - "CAP_SETUID" - "CAP_SYS_CHROOT" - "CAP_SYS_RESOURCE" ]; User = cfg.user; @@ -266,22 +265,19 @@ in { ProtectControlGroups = true; ProtectKernelModules = true; ProtectSystem = "strict"; + ProtectClock = true; + ProtectHostname = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelTunables = true; RuntimeDirectory = "unbound"; ConfigurationDirectory = "unbound"; StateDirectory = "unbound"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" "AF_UNIX" ]; RestrictRealtime = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ - "~@clock" - "@cpu-emulation" - "@debug" - "@keyring" - "@module" - "mount" - "@obsolete" - "@resources" - ]; + SystemCallFilter = [ "@system-service" ]; RestrictNamespaces = true; LockPersonality = true; RestrictSUIDSGID = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 37a739f41d..537a4db95c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -1,60 +1,61 @@ { config, options, lib, pkgs, utils, ... }: -with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; - cmd = '' - @${cfg.jrePackage}/bin/java java \ - ${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") - "--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED " - + "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED " - + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \ - ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ - ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ - -jar ${stateDir}/lib/ace.jar - ''; + cmd = lib.escapeShellArgs ([ "@${cfg.jrePackage}/bin/java" "java" ] + ++ lib.optionals (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") [ + "--add-opens=java.base/java.lang=ALL-UNNAMED" + "--add-opens=java.base/java.time=ALL-UNNAMED" + "--add-opens=java.base/sun.security.util=ALL-UNNAMED" + "--add-opens=java.base/java.io=ALL-UNNAMED" + "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" + ] + ++ (lib.optional (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m") + ++ (lib.optional (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m") + ++ cfg.extraJvmOptions + ++ [ "-jar" "${stateDir}/lib/ace.jar" ]); in { options = { - services.unifi.enable = mkOption { - type = types.bool; + services.unifi.enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether or not to enable the unifi controller service. ''; }; - services.unifi.jrePackage = mkOption { - type = types.package; + services.unifi.jrePackage = lib.mkOption { + type = lib.types.package; default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; - defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; + defaultText = lib.literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; }; - services.unifi.unifiPackage = mkOption { - type = types.package; + services.unifi.unifiPackage = lib.mkOption { + type = lib.types.package; default = pkgs.unifi5; - defaultText = literalExpression "pkgs.unifi5"; + defaultText = lib.literalExpression "pkgs.unifi5"; description = lib.mdDoc '' The unifi package to use. ''; }; - services.unifi.mongodbPackage = mkOption { - type = types.package; + services.unifi.mongodbPackage = lib.mkOption { + type = lib.types.package; default = pkgs.mongodb-4_4; - defaultText = literalExpression "pkgs.mongodb"; + defaultText = lib.literalExpression "pkgs.mongodb"; description = lib.mdDoc '' The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.4. ''; }; - services.unifi.openFirewall = mkOption { - type = types.bool; + services.unifi.openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether or not to open the minimum required ports on the firewall. @@ -65,8 +66,8 @@ in ''; }; - services.unifi.initialJavaHeapSize = mkOption { - type = types.nullOr types.int; + services.unifi.initialJavaHeapSize = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 1024; description = lib.mdDoc '' @@ -75,8 +76,8 @@ in ''; }; - services.unifi.maximumJavaHeapSize = mkOption { - type = types.nullOr types.int; + services.unifi.maximumJavaHeapSize = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 4096; description = lib.mdDoc '' @@ -85,9 +86,18 @@ in ''; }; + services.unifi.extraJvmOptions = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + example = lib.literalExpression ''["-Xlog:gc"]''; + description = lib.mdDoc '' + Set extra options to pass to the JVM. + ''; + }; + }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.unifi = { isSystemUser = true; @@ -97,7 +107,7 @@ in }; users.groups.unifi = {}; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { # https://help.ubnt.com/hc/en-us/articles/218506997 allowedTCPPorts = [ 8080 # Port for UAP to inform controller. @@ -123,8 +133,8 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${(removeSuffix "\n" cmd)} start"; - ExecStop = "${(removeSuffix "\n" cmd)} stop"; + ExecStart = "${cmd} start"; + ExecStop = "${cmd} stop"; Restart = "on-failure"; TimeoutSec = "5min"; User = "unifi"; @@ -166,7 +176,7 @@ in StateDirectory = "unifi"; RuntimeDirectory = "unifi"; LogsDirectory = "unifi"; - CacheDirectory= "unifi"; + CacheDirectory = "unifi"; TemporaryFileSystem = [ # required as we want to create bind mounts below @@ -176,7 +186,7 @@ in # We must create the binary directories as bind mounts instead of symlinks # This is because the controller resolves all symlinks to absolute paths # to be used as the working directory. - BindPaths = [ + BindPaths = [ "/var/log/unifi:${stateDir}/logs" "/run/unifi:${stateDir}/run" "${cfg.unifiPackage}/dl:${stateDir}/dl" @@ -194,7 +204,7 @@ in }; imports = [ - (mkRemovedOptionModule [ "services" "unifi" "dataDir" ] "You should move contents of dataDir to /var/lib/unifi/data" ) - (mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ]) + (lib.mkRemovedOptionModule [ "services" "unifi" "dataDir" ] "You should move contents of dataDir to /var/lib/unifi/data") + (lib.mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ]) ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix index d4099be12a..d36be87daf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix @@ -586,6 +586,7 @@ in }) all_peers; boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; + boot.kernelModules = [ "wireguard" ]; environment.systemPackages = [ pkgs.wireguard-tools ]; systemd.services = diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 0595e9e6df..90d9c68433 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -530,5 +530,5 @@ in { ''; }; - meta.maintainers = with lib.maintainers; [ globin rnhmjoj ]; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 8335583d2d..56d81fb040 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -116,9 +116,9 @@ in }; persistentKeys = mkEnableOption (lib.mdDoc '' - If enabled then keys will be generated once and Yggdrasil + persistent keys. If enabled then keys will be generated once and Yggdrasil will retain the same IPv6 address when the service is - restarted. Keys are stored at ${keysPath}. + restarted. Keys are stored at ${keysPath} ''); extraArgs = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index 279b26bb89..3a27443034 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -108,6 +108,12 @@ let containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0; getGutenprint = pkgs: head (filterGutenprint pkgs); + parsePorts = addresses: let + splitAddress = addr: strings.splitString ":" addr; + extractPort = addr: builtins.foldl' (a: b: b) "" (splitAddress addr); + in + builtins.map (address: strings.toInt (extractPort address)) addresses; + in { @@ -172,6 +178,15 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the firewall for TCP/UDP ports specified in + listenAdrresses option. + ''; + }; + bindirCmds = mkOption { type = types.lines; internal = true; @@ -463,6 +478,13 @@ in security.pam.services.cups = {}; + networking.firewall = let + listenPorts = parsePorts cfg.listenAddresses; + in mkIf cfg.openFirewall { + allowedTCPPorts = listenPorts; + allowedUDPPorts = listenPorts; + }; + }; meta.maintainers = with lib.maintainers; [ matthewbauer ]; diff --git a/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix b/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix index 9a50e79631..ae79d5545f 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/opensearch.nix @@ -72,6 +72,18 @@ in The port to listen on for transport traffic. ''; }; + + options."plugins.security.disabled" = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether to enable the security plugin, + `plugins.security.ssl.transport.keystore_filepath` or + `plugins.security.ssl.transport.server.pemcert_filepath` and + `plugins.security.ssl.transport.client.pemcert_filepath` + must be set for this plugin to be enabled. + ''; + }; }; default = {}; @@ -186,6 +198,13 @@ in shopt -s inherit_errexit # Install plugins + + # remove plugins directory if it is empty. + if [ -z "$(ls -A ${cfg.dataDir}/plugins)" ]; then + rm -r "${cfg.dataDir}/plugins" + fi + + ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins" ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index 9393fa7512..235f29ab8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -103,9 +103,9 @@ in }; bantime = mkOption { - default = null; - type = types.nullOr types.str; - example = "10m"; + default = "10m"; + type = types.str; + example = "1h"; description = lib.mdDoc "Number of seconds that a host is banned."; }; @@ -393,7 +393,7 @@ in ) ) // { # Miscellaneous options - inherit (cfg) banaction maxretry; + inherit (cfg) banaction maxretry bantime; ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}''; backend = "systemd"; # Actions diff --git a/third_party/nixpkgs/nixos/modules/services/security/jitterentropy-rngd.nix b/third_party/nixpkgs/nixos/modules/services/security/jitterentropy-rngd.nix new file mode 100644 index 0000000000..7bfacb5ddc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/security/jitterentropy-rngd.nix @@ -0,0 +1,18 @@ +{ lib, config, pkgs, ... }: +let + cfg = config.services.jitterentropy-rngd; +in +{ + options.services.jitterentropy-rngd = { + enable = + lib.mkEnableOption (lib.mdDoc "jitterentropy-rngd service configuration"); + package = lib.mkPackageOptionMD pkgs "jitterentropy-rngd" { }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services."jitterentropy".wantedBy = [ "basic.target" ]; + }; + + meta.maintainers = with lib.maintainers; [ thillux ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix index 013aeb1675..97ac3a7280 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix @@ -172,7 +172,7 @@ in { ln -sf '${file}' "${local}" '') rules} - if [ ! -f /etc/opensnitch-system-fw.json ]; then + if [ ! -f /etc/opensnitchd/system-fw.json ]; then cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json" fi ''); diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix deleted file mode 100644 index 664335cb58..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ /dev/null @@ -1,458 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.privacyidea; - opt = options.services.privacyidea; - - uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python310; }; - python = uwsgi.python3; - penv = python.withPackages (const [ pkgs.privacyidea ]); - logCfg = pkgs.writeText "privacyidea-log.cfg" '' - [formatters] - keys=detail - - [handlers] - keys=stream - - [formatter_detail] - class=privacyidea.lib.log.SecureFormatter - format=[%(asctime)s][%(process)d][%(thread)d][%(levelname)s][%(name)s:%(lineno)d] %(message)s - - [handler_stream] - class=StreamHandler - level=NOTSET - formatter=detail - args=(sys.stdout,) - - [loggers] - keys=root,privacyidea - - [logger_privacyidea] - handlers=stream - qualname=privacyidea - level=INFO - - [logger_root] - handlers=stream - level=ERROR - ''; - - piCfgFile = pkgs.writeText "privacyidea.cfg" '' - SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ] - SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2:///privacyidea' - SECRET_KEY = '${cfg.secretKey}' - PI_PEPPER = '${cfg.pepper}' - PI_ENCFILE = '${cfg.encFile}' - PI_AUDIT_KEY_PRIVATE = '${cfg.auditKeyPrivate}' - PI_AUDIT_KEY_PUBLIC = '${cfg.auditKeyPublic}' - PI_LOGCONFIG = '${logCfg}' - ${cfg.extraConfig} - ''; - - renderValue = x: - if isList x then concatMapStringsSep "," (x: ''"${x}"'') x - else if isString x && hasInfix "," x then ''"${x}"'' - else x; - - ldapProxyConfig = pkgs.writeText "ldap-proxy.ini" - (generators.toINI {} - (flip mapAttrs cfg.ldap-proxy.settings - (const (mapAttrs (const renderValue))))); - - privacyidea-token-janitor = pkgs.writeShellScriptBin "privacyidea-token-janitor" '' - exec -a privacyidea-token-janitor \ - /run/wrappers/bin/sudo -u ${cfg.user} \ - env PRIVACYIDEA_CONFIGFILE=${cfg.stateDir}/privacyidea.cfg \ - ${penv}/bin/privacyidea-token-janitor $@ - ''; -in - -{ - options = { - services.privacyidea = { - enable = mkEnableOption (lib.mdDoc "PrivacyIDEA"); - - environmentFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/root/privacyidea.env"; - description = lib.mdDoc '' - File to load as environment file. Environment variables - from this file will be interpolated into the config file - using `envsubst` which is helpful for specifying - secrets: - ``` - { services.privacyidea.secretKey = "$SECRET"; } - ``` - - The environment-file can now specify the actual secret key: - ``` - SECRET=veryverytopsecret - ``` - ''; - }; - - stateDir = mkOption { - type = types.str; - default = "/var/lib/privacyidea"; - description = lib.mdDoc '' - Directory where all PrivacyIDEA files will be placed by default. - ''; - }; - - superuserRealm = mkOption { - type = types.listOf types.str; - default = [ "super" "administrators" ]; - description = lib.mdDoc '' - The realm where users are allowed to login as administrators. - ''; - }; - - secretKey = mkOption { - type = types.str; - example = "t0p s3cr3t"; - description = lib.mdDoc '' - This is used to encrypt the auth_token. - ''; - }; - - pepper = mkOption { - type = types.str; - example = "Never know..."; - description = lib.mdDoc '' - This is used to encrypt the admin passwords. - ''; - }; - - encFile = mkOption { - type = types.str; - default = "${cfg.stateDir}/enckey"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/enckey"''; - description = lib.mdDoc '' - This is used to encrypt the token data and token passwords - ''; - }; - - auditKeyPrivate = mkOption { - type = types.str; - default = "${cfg.stateDir}/private.pem"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/private.pem"''; - description = lib.mdDoc '' - Private Key for signing the audit log. - ''; - }; - - auditKeyPublic = mkOption { - type = types.str; - default = "${cfg.stateDir}/public.pem"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/public.pem"''; - description = lib.mdDoc '' - Public key for checking signatures of the audit log. - ''; - }; - - adminPasswordFile = mkOption { - type = types.path; - description = lib.mdDoc "File containing password for the admin user"; - }; - - adminEmail = mkOption { - type = types.str; - example = "admin@example.com"; - description = lib.mdDoc "Mail address for the admin user"; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = lib.mdDoc '' - Extra configuration options for pi.cfg. - ''; - }; - - user = mkOption { - type = types.str; - default = "privacyidea"; - description = lib.mdDoc "User account under which PrivacyIDEA runs."; - }; - - group = mkOption { - type = types.str; - default = "privacyidea"; - description = lib.mdDoc "Group account under which PrivacyIDEA runs."; - }; - - tokenjanitor = { - enable = mkEnableOption (lib.mdDoc "automatic runs of the token janitor"); - interval = mkOption { - default = "quarterly"; - type = types.str; - description = lib.mdDoc '' - Interval in which the cleanup program is supposed to run. - See {manpage}`systemd.time(7)` for further information. - ''; - }; - action = mkOption { - type = types.enum [ "delete" "mark" "disable" "unassign" ]; - description = lib.mdDoc '' - Which action to take for matching tokens. - ''; - }; - unassigned = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Whether to search for **unassigned** tokens - and apply [](#opt-services.privacyidea.tokenjanitor.action) - onto them. - ''; - }; - orphaned = mkOption { - default = true; - type = types.bool; - description = lib.mdDoc '' - Whether to search for **orphaned** tokens - and apply [](#opt-services.privacyidea.tokenjanitor.action) - onto them. - ''; - }; - }; - - ldap-proxy = { - enable = mkEnableOption (lib.mdDoc "PrivacyIDEA LDAP Proxy"); - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). - ''; - }; - - user = mkOption { - type = types.str; - default = "pi-ldap-proxy"; - description = lib.mdDoc "User account under which PrivacyIDEA LDAP proxy runs."; - }; - - group = mkOption { - type = types.str; - default = "pi-ldap-proxy"; - description = lib.mdDoc "Group account under which PrivacyIDEA LDAP proxy runs."; - }; - - settings = mkOption { - type = with types; attrsOf (attrsOf (oneOf [ str bool int (listOf str) ])); - default = {}; - description = lib.mdDoc '' - Attribute-set containing the settings for `privacyidea-ldap-proxy`. - It's possible to pass secrets using env-vars as substitutes and - use the option [](#opt-services.privacyidea.ldap-proxy.environmentFile) - to inject them via `envsubst`. - ''; - }; - - environmentFile = mkOption { - default = null; - type = types.nullOr types.str; - description = lib.mdDoc '' - Environment file containing secrets to be substituted into - [](#opt-services.privacyidea.ldap-proxy.settings). - ''; - }; - }; - }; - }; - - config = mkMerge [ - - (mkIf cfg.enable { - - assertions = [ - { - assertion = cfg.tokenjanitor.enable -> (cfg.tokenjanitor.orphaned || cfg.tokenjanitor.unassigned); - message = '' - privacyidea-token-janitor has no effect if neither orphaned nor unassigned tokens - are to be searched. - ''; - } - ]; - - environment.systemPackages = [ pkgs.privacyidea (hiPrio privacyidea-token-janitor) ]; - - services.postgresql.enable = mkDefault true; - - systemd.services.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { - environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; - path = [ penv ]; - serviceConfig = { - CapabilityBoundingSet = [ "" ]; - ExecStart = "${pkgs.writeShellScript "pi-token-janitor" '' - ${optionalString cfg.tokenjanitor.orphaned '' - echo >&2 "Removing orphaned tokens..." - privacyidea-token-janitor find \ - --orphaned true \ - --action ${cfg.tokenjanitor.action} - ''} - ${optionalString cfg.tokenjanitor.unassigned '' - echo >&2 "Removing unassigned tokens..." - privacyidea-token-janitor find \ - --assigned false \ - --action ${cfg.tokenjanitor.action} - ''} - ''}"; - Group = cfg.group; - LockPersonality = true; - MemoryDenyWriteExecute = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectSystem = "strict"; - ReadWritePaths = cfg.stateDir; - Type = "oneshot"; - User = cfg.user; - WorkingDirectory = cfg.stateDir; - }; - }; - systemd.timers.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.tokenjanitor.interval; - timerConfig.Persistent = true; - }; - - systemd.services.privacyidea = let - piuwsgi = pkgs.writeText "uwsgi.json" (builtins.toJSON { - uwsgi = { - buffer-size = 8192; - plugins = [ "python3" ]; - pythonpath = "${penv}/${uwsgi.python3.sitePackages}"; - socket = "/run/privacyidea/socket"; - uid = cfg.user; - gid = cfg.group; - chmod-socket = 770; - chown-socket = "${cfg.user}:nginx"; - chdir = cfg.stateDir; - wsgi-file = "${penv}/etc/privacyidea/privacyideaapp.wsgi"; - processes = 4; - harakiri = 60; - reload-mercy = 8; - stats = "/run/privacyidea/stats.socket"; - max-requests = 2000; - limit-as = 1024; - reload-on-as = 512; - reload-on-rss = 256; - no-orphans = true; - vacuum = true; - }; - }); - in { - wantedBy = [ "multi-user.target" ]; - after = [ "postgresql.service" ]; - path = with pkgs; [ openssl ]; - environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; - preStart = let - pi-manage = "${config.security.sudo.package}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; - pgsu = config.services.postgresql.superUser; - psql = config.services.postgresql.package; - in '' - mkdir -p ${cfg.stateDir} /run/privacyidea - chown ${cfg.user}:${cfg.group} -R ${cfg.stateDir} /run/privacyidea - umask 077 - ${lib.getBin pkgs.envsubst}/bin/envsubst -o ${cfg.stateDir}/privacyidea.cfg \ - -i "${piCfgFile}" - chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg - if ! test -e "${cfg.stateDir}/db-created"; then - ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} - ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea - ${pi-manage} create_enckey - ${pi-manage} create_audit_keys - ${pi-manage} createdb - ${pi-manage} admin add admin -e ${cfg.adminEmail} -p "$(cat ${cfg.adminPasswordFile})" - ${pi-manage} db stamp head -d ${penv}/lib/privacyidea/migrations - touch "${cfg.stateDir}/db-created" - chmod g+r "${cfg.stateDir}/enckey" "${cfg.stateDir}/private.pem" - fi - ${pi-manage} db upgrade -d ${penv}/lib/privacyidea/migrations - ''; - serviceConfig = { - Type = "notify"; - ExecStart = "${uwsgi}/bin/uwsgi --json ${piuwsgi}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; - NotifyAccess = "main"; - KillSignal = "SIGQUIT"; - }; - }; - - users.users.privacyidea = mkIf (cfg.user == "privacyidea") { - group = cfg.group; - isSystemUser = true; - }; - - users.groups.privacyidea = mkIf (cfg.group == "privacyidea") {}; - }) - - (mkIf cfg.ldap-proxy.enable { - - assertions = [ - { assertion = let - xor = a: b: a && !b || !a && b; - in xor (cfg.ldap-proxy.settings == {}) (cfg.ldap-proxy.configFile == null); - message = "configFile & settings are mutually exclusive for services.privacyidea.ldap-proxy!"; - } - ]; - - warnings = mkIf (cfg.ldap-proxy.configFile != null) [ - "Using services.privacyidea.ldap-proxy.configFile is deprecated! Use the RFC42-style settings option instead!" - ]; - - systemd.services.privacyidea-ldap-proxy = let - ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); - in { - description = "privacyIDEA LDAP proxy"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = cfg.ldap-proxy.user; - Group = cfg.ldap-proxy.group; - StateDirectory = "privacyidea-ldap-proxy"; - EnvironmentFile = mkIf (cfg.ldap-proxy.environmentFile != null) - [ cfg.ldap-proxy.environmentFile ]; - ExecStartPre = - "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' - umask 0077 - ${pkgs.envsubst}/bin/envsubst \ - -i ${ldapProxyConfig} \ - -o $STATE_DIRECTORY/ldap-proxy.ini - ''}"; - ExecStart = let - configPath = if cfg.ldap-proxy.settings != {} - then "%S/privacyidea-ldap-proxy/ldap-proxy.ini" - else cfg.ldap-proxy.configFile; - in '' - ${ldap-proxy-env}/bin/twistd \ - --nodaemon \ - --pidfile= \ - -u ${cfg.ldap-proxy.user} \ - -g ${cfg.ldap-proxy.group} \ - ldap-proxy \ - -c ${configPath} - ''; - Restart = "always"; - }; - }; - - users.users.pi-ldap-proxy = mkIf (cfg.ldap-proxy.user == "pi-ldap-proxy") { - group = cfg.ldap-proxy.group; - isSystemUser = true; - }; - - users.groups.pi-ldap-proxy = mkIf (cfg.ldap-proxy.group == "pi-ldap-proxy") {}; - }) - ]; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/security/tang.nix b/third_party/nixpkgs/nixos/modules/services/security/tang.nix new file mode 100644 index 0000000000..9cb0a22fca --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/security/tang.nix @@ -0,0 +1,95 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.tang; +in +{ + options.services.tang = { + enable = mkEnableOption "tang"; + + package = mkOption { + type = types.package; + default = pkgs.tang; + defaultText = literalExpression "pkgs.tang"; + description = mdDoc "The tang package to use."; + }; + + listenStream = mkOption { + type = with types; listOf str; + default = [ "7654" ]; + example = [ "198.168.100.1:7654" "[2001:db8::1]:7654" "7654" ]; + description = mdDoc '' + Addresses and/or ports on which tang should listen. + For detailed syntax see ListenStream in {manpage}`systemd.socket(5)`. + ''; + }; + + ipAddressAllow = mkOption { + example = [ "192.168.1.0/24" ]; + type = types.listOf types.str; + description = '' + Whitelist a list of address prefixes. + Preferably, internal addresses should be used. + ''; + }; + + }; + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services."tangd@" = { + description = "Tang server"; + path = [ cfg.package ]; + serviceConfig = { + StandardInput = "socket"; + StandardOutput = "socket"; + StandardError = "journal"; + DynamicUser = true; + StateDirectory = "tang"; + RuntimeDirectory = "tang"; + StateDirectoryMode = "700"; + UMask = "0077"; + CapabilityBoundingSet = [ "" ]; + ExecStart = "${cfg.package}/libexec/tangd %S/tang"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + DeviceAllow = [ "/dev/stdin" ]; + RestrictAddressFamilies = [ "AF_UNIX" ]; + DevicePolicy = "strict"; + 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"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + IPAddressDeny = "any"; + IPAddressAllow = cfg.ipAddressAllow; + }; + }; + + systemd.sockets.tangd = { + description = "Tang server"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = cfg.listenStream; + Accept = "yes"; + IPAddressDeny = "any"; + IPAddressAllow = cfg.ipAddressAllow; + }; + }; + }; + meta.maintainers = with lib.maintainers; [ jfroche julienmalka ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix index 3f501d4534..38805eba2c 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix @@ -11,7 +11,7 @@ let in { options.services.earlyoom = { - enable = mkEnableOption (lib.mdDoc "Early out of memory killing"); + enable = mkEnableOption (lib.mdDoc "early out of memory killing"); freeMemThreshold = mkOption { type = types.ints.between 1 100; diff --git a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix index c9df20196d..ce255cd8d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/nix-daemon.nix @@ -249,11 +249,6 @@ in services.xserver.displayManager.hiddenUsers = attrNames nixbldUsers; - system.activationScripts.nix = stringAfter [ "etc" "users" ] - '' - install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user - ''; - # Legacy configuration conversion. nix.settings = mkMerge [ (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) diff --git a/third_party/nixpkgs/nixos/modules/services/system/systembus-notify.nix b/third_party/nixpkgs/nixos/modules/services/system/systembus-notify.nix index 269197b399..f79879fa13 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/systembus-notify.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/systembus-notify.nix @@ -13,7 +13,7 @@ in WARNING: enabling this option (while convenient) should *not* be done on a machine where you do not trust the other users as it allows any other - local user to DoS your session by spamming notifications. + local user to DoS your session by spamming notifications ''); }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix index 1b971838b3..58a4b70014 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix @@ -14,7 +14,7 @@ let in { options = { services.flexget = { - enable = mkEnableOption (lib.mdDoc "Run FlexGet Daemon"); + enable = mkEnableOption (lib.mdDoc "FlexGet daemon"); package = mkPackageOptionMD pkgs "flexget" {}; @@ -64,7 +64,6 @@ in { path = [ pkg ]; serviceConfig = { User = cfg.user; - Environment = "TZ=${config.time.timeZone}"; ExecStartPre = "${pkgs.coreutils}/bin/install -m644 ${ymlFile} ${configFile}"; ExecStart = "${pkg}/bin/flexget -c ${configFile} daemon start"; ExecStop = "${pkg}/bin/flexget -c ${configFile} daemon stop"; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index b98cb5283a..5efb9334ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -148,7 +148,7 @@ in type = types.bool; default = true; description = lib.mdDoc '' - Whether to enable [Micro Transport Protocol (µTP)](http://en.wikipedia.org/wiki/Micro_Transport_Protocol). + Whether to enable [Micro Transport Protocol (µTP)](https://en.wikipedia.org/wiki/Micro_Transport_Protocol). ''; }; options.watch-dir = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix b/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix index c3abd9cdcc..50f8e88102 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix @@ -40,7 +40,7 @@ in }; allowVideoAccess = lib.mkEnableOption (lib.mdDoc '' - Enable access to video devices like cameras on the system. + access to video devices like cameras on the system ''); }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix index cb438a0815..5c93f60cbd 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix @@ -32,7 +32,7 @@ let name = "mongo.conf"; executable = false; text = '' - # for documentation of all options, see http://docs.mongodb.org/manual/reference/configuration-options/ + # for documentation of all options, see https://www.mongodb.com/docs/manual/reference/configuration-options/ storage: dbPath: ${cfg.dataDir}/db @@ -63,7 +63,7 @@ let executable = false; text = '' # for documentation of all options, see: - # http://docs.mongodb.org/manual/reference/configuration-options/ + # https://www.mongodb.com/docs/manual/reference/configuration-options/ storage: dbPath: ${cfg.dataDir}/db-wt diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix index 8d17752586..8a8ed49115 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix @@ -86,7 +86,7 @@ let # Erlang/Elixir uses a somewhat special format for IP addresses erlAddr = addr: fileContents (pkgs.runCommand addr { - nativeBuildInputs = with pkgs; [ elixir ]; + nativeBuildInputs = [ cfg.package.elixirPackage ]; code = '' case :inet.parse_address('${addr}') do {:ok, addr} -> IO.inspect addr @@ -96,7 +96,7 @@ let passAsFile = [ "code" ]; } ''elixir "$codePath" >"$out"''); - format = pkgs.formats.elixirConf { }; + format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; configFile = format.generate "config.exs" (replaceSec (attrsets.updateManyAttrsByPath [{ @@ -146,7 +146,7 @@ let initSecretsScript = writeShell { name = "akkoma-init-secrets"; - runtimeInputs = with pkgs; [ coreutils elixir ]; + runtimeInputs = with pkgs; [ coreutils cfg.package.elixirPackage ]; text = let key-base = web.secret_key_base; jwt-signer = ex.":joken".":default_signer"; @@ -282,11 +282,11 @@ let AKKOMA_CONFIG_PATH="$RUNTIME_DIRECTORY/config.exs" \ ERL_EPMD_ADDRESS="${cfg.dist.address}" \ ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ - ERL_FLAGS="${concatStringsSep " " [ - "-kernel inet_dist_use_interface '${erlAddr cfg.dist.address}'" - "-kernel inet_dist_listen_min ${toString cfg.dist.portMin}" - "-kernel inet_dist_listen_max ${toString cfg.dist.portMax}" - ]}" \ + ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([ + "-kernel" "inet_dist_use_interface" (erlAddr cfg.dist.address) + "-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin) + "-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax) + ] ++ cfg.dist.extraFlags))} \ RELEASE_COOKIE="$(<"$RUNTIME_DIRECTORY/cookie")" \ RELEASE_NAME="akkoma" \ exec "${cfg.package}/bin/$(basename "$0")" "$@" @@ -553,6 +553,13 @@ in { description = mdDoc "TCP port to bind Erlang Port Mapper Daemon to."; }; + extraFlags = mkOption { + type = with types; listOf str; + default = [ ]; + description = mdDoc "Extra flags to pass to Erlang"; + example = [ "+sbwt" "none" "+sbwtdcpu" "none" "+sbwtdio" "none" ]; + }; + portMin = mkOption { type = types.port; default = 49152; @@ -902,7 +909,7 @@ in { }; config = mkIf cfg.enable { - warnings = optionals (!config.security.sudo.enable) ['' + warnings = optionals (with config.security; (!sudo.enable) && (!sudo-rs.enable)) ['' The pleroma_ctl wrapper enabled by the installWrapper option relies on sudo, which appears to have been disabled through security.sudo.enable. '']; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.md b/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.md new file mode 100644 index 0000000000..236953bd4f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.md @@ -0,0 +1,42 @@ +# c2FmZQ {#module-services-c2fmzq} + +c2FmZQ is an application that can securely encrypt, store, and share files, +including but not limited to pictures and videos. + +The service `c2fmzq-server` can be enabled by setting +``` +{ + services.c2fmzq-server.enable = true; +} +``` +This will spin up an instance of the server which is API-compatible with +[Stingle Photos](https://stingle.org) and an experimental Progressive Web App +(PWA) to interact with the storage via the browser. + +In principle the server can be exposed directly on a public interface and there +are command line options to manage HTTPS certificates directly, but the module +is designed to be served behind a reverse proxy or only accessed via localhost. + +``` +{ + services.c2fmzq-server = { + enable = true; + bindIP = "127.0.0.1"; # default + port = 8080; # default + }; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."example.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:8080"; + }; + }; + }; +} +``` + +For more information, see . diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.nix new file mode 100644 index 0000000000..2749c2a5a8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/c2fmzq-server.nix @@ -0,0 +1,125 @@ +{ lib, pkgs, config, ... }: + +let + inherit (lib) mkEnableOption mkPackageOption mkOption types; + + cfg = config.services.c2fmzq-server; + + argsFormat = { + type = with lib.types; nullOr (oneOf [ bool int str ]); + generate = lib.cli.toGNUCommandLineShell { }; + }; +in { + options.services.c2fmzq-server = { + enable = mkEnableOption "c2fmzq-server"; + + bindIP = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The local address to use."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = "The local port to use."; + }; + + passphraseFile = mkOption { + type = types.str; + example = "/run/secrets/c2fmzq/pwfile"; + description = "Path to file containing the database passphrase"; + }; + + package = mkPackageOption pkgs "c2fmzq" { }; + + settings = mkOption { + type = types.submodule { + freeformType = argsFormat.type; + + options = { + address = mkOption { + internal = true; + type = types.str; + default = "${cfg.bindIP}:${toString cfg.port}"; + }; + + database = mkOption { + type = types.str; + default = "%S/c2fmzq-server/data"; + description = "Path of the database"; + }; + + verbose = mkOption { + type = types.ints.between 1 3; + default = 2; + description = "The level of logging verbosity: 1:Error 2:Info 3:Debug"; + }; + }; + }; + description = '' + Configuration for c2FmZQ-server passed as CLI arguments. + Run {command}`c2FmZQ-server help` for supported values. + ''; + example = { + verbose = 3; + allow-new-accounts = true; + auto-approve-new-accounts = true; + encrypt-metadata = true; + enable-webapp = true; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.c2fmzq-server = { + description = "c2FmZQ-server"; + documentation = [ "https://github.com/c2FmZQ/c2FmZQ/blob/main/README.md" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} ${argsFormat.generate cfg.settings}"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DynamicUser = true; + Environment = "C2FMZQ_PASSPHRASE_FILE=%d/passphrase-file"; + IPAccounting = true; + IPAddressAllow = cfg.bindIP; + IPAddressDeny = "any"; + LoadCredential = "passphrase-file:${cfg.passphraseFile}"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateTmp = true; + PrivateUsers = true; + 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" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SocketBindAllow = cfg.port; + SocketBindDeny = "any"; + StateDirectory = "c2fmzq-server"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @obsolete" ]; + }; + }; + }; + + meta = { + doc = ./c2fmzq-server.md; + maintainers = with lib.maintainers; [ hmenke ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix index da2cf93d7f..5519d6967a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -69,7 +69,7 @@ let in { options.services.cloudlog = with types; { - enable = mkEnableOption (mdDoc "Whether to enable Cloudlog"); + enable = mkEnableOption (mdDoc "Cloudlog"); dataDir = mkOption { type = str; default = "/var/lib/cloudlog"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix index bd041db007..0c4a71c6df 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix @@ -108,8 +108,7 @@ in ProtectClock = true; ProtectHome = true; ProtectHostname = true; - # Would re-mount paths ignored by temporary root - #ProtectSystem = "strict"; + ProtectSystem = "strict"; ProtectControlGroups = true; ProtectKernelLogs = true; ProtectKernelModules = true; @@ -121,9 +120,7 @@ in RestrictSUIDSGID = true; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ]; - TemporaryFileSystem = "/:ro"; - # Does not work well with the temporary root - #UMask = "0066"; + UMask = "0066"; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index f80eb6b4c7..da1dba7d94 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -407,7 +407,7 @@ in type = with lib.types; nullOr (enum ["plain" "login" "cram_md5"]); default = null; description = lib.mdDoc '' - Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html + Authentication type to use, see https://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; @@ -423,7 +423,7 @@ in type = lib.types.str; default = "peer"; description = lib.mdDoc '' - How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html + How OpenSSL checks the certificate, see https://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix index ffc05d0e41..8b4ea2aa53 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/freshrss.nix @@ -220,7 +220,7 @@ in "catch_workers_output" = true; }; phpEnv = { - FRESHRSS_DATA_PATH = "${cfg.dataDir}"; + DATA_PATH = "${cfg.dataDir}"; }; }; }; @@ -267,7 +267,7 @@ in WorkingDirectory = cfg.package; }; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; script = @@ -302,7 +302,7 @@ in wantedBy = [ "multi-user.target" ]; startAt = "*:0/5"; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; serviceConfig = defaultServiceConfig //{ ExecStart = "${cfg.package}/app/actualize_script.php"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index bfa5fd5aff..1a66f077b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) literalExpression mdDoc mkEnableOption mkIf mkOption mkPackageOptionMD mkRenamedOptionModule types versionAtLeast; + inherit (lib) mkOption types mdDoc literalExpression; cfg = config.services.hedgedoc; @@ -9,990 +9,189 @@ let # versionAtLeast statement remains set to 21.03 for backwards compatibility. # See https://github.com/NixOS/nixpkgs/pull/108899 and # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. - name = if versionAtLeast config.system.stateVersion "21.03" - then "hedgedoc" - else "codimd"; + name = if lib.versionAtLeast config.system.stateVersion "21.03" then + "hedgedoc" + else + "codimd"; - settingsFormat = pkgs.formats.json {}; - - prettyJSON = conf: - pkgs.runCommandLocal "hedgedoc-config.json" { - nativeBuildInputs = [ pkgs.jq ]; - } '' - jq '{production:del(.[]|nulls)|del(.[][]?|nulls)}' \ - < ${settingsFormat.generate "hedgedoc-ugly.json" cfg.settings} \ - > $out - ''; + settingsFormat = pkgs.formats.json { }; in { + meta.maintainers = with lib.maintainers; [ SuperSandro2000 h7x4 ]; + imports = [ - (mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ]) - (mkRenamedOptionModule - [ "services" "hedgedoc" "configuration" ] [ "services" "hedgedoc" "settings" ]) + (lib.mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ]) + (lib.mkRenamedOptionModule [ "services" "hedgedoc" "configuration" ] [ "services" "hedgedoc" "settings" ]) + (lib.mkRenamedOptionModule [ "services" "hedgedoc" "groups" ] [ "users" "users" "hedgedoc" "extraGroups" ]) + (lib.mkRemovedOptionModule [ "services" "hedgedoc" "workDir" ] '' + This option has been removed in favor of systemd managing the state directory. + + If you have set this option without specifying `services.settings.uploadsDir`, + please move these files to `/var/lib/hedgedoc/uploads`, or set the option to point + at the correct location. + '') ]; options.services.hedgedoc = { - package = mkPackageOptionMD pkgs "hedgedoc" { }; - enable = mkEnableOption (lib.mdDoc "the HedgeDoc Markdown Editor"); + package = lib.mkPackageOptionMD pkgs "hedgedoc" { }; + enable = lib.mkEnableOption (mdDoc "the HedgeDoc Markdown Editor"); - groups = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - Groups to which the service user should be added. - ''; - }; - - workDir = mkOption { - type = types.path; - default = "/var/lib/${name}"; - description = lib.mdDoc '' - Working directory for the HedgeDoc service. - ''; - }; - - settings = let options = { - debug = mkEnableOption (lib.mdDoc "debug mode"); - domain = mkOption { - type = types.nullOr types.str; - default = null; - example = "hedgedoc.org"; - description = lib.mdDoc '' - Domain name for the HedgeDoc instance. - ''; - }; - urlPath = mkOption { - type = types.nullOr types.str; - default = null; - example = "/url/path/to/hedgedoc"; - description = lib.mdDoc '' - Path under which HedgeDoc is accessible. - ''; - }; - host = mkOption { - type = types.str; - default = "localhost"; - description = lib.mdDoc '' - Address to listen on. - ''; - }; - port = mkOption { - type = types.port; - default = 3000; - example = 80; - description = lib.mdDoc '' - Port to listen on. - ''; - }; - path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/run/hedgedoc.sock"; - description = lib.mdDoc '' - Specify where a UNIX domain socket should be placed. - ''; - }; - allowOrigin = mkOption { - type = types.listOf types.str; - default = []; - example = [ "localhost" "hedgedoc.org" ]; - description = lib.mdDoc '' - List of domains to whitelist. - ''; - }; - useSSL = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable to use SSL server. This will also enable - {option}`protocolUseSSL`. - ''; - }; - enableStatsApi = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enables or disables the /status and /metrics endpoint. - ''; - }; - hsts = { - enable = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable HSTS if HTTPS is also enabled. - ''; - }; - maxAgeSeconds = mkOption { - type = types.int; - default = 31536000; - description = lib.mdDoc '' - Max duration for clients to keep the HSTS status. - ''; - }; - includeSubdomains = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to include subdomains in HSTS. - ''; - }; - preload = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to allow preloading of the site's HSTS status. - ''; - }; - }; - csp = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExpression '' - { - enable = true; - directives = { - scriptSrc = "trustworthy.scripts.example.com"; - }; - upgradeInsecureRequest = "auto"; - addDefaults = true; - } - ''; - description = lib.mdDoc '' - Specify the Content Security Policy which is passed to Helmet. - For configuration details see . - ''; - }; - protocolUseSSL = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable to use TLS for resource paths. - This only applies when {option}`domain` is set. - ''; - }; - urlAddPort = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enable to add the port to callback URLs. - This only applies when {option}`domain` is set - and only for ports other than 80 and 443. - ''; - }; - useCDN = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to use CDN resources or not. - ''; - }; - allowAnonymous = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to allow anonymous usage. - ''; - }; - allowAnonymousEdits = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to allow guests to edit existing notes with the `freely` permission, - when {option}`allowAnonymous` is enabled. - ''; - }; - allowFreeURL = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to allow note creation by accessing a nonexistent note URL. - ''; - }; - requireFreeURLAuthentication = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to require authentication for FreeURL mode style note creation. - ''; - }; - defaultPermission = mkOption { - type = types.enum [ "freely" "editable" "limited" "locked" "private" ]; - default = "editable"; - description = lib.mdDoc '' - Default permissions for notes. - This only applies for signed-in users. - ''; - }; - dbURL = mkOption { - type = types.nullOr types.str; - default = null; - example = '' - postgres://user:pass@host:5432/dbname - ''; - description = lib.mdDoc '' - Specify which database to use. - HedgeDoc supports mysql, postgres, sqlite and mssql. - See [ - https://sequelize.readthedocs.io/en/v3/](https://sequelize.readthedocs.io/en/v3/) for more information. - Note: This option overrides {option}`db`. - ''; - }; - db = mkOption { - type = types.attrs; - default = {}; - example = literalExpression '' - { - dialect = "sqlite"; - storage = "/var/lib/${name}/db.${name}.sqlite"; - } - ''; - description = lib.mdDoc '' - Specify the configuration for sequelize. - HedgeDoc supports mysql, postgres, sqlite and mssql. - See [ - https://sequelize.readthedocs.io/en/v3/](https://sequelize.readthedocs.io/en/v3/) for more information. - Note: This option overrides {option}`db`. - ''; - }; - sslKeyPath= mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/hedgedoc/hedgedoc.key"; - description = lib.mdDoc '' - Path to the SSL key. Needed when {option}`useSSL` is enabled. - ''; - }; - sslCertPath = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/hedgedoc/hedgedoc.crt"; - description = lib.mdDoc '' - Path to the SSL cert. Needed when {option}`useSSL` is enabled. - ''; - }; - sslCAPath = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/var/lib/hedgedoc/ca.crt" ]; - description = lib.mdDoc '' - SSL ca chain. Needed when {option}`useSSL` is enabled. - ''; - }; - dhParamPath = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/hedgedoc/dhparam.pem"; - description = lib.mdDoc '' - Path to the SSL dh params. Needed when {option}`useSSL` is enabled. - ''; - }; - tmpPath = mkOption { - type = types.str; - default = "/tmp"; - description = lib.mdDoc '' - Path to the temp directory HedgeDoc should use. - Note that {option}`serviceConfig.PrivateTmp` is enabled for - the HedgeDoc systemd service by default. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - defaultNotePath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/default.md"; - defaultText = literalExpression "\"\${cfg.package}/public/default.md\""; - description = lib.mdDoc '' - Path to the default Note file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - docsPath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/docs"; - defaultText = literalExpression "\"\${cfg.package}/public/docs\""; - description = lib.mdDoc '' - Path to the docs directory. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - indexPath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/views/index.ejs"; - defaultText = literalExpression "\"\${cfg.package}/public/views/index.ejs\""; - description = lib.mdDoc '' - Path to the index template file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - hackmdPath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/views/hackmd.ejs"; - defaultText = literalExpression "\"\${cfg.package}/public/views/hackmd.ejs\""; - description = lib.mdDoc '' - Path to the hackmd template file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - errorPath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/views/error.ejs"; - defaultText = literalExpression "\"\${cfg.package}/public/views/error.ejs\""; - description = lib.mdDoc '' - Path to the error template file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - prettyPath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/views/pretty.ejs"; - defaultText = literalExpression "\"\${cfg.package}/public/views/pretty.ejs\""; - description = lib.mdDoc '' - Path to the pretty template file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - slidePath = mkOption { - type = types.nullOr types.str; - default = "${cfg.package}/public/views/slide.hbs"; - defaultText = literalExpression "\"\${cfg.package}/public/views/slide.hbs\""; - description = lib.mdDoc '' - Path to the slide template file. - (Non-canonical paths are relative to HedgeDoc's base directory) - ''; - }; - uploadsPath = mkOption { - type = types.str; - default = "${cfg.workDir}/uploads"; - defaultText = literalExpression "\"\${cfg.workDir}/uploads\""; - description = lib.mdDoc '' - Path under which uploaded files are saved. - ''; - }; - sessionName = mkOption { - type = types.str; - default = "connect.sid"; - description = lib.mdDoc '' - Specify the name of the session cookie. - ''; - }; - sessionSecret = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Specify the secret used to sign the session cookie. - If unset, one will be generated on startup. - ''; - }; - sessionLife = mkOption { - type = types.int; - default = 1209600000; - description = lib.mdDoc '' - Session life time in milliseconds. - ''; - }; - heartbeatInterval = mkOption { - type = types.int; - default = 5000; - description = lib.mdDoc '' - Specify the socket.io heartbeat interval. - ''; - }; - heartbeatTimeout = mkOption { - type = types.int; - default = 10000; - description = lib.mdDoc '' - Specify the socket.io heartbeat timeout. - ''; - }; - documentMaxLength = mkOption { - type = types.int; - default = 100000; - description = lib.mdDoc '' - Specify the maximum document length. - ''; - }; - email = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable email sign-in. - ''; - }; - allowEmailRegister = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable email registration. - ''; - }; - allowGravatar = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to use gravatar as profile picture source. - ''; - }; - imageUploadType = mkOption { - type = types.enum [ "imgur" "s3" "minio" "filesystem" ]; - default = "filesystem"; - description = lib.mdDoc '' - Specify where to upload images. - ''; - }; - minio = mkOption { - type = types.nullOr (types.submodule { - options = { - accessKey = mkOption { - type = types.str; - description = lib.mdDoc '' - Minio access key. - ''; - }; - secretKey = mkOption { - type = types.str; - description = lib.mdDoc '' - Minio secret key. - ''; - }; - endPoint = mkOption { - type = types.str; - description = lib.mdDoc '' - Minio endpoint. - ''; - }; - port = mkOption { - type = types.port; - default = 9000; - description = lib.mdDoc '' - Minio listen port. - ''; - }; - secure = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to use HTTPS for Minio. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the minio third-party integration."; - }; - s3 = mkOption { - type = types.nullOr (types.submodule { - options = { - accessKeyId = mkOption { - type = types.str; - description = lib.mdDoc '' - AWS access key id. - ''; - }; - secretAccessKey = mkOption { - type = types.str; - description = lib.mdDoc '' - AWS access key. - ''; - }; - region = mkOption { - type = types.str; - description = lib.mdDoc '' - AWS S3 region. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the s3 third-party integration."; - }; - s3bucket = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Specify the bucket name for upload types `s3` and `minio`. - ''; - }; - allowPDFExport = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable PDF exports. - ''; - }; - imgur.clientId = mkOption { - type = types.nullOr types.str; - default = null; - description = lib.mdDoc '' - Imgur API client ID. - ''; - }; - azure = mkOption { - type = types.nullOr (types.submodule { - options = { - connectionString = mkOption { - type = types.str; - description = lib.mdDoc '' - Azure Blob Storage connection string. - ''; - }; - container = mkOption { - type = types.str; - description = lib.mdDoc '' - Azure Blob Storage container name. - It will be created if non-existent. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the azure third-party integration."; - }; - oauth2 = mkOption { - type = types.nullOr (types.submodule { - options = { - authorizationURL = mkOption { - type = types.str; - description = lib.mdDoc '' - Specify the OAuth authorization URL. - ''; - }; - tokenURL = mkOption { - type = types.str; - description = lib.mdDoc '' - Specify the OAuth token URL. - ''; - }; - baseURL = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the OAuth base URL. - ''; - }; - userProfileURL = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the OAuth userprofile URL. - ''; - }; - userProfileUsernameAttr = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the name of the attribute for the username from the claim. - ''; - }; - userProfileDisplayNameAttr = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the name of the attribute for the display name from the claim. - ''; - }; - userProfileEmailAttr = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the name of the attribute for the email from the claim. - ''; - }; - scope = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the OAuth scope. - ''; - }; - providerName = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the name to be displayed for this strategy. - ''; - }; - rolesClaim = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the role claim name. - ''; - }; - accessRole = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify role which should be included in the ID token roles claim to grant access - ''; - }; - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - Specify the OAuth client ID. - ''; - }; - clientSecret = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - Specify the OAuth client secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the OAuth integration."; - }; - facebook = mkOption { - type = types.nullOr (types.submodule { - options = { - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - Facebook API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Facebook API client secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the facebook third-party integration"; - }; - twitter = mkOption { - type = types.nullOr (types.submodule { - options = { - consumerKey = mkOption { - type = types.str; - description = lib.mdDoc '' - Twitter API consumer key. - ''; - }; - consumerSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Twitter API consumer secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the Twitter third-party integration."; - }; - github = mkOption { - type = types.nullOr (types.submodule { - options = { - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - GitHub API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Github API client secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the GitHub third-party integration."; - }; - gitlab = mkOption { - type = types.nullOr (types.submodule { - options = { - baseURL = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - GitLab API authentication endpoint. - Only needed for other endpoints than gitlab.com. - ''; - }; - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - GitLab API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - GitLab API client secret. - ''; - }; - scope = mkOption { - type = types.enum [ "api" "read_user" ]; - default = "api"; - description = lib.mdDoc '' - GitLab API requested scope. - GitLab snippet import/export requires api scope. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the GitLab third-party integration."; - }; - mattermost = mkOption { - type = types.nullOr (types.submodule { - options = { - baseURL = mkOption { - type = types.str; - description = lib.mdDoc '' - Mattermost authentication endpoint. - ''; - }; - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - Mattermost API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Mattermost API client secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the Mattermost third-party integration."; - }; - dropbox = mkOption { - type = types.nullOr (types.submodule { - options = { - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - Dropbox API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Dropbox API client secret. - ''; - }; - appKey = mkOption { - type = types.str; - description = lib.mdDoc '' - Dropbox app key. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the Dropbox third-party integration."; - }; - google = mkOption { - type = types.nullOr (types.submodule { - options = { - clientID = mkOption { - type = types.str; - description = lib.mdDoc '' - Google API client ID. - ''; - }; - clientSecret = mkOption { - type = types.str; - description = lib.mdDoc '' - Google API client secret. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the Google third-party integration."; - }; - ldap = mkOption { - type = types.nullOr (types.submodule { - options = { - providerName = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Optional name to be displayed at login form, indicating the LDAP provider. - ''; - }; - url = mkOption { - type = types.str; - example = "ldap://localhost"; - description = lib.mdDoc '' - URL of LDAP server. - ''; - }; - bindDn = mkOption { - type = types.str; - description = lib.mdDoc '' - Bind DN for LDAP access. - ''; - }; - bindCredentials = mkOption { - type = types.str; - description = lib.mdDoc '' - Bind credentials for LDAP access. - ''; - }; - searchBase = mkOption { - type = types.str; - example = "o=users,dc=example,dc=com"; - description = lib.mdDoc '' - LDAP directory to begin search from. - ''; - }; - searchFilter = mkOption { - type = types.str; - example = "(uid={{username}})"; - description = lib.mdDoc '' - LDAP filter to search with. - ''; - }; - searchAttributes = mkOption { - type = types.nullOr (types.listOf types.str); - default = null; - example = [ "displayName" "mail" ]; - description = lib.mdDoc '' - LDAP attributes to search with. - ''; - }; - userNameField = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - LDAP field which is used as the username on HedgeDoc. - By default {option}`useridField` is used. - ''; - }; - useridField = mkOption { - type = types.str; - example = "uid"; - description = lib.mdDoc '' - LDAP field which is a unique identifier for users on HedgeDoc. - ''; - }; - tlsca = mkOption { - type = types.str; - default = "/etc/ssl/certs/ca-certificates.crt"; - example = "server-cert.pem,root.pem"; - description = lib.mdDoc '' - Root CA for LDAP TLS in PEM format. - ''; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the LDAP integration."; - }; - saml = mkOption { - type = types.nullOr (types.submodule { - options = { - idpSsoUrl = mkOption { - type = types.str; - example = "https://idp.example.com/sso"; - description = lib.mdDoc '' - IdP authentication endpoint. - ''; - }; - idpCert = mkOption { - type = types.path; - example = "/path/to/cert.pem"; - description = lib.mdDoc '' - Path to IdP certificate file in PEM format. - ''; - }; - issuer = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Optional identity of the service provider. - This defaults to the server URL. - ''; - }; - identifierFormat = mkOption { - type = types.str; - default = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"; - description = lib.mdDoc '' - Optional name identifier format. - ''; - }; - groupAttribute = mkOption { - type = types.str; - default = ""; - example = "memberOf"; - description = lib.mdDoc '' - Optional attribute name for group list. - ''; - }; - externalGroups = mkOption { - type = types.listOf types.str; - default = []; - example = [ "Temporary-staff" "External-users" ]; - description = lib.mdDoc '' - Excluded group names. - ''; - }; - requiredGroups = mkOption { - type = types.listOf types.str; - default = []; - example = [ "Hedgedoc-Users" ]; - description = lib.mdDoc '' - Required group names. - ''; - }; - providerName = mkOption { - type = types.str; - default = ""; - example = "My institution"; - description = lib.mdDoc '' - Optional name to be displayed at login form indicating the SAML provider. - ''; - }; - attribute = { - id = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Attribute map for `id`. - Defaults to `NameID` of SAML response. - ''; - }; - username = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Attribute map for `username`. - Defaults to `NameID` of SAML response. - ''; - }; - email = mkOption { - type = types.str; - default = ""; - description = lib.mdDoc '' - Attribute map for `email`. - Defaults to `NameID` of SAML response if - {option}`identifierFormat` has - the default value. - ''; - }; - }; - }; - }); - default = null; - description = lib.mdDoc "Configure the SAML integration."; - }; - }; in lib.mkOption { - type = lib.types.submodule { + settings = mkOption { + type = types.submodule { freeformType = settingsFormat.type; - inherit options; + options = { + domain = mkOption { + type = with types; nullOr str; + default = null; + example = "hedgedoc.org"; + description = mdDoc '' + Domain to use for website. + + This is useful if you are trying to run hedgedoc behind + a reverse proxy. + ''; + }; + urlPath = mkOption { + type = with types; nullOr str; + default = null; + example = "hedgedoc"; + description = mdDoc '' + URL path for the website. + + This is useful if you are hosting hedgedoc on a path like + `www.example.com/hedgedoc` + ''; + }; + host = mkOption { + type = with types; nullOr str; + default = "localhost"; + description = mdDoc '' + Address to listen on. + ''; + }; + port = mkOption { + type = types.port; + default = 3000; + example = 80; + description = mdDoc '' + Port to listen on. + ''; + }; + path = mkOption { + type = with types; nullOr path; + default = null; + example = "/run/hedgedoc/hedgedoc.sock"; + description = mdDoc '' + Path to UNIX domain socket to listen on + + ::: {.note} + If specified, {option}`host` and {option}`port` will be ignored. + ::: + ''; + }; + protocolUseSSL = mkOption { + type = types.bool; + default = false; + example = true; + description = mdDoc '' + Use `https://` for all links. + + This is useful if you are trying to run hedgedoc behind + a reverse proxy. + + ::: {.note} + Only applied if {option}`domain` is set. + ::: + ''; + }; + allowOrigin = mkOption { + type = with types; listOf str; + default = with cfg.settings; [ host ] ++ lib.optionals (domain != null) [ domain ]; + defaultText = literalExpression '' + with config.services.hedgedoc.settings; [ host ] ++ lib.optionals (domain != null) [ domain ] + ''; + example = [ "localhost" "hedgedoc.org" ]; + description = mdDoc '' + List of domains to whitelist. + ''; + }; + db = mkOption { + type = types.attrs; + default = { + dialect = "sqlite"; + storage = "/var/lib/${name}/db.sqlite"; + }; + defaultText = literalExpression '' + { + dialect = "sqlite"; + storage = "/var/lib/hedgedoc/db.sqlite"; + } + ''; + example = literalExpression '' + db = { + username = "hedgedoc"; + database = "hedgedoc"; + host = "localhost:5432"; + # or via socket + # host = "/run/postgresql"; + dialect = "postgresql"; + }; + ''; + description = mdDoc '' + Specify the configuration for sequelize. + HedgeDoc supports `mysql`, `postgres`, `sqlite` and `mssql`. + See + for more information. + + ::: {.note} + The relevant parts will be overriden if you set {option}`dbURL`. + ::: + ''; + }; + useSSL = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Enable to use SSL server. + + ::: {.note} + This will also enable {option}`protocolUseSSL`. + + It will also require you to set the following: + + - {option}`sslKeyPath` + - {option}`sslCertPath` + - {option}`sslCAPath` + - {option}`dhParamPath` + ::: + ''; + }; + uploadsPath = mkOption { + type = types.path; + default = "/var/lib/${name}/uploads"; + defaultText = "/var/lib/hedgedoc/uploads"; + description = mdDoc '' + Directory for storing uploaded images. + ''; + }; + + # Declared because we change the default to false. + allowGravatar = mkOption { + type = types.bool; + default = false; + example = true; + description = mdDoc '' + Whether to enable [Libravatar](https://wiki.libravatar.org/) as + profile picture source on your instance. + + Despite the naming of the setting, Hedgedoc replaced Gravatar + with Libravatar in [CodiMD 1.4.0](https://hedgedoc.org/releases/1.4.0/) + ''; + }; + }; }; - description = lib.mdDoc '' + + description = mdDoc '' HedgeDoc configuration, see for documentation. @@ -1003,7 +202,7 @@ in type = with types; nullOr path; default = null; example = "/var/lib/hedgedoc/hedgedoc.env"; - description = lib.mdDoc '' + description = mdDoc '' Environment file as defined in {manpage}`systemd.exec(5)`. Secrets may be passed to the service without adding them to the world-readable @@ -1028,45 +227,94 @@ in }; }; - config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.settings.db == {} -> ( - cfg.settings.dbURL != "" && cfg.settings.dbURL != null - ); - message = "Database configuration for HedgeDoc missing."; } - ]; - users.groups.${name} = {}; + config = lib.mkIf cfg.enable { + users.groups.${name} = { }; users.users.${name} = { description = "HedgeDoc service user"; group = name; - extraGroups = cfg.groups; - home = cfg.workDir; - createHome = true; isSystemUser = true; }; + services.hedgedoc.settings = { + defaultNotePath = lib.mkDefault "${cfg.package}/public/default.md"; + docsPath = lib.mkDefault "${cfg.package}/public/docs"; + viewPath = lib.mkDefault "${cfg.package}/public/views"; + }; + systemd.services.hedgedoc = { description = "HedgeDoc Service"; + documentation = [ "https://docs.hedgedoc.org/" ]; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; - preStart = '' - ${pkgs.envsubst}/bin/envsubst \ - -o ${cfg.workDir}/config.json \ - -i ${prettyJSON cfg.settings} - mkdir -p ${cfg.settings.uploadsPath} - ''; + preStart = + let + configFile = settingsFormat.generate "hedgedoc-config.json" { + production = cfg.settings; + }; + in + '' + ${pkgs.envsubst}/bin/envsubst \ + -o /run/${name}/config.json \ + -i ${configFile} + ${pkgs.coreutils}/bin/mkdir -p ${cfg.settings.uploadsPath} + ''; serviceConfig = { - WorkingDirectory = cfg.workDir; - StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ]; - ExecStart = "${lib.getExe cfg.package}"; - EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + User = name; + Group = name; + + Restart = "always"; + ExecStart = "${cfg.package}/bin/hedgedoc"; + RuntimeDirectory = [ name ]; + StateDirectory = [ name ]; + WorkingDirectory = "/run/${name}"; + ReadWritePaths = [ + "-${cfg.settings.uploadsPath}" + ] ++ lib.optionals (cfg.settings.db ? "storage") [ "-${cfg.settings.db.storage}" ]; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ - "CMD_CONFIG_FILE=${cfg.workDir}/config.json" + "CMD_CONFIG_FILE=/run/${name}/config.json" "NODE_ENV=production" ]; - Restart = "always"; - User = name; + + # Hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = 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" + # Required for connecting to database sockets, + # and listening to unix socket at `cfg.settings.path` + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SocketBindAllow = lib.mkIf (cfg.settings.path == null) cfg.settings.port; + SocketBindDeny = "any"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @obsolete" + "@pkey" + ]; + UMask = "0007"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix index 0fc283ff52..be8ecc645e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix @@ -7,7 +7,7 @@ in { enable = mkEnableOption (lib.mdDoc "hledger-web service"); - serveApi = mkEnableOption (lib.mdDoc "Serve only the JSON web API, without the web UI"); + serveApi = mkEnableOption (lib.mdDoc "serving only the JSON web API, without the web UI"); host = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix index 1a852ec352..6cb2d9ec78 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/isso.nix @@ -12,11 +12,11 @@ in { options = { services.isso = { enable = mkEnableOption (lib.mdDoc '' - A commenting server similar to Disqus. + isso, a commenting server similar to Disqus. Note: The application's author suppose to run isso behind a reverse proxy. The embedded solution offered by NixOS is also only suitable for small installations - below 20 requests per second. + below 20 requests per second ''); settings = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 3825b03c24..21416be358 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -105,9 +105,9 @@ in type = bool; default = true; description = lib.mdDoc '' - Whether to enable Jitsi Videobridge instance and configure it to connect to Prosody. + Jitsi Videobridge instance and configure it to connect to Prosody. - Additional configuration is possible with {option}`services.jitsi-videobridge`. + Additional configuration is possible with {option}`services.jitsi-videobridge` ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix new file mode 100644 index 0000000000..f1ab8b8b4e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lanraragi.nix @@ -0,0 +1,100 @@ +{ pkgs, lib, config, ... }: + +let + cfg = config.services.lanraragi; +in +{ + meta.maintainers = with lib.maintainers; [ tomasajt ]; + + options.services = { + lanraragi = { + enable = lib.mkEnableOption (lib.mdDoc "LANraragi"); + package = lib.mkPackageOptionMD pkgs "lanraragi" { }; + + port = lib.mkOption { + type = lib.types.port; + default = 3000; + description = lib.mdDoc "Port for LANraragi's web interface."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/lanraragi-password"; + description = lib.mdDoc '' + A file containing the password for LANraragi's admin interface. + ''; + }; + + redis = { + port = lib.mkOption { + type = lib.types.port; + default = 6379; + description = lib.mdDoc "Port for LANraragi's Redis server."; + }; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/redis-lanraragi-password"; + description = lib.mdDoc '' + A file containing the password for LANraragi's Redis server. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.redis.servers.lanraragi = { + enable = true; + port = cfg.redis.port; + requirePassFile = cfg.redis.passwordFile; + }; + + systemd.services.lanraragi = { + description = "LANraragi main service"; + after = [ "network.target" "redis-lanraragi.service" ]; + requires = [ "redis-lanraragi.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + StateDirectory = "lanraragi"; + RuntimeDirectory = "lanraragi"; + LogsDirectory = "lanraragi"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/lanraragi"; + }; + environment = { + "LRR_TEMP_DIRECTORY" = "/run/lanraragi"; + "LRR_LOG_DIRECTORY" = "/var/log/lanraragi"; + "LRR_NETWORK" = "http://*:${toString cfg.port}"; + "HOME" = "/var/lib/lanraragi"; + }; + preStart = '' + REDIS_PASS=${lib.optionalString (cfg.redis.passwordFile != null) "$(head -n1 ${cfg.redis.passwordFile})"} + cat > lrr.conf < "127.0.0.1:${toString cfg.redis.port}", + redis_password => "$REDIS_PASS", + redis_database => "0", + redis_database_minion => "1", + redis_database_config => "2", + redis_database_search => "3", + } + EOF + '' + lib.optionalString (cfg.passwordFile != null) '' + PASS_HASH=$( + PASS=$(head -n1 ${cfg.passwordFile}) ${cfg.package.perlEnv}/bin/perl -I${cfg.package}/share/lanraragi/lib -e \ + 'use LANraragi::Controller::Config; print LANraragi::Controller::Config::make_password_hash($ENV{PASS})' \ + 2>/dev/null + ) + + ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} -a "$REDIS_PASS" < + for supported values. + + For secrets use passwordFile option instead. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.str; + default = "/var/lib/microbin"; + description = lib.mdDoc "Default data folder for MicroBin."; + }; + + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/secrets/microbin.env"; + description = lib.mdDoc '' + Path to file containing environment variables. + Useful for passing down secrets. + Variables that can be considered secrets are: + - MICROBIN_BASIC_AUTH_USERNAME + - MICROBIN_BASIC_AUTH_PASSWORD + - MICROBIN_ADMIN_USERNAME + - MICROBIN_ADMIN_PASSWORD + - MICROBIN_UPLOADER_PASSWORD + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.microbin.settings = with lib; { + MICROBIN_BIND = mkDefault "0.0.0.0"; + MICROBIN_DISABLE_TELEMETRY = mkDefault true; + MICROBIN_LIST_SERVER = mkDefault false; + MICROBIN_PORT = mkDefault "8080"; + }; + + systemd.services.microbin = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = lib.mapAttrs (_: v: if lib.isBool v then lib.boolToString v else toString v) cfg.settings; + serviceConfig = { + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + DevicePolicy = "closed"; + DynamicUser = true; + EnvironmentFile = lib.optional (cfg.passwordFile != null) cfg.passwordFile; + ExecStart = "${cfg.package}/bin/microbin"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ReadWritePaths = cfg.dataDir; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + StateDirectory = "microbin"; + SystemCallArchitectures = [ "native" ]; + SystemCallFilter = [ "@system-service" ]; + WorkingDirectory = cfg.dataDir; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ surfaceflinger ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix index e9264a38f0..343c5cead2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix @@ -8,7 +8,7 @@ let user = "mobilizon"; group = "mobilizon"; - settingsFormat = pkgs.formats.elixirConf { elixir = pkgs.elixir_1_14; }; + settingsFormat = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; }; configFile = settingsFormat.generate "mobilizon-config.exs" cfg.settings; @@ -309,7 +309,7 @@ in genCookie = "IO.puts(Base.encode32(:crypto.strong_rand_bytes(32)))"; evalElixir = str: '' - ${pkgs.elixir_1_14}/bin/elixir --eval '${str}' + ${cfg.package.elixirPackage}/bin/elixir --eval '${str}' ''; in '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md index cbd7b5b3d0..ecc7f38059 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md @@ -49,7 +49,7 @@ used by the imperative installer and all values are written to an additional fil to ensure that changes can be applied by changing the module's options. In case the application serves multiple domains (those are checked with -[`$_SERVER['HTTP_HOST']`](http://php.net/manual/en/reserved.variables.server.php)) +[`$_SERVER['HTTP_HOST']`](https://www.php.net/manual/en/reserved.variables.server.php)) it's needed to add them to [`services.nextcloud.config.extraTrustedDomains`](#opt-services.nextcloud.config.extraTrustedDomains). @@ -119,13 +119,7 @@ Auto updates for Nextcloud apps can be enabled using - **Server-side encryption.** Nextcloud supports [server-side encryption (SSE)](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html). This is not an end-to-end encryption, but can be used to encrypt files that will be persisted - to external storage such as S3. Please note that this won't work anymore when using OpenSSL 3 - for PHP's openssl extension and **Nextcloud 25 or older** because this is implemented using the - legacy cipher RC4. For Nextcloud26 this isn't relevant anymore, because Nextcloud has an RC4 implementation - written in native PHP and thus doesn't need `ext-openssl` for that anymore. - If [](#opt-system.stateVersion) is *above* `22.05`, - this is disabled by default. To turn it on again and for further information please refer to - [](#opt-services.nextcloud.enableBrokenCiphersForSSE). + to external storage such as S3. ## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index e0a7e7d485..f9713cac47 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -27,13 +27,7 @@ let phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: - (with all; - # disable default openssl extension - (lib.filter (e: e.pname != "php-openssl") enabled) - # use OpenSSL 1.1 for RC4 Nextcloud encryption if user - # has acknowledged the brokenness of the ciphers (RC4). - # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed. - ++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ]) + (with all; enabled ++ optional cfg.enableImagemagick imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu @@ -66,6 +60,9 @@ let mysqlLocal = cfg.database.createLocally && cfg.config.dbtype == "mysql"; pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql"; + # https://github.com/nextcloud/documentation/pull/11179 + ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2"; + in { imports = [ @@ -87,6 +84,10 @@ in { Further details about this can be found in the `Nextcloud`-section of the NixOS-manual (which can be opened e.g. by running `nixos-help`). '') + (mkRemovedOptionModule [ "services" "nextcloud" "enableBrokenCiphersForSSE" ] '' + This option has no effect since there's no supported Nextcloud version packaged here + using OpenSSL for RC4 SSE. + '') (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' Use services.nextcloud.enableImagemagick instead. '') @@ -95,39 +96,6 @@ in { options.services.nextcloud = { enable = mkEnableOption (lib.mdDoc "nextcloud"); - enableBrokenCiphersForSSE = mkOption { - type = types.bool; - default = versionOlder stateVersion "22.11"; - defaultText = literalExpression "versionOlder system.stateVersion \"22.11\""; - description = lib.mdDoc '' - This option enables using the OpenSSL PHP extension linked against OpenSSL 1.1 - rather than latest OpenSSL (≥ 3), this is not recommended unless you need - it for server-side encryption (SSE). SSE uses the legacy RC4 cipher which is - considered broken for several years now. See also [RFC7465](https://datatracker.ietf.org/doc/html/rfc7465). - - This cipher has been disabled in OpenSSL ≥ 3 and requires - a specific legacy profile to re-enable it. - - If you deploy Nextcloud using OpenSSL ≥ 3 for PHP and have - server-side encryption configured, you will not be able to access - your files anymore. Enabling this option can restore access to your files. - Upon testing we didn't encounter any data corruption when turning - this on and off again, but this cannot be guaranteed for - each Nextcloud installation. - - It is `true` by default for systems with a [](#opt-system.stateVersion) below - `22.11` to make sure that existing installations won't break on update. On newer - NixOS systems you have to explicitly enable it on your own. - - Please note that this only provides additional value when using - external storage such as S3 since it's not an end-to-end encryption. - If this is not the case, - it is advised to [disable server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption) and set this to `false`. - - In the future, Nextcloud may move to AES-256-GCM, by then, - this option will be removed. - ''; - }; hostName = mkOption { type = types.str; description = lib.mdDoc "FQDN for the nextcloud instance."; @@ -225,7 +193,7 @@ in { package = mkOption { type = types.package; description = lib.mdDoc "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud25" "nextcloud26" "nextcloud27" ]; + relatedPackages = [ "nextcloud26" "nextcloud27" ]; }; phpPackage = mkOption { type = types.package; @@ -740,28 +708,7 @@ in { '') ++ (optional (versionOlder cfg.package.version "25") (upgradeWarning 24 "22.11")) ++ (optional (versionOlder cfg.package.version "26") (upgradeWarning 25 "23.05")) - ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")) - ++ (optional cfg.enableBrokenCiphersForSSE '' - You're using PHP's openssl extension built against OpenSSL 1.1 for Nextcloud. - This is only necessary if you're using Nextcloud's server-side encryption. - Please keep in mind that it's using the broken RC4 cipher. - - If you don't use that feature, you can switch to OpenSSL 3 and get - rid of this warning by declaring - - services.nextcloud.enableBrokenCiphersForSSE = false; - - If you need to use server-side encryption you can ignore this warning. - Otherwise you'd have to disable server-side encryption first in order - to be able to safely disable this option and get rid of this warning. - See on how to achieve this. - - For more context, here is the implementing pull request: https://github.com/NixOS/nixpkgs/pull/198470 - '') - ++ (optional (cfg.enableBrokenCiphersForSSE && versionAtLeast cfg.package.version "26") '' - Nextcloud26 supports RC4 without requiring legacy OpenSSL, so - `services.nextcloud.enableBrokenCiphersForSSE` can be set to `false`. - ''); + ++ (optional (versionOlder cfg.package.version "27") (upgradeWarning 26 "23.11")); services.nextcloud.package = with pkgs; mkDefault ( @@ -1136,10 +1083,6 @@ in { } ''; }; - "/" = { - priority = 900; - extraConfig = "rewrite ^ /index.php;"; - }; "~ ^/store-apps" = { priority = 201; extraConfig = "root ${cfg.home};"; @@ -1164,15 +1107,23 @@ in { try_files $uri $uri/ =404; ''; }; - "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' - return 404; - ''; - "~ ^/(?:\\.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = '' - return 404; - ''; - "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = { + "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)" = { + priority = 450; + extraConfig = '' + return 404; + ''; + }; + "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + priority = 450; + extraConfig = '' + return 404; + ''; + }; + "~ \\.php(?:$|/)" = { priority = 500; extraConfig = '' + # legacy support (i.e. static files and directories in cfg.package) + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[s${optionalString (!ocmProviderIsNotAStaticDirAnymore) "m"}]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; include ${config.services.nginx.package}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+?\.php)(\\/.*)$; set $path_info $fastcgi_path_info; @@ -1188,19 +1139,30 @@ in { fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s; ''; }; - "~ \\.(?:css|js|woff2?|svg|gif|map)$".extraConfig = '' + "~ \\.(?:css|js|mjs|svg|gif|png|jpg|jpeg|ico|wasm|tflite|map|html|ttf|bcmap|mp4|webm)$".extraConfig = '' try_files $uri /index.php$request_uri; expires 6M; access_log off; + location ~ \.wasm$ { + default_type application/wasm; + } ''; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + "~ ^\\/(?:updater|ocs-provider${optionalString (!ocmProviderIsNotAStaticDirAnymore) "|ocm-provider"})(?:$|\\/)".extraConfig = '' try_files $uri/ =404; index index.php; ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' - try_files $uri /index.php$request_uri; - access_log off; - ''; + "/remote" = { + priority = 1500; + extraConfig = '' + return 301 /remote.php$request_uri; + ''; + }; + "/" = { + priority = 1600; + extraConfig = '' + try_files $uri $uri/ /index.php$request_uri; + ''; + }; }; extraConfig = '' index index.php index.html /index.php$request_uri; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/outline.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/outline.nix index 1d8298963e..0e3bd07c1f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/outline.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/outline.nix @@ -117,13 +117,14 @@ in storage = lib.mkOption { description = lib.mdDoc '' To support uploading of images for avatars and document attachments an - s3-compatible storage must be provided. AWS S3 is recommended for + s3-compatible storage can be provided. AWS S3 is recommended for redundancy however if you want to keep all file storage local an alternative such as [minio](https://github.com/minio/minio) can be used. + Local filesystem storage can also be used. - A more detailed guide on setting up S3 is available - [here](https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f). + A more detailed guide on setting up storage is available + [here](https://docs.getoutline.com/s/hosting/doc/file-storage-N4M0T6Ypu7). ''; example = lib.literalExpression '' { @@ -136,6 +137,19 @@ in ''; type = lib.types.submodule { options = { + storageType = lib.mkOption { + type = lib.types.enum [ "local" "s3" ]; + description = lib.mdDoc "File storage type, it can be local or s3."; + default = "s3"; + }; + localRootDir = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + If `storageType` is `local`, this sets the parent directory + under which all attachments/images go. + ''; + default = "/var/lib/outline/data"; + }; accessKey = lib.mkOption { type = lib.types.str; description = lib.mdDoc "S3 access key."; @@ -557,7 +571,10 @@ in systemd.tmpfiles.rules = [ "f ${cfg.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" "f ${cfg.utilsSecretFile} 0600 ${cfg.user} ${cfg.group} -" - "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" + (if (cfg.storage.storageType == "s3") then + "f ${cfg.storage.secretKeyFile} 0600 ${cfg.user} ${cfg.group} -" + else + "d ${cfg.storage.localRootDir} 0700 ${cfg.user} ${cfg.group} - -") ]; services.postgresql = lib.mkIf (cfg.databaseUrl == "local") { @@ -599,14 +616,6 @@ in URL = cfg.publicUrl; PORT = builtins.toString cfg.port; - AWS_ACCESS_KEY_ID = cfg.storage.accessKey; - AWS_REGION = cfg.storage.region; - AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl; - AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName; - AWS_S3_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; - AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle; - AWS_S3_ACL = cfg.storage.acl; - CDN_URL = cfg.cdnUrl; FORCE_HTTPS = builtins.toString cfg.forceHttps; ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck; @@ -622,8 +631,21 @@ in RATE_LIMITER_ENABLED = builtins.toString cfg.rateLimiter.enable; RATE_LIMITER_REQUESTS = builtins.toString cfg.rateLimiter.requests; RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow; + + FILE_STORAGE = cfg.storage.storageType; + FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; + FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir; } + (lib.mkIf (cfg.storage.storageType == "s3") { + AWS_ACCESS_KEY_ID = cfg.storage.accessKey; + AWS_REGION = cfg.storage.region; + AWS_S3_UPLOAD_BUCKET_URL = cfg.storage.uploadBucketUrl; + AWS_S3_UPLOAD_BUCKET_NAME = cfg.storage.uploadBucketName; + AWS_S3_FORCE_PATH_STYLE = builtins.toString cfg.storage.forcePathStyle; + AWS_S3_ACL = cfg.storage.acl; + }) + (lib.mkIf (cfg.slackAuthentication != null) { SLACK_CLIENT_ID = cfg.slackAuthentication.clientId; }) @@ -676,7 +698,9 @@ in script = '' export SECRET_KEY="$(head -n1 ${lib.escapeShellArg cfg.secretKeyFile})" export UTILS_SECRET="$(head -n1 ${lib.escapeShellArg cfg.utilsSecretFile})" - export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})" + ${lib.optionalString (cfg.storage.storageType == "s3") '' + export AWS_SECRET_ACCESS_KEY="$(head -n1 ${lib.escapeShellArg cfg.storage.secretKeyFile})" + ''} ${lib.optionalString (cfg.slackAuthentication != null) '' export SLACK_CLIENT_SECRET="$(head -n1 ${lib.escapeShellArg cfg.slackAuthentication.secretFile})" ''} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix index 55bf0da7b7..7012df6dff 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peering-manager.nix @@ -35,7 +35,15 @@ in { Enable Peering Manager. This module requires a reverse proxy that serves `/static` separately. - See this [example](https://github.com/peering-manager-community/peering-manager/blob/develop/contrib/nginx.conf/) on how to configure this. + See this [example](https://github.com/peering-manager/contrib/blob/main/nginx.conf on how to configure this. + ''; + }; + + enableScheduledTasks = mkOption { + type = types.bool; + default = true; + description = '' + Set up [scheduled tasks](https://peering-manager.readthedocs.io/en/stable/setup/8-scheduled-tasks/) ''; }; @@ -194,32 +202,30 @@ in { }; systemd.services = let - defaultServiceConfig = { - WorkingDirectory = "/var/lib/peering-manager"; - User = "peering-manager"; - Group = "peering-manager"; - StateDirectory = "peering-manager"; - StateDirectoryMode = "0750"; - Restart = "on-failure"; - }; - in { - peering-manager-migration = { - description = "Peering Manager migrations"; - wantedBy = [ "peering-manager.target" ]; - + defaults = { environment = { PYTHONPATH = pkg.pythonPath; }; - - serviceConfig = defaultServiceConfig // { + serviceConfig = { + WorkingDirectory = "/var/lib/peering-manager"; + User = "peering-manager"; + Group = "peering-manager"; + StateDirectory = "peering-manager"; + StateDirectoryMode = "0750"; + Restart = "on-failure"; + }; + }; + in { + peering-manager-migration = lib.recursiveUpdate defaults { + description = "Peering Manager migrations"; + wantedBy = [ "peering-manager.target" ]; + serviceConfig = { Type = "oneshot"; - ExecStart = '' - ${pkg}/bin/peering-manager migrate - ''; + ExecStart = "${pkg}/bin/peering-manager migrate"; }; }; - peering-manager = { + peering-manager = lib.recursiveUpdate defaults { description = "Peering Manager WSGI Service"; wantedBy = [ "peering-manager.target" ]; after = [ "peering-manager-migration.service" ]; @@ -228,11 +234,7 @@ in { ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input ''; - environment = { - PYTHONPATH = pkg.pythonPath; - }; - - serviceConfig = defaultServiceConfig // { + serviceConfig = { ExecStart = '' ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \ --bind ${cfg.listenAddress}:${toString cfg.port} \ @@ -241,45 +243,92 @@ in { }; }; - peering-manager-rq = { + peering-manager-rq = lib.recursiveUpdate defaults { description = "Peering Manager Request Queue Worker"; wantedBy = [ "peering-manager.target" ]; after = [ "peering-manager.service" ]; + serviceConfig.ExecStart = "${pkg}/bin/peering-manager rqworker high default low"; + }; - environment = { - PYTHONPATH = pkg.pythonPath; - }; - - serviceConfig = defaultServiceConfig // { - ExecStart = '' - ${pkg}/bin/peering-manager rqworker high default low - ''; + peering-manager-housekeeping = lib.recursiveUpdate defaults { + description = "Peering Manager housekeeping job"; + after = [ "peering-manager.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkg}/bin/peering-manager housekeeping"; }; }; - peering-manager-housekeeping = { - description = "Peering Manager housekeeping job"; + peering-manager-peeringdb-sync = lib.recursiveUpdate defaults { + description = "PeeringDB sync"; after = [ "peering-manager.service" ]; - - environment = { - PYTHONPATH = pkg.pythonPath; - }; - - serviceConfig = defaultServiceConfig // { + serviceConfig = { Type = "oneshot"; - ExecStart = '' - ${pkg}/bin/peering-manager housekeeping - ''; + ExecStart = "${pkg}/bin/peering-manager peeringdb_sync"; + }; + }; + + peering-manager-prefix-fetch = lib.recursiveUpdate defaults { + description = "Fetch IRR AS-SET prefixes"; + after = [ "peering-manager.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkg}/bin/peering-manager grab_prefixes"; + }; + }; + + peering-manager-configuration-deployment = lib.recursiveUpdate defaults { + description = "Push configuration to routers"; + after = [ "peering-manager.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkg}/bin/peering-manager configure_routers"; + }; + }; + + peering-manager-session-poll = lib.recursiveUpdate defaults { + description = "Poll peering sessions from routers"; + after = [ "peering-manager.service" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkg}/bin/peering-manager poll_bgp_sessions --all"; }; }; }; - systemd.timers.peering-manager-housekeeping = { - description = "Run Peering Manager housekeeping job"; - wantedBy = [ "timers.target" ]; + systemd.timers = { + peering-manager-housekeeping = { + description = "Run Peering Manager housekeeping job"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "daily"; + }; - timerConfig = { - OnCalendar = "daily"; + peering-manager-peeringdb-sync = { + enable = lib.mkDefault cfg.enableScheduledTasks; + description = "Sync PeeringDB at 2:30"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "02:30:00"; + }; + + peering-manager-prefix-fetch = { + enable = lib.mkDefault cfg.enableScheduledTasks; + description = "Fetch IRR AS-SET prefixes at 4:30"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "04:30:00"; + }; + + peering-manager-configuration-deployment = { + enable = lib.mkDefault cfg.enableScheduledTasks; + description = "Push router configuration every hour 5 minutes before full hour"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "*:55:00"; + }; + + peering-manager-session-poll = { + enable = lib.mkDefault cfg.enableScheduledTasks; + description = "Poll peering sessions from routers every hour"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "*:00:00"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix index 17e170c33d..a224676114 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix @@ -352,6 +352,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + tmp_persistent = lib.mkDefault "/var/lib/peertube/storage/tmp_persistent/"; bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; @@ -521,6 +522,21 @@ in { ''; }; + locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = { + tryFiles = "/dev/null @api"; + root = cfg.settings.storage.tmp; + priority = 1135; + + extraConfig = '' + client_max_body_size 12G; + add_header X-File-Maximum-Size 8G always; + '' + lib.optionalString cfg.enableWebHttps '' + add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains'; + '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 '' + add_header Alt-Svc 'h3=":443"; ma=86400'; + ''; + }; + locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = { tryFiles = "/dev/null @api"; priority = 1140; @@ -607,70 +623,7 @@ in { ''; }; - locations."^~ /lazy-static/avatars/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.avatars; - priority = 1330; - extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; - - rewrite ^/lazy-static/avatars/(.*)$ /$1 break; - ''; - }; - - locations."^~ /lazy-static/banners/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.avatars; - priority = 1340; - extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; - - rewrite ^/lazy-static/banners/(.*)$ /$1 break; - ''; - }; - - locations."^~ /lazy-static/previews/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.previews; - priority = 1350; - extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; - - rewrite ^/lazy-static/previews/(.*)$ /$1 break; - ''; - }; - - locations."^~ /static/streaming-playlists/private/" = { + locations."^~ /download/" = { proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; priority = 1410; extraConfig = '' @@ -682,7 +635,7 @@ in { ''; }; - locations."^~ /static/webseed/private/" = { + locations."^~ /static/streaming-playlists/private/" = { proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; priority = 1420; extraConfig = '' @@ -694,31 +647,34 @@ in { ''; }; - locations."^~ /static/thumbnails/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.thumbnails; + locations."^~ /static/web-videos/private/" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; priority = 1430; extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; + proxy_limit_rate 5M; + ''; + }; - rewrite ^/static/thumbnails/(.*)$ /$1 break; + locations."^~ /static/webseed/private/" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; + priority = 1440; + extraConfig = '' + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_limit_rate 5M; ''; }; locations."^~ /static/redundancy/" = { tryFiles = "$uri @api"; root = cfg.settings.storage.redundancy; - priority = 1440; + priority = 1450; extraConfig = '' set $peertube_limit_rate 800k; @@ -753,7 +709,42 @@ in { locations."^~ /static/streaming-playlists/" = { tryFiles = "$uri @api"; root = cfg.settings.storage.streaming_playlists; - priority = 1450; + priority = 1460; + extraConfig = '' + set $peertube_limit_rate 800k; + + if ($request_uri ~ -fragmented.mp4$) { + set $peertube_limit_rate 5M; + } + + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + if ($request_method = 'GET') { + ${nginxCommonHeaders} + + access_log off; + } + + aio threads; + sendfile on; + sendfile_max_chunk 1M; + + limit_rate $peertube_limit_rate; + limit_rate_after 5M; + + rewrite ^/static/streaming-playlists/(.*)$ /$1 break; + ''; + }; + + locations."^~ /static/web-videos/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.streaming_playlists; + priority = 1470; extraConfig = '' set $peertube_limit_rate 800k; @@ -788,7 +779,7 @@ in { locations."^~ /static/webseed/" = { tryFiles = "$uri @api"; root = cfg.settings.storage.videos; - priority = 1460; + priority = 1480; extraConfig = '' set $peertube_limit_rate 800k; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix index 4801bd203b..723b38ee75 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.phylactery; in { options.services.phylactery = { - enable = mkEnableOption (lib.mdDoc "Whether to enable Phylactery server"); + enable = mkEnableOption (lib.mdDoc "Phylactery server"); host = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix index 5ebee48c3e..1fa69814c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix @@ -1,123 +1,110 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + literalExpression + mdDoc + mkEnableOption + mkIf + mkOption + mkPackageOptionMD + mkRemovedOptionModule + types + ; cfg = config.services.plantuml-server; in { + imports = [ + (mkRemovedOptionModule [ "services" "plantuml-server" "allowPlantumlInclude" ] "This option has been removed from PlantUML.") + ]; + options = { services.plantuml-server = { - enable = mkEnableOption (lib.mdDoc "PlantUML server"); + enable = mkEnableOption (mdDoc "PlantUML server"); - package = mkOption { - type = types.package; - default = pkgs.plantuml-server; - defaultText = literalExpression "pkgs.plantuml-server"; - description = lib.mdDoc "PlantUML server package to use"; - }; + package = mkPackageOptionMD pkgs "plantuml-server" { }; packages = { - jdk = mkOption { - type = types.package; - default = pkgs.jdk; - defaultText = literalExpression "pkgs.jdk"; - description = lib.mdDoc "JDK package to use for the server"; - }; - jetty = mkOption { - type = types.package; - default = pkgs.jetty; - defaultText = literalExpression "pkgs.jetty"; - description = lib.mdDoc "Jetty package to use for the server"; + jdk = mkPackageOptionMD pkgs "jdk" { }; + jetty = mkPackageOptionMD pkgs "jetty" { + default = "jetty_11"; + extraDescription = '' + At the time of writing (v1.2023.12), PlantUML Server does not support + Jetty versions higher than 12.x. + + Jetty 12.x has introduced major breaking changes, see + and + + ''; }; }; user = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "User which runs PlantUML server."; + description = mdDoc "User which runs PlantUML server."; }; group = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "Group which runs PlantUML server."; + description = mdDoc "Group which runs PlantUML server."; }; home = mkOption { - type = types.str; + type = types.path; default = "/var/lib/plantuml"; - description = lib.mdDoc "Home directory of the PlantUML server instance."; + description = mdDoc "Home directory of the PlantUML server instance."; }; listenHost = mkOption { type = types.str; default = "127.0.0.1"; - description = lib.mdDoc "Host to listen on."; + description = mdDoc "Host to listen on."; }; listenPort = mkOption { type = types.int; default = 8080; - description = lib.mdDoc "Port to listen on."; + description = mdDoc "Port to listen on."; }; plantumlLimitSize = mkOption { type = types.int; default = 4096; - description = lib.mdDoc "Limits image width and height."; + description = mdDoc "Limits image width and height."; }; - graphvizPackage = mkOption { - type = types.package; - default = pkgs.graphviz; - defaultText = literalExpression "pkgs.graphviz"; - description = lib.mdDoc "Package containing the dot executable."; - }; + graphvizPackage = mkPackageOptionMD pkgs "graphviz" { }; plantumlStats = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; + description = mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; }; httpAuthorization = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; - }; - - allowPlantumlInclude = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory."; + description = mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; }; }; }; config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - createHome = true; - }; - - users.groups.${cfg.group} = {}; - systemd.services.plantuml-server = { description = "PlantUML server"; wantedBy = [ "multi-user.target" ]; path = [ cfg.home ]; + environment = { PLANTUML_LIMIT_SIZE = builtins.toString cfg.plantumlLimitSize; GRAPHVIZ_DOT = "${cfg.graphvizPackage}/bin/dot"; PLANTUML_STATS = if cfg.plantumlStats then "on" else "off"; HTTP_AUTHORIZATION = cfg.httpAuthorization; - ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' ${cfg.packages.jdk}/bin/java \ @@ -128,13 +115,40 @@ in jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} ''; + serviceConfig = { User = cfg.user; Group = cfg.group; + StateDirectory = mkIf (cfg.home == "/var/lib/plantuml") "plantuml"; + StateDirectoryMode = mkIf (cfg.home == "/var/lib/plantuml") "0750"; + + # Hardening + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; }; }; }; - meta.maintainers = with lib.maintainers; [ truh ]; + meta.maintainers = with lib.maintainers; [ truh anthonyroussel ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix index e2d5cdc4f7..300a0f892e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix @@ -11,13 +11,6 @@ in { package = mkPackageOptionMD pkgs "plausible" { }; - releaseCookiePath = mkOption { - type = with types; either str path; - description = lib.mdDoc '' - The path to the file with release cookie. (used for remote connection to the running node). - ''; - }; - adminUser = { name = mkOption { default = "admin"; @@ -78,9 +71,9 @@ in { server = { disableRegistration = mkOption { default = true; - type = types.bool; + type = types.enum [true false "invite_only"]; description = lib.mdDoc '' - Whether to prohibit creating an account in plausible's UI. + Whether to prohibit creating an account in plausible's UI or allow on `invite_only`. ''; }; secretKeybaseFile = mkOption { @@ -92,6 +85,13 @@ in { framework docs](https://hexdocs.pm/phoenix/Mix.Tasks.Phx.Gen.Secret.html#content). ''; }; + listenAddress = mkOption { + default = "127.0.0.1"; + type = types.str; + description = lib.mdDoc '' + The IP address on which the server is listening. + ''; + }; port = mkOption { default = 8000; type = types.port; @@ -162,6 +162,10 @@ in { }; }; + imports = [ + (mkRemovedOptionModule [ "services" "plausible" "releaseCookiePath" ] "Plausible uses no distributed Erlang features, so this option is no longer necessary and was removed") + ]; + config = mkIf cfg.enable { assertions = [ { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; @@ -180,8 +184,6 @@ in { enable = true; }; - services.epmd.enable = true; - environment.systemPackages = [ cfg.package ]; systemd.services = mkMerge [ @@ -209,7 +211,33 @@ in { # Configuration options from # https://plausible.io/docs/self-hosting-configuration PORT = toString cfg.server.port; - DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; + LISTEN_IP = cfg.server.listenAddress; + + # Note [plausible-needs-no-erlang-distributed-features]: + # Plausible does not use, and does not plan to use, any of + # Erlang's distributed features, see: + # https://github.com/plausible/analytics/pull/1190#issuecomment-1018820934 + # Thus, disable distribution for improved simplicity and security: + # + # When distribution is enabled, + # Elixir spwans the Erlang VM, which will listen by default on all + # interfaces for messages between Erlang nodes (capable of + # remote code execution); it can be protected by a cookie; see + # https://erlang.org/doc/reference_manual/distributed.html#security). + # + # It would be possible to restrict the interface to one of our choice + # (e.g. localhost or a VPN IP) similar to how we do it with `listenAddress` + # for the Plausible web server; if distribution is ever needed in the future, + # https://github.com/NixOS/nixpkgs/pull/130297 shows how to do it. + # + # But since Plausible does not use this feature in any way, + # we just disable it. + RELEASE_DISTRIBUTION = "none"; + # Additional safeguard, in case `RELEASE_DISTRIBUTION=none` ever + # stops disabling the start of EPMD. + ERL_EPMD_ADDRESS = "127.0.0.1"; + + DISABLE_REGISTRATION = if isBool cfg.server.disableRegistration then boolToString cfg.server.disableRegistration else cfg.server.disableRegistration; RELEASE_TMP = "/var/lib/plausible/tmp"; # Home is needed to connect to the node with iex @@ -238,7 +266,10 @@ in { path = [ cfg.package ] ++ optional cfg.database.postgres.setup config.services.postgresql.package; script = '' - export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + # Elixir does not start up if `RELEASE_COOKIE` is not set, + # even though we set `RELEASE_DISTRIBUTION=none` so the cookie should be unused. + # Thus, make a random one, which should then be ignored. + export RELEASE_COOKIE=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 20) export ADMIN_USER_PWD="$(< $CREDENTIALS_DIRECTORY/ADMIN_USER_PWD )" export SECRET_KEY_BASE="$(< $CREDENTIALS_DIRECTORY/SECRET_KEY_BASE )" @@ -265,7 +296,6 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - "RELEASE_COOKIE:${cfg.releaseCookiePath}" ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; }; @@ -296,6 +326,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ ma27 ]; + meta.maintainers = with maintainers; [ ]; meta.doc = ./plausible.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix index f0505e052e..71b5ad4d4c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix @@ -29,6 +29,13 @@ in { default = 8080; description = lib.mdDoc "The port of the Shiori web application"; }; + + webRoot = mkOption { + type = types.str; + default = "/"; + example = "/shiori"; + description = lib.mdDoc "The root of the Shiori web application"; + }; }; }; @@ -40,7 +47,7 @@ in { environment.SHIORI_DIR = "/var/lib/shiori"; serviceConfig = { - ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'"; + ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'"; DynamicUser = true; StateDirectory = "shiori"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix index e861a41851..4fbf2bad75 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix @@ -18,19 +18,23 @@ let inherit (snipe-it.passthru) phpPackage; # shell script for local administration - artisan = pkgs.writeScriptBin "snipe-it" '' + artisan = (pkgs.writeScriptBin "snipe-it" '' #! ${pkgs.runtimeShell} - cd ${snipe-it} + cd "${snipe-it}/share/php/snipe-it" sudo=exec if [[ "$USER" != ${user} ]]; then sudo='exec /run/wrappers/bin/sudo -u ${user}' fi $sudo ${phpPackage}/bin/php artisan $* - ''; + '').overrideAttrs (old: { + meta = old.meta // { + mainProgram = "snipe-it"; + }; + }); in { options.services.snipe-it = { - enable = mkEnableOption (lib.mdDoc "A free open source IT asset/license management system"); + enable = mkEnableOption (lib.mdDoc "snipe-it, a free open source IT asset/license management system"); user = mkOption { default = "snipeit"; @@ -357,7 +361,7 @@ in { services.nginx = { enable = mkDefault true; virtualHosts."${cfg.hostName}" = mkMerge [ cfg.nginx { - root = mkForce "${snipe-it}/public"; + root = mkForce "${snipe-it}/share/php/snipe-it/public"; extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; locations = { "/" = { @@ -394,7 +398,7 @@ in { RuntimeDirectory = "snipe-it/cache"; RuntimeDirectoryMode = "0700"; }; - path = [ pkgs.replace-secret ]; + path = [ pkgs.replace-secret artisan ]; script = let isSecret = v: isAttrs v && v ? _secret && (isString v._secret || builtins.isPath v._secret); @@ -451,7 +455,7 @@ in { rm "${cfg.dataDir}"/bootstrap/cache/*.php || true # migrate db - ${phpPackage}/bin/php artisan migrate --force + ${lib.getExe artisan} migrate --force # A placeholder file for invalid barcodes invalid_barcode_location="${cfg.dataDir}/public/uploads/barcodes/invalid_barcode.gif" diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index 592ab253f7..7b2e3be429 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -430,7 +430,7 @@ let background processes while not running tt-rss, this method is generally viable to keep your feeds up to date. Still, there are more robust (and recommended) updating methods - available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds + available, you can read about them here: ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix index a7671aa717..f92afa9276 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix @@ -120,7 +120,7 @@ let withConfigFile '' query () { local result=$(${sqlite}/bin/sqlite3 \ - '${cfg.stateDir}/${settings.database.filename}' + '${cfg.stateDir}/${settings.database.filename}' \ "$1" \ ) diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix index f225d138cc..99b0a0bc56 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix @@ -9,7 +9,7 @@ in options.services.zitadel = let inherit (lib) mkEnableOption mkOption mkPackageOption types; in { - enable = mkEnableOption "ZITADEL, a user and identity access management platform."; + enable = mkEnableOption "ZITADEL, a user and identity access management platform"; package = mkPackageOption pkgs "ZITADEL" { default = [ "zitadel" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix index 80fb24fe2c..47b4c6ab41 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.garage; - toml = pkgs.formats.toml {}; + toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; in { @@ -19,8 +19,8 @@ in extraEnvironment = mkOption { type = types.attrsOf types.str; description = lib.mdDoc "Extra environment variables to pass to the Garage server."; - default = {}; - example = { RUST_BACKTRACE="yes"; }; + default = { }; + example = { RUST_BACKTRACE = "yes"; }; }; environmentFile = mkOption { @@ -30,7 +30,7 @@ in }; logLevel = mkOption { - type = types.enum (["info" "debug" "trace"]); + type = types.enum ([ "info" "debug" "trace" ]); default = "info"; example = "debug"; description = lib.mdDoc "Garage log level, see for examples."; @@ -65,12 +65,8 @@ in }; package = mkOption { - # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. - default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8 - else pkgs.garage_0_7; - defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; - description = lib.mdDoc "Garage package to use, if you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; + description = lib.mdDoc "Garage package to use, needs to be set explicitly. If you are upgrading from a major version, please read NixOS and Garage release notes for upgrade instructions."; }; }; @@ -90,7 +86,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; - StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir && hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; + StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh index ac573089cd..8c49b87db0 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,6 +1,6 @@ set -e -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/bin diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/keter/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/keter/default.nix index 3916c48647..0cd9c30cea 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/keter/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/keter/default.nix @@ -16,7 +16,7 @@ in options.services.keter = { enable = lib.mkEnableOption (lib.mdDoc ''keter, a web app deployment manager. Note that this module only support loading of webapps: -Keep an old app running and swap the ports when the new one is booted. +Keep an old app running and swap the ports when the new one is booted ''); root = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix index 0438e12e7d..eaa113c0d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix @@ -10,7 +10,7 @@ let # List of known lighttpd modules, ordered by how the lighttpd documentation # recommends them being imported: - # http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails + # https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails # # Some modules are always imported and should not appear in the config: # disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ]; @@ -84,8 +84,8 @@ let # server.modules += () entries in each sub-service extraConfig snippet, # read this: # - # http://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails - # http://redmine.lighttpd.net/issues/2337 + # https://redmine.lighttpd.net/projects/1/wiki/Server_modulesDetails + # https://redmine.lighttpd.net/issues/2337 # # Basically, lighttpd doesn't want to load (or even silently ignore) a # module for a second time, and there is no way to check if a module has @@ -253,6 +253,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}"; + serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID"; # SIGINT => graceful shutdown serviceConfig.KillSignal = "SIGINT"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix index 2d887af87c..bdd6d8b62a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix @@ -44,7 +44,7 @@ in { type = types.lines; description = lib.mdDoc '' Verbatim config file to use - (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + (see https://kazu-yamamoto.github.io/mighttpd2/config.html) ''; }; @@ -78,7 +78,7 @@ in { type = types.lines; description = lib.mdDoc '' Verbatim routing file to use - (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) + (see https://kazu-yamamoto.github.io/mighttpd2/config.html) ''; }; 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 955d6e1906..cf70dc3259 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 @@ -35,6 +35,7 @@ let compressMimeTypes = [ "application/atom+xml" "application/geo+json" + "application/javascript" # Deprecated by IETF RFC 9239, but still widely used "application/json" "application/ld+json" "application/manifest+json" @@ -329,7 +330,7 @@ let listenString = { addr, port, ssl, proxyProtocol ? false, extraParameters ? [], ... }: # UDP listener for QUIC transport protocol. (optionalString (ssl && vhost.quic) (" - listen ${addr}:${toString port} quic " + listen ${addr}${optionalString (port != null) ":${toString port}"} quic " + optionalString vhost.default "default_server " + optionalString vhost.reuseport "reuseport " + optionalString (extraParameters != []) (concatStringsSep " " @@ -338,7 +339,7 @@ let in filter isCompatibleParameter extraParameters)) + ";")) + " - listen ${addr}:${toString port} " + listen ${addr}${optionalString (port != null) ":${toString port}"} " + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " @@ -954,7 +955,7 @@ in default = {}; description = lib.mdDoc '' Configure a proxy cache path entry. - See for documentation. + See for documentation. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index 7636c1b261..9db4c8e230 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -31,12 +31,15 @@ with lib; options = { addr = mkOption { type = str; - description = lib.mdDoc "IP address."; + description = lib.mdDoc "Listen address."; }; port = mkOption { - type = port; - description = lib.mdDoc "Port number."; - default = 80; + type = types.nullOr port; + description = lib.mdDoc '' + Port number to listen on. + If unset and the listen address is not a socket then nginx defaults to 80. + ''; + default = null; }; ssl = mkOption { type = bool; @@ -60,6 +63,7 @@ with lib; example = [ { addr = "195.154.1.1"; port = 443; ssl = true; } { addr = "192.154.1.1"; port = 80; } + { addr = "unix:/var/run/nginx.sock"; } ]; description = lib.mdDoc '' Listen addresses and ports for this virtual host. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/rustus.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/rustus.nix index 878d790e36..6d3b2e6a65 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/rustus.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/rustus.nix @@ -8,7 +8,7 @@ in options.services.rustus = { - enable = mkEnableOption (lib.mdDoc "TUS protocol implementation in Rust."); + enable = mkEnableOption (lib.mdDoc "TUS protocol implementation in Rust"); host = mkOption { type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix index f0c3cf8787..18f5736313 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix @@ -204,11 +204,9 @@ in }; # Create default cert store - system.activationScripts.makeStargazerCertDir = - lib.optionalAttrs (cfg.store == /var/lib/gemini/certs) '' - mkdir -p /var/lib/gemini/certs - chown -R ${cfg.user}:${cfg.group} /var/lib/gemini/certs - ''; + systemd.tmpfiles.rules = lib.mkIf (cfg.store == /var/lib/gemini/certs) [ + ''d /var/lib/gemini/certs - "${cfg.user}" "${cfg.group}" -'' + ]; users.users = lib.optionalAttrs (cfg.user == "stargazer") { stargazer = { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index bb42c52b69..f1e4d93040 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -221,7 +221,7 @@ in # Default Fonts fonts.packages = with pkgs; [ - source-code-pro # Default monospace font in 3.32 + dejavu_fonts # Default monospace font in LMDE 6+ ubuntu_font_family # required for default theme ]; }) diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix index b2369e2426..28d7513058 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -15,7 +15,7 @@ in options = { services.xserver.desktopManager.deepin = { - enable = mkEnableOption (lib.mdDoc "Enable Deepin desktop manager"); + enable = mkEnableOption (lib.mdDoc "Deepin desktop manager"); extraGSettingsOverrides = mkOption { default = ""; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 1512b5fdf8..28dd408c92 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -63,7 +63,7 @@ in # make available for D-BUS user services #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${e.efl}/share - # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update fi ''; @@ -90,7 +90,7 @@ in }; }; - environment.etc."X11/xkb".source = xcfg.xkbDir; + environment.etc."X11/xkb".source = xcfg.xkb.dir; fonts.packages = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index 8b5daf83de..12bdd93333 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -455,7 +455,7 @@ in pkgs.glib # for gsettings program pkgs.gnome-menus pkgs.gtk3.out # for gtk-launch program - pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; in mandatoryPackages diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index eef7aa1405..d82d19b26c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -201,7 +201,7 @@ in onboard orca # elementary/greeter#668 sound-theme-freedesktop - xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ + xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) ++ (with pkgs.pantheon; [ # Artwork elementary-gtk-theme diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 758a71b634..361dbe879a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -29,7 +29,7 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (lib) - getBin optionalString literalExpression + getBin optionalAttrs optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; @@ -178,7 +178,7 @@ in capabilities = "cap_sys_nice+ep"; source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; - } // mkIf (!cfg.runUsingSystemd) { + } // optionalAttrs (!cfg.runUsingSystemd) { start_kdeinit = { setuid = true; owner = "root"; @@ -309,7 +309,7 @@ in "/share" ]; - environment.etc."X11/xkb".source = xcfg.xkbDir; + environment.etc."X11/xkb".source = xcfg.xkb.dir; environment.sessionVariables = { PLASMA_USE_QT_SCALING = mkIf cfg.useQtScaling "1"; @@ -379,7 +379,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - programs.firefox.wrapperConfig.enablePlasmaBrowserIntegration = true; + programs.firefox.nativeMessagingHosts.packages = [ pkgs.plasma5Packages.plasma-browser-integration ]; }) (mkIf (cfg.kwinrc != {}) { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 1f08ded7c9..16a7ff1a4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -96,7 +96,7 @@ let )} # Speed up application start by 50-150ms according to - # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html + # https://kdemonkey.blogspot.com/2008/04/magic-trick.html compose_cache="''${XCOMPOSECACHE:-$HOME/.compose-cache}" mkdir -p "$compose_cache" # To avoid accidentally deleting a wrongly set up XCOMPOSECACHE directory, diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index 25470e2d3c..6ca7a4425f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -204,10 +204,10 @@ in left-handed = xcfg.libinput.mouse.leftHanded; }; keyboard = { - keymap_model = xcfg.xkbModel; - keymap_layout = xcfg.layout; - keymap_variant = xcfg.xkbVariant; - keymap_options = xcfg.xkbOptions; + keymap_model = xcfg.xkb.model; + keymap_layout = xcfg.xkb.layout; + keymap_variant = xcfg.xkb.variant; + keymap_options = xcfg.xkb.options; }; }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}"; description = lib.mdDoc "Command used to start the selected compositor"; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix index cb78f52d9b..0861530f21 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix @@ -60,11 +60,11 @@ in VertRefresh 1.0 - 200.0 #To add your own modes here, use a modeline calculator, like: # cvt: - # http://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html + # https://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html # xtiming: - # http://xtiming.sourceforge.net/cgi-bin/xtiming.pl + # https://xtiming.sourceforge.net/cgi-bin/xtiming.pl # gtf: - # http://gtf.sourceforge.net/ + # https://gtf.sourceforge.net/ #This can be used to get a specific DPI, but only for the default resolution: #DisplaySize 508 317 #NOTE: the highest modes will not work without increasing the VideoRam diff --git a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index 1f48713a68..ab7e39739e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -3,7 +3,7 @@ with lib; let - layouts = config.services.xserver.extraLayouts; + layouts = config.services.xserver.xkb.extraLayouts; layoutOpts = { options = { @@ -15,10 +15,10 @@ let languages = mkOption { type = types.listOf types.str; description = - lib.mdDoc '' - A list of languages provided by the layout. - (Use ISO 639-2 codes, for example: "eng" for english) - ''; + lib.mdDoc '' + A list of languages provided by the layout. + (Use ISO 639-2 codes, for example: "eng" for english) + ''; }; compatFile = mkOption { @@ -80,29 +80,37 @@ let }; xkb_patched = pkgs.xorg.xkeyboardconfig_custom { - layouts = config.services.xserver.extraLayouts; + layouts = config.services.xserver.xkb.extraLayouts; }; in { + imports = [ + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "extraLayouts" ]; + to = [ "services" "xserver" "xkb" "extraLayouts" ]; + }) + ]; + ###### interface - options.services.xserver = { + options.services.xserver.xkb = { extraLayouts = mkOption { type = types.attrsOf (types.submodule layoutOpts); - default = {}; + default = { }; example = literalExpression - '' - { - mine = { - description = "My custom xkb layout."; - languages = [ "eng" ]; - symbolsFile = /path/to/my/layout; - }; - } - ''; + '' + { + mine = { + description = "My custom xkb layout."; + languages = [ "eng" ]; + symbolsFile = /path/to/my/layout; + }; + } + ''; description = lib.mdDoc '' Extra custom layouts that will be included in the xkb configuration. Information on how to create a new layout can be found here: @@ -121,11 +129,11 @@ in environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon # https://xkbcommon.org/doc/current/group__include-path.html - XKB_CONFIG_ROOT = config.services.xserver.xkbDir; + XKB_CONFIG_ROOT = config.services.xserver.xkb.dir; }; services.xserver = { - xkbDir = "${xkb_patched}/etc/X11/xkb"; + xkb.dir = "${xkb_patched}/etc/X11/xkb"; exportConfiguration = config.services.xserver.displayManager.startx.enable || config.services.xserver.displayManager.sx.enable; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix index 133e64c65c..bd2bcb7bcd 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix @@ -37,7 +37,7 @@ in Window class translation rules. /etc/X11/imwheelrc is generated based on this config which means this config is global for all users. - See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html) + See [official man pages](https://imwheel.sourceforge.net/imwheel.1.html) for more information. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index c2e6da4b45..4a8f2f61ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -175,6 +175,31 @@ in "Use services.xserver.fontPath instead of useXFS") (mkRemovedOptionModule [ "services" "xserver" "useGlamor" ] "Option services.xserver.useGlamor was removed because it is unnecessary. Drivers that uses Glamor will use it automatically.") + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "layout" ]; + to = [ "services" "xserver" "xkb" "layout" ]; + }) + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "xkbModel" ]; + to = [ "services" "xserver" "xkb" "model" ]; + }) + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "xkbOptions" ]; + to = [ "services" "xserver" "xkb" "options" ]; + }) + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "xkbVariant" ]; + to = [ "services" "xserver" "xkb" "variant" ]; + }) + (lib.mkRenamedOptionModuleWith { + sinceRelease = 2311; + from = [ "services" "xserver" "xkbDir" ]; + to = [ "services" "xserver" "xkb" "dir" ]; + }) ]; @@ -339,48 +364,50 @@ in ''; }; - layout = mkOption { - type = types.str; - default = "us"; - description = lib.mdDoc '' - Keyboard layout, or multiple keyboard layouts separated by commas. - ''; - }; + xkb = { + layout = mkOption { + type = types.str; + default = "us"; + description = lib.mdDoc '' + X keyboard layout, or multiple keyboard layouts separated by commas. + ''; + }; - xkbModel = mkOption { - type = types.str; - default = "pc104"; - example = "presario"; - description = lib.mdDoc '' - Keyboard model. - ''; - }; + model = mkOption { + type = types.str; + default = "pc104"; + example = "presario"; + description = lib.mdDoc '' + X keyboard model. + ''; + }; - xkbOptions = mkOption { - type = types.commas; - default = "terminate:ctrl_alt_bksp"; - example = "grp:caps_toggle,grp_led:scroll"; - description = lib.mdDoc '' - X keyboard options; layout switching goes here. - ''; - }; + options = mkOption { + type = types.commas; + default = "terminate:ctrl_alt_bksp"; + example = "grp:caps_toggle,grp_led:scroll"; + description = lib.mdDoc '' + X keyboard options; layout switching goes here. + ''; + }; - xkbVariant = mkOption { - type = types.str; - default = ""; - example = "colemak"; - description = lib.mdDoc '' - X keyboard variant. - ''; - }; + variant = mkOption { + type = types.str; + default = ""; + example = "colemak"; + description = lib.mdDoc '' + X keyboard variant. + ''; + }; - xkbDir = mkOption { - type = types.path; - default = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"''; - description = lib.mdDoc '' - Path used for -xkbdir xserver parameter. - ''; + dir = mkOption { + type = types.path; + default = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + defaultText = literalExpression ''"''${pkgs.xkeyboard_config}/etc/X11/xkb"''; + description = lib.mdDoc '' + Path used for -xkbdir xserver parameter. + ''; + }; }; config = mkOption { @@ -667,7 +694,7 @@ in { "X11/xorg.conf".source = "${configFile}"; # -xkbdir command line option does not seems to be passed to xkbcomp. - "X11/xkb".source = "${cfg.xkbDir}"; + "X11/xkb".source = "${cfg.xkb.dir}"; }) # localectl looks into 00-keyboard.conf //{ @@ -675,10 +702,10 @@ in Section "InputClass" Identifier "Keyboard catchall" MatchIsKeyboard "on" - Option "XkbModel" "${cfg.xkbModel}" - Option "XkbLayout" "${cfg.layout}" - Option "XkbOptions" "${cfg.xkbOptions}" - Option "XkbVariant" "${cfg.xkbVariant}" + Option "XkbModel" "${cfg.xkb.model}" + Option "XkbLayout" "${cfg.xkb.layout}" + Option "XkbOptions" "${cfg.xkb.options}" + Option "XkbVariant" "${cfg.xkb.variant}" EndSection ''; } @@ -759,7 +786,7 @@ in services.xserver.displayManager.xserverArgs = [ "-config ${configFile}" - "-xkbdir" "${cfg.xkbDir}" + "-xkbdir" "${cfg.xkb.dir}" ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" @@ -777,14 +804,14 @@ in ]; system.checks = singleton (pkgs.runCommand "xkb-validated" { - inherit (cfg) xkbModel layout xkbVariant xkbOptions; + inherit (cfg.xkb) model layout variant options; nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ]; preferLocalBuild = true; } '' ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}" } - xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" + xkbvalidate "$model" "$layout" "$variant" "$options" touch "$out" ''); diff --git a/third_party/nixpkgs/nixos/modules/system/activation/activatable-system.nix b/third_party/nixpkgs/nixos/modules/system/activation/activatable-system.nix index 7f6154794b..3d94159674 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/activatable-system.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/activatable-system.nix @@ -1,52 +1,16 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: let inherit (lib) mkOption - optionalString types ; - perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); - systemBuilderArgs = { activationScript = config.system.activationScripts.script; dryActivationScript = config.system.dryActivationScript; }; - systemBuilderCommands = '' - echo "$activationScript" > $out/activate - echo "$dryActivationScript" > $out/dry-activate - substituteInPlace $out/activate --subst-var-by out ''${!toplevelVar} - substituteInPlace $out/dry-activate --subst-var-by out ''${!toplevelVar} - chmod u+x $out/activate $out/dry-activate - unset activationScript dryActivationScript - - mkdir $out/bin - substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ - --subst-var out \ - --subst-var-by toplevel ''${!toplevelVar} \ - --subst-var-by coreutils "${pkgs.coreutils}" \ - --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ - --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ - --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ - --subst-var-by perl "${perlWrapped}" \ - --subst-var-by shell "${pkgs.bash}/bin/sh" \ - --subst-var-by su "${pkgs.shadow.su}/bin/su" \ - --subst-var-by systemd "${config.systemd.package}" \ - --subst-var-by utillinux "${pkgs.util-linux}" \ - ; - - chmod +x $out/bin/switch-to-configuration - ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' - if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then - echo "switch-to-configuration syntax is not valid:" - echo "$output" - exit 1 - fi - ''} - ''; - in { options = { @@ -60,6 +24,18 @@ in do, but for image based systems, this may not be needed or not be desirable. ''; }; + system.activatableSystemBuilderCommands = options.system.systemBuilderCommands // { + description = lib.mdDoc '' + Like `system.systemBuilderCommands`, but only for the commands that are + needed *both* when the system is activatable and when it isn't. + + Disclaimer: This option might go away in the future. It might be + superseded by separating switch-to-configuration into a separate script + which will make this option superfluous. See + https://github.com/NixOS/nixpkgs/pull/263462#discussion_r1373104845 for + a discussion. + ''; + }; system.build.separateActivationScript = mkOption { type = types.package; description = '' @@ -71,7 +47,18 @@ in }; }; config = { - system.systemBuilderCommands = lib.mkIf config.system.activatable systemBuilderCommands; + system.activatableSystemBuilderCommands = '' + echo "$activationScript" > $out/activate + echo "$dryActivationScript" > $out/dry-activate + substituteInPlace $out/activate --subst-var-by out ''${!toplevelVar} + substituteInPlace $out/dry-activate --subst-var-by out ''${!toplevelVar} + chmod u+x $out/activate $out/dry-activate + unset activationScript dryActivationScript + ''; + + system.systemBuilderCommands = lib.mkIf + config.system.activatable + config.system.activatableSystemBuilderCommands; system.systemBuilderArgs = lib.mkIf config.system.activatable (systemBuilderArgs // { toplevelVar = "out"; @@ -86,7 +73,7 @@ in }) '' mkdir $out - ${systemBuilderCommands} + ${config.system.activatableSystemBuilderCommands} ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix index c8407dd677..bc0b7266ce 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix @@ -55,10 +55,6 @@ let # used as a garbage collection root. ln -sfn "$(readlink -f "$systemConfig")" /run/current-system - # Prevent the current configuration from being garbage-collected. - mkdir -p /nix/var/nix/gcroots - ln -sfn /run/current-system /nix/var/nix/gcroots/current-system - exit $_status ''; @@ -233,23 +229,15 @@ in config = { system.activationScripts.stdio = ""; # obsolete + system.activationScripts.var = ""; # obsolete - system.activationScripts.var = - '' - # Various log/runtime directories. - - mkdir -p /var/tmp - chmod 1777 /var/tmp - - # Empty, immutable home directory of many system accounts. - mkdir -p /var/empty - # Make sure it's really empty - ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true - find /var/empty -mindepth 1 -delete - chmod 0555 /var/empty - chown root:root /var/empty - ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true - ''; + systemd.tmpfiles.rules = [ + # Prevent the current configuration from being garbage-collected. + "d /nix/var/nix/gcroots -" + "L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system" + "D /var/empty 0555 root root -" + "h /var/empty - - - - +i" + ]; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null then '' diff --git a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix index 9e1fa309d5..98c234bc34 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix @@ -79,7 +79,7 @@ in // { default = true; internal = true; }; enableValidation = lib.mkEnableOption (lib.mdDoc ''the validation of bootspec documents for each build. This will introduce Go in the build-time closure as we are relying on [Cuelang](https://cuelang.org/) for schema validation. - Enable this option if you want to ascertain that your documents are correct. + Enable this option if you want to ascertain that your documents are correct '' ); diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index e05f89bb0f..e2f66a287b 100755 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -22,6 +22,7 @@ use JSON::PP; use IPC::Cmd; use Sys::Syslog qw(:standard :macros); use Cwd qw(abs_path); +use Fcntl ':flock'; ## no critic(ControlStructures::ProhibitDeepNests) ## no critic(ErrorHandling::RequireCarping) @@ -91,6 +92,8 @@ if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "" } make_path("/run/nixos", { mode => oct(755) }); +open(my $stc_lock, '>>', '/run/nixos/switch-to-configuration.lock') or die "Could not open lock - $!"; +flock($stc_lock, LOCK_EX) or die "Could not acquire lock - $!"; openlog("nixos", "", LOG_USER); # Install or update the bootloader. @@ -599,7 +602,9 @@ while (my ($unit, $state) = each(%{$active_cur})) { $units_to_start{$unit} = 1; record_unit($start_list_file, $unit); # Don't spam the user with target units that always get started. - $units_to_filter{$unit} = 1; + if (($ENV{"STC_DISPLAY_ALL_UNITS"} // "") ne "1") { + $units_to_filter{$unit} = 1; + } } } @@ -983,4 +988,5 @@ if ($res == 0) { syslog(LOG_ERR, "switching to system configuration $toplevel failed (status $res)"); } +close($stc_lock) or die "Could not close lock - $!"; exit($res); diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix new file mode 100644 index 0000000000..00bc18e48d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix @@ -0,0 +1,55 @@ +{ config, lib, pkgs, ... }: + +let + + perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); + +in + +{ + + options = { + system.switch.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether to include the capability to switch configurations. + + Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. + + This is good for image based appliances where updates are handled + outside the image. Reducing features makes the image lighter and + slightly more secure. + ''; + }; + }; + + config = lib.mkIf config.system.switch.enable { + system.activatableSystemBuilderCommands = '' + mkdir $out/bin + substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ + --subst-var out \ + --subst-var-by toplevel ''${!toplevelVar} \ + --subst-var-by coreutils "${pkgs.coreutils}" \ + --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ + --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ + --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ + --subst-var-by perl "${perlWrapped}" \ + --subst-var-by shell "${pkgs.bash}/bin/sh" \ + --subst-var-by su "${pkgs.shadow.su}/bin/su" \ + --subst-var-by systemd "${config.systemd.package}" \ + --subst-var-by utillinux "${pkgs.util-linux}" \ + ; + + chmod +x $out/bin/switch-to-configuration + ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then + echo "switch-to-configuration syntax is not valid:" + echo "$output" + exit 1 + fi + ''} + ''; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index 8c9483f01c..d16152ab9d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -20,17 +20,13 @@ let optionalString fixBinary "F"; in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; - activationSnippet = name: { interpreter, wrapInterpreterInShell, ... }: if wrapInterpreterInShell then '' - rm -f /run/binfmt/${name} - cat > /run/binfmt/${name} << 'EOF' - #!${pkgs.bash}/bin/sh - exec -- ${interpreter} "$@" - EOF - chmod +x /run/binfmt/${name} - '' else '' - rm -f /run/binfmt/${name} - ln -s ${interpreter} /run/binfmt/${name} - ''; + mkInterpreter = name: { interpreter, wrapInterpreterInShell, ... }: + if wrapInterpreterInShell + then pkgs.writeShellScript "${name}-interpreter" '' + #!${pkgs.bash}/bin/sh + exec -- ${interpreter} "$@" + '' + else interpreter; getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; getQemuArch = system: (lib.systems.elaborate { inherit system; }).qemuArch; @@ -318,18 +314,25 @@ in { environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); - system.activationScripts.binfmt = stringAfter [ "specialfs" ] '' - mkdir -p /run/binfmt - chmod 0755 /run/binfmt - ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} - ''; - systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { - additionalUpstreamSystemUnits = [ - "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - "systemd-binfmt.service" - ]; - services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; - }; + + systemd = lib.mkMerge [ + ({ tmpfiles.rules = [ + "d /run/binfmt 0755 -" + ] ++ lib.mapAttrsToList + (name: interpreter: + "L+ /run/binfmt/${name} - - - - ${interpreter}" + ) + (lib.mapAttrs mkInterpreter config.boot.binfmt.registrations); + }) + + (lib.mkIf (config.boot.binfmt.registrations != {}) { + additionalUpstreamSystemUnits = [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + }) + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix b/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix index a2764187a5..897602f982 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix @@ -12,33 +12,32 @@ with lib; ]; options = { - boot.growPartition = mkEnableOption (lib.mdDoc "grow the root partition on boot"); + boot.growPartition = mkEnableOption (lib.mdDoc "growing the root partition on boot"); }; config = mkIf config.boot.growPartition { + assertions = [ + { + assertion = !config.boot.initrd.systemd.repart.enable && !config.systemd.repart.enable; + message = "systemd-repart already grows the root partition and thus you should not use boot.growPartition"; + } + ]; + systemd.services.growpart = { + wantedBy = [ "-.mount" ]; + after = [ "-.mount" ]; + before = [ "systemd-growfs-root.service" ]; + conflicts = [ "shutdown.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + TimeoutSec = "infinity"; + # growpart returns 1 if the partition is already grown + SuccessExitStatus = "0 1"; + }; - assertions = [{ - assertion = !config.boot.initrd.systemd.enable; - message = "systemd stage 1 does not support 'boot.growPartition' yet."; - }]; - - boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.gawk}/bin/gawk - copy_bin_and_libs ${pkgs.gnused}/bin/sed - copy_bin_and_libs ${pkgs.util-linux}/sbin/sfdisk - copy_bin_and_libs ${pkgs.util-linux}/sbin/lsblk - - substitute "${pkgs.cloud-utils.guest}/bin/.growpart-wrapped" "$out/bin/growpart" \ - --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ - --replace "awk" "gawk" \ - --replace "sed" "gnused" - - ln -s sed $out/bin/gnused - ''; - - boot.initrd.postDeviceCommands = '' - rootDevice="${config.fileSystems."/".device}" - if waitDevice "$rootDevice"; then + script = '' + rootDevice="${config.fileSystems."/".device}" rootDevice="$(readlink -f "$rootDevice")" parentDevice="$rootDevice" while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do @@ -48,11 +47,8 @@ with lib; if [ "''${parentDevice%[0-9]p}" != "''${parentDevice}" ] && [ -b "''${parentDevice%p}" ]; then parentDevice="''${parentDevice%p}" fi - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "$partNum" - udevadm settle - fi - ''; - + "${pkgs.cloud-utils.guest}/bin/growpart" "$parentDevice" "$partNum" + ''; + }; }; - } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix index 1d95742fac..88ba43caf0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix @@ -80,7 +80,7 @@ in }; boot.initrd.network.udhcpc.enable = mkOption { - default = config.networking.useDHCP; + default = config.networking.useDHCP && !config.boot.initrd.systemd.enable; defaultText = "networking.useDHCP"; type = types.bool; description = lib.mdDoc '' @@ -116,11 +116,11 @@ in boot.initrd.kernelModules = [ "af_packet" ]; - boot.initrd.extraUtilsCommands = '' + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.klibc}/lib/klibc/bin.static/ipconfig ''; - boot.initrd.preLVMCommands = mkBefore ( + boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ( # Search for interface definitions in command line. '' ifaces="" @@ -138,7 +138,7 @@ in # Bring up all interfaces. for iface in ${dhcpIfShellExpr}; do echo "bringing up network interface $iface..." - ip link set "$iface" up && ifaces="$ifaces $iface" + ip link set dev "$iface" up && ifaces="$ifaces $iface" done # Acquire DHCP leases. @@ -148,12 +148,12 @@ in done '' - + cfg.postCommands); + + cfg.postCommands)); - boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 '' + boot.initrd.postMountCommands = mkIf (cfg.flushBeforeStage2 && !config.boot.initrd.systemd.enable) '' for iface in $ifaces; do - ip address flush "$iface" - ip link set "$iface" down + ip address flush dev "$iface" + ip link set dev "$iface" down done ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index 60c5ff62ff..a8cd2e8f05 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -164,13 +164,12 @@ in for instructions. ''; } - - { - assertion = config.boot.initrd.systemd.enable -> cfg.shell == null; - message = "systemd stage 1 does not support boot.initrd.network.ssh.shell"; - } ]; + warnings = lib.optional (config.boot.initrd.systemd.enable && cfg.shell != null) '' + Please set 'boot.initrd.systemd.users.root.shell' instead of 'boot.initrd.network.ssh.shell' + ''; + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib @@ -235,6 +234,8 @@ in users.sshd = { uid = 1; group = "sshd"; }; groups.sshd = { gid = 1; }; + users.root.shell = mkIf (config.boot.initrd.network.ssh.shell != null) config.boot.initrd.network.ssh.shell; + contents."/etc/ssh/authorized_keys.d/root".text = concatStringsSep "\n" config.boot.initrd.network.ssh.authorizedKeys; contents."/etc/ssh/sshd_config".text = sshdConfig; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index 9ea6119196..a46331ccd4 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -96,8 +96,8 @@ in # (required, but can be null if only config changes # are needed) - extraStructuredConfig = { # attrset of extra configuration parameters - FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional) + extraStructuredConfig = { # attrset of extra configuration parameters without the CONFIG_ prefix + FOO = lib.kernel.yes; # (optional) }; # values should generally be lib.kernel.yes, # lib.kernel.no or lib.kernel.module @@ -105,8 +105,9 @@ in foo = true; # (may be checked by other NixOS modules, optional) }; - extraConfig = "CONFIG_FOO y"; # extra configuration options in string form - # (deprecated, use extraStructuredConfig instead, optional) + extraConfig = "FOO y"; # extra configuration options in string form without the CONFIG_ prefix + # (optional, multiple lines allowed to specify multiple options) + # (deprecated, use extraStructuredConfig instead) } ``` @@ -269,6 +270,9 @@ in "ata_piix" "pata_marvell" + # NVMe + "nvme" + # Standard SCSI stuff. "sd_mod" "sr_mod" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix index 926cbd2b4b..78982356a9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix @@ -12,7 +12,7 @@ in }; options.boot.loader.external = { - enable = mkEnableOption (lib.mdDoc "use an external tool to install your bootloader"); + enable = mkEnableOption (lib.mdDoc "using an external tool to install your bootloader"); installHook = mkOption { type = with types; path; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 5ef3c5cd52..13df609071 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -25,7 +25,7 @@ in under `/boot/extlinux.conf`. For instance, U-Boot's generic distro boot support uses this file format. - See [U-boot's documentation](http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master) + See [U-boot's documentation](https://u-boot.readthedocs.io/en/latest/develop/distro.html) for more information. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index 468f701ae5..7097e1d83d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -339,7 +339,7 @@ in See the [ GRUB source code - ](http://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326) + ](https://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326) for which disk modules are available. The list elements are passed directly as `argv` diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py old mode 100755 new mode 100644 index a040518a5a..96b42066b2 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -1,27 +1,41 @@ #! @python3@/bin/python3 -B import argparse -import shutil -import os -import sys -import errno -import subprocess -import glob -import tempfile -import errno -import warnings import ctypes -libc = ctypes.CDLL("libc.so.6") -import re import datetime +import errno import glob +import os import os.path -from typing import NamedTuple, List, Optional -from packaging import version +import re +import shutil +import subprocess +import sys +import warnings +import json +from typing import NamedTuple, Dict, List +from dataclasses import dataclass + + +@dataclass +class BootSpec: + init: str + initrd: str + initrdSecrets: str + kernel: str + kernelParams: List[str] + label: str + system: str + toplevel: str + specialisations: Dict[str, "BootSpec"] + + + +libc = ctypes.CDLL("libc.so.6") class SystemIdentifier(NamedTuple): - profile: Optional[str] + profile: str | None generation: int - specialisation: Optional[str] + specialisation: str | None def copy_if_not_exists(source: str, dest: str) -> None: @@ -29,13 +43,13 @@ def copy_if_not_exists(source: str, dest: str) -> None: shutil.copyfile(source, dest) -def generation_dir(profile: Optional[str], generation: int) -> str: +def generation_dir(profile: str | None, generation: int) -> str: if profile: return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation) else: return "/nix/var/nix/profiles/system-%d-link" % (generation) -def system_dir(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str: +def system_dir(profile: str | None, generation: int, specialisation: str | None) -> str: d = generation_dir(profile, generation) if specialisation: return os.path.join(d, "specialisation", specialisation) @@ -49,7 +63,7 @@ initrd {initrd} options {kernel_params} """ -def generation_conf_filename(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str: +def generation_conf_filename(profile: str | None, generation: int, specialisation: str | None) -> str: pieces = [ "nixos", profile or None, @@ -60,23 +74,33 @@ def generation_conf_filename(profile: Optional[str], generation: int, specialisa return "-".join(p for p in pieces if p) + ".conf" -def write_loader_conf(profile: Optional[str], generation: int, specialisation: Optional[str]) -> None: +def write_loader_conf(profile: str | None, generation: int, specialisation: str | None) -> None: with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": f.write("timeout @timeout@\n") f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation)) if not @editor@: - f.write("editor 0\n"); - f.write("console-mode @consoleMode@\n"); + f.write("editor 0\n") + f.write("console-mode @consoleMode@\n") + f.flush() + os.fsync(f.fileno()) os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def profile_path(profile: Optional[str], generation: int, specialisation: Optional[str], name: str) -> str: - return os.path.realpath("%s/%s" % (system_dir(profile, generation, specialisation), name)) +def get_bootspec(profile: str | None, generation: int) -> BootSpec: + boot_json_path = os.path.realpath("%s/%s" % (system_dir(profile, generation, None), "boot.json")) + boot_json_f = open(boot_json_path, 'r') + bootspec_json = json.load(boot_json_f) + return bootspec_from_json(bootspec_json) + +def bootspec_from_json(bootspec_json: Dict) -> BootSpec: + specialisations = bootspec_json['org.nixos.specialisation.v1'] + specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()} + return BootSpec(**bootspec_json['org.nixos.bootspec.v1'], specialisations=specialisations) -def copy_from_profile(profile: Optional[str], generation: int, specialisation: Optional[str], name: str, dry_run: bool = False) -> str: - store_file_path = profile_path(profile, generation, specialisation, name) +def copy_from_file(file: str, dry_run: bool = False) -> str: + store_file_path = os.path.realpath(file) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) @@ -84,40 +108,19 @@ def copy_from_profile(profile: Optional[str], generation: int, specialisation: O copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path - -def describe_generation(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str: - try: - with open(profile_path(profile, generation, specialisation, "nixos-version")) as f: - nixos_version = f.read() - except IOError: - nixos_version = "Unknown" - - kernel_dir = os.path.dirname(profile_path(profile, generation, specialisation, "kernel")) - module_dir = glob.glob("%s/lib/modules/*" % kernel_dir)[0] - kernel_version = os.path.basename(module_dir) - - build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) - build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') - - description = "@distroName@ {}, Linux Kernel {}, Built on {}".format( - nixos_version, kernel_version, build_date - ) - - return description - - -def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], - machine_id: str, current: bool) -> None: - kernel = copy_from_profile(profile, generation, specialisation, "kernel") - initrd = copy_from_profile(profile, generation, specialisation, "initrd") +def write_entry(profile: str | None, generation: int, specialisation: str | None, + machine_id: str, bootspec: BootSpec, current: bool) -> None: + if specialisation: + bootspec = bootspec.specialisations[specialisation] + kernel = copy_from_file(bootspec.kernel) + initrd = copy_from_file(bootspec.initrd) title = "@distroName@{profile}{specialisation}".format( profile=" [" + profile + "]" if profile else "", specialisation=" (%s)" % specialisation if specialisation else "") try: - append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets") - subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) + subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass except subprocess.CalledProcessError: @@ -132,31 +135,27 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "init=%s " % profile_path(profile, generation, specialisation, "init") + kernel_params = "init=%s " % bootspec.init + + kernel_params = kernel_params + " ".join(bootspec.kernelParams) + build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) + build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') - with open(profile_path(profile, generation, specialisation, "kernel-params")) as params_file: - kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: f.write(BOOT_ENTRY.format(title=title, generation=generation, kernel=kernel, initrd=initrd, kernel_params=kernel_params, - description=describe_generation(profile, generation, specialisation))) + description=f"{bootspec.label}, built on {build_date}")) if machine_id is not None: f.write("machine-id %s\n" % machine_id) + f.flush() + os.fsync(f.fileno()) os.rename(tmp_path, entry_file) -def mkdir_p(path: str) -> None: - try: - os.makedirs(path) - except OSError as e: - if e.errno != errno.EEXIST or not os.path.isdir(path): - raise - - -def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]: +def get_generations(profile: str | None = None) -> list[SystemIdentifier]: gen_list = subprocess.check_output([ "@nix@/bin/nix-env", "--list-generations", @@ -179,21 +178,14 @@ def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]: return configurations[-configurationLimit:] -def get_specialisations(profile: Optional[str], generation: int, _: Optional[str]) -> List[SystemIdentifier]: - specialisations_dir = os.path.join( - system_dir(profile, generation, None), "specialisation") - if not os.path.exists(specialisations_dir): - return [] - return [SystemIdentifier(profile, generation, spec) for spec in os.listdir(specialisations_dir)] - - -def remove_old_entries(gens: List[SystemIdentifier]) -> None: - rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") - rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") +def remove_old_entries(gens: list[SystemIdentifier]) -> None: + rex_profile = re.compile(r"^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") + rex_generation = re.compile(r"^@efiSysMountPoint@/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") known_paths = [] for gen in gens: - known_paths.append(copy_from_profile(*gen, "kernel", True)) - known_paths.append(copy_from_profile(*gen, "initrd", True)) + bootspec = get_bootspec(gen.profile, gen.generation) + known_paths.append(copy_from_file(bootspec.kernel, True)) + known_paths.append(copy_from_file(bootspec.initrd, True)) for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"): if rex_profile.match(path): prof = rex_profile.sub(r"\1", path) @@ -210,7 +202,7 @@ def remove_old_entries(gens: List[SystemIdentifier]) -> None: os.unlink(path) -def get_profiles() -> List[str]: +def get_profiles() -> list[str]: if os.path.isdir("/nix/var/nix/profiles/system-profiles/"): return [x for x in os.listdir("/nix/var/nix/profiles/system-profiles/") @@ -218,11 +210,7 @@ def get_profiles() -> List[str]: else: return [] -def main() -> None: - parser = argparse.ArgumentParser(description='Update @distroName@-related systemd-boot files') - parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default @distroName@ config to boot') - args = parser.parse_args() - +def install_bootloader(args: argparse.Namespace) -> None: try: with open("/etc/machine-id") as machine_file: machine_id = machine_file.readlines()[0] @@ -273,21 +261,15 @@ def main() -> None: if available_match is None: raise Exception("could not determine systemd-boot version") - installed_version = version.parse(installed_match.group(1)) - available_version = version.parse(available_match.group(1)) + installed_version = installed_match.group(1) + available_version = available_match.group(1) - # systemd 252 has a regression that leaves some machines unbootable, so we skip that update. - # The fix is in 252.2 - # See https://github.com/systemd/systemd/issues/25363 and https://github.com/NixOS/nixpkgs/pull/201558#issuecomment-1348603263 if installed_version < available_version: - if version.parse('252') <= available_version < version.parse('252.2'): - print("skipping systemd-boot update to %s because of known regression" % available_version) - else: - print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) + print("updating systemd-boot from %s to %s" % (installed_version, available_version)) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) - mkdir_p("@efiSysMountPoint@/efi/nixos") - mkdir_p("@efiSysMountPoint@/loader/entries") + os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True) + os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True) gens = get_generations() for profile in get_profiles(): @@ -295,10 +277,11 @@ def main() -> None: remove_old_entries(gens) for gen in gens: try: - is_default = os.path.dirname(profile_path(*gen, "init")) == args.default_config - write_entry(*gen, machine_id, current=is_default) - for specialisation in get_specialisations(*gen): - write_entry(*specialisation, machine_id, current=is_default) + bootspec = get_bootspec(gen.profile, gen.generation) + is_default = os.path.dirname(bootspec.init) == args.default_config + write_entry(*gen, machine_id, bootspec, current=is_default) + for specialisation in bootspec.specialisations.keys(): + write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, current=is_default) if is_default: write_loader_conf(*gen) except OSError as e: @@ -324,17 +307,26 @@ def main() -> None: os.rmdir(actual_root) os.rmdir(root) - mkdir_p("@efiSysMountPoint@/efi/nixos/.extra-files") + os.makedirs("@efiSysMountPoint@/efi/nixos/.extra-files", exist_ok=True) subprocess.check_call("@copyExtraFiles@") - # Since fat32 provides little recovery facilities after a crash, - # it can leave the system in an unbootable state, when a crash/outage - # happens shortly after an update. To decrease the likelihood of this - # event sync the efi filesystem after each update. - rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY)) - if rc != 0: - print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr) + +def main() -> None: + parser = argparse.ArgumentParser(description='Update @distroName@-related systemd-boot files') + parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default @distroName@ config to boot') + args = parser.parse_args() + + try: + install_bootloader(args) + finally: + # Since fat32 provides little recovery facilities after a crash, + # it can leave the system in an unbootable state, when a crash/outage + # happens shortly after an update. To decrease the likelihood of this + # event sync the efi filesystem after each update. + rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY)) + if rc != 0: + print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr) if __name__ == '__main__': diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index d9a1535ffc..1086ab80b1 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,14 +7,12 @@ let efi = config.boot.loader.efi; - python3 = pkgs.python3.withPackages (ps: [ ps.packaging ]); - systemdBootBuilder = pkgs.substituteAll { src = ./systemd-boot-builder.py; isExecutable = true; - inherit python3; + inherit (pkgs) python3; systemd = config.systemd.package; @@ -52,7 +50,7 @@ let }; checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { - nativeBuildInputs = [ pkgs.mypy python3 ]; + nativeBuildInputs = [ pkgs.mypy ]; } '' install -m755 ${systemdBootBuilder} $out mypy \ @@ -69,6 +67,8 @@ let ''; in { + meta.maintainers = with lib.maintainers; [ julienmalka ]; + imports = [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ]) ]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 06c329e006..ca560d63f3 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -537,7 +537,7 @@ in description = lib.mdDoc '' Unless enabled, encryption keys can be easily recovered by an attacker with physical access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port. - More information is available at . + More information is available at . This option blacklists FireWire drivers, but doesn't remove them. You can manually load the drivers if you need to use a FireWire device, but don't forget to unload them! diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index a5084260da..b7ced5b0d3 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -159,6 +159,7 @@ let "geneve" "l2tp" "macsec" + "wlan" "vrf" "vcan" "vxcan" @@ -468,6 +469,30 @@ let (assertMinimum "Table" 0) ]; + sectionWLAN = checkUnitConfig "WLAN" [ + (assertOnlyFields [ + "PhysicalDevice" # systemd supports both strings ("phy0") and indexes (0) here. + "Type" + "WDS" + ]) + # See https://github.com/systemd/systemd/blob/main/src/basic/linux/nl80211.h#L3382 + (assertValueOneOf "Type" [ + "ad-hoc" + "station" + "ap" + "ap-vlan" + "wds" + "monitor" + "mesh-point" + "p2p-client" + "p2p-go" + "p2p-device" + "ocb" + "nan" + ]) + (assertValueOneOf "WDS" boolValues) + ]; + sectionBatmanAdvanced = checkUnitConfig "BatmanAdvanced" [ (assertOnlyFields [ "GatewayMode" @@ -995,7 +1020,7 @@ let "MulticastToUnicast" "NeighborSuppression" "Learning" - "Hairpin" + "HairPin" "Isolated" "UseBPDU" "FastLeave" @@ -1011,7 +1036,7 @@ let (assertValueOneOf "MulticastToUnicast" boolValues) (assertValueOneOf "NeighborSuppression" boolValues) (assertValueOneOf "Learning" boolValues) - (assertValueOneOf "Hairpin" boolValues) + (assertValueOneOf "HairPin" boolValues) (assertValueOneOf "Isolated" boolValues) (assertValueOneOf "UseBPDU" boolValues) (assertValueOneOf "FastLeave" boolValues) @@ -1779,6 +1804,16 @@ let ''; }; + wlanConfig = mkOption { + default = {}; + example = { PhysicalDevice = 0; Type = "station"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionWLAN; + description = lib.mdDoc '' + Each attribute in this set specifies an option in the `[WLAN]` section of the unit. + See {manpage}`systemd.netdev(5)` for details. + ''; + }; + batmanAdvancedConfig = mkOption { default = {}; example = { @@ -2950,10 +2985,10 @@ in stage2Config (mkIf config.boot.initrd.systemd.enable { assertions = [{ - assertion = config.boot.initrd.network.udhcpc.extraArgs == []; + assertion = !config.boot.initrd.network.udhcpc.enable && config.boot.initrd.network.udhcpc.extraArgs == []; message = '' - boot.initrd.network.udhcpc.extraArgs is not supported when - boot.initrd.systemd.enable is enabled + systemd stage 1 networking does not support 'boot.initrd.network.udhcpc'. Configure + DHCP with 'networking.*' options or with 'boot.initrd.systemd.network' options. ''; }]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index bc2fc7f7b1..086e5d65da 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -253,9 +253,6 @@ done @setHostId@ # Load the required kernel modules. -mkdir -p /lib -ln -s @modulesClosure@/lib/modules /lib/modules -ln -s @modulesClosure@/lib/firmware /lib/firmware echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do info "loading module $(basename $i)..." @@ -498,6 +495,8 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then fi fi +@postResumeCommands@ + # If we have a path to an iso file, find the iso and link it to /dev/root if [ -n "$isoPath" ]; then mkdir -p /findiso diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index a3551f68db..13c71e1495 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -284,7 +284,7 @@ let # in the NixOS installation CD, so use ID_CDROM_MEDIA in the # corresponding udev rules for now. This was the behaviour in # udev <= 154. See also - # http://www.spinics.net/lists/hotplug/msg03935.html + # https://www.spinics.net/lists/hotplug/msg03935.html substituteInPlace $out/60-persistent-storage.rules \ --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA ''; # */ @@ -307,7 +307,7 @@ let ${pkgs.buildPackages.busybox}/bin/ash -n $target ''; - inherit linkUnits udevRules extraUtils modulesClosure; + inherit linkUnits udevRules extraUtils; inherit (config.boot) resumeDevice; @@ -316,7 +316,7 @@ let inherit (config.system.build) earlyMountScript; inherit (config.boot.initrd) checkJournalingFS verbose - preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; + preLVMCommands preDeviceCommands postDeviceCommands postResumeCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable @@ -349,6 +349,9 @@ let [ { object = bootStage1; symlink = "/init"; } + { object = "${modulesClosure}/lib"; + symlink = "/lib"; + } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; preferLocalBuild = true; @@ -524,6 +527,14 @@ in ''; }; + boot.initrd.postResumeCommands = mkOption { + default = ""; + type = types.lines; + description = lib.mdDoc '' + Shell commands to be executed immediately after attempting to resume. + ''; + }; + boot.initrd.postMountCommands = mkOption { default = ""; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh index 5a2133f960..a89e3d8176 100755 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh @@ -54,7 +54,7 @@ if [ ! -e /proc/1 ]; then fi -if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ]; then +if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" = true ] || [ ! -c /dev/kmsg ] ; then echo "booting system configuration ${systemConfig}" else echo "booting system configuration $systemConfig" > /dev/kmsg diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 8e38072b4c..68a8c1f37e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -575,7 +575,7 @@ in system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET" "SYSFS" "PROC_FS" "FHANDLE" "CRYPTO_USER_API_HASH" "CRYPTO_HMAC" - "CRYPTO_SHA256" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL" + "CRYPTO_SHA256" "DMIID" "AUTOFS_FS" "TMPFS_POSIX_ACL" "TMPFS_XATTR" "SECCOMP" ]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/homed.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/homed.nix index 403d169012..b216820c0c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/homed.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/homed.nix @@ -5,7 +5,7 @@ let in { options.services.homed.enable = lib.mkEnableOption (lib.mdDoc '' - Enable systemd home area/user account manager + systemd home area/user account manager ''); config = lib.mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index 61af2768e2..0e7d59b320 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -128,10 +128,6 @@ in { stage 2 counterparts such as {option}`systemd.services`, except that `restartTriggers` and `reloadTriggers` are not supported. - - Note: This is experimental. Some of the `boot.initrd` options - are not supported when this is enabled, and the options under - `boot.initrd.systemd` are subject to change. ''; }; @@ -348,17 +344,39 @@ in { }; config = mkIf (config.boot.initrd.enable && cfg.enable) { + assertions = map (name: { + assertion = lib.attrByPath name (throw "impossible") config.boot.initrd == ""; + message = '' + systemd stage 1 does not support 'boot.initrd.${lib.concatStringsSep "." name}'. Please + convert it to analogous systemd units in 'boot.initrd.systemd'. + + Definitions: + ${lib.concatMapStringsSep "\n" ({ file, ... }: " - ${file}") (lib.attrByPath name (throw "impossible") options.boot.initrd).definitionsWithLocations} + ''; + }) [ + [ "preFailCommands" ] + [ "preDeviceCommands" ] + [ "preLVMCommands" ] + [ "postDeviceCommands" ] + [ "postResumeCommands" ] + [ "postMountCommands" ] + [ "extraUdevRulesCommands" ] + [ "extraUtilsCommands" ] + [ "extraUtilsCommandsTest" ] + [ "network" "postCommands" ] + ]; + system.build = { inherit initialRamdisk; }; boot.initrd.availableKernelModules = [ # systemd needs this for some features - "autofs4" + "autofs" # systemd-cryptenroll ] ++ lib.optional cfg.enableTpm2 "tpm-tis" ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; boot.initrd.systemd = { - initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; + initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package]; extraBin = { less = "${pkgs.less}/bin/less"; mount = "${cfg.package.util-linux}/bin/mount"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix index 773163bbcb..7e62a4c9bf 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix @@ -28,6 +28,15 @@ in { ''; }; + services.journald.storage = mkOption { + default = "persistent"; + type = types.enum [ "persistent" "volatile" "auto" "none" ]; + description = mdDoc '' + Controls where to store journal data. See + {manpage}`journald.conf(5)` for further information. + ''; + }; + services.journald.rateLimitBurst = mkOption { default = 10000; type = types.int; @@ -100,7 +109,7 @@ in { environment.etc = { "systemd/journald.conf".text = '' [Journal] - Storage=persistent + Storage=${cfg.storage} RateLimitInterval=${cfg.rateLimitInterval} RateLimitBurst=${toString cfg.rateLimitBurst} ${optionalString (cfg.console != "") '' diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix index 2431c68ea1..5ac2ace56b 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/repart.nix @@ -74,6 +74,15 @@ in }; config = lib.mkIf (cfg.enable || initrdCfg.enable) { + assertions = [ + { + assertion = initrdCfg.enable -> config.boot.initrd.systemd.enable; + message = '' + 'boot.initrd.systemd.repart.enable' requires 'boot.initrd.systemd.enable' to be enabled. + ''; + } + ]; + boot.initrd.systemd = lib.mkIf initrdCfg.enable { additionalUpstreamUnits = [ "systemd-repart.service" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix index 32b9b275d3..183e2033ec 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -20,6 +20,102 @@ in ''; }; + systemd.tmpfiles.settings = mkOption { + description = lib.mdDoc '' + Declare systemd-tmpfiles rules to create, delete, and clean up volatile + and temporary files and directories. + + Even though the service is called `*tmp*files` you can also create + persistent files. + ''; + example = { + "10-mypackage" = { + "/var/lib/my-service/statefolder".d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + }; + }; + default = {}; + type = types.attrsOf (types.attrsOf (types.attrsOf (types.submodule ({ name, config, ... }: { + options.type = mkOption { + type = types.str; + default = name; + example = "d"; + description = lib.mdDoc '' + The type of operation to perform on the file. + + The type consists of a single letter and optionally one or more + modifier characters. + + Please see the upstream documentation for the available types and + more details: + + ''; + }; + options.mode = mkOption { + type = types.str; + default = "-"; + example = "0755"; + description = lib.mdDoc '' + The file access mode to use when creating this file or directory. + ''; + }; + options.user = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = lib.mdDoc '' + The user of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.group = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = lib.mdDoc '' + The group of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.age = mkOption { + type = types.str; + default = "-"; + example = "10d"; + description = lib.mdDoc '' + Delete a file when it reaches a certain age. + + If a file or directory is older than the current time minus the age + field, it is deleted. + + If set to `"-"` no automatic clean-up is done. + ''; + }; + options.argument = mkOption { + type = types.str; + default = ""; + example = ""; + description = lib.mdDoc '' + An argument whose meaning depends on the type of operation. + + Please see the upstream documentation for the meaning of this + parameter in different situations: + + ''; + }; + })))); + }; + systemd.tmpfiles.packages = mkOption { type = types.listOf types.package; default = []; @@ -100,7 +196,13 @@ in ${concatStringsSep "\n" cfg.rules} ''; }) - ]; + ] ++ (mapAttrsToList (name: paths: + pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (concatStrings (mapAttrsToList (path: types: + concatStrings (mapAttrsToList (_type: entry: '' + '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument} + '') types) + ) paths )) + ) cfg.settings); systemd.tmpfiles.rules = [ "d /nix/var 0755 root root - -" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/userdbd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/userdbd.nix index 994aa3ca3b..e7f6d42341 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/userdbd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/userdbd.nix @@ -5,7 +5,7 @@ let in { options.services.userdbd.enable = lib.mkEnableOption (lib.mdDoc '' - Enables the systemd JSON user/group record lookup service + the systemd JSON user/group record lookup service ''); config = lib.mkIf cfg.enable { systemd.additionalUpstreamSystemUnits = [ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix b/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix index a6604802c3..7487cf97fe 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix @@ -46,6 +46,28 @@ with lib; wantedBy = [ "sysinit.target" ]; aliases = [ "dbus-org.freedesktop.timesync1.service" ]; restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ]; + + preStart = ( + # Ensure that we have some stored time to prevent + # systemd-timesyncd to resort back to the fallback time. If + # the file doesn't exist we assume that our current system + # clock is good enough to provide an initial value. + '' + if ! [ -f /var/lib/systemd/timesync/clock ]; then + test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync + touch /var/lib/systemd/timesync/clock + fi + '' + + # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes + # - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742 + # - https://github.com/systemd/systemd/issues/12131 + (lib.optionalString (versionOlder config.system.stateVersion "19.09") '' + if [ -L /var/lib/systemd/timesync ]; then + rm /var/lib/systemd/timesync + mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync + fi + '') + ); }; environment.etc."systemd/timesyncd.conf".text = '' @@ -59,28 +81,5 @@ with lib; group = "systemd-timesync"; }; users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; - - system.activationScripts.systemd-timesyncd-migration = - # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes - # - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742 - # - https://github.com/systemd/systemd/issues/12131 - mkIf (versionOlder config.system.stateVersion "19.09") '' - if [ -L /var/lib/systemd/timesync ]; then - rm /var/lib/systemd/timesync - mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync - fi - ''; - system.activationScripts.systemd-timesyncd-init-clock = - # Ensure that we have some stored time to prevent systemd-timesyncd to - # resort back to the fallback time. - # If the file doesn't exist we assume that our current system clock is - # good enough to provide an initial value. - '' - if ! [ -f /var/lib/systemd/timesync/clock ]; then - test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync - touch /var/lib/systemd/timesync/clock - fi - ''; }; - } diff --git a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix index 7837a34b49..da9c83ba33 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix @@ -5,8 +5,22 @@ with lib; let fileSystems = config.system.build.fileSystems ++ config.swapDevices; encDevs = filter (dev: dev.encrypted.enable) fileSystems; - keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; - keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; + + # With scripted initrd, devices with a keyFile have to be opened + # late, after file systems are mounted, because that could be where + # the keyFile is located. With systemd initrd, each individual + # systemd-cryptsetup@ unit has RequiresMountsFor= to delay until all + # the mount units for the key file are done; i.e. no special + # treatment is needed. + lateEncDevs = + if config.boot.initrd.systemd.enable + then { } + else filter (dev: dev.encrypted.keyFile != null) encDevs; + earlyEncDevs = + if config.boot.initrd.systemd.enable + then encDevs + else filter (dev: dev.encrypted.keyFile == null) encDevs; + anyEncrypted = foldr (j: v: v || j.encrypted.enable) false encDevs; @@ -39,11 +53,14 @@ let type = types.nullOr types.str; description = lib.mdDoc '' Path to a keyfile used to unlock the backing encrypted - device. At the time this keyfile is accessed, the - `neededForBoot` filesystems (see - `fileSystems..neededForBoot`) - will have been mounted under `/mnt-root`, - so the keyfile path should usually start with "/mnt-root/". + device. When systemd stage 1 is not enabled, at the time + this keyfile is accessed, the `neededForBoot` filesystems + (see `utils.fsNeededForBoot`) will have been mounted under + `/mnt-root`, so the keyfile path should usually start with + "/mnt-root/". When systemd stage 1 is enabled, + `fsNeededForBoot` file systems will be mounted as needed + under `/sysroot`, and the keyfile will not be accessed until + its requisite mounts are done. ''; }; }; @@ -62,26 +79,42 @@ in }; config = mkIf anyEncrypted { - assertions = map (dev: { - assertion = dev.encrypted.label != null; - message = '' - The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set - ''; - }) encDevs; + assertions = concatMap (dev: [ + { + assertion = dev.encrypted.label != null; + message = '' + The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set + ''; + } + { + assertion = + config.boot.initrd.systemd.enable -> ( + dev.encrypted.keyFile == null + || !lib.any (x: lib.hasPrefix x dev.encrypted.keyFile) ["/mnt-root" "$targetRoot"] + ); + message = '' + Bad use of '/mnt-root' or '$targetRoot` in 'keyFile'. + + When 'boot.initrd.systemd.enable' is enabled, file systems + are mounted at '/sysroot' instead of '/mnt-root'. + ''; + } + ]) encDevs; boot.initrd = { luks = { devices = builtins.listToAttrs (map (dev: { name = dev.encrypted.label; - value = { device = dev.encrypted.blkDev; }; - }) keylessEncDevs); + value = { device = dev.encrypted.blkDev; inherit (dev.encrypted) keyFile; }; + }) earlyEncDevs); forceLuksSupportInInitrd = true; }; - postMountCommands = - concatMapStrings (dev: + # TODO: systemd stage 1 + postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable) + (concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n" - ) keyedEncDevs; + ) lateEncDevs); }; }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix index 19ef188ce7..af7ba7aa6a 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix @@ -6,23 +6,39 @@ let bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; - mountCommand = pkgs.runCommand "mount.bcachefs" {} '' - mkdir -p $out/bin - cat > $out/bin/mount.bcachefs < /dev/null 2> /dev/null; then # test for encryption prompt $name until bcachefs unlock $path 2> /dev/null; do # repeat until successfully unlocked @@ -30,55 +46,84 @@ let prompt $name done printf "unlocking successful.\n" + else + echo "Cannot unlock device $uuid with path $path" >&2 fi } ''; - openCommand = name: fs: - let - # we need only unlock one device manually, and cannot pass multiple at once - # remove this adaptation when bcachefs implements mounting by filesystem uuid - # also, implement automatic waiting for the constituent devices when that happens - # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) - firstDevice = head (splitString ":" fs.device); - in - '' - tryUnlock ${name} ${firstDevice} + # we need only unlock one device manually, and cannot pass multiple at once + # remove this adaptation when bcachefs implements mounting by filesystem uuid + # also, implement automatic waiting for the constituent devices when that happens + # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) + firstDevice = fs: head (splitString ":" fs.device); + + openCommand = name: fs: '' + tryUnlock ${name} ${firstDevice fs} + ''; + + mkUnits = prefix: name: fs: let + mountUnit = "${utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint))}.mount"; + device = firstDevice fs; + deviceUnit = "${utils.escapeSystemdPath device}.device"; + in { + name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}"; + value = { + description = "Unlock bcachefs for ${fs.mountPoint}"; + requiredBy = [ mountUnit ]; + before = [ mountUnit ]; + bindsTo = [ deviceUnit ]; + after = [ deviceUnit ]; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\""; + Restart = "on-failure"; + RestartMode = "direct"; + # Ideally, this service would lock the key on stop. + # As is, RemainAfterExit doesn't accomplish anything. + RemainAfterExit = true; + }; + script = '' + ${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}" ''; + }; + }; in { config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ { - # We do not want to include bachefs in the fsPackages for systemd-initrd - # because we provide the unwrapped version of mount.bcachefs - # through the extraBin option, which will make it available for use. - system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; - environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; + # needed for systemd-remount-fs + system.fsPackages = [ pkgs.bcachefs-tools ]; # use kernel package with bcachefs support until it's in mainline + # TODO replace with requireKernelConfig boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + + systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); } (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; - boot.initrd.systemd.extraBin = { + # do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357 "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs"; - "mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs"; + "mount.bcachefs" = "${pkgs.bcachefs-tools}/bin/mount.bcachefs"; }; - boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs - copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs + copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/mount.bcachefs ''; - boot.initrd.extraUtilsCommandsTest = '' + boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/bcachefs version ''; - boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs); + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + concatStrings (mapAttrsToList openCommand bootFs)); + + boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) ]); } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix index 82fdd60587..87fe326c09 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/btrfs.nix @@ -52,34 +52,37 @@ in config = mkMerge [ (mkIf enableBtrfs { system.fsPackages = [ pkgs.btrfs-progs ]; + }) - boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ]; - boot.initrd.availableKernelModules = mkIf inInitrd ( + (mkIf inInitrd { + boot.initrd.kernelModules = [ "btrfs" ]; + boot.initrd.availableKernelModules = [ "crc32c" ] ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [ # Needed for mounting filesystems with new checksums "xxhash_generic" "blake2b_generic" "sha256_generic" # Should be baked into our kernel, just to be sure - ] - ); + ]; - boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs ln -sv btrfs $out/bin/btrfsck ln -sv btrfsck $out/bin/fsck.btrfs ''; - boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/btrfs --version ''; - boot.initrd.postDeviceCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) + boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) '' btrfs device scan ''; + + boot.initrd.systemd.initrdBin = [ pkgs.btrfs-progs ]; }) (mkIf enableAutoScrub { diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix index 0de292a692..837b9e19bf 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/cifs.nix @@ -21,5 +21,7 @@ in copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs ''; + boot.initrd.systemd.extraBin."mount.cifs" = mkIf inInitrd "${pkgs.cifs-utils}/sbin/mount.cifs"; + }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/ext.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/ext.nix index edc0efc552..1c34ee2c70 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/ext.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/ext.nix @@ -25,5 +25,7 @@ in ln -sv e2fsck $out/bin/fsck.ext4 ''; + boot.initrd.systemd.initrdBin = lib.mkIf inInitrd [ pkgs.e2fsprogs ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix index 035784f43d..4f99f9a57f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/f2fs.nix @@ -16,5 +16,7 @@ in boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.f2fs-tools ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix index 6d80c4c657..b5132b4caa 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/jfs.nix @@ -15,5 +15,7 @@ in boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.jfsutils}/sbin/fsck.jfs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.jfsutils ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix index 7b017a83db..3c6a0f0cd9 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/reiserfs.nix @@ -21,5 +21,7 @@ in ln -s reiserfsck $out/bin/fsck.reiserfs ''; + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.reiserfsprogs ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix index 5421b617b4..9281b34633 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/vfat.nix @@ -21,5 +21,7 @@ in ln -sv dosfsck $out/bin/fsck.vfat ''; + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.dosfstools ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix index f81f586465..76f31e660a 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/xfs.nix @@ -26,5 +26,7 @@ in '' sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs ''; + + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.xfsprogs.bin ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 5cf863c87f..4b6a5b6c12 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -90,12 +90,17 @@ let getPoolMounts = prefix: pool: let + poolFSes = getPoolFilesystems pool; + # Remove the "/" suffix because even though most mountpoints # won't have it, the "/" mountpoint will, and we can't have the # trailing slash in "/sysroot/" in stage 1. mountPoint = fs: escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint)); + + hasUsr = lib.any (fs: fs.mountPoint == "/usr") poolFSes; in - map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); + map (x: "${mountPoint x}.mount") poolFSes + ++ lib.optional hasUsr "sysusr-usr.mount"; getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then { hasKeys = cfgZfs.requestEncryptionCredentials; @@ -579,17 +584,17 @@ in boot.initrd = mkIf inInitrd { kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = - '' + mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${cfgZfs.package}/sbin/zfs copy_bin_and_libs ${cfgZfs.package}/sbin/zdb copy_bin_and_libs ${cfgZfs.package}/sbin/zpool ''; - extraUtilsCommandsTest = mkIf inInitrd - '' + extraUtilsCommandsTest = + mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/zfs --help >/dev/null 2>&1 $out/bin/zpool --help >/dev/null 2>&1 ''; - postDeviceCommands = concatStringsSep "\n" (['' + postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) (concatStringsSep "\n" (['' ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" ''] ++ [(importLib { # See comments at importLib definition. @@ -618,10 +623,10 @@ in else concatMapStrings (fs: '' zfs load-key -- ${escapeShellArg fs} '') (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)} - '') rootPools)); + '') rootPools))); # Systemd in stage 1 - systemd = { + systemd = mkIf config.boot.initrd.systemd.enable { packages = [cfgZfs.package]; services = listToAttrs (map (pool: createImportService { inherit pool; @@ -632,7 +637,8 @@ in targets.zfs-import.wantedBy = [ "zfs.target" ]; targets.zfs.wantedBy = [ "initrd.target" ]; extraBin = { - # zpool and zfs are already in thanks to fsPackages + zpool = "${cfgZfs.package}/sbin/zpool"; + zfs = "${cfgZfs.package}/sbin/zfs"; awk = "${pkgs.gawk}/bin/awk"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 67ef152c4b..e1ac7f24cb 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -28,12 +28,12 @@ let SLAVES=$(ip link | grep 'master ${i}' | awk -F: '{print $2}') for I in $SLAVES; do UPDATED=0 - ip link set "$I" nomaster + ip link set dev "$I" nomaster done [ "$UPDATED" -eq "1" ] && break done - ip link set "${i}" down 2>/dev/null || true - ip link del "${i}" 2>/dev/null || true + ip link set dev "${i}" down 2>/dev/null || true + ip link del dev "${i}" 2>/dev/null || true ''; # warn that these attributes are deprecated (2017-2-2) @@ -61,8 +61,6 @@ let MACAddress = i.macAddress; } // optionalAttrs (i.mtu != null) { MTUBytes = toString i.mtu; - } // optionalAttrs (i.wakeOnLan.enable == true) { - WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; }; }; in listToAttrs (map createNetworkLink interfaces); @@ -195,7 +193,7 @@ let state="/run/nixos/network/addresses/${i.name}" mkdir -p $(dirname "$state") - ip link set "${i.name}" up + ip link set dev "${i.name}" up ${flip concatMapStrings ips (ip: let @@ -272,7 +270,7 @@ let ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" ''; postStop = '' - ip link del ${i.name} || true + ip link del dev ${i.name} || true ''; }; @@ -293,15 +291,15 @@ let script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." - ip link show dev "${n}" >/dev/null 2>&1 && ip link del "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link del dev "${n}" echo "Adding bridge ${n}..." ip link add name "${n}" type bridge # Enslave child interfaces ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" master "${n}" - ip link set "${i}" up + ip link set dev "${i}" master "${n}" + ip link set dev "${i}" up '')} # Save list of enslaved interfaces echo "${flip concatMapStrings v.interfaces (i: '' @@ -318,7 +316,7 @@ let for uri in qemu:///system lxc:///; do for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ - ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set dev ',target/@dev,' master ',source/@bridge,';')" | \ ${pkgs.bash}/bin/bash done done @@ -330,23 +328,23 @@ let echo 2 >/sys/class/net/${n}/bridge/stp_state ''} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link set "${n}" down || true - ip link del "${n}" || true + ip link set dev "${n}" down || true + ip link del dev "${n}" || true rm -f /run/${n}.interfaces ''; reload = '' # Un-enslave child interfaces (old list of interfaces) for interface in `cat /run/${n}.interfaces`; do - ip link set "$interface" nomaster up + ip link set dev "$interface" nomaster up done # Enslave child interfaces (new list of interfaces) ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" master "${n}" - ip link set "${i}" up + ip link set dev "${i}" master "${n}" + ip link set dev "${i}" up '')} # Save list of enslaved interfaces echo "${flip concatMapStrings v.interfaces (i: '' @@ -397,7 +395,7 @@ let postStop = '' echo "Cleaning Open vSwitch ${n}" echo "Shutting down internal ${n} interface" - ip link set ${n} down || true + ip link set dev ${n} down || true echo "Deleting flows for ${n}" ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true echo "Deleting Open vSwitch ${n}" @@ -435,10 +433,10 @@ let while [ ! -d "/sys/class/net/${n}" ]; do sleep 0.1; done; # Bring up the bond and enslave the specified interfaces - ip link set "${n}" up + ip link set dev "${n}" up ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" down - ip link set "${i}" master "${n}" + ip link set dev "${i}" down + ip link set dev "${i}" master "${n}" '')} ''; postStop = destroyBond n; @@ -459,13 +457,13 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add link "${v.interface}" name "${n}" type macvlan \ ${optionalString (v.mode != null) "mode ${v.mode}"} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -517,7 +515,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add name "${n}" type sit \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ @@ -528,10 +526,10 @@ let optionalString (v.encapsulation.sourcePort != null) "encap-sport ${toString v.encapsulation.sourcePort}" }"} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -551,16 +549,16 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add name "${n}" type ${v.type} \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "${ttlarg} ${toString v.ttl}"} \ ${optionalString (v.dev != null) "dev \"${v.dev}\""} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -579,17 +577,17 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}" # We try to bring up the logical VLAN interface. If the master # interface the logical interface is dependent upon is not up yet we will # fail to immediately bring up the logical interface. The resulting logical # interface will brought up later when the master interface is up. - ip link set "${n}" up || true + ip link set dev "${n}" up || true ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index 53097e21c6..2009c9a7e6 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -28,18 +28,20 @@ let # TODO: warn the user that any address configured on those interfaces will be useless ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches); - genericNetwork = override: - let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address - ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address; - makeGateway = gateway: { + defaultGateways = mkMerge (forEach [ cfg.defaultGateway cfg.defaultGateway6 ] (gateway: + optionalAttrs (gateway != null && gateway.interface != null) { + networks."40-${gateway.interface}" = { + matchConfig.Name = gateway.interface; + routes = [{ routeConfig = { - Gateway = gateway; - GatewayOnLink = false; + Gateway = gateway.address; + } // optionalAttrs (gateway.metric != null) { + Metric = gateway.metric; }; - }; - in optionalAttrs (gateway != [ ]) { - routes = override (map makeGateway gateway); - }; + }]; + }; + } + )); genericDhcpNetworks = initrd: mkIf cfg.useDHCP { networks."99-ethernet-default-dhcp" = { @@ -86,10 +88,10 @@ let }; }; }); - networks."40-${i.name}" = mkMerge [ (genericNetwork id) { + networks."40-${i.name}" = { name = mkDefault i.name; DHCP = mkForce (dhcpStr - (if i.useDHCP != null then i.useDHCP else false)); + (if i.useDHCP != null then i.useDHCP else (config.networking.useDHCP && i.ipv4.addresses == [ ]))); address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); routes = forEach (interfaceRoutes i) @@ -158,7 +160,7 @@ let } // optionalAttrs (i.mtu != null) { MTUBytes = toString i.mtu; }; - }]; + }; })); bridgeNetworks = mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { @@ -169,10 +171,10 @@ let }; }; networks = listToAttrs (forEach bridge.interfaces (bi: - nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { + nameValuePair "40-${bi}" { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bridge = name; - } ]))); + })); })); vlanNetworks = mkMerge (flip mapAttrsToList cfg.vlans (name: vlan: { @@ -183,9 +185,9 @@ let }; vlanConfig.Id = vlan.id; }; - networks."40-${vlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + networks."40-${vlan.interface}" = { vlan = [ name ]; - } ]); + }; })); in @@ -198,6 +200,7 @@ in # initrd.systemd.network.enable. By setting the latter and not the # former, the user retains full control over the configuration. boot.initrd.systemd.network = mkMerge [ + defaultGateways (genericDhcpNetworks true) interfaceNetworks bridgeNetworks @@ -214,11 +217,11 @@ in assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; } { - assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null; - message = "networking.defaultGateway.interface is not supported by networkd."; + assertion = cfg.defaultGateway != null -> cfg.defaultGateway.interface != null; + message = "networking.defaultGateway.interface is not optional when using networkd."; } { - assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; - message = "networking.defaultGateway6.interface is not supported by networkd."; + assertion = cfg.defaultGateway6 != null -> cfg.defaultGateway6.interface != null; + message = "networking.defaultGateway6.interface is not optional when using networkd."; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; @@ -233,6 +236,7 @@ in mkMerge [ { enable = true; } + defaultGateways (genericDhcpNetworks false) interfaceNetworks bridgeNetworks @@ -302,10 +306,10 @@ in }; networks = listToAttrs (forEach bond.interfaces (bi: - nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { + nameValuePair "40-${bi}" { DHCP = mkOverride 0 (dhcpStr false); networkConfig.Bond = name; - } ]))); + })); }))) (mkMerge (flip mapAttrsToList cfg.macvlans (name: macvlan: { netdevs."40-${name}" = { @@ -315,9 +319,9 @@ in }; macvlanConfig = optionalAttrs (macvlan.mode != null) { Mode = macvlan.mode; }; }; - networks."40-${macvlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + networks."40-${macvlan.interface}" = { macvlan = [ name ]; - } ]); + }; }))) (mkMerge (flip mapAttrsToList cfg.fooOverUDP (name: fou: { netdevs."40-${name}" = { @@ -362,9 +366,9 @@ in }))); }; networks = mkIf (sit.dev != null) { - "40-${sit.dev}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + "40-${sit.dev}" = { tunnel = [ name ]; - } ]); + }; }; }))) (mkMerge (flip mapAttrsToList cfg.greTunnels (name: gre: { @@ -383,9 +387,9 @@ in }); }; networks = mkIf (gre.dev != null) { - "40-${gre.dev}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + "40-${gre.dev}" = { tunnel = [ name ]; - } ]); + }; }; }))) vlanNetworks @@ -438,7 +442,7 @@ in postStop = '' echo "Cleaning Open vSwitch ${n}" echo "Shutting down internal ${n} interface" - ip link set ${n} down || true + ip link set dev ${n} down || true echo "Deleting flows for ${n}" ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true echo "Deleting Open vSwitch ${n}" diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index fe77a44459..298add1343 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -190,9 +190,11 @@ let type = types.nullOr types.bool; default = null; description = lib.mdDoc '' - Whether this interface should be configured with dhcp. - Null implies the old behavior which depends on whether ip addresses - are specified or not. + Whether this interface should be configured with DHCP. Overrides the + default set by {option}`networking.useDHCP`. If `null` (the default), + DHCP is enabled if the interface has no IPv4 addresses configured + with {option}`networking.interfaces..ipv4.addresses`, and + disabled otherwise. ''; }; @@ -496,7 +498,7 @@ in option will result in an evaluation error if the hostname is empty or no domain is specified. - Modules that accept a mere `networing.hostName` but prefer a fully qualified + Modules that accept a mere `networking.hostName` but prefer a fully qualified domain name may use `networking.fqdnOrHostName` instead. ''; }; @@ -640,9 +642,7 @@ in } ]; }; description = lib.mdDoc '' - The configuration for each network interface. If - {option}`networking.useDHCP` is true, then every - interface not listed here will be configured using DHCP. + The configuration for each network interface. Please note that {option}`systemd.network.netdevs` has more features and is better maintained. When building new things, it is advised to @@ -1304,8 +1304,8 @@ in default = true; description = lib.mdDoc '' Whether to use DHCP to obtain an IP address and other - configuration for all network interfaces that are not manually - configured. + configuration for all network interfaces that do not have any manually + configured IPv4 addresses. ''; }; @@ -1344,7 +1344,10 @@ in config = { - warnings = concatMap (i: i.warnings) interfaces; + warnings = (concatMap (i: i.warnings) interfaces) ++ (lib.optional + (config.systemd.network.enable && cfg.useDHCP && !cfg.useNetworkd) '' + The combination of `systemd.network.enable = true`, `networking.useDHCP = true` and `networking.useNetworkd = false` can cause both networkd and dhcpcd to manage the same interfaces. This can lead to loss of networking. It is recommended you choose only one of networkd (by also enabling `networking.useNetworkd`) or scripting (by disabling `systemd.network.enable`) + ''); assertions = (forEach interfaces (i: { @@ -1403,40 +1406,12 @@ in val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val)); - security.wrappers = { - ping = { - owner = "root"; - group = "root"; - capabilities = "cap_net_raw+p"; - source = "${pkgs.iputils.out}/bin/ping"; - }; + systemd.services.domainname = lib.mkIf (cfg.domain != null) { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.ExecStart = ''${pkgs.nettools}/bin/domainname "${cfg.domain}"''; }; - security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' - /run/wrappers/bin/ping { - include - include - rpx /run/wrappers/wrappers.*/ping, - } - /run/wrappers/wrappers.*/ping { - include - include - capability net_raw, - capability setpcap, - } - ''); - - # Set the host and domain names in the activation script. Don't - # clear it if it's not configured in the NixOS configuration, - # since it may have been set by dhcpcd in the meantime. - system.activationScripts.hostname = let - effectiveHostname = config.boot.kernel.sysctl."kernel.hostname" or cfg.hostName; - in optionalString (effectiveHostname != "") '' - hostname "${effectiveHostname}" - ''; - system.activationScripts.domain = - optionalString (cfg.domain != null) '' - domainname "${cfg.domain}" - ''; environment.etc.hostid = mkIf (cfg.hostId != null) { source = hostidFile; }; boot.initrd.systemd.contents."/etc/hostid" = mkIf (cfg.hostId != null) { source = hostidFile; }; @@ -1460,6 +1435,16 @@ in ] ++ bridgeStp; + # Wake-on-LAN configuration is shared by the scripted and networkd backends. + systemd.network.links = pipe interfaces [ + (filter (i: i.wakeOnLan.enable)) + (map (i: nameValuePair "40-${i.name}" { + matchConfig.OriginalName = i.name; + linkConfig.WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; + })) + listToAttrs + ]; + # The network-interfaces target is kept for backwards compatibility. # New modules must NOT use it. systemd.targets.network-interfaces = diff --git a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix index 61b3682e0f..249755bc05 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix @@ -62,13 +62,13 @@ in { cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ ''; - extraUtilsCommands = '' + extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon ''; - extraUtilsCommandsTest = '' + extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/mdadm --version ''; diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 6dc4091bad..9ee77cd79a 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -6,49 +6,124 @@ with lib; let + cfg = config.testing; + qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; + + backdoorService = { + requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + script = + '' + export USER=root + export HOME=/root + export DISPLAY=:0.0 + + if [[ -e /etc/profile ]]; then + source /etc/profile + fi + + # Don't use a pager when executing backdoor + # actions. Because we use a tty, commands like systemctl + # or nix-store get confused into thinking they're running + # interactively. + export PAGER= + + cd /tmp + exec < /dev/hvc0 > /dev/hvc0 + while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done + echo "connecting to host..." >&2 + stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion + # The following line is essential since it signals to + # the test driver that the shell is ready. + # See: the connect method in the Machine class. + echo "Spawning backdoor root shell..." + # Passing the terminal device makes bash run non-interactively. + # Otherwise we get errors on the terminal because bash tries to + # setup things like job control. + # Note: calling bash explicitly here instead of sh makes sure that + # we can also run non-NixOS guests during tests. + PS1= exec /usr/bin/env bash --norc /dev/hvc0 + ''; + serviceConfig.KillSignal = "SIGHUP"; + }; + in { + options.testing = { + + initrdBackdoor = lib.mkEnableOption (lib.mdDoc '' + enable backdoor.service in initrd. Requires + boot.initrd.systemd.enable to be enabled. Boot will pause in + stage 1 at initrd.target, and will listen for commands from the + Machine python interface, just like stage 2 normally does. This + enables commands to be sent to test and debug stage 1. Use + machine.switch_root() to leave stage 1 and proceed to stage 2. + ''); + + }; + config = { - systemd.services.backdoor = - { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - script = - '' - export USER=root - export HOME=/root - export DISPLAY=:0.0 + assertions = [ + { + assertion = cfg.initrdBackdoor -> config.boot.initrd.systemd.enable; + message = '' + testing.initrdBackdoor requires boot.initrd.systemd.enable to be enabled. + ''; + } + ]; - source /etc/profile + systemd.services.backdoor = lib.mkMerge [ + backdoorService + { + wantedBy = [ "multi-user.target" ]; + } + ]; - # Don't use a pager when executing backdoor - # actions. Because we use a tty, commands like systemctl - # or nix-store get confused into thinking they're running - # interactively. - export PAGER= + boot.initrd.systemd = lib.mkMerge [ + { + contents."/etc/systemd/journald.conf".text = '' + [Journal] + ForwardToConsole=yes + MaxLevelConsole=debug + ''; - cd /tmp - exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done - echo "connecting to host..." >&2 - stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion - # The following line is essential since it signals to - # the test driver that the shell is ready. - # See: the connect method in the Machine class. - echo "Spawning backdoor root shell..." - # Passing the terminal device makes bash run non-interactively. - # Otherwise we get errors on the terminal because bash tries to - # setup things like job control. - # Note: calling bash explicitly here instead of sh makes sure that - # we can also run non-NixOS guests during tests. - PS1= exec /usr/bin/env bash --norc /dev/hvc0 - ''; - serviceConfig.KillSignal = "SIGHUP"; - }; + extraConfig = config.systemd.extraConfig; + } + + (lib.mkIf cfg.initrdBackdoor { + # Implemented in machine.switch_root(). Suppress the unit by + # making it a noop without removing it, which would break + # initrd-parse-etc.service + services.initrd-cleanup.serviceConfig.ExecStart = [ + # Reset + "" + # noop + "/bin/true" + ]; + + services.backdoor = lib.mkMerge [ + backdoorService + { + # TODO: Both stage 1 and stage 2 should use these same + # settings. But a lot of existing tests rely on + # backdoor.service having default orderings, + # e.g. systemd-boot.update relies on /boot being mounted + # as soon as backdoor starts. But it can be useful for + # backdoor to start even earlier. + wantedBy = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; + before = [ "shutdown.target" "initrd-switch-root.target" ]; + } + ]; + + contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env"; + }) + ]; # Prevent agetty from being instantiated on the serial device, since it # interferes with the backdoor (writes to it will randomly fail @@ -104,12 +179,6 @@ in MaxLevelConsole=debug ''; - boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = '' - [Journal] - ForwardToConsole=yes - MaxLevelConsole=debug - ''; - systemd.extraConfig = '' # Don't clobber the console with duplicate systemd messages. ShowStatus=no @@ -123,12 +192,10 @@ in DefaultDeviceTimeoutSec=300 ''; - boot.initrd.systemd.extraConfig = config.systemd.extraConfig; - boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. - networking.defaultGateway = mkOverride 150 ""; + networking.defaultGateway = mkOverride 150 null; networking.nameservers = mkOverride 150 [ ]; system.requiredKernelConfig = with config.lib.kernelConfig; [ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix index 6e6021cf80..e712fac17a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/azure-agent.nix @@ -61,7 +61,7 @@ in # Which provisioning agent to use. Supported values are "auto" (default), "waagent", # "cloud-init", or "disabled". - Provisioning.Agent=disabled + Provisioning.Agent=auto # Password authentication for root account will be unavailable. Provisioning.DeleteRootPassword=n @@ -241,7 +241,16 @@ in after = [ "network-online.target" "sshd.service" ]; wants = [ "network-online.target" ]; - path = [ pkgs.e2fsprogs pkgs.bash ]; + path = [ + pkgs.e2fsprogs + pkgs.bash + + # waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3 + pkgs.python39 + + # waagent's Microsoft.CPlat.Core.RunCommandLinux needs lsof + pkgs.lsof + ]; description = "Windows Azure Agent Service"; unitConfig.ConditionPathExists = "/etc/waagent.conf"; serviceConfig = { @@ -250,5 +259,10 @@ in }; }; + # waagent will generate files under /etc/sudoers.d during provisioning + security.sudo.extraConfig = '' + #includedir /etc/sudoers.d + ''; + }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix index 39c6cab598..d909680cca 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix @@ -37,42 +37,5 @@ in inherit config lib pkgs; }; - # Azure metadata is available as a CD-ROM drive. - fileSystems."/metadata".device = "/dev/sr0"; - - systemd.services.fetch-ssh-keys = { - description = "Fetch host keys and authorized_keys for root user"; - - wantedBy = [ "sshd.service" "waagent.service" ]; - before = [ "sshd.service" "waagent.service" ]; - - path = [ pkgs.coreutils ]; - script = - '' - eval "$(cat /metadata/CustomData.bin)" - if ! [ -z "$ssh_host_ecdsa_key" ]; then - echo "downloaded ssh_host_ecdsa_key" - echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key - chmod 600 /etc/ssh/ssh_host_ed25519_key - fi - - if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then - echo "downloaded ssh_host_ecdsa_key_pub" - echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub - chmod 644 /etc/ssh/ssh_host_ed25519_key.pub - fi - - if ! [ -z "$ssh_root_auth_key" ]; then - echo "downloaded ssh_root_auth_key" - mkdir -m 0700 -p /root/.ssh - echo "$ssh_root_auth_key" > /root/.ssh/authorized_keys - chmod 600 /root/.ssh/authorized_keys - fi - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.StandardError = "journal+console"; - serviceConfig.StandardOutput = "journal+console"; - }; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix index 3c503f027d..887af26949 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix @@ -84,6 +84,10 @@ in { groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } ]; + security.sudo-rs.extraRules = mkIf config.users.mutableUsers [ + { groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } + ]; + users.groups.google-sudoers = mkIf config.users.mutableUsers { }; boot.extraModprobeConfig = readFile "${pkgs.google-guest-configs}/etc/modprobe.d/gce-blacklist.conf"; 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 197ebb18b9..dcdd1b59ee 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix @@ -44,10 +44,17 @@ in GZIP compression level of the resulting disk image (1-9). ''; }; + virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting"; }; #### implementation config = { + boot.initrd.availableKernelModules = [ "nvme" ]; + boot.loader.grub = mkIf cfg.efi { + device = mkForce "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -62,6 +69,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 lib pkgs; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix new file mode 100644 index 0000000000..3a4f0d7157 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/incus.nix @@ -0,0 +1,236 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.virtualisation.incus; + preseedFormat = pkgs.formats.yaml { }; +in +{ + meta.maintainers = [ lib.maintainers.adamcstephens ]; + + options = { + virtualisation.incus = { + enable = lib.mkEnableOption (lib.mdDoc '' + incusd, a daemon that manages containers and virtual machines. + + Users in the "incus-admin" group can interact with + the daemon (e.g. to start or stop containers) using the + {command}`incus` command line tool, among others. + ''); + + package = lib.mkPackageOptionMD pkgs "incus" { }; + + lxcPackage = lib.mkPackageOptionMD pkgs "lxc" { }; + + preseed = lib.mkOption { + type = lib.types.nullOr ( + lib.types.submodule { freeformType = preseedFormat.type; } + ); + + default = null; + + description = lib.mdDoc '' + Configuration for Incus preseed, see + + for supported values. + + Changes to this will be re-applied to Incus which will overwrite existing entities or create missing ones, + but entities will *not* be removed by preseed. + ''; + + example = { + networks = [ + { + name = "incusbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "incusbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "default"; + driver = "dir"; + config = { + source = "/var/lib/incus/storage-pools/default"; + }; + } + ]; + }; + }; + + socketActivation = lib.mkEnableOption ( + lib.mdDoc '' + socket-activation for starting incus.service. Enabling this option + will stop incus.service from starting automatically on boot. + '' + ); + + startTimeout = lib.mkOption { + type = lib.types.ints.unsigned; + default = 600; + apply = toString; + description = lib.mdDoc '' + Time to wait (in seconds) for incusd to become ready to process requests. + If incusd does not reply within the configured time, `incus.service` will be + considered failed and systemd will attempt to restart it. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + # https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md + boot.kernel.sysctl = { + "fs.aio-max-nr" = lib.mkDefault 524288; + "fs.inotify.max_queued_events" = lib.mkDefault 1048576; + "fs.inotify.max_user_instances" = lib.mkOverride 1050 1048576; # override in case conflict nixos/modules/services/x11/xserver.nix + "fs.inotify.max_user_watches" = lib.mkOverride 1050 1048576; # override in case conflict nixos/modules/services/x11/xserver.nix + "kernel.dmesg_restrict" = lib.mkDefault 1; + "kernel.keys.maxbytes" = lib.mkDefault 2000000; + "kernel.keys.maxkeys" = lib.mkDefault 2000; + "net.core.bpf_jit_limit" = lib.mkDefault 1000000000; + "net.ipv4.neigh.default.gc_thresh3" = lib.mkDefault 8192; + "net.ipv6.neigh.default.gc_thresh3" = lib.mkDefault 8192; + # vm.max_map_count is set higher in nixos/modules/config/sysctl.nix + }; + + boot.kernelModules = [ + "veth" + "xt_comment" + "xt_CHECKSUM" + "xt_MASQUERADE" + "vhost_vsock" + ] ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ]; + + environment.systemPackages = [ cfg.package ]; + + # Note: the following options are also declared in virtualisation.lxc, but + # the latter can't be simply enabled to reuse the formers, because it + # does a bunch of unrelated things. + systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; + + security.apparmor = { + packages = [ cfg.lxcPackage ]; + policies = { + "bin.lxc-start".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers + ''; + }; + }; + + systemd.services.incus = { + description = "Incus Container and Virtual Machine Management Daemon"; + + wantedBy = lib.mkIf (!cfg.socketActivation) [ "multi-user.target" ]; + after = [ + "network-online.target" + "lxcfs.service" + ] ++ (lib.optional cfg.socketActivation "incus.socket"); + requires = [ + "lxcfs.service" + ] ++ (lib.optional cfg.socketActivation "incus.socket"); + wants = [ + "network-online.target" + ]; + + path = lib.mkIf config.boot.zfs.enabled [ config.boot.zfs.package ]; + + environment = { + # Override Path to the LXC template configuration directory + INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; + ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; + ExecStop = "${cfg.package}/bin/incus admin shutdown"; + + KillMode = "process"; # when stopping, leave the containers alone + Delegate = "yes"; + LimitMEMLOCK = "infinity"; + LimitNOFILE = "1048576"; + LimitNPROC = "infinity"; + TasksMax = "infinity"; + + Restart = "on-failure"; + TimeoutStartSec = "${cfg.startTimeout}s"; + TimeoutStopSec = "30s"; + }; + }; + + systemd.sockets.incus = lib.mkIf cfg.socketActivation { + description = "Incus UNIX socket"; + wantedBy = [ "sockets.target" ]; + + socketConfig = { + ListenStream = "/var/lib/incus/unix.socket"; + SocketMode = "0660"; + SocketGroup = "incus-admin"; + Service = "incus.service"; + }; + }; + + systemd.services.incus-preseed = lib.mkIf (cfg.preseed != null) { + description = "Incus initialization with preseed file"; + + wantedBy = ["incus.service"]; + after = ["incus.service"]; + bindsTo = ["incus.service"]; + partOf = ["incus.service"]; + + script = '' + ${cfg.package}/bin/incus admin init --preseed <${ + preseedFormat.generate "incus-preseed.yaml" cfg.preseed + } + ''; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + + users.groups.incus-admin = { }; + + users.users.root = { + # match documented default ranges https://linuxcontainers.org/incus/docs/main/userns-idmap/#allowed-ranges + subUidRanges = [ + { + startUid = 1000000; + count = 1000000000; + } + ]; + subGidRanges = [ + { + startGid = 1000000; + count = 1000000000; + } + ]; + }; + + virtualisation.lxc.lxcfs.enable = true; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix index 9402d3bf37..61d7c4cb73 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix @@ -9,15 +9,16 @@ in { options = { virtualisation.lxc = { - privilegedContainer = lib.mkOption { - type = lib.types.bool; - default = false; - description = lib.mdDoc '' - Whether this LXC container will be running as a privileged container or not. If set to `true` then - additional configuration will be applied to the `systemd` instance running within the container as - recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). - ''; - }; + nestedContainer = lib.mkEnableOption (lib.mdDoc '' + Whether this container is configured as a nested container. On LXD containers this is recommended + for all containers and is enabled with `security.nesting = true`. + ''); + + privilegedContainer = lib.mkEnableOption (lib.mdDoc '' + Whether this LXC container will be running as a privileged container or not. If set to `true` then + additional configuration will be applied to the `systemd` instance running within the container as + recommended by [distrobuilder](https://linuxcontainers.org/distrobuilder/introduction/). + ''); }; }; @@ -36,7 +37,6 @@ in { ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - # TODO: build rootfs as squashfs for faster unpack system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { extraArgs = "--owner=0"; @@ -63,11 +63,30 @@ in { extraCommands = "mkdir -p proc sys dev"; }; + system.build.squashfs = pkgs.callPackage ../../lib/make-squashfs.nix { + fileName = "nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}"; + + noStrip = true; # keep directory structure + comp = "zstd -Xcompression-level 6"; + + storeContents = [config.system.build.toplevel]; + + pseudoFiles = [ + "/sbin d 0755 0 0" + "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init" + "/dev d 0755 0 0" + "/proc d 0555 0 0" + "/sys d 0555 0 0" + ]; + }; + system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" '' #!${pkgs.runtimeShell} - ln -fs "$1/init" /sbin/init + ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init ''; + systemd.additionalUpstreamSystemUnits = lib.mkIf cfg.nestedContainer ["systemd-udev-trigger.service"]; + # Add the overrides from lxd distrobuilder # https://github.com/lxc/distrobuilder/blob/05978d0d5a72718154f1525c7d043e090ba7c3e0/distrobuilder/main.go#L630 systemd.packages = [ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index e30fbebb66..6f628c4a6e 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -145,9 +145,7 @@ in { }; ui = { - enable = lib.mkEnableOption (lib.mdDoc '' - Enables the (experimental) LXD UI. - ''); + enable = lib.mkEnableOption (lib.mdDoc "(experimental) LXD UI"); package = lib.mkPackageOption pkgs.lxd-unwrapped "ui" { }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index 5df9942dbc..6fdb177b96 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -649,6 +649,15 @@ in ''; }; + restartIfChanged = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether the container should be restarted during a NixOS + configuration switch if its definition has changed. + ''; + }; + timeoutStartSec = mkOption { type = types.str; default = "1min"; @@ -745,7 +754,7 @@ in { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql_14; - system.stateVersion = "21.05"; + system.stateVersion = "${lib.trivial.release}"; }; }; } @@ -826,7 +835,7 @@ in containerConfig.path config.environment.etc."${configurationDirectoryName}/${name}.conf".source ]; - restartIfChanged = true; + restartIfChanged = containerConfig.restartIfChanged; } ) )) config.containers) @@ -897,4 +906,6 @@ in "tun" ]; }); + + meta.buildDocsInSandbox = false; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index 71f5d7a752..a4a40346f0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -214,6 +214,13 @@ let ''; }; + hostname = mkOption { + type = with types; nullOr str; + default = null; + description = lib.mdDoc "The hostname of the container."; + example = "hello-world"; + }; + extraOptions = mkOption { type = with types; listOf str; default = []; @@ -239,6 +246,25 @@ let mkService = name: container: let dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; escapedName = escapeShellArg name; + preStartScript = pkgs.writeShellApplication { + name = "pre-start"; + runtimeInputs = [ ]; + text = '' + ${cfg.backend} rm -f ${name} || true + ${optionalString (isValidLogin container.login) '' + ${cfg.backend} login \ + ${container.login.registry} \ + --username ${container.login.username} \ + --password-stdin < ${container.login.passwordFile} + ''} + ${optionalString (container.imageFile != null) '' + ${cfg.backend} load -i ${container.imageFile} + ''} + ${optionalString (cfg.backend == "podman") '' + rm -f /run/podman-${escapedName}.ctr-id + ''} + ''; + }; in { wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] @@ -253,23 +279,6 @@ let else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] else throw "Unhandled backend: ${cfg.backend}"; - preStart = '' - ${cfg.backend} rm -f ${name} || true - ${optionalString (isValidLogin container.login) '' - cat ${container.login.passwordFile} | \ - ${cfg.backend} login \ - ${container.login.registry} \ - --username ${container.login.username} \ - --password-stdin - ''} - ${optionalString (container.imageFile != null) '' - ${cfg.backend} load -i ${container.imageFile} - ''} - ${optionalString (cfg.backend == "podman") '' - rm -f /run/podman-${escapedName}.ctr-id - ''} - ''; - script = concatStringsSep " \\\n " ([ "exec ${cfg.backend} run" "--rm" @@ -277,6 +286,8 @@ let "--log-driver=${container.log-driver}" ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" + ++ optional (container.hostname != null) + "--hostname=${escapeShellArg container.hostname}" ++ lib.optionals (cfg.backend == "podman") [ "--cidfile=/run/podman-${escapedName}.ctr-id" "--cgroups=no-conmon" @@ -318,7 +329,7 @@ let ### # ExecReload = ...; ### - + ExecStartPre = [ "${preStartScript}/bin/pre-start" ]; TimeoutStartSec = 0; TimeoutStopSec = 120; Restart = "always"; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index e0004df6f6..6f275baf60 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -198,6 +198,39 @@ let 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"} @@ -267,6 +300,7 @@ let }; storeImage = import ../../lib/make-disk-image.nix { + name = "nix-store-image"; inherit pkgs config lib; additionalPaths = [ regInfo ]; format = "qcow2"; @@ -656,8 +690,8 @@ in package = mkOption { type = types.package; - default = hostPkgs.qemu_kvm; - defaultText = literalExpression "config.virtualisation.host.pkgs.qemu_kvm"; + 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 = lib.mdDoc "QEMU package to use."; }; @@ -862,6 +896,32 @@ in }; }; + virtualisation.tpm = { + enable = mkEnableOption "a TPM device in the virtual machine with a driver, using swtpm."; + + package = mkPackageOptionMD cfg.host.pkgs "swtpm" { }; + + 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.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); + defaultText = '' + Based on the guest platform Linux system: + + - `tpm-tis` for (i686, x86_64) + - `tpm-spapr` for ppc64 + - `tpm-tis-device` for (armv7, aarch64) + ''; + example = "tpm-tis-device"; + description = lib.mdDoc "QEMU device model for the TPM, uses the appropriate default based on th guest platform system and the package passed."; + }; + }; + virtualisation.useDefaultFilesystems = mkOption { type = types.bool; @@ -937,7 +997,7 @@ in virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. ''; } - { assertion = cfg.directBoot.initrd != options.virtualisation.directBoot.initrd.default -> cfg.directBoot.enable; + { 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 @@ -1027,7 +1087,8 @@ in boot.initrd.availableKernelModules = optional cfg.writableStore "overlay" - ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; + ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" + ++ optional (cfg.tpm.enable) "tpm_tis"; virtualisation.additionalPaths = [ config.system.build.toplevel ]; @@ -1098,6 +1159,11 @@ in (mkIf (!cfg.graphics) [ "-nographic" ]) + (mkIf (cfg.tpm.enable) [ + "-chardev socket,id=chrtpm,path=\"$NIX_SWTPM_DIR\"/socket" + "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" + "-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0" + ]) ]; virtualisation.qemu.drives = mkMerge [ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/vagrant-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/vagrant-guest.nix index 263b1ebca0..2fad376086 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/vagrant-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/vagrant-guest.nix @@ -55,4 +55,5 @@ in }; security.sudo.wheelNeedsPassword = false; + security.sudo-rs.wheelNeedsPassword = false; } diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 29dcdab7d1..9b4b92be6f 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -67,10 +67,19 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.docker") (onFullSupported "nixos.tests.ecryptfs") (onFullSupported "nixos.tests.env") - (onFullSupported "nixos.tests.firefox-esr") - (onFullSupported "nixos.tests.firefox") + + # Way too many manual retries required on Hydra. + # Apparently it's hard to track down the cause. + # So let's depend just on the packages for now. + #(onFullSupported "nixos.tests.firefox-esr") + #(onFullSupported "nixos.tests.firefox") + # Note: only -unwrapped variants have a Hydra job. + (onFullSupported "nixpkgs.firefox-esr-unwrapped") + (onFullSupported "nixpkgs.firefox-unwrapped") + (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") + (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") @@ -88,6 +97,8 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.simple") (onSystems ["x86_64-linux"] "nixos.tests.installer.swraid") + (onSystems ["x86_64-linux"] "nixos.tests.installer.zfsroot") + (onSystems ["x86_64-linux"] "nixos.tests.nixos-rebuild-specialisations") (onFullSupported "nixos.tests.ipv6") (onFullSupported "nixos.tests.keymap.azerty") (onFullSupported "nixos.tests.keymap.colemak") @@ -154,7 +165,6 @@ in rec { (onFullSupported "nixos.tests.switchTest") (onFullSupported "nixos.tests.udisks2") (onFullSupported "nixos.tests.xfce") - (onSystems ["i686-linux"] "nixos.tests.zfs.installer") (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") ["nixpkgs.tarball"] diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index abaa7ef9a7..2acc5ade78 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -123,7 +123,7 @@ let build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target; in - pkgs.symlinkJoin { + configEvaled.pkgs.symlinkJoin { name = "netboot"; paths = [ build.netbootRamdisk @@ -328,6 +328,21 @@ in rec { ); + lxdContainerImageSquashfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-container-image.nix + ]; + }).config.system.build.squashfs) + + ); + # Metadata for the lxd image lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: @@ -383,7 +398,7 @@ in rec { modules = singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = mkDefault lib.trivial.release; }); }).config.system.build.toplevel; preferLocalBuild = true; diff --git a/third_party/nixpkgs/nixos/tests/activation/nix-channel.nix b/third_party/nixpkgs/nixos/tests/activation/nix-channel.nix new file mode 100644 index 0000000000..d26ea98e56 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/activation/nix-channel.nix @@ -0,0 +1,26 @@ +{ lib, ... }: + +{ + + name = "activation-nix-channel"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { + nix.channel.enable = true; + }; + + testScript = { nodes, ... }: '' + machine.start(allow_reboot=True) + + assert machine.succeed("cat /root/.nix-channels") == "${nodes.machine.system.defaultChannel} nixos\n" + + nixpkgs_unstable_channel = "https://nixos.org/channels/nixpkgs-unstable nixpkgs" + machine.succeed(f"echo '{nixpkgs_unstable_channel}' > /root/.nix-channels") + + machine.reboot() + + assert machine.succeed("cat /root/.nix-channels") == f"{nixpkgs_unstable_channel}\n" + ''; + +} diff --git a/third_party/nixpkgs/nixos/tests/activation/var.nix b/third_party/nixpkgs/nixos/tests/activation/var.nix new file mode 100644 index 0000000000..1a546a7671 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/activation/var.nix @@ -0,0 +1,18 @@ +{ lib, ... }: + +{ + + name = "activation-var"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { }; + + testScript = '' + assert machine.succeed("stat -c '%a' /var/tmp") == "1777\n" + assert machine.succeed("stat -c '%a' /var/empty") == "555\n" + assert machine.succeed("stat -c '%U' /var/empty") == "root\n" + assert machine.succeed("stat -c '%G' /var/empty") == "root\n" + assert "i" in machine.succeed("lsattr -d /var/empty") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index da788cc159..6c127efa4c 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -90,6 +90,14 @@ in { lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {}; node-name = runTest ./nixos-test-driver/node-name.nix; busybox = runTest ./nixos-test-driver/busybox.nix; + driver-timeout = pkgs.runCommand "ensure-timeout-induced-failure" { + failed = pkgs.testers.testBuildFailure ((runTest ./nixos-test-driver/timeout.nix).config.rawTestDerivation); + } '' + grep -F "timeout reached; test terminating" $failed/testBuildFailure.log + # The program will always be terminated by SIGTERM (143) if it waits for the deadline thread. + [[ 143 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + ''; }; # NixOS vm tests and non-vm unit tests @@ -116,6 +124,7 @@ in { apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; + archi = handleTest ./archi.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; @@ -153,6 +162,7 @@ in { budgie = handleTest ./budgie.nix {}; buildbot = handleTest ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; + c2fmzq = handleTest ./c2fmzq.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTest ./cage.nix {}; @@ -216,6 +226,7 @@ in { darling = handleTest ./darling.nix {}; dae = handleTest ./dae.nix {}; dconf = handleTest ./dconf.nix {}; + deconz = handleTest ./deconz.nix {}; deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; @@ -247,6 +258,7 @@ in { ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; fscrypt = handleTest ./fscrypt.nix {}; + fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {}; @@ -263,6 +275,8 @@ in { esphome = handleTest ./esphome.nix {}; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; activation = pkgs.callPackage ../modules/system/activation/test.nix { }; + activation-var = runTest ./activation/var.nix; + activation-nix-channel = runTest ./activation/nix-channel.nix; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; @@ -271,9 +285,11 @@ in { fail2ban = handleTest ./fail2ban.nix { }; fakeroute = handleTest ./fakeroute.nix {}; fancontrol = handleTest ./fancontrol.nix {}; + fanout = handleTest ./fanout.nix {}; fcitx5 = handleTest ./fcitx5 {}; fenics = handleTest ./fenics.nix {}; ferm = handleTest ./ferm.nix {}; + ferretdb = handleTest ./ferretdb.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; @@ -284,12 +300,14 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; forgejo = handleTest ./forgejo.nix { }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; + freetube = discoverTests (import ./freetube.nix); freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frigate = handleTest ./frigate.nix {}; @@ -323,6 +341,7 @@ in { gollum = handleTest ./gollum.nix {}; gonic = handleTest ./gonic.nix {}; google-oslogin = handleTest ./google-oslogin {}; + goss = handleTest ./goss.nix {}; gotify-server = handleTest ./gotify-server.nix {}; gotosocial = runTest ./web-apps/gotosocial.nix; grafana = handleTest ./grafana {}; @@ -330,6 +349,7 @@ in { graphite = handleTest ./graphite.nix {}; graylog = handleTest ./graylog.nix {}; grocy = handleTest ./grocy.nix {}; + grow-partition = runTest ./grow-partition.nix; grub = handleTest ./grub.nix {}; guacamole-server = handleTest ./guacamole-server.nix {}; gvisor = handleTest ./gvisor.nix {}; @@ -353,6 +373,7 @@ in { honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; + livebook-service = handleTest ./livebook-service.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; @@ -374,6 +395,7 @@ in { icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; incron = handleTest ./incron.nix {}; + incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; }); influxdb = handleTest ./influxdb.nix {}; influxdb2 = handleTest ./influxdb2.nix {}; initrd-network-openvpn = handleTest ./initrd-network-openvpn {}; @@ -424,14 +446,16 @@ in { ksm = handleTest ./ksm.nix {}; kthxbye = handleTest ./kthxbye.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; - kubo = runTest ./kubo.nix; + kubo = import ./kubo { inherit recurseIntoAttrs runTest; }; ladybird = handleTest ./ladybird.nix {}; languagetool = handleTest ./languagetool.nix {}; + lanraragi = handleTest ./lanraragi.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; lemmy = handleTest ./lemmy.nix {}; libinput = handleTest ./libinput.nix {}; libreddit = handleTest ./libreddit.nix {}; + librenms = handleTest ./librenms.nix {}; libresprite = handleTest ./libresprite.nix {}; libreswan = handleTest ./libreswan.nix {}; librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; }; @@ -551,10 +575,10 @@ in { nginx-njs = handleTest ./nginx-njs.nix {}; nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; - nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; + nginx-unix-socket = handleTest ./nginx-unix-socket.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; @@ -563,11 +587,13 @@ in { nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; - nixos-rebuild-specialisations = handleTest ./nixos-rebuild-specialisations.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 {}; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; non-default-filesystems = handleTest ./non-default-filesystems.nix {}; + non-switchable-system = runTest ./non-switchable-system.nix; noto-fonts = handleTest ./noto-fonts.nix {}; noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; @@ -631,6 +657,7 @@ in { phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; + plantuml-server = handleTest ./plantuml-server.nix {}; plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; plasma5 = handleTest ./plasma5.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; @@ -660,7 +687,6 @@ in { predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; - privacyidea = handleTest ./privacyidea.nix {}; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; @@ -693,8 +719,10 @@ in { restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; retroarch = handleTest ./retroarch.nix {}; + rkvm = handleTest ./rkvm {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; + rosenpass = handleTest ./rosenpass.nix {}; rshim = handleTest ./rshim.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; @@ -728,6 +756,7 @@ in { snapper = handleTest ./snapper.nix {}; snipe-it = runTest ./web-apps/snipe-it.nix; soapui = handleTest ./soapui.nix {}; + soft-serve = handleTest ./soft-serve.nix {}; sogo = handleTest ./sogo.nix {}; solanum = handleTest ./solanum.nix {}; sonarr = handleTest ./sonarr.nix {}; @@ -736,8 +765,9 @@ in { spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; - sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; - sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; + ssh-audit = handleTest ./ssh-audit.nix {}; + sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix {}; + sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix {}; stalwart-mail = handleTest ./stalwart-mail.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; @@ -757,6 +787,7 @@ in { syncthing = handleTest ./syncthing.nix {}; syncthing-no-settings = handleTest ./syncthing-no-settings.nix {}; syncthing-init = handleTest ./syncthing-init.nix {}; + syncthing-many-devices = handleTest ./syncthing-many-devices.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; @@ -805,6 +836,7 @@ in { systemd-userdbd = handleTest ./systemd-userdbd.nix {}; systemd-homed = handleTest ./systemd-homed.nix {}; tandoor-recipes = handleTest ./tandoor-recipes.nix {}; + tang = handleTest ./tang.nix {}; taskserver = handleTest ./taskserver.nix {}; tayga = handleTest ./tayga.nix {}; teeworlds = handleTest ./teeworlds.nix {}; @@ -819,6 +851,7 @@ in { timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; + tinyproxy = handleTest ./tinyproxy.nix {}; tinywl = handleTest ./tinywl.nix {}; tmate-ssh-server = handleTest ./tmate-ssh-server.nix { }; tomcat = handleTest ./tomcat.nix {}; @@ -832,6 +865,7 @@ in { trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; + tsja = handleTest ./tsja.nix {}; tsm-client-gui = handleTest ./tsm-client-gui.nix {}; txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; @@ -855,8 +889,7 @@ in { uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; }; - varnish72 = handleTest ./varnish.nix { package = pkgs.varnish72; }; - varnish73 = handleTest ./varnish.nix { package = pkgs.varnish73; }; + varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; }; vault = handleTest ./vault.nix {}; vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; @@ -903,4 +936,5 @@ in { zram-generator = handleTest ./zram-generator.nix {}; zrepl = handleTest ./zrepl.nix {}; zsh-history = handleTest ./zsh-history.nix {}; + zwave-js = handleTest ./zwave-js.nix {}; } diff --git a/third_party/nixpkgs/nixos/tests/archi.nix b/third_party/nixpkgs/nixos/tests/archi.nix new file mode 100644 index 0000000000..59f2e940c0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/archi.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "archi"; + meta.maintainers = with lib.maintainers; [ paumr ]; + + nodes.machine = { pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + environment.systemPackages = with pkgs; [ archi ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("createEmptyModel via CLI"): + machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate") + machine.copy_from_vm("smoke.archimate", "") + + with subtest("UI smoketest"): + machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &") + machine.wait_for_window("Archi") + + # wait till main UI is open + machine.wait_for_text("Welcome to Archi") + + machine.screenshot("welcome-screen") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/bittorrent.nix b/third_party/nixpkgs/nixos/tests/bittorrent.nix index 11420cba9d..4a73fea6a0 100644 --- a/third_party/nixpkgs/nixos/tests/bittorrent.nix +++ b/third_party/nixpkgs/nixos/tests/bittorrent.nix @@ -148,7 +148,7 @@ in ) # Bring down the initial seeder. - # tracker.stop_job("transmission") + tracker.stop_job("transmission") # Now download from the second client. This can only succeed if # the first client created a NAT hole in the router. diff --git a/third_party/nixpkgs/nixos/tests/buildbot.nix b/third_party/nixpkgs/nixos/tests/buildbot.nix index 467c8d8baf..dbf68aba94 100644 --- a/third_party/nixpkgs/nixos/tests/buildbot.nix +++ b/third_party/nixpkgs/nixos/tests/buildbot.nix @@ -1,11 +1,6 @@ # Test ensures buildbot master comes up correctly and workers can connect -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -import ./make-test-python.nix { +import ./make-test-python.nix ({ pkgs, ... }: { name = "buildbot"; nodes = { @@ -110,4 +105,4 @@ import ./make-test-python.nix { ''; meta.maintainers = with pkgs.lib.maintainers; [ ]; -} {} +}) diff --git a/third_party/nixpkgs/nixos/tests/c2fmzq.nix b/third_party/nixpkgs/nixos/tests/c2fmzq.nix new file mode 100644 index 0000000000..d8ec816c7d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/c2fmzq.nix @@ -0,0 +1,75 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "c2FmZQ"; + meta.maintainers = with lib.maintainers; [ hmenke ]; + + nodes.machine = { + services.c2fmzq-server = { + enable = true; + port = 8080; + passphraseFile = builtins.toFile "pwfile" "hunter2"; # don't do this on real deployments + settings = { + verbose = 3; # debug + }; + }; + environment = { + sessionVariables = { + C2FMZQ_PASSPHRASE = "lol"; + C2FMZQ_API_SERVER = "http://localhost:8080"; + }; + systemPackages = [ + pkgs.c2fmzq + (pkgs.writeScriptBin "c2FmZQ-client-wrapper" '' + #!${pkgs.expect}/bin/expect -f + spawn c2FmZQ-client {*}$argv + expect { + "Enter password:" { send "$env(PASSWORD)\r" } + "Type YES to confirm:" { send "YES\r" } + timeout { exit 1 } + eof { exit 0 } + } + interact + '') + ]; + }; + }; + + testScript = { nodes, ... }: '' + machine.start() + machine.wait_for_unit("c2fmzq-server.service") + machine.wait_for_open_port(8080) + + with subtest("Create accounts for alice and bob"): + machine.succeed("PASSWORD=foobar c2FmZQ-client-wrapper -- -v 3 create-account alice@example.com") + machine.succeed("PASSWORD=fizzbuzz c2FmZQ-client-wrapper -- -v 3 create-account bob@example.com") + + with subtest("Log in as alice"): + machine.succeed("PASSWORD=foobar c2FmZQ-client-wrapper -- -v 3 login alice@example.com") + msg = machine.succeed("c2FmZQ-client -v 3 status") + assert "Logged in as alice@example.com" in msg, f"ERROR: Not logged in as alice:\n{msg}" + + with subtest("Create a new album, upload a file, and delete the uploaded file"): + machine.succeed("c2FmZQ-client -v 3 create-album 'Rarest Memes'") + machine.succeed("echo 'pls do not steal' > meme.txt") + machine.succeed("c2FmZQ-client -v 3 import meme.txt 'Rarest Memes'") + machine.succeed("c2FmZQ-client -v 3 sync") + machine.succeed("rm meme.txt") + + with subtest("Share the album with bob"): + machine.succeed("c2FmZQ-client-wrapper -- -v 3 share 'Rarest Memes' bob@example.com") + + with subtest("Log in as bob"): + machine.succeed("PASSWORD=fizzbuzz c2FmZQ-client-wrapper -- -v 3 login bob@example.com") + msg = machine.succeed("c2FmZQ-client -v 3 status") + assert "Logged in as bob@example.com" in msg, f"ERROR: Not logged in as bob:\n{msg}" + + with subtest("Download the shared file"): + machine.succeed("c2FmZQ-client -v 3 download 'shared/Rarest Memes/meme.txt'") + machine.succeed("c2FmZQ-client -v 3 export 'shared/Rarest Memes/meme.txt' .") + msg = machine.succeed("cat meme.txt") + assert "pls do not steal\n" == msg, f"File content is not the same:\n{msg}" + + with subtest("Test that PWA is served"): + msg = machine.succeed("curl -sSfL http://localhost:8080") + assert "c2FmZQ" in msg, f"Could not find 'c2FmZQ' in the output:\n{msg}" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/castopod.nix b/third_party/nixpkgs/nixos/tests/castopod.nix index 1d53c3e9a3..4435ec617d 100644 --- a/third_party/nixpkgs/nixos/tests/castopod.nix +++ b/third_party/nixpkgs/nixos/tests/castopod.nix @@ -82,6 +82,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: castopod.succeed("curl -s http://localhost/cp-install | grep 'Create your Super Admin account' > /dev/null") with subtest("Create superadmin and log in"): - castopod.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + castopod.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/cinnamon.nix b/third_party/nixpkgs/nixos/tests/cinnamon.nix index 2a13892319..7637b55a2b 100644 --- a/third_party/nixpkgs/nixos/tests/cinnamon.nix +++ b/third_party/nixpkgs/nixos/tests/cinnamon.nix @@ -14,27 +14,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { testScript = { nodes, ... }: let user = nodes.machine.users.users.alice; - uid = toString user.uid; - bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus"; - display = "DISPLAY=:0.0"; - env = "${bus} ${display}"; - gdbus = "${env} gdbus"; + env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"; su = command: "su - ${user.name} -c '${env} ${command}'"; # Call javascript in cinnamon (the shell), returns a tuple (success, output), # where `success` is true if the dbus call was successful and `output` is what # the javascript evaluates to. - eval = "call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval"; - - # Should be 2 (RunState.RUNNING) when startup is done. - # https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187 - getRunState = su "${gdbus} ${eval} Main.runState"; - - # Start gnome-terminal. - gnomeTerminalCommand = su "gnome-terminal"; - - # Hopefully gnome-terminal's wm class. - wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class"; + eval = name: su "gdbus call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval ${name}"; in '' machine.wait_for_unit("display-manager.service") @@ -54,13 +40,43 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') - machine.wait_until_succeeds("${getRunState} | grep -q 'true,..2'") + # https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187 + machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") + + with subtest("Check if Cinnamon components actually start"): + for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f {i}") + machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") + machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") + + with subtest("Open Cinnamon Settings"): + machine.succeed("${su "cinnamon-settings themes >&2 &"}") + machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'") + machine.wait_for_text('(Style|Appearance|Color)') + machine.sleep(2) + machine.screenshot("cinnamon_settings") + + with subtest("Lock the screen"): + machine.succeed("${su "cinnamon-screensaver-command -l >&2 &"}") + machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is active'") + machine.sleep(2) + machine.screenshot("cinnamon_screensaver") + machine.send_chars("${user.password}\n", delay=0.2) + machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is inactive'") + machine.sleep(2) with subtest("Open GNOME Terminal"): - machine.succeed("${gnomeTerminalCommand}") - # Correct output should be (true, '"Gnome-terminal"') - machine.wait_until_succeeds("${wmClass} | grep -q 'true,...Gnome-terminal'") - machine.sleep(20) - machine.screenshot("screen") + machine.succeed("${su "gnome-terminal"}") + machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'") + machine.sleep(2) + + with subtest("Open virtual keyboard"): + machine.succeed("${su "dbus-send --print-reply --dest=org.Cinnamon /org/Cinnamon org.Cinnamon.ToggleKeyboard"}") + machine.wait_for_text('(Ctrl|Alt)') + machine.sleep(2) + machine.screenshot("cinnamon_virtual_keyboard") + + with subtest("Check if Cinnamon has ever coredumped"): + machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/cockpit.nix b/third_party/nixpkgs/nixos/tests/cockpit.nix index 6f86d1e2c4..e7165b9790 100644 --- a/third_party/nixpkgs/nixos/tests/cockpit.nix +++ b/third_party/nixpkgs/nixos/tests/cockpit.nix @@ -50,7 +50,8 @@ import ./make-test-python.nix ( options = Options() options.add_argument("--headless") - driver = webdriver.Firefox(options=options) + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + driver = webdriver.Firefox(options=options, service=service) driver.implicitly_wait(10) diff --git a/third_party/nixpkgs/nixos/tests/common/auto-format-root-device.nix b/third_party/nixpkgs/nixos/tests/common/auto-format-root-device.nix index 56eecef2f4..fef8c70049 100644 --- a/third_party/nixpkgs/nixos/tests/common/auto-format-root-device.nix +++ b/third_party/nixpkgs/nixos/tests/common/auto-format-root-device.nix @@ -5,19 +5,19 @@ # `virtualisation.fileSystems."/".autoFormat = true;` # instead. -{ config, pkgs, ... }: +{ lib, config, pkgs, ... }: let rootDevice = config.virtualisation.rootDevice; in { - boot.initrd.extraUtilsCommands = '' + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # We need mke2fs in the initrd. copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs ''; - boot.initrd.postDeviceCommands = '' + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # If the disk image appears to be empty, run mke2fs to # initialise. FSTYPE=$(blkid -o value -s TYPE ${rootDevice} || true) diff --git a/third_party/nixpkgs/nixos/tests/containers-imperative.nix b/third_party/nixpkgs/nixos/tests/containers-imperative.nix index 22b664a90e..18bec1db78 100644 --- a/third_party/nixpkgs/nixos/tests/containers-imperative.nix +++ b/third_party/nixpkgs/nixos/tests/containers-imperative.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { modules = lib.singleton { nixpkgs = { inherit (config.nixpkgs) localSystem; }; - containers.foo.config = { - system.stateVersion = "18.03"; - }; + containers.foo.config = {}; }; # The system is inherited from the host above. diff --git a/third_party/nixpkgs/nixos/tests/dae.nix b/third_party/nixpkgs/nixos/tests/dae.nix index b8c8ebce74..42a2eb5fe0 100644 --- a/third_party/nixpkgs/nixos/tests/dae.nix +++ b/third_party/nixpkgs/nixos/tests/dae.nix @@ -14,6 +14,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; services.dae = { enable = true; + config = '' + global{} + routing{} + ''; }; }; diff --git a/third_party/nixpkgs/nixos/tests/deconz.nix b/third_party/nixpkgs/nixos/tests/deconz.nix new file mode 100644 index 0000000000..cbe721ba49 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/deconz.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + httpPort = 800; +in +{ + name = "deconz"; + + meta.maintainers = with lib.maintainers; [ + bjornfor + ]; + + nodes.machine = { config, pkgs, lib, ... }: { + nixpkgs.config.allowUnfree = true; + services.deconz = { + enable = true; + inherit httpPort; + extraArgs = [ + "--dbg-err=2" + "--dbg-info=2" + ]; + }; + }; + + testScript = '' + machine.wait_for_unit("deconz.service") + machine.succeed("curl -sfL http://localhost:${toString httpPort}") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix index 1c05376e09..1a794931dc 100644 --- a/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix +++ b/third_party/nixpkgs/nixos/tests/dnscrypt-wrapper/default.nix @@ -1,5 +1,15 @@ + { lib, pkgs, ... }: +let + snakeoil = import ../common/acme/server/snakeoil-certs.nix; + + hosts = lib.mkForce + { "fd::a" = [ "server" snakeoil.domain ]; + "fd::b" = [ "client" ]; + }; +in + { name = "dnscrypt-wrapper"; meta = with pkgs.lib.maintainers; { @@ -7,59 +17,122 @@ }; nodes = { - server = { lib, ... }: - { services.dnscrypt-wrapper = with builtins; + server = { + networking.hosts = hosts; + networking.interfaces.eth1.ipv6.addresses = lib.singleton + { address = "fd::a"; prefixLength = 64; }; + + services.dnscrypt-wrapper = { enable = true; - address = "192.168.1.1"; + address = "[::]"; + port = 5353; keys.expiration = 5; # days keys.checkInterval = 2; # min # The keypair was generated by the command: # dnscrypt-wrapper --gen-provider-keypair \ # --provider-name=2.dnscrypt-cert.server \ - # --ext-address=192.168.1.1:5353 - providerKey.public = toFile "public.key" (readFile ./public.key); - providerKey.secret = toFile "secret.key" (readFile ./secret.key); + providerKey.public = "${./public.key}"; + providerKey.secret = "${./secret.key}"; }; - services.tinydns.enable = true; - services.tinydns.data = '' - ..:192.168.1.1:a - +it.works:1.2.3.4 - ''; - networking.firewall.allowedUDPPorts = [ 5353 ]; - networking.firewall.allowedTCPPorts = [ 5353 ]; - networking.interfaces.eth1.ipv4.addresses = lib.mkForce - [ { address = "192.168.1.1"; prefixLength = 24; } ]; + + # nameserver + services.bind.enable = true; + services.bind.zones = lib.singleton + { name = "."; + master = true; + file = pkgs.writeText "root.zone" '' + $TTL 3600 + . IN SOA example.org. admin.example.org. ( 1 3h 1h 1w 1d ) + . IN NS example.org. + example.org. IN AAAA 2001:db8::1 + ''; + }; + + # webserver + services.nginx.enable = true; + services.nginx.virtualHosts.${snakeoil.domain} = + { onlySSL = true; + listenAddresses = [ "localhost" ]; + sslCertificate = snakeoil.${snakeoil.domain}.cert; + sslCertificateKey = snakeoil.${snakeoil.domain}.key; + locations."/ip".extraConfig = '' + default_type text/plain; + return 200 "Ciao $remote_addr!\n"; + ''; + }; + + # demultiplex HTTP and DNS from port 443 + services.sslh = + { enable = true; + method = "ev"; + settings.transparent = true; + settings.listen = lib.mkForce + [ { host = "server"; port = "443"; is_udp = false; } + { host = "server"; port = "443"; is_udp = true; } + ]; + settings.protocols = + [ # Send TLS to webserver (TCP) + { name = "tls"; host= "localhost"; port= "443"; } + # Send DNSCrypt to dnscrypt-wrapper (TCP or UDP) + { name = "anyprot"; host = "localhost"; port = "5353"; } + { name = "anyprot"; host = "localhost"; port = "5353"; is_udp = true;} + ]; + }; + + networking.firewall.allowedTCPPorts = [ 443 ]; + networking.firewall.allowedUDPPorts = [ 443 ]; }; - client = { lib, ... }: - { services.dnscrypt-proxy2.enable = true; - services.dnscrypt-proxy2.upstreamDefaults = false; - services.dnscrypt-proxy2.settings = { - server_names = [ "server" ]; - static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; + client = { + networking.hosts = hosts; + networking.interfaces.eth1.ipv6.addresses = lib.singleton + { address = "fd::b"; prefixLength = 64; }; + + services.dnscrypt-proxy2.enable = true; + services.dnscrypt-proxy2.upstreamDefaults = false; + services.dnscrypt-proxy2.settings = + { server_names = [ "server" ]; + listen_addresses = [ "[::1]:53" ]; + cache = false; + # Computed using https://dnscrypt.info/stamps/ + static.server.stamp = + "sdns://AQAAAAAAAAAADzE5Mi4xNjguMS4yOjQ0MyAUQdg6" + +"_RIIpK6pHkINhrv7nxwIG5c7b_m5NJVT3A1AXRYyLmRuc2NyeXB0LWNlcnQuc2VydmVy"; }; - networking.nameservers = [ "127.0.0.1" ]; - networking.interfaces.eth1.ipv4.addresses = lib.mkForce - [ { address = "192.168.1.2"; prefixLength = 24; } ]; - }; + networking.nameservers = [ "::1" ]; + security.pki.certificateFiles = [ snakeoil.ca.cert ]; + }; }; testScript = '' - start_all() - with subtest("The server can generate the ephemeral keypair"): server.wait_for_unit("dnscrypt-wrapper") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt") almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip() - with subtest("The client can connect to the server"): - server.wait_for_unit("tinydns") - client.wait_for_unit("dnscrypt-proxy2") - assert "1.2.3.4" in client.wait_until_succeeds( - "host it.works" - ), "The IP address of 'it.works' does not match 1.2.3.4" + with subtest("The DNSCrypt client can connect to the server"): + server.wait_for_unit("sslh") + client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\[server\] OK'") + + with subtest("HTTP client can connect to the server"): + server.wait_for_unit("nginx") + client.succeed("curl -s --fail https://${snakeoil.domain}/ip | grep -q fd::b") + + with subtest("DNS queries over UDP are working"): + server.wait_for_unit("bind") + client.wait_for_open_port(53) + assert "2001:db8::1" in client.wait_until_succeeds( + "host -U example.org" + ), "The IP address of 'example.org' does not match 2001:db8::1" + + with subtest("DNS queries over TCP are working"): + server.wait_for_unit("bind") + client.wait_for_open_port(53) + assert "2001:db8::1" in client.wait_until_succeeds( + "host -T example.org" + ), "The IP address of 'example.org' does not match 2001:db8::1" with subtest("The server rotates the ephemeral keys"): # advance time by a little less than 5 days @@ -68,7 +141,8 @@ server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys") with subtest("The client can still connect to the server"): - server.wait_for_unit("dnscrypt-wrapper") - client.succeed("host it.works") + client.systemctl("restart dnscrypt-proxy2") + client.wait_until_succeeds("host -T example.org") + client.wait_until_succeeds("host -U example.org") ''; } diff --git a/third_party/nixpkgs/nixos/tests/docker-registry.nix b/third_party/nixpkgs/nixos/tests/docker-registry.nix index 316b7c9b97..db20cb52c3 100644 --- a/third_party/nixpkgs/nixos/tests/docker-registry.nix +++ b/third_party/nixpkgs/nixos/tests/docker-registry.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker-registry"; meta = with pkgs.lib.maintainers; { - maintainers = [ globin ma27 ironpinguin ]; + maintainers = [ globin ironpinguin ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/documize.nix b/third_party/nixpkgs/nixos/tests/documize.nix index fda79b1a09..3624c0c567 100644 --- a/third_party/nixpkgs/nixos/tests/documize.nix +++ b/third_party/nixpkgs/nixos/tests/documize.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "documize"; meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/fanout.nix b/third_party/nixpkgs/nixos/tests/fanout.nix new file mode 100644 index 0000000000..c36d34dcce --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/fanout.nix @@ -0,0 +1,30 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: +import ./make-test-python.nix ({lib, pkgs, ...}: { + name = "fanout"; + meta.maintainers = [ lib.maintainers.therishidesai ]; + + nodes = let + cfg = { ... }: { + services.fanout = { + enable = true; + fanoutDevices = 2; + bufferSize = 8192; + }; + }; + in { + machine = cfg; + }; + + testScript = '' + start_all() + + # mDNS. + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -c /dev/fanout0") + machine.succeed("test -c /dev/fanout1") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/fastnetmon-advanced.nix b/third_party/nixpkgs/nixos/tests/fastnetmon-advanced.nix new file mode 100644 index 0000000000..b2d2713a92 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/fastnetmon-advanced.nix @@ -0,0 +1,65 @@ +{ pkgs, lib, ... }: + +{ + name = "fastnetmon-advanced"; + meta.maintainers = lib.teams.wdz.members; + + nodes = { + bird = { ... }: { + networking.firewall.allowedTCPPorts = [ 179 ]; + services.bird2 = { + enable = true; + config = '' + router id 192.168.1.1; + + protocol bgp fnm { + local 192.168.1.1 as 64513; + neighbor 192.168.1.2 as 64514; + multihop; + ipv4 { + import all; + export none; + }; + } + ''; + }; + }; + fnm = { ... }: { + networking.firewall.allowedTCPPorts = [ 179 ]; + services.fastnetmon-advanced = { + enable = true; + settings = { + networks_list = [ "172.23.42.0/24" ]; + gobgp = true; + gobgp_flow_spec_announces = true; + }; + bgpPeers = { + bird = { + local_asn = 64514; + remote_asn = 64513; + local_address = "192.168.1.2"; + remote_address = "192.168.1.1"; + + description = "Bird"; + ipv4_unicast = true; + multihop = true; + active = true; + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + start_all() + fnm.wait_for_unit("fastnetmon.service") + bird.wait_for_unit("bird2.service") + + fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "BGP daemon restarted correctly"') + fnm.wait_until_succeeds("journalctl -eu gobgp.service | grep BGP_FSM_OPENCONFIRM") + bird.wait_until_succeeds("birdc show protocol fnm | grep Estab") + fnm.wait_until_succeeds('journalctl -eu fastnetmon.service | grep "API server listening"') + fnm.succeed("fcli set blackhole 172.23.42.123") + bird.succeed("birdc show route | grep 172.23.42.123") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/ferretdb.nix b/third_party/nixpkgs/nixos/tests/ferretdb.nix new file mode 100644 index 0000000000..9ad7397ade --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ferretdb.nix @@ -0,0 +1,64 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; } +, ... +}: +let + lib = pkgs.lib; + testScript = '' + machine.start() + machine.wait_for_unit("ferretdb.service") + machine.wait_for_open_port(27017) + machine.succeed("mongosh --eval 'use myNewDatabase;' --eval 'db.myCollection.insertOne( { x: 1 } );'") + ''; +in +with import ../lib/testing-python.nix { inherit system; }; +{ + + postgresql = makeTest + { + inherit testScript; + name = "ferretdb-postgresql"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = + { pkgs, ... }: + { + services.ferretdb = { + enable = true; + settings.FERRETDB_HANDLER = "pg"; + settings.FERRETDB_POSTGRESQL_URL = "postgres://ferretdb@localhost/ferretdb?host=/run/postgresql"; + }; + + systemd.services.ferretdb.serviceConfig = { + Requires = "postgresql.service"; + After = "postgresql.service"; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "ferretdb" ]; + ensureUsers = [{ + name = "ferretdb"; + ensurePermissions."DATABASE ferretdb" = "ALL PRIVILEGES"; + }]; + }; + + environment.systemPackages = with pkgs; [ mongosh ]; + }; + }; + + sqlite = makeTest + { + inherit testScript; + name = "ferretdb-sqlite"; + meta.maintainers = with lib.maintainers; [ julienmalka ]; + + nodes.machine = + { pkgs, ... }: + { + services.ferretdb.enable = true; + + environment.systemPackages = with pkgs; [ mongosh ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/firefox.nix b/third_party/nixpkgs/nixos/tests/firefox.nix index 3f9cea6662..fbea95dc75 100644 --- a/third_party/nixpkgs/nixos/tests/firefox.nix +++ b/third_party/nixpkgs/nixos/tests/firefox.nix @@ -1,14 +1,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: -let firefoxPackage' = firefoxPackage.override (args: { - extraPrefsFiles = (args.extraPrefsFiles or []) ++ [ - # make sure that autoplay is enabled by default for the audio test - (builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);'')) - ]; - }); - -in { - name = firefoxPackage'.unwrapped.pname; + name = firefoxPackage.pname; + meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -17,10 +10,13 @@ in { pkgs, ... }: { imports = [ ./common/x11.nix ]; - environment.systemPackages = [ - firefoxPackage' - pkgs.xdotool - ]; + environment.systemPackages = [ pkgs.xdotool ]; + + programs.firefox = { + enable = true; + preferences."media.autoplay.default" = 0; + package = firefoxPackage; + }; # Create a virtual sound device, with mixing # and all, for recording audio. @@ -58,7 +54,9 @@ in }; - testScript = '' + testScript = let + exe = firefoxPackage.unwrapped.binaryName; + in '' from contextlib import contextmanager @@ -97,7 +95,7 @@ in with subtest("Wait until Firefox has finished loading the Valgrind docs page"): machine.execute( - "xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" + "xterm -e '${exe} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" ) machine.wait_for_window("Valgrind") machine.sleep(40) @@ -105,7 +103,7 @@ in with subtest("Check whether Firefox can play sound"): with record_audio(machine): machine.succeed( - "${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" + "${exe} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" ) wait_for_sound(machine) machine.copy_from_vm("/tmp/record.wav") diff --git a/third_party/nixpkgs/nixos/tests/forgejo.nix b/third_party/nixpkgs/nixos/tests/forgejo.nix index b326819e31..6acd6acb50 100644 --- a/third_party/nixpkgs/nixos/tests/forgejo.nix +++ b/third_party/nixpkgs/nixos/tests/forgejo.nix @@ -37,7 +37,7 @@ let settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; settings.actions.ENABLED = true; }; - environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq ]; + environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq pkgs.file ]; services.openssh.enable = true; specialisation.runner = { @@ -53,6 +53,14 @@ let tokenFile = "/var/lib/forgejo/runner_token"; }; }; + specialisation.dump = { + inheritParentConfig = true; + configuration.services.forgejo.dump = { + enable = true; + type = "tar.zst"; + file = "dump.tar.zst"; + }; + }; }; client1 = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; @@ -66,8 +74,10 @@ let let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; serverSystem = nodes.server.system.build.toplevel; + dumpFile = with nodes.server.specialisation.dump.configuration.services.forgejo.dump; "${backupDir}/${file}"; in '' + import json GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no" REPO = "forgejo@server:test/repo" PRIVK = "${snakeOilPrivateKey}" @@ -137,6 +147,11 @@ let client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') + with subtest("Testing git protocol version=2 over ssh"): + git_protocol = client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' GIT_TRACE2_EVENT=true git -C repo fetch |& grep negotiated-version") + version = json.loads(git_protocol).get("value") + assert version == "2", f"git did not negotiate protocol version 2, but version {version} instead." + server.wait_until_succeeds( 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' + '-H "Accept: application/json" | jq length)" = "1"', @@ -150,6 +165,12 @@ let server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test") server.wait_for_unit("gitea-runner-test.service") server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'") + + with subtest("Testing backup service"): + server.succeed("${serverSystem}/specialisation/dump/bin/switch-to-configuration test") + server.systemctl("start forgejo-dump") + assert "Zstandard compressed data" in server.succeed("file ${dumpFile}") + server.copy_from_vm("${dumpFile}") ''; }); in diff --git a/third_party/nixpkgs/nixos/tests/freetube.nix b/third_party/nixpkgs/nixos/tests/freetube.nix new file mode 100644 index 0000000000..f285384b68 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/freetube.nix @@ -0,0 +1,41 @@ +let + tests = { + wayland = { pkgs, ... }: { + imports = [ ./common/wayland-cage.nix ]; + services.cage.program = "${pkgs.freetube}/bin/freetube"; + virtualisation.memorySize = 2047; + environment.variables.NIXOS_OZONE_WL = "1"; + environment.variables.DISPLAY = "do not use"; + }; + xorg = { pkgs, ... }: { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + virtualisation.memorySize = 2047; + services.xserver.enable = true; + services.xserver.displayManager.sessionCommands = '' + ${pkgs.freetube}/bin/freetube + ''; + test-support.displayManager.auto.user = "alice"; + }; + }; + + mkTest = name: machine: + import ./make-test-python.nix ({ pkgs, ... }: { + inherit name; + nodes = { "${name}" = machine; }; + meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; + enableOCR = true; + + testScript = '' + start_all() + machine.wait_for_unit('graphical.target') + machine.wait_for_text('Your Subscription list is currently empty') + machine.send_key("ctrl-r") + machine.wait_for_text('Your Subscription list is currently empty') + machine.screenshot("main.png") + machine.send_key("ctrl-comma") + machine.wait_for_text('General Settings', timeout=30) + machine.screenshot("preferences.png") + ''; + }); +in +builtins.mapAttrs (k: v: mkTest k v { }) tests diff --git a/third_party/nixpkgs/nixos/tests/garage/basic.nix b/third_party/nixpkgs/nixos/tests/garage/basic.nix index b6df1e72af..88d747ea33 100644 --- a/third_party/nixpkgs/nixos/tests/garage/basic.nix +++ b/third_party/nixpkgs/nixos/tests/garage/basic.nix @@ -1,4 +1,4 @@ -args@{ mkNode, ... }: +args@{ mkNode, ver, ... }: (import ../make-test-python.nix ({ pkgs, ...} : { name = "garage-basic"; meta = { @@ -52,7 +52,7 @@ args@{ mkNode, ... }: machine.succeed(f"garage layout apply --version {version}") def create_api_key(machine: Machine, key_name: str) -> S3Key: - output = machine.succeed(f"garage key new --name {key_name}") + output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}") m = key_creation_regex.match(output) if not m or not m.group('key_id') or not m.group('secret_key'): raise ValueError('Cannot parse API key data') @@ -90,7 +90,7 @@ args@{ mkNode, ... }: single_node.wait_for_open_port(3900) # Now Garage is initialized. single_node_id = get_node_id(single_node) - apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"']) + apply_garage_layout(single_node, [f'-z qemutest -c ${if ver == "0_8" then "1" else "1G"} "{single_node_id}"']) # Now Garage is operational. test_bucket_writes(single_node) test_bucket_over_http(single_node) diff --git a/third_party/nixpkgs/nixos/tests/garage/default.nix b/third_party/nixpkgs/nixos/tests/garage/default.nix index 0a1ccde056..a42236e9a5 100644 --- a/third_party/nixpkgs/nixos/tests/garage/default.nix +++ b/third_party/nixpkgs/nixos/tests/garage/default.nix @@ -44,10 +44,11 @@ let in foldl (matrix: ver: matrix // { - "basic${toString ver}" = import ./basic.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; - "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; }; + "basic${toString ver}" = import ./basic.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; }; + "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; }; }) {} [ "0_8" + "0_9" ] diff --git a/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix b/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix index d372ad1aa0..d4387b198d 100644 --- a/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix +++ b/third_party/nixpkgs/nixos/tests/garage/with-3node-replication.nix @@ -1,4 +1,4 @@ -args@{ mkNode, ... }: +args@{ mkNode, ver, ... }: (import ../make-test-python.nix ({ pkgs, ...} : { name = "garage-3node-replication"; @@ -55,7 +55,7 @@ args@{ mkNode, ... }: machine.succeed(f"garage layout apply --version {version}") def create_api_key(machine: Machine, key_name: str) -> S3Key: - output = machine.succeed(f"garage key new --name {key_name}") + output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}") m = key_creation_regex.match(output) if not m or not m.group('key_id') or not m.group('secret_key'): raise ValueError('Cannot parse API key data') @@ -110,7 +110,7 @@ args@{ mkNode, ... }: zones = ["nixcon", "nixcon", "paris_meetup", "fosdem"] apply_garage_layout(node1, [ - f'{ndata.node_id} -z {zones[index]} -c 1' + f'{ndata.node_id} -z {zones[index]} -c ${if ver == "0_8" then "1" else "1G"}' for index, ndata in enumerate(node_ids.values()) ]) # Now Garage is operational. diff --git a/third_party/nixpkgs/nixos/tests/gitea.nix b/third_party/nixpkgs/nixos/tests/gitea.nix index f574b59be5..f62c72bddd 100644 --- a/third_party/nixpkgs/nixos/tests/gitea.nix +++ b/third_party/nixpkgs/nixos/tests/gitea.nix @@ -26,7 +26,7 @@ let supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; makeGiteaTest = type: nameValuePair type (makeTest { name = "${giteaPackage.pname}-${type}"; - meta.maintainers = with maintainers; [ aanderse emilylange kolaente ma27 ]; + meta.maintainers = with maintainers; [ aanderse kolaente ma27 ]; nodes = { server = { config, pkgs, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/goss.nix b/third_party/nixpkgs/nixos/tests/goss.nix new file mode 100644 index 0000000000..6b772d1921 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/goss.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "goss"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes.machine = { + environment.systemPackages = [ pkgs.jq ]; + + services.goss = { + enable = true; + + environment = { + GOSS_FMT = "json"; + }; + + settings = { + addr."tcp://localhost:8080" = { + reachable = true; + local-address = "127.0.0.1"; + }; + command."check-goss-version" = { + exec = "${lib.getExe pkgs.goss} --version"; + exit-status = 0; + }; + dns.localhost.resolvable = true; + file."/nix" = { + filetype = "directory"; + exists = true; + }; + group.root.exists = true; + kernel-param."kernel.ostype".value = "Linux"; + service.goss = { + enabled = true; + running = true; + }; + user.root.exists = true; + }; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("goss.service") + machine.wait_for_open_port(8080) + + with subtest("returns health status"): + result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz")) + + assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}" + assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}" + assert result["summary"]["test-count"] == 10, f".summary.test-count should be 10, was {result['summary']['test-count']}" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/gotify-server.nix b/third_party/nixpkgs/nixos/tests/gotify-server.nix index d004f542b3..c8d7fa172a 100644 --- a/third_party/nixpkgs/nixos/tests/gotify-server.nix +++ b/third_party/nixpkgs/nixos/tests/gotify-server.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gotify-server"; meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix b/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix index 96378452ad..d33d16ce12 100644 --- a/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix +++ b/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix @@ -22,15 +22,14 @@ let }; }; - system.activationScripts.setup-grafana = { - deps = [ "users" ]; - text = '' - mkdir -p /var/lib/grafana/dashboards - chown -R grafana:grafana /var/lib/grafana - chmod 0700 -R /var/lib/grafana/dashboards - cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ - ''; - }; + systemd.tmpfiles.rules = + let + dashboard = pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json); + in + [ + "d /var/lib/grafana/dashboards 0700 grafana grafana -" + "C+ /var/lib/grafana/dashboards/test.json - - - - ${dashboard}" + ]; }; extraNodeConfs = { diff --git a/third_party/nixpkgs/nixos/tests/grow-partition.nix b/third_party/nixpkgs/nixos/tests/grow-partition.nix new file mode 100644 index 0000000000..344910848d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/grow-partition.nix @@ -0,0 +1,83 @@ +{ lib, ... }: + +let + rootFslabel = "external"; + rootFsDevice = "/dev/disk/by-label/${rootFslabel}"; + + externalModule = partitionTableType: { config, lib, pkgs, ... }: { + virtualisation.directBoot.enable = false; + virtualisation.mountHostNixStore = false; + virtualisation.useEFIBoot = partitionTableType == "efi"; + + # This stops the qemu-vm module from overriding the fileSystems option + # with virtualisation.fileSystems. + virtualisation.fileSystems = lib.mkForce { }; + + + boot.loader.grub.enable = true; + boot.loader.grub.efiSupport = partitionTableType == "efi"; + boot.loader.grub.efiInstallAsRemovable = partitionTableType == "efi"; + boot.loader.grub.device = if partitionTableType == "efi" then "nodev" else "/dev/vda"; + + boot.growPartition = true; + + fileSystems = { + "/".device = rootFsDevice; + }; + + system.build.diskImage = import ../lib/make-disk-image.nix { + inherit config lib pkgs; + label = rootFslabel; + inherit partitionTableType; + format = "raw"; + bootSize = "128M"; + additionalSpace = "0M"; + copyChannel = false; + }; + }; +in +{ + name = "grow-partition"; + + meta.maintainers = with lib.maintainers; [ arianvp ]; + + nodes = { + efi = externalModule "efi"; + legacy = externalModule "legacy"; + legacyGPT = externalModule "legacy+gpt"; + hybrid = externalModule "hybrid"; + }; + + + testScript = { nodes, ... }: + lib.concatLines (lib.mapAttrsToList (name: node: '' + import os + import subprocess + import tempfile + import shutil + + tmp_disk_image = tempfile.NamedTemporaryFile() + + shutil.copyfile("${node.system.build.diskImage}/nixos.img", tmp_disk_image.name) + + subprocess.run([ + "${node.virtualisation.qemu.package}/bin/qemu-img", + "resize", + "-f", + "raw", + tmp_disk_image.name, + "+32M", + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + ${name}.wait_for_unit("growpart.service") + systemd_growpart_logs = ${name}.succeed("journalctl --boot --unit growpart.service") + assert "CHANGED" in systemd_growpart_logs + ${name}.succeed("systemctl restart growpart.service") + systemd_growpart_logs = ${name}.succeed("journalctl --boot --unit growpart.service") + assert "NOCHANGE" in systemd_growpart_logs + + '') nodes); +} diff --git a/third_party/nixpkgs/nixos/tests/hadoop/hadoop.nix b/third_party/nixpkgs/nixos/tests/hadoop/hadoop.nix index b132f4fa58..6162ccfd33 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/hadoop.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/hadoop.nix @@ -176,22 +176,22 @@ import ../make-test-python.nix ({ package, ... }: { nn2.succeed("systemctl stop hdfs-zkfc") # Initialize zookeeper for failover controller - nn1.succeed("sudo -u hdfs hdfs zkfc -formatZK 2>&1 | systemd-cat") + nn1.succeed("sudo -u hdfs systemd-cat hdfs zkfc -formatZK") # Format NN1 and start it - nn1.succeed("sudo -u hdfs hadoop namenode -format 2>&1 | systemd-cat") + nn1.succeed("sudo -u hdfs systemd-cat hadoop namenode -format") nn1.succeed("systemctl start hdfs-namenode") nn1.wait_for_open_port(9870) nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) # Bootstrap NN2 from NN1 and start it - nn2.succeed("sudo -u hdfs hdfs namenode -bootstrapStandby 2>&1 | systemd-cat") + nn2.succeed("sudo -u hdfs systemd-cat hdfs namenode -bootstrapStandby") nn2.succeed("systemctl start hdfs-namenode") nn2.wait_for_open_port(9870) nn2.wait_for_open_port(8022) nn2.wait_for_open_port(8020) - nn1.succeed("netstat -tulpne | systemd-cat") + nn1.succeed("systemd-cat netstat -tulpne") # Start failover controllers nn1.succeed("systemctl start hdfs-zkfc") @@ -200,10 +200,10 @@ import ../make-test-python.nix ({ package, ... }: { # DN should have started by now, but confirm anyway dn1.wait_for_unit("hdfs-datanode") # Print states of namenodes - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") # Wait for cluster to exit safemode client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") # test R/W client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") @@ -211,7 +211,7 @@ import ../make-test-python.nix ({ package, ... }: { # Test NN failover nn1.succeed("systemctl stop hdfs-namenode") assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") nn1.succeed("systemctl start hdfs-namenode") @@ -219,7 +219,7 @@ import ../make-test-python.nix ({ package, ... }: { nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs systemd-cat hdfs haadmin -getAllServiceState") #### YARN tests #### @@ -236,20 +236,20 @@ import ../make-test-python.nix ({ package, ... }: { nm1.wait_for_open_port(8042) nm1.wait_for_open_port(8040) client.wait_until_succeeds("yarn node -list | grep Nodes:1") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - client.succeed("sudo -u yarn yarn node -list | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn systemd-cat yarn node -list") # Test RM failover rm1.succeed("systemctl stop yarn-resourcemanager") assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") rm1.succeed("systemctl start yarn-resourcemanager") rm1.wait_for_unit("yarn-resourcemanager") rm1.wait_for_open_port(8088) assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u yarn systemd-cat yarn rmadmin -getAllServiceState") - assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") + assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10") assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix b/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix index 429d4bf6b5..65686b3715 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix @@ -50,8 +50,8 @@ import ../make-test-python.nix ({ package, lib, ... }: namenode.wait_for_unit("hdfs-namenode") namenode.wait_for_unit("network.target") namenode.wait_for_open_port(8020) - namenode.succeed("ss -tulpne | systemd-cat") - namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat") + namenode.succeed("systemd-cat ss -tulpne") + namenode.succeed("systemd-cat cat /etc/hadoop*/hdfs-site.xml") namenode.wait_for_open_port(9870) datanode.wait_for_unit("hdfs-datanode") diff --git a/third_party/nixpkgs/nixos/tests/hedgedoc.nix b/third_party/nixpkgs/nixos/tests/hedgedoc.nix index 410350d836..16e0dc14e9 100644 --- a/third_party/nixpkgs/nixos/tests/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/tests/hedgedoc.nix @@ -8,20 +8,22 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: nodes = { hedgedocSqlite = { ... }: { - services = { - hedgedoc = { - enable = true; - settings.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db"; - }; - }; + services.hedgedoc.enable = true; }; - hedgedocPostgres = { ... }: { + hedgedocPostgresWithTCPSocket = { ... }: { systemd.services.hedgedoc.after = [ "postgresql.service" ]; services = { hedgedoc = { enable = true; - settings.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb"; + settings.db = { + dialect = "postgres"; + user = "hedgedoc"; + password = "$DB_PASSWORD"; + host = "localhost"; + port = 5432; + database = "hedgedocdb"; + }; /* * Do not use pkgs.writeText for secrets as @@ -40,6 +42,33 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: }; }; }; + + hedgedocPostgresWithUNIXSocket = { ... }: { + systemd.services.hedgedoc.after = [ "postgresql.service" ]; + services = { + hedgedoc = { + enable = true; + settings.db = { + dialect = "postgres"; + user = "hedgedoc"; + password = "$DB_PASSWORD"; + host = "/run/postgresql"; + database = "hedgedocdb"; + }; + + environmentFile = pkgs.writeText "hedgedoc-env" '' + DB_PASSWORD=snakeoilpassword + ''; + }; + postgresql = { + enable = true; + initialScript = pkgs.writeText "pg-init-script.sql" '' + CREATE ROLE hedgedoc LOGIN PASSWORD 'snakeoilpassword'; + CREATE DATABASE hedgedocdb OWNER hedgedoc; + ''; + }; + }; + }; }; testScript = '' @@ -50,11 +79,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: hedgedocSqlite.wait_for_open_port(3000) hedgedocSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new") - with subtest("HedgeDoc postgres"): - hedgedocPostgres.wait_for_unit("postgresql.service") - hedgedocPostgres.wait_for_unit("hedgedoc.service") - hedgedocPostgres.wait_for_open_port(5432) - hedgedocPostgres.wait_for_open_port(3000) - hedgedocPostgres.wait_until_succeeds("curl -sSf http://localhost:3000/new") + with subtest("HedgeDoc postgres with TCP socket"): + hedgedocPostgresWithTCPSocket.wait_for_unit("postgresql.service") + hedgedocPostgresWithTCPSocket.wait_for_unit("hedgedoc.service") + hedgedocPostgresWithTCPSocket.wait_for_open_port(5432) + hedgedocPostgresWithTCPSocket.wait_for_open_port(3000) + hedgedocPostgresWithTCPSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new") + + with subtest("HedgeDoc postgres with UNIX socket"): + hedgedocPostgresWithUNIXSocket.wait_for_unit("postgresql.service") + hedgedocPostgresWithUNIXSocket.wait_for_unit("hedgedoc.service") + hedgedocPostgresWithUNIXSocket.wait_for_open_port(5432) + hedgedocPostgresWithUNIXSocket.wait_for_open_port(3000) + hedgedocPostgresWithUNIXSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix index e06c52a5f4..e97e8a467b 100644 --- a/third_party/nixpkgs/nixos/tests/home-assistant.nix +++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix @@ -9,13 +9,13 @@ in { nodes.hass = { pkgs, ... }: { services.postgresql = { enable = true; - ensureDatabases = [ "hass" ]; - ensureUsers = [{ - name = "hass"; - ensurePermissions = { - "DATABASE hass" = "ALL PRIVILEGES"; - }; - }]; + + # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989 + # Should be replaced with ensureUsers again when a solution for that is found + initialScript = pkgs.writeText "hass-setup-db.sql" '' + CREATE ROLE hass WITH LOGIN; + CREATE DATABASE hass WITH OWNER hass; + ''; }; services.home-assistant = { @@ -43,6 +43,16 @@ in { psycopg2 ]; + # test loading custom components + customComponents = with pkgs.home-assistant-custom-components; [ + prometheus-sensor + ]; + + # test loading lovelace modules + customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [ + mini-graph-card + ]; + config = { homeassistant = { name = "Home"; @@ -114,6 +124,14 @@ in { inheritParentConfig = true; configuration.services.home-assistant.config.backup = {}; }; + + specialisation.removeCustomThings = { + inheritParentConfig = true; + configuration.services.home-assistant = { + customComponents = lib.mkForce []; + customLovelaceModules = lib.mkForce []; + }; + }; }; testScript = { nodes, ... }: let @@ -161,6 +179,14 @@ in { hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") + with subtest("Check that custom components get installed"): + hass.succeed("test -f ${configDir}/custom_components/prometheus_sensor/manifest.json") + hass.wait_until_succeeds("journalctl -u home-assistant.service | grep -q 'We found a custom integration prometheus_sensor which has not been tested by Home Assistant'") + + with subtest("Check that lovelace modules are referenced and fetchable"): + hass.succeed("grep -q 'mini-graph-card-bundle.js' '${configDir}/ui-lovelace.yaml'") + hass.succeed("curl --fail http://localhost:8123/local/nixos-lovelace-modules/mini-graph-card-bundle.js") + with subtest("Check that optional dependencies are in the PYTHONPATH"): env = get_unit_property("Environment") python_path = env.split("PYTHONPATH=")[1].split()[0] @@ -200,6 +226,13 @@ in { for domain in ["backup"]: assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" + with subtest("Check custom components and custom lovelace modules get removed"): + cursor = get_journal_cursor() + hass.succeed("${system}/specialisation/removeCustomThings/bin/switch-to-configuration test") + hass.fail("grep -q 'mini-graph-card-bundle.js' '${configDir}/ui-lovelace.yaml'") + hass.fail("test -f ${configDir}/custom_components/prometheus_sensor/manifest.json") + wait_for_homeassistant(cursor) + with subtest("Check that no errors were logged"): hass.fail("journalctl -u home-assistant -o cat | grep -q ERROR") diff --git a/third_party/nixpkgs/nixos/tests/hydra/default.nix b/third_party/nixpkgs/nixos/tests/hydra/default.nix index baf18afbc5..98c3c6fbae 100644 --- a/third_party/nixpkgs/nixos/tests/hydra/default.nix +++ b/third_party/nixpkgs/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let makeHydraTest = with pkgs.lib; name: package: makeTest { name = "hydra-${name}"; meta = with pkgs.lib.maintainers; { - maintainers = [ lewo ma27 ]; + maintainers = [ lewo ]; }; nodes.machine = { pkgs, lib, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/incus/container.nix b/third_party/nixpkgs/nixos/tests/incus/container.nix new file mode 100644 index 0000000000..79b9e2fbab --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/container.nix @@ -0,0 +1,77 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + + container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + container-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; +in +{ + name = "incus-container"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { ... }: { + virtualisation = { + # Ensure test VM has enough resources for creating and managing guests + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus.enable = true; + }; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + def set_container(config): + machine.succeed(f"incus config set container {config}") + machine.succeed("incus restart container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + + machine.wait_for_unit("incus.service") + + # no preseed should mean no service + machine.fail("systemctl status incus-preseed.service") + + machine.succeed("incus admin init --minimal") + + with subtest("Container image can be imported"): + machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos") + + with subtest("Container can be launched and managed"): + machine.succeed("incus launch nixos container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -") + + with subtest("Container CPU limits can be managed"): + set_container("limits.cpu 1") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}" + + set_container("limits.cpu 2") + cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip() + assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}" + + with subtest("Container memory limits can be managed"): + set_container("limits.memory 64MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'" + + set_container("limits.memory 128MB") + meminfo = machine.succeed("incus exec container grep -- MemTotal /proc/meminfo").strip() + meminfo_bytes = " ".join(meminfo.split(' ')[-2:]) + assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/incus/default.nix b/third_party/nixpkgs/nixos/tests/incus/default.nix new file mode 100644 index 0000000000..c88974605e --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/default.nix @@ -0,0 +1,14 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, + handleTestOn, +}: +{ + container = import ./container.nix { inherit system pkgs; }; + preseed = import ./preseed.nix { inherit system pkgs; }; + socket-activated = import ./socket-activated.nix { inherit system pkgs; }; + virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { + inherit system pkgs; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/incus/preseed.nix b/third_party/nixpkgs/nixos/tests/incus/preseed.nix new file mode 100644 index 0000000000..47b2d0cd62 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/preseed.nix @@ -0,0 +1,60 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +{ + name = "incus-preseed"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + incus.enable = true; + + incus.preseed = { + networks = [ + { + name = "nixostestbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "nixostest_default"; + devices = { + eth0 = { + name = "eth0"; + network = "nixostestbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "nixostest_pool"; + driver = "dir"; + } + ]; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") + + with subtest("Verify preseed resources created"): + machine.succeed("incus profile show nixostest_default") + machine.succeed("incus network info nixostestbr0") + machine.succeed("incus storage show nixostest_pool") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix b/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix new file mode 100644 index 0000000000..4d25b26a15 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/socket-activated.nix @@ -0,0 +1,26 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +{ + name = "incus-socket-activated"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + incus.enable = true; + incus.socketActivation = true; + }; + }; + + testScript = '' + machine.wait_for_unit("incus.socket") + + # ensure service is not running by default + machine.fail("systemctl is-active incus.service") + machine.fail("systemctl is-active incus-preseed.service") + + # access the socket and ensure the service starts + machine.succeed("incus list") + machine.wait_for_unit("incus.service") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix b/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix new file mode 100644 index 0000000000..bfa116679d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/incus/virtual-machine.nix @@ -0,0 +1,55 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: + +let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + + # Our tests require `grep` & friends: + environment.systemPackages = with pkgs; [busybox]; + }; + }; + + vm-image-metadata = releases.lxdVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system}; + vm-image-disk = releases.lxdVirtualMachineImage.${pkgs.stdenv.hostPlatform.system}; + + instance-name = "instance1"; +in +{ + name = "incus-virtual-machine"; + + meta.maintainers = with lib.maintainers; [ adamcstephens ]; + + nodes.machine = {...}: { + virtualisation = { + # Ensure test VM has enough resources for creating and managing guests + cores = 2; + memorySize = 1024; + diskSize = 4096; + + incus.enable = true; + }; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("incus exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + machine.wait_for_unit("incus.service") + + machine.succeed("incus admin init --minimal") + + with subtest("virtual-machine image can be imported"): + machine.succeed("incus image import ${vm-image-metadata}/*/*.tar.xz ${vm-image-disk}/nixos.qcow2 --alias nixos") + + with subtest("virtual-machine can be launched and become available"): + machine.succeed("incus launch nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + + with subtest("lxd-agent is started"): + machine.succeed("incus exec ${instance-name} systemctl is-active lxd-agent") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/installer-systemd-stage-1.nix b/third_party/nixpkgs/nixos/tests/installer-systemd-stage-1.nix index 85155a6c68..1b4c92b584 100644 --- a/third_party/nixpkgs/nixos/tests/installer-systemd-stage-1.nix +++ b/third_party/nixpkgs/nixos/tests/installer-systemd-stage-1.nix @@ -8,15 +8,17 @@ # them when fixed. inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; }) # bcache + bcachefsSimple + bcachefsEncrypted btrfsSimple btrfsSubvolDefault btrfsSubvolEscape btrfsSubvols - # encryptedFSWithKeyfile + encryptedFSWithKeyfile # grub1 - # luksroot - # luksroot-format1 - # luksroot-format2 + luksroot + luksroot-format1 + luksroot-format2 # lvm separateBoot separateBootFat diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 3268a16967..1baa439642 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -69,8 +69,8 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi - , grubIdentifier, preBootCommands, postBootCommands, extraConfig + testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier + , postInstallCommands, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig, testFlakeSwitch }: let iface = "virtio"; @@ -153,6 +153,8 @@ let """ ) + ${postInstallCommands} + with subtest("Shutdown system after installation"): machine.succeed("umount -R /mnt") machine.succeed("sync") @@ -368,7 +370,9 @@ let makeInstallerTest = name: - { createPartitions, preBootCommands ? "", postBootCommands ? "", extraConfig ? "" + { createPartitions + , postInstallCommands ? "", preBootCommands ? "", postBootCommands ? "" + , extraConfig ? "" , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", grubUseEfi ? false @@ -479,7 +483,7 @@ let }; testScript = testScriptFun { - inherit bootLoader createPartitions preBootCommands postBootCommands + inherit bootLoader createPartitions postInstallCommands preBootCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig testSpecialisationConfig testFlakeSwitch; }; @@ -511,7 +515,7 @@ let enableOCR = true; preBootCommands = '' machine.start() - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("supersecret\n") ''; }; @@ -682,17 +686,32 @@ in { createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" - + " mkpart primary linux-swap 1M 1024M" - + " mkpart primary 1024M -1s", + + " mkpart primary 1M 100MB" # bpool + + " mkpart primary linux-swap 100M 1024M" + + " mkpart primary 1024M -1s", # rpool "udevadm settle", - "mkswap /dev/vda1 -L swap", + "mkswap /dev/vda2 -L swap", "swapon -L swap", - "zpool create rpool /dev/vda2", + "zpool create rpool /dev/vda3", "zfs create -o mountpoint=legacy rpool/root", "mount -t zfs rpool/root /mnt", + "zfs create -o mountpoint=legacy rpool/root/usr", + "mkdir /mnt/usr", + "mount -t zfs rpool/root/usr /mnt/usr", + "zpool create -o compatibility=grub2 bpool /dev/vda1", + "zfs create -o mountpoint=legacy bpool/boot", + "mkdir /mnt/boot", + "mount -t zfs bpool/boot /mnt/boot", "udevadm settle", ) ''; + + # umount & export bpool before shutdown + # this is a fix for "cannot import 'bpool': pool was previously in use from another system." + postInstallCommands = '' + machine.succeed("umount /mnt/boot") + machine.succeed("zpool export bpool") + ''; }; # Create two physical LVM partitions combined into one volume group @@ -762,7 +781,7 @@ in { encrypted.enable = true; encrypted.blkDev = "/dev/vda3"; encrypted.label = "crypt"; - encrypted.keyFile = "/mnt-root/keyfile"; + encrypted.keyFile = "/${if systemdStage1 then "sysroot" else "mnt-root"}/keyfile"; }; ''; }; @@ -918,6 +937,10 @@ in { enableOCR = true; preBootCommands = '' machine.start() + # Enter it wrong once + machine.wait_for_text("enter passphrase for ") + machine.send_chars("wrong\n") + # Then enter it right. machine.wait_for_text("enter passphrase for ") machine.send_chars("password\n") ''; diff --git a/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix index 92ae9990c9..494a539b57 100644 --- a/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix +++ b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix @@ -202,7 +202,7 @@ import ./make-test-python.nix ( initiatorAuto.succeed("umount /mnt") initiatorAuto.succeed("systemctl restart multipathd") - initiatorAuto.succeed("multipath -ll | systemd-cat") + initiatorAuto.succeed("systemd-cat multipath -ll") # Install our RootDisk machine to 123456, the alias to the device that multipath is now managing initiatorAuto.succeed("mount /dev/mapper/123456 /mnt") @@ -223,7 +223,7 @@ import ./make-test-python.nix ( initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") initiatorRootDisk.succeed("systemctl restart multipathd") - initiatorRootDisk.succeed("multipath -ll | systemd-cat") + initiatorRootDisk.succeed("systemd-cat multipath -ll") # Verify we can write and sync the root disk initiatorRootDisk.succeed("mkdir /scratch") diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index 6d883df14c..352deb521a 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -25,7 +25,6 @@ let }) args); kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) - linux_4_14_hardened linux_4_19_hardened linux_5_4_hardened linux_5_10_hardened diff --git a/third_party/nixpkgs/nixos/tests/keymap.nix b/third_party/nixpkgs/nixos/tests/keymap.nix index cc45824667..e8973a50f8 100644 --- a/third_party/nixpkgs/nixos/tests/keymap.nix +++ b/third_party/nixpkgs/nixos/tests/keymap.nix @@ -31,7 +31,7 @@ let nodes.machine.console.keyMap = mkOverride 900 layout; nodes.machine.services.xserver.desktopManager.xterm.enable = false; - nodes.machine.services.xserver.layout = mkOverride 900 layout; + nodes.machine.services.xserver.xkb.layout = mkOverride 900 layout; nodes.machine.imports = [ ./common/x11.nix extraConfig ]; testScript = '' @@ -116,7 +116,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "fr"; - extraConfig.services.xserver.layout = "fr"; + extraConfig.services.xserver.xkb.layout = "fr"; }; bone = { @@ -130,8 +130,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "bone"; - extraConfig.services.xserver.layout = "de"; - extraConfig.services.xserver.xkbVariant = "bone"; + extraConfig.services.xserver.xkb.layout = "de"; + extraConfig.services.xserver.xkb.variant = "bone"; }; colemak = { @@ -141,8 +141,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "colemak"; - extraConfig.services.xserver.layout = "us"; - extraConfig.services.xserver.xkbVariant = "colemak"; + extraConfig.services.xserver.xkb.layout = "us"; + extraConfig.services.xserver.xkb.variant = "colemak"; }; dvorak = { @@ -154,8 +154,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "dvorak"; - extraConfig.services.xserver.layout = "us"; - extraConfig.services.xserver.xkbVariant = "dvorak"; + extraConfig.services.xserver.xkb.layout = "us"; + extraConfig.services.xserver.xkb.variant = "dvorak"; }; dvorak-programmer = { @@ -170,8 +170,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "dvorak-programmer"; - extraConfig.services.xserver.layout = "us"; - extraConfig.services.xserver.xkbVariant = "dvp"; + extraConfig.services.xserver.xkb.layout = "us"; + extraConfig.services.xserver.xkb.variant = "dvp"; }; neo = { @@ -185,8 +185,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "neo"; - extraConfig.services.xserver.layout = "de"; - extraConfig.services.xserver.xkbVariant = "neo"; + extraConfig.services.xserver.xkb.layout = "de"; + extraConfig.services.xserver.xkb.variant = "neo"; }; qwertz = { @@ -199,7 +199,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.keyMap = "de"; - extraConfig.services.xserver.layout = "de"; + extraConfig.services.xserver.xkb.layout = "de"; }; custom = { @@ -212,8 +212,8 @@ in pkgs.lib.mapAttrs mkKeyboardTest { }; extraConfig.console.useXkbConfig = true; - extraConfig.services.xserver.layout = "us-greek"; - extraConfig.services.xserver.extraLayouts.us-greek = + extraConfig.services.xserver.xkb.layout = "us-greek"; + extraConfig.services.xserver.xkb.extraLayouts.us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; symbolsFile = pkgs.writeText "us-greek" '' diff --git a/third_party/nixpkgs/nixos/tests/kubo/default.nix b/third_party/nixpkgs/nixos/tests/kubo/default.nix new file mode 100644 index 0000000000..629922fc36 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/kubo/default.nix @@ -0,0 +1,5 @@ +{ recurseIntoAttrs, runTest }: +recurseIntoAttrs { + kubo = runTest ./kubo.nix; + kubo-fuse = runTest ./kubo-fuse.nix; +} diff --git a/third_party/nixpkgs/nixos/tests/kubo/kubo-fuse.nix b/third_party/nixpkgs/nixos/tests/kubo/kubo-fuse.nix new file mode 100644 index 0000000000..71a5bf6164 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/kubo/kubo-fuse.nix @@ -0,0 +1,42 @@ +{ lib, ...} : { + name = "kubo-fuse"; + meta = with lib.maintainers; { + maintainers = [ mguentner Luflosi ]; + }; + + nodes.machine = { config, ... }: { + services.kubo = { + enable = true; + autoMount = true; + }; + users.users.alice = { + isNormalUser = true; + extraGroups = [ config.services.kubo.group ]; + }; + users.users.bob = { + isNormalUser = true; + }; + }; + + testScript = '' + start_all() + + with subtest("FUSE mountpoint"): + machine.fail("echo a | su bob -l -c 'ipfs add --quieter'") + # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0. + # See https://github.com/ipfs/kubo/issues/9044. + # Workaround: using CID Version 1 avoids that. + ipfs_hash = machine.succeed( + "echo fnord3 | su alice -l -c 'ipfs add --quieter --cid-version=1'" + ).strip() + + machine.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3") + + with subtest("Unmounting of /ipns and /ipfs"): + # Force Kubo to crash and wait for it to restart + machine.systemctl("kill --signal=SIGKILL ipfs.service") + machine.wait_for_unit("ipfs.service", timeout = 30) + + machine.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/kubo.nix b/third_party/nixpkgs/nixos/tests/kubo/kubo.nix similarity index 60% rename from third_party/nixpkgs/nixos/tests/kubo.nix rename to third_party/nixpkgs/nixos/tests/kubo/kubo.nix index 496f409a40..7965ad2773 100644 --- a/third_party/nixpkgs/nixos/tests/kubo.nix +++ b/third_party/nixpkgs/nixos/tests/kubo/kubo.nix @@ -18,20 +18,6 @@ }; }; - nodes.fuse = { config, ... }: { - services.kubo = { - enable = true; - autoMount = true; - }; - users.users.alice = { - isNormalUser = true; - extraGroups = [ config.services.kubo.group ]; - }; - users.users.bob = { - isNormalUser = true; - }; - }; - testScript = '' start_all() @@ -63,23 +49,5 @@ with subtest("Setting dataDir works properly with the hardened systemd unit"): machine.succeed("test -e /mnt/ipfs/config") machine.succeed("test ! -e /var/lib/ipfs/") - - with subtest("FUSE mountpoint"): - fuse.fail("echo a | su bob -l -c 'ipfs add --quieter'") - # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0. - # See https://github.com/ipfs/kubo/issues/9044. - # Workaround: using CID Version 1 avoids that. - ipfs_hash = fuse.succeed( - "echo fnord3 | su alice -l -c 'ipfs add --quieter --cid-version=1'" - ).strip() - - fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3") - - with subtest("Unmounting of /ipns and /ipfs"): - # Force Kubo to crash and wait for it to restart - fuse.systemctl("kill --signal=SIGKILL ipfs.service") - fuse.wait_for_unit("ipfs.service", timeout = 30) - - fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3") ''; } diff --git a/third_party/nixpkgs/nixos/tests/lanraragi.nix b/third_party/nixpkgs/nixos/tests/lanraragi.nix new file mode 100644 index 0000000000..f513ac9d25 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lanraragi.nix @@ -0,0 +1,40 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "lanraragi"; + meta.maintainers = with lib.maintainers; [ tomasajt ]; + + nodes = { + machine1 = { pkgs, ... }: { + services.lanraragi.enable = true; + }; + machine2 = { pkgs, ... }: { + services.lanraragi = { + enable = true; + passwordFile = pkgs.writeText "lrr-test-pass" '' + ultra-secure-password + ''; + port = 4000; + redis = { + port = 4001; + passwordFile = pkgs.writeText "redis-lrr-test-pass" '' + still-a-very-secure-password + ''; + }; + }; + }; + + + }; + + testScript = '' + start_all() + + machine1.wait_for_unit("lanraragi.service") + machine1.wait_until_succeeds("curl -f localhost:3000") + machine1.succeed("[ $(curl -o /dev/null -X post 'http://localhost:3000/login' --data-raw 'password=kamimamita' -w '%{http_code}') -eq 302 ]") + + machine2.wait_for_unit("lanraragi.service") + machine2.wait_until_succeeds("curl -f localhost:4000") + machine2.succeed("[ $(curl -o /dev/null -X post 'http://localhost:4000/login' --data-raw 'password=ultra-secure-password' -w '%{http_code}') -eq 302 ]") + ''; +}) + diff --git a/third_party/nixpkgs/nixos/tests/librenms.nix b/third_party/nixpkgs/nixos/tests/librenms.nix new file mode 100644 index 0000000000..c59f56a323 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/librenms.nix @@ -0,0 +1,108 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + api_token = "f87f42114e44b63ad1b9e3c3d33d6fbe"; # random md5 hash + wrong_api_token = "e68ba041fcf1eab923a7a6de3af5f726"; # another random md5 hash +in { + name = "librenms"; + meta.maintainers = lib.teams.wdz.members; + + nodes.librenms = { + time.timeZone = "Europe/Berlin"; + + environment.systemPackages = with pkgs; [ + curl + jq + ]; + + services.librenms = { + enable = true; + hostname = "librenms"; + database = { + createLocally = true; + host = "localhost"; + database = "librenms"; + username = "librenms"; + passwordFile = pkgs.writeText "librenms-db-pass" "librenmsdbpass"; + }; + nginx = { + default = true; + }; + enableOneMinutePolling = true; + settings = { + enable_billing = true; + }; + }; + + # systemd oneshot to create a dummy admin user and a API token for testing + systemd.services.lnms-api-init = { + description = "LibreNMS API init"; + after = [ "librenms-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "root"; + Group = "root"; + }; + script = '' + API_USER_NAME=api + API_TOKEN=${api_token} # random md5 hash + + # we don't need to know the password, it just has to exist + API_USER_PASS=$(${pkgs.pwgen}/bin/pwgen -s 64 1) + ${pkgs.librenms}/artisan user:add $API_USER_NAME -r admin -p $API_USER_PASS + API_USER_ID=$(${pkgs.mariadb}/bin/mysql -D librenms -N -B -e "SELECT user_id FROM users WHERE username = '$API_USER_NAME';") + + ${pkgs.mariadb}/bin/mysql -D librenms -e "INSERT INTO api_tokens (user_id, token_hash, description) VALUES ($API_USER_ID, '$API_TOKEN', 'API User')" + ''; + }; + }; + + nodes.snmphost = { + networking.firewall.allowedUDPPorts = [ 161 ]; + + systemd.services.snmpd = { + description = "snmpd"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = "root"; + Group = "root"; + ExecStart = let + snmpd-config = pkgs.writeText "snmpd-config" '' + com2sec readonly default public + + group MyROGroup v2c readonly + view all included .1 80 + access MyROGroup "" any noauth exact all none none + + syslocation Testcity, Testcountry + syscontact Testi mc Test + ''; + in "${pkgs.net-snmp}/bin/snmpd -c ${snmpd-config} -C"; + }; + }; + }; + + testScript = '' + start_all() + + snmphost.wait_until_succeeds("pgrep snmpd") + + librenms.wait_for_unit("lnms-api-init.service") + librenms.wait_for_open_port(80) + + # Test that we can authenticate against the API + librenms.succeed("curl --fail -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0") + librenms.fail("curl --fail -H 'X-Auth-Token: ${wrong_api_token}' http://localhost/api/v0") + + # add snmphost as a device + librenms.succeed("curl --fail -X POST -d '{\"hostname\":\"snmphost\",\"version\":\"v2c\",\"community\":\"public\"}' -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices") + + # wait until snmphost gets polled + librenms.wait_until_succeeds("test $(curl -H 'X-Auth-Token: ${api_token}' http://localhost/api/v0/devices/snmphost | jq -Mr .devices[0].last_polled) != 'null'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/lighttpd.nix b/third_party/nixpkgs/nixos/tests/lighttpd.nix index 36e2745c55..daef1584a4 100644 --- a/third_party/nixpkgs/nixos/tests/lighttpd.nix +++ b/third_party/nixpkgs/nixos/tests/lighttpd.nix @@ -17,5 +17,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { server.wait_for_unit("lighttpd.service") res = server.succeed("curl --fail http://localhost/file.txt") assert "hello nixos test" in res, f"bad server response: '{res}'" + server.succeed("systemctl reload lighttpd") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/livebook-service.nix b/third_party/nixpkgs/nixos/tests/livebook-service.nix new file mode 100644 index 0000000000..9397e3cb75 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/livebook-service.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "livebook-service"; + + nodes = { + machine = { config, pkgs, ... }: { + imports = [ + ./common/user-account.nix + ]; + + services.livebook = { + enableUserService = true; + port = 20123; + environmentFile = pkgs.writeText "livebook.env" '' + LIVEBOOK_PASSWORD = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + ''; + options = { + cookie = "chocolate chip"; + }; + }; + }; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + sudo = lib.concatStringsSep " " [ + "XDG_RUNTIME_DIR=/run/user/${toString user.uid}" + "sudo" + "--preserve-env=XDG_RUNTIME_DIR" + "-u" + "alice" + ]; + in + '' + machine.wait_for_unit("multi-user.target") + + machine.succeed("loginctl enable-linger alice") + machine.wait_until_succeeds("${sudo} systemctl --user is-active livebook.service") + machine.wait_for_open_port(20123) + + machine.succeed("curl -L localhost:20123 | grep 'Type password'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/lxd/container.nix b/third_party/nixpkgs/nixos/tests/lxd/container.nix index bdaaebfc00..0ebe73d872 100644 --- a/third_party/nixpkgs/nixos/tests/lxd/container.nix +++ b/third_party/nixpkgs/nixos/tests/lxd/container.nix @@ -13,6 +13,7 @@ let lxd-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; lxd-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; + lxd-image-rootfs-squashfs = releases.lxdContainerImageSquashfs.${pkgs.stdenv.hostPlatform.system}; in { name = "lxd-container"; @@ -23,7 +24,7 @@ in { nodes.machine = { lib, ... }: { virtualisation = { - diskSize = 4096; + diskSize = 6144; # Since we're testing `limits.cpu`, we've gotta have a known number of # cores to lean on @@ -65,6 +66,16 @@ in { machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") machine.succeed("lxc delete -f container") + with subtest("Squashfs image is functional"): + machine.succeed( + "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs-squashfs} --alias nixos-squashfs" + ) + machine.succeed("lxc launch nixos-squashfs container") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") + machine.succeed("lxc delete -f container") + with subtest("Container is mounted with lxcfs inside"): machine.succeed("lxc launch nixos container") with machine.nested("Waiting for instance to start and be usable"): diff --git a/third_party/nixpkgs/nixos/tests/mailman.nix b/third_party/nixpkgs/nixos/tests/mailman.nix index 2806e9166d..f9b43861a1 100644 --- a/third_party/nixpkgs/nixos/tests/mailman.nix +++ b/third_party/nixpkgs/nixos/tests/mailman.nix @@ -63,5 +63,11 @@ import ./make-test-python.nix { wait_for_api() machine.succeed("curl --fail-with-body -sLSu restadmin:secretpassword http://localhost:8001/3.1/domains") machine.succeed("curl --fail-with-body -sILS http://localhost/") + + with subtest("service locking"): + machine.fail("su -s /bin/sh -c 'mailman start' mailman") + machine.execute("systemctl kill --signal=SIGKILL mailman") + machine.succeed("systemctl restart mailman") + wait_for_api() ''; } diff --git a/third_party/nixpkgs/nixos/tests/misc.nix b/third_party/nixpkgs/nixos/tests/misc.nix index 442b45948c..e7842debba 100644 --- a/third_party/nixpkgs/nixos/tests/misc.nix +++ b/third_party/nixpkgs/nixos/tests/misc.nix @@ -13,6 +13,7 @@ in { environment.variables.EDITOR = lib.mkOverride 0 "emacs"; documentation.nixos.enable = lib.mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; + systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; virtualisation.fileSystems = { "/tmp2" = { fsType = "tmpfs"; options = [ "mode=1777" "noauto" ]; @@ -117,6 +118,9 @@ in { ) machine.fail("[ -e /tmp/foo ]") + with subtest("whether systemd-tmpfiles settings works"): + machine.succeed("[ -e /tmp/somefile ]") + with subtest("whether automounting works"): machine.fail("grep '/tmp2 tmpfs' /proc/mounts") machine.succeed("touch /tmp2/x") diff --git a/third_party/nixpkgs/nixos/tests/mobilizon.nix b/third_party/nixpkgs/nixos/tests/mobilizon.nix index 2b070ca9d9..398c8530dc 100644 --- a/third_party/nixpkgs/nixos/tests/mobilizon.nix +++ b/third_party/nixpkgs/nixos/tests/mobilizon.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ... }: meta.maintainers = with lib.maintainers; [ minijackson erictapen ]; nodes.server = - { ... }: + { pkgs, ... }: { services.mobilizon = { enable = true; @@ -25,6 +25,8 @@ import ./make-test-python.nix ({ lib, ... }: }; }; + services.postgresql.package = pkgs.postgresql_14; + security.pki.certificateFiles = [ certs.ca.cert ]; services.nginx.virtualHosts."${mobilizonDomain}" = { diff --git a/third_party/nixpkgs/nixos/tests/mosquitto.nix b/third_party/nixpkgs/nixos/tests/mosquitto.nix index 8eca4f2592..c0980b23e7 100644 --- a/third_party/nixpkgs/nixos/tests/mosquitto.nix +++ b/third_party/nixpkgs/nixos/tests/mosquitto.nix @@ -4,7 +4,6 @@ let port = 1888; tlsPort = 1889; anonPort = 1890; - bindTestPort = 18910; password = "VERY_secret"; hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw=="; topic = "test/foo"; @@ -127,10 +126,6 @@ in { }; }; } - { - settings.bind_interface = "eth0"; - port = bindTestPort; - } ]; }; }; @@ -140,8 +135,6 @@ in { }; testScript = '' - import json - def mosquitto_cmd(binary, user, topic, port): return ( "mosquitto_{} " @@ -174,27 +167,6 @@ in { start_all() server.wait_for_unit("mosquitto.service") - with subtest("bind_interface"): - addrs = dict() - for iface in json.loads(server.succeed("ip -json address show")): - for addr in iface['addr_info']: - # don't want to deal with multihoming here - assert addr['local'] not in addrs - addrs[addr['local']] = (iface['ifname'], addr['family']) - - # mosquitto grabs *one* random address per type for bind_interface - (has4, has6) = (False, False) - for line in server.succeed("ss -HlptnO sport = ${toString bindTestPort}").splitlines(): - items = line.split() - if "mosquitto" not in items[5]: continue - listener = items[3].rsplit(':', maxsplit=1)[0].strip('[]') - assert listener in addrs - assert addrs[listener][0] == "eth0" - has4 |= addrs[listener][1] == 'inet' - has6 |= addrs[listener][1] == 'inet6' - assert has4 - assert has6 - with subtest("check passwords"): client1.succeed(publish("-m test", "password_store")) client1.succeed(publish("-m test", "password_file")) diff --git a/third_party/nixpkgs/nixos/tests/mysql/common.nix b/third_party/nixpkgs/nixos/tests/mysql/common.nix index 7fdf0f33d3..1cf52347f4 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/common.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/common.nix @@ -3,5 +3,8 @@ mysqlPackages = { inherit (pkgs) mysql80; }; + perconaPackages = { + inherit (pkgs) percona-server_8_0; + }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } diff --git a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix index 6ddc49f86f..3e059cad09 100644 --- a/third_party/nixpkgs/nixos/tests/mysql/mysql.nix +++ b/third_party/nixpkgs/nixos/tests/mysql/mysql.nix @@ -6,7 +6,7 @@ }: let - inherit (import ./common.nix { inherit pkgs lib; }) mkTestName mariadbPackages mysqlPackages; + inherit (import ./common.nix { inherit pkgs lib; }) mkTestName mariadbPackages mysqlPackages perconaPackages; makeTest = import ./../make-test-python.nix; # Setup common users @@ -78,9 +78,6 @@ let }; }; }; - - mariadb = { - }; }; testScript = '' @@ -147,3 +144,8 @@ in // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; }) mariadbPackages) + // (lib.mapAttrs (_: package: makeMySQLTest { + inherit package; + name = "percona_8_0"; + hasMroonga = false; useSocketAuth = false; + }) perconaPackages) diff --git a/third_party/nixpkgs/nixos/tests/netdata.nix b/third_party/nixpkgs/nixos/tests/netdata.nix index c5f7294f79..e3438f6340 100644 --- a/third_party/nixpkgs/nixos/tests/netdata.nix +++ b/third_party/nixpkgs/nixos/tests/netdata.nix @@ -30,8 +30,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { # check if netdata can read disk ops for root owned processes. # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. - url = "http://localhost:19999/api/v1/data\?chart=users.pwrites" - filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + url = "http://localhost:19999/api/v1/data\?chart=user.root_disk_physical_io" + filter = '[.data[range(10)][2]] | add | . < 0' cmd = f"curl -s {url} | jq -e '{filter}'" netdata.wait_until_succeeds(cmd) diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 46fc715d08..768d0cfa22 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -113,8 +113,8 @@ let networking = { useNetworkd = networkd; useDHCP = false; - defaultGateway = "192.168.1.1"; - defaultGateway6 = "fd00:1234:5678:1::1"; + defaultGateway = { address = "192.168.1.1"; interface = "enp1s0"; }; + defaultGateway6 = { address = "fd00:1234:5678:1::1"; interface = "enp1s0"; }; interfaces.enp1s0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } { address = "192.168.1.3"; prefixLength = 32; } @@ -185,7 +185,11 @@ let nodes.router = router; nodes.client = { lib, ... }: { # Disable test driver default config - networking.interfaces = lib.mkForce {}; + networking.interfaces = lib.mkForce { + # Make sure DHCP defaults correctly even when some unrelated config + # is set on the interface (nothing, in this case). + enp1s0 = {}; + }; networking.useNetworkd = networkd; virtualisation.interfaces.enp1s0.vlan = 1; }; diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix index b7af6d6d73..ab1d8353db 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -37,8 +37,6 @@ in { "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; - system.stateVersion = "22.11"; # stateVersion >=21.11 to make sure that we use OpenSSL3 - services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index b9f35b398c..19d04b28b4 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -8,10 +8,6 @@ with pkgs.lib; foldl (matrix: ver: matrix // { "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; }; - "openssl-sse${toString ver}" = import ./openssl-sse.nix { - inherit system pkgs; - nextcloudVersion = ver; - }; "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix { inherit system pkgs; nextcloudVersion = ver; @@ -26,4 +22,4 @@ foldl }; }) { } - [ 25 26 27 ] + [ 26 27 ] diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix b/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix deleted file mode 100644 index d6ea39c615..0000000000 --- a/third_party/nixpkgs/nixos/tests/nextcloud/openssl-sse.nix +++ /dev/null @@ -1,109 +0,0 @@ -args@{ pkgs, nextcloudVersion ? 25, ... }: - -(import ../make-test-python.nix ({ pkgs, ...}: let - adminuser = "root"; - adminpass = "notproduction"; - nextcloudBase = { - networking.firewall.allowedTCPPorts = [ 80 ]; - system.stateVersion = "22.05"; # stateVersions <22.11 use openssl 1.1 by default - services.nextcloud = { - enable = true; - config.adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; - database.createLocally = true; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; - }; - }; -in { - name = "nextcloud-openssl"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; - }; - nodes.nextcloudwithopenssl1 = { - imports = [ nextcloudBase ]; - services.nextcloud.hostName = "nextcloudwithopenssl1"; - }; - nodes.nextcloudwithopenssl3 = { - imports = [ nextcloudBase ]; - services.nextcloud = { - hostName = "nextcloudwithopenssl3"; - enableBrokenCiphersForSSE = false; - }; - }; - testScript = { nodes, ... }: let - withRcloneEnv = host: pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://${host}/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - "''${@}" - ''; - withRcloneEnv1 = withRcloneEnv "nextcloudwithopenssl1"; - withRcloneEnv3 = withRcloneEnv "nextcloudwithopenssl3"; - copySharedFile1 = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${withRcloneEnv1} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - copySharedFile3 = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'bye' | ${withRcloneEnv3} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file2 - ''; - openssl1-node = nodes.nextcloudwithopenssl1.system.build.toplevel; - openssl3-node = nodes.nextcloudwithopenssl3.system.build.toplevel; - in '' - nextcloudwithopenssl1.start() - nextcloudwithopenssl1.wait_for_unit("multi-user.target") - nextcloudwithopenssl1.succeed("nextcloud-occ status") - nextcloudwithopenssl1.succeed("curl -sSf http://nextcloudwithopenssl1/login") - nextcloud_version = ${toString nextcloudVersion} - - with subtest("With OpenSSL 1 SSE can be enabled and used"): - nextcloudwithopenssl1.succeed("nextcloud-occ app:enable encryption") - nextcloudwithopenssl1.succeed("nextcloud-occ encryption:enable") - - with subtest("Upload file and ensure it's encrypted"): - nextcloudwithopenssl1.succeed("${copySharedFile1}") - nextcloudwithopenssl1.succeed("grep -E '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") - nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") - - with subtest("Switch to OpenSSL 3"): - nextcloudwithopenssl1.succeed("${openssl3-node}/bin/switch-to-configuration test") - nextcloudwithopenssl1.wait_for_open_port(80) - nextcloudwithopenssl1.succeed("nextcloud-occ status") - - with subtest("Existing encrypted files cannot be read, but new files can be added"): - # This will succeed starting NC26 because of their custom implementation of openssl_seal - read_existing_file_test = nextcloudwithopenssl1.fail if nextcloud_version < 26 else nextcloudwithopenssl1.succeed - read_existing_file_test("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file >&2") - nextcloudwithopenssl1.succeed("nextcloud-occ encryption:disable") - nextcloudwithopenssl1.succeed("${copySharedFile3}") - nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2") - nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") - - with subtest("Switch back to OpenSSL 1.1 and ensure that encrypted files are readable again"): - nextcloudwithopenssl1.succeed("${openssl1-node}/bin/switch-to-configuration test") - nextcloudwithopenssl1.wait_for_open_port(80) - nextcloudwithopenssl1.succeed("nextcloud-occ status") - nextcloudwithopenssl1.succeed("nextcloud-occ encryption:enable") - nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") - nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") - nextcloudwithopenssl1.succeed("grep -E '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") - nextcloudwithopenssl1.succeed("grep bye /var/lib/nextcloud/data/root/files/test-shared-file2") - - with subtest("Ensure that everything can be decrypted"): - nextcloudwithopenssl1.succeed("echo y | nextcloud-occ encryption:decrypt-all >&2") - nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") - nextcloudwithopenssl1.succeed("${withRcloneEnv1} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") - nextcloudwithopenssl1.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud/data/root/files/test-shared-file") - - with subtest("Switch to OpenSSL 3 ensure that all files are usable now"): - nextcloudwithopenssl1.succeed("${openssl3-node}/bin/switch-to-configuration test") - nextcloudwithopenssl1.wait_for_open_port(80) - nextcloudwithopenssl1.succeed("nextcloud-occ status") - nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file2 | grep bye") - nextcloudwithopenssl1.succeed("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file | grep hi") - - nextcloudwithopenssl1.shutdown() - ''; -})) args diff --git a/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix b/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix deleted file mode 100644 index 92ba30a09c..0000000000 --- a/third_party/nixpkgs/nixos/tests/nginx-sandbox.nix +++ /dev/null @@ -1,65 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "nginx-sandbox"; - meta = with pkgs.lib.maintainers; { - maintainers = [ izorkin ]; - }; - - # This test checks the creation and reading of a file in sandbox mode. Used simple lua script. - - nodes.machine = { pkgs, ... }: { - nixpkgs.overlays = [ - (self: super: { - nginx-lua = super.nginx.override { - modules = [ - pkgs.nginxModules.lua - ]; - }; - }) - ]; - services.nginx.enable = true; - services.nginx.package = pkgs.nginx-lua; - services.nginx.virtualHosts.localhost = { - extraConfig = '' - location /test1-write { - content_by_lua_block { - local create = os.execute('${pkgs.coreutils}/bin/mkdir /tmp/test1-read') - local create = os.execute('${pkgs.coreutils}/bin/touch /tmp/test1-read/foo.txt') - local echo = os.execute('${pkgs.coreutils}/bin/echo worked > /tmp/test1-read/foo.txt') - } - } - location /test1-read { - root /tmp; - } - location /test2-write { - content_by_lua_block { - local create = os.execute('${pkgs.coreutils}/bin/mkdir /var/web/test2-read') - local create = os.execute('${pkgs.coreutils}/bin/touch /var/web/test2-read/bar.txt') - local echo = os.execute('${pkgs.coreutils}/bin/echo error-worked > /var/web/test2-read/bar.txt') - } - } - location /test2-read { - root /var/web; - } - ''; - }; - users.users.foo.isNormalUser = true; - }; - - testScript = '' - machine.wait_for_unit("nginx") - machine.wait_for_open_port(80) - - # Checking write in temporary folder - machine.succeed("$(curl -vvv http://localhost/test1-write)") - machine.succeed('test "$(curl -fvvv http://localhost/test1-read/foo.txt)" = worked') - - # Checking write in protected folder. In sandbox mode for the nginx service, the folder /var/web is mounted - # in read-only mode. - machine.succeed("mkdir -p /var/web") - machine.succeed("chown nginx:nginx /var/web") - machine.succeed("$(curl -vvv http://localhost/test2-write)") - assert "404 Not Found" in machine.succeed( - "curl -vvv -s http://localhost/test2-read/bar.txt" - ) - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/nginx-unix-socket.nix b/third_party/nixpkgs/nixos/tests/nginx-unix-socket.nix new file mode 100644 index 0000000000..4640eaa171 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nginx-unix-socket.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + nginxSocketPath = "/var/run/nginx/test.sock"; +in +{ + name = "nginx-unix-socket"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost = { + serverName = "localhost"; + listen = [{ addr = "unix:${nginxSocketPath}"; }]; + locations."/test".return = "200 'foo'"; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_unix_socket("${nginxSocketPath}") + + webserver.succeed("curl --fail --silent --unix-socket '${nginxSocketPath}' http://localhost/test | grep '^foo$'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix b/third_party/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix new file mode 100644 index 0000000000..3ade90ea24 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nixos-rebuild-install-bootloader.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nixos-rebuild-install-bootloader"; + + nodes = { + machine = { lib, pkgs, ... }: { + imports = [ + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; + + system.includeBuildDependencies = true; + + virtualisation = { + cores = 2; + memorySize = 2048; + }; + + virtualisation.useBootLoader = true; + }; + }; + + testScript = + let + configFile = pkgs.writeText "configuration.nix" '' + { lib, pkgs, ... }: { + imports = [ + ./hardware-configuration.nix + + ]; + + boot.loader.grub = { + enable = true; + device = "/dev/vda"; + forceInstall = true; + }; + + documentation.enable = false; + } + ''; + + in + '' + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + + machine.succeed("nixos-generate-config") + machine.copy_from_host( + "${configFile}", + "/etc/nixos/configuration.nix", + ) + machine.succeed("nixos-rebuild switch") + + # Need to run `nixos-rebuild` twice because the first run will install + # GRUB anyway + with subtest("Switch system again and install bootloader"): + result = machine.succeed("nixos-rebuild switch --install-bootloader") + # install-grub2.pl messages + assert "updating GRUB 2 menu..." in result + assert "installing the GRUB 2 boot loader on /dev/vda..." in result + # GRUB message + assert "Installation finished. No error reported." in result + # at this point we've tested regression #262724, but haven't tested the bootloader itself + # TODO: figure out how to how to tell the test driver to start the bootloader instead of + # booting into the kernel directly. + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nixos-test-driver/timeout.nix b/third_party/nixpkgs/nixos/tests/nixos-test-driver/timeout.nix new file mode 100644 index 0000000000..29bd85d249 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nixos-test-driver/timeout.nix @@ -0,0 +1,15 @@ +{ + name = "Test that sleep of 6 seconds fails a timeout of 5 seconds"; + globalTimeout = 5; + + nodes = { + machine = ({ pkgs, ... }: { + }); + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("sleep 6") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/non-switchable-system.nix b/third_party/nixpkgs/nixos/tests/non-switchable-system.nix new file mode 100644 index 0000000000..54bede7545 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/non-switchable-system.nix @@ -0,0 +1,15 @@ +{ lib, ... }: + +{ + name = "non-switchable-system"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { + system.switch.enable = false; + }; + + testScript = '' + machine.succeed("test ! -e /run/current-system/bin/switch-to-configuration") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/openresty-lua.nix b/third_party/nixpkgs/nixos/tests/openresty-lua.nix index b177b3c194..9e987398f5 100644 --- a/third_party/nixpkgs/nixos/tests/openresty-lua.nix +++ b/third_party/nixpkgs/nixos/tests/openresty-lua.nix @@ -16,6 +16,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: nodes = { webserver = { pkgs, lib, ... }: { + networking = { + extraHosts = '' + 127.0.0.1 default.test + 127.0.0.1 sandbox.test + ''; + }; services.nginx = { enable = true; package = pkgs.openresty; @@ -24,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: lua_package_path '${luaPath};;'; ''; - virtualHosts."default" = { + virtualHosts."default.test" = { default = true; locations."/" = { extraConfig = '' @@ -36,6 +42,33 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; }; }; + + virtualHosts."sandbox.test" = { + locations."/test1-write" = { + extraConfig = '' + content_by_lua_block { + local create = os.execute('${pkgs.coreutils}/bin/mkdir /tmp/test1-read') + local create = os.execute('${pkgs.coreutils}/bin/touch /tmp/test1-read/foo.txt') + local echo = os.execute('${pkgs.coreutils}/bin/echo worked > /tmp/test1-read/foo.txt') + } + ''; + }; + locations."/test1-read" = { + root = "/tmp"; + }; + locations."/test2-write" = { + extraConfig = '' + content_by_lua_block { + local create = os.execute('${pkgs.coreutils}/bin/mkdir /var/web/test2-read') + local create = os.execute('${pkgs.coreutils}/bin/touch /var/web/test2-read/bar.txt') + local echo = os.execute('${pkgs.coreutils}/bin/echo error-worked > /var/web/test2-read/bar.txt') + } + ''; + }; + locations."/test2-read" = { + root = "/var/web"; + }; + }; }; }; }; @@ -51,5 +84,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: f"curl -w '%{{http_code}}' --head --fail {url}" ) assert http_code.split("\n")[-1] == "200" + + # This test checks the creation and reading of a file in sandbox mode. + # Checking write in temporary folder + webserver.succeed("$(curl -vvv http://sandbox.test/test1-write)") + webserver.succeed('test "$(curl -fvvv http://sandbox.test/test1-read/foo.txt)" = worked') + # Checking write in protected folder. In sandbox mode for the nginx service, the folder /var/web is mounted + # in read-only mode. + webserver.succeed("mkdir -p /var/web") + webserver.succeed("chown nginx:nginx /var/web") + webserver.succeed("$(curl -vvv http://sandbox.test/test2-write)") + assert "404 Not Found" in machine.succeed( + "curl -vvv -s http://sandbox.test/test2-read/bar.txt" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/opensearch.nix b/third_party/nixpkgs/nixos/tests/opensearch.nix index c0caf950cb..2887ac9677 100644 --- a/third_party/nixpkgs/nixos/tests/opensearch.nix +++ b/third_party/nixpkgs/nixos/tests/opensearch.nix @@ -31,14 +31,9 @@ in services.opensearch.dataDir = "/var/opensearch_test"; services.opensearch.user = "open_search"; services.opensearch.group = "open_search"; - system.activationScripts.createDirectory = { - text = '' - mkdir -p "/var/opensearch_test" - chown open_search:open_search /var/opensearch_test - chmod 0700 /var/opensearch_test - ''; - deps = [ "users" "groups" ]; - }; + systemd.tmpfiles.rules = [ + "d /var/opensearch_test 0700 open_search open_search -" + ]; users = { groups.open_search = {}; users.open_search = { diff --git a/third_party/nixpkgs/nixos/tests/openssh.nix b/third_party/nixpkgs/nixos/tests/openssh.nix index e88625678f..7994974779 100644 --- a/third_party/nixpkgs/nixos/tests/openssh.nix +++ b/third_party/nixpkgs/nixos/tests/openssh.nix @@ -22,7 +22,7 @@ in { ]; }; - server_lazy = + server-lazy = { ... }: { @@ -34,7 +34,7 @@ in { ]; }; - server_localhost_only = + server-localhost-only = { ... }: { @@ -43,7 +43,7 @@ in { }; }; - server_localhost_only_lazy = + server-localhost-only-lazy = { ... }: { @@ -52,7 +52,7 @@ in { }; }; - server_match_rule = + server-match-rule = { ... }: { @@ -82,6 +82,19 @@ in { }; }; + server_allowedusers = + { ... }: + + { + services.openssh = { enable = true; settings.AllowUsers = [ "alice" "bob" ]; }; + users.groups = { alice = { }; bob = { }; carol = { }; }; + users.users = { + alice = { isNormalUser = true; group = "alice"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + bob = { isNormalUser = true; group = "bob"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + carol = { isNormalUser = true; group = "carol"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + }; + }; + client = { ... }: { }; @@ -90,7 +103,12 @@ in { testScript = '' start_all() - server.wait_for_unit("sshd") + server.wait_for_unit("sshd", timeout=30) + server_localhost_only.wait_for_unit("sshd", timeout=30) + server_match_rule.wait_for_unit("sshd", timeout=30) + + server_lazy.wait_for_unit("sshd.socket", timeout=30) + server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30) with subtest("manual-authkey"): client.succeed("mkdir -m 700 /root/.ssh") @@ -119,11 +137,11 @@ in { ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server-lazy 'echo hello world' >&2", timeout=30 ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server-lazy 'ulimit -l' | grep 1024", timeout=30 ) @@ -137,7 +155,7 @@ in { timeout=30 ) client.succeed( - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-lazy true", timeout=30 ) @@ -147,5 +165,23 @@ in { with subtest("match-rules"): server_match_rule.succeed("ss -nlt | grep '127.0.0.1:22'") + + with subtest("allowed-users"): + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil alice@server_allowedusers true", + timeout=30 + ) + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil bob@server_allowedusers true", + timeout=30 + ) + client.fail( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil carol@server_allowedusers true", + timeout=30 + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix b/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix index 07408dea79..46e307a3f1 100644 --- a/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix +++ b/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix @@ -20,7 +20,7 @@ import ../make-test-python.nix ({ ... }: '' machine.wait_for_unit("multi-user.target") machine.succeed( - 'egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue.*origin=nixos-test" /etc/pam.d/ -R' + 'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test" /etc/pam.d/ -R' ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/pam/test_chfn.py b/third_party/nixpkgs/nixos/tests/pam/test_chfn.py index a48438b8d3..3cfbb3908e 100644 --- a/third_party/nixpkgs/nixos/tests/pam/test_chfn.py +++ b/third_party/nixpkgs/nixos/tests/pam/test_chfn.py @@ -6,7 +6,7 @@ expected_lines = { "auth required pam_deny.so", "auth sufficient @@pam_ccreds@@/lib/security/pam_ccreds.so action=store use_first_pass", "auth sufficient pam_rootok.so", - "auth sufficient pam_unix.so likeauth try_first_pass", + "auth sufficient pam_unix.so likeauth try_first_pass", "password sufficient @@pam_krb5@@/lib/security/pam_krb5.so use_first_pass", "password sufficient pam_unix.so nullok yescrypt", "session optional @@pam_krb5@@/lib/security/pam_krb5.so", @@ -15,9 +15,10 @@ expected_lines = { } actual_lines = set(machine.succeed("cat /etc/pam.d/chfn").splitlines()) -missing_lines = expected_lines - actual_lines -extra_lines = actual_lines - expected_lines -non_functional_lines = set([line for line in extra_lines if (line == "" or line.startswith("#"))]) +stripped_lines = set([line.split("#")[0].rstrip() for line in actual_lines]) +missing_lines = expected_lines - stripped_lines +extra_lines = stripped_lines - expected_lines +non_functional_lines = set([line for line in extra_lines if line == ""]) unexpected_functional_lines = extra_lines - non_functional_lines with subtest("All expected lines are in the file"): diff --git a/third_party/nixpkgs/nixos/tests/paperless.nix b/third_party/nixpkgs/nixos/tests/paperless.nix index ce6a4d8128..22409e8992 100644 --- a/third_party/nixpkgs/nixos/tests/paperless.nix +++ b/third_party/nixpkgs/nixos/tests/paperless.nix @@ -2,65 +2,88 @@ import ./make-test-python.nix ({ lib, ... }: { name = "paperless"; meta.maintainers = with lib.maintainers; [ erikarvstedt Flakebi ]; - nodes.machine = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ imagemagick jq ]; - services.paperless = { - enable = true; - passwordFile = builtins.toFile "password" "admin"; + nodes = let self = { + simple = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ imagemagick jq ]; + services.paperless = { + enable = true; + passwordFile = builtins.toFile "password" "admin"; + }; }; - }; + postgres = { config, pkgs, ... }: { + imports = [ self.simple ]; + services.postgresql = { + enable = true; + ensureDatabases = [ "paperless" ]; + ensureUsers = [ + { name = config.services.paperless.user; + ensurePermissions = { "DATABASE \"paperless\"" = "ALL PRIVILEGES"; }; + } + ]; + }; + services.paperless.extraConfig = { + PAPERLESS_DBHOST = "/run/postgresql"; + }; + }; + }; in self; testScript = '' import json - machine.wait_for_unit("paperless-consumer.service") + def test_paperless(node): + node.wait_for_unit("paperless-consumer.service") - with subtest("Add a document via the file system"): - machine.succeed( - "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " - "-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" + with subtest("Add a document via the file system"): + node.succeed( + "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " + "-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" ) - with subtest("Web interface gets ready"): - machine.wait_for_unit("paperless-web.service") + with subtest("Web interface gets ready"): + node.wait_for_unit("paperless-web.service") # Wait until server accepts connections - machine.wait_until_succeeds("curl -fs localhost:28981") + node.wait_until_succeeds("curl -fs localhost:28981") - # Required for consuming documents via the web interface - with subtest("Task-queue gets ready"): - machine.wait_for_unit("paperless-task-queue.service") + # Required for consuming documents via the web interface + with subtest("Task-queue gets ready"): + node.wait_for_unit("paperless-task-queue.service") - with subtest("Add a png document via the web interface"): - machine.succeed( - "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " - "-annotate +5+20 'hello web 16-10-2005' /tmp/webdoc.png" + with subtest("Add a png document via the web interface"): + node.succeed( + "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " + "-annotate +5+20 'hello web 16-10-2005' /tmp/webdoc.png" ) - machine.wait_until_succeeds("curl -u admin:admin -F document=@/tmp/webdoc.png -fs localhost:28981/api/documents/post_document/") + node.wait_until_succeeds("curl -u admin:admin -F document=@/tmp/webdoc.png -fs localhost:28981/api/documents/post_document/") - with subtest("Add a txt document via the web interface"): - machine.succeed( - "echo 'hello web 16-10-2005' > /tmp/webdoc.txt" + with subtest("Add a txt document via the web interface"): + node.succeed( + "echo 'hello web 16-10-2005' > /tmp/webdoc.txt" ) - machine.wait_until_succeeds("curl -u admin:admin -F document=@/tmp/webdoc.txt -fs localhost:28981/api/documents/post_document/") + node.wait_until_succeeds("curl -u admin:admin -F document=@/tmp/webdoc.txt -fs localhost:28981/api/documents/post_document/") - with subtest("Documents are consumed"): - machine.wait_until_succeeds( - "(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 3))" + with subtest("Documents are consumed"): + node.wait_until_succeeds( + "(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 3))" ) - docs = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/"))['results'] + docs = json.loads(node.succeed("curl -u admin:admin -fs localhost:28981/api/documents/"))['results'] assert "2005-10-16" in docs[0]['created'] assert "2005-10-16" in docs[1]['created'] assert "2005-10-16" in docs[2]['created'] - # Detects gunicorn issues, see PR #190888 - with subtest("Document metadata can be accessed"): - metadata = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/1/metadata/")) + # Detects gunicorn issues, see PR #190888 + with subtest("Document metadata can be accessed"): + metadata = json.loads(node.succeed("curl -u admin:admin -fs localhost:28981/api/documents/1/metadata/")) assert "original_checksum" in metadata - metadata = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/2/metadata/")) + metadata = json.loads(node.succeed("curl -u admin:admin -fs localhost:28981/api/documents/2/metadata/")) assert "original_checksum" in metadata - metadata = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/3/metadata/")) + metadata = json.loads(node.succeed("curl -u admin:admin -fs localhost:28981/api/documents/3/metadata/")) assert "original_checksum" in metadata + + test_paperless(simple) + simple.send_monitor_command("quit") + simple.wait_for_shutdown() + test_paperless(postgres) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/plantuml-server.nix b/third_party/nixpkgs/nixos/tests/plantuml-server.nix new file mode 100644 index 0000000000..460c30919a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/plantuml-server.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "plantuml-server"; + meta.maintainers = with lib.maintainers; [ anthonyroussel ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.plantuml-server.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("plantuml-server.service") + machine.wait_for_open_port(8080) + + with subtest("Generate chart"): + chart_id = machine.succeed("curl -sSf http://localhost:8080/plantuml/coder -d 'Alice -> Bob'") + machine.succeed("curl -sSf http://localhost:8080/plantuml/txt/{}".format(chart_id)) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/plausible.nix b/third_party/nixpkgs/nixos/tests/plausible.nix index ef32bb3a80..9c26c509a5 100644 --- a/third_party/nixpkgs/nixos/tests/plausible.nix +++ b/third_party/nixpkgs/nixos/tests/plausible.nix @@ -1,16 +1,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "plausible"; meta = with lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { virtualisation.memorySize = 4096; services.plausible = { enable = true; - releaseCookiePath = "${pkgs.runCommand "cookie" { } '' - ${pkgs.openssl}/bin/openssl rand -base64 64 >"$out" - ''}"; adminUser = { email = "admin@example.org"; passwordFile = "${pkgs.writeText "pwd" "foobar"}"; @@ -28,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("plausible.service") machine.wait_for_open_port(8000) + # Ensure that the software does not make not make the machine + # listen on any public interfaces by default. + machine.fail("ss -tlpn 'src = 0.0.0.0 or src = [::]' | grep LISTEN") + machine.succeed("curl -f localhost:8000 >&2") machine.succeed("curl -f localhost:8000/js/script.js >&2") diff --git a/third_party/nixpkgs/nixos/tests/pleroma.nix b/third_party/nixpkgs/nixos/tests/pleroma.nix index 4f1aef8541..08a01585f8 100644 --- a/third_party/nixpkgs/nixos/tests/pleroma.nix +++ b/third_party/nixpkgs/nixos/tests/pleroma.nix @@ -164,9 +164,12 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500 mkdir -p $out - cp key.pem cert.pem $out + openssl req -x509 \ + -subj '/CN=pleroma.nixos.test/' -days 49710 \ + -addext 'subjectAltName = DNS:pleroma.nixos.test' \ + -keyout "$out/key.pem" -newkey ed25519 \ + -out "$out/cert.pem" -noenc ''; hosts = nodes: '' @@ -180,7 +183,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - toot + pkgs.toot send-toot ]; }; diff --git a/third_party/nixpkgs/nixos/tests/postgresql.nix b/third_party/nixpkgs/nixos/tests/postgresql.nix index b44849e0a1..c0dd24cf6a 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql.nix @@ -219,8 +219,6 @@ let in concatMapAttrs (name: package: { ${name} = make-postgresql-test name package false; + ${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true; ${name + "-clauses"} = mk-ensure-clauses-test name package; }) postgresql-versions - // { - postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true; - } diff --git a/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix b/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix index 42183625c7..51d5e8ae59 100644 --- a/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix +++ b/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix @@ -36,7 +36,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd, systemdStage networking.useDHCP = !withNetworkd; # Check if predictable interface names are working in stage-1 - boot.initrd.postDeviceCommands = script; + boot.initrd.postDeviceCommands = lib.mkIf (!systemdStage1) script; boot.initrd.systemd = lib.mkIf systemdStage1 { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/printing.nix b/third_party/nixpkgs/nixos/tests/printing.nix index 7df042e72e..29c5d810f2 100644 --- a/third_party/nixpkgs/nixos/tests/printing.nix +++ b/third_party/nixpkgs/nixos/tests/printing.nix @@ -19,6 +19,7 @@ import ./make-test-python.nix ( startWhenNeeded = socket; listenAddresses = [ "*:631" ]; defaultShared = true; + openFirewall = true; extraConf = '' Order allow,deny @@ -26,7 +27,6 @@ import ./make-test-python.nix ( ''; }; - networking.firewall.allowedTCPPorts = [ 631 ]; # Add a HP Deskjet printer connected via USB to the server. hardware.printers.ensurePrinters = [{ name = "DeskjetLocal"; diff --git a/third_party/nixpkgs/nixos/tests/privacyidea.nix b/third_party/nixpkgs/nixos/tests/privacyidea.nix deleted file mode 100644 index 401ad72c37..0000000000 --- a/third_party/nixpkgs/nixos/tests/privacyidea.nix +++ /dev/null @@ -1,43 +0,0 @@ -# Miscellaneous small tests that don't warrant their own VM run. - -import ./make-test-python.nix ({ pkgs, ...} : rec { - name = "privacyidea"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; - }; - - nodes.machine = { ... }: { - virtualisation.cores = 2; - - services.privacyidea = { - enable = true; - secretKey = "$SECRET_KEY"; - pepper = "$PEPPER"; - adminPasswordFile = pkgs.writeText "admin-password" "testing"; - adminEmail = "root@localhost"; - - # Don't try this at home! - environmentFile = pkgs.writeText "pi-secrets.env" '' - SECRET_KEY=testing - PEPPER=testing - ''; - }; - services.nginx = { - enable = true; - virtualHosts."_".locations."/".extraConfig = '' - uwsgi_pass unix:/run/privacyidea/socket; - ''; - }; - }; - - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") - machine.succeed("curl --fail http://localhost | grep privacyIDEA") - machine.succeed("grep \"SECRET_KEY = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") - machine.succeed("grep \"PI_PEPPER = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") - machine.succeed( - "curl --fail http://localhost/auth -F username=admin -F password=testing | grep token" - ) - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 8369d6a497..7840130d4a 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -257,6 +257,21 @@ let ''; }; + exportarr-sonarr = { + nodeName = "exportarr_sonarr"; + exporterConfig = { + enable = true; + url = "http://127.0.0.1:8989"; + # testing for real data is tricky, because the api key can not be preconfigured + apiKeyFile = pkgs.writeText "dummy-api-key" "eccff6a992bc2e4b88e46d064b26bb4e"; + }; + exporterTest = '' + wait_for_unit("prometheus-exportarr-sonarr-exporter.service") + wait_for_open_port(9707) + succeed("curl -sSf 'http://localhost:9707/metrics") + ''; + }; + fastly = { exporterConfig = { enable = true; @@ -416,8 +431,8 @@ let }; kea = let - controlSocketPathV4 = "/run/kea/dhcp4.sock"; - controlSocketPathV6 = "/run/kea/dhcp6.sock"; + controlSocketPathV4 = "/run/kea-dhcp4/dhcp4.sock"; + controlSocketPathV6 = "/run/kea-dhcp6/dhcp6.sock"; in { exporterConfig = { @@ -471,7 +486,7 @@ let services.knot = { enable = true; extraArgs = [ "-v" ]; - extraConfig = '' + settingsFile = pkgs.writeText "knot.conf" '' server: listen: 127.0.0.1@53 @@ -512,7 +527,7 @@ let wait_for_unit("knot.service") wait_for_unit("prometheus-knot-exporter.service") wait_for_open_port(9433) - succeed("curl -sSf 'localhost:9433' | grep 'knot_server_zone_count 1.0'") + succeed("curl -sSf 'localhost:9433' | grep '2\.019031301'") ''; }; @@ -969,7 +984,7 @@ let pgbouncer = { exporterConfig = { enable = true; - connectionString = "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable"; + connectionStringFile = pkgs.writeText "connection.conf" "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable"; }; metricProvider = { @@ -1318,12 +1333,12 @@ let wait_for_open_port(9374) wait_until_succeeds( "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format( - 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1"} ' + 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source=""} ' ) ) wait_until_succeeds( "curl -sSf localhost:9374/metrics | grep '{}'".format( - 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1"}' + 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source=""}' ) ) ''; diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 3b9ea2f85b..4111720cf6 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -4,6 +4,7 @@ import ./make-test-python.nix ( let remoteRepository = "/root/restic-backup"; remoteFromFileRepository = "/root/restic-backup-from-file"; + remoteNoInitRepository = "/root/restic-backup-no-init"; rcloneRepository = "rclone:local:/root/restic-rclone-backup"; backupPrepareCommand = '' @@ -21,7 +22,10 @@ import ./make-test-python.nix ( unpackPhase = "true"; installPhase = '' mkdir $out - touch $out/some_file + echo some_file > $out/some_file + echo some_other_file > $out/some_other_file + mkdir $out/a_dir + echo a_file > $out/a_dir/a_file ''; }; @@ -51,11 +55,21 @@ import ./make-test-python.nix ( inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; repository = remoteRepository; initialize = true; + timerConfig = null; # has no effect here, just checking that it doesn't break the service }; remote-from-file-backup = { - inherit passwordFile paths exclude pruneOpts; + inherit passwordFile exclude pruneOpts; initialize = true; repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository; + paths = [ "/opt/a_dir" ]; + dynamicFilesFrom = '' + find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir + ''; + }; + remote-noinit-backup = { + inherit passwordFile exclude pruneOpts paths; + initialize = false; + repository = remoteNoInitRepository; }; rclonebackup = { inherit passwordFile paths exclude pruneOpts; @@ -107,6 +121,7 @@ import ./make-test-python.nix ( "cp -rT ${testDir} /opt", "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /root/restic-rclone-backup", + "restic-remote-noinit-backup init", # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", @@ -123,13 +138,22 @@ import ./make-test-python.nix ( "systemctl start restic-backups-remote-from-file-backup.service", 'restic-remote-from-file-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that remote-noinit-backup produces a snapshot + "systemctl start restic-backups-remote-noinit-backup.service", + 'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + + # test that restoring that snapshot produces the same directory + "mkdir /tmp/restore-2", + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-2", + "diff -ru ${testDir} /tmp/restore-2/opt", + # test that rclonebackup produces a snapshot "systemctl start restic-backups-rclonebackup.service", 'restic-rclonebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', # test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines "systemctl start restic-backups-custompackage.service", - "grep 'backup.* /opt' /root/fake-restic.log", + "grep 'backup' /root/fake-restic.log", "grep 'check.* --some-check-option' /root/fake-restic.log", # test that we can create four snapshots in remotebackup and rclonebackup diff --git a/third_party/nixpkgs/nixos/tests/rkvm/cert.pem b/third_party/nixpkgs/nixos/tests/rkvm/cert.pem new file mode 100644 index 0000000000..933efe5205 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rkvm/cert.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC3jCCAcagAwIBAgIUWW1hb9xdRtxAhA42jkS89goW9LUwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEcmt2bTAeFw0yMzA4MjIxOTI1NDlaFw0zMzA4MTkxOTI1 +NDlaMA8xDTALBgNVBAMMBHJrdm0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCuBsh0+LDXN4b2o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGF +ICIX+H3dqQOziGSCTAQGJD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLP +KaEbWEsvQbr3RMx8WOtG4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0M +OkgOZW9XLfKiAWlZoyXEkBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIu +R/wJ8OQXHP6boQLQGUhCWBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdyl +TCs9bSqHXZjqMBoiSp22uH6+Lh9RAgMBAAGjMjAwMA8GA1UdEQQIMAaHBAoAAAEw +HQYDVR0OBBYEFEh9HEsnY3dfNKVyPWDbwfR0qHopMA0GCSqGSIb3DQEBCwUAA4IB +AQB/r+K20JqegUZ/kepPxIU95YY81aUUoxvLbu4EAgh8o46Fgm75qrTZPg4TaIZa +wtVejekrF+p3QVf0ErUblh/iCjTZPSzCmKHZt8cc9OwTH7bt3bx7heknzLDyIa5z +szAL+6241UggQ5n5NUGn5+xZHA7TMe47xAZPaRMlCQ/tp5pWFjH6WSSQSP5t4Ag9 +ObhY+uudFjmWi3QIBTr3iIscbWx7tD8cjus7PzM7+kszSDRV04xb6Ox8JzW9MKIN +GwgwVgs3zCuyqBmTGnR1og3aMk6VtlyZUYE78uuc+fMBxqoBZ0mykeOp0Tbzgtf7 +gPkYcQ6vonoQhuTXYj/NrY+b +-----END CERTIFICATE----- diff --git a/third_party/nixpkgs/nixos/tests/rkvm/default.nix b/third_party/nixpkgs/nixos/tests/rkvm/default.nix new file mode 100644 index 0000000000..22425948d8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rkvm/default.nix @@ -0,0 +1,104 @@ +import ../make-test-python.nix ({ pkgs, ... }: +let + # Generated with + # + # nix shell .#rkvm --command "rkvm-certificate-gen --ip-addresses 10.0.0.1 cert.pem key.pem" + # + snakeoil-cert = ./cert.pem; + snakeoil-key = ./key.pem; +in +{ + name = "rkvm"; + + nodes = { + server = { pkgs, ... }: { + imports = [ ../common/user-account.nix ]; + + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.getty.autologinUser = "alice"; + + services.rkvm.server = { + enable = true; + settings = { + certificate = snakeoil-cert; + key = snakeoil-key; + password = "snakeoil"; + switch-keys = [ "left-alt" "right-alt" ]; + }; + }; + }; + + client = { pkgs, ... }: { + imports = [ ../common/user-account.nix ]; + + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.2/24"; + }; + + services.getty.autologinUser = "alice"; + + services.rkvm.client = { + enable = true; + settings = { + server = "10.0.0.1:5258"; + certificate = snakeoil-cert; + key = snakeoil-key; + password = "snakeoil"; + }; + }; + }; + }; + + testScript = '' + server.wait_for_unit("getty@tty1.service") + server.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + server.wait_for_unit("rkvm-server") + server.wait_for_open_port(5258) + + client.wait_for_unit("getty@tty1.service") + client.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + client.wait_for_unit("rkvm-client") + + server.sleep(1) + + # Switch to client + server.send_key("alt-alt_r", delay=0.2) + server.send_chars("echo 'hello client' > /tmp/test.txt\n") + + # Switch to server + server.send_key("alt-alt_r", delay=0.2) + server.send_chars("echo 'hello server' > /tmp/test.txt\n") + + server.sleep(1) + + client.systemctl("stop rkvm-client.service") + server.systemctl("stop rkvm-server.service") + + server_file = server.succeed("cat /tmp/test.txt") + assert server_file.strip() == "hello server" + + client_file = client.succeed("cat /tmp/test.txt") + assert client_file.strip() == "hello client" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/rkvm/key.pem b/third_party/nixpkgs/nixos/tests/rkvm/key.pem new file mode 100644 index 0000000000..7197decff8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rkvm/key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCuBsh0+LDXN4b2 +o/PJjzuiZ9Yv9Pz1Oho9WRiXtNIuHTRdBCcht/iu3PGFICIX+H3dqQOziGSCTAQG +JD2p+1ik8d+boJbpa0oxXuHuomsMAT3mib3GpipQoBLPKaEbWEsvQbr3RMx8WOtG +4dmRQFzSVVtmAXyM0pNyisd4eUCplyIl9gsRJIvsO/0MOkgOZW9XLfKiAWlZoyXE +kBmPAshg3EkwQtmwxPA/NgWbAOW3zJKSChxnnGYiuIIuR/wJ8OQXHP6boQLQGUhC +WBKa1uK1gEBmV3Pj6uK8RzTkQq6/47F5sPa6VfqQYdylTCs9bSqHXZjqMBoiSp22 +uH6+Lh9RAgMBAAECggEABo2V1dBu5E51zsAiFCMdypdLZEyUNphvWC5h3oXowONz +pH8ICYfXyEnkma/kk2+ALy0dSRDn6/94dVIUX7Fpx0hJCcoJyhSysK+TJWfIonqX +ffYOMeFG8vicIgs+GFKs/hoPtB5LREbFkUqRj/EoWE6Y3aX3roaCwTZC8vaUk0OK +54gExcNXRwQtFmfM9BiPT76F2J641NVsddgKumrryMi605CgZ57OFfSYEena6T3t +JbQ1TKB3SH1LvSQIspyp56E3bjh8bcwSh72g88YxWZI9yarOesmyU+fXnmVqcBc+ +CiJDX3Te1C2GIkBiH3HZJo4P88aXrkJ7J8nub/812QKBgQDfCHjBy5uWzzbDnqZc +cllIyUqMHq1iY2/btdZQbz83maZhQhH2UL4Zvoa7qgMX7Ou5jn1xpDaMeXNaajGK +Fz66nmqQEUFX1i+2md2J8TeKD37yUJRdlrMiAc+RNp5wiOH9EI18g2m6h/nj3s/P +MdNyxsz+wqOiJT0sZatarKiFhQKBgQDHv+lPy4OPH1MeSv5vmv3Pa41O/CeiPy+T +gi6nEZayVRVog3zF9T6gNIHrZ1fdIppWPiPXv9fmC3s/IVEftLG6YC+MAfigYhiz +Iceoal0iJJ8DglzOhlKgHEnxEwENCz8aJxjpvbxHHcpvgXdBSEVfHvVqDkAFTsvF +JA5YTmqGXQKBgQCL6uqm2S7gq1o12p+PO4VbrjwAL3aiVLNl6Gtsxn2oSdIhDavr +FLhNukMYFA4gwlcXb5au5k/6TG7bd+dgNDj8Jkm/27NcgVgpe9mJojQvfo0rQvXw +yIvUd8JZ3SQEgTsU4X+Bb4eyp39TPwKrfxyh0qnj4QN6w1XfNmELX2nRaQKBgEq6 +a0ik9JTovSnKGKIcM/QTYow4HYO/a8cdnuJ13BDfb+DnwBg3BbTdr/UndmGOfnrh +SHuAk/7GMNePWVApQ4xcS61vV1p5GJB7hLxm/my1kp+3d4z0B5lKvAbqeywsFvFr +yxA3IWbhqEhLARh1Ny684EdLCXxy3Bzmvk8fFw8pAoGAGkt9pJC2wkk9fnJIHq+f +h/WnEO0YrGzYnVA+RyCNKrimRd+GylGHJ/Ev6PRZvMwyGE7RCB+fHVrrEcEJAcxL +SaOg5NA8cwrG+UpTQqi4gt6tCW87afVCyL6dC/E8giJlzI0LY9DnFGoVqYL0qJvm +Sj4SU0fyLsW/csOLd5T+Bf8= +-----END PRIVATE KEY----- diff --git a/third_party/nixpkgs/nixos/tests/rosenpass.nix b/third_party/nixpkgs/nixos/tests/rosenpass.nix new file mode 100644 index 0000000000..ec4046c8c0 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/rosenpass.nix @@ -0,0 +1,217 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + deviceName = "rp0"; + + server = { + ip = "fe80::1"; + wg = { + public = "mQufmDFeQQuU/fIaB2hHgluhjjm1ypK4hJr1cW3WqAw="; + secret = "4N5Y1dldqrpsbaEiY8O0XBUGUFf8vkvtBtm8AoOX7Eo="; + listen = 10000; + }; + }; + client = { + ip = "fe80::2"; + wg = { + public = "Mb3GOlT7oS+F3JntVKiaD7SpHxLxNdtEmWz/9FMnRFU="; + secret = "uC5dfGMv7Oxf5UDfdPkj6rZiRZT2dRWp5x8IQxrNcUE="; + }; + }; +in +{ + name = "rosenpass"; + + nodes = + let + shared = peer: { config, modulesPath, ... }: { + imports = [ "${modulesPath}/services/networking/rosenpass.nix" ]; + + boot.kernelModules = [ "wireguard" ]; + + services.rosenpass = { + enable = true; + defaultDevice = deviceName; + settings = { + verbosity = "Verbose"; + public_key = "/etc/rosenpass/pqpk"; + secret_key = "/etc/rosenpass/pqsk"; + }; + }; + + networking.firewall.allowedUDPPorts = [ 9999 ]; + + systemd.network = { + enable = true; + networks."rosenpass" = { + matchConfig.Name = deviceName; + networkConfig.IPForward = true; + address = [ "${peer.ip}/64" ]; + }; + + netdevs."10-rp0" = { + netdevConfig = { + Kind = "wireguard"; + Name = deviceName; + }; + wireguardConfig.PrivateKeyFile = "/etc/wireguard/wgsk"; + }; + }; + + environment.etc."wireguard/wgsk" = { + text = peer.wg.secret; + user = "systemd-network"; + group = "systemd-network"; + }; + }; + in + { + server = { + imports = [ (shared server) ]; + + networking.firewall.allowedUDPPorts = [ server.wg.listen ]; + + systemd.network.netdevs."10-${deviceName}" = { + wireguardConfig.ListenPort = server.wg.listen; + wireguardPeers = [ + { + wireguardPeerConfig = { + AllowedIPs = [ "::/0" ]; + PublicKey = client.wg.public; + }; + } + ]; + }; + + services.rosenpass.settings = { + listen = [ "0.0.0.0:9999" ]; + peers = [ + { + public_key = "/etc/rosenpass/peers/client/pqpk"; + peer = client.wg.public; + } + ]; + }; + }; + client = { + imports = [ (shared client) ]; + + systemd.network.netdevs."10-${deviceName}".wireguardPeers = [ + { + wireguardPeerConfig = { + AllowedIPs = [ "::/0" ]; + PublicKey = server.wg.public; + Endpoint = "server:${builtins.toString server.wg.listen}"; + }; + } + ]; + + services.rosenpass.settings.peers = [ + { + public_key = "/etc/rosenpass/peers/server/pqpk"; + endpoint = "server:9999"; + peer = server.wg.public; + } + ]; + }; + }; + + testScript = { ... }: '' + from os import system + + # Full path to rosenpass in the store, to avoid fiddling with `$PATH`. + rosenpass = "${pkgs.rosenpass}/bin/rosenpass" + + # Path in `/etc` where keys will be placed. + etc = "/etc/rosenpass" + + start_all() + + for machine in [server, client]: + machine.wait_for_unit("multi-user.target") + + # Gently stop Rosenpass to avoid crashes during key generation/distribution. + for machine in [server, client]: + machine.execute("systemctl stop rosenpass.service") + + for (name, machine, remote) in [("server", server, client), ("client", client, server)]: + pk, sk = f"{name}.pqpk", f"{name}.pqsk" + system(f"{rosenpass} gen-keys --force --secret-key {sk} --public-key {pk}") + machine.copy_from_host(sk, f"{etc}/pqsk") + machine.copy_from_host(pk, f"{etc}/pqpk") + remote.copy_from_host(pk, f"{etc}/peers/{name}/pqpk") + + for machine in [server, client]: + machine.execute("systemctl start rosenpass.service") + + for machine in [server, client]: + machine.wait_for_unit("rosenpass.service") + + with subtest("ping"): + client.succeed("ping -c 2 -i 0.5 ${server.ip}%${deviceName}") + + with subtest("preshared-keys"): + # Rosenpass works by setting the WireGuard preshared key at regular intervals. + # Thus, if it is not active, then no key will be set, and the output of `wg show` will contain "none". + # Otherwise, if it is active, then the key will be set and "none" will not be found in the output of `wg show`. + for machine in [server, client]: + machine.wait_until_succeeds("wg show all preshared-keys | grep --invert-match none", timeout=5) + ''; + + # NOTE: Below configuration is for "interactive" (=developing/debugging) only. + interactive.nodes = + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPublicKey snakeOilPrivateKey; + + sshAndKeyGeneration = { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + environment.systemPackages = [ + (pkgs.writeShellApplication { + name = "gen-keys"; + runtimeInputs = [ pkgs.rosenpass ]; + text = '' + HOST="$(hostname)" + if [ "$HOST" == "server" ] + then + PEER="client" + else + PEER="server" + fi + + # Generate keypair. + mkdir -vp /etc/rosenpass/peers/$PEER + rosenpass gen-keys --force --secret-key /etc/rosenpass/pqsk --public-key /etc/rosenpass/pqpk + + # Set up SSH key. + mkdir -p /root/.ssh + cp ${snakeOilPrivateKey} /root/.ssh/id_ecdsa + chmod 0400 /root/.ssh/id_ecdsa + + # Copy public key to other peer. + # shellcheck disable=SC2029 + ssh -o StrictHostKeyChecking=no $PEER "mkdir -pv /etc/rosenpass/peers/$HOST" + scp /etc/rosenpass/pqpk "$PEER:/etc/rosenpass/peers/$HOST/pqpk" + ''; + }) + ]; + }; + + # Use kmscon + # to provide a slightly nicer console, and while we're at it, + # also use a nice font. + # With kmscon, we can for example zoom in/out using [Ctrl] + [+] + # and [Ctrl] + [-] + niceConsoleAndAutologin.services.kmscon = { + enable = true; + autologinUser = "root"; + fonts = [{ + name = "Fira Code"; + package = pkgs.fira-code; + }]; + }; + in + { + server = sshAndKeyGeneration // niceConsoleAndAutologin; + client = sshAndKeyGeneration // niceConsoleAndAutologin; + }; +}) diff --git a/third_party/nixpkgs/nixos/tests/sabnzbd.nix b/third_party/nixpkgs/nixos/tests/sabnzbd.nix index 075bd0b1fe..64cb655b43 100644 --- a/third_party/nixpkgs/nixos/tests/sabnzbd.nix +++ b/third_party/nixpkgs/nixos/tests/sabnzbd.nix @@ -18,5 +18,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_until_succeeds( "curl --fail -L http://localhost:8080/" ) + _, out = machine.execute("grep SABCTools /var/lib/sabnzbd/logs/sabnzbd.log") + machine.log(out) + machine.fail("grep 'SABCTools disabled: no correct version found!' /var/lib/sabnzbd/logs/sabnzbd.log") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix b/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix index a256bbdfd7..b4ac1670b5 100644 --- a/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix +++ b/third_party/nixpkgs/nixos/tests/shattered-pixel-dungeon.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_x() machine.execute("shattered-pixel-dungeon >&2 &") machine.wait_for_window(r"Shattered Pixel Dungeon") - machine.sleep(5) - if "Enter" not in machine.get_screen_text(): - raise Exception("Program did not start successfully") + machine.wait_for_text("Enter") machine.screenshot("screen") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/soft-serve.nix b/third_party/nixpkgs/nixos/tests/soft-serve.nix new file mode 100644 index 0000000000..1c4cb4c958 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/soft-serve.nix @@ -0,0 +1,102 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + sshPort = 8231; + httpPort = 8232; + statsPort = 8233; + gitPort = 8418; +in +{ + name = "soft-serve"; + meta.maintainers = with lib.maintainers; [ dadada ]; + nodes = { + client = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + curl + git + openssh + ]; + environment.etc.sshKey = { + source = snakeOilPrivateKey; + mode = "0600"; + }; + }; + + server = + { config, ... }: + { + services.soft-serve = { + enable = true; + settings = { + name = "TestServer"; + ssh.listen_addr = ":${toString sshPort}"; + git.listen_addr = ":${toString gitPort}"; + http.listen_addr = ":${toString httpPort}"; + stats.listen_addr = ":${toString statsPort}"; + initial_admin_keys = [ snakeOilPublicKey ]; + }; + }; + networking.firewall.allowedTCPPorts = [ sshPort httpPort statsPort ]; + }; + }; + + testScript = + { ... }: + '' + SSH_PORT = ${toString sshPort} + HTTP_PORT = ${toString httpPort} + STATS_PORT = ${toString statsPort} + KEY = "${snakeOilPublicKey}" + SSH_KEY = "/etc/sshKey" + SSH_COMMAND = f"ssh -p {SSH_PORT} -i {SSH_KEY} -o StrictHostKeyChecking=no" + TEST_DIR = "/tmp/test" + GIT = f"git -C {TEST_DIR}" + + for machine in client, server: + machine.wait_for_unit("network.target") + + server.wait_for_unit("soft-serve.service") + server.wait_for_open_port(SSH_PORT) + + with subtest("Get info"): + status, test = client.execute(f"{SSH_COMMAND} server info") + if status != 0: + raise Exception("Failed to get SSH info") + key = " ".join(KEY.split(" ")[0:2]) + if not key in test: + raise Exception("Admin key must be configured correctly") + + with subtest("Create user"): + client.succeed(f"{SSH_COMMAND} server user create beatrice") + client.succeed(f"{SSH_COMMAND} server user info beatrice") + + with subtest("Create repo"): + client.succeed(f"git init {TEST_DIR}") + client.succeed(f"{GIT} config --global user.email you@example.com") + client.succeed(f"touch {TEST_DIR}/foo") + client.succeed(f"{GIT} add foo") + client.succeed(f"{GIT} commit --allow-empty -m test") + client.succeed(f"{GIT} remote add origin git@server:test") + client.succeed(f"GIT_SSH_COMMAND='{SSH_COMMAND}' {GIT} push -u origin master") + client.execute("rm -r /tmp/test") + + server.wait_for_open_port(HTTP_PORT) + + with subtest("Clone over HTTP"): + client.succeed(f"curl --connect-timeout 10 http://server:{HTTP_PORT}/") + client.succeed(f"git clone http://server:{HTTP_PORT}/test /tmp/test") + client.execute("rm -r /tmp/test") + + with subtest("Clone over SSH"): + client.succeed(f"GIT_SSH_COMMAND='{SSH_COMMAND}' git clone git@server:test /tmp/test") + client.execute("rm -r /tmp/test") + + with subtest("Get stats over HTTP"): + server.wait_for_open_port(STATS_PORT) + status, test = client.execute(f"curl --connect-timeout 10 http://server:{STATS_PORT}/metrics") + if status != 0: + raise Exception("Failed to get metrics from status port") + if not "go_gc_duration_seconds_count" in test: + raise Exception("Metrics did not contain key 'go_gc_duration_seconds_count'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/sourcehut.nix b/third_party/nixpkgs/nixos/tests/sourcehut.nix index 87e6d82bdd..0b258acc2a 100644 --- a/third_party/nixpkgs/nixos/tests/sourcehut.nix +++ b/third_party/nixpkgs/nixos/tests/sourcehut.nix @@ -126,6 +126,7 @@ in virtualisation.diskSize = 4 * 1024; virtualisation.memorySize = 2 * 1024; networking.domain = domain; + networking.enableIPv6 = false; networking.extraHosts = '' ${config.networking.primaryIPAddress} builds.${domain} ${config.networking.primaryIPAddress} git.${domain} @@ -134,11 +135,6 @@ in services.sourcehut = { enable = true; - services = [ - "builds" - "git" - "meta" - ]; nginx.enable = true; nginx.virtualHost = { forceSSL = true; diff --git a/third_party/nixpkgs/nixos/tests/sqlite3-to-mysql.nix b/third_party/nixpkgs/nixos/tests/sqlite3-to-mysql.nix index 029058187d..f18a442157 100644 --- a/third_party/nixpkgs/nixos/tests/sqlite3-to-mysql.nix +++ b/third_party/nixpkgs/nixos/tests/sqlite3-to-mysql.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: python3Packages.pytest python3Packages.pytest-mock python3Packages.pytest-timeout - python3Packages.factory_boy + python3Packages.factory-boy python3Packages.docker # only needed so import does not fail sqlite3-to-mysql ]) diff --git a/third_party/nixpkgs/nixos/tests/ssh-audit.nix b/third_party/nixpkgs/nixos/tests/ssh-audit.nix new file mode 100644 index 0000000000..bd6255b804 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ssh-audit.nix @@ -0,0 +1,103 @@ +import ./make-test-python.nix ( + {pkgs, ...}: let + sshKeys = import (pkgs.path + "/nixos/tests/ssh-keys.nix") pkgs; + sshUsername = "any-user"; + serverName = "server"; + clientName = "client"; + sshAuditPort = 2222; + in { + name = "ssh"; + + nodes = { + "${serverName}" = { + networking.firewall.allowedTCPPorts = [ + sshAuditPort + ]; + services.openssh.enable = true; + users.users."${sshUsername}" = { + isNormalUser = true; + openssh.authorizedKeys.keys = [ + sshKeys.snakeOilPublicKey + ]; + }; + }; + "${clientName}" = { + programs.ssh = { + ciphers = [ + "aes128-ctr" + "aes128-gcm@openssh.com" + "aes192-ctr" + "aes256-ctr" + "aes256-gcm@openssh.com" + "chacha20-poly1305@openssh.com" + ]; + extraConfig = '' + IdentitiesOnly yes + ''; + hostKeyAlgorithms = [ + "rsa-sha2-256" + "rsa-sha2-256-cert-v01@openssh.com" + "rsa-sha2-512" + "rsa-sha2-512-cert-v01@openssh.com" + "sk-ssh-ed25519-cert-v01@openssh.com" + "sk-ssh-ed25519@openssh.com" + "ssh-ed25519" + "ssh-ed25519-cert-v01@openssh.com" + ]; + kexAlgorithms = [ + "curve25519-sha256" + "curve25519-sha256@libssh.org" + "diffie-hellman-group-exchange-sha256" + "diffie-hellman-group16-sha512" + "diffie-hellman-group18-sha512" + "sntrup761x25519-sha512@openssh.com" + ]; + macs = [ + "hmac-sha2-256-etm@openssh.com" + "hmac-sha2-512-etm@openssh.com" + "umac-128-etm@openssh.com" + ]; + }; + }; + }; + + testScript = '' + start_all() + + ${serverName}.wait_for_open_port(22) + + # Should pass SSH server audit + ${serverName}.succeed("${pkgs.ssh-audit}/bin/ssh-audit 127.0.0.1") + + # Wait for client to be able to connect to the server + ${clientName}.wait_for_unit("network-online.target") + + # Set up trusted private key + ${clientName}.succeed("cat ${sshKeys.snakeOilPrivateKey} > privkey.snakeoil") + ${clientName}.succeed("chmod 600 privkey.snakeoil") + + # Fail fast and disable interactivity + ssh_options = "-o BatchMode=yes -o ConnectTimeout=1 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" + + # Should deny root user + ${clientName}.fail(f"ssh {ssh_options} root@${serverName} true") + + # Should deny non-root user password login + ${clientName}.fail(f"ssh {ssh_options} -o PasswordAuthentication=yes ${sshUsername}@${serverName} true") + + # Should allow non-root user certificate login + ${clientName}.succeed(f"ssh {ssh_options} -i privkey.snakeoil ${sshUsername}@${serverName} true") + + # Should pass SSH client audit + service_name = "ssh-audit.service" + ${serverName}.succeed(f"systemd-run --unit={service_name} ${pkgs.ssh-audit}/bin/ssh-audit --client-audit --port=${toString sshAuditPort}") + ${clientName}.sleep(5) # We can't use wait_for_open_port because ssh-audit exits as soon as anything talks to it + ${clientName}.execute( + f"ssh {ssh_options} -i privkey.snakeoil -p ${toString sshAuditPort} ${sshUsername}@${serverName} true", + check_return=False, + timeout=10 + ) + ${serverName}.succeed(f"exit $(systemctl show --property=ExecMainStatus --value {service_name})") + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/sslh.nix b/third_party/nixpkgs/nixos/tests/sslh.nix index 17094606e8..30ffd389d4 100644 --- a/third_party/nixpkgs/nixos/tests/sslh.nix +++ b/third_party/nixpkgs/nixos/tests/sslh.nix @@ -10,21 +10,13 @@ import ./make-test-python.nix { prefixLength = 64; } ]; - # sslh is really slow when reverse dns does not work - networking.hosts = { - "fe00:aa:bb:cc::2" = [ "server" ]; - "fe00:aa:bb:cc::1" = [ "client" ]; - }; services.sslh = { enable = true; - transparent = true; - appendConfig = '' - protocols: - ( - { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, - { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - ); - ''; + settings.transparent = true; + settings.protocols = [ + { name = "ssh"; service = "ssh"; host = "localhost"; port = "22"; probe = "builtin"; } + { name = "http"; host = "localhost"; port = "80"; probe = "builtin"; } + ]; }; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ]; diff --git a/third_party/nixpkgs/nixos/tests/stratis/encryption.nix b/third_party/nixpkgs/nixos/tests/stratis/encryption.nix index a555ff8a8e..81b5f92b4a 100644 --- a/third_party/nixpkgs/nixos/tests/stratis/encryption.nix +++ b/third_party/nixpkgs/nixos/tests/stratis/encryption.nix @@ -26,7 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }: # test rebinding encrypted pool machine.succeed("stratis pool rebind keyring testpool testkey2") # test restarting encrypted pool - machine.succeed("stratis pool stop testpool") - machine.succeed("stratis pool start --name testpool --unlock-method keyring") + machine.succeed("stratis pool stop --name testpool") + machine.succeed("stratis pool start --name testpool --unlock-method keyring") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/stunnel.nix b/third_party/nixpkgs/nixos/tests/stunnel.nix index 22c087290f..07fba435d4 100644 --- a/third_party/nixpkgs/nixos/tests/stunnel.nix +++ b/third_party/nixpkgs/nixos/tests/stunnel.nix @@ -17,11 +17,16 @@ let }; }; makeCert = { config, pkgs, ... }: { - system.activationScripts.create-test-cert = stringAfter [ "users" ] '' - ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} - ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) - chown stunnel /test-key.pem /test-key-and-cert.pem + systemd.services.create-test-cert = { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' + ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} + ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) + chown stunnel /test-key.pem /test-key-and-cert.pem ''; + }; }; serverCommon = { pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 443 ]; diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index 1b17739148..1fe478f0bf 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -21,7 +21,8 @@ in }; security.sudo = { - enable = true; + # Explicitly _not_ defining 'enable = true;' here, to check that sudo is enabled by default + wheelNeedsPassword = false; extraConfig = '' diff --git a/third_party/nixpkgs/nixos/tests/syncthing-many-devices.nix b/third_party/nixpkgs/nixos/tests/syncthing-many-devices.nix new file mode 100644 index 0000000000..2251bf0774 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/syncthing-many-devices.nix @@ -0,0 +1,203 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + +# This nixosTest is supposed to check the following: +# +# - Whether syncthing's API handles multiple requests for many devices, see +# https://github.com/NixOS/nixpkgs/issues/260262 +# +# - Whether syncthing-init.service generated bash script removes devices and +# folders that are not present in the user's configuration, which is partly +# injected into the script. See also: +# https://github.com/NixOS/nixpkgs/issues/259256 +# + +let + # Just a long path not to copy paste + configPath = "/var/lib/syncthing/.config/syncthing/config.xml"; + + # We will iterate this and more attribute sets defined here, later in the + # testScript. Start with this, and distinguish these settings from other + # settings, as we check these differently with xmllint, due to the ID. + settingsWithId = { + devices = { + # All of the device IDs used here were generated by the following command: + # + # (${pkgs.syncthing}/bin/syncthing generate --home /tmp/foo\ + # | grep ID: | sed 's/.*ID: *//') && rm -rf /tmp/foo + # + # See also discussion at: + # https://forum.syncthing.net/t/how-to-generate-dummy-device-ids/20927/8 + test_device1.id = "IVTZ5XF-EF3GKFT-GS4AZLG-IT6H2ZP-6WK75SF-AFXQXJJ-BNRZ4N6-XPDKVAU"; + test_device2.id = "5C35H56-Z2GFF4F-F3IVD4B-GJYVWIE-SMDBJZN-GI66KWP-52JIQGN-4AVLYAM"; + test_device3.id = "XKLSKHE-BZOHV7B-WQZACEF-GTH36NP-6JSBB6L-RXS3M7C-EEVWO2L-C5B4OAJ"; + test_device4.id = "APN5Q7J-35GZETO-5KCLF35-ZA7KBWK-HGWPBNG-FERF24R-UTLGMEX-4VJ6PQX"; + test_device5.id = "D4YXQEE-5MK6LIK-BRU5QWM-ZRXJCK2-N3RQBJE-23JKTQQ-LYGDPHF-RFPZIQX"; + test_device6.id = "TKMCH64-T44VSLI-6FN2YLF-URBZOBR-ATO4DYX-GEDRIII-CSMRQAI-UAQMDQG"; + test_device7.id = "472EEBG-Q4PZCD4-4CX6PGF-XS3FSQ2-UFXBZVB-PGNXWLX-7FKBLER-NJ3EMAR"; + test_device8.id = "HW6KUMK-WTBG24L-2HZQXLO-TGJSG2M-2JG3FHX-5OGYRUJ-T6L5NN7-L364QAZ"; + test_device9.id = "YAE24AP-7LSVY4T-J74ZSEM-A2IK6RB-FGA35TP-AG4CSLU-ED4UYYY-2J2TDQU"; + test_device10.id = "277XFSB-OFMQOBI-3XGNGUE-Y7FWRV3-QQDADIY-QIIPQ26-EOGTYKW-JP2EXAI"; + test_device11.id = "2WWXVTN-Q3QWAAY-XFORMRM-2FDI5XZ-OGN33BD-XOLL42R-DHLT2ML-QYXDQAU"; + }; + # Generates a few folders with IDs and paths as written... + folders = lib.pipe 6 [ + (builtins.genList (x: { + name = "/var/lib/syncthing/test_folder${builtins.toString x}"; + value = { + id = "DontDeleteMe${builtins.toString x}"; + }; + })) + builtins.listToAttrs + ]; + }; + # Non default options that we check later if were applied + settingsWithoutId = { + options = { + autoUpgradeIntervalH = 0; + urAccepted = -1; + }; + gui = { + theme = "dark"; + }; + }; + # Used later when checking whether settings were set in config.xml: + checkSettingWithId = { t # t for type + , id + , not ? false + }: '' + print("Searching for a ${t} with id ${id}") + configVal_${t} = machine.succeed( + "${pkgs.libxml2}/bin/xmllint " + "--xpath 'string(//${t}[@id=\"${id}\"]/@id)' ${configPath}" + ) + print("${t}.id = {}".format(configVal_${t})) + assert "${id}" ${if not then "not" else ""} in configVal_${t} + ''; + # Same as checkSettingWithId, but for 'options' and 'gui' + checkSettingWithoutId = { t # t for type + , n # n for name + , v # v for value + , not ? false + }: '' + print("checking whether setting ${t}.${n} is set to ${v}") + configVal_${t}_${n} = machine.succeed( + "${pkgs.libxml2}/bin/xmllint " + "--xpath 'string(/configuration/${t}/${n})' ${configPath}" + ) + print("${t}.${n} = {}".format(configVal_${t}_${n})) + assert "${v}" ${if not then "not" else ""} in configVal_${t}_${n} + ''; + # Removes duplication a bit to define this function for the IDs to delete - + # we check whether they were added after our script ran, and before the + # systemd unit's bash script ran, and afterwards - whether the systemd unit + # worked. + checkSettingsToDelete = { + not + }: lib.pipe IDsToDelete [ + (lib.mapAttrsToList (t: id: + checkSettingWithId { + inherit t id; + inherit not; + } + )) + lib.concatStrings + ]; + # These IDs are added to syncthing using the API, similarly to how the + # generated systemd unit's bash script does it. Only we add it and expect the + # systemd unit bash script to remove them when executed. + IDsToDelete = { + # Also created using the syncthing generate command above + device = "LZ2CTHT-3W2M7BC-CMKDFZL-DLUQJFS-WJR73PA-NZGODWG-DZBHCHI-OXTQXAK"; + # Intentionally this is a substring of the IDs of the 'test_folder's, as + # explained in: https://github.com/NixOS/nixpkgs/issues/259256 + folder = "DeleteMe"; + }; + addDeviceToDeleteScript = pkgs.writers.writeBash "syncthing-add-device-to-delete.sh" '' + set -euo pipefail + + export RUNTIME_DIRECTORY=/tmp + + curl() { + # get the api key by parsing the config.xml + while + ! ${pkgs.libxml2}/bin/xmllint \ + --xpath 'string(configuration/gui/apikey)' \ + ${configPath} \ + >"$RUNTIME_DIRECTORY/api_key" + do sleep 1; done + + (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" + + ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ + --retry 1000 --retry-delay 1 --retry-all-errors \ + "$@" + } + curl -d ${lib.escapeShellArg (builtins.toJSON { deviceID = IDsToDelete.device;})} \ + -X POST 127.0.0.1:8384/rest/config/devices + curl -d ${lib.escapeShellArg (builtins.toJSON { id = IDsToDelete.folder;})} \ + -X POST 127.0.0.1:8384/rest/config/folders + ''; +in { + name = "syncthing-init"; + meta.maintainers = with lib.maintainers; [ doronbehar ]; + + nodes.machine = { + services.syncthing = { + enable = true; + overrideDevices = true; + overrideFolders = true; + settings = settingsWithoutId // settingsWithId; + }; + }; + testScript = '' + machine.wait_for_unit("syncthing-init.service") + '' + (lib.pipe settingsWithId [ + # Check that folders and devices were added properly and that all IDs exist + (lib.mapAttrsRecursive (path: id: + checkSettingWithId { + # plural -> solitary + t = (lib.removeSuffix "s" (builtins.elemAt path 0)); + inherit id; + } + )) + # Get all the values we applied the above function upon + (lib.collect builtins.isString) + lib.concatStrings + ]) + (lib.pipe settingsWithoutId [ + # Check that all other syncthing.settings were added properly with correct + # values + (lib.mapAttrsRecursive (path: value: + checkSettingWithoutId { + t = (builtins.elemAt path 0); + n = (builtins.elemAt path 1); + v = (builtins.toString value); + } + )) + # Get all the values we applied the above function upon + (lib.collect builtins.isString) + lib.concatStrings + ]) + '' + # Run the script on the machine + machine.succeed("${addDeviceToDeleteScript}") + '' + (checkSettingsToDelete { + not = false; + }) + '' + # Useful for debugging later + machine.copy_from_vm("${configPath}", "before") + + machine.systemctl("restart syncthing-init.service") + machine.wait_for_unit("syncthing-init.service") + '' + (checkSettingsToDelete { + not = true; + }) + '' + # Useful for debugging later + machine.copy_from_vm("${configPath}", "after") + + # Copy the systemd unit's bash script, to inspect it for debugging. + mergeScript = machine.succeed( + "systemctl cat syncthing-init.service | " + "${pkgs.initool}/bin/initool g - Service ExecStart --value-only" + ).strip() # strip from new lines + machine.copy_from_vm(mergeScript, "") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-boot.nix b/third_party/nixpkgs/nixos/tests/systemd-boot.nix index c1f8637989..13007d0d80 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-boot.nix @@ -18,7 +18,7 @@ in { basic = makeTest { name = "systemd-boot"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; nodes.machine = common; @@ -42,7 +42,7 @@ in # Check that specialisations create corresponding boot entries. specialisation = makeTest { name = "systemd-boot-specialisation"; - meta.maintainers = with pkgs.lib.maintainers; [ lukegb ]; + meta.maintainers = with pkgs.lib.maintainers; [ lukegb julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -65,7 +65,7 @@ in # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI" fallback = makeTest { name = "systemd-boot-fallback"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -91,7 +91,7 @@ in update = makeTest { name = "systemd-boot-update"; - meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ]; + meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; nodes.machine = common; @@ -107,13 +107,13 @@ in ) output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") - assert "updating systemd-boot from 000.0-1-notnixos to " in output + assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" ''; }; memtest86 = makeTest { name = "systemd-boot-memtest86"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -128,7 +128,7 @@ in netbootxyz = makeTest { name = "systemd-boot-netbootxyz"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -143,7 +143,7 @@ in entryFilename = makeTest { name = "systemd-boot-entry-filename"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -160,7 +160,7 @@ in extraEntries = makeTest { name = "systemd-boot-extra-entries"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -179,7 +179,7 @@ in extraFiles = makeTest { name = "systemd-boot-extra-files"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -196,7 +196,7 @@ in switch-test = makeTest { name = "systemd-boot-switch-test"; - meta.maintainers = with pkgs.lib.maintainers; [ Enzime ]; + meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes = { inherit common; @@ -256,7 +256,7 @@ in # itself, systems with such firmware won't boot without this fix uefiLargeFileWorkaround = makeTest { name = "uefi-large-file-workaround"; - + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes.machine = { pkgs, ... }: { imports = [common]; virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: { diff --git a/third_party/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix b/third_party/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix index d2dc1fd7b6..bf74183122 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-credentials-tpm2.nix @@ -1,13 +1,4 @@ -import ./make-test-python.nix ({ lib, pkgs, system, ... }: - -let - tpmSocketPath = "/tmp/swtpm-sock"; - tpmDeviceModels = { - x86_64-linux = "tpm-tis"; - aarch64-linux = "tpm-tis-device"; - }; -in - +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-credentials-tpm2"; @@ -16,51 +7,11 @@ in }; nodes.machine = { pkgs, ... }: { - virtualisation = { - qemu.options = [ - "-chardev socket,id=chrtpm,path=${tpmSocketPath}" - "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" - "-device ${tpmDeviceModels.${system}},tpmdev=tpm_dev_0" - ]; - }; - - boot.initrd.availableKernelModules = [ "tpm_tis" ]; - + virtualisation.tpm.enable = true; environment.systemPackages = with pkgs; [ diffutils ]; }; testScript = '' - import subprocess - from tempfile import TemporaryDirectory - - # From systemd-initrd-luks-tpm2.nix - class Tpm: - def __init__(self): - self.state_dir = TemporaryDirectory() - self.start() - - def start(self): - self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", - "socket", - "--tpmstate", f"dir={self.state_dir.name}", - "--ctrl", "type=unixio,path=${tpmSocketPath}", - "--tpm2", - ]) - - # Check whether starting swtpm failed - try: - exit_code = self.proc.wait(timeout=0.2) - if exit_code is not None and exit_code != 0: - raise Exception("failed to start swtpm") - except subprocess.TimeoutExpired: - pass - - """Check whether the swtpm process exited due to an error""" - def check(self): - exit_code = self.proc.poll() - if exit_code is not None and exit_code != 0: - raise Exception("swtpm process died") - CRED_NAME = "testkey" CRED_RAW_FILE = f"/root/{CRED_NAME}" CRED_FILE = f"/root/{CRED_NAME}.cred" @@ -85,12 +36,6 @@ in machine.log("systemd-run finished successfully") - tpm = Tpm() - - @polling_condition - def swtpm_running(): - tpm.check() - machine.wait_for_unit("multi-user.target") with subtest("Check whether TPM device exists"): diff --git a/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix b/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix index 055ae7d168..034aae1d5e 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-cryptenroll.nix @@ -8,47 +8,34 @@ import ./make-test-python.nix ({ pkgs, ... }: { environment.systemPackages = [ pkgs.cryptsetup ]; virtualisation = { emptyDiskImages = [ 512 ]; - qemu.options = [ - "-chardev socket,id=chrtpm,path=/tmp/swtpm-sock" - "-tpmdev emulator,id=tpm0,chardev=chrtpm" - "-device tpm-tis,tpmdev=tpm0" - ]; + tpm.enable = true; }; }; testScript = '' - import subprocess - import tempfile + machine.start() - def start_swtpm(tpmstate): - subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir="+tpmstate, "--ctrl", "type=unixio,path=/tmp/swtpm-sock", "--log", "level=0", "--tpm2"]) + # Verify the TPM device is available and accessible by systemd-cryptenroll + machine.succeed("test -e /dev/tpm0") + machine.succeed("test -e /dev/tpmrm0") + machine.succeed("systemd-cryptenroll --tpm2-device=list") - with tempfile.TemporaryDirectory() as tpmstate: - start_swtpm(tpmstate) - machine.start() + # Create LUKS partition + machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -") + # Enroll new LUKS key and bind it to Secure Boot state + # For more details on PASSWORD variable, check the following issue: + # https://github.com/systemd/systemd/issues/20955 + machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb") + # Add LUKS partition to /etc/crypttab to test auto unlock + machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab") - # Verify the TPM device is available and accessible by systemd-cryptenroll - machine.succeed("test -e /dev/tpm0") - machine.succeed("test -e /dev/tpmrm0") - machine.succeed("systemd-cryptenroll --tpm2-device=list") + machine.shutdown() + machine.start() - # Create LUKS partition - machine.succeed("echo -n lukspass | cryptsetup luksFormat -q /dev/vdb -") - # Enroll new LUKS key and bind it to Secure Boot state - # For more details on PASSWORD variable, check the following issue: - # https://github.com/systemd/systemd/issues/20955 - machine.succeed("PASSWORD=lukspass systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=7 /dev/vdb") - # Add LUKS partition to /etc/crypttab to test auto unlock - machine.succeed("echo 'luks /dev/vdb - tpm2-device=auto' >> /etc/crypttab") - machine.shutdown() - - start_swtpm(tpmstate) - machine.start() - - # Test LUKS partition automatic unlock on boot - machine.wait_for_unit("systemd-cryptsetup@luks.service") - # Wipe TPM2 slot - machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb") + # Test LUKS partition automatic unlock on boot + machine.wait_for_unit("systemd-cryptsetup@luks.service") + # Wipe TPM2 slot + machine.succeed("systemd-cryptenroll --wipe-slot=tpm2 /dev/vdb") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix index d9dd9118a3..e292acfd1c 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { # Booting off the TPM2-encrypted device requires an available init script mountHostNixStore = true; useEFIBoot = true; - qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"]; + tpm.enable = true; }; boot.loader.systemd-boot.enable = true; @@ -33,29 +33,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; testScript = '' - import subprocess - import os - import time - - - class Tpm: - def __init__(self): - os.mkdir("/tmp/mytpm1") - self.start() - - def start(self): - self.proc = subprocess.Popen(["${pkgs.swtpm}/bin/swtpm", "socket", "--tpmstate", "dir=/tmp/mytpm1", "--ctrl", "type=unixio,path=/tmp/mytpm1/swtpm-sock", "--log", "level=20", "--tpm2"]) - - def wait_for_death_then_restart(self): - while self.proc.poll() is None: - print("waiting for tpm to die") - time.sleep(1) - assert self.proc.returncode == 0 - self.start() - - tpm = Tpm() - - # Create encrypted volume machine.wait_for_unit("multi-user.target") machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -") @@ -66,8 +43,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.succeed("sync") machine.crash() - tpm.wait_for_death_then_restart() - # Boot and decrypt the disk machine.wait_for_unit("multi-user.target") assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix index bf635a10d0..0f93492176 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-modprobe.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-modprobe"; nodes.machine = { pkgs, ... }: { + testing.initrdBackdoor = true; boot.initrd.systemd.enable = true; boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd. boot.extraModprobeConfig = '' @@ -10,6 +11,12 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; testScript = '' + machine.wait_for_unit("initrd.target") + max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") + assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + + # Make sure it sticks in stage 2 + machine.switch_root() machine.wait_for_unit("multi-user.target") max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix index 6aaa6c828f..d4c168f40e 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix @@ -4,34 +4,16 @@ import ./make-test-python.nix ({ lib, ... }: { nodes = { server = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.cryptsetup ]; - boot.loader.systemd-boot.enable = true; - boot.loader.timeout = 0; - virtualisation = { - emptyDiskImages = [ 4096 ]; - useBootLoader = true; - # Booting off the encrypted disk requires an available init script from - # the Nix store - mountHostNixStore = true; - useEFIBoot = true; - }; - - specialisation.encrypted-root.configuration = { - virtualisation.rootDevice = "/dev/mapper/root"; - virtualisation.fileSystems."/".autoFormat = true; - boot.initrd.luks.devices = lib.mkVMOverride { - root.device = "/dev/vdb"; - }; - boot.initrd.systemd.enable = true; - boot.initrd.network = { + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; + boot.initrd.systemd.contents."/etc/msg".text = "foo"; + boot.initrd.network = { + enable = true; + ssh = { enable = true; - ssh = { - enable = true; - authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; - port = 22; - # Terrible hack so it works with useBootLoader - hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ]; - }; + authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; + port = 22; + hostKeys = [ ./initrd-network-ssh/ssh_host_ed25519_key ]; }; }; }; @@ -63,24 +45,16 @@ import ./make-test-python.nix ({ lib, ... }: { status, _ = client.execute("nc -z server 22") return status == 0 - server.wait_for_unit("multi-user.target") - server.succeed( - "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb", - "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf", - "sync", - ) - server.shutdown() - server.start() - client.wait_for_unit("network.target") with client.nested("waiting for SSH server to come up"): retry(ssh_is_up) - client.succeed( - "echo somepass | ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'systemd-tty-ask-password-agent' & exit" + msg = client.succeed( + "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'cat /etc/msg'" ) + assert "foo" in msg + server.switch_root() server.wait_for_unit("multi-user.target") - server.succeed("mount | grep '/dev/mapper/root on /'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix index 8376276d8f..9c4ddb6e4b 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix @@ -1,14 +1,36 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "systemd-initrd-network"; - meta.maintainers = [ lib.maintainers.elvishjerricco ]; +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +}: - nodes = let - mkFlushTest = flush: script: { ... }: { - boot.initrd.systemd.enable = true; - boot.initrd.network = { - enable = true; - flushBeforeStage2 = flush; - }; +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + inherit (lib.maintainers) elvishjerricco; + + common = { + boot.initrd.systemd = { + enable = true; + network.wait-online.timeout = 10; + network.wait-online.anyInterface = true; + targets.network-online.requiredBy = [ "initrd.target" ]; + services.systemd-networkd-wait-online.requiredBy = + [ "network-online.target" ]; + initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; + }; + testing.initrdBackdoor = true; + boot.initrd.network.enable = true; + }; + + mkFlushTest = flush: script: makeTest { + name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush"; + meta.maintainers = [ elvishjerricco ]; + + nodes.machine = { + imports = [ common ]; + + boot.initrd.network.flushBeforeStage2 = flush; systemd.services.check-flush = { requiredBy = ["multi-user.target"]; before = ["network-pre.target" "multi-user.target"]; @@ -19,57 +41,53 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { inherit script; }; }; - in { - basic = { ... }: { - boot.initrd.network.enable = true; - boot.initrd.systemd = { - enable = true; - # Enable network-online to fail the test in case of timeout - network.wait-online.timeout = 10; - network.wait-online.anyInterface = true; - targets.network-online.requiredBy = [ "initrd.target" ]; - services.systemd-networkd-wait-online.requiredBy = - [ "network-online.target" ]; + testScript = '' + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() - initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - services.check = { - requiredBy = [ "initrd.target" ]; - before = [ "initrd.target" ]; - after = [ "network-online.target" ]; - serviceConfig.Type = "oneshot"; - path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - script = '' - ip addr | grep 10.0.2.15 || exit 1 - ping -c1 10.0.2.2 || exit 1 - ''; - }; - }; - }; - - doFlush = mkFlushTest true '' - if ip addr | grep 10.0.2.15; then - echo "Network configuration survived switch-root; flushBeforeStage2 failed" - exit 1 - fi - ''; - - dontFlush = mkFlushTest false '' - if ! (ip addr | grep 10.0.2.15); then - echo "Network configuration didn't survive switch-root" - exit 1 - fi + machine.wait_for_unit("multi-user.target") ''; }; - testScript = '' - start_all() - basic.wait_for_unit("multi-user.target") - doFlush.wait_for_unit("multi-user.target") - dontFlush.wait_for_unit("multi-user.target") - # Make sure the systemd-network user was set correctly in initrd - basic.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") - basic.succeed("ip addr show >&2") - basic.succeed("ip route show >&2") +in { + basic = makeTest { + name = "systemd-initrd-network"; + meta.maintainers = [ elvishjerricco ]; + + nodes.machine = common; + + testScript = '' + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() + + # Make sure the systemd-network user was set correctly in initrd + machine.wait_for_unit("multi-user.target") + machine.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") + machine.succeed("ip addr show >&2") + machine.succeed("ip route show >&2") + ''; + }; + + doFlush = mkFlushTest true '' + if ip addr | grep 10.0.2.15; then + echo "Network configuration survived switch-root; flushBeforeStage2 failed" + exit 1 + fi ''; -}) + + dontFlush = mkFlushTest false '' + if ! (ip addr | grep 10.0.2.15); then + echo "Network configuration didn't survive switch-root" + exit 1 + fi + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix index a6a22e9d48..2b7283a821 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix @@ -2,16 +2,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-simple"; nodes.machine = { pkgs, ... }: { - boot.initrd.systemd = { - enable = true; - emergencyAccess = true; - }; + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; virtualisation.fileSystems."/".autoResize = true; }; testScript = '' import subprocess + with subtest("testing initrd backdoor"): + machine.wait_for_unit("initrd.target") + machine.succeed("systemctl status initrd-fs.target") + machine.switch_root() + with subtest("handover to stage-2 systemd works"): machine.wait_for_unit("multi-user.target") machine.succeed("systemd-analyze | grep -q '(initrd)'") # direct handover @@ -37,6 +40,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) machine.start() + machine.switch_root() newAvail = machine.succeed("df --output=avail / | sed 1d") assert int(oldAvail) < int(newAvail), "File system did not grow" diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix index 6c423f4140..6b241b93d5 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-networkd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-networkd.nix @@ -65,7 +65,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { in import ./make-test-python.nix ({pkgs, ... }: { name = "networkd"; meta = with pkgs.lib.maintainers; { - maintainers = [ ninjatrappeur ]; + maintainers = [ picnoir ]; }; nodes = { node1 = { pkgs, ... }@attrs: diff --git a/third_party/nixpkgs/nixos/tests/systemd-repart.nix b/third_party/nixpkgs/nixos/tests/systemd-repart.nix index 22ea8fbd22..3914d5b323 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-repart.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-repart.nix @@ -29,16 +29,6 @@ let "+32M", ]) - # Fix the GPT table by moving the backup table to the end of the enlarged - # disk image. This is necessary because we increased the size of the disk - # before. The disk needs to be a raw disk because sgdisk can only run on - # raw images. - subprocess.run([ - "${pkgs.gptfdisk}/bin/sgdisk", - "--move-second-header", - tmp_disk_image.name, - ]) - # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name ''; diff --git a/third_party/nixpkgs/nixos/tests/systemd-timesyncd.nix b/third_party/nixpkgs/nixos/tests/systemd-timesyncd.nix index 43abd36c47..f38d06be15 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-timesyncd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-timesyncd.nix @@ -15,12 +15,13 @@ in { # create the path that should be migrated by our activation script when # upgrading to a newer nixos version system.stateVersion = "19.03"; - system.activationScripts.simulate-old-timesync-state-dir = lib.mkBefore '' - rm -f /var/lib/systemd/timesync - mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync - ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync - chown systemd-timesync: /var/lib/private/systemd/timesync - ''; + systemd.tmpfiles.rules = [ + "r /var/lib/systemd/timesync -" + "d /var/lib/systemd -" + "d /var/lib/private/systemd/timesync -" + "L /var/lib/systemd/timesync - - - - /var/lib/private/systemd/timesync" + "d /var/lib/private/systemd/timesync - systemd-timesync systemd-timesync -" + ]; }); }; diff --git a/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix index 3c36291b73..1a39cc73c8 100644 --- a/third_party/nixpkgs/nixos/tests/systemd.nix +++ b/third_party/nixpkgs/nixos/tests/systemd.nix @@ -76,6 +76,17 @@ import ./make-test-python.nix ({ pkgs, ... }: { # wait for user services machine.wait_for_unit("default.target", "alice") + with subtest("systemctl edit suggests --runtime"): + # --runtime is suggested when using `systemctl edit` + ret, out = machine.execute("systemctl edit testservice1.service 2>&1") + assert ret == 1 + assert out.rstrip("\n") == "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead." + # editing w/o `--runtime` is possible for user-services, however + # it's not possible because we're not in a tty when grepping + # (i.e. hacky way to ensure that the error from above doesn't appear here). + _, out = machine.execute("systemctl --user edit testservice2.service 2>&1") + assert out.rstrip("\n") == "Cannot edit units if not on a tty." + # Regression test for https://github.com/NixOS/nixpkgs/issues/105049 with subtest("systemd reads timezone database in /etc/zoneinfo"): timer = machine.succeed("TZ=UTC systemctl show --property=TimersCalendar oncalendar-test.timer") @@ -169,7 +180,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { # Do some IP traffic output_ping = machine.succeed( - "systemd-run --wait -- /run/wrappers/bin/ping -c 1 127.0.0.1 2>&1" + "systemd-run --wait -- ping -c 1 127.0.0.1 2>&1" ) with subtest("systemd reports accounting data on system.slice"): diff --git a/third_party/nixpkgs/nixos/tests/tandoor-recipes.nix b/third_party/nixpkgs/nixos/tests/tandoor-recipes.nix index 54456238fe..f3369da99a 100644 --- a/third_party/nixpkgs/nixos/tests/tandoor-recipes.nix +++ b/third_party/nixpkgs/nixos/tests/tandoor-recipes.nix @@ -3,33 +3,8 @@ import ./make-test-python.nix ({ lib, ... }: { meta.maintainers = with lib.maintainers; [ ambroisie ]; nodes.machine = { pkgs, ... }: { - # Setup using Postgres services.tandoor-recipes = { enable = true; - - extraConfig = { - DB_ENGINE = "django.db.backends.postgresql"; - POSTGRES_HOST = "/run/postgresql"; - POSTGRES_USER = "tandoor_recipes"; - POSTGRES_DB = "tandoor_recipes"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "tandoor_recipes" ]; - ensureUsers = [ - { - name = "tandoor_recipes"; - ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES"; - } - ]; - }; - - systemd.services = { - tandoor-recipes = { - after = [ "postgresql.service" ]; - }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/tang.nix b/third_party/nixpkgs/nixos/tests/tang.nix new file mode 100644 index 0000000000..10486a9feb --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/tang.nix @@ -0,0 +1,81 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "tang"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jfroche ]; + }; + + nodes.server = + { config + , pkgs + , modulesPath + , ... + }: { + imports = [ + "${modulesPath}/../tests/common/auto-format-root-device.nix" + ]; + virtualisation = { + emptyDiskImages = [ 512 ]; + useBootLoader = true; + useEFIBoot = true; + # This requires to have access + # to a host Nix store as + # the new root device is /dev/vdb + # an empty 512MiB drive, containing no Nix store. + mountHostNixStore = true; + }; + + boot.loader.systemd-boot.enable = true; + + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + + environment.systemPackages = with pkgs; [ clevis tang cryptsetup ]; + services.tang = { + enable = true; + ipAddressAllow = [ "127.0.0.1/32" ]; + }; + }; + testScript = '' + start_all() + machine.wait_for_unit("sockets.target") + + with subtest("Check keys are generated"): + machine.wait_until_succeeds("curl -v http://127.0.0.1:7654/adv") + key = machine.wait_until_succeeds("tang-show-keys 7654") + + with subtest("Check systemd access list"): + machine.succeed("ping -c 3 192.168.0.1") + machine.fail("curl -v --connect-timeout 3 http://192.168.0.1:7654/adv") + + with subtest("Check basic encrypt and decrypt message"): + machine.wait_until_succeeds(f"""echo 'Hello World' | clevis encrypt tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}"}}' > /tmp/encrypted""") + decrypted = machine.wait_until_succeeds("clevis decrypt < /tmp/encrypted") + assert decrypted.strip() == "Hello World" + machine.wait_until_succeeds("tang-show-keys 7654") + + with subtest("Check encrypt and decrypt disk"): + machine.succeed("cryptsetup luksFormat --force-password --batch-mode /dev/vdb <<<'password'") + machine.succeed(f"""clevis luks bind -s1 -y -f -d /dev/vdb tang '{{ "url": "http://127.0.0.1:7654", "thp":"{key}" }}' <<< 'password' """) + clevis_luks = machine.succeed("clevis luks list -d /dev/vdb") + assert clevis_luks.strip() == """1: tang '{"url":"http://127.0.0.1:7654"}'""" + machine.succeed("clevis luks unlock -d /dev/vdb") + machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +") + machine.succeed("clevis luks unlock -d /dev/vdb") + machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +") + # without tang available, unlock should fail + machine.succeed("systemctl stop tangd.socket") + machine.fail("clevis luks unlock -d /dev/vdb") + machine.succeed("systemctl start tangd.socket") + + with subtest("Rotate server keys"): + machine.succeed("${pkgs.tang}/libexec/tangd-rotate-keys -d /var/lib/tang") + machine.succeed("clevis luks unlock -d /dev/vdb") + machine.succeed("find /dev/mapper -name 'luks*' -exec cryptsetup close {} +") + + with subtest("Test systemd service security"): + output = machine.succeed("systemd-analyze security tangd@.service") + machine.log(output) + assert output[-9:-1] == "SAFE :-}" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/tinyproxy.nix b/third_party/nixpkgs/nixos/tests/tinyproxy.nix new file mode 100644 index 0000000000..b8448d4c23 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/tinyproxy.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "tinyproxy"; + + nodes.machine = { config, pkgs, ... }: { + services.tinyproxy = { + enable = true; + settings = { + Listen = "127.0.0.1"; + Port = 8080; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("tinyproxy.service") + machine.wait_for_open_port(8080) + + machine.succeed('curl -s http://localhost:8080 |grep -i tinyproxy') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/tsja.nix b/third_party/nixpkgs/nixos/tests/tsja.nix new file mode 100644 index 0000000000..176783088d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/tsja.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : { + name = "tsja"; + meta = { + maintainers = with lib.maintainers; [ chayleaf ]; + }; + + nodes = { + master = + { config, ... }: + + { + services.postgresql = { + enable = true; + extraPlugins = with config.services.postgresql.package.pkgs; [ + tsja + ]; + }; + }; + }; + + testScript = '' + start_all() + master.wait_for_unit("postgresql") + master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") + # make sure "日本語" is parsed as a separate lexeme + master.succeed(""" + sudo -u postgres \\ + psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ + | grep "{日本語}" + """) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/udisks2.nix b/third_party/nixpkgs/nixos/tests/udisks2.nix index 6afb200f85..8cc148750c 100644 --- a/third_party/nixpkgs/nixos/tests/udisks2.nix +++ b/third_party/nixpkgs/nixos/tests/udisks2.nix @@ -32,6 +32,9 @@ in '' import lzma + machine.systemctl("start udisks2") + machine.wait_for_unit("udisks2.service") + with lzma.open( "${stick}" ) as data, open(machine.state_dir / "usbstick.img", "wb") as stick: diff --git a/third_party/nixpkgs/nixos/tests/vaultwarden.nix b/third_party/nixpkgs/nixos/tests/vaultwarden.nix index 95d00c1d8e..9d2f0e6ab0 100644 --- a/third_party/nixpkgs/nixos/tests/vaultwarden.nix +++ b/third_party/nixpkgs/nixos/tests/vaultwarden.nix @@ -54,9 +54,8 @@ let services.postgresql = { enable = true; initialScript = pkgs.writeText "postgresql-init.sql" '' - CREATE DATABASE bitwarden; CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; - GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser; + CREATE DATABASE bitwarden WITH OWNER bitwardenuser; ''; }; @@ -174,7 +173,7 @@ let ) with subtest("use the web interface to sign up, log in, and save a password"): - server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + server.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner") with subtest("log in with the cli"): key = client.succeed( diff --git a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/remote-postgresql.nix index 715477191b..6548883db4 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/remote-postgresql.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/remote-postgresql.nix @@ -16,7 +16,7 @@ in meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ]; nodes = { - database = { + database = { config, ... }: { networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -24,11 +24,13 @@ in ]; }; extraHosts = hosts; - firewall.allowedTCPPorts = [ 5432 ]; + firewall.allowedTCPPorts = [ config.services.postgresql.port ]; }; services.postgresql = { enable = true; + # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. + package = pkgs.postgresql_14; enableTCPIP = true; authentication = '' hostnossl mastodon_local mastodon_test 192.168.2.201/32 md5 @@ -41,7 +43,7 @@ in }; }; - nginx = { + nginx = { nodes, ... }: { networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -69,18 +71,14 @@ in tryFiles = "$uri @proxy"; }; locations."@proxy" = { - proxyPass = "http://192.168.2.201:55001"; - proxyWebsockets = true; - }; - locations."/api/v1/streaming/" = { - proxyPass = "http://192.168.2.201:55002"; + proxyPass = "http://192.168.2.201:${toString nodes.server.services.mastodon.webPort}"; proxyWebsockets = true; }; }; }; }; - server = { pkgs, ... }: { + server = { config, pkgs, ... }: { virtualisation.memorySize = 2048; environment = { @@ -98,7 +96,10 @@ in ]; }; extraHosts = hosts; - firewall.allowedTCPPorts = [ 55001 55002 ]; + firewall.allowedTCPPorts = [ + config.services.mastodon.webPort + config.services.mastodon.sidekiqPort + ]; }; services.mastodon = { @@ -106,6 +107,7 @@ in configureNginx = false; localDomain = "mastodon.local"; enableUnixSocket = false; + streamingProcesses = 2; database = { createLocally = false; host = "192.168.2.102"; diff --git a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/script.nix b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/script.nix index a89b4b7480..afb7c0e0a0 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/script.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/script.nix @@ -10,9 +10,8 @@ server.wait_for_unit("redis-mastodon.service") server.wait_for_unit("mastodon-sidekiq-all.service") - server.wait_for_unit("mastodon-streaming.service") + server.wait_for_unit("mastodon-streaming.target") server.wait_for_unit("mastodon-web.service") - server.wait_for_open_port(55000) server.wait_for_open_port(55001) # Check that mastodon-media-auto-remove is scheduled diff --git a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/standard.nix b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/standard.nix index 14311afea3..e5eb30fef5 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/mastodon/standard.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/mastodon/standard.nix @@ -40,11 +40,15 @@ in port = 31637; }; + # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. + services.postgresql.package = pkgs.postgresql_14; + services.mastodon = { enable = true; configureNginx = true; localDomain = "mastodon.local"; enableUnixSocket = false; + streamingProcesses = 2; smtp = { createLocally = false; fromAddress = "mastodon@mastodon.local"; diff --git a/third_party/nixpkgs/nixos/tests/wordpress.nix b/third_party/nixpkgs/nixos/tests/wordpress.nix index 106bbff46c..592af9a094 100644 --- a/third_party/nixpkgs/nixos/tests/wordpress.nix +++ b/third_party/nixpkgs/nixos/tests/wordpress.nix @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_1" "6_2" "6_3" + "6_3" "6_4" ]; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/xfce.nix b/third_party/nixpkgs/nixos/tests/xfce.nix index 3758ccbccf..9620e9188c 100644 --- a/third_party/nixpkgs/nixos/tests/xfce.nix +++ b/third_party/nixpkgs/nixos/tests/xfce.nix @@ -20,26 +20,56 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; services.xserver.desktopManager.xfce.enable = true; + environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ]; hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then }; + enableOCR = true; + testScript = { nodes, ... }: let user = nodes.machine.users.users.alice; + bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus"; in '' - machine.wait_for_x() - machine.wait_for_file("${user.home}/.Xauthority") - machine.succeed("xauth merge ${user.home}/.Xauthority") - machine.wait_for_window("xfce4-panel") - machine.sleep(10) + with subtest("Wait for login"): + machine.wait_for_x() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") - # Check that logging in has given the user ownership of devices. - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + with subtest("Check that logging in has given the user ownership of devices"): + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal >&2 &'") - machine.wait_for_window("Terminal") - machine.sleep(10) - machine.screenshot("screen") + with subtest("Check if Xfce components actually start"): + machine.wait_for_window("xfce4-panel") + machine.wait_for_window("Desktop") + for i in ["xfwm4", "xfsettingsd", "xfdesktop", "xfce4-screensaver", "xfce4-notifyd", "xfconfd"]: + machine.wait_until_succeeds(f"pgrep -f {i}") + + with subtest("Open whiskermenu"): + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfconf-query -c xfce4-panel -p /plugins/plugin-1 -t string -s whiskermenu -n >&2 &'") + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfconf-query -c xfce4-panel -p /plugins/plugin-1/stay-on-focus-out -t bool -s true -n >&2 &'") + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfce4-panel -r >&2 &'") + machine.wait_until_succeeds("journalctl -b --grep 'xfce4-panel: Restarting' -t xsession") + machine.sleep(5) + machine.wait_until_succeeds("pgrep -f libwhiskermenu") + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfce4-popup-whiskermenu >&2 &'") + machine.wait_for_text('Mail Reader') + # Close the menu. + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfce4-popup-whiskermenu >&2 &'") + + with subtest("Open Xfce terminal"): + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 xfce4-terminal >&2 &'") + machine.wait_for_window("Terminal") + + with subtest("Open Thunar"): + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 thunar >&2 &'") + machine.wait_for_window("Thunar") + machine.wait_for_text('(Pictures|Public|Templates|Videos)') + + with subtest("Check if any coredumps are found"): + machine.succeed("(coredumpctl --json=short 2>&1 || true) | grep 'No coredumps found'") + machine.sleep(10) + machine.screenshot("screen") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix index 7926fe80de..1a807b27b6 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/ejabberd.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.lib.maintainers; { - maintainers = [ ajs124 ]; + maintainers = [ ]; }; nodes = { client = { nodes, pkgs, ... }: { diff --git a/third_party/nixpkgs/nixos/tests/zfs.nix b/third_party/nixpkgs/nixos/tests/zfs.nix index 800f5e43cd..3454fbaf78 100644 --- a/third_party/nixpkgs/nixos/tests/zfs.nix +++ b/third_party/nixpkgs/nixos/tests/zfs.nix @@ -113,8 +113,6 @@ let }; testScript = '' - # TODO: Remove this when upgrading stable to zfs 2.2.0 - unstable = ${if enableUnstable then "True" else "False"}; machine.wait_for_unit("multi-user.target") machine.succeed( "zpool status", @@ -136,8 +134,6 @@ let machine.crash() machine.wait_for_unit("multi-user.target") machine.succeed("zfs set sharesmb=on rpool/shared_smb") - if not unstable: - machine.succeed("zfs share rpool/shared_smb") machine.succeed( "smbclient -gNL localhost | grep rpool_shared_smb", "umount /tmp/mnt", diff --git a/third_party/nixpkgs/nixos/tests/zwave-js.nix b/third_party/nixpkgs/nixos/tests/zwave-js.nix new file mode 100644 index 0000000000..9239e6964f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/zwave-js.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : + +let + secretsConfigFile = pkgs.writeText "secrets.json" (builtins.toJSON { + securityKeys = { + "S0_Legacy" = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; + }; + }); +in { + name = "zwave-js"; + meta.maintainers = with lib.maintainers; [ graham33 ]; + + nodes = { + machine = { config, ... }: { + services.zwave-js = { + enable = true; + serialPort = "/dev/null"; + extraFlags = ["--mock-driver"]; + inherit secretsConfigFile; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("zwave-js.service") + machine.wait_for_open_port(3000) + machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'") + ''; +}) diff --git a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch b/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch deleted file mode 100644 index 2b69e1afa8..0000000000 --- a/third_party/nixpkgs/patches/poetry2nix-cryptography39.0.1.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix ---- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix -+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix -@@ -383,4 +383,5 @@ lib.composeManyExtensions [ - "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; - "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; - "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; -+ "39.0.1" = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc="; - "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index ec475fc936..e69de29bb2 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1 +0,0 @@ -poetry2nix-cryptography39.0.1.patch diff --git a/third_party/nixpkgs/pkgs/README.md b/third_party/nixpkgs/pkgs/README.md index 5cc7024758..31a590e43d 100644 --- a/third_party/nixpkgs/pkgs/README.md +++ b/third_party/nixpkgs/pkgs/README.md @@ -114,6 +114,25 @@ Now that this is out of the way. To add a package to Nixpkgs: 7. Optionally commit the new package and open a pull request [to nixpkgs](https://github.com/NixOS/nixpkgs/pulls), or use [the Patches category](https://discourse.nixos.org/t/about-the-patches-category/477) on Discourse for sending a patch without a GitHub account. +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + (pkg-name): (from -> to | init at version | refactor | etc) + + (Motivation for change. Link to release notes. Additional information.) + ``` + + Examples: + + * nginx: init at 2.0.1 + * firefox: 54.0.1 -> 55.0 + + https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ + ## Category Hierarchy [categories]: #category-hierarchy @@ -362,25 +381,17 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * If in doubt, try to contact the upstream developers for clarification. * `meta.mainProgram` must be set when appropriate. -* `meta.maintainers` should be set. +* `meta.maintainers` must be set for new packages. See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes). ### Import From Derivation -Import From Derivation (IFD) is disallowed in Nixpkgs for performance reasons: -[Hydra] evaluates the entire package set, and sequential builds during evaluation would increase evaluation times to become impractical. - -[Hydra]: https://github.com/NixOS/hydra +[Import From Derivation](https://nixos.org/manual/nix/unstable/language/import-from-derivation) (IFD) is disallowed in Nixpkgs for performance reasons: +[Hydra](https://github.com/NixOS/hydra) evaluates the entire package set, and sequential builds during evaluation would increase evaluation times to become impractical. Import From Derivation can be worked around in some cases by committing generated intermediate files to version control and reading those instead. - - -See also [NixOS Wiki: Import From Derivation]. - -[NixOS Wiki: Import From Derivation]: https://nixos.wiki/wiki/Import_From_Derivation - ## Sources ### Fetching Sources @@ -576,7 +587,7 @@ This is how the pull request looks like in this case: [https://github.com/NixOS/ To run the main types of tests locally: - Run package-internal tests with `nix-build --attr pkgs.PACKAGE.passthru.tests` -- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTest.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix` +- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTests.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix` - Run [global package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) with `nix-build --attr tests.PACKAGE`, where `PACKAGE` is the name of the test listed in `pkgs/test/default.nix` - See `lib/tests/NAME.nix` for instructions on running specific library tests @@ -704,16 +715,16 @@ It can happen that non-trivial updates include patches or more complex changes. Reviewing process: -- Ensure that the package versioning fits the guidelines. -- Ensure that the commit text fits the guidelines. +- Ensure that the package versioning [fits the guidelines](#versioning). +- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions). - Ensure that the package maintainers are notified. - [CODEOWNERS](https://help.github.com/articles/about-codeowners) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. -- Ensure that the meta field information is correct. +- Ensure that the meta field information [fits the guidelines](#meta-attributes) and is correct: - License can change with version updates, so it should be checked to match the upstream license. - If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package. - Ensure that the code contains no typos. -- Building the package locally. - - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. +- Build the package locally. + - Pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. ```ShellSession @@ -730,7 +741,7 @@ Reviewing process: ```ShellSession $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER" ``` -- Running every binary. +- Run every binary. Sample template for a package update review is provided below. @@ -739,7 +750,7 @@ Sample template for a package update review is provided below. - [ ] package name fits guidelines - [ ] package version fits guidelines -- [ ] package build on ARCHITECTURE +- [ ] package builds on ARCHITECTURE - [ ] executables tested on ARCHITECTURE - [ ] all depending packages build - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed @@ -756,18 +767,20 @@ New packages are a common type of pull requests. These pull requests consists in Review process: -- Ensure that the package versioning fits the guidelines. -- Ensure that the commit name fits the guidelines. -- Ensure that the meta fields contain correct information. +- Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation). +- Ensure that the package name and version [fits the guidelines](#package-naming). +- Ensure that the package versioning [fits the guidelines](#versioning). +- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions). +- Ensure that the meta fields [fits the guidelines](#meta-attributes) and contain the correct information: - License must match the upstream license. - Platforms should be set (or the package will not get binary substitutes). - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package. - Report detected typos. - Ensure the package source: - - Uses mirror URLs when available. + - Uses `mirror://` URLs when available. - Uses the most appropriate functions (e.g. packages from GitHub should use `fetchFromGitHub`). -- Building the package locally. -- Running every binary. +- Build the package locally. +- Run every binary. Sample template for a new package review is provided below. @@ -777,7 +790,7 @@ Sample template for a new package review is provided below. - [ ] package path fits guidelines - [ ] package name fits guidelines - [ ] package version fits guidelines -- [ ] package build on ARCHITECTURE +- [ ] package builds on ARCHITECTURE - [ ] executables tested on ARCHITECTURE - [ ] `meta.description` is set and fits guidelines - [ ] `meta.license` fits upstream license diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix index 8c9ad47726..2d706b4204 100644 --- a/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.12"; + version = "0.14.3"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5m4aeuCqSJNgerQKyP9M6Qf7P4ijCtCY4Efew6E09Bc="; + sha256 = "sha256-U4xq9FY2uZlnBwm8Se1wReU1c1RAJMx6FIoD0D2BlM4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix index 88956a190c..3d3589de54 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ams-lv2/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; + postPatch = '' + # U was removed in python 3.11 because it had no effect + substituteInPlace waflib/*.py \ + --replace "m='rU" "m='r" + ''; + meta = with lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; homepage = "https://github.com/blablack/ams-lv2"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/6.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/7.nix similarity index 83% rename from third_party/nixpkgs/pkgs/applications/audio/ardour/6.nix rename to third_party/nixpkgs/pkgs/applications/audio/ardour/7.nix index 4e0508f00c..ab9b2ebcd9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/6.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/7.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit +, fetchzip , alsa-lib , aubio , boost @@ -56,21 +58,40 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.9"; + version = "7.5"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm"; + hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I="; + }; + + bundledContent = fetchzip { + url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip"; + hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A="; + # archive does not contain a single folder at the root + stripRoot = false; }; patches = [ # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096 ./as-flags.patch + ./default-plugin-search-paths.patch ]; + # Ardour's wscript requires git revision and date to be available. + # Since they are not, let's generate the file manually. + postPatch = '' + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc + sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript + patchShebangs ./tools/ + substituteInPlace libs/ardour/video_tools_paths.cc \ + --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ + --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + ''; + nativeBuildInputs = [ doxygen graphviz # for dot @@ -142,31 +163,23 @@ stdenv.mkDerivation rec { # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437 # "--use-external-libs" - # Ardour's wscript requires git revision and date to be available. - # Since they are not, let's generate the file manually. - postPatch = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' - ''; - postInstall = '' # wscript does not install these for some reason install -vDm 644 "build/gtk2_ardour/ardour.xml" \ -t "$out/share/mime/packages" - install -vDm 644 "build/gtk2_ardour/ardour6.desktop" \ + install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \ -t "$out/share/applications" for size in 16 22 32 48 256 512; do install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour6.png" + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png" done install -vDm 644 "ardour.1"* -t "$out/share/man/man1" + + # install additional bundled beats, chords and progressions + cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media" '' + lib.optionalString videoSupport '' # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. - wrapProgram "$out/bin/ardour6" \ + wrapProgram "$out/bin/ardour${lib.versions.major version}" \ --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}" ''; @@ -185,7 +198,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ardour.org/"; license = licenses.gpl2Plus; - mainProgram = "ardour6"; + mainProgram = "ardour7"; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index ab9b2ebcd9..6b001ce85a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -14,15 +14,19 @@ , fftw , fftwSinglePrec , flac +, fluidsynth , glibc , glibmm , graphviz , gtkmm2 , harvid +, hidapi , itstool +, kissfft , libarchive , libjack2 , liblo +, libltc , libogg , libpulseaudio , librdf_raptor @@ -43,6 +47,7 @@ , perl , pkg-config , python3 +, qm-dsp , readline , rubberband , serd @@ -54,18 +59,19 @@ , vamp-plugin-sdk , wafHook , xjadeo +, optimize ? true # disable to print Lua DSP script output to stdout , videoSupport ? true }: stdenv.mkDerivation rec { pname = "ardour"; - version = "7.5"; + version = "8.1"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I="; + hash = "sha256-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E="; }; bundledContent = fetchzip { @@ -115,12 +121,16 @@ stdenv.mkDerivation rec { fftw fftwSinglePrec flac + fluidsynth glibmm gtkmm2 + hidapi itstool + kissfft libarchive libjack2 liblo + libltc libogg libpulseaudio librdf_raptor @@ -139,6 +149,7 @@ stdenv.mkDerivation rec { pango perl python3 + qm-dsp readline rubberband serd @@ -155,13 +166,11 @@ stdenv.mkDerivation rec { "--docs" "--freedesktop" "--no-phone-home" - "--optimize" "--ptformat" "--run-tests" "--test" - ]; - # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437 - # "--use-external-libs" + "--use-external-libs" + ] ++ lib.optional optimize "--optimize"; postInstall = '' # wscript does not install these for some reason @@ -198,7 +207,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ardour.org/"; license = licenses.gpl2Plus; - mainProgram = "ardour7"; + mainProgram = "ardour8"; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index d3c1d868d2..16bc4fe788 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , wrapGAppsHook @@ -15,6 +14,8 @@ , lv2 , lilv , mpg123 +, opusfile +, rapidjson , serd , sord , sqlite @@ -61,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.3.3"; + version = "3.4.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "audacity"; + repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-m38Awdv2ew+MKqd68x/ZsRBwidM2KJ3BRykIKgnFSx4="; + hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M="; }; postPatch = '' @@ -109,8 +110,10 @@ stdenv.mkDerivation rec { lilv lv2 mpg123 + opusfile pcre portmidi + rapidjson serd sord soundtouch diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix deleted file mode 100644 index d803b09c19..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, alsa-lib, bzip2, cairo, dpkg, freetype, gdk-pixbuf -, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg -, libxkbcommon -, makeWrapper, pixman, autoPatchelfHook -, xdg-utils, zenity, zlib }: - -stdenv.mkDerivation rec { - pname = "bitwig-studio"; - version = "1.3.16"; - - src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; - }; - - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; - - unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; - - dontBuild = true; - dontWrapGApps = true; # we only want $gappsWrapperArgs here - - buildInputs = with xorg; [ - alsa-lib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau - libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb - libxkbfile pixman xcbutil xcbutilwm zlib - ]; - - installPhase = '' - mkdir -p $out - cp -r opt/bitwig-studio $out/libexec - - # Use NixOS versions of these libs instead of the bundled ones. - ( - cd $out/libexec/lib/bitwig-studio - rm libbz2.so* libxkbfile.so* libXcursor.so* libXau.so* \ - libXdmcp.so* libpng16.so* libxcb*.so* libharfbuzz.so* \ - libcairo.so* libfreetype.so* - ln -s ${bzip2.out}/lib/libbz2.so.1.0.6 libbz2.so.1.0 - ) - - # Use our OpenJDK instead of Bitwig’s bundled—and commercial!—one. - rm -rf $out/libexec/lib/jre - ln -s ${jdk.home}/jre $out/libexec/lib/jre - - mkdir -p $out/bin - ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio - - cp -r usr/share $out/share - substitute usr/share/applications/bitwig-studio.desktop \ - $out/share/applications/bitwig-studio.desktop \ - --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio - ''; - - postFixup = '' - # Bitwig’s `libx11-windowing-system.so` has several problems: - # - # • has some old version of libxkbcommon linked statically (ಠ_ಠ), - # - # • hardcodes path to `/usr/share/X11/xkb`, - # - # • even if we redirected it with libredirect (after adding - # `eaccess()` to libredirect!), their version of libxkbcommon - # is unable to parse our xkeyboardconfig. Been there, done that. - # - # However, it suffices to override theirs with our libxkbcommon - # in LD_PRELOAD. :-) - - find $out -type f -executable \ - -not -name '*.so.*' \ - -not -name '*.so' \ - -not -path '*/resources/*' | \ - while IFS= read -r f ; do - wrapProgram $f \ - --suffix PATH : "${lib.makeBinPath [ ffmpeg zenity ]}" \ - --prefix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ - "''${gappsWrapperArgs[@]}" \ - --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true - done - ''; - - meta = with lib; { - description = "A digital audio workstation"; - longDescription = '' - Bitwig Studio is a multi-platform music-creation system for - production, performance and DJing, with a focus on flexible - editing tools and a super-fast workflow. - ''; - homepage = "https://www.bitwig.com/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus mrVanDalo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix deleted file mode 100644 index 0d93284e29..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ fetchurl, bitwig-studio1, - pulseaudio }: - -bitwig-studio1.overrideAttrs (oldAttrs: rec { - pname = "bitwig-studio"; - version = "2.5"; - - src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1zkiz36lhck3qvl0cp0dq6pwbv4lx4sh9wh0ga92kx5zhvbjm098"; - }; - - runtimeDependencies = [ - pulseaudio - ]; -}) 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 ac58eed5fa..d1540fd1ce 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 @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.7"; + version = "5.0.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-jsHGUAVRUiz9soffW1PvF6UUGzbGhltaKtEW5ynq/Xk="; + sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/butt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/butt/default.nix index 04f5c85358..01e35f9450 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/butt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/butt/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "butt"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-6c4BknAh+XPaKrEfCz0oHm7lWOLV+9jiJbQx9vvtI4I="; + hash = "sha256-dh6NceHiqpN6PVwKIo2jV3qCO17P6E6QHdZGRVyd6/g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix deleted file mode 100644 index a5d1a783b4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/cadence/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib -, libjack2 -, fetchpatch -, fetchFromGitHub -, jack_capture -, pkg-config -, pulseaudioFull -, qtbase -, mkDerivation -, python3 -}: -#ladish missing, claudia can't work. -#pulseaudio needs fixes (patchShebangs .pa ...) -#desktop needs icons and exec fixing. - -mkDerivation rec { - version = "0.9.1"; - pname = "cadence"; - - src = fetchFromGitHub { - owner = "falkTX"; - repo = "Cadence"; - rev = "v${version}"; - sha256 = "sha256-QFC4wiVF8wphhrammxtc+VMZJpXY5OGHs6DNa21+6B8="; - }; - - patches = [ - # Fix installation without DESTDIR - (fetchpatch { - url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch"; - sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8"; - }) - # Fix build with Qt 5.15 - (fetchpatch { - url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch"; - sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh"; - }) - ]; - - postPatch = '' - libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); - substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso - substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ - "${lib.makeBinPath[pulseaudioFull]}/pulseaudio" - substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso - ''; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - qtbase - jack_capture - pulseaudioFull - ( - (python3.withPackages (ps: with ps; [ - pyqt5 - dbus-python - ])) - ) - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "SYSCONFDIR=${placeholder "out"}/etc" - ]; - - dontWrapQtApps = true; - - # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise. - preFixup = - let - outRef = placeholder "out"; - prefix = "${outRef}/share/cadence/src"; - scriptAndSource = lib.mapAttrs' - (script: source: - lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source) - ) - { - "cadence" = "cadence.py"; - "claudia" = "claudia.py"; - "catarina" = "catarina.py"; - "catia" = "catia.py"; - "cadence-jacksettings" = "jacksettings.py"; - "cadence-aloop-daemon" = "cadence_aloop_daemon.py"; - "cadence-logs" = "logs.py"; - "cadence-render" = "render.py"; - "claudia-launcher" = "claudia_launcher.py"; - "cadence-session-start" = "cadence_session_start.py"; - }; - in - lib.mapAttrsToList - (script: source: '' - rm -f ${script} - makeQtWrapper ${source} ${script} \ - --prefix PATH : "${lib.makeBinPath [ - jack_capture # cadence-render - pulseaudioFull # cadence, cadence-session-start - ]}" - '') - scriptAndSource; - - meta = { - homepage = "https://github.com/falkTX/Cadence/"; - description = "Collection of tools useful for audio production"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "cadence"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix index 731cb63c4d..70d199d43b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.09"; + version = "23.10"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-q42ry47y4tTkUbejv6iN5jXcadXSSTPQ3omhMUevfqU="; + hash = "sha256-6Wt2sC7vdrz2Fkl08bNLfnGu+pAV7b5lZUmsx1wtJRE="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index bf37486627..a6874390f0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "falkTX"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/ZIproky1AHJHvV62xWm0nrzNBOjvBBv93V0KespVjU="; + hash = "sha256-WDwYfDR760Maz3oWNPcPbl8L+0MIRbeqNVGH9Gg4ZYc="; }; nativeBuildInputs = [ @@ -61,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: { filename="$(basename -- "$file")" substituteInPlace "$file" --replace '--with-appname="$0"' "--with-appname=\"$filename\"" done + '' + lib.optionalString withGtk2 '' + # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge. + substituteInPlace source/bridges-ui/Makefile \ + --replace '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0' ''; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix index a3f859ca0e..88d0931ca1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config +{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null @@ -101,7 +101,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM="; }; - patches = [ ./option-debugging.patch ]; + patches = [ + ./option-debugging.patch + # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ + (fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index 34b4b7ab18..f2627d65ff 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -121,6 +121,13 @@ in clangStdenv.mkDerivation { ./autogen.sh ''; + postPatch = '' + # Fix the build on c++17 compiler: + # https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 + # TODO: remove after 1.9.5 release. + substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 ' + ''; + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/elektroid/default.nix b/third_party/nixpkgs/pkgs/applications/audio/elektroid/default.nix new file mode 100644 index 0000000000..c76ba7f1c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/elektroid/default.nix @@ -0,0 +1,53 @@ +{ alsa-lib +, autoreconfHook +, fetchFromGitHub +, gtk3 +, json-glib +, lib +, libpulseaudio +, libsamplerate +, libsndfile +, libzip +, pkg-config +, stdenv +, zlib +}: + +let + version = "2.5.2"; +in +stdenv.mkDerivation { + inherit version; + + pname = "elektroid"; + + src = fetchFromGitHub { + owner = "dagargo"; + repo = "elektroid"; + rev = version; + sha256 = "sha256-wpPHcrlCX7RD/TGH2Xrth+oCg98gMm035tfTBV70P+Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + alsa-lib + gtk3 + json-glib + libpulseaudio + libsamplerate + libsndfile + libzip + zlib + ]; + + meta = with lib; { + description = "Sample and MIDI device manager"; + homepage = "https://github.com/dagargo/elektroid"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ camelpunch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index 5e62399c8a..f0aebf4e4a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , which @@ -15,6 +16,9 @@ , pcaudiolib , sonicSupport ? true , sonic +, CoreAudio +, AudioToolbox +, AudioUnit , alsa-plugins , makeWrapper }: @@ -30,7 +34,13 @@ stdenv.mkDerivation rec { hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk="; }; - patches = lib.optionals mbrolaSupport [ + patches = [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) + ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. (substituteAll { src = ./mbrola.patch; @@ -42,9 +52,20 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib - ++ lib.optional sonicSupport sonic; + ++ lib.optional sonicSupport sonic + ++ lib.optionals stdenv.isDarwin [ + CoreAudio + AudioToolbox + AudioUnit + ]; - preConfigure = "./autogen.sh"; + # touch ChangeLog to avoid below error on darwin: + # Makefile.am: error: required file './ChangeLog.md' not found + preConfigure = lib.optionalString stdenv.isDarwin '' + touch ChangeLog + '' + '' + ./autogen.sh + ''; configureFlags = [ "--with-mbrola=${if mbrolaSupport then "yes" else "no"}" diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix index b393041eeb..a45853ad98 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.13"; + version = "2.5.16"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-Tgb9UYj8mI4JsxA/PaTokm2NzQ14P8cOdKK8KCcnSIQ="; + sha256 = "sha256-O3IWx6Ht/xcb8NFxI7Biwck3dIHbxyof/zDgYDdzozY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index a0a6ce0244..a9a9ab519d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.60.3"; + version = "2.68.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-kaKDZKs/UsrqYlGmGgpSRcqN7FypxLCcIF72klovD4k="; + sha256 = "sha256-jD6/ZeS0xdtajCg5e95E0Jo2lfXOn4OIVf4LJgAfPbo="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix index fb8a27abdc..5da2fa6ee0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/darwin.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw="; + hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix index aff0d5681e..c89d5163c2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/default.nix @@ -8,7 +8,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; pname = "feishin"; - version = "0.3.0"; + version = "0.5.1"; appname = "Feishin"; meta = with lib; { @@ -21,6 +21,7 @@ let maintainers = with maintainers; [ onny ]; }; -in if stdenv.isDarwin +in +if stdenv.isDarwin then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; }) else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix index eaa6b9fc04..d503492adf 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/feishin/linux.nix @@ -25,17 +25,17 @@ let comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; icon = "feishin"; exec = "feishin %u"; - categories = [ "Audio" ]; + categories = [ "Audio" "AudioVideo" ]; mimeTypes = [ "x-scheme-handler/feishin" ]; }; in stdenv.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE="; + hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix index bc92fa096b..a361714712 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "11.2.0"; + version = "11.3.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-pDTBA9HpFzwagz9B5AmaHzML361ON3XA+OIZJQyAuJo="; + sha256 = "sha256-jzpD8+zhIbOYgSNsoE1Pay+FiPXtRCd6Zz6HHkzWAkY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index 503e72dfe0..34329fb2ea 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPackages, pkg-config, cmake +{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake , alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-RqhlpvMbRSwdcY2uuFAdJnihN3aObcLVMuvCZ294dgo="; + hash = "sha256-3qLmo9Ibl44v6Jj5Ix17ixwqfPt3ITTXUqBETF5pzE4="; }; - patches = [ - # Fixes bad CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_LIBDIR concatenation for Darwin install name dir - # Remove when PR merged & in release - (fetchpatch { - name = "0001-Fix-incorrect-way-of-turning-CMAKE_INSTALL_LIBDIR-absolute.patch"; - url = "https://github.com/FluidSynth/fluidsynth/pull/1261/commits/03cd38dd909fc24aa39553d869afbb4024416de8.patch"; - hash = "sha256-nV+MbFttnbNBO4zWnPLpnnEuoiESkV9BGFlUS9tQQfk="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index be3845be65..50993b056a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.72.1"; + version = "1.73"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-dGoldr0JvXri4XfSn/DKeJw/wsBaj+AKoKWdbEgo8lg="; + hash = "sha256-f5deXMSyZIDKPO7hsNONes/kTFLFodx4nuEjZzkR5Aw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix b/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix index 71cc796a62..82166dd123 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/furnace/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, gitUpdater , testers , furnace , fetchFromGitHub @@ -104,9 +103,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - }; + updateScript = ./update.sh; tests.version = testers.testVersion { package = furnace; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/furnace/update.sh b/third_party/nixpkgs/pkgs/applications/audio/furnace/update.sh new file mode 100755 index 0000000000..cc2969f350 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/furnace/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jql + +set -eu -o pipefail + +# Because upstream uses release tags that don't always sort correctly, query for latest release +version="$( + curl -Ls 'https://api.github.com/repos/tildearrow/furnace/releases/latest' \ + | jql -r '"tag_name"' \ + | sed 's/^v//' +)" +update-source-version furnace "$version" diff --git a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix index f3a0ba8c6e..15125358e4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "galaxy-buds-client"; - version = "4.5.2"; + version = "4.5.4"; src = fetchFromGitHub { owner = "ThePBone"; repo = "GalaxyBudsClient"; rev = version; - hash = "sha256-bnJ1xvqos+JP0KF8Z7mX8/8IozcaRCgaRL3cSO3V120="; + hash = "sha256-mmhXTtESjc8uNULc9zV2Qy/815BEEL7ybdnjArF2CXY="; }; projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix index d45dd12b8b..1e72808d90 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/galaxy-buds-client/deps.nix @@ -2,33 +2,42 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.14"; sha256 = "0nn3xgkf7v47dwpnsxjg0b25ifqa4mbq02ja5rvnlc3q2k6k0fxv"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.14"; sha256 = "0diw3l2nblapvvhnpl28fcgmqg845rlp8cszcvzhd8g6mcm54r7i"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.14"; sha256 = "0r0p1g80pj06d8i7mq0kj00bpnsdlrxkh31r9166c779in34y946"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.14"; sha256 = "133w2s2jrjj8731s7xq06c8b4zwn00lb7cn8c1iypqaa82krvkq2"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.14"; sha256 = "06v18kmq10z5gmdqpnvn3aws2ir14gnnz0gvkbj7f68bfggzcg3s"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.14"; sha256 = "1qmggiigsn2rkqr0fhrfvyx138dvazihj64r1s4azq014530r0pk"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.14"; sha256 = "1h0h20cq6hds2mljn1457s42n6pcq821l1d6da2ijncmhk6rdwnl"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.14"; sha256 = "1hnski71ynqqlddfnbhall4fx3ndh04774kzykzparm8nd9aqaam"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.13"; sha256 = "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.14"; sha256 = "1cvyg94avqdscniszshx5r3vfvx0cnna262sp89ad4bianmd4qkj"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.13"; sha256 = "1msrsxzya1l0grfxk17yizfvy2vg4i7hyw1aw54s8gf7x3gpzn86"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.14"; sha256 = "1c1jdxsnqrzwrcalrvc7x34x1zxc5qcpfxx4fkqca99ngw4b0blj"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.14"; sha256 = "182nza6rqndxlwi089r06ladfc6j8vsgqzd7xq21s91zbcbcidar"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.13"; sha256 = "0cs42z2vz679mdic7fbxzjs53xm2lp37wcnh843nz86qvma5280k"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.13"; sha256 = "0s5fcsy2hs2wphd5cs4dnk4aw8zs5bbzisg0ba5akqpzwpps8fs1"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.13"; sha256 = "19kxbgs0nbiw9zq1f9fsawnw0sl5c880z2dfidnjp99vvfda9rzs"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.16"; sha256 = "1gsm421gzzymc6rys4sw4hds33grg2mwpnm5xpbhwfh4bnbfblg8"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.17"; sha256 = "05g761may9xa1n75lmzib5hknjk7k0nz453bmg2d5m0xxqw6yc13"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.17"; sha256 = "0k0xnbayplndc6xld98jdla8zv769aj5s285cpbdgm2dril0rywj"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.17"; sha256 = "0smxxr0b8585x0fq57y3jcaxpl5qyxmkr0c6pd83bsczk8p4rjfy"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Config.Net"; version = "4.15.0"; sha256 = "0hsyma0r8hssz2h7bx38rr8ajx28x5ya2h4k665cbd65z3cs1di1"; }) (fetchNuGet { pname = "Config.Net.Json"; version = "4.15.0"; sha256 = "1q6v4pj76h0hhn26ln4kc8vg75jm8jnlp1ssnrqzwxy88yf82z4h"; }) (fetchNuGet { pname = "CS-Script.Core"; version = "1.4.2-preview"; sha256 = "0djliiixl3ncc1b29s9knal1ascg359na0pacsm73p98ad1f7pzh"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.0"; sha256 = "1b8kvqli5wql53ab9fwyg78h572z4f286s8rjb9xxmsyav1hsyll"; }) + (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.1"; sha256 = "1g5g7mnfr668hww9r84pfl04x0s44cq5ppykqg406a0lkdb2g8yp"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.1"; sha256 = "0z0fadsicysa77ji4fnjkaaqfpc0d1w7x9qlkq40kb3jg7xhsmyx"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.1"; sha256 = "15671jvv5j98rkv249nn1fchxcd9gq8b37iwjqbmijig3r4ir718"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "InputSimulatorCore"; version = "1.0.5"; sha256 = "1vfqhqjcrpzahhvv5kyh6pk6j5c06wd0b2831y31fbxpdkxhbs2p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) @@ -112,16 +121,21 @@ (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; sha256 = "10byjmh2s0c13lmnzfw24qmr11kry9hg9y5fib3556y7759qwbqv"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.13"; sha256 = "0gzsiv85g0i8jmjl0nplvljqrgc4y42ds1q0f1x1hdqbnn7vsav2"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.0-preview.178"; sha256 = "1gwk81iq6zipab3dhpwydrqm2mqz67hpx7asvhna3mx0phrp2zqd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.13"; sha256 = "1a6rwgwwqg98dhk5hdb38iffa39khcrvfwskl6i5j3xgvgzzq2lx"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.13"; sha256 = "0rxm79asyx1dji8x7q1z47mzy6zh8qbgw7py6xfkfj89cai6x4p8"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.13"; sha256 = "1f00mzx7gzfhy42yldi3jzaivsl3byspak22rji86iq0vczz28zg"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.16"; sha256 = "06qf63bx6m18wbhvzfs89m5yl5s08spgg02gr7qy8j36r04k6cc5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.1"; sha256 = "0r14s3zyn3cpic02j80xjh8x6dd8g671f9nfnng5zk1x497qdw3a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "0.5.16"; sha256 = "0qp0vmknclaahf1aj8y2jl4xbaq30rf4ia55fpawxi25dfxsa4wy"; }) + (fetchNuGet { pname = "Svg.Model"; version = "0.5.16"; sha256 = "0c2hk7wgvd2lbc96jxnkcwmzbbdnwgnhh4km9ijb5248qkghs1b1"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "0.5.16"; sha256 = "0ra6svakyg5h6m19ww5yrxl85w8yi3v5vrzqgcnqlvzndk696cyf"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -154,6 +168,7 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix index b277175ec1..72b1fe6129 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = version; - sha256 = "sha256-SW2qT+pMKTMBnkaL+Dg87tqutcLTqaY4nCeFfJjHIw4="; + sha256 = "sha256-q3Lu3UaEKfS7F59G6rPx+5cKcsaXk+xcdtJRIXPwVIs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index 185139da2a..e4a10d82c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , pkg-config , alsa-lib @@ -7,27 +7,27 @@ , nix-update-script }: -buildGoModule rec { +buildGo121Module rec { pname = "go-musicfox"; - version = "4.1.4"; + version = "4.2.1"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-z4zyLHflmaX5k69KvPTISRIEHVjDmEGZenNXfYd3UUk="; + hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38="; }; deleteVendor = true; - vendorHash = "sha256-S1OIrcn55wm/b7B3lz55guuS+mrv5MswNMO2UyfgjRc="; + vendorHash = "sha256-ILO4v4ii1l9JokXG7R3vuN7i5hDi/hLHTFiClA2vdf0="; subPackages = [ "cmd/musicfox.go" ]; ldflags = [ "-s" "-w" - "-X github.com/go-musicfox/go-musicfox/pkg/constants.AppVersion=${version}" + "-X github.com/go-musicfox/go-musicfox/internal/types.AppVersion=${version}" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix index f51daf7081..b4800889de 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.6"; + version = "0.7.9"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-w0nmTYcq2DBHSjQ23zWxT6optyH+lRAMRa210F7XEvE="; + hash = "sha256-yXrCE3nsdZP4JHKVslzQafjZ380zC8sZv5TJf8dJqJw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index f8d4232798..7eaac915a5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.11.3"; + version = "3.11.4"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "p8BgpvMK1kP4VnRfmcvSMbXmWs5DmWBZ6te7L9b+UJQ="; + sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4="; }; patches = [ @@ -95,6 +95,6 @@ python3Packages.buildPythonApplication rec { homepage = "http://gpodder.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ skeidel mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix index a16ad3c932..ba73a5aae1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gtkpod/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/gtkpod/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix index 3033888996..3a650646a8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , avahi @@ -50,6 +51,12 @@ stdenv.mkDerivation rec { sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; }; + # doesnt apply cleanly, so doing with substituteInPlace + # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch + postPatch = '' + substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')" + ''; + nativeBuildInputs = [ gettext hicolor-icon-theme diff --git a/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix index 97862104a0..80cb8f7698 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/industrializer/default.nix @@ -6,6 +6,7 @@ , automake , gnome2 , gtk2 +, libGL , libjack2 , libtool , libxml2 @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { audiofile gnome2.gtkglext gtk2 + libGL libjack2 libtool libxml2 diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix index 44e6dd1cd8..e0b761a70f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jack-capture/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "jack_capture"; - version = "0.9.73"; + version = "0.9.73.2023-01-04"; - src = fetchurl { - url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz"; - sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; + src = fetchFromGitHub { + owner = "kmatheussen"; + repo = "jack_capture"; + rev = "a539d444d388c4cfed7279e385830e7767d59c41"; + sha256 = "sha256-2DavZS4esV17a3vkiPvfCfp0QF94ZcXqdIw84h9HDjA="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for recording soundfiles with jack"; - homepage = "http://archive.notam02.no/arkiv/src"; + homepage = "https://github.com/kmatheussen/jack_capture/"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu orivej ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 935e3a9503..032ee8ec03 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm, xorg , zita-convolver, zita-resampler }: @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libxcb lv2 xcbutilwm + xorg.xcbutil zita-convolver zita-resampler ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix index 4759451abd..620f2ee088 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -6,25 +6,48 @@ , openssl , libiconv , sqlite -, Security }: +, Security +, SystemConfiguration +, CoreFoundation +, installShellFiles +, asciidoctor }: rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-9o0PsmOkanPcES3y8NvvEOA/lsUU1vtKQAqBQwQtazk="; + hash = "sha256-rI6GBDUzI0pHjULoNKWZ4GKlrtpX/4x6Q1Q+DByNqRs="; }; - cargoHash = "sha256-z7L6VQmCYo4YoEmwrvNU3u3UxnLkAqPgFBqJv4K1N1k="; + cargoHash = "sha256-8/0WkoDxUJz0QoQiDGHTuU7HmiY9nqUNPvztI0xmqvk="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; - buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]); + buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ + libiconv + Security + SystemConfiguration + CoreFoundation + ] else [ + openssl + ]); + + buildFeatures = [ "shell_completion" ]; + + postInstall = '' + installShellCompletion \ + --bash generated_completions/listenbrainz-mpd.bash \ + --fish generated_completions/listenbrainz-mpd.fish \ + --zsh generated_completions/_listenbrainz-mpd + + asciidoctor --backend=manpage listenbrainz-mpd.adoc -o listenbrainz-mpd.1 + installManPage listenbrainz-mpd.1 + ''; meta = with lib; { homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index 5ff07f2fa6..43e5338cb9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.11"; + version = "1.2.13"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-9zLs1J7rZkMaVQxOwihjCsKSLyb9q64pTZLVg/UVf2o="; + sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix index 679062fccf..fcfafbdb4b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -37,5 +37,8 @@ stdenv.mkDerivation rec { license = licenses.bsd0; maintainers = with maintainers; [ magnetophon orivej ]; platforms = platforms.linux; + # 2023-08-19, `-Werror=format-security` fails for xputty + # reported as https://github.com/brummer10/libxputty/issues/12 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix index a21495027c..6cc20269dc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, lib, symlinkJoin, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, runCommandLocal }: let pname = "mbrola"; @@ -7,31 +7,19 @@ let meta = with lib; { license = licenses.agpl3Plus; maintainers = with maintainers; [ davidak ]; - platforms = platforms.linux; + platforms = platforms.all; description = "Speech synthesizer based on the concatenation of diphones"; homepage = "https://github.com/numediart/MBROLA"; }; - voices = stdenvNoCC.mkDerivation { - pname = "${pname}-voices"; - inherit version; - - src = fetchFromGitHub { - owner = "numediart"; - repo = "MBROLA-voices"; - rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit - sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; - }; - - dontBuild = true; - installPhase = '' - runHook preInstall - install -d $out/share/mbrola/voices - cp -R $src/data/* $out/share/mbrola/voices/ - runHook postInstall - ''; - dontFixup = true; + # Very big (0.65 G) so kept as a fixed-output derivation to limit "duplicates". + voices = fetchFromGitHub { + owner = "numediart"; + repo = "MBROLA-voices"; + rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit + sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; + name = "${pname}-voices-${version}"; meta = meta // { description = "Speech synthesizer based on the concatenation of diphones (voice files)"; homepage = "https://github.com/numediart/MBROLA-voices"; @@ -65,8 +53,14 @@ let }; in -symlinkJoin { - inherit pname version meta; - name = "${pname}-${version}"; - paths = [ bin voices ]; -} + runCommandLocal + "${pname}-${version}" + { + inherit pname version meta; + } + '' + mkdir -p "$out/share/mbrola" + ln -s '${voices}/data' "$out/share/mbrola/voices" + ln -s '${bin}/bin' "$out/" + '' + diff --git a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index bb11921823..6165e2c618 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.22"; + version = "10.26"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-JmDH9IudtuJdu1kSDI1RNaYiIgmPgH4RT2Myz9ihQH4="; + sha256 = "sha256-SXuuAavvqzZ7DRX6SKfPfC1smbTHVHUAv80w0RHLfpg="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 86d20ea5e8..417dd8e41a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, pythonPackages, mopidy }: +{ lib, fetchFromGitHub, pythonPackages, mopidy, unstableGitUpdater }: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2023-04-21"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "984151ac96c5f9c35892055bff20cc11f46092d5"; - hash = "sha256-4e9Aj0AOFR4/FK54gr1ZyPt0nYZDMrMetV4FPtBxapU="; + rev = "48faaaa2642647b0152231798b46ccd9631694f5"; + hash = "sha256-RwkUdcbDU7/ndVnPteG/iXB2dloljvCHQlvPk4tacuA="; }; propagatedBuildInputs = [ @@ -22,6 +22,8 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_spotify" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-spotify"; description = "Mopidy extension for playing music from Spotify"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix index 7746d1c63f..5f9f0229cb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix @@ -1,38 +1,60 @@ -{ fetchurl, lib, stdenv, gettext, libmpcdec, libao }: +{ lib +, stdenv +, fetchFromGitLab +, gettext +, libao +, libmpcdec +}: -let version = "0.2.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpc123"; - inherit version; + version = "0.2.4"; - src = fetchurl { - url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz"; - sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "mpc123"; + rev = "upstream/${finalAttrs.version}"; + hash = "sha256-+/yxb19CJzyjQmT3O21pEmPR5YudmyCxWwo+W3uOB9Q="; }; - patches = [ ./use-gcc.patch ]; + strictDeps = true; + + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + gettext + libao + libmpcdec + ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; - buildInputs = [ gettext libmpcdec libao ]; + # XXX: Should install locales too (though there's only 1 available). + installPhase = '' + runHook preInstall - installPhase = - # XXX: Should install locales too (though there's only 1 available). - '' mkdir -p "$out/bin" - cp -v mpc123 "$out/bin" - ''; + mkdir -p "$out/bin" + cp -v mpc123 "$out/bin" + + runHook postInstall + ''; meta = { - homepage = "https://mpc123.sourceforge.net/"; - description = "A Musepack (.mpc) audio player"; - + homepage = "https://github.com/bucciarati/mpc123"; license = lib.licenses.gpl2Plus; - + mainProgram = "mpc123"; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc123/use-gcc.patch b/third_party/nixpkgs/pkgs/applications/audio/mpc123/use-gcc.patch deleted file mode 100644 index ca4cf84591..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc123/use-gcc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't worry, just use GCC and everything's gonna be alright. - ---- mpc123-0.2.4/Makefile 2008-03-21 22:14:38.000000000 +0100 -+++ mpc123-0.2.4/Makefile 2010-01-28 23:26:49.000000000 +0100 -@@ -17,7 +17,7 @@ - # along with this program; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --CC := $(shell which colorgcc || which cc) -+CC := gcc - - TAGSPRG := ctags - diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix index 92f66d375d..a382450848 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests + beautifulsoup4 distutils-extra mpd2 notify-py pygobject3 requests ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix index 348dcfb598..94ee6ad53e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix @@ -21,11 +21,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.31.3"; + version = "1.32.3"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo="; + hash = "sha256-LZkTpX1O6PSXoYLG6CWCYCQJeCpPtIHpif7r9ENYZ7Q="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix index 75cf863fc7..e011804944 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs="; + sha256 = "sha256-zY1AFcm8uvFkrKUZHsqtKY2CYTY4bWmkTJ7bZPqXoxk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mus/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/mus/Cargo.lock deleted file mode 100644 index c9d036eea3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/mus/Cargo.lock +++ /dev/null @@ -1,382 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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 = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bufstream" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "clap" -version = "4.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[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 = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[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 = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "mpd" -version = "0.1.0" -source = "git+https://github.com/kstep/rust-mpd?rev=e8b5c3d#e8b5c3d67bb602960aa21910430380d6626b3be7" -dependencies = [ - "bufstream", -] - -[[package]] -name = "mus" -version = "0.1.0" -dependencies = [ - "clap", - "colored", - "mpd", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[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.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/third_party/nixpkgs/pkgs/applications/audio/mus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mus/default.nix index 402b0b70c1..1235486ab5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mus/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mus"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~sfr"; repo = pname; rev = version; - hash = "sha256-s7rizOieOmzK0Stkk1SWe9h/5DoaH6MMmL/5QFeezt0="; + hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mpd-0.1.0" = "sha256-5UC6aFNJU9B5AlgJ7uPO+W7e2MHpvTu2OpktjiIXMfc="; - }; - }; + cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; meta = with lib; { description = "a pretty good mpd client"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 531d285126..f25606886f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { description = "Terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; - maintainers = with lib.maintainers; [ aanderse srapenne afh ]; + maintainers = with lib.maintainers; [ aanderse afh ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix index 935c277597..3e130b0855 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "12.0.2"; + version = "13.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-7jE3erxrCPN2deI7EV0gDH1gy2XdwC1YdU2mo2xMI6Q="; + sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix index 5723a1fd10..daafc48deb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.12.7"; + version = "3.13.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA="; + sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix index 645b071561..5a25843d27 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix @@ -2,6 +2,7 @@ , stdenv , buildDotnetModule , fetchFromGitHub +, fetchpatch , dotnetCorePackages , dbus , fontconfig @@ -22,6 +23,19 @@ buildDotnetModule rec { hash = "sha256-/+hlL2sj/juzWrDcb5dELp8Zdg688XK8OnjKz20rx/M="; }; + patches = [ + # Needed until stakira/OpenUtau#836 is merged and released to fix crashing issues. See stakira/OpenUtau#822 + (fetchpatch { + name = "openutau-update-avalonia-to-11.0.4.patch"; + url = "https://github.com/stakira/OpenUtau/commit/0130d7387fb626a72850305dc61d7c175caccc0f.diff"; + hash = "sha256-w9PLnfiUtiKY/8+y4qqINeEul4kP72nKEVc5c8p2g7c="; + # It looks like fetched files use CRLF but patch comes back with LF + decode = "sed -e 's/$/\\r/'"; + }) + ]; + # Needs binary for above patch due to CRLF shenanigans otherwise being ignored + patchFlags = [ "-p1" "--binary" ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; @@ -47,8 +61,8 @@ buildDotnetModule rec { # needed until upstream bumps to dotnet 7 postPatch = '' substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \ - "net6.0" \ - "net7.0" + 'net6.0' \ + 'net7.0' ''; # need to make sure proprietary worldline resampler is copied @@ -74,10 +88,10 @@ buildDotnetModule rec { binaryNativeCode ]; license = with licenses; [ - # dotnet code + # dotnet code and worldline resampler binary mit - # worldline resampler - unfree + # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT + unfreeRedistributable ]; maintainers = with maintainers; [ lilyinstarlight ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/openutau/deps.nix b/third_party/nixpkgs/pkgs/applications/audio/openutau/deps.nix index ea369c1408..8421591775 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/openutau/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/openutau/deps.nix @@ -3,22 +3,22 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-rc1.1"; sha256 = "15gn6qbbx6zars37fvfdsyvqg9303zr8dsx7k1v6a4mzm190xhmm"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-rc1.1"; sha256 = "0nflr62lywmgby1lc6zasn24rinkq72imkazhv77wnj28ayid3bx"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-rc1.1"; sha256 = "088xz8llm8298agk4dkpzrb1bqyksgvzhj3pw1s4r1fcdfl0z64j"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-rc1.1"; sha256 = "06580q0il62f3464vq2113gbv0yng4jqm79k2wvn3brzl82pyhvq"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-rc1.1"; sha256 = "1jia97djk33za7spfr9276plvx8mybm7i3ckp1wprlnmh5b6nykp"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-rc1.1"; sha256 = "1mpm34lgxcxh5hglyq2fpggdf18cadzx9030kxax5ilp69mk93df"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-rc1.1"; sha256 = "0hzk1gb4zh9n5k3wv2n8nw9qcgyj9pvwysph3shg9m8wwrdhkiy5"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-rc1.1"; sha256 = "08116ixw118i2v11dylhwkj1ilgkpk29cp9n7zqj3zk7pxkln2f7"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-rc1.1"; sha256 = "1m3r05b14vw4mn1m9ak91j00q0ppnkysb6m7w86sacqjfhpl8faa"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-rc1.1"; sha256 = "0a8xvqd0hgi8bynjipvvhg0cm9qr63p0h3ji1wbn3y9vrysliykh"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-rc1.1"; sha256 = "03lp3m40hwbpasa4q6gykj1y5772lpzzr59y5k1nbi54k2n3fl3k"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-rc1.1"; sha256 = "0bgz8djfmb17qrf44bivcyf9hwdfccl5f8hgyq158y7ag4a313sn"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-rc1.1"; sha256 = "1zslv10kcmclx5ajd74yi6j1f8p3a9iy2r0w4k8kwkc56d5jg30c"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-rc1.1"; sha256 = "0b4bmza84bv8hbh6jmy1kxxp9pnz4q4wq6bw8jc30w4jkdhp588r"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix b/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix index 5e781a9f51..d85b543bae 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation { ]; patches = [ + # https://github.com/paulnasca/paulstretch_cpp/pull/12 (fetchpatch { - url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + url = "https://github.com/paulnasca/paulstretch_cpp/commit/d8671b36135fe66839b11eadcacb474cc8dae0d1.patch"; sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 5cec295d0a..00aed30366 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar globin ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; mainProgram = "pavucontrol"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix index 15f75813f8..0a258b0cb9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pbpctrl/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pbpctrl"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "qzed"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-CYroQb6x2d4ay3RZUSiSrcGDF0IL3ETZtHAFt18sa5s="; + hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI="; }; - cargoHash = "sha256-+YtnPKbxZENL6/u36RFFZA6F+19qHDAVx6Q8FSB/LCU="; + cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 03df731aef..12efbfb64a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cyclone"; - version = "0.3beta-2"; + version = "unstable-2023-09-12"; src = fetchFromGitHub { owner = "porres"; repo = "pd-cyclone"; - rev = "cyclone${version}"; - sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q"; + rev = "7c470fb03db66057a2198843b635ac3f1abde84d"; + hash = "sha256-ixfnmeoRzV0qEOOIxCV1361t3d59fwxjHWhz9uXQ2ps="; }; buildInputs = [ puredata ]; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { rm -rf $out/lib ''; - meta = { + meta = with lib; { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; - license = lib.licenses.tcltk; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; + license = licenses.tcltk; + maintainers = with maintainers; [ magnetophon carlthome ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix index fc4c08a63a..7bfdb1bd8a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -10,17 +11,18 @@ , libv4l , libX11 , file - }: +}: stdenv.mkDerivation rec { pname = "gem-unstable"; - version = "2020-09-22"; + version = "2023-07-28"; src = fetchFromGitHub { + owner = "umlaeute"; repo = "Gem"; - rev = "2edfde4f0587e72ef325e7f53681936dcc19655b"; - sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq"; + rev = "4ec12eef8716822c68f7c02a5a94668d2427037d"; + hash = "sha256-Y/Z7oJdKGd7+aSk8eAN9qu4ss+BOvzaXWpWGjfJqGJ8="; }; nativeBuildInputs = [ @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { libX11 ]; - meta = { + meta = with lib; { description = "Graphics Environment for Multimedia"; homepage = "http://puredata.info/downloads/gem"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.raboof ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raboof carlthome ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index 1f811c2767..4ae4ff6b67 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -16,19 +16,18 @@ let if enablePlayback then pythonPackages.pyqt5_with_qtmultimedia else - pythonPackages.pyqt5 - ; + pythonPackages.pyqt5; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.9.2"; + version = "2.10"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-Sk4QlwJqqgCWAgguhIVscJfpf/5imoHYN9yVWv5qYG8="; + hash = "sha256-wgIJ813mOSpFzFJESDwNvRSZcX42MTtOyFgSeeRR28g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix index 6022695282..0f302bc72e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MSm9rW41x8qvPuDermOPIYpxgblk5hlKIQsUEAvCzMo="; + sha256 = "sha256-jMP8hPv0Rv/OIVIzR/5R8LmEcyzwtcof9Ire86WtISc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix index 576124d968..10bd25e116 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pocket-casts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "pocket-casts"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE="; + sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; }; desktopItems = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 8b2770ecd2..1e9e26cb18 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.16"; + version = "6.3.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-0g16EblefuUU99RgcwtGrPWniGGlOt6GjVjyNdzN3GY="; + hash = "sha256-hVQPLRyDXrqpheAqzC/hQ/ZaFxP1c7ClAJQs3wlEcGc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 940a281a1c..276fdbf32e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.64"; + version = "1.65.1"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-b/1YksgXKXi6Tyntd03yWKZAAjvmG4HxsVYLVXoiMaA="; + sha256 = "sha256-0bZGiulLeAZ8bR0lj0Bm7te3T3YhxSOBFgMgWADRkIY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix index ebdc0388b9..f8df443f5c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix @@ -1,30 +1,51 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsa-lib, libjack2, tk, fftw +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gettext +, makeWrapper +, alsa-lib +, libjack2 +, tk +, fftw +, portaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "puredata"; - version = "0.50-2"; + version = "0.54-0"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; + hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsa-lib libjack2 fftw ]; + buildInputs = [ + fftw + libjack2 + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + portaudio + ]; configureFlags = [ - "--enable-alsa" - "--enable-jack" + "--enable-universal" "--enable-fftw" - "--disable-portaudio" - "--disable-oss" + "--enable-jack" + ] ++ lib.optionals stdenv.isLinux [ + "--enable-alsa" + ] ++ lib.optionals stdenv.isDarwin [ + "--enable-portaudio" + "--without-local-portaudio" + "--disable-jack-framework" + "--with-wish=${tk}/bin/wish8.6" ]; postInstall = '' - wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin + wrapProgram $out/bin/pd --prefix PATH : ${lib.makeBinPath [ tk ]} ''; meta = with lib; { @@ -32,7 +53,9 @@ stdenv.mkDerivation rec { audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ goibhniu carlthome ]; + mainProgram = "pd"; + changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index bc384f68a6..c7a6bd8932 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.11"; + version = "0.9.12"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-dZW9bZ17O/1DxBr5faYSE+YkSuz7NIJSc1vqxzOOxyg="; + sha256 = "sha256-S8fEg8joFHgk6MKWeSxPyTM8O6Ffx5NG90OabPPDs7s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix index 569c707b93..65cf4e3d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-gbQkDZgyo22VTWpEixuS2WaiwwXgKDsnXbB6Q0U0OeM="; + hash = "sha256-Jb4/KxnY1wtrUTbD+X04Wl7b9A2sZ92E/N1K+dVU95U="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index 01d35ba259..44a285c7b6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -1,23 +1,33 @@ -{ lib, mkDerivation, fetchFromGitLab -, cmake, pkg-config -, alsa-lib, pipewire +{ lib +, stdenv +, fetchFromGitLab +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, qtsvg +, qtwayland +, alsa-lib +, pipewire }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; - rev = "v${version}"; - sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-wJ+vUw16yBBFjMdJogF1nkLnAh3o2ndN9+0png8ZVJ4="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ alsa-lib pipewire ]; + buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ]; + + cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ]; meta = with lib; { description = "Qt graph manager for PipeWire, similar to QjackCtl."; @@ -30,5 +40,6 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ kanashimia exi Scrumplex ]; + mainProgram = "qpwgraph"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 7c9e90fe9a..b5cf860ad9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.82"; + version = "7.05"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-2vtkOodMj0JGLQQn4a+XHxodHQqpnSW1ea7v6aC9sHo="; - aarch64-linux = "sha256-FBNfXTnxqq22CnFrE2zvf6kDy/p/+SXOzqz7JS3IdG8="; + x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0="; + aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index 6e6110fe22..56546404ad 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20230906"; + version = "20231029"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-eW1sqfcAR3lutSyQKj7j1elkFTa8jfZqgrJYYAzMlzo="; + sha256 = "sha256-ELCV5c79fFX1C4+S9bnDFOx3jAs/R2TERH1Q9fkBGnY="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix index 1d43d11c60..d1ac18eabb 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -10,9 +10,18 @@ stdenv.mkDerivation rec { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - sha256 = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; + hash = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; }; + patches = [ + # link with -lGL can remove on next update + (fetchpatch { + name = "ui-add-lGL.patch"; + url = "https://github.com/pantherb/setBfree/commit/756437db43fbf5481f101d8fc695f8b11192047f.patch"; + hash = "sha256-49PYTayD4TchAApfFvj3DLc4EBTxH8LYx48TtdSRwwA="; + }) + ]; + postPatch = '' substituteInPlace common.mak \ --replace /usr/local "$out" \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index 8cf233c37f..f82043c8dc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.6"; + version = "23.8"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-3oh2kFhCYe1sl4MN336Z6pEmpluiUnlcC5aAZxn0zIE="; + sha256 = "sha256-g2+7i1+TgX17TpW1mHSdAzHKC/Gtm4NYZCmuVoPo2rg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix b/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix index 30e6ba9b2f..96757234e1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/songrec/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-cUiy8ApeUv1K8SEH4APMTvbieGTt4kZYhyB9iGJd/IY="; + hash = "sha256-K80uoMfwkyH/K8t6zdkq1ZYTpI0dAIvO2K2kzpzDoN0="; }; - cargoSha256 = "sha256-Tlq4qDp56PXP4N1UyHjtQoRgDrc/19vIv8uml/lAqqc="; + cargoHash = "sha256-Xmey+goHGTWMgKIJRzKMi9Y1bv677Yo2sfDaMauvZsM="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index df05a7cdec..74e488e436 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -25,6 +25,7 @@ , boost , aubio , jack2 +, jack-example-tools , supercollider-with-sc3-plugins , parallel @@ -187,14 +188,14 @@ stdenv.mkDerivation rec { preFixup = '' # Wrap Qt GUI (distributed binary) wrapQtApp $out/bin/sonic-pi \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} # If ImGui was built if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then # Wrap ImGui into bin makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \ --inherit-argv0 \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} fi # Remove runtime Erlang references diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix index bc7a6ea5a1..e2e5094e84 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.gst-python - python3Packages.distutils_extra + python3Packages.distutils-extra python3Packages.setuptools python3Packages.pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundwireserver/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundwireserver/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix index 90348e7b80..8ae8001b6e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "spectmorph"; - version = "0.5.2"; + version = "0.6.1"; src = fetchurl { - url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; + url = "https://github.com/swesterfeld/spectmorph/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-H/PaczAkjxeu2Q6S/jazZ0PU9oCmhBzsLgbGLusxXm8="; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix index 239d032682..16b3e7bdd5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix @@ -2,7 +2,7 @@ , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta, harfbuzz +, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. , deviceScaleFactor ? null @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.13.661.ga588f749"; + version = "1.2.22.982.g794acc0a"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "68"; + rev = "70"; deps = [ alsa-lib @@ -40,6 +40,8 @@ let glib gtk3 harfbuzz + libayatana-appindicator + libdbusmenu libdrm libgcrypt libnotify @@ -84,7 +86,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-THGSRx0sGOVEB6bOHWHiy1G0Acq0hUa94tG/v+i5DA+CluI58pqj8gYQ61k/ACLJXTUyM8SA92C8DK1Go18X8w=="; + hash = "sha512-oxDUZqyMLxCbUBb1A+BBznByQ1rZAJcEIkaSUQ93/k1DX3rTaBHzEXmBtJhmN6L8L3fw1pa9GvE7eDaD8+jeGg=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh b/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh index 8c466e836c..9bd983755c 100755 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh @@ -39,12 +39,11 @@ snap_info=($( # just for human consumption. Revision is just an integer that gets increased # by one every (stable or unstable) release. revision="${snap_info[0]}" -sha512="${snap_info[1]}" +# We need to escape the slashes +hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')" upstream_version="${snap_info[2]}" last_updated="${snap_info[3]}" - echo "Latest $channel release is $upstream_version from $last_updated." - # # read the current spotify version from the currently *committed* nix expression # @@ -70,7 +69,7 @@ echo "Updating from ${current_nix_version} to ${upstream_version}, released on $ # search-and-replace revision, hash and version sed --regexp-extended \ -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ - -e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \ -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ -i "$spotify_nix" diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index d0ceec6d67..da126de3fc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; + mainProgram = binName; maintainers = with maintainers; [ adamcstephens ]; platforms = if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix index b9ca1a1790..4feaf9cd99 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 cairo lv2 libjack2 mesa + xorg.libX11 cairo libGL lv2 libjack2 mesa ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 7933c74571..b9821895d3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.20"; + version = "1.0.21"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-/utd2uYoxPHQ4kQwA0tZW5HwmN90vXL23EiNFh3wXoE="; + hash = "sha256-McwnYHaw0LYDeHLDQzfqRIYMV2FoiMdHyOL/EE8/esU="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix index a146ea8cd9..312cf1db5b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/string-machine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, boost, cairo, libGL, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "string-machine"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost cairo lv2 + boost cairo libGL lv2 ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 52ddd53021..47c2297274 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.7"; + version = "7.7.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; + hash = "sha256-FNRG0NKHQpPHb3P1M0eshFuGu9lyWFgmufFC5aqr7n0="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix index 04dd28e0b5..6c4dd61c66 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix @@ -49,14 +49,15 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tenacityteam"; repo = pname; + fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-wesnay+UQiPSDaRuSo86MgHdElN4s0rPIvokZhKM7GI="; + hash = "sha256-UU3iKfab6en4IyGlpNLUhOil3snzaZ2nI6JMqoL6DUs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix index 806f01dc12..2c15d1e205 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tetraproc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tetraproc"; - version = "0.8.6"; + version = "0.9.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7"; + sha256 = "sha256-kRak33RuYusG6U5FOf9b9vOJUjNK3zqoLL0V/bWBJqs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix index 82a5220d7d..3d6917b58d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.1.171"; + version = "1.2.4.180"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-lIm+X+znIp80cbVb8KEkeZwiMkTsqdRLAfI+3a9BgfY="; - armv7l-linux = "sha256-kghoaLQ3aEIytdmxlmVXPuZWBwg/A3Y3NL2WSmHKxMM="; - x86_64-linux = "sha256-iRab2H+TYpGcUBB/x2/M4NuupWLjvt4EvyMc5cfWyeo="; + aarch64-linux = "sha256-Z3vHcfimchshFTRbSsVhAw4DJPetZF59zyAnnbQ3YAM="; + armv7l-linux = "sha256-KUA6UFenEVme0AMuE69dR13RfYSGAd9GEdikh3DS0ko="; + x86_64-linux = "sha256-3RA+piRJ4UE4tPYALaifENJg7+0BZDmSwS36VJiEn8Q="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix index f696c50618..6b5e646017 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/default.nix @@ -1,21 +1,23 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , mpg123, ffmpeg, libvorbis, libao, jansson, speex +, nix-update-script }: -let - vgmstreamVersion = "r1702-5596-00bdb165b"; -in + stdenv.mkDerivation rec { pname = "vgmstream"; - version = "unstable-2022-02-21"; + version = "1879"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; - rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; - sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; + rev = "refs/tags/r${version}"; + sha256 = "sha256-m7M9oIEym/jzuw2HAbjdF6fZsfTew1KK0g1D4SePiiE="; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + attrPath = "vgmstream"; + extraArgs = [ "--version-regex" "r(.*)" ]; + }; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,10 +30,6 @@ stdenv.mkDerivation rec { "-DUSE_CELT=OFF" ]; - postConfigure = '' - echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h - ''; - meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh b/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh deleted file mode 100755 index 5353480dd3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/vgmstream/update.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the vgmstream folder" - exit 1 -fi - -if [[ ! -v GITHUB_TOKEN ]]; then - echo "ERROR: \$GITHUB_TOKEN not set" - exit 1 -fi - - -payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' < Collect Logs + # in at least rider and goland + udev + ])} >> $vmopts_file ''; installPhase = '' @@ -106,21 +121,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { wrapProgram "$out/$pname/bin/${loName}.sh" \ --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ - # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib libsecret e2fsprogs - libnotify - # Required for Help -> Collect Logs - # in at least rider and goland - udev - ] ++ extraLdPath)}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ --set-default JETBRAINSCLIENT_JDK "$jdk" \ - --set ${hiName}_JDK "$jdk" \ - --set ${hiName}_VM_OPTIONS ${vmoptsFile} + --set-default ${hiName}_JDK "$jdk" \ + --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh 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 e3c39af090..353d4a5d4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,15 +18,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" }, "name": "ideavim" }, @@ -35,7 +35,7 @@ "idea-ultimate" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip" }, "name": "python" }, @@ -57,15 +57,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip", - "232.9559.28": null, - "232.9559.58": null, - "232.9559.61": null, + "232.10072.15": null, + "232.10072.21": null, + "232.10072.27": null, + "232.10072.28": null, + "232.10072.31": null, + "232.10072.32": null, "232.9921.42": null, - "232.9921.47": null, - "232.9921.48": null, - "232.9921.53": null, - "232.9921.55": null, - "232.9921.62": null + "232.9921.83": null, + "233.8264.22": null }, "name": "kotlin" }, @@ -87,15 +87,15 @@ ], "builds": { "223.8836.1185": null, - "232.9559.28": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip" + "232.10072.15": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip" }, "name": "ini" }, @@ -105,8 +105,8 @@ "phpstorm" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip" }, "name": "symfony-support" }, @@ -116,8 +116,8 @@ "phpstorm" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -130,11 +130,10 @@ "rust-rover" ], "builds": { - "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip" + "232.10072.15": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip" }, "name": "python-community-edition" }, @@ -155,14 +154,14 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" }, "name": "-deprecated-rust" }, @@ -183,14 +182,14 @@ ], "builds": { "223.8836.1185": null, - "232.9559.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "-deprecated-rust-beta" }, @@ -205,11 +204,10 @@ "webstorm" ], "builds": { - "232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" + "232.10072.21": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" }, "name": "ide-features-trainer" }, @@ -231,15 +229,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "233.8264.22": null }, "name": "nixidea" }, @@ -248,7 +246,7 @@ "idea-ultimate" ], "builds": { - "232.9921.47": "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip" }, "name": "go" }, @@ -269,16 +267,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip" }, "name": "csv-editor" }, @@ -299,16 +297,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip" }, "name": "vscode-keymap" }, @@ -329,16 +327,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip" }, "name": "eclipse-keymap" }, @@ -359,16 +357,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "223.8836.1185": null, + "232.10072.15": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip" }, "name": "visual-studio-keymap" }, @@ -390,15 +388,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.58": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.10072.32": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.48": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.9921.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.8264.22": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -419,16 +417,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "232.9921.83": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip" }, "name": "github-copilot" }, @@ -450,15 +448,15 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.58": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.10072.32": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.9921.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -469,41 +467,45 @@ "rust-rover" ], "builds": { - "232.9921.42": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", - "232.9921.62": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip" + "232.10072.27": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", + "233.8264.22": "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", - "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip": "sha256-m9ocJSFWparZLrX1MQA0IlSH5LHodmzzVmGZ6eHml24=", - "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", + "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip": "sha256-3bHSRhzvVO07mvuD6tpkiKFXTF66zCK/wpXFVb8IkfY=", + "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip": "sha256-4Y/DZpCWKljaslJFsaqItq1DVJVVRlQjWpM6GLRo8QA=", + "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip": "sha256-n4psF9fFFU8ohtbOndRx6i20EntjEzL3BvMObAZyOOw=", "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", - "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", + "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip": "sha256-cB3DTeWhDgAwHlxwYogd0/DuYBzo5DqaRtBvEC/p8I4=", "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", - "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=", + "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip": "sha256-d54ipHXOwl3AZD5k72s1vTHzevRA4v+WfGUItGtUIn8=", "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", + "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip": "sha256-A3qx1stw9cTaD/dUmJ8q4j7yLnlvdq6yINZGuA9zDBQ=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=", - "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip": "sha256-SXzP1lg/FRroeaNQ4q5ePpDI+AiVF+dOE8tRWfm+sGk=", + "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip": "sha256-K+crYlCWZaHfBYXM4gFhEcEVW00EznfFibPo2ycAIAs=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip": "sha256-YTZZbObuUWxIZoU3vKnWve/nRtcDWLubx4Z43ljlCYI=", - "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip": "sha256-+2ow+tbZUipK92SKp0AegcRwUL1OSQuGE4FlZPOAGSk=", + "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip": "sha256-5gTCC+3ZhxQtu2dxc1U5WuYY6NswaSs29n+EOnVn/1U=", + "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip": "sha256-V8xmXBe9R/lOyk6ryaUxCr9UCZTxDiFFp7iR9KH0G/A=", + "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip": "sha256-avd+FtL7thr3btczmG/d5tsXzi7pVLd6B1mQhL/U6ts=", "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=", - "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip": "sha256-XJoRZ3ExKHkUZljuuMjMzMCcFw0A+vOyJAwtf+soHU4=", - "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip": "sha256-Jntjg8pXb2HfE8yojDcECM/Lbv4k7J2AoxQ2yD2R23s=", - "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip": "sha256-H5ZfeMT93sGUrDh/7ba9zsW/eQz37Rl/iShY6ryNM3E=", + "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip": "sha256-E3xWjwTxtLkOtm9748BbkKGaS4l8SlZOkj3w6VgqlFQ=", + "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip": "sha256-XIdhTQMxl/nJnntfQlHLlcyA79IS3hnGEGrXhKBFgY0=", + "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip": "sha256-eC5Zs6ph/4C3Xf6e07DfyqhBmsG3bAFLnvae1JiFzpE=", + "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip": "sha256-3UxSPvEXXhAf3zYg2H/jja4F5fuDFWQ6SWFRvcWJ0Iw=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip": "sha256-wyqNQO4fFU9fJVbHbde/NWtY/RVOF/71o+TgWfS7VuM=", "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", + "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip": "sha256-LjN0BkcnX8mVHh2dPULddVwooi9fcABkrRVhTPA7XSo=", + "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip": "sha256-R+5/E65OaEZxHY4FBUJtJUvcNYfrNHKID497FNc/R3g=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", - "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o=" + "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip": "sha256-uWAy/ugmFQBvYEQvSuuNS7xDYkzZgYGyQdSQbuvt0Lk=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py index 9008906bde..c15f6d7f2c 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/update_ides.py @@ -31,6 +31,7 @@ def download_channels(): return { channel["@name"]: channel for product in products + if "channel" in product for channel in one_or_more(product["channel"]) } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index 1a1f17c54e..5bbbd9dfc7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -1,5 +1,5 @@ { - "linux": { + "x86_64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", @@ -11,50 +11,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "0b20f0dc61d8fd9b42962d4931c64742dd17e3f008dfec2c8863a56b1bc4be9b", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.tar.gz", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "5917b88c9deeeee6019c1e5d82e4a90174bf2d9299a4bc8dac286029e4ae5d03", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.tar.gz", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "30a7b848d004c12e8a5ce668dea6939f49b2aaf0bcce443f02987b4ea38179ab", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.tar.gz", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "3f1ddc7290af60df6c58ebc5b27b3f10bda972920508bed00182487a6c57f1cc", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.tar.gz", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "685b3eb786134137be41beaca80a0edb9aaed9e24b98cef8006fe840972b990f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "ec10da775003055527c9b2cbf64d49524be878d06e18510acde2065ce0736b99", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "e2951dfcd80556f29378d55c8d4ebfbc6e599e14ada17a06386729221d71353b", - "url": "https://download.jetbrains.com/go/goland-2023.2.2.tar.gz", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "b34fd9a42d82bcc61052f72ed75f6c1e1d7e37163de38933ee0f124ef6e6bb60", + "url": "https://download.jetbrains.com/go/goland-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "cf647137394e27b3011072e463dc2e4bcdd54dc6ea9406e487a47648fc77bd26", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "4b34fdaabb5907656ac87d50df85f13ace804d8684f3886dac07f62a93706b2e", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "8a0dc4c495b8547fafa90eb81b6fdfc4a9fbbc7b5806d20ebb2f6538330cd3a5", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "b395e37c797c10c0fd0c4ccf6e735852fb40bec5fbbc98705f481f6f068c7993", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.tar.gz", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,59 +67,182 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "5e3dd021b82dcad0f51bded677aa87680dcc3f5d843951c48848a9191141bf1d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.tar.gz", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "dd8d771508b277ab2a713b8f546c2ec6dbb261ba8c23072e46ec6ce2ea9ab2a0", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.tar.gz", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "5956c6cb5a5bad1d9749e487b3bb69fcbf0170f52324e4ff009283b723838778", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.tar.gz", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "d59dd88c1eb51cdd756433d415588c573ca944ebf6f08844b8ac8cd2e3d9937b", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.tar.gz", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "8f7c0aca8f2a832164426393e55d543b3b56867f2497d8844547fb03e217f160", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.tar.gz", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "e625fea80b72c9e12f986a8eb918425c6ef1d3f7b31117b40d122e3ce76046b1", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.tar.gz", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "a44872d0fc330b1cc58bb7db5c8397f4ae7d972bc0c48a66defac10121ecc645", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.tar.gz", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "a32b2d0682613f3afacd11eac1a79f022c99e17ef9ab23fe26c5d8d34b093ad8", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.tar.gz", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "9f14f95ef1952d6b85e13a596d00e8b57ab35a4d07a96ee33d4ceebbd113a827", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.tar.gz", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "068b8c486cd61755787538ea036608a9aa590a3b49cd9003dd5edce28d322c02", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.tar.gz", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2023.2 EAP", - "sha256": "1f67e1a82f5cbb7c84382c7f251ae06b1e2699fa7d2fa4129e23ec2e43251687", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.tar.gz", - "build_number": "232.9921.62" + "version": "2023.3 EAP", + "sha256": "3dd8e99b066164efc11e86e3289e444c5238dfce8e9142fe2d3a8c340eeeb175", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.tar.gz", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2023.2.3", + "sha256": "b57f4a71361a224aeb0e80f2f311f632ab1757356a2de3627ade3e9dd4ee0899", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.tar.gz", + "build_number": "232.10072.28" + } + }, + "aarch64-linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", "version": "2023.2.2", - "sha256": "10c1203620258bf4b0c952d809f50ea954f80d1ed60098917a4c64fb2718b931", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.tar.gz", + "sha256": "9ceeda2fc4f99e160f7402e0cc0712e480eaa1c12b86feac028bb0d191806d41", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.tar.gz", "build_number": "232.9921.42" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "8b4372405832cf377cf4e4af4b240383231f62397249c9aee7eda54052410bd2", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.tar.gz", + "build_number": "232.10072.15" + }, + "dataspell": { + "update-channel": "DataSpell RELEASE", + "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "43f9f4e7c1d19c077aa0cfc76561477955f7b61414ec4fa12b7079870ef0bf1b", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.29" + }, + "gateway": { + "update-channel": "Gateway RELEASE", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "c186170fd0d6322a61cb1233c2827691aebd86ab06f3cd1b3733dcc422c9290e", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "60ef96e70ee2fab3ce04f30ba887cc7f4f62d499811e2050f534ede06a23cbb6", + "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "9e6402c323d74f9c88aaea13d0fb0027786a1ac3dbee232794d071132bf7a5ce", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "b895aebe1803a1d8d58f8ae29a5072bcd496ca75ecdf8f554390a2c90b76fa3b", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.27" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2022.3", + "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b", + "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz", + "build_number": "223.8836.1185" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "577bea15c1208e0b842bcdb2ff0f0205144a8800fcadf87f873af7c067e0ce73", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.32", + "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": "2023.2.3", + "sha256": "6fdc5238ffa4767834b11b52b650107f1c64d6a53d0e2bbc23581b6c90b67ab5", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.31" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "578ecbd059ccb010682cf602e959454b296ec2e741202f236fbdb38897b296dd", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.31" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", + "version": "2023.2.2", + "sha256": "a41f97a86c84157cb36b085ad3c526263414e6c8157be311f38491e715631daa", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.tar.gz", + "build_number": "232.9921.83" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "613732ccdb38e1bc0d2ecd2ead464c74ed643f1b6d99695987c1bcc78784fbf3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.21" + }, + "rust-rover": { + "update-channel": "RustRover EAP", + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", + "version": "2023.3 EAP", + "sha256": "812c33f46f8c7e309e777f10b6806b3658d7f90f95aa1a776c686aafabb290e7", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.tar.gz", + "build_number": "233.8264.22" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", + "version": "2023.2.3", + "sha256": "2b0ead390f94c6b1d2069a078d6882e7ff3d0af280ff15b8481606d3f500fe0d", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.tar.gz", + "build_number": "232.10072.28" } }, "x86_64-darwin": { @@ -134,50 +257,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.2.1", - "sha256": "1ceabbebd391f5778ef495a780b0e9b54584342d6e55cc28834e8f708759b440", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.dmg", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "cafd9cfbdd4453a587674324e617977c9f9536bbe7aa290cc39b0c3c5c842bba", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.dmg", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.2.2", - "sha256": "24fb47966c891bf3a2a827df38885d48509c6e2e68a7cc03145ad28493adb76b", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "f8d4b3a7a36fbbd77a4b6e965cd159f4adeff54933df1e8caf2e4f341e3443c7", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.dmg", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.2.2", - "sha256": "cfa68c2b1290f1d51aa37a918a79342e42b6a50b2563524757ec8bd700008fba", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "25780bcbb57ebc1a7a05bec24abf21b2a96b22f80a91de89c94926799da3183f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.dmg", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.2.2", - "sha256": "d60e55ecd6208d2af871c154320f988622cd52ca4b202cd9a90c2de7750e8e23", - "url": "https://download.jetbrains.com/go/goland-2023.2.2.dmg", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "5e78a73a69481fd63ad53d99371b3e7e534731c6116ee6d7fee127c533bc644a", + "url": "https://download.jetbrains.com/go/goland-2023.2.3.dmg", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.2.2", - "sha256": "a59590af2bef95562f3b7a066016d22f347d59b71e136d3dd739d626f1594636", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "dbdda6a0df334a402103d3ee1e70cd5f514cc9353efcdd49395a736c9a640730", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.dmg", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.2.2", - "sha256": "f420cc60d925415a7059b3283176b4aafef3555c06746b9617cf50edef62fe69", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "fddefd00d6a96ec8c3bd81f9183f3b70d4df71d460f9c704519abffb95246e0f", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.dmg", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -190,59 +313,59 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2.2", - "sha256": "99a9bb313a5c141ecd1810306deaca3cf52d338edf206362b3f9d9337a27890e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.dmg", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "7ce4ff6b344ff8ce18ef8a821ba3fd1d222f9222a9b3e65744a796379d92417e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.dmg", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.2.1", - "sha256": "5bbbfd755d407e75a77900e3a5367dc7ec4f4ddde3311625341b3c35353b126b", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.dmg", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "b914bd3c0018f951bef5da9c04907355a88546ce983dcf4115bbf11556015ec7", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.dmg", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.2.1", - "sha256": "56747a699b16387df1c0c8cb5bd2d52c8ce7fe670054e5f37352b381d7272dbe", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.dmg", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "b33bbd30222363cdc3091aee923ed1c309edba799616a3a681cd9a1ca94e822a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.dmg", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.2.1", - "sha256": "e80c8939c9e9c5357e65e561175a37cfac745aa60e08505c6cf48ecf9eaa4ce3", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.dmg", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "8fa1c224eccfffe896de8b375160e5d9f63103912f935748199cca758448fc9e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.dmg", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.2.2", - "sha256": "2b77f24770813c0cf55892effde8c0a6a5af1c9f4b08c1c8ae9163e503afc5d3", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "eb0db28facbe7aed6de99dc97053cdfbeea845ce73b6b9efa6c95caaf68204e9", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.dmg", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2023.2 EAP", - "sha256": "dfde444bff011783cb4a5aa2aafae8ea989874c19535b01da8214df5eb3174fb", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.dmg", - "build_number": "232.9921.62" + "version": "2023.3 EAP", + "sha256": "889ed748efbd44b76da03186efac063baf36c2208d919550dd97cf2dae8f40e3", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.dmg", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.2.2", - "sha256": "3733f1968925681a693a09053e62ba4a800b51a062f5e9772658a5fba82d2fa8", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.dmg", - "build_number": "232.9921.42" + "version": "2023.2.3", + "sha256": "918bb2061d623f736c73b67db929ced2a83013f64d57406af09f5c9df9c7d8cd", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.dmg", + "build_number": "232.10072.28" } }, "aarch64-darwin": { @@ -257,50 +380,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "bcca68af7d5b04d21a6a2a652c0d828ef450d117ab13af74bcf7ff71a803cfdd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1-aarch64.dmg", - "build_number": "232.9559.28" + "version": "2023.2.2", + "sha256": "30458ba96e1a518a40c0fc89d35f70ea96803cccd5ce8aca72e2363745214c87", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.dmg", + "build_number": "232.10072.15" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "0baeeba5f8a2dd02304b42a54d633719df3242bfaedc5b62bec4dacd403eabf2", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.2-aarch64.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "4f26303afa3d2359ea4b0bcee875b605dcaadaece3d1b0e16e5c37b8ea46afe3", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.dmg", + "build_number": "232.10072.29" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b6ae26eaa6f7f4b77d1bf3d75658eb8ae70bccce4b7e8e62d18dada0810b382c", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "b4c1167303ed8985c5439d6a07f9d2970074e3748c21e9155b2c76a508fe0a15", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b8343e424f1c954ef2c8db7dabc4aaad63d055aa7a4b572773dbeeab43463007", - "url": "https://download.jetbrains.com/go/goland-2023.2.2-aarch64.dmg", - "build_number": "232.9921.53" + "version": "2023.2.3", + "sha256": "3ad91c136fd840dbc596f2873ccc4c2df14f7ec2a435f8a61acfdc3a97660e32", + "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b3c126636d2096933672d1c1359fe32ad04d35057090363ad1812951f2ada7d9", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "563d2189f1ae0310abd108f256edca786ca732100344b3519a7201245e4af781", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "b649cb8c82190ca8682bad9b37da93f10981d35850f501c196ad106edf96cd44", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2-aarch64.dmg", - "build_number": "232.9921.47" + "version": "2023.2.3", + "sha256": "4ee862a5f5b2f8d9276744bd67cd024a5c6740601e2168a985a5c66cb43e18ea", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.dmg", + "build_number": "232.10072.27" }, "mps": { "update-channel": "MPS RELEASE", @@ -313,59 +436,59 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "a31daeddae532324436b2d11acbd5fb657721883f17c7ef4457ac76a51bd4189", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.dmg", - "build_number": "232.9921.55", + "version": "2023.2.3", + "sha256": "68d543fb2a79cd0b07ddb94a4c00d8c0c1aca7f604bc838ac92e232e763489b3", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.dmg", + "build_number": "232.10072.32", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "4bc1462299de2202c7171f34ad1b7c51f83f2227e0e891cf8a8098f8494e781d", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1-aarch64.dmg", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "08c45adbb0dca219955f511993ca8150dcca235bdba3ac24c67ae035c68ba992", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.dmg", + "build_number": "232.10072.31" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "82722d522176ca9aac0e919a38c3b88155e6e3cc104b64204755a9657a180b52", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1-aarch64.dmg", - "build_number": "232.9559.58" + "version": "2023.2.3", + "sha256": "63d68b20963575f76937ca0ce18a8150639c47b8cf8f3d6e96fa3306191cd076", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.dmg", + "build_number": "232.10072.31" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "d12db1a3b5c62999efd18af179c420f5173b7820c2fe736b1d19bb157604c19b", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1-aarch64.dmg", - "build_number": "232.9559.61" + "version": "2023.2.2", + "sha256": "89c30f905216480ba0e379705542d81beac6e7467d26fe3aa882e9b008de42c2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.dmg", + "build_number": "232.9921.83" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "53e551897d42d0986b2e01f171bd7b96fe790516fdf1578feabec0a44cf441e5", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2-aarch64.dmg", - "build_number": "232.9921.48" + "version": "2023.2.3", + "sha256": "db571f72488e299d700670c546fb5ae9e1b1bc1eff3f2b26ef8520a22b1fb407", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.dmg", + "build_number": "232.10072.21" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2023.2 EAP", - "sha256": "35d44a4f72c027283843aaa6409de701d14274cdc5a614c3fdc53121383f9389", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62-aarch64.dmg", - "build_number": "232.9921.62" + "version": "2023.3 EAP", + "sha256": "9c4f26089697f6cb394e971dac8ef4fe974b5ecffd63311fcf0be66d4b4aec59", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.dmg", + "build_number": "233.8264.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "27ae504b6ee24df28d29f59602c893c2b9af9357e4cc1e20dab22753177508db", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2-aarch64.dmg", - "build_number": "232.9921.42" + "version": "2023.2.3", + "sha256": "8811624166bf11d591bcf24fee0087861c3193a79aecb7159cced17737d88517", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.dmg", + "build_number": "232.10072.28" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 11ed703639..5ca75e76cd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra srapenne ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix index 2f097dee52..1d516f9b43 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -39,6 +39,7 @@ in mapAliases ({ kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04 kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04 + kak-byline = byline-kak; # backwards compat, added 2023-10-22 kak-fzf = fzf-kak; # backwards compat, added 2021-01-04 kak-powerline = powerline-kak; # backwards compat, added 2021-01-04 kak-prelude = prelude-kak; # backwards compat, added 2021-01-04 diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix index a37c90fb99..84fc2cec0a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -17,16 +17,28 @@ packages = ( self: auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2022-03-13"; + version = "2023-07-30"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; - sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; + rev = "d4b33b783ea42a536c848296b5b6d434b4d1470f"; + sha256 = "017x9g89q0w60y561xhigc0f14ryp4phh1hdna847ca5lvmbxksp"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; + byline-kak = buildKakounePluginFrom2Nix { + pname = "byline-kak"; + version = "2023-02-27"; + src = fetchFromGitHub { + owner = "evanrelf"; + repo = "byline.kak"; + rev = "a27d109b776c60e11752eeb3207c989a5e157fc0"; + sha256 = "121dxd65ml65ablkvdxj0rib3kvfwss0pv943bgl3nq35ag19b81"; + }; + meta.homepage = "https://github.com/evanrelf/byline.kak/"; + }; + connect-kak = buildKakounePluginFrom2Nix { pname = "connect-kak"; version = "2021-02-24"; @@ -137,12 +149,12 @@ packages = ( self: kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2022-11-29"; + version = "2023-04-20"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; - sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; + rev = "dbb39712e3824ca6142b510f26f35a769934a1e1"; + sha256 = "1wncx16a8mi2b81cvkiji3ccv8is5g3sa4hwf1669va5a432vdwn"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -209,12 +221,12 @@ packages = ( self: tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-07-05"; + version = "2023-05-15"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; - sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; + rev = "f0b3a399db1dfa12b89fbff3eed09aec74725bab"; + sha256 = "1sg26bv4vr08pqyxp68wsmzj8vhi2qg1bmkqb2jnngi5sjp4r7xy"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index b856308c78..3f4a640e2f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,6 +1,7 @@ repo,branch,alias https://github.com/greenfork/active-window.kak/,, https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/evanrelf/byline.kak/,, https://github.com/kakounedotcom/connect.kak/,, https://github.com/andreyorst/fzf.kak/,, https://github.com/lePerdu/kakboard/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py index 5ce54c834f..5e0ca51727 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py @@ -73,6 +73,9 @@ in lib.fix' (lib.extends overrides packages) ) print(f"updated {outfile}") + def update(self, args): + pluginupdate.update_plugins(self, args) + def main(): editor = KakouneEditor("kakoune", ROOT, GET_PLUGINS) diff --git a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix index 099aec1558..2a9557dce6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/lifeograph"; rev = "v${version}"; - sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; + hash = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "lifeograph"; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/ne/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ne/default.nix index f783dfea81..e246185e2a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ne/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ne/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texlive, perl, ghostscript }: +{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texliveMedium, perl, ghostscript }: stdenv.mkDerivation rec { pname = "ne"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "vigna"; repo = pname; rev = version; - sha256 = "sha256-mRMACfWcUW6/R43riRGNce4Ac5IRo4YEML8H0oGSH5o="; + sha256 = "sha256-lbXb/ZY0+vkOB8mXkHDaehXZMzrpx3A0jWnLpCjhMDE="; }; postPatch = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace src/makefile --replace "-lcurses" "-lncurses" ''; - nativeBuildInputs = [ texlive.combined.scheme-medium texinfo6 perl ghostscript ]; + nativeBuildInputs = [ texliveMedium texinfo6 perl ghostscript ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index 4b77b2b7c6..e183799d85 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - hash = "sha256-kKstlq1BzoBAy+gy9iL1auRViJ223cVpAt5X7pUWT1U="; + hash = "sha256-Lyo98cAs7Zhx23N4s4f3zpWFKYJMmXleWpt3wiVDQZo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-gtk.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix index b9d0ab4ec2..a8483f0db3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "neovim-qt-unwrapped"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "sha256-UJXaHENqau5EEe5c94pJuNxZU5rutJs642w9Cof8Sa4="; + sha256 = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix index f1c38d2915..a7e0e4c770 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests/default.nix @@ -212,7 +212,7 @@ rec { # having no RC generated should autodisable init.vim wrapping nvim_autowrap = runTest nvim_via_override '' - ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ! grep ${nvimShouldntWrap}/bin/nvim ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 0fbb54df01..d61a2fe5e5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -7,8 +7,10 @@ , neovimUtils , vimUtils , perl +, lndir }: -neovim: + +neovim-unwrapped: let wrapper = { @@ -62,7 +64,7 @@ let # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ++ commonWrapperArgs @@ -72,36 +74,45 @@ let in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; - symlinkJoin { - name = "neovim-${lib.getVersion neovim}${extraName}"; + stdenv.mkDerivation (finalAttrs: { + name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; + + __structuredAttrs = true; + dontUnpack = true; + inherit viAlias vimAlias withNodeJs withPython3 withPerl; + inherit wrapRc providerLuaRc packpathDirs; + inherit python3Env rubyEnv; + withRuby = rubyEnv != null; + inherit wrapperArgs; + # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop - substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + lib.optionalString withPython3 '' + + lib.optionalString finalAttrs.withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + lib.optionalString (rubyEnv != null) '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + + lib.optionalString (finalAttrs.rubyEnv != null) '' + ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + lib.optionalString withNodeJs '' + + lib.optionalString finalAttrs.withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + lib.optionalString withPerl '' + + lib.optionalString finalAttrs.withPerl '' ln -s ${perlEnv}/bin/perl $out/bin/nvim-perl '' - + lib.optionalString vimAlias '' + + lib.optionalString finalAttrs.vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + lib.optionalString viAlias '' + + lib.optionalString finalAttrs.viAlias '' ln -s $out/bin/nvim $out/bin/vi '' + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim @@ -139,26 +150,33 @@ let makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; - paths = [ neovim ]; + buildPhase = '' + runHook preBuild + mkdir -p $out + for i in ${neovim-unwrapped}; do + lndir -silent $i $out + done + runHook postBuild + ''; preferLocalBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper lndir ]; passthru = { inherit providerLuaRc packpathDirs; - unwrapped = neovim; + unwrapped = neovim-unwrapped; initRc = neovimRcContent; tests = callPackage ./tests { }; }; - meta = neovim.meta // { + meta = neovim-unwrapped.meta // { # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (neovim.meta.priority or 0) - 1; + priority = (neovim-unwrapped.meta.priority or 0) - 1; }; - }; + }); in lib.makeOverridable wrapper diff --git a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix index 1c57658026..c2085bcf04 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-1ci1g+qBDsw9IkqjI3tRvMsLBvnPU+nn7heYuid/e5M="; + sha256 = "sha256-m8+kM9uz3gJ3kvpgZdoonSvYlh/f1WiGZlB8JKMTXh4="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix index c4fd772d35..72ff8ae5d6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.10"; + version = "0.26.13"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-KKYU9+DDK0kXperKfgxuysqHsTGRq1NKtAT1Vps8M/o="; + sha256 = "0wlpv0rk4ys4rbcpf8lqpkm0yr5dxkaz60qk2lvm27w1s489ir8l"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; @@ -31,6 +31,7 @@ mkDerivation rec { meta = with lib; { license = licenses.gpl2; description = "A hex editor"; + homepage = "https://apps.kde.org/okteta/"; maintainers = with maintainers; [ peterhoeg bkchr ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/openvi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/openvi/default.nix index 19da3daf78..54a57d949e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/openvi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.4.23"; + version = "7.4.26"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-DwecSnByRkjBFqy3gWJ0+1srF2YsNACqKrAITn6wXJw="; + hash = "sha256-Fgsw4ovq7PXqPF5ECVFJulrcHdsbRQsvy62DAr4RRr4="; }; buildInputs = [ ncurses perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix index b541f7a904..a4822d4315 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.65.1"; + version = "2.65.2"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-ebtzhir6nBnIawkJJq+BgXv/5CbXtbhujXkMBzQEsNY="; + hash = "sha256-wuRbn3zQlyqba21tKLVCRfs8QgreWQ+FBFDw6myoYbk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix index 446b73dc50..b4555bc898 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix @@ -24,10 +24,10 @@ let }; }; "7" = { - version = "7.05.2"; + version = "7.8"; src = fetchurl { url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip"; - hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8="; + hash = "sha256-tYQfPfzKRwClNwgSoJfMwG3LHhi3O/iFuuwIVHS8OXk="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix index 0ca79907f8..65e724df3d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix @@ -26,13 +26,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jSgSKxW7cxSoSwBytoaQtLwbkYm2udjmaZTHbN1jJwQ="; + sha256 = "sha256-+bQRUTEJluhcs5P87It9/oJOzrCcNFzDJVpixoQKXQc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix index d2162dc9c9..ef08ac9352 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix @@ -209,5 +209,14 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ colamaroro ]; + knownVulnerabilities = [ + "CVE-2023-5217" + "CVE-2022-21718" + "CVE-2022-29247" + "CVE-2022-29257" + "CVE-2022-36077" + "CVE-2023-29198" + "CVE-2023-39956" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix index a3eee45ed4..278296f12d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, buildFHSEnvChroot, callPackage, makeDesktopItem, writeScript +{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell +, runCommand, quartus-prime-lite , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } }: @@ -13,10 +14,15 @@ let categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` -in buildFHSEnvChroot rec { +in buildFHSEnv rec { name = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ + (runCommand "ld-lsb-compat" {} '' + mkdir -p "$out/lib" + ln -sr "${glibc}/lib/ld-linux-x86-64.so.2" "$out/lib/ld-lsb-x86-64.so.3" + ln -sr "${pkgsi686Linux.glibc}/lib/ld-linux.so.2" "$out/lib/ld-lsb.so.3" + '') # quartus requirements glib xorg.libICE @@ -26,6 +32,10 @@ in buildFHSEnvChroot rec { xorg.libXtst xorg.libXi ]; + + # Also support 32-bit executables. + multiArch = true; + multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; }; @@ -47,46 +57,66 @@ in buildFHSEnvChroot rec { libxcrypt-legacy ]; - passthru = { inherit unwrapped; }; - - extraInstallCommands = let - quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ - "asm" "cdb" "cpf" "drc" "eda" "fit" "jbcc" "jli" "map" "pgm" "pow" - "sh" "si" "sim" "sta" "stp" "tan" - ]) ++ [ "quartus/bin/quartus" ]; - - qsysExecutables = map (c: "quartus/sopc_builder/bin/qsys-${c}") [ - "generate" "edit" "script" - ]; - # Should we install all executables ? - modelsimExecutables = map (c: "modelsim_ase/bin/${c}") [ - "vsim" "vlog" "vlib" - ]; - in '' + extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/128x128 ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${unwrapped}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png - mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin - WRAPPER=$out/bin/${name} - EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" - for executable in $EXECUTABLES; do - echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable + progs_to_wrap=( + "${unwrapped}"/quartus/bin/* + "${unwrapped}"/quartus/sopc_builder/bin/qsys-{generate,edit,script} + "${unwrapped}"/modelsim_ase/bin/* + "${unwrapped}"/modelsim_ase/linuxaloem/lmutil + ) + + wrapper=$out/bin/${name} + progs_wrapped=() + for prog in ''${progs_to_wrap[@]}; do + relname="''${prog#"${unwrapped}/"}" + wrapped="$out/$relname" + progs_wrapped+=("$wrapped") + mkdir -p "$(dirname "$wrapped")" + echo "#!${runtimeShell}" >> "$wrapped" + case "$relname" in + modelsim_ase/*) + echo "export NIXPKGS_IS_MODELSIM_WRAPPER=1" >> "$wrapped" + ;; + esac + echo "$wrapper $prog \"\$@\"" >> "$wrapped" done cd $out - chmod +x $EXECUTABLES + chmod +x ''${progs_wrapped[@]} # link into $out/bin so executables become available on $PATH - ln --symbolic --relative --target-directory ./bin $EXECUTABLES + ln --symbolic --relative --target-directory ./bin ''${progs_wrapped[@]} ''; - # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when - # starting most operations in many containerized environments, including WSL2, Docker, and LXC - # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version - # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 - runScript = writeScript "${name}-wrapper" '' - exec env LD_PRELOAD=libudev.so.0 "$@" + profile = '' + # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when + # starting most operations in many containerized environments, including WSL2, Docker, and LXC + # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) + # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version + # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 + # + # But, as can be seen in the above resource, LD_PRELOADing libudev breaks + # compiling encrypted device libraries in ModelSim (with error + # `(vlog-2163) Macro ` is undefined.`), so only use LD_PRELOAD + # for non-ModelSim wrappers. + if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + fi ''; + + # Run the wrappers directly, instead of going via bash. + runScript = ""; + + passthru = { + inherit unwrapped; + tests = { + modelsimEncryptedModel = runCommand "quartus-prime-lite-test-modelsim-encrypted-model" {} '' + "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/modelsim_ase/altera/verilog/src/arriav_atoms_ncrypt.v" + touch "$out" + ''; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix index 4b59da01ba..bbb8d39a5f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/qxmledit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml -, qtquick1, libGLU }: +, libGLU }: stdenv.mkDerivation rec { pname = "qxmledit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ]; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml libGLU ]; qmakeFlags = [ "CONFIG+=release" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 2ce482f356..82a572eaf4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -145,6 +145,9 @@ in --replace '@node@' ${nodejs} \ --replace './lib/quarto' ${quartoSrc} + substituteInPlace src/cpp/conf/rsession-dev.conf \ + --replace '@node@' ${nodejs} + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch index 8593490961..bb4480b4ae 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch @@ -1,5 +1,33 @@ +diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf +index d18362b..98cdd4c 100644 +--- a/src/cpp/conf/rsession-dev.conf ++++ b/src/cpp/conf/rsession-dev.conf +@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR} + external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} + external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} + external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node ++external-node-path=@node@/bin/node + + # enable copilot + copilot-enabled=1 +diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt +index 30dd638..cb4a645 100644 +--- a/src/cpp/server/CMakeLists.txt ++++ b/src/cpp/server/CMakeLists.txt +@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE) + DESTINATION ${RSERVER_SYSTEMD_DIR}) + + # install node +- install( +- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/node" +- USE_SOURCE_PERMISSIONS) + + elseif(APPLE) + diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 83e9433..f1ee63d 100644 +index 033d605..f1ee63d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml @@ -87,29 +87,7 @@ diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix index 640a00eaaa..8da51bd97a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; + hash = "sha256-7qkQelB0Y+DBihhaYVVQjK66pk8p2Sjhno87bW554SY="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json index 59c79721a6..16598d0248 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.173.4", + "version": "3.178.4", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-amd64.deb", - "hash": "sha512-8GDzj7Xm61rF5xybLE74D4yMbT2HgEG0ez1gQio/qWtWSqY72+GSKWlCA+3wz8Mz2jThRDlka9s2fHBBUvG+fg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-amd64.deb", + "hash": "sha512-6er/a9PqhKU4aagAxsbVdoXbRBNUr3Fa8BPWfuQ74Q4ai+iYlPjd4q50cTJQ4wJ5ucGyopgBEJq4/xYNunw6Ig==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-arm64.deb", - "hash": "sha512-yJ8yZK+RkPUzkjbscCXT5yv9BxeHGQsZsCrKwOJRdd/XbcVPnKWQm00JVZmMuz17d8rhm8Km/EW81JufZByM0Q==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-arm64.deb", + "hash": "sha512-lvvXCK3XOIH9HS1EU5eVBo4W8VoE4iM1Ve1XkZ/CysYBYLaXojXyybeN5Iw1Rmuk3trq/7RebjkNx/rxhsU0LQ==" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix index 427d0aa3ac..5d6c3687a0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -1,13 +1,18 @@ -{ lib, mkDerivation, callPackage, fetchurl, - guile_1_8, qtbase, xmodmap, which, freetype, +{ lib, stdenv, callPackage, fetchurl, + guile_1_8, xmodmap, which, freetype, libjpeg, sqlite, - tex ? null, + texliveSmall ? null, aspell ? null, git ? null, python3 ? null, cmake, pkg-config, + wrapQtAppsHook, + xdg-utils, + qtbase, + qtsvg, + qtmacextras, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -15,32 +20,50 @@ koreanFonts ? false }: let - pname = "TeXmacs"; - version = "2.1"; + pname = "texmacs"; + version = "2.1.2"; common = callPackage ./common.nix { - inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; + inherit extraFonts chineseFonts japaneseFonts koreanFonts; + tex = texliveSmall; }; in -mkDerivation { +stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48"; + hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; }; - nativeBuildInputs = [ cmake pkg-config ]; + postPatch = common.postPatch + '' + substituteInPlace configure \ + --replace "-mfpmath=sse -msse2" "" + ''; + + nativeBuildInputs = [ + guile_1_8 + pkg-config + wrapQtAppsHook + xdg-utils + ] ++ lib.optionals (!stdenv.isDarwin) [ + cmake + ]; + buildInputs = [ guile_1_8 qtbase + qtsvg ghostscriptX freetype libjpeg sqlite git python3 + ] ++ lib.optionals stdenv.isDarwin [ + qtmacextras ]; - NIX_LDFLAGS = "-lz"; + + env.NIX_LDFLAGS = "-lz"; qtWrapperArgs = [ "--suffix" "PATH" ":" (lib.makeBinPath [ @@ -48,7 +71,7 @@ mkDerivation { which ghostscriptX aspell - tex + texliveSmall git python3 ]) @@ -58,10 +81,8 @@ mkDerivation { wrapQtApp $out/bin/texmacs ''; - inherit (common) postPatch; - meta = common.meta // { maintainers = [ lib.maintainers.roconnor ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix index c2b82321d4..47a7445bd7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake +, withQt ? true, qtbase, wrapQtAppsHook +, withCurses ? false, ncurses +}: stdenv.mkDerivation rec { - version = "12.0"; + version = "12.1"; pname = "textadept"; src = fetchFromGitHub { @@ -8,15 +11,19 @@ stdenv.mkDerivation rec { owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; + sha256 = "sha256-ce7U/GR/4zkjnRN3fx3FLecc9vuvFqCONy275SWnpNc="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals withQt [ wrapQtAppsHook ]; - cmakeFlags = [ - "CMAKE_INSTALL_PREFIX=build/install" - ]; + buildInputs = + lib.optionals withQt [ qtbase ] + ++ lib.optionals withCurses ncurses; + + cmakeFlags = + lib.optional withQt [ "-DQT=ON" ] + ++ lib.optional withCurses [ "-DCURSES=ON" "-DQT=OFF"]; preConfigure = '' mkdir -p $PWD/build/_deps @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon patricksjackson ]; + maintainers = with maintainers; [ raskin mirrexagon arcuru ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix index b0117f4022..4f352bf19b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix @@ -1,36 +1,45 @@ { + # scintilla "scintilla536.tgz" = { url = "https://www.scintilla.org/scintilla536.tgz"; sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; }; + # lexilla "lexilla510.tgz" = { url = "https://www.scintilla.org/lexilla510.tgz"; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; }; + # scinterm "scinterm_5.0.zip" = { url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; }; - "scintillua_6.2.zip" = { - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; - sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; + # scintillua + "e88bbcfecae46b48b79d8156ea7129411b5c847d.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/e88bbcfecae46b48b79d8156ea7129411b5c847d.zip"; + sha256 = "sha256-sWqpVtcAwysGn86XFwaEkKSPemk2247SydOQi6klFrQ="; }; + # lua "lua-5.4.6.tar.gz" = { url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; }; + # lpeg "lpeg-1.1.0.tar.gz" = { url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo="; }; + # luafilesystem "v1_8_0.zip" = { url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; }; - "cdk-5.0-20200923.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; - sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; + # cdk + "t20200923.tar.gz" = { + url = "http://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz"; + sha256 = "sha256-rjL4oMSDJZWAZJ8pG8FApfpvrVNJvY+6D8ZV+gwvDnI="; }; + # libtermkey "libtermkey-0.22.tar.gz" = { url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix index 72db4262c8..b27ab8bbb6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix @@ -8,6 +8,7 @@ , poppler , qt5compat , qttools +, qtwayland , withLua ? true, lua , withPython ? true, python3 }: @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { qt5compat qttools ] ++ lib.optional withLua lua - ++ lib.optional withPython python3; + ++ lib.optional withPython python3 + ++ lib.optional stdenv.isLinux qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" diff --git a/third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix index 887a9a8e69..f6b241c9d0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tweak/default.nix @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preBuild = "substituteInPlace Makefile --replace '$(DESTDIR)/usr/local' $out"; + makeFlags = [ "CC:=$(CC)" "LINK:=$(CC)" ]; meta = with lib; { description = "An efficient hex editor"; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix new file mode 100644 index 0000000000..936cc9f7bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, fetchurl +, dpkg +, lib +, glib +, nss +, nspr +, at-spi2-atk +, cups +, dbus +, libdrm +, gtk3 +, pango +, cairo +, xorg +, libxkbcommon +, mesa +, expat +, alsa-lib +, buildFHSEnv +}: + +let + pname = "typora"; + version = "1.7.6"; + src = fetchurl { + url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; + hash = "sha256-o91elUN8sFlzVfIQj29amsiUdSBjZc51tLCO+Qfar6c="; + }; + + typoraBase = stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ dpkg ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share + mv usr/share $out + ln -s $out/share/typora/Typora $out/bin/Typora + runHook postInstall + ''; + }; + + typoraFHS = buildFHSEnv { + name = "typora-fhs"; + targetPkgs = pkgs: (with pkgs; [ + typoraBase + udev + alsa-lib + glib + nss + nspr + atk + cups + dbus + gtk3 + libdrm + pango + cairo + mesa + expat + libxkbcommon + ]) ++ (with pkgs.xorg; [ + libX11 + libXcursor + libXrandr + libXcomposite + libXdamage + libXext + libXfixes + libxcb + ]); + runScript = '' + Typora $* + ''; + }; + +in stdenv.mkDerivation { + inherit pname version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + ln -s ${typoraFHS}/bin/typora-fhs $out/bin/typora + ln -s ${typoraBase}/share/ $out + runHook postInstall + ''; + + meta = with lib; { + description = "A markdown editor, a markdown reader"; + homepage = "https://typora.io/"; + license = licenses.unfree; + maintainers = with maintainers; [ npulidomateo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 0179dabe39..83d61b37bf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1897"; + version = "9.0.2048"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; + hash = "sha256-zR2iPiD4/gf5BnxYoe3cx2ebGWE1P2bY4Cg15gveFgg="; }; enableParallelBuilding = true; 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 f529df1317..38324c09bb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-09-14"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "62443c9eb261e641d20af143357b157e3f542bb5"; - sha256 = "16mk5h1qgcr46w73dfq7lkh0428s0w4wbawplv94395wj92rmhnw"; + rev = "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced"; + sha256 = "1xmnzr1hccgdaadjc8i207bz44272ng5aaaypdacaag2pciapq3s"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-09-17"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "6462fb4b41215fac4558608c4d944074075ceb17"; - sha256 = "06c8w36bvgnspn7frmldrvxl40108pbfrn0spzympyg03c693swr"; + rev = "ecca5017b6b27e1bded009f9725186d941d85b53"; + sha256 = "01dc9rih8f3hxvj5mi8ahdh7gf1hgb2zrks3wb8im4f4lc6nkdjz"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-10-01"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "dd95de5dbe31ecb106305920cbd0e24e26c17afe"; - sha256 = "1vmh1b8mwpwvfyigxhc5pnda1ddyccqgjz3jmn2pm101bwgg6424"; + rev = "68ff818a5bb7549f90b05e412b76fe448f605ffb"; + sha256 = "075zvc5d088m7zvjmap6c3g1kfnamg7sjjf5s4fcvwg20dn1zp9q"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-09-25"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "a77f45791edeaa82fa75c5959ca73a59d7549549"; - sha256 = "1pw6jk6qlgba87gcdr7iawmbyfa48qy5zf63ghrrddfh1850gxsj"; + rev = "59bf3ccc33bcf7010a06521fd3ac9be912261bd3"; + sha256 = "14hnfva8mp9dy0bw5hsm5dj2axkpvhn9qa3w5h51aljkgcn6r7nb"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -257,12 +257,12 @@ final: prev: QFEnter = buildVimPlugin { pname = "QFEnter"; - version = "2022-10-15"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "fd5d378f97ee4847ce4fcb58b3719864228607da"; - sha256 = "009lpb3hygcw09535bajnd18xq6hbz19pdbwx9l9cykwaniciahi"; + rev = "426c04312ae67ac28dce38ccc5fafdd1ed4a3d9f"; + sha256 = "02s3mq0hxszi7fbm256xgh4nz5mc5frg8rz6dnll7sk26as8fgrd"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-09-30"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "daf2f4397e97c0f12b89068eec35078c61069ceb"; - sha256 = "1yzg8qld4w4xzdb0v3vls47kf753d8d8lfcsz6fl40sprwdfj8px"; + rev = "357fe900baae09e1a3fcef913e49733d05d1f888"; + sha256 = "1dk08b9sb825z18zcq3av3wr8c2xk5szakgiis5c25938jw0c1hl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2023-09-27"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "3367b9b4a921b673ffe88454ac838f272375e0b2"; - sha256 = "1mqzvnrjf8r9s1g5ah7mfxxl5hcj2jp0phak45h0vvb7g185951w"; + rev = "cc9a3ae3efdcc7d038aab0620ea28882533c236c"; + sha256 = "1q5mcqyim7gjc6hr792a7q8xbng7yvr6ynwicz6wn14q05s6lwpq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-09-29"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "551a2b679f265917990207e6d8de28018d55f437"; - sha256 = "07jaqdqdd46q2y4n5vbfkg6v7wxyhiy035fi1wrjyvb1rfil766b"; + rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2"; + sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ai-vim = buildVimPlugin { pname = "ai.vim"; - version = "2023-04-05"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "aduros"; repo = "ai.vim"; - rev = "17a61d5bd8b84791b7db6757abefb763f98a4fd1"; - sha256 = "0jnycmfmml8ba345s76wh4nrlf5jb5pmpyl5l2sg9fyqw2lz5r36"; + rev = "489d2c1b1e5373d7da7e50ba189b289a375c2034"; + sha256 = "04jhp7hd2r2gmaqglnll08qcdi7jymkjpwmq532xvxxyji53zbv1"; }; meta.homepage = "https://github.com/aduros/ai.vim/"; }; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2023-09-17"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "53b01d6a546384a28f1ccbed41baae58d7341da4"; - sha256 = "1jqsxgys7285m99y553ydvf0cwdkm98s0mi6mnmghzv3q7d9ngik"; + rev = "50e237facda4b9c3761c3f3e9df185cfdf3d91e8"; + sha256 = "1iyxw4j499qwwhygwqspsq5573smrd1rcnyh74vk0sj058d3l03y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -631,12 +631,12 @@ final: prev: ansible-vim = buildVimPlugin { pname = "ansible-vim"; - version = "2022-02-11"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "93798e8c89c441d29d4678da0c0d5e1429eb43b0"; - sha256 = "0r2q7iyw0y7zaf33k6ka5ca9v6g7zlmya5x0ph5xgsylmglq6jca"; + rev = "afc739e505053a6143a1fc6cedac6fb4d7a1d4db"; + sha256 = "0hfbfjnzs53anzc9ljmbiph3xsq8d84kxx03msab05953sgyq3id"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -763,12 +763,12 @@ final: prev: asyncomplete-vim = buildVimPlugin { pname = "asyncomplete.vim"; - version = "2023-04-11"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "b3fbac1930be2c9cdf956f4a0346c1dd0e9abd44"; - sha256 = "0jm2bqsqk0jjdm69lpxgnsms7c12pfkrn1lljpqqf2cx1xjql19r"; + rev = "016590d2ca73cefe45712430e319a0ef004e2215"; + sha256 = "1mpdhh9vmjasigw9r5zv5ikvia2vsqpm3l3bd3sqriwv597jcyb9"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-09-09"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "2ff7e8d4f7fcf8bfb4e05280049c390d71371869"; - sha256 = "0g7k0r1lfkw3km6drcv6zy29yjhc0szqlhjxrp5zdps186fx50hj"; + rev = "41ab08a3c56b2543263873e0f1a7d1f3267180fc"; + sha256 = "1d0d9c89i56qh6rks1sp8fzw6a09jyvqclya70vwxdyayz48mspc"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -991,12 +991,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2023-10-01"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "104510cb339071f4350acdc30d1630ce15dca8b1"; - sha256 = "0bwgdvfvwikvlbb97n0iddpk3bw6nwl02596nb567s4xkijx91nk"; + rev = "3f2b658cbd6650ddaf2bae3233e143a41ca25b1a"; + sha256 = "04xnnyinr93jriqg5yhwrwbf0q0zbb2ad1wrnl08sbi8fzl7a7a9"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1051,12 +1051,12 @@ final: prev: bigfile-nvim = buildVimPlugin { pname = "bigfile.nvim"; - version = "2023-06-28"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "LunarVim"; repo = "bigfile.nvim"; - rev = "9616b73670ffeb92679677554ded88854ae42cf8"; - sha256 = "09rflfns0qba3r0qrz0p9g0p4vjf5x74phis0nb14fxjalz9cxcc"; + rev = "33eb067e3d7029ac77e081cfe7c45361887a311a"; + sha256 = "1l0ndnlvqj6q8kafpq0piikhqmi7bhzi0y4b88wrh0arcpdc19kx"; }; meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: block-nvim = buildVimPlugin { pname = "block.nvim"; - version = "2023-06-22"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "HampusHauffman"; repo = "block.nvim"; - rev = "a7739f9703adf9e77b42a331d4998bd5c8cbf1e9"; - sha256 = "0wvkyczxjgi701bnhw5fxzwprgsx26nbq13mi3qqlyh42nhhm8zq"; + rev = "6fb969ab12579e58b9379aa51933cad4a466cf75"; + sha256 = "10l9liw5cag4gq281gx8px634b7jamm71kakn36v96vdnyrbia3n"; }; meta.homepage = "https://github.com/HampusHauffman/block.nvim/"; }; @@ -1171,12 +1171,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-09-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "6ecd37e0fa8b156099daedd2191130e083fb1490"; - sha256 = "1b70xycm9ggqdqbqhkl2ch6k3r3qsww9zvnl2cs9198lr1f2j0ri"; + rev = "9e8d2f695dd50ab6821a6a53a840c32d2067a78a"; + sha256 = "08k2b8i269c50gq3nl2s08izwl2p454xshl3yslcwwi3hsg25blm"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1243,24 +1243,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-09-26"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "b7ae63e2f4fdf7540ce3f42dd1ec5a27b9930560"; - sha256 = "01l2rlrmcl72fb0i39wzny9216x8p11mi24g1pgd4ayipx057i68"; + rev = "f77b477d9f0b9a28612212b3fc43145f2a5591cc"; + sha256 = "0xp4h8yhlm9kfr4m5446g95mvqr4imhrzwhg726hrdkfs04b1hzq"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2023-09-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2bf3d1fc5b53da1ba681676c9cb3431f03f9f497"; - sha256 = "09623pff0h2zx5n2mg21jfdcl6c6f5jsdpv2gxg70mmrrhlrm9xx"; + rev = "f205444ad5666c5fe47f5d6248351a9fe7af574b"; + sha256 = "1rc68r9nx4nycnbl4pqr7lh31wv5xzrx34swsk191qkxl0fvzx2b"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1315,24 +1315,24 @@ final: prev: clang_complete = buildVimPlugin { pname = "clang_complete"; - version = "2022-11-30"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "d866f31a6b1cfc725dd015293e0a275a6ae9beb0"; - sha256 = "1fz1mjk049b2f31ymk4ph287km8q3yan9xm5ipj41mjwaavdmzi3"; + rev = "75946deff49f2bd70a8d1180c8e60a88aa056e47"; + sha256 = "1h6zxf5kpja3rssj689pj9vj2kajhx1vzg2qd2ir743619r2sxfh"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2023-09-08"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "bafed83f79b5779f5b43e8e015e13ca99dcd8b3a"; - sha256 = "0v703kl34a6cx863m1ah347bg3fk06mr0780cxnz547dpc8dddbm"; + rev = "34c8eaa12be192e83cd4865ce2375e9f53e728f2"; + sha256 = "0jfbx2a8yfnp8k1x1c003f1mpvi05kaydla8y07h0lm3nlkdbvr3"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1807,12 +1807,12 @@ final: prev: cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; - version = "2023-06-15"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "cmp-snippy"; - rev = "c4dc31232c510cd32d4708701e6f06746d46df90"; - sha256 = "1713shiq0cdm2igy3wf5ryjv4wfvbnvrg9xf17klw3hjhdknvyax"; + rev = "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3"; + sha256 = "1l4wrgkxwmw7vyjxl2y30f3xng7qaacvas4g0whqz2ybcl03rv5j"; }; meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; @@ -1855,12 +1855,12 @@ final: prev: cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; - version = "2023-04-06"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "389eadd48c27aa6dc0e6b992644704f026802a2e"; - sha256 = "0kbxjpw7j90pgvwmx3cb47jkk01wx5q6fqr660llinqc1vmj1rsq"; + rev = "b8bc760dfcc624edd5454f0982b63786a822eed9"; + sha256 = "01fz8hj7qadg2h8q0d3xv7x9q0qsykbbvv6bdnw71j74rid4xw7k"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1927,12 +1927,12 @@ final: prev: cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; - version = "2022-10-28"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "18095520391186d634a0045dacaa346291096566"; - sha256 = "0b91ap1l3nph46r7b5hcn7413yj3zhrz1jmn4xqp387ng35qz537"; + rev = "05a9ab28b53f71d1aece421ef32fee2cb857a843"; + sha256 = "0gw3jz65dnxkc618j26zj37gs1yycf7wql9yqc9glazjdjbljhlx"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -1999,12 +1999,12 @@ final: prev: coc-svelte = buildVimPlugin { pname = "coc-svelte"; - version = "2022-03-14"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "coc-extensions"; repo = "coc-svelte"; - rev = "7dda98527c0831e287ae8cd1c85cfc958c949d4a"; - sha256 = "0ci35dph7zz53hiw65xp79g6i8h5yk1zlcbinljfcdn5635wsjbn"; + rev = "b7aa4f70b6e22364b927cad4beb516ebe04175f8"; + sha256 = "0izq1wmafh278jbc55936d5dvnhrm3n2xmgln9m8ggrmp6751fzh"; }; meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-09-26"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "bee5429aba9bc1df9cb15a2f10fea06ce87a47be"; - sha256 = "0lnrpxrggy9gds2968iwyyg3m0z07gi9x1fbc5z56girh44vs816"; + rev = "1efe2a2cdf516094bdb211aa8a1d45ef01836207"; + sha256 = "0kn0vrcn1ixa1lw5nchl7ahzmysx80lv6zf1dgqzrmk94miar15k"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2119,12 +2119,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2023-08-07"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "459e9c6e7d5bd8f559bbf8101869d0c9e800b154"; - sha256 = "1iq1g83za7prgwwakdsf5j8dzb4gb00r76nflj1i3h3yj0kn2vsi"; + rev = "a2ff356633bfc2b4638925eee172d43173420d3b"; + sha256 = "1pi4jgc8h48gqdik5kzvlvswh9y9f8rbz6hchng5n5ybnsf3w88a"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2285,6 +2285,19 @@ final: prev: meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; + conform-nvim = buildVimPlugin { + pname = "conform.nvim"; + version = "2023-11-15"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "conform.nvim"; + rev = "4524a687107c6e598017dc7356b7cd1eb046aa71"; + sha256 = "02waplka03ghpxhwsgjf0z4iv6dqkcrg2whlha334982q57gml1w"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/stevearc/conform.nvim/"; + }; + conjure = buildVimPlugin { pname = "conjure"; version = "2023-08-27"; @@ -2335,24 +2348,24 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-09-21"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "1a8032ae496916ccc7a7a52ee79194fbef29f462"; - sha256 = "0a3k8nb39j0n14ylg84x8c6n8g4m7llx78vad2vz247wnyw4z9sj"; + rev = "73047082d72fcfdde1f73b7f17ad495cffcbafaa"; + sha256 = "159ghjskc2gydxvxsiijgz4swgad0njkmppalkj685wv5kl46pyg"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-09-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "998cf5ab1b85e844c7e8edb864a997e590df7182"; - sha256 = "1sf566vwyj21h9vbs64j8458v4ncqpmfb5cr74pyl59qi33yq1zd"; + rev = "309b3c803d1862d5e84c7c9c5749ae04010123b8"; + sha256 = "1l2rvqcc85mxcpf8a5jsv79bgzb4hjl77bq02npjhpcj8gi8drna"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2371,12 +2384,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2023-08-27"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "47a748c18d6378df7aa033527d1b56d6dec94dc5"; - sha256 = "1jzxrkbynpr4nazjkw9b72liamzyb5ziqww51hc1lby72y4q0llc"; + rev = "f110ee91f1b2b897ab0026da347396756953ca41"; + sha256 = "1r4mzsvjd6swrp84cscsq7ikgqf60jm2dz4zzpja4vj1rpx4n2yc"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2395,12 +2408,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2023-09-05"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "e7304683400a65e3f85e6973fcc2ad2a1bc811e6"; - sha256 = "05jb2jarrw6amrpxalgxngdans89s18009vx4mx3l9imagn1rx5v"; + rev = "d4a58fa7ab20c928f88e416b3fcf6ada965bf314"; + sha256 = "0jk3gz1rbq1zwzly66gcxhkxqn2im45lr5q5vjg2idpvbn6y8zpf"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2431,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-09-29"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "7e0e24b5c28c9fababf2b965f5840e6867c96848"; - sha256 = "0c1vykv382hbri0r86scxzh8665knam6nim2rh9nq8s4davxxjwn"; + rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485"; + sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2551,12 +2564,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-09-30"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "b2637e92a294068d79cde7929094f050981c5969"; - sha256 = "0y7s03in2y68c7n81q9a8mfba6s6dz2j8hp7a3kqldy8mhz4mqad"; + rev = "63df28409d940f9cac0a925df09d3dc369db9841"; + sha256 = "0731yc308jhqwpgabdb69mz8wi75rbnlwa2rh25rrigr28hxin1c"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2647,12 +2660,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-09-07"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "68f607d93a9758d15c0d63d3268aa420ddd29edd"; - sha256 = "0k15zc28a8pmr34xxkfjfy5kbhi4n2h3h9iswrn7vslhh4pnx076"; + rev = "8b53173370d3c2285abb34569b8d00b73d06eaa3"; + sha256 = "0qwalcsp7r1yk0mx8agsy2hpg3qia4nla3prkygdvybhk42jvxfi"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -2937,24 +2950,24 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2023-09-09"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "611cf5e84f655c96318b803785f89e3146d8e48f"; - sha256 = "1gv1qjm1paxgrcchxbkfn7v9ygq7nhpf8wcc304fc2s4q5awvjn3"; + rev = "019bbe9daea397c93a99adc747f8f071379fee5c"; + sha256 = "1ihgmg2kws57wypiyzibdh50gccxk7gl1iah84fcbyzm0lfdvk5p"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-09-17"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "a111d19ccceac6530448d329c63f998f77b5626e"; - sha256 = "18g71p8k2ksfzh3hpm27ry9fd8vi6wkl5czwv3sag8cix1lkm56d"; + rev = "d38c1b5266850f77f75e006bcc26213684e1e141"; + sha256 = "1byqdh3x2yy1rj3gq0hyxpxwzlipvhv07ni9gz4644ssavjhalb6"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3009,36 +3022,36 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2023-07-29"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "9fe831e685a76e1a1898a694623b33247c4d036c"; - sha256 = "03mrsy17fvdislkf50hfxp87kw2k53zfyygc21ln11792k2nmfc1"; + rev = "7200e64c589f899d29f8963aad7543856d1c2545"; + sha256 = "095jnw5wmphr7fp4n63sdjh787hlvhpz4baqcvcy7n90aiq3r3sq"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-09-30"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "8f4d62b7817455896a3c73cab642002072c114bc"; - sha256 = "0cjn0w4v1n31qgxvwnd7ix1lxjdqhrbllb543lhdc1p48a00sqx1"; + rev = "fe3071330a0720ce3695ac915820c8134b22d1b0"; + sha256 = "0a76mkvgya5hygfjbk2wbha18fhwhv6kmkxgvda053z325505mc6"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-09-30"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "9c2bc34bf78bbbf1633b41358e9a203a58b7d19f"; - sha256 = "06l68i8zjgpmzq0yqxbmgl2ncswqpyxxfivjjsm1s1lx5jya97j1"; + rev = "c8a209ee319bb93e41e4daebc02eb1614409c350"; + sha256 = "16kcqjzi68mmfic13jagv2glnlg9jg63n8ywixn60c9h8cd83gk5"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3057,12 +3070,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "a4fd4f458331d42677d992f428235c491b2016aa"; - sha256 = "088s18nicji5zvx2xpwr2b1qvwq84ji5gd125lwxllq37vw6y6zv"; + rev = "d811acd067193fabadd04f081228fd97827ae5ae"; + sha256 = "1m62wnwkzy48s7a8q3fjzxxf3fgq2bfqvgjhmp7xkpc1bgad2rq1"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3081,12 +3094,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-09-30"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "70e334c9cd7915aedde3255ade01ceeebe735b53"; - sha256 = "0zcm2p3qwiz2vkj4h4jy30dvphb6j6j8kyl3pzaxkiwlqlslsfma"; + rev = "8355be45610afdf79a0bab32b91ee297997455b4"; + sha256 = "0hjlxkyhi5aw6b157i9hr2cdcz63r0qag0l3hf2hcmjzvjjb51ls"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3118,24 +3131,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-09-28"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "dcdb132451dfc2c0d7ec815e66e69ca5b8ae8577"; - sha256 = "1rrj7vvdzzzcacvbkl4pzfq7a19jc25bhk31g017az9q2mmap0mz"; + rev = "9bc2196b24a38ebaa16fab25d63caa38565410f3"; + sha256 = "0pnmk7zgbqhxcnwby7x3s1ryb0wx53m2i9ifv5lc1yf7ns71kcz9"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-09-19"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "3099bacca3745aa805b04eacad3d2721c9d477f4"; - sha256 = "0kpwvz1a1h958gr1mig547scg8wpxg4bkrdqmn52ayl27xj5iy1h"; + rev = "8f573b0b089567aa9c544b029000c97e715e5f58"; + sha256 = "0rhnvlji6qvwj8mafgw2jwyx8ixmw4ir73gbywlvhpay3nzal8rb"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3203,12 +3216,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38"; - sha256 = "1c0948bdqydl0r3qvx6p4vpaflfg82s1q9s3cl3c6alqzc46pdjh"; + rev = "72f101bd63228a1a45012325e39c5280ec22c828"; + sha256 = "0airdqkf1yrmsxl2id7v22f063j18rj499kly9rsp0qa8g3zh97r"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3287,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-09-29"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "ee9f8afdbe8654001b200530903f1dcbcc3394e6"; - sha256 = "1x7c6shkx5gxqv7lcby40gkx5f7sr4rgv23pxbzk0l2xy6nsvvmd"; + rev = "62a9f4fd4fcf46cb87b7868323a1e9aef5b08028"; + sha256 = "19bhhdkqx24jyz1xc7v39563gqa7y8y2aai4pgl7n5mbrvcr9bsy"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3323,24 +3336,24 @@ final: prev: ferret = buildVimPlugin { pname = "ferret"; - version = "2022-12-08"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "22cf052269b1143cd579b81c9390880ac712b67f"; - sha256 = "0pwwyf0fwwqaxa9sqm74aqy5r0wvyh24csg8mwp4cyhkdnk2w1rf"; + rev = "343b6934e9369d10d64c25642586dfdbab01bf45"; + sha256 = "0yam4066mkhndpmv1d1icql8fi7fzjv8p1gg7vnjnkzizcgprw8k"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-06-10"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "90c22e47be057562ee9566bad313ad42d622c1d3"; - sha256 = "1ga6pxz89687km1mwisd4vfl1bpw6gg100v9xcfjks03zc1bywrp"; + rev = "2f7c08f45639a64a5c0abcf67321d52c3f499ae6"; + sha256 = "0x4vbqbpzsw1pkqnm6l8hymm35vnfpl5vdaa91g6890q9q57csgh"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3384,36 +3397,36 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-10-01"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "eccef9f34ac332e0f1652d7559fe5cbeab614201"; - sha256 = "1s3vjrz4lcz7lqdxxizj1fdrjax1p5farvi4fr0058k18s8hqqmz"; + rev = "48817af25f51c0590653bbc290866e4890fe1cbe"; + sha256 = "0cf1ll91mhqw73p3y366fxylrq0y222jl2kb8sxf2s4gisxpppcg"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-09-24"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "67c70f0be3bc536850e1c224a39aef075d23344f"; - sha256 = "09dsal7a95z62f7nw8rjllm102z1112rfxbkj6fxvbw0y5gxmplk"; + rev = "f75bd1eae9aa826dda5ddc3a8cf5a0efa6df046b"; + sha256 = "094cmx9k03lh0ak8wnfc70s2ca81r0qddgcraja8px04c2fm5ln1"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2023-07-13"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "498b3a4864e697f1ed1145e518c4c78c776c55d8"; - sha256 = "0w56zv254hpw57zgwzaikj9ciyksvkbd0brynhgcaby8s6hhhgil"; + rev = "f4e9af572a62c808c8de214da672f2a115a98c35"; + sha256 = "10sd56dlgg9zisxp49lh9di3ag6w69rlzy067sp2rcbr84gz8spy"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3468,12 +3481,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2023-10-01"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "1119125206075c4703f2147f964ed0a45f84c6ab"; - sha256 = "1nm24s024ahfgsgplj5gxan009kxdalwwzdvg1vbysavgxhfzwra"; + rev = "7350750d46fbeb4d2bb4878157b658d435935299"; + sha256 = "031l98vwm5099q9xizldk8djn3yrckpp3nlbbd16b2iw7v7rgwm7"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3492,12 +3505,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-09-21"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "34dcdfa0c75df667743b2a50dd99c84a557376f0"; - sha256 = "09dks17yi1cbk4gviv7kw7r04rcn8ridq75slm3vxf3jkid095ns"; + rev = "91651e6afaf6f73b0ffb8b433c06cd4e06f90403"; + sha256 = "1dsxlhsfhdd37l8z9pg2f5s0r4rafk6jl92wz1zcbhf6iswa6vy7"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3588,12 +3601,12 @@ final: prev: fzf-checkout-vim = buildVimPlugin { pname = "fzf-checkout.vim"; - version = "2022-12-27"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; - rev = "00d953bbe2fba8d816f61bfe675070d4505f7a4f"; - sha256 = "0c5k4l2glvs23z6f9pynsxjdc8ascbgngvrqncbnsp0djs8wgasj"; + rev = "db0289a6c8e77b08a0150627733722fd07d5fa62"; + sha256 = "0ssk2kfn16qdcjamwql15s73p1hfl422fvf6fgl1p0ww9fznzkll"; }; meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; @@ -3624,24 +3637,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-09-29"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "f4091b9fa05ae6c2eab2823c0b345be2a27208c6"; - sha256 = "1q48jk4cm9djkz1czf80f024fv6mdysc38x4r66m5gkqs4vky3ma"; + rev = "03d8c35bf7b0541a877348cefc486dcd02142ec7"; + sha256 = "024cf9f73f90qfhcr3iqpcwwbxgm1k6a3hn7nl6ndci7mfbc4xc1"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-09-17"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "678ee1a549bd873dde35f6146f288a3f2e29d983"; - sha256 = "0ls94bxj1awx1z0x4h9pmc08zh917gyyllalm562a0a51x6sr9sg"; + rev = "1e054c1d075d87903647db9320116d360eb8b024"; + sha256 = "197fmlqk2hqrbsgbk9mq1kn67nf7zqcy7yn2zjk0cjk7ldppzfmk"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3672,24 +3685,24 @@ final: prev: gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; - version = "2023-06-14"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "865f01aa04434838f0ed1915734e2200759d925b"; - sha256 = "029kbjrk7cr3zxc3yxjqi7mf58sq604xn7cx46r2kgs0d375f2gd"; + rev = "0938bf901201362721d38480f2ebd339a28a9cc1"; + sha256 = "1y9w0jvlr76k5kvd15iy9r2h75afdiydzgki60g4m6i3mh6pjfqr"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPlugin { pname = "ghcid"; - version = "2023-07-02"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "19b0e912da74341993a005aa53a0c57fd2afc800"; - sha256 = "0vczhvbm62cac3vz9zbxhgimcgyqd5g33mc2sa46f45migcmvikz"; + rev = "b7dc5c4ee640b6c8137ecfd0a2b50df278015221"; + sha256 = "0cp6m8w9pmx3pzw1qyh0gm4c2z8akg1mwh27k9m0jgw1w00yqd87"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3720,12 +3733,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-09-29"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "39df33dad2cbf4eb9d17264bcda0c12e670ef1c2"; - sha256 = "0faaqj4a0nz005gl1r3hp07zrckq00v9ik0g04wwzbr0phccka8q"; + rev = "f07e913b7143f19edd6787229f2d51759b478600"; + sha256 = "0gqr1i3g1afjm2p03vjzs0jiy6jycg6lvqa0fdsqdrb7cyircs5r"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3756,12 +3769,12 @@ final: prev: git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; - version = "2021-12-24"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "d7f4e2584e81670154f07ca9fa5dd791d9c1b458"; - sha256 = "1k446mah5dlqddxwdm7l009251ly8l99ysamncs5q2wpvmv68hm6"; + rev = "f247308e68dab9f1133759b05d944569ad054546"; + sha256 = "0mspffvg2z5lx4ck96d2pnf1azy3s1zq720n6abnxzajadmnh47r"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -3792,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-10-01"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "e2ca739be75447fb5ccc9bfeb64f7afbc2cee5e6"; - sha256 = "0x9mwarz61xggw4xdxllzgardi2qxp33bk24x59rqpkb8135bjrz"; + rev = "af0f583cd35286dd6f0e3ed52622728703237e50"; + sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3852,24 +3865,24 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-09-30"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "2f573a297bea3a483a3607ae7c607a8a08d27993"; - sha256 = "0knxirf1kimjck9f8mx26m8s9v2vbjmacnr29rm9la96fs5bg2n4"; + rev = "e749ff85ffec5a4ef11cb8252a2030be5726cb6c"; + sha256 = "0811lkf5cr9qsp4as3lqq04w545ygmxj1sad66gabvk8lcq7indj"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-09-07"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "74c32eaa520987d195a2594a6efaab61cf9072c8"; - sha256 = "0n5mwyfsmifcfmgs49yc77zvndhkkki2dnka11pk1djvp53bs9ky"; + rev = "09b78f294ea26af678a9ac363b7d5ce8e20b696e"; + sha256 = "0g9zp1p9rpx4bixm6hdpd7w9a483yrz73p6vfl9pn5ky0vavaz25"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -3972,24 +3985,24 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "b5f8c6a6c1cda630c53b061b765068a0898d47a3"; - sha256 = "1vb36n4kd08bfprmfjds2kg11wmwhrd1hqpg67lmhkpccgl0xdsn"; + rev = "d13f4d4e75510e3d798f2ff7561d3c8991220375"; + sha256 = "0hrgzfc4hss3ng6jmkn4rsvwkw1pgck98gnqv32hda4w9bni6pzc"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-09-30"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "61b0b3be2f0cfd521667403a0367298144d6c165"; - sha256 = "1dphrf8bq088d47macxhx2ql9bq5s9axs9cqwqbp6vkmr4zcx072"; + rev = "517b012757fbe7a4d6e507baf5cc75837e62734f"; + sha256 = "1ndbd6mn19g3wiqshw9wckkl976kjvgy2dc3lmb92cyxjni8a507"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4020,59 +4033,59 @@ final: prev: gv-vim = buildVimPlugin { pname = "gv.vim"; - version = "2022-10-25"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "320cc8c477c5acc4fa0e52a460d87b2af54fa051"; - sha256 = "1w0vwdvhbjs5gfggxrdphysj7y4yd53kklijgybjcchwjz98pncb"; + rev = "c67a016566e03d8936c7386e626f88956e87761e"; + sha256 = "0r2qgv22y3d2gb9l0wvgz3y9f3svn2ppydwr4rs42nyh56z702fd"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-09-23"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "3d98663dbd2ed51a3be97e50dfe7df6c26d62d8d"; - sha256 = "07fv14zi1c55grzhzbri3rs4bv1lx5ywpkdgvmhgr1h7blm3d9g1"; + rev = "8cc4dec29a177cb7c33a900ccf45b451684c30a0"; + sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2023-09-09"; + version = "2023-10-24"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "e24288327f88f459025a00632c7b1f543759906a"; - sha256 = "19xr3d4bbvn9s1ab9cnm3qw5lxs8jl5gs5hn62fagdl39a6bwn2d"; + rev = "92c63717c27584b53e6c9c9594e47a1840a8e107"; + sha256 = "0z4gm1p06li8fx9h0zjwbimhz8jfl9akh98a5l4q0qv211bpn0ya"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-05-28"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc"; - sha256 = "03i86ss4n3fayqwsv8d9dxgrs5lq5sc5fgbc2fg1b963r3y6rk68"; + rev = "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a"; + sha256 = "0wqxg31z7gi7ap8r0057lpadywx3d245ghlljr6mkmp0jz3waad5"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-10-01"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "8b472cf9abf5c2996843894d1231aed5f6653bc2"; - sha256 = "1msyfigc97vxsbinm404vzd68biy5hgj61ppz2lc96xbyq7r66xd"; + rev = "dc778953e98bf2667424d93dad82eefe319e0f7d"; + sha256 = "18qc0xcdzg914bis9djz1gd7csalqzvlqbv2nd7v02pm0gnw7fbj"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4115,12 +4128,12 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2023-07-27"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46"; - sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz"; + rev = "e3d7bfdf40e41a020d966d35f8b48d75b90367d2"; + sha256 = "1acxyy5317qf4ry0z32xkk3aasp233nss0nyd8dzfkf631klvzi2"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; @@ -4175,11 +4188,11 @@ final: prev: himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2023-09-14"; + version = "2023-11-08"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "950132d1bec1689476be2edc5913ba30bc13555a"; - sha256 = "116a34xy1ml0xrdcwy8jwqj4pw232449hx4v7crhj3cp68yq07n2"; + rev = "17afaa93586d703d60f16ca420f6a626b2479d73"; + sha256 = "0kzp8xf3rnml13x7c6m2736283jlgara3r001wncwkn4dr896l2n"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -4234,36 +4247,36 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-09-19"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "f2508f415b9fe34082696009574ca26f57a66531"; - sha256 = "0l8b2ag894chk8ljznmspr1ac53n3wf6iww37ksd2pdas51la344"; + rev = "df0b5b693ef8c3d414b5b85e4bc11cea99c4958d"; + sha256 = "19xyzig3wq6k49ky2ki3ffc8f0kjzdl4wir3hs7fa6q4r53p5s7f"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2023-09-14"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "1dc11eb47ca15828df8ed3c7a014eeca9c564e55"; - sha256 = "13siw00n3fa2s8lq7mz8pp4n2f2m7w3y5wd1kg6dsy4g3nvsiw0l"; + rev = "eb5531b5f6285656408d1ed07b4d9bcc8067bad4"; + sha256 = "0yl1l11dp58mg3bfk42ydcc7s2fxnnz6nlkkc09kxmdf4gxwr3wc"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-09-10"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "f74d2924564ba5fd8faa2d7e7cf6065de26f9820"; - sha256 = "15p8yv72zigy0rwb52mjj9fwa5l37xdq19czy96zbfxhvs93zvpf"; + rev = "db0acd3a3445b26948e754dbb35a4ede10c31d30"; + sha256 = "16rph1lwqz4i78qz30l59kwzkndcsfpcc5dzcpw5rzlhq1zqcssy"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4342,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-09-24"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "961e5a68998dd76bf5e25ae2d96fcf3bb1ee22ae"; - sha256 = "0k1gj83w3lqx9dass0mff1yhzn9p0ln96sz0cds14kkgyzfq6dw4"; + rev = "4c1c903268b42a5b83caf229ddda7014a6a2e0bd"; + sha256 = "0q6315nx7dailivvncvg1hiwjk910djcwjm5arqd0nq7099d998p"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4414,12 +4427,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-10-01"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "3d26bc7ab0e8dfddc0f40c840a8f925dddc2fef6"; - sha256 = "1p3bxdrj2xibyqw37b1247sz5nqx460d3lr4py3fn0cdgrf3420s"; + rev = "29be0919b91fb59eca9e90690d76014233392bef"; + sha256 = "0z8n9d6f4qiq8m4ai1r2xz90955cp6cikqprq74ivfch3icrzdi1"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4570,12 +4583,12 @@ final: prev: jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2023-07-31"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "338af171ea32bb9d4705429d3aef20735d567c87"; - sha256 = "0mwnzvv3pr9ny7bfd98q78mjyw9zhgvnz38drh3y3l0h5f6i9z08"; + rev = "b82da7d2b5efa28449f1a46e906dee439f68240c"; + sha256 = "136v3484p88xd5z7j8alxp0i7kdywkd3nkz8830xvrhxsqz3vr0f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -4619,11 +4632,11 @@ final: prev: jq-vim = buildVimPlugin { pname = "jq.vim"; - version = "2022-11-26"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "vito-c"; repo = "jq.vim"; - rev = "6ff60efab7a15c60ff073c5bb7aec2858a0bafba"; + rev = "6f10c6977d46cbb3b3d0f2170e726f36af588bc2"; sha256 = "0fzzqixnzhv2k8dhznn9yzx6h4ivc960dbj7qlbp3czs9fvs8x76"; }; meta.homepage = "https://github.com/vito-c/jq.vim/"; @@ -4655,12 +4668,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2023-09-13"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "a4e99f089110c6d00bc33f5497709200e914e763"; - sha256 = "0c8fqpxxgp7k5yvqf28fwxjfwqnyvl55hapw0vlmaak93qnfndxq"; + rev = "c19b9023842697ec92caf72cd3599f7dd7be4456"; + sha256 = "07wwz1z3am862igx6hkkyymvj2807a1a0y51324jvk27csidrcm5"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4775,12 +4788,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-09-30"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "59335c5b9d116f5d3948f833288a89e2a829a005"; - sha256 = "04x04mzs3cc736l4phsws981nsga8hws3ca46pniz5h3qhj8zfwa"; + rev = "96584866b9c5e998cbae300594d0ccfd0c464627"; + sha256 = "11s0ddi1zcnyrh1q73jp2a4whvpajiwjd6dv8igfwj4jr21mrl39"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4799,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-09-30"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "cd33d84e954ac15b42020889d1d0d6a9cc0e9e9c"; - sha256 = "11gkkc32ha1n6b7x88mvnw1afkp45mx8abpa1c4hkc2x7666sxc5"; + rev = "2c896afc38b1e1d39118318d581850e2d3ad8e7f"; + sha256 = "1n9f4hhi55imk53hzzxsypxvsymg3avj9xnsxgr1bl12xyjbm9gk"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4835,24 +4848,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2023-07-23"; + version = "2023-10-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c"; - sha256 = "093fzf1bki2ll3lrqbnrw9w7i7aajbma4zq83c2nkxwi5gj5jqgl"; + rev = "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c"; + sha256 = "19nffffmczlqfsgjs10hqs9abgbygiv0ns64apk7gzf5anjaj0z1"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2023-07-08"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3db15cae08d63bab40d0c38474e368f97414f090"; - sha256 = "1gkaj6baynds4nlas4i0kwd6w68byyclxp1slghccjfamaqlv3sn"; + rev = "234e2ef8dec65db153c63a8b310c74155bb93ee7"; + sha256 = "051m8h7600f88ljn6m4mp49xi3pgh2ak8h01bb7gqk1lkq47d7ah"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4895,12 +4908,12 @@ final: prev: lf-vim = buildVimPlugin { pname = "lf.vim"; - version = "2022-08-24"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "e77c40a5ff3e900fb2c348939c636667df647bc8"; - sha256 = "0b5pmn5s2w4zvv05b4ysjxbfb0ivb4ljamza26g2jzq34sc1w04b"; + rev = "f2bab8f4a420ec434f1fb4b5fa4ee354f6dd2afd"; + sha256 = "044wgd5wscpss4jc5czwsjc4ycx3kykxijzr8c7kymy5ydalpmgj"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -4943,12 +4956,12 @@ final: prev: lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; - version = "2023-06-06"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "718508395f4047eb8cd05389c1fec709cb7df90a"; - sha256 = "04pz3j1875adri8hjz6qir496jjmxjxppj3q3q5jqd08jcp9h2qx"; + rev = "d65e4d1220a35f1f19441116e0f1dab641e1cc51"; + sha256 = "0xx64dwfnra335kadr2p6a8hyv0bxpfcix7k3f0qbd1hvzf0pihc"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -5051,12 +5064,12 @@ final: prev: litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; - version = "2022-09-28"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "e2dffec35740032258fee3a3c7f30123226f2271"; - sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8"; + rev = "14b66cc6ff76deb67259db99196c0da5a6c75ca2"; + sha256 = "0ynnn2rknyzyjn796lig32n1jycapg6q4zrpzllxlvqyhyhxsjf5"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -5087,12 +5100,12 @@ final: prev: litee-nvim = buildVimPlugin { pname = "litee.nvim"; - version = "2022-12-11"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2"; - sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq"; + rev = "3c51764a615566e4c0223362f4be00acc23c430e"; + sha256 = "1y68zqlzm4ba7fg62drs2flxbyizar1m9vyqgbah7bfdvw4gw0al"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -5147,12 +5160,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2023-08-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "42d68e9f33dcda67591f0c406d98b480915f94ad"; - sha256 = "096z4wz51492qgbq7yazxpsbkzcb49acx9y4ifnwlb9zl1h6xsjj"; + rev = "f7afc7a66b5319036e84487240283fa7d8e1100d"; + sha256 = "15a6mnh5ivnllgiwvcs2qc9rrg1alh345yv129417rl0brf0n438"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5183,12 +5196,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-08-23"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; - sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; + rev = "8a9ee4e11a3e23101d1d1d11aaac3159ad925cc9"; + sha256 = "0snk9as2m5dz3m0iki4mrs8j5kd3zr0bfpwxi0i70y4hzxaqlwm1"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5207,23 +5220,23 @@ final: prev: lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-09-25"; + version = "2023-10-29"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017"; - sha256 = "1rva0ykikkj8wssga5h0ccqarkvcvi9g2kgr3il889v3zsim7d2m"; + rev = "cf2306dd332e34a3e91075b40bdd4f6db824b2ee"; + sha256 = "18g9fhwr2mrjcns36h6x1xgy8q84i80566474zxsd6z7ckd8qdfw"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-09-20"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23"; - sha256 = "16lca28qd9aik71lb9vkfg0ypsabx36j9aqaqjsihbhb2b2z8v4p"; + rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab"; + sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5254,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-10-01"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "f8a6d7cfe185637616d7fdee676dd543ae5fde55"; - sha256 = "0vwk2nn8mm113lk6sywdgfp6k0887d14pys9w8b6k4hm8xw5zfzq"; + rev = "4d85d4ad3ef6ba9ad0fffe478f834c29b5bfa57c"; + sha256 = "07jpv90i1xrns6hy77pbyilrxh7ad8i1h0x2x0w6mmv395gysxvy"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5290,24 +5303,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2023-08-03"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "45e27ca739c7be6c49e5496d14fcf45a303c3a63"; - sha256 = "1ixzh61d0rd8223qagd1k4bidv8jw4hsafy02idb7c1yg6fy5ixz"; + rev = "2248ef254d0a1488a72041cfb45ca9caada6d994"; + sha256 = "1ccbbgn3a3304dcxfbl94ai8dgfshi5db8k73iifijhxbncvlpwd"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-09-25"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "480b032f6708573334f4437d3f83307d143f1a72"; - sha256 = "0jb4aaspl3xcqafqych973qrgnnp5bqhvinf03id8494da8zf9z7"; + rev = "1f4ad8bb72bdeb60975e98652636b991a9b7475d"; + sha256 = "174pwxjdnb1gxxrnvz6zplr5r2cwjq79si1ns1ymziq4lrxjnni8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5375,24 +5388,24 @@ final: prev: markdown-preview-nvim = buildVimPlugin { pname = "markdown-preview.nvim"; - version = "2022-05-13"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "iamcco"; repo = "markdown-preview.nvim"; - rev = "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96"; - sha256 = "0hd51c7n8hr5bdhd8xl4gr4jgasdjr90rmcjaxylp475xyz6wl3v"; + rev = "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"; + sha256 = "06187wxcj2ramhimkrgwq1q8fnndzdywljc606n3pr11y8dxs5ac"; }; meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; markid = buildVimPlugin { pname = "markid"; - version = "2023-07-01"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "markid"; - rev = "46d03e1b7d82c07bbf06ef2f6595fea73ae6410b"; - sha256 = "1mk96p5if9zd3apv7d2kn4c3h2ik39v80apr0qf10h8lwx5zx19c"; + rev = "9b249e4d2ad0767a1091017cd52264590e41a274"; + sha256 = "06yrg2xhk4hanm68cq84j4137na91k9wf2mds90af1gyrp4hlcf5"; }; meta.homepage = "https://github.com/David-Kunz/markid/"; }; @@ -5411,36 +5424,36 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-10-01"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "48025d62f45af52ba47e4193b854864839392e4c"; - sha256 = "1n3xlfjjjwng0rhlgvl0dj25fhlfk35vscwmz1kpdad627lzg83b"; + rev = "faeb361507aa1ef1b0e5645781e2aa0d36a4aa84"; + sha256 = "1kq88b7q8kskigpizk432h4r5gf8k87f3zrnxz2pyvrwwg7vpkmp"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2023-09-23"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "83dcddb6477f9ba5db98971ef27bd18bdca921b4"; - sha256 = "1g04jj1z7ak74b8rccwhmg1yqlfxhhn3mblsqzxbz48xy4bjlsdp"; + rev = "e4f34741daa9cf95de68a603d3e7a6844a69fdf0"; + sha256 = "1pk19mlssn6f4pqm2j0kf9841nmxd0scphhrrd02w81gmsr912zh"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2023-09-10"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a"; - sha256 = "01k4xxfmhdip6vniwj4lai7fqp5dyh799cfyrjqmqqxx25q7m8aj"; + rev = "41e75af1f578e55ba050c863587cffde3556ffa6"; + sha256 = "13gbx1nn5yjp13lqxdlalrwhk53b76qsqy662jzfz7scyp5siglz"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5459,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-07-11"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536"; - sha256 = "04fd3rm4lzf29vpma2ylh19qcsms81qs6nlzwji8la3d78zr09n3"; + rev = "eb52634ec1f6cc186f85640ae4bf3ee80bb10551"; + sha256 = "1lb58jxkz2kzf0zqbba3znxckadi09yna9lmyq3my59xzkaqa7p4"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5507,12 +5520,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2023-08-11"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "517518347e41301bb2d1189d257f3918551a2ea5"; - sha256 = "0rh6bm12wkkwbhb1xfp3n57xjy9i99zc92wbzvalp8ylps9dvcpb"; + rev = "ca3444c8e5002ee5ab6f077660317f869c7b6a36"; + sha256 = "104lc4kfx5jr6fd684vx1bps7ifbqfx6iyi3nbczbhycw0wfw4r4"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -5531,24 +5544,24 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-09-26"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1fdbb864e2015eb6f501394d593630f825154385"; - sha256 = "1iivgd0hlsi6d3i9lzffy74ilra7rigmdq6z3wrdfv33iwgm1k12"; + rev = "abd7aa3ec50350ec3c986fcdd7328e3d23948b89"; + sha256 = "188dqyddsj2rzz212n8kswxqn8mxa0n38j681r912z4yf4vbmjqi"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2023-07-25"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "74573b63b9ef0583262b6bf6ef209eb7f3b06b94"; - sha256 = "040z12dxagbfsbkdwpsz6dk2vpak3z737ra5ipb1ljqsswgrj5f9"; + rev = "701f4cf4b60a3e1685d2da484282f3a3d8bf9db6"; + sha256 = "1kgzg69v9gsl0whq7740av3iyih0z460l42js5jxl8mg630bzxbc"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5567,36 +5580,36 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-07-05"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "a728a3533bb57502fdfd6fdb4e5839fc87430edc"; - sha256 = "18zzwij973ar8jqmxvv9rv8r3lhvvjy2i61x1052jkkm3d9j59jk"; + rev = "3b3563c61af31ecbf6522e92626929b8654649d5"; + sha256 = "0hqmxszry28in5c3nf6ixwa5q4ngwmpi75kx8niy8329nrnb7lzb"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; mkdx = buildVimPlugin { pname = "mkdx"; - version = "2023-08-23"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "4a8067468b4372d58f519eb55708b524a893d67d"; - sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; + rev = "ee667cad506954b706c3fa972fbaaad46b1bf028"; + sha256 = "1yl7ch7ylgjm1fpk7kc5260lk58922bg9ygg2x8a7r5k1glxx71j"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-08-25"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; - sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; + rev = "d22c02c007170ab432ca3e166a1da56297767e87"; + sha256 = "0pvx8bsl4623mx4fgym993dnws62vfnaz90mrcfp7kska3p1d4p2"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5613,14 +5626,26 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; + molten-nvim = buildVimPlugin { + pname = "molten-nvim"; + version = "2023-11-14"; + src = fetchFromGitHub { + owner = "benlubas"; + repo = "molten-nvim"; + rev = "91ec70b710bc8e1de59352b1ecfb4cdb6e786c92"; + sha256 = "0h3xg8n5asya98lyly8m2zgkkg1llxji3fx6fd4i6yym42c3awv0"; + }; + meta.homepage = "https://github.com/benlubas/molten-nvim/"; + }; + monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-09-29"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "6b3bf9a4e0c988471969f62b36486023b33dd963"; - sha256 = "1frrsxvvklq6lpwclqsknqwpca1bgb13ijwj17x2x69bnzd13vhi"; + rev = "70c384c43b9e19b59df3d6489b544ad4df155100"; + sha256 = "0ddsfh39f6s1z2a42qgk8w0fl02j6xvsqqjcf4zqw32mgyfhwf6i"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5651,12 +5676,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-09-16"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b7a837496da6f5b39b610a7cbd6c3f7d05526d6e"; - sha256 = "0mf282j3xq76h7jzgyy7wgbjw17vglx49ybrjxn08bix9vnvx1y4"; + rev = "b4e8571b79a7d2a2aea70922c35eac3a71578c0e"; + sha256 = "0brpnb1dbw9xsmd2g5ydq5gvmk3xf1q69n3x2i1rd5bcyzcg6f8n"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5915,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-09-30"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "7e2a3caf999e2028abb643eb0472f351b2777591"; - sha256 = "0mqrvk1aqs72vpwsy9ys9c3v3xbi1f7k4n692nm1v58v6d70gffk"; + rev = "f86e871584bd3c5a00b4ff8344305889eb52ebff"; + sha256 = "16v172gmr3clr8mnw1v767ln6qidalp7qv6xsh10ylnkzygz9lin"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5939,12 +5964,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-09-30"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "466ba6f645f63f91ac84d3dd986acede5d107f39"; - sha256 = "0vqprdkbr8vgdfqhjwnqjfw76sfrr4akfn589kyzwpvncb6ygwv1"; + rev = "64437787dba70fce50dad7bfbb97d184c5bc340f"; + sha256 = "1bwwjnn10b4spvcvdjqwi28zx7ghzvy3q9wspipp12kfvcmdfnbc"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5963,24 +5988,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-10-01"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "41581561a0ffc6ea6a191ee90a23f8c1c7f470fb"; - sha256 = "1q0vfzbzdyc1cnfa2icgrs4zkjajxbqzqypa4q8sfh3cgq364l92"; + rev = "b2881eeb395d2b268de5fe9b5e201a8f1816beb8"; + sha256 = "02wnkbcvcpsz6dy855c1c8l0cz7178qaqddvmmgqfpzi1dfxn4q9"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-09-22"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0"; - sha256 = "09lk5q7zfvjcfvijk3pr830zl602j3i06zil148fwhkghig0flkg"; + rev = "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7"; + sha256 = "1263nvq9a275340hdnkimz70xq615a9rz2s8szncii35z10szjm7"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -5999,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-09-29"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "8b06f91ae973fd68fde074f15a887f9a3a3411cb"; - sha256 = "120h0n3md78hzddyd77b47k7dicnij8zb1rw624b9956612slg07"; + rev = "296570589180d9428539f5ac099d7c8b9f4ad489"; + sha256 = "10b9jl17kb6lnlhgm7lblf08qh3q8ymhzzv7w1p4hz786hrcgi53"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6071,36 +6096,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-09-23"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "745715c873395840a5127413d1ef30a42735605e"; - sha256 = "0nm85zcai92wm4afhaswsmybhyxak7sfmga6dacv0z4v3gnghhav"; + rev = "d5f3ad064918cf19dbbdfa77817d162d4de6a461"; + sha256 = "1qaghcfmnyv8hcmnbdrz12x6m92lxl9n3mxbf6vqmqi9ivdr63h1"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2023-08-06"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "1310d4aaefd8149c9839bbe1d5610e94389e2f0e"; - sha256 = "1k7hhyr8j9jzaqcg243xnqj94238sdzg5v09n7djcjg3cd4yjmwd"; + rev = "6a7a677c40fa3c348924a4e2a06a513e0b34c056"; + sha256 = "05m64vwi55kzknz9za0izc9hs1djc46467d7d8ijx3268sw3l0x6"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2023-08-10"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb"; - sha256 = "1rbfmxzfwbb2sqvcgzfhbkjz0w765psakaah7jp9rl72zjbnqy72"; + rev = "e85740d1a54ab0f10127b08c67a291053bc3acfa"; + sha256 = "0klmrkmhc3b52v7f03dvhysywixkh2zqqllq7sbrs278gnlxm2yl"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6143,12 +6168,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2023-09-10"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "1e67a504d03def3a6a1125d934cb511680f72555"; - sha256 = "0pgqyvcjb233l2qw97c1gfn04fnl768djhji9y1p5fc4769znd1w"; + rev = "d424d262d01bccc1e0b038c9a7220a755afd2a1f"; + sha256 = "1sg8m77hik1gffrqy4038sivhr8yhg536dp6yr5gbnbrjvc35dgm"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6179,24 +6204,24 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-08-13"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "6528e761e4528aed3f4b60aff4c9f3406beb3cdd"; - sha256 = "0xp4bgsk3kh2bbyq67l7kvflzjbkxkzhdzq34pvbmjvhhsrrifz9"; + rev = "f7bdb60c3d7716f75fb04582f64dae8efb7716f1"; + sha256 = "1sibrd1nqhmp75jhv15fmfxk796bw419zmj9bz4y2kn9w4rdwv1z"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-08-23"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "7904f8c0fedbe615ee3d75beb810d3e1426b05c6"; - sha256 = "13lsns5wdkp9ay4a11pp6hvhd8isqd5vzag89alwlazsdnmirmvd"; + rev = "0e85312566c6ef0aa7456503e4038cc5541e7df4"; + sha256 = "0jcbmh0w8zvhdkk111cvsb56j67bc2l0vf7dcyswn50p96djq5g0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6216,24 +6241,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-10-01"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "6f8f89cef7e5ed811e8e2f2031f8a214d5dd6c0a"; - sha256 = "0b27zr14y9cx9za3akzpmvgri8y0jw302i7xwkc89wbxxkyjszi2"; + rev = "d0d9fa025056d4a8124e7bf34a3b0b7942870c84"; + sha256 = "1f4w2lyjj19piw0pn9456ilnw4g7086641z73f6msvy6fnxggp6l"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-09-03"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "ae559fbd405084ee38dd711eede6d74f3dc1d463"; - sha256 = "032q6cm470y64y3crb7p35ap1r6p8dqh6wgwk5aq5xyfr8c07vbj"; + rev = "d8b00a91e440474da20a8e9acdb0d72051078b8b"; + sha256 = "1z400jfjy3nqxn8024kbampnbnawzxacqz7k3mv2l72brgyp62bn"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6276,36 +6301,36 @@ final: prev: neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2023-08-25"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "81d2265efac717bb567bc15cc652ae10801286b3"; - sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; + rev = "c969a5b0073f2b5c8eaf017d1652f9251d761a15"; + sha256 = "0vjbc6sj9d4l8553g10wqxqpjr8z064g143i4ig4d42vsxh24ccc"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-09-17"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "51a3b866d85733d2df2c6b5a16d75ce6ed2fbade"; - sha256 = "028qqd0ywlf93ndy3vqp6pj9pbp3nsibdnkmg3b45g1phc49hbrw"; + rev = "8630acad9e84b8267646bc8712a4365af7a12f2b"; + sha256 = "13s3im555wz66z1hmmn8zlpy6vsry0xi87yxfm7hjpfcb56lqncc"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-09-20"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "139cff7c85598ec591b5ed7d71ce8ed3b5313b97"; - sha256 = "1p8c2mnvv131nn7id2panm68nvmmbn44phzzwa2gggdv1snz0xax"; + rev = "f4e58d5278344440f65c5a5177f16711337e44f7"; + sha256 = "1ysg0vh7kw1sqpzdhgy13j9aljwk47jh5ss2y3k54j8a1qrx5c3j"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6396,24 +6421,24 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2023-08-12"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "d2e21d417f6c788b11ae3b90d7ac478930dead36"; - sha256 = "140xp1kqj76gyn440bs62ff85b4xvlvxiyidvb5r4w0imrlacnpc"; + rev = "da948e160d9f54c2967c7927b9c74c5a68c8dc49"; + sha256 = "0ww8l7lfwqnkskil0dfl71brnb5v03dgyf7i0nfmrcnyc2c0xrcm"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-09-04"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "32168889bdbc1e7d1d313e3e41c1cc794b38eac5"; - sha256 = "1g24dr58df398lbm0j7y8nh7k3gvv49xc9fndh5385pfj2l91fv0"; + rev = "0cb04e9245b000daf32f04aae5f606011a6aa3b5"; + sha256 = "1rws27wc2l3qahvbfd5b2i1js9kwldxxsfsn0abah96q2m1i3q85"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6480,12 +6505,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-09-27"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "fe2fc7b93d66349eff2c5baa6cec922ee3958f56"; - sha256 = "1paipf7phkkr66xnfsi9hwxlqpj339nza8ni42hc5lg12c4h0p14"; + rev = "6a6076bd678f825ffbe16ec97807793c3167f1a7"; + sha256 = "1p1gp2p08mh0z7ckr63lw76ac91pssv0k2jczwpkibqmpp4imwnx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6552,36 +6577,48 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-09-30"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "a3a76540533909aa42b4f9430c5b1976a6508f81"; - sha256 = "1yrni32ailamah5rbf6haypvik2wm4ywxrlrk3d12wl2hd9g7yxq"; + rev = "2bcb6b761a34c69739da9aab642839b59236b801"; + sha256 = "1pd2qzc3gvrbwhxd5i2bc5jd1ll762m23qsjpbhc4xm5dyq66i89"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-09-25"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "396f9146529130904e07c45e90ecdbfa607534f3"; - sha256 = "0n7z491mg9wlr9vhpzanly9ywykbjavv04qk1f5msj5i5r613jh9"; + rev = "92433164e2f7118d4122c7674c3834d9511722ba"; + sha256 = "0cs7hnjgv1np3pmz0li9g4m01i87z360x0fpbh4aqck4k8mhjn7f"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; + none-ls-nvim = buildVimPlugin { + pname = "none-ls.nvim"; + version = "2023-11-15"; + src = fetchFromGitHub { + owner = "nvimtools"; + repo = "none-ls.nvim"; + rev = "e5abf91b410e28e823b26fe9141287fb416d2dee"; + sha256 = "1bx8aan45sipqpg0yh4idagqhgn085dnnzgb051jzdwd6ja0hisv"; + }; + meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; + }; + nord-nvim = buildVimPlugin { pname = "nord.nvim"; - version = "2023-08-30"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "15fbfc38a83980b93e169b32a1bf64757f1e2bf4"; - sha256 = "077mr9gz4bsk0fz7vmzc9b68kysdax5vrlwfh7rhdam8qqlpncm7"; + rev = "0a22a387c92bb3b46e3d245522712ae7497bec38"; + sha256 = "1bmmyf3d4ihiaa0h9q77scif22kykkidks72vmamzh7v34x3c7d8"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -6622,14 +6659,14 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPlugin { + nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2023-09-06"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "c8de23342caf8d50b15d6b28368d36a56a69d76f"; - sha256 = "0na7mi192alj1pyskdyivn12a0nmcmzy79kmqxyz8r1cijgb33q2"; + rev = "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32"; + sha256 = "0x3bf63d4xblpvjirnhsk4ifb58rw6wprmj86dsfqjzls37fw6m5"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6660,12 +6697,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-09-28"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "195fe4ae72365c75757c5d0df677f3b29d8697ce"; - sha256 = "01ycw6c0dlzyjpkp5kklp484ccygmrww65k5pcqgipvhzq0ldfm4"; + rev = "9d37797e6f9856ef25cfa266cff43f764e828827"; + sha256 = "0a57bswr6w0nmxj1fmvn24w60ibgh1gyqx586qhz1fq5i4jfjva8"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6684,12 +6721,12 @@ final: prev: nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; - version = "2023-08-28"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "c4e9c71c9ca595772a360435bdf91bee3f9d32b1"; - sha256 = "0ri3bx03vzl9m0q5dbkr85cax2vm1abk1hiiwxzbdmc759p6mxvq"; + rev = "6af458f0196215f397db31a6e1fb2df795811693"; + sha256 = "0pvdbk48pyqvi75pzpsz9wsvhfrp5rya2dbccg2gfx3h5yvks6fn"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -6708,24 +6745,24 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-09-23"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "de4f7138a68d5d5063170f2182fd27faf06b0b54"; - sha256 = "0ppip04x0z98aq7b0zpg1yyy2cgqr94jgf5dy2dr1wvgrjh9lxhd"; + rev = "0f04d78619cce9a5af4f355968040f7d675854a1"; + sha256 = "0k2pibxx42qsdvxgbrdj7g44y5q6dnaw0g07gq025dpn27jk9ark"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-09-30"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "88f209605b7857ce5911e8aaa503a210876e935d"; - sha256 = "1767iwhbgi7lrfwn4wsk96h8x8dyfgbp11wffm8c42yhjwwmp0kl"; + rev = "010bedf0b7c01ab4d4e4e896a8527d97c222351d"; + sha256 = "0zy2p9gdyw5kz256ify79s72bc53pq1d3n813nzppxlggkndyn3v"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6780,12 +6817,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-08-26"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "5dce1b778b85c717f6614e3f4da45e9f19f54435"; - sha256 = "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq"; + rev = "0b751f6beef40fd47375eaf53d3057e0bfa317e4"; + sha256 = "1qp7s2iam9zzdlw5sgkk6c623z7vjgga0rcg63ja0f836l90grba"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6804,12 +6841,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-09-25"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "52e050a319f37a5f752fe8f461db209ab03a3188"; - sha256 = "0i8h1a7m4q3rsxbsxqbzlyyk4yv77kr56lvfs94d1xj8wq7nqgp7"; + rev = "2e71292a37535fdbcf0f9500aeb141021d90af8b"; + sha256 = "140qc5gzss0nb00gp1qr3rz22swzcvkwg7c5772ki8yvj3yc9ini"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6876,12 +6913,12 @@ final: prev: nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; - version = "2023-07-20"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "4634dfb00961a86948518c7e6f85737c24364308"; - sha256 = "0ry8b5945spz00scab6xxs8va56yg17q1dd6g90k3zm9gvdi0r79"; + rev = "13e357d4a2a230070c64ede61252225f0b7d3b5e"; + sha256 = "11pw7izbb9yim3vcijxljhp3l7z39ycscjgqrl5wxaj4j2jvaldw"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; @@ -6900,36 +6937,36 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-09-14"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "b3d4408e29d924fe130c9397a7c3b3630b3ea671"; - sha256 = "082j57shp24i4rpg8j600picn3wlxsa1br99yfdrankfb2jbcwls"; + rev = "9d81c11fd185a131f81841e64941859305f6c42d"; + sha256 = "1pwn5c0hjm3wpzzybbakxgpq4bd7f6aygvslhivi4inzn48dla90"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2023-08-23"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0"; - sha256 = "00dfcskbj25w4wilrpbq6g1l2zrxf1awplsfqp9nhnzs1ivbg9yb"; + rev = "a5cc8dcad43f0732585d4793deb02a25c4afb766"; + sha256 = "00nm95dpbmjnndvh8kapbgmrbfjqg3dd8hhrwgd3rmk30d777zxq"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2023-05-23"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42"; - sha256 = "186advam53j32xgiwg05wbgq3ab8zzkq3lnam6gad9101qp4wgf1"; + rev = "e0be843877e7ae756ef1ee7a441ca0b9e1677da9"; + sha256 = "0xib2xayrnf96r07rd7xdahpza41155npkdjxmr48h52gjj15nbl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -6996,12 +7033,12 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2023-08-16"; + version = "2023-10-14"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "6fd4eb53ac25fda0c2f1a60457c5f0592a0e95ad"; - sha256 = "0n4q5sls5kwbzkc4z3g26r0d76r9bvy5q8h0kb70xs7n2h289iqh"; + rev = "c0328e23b815bbe55935945332c5e5dc88092792"; + sha256 = "154vry38gq0kv2ya23pgnbby9hizivyamnv0vcag3g27nj7xk2a4"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -7032,12 +7069,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-09-28"; + version = "2023-10-16"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c1a83ce4f3e12250ffa30a9aab79dad8d9b9fb95"; - sha256 = "0n49zyifb0ljm88b52gpb9808gzpplgwc1cmbjy4f87zgn4smqkv"; + rev = "5dfa7701c586b7ddba4152e512563c377e031b49"; + sha256 = "1yxcd6xl5zjbsz6x34fnslhpaqs1liyvwqwkk0sdsiyzb6iv7wvw"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7068,12 +7105,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-09-19"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "3ca419c52a7c20a2565237db2c110ed68fc7e6f1"; - sha256 = "1jy5yklfc3fvajy5mqwfi4h6p5bxb71ar1hnck8k8hciggrijhrq"; + rev = "503a399e0d0b5d432068ab5ae24b9848891b0d53"; + sha256 = "0qq8sr32k9wv92km71h5clpmhsnck3i0dj40qapabb3iaw8iwhwf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7139,24 +7176,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-09-27"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "ac99483249bfa202395e3abcfce7bd39288d93e7"; - sha256 = "11l0bbbaxxinm17j9aqw7an1nfd77pgmkmh3acdx5ppnk8d9141z"; + rev = "b1db01865791b324918a7835984c0f96112df37c"; + sha256 = "1smxkw2pkmcbhypmcmssbnq0cpi2jsq7ihsm9nzp7mpvxz21gd34"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-09-30"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "1065763f115a7765ef237347ad676ba348d7193a"; - sha256 = "0wlfq7xpi60nrqxx2v0h2pjv9jhx5alir8z9q1h7vcnf2hykj45c"; + rev = "4f2d968a827d86bb40b7b1fad28c11f7b764fef3"; + sha256 = "0i60lyzhhnpzxi7k5dy4xacsg8mmc7ac8f8xwlbv32h8jqrblsab"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7187,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-10-01"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "eb1b53162755888ff75e495797071644d983bff7"; - sha256 = "04kgsf3rhr0wk3vyx6lawlxj5icvaryx925flh72f234vkhigmq2"; + rev = "d5d7412ff267b92a11a94e6559d5507c43670a52"; + sha256 = "1jqpsj2in41fv148zdvddpcwjzmll5kchzx9mnbas685xmzc4h0k"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7247,12 +7284,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-09-18"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "f41c14ae8500ceccb71e6695574b67881f0b5a93"; - sha256 = "177l4rl3in93qk0ncjalr0bj5jfiv5z5c1g6n0b7d8wvlc3j24cm"; + rev = "96d0c8ded6c2b9e66340c1e00d5a62acec112711"; + sha256 = "1ml08is8vn49d7bbzlhfdxfa6q8c9hjnfxrsaxqbgkhgnw7nakq5"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7343,12 +7380,12 @@ final: prev: nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; - version = "2023-05-15"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "3e96035d62290183fe7a11418db2b254fcfcaee3"; - sha256 = "12zdrwjlrvzlpwqi757llfvr7ir6ww949i85da385n2crj3jfd8i"; + rev = "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7"; + sha256 = "0alsh1r6c5b8zf3jcymmrp921mmmhvws38ih9hbw5yffcy0lqhl2"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; @@ -7367,12 +7404,12 @@ final: prev: nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; - version = "2023-07-24"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d"; - sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g"; + rev = "3f4f176a6dd50c8588cfbe1b0e9cbea39018003e"; + sha256 = "11mrgrdhcqsw1xg9pldby8gp0wpkmbcf9c9nbahxd73s77b5a0b4"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7415,12 +7452,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-09-03"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b0737d036cfbb39e066d144702197eda0a4b6cf1"; - sha256 = "1r89wdsv8g7dmd06a9zx99mb6r45ns5d7sn7rflax2n1wrfraaix"; + rev = "642068c7d6d98e019a3e1db7c7b4876373347730"; + sha256 = "1zi3kvyxb3zyni5dj9kmi296r303bskpcdmsi3a4r9a3pryl4lhr"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7439,12 +7476,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-09-09"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "5787f088c99c04309a8aa6363fd3ac9a5a26b780"; - sha256 = "0m68plmz4lb7ysxr5lx4kxx0g388z5bp8p3gnhiw5ybmhymc0v8f"; + rev = "7c8f18e90cad4f56c4e22a49101668735639f286"; + sha256 = "1mfjnzfg4z5hzribzadlmgjjihh5dx55swjrjljmgsbj7jn4nqws"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7463,36 +7500,36 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-09-13"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5"; - sha256 = "01j8xxjlj10ayfffhb5fav9r86599zqn17i9jd3kmc59m8yxdpr7"; + rev = "a18a58015b46f02b4fe537ebfffd82e46110ff24"; + sha256 = "0ry2scnw8hzd3snjhbp71zc6mnna2bwn6icr3frsgdj1p5rfissn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-09-14"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "be7273858d75673a0ae594552742eb8769f35d6a"; - sha256 = "1qr59fq94j1l5qj5xk0v9mnp65gjg2iqwsal9j7c7c6cxz76bg7s"; + rev = "e0eeac5480704cc3fdd5bdadd4901ca5409d7838"; + sha256 = "09nl8id8adhk8qz8jz7ygwx5dmh96237gkp6fw2qdhvv4x7w843j"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2023-08-18"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "1c2ef599abeeb98e40706830bcd27e90e259367a"; - sha256 = "06j190qns6fscxp7mnr6zl5bipzbc4w478z5x5g2awghc0iwzkcr"; + rev = "0855a89e00a5822c3a482a82e5223fcf2e9ede13"; + sha256 = "09riinjjh96nrs357ay886j8gs6cgkhj3zwngm44pf8p04w2w81n"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7535,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-10-01"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "113e0950c88b81b01d253d8f3da17bbd0e6716bb"; - sha256 = "1nmx68gjc59cn6lapvml12x4yj9iqaqdb8q3ad5w3gfnmva03sjd"; + rev = "80cfeadf179d5cba76f0f502c71dbcff1b515cd8"; + sha256 = "0fmmfhzl8igk3kpk34cs0wvw4lyhjvc83cdk225gs06awqr24i3m"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-10-01"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "776e4d341b5416c995e74c3abbf75f9cec26aa5e"; - sha256 = "02pk5di7lxvbwzi2ajq7kj6rfrxd46635jccw6xf5fbxcl84cqsb"; + rev = "8b9f99660294dcd11d42572c84ee33a1e284f70d"; + sha256 = "09mkkkirp922018dvci32p9mfsa2fqkv9b6nd1srwicxydx1wzp7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-10-01"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "bc19b78e9c705d67be98d56e9fab96470af45f33"; - sha256 = "1xfdiyz0a07zpmavyinq3mc3f81xw99n7847ijwb3rwpmiqs7hns"; + rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977"; + sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7607,24 +7644,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-08-29"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; - sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; + rev = "dbcd9388e3b119a87c785e10a00d62876077d23d"; + sha256 = "0qprl987ljj9ki24n75g5fvpj8h4rqzx7n6sdicpmw9d91bn169b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2023-09-30"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "48b3bf54e32f23e2299c59ff76fa3b0599565b39"; - sha256 = "11nmxnqr8dnn1l24gcrm4bpvpmy4ibsi6x46iz5y2vp7pzrj6cf9"; + rev = "011c09784f1a95cf469a48c1993b664190440391"; + sha256 = "1sik741s868ini18kqzndk3pdl44wzs8nra3sc3ggwi3ps9rs2qi"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; @@ -7643,12 +7680,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-09-30"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "0c136439fb93fd94db9106250ff6f6858101422b"; - sha256 = "0cmszvwxbis2m36zwb7bcq0yfw19ska31j1r7k7pn55skr605527"; + rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d"; + sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7678,12 +7715,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-09-22"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66"; - sha256 = "05k9f2zxk1kkzp8xzsyc6j5szvvd8znjim10sj27jc0rmg5qldam"; + rev = "a6132d058f23d15686f07b8e1ca252e060a0e0ce"; + sha256 = "0ijlsw9x3g2h48wvcagp1h4pvyjrrlc1cn0jni5pqs6fqjlcbypk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7702,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-09-24"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "45d0237c427baba8cd05e0ab26d30e2ee58c2c82"; - sha256 = "0cbp2xv6gnjd1plc8psj0qgwxfrfqw7qg8jn1cgr1la563jjlnlk"; + rev = "11eb26fc166742db8d1e8a6f5a7de9df37b09aae"; + sha256 = "0xshsc1wxgsvdb09klsddz0ipf43vimsya4rc4zi22xxjgj40dyh"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7810,24 +7847,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-09-26"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "04334f0602b351e4995f352b6fed3d6f91f64610"; - sha256 = "1sjig39rj9xli6nrf58xgvqbdnhrmz5zjdicn28pv7d67mydgvbw"; + rev = "5d6bed660ff18878a9096b3acef9c444b85021ac"; + sha256 = "1y1d1fa5m5wch2daskshmwm934qgbaca9s1340y36bhysbdd7ifj"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-09-30"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "956d7fc89b0bd1f9ea6515ca10c1e2a293e4d8fd"; - sha256 = "0gbrnnji01pdz7x78cbdnvs6y4gpb298f239i5b41mr9vdc55ysl"; + rev = "af04969c437e0c46a2b3c86d7892458e878ecc40"; + sha256 = "17mi1hs3jmmrxqxhykqf0xj91ssxzzzig7gmdlyak6pgwln2ziyr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7859,12 +7896,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-09-04"; + version = "2023-10-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "dac8c39812dae025255c9069a260e1f69d967927"; - sha256 = "15cv4cxgxy5llhhdla2hjfvn7544m3dasysd6ci8h5ys8x75nva0"; + rev = "b9acd92ded2ba155867ca5af9d618e933d96e3b0"; + sha256 = "03a42mqqhd18skf765n3cf41i31wdc14w7z0vra4ll7d0p6qrdsz"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7883,12 +7920,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-09-29"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "7c02b4eeb310173ef6d741e60200d72b76923eae"; - sha256 = "1vmix76dr7sv199nwmvmxxgp7cqysi77m79p4bgsx2mynmkdx4p4"; + rev = "89888840309a813ef6911e0150a0c6aa66c2ab5c"; + sha256 = "0648dilrk31yn2c8s581c62j9jk30cnxf6h4f2pcddygs308pqn8"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7907,12 +7944,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-09-11"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "5d4ea147564f6a5e5a2aea643c1fae15acb66b90"; - sha256 = "1r3kx8h17dsyda86amx4j8q29dpm8w4rqli7iwldww7bcp3skbg5"; + rev = "3679fb93aaf473c1dd63222ac88577a909f6b41c"; + sha256 = "0xlfhmjqsx6cf12jkidp7bxpl9rdbrv1nrcszh0f2rvgir7r843k"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7943,12 +7980,12 @@ final: prev: openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-09-26"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "cdca4f17dbc2ed85ea5e54c594eb57c4057d9290"; - sha256 = "04jx2pprk1072a06vanyml6bv4qh0hhfmjz145jjp69rn1pzqm8f"; + rev = "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc"; + sha256 = "0xq2s7vwjfxqm5g7k5c3b9cm9j3ngrx8g4dd9qfzq1s9pfkk3i3y"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; @@ -7967,12 +8004,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-09-27"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6e40eec330afdcec051a2fb6d85b92d3a04b6dac"; - sha256 = "03yxbwj3xcbnbi622gfnq4hn9w1isq0rqwrvhi84mxnmpg934win"; + rev = "e9c08d58c13372981815d207c78763e5beac32d4"; + sha256 = "1rcq9gl29l5925ny1vqrfynzri84c0hn2nw8rd01210jilpsp2d8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7991,24 +8028,24 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2023-09-16"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "2752dd199d73342f13a1bd599a99822505e2803f"; - sha256 = "00jmwd8la3cadhy2dzl3gzq8wbgn6xwjb9l35h1w1k161pl5p882"; + rev = "b25537cc5c836f1a485176757da954b775a5b914"; + sha256 = "0vccwqhhsr4qqwf9jkv0pv1s06qf3mxsgzn67lkwimjsg58ksz9p"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-09-26"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "8065976876cea89d0b99ffef4d997b930296f0e8"; - sha256 = "1sk0pf90hib69nyjr5vfr3kqgy0jh400nix6d8yp8qvdw5y1aw4a"; + rev = "6f462a61ce9a5f47743cbf78454bed14a855eb03"; + sha256 = "1zxqd6mjhxw1mcr6n4jgd0jxpz6j0qpcmzlzsgih8xkjn65vdxa3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8028,12 +8065,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2023-03-28"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "4d98c8cc90d970d87c472c04bf7ca712336cc753"; - sha256 = "1wk9s1240f3vlyxi0xy97vkp3xz3r27582knav3zd6wrhqhih25r"; + rev = "18f8126dd8e65b2e21804c9107785af4abbb5bfc"; + sha256 = "0b9s9a3nz0449sl8zzf55xk12hrkksvnrnbc38i1la234xhrfpsw"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -8100,12 +8137,12 @@ final: prev: persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2023-05-22"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "4b8051c01f696d8849a5cb8afa9767be8db16e40"; - sha256 = "1nzsv0rvv1jn6lqjbjrd7zcfnn74ckhng5aya3wb1q1qrnd557v6"; + rev = "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32"; + sha256 = "0817bx2x7pshxxvdp3njq1q19xv84lxga2vdanx9zijfs8pid2y0"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -8196,12 +8233,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-09-12"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9ce85b0f7dcfe5358c0be937ad23e456907d410b"; - sha256 = "0772bqmfkx27b6kfn8x28v8ll0qr2zvdclynansraprrzllsqymk"; + rev = "50012918b2fc8357b87cff2a7f7f0446e47da174"; + sha256 = "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8402,12 +8439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-09-08"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "b349b7e54f5f5543b6104bfbad0e7d09d4f7c564"; - sha256 = "11q0x50ppyrna7bd7x9id3fpxz7rdj6zii3ysnkh7hfzm3hsg7pi"; + rev = "14a80ffab90567e360eb97b19039c4c16913ad79"; + sha256 = "1ak24ydzrak1al1nf6kdfjivlfh03hsyibyf7x1gnzwgm35i1v4a"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8474,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-09-28"; + version = "2023-11-15"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "ece052dbcb2b3d2980f0f9881e41277929813644"; - sha256 = "05rc0mgn3jbp1aiac7531cidpc1s79qi1zhj2l7cz9353cfq0j47"; + rev = "ffb31befabb165812360ba70072e04c2101317d7"; + sha256 = "1a4gwggn131zyiigv7zvpbriqs2f2z7kslds9xpc6rgskd873kkd"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8557,24 +8594,24 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-09-18"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "be6505be8bdd306646bb81399312c02927a60a51"; - sha256 = "1h4hbg5x80anr4imfnlvvmcyqr0jg3s0jkpgzhpzq1783b89sj9s"; + rev = "156532476deb10b1b2a32cb38e1078b3f9951c42"; + sha256 = "03xgyfzb2jsz7788k5h122jskq90irgg0m12csbrb2ysd727pyf8"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2023-09-05"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "f7f7b8a55de10293e2af6002d4da98cbeffc6333"; - sha256 = "12khn5113sijszgmihcblczg4afk34n6wwf0pf3sjj5286ypv2a9"; + rev = "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d"; + sha256 = "0ig2xy0c89n3yl3lbff6sdvqggppjwxiv2pbbi0hy8cckn55mfjz"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -8617,12 +8654,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-09-30"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "35d949df1928b44b6d941fd9015eb3f973845b1f"; - sha256 = "13lcd7wgdfd1hy1jkqbwvkcpyz9caxj9gdrn03ckba5lcbbnf08k"; + rev = "b8d6c0a8762fd374e0204768a94241135ca3e311"; + sha256 = "038h0cygs58i6llps9lm58zgb806r1gvqf88afz8n56248jhkcmx"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8723,6 +8760,18 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; + rustaceanvim = buildNeovimPlugin { + pname = "rustaceanvim"; + version = "2023-11-15"; + src = fetchFromGitHub { + owner = "mrcjkb"; + repo = "rustaceanvim"; + rev = "3f0217642bbcb4179772c2bfd124fb808371be2e"; + sha256 = "0lqvggbrfmf96cz6q2jjdic67m9j7ap65va7j0z4jm2rfndany70"; + }; + meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; + }; + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; @@ -8749,12 +8798,12 @@ final: prev: satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2023-07-31"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "542e856b3a727ce4757250cc00e45332fe146690"; - sha256 = "1sjdgf3q60c80zhd4zqiixkizyy3xxa91v60nkag32lnjqmqx9qv"; + rev = "7911fa8137c77258ba509ba875ea52c6d59737e8"; + sha256 = "1gw2l4m38p3iw0wjcjwiq4cq824hblvqir7jiz5dbhfyc74bbr4k"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8773,12 +8822,12 @@ final: prev: scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2023-09-10"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "01ce40fe7434fba9a122c01b4734479b3860609a"; - sha256 = "10bc32imz72crnzd2fak5n571x0wq7vh9jqpy4q9f9kin2lw497b"; + rev = "cd27af77ad61a7199af5c28d27013fb956eb0e3e"; + sha256 = "1qb64f59qw4rrrxgqavqs7v05v47nr3kr36a3gcvkb2a3ivasp6g"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -8881,12 +8930,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-09-27"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "b0b543285dfefd47eeae93f3f5c812c1dce26ff4"; - sha256 = "09sldl3858nlhm10xzbrd3nigf05ia34n2ml4mqrzmb0zkkzidn6"; + rev = "41378567217097a3d78b624c9f11d29436381e99"; + sha256 = "0dwh7zb8l83d8l63ps6qc5am7r95bnyavz5r8qpxnzgzdic2r5nv"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8954,12 +9003,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-09-12"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "0beb14427dcf2a5d5d63e0064b45032a7bd3e763"; - sha256 = "1jzai9sbq1jhs27gf67ppp4czj21rc18q9dlyb9whjrkiz61dv64"; + rev = "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362"; + sha256 = "0hxy3fv6qp7shwh9wgf20q5i8ba2pzng2dd1dvw27aabibk43ba3"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9002,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2022-08-03"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "aca7863edb34af45830e422393fa95bd7ea77f4b"; - sha256 = "06qgpqrqskpxaxp7cvra3pqra024i2jicqark7dyvcpc9krp02ry"; + rev = "e00e423a5cc4637fdcea79435086736f6ae85182"; + sha256 = "06hviy2f6jawhdcjfhd5hkkjwsj0bnaz5cvmf76chccqr24851cw"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9038,12 +9087,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "17308ee6d9c764bfc1e0fa97213e7a99701b4144"; - sha256 = "1zqdzc31xjmimnmc264zafshxip55kd1cypjbll1pz7h2yc1xr3r"; + rev = "bdce098fc9e7202d3c555e2dc98c755ca1c23835"; + sha256 = "09brv393ccqgvg0xwg55lh6ss5c16qs1as2hrrqh8952c1kqzxig"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -9170,12 +9219,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2023-09-02"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "53962443e4dc557e4d4c02b501adfcb5cd1368c3"; - sha256 = "048ybbfgsb7gz6jx7nkkzq30giqv93bnzicbhsa2g9r1hr9yphx4"; + rev = "8b00772a03c416d23954baeff8a32154bb626293"; + sha256 = "0anb7bh08n4aj6x04v3ys35sl6b4f1lc7026b3pc3i6yjivnq9k8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9195,12 +9244,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-09-25"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "8ea4c4f5caf61ac4ab887fc53eabc916985db881"; - sha256 = "0z6i35gcf4qcy9cgsrg2bg2alh0sk6zxqvid8lgkmds4qgrvhxp3"; + rev = "ffe6b8e975bb2f218cbeb3e785d2f12d9f88b37d"; + sha256 = "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9219,12 +9268,12 @@ final: prev: ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-08-20"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; - sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; + rev = "bb323ba621ac647b4ac5638b47666e3ef3c279e1"; + sha256 = "0w578iy0m0vvfyawjpfpi2yl51acay4alwm3g7pgf8h8rcya3pv8"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9279,12 +9328,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2023-08-27"; + version = "2023-10-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "0944234914438695050eec6f83b4669864680c1a"; - sha256 = "0ia4s68xwjsr9zrn8h48d5bhpcj3qqvcdwak6pwjvg4hxrq7183p"; + rev = "98d02fc90ebd7c4674ec935074d1d09443d49318"; + sha256 = "0ml58i3xfn0nnqci2wh4nqi4y8ydfxbk7px4abkjlym24apbga6y"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -9303,12 +9352,12 @@ final: prev: substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2023-07-20"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "89dbe55cccee36bcb5e2be8c2d92ff8716601734"; - sha256 = "01cwgkgf8kgi4x4flwwfaj4qgafvnzaiixn68im4279rm6m1ic6y"; + rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610"; + sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -9593,24 +9642,24 @@ final: prev: tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; - version = "2023-09-22"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "593c9a6e1d411e276aee3eb459bcdaabb21550e5"; - sha256 = "0hx20j02h753q9jmwhzbddr0bf0z5magc3ayrc3yw8sjvhnqvrhw"; + rev = "90eaf759099bcd47aa0471f974109d7fd78e4eea"; + sha256 = "169m394b5rc6x9sx92ir4p6h4ipclgvmlqmbxhf0phpmzldvgpaj"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-09-08"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "bd5d323581f24ee124b33688287e6a22244c6f2a"; - sha256 = "0bp554glsjfhl1rbz4xfl536g5x962bqw8ss134j3cjpr5q4bf8d"; + rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962"; + sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -9666,24 +9715,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-09-23"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "6e51d0cd6447cf2525412220ff0a2885eef9039c"; - sha256 = "1ksx2w2vaxnjyvj937la3fsiw7z0ary5qjnylxspw0zqp6d2ri9q"; + rev = "da2a20ccaf39ce04b92178711a2db175ec0a87d5"; + sha256 = "1k7sp1xcrr2wlkjrs7aqsnxjf7sp9ra36bpl1rn1dfmjyd949n6r"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-10-01"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "4bdd9bafc7ac2c6fed03e92efac1e6b4632eda28"; - sha256 = "01a4hdgjf3i0qywz45rvzga02hphb2zl5cnpafw0igzb3lrsxqqk"; + rev = "daf59744f60e34cbb48a40a092e9e735553b6f21"; + sha256 = "0mlfnhyz1daxmrfvvqmwpcqpqkl4nd5dqwz4ac539ffaca2mf6zb"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -9763,12 +9812,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-09-11"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "392a883dec9d8ccfb1da3e10d1101ae34e627b97"; - sha256 = "0z2ir6gkr314aq7adiyjr06l876v61dkjf9n804kck5zwlbqyk30"; + rev = "d946dba3dbf71005434aeae5a4aa5589b09649bc"; + sha256 = "1sha737v9ixzf2d336ykvh5kszb5bi2vb4i5ms4ffayf10lhk30g"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -9787,12 +9836,12 @@ final: prev: telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2023-04-27"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30"; - sha256 = "1amcaf182p3b27hx32m6vj1n3nz97qicwx3h51g5jlaf78z6pa8z"; + rev = "5460c6c60d48618c5c746e5b1cad4c3e8262fdae"; + sha256 = "0mj5sg698idk6lsaw6fd56j206vf0djv5sgaszjm4vffgc7666sb"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -9823,12 +9872,12 @@ final: prev: telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2022-04-30"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "62ea5e58c7bbe191297b983a9e7e89420f581369"; - sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw"; + rev = "0fc69ebbf178631b8ab76745459fade062156ec5"; + sha256 = "16ri6gxy4pgjf2rxxnd6p0i1ibaz08sd31n2v40n6y84is2nywrd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -9847,12 +9896,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2023-06-03"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "3dec002ea3e7952071d26fbb5d01e2038a58a554"; - sha256 = "1331qgsfxy1qsvxlkss2g713qlj2ri02ywbhiwwy5cyl8bc0rl76"; + rev = "13c33c173e53f14df7eec5155c52a3d2ab022d8d"; + sha256 = "0bc3c447491pbp6l20gn4kwd9n7wm4ayac0imsvswpmnvlrh0ibn"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -9908,12 +9957,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-09-29"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ffe90fac32122f401429b14d383137bd92a685d0"; - sha256 = "1wf2kq3pv98fzy12hv19jg80r9phr96j2x5qvzbqfagglc1zb3jf"; + rev = "721cdcae134eb5c564cb6c9df6c317c3854528ad"; + sha256 = "12kizqyhknpp4931n2fkbdxhb04afpcnxyw6s4z7mf1vsfjz39w2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9956,24 +10005,24 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2023-07-30"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "929c45441adc5798d382caa50f4e5158e2097765"; - sha256 = "0ggr9rg10r7hrai9rz89sa301z9pib0g6mav6byrxfnw1kww16xy"; + rev = "aa3369a562b816ff0cec4fa6eddc9c32ac472710"; + sha256 = "07fd9xqg2ykqnsqb9w6jqypzzl8klih5d67gi42jdawj3n4ijvcs"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; terminus = buildVimPlugin { pname = "terminus"; - version = "2021-12-28"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "wincent"; repo = "terminus"; - rev = "12b07e390ea6346c91cd82edb0fa9b967164c38d"; - sha256 = "1s964165x466hjcd3ykfd38jaqh274yygnfw34a66rhgjvhmfzmi"; + rev = "51350e786d4bfcfc476abb015a3f90db3f81231f"; + sha256 = "0lvz87y22dc4jd6982r0k2d0bgyfwwjmcrcim78vvy6ymi58gmgw"; }; meta.homepage = "https://github.com/wincent/terminus/"; }; @@ -10016,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-09-03"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "0a8ef564493a850b7646c57d55682e2ba19e50ad"; - sha256 = "184y9s384k5y10j5jr02jykh6h1d5g2wihfflzds1q98ip46zk2j"; + rev = "acd6178ffcf728c82036c7064630ff40f4c9ae82"; + sha256 = "03r9znnrgvc374k71wzjyr69ifpmbgpwx9n8xmrv3f0w6kmfa1y1"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10100,12 +10149,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2023-09-06"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "673782b74a6055d430d3f5148a033edd99e5519f"; - sha256 = "0q3942mzp54jjkv3f1aazbnlwmqz3jxvd1jlfgfbk2jpk008r5xg"; + rev = "ea67d59721eb7e12144ce2963452e869bfd60526"; + sha256 = "020prdsczz2vc5cdb6075fdy1fj5zhvjcirfc46kfp5bahzfarzz"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10124,12 +10173,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2023-07-28"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "3094ead8edfa9040de2421deddec55d3762f64d1"; - sha256 = "0qmx94fq1pllwnwzav87fi3v9d64sm8ggv9jgs19flr6r8kh0vs2"; + rev = "4a6737a8d70fe1ac55c64dfa47fcb189ca431872"; + sha256 = "1wf19rahk713qv834gpaw18w8a4ydl44m6jz6l933ns89q1kakk7"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -10149,24 +10198,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-09-25"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "61e8ad370d4da5d84c77e31671027bc094ac06ca"; - sha256 = "0cwqlaqvbnw4ncm717v052mzb943jcynrfpx38c8aspzjqybdcpj"; + rev = "c80844fd52ba76f48fabf83e2b9f9b93273f418d"; + sha256 = "19rbq39m7c1v9yrfmlwmfmxgv5d9bwcjbgjdp3cin409fnl4rv6b"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-09-28"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "e89caa3ad6d8da9d0dd981ec74a82c55adc61ffd"; - sha256 = "11r0vd7yzmlim6r48nby0zm508fxfcmhcm7fz7alhwb480h7s22a"; + rev = "f247ee700b569ed43f39320413a13ba9b0aef0db"; + sha256 = "0wyz1dcm92dc83rz3hy8a0m47yy5lmpk0pwiycpn5yc8jdaxj63b"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10197,12 +10246,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2023-09-28"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "81d0ae51b84143e228d27b6cf79d09012d2021cb"; - sha256 = "0pk3zvz982gfdfwz4a1c8zr9ilqsip42l8bfc0vmnd7gc1r096w8"; + rev = "1d6e89f4790aa04eaae38fa9460a3ee191961c96"; + sha256 = "1f7zrzv0f2di1vkavgyqa80mx686rii0gsygl8rs3qrr9bc17zd5"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10221,24 +10270,24 @@ final: prev: trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2023-03-22"; + version = "2023-10-12"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e"; - sha256 = "1r4p93siid35q1r9kj8cgyin6i8zg033ifvamf19052mpnwli824"; + rev = "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7"; + sha256 = "1qm4n2biqqiwa0jqf60al969nz135i5pgn2pk123lxprb9q49wq5"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2023-08-30"; + version = "2023-10-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "3f85d8ed30e97ceeddbbcf80224245d347053711"; - sha256 = "0l1mf8mpf2q2wk983baj75hy30dm7hwncbfazrnimycqdyarxn6x"; + rev = "f1168feada93c0154ede4d1fe9183bf69bac54ea"; + sha256 = "0n5xi4bxfaizwjny5dv0k7zqc3gl60d5g1mkcdbfnq4y5f3f0wpj"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -10269,12 +10318,12 @@ final: prev: tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; - version = "2022-04-12"; + version = "2023-10-03"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "8f6e2464171c5367867959093aa4b9c99b636a57"; - sha256 = "1h8gw0nlwd31yx6xd67c0bw4bw71rxpldlvmnfp8cxnpjiav3zkj"; + rev = "e1afca562d46907bf63270157c88b7ec8f66e46b"; + sha256 = "0viwjg5vp66xh4lv6iah3w3pdqh5wjd0yqs8h76rxmf83skb5vhk"; }; meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; @@ -10291,14 +10340,26 @@ final: prev: meta.homepage = "https://github.com/folke/twilight.nvim/"; }; + typescript-tools-nvim = buildVimPlugin { + pname = "typescript-tools.nvim"; + version = "2023-10-19"; + src = fetchFromGitHub { + owner = "pmizio"; + repo = "typescript-tools.nvim"; + rev = "102ba313f87e1f9f9864f681dd7779cac8f6d3ea"; + sha256 = "1sadhwdwcdb5qibp4xsw1g3skfgyq6rv86cmlb15ys6r4dv0lyws"; + }; + meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; + }; + typescript-vim = buildVimPlugin { pname = "typescript-vim"; - version = "2023-05-11"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "31ede5ad905ce4159a5e285073a391daa3bf83fa"; - sha256 = "0225jg2b3hswfq35cnnwv0m7w3ibakaly4s9ya2lq9vabsp9dgar"; + rev = "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3"; + sha256 = "1ybc0ppr6xqx5ahg56xfcrs2v0h9dnsblqmgvx5xbz41lirh51h0"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -10317,36 +10378,36 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-09-19"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "65f9e78c11829a643d1539f3481c0ff875c83603"; - sha256 = "1q5v37l4awz5pm8cqvbvvwjizf45m7nqnxqv0inxzr70g9gqp7qv"; + rev = "e72561f0023860eb83bd7680573b05ecfc016c55"; + sha256 = "1i9ydjr9fzhwxf55451p4i0l4mnflp9gziyxz7z5w06qa1ya7cvd"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-09-25"; + version = "2023-10-17"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "f6d1501b630cb783b0af8507c5588328f826d40f"; - sha256 = "0h0rcqrfk4r48phlsb8nhvxb89vm9820lhbmkqvk1bqkjblsv279"; + rev = "b393ba65386d47664421e1f8b246a87a6e8b218c"; + sha256 = "1g6r2nd3nplilgp6fj012smlhs857kn10mb8qab2phh2ja1r25c7"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPlugin { pname = "undotree"; - version = "2023-07-07"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "0e11ba7325efbbb3f3bebe06213afa3e7ec75131"; - sha256 = "15x5vsvvnr3sa78mh3gq0vagjcf3qv53b9hpni368p4m0f9a47b8"; + rev = "36ff7abb6b60980338344982ad4cdf03f7961ecd"; + sha256 = "1rjz58ggkrz0pfrbiq93p2zq4bif2m7rjn9jj8hbqikmp8g7h19g"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10365,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-09-29"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "5fa80db737fa357d9f9f14a36cdc10cbb1cb7651"; - sha256 = "1001rbbwhfbb26ji36kpkc3ji1gsgf3xmlr990bxv8wh33qib2rf"; + rev = "68d6f93d3bdd3663aee6ec7e16fee4eedc6df26b"; + sha256 = "1kb2dnd5jcwig3yjajjwznmb47llrl5y5jmd33nkdrrmvckb6l0z"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10389,12 +10450,12 @@ final: prev: urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2023-09-19"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "bdbdf1e020e283551f003e71b0004096c746ef57"; - sha256 = "1bf226s400vyjffr6zqx9kr52qznzcgx1jnh356vfx3fjxsq81nl"; + rev = "7d622e11adbc2cac5bba62345ade9b6672d564a4"; + sha256 = "1cqzvbglqjy4563p4q08lsy3yhbsvn8i2davjlgplxvnvb76i68d"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -10437,12 +10498,12 @@ final: prev: venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2022-11-22"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "c114563960b8fb1197695d42798d1f3e7190b798"; - sha256 = "02fcn8h0k750vw8a4pibc3cvy02pbv25c8b01davhcill98nmkia"; + rev = "e4d68341a73dd56c64955058821a58295fb337b1"; + sha256 = "181sr7p8qn67br64ahg5vhb9b7m9mldwlg27nsgs0hc33vagvr1h"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -10461,12 +10522,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-08-24"; + version = "2023-11-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; - sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; + rev = "1d242f09a4e8cd20589a3cf48f0ac3830246f14d"; + sha256 = "126319l699a16b862y33a03zlpzbackbvn6d4brnabbmanisd56n"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10653,12 +10714,12 @@ final: prev: vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; - version = "2023-02-13"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "be43aaaa70cf7c08c93f66051612d24de4c9daf8"; - sha256 = "10gsrs69gcjvjcn4hjrqlpsnlqm67gygzlzld6c3cbav1gfbsq08"; + rev = "6b194728345dcd3e5eae9ee1f30e03c09c254d7f"; + sha256 = "11z1654h1pgndrykwjzll0f95pk9sx5cqad5dqpmfx66msxm9pff"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -10797,24 +10858,24 @@ final: prev: vim-agda = buildVimPlugin { pname = "vim-agda"; - version = "2022-03-01"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "msuperdock"; repo = "vim-agda"; - rev = "1695060850b5991e8aded0861fae0c31877950a7"; - sha256 = "0mr21s3x2c7qxay3a92iwhwwyir97s6g3vz8r3m40zxm91xdm7y6"; + rev = "36d6b9f2fd8b2bdc9cd70fad74298db09b694a57"; + sha256 = "149250pc0y44zqi1ya7kmkk0q4q78zmhpb7vannm4rk990sj0xjq"; }; meta.homepage = "https://github.com/msuperdock/vim-agda/"; }; vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2023-07-19"; + version = "2023-10-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "e6bb8427dc2d2dc3583ed1bf5ff6a9682c854d32"; - sha256 = "0sbhpp8w1rdrh386j3q4n2zrwq1ipxb9107ddwlgs89nh5wbf4qv"; + rev = "3b9e149e19ed58dee66e4842626751e329e1bd96"; + sha256 = "03jycan9s1r02hg7irscd4kr094vhk555znqj1a4is3b7i6iwrbk"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -10929,12 +10990,12 @@ final: prev: vim-astro = buildVimPlugin { pname = "vim-astro"; - version = "2022-08-25"; + version = "2023-10-21"; src = fetchFromGitHub { owner = "wuelnerdotexe"; repo = "vim-astro"; - rev = "34732be5e9a5c28c2409f4490edf92d46d8b55a9"; - sha256 = "1ild33hxiphj0z8b4kpcad4rai7q7jd0lsmhpa30kfgmyj5kh90z"; + rev = "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1"; + sha256 = "1zx5dfmzd2bkj7widq89n5dxlqz8ixxr8pcyaafi09590j3kf15z"; }; meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; }; @@ -11301,12 +11362,12 @@ final: prev: vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; - version = "2023-07-18"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904"; - sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0"; + rev = "8def3d890b2087ee4c42af03117d7edc7d693706"; + sha256 = "129mrz3jxw4kgbg5lz9gc7rznsjp2fbjvi60zyrpkmv8xa6yhmpw"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -11517,24 +11578,24 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-05-22"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "7d80bbd11c407a09e0f7b869c38f3dec3902805f"; - sha256 = "12aawycg41vi1jznnf8ln2qwflsa63cmlzkxrxj8mbvfjlckq26x"; + rev = "fecf5a3ecfb1869f34252c7c27351de99f01ab0e"; + sha256 = "18s05nvhfx56hqjg59ypvzrk7jm70c1yazic01i9pjznv5fpcnrg"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2023-04-25"; + version = "2023-10-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "fc7321a17f4c55db11fae89a884ddf4724020bae"; - sha256 = "1y3yx8zzlca47b3yswsyj3z9zx43xnx6nrvxjabm6wxl2dhgxhqw"; + rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569"; + sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -11625,12 +11686,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2023-06-18"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "bbf53b30ca1e718625b9b84b1d32379e470ddad7"; - sha256 = "1pg1w587lkj0vx1qcf7916928jm72c5j0jjj9804bdxdwixygyza"; + rev = "babbf69f7bb5274f0461e04a59d3e059bee27314"; + sha256 = "1j38m972z5qca8rl5i0w8rhvv1r2ipqvajh07b006dn8smaz33zs"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -11985,12 +12046,12 @@ final: prev: vim-flake8 = buildVimPlugin { pname = "vim-flake8"; - version = "2023-09-20"; + version = "2023-10-04"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "fe47074aa4228b460ebc0d4b159345f886babbd9"; - sha256 = "1zb88dsb1m29cav42i95xz1h0f8zpx5p1snrlm7769fqx9gdyzcq"; + rev = "a245098a174f30feff1b4387526876975042084a"; + sha256 = "1js26bxfl7csdffrwc0b3wwal81w18fznw6dnks40wr3iv62y2jd"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -12009,24 +12070,24 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-09-02"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd"; - sha256 = "184nd73bw19vrf5avx345fcnlf8jbvbfnykjsa1xgj9q1wxrxprl"; + rev = "b1d93789faf8bfe1f3e17eec03b8312c2939fcf2"; + sha256 = "11rykxacg9qlwyf0j4p6w8qqjr5yi1inmghyb4mvd5d0zp61p5w0"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2023-09-02"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "58c1d39ec42f92d23a1204b1869e5d1dece8b86c"; - sha256 = "11nbfrl8wpiy2cw1idc5dv41vkww065v9kv9iyvpp2nrrj0hrpl3"; + rev = "b6aa1cadbad4ac88f740d1d435aeec754ab3a9c7"; + sha256 = "09bnqgx3iissighkr01xsi9q5rl4753qcy4y9nirimzidzqw61f1"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -12081,12 +12142,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-09-18"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "99db68d9b3304580bd383da7aaee05c7a954a344"; - sha256 = "04c5zip3rll58zswjmns42g4wl69s7gbq7qja4w8q4p7phgb5l5w"; + rev = "46eaf8918b347906789df296143117774e827616"; + sha256 = "1xqznxw6f0arrvb4i5m2y3pkxy0lg5dimkzgm8rwci47w2r7rb3g"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12189,12 +12250,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2023-09-01"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f7b97666ae36c7b3f262f3190dbcd7033845d985"; - sha256 = "0qwp99ip17r1jf05w974ygbz1d9s69fpckwaccpbg7v3jgh973vm"; + rev = "fe0e8a2630eef548e4122096e4e2241f42208fe3"; + sha256 = "1lzhkqr74z430zm61jy4hmrxv3nq89rhrpzlp8fj9vwfkbqpzrgm"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -12237,12 +12298,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-09-04"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a2e59981a2d965bed9f4052fa15a08d2ee2f8040"; - sha256 = "0wa6s45lkcphamkhgjlxmryx9wqgi6qzri0mqymkpzcsplgyqc9w"; + rev = "1401b576c6ac382529188d3d26cff866139f2f9a"; + sha256 = "1i6k7i3dqzx825vhp1y2i7ca1i0y8bclkj13vnwws6drw3q9gbrg"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12550,12 +12611,12 @@ final: prev: vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-09-26"; + version = "2023-10-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; - sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; + rev = "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86"; + sha256 = "0x3li63dijw9z4imbajpxbrclw32649810bsnx5cawrqgbc7kl99"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -12815,12 +12876,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-08-02"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "927b41825b9cd07a40fc15b4c68635c4b36fa923"; - sha256 = "11j6l136rskm19p19mjxvws5yp99s3d5h7mg3wq3mka18mcmhv06"; + rev = "8fa4691bc3b593b6deaf885a3af80aafb12f338b"; + sha256 = "0gic7vfd3jbz5pwn0cchhx4xs05vil590mc90kfkvf97ksr94965"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -12899,12 +12960,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2023-02-23"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "8e735f84d2d954229ee65f4dc71bfc0bec897d98"; - sha256 = "09dl9i2y5drvgnvbid075w5sd0ad7ry1p1am2bfgykjcs1pz3jp1"; + rev = "281346a221434574dd7f8767a352b2bf0b218b74"; + sha256 = "0fa5b41qlall8z2pziwgc43sj24kpavrhdz9amwwsiv2g9wl5cli"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -13031,12 +13092,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-09-09"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7233bb2ec07506b6a6e57dfe4541f1c4e5647fd2"; - sha256 = "0h0qg61zixfl26czgaxklx7hdkkia2cc83xvv80ipyr1rva2crwh"; + rev = "ee2bb88833766ed184a77d4caa1e43d0821eaeb2"; + sha256 = "1bq745cx1ybzi84zjm6lj3mzy4bz5id5fs07jkvipakdpp44bxsa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13067,12 +13128,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-09-17"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "7613a3f702ae7ff2794b659a9769494203f5cb67"; - sha256 = "0fa56dn9jmqz0hwd2jjc9g4j0rqyw5d5v64vzs8lq6r52fvzcm6j"; + rev = "3d99f09affd1ea6b9289949d5b282c43fe21eab8"; + sha256 = "08983vwgcaz2ydl4pf5nlzjli7aa88bmdp3m56519ihfhj2s1s22"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13151,12 +13212,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-09-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "4e9b4deda11d05a157ab34e97f76089669b5b7af"; - sha256 = "027i9y3f0dh6m3fw4fr7jd3pichbs9004c5hqm4i2fz82vb35smm"; + rev = "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a"; + sha256 = "06kkknpmj4ylx13f3rmfsz9f3psq637dp71lda00g1v7r6w86wbp"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -13188,12 +13249,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-09-02"; + version = "2023-11-05"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "6dbe108230c7dbbf00555b7d4d9f6a891837ef07"; - sha256 = "1c0rkdr0pjrrplvr5adnb0q9vkq11kr7m5mvlggm633g45khjw5l"; + rev = "d30b72d20f01478a8486f15a57c89fe3177373db"; + sha256 = "0zlficdwybcz8mvzv70vp4mkzrwpmvp3v0dq88fyimyajyxi1aqp"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13296,24 +13357,24 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-09-12"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "c112e2d574dc6f1122a919d595f9b0d3bc5dc3ec"; - sha256 = "1q28hqbybdpqwx0i5w5zywxalyf31ljjqi9ym4z5w91qsqx6xp08"; + rev = "247324e0170e19de0018e7c8e437f83b6f0ef6fc"; + sha256 = "0l3rlah48969kkz2r6xl9r8plg7n4an1pk5cy92ly94x6yw5awkm"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; vim-move = buildVimPlugin { pname = "vim-move"; - version = "2023-05-11"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "244a2908ffbca3d09529b3ec24c2c090f489f401"; - sha256 = "1kd0bwzmsa8c6imr69a5z5dk5hm2ipnf1wf5j0wd4sz4yfjxzfa3"; + rev = "3c4195de0748da9bba25c54d78d959d349e93c55"; + sha256 = "021xv4q95ib9fhm0c7pzrpx56n66kq3n3nkyy57k59b1ryf6bigm"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -13596,12 +13657,12 @@ final: prev: vim-orgmode = buildVimPlugin { pname = "vim-orgmode"; - version = "2022-12-09"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "b27feaba9a316e8307cfd7a56797b378fb52df83"; - sha256 = "0b2y49ylbrp1i5r5abznziv1n43d063mib07v4ila0873k7fzir6"; + rev = "83982349e45e6d27d186ad82050f86c3233a16f0"; + sha256 = "1gw9x3lf379kpscb47vg14cmfspcj04kif6q38xvd5szkw8mq50f"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -13632,12 +13693,12 @@ final: prev: vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; - version = "2023-07-01"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "74f5ed963d6dc9dc25db212078300fca6b0a0b4d"; - sha256 = "1j3dyalzy73sckad175y81sifnv65vyhlysxjllbaikafgc0k2sm"; + rev = "7250d51bda669ce1d7f334f2f5e6be012daddcde"; + sha256 = "1ci3z82d20w24vipcpq1z20i6icy7nv7mkdxsk2ly7llr7xwa72w"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -13680,12 +13741,12 @@ final: prev: vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2023-02-24"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "d4fc6f8234c37eef16b6de8055c5fe53b7d7316a"; - sha256 = "03papfmlyrn410c7dflwbxinwymlvizdmwvyvrg24gdxc5vvp24q"; + rev = "84ff781925a28346df99d3764ec697c3088862a7"; + sha256 = "09lswvc5s97brx6iimkbqslmsmbb19nz0s6w0hpss8vf0fy38a8l"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -13872,12 +13933,12 @@ final: prev: vim-prettier = buildVimPlugin { pname = "vim-prettier"; - version = "2021-11-24"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; - rev = "5e6cca21e12587c02e32a06bf423519eb1e9f1b2"; - sha256 = "0sf23h1d15sqcfx1zsscvvczw8bbc7pravfw72mfrf5n6xfiaqal"; + rev = "7dbdbb12c50a9f4ba72390cce2846248e4368fd0"; + sha256 = "1hmb0pq7skqwz722nc36095z9lg3bbqxqdnnjq50wxc2hdfhix75"; }; meta.homepage = "https://github.com/prettier/vim-prettier/"; }; @@ -13932,12 +13993,12 @@ final: prev: vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "2023-08-08"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "3099aaea29b072525b2b387ef0375079da3cc1ed"; - sha256 = "1yd0kgjgv8gjp5dnk3r2pgi4b4cbk1d8zy52ayh2lzspxfhihphy"; + rev = "a79ac2677c5f7ee766454b6c30f21bc033049037"; + sha256 = "0rvimllhz91yykwqgl1ffxc19c4dds4q17wa4ip0zv7y7fydhzvf"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -13956,12 +14017,12 @@ final: prev: vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-01-11"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "502590f90a21f0de2b7664d6d0dcc90e5bb28a9c"; - sha256 = "0v335bgbf1a6ry8dvphfqwmlhlz8x94cj4x6z7ssz16hpasrlhx6"; + rev = "7d0c8581e774cab8198bafa936e231b6f4c634e6"; + sha256 = "07ac71a09qcl1flavkwazd4df6n8v56cqj3phff3f12p5sfkmy1y"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -14160,12 +14221,12 @@ final: prev: vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "2023-09-15"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "88f29671b776fff56e5ee554becf34dd2ee1975c"; - sha256 = "1166568yvm54mlinbcxldb0f81c6x8pxsn471phh0n6kh6x9g8nk"; + rev = "f06f069ce67bdda6f2cd408f8859cdf031e5b6b4"; + sha256 = "08jkb840z1li8vbrbvigxffl5d84bl61cnm8xb2k59ic3l7ia96g"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -14232,12 +14293,12 @@ final: prev: vim-scriptease = buildVimPlugin { pname = "vim-scriptease"; - version = "2022-05-30"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "18511d389675d773994215ddb572ccdc2b72f52b"; - sha256 = "1mzs4x6y68akysbibprfif1dksaafhcyhddkcyh3da6by6sp5l0l"; + rev = "cdb5981d47ac98221a408ae2e7cae66524d9e872"; + sha256 = "1f5y96lkbj8zfm6lc3izynb4dz914vli2yqpn1gw9y3llj43n5bn"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -14376,12 +14437,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-09-29"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "3c523dd9d12f96703d07fa35e75d1afe45eecd96"; - sha256 = "0j9db2lvlzizhxf5arg3rfb1cxdsnqa3f8ri7afpl9n2zsa5prp0"; + rev = "ce6ffa7d5f3d5faf739c07c0409b5e2035c279cc"; + sha256 = "04w9ybcfc4cyb5ipp8ccpr35r4ja45xasgn149bkqxv747j9hvhp"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14484,12 +14545,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-09-11"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d"; - sha256 = "19k2bl2w5z5yvjfgp7wfr9s7zvdj3ak1393q09lv2k11j57f90pm"; + rev = "b039190177d97a968d80518470910aae7faf182a"; + sha256 = "18yanygh3an4vak8zdj242pvqf557pg7ybfcnzrl0052vr7s3pf8"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14676,12 +14737,12 @@ final: prev: vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; - version = "2022-10-20"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "9555a3e6e5bcf285ec181b7fc983eea90500feb4"; - sha256 = "0pzqk8h3h4z4dbgaxla76wlc1fzxk9cbw3xcwjpjgvbgxplg565s"; + rev = "4ff8de2ac93431ee6d85a9e04177012752e6abdc"; + sha256 = "0wpdh17chadai08kbvd1gkfyzv5b64l4nwbj80jgsig5p4qqz3pj"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -14736,12 +14797,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2023-04-26"; + version = "2023-10-02"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "2bbc5f65a80c79a5110494a2ba1b869075fcf7a0"; - sha256 = "0k79q0703ngknrxm4mnhg1qvgkfh2ga7sli6krkx1hd9ikb4p5qp"; + rev = "d37ae7e7828aa167877e338dea5d4e1653ed3eb1"; + sha256 = "0630s7jaadd6ndkkj49k3ivink2vkajh0cjx30dw1ip6md360sjh"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -14761,12 +14822,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-09-30"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "53c6c72f3a0c6a24a74e659eaa769d7057ef2ecd"; - sha256 = "0y36ckap8z07b3ayj53l9drz1m4wrg0fd12q8p0cyhhghf0g8s2i"; + rev = "6d054a713d601291c01c42197796644cf00ca9f2"; + sha256 = "0lf82ka9x1fkgczqxkbvlqygp6glcn1baq8ix0y60jn3kqccpm4s"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14857,12 +14918,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2021-12-03"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "737e5444713ba53a9dcfbe3b962239bd0bd9162e"; - sha256 = "0wj3v45p7pxm7f4pdzdbvy78vhq57jki0ldgfb3229hb101k1sgh"; + rev = "77b37bef259b9979e15fd7fdaf659cc167487f21"; + sha256 = "1xskpb8ah9p5qw5vljc12zq7alm95xjhlcy78jhahb48nkf2b39l"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -14941,12 +15002,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2023-09-10"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "2889cbdbe756324e1e21716a34b3d36b058f959e"; - sha256 = "105zmflfvqf6wllm26gwnh7am3g98aywq1d034lpr1c7zm5ln0pv"; + rev = "bff212497e0873ef7c97bd1e3d59cf57d6627581"; + sha256 = "1zpn2l7lzi03glmficfs1jwk7d9c5jn2pp63m818h8810dhicalr"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15085,12 +15146,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2022-09-14"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "724bd53adfbaf32e129b001658b45d4c5c29ca1a"; - sha256 = "0dhxyhclhsh3qrbvl18hxnif76k1bnyi5r7ry9p1cdcmyswa1bay"; + rev = "aec289a9fdabaa0ee6087d044d75b32e12084344"; + sha256 = "04i20r65pqmmspg8bpdlhmjymw8s4qahcyb99yjmj85ysz5lsph6"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15133,12 +15194,12 @@ final: prev: vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; - version = "2023-09-15"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "be277461265f1e5c7db470aa479f30956597ea9e"; - sha256 = "0fiqz7qrcsla2ms5lfw0w8f6ysa5wivnhjn9463i00vasg19mcqi"; + rev = "8eebdf6ab4a880d845893f210fd20516d2e2384f"; + sha256 = "10aadjkisfsx4avylblp7zb97ikaay249fzw3f43xgknlajg35dg"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -15169,24 +15230,24 @@ final: prev: vim-vue-plugin = buildVimPlugin { pname = "vim-vue-plugin"; - version = "2023-02-02"; + version = "2023-10-05"; src = fetchFromGitHub { owner = "leafOfTree"; repo = "vim-vue-plugin"; - rev = "58ac69b2c8a98a9bd2a95fbaa7b5f0fe806bad0f"; - sha256 = "0x8a66r1wlyashyqxmdpz3wnqhgfmscs42m2r82g5ic6a7n6f36l"; + rev = "04c3fb20ed5096a983f71af204afba07cdfa6d6f"; + sha256 = "1cs77gyzvvcrlvvf31ilqzdp5qgzwbdksprn48n2jrdbi3dfl5pp"; }; meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; }; vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-08-16"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "0d2efa2daff34b27b0d227d4c3b136811c93db93"; - sha256 = "05d2lr6g7ijlxlv9r5szimdpnifa0mb2fidpls9lp8zzvaj2gafk"; + rev = "3c6c5bf17f4ae6c53396667ce3405df02a80b894"; + sha256 = "0n8db9y20fmm4zngmhpnr3pcpjrm78071mmq96wx1nfgn544hsld"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15325,12 +15386,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2023-08-17"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "067362349ab701ae945285a4797918ed7a649575"; - sha256 = "13l4632nhzwb4afh16f6rdq9wxsffh25c08d452y7mrx9zrmp64c"; + rev = "5c23544a89ef5a820d3744e4bccbcfbeed3cc9be"; + sha256 = "0bpwgrml3yaszh39nkf3zxk4q4djjjlhyb8xjyikn1a4yvl0fs0y"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -15361,12 +15422,12 @@ final: prev: vim_current_word = buildVimPlugin { pname = "vim_current_word"; - version = "2023-05-23"; + version = "2023-11-09"; src = fetchFromGitHub { owner = "dominikduda"; repo = "vim_current_word"; - rev = "52dddbcba60f7276cf66fa0b799ef18b0145569a"; - sha256 = "1fmas87r8kq9g4mzpf4jsjh09dfpfp0c110z1b47bhhi1xmy73zs"; + rev = "967c73804e38e5b2ceaa536328a4f76f1157a482"; + sha256 = "0wsssqw2nbd1nl804wp0iqhhf51fw4fv67s1g4pl3vpgrl8rh5l9"; }; meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; @@ -15493,12 +15554,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-09-25"; + version = "2023-11-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "162a176f217616bac51ab1eb3b018b6e15b02e3a"; - sha256 = "1afnmrh9vp1zxsyn6w81pqmsnqd49vvipd80hsy8pxpzj4lpca9n"; + rev = "66617adda22d29c60ec2ee9bcb854329352ada80"; + sha256 = "01sxg72xbvakdzc73ilkziyl8vl5qxkahfb293vlhy37hx3gbbzi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15506,12 +15567,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-09-28"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7d453a61b0256337f341a1195ca9eb3f3890a7df"; - sha256 = "0yk9zmcyl3mbfr5m1vs9w593irc78a9xwsn048qf7bpkwwmp1b0h"; + rev = "a630f0f75d9468d10c9125f2f1b0049e479c2f54"; + sha256 = "0f1p93jmhfp6fvl29v58rgwcvqa5lh1ks44w7gp6yh2w0i78s200"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15530,12 +15591,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2023-07-31"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "f0fe154ede6b11e3db9b058b930005a056a3d1c6"; - sha256 = "1bkhlvr9y22wdl3cgwcfw591d4d0n7hsmfp2y7az4qjnxbk9pkf4"; + rev = "0bb1b4945bb205a076a35b66174e5d66be8eaafe"; + sha256 = "1vymahgvlgx864f4hwfy1ahpg1py095qz4n2dcj152z3hl7rkd4l"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15626,12 +15687,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2023-07-28"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "7ccf476ebe0445a741b64e36c78a682c1c6118b7"; - sha256 = "173gxysxw68xnfmkx468cz4g5lw5vz9sg8lj1wdz27wyvlfq8pq7"; + rev = "4433e5ec9a507e5097571ed55c02ea9658fb268a"; + sha256 = "1inm7szfhji6l9k4khq9fvddbwj348gilgbd6b8nlygd7wz23y5s"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -15770,12 +15831,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2023-09-23"; + version = "2023-10-08"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb"; - sha256 = "1wsvy0j3zgd34ssbnajih8sx12666v0yywp7vr6bijz0hc4mlihs"; + rev = "696febba72939cf9082e0fd9cb9c603254cfa8a6"; + sha256 = "0dqygl72ln9x572a6q3dii9cqnjgfb7l70iw9vifjpv8vsyak20x"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -15867,24 +15928,24 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2023-05-22"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "68f554702de63f4b7b6b6d4bcb10178f41a0acc7"; - sha256 = "0apv5xjihr58h7r4c4wfaswvc3ykw50zk36g0nkk1nymwlflkgh7"; + rev = "50e2e2a36cc97847d9ab3b1a3555ba2ef6839b50"; + sha256 = "1xmc17cmjiyg9j0d3kmfa43npczqbhhfcnillc2ff5ai9dz4pm7s"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2023-08-30"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "491b8a79e0547e181c7c6fb054d778fd595f068c"; - sha256 = "1p8fakdby43sk3l54dszib5sf6h58mcmvdd3zvwjxn16diqjd6jd"; + rev = "510d12c088ed45a410371c63ebd62ffb54c1615f"; + sha256 = "1pr1qvd7fdhza3rijs0jg0byi7z82hpzsw1qvqgrz527vk0vgci0"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -15915,24 +15976,24 @@ final: prev: zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-09-27"; + version = "2023-10-10"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "a34fb9850a56bb1f1e62bb5cfd0641c8baaeb3f9"; - sha256 = "0zgd892b8z8blbs7z29qwwkvp43633iri9jf5rin9bgicj412cg9"; + rev = "54c216e5306a5c3878a60596aacb94dca8652ab9"; + sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2023-09-30"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "e9e5e21dbeacd0e753728c7ea45b7a7582d9080a"; - sha256 = "0ycx8ad6a9xyc2i4gzjccbl5pzvg1y7rqhpxf4mys5vh5j7iisvv"; + rev = "142625638d2fad464939c6ee1775571aba6379c6"; + sha256 = "1aha78jjpfrmlji5lnzzylycqvm84g9qqjmbs9ynn84yfl2brd8f"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -15951,24 +16012,24 @@ final: prev: zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; - version = "2023-05-21"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "cc5b702cacbcbb4192b2a619c0f9cf6ab6e76936"; - sha256 = "0dc1mg9x8flda59vl8d89m1ri1n0jl72q4jhmxj7mg9gp2r39l3m"; + rev = "b1e70b6fc1682a83929aee63680d2b43456fe9a5"; + sha256 = "025rqfs0n2ryi7xwzpq5h2r7jhvxbrb2gjp6fqa072hapgqr0igb"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-09-30"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "7a4bcdadafc59a5bedbd866c643fa486d8cca4a1"; - sha256 = "0v8syhgyvl4zs484dycz65qrclds2cd6f9ja85xy4gzfhisnc6s3"; + rev = "cc717acba29259d578548973c41448b092453c52"; + sha256 = "1jbyvd5w06hppwpvjm2sd01qz3phw7ds5n7w220x8r2vslpmm25l"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15987,12 +16048,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2023-08-30"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b2cc39273abbb6b38a3d173d2a5d8c2d1c79fc19"; - sha256 = "1fcggi03mh0rq1akr9a76mfycm6i34yihhkqmxzgbf63q4v90qrd"; + rev = "6495b4ff40479ec7705addb4ea800ec308026648"; + sha256 = "116gnd891v3rqaxk2dki1ril6j2y7f6vcdh421i0xwnvbj91pfc6"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -16035,12 +16096,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-10-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "60d7e7749c21dec4e77c70672c3882dc5653d02c"; - sha256 = "1z8d6i81n2j8ynfpa8gvlw27svjgv4rxs1ham4rl90vraryqgpl1"; + rev = "06ad2689ebd251a71c6caeb9fb47e231773c9b47"; + sha256 = "0qv838nws43rdyyl16l8jlnldm4cdyghpl6ylpw2h1php2bd4527"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16059,12 +16120,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-09-13"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "6c22f52568c4ab080a6676f7bb6515f0076e6567"; - sha256 = "1x7wbh4v5a4scxvdqvi86ql0z9kygw4fg3v7by0r2bcgqy9rxbcy"; + rev = "e89e67da3237d965ab10230de30071d1fdcf0b02"; + sha256 = "067w9rsp9srckxb4fyghy73cx50p5xg00l1x2fj4nsahv05bigkr"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -16095,12 +16156,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2023-07-28"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "e29002cbee4854a9c8c4b148d8a52fae3176070f"; - sha256 = "19gndx91dj3c76zbidlk4gjgjw0qkpv4x0ws6f1fsga9b9gplf3g"; + rev = "92762f4fa2144c05db760ea254f4c399a56a7ef5"; + sha256 = "1v65jvkj9z8zj6d5v6kxnz780hgc7svw0gjg3v6j9zpba4rmbs02"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch index abc37992cb..ec2408d6f4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch @@ -1,18 +1,18 @@ diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim -index 9eebb56..3a0b069 100644 +index 323b57b..8053ea8 100644 --- a/autoload/health/mkdp.vim +++ b/autoload/health/mkdp.vim -@@ -9,8 +9,8 @@ function! health#mkdp#check() abort - call health#report_info('Pre build: ' . l:mkdp_server_script) - call health#report_info('Pre build version: ' . mkdp#util#pre_build_version()) - call health#report_ok('Using pre build') +@@ -8,8 +8,8 @@ function! health#mkdp#check() abort + lua vim.health.info('Pre build: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Pre build version: ' .. vim.fn['mkdp#util#pre_build_version']()) + lua vim.health.ok('Using pre build') - elseif executable('node') -- call health#report_info('Node version: ' . system('node --version')) +- lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('node --version'), '^%s*(.-)%s*$', '%1')) + else -+ call health#report_info('Node version: ' . system('@node@ --version')) - let l:mkdp_server_script = s:mkdp_root_dir . '/app/server.js' - call health#report_info('Script: ' . l:mkdp_server_script) - call health#report_info('Script exists: ' . filereadable(l:mkdp_server_script)) ++ lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('@node@ --version'), '^%s*(.-)%s*$', '%1')) + let l:mkdp_server_script = s:mkdp_root_dir .. '/app/server.js' + lua vim.health.info('Script: ' .. vim.api.nvim_eval('l:mkdp_server_script')) + lua vim.health.info('Script exists: ' .. vim.fn.filereadable(vim.api.nvim_eval('l:mkdp_server_script'))) diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim index b257571..57f04e7 100644 --- a/autoload/mkdp/rpc.vim 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 dfda03ac5a..e0c0f05bf3 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 @@ -27,24 +27,24 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=db929fc"; + version = "0.0.0+rev=ff1045f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "db929fc6822b9b9e1211678d508f187894ce0345"; - hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU="; + rev = "ff1045f5da90344d547022c50f1756be4adaf721"; + hash = "sha256-8qPkmLxe4DrZyVjiEYGTWlLnXDzMV/7ZlDFDAPY+jTE="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -59,25 +59,36 @@ }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; + authzed = buildGrammar { + language = "authzed"; + version = "0.0.0+rev=1dec7e1"; + src = fetchFromGitHub { + owner = "mleonidas"; + repo = "tree-sitter-authzed"; + rev = "1dec7e1af96c56924e3322cd85fdce15d0a31d00"; + hash = "sha256-qPSQF95DO7WByVy9YXEOus3q3U4QfWuUFbJGVXd4EtQ="; + }; + meta.homepage = "https://github.com/mleonidas/tree-sitter-authzed"; + }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=374da90"; + version = "0.0.0+rev=4b4b46c"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "374da90decaa60fea7a22490a77440ece6d4161d"; - hash = "sha256-gbA6VyhPh2lH9FqYKj9sL8uhuMizCmV0U42s5gvk7AE="; + rev = "4b4b46c9a44ec7fb9e8c9ce4a010295edc5be8d5"; + hash = "sha256-bHlll+YgRpv4cSxzNAfVhexeMB7rgkzy3pdOZ5DW1ww="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=fd4e40d"; + version = "0.0.0+rev=7331995"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "fd4e40dab883d6456da4d847de8321aee9c80805"; - hash = "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw="; + rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94"; + hash = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -94,12 +105,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=358e5ec"; + version = "0.0.0+rev=484f508"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "358e5ecbb87109eef7fd596ea518a4ff74cb9b31"; - hash = "sha256-vz8FU+asnMqF6J4UZer4iecw8uFFiYVpz4Fs/ds4Rt0="; + rev = "484f50849bcce887c86451f532bf778689ca8523"; + hash = "sha256-5k5sHW9xabbCFJXHJfs8oBlCjIBa6L3OtDdKEVXLgOc="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -127,12 +138,12 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=6cb07d9"; + version = "0.0.0+rev=10bacac"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693"; - hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik="; + rev = "10bacac929ff36a1e8f4056503fe4f8717b21b94"; + hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -149,12 +160,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=a2b7bac"; + version = "0.0.0+rev=25371f9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "a2b7bac3b313efbaa683d9a276ff63cdc544d960"; - hash = "sha256-39i06oXMQemfq3Y4TTXai6HFXvURVOif1v2i9LP4sAI="; + rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"; + hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -193,12 +204,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=c80c219"; + version = "0.0.0+rev=871622a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "c80c219da2086696202cec8fc2501c02f4819a3f"; - hash = "sha256-CN/FKq+ygqraPELaDJRkCSq9DEcVCpNByz5iA2WRAWU="; + rev = "871622a3a483f0baf94923d8495c8e0bb2c09009"; + hash = "sha256-w4dCrAgb7/qQvFvo2RbfN0bRaUO8RKtReKx5i7SbTF8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -226,12 +237,12 @@ }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=c9a7e2d"; + version = "0.0.0+rev=aefcc28"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "c9a7e2df7cac2dfb730f766a4f343308f84ff346"; - hash = "sha256-7k2LkfzlY+UxQvB1dPP6KQM2UTwThaj5NoAIKDVYAhA="; + rev = "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"; + hash = "sha256-ihkBqdYVulTlysb9J8yg4c5XVktJw8jIwzhqybBw8Ug="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -281,12 +292,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=a90f170"; + version = "0.0.0+rev=d153fe1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "a90f170f92d5d70e7c2d4183c146e61ba5f3a457"; - hash = "sha256-e9Mz84lssaPR80hlogyjXx+jA8gD8YVp4T06qC6gRVI="; + rev = "d153fe1c3385ee0521730ff4e0be9358e903b322"; + hash = "sha256-zxAz82XpTtKondA84L1sO3VByo8vLI4j154pWbxlV74="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -315,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=275cfb9"; + version = "0.0.0+rev=3161aed"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "275cfb95013b88382e11490aef1e7c9b17a95ef7"; - hash = "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw="; + rev = "3161aed045130c900f870ef53fad93a574317769"; + hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -349,12 +360,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=7e447dc"; + version = "0.0.0+rev=f71e310"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "7e447dc18a2d293498670fb5ea16138648c883e5"; - hash = "sha256-BCWtpTgEv/3ahiflK3wHmnhHjTmtmvJxHGo2X7FggsE="; + rev = "f71e310a93010863f4b17a2a501ea8e2032c345b"; + hash = "sha256-6iRUtQ1bol0a7whK35MaJ3UKrxmTAzchQ8Yxy4TeerE="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -393,12 +404,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=1800d5a"; + version = "0.0.0+rev=33e22c3"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "1800d5a06789797065ba5e7d80712b6bbf5483d7"; - hash = "sha256-qt626fHCZkHkl8yrEtDbJ+l7wwmU0XMcP0oPwrCYNgI="; + rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"; + hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -426,12 +437,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=9deacbf"; + version = "0.0.0+rev=a3bfa1a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052"; - hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ="; + rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; + hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; }; location = "tree-sitter-dtd"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; @@ -483,12 +494,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=0694058"; + version = "0.0.0+rev=debe14f"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "0694058bf0555adbf5f700ce4868d18e463cb824"; - hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo="; + rev = "debe14fad40a8100c679d95c66f599b48111742c"; + hash = "sha256-tB03/AqoYIMyWFGv3nKlGY/EjNV1/IQyXQsC+0M51V8="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -527,12 +538,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=4a0ec79"; + version = "0.0.0+rev=35ae91b"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "4a0ec79b7eb7671efe935cd97967430c34598c7d"; - hash = "sha256-q1V5lJsSQyx7ji4T+leIfSH9wAZRHW0XeLnY3Rc9WWI="; + rev = "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"; + hash = "sha256-sA1Sy2yHBACDlicLYX+BLdcy4cnpleaYYVcjPcgHtW0="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -582,12 +593,12 @@ }; forth = buildGrammar { language = "forth"; - version = "0.0.0+rev=e7d1f8a"; + version = "0.0.0+rev=9018923"; src = fetchFromGitHub { owner = "AlexanderBrevig"; repo = "tree-sitter-forth"; - rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"; - hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU="; + rev = "90189238385cf636b9ee99ce548b9e5b5e569d48"; + hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws="; }; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; }; @@ -670,12 +681,12 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=2339ffe"; + version = "0.0.0+rev=19d554d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "2339ffe87a88d0b7838c015592c8269eb0063140"; - hash = "sha256-O3yzJjxrHdDoqcYu4ZDqrMuzinb0/0ub4puaSZPaG3c="; + rev = "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"; + hash = "sha256-/mbnDUMVeyFmkkk/9AdhTvAjSeZcyc2rFgzaPJBiNs4="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; @@ -703,45 +714,56 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=32c8f1e"; + version = "0.0.0+rev=b2afa4f"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c"; - hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs="; + rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122"; + hash = "sha256-Z1wutK2NyI5EMwTezeZp/g8JFD0p7kqBGCuh9Amyjgo="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=d3031a8"; + version = "0.0.0+rev=f9746dc"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "d3031a8294bf331600d5046b1d14e690a0d8ba0c"; - hash = "sha256-YvftQHEwYxRyRIYHrnAjIqgx6O0FlFrnF9TwUE+RiqI="; + rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1"; + hash = "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=ec6100d"; + version = "0.0.0+rev=bea82d3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "ec6100d2bdf22363ca8a711a212f2144ea49233f"; - hash = "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8="; + rev = "bea82d337801e472e35b5cd08038afdf13263768"; + hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; + gn = buildGrammar { + language = "gn"; + version = "0.0.0+rev=bc06955"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-gn"; + rev = "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"; + hash = "sha256-Sn6He4YRrKJe4QvGiaauquYBVQol0lWeIuOwkdUEzkQ="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-gn"; + }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=bbaa67a"; + version = "0.0.0+rev=ff86c7f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "bbaa67a180cfe0c943e50c55130918be8efb20bd"; - hash = "sha256-G7d8CHCyKDAb9j6ijRfHk/HlgPqSI+uvkuRIRRvjkHI="; + rev = "ff86c7f1734873c8c4874ca4dd95603695686d7a"; + hash = "sha256-0oXApYf6Ht9xWrWMMaumac1Rqg52GMYW0bAhRbQ8To0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -791,12 +813,12 @@ }; gpg = buildGrammar { language = "gpg"; - version = "0.0.0+rev=9c26b66"; + version = "0.0.0+rev=18b2690"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gpg-config"; - rev = "9c26b66d6bca0bd0520269e98241709806561bd5"; - hash = "sha256-OybtJVKiQYpftPA+jMyOjswxtkLHvqqyLbmZkKkBFZc="; + rev = "18b2690a15f061a6ff48730589f7a4039af2d002"; + hash = "sha256-KLyXe1Xt1OPHmOMGX+ulVdjDhBpE31lO7/nGNiI4wt0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; }; @@ -813,15 +835,26 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=76e02db"; + version = "0.0.0+rev=7e02322"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "76e02db5866dd2b096512103ed4d8f630cc32980"; - hash = "sha256-H6Gp7MqGxU1oONq/w8p8pNR3Vhi68dvO+2aHw8anBTs="; + rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec"; + hash = "sha256-tWLc5guc5dxKHoACN3Byo/KV+2i/u2tpZgaS+Yi+CyA="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; + gstlaunch = buildGrammar { + language = "gstlaunch"; + version = "0.0.0+rev=2c0d9c9"; + src = fetchFromGitHub { + owner = "theHamsta"; + repo = "tree-sitter-gstlaunch"; + rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"; + hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY="; + }; + meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; + }; hack = buildGrammar { language = "hack"; version = "0.0.0+rev=fca1e29"; @@ -846,12 +879,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=d7ac98f"; + version = "0.0.0+rev=ca10c43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"; - hash = "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg="; + rev = "ca10c43a4c9bfe588c480d2941726c2fadcae699"; + hash = "sha256-HyS9Q6+WSUgyQ9mL5sZvQ4CHW+3MypT2U9b1X5NnMHc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -868,12 +901,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=b553906"; + version = "0.0.0+rev=fdf6463"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; - hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; + rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"; + hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -901,12 +934,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=d698c21"; + version = "0.0.0+rev=ac65c93"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"; - hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM="; + rev = "ac65c934b3214e96e0f854be009a3bd51549bd14"; + hash = "sha256-rTBal4RBOFBKfb9cydvWH+JtCCMOlnnGMPb2X7LXRjE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -934,23 +967,23 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=e5d7d7d"; + version = "0.0.0+rev=d742025"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"; - hash = "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4="; + rev = "d742025fa2d8e6100f134a6ea990443aa1f074b3"; + hash = "sha256-ZpUruxwi9S+gUy/k0DkhDGWLc65XppUhD0NeVVItYg4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=717e83a"; + version = "0.0.0+rev=8873e3d"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "717e83aefd328735beeeb671f3f95b2624e70c57"; - hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs="; + rev = "8873e3df89f9ea1d33f6235e516b600009288557"; + hash = "sha256-zVpjgnP39ToEDf59Ldq/DhRVKZOGaWX+usVOcSsJX3k="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; @@ -978,12 +1011,12 @@ }; ini = buildGrammar { language = "ini"; - version = "0.0.0+rev=7f11a02"; + version = "0.0.0+rev=bcb84a2"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; - rev = "7f11a02fb8891482068e0fe419965d7bade81a68"; - hash = "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M="; + rev = "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"; + hash = "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU="; }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; @@ -1000,23 +1033,23 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=bd9cbaf"; + version = "0.0.0+rev=51271e2"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"; - hash = "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM="; + rev = "51271e260346878e1a1aa6c506ce6a797b7c25e2"; + hash = "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=83044af"; + version = "0.0.0+rev=2b57cd9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "83044af4950e9f1adb46a20f616d10934930ce7e"; - hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI="; + rev = "2b57cd9541f9fd3a89207d054ce8fbe72657c444"; + hash = "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; @@ -1055,23 +1088,23 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=ca3f891"; + version = "0.0.0+rev=3fef30d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"; - hash = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; + rev = "3fef30de8aee74600f25ec2e319b62a1a870d51e"; + hash = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=5dd5cdc"; + version = "0.0.0+rev=c23f7a9"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; - hash = "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E="; + rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"; + hash = "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1132,15 +1165,26 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=06a2f6e"; + version = "0.0.0+rev=0ef8789"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"; - hash = "sha256-HF3wp4nNwgP0LhZvxQKMnPqMPhwu8Xc9khgiQoy6DeA="; + rev = "0ef87892401bb01c84b40916e1f150197bc134b1"; + hash = "sha256-A48osbWX8rkM5UlHcSX3t7PJ97IhsNe+JUTB4fnkDAE="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; + kusto = buildGrammar { + language = "kusto"; + version = "0.0.0+rev=8353a12"; + src = fetchFromGitHub { + owner = "Willem-J-an"; + repo = "tree-sitter-kusto"; + rev = "8353a1296607d6ba33db7c7e312226e5fc83e8ce"; + hash = "sha256-CZCvgOtHjCgyzKFdys+ZvSWCj1I1/b2MnaJcdAtm2aY="; + }; + meta.homepage = "https://github.com/Willem-J-an/tree-sitter-kusto"; + }; lalrpop = buildGrammar { language = "lalrpop"; version = "0.0.0+rev=06ae1b6"; @@ -1174,6 +1218,28 @@ }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; + leo = buildGrammar { + language = "leo"; + version = "0.0.0+rev=23a9534"; + src = fetchFromGitHub { + owner = "r001"; + repo = "tree-sitter-leo"; + rev = "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"; + hash = "sha256-21Vqvc3HjmKi1FRKyswMcf8rPjkyAbjTayDYMsTUsBg="; + }; + meta.homepage = "https://github.com/r001/tree-sitter-leo"; + }; + liquidsoap = buildGrammar { + language = "liquidsoap"; + version = "0.0.0+rev=b35882f"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "tree-sitter-liquidsoap"; + rev = "b35882f2e1460867ddddcbe8af586e6807d4676f"; + hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0="; + }; + meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; + }; llvm = buildGrammar { language = "llvm"; version = "0.0.0+rev=1b96e58"; @@ -1253,24 +1319,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=aaf7679"; + version = "0.0.0+rev=f9820b2"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; - hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; + rev = "f9820b2db958228f9be339b67d2de874d065866e"; + hash = "sha256-0T0P018Zb4tfU2D4PLhiW8tunOInlRtrHajPOVqOpwc="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=aaf7679"; + version = "0.0.0+rev=f9820b2"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"; - hash = "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4="; + rev = "f9820b2db958228f9be339b67d2de874d065866e"; + hash = "sha256-0T0P018Zb4tfU2D4PLhiW8tunOInlRtrHajPOVqOpwc="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1321,16 +1387,27 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=e2053f7"; + version = "0.0.0+rev=650a8fb"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "e2053f7c8856d91bc36c87604f697784845cee69"; - hash = "sha256-u41Qyyu9bNbcAjfTUoq2W2LvfqPpJ62xzaaAg3VbTsA="; + rev = "650a8fb72013ba8d169bdb458e480d640fc545c9"; + hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; + nasm = buildGrammar { + language = "nasm"; + version = "0.0.0+rev=3bc691d"; + src = fetchFromGitHub { + owner = "naclsn"; + repo = "tree-sitter-nasm"; + rev = "3bc691d2cfba44bea339a775ad496c8bc552c60d"; + hash = "sha256-o4aXvPhXSYMc1oaagIbnFhpqcbWdN8dhMa3QRE/iRMM="; + }; + meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; + }; nickel = buildGrammar { language = "nickel"; version = "0.0.0+rev=b759233"; @@ -1342,6 +1419,28 @@ }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; + nim = buildGrammar { + language = "nim"; + version = "0.0.0+rev=1f9308c"; + src = fetchFromGitHub { + owner = "alaviss"; + repo = "tree-sitter-nim"; + rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281"; + hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc="; + }; + meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; + }; + nim_format_string = buildGrammar { + language = "nim_format_string"; + version = "0.0.0+rev=d45f750"; + src = fetchFromGitHub { + owner = "aMOPel"; + repo = "tree-sitter-nim-format-string"; + rev = "d45f75022d147cda056e98bfba68222c9c8eca3a"; + hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0="; + }; + meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string"; + }; ninja = buildGrammar { language = "ninja"; version = "0.0.0+rev=0a95cfd"; @@ -1366,12 +1465,12 @@ }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=1a30509"; + version = "0.0.0+rev=014073f"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; - hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; + rev = "014073fe8016d1ac440c51d22c77e3765d8f6855"; + hash = "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1397,6 +1496,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; }; + objdump = buildGrammar { + language = "objdump"; + version = "0.0.0+rev=28d3b2e"; + src = fetchFromGitHub { + owner = "ColinKennedy"; + repo = "tree-sitter-objdump"; + rev = "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"; + hash = "sha256-OPqIhgItghXplQ78Vlwd0G6KtDWTVkaG17RPqx1b5JY="; + }; + meta.homepage = "https://github.com/ColinKennedy/tree-sitter-objdump"; + }; ocaml = buildGrammar { language = "ocaml"; version = "0.0.0+rev=694c577"; @@ -1435,12 +1545,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=d165dbe"; + version = "0.0.0+rev=751f779"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "d165dbee27617dab2653e38737d96ede1030d14f"; - hash = "sha256-NxF3aSDtXGMcE7v0BrYQbnUM/hophanKgsYX1ad8AFY="; + rev = "751f7796fa76075cff52edd1afff569a8a09c2a7"; + hash = "sha256-VKcyuoXSRN4PAHQKzfuCKB9lg5y5MQyofy3FkN79Nrw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1490,23 +1600,23 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=79e88f6"; + version = "0.0.0+rev=3911403"; src = fetchFromGitHub { - owner = "ganezdragon"; + owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "79e88f64681660f3961939bf764d8f3b4bbb0d27"; - hash = "sha256-cadmD6kXhA3TENHhM03+iX2J0+Z0UhHizFiZLnknXLk="; + rev = "3911403cba497196fb867a6f1e286e3e1576f425"; + hash = "sha256-/BS3taDAcjTaPfqhKyh6dnA5N9E8n4oSZepdcJVAIsw="; }; - meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; + meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=a05c611"; + version = "0.0.0+rev=33e3016"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "a05c6112a1dfdd9e586cb275700931e68d3c7c85"; - hash = "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw="; + rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"; + hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1543,14 +1653,25 @@ }; meta.homepage = "https://github.com/erasin/tree-sitter-po"; }; + pod = buildGrammar { + language = "pod"; + version = "0.0.0+rev=ea5d557"; + src = fetchFromGitHub { + owner = "tree-sitter-perl"; + repo = "tree-sitter-pod"; + rev = "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"; + hash = "sha256-CFPfpFQYlaryMX/k6tBT9k0WbQRz2vdVzh++lIVYe80="; + }; + meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; + }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=d7b43b5"; + version = "0.0.0+rev=374f618"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "d7b43b51f92fb19efe8af45c2246087c611c8f63"; - hash = "sha256-83gE+dY1ldK5zFcEtqY3zZgk+MMrSA8w5alqp2sa/7Y="; + rev = "374f618de179498c2a821136bb86c3edbe221e10"; + hash = "sha256-X6PQQqY7fLB9AvCMfLlZ2cU8dKoCsw1KGjzYup8BoJ8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -1643,25 +1764,36 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; + purescript = buildGrammar { + language = "purescript"; + version = "0.0.0+rev=f89bd14"; + src = fetchFromGitHub { + owner = "postsolar"; + repo = "tree-sitter-purescript"; + rev = "f89bd149e44624342bf49f76245d3284f2beed9a"; + hash = "sha256-c4Zux+6kg9b9/0t9LOtfSdMMQbp1xwiQH8dz4BBB/pY="; + }; + meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; + }; pymanifest = buildGrammar { language = "pymanifest"; - version = "0.0.0+rev=8953f91"; + version = "0.0.0+rev=a775470"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-pymanifest"; - rev = "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"; - hash = "sha256-1kG09tYE9FAxsE4MqLadi4dtqtJOFOZGOOVgnqvWc44="; + rev = "a77547018ada84ca4bc115c7650b19441120f065"; + hash = "sha256-8aU3TA0KJAfsiJi326mixw6GcnFDTJzrHquCZi0lYOQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest"; }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=a901729"; + version = "0.0.0+rev=82f5c99"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "a901729099257aac932d79c60adb5e8a53fa7e6c"; - hash = "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84="; + rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"; + hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1766,23 +1898,23 @@ }; rego = buildGrammar { language = "rego"; - version = "0.0.0+rev=b2667c9"; + version = "0.0.0+rev=9ac75e7"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; - hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM="; + rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf"; + hash = "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=eda424e"; + version = "0.0.0+rev=389dd46"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-requirements"; - rev = "eda424eade0f2afbafbf0c89d18c77818fa19273"; - hash = "sha256-cZjj17316Cnz/A+7K3f81H/iedrlu0IDTdDLkXThcnQ="; + rev = "389dd46a39075ce36af6ee3af50393d9aa506d14"; + hash = "sha256-SGamdYeoBKMkyVzvA4nCWp3bqhfmkJctyhcVhqYBfPQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; @@ -1821,12 +1953,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=2ca8c12"; + version = "0.0.0+rev=3c03a4b"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "2ca8c123c82ca41f41b66b5d13d403cff0204b78"; - hash = "sha256-aCeKxuBRLPYM8CjVLP5cBUhtuAezzZpGfCE2UaJj1E4="; + rev = "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028"; + hash = "sha256-WEerUDni10WpXKXX9r6pMwKn3Z9xqIKnlkQDxJiXxxY="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -1954,24 +2086,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=e63bcdc"; + version = "0.0.0+rev=a768c95"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; - hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; + hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -1989,12 +2121,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=39750c4"; + version = "0.0.0+rev=9fe5aea"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"; - hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y="; + rev = "9fe5aeaa8d58d00cc31c20a3ae923ae695ce2ce7"; + hash = "sha256-HnSZGrxrHlARPhgTJRO6P0FcmjOdB3c5eMpH9+5ZaX8="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2011,12 +2143,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=e400863"; + version = "0.0.0+rev=6ac08de"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "e4008633536870f3fed3198c96503250af0b0a12"; - hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI="; + rev = "6ac08decae456ef2fc307977d9210f86d75d4eca"; + hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2033,12 +2165,12 @@ }; strace = buildGrammar { language = "strace"; - version = "0.0.0+rev=0dc85e4"; + version = "0.0.0+rev=d819cdd"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "tree-sitter-strace"; - rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e"; - hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q="; + rev = "d819cdd5dbe455bd3c859193633c8d91c0df7c36"; + hash = "sha256-u2LznohljEq7WEoVbwr1ZyV+qbchDuoktJFCeh4iePg="; }; meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; }; @@ -2077,12 +2209,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=10eb01d"; + version = "0.0.0+rev=b3bfaad"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "10eb01d29827f24b1271672e89790661d94da9e1"; - hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o="; + rev = "b3bfaad89426a062c2a5d971cfebb7262f8cff62"; + hash = "sha256-8rPtZmxfg1jHGqD4oKWfJpsVtk3cPPuwylJOWGXhtB0="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2111,12 +2243,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=c544082"; + version = "0.0.0+rev=884a034"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "c544082904fd1d27da5493857bd3fc278bae2a1a"; - hash = "sha256-0iH5zEe5/BD2Wi4jb67grCXafmHhJkSD/NkjqGZZ3pY="; + rev = "884a034e0ae29ce72649041a603deacdfb4a3275"; + hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2145,12 +2277,12 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=b553906"; + version = "0.0.0+rev=fdf6463"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; - hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; + rev = "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"; + hash = "sha256-UEjC3PeTQCvbtfk4a0EaLh+DXraUQIaSUGU6vszYP3E="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -2190,12 +2322,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=7ba226c"; + version = "0.0.0+rev=d99cb5c"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "7ba226cf85280c7917d082940022006e6a3b7b6f"; - hash = "sha256-OszsJIzggkPRor8aulnpHP0vPT+8fVfDtiIdUiAAqFU="; + rev = "d99cb5c77bb0e733176d607a0875ac30e17e1e72"; + hash = "sha256-ShZlFHokmy3hhfTeh+/anz7a2bGDwWAdWIdi3X/lchQ="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2235,12 +2367,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2258,27 +2390,49 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=779ee5a"; + version = "0.0.0+rev=eaf80e6"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "779ee5ab1e065dcef7f51f253030dc875445b25f"; - hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A="; + rev = "eaf80e6af969e25993576477a9dbdba3e48c1305"; + hash = "sha256-fp7HcdJEFxi/zBFSrM86THwBMpqFwAGugcTVbPk3bd4="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=b1bf482"; + version = "0.0.0+rev=d847898"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; - hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; + hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; + typoscript = buildGrammar { + language = "typoscript"; + version = "0.0.0+rev=43b221c"; + src = fetchFromGitHub { + owner = "Teddytrombone"; + repo = "tree-sitter-typoscript"; + rev = "43b221c0b76e77244efdaa9963e402a17c930fbc"; + hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc="; + }; + meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; + }; + udev = buildGrammar { + language = "udev"; + version = "0.0.0+rev=baeac48"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-udev"; + rev = "baeac48a999abb9384cdcce320f0182937aec8ba"; + hash = "sha256-XEbCi9Oo5mTiocdh8Uqr5XQ3nqH3MBZjZusGd076NWE="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev"; + }; ungrammar = buildGrammar { language = "ungrammar"; version = "0.0.0+rev=debd26f"; @@ -2292,24 +2446,24 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=694c8c0"; + version = "0.0.0+rev=a69d087"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"; - hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4="; + rev = "a69d087590f2ca057d1ef1a393de7e22869bb557"; + hash = "sha256-9eDWvNkY3rEz6khluAJuTXF95CF384IRptaRXGOHma4="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; }; usd = buildGrammar { language = "usd"; - version = "0.0.0+rev=718a6b3"; + version = "0.0.0+rev=ab8c30b"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-usd"; - rev = "718a6b3e939904e0b4fe7cff6742e96af4781f4b"; - hash = "sha256-6U4TreAeAGB7WRUtTXdxQvNa6Sl6E+f329/SZ6DOQ+0="; + rev = "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"; + hash = "sha256-Y7AYRpiblBd8xun73UohIf8FFkbNIqSXv44bM3L5uDc="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-usd"; }; @@ -2326,12 +2480,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=e14fdf6"; + version = "0.0.0+rev=099a85f"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"; - hash = "sha256-ERtjgmnXzXyuKLxVy6Pi89B59BaB87JIzZqaWMZPR9k="; + rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"; + hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2371,23 +2525,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=77e9e96"; + version = "0.0.0+rev=32c76f1"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "77e9e96c2ae5cff7343ce3dced263483acf95793"; - hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs="; + rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55"; + hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=c0f8580"; + version = "0.0.0+rev=60045f7"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"; - hash = "sha256-pBdfFeJbZJy6pjr2a0SgFyjEZKvajKOfrqoRAMB66V8="; + rev = "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"; + hash = "sha256-FW+sPrzFQxKkWkyX2q+s+RBIMCOUWOt38vj2DzAaJ4I="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2426,25 +2580,36 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=fac3f72"; + version = "0.0.0+rev=eacf704"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "fac3f72d80d379fea61d1eca782cb99ac6d78b62"; - hash = "sha256-/PIqwqG5h2iFVzpTTlXOrAKEDNctcxRHIhGyv5jlkIw="; + rev = "eacf704338661b981fcf4fdb5ee44d898f038144"; + hash = "sha256-JwA49Up2G2/jobjqniQeJ1Rfko3PFfgINRvi/QswlCk="; }; location = "libs/tree-sitter-wing"; generate = true; meta.homepage = "https://github.com/winglang/wing"; }; + xcompose = buildGrammar { + language = "xcompose"; + version = "0.0.0+rev=01344fe"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-xcompose"; + rev = "01344fed31a3cd37a63f03357ec80cbc592a93b5"; + hash = "sha256-MZmtV8d5L7qF65cJuxZaJwMVvxSYMduwv8lbzljMJLM="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; + }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=9deacbf"; + version = "0.0.0+rev=a3bfa1a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xml"; - rev = "9deacbfb79cb3527a0396255beb17e1bba3f2052"; - hash = "sha256-3ryZXRgsBaNKBBHUhJ8ANHYunOUMzthMI7gw+6lnooQ="; + rev = "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"; + hash = "sha256-01zkVlkLGAlMV4bKlxwypvMizQ13FSRSuiLZCSuJy3Q="; }; location = "tree-sitter-xml"; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 37414b0735..4b70d8555d 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -2,34 +2,20 @@ #!nix-shell update-shell.nix -i python import json +import logging import subprocess from concurrent.futures import ThreadPoolExecutor -from os import environ -from os.path import dirname, join +import os +import sys +from os.path import join -configs = json.loads( - subprocess.check_output( - [ - "nvim", - "--headless", - "-u", - "NONE", - "+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))", - "+quit!", - ] - ) -) +log = logging.getLogger("vim-updater") -def generate_grammar(item): - lang, lock = item - cfg = configs.get(lang) - if not cfg: - return "" - +def generate_grammar(lang, rev, cfg): + """Generate grammar for a language""" info = cfg["install_info"] url = info["url"] - rev = lock["revision"] generated = f""" {lang} = buildGrammar {{ language = "{lang}"; @@ -56,26 +42,57 @@ def generate_grammar(item): return generated -def update_grammars(lockfile: str): +def update_grammars(nvim_treesitter_dir: str): + """ + The lockfile contains just revisions so we start neovim to dump the + grammar information in a better format + """ + # the lockfile + cmd = [ + "nvim", + "--headless", + "-u", + "NONE", + "--cmd", + f"set rtp^={nvim_treesitter_dir}", + "+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))", + "+quit!", + ] + log.debug("Running command: %s", ' '.join(cmd)) + configs = json.loads(subprocess.check_output(cmd)) generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py - { buildGrammar, """ +{ buildGrammar, """ generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) generated_file += """ }: - { - """ - for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): - generated_file += generated - generated_file += "}\n" - generated_file += "}\n" +{ +""" - open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) + lockfile_path = os.path.join(nvim_treesitter_dir, "lockfile.json") + log.debug("Opening %s", lockfile_path) + with open(lockfile_path) as lockfile_fd: + lockfile = json.load(lockfile_fd) + + def _generate_grammar(item): + lang, lock = item + cfg = configs.get(lang) + if not cfg: + return "" + return generate_grammar(lang, lock["revision"], cfg) + + for generated in ThreadPoolExecutor(max_workers=5).map( + _generate_grammar, lockfile.items() + ): + generated_file += generated + + generated_file += "}\n" + return generated_file if __name__ == "__main__": - # TODO add lockfile - update_grammars() + generated = update_grammars(sys.args[1]) + open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated) 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 bf3181f8fe..ea1e3f8da7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -999,14 +999,21 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-HdewCCraJ2jj2KAVnjzND+4O52jqfABonFU6ybWWAWY="; + cargoHash = "sha256-ITrjY15Haz8hEztWym4q8YW2h0R8/kOYPaIYJu87sN4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; + prePatch = '' + rm .cargo/config.toml + ''; + + env.OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--workspace" ]; # tests are broken @@ -1033,23 +1040,22 @@ self: super: { sniprun = let - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; - rev = "v${version}"; - hash = "sha256-1xvB/YhpHlOhxbkIGlgQyTlO5ljWPHfOm+tuhKRTXAw="; + rev = "refs/tags/v${version}"; + hash = "sha256-xQb/VZOuwB1J4m6iOs1JMfH1f1rOzJzpvq3D4HHOHAI="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - # Cargo.lock is outdated - preBuild = '' - cargo update --offline - ''; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; - cargoHash = "sha256-pML4ZJYivC/tu/7yvbB/VHfXTT+UpLZuS1Y3iNXt2Ks="; + cargoHash = "sha256-6h0P0UVks6dQz2PZ1A/CLa1T8okD3CIUnfrH3vHe4L8="; nativeBuildInputs = [ makeWrapper ]; @@ -1246,6 +1252,10 @@ self: super: { meta.maintainers = with lib.maintainers; [enderger]; }; + typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { + dependencies = with self; [ nvim-lspconfig plenary-nvim ]; + }; + unicode-vim = let unicode-data = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch index da0222fbbe..e0980a3ccb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch @@ -1,15 +1,15 @@ diff --git a/coq/__main__.py b/coq/__main__.py -index 5a6c6fd2..e0d9eec8 100644 +index dd40afc1..36bcca21 100644 --- a/coq/__main__.py +++ b/coq/__main__.py @@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable) _EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name _REQ = REQUIREMENTS.read_text() - + -_IN_VENV = _RT_PY == _EXEC_PATH +_IN_VENV = True - - + + if command == "deps": @@ -152,7 +152,7 @@ elif command == "run": try: @@ -21,15 +21,15 @@ index 5a6c6fd2..e0d9eec8 100644 else: import pynvim_pp diff --git a/coq/consts.py b/coq/consts.py -index 5a027fe9..a3e0c5a4 100644 +index 804e92ab..5c090a93 100644 --- a/coq/consts.py +++ b/coq/consts.py -@@ -9,7 +9,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent +@@ -10,7 +10,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent REQUIREMENTS = TOP_LEVEL / "requirements.txt" - - + + -VARS = TOP_LEVEL / ".vars" +VARS = Path.home() / ".cache/coq_nvim/vars" - + RT_DIR = VARS / "runtime" RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch index f3203e0075..85a6daceef 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index aa39e0b..188d54a 100644 +index c9b811f..459cf07 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua @@ -4,9 +4,7 @@ M.custom_highlight=false @@ -13,11 +13,29 @@ index aa39e0b..188d54a 100644 local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." +@@ -145,7 +143,7 @@ function M.setup_highlights() + highlight(group, styles) + end + vim.cmd('augroup END') +- else ++ else + for group, styles in pairs(colors_table) do + local gui = styles.gui and 'gui='..styles.gui or 'gui=NONE' + local sp = styles.sp and 'guisp='..styles.sp or 'guisp=NONE' +@@ -354,7 +352,7 @@ function M.health() + -- check if the log is recreated + if pcall(M.ping) then health_ok("Sent a ping to the sniprun binary") + else health_warn("Could not send a ping to the sniprun binary - is it present, executable and compatible with your CPU architecture?") end +- ++ + + os.execute("sleep 0.2") + if not M.file_exists(path_log_file) and not M.file_exists(path_log_file_mac) then health_error("sniprun binary incompatible or crash at start", {"Compile sniprun locally, with a clean reinstall and 'bash ./install.sh 1' as post-install command."}) diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh -index 2e6264d..0eab1c6 100644 +index eb51dbe..1382b5c 100755 --- a/ressources/init_repl.sh +++ b/ressources/init_repl.sh -@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe +@@ -35,7 +35,7 @@ mkfifo $working_dir/$pipe touch $working_dir/$out sleep 36000 > $working_dir/$pipe & @@ -25,7 +43,7 @@ index 2e6264d..0eab1c6 100644 +echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh chmod +x $working_dir/real_launcher.sh - echo $repl " process started at $(date +"%F %T")." >> $working_dir/log + echo $repl " process started at $(date +"%F %T")." >> $log diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh index feaa91e..749c55e 100755 --- a/ressources/launcher_repl.sh diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py index 9770b27252..e7e50c21d4 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py @@ -23,11 +23,12 @@ import os import logging import textwrap import json +import subprocess from typing import List, Tuple from pathlib import Path -log = logging.getLogger() +log = logging.getLogger("vim-updater") sh = logging.StreamHandler() formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") @@ -39,15 +40,14 @@ ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe import pluginupdate import importlib from pluginupdate import run_nix_expr, PluginDesc -from treesitter import update_grammars +import treesitter HEADER = ( "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) -NVIM_TREESITTER_GENERATED_NIX = \ - "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix" +NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter" class VimEditor(pluginupdate.Editor): @@ -58,8 +58,7 @@ class VimEditor(pluginupdate.Editor): ): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) nvim_treesitter_rev = pluginupdate.run_nix_expr( - "(import { }).vimPlugins.nvim-treesitter.src.rev", - self.nixpkgs + "(import { }).vimPlugins.nvim-treesitter.src.rev", self.nixpkgs ) with open(outfile, "w+") as f: @@ -78,7 +77,8 @@ class VimEditor(pluginupdate.Editor): content = self.plugin2nix(pdesc, plugin) f.write(content) if ( - plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev + plugin.name == "nvim-treesitter" + and plugin.commit != nvim_treesitter_rev ): self.nvim_treesitter_updated = True f.write("\n}\n") @@ -126,33 +126,45 @@ class VimEditor(pluginupdate.Editor): def update(self, args): pluginupdate.update_plugins(self, args) + # TODO this should probably be skipped when running outside a nixpkgs checkout if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") - nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter") - lockfile = json.load(open(args.nixpkgs.join(NVIM_TREESITTER_GENERATED_FILE, "lockfile.json"))) + cmd = [ + "nix", "build", + "vimPlugins.nvim-treesitter.src", "-f", self.nixpkgs + , "--print-out-paths" + ] + log.debug("Running command: %s", " ".join(cmd)) + nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip() - nvim_treesitter.update_grammars(lockfile) + generated = treesitter.update_grammars(nvim_treesitter_dir) + treesitter_generated_nix_path = os.path.join( + NIXPKGS_NVIMTREESITTER_FOLDER, + "generated.nix" + ) + open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated) if self.nixpkgs_repo: index = self.nixpkgs_repo.index for diff in index.diff(None): - if diff.a_path == NVIM_TREESITTER_GENERATED_NIX: + if diff.a_path == treesitter_generated_nix_path: msg = "vimPlugins.nvim-treesitter: update grammars" print(f"committing to nixpkgs: {msg}") - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.add([treesitter_generated_nix_path]) index.commit(msg) return print("no updates to nvim-treesitter grammars") def main(): - global luaPlugins log.debug(f"Loading from {ROOT}/../get-plugins.nix") with open(f"{ROOT}/../get-plugins.nix") as f: GET_PLUGINS = f.read() - editor = VimEditor("vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS) + editor = VimEditor( + "vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS + ) editor.run() diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix index e82650a040..afa245d9be 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix @@ -3,17 +3,13 @@ , makeWrapper , python3Packages , lib +, nix-prefetch-git +, nurl # optional , vimPlugins , neovim }: -let - my_neovim = neovim.override { - configure.packages.all.start = [ vimPlugins.nvim-treesitter ]; - }; - -in buildPythonApplication { format = "other"; pname = "vim-plugins-updater"; @@ -38,7 +34,8 @@ buildPythonApplication { cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py # wrap python scripts - makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix my_neovim ]}" --prefix PYTHONPATH : "$out/lib" ) + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ + nix nix-prefetch-git neovim nurl ]}" --prefix PYTHONPATH : "$out/lib" ) wrapPythonPrograms ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 614363cffb..4db45ddc84 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -67,15 +67,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -101,15 +101,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -124,9 +124,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -149,6 +149,15 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +[[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" @@ -156,22 +165,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bstr" -version = "1.5.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] [[package]] name = "built" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" +checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ "cargo-lock", "git2", @@ -196,26 +210,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] -name = "cargo-lock" -version = "8.0.3" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-lock" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ "semver", "serde", - "toml", + "toml 0.7.6", "url", ] [[package]] -name = "cc" -version = "1.0.79" +name = "cargo-platform" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] +[[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" @@ -239,10 +292,19 @@ dependencies = [ ] [[package]] -name = "clap" -version = "4.3.1" +name = "chrono-humanize" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" +dependencies = [ + "chrono", +] + +[[package]] +name = "clap" +version = "4.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" dependencies = [ "clap_builder", "clap_derive", @@ -251,22 +313,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.1" +version = "4.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.1" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", @@ -340,6 +401,22 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "colorsys" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54261aba646433cb567ec89844be4c4825ca92a4f8afba52fc4dd88436e31bbd" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "console" version = "0.15.7" @@ -352,12 +429,31 @@ dependencies = [ "windows-sys 0.45.0", ] +[[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.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -381,9 +477,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -394,13 +490,54 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "directories" version = "4.0.1" @@ -410,6 +547,13 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs" +version = "0.1.0" +dependencies = [ + "directories", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -425,15 +569,14 @@ dependencies = [ name = "dumb_analyzer" version = "0.1.0" dependencies = [ - "once_cell", "serde_json", ] [[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 = "encode_unicode" @@ -460,10 +603,16 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -513,6 +662,16 @@ dependencies = [ "utils", ] +[[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -521,9 +680,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -628,9 +787,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -639,17 +798,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" -version = "0.16.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -658,11 +817,11 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick 1.0.4", "bstr", "fnv", "log", @@ -710,9 +869,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -720,7 +879,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -733,6 +892,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.4.1" @@ -741,18 +906,32 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "highlighter" +version = "0.1.0" dependencies = [ - "libc", + "anyhow", + "colorsys", + "once_cell", + "rgb2ansi256", + "serde", + "syntect", + "tracing", + "utils", ] [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] [[package]] name = "http" @@ -784,15 +963,15 @@ 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 = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -805,7 +984,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -814,10 +993,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -827,9 +1007,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -858,10 +1038,16 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.3.0" +name = "ident_case" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -897,7 +1083,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -912,31 +1108,19 @@ dependencies = [ "regex", ] -[[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.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", "windows-sys 0.48.0", ] @@ -952,9 +1136,31 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[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 = "jobserver" @@ -967,9 +1173,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -982,15 +1188,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1000,9 +1206,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1011,16 +1217,47 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "line-wrap" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linter" +version = "0.1.0" +dependencies = [ + "async-trait", + "cargo_metadata", + "once_cell", + "parking_lot", + "paths", + "regex", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1028,13 +1265,22 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] [[package]] name = "maple" -version = "0.1.45" +version = "0.1.47" dependencies = [ "built", "chrono", @@ -1054,19 +1300,24 @@ dependencies = [ "base64 0.13.1", "bytecount", "chrono", + "chrono-humanize", "clap", - "directories", + "dirs", "dumb_analyzer", "filter", "futures", "grep-matcher", "grep-searcher", + "highlighter", "icon", "ignore", "itertools", + "linter", + "maple_derive", "matcher", "once_cell", "parking_lot", + "paths", "pattern", "percent-encoding", "printer", @@ -1077,10 +1328,23 @@ dependencies = [ "serde_json", "subprocess", "tokio", - "toml", + "toml 0.5.11", "tracing", "types", "utils", + "webbrowser", +] + +[[package]] +name = "maple_derive" +version = "0.1.0" +dependencies = [ + "darling", + "once_cell", + "proc-macro2", + "quote", + "syn", + "types", ] [[package]] @@ -1098,9 +1362,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -1113,9 +1377,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1128,9 +1392,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[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", ] @@ -1146,6 +1410,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1158,20 +1428,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" 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", ] @@ -1182,19 +1452,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] -name = "object" -version = "0.30.3" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] [[package]] name = "overload" @@ -1220,15 +1521,24 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "paths" +version = "0.1.0" +dependencies = [ + "dirs", + "itertools", + "serde", ] [[package]] @@ -1241,15 +1551,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1263,6 +1573,20 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "plist" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +dependencies = [ + "base64 0.21.2", + "indexmap 1.9.3", + "line-wrap", + "quick-xml", + "serde", + "time 0.3.27", +] + [[package]] name = "printer" version = "0.1.0" @@ -1278,22 +1602,37 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "quote" -version = "1.0.28" +name = "quick-xml" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "rayon" version = "1.7.0" @@ -1322,7 +1661,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -1332,26 +1680,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick 1.0.4", "memchr", - "regex-syntax 0.7.2", + "regex-automata", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick 1.0.4", + "memchr", + "regex-syntax 0.7.5", +] [[package]] name = "regex-syntax" @@ -1361,15 +1715,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -1404,6 +1758,12 @@ dependencies = [ "winreg", ] +[[package]] +name = "rgb2ansi256" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebca96b1c05912d531790498048bab5b7b97a756a7bb9df71fa4ef7ef9814e1" + [[package]] name = "ring" version = "0.16.20" @@ -1437,13 +1797,12 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -1451,9 +1810,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -1463,18 +1822,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -1482,9 +1841,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "same-file" @@ -1497,9 +1862,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -1513,27 +1878,27 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", @@ -1542,15 +1907,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1589,18 +1963,18 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -1612,6 +1986,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.5.2" @@ -1635,9 +2019,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1645,19 +2029,40 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.40" +name = "syntect" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "flate2", + "fnv", + "once_cell", + "onig", + "plist", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "thiserror", + "walkdir", + "yaml-rust", +] + +[[package]] +name = "thiserror" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -1687,10 +2092,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1705,9 +2111,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -1729,18 +2135,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -1758,9 +2164,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -1789,6 +2195,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -1814,15 +2254,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.21", + "time 0.3.27", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", @@ -1896,9 +2336,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -1934,9 +2374,9 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1983,11 +2423,10 @@ dependencies = [ [[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", ] @@ -2005,9 +2444,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2015,9 +2454,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -2030,9 +2469,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2042,9 +2481,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2052,9 +2491,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -2065,38 +2504,42 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webbrowser" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ - "ring", - "untrusted", + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle", + "url", + "web-sys", ] [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "winapi" @@ -2135,7 +2578,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2153,7 +2596,7 @@ 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]] @@ -2173,17 +2616,17 @@ dependencies = [ [[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]] @@ -2194,9 +2637,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -2206,9 +2649,9 @@ 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_i686_gnu" @@ -2218,9 +2661,9 @@ 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_msvc" @@ -2230,9 +2673,9 @@ 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_x86_64_gnu" @@ -2242,9 +2685,9 @@ 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_gnullvm" @@ -2254,9 +2697,9 @@ 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_msvc" @@ -2266,15 +2709,34 @@ 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 = "winnow" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +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 = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 271f50919f..5e4466af79 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.45"; + version = "0.47"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos="; + hash = "sha256-CYv5AZsGvN2dtN7t58b50a8PH7804Lnm4d4wAX6Mm5Q="; }; meta = with lib; { @@ -47,8 +47,7 @@ let libgit2 zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices ]; }; in 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 64f721cee3..ff93512e5c 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 @@ -190,6 +190,7 @@ https://github.com/aca/completion-tabnine/,, https://github.com/nvim-treesitter/completion-treesitter/,, https://github.com/chikatoike/concealedyank.vim/,, https://github.com/rhysd/conflict-marker.vim/,, +https://github.com/stevearc/conform.nvim/,HEAD, https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, @@ -433,7 +434,7 @@ https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, https://github.com/Issafalcon/lsp-overloads.nvim/,main, https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, -https://github.com/VonHeikemen/lsp-zero.nvim/,main, +https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x, https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, @@ -469,6 +470,7 @@ https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, https://github.com/SidOfc/mkdx/,, https://github.com/mawkler/modicator.nvim/,HEAD, https://github.com/tomasr/molokai/,, +https://github.com/benlubas/molten-nvim/,HEAD, https://github.com/loctvl842/monokai-pro.nvim/,HEAD, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/leafo/moonscript-vim/,HEAD, @@ -551,6 +553,7 @@ https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, +https://github.com/nvimtools/none-ls.nvim/,HEAD, https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,HEAD, @@ -732,6 +735,7 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, +https://github.com/mrcjkb/rustaceanvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, @@ -863,6 +867,7 @@ https://github.com/Pocco81/true-zen.nvim/,, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, +https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/kaarmu/typst.vim/,HEAD, 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 22f047a1bc..365b26642b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -326,8 +326,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.1.1"; - sha256 = "sha256-UVZOpkOHbLiwA4VfTgXxuIU8EtJLnqRa5zUVha6xQJY="; + version = "2.3.3"; + sha256 = "sha256-A7+7lnCPAtSWUfHLNKbYqKuTxi2Nx05Qdh5HCkT1dnM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -343,8 +343,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.8.2"; - sha256 = "0kw9asv91s37ql61blbb8pr7wb6c2ba1klchal53chp6ib55v5kn"; + version = "1.0.1"; + sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -377,8 +377,8 @@ let mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.12.5"; - sha256 = "sha256-gJIxCdoxWGThalY+qJ930UtRLFkvr34LfaSioAZH9TQ="; + version = "0.13.5"; + sha256 = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' @@ -532,8 +532,8 @@ let mktplcRef = { name = "emojisense"; publisher = "bierner"; - version = "0.9.1"; - sha256 = "sha256-bfhImi2qMHWkgKqkoStS0NtbXTfj6GpcLkI0PSMjuvg="; + version = "0.10.0"; + sha256 = "sha256-PD8edYuJu6QHPYIM08kV85LuKh0H0/MIgFmMxSJFK5M="; }; meta = { license = lib.licenses.mit; @@ -732,8 +732,8 @@ let mktplcRef = { name = "chatgpt-reborn"; publisher = "chris-hayes"; - version = "3.16.3"; - sha256 = "wkitG5gmYKYKXRw/zVW04HN1dePiTjbnynFOY/bwxfI="; + version = "3.19.1"; + sha256 = "1msb3lqy9p2v26nsw0clfsisiwxcid3jp1l6549hk1i1gcqhd84w"; }; }; @@ -741,8 +741,8 @@ let mktplcRef = { name = "path-intellisense"; publisher = "christian-kohler"; - version = "2.8.4"; - sha256 = "sha256-FEBYcjJHOwmxVHhhyxqOpk/V6hvtMkhkvLVpmJCMSZw="; + version = "2.8.5"; + sha256 = "1ndffv1m4ayiija1l42m28si44vx9y6x47zpxzqv2j4jj7ga1n5z"; }; meta = { description = "Visual Studio Code plugin that autocompletes filenames"; @@ -1229,8 +1229,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.16.0"; - sha256 = "sha256-PZUyOZ/U6OkGid+PYY2G/pAe5R5eumUibKNel9HBI+s="; + version = "0.17.5"; + sha256 = "sha256-2iOyLNLMQ6Snm0gvv7Yl6von/A9UTfLYrH5l1PoJwUc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1575,9 +1575,10 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.89.156"; - sha256 = "sha256-BJnYd9D3bWrZI8UETnAua8ngVjZJ7EXB1UrZAjVnx1E="; + version = "1.135.544"; + sha256 = "sha256-OeG1nkQbQAfu8NuDEA+iaWy0ioFyXPe7Qm/CZIKPiX8="; }; + meta = { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; @@ -1591,8 +1592,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.3.2023061502"; - sha256 = "sha256-sUoKwlPDMz+iQbmIsD2JhyDwmUQzOyCHXaXCUaizQ7k="; + version = "0.11.2023111001"; + sha256 = "sha256-sBDvqqyq0R0ZyS81G61fI9Vd860RIjhNzCqY0bdz1mg="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -1645,8 +1646,8 @@ let # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they can require insider versions # of VS Code - version = "0.68.1"; - sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI="; + version = "0.75.2023101209"; + sha256 = "1saz4brd5k1wyy7pz1h3jcl4kq35f78s2q8drjd7v2k97jhy8la1"; }; meta = { license = lib.licenses.mit; }; }; @@ -1743,6 +1744,22 @@ let }; }; + griimick.vhs = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vhs"; + publisher = "griimick"; + version = "0.0.4"; + sha256 = "sha256-zAy8o5d2pK5ra/dbwoLgPAQAYfRQtUYQjisWYgIhsXA="; + }; + meta = { + description = "Visual Studio Code extension providing syntax support for VHS .tape files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=griimick.vhs"; + homepage = "https://github.com/griimick/vscode-vhs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + gruntfuggly.todo-tree = buildVscodeMarketplaceExtension { mktplcRef = { name = "todo-tree"; @@ -1891,8 +1908,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.10.0"; - sha256 = "s0+8952svPSA69M4H29zuIxUWV6xNRpIqLNd8pzGJhY="; + version = "9.14.1"; + sha256 = "1a8im7n25jy2zyqcqhscj62bamhwzp6kk6hdarb0p38d4pwwzxbm"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -2361,9 +2378,10 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.14.0"; - sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs="; + version = "0.15.2"; + sha256 = "06lp4qgnksklgc6nvx1l9z38y7apbx0a6v886nd15aq9rq8my0ka"; }; + meta = { description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; @@ -2455,8 +2473,8 @@ let mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2022.7.11"; - sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; + version = "2023.8.50"; + sha256 = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; }; buildInputs = [ nodePackages.pyright ]; @@ -2467,6 +2485,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; homepage = "https://github.com/microsoft/pylance-release"; license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ericthemagician ]; }; }; @@ -2726,12 +2745,15 @@ let }; }; + nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; publisher = "nvarner"; - version = "0.5.0"; - sha256 = "sha256-4bZbjbcd/EjSRBMkzMs1pD00qyQb5W6gePh4xfoU6Ug="; + # Please update the corresponding binary (typst-lsp) when updating + # this extension. + version = "0.11.0"; + sha256 = "sha256-fs+CBg3FwzTn608dm9EvfF2UrI2Sa5hsm0OK/WQyy6o="; }; nativeBuildInputs = [ jq moreutils ]; @@ -2832,8 +2854,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.29.0"; - sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM="; + version = "4.31.0"; + sha256 = "0rn4dyqr46wbgi4k27ni6a6i3pa83gyaprhds5rlndjaw90iakb4"; }; meta = { license = lib.licenses.mit; @@ -2898,8 +2920,8 @@ let mktplcRef = { name = "vscode-xml"; publisher = "redhat"; - version = "0.25.2023032304"; - sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; + version = "0.26.2023092519"; + sha256 = "00p98qihw7ndwl4h18jx8n0lmrqsn1vab7h2k3cbjdz0b623j773"; }; meta.license = lib.licenses.epl20; }; @@ -2908,8 +2930,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.12.0"; - sha256 = "sha256-r/me14KonxnQeensIYyWU4dQrhomc8h2ntYoiZ+Y7jE="; + version = "1.14.0"; + sha256 = "0pww9qndd2vsizsibjsvscz9fbfx8srrj67x4vhmwr581q674944"; }; meta = { license = lib.licenses.mit; @@ -3293,8 +3315,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "107.4.3"; - sha256 = "sha256-z1foIJXVKmJ0G4FfO9xsjiQgmq/ZtoB3b6Ch8Nyj1zY="; + version = "107.12.0"; + sha256 = "036ri011fd0cf91iwv59j57m05mxliy27ms4di2y9jlk7jzmr4s2"; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -3339,8 +3361,8 @@ let mktplcRef = { name = "vscode-tailscale"; publisher = "tailscale"; - version = "0.4.0"; - sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs="; + version = "0.6.4"; + sha256 = "1jcq5kdcdyb5yyy0p9cnv56vmclvb6wdwq8xvy1qbkfdqbmy05gm"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog"; @@ -3473,6 +3495,22 @@ let }; }; + tsandall.opa = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "opa"; + publisher = "tsandall"; + version = "0.12.2"; + sha256 = "sha256-/eJzDhnQyvC9OBr4M03wLIWPiBeVtvX7ztSnO+YoCZM="; + }; + meta = { + changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; + description = "An extension for VS Code which provides support for OPA"; + homepage = "https://github.com/open-policy-agent/vscode-opa"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.msanft ]; + }; + }; + tuttieee.emacs-mcx = buildVscodeMarketplaceExtension { mktplcRef = { name = "emacs-mcx"; @@ -3516,15 +3554,15 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.15"; - sha256 = "sha256-q+hSssxOIfeRUw2z9nMiCmH8cAF+GPTvlmc1jl/L4uU="; + version = "0.0.23"; + sha256 = "sha256-NauXoYTAka8qXNPYlW5g7r6NNX1x8cnvDRbEGkRsMoY="; }; meta = { description = "VSCode language extension for Uiua"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; homepage = "https://github.com/uiua-lang/uiua-vscode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.wackbyte ]; + maintainers = with lib.maintainers; [ tomasajt wackbyte ]; }; }; @@ -3548,8 +3586,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.12.0"; - sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4="; + version = "3.14.0"; + sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; @@ -3714,8 +3752,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.25.2"; - sha256 = "sha256-hy2Ks6oRc9io6vfgql9aFGjUiRzBCS4mGdDO3NqIFEg="; + version = "1.26.1"; + sha256 = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI="; }; meta = { license = lib.licenses.mit; @@ -3750,8 +3788,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "10.1.0"; - sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0="; + version = "10.5.1"; + sha256 = "119rf52xnxz0cwvvjjfc5m5iv19288cxz33xzr79b67wyfd79hl9"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; @@ -3888,8 +3926,8 @@ let mktplcRef = { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.15.8"; - sha256 = "sha256-PwWGs9KRfV3qpYbgdiw8FYvnkaJQ2VW2H6p6+umk7eg="; + version = "3.16.2"; + sha256 = "0ava94zn68lxy3ph78r5rma39qz03al5l5i6x070mpa1hzj3i319"; }; meta = { license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json index 29f8c62b9a..0b2a6760a0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json @@ -1,23 +1,24 @@ { "name": "rust-analyzer", - "version": "0.3.1607", + "version": "0.3.1697", "dependencies": { + "@hpcc-js/wasm": "^2.13.0", "anser": "^2.1.1", - "d3": "^7.6.1", + "d3": "^7.8.5", "d3-graphviz": "^5.0.2", - "vscode-languageclient": "^8.0.2", + "vscode-languageclient": "^8.1.0", + "@tsconfig/strictest": "^2.0.1", "@types/node": "~16.11.7", - "@types/vscode": "~1.66.0", - "@typescript-eslint/eslint-plugin": "^5.30.5", - "@typescript-eslint/parser": "^5.30.5", - "@vscode/test-electron": "^2.1.5", - "cross-env": "^7.0.3", - "eslint": "^8.19.0", - "eslint-config-prettier": "^8.5.0", - "ovsx": "^0.5.2", - "prettier": "^2.7.1", - "tslib": "^2.4.0", - "typescript": "^4.7.4", - "vsce": "^2.9.2" + "@types/vscode": "~1.75", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "@vscode/test-electron": "^2.3.3", + "@vscode/vsce": "^2.19.0", + "eslint": "^8.44.0", + "eslint-config-prettier": "^8.8.0", + "ovsx": "^0.8.2", + "prettier": "^3.0.0", + "tslib": "^2.6.0", + "typescript": "^5.1.6" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 77c589dbba..044c8274d4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -20,7 +20,7 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2023-07-31"; + releaseTag = "2023-10-16"; src = fetchFromGitHub { owner = "rust-lang"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 6fff745449..17fe106043 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq unzip +#! nix-shell -i bash -p cacert curl jq unzip # shellcheck shell=bash set -eu -o pipefail diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index e8ae861bf2..693ffb4e94 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -1,164 +1,55 @@ -{ stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages -, at-spi2-atk, autoPatchelfHook, alsa-lib, mesa, nss, nspr, xorg -, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland -, libglvnd, libkrb5 +{ stdenv +, lib +, makeDesktopItem +, unzip +, libsecret +, libXScrnSaver +, libxshmfence +, buildPackages +, at-spi2-atk +, autoPatchelfHook +, alsa-lib +, mesa +, nss +, nspr +, xorg +, systemd +, fontconfig +, libdbusmenu +, glib +, buildFHSEnv +, wayland +, libglvnd +, libkrb5 -# Populate passthru.tests + # Populate passthru.tests , tests -# needed to fix "Save as Root" -, asar, bash + # needed to fix "Save as Root" +, asar +, bash -# Attributes inherit from specific versions -, version, src, meta, sourceRoot, commandLineArgs -, executableName, longName, shortName, pname, updateScript + # Attributes inherit from specific versions +, version +, src +, meta +, sourceRoot +, commandLineArgs +, executableName +, longName +, shortName +, pname +, updateScript , dontFixup ? false -, rev ? null, vscodeServer ? null +, rev ? null +, vscodeServer ? null , sourceExecutableName ? executableName , useVSCodeRipgrep ? false , ripgrep }: +stdenv.mkDerivation (finalAttrs: let - unwrapped = stdenv.mkDerivation { - - inherit pname version src sourceRoot dontFixup; - - passthru = { - inherit executableName longName tests updateScript; - fhs = fhs {}; - fhsWithPackages = f: fhs { additionalPkgs = f; }; - } // lib.optionalAttrs (vscodeServer != null) { - inherit rev vscodeServer; - }; - - desktopItem = makeDesktopItem { - name = executableName; - desktopName = longName; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = "${executableName} %F"; - icon = "vs${executableName}"; - startupNotify = true; - startupWMClass = shortName; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "inode/directory" ]; - keywords = [ "vscode" ]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "${executableName} --new-window %F"; - icon = "vs${executableName}"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = executableName + "-url-handler"; - desktopName = longName + " - URL Handler"; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = executableName + " --open-url %U"; - icon = "vs${executableName}"; - startupNotify = true; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vscode" ]; - keywords = [ "vscode" ]; - noDisplay = true; - }; - - buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; - - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; - - nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook - asar - # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) - ]; - - dontBuild = true; - dontConfigure = true; - noDumpEnvVars = true; - - installPhase = '' - runHook preInstall - '' + (if stdenv.isDarwin then '' - mkdir -p "$out/Applications/${longName}.app" "$out/bin" - cp -r ./* "$out/Applications/${longName}.app" - ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" - '' else '' - mkdir -p "$out/lib/vscode" "$out/bin" - cp -r ./* "$out/lib/vscode" - - ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" - - mkdir -p "$out/share/applications" - ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" - ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" - - # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. - mkdir -p "$out/share/pixmaps" - cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" - - # Override the previously determined VSCODE_PATH with the one we know to be correct - sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" - grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded - - # Remove native encryption code, as it derives the key from the executable path which does not work for us. - # The credentials should be stored in a secure keychain already, so the benefit of this is questionable - # in the first place. - rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt - '') + '' - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # Add gio to PATH so that moving files to the trash works when not using a desktop environment - --prefix PATH : ${glib.bin}/bin - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - --add-flags ${lib.escapeShellArg commandLineArgs} - ) - ''; - - # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 - # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 - postPatch = lib.optionalString stdenv.isLinux '' - # this is a fix for "save as root" functionality - packed="resources/app/node_modules.asar" - unpacked="resources/app/node_modules" - asar extract "$packed" "$unpacked" - substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ - --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ - --replace "/bin/bash" "${bash}/bin/bash" - rm -rf "$packed" - - # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, - # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' - # and the window immediately closes which renders VSCode unusable - # see https://github.com/NixOS/nixpkgs/issues/152939 for full log - ln -rs "$unpacked" "$packed" - '' + (let - vscodeRipgrep = if stdenv.isDarwin then - "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" - else - "resources/app/node_modules/@vscode/ripgrep/bin/rg"; - in if !useVSCodeRipgrep then '' - rm ${vscodeRipgrep} - ln -s ${ripgrep}/bin/rg ${vscodeRipgrep} - '' else '' - chmod +x ${vscodeRipgrep} - ''); - - postFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} - ''; - - inherit meta; - }; # Vscode and variants allow for users to download and use extensions # which often include the usage of pre-built binaries. @@ -169,7 +60,7 @@ let # # buildFHSEnv allows for users to use the existing vscode # extension tooling without significant pain. - fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnv { + fhs = { additionalPkgs ? pkgs: [ ] }: buildFHSEnv { # also determines the name of the wrapped command name = executableName; @@ -197,10 +88,10 @@ let # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - ln -s "${unwrapped}/share" "$out/" + ln -s "${finalAttrs.finalPackage}/share" "$out/" ''; - runScript = "${unwrapped}/bin/${executableName}"; + runScript = "${finalAttrs.finalPackage}/bin/${executableName}"; # vscode likes to kill the parent so that the # gui application isn't attached to the terminal session @@ -208,7 +99,7 @@ let passthru = { inherit executableName; - inherit (unwrapped) pname version; # for home-manager module + inherit (finalAttrs.finalPackage) pname version; # for home-manager module }; meta = meta // { @@ -219,4 +110,145 @@ let }; }; in - unwrapped +{ + + inherit pname version src sourceRoot dontFixup; + + passthru = { + inherit executableName longName tests updateScript; + fhs = fhs { }; + fhsWithPackages = f: fhs { additionalPkgs = f; }; + } // lib.optionalAttrs (vscodeServer != null) { + inherit rev vscodeServer; + }; + + desktopItem = makeDesktopItem { + name = executableName; + desktopName = longName; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = "${executableName} %F"; + icon = "vs${executableName}"; + startupNotify = true; + startupWMClass = shortName; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" ]; + keywords = [ "vscode" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "${executableName} --new-window %F"; + icon = "vs${executableName}"; + }; + }; + + urlHandlerDesktopItem = makeDesktopItem { + name = executableName + "-url-handler"; + desktopName = longName + " - URL Handler"; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = executableName + " --open-url %U"; + icon = "vs${executableName}"; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vscode" ]; + keywords = [ "vscode" ]; + noDisplay = true; + }; + + buildInputs = [ libsecret libXScrnSaver libxshmfence ] + ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; + + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + asar + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) + ]; + + dontBuild = true; + dontConfigure = true; + noDumpEnvVars = true; + + installPhase = '' + runHook preInstall + '' + (if stdenv.isDarwin then '' + mkdir -p "$out/Applications/${longName}.app" "$out/bin" + cp -r ./* "$out/Applications/${longName}.app" + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" + '' else '' + mkdir -p "$out/lib/vscode" "$out/bin" + cp -r ./* "$out/lib/vscode" + + ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" + + mkdir -p "$out/share/applications" + ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" + ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" + + # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. + mkdir -p "$out/share/pixmaps" + cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" + + # Override the previously determined VSCODE_PATH with the one we know to be correct + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" + grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded + + # Remove native encryption code, as it derives the key from the executable path which does not work for us. + # The credentials should be stored in a secure keychain already, so the benefit of this is questionable + # in the first place. + rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt + '') + '' + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + # Add gio to PATH so that moving files to the trash works when not using a desktop environment + --prefix PATH : ${glib.bin}/bin + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags ${lib.escapeShellArg commandLineArgs} + ) + ''; + + # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 + # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 + postPatch = lib.optionalString stdenv.isLinux '' + # this is a fix for "save as root" functionality + packed="resources/app/node_modules.asar" + unpacked="resources/app/node_modules" + asar extract "$packed" "$unpacked" + substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ + --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ + --replace "/bin/bash" "${bash}/bin/bash" + rm -rf "$packed" + + # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, + # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' + # and the window immediately closes which renders VSCode unusable + # see https://github.com/NixOS/nixpkgs/issues/152939 for full log + ln -rs "$unpacked" "$packed" + '' + ( + let + vscodeRipgrep = + if stdenv.isDarwin then + "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" + else + "resources/app/node_modules/@vscode/ripgrep/bin/rg"; + in + if !useVSCodeRipgrep then '' + rm ${vscodeRipgrep} + ln -s ${ripgrep}/bin/rg ${vscodeRipgrep} + '' else '' + chmod +x ${vscodeRipgrep} + '' + ); + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} + ''; + + inherit meta; +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index c924e49dfa..a784455f70 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ayb0fj3dfcvwmfc749aihn1mm2h4nin914kvalchkm9q0xvc2y9"; - x86_64-darwin = "0yvcm1m1dlklacc0rir4ja2bqiwlwmrmx3qwxf3ik40m1dfwhh53"; - aarch64-linux = "0vj7q6b82n9509dph0p4d6n7b9gwz5b3wkg4wysm4w4xflqlx9al"; - aarch64-darwin = "144fxkxg6c5216ds32wdx7qf5hnvlq4a429z90wz62iynslaggl4"; - armv7l-linux = "1819dg30dy8hd8gi84b1992ii1bxcfcvhx9yf4q8wdf62hw5nkpq"; + x86_64-linux = "1vdgc4mnysij2sf87d5dfh0yw9j2a58lvmnwzzsj1icaydhkhfjy"; + x86_64-darwin = "0zxky35ifgjwb6p41mi3z34fvn49fpl09r1n9kp46ip8mqsm7gm7"; + aarch64-linux = "0qv0gbkfx78a393x44g6zmi5gs57d2cnjqlwfv0yrhkgi5s8v1ma"; + aarch64-darwin = "1rl4256h8i52akzy8g2bkydsi5llp05qqj0jr2di896x4niw57iz"; + armv7l-linux = "18mcf5x3h3mwlvhkl86b2wcl0adj7pr4aqr12va07mwlh2fp83h4"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.83.0"; + version = "1.84.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e7e037083ff4455cf320e344325dacb480062c3c"; + rev = "1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "11lf24hsbc4xbi08lrzxw4bn0jqp7rbhz120y9i3ffq25kni989l"; + sha256 = "18kx7szx1v7dk0qqsw6cf40zd8mrc7a8snvm6i1n8q039d9mx2jz"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index f7527096f1..ec47f8c1b8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; - x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; - aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; - aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; - armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; + x86_64-linux = "1h2s90h1a4b4r9rqafd5fj95mx21xqlp3msv8fxfjd2kkfl8bdcl"; + x86_64-darwin = "1cprq4cy01cmyqrvv5p9f09k7h5p4nj9jbk4lrlnyj1z2xvhcls1"; + aarch64-linux = "0g9j14vnan10r014309s6mdkizjfpbd83bf1kxx2kk625n87xszc"; + aarch64-darwin = "10rw2dy3khpxa292zygxi67amxd6s351ha8nxvav5m9xfxlgd2qn"; + armv7l-linux = "0bw0hfhvwv7wbh2daxgxaxm34v5z5ak4nmmk45ksxc4xsmjc5v23"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.2.23257"; + version = "1.84.2.23317"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix index e14d3d0d71..3083f2dccb 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "86Box"; - version = "4.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; rev = "v${version}"; - hash = "sha256-VTfYCVEbArcYVzh3NkX1yBXhtRnGZ/+khk0KG42fs24="; + hash = "sha256-1005Czm4CftL96G0+sKV1wx/ogXTKS0vQAzZHtIMlKA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/blink/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/blink/default.nix index e522546078..bdaf36bf66 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/blink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/blink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, fetchFromGitHub, fetchpatch, lib }: stdenv.mkDerivation (finalAttrs: { pname = "blink"; @@ -11,6 +11,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-W7yL7Ut3MRygJhFGr+GIj/CK57MkuDTcenft8IvH7jU="; }; + # Drop after next release + patches = [ + (fetchpatch { + url = "https://github.com/jart/blink/commit/b31fed832b10d32eadaec885fb20dacbb0eb6986.patch"; + hash = "sha256-DfZxW/H58qXAjkQz31YS4SPMz7152ZzNHK7wHopgnQA="; + }) + ]; + # 'make check' requires internet connection doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix index 35ed421469..a02eb526fe 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -1,29 +1,39 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , gitUpdater , cmake , python3 -, withDynarec ? stdenv.hostPlatform.isAarch64 +, withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64) , runCommand , hello-x86_64 -, box64 }: -# Currently only supported on ARM -assert withDynarec -> stdenv.hostPlatform.isAarch64; +# Currently only supported on ARM & RISC-V +assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "box64"; version = "0.2.4"; src = fetchFromGitHub { owner = "ptitSeb"; - repo = pname; - rev = "v${version}"; + repo = "box64"; + rev = "v${finalAttrs.version}"; hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; }; + patches = [ + # Fix crash due to regression in SDL1 AudioCallback signature in 0.2.4 + # Remove when version > 0.2.4 + (fetchpatch { + name = "0001-box64-Fixed_signature_of_SDL1_AudioCallback.patch"; + url = "https://github.com/ptitSeb/box64/commit/5fabd602aea1937e3c5ce58843504c2492b8c0ec.patch"; + hash = "sha256-dBdKijTljCFtSJ2smHrbjH/ok0puGw4YEy/kluLl4AQ="; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -31,12 +41,20 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNOGIT=ON" - "-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}" - "-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" - "-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" + + # Arch mega-option + "-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}" + "-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}" + "-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}" + "-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}" ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # x86_64 has no arch-specific mega-option, manually enable the options that apply to it "-DLD80BITS=ON" "-DNOALIGN=ON" + ] ++ [ + # Arch dynarec + "-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}" + "-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}" ]; installPhase = '' @@ -47,9 +65,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - doInstallCheck = true; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckPhase = '' runHook preInstallCheck @@ -68,7 +86,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; tests.hello = runCommand "box64-test-hello" { - nativeBuildInputs = [ box64 hello-x86_64 ]; + nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to # tell what problems the emulator has run into. @@ -81,6 +99,7 @@ stdenv.mkDerivation rec { description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; license = licenses.mit; maintainers = with maintainers; [ gador OPNA2608 ]; - platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; + mainProgram = "box64"; + platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix index 5d376955ea..359b2f26a5 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,4 +1,4 @@ -{ callPackage, glib, libao, intltool, libmirage }: +{ callPackage, glib, libao, intltool, libmirage, coreutils }: let pkg = import ./base.nix { version = "3.2.5"; pname = "cdemu-daemon"; @@ -7,4 +7,12 @@ let pkg = import ./base.nix { in callPackage pkg { nativeBuildInputs = [ intltool ]; buildInputs = [ glib libao libmirage ]; + drvParams.postInstall = '' + mkdir -p $out/share/dbus-1/services + cp -R ../$pname-$version/service-example $out/share/cdemu + substitute \ + $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \ + $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ + --replace /bin/true ${coreutils}/bin/true + ''; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index 6e3f93701c..664399f757 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -26,7 +26,6 @@ , libXrandr , lzo , mbedtls_2 -, mgba , miniupnpc , minizip-ng , openal @@ -38,7 +37,6 @@ , vulkan-loader , xxHash , xz -, zlib-ng # Used in passthru , common-updater-scripts @@ -78,6 +76,8 @@ stdenv.mkDerivation rec { ./find-minizip-ng.patch ]; + strictDeps = true; + nativeBuildInputs = [ stdenv.cc cmake @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { sfml xxHash xz # LibLZMA - zlib-ng ] ++ lib.optionals stdenv.isLinux [ alsa-lib bluez @@ -175,6 +174,7 @@ stdenv.mkDerivation rec { tests.version = testers.testVersion { package = dolphin-emu; command = "dolphin-emu-nogui --version"; + version = if stdenv.hostPlatform.isDarwin then "Dolphin 5.0" else version; }; updateScript = writeShellScript "dolphin-update-script" '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-x/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-x/default.nix new file mode 100644 index 0000000000..3c0805e270 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-x/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, AudioUnit +, autoreconfHook +, Carbon +, Cocoa +, ffmpeg +, fluidsynth +, freetype +, glib +, libpcap +, libpng +, libslirp +, libxkbfile +, libXrandr +, makeWrapper +, ncurses +, pkg-config +, SDL2 +, SDL2_net +, testers +, yad +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dosbox-x"; + version = "2023.10.06"; + + src = fetchFromGitHub { + owner = "joncampbell123"; + repo = "dosbox-x"; + rev = "dosbox-x-v${finalAttrs.version}"; + hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + + buildInputs = [ + ffmpeg + fluidsynth + freetype + glib + libpcap + libpng + libslirp + ncurses + SDL2 + SDL2_net + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libxkbfile + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit + Carbon + Cocoa + ]; + + configureFlags = [ "--enable-sdl2" ]; + + enableParallelBuilding = true; + + hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436 + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/dosbox-x \ + --prefix PATH : ${lib.makeBinPath [ yad ]} + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + # Version output on stderr, program returns status code 1 + command = "${lib.getExe finalAttrs.finalPackage} -version 2>&1 || true"; + }; + + meta = { + homepage = "https://dosbox-x.com"; + description = "A cross-platform DOS emulator based on the DOSBox project"; + longDescription = '' + DOSBox-X is an expanded fork of DOSBox with specific focus on running + Windows 3.x/9x/Me, PC-98 and 3D support via 3dfx. + + The full expanded feature list is available here: + https://dosbox-x.com/wiki/DOSBox%E2%80%90X%E2%80%99s-Feature-Highlights + ''; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hughobrien OPNA2608 ]; + platforms = lib.platforms.unix; + mainProgram = "dosbox-x"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix index 4a6d229762..d0c9d8450e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , SDL , SDL_net @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/joncampbell123/dosbox-x/commit/006d5727d36d1ec598e387f2f1a3c521e3673dcb.patch"; + includes = [ "src/gui/render_templates_sai.h" ]; + hash = "sha256-HSO29/LgZRKQ3HQBA0QF5henG8pCSoe1R2joYNPcUcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix index 170a3c30e5..f0434ecded 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/emulationstation/default.nix @@ -1,34 +1,25 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive -, fetchpatch }: +, freeimage, freetype, libGLU, libGL, rapidjson, SDL2, alsa-lib +, vlc }: stdenv.mkDerivation { pname = "emulationstation"; - version = "2.0.1a"; + version = "2.11.2"; src = fetchFromGitHub { - owner = "Aloshi"; + fetchSubmodules = true; + owner = "RetroPie"; repo = "EmulationStation"; - rev = "646bede3d9ec0acf0ae378415edac136774a66c5"; - sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; + rev = "cda7de687924c4c1ab83d6b0ceb88aa734fe6cfe"; + hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch"; - sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p"; - }) - ]; - - postPatch = '' - sed -i "7i #include " es-app/src/views/gamelist/ISimpleGameListView.h - ''; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost curl eigen freeimage freetype libGLU libGL rapidjson SDL2 vlc ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation + cp -r ../resources/ $out/bin/resources/ ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix index f1874d62fb..ee02b1eee0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/flycast/default.nix @@ -6,35 +6,24 @@ , makeWrapper , alsa-lib , curl -, egl-wayland , libao -, libdecor -, libevdev -, libffi -, libGL , libpulseaudio -, libX11 -, libXext -, libxkbcommon , libzip -, mesa +, lua , miniupnpc -, udev -, vulkan-headers +, SDL2 , vulkan-loader -, wayland -, zlib }: stdenv.mkDerivation rec { pname = "flycast"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "V${version}"; - sha256 = "sha256-PRInOqg9OpaUVLwSj1lOxDtjpVaYehkRsp0jLrVKPyY="; + rev = "v${version}"; + sha256 = "sha256-eQMKaUaZ1b0oXre4Ouli4qIyNaG64KntyRGk3/YIopc="; fetchSubmodules = true; }; @@ -47,23 +36,16 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib curl - egl-wayland libao - libdecor - libevdev - libffi - libGL libpulseaudio - libX11 - libXext - libxkbcommon libzip - mesa # for libgbm + lua miniupnpc - udev - vulkan-headers - wayland - zlib + SDL2 + ]; + + cmakeFlags = [ + "-DUSE_HOST_SDL=ON" ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix b/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix index 6135ee064e..5134918283 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix @@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: { wrapQtApp "$out/bin/fs-uae-launcher" \ --set PYTHONPATH "$PYTHONPATH" - # fs-uae-launcher search side by side for fs-uae + # fs-uae-launcher search side by side for executables and shared files # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable ln -s ${fsuae}/bin/fs-uae $out/bin ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin + ln -s ${fsuae}/share/fs-uae $out/share/fs-uae ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/gxemul/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/gxemul/default.nix index cacb521c2f..05f837b187 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/gxemul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/gxemul/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "http://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; + url = "https://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://gavare.se/gxemul/"; + homepage = "https://gavare.se/gxemul/"; description = "Gavare's experimental emulator"; longDescription = '' GXemul is a framework for full-system computer architecture diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index 730ed7b7ac..0688947f6b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.259"; + version = "0.260"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-F8psPvwuaILXZF7dCStJApVTD9zzzBwjf1CKGelHlqE="; + hash = "sha256-spWnaf7xXK2xzgdUagsgN5doVrpJk7EA6fzYd9FlFm0="; }; outputs = [ "out" "tools" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index d1cbf12b34..d84ae907b1 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -164,16 +164,6 @@ in }; }; - beetle-snes = mkLibretroCore { - core = "mednafen-snes"; - src = getCoreSrc "beetle-snes"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's SNES core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; - beetle-supafaust = mkLibretroCore { core = "mednafen-supafaust"; src = getCoreSrc "beetle-supafaust"; @@ -568,6 +558,7 @@ in mame2015 = mkLibretroCore { core = "mame2015"; + patches = [ ./patches/mame2015-python311.patch ]; makeFlags = [ "PYTHON=python3" ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; @@ -581,6 +572,7 @@ in mame2016 = mkLibretroCore { core = "mame2016"; + patches = [ ./patches/mame2016-python311.patch ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; @@ -768,7 +760,7 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2"; + postBuild = "cd pcsx2"; meta = { description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index f1099967fe..78cb11c7d9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -59,12 +59,6 @@ "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=" }, - "beetle-snes": { - "owner": "libretro", - "repo": "beetle-bsnes-libretro", - "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91", - "hash": "sha256-zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" - }, "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch new file mode 100644 index 0000000000..5827ba1415 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2015-python311.patch @@ -0,0 +1,61 @@ +diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py +index da29fc722a..3de641dd69 100755 +--- a/src/emu/cpu/m6502/m6502make.py ++++ b/src/emu/cpu/m6502/m6502make.py +@@ -16,7 +16,7 @@ def load_opcodes(fname): + opcodes = [] + logging.info("load_opcodes: %s", fname) + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read opcodes file %s [%s]", fname, err) +@@ -39,7 +39,7 @@ def load_disp(fname): + logging.info("load_disp: %s", fname) + states = [] + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read display file %s [%s]", fname, err) +diff --git a/src/emu/cpu/m6809/m6809make.py b/src/emu/cpu/m6809/m6809make.py +index c3d5b0f66e..79f6f90cdd 100644 +--- a/src/emu/cpu/m6809/m6809make.py ++++ b/src/emu/cpu/m6809/m6809make.py +@@ -14,7 +14,7 @@ def load_file(fname, lines): + if path != "": + path += '/' + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/emu/cpu/mcs96/mcs96make.py +index ec5ec37a78..7ab806a653 100644 +--- a/src/emu/cpu/mcs96/mcs96make.py ++++ b/src/emu/cpu/mcs96/mcs96make.py +@@ -71,7 +71,7 @@ def __init__(self, fname, is_196): + self.ea = {} + self.macros = {} + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/emu/cpu/tms57002/tmsmake.py +index 62092097d9..78f9fe43cd 100755 +--- a/src/emu/cpu/tms57002/tmsmake.py ++++ b/src/emu/cpu/tms57002/tmsmake.py +@@ -326,7 +326,7 @@ def ins_cmp_dasm(a, b): + def LoadLst(filename): + instructions = [] + ins = None +- for n, line in enumerate(open(filename, "rU")): ++ for n, line in enumerate(open(filename, "r")): + line = line.rstrip() + if not line and ins: + # new lines separate intructions diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch new file mode 100644 index 0000000000..6647e445a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/patches/mame2016-python311.patch @@ -0,0 +1,74 @@ +diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py +index a73d8ad268..82a80c0984 100644 +--- a/scripts/build/verinfo.py ++++ b/scripts/build/verinfo.py +@@ -63,7 +63,7 @@ def extract_version(input): + build, outfmt, srcfile, dstfile = parse_args() + + try: +- fp = open(srcfile, 'rU') ++ fp = open(srcfile, 'r') + except IOError: + sys.stderr.write("Unable to open source file '%s'\n" % srcfile) + sys.exit(1) +diff --git a/src/devices/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py +index 8bcd85f8e2..557b175966 100755 +--- a/src/devices/cpu/m6502/m6502make.py ++++ b/src/devices/cpu/m6502/m6502make.py +@@ -18,7 +18,7 @@ def load_opcodes(fname): + opcodes = [] + logging.info("load_opcodes: %s", fname) + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read opcodes file %s [%s]", fname, err) +@@ -41,7 +41,7 @@ def load_disp(fname): + logging.info("load_disp: %s", fname) + states = [] + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + logging.error("cannot read display file %s [%s]", fname, err) +diff --git a/src/devices/cpu/m6809/m6809make.py b/src/devices/cpu/m6809/m6809make.py +index 8838b96019..e1ea25db06 100644 +--- a/src/devices/cpu/m6809/m6809make.py ++++ b/src/devices/cpu/m6809/m6809make.py +@@ -16,7 +16,7 @@ def load_file(fname, lines): + if path != "": + path += '/' + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/devices/cpu/mcs96/mcs96make.py b/src/devices/cpu/mcs96/mcs96make.py +index b4844942e3..207208d2b6 100644 +--- a/src/devices/cpu/mcs96/mcs96make.py ++++ b/src/devices/cpu/mcs96/mcs96make.py +@@ -73,7 +73,7 @@ def __init__(self, fname, is_196): + self.ea = {} + self.macros = {} + try: +- f = open(fname, "rU") ++ f = open(fname, "r") + except Exception: + err = sys.exc_info()[1] + sys.stderr.write("Cannot read opcodes file %s [%s]\n" % (fname, err)) +diff --git a/src/devices/cpu/tms57002/tmsmake.py b/src/devices/cpu/tms57002/tmsmake.py +index e2e12b5a4b..942ec09537 100755 +--- a/src/devices/cpu/tms57002/tmsmake.py ++++ b/src/devices/cpu/tms57002/tmsmake.py +@@ -323,7 +323,7 @@ def AddInfo(self, line): + def LoadLst(filename): + instructions = [] + ins = None +- for n, line in enumerate(open(filename, "rU")): ++ for n, line in enumerate(open(filename, "r")): + line = line.rstrip() + if not line and ins: + # new lines separate intructions diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py index 5348092c52..e9536d8318 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" +#!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ nix-prefetch-github ])" -p "git" import json import os @@ -22,7 +22,6 @@ CORES = { "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, - "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-supafaust": {"repo": "supafaust"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 028e1daff0..f4fe6f467a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1012"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1053"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "e6700b314f1384f015666767baf9ea1d8411e330"; - sha256 = "1szgmvwril7zwfbvqz850xavrk70i56i1yyqfh9mxpxlc3n9xxzr"; + rev = "28dd7d80af56701887dbb538b56aa58edaf39d91"; + sha256 = "09h4423z18q8r8fqcd5kv34iwmy9gkmpgw8an8myrhhvkmxi3zwg"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix index 7d952d9371..8a7c89f4db 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix @@ -2,35 +2,33 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.3"; sha256 = "1ig635386glxgfv9l894dqp98l93ymsylml649xm42lc9a9f1khc"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.3"; sha256 = "0xcxwc588lc2ify2d3m53pmwjgf7p9lwz5q11hn8p5c9zh01iai9"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.3"; sha256 = "1kls0v2rjimcv7k0dvqd3l694xdg9nf8wdzcz1cadi4qvj0bx7l4"; }) - (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; sha256 = "1qxw096av0n4ks0jixh7xxrzgsn9fshp1ypy3vvij7r0a1sk7y1q"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.3"; sha256 = "0g8hzvkf2rrfnpmm56m2miwpdw14l04rr0q8xz03j220fy9xk5fm"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.3"; sha256 = "1rificg9ikf8m2550ylrqavkkvihf8xb22agmdrbz07v7s93v731"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.3"; sha256 = "0w8qc45phfz4mnnx1mfxi042qmq31shmjmz5inb4maw9xha0yr3c"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.3"; sha256 = "09g4flx6sg2b2mkwbqrwl51q87xzy0d43j2xjxvnwc8vwhr1h8gs"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.3"; sha256 = "1gi3y2cdfcjkwjldavahyx09a1n91jpvx8szwrfgr3kk4ycc5lyn"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.3"; sha256 = "0syh20a6892pip4qz32kgc5w77ig40yjgwbcknivhjr8arc3126r"; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.4"; sha256 = "1p7mz33a6dn6ghvwajxdghq15mn5f6isvvqzxcjbnhh3m5c1zhrz"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.4"; sha256 = "1yxand1h0ybwbykn12ixdanbp74rd5spcz8xifmzjmvisjzglvsi"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.3"; sha256 = "0089z8ml8pblq6hispj1nf7lvf6zplrrlix22jcd87pm13232pg2"; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0"; sha256 = "1xmgaj2wnjdl16x4y6rmfp3q9faca5na90zlb8j62rxcwf1v3lkr"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0"; sha256 = "0cd8w9pm7lpifdzjmsnmjlzdqgq3qw653mcj3adczb5ycqqbd8p3"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.3"; sha256 = "0zkm0asxcbsybswxs0p6ybsiq6j1l1j02h0xfxzsmhcimm3y92kk"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.3"; sha256 = "14pj98057fmfgafq0pni7pw79ls0lsf3jaydfjmdjyw5x2b2x51q"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.3"; sha256 = "0pb41fpiwndcf34r53apxf92qgqxavc4zfl1xy847pz3kj1vsclp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.2"; sha256 = "0b07rszfp87lj08bsni6vjynqcpfdwr8cqxpwy68620qki8w953l"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.2"; sha256 = "12bqmm0sdc5a1xxz1hffvpgpjc5m64cn7w45bd67wnapz2w943rv"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; }) (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) - (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.1"; sha256 = "12w6rk3qgn6i2zk06appf98pgdf89pw10865qcwn5xpjwm7487k2"; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.4"; sha256 = "1xizjlk34xi4z837j6lbv4mc5vfb8gimkxicxcz0012wkzlmmzb1"; }) (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) @@ -45,31 +43,30 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.6.0"; sha256 = "0qvkwkbqz4dhkxsisanax1lwm3nzyyb4kgb40qczxbl8g251cjp2"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; sha256 = "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.6.0"; sha256 = "1yfvwygx795c9lswpiv8q19zydifarzljdmvv67vjmi559cm8b1q"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; sha256 = "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.2"; sha256 = "09mf5kpxn1a1m8ciwklhh6ascx0yqpcs5r2hvmfj80j44n3qrwhm"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.31.0"; sha256 = "0l1y4q5syl6kcnk6yrjphdj3clfjnmlnxrkvmfjffvfnl9slsh9m"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.31.0"; sha256 = "0vfrrrvz6axfg41pcnwlhqh7gkxl1vrm8hbxjkzkw5a5ijh0i4pc"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.31.0"; sha256 = "0dbvi7ifsl6gdsa1hc4bvma9qyr63gvgamwndy0k7wyvvh492rhm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.31.0"; sha256 = "0yrsysxgjfwrh1n2mplpm4jwm0ws4p49pdd3zcsql7kjjhs525lv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.0"; sha256 = "0sc96z969qfybq5njsqm8hwhqv8jj6gysyjq7n9r9km1nqnhazmi"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.0"; sha256 = "12xa4yx19j5q7nbisl57jla8x6pby964cr9xkv0qm4834x4zdd3h"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.0"; sha256 = "0hv1qb51v6frvhybwcn6m3haq768jgdx59p17jn217fbjiprq14s"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.0"; sha256 = "0cjdbi3ximvfz2nyp2vlxqskmscxw8drjighvy7dna3mi749isrh"; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.2"; sha256 = "0xdjkdnrvnaxqgg38y5w1l3jbppigg68cc8q9jn0p21vn48bgrxq"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.2"; sha256 = "1szsg1iy77f0caxzkk0ihpp4ifbfnbdbn8k0wbbhbdprxj8pr356"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) @@ -141,7 +138,7 @@ (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0"; sha256 = "0gdsrzh8q8mxlm7sxvai7zshaz93a3dm1ha4cgs4845lfhpn8nhc"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.2"; sha256 = "0l28whcj3r8gmdg7vyb4sxbjdr12w5q9lqibclfrwrwhlx3rxhb0"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) @@ -156,9 +153,9 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0"; sha256 = "0bmvgaqy4iaxw9x88ifx3a2zz0vw3p9w6pj4bk3xfnf5p9vjx1mr"; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0"; sha256 = "0yrjcqcrlgqpdm3bi59nc3fppcqgrfc7jddjwxjj2q423gimip97"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0"; sha256 = "1bs2l9fjiqpip4qh0aw7x8f8m0ja0xlcj5vwd329knkww2jx1d3c"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.2"; sha256 = "0xkv2h80s4nz2yypiax30s1ws0yd6zdijf5rq1lqjcxaiggf6a7q"; }) + (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.2"; sha256 = "0zdj69w5dxzwj4fqcsjfjjbc67x931f7qb32i1jsn2k91v904gsd"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.2"; sha256 = "1877z97c8qbsr1adbc0hvfls03icgmzh4j3pjp8cfnxflxrxql6a"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) @@ -183,7 +180,7 @@ (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.31.0"; sha256 = "03bwmmznb4axcvlx8ql5cgigpbldjc1zrxnf5kj25r4drq8yp1cm"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.0"; sha256 = "15c717z4kspqxiwnia7dk1mj5gv7hg584q4x1xc7z1g0rnz28pwd"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -247,7 +244,6 @@ (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) @@ -261,9 +257,7 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix index 5a47111610..5c95f7f828 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wineasio/default.nix @@ -9,13 +9,13 @@ multiStdenv.mkDerivation rec { pname = "wineasio"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-HEnJj9yfXe+NQuPATMpPvseFs+3TkiMLd1L+fIfQd+o="; + hash = "sha256-d5BGJAkaM5XZXyqm6K/UzFE4sD6QVHHGnLi1bcHxiaM="; fetchSubmodules = true; }; @@ -36,10 +36,10 @@ multiStdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D build32/wineasio.dll $out/lib/wine/i386-windows/wineasio.dll - install -D build32/wineasio.dll.so $out/lib/wine/i386-unix/wineasio.dll.so - install -D build64/wineasio.dll $out/lib/wine/x86_64-windows/wineasio.dll - install -D build64/wineasio.dll.so $out/lib/wine/x86_64-unix/wineasio.dll.so + install -D build32/wineasio32.dll $out/lib/wine/i386-windows/wineasio32.dll + install -D build32/wineasio32.dll.so $out/lib/wine/i386-unix/wineasio32.dll.so + install -D build64/wineasio64.dll $out/lib/wine/x86_64-windows/wineasio64.dll + install -D build64/wineasio64.dll.so $out/lib/wine/x86_64-unix/wineasio64.dll.so runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix index fddef8deef..25f0511c47 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.111"; + version = "0.7.116"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-j7VNNKGm8mFEz+8779ylw1Yjd+jDuoL19Sw52kJll4s="; + hash = "sha256-/fUTQYi6EDG4wUFc17nuBUt/F1zBdhk/MEizwTo5I8Q="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix index 3fdd6db846..a24ded8525 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix @@ -49,10 +49,10 @@ }: let - tzinfoVersion = "220816"; + tzinfoVersion = "221202"; tzinfo = fetchurl { url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${tzinfoVersion}/${tzinfoVersion}.zip"; - hash = "sha256-yv8ykEYPu9upeXovei0u16iqQ7NasH6873KnQy4+KwI="; + hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; }; in stdenv.mkDerivation { pname = "yuzu-${branch}"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix index fc6d1813af..24997cbdcd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-10-07 +# Last updated: 2023-11-05 { compatList = { - rev = "156a0a80efc47069ba3360f8a1b268a1c6f2f505"; + rev = "e9c4e5da6e5e88e889c87582dfd826d204ca8782"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1579"; - hash = "sha256:0689w42as1di8xbh8kq2p0cws8gdwq64zdj3i8wq612nkw0q5s60"; + version = "1611"; + hash = "sha256:18rrw63j2zjwakbn99wbzprb1rpmlznl6gb09ay9sq8brxy7zjsv"; }; ea = { - version = "3911"; - distHash = "sha256:0xj642kjhj0gp9l15b3ysj3gmyy47rcvzw9amghsfl13bg5ffnwh"; - fullHash = "sha256:13rd6kwnhpvjzp67k6pqgl9fsqzwy5d8043hv6kd93gg8jbxkp38"; + version = "3966"; + distHash = "sha256:1p60455s0h3dwigxm2lxdfgxgv4l2ibwybisja1khcy4i8lgss03"; + fullHash = "sha256:1jq2bfbv9a6i3dlqsdgmi87rccvks45iyybxwf8p6rxdjqh4bvl2"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zesarux/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/zesarux/default.nix deleted file mode 100644 index 4a00f9b034..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/zesarux/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, SDL2 -, aalib -, alsa-lib -, libXext -, libXxf86vm -, libcaca -, libpulseaudio -, libsndfile -, ncurses -, openssl -, which -}: - -stdenv.mkDerivation rec { - pname = "zesarux"; - version = "10.0"; - - src = fetchFromGitHub { - owner = "chernandezba"; - repo = pname; - rev = version; - hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k="; - }; - - nativeBuildInputs = [ - which - ]; - - buildInputs = [ - SDL2 - aalib - alsa-lib - libXxf86vm - libXext - libcaca - libpulseaudio - libsndfile - ncurses - openssl - ]; - - patches = [ - # Patch the shell scripts; remove it when the next version arrives - (fetchpatch { - name = "000-fix-shebangs.patch"; - url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff"; - sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI="; - }) - - # Patch pending upstream release for libcaca-0.99.beta20 support: - # https://github.com/chernandezba/zesarux/pull/1 - (fetchpatch { - name = "libcaca-0.99.beta20.patch"; - url = "https://github.com/chernandezba/zesarux/commit/542786338d00ab6fcdf712bbd6f5e891e8b26c34.diff"; - sha256 = "sha256-UvXvBb9Nzw5HNz0uiv2SV1Oeiw7aVCa0jhEbThDRVec="; - }) - ]; - - postPatch = '' - cd src - patchShebangs ./configure *.sh - ''; - - configureFlags = [ - "--prefix=${placeholder "out"}" - "--c-compiler ${stdenv.cc.targetPrefix}cc" - "--enable-cpustats" - "--enable-memptr" - "--enable-sdl2" - "--enable-ssl" - "--enable-undoc-scfccf" - "--enable-visualmem" - ]; - - installPhase = '' - runHook preInstall - - ./generate_install_sh.sh - patchShebangs ./install.sh - ./install.sh - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/chernandezba/zesarux"; - description = " ZX Second-Emulator And Released for UniX"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} -# TODO: Darwin support diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix index 1583777a05..8e12d7cd7b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/default.nix @@ -23,6 +23,11 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; + patches = [ + ./zlib-1.3.patch + ./fortify3.patch + ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU libGL ]; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/fortify3.patch b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/fortify3.patch new file mode 100644 index 0000000000..cbd55a1c7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/fortify3.patch @@ -0,0 +1,20 @@ +pal16bxcl is an array of 256 dwords, not bytes: + src/endmem.asm:NEWSYM pal16bxcl, resd 256 + +While at it fixes off-by-4 out of bounds exit. + +Detected by _FORTIFY_SOURCE=3: + *** buffer overflow detected ***: terminated + #7 0x08057c14 in memset (__len=2, __ch=255, __dest=) at ...-glibc-2.38-23-dev/include/bits/string_fortified.h:59 +#8 clearmem () at initc.c:1461 +--- a/src/initc.c ++++ b/src/initc.c +@@ -1389,7 +1389,7 @@ extern unsigned char vidmemch8[4096]; + extern unsigned char pal16b[1024]; + extern unsigned char pal16bcl[1024]; + extern unsigned char pal16bclha[1024]; +-extern unsigned char pal16bxcl[256]; ++extern unsigned char pal16bxcl[1024]; + extern unsigned char SPCRAM[65472]; + unsigned char *SPCState = SPCRAM; + diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/zlib-1.3.patch b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/zlib-1.3.patch new file mode 100644 index 0000000000..0c4771f089 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/zlib-1.3.patch @@ -0,0 +1,41 @@ +Add support for 2-digit zlib version like "1.3". +--- a/src/acinclude.m4 ++++ b/src/acinclude.m4 +@@ -67,7 +67,7 @@ char* my_strdup (char *str) + + int main (int argc, char *argv[]) + { +- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version; ++ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0; + + char *zlibver, *tmp_version; + +@@ -85,7 +85,7 @@ int main (int argc, char *argv[]) + printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version"); + exit(1); + } +- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) { ++ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) { + printf("%s, bad version string given\n", zlibver); + puts("\tby zlib, sometimes due to very old zlibs that didnt correctly"); + printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... "); +--- a/src/configure ++++ b/src/configure +@@ -3817,7 +3817,7 @@ char* my_strdup (char *str) + + int main (int argc, char *argv[]) + { +- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version; ++ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0; + + char *zlibver, *tmp_version; + +@@ -3835,7 +3835,7 @@ int main (int argc, char *argv[]) + printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version"); + exit(1); + } +- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) { ++ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) { + printf("%s, bad version string given\n", zlibver); + puts("\tby zlib, sometimes due to very old zlibs that didnt correctly"); + printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... "); diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix index b26d20c650..ad35ae555d 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.16.0"; + version = "1.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "v${version}"; - hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM="; + hash = "sha256-FExDKugFP94C3zMnR1V4QDPWeM2OtRH2ei0LNs3h06c="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix index 37369ccdb2..577bad9e69 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }: +{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }: stdenv.mkDerivation rec { pname = "clifm"; - version = "1.14.6"; + version = "1.15"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc="; + sha256 = "sha256-4Z2u1APNfJ9Ai95MMWb5FCUgCA2Hrbp+5eBJZD3tN+U="; }; - buildInputs = [ libcap acl file readline ]; + buildInputs = [ libcap acl file readline python3]; makeFlags = [ "DESTDIR=${placeholder "out"}" diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix index 2c374511af..6c5544aded 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/dfilemanager/default.nix @@ -17,7 +17,7 @@ mkDerivation { cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { - homepage = "http://dfilemanager.sourceforge.net/"; + homepage = "https://github.com/probonopd/dfilemanager"; description = "File manager written in Qt/C++"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix index b0b7c34127..04491de0fd 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix @@ -3,32 +3,40 @@ , fetchFromGitHub , pkg-config , bzip2 +, libgit2 +, zlib , zstd , zoxide }: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.8.1"; + version = "2.10.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; rev = "v${version}"; - hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI="; + hash = "sha256-pDJW/QhkJtEAq7xusYn/t/pPizT77OYmlbVlF/RTXic="; }; - cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY="; + cargoHash = "sha256-AGQt06fMXuyOEmQIEiUCzuK1Atx3gQMUCB+hPWlrldk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 + libgit2 + zlib zstd ]; nativeCheckInputs = [ zoxide ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + buildFeatures = [ "zstd/pkg-config" ]; checkFlags = [ @@ -37,11 +45,6 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::test_has_write_permission" ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix index 2a15b12a9f..d6273cf07e 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs="; + hash = "sha256-hif62WAyJyFHpJoP3ph7gJk1QkEL7qkcv/BJuoXkwFU="; }; - vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc="; + vendorHash = "sha256-e292ke0JiFEopLSozb+FkpwzSuhpIs/PdWOYuNI2M2o="; meta = with lib; { description = "Terminal file manager"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix deleted file mode 100644 index 3848487cbd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, libX11, fetchurl }: - -stdenv.mkDerivation rec { - pname = "worker"; - version = "4.12.1"; - - src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; - }; - - buildInputs = [ libX11 ]; - - meta = with lib; { - description = "A two-pane file manager with advanced file manipulation features"; - homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; - license = licenses.gpl2; - maintainers = []; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix index 7757a1322b..cd0476c1e0 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix @@ -3,6 +3,7 @@ , lib , makeWrapper +, installShellFiles , stdenv , Foundation @@ -30,18 +31,18 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "sxyazi"; repo = pname; rev = "v${version}"; - hash = "sha256-ARpludMVQlZtCRAfW0cNYVmT3m9t9lunMIW24peYX6Y="; + hash = "sha256-FhKrq4N32uJRHGc0qRl+CIVNRW597jACcTFEgj8hiSE="; }; - cargoHash = "sha256-dhdk5aGKv6tY8x7MmA0hWcmJBiXOXC92DlQTd/1AKtQ="; + cargoHash = "sha256-YUymZhDp1Pjm+W6m8Vmh2AgMCdaNt6TQQpiJwSg/gPw="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; postInstall = with lib; @@ -60,6 +61,10 @@ rustPlatform.buildRustPackage rec { '' wrapProgram $out/bin/yazi \ --prefix PATH : "${makeBinPath runtimePaths}" + installShellCompletion --cmd yazi \ + --bash ./config/completions/yazi.bash \ + --fish ./config/completions/yazi.fish \ + --zsh ./config/completions/_yazi ''; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix index f00118fdf7..c10e0d4368 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -11,41 +11,25 @@ let python = python310.override { packageOverrides = self: super: { - pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { - version = "1.28.6"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "py-pdf"; - repo = "pypdf"; - rev = version; - fetchSubmodules = true; - hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; - }; - - nativeBuildInputs = []; - - nativeCheckInputs = with self; [ pytestCheckHook pillow ]; - }); flask = super.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; + version = "2.3.3"; src = old.src.override { inherit version; - hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; }); werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.1.2"; + version = "2.3.7"; src = old.src.override { inherit version; - hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; }); }; }; odoo_version = "16.0"; - odoo_release = "20230722"; + odoo_release = "20231024"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; @@ -56,7 +40,7 @@ in python.pkgs.buildPythonApplication rec { src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-pSycpYSiqJ6DKENvCWwLz+JaPUXT5dmaq8x4Aency60="; # odoo + hash = "sha256-Ux8RfA7kWLKissBBY5wrfL+aKKw++5BxjP3Vw0JAOsk="; # odoo }; # needs some investigation @@ -69,6 +53,7 @@ in python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ babel chardet + cryptography decorator docutils ebaysdk @@ -80,7 +65,6 @@ in python.pkgs.buildPythonApplication rec { libsass lxml markupsafe - mock num2words ofxparse passlib @@ -100,13 +84,16 @@ in python.pkgs.buildPythonApplication rec { qrcode reportlab requests - setuptools + urllib3 vobject werkzeug xlrd xlsxwriter xlwt zeep + + setuptools + mock ]; # takes 5+ minutes and there are not files to strip diff --git a/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix index 1bf08aedd2..8c26be6bb2 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/gmt/dcw.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dcw-gmt"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "sha256-q3LIJTB2OAyEd6EiU3C8QfSv+BHCjS9k11BS/z2QA68="; + sha256 = "sha256-S7hA0HXIuj4UrrQc8XwkI2v/eHVmMU+f91irmXd0XZk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/clang-integer-conversion.patch b/third_party/nixpkgs/pkgs/applications/gis/grass/clang-integer-conversion.patch new file mode 100644 index 0000000000..85145f45c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/clang-integer-conversion.patch @@ -0,0 +1,21 @@ +diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c +--- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500 +@@ -52,9 +52,16 @@ + + db_get_login2("mysql", name, &user, &password, &host, &port); + ++ const char* errstr; ++ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr); ++ if (errstr != NULL) { ++ db_d_append_error("%s", errstr); ++ return DB_FAILED; ++ } ++ + connection = mysql_init(NULL); + res = mysql_real_connect(connection, host, user, password, +- connpar.dbname, port, NULL, 0); ++ connpar.dbname, port_number, NULL, 0); + + if (res == NULL) { + db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 654aa6451f..cd0d6dbc93 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4="; + hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ="; }; nativeBuildInputs = [ @@ -81,12 +81,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # On Darwin the installer tries to symlink the help files into a system - # directory - patches = [ ./no_symbolic_links.patch ]; + patches = lib.optionals stdenv.isDarwin [ + # Fix conversion of const char* to unsigned int. + ./clang-integer-conversion.patch + ]; # Correct mysql_config query - patchPhase = '' + postPatch = '' substituteInPlace configure --replace "--libmysqld-libs" "--libs" ''; diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/no_symbolic_links.patch b/third_party/nixpkgs/pkgs/applications/gis/grass/no_symbolic_links.patch deleted file mode 100644 index ef09b97b70..0000000000 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/no_symbolic_links.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/include/Make/Install.make b/include/Make/Install.make -index 0aba138..8ba74bc 100644 ---- a/include/Make/Install.make -+++ b/include/Make/Install.make -@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) - -$(INSTALL) config.status $(INST_DIR)/config.status - -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null - --ifneq ($(findstring darwin,$(ARCH)),) -- @# enable OSX Help Viewer -- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) --endif -- - $(INST_DIR) $(UNIX_BIN): - $(MAKE_DIR_CMD) $@ - -diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh -index 04e63eb..c9d9c2c 100755 ---- a/macosx/app/build_html_user_index.sh -+++ b/macosx/app/build_html_user_index.sh -@@ -140,7 +140,6 @@ else - # echo "" >> $FULLINDEX - # make them local to user to simplify page links - echo "" >> $FULLINDEX -- ln -sf "$HTMLDIRG/$i" global_$i - done - done - fi -@@ -183,8 +182,3 @@ echo " - " > $i.html - done - --# add Help Viewer links in user docs folder -- --mkdir -p $HOME/Library/Documentation/Help/ --ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon --ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER 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 83be13b959..f6cc1bbc40 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -76,14 +76,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.28.11"; + version = "3.28.12"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-3yV47GlIhYGR7+ZlPLQw1vy1x8xuJd5erUJO3Pw7L+g="; + hash = "sha256-C80ZrQW7WFXz8UMXSt3FJcK2gDd292H24Ic3pJD/yqI="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 8d01ce5f7a..3faf4d304a 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -12,6 +11,7 @@ , bison , cmake +, draco , exiv2 , fcgi , flex @@ -64,8 +64,8 @@ let owslib psycopg2 pygments - pyqt-builder pyqt5 + pyqt-builder python-dateutil pytz pyyaml @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.32.3"; + version = "3.34.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ge5ne22sDLKbrJk2vYQxpu3iRXSoOk9924c/RdtD3Nc="; + hash = "sha256-+Yzp8kfd7cfxTwsrxRo+6uS+2Aj4HfKA2E8hSf7htsU="; }; passthru = { @@ -104,6 +104,7 @@ in mkDerivation rec { ]; buildInputs = [ + draco exiv2 fcgi geos @@ -142,11 +143,6 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch"; - hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14="; - }) ]; # Add path to Qt platform plugins @@ -156,8 +152,9 @@ in mkDerivation rec { ''; cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" - "-DWITH_PDAL=TRUE" + "-DWITH_PDAL=True" "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix index 9be6e3c036..f396ded7e1 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.1.1"; + version = "9.2.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - sha256 = "sha256-VXupgjoiexZZ1kLXAbbQMW7XQ7FWjd1ejZPeeTffUhM="; + sha256 = "sha256-jHZi1c1M5WQfqBmtIvI7S9mWNXmzGUsvgJICvXbSjVc="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix b/third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix index fd8c893a91..3ec0439a5d 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/tunnelx/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tunnelx"; - version = "2023-07-nix"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "CaveSurveying"; repo = "tunnelx"; rev = "v${finalAttrs.version}"; - hash = "sha256-H6lHqc9on/pv/KihNcaHPwbWf4JXRkeRqNoYq6yVKqM="; + hash = "sha256-4vTtmhVNDXUD7pCiugt+Yl/M3MFsUnzJfpcU9AxnGvA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index c6d3a83e0c..d248b845dd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, nixos-icons , perlPackages , python3 }: @@ -48,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-19"; + version = "7.1.1-21"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; + hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -126,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix index 96a53b5efb..e611a56a66 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + # https://github.com/autotrace/autotrace/pull/105 name = "imagemagick7-support.patch"; - url = "https://github.com/autotrace/autotrace/pull/105.patch"; + url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch"; hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix index a780fc039a..ac52af2a7d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I="; + hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix index ca1639f811..1ff914c274 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "batik"; - version = "1.16"; + version = "1.17"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-Y4bJ6X46sKx1+fmNkOS2RU7gn7n0fKDnkOYMq0S8fYM="; + sha256 = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 9abc3cb9ce..bdf12444b2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -10,7 +10,7 @@ , ninja , curl , perl -, llvm_13 +, llvmPackages_13 , desktop-file-utils , exiv2 , glib @@ -53,7 +53,6 @@ , libheif , libaom , portmidi -, fetchpatch , lua }: @@ -66,7 +65,9 @@ stdenv.mkDerivation rec { sha256 = "c11d28434fdf2e9ce572b9b1f9bc4e64dcebf6148e25080b4c32eb51916cfa98"; }; - nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ] + # LLVM Clang C compiler version 11.1.0 is too old and is unsupported. Version 12+ is required. + ++ lib.optionals stdenv.isDarwin [ llvmPackages_13.clang ]; buildInputs = [ cairo diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix index 093a53978a..eb9d54d5cf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -15,6 +15,7 @@ , pkg-config , poppler , python3 +, wrapGAppsHook # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: @@ -59,6 +60,7 @@ stdenv.mkDerivation { meson ninja pkg-config + wrapGAppsHook ] ++ lib.optionals withDocs [ dblatex diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix index 2a7e0e9ac0..be714028ec 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -67,6 +67,14 @@ mkDerivation rec { hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch"; + hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 9241453152..fdf571b026 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,6 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, desktopToDarwinBundle , fixup_yarn_lock , makeWrapper , nodejs @@ -14,28 +13,29 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "22.0.2"; + version = "22.0.3"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-L+tbNCokVoiS2KkaPVBjG7H/8cqz1e8dlXC5H8BkPvU="; + hash = "sha256-Im0T+1jm1IZT3UILsOJ4Rp5P5IiBUKcJJ+cqv3WsqXw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-d8AquOKdrPQHBhRG9o1GB18LpwlwQK6ZaM1gLAcjilM="; + hash = "sha256-Abyu/WoNOPAIfRIThG7vKFECW9NQMgcBAkLgEPwdJDQ="; }; nativeBuildInputs = [ - copyDesktopItems fixup_yarn_lock makeWrapper nodejs yarn - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optionals (!stdenv.isDarwin) [ + copyDesktopItems + ]; ELECTRON_SKIP_BINARY_DOWNLOAD = true; @@ -54,9 +54,15 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + '' + lib.optionalString stdenv.isDarwin '' + cp -R ${electron}/Applications/Electron.app Electron.app + chmod -R u+w Electron.app + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" electron-builder-linux-mac.json + '' + '' yarn --offline run electron-builder --dir \ --config electron-builder-linux-mac.json \ - -c.electronDist=${electron}/libexec/electron \ + -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} runHook postBuild @@ -65,6 +71,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv dist/mac*/draw.io.app $out/Applications + + # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place. + makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio + '' + lib.optionalString (!stdenv.isDarwin) '' mkdir -p "$out/share/lib/drawio" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" @@ -74,6 +87,7 @@ stdenv.mkDerivation rec { --add-flags "$out/share/lib/drawio/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 + '' + '' runHook postInstall ''; @@ -98,6 +112,5 @@ stdenv.mkDerivation rec { changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ qyliss darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix index 5cd574bf9b..79e66d8ed9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, libGL , libjpeg , libexif , giflib @@ -17,6 +18,7 @@ , sane-backends , libXpm , libepoxy +, pixman , poppler , mesa , lirc @@ -42,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; buildInputs = [ + libGL libexif libjpeg libpng @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { libdrm libXpm libepoxy + pixman poppler lirc mesa diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 4859fee52f..af41424d58 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "feh"; - version = "3.10"; + version = "3.10.1"; src = fetchFromGitHub { owner = "derf"; repo = pname; rev = version; - hash = "sha256-9NJ6zgQHcFJPmRlqJuCMXcKjLvDPUG+QvKGTJlWvWK4="; + hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg="; }; outputs = [ "out" "man" "doc" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # released under a variant of the MIT license # https://spdx.org/licenses/MIT-feh.html license = licenses.mit-feh; - maintainers = with maintainers; [ viric willibutz globin ma27 ]; + maintainers = with maintainers; [ viric willibutz globin ]; platforms = platforms.unix; mainProgram = "feh"; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix index 64af09ada8..0ee58e009c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ ercao kashw2 ]; + knownVulnerabilities = [ "CVE-2023-5217" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix index 039eb45a29..e3847b98d5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fiji/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ zane ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/third_party/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch new file mode 100644 index 0000000000..27e5fb81b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -0,0 +1,61 @@ +From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Thu, 2 Nov 2023 17:32:07 +0100 +Subject: [PATCH] NIXOS: don't ignore PYTHONPATH + +On NixOS or rather within nixpkgs we provide the runtime Python +packages via the PYTHONPATH environment variable. FreeCAD tries its +best to ignore Python environment variables that are being inherited +from the environment. For Python versions >=3.11 it also tries to +initialize the interpreter config without any environmental data. We +have to initialize the configuration *with* the information from the +environment for our packaging to work. + +Upstream has purposely isolated the environments AFAIK and thus +shouldn't accept this patch (as is). What they might accept (once +support for older Python versions has been dropped) is removing the +PYTHONPATH specific putenv calls. +--- + src/Base/Interpreter.cpp | 2 +- + src/Main/MainGui.cpp | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp +index 52c47168af..9966bd0013 100644 +--- a/src/Base/Interpreter.cpp ++++ b/src/Base/Interpreter.cpp +@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) + { + PyStatus status; + PyConfig config; + PyConfig_InitIsolatedConfig(&config); ++ config.isolated = 0; ++ config.use_environment = 1; + + status = PyConfig_SetBytesArgv(&config, argc, argv); + if (PyStatus_Exception(status)) { +diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp +index 48ae847ef4..28813df383 100644 +--- a/src/Main/MainGui.cpp ++++ b/src/Main/MainGui.cpp +@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) + // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 + // See Gui::Application::runApplication() + putenv("LC_NUMERIC=C"); +- putenv("PYTHONPATH="); + #elif defined(FC_OS_MACOSX) + (void)QLocale::system(); +- putenv("PYTHONPATH="); + #elif defined(__MINGW32__) + const char* mingw_prefix = getenv("MINGW_PREFIX"); + const char* py_home = getenv("PYTHONHOME"); + if (!py_home && mingw_prefix) + _putenv_s("PYTHONHOME", mingw_prefix); + #else +- _putenv("PYTHONPATH="); + // https://forum.freecad.org/viewtopic.php?f=4&t=18288 + // https://forum.freecad.org/viewtopic.php?f=3&t=20515 + const char* fc_py_home = getenv("FC_PYTHONHOME"); +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index f997f23d43..1ef114c9c4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -9,6 +9,7 @@ , boost , coin3d , eigen +, freecad # for passthru.tests , gfortran , gts , hdf5 @@ -35,6 +36,7 @@ , qtwebengine , qtx11extras , qtxmlpatterns +, runCommand # for passthru.tests , scipy , shiboken2 , soqt @@ -49,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-rwt81Z+Bp8uZlR4iuGQEDKBu/Dr9Rqg7d9SsCdofTUU="; + hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; }; nativeBuildInputs = [ @@ -108,6 +110,10 @@ stdenv.mkDerivation (finalAttrs: { qtx11extras ]; + patches = [ + ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ]; + cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" @@ -127,10 +133,7 @@ stdenv.mkDerivation (finalAttrs: { export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; - # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; @@ -146,6 +149,21 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd ''; + passthru.tests = { + # Check that things such as argument parsing still work correctly with + # the above PYTHONPATH patch. Previously the patch used above changed + # the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`, + # which caused the built-in interpreter to attempt (and fail) to doubly + # parse argv. This should catch if that ever regresses and also ensures + # that PYTHONPATH is still respected enough for the FreeCAD console to + # successfully run and check that it was included in `sys.path`. + python-path = runCommand "freecad-test-console" { + nativeBuildInputs = [ freecad ]; + } '' + HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" {try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ + 'checkUdev=()=>{return 1}' + ''; + }; + + # also make sure to update the udev rules in ./10-dygma.rules; most recently + # taken from + # https://github.com/Dygmalab/Bazecor/blob/v1.3.6/src/main/utils/udev.ts#L6 + + extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ + p.glib + ]; + + # Also expose the udev rules here, so it can be used as: + # services.udev.packages = [ pkgs.bazecor ]; + # to allow non-root modifications to the keyboards. + + extraInstallCommands = '' + mv $out/bin/bazecor-* $out/bin/bazecor + + mkdir -p $out/lib/udev/rules.d + ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + ''; + + meta = { + description = "Graphical configurator for Dygma Products"; + homepage = "https://github.com/Dygmalab/Bazecor"; + changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "bazecor"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix deleted file mode 100644 index 4d7789f033..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: - -stdenv.mkDerivation rec { - pname = "binance"; - version = "1.39.0"; - - src = fetchurl { - url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6VQerIzX2u8QGUsa8kvu6Qud3OEn9lrZkQddfkZ1X0g="; - }; - - nativeBuildInputs = [ - dpkg - autoPatchelfHook - makeWrapper - ]; - - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss popt ]; - - libPath = lib.makeLibraryPath buildInputs; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - runHook postInstall - ''; - - postFixup = '' - substituteInPlace $out/share/applications/binance.desktop --replace '/opt/Binance' $out/bin - - makeWrapper ${electron}/bin/electron \ - $out/bin/binance \ - --add-flags $out/opt/Binance/resources/app.asar \ - --prefix LD_LIBRARY_PATH : ${libPath} - ''; - - meta = with lib; { - description = "Binance Cryptoexchange Official Desktop Client"; - homepage = "https://www.binance.com/en/desktop-download"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 534107f615..4865f9f29e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "Mail system tray notification icon for Thunderbird"; homepage = "https://github.com/gyunaev/birdtray"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ Flakebi oxalica ]; + maintainers = with maintainers; [ Flakebi ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 0b368ef1b3..7a6db59bf6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -6,7 +6,7 @@ , zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport, cudaPackages ? { } -, hipSupport ? false, hip # comes with a significantly larger closure size +, hipSupport ? false, rocmPackages # comes with a significantly larger closure size , colladaSupport ? true, opencollada , spaceNavSupport ? stdenv.isLinux, libspnav , makeWrapper @@ -18,10 +18,13 @@ , openpgl , mesa , runCommand +, callPackage }: let - python = python310Packages.python; + pythonPackages = python310Packages; + inherit (pythonPackages) python; + buildEnv = callPackage ./wrapper.nix {}; optix = fetchzip { # url taken from the archlinux blender PKGBUILD url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; @@ -31,11 +34,11 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-zFL0GRWAtNC3C+SAspWZmGa8US92EiYQgVfiOsCJRx4="; + hash = "sha256-QAHA/pn22HLsfH6VX4Sp7r25raFxAPS1Gergjez38kM="; }; patches = [ @@ -103,8 +106,8 @@ stdenv.mkDerivation (finalAttrs: rec { substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '') + (lib.optionalString hipSupport '' - substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"' - substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"' + substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' + substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); cmakeFlags = @@ -189,7 +192,9 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = { - inherit python; + inherit python pythonPackages; + + withPackages = f: let packages = f pythonPackages; in buildEnv.override { blender = finalAttrs.finalPackage; extraModules = packages; }; tests = { render = runCommand "${pname}-test" { } '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/wrapper.nix index 3828d61a86..7450827a8f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/wrapper.nix @@ -2,32 +2,28 @@ , lib , blender , makeWrapper -, python3Packages +, extraModules ? [] }: -{ name ? "wrapped" -, packages ? [] -}: -stdenv.mkDerivation { - pname = "blender-${name}"; - inherit (blender) version; +stdenv.mkDerivation (finalAttrs: { + pname = blender.pname + "-wrapped"; src = blender; - nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ]; + inherit (blender) version meta; + + nativeBuildInputs = [ blender.pythonPackages.wrapPython makeWrapper ]; installPhase = '' mkdir $out/{share/applications,bin} -p - sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop + sed 's/Exec=blender/Exec=${finalAttrs.finalPackage.pname}/g' $src/share/applications/blender.desktop > $out/share/applications/${finalAttrs.finalPackage.pname}.desktop cp -r $src/share/blender $out/share cp -r $src/share/doc $out/share cp -r $src/share/icons $out/share buildPythonPath "$pythonPath" - makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \ + makeWrapper ${blender}/bin/blender $out/bin/${finalAttrs.finalPackage.pname} \ --prefix PATH : $program_PATH \ --prefix PYTHONPATH : $program_PYTHONPATH ''; - pythonPath = packages; - - meta = blender.meta; -} + pythonPath = extraModules; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix index ab047e0809..2ada67daa1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -76,6 +76,6 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index a71984dd2c..b8b7eb435a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.26.0"; + version = "6.29.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM="; + hash = "sha256-w9mvMKm76w5sDfW0OYxhZuhIOYKdUH3tpiGlpKNC2kM="; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac="; + hash = "sha256-eTzwo8aAIJnZTIZ/8DqCQi3ZbKxycEdiv+UxRuxo12g="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; @@ -148,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \ + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 5164b80a0b..e88e737443 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,12 +1,12 @@ diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py -index 938ab24..1e095f8 100644 +index 50b4750124..858e39eece 100644 --- a/src/calibre/ebooks/metadata/archive.py +++ b/src/calibre/ebooks/metadata/archive.py -@@ -44,7 +44,7 @@ +@@ -99,7 +99,7 @@ class ArchiveExtract(FileTypePlugin): description = _('Extract common e-book formats from archive files ' - '(ZIP/RAR). Also try to autodetect if they are actually ' - 'CBZ/CBR files.') -- file_types = {'zip', 'rar'} -+ file_types = {'zip'} + '(ZIP/RAR/7z). Also try to autodetect if they are actually ' + 'CBZ/CBR/CB7 files.') +- file_types = {'zip', 'rar', '7z'} ++ file_types = {'zip', '7z'} supported_platforms = ['windows', 'osx', 'linux'] on_import = True 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 be7898d696..c9caa508f1 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.15.1"; + version = "5.17.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-q9wzfNyMzlyGTjaFOA7TZt+F/jC6EnPb/i4Q9eRxS3E="; + hash = "sha256-yxph3Aor5nZOhu2PY4MGcfScaz9w24JXqXbhT+QKlNI="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 04c30deef7..33e8341000 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - rev = version; - hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZGw6gESKaio89mt3VPm/uqHwlUQ0/8vIydv/WsOYQ20="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix index 1ce6195aae..f03b27ea51 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/comodoro/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comodoro"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "soywod"; repo = "comodoro"; rev = "v${version}"; - hash = "sha256-pxe3Nv1N85uWsiv4s0wtD++zlZZgMADH51f5RMK9huA="; + hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; }; - cargoSha256 = "E5oHeMow9MrVrlDX+v0tX9Nv3gHUxDNUpRAT5jPa+DI="; + cargoHash = "sha256-1WJIIsTzbChWqvdBSR/OpLC1iR8FgLmypJFQEtpalbw="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index cbd66c89f9..dacb6c3af9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , ninja , extra-cmake-modules @@ -26,6 +27,15 @@ stdenv.mkDerivation rec { hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg="; }; + patches = [ + # itemfakevim: fix build with qt 6.6.0 + # https://github.com/hluk/CopyQ/pull/2508 + (fetchpatch2 { + url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch"; + hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix index 9c0a000bab..0771737eb2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-HETD2+acxJf30iC6UwRXD/onFYo3ki4RwAAVs4NbSAw="; + sha256 = "sha256-a8cLtmv9nLtvN9o/aIwveTAT36XmTN1j85ZxVGIXO6E="; }; patches = [ ./polkit-dir.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix index 0e4a664d23..054823b86f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-c2QjFDJmRLlXU1ZMOjb0BhIRgqubCTRyncc2KUKOhsg="; + hash = "sha256-IGk7akmHGQXLHfCCq6GXOIUnh63/sE2Ds+8H91uMKnw="; }; - cargoHash = "sha256-NnxgNk/C1DmEmPb2AcocsPsp2ngdyjbMP71M+fNL1qA="; + cargoHash = "sha256-2SD62zlWck+DPFs8bQipd8G09134L6LotrzfAiM1Pc8="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 9c207dcd77..6c70d49fdd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.10"; + version = "2.11.0"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28="; + hash = "sha256-e0zfbfRNzAiNvlWO84YbMApUXXzMcZG1MckTGMZm2ik="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix b/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix index 89678b7d0f..1b33b9fac3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { license = licenses.isc; maintainers = [ maintainers.ajgrf ]; platforms = platforms.linux; + mainProgram = "darkman"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 04804732ed..07069dce1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.6"; + version = "2.4.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-k+I4n05IbQT7tGzkJ0aPW6kLT1mGqwQOwoKDyal8L3w="; + hash = "sha256-zxTT/CkSbH40R7itXAx0zD+haHOoMep/W4KfalJQ/8w="; }; - vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; + vendorHash = "sha256-CbR0uHtha2OoHW9mcB1I2lGJbjerbZARVN/mTstv/Y0="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix index 020373da38..ffcd26afc9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.3.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "sha256-P8dh6k8lht1/JNILzNZEyYD8loNoJjG5869K2Hl11z8="; + sha256 = "sha256-T4/c8K1P/o91DWJik/9HtHav948vbVa40qPdy7nKmos="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix index a90dddb316..ea74034642 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diebahn/default.nix @@ -15,6 +15,7 @@ , gtk4 , libadwaita , pango +, gettext , darwin }: @@ -54,9 +55,19 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Foundation + Security + ]); + + # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys + # because the vendored copy does not build with newer versions of clang. + env = lib.optionalAttrs stdenv.isDarwin { + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; meta = { description = "GTK4 frontend for the travel information of the german railway"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index 918605366f..1f37a8e942 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; rev = "v${version}"; - sha256 = "sha256-Si8v5ZY1Q/AwQTaxa1bYG8bgqxWj++c4Hh1LzXSmSwE="; + sha256 = "sha256-jt11wssl8cH2cH3NXF+iWHxVNxPJm0I8toignBHq3q0="; }; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix index a380a06741..50172b9d1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/effitask/default.nix @@ -5,7 +5,6 @@ , openssl , gtk3 , stdenv -, rust }: rustPlatform.buildRustPackage rec { @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { # default installPhase don't install assets installPhase = '' runHook preInstall - make install PREFIX="$out" TARGET="target/${rust.toRustTarget stdenv.hostPlatform}/release/effitask" + make install PREFIX="$out" TARGET="target/${stdenv.hostPlatform.rust.rustcTarget}/release/effitask" runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index dbf22e9508..a4bbdc2eb7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -7,52 +7,7 @@ , radicale3 }: -let - python = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = old.src.override { - inherit version; - hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; - }; - - patches = [ - # Pulling in this patch lets us continue running tests without any - # other changes using setuptools >= 67.5.0. - (fetchpatch { - name = "remove-deprecated-pkg-resources.patch"; - url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch"; - hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU="; - includes = [ "src/flask/cli.py" ]; - }) - ]; - }); - flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { - version = "0.15.1"; - src = old.src.override { - inherit version; - hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw="; - }; - disabledTests = [ - "test_outside_request" - ]; - disabledTestPaths = [ - "tests/test_form.py" - "tests/test_html5.py" - ]; - patches = [ ]; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = old.src.override { - inherit version; - hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "etesync-dav"; version = "0.32.1"; @@ -69,7 +24,7 @@ in python.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ appdirs etebase etesync diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock index 6c5d689d37..b8dba83ebf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/Cargo.lock @@ -4,19 +4,19 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", - "log", "memchr", "pin-project-lite", "tokio", "tokio-util", + "tracing", ] [[package]] @@ -30,7 +30,7 @@ dependencies = [ "actix-utils", "actix-web", "askama_escape", - "bitflags", + "bitflags 1.3.2", "bytes", "derive_more", "futures-core", @@ -44,17 +44,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", + "ahash", "base64", - "bitflags", + "bitflags 2.2.1", "brotli", "bytes", "bytestring", @@ -127,7 +127,7 @@ dependencies = [ "futures-util", "mio", "num_cpus", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" dependencies = [ "actix-codec", "actix-http", @@ -168,7 +168,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -177,7 +177,6 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", "itoa", "language-tags", "log", @@ -189,8 +188,8 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2", - "time 0.3.20", + "socket2 0.5.3", + "time 0.3.21", "url", ] @@ -206,6 +205,15 @@ dependencies = [ "syn 1.0.109", ] +[[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" @@ -214,25 +222,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", -] - -[[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]] @@ -249,9 +245,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -271,6 +267,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[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" @@ -282,55 +284,63 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", + "colorchoice", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arbitrary-int" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2967dc82d90be9986876ba8ec7a7d89f5cc64930cc576a683089caae12134ee2" +checksum = "6a49f791c7c8885e8221d31bc3a34455b0fd869810d8ddff608dbe08a598f9d9" [[package]] name = "askama_escape" @@ -371,10 +381,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] -name = "base64" -version = "0.21.0" +name = "backtrace" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.1", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -391,12 +416,24 @@ dependencies = [ "serde", ] +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + [[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 = "block-buffer" version = "0.10.4" @@ -429,9 +466,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -504,70 +541,69 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "4.2.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "claxon" @@ -577,22 +613,24 @@ checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" [[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", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" @@ -604,21 +642,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -638,7 +661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time 0.3.21", "version_check", ] @@ -654,15 +677,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -682,6 +705,40 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +[[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" @@ -707,50 +764,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "cxx" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.109", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -782,24 +795,10 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "4.0.0" +name = "either" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encoding_rs" @@ -812,33 +811,28 @@ dependencies = [ [[package]] name = "enolib" -version = "0.1.0" -source = "git+https://codeberg.org/simonrepp/enolib-rs#fdb3d6fa2184d3a19f32246e71451881358a3de5" +version = "0.2.1" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.2.1#16f94efb92203f5b8f92a67de6abb7fa0ef5869d" [[package]] -name = "errno" -version = "0.2.8" +name = "exr" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.6.2", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] name = "faircamp" -version = "0.1.0" +version = "0.8.0" dependencies = [ "actix-files", "actix-web", @@ -850,8 +844,8 @@ dependencies = [ "enolib", "hound", "id3", - "indoc 1.0.9", - "indoc 2.0.1", + "image", + "indoc", "iso_currency", "lewton", "libvips", @@ -873,6 +867,15 @@ dependencies = [ "zip", ] +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + [[package]] name = "fixed" version = "1.23.1" @@ -887,12 +890,25 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", ] [[package]] @@ -903,36 +919,36 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-task", @@ -942,39 +958,48 @@ dependencies = [ [[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", ] [[package]] -name = "getopts" -version = "0.2.21" +name = "getrandom" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ - "unicode-width", + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.2.8" +name = "gif" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "color_quant", + "weezl", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "h2" -version = "0.3.16" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1041,12 +1066,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - [[package]] name = "hex" version = "0.4.3" @@ -1062,6 +1081,15 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hound" version = "3.5.0" @@ -1099,54 +1127,72 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[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 = "id3" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d7a833474b30425eb64132d1f9b727b4e39537418bcc3288497c8d2f5c8948" +checksum = "9389dd9c8c4671b1e4b2878a6329bccb573f9c24a75bc91c641c451ce5436501" dependencies = [ - "bitflags", + "bitflags 2.2.1", "byteorder", "flate2", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "indexmap" -version = "1.9.2" +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1154,37 +1200,17 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] -name = "indoc" -version = "2.0.1" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" - -[[package]] -name = "io-lifetimes" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", + "generic-array", ] [[package]] @@ -1198,9 +1224,9 @@ dependencies = [ [[package]] name = "iso_currency" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cd86f5dc2dd0a46368e141f794bf2cc53d13a1e8cdce9e6ca0f8c94ef6e096" +checksum = "33f07181be95c82347a07cf4caf43d2acd8a7e8d08ef1db75e10ed5a9aec3c1b" dependencies = [ "iso_country", ] @@ -1224,7 +1250,7 @@ dependencies = [ "log", "thiserror", "walkdir", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1243,10 +1269,19 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.61" +name = "jpeg-decoder" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -1263,6 +1298,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + [[package]] name = "lewton" version = "0.10.2" @@ -1276,9 +1317,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libvips" @@ -1290,21 +1331,6 @@ dependencies = [ "num-traits", ] -[[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 = "local-channel" version = "0.1.3" @@ -1357,6 +1383,15 @@ 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 = "metaflac" version = "0.2.5" @@ -1370,9 +1405,9 @@ dependencies = [ [[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 = "mime_guess" @@ -1399,6 +1434,16 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + [[package]] name = "mio" version = "0.8.6" @@ -1408,7 +1453,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1420,6 +1465,15 @@ dependencies = [ "rand", ] +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + [[package]] name = "ndk-context" version = "0.1.1" @@ -1457,6 +1511,17 @@ 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" @@ -1472,7 +1537,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -1485,6 +1550,15 @@ dependencies = [ "malloc_buf", ] +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + [[package]] name = "ogg" version = "0.8.0" @@ -1509,12 +1583,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "opus" version = "0.3.0" @@ -1564,7 +1632,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1598,15 +1666,35 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] [[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" @@ -1616,9 +1704,22 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] [[package]] name = "ppv-lite86" @@ -1628,30 +1729,38 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "bitflags", - "getopts", + "bitflags 1.3.2", "memchr", "unicase", ] [[package]] -name = "quote" -version = "1.0.26" +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1688,9 +1797,31 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[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" @@ -1698,25 +1829,26 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", -] - -[[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", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1725,9 +1857,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rmp3" @@ -1739,6 +1871,12 @@ dependencies = [ "libc", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc_version" version = "0.4.0" @@ -1748,20 +1886,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.36.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - [[package]] name = "ryu" version = "1.0.13" @@ -1779,9 +1903,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" dependencies = [ "lazy_static", "regex", @@ -1793,12 +1917,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "semver" version = "1.0.17" @@ -1807,26 +1925,29 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1876,6 +1997,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + [[package]] name = "slab" version = "0.4.8" @@ -1911,10 +2038,20 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.9.6" +name = "socket2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -1950,42 +2087,44 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] @@ -2001,9 +2140,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -2013,15 +2152,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -2043,11 +2182,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -2055,27 +2194,27 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -2099,9 +2238,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -2123,9 +2262,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -2142,17 +2281,11 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2195,9 +2328,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2205,24 +2338,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2230,28 +2363,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" dependencies = [ "js-sys", "wasm-bindgen", @@ -2259,12 +2392,12 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", - "dirs", + "home", "jni", "log", "ndk-context", @@ -2274,6 +2407,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + [[package]] name = "winapi" version = "0.3.9" @@ -2305,13 +2444,31 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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]] @@ -2320,13 +2477,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] @@ -2335,36 +2507,72 @@ 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" @@ -2372,10 +2580,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "zip" -version = "0.6.4" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -2387,7 +2601,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.20", + "time 0.3.21", "zstd 0.11.2+zstd.1.5.2", ] @@ -2406,7 +2620,7 @@ version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ - "zstd-safe 6.0.4+zstd.1.5.4", + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -2421,9 +2635,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.4+zstd.1.5.4" +version = "6.0.5+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -2431,11 +2645,20 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", "pkg-config", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix index df9d08dacc..bbceb6833b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchgit +, fetchFromGitea , makeWrapper , pkg-config , glib @@ -9,29 +9,32 @@ , vips , ffmpeg , callPackage -, unstableGitUpdater , darwin +, testers +, faircamp }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "unstable-2023-04-10"; + version = "0.8.0"; - # TODO when switching to a stable release, use fetchFromGitea and add a - # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. - src = fetchgit { - url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "21f775dc35a88c54015694f9757e81c97fa860ea"; - hash = "sha256-aMSMMIGfoiqtg8Dj8QiCbUE40OKQXMXt4hvlvbXQLls="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "simonrepp"; + repo = "faircamp"; + rev = version; + hash = "sha256-Rz/wMlVNjaGhk26QMnS4+W3oA/RSdB6FuigC84L8eDg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.1.0" = "sha256-0+T8RRQnqbIiIup/aDJgvxeV8sRV4YrlA9JVbQxMfF0="; + "enolib-0.2.1" = "sha256-ryB5Tk90BvsstdXgYw7F0BJymWWetAIijhVpLeVBOa8="; }; }; + buildFeatures = [ "libvips" ]; + nativeBuildInputs = [ makeWrapper pkg-config @@ -50,9 +53,10 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - passthru.tests.wav = callPackage ./test-wav.nix { }; - - passthru.updateScript = unstableGitUpdater { }; + passthru.tests = { + wav = callPackage ./test-wav.nix { }; + version = testers.testVersion { package = faircamp; }; + }; meta = with lib; { description = "A self-hostable, statically generated bandcamp alternative"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix index 53c4e88c3e..f039a31a9e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "2.1.5"; + version = "2.1.8"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-33LQedZTfps7uAB5LGGXM/YB7SySTJLp70+yS5pMvIk="; + sha256 = "sha256-MATMl5eEIauDQpz8/wqIzD7IugPVZ2HJAWCbDM4n+hA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix index e698f4857b..893ae8aed0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.7.1"; + version = "5.8.1"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-kxvqEgXlKQlfzlCqKb5o3hvop82vDsJmQDK9XOCq61g="; + hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index ff1630dc35..bb47e1a251 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.25.3"; + version = "1.26.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-raslLhVbeUL6Zoz5cw+fKtqdUvAkd7frAncd+q1AVxs="; + sha256 = "sha256-Y0d3TgSLrxA2kPWlHrNC8GlEcD7s4VZR2YZlderZ3gI="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluxboxlauncher/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix b/third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix index 2d0b39672f..2a323a2f2d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/furtherance/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "furtherance"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "lakoliu"; repo = "Furtherance"; rev = "v${finalAttrs.version}"; - hash = "sha256-KNC0e1Qfls+TcUDPvLaTWWF4ELBJYPE7Oo9/4PK10js="; + hash = "sha256-tr7TBqfqKzMnYBMHJmrAW/HViqT4rydBBZvBqgpnfSk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-NHrKk7XgqeEuNAOyIDfzFJzIExTpUfv83Pdv/NPkgYQ="; + hash = "sha256-MFiMoTMW83QxV3BOyZaa1XmfRNieCT007N/4vfSD67Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 49da3ac99a..a80a86317a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.0"; + version = "1.26.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-+g4tfr7RF9rrimQcXhcz3o/Cx9xLNrTDV1Fx7XSxh7I="; + sha256 = "sha256-Agccsz0TlzCDnhR5Vy7Tt3jrqz9+hwaclQgXJBhGY9w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 2483cc000f..240370297d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "3.31"; + version = "3.34"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - sha256 = "+ChCF27nmPKbqaZVxsZ6TlbzSdEz6RfMs87NE8xaSRw="; + hash = "sha256-KuDNngHOoeEHJExEHoLdNO95ZUvLx8TWiAOTmRKHtmQ="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; @@ -32,10 +32,11 @@ perlPackages.buildPerlPackage rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/man/man1 - cp get_iplayer $out/bin + + install -D get_iplayer -t $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB - cp get_iplayer.1 $out/share/man/man1 + install -D get_iplayer.1 -t $out/share/man/man1 + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix index 24fd6cf2ea..63223755e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gimoji/default.nix @@ -26,6 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Easily add emojis to your git commit messages"; homepage = "https://github.com/zeenix/gimoji"; license = licenses.mit; + mainProgram = "gimoji"; maintainers = with maintainers; [ a-kenji ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix b/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix index 363e6fadee..5c8eb94712 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql_11 +, postgresql_15 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql_11 # for pg_config + postgresql_15 # for postgresql utils ]; enableParallelBuilding = true; @@ -102,6 +102,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" + "--with-postgres-utils=${lib.getBin postgresql_15}/bin" ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index 7b59df8fd4..8ea6091894 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "23.1"; + version = "23.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-0Lf/GuqlovVbnk3jSJHFGF688GXABcSVLr1hATaIomk="; + sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 99fc367835..72acbe02bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.9"; + version = "13.10"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-vzbZN+0lDSmvZnQCuvNJCYHTYKqErFhW4RI5Mfbgr6o="; + hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix index f475df8f7b..2cb72575a4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gsimplecal"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "dmedvinsky"; repo = "gsimplecal"; rev = "v${version}"; - sha256 = "sha256-8faYw8tg8pOkpImcv8TM4UUpQEEtDKjAk4iKbXDC9no="; + sha256 = "sha256-Q8vK+rIRr+Tzwq0Xw5a1pYoLkSwF6PEdqc3/Dk01++o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix index 129de17fb1..6d01105ac0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "harsh"; - version = "0.8.29"; + version = "0.8.30"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE="; + hash = "sha256-X9YCxDgxIuJyTUurDQ574nKBAUsdKHNx1T6DkcygYS4="; }; vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index fb3489893b..d5ea27c9d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, fetchPypi, python3 }: let @@ -18,7 +18,8 @@ let # Use click 7 click = super.click.overridePythonAttrs (old: rec { version = "7.1.2"; - src = old.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix index ccb597db62..25e541cf3d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix @@ -9,6 +9,7 @@ , svg-path , pygments , watchdog +, fetchpatch }: buildPythonApplication rec { @@ -25,6 +26,13 @@ buildPythonApplication rec { nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + patches = [ + (fetchpatch { + name = "fix tests with pygments 2.14"; + url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch"; + sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; + }) + ]; meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix index 71ba3dcf10..6c9c65cf42 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix @@ -1,25 +1,41 @@ -{ buildPythonApplication, fetchFromGitHub, nose, openjdk, lib }: +{ lib +, fetchFromGitHub +, openjdk +, python3 +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "html5validator"; - version = "0.3.3"; + version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "svenkreiss"; repo = "html5validator"; - rev = "v${version}"; - sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv"; + rev = "refs/tags/v${version}"; + hash = "sha256-yvclqE4+2R9q/UJU9W95U1/xVJeNj+5eKvT6VQel9k8="; }; - propagatedBuildInputs = [ openjdk ]; + propagatedBuildInputs = [ + openjdk + ] ++ (with python3.pkgs; [ + pyyaml + ]); - nativeCheckInputs = [ nose ]; - checkPhase = "PATH=$PATH:$out/bin nosetests"; + nativeCheckInputs = with python3.pkgs; [ + hacking + pytestCheckHook + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; meta = with lib; { - homepage = "https://github.com/svenkreiss/html5validator"; description = "Command line tool that tests files for HTML5 validity"; + homepage = "https://github.com/svenkreiss/html5validator"; + changelog = "https://github.com/svenkreiss/html5validator/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.phunehehe ]; + maintainers = with maintainers; [ phunehehe ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index a88cf10f15..ef9be284b5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.119.0"; + version = "0.120.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A="; + hash = "sha256-96ikGGKw9IN/ch199oFcucp8aVR+fEiAWBeu39J2Osw="; }; - vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k="; + vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprdim/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hyprdim/default.nix index f7cf680ad0..c59277a154 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hyprdim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hyprdim/default.nix @@ -2,38 +2,41 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "donovanglover"; - repo = pname; + repo = "hyprdim"; rev = version; - hash = "sha256-6HeVLgEJDPy4cWL5td3Xl7+a6WUFZWUFynvBzPhItcg="; + hash = "sha256-b2T/ueinKiheuK+siV29vJfEsEodq6qT2J3XxvoD/14="; }; - cargoHash = "sha256-qYX5o64X8PsFcTYuZ82lIShyUN69oTzQIHrQH4B7iIw="; + cargoHash = "sha256-Sf32vaqcxVdg6/kDidxBSr5XDWg3aNEBpEl31do2ZJ8="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage man/hyprdim.1 + installManPage target/man/hyprdim.1 installShellCompletion --cmd hyprdim \ - --bash <(cat completions/hyprdim.bash) \ - --fish <(cat completions/hyprdim.fish) \ - --zsh <(cat completions/_hyprdim) + --bash <(cat target/completions/hyprdim.bash) \ + --fish <(cat target/completions/hyprdim.fish) \ + --zsh <(cat target/completions/_hyprdim) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Automatically dim windows in Hyprland when switching between them"; homepage = "https://github.com/donovanglover/hyprdim"; - license = licenses.mit; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ donovanglover ]; mainProgram = "hyprdim"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix index 906bc00dce..d8d6ba70c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix @@ -2,38 +2,41 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "hyprnome"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprnome"; rev = version; - hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA="; + hash = "sha256-zlXiT2EOIdgIDI4NQuU3C903SSq5bylBAFJXyv7mdJ4="; }; - cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0="; + cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage man/hyprnome.1 + installManPage target/man/hyprnome.1 installShellCompletion --cmd hyprnome \ - --bash <(cat completions/hyprnome.bash) \ - --fish <(cat completions/hyprnome.fish) \ - --zsh <(cat completions/_hyprnome) + --bash <(cat target/completions/hyprnome.bash) \ + --fish <(cat target/completions/hyprnome.fish) \ + --zsh <(cat target/completions/_hyprnome) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "GNOME-like workspace switching in Hyprland"; homepage = "https://github.com/donovanglover/hyprnome"; - license = licenses.mit; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ donovanglover ]; mainProgram = "hyprnome"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix index 91256c8027..d1b873eae8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix @@ -49,8 +49,11 @@ stdenv.mkDerivation rec { substituteInPlace etc/meson.build \ --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/systemd/iptsd-find-service \ + --replace "iptsd-find-hidraw" "$out/bin/iptsd-find-hidraw" \ + --replace "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" substituteInPlace etc/udev/50-iptsd.rules.in \ - --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" + --replace "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" ''; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix index 1a2304d340..b3800d6c7e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.4.17212"; + version = "2.1.0.18144"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-lnTYLZJBiM8nnUvMqtcp/i/VNek/9zlxYyZFa+hew5g="; + sha256 = "sha256-K65naW+RWAy4uxQq2GQmL0kwCH+G73ez1kgTtnTwjEw="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/join-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/join-desktop/default.nix deleted file mode 100644 index 369aae0386..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/join-desktop/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchurl -, alsa-lib -, autoPatchelfHook -, dpkg -, gtk3 -, makeWrapper -, mesa -, nss -, systemd -, xorg -}: - -stdenv.mkDerivation rec { - pname = "join-desktop"; - version = "1.1.2"; - - src = fetchurl { - url = "https://github.com/joaomgcd/JoinDesktop/releases/download/v${version}/com.joaomgcd.join_${version}_amd64.deb"; - sha256 = "sha256-k1LX/HC3tfL4Raipo7wp/LnfrPa38x8NBeKRyHJ72CU="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - alsa-lib - gtk3 - mesa - nss - xorg.libXScrnSaver - xorg.libXtst - ]; - - unpackPhase = "dpkg-deb -x $src ."; - - runtimeDependencies = [ - (lib.getLib systemd) - # TODO: check if they are required - # libnotify - # libappindicator - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/join-desktop - - mv usr/share/* $out/share - mv opt/Join\ Desktop/* $out/share/join-desktop - - ln -s $out/share/join-desktop/com.joaomgcd.join $out/bin/ - - substituteInPlace $out/share/applications/com.joaomgcd.join.desktop \ - --replace "/opt/Join Desktop/com.joaomgcd.join" "com.joaomgcd.join" - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/joaomgcd/JoinDesktop/"; - description = "Desktop app for Join"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license - license = licenses.free; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 840eb846c2..e993b085ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -54,7 +54,7 @@ let mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 40ece54ab1..972c4b94ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.89752"; + version = "0.15.93226"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-vYI9jbY2npPrmP0lMRSbLneVbQvQVsL0plM5jOvtdzA="; + sha256 = "sha256-RMN/OQHnHCx/xbi/J9LiK6m0TkPvd34GtmR6lr66pKs="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 8dacbf8145..43d320a4c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -1,18 +1,20 @@ { lib , fetchFromGitHub , python3 +, testers +, jrnl }: python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "4.0.1"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI="; + hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o="; }; nativeBuildInputs = with python3.pkgs; [ @@ -20,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - ansiwrap asteval colorama cryptography @@ -51,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { "jrnl" ]; + passthru.tests.version = testers.testVersion { + package = jrnl; + version = "v${version}"; + }; + meta = with lib; { changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; description = "Simple command line journal application that stores your journal in a plain text file"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix index 720536b18e..a6059ae44f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.62"; + version = "0.67"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM="; + sha256 = "sha256-jyny5uNZ5eL4AV47uAgOhBe4Zqg8GK3e86Z9gZbC68s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix index 7e28366b94..0876bf6c15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kbt/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "1.2.3"; + version = "2.0.6"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-AhMl8UuSVKLiIj+EnnmJX8iURjytLByDRLqDkgHGBr0="; + hash = "sha256-G5/Sb/suTUkpR6OGlOawLVGLTthcrp78Y+5mxlndfA4="; }; - cargoHash = "sha256-pgdI+BoYrdSdQpVN0pH4QMcNAKbjbnrUbAmMpmtfd2s="; + cargoHash = "sha256-7P93mttZ9W76lpGPKN33cgr4nEaHRlDQWov+TUbDHkM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index d9f6e5913f..b16ff896b6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.54"; + version = "2.55"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; + hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index 762434ef12..ed7884ad25 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -88,7 +88,14 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ + asciidoctor + cmake + wrapQtAppsHook + qttools + pkg-config + ] + ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook; dontWrapGApps = true; preFixup = '' @@ -97,6 +104,12 @@ stdenv.mkDerivation rec { wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; + # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 + postInstall = lib.optionalString withKeePassBrowser '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" + ''; + buildInputs = [ curl botan2 @@ -129,7 +142,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne blankparticle ]; + maintainers = with maintainers; [ jonafato blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json new file mode 100644 index 0000000000..70f1b26041 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json @@ -0,0 +1,9 @@ +{ + "name": "org.keepassxc.keepassxc_browser", + "description": "KeePassXC integration with native messaging support", + "path": "@out@/bin/keepassxc-proxy", + "type": "stdio", + "allowed_extensions": [ + "keepassxc-browser@keepassxc.org" + ] +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff b/third_party/nixpkgs/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff deleted file mode 100644 index 3a438e2519..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kemai/000-cmake-disable-conan.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce78a9d..3cd51e0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,18 +8,21 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) - # Common configuration - set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -- --# Setup Conan --if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") -- message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") -- file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" -- "${CMAKE_BINARY_DIR}/conan.cmake" -- TLS_VERIFY ON) --endif() --include(${CMAKE_BINARY_DIR}/conan.cmake) -- --conan_cmake_autodetect(settings) --conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) -+set(USE_CONAN ON CACHE BOOL "Use conan for dependency managment") -+ -+if(USE_CONAN) -+ # Setup Conan -+ if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") -+ message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") -+ file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" -+ "${CMAKE_BINARY_DIR}/conan.cmake" -+ TLS_VERIFY ON) -+ endif() -+ include(${CMAKE_BINARY_DIR}/conan.cmake) -+ -+ conan_cmake_autodetect(settings) -+ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) -+endif () - - # Setup Qt - set(CMAKE_AUTOMOC ON) diff --git a/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix index 1e358299f5..70941045ce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kemai/default.nix @@ -1,13 +1,16 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , magic-enum +, range-v3 , spdlog , qtbase , qtconnectivity , qttools , qtlanguageserver +, qtwayland , wrapQtAppsHook , libXScrnSaver , nix-update-script @@ -15,15 +18,24 @@ stdenv.mkDerivation rec { pname = "kemai"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; rev = version; - hash = "sha256-PDjNO2iMPK0J3TSHVZ/DW3W0GkdB8yNZYoTGEd2snac="; + hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM="; }; + patches = [ + # Backport the fix for an issue where LICENSE.txt ends up in /bin + # Remove in next release + (fetchpatch { + url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch"; + hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg="; + }) + ]; + buildInputs = [ qtbase qtconnectivity @@ -31,10 +43,14 @@ stdenv.mkDerivation rec { qtlanguageserver libXScrnSaver magic-enum + range-v3 spdlog + ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + cmakeFlags = [ + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DFETCHCONTENT_QUIET=OFF" + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" ]; - cmakeFlags = [ "-DUSE_CONAN=OFF" ]; - patches = [ ./000-cmake-disable-conan.diff ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -48,5 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; + broken = stdenv.isDarwin; + mainProgram = "Kemai"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 271d571a53..a8de9a4dde 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ (with python3.pkgs; [ setuptools-scm sphinx - sphinxcontrib_newsfeed + sphinxcontrib-newsfeed ]); propagatedBuildInputs = with python3.pkgs;[ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ make -C doc man installManPage doc/build/man/khal.1 diff --git a/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix index a17be0e092..89e0356309 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix @@ -10,23 +10,23 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo="; + hash = "sha256-9QupKpB3T/6gdGSeLjRknjPdgOzbfzEeJreIamWwpSw="; }; - cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA="; + cargoHash = "sha256-a7FZpMtgTdqpLV/OfgN4W4GpTJlkfEtPO7F//FmVA/s="; libPath = lib.makeLibraryPath [ wayland libxkbcommon ]; - buildInputs = [ fontconfig ]; + buildInputs = [ fontconfig libxkbcommon ]; nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 6306400a3c..0901e82f3d 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.28.11"; + version = "0.28.12"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ="; + hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix b/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix index d95df54bb4..31880f99a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/krabby/default.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.1.7"; + version = "0.1.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YI8OkNIDZWxAV+9n8AbKdZuWdA3A2cD94DuPgFvkokE="; + sha256 = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; }; - cargoHash = "sha256-j4zCuPmn/+ZSLFkAivNs3lH7YWVLvLA9k9RKbh43tUU="; + cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; meta = with lib; { description = "Print pokemon sprites in your terminal"; 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 be9102b612..4ea55b39c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix @@ -2,6 +2,7 @@ , fetchCrate , rustPlatform , pkg-config +, installShellFiles , openssl , dbus , sqlite @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + installShellFiles ]; buildInputs = [ @@ -32,6 +34,13 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + postInstall = '' + installShellCompletion --cmd leetcode \ + --bash <($out/bin/leetcode completions bash) \ + --fish <($out/bin/leetcode completions fish) \ + --zsh <($out/bin/leetcode completions zsh) + ''; + passthru.tests = testers.testVersion { package = leetcode-cli; command = "leetcode -V"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix index 9d87de5432..4228d5eec0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "limesctl"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TR3cFIGU5hmZuzlYUJX+84vb8gmErSIZizK9J5Ieagk="; + hash = "sha256-osXwVZuMB9cMj0tEMBOQ8hrKWAmfXui4ELoi0dm9yB4="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/misc/livecaptions/default.nix b/third_party/nixpkgs/pkgs/applications/misc/livecaptions/default.nix index 5ef7791836..2d52e96fe3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/livecaptions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/livecaptions/default.nix @@ -18,8 +18,8 @@ name = "april-asr"; owner = "abb128"; repo = "april-asr"; - rev = "c2f138c674cad58e2708ecaddc95cc72e7f85549"; - hash = "sha256-hZe2iss3BGdzeTM5FCp9wp6LaDOjtGJrZS5vB5F6uLg="; + rev = "3308e68442664552de593957cad0fa443ea183dd"; + hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE="; }; aprilModel = fetchurl { @@ -28,15 +28,15 @@ hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "livecaptions"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "abb128"; repo = "LiveCaptions"; - rev = "v${version}"; - hash = "sha256-RepuvqNPHRGENupPG5ezadn6f7FxEUYFDi4+DpNanuA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU="; }; nativeBuildInputs = [ @@ -72,5 +72,6 @@ in license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [Scrumplex]; + mainProgram = "livecaptions"; }; - } + }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix index 427be60315..38da8824cb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "system-makedeps.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; - hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; + name = "system-makedeps-and-ocaml5.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b"; + hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch b/third_party/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch deleted file mode 100644 index c12828f2d9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/build.bash b/build.bash -index 7c278b6..41494c5 100755 -with manual adjustments ---- a/build.bash -+++ b/build.bash -@@ -30,7 +30,6 @@ srcd="$(dirname $0)" - mudir=$outd/mupdf - muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" - --test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING - - mkdir -p $outd/{$wsid,lablGL} - :>$outd/ordered -@@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } - mulibst="$mudir/build/$mbt/libs" - mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" - --keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" --isfresh "$mulibst" "$(eval $keycmd)" || ( -- make -C "$mudir" build=$mbt -j $mjobs libs -- eval $keycmd >${mulibst}.past --) && vecho "fresh mupdf" -- - oincs() { - local i= - local incs1= -@@ -100,35 +93,6 @@ mflags() { - } - - overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.11.1" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz -- txz=$outd/$(basename $url) -- keycmd="printf $url; digest $txz;" -- isfresh $txz "$(eval $keycmd)" || { -- executable_p() { command -v "$1" >/dev/null 2>&1; } -- if executable_p wget; then dl() { wget -q "$1" -O "$2"; } -- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } -- else die "no program to fetch remote urls found" -- fi -- dl $url $txz -- eval $keycmd >$txz.past -- } && vecho "fresh $txz" -- absprefix=$(cd $outd &>/dev/null; pwd -P) -- export PATH=$absprefix/bin:$PATH -- ocamlc=$absprefix/bin/ocamlc -- keycmd="printf $url; digest $ocamlc;" -- isfresh $ocamlc "$(eval $keycmd)" || ( -- tar xf $txz -C $outd -- bn=$(basename $url) -- cd $outd/${bn%.tar.xz} -- ./configure --disable-ocamldoc --disable-ocamltest \ -- --enable-debugger=no --prefix=$absprefix -- make -j $mjobs world -- make install -- eval $keycmd >$absprefix/bin/ocamlc.past -- ) && vecho "fresh ocamlc" -- overs=$(ocamlc -vnum 2>/dev/null) --} - - ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ - { read _ c; echo $c; })} -@@ -243,7 +208,7 @@ bobjc() { - } && vecho "fresh $o" - } - --ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown -+ver=@version@ - - cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" - keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do - done - - libs="str.cma unix.cma" --clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" -+clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz" - if $darwin; then - mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) - clibs="$clibs -framework Cocoa -framework OpenGL" diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index 4dfcdc5879..a40064bb5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -4,7 +4,7 @@ , appimageTools , makeWrapper # graphs will not sync without matching upstream's major electron version -, electron_24 +, electron_25 , git , nix-update-script }: @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.18"; + version = "0.9.20"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-+2BnVW0qWSJ/PIY3zl1c9qzcP9DZVp6E9B7AI6LqibE="; + hash = "sha256-iT0Gc/ePx1tUNTPoE2Ol+dHUmbS4CkneZbyraRBx5Ak="; name = "${pname}-${version}.AppImage"; }; @@ -57,7 +57,7 @@ in { postFixup = '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix index 87a130ae98..b298992fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix @@ -1,19 +1,20 @@ { lib, appimageTools, fetchurl }: let - version = "1.7.7"; + version = "1.7.8"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-3WiJR+gwudeLs6Mn75SJP4BZ6utwxvvRLOHe/W+1Pfs="; + sha256 = "sha256-DhTWD9uL7zKWiRfeLYKxPtmAy1yR20wjlVA+N33YgpQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 rec { +in +appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index 730737a8bb..044553bbab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -1,6 +1,7 @@ { buildPythonApplication , lib , fetchFromGitHub +, fetchpatch # build inputs , atk @@ -75,15 +76,24 @@ let in buildPythonApplication rec { pname = "lutris-unwrapped"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - hash = "sha256-ectrfbIkPhIqfhkavDpBCNdLPnGQhCnfFYwTf2IxB50="; + hash = "sha256-h7oHFVqMJU1HuuUgh5oKXxr9uaIPHz7Q4gf8ONLzric="; }; + # Backport patch to fix a failing test + # FIXME: remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/lutris/lutris/commit/1f1d554df3b38da64fc65557ad619e55e050641e.patch"; + hash = "sha256-kVK1RX6T1ijffWVU7VEt2fR62QpvI6VZebiKPgEE/N8="; + }) + ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ atk diff --git a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix index 48fbce686f..20315e7acc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.7.1"; + version = "2.8.0"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk="; + hash = "sha256-YNI4WkWLnB1w8I0ETflDsWNkB6QGO5QrASajKpcmGcU="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index a830bffd7d..d2e8c7aa59 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "23.07"; + version = "23.10"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; + hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index b93c552e19..094f8c1790 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "23.07"; + version = "23.10"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; + hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index 9d474ca91f..52b4d78bb5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -2,7 +2,8 @@ , stdenv , fetchFromGitHub , fetchpatch -, qmake +, cmake +, pkg-config , qttools , wrapQtAppsHook , gdal @@ -32,9 +33,14 @@ stdenv.mkDerivation rec { url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; }) + # https://github.com/openstreetmap/merkaartor/pull/290 + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch"; + hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk="; + }) ]; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ gdal proj qtsvg qtwebengine ] ++ lib.optional withGeoimage exiv2 @@ -42,27 +48,25 @@ stdenv.mkDerivation rec { ++ lib.optional withLibproxy libproxy ++ lib.optional withZbar zbar; - preConfigure = '' - lrelease src/src.pro - ''; - - qmakeFlags = [ - "USEWEBENGINE=1" - ] ++ lib.optional withGeoimage "GEOIMAGE=1" - ++ lib.optional withGpsdlib "GPSDLIB=1" - ++ lib.optional withLibproxy "LIBPROXY=1" - ++ lib.optional withZbar "ZBAR=1"; + cmakeFlags = [ + (lib.cmakeBool "GEOIMAGE" withGeoimage) + (lib.cmakeBool "GPSD" withGpsdlib) + (lib.cmakeBool "LIBPROXY" withLibproxy) + (lib.cmakeBool "WEBENGINE" true) + (lib.cmakeBool "ZBAR" withZbar) + ]; postInstall = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv binaries/bin/merkaartor.app $out/Applications - mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents + mkdir -p $out/{Applications,bin} + mv $out/merkaartor.app $out/Applications + makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor ''; meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; + mainProgram = "merkaartor"; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index 4dffe9e08e..ad694c01cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "A simple GOG client for Linux"; license = licenses.gpl3; - maintainers = with maintainers; [ srapenne ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock index 825c48cb48..7481dab903 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock @@ -155,20 +155,6 @@ name = "bytemuck" version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] [[package]] name = "byteorder" @@ -185,7 +171,7 @@ dependencies = [ "bitflags 2.3.3", "cairo-sys-rs", "glib", - "libc 0.2.147", + "libc", "once_cell", "thiserror", ] @@ -197,7 +183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", - "libc 0.2.147", + "libc", "system-deps", ] @@ -278,7 +264,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "libc 0.2.147", + "libc", ] [[package]] @@ -330,7 +316,7 @@ dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils 0.8.16", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -390,15 +376,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - [[package]] name = "dlv-list" version = "0.5.0" @@ -408,60 +385,6 @@ dependencies = [ "const-random", ] -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "drm" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "nix", -] - -[[package]] -name = "drm-ffi" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" -dependencies = [ - "drm-sys", - "nix", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" -dependencies = [ - "libc 0.2.147", -] - -[[package]] -name = "egl" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" -dependencies = [ - "khronos", - "libc 0.2.147", -] - [[package]] name = "either" version = "1.8.1" @@ -481,7 +404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c0007216af1525058024bc6dc15bbd2ffe8af877f0fbf754fbdb78c59d634e8" dependencies = [ "cc", - "libc 0.2.147", + "libc", ] [[package]] @@ -517,7 +440,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version 0.4.0", ] @@ -608,30 +531,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gbm" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" -dependencies = [ - "bitflags 1.3.2", - "drm", - "drm-fourcc", - "gbm-sys", - "libc 0.2.147", - "wayland-backend", - "wayland-server", -] - -[[package]] -name = "gbm-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" -dependencies = [ - "libc 0.2.147", -] - [[package]] name = "gdk-pixbuf" version = "0.18.0" @@ -641,7 +540,7 @@ dependencies = [ "gdk-pixbuf-sys", "gio", "glib", - "libc 0.2.147", + "libc", "once_cell", ] @@ -654,7 +553,7 @@ dependencies = [ "gio-sys", "glib-sys", "gobject-sys", - "libc 0.2.147", + "libc", "system-deps", ] @@ -669,7 +568,7 @@ dependencies = [ "gdk4-sys", "gio", "glib", - "libc 0.2.147", + "libc", "pango", ] @@ -684,7 +583,7 @@ dependencies = [ "gio-sys", "glib-sys", "gobject-sys", - "libc 0.2.147", + "libc", "pango-sys", "pkg-config", "system-deps", @@ -707,7 +606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", - "libc 0.2.147", + "libc", "wasi", ] @@ -743,7 +642,7 @@ dependencies = [ "futures-util", "gio-sys", "glib", - "libc 0.2.147", + "libc", "once_cell", "pin-project-lite", "smallvec", @@ -758,7 +657,7 @@ checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", - "libc 0.2.147", + "libc", "system-deps", "winapi", ] @@ -799,7 +698,7 @@ dependencies = [ "glib-macros", "glib-sys", "gobject-sys", - "libc 0.2.147", + "libc", "memchr", "once_cell", "smallvec", @@ -826,7 +725,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ - "libc 0.2.147", + "libc", "system-deps", ] @@ -837,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", - "libc 0.2.147", + "libc", "system-deps", ] @@ -849,7 +748,7 @@ checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", - "libc 0.2.147", + "libc", ] [[package]] @@ -859,7 +758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", - "libc 0.2.147", + "libc", "pkg-config", "system-deps", ] @@ -875,7 +774,7 @@ dependencies = [ "glib", "graphene-rs", "gsk4-sys", - "libc 0.2.147", + "libc", "pango", ] @@ -890,7 +789,7 @@ dependencies = [ "glib-sys", "gobject-sys", "graphene-sys", - "libc 0.2.147", + "libc", "pango-sys", "system-deps", ] @@ -912,7 +811,7 @@ dependencies = [ "gsk4", "gtk4-macros", "gtk4-sys", - "libc 0.2.147", + "libc", "pango", ] @@ -944,7 +843,7 @@ dependencies = [ "gobject-sys", "graphene-sys", "gsk4-sys", - "libc 0.2.147", + "libc", "pango-sys", "system-deps", ] @@ -1051,7 +950,7 @@ dependencies = [ "futures-core", "futures-io", "intmap", - "libc 0.2.147", + "libc", "once_cell", "rustc_version 0.4.0", "spinning", @@ -1066,17 +965,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc 0.2.147", - "windows-sys", -] - [[package]] name = "itoa" version = "1.0.8" @@ -1092,15 +980,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "khronos" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0711aaa80e6ba6eb1fa8978f1f46bfcb38ceb2f3f33f3736efbff39dac89f50" -dependencies = [ - "libc 0.1.12", -] - [[package]] name = "khronos_api" version = "3.1.0" @@ -1125,7 +1004,7 @@ dependencies = [ "glib", "gtk4", "libadwaita-sys", - "libc 0.2.147", + "libc", "pango", ] @@ -1140,33 +1019,17 @@ dependencies = [ "glib-sys", "gobject-sys", "gtk4-sys", - "libc 0.2.147", + "libc", "pango-sys", "system-deps", ] -[[package]] -name = "libc" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" - [[package]] name = "libc" version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -[[package]] -name = "libloading" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys", -] - [[package]] name = "libsqlite3-sys" version = "0.26.0" @@ -1184,7 +1047,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" dependencies = [ - "libc 0.2.147", + "libc", "pkg-config", ] @@ -1223,7 +1086,7 @@ version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ - "libc 0.2.147", + "libc", ] [[package]] @@ -1238,15 +1101,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[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.0" @@ -1273,25 +1127,23 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.3.2" +version = "0.3.3" dependencies = [ "arrayvec 0.7.4", - "drm", - "egl", "errno-sys", - "gbm", "gettext-rs", "gl", "gtk4", "interprocess", "lazy_static", "libadwaita", - "libc 0.2.147", + "libc", "libudev-sys", "minidl", "num_cpus", "pathfinder_canvas", "pathfinder_color", + "pathfinder_content", "pathfinder_geometry", "pathfinder_gl", "pathfinder_gpu", @@ -1318,8 +1170,7 @@ checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", - "libc 0.2.147", - "memoffset 0.7.1", + "libc", "static_assertions", ] @@ -1380,7 +1231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", - "libc 0.2.147", + "libc", ] [[package]] @@ -1436,7 +1287,7 @@ checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ "gio", "glib", - "libc 0.2.147", + "libc", "once_cell", "pango-sys", ] @@ -1449,7 +1300,7 @@ checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", - "libc 0.2.147", + "libc", "system-deps", ] @@ -1685,15 +1536,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - [[package]] name = "quote" version = "1.0.29" @@ -1709,7 +1551,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc 0.2.147", + "libc", "rand_chacha", "rand_core", ] @@ -1841,12 +1683,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" -[[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" @@ -1935,7 +1771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" dependencies = [ "cfg-if 1.0.0", - "libc 0.2.147", + "libc", "nix", "rand", "win-sys", @@ -2001,7 +1837,7 @@ checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", - "libc 0.2.147", + "libc", "ntapi", "once_cell", "winapi", @@ -2215,59 +2051,6 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" -[[package]] -name = "wayland-backend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" -dependencies = [ - "cc", - "downcast-rs", - "io-lifetimes", - "nix", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-scanner" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-server" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "io-lifetimes", - "nix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "libc 0.2.147", - "log", - "memoffset 0.7.1", - "pkg-config", -] - [[package]] name = "web-sys" version = "0.3.64" @@ -2315,109 +2098,43 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - [[package]] name = "windows_aarch64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - [[package]] name = "windows_i686_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - [[package]] name = "windows_i686_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - [[package]] name = "windows_x86_64_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - [[package]] name = "windows_x86_64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - [[package]] name = "winnow" version = "0.4.9" diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 71055e6946..8384fc1ce4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -23,6 +23,7 @@ , glib , graphene , gtk4 +, libGL , libadwaita , libdrm , mesa @@ -42,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-KuaVivW/i+1Pw6ShpvBYbwPMUHsEJ7FR80is0DBMbXM="; + hash = "sha256-xLyCLKUk21MvswtPUKm41Hr34vTzCMVQNTaAkuhSGLc="; }; cargoDeps = symlinkJoin { @@ -92,6 +93,7 @@ stdenv.mkDerivation rec { glib graphene gtk4 + libGL libadwaita libdrm mesa @@ -102,14 +104,24 @@ stdenv.mkDerivation rec { ]; postPatch = '' - echo -e "[wrap-file]\ndirectory = nvtop-src\n[provide]\ndependency_names = nvtop" > ./subprojects/nvtop.wrap - cp -r --no-preserve=mode,ownership "${nvtop}" ./subprojects/nvtop-src - cd ./subprojects/nvtop-src + SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer + SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop + + substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \ + --replace "nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324" "nvtop-src" + + GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native + mkdir -p $GATHERER_BUILD_DEST + NVTOP_SRC=$GATHERER_BUILD_DEST/nvtop-src + + cp -r --no-preserve=mode,ownership "${nvtop}" $NVTOP_SRC + pushd $NVTOP_SRC mkdir -p include/libdrm - for patchfile in $(ls ../packagefiles/nvtop*.patch); do + for patchfile in $(ls $SRC_GATHERER_NVTOP/patches/nvtop*.patch); do patch -p1 < $patchfile done - cd ../.. + popd + patchShebangs data/hwdb/generate_hwdb.py ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index cc5dd212ca..7a714c49cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -2,6 +2,12 @@ # 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 = "anyhow" version = "1.0.72" @@ -52,6 +58,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + [[package]] name = "bitflags" version = "1.3.2" @@ -64,6 +76,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +[[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.3.1" @@ -74,11 +95,68 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "cargo-util" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd54c8b94a0c851d687924460637361c355afafa72d973fe8644499fbdee8fae" +dependencies = [ + "anyhow", + "core-foundation", + "filetime", + "hex", + "jobserver", + "libc 0.2.147", + "log", + "miow", + "same-file", + "sha2", + "shell-escape", + "tempfile", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc 0.2.147", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -116,6 +194,40 @@ dependencies = [ "tiny-keccak", ] +[[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 0.2.147", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc 0.2.147", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -131,6 +243,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[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 = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dlv-list" version = "0.5.0" @@ -140,6 +272,75 @@ dependencies = [ "const-random", ] +[[package]] +name = "drm" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix", +] + +[[package]] +name = "drm-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +dependencies = [ + "drm-sys", + "nix", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" +dependencies = [ + "libc 0.2.147", +] + +[[package]] +name = "egl" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" +dependencies = [ + "khronos", + "libc 0.2.147", +] + +[[package]] +name = "errno" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +dependencies = [ + "errno-dragonfly", + "libc 0.2.147", + "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 0.2.147", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -155,6 +356,43 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc 0.2.147", + "redox_syscall", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + [[package]] name = "futures-core" version = "0.3.28" @@ -173,7 +411,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -184,19 +422,64 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "arrayvec", + "cargo-util", + "cc", + "drm", + "egl", + "flate2", + "gbm", "interprocess", "lazy_static", - "libc", + "libc 0.2.147", + "minidl", "num_cpus", + "pkg-config", "raw-cpuid", "rust-ini", "rustbus", + "serde", + "serde_json", + "sha2", "shared_memory_extended", + "tar", "thiserror", + "ureq", +] + +[[package]] +name = "gbm" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc 0.2.147", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc 0.2.147", +] + +[[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]] @@ -206,7 +489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "libc", + "libc 0.2.147", "wasi", ] @@ -222,6 +505,22 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "instant" version = "0.1.12" @@ -242,7 +541,7 @@ dependencies = [ "futures-core", "futures-io", "intmap", - "libc", + "libc 0.2.147", "once_cell", "rustc_version", "spinning", @@ -257,18 +556,63 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc 0.2.147", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0711aaa80e6ba6eb1fa8978f1f46bfcb38ceb2f3f33f3736efbff39dac89f50" +dependencies = [ + "libc 0.1.12", +] + [[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.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" + [[package]] name = "libc" version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +[[package]] +name = "linux-raw-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" + [[package]] name = "lock_api" version = "0.4.10" @@ -300,6 +644,30 @@ dependencies = [ "autocfg", ] +[[package]] +name = "minidl" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d3d8666e5ed22230c0096edcccf7097905b1e2975869e1b9fe5df40d26d801" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "miow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "nix" version = "0.26.2" @@ -308,7 +676,7 @@ checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc", + "libc 0.2.147", "memoffset", "pin-utils", "static_assertions", @@ -321,7 +689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", - "libc", + "libc 0.2.147", ] [[package]] @@ -347,10 +715,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] -name = "pin-project-lite" -version = "0.2.10" +name = "percent-encoding" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -358,6 +732,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -394,7 +774,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", + "libc 0.2.147", "rand_chacha", "rand_core", ] @@ -427,6 +807,30 @@ dependencies = [ "bitflags 2.4.0", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc 0.2.147", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "rust-ini" version = "0.19.0" @@ -468,18 +872,130 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.38.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc 0.2.147", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.5", + "sct", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[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 = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "semver" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +[[package]] +name = "serde" +version = "1.0.179" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.179" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serde_json" +version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shared_memory_extended" version = "0.13.0" @@ -487,12 +1003,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" dependencies = [ "cfg-if", - "libc", + "libc 0.2.147", "nix", "rand", "win-sys", ] +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spinning" version = "0.1.0" @@ -530,6 +1058,30 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc 0.2.147", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "thiserror" version = "1.0.44" @@ -559,30 +1111,188 @@ dependencies = [ "crunchy", ] +[[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 = "to_method" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki 0.100.3", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "waker-fn" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.3", +] + [[package]] name = "win-sys" version = "0.3.1" @@ -608,6 +1318,15 @@ 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" @@ -620,39 +1339,171 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +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-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_i686_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[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_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "xattr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +dependencies = [ + "libc 0.2.147", +] diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 2e2a02dc5d..298aa2ef40 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4912"; + version = "4916"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-4A6N0bhRLKgpLXUSN1iAmIC4YX+BaiUow2YQqnxguRM="; + sha256 = "sha256-Ok6s1DaTZBcYtkHA7WAxjGz0HycvFqBpkwZIirc+dFU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index faa6c2180f..fbdbe92ff6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.02.0"; + version = "1.03.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-URGAhd7u1DrGReQAwsX9LMj7Jq1GsILzP8fVFnA74O4="; + sha256 = "sha256-S2Pnueo3opP1k6XBBHGAyRJpkNuI1Hotz7ypXa/96eQ="; }; outputs = [ "out" "udev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index 854d8d17b5..aad0de40bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak="; + sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8="; fetchSubmodules = true; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source implementation of NVIDIA's GameStream"; homepage = "https://github.com/moonlight-stream/moonlight-embedded"; license = licenses.gpl3Plus; - maintainers = [ maintainers.globin ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff index f5406087ae..0c137fa077 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/darwin.diff @@ -25,7 +25,7 @@ CONFIG += soundio discord-rpc } macx { -- LIBS += -lssl -lcrypto -lavcodec.59 -lavutil.57 -lopus -framework SDL2 -framework SDL2_ttf +- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal # For libsoundio diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix index cbbbdc4d75..59c0b6eb8f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "4.3.1"; + version = "5.0.1"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Utpv9VdX5vuUWDSGc3YcF8tHbvUZpPeXEDP4NKts+vI="; + sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch new file mode 100644 index 0000000000..c658b237dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/wrap/cpp.py b/scripts/wrap/cpp.py +index 51ac5f1..b5c0b5a 100644 +--- a/scripts/wrap/cpp.py ++++ b/scripts/wrap/cpp.py +@@ -4595,7 +4595,7 @@ def cpp_source( + */ + typedef unsigned long size_t; + ''')) +- if state.state_.macos: ++ if state.state_.linux or state.state_.macos: + f.write( textwrap.dedent(''' + /* + Workaround on MacOS: we need to define fixed-size int types diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/darwin.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/darwin.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/darwin.patch rename to third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/darwin.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17.nix rename to third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch rename to third_party/nixpkgs/pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 606649d5bb..4381349814 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fetchFromGitHub , copyDesktopItems , makeDesktopItem @@ -26,19 +25,26 @@ , enableGL ? true , freeglut , libGLU +, enableOcr ? false +, leptonica +, tesseract +, enableCxx ? false +, python3 +, enablePython ? false +, which +, swig , xcbuild , gitUpdater # for passthru.tests , cups-filters -, python3 , zathura +, mupdf }: -let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); +assert enablePython -> enableCxx; + +let freeglut-mupdf = freeglut.overrideAttrs (old: rec { pname = "freeglut-mupdf"; @@ -53,35 +59,46 @@ let in stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.5"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; + sha256 = "sha256-blZ5zfqu+cfoniljlSIM4sEz7T3K1RpHhmczbG6uxwY="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch ./0002-Add-Darwin-deps.patch + ./0003-Fix-cpp-build.patch ]; postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" - ''; - # Use shared libraries to decrease size - buildFlags = [ "shared" ]; + patchShebangs scripts/mupdfwrap.py + + # slip in makeFlags when building bindings + sed -i -e 's/^\( *make_args *=\)/\1 """ $(echo ''${makeFlagsArray[@]@Q})"""/' scripts/wrap/__main__.py + + # fix libclang unnamed struct format + for wrapper in ./scripts/wrap/{cpp,state}.py; do + substituteInPlace "$wrapper" --replace 'struct (unnamed' '(unnamed struct' + done + ''; makeFlags = [ "prefix=$(out)" + "shared=yes" "USE_SYSTEM_LIBS=yes" "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] - ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; + ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ] + ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ]; nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems + ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] + ++ lib.optionals (enablePython) [ which swig ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] @@ -89,11 +106,12 @@ stdenv.mkDerivation rec { ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then - with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] - else - [ freeglut-mupdf libGLU ] - ) + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut-mupdf libGLU ] + ) + ++ lib.optionals enableOcr [ leptonica tesseract ] ; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -102,6 +120,12 @@ stdenv.mkDerivation rec { rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; + postBuild = lib.optionalString (enableCxx || enablePython) '' + for dir in build/*; do + ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString (enableCxx) "01"}${lib.optionalString (enablePython) "23"} + done + ''; + desktopItems = [ (makeDesktopItem { name = pname; @@ -136,7 +160,7 @@ stdenv.mkDerivation rec { Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdf-third + Libs: -L$out/lib -lmupdf Cflags: -I$dev/include EOF @@ -148,7 +172,16 @@ stdenv.mkDerivation rec { ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf" '' else lib.optionalString (enableX11) '' ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" - ''); + '') + (lib.optionalString (enableCxx) '' + cp platform/c++/include/mupdf/*.h $out/include/mupdf + cp build/*/libmupdfcpp.so $out/lib + '') + (lib.optionalString (enablePython) ('' + mkdir -p $out/${python3.sitePackages}/mupdf + cp build/*/_mupdf.so $out/${python3.sitePackages} + cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py + '' + lib.optionalString (stdenv.isDarwin) '' + install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so + '')); enableParallelBuilding = true; @@ -156,6 +189,7 @@ stdenv.mkDerivation rec { tests = { inherit cups-filters zathura; inherit (python3.pkgs) pikepdf pymupdf; + mupdf-all = mupdf.override { enableCurl = true; enableGL = true; enableOcr = true; enableCxx = true; enablePython = true; }; }; updateScript = gitUpdater { @@ -169,7 +203,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nhentai/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nhentai/default.nix index f5284c1ad7..9f99c4fa62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nhentai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nhentai/default.nix @@ -1,13 +1,21 @@ -{ lib, python3Packages, fetchPypi }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "nhentai"; - version = "0.4.16"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; + version = "0.5.3"; + src = fetchFromGitHub { + owner = "RicterZ"; + repo = pname; + rev = version; + hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc="; }; + # tests require a network connection + doCheck = false; + propagatedBuildInputs = with python3Packages; [ requests iso8601 @@ -21,6 +29,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/RicterZ/nhentai"; description = "nHentai is a CLI tool for downloading doujinshi from "; license = licenses.mit; - maintainers = with maintainers; [ travisdavis-ops ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix index 0c30fac6a5..41d32418b0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4="; + sha256 = "sha256-kqLQwqZ2RPSKNdw1yzKUfqSe8hQcJe/6/8UzTT/Gz/8="; }; patches = [ ./fix-paths.patch ]; @@ -24,7 +24,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI="; + vendorHash = "sha256-vdDlPsjfHl7w1ufosLYquHAKOvkolNBr04bt+OQBlFE="; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix index f0fc2b1bb3..18ba079088 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "v${version}"; - hash = "sha256-Y405ZeOSpc1aPKEzFdvlgJgpGAi9HUR+Hvx63uYdp88="; + hash = "sha256-9v5TQTliUEnynoGDf1UXsQ9Ym7x2gPmx4QiRJH5BId4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index 34600bb351..d3e11493fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nwg-piotr/nwg-launchers"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index a4d333e594..ddc427654e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.13"; + version = "0.9.16"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; + hash = "sha256-xHAn8NWSWSm95SIX1M8HIQwgNBq5/K5xsanbkAKfXSw="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix index 973a05ad1d..043ff2352e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obinskit/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://s3.hexcore.xyz/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - sha256 = "1kcn41wmwcx6q70spa9a1qh7wfrj1sk4v4i58lbnf9kc6vasw41a"; + curlOptsList = [ "--header" "Referer: https://www.hexcore.xyz/" ]; + hash = "sha256-KhCu1TZsJmcXRSWSTaYOMjt+IA4qqavBwaYzXnkgls0="; }; unpackPhase = "tar -xzf $src"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 78967c55a5..43ea198d62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.14"; + version = "1.4.16"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-5cVKlZJDtXOkil+RohijCcqyJVTrysmqyTvJR0dDAuc=" else "sha256-qFSQer37Nkh3A3oVAFP/0qXzPWJ7SqY2GYA6b1iaYmE="; + hash = if stdenv.isDarwin then "sha256-ydLWr+Snkza9G+R7HbPuUdoZsL25Uj+KDos67Mq/urY=" else "sha256-PBKLGs3MZyarSMiWnjqY7d9bQrKu2uLAvLUufpHLxcw="; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 5f5c2b897a..e7daa60198 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -3,6 +3,7 @@ , callPackage , lib , fetchFromGitHub +, fetchPypi , python3 , substituteAll , nix-update-script @@ -16,6 +17,30 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # Due to flask > 2.3 the login will not work + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = fetchPypi { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + }; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + }); + } + ) + # Built-in dependency ( self: super: { @@ -80,13 +105,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-DSngV8nWHNqfPEBIfGq3HQeC1p9s6Q+GX+LcJiAiS4E="; + hash = "sha256-71uE8JvcS++xH8WSVWj5x0+9s3XIwf3A64c6YtxpSRc="; }; propagatedBuildInputs = with self; [ @@ -114,7 +139,6 @@ let netifaces octoprint-filecheck octoprint-firmwarecheck - octoprint-pisupport passlib pathvalidate pkginfo @@ -142,6 +166,8 @@ let pydantic ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs + ] ++ lib.optionals (!stdenv.isDarwin) [ + octoprint-pisupport ]; nativeCheckInputs = with self; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix index b016aa8719..5de5c157d3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; description = "A framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index 9d88d6331c..cdcdb2b1e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ dbus-python - distutils_extra + distutils-extra pyatspi pycairo pygobject3 diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock index 6fa93003a6..d0bfd1e178 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock @@ -4,24 +4,23 @@ version = 3 [[package]] name = "ahash" -version = "0.3.8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "memchr", + "getrandom", + "once_cell", + "version_check", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "aho-corasick" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +dependencies = [ + "memchr", +] [[package]] name = "cfg-if" @@ -29,51 +28,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "crossbeam-channel" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "edit-distance" version = "2.1.0" @@ -81,104 +35,189 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" [[package]] -name = "either" -version = "1.7.0" +name = "emojicon" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +checksum = "349cbfb1ca5301d8492ff741487f98fed75957c5e8fee41485e3413359099ef9" [[package]] -name = "hashbrown" -version = "0.8.2" +name = "getrandom" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "ahash", - "autocfg", - "rayon", - "serde", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ + "cfg-if", "libc", + "wasi", ] [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] -name = "memoffset" -version = "0.6.5" +name = "okkhor" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "e6ef452078c9fb34be8842a52484bf9271e01ac2795e3d15ee90357fb45c102f" [[package]] name = "once_cell" -version = "1.13.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "rayon" -version = "1.5.3" +name = "phf" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", + "phf_macros", + "phf_shared", + "proc-macro-hack", ] [[package]] -name = "rayon-core" -version = "1.9.3" +name = "phf_generator" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "poriborton" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c081c9ef49e856f39ccd59e4943582b1e47225eb01b0debc1d388c4daa55b0dd" +dependencies = [ + "matches", + "phf", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "regex" -version = "1.6.0" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -187,65 +226,109 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "riti" version = "0.1.0" dependencies = [ + "ahash", "edit-distance", - "either", - "hashbrown", - "rayon", + "emojicon", + "okkhor", + "poriborton", "regex", - "rupantor", - "serde_json", - "stringplus", -] - -[[package]] -name = "rupantor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04eb802986005129b0946dbb4baa420bf14cea547c5ee6b57ba081d9e85f6a4b" -dependencies = [ "serde_json", "stringplus", ] [[package]] name = "ryu" -version = "1.0.10" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.139" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "stringplus" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222" + +[[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.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix index 4ce864bfde..c0a514367a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -7,20 +7,25 @@ , rustPlatform , rustc , wrapQtAppsHook +, fcitx5 , ibus , qtbase , zstd +, withFcitx5Support ? false +, withIbusSupport ? false }: stdenv.mkDerivation rec { pname = "openbangla-keyboard"; - version = "2.0.0"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "openbangla"; repo = "openbangla-keyboard"; - rev = version; - hash = "sha256-UoLiysaA0Wob/SLBqm36Txqb8k7bwoQ56h8ZufHR74I="; + # no upstream release in 3 years + # fcitx5 support was added over a year after the last release + rev = "780bd40eed16116222faff044bfeb61a07af158f"; + hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E="; fetchSubmodules = true; }; @@ -33,8 +38,11 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ + buildInputs = lib.optionals withFcitx5Support [ + fcitx5 + ] ++ lib.optionals withIbusSupport [ ibus + ] ++ [ qtbase zstd ]; @@ -45,9 +53,15 @@ stdenv.mkDerivation rec { cp ${./Cargo.lock} Cargo.lock ''; sourceRoot = "${src.name}/${cargoRoot}"; - sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34="; + hash = "sha256-XMleyP2h1aBhtjXhuGHyU0BN+tuL12CGoj+kLY5uye0="; }; + cmakeFlags = lib.optionals withFcitx5Support [ + "-DENABLE_FCITX=YES" + ] ++ lib.optionals withIbusSupport [ + "-DENABLE_IBUS=YES" + ]; + cargoRoot = "src/engine/riti"; postPatch = '' cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock @@ -59,17 +73,13 @@ stdenv.mkDerivation rec { --replace "/usr" "$out" ''; - postInstall = '' - mkdir -p $out/bin - ln -s $out/share/openbangla-keyboard/openbangla-gui $out/bin/openbangla-gui - ''; - - meta = with lib; { + meta = { + isIbusEngine = withIbusSupport; description = "An OpenSource, Unicode compliant Bengali Input Method"; homepage = "https://openbangla.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hqurve ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eclairevoyant hqurve ]; + platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbrf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbrf/default.nix index c0fb436b7f..63734811ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openbrf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, vcg, glew, qmake, libGLU, eigen, libGL }: mkDerivation { @@ -12,12 +12,23 @@ mkDerivation { sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j"; }; - buildInputs = [ qtbase vcg glew ]; + patches = [ + # https://github.com/cfcohen/openbrf/pull/7 + (fetchpatch { + name = "fix-build-against-newer-vcglib.patch"; + url = "https://github.com/cfcohen/openbrf/commit/6d82a25314a393e72bfbe2ffc3965bcac407df4c.patch"; + hash = "sha256-rNxAw6Le6QXMSirIAMhMmqVgNJLq6osnEOhWrY3mTpM="; + }) + ]; + + buildInputs = [ qtbase vcg glew eigen ]; nativeBuildInputs = [ qmake ]; qmakeFlags = [ "openBrf.pro" ]; + env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3"; + postPatch = '' sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix index 0e06c8a6fb..e8d4500f1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-k4xrgRanQmkjmXGvfeaGU61+GP8asYPq4RQrao3rd4Q="; + hash = "sha256-CB3ALd8N+bZ6kD34rKTxdIXrSqZtaQTINmI2yf/m38w="; }; - cargoHash = "sha256-CLMhzPM11LnQdCVD66xC4Fk+8LnfRfFzk3FwQeXboes="; + cargoHash = "sha256-GLnczSTDMDjvLw+8js6LUVtW8QLlS3G12pSabYkYsHI="; nativeBuildInputs = [ pkg-config @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { oniguruma ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration ]; # requires internet access diff --git a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix index b313ab2fa1..04794635cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.9"; + version = "3.2.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg="; + hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix index 87c49c2cf7..67a9e27667 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages -, meson, cmake, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 +, meson, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 , wrapGAppsHook, gobject-introspection, bash, }: let python = python3.withPackages (p: @@ -14,7 +14,7 @@ let pygobject3 ]); - version = "0.7.2"; + version = "0.8.0"; in stdenv.mkDerivation { inherit version; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { owner = "berarma"; repo = "oversteer"; rev = version; - sha256 = "sha256-9MWRb0NXUbB8c+pH0mjUzsz849PmEjsZMhQr4wsmlKI="; + sha256 = "sha256-fkf6sa4yYbxGOehyLzuFj5nZiPK3B1D/VVvobhKB4Uo="; }; buildInputs = [ bash gtk3 ]; @@ -64,12 +64,13 @@ in stdenv.mkDerivation { --replace /bin/sh ${bash}/bin/sh ''; - patches = [ ./fix-install-dir.patch ]; + patches = [ ]; meta = with lib; { homepage = "https://github.com/berarma/oversteer"; + changelog = "https://github.com/berarma/oversteer/releases/tag/${version}"; description = "Steering Wheel Manager for Linux"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.srounce ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch b/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch deleted file mode 100644 index 0d5fdec689..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 239acf9..6a06c83 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,7 +8,7 @@ pymod = import('python') - prefix = get_option('prefix') - pkgdatadir = join_paths(prefix, get_option('datadir'), meson.project_name()) - py_installation = pymod.find_installation(get_option('python')) --py_path = py_installation.get_path('purelib') -+py_path = py_installation.get_install_dir() - - python3_required_modules = ['gi', 'pyudev', 'xdg', 'evdev', 'gettext', 'matplotlib', 'scipy', 'numpy'] - foreach p : python3_required_modules diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock index 128ab926d1..cc776f8b27 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -129,7 +129,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -185,9 +185,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -248,12 +248,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "serde", ] @@ -265,9 +265,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -277,9 +277,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[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", ] @@ -315,7 +315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -372,9 +372,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", @@ -382,25 +382,24 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] name = "clap" -version = "4.4.0" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", @@ -410,23 +409,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -437,9 +436,9 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clap_mangen" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9" +checksum = "b44f35c514163027542f7147797ff930523eea288e03642727348ef1a9666f6b" dependencies = [ "clap", "roff", @@ -639,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -673,7 +672,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -684,7 +683,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -799,15 +798,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "embed-resource" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", - "toml 0.7.6", + "toml 0.7.8", "vswhom", - "winreg 0.11.0", + "winreg 0.51.0", ] [[package]] @@ -839,9 +838,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1001,7 +1000,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1606,9 +1605,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -1761,9 +1760,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "4f7765dccf8c39c3a470fc694efe322969d791e713ca46bc7b5c506886157572" dependencies = [ "serde", "serde_json", @@ -1811,9 +1810,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "line-wrap" @@ -1826,9 +1825,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1910,9 +1909,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -2190,9 +2189,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -2247,7 +2246,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2258,9 +2257,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -2293,7 +2292,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owmods_cli" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "clap", @@ -2308,7 +2307,7 @@ dependencies = [ [[package]] name = "owmods_core" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "directories", @@ -2334,7 +2333,7 @@ dependencies = [ [[package]] name = "owmods_gui" -version = "0.11.2" +version = "0.11.3" dependencies = [ "anyhow", "log", @@ -2535,7 +2534,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "indexmap 1.9.3", "line-wrap", "quick-xml", @@ -2759,13 +2758,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "regex-syntax 0.7.5", ] @@ -2780,9 +2779,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -2807,7 +2806,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -2907,9 +2906,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", @@ -2920,9 +2919,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -2936,14 +2935,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", @@ -3076,14 +3075,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa 1.0.9", "ryu", @@ -3098,7 +3097,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3128,7 +3127,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", @@ -3148,7 +3147,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3251,9 +3250,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3353,9 +3352,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -3394,10 +3393,10 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.4", + "cfg-expr 0.15.5", "heck 0.4.1", "pkg-config", - "toml 0.7.6", + "toml 0.7.8", "version-compare 0.1.1", ] @@ -3483,7 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "bytes", "cocoa", "dirs-next", @@ -3555,7 +3554,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "brotli", "ico", "json-patch", @@ -3696,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -3731,22 +3730,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3761,9 +3760,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa 1.0.9", @@ -3776,15 +3775,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3823,7 +3822,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -3836,7 +3835,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -3908,9 +3907,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -3929,9 +3928,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -3966,7 +3965,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -4059,9 +4058,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -4092,9 +4091,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4176,9 +4175,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4226,7 +4225,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -4260,7 +4259,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4700,16 +4699,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "winreg" version = "0.50.0" @@ -4721,10 +4710,20 @@ dependencies = [ ] [[package]] -name = "wry" -version = "0.24.3" +name = "winreg" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" dependencies = [ "base64 0.13.1", "block", diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix index f0e325677a..1ff98c28a9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, nix-update-script , fetchFromGitHub , rustPlatform , pkg-config @@ -11,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90="; + hash = "sha256-CobGF3ZQEdRRoMGL9l37alGQArIuRxiFbihQoRdnAsc="; }; cargoLock = { @@ -53,6 +54,8 @@ rustPlatform.buildRustPackage rec { dist/cli/completions/owmods.{bash,fish,zsh} ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "CLI version of the mod manager for Outer Wilds Mod Loader"; homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh deleted file mode 100755 index 4848dc3210..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget - -#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh -set -e - -dirname="$(dirname "$0")" - -updateHash() -{ - version=$1 - - url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version" - prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version) - sha256="$(echo $prefetchJson | jq -r ".sha256")" - echo "sha256=${sha256}" - - sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix" - - #downloads and replaces .lock file - wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock - -} - -updateVersion() -{ - sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" -} - -latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name") -latestVersion="$(expr $latestTag : 'gui_v\(.*\)')" -echo "latest version: ${latestVersion}" - -echo "updating..." -updateVersion $latestVersion - -updateHash $latestVersion -echo "updated cli" diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index bac74b0ffe..2e22cdbd1b 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.3.2"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-HFZSIzP3G6f78gTOpzZFG5ZAo5Lo6VuxQe6xMvCVfss="; + sha256 = "sha256-2zdsVItGZYQydpC9E/uCbzOE9Xoh7zTqa9DpxA5qNCc="; }; - cargoHash = "sha256-ZsqxlwgXqw9eUEjw1DLBMz05V/y/ZbcrCL6I8TcnnDs="; + cargoHash = "sha256-FXYFQpiK2BGUz9GjsUPS9LWPeezbBQ3A33juoVCl71g="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index 7f09f3b616..a7b9041a34 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-WGavhxCGM10LXKvrXT3A2SOMSJRuoA/wAlEj7NFs8Ok="; + sha256 = "sha256-e/QXwRVtgl9+BaKbkeztCPfXORhef1HaKBPzKvVPVpM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index f140f8271e..ef77c5a56f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tNLy3HeHh8nBtmfJS5XhKX+KhIBnuUV2C8LwQl3mQLU="; + hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix index f6ee417869..e7d0611230 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix @@ -5,6 +5,7 @@ , version , desktopName , longDescription +, broken ? false , buildFHSEnv , extraBuildInputs ? [ ] , jdk @@ -85,6 +86,7 @@ buildFHSEnv { ''; meta = with lib; { + inherit broken; homepage = "https://www.qoppa.com/${pname}/"; description = "An easy to use, full-featured PDF editing software"; longDescription = longDescription; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix index b6787ce0ad..21874519a7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix @@ -11,7 +11,7 @@ { lib , stdenv , program ? "pdfstudio" -, year ? "2022" +, year ? "2023" , fetchurl , callPackage , jdk11 @@ -31,23 +31,23 @@ in { pdfstudioviewer = callPackage ./common.nix rec { inherit desktopName pname program year; - version = "${year}.2.4"; + version = "${year}.0.3"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; - sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg="; + sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs="; }; jdk = jdk17; }; pdfstudio2021 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.1"; + version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo="; + sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -57,14 +57,24 @@ in pdfstudio2022 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.4"; + version = "${year}.2.5"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ="; + sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; + + pdfstudio2023 = callPackage ./common.nix rec { + inherit desktopName longDescription pname program year; + version = "${year}.0.3"; + src = fetchurl { + url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; + sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; + }; + jdk = jdk17; + }; }.${pname} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 87847e32f6..ba12738c2e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE="; + sha256 = "sha256-Km4PWvbIzgc1Kxsp26HYLCA4OkCfOsGWsdWYLmWf/NA="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 3c025d6e88..25cc0ccf41 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -123,7 +123,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -134,20 +134,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -178,7 +178,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.24", "slab", "socket2 0.4.9", "waker-fn", @@ -190,43 +190,60 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", "async-lock", - "autocfg", + "async-signal", "blocking", "cfg-if", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "rustix 0.37.23", - "signal-hook", + "rustix 0.38.18", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.18", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" @@ -236,7 +253,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -260,7 +277,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -274,15 +291,15 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auto-launch" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5904a4d734f0235edf29aab320a14899f3e090446e594ff96508a6215f76f89c" +checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" dependencies = [ "dirs 4.0.0", "thiserror", @@ -318,9 +335,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -366,24 +383,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand 1.9.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[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", @@ -392,9 +410,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -402,9 +420,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -412,9 +430,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-unit" @@ -428,27 +446,27 @@ dependencies = [ [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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", ] @@ -495,7 +513,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -505,7 +523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -555,9 +573,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -571,16 +589,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -630,15 +647,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", "libc", "objc", ] @@ -674,9 +690,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -900,7 +916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -934,7 +950,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -945,7 +961,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1165,13 +1181,13 @@ dependencies = [ [[package]] name = "embed-resource" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" +checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" dependencies = [ "cc", "rustc_version", - "toml 0.7.6", + "toml 0.8.2", "vswhom", "winreg 0.51.0", ] @@ -1206,9 +1222,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -1216,13 +1232,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1233,25 +1249,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "error-code" version = "2.3.1" @@ -1280,10 +1285,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "exr" -version = "1.7.0" +name = "event-listener" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", @@ -1306,9 +1322,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" @@ -1374,14 +1390,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "nanorand", - "pin-project", "spin 0.9.8", ] @@ -1418,7 +1432,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1538,7 +1552,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1618,7 +1632,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1635,7 +1649,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1649,7 +1663,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1661,7 +1675,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", "x11", ] @@ -1716,10 +1730,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1764,7 +1776,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", "winapi", ] @@ -1810,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1840,7 +1852,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1881,7 +1893,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] @@ -1934,9 +1946,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash", "allocator-api2", @@ -1948,7 +1960,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -1971,9 +1983,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2016,7 +2028,21 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", "proc-macro2", "quote", "syn 1.0.109", @@ -2216,12 +2242,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "serde", ] @@ -2364,9 +2390,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2391,9 +2417,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" dependencies = [ "serde", "serde_json", @@ -2428,7 +2454,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ "cssparser", - "html5ever", + "html5ever 0.25.2", + "matches", + "selectors", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever 0.26.0", + "indexmap 1.9.3", "matches", "selectors", ] @@ -2474,9 +2513,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libdbus-sys" @@ -2509,9 +2548,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -2519,9 +2558,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -2755,9 +2794,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -2809,7 +2848,17 @@ dependencies = [ "dirs-next", "objc-foundation", "objc_id", - "time 0.3.28", + "time", +] + +[[package]] +name = "macos-accessibility-client" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf7710fbff50c24124331760978fb9086d6de6288dcdb38b25a97f8b1bdebbb" +dependencies = [ + "core-foundation", + "core-foundation-sys", ] [[package]] @@ -2835,7 +2884,21 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -2858,18 +2921,19 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2959,15 +3023,6 @@ dependencies = [ "x11-dl", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.10", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -3082,11 +3137,12 @@ dependencies = [ [[package]] name = "notify-debouncer-mini" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" +checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" dependencies = [ "crossbeam-channel", + "log", "notify", "serde", ] @@ -3200,9 +3256,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3289,9 +3345,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3335,7 +3391,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3346,9 +3402,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3421,14 +3477,14 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.1.2", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3510,7 +3566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -3545,6 +3601,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" @@ -3611,26 +3677,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - [[package]] name = "pin-project-lite" version = "0.2.13" @@ -3643,6 +3689,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkcs1" version = "0.7.5" @@ -3676,12 +3733,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "indexmap 1.9.3", "line-wrap", "quick-xml 0.29.0", "serde", - "time 0.3.28", + "time", ] [[package]] @@ -3718,13 +3775,14 @@ name = "pot" version = "0.0.0" dependencies = [ "arboard", - "base64 0.21.3", + "base64 0.21.4", "dirs 5.0.1", "image", "libloader", - "libloading 0.8.0", + "libloading 0.8.1", "lingua", "log", + "macos-accessibility-client", "mouse_position", "once_cell", "reqwest_dav", @@ -3767,7 +3825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -3802,9 +3860,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3943,9 +4001,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3953,14 +4011,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3994,14 +4050,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.0", ] [[package]] @@ -4015,13 +4071,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.0", ] [[package]] @@ -4032,17 +4088,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4064,6 +4120,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-util", @@ -4078,8 +4135,9 @@ dependencies = [ [[package]] name = "reqwest_dav" -version = "0.1.3" -source = "git+https://github.com/pot-app/reqwest_dav.git#241363249e0fb2a12912ec04400fc55c93b4a079" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb731945e2fa330114abcab8ea68ba22e4f5943853c45adb2cdd19c68a46930b" dependencies = [ "async-trait", "chrono", @@ -4118,21 +4176,6 @@ dependencies = [ "windows 0.37.0", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - [[package]] name = "rsa" version = "0.9.2" @@ -4172,9 +4215,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", @@ -4186,47 +4229,17 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.3", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -4293,16 +4306,6 @@ dependencies = [ "xcb", ] -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "2.9.2" @@ -4352,7 +4355,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", @@ -4361,9 +4364,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -4408,14 +4411,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa 1.0.9", "ryu", @@ -4430,7 +4433,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4460,15 +4463,15 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_json", "serde_with_macros", - "time 0.3.28", + "time", ] [[package]] @@ -4480,7 +4483,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4517,9 +4520,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", @@ -4528,9 +4531,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4539,9 +4542,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", ] @@ -4556,16 +4559,6 @@ dependencies = [ "winapi", ] -[[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.1" @@ -4608,9 +4601,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -4624,9 +4617,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4698,9 +4691,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4711,9 +4704,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash", "atoi", @@ -4723,7 +4716,7 @@ dependencies = [ "crossbeam-queue", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", "futures-intrusive", @@ -4731,33 +4724,30 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls", - "rustls-pemfile", "serde", "serde_json", "sha2", "smallvec", "sqlformat", "thiserror", - "time 0.3.28", + "time", "tokio", "tokio-stream", "tracing", "url", - "webpki-roots", ] [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -4768,9 +4758,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -4794,12 +4784,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.3", + "base64 0.21.4", "bitflags 2.4.0", "byteorder", "bytes", @@ -4830,19 +4820,19 @@ dependencies = [ "sqlx-core", "stringprep", "thiserror", - "time 0.3.28", + "time", "tracing", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.3", + "base64 0.21.4", "bitflags 2.4.0", "byteorder", "crc", @@ -4870,16 +4860,16 @@ dependencies = [ "sqlx-core", "stringprep", "thiserror", - "time 0.3.28", + "time", "tracing", "whoami", ] [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "flume", @@ -4893,7 +4883,7 @@ dependencies = [ "percent-encoding", "serde", "sqlx-core", - "time 0.3.28", + "time", "tracing", "url", ] @@ -5006,9 +4996,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5028,6 +5018,27 @@ dependencies = [ "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]] name = "system-deps" version = "5.0.0" @@ -5043,22 +5054,22 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" dependencies = [ - "cfg-expr 0.15.4", + "cfg-expr 0.15.5", "heck 0.4.1", "pkg-config", - "toml 0.7.6", + "toml 0.8.2", "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.16.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" +checksum = "b768eb5cf657b045d03304b1f60ecb54eac8b520f393c4f4240a94111a1caa17" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -5133,12 +5144,12 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" +checksum = "0238c5063bf9613054149a1b6bce4935922e532b7d8211f36989a490a79806be" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "bytes", "cocoa", "dirs-next", @@ -5180,7 +5191,7 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", - "time 0.3.28", + "time", "tokio", "url", "uuid", @@ -5192,12 +5203,13 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b" +checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" dependencies = [ "anyhow", "cargo_toml", + "dirs-next", "heck 0.4.1", "json-patch", "semver", @@ -5205,15 +5217,16 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", + "walkdir", ] [[package]] name = "tauri-codegen" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" +checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "brotli", "ico", "json-patch", @@ -5228,16 +5241,16 @@ dependencies = [ "sha2", "tauri-utils", "thiserror", - "time 0.3.28", + "time", "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7" +checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -5250,7 +5263,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" dependencies = [ "auto-launch", "log", @@ -5263,7 +5276,7 @@ dependencies = [ [[package]] name = "tauri-plugin-fs-watch" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" dependencies = [ "log", "notify", @@ -5277,7 +5290,7 @@ dependencies = [ [[package]] name = "tauri-plugin-log" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" dependencies = [ "byte-unit", "fern", @@ -5286,13 +5299,13 @@ dependencies = [ "serde_json", "serde_repr", "tauri", - "time 0.3.28", + "time", ] [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" dependencies = [ "log", "serde", @@ -5306,7 +5319,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#77b81af36cc6c03b07c59a2988b0f6d20960f1b0" dependencies = [ "futures-core", "log", @@ -5315,14 +5328,14 @@ dependencies = [ "sqlx", "tauri", "thiserror", - "time 0.3.28", + "time", "tokio", ] [[package]] name = "tauri-plugin-store" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90" dependencies = [ "log", "serde", @@ -5333,9 +5346,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769" +checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" dependencies = [ "gtk", "http", @@ -5354,9 +5367,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" +checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895" dependencies = [ "cocoa", "gtk", @@ -5374,19 +5387,20 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84" +checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46" dependencies = [ "brotli", "ctor", "dunce", "glob", "heck 0.4.1", - "html5ever", + "html5ever 0.26.0", "infer", "json-patch", - "kuchiki", + "kuchikiki", + "log", "memchr", "phf 0.10.1", "proc-macro2", @@ -5408,7 +5422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -5428,9 +5442,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] @@ -5453,22 +5467,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5494,20 +5508,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa 1.0.9", @@ -5520,15 +5523,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -5571,9 +5574,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -5581,7 +5584,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2 0.5.4", "windows-sys 0.48.0", ] @@ -5608,9 +5611,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -5631,14 +5634,26 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -5652,11 +5667,24 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -5690,7 +5718,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5763,9 +5791,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" @@ -5794,9 +5822,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5819,12 +5847,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" version = "2.4.1" @@ -5916,15 +5938,15 @@ 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.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5945,12 +5967,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" @@ -5978,7 +5994,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -6012,7 +6028,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6149,16 +6165,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.1.1", -] - -[[package]] -name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", + "system-deps 6.1.2", ] [[package]] @@ -6235,9 +6242,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", ] @@ -6574,9 +6581,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -6630,9 +6637,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" dependencies = [ "base64 0.13.1", "block", @@ -6644,7 +6651,7 @@ dependencies = [ "gio", "glib", "gtk", - "html5ever", + "html5ever 0.25.2", "http", "kuchiki", "libc", @@ -6750,9 +6757,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zbus" @@ -6773,7 +6780,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -6842,7 +6849,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.28", + "time", "zstd", ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix index bb907e30df..bf345bdea4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "2.4.2"; + version = "2.6.6"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-n12uO5QbD/HgD5Rq5d+TQ8j8Gn5hl6wTi27TqFmunIM="; + hash = "sha256-ZpN+SgBq2vA2p4MjrT07j22VB67FdiXIIl9puGiGJA4="; }; sourceRoot = "${src.name}/src-tauri"; @@ -66,15 +66,15 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-/5bB4czTPS3ZM9f7NBIHbwd95BqY2dRwKaBOWVsef04="; + outputHash = "sha256-PqdwoGPsu1j4sDTvBAguDhB2v1yaNWybluLiN37SDa4="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { # All other crates in the same workspace reuse this hash. - "tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo="; - "reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI="; + "tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98="; + "tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix deleted file mode 100644 index 2878b04844..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ /dev/null @@ -1,263 +0,0 @@ -{ lib, fetchFromGitHub, cacert, openssl, nixosTests -, python310, fetchPypi, fetchpatch -}: - -let - dropDocOutput = { outputs, ... }: { - outputs = lib.filter (x: x != "doc") outputs; - }; - - # Follow issue below for Python 3.11 support - # https://github.com/privacyidea/privacyidea/issues/3593 - python3' = python310.override { - packageOverrides = self: super: { - django = super.django_3; - - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - doCheck = false; - }); - # version 3.3.0+ does not support SQLAlchemy 1.3 - factory_boy = super.factory_boy.overridePythonAttrs (oldAttrs: rec { - version = "3.2.1"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; - }; - postPatch = ""; - }); - # fails with `no tests ran in 1.75s` - alembic = super.alembic.overridePythonAttrs (lib.const { - doCheck = false; - }); - flask-migrate = super.flask-migrate.overridePythonAttrs (oldAttrs: rec { - version = "2.7.0"; - src = fetchPypi { - pname = "Flask-Migrate"; - inherit version; - hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; - }; - }); - flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { - version = "2.5.1"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask-SQLAlchemy"; - inherit version; - hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; - }; - }); - # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "1.0.1"; - src = old.src.override { - inherit version; - hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; - }; - nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ - requests - ]); - doCheck = false; - }); - # Required by flask-1.1 - jinja2 = super.jinja2.overridePythonAttrs (old: rec { - version = "2.11.3"; - src = old.src.override { - inherit version; - hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; - }; - patches = [ - # python 3.10 compat fixes. In later upstream releases, but these - # are not compatible with flask 1 which we need here :( - (fetchpatch { - url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; - hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; - }) - (fetchpatch { - url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; - hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; - excludes = [ "CHANGES.rst" ]; - }) - ]; - }); - # Required by jinja2-2.11.3 - markupsafe = super.markupsafe.overridePythonAttrs (old: rec { - version = "2.0.1"; - src = old.src.override { - inherit version; - hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; - }; - }); - itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { - version = "1.1.0"; - src = old.src.override { - inherit version; - hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; - }; - }); - flask = super.flask.overridePythonAttrs (old: rec { - version = "1.1.4"; - src = old.src.override { - inherit version; - hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; - }; - }); - sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { - meta = meta // { broken = false; }; - }); - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - # Now requires `lingua` as check input that requires a newer `click`, - # however `click-7` is needed by the older flask we need here. Since it's just - # for the test-suite apparently, let's skip it for now. - mako = super.mako.overridePythonAttrs (lib.const { - nativeCheckInputs = []; - doCheck = false; - }); - # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not - # supported by current privacyIDEA. - responses = super.responses.overridePythonAttrs (lib.const { - doCheck = false; - }); - flask-babel = (super.flask-babel.override { - sphinxHook = null; - furo = null; - }).overridePythonAttrs (old: (dropDocOutput old) // rec { - pname = "Flask-Babel"; - version = "2.0.0"; - format = "setuptools"; - src = fetchPypi { - inherit pname; - inherit version; - hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; - }; - disabledTests = [ - # AssertionError: assert 'Apr 12, 2010...46:00\u202fPM' == 'Apr 12, 2010, 1:46:00 PM' - # Note the `\u202f` (narrow, no-break space) vs space. - "test_basics" - "test_init_app" - "test_custom_locale_selector" - "test_refreshing" - ]; - }); - psycopg2 = (super.psycopg2.override { - sphinxHook = null; - sphinx-better-theme = null; - }).overridePythonAttrs dropDocOutput; - pyjwt = (super.pyjwt.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs (old: (dropDocOutput old) // { format = "setuptools"; }); - beautifulsoup4 = (super.beautifulsoup4.override { - sphinxHook = null; - }).overridePythonAttrs dropDocOutput; - pydash = (super.pydash.override { - sphinx-rtd-theme = null; - }).overridePythonAttrs (old: rec { - version = "5.1.0"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; - }; - format = "setuptools"; - doCheck = false; - }); - pyopenssl = (super.pyopenssl.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs dropDocOutput; - deprecated = (super.deprecated.override { - sphinxHook = null; - }).overridePythonAttrs dropDocOutput; - wrapt = (super.wrapt.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs dropDocOutput; - }; - }; -in -python3'.pkgs.buildPythonPackage rec { - pname = "privacyIDEA"; - version = "3.8.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; - fetchSubmodules = true; - }; - - patches = [ - # https://github.com/privacyidea/privacyidea/pull/3611 - (fetchpatch { - url = "https://github.com/privacyidea/privacyidea/commit/7db6509721726a34e8528437ddbd4210019b11ef.patch"; - sha256 = "sha256-ZvtauCs1vWyxzGbA0B2+gG8q5JyUO8DF8nm/3/vcYmE="; - }) - ]; - - propagatedBuildInputs = with python3'.pkgs; [ - cryptography pyrad pymysql python-dateutil flask-versioned flask-script - defusedxml croniter flask-migrate pyjwt configobj sqlsoup pillow - python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel - ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno - ]; - - passthru.tests = { inherit (nixosTests) privacyidea; }; - - nativeCheckInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; - preCheck = "export HOME=$(mktemp -d)"; - postCheck = "unset HOME"; - disabledTests = [ - # expects `/home/` to exist, fails with `FileNotFoundError: [Errno 2] No such file or directory: '/home/'`. - "test_01_loading_scripts" - - # Tries to connect to `fcm.googleapis.com`. - "test_02_api_push_poll" - "test_04_decline_auth_request" - - # Timezone info not available in build sandbox - "test_14_convert_timestamp_to_utc" - - # Fails because of different logger configurations - "test_01_create_default_app" - "test_03_logging_config_file" - "test_04_logging_config_yaml" - "test_05_logging_config_broken_yaml" - ]; - - pythonImportsCheck = [ "privacyidea" ]; - - postPatch = '' - patchShebangs tests/testdata/scripts - substituteInPlace privacyidea/lib/resolvers/LDAPIdResolver.py --replace \ - "/etc/privacyidea/ldap-ca.crt" \ - "${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; - - postInstall = '' - rm -r $out/${python3'.sitePackages}/tests - ''; - - meta = with lib; { - description = "Multi factor authentication system (2FA, MFA, OTP Server)"; - license = licenses.agpl3Plus; - homepage = "http://www.privacyidea.org"; - maintainers = with maintainers; [ globin ma27 ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix index 8ec268c212..25ff9aed3b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.65.1"; + version = "0.69.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU="; + hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c="; # 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; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM="; + vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index fb796eb95d..0c9907764f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -18,7 +18,6 @@ , glew , glib , gmp -, gtest , gtk3 , hicolor-icon-theme , ilmbase @@ -105,10 +104,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ finalAttrs.nativeCheckInputs; - - doCheck = true; - nativeCheckInputs = [ gtest ]; + ]; separateDebugInfo = true; @@ -118,11 +114,6 @@ stdenv.mkDerivation (finalAttrs: { # additionally need to set the path via the NLOPT environment variable. NLOPT = nlopt; - # Disable compiler warnings that clutter the build log. - # It seems to be a known issue for Eigen: - # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 - env.NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; - # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; @@ -150,9 +141,6 @@ stdenv.mkDerivation (finalAttrs: { # Fix resources folder location on macOS substituteInPlace src/PrusaSlicer.cpp \ --replace "#ifdef __APPLE__" "#if 0" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - # Disable segfault tests - sed -i '/libslic3r/d' tests/CMakeLists.txt ''; patches = [ @@ -193,11 +181,23 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + doCheck = true; + + checkPhase = '' + runHook preCheck + + ctest \ + --force-new-ctest-process \ + -E 'libslic3r_tests|sla_print_tests' + + runHook postCheck + ''; + meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; - maintainers = with maintainers; [ moredread tweber ]; + maintainers = with maintainers; [ moredread tweber tmarkus ]; } // lib.optionalAttrs (stdenv.isDarwin) { mainProgram = "PrusaSlicer"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 6f071521d9..308c0949f1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,9 +1,23 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, wxGTK31, prusa-slicer }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, wxGTK31, prusa-slicer, libspnav }: let appname = "SuperSlicer"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; + patches = [ + # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; + # Excludes Linux-only patches + excludes = [ + "src/slic3r/GUI/FreeCADDialog.cpp" + "src/slic3r/GUI/Tab.cpp" + "src/slic3r/Utils/Http.cpp" + ]; + sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; + }) + ]; + versions = { stable = { version = "2.3.57.12"; @@ -11,26 +25,14 @@ let patches = null; }; latest = { - version = "2.4.58.3"; - sha256 = "sha256-pEZcBEvK4Mq8nytiXLJvta7Bk6qZRJfTNrYz7N/aUAE="; - patches = [ - # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; - sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; - }) - # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; - # Excludes Linux-only patches - excludes = [ - "src/slic3r/GUI/FreeCADDialog.cpp" - "src/slic3r/GUI/Tab.cpp" - "src/slic3r/Utils/Http.cpp" - ]; - sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; - }) - ]; + version = "2.4.58.5"; + sha256 = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; + inherit patches; + }; + beta = { + version = "2.5.59.2"; + sha256 = "sha256-IgE+NWy2DUrPR2ROfK1F67e8B3eoM9yRVQ0GZTxJ42I="; + inherit patches; }; }; @@ -45,19 +47,23 @@ let fetchSubmodules = true; }; - # wxScintilla is not used on macOS + # - wxScintilla is not used on macOS + # - Partially applied upstream changes cause a bug when trying to link against a nonexistent libexpat prePatch = super.prePatch + '' substituteInPlace src/CMakeLists.txt \ - --replace "scintilla" "" + --replace "scintilla" "" \ + --replace "list(APPEND wxWidgets_LIBRARIES libexpat)" "list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)" + + substituteInPlace src/libslic3r/CMakeLists.txt \ + --replace "libexpat" "EXPAT::EXPAT" ''; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; - # See https://github.com/supermerill/SuperSlicer/issues/432 - cmakeFlags = super.cmakeFlags ++ [ - "-DSLIC3R_BUILD_TESTS=0" + buildInputs = super.buildInputs ++ [ + libspnav ]; desktopItems = [ @@ -76,7 +82,7 @@ let inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3; - maintainers = with maintainers; [ cab404 moredread ]; + maintainers = with maintainers; [ cab404 moredread tmarkus ]; mainProgram = "superslicer"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index cb92304e50..e644f44f59 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-Fk31k0JIe1KJW7UviA8yikjfwlcdRD92wehNbuEoH2w="; + hash = "sha256-EDd8SChQ8Vh2uNSZq5mrWdsLNT0KC4IMA7e3BPk6p04="; }; - cargoHash = "sha256-eVJuebau0Y9oelniCzvOk9riMMZ9cS7E/G6KinbQa6k="; + cargoHash = "sha256-H4Oyn2cLyj/RNkiMQMzbHjhs1AJIcmSkZOO83ETByWk="; nativeBuildInputs = [ installShellFiles @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { any terminal on the same machine. The queue will be continuously processed, even if you no longer have any active ssh sessions. ''; - changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 29f3c0c35b..d9ae209dda 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.17.0"; # do NOT update to 3.x Windows releases + version = "1.18.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-C1mt9MklZoQNzs6zhk9CskeA4FfDsBVHNx/LRaqxWiI="; + hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index e27f2a0bdc..5ddb8170fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with lib; { description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc"; - maintainers = [ maintainers.globin ]; + maintainers = [ ]; license = licenses.asl20; platforms = platforms.all; homepage = "https://www.qlcplus.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix index 70d30ea054..71be8f8b15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -43,7 +43,7 @@ let "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" ] ++ lib.optionals (pname == "gammastep") [ - "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/" "--enable-apparmor" ]; @@ -117,7 +117,8 @@ rec { license = licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; - maintainers = with maintainers; [ globin yana ]; + mainProgram = "redshift"; + maintainers = with maintainers; [ yana ]; }; }; @@ -137,7 +138,8 @@ rec { longDescription = "Gammastep" + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; - maintainers = [ lib.maintainers.primeos ] ++ redshift.meta.maintainers; + mainProgram = "gammastep"; + maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix index 42d5535f55..5ffc383f14 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.43"; + version = "1.12.64"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-3GNp+0ZUZbUcBkE8DbIEDRYlWfG3HDTTS6wK3u42jJg="; + hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw="; }; appexec = appimageTools.wrapType2 { inherit pname version src; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix index 1d7ef32cd3..1466d3e232 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix @@ -26,6 +26,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { description = "Window switcher, run dialog and dmenu replacement for Wayland"; homepage = "https://github.com/lbonn/rofi"; license = licenses.mit; + mainProgram = "rofi"; maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix index 7e5fa2c9fb..0b353b61a9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rsclock/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rsClock"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "valebes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HsHFlM5PHUIF8FbLMJpleAvgsXHP6IZLuiH+umK1V4M="; + sha256 = "sha256-bxka9qTow5aL8ErYQudB+WRi2HecYn4/M3lBSxjd5/U="; }; - cargoHash = "sha256-0bUKiKieIic+d3jEow887i7j2tp/ntYkXm6x08Df64M="; + cargoHash = "sha256-ESBeXLBkDAmuQkazcXYdo5VnMCTaxfZmzKP+d5V4lEo="; meta = with lib; { description = "A simple terminal clock written in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix index bf3e8866f7..ce774e5a66 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "safecloset"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; rev = "v${version}"; - hash = "sha256-ZvJbPbKS7HZ9R4Z9bMrXVjKtIdKE5dkp115dmHv7uJY="; + hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws="; }; - cargoHash = "sha256-vyn/rcptkJLjXg8qjAnzc2bDjz2r0LsGa8toyybgdbM="; + cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/third_party/nixpkgs/pkgs/applications/misc/sfwbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sfwbar/default.nix index ec85d9d0e4..bd46c449ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sfwbar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sfwbar/default.nix @@ -10,17 +10,19 @@ , libpulseaudio , libmpdclient , libxkbcommon +, alsa-lib +, makeWrapper , }: stdenv.mkDerivation rec { pname = "sfwbar"; - version = "1.0_beta11"; + version = "1.0_beta13"; src = fetchFromGitHub { owner = "LBCrion"; repo = pname; rev = "v${version}"; - sha256 = "PmpiO5gvurpaFpoq8bQdZ53FYSVDnyjN8MxDpelMnAU="; + hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64="; }; buildInputs = [ @@ -30,14 +32,21 @@ stdenv.mkDerivation rec { libpulseaudio libmpdclient libxkbcommon + alsa-lib ]; nativeBuildInputs = [ meson ninja pkg-config + makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/sfwbar \ + --suffix XDG_DATA_DIRS : $out/share + ''; + meta = with lib; { homepage = "https://github.com/LBCrion/sfwbar"; description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix deleted file mode 100644 index 82008de957..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ autoPatchelfHook -, dpkg -, fetchurl -, makeDesktopItem -, makeWrapper -, lib -, stdenv -, udev -, alsa-lib -, mesa -, nss -, nspr -, systemd -, wrapGAppsHook -, xorg -}: - -let - inherit (stdenv.hostPlatform) system; - - throwSystem = throw "Unsupported system: ${system}"; - - pname = "simplenote"; - - version = "2.9.0"; - - sha256 = { - x86_64-linux = "sha256-uwd9fYqZepJ/BBttprqkJhswqMepGsHDTd5Md9gjI68="; - }.${system} or throwSystem; - - meta = with lib; { - description = "The simplest way to keep notes"; - homepage = "https://github.com/Automattic/simplenote-electron"; - license = licenses.gpl2; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ - kiwi - ]; - platforms = [ - "x86_64-linux" - ]; - }; - - linux = stdenv.mkDerivation rec { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb"; - inherit sha256; - }; - - desktopItem = makeDesktopItem { - categories = [ "Development" ]; - comment = "Simplenote for Linux"; - desktopName = "Simplenote"; - exec = "simplenote %U"; - icon = "simplenote"; - name = "simplenote"; - startupNotify = true; - }; - - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - dontWrapGApps = true; - - # TODO: migrate off autoPatchelfHook and use nixpkgs' electron - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook - ]; - - buildInputs = [ - alsa-lib - mesa - xorg.libXScrnSaver - xorg.libXtst - nss - nspr - stdenv.cc.cc - systemd - ]; - - unpackPhase = "dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" - - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* "$out/share/applications" - ''; - - runtimeDependencies = [ - (lib.getLib udev) - ]; - - postFixup = '' - makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" \ - "''${gappsWrapperArgs[@]}" - ''; - }; - -in -linux diff --git a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix index 329bf2aada..3a59a2542e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" + --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \ + --replace "-lmupdf-third" "" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ --replace "/etc/sioyek" "$out/etc" diff --git a/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix index 85e162ec58..f599c4f47c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slippy/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "slippy"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "slippy"; rev = "v${version}"; - hash = "sha256-oxXmfvdnYmmKXvKHpJC23cvHaVdh5cpfQ1q5GPLskfY="; + hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; }; - cargoHash = "sha256-4MMTWhyi2/n9ESX2KJFERsXQHyGZunvArbYQmKiV7Eg="; + cargoHash = "sha256-6nB+rHBJU9qhA7azz2ynaBw1UJdwE+T7pgpoPzhD5Bk="; # the dependency css-minify contains both README.md and Readme.md, # which causes a hash mismatch on systems with a case-insensitive filesystem @@ -53,6 +53,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; + meta = with lib; { description = "Markdown slideshows in Rust"; homepage = "https://github.com/axodotdev/slippy"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix index 4f022d81f6..83407f94fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix @@ -7,29 +7,32 @@ , libXau , libXdmcp , conf ? null -, patches ? [] +, patches ? [ ] }: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2022-12-19"; + version = "1.0"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; - hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; + rev = version; + hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4="; }; - configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = '' - ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} - makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) - ''; + preBuild = + let + configFile = if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in + '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXdmcp]; + buildInputs = [ libX11 libXau libXdmcp ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix index 1c6931fadc..ee5e01b799 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.6.11"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~strahinja"; repo = "slweb"; rev = "v${finalAttrs.version}"; - hash = "sha256-+bKapK/s1pmo1NRRslf7V4ogWTtchFNWpzi+S8YG6+4="; + hash = "sha256-QDHcp5pCmapgOlJpDDyyC12JOfh/biDyF6O+iKGbOGg="; }; nativeBuildInputs = [ redo-apenwarr ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index be0d29ee50..93a6c069f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI="; + hash = "sha256-cs1kj/spZtMUL9aUtBHINAH7uyjMSn9jRDF/hRPzIbo="; }; outputs = [ "out" "udev" ]; @@ -38,13 +38,14 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ evdev + dbus-python gtk3 + hid-parser psutil pygobject3 pyudev pyyaml xlib - hid-parser ]; # the -cli symlink is just to maintain compabilility with older versions where diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index a6ce353694..b9ac311bce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.24.2"; + version = "2.27.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-jzEtXmlpt6foldLW57ZcpevX8CDc+c8iIynT5nOD9qY="; + hash = "sha256-Z+paJAuzUnCdCSx2UHg1HV14vDo3jWsyUrcbEnvqTm0="; }; - vendorHash = "sha256-rMMTUT7HIgYvxGcqR02VmxOh1ihE6xuIboDsnuOo09g="; + vendorHash = "sha256-H2kSTsYiD9HResHes+7YxUyNcjtM0SLpDPUC0Y518VM="; ldflags = [ "-s -w" diff --git a/third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix index 4316905e65..8584dbbf1e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stretchly/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://hovancik.net/stretchly"; downloadPage = "https://hovancik.net/stretchly/downloads/"; license = licenses.bsd2; - maintainers = with maintainers; [ _1000101 oxalica ]; + maintainers = with maintainers; [ _1000101 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index d505761f80..5755c56102 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -111,13 +111,13 @@ in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "7.0.2"; + version = "7.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; src = fetchurl { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo="; + sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY="; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 93d539b9f4..4f1a5fdef6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -33,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.7"; + version = "1.4.8"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54="; + sha256 = "sha256-Fy3cy6c36Qsi8F7cC/MI8g6tdfkn8fDBncL+ZOoiGcs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 0d1b78ca91..21cec72c5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-06qiJ3NZZSvDBH7r6K1qnz0q4ngB45wBoaG6eTFiRtk="; + sha256 = "sha256-5U9LWFaCwszvT1reu6NflPKQUrsQkP/NdSO4LBHWm2g="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-tcyLoXOrC+lrFVRzxWfWpvHpfA6tbEBXFj9mSeTLcbc="; + cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix index 829def809d..f5ce961e40 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix @@ -42,6 +42,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { patches = [ # Allow setting MEDIA_ROOT through environment variable ./media-root.patch + # https://github.com/TandoorRecipes/recipes/pull/2706 + (fetchpatch { + url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch"; + hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs="; + }) ]; propagatedBuildInputs = with python.pkgs; [ @@ -113,8 +118,8 @@ python.pkgs.pythonPackages.buildPythonPackage rec { touch cookbook/static/themes/bootstrap.min.css.map touch cookbook/static/css/bootstrap-vue.min.css.map - ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse - ${python.pythonForBuild.interpreter} manage.py collectstatic + ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic_js_reverse + ${python.pythonOnBuildForHost.interpreter} manage.py collectstatic runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix index 6e9d2e6cc1..23f736e9f0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; + hash = "sha256-48ZFSE+uFEtY3ry3ONT/d+KhfX93eTyW8z+PiXQqEn4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix b/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix index f0ea721f12..fbe734ddc1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix @@ -10,7 +10,7 @@ , expat , bwidget , python3 -, texlive +, texliveTeTeX , survex , makeWrapper , fmt @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config perl python3 - texlive.combined.scheme-tetex + texliveTeTeX makeWrapper tcl.tclPackageHook ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { fixupPhase = '' runHook preFixup wrapProgram $out/bin/therion \ - --prefix PATH : ${lib.makeBinPath [ survex texlive.combined.scheme-tetex ]} + --prefix PATH : ${lib.makeBinPath [ survex texliveTeTeX ]} wrapProgram $out/bin/xtherion \ --prefix PATH : ${lib.makeBinPath [ tk ]} runHook postFixup diff --git a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix index eebe42890d..3d32c43bd2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.19.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM="; + hash = "sha256-l19p/Ql1gaNJpmDH46jwLgUUmJ5YTYRQi6DdayAd84Q="; }; buildInputs = [ sqlite zlib ]; @@ -17,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; - doCheck = true; + + # https://github.com/felt/tippecanoe/issues/148 + doCheck = false; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; 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 67c9f83683..c8a2be9b3b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,45 +1,38 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_24, libsecret }: - -stdenv.mkDerivation rec { +{ lib, appimageTools, fetchurl, asar }: let pname = "todoist-electron"; - version = "8.3.3"; + version = "8.9.3"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage"; - hash = "sha256-X928hCrYVOBTEZq1hmZWgWlabtOzQrLUuptF/SJcAto="; + hash = "sha256-L1uH5bnJ66QxAXs7yywG4H/FaunwTX1l+tVtRe2nxdc="; }; - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; + appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} - dontUnpack = true; - dontConfigure = true; - dontBuild = true; + # Get rid of the autoupdater + ${asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${asar}/bin/asar pack app $out/resources/app.asar + ''; + }); - nativeBuildInputs = [ makeWrapper ]; +in appimageTools.wrapAppImage { + inherit pname version; + src = appimageContents; - installPhase = '' - runHook preInstall + extraPkgs = { pkgs, ... }@args: [ + pkgs.hidapi + ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; - mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512 - - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512 - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron_24}/bin/electron $out/bin/todoist-electron \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + extraInstallCommands = '' + # Add desktop convencience stuff + mv $out/bin/{${pname}-*,${pname}} + install -Dm444 ${appimageContents}/todoist.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/todoist.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/todoist.desktop \ + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" ''; meta = with lib; { @@ -47,6 +40,6 @@ stdenv.mkDerivation rec { description = "The official Todoist electron app"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; - maintainers = with maintainers; [ i077 kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza pokon548 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 0faa36302f..e74cb435e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ="; + sha256 = "sha256-0L/5i+m0rh1VjsZ0N2cshi+Nw951ASjMf5y6JxV53ko="; }; nativeCheckInputs = with python3Packages; [ pytest ]; @@ -30,4 +30,3 @@ python3Packages.buildPythonApplication rec { }; } - diff --git a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix index 39b674d4c3..54f6e70db0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-UK9Pq+QNEk+AeG5/ohyCiL+lSpENQfiR/Qm0nQGJGrg="; + hash = "sha256-LYOWU3ven9g3NCB9HAWFk3oCBFcWAXU5R4T4EIF14q0="; }; - cargoHash = "sha256-TpNnb3usDkNlcejlSkXb5R1fgVlKNYBFAWi1fEn9uzI="; + cargoHash = "sha256-MnQ5Y+mQIBh+MMIgL09clkPnOYIwFhNeLSvfEt9Lvsg="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/tumpa/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tumpa/default.nix index f7dfdd95d5..cc73b7fa69 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tumpa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tumpa/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "kushaldas"; repo = "tumpa"; rev = "v${version}"; - sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; + hash = "sha256-sT+IasupBxkfYoOULRvG429ZHA94uAJoYfFd1Whs0J4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix index 9050655d4f..888913dd1e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-u/vpS9BQxeKd8eaJicmn2wMk9EYjCO7LXdoshCBa4rw="; + hash = "sha256-m6vt4wpLpKJJNP8qCCeLMgNfAAZengDGjBVmFI5ZeSQ="; }; - vendorHash = "sha256-m6hPj1IZr+jEA/h2qbz03tuVq3aPEMmcnWiEC0LKtxI="; + vendorHash = "sha256-q22t4/eum/RSWyzVQfJ0VZkEHgBu12nyRgmkJffi7PM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 7a466b0e5d..96f033744e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -21,15 +21,15 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.3"; + version = "5.15.4"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-unAic6GTgvZFFJwPERh164vfDiFE0zLEUjgADR94w5w="; + sha256 = "sha256-5pEpYnJFHQKEfTve07ngFVDAOM9+kwrx6hc30gEwsko="; }; nativeBuildInputs = with python3Packages; [ - distutils_extra + distutils-extra gobject-introspection intltool wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix index db6ab6d6a9..a5a2085fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 configobj dbus-python - distutils_extra + distutils-extra httplib2 lxml pillow diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 7eaef8b202..93062a7c9a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -45,13 +45,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.11"; + version = "2.11.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-G/9paJFJsRfIxMJ2hbuVS7pxCfSUCK69DNV2DHi60qA="; + hash = "sha256-A8iYFdW30Em5pjGn3DRpaV0A7ixwfSzmIp8AgtPkBCI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix index d70918f2e7..b54df7e951 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Fix dbus interface headers. See # https://github.com/davidbrazdil/volnoti/pull/10 (fetchpatch { - url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch"; sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix index cbbe3408d4..4155c912c6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix @@ -3,14 +3,17 @@ , rustPlatform , nix-update-script }: -rustPlatform.buildRustPackage rec { - pname = "wallust"; +let version = "2.7.1"; +in +rustPlatform.buildRustPackage { + pname = "wallust"; + inherit version; src = fetchFromGitea { domain = "codeberg.org"; owner = "explosion-mental"; - repo = pname; + repo = "wallust"; rev = version; hash = "sha256-WhL2HWM1onRrCqWJPLnAVMd/f/xfLrK3mU8jFSLFjAM="; }; @@ -19,13 +22,13 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "A better pywal"; homepage = "https://codeberg.org/explosion-mental/wallust"; - license = licenses.mit; - maintainers = with maintainers; [ onemoresuza iynaix ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onemoresuza iynaix ]; downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "wallust"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index d2e49ee8fb..e82e7a266f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -68,24 +68,24 @@ let libcava.src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; - rev = "0.8.5"; - hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; + rev = "0.9.1"; + hash = "sha256-FnRJJV0poRmw+y4nt1X7Z0ipX86LRK1TJhNKHFk0rTw="; }; in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.9.22"; + version = "0.9.24"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-9LJDA+zrHF9Mn8+W9iUw50LvO+xdT7/l80KdltPrnDo="; + hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0="; }; postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.9.1 patchShebangs . popd ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix index 9445ed8f1f..26c0f4bca0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix @@ -7,26 +7,26 @@ , scdoc , wayland , wayland-protocols -, zig_0_10 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ifreund"; repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; + hash = "sha256-Q1FlahawsnJ77gP6QVs9AR058rhMU92iueRPudPf+sE="; }; nativeBuildInputs = [ pkg-config scdoc wayland - zig_0_10.hook + zig_0_11.hook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix index 54775719a2..7e2f72e31d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-697LoXu6x8ODQa7tG/NqpSqnLJgM765wBFFnKyul7uI="; + hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; - cargoHash = "sha256-sxZ4R7QXQSuNFNRuOI/omON6QmQ0DTKQvjHy1BcvXAA="; + cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix index abb5d0b960..2199007518 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xastir/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.8"; + version = "2.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - hash = "sha256-hRe0KO1lWOv3hNNDMS70t+X1rxuhNlNKykmo4LEU+U0="; + hash = "sha256-EQXSfH4b5vMiprFcMXCUDNl+R1cHSj9CyhZnUPAMoCw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 2a6ac97c9c..d93108bdf5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; + mainProgram = "xmrig"; platforms = platforms.unix; maintainers = with maintainers; [ kim0 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index 99d8225f26..ba643eb77b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -15,6 +15,7 @@ xmrig.overrideAttrs (oldAttrs: rec { description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; + mainProgram = "xmrig"; platforms = platforms.unix; maintainers = with maintainers; [ j0hax ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix index 07857fbf5e..76eb27a624 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another telephony engine"; - homepage = "http://yate.ro/"; + homepage = "https://yate.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix index 93b06323e0..1c57456f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ydict"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "ydict"; rev = "v${version}"; - sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; + sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8="; }; vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix index ca0bf4472a..7f6bb6095d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -4,7 +4,7 @@ , yubikey-manager , fido2 , mss -, zxing_cpp +, zxing-cpp , pillow , cryptography @@ -43,7 +43,7 @@ buildPythonApplication { yubikey-manager fido2 mss - zxing_cpp + zxing-cpp pillow cryptography ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 6282b812b2..321ef367c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx + meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx gettext wrapGAppsHook libxml2 appstream-glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 002c753caf..f6eb5cfd45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -11,15 +11,16 @@ , tesseract , leptonica , mujs +, gitUpdater }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.4.1"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0pcjxvlh4hls8mjhjghhhihyy2kza8l27wdx0yq4bkd1g1b5f74c"; + hash = "sha256-+YKgHWUj+iVmk4EYTAamJe2/15YcvbBxHcz9ucQCrC8="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -40,6 +41,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; + postPatch = '' + sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build + ''; + + passthru.updateScript = gitUpdater { + url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; + }; + meta = with lib; { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "A zathura PDF plugin (mupdf)"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix index 79d386e349..75e310cdff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/default.nix @@ -1,12 +1,8 @@ -{ callPackage, texlive }: +{ callPackage, texliveMedium }: -builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) { zettlr = { - version = "2.3.0"; - hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; - }; - zettlr-beta = { - version = "3.0.0-beta.7"; - hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U="; + version = "3.0.2"; + hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix index 4a8bcbd854..671577b61b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zettlr/generic.nix @@ -4,7 +4,7 @@ , appimageTools , lib , fetchurl -, texlive +, texliveMedium , pandoc }: @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { inherit name src; multiArch = false; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop diff --git a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix b/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix deleted file mode 100644 index 62dbae082d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/aether/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig -, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid -, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu -, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems -}: - -let - binaryName = "AetherP2P"; - aether-app-git = fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }; -in -stdenv.mkDerivation rec { - pname = "aether"; - version = "2.0.0-dev.15"; - - src = fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }; - - # there is no logo in the tarball so we grab it from github and convert it in the build phase - buildPhase = '' - convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png - ''; - - dontWrapGApps = true; - - buildInputs = [ - alsa-lib - cups - libdrm - libuuid - libXdamage - libX11 - libXScrnSaver - libXtst - libxcb - libxshmfence - mesa - nss - ]; - - nativeBuildInputs = [ - imagemagick - autoPatchelfHook - wrapGAppsHook - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = binaryName; - icon = pname; - desktopName = "Aether"; - genericName = meta.description; - categories = [ "Network" ]; - mimeTypes = [ "x-scheme-handler/aether" ]; - }) - ]; - - installPhase = - let - libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver - libappindicator-gtk3 libdbusmenu - ]; - in - '' - mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps} - mv * $out/opt/${binaryName} - - chmod +x $out/opt/${binaryName}/${binaryName} - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/opt/${binaryName}/${binaryName} - - wrapProgram $out/opt/${binaryName}/${binaryName} \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix LD_LIBRARY_PATH : ${libPath} - - ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ - - ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/ - - runHook postInstall - ''; - - meta = with lib; { - description = "Peer-to-peer ephemeral public communities"; - homepage = "https://getaether.net/"; - downloadPage = "https://getaether.net/download/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Only; - maintainers = with maintainers; [ maxhille ]; - # other platforms could be supported by building from source - platforms = [ "x86_64-linux" ]; - }; -} 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 bd810cfe73..93ba2ac105 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.2.2"; + version = "6.2.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-5xbwBCLTlZ0cE273n3ErykZSEr59dZjQWhVTK91W9a4="; + sha256 = "sha256-W6P83+DPd2VRz52UKPJp+D1WcjgDwyXYcx6rViHbmlk="; }; # just patch interpreter diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 7e79064833..e2673068dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.11"; + version = "1.10.15"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-6eebc8+SsonTngOIM5C+cxqzhFSLK5wLB/sBhVQuTQ4="; + hash = "sha256-vx9Vfbdxd3Y0fdjpKC6LFAUEej1RHszyM5GUUGKy0zU="; }; - vendorHash = "sha256-sBoH/0SQtHO/fgyfve4bpy74GIS8qWr6KcIQyOnkgkI="; + vendorHash = "sha256-br/z6k1D1r9JEECKNy7BOZzfHaaveCMUA1bKos0+p0Q="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 2121e74d36..d51f3816ef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.58.137"; + version = "1.60.118"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-6vsdQU9NbEKFp/1A0bNQvutF4I+vI0zfrx70QvU1KV4="; + sha256 = "sha256-Lo9F7z8gJJRId7LBfVTj18C65swDr8C7Mt1gNmXoSoY="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 1e203fc12e..909b506457 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -85,8 +85,8 @@ mkChromiumDerivation (base: rec { then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled - then [ squalus primeos michaeladler networkexception ] - else [ primeos thefloweringash networkexception ]; + then [ squalus primeos michaeladler networkexception emilylange ] + else [ primeos thefloweringash networkexception emilylange ]; license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; 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 562fbbbb30..ff0c83527a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch +, fetchzip, zstd , buildPackages , pkgsBuildBuild , pkgsBuildTarget @@ -61,21 +62,21 @@ buildFun: let - python3WithPackages = python3.pythonForBuild.withPackages(ps: with ps; [ + python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); clangFormatPython3 = fetchurl { url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; }; # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; - githubPatch = { commit, sha256, revert ? false }: fetchpatch { + githubPatch = { commit, hash, revert ? false }: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256 revert; + inherit hash revert; }; mkGnFlags = @@ -117,7 +118,7 @@ let libExecPath = "$out/libexec/${packageName}"; ungoogler = ungoogled-chromium { - inherit (upstream-info.deps.ungoogled-patches) rev sha256; + inherit (upstream-info.deps.ungoogled-patches) rev hash; }; # There currently isn't a (much) more concise way to get a stdenv @@ -147,15 +148,39 @@ let else throw "no chromium Rosetta Stone entry for os: ${platform.config}"; }; + recompressTarball = { version, hash ? "" }: fetchzip { + name = "chromium-${version}.tar.zstd"; + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + inherit hash; + + nativeBuildInputs = [ zstd ]; + + postFetch = '' + echo removing unused code from tarball to stay under hydra limit + rm -r $out/third_party/{rust-src,llvm} + + echo moving remains out of \$out + mv $out source + + echo recompressing final contents into new tarball + # try to make a deterministic tarball + tar \ + --use-compress-program "zstd -T$NIX_BUILD_CORES" \ + --sort name \ + --mtime 1970-01-01 \ + --owner=root --group=root \ + --numeric-owner --mode=go=rX,u+rw,a-s \ + -cf $out source + ''; + }; + + base = rec { pname = "${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - inherit (upstream-info) sha256; - }; + src = recompressTarball { inherit version; inherit (upstream-info) hash; }; nativeBuildInputs = [ ninja pkg-config @@ -225,7 +250,7 @@ let (githubPatch { # Reland [clang] Disable autoupgrading debug info in ThinLTO builds commit = "54969766fd2029c506befc46e9ce14d67c7ed02a"; - sha256 = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; + hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) ]; @@ -290,9 +315,6 @@ let sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc '' + '' - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc @@ -309,7 +331,7 @@ let # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node - ln -s "${pkgsBuildHost.jre8_headless}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py @@ -415,7 +437,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python3.pythonForBuild}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3.pythonOnBuildForHost}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. @@ -454,9 +476,10 @@ let postFixup = '' # Make sure that libGLESv2 and libvulkan are found by dlopen. + # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp chromiumBinary="$libExecPath/$packageName" origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader ]}:$origRpath" "$chromiumBinary" + patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" ''; passthru = { @@ -464,6 +487,7 @@ let chromiumDeps = { gn = gnChromium; }; + inherit recompressTarball; }; } # overwrite `version` with the exact same `version` from the same source, diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 5677bc37e8..7c2c75e749 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -57,7 +57,7 @@ let gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { - inherit (upstream-info.deps.gn) url rev sha256; + inherit (upstream-info.deps.gn) url rev hash; }; }); }); @@ -80,12 +80,12 @@ let chromeSrc = let # Use the latest stable Chrome version if necessary: - version = if chromium.upstream-info.sha256bin64 != null + version = if chromium.upstream-info.hash_deb_amd64 != null then chromium.upstream-info.version else (import ./upstream-info.nix).stable.version; - sha256 = if chromium.upstream-info.sha256bin64 != null - then chromium.upstream-info.sha256bin64 - else (import ./upstream-info.nix).stable.sha256bin64; + hash = if chromium.upstream-info.hash_deb_amd64 != null + then chromium.upstream-info.hash_deb_amd64 + else (import ./upstream-info.nix).stable.hash_deb_amd64; in fetchurl { urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ "https://dl.google.com/linux/chrome/deb/pool/main/g" @@ -93,7 +93,7 @@ let "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" "http://repo.fdzh.org/chrome/deb/pool/main/g" ]; - inherit sha256; + inherit hash; }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 549d285377..cf3d0a7d73 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -6,10 +6,10 @@ }: { rev -, sha256 +, hash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ungoogled-chromium"; version = rev; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ungoogled-software"; repo = "ungoogled-chromium"; - inherit rev sha256; + inherit rev hash; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index f8dae95936..a241ee0dd7 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -21,12 +21,11 @@ from urllib.request import urlopen RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/all/versions/all/releases' DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' -BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' PIN_PATH = dirname(abspath(__file__)) + '/upstream-info.nix' UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' - +NIXPKGS_PATH = subprocess.check_output(["git", "rev-parse", "--show-toplevel"], cwd=dirname(PIN_PATH)).strip() def load_as_json(path): """Loads the given nix file as JSON.""" @@ -41,11 +40,28 @@ def save_dict_as_nix(path, input): with open(path, 'w') as out: out.write(formatted.decode()) +def prefetch_src_sri_hash(attr_path, version): + """Prefetches the fixed-output-derivation source tarball and returns its SRI-Hash.""" + print(f'nix-build (FOD prefetch) {attr_path} {version}') + out = subprocess.run( + ["nix-build", "--expr", f'(import ./. {{}}).{attr_path}.browser.passthru.recompressTarball {{ version = "{version}"; }}'], + cwd=NIXPKGS_PATH, + stderr=subprocess.PIPE + ).stderr.decode() + + for line in iter(out.split("\n")): + match = re.match(r"\s+got:\s+(.+)$", line) + if match: + print(f'Hash: {match.group(1)}') + return match.group(1) + print(f'{out}\n\nError: Expected hash in nix-build stderr output.', file=sys.stderr) + sys.exit(1) + def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" - print(f'nix-prefetch-url {url}') - out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) - return out.decode('utf-8').rstrip() + print(f'nix store prefetch-file {url}') + out = subprocess.check_output(['nix', 'store', 'prefetch-file', '--json', '--hash-type', algo, url]) + return json.loads(out)['hash'] def nix_prefetch_git(url, rev): @@ -80,9 +96,9 @@ def get_chromedriver(channel): return { 'version': channel['version'], - 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), - 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')), - 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64')) + 'hash_linux': nix_prefetch_url(get_chromedriver_url('linux64')), + 'hash_darwin': nix_prefetch_url(get_chromedriver_url('mac-x64')), + 'hash_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac-arm64')) } @@ -97,7 +113,7 @@ def get_channel_dependencies(version): 'version': datetime.fromisoformat(gn['date']).date().isoformat(), 'url': gn['url'], 'rev': gn['rev'], - 'sha256': gn['sha256'] + 'hash': gn['hash'] } } @@ -135,10 +151,6 @@ def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': return 'chromium' - if channel_name == 'beta': - return 'chromiumBeta' - if channel_name == 'dev': - return 'chromiumDev' if channel_name == 'ungoogled-chromium': return 'ungoogled-chromium' print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) @@ -190,6 +202,10 @@ with urlopen(RELEASES_URL) as resp: if channel_name in channels: continue + # We only look for channels that are listed in our version pin file. + if channel_name not in last_channels: + continue + # If we're back at the last release we used, we don't need to # keep going -- there's no new version available, and we can # just reuse the info from last time. @@ -206,8 +222,11 @@ with urlopen(RELEASES_URL) as resp: google_chrome_suffix = channel_name try: - channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{release["version"]}.tar.xz') - channel['sha256bin64'] = nix_prefetch_url( + channel['hash'] = prefetch_src_sri_hash( + channel_name_to_attr_name(channel_name), + release["version"] + ) + channel['hash_deb_amd64'] = nix_prefetch_url( f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + f'google-chrome-{google_chrome_suffix}_{release["version"]}-1_amd64.deb') except subprocess.CalledProcessError: @@ -222,7 +241,7 @@ with urlopen(RELEASES_URL) as resp: ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { 'rev': release['ungoogled_tag'], - 'sha256': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['sha256'] + 'hash': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['hash'] } with open(UNGOOGLED_FLAGS_PATH, 'w') as out: out.write(get_ungoogled_chromium_gn_flags(release['ungoogled_tag'])) 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 604b64548d..4714704c0e 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,65 +1,39 @@ { - beta = { - deps = { - gn = { - rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-01"; - }; - }; - sha256 = "1wf0j189cxpayy6ffmj5j6h5yg3amivryilimjc2ap0jkyj4xrbi"; - sha256bin64 = "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"; - version = "117.0.5938.22"; - }; - dev = { - deps = { - gn = { - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-10"; - }; - }; - sha256 = "1z01b6w4sgndrlcd26jgimk3rhv3wzpn67nv1fd5ln7dwfwkyq20"; - sha256bin64 = "11y09hsy7y1vg65xfilq44ffsmn15dqy80fa57psj1kin4a52v2x"; - version = "118.0.5966.0"; - }; stable = { chromedriver = { - sha256_darwin = "06yhmapflj5m40952zcrq97qlj3crbbffaspiz87w0syxnw9avq1"; - sha256_darwin_aarch64 = - "07dkpaqildzsrwbgjgxw5imbbz2pjvyq3n1wiw94lfjqbd9jrkbz"; - sha256_linux = "0lqng6g722apxa9k596f42f6bw323q4b29vrkcs1lh86skgikdgj"; - version = "117.0.5938.149"; + hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI="; + hash_darwin_aarch64 = + "sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow="; + hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y="; + version = "119.0.6045.105"; }; deps = { gn = { - rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; + hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; + rev = "991530ce394efb58fcd848195469022fa17ae126"; url = "https://gn.googlesource.com/gn"; - version = "2023-08-01"; + version = "2023-09-12"; }; }; - sha256 = "1pyrqxzxxibz0yp218kw6z186x8y6kd5a1l0mcbhj70rpm9cimyx"; - sha256bin64 = "1zly8dpxmhyqdsqd381r0yzjrf8nkfigfjhabm3dbf1ih7qma40z"; - version = "117.0.5938.149"; + hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; + hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; + version = "119.0.6045.123"; }; ungoogled-chromium = { deps = { gn = { - rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; + hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; + rev = "991530ce394efb58fcd848195469022fa17ae126"; url = "https://gn.googlesource.com/gn"; - version = "2023-08-01"; + version = "2023-09-12"; }; ungoogled-patches = { - rev = "117.0.5938.149-1"; - sha256 = "0kzbnymbp7snxmg3adpl16anyhs2rxk0iqy5dda8dx5rv9s8i0x0"; + hash = "sha256-4EbfM62KuG8nHrYWwp183V5G9ac7FICjpyJahnKbQjE="; + rev = "119.0.6045.123-1"; }; }; - sha256 = "1pyrqxzxxibz0yp218kw6z186x8y6kd5a1l0mcbhj70rpm9cimyx"; - sha256bin64 = "1zly8dpxmhyqdsqd381r0yzjrf8nkfigfjhabm3dbf1ih7qma40z"; - version = "117.0.5938.149"; + hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; + hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; + version = "119.0.6045.123"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8130f9f775..164851bc27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { pciutils ]; appendRunpaths = [ - "${pipewire.lib}/lib" + "${pipewire}/lib" ]; installPhase = diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 249207f4bf..8408732d23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1025 @@ { - version = "118.0.1"; + version = "119.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ach/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ach/firefox-119.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "57ca2dfedca8ae33cd24c6bf63a747a75f931484dbd22104309d8aec9d655922"; + sha256 = "cf90a2af34183711ef83f591436a2428bb48bcd5a3d0d0cb4efb0d37434f3baf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/af/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/af/firefox-119.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3a67ded092941d1d1d5277bb116e29a6ced5cd7a68ba1c0ccdcb0c053a720f4a"; + sha256 = "35b7475c9bb0cd12638851d73192c0381139b47bd65668c6451d228f767c5d81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/an/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/an/firefox-119.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "92c26a519176f860af4cedf257bf48324c2f472036366bcdde837f054583ac4f"; + sha256 = "c6cf760fdacc1902efe5ca3c06c22da43436cc0371b4f699be1de354fb7ebeec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ar/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ar/firefox-119.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d7233b314b69bebac80d84a9869eac18fa2f060395815ea8e9fa60c8f7c2cc2e"; + sha256 = "0e0813d7d21455f62eef15130849e4fdaa52da9e1f487e3b200f3664f29e9076"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ast/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ast/firefox-119.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "02d730fcfaa62ab22b070fef1e71fc002fdec6af7cb3d78d4f0f8434706e4a16"; + sha256 = "edb9adab523ced71fe3b85d6d2527a2fb587682601a7aec1a1ca9ab712dd2a29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/az/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/az/firefox-119.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "a6f708dffe6cd42bdc4eaace5e3d602c5817e93e42dfc7d69ed69938670f5343"; + sha256 = "af34649c9fcf0a397cc5715a4e7fa2cd21f165d8b7c1452542bb1e8ecbe7843b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/be/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/be/firefox-119.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d4f861f6c782b19237c0c1aa9282506b9cd07fdb71a019721cc8e14f01d65351"; + sha256 = "8e88629368f81b58651ddd213048b25f62c8b4ddb4d5a9eb92ec5e2b7b4d83e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bg/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bg/firefox-119.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "38cf1ffba2c1247fece1b2da997c8cab9f38d94b825ea3aa08d518fc898c0c7d"; + sha256 = "926605f038c8d4d44210007471a2d617c41da37585f71e4726b64305b90b77b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bn/firefox-119.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "614632a639969e25426a8243f1f93050882796b830459c165e7c31daa8baac05"; + sha256 = "50780e68b79f19e32a2b53b7d6d6c75948ffd2177e8abd7b97f14472dfed16f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/br/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/br/firefox-119.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "eabda4fb0d8e8278e26b3922f77a7fcce75797447e36edb7d9d065f5fdc65a2f"; + sha256 = "f39aa05fee3009f13af80a3c2cfbeaf3eceb3b02628cc6a312c23cb60baab689"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bs/firefox-119.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "e3744c0b5bbcf15734a53af39da6b281b24fa55156b0523c48a85d0366675a4c"; + sha256 = "bb58d680f4d6e63e2bb12f18da287f47a6ae5791b2bbbb924ab5bc8750ea382f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca-valencia/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca-valencia/firefox-119.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "86d5f1fa6a48ef3e96ea1443beaf456f25233f757d0154ec4d7e388bdc817ba1"; + sha256 = "c677065bd25fd39047b9fe1f10b9f654e29e8af131e1420e04d063b2e7a236c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca/firefox-119.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b2ec3b39a96df6bbc8b43e8ea0313c1e11f3f65bdb01f79d23a653d76336b726"; + sha256 = "5436dade80ee8d46ec5cb3ad32b156a0153ad01a08d4e7a71f21f685e9db7df5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cak/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cak/firefox-119.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "471fdf1610fc350b1dbef05c2f31ace65242d6bd143f057aa6d721d893568d0e"; + sha256 = "b7fd3c229d0335ef2f5c5fa6f30847fea9596961863d3600fc5b333fecce2eb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cs/firefox-119.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f26a52cd29a308ca7c9b631f2132a3f29061648ed0136ac5be154cd2c486f266"; + sha256 = "08e74645081c93cebc5ee40f6ddd074d1dd09e8ab822c2be496b20c1133db262"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cy/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cy/firefox-119.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "093a242b307fa1a78eeeb7bbc849c0b9f70006b4e7515e5aea9c5dbb2a3e4857"; + sha256 = "28b6bd6f71805310b18cd8c4363da666051711433db849909787b4228ac09895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/da/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/da/firefox-119.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a45e5abccf85084991851851687a45f620e96b802367b2305b5b712885f6cd59"; + sha256 = "252918ac59d208c2f457171085974d4a8525a2fbaea406af0079823a6bddf784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/de/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/de/firefox-119.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4cfd67a3e0067a0c61dcec66c13e9d87532cd5e509f984f6c1baa7c23e2d86be"; + sha256 = "dc784325d72c64e1f7b9b6014538c0f6c728deb5398e5d43eae17dca5899c800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/dsb/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/dsb/firefox-119.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f97990d46d590c158179f23df9744e0ac2d44aa3e2dc731828b9f10ad217d9c2"; + sha256 = "64b769c4f0e1b5c77a57302b5502a65138ca5f24438c34913abb27f08d56e3bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/el/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/el/firefox-119.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9c578f1c8434f7c0cd3918651cce62322d1a0af3f342f494fa76dcea15523082"; + sha256 = "f0db76422f958cc3f7b4cf29165b41cb50a3aa04ca74265397f71cbee925cd9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-CA/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-CA/firefox-119.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "76f6b4d94e3bd1ccbe2c137c9899b84bf76faa00c954951f0596ac27b13c3c85"; + sha256 = "d9e86adbfe21f7f503f12a5e084a082e6d6b461cbefbe94881c4b752629992c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-GB/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-GB/firefox-119.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "21123779061219834522dfca02828a8fb6234944002e0ef97e2b4f733e619773"; + sha256 = "ba27957e33e3f4a8a57735e058b84c004da9a6357731f58ef4daf2237f8d4268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-US/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-US/firefox-119.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "dfaaf6a2ff0fd4751659b797a688966907ae53bb76837b1aedc8c9c62bd641bd"; + sha256 = "7d7e65a8e8f11a821545cdb9a3348c68d4fd60d2b6f5454fb17dc4d42fabde56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eo/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eo/firefox-119.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "69ce9ac8c0610ce37ac7858c0b718a84e1a4a6749f5ac7ec69db4729634bb492"; + sha256 = "892a91efe311e99286e44799b7f50445a27a29f0ea9040e556d29aed5a343421"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-AR/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-AR/firefox-119.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f983c4556bb618cf5e04fe083e55480c5768381ec194c5137e4e2d7e9ba90778"; + sha256 = "65a1324bccfad9edc6adda59362753f5272fda40d8b909606bd120fbf36c1ca8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-CL/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-CL/firefox-119.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c6216ab87cc6f63289341c49a97631ed4b4ba881a828d41395186d167d3b897e"; + sha256 = "6571688a29d48d284309bf6c7f6648ad5bc973b6399a15d1f6f1d06304bf116f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-ES/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-ES/firefox-119.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e1e6fd750066192a0014757e4845a4f1a51a75987af5ea26467ecce6e7831022"; + sha256 = "2e2e09a0e93857a4405ea4f30db542f445f8f3faea324131d147a95ba1e8f58d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-MX/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-MX/firefox-119.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f21c46e08b67e362e999875a53d2ac7277acf9f2ec8ac2ef7f9d1abf347713e8"; + sha256 = "eabebd5780be18881bfb054e6bb7f9c98a823a3de443e8fd044ee59c7e60d55f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/et/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/et/firefox-119.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5a17f44761255c3a16eaadbdf85790775c41e75211a7520a32a6432665b28d30"; + sha256 = "7c5bfab9fd30c5b671a1901071f7de0d555c7637f87105b5af949fdcc4eae0c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eu/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eu/firefox-119.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d2f8f6180f7d4aa465df322f01a8e3ca5e61a3e51bdf58a130bc2339598a906e"; + sha256 = "617f6f49e8d8eee2549a33716e9911209a1cc049327cd4f6bf00825b15ef21c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fa/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fa/firefox-119.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0b25641300d1adc30592814673a4c085d10581011a91b9c9ccff1db6b0175a17"; + sha256 = "17cea2b9830e500f9ed8503e153fe03c4f4ac924fa3e9f6e757c37ced72ee0db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ff/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ff/firefox-119.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6433ea78711d7a034a45ce7a1ad358be8cc9bfddccab4c3ebe0e69209dd62f7d"; + sha256 = "704e1b267c71f76c16ae62a39c52a8f3cabd51ab7ab9b5a5734afd3c978a59bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fi/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fi/firefox-119.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d52abfff6798536bca7d83acd8fa88ca7fed22157e0276aee7fdb65278f27c55"; + sha256 = "ce61c29255cdfce6cd4da9c7ce7e3432629b7fb08f35314ff12282d0e4f8af45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fr/firefox-119.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "84fd988369815285286149def490876d00380c2bb2455ac674def76adac8f333"; + sha256 = "0c5f6b764a9a6334d9759ff0a58a0129cd9d4054ccdafc829f2bc902a19d4630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fur/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fur/firefox-119.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "f6941eee1a8163d7eb48476b0da395a049f91420a94346d7b5050a192bc62faa"; + sha256 = "f9df9b54a4bb771ac4faae64de3ede13fda4026424ad0823db8f437f3520a966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fy-NL/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fy-NL/firefox-119.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6b5aed85188727af3bff5864f19493d3ea4758bba7de051392b4b5772c5eedae"; + sha256 = "f71d895584edb495d80773e9f8687a1d56ff548cfb332ebd2e226bd500d62b7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ga-IE/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ga-IE/firefox-119.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b6424ab6d95c2dec1c75388c685ac6885f39ef0d0a39a5c6b1c105d60a5ea1c0"; + sha256 = "b7b6b99174277532bd2486dfd86ab94c036c5a1937336467376dfd7e885336a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gd/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gd/firefox-119.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "44443c7128426113992bb470e67d5121a59e9ade860047b4f903f2125995b8ad"; + sha256 = "43f6432c2b1e21b5178d83ab7cfb5381ead41029b24e3135ebe6daefab5aaf65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gl/firefox-119.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "fbc14f0cf6f02cdd0abc2dc7512b36da4151bf48df3d2d025f6ec36d226adce7"; + sha256 = "69bcee258ce0d6b39e7654484950b6e45f4306f2067d36fd5c67acf248468c1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gn/firefox-119.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ba50704fbf51b6ed2f8289dd450c5774b0f53de8b0f1cf09055d337f662b1a68"; + sha256 = "24a154468da6beff23afe0496d5c0b7c526f849eda9a0ca30e535de459d4ee3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gu-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gu-IN/firefox-119.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "29c8c4721305bceaa80bdd2238e41af9e59e193900641863a00b82b467e49c5b"; + sha256 = "442ba0d079f8076e5de265b91dd27cd747ec27f88aaaf68b5dc730b98b5a93b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/he/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/he/firefox-119.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "becee2ea0ce9821518b3b18f1b593a9b2143f24438d8674e00fa3ca1a27f79d8"; + sha256 = "c9de9ba5a4570e3de878d88404ee821ddddfd817fa62522b16e3b501ee0221ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hi-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hi-IN/firefox-119.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "162c19be9f556103d79d81e53adc930311f67d6e445125758fb5661e3e173589"; + sha256 = "b9a5a03540c19518629e180abc5680328e605e6c3c5c1128df12bdcba1a0567c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hr/firefox-119.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5cd7a8a042614f6444d262837ed5793aa5e1e85a0cb1b2be266b0ed463407b90"; + sha256 = "20bd65fb8a50d007f5f8ea1ec1c90ee118d598b931c30078f89ddae86f4dbf83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hsb/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hsb/firefox-119.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e86c552bd90768e681e8fa48ae1844d094549359cd12b134588454a3db30aad1"; + sha256 = "11d2da7ef251c5c065e5410d912664e641c9ce9b99f140dfa33ab549e52590b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hu/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hu/firefox-119.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d27f59da039eab219cf869ccabce2b8b6be8dd41640e542ef0d2e696c16306e3"; + sha256 = "5afb7d769b1377884f155d952243dde4bfda4231e21e37c21c6fed9aada72f82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hy-AM/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hy-AM/firefox-119.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e267f621b61c5ca629394f48b707b20a073c3620f6afeeb086983d20d9789173"; + sha256 = "446e429b5f51ef686b8437583cebbe05bea9899bcf15b18bf2a409a5488fd2cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ia/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ia/firefox-119.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "39c08d1f7b42abb776eae47fc9e468098cec626cd75dbbd90fe3031eb7900856"; + sha256 = "dc24337bb7919c9d1e6943688a6c23fd35cfdd259ce3380a11865e42f80d9c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/id/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/id/firefox-119.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "bb9ea3059f7f7928976fb42412c771c987113e9290a75fd5de8296d27d3e0960"; + sha256 = "1055e7944bf3718cb39a9bb974492348f5d4133fbb36caa25dc70a422a1ae65e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/is/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/is/firefox-119.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "02a84fe761bae4b977cccf31b7183528ca19467db51304afb9086b92d6089a8f"; + sha256 = "92d02b4eba5ba6932157a89cc54345842db05ded27303d1a6a3f41fecbdc3d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/it/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/it/firefox-119.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7702c2d4ada8f04199a2c777404a265f7d09dd1c95ab9092c1fe1e8f2c36ebb1"; + sha256 = "42e8fd5a2b9ebd70a7a4c06e540235705e83f0ddb04ad6e4a896bea3cba28e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ja/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ja/firefox-119.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f0f2dd4ce61fcf6e893caf2c8c1b3dda14fab3b61f7742dc642bd677165f1bc3"; + sha256 = "d3428500cc6c12ed769f4dbe8b0ef3a3f8dbded9c03e7a0ba602b4694a4a1ac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ka/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ka/firefox-119.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9fc09ff2f780cd0ba304bda13fbf3073265a5b38655ec7e35808ab21678c74ca"; + sha256 = "e233bce15359f237b59ef3a86df23800cf6ef0566a1503c343b4d392b4100adb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kab/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kab/firefox-119.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "41a23d0e24ab6239a8cbcc87b71a0d99cbe933ec9990822c7cdfd1309ea15a29"; + sha256 = "18bdd5a8c63b5670545076848d25be9002742eaa18139f35df35b5d802065e33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kk/firefox-119.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a90fd47a0dc4e5beaec45155f404ae62bfa9ce1f7bf091d82ff8597780515cfb"; + sha256 = "852365e6037bda685eaceebd965d90eb76f6b8519a06ca9a6fdbae9a945b5f70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/km/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/km/firefox-119.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "017124b2f12d9be14cfa2d71723f76302b233d1b6ebab3ae5bbd7bad84418474"; + sha256 = "31e9a5977bd9280d8ebc392f1133a2cfb0837a4ab18df8188bc4c1202de3af58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kn/firefox-119.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "40d346c14b1dccc762de644cee7e85ddd8a7725aeebe6dbeb0679a11da83dd58"; + sha256 = "25fed3cac9a152d696b7016f1ab1b954a763e6476797bb7e8e1c69683e5683d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ko/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ko/firefox-119.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9048f80c9244c301f010f5b90a58f48c7b150567494b479c7815037bb8d08595"; + sha256 = "3e26b5dfb9625b5a422caf9da7f4bad28ada9853b169ba2505c7111a55d20c30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lij/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lij/firefox-119.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "194f89e2ab1c4f9424f273898c3ba9283af5f5b38b633b1123efb8b3a071a770"; + sha256 = "669b90a4d97e6baa310c096c82a14536ebc95287c3df21de97ae67c7808c270b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lt/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lt/firefox-119.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a5425acdcf1a2ac0bb8b0226eed96341d9f276d9a4dc358003529f08e7285381"; + sha256 = "20aef23a5e3e8573c22c600eb63f920908737dcff33a049a67790832eb8f02af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lv/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lv/firefox-119.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7079c544f4e3b6c3d0f7f1e89fb086581ab7919955b8a05c9ef2ef4e2ea46100"; + sha256 = "42c48753d41d85066a2d1152af29d59e86945eaf8928726670fcc77f880baf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mk/firefox-119.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2764792958ed8eff978186a49f7fd97c0588dccba83b9a5d68c36793e1dd6c3b"; + sha256 = "563c1c0e5c23b3249095cb068d70333b3ebb6598f5099f32418b040c680475ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mr/firefox-119.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c455572b46343f1749147801b74970154b76bc102214f21811883869c1b65b33"; + sha256 = "69702f953054e70572b2e7c4474641ccc4df119d962a1d2341cd898d943c88b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ms/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ms/firefox-119.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "000938ec1fd1804af1f4f311a690dc2f1e425a88a1c05df31779ed2a5c579186"; + sha256 = "c61b592b5aa9a8863fe7fc7950d72701698efb3e74addf19fffebe6750866fc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/my/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/my/firefox-119.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "07ef309b045af66b7f16dc2b6787e5424b41d61ac87d19a435b54004625240c5"; + sha256 = "18428c4c73468594cd9c2c22ce654c028d3c1f9894f37d263f79ffc222f092c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nb-NO/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nb-NO/firefox-119.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3e1513003648e39417ef6a304a30ae85281865b555506b255bcfa799366a607"; + sha256 = "f2989993ea8ed110ff2cff4eed467a03156ede2db4e87864f7750006bc4cd2b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ne-NP/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ne-NP/firefox-119.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "869fb60690023383648425f79fbc9f24bfb4813dd95d176f2a4d17796bf9ee4a"; + sha256 = "e78b3a70f1c71d8cfcd3f72f5c07cb6ca3f2b31b9c25c616db518aa9d1d9262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nl/firefox-119.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "34d9fe25f8667f904b3784aa601a0f65bb63bc22d4c7048de4063db70893b5bf"; + sha256 = "87027a0b36cdd388c0e16048074655fdb55a96f03561abb1760adb015a10df80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nn-NO/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nn-NO/firefox-119.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "dd4c36fe148768a71c9786c29800c612aa037346f8f6c39b21dc6da7ac7029ad"; + sha256 = "20768f6e2fa0abf0d0e438c7899ded5811824ae5bd1474f978526a8424e423c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/oc/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/oc/firefox-119.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c2a8bcadd2602fd5c44483adfb38372125b2d386719d4943c64b82efe558bb8a"; + sha256 = "63ac23dbe4886a07e0443e1772e5b3578ea1d4f5043064e02d179e2255c68fdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pa-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pa-IN/firefox-119.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "211dc4b245d004ccc0281f4431a58df767b7d1c762d32fa24188d72f2c522808"; + sha256 = "22d3209d47e2bb368f082b59c9bf674ac0ca3bf7f458361a0d2ed62a05d0b39d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pl/firefox-119.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "13cb01ba5414bfbb669bac781f33e641a870f407d9d4f87cbbb60489594d500a"; + sha256 = "660839198b7cf81d943e0af33ae5e2d257c68b2c4f9d5f4847029c303bcd1a35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-BR/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-BR/firefox-119.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "09f462ae3538a828cd98ac2f013b6151065fa8e38c586193b4f37f2b1d71e228"; + sha256 = "f9dfcc38f180ba7f0a68e276ae32ce4f30da1dea5e41fa1c651994e39a2323ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-PT/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-PT/firefox-119.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5001103a4cf5bfb31daedae4eb63dfa5a645c231c35927f7499746935c5ca7f1"; + sha256 = "41fea86dfc01560fa02f112ab1458fb2513e214f5d311ce3f73d3dacb23f0f98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/rm/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/rm/firefox-119.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b07bcb0e7f4111197a98138d4892a420c88b7fa3df8c93e2038046078e82e424"; + sha256 = "4e59cfe5e937c5d4c791f2a3085353699274300641878c0eb6ef9e1c008abe7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ro/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ro/firefox-119.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9e249cca7806872a0fe8abfbfda509185591211a48bc28887a669994926b3f13"; + sha256 = "54b01409fcb03542b45eb5913494765685c732c25e070d107e8df4ba9084e87b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ru/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ru/firefox-119.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "34e8a96a4642da70170c35ff8101244c17167fc1162d4547bd142e5e2c1b6b63"; + sha256 = "8df2fba5aef8f65bee4fcc0db8a8f809c65d5da7e631e378841a5f7f6a1365fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sc/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sat/firefox-119.0.1.tar.bz2"; + locale = "sat"; + arch = "linux-x86_64"; + sha256 = "0c7e22d71463681b6033f8e783edf05199c1bef26e80143d03b85c5a013eb09a"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sc/firefox-119.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "f46be537b47b7c119cb0635740ee8d3a0fec34e53516af78fe74e4a8b56fa94c"; + sha256 = "d59f5f0012920790bd575de2fa03175f350179e728e3f2b39429db5918cc4c87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sco/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sco/firefox-119.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "386aa79bba02bc4717c6d9d81b0486f561532bad10600de8de2c1cd740efbc07"; + sha256 = "fa3313e39e27e83d7c7052b561ee8b16e5647405c712d6f9fc180f5b79354687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/si/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/si/firefox-119.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ea5666a749f5d5ba0caffb51f4ba97b0bb0d4c22be2df71af8184d24410531c1"; + sha256 = "f0f6b7610bee29b293dd284dc2c8bfc2a8e823569603464772413cdd0215ef0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sk/firefox-119.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4cc80425dcfdbe66c1843071e24519b51350d2e9de6da372cd4b00fe801896ac"; + sha256 = "34a45a30785950c7dafc86a704f12e0ad452fdd8b685d98501eb472c87a35c18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sl/firefox-119.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e0feb4fca0521816739314e42fa3583355f62dc0ba94241e49f2d63f1d41173f"; + sha256 = "4f554a7428d4ee3adf7c781c416ee56725fb17a976fff2530823b9352a6341b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/son/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/son/firefox-119.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9606cade30e14db9e9f9da4d2044734c09f188634c1d81bb79babe2c7a880aaa"; + sha256 = "031c62d2d5451ac522b2d7760bb9f8f74cdf7afd9336b1f1c3a43dfeac1260da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sq/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sq/firefox-119.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f83ab52ef4b1bb643a8c1daf80e19ad6878fbe861e0ca251e0d4507f8c4dd9ab"; + sha256 = "00c0ba4f17fb761b3646eb4e9c224cc43af4e763ec660fa9cc4fb273e9802dca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sr/firefox-119.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b9649571a1e768c176af22e010433098b06e9aa3b0ad9341e91b7b9402e5367a"; + sha256 = "0f413e14ab17a324e35e582a108c68fdf7c19f5dedbb94dcb30ea724c1dbc7a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sv-SE/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sv-SE/firefox-119.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7bf8027353c03917d849f715c2e2d9351a2d59a05f39e0375a2671bb48a3cf7d"; + sha256 = "39bab6f47250385f85c1555f916689c40cfccdd64ae0f433a6cc74eb6a0b7b3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/szl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/szl/firefox-119.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "cc7a90b08c7d8a1cbbae33160b4b63e5b84515642e7b78e8497128ad01189008"; + sha256 = "ae2e7059c8612023a4a1f0d8b5ef816243e7472a98487bc415e50a5d974e9d71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ta/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ta/firefox-119.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "72ee4da1a596e9d44fc7428f800b834d747f82aa716b6db9a7ff6c1fca5c34ab"; + sha256 = "a3e60bd086c3899f45b6b8c39081dc3dc2933862d2d789162a876e65e5c69e2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/te/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/te/firefox-119.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "105a24e8555d0652fb516677f7c4a414155b5710b5abe4c6d4cc4fde3c4538d7"; + sha256 = "37ec9536f4546d723d7aee5e61dac25ba0717669b7cc883a52e4fe6ced99335e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tg/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tg/firefox-119.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "3b20242dafa0af9367237f72805709d5d6bea96cf3743ca9372625d456f4c3fd"; + sha256 = "0703039b5362d9023c4c4ca70c5af46086fdd427353dbb8458aa3c646ed8043e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/th/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/th/firefox-119.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c5ce04d832063815557389cc1b3c6a57944890dce92b833901ab79f15c918438"; + sha256 = "08cada5788a4436d03dd9fc1f19303886d76825e000f7242717e0fed9800198b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tl/firefox-119.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "20d7481c7f0eaa5cd080d586320d896bf711952051bc08970a6da098c823e104"; + sha256 = "09b9d91554cdab127a9be2d08d65e801c04be9645053fbd7155ef0c08701124a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tr/firefox-119.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2fa9718354408518a0c61cc4d98267934f005a25d18d0691434c0772ebe30f78"; + sha256 = "64e057a8874bf3f4ee83cb2c82e8f355880b7e05999055ac9e3370371988b5b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/trs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/trs/firefox-119.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "31c488d2dc2becf2c0dc25bbe1fd1ece1e0f75296138ccf9d93acf488791a50d"; + sha256 = "2fc9c15c5147e7971bf1bd9e521e20a34a449c6063e426a4b102dc067a690ee3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uk/firefox-119.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b7eb792b6b37e91d1512211ca5736ee1bf71d2860f7909d80167ca85258191b2"; + sha256 = "02b726c51b634ed7181b772b77bf0b5543dc77727563e911ea10d381f2ef1efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ur/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ur/firefox-119.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e7845b7621cb024b31fdb212384a21961c7f5c0d18a100116e29c061b6e244a2"; + sha256 = "52749b68b455d4a1054c00b75185c18bf05807716b752164559a995b4740e00f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uz/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uz/firefox-119.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3fff96476de332de060bdb1e511bad5e70d763b38cf6373126bbe43ba239dae8"; + sha256 = "3f789d1fef8d5729af3c3f53a7701e543fb3da9eb8dee6c48c9bb815e894a7de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/vi/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/vi/firefox-119.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5a30899b084364adb01873e42901d1bd4203408c5c734603fd6d367546299ef7"; + sha256 = "4b9a103512983340a3c3d51da4b0044826cf8e22eae1479d06a64e0b3827df3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/xh/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/xh/firefox-119.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d9a5240cb39855653bf90552e96cd989f77b80f79ed14e09dd3c0c748c4f2407"; + sha256 = "13073d443f3491ff828c913689f0b32e1ecabe707ee2f76f6a0fc66f28b3cf64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-CN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-CN/firefox-119.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "64a99e44829eb0b9562770687ce8a62cf614bb5369e4b3accc5aa4792bb9bd33"; + sha256 = "40a6787e1ed8d39b12e494d33496b718e19eb354c7d9b0bbdffdc438978305c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-TW/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-TW/firefox-119.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1962c3814753af75e9426ee7e856a2195b1a1323787f524abfb70f5cbda07839"; + sha256 = "800d19524b1c62c02da3a5116b2f5207ba0e238a30735bc10bebdc3b0e55fd97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ach/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ach/firefox-119.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8f013f3d8c138763e43aa855ce3785b6cb74a02a4bf81ee7b2ec1a006b0462e0"; + sha256 = "995e3b86a9f1365014bbc3c9e34c3bbf7c8836e36ed16a0cb6e872416de98b9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/af/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/af/firefox-119.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "48abe09a5e89e39e1924581f3dfe5ab0953c761fe792c39e30989910da82283f"; + sha256 = "e519b620bd95162697511d1e1e6f8c1fb623dc661feb4b9d94db6cb17c318d28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/an/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/an/firefox-119.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5e14802ef24033286e9ca77e6ca0c44895a21a8b07e89e532c7b6a4c98db6e3b"; + sha256 = "2b44a7eadc3828627d572d5354d062cdd1a5d8ba545f2e69529d6d4375c4d367"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ar/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ar/firefox-119.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a822c051bd2b1f14f6fc9816dddaaae73861b35fbf3539cdb2e95bf5c0c0ed16"; + sha256 = "e1bbfdeef1957926e0a2d849a483f5d1d75d9d29dc3373845ed19433104525ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ast/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ast/firefox-119.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "39d15f544465b816e0ef88c007dd4049fcf498d74eee2b3495db37c36b844dd5"; + sha256 = "43a0f6f95ed2dcb0add16ba4b765a164614a81a217b8eaf1f998aa0d89ae7417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/az/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/az/firefox-119.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "20f0043984c4ebadeab243563d8018f434e03c1e756e82cda0c3d5a2032dfd01"; + sha256 = "d8dddd74ffdef6fbfe9924e6fca9c8b436130e7cb17a184d682fa93d4fdced41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/be/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/be/firefox-119.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9c7e8e8682ebee619286ba137e7713bf103286a1d87f92f0caa3d510fcab90af"; + sha256 = "f2a07b563a6d0085ab68b58bea9203a3573f6f0b4e673e7f0af34f0bd709f607"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bg/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bg/firefox-119.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bcdae2edd650c1a8b02b7650638e059dbc274df564a7c0f495f0042640883fd9"; + sha256 = "6257b89abf9a07176b48f6b8089bbd1a9adf67c2c15f778a11d95e137d3eb987"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bn/firefox-119.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3f334f3c99466ad107f4b17a3d45f7318d6a3b6bd2c1290c7da101c82abf0b8d"; + sha256 = "c110e7b0d3b1e8f21a3c6e8ff3c25341c66def3c28aae3010a73f52f02dcfd8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/br/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/br/firefox-119.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "bd2ee8ad5b0201abc50d39888b83652219c51a29b73dd2a7ce35cd682604ba3f"; + sha256 = "fcf3dd819894dc19c6dc6ddf836c6a0a73b1110487489f3247f816a7d8e9780d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bs/firefox-119.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "fcc31e454f02e140511c02dc94d736c96ee268cadeb8582386b468bbce6c39b1"; + sha256 = "c8903eab5082b5fa8eb5fcf24dfbd0d8f244e1cbf3e79d4c826622a2c6e2e385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca-valencia/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca-valencia/firefox-119.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "4c5886a2be50a26c646d1c5c8e5e8d91139e967d15b8ef73b67f612cdf14b368"; + sha256 = "02ca7f29bee2e06af0dfd4757beabbf82e45b77e8d3fc7cc544f93d5776843ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca/firefox-119.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "be75daddc1c8e47ad47f310a287f9bb203a3bfd19558476e5c971c6169eb1866"; + sha256 = "47d743c84c6e3e507957ded5092c6c7d67b7f52d9eec4dfde65dc2640ec3af1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cak/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cak/firefox-119.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a25e63e13074e3cfe85f496f63601a5b4ca079007548fe1642da1b40b2d8af14"; + sha256 = "368237495ce87e0e5a249421a0643d05d02bd44d1138b4c4c614eeb34ec44d7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cs/firefox-119.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b3dadc40ff303dacacf7d000eb9275667eb094a0cc77dfef738038b6ae530f63"; + sha256 = "d4170a9b18003c32a17144c5819e7481d610b3133363008c21c905d11f9fc752"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cy/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cy/firefox-119.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "2d8f8a0374681ed9ce3da91b945cab3f77d2ce4d32b6a3449e9b9f19de64ecdd"; + sha256 = "75d2be292dbd8fffe3b6b92002035f7e42bd2dec6956e449973be88bb0debfc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/da/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/da/firefox-119.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "166fcf5df925f70e660d9163995b1265f2323bca1c15bdd5d8fa5fb46d48a231"; + sha256 = "22d42d3ac8be47c35f97bbb3cdd41836b7e0a0409617e192955c5f5cd96266ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/de/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/de/firefox-119.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0183fb7a7649c335a3df81498949439fd1011ca062ebde5110f9524d20ede65a"; + sha256 = "6cc88df9de046096bec39504e5ecd2d3051ef4331e369867c5e6567acbf65cc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/dsb/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/dsb/firefox-119.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2073788924e4d416eb196525199fe695cf145b5d98944170994986aecef0b0ef"; + sha256 = "a81f9efae2e4a769be060e286b8bee0d00569c0a53cb839928d46c96fe65bfe5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/el/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/el/firefox-119.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "71242455bd09e3c29df35a393387927e6a5e0012efb8a23cb9b4ef7f367cabf9"; + sha256 = "bd4ebea36042e849301bdd843e482d50930d8810fb5d32947fe4511de48008b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-CA/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-CA/firefox-119.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d9bb5089b09df3f888424481ee0b3acc99fe35b441eac134eda2ad56645d68d7"; + sha256 = "2e6a07daf47d70295bf39aee8bad62ea334ecffb29f219b87ccb73521f3ee3f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-GB/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-GB/firefox-119.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4ec038d3a33ae0bbd8ccf70bb61ffab50fc582b8157a4a3c4f0f700def7f9924"; + sha256 = "0585fdbf94e401c00e291bdd22b3c137ee0effbc287ff44f2d5a6b6bb9df6fc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-US/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-US/firefox-119.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c68b22022a8ed2bb2a1857b70e4b0459a0a773b6781ed0a92921da8611ef8cf6"; + sha256 = "c3faa5a469d1397090d3159e5a336a065c9722f94bbb107887805b0d62b02e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eo/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eo/firefox-119.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "94cb22f3644cf7e1588a2b7c1142cf872cbdbb5bafd542adc87018cd61665f54"; + sha256 = "0bf1cda5b3bcc8bf0c0964e5826db28a13705a969a0e6dc14a6498d62e167422"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-AR/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-AR/firefox-119.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e4e87c33cb7fb1820fcd576f32264c8709f5a12c1e8c454afcf7768789f191f7"; + sha256 = "a8db855598b21922a3f8f0e0aa70e96b27c9f4164906975195094b024404053c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-CL/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-CL/firefox-119.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "93573ed0237b3e2e86118d62eb0071eb7edad2f0f77eccd311dece05612b1280"; + sha256 = "8aaba2eab96010c531fc3c13e0e11b3ba31aea1ea275d22d2d55ed91d204d8ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-ES/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-ES/firefox-119.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2468ad13eb214da8c615fe80eb2231b51a0c0dacb99913870d8906dceed180bb"; + sha256 = "fabce87a93462cf25e25435aac5b704d2921d9fdefc44f9d9ae1a5fc13e6d895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-MX/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-MX/firefox-119.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "373b189a0de60f3656d9758a6ddf84ccf7bec9a0a577bfed7f11f58faf10587f"; + sha256 = "8ad782b622ed063fb0cbc6f509fb2edd34537a0096c93ef3f861259b5166ad41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/et/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/et/firefox-119.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9aa31367c675bb7ac1251b626f5b3965114df71798044ecae1669f70a8b1df33"; + sha256 = "48d3c7ac37d505e1734190267cb107bbf72d8286a238532da1b86cc97494e533"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eu/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eu/firefox-119.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "831b47482c316bf5536d8bc2c14a20cdb39a1690ccb35f19d6db2a20ae99eab9"; + sha256 = "f9ebe4ff904ffcc0545d375ef1595d99d4253fb171780a569b4610958b264946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fa/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fa/firefox-119.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "39e8d4c1c873519ea94ccaa2392746d69a5de78d77642b9ef0ff6a9ca3164d6b"; + sha256 = "a65eb2459e5b2ac07c485ae142ee67a56737c309efc055d064c5b1314d01277e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ff/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ff/firefox-119.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "18582691a78894fa07fd32238c4417e26e92ba1f0d9af6387215d56da0decdc3"; + sha256 = "01560cdc2d01b1b8423a68698a4273870103c2c4e6d34990813db6bbb2d417d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fi/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fi/firefox-119.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "34bcd002090c12d7976fe28f9125ee79dc1d18c1312394907fafa10cd7c9d86e"; + sha256 = "6a9ee52625a8add941f2018c53abe1596ff8eee2d532b53092ff640af478d081"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fr/firefox-119.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "af448808cca3fa43f2a99a0c1f40d55c1353e994510ddafb96abe7b04fab01a3"; + sha256 = "f8ff14ecb998b4945041796e189fb87cf309079b922cf397c05eeec2dd2c9a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fur/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fur/firefox-119.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "4986aa9c0040c8a9d90243c80730f2bc5f4ed774e684486dd142503b69ab163c"; + sha256 = "349a4b860435c0d65a84a12e074d11209b3f0ab8856c005e5131f09cbfed1900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fy-NL/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fy-NL/firefox-119.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "fa8668765d334bae5314aab82ff80cb6ff27eb59cf25c3cdedf27c3abc708956"; + sha256 = "8779f243e0918de79039734a6372a25b01b9a5c9ef2e01c757309237d588a694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ga-IE/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ga-IE/firefox-119.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fcc26e382e7ee584d0690f32fa32bc04982b4ab37bd173ebe4a7a84878716dd8"; + sha256 = "21b483531d4a91e920fa5ff6a9f267ce835c9c5941c1af913021f5cbcbdfa84b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gd/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gd/firefox-119.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d3c3fd2fa1e40f76e8c3870be3c7a45a4674ea62ccdc66429a38e7bf1c9c657c"; + sha256 = "fbf5fb03e13a8b9eddca4f521299ca620570b48ef11bd34ef6e37643f3280cc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gl/firefox-119.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7569c06c1ad2bc71431aeac6cc323394f500e340321d139974ee94f076a9b90f"; + sha256 = "0fbe3e59568261b7f96805a257df8320690d3a9952fa421228ade5042b42f36e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gn/firefox-119.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "232fe5dd8b2a4c7510f4b470e9a0347183867045781388bf823635049dddbe4f"; + sha256 = "1b35a1efe2321821f26fdd97c414145dfbefa7b5fda8ca94f8d9c7911ced9bd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gu-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gu-IN/firefox-119.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9732e6c4f7dd8a99200b3f611f69497100b5d931c849dd858bbf3be058d8f5a3"; + sha256 = "5aa7c4f18a983756d45b6f8273bf6f73449e28426616aa32f5092e9b67ba0d79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/he/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/he/firefox-119.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fcc77690e2944b6c3123caad0b773fb033b6e98cc006c3e116dc263245fc07df"; + sha256 = "f777ee429354b7e2facf45057cd4552493fcbcea52a4afd298555ac87306f692"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hi-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hi-IN/firefox-119.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c9ea5476e0a0590c37314cae49cd6ce7aff8f7889d2458d66b009fb158e6f52c"; + sha256 = "74ed18e2f5f8b8d443df42810f849dce6339343566c32bc2cc6a82446680217c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hr/firefox-119.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "39f2808f62451650414d35b641223f8fc2477096f4dfb9fe62beeaa59f7cb04d"; + sha256 = "3e5a37911a3013b46e1f801e4f4c21c304594e4aba318a87ef29a9be5a4da687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hsb/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hsb/firefox-119.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0b4dca99c0d1aeff5a681f87fdc9432cd28a90147a1678f13f9d9c1ac826d10e"; + sha256 = "12c8a1d884b6bd2d056a1c44debede068e6e09dac0e871894b89150e321f94c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hu/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hu/firefox-119.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "db2e47a87ad306294580502dd823b6645bbb49f44ff26a2e5ed3a5e919db1c86"; + sha256 = "47529ca31f8c81eb6b19ba99552aed60c712af2337ae0af473e212bdbfaef29a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hy-AM/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hy-AM/firefox-119.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fb85e7930f5a0f91946b0780926c7231eb514cd346e13e8b41268a8e17da3a3a"; + sha256 = "6cf788b21ca4608605b1ce539fdcc0c7b8610f4dbf98109b8ef0c3b9d80d8fb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ia/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ia/firefox-119.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e3eb266da530e8634209209a934f1f863440fe9b094f47567f1f5619f4c1d551"; + sha256 = "6fda520cb8df890a9404c6a71fe0ab813e7b563d2d084bd4cd77817d89e56271"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/id/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/id/firefox-119.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "325a7d2fe7eacebbc441c78ce92acb98f5f0f3fc579b4e3db03f5959775e3467"; + sha256 = "38f2a22dc6d96e52130141982c7862136d001e8bbbe9f337391019c34690b126"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/is/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/is/firefox-119.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b952c6d9f62c83bbdf949a7436bd5d8d6ad77eb2dd877eb238a3c1efde041009"; + sha256 = "1405bdfbd59b3c4c8800f4191f1bde2f47096a37adf8f66d6d3fc881c93ca161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/it/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/it/firefox-119.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e868200b9b8d7493348a38dd57ab10c50965951cf68ea637fa78d02e4cf70e8b"; + sha256 = "d8edde64459325e81b51eb197de89018d107e427963381dec0a5ad54803ef258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ja/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ja/firefox-119.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1f366580739e430e83b406e79b662c9f63be1566defffe4bed8ed705949bbc93"; + sha256 = "9c2bc20554ec009fad6bc7e0904f732fffb2f6efc2de1314ea7660547ed2b085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ka/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ka/firefox-119.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d44df6d15b7a78cf702eaeab89028961fb03b1af3fca353cb48dab8efea8ae2c"; + sha256 = "86a9e9100b0a482b4829bce83160a4a4adb06b7b91fd91a55004f7418e8949db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kab/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kab/firefox-119.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fe7ca11b6fa0069d18ea3d9e273e90ad736155384c6ad64cc2e99edecc802744"; + sha256 = "30a17adf1a960c5470d44a2cce09dcf804831d9cfba332c75d1b77655af95b70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kk/firefox-119.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "570daa49f4283ac79093e3bc3dcbc31b3d23e38cb3024c43899a51e8892054cb"; + sha256 = "3bde81c8d3e371eeca249b48a994fd2fc9f478ac6309f0ee5283a8425b30db05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/km/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/km/firefox-119.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e5ebe59f44d4ba25053796f4fb3ee434123ce828dc2f2615fac72a5df8815e5a"; + sha256 = "e05a943bb6b2c09982540cae733e81f1a9d363958a68040ebd657da5ac04845a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kn/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kn/firefox-119.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "aa57e50d7f6906073b7fc3c4a0ce7d416b677d5f7b60c56cbdab3e3b319fabbe"; + sha256 = "17e9357334834134002f710f61db6c609240b35ff9f5116bffbb01488997aab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ko/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ko/firefox-119.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "78c530bc3848ce345dad35e01e1e6d8b13bc0eb1b9194a8feee25bbffb70e709"; + sha256 = "2065b72bf7e8dad9852d8f5471bbb37241cdf6d43594cca3eb41c4c4d58aeee6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lij/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lij/firefox-119.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a6e1fa50349dd5892382b75dc78405d71eb452ba01d919b76c9deb962e5f6e71"; + sha256 = "4dc2aef6ad9477c9708db994956485fb006264efb300f489fd4fb4ee25f8847d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lt/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lt/firefox-119.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cf488c96d2ecc211d08cfd7f83def294133c115947290ad4ce7664710f7c0d0f"; + sha256 = "be49d7c71c76dfd36f8589388ce977c915780dca80b239b0731df86afdf0b669"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lv/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lv/firefox-119.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "82a9003b38a850a8866a28bafa5ffb7c189b9115cd1feb31b4131d3b69c68b6e"; + sha256 = "7939ebb3c3965d4db86be9516833d36968448ab188734ef7991f47c7dc307ed9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mk/firefox-119.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "85f78f5e64f6ac47652fd09cee351c283f2b310b03aa17d40c622bbb3c005f13"; + sha256 = "e37c008b774c8e4774bba59a25a29d8df2e63132db6e0762a00da60f7d374f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mr/firefox-119.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "75dc12353acd76365b6eef4979b4de8ff586ac81b1fc15b9cd88993d9001b654"; + sha256 = "fe38e4ee96783f3df61d92b0405e447286ba9a85ca84e048621e3c24cfa04166"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ms/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ms/firefox-119.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9380131172dc52cef4babe594d86363f07bfa6efc2d0279c881119ec69a3a956"; + sha256 = "a0429e6ca5bfbcc297212defbca30218fe8e91a33feedef01ee99a339d7bd63b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/my/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/my/firefox-119.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "57c7fb3f591ac957c5a6b656e7cb9d113090d67d102a97f3b977dacbd1cb7e8e"; + sha256 = "fb138fd185638cac7be3de34f402b2810e2a133b322a9d254ef8ee9d9294d208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nb-NO/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nb-NO/firefox-119.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "81814477be0bf7761b4b6f6d14f9083be1f96fa2bfab4a82b223abf5bbea037e"; + sha256 = "fc3e5f37199302836c7fbbb4747fc3a016486d3aaf632f0e79272a4c96a59143"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ne-NP/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ne-NP/firefox-119.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4f0a13a980f44823dbce017fd1a6e2b75171206f3bfb2018ef90583fd8b723d9"; + sha256 = "978478460a0498d9a10dc118545823bccd3a52d7dce88f36badbb0df08550696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nl/firefox-119.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "bd99d32238c48febb7b2a5e557371111f7d1fd879a481d383a4e4b99d8011aa2"; + sha256 = "67930465d612df84ab140ac66d185077f8ee314290daaca9c6fcdcba5f21c817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nn-NO/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nn-NO/firefox-119.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fa588b2c34eda24f89651eeb65ab646daab0b9ac846ef66d04abcb84d62a2b55"; + sha256 = "81e478f2307b10cb71854614f089518213d061d1e122e6ae6cf3beb6b5c84c50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/oc/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/oc/firefox-119.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ab378a1241ef3d634bbabca453de5c7ae7240ffdb79e8cd9a36ca84d1dcb4eda"; + sha256 = "6cfec951a0b99743ab2dc521d27bffb50ce2bebff2de6196c30f33eab5187c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pa-IN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pa-IN/firefox-119.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "aea29e94e88ac16e98d5c1c4f8eadf56ba41f5c5e2d6a7640840c69c84423535"; + sha256 = "6c7b6f3c5a0f871395d13285ca5a4bb0c0415726cf9909fd86151c014f770c2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pl/firefox-119.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4a66ec55133f59d612bd8a739dd00ca4e6d5d121aad4e27d65f607b63a3a084e"; + sha256 = "44b28cdb9f11948ea6f00801f988a21a2df943b17b88292703de5641abe6b471"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-BR/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-BR/firefox-119.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3f3c8ac821c6c10eec513a997f3267f4816ade2dd14f33cf27b31f48d996e452"; + sha256 = "ba8db08a40fb15570b954da9b5b6e7cddf3138cbd540ba6fd221a2d3d2d9b544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-PT/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-PT/firefox-119.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "be5c2da69f95466931ac1b796d7a40e7e5fe8c4c38f082053cdebf15ac0e3b45"; + sha256 = "8518cc89f5d0a8f0a714c3d15b1ae0dbbaa6c1dbb47b766f98e706ee5c9fea8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/rm/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/rm/firefox-119.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "abc9384641663c1a017ce3e8d05de528a7e0600c6db416390a6d3c663ddcdaf6"; + sha256 = "56fe885cbdf01c1c53e0bcdaa74fe8a9b2fd075d4050a197fbe872dfe1f3fd1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ro/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ro/firefox-119.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "b5d974e6714c01eaed4952158c52a910f3115744ade8c56b2c57c6e3a0f87c6d"; + sha256 = "94474a1992ef8d0cddb85e698375d7df43736325e28ae2e60f94299a9cff5079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ru/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ru/firefox-119.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "12dd5c92533652e66c99fcfd818b00591f7ff2113d4c537720b503a692ba7439"; + sha256 = "f9e70b1b61c47850804f9dd4c8a907ff81599b95477893c42e4f6a0e6588092c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sc/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sat/firefox-119.0.1.tar.bz2"; + locale = "sat"; + arch = "linux-i686"; + sha256 = "e2bd85382eb4bb006518e7a37692e4b11d33bcbddef43fe1636465a94f13d07f"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sc/firefox-119.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "30952cdb2f4e00bbbb2502a417b13bfdb200078f26dc56ed84ea45c3bd00aa9f"; + sha256 = "e3b7d6a2d10f9da0b11fc01128ad1cc3c878e90260bb906b1ec451f8c0160b36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sco/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sco/firefox-119.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "8f7ba9ce28ae517841627a2f4594494fbae847e9ab23d0c6c17b15832f01294b"; + sha256 = "5c20827498ba6ab0ea1b6299796479ab3af2685d64248166c4aeaa34283837d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/si/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/si/firefox-119.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c873a26e519132a8d7f6ff253deabfab0e937bb947054b0f1bca2ecdaaafcc7c"; + sha256 = "1d6ac6db81135b96f5940eae2b14a375ff636b0ccf5163e7ba198739a35c977e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sk/firefox-119.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7d94648ea110b2b4e462ee8b8dc03f2d14d5eb1264b97dbbbc1d69a7fe171d3a"; + sha256 = "5f1cc60c2fe7ba2e184de94ea3552a84acde3bc438dae2afbca245af27ea1060"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sl/firefox-119.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7a0e3e6d1269934c77ba3e89eb484311e79f7c54921929bf46839c1edbd98a7b"; + sha256 = "3942f5597ee26764f55eb1b5fd8a3ef656b94ed4630067042ae3d6cdc35a4a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/son/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/son/firefox-119.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4b8234d05db7af3d301afe1f489876986d325849ffa043d226c923ed089fae2b"; + sha256 = "9a0aad56e659f09f65804682d902767beda5955215f794c3b07b0a94a0ec628d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sq/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sq/firefox-119.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "39f839067a963c3b85706b30c3ba1bd4113518e3c075d758d11669ac745d33ca"; + sha256 = "a3739cdfd849de74b021dde0aeea27eb0dbbf1a04f0481ff4adaf7eee4fdb615"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sr/firefox-119.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "626a7b1e89a9b1bb89a7a94e966647acd6df526de2bea52444bc316515a86a42"; + sha256 = "68a0ace6dfc11e82c7e5ebe918a4d5c975897beb0f0727a2114089e2eafc077b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sv-SE/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sv-SE/firefox-119.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e4254eb17fd1769ad253242b3d5e513e72538daa0daf784693b97c01cbca66cf"; + sha256 = "9a67bd82f39e4af0801b24f88f6f6bf92ba5d85031de2098fef6b2b9d3593863"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/szl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/szl/firefox-119.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "32571063b99520a5627dba81e0ce08b35ed08d9e40d060820adaf0b55ba80d41"; + sha256 = "7a4da1bbd23268b52d82fefaeaf67f03d11e3b295d5811107de8731269ce98bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ta/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ta/firefox-119.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e5581fde1d1b8287af54306f228466096a5844a5b33947f775476e0cf2a7dc9f"; + sha256 = "e29cdd9028f07d00853d5c29a574d281218be9c13e2fe0cd8b53b17cb6c1b006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/te/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/te/firefox-119.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "300d514bc36af73721bad4f8cddf272b8d82a46ff867130e31bbadca601ada2d"; + sha256 = "a34da2975dca94013bf7152ca9d3029f63fd48be602088cae64d3eba844029a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tg/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tg/firefox-119.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "ee30293e209a350065132068459d6c882d045d1e611aa08096d1fb4a2b100e36"; + sha256 = "4602903e4dcfb4ee14fed515188ef7856f30bba9b7d7a0ee3e3674e9242e9e03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/th/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/th/firefox-119.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "95647fb5a8d8b2321113398ae2b5ad516be1228751272f356a49abe2206a687b"; + sha256 = "805072c3cfd004060f20334a468467bd7c372df415f24df35e97a1309f2aec13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tl/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tl/firefox-119.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "52d9033dd208f11afce6fb77d16bbd705c28b1b893b0c1ceee526e3ba4467de6"; + sha256 = "8a0da3f8c4aa05db9e08c4bb95587a1347a38fc15a5d500569cdaba77a8f0899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tr/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tr/firefox-119.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3c29ea78405aea803b3093bdbe7d4389dd73ebd9665fa9301a76a289c85bb59a"; + sha256 = "9fe74282a7bf0612e6172dcc54a5a65915b1d30fd5a1d18f193a617a5be6ea1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/trs/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/trs/firefox-119.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "cda51b1fc45f59a0e9f3c51ddea94b030d180040b02f26a13baf37601e0bd961"; + sha256 = "99056931998947015e7fef2cbc432dd0ee565d2c612e0a35b2848f06987cc322"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uk/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uk/firefox-119.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2f857d43702fc3af4649e7c22e324b8e7547c66c97d5013d84ee2ea8594e00ce"; + sha256 = "4ed96af94b077ae2a660f10c2786344da83ec513706177793a427b2bd943332f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ur/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ur/firefox-119.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4f0bd303ccadb1c8db47f5298642d6fa6f96598f7ad409dc273ae645fc739aad"; + sha256 = "bb45d5109de54888df1c051d6692f337b87cbccf897f0b3a6ee475ef9bef9e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uz/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uz/firefox-119.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c419e83710a5d575cf56644a4cbe214b60cf24ea6dac70a6459a3bf8fbacc7c0"; + sha256 = "9e053e07a72afb8fa4975f06e3fdcfe52c85777a91f0262e8008fbd906c4a46f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/vi/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/vi/firefox-119.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e00c7460e9e32f24ac1a2d968f6f20d647a1ab13188524d3bd39654172f2e3e3"; + sha256 = "5369cebbc2a94c29971f53a50b77666845233982d9fee050ae5111440a12d276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/xh/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/xh/firefox-119.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "75d96c526ae353b5b5a63cb14d71ad7fd84256932945766afb3e826b7ee73edc"; + sha256 = "868c5ae9ec6c5f2efba92e84f5112e560bb3a1bf44d76dd90abcbf00fe19f1e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-CN/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-CN/firefox-119.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "37b687221c5d2d52dc6b225debc14c6cc842ce91d7e1ad87f8ad56c6ae7801c2"; + sha256 = "4ce3f1ff7ea8b8a6d0af2fefd05c7647adbfa6feafcd788a38a1f149b2dcfb26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-TW/firefox-118.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-TW/firefox-119.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "95df34bcb9875d915690043f6dbe71d80a6acba5fb4b0ad5cae7143ca9ef72df"; + sha256 = "a91f8b78ed240ca818661baedabac14cb646a8396a9983d46fb3a3df556a102a"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index bb4b1ba0a8..c77411b6c2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,5 +1,6 @@ { pname , version +, packageVersion ? version , meta , updateScript ? null , binaryName ? "firefox" @@ -206,7 +207,7 @@ in buildStdenv.mkDerivation { pname = "${pname}-unwrapped"; - inherit version; + version = packageVersion; inherit src unpackPhase meta; @@ -502,6 +503,9 @@ buildStdenv.mkDerivation { preBuild = '' cd mozobj + '' + lib.optionalString (lib.versionAtLeast version "120") '' + # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; postBuild = '' @@ -557,7 +561,6 @@ buildStdenv.mkDerivation { passthru = { inherit application extraPatches; inherit updateScript; - inherit version; inherit alsaSupport; inherit binaryName; inherit jackSupport; @@ -569,6 +572,7 @@ buildStdenv.mkDerivation { inherit tests; inherit gtk3; inherit wasiSysRoot; + version = packageVersion; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index d999d64da4..c4d59bc2c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "118.0.1"; + version = "119.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad"; + sha512 = "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a"; }; meta = { @@ -30,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "119.0b4"; + version = "120.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54"; + sha512 = "7ac5562ce393ea84663eac5c6ee1a0ca527ff4a8a9ec6aaaef37213ff071076846949e80af21d95ec8e32d3cbc740b772a9d7cc54965b7bbc8e015da22ae927f"; }; meta = { @@ -58,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "119.0b4"; + version = "120.0b9"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb"; + sha512 = "07bf1a58550e70c683719adef55fa3d1ee06876e0cb086c28242879c683269c4aa784b1dce639218b3ad24a546192088fe5224a52e13a0086f205ec5470e2428"; }; meta = { @@ -90,11 +90,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.3.1esr"; + version = "115.4.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1"; + sha512 = "3ee680c5c503df7e4913794b7029ccffc10889f8f259f16030b24c1c18c1528439123532374ccb3a7e7a0d5d64068949cb85638a29694a7d99b74dd403ddefdc"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6561e51d7d..68f547d1f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx-cast-bridge +, keepassxc , udev , libkrb5 , libva @@ -33,6 +34,7 @@ let , nameSuffix ? "" , icon ? applicationName , wmClass ? applicationName + , nativeMessagingHosts ? [] , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -44,7 +46,7 @@ let , extraPrefs ? "" , extraPrefsFiles ? [] # For more information about policies visit - # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled + # https://mozilla.github.io/policy-templates/ , extraPolicies ? {} , extraPoliciesFiles ? [] , libName ? browser.libName or "firefox" # Important for tor package or the like @@ -61,17 +63,28 @@ let # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards smartcardSupport = cfg.smartcardSupport or false; - nativeMessagingHosts = - [ ] - ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) - ++ lib.optional (cfg.enableBukubrow or false) bukubrow - ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector - ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration - ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge - ++ extraNativeMessagingHosts - ; + deprecatedNativeMessagingHost = option: pkg: + if (cfg.${option} or false) + then + lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead" + [pkg] + else []; + + allNativeMessagingHosts = builtins.map lib.getBin ( + nativeMessagingHosts + ++ deprecatedNativeMessagingHost "enableBrowserpass" browserpass + ++ deprecatedNativeMessagingHost "enableBukubrow" bukubrow + ++ deprecatedNativeMessagingHost "enableTridactylNative" tridactyl-native + ++ deprecatedNativeMessagingHost "enableGnomeExtensions" gnome-browser-connector + ++ deprecatedNativeMessagingHost "enableUgetIntegrator" uget-integrator + ++ deprecatedNativeMessagingHost "enablePlasmaBrowserIntegration" plasma5Packages.plasma-browser-integration + ++ deprecatedNativeMessagingHost "enableFXCastBridge" fx-cast-bridge + ++ deprecatedNativeMessagingHost "enableKeePassXC" keepassxc + ++ (if extraNativeMessagingHosts != [] + then lib.warn "The extraNativeMessagingHosts argument for the Firefox wrapper is deprecated, please use `nativeMessagingHosts`" extraNativeMessagingHosts + else []) + ); + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -336,7 +349,7 @@ let install -D -t $out/share/applications $desktopItem/share/applications/* mkdir -p $out/lib/mozilla/native-messaging-hosts - for ext in ${toString nativeMessagingHosts}; do + for ext in ${toString allNativeMessagingHosts}; do ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* done diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix new file mode 100644 index 0000000000..a4796d9395 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildMozillaMach +, nixosTests +}: + +((buildMozillaMach rec { + pname = "floorp"; + packageVersion = "11.5.1"; + applicationName = "Floorp"; + binaryName = "floorp"; + version = "155.4.0"; + + src = fetchFromGitHub { + owner = "Floorp-Projects"; + repo = "Floorp"; + fetchSubmodules = true; + rev = "v${packageVersion}"; + hash = "sha256-988jKyfIGZ2UPHTNO1cK2lxR/5j3U/QYR3ZI9WsvHUI="; + }; + + extraConfigureFlags = [ + "--with-app-name=${pname}" + "--with-app-basename=${applicationName}" + "--with-branding=browser/branding/official" + "--with-distribution-id=app.floorp.Floorp" + "--with-unsigned-addon-scopes=app,system" + "--allow-addon-sideload" + ]; + + meta = { + description = "A fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; + homepage = "https://floorp.app/"; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.floorp ]; +}).override { + privacySupport = true; + enableOfficialBranding = false; +}).overrideAttrs (prev: { + MOZ_REQUIRE_SIGNING = ""; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 342396c6a5..9f778ed500 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.0"; + version = "1.17.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-UoyCsmZKpRkO4bQt6RwRAceu3+JPD8I8qSf9/uU5Vm4="; + hash = "sha256-YPC+mwXKZOOhLtUU+WHdkQtHFYfIYOiadbuAHLvAXxM="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix index 4dde2d57d7..ec00983663 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix @@ -21,6 +21,7 @@ in # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "librewolf"; }; tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index e4516cb424..afe766f841 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "118.0.1-1", + "packageVersion": "119.0.1-1", "source": { - "rev": "118.0.1-1", - "sha256": "1wdqiif1la97w9b3xsz20xrcg2d1c0j13pdfcj7z23jz8846iqk4" + "rev": "119.0.1-1", + "sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7" }, "settings": { - "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", - "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" + "rev": "095f50ed91aa7db2de9c67763cf46bae09146a58", + "sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi" }, "firefox": { - "version": "118.0.1", - "sha512": "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad" + "version": "119.0.1", + "sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix index 0a41ad0feb..a31dc94117 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix @@ -13,28 +13,20 @@ stdenv.mkDerivation rec { pname = "lynx"; - version = "2.8.9rel.1"; + version = "2.9.0dev.12"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - sha256 = "15cmyyma2kz1hfaa6mwjgli8zwdzq3jv0q2cl6nwzycjfwyijzrq"; + hash = "sha256-pkVbFZ0Ad22OwQUShcly3B8MVS0FcaDP8Coj7BRu6OU="; }; enableParallelBuilding = true; hardeningEnable = [ "pie" ]; - patches = [ - (fetchpatch { - name = "CVE-2021-38165.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lynx/CVE-2021-38165.patch?id=3400945dbbb8a87065360963e4caa0e17d3dcc61"; - sha256 = "1aykb9y2g2vdpbbpvjlm4r40x7py2yv6jbywwcqcxrlciqcw4x57"; - }) - ]; - configureFlags = [ "--enable-default-colors" "--enable-widec" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index d6898e9d86..3577c2a12b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -32,6 +32,9 @@ , libuuid , systemd , wayland + +# command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? "" }: let @@ -179,7 +182,9 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram "$out/bin/${longName}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''; passthru.updateScript = ./update.py; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 821348794b..d034c68d85 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "117.0.2045.47"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-h4iw+H8f62JEih1tWTpjxNC9+wu3hHQOM2VJid1kHNQ="; + sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; }; beta = import ./browser.nix { channel = "beta"; - version = "118.0.2088.17"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-3Z37M2ZQRJ5uA7NcinMlF1XEsYVv9A+ppPZZf34ye6Q="; + sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; }; dev = import ./browser.nix { channel = "dev"; - version = "119.0.2116.0"; + version = "120.0.2186.2"; revision = "1"; - sha256 = "sha256-raLRFSHZyHaxKi6EG62VIbcW29HTjTnBFw7IJFVbm5I="; + sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 3b3f292215..28f8358feb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,19 +78,19 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.6"; + version = "13.0.1"; sources = { x86_64-linux = fetchurl { urls = [ - "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" - "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" - "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" - "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" - "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" - "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" + "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" + "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" + "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" + "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-e7gRkRMipnEG1hMlhs25LUJ5KDGt8qP3wpbSG2K2aK8="; + hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ="; }; }; @@ -232,7 +232,7 @@ stdenv.mkDerivation rec { updateScript = callPackage ../tor-browser/update.nix { inherit pname version meta; baseUrl = "https://cdn.mullvad.net/browser/"; - prefix = "mullvad-browser-"; + name = "mullvad-browser"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix index 79020e18b9..2ea777728f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.4.1"; + version = "32.5.0"; src = fetchzip { urls = [ @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-c/rfnMpiLWqlNZppqPRNWXsgAQ1FofAdel5EFnK+mrY=" + "sha256-1MJ5K9Zc/BHeQwwlq3XyUV8XTFEpPytNyTnsDpE1tBI=" else - "sha256-27njFdqq2DUctlz/UOtH5tlOduQNpoapuCYS+48K9dk="; + "sha256-xXunZTqoc2A+ilosRUUluxDwewD3xwITF5nb5Lbyv7Y="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix index 21dde7700b..5090d3cf45 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "15.0.0"; + version = "16.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-O0VWgx6FKulELZuJgMwFgGSo+EaCqb9dgneF2XFnq7U="; + sha256 = "sha256-bxzLduesbeVhLuPcnIJmZaVi861gv44Oos9VB8m3TCs="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1f898ed879..04de25c498 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,21 +1,22 @@ { stdenv, lib, fetchurl, fetchzip, python3 , wrapQtAppsHook, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 -, libxslt, gst_all_1 ? null +, libxslt , withPdfReader ? true -, withMediaPlayback ? true -, backend ? "webengine" , pipewireSupport ? stdenv.isLinux , pipewire , qtwayland , qtbase , qtwebengine -, wrapGAppsHook , enableWideVine ? false , widevine-cdm +# can cause issues on some graphics chips +, enableVulkan ? false +, vulkan-loader }: let + isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let version = "3.9.179"; in @@ -26,20 +27,14 @@ let }; pname = "qutebrowser"; - version = "3.0.0"; + version = "3.0.2"; in -assert withMediaPlayback -> gst_all_1 != null; -assert lib.assertMsg (backend != "webkit") '' - Support for the QtWebKit backend has been removed. - Please remove the `backend = "webkit"` option from your qutebrowser override. -''; - python3.pkgs.buildPythonApplication { inherit pname version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Oer0p/DwUfOejUCgSCSkMvLLAjNyJx51qgN7bcQQ2Pw="; + hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; }; # Needs tox @@ -48,25 +43,25 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking - ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ - gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav - ]); + ]; nativeBuildInputs = [ - wrapQtAppsHook wrapGAppsHook asciidoc + wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt python3.pkgs.pygments ]; propagatedBuildInputs = with python3.pkgs; ([ - pyyaml pyqt6-webengine jinja2 pygments + pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 - readability-lxml pykeepass stem + readability-lxml pykeepass + stem pynacl # extensive ad blocking adblock + # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard + pyperclip ] ++ lib.optional stdenv.isLinux qtwayland ); @@ -74,7 +69,6 @@ python3.pkgs.buildPythonApplication { ./fix-restart.patch ]; - dontWrapGApps = true; dontWrapQtApps = true; postPatch = '' @@ -89,7 +83,7 @@ python3.pkgs.buildPythonApplication { runHook preInstall make -f misc/Makefile \ - PYTHON=${python3}/bin/python3 \ + PYTHON=${python3.pythonOnBuildForHost.interpreter} \ PREFIX=. \ DESTDIR="$out" \ DATAROOTDIR=/share \ @@ -112,17 +106,26 @@ python3.pkgs.buildPythonApplication { in '' makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH "''${qtWrapperArgs[@]}" + # avoid persistant warning on starup + --set QT_STYLE_OVERRIDE Fusion ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString (enableVulkan) '' + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]} + --set-default QSG_RHI_BACKEND vulkan + ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} ) ''; meta = with lib; { homepage = "https://github.com/qutebrowser/qutebrowser"; + changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; + mainProgram = "qutebrowser"; platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix index 7de6e40de2..caa4b6e39a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -34,8 +34,6 @@ , mediaSupport ? true , ffmpeg -, gmp - # Wrapper runtime , coreutils , glibcLocales @@ -88,33 +86,27 @@ lib.warnIf (useHardenedMalloc != null) ffmpeg ]; - # Library search path for the fte transport - fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; - - # Upstream source - version = "12.5.6"; - - lang = "ALL"; + version = "13.0.1"; sources = { x86_64-linux = fetchurl { urls = [ - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" + "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-lZlGhyGDT9Vxox3ghfFSIZd3sazNyL23k0UtipaIGR8="; + hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc="; }; i686-linux = fetchurl { urls = [ - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" + "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" + "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-3Z3S6P3wkZeC/lhgO7XDdDDQ6cpyOX+e3SBuh47aMl8="; + hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA="; }; }; @@ -343,15 +335,11 @@ stdenv.mkDerivation rec { # chance that TBB would continue using old font files. rm -rf "\$HOME/.cache/fontconfig" - # Workaround a bug in 12.0.X that Tor directories are not cleaned up and tor gets confused where its socket is - rm -rf \$XDG_RUNTIME_DIR/Tor* - # Manually specify data paths (by default TB attempts to create these in the store) { echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");" echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");" echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");" - echo "user_pref(\"network.proxy.socks\", \"file://\$XDG_RUNTIME_DIR/Tor/socks.socket\");" } >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js" # Lift-off @@ -467,7 +455,7 @@ stdenv.mkDerivation rec { # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. - license = licenses.free; + license = with licenses; [ mpl20 lgpl21Plus lgpl3Plus free ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix index f169bd3c4e..4edb644d59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix @@ -13,13 +13,16 @@ , version , meta , baseUrl ? "https://dist.torproject.org/torbrowser/" -# prefix used to match published archive -, prefix ? "tor-browser-" -# suffix used to match published archive -, suffix ? "_ALL.tar.xz" +# name used to match published archive +, name ? "tor-browser" +, prerelease ? false }: -writeShellScript "update-${pname}" '' +let + versionMatch = if prerelease + then ''[0-9]+(\.[0-9]+)*.*'' + else ''[0-9]+(\.[0-9]+)*''; +in writeShellScript "update-${pname}" '' PATH="${lib.makeBinPath [ coreutils curl gnugrep gnused gnupg nix common-updater-scripts ]}" set -euo pipefail @@ -27,7 +30,7 @@ writeShellScript "update-${pname}" '' url=${baseUrl} version=$(curl -s $url \ - | sed -rne 's,^.*href="([0-9]+(\.[0-9]+)*)/".*,\1,p' \ + | sed -rne 's,^.*href="(${versionMatch})/".*,\1,p' \ | sort --version-sort | tail -1) if [[ "${version}" = "$version" ]]; then @@ -47,13 +50,13 @@ writeShellScript "update-${pname}" '' gpgv --keyring=$HOME/tor.keyring $HOME/shasums.asc $HOME/shasums declare -A platforms=( - ['x86_64-linux']='linux64' - ['i686-linux']='linux32' + ['x86_64-linux']='linux-x86_64' + ['i686-linux']='linux-i686' ) for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" - sha256=$(cat "$HOME/shasums" | grep "${prefix}""$arch-$version""${suffix}" | cut -d" " -f1) + sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) hash=$(nix hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "0" "sha256-${lib.fakeSha256}" --source-key="sources.$platform" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 8bb0c21ed2..7c1beb43dc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,20 +2,21 @@ buildNpmPackage rec { pname = "vieb"; - version = "10.3.0"; + version = "10.4.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-eopsDwgyWshZOppkODGKT8UGnj4vvc7ssEzVAhZeDTA="; + hash = "sha256-SQQDlOSP1MZeN6BHdahpxpZ0e60lgA4ph0r2jkmTdP8="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-9tnLlKzOy8ze4m2beS/pI34IiEa5TdNNr+Rmm2TFgfk="; + npmDepsHash = "sha256-yCWSEuhiP6DfcFns6uyUrLBJeQbOK7yJ9QfGhHkTlHI="; + makeCacheWritable = true; dontNpmBuild = true; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index a956dee90d..2ce73facf6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.2.3105.54"; + version = "6.2.3105.58"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-QqdCnwSrqJAEj++xcr3cOkKSbZIFkyvMutxsLNR/Moc="; - x86_64-linux = "sha256-z5/l94MFhpHRLvbUdSwFSSt3n21mPZJzanYugXecLFk="; + aarch64-linux = "sha256-PDy+cenU1D9UKlICgZgj/KKZFq5x8iSDpbtCr06ks70="; + x86_64-linux = "sha256-uWv4odg/nEuY6B8Jzt5Br4pUFMlG0vGEt968PajxMUA="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix index de3c1cfdcd..2f63670128 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivationWith , fetchFromGitHub , python3Packages @@ -6,6 +7,8 @@ }: mkDerivationWith python3Packages.buildPythonApplication rec { + inherit stdenv; + pname = "webmacs"; version = "0.8"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix index e7a9f8cf68..24148153cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -47,19 +47,42 @@ , at-spi2-atk , at-spi2-core , libqt5pas +, qt6 +, vivaldi-ffmpeg-codecs +, edition ? "stable" }: -stdenv.mkDerivation rec { - pname = "yandex-browser"; - version = "23.7.1.1148-1"; +let + version = { + corporate = "23.9.1.1016-1"; + beta = "23.9.1.1028-1"; + stable = "23.9.1.962-1"; + }.${edition}; + + hash = { + corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc="; + beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA="; + stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc="; + }.${edition}; + + app = { + corporate = ""; + beta = "-beta"; + stable = ""; + }.${edition}; + +in stdenv.mkDerivation rec { + pname = "yandex-browser-${edition}"; + inherit version; src = fetchurl { - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4="; + url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; + inherit hash; }; nativeBuildInputs = [ autoPatchelfHook + qt6.wrapQtAppsHook wrapGAppsHook ]; @@ -108,6 +131,7 @@ stdenv.mkDerivation rec { pango stdenv.cc.cc.lib libqt5pas + qt6.qtbase ]; unpackPhase = '' @@ -118,15 +142,20 @@ stdenv.mkDerivation rec { installPhase = '' cp $TMP/ya/{usr/share,opt} $out/ -R - substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta + cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true + rm -f $out/share/applications/yandex-browser.desktop + substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ + substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ + substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ + ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so + ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} ''; runtimeDependencies = map lib.getLib [ libpulseaudio curl systemd + vivaldi-ffmpeg-codecs ] ++ buildInputs; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index e062a3d151..0401f1a568 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "44.2"; + version = "45.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-mdv/yDUi6tzYc3C7dtmkAWtk4IqzHvOZVO2CA3TP9TE="; + hash = "sha256-NIQFKVpZSxY2QOb73WfYsCzMQwB9XySoADCL7IlmGe8="; }; outputs = [ "out" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix index 832456d35d..bc1d81e7f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "3.2"; + version = "3.5"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-3cu5Y9Z20CbFN+4/2LLM3pcXofuc8oztoZVPhDzFLas="; + hash = "sha256-w5QdFvF+kIxt27rg/uXjd+G0Dls7oYhmFew+O2NoaVg="; }; - vendorHash = "sha256-w9WDbNvnaRgZ/rpI450C7AA244AXRE8u960xZnAiXn4="; + vendorHash = "sha256-F9mzGP5b9dcmnT6TvjjbRq/isk1o8vM/5yxWUaZrnaw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix index 35a6d4438e..f83583283d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix @@ -4,7 +4,6 @@ , dpkg , wrapGAppsHook , autoPatchelfHook -, clash , clash-meta , openssl , webkitgtk @@ -14,11 +13,11 @@ stdenv.mkDerivation rec { pname = "clash-verge"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-+RYfGLa4d5JkLWnlYfhjCOSREVJ4ad/R36eSiNj3GIA="; + hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8="; }; nativeBuildInputs = [ @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - ln -s ${lib.getExe clash} $out/bin/clash ln -s ${lib.getExe clash-meta} $out/bin/clash-meta ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index a83f1e1dfa..8ef4035996 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2023.8.2"; + version = "2023.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-8khwpGOBSpbAHnKeKFZUrJoE0dgQB3bN6Y/W2gwRfCM="; + hash = "sha256-T+hxNvsckL8PAVb4GjXhnkVi3rXMErTjRgGxCUypwVA="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index 6ffc939e23..b0b7e8a08e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.10"; + version = "3.5.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-uhXwCaAVFLlGeqkBbeA5DINo9CjNMzU9rRmOYoYJASI="; + hash = "sha256-3MwSiI21j2tMqdDInK7Q+QDMiFCophJyNXMOXMwJeEQ="; }; - vendorHash = "sha256-0563OHMNkKZcmLY1nHS70pbtrufY1d1WNXrxcCl6MKY="; + vendorHash = "sha256-Zh/r4/+x67C1yXGW/R+FYKiGFaGPEV//Sg9cWwVIMxI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index e42a4e0c4b..3b0250c5f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.16"; + version = "0.4.17"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-KxEH6FpCaOVOjdNKn7dYbFlT/W4gA8276Zt3sIs3Tg8="; + sha256 = "sha256-txbs1SzAaV1nCl104m0Ht5DwzCmK+sBDn4rZ1newdLc="; }; - vendorHash = "sha256-3f5eEge5tGko/B7MtPcifoQOkkVr0jjFX5nF6g1kow4="; + vendorHash = "sha256-1nolJLWkArzSKf11fzlvvgiCnvMYSu5MHRNAn1lryms="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 33ac8cc965..e20ad8c68e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-ETvAE9kegqtAduXm9/9fmPgJJ2Xq6ZY5J5iGcjHkyKM="; + hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-4vGBi6P0xSfBheTg2/z28l9H07TasqqM8l6YjGgLhvs="; + vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 269f97ac39..2e2ca3341d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.10"; + version = "0.10.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Lu/itKaF7mSG/jwg2sA4wNkbzBWdDY4pfwHB0elI1Bc="; + hash = "sha256-DhMoNI1eRzP9FK752Z8sAcuj5dpu2vRqXRv4tbSYmLE="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index 98a051cb7c..4abcb0321d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hxak76S3+i5G81Xv4wdFvR/+vg5Eh86YjeqRzNUmfh4="; + sha256 = "sha256-T8fPD0i15U/PzDOAVP0sifLYFHr76jD1o7q+nn+N0cY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 887d6e6f5c..8e1c1c14fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-iIv4xOqggbMDvscnaaz0QXjeScJ4SzOP0fvfshq+vyE="; + hash = "sha256-czU5o6QS4MsXyyedQ0nzwDiCQacHcDsbm2iDk7nU+Y8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index be63630ab7..f33d11a4c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.66"; + version = "1.0.68"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-17dRFRG3HpYJvqE4+SFI6a6nP6umkKc61rwQu4FiG6Q="; + sha256 = "sha256-qvcMA8oPDyi8WoIzr/3mu+2cHDXn5rgLUmnsGdOQXVM="; }; - vendorHash = "sha256-AvAS3S7bepaTFPelE+Bj5/UuQIXEDvSAtDuFaPRC9sk="; + vendorHash = "sha256-C+XaX78iGKw6Ll7PMPFWWAy6fRwjrmbLhFdmqJPMrxc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix index 37bbcec1a2..de8e4b3875 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "click"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "databricks"; repo = "click"; rev = "v${version}"; - hash = "sha256-rwS08miRpc+Q9DRuspr21NMYpEYmmscvzarDnjyVe5c="; + hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA="; }; - cargoHash = "sha256-WNITVYTS7JWrBBwxlQuVTmLddWLbDJACizEsRiustGg="; + cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; 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 0371e8c813..2204a94050 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.7.3"; + version = "8.7.4"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-2ABsxoGRRUfa09tVPmn1IXDR2IXIewg/b/fmQnaKLoY="; + sha256 = "sha256-W4+2ugRSSP3HgmyQJKGCPMX7cmE7Fk3iovBOgBen+q8="; }; - vendorHash = "sha256-k2NI9zyeQM4PJo2wE3WkG5sntJGISwmz4xqQVChu8WQ="; + vendorHash = "sha256-klbKL/c7L7kHPadDa/FkpuAgHYQmuLQK6yFhph52KsU="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index af27ec6c93..30710a8146 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-mbsmsNwUDjBqEbPuYFWHZPBfqDa92PnpiuD10mLhiEQ="; + hash = "sha256-yACUJY//y1nqu0PfmCuREC8k/koJEB6yPV5IXLnweB0="; }; - vendorHash = "sha256-FUimSBMZI4BDtNKnlzmxe2HiL7MGIUh7SFC2dwWYT3I="; + vendorHash = "sha256-wOf9OWbqjxYJio57lMBdp77RG5hhRrVU75iJiI8g0EM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 381cd1d456..d9af5c360d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "HyperKit driver for docker-machine"; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; - platforms = platforms.darwin; + platforms = [ "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index b4f9ce722e..80538f0f11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-570wOLUtKKzDDLLDrAOPAnAUpZeAqrwKsQWoHCBjKKk="; + sha256 = "sha256-kfX9BzARDWUOBIu67j60K38uwkRELxd/gXtEHOHAXS8="; }; - vendorHash = "sha256-kRRUaA/psQDmcM1ZhzdZE3eyw8DWZpesJVA2zVfORGk="; + vendorHash = "sha256-7axI7R8cTntc1IcOwVPmPj8MHeIvhbnkYKQdqu5fZOU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index f0547dcf56..60fb991fb0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM="; + sha256 = "sha256-mwlpRx/snaTymCubVLTnvN5SpXO2EWl9qZ8seNtNKtI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${jre}/bin cat <> $out/opt/flink/conf/flink-conf.yaml - env.java.home: ${jre}" + env.java.home: ${jre} env.log.dir: /tmp/flink-logs EOF ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index a45b86ba55..821921d418 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchzip +, installShellFiles +}: let - version = "2.1.1"; - sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn"; - manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s"; + version = "2.1.2"; + sha256 = "1k47wjfyhkfn4v5cpfwfgb8ypcsiaml2cxwbwasis926wda37gzk"; + manifestsSha256 = "1imwvm85p5m9s05vmjvqql2hbkrj4m5cy87212ghybaricklcx6a"; manifests = fetchzip { url = @@ -23,7 +29,7 @@ in buildGoModule rec { inherit sha256; }; - vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY="; + vendorHash = "sha256-4srEYBI/Qay9F0JxEIT0HyOtF29V9dzdB1ei4tZYJbs="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,6 +71,7 @@ in buildGoModule rec { updates to configuration when there is new code to deploy. ''; homepage = "https://fluxcd.io"; + downloadPage = "https://github.com/fluxcd/flux2/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; mainProgram = "flux"; 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 572c05e2a7..8e3b5d297b 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.26"; + version = "0.6.28"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-Tj64/8uYEy4qZISjmtpOGTMzgSkBB516/Dej6/biYRY="; + hash = "sha256-/ifr/sSaChZKRe9wCcjURhqZl2/JhIMewZSlJiit/7w="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix index 05fa118e2a..00816c0203 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.13.0"; + version = "3.13.3"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-7ciI8KgkC1NRYP8bFW5RnZ2oLXaCuPHQBd2tvgQ+YO8="; + hash = "sha256-kLDriWkzOX4mC4VTpkyEtMTpOSoR0BsCwVeWLCfaY5w="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 4082fdbc0f..407b0c0dd9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.9"; + version = "1.15.14"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-P3NC1/ZujqSO2C4ToNLpxgbxqACXYYsAFQh1Xbbu7x4="; + hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; }; - vendorHash = "sha256-KaBq1VCGWv3K50DDelS0hOQkXnK1ufBiXBtbPQFzwMY="; + vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix new file mode 100644 index 0000000000..7d5d2918e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix @@ -0,0 +1,37 @@ +{ version, stdenv, fetchurl, lib, cmake, openssl, platformAttrs, ... }: + +stdenv.mkDerivation (finalAttrs: { + pname = "hadoop-yarn-containerexecutor"; + inherit version; + + src = fetchurl { + url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}-src.tar.gz"; + hash = platformAttrs.${stdenv.system}.srcHash; + }; + sourceRoot = "hadoop-${finalAttrs.version}-src/hadoop-yarn-project/hadoop-yarn/" + +"hadoop-yarn-server/hadoop-yarn-server-nodemanager/src"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + cmakeFlags = [ "-DHADOOP_CONF_DIR=/run/wrappers/yarn-nodemanager/etc/hadoop" ]; + + installPhase = '' + mkdir $out + mv target/var/empty/local/bin $out/ + ''; + + meta = with lib; { + homepage = "https://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = licenses.asl20; + + longDescription = '' + The Hadoop YARN Container Executor is a native component responsible for managing the lifecycle of containers + on individual nodes in a Hadoop YARN cluster. It launches, monitors, and terminates containers, ensuring that + resources like CPU and memory are allocated according to the policies defined in the ResourceManager. + ''; + + maintainers = with maintainers; [ illustris ]; + platforms = filter (strings.hasSuffix "linux") (attrNames platformAttrs); + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 65512de203..d5bae9ad88 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -19,6 +19,8 @@ , nixosTests , sparkSupport ? true , spark +, libtirpc +, callPackage }: with lib; @@ -26,40 +28,75 @@ with lib; assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let - common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: - stdenv.mkDerivation rec { - inherit pname jdk libPatches untarDir openssl; + common = { pname, platformAttrs, jdk, tests }: + stdenv.mkDerivation (finalAttrs: { + inherit pname jdk; version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" + + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system}) hash; }; doCheck = true; + # Build the container executor binary from source + # InstallPhase is not lazily evaluating containerExecutor for some reason + containerExecutor = if stdenv.isLinux then (callPackage ./containerExecutor.nix { + inherit (finalAttrs) version; + inherit platformAttrs; + }) else ""; + nativeBuildInputs = [ makeWrapper ] - ++ optionals (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; - buildInputs = [ openssl ] ++ nativeLibs; + ++ optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin,lib} - mv * $out/lib/${untarDir} + mkdir $out + mv * $out/ '' + optionalString stdenv.isLinux '' - # All versions need container-executor, but some versions can't use autoPatchelf because of broken SSL versions - patchelf --set-interpreter ${glibc.out}/lib64/ld-linux-x86-64.so.2 $out/lib/${untarDir}/bin/container-executor - '' + '' - for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do - makeWrapper "$n" "$out/bin/$(basename $n)"\ - --set-default JAVA_HOME ${jdk.home}\ - --set-default HADOOP_HOME $out/lib/${untarDir}\ - --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ - --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\ - --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ - --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" + for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do + ln -sf "$n" $out/bin done - '' + optionalString sparkSupport '' + + # these libraries are loaded at runtime by the JVM + ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 + ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/native/ + ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/native/ + ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/native/ + ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ + ln -s ${getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ + + # libjvm.so is in different paths for java 8 and 11 + # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it + find $out/lib/native/ -name 'libnativetask.so*' -o -name 'libhdfs.so*' | \ + xargs -n1 patchelf --add-rpath $(dirname $(find ${finalAttrs.jdk.home} -name libjvm.so | head -n1)) + + # NixOS/nixpkgs#193370 + # This workaround is needed to use protobuf 3.19 + # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8 + find $out/lib/native -name 'libhdfspp.so*' | \ + xargs -r -n1 patchelf --replace-needed libprotobuf.so.${ + if (versionAtLeast finalAttrs.version "3.3") then "18" + else "8" + } libprotobuf.so + + patchelf --replace-needed libcrypto.so.1.1 libcrypto.so \ + $out/lib/native/{libhdfs{pp,}.so*,examples/{pipes-sort,wordcount-nopipe,wordcount-part,wordcount-simple}} + + '' + '' + for n in $(find $out/bin -type f ! -name "*.*"); do + wrapProgram "$n"\ + --set-default JAVA_HOME ${finalAttrs.jdk.home}\ + --set-default HADOOP_HOME $out/\ + --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ + --set-default HADOOP_CONF_DIR $out/etc/hadoop/\ + --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ + --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath finalAttrs.buildInputs}" + done + '' + (optionalString sparkSupport '' # Add the spark shuffle service jar to YARN - cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/lib/${untarDir}/share/hadoop/yarn/ - '' + libPatches; + cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/ + ''); passthru = { inherit tests; }; @@ -83,7 +120,7 @@ let maintainers = with maintainers; [ illustris ]; platforms = attrNames platformAttrs; } (attrByPath [ stdenv.system "meta" ] {} platformAttrs); - }; + }); in { # Different version of hadoop support different java runtime versions @@ -91,48 +128,29 @@ in hadoop_3_3 = common rec { pname = "hadoop"; platformAttrs = rec { - x86_64-linux = { - version = "3.3.5"; - hash = "sha256-RG4FypL6I6YGF6ixeUbe3kcoGvFQQEFhfLfV9i50JSo="; - }; - x86_64-darwin = x86_64-linux; - aarch64-linux = { - version = "3.3.5"; - hash = "sha256-qcKjbE881isauWBxIv+NY0UFbYit704/Re8Kdl6x1LA="; - }; - aarch64-darwin = aarch64-linux; + x86_64-linux = { + version = "3.3.6"; + hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ="; + srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU="; + }; + x86_64-darwin = x86_64-linux; + aarch64-linux = x86_64-linux // { + hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0="; + }; + aarch64-darwin = aarch64-linux; }; - untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}"; jdk = jdk11_headless; - inherit openssl; # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ]; - libPatches = '' - ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 - ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/ - ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/ - '' + optionalString stdenv.isLinux '' - # libjvm.so for Java >=11 - patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 - # Java 8 has libjvm.so at a different path - patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 - # NixOS/nixpkgs#193370 - # This workaround is needed to use protobuf 3.19 - patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so - ''; tests = nixosTests.hadoop; }; - hadoop_3_2 = common rec { + hadoop_3_2 = common { pname = "hadoop"; platformAttrs.x86_64-linux = { version = "3.2.4"; hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; + srcHash = "sha256-F9nGD3mZZ1eJf3Ec3AJGE9YBcL/HiagskcdKQhCn/sw="; }; jdk = jdk8_headless; - # not using native libs because of broken openssl_1_0_2 dependency - # can be manually overridden tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { @@ -140,6 +158,7 @@ in platformAttrs.x86_64-linux = { version = "2.10.2"; hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + srcHash = "sha256-ucxCyXiJo8aL6aNMhZgKEbn8sGKOoMPVREbMGSfSdAI="; }; jdk = jdk8_headless; tests = nixosTests.hadoop2; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index cf0ec824b0..f9d95627f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-H9Pw4HPffFmRJXGh+e2hcddYfhgmvnUOxezQ6Zc8NwY="; + hash = "sha256-2h1Pc313JZ/2NkFOOQnIrhe1Pm8FJ/BvxjAQhs/eSK0="; }; - vendorHash = "sha256-9XdLSTr9FKuatJzpWM8AwrPtYDS+LC14bpz6evvJRuQ="; + vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk="; postPatch = '' substituteInPlace pkg/config/config.go \ 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 6a8c2d0166..928acfa935 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.13.0"; + version = "3.13.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-/czguDCjnQPO4bcWa9Idl9U3yzFDxL7D4P/Ia7ZzMXE="; + sha256 = "sha256-WXtEXgKco50D1TR775lIm/VuD+MJMbOMQpPC0W4MAYo="; }; - vendorHash = "sha256-ba5ZUpV8QHn8T1mXxY5WB0pA1OGUzmNixtwwTQFrqb4="; + vendorHash = "sha256-kvler6o4On4SbFF7AvPSCF5fRYtPNI5fsOcUbrTGYcQ="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 9d2159f2c3..0a1f99e1d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-s3"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - hash = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; + hash = "sha256-D79nUIueOV2FC3I2LreHMzl/xOpzNa+OsfL5wcnyY78="; }; - vendorHash = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; + vendorHash = "sha256-dKKggD/VlBiopt2ygh07+6bTBbRgQfWbiY/1qJSSx/0="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index da65c16973..f858f8b2a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI="; + hash = "sha256-UB69cGsELQ2CFXVsPV0MDNOYRTYgfA2NXHKbsaZl9NQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 9b88d99e44..59397e9f31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E="; + hash = "sha256-RgEYFTI1uaW1aTr+/lpKQ39o5CLsj/p0JeSTUXti/IM="; }; - vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI="; + vendorHash = "sha256-P0PVzgaUN9X9x77v1psV13vNl06HrHbdlA1YHCq/eCo="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index b70ecd725e..6646315280 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.157.0"; + version = "0.158.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-M0XhkmYdmKpaA1gTXGgI7XNqIAuerV2NqfUI7sIgIiw="; + sha256 = "sha256-ohf8MUUTZ3YNon12QpSRE80RaHvWsbrZk/slgEVbgoo="; }; - vendorHash = "sha256-RRnziHhM3pxoi5dZSZI5bkGWIp3Nx0TU3mVsOoU/CCM="; + vendorHash = "sha256-rA8egwzvvhArQboWpH2ZZTSJGTyzHUIl6aLusPfr8tw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix index 447dbb4e8d..54211aa542 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QtslAJC9qPR1jnyK4SLPVv8YTxOUvrzrSA1TzEwajS8="; + sha256 = "sha256-nnW0dLFPHex4fYJeBPFy8SP7Uc6cs5eN+dv0kIfCUYs="; }; vendorHash = null; 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 c7b66eaac7..2d0854ba36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -1,32 +1,35 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo121Module rec { pname = "k0sctl"; - version = "0.15.5"; + version = "0.16.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ntjrk2OEIkAmNpf9Ag6HkSIOSA3NtO9hSJOBgvne4b0="; + hash = "sha256-DUDvsF4NCFimpW9isqEhodieiJXwjhwhfXR2t/ho3kE="; }; - vendorHash = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; + vendorHash = "sha256-eJTVUSAcgE1AaOCEEc202sC0yIfMj30UoK/ObowJ9Zk="; ldflags = [ "-s" "-w" "-X github.com/k0sproject/k0sctl/version.Environment=production" - "-X github.com/carlmjohnson/versioninfo.Version=${version}" - "-X github.com/carlmjohnson/versioninfo.Revision=${version}" + "-X github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12 + "-X github.com/carlmjohnson/versioninfo.Revision=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; + # https://github.com/k0sproject/k0sctl/issues/569 + checkFlags = [ "-skip=^Test(Unmarshal|VersionDefaulting)/version_not_given$" ]; + postInstall = '' for shell in bash zsh fish; do installShellCompletion --cmd ${pname} \ @@ -38,6 +41,7 @@ buildGoModule rec { description = "A bootstrapping and management tool for k0s clusters."; homepage = "https://k0sproject.io/"; license = licenses.asl20; + mainProgram = pname; maintainers = with maintainers; [ nickcao qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index 93df5633f5..5bbfbcf380 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.26.6+k3s1"; - k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26"; - k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y"; - k3sVendorHash = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; + k3sVersion = "1.26.9+k3s1"; + k3sCommit = "4e217286a7ea41b82f1b67ab851d444ecf9a0f9b"; + k3sRepoSha256 = "1rf2gzf3ilcd1gc6d4k1w6cficr70x8lwzcq81njpz72dr6883z3"; + k3sVendorHash = "sha256-heCQNRaa0qFNkL69KEiIH2qEg+pukgS+fLOSWcwFddA="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.2.0-k3s1"; - k3sCNISha256 = "0hzcap4vbl94zsiqc66dlwjgql50gw5g6f0adag0p8yqwcy6vaw2"; - containerdVersion = "1.7.1-k3s1"; - containerdSha256 = "00k7nkclfxwbzcgnn8s7rkrxyn0zpk57nyy18icf23wsj352gfrn"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.6-k3s1.26"; + containerdSha256 = "1bj7nggfmkrrgm5yk08p665z1mw1y376k4g3vjbkqldfglzpx7sq"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 503a4ff0c0..e2ba162b75 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, callPackage }: +{ lib, callPackage, ... }@args: let k3s_builder = import ./builder.nix lib; common = opts: callPackage (k3s_builder opts); + # extraArgs is the extra arguments passed in by the caller to propogate downward. + # This is to allow all-packages.nix to do: + # + # let k3s_1_23 = (callPackage ./path/to/k3s { + # commonK3sArg = .... + # }).k3s_1_23; + extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { k3s_1_26 = common ((import ./1_26/versions.nix) // { updateScript = [ ./update-script.sh "26" ]; - }) { }; + }) extraArgs; # 1_27 can be built with the same builder as 1_26 k3s_1_27 = common ((import ./1_27/versions.nix) // { updateScript = [ ./update-script.sh "27" ]; - }) { }; + }) extraArgs; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix index 17811da54a..69e8427be0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.15"; + version = "0.3.19"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-mWdSyP1Gcs1FC0HUX2p84PK0n1Xnd2LrD48luN4+OVs="; + hash = "sha256-yXlcTU0efgjcWy4nlhEIjd9dzErKyAW9gFhacOXv6pA="; }; - vendorHash = "sha256-y+oF9sqYVEQSukLkfz0JXFpKtUKP/1DzHIivkL2wBwk="; + vendorHash = "sha256-/yibMktAzoUCGED8oJWmNZJxOY0UM0zMl4Qww6olOZY="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index bcd553c117..b58ef4fa08 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, k9s }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, nix-update-script, k9s }: buildGoModule rec { pname = "k9s"; - version = "0.27.4"; + version = "0.28.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-SMdpjeMerIEc0oeNe0SfZyc3yQTq6eif1fDLICNceKY="; + sha256 = "sha256-3ij77aBNufSEP3wf8wtQ/aBehE45fwrgofCmyXxuyPM="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorHash = "sha256-wh4WjfDBX9xdtF9fBjSLPBbqb6k8H/LpWO9eTn86le4="; + vendorHash = "sha256-kgi5ZfbjkSiJ/uZkfpeMhonSt/4sO3RKARpoww1FsTo="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); @@ -28,10 +28,13 @@ buildGoModule rec { preCheck = "export HOME=$(mktemp -d)"; # For arch != x86 # {"level":"fatal","error":"could not create any of the following paths: /homeless-shelter/.config, /etc/xdg","time":"2022-06-28T15:52:36Z","message":"Unable to create configuration directory for k9s"} - passthru.tests.version = testers.testVersion { - package = k9s; - command = "HOME=$(mktemp -d) k9s version -s"; - inherit version; + passthru = { + tests.version = testers.testVersion { + package = k9s; + command = "HOME=$(mktemp -d) k9s version -s"; + inherit version; + }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ installShellFiles ]; 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 7639c95a97..02799677d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.16.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-PTcPlYJ0IHWNQKBJcMiotGp6GPH3qY3f6sJKgUVSTZU="; + hash = "sha256-EMBCJc9x4oduFSHMYajc/Pf8nHwRP7qMsvJUbnDkjdk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix index b3b4800151..e4bd3be1e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.13.16"; + version = "0.14.2"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-MEP7OlmsPe5qpdFBEOzCsJqLdZ5t7bMwPE/JhP9bGTY="; + hash = "sha256-SHijhYZyvaBkRVt0BO37OXEjaDGUIeO+PfrmUqPJf/M="; }; - vendorHash = "sha256-5r5UqWRmqrLcpTeYpezGxIMj9JnPaohhd1i7VvaBVGM="; + vendorHash = "sha256-fxbyAd2NaU1WQCPE+Feb1mrz6dzwCyZqanm+wfBL/IE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix index 0dff89cad4..2f69393477 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "kluctl"; - version = "2.20.8"; + version = "2.22.1"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-F4vEHzN44+d0EtfJukEq5WVm8aLVWqmT5Xcpa/DBPng="; + hash = "sha256-s7ADEWy3wx2hGeJzfXPVSBv+bAOoOQPsF75Sq02T/AI="; }; - vendorHash = "sha256-x5Zy8H7DzxU+uBCUL6edv8x2LwiIjXl5UrRUMDtUEk8="; + subPackages = [ "cmd" ]; + + vendorHash = "sha256-EEOVd15f1SK8InSIG+TuVwWibkf+ePJ5AGZpiMD+RaQ="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix index ce4a5e83c6..664c1b693f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-Aiu8SedWCP2yIw51+aVEFcskJKee8RvUcW6yGtagSnI="; + sha256 = "sha256-Xp5PpHIcjh02qesnyrz53yydIAClx0OrBE75Sz5pifg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index c3ae7d5081..f753c739eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -61,8 +61,8 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.0"; - sha256 = "sha256-a/3amvgGG7Gro6K7uIi20jwCo+JAlSuPB3/EUf75hxc="; + version = "1.28.1"; + sha256 = "sha256-jVaSqBdxg70XODwmFIpufJGXqB4r0UfNc/J+ZnjkhDU="; rev = "v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index 20788e6943..2701db12e6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "kube-router"; - version = "1.6.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-3hfStQ87t8zKyRqUoUViAqRcI8AQXhYSwOGqwIm6Q/w="; + hash = "sha256-Iwo+I1EfclkF4FL8QM3xGkIFxakmelI+hSUepLwfFSw="; }; - vendorHash = "sha256-kV5tUGhOm0/q5btOQu4TtDO5dVmACNNvDS7iNgm/Xio="; + vendorHash = "sha256-VjPesQ27GcwnFQrNI+VYzJ4/aahcjASbfMi//Zs/KLM="; CGO_ENABLED = 0; ldflags = [ "-s" "-w" - "-X github.com/cloudnativelabs/kube-router/pkg/version.Version=${version}" - "-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix" + "-X github.com/cloudnativelabs/kube-router/v2/pkg/version.Version=${version}" + "-X github.com/cloudnativelabs/kube-router/v2/pkg/version.BuildDate=Nix" ]; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 1724cb60e1..6f54075dc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8="; + hash = "sha256-JXI3hQVChM7czCwan1yswsrUSse/IbMzwXw0tnaBiek="; }; - vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c="; + vendorHash = "sha256-yiRxSJIIYJbkV3QAFclrDDnsBoX1t4cSRvGmwVgz/w8="; subPackages = ["cmd"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index fe3732152d..7197a695e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.34.1"; + version = "0.34.2"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-UGxtL8X1wEyo7jYmPw0GTvuzzQCBA3WTIowMnYSyfvM="; + hash = "sha256-+qQ/80wXSKvPg2nRuvkYZe0+fwnxKsegR0IjsxBKDNQ="; }; - vendorHash = "sha256-AbEEHG+LJB5fOm8koVQllKohtb0lqD6Kln3GCwlkb/0="; + vendorHash = "sha256-X+EvvrAnqMw/jpVdF/UJq9zFH+1NLFLYOu5RsxykynY="; ldflags = [ "-s" 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 8df27913dc..131a653b0e 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.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0="; + hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk="; }; - vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8="; + vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 53e37c5544..55ccd893be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-e93rQRIF3CmXjQhpACxBp4WnPtQ5IJnm7H5BcHGqH0c="; + hash = "sha256-tVkuLoQ0xKnPQG7a6tShTIJ7/kDYlmmLPHlPfhk01qw="; }; - vendorHash = "sha256-YkOw4HpbX6e6uIAUa7zQPah/ifRfB4ICi90AxleKNNE="; + vendorHash = "sha256-45KvBV9R7a7GcZtszxTaOOert1vWH4eltVr/AWGqOSY="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix index dc9f8c25b5..db40df70f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,21 +2,21 @@ buildGo121Module rec { pname = "kubectl-klock"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "jillejr"; + owner = "applejag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A="; + sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s="; }; - vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0="; + vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso="; meta = with lib; { description = "A kubectl plugin to render watch output in a more readable fashion"; - homepage = "https://github.com/jillejr/kubectl-klock"; - changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}"; + homepage = "https://github.com/applejag/kubectl-klock"; + changelog = "https://github.com/applejag/kubectl-klock/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.scm2342 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 43e3941a0e..3af7a59908 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-keYCF/Jte3sgJi4fnVO1ZDAsYyqXlHzX91tyS5oVCW4="; + sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix index d7eb948109..8c15855576 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.17"; + version = "2.3.0"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-cqKnoGRW+IquuZ7wvCRipRJ6mO18w/yhf5nS094vs7c="; + hash = "sha256-5znZMr0Dj6kpKJbypICN5+Fv/+3FgTLBok3YMrWaHdo="; }; - vendorHash = "sha256-0J27JSewc0DCcc3xvl2DBZE/b0qKuozuP7tFdbrRX7I="; + vendorHash = "sha256-/iAGUnIMH2+IrvvXig56SpZ0eTfVwaCgGMUDp5/MtEo="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index 08d1c5d22e..b380d07023 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pMen6ZL1S0xr5+h7gVBMG4XjlZUifIiqHvjKgg8AY5c="; + sha256 = "sha256-bPxsXRXk8hlhIhj2tO7mJ5XYd6oNH25cwp5CUVo65mo="; }; - vendorHash = "sha256-pNOCagxOcxhELSWO1GfbxGmopYXIgKD00XdZdVgawrc="; + vendorHash = "sha256-WZTtu7T7aWOk3Q0HBjGcc+lsgOExmQQEs0lEEvP+Wb4="; ldflags = [ "-X main.version=${version}" @@ -22,6 +22,6 @@ buildGoModule rec { description = "A Kubernetes credential plugin implementing Azure authentication"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ yurrriq ]; + maintainers = []; }; } 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 97d3a31402..ac142ca359 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.28.2"; + version = "1.28.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI="; + hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index ab02dff316..ae514e2b92 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-L5j7+2m2zKRQ/zpmwq1OimPM6I1KmmPBzNcK+s1NIDs="; + sha256 = "sha256-vKAKDQrQ7FmCnJwo8ItwpiayrHa9bhMognYZMlpZAlM="; }; - vendorHash = "sha256-+x5wohzPYzff3jpqsvnDqElrBW867WLrl4RaLlRjkUk="; + vendorHash = "sha256-LPxU6qvpUb0ZjzjqGeTywOluwWbsi1YmiYYWJfaMWvg="; subPackages = [ "cmd/kubeseal" ]; 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 d958e06b7e..ccbde5deac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "50.4"; + version = "51.0.14"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; - rev = version; - sha256 = "sha256-+9AnzY/vnB1OGzkKmYL0sxWS17NV+MGnHNXGOtt+BKU="; + rev = "v${version}"; + hash = "sha256-aFeegAFGRofGa54roJ3EACvk9179YAwsgO97eeoOd6s="; }; vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix index acead1775d..507430e231 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA="; + sha256 = "sha256-vlUR/fr/PFUBzvxebssrcUgfgnDpFuLuJOl5SBEMKR8="; }; vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index f662e965ff..1b3b11bfed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.3.1"; + version = "2.4.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; + hash = "sha256-MAruZVXkokwiRIIo84dikIEUuYYJLgTDl4Zgivrltyk="; }; - vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + vendorHash = "sha256-F428xc4YeTtBMlTEUdEdbLwtm2MPpCkDib/dgRTT/3Y="; # no test files doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index f0f7c2135e..7a45eea58c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-SRDabFN0ITXwHzvE5m3pIAk42kQa2yINpT64x+k3r3g="; + sha256 = "sha256-Qcy+LGvoDJZ+zpIJvC8P0c5pl6GpiDuq7sWdrdMojmg="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-YFlf0lqG4vWn9d5RAvi12ti/wV+qvsHWn123hhfmxRU="; + vendorHash = "sha256-6JM5r/MUETmlMB/8Z82mpUe8bAym9ekb1HL24ik2OlE="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix index 48e07567a8..78458741a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; + sha256 = "sha256-pinrBLzBMptqzMMiQmZob6B5rNNyQsaEkuECFFyTkrw="; }; - vendorHash = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; + vendorHash = "sha256-z3QoDcp7l3XUNo4xvgd6iD1Nw6cly2CoxjRtbo+IKQ0="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index a763177034..3544669ee9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.1"; - sha256 = "1fxwy8c1zcjwnv055czn9ixalpvq710k0m82633n73a0ixnlmjbv"; - vendorHash = "sha256-hOuvIndyGGvNWYmzE0rho/Y30/ilCzeBtL5GEvl9QqU="; + version = "2.14.2"; + sha256 = "0j7w1x88fxbwlmdj111l3v02m8a2p75zsjj847d09a901jav3ih5"; + vendorHash = "sha256-yEwz9CopCbK8mOUxzjDG3nsbWzhJlA3JTO4nYN8G68E="; } 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 2e7b8a50b9..8fdbdc3a3e 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 = "23.9.4"; - sha256 = "1hjhbkwn44i1gsc7llxc9mrdjf5xc1nl4dxqgnxgks3hzkch6qqc"; - vendorHash = "sha256-OzHl9QhNLaTCBCWpCmqzPkdWMwygKXSkYTczQD5KVh8="; + version = "23.10.4"; + sha256 = "1fbzxkfc957kdhk60x3ywwpn54zq8njqk313cgfygnrmmj3m67j9"; + vendorHash = "sha256-WEnopX/tIRoA5wiiCMue1T3wottxv744Mp7XJl63j4k="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 72dbfde9f5..0d2a26478e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-O1N8+Gjo0EapRV5Z7Z27Cfs886cbwTmckJsSJ2OI5fM="; + hash = "sha256-PR3vhNfY84vKQaAMKmPPmY7kK3BRxELAC34NfMYXQPk="; }; - vendorHash = "sha256-/4XFQagUbU8SgoBogK1hAsfGoTY+DaIVaNpSA3Enaho="; + vendorHash = "sha256-qLxUAICm/SGy2iHAbg+12xmId+P335dFyjltYlB45iw="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index 0b63cc7b0f..3fef75313b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,108 +1,56 @@ -{ nixosTests -, pkgs -, poetry2nix -, lib -, overrides ? (self: super: {}) -}: +{ python3 }: let + python = python3.override { + packageOverrides = self: super: { + nixops = self.callPackage ./unwrapped.nix { }; + } // (plugins self); + }; - interpreter = ( - poetry2nix.mkPoetryPackages { - projectDir = ./.; - python = pkgs.python310; - overrides = [ - poetry2nix.defaultPoetryOverrides - (import ./poetry-git-overlay.nix { inherit pkgs; }) - ( - self: super: { + plugins = ps: with ps; rec { + nixops-aws = callPackage ./plugins/nixops-aws.nix { }; + nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; + nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; + nixops-gce = callPackage ./plugins/nixops-gce.nix { }; + nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; + nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; + nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; + nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; + nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; + nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; - nixops = super.nixops.overridePythonAttrs ( - old: { - version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; + # aliases for backwards compatibility + nixops-gcp = nixops-gce; + nixops-virtd = nixops-libvirtd; + nixopsvbox = nixops-vbox; + }; - postPatch = '' - substituteInPlace nixops/args.py --subst-var version - ''; + # selector is a function mapping pythonPackages to a list of plugins + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + withPlugins = selector: let + selected = selector (plugins python.pkgs); + in python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selected; - meta = old.meta // { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - mainProgram = "nixops"; - }; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - } - ); - } - ) - - # User provided overrides - overrides - - # Make nixops pluginable - (self: super: let - # Create a fake sphinx directory that doesn't pull the entire setup hook and incorrect python machinery - sphinx = pkgs.runCommand "sphinx" {} '' - mkdir -p $out/bin - for f in ${pkgs.python3.pkgs.sphinx}/bin/*; do - ln -s $f $out/bin/$(basename $f) - done - ''; - - in { - nixops = super.__toPluginAble { - drv = super.nixops; - finalDrv = self.nixops; - - nativeBuildInputs = [ sphinx ]; - - postInstall = '' - doc_cache=$(mktemp -d) - sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 - - html=$(mktemp -d) - sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc - ''; - - }; - }) - - (self: super: { - cryptography = super.cryptography.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ - "CVE-2023-2650" - "CVE-2023-2975" - "CVE-2023-3446" - "CVE-2023-3817" - "CVE-2023-38325" - ]; - }; - }); - }) - - ]; - } - ).python; - - pkg = (interpreter.pkgs.nixops.withPlugins(ps: [ - ps.nixops-aws - ps.nixops-digitalocean - ps.nixops-encrypted-links - ps.nixops-gcp - ps.nixops-hercules-ci - ps.nixops-hetzner - ps.nixopsvbox - ps.nixops-virtd - ps.nixops-hetznercloud - ])).overrideAttrs (finalAttrs: prevAttrs: { - passthru = prevAttrs.passthru or {} // { - tests = prevAttrs.passthru.tests or {} // - nixosTests.nixops.unstable.passthru.override { nixopsPkg = pkg; }; + passthru = old.passthru // { + plugins = plugins python.pkgs; + inherit withPlugins python; }; - }); -in pkg + })); +in withPlugins (ps: [ + ps.nixops-aws + ps.nixops-digitalocean + ps.nixops-encrypted-links + ps.nixops-gce + ps.nixops-hercules-ci + ps.nixops-hetzner + ps.nixops-hetznercloud + ps.nixops-libvirtd + ps.nixops-vbox +]) diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix new file mode 100644 index 0000000000..06d8135bc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, boto +, boto3 +, nixops +, nixos-modules-contrib +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-aws"; + version = "unstable-2023-08-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops-aws"; + rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; + hash = "sha256-i0KjFrwpDHRch9jorccdVwnjAQiORClDUqm2R2xvwuU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + boto + boto3 + nixos-modules-contrib + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_aws" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "AWS plugin for NixOps"; + homepage = "https://github.com/NixOS/nixops-aws"; + license = licenses.lgpl3Only; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix new file mode 100644 index 0000000000..e35b4cd07f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +, digital-ocean +}: + +buildPythonPackage { + pname = "nixops-digitalocean"; + version = "unstable-2022-08-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-digitalocean"; + rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"; + hash = "sha256-aJtShvdqjAiCK5oZL0GR5cleDb4s1pJkO6UPKGd4Dgg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + digital-ocean + ]; + + pythonImportsCheck = [ "nixops_digitalocean" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps Digitalocean plugin"; + homepage = "https://github.com/nix-community/nixops-digitalocean"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ kiwi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix new file mode 100644 index 0000000000..49ffc319a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-encrypted-links"; + version = "unstable-2021-02-16"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-encrypted-links"; + rev = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"; + hash = "sha256-1TTbARyCfrLxF6SVNkmIKNNcLS9FVW22d9w0VRrH1os="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixops_encrypted_links" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "EncryptedLinksTo from Nixops 1 module port"; + homepage = "https://github.com/nix-community/nixops-encrypted-links"; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix new file mode 100644 index 0000000000..604e82114b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, cryptography +, libcloud +, nixops +, nixos-modules-contrib +}: + +buildPythonPackage { + pname = "nixops-gce"; + version = "unstable-2023-05-26"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-gce"; + rev = "d13cb794aef763338f544010ceb1816fe31d7f42"; + hash = "sha256-UkYf6CoUrr8yuQoe/ik6vu+UCi3ByJd0BdkS9SLEp0Q="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + cryptography + libcloud + nixos-modules-contrib + ]; + + pythonImportsCheck = [ "nixops_gcp" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps Google Cloud Backend"; + homepage = "https://github.com/nix-community/nixops-gce"; + license = licenses.mit; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix new file mode 100644 index 0000000000..90ed88edfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-hercules-ci"; + version = "unstable-2021-10-06"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hercules-ci"; + repo = "nixops-hercules-ci"; + rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc"; + hash = "sha256-4IZ+qzhERJIhLcIq9FvVml+xAFJ8R4QpUjFRw2DZl2U="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixops_hercules_ci" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Use Hercules CI as a NixOps backend"; + homepage = "https://github.com/hercules-ci/nixops-hercules-ci"; + license = licenses.asl20; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix new file mode 100644 index 0000000000..c4d037fe75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, hetzner +, nixops +, nixos-modules-contrib +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-hetzner"; + version = "unstable-2022-04-23"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops-hetzner"; + rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; + hash = "sha256-duK1Ui4VpbGSgGvfjTOddHSqHZ1FSy4L9Egg+FvZv04="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + hetzner + nixos-modules-contrib + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_hetzner" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Hetzner bare metal NixOps plugin"; + homepage = "https://github.com/NixOS/nixops-hetzner"; + license = licenses.mit; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix new file mode 100644 index 0000000000..17e94ab9f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, hcloud +, nixops +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-hetznercloud"; + version = "unstable-2023-02-19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lukebfox"; + repo = "nixops-hetznercloud"; + rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; + hash = "sha256-IsRJUUAfN6YXcue80qlcunkawUtgMiMU8mM6DP+7Cm4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + hcloud + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_hetznercloud" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "A NixOps plugin supporting Hetzner Cloud deployments"; + homepage = "https://github.com/lukebfox/nixops-hetznercloud"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ lukebfox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix new file mode 100644 index 0000000000..b3439bf4fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, libvirt +, nixops +}: + +buildPythonPackage { + pname = "nixops-libvirtd"; + version = "unstable-2023-09-01"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-libvirtd"; + rev = "b59424bf53e74200d684a4bce1ae64d276e793a0"; + hash = "sha256-HxJu8/hOPI5aCddTpna0mf+emESYN3ZxpTkitfKcfVQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + libvirt + ]; + + pythonImportsCheck = [ "nixops_virtd" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps libvirtd backend plugin"; + homepage = "https://github.com/nix-community/nixops-libvirtd"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ aminechikhaoui ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix new file mode 100644 index 0000000000..4a9f035109 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-vbox"; + version = "unstable-2023-08-10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-vbox"; + rev = "baa5f09c9ae9aaf639c95192460ab5dcbe83a883"; + hash = "sha256-QrxherQO1t0VpYjJSEbntUWVD6GW4MtVHiKINpzHA1M="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixopsvbox" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps plugin for VirtualBox VMs"; + homepage = "https://github.com/nix-community/nixops-vbox"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ aminechikhaoui ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix new file mode 100644 index 0000000000..5c6e9fec32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixos-modules-contrib"; + version = "unstable-2021-01-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixos-modules-contrib"; + rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; + hash = "sha256-/RSStpkAxWpUB5saQ8CmQZljFjJyUMOrR1+GiHJR2Tg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixos_modules_contrib" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Useful NixOS modules which may not belong in the Nixpkgs repository itself"; + homepage = "https://github.com/nix-community/nixos-modules-contrib"; + license = licenses.lgpl3; + maintainers = []; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix deleted file mode 100644 index 7de5435ddc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ pkgs }: -self: super: { - - nixops = super.nixops.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops.git"; - rev = "fc9b55c55da62f949028143b974f67fdc7f40c8b"; - sha256 = "0f5r17rq3rf3ylp16cq50prn8qmfc1gwpqgqfj491w38sr5sspf8"; - }; - } - ); - - nixops-aws = super.nixops-aws.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops-aws.git"; - rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; - sha256 = "1rf2dxn4gdm9a91jji4f100y62ap3p3svs6qhxf78319phba6hlb"; - }; - } - ); - - nixops-digitalocean = super.nixops-digitalocean.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-digitalocean.git"; - rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"; - sha256 = "020fg1kjh3x57dj95micpq6mxjg5j50jy6cs5f10i33ayy3556v8"; - }; - } - ); - - nixops-encrypted-links = super.nixops-encrypted-links.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-encrypted-links.git"; - rev = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"; - sha256 = "12ynqwd5ad6wfyv6sma55wnmrlr8i14kd5d42zqv4zl23h0xnd6m"; - }; - } - ); - - nixops-gcp = super.nixops-gcp.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-gce.git"; - rev = "d13cb794aef763338f544010ceb1816fe31d7f42"; - sha256 = "0i57qhiga4nr0ms9gj615l599vxy78lzw7hap4rbzbhl5bl1yijj"; - }; - } - ); - - nixops-hercules-ci = super.nixops-hercules-ci.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/hercules-ci/nixops-hercules-ci.git"; - rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc"; - sha256 = "0rcpv5hc6l9ia8lq8ivwa80b2pwssmdz8an25lhr4i2472mpx1p0"; - }; - } - ); - - nixops-hetzner = super.nixops-hetzner.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops-hetzner"; - rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; - sha256 = "0kmzv5dzh828yh5jwjs5klfslx3lklrqvpvbh29b398m5r9bbqkn"; - }; - } - ); - - nixops-hetznercloud = super.nixops-hetznercloud.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/lukebfox/nixops-hetznercloud.git"; - rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; - sha256 = "0vhapgzhqfk3y8a26ck09g0ilydsbjlx5g77f8bscdqz818lki12"; - }; - } - ); - - nixops-virtd = super.nixops-virtd.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991"; - sha256 = "1mklm3lmicvhs0vcib3ss21an45wk24m1mkcwy1zvbpbmvhdz2m4"; - }; - } - ); - - nixopsvbox = super.nixopsvbox.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-vbox.git"; - rev = "2729672865ebe2aa973c062a3fbddda8c1359da0"; - sha256 = "07bmrbg3g2prnba2kwg1rg6rvmnx1vzc538y2q3g04s958hala56"; - }; - } - ); - - nixos-modules-contrib = super.nixos-modules-contrib.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixos-modules-contrib.git"; - rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; - sha256 = "0f6ra5r8i1jz8ymw6l3j68b676a1lv0466lv0xa6mi80k6v9457x"; - }; - } - ); - -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock deleted file mode 100644 index 900875191e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock +++ /dev/null @@ -1,731 +0,0 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. - -[[package]] -name = "apache-libcloud" -version = "3.7.0" -description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" -optional = false -python-versions = ">=3.6, <4" -files = [ - {file = "apache-libcloud-3.7.0.tar.gz", hash = "sha256:148a9e50069654432a7d34997954e91434dd38ebf68832eb9c75d442b3e62fad"}, - {file = "apache_libcloud-3.7.0-py2.py3-none-any.whl", hash = "sha256:027a9aff2c01db9c8e6f9f94b6eb44b3153d82702c42bfbe7af5624dabf1f950"}, -] - -[package.dependencies] -requests = ">=2.26.0" - -[[package]] -name = "boto" -version = "2.49.0" -description = "Amazon Web Services Library" -optional = false -python-versions = "*" -files = [ - {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, - {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, -] - -[[package]] -name = "boto3" -version = "1.28.22" -description = "The AWS SDK for Python" -optional = false -python-versions = ">= 3.7" -files = [ - {file = "boto3-1.28.22-py3-none-any.whl", hash = "sha256:0c1c1d19232018ac49fd2c0a94aa0b802f5d222e89448ff50734626bce454b32"}, - {file = "boto3-1.28.22.tar.gz", hash = "sha256:af1ce129f462cdc8dfb1a1c559d7ed725e51344fb0ae4a56d9453196bf416555"}, -] - -[package.dependencies] -botocore = ">=1.31.22,<1.32.0" -jmespath = ">=0.7.1,<2.0.0" -s3transfer = ">=0.6.0,<0.7.0" - -[package.extras] -crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] - -[[package]] -name = "botocore" -version = "1.31.22" -description = "Low-level, data-driven core of boto 3." -optional = false -python-versions = ">= 3.7" -files = [ - {file = "botocore-1.31.22-py3-none-any.whl", hash = "sha256:b91025ca1a16b13ae662bdb46e7c16d2c53619df23bf3583a43791519da14870"}, - {file = "botocore-1.31.22.tar.gz", hash = "sha256:d193ab0742ddc4af3a3994af4ec993acf5ac75460f298880fe869765e7bc578d"}, -] - -[package.dependencies] -jmespath = ">=0.7.1,<2.0.0" -python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<1.27" - -[package.extras] -crt = ["awscrt (==0.16.26)"] - -[[package]] -name = "certifi" -version = "2023.7.22" -description = "Python package for providing Mozilla's CA Bundle." -optional = false -python-versions = ">=3.6" -files = [ - {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, - {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, -] - -[[package]] -name = "cffi" -version = "1.15.1" -description = "Foreign Function Interface for Python calling C code." -optional = false -python-versions = "*" -files = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "charset-normalizer" -version = "3.2.0" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"}, - {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, -] - -[[package]] -name = "cryptography" -version = "40.0.1" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -optional = false -python-versions = ">=3.6" -files = [ - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:918cb89086c7d98b1b86b9fdb70c712e5a9325ba6f7d7cfb509e784e0cfc6917"}, - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:9618a87212cb5200500e304e43691111570e1f10ec3f35569fdfcd17e28fd797"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0a4e3406cfed6b1f6d6e87ed243363652b2586b2d917b0609ca4f97072994405"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1e0af458515d5e4028aad75f3bb3fe7a31e46ad920648cd59b64d3da842e4356"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d8aa3609d337ad85e4eb9bb0f8bcf6e4409bfb86e706efa9a027912169e89122"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cf91e428c51ef692b82ce786583e214f58392399cf65c341bc7301d096fa3ba2"}, - {file = "cryptography-40.0.1-cp36-abi3-win32.whl", hash = "sha256:650883cc064297ef3676b1db1b7b1df6081794c4ada96fa457253c4cc40f97db"}, - {file = "cryptography-40.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a805a7bce4a77d51696410005b3e85ae2839bad9aa38894afc0aa99d8e0c3160"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:cd033d74067d8928ef00a6b1327c8ea0452523967ca4463666eeba65ca350d4c"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d36bbeb99704aabefdca5aee4eba04455d7a27ceabd16f3b3ba9bdcc31da86c4"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:32057d3d0ab7d4453778367ca43e99ddb711770477c4f072a51b3ca69602780a"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:f5d7b79fa56bc29580faafc2ff736ce05ba31feaa9d4735048b0de7d9ceb2b94"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7c872413353c70e0263a9368c4993710070e70ab3e5318d85510cc91cce77e7c"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:28d63d75bf7ae4045b10de5413fb1d6338616e79015999ad9cf6fc538f772d41"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6f2bbd72f717ce33100e6467572abaedc61f1acb87b8d546001328d7f466b778"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cc3a621076d824d75ab1e1e530e66e7e8564e357dd723f2533225d40fe35c60c"}, - {file = "cryptography-40.0.1.tar.gz", hash = "sha256:2803f2f8b1e95f614419926c7e6f55d828afc614ca5ed61543877ae668cc3472"}, -] - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] -docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff"] -sdist = ["setuptools-rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"] -test-randomorder = ["pytest-randomly"] -tox = ["tox"] - -[[package]] -name = "hcloud" -version = "1.18.2" -description = "Official Hetzner Cloud python library" -optional = false -python-versions = ">3.5" -files = [ - {file = "hcloud-1.18.2-py2.py3-none-any.whl", hash = "sha256:fcd73c7aab1d6e729333697e5214b26727775eccdbfb50effd1863c3424caa59"}, - {file = "hcloud-1.18.2.tar.gz", hash = "sha256:37bd5ba56387e3c491c5babd3e08ab91d5f0390cd5e880e4dfea19e21681bc9e"}, -] - -[package.dependencies] -python-dateutil = ">=2.7.5" -requests = ">=2.20" - -[package.extras] -docs = ["Sphinx (==1.8.1)", "sphinx-rtd-theme (==0.4.2)"] - -[[package]] -name = "hetzner" -version = "0.8.3" -description = "High level access to the Hetzner robot" -optional = false -python-versions = "*" -files = [ - {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, -] - -[[package]] -name = "idna" -version = "3.4" -description = "Internationalized Domain Names in Applications (IDNA)" -optional = false -python-versions = ">=3.5" -files = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] - -[[package]] -name = "jmespath" -version = "1.0.1" -description = "JSON Matching Expressions" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, - {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, -] - -[[package]] -name = "jsonpickle" -version = "3.0.1" -description = "Python library for serializing any arbitrary object graph into JSON" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jsonpickle-3.0.1-py2.py3-none-any.whl", hash = "sha256:130d8b293ea0add3845de311aaba55e6d706d0bb17bc123bd2c8baf8a39ac77c"}, - {file = "jsonpickle-3.0.1.tar.gz", hash = "sha256:032538804795e73b94ead410800ac387fdb6de98f8882ac957fcd247e3a85200"}, -] - -[package.extras] -docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["ecdsa", "feedparser", "gmpy2", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] -testing-libs = ["simplejson", "ujson"] - -[[package]] -name = "libvirt-python" -version = "9.6.0" -description = "The libvirt virtualization API python binding" -optional = false -python-versions = ">=3.6" -files = [ - {file = "libvirt-python-9.6.0.tar.gz", hash = "sha256:53422d8e3110139655c3d9c2ff2602b238f8a39b7bf61a92a620119b45550a99"}, -] - -[[package]] -name = "nixops" -version = "2.0.0" -description = "NixOS cloud provisioning and deployment tool" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -pluggy = "^1.0.0" -PrettyTable = "^0.7.2" -typeguard = "^2.7.1" -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops.git" -reference = "master" -resolved_reference = "fc9b55c55da62f949028143b974f67fdc7f40c8b" - -[[package]] -name = "nixops-aws" -version = "1.0" -description = "NixOps AWS plugin" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -boto = "^2.49.0" -boto3 = "^1.13.7" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-aws.git" -reference = "HEAD" -resolved_reference = "8802d1cda9004ec1362815292c2a8ab95e6d64e8" - -[[package]] -name = "nixops-digitalocean" -version = "2.0" -description = "NixOps plugin for Digital Ocean" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} -python-digitalocean = "^1.15.0" - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-digitalocean.git" -reference = "HEAD" -resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff" - -[[package]] -name = "nixops-encrypted-links" -version = "1.0" -description = "Encrypted links support for NixOps" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-encrypted-links.git" -reference = "HEAD" -resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1" - -[[package]] -name = "nixops-gcp" -version = "1.0" -description = "NixOps backend for Google Cloud Platform" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -apache-libcloud = "^3.7.0" -cryptography = "40.0.1" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-gce.git" -reference = "HEAD" -resolved_reference = "d13cb794aef763338f544010ceb1816fe31d7f42" - -[[package]] -name = "nixops-hercules-ci" -version = "0.1.0" -description = "" -optional = false -python-versions = "^3.8" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/hercules-ci/nixops-hercules-ci.git" -reference = "HEAD" -resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" - -[[package]] -name = "nixops-hetzner" -version = "1.0" -description = "NixOS deployment tool, but for hetzner" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -hetzner = "0.8.3" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-hetzner" -reference = "HEAD" -resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" - -[[package]] -name = "nixops-hetznercloud" -version = "0.1.3" -description = "NixOps Hetzner Cloud plugin" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -hcloud = "1.18.2" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/lukebfox/nixops-hetznercloud.git" -reference = "HEAD" -resolved_reference = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3" - -[[package]] -name = "nixops-virtd" -version = "1.0" -description = "NixOps plugin for virtd" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -libvirt-python = "^9.0" -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "HEAD" -resolved_reference = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991" - -[[package]] -name = "nixopsvbox" -version = "1.7" -description = "NixOps backend for VirtualBox" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-vbox.git" -reference = "HEAD" -resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" - -[[package]] -name = "nixos-modules-contrib" -version = "0.1.0" -description = "NixOS modules that don't quite belong in NixOS." -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixos-modules-contrib.git" -reference = "master" -resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" - -[[package]] -name = "pluggy" -version = "1.2.0" -description = "plugin and hook calling mechanisms for python" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, - {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, -] - -[package.extras] -dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] - -[[package]] -name = "prettytable" -version = "0.7.2" -description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." -optional = false -python-versions = "*" -files = [ - {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, - {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, - {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, -] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" -files = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "python-digitalocean" -version = "1.17.0" -description = "digitalocean.com API to manage Droplets and Images" -optional = false -python-versions = "*" -files = [ - {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, - {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, -] - -[package.dependencies] -jsonpickle = "*" -requests = "*" - -[[package]] -name = "requests" -version = "2.31.0" -description = "Python HTTP for Humans." -optional = false -python-versions = ">=3.7" -files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, -] - -[package.dependencies] -certifi = ">=2017.4.17" -charset-normalizer = ">=2,<4" -idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<3" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] - -[[package]] -name = "s3transfer" -version = "0.6.1" -description = "An Amazon S3 Transfer Manager" -optional = false -python-versions = ">= 3.7" -files = [ - {file = "s3transfer-0.6.1-py3-none-any.whl", hash = "sha256:3c0da2d074bf35d6870ef157158641178a4204a6e689e82546083e31e0311346"}, - {file = "s3transfer-0.6.1.tar.gz", hash = "sha256:640bb492711f4c0c0905e1f62b6aaeb771881935ad27884852411f8e9cacbca9"}, -] - -[package.dependencies] -botocore = ">=1.12.36,<2.0a.0" - -[package.extras] -crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - -[[package]] -name = "typeguard" -version = "2.13.3" -description = "Run-time type checker for Python" -optional = false -python-versions = ">=3.5.3" -files = [ - {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, - {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, -] - -[package.extras] -doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] -test = ["mypy", "pytest", "typing-extensions"] - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -optional = false -python-versions = "*" -files = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] - -[[package]] -name = "urllib3" -version = "1.26.16" -description = "HTTP library with thread-safe connection pooling, file post, and more." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "urllib3-1.26.16-py2.py3-none-any.whl", hash = "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f"}, - {file = "urllib3-1.26.16.tar.gz", hash = "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "2.0" -python-versions = "^3.10" -content-hash = "3d42a61f93a1a6b6816e317a78f3385271bd838430200f69154ebc5bebeb6162" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml deleted file mode 100644 index 84739cb09d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ /dev/null @@ -1,28 +0,0 @@ -[tool.poetry] -name = "nixopsenv" -version = "2.0.0" -description = "NixOps 2.0" -authors = ["Adam Hoese "] - -[tool.poetry.dependencies] -python = "^3.10" -nixops = {git = "https://github.com/NixOS/nixops.git"} -nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} -nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"} -nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} -nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} -nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} -nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} -nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.git"} -nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} - -# poetry lock would download an excessive number of wheels looking for a compatible version, so -# we pin a feasible range here. This does not represent a real constraint on the version and -# would be ok to remove/update/ignore in future upgrades. Note that a botocore wheel is about 50MB. -boto3 = "^1.26" -botocore = "^1.29" - -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix deleted file mode 100644 index a7926d0fd5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs ? import { } }: - -pkgs.mkShell { - packages = [ - pkgs.python310 - pkgs.poetry2nix.cli - pkgs.pkg-config - pkgs.libvirt - pkgs.poetry - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/unwrapped.nix new file mode 100644 index 0000000000..c70da93046 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, sphinx +, pluggy +, prettytable +, typeguard +, typing-extensions +, nixosTests +}: + +buildPythonApplication rec { + pname = "nixops"; + version = "unstable-2023-10-26"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops"; + rev = "2cfc2cb4fa9ecb89a4274574ff7f63ea61782498"; + hash = "sha256-4uvQQkERZFEeRJjMAcyLYJzNvH0rNiiJ+5BDQmD58gI="; + }; + + postPatch = '' + substituteInPlace nixops/args.py --replace "@version@" "${version}-pre-${lib.substring 0 7 src.rev or "dirty"}" + ''; + + nativeBuildInputs = [ + poetry-core + sphinx + ]; + + propagatedBuildInputs = [ + pluggy + prettytable + typeguard + typing-extensions + ]; + + postInstall = '' + doc_cache=$(mktemp -d) + sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 + + html=$(mktemp -d) + sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc + ''; + + pythonImportsCheck = [ "nixops" ]; + + passthru = { + tests.nixops = nixosTests.nixops.unstable; + updateScript = unstableGitUpdater {}; + }; + + meta = with lib; { + description = "A tool for deploying to NixOS machines in a network or cloud"; + homepage = "https://github.com/NixOS/nixops"; + license = licenses.lgpl3Only; + maintainers = with lib.maintainers; [ adisbladis aminechikhaoui roberth ]; + platforms = lib.platforms.unix; + mainProgram = "nixops"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/update b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/update deleted file mode 100755 index 1d1fd93fdb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/update +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../../. -i bash -set -eux - -rm -f ./poetry.lock ./poetry-git-overlay.nix - -poetry lock - -# builtins.fetchGit is disabled in restricted eval -# Pin fixed-output derivations from lock file -poetry2nix lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index c973a20ad5..f5f3961ade 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -75,9 +75,9 @@ rec { nomad_1_6 = generic { buildGoModule = buildGo121Module; - version = "1.6.2"; - sha256 = "sha256-Q0RyO9FZWGxWgVmTU07/pw5P4Ebcwcednq8TDmshuAk="; - vendorHash = "sha256-XCuWhKuBtSPTK8fXwgjMKMjwLnl1KWZKSJ4Ih9XDIDc="; + version = "1.6.3"; + sha256 = "sha256-5UWGriDy15PX3+9UppcUsEwih/e9COLVBis3fn+24L0="; + vendorHash = "sha256-gXoheW6Ww9Iu4utKNHweP2blzhWid+Q9Tp0ZgCmBAVg="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix index ac44c8efff..95646c800a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.69"; + version = "0.1.70"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-JKR58is8SzNmEQ8x1om1anReLIbNCHJkkzZQ1SiQ5J4="; + sha256 = "sha256-J/CN1cxEcKiEt8WMg79nA4y0gp18vSDEsBqvYuQVaIk="; }; vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix index 630b64b4c1..e94e3772c8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-d6C+nOz60CPnEsSf74+WBTaeIXGKtysVELg0+dXM1cU="; + sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y="; }; vendorHash = null; 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 f98f9eb110..bc31e05a6a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,15 +14,15 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-alpha2"; + version = "1.6.0-alpha5"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-29vF5vWCPxJJHsQ1dkLcIaqEQVYxp2YjZ4LK5r4/dlo="; + hash = "sha256-nkDDq9/ruiSvACw997DgnswwTVzCaZ5K9oT2bKrBYWA="; }; - vendorHash = "sha256-qhnQ47K9N7HoTMUXhX2RlUuQaCgeAB/Sshh56A5rhpk="; + vendorHash = "sha256-mUakrS3d4UXA5XKyuiIUbGsCAiUMwVbYr8UWOyAtA8Y="; ldflags = [ "-s" "-w" ]; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index f8ff802ede..71fd37a3ce 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.7.2"; + version = "2.7.6"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-+DqkYzRS1H6PGthljAqsmLAnGtKkX4g0drZiRh8b1v4="; + hash = "sha256-h0xr94DNmqjpRcas0F+UxQEnCHt5VGU2CRtv+GzJl00="; }; - vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4="; + vendorHash = "sha256-UBuCAIwx1UOh9bsk3eNlTOozB55RIvuKQ0P1WRkJNaI="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix index a4270fbcea..5aae5e8e68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pig/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = [ maintainers.skeidel ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix index 823fdfb434..bf028f30f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-z+JwtrP3WGMK11RRYrDig5SrX6YCj7U3AwuLg/J8dgs="; + sha256 = "sha256-Nhm2dLEFI+fAJ2lLE9z+3Qug3bbsoiRjex89Pa9oAVQ="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-QywpqgQj76x0zmn4eC74fy7UECK4K81WO+nxOYKZqq0="; + vendorHash = "sha256-4y513BkV3EYgqlim2eXw02m36wtUVQeegmQiMZ3HyWg="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix index de8eaa0e01..b496d5a801 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.4"; + version = "5.18.6"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw="; + hash = "sha256-PQf1gEFlZ6Y9KMQjKeXAZy/OfxCbiKfST3pr9xp0/vg="; }; - vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY="; + vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix index 67f1988220..871f8287b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "1.3.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8="; + sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0="; + vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix index 5f22075554..a699acb486 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-GrqefNH3wLMMd+JfkugVJhUHFP5vvqroAMbWLan9ylU="; + sha256 = "sha256-6dj6thIjxoYdX4h7btK8bQcqfqbZ86E/rQOHkgIeaN4="; }; - vendorHash = "sha256-y/ZoSK/lgqt8VZAb8NgCzyde/cwAhpu658/3mC/tI98="; + vendorHash = "sha256-SGhflDzTRix+kWgh9/0Rc5laQwGdEu+RawEDyHVI+3E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index ddfa4443d8..d21cc92197 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.15"; + version = "0.15.17"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aKxRjPXvj9rGUheUjpjGWlzg9I6LaCxfc6FJV8Kzj3I="; + sha256 = "sha256-RzwLc29f+u/m1x5R199M8XQQ5nn33ofYi3AyMCimMtA="; # 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/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index b144df23bd..02ceac6198 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stern"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-86XoYzw1bnIWwGiFgRl9RcZSYrF4byYKnDlJ4QSqXV0="; + sha256 = "sha256-W8jGUs63R6QpwuTgzK5yVLhKGXypvKOyCWHT2xdb6eM="; }; vendorHash = "sha256-LLVd9WB8ixH78CHYe0sS4sCDCD+6SQ7PxWr2MHiAOxI="; 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 1d0356e68e..f0414dba54 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.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70="; + hash = "sha256-15sNXiJ/s3MlrXFXPxA7mQ+/36HRSZF6XKos6XEHi1Y="; }; - vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0="; + vendorHash = "sha256-fGl16Wsb1tW9+wZBg5yY73t7n+EJ1dVx5IlzY2B8PJA="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 3b9962b84a..9bda0fedf0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.32.0"; + version = "0.32.2"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Ilue0stXko8bkMMzXEHrdgJYIV5ZcI39hwFUya8X4ac="; + sha256 = "sha256-CNjZpiIKkky4BVmz6pN5tdADIt6hlnWY8ig9Rdt6qmI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix index 126a083b5b..ea61664750 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.9.0"; + version = "0.10.6"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0="; + hash = "sha256-4kNuudnYBD6rgIkysP7dEjsRu/dFvTm3hkbBYZ6+Zh4="; }; - vendorHash = "sha256-EX1T3AygarJn4Zae2I8CHQrZakmbNF1OwE4YZFF+nKc="; + vendorHash = "sha256-ZECwF/avHKE4L9GHa2w5Lx71wD6UIAaPpRkUtpEVafI="; inherit overrideModAttrs; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix index 09cc62352d..2e7f70eaf5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-backend-git/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terraform-backend-git"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "plumber-cd"; repo = "terraform-backend-git"; rev = "v${version}"; - hash = "sha256-ryHFuHIEJ4i1R3oBW3w3aAvtv+vIrO745qwx0+SqBF4="; + hash = "sha256-ZbQfL7uKCFD98HcoeqscZaIsWFvWH0Ytzlqr6fMmXUs="; }; vendorHash = "sha256-Y/4UgG/2Vp+gxBnGrNpAgRNfPZWJXhVo8TVa/VfOYt0="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 669af001e5..b9668b0dd6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.3.44"; + version = "1.3.45"; format = "setuptools"; src = fetchFromGitHub { owner = "terraform-compliance"; repo = "cli"; rev = "refs/tags/${version}"; - sha256 = "sha256-eE9bqu9ipuas+rdcJpn09V6nkdoYPOpChHgPH8U0rNw="; + sha256 = "sha256-Q7EzDL8yt2UPrM4u4f4ttDI5Da0ZzQwZmOlk7RrNN5E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 94bc2827ec..6769c46868 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -46,6 +46,8 @@ let name = "source-${rev}"; inherit owner repo rev hash; }; + # nixpkgs-update: no auto update + # easier to update all providers together meta = { inherit homepage; @@ -95,6 +97,7 @@ let removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { + fly = archived "fly" "2023/10"; ksyun = removed "ksyun" "2023/04"; }; 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 0031fb0397..3ba13e12bc 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 @@ -1,22 +1,22 @@ { "aci": { - "hash": "sha256-rJ4xiBLrwhYkVPFDo6vZkk+w3v07EuK5a2gn1cbEA6Q=", + "hash": "sha256-RcMT8KD2V9JsAoQCznHpWIe+DHcTfKuW6gJlnxw9Kxo=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.10.1", + "rev": "v2.11.1", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-5KR32V4sE5AkOVroLmelNBzBZpD4KfhC491X+5eo+n8=", + "hash": "sha256-Yw+mkmRmetNKQhS5jpJ946ISj6Ga+G6hFArT0iVWNJ0=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UIV0dIoRZxNiaEq1HGPIV4mFLn4pAoGPo6tx6zV3r3A=" + "vendorHash": "sha256-xpcloyR34rkarjJM2PWiLzFaJCpXWqPCP49Pmnk29nY=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -28,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-3agD22viTP+yntNg2nyYi5OpknXnfI2Jk/xEcvXgia8=", + "hash": "sha256-RxqrgekgPkLUTJsrEVfQPTOodv/hNWXFV7c/1Mg6mt0=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.8.2", + "rev": "v4.9.3", "spdx": "MIT", - "vendorHash": "sha256-sVPby/MLAgU7DfBDACqxvkLWblBhisHcUaoOgR3fMaM=" + "vendorHash": "sha256-gRcWzrI8qNpP/xxGV6MOYm79h4mH4hH+NW8W2BbGdYw=" }, "akamai": { - "hash": "sha256-jVl4B7YfBDri+G/cJHTvPJquCALEdKxRY1DKeJOC2p0=", + "hash": "sha256-Du0ANsAHzV6zKobpiJzdy26JgIW1NRO6fbAHNMCDbaI=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.2.0", + "rev": "v5.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GjGv4q0+Yfu4Vc/eZHcch/Y5MMj1QszDrIlu/sY33Ho=" + "vendorHash": "sha256-4w3zYSO0GIL636FFuv1X4covAyFHVQ2Ah9N4RUQd7wM=" }, "alicloud": { - "hash": "sha256-Ni69AvtyRgwT89OayULlqS8mWdoK+BLK35H0sQEiksg=", + "hash": "sha256-GdoesVK4awNjMMBE6YuLIMh23WyMLKxABWLQ/y5H4kw=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.209.1", + "rev": "v1.212.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -73,66 +73,75 @@ "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" }, "argocd": { - "hash": "sha256-7BOBk2wrCvI8sAzjgDWYNhK+Uht4SaySLK6lJdR1o9Q=", + "hash": "sha256-nJrXbeI/07LlKngEkAnqPG6CiOLFTFugmZMVl2FEvIo=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v6.0.2", + "rev": "v6.0.3", "spdx": "MPL-2.0", "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, + "artifactory": { + "hash": "sha256-F491M8AS+nh4fCPUA/6R9c6MQ6CB29QJsWjk1L5LOwI=", + "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", + "owner": "jfrog", + "repo": "terraform-provider-artifactory", + "rev": "v9.8.0", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Ne0ed+H6lPEH5uTYS98pLIf+7B1w+HSM77tGGG9E5RQ=" + }, "auth0": { - "hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=", + "hash": "sha256-ShwoPwEQLNX1+LB84iWrS5VopKt8kao35/iVVGLDZck=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.50.0", + "rev": "v1.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+ZYbaQICwcABnJE9p6Lwk0gXqeHfO/TLkvwvLD9v8ng=" + "vendorHash": "sha256-fD3epndk6L+zjtUNalis9VJCxWKOBScYGHkUFRnLNLQ=" }, "avi": { - "hash": "sha256-xis3uVCK+dck6R5ru8suNQov9qTLwLIdeQCAR9Jwqcs=", + "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.4", + "rev": "v22.1.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-vORXHX6VKP/JHP/InB2b9Rqej2JIIDOzS3r05wO2I+c=" + "vendorHash": "sha256-1+VDh9hR/2Knl5oV9ZQiPCt+F7VmaTU4MI1+o8Msu8M=" }, "aviatrix": { - "hash": "sha256-T/GPJBcKxWhBxB7fVACkkwRm6dqixQpkAzi6UYw6TRw=", + "hash": "sha256-PRYtkq4CLEbUJ7YOSlvDyz+z4icLi0DBkDCTs/tNoIQ=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.2", + "rev": "v3.1.3", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-Wt6rcHCxn1RPIxblL/Y6JWfsmOcloMZ8DMWvoVz/xrI=", + "hash": "sha256-4ecgttYOAQ/I+ma1eSPomiJ4rdT9F1gtQUu4OS4stlQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.14.0", + "rev": "v5.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wF4dsQItVSXpJWBiOmdt/5ZaZeROmIxNW66Ec80PudU=" + "vendorHash": "sha256-twXEX5emBPQUMQcf11S9ZKfuaGv74LtXUE2LxqmN2xo=" }, "azuread": { - "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", + "hash": "sha256-PwHnyw0sZurUMLWKUmC3ULB8bc9adIU5C9WzVqBsLBA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.41.0", + "rev": "v2.45.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-l26MIkMpB4/vO6r2u7vyepAGxRw8CNPDhcUD/USWteg=", + "hash": "sha256-sGZvfjq2F1BjvqgYel0P/ofGmHXv8c7OhfXGGoXB2+Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.71.0", + "rev": "v3.80.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -146,31 +155,31 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-5tydl+IMHz1wYxNUHJY6l+yIgtjc0gy5ufa+DQHiNf0=", + "hash": "sha256-N2WfSCro4jVZSXTe41hs4uQsmnhbsfl/J2o51YEOsB4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.15", + "rev": "v1.19.20", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-dlQRjIf2lffWqD42ykZdm6HJT0qdID9gdc0vjq2nl9k=", + "hash": "sha256-eiwnIsGVGrOxSwrZj+UAq5sl2w2eT6tDCVQSnMBc/lk=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.19.0", + "rev": "v1.20.0", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-En53+Lj7cQxzkKgXDPWNptVbg0wMAc5WRmsilBOlgEM=", + "hash": "sha256-dO+2sg+4Xg+9fxKe/hGF0EBS4yGZAzhIBgcBhT/VDWk=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.35.0", + "rev": "v2.37.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-xaa/NAJfKlSM4P9o4xNsJhL5ZyUGNYMC9/WbCqMKiLM=" + "vendorHash": "sha256-2s8ATVlSVa6n/OSay0oTdJXGdfnCwX6da3Pcu/xYcPY=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -182,22 +191,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-LZyfyiPyGToJMMue9049CnMnioJblko/WXt2PSNv4WE=", + "hash": "sha256-+H2ivPSrNBybUSYX2sLL4V8uqLTsJZp7AN1AYQQ/f90=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.26.0", + "rev": "v1.0.6", "spdx": "MIT", - "vendorHash": "sha256-G4aKekEqEZVMxXDjPgnzvXidv0u1WydZqxSPj5d+WKg=" + "vendorHash": "sha256-GzHqmSS0yWH+pNGA7ZbfpRkjUsc2F9vlJ9XEOjKxFS4=" }, "checkly": { - "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=", + "hash": "sha256-HfmEh+7RmCIjBvacBW6sX3PL295oHOo8Z+5YsFyl0/4=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.9", + "rev": "v1.7.2", "spdx": null, - "vendorHash": "sha256-EhsfA53xkGFgiwJxBtpD1ZKjb0+14dKD9rQ0Jrrm3ck=" + "vendorHash": "sha256-iAAsTiBX1/EOCFgLv7bmTVW5ga5ef4GIEJSHo4w76Tg=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -209,22 +218,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-35pcXFmVCO2naCeDDcNtgzUeMdkGfGBxZvYSSGtH824=", + "hash": "sha256-YZUlGvhanK/xH6Qbqlw6YebBxg03lZIcQeiUc5GP51o=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.27.0", + "rev": "v1.28.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" + "vendorHash": "sha256-dR/7rtDNj9bIRh6JMwXhWvLiAhXfrGnqS9QvfDH9eGw=" }, "cloudflare": { - "hash": "sha256-l1cTzPiOOLyvbvbt7dWR9lRgqVFiO5gRq4XNnLqvac0=", + "hash": "sha256-FdKz6EmpxhqM+wcCAuwTCOCxhV0LI4+7d12fNxOSd7Q=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.13.0", + "rev": "v4.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uZ0zc+/RmEiqxBSZLgLPmwN29BEJitPN13HE88zPxcI=" + "vendorHash": "sha256-PwIFz2T+iXR6+A/yrF4+kxWr2SxLDUY8XDO5aTeg89M=" }, "cloudfoundry": { "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", @@ -245,11 +254,11 @@ "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" }, "cloudscale": { - "hash": "sha256-fthgKxMYubc0y+6C6ON/zw+bZ9pd73N0Q0qDR715KCo=", + "hash": "sha256-SDivLkP1y/qBVNSiyCjV6zPTbLUplxzD3gNxzkjC51M=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.2.0", + "rev": "v4.2.2", "spdx": "MIT", "vendorHash": null }, @@ -264,13 +273,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-2oujZd7tqvMnp48m3bs45p5dRC7U5a7hsiS5qBuPUHU=", + "hash": "sha256-mGLI/TAovyBvowI6AwRPcmYqwnPEe4ibDhFj1t7I+oM=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.18.0", + "rev": "v2.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0SRbKFKl1lfiiMDZW20ak9m09T3tSOH/fc+UwGeXmuk=" + "vendorHash": "sha256-sOnEgGTboK+vbNQYUOP0TxLe2JsqBUFo6/k55paIsmM=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -282,22 +291,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-FAqtbze6Lw6SCU84R6aB0oY+pcWyDBdTZRBZhM2pjyc=", + "hash": "sha256-IU9eBWYqI/a9EsYhI6kPom1PK/H403Dxr7eSXYFL5Do=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.29.0", + "rev": "v3.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UJRuj5qmWWjkqMBGf0500//83ky0Dxx04IQETPwwSsw=" + "vendorHash": "sha256-C+N+LQ6qjpRrUNzCaiauIor+noD+0igTfR7RnrZdNwU=" }, "dexidp": { - "hash": "sha256-69r3m3lIKftZQ8NXBD5KEHbsNUwCGpFgn/CYO+921M4=", + "hash": "sha256-Sy/xkhuNTocCoD7Nlq+pbvYiat4du4vZtOOZD2Ig3OA=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.3.0", + "rev": "v0.3.2", "spdx": "MIT", - "vendorHash": "sha256-EWEc7tILolAIzT7ZOLXlrlrt3hsgJxFD89y/USLeE40=" + "vendorHash": "sha256-8gz6tsmHHH9B3Z5H0TZRdlpCI6LhthIn7fYn8PjYPeg=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -309,11 +318,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-CnakqGO/adv44knzp3Q5nC17tD+ZpOEFqfQXPk20klg=", + "hash": "sha256-8T2xWKKoPU54ukMClva/fgZXGDMh92Oi0IacjnbgCCI=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.29.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -336,13 +345,13 @@ "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw=" }, "dnsimple": { - "hash": "sha256-Q/EjVBjZyML1coMblzqGU7AFdG+of1hVQ4GibM7MiRw=", + "hash": "sha256-6QubFsPp3sOmCSgIpRH+x+Q9YDDnOnfX5UzV+iy3uh4=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.1.2", + "rev": "v1.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-rCM+PL78zD1FYK2v9ihdLkoFwbkgtJTSEq5vKXZPAsU=" + "vendorHash": "sha256-TTRxLal+oao8UtZpeZ4/HdR99WHGXARZWKqy1baT/mE=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -354,11 +363,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-VwyJrgPiZW9DzAFS3SeLxV6sdVjD5MzsekOSg3ByhXk=", + "hash": "sha256-zebkytKTBZ1WRS8oSdW/5B7McnL5GBClN79igdjcMvs=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.2.4", + "rev": "v1.3.0", "spdx": "Apache-2.0", "vendorHash": "sha256-Z5GKIty78BUFF3VbTcsZKi437gw/kOIHEKkAYu3uB2o=" }, @@ -372,20 +381,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-6fY1gDQLPOaq2FiuT0Mue8dcsJbFCFQ1N38tmyBcdWg=", + "hash": "sha256-7RnThTuYTO1W0nBZAilUB5WOp8Rng14aNBiax6M9FwQ=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.16.0", + "rev": "v1.19.0", "spdx": "MIT", - "vendorHash": "sha256-SqT25WhGmJM/ZTd7QdVPJFxo7zo5OB9AuuDK4RdjKeI=" + "vendorHash": "sha256-nq380VsSog+nsL+U1KXkVUJqq3t4dJkrfbBH8tHm48E=" }, "exoscale": { - "hash": "sha256-93pCsHrsYLJYgg8MXHz2Gg+vaPC9gcHdLastb89/BMg=", + "hash": "sha256-Fc2/IT8L1jn0Oh8zT0C/Am4eoumQe0VRYqBDc/enEuY=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.51.0", + "rev": "v0.53.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -399,88 +408,79 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-Pd79xIFu+vwynwVqDFqkuhg8NczkbCF2eWOXrLOPCGI=", + "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.3.1", + "rev": "v5.6.0", "spdx": "MPL-2.0", "vendorHash": null }, "flexibleengine": { - "hash": "sha256-9qwGI7JBhX2WDX7u3SY2l9RJeiDffEpkE16f8/qqlI8=", + "hash": "sha256-+RAuFh88idG49nV4HVPgaGxADw/k/sUSTqrzWjf15tw=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.40.0", + "rev": "v1.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck=" - }, - "fly": { - "hash": "sha256-9QB2fbggCKcJz8tkSYgq/X8r+MB2M76VCWXgsHARTkU=", - "homepage": "https://registry.terraform.io/providers/fly-apps/fly", - "owner": "fly-apps", - "repo": "terraform-provider-fly", - "rev": "v0.0.23", - "spdx": "BSD-3-Clause", - "vendorHash": "sha256-f+Z6Y2WPxqJoHoCwuK6sgFa8nUnkW/WwrD55dtU0wtM=" + "vendorHash": "sha256-yin+UVMkqIxMSoVB4TD6Nv8F24FnEGZP5PFVpmuO2Fg=" }, "fortios": { - "hash": "sha256-fWz3OAIOSVHNA6x8i6f/ewcC0WwWDYzeaT8rz3vFDWA=", + "hash": "sha256-RpcKMndbO3wbkHmrINkbsQ+UeFsZrQ7x02dv8ZpFMec=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.17.0", + "rev": "1.18.0", "spdx": "MPL-2.0", "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, "gandi": { - "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=", + "hash": "sha256-8heDWScvmqUStu8Hq08wvcmEiI6Ym3tb3yCjHMgsDis=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.3", + "rev": "v2.2.4", "spdx": "MPL-2.0", "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-I1FOJitXPJo/mlJCTXsJ1i+UCTImbtkJtEWAvV8wUP0=", + "hash": "sha256-hlUVYgisdMa60XWb4z3erZS/8QBHEFGrjREsWh4azEE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.34.0", + "rev": "v5.42.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-91hv73KEer3FyS9FWoQ0gV1VwRKZqAu/6fAughmX5D0=", + "hash": "sha256-eONOqinRXs9lPz4d8WDb9lA0XcJuNqzgsZrmJAZ42t8=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.3.0", + "rev": "v16.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-G7+3vqxdi4i21o1hYj2GVvoCdcmFN3ue1i4fuepucsw=" + "vendorHash": "sha256-2t50Gsyf8gxG/byjgNyw5GEturU0MgBvZuJyc49s4t0=" }, "google": { - "hash": "sha256-MysIqOj2FTxZL1K/+Ai9/Fv69kIFGEmhWJpWxvsiTcc=", + "hash": "sha256-o4tyG0Q4sqBktreYEKJ+1QlNXx/BEPmAGOTTzTcFnP8=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.80.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" + "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" }, "google-beta": { - "hash": "sha256-xaSse89edfKWBM56oAE3r7IwJ7gdaArSw6flcFC7ZLk=", + "hash": "sha256-+5Fm/aT90bD6RpQrUGjmpmahPTjOfsRJAaZuZsrPQn4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.80.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" + "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -492,31 +492,31 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-pgyyOLkMu7W4llDb4oY72ujZ26SiQqvufVGWVv7y3Sk=", + "hash": "sha256-8GBhJvv0JYHh98l1IRMsodYlFAkW5Lt1dJ03mPzTcts=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.2.0", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-+I0nCbe/OK+9ax8PzLw+PCBHrNDTm96J1GITiNCQEfc=" + "vendorHash": "sha256-DOkDVQPTwB0l1VlfbvwJYiKRi/GE85cPzaY4JKnewaA=" }, "gridscale": { - "hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=", + "hash": "sha256-gyUDWG7h3fRU0l0uyfmxd0Oi1TtQHnJutqahDoPZWgM=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.21.1", + "rev": "v1.22.0", "spdx": "MPL-2.0", "vendorHash": null }, "hcloud": { - "hash": "sha256-kuC4tm8ob9bg7iLcUaGEHMYh6XaZp4rQiVlnbo1Xzek=", + "hash": "sha256-9yW3VbxtD+oSxmc2R9yzZisMTAOwjzyCzvZBRdFdH/w=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.42.1", + "rev": "v1.44.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" + "vendorHash": "sha256-oGABaZRnwZdS5qPmksT4x7Tin2WpU2Jk9pejeHbghm8=" }, "helm": { "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", @@ -528,11 +528,11 @@ "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, "heroku": { - "hash": "sha256-PexzolGXe0dy+6vGXVDTqtHGjF66DTtt4/GUyx78RMQ=", + "hash": "sha256-M1HdcKHOVf/rxjECvHqnU6FRXE6T8TpI24Fo0gkZ6FU=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.2.6", + "rev": "v5.2.7", "spdx": null, "vendorHash": null }, @@ -565,11 +565,11 @@ "vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4=" }, "huaweicloud": { - "hash": "sha256-ogxzt57zD122xJv0qpHVyUzhHrH8U1RHfJihTLUcBbI=", + "hash": "sha256-V6Ar0MXK7i927eDq8uvHZc3ivVonK9KBKqSZCCESgq0=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.54.1", + "rev": "v1.57.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -592,13 +592,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-AGAr1O6gzkEG3MQ/AQZarzYnhMK2yilyf9rtKDOwKsM=", + "hash": "sha256-Od+aunGMjcQ4AF60dxWNAUVMQiAkFMSAquOhUp3icug=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.56.2", + "rev": "v1.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uUVU+2mXyhWq653ig8YlsRyqcQBHO9rrRJQwSHovQiM=" + "vendorHash": "sha256-qp1TZmDr7X+2MCdlGTBLubJ7hF5Y9jqoFaj5mxgNLHE=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -610,11 +610,11 @@ "vendorHash": null }, "infoblox": { - "hash": "sha256-655WGpwE1BmWRdikvHtxxX8u4kOZ9cSLCZDr6QGfn5Y=", + "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.4.1", + "rev": "v2.5.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -673,31 +673,31 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-sIu+3Vu99wxcA+fdYMXRMZzK7RpUlV37136wyn5H4WQ=", + "hash": "sha256-4vluO+efNhlYhnzNjvZD6ol0eIx3DWzQBTevMmRAfxM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.15.1", + "rev": "v2.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" + "vendorHash": "sha256-f/OJ+DoH/pc+A7bl1OOgsSU1PQC2ZEBuK7sSmcpA3tk=" }, "libvirt": { - "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", + "hash": "sha256-64wCem/eTCCyZvz96szsWoKrxKezsHQYoYZGKHBF8OY=", "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", "repo": "terraform-provider-libvirt", - "rev": "v0.7.1", + "rev": "v0.7.4", "spdx": "Apache-2.0", - "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" + "vendorHash": "sha256-dHzyNvzxNltCAmwYWQHOEKkhgfylUUhOtBPiBqIS1Qg=" }, "linode": { - "hash": "sha256-rGInk/2GCwd+pNnL3+009xuqhpR4kr7u8NYho1XRtqs=", + "hash": "sha256-ScuHyfnco5Xz6HrZ9YPQLdWKo1Hqu7LRteLHH2JxHXQ=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.7.0", + "rev": "v2.9.7", "spdx": "MPL-2.0", - "vendorHash": "sha256-KlzQ336zOsMUsCX8eanypXP32LxP+iTJDBvQdeWSv2k=" + "vendorHash": "sha256-5ALsYOuWLFGbIR3yVKmPeb0tQnx63p4WC98WdcxXeZ4=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -718,20 +718,20 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-0/nIdfCsmPaUkGkSkmWWioc6RZGTb0XWtvprjuDg2gU=", + "hash": "sha256-2th4/2uLFnmSFKI94bSSt4OSX9wiML/OkThR6SbUCPE=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.2", + "rev": "v1.10.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-DMOyP8BX1502a+Hd7rwhpV2/nT0ECFKmKDPtWE6o0IM=" + "vendorHash": "sha256-gcXX4XIyY2X7ZSDMVVzGL/ltaf8Z1/Zx8oJo/IDrIBA=" }, "mailgun": { - "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", + "hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.4", + "rev": "v0.7.5", "spdx": "MPL-2.0", "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, @@ -754,22 +754,22 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-skwM0rqhsqQaut0Vuh5Baf8bWzsLOFCjUDk9w2mgB1E=", + "hash": "sha256-i3YYBffP7Jp3f0wN1ZwP+c7C8WN8EKUh7JOKzbH0R/I=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.17.2", - "spdx": "Apache-2.0", - "vendorHash": "sha256-4axdVO1VujG9qXtuNJHQqhANjciHIACMjuneqCj2omc=" + "rev": "v2.0.1", + "spdx": "AGPL-3.0", + "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" }, "mongodbatlas": { - "hash": "sha256-xFVCYeEcdQ/w+s99Ykd10liASIDJaA/eTfnMGT2hybU=", + "hash": "sha256-SMIc78haJiH0XdTr9OBGWOcvXfYQW9thcNkCOxmNxDw=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.11.0", + "rev": "v1.12.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ae3y/lwIYFi6p5gCBVgo1GuCu218JB3zKljexETWu0s=" + "vendorHash": "sha256-B1trhV2/H5gP7EnUU7G45gIh95S2wYbANHsRM76CDWE=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -790,13 +790,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-tbXRo7VNwjidyg/KcnwqmrxbnplMsUkCQAAsQb0WxSE=", + "hash": "sha256-6SwAieZc7Qe8r+olZUUV46myax/M57t4VfWDrXMK8Hk=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.26.1", + "rev": "v3.27.7", "spdx": "MPL-2.0", - "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" + "vendorHash": "sha256-9+AcCcAX/oEnljMCuJQ9B/aRkAB/074r4G/XWnLv/KU=" }, "nomad": { "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", @@ -808,13 +808,13 @@ "vendorHash": "sha256-L8BpkzTs5qcr31Nho66xzlNMVg2SqfZbj9pPAZrNuqA=" }, "ns1": { - "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=", + "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.5", + "rev": "v2.0.10", "spdx": "MPL-2.0", - "vendorHash": "sha256-FLQhshuqIcMeqrW6h68pXzPaY0VqRXhfL0YMpHyKfkY=" + "vendorHash": "sha256-nkpKq8cAusokeuOk32n8QA9He9zQlaTFzUwLMHKzpqM=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -827,31 +827,31 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-p7ryvJEoMxfJWKNkUlpZL6lgJt5I93eHRh5qev5RGJ4=", + "hash": "sha256-Okjb4MS28gY1UdYA8+qs45VV5QcGabvMn5bc+nhzbt4=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.9.2", + "rev": "v1.9.4", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-xZHk/rkq2H4Bkr+ugTHrkb4Al2ky0zOWEQmZtiXV48s=", + "hash": "sha256-gk5KegQozeDg6ZqYsy+DxMczBOKxH0v3mHFRau/alFY=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.11.0", + "rev": "v5.20.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-Y3sLtuN55vgO35aWM6c2zIChkF5Q+8zlvH5NOJF/tRU=", + "hash": "sha256-LCOuRsAX0ftacS0ecNQpYXKKumfCZ9a10bSuRJtD20E=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.3.0", + "rev": "v4.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-2w/cdB8ySt+nimU4KXSpWjWMkeX7rEmhYHBJWQPJ5PI=" + "vendorHash": "sha256-ZhF1c4cez43cCumU+PYufpEcprRDxY7hVCNQHdIEDtI=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -863,76 +863,76 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-0XeGaHyN+u5QEU9RUr51FVi13HNmjBN6mnFwfilPw5s=", + "hash": "sha256-WVNCZDb96vsDfRvAz0MQlHmQUj+PbJ2CVWJ/A7yOAGk=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.3.0", + "rev": "v1.3.1", "spdx": "MPL-2.0", "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, "openstack": { - "hash": "sha256-Iauu0sQf8wq4Ev8JflxrthXYe99YDnt5ZzWQ/q3Bjfw=", + "hash": "sha256-sFv7n5tf3aAwe6R1XeJdU3XMDF9ZMCM3t/vVLegZaXM=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.52.1", + "rev": "v1.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" + "vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ=" }, "opentelekomcloud": { - "hash": "sha256-dNA6rNzbXFycKRKwJl+/HqUKCKn678KqthIRhmOe72M=", + "hash": "sha256-3p5R8thq5iWaeAsvqoA03UK6hzVGi4DlEe3PHJBP3xA=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.6", + "rev": "v1.35.11", "spdx": "MPL-2.0", - "vendorHash": "sha256-PHtTE3puaeIKXr9mf2bDhhHI51L4XVfOPhL7c5AvlBA=" + "vendorHash": "sha256-MD3tywosRUbkzeXQA2yTHr3p8RJlzNZVbrlTesDHpMI=" }, "opsgenie": { - "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", + "hash": "sha256-IIQtbRKfLbJz5J/T/YzVWSivMeuyKO6iKlXmbrslpQo=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.29", + "rev": "v0.6.34", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-U1gjD3NUm3/KqnbjgM91qe5gy/x/9Mn3Q4VW2XXBRw4=", + "hash": "sha256-s8Tg1j47J0sj9Jt98mS4rFgtGl4uFIfdaQDNXOV8Bbg=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.33.0", + "rev": "v0.35.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-wVXGDWpKVujS5FfvDM7quCuXRFP2MBlJra7qTyFJgDM=", + "hash": "sha256-4TplBhRU4k7ucDCsgWcqEok9tOADuZAwqOonAY+eLdY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.16.2", + "rev": "v3.1.1", "spdx": "MPL-2.0", "vendorHash": null }, "pass": { - "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "hash": "sha256-QGcHOsyUINH4bqK14OEzNm4b7oMK/4hwN9SuKt4m6t8=", "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", "repo": "terraform-provider-pass", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" + "vendorHash": "sha256-LWyfkhyTr6xHtt8nCdqid/zKwGerYVxSEpqSe853S9w=" }, "postgresql": { - "hash": "sha256-8ihu/qnPknrHeZjZ0MNcUL3qjH/gvEsOnZKDI93Hdh4=", + "hash": "sha256-r1Im4bhAakBe0PoDTpiQWPfnoFBtMCrAyL7qBa1yTQc=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.20.0", + "rev": "v1.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zsjx61qUV7nB26ghpl3T2AcXVMHblUQ0JNQ0xUnO+6Y=" + "vendorHash": "sha256-bTgxH5KUFCLDxwY5JIG+rQtDq0uFXOsbuS1FxF3hJeU=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -943,6 +943,24 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "project": { + "hash": "sha256-bLzJT+ZyBtnehpiR02tyCcI5xOC2vJxBlYW1cLX7yqI=", + "homepage": "https://registry.terraform.io/providers/jfrog/project", + "owner": "jfrog", + "repo": "terraform-provider-project", + "rev": "v1.3.4", + "spdx": "Apache-2.0", + "vendorHash": "sha256-ZDscj89bnLiubB+cxWjK1v9DXc5RX21pxfksJd6pQxk=" + }, + "proxmox": { + "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", + "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", + "owner": "Telmate", + "repo": "terraform-provider-proxmox", + "rev": "v2.9.14", + "spdx": "MIT", + "vendorHash": "sha256-um4iOwYO6ASv9wpu5Jua9anUZBKly4yVgI224Fk2dOM=" + }, "rabbitmq": { "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", @@ -953,11 +971,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-thojEtfA8vn5fMTBuOClAKt3rlKs2XK7/RRMYSHAoMM=", + "hash": "sha256-ww4ZT0XobDZ2616wkpO2IQPlwU4oz/vXzy4Y6iXslV8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.1.1", + "rev": "v3.2.0", "spdx": "MPL-2.0", "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, @@ -980,22 +998,22 @@ "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { - "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", + "hash": "sha256-VPkHnSOTnRvvX6+K0L0q5IqSSFCE6VPdg2BaSejFMNc=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.3", + "rev": "v0.4.7", "spdx": "MPL-2.0", "vendorHash": null }, "scaleway": { - "hash": "sha256-YARTRjmrweBJAa5PAWZ/2yayBa9Q09vp1AgVJNxB53Q=", + "hash": "sha256-lOoxgWps6r4/7JhK0Z0Iz5EA2mHYNrdIgOntRqXFrH8=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.27.0", + "rev": "v2.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TiR7t6RaaLT+1gqgdq/Dsegft3dqv7xwFAeeT6pNRbM=" + "vendorHash": "sha256-tly9+vClV/IGivNBY114lNXxnYjJVvhVAi1tEyCtIoo=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1007,13 +1025,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-oA//8+TedHk1zB4xj47kUNVEYXaMhEGas72xjU2uVHk=", + "hash": "sha256-o1Lf4CEdq7WeJ4TAY7Hq/rjadcB6Ifi5ylEs7ctXw4I=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v3.11.0", + "rev": "v4.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-3oVyxtl/d9coyNDk2Cj3WnkVUAsW56YZPXhUXL3DJGk=" + "vendorHash": "sha256-5+cFBQHK1ypac5Ug2YNokfH/XoVInAytoIklN3bHt2g=" }, "sentry": { "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", @@ -1052,31 +1070,31 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-v4rpdOsEYy0coZUq7frvF+IVLhI3Vz8Q6fk4koFg9a4=", + "hash": "sha256-O5Nt+CcVppo5w4gD+NQ/XrRbkJicIzQrh5gffjPNvvw=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.70.0", + "rev": "v0.75.0", "spdx": "MIT", - "vendorHash": "sha256-7jB1p6+EVUp03Bw7AyL8jH/n1tslkPmK7FIqFbde1n4=" + "vendorHash": "sha256-VD3zXfaa2fmq85a/k7LPbDVS1gA5xHC2F3Ojqpmt8MI=" }, "sops": { - "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", + "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v0.7.2", + "rev": "v1.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" + "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-PzIQ8hYCoZOdNoFvHGBGG/3ROIBl6micozonoMojG0Q=", + "hash": "sha256-mYLIOnWI1yzfmuKikDib4PIDLJulGBqvo2OkGmUt7fw=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.134.0", + "rev": "v1.149.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ptMO8xtL5STVapeZbie+6UHR4AcLbHkzXTz7sPfbsV4=" + "vendorHash": "sha256-6UUXMcfyIiZWc7HSy3P8gc7i1L9cVjifwREfmw05Qco=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1088,31 +1106,31 @@ "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U=" }, "statuscake": { - "hash": "sha256-yky6aCRK1I9NOEWcz6n6uvU+6HBJcLPQr1LLVO+34jE=", + "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake", "owner": "StatusCakeDev", "repo": "terraform-provider-statuscake", - "rev": "v2.1.0", + "rev": "v2.2.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-fgvNdBwkz+YHOrLRQSe1D+3/VUhttKkJGzV6cg57g8s=" + "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-R2t754J438nDkifE0zEtYO5q6g6N4CVQdZn9DoBiuVQ=", + "hash": "sha256-5/PaEGKG8M/XifRelqV1aL6ARXRVvOYY/uka+grijzg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.25.0", + "rev": "v2.27.0", "spdx": "MPL-2.0", "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" }, "tailscale": { - "hash": "sha256-kQARVkZM0lZtZNTftQ5JXHtVoeCiChNmq9t9yRXvK0g=", + "hash": "sha256-GOeuTjF+nwasO2Fel8FbDvZeTLaz+/HlcZnySxxS2d8=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.13.9", + "rev": "v0.13.11", "spdx": "MIT", - "vendorHash": "sha256-7qDPVKcBQuJQlya6UHjo5YPLgKl0qz1NlU2TuEf8T+0=" + "vendorHash": "sha256-wbSQkw2k/LtbWOcMd8ZnHzzI01H45J18sevQU9Xur2Q=" }, "talos": { "hash": "sha256-aP5hiR+b31+QjVWvNPxYkzijTUnFGpgR3f5XuN1Pzx8=", @@ -1124,29 +1142,29 @@ "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-OA/GnrdOv9gbnGESdMdw7sc9kRcWI4A6A79ZLOQzyJU=", + "hash": "sha256-o9PY7kZAsF/bOkmIa0QKW2SabK0u56FtjMxmlKNROBg=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.22", + "rev": "v1.81.45", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-KYJ37/lr/ZC3CSbWEYemM9pzzWDAlfNQS0KP68VqPso=", + "hash": "sha256-HsoqWDwze/INB3KfQzwKKGbyKiU7xfsI4Bg/4/xFGr4=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.48.0", + "rev": "v0.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Q66BRTiZ/Yuk7+fQWhqM8WCCRNVnfu6qx4E9jr+goXI=" + "vendorHash": "sha256-D8ouBW20jzFi365gDgL2sRk2IERSgJN3PFb7e1Akl50=" }, "thunder": { - "hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=", + "hash": "sha256-wS50I4iTnHq0rDUoz7tQXpqW84wugQQiw42xhzxFiRw=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.2.2", + "rev": "v1.3.0", "spdx": "BSD-2-Clause", "vendorHash": null }, @@ -1188,32 +1206,32 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-+xqt0y/DIx+h8L+73B00ou0Cy9f60sGijgw95N8eROk=", + "hash": "sha256-eCJXqCtNWPsJzlEPdGHK1NMxASTqQBIFAWSVGbyiKn0=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.37.0", + "rev": "v1.38.2", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-+11qnWZPtCyAjON5XZye9069332lKEpJdy504dYhOLw=", + "hash": "sha256-WbJy1lwEX6RCYxZydCJ+0U/mJB4NoYiUg9+zf8Mxnwk=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.11.0", + "rev": "1.14.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA=" + "vendorHash": "sha256-vFfwa8DfmiHpbBbXPNovPC7SFoXRjyHRwOVqBcWCEtI=" }, "vault": { - "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=", + "hash": "sha256-9SOHw46KChe7bGInsIIyy0pyNG3K7CXNEomHkmpt8d4=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.20.0", + "rev": "v3.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" + "vendorHash": "sha256-HvjbXSAkbTmADyWQaw0lZV3nZUEIYiAB3VahYvIQeb4=" }, "vcd": { "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", @@ -1225,13 +1243,13 @@ "vendorHash": "sha256-p/wTnEr/+qe8S83x6EtfsnIMVUF1VWZVHOq0vLDbh60=" }, "venafi": { - "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", + "hash": "sha256-OQNeDmsXC1Fr9bTZ07HELZznU9n4ttSkFbNOC6ooxnk=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.16.1", + "rev": "v0.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" + "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", @@ -1243,48 +1261,48 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-J+lhKDl8CGpDgdfuv0uWd7yDNiwrWAzoXCxkEidqJH4=", + "hash": "sha256-03qXrYDpmPc7gHELzjS5miLm5NPTrF0AV1sUSCM0/4o=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.7", + "rev": "v3.0.11", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-Tvc3+HVsrD2CgfRVqfcF7DtszI+s7HrIgP2wiImqOXo=", + "hash": "sha256-3kBxS8JeYYjILfpeq58fYt6j2vQXEHRXoxZBfOhCptA=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.4.2", + "rev": "v2.5.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-MrDY1zx4aXKRGmhTPMLnIVBAJh+szdL6rH0m0amlYS8=" + "vendorHash": "sha256-4ulRYzb4bzk0TztT04CwqlnMGw8tp7YnoCm2/NqGN7Y=" }, "vultr": { - "hash": "sha256-h9MQv4BTv9y4A6HSDE3dIV7aKwaIWRYy5EyE2T0mpG4=", + "hash": "sha256-9HEuJXV6spLoLEVwdNid+MfVrBvrdUKjHWkDvQLSG+s=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.15.1", + "rev": "v2.17.1", "spdx": "MPL-2.0", "vendorHash": null }, "wavefront": { - "hash": "sha256-bBJZT5h/2ZFTKhFXMWj/xf+DAMGdUZw8E07PuIsMVpU=", + "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v5.0.1", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-77pijBYzCQoaZgMRNRwZEAJVM51EMGezXXcrfn9ae1Q=" + "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-Y4bEbqUTxP1QDf1r8a3vtxV+RG3dqjHxHN9p/nB3qz8=", + "hash": "sha256-QirLhOAvOcsMFR0ZWHCCI2wbfcD5hfHSlZ0bguvAHiI=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.97.0", + "rev": "v0.102.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1Sw4a9HFYt24Om5Bbbmx6JskhbMd4zTv6K6WOrQetpQ=" + "vendorHash": "sha256-y8M50X2F4olM1I0i32uUd/FASY9wUnMOF5k4AEP6b9I=" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index e6c122a539..70f547fb02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.0"; - hash = "sha256-R1phgtGn9hyNqa0wR1zY9uThTJSIj7TuK5ekXx48QP0="; - vendorHash = "sha256-V7S+IzHfBhIHo0xCvHJ75gOmvVbJd2k8XBdvLG1dcsc="; + version = "1.6.4"; + hash = "sha256-kA0H+JxyMV6RKRr20enTOzfwj2Lk2IP4vivfHv02+w8="; + vendorHash = "sha256-cxnvEwtZLXYZzCITJgYk8hDRndLLC8YTD+RvgcNska0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 1e6c86915a..638a308903 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.52.1"; + version = "0.53.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t1GAcOZAYdfrI0lsyKUEBbnJaGzuFP0+Mz3Yrv4Bmik="; + hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo="; }; - vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; + vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix index f1781cca39..2c42ac08d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-pNuJxmVMGbBHw7pa+Bx0HY0orXIXoyyAXOKuQ1zpfus="; + sha256 = "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix index 7267e3fc06..1381ba6642 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.3"; + version = "0.3.6"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-1sYWOvSWxoS0R6M1HxJ6yyBSa/LY3b9G8mF3NMofFhM="; + hash = "sha256-8TRX7gAbBlCIOHbwRIVoke2WBSgwLx9121Fg5h0LPF0="; }; vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix new file mode 100644 index 0000000000..85645c2849 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/assets.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, version, src +, fetchYarnDeps +, fixup_yarn_lock, yarn, nodejs +}: + +stdenvNoCC.mkDerivation rec { + pname = "tilt-assets"; + + inherit src version; + + nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/web/yarn.lock"; + hash = "sha256-UTxglGn3eIgahZg4kxolg2f2MTReCL4r/GyWNg4105E="; + }; + + configurePhase = '' + export HOME=$(mktemp -d)/yarn_home + ''; + + buildPhase = '' + runHook preBuild + + yarn config --offline set yarn-offline-mirror $yarnOfflineCache + + cd web + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-engines + patchShebangs node_modules + export PATH=$PWD/node_modules/.bin:$PATH + ./node_modules/.bin/react-scripts build + + mkdir -p $out + cd .. + + runHook postBuild + ''; + + installPhase = '' + cp -r web/build/* $out + ''; + + meta = with lib; { + description = "Assets needed for Tilt"; + homepage = "https://tilt.dev/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anton-dessiatov ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/binary.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/binary.nix new file mode 100644 index 0000000000..d326f0f92e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/binary.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, src, version +, tilt-assets +}: + +buildGoModule rec { + pname = "tilt"; + /* Do not use "dev" as a version. If you do, Tilt will consider itself + running in development environment and try to serve assets from the + source tree, which is not there once build completes. */ + inherit src version; + + vendorHash = null; + + subPackages = [ "cmd/tilt" ]; + + ldflags = [ "-X main.version=${version}" ]; + + preBuild = '' + mkdir -p pkg/assets/build + cp -r ${tilt-assets}/* pkg/assets/build/ + ''; + + meta = { + description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; + homepage = "https://tilt.dev/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anton-dessiatov ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index dd95c6d939..646f0c9a0a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,32 +1,20 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ fetchFromGitHub +, callPackage }: +let args = rec { + /* Do not use "dev" as a version. If you do, Tilt will consider itself + running in development environment and try to serve assets from the + source tree, which is not there once build completes. */ + version = "0.33.6"; -buildGoModule rec { - pname = "tilt"; - /* Do not use "dev" as a version. If you do, Tilt will consider itself - running in development environment and try to serve assets from the - source tree, which is not there once build completes. */ - version = "0.33.6"; + src = fetchFromGitHub { + owner = "tilt-dev"; + repo = "tilt"; + rev = "v${version}"; + hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; + }; + }; - src = fetchFromGitHub { - owner = "tilt-dev"; - repo = "tilt"; - rev = "v${version}"; - hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; - }; + tilt-assets = callPackage ./assets.nix args; +in callPackage ./binary.nix (args // { inherit tilt-assets; }) - vendorHash = null; - - subPackages = [ "cmd/tilt" ]; - - ldflags = [ "-X main.version=${version}" ]; - - meta = { - description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; - homepage = "https://tilt.dev/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ anton-dessiatov ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix index 02e6ffa1a3..8ea2defea9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo121Module rec { pname = "timoni"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-DzJNNikvODP3v1jgQLbFcXEhcFfTeIYR6qHhUzEP/Ns="; + hash = "sha256-kMqQiFicuKa0j/li9UmitEeSof0vLlgGR4AMtJksROs="; }; - vendorHash = "sha256-lRZFRnft8vEntVxiLOBcR00FP8AXexLyo3h2LCNWN00="; + vendorHash = "sha256-tAqmTl+5tScXOaYWEvMs2RPTdyLTAemQN1VqOQGe6lU="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index af0642c14c..10f8e7a9f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "vcluster"; - version = "0.15.6"; + version = "0.16.4"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-frYE/0PcVNlk+hwSCoPwSbL2se4dEP9g6aLDMGdn6x8="; + hash = "sha256-LL+fikMTg79d9goFEkmxwYvF9E0GrPNTLmFy2tfnQtg="; }; vendorHash = null; @@ -17,7 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" "-w" + "-X main.version=${version}" + "-X main.goVersion=${lib.getVersion go}" + ]; # Test is disabled because e2e tests expect k8s. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 9092dfb307..f15e6ac474 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.11.1"; + version = "1.12.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4="; + sha256 = "sha256-qa/Ic3qi+CAW9h4W2G8x6UdxPC2SkrMLMJEcxN7eDGY="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-WkJk+46+9U4TegDnGtQ+EoqqV/D7githz2pJvxCbV4c="; + vendorHash = "sha256-TisGl0kM4vMVh9vk6/mRVOaRm9yoTwKkPedTPqdySDY="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/default.nix index a1a72a6988..d71e9fb7fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/default.nix @@ -10,7 +10,7 @@ openssl, parted, procps, # for pidof, - python3, + python39, # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 shadow, # for useradd, usermod util-linux, # for (u)mount, fdisk, sfdisk, mkswap }: @@ -19,7 +19,7 @@ let inherit (lib) makeBinPath; in -python3.pkgs.buildPythonPackage rec { +python39.pkgs.buildPythonPackage rec { pname = "waagent"; version = "2.8.0.11"; src = fetchFromGitHub { @@ -28,9 +28,14 @@ python3.pkgs.buildPythonPackage rec { rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb"; sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; }; + patches = [ + # Suppress the following error when waagent try to configure sshd: + # Read-only file system: '/etc/ssh/sshd_config' + ./dont-configure-sshd.patch + ]; doCheck = false; - buildInputs = with python3.pkgs; [ distro ]; + buildInputs = with python39.pkgs; [ distro ]; runtimeDeps = [ findutils gnugrep diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch new file mode 100644 index 0000000000..9068f4a3dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch @@ -0,0 +1,23 @@ +From 383e7c826906baedcd12ae7c20a4a5d4b32b104a Mon Sep 17 00:00:00 2001 +From: "Yang, Bo" +Date: Wed, 8 Nov 2023 23:08:07 +0000 +Subject: [PATCH] Don't configure sshd + +--- + azurelinuxagent/pa/provision/default.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/azurelinuxagent/pa/provision/default.py b/azurelinuxagent/pa/provision/default.py +index 91fe04edab..48edf01490 100644 +--- a/azurelinuxagent/pa/provision/default.py ++++ b/azurelinuxagent/pa/provision/default.py +@@ -237,9 +237,6 @@ def config_user_account(self, ovfenv): + self.osutil.conf_sudoer(ovfenv.username, + nopasswd=ovfenv.user_password is None) + +- logger.info("Configure sshd") +- self.osutil.conf_sshd(ovfenv.disable_ssh_password_auth) +- + self.deploy_ssh_pubkeys(ovfenv) + self.deploy_ssh_keypairs(ovfenv) + diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix index f47bd051c7..336d840eb5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MJX9OrfvzGwrJria1Ki6QHprvoDLxBRPCnKRqPdnbUw="; + sha256 = "sha256-H/l/b6yPoNZeBG1TPc9PCBpZg4ETnF9FmYnbRmKl8c8="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-3woVoEh+bU8QOzOEk7hnxxVe0mlPozqUDuP0Rn/9J6k="; + vendorHash = "sha256-le34zvlgquxOv0xdOPfpf7/ZuoPd9MEfp8Gshigvtas="; subPackages = [ "cmd/gitops" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 3b165ab6fa..9895729c29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.263"; + version = "1.2.269"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-eWiUn6v7XZZH7rudvCMLa3rUBmMsiSUKcwoDCFxRlFE="; + hash = "sha256-LUHENANM+3wGftTVXaQsGykKayzEAIQ3TQ5qM77TJVA="; }; - vendorHash = "sha256-0bxM0Y4K6wxg6Ka1A9MusptiSMshTUWJItXoVDpo7lI="; + vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index eeb97e1b0f..3099df6e9f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.29.2"; + version = "0.30.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-eSKoh1Ab2rzpOOHRi+FZ92ic92Q6bFpu1jYIPhmoqQc="; + hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc="; }; - vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU="; + vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw="; proxyVendor = true; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix index b06de9cdc6..92319f1734 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-AcU/1/TBS0nT7bXYguM8KI4mBUQzvSTVwuQkzq3t3EY="; + hash = "sha256-AmlDOtV6uQtrscvIgK5kz6PldA7a1XrVuwO4DCFZeno="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-GVSI3yv7YzW2QPC26gA2C3TqjBnTxyiPzmW+hsGGdaQ="; + vendorHash = "sha256-v1DoRZuv6k6UIgPirXMbvunttn1aBLbTc+GdtdKquDk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix index 78f9b11291..334818d59f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-9eMcbmRCr92ebJsPTyDFnwGn3gsRpR7aAkzV6Qfntgo="; + hash = "sha256-glCZdaIsV8bim3iQuFKlIVmDm/YhDohVC6wIYvQuJAM="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-ikgD17+lnKpxCzrIkOXOq332X48qEdSWXIIRoq76fB4="; + vendorHash = "sha256-tDaFceewyNW19HMmfdDC2qL12hUCw5TUa3TX5TXfvVo="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/discordo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/discordo/default.nix index 12d9d56076..87f9c4bbc1 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 = "unstable-2023-09-16"; + version = "unstable-2023-10-22"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "d3cdbe480392dbab6ddc099d7d880378f6a13f26"; - hash = "sha256-noCwPhp5/wYt28TM1vvsXb0ewRMV/cMzu/zUD2b0YV4="; + rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5"; + hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0="; }; - vendorHash = "sha256-5Y+SP374Bd8F2ABKEKRhTcGNhsFM77N5oC5wRN6AzKk="; + vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 83544b7f9a..e9b43a6aa1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.4.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4TQAtqM1ruhv3W1SBHAd1WVJKa7dvGLHlxVqazc+uk="; + sha256 = "sha256-CyQKQNuCJLtm73ngrGtUmVUfiseXEp2fcKVGvQ1ET5A="; }; - vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI="; + vendorHash = "sha256-Q8Xw2vuxiYpkY0/gQlUVWO7WQszv2x1cvbV03Wi1GNg="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/cli.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/cli.nix index c6b0baa9d3..38c5220563 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/cli.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/cli.nix @@ -5,14 +5,14 @@ , fetchurl , python3 , dropbox -, gtk3 +, gtk4 , gnome , gdk-pixbuf , gobject-introspection }: let - version = "2020.03.04"; + version = "2023.09.06"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -23,16 +23,12 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k"; + hash = "sha256-kZMwj8Fn8Hf58C57wE025TlmiSs5TaKMGEzvb2QjgSw="; }; strictDeps = true; patches = [ - # Fix extension for Nautilus 43 - # https://github.com/dropbox/nautilus-dropbox/pull/105 - ./nautilus-43.patch - (substituteAll { src = ./fix-cli-paths.patch; inherit dropboxd; @@ -54,12 +50,12 @@ stdenv.mkDerivation { buildInputs = [ python3 - gtk3 + gtk4 gnome.nautilus ]; configureFlags = [ - "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extension-4" ]; makeFlags = [ @@ -70,6 +66,8 @@ stdenv.mkDerivation { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; license = lib.licenses.gpl3Plus; + mainProgram = "dropbox"; + maintainers = with lib.maintainers; [ eclairevoyant ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix index cf2edf7673..fd48bc86a9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "111.3.447"; + version = "185.4.6054"; arch = { x86_64-linux = "x86_64"; @@ -84,7 +84,7 @@ buildFHSEnv { description = "Online stored folders (daemon version)"; homepage = "http://www.dropbox.com/"; license = licenses.unfree; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ eclairevoyant ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; mainProgram = "dropbox"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/nautilus-43.patch b/third_party/nixpkgs/pkgs/applications/networking/dropbox/nautilus-43.patch deleted file mode 100644 index b4b5578431..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/nautilus-43.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 025289c..42b49fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) - #AC_PROG_INTLTOOL([0.29]) - - # Dependency checks --NAUTILUS_REQUIRED=2.16.0 -+NAUTILUS_REQUIRED=43.rc - GLIB_REQUIRED=2.14.0 - - # Used programs -@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then - AC_MSG_ERROR(you need to have pkgconfig installed !) - fi - --PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) -+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED) - PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) -+PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0) -+ -+AC_SUBST(GTK_CFLAGS) - - AC_PATH_PROG([PYTHON3], [python3]) - -@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory]) - if test -n "$with_nautilus_extension_dir"; then - NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir - else -- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` -+ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4` - fi - if test -z "$NAUTILUS_EXTENSION_DIR"; then -- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' -+ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4' - fi - - AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) -diff --git a/src/Makefile.am b/src/Makefile.am -index 15d6687..c521ec5 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(NAUTILUS_CFLAGS) \ -+ $(GTK_CFLAGS) \ - $(GLIB_CFLAGS) - - if DEBUG -diff --git a/src/dropbox.c b/src/dropbox.c -index 0d59559..8162aa9 100644 ---- a/src/dropbox.c -+++ b/src/dropbox.c -@@ -27,9 +27,6 @@ - - #include - --#include --#include -- - #include "nautilus-dropbox.h" - - static GType type_list[1]; -@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) { - nautilus_dropbox_register_type (module); - type_list[0] = NAUTILUS_TYPE_DROPBOX; - -- dropbox_use_nautilus_submenu_workaround -- = (NAUTILUS_VERSION_MAJOR < 2 || -- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22)); - dropbox_use_operation_in_progress_workaround = TRUE; - } - -diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c -index c75ccbf..b9c10b4 100644 ---- a/src/nautilus-dropbox.c -+++ b/src/nautilus-dropbox.c -@@ -37,9 +37,7 @@ - #include - #include - --#include --#include --#include -+#include - - #include "g-util.h" - #include "dropbox-command-client.h" -@@ -49,7 +47,7 @@ - static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; - gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; - --gboolean dropbox_use_nautilus_submenu_workaround; -+ - gboolean dropbox_use_operation_in_progress_workaround; - - static GType dropbox_type = 0; -@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options, - g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); - } - -- /* taken from nautilus-file-repairer (http://repairer.kldp.net/): -- * this code is a workaround for a bug of nautilus -- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ -- if (dropbox_use_nautilus_submenu_workaround) { -- toret = g_list_append(toret, item); -- } -- - g_object_unref(item); - g_string_free(new_action_string, TRUE); - ret++; -@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud) - - static GList * - nautilus_dropbox_get_file_items(NautilusMenuProvider *provider, -- GtkWidget *window, - GList *files) - { - /* -@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response) - - gchar **emblem_paths_list; - int i; -- -- GtkIconTheme *theme = gtk_icon_theme_get_default(); -+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); - - if (emblem_paths_response && - (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) { - for (i = 0; emblem_paths_list[i] != NULL; i++) { - if (emblem_paths_list[i][0]) -- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]); -+ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]); - } - } - g_hash_table_unref(emblem_paths_response); -@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response) - goto exit; - - // We need to remove the old paths. -- GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); - gchar ** paths; -- gint path_count; -+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); - -- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); -+ paths = gtk_icon_theme_get_search_path(theme); - - gint i, j, out = 0; - gboolean found = FALSE; -- for (i = 0; i < path_count; i++) { -+ for (i = 0; paths[i] != NULL; i++) { - gboolean keep = TRUE; - for (j = 0; emblem_paths_list[j] != NULL; j++) { - if (emblem_paths_list[j][0]) { -@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response) - accomodate the changes */ - if (found) { - paths[out] = NULL; /* Clear the last one */ -- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out); -+ gtk_icon_theme_set_search_path(theme, (const gchar **)paths); - } - - g_strfreev(paths); -@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) { - - - static void --nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) { -+nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { - iface->get_file_items = nautilus_dropbox_get_file_items; - return; - } - - static void --nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) { -+nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) { - iface->update_file_info = nautilus_dropbox_update_file_info; - iface->cancel_update = nautilus_dropbox_cancel_update; - return; -diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h -index 65734be..44faa27 100644 ---- a/src/nautilus-dropbox.h -+++ b/src/nautilus-dropbox.h -@@ -27,7 +27,7 @@ - #include - #include - --#include -+#include - - #include "dropbox-command-client.h" - #include "nautilus-dropbox-hooks.h" diff --git a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix index 7085ac5f38..9e239627b0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst"; description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix index 968e8dd84a..dd351ce1a2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/fluent-reader/default.nix @@ -2,11 +2,11 @@ let pname = "fluent-reader"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage"; - hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU="; + hash = "sha256-2oLV9SWBNt0j1WAS6j4dobsUEpptjTubpr8pdOcIOY4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix index 70da2b8796..0c97ad68b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b/A76f9/pFDdG1ZiHQnJrxYmlvFIjhZZhTIGl09cMcg="; + sha256 = "sha256-bjPmhNJFkN0N0Mx3Q4RJuNfeqFy9v8KphiAU1WyKCo4="; }; - vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; + vendorHash = "sha256-jYrPsVagGgvpQ9Zj3o2kB82xgw/yaJS9BXxuqMkNjEA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 95c274ab88..da654a6bdd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-R3fw5GLQUYZUX1kH6e0IRQ/I/IsFTOK6aP5h5QVU0Ps="; + sha256 = "sha256-tgXBsby9ML+m4b2hvLXHIb552o5x6l3kO8YTeZRCExI="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix index 5a7dc544bf..6b96332a6f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-seOokeFbjCuwUsB6MbrxaeTlPUzwNzkJPbByM9/oDDU="; + sha256 = "sha256-hGMO3uqUlh5h4HYmJiFdfZZw+y1yjprlSadYvix2LIU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix index 8da9a49f90..35ca72c5ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { cat >test-runner <=5 yet # https://github.com/NixOS/nixpkgs/issues/258504 + # https://github.com/Flexget/Flexget/issues/3847 packageOverrides = self: super: { transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { version = "4.3.1"; @@ -23,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.11"; + version = "3.9.18"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -31,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-0ONjRIMSfHKvaO05hhurfnS/waNNRZEVq7BodeV00kU="; + hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix index 470dc77cad..0727848f8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix @@ -15,9 +15,16 @@ , makeDesktopItem }: +let + wxGTK32' = wxGTK32.overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ + "--disable-exceptions" + ]; + }); +in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.0"; + version = "13.1"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -26,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-E0lYKNCVtkdnhI3NPx8828Fz6sfmIm18KSC0NSWgHfQ="; + hash = "sha256-xuJQOegmZHPsCmJU2akTD4nQh05M+rpnjQVEer33SCk="; }; sourceRoot = "."; @@ -63,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libssh2 openssl - wxGTK32 + wxGTK32' ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/geph/Cargo.lock new file mode 100644 index 0000000000..90ac74fa58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/Cargo.lock @@ -0,0 +1,4451 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher", +] + +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" + +[[package]] +name = "async-channel" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +dependencies = [ + "concurrent-queue 1.2.2", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-dup" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" +dependencies = [ + "futures-io", + "simple-mutex", +] + +[[package]] +name = "async-executor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +dependencies = [ + "async-task", + "concurrent-queue 1.2.2", + "fastrand", + "futures-lite", + "once_cell", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3ca4f8ff117c37c278a2f7415ce9be55560b846b5bc4412aaa5d29c1c3dae2" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-global-executor" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-mutex", + "blocking", + "futures-lite", + "num_cpus", + "once_cell", +] + +[[package]] +name = "async-h1" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5142de15b549749cce62923a50714b0d7b77f5090ced141599e78899865451" +dependencies = [ + "async-channel", + "async-dup", + "async-std", + "byte-pool", + "futures-core", + "http-types", + "httparse", + "lazy_static", + "log", + "pin-project", +] + +[[package]] +name = "async-io" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +dependencies = [ + "concurrent-queue 1.2.2", + "futures-lite", + "libc", + "log", + "once_cell", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "winapi", +] + +[[package]] +name = "async-lock" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-mutex" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-net" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5373304df79b9b4395068fb080369ec7178608827306ce4d081cba51cac551df" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-oneshot" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f4770cbbff928c30a991de67fb3976f44d8e3e202f8c79ef91b47006e04904" +dependencies = [ + "futures-micro", +] + +[[package]] +name = "async-process" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692" +dependencies = [ + "async-io", + "blocking", + "cfg-if 1.0.0", + "event-listener", + "futures-lite", + "libc", + "once_cell", + "signal-hook", + "winapi", +] + +[[package]] +name = "async-sse" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" +dependencies = [ + "async-channel", + "async-std", + "http-types", + "log", + "memchr", + "pin-project-lite 0.1.12", +] + +[[package]] +name = "async-std" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "num_cpus", + "once_cell", + "pin-project-lite 0.2.7", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "atk" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" +dependencies = [ + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "atomic-waker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" + +[[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.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091bcdf2da9950f96aa522681ce805e6857f6ca8df73833d35736ab2dc78e152" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +dependencies = [ + "async-channel", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "once_cell", +] + +[[package]] +name = "bumpalo" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" + +[[package]] +name = "byte-pool" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca" +dependencies = [ + "crossbeam-queue", + "stable_deref_trait", +] + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" + +[[package]] +name = "cairo-rs" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +dependencies = [ + "glib-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + +[[package]] +name = "cc" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" + +[[package]] +name = "cfg-expr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" +dependencies = [ + "smallvec", +] + +[[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "chunked_transfer" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" + +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + +[[package]] +name = "cocoa" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.2", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation 0.9.2", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "concurrent-queue" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + +[[package]] +name = "const_fn" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "aes-gcm", + "base64", + "hkdf", + "hmac", + "percent-encoding 2.1.0", + "rand 0.8.5", + "sha2", + "time", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +dependencies = [ + "core-foundation-sys 0.8.3", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core-graphics" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" +dependencies = [ + "bitflags", + "core-foundation 0.7.0", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86" +dependencies = [ + "bitflags", + "core-foundation 0.9.2", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation 0.9.2", + "foreign-types", + "libc", +] + +[[package]] +name = "core-video-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" +dependencies = [ + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "core-graphics 0.19.2", + "libc", + "objc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +dependencies = [ + "libc", +] + +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebb3d1683412e9be6a15533314f00ec223c0762c522a3f77f048b265aab4470c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422f23e724af1240ec469ea1e834d87a4b59ce2efe2c6a96256b0c47e2fd86aa" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "ctor" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi", +] + +[[package]] +name = "curl-sys" +version = "0.4.59+curl-7.86.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.4", +] + +[[package]] +name = "deflate" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f95bf05dffba6e6cce8dfbb30def788154949ccd9aed761b472119c21e01c70" +dependencies = [ + "adler32", +] + +[[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 = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "embed-resource" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +dependencies = [ + "cc", + "rustc_version 0.4.0", + "toml 0.7.5", + "vswhom", + "winreg", +] + +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[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 = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "event-listener" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "field-offset" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset", + "rustc_version 0.3.3", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.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", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + +[[package]] +name = "futures-channel" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" + +[[package]] +name = "futures-executor" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.11.2", +] + +[[package]] +name = "futures-io" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite 0.2.7", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +dependencies = [ + "autocfg", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "futures-micro" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9325be55c5581082cd110294fa988c1f920bc573ec370ef201e33c469a95a" + +[[package]] +name = "futures-sink" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" + +[[package]] +name = "futures-task" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" + +[[package]] +name = "futures-util" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +dependencies = [ + "autocfg", + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite 0.2.7", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "gdk" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" +dependencies = [ + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "gdk-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "pango-sys", + "pkg-config", + "system-deps 3.2.0", +] + +[[package]] +name = "generator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.32.0", +] + +[[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 = "gephgui-wry" +version = "0.1.0" +dependencies = [ + "anyhow", + "bincode", + "dirs", + "embed-resource", + "flume", + "is_elevated", + "isahc", + "mime-sniffer", + "mime_guess", + "nanorpc", + "native-dialog", + "once_cell", + "open", + "parking_lot 0.11.2", + "png", + "rand 0.8.5", + "rfd", + "runas", + "rust-embed", + "semver 1.0.14", + "serde", + "serde_json", + "serde_yaml", + "slab", + "smol", + "smol-timeout", + "smolscale", + "tao", + "tap", + "tempfile", + "tide", + "tracing", + "tracing-subscriber 0.2.25", + "ureq", + "webbrowser", + "which 4.2.2", + "winres", + "wry", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" + +[[package]] +name = "gio" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys 0.14.0", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" +dependencies = [ + "glib-sys 0.10.1", + "gobject-sys 0.10.0", + "libc", + "system-deps 1.3.2", + "winapi", +] + +[[package]] +name = "gio-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" +dependencies = [ + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "system-deps 3.2.0", + "winapi", +] + +[[package]] +name = "glib" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "once_cell", + "smallvec", +] + +[[package]] +name = "glib-macros" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate 1.1.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" +dependencies = [ + "libc", + "system-deps 1.3.2", +] + +[[package]] +name = "glib-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +dependencies = [ + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gobject-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" +dependencies = [ + "glib-sys 0.10.1", + "libc", + "system-deps 1.3.2", +] + +[[package]] +name = "gobject-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +dependencies = [ + "glib-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "gtk" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c" +dependencies = [ + "atk", + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "pango-sys", + "system-deps 3.2.0", +] + +[[package]] +name = "gtk3-macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate 1.1.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hkdf" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac", + "digest", +] + +[[package]] +name = "http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +dependencies = [ + "bytes", + "fnv", + "itoa 0.4.8", +] + +[[package]] +name = "http-client" +version = "6.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "dashmap 4.0.2", + "http-types", + "log", +] + +[[package]] +name = "http-types" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", + "async-std", + "base64", + "cookie", + "futures-lite", + "infer", + "pin-project-lite 0.2.7", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs", + "serde_urlencoded", + "url 2.2.2", +] + +[[package]] +name = "httparse" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[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.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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +[[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 = "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 = "is_elevated" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5299060ff5db63e788015dcb9525ad9b84f4fd9717ed2cbdeba5018cbf42f9b5" +dependencies = [ + "winapi", +] + +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel", + "castaway", + "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "event-listener", + "futures-lite", + "http", + "log", + "mime", + "once_cell", + "polling", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url 2.2.2", + "waker-fn", +] + +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "javascriptcore-rs" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca9c7d1445bba2889672fbadc16c3d5007bfdcf0a15a18a3a50fe9fab2c7427" +dependencies = [ + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f46ada8a08dcd75a10afae872fbfb51275df4a8ae0d46b8cc7c708f08dd2998" +dependencies = [ + "libc", +] + +[[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.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +dependencies = [ + "wasm-bindgen", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libnghttp2-sys" +version = "0.1.7+1.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libz-sys" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[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", + "value-bag", +] + +[[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", + "tracing", + "tracing-subscriber 0.3.6", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime-sniffer" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e98f7cfbbaf64674624e2aa35327d75e3de8e4d1b2555ef70dcf0c107a95490" +dependencies = [ + "mime", + "url 1.7.2", +] + +[[package]] +name = "mime_guess" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "nanorpc" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81076363e771721de9b7afffdce190cfcbdeed60bd2ce5544ddf00c25d9cfb87" +dependencies = [ + "anyhow", + "async-trait", + "fastrand", + "futures-lite", + "log", + "nanorpc-derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "nanorpc-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5018dd1f05b88bb28d0bbc0705a5c837477894f1f31c6112a6a90db5d133b030" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "native-dialog" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "716291d444588158221ce5b7836ead33e0d1e053157735d277212eff029cb7d6" +dependencies = [ + "cocoa", + "dirs-next", + "objc", + "objc-foundation", + "objc_id", + "once_cell", + "raw-window-handle 0.3.3", + "thiserror", + "wfd", + "which 4.2.2", + "winapi", +] + +[[package]] +name = "ndk" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d64d6af06fde0e527b1ba5c7b79a6cc89cfc46325b0b2887dffe8f70197e0c3c" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-glue" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e9e94628f24e7a3cb5b96a2dc5683acd9230bf11991c2a1677b87695138420" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" +dependencies = [ + "darling", + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ndk-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" +dependencies = [ + "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" +dependencies = [ + "proc-macro-crate 1.1.0", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "open" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16814a067484415fda653868c9be0ac5f2abd2ef5d951082a5f2fe1b3662944" +dependencies = [ + "is-wsl", + "pathdiff", +] + +[[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.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "pango" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +dependencies = [ + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "libc", + "system-deps 3.2.0", +] + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[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" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.4", +] + +[[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", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.42.0", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[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 = "pin-project" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" + +[[package]] +name = "png" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c845088517daa61e8a57eee40309347cea13f273694d1385c553e7a57127763b" +dependencies = [ + "bitflags", + "crc32fast", + "deflate", + "encoding", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "winapi", +] + +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml 0.5.8", +] + +[[package]] +name = "proc-macro-crate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +dependencies = [ + "thiserror", + "toml 0.5.8", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" +dependencies = [ + "libc", +] + +[[package]] +name = "raw-window-handle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" +dependencies = [ + "cty", +] + +[[package]] +name = "redox_syscall" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +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.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rfd" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0c25b610bf37d9874ff224ab2791ff2272bedeb5638a2dca8b18e1270ed69b" +dependencies = [ + "block", + "dispatch", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "gtk-sys", + "js-sys", + "lazy_static", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle 0.4.3", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.29.0", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "route-recognizer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e" + +[[package]] +name = "runas" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a620b0994a180cdfa25c0439e6d58c0628272571501880d626ffff58e96a0799" +dependencies = [ + "cc", + "which 3.1.1", +] + +[[package]] +name = "rust-embed" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be44a6694859b7cfc955699935944a6844aa9fe416aeda5d40829e3e38dfee6" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f567ca01565c50c67b29e535f5f67b8ea8aeadaeed16a88f10792ab57438b957" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 1.0.109", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6116e7ab9ea963f60f2f20291d8fcf6c7273192cdd7273b3c80729a9605c97b2" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[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 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.14", +] + +[[package]] +name = "rustls" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5ac6078ca424dc1d3ae2328526a76787fecc7f8011f520e3276730e711fc95" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[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 = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +dependencies = [ + "itoa 1.0.4", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding 2.1.0", + "serde", + "thiserror", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +dependencies = [ + "form_urlencoded", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" +dependencies = [ + "indexmap 1.9.2", + "itoa 1.0.4", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + +[[package]] +name = "sha2" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +dependencies = [ + "block-buffer", + "cfg-if 1.0.0", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[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 = "signal-hook" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[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 = "simple-mutex" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" +dependencies = [ + "event-listener", +] + +[[package]] +name = "slab" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" + +[[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel", + "futures-core", + "futures-io", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smol" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "smol-timeout" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "847d777e2c6c166bad26264479e80a9820f3d364fcb4a0e23cd57bbfa8e94961" +dependencies = [ + "async-io", + "pin-project-lite 0.1.12", +] + +[[package]] +name = "smolscale" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b1adada57639d497c1e8437ac6c3a3fd91bf32b367ae50e6198d127cf9736c" +dependencies = [ + "anyhow", + "async-channel", + "async-executor", + "async-global-executor", + "async-io", + "async-oneshot", + "async-task", + "backtrace", + "cache-padded", + "concurrent-queue 2.0.0", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils", + "dashmap 5.4.0", + "event-listener", + "fastrand", + "flume", + "futures-intrusive", + "futures-lite", + "log", + "num_cpus", + "once_cell", + "parking_lot 0.12.1", + "pin-project-lite 0.2.7", + "rustc-hash", + "scopeguard", + "slab", + "smallvec", + "st3", + "tabwriter", + "thread_local", + "waker-fn", +] + +[[package]] +name = "socket2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "soup-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7adf08565630bbb71f955f11f8a68464817ded2703a3549747c235b58a13e" +dependencies = [ + "bitflags", + "gio-sys 0.10.1", + "glib-sys 0.10.1", + "gobject-sys 0.10.0", + "libc", + "pkg-config", + "system-deps 1.3.2", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +dependencies = [ + "lock_api", +] + +[[package]] +name = "st3" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edacd49b8f40b3357c6af1bf2ed726f3b7596369a2f0f17d30aa98513f0003d6" +dependencies = [ + "cache-padded", + "loom", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "strum" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" + +[[package]] +name = "strum" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" + +[[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 1.0.109", +] + +[[package]] +name = "strum_macros" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "sval" +version = "1.0.0-alpha.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" + +[[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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" +dependencies = [ + "heck", + "pkg-config", + "strum 0.18.0", + "strum_macros 0.18.0", + "thiserror", + "toml 0.5.8", + "version-compare 0.0.10", +] + +[[package]] +name = "system-deps" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" +dependencies = [ + "anyhow", + "cfg-expr", + "heck", + "itertools", + "pkg-config", + "strum 0.21.0", + "strum_macros 0.21.1", + "thiserror", + "toml 0.5.8", + "version-compare 0.0.11", +] + +[[package]] +name = "tabwriter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "tao" +version = "0.5.2" +source = "git+https://github.com/tauri-apps/tao?branch=next#97cd0497ae827903f7d67aa1c991a77a397c9cb8" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation 0.9.2", + "core-graphics 0.22.2", + "core-video-sys", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "glib-sys 0.14.0", + "gtk", + "instant", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-glue", + "ndk-sys", + "objc", + "parking_lot 0.11.2", + "raw-window-handle 0.3.3", + "scopeguard", + "serde", + "unicode-segmentation", + "webview2-com-sys", + "windows 0.19.0", + "x11-dl", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "rand 0.8.5", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[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.18", +] + +[[package]] +name = "thread_local" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tide" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0" +dependencies = [ + "async-h1", + "async-sse", + "async-std", + "async-trait", + "futures-util", + "http-client", + "http-types", + "kv-log-macro", + "log", + "pin-project-lite 0.2.7", + "route-recognizer", + "serde", + "serde_json", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.109", +] + +[[package]] +name = "tinyvec" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +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 = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.7", + "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", + "quote", + "syn 1.0.109", +] + +[[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-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.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +dependencies = [ + "ansi_term", + "chrono", + "lazy_static", + "matchers 0.0.1", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf" +dependencies = [ + "ansi_term", + "lazy_static", + "matchers 0.1.0", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "typenum" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd912a3d096959150c4d71ac752e13f1683085922658c205b89b40fe8ebe07f" +dependencies = [ + "base64", + "chunked_transfer", + "log", + "once_cell", + "rustls", + "url 2.2.2", + "webpki", + "webpki-roots", +] + +[[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.3", + "matches", + "percent-encoding 2.1.0", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "sval", + "version_check", +] + +[[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.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "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.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" + +[[package]] +name = "web-sys" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecad156490d6b620308ed411cfee90d280b3cbd13e189ea0d3fada8acc89158a" +dependencies = [ + "web-sys", + "widestring", + "winapi", +] + +[[package]] +name = "webkit2gtk" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e47b7f870883fc21612d2a51b74262f7f2cc5371f1621370817292a35300a9" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys 0.14.0", + "glib", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66ccc9f0cb4de7c3b92376a5bf64e7ddffb33852f092721731a039ec38dda98" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup-sys", + "system-deps 3.2.0", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +dependencies = [ + "webpki", +] + +[[package]] +name = "webview2-com" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2294dee38668da0d71019097dddc6cef525fde7aa4784243dd83f0752e08aa5" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.19.0", +] + +[[package]] +name = "webview2-com-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eba35fdbb8fbc8de7e7479532a356dbbf2754d8a6e9c9fbfa430896cbb1ca89" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14690dcb8b57c5238c4502cfc321f858fa1306edd4109e8e1d7ddee0c29b06a5" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.19.0", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "wfd" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "which" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +dependencies = [ + "failure", + "libc", +] + +[[package]] +name = "which" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +dependencies = [ + "either", + "lazy_static", + "libc", +] + +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + +[[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" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef84dd25f4c69a271b1bba394532bf400523b43169de21dfc715e8f8e491053d" +dependencies = [ + "const-sha1", + "windows_gen", + "windows_macros", +] + +[[package]] +name = "windows" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", +] + +[[package]] +name = "windows" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" +dependencies = [ + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", +] + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[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.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_gen" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7bb21b8ff5e801232b72a6ff554b4cc0cef9ed9238188c3ca78fe3968a7e5d" +dependencies = [ + "windows_quote", + "windows_reader", +] + +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[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.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_macros" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5566b8c51118769e4a9094a688bf1233a3f36aacbfc78f3b15817fe0b6e0442f" +dependencies = [ + "syn 1.0.109", + "windows_gen", + "windows_quote", + "windows_reader", +] + +[[package]] +name = "windows_quote" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af8236a9493c38855f95cdd11b38b342512a5df4ee7473cffa828b5ebb0e39c" + +[[package]] +name = "windows_reader" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8d5cf83fb08083438c5c46723e6206b2970da57ce314f80b57724439aaacab" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[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.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winnow" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if 1.0.0", + "winapi", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.8", +] + +[[package]] +name = "wry" +version = "0.12.2" +source = "git+https://github.com/tauri-apps/wry?rev=e056fb2a15e29de1b8ed85a548cfeb1f85031357#e056fb2a15e29de1b8ed85a548cfeb1f85031357" +dependencies = [ + "cocoa", + "core-graphics 0.22.2", + "gdk", + "gio", + "glib", + "gtk", + "http", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "tao", + "thiserror", + "url 2.2.2", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.19.0", +] + +[[package]] +name = "x11-dl" +version = "2.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59" +dependencies = [ + "lazy_static", + "libc", + "pkg-config", +] diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix index 36de704dbc..4ebbc3370e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/geph/default.nix @@ -2,19 +2,23 @@ , stdenvNoCC , rustPlatform , fetchFromGitHub -, buildNpmPackage +, buildGoModule +, makeWrapper +, nodePackages +, esbuild +, jq +, moreutils , perl , pkg-config , glib , webkitgtk -, libappindicator-gtk3 , libayatana-appindicator , cairo , openssl }: let - version = "4.7.8"; + version = "4.10.1"; geph-meta = with lib; { description = "A modular Internet censorship circumvention system designed specifically to deal with national filtering."; homepage = "https://geph.io"; @@ -31,10 +35,10 @@ in owner = "geph-official"; repo = pname; rev = "v${version}"; - hash = "sha256-DVGbLyFgraQMSIUAqDehF8DqbnvcaeWbuLVgiSQY3KE="; + hash = "sha256-e0Pdg4pQ5s1wvTnFm1rKuAwkYtCtu2Uacd7yH3EHeCo="; }; - cargoHash = "sha256-uBq6rjUnKEscwhu60HEZffLvuXcArz+AiR52org+qKw="; + cargoHash = "sha256-Kwc+EOH2pJJVvIcTUfL39Xrv/7YmTPUDge7mmjDs9pQ="; nativeBuildInputs = [ perl ]; @@ -50,52 +54,91 @@ in src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; - rev = "85a55bfc2f4314d9c49608f252080696b1f8e2a9"; - hash = "sha256-id/sfaQsF480kUXg//O5rBIciuuhDuXY19FQe1E3OQs="; + rev = "4163e12188dd679ba548e127fc9771cb5e87bab0"; + hash = "sha256-wBvhfgp5sZTRCBR9HZqs1G0VaIt9DW2e9CWMAp/T5WI="; fetchSubmodules = true; }; - gephgui = buildNpmPackage { - pname = "gephgui"; - inherit version src; + pnpm-deps = stdenvNoCC.mkDerivation { + pname = "${pname}-pnpm-deps"; + inherit src version; - sourceRoot = "${src.name}/gephgui-wry/gephgui"; + sourceRoot = "source/gephgui-wry/gephgui"; - postPatch = "ln -s ${./package-lock.json} ./package-lock.json"; - - npmDepsHash = "sha256-5y6zpMF4M56DiWVhMvjJGsYpVdlJSoWoWyPgLc7hJoo="; + nativeBuildInputs = [ + jq + moreutils + nodePackages.pnpm + ]; installPhase = '' - runHook preInstall + export HOME=$(mktemp -d) + pnpm config set store-dir $out + pnpm install --ignore-scripts - mkdir -p $out - mv dist $out - - runHook postInstall + # Remove timestamp and sort the 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-OKPx5xRI7DWd6m31nYx1biP0k6pcZ7fq7dfVlHda4O0="; }; - gephgui-wry = rustPlatform.buildRustPackage rec { + gephgui-wry = rustPlatform.buildRustPackage { pname = "gephgui-wry"; inherit version src; - sourceRoot = "${src.name}/gephgui-wry"; + sourceRoot = "source/gephgui-wry"; - cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tao-0.5.2" = "sha256-HyQyPRoAHUcgtYgaAW7uqrwEMQ45V+xVSxmlAZJfhv0="; + "wry-0.12.2" = "sha256-kTMXvignEF3FlzL0iSlF6zn1YTOCpyRUDN8EHpUS+yI="; + }; + }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + nodePackages.pnpm + makeWrapper + ]; buildInputs = [ glib webkitgtk - libappindicator-gtk3 libayatana-appindicator cairo openssl ]; + ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.15.10"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + })}"; + preBuild = '' - ln -s ${gephgui}/dist ./gephgui + cd gephgui + export HOME=$(mktemp -d) + pnpm config set store-dir ${pnpm-deps} + pnpm install --ignore-scripts --offline + chmod -R +w node_modules + pnpm rebuild + pnpm build + cd .. ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json b/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json deleted file mode 100644 index 1523705c18..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/geph/package-lock.json +++ /dev/null @@ -1,3658 +0,0 @@ -{ - "name": "gephgui-html", - "version": "0.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "gephgui-html", - "version": "0.0.0", - "dependencies": { - "@extractus/feed-extractor": "^6.2.1", - "@smui/chips": "7.0.0-beta.0", - "@smui/form-field": "7.0.0-beta.0", - "@vitejs/plugin-legacy": "^2.3.0", - "country-code-emoji": "^2.3.0", - "country-flag-icons": "^1.5.5", - "darkreader": "^4.9.58", - "detect-nearest-browser-locale": "^19.0.0", - "knuth-shuffle": "^1.0.8", - "knuth-shuffle-seeded": "^1.0.6", - "openmoji": "^14.0.0", - "stream-browserify": "^3.0.0", - "svelte-material-icons": "^2.0.4", - "svelte-material-ui": "^6.2.0", - "terser": "^5.15.1", - "tinyld": "=1.3.1", - "twemoji": "^14.0.2", - "uplot": "^1.6.22" - }, - "devDependencies": { - "@rollup/plugin-dsv": "^2.0.3", - "@smui/button": "^6.1.4", - "@smui/checkbox": "^6.1.4", - "@smui/circular-progress": "^6.1.4", - "@smui/data-table": "^6.2.0", - "@smui/dialog": "^6.1.4", - "@smui/icon-button": "^6.1.4", - "@smui/linear-progress": "^6.1.4", - "@smui/ripple": "^6.1.4", - "@smui/select": "^6.2.0", - "@smui/snackbar": "^6.1.4", - "@smui/switch": "^6.1.4", - "@smui/tab": "^6.1.4", - "@smui/tab-bar": "^6.1.4", - "@smui/textfield": "^6.1.4", - "@sveltejs/vite-plugin-svelte": "^1.0.2", - "@tsconfig/svelte": "^3.0.0", - "rollup": "^2.79.1", - "svelte": "^3.50.1", - "svelte-check": "^2.8.1", - "svelte-preprocess": "^4.10.7", - "tslib": "^2.4.0", - "typescript": "^4.6.4", - "vite": "^3.1.0" - } - }, - "node_modules/@babel/standalone": { - "version": "7.21.2", - "resolved": "https://registry.npmmirror.com/@babel/standalone/-/standalone-7.21.2.tgz", - "integrity": "sha512-ySP/TJcyqMJVg1M/lmnPVi6L+F+IJpQ4+0lqtf723LERbk1N8/0JgLgm346cRAzfHaoXkLq/M/mJBd2uo25RBA==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz", - "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", - "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", - "cpu": [ - "loong64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@extractus/feed-extractor": { - "version": "6.2.1", - "resolved": "https://registry.npmmirror.com/@extractus/feed-extractor/-/feed-extractor-6.2.1.tgz", - "integrity": "sha512-zCIcvp4CDhgqdX17MJenBCXXm4NMVFJyKmvVMzl3LwOyFUEmpO4WGjtzXhxw1XN1Mjj5gvPclJNPgRBGlom2zA==", - "dependencies": { - "bellajs": "^11.1.1", - "cross-fetch": "^3.1.5", - "fast-xml-parser": "^4.0.13", - "html-entities": "^2.3.3" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@material/animation": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-13.0.0.tgz", - "integrity": "sha512-YR0/u4u56qXDjKYolQ7F+IvlPkaSBhMl/dZv8DK0FbD6PH4ckOPd3bEXNRndXtprsxwknQQP2pttjPImylkl0g==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/banner": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/banner/-/banner-13.0.0.tgz", - "integrity": "sha512-59M85ezhwRaa+BqguYCCaRS57fV5KQe3Ff2cU6LcQNw0UPMFW1ap0dZ+iZBv/sj+7/QcqBBShL9uu8dWKtI4Gg==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/button": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/base": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/base/-/base-13.0.0.tgz", - "integrity": "sha512-vFx0JryRfcvUNX3cZ2u32wUMvxzd+c/YW0LFOXNgqCDWlubHcMm0Y6Wz371LhfQo80/NE69u+/4Joo99yKnVeg==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/button": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/button/-/button-13.0.0.tgz", - "integrity": "sha512-lYorht6fcEd4P+dsLVp2BGtaY5cGYNp71LMajuDe71GZX3dZPoKeVvb+Ie1S7vcB+o+WLTeaisMk9/vA4gfi8A==", - "dependencies": { - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/card": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/card/-/card-13.0.0.tgz", - "integrity": "sha512-ooJUOt1Viv99Dyz4rhz9ZZbfa996eHh3RUuXkPRkT66Btd5TzpdqsQWKwOVc5bgbgWqzhDWQ6A/aQdYqH97ccg==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/checkbox": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/checkbox/-/checkbox-13.0.0.tgz", - "integrity": "sha512-tRC6n9Jq7GgdU0d1F8NOvUy6WiRZR58tUgL1QqoiQK9PGKSt0dAF3Aa48uubO7/Lt9K4NqgwV6/OeHv8pHaM/w==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/touch-target": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/chips/-/chips-14.0.0.tgz", - "integrity": "sha512-SfZX/Ovdq4NgjdtIr/N1O3fEHisZC+t8G8629OV/NrniSS6rKOa+q1mImzna8R4pfuYO+7nT5nZewQpL/JSYaQ==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/checkbox": "^14.0.0", - "@material/density": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/elevation": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/focus-ring": "^14.0.0", - "@material/ripple": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/shape": "^14.0.0", - "@material/theme": "^14.0.0", - "@material/tokens": "^14.0.0", - "@material/touch-target": "^14.0.0", - "@material/typography": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/animation": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", - "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/base": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", - "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/checkbox": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/checkbox/-/checkbox-14.0.0.tgz", - "integrity": "sha512-OoqwysCqvj1d0cRmEwVWPvg5OqYAiCFpE6Wng6me/Cahfe4xgRxSPa37WWqsClw20W7PG/5RrYRCBtc6bUUUZA==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/density": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/focus-ring": "^14.0.0", - "@material/ripple": "^14.0.0", - "@material/theme": "^14.0.0", - "@material/touch-target": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/density": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/density/-/density-14.0.0.tgz", - "integrity": "sha512-NlxXBV5XjNsKd8UXF4K/+fOXLxoFNecKbsaQO6O2u+iG8QBfFreKRmkhEBb2hPPwC3w8nrODwXX0lHV+toICQw==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/dom": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", - "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/elevation": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/elevation/-/elevation-14.0.0.tgz", - "integrity": "sha512-Di3tkxTpXwvf1GJUmaC8rd+zVh5dB2SWMBGagL4+kT8UmjSISif/OPRGuGnXs3QhF6nmEjkdC0ijdZLcYQkepw==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/feature-targeting": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", - "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/ripple": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", - "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/rtl": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", - "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", - "dependencies": { - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/shape": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/shape/-/shape-14.0.0.tgz", - "integrity": "sha512-o0mJB0+feOv473KckI8gFnUo8IQAaEA6ynXzw3VIYFjPi48pJwrxa0mZcJP/OoTXrCbDzDeFJfDPXEmRioBb9A==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/theme": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", - "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/tokens": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/tokens/-/tokens-14.0.0.tgz", - "integrity": "sha512-SXgB9VwsKW4DFkHmJfDIS0x0cGdMWC1D06m6z/WQQ5P5j6/m0pKrbHVlrLzXcRjau+mFhXGvj/KyPo9Pp/Rc8Q==", - "dependencies": { - "@material/elevation": "^14.0.0" - } - }, - "node_modules/@material/chips/node_modules/@material/touch-target": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/touch-target/-/touch-target-14.0.0.tgz", - "integrity": "sha512-o3kvxmS4HkmZoQTvtzLJrqSG+ezYXkyINm3Uiwio1PTg67pDgK5FRwInkz0VNaWPcw9+5jqjUQGjuZMtjQMq8w==", - "dependencies": { - "@material/base": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/chips/node_modules/@material/typography": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-14.0.0.tgz", - "integrity": "sha512-/QtHBYiTR+TPMryM/CT386B2WlAQf/Ae32V324Z7P40gHLKY/YBXx7FDutAWZFeOerq/two4Nd2aAHBcMM2wMw==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/circular-progress": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/circular-progress/-/circular-progress-13.0.0.tgz", - "integrity": "sha512-jSbr0ywY2N6s05tyqTXl/cG339C+qU3ck3FwXUq5SJup8CWT0AoJ8EG/CD10CEhNH8nH9Iwstve95oNgIt8G4g==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/progress-indicator": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/data-table": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/data-table/-/data-table-13.0.0.tgz", - "integrity": "sha512-Z3yEq1T6Om/A3ntPw0bd40dqtOR4H3++pvchgW35kq+V9xDLL0hfzmuiy0QH4plA2ZsFYJxjt02k/SRvnkjKPQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/checkbox": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/icon-button": "^13.0.0", - "@material/linear-progress": "^13.0.0", - "@material/list": "^13.0.0", - "@material/menu": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/select": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/density": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/density/-/density-13.0.0.tgz", - "integrity": "sha512-ppJTzOsuhjQam5GvHaq/XZocZNUr+41XQ2sd5nONAmQ0wwzXgqG0FaxtF1EXqK3uZFadz+vAu6enagre9DXhTA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/dialog": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/dialog/-/dialog-13.0.0.tgz", - "integrity": "sha512-1Ggo9Bid94F1ttZJKSjIcgMvkVQtKsqwbqLs5cWlleaiwtAcwUE12XA2B1MNj8xM9ajU3BJm4GigupBOK1jGHQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/button": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/icon-button": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/dom": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-13.0.0.tgz", - "integrity": "sha512-M9HLAYBZtkTUvf66FL+jAEvUOdhji1HkGA1mV6oyE+HY9gkCkmso+mngvzlLd5+uaAVE9I3WQFhSb9gp0cpXnw==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/drawer": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/drawer/-/drawer-13.0.0.tgz", - "integrity": "sha512-TIV/K9MED3ymngmKrdLwOMhUF44BzoR6HuTVsZAM4bgy0sfSv+jzgaGUqJsvjEhTXk+Q9OTEge+TsU/ETzQCbg==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/list": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/elevation": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/elevation/-/elevation-13.0.0.tgz", - "integrity": "sha512-hzdblgamVRbC0UwKafcvUVDvKzMiOSveDiwGgFk+EAg/tZRdwMlQPyf/9I6Lr8Cw/pNGnEOPhmCDOYPOHimr0w==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/fab": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/fab/-/fab-13.0.0.tgz", - "integrity": "sha512-qOi+XWEZWUR5T961UjSorgqm5VaanuZtRN3nsrKqHH1p0L8fYRc3qkGIChlaY9p7BcOYMCynXJzT+MfELVrcwA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/feature-targeting": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-13.0.0.tgz", - "integrity": "sha512-QJClfeaA4EMyAxKJy9WR0Nx+/VwSZCkhGLUVBG9NhxqYGfl/LtaeaidrNm32vYEoNZAofN92VD2RwQTRwp/dMQ==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/floating-label": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/floating-label/-/floating-label-13.0.0.tgz", - "integrity": "sha512-imAPamD97QrizVCOpxjr3UfQJyDBpEEhDBSbEbKLrCpqG3jQx4/My5rNKKVGWjxUiBYgBA1dhkn98RRX5tGBtQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/focus-ring": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/focus-ring/-/focus-ring-14.0.0.tgz", - "integrity": "sha512-fqqka6iSfQGJG3Le48RxPCtnOiaLGPDPikhktGbxlyW9srBVMgeCiONfHM7IT/1eu80O0Y67Lh/4ohu5+C+VAQ==", - "dependencies": { - "@material/dom": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0" - } - }, - "node_modules/@material/focus-ring/node_modules/@material/dom": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", - "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/focus-ring/node_modules/@material/feature-targeting": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", - "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/focus-ring/node_modules/@material/rtl": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", - "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", - "dependencies": { - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/focus-ring/node_modules/@material/theme": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", - "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/form-field/-/form-field-14.0.0.tgz", - "integrity": "sha512-k1GNBj6Sp8A7Xsn5lTMp5DkUkg60HX7YkQIRyFz1qCDCKJRWh/ou7Z45GMMgKmG3aF6LfjIavc7SjyCl8e5yVg==", - "dependencies": { - "@material/base": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/ripple": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "@material/typography": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/animation": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", - "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/base": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", - "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/dom": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", - "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/feature-targeting": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", - "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/ripple": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", - "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/rtl": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", - "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", - "dependencies": { - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/theme": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", - "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/form-field/node_modules/@material/typography": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-14.0.0.tgz", - "integrity": "sha512-/QtHBYiTR+TPMryM/CT386B2WlAQf/Ae32V324Z7P40gHLKY/YBXx7FDutAWZFeOerq/two4Nd2aAHBcMM2wMw==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/icon-button": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/icon-button/-/icon-button-13.0.0.tgz", - "integrity": "sha512-SdxFytWvbfN0fj7jHFq3DqK5/Zoms+Ipuv6fI8AzwgDFe7mXJ2euPahN+3XcmJ3BaSMyfYsdbcYdCWs8bgHW1w==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/touch-target": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/image-list": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/image-list/-/image-list-13.0.0.tgz", - "integrity": "sha512-D78QKpK5JmO6zrbsSYt1YfRlkqzzduDTe6BstS0efUFS1CA11hrqwQFoMaR1L1dw2U3CQ/CP22bBMSZVV9aU6A==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/layout-grid": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/layout-grid/-/layout-grid-13.0.0.tgz", - "integrity": "sha512-9L1BVLRIyetm/AOC+59+yca6R0OO2AJKHiUMdZrxgUVjqVblqWXEMeONZqslFRGHBiSIaYdrDIhn4ZTYY6tKUA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/line-ripple": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/line-ripple/-/line-ripple-13.0.0.tgz", - "integrity": "sha512-5djBRXrd1+SiMVUTWr4rD6xv+/qTaGGmgUS5GytBE5mczvnEwcPmM4PzF+HNj2TS+wvNvIfRjRmUzWO2Z6w2lA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/linear-progress": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/linear-progress/-/linear-progress-13.0.0.tgz", - "integrity": "sha512-FJpP6flSME5QRPfkB616uA5bk9aMKJBqkklrHk6dSMZaTKbiHRmc6faxMIZ4w9W49JFMXaSwzC39y96tQTiRQg==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/progress-indicator": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/list": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/list/-/list-13.0.0.tgz", - "integrity": "sha512-poq4WNDEfW6Z3YPAn3wdBX4RSkj3A83Pht6984MmG8YJZMlq34ftHECw37VcdmFJIyRPdpZqywJo/i7CxsSAgQ==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/menu": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/menu/-/menu-13.0.0.tgz", - "integrity": "sha512-RY9R2ubYU6a7WRJW3nWr/AoSzdrxwUGqkfJSx0U9M/wK1vbXYYcJ7eCXFzSpa5VrstE7of7PbyYtQ8V61tILEQ==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/list": "^13.0.0", - "@material/menu-surface": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/menu-surface": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/menu-surface/-/menu-surface-13.0.0.tgz", - "integrity": "sha512-Irfnk0l8AO7z8ucilbBzZI8izbFV/aK1GbiPpT1SmZuKkL1z+04rB2HpB+OqwaBixdLTDq70AyawcnQ0MACeXQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/notched-outline": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/notched-outline/-/notched-outline-13.0.0.tgz", - "integrity": "sha512-BHdxr1x2AN4oqycTNg0FGisG3rMHf50z3MuyUoQsJJ3WGjxBMWKd0yK/xl4m38nFKPg1vQnzyHIYTJdRpCaE7A==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/floating-label": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/progress-indicator": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/progress-indicator/-/progress-indicator-13.0.0.tgz", - "integrity": "sha512-IfhAMn03gWg/Rl0Bg26Q1g+DrMnaULllz+ZJeIY7BXZC5qFYq1fLq4+RiQmfPGlJfURUjrWNLcI1VDVyXUHHzg==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@material/radio": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/radio/-/radio-13.0.0.tgz", - "integrity": "sha512-6jeZ+dKSzBB/j2IZ7RjFl5mrB+EWnpv/x+U9w6ENLCdueM4+LKUqBAc2fC2WMycsqgoFnlB0xsO/sG+kN0J6fw==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/touch-target": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/ripple": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-13.0.0.tgz", - "integrity": "sha512-hx4B40hB2rRfsGwf1jwo2GGlYDq0yUQjcMcMmXfQipPJNpQhy8ylmXKc1DBjmWf7EQ/MgbfCSYwPrYXrbGP31w==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/rtl": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-13.0.0.tgz", - "integrity": "sha512-nFGy3iQg7k+xLs67eb86mRFVLwa0yi7MusqRK4OM8DXcLO5yoVfUTPKpdSykcbRryp9imVHsxutox2tZawR4og==", - "dependencies": { - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/segmented-button": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/segmented-button/-/segmented-button-13.0.0.tgz", - "integrity": "sha512-cbjSzkGms+MB6e7ZF6Toc0kpIor4qFm3ueY8KGRIbpvPoJuHfDy6wqIUhwpfAibSpcaDSnCKg1m+hEtyplZPkQ==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/select": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/select/-/select-13.0.0.tgz", - "integrity": "sha512-wVprsSMicU/l+LAqXdOU+qdzzdHupLXpWWQo2Rsk8G6AxL1Zna+/+ETnRlDdr2wHHK/KNDXSBdmuCcoEIRshcA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/floating-label": "^13.0.0", - "@material/line-ripple": "^13.0.0", - "@material/list": "^13.0.0", - "@material/menu": "^13.0.0", - "@material/menu-surface": "^13.0.0", - "@material/notched-outline": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/shape": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/shape/-/shape-13.0.0.tgz", - "integrity": "sha512-exk96+iCjzCujk3aSrvIMhmW773s1Tc0h+MbQKbt6Iv3nHJCyLSiRbxclCHXWHrVwG/9KZRkrt/g2qk7P3VRBg==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/slider": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/slider/-/slider-13.0.0.tgz", - "integrity": "sha512-PW+3X9MiOoWmXhirYo/Mk2UYW00Tnsihrx5YJQ4+IxwbrUI75/8yUsO8kVr7YC+Eqhldz8oXzhIXglQFtbpolQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/snackbar": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/snackbar/-/snackbar-13.0.0.tgz", - "integrity": "sha512-z59aYCeMWWEbsUU04QDZN4CxzCCOp3OIc5tzrdqnY3qRq4wwApxncf7RKKKSU2K6WTEWfdHHOc7aNX8kqlDmUg==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/button": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/icon-button": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/switch": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/switch/-/switch-13.0.0.tgz", - "integrity": "sha512-zbdo6nKEOAx24ILCBobZlQqU2WZ+KuPgdAc1VTI1q1BCKN3rDIfm9RnsCuYiZa9iaq4UUgdYuhH8KVEYGP7Lrw==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tab/-/tab-13.0.0.tgz", - "integrity": "sha512-7tziMFiyiFZner39h6ue6A6rfJhz8LDyeVPYfdAMe8ZO8GT+PczDr5yuectamR8fNBE7Fk9Bj/KvIOx+LjKgDg==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/tab-indicator": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab-bar": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tab-bar/-/tab-bar-13.0.0.tgz", - "integrity": "sha512-GLODDvwKiN867weT+WiSR/4Oum2hw0Ipl1vcJxtZeE6C3PmGWBE316j8a5DLYvf9bjIPLYLNLUzLU3QnJB6T5w==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/tab": "^13.0.0", - "@material/tab-indicator": "^13.0.0", - "@material/tab-scroller": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab-indicator": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tab-indicator/-/tab-indicator-13.0.0.tgz", - "integrity": "sha512-T6Q4zCdl374rQgNLrAIc8+sy8ax6fbNTZRb+oJgShzjVz4wH9OLk6LX1RREHEeWiZt69nTqeR4yU6/6xFX+Kjw==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tab-scroller": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tab-scroller/-/tab-scroller-13.0.0.tgz", - "integrity": "sha512-SHdNXTLrNA47RbTNOQa67DbQjw0qrf1h0OuoESXHMU/B7QQvhAOqnHpU32/LdCP+gvc7EdZjolVQgk3WphDcQA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/tab": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/textfield": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/textfield/-/textfield-13.0.0.tgz", - "integrity": "sha512-CzodrOqx8wzj2AQngMpISURJID4jVOHf4CtiPoj32LG8bWLn5ZfAAX2aA2rO6NPyDYsFm0aEnlfMhnDwQyPoYw==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/floating-label": "^13.0.0", - "@material/line-ripple": "^13.0.0", - "@material/notched-outline": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/theme": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-13.0.0.tgz", - "integrity": "sha512-KAe1s0MvvfCGAwJliDVTvgAKuD3ESwhl7F7br4Iam4IPdqME2rWl8NPhKHFfaWqTG7PyCgMMngYEYuA8cLNTsA==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/tokens": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tokens/-/tokens-13.0.0.tgz", - "integrity": "sha512-t55CKVeAjABdSQCKjsvYvqrA6Z4f5varLpLloai8ZQU0giSl7qbUczV1i8y2pSOzpRTswD5JKM7a19qfsl/TCA==", - "dependencies": { - "@material/elevation": "^13.0.0" - } - }, - "node_modules/@material/tooltip": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/tooltip/-/tooltip-13.0.0.tgz", - "integrity": "sha512-/QinwEM0sYtRUthgOy7R+V4iwLMZ8SCd8A3PyGyTr27BUGWykwAUFdXyzT4rxLhDNcnDOYH14N+Z3Bom+UwO9Q==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/top-app-bar": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/top-app-bar/-/top-app-bar-13.0.0.tgz", - "integrity": "sha512-NTbIbBmoo4wfbBwW+9XMmjYQJ3e7NJ9P/ahTszYuzYDyWNcc3m8G/A0zM+1LBmoze3rP/QTxcaJUH/A5/3ufXA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/touch-target": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/touch-target/-/touch-target-13.0.0.tgz", - "integrity": "sha512-2BMjj+nwKIYG7cZZGcNuRSKo53knqDu9ksv9wLidxjLgzqXBd1v9gdXsqMRQXepoOqftWGmYMaRYI0xMnxt6lA==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@material/typography": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/typography/-/typography-13.0.0.tgz", - "integrity": "sha512-UfaK4vT3LmGiiySf2RVIrf7fJZa6EJadFwo4YUMJx9bvUMRlBm1oI8Vo9fYpKdLfuSTeA+2BlgbwYVObj3laFw==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/theme": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@rollup/plugin-dsv": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/@rollup/plugin-dsv/-/plugin-dsv-2.0.3.tgz", - "integrity": "sha512-x2lqNepgPZUwRgNzEK8oTpoN6Y7NEQQl1PHp4gltXuxeJGlu3oyxVuw5gY5+T/LMUyQ9Nvlw6xu/rOC7v9kxPg==", - "dev": true, - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "@types/d3-dsv": "~1.2.0", - "d3-dsv": "1.2.0", - "tosource": "^1.0.0" - } - }, - "node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", - "dev": true, - "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" - } - }, - "node_modules/@smui-extra/accordion": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui-extra/accordion/-/accordion-6.1.4.tgz", - "integrity": "sha512-2yaGn8Jmqr+EGF+Xk5GkvNGu9jUH+RxuhUybfpZ0LHlGJhmXAAGUthgf44EJ0XLlR7upPaAmd3lI1+fYfmrRDQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/paper": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui-extra/autocomplete": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/@smui-extra/autocomplete/-/autocomplete-6.2.0.tgz", - "integrity": "sha512-JCZOQO6rnDdCq8/q9gB4ElM04AIaQAcNLiNkPsgzUT6v8klYzerqPnfT3JBvm+p+ZUqocmRAIrdsF5QVvAgacg==", - "dependencies": { - "@smui/common": "^6.1.4", - "@smui/list": "^6.1.4", - "@smui/menu": "^6.2.0", - "@smui/menu-surface": "^6.1.4", - "@smui/textfield": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui-extra/badge": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui-extra/badge/-/badge-6.1.4.tgz", - "integrity": "sha512-AudM5fswJlggtIy7JKywCBuWOPAT776OGwNXJlEUsCXCvqIqQC7HoCwn0Es15Y0rSZcPdRLJm9e2JjzC/SKTbw==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/banner": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/banner/-/banner-6.1.4.tgz", - "integrity": "sha512-nv5/lHUFIIhEGmPBJfmj3Ube5LumCNJSlg+BnApk4obeBYET/ANz85zVU3kEEgn5FS8Z8V49/B59X5F0gY4eog==", - "dependencies": { - "@material/banner": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/button": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/button/-/button-6.1.4.tgz", - "integrity": "sha512-4CD6uPNkvZzoQyr6b3+PC49wieMkZW6xzxf+r/vq5pcv2X/PM+caySjzfAZamWN2m4nZMrmJjyEw1iCITWoQyg==", - "dependencies": { - "@material/button": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/theme": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/card": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/card/-/card-6.1.4.tgz", - "integrity": "sha512-B8t2+w4Y9/3bz80yZeEFJH3Y2aFVZzHsUyBF2aC59rxa5qARihLE7PbCVEyqr6T5oQFr8A7QcHKLC+Ylsxj6HQ==", - "dependencies": { - "@material/card": "^13.0.0", - "@smui/button": "^6.1.4", - "@smui/common": "^6.1.4", - "@smui/icon-button": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/checkbox": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/checkbox/-/checkbox-6.1.4.tgz", - "integrity": "sha512-yWARPjnOaQFVi4iQxUINDLAd0V78mtKhAEuc+F91cjpfDvSzaPWPD3dfynYN7g3yf7uW/bocHM1yUxqtmQ3+7Q==", - "dependencies": { - "@material/checkbox": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/chips": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmmirror.com/@smui/chips/-/chips-7.0.0-beta.0.tgz", - "integrity": "sha512-xL9bEJp0syGfHjGHtFAxBASCtDmbvlCLT/WV3k4PV1xzzCuEWFRQ+C15V8HxeKMPW/CPEi1rKelFkl1vzCchSQ==", - "dependencies": { - "@material/chips": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/rtl": "^14.0.0", - "@smui/common": "^7.0.0-beta.0", - "@smui/ripple": "^7.0.0-beta.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/chips/node_modules/@material/animation": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/animation/-/animation-14.0.0.tgz", - "integrity": "sha512-VlYSfUaIj/BBVtRZI8Gv0VvzikFf+XgK0Zdgsok5c1v5DDnNz5tpB8mnGrveWz0rHbp1X4+CWLKrTwNmjrw3Xw==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/base": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/base/-/base-14.0.0.tgz", - "integrity": "sha512-Ou7vS7n1H4Y10MUZyYAbt6H0t67c6urxoCgeVT7M38aQlaNUwFMODp7KT/myjYz2YULfhu3PtfSV3Sltgac9mA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/dom": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", - "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/feature-targeting": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", - "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/ripple": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/ripple/-/ripple-14.0.0.tgz", - "integrity": "sha512-9XoGBFd5JhFgELgW7pqtiLy+CnCIcV2s9cQ2BWbOQeA8faX9UZIDUx/g76nHLZ7UzKFtsULJxZTwORmsEt2zvw==", - "dependencies": { - "@material/animation": "^14.0.0", - "@material/base": "^14.0.0", - "@material/dom": "^14.0.0", - "@material/feature-targeting": "^14.0.0", - "@material/rtl": "^14.0.0", - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/rtl": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", - "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", - "dependencies": { - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@material/theme": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", - "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/chips/node_modules/@smui/common": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmmirror.com/@smui/common/-/common-7.0.0-beta.0.tgz", - "integrity": "sha512-JFbmbXR/j3NdUPC1Nn28LDH62WVv6AaKQVr4VVmutgBYAkMy+QIQhG/kvFBP4Shr2gG8DLQyXGSK0wHHgiONlw==", - "dependencies": { - "@material/dom": "^14.0.0", - "@tsconfig/svelte": "^3.0.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/chips/node_modules/@smui/ripple": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmmirror.com/@smui/ripple/-/ripple-7.0.0-beta.0.tgz", - "integrity": "sha512-2G9ILzcNAWeL8NgqW4tuBJXuh0gfGj01CtlGeRUSUNG5AxM3zLECrTEEqKdX25wtJf+QxBqV1Zi3ZqFDm3lzDg==", - "dependencies": { - "@material/dom": "^14.0.0", - "@material/ripple": "^14.0.0", - "@smui/common": "^7.0.0-beta.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/circular-progress": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/circular-progress/-/circular-progress-6.1.4.tgz", - "integrity": "sha512-79SOd1XpQsSA4P1JpuWgvMVRmGIXFnsTqDkbe8bqF5U8TuK8vPbTNeBO/ANlkOJr2Mqt4j/lJ8Vma02tqjamMA==", - "dependencies": { - "@material/circular-progress": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/common": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/common/-/common-6.1.4.tgz", - "integrity": "sha512-l6c4gJH+qP9HdM9RhTP07Gl8eewVbYWT7QfVSAF+wwji32ndjgZLlP5P2Jl/GmsQOOlDoNB3VPy/o4Z/kab31g==", - "dependencies": { - "@material/dom": "^13.0.0", - "@tsconfig/svelte": "^3.0.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/data-table": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/@smui/data-table/-/data-table-6.2.0.tgz", - "integrity": "sha512-fFfGRr6vwg343wdGhwHrHZbKI/eYQC8rcT7cDaQc8MOL6ULVW29h0Qt6KwyLMeArC/LV2SBsXQJqOIt+Z90qSQ==", - "dependencies": { - "@material/data-table": "^13.0.0", - "@material/dom": "^13.0.0", - "@smui/checkbox": "^6.1.4", - "@smui/common": "^6.1.4", - "@smui/icon-button": "^6.1.4", - "@smui/ripple": "^6.1.4", - "@smui/select": "^6.2.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/dialog": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/dialog/-/dialog-6.1.4.tgz", - "integrity": "sha512-ouCROTmIHutDxmSI3DYX4vlGeFaq0VHRtdhD3vCdd/7u9qBukXunKaCfTOvqozdoaa0pG3Cc66bYsa25m9RP4w==", - "dependencies": { - "@material/button": "^13.0.0", - "@material/dialog": "^13.0.0", - "@material/dom": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/drawer": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/drawer/-/drawer-6.1.4.tgz", - "integrity": "sha512-Y13Fvf9ue/yfeuV99I8doRYEN/viWMQpWPTmz3bvh+0ztyPvjK4kpP0AlCu1QxX7UCgb390DLmfT1lDrCl/QrA==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/drawer": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/fab": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/fab/-/fab-6.1.4.tgz", - "integrity": "sha512-uwjh2moyu8bDoZBKLYbQXgDkX/FRlK/xseVYJ8jG/qTSxx/juVd9hG8sK7ERB/ru9odexTSobDXdQT6dPwaXDA==", - "dependencies": { - "@material/fab": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/floating-label": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/floating-label/-/floating-label-6.1.4.tgz", - "integrity": "sha512-7crwK7WsU7ELS+uJj5J8XnbCGoJrCDijs7DN57ok3LemWTsmn0vhhnsmDC3FYZARcAQ1KsX936+ahJGfiP/oAg==", - "dependencies": { - "@material/floating-label": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/form-field": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmmirror.com/@smui/form-field/-/form-field-7.0.0-beta.0.tgz", - "integrity": "sha512-YWHg8bH1+sc8j5wmdbGdZJNtireCro7fBNp8RZCceChHXQPvaxhUwRU6zV/HepcVLT14SVSO3px5jRNnpCuM8Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "@material/form-field": "^14.0.0", - "@material/rtl": "^14.0.0", - "@smui/common": "^7.0.0-beta.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/form-field/node_modules/@material/dom": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/dom/-/dom-14.0.0.tgz", - "integrity": "sha512-8t88XyacclTj8qsIw9q0vEj4PI2KVncLoIsIMzwuMx49P2FZg6TsLjor262MI3Qs00UWAifuLMrhnOnfyrbe7Q==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/form-field/node_modules/@material/feature-targeting": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/feature-targeting/-/feature-targeting-14.0.0.tgz", - "integrity": "sha512-a5WGgHEq5lJeeNL5yevtgoZjBjXWy6+klfVWQEh8oyix/rMJygGgO7gEc52uv8fB8uAIoYEB3iBMOv8jRq8FeA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/form-field/node_modules/@material/rtl": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/rtl/-/rtl-14.0.0.tgz", - "integrity": "sha512-xl6OZYyRjuiW2hmbjV2omMV8sQtfmKAjeWnD1RMiAPLCTyOW9Lh/PYYnXjxUrNa0cRwIIbOn5J7OYXokja8puA==", - "dependencies": { - "@material/theme": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/form-field/node_modules/@material/theme": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/@material/theme/-/theme-14.0.0.tgz", - "integrity": "sha512-6/SENWNIFuXzeHMPHrYwbsXKgkvCtWuzzQ3cUu4UEt3KcQ5YpViazIM6h8ByYKZP8A9d8QpkJ0WGX5btGDcVoA==", - "dependencies": { - "@material/feature-targeting": "^14.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/@smui/form-field/node_modules/@smui/common": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmmirror.com/@smui/common/-/common-7.0.0-beta.0.tgz", - "integrity": "sha512-JFbmbXR/j3NdUPC1Nn28LDH62WVv6AaKQVr4VVmutgBYAkMy+QIQhG/kvFBP4Shr2gG8DLQyXGSK0wHHgiONlw==", - "dependencies": { - "@material/dom": "^14.0.0", - "@tsconfig/svelte": "^3.0.0", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/icon-button": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/icon-button/-/icon-button-6.1.4.tgz", - "integrity": "sha512-8eUow8d+vztGJBzHTuXGP0UszXq5RUN4syxW7Ur742D4zNSrF6dzccjteF5S51a7Pcf7AHeEDkAqHbA6ioIGLw==", - "dependencies": { - "@material/density": "^13.0.0", - "@material/icon-button": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/image-list": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/image-list/-/image-list-6.1.4.tgz", - "integrity": "sha512-v52fqVzwqeOvwuJNnk16vHK3QTeS62EZoycSyUMpdf0AeG3DLzIOVo5+CkQ7xuvIFpWve59i5pmOsn29fteMsg==", - "dependencies": { - "@material/image-list": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/layout-grid": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/layout-grid/-/layout-grid-6.1.4.tgz", - "integrity": "sha512-i8t/PxQsWXfXG1ESv3uiHHIsLTHU/T+FN33HncnXDYkG7IITMFeKXMN76VWpRjDfTl0f7p4EHazBjeXJ1dFziQ==", - "dependencies": { - "@material/layout-grid": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/line-ripple": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/line-ripple/-/line-ripple-6.1.4.tgz", - "integrity": "sha512-IUbapkBPyrybkUEEZVLpBs6HXXHN3v1aHewFPI7KvHU4a+Ho7EIqWpAHn8wc8SSX2knC2/HeGtpNycAAW127Tw==", - "dependencies": { - "@material/line-ripple": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/linear-progress": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/linear-progress/-/linear-progress-6.1.4.tgz", - "integrity": "sha512-ta1syavpt9yIAmqV98DKzf0JEy32us4oIxThgj9Ze+4Xi6l4NnuUAx3L9XiW37qE7xrNJcoFMAlErht2yYDUIw==", - "dependencies": { - "@material/linear-progress": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/list": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/list/-/list-6.1.4.tgz", - "integrity": "sha512-YPecf8ib/EETUVlt+TZMclzm5S+usMVpFsIgidMR75+HFUpXVlHsaOqGdQuQYJ75YRf3HZcYwUNn4t2B3ayhTg==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/list": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/menu": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/@smui/menu/-/menu-6.2.0.tgz", - "integrity": "sha512-zYb3U5DPyrHWKwH2Q6KLSotrQ+6r223PnLbYGRcOCF7sEVNL+P7N8n8EfJTxX+/NF9Dbs48Z1a0QBvkN51klbQ==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/menu": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/list": "^6.1.4", - "@smui/menu-surface": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/menu-surface": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/menu-surface/-/menu-surface-6.1.4.tgz", - "integrity": "sha512-rZDHRLiAUCYrunhYAuZUSqtBO2r80rMu5/aeNuBNcemwBw/z/6opNTC8XEcAfN6kbbABewKDD/aW/MIZJgjHsA==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/menu-surface": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/notched-outline": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/notched-outline/-/notched-outline-6.1.4.tgz", - "integrity": "sha512-wUWnF5qzCbM6UXioq1CHeYMHXfnd/2A2dXnl7ziQTEqPit9qCNc0XM9VcoxLJTy7IyEFmmTI7GcH0fOjggqg8A==", - "dependencies": { - "@material/notched-outline": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/floating-label": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/paper": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/paper/-/paper-6.1.4.tgz", - "integrity": "sha512-mKfbF5Hr5yUsUL8tGmKHfkV6bxkE50EJwZmCw0t1+CSOfHTD/96klVNDVKh4Tgr7tfK8g0yJ14Ra8fJwV/V6jA==", - "dependencies": { - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/radio": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/radio/-/radio-6.1.4.tgz", - "integrity": "sha512-G9/bhNX5X8GmWjzddRRmDxwcg4PqreCAoBXiQVcJdv4pinrkfgrtGVzGVzRzD0WEHlB4X9J2aYn6BkFn41xC+Q==", - "dependencies": { - "@material/radio": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/ripple": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/ripple/-/ripple-6.1.4.tgz", - "integrity": "sha512-bMyjVE13Mpy8iygQTtxFTPfxJcefAD/4JBDTm3EORhyO16CcSHhHmMuUjP8YxWTPmn+mnWaeNORZ31aJt4tlYw==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/ripple": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/segmented-button": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/segmented-button/-/segmented-button-6.1.4.tgz", - "integrity": "sha512-71k+vUfBYynvof1YNeElSoM2GFMZenU7yTKhL40yyACZJ33HAa/Xc+Tcy2uyrUyvCNd1dyrr49Cs4s/OX/nrdQ==", - "dependencies": { - "@material/segmented-button": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/select": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/@smui/select/-/select-6.2.0.tgz", - "integrity": "sha512-Cr9lKbEiGF9E+AzQOaSbUc1WyHbbft7CoeLNHblEiRijffSMY/Pgsn0qjqOBh3jeDUu6Nb5BW/3icL1As3SS4Q==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/select": "^13.0.0", - "@material/theme": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/floating-label": "^6.1.4", - "@smui/line-ripple": "^6.1.4", - "@smui/list": "^6.1.4", - "@smui/menu": "^6.2.0", - "@smui/menu-surface": "^6.1.4", - "@smui/notched-outline": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/slider": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/slider/-/slider-6.1.4.tgz", - "integrity": "sha512-Q+U8Q3XYOw6m8LOCfrXapFPsgIwnxqgn4Cy2MSnew1CtaPwEnul8gNP4OKxvZz24g2XPJa+ohAHVIVH149stQw==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/slider": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/snackbar": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/snackbar/-/snackbar-6.1.4.tgz", - "integrity": "sha512-RkKqm9/uXRxcOTQfgkL3HvwRkRVzhmEjUWaRj6hr3MPUHvTI2nihv86BUNobRCt32ROKvnSATCjXsCfqTfceqg==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/snackbar": "^13.0.0", - "@smui/button": "^6.1.4", - "@smui/common": "^6.1.4", - "@smui/icon-button": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/switch": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/switch/-/switch-6.1.4.tgz", - "integrity": "sha512-UluXjA4RD9f/EjrpmQwdhZB5Zk6d9FhGdzMIEEc7JEIoYnQ0TmOCSUDoV+IJpwdFSxYIlKgX37PInqPB62Eg3Q==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/switch": "^13.0.0", - "@material/theme": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/tab": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/tab/-/tab-6.1.4.tgz", - "integrity": "sha512-vxxJ31XDArQPhGEq4M4CNeQH9i09xJxBEX3cTr34lP3IXih3RQ1TTw1a8xzC137FsJERGm3ii72CKHpPpnyFkA==", - "dependencies": { - "@material/tab": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "@smui/tab-indicator": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/tab-bar": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/tab-bar/-/tab-bar-6.1.4.tgz", - "integrity": "sha512-bY2hzuYrdzvqWY34cYzez1YK5l4aF5gUFnaiu6l83wmhX5fzl5AqqKCbWgxoAVqNC4ErKAvthFzSaeiDdzOaNQ==", - "dependencies": { - "@material/tab-bar": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/tab": "^6.1.4", - "@smui/tab-scroller": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/tab-indicator": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/tab-indicator/-/tab-indicator-6.1.4.tgz", - "integrity": "sha512-yb79eJe/5X7X9rzcO9vZG+QDUsyvXSGWaonpsD4n9PUtWYG56pmar1LAwsVTYJw3nAqZZuGyLDC8/O6qCrd2Tg==", - "dependencies": { - "@material/tab-indicator": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/tab-scroller": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/tab-scroller/-/tab-scroller-6.1.4.tgz", - "integrity": "sha512-ViD6yuxYEkxfUeYq/EDpdRoeJCG+geYTWhXlQBKaLQ0IwN8qI5NRH+YcQozzJXNYlbW77lCn2X1piUWuMKEGSg==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/tab-scroller": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/textfield": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/textfield/-/textfield-6.1.4.tgz", - "integrity": "sha512-Y873i6KCAeh3fa3Kp7EuVKR5BU5CtfVEJXP30uVM5PdNIVeAGV5xTCjOyq/rpiGALILxQFVMfE6NKKCyTCCenA==", - "dependencies": { - "@material/dom": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/textfield": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/floating-label": "^6.1.4", - "@smui/line-ripple": "^6.1.4", - "@smui/notched-outline": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/tooltip": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/tooltip/-/tooltip-6.1.4.tgz", - "integrity": "sha512-KBSoaRJ+9GX5HCxRt66zUOJ4++w9P9LPbBjOXIfyAvV3Qfm4VOBAm5mD2GWi1fJw96gci+lnTFq4pCMMN9L/2A==", - "dependencies": { - "@material/tooltip": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/top-app-bar": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/top-app-bar/-/top-app-bar-6.1.4.tgz", - "integrity": "sha512-r7ychtYYtysTnVhTlNx+KZeReuUacbP9Cv3nmgQeiY8Qs3bSae/+AVNzEA3nB1QCXKKWwNPy81E0rjV4XKFLPg==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/top-app-bar": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@smui/touch-target": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/touch-target/-/touch-target-6.1.4.tgz", - "integrity": "sha512-ZQ1yYBOMIFaGiKylFWbmK9SEwCopZ/et2Pppvy3ssdQeSH8xDPcpa5/EdRYudxCYTPW/scZCUSww6ysTaFOuAw==", - "dependencies": { - "@material/touch-target": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "1.4.0", - "resolved": "https://registry.npmmirror.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.4.0.tgz", - "integrity": "sha512-6QupI/jemMfK+yI2pMtJcu5iO2gtgTfcBdGwMZZt+lgbFELhszbDl6Qjh000HgAV8+XUA+8EY8DusOFk8WhOIg==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "deepmerge": "^4.2.2", - "kleur": "^4.1.5", - "magic-string": "^0.26.7", - "svelte-hmr": "^0.15.1", - "vitefu": "^0.2.2" - }, - "engines": { - "node": "^14.18.0 || >= 16" - }, - "peerDependencies": { - "svelte": "^3.44.0", - "vite": "^3.0.0" - } - }, - "node_modules/@tsconfig/svelte": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@tsconfig/svelte/-/svelte-3.0.0.tgz", - "integrity": "sha512-pYrtLtOwku/7r1i9AMONsJMVYAtk3hzOfiGNekhtq5tYBGA7unMve8RvUclKLMT3PrihvJqUmzsRGh0RP84hKg==" - }, - "node_modules/@types/d3-dsv": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/@types/d3-dsv/-/d3-dsv-1.2.2.tgz", - "integrity": "sha512-GRnz9z8ypqb7OsQ/xw/BmFAp0/k3pgM1s19FTZZSlCMY0EvyVTkU8xzZKKDXzytGXPpTNC4R5pGl9oxEvVSnHQ==", - "dev": true - }, - "node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@types/pug": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/@types/pug/-/pug-2.0.6.tgz", - "integrity": "sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==", - "dev": true - }, - "node_modules/@types/sass": { - "version": "1.45.0", - "resolved": "https://registry.npmmirror.com/@types/sass/-/sass-1.45.0.tgz", - "integrity": "sha512-jn7qwGFmJHwUSphV8zZneO3GmtlgLsmhs/LQyVvQbIIa+fzGMUiHI4HXJZL3FT8MJmgXWbLGiVVY7ElvHq6vDA==", - "deprecated": "This is a stub types definition. sass provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "sass": "*" - } - }, - "node_modules/@vitejs/plugin-legacy": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-2.3.1.tgz", - "integrity": "sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ==", - "dependencies": { - "@babel/standalone": "^7.20.0", - "core-js": "^3.26.0", - "magic-string": "^0.26.7", - "regenerator-runtime": "^0.13.10", - "systemjs": "^6.13.0" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "peerDependencies": { - "terser": "^5.4.0", - "vite": "^3.0.0" - } - }, - "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "devOptional": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/bellajs": { - "version": "11.1.2", - "resolved": "https://registry.npmmirror.com/bellajs/-/bellajs-11.1.2.tgz", - "integrity": "sha512-2Fy3Km5JKyIy/KunW3oica2gZtkjD2qSqti2Q3xPhHvXXdMbc+32pEMOPG+xrSat0BXVhRjHIx++lzxIPK0GqQ==", - "engines": { - "node": ">= 14" - } - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "devOptional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "devOptional": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "devOptional": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/core-js": { - "version": "3.29.0", - "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.29.0.tgz", - "integrity": "sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==", - "hasInstallScript": true - }, - "node_modules/country-code-emoji": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/country-code-emoji/-/country-code-emoji-2.3.0.tgz", - "integrity": "sha512-MqmIWr3aucoU/3XZU44e0sz6izAlErqaUYp9/NFzdnzb9TrwwornyW3ws2da5TSnpTUr2qP2840oJW9oNKXCoQ==" - }, - "node_modules/country-flag-icons": { - "version": "1.5.5", - "resolved": "https://registry.npmmirror.com/country-flag-icons/-/country-flag-icons-1.5.5.tgz", - "integrity": "sha512-k4WXZ/WvWOSiYXRG1n8EYHNr1m/IX0GffKqAidaet5DrJsDOmJ8Q/8JvvONhZNnKYg24s4lvsm+9og1HcuIU/g==" - }, - "node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmmirror.com/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dependencies": { - "node-fetch": "2.6.7" - } - }, - "node_modules/d3-dsv": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-1.2.0.tgz", - "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==", - "dev": true, - "dependencies": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" - }, - "bin": { - "csv2json": "bin/dsv2json", - "csv2tsv": "bin/dsv2dsv", - "dsv2dsv": "bin/dsv2dsv", - "dsv2json": "bin/dsv2json", - "json2csv": "bin/json2dsv", - "json2dsv": "bin/json2dsv", - "json2tsv": "bin/json2dsv", - "tsv2csv": "bin/dsv2dsv", - "tsv2json": "bin/dsv2json" - } - }, - "node_modules/darkreader": { - "version": "4.9.58", - "resolved": "https://registry.npmmirror.com/darkreader/-/darkreader-4.9.58.tgz", - "integrity": "sha512-D/JGoJqW3m2AWBLhO+Pev+eThfs+CwRT4bcLb/1zKjql2yVwG0lx8C2XRDdSVGHw4y11n26W7syWoBpUfuhMqQ==" - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/dedent-js": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/dedent-js/-/dedent-js-1.0.1.tgz", - "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==" - }, - "node_modules/deepmerge": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.0.tgz", - "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/detect-indent": { - "version": "6.1.0", - "resolved": "https://registry.npmmirror.com/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-nearest-browser-locale": { - "version": "19.0.0", - "resolved": "https://registry.npmmirror.com/detect-nearest-browser-locale/-/detect-nearest-browser-locale-19.0.0.tgz", - "integrity": "sha512-nprsk4sjhtvQThzsc4M1ZbMw0YZce+D8XTr1mxl4VZIeORKTgnHsdIzftRSGdkQ9SZpkZAZEd+ixYka0AKqi5g==", - "dependencies": { - "detect-nearest-locale": "^1.0.1" - } - }, - "node_modules/detect-nearest-locale": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/detect-nearest-locale/-/detect-nearest-locale-1.0.1.tgz", - "integrity": "sha512-f4BbmpbH5AA4MsW55rnPxAC9b1Ev+6XY3JzlifZiaBAC95jfstbszEq70BM+79vXUw8HAq77TiAz1xcBO1Em2A==" - }, - "node_modules/es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==", - "dev": true - }, - "node_modules/esbuild": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.15.18.tgz", - "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.15.18", - "@esbuild/linux-loong64": "0.15.18", - "esbuild-android-64": "0.15.18", - "esbuild-android-arm64": "0.15.18", - "esbuild-darwin-64": "0.15.18", - "esbuild-darwin-arm64": "0.15.18", - "esbuild-freebsd-64": "0.15.18", - "esbuild-freebsd-arm64": "0.15.18", - "esbuild-linux-32": "0.15.18", - "esbuild-linux-64": "0.15.18", - "esbuild-linux-arm": "0.15.18", - "esbuild-linux-arm64": "0.15.18", - "esbuild-linux-mips64le": "0.15.18", - "esbuild-linux-ppc64le": "0.15.18", - "esbuild-linux-riscv64": "0.15.18", - "esbuild-linux-s390x": "0.15.18", - "esbuild-netbsd-64": "0.15.18", - "esbuild-openbsd-64": "0.15.18", - "esbuild-sunos-64": "0.15.18", - "esbuild-windows-32": "0.15.18", - "esbuild-windows-64": "0.15.18", - "esbuild-windows-arm64": "0.15.18" - } - }, - "node_modules/esbuild-android-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", - "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-android-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", - "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-darwin-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", - "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-darwin-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", - "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-freebsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", - "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-freebsd-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", - "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-32": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", - "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", - "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", - "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", - "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-mips64le": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", - "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", - "cpu": [ - "mips64el" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-ppc64le": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", - "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", - "cpu": [ - "ppc64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-riscv64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", - "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", - "cpu": [ - "riscv64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-s390x": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", - "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", - "cpu": [ - "s390x" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-netbsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", - "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-openbsd-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", - "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-sunos-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", - "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-32": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", - "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", - "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-arm64": { - "version": "0.15.18", - "resolved": "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", - "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-xml-parser": { - "version": "4.1.3", - "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.1.3.tgz", - "integrity": "sha512-LsNDahCiCcJPe8NO7HijcnukHB24tKbfDDA5IILx9dmW3Frb52lhbeX6MPNUSvyGNfav2VTYpJ/OqkRoVLrh2Q==", - "dependencies": { - "strnum": "^1.0.5" - }, - "bin": { - "fxparser": "src/cli/cli.js" - } - }, - "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "devOptional": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs-extra/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "devOptional": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmmirror.com/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==" - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/immutable": { - "version": "4.2.4", - "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.2.4.tgz", - "integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==", - "devOptional": true - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "devOptional": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dependencies": { - "has": "^1.0.3" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "devOptional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "devOptional": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "devOptional": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/jsonfile": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-5.0.0.tgz", - "integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==", - "dependencies": { - "universalify": "^0.1.2" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmmirror.com/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/knuth-shuffle": { - "version": "1.0.8", - "resolved": "https://registry.npmmirror.com/knuth-shuffle/-/knuth-shuffle-1.0.8.tgz", - "integrity": "sha512-IdC4Hpp+mx53zTt6VAGsAtbGM0g4BV9fP8tTcviCosSwocHcRDw9uG5Rnv6wLWckF4r72qeXFoK9NkvV1gUJCQ==" - }, - "node_modules/knuth-shuffle-seeded": { - "version": "1.0.6", - "resolved": "https://registry.npmmirror.com/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz", - "integrity": "sha512-9pFH0SplrfyKyojCLxZfMcvkhf5hH0d+UwR9nTVJ/DDQJGuzcXjTwB7TP7sDfehSudlGGaOLblmEWqv04ERVWg==", - "dependencies": { - "seed-random": "~2.2.0" - } - }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/magic-string": { - "version": "0.26.7", - "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz", - "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", - "dependencies": { - "sourcemap-codec": "^1.4.8" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "devOptional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/openmoji": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/openmoji/-/openmoji-14.0.0.tgz", - "integrity": "sha512-MGF9GbXfpULuRtUM1srEv2OP3sg/e8hAw0UCTiP+N3+CX38RCo8/kjyFYm0eO+OENnbbri9Vx4m5pU0Vbc7LGw==" - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "devOptional": true, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", - "dependencies": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "node_modules/readable-stream": { - "version": "3.6.1", - "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.1.tgz", - "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "devOptional": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" - }, - "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dependencies": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/rollup": { - "version": "2.79.1", - "resolved": "https://registry.npmmirror.com/rollup/-/rollup-2.79.1.tgz", - "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=10.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/rw": { - "version": "1.3.3", - "resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz", - "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==", - "dev": true - }, - "node_modules/sade": { - "version": "1.8.1", - "resolved": "https://registry.npmmirror.com/sade/-/sade-1.8.1.tgz", - "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", - "dev": true, - "dependencies": { - "mri": "^1.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/sander": { - "version": "0.5.1", - "resolved": "https://registry.npmmirror.com/sander/-/sander-0.5.1.tgz", - "integrity": "sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==", - "dev": true, - "dependencies": { - "es6-promise": "^3.1.2", - "graceful-fs": "^4.1.3", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2" - } - }, - "node_modules/sass": { - "version": "1.58.3", - "resolved": "https://registry.npmmirror.com/sass/-/sass-1.58.3.tgz", - "integrity": "sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==", - "devOptional": true, - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/seed-random": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/seed-random/-/seed-random-2.2.0.tgz", - "integrity": "sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==" - }, - "node_modules/sorcery": { - "version": "0.10.0", - "resolved": "https://registry.npmmirror.com/sorcery/-/sorcery-0.10.0.tgz", - "integrity": "sha512-R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g==", - "dev": true, - "dependencies": { - "buffer-crc32": "^0.2.5", - "minimist": "^1.2.0", - "sander": "^0.5.0", - "sourcemap-codec": "^1.3.0" - }, - "bin": { - "sorcery": "bin/index.js" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/sourcemap-codec": { - "version": "1.4.8", - "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", - "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", - "deprecated": "Please use @jridgewell/sourcemap-codec instead" - }, - "node_modules/stream-browserify": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-3.0.0.tgz", - "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==", - "dependencies": { - "inherits": "~2.0.4", - "readable-stream": "^3.5.0" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/svelte": { - "version": "3.55.1", - "resolved": "https://registry.npmmirror.com/svelte/-/svelte-3.55.1.tgz", - "integrity": "sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/svelte-check": { - "version": "2.10.3", - "resolved": "https://registry.npmmirror.com/svelte-check/-/svelte-check-2.10.3.tgz", - "integrity": "sha512-Nt1aWHTOKFReBpmJ1vPug0aGysqPwJh2seM1OvICfM2oeyaA62mOiy5EvkXhltGfhCcIQcq2LoE0l1CwcWPjlw==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.9", - "chokidar": "^3.4.1", - "fast-glob": "^3.2.7", - "import-fresh": "^3.2.1", - "picocolors": "^1.0.0", - "sade": "^1.7.4", - "svelte-preprocess": "^4.0.0", - "typescript": "*" - }, - "bin": { - "svelte-check": "bin/svelte-check" - }, - "peerDependencies": { - "svelte": "^3.24.0" - } - }, - "node_modules/svelte-hmr": { - "version": "0.15.1", - "resolved": "https://registry.npmmirror.com/svelte-hmr/-/svelte-hmr-0.15.1.tgz", - "integrity": "sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==", - "dev": true, - "engines": { - "node": "^12.20 || ^14.13.1 || >= 16" - }, - "peerDependencies": { - "svelte": ">=3.19.0" - } - }, - "node_modules/svelte-material-icons": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/svelte-material-icons/-/svelte-material-icons-2.1.0.tgz", - "integrity": "sha512-UaZngbPcWtS6gEoZx/8bpv0ompsm5SOZs66NkuEQIX+p8UblrUoknjy7kKRlFEpRdFQ232IB8jswkGaFTreB6g==", - "peerDependencies": { - "svelte": "^3.0.0" - } - }, - "node_modules/svelte-material-ui": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/svelte-material-ui/-/svelte-material-ui-6.2.0.tgz", - "integrity": "sha512-/iS1gJr2Y4N+jDyt8AQZYaOTp9hAisWd5BXo20CIVUQbp2PX583S6w1JP5SpztjQnyGONpIa+qAg3Ntbj51c7Q==", - "dependencies": { - "@smui-extra/accordion": "^6.1.4", - "@smui-extra/autocomplete": "^6.2.0", - "@smui-extra/badge": "^6.1.4", - "@smui/banner": "^6.1.4", - "@smui/button": "^6.1.4", - "@smui/card": "^6.1.4", - "@smui/checkbox": "^6.1.4", - "@smui/chips": "^6.1.4", - "@smui/circular-progress": "^6.1.4", - "@smui/common": "^6.1.4", - "@smui/data-table": "^6.2.0", - "@smui/dialog": "^6.1.4", - "@smui/drawer": "^6.1.4", - "@smui/fab": "^6.1.4", - "@smui/floating-label": "^6.1.4", - "@smui/form-field": "^6.1.4", - "@smui/icon-button": "^6.1.4", - "@smui/image-list": "^6.1.4", - "@smui/layout-grid": "^6.1.4", - "@smui/line-ripple": "^6.1.4", - "@smui/linear-progress": "^6.1.4", - "@smui/list": "^6.1.4", - "@smui/menu": "^6.2.0", - "@smui/menu-surface": "^6.1.4", - "@smui/notched-outline": "^6.1.4", - "@smui/paper": "^6.1.4", - "@smui/radio": "^6.1.4", - "@smui/ripple": "^6.1.4", - "@smui/segmented-button": "^6.1.4", - "@smui/select": "^6.2.0", - "@smui/slider": "^6.1.4", - "@smui/snackbar": "^6.1.4", - "@smui/switch": "^6.1.4", - "@smui/tab": "^6.1.4", - "@smui/tab-bar": "^6.1.4", - "@smui/tab-indicator": "^6.1.4", - "@smui/tab-scroller": "^6.1.4", - "@smui/textfield": "^6.1.4", - "@smui/tooltip": "^6.1.4", - "@smui/top-app-bar": "^6.1.4", - "@smui/touch-target": "^6.1.4" - } - }, - "node_modules/svelte-material-ui/node_modules/@material/chips": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/chips/-/chips-13.0.0.tgz", - "integrity": "sha512-Ov4runDbrROUpMqKyCi3lpknfrLzGwtV+/rfYIgTYUkEVpCHXHddxXxcjP4zqh3QLXnE6ma92PLGcxCb/zzogQ==", - "dependencies": { - "@material/animation": "^13.0.0", - "@material/base": "^13.0.0", - "@material/checkbox": "^13.0.0", - "@material/density": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/elevation": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/shape": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/tokens": "^13.0.0", - "@material/touch-target": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/svelte-material-ui/node_modules/@material/form-field": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/@material/form-field/-/form-field-13.0.0.tgz", - "integrity": "sha512-cXs5uYA89KgrXrU1UYkl52JizeIK3Mx9LjBw4ZYiyQJzFaBTPYsYWGSJMad1HZhWlRiigGTyN1M9ePIxtBpi0Q==", - "dependencies": { - "@material/base": "^13.0.0", - "@material/feature-targeting": "^13.0.0", - "@material/ripple": "^13.0.0", - "@material/rtl": "^13.0.0", - "@material/theme": "^13.0.0", - "@material/typography": "^13.0.0", - "tslib": "^2.1.0" - } - }, - "node_modules/svelte-material-ui/node_modules/@smui/chips": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/chips/-/chips-6.1.4.tgz", - "integrity": "sha512-zNYQeYkaeqatT8K4DI0J1sWnNAUpUMyGIGijBEW0QZkQFf9+v4eGFemulE/feY3MrYRgGDCFydgziK6G4+ezNg==", - "dependencies": { - "@material/chips": "^13.0.0", - "@material/dom": "^13.0.0", - "@material/rtl": "^13.0.0", - "@smui/common": "^6.1.4", - "@smui/ripple": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/svelte-material-ui/node_modules/@smui/form-field": { - "version": "6.1.4", - "resolved": "https://registry.npmmirror.com/@smui/form-field/-/form-field-6.1.4.tgz", - "integrity": "sha512-MytvYxHO/+zTzReWGNZ4UXZ2jeDShyopHFfQUCfwPszHX8ckiYTx/Ld+wFBs6GSq9bGJw49gHnYkkZUfVIbm3A==", - "dependencies": { - "@material/feature-targeting": "^13.0.0", - "@material/form-field": "^13.0.0", - "@material/rtl": "^13.0.0", - "@smui/common": "^6.1.4", - "svelte2tsx": "^0.5.12" - } - }, - "node_modules/svelte-preprocess": { - "version": "4.10.7", - "resolved": "https://registry.npmmirror.com/svelte-preprocess/-/svelte-preprocess-4.10.7.tgz", - "integrity": "sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@types/pug": "^2.0.4", - "@types/sass": "^1.16.0", - "detect-indent": "^6.0.0", - "magic-string": "^0.25.7", - "sorcery": "^0.10.0", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">= 9.11.2" - }, - "peerDependencies": { - "@babel/core": "^7.10.2", - "coffeescript": "^2.5.1", - "less": "^3.11.3 || ^4.0.0", - "postcss": "^7 || ^8", - "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0", - "pug": "^3.0.0", - "sass": "^1.26.8", - "stylus": "^0.55.0", - "sugarss": "^2.0.0", - "svelte": "^3.23.0", - "typescript": "^3.9.5 || ^4.0.0" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "coffeescript": { - "optional": true - }, - "less": { - "optional": true - }, - "node-sass": { - "optional": true - }, - "postcss": { - "optional": true - }, - "postcss-load-config": { - "optional": true - }, - "pug": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "node_modules/svelte-preprocess/node_modules/magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "dependencies": { - "sourcemap-codec": "^1.4.8" - } - }, - "node_modules/svelte2tsx": { - "version": "0.5.23", - "resolved": "https://registry.npmmirror.com/svelte2tsx/-/svelte2tsx-0.5.23.tgz", - "integrity": "sha512-jYFnugTQRFmUpvLXPQrKzVYcW5ErT+0QCxg027Zx9BuvYefMZFuoBSTDYe7viPEFGrPPiLgT2m7f5n9khE7f7Q==", - "dependencies": { - "dedent-js": "^1.0.1", - "pascal-case": "^3.1.1" - }, - "peerDependencies": { - "svelte": "^3.24", - "typescript": "^4.1.2" - } - }, - "node_modules/systemjs": { - "version": "6.14.0", - "resolved": "https://registry.npmmirror.com/systemjs/-/systemjs-6.14.0.tgz", - "integrity": "sha512-OMf+kFCYG9fLQerUyw/QVIPfZ+lo579R+usrDzSrZAkvMl6B0tHtc4rUP7DFaPCr7Sy6p5DYD4V9OCF1Sp6+vA==" - }, - "node_modules/terser": { - "version": "5.16.5", - "resolved": "https://registry.npmmirror.com/terser/-/terser-5.16.5.tgz", - "integrity": "sha512-qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg==", - "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tinyld": { - "version": "1.3.1", - "resolved": "https://registry.npmmirror.com/tinyld/-/tinyld-1.3.1.tgz", - "integrity": "sha512-INB2is03ygze5dUeAp5wCYBUf/+FsXcElCmfewe1ujirCUTe4nGUNDN229Ay/C2W+f15qD7uhclstNHY+a6fgg==", - "bin": { - "tinyld": "bin/tinyld.js" - }, - "engines": { - "node": ">= 12.10.0", - "npm": ">= 6.12.0", - "yarn": ">= 1.20.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "devOptional": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/tosource": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/tosource/-/tosource-1.0.0.tgz", - "integrity": "sha512-N6g8eQ1eerw6Y1pBhdgkubWIiPFwXa2POSUrlL8jth5CyyEWNWzoGKRkO3CaO7Jx27hlJP54muB3btIAbx4MPg==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, - "node_modules/twemoji": { - "version": "14.0.2", - "resolved": "https://registry.npmmirror.com/twemoji/-/twemoji-14.0.2.tgz", - "integrity": "sha512-BzOoXIe1QVdmsUmZ54xbEH+8AgtOKUiG53zO5vVP2iUu6h5u9lN15NcuS6te4OY96qx0H7JK9vjjl9WQbkTRuA==", - "dependencies": { - "fs-extra": "^8.0.1", - "jsonfile": "^5.0.0", - "twemoji-parser": "14.0.0", - "universalify": "^0.1.2" - } - }, - "node_modules/twemoji-parser": { - "version": "14.0.0", - "resolved": "https://registry.npmmirror.com/twemoji-parser/-/twemoji-parser-14.0.0.tgz", - "integrity": "sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA==" - }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/uplot": { - "version": "1.6.24", - "resolved": "https://registry.npmmirror.com/uplot/-/uplot-1.6.24.tgz", - "integrity": "sha512-WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg==" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/vite": { - "version": "3.2.5", - "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.5.tgz", - "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==", - "dependencies": { - "esbuild": "^0.15.9", - "postcss": "^8.4.18", - "resolve": "^1.22.1", - "rollup": "^2.79.1" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - }, - "peerDependencies": { - "@types/node": ">= 14", - "less": "*", - "sass": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, - "node_modules/vitefu": { - "version": "0.2.4", - "resolved": "https://registry.npmmirror.com/vitefu/-/vitefu-0.2.4.tgz", - "integrity": "sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==", - "dev": true, - "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0" - }, - "peerDependenciesMeta": { - "vite": { - "optional": true - } - } - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - } - } -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index be8173da16..b10dac2262 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; + hash = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix index bd1b74fe4a..a3671b4766 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -12,25 +12,25 @@ in { guiStable = mkGui { channel = "stable"; - version = "2.2.43"; - hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; + version = "2.2.44.1"; + hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.43"; - hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; + version = "2.2.44.1"; + hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.43"; - hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; + version = "2.2.44.1"; + hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.43"; - hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; + version = "2.2.44.1"; + hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix index a9537d9931..85f0d7c0e6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -8,6 +8,8 @@ , fetchFromGitHub , qt5 , wrapQtAppsHook +, testers +, gns3-gui }: python3.pkgs.buildPythonApplication rec { @@ -56,6 +58,11 @@ python3.pkgs.buildPythonApplication rec { export QT_QPA_PLATFORM=offscreen ''; + passthru.tests.version = testers.testVersion { + package = gns3-gui; + command = "${lib.getExe gns3-gui} --version"; + }; + meta = with lib; { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 48d48de83b..9253412aac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -8,6 +8,8 @@ , fetchFromGitHub , pkgsStatic , stdenv +, testers +, gns3-server }: python3.pkgs.buildPythonApplication { @@ -32,7 +34,6 @@ python3.pkgs.buildPythonApplication { aiohttp-cors async-generator distro - importlib-resources jinja2 jsonschema multidict @@ -45,6 +46,8 @@ python3.pkgs.buildPythonApplication { truststore yarl zipstream + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; postInstall = lib.optionalString (!stdenv.hostPlatform.isWindows) '' @@ -72,6 +75,11 @@ python3.pkgs.buildPythonApplication { "--reruns 3" ]; + passthru.tests.version = testers.testVersion { + package = gns3-server; + command = "${lib.getExe gns3-server} --version"; + }; + meta = with lib; { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' @@ -84,5 +92,6 @@ python3.pkgs.buildPythonApplication { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "gns3server"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix index 9944238703..686f671e13 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.06"; + version = "1.07"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; - hash = "sha512-eoleQy4dKLfZsrsqUybKMjUIdqLIDTncbBnnU0fXKkhH8apP8R8H6Kmt6hTqcbhNcIkNzBcP9s4Ld54dZYa0+g=="; + hash = "sha256-LdEeZH+JWb7iEEzikAXaxG0N5GMPxjgTId4THLgdU2w="; }; inherit patches; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix index 9c0a5ea086..c8db9d33a2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-e80TExGDZkUUZdw/g4Wj9qrdCE/+RN0lfdqBBYY7t2k="; + hash = "sha256-YEfHX555qbDMbWx2MgJKQSaBK8IS9SrPXTyBPMfJ+ws="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch deleted file mode 100644 index 4784e6790f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt -index bafbabf1..0579f20a 100644 ---- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt -+++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt -@@ -188,11 +188,3 @@ install_headers(include hilti) - install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti) - install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")" - )# Get rid of symlink. -- --##### Tests -- --add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc) --hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE) --target_link_libraries(hilti-toolchain-tests PRIVATE doctest) --target_compile_options(hilti-toolchain-tests PRIVATE "-Wall") --add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests) diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix index 082607e4d0..cfb8cc685a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -14,8 +14,8 @@ let src-cmake = fetchFromGitHub { owner = "zeek"; repo = "cmake"; - rev = "9f05362a5c33ed11dab37d2dedf74206d59d8f6d"; - hash = "sha256-UfPPbwLJcI6+8EYLKRcBhxashEkCTJ2Gj1JOtFayot8="; + rev = "b191c36167bc0d6bd9f059b01ad4c99be98488d9"; + hash = "sha256-h6xPCcdTnREeDsGQhWt2w4yJofpr7g4a8xCOB2e0/qQ="; }; src-3rdparty = fetchFromGitHub { owner = "zeek"; @@ -28,17 +28,13 @@ let src = fetchFromGitHub { owner = "zeek"; repo = "actor-framework"; - rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd"; - hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg="; + rev = "4f580d89f35ae4d475505101623c8b022c0c6aa6"; + hash = "sha256-8KGXg072lZiq/rC5ZuThDGRjeYvVVFBd3ea8yhUHOYY="; }; - checkPhase = '' - runHook preCheck - libcaf_core/caf-core-test - libcaf_io/caf-io-test - libcaf_openssl/caf-openssl-test - libcaf_net/caf-net-test --not-suites='net.*' - runHook postCheck - ''; + cmakeFlags = old.cmakeFlags ++ [ + "-DCAF_ENABLE_TESTING=OFF" + ]; + doCheck = false; }); in stdenv.mkDerivation { @@ -51,8 +47,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "zeek"; repo = "broker"; - rev = "bc0205ce1fc06ddb91abb6744cb79c7eb846c23e"; - hash = "sha256-bmyitJg3kRyIXm09IupLwZXbiGZfikkHcRcIexkS4/g="; + rev = "3df8d35732d51e3bd41db067260998e79e93f366"; + hash = "sha256-37JIgbG12zd13YhfgVb4egzi80fUcZVj/s+yvsjcP7E="; }; postUnpack = '' rmdir $sourceRoot/cmake $sourceRoot/3rdparty @@ -78,6 +74,8 @@ stdenv.mkDerivation { "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + meta = with lib; { description = "Zeek's Messaging Library"; homepage = "https://github.com/zeek/broker"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch deleted file mode 100644 index 18aef60132..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt -index f154901c..76563717 100644 ---- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt -+++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt -@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE - # Build hilti-rt-debug with debug flags. - string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) - target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug}) --target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") -+target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") - target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") - - add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc) -diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt -index 20e7d291..9712341f 100644 ---- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt -+++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt -@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects) - # Build spicy-rt-debug with debug flags. - string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) - target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug}) --target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") -+target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") - target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") - target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects) - diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index eb8799e766..3922b95fba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -5,7 +5,6 @@ , cmake , flex , bison -, spicy-parser-generator , openssl , libkqueue , libpcap @@ -23,21 +22,20 @@ let broker = callPackage ./broker { }; + python = python3.withPackages (p: [ p.gitpython p.semantic-version ]); in stdenv.mkDerivation rec { pname = "zeek"; - version = "5.2.2"; + version = "6.0.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-4MJBV8yWpy5LvkyyipOZdDjU6FV7F8INc/zWddRGFcY="; + sha256 = "sha256-JCGYmtzuain0io9ycvcZ7b6VTWbC6G46Uuecrhd/iHw="; }; strictDeps = true; patches = [ - ./avoid-broken-tests.patch - ./debug-runtime-undef-fortify-source.patch ./fix-installation.patch ]; @@ -46,12 +44,11 @@ stdenv.mkDerivation rec { cmake file flex - python3 + python ]; buildInputs = [ broker - spicy-parser-generator curl gperftools libmaxminddb @@ -60,6 +57,7 @@ stdenv.mkDerivation rec { openssl swig zlib + python ] ++ lib.optionals stdenv.isLinux [ libkqueue ] ++ lib.optionals stdenv.isDarwin [ @@ -67,25 +65,25 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs ./auxil/spicy/spicy/scripts - - substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" "" - substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" "" + patchShebangs ./ci/collect-repo-info.py + patchShebangs ./auxil/spicy/scripts ''; cmakeFlags = [ "-DBroker_ROOT=${broker}" - "-DSPICY_ROOT_DIR=${spicy-parser-generator}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" "-DZEEK_LOG_DIR=/var/log/zeek" "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" + "-DDISABLE_JAVASCRIPT=ON" ] ++ lib.optionals stdenv.isLinux [ "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + postInstall = '' for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do substituteInPlace $file \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch index 6360a11730..63c213e3a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/fix-installation.patch @@ -1,18 +1,9 @@ -From f8c42a712db42cfd00fca75be2ce63c3aad2aad1 Mon Sep 17 00:00:00 2001 -From: Tobias Mayer -Date: Sun, 13 Nov 2022 21:48:36 +0100 -Subject: [PATCH] Fix installation - ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 846b65efd..d8b0be169 100644 +index 4d3da0c90..d37931c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,11 +81,6 @@ if ( NOT ZEEK_LOG_DIR ) - set(ZEEK_LOG_DIR ${ZEEK_ROOT_DIR}/logs) +@@ -503,11 +503,6 @@ if (NOT MSVC) + set(HAVE_SUPERVISOR true) endif () -install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR}) @@ -21,8 +12,68 @@ index 846b65efd..d8b0be169 100644 -install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR}) - configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) - execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink - "${CMAKE_CURRENT_BINARY_DIR}/zeek-wrapper.in" --- -2.37.3 - + + file( +@@ -1198,7 +1193,7 @@ if (INSTALL_ZKG) + @ONLY) + + install(DIRECTORY DESTINATION var/lib/zkg) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR} ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/zeek/zkg + RENAME config) + endif () + +Submodule auxil/zeekctl contains modified content +diff --git a/auxil/zeekctl/CMakeLists.txt b/auxil/zeekctl/CMakeLists.txt +index 1ebe7c2..1435509 100644 +--- a/auxil/zeekctl/CMakeLists.txt ++++ b/auxil/zeekctl/CMakeLists.txt +@@ -9,7 +9,7 @@ file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) + set(PREFIX "${CMAKE_INSTALL_PREFIX}") + set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") + set(ZEEKSCRIPTDIR "${ZEEK_SCRIPT_INSTALL_PATH}") +-set(ETC "${ZEEK_ETC_INSTALL_DIR}") ++set(ETC "${CMAKE_INSTALL_SYSCONFDIR}") + + ######################################################################## + ## Dependency Configuration +@@ -200,38 +200,9 @@ else () + set(LOGS ${VAR}/logs) + endif () + +-if ( BINARY_PACKAGING_MODE AND NOT APPLE ) +- # Packaging for Apple-based systems does not need special logic +- # because many probably find it more convenient for uninstalling +- # when everything resides under a common prefix (since there's no +- # native package management system) +- set(perms OWNER_READ OWNER_WRITE OWNER_EXECUTE +- GROUP_READ GROUP_WRITE GROUP_EXECUTE +- WORLD_READ WORLD_WRITE WORLD_EXECUTE) +- +- install(DIRECTORY DESTINATION ${SPOOL} +- DIRECTORY_PERMISSIONS ${perms}) +- install(DIRECTORY DESTINATION ${SPOOL}/tmp +- DIRECTORY_PERMISSIONS ${perms}) +- install(DIRECTORY DESTINATION ${SPOOL}/brokerstore +- DIRECTORY_PERMISSIONS ${perms}) +- install(DIRECTORY DESTINATION ${LOGS} +- DIRECTORY_PERMISSIONS ${perms}) +- set(EMPTY_WORLD_DIRS +- "${EMPTY_WORLD_DIRS} ${SPOOL} ${SPOOL}/tmp ${LOGS}" +- CACHE STRING "" FORCE) +-else () +- install(DIRECTORY DESTINATION ${SPOOL}) +- install(DIRECTORY DESTINATION ${SPOOL}/tmp) +- install(DIRECTORY DESTINATION ${SPOOL}/brokerstore) +- install(DIRECTORY DESTINATION ${LOGS}) +-endif () +- + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh + "# Automatically generated. Do not edit.\n") +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh DESTINATION ${SPOOL}) +-InstallSymlink(${SPOOL}/zeekctl-config.sh +- ${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh DESTINATION ${PREFIX}/share/zeekctl/scripts) + + # A couple of configuration options that are needed are placed in here. + configure_file(etc/zeekctl.cfg.in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 843728a098..69515f82dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.0.3"; + version = "9.5.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - sha256 = "sha256-Mmw4wWjU1Fr2dqonD3Vin8m6VX2dfDXbMDl+lTT4YT4="; + hash = "sha256-UQg7yGKdjZWrJpPAaHpPz9aQuxLvuRDXeQaOg7WorwE="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang hexchen ]; + mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index e8e5f01206..9b16c05241 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -20,7 +20,6 @@ , glib , gtk3 , libappindicator-gtk3 -, libdbusmenu , libdrm , libnotify , libpulseaudio @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.4-libwebp"; + version = "3.2.5"; src = let @@ -47,12 +46,12 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb"; - hash = "sha256-WeHgai9vTaN04zMdAXmhemKroKH+kwHuOr/E85mfurE="; + url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; + hash = "sha256-6zlYm4xuYpG+Bgsq5S+B/Zt9TRB2GZnueKAg2ywYLE4="; }; aarch64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_arm64.deb"; - hash = "sha256-4/vGdWXv8wrbF/EhMK6kJPjta0EOGH6C3kUyM0OTB8M="; + url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; + hash = "sha256-HJu1lRa3zOTohsPMe23puHxg1VMWNR2aOjDQJqc4TqE="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5aa3629bd3..fd9bdf8923 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "3.6.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g="; + hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix index c523b59fb1..2bb15a79b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -1,11 +1,21 @@ -{ lib, fetchurl, mkDerivation, appimageTools, libsecret, makeWrapper }: +{ lib +, stdenvNoCC +, fetchurl +, appimageTools +, libsecret +, makeWrapper +, writeShellApplication +, curl +, yq +, common-updater-scripts +}: let pname = "beeper"; - version = "3.71.16"; + version = "3.85.17"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-${version}.AppImage"; - hash = "sha256-Ho5zFmhNzkOmzo/btV+qZfP2GGx5XvV/1JncEKlH4vc="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage"; + hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0="; }; appimage = appimageTools.wrapType2 { inherit version pname src; @@ -15,8 +25,8 @@ let inherit version pname src; }; in -mkDerivation rec { - inherit name pname; +stdenvNoCC.mkDerivation rec { + inherit name pname version; src = appimage; @@ -44,6 +54,20 @@ mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-beeper"; + runtimeInputs = [ curl yq common-updater-scripts ]; + text = '' + set -o errexit + latestLinux="$(curl -s https://download.todesktop.com/2003241lzgn20jd/latest-linux.yml)" + version="$(echo "$latestLinux" | yq -r .version)" + filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')" + update-source-version beeper "$version" "" "https://download.todesktop.com/2003241lzgn20jd/$filename" --source-key=src.src + ''; + }); + }; + meta = with lib; { description = "Universal chat app."; longDescription = '' @@ -53,7 +77,7 @@ mkDerivation rec { ''; homepage = "https://beeper.com"; license = licenses.unfree; - maintainers = with maintainers; [ jshcmpbll ]; + maintainers = with maintainers; [ jshcmpbll mjm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index ed8fab4473..73d1321850 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.58.3"; + version = "2.59.1"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; + sha256 = "sha256-stMv4KQoWPmK5jcfdhamC27Rb51zjbeEn40u6YUvXz4="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; + sha256 = "sha256-WMT4yrLjDSMsI/lFbYODu3/0whcF+++4ShoChfMyLfQ="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nickel/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock similarity index 51% rename from third_party/nixpkgs/pkgs/development/interpreters/nickel/Cargo.lock rename to third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock index 134dec047f..0fe7233f63 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nickel/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock @@ -2,162 +2,80 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.10", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" -version = "1.0.5" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "anes" -version = "0.1.6" +name = "alloc-no-stdlib" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] -name = "ansi_term" -version = "0.12.1" +name = "alloc-stdlib" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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 = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", + "alloc-no-stdlib", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "atk" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ - "term", -] - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[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", + "atk-sys", + "bitflags", + "glib", "libc", - "winapi", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] + +[[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]] @@ -166,63 +84,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -230,72 +97,146 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitflags" -version = "2.4.0" +name = "block" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] [[package]] -name = "block-padding" -version = "0.2.1" +name = "brotli" +version = "3.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] [[package]] name = "bstr" -version = "1.6.2" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "memchr", - "regex-automata", - "serde", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" [[package]] -name = "cast" -version = "0.3.0" +name = "byteorder" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "cargo_toml" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8" +dependencies = [ + "serde", + "toml", +] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" dependencies = [ - "libc", + "byteorder", + "uuid 0.8.2", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +dependencies = [ + "smallvec", ] [[package]] @@ -305,179 +246,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +name = "cinny" +version = "3.1.0" dependencies = [ - "ciborium-io", - "ciborium-ll", "serde", + "serde_json", + "tauri", + "tauri-build", ] [[package]] -name = "ciborium-io" -version = "0.2.1" +name = "cocoa" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" -dependencies = [ - "anstream", - "anstyle", - "clap_lex 0.5.1", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" -dependencies = [ - "clap 4.4.3", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "codespan" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3362992a0d9f1dd7c3d0e89e0ab2bb540b7a95fea8cd798090e758fda2899b5e" -dependencies = [ - "codespan-reporting", -] - -[[package]] -name = "codespan-lsp" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4159b76af02757139baf42c0c971c6dc155330999fbfd8eddb29b97fb2db68" -dependencies = [ - "codespan-reporting", - "lsp-types", - "url", -] - -[[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 = "comrak" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" -dependencies = [ - "clap 4.4.3", - "entities", - "memchr", - "once_cell", - "regex", - "shell-words", - "slug", - "syntect", - "typed-arena", - "unicode_categories", - "xdg", -] - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", "libc", - "windows-sys 0.45.0", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", ] [[package]] @@ -487,28 +309,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "coolor" -version = "0.5.0" +name = "core-foundation" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "crossterm", + "core-foundation-sys", + "libc", ] [[package]] -name = "cpp_demangle" -version = "0.4.3" +name = "core-foundation-sys" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "cfg-if", + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation", + "foreign-types", + "libc", ] [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -522,95 +367,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.25", - "criterion-plot", - "itertools 0.10.5", - "lazy_static", - "num-traits", - "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" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.6" 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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if", "crossbeam-utils", @@ -618,44 +379,13 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] -[[package]] -name = "crossterm" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" @@ -667,40 +397,93 @@ dependencies = [ ] [[package]] -name = "csv" -version = "1.2.2" +name = "cssparser" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn", ] [[package]] -name = "csv-core" -version = "0.1.10" +name = "cssparser-macros" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" dependencies = [ - "memchr", + "quote", + "syn", ] [[package]] -name = "debugid" -version = "0.8.0" +name = "ctor" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "uuid", + "quote", + "syn", ] [[package]] -name = "deranged" -version = "0.3.8" +name = "cty" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dbus" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] [[package]] name = "derive_more" @@ -709,58 +492,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.67", - "quote 1.0.33", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "deunicode" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn", ] [[package]] name = "digest" -version = "0.10.7" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", ] -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs-next" version = "2.0.0" @@ -771,17 +518,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -794,156 +530,83 @@ dependencies = [ ] [[package]] -name = "doc-comment" +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "dtoa-short" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "embed-doc-image" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" dependencies = [ - "base64 0.13.1", - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", + "dtoa", ] [[package]] -name = "ena" -version = "0.14.2" +name = "dunce" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "log", -] - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "entities" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" - -[[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 = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", + "cfg-if", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] [[package]] -name = "fd-lock" -version = "3.0.13" +name = "field-offset" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset", + "rustc_version 0.3.3", +] + +[[package]] +name = "filetime" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if", - "rustix 0.38.13", - "windows-sys 0.48.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", + "redox_syscall", + "windows-sys 0.42.0", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -956,50 +619,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.2.0" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +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 = "futures" -version = "0.3.28" +name = "futf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "mac", + "new_debug_unreachable", ] [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", - "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -1008,56 +680,140 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", + "proc-macro2", + "quote", + "syn", ] -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" 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" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.0.3", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.0.3", + "x11", +] + +[[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", @@ -1076,9 +832,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -1086,44 +842,164 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.0" +name = "gio" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - -[[package]] -name = "git-version" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "git-version-macro", - "proc-macro-hack", + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", ] [[package]] -name = "git-version-macro" -version = "0.3.5" +name = "gio-sys" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +dependencies = [ + "anyhow", + "heck 0.4.0", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.0.3", ] [[package]] name = "glob" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "half" -version = "1.8.2" +name = "globset" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.0.3", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "hashbrown" @@ -1132,16 +1008,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "hashbrown" -version = "0.14.0" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "heck" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" @@ -1153,194 +1032,206 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.2" +name = "html5ever" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "humantime" -version = "2.1.0" +name = "http" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.4", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[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.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "ignore" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown 0.12.3", - "serde", + "hashbrown", ] [[package]] -name = "indexmap" -version = "2.0.0" +name = "infer" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" dependencies = [ - "equivalent", - "hashbrown 0.14.0", + "cfb", ] [[package]] -name = "indoc" -version = "1.0.9" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[package]] -name = "inferno" -version = "0.11.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "ahash", - "indexmap 2.0.0", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml 0.26.0", - "rgb", - "str_stack", -] - -[[package]] -name = "insta" -version = "1.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "regex", - "similar", - "yaml-rust", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.13", - "windows-sys 0.48.0", -] - -[[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 = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", + "cfg-if", ] [[package]] name = "itoa" -version = "1.0.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[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.61" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] [[package]] -name = "keccak" -version = "0.1.4" +name = "json-patch" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ - "cpufeatures", + "serde", + "serde_json", + "treediff", ] [[package]] -name = "lalrpop" -version = "0.19.12" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.6.29", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid 0.2.4", -] - -[[package]] -name = "lalrpop-util" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" -dependencies = [ - "regex", + "cssparser", + "html5ever", + "matches", + "selectors", ] [[package]] @@ -1350,10 +1241,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.148" +name = "libappindicator" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] [[package]] name = "line-wrap" @@ -1364,29 +1298,11 @@ dependencies = [ "safemem", ] -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -1394,148 +1310,91 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "logos" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "logos-derive", + "cfg-if", ] [[package]] -name = "logos-derive" -version = "0.12.1" +name = "loom" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ - "beef", - "fnv", - "proc-macro2 1.0.67", - "quote 1.0.33", - "regex-syntax 0.6.29", - "syn 1.0.109", -] - -[[package]] -name = "lsp-harness" -version = "0.1.0" -dependencies = [ - "anyhow", - "assert_cmd", - "env_logger", - "insta", - "log", - "lsp-server", - "lsp-types", - "nickel-lang-utils", + "cfg-if", + "generator", + "scoped-tls", "serde", "serde_json", - "test-generator", - "toml", + "tracing", + "tracing-subscriber", ] [[package]] -name = "lsp-server" -version = "0.6.0" +name = "mac" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f70570c1c29cf6654029b8fe201a5507c153f0d85be6f234d471d756bc36775a" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" dependencies = [ - "crossbeam-channel", - "log", - "serde", - "serde_json", + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", ] [[package]] -name = "lsp-types" -version = "0.88.0" +name = "malloc_buf" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e8e042772e4e10b3785822f63c82399d0dd233825de44d2596f7fa86e023e0" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "malachite" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7f4730c30071ba374fac86ad35b1cb7a0716f774737768667ea3fa1828e3" -dependencies = [ - "malachite-base", - "malachite-nz", - "malachite-q", -] - -[[package]] -name = "malachite-base" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06bfa98a4b4802af5a4263b4ad4660e28e51e8490f6354eb9336c70767e1c5" -dependencies = [ - "itertools 0.9.0", - "rand", - "rand_chacha", - "ryu", - "sha3", -] - -[[package]] -name = "malachite-nz" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e21c64b7af5be3dc8cef16f786243faf59459fe4ba93b44efdeb264e5ade4" -dependencies = [ - "embed-doc-image", - "itertools 0.9.0", - "malachite-base", - "serde", -] - -[[package]] -name = "malachite-q" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755e541d5134b5016594c9043094172c4dda9259b3ce824a7b8101941850360" -dependencies = [ - "itertools 0.9.0", - "malachite-base", - "malachite-nz", - "serde", -] - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ "libc", ] +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "memoffset" version = "0.6.5" @@ -1546,42 +1405,64 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "minisign-verify" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimad" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef" -dependencies = [ - "once_cell", -] +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] -name = "mio" -version = "0.8.8" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ + "lazy_static", "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", ] [[package]] @@ -1591,231 +1472,243 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] -name = "nibble_vec" -version = "0.1.0" +name = "nodrop" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "nickel-lang-cli" -version = "1.2.2" -dependencies = [ - "clap 4.4.3", - "clap_complete", - "directories", - "git-version", - "insta", - "nickel-lang-core", - "nickel-lang-utils", - "serde", - "tempfile", - "test-generator", -] - -[[package]] -name = "nickel-lang-core" -version = "0.2.0" -dependencies = [ - "ansi_term", - "assert_matches", - "clap 4.4.3", - "codespan", - "codespan-reporting", - "comrak", - "criterion", - "indexmap 1.9.3", - "indoc 2.0.3", - "js-sys", - "lalrpop", - "lalrpop-util", - "logos", - "malachite", - "malachite-q", - "md-5", - "nickel-lang-utils", - "once_cell", - "pprof", - "pretty", - "pretty_assertions", - "regex", - "rustyline", - "rustyline-derive", - "serde", - "serde-wasm-bindgen", - "serde_json", - "serde_repr", - "serde_yaml", - "sha-1", - "sha2", - "similar", - "simple-counter", - "strip-ansi-escapes", - "termimad", - "test-generator", - "toml", - "topiary", - "tree-sitter-nickel 0.1.0", - "typed-arena", - "unicode-segmentation", - "void", - "wasm-bindgen", -] - -[[package]] -name = "nickel-lang-lsp" -version = "1.2.2" -dependencies = [ - "anyhow", - "assert_cmd", - "assert_matches", - "clap 4.4.3", - "codespan", - "codespan-lsp", - "codespan-reporting", - "csv", - "derive_more", - "env_logger", - "insta", - "lalrpop", - "lalrpop-util", - "lazy_static", - "log", - "lsp-harness", - "lsp-server", - "lsp-types", - "nickel-lang-core", - "nickel-lang-utils", - "pretty_assertions", - "regex", - "serde", - "serde_json", - "test-generator", - "thiserror", -] - -[[package]] -name = "nickel-lang-utils" -version = "0.1.0" -dependencies = [ - "codespan", - "criterion", - "nickel-lang-core", - "serde", - "toml", -] - -[[package]] -name = "nickel-wasm-repl" -version = "0.1.0" -dependencies = [ - "nickel-lang-core", -] - -[[package]] -name = "nix" -version = "0.26.4" +name = "notify-rust" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "dbus", + "mac-notification-sys", + "tauri-winrt-notification", ] [[package]] -name = "num-format" -version = "0.4.4" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "arrayvec 0.7.4", - "itoa", + "overload", + "winapi", +] + +[[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-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.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] [[package]] -name = "object" -version = "0.32.1" +name = "num_enum" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "memchr", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] -name = "onig" -version = "6.4.0" +name = "open" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ - "bitflags 1.3.2", + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", "libc", "once_cell", - "onig_sys", + "openssl-macros", + "openssl-sys", ] [[package]] -name = "onig_sys" -version = "69.8.1" +name = "openssl-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" 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.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +dependencies = [ + "autocfg", "cc", + "libc", "pkg-config", + "vcpkg", ] [[package]] -name = "oorandom" -version = "11.1.3" +name = "os_info" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - -[[package]] -name = "pad" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" dependencies = [ - "unicode-width", + "log", + "serde", + "winapi", +] + +[[package]] +name = "os_pipe" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", ] [[package]] @@ -1830,31 +1723,132 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-sys 0.42.0", ] [[package]] -name = "percent-encoding" -version = "2.3.0" +name = "paste" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] -name = "petgraph" -version = "0.6.4" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" dependencies = [ - "fixedbitset", - "indexmap 2.0.0", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +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_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[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 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", ] [[package]] @@ -1868,9 +1862,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1880,72 +1874,34 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" -version = "1.5.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" dependencies = [ - "base64 0.21.4", - "indexmap 1.9.3", + "base64", + "indexmap", "line-wrap", - "quick-xml 0.29.0", "serde", "time", + "xml-rs", ] [[package]] -name = "plotters" -version = "0.3.5" +name = "png" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "pprof" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" -dependencies = [ - "backtrace", - "cfg-if", - "criterion", - "findshlibs", - "inferno", - "libc", - "log", - "nix", - "once_cell", - "parking_lot", - "smallvec", - "symbolic-demangle", - "tempfile", - "thiserror", + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", ] [[package]] @@ -1961,203 +1917,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "predicates" -version = "3.0.3" +name = "proc-macro-crate" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ - "anstyle", - "difflib", - "itertools 0.10.5", - "predicates-core", + "once_cell", + "thiserror", + "toml", ] [[package]] -name = "predicates-core" -version = "1.0.6" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "predicates-core", - "termtree", + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", ] [[package]] -name = "pretty" -version = "0.11.3" +name = "proc-macro-error-attr" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f3aa1e3ca87d3b124db7461265ac176b40c277f37e503eaa29c9c75c037846" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "arrayvec 0.5.2", - "log", - "typed-arena", - "unicode-segmentation", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "prettydiff" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" -dependencies = [ - "ansi_term", - "pad", + "proc-macro2", + "quote", + "version_check", ] [[package]] name = "proc-macro-hack" -version = "0.5.20+deprecated" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "0.4.30" +version = "1.0.47" 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.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] -[[package]] -name = "pyckel" -version = "1.2.2" -dependencies = [ - "codespan-reporting", - "nickel-lang-core", - "pyo3", - "pyo3-build-config", -] - -[[package]] -name = "pyo3" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" -dependencies = [ - "cfg-if", - "indoc 1.0.9", - "libc", - "memoffset 0.6.5", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" -dependencies = [ - "proc-macro2 1.0.67", - "pyo3-macros-backend", - "quote 1.0.33", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", -] - [[package]] name = "quick-xml" -version = "0.26.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "0.6.13" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2 1.0.67", -] - -[[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", + "proc-macro2", ] [[package]] @@ -2168,9 +1992,21 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ "getrandom 0.1.16", "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.2.2", + "rand_core 0.5.1", "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", ] [[package]] @@ -2180,7 +2016,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", ] [[package]] @@ -2192,35 +2038,40 @@ dependencies = [ "getrandom 0.1.16", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.8", +] + [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", ] [[package]] -name = "rayon" -version = "1.7.0" +name = "rand_pcg" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "either", - "rayon-core", + "rand_core 0.5.1", ] [[package]] -name = "rayon-core" -version = "1.11.0" +name = "raw-window-handle" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "cty", ] [[package]] @@ -2229,16 +2080,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -2247,60 +2089,78 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.8", + "redox_syscall", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] -name = "regex-syntax" -version = "0.7.5" +name = "remove_dir_all" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "rgb" -version = "0.8.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "bytemuck", + "winapi", ] [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "rfd" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +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", +] + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] [[package]] name = "rustc_version" @@ -2308,81 +2168,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.7", - "windows-sys 0.48.0", + "semver 1.0.14", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustyline" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "rustyline-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", -] +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "safemem" @@ -2400,203 +2199,283 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.2.0" +name = "schannel" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[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 = "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 = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] [[package]] name = "semver" -version = "1.0.18" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +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.188" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ - "itoa", + "itoa 1.0.4", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "serde_spanned" -version = "0.6.3" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.0", - "itoa", + "form_urlencoded", + "itoa 1.0.4", "ryu", "serde", - "unsafe-libyaml", ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "serde_with" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] -name = "sha3" -version = "0.9.1" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "lazy_static", ] [[package]] -name = "shell-words" -version = "1.1.0" +name = "shared_child" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" dependencies = [ "libc", - "signal-hook-registry", + "winapi", ] -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "simple-counter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb57743b52ea059937169c0061d70298fe2df1d2c988b44caae79dd979d9b49" - [[package]] name = "siphasher" -version = "0.3.11" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" dependencies = [ "autocfg", ] [[package]] -name = "slug" -version = "0.1.4" +name = "smallvec" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "deunicode", + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", ] [[package]] -name = "smallvec" -version = "1.11.0" +name = "soup2-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] [[package]] name = "stable_deref_trait" @@ -2605,37 +2484,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "str-buf" -version = "1.0.6" +name = "state" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] [[package]] name = "string_cache" -version = "0.8.7" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ "new_debug_unreachable", "once_cell", "parking_lot", - "phf_shared", + "phf_shared 0.10.0", "precomputed-hash", + "serde", ] [[package]] -name = "strip-ansi-escapes" -version = "0.2.0" +name = "string_cache_codegen" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "vte", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", ] [[package]] @@ -2645,198 +2525,381 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "symbolic-common" -version = "10.2.1" +name = "strum" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" dependencies = [ - "debugid", - "memmap2", - "stable_deref_trait", - "uuid", + "strum_macros", ] [[package]] -name = "symbolic-demangle" -version = "10.2.1" +name = "strum_macros" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ - "cpp_demangle", - "rustc-demangle", - "symbolic-common", + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "syn" -version = "0.15.44" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] -name = "syn" -version = "2.0.33" +name = "system-deps" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "unicode-ident", + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml", + "version-compare 0.0.11", ] [[package]] -name = "syntect" -version = "5.1.0" +name = "system-deps" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", + "cfg-expr 0.11.0", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1fa15735311b4816d030ff54da58560b047daca0970e1031aed5502e84231a8" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", "once_cell", - "onig", - "plist", - "regex-syntax 0.7.5", + "parking_lot", + "paste", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid 1.2.2", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tauri" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679" +dependencies = [ + "anyhow", + "attohttpc", + "base64", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.0", + "http", + "ignore", + "minisign-verify", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver 1.0.14", "serde", "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", "thiserror", - "walkdir", - "yaml-rust", + "time", + "tokio", + "url", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", ] [[package]] -name = "target-lexicon" -version = "0.12.11" +name = "tauri-build" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.0", + "json-patch", + "semver 1.0.14", + "serde_json", + "tauri-utils", + "winres", +] + +[[package]] +name = "tauri-codegen" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +dependencies = [ + "base64", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver 1.0.14", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid 1.2.2", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-runtime" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +dependencies = [ + "gtk", + "http", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "uuid 1.2.2", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +dependencies = [ + "brotli", + "ctor", + "glob", + "heck 0.4.0", + "html5ever", + "infer", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.14", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" +dependencies = [ + "quick-xml", + "strum", + "windows 0.39.0", +] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.13", - "windows-sys 0.48.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", + "libc", + "redox_syscall", + "remove_dir_all", "winapi", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "tendril" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ - "winapi-util", + "futf", + "mac", + "utf-8", ] [[package]] -name = "termimad" -version = "0.23.2" +name = "thin-slice" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e32883199fc52cda7e431958dee8bc3ec6898afabc152b76959b9e0e74e2202" -dependencies = [ - "coolor", - "crossbeam", - "crossterm", - "minimad", - "thiserror", - "unicode-width", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.23", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-generator" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b23be2add79223226e1cb6446cb3e37506a5927089870687a0f1149bb7a073a" -dependencies = [ - "glob", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", + "proc-macro2", + "quote", + "syn", +] + +[[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.3.28" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "deranged", - "itoa", + "itoa 1.0.4", "serde", "time-core", "time-macros", @@ -2844,38 +2907,19 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[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" @@ -2887,210 +2931,104 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.32.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ - "backtrace", + "autocfg", + "bytes", + "memchr", + "num_cpus", "pin-project-lite", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 2.0.33", + "windows-sys 0.42.0", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] -name = "toml_edit" -version = "0.19.15" +name = "tracing" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", ] [[package]] -name = "topiary" -version = "0.2.3" -source = "git+https://github.com/tweag/topiary.git?rev=refs/heads/main#7e6cb4f8b505eacee57aaf3c1ab0f3cf539da159" +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "clap 4.4.3", - "futures", - "itertools 0.11.0", + "proc-macro2", + "quote", + "syn", +] + +[[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", - "pretty_assertions", - "prettydiff", + "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", - "serde", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ "serde_json", - "tokio", - "toml", - "tree-sitter-bash", - "tree-sitter-facade", - "tree-sitter-json", - "tree-sitter-nickel 0.0.1", - "tree-sitter-ocaml", - "tree-sitter-ocamllex", - "tree-sitter-query", - "tree-sitter-rust", - "tree-sitter-toml", - "unescape", - "web-tree-sitter-sys", ] -[[package]] -name = "tree-sitter" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#bdcd56c5a3896f7bbb7684e223c43d9f24380351" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-facade" -version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" -dependencies = [ - "js-sys", - "tree-sitter", - "wasm-bindgen", - "web-sys", - "web-tree-sitter-sys", -] - -[[package]] -name = "tree-sitter-json" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-nickel" -version = "0.0.1" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=b1a4718601ebd29a62bf3a7fd1069a99ccf48093#b1a4718601ebd29a62bf3a7fd1069a99ccf48093" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-nickel" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e95267764f0648c768e4da3e4c31b96bc5716446497dfa8b6296924b149f64a" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1163abc658cf8ae0ecffbd8f4bd3ee00a2b98729de74f3b08f0e24f3ac208a" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocamllex" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e774222086fd065999b6605fb231fbfc386bf782aa7dbad52503ff00b429a62" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-query" -version = "0.1.0" -source = "git+https://github.com/nvim-treesitter/tree-sitter-query#3a9808b22742d5bd906ef5d1a562f2f1ae57406d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - [[package]] name = "typenum" version = "1.16.0" @@ -3098,22 +3036,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "unescape" -version = "0.1.0" +name = "ucd-trie" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" @@ -3126,51 +3064,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.10.0" 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.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 = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "url" -version = "2.4.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", @@ -3179,16 +3081,49 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.4.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + +[[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 = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -3196,48 +3131,14 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", -] - -[[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.4.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", + "winapi", "winapi-util", ] @@ -3255,36 +3156,34 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", - "serde", - "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -3294,52 +3193,126 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ - "quote 1.0.33", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ - "proc-macro2 1.0.67", - "quote 1.0.33", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "web-tree-sitter-sys" -version = "1.3.0" -source = "git+https://github.com/tweag/web-tree-sitter-sys#9e9755b9ab59055092de4717ba0bafe6483f4e5c" +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.0.3", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", ] [[package]] @@ -3374,163 +3347,314 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" dependencies = [ - "windows-targets 0.42.2", + "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", + "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-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows-targets 0.48.5", + "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-targets" -version = "0.42.2" +name = "windows-tokens" +version = "0.39.0" 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.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", -] +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[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.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[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.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[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.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[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.2" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" [[package]] -name = "winnow" -version = "0.5.15" +name = "windows_x86_64_msvc" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +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 = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "memchr", + "toml", ] [[package]] -name = "xdg" -version = "2.5.2" +name = "wry" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "9ae300cf3ac1abd15037d0956d25d084077c8d67a075d7ef6971426a04f6fdd1" dependencies = [ - "linked-hash-map", + "base64", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "x11" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +dependencies = [ + "lazy_static", + "libc", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "zip" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 2dbe74d3b3..9777dca11c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -9,28 +9,37 @@ , dbus , glib , glib-networking +, libayatana-appindicator , webkitgtk , makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; - version = "2.2.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "v${version}"; - hash = "sha256-RW6LeItIAHJk1e7qMa1MLIGb3jHvJ/KM8E9l1qR48w8="; + hash = "sha256-v5D0/EHVQ2xo7TGo+jZoRDBVFczkaZu2ka6QpwV4dpw="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-Iab/icQ9hFVh/o6egZVPa2zeKgO5WxzkluhRckcayvw="; + # modififying $cargoDepsCopy requires the lock to be vendored + cargoLock.lockFile = ./Cargo.lock; - postPatch = '' + postPatch = let + cinny' = + assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + cinny; + in '' substituteInPlace tauri.conf.json \ - --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny}",' + --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' + + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; postInstall = '' @@ -50,6 +59,7 @@ rustPlatform.buildRustPackage rec { dbus glib glib-networking + libayatana-appindicator webkitgtk ]; @@ -67,7 +77,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = [ maintainers.aveltras ]; + maintainers = [ ]; license = licenses.agpl3Only; platforms = platforms.linux; mainProgram = "cinny"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 336d045b6c..db3b48e4a2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -1,23 +1,46 @@ -{ lib, buildNpmPackage, fetchFromGitHub, writeText, jq, conf ? { } }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, writeText +, jq +, python3 +, pkg-config +, pixman +, cairo +, pango +, stdenv +, darwin +, conf ? { } +}: let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in buildNpmPackage rec { pname = "cinny"; - version = "2.2.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-Da/gbq9piKvkIMiamoafcRrqxF7128GXoswk2C43An8="; + hash = "sha256-GcygxK9NcGlv4rwxQCJqi0BhNlOTFxjGB8mbfTaBMOk="; }; - npmDepsHash = "sha256-3wgB/dQmLtwxbRsk+OUcyfx98vpCvhvseEOCrJIFohY="; + npmDepsHash = "sha256-4R+To2LhcnEM9x1noo6MhCckyBKgPWiAi7zgDqAmaN0="; nativeBuildInputs = [ jq + python3 + pkg-config + ]; + + buildInputs = [ + pixman + cairo + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreText ]; installPhase = '' @@ -32,7 +55,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe ashkitten ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index f1361fea13..5343fd1c4d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -1,38 +1,55 @@ { lib , python3 , fetchFromGitHub +, testers +, deltachat-cursed }: python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.7.2"; + version = "0.8.0"; + + pyproject = true; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk="; + hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools-scm + nativeBuildInputs = with python3.pythonOnBuildForHost.pkgs; [ + setuptools + setuptools-scm ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = with python3.pkgs; [ + appdirs deltachat emoji notify-py + setuptools # for pkg_resources urwid-readline ]; doCheck = false; # no tests implemented + passthru.tests = { + version = testers.testVersion rec { + package = deltachat-cursed; + command = '' + HOME="$TEMP" ${lib.getExe package} --version + ''; + }; + }; + meta = with lib; { description = "Lightweight Delta Chat client"; homepage = "https://github.com/adbenitez/deltachat-cursed"; license = licenses.gpl3Plus; + mainProgram = "curseddelta"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 6fae9b25fd..fea9da80d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_22 +, electron_26 , buildGoModule , esbuild , fetchFromGitHub @@ -15,6 +15,8 @@ , sqlcipher , stdenv , CoreServices +, testers +, deltachat-desktop }: let @@ -33,16 +35,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.40.4"; + version = "1.41.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU="; + hash = "sha256-ITcBIm47OiGy/i6jnG6r1OoStjRPystOts6ViLioLNY="; }; - npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0="; + npmDepsHash = "sha256-+t6m2kDUOh6kIkbZgol/CQciDTxUZSkTr1amPywrMb4="; nativeBuildInputs = [ makeWrapper @@ -92,7 +94,7 @@ buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop @@ -116,6 +118,12 @@ buildNpmPackage rec { ]; }); + passthru.tests = { + version = testers.testVersion { + package = deltachat-desktop; + }; + }; + meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 2cd7ee2d2c..1862cf6e04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,52 +1,52 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.31"; - ptb = "0.0.49"; - canary = "0.0.170"; - development = "0.0.234"; + stable = "0.0.33"; + ptb = "0.0.53"; + canary = "0.0.173"; + development = "0.0.1"; } else { - stable = "0.0.280"; - ptb = "0.0.80"; - canary = "0.0.315"; - development = "0.0.8797"; + stable = "0.0.282"; + ptb = "0.0.84"; + canary = "0.0.329"; + development = "0.0.2"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-toWwiMsEFsGaOYaPZziSmZtpzxGd9m+2MtxTrJwqFbw="; + hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-o8cDoBe6A0wBjVLjp4JXrv3QsG7TZ/Kj4+T5lj6WHdY="; + hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Lw+qLAAwyoDBKDPOBA9HR79gcnqwTshFq6GMpFS0tXA="; + hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-R5UwgpXgb32mEohTzyRVXmumcgPl8UPan3UjmLFLxLo="; + hash = "sha256-ogLOZZ9pTXB01TqdnmdORIzZ8GbGzskUzbG4E68gZwY="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-SUbpzd8RIf+e+so/dXZh5OkjCvWRC+EyqgeIg4u32Hg="; + hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-IvrCjiZ5Oa616+U8C2ihg8THj7ePV2A8+82wUWqWoPY="; + hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-m43SijSBxcAvYAlSFpQKIFILUm4AgSQ5F4XyQJyftts="; + hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo="; + hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 0c4bebcab9..ce304a4fb2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2023-07-07"; + version = "unstable-2023-10-24"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "5ac246dc92e9a2a9b314d899df728f37096c482b"; - hash = "sha256-ODeVru4LCSl3rIeJCdezAwqzKP6IRo5WDaaUymqEcBs="; + rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2"; + hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index 5f0506b022..a49a2f2715 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.45"; + "version" = "1.11.47"; "hashes" = { - "desktopSrcHash" = "sha256-SxpnvIctV738mMRmMiuLgr1InMrlWH39/6lTO0wu+vQ="; - "desktopYarnHash" = "09a2swngqjz4hahzvczhw0lh38y39glc1dkkhjkp4jqvmds9ni7n"; - "webSrcHash" = "sha256-hImwZ7vzpupRulk9g5jhfv0sgZqmPXnggJjUUwZ+UCE="; - "webYarnHash" = "0r2xzq9630vky32hqp3h1skdgv3jiiffi8553yzzk4zr45nlvf9d"; + "desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU="; + "desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v"; + "webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss="; + "webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 82f808be3b..f3362ab775 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -28,7 +28,7 @@ mkFranzDerivation' rec { homepage = "https://getferdi.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ma27 ]; + maintainers = with maintainers; [ davidtwco ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; knownVulnerabilities = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix index c9c2758170..61a85ae4f7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -1,20 +1,27 @@ -{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }: +{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script, stdenv }: -mkFranzDerivation rec { +let + arch = { + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + hash = { + amd64-linux_hash = "sha256-ZCyAz+XVp2NJVUuMWyv5ubjMaoYBsjPAye/1vO2jv/w="; + arm64-linux_hash = "sha256-prdVwEn6eynzjLQ+aw2CS4PJ/JgG4QFKs9WDbzjV5oo="; + }."${arch}-linux_hash"; +in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.4.1"; + version = "6.6.0"; src = fetchurl { - url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - hash = "sha256-Oai5z6/CE/R2rH9LBVhY7eaKpF8eIIYI+3vjJPbq+rw="; + url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; + inherit hash; }; extraBuildInputs = [ xorg.libxshmfence ]; passthru = { - updateScript = nix-update-script { - extraArgs = [ "--override-filename" ./default.nix ]; - }; + updateScript = ./update.sh; }; meta = with lib; { @@ -22,7 +29,7 @@ mkFranzDerivation rec { homepage = "https://ferdium.org/"; license = licenses.asl20; maintainers = with maintainers; [ magnouvean ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; hydraPlatforms = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/update.sh new file mode 100755 index 0000000000..bb59b7efdf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + + hashKey="${arch}-linux_hash" + + url="https://github.com/ferdium/ferdium-app/releases/download/v$version/Ferdium-linux-$version-$arch.deb" + 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" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw -f ../../../../.. ferdium.version) + +latestTag=$(curl https://api.github.com/repos/ferdium/ferdium-app/releases/latest | jq -r ".tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Ferdium is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion amd64 +updateHash $latestVersion arm64 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7938708ca6..89664fc333 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-Erh7tR6WX8pt89PRicgbVZd8CLlv18Vyq44O+ZnJVzU="; + hash = "sha256-yyIs8TT6tNrqycgmYJVHdCQwUX5NlR2IHTW+Q+J9CIQ="; }; format = "pyproject"; @@ -87,5 +87,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ raskin abbradar ]; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; + mainProgram = "gajim"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix index 50d438448f..ea8351c74f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , darwin , stdenv }: @@ -18,10 +19,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-UbmeEcmUr3zx05Hk36tjsl0Y9ay7DNM1u/3lPqlXN2o="; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + postInstall = '' + OUT_DIR=$releaseDir/build/iamb-*/out + installManPage $OUT_DIR/iamb.{1,5} + ''; + meta = with lib; { description = "A Matrix client for Vim addicts"; homepage = "https://github.com/ulyssa/iamb"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index caf6669e12..0b2be12ad0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,8 +1,12 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "matrix-dl"; version = "unstable-2020-07-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "rubo77"; @@ -11,6 +15,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql"; }; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ matrix-client ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index b666df3096..4d4fa9521f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -1,7 +1,7 @@ { lib , newScope , pidgin -, texlive +, texliveBasic , config }: @@ -19,7 +19,7 @@ lib.makeScope newScope (self: pidgin-indicator = callPackage ./pidgin-indicator { }; pidgin-latex = callPackage ./pidgin-latex { - texLive = texlive.combined.scheme-basic; + texLive = texliveBasic; }; pidgin-msn-pecan = callPackage ./msn-pecan { }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix index a014779970..1cf7fed874 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; - configureFlags = [ "--without-dbus" ]; + configureFlags = [ + "--without-dbus" + "--enable-quality-check=no" + ]; + enableParallelBuilding = true; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix index 54a2e9e6c0..af5cf167a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -23,23 +23,23 @@ }: let - version = "3.2.1-17153"; - _hash = "b69de82d"; + sources = import ./sources.nix; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb"; - hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_amd64.deb"; + hash = sources.amd64_hash; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb"; - hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_arm64.deb"; + hash = sources.arm64_hash; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation { pname = "qq"; - inherit version src; + version = sources.version; + inherit src; nativeBuildInputs = [ autoPatchelfHook @@ -98,6 +98,8 @@ stdenv.mkDerivation { ) ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://im.qq.com/linuxqq/"; description = "Messaging app"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix new file mode 100644 index 0000000000..b3ea2b3fe8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -0,0 +1,8 @@ +# Generated by ./update.sh - do not update manually! +# Last updated: 2023-11-14 +{ + version = "3.2.2-18394"; + urlhash = "fd2e886e"; + arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk="; + amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk="; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh new file mode 100755 index 0000000000..8b9121299b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/update.sh @@ -0,0 +1,31 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git jq + +set -euo pipefail + +cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) + +payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= \K\{.*\}(?=;)") +amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") +arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") + +urlhash=$(grep -oP "(?<=QQNT/)[a-f0-9]+(?=/linuxqq)" <<< "$amd64_url") +version=$(grep -oP "(?<=/linuxqq_).*(?=_amd64.deb)" <<< "$amd64_url") + +amd64_hash=$(nix-prefetch-url $amd64_url) +arm64_hash=$(nix-prefetch-url $arm64_url) + +# use friendlier hashes +amd64_hash=$(nix hash to-sri --type sha256 "$amd64_hash") +arm64_hash=$(nix hash to-sri --type sha256 "$arm64_hash") + +cat >sources.nix < ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-PXLmGwVjHavcKDIxdo+TioVUSyfjH6v+E8V7TfXF47s="; + hash = "sha256-d0I4YU2OY+TT1ac6bLZA7Hb+BsyYK4eoySNlFXkndnU="; }; + # Why is this needed? https://github.com/weechat/weechat/issues/2031 + patches = lib.optional gettext.gettextNeedsLdflags ./gettext-intl.patch; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ @@ -87,10 +90,10 @@ let meta = { homepage = "https://weechat.org/"; changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html"; - description = "A fast, light and extensible chat client"; + description = "Fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package - (eg. adding python modules for scripts that would require them, etc.) + (e.g. adding python modules for scripts that would require them, etc.) on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch new file mode 100644 index 0000000000..7b95472c06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/gettext-intl.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake +index 358734688..ffcbf7ef4 100644 +--- a/cmake/FindGettext.cmake ++++ b/cmake/FindGettext.cmake +@@ -42,6 +42,7 @@ find_path(LIBINTL_INCLUDE + ) + + set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE}) ++set(CMAKE_REQUIRED_FLAGS "-lintl") + + check_include_files(libintl.h HAVE_LIBINTL_H) + diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index da599367af..3ae60816b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -34,10 +34,19 @@ in buildPythonPackage { hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; }; - patches = fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; - sha256 = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; - }; + patches = [ + # server: remove set_npn_protocols() + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/poljar/weechat-matrix/pull/309.patch"; + hash = "sha256-Grdht+TOFvCYRpL7uhPivqL7YzLoNVF3iQNHgbv1Te0="; + }) + # Fix compatibility with matrix-nio 0.21 + (fetchpatch { + url = "https://github.com/poljar/weechat-matrix/commit/feae9fda26ea9de98da9cd6733980a203115537e.patch"; + hash = "sha256-MAfxJ85dqz5PNwp/GJdHA2VvXVdWh+Ayx5g0oHiw9rs="; + includes = ["matrix/config.py"]; + }) + ]; propagatedBuildInputs = [ pyopenssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix index defb898b44..117fbc850d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix @@ -2,19 +2,20 @@ , buildGoModule , fetchurl , nixosTests +, callPackage }: buildGoModule rec { pname = "kubo"; - version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.24.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0="; + hash = "sha256-stSjLvg8G1EiXon3Qby4wLgbhX7Aaj9pnxcvE32/42k="; }; # tarball contains multiple files/directories @@ -29,7 +30,10 @@ buildGoModule rec { subPackages = [ "cmd/ipfs" ]; - passthru.tests.kubo = nixosTests.kubo; + passthru.tests = { + inherit (nixosTests) kubo; + repoVersion = callPackage ./test-repoVersion.nix {}; + }; vendorHash = null; @@ -37,9 +41,9 @@ buildGoModule rec { postPatch = '' substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" + --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" + --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo/test-repoVersion.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo/test-repoVersion.nix new file mode 100644 index 0000000000..25fd8fcfbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo/test-repoVersion.nix @@ -0,0 +1,13 @@ +{ runCommand, kubo }: + +runCommand "kubo-test-repoVersion" { } '' + export IPFS_PATH="$TMPDIR" + "${kubo}/bin/ipfs" init --empty-repo + declared_repo_version='${kubo.repoVersion}' + actual_repo_version="$(cat "$IPFS_PATH/version")" + if [ "$declared_repo_version" != "$actual_repo_version" ]; then + echo "kubo.repoVersion is not set correctly. It should be $actual_repo_version but is $declared_repo_version." + exit 1 + fi + touch "$out" +'' diff --git a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix index 6899e6f485..e3038e83ad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-RS37Fpo1uzwEKzCysilXiH/NYOySEYGPOk0R/+rqiag="; + sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg="; }; nativeBuildInputs = [ automake diff --git a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix index 019da46951..719b730817 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix @@ -3,14 +3,14 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_21 +, protobuf_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; - protobuf = protobuf3_21.override { enableShared = false; }; + protobuf = protobuf_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index 341f4628dc..c5a07a89c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix index 40292268a5..7febb62a0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -10,15 +10,15 @@ }: let - thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; + thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "102.15.1"; + version = "115.4.2"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb41"; + rev = "${version}-bb17"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8="; + hash = "sha256-hfM1VzYD0TsjZik0MLXBAkD5ecyvbg7jn2pKdrzMEfo="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg="; + hash = "sha256-PAjj7FvIA7uB0yngkL4KYKZoYU1CF2qQTF5+sG2VLtI="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -57,8 +57,6 @@ in ((buildMozillaMach { patches=$(mktemp -d) for dir in branding bugs external features misc; do cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/ - # files is not in series file and duplicated with external patch - [[ $dir == bugs ]] && rm $patches/1820504-optimise-grapheme-m-c.patch done cp ${betterbird-patches}/${majVer}/series* $patches/ chmod -R +w $patches diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index bc5b692501..2ae02236fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -158,6 +158,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 srapenne ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 9ac8c83dc5..8d0bc45c4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch (fetchpatch { + # https://github.com/neomutt/neomutt/pull/3933 name = "disable-incorrect-tests.patch"; - url = "https://github.com/neomutt/neomutt/pull/3933.patch"; + url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch"; hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; excludes = [".github/workflows/macos.yml"]; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 12a2437121..ea59ad8172 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -3,21 +3,32 @@ , stdenv , fetchFromGitHub , rustPlatform +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; + hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0="; }; + cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ="; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ notmuch ]; - cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; + postInstall = '' + installManPage share/notmuch-mailmover.1 + installShellCompletion --cmd notmuch-mailmover \ + --bash share/notmuch-mailmover.bash \ + --fish share/notmuch-mailmover.fish \ + --zsh share/_notmuch-mailmover + ''; meta = with lib; { description = "Application to assign notmuch tagged mails to IMAP folders"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 9738a3dc8f..715ede00bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.3.1"; + version = "115.4.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/af/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/af/thunderbird-115.4.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "cebe0180a4a11d1a0d5478347ff1e80e8ba8217fdfde0ffc11e58c7b8a1da039"; + sha256 = "f6cb9c8a8069e430f2a11961880f0484ef0582ee98cd6cefc4136fe62882526b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ar/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ar/thunderbird-115.4.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ebc9d82cf60a18c1c9de514449aa9b4dc6e60c67c40be6a1de679354ab1ddb89"; + sha256 = "a3bf45d4268bb2af5ae843e54e32c7bf879666113a76d6091b2b1b8f4a3afd05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ast/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ast/thunderbird-115.4.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "130b99f167f3e56c8f85da354da70bceaecb7559fc524d2a0d30125557fbe925"; + sha256 = "e14679065a5ef9825473749929086715d21c899ec03760d66420098af78bd364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/be/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/be/thunderbird-115.4.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d72f73e2dfcd9e3ef9477f4e1ddbfb478d3b2b069107128a28d0f22a939c8ab8"; + sha256 = "cad53df572751af17c38ff18aed28ec65d376a02050e8341d76a96cc5e21e3c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/bg/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/bg/thunderbird-115.4.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "58cde7ac9d2089b05f521505309249033773d7c366dfebda06043656c53afd09"; + sha256 = "ae6eb58bc7b7036a4a5283f9968cb734a9e3f5caf680cd9565a71a3a4b5fbb81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/br/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/br/thunderbird-115.4.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3cb367bbca0965f42168798e6e18573edf6aa8a65ca6f99d2f31ae2393b7848e"; + sha256 = "763d2ca13ffe77f5cd7d8e65a1b99d13de48e44ca6e4069dd263354eac1b5ec5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ca/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ca/thunderbird-115.4.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "18014fb63aab93646bbfe8af40a8a72c6ddac77ef5e0ccbf7fb4fc4aa2e64501"; + sha256 = "48eecfd0f6156bf8e1e065a1a26c78486876f32f08cee4ff864316a351518ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cak/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cak/thunderbird-115.4.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9c604f7ce4e1245b4fa78e67b9ee91bd5fe93f2e23618f6cc0ebed6235b3bff8"; + sha256 = "412ca26696c0f75b265c4f14d8edf1274427b641062ec30e1b3f81bb4816bdc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cs/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cs/thunderbird-115.4.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "92b20cbe5c985338a2d690690ee7b84ebe53630383b3c88c2d54d5baa81616ba"; + sha256 = "52348c625287a7ab209e714b3bb05f5bacd51d8ffe9d4adf978b6970ff0c605c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cy/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cy/thunderbird-115.4.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8ce9601654779de2319671565602bacd407c50834c3a7d9c3eed7663cd2dfda1"; + sha256 = "3249849916c27cc1cea3e8414c89fbb96a95654aa9d9d13c513e8ae3ecac2241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/da/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/da/thunderbird-115.4.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "27efa3be6f134494ac05c91c2b7fd55c64c4df41a10eecad1edabb72b8ad1f1d"; + sha256 = "8e0531a525128b4b02547b11b48a7938c18356bc2cc8bfe7f86841bfc188656f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/de/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/de/thunderbird-115.4.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8b22cc8e30eba91349db1b6bb51425efc14684a78e5c55026d7be7741e42b7a7"; + sha256 = "f60fc1958d29faf1047ea7eaeb900a02351e569685dd4c3594db45edb97905b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/dsb/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/dsb/thunderbird-115.4.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a7a1aa4ea136eca7a564982aeff809b79f7e23e305a93a44361c876ad6eb72e3"; + sha256 = "5953e818188ec5c4780a45dfe8ca576a3a3b9f8cd196ff81a380e161a6ae10d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/el/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/el/thunderbird-115.4.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ff374034283855af4cb9e16e5680748bd7fc084c9a6c1f4c4f39087adde88d01"; + sha256 = "e6f5021f37bb842aa9baef26dd4895a028d7c81345acaa13b2be027392a5818b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-CA/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-CA/thunderbird-115.4.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1e06132986b4ad668d3ae053c77964b3aeb191e5bac16b3d54621a69c29c3906"; + sha256 = "991533bc7344cba739e95e0e979e724070bda14df8de43dacc1dec4cfa1cdc89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-GB/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-GB/thunderbird-115.4.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "12c1eeef9790b976fd3da5aadca9912ffa0951cf20cb1ea9be9cb5ecd2b262f4"; + sha256 = "ccb93e3d905481c45756edc8926ff9999a1d697a428a3a31b9ed3c366aa9e325"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-US/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-US/thunderbird-115.4.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f12ece3d4df211e785d67ada46bdf239be68a2dd00118b15063c9fb12d5faaa2"; + sha256 = "3f7571801f390131dcf98bf97565391b35ea883a1a835229c5ed6c790f1bdfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-AR/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-AR/thunderbird-115.4.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a232bcc945cb551e2633c1eb1876eb849d3dec5176640419245cedcac6c5cc09"; + sha256 = "39562a107559766857a369b4a2d48273c852548564a1b5a145c75ed5073d6362"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-ES/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-ES/thunderbird-115.4.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c9a0ee9373ad30d8aa0280681b95eb8de72baa1b3cb09bc25ab9a4bde82fe88c"; + sha256 = "b246ca331d7626477203a720318394d4750da96eb0e66336ffd4e34f345bc9f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-MX/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-MX/thunderbird-115.4.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5b44241ce4e34c15346e229e9898f545acb298ddd8ed58ff95ceadd79e0b4d11"; + sha256 = "9860008e2344e7e42e7856ee83f384c4f13fa8bcdb06c9dce7a5536449c3955f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/et/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/et/thunderbird-115.4.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cdf87430b8f78f53c8b1bb94a577e8d06e85a619f41e69f9fb7d33f707c3e4d2"; + sha256 = "a4b3beed7208991ddecf91f2c92586f5267daf862feb228688192c3d2ce3695d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/eu/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/eu/thunderbird-115.4.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "12f04c6677f0b37edd4daae6fde22b6ef0368e122d43434bdc80689e23923384"; + sha256 = "f75f7557ca1b920a68f52c39c97952741cebe7bb4fa1222f0db8e11cad9ee00f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fi/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fi/thunderbird-115.4.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "47d42496f5a3904ded0f0503e682e06dc0caad999103ecbf58a43df05ba94c55"; + sha256 = "c064953b062e8c29b880cd07b504d36d26fc909bc0a7a6728af964bc845ebe0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fr/thunderbird-115.4.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a05bbd534836e6ae2cf0cd908e8f4ecd04ee5ed6e380590716932fd24760e628"; + sha256 = "e49b72d8258d4140494d7f4ac44bae0fec2bfaf19adb4e186b65cc1acd9d912d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fy-NL/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fy-NL/thunderbird-115.4.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a2f47372b7b40907639b98d47c69e36b89113fd30cad4cdecb060011b05c50e4"; + sha256 = "4485958ba2c9f2f23b9bc7e698a85e16299c359111cbb99221d0edacfc263360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ga-IE/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ga-IE/thunderbird-115.4.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "50d8934a62bd65dcc3097ba53d5ec55de024d7c0ab3e3aa3de639f103fb9a8ec"; + sha256 = "8153c43633a6b0cd66aaedd3d71b91f3eb7697f1985909f295d70b87ed5a1c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gd/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gd/thunderbird-115.4.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "150d7d5848bab9111eac1e13869f7268728d293de067a2bab48106a59f087a4d"; + sha256 = "ac847943ca5da90e8dd2c3041cf960b6f5a84d648a17f3441fa6bb2ccc0829e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gl/thunderbird-115.4.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d68375242a2296f33993c6a4c0695ab4ec147509ca2caae9af5b8eba8103ce5b"; + sha256 = "5dbbe07d7ec93d852c46a45aa919b05956f1630352547efd86ba90ba37ce8969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/he/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/he/thunderbird-115.4.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "097ad868096d22bc634e6304bd3ad836f5d767839d1cb48790c9caeab80f3819"; + sha256 = "8628fce18ee60217944cc21312ba4df777bc90091bc77424ca2012e8aecbb9e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hr/thunderbird-115.4.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "96093e3b5b9d1acf9d6ac14349ee9acb6616444ccecb8f35875c15c43ac38c42"; + sha256 = "8829ad3546b7e12a9cefbd993083733d876752aa03a41236668eb84565c235e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hsb/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hsb/thunderbird-115.4.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fa63db473969f137ffd623c3882b55b91a6040eda2fb3b54903f76ec1d0dbf90"; + sha256 = "e55e7006c6e80c1bc2d59e41a4475be97abfd385c4433bdd3d3b9d633a7c4a45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hu/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hu/thunderbird-115.4.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "544774cf0ff36ef1cedaae27111755e5050f909fe5e0f3d2f16ba6f9ce0ec3a9"; + sha256 = "77d5dc64238ec7914b7fce05fa94d2a5d8e11928380ee1d0322c414d69aa5a2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hy-AM/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hy-AM/thunderbird-115.4.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f11d0272755ec879b29349903437d8bf11ace96706e5c9453c1fa576206f4227"; + sha256 = "2bb6da6af7201d25e7c11895dc969e5f17dd3a5bed963ec930eab091e706bcbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/id/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/id/thunderbird-115.4.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9352fefd2809b13bedaae3df31160048b96d4efe743742e032da2cad22a0c8d0"; + sha256 = "8db39f0b0aeebd47c6db4dee6057053b578b3d6c09668a0d64c3141c80421821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/is/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/is/thunderbird-115.4.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8d802906a852bbcc14c4b41ced9863eee597301aded1e409afce819084370762"; + sha256 = "a23ed8b9e000eb5579b710706e656d66667b384af0d3ddb7530ce85733c75233"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/it/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/it/thunderbird-115.4.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "914f9304e31a3ffe4054c5521901040a875455f4d202a10712908073377a13c6"; + sha256 = "7f7f89bcf11366e7b1485b8e26aef44fd565c8d4d67839473171517a8a9f074f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ja/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ja/thunderbird-115.4.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2e7964c0ea3a586d365d201fb0fc32e0e1da3426fbfbca0754812844fe17f26c"; + sha256 = "2da90acef62b2d1f4b5c70a857a58bceaaa59eea06cd5c55476c2d555bda66d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ka/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ka/thunderbird-115.4.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "468c045050b0b68254d042f15ec09303318a58d0f5e9fa4e824ec749b256ab0d"; + sha256 = "e7722b2a7118d2ac5991ba535a277acf2ffd1f6e56f36f7a2f35b465eed1657a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kab/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kab/thunderbird-115.4.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8d76a4d2e7b491d5a912ff6eb3f64996b9d80ed4874ffb07109239f4f5dba699"; + sha256 = "e5d30697c976c25ff3845b3b83f98097cdb4aa0350c8362ddd0b9aaf68c63fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kk/thunderbird-115.4.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "30cfbc6faa9cccd21e2d17c03267d3542c99d18d4124684458081a5f43b023ef"; + sha256 = "f952cee1fa3a054683ebfeb256293a0172ab63806af2481980ca527a07f5b383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ko/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ko/thunderbird-115.4.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c6817b34e8205680a3f92354bed9232b761249dfb316c61ae2d1d6f4c674b00b"; + sha256 = "d0589966a1853541260b11f0848dc2621ef52f83426a2bd6115f0b28038289d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lt/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lt/thunderbird-115.4.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1885249ad6b0b93d1f92cd12d8a7ec826522c0829c20f3650c0fe67409fb839c"; + sha256 = "4d1680aa863f93db1f800f0dcf35496fc4bf777ffc7eb7c853f84629054f53af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lv/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lv/thunderbird-115.4.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f076a056ba8b68291e3461b6acd70d7de8540aaf34414442bdaf7febd54f6565"; + sha256 = "24571d6977a3bf99a636598a527875f5037e290807ea1884583739df7cc3d0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ms/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ms/thunderbird-115.4.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9b4bc1b4d08e3143c38dcbdde0d7d574cb321050a28afcf5826a9050119a087b"; + sha256 = "937936b0e31500ff3c2e34090f79e158d23869faf829eed5d855c83c49946b38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nb-NO/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nb-NO/thunderbird-115.4.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b1e90bcb60dfaee62765ecdfa2c149869304ae60eb8d4296664d8592b7f0e144"; + sha256 = "3084fed2561faf59c1ec4f75e6001181db689086daf8014a370c13f0709b1916"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nl/thunderbird-115.4.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6cdff185bff851dfa0a33cbc5cb70c5bbf9651f7b7cd3bff772d9574c52d09f3"; + sha256 = "54f1294805f3899917cdfe3cd6e5dcc5ed054312d7a88fe89bab4d96a2bee1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nn-NO/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nn-NO/thunderbird-115.4.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "76bcfcc43e07d2b6d869f8ac27e5a0d15edc9d90e1c60f29a6ead469937da00f"; + sha256 = "fa43ea181404914a61e790aab79538848f4a4c889f331795c7128360cd06f070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pa-IN/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pa-IN/thunderbird-115.4.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5be1be208f37287d956867147a8cbf55bfc7c56691dd7850f142972fa1fd30d2"; + sha256 = "95276577202c4214712f8b53270cc67c46004842d3d508003e0de9568128b44f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pl/thunderbird-115.4.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a6f4372fd09296a5e057156c5857ba98d2b28185955bca4eab1bc9693eda454a"; + sha256 = "d9f440c272f9a7ece1e0d93beb29c42eb7cc9058a46c9876e9643485ef203eeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-BR/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-BR/thunderbird-115.4.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "fb19832f75b6d91d989a96b867826253c68c2b16d5bec58c0643caeb393afd43"; + sha256 = "65ab26c8db2e47bd33cdbd054b053116abec1229fb852ff9a2a6e08989d17214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-PT/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-PT/thunderbird-115.4.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "34bb7b3b7972d651cd34f2e5d3759651c5e7f633560b355f9fdf838f94b2c24f"; + sha256 = "d2313d541e70bb5884a32d3ba47f2c08f605a7eedab03043070c9ff4e1e70238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/rm/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/rm/thunderbird-115.4.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8ec988d4367a2d5a4c980a79e2ba0e8f6a8066b068938a16e3a9e3e7719fa9b6"; + sha256 = "099c226a5cb0b0f33c55132f93422d7a831a0db701c2d35fe9b15187fb661e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ro/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ro/thunderbird-115.4.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ead67c7e3ec02ef561478494de852d2444941fa0562908a752a6c776fe4b9704"; + sha256 = "495819d350ee091fd70134e7614fc53a77898563cc001e16b90befeddd6097c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ru/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ru/thunderbird-115.4.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3d81c4f4ab6dcbc602adc4fdd265b18d635c646c50f051b8ade0aa6a8906ba13"; + sha256 = "b230727076e96b9343b16ebdeaa81d4bafe9aa7cf7b505e0ff80a69eb5524f77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sk/thunderbird-115.4.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a2001b49f939b65f5df13fc27f55174281c73a90a657375d9191e5de4a425d58"; + sha256 = "38957f7a5d76b613b5d0e72282556f04d9c5ddc145ce2082a047a2ef57cec1af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sl/thunderbird-115.4.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "db0999eb0884206f59c5d7053771864590fa8a0911fcdab8d479f13cd76f57c9"; + sha256 = "8ea2a350f4eb609cb5ec9cffabfc3af342ddf34612368acd272c8658ff382fab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sq/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sq/thunderbird-115.4.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "08cd3e5927e0b853324cdf5d475dfbdff222723f21a34b31f59c8fdbdaaa36ab"; + sha256 = "cc33784f9b3b255ef63007ac348d0c995a41716c6cec9a1b93a21c6881908837"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sr/thunderbird-115.4.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a4782d01b45030631bdda4692cb52d00f014d4360feaa1b1b9797a74c2fb3861"; + sha256 = "2e1013b838117e10bcc66f320df8095ccdf0338c76dc8cd8737357b2bbcf77b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sv-SE/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sv-SE/thunderbird-115.4.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a13453f4bb640b12ee6db4e83b3b59be2c7c42f0c86f212e7feacee6b7197530"; + sha256 = "23942d8165eb78889890269b82e0404984f89e636ed050b7d14a5625dc889aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/th/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/th/thunderbird-115.4.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "279730d66c90a381a86ce15ad7b709d0dfe6eae305d3166352fd317df0ba5d56"; + sha256 = "c6d83bda21db67bcecb4923f68c5a311edf14749a04726457f251bdc14d18d71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/tr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/tr/thunderbird-115.4.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7716e1d986c87342cc48a465a662329ac779d1b22d1ca009467716b4d0c60620"; + sha256 = "72429c1ce1a44bc0a55973b31ace62f1dd408e8aab2e84483414bd5d09b0533d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uk/thunderbird-115.4.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0715cf2c118d342dc691581f5f9c617e145f3128887c7f7b9a1c4c464e0d621f"; + sha256 = "2dc323d8b0a5f3636d938e08245bd66624b4c1388078fa06acda9da12a250585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uz/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uz/thunderbird-115.4.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6af8bae5251ad53cbcfc4abc2b659f73145d246d5db7c655a811ca4a32897428"; + sha256 = "b79e94e508ed7b4344683a8e56d4417519058a111ac3afcee5242b787e8da403"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/vi/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/vi/thunderbird-115.4.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "16c2ef5305c51b6c00b6fe171cb7ad942b6411e53629a3603347ac7fa4a5917f"; + sha256 = "08d243efb6fb4c7bebd9ccd7720c4b583d30e2cce6142d6769745778aa847f1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-CN/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-CN/thunderbird-115.4.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a3f3a0d19ddb264031167e8c4eef2192239e4d09408d6972c2f63cd241068b4f"; + sha256 = "b3fced53a9ffd152a9d7301da4b3119d70e09d38352d997cb1938656d53f4e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-TW/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-TW/thunderbird-115.4.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "de1a3b31b76ccfca1ef2848d96703a0d3e85065d0f71a7a6f030b3054065ddd3"; + sha256 = "328bf581c63dfcfe8702e718a1112a62cd3fa544023618282c14111e6586375c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/af/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/af/thunderbird-115.4.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a0e0caed0d502c2f5f4be6b80a874daa88ca776e88b848a5dafa9f89d7b7d03d"; + sha256 = "08383e3f87665461568adcbd7cc12e0811d9e3b52ab51ea32573c851eb59c4cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ar/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ar/thunderbird-115.4.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e073b739553b3ff1cd0e080b2e904e258bd9224e57640b8da8876932156a1a66"; + sha256 = "90fe66398616435addf7cd9871c42fe0419089729bf8fc0f9473cd557e32a3d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ast/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ast/thunderbird-115.4.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bced7c19a96d8eb6819365421b8c79b1f4ed807b1e69b58c4e436a726aa6bcf8"; + sha256 = "940299f1d667e1b4cce44b1b4d7b26021ee1313fadca391cc18e8551b56ff1fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/be/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/be/thunderbird-115.4.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1c4d9e38742bccd79afc383c6fc7cbd6833476aedc714cabe2bf3dabdda60dec"; + sha256 = "7c5fb060a3e269cdc929d190fe96d2e1caf4ec6298e3372314e8fedc1cf64c22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/bg/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/bg/thunderbird-115.4.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a26988b65430aa3a51f298c2ff0ae724367265467ed9a886011dbcec7a570155"; + sha256 = "1814d1b9e840261693a2c48124f610c2a3f2da53711799d9b12f1904064b20ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/br/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/br/thunderbird-115.4.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0b41b1ab5cf1e3ea4bfec6a60fddcca5c310f980b50b65632cdf580a96ce0c36"; + sha256 = "7a85ca429f007cccaf44e923084a1eafffd2148303cfd54a991768417dd4a945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ca/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ca/thunderbird-115.4.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "41629371090e2d1ad19882931e344379c06d4eed8c42e445bd148cd5a5ac2eb1"; + sha256 = "3d90952a9becc9da367a16c8606b74debc6eeba66650d8456aba959b5c8af54e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cak/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cak/thunderbird-115.4.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "0a55ee3b2249ed184c92e182da6ea5af630ca7112f88463aa70f34912f7351ca"; + sha256 = "9b27c4bbebb87d079d12c83c2d4aba6eeb778d97afdd28f8df52093cea82a206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cs/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cs/thunderbird-115.4.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6a97c43fe413f14e0cc75f4122df69896f9a0765abfbca3c58000435fb468516"; + sha256 = "0a50cbaa130b23276ce5b0e58d72f6e7dae1c15c6089cb3aed7148d676244b6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cy/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cy/thunderbird-115.4.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c9bedd80cb934c54c7ee8a3965934a4a551f704b3823ab528c0db2fd8a2bddc2"; + sha256 = "97ec55678e2b4e821b6b33667fa8eb4ab9b66ad39a263eccb13ff4ae4050bb17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/da/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/da/thunderbird-115.4.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5d64f5fa14da87a192658a21bde9f600f94490f3b31b0e28d7b1e365840e9b2a"; + sha256 = "281b4050241ac64eccf5c0c1d077c986b8d9f9dbe7ca39ef25ca5a967d2dba9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/de/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/de/thunderbird-115.4.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b232fe451f7fb109c1e6bf8fe41715ca1e2b5021d0fead1b1ed25da8678cea85"; + sha256 = "9ccfa1201294f2d9c9d65643f95eeb90dae1cfacff7cb8d81b6760285c382d33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/dsb/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/dsb/thunderbird-115.4.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9e92a8e20e874ab7117001cd9db0c72f34f49569be8522f12ed0044829d4733c"; + sha256 = "f71f6b889deeca16de9ccd1c38afa9c9e0cc18a7fcef16cb42c2c5349988a8b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/el/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/el/thunderbird-115.4.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dd534a1bb9aff5322b190a3f214e3205c9d61447fb7306a52717960f16da1d4d"; + sha256 = "f6bb942f8ac7a9fd2a73869639646ce7c80f71cf51ec4a35d448ae79a65e0d3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-CA/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-CA/thunderbird-115.4.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8f95507ee742cf3cc78d2ddef1a052262d3698f90ccbf157ea9227390ae65a4a"; + sha256 = "52e4f617f06d21b60ae3a41bd053d73a56c05115fcad963b2b4c4eef1e85756f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-GB/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-GB/thunderbird-115.4.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "181e6c65ccdb0a6e157557ae3da9adc7c6dec90c3423f7e96d5777adb15e61aa"; + sha256 = "dba2923a47c12dd14542a27cca051df17c6e00f54eacb2ffe0fbd08730d35701"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-US/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-US/thunderbird-115.4.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "6df045b6d0a53f2ef9b882f093d069a70d60fe501835d09a8aed0d5fe810283d"; + sha256 = "d42af97a227a9622f246025d522e86ee0274de090c7a007a88e1eed9861be382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-AR/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-AR/thunderbird-115.4.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "d77ac4665b50a84fd6b4a7699b2e60b44ddd0a8465144a6c703fa3aa98340b5d"; + sha256 = "94d7fe7f3c857086361212ed098087e3bb592fbdfb11845f08f1c531434ad477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-ES/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-ES/thunderbird-115.4.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4c28a5ecfac54d0939cd4020381fbb361f96ddd7113c7ef2e23ffba9121c62ea"; + sha256 = "d014c178c9bb16838fb1b14df01e6b6d5df4c87c4421c4a4fdff4cf17d019285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-MX/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-MX/thunderbird-115.4.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7edde23453945f15db4b5742ffe3654a092cbd8a5ed77891eacd56aa0672f05b"; + sha256 = "ae785957277ff303e6df28589c1cbb536e98143daefae7d55b95abb327ce97d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/et/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/et/thunderbird-115.4.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e5c8d238030a6fac97a70429b16f2c69c85229928166a134c11422b1be17d9ce"; + sha256 = "8138692b55a357f7c00969ced73dcdb03d536806df02905414a589b89026c67f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/eu/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/eu/thunderbird-115.4.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1c6f0b49244d16c4b092e5a5a04a459f927ad2a1a8233d9d88d53a81b41432f7"; + sha256 = "14c61bf1db21cf5f3b07e3cde8945135957d8a30aa7fdb0e47e54b10255cf1ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fi/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fi/thunderbird-115.4.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ee41a31bb89866b47398a4d7de1f656e8957e853961f570c3f50d5fa70983303"; + sha256 = "8d3815fca050082244ce006020463588f115bede9a85ab92fd7b5e129e610a7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fr/thunderbird-115.4.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "cccb80a0d288821dd9e6a282430aa0793167a0bc5a74542ddcc82b46a3e3507f"; + sha256 = "3b75ca8cc061aa81fea54c974a796435a20344f43f7aaacdc7fd3e69982f8b0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fy-NL/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fy-NL/thunderbird-115.4.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6b90cc256a6a9b4c7c3d967ec843e5b0fdb4b78daa63fad79477cfc04c952719"; + sha256 = "4fdc9e70b935cc39853a045eef3f5f992dd46327e07ace300307a9a12a188cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ga-IE/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ga-IE/thunderbird-115.4.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c6ef206267af6fdda477a972f3a59fad83866a0c4530fe9baca6ba7d68b271f6"; + sha256 = "01c8c390636fd567ef3f72099f349f7273b0cede1aab69251916f90ea6640817"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gd/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gd/thunderbird-115.4.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "9f80964540eb64d49bfc6e0c459d6d3e57465d6cbfa72aee7ab50cb72cb2ca48"; + sha256 = "e92d9c51e1093814d39564c99558d3324c7774f72b7b3baa6f2f09056180b817"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gl/thunderbird-115.4.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e811f521e1aa9b210d2868f2d5492b5b9b8440a75a935c27699aa17a7eaa4937"; + sha256 = "0ef59efe918b0a11cf7acbf3cf5faac4fb4fd11dd42c6c2eb74ded8921ce8070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/he/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/he/thunderbird-115.4.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b123f32b8ee177dfba6378bfd1c872453bce2e90aa4839cde489bf60269a22de"; + sha256 = "2f4085a6d052147eafceed86dbef1060c9bc6e46483a8dfc4ed6e64ec6906593"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hr/thunderbird-115.4.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "90374d091f267036c6806ccd000b4cdbb72f5bbe957ad06e15f723682796fc2f"; + sha256 = "1bd34790200a497a85c0c9df008159189183f35752b3a0ee30b7136b0b7bc533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hsb/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hsb/thunderbird-115.4.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8b99f5aaae0fc61c44780d996a21aad0c1173430d0a56a63d9cfb1bd116bd75a"; + sha256 = "826501b1ef15b0e29f199d20e306c0da884d147a744dc21600e42c0c5a4552f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hu/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hu/thunderbird-115.4.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e31779d17e2968907097c367ad442371d86b6c42ed620e6b047b95b23715e48b"; + sha256 = "c96b3cc9d3cf1ac7426d4368d23efb8ce8421212ea412cee3c35f1fb1b334736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hy-AM/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hy-AM/thunderbird-115.4.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "180c3453c664f31687dfa084012cf5527425c35c81019df65e9dede4680cf54f"; + sha256 = "aea19658cc49e236e2e5b9365a89e70e3430f084f4f578c1632dad4158ed386f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/id/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/id/thunderbird-115.4.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c74ff79b76f6b73f7962426594714a9864b6b735216aed7dd0ba15193ccbdf4f"; + sha256 = "671a7938c700e305575d5afa1cddee2efc272eb42bf25eefa556c9f734593daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/is/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/is/thunderbird-115.4.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e93faa12d98ea04510ab192585fda996b0e2c06138133a2ca8078cf933e96fc2"; + sha256 = "a7b0d1de39daa5349bc8fb18e7c873cdaf361b6ab37407ccb0ea727d263bb966"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/it/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/it/thunderbird-115.4.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b4c6a1ec49ef2e34d399001f2fa6073334223bff487db8764593cf57f641eccf"; + sha256 = "764a66760083bfd09f073cc88f0cac67cd2712482a833ded3130c4f584d30dca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ja/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ja/thunderbird-115.4.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8abd71c45890632ad38f6cebf8dcffd9938f1d6e5b63513e6cf139a5d657d2e5"; + sha256 = "edbf7f3d41e3828b0092e5dcf0a3338526809b0e8810f9819e33f41b9afbc62f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ka/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ka/thunderbird-115.4.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a6a0f69751aa4aa967aff05857d826905a25b949a507c6a5953e3a9d764ad6db"; + sha256 = "dd74e35eaf32c8c5e5acfa43f4bcf0c9c123eb416ee9602bfa6cfd5476daf267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kab/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kab/thunderbird-115.4.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6be26710c7a8fa9a7db710bfaf64d6d7bacad607c2f8eeff7b1f306e9050aa4"; + sha256 = "3eca6970ce51a50420a8af1f497e025095e62a591663ee13a50e19344a34f6fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kk/thunderbird-115.4.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b221573610a8a98600e82db05544f916509822d3bebcc656bb2e64bcbb85a158"; + sha256 = "194f9573ed80d89ebb227cad02c2aadbd2fff7a924efe95836b25b869a776052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ko/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ko/thunderbird-115.4.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ead6c335ac822391b773778abfe609bfdbdfe1e7dc6e5e0956531b0e29fe592d"; + sha256 = "76de2ae5ccd6ae6e0e0e751b142f3151899d046e27be7244519535ebc2c0e514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lt/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lt/thunderbird-115.4.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cfc792e830e60ca5ff8ff1c468493dbae332340ff0d786083b529e4f46b3e30b"; + sha256 = "1e4031535b0306b9f876ce01dda4913cf7bb2f3506bf3e0a8b095f14f7e75d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lv/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lv/thunderbird-115.4.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "76d46bbc0d30c92816391c09ac111c5820c114165e879addb800e18637c7adb9"; + sha256 = "2e92b529ddee80cabf2d9ddaf831c04350a0839ba04945c0bbe944005852971b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ms/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ms/thunderbird-115.4.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b14194b7637d0afb8d8b3ef61eb0eaa2bbbcea7ed39316342cb00105445fc2b3"; + sha256 = "ae21aa767a9e0e30a306e87041900e6563654a128b496c26061ae83665ad1048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nb-NO/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nb-NO/thunderbird-115.4.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "19806dc92d6bc218be377bb7bd8a455a9e18aa5539a2cbc55a4359c0c00505a9"; + sha256 = "6af7284b487fd40f2785677b411a2d9a40a17ec40a6d3473709de7e87d069303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nl/thunderbird-115.4.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d00a9436cb35db75f80472453e3f29694bde58fba07553ce9a6c4b4e559ef2ac"; + sha256 = "0703e2a855aa259e1133390b27c376d6c98fafede9a9629ef970b31a1cf5bf80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nn-NO/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nn-NO/thunderbird-115.4.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4a7a0b70caa9d56b8c2ae25762a5ec6e20c805e92694655c31f0498a9b56e29a"; + sha256 = "b40f8ffba3ab3ed6ae27c395d9d9e9106d026c5ca6bec6801560ad75d33b755a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pa-IN/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pa-IN/thunderbird-115.4.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "76d6f61c7053139ef52ddfac63454b152a0e5957773e5f293c975cc6468cdd36"; + sha256 = "fca4d6fe2e4af82920065ec759f44f2032f8a4f237408352ba481552079bb65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pl/thunderbird-115.4.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7afac7c8563248a3b2101a990cb0e84039475c8c7a41113fcaaf043df55a54e4"; + sha256 = "2fd14fee330663d551d513c2fc02c8d325180c99bab5199cf03df9d9a0c42297"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-BR/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-BR/thunderbird-115.4.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d183b0f1d6c01e436bd38d1f5e06bdfe528584e7602103bb576d5640366fddb9"; + sha256 = "90ec7cf1df0e88e40ae1a372d4db118dd4d7395b055e7cf0b137a5a968f0690e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-PT/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-PT/thunderbird-115.4.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4eac7d59c9df12542ce2fc6fb1bfbce62d537c4520be627716559e2c1e7a2128"; + sha256 = "33ed9c0c2e357694ba2f942f8322bf72b9da7a4ea699c9371f24f4282702c80a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/rm/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/rm/thunderbird-115.4.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "115308e7f02fd241d80591bef5dd300421250827f8eb1373a2b4446018ab897b"; + sha256 = "6f42ae9d7c342d4f0c49cb6a40250abc94e3688015d7c2d18b60ea9749482a91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ro/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ro/thunderbird-115.4.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "118587e5d8697e2da4e353deecefe18073c1f2f531eb80903f65957b7bfb965a"; + sha256 = "21c5a6025a9134beec3647691d0e843e31d28649c2179fdca8b6209cb86ff55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ru/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ru/thunderbird-115.4.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a8b5a03ca48c985e38156d5c7fbfd67a48cfada1613cd1948083410dc1ccab78"; + sha256 = "e848ff4e0867d346096fe417239ad9ab1c1680f1df5d68622a65340c0579e579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sk/thunderbird-115.4.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "724f250a2efdb6d3f1b7cd3a16dd667ef013b8e7d8af76befc6a35692b6db51b"; + sha256 = "e02d48cb66318cebeb764014e47b4d5f8623d7cbf66f665ff4018dac9656ee4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sl/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sl/thunderbird-115.4.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e243ed7bf35315cbe856c66614b9c8df243884aa68dab703a155bffd3568964e"; + sha256 = "c64947d2efb20bd3a9d0371114bc58cfbd6cc903a8ac9233565d38aeea474c79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sq/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sq/thunderbird-115.4.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7beb3635ce488c8ea059777eb986c2554fe064e162db146ed4074753b86b60ef"; + sha256 = "65291c7a93eaa973410ecc642111030ddd3083a76419c35632bf6d5b11ed9659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sr/thunderbird-115.4.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "162c3daade98baac53b44e03d42c3696f53d4259875f11b92622de756e1af457"; + sha256 = "33df374a558e147840773676e8a849d792224a77e3da4dc2366e56d2863962b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sv-SE/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sv-SE/thunderbird-115.4.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f76cff08945f213f80997d231d0930a8641725063a6c95ab5090d50c1ef791ca"; + sha256 = "2d2a7af5330149a14ff550bf0572226e77cb92529269666ffd05f00b0061f2f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/th/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/th/thunderbird-115.4.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e45b3bf416d32b65ef8c0e93170bce63f2a151ddc1ec54be637a2111a9966e07"; + sha256 = "4593a11c4ba6ab479734c52ee818ff6b304a74ac94199b77d6f2008f3dabe5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/tr/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/tr/thunderbird-115.4.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "86859e3328fb519ef0183cffea86222392bd40ff11c6e1eef500de46e2c236ef"; + sha256 = "c363acf14f55c307e9d0a1d9d23dd33f40e72da9c9c22f5ef0c9b9eca13a639f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uk/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uk/thunderbird-115.4.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6e38fe346232dc10dd3fd71578856116c7005b89ee6a064b409481f9bf1b3ad5"; + sha256 = "b4f356f80d2d8d8167b404553fa3bc55b392157b0ccf70ae471bd91433d58a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uz/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uz/thunderbird-115.4.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f4d3dad6b9ba9a417f9365617fc93f04b794ca5bbe1979606fc7ea2b9b4a919f"; + sha256 = "9a875b9bdf2de6ea3ca5a86381e4f0e02b16940f456bbc86387e1b19aac51efb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/vi/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/vi/thunderbird-115.4.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "740b1c77c00ece1cc21824bbaa76edf8fb1b5ea99307f0ff5c4db28da01b0fef"; + sha256 = "3370cbd9253379c7cc1096a85b8b37d6102e4af9343a303024dc1811b82e2293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-CN/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-CN/thunderbird-115.4.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d1d5c77022286d5eade32a3fe26d0f707d5ea2b2c0288e2b1e589b272948dab3"; + sha256 = "b85d1962f95954ea8ad8b4306fe6f6bea352c2fc47db039477952bdb69f07457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-TW/thunderbird-115.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-TW/thunderbird-115.4.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ab6d7d5d542146c063cb013c41e04ef6967bfcab0c3b9fad3248bc9a1fe6386f"; + sha256 = "286e8f3d72f2510919e30989d9c4eca3a3e2e0ef4162400942d5b2fa0777dac5"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 71b0768dab..523a1f3a39 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.3.1"; + version = "115.4.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e3b643cfee07d3fdd7bcc686db6dd3e81b09ecabfa9df4d34dd32acf3799b4b0b4a88e169f957d420e06aabba55c4452f3a9761db37828b025048ad5d8ef2db9"; + sha512 = "44cedd5931edbac2ab0babfaf0e71a0262317c01fd7d71e8740bb8f54766c9b49b9e325f1d2796c3a233d4298457d8769b675213a21bef759c46086080bcc8bc"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index d7ee8754c9..44eba5bc02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.8"; + version = "3.118.13"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-12R8g5U8p2lXNaSeJiCvEb6AgCC40jDXDKO8kyEvM6w="; + hash = "sha256-3kpfF/XG7w6qUooS5UsntMKnggG1LhmV9f+R35kkmb0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index cd4642f906..bd09e6b8be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2023.4"; + version = "2023.5"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM="; - aarch64-linux = "sha256-e0lp+SpBUmtYBcJPvql8ALeCkVtneZ1Cd3IFMVX6R2Q="; + x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4="; + aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo="; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock index 87bef3c513..49d3e0f812 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/Cargo.lock @@ -19,31 +19,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array 0.14.4", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "ctr", - "opaque-debug 0.3.0", ] [[package]] name = "aes-gcm" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" dependencies = [ "aead", "aes", @@ -62,6 +61,12 @@ 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.1.2" @@ -82,13 +87,62 @@ dependencies = [ [[package]] name = "android_system_properties" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] +[[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.44" @@ -97,9 +151,21 @@ checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arc-swap" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-stream" @@ -119,7 +185,7 @@ checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -130,7 +196,7 @@ checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -222,12 +288,38 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "digest 0.10.3", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -284,9 +376,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cbindgen" @@ -294,7 +386,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" dependencies = [ - "clap", + "clap 3.2.25", "heck", "indexmap", "log", @@ -302,7 +394,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.100", "tempfile", "toml", ] @@ -327,21 +419,20 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", @@ -352,13 +443,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.21" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f725f340c3854e3cb3ab736dc21f0cca183303acea3b3ffec30f141503ac8eb" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.43", @@ -368,36 +459,74 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array 0.14.4", + "crypto-common", + "inout", + "zeroize", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", - "clap_lex", + "clap_lex 0.2.4", "indexmap", - "once_cell", "strsim 0.10.0", "termcolor", "textwrap", ] [[package]] -name = "clap_complete" -version = "3.0.6" +name = "clap" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678db4c39c013cc68b54d372bce2efc58e30a0337c497c9032fd196802df3bc3" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ - "clap", + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", + "once_cell", + "strsim 0.10.0", +] + +[[package]] +name = "clap_complete" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" +dependencies = [ + "clap 4.2.7", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] @@ -409,6 +538,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + [[package]] name = "classic-mceliece-rust" version = "2.0.2" @@ -420,6 +555,22 @@ dependencies = [ "zeroize", ] +[[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 = "colored" version = "1.9.3" @@ -443,9 +594,15 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" + +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "convert_case" @@ -465,9 +622,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" @@ -479,10 +636,29 @@ dependencies = [ ] [[package]] -name = "crypto-bigint" -version = "0.3.2" +name = "crossbeam-channel" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[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 = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.4", "rand_core 0.6.4", @@ -492,19 +668,20 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.4", + "rand_core 0.6.4", "typenum", ] [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] @@ -532,6 +709,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "darling" version = "0.10.2" @@ -553,7 +774,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.100", ] [[package]] @@ -564,7 +785,18 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.100", +] + +[[package]] +name = "dashmap" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +dependencies = [ + "cfg-if", + "num_cpus", + "parking_lot", ] [[package]] @@ -586,11 +818,12 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "zeroize", ] [[package]] @@ -601,7 +834,7 @@ checksum = "302ccf094df1151173bb6f5a2282fcd2f45accd5eae1bdf82dcbfefbc501ad5c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -614,7 +847,7 @@ dependencies = [ "derive_builder_core", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -626,7 +859,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -639,7 +872,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.100", ] [[package]] @@ -706,9 +939,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -732,13 +965,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.3", "generic-array 0.14.4", "rand_core 0.6.4", "sec1", @@ -761,7 +995,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -803,7 +1037,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.100", "synstructure", ] @@ -818,6 +1052,17 @@ dependencies = [ "winapi", ] +[[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" @@ -863,6 +1108,18 @@ dependencies = [ "log", ] +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.48.0", +] + [[package]] name = "fixedbitset" version = "0.4.2" @@ -877,14 +1134,22 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "futures" version = "0.3.25" @@ -941,7 +1206,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -1017,9 +1282,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug 0.3.0", "polyval", @@ -1033,9 +1298,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1080,6 +1345,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -1158,9 +1429,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1176,9 +1447,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1189,7 +1460,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", + "itoa 1.0.1", "pin-project-lite", "socket2", "tokio", @@ -1212,15 +1483,26 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.42" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9512e544c25736b82aebbd2bf739a47c8a1c935dfcc3a6adcde10e35cd3cd468" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", - "core-foundation", + "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", +] + +[[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]] @@ -1240,6 +1522,16 @@ dependencies = [ "unicode-normalization", ] +[[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.7.0" @@ -1250,6 +1542,17 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + [[package]] name = "inotify" version = "0.10.0" @@ -1272,6 +1575,15 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "instant" version = "0.1.11" @@ -1317,9 +1629,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "ipnetwork" @@ -1341,14 +1653,14 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", - "rustix", - "windows-sys 0.42.0", + "rustix 0.37.3", + "windows-sys 0.48.0", ] [[package]] @@ -1413,7 +1725,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -1442,6 +1754,26 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +[[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags", + "libc", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1450,9 +1782,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libdbus-sys" @@ -1463,6 +1795,15 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.4" @@ -1475,6 +1816,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" + [[package]] name = "lock_api" version = "0.4.6" @@ -1557,16 +1904,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" dependencies = [ "digest 0.10.3", - "md5-asm", -] - -[[package]] -name = "md5-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b9a6f25ec11ea27e22d7fc8beafda909da44ece95f63e94f1eeb23d19bb5c7" -dependencies = [ - "cc", ] [[package]] @@ -1584,6 +1921,24 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -1644,6 +1999,7 @@ dependencies = [ "hyper", "ipnetwork", "log", + "mullvad-fs", "mullvad-types", "once_cell", "regex", @@ -1655,19 +2011,18 @@ dependencies = [ "talpid-types", "tokio", "tokio-rustls", - "uuid", ] [[package]] name = "mullvad-cli" version = "0.0.0" dependencies = [ - "base64", + "anyhow", + "base64 0.13.0", "chrono", - "clap", + "clap 4.2.7", "clap_complete", "env_logger 0.10.0", - "err-derive", "futures", "itertools", "mullvad-management-interface", @@ -1689,7 +2044,7 @@ dependencies = [ "android_logger", "cfg-if", "chrono", - "clap", + "clap 4.2.7", "ctrlc", "dirs-next", "duct", @@ -1702,6 +2057,7 @@ dependencies = [ "log", "log-panics", "mullvad-api", + "mullvad-fs", "mullvad-management-interface", "mullvad-paths", "mullvad-relay-selector", @@ -1709,6 +2065,7 @@ dependencies = [ "mullvad-version", "nix 0.23.1", "objc", + "once_cell", "parking_lot", "rand 0.8.5", "regex", @@ -1738,6 +2095,16 @@ dependencies = [ "talpid-types", ] +[[package]] +name = "mullvad-fs" +version = "0.0.0" +dependencies = [ + "log", + "talpid-types", + "tokio", + "uuid", +] + [[package]] name = "mullvad-jni" version = "0.0.0" @@ -1807,7 +2174,7 @@ dependencies = [ name = "mullvad-problem-report" version = "0.0.0" dependencies = [ - "clap", + "clap 4.2.7", "dirs-next", "duct", "env_logger 0.10.0", @@ -1852,7 +2219,7 @@ dependencies = [ name = "mullvad-setup" version = "0.0.0" dependencies = [ - "clap", + "clap 4.2.7", "env_logger 0.10.0", "err-derive", "lazy_static", @@ -1872,6 +2239,7 @@ name = "mullvad-types" version = "0.0.0" dependencies = [ "chrono", + "clap 4.2.7", "err-derive", "ipnetwork", "jnix", @@ -2010,7 +2378,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.4", ] [[package]] @@ -2025,13 +2393,48 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +name = "nix" +version = "0.26.1" +source = "git+https://github.com/nix-rust/nix?rev=b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28#b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28" dependencies = [ - "autocfg", - "num-traits", + "bitflags", + "cfg-if", + "libc", + "memoffset 0.8.0", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "notify" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +dependencies = [ + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify 0.9.6", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.42.0", ] [[package]] @@ -2045,11 +2448,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] @@ -2073,9 +2476,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2112,30 +2515,39 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" + +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] [[package]] name = "p256" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] name = "p384" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d8266e41f57bd8562ed9b6e93cdcf73ead050e1e8c3a27ea3871b6643a20c" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] @@ -2183,9 +2595,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" @@ -2216,7 +2628,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2247,7 +2659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52063325d6b0de17051e72275d44f96c5b73a75029fcdd7e05e54a62ff216437" dependencies = [ "derive_builder", - "errno", + "errno 0.2.8", "error-chain", "ioctl-sys", "ipnetwork", @@ -2309,7 +2721,7 @@ checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2324,6 +2736,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.20" @@ -2332,9 +2754,9 @@ checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", @@ -2343,9 +2765,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ "cfg-if", "cpufeatures", @@ -2376,7 +2798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.100", ] [[package]] @@ -2388,7 +2810,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.100", "version_check", ] @@ -2405,9 +2827,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -2452,7 +2874,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2498,14 +2920,14 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2654,19 +3076,21 @@ dependencies = [ [[package]] name = "ring-compat" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6242f589b69a0555addb0bb759f81e5cba40485d38b36f780ab3a588b2bdf064" +checksum = "333b9bf6765e0141324d95b5375bb1aa5267865bb4bc0281c22aff22f5d37746" dependencies = [ "aead", - "digest 0.9.0", + "digest 0.10.3", "ecdsa", "ed25519", "generic-array 0.14.4", "opaque-debug 0.3.0", "p256", "p384", + "pkcs8", "ring", + "signature", ] [[package]] @@ -2712,13 +3136,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.6", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.8" @@ -2737,7 +3175,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] @@ -2767,6 +3205,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "sct" version = "0.7.0" @@ -2779,10 +3223,11 @@ dependencies = [ [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array 0.14.4", "subtle", @@ -2834,7 +3279,7 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -2881,16 +3326,6 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.3", - "sha1-asm", -] - -[[package]] -name = "sha1-asm" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563d4f7100bc3fce234e5f37bbf63dc2752558964505ba6ac3f7204bdc59eaac" -dependencies = [ - "cc", ] [[package]] @@ -2905,20 +3340,22 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16fc99441d1a1b91b5f7b5093773d631ad506761a973e0a632f1836d1b05939" +version = "1.15.3" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ + "arc-swap", "async-trait", - "base64", + "base64 0.21.0", + "blake3", "byte_string", "bytes", "cfg-if", "futures", "libc", "log", - "nix 0.23.1", + "notify", "once_cell", + "percent-encoding", "pin-project", "sendfd", "serde", @@ -2926,24 +3363,27 @@ dependencies = [ "serde_urlencoded", "shadowsocks-crypto", "socket2", + "spin 0.9.2", "thiserror", "tokio", "tokio-tfo", + "trust-dns-resolver", "url", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "shadowsocks-crypto" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd381517e3eb8fec5090696debfdea972d8afe6fc926c26c7bfd5fee9053efbd" +checksum = "dfb488687e398030dd9c9396e119ddbc6952bdeaefe2168943b5b2ddaa54f2e6" dependencies = [ "aes", "aes-gcm", "cfg-if", "chacha20", "chacha20poly1305", + "ctr", "hkdf", "md-5", "rand 0.8.5", @@ -2951,11 +3391,22 @@ dependencies = [ "sha1", ] +[[package]] +name = "shadowsocks-proxy" +version = "0.0.0" +dependencies = [ + "cbindgen", + "libc", + "log", + "oslog", + "shadowsocks-service", + "tokio", +] + [[package]] name = "shadowsocks-service" -version = "1.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c3eb3ce85fb4c1f7451d2a5704503d3146ed7d626a17a63194092f07be45a4" +version = "1.15.3" +source = "git+https://github.com/mullvad/shadowsocks-rust?rev=c45980bb22d0d50ac888813c59a1edf0cff14a36#c45980bb22d0d50ac888813c59a1edf0cff14a36" dependencies = [ "arc-swap", "async-trait", @@ -2964,16 +3415,18 @@ dependencies = [ "bytes", "cfg-if", "futures", - "idna", + "hyper", + "idna 0.3.0", "ipnet", "iprange", "json5", "libc", "log", "lru_time_cache", - "nix 0.23.1", + "nix 0.26.2", "once_cell", "pin-project", + "rand 0.8.5", "regex", "serde", "shadowsocks", @@ -2981,7 +3434,8 @@ dependencies = [ "spin 0.9.2", "thiserror", "tokio", - "winapi", + "tower", + "windows-sys 0.45.0", ] [[package]] @@ -3011,9 +3465,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "rand_core 0.6.4", ] @@ -3048,9 +3502,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3071,6 +3525,22 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + +[[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.9.3" @@ -3109,6 +3579,17 @@ dependencies = [ "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 = "sync_wrapper" version = "0.1.1" @@ -3123,15 +3604,15 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "unicode-xid", ] [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags", "core-foundation", @@ -3161,14 +3642,14 @@ dependencies = [ "err-derive", "futures", "hex", - "inotify", + "inotify 0.10.0", "internet-checksum", "ipnetwork", "jnix", "lazy_static", "libc", "log", - "memoffset", + "memoffset 0.6.4", "mnl", "netlink-packet-route", "netlink-sys", @@ -3186,7 +3667,6 @@ dependencies = [ "regex", "resolv-conf", "rtnetlink", - "shadowsocks-service", "shell-escape", "socket2", "subslice", @@ -3297,6 +3777,7 @@ dependencies = [ name = "talpid-routing" version = "0.0.0" dependencies = [ + "bitflags", "err-derive", "futures", "ipnetwork", @@ -3305,12 +3786,13 @@ dependencies = [ "log", "netlink-packet-route", "netlink-sys", + "nix 0.26.1", "rtnetlink", "socket2", + "system-configuration", "talpid-types", "talpid-windows-net", "tokio", - "tokio-stream", "widestring 1.0.2", "windows-sys 0.45.0", ] @@ -3348,6 +3830,7 @@ name = "talpid-tunnel-config-client" version = "0.0.0" dependencies = [ "classic-mceliece-rust", + "libc", "log", "pqc_kyber", "prost", @@ -3357,6 +3840,7 @@ dependencies = [ "tonic", "tonic-build", "tower", + "windows-sys 0.45.0", "zeroize", ] @@ -3364,7 +3848,7 @@ dependencies = [ name = "talpid-types" version = "0.0.0" dependencies = [ - "base64", + "base64 0.13.0", "err-derive", "ipnetwork", "jnix", @@ -3434,7 +3918,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix", + "rustix 0.36.7", "windows-sys 0.42.0", ] @@ -3470,7 +3954,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3545,7 +4029,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3572,9 +4056,9 @@ dependencies = [ [[package]] name = "tokio-tfo" -version = "0.1.9" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4279aec5ded232170bf39130dd0e0deaed2c9f31cd3b5db1f2021056bcf5f94a" +checksum = "35ccf89920b48afc418f18135342355d30ad048f3c95ba54670f50a52371a439" dependencies = [ "cfg-if", "futures", @@ -3584,7 +4068,7 @@ dependencies = [ "pin-project", "socket2", "tokio", - "winapi", + "windows-sys 0.36.1", ] [[package]] @@ -3619,7 +4103,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.13.0", "bytes", "futures-core", "futures-util", @@ -3652,7 +4136,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3727,7 +4211,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", ] [[package]] @@ -3800,7 +4284,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.2.3", "ipnet", "lazy_static", "rand 0.8.5", @@ -3836,9 +4320,9 @@ dependencies = [ [[package]] name = "trust-dns-server" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cf9f8a359c9f16fdf760b79cb2be3f261b98db8027f81959c7a4f6645e2c" +checksum = "99022f9befa6daec2a860be68ac28b1f0d9d7ccf441d8c5a695e35a58d88840d" dependencies = [ "async-trait", "bytes", @@ -3931,6 +4415,12 @@ 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.2.2" @@ -3939,11 +4429,11 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" dependencies = [ - "generic-array 0.14.4", + "crypto-common", "subtle", ] @@ -3955,17 +4445,22 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", "serde", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -4041,7 +4536,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.100", "wasm-bindgen-shared", ] @@ -4063,7 +4558,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4148,6 +4643,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-service" version = "0.6.0" @@ -4159,19 +4663,32 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[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", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] @@ -4180,7 +4697,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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]] @@ -4189,13 +4715,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] @@ -4204,42 +4745,114 @@ 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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[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 = "winreg" version = "0.7.0" @@ -4286,6 +4899,6 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.100", "synstructure", ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix index 754109c5cc..71a53aa334 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/mullvad.nix @@ -1,9 +1,7 @@ { lib , stdenv -, writeText , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , protobuf , makeWrapper @@ -19,18 +17,20 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2023.3"; + version = "2023.5"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-as/d14xVTqJvb+QxzEyZWh1EMRVpE8cDQRbdc4R4pcU="; + hash = "sha256-bu16U9XJiIuYG9Npljos2ytfloSoGIl1ayH43w0aeKY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk="; + "shadowsocks-1.15.3" = "sha256-P35IQL2sAfrtjwMDn8k/kmkk2IMsvq6zICRRGUGfqJI="; "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 187eaa5a9c..c2ccd58861 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -40,6 +40,15 @@ let sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; }; }; + "@aws-crypto/crc32c-3.0.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz"; + sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; + }; + }; "@aws-crypto/ie11-detection-3.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -49,6 +58,15 @@ let sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; }; }; + "@aws-crypto/sha1-browser-3.0.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz"; + sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; + }; + }; "@aws-crypto/sha256-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -85,193 +103,283 @@ let sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/client-cognito-identity-3.414.0" = { + "@aws-sdk/client-cognito-identity-3.427.0" = { name = "_at_aws-sdk_slash_client-cognito-identity"; packageName = "@aws-sdk/client-cognito-identity"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.414.0.tgz"; - sha512 = "U9J0R/22eftQjY6JeAzXXYSgA+T6vx/jDsBBWBIKTjCZPBmmVOb2A4/d4sxHMxjh6Ms3DolpocE5FCbB9eGBEg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.427.0.tgz"; + sha512 = "9brRaNnl6haE7R3R43A5CSNw0k1YtB3xjuArbMg/p6NDUpvRSRgOVNWu2R02Yjh/j2ZuaLOCPLuCipb+PHQPKQ=="; }; }; - "@aws-sdk/client-sso-3.414.0" = { + "@aws-sdk/client-s3-3.427.0" = { + name = "_at_aws-sdk_slash_client-s3"; + packageName = "@aws-sdk/client-s3"; + version = "3.427.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.427.0.tgz"; + sha512 = "YKjJ9zgn0oE393HURKgvjNoX6lxUjb+dkTBE1GymFnGCPl6VxQbKXajXWNqUyN+oPPlZ2osEiljPaN0RserUjA=="; + }; + }; + "@aws-sdk/client-sso-3.427.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.414.0.tgz"; - sha512 = "GvRwQ7wA3edzsQEKS70ZPhkOUZ62PAiXasjp6GxrsADEb8sV1z4FxXNl9Un/7fQxKkh9QYaK1Wu1PmhLi9MLMg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.427.0.tgz"; + sha512 = "sFVFEmsQ1rmgYO1SgrOTxE/MTKpeE4hpOkm1WqhLQK7Ij136vXpjCxjH1JYZiHiUzO1wr9t4ex4dlB5J3VS/Xg=="; }; }; - "@aws-sdk/client-sts-3.414.0" = { + "@aws-sdk/client-sts-3.427.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.414.0.tgz"; - sha512 = "xeYH3si6Imp1EWolWn1zuxJJu2AXKwXl1HDftQULwC5AWkm1mNFbXYSJN4hQul1IM+kn+JTRB0XRHByQkKhe+Q=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.427.0.tgz"; + sha512 = "le2wLJKILyWuRfPz2HbyaNtu5kEki+ojUkTqCU6FPDRrqUvEkaaCBH9Awo/2AtrCfRkiobop8RuTTj6cAnpiJg=="; }; }; - "@aws-sdk/credential-provider-cognito-identity-3.414.0" = { + "@aws-sdk/credential-provider-cognito-identity-3.427.0" = { name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; packageName = "@aws-sdk/credential-provider-cognito-identity"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.414.0.tgz"; - sha512 = "sAbp5HVy0YmvXUKkkTt8Tr5a5XNQMxshxI+pmXHLCHNpRATS9A6i7YHVNMGmERKGriFWZG0Q8qgKh1E+rvN7fQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.427.0.tgz"; + sha512 = "BQNzNrMJlBAfXhYNdAUqaVASpT9Aho5swj7glZKxx4Uds1w5Pih2e14JWgnl8XgUWAZ36pchTrV1aA4JT7N8vw=="; }; }; - "@aws-sdk/credential-provider-env-3.413.0" = { + "@aws-sdk/credential-provider-env-3.425.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.413.0.tgz"; - sha512 = "yeMOkfG20/RlzfPMtQuDB647AcPEvFEVYOWZzAWVJfldYQ5ybKr0d7sBkgG9sdAzGkK3Aw9dE4rigYI8EIqc1Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.425.0.tgz"; + sha512 = "J20etnLvMKXRVi5FK4F8yOCNm2RTaQn5psQTGdDEPWJNGxohcSpzzls8U2KcMyUJ+vItlrThr4qwgpHG3i/N0w=="; }; }; - "@aws-sdk/credential-provider-ini-3.414.0" = { + "@aws-sdk/credential-provider-http-3.425.0" = { + name = "_at_aws-sdk_slash_credential-provider-http"; + packageName = "@aws-sdk/credential-provider-http"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.425.0.tgz"; + sha512 = "aP9nkoVWf+OlNMecrUqe4+RuQrX13nucVbty0HTvuwfwJJj0T6ByWZzle+fo1D+5OxvJmtzTflBWt6jUERdHWA=="; + }; + }; + "@aws-sdk/credential-provider-ini-3.427.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.414.0.tgz"; - sha512 = "rlpLLx70roJL/t40opWC96LbIASejdMbRlgSCRpK8b/hKngYDe5A7SRVacaw08vYrAywxRiybxpQOwOt9b++rA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.427.0.tgz"; + sha512 = "NmH1cO/w98CKMltYec3IrJIIco19wRjATFNiw83c+FGXZ+InJwReqBnruxIOmKTx2KDzd6fwU1HOewS7UjaaaQ=="; }; }; - "@aws-sdk/credential-provider-node-3.414.0" = { + "@aws-sdk/credential-provider-node-3.427.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.414.0.tgz"; - sha512 = "xlkcOUKeGHInxWKKrZKIPSBCUL/ozyCldJBjmMKEj7ZmBAEiDcjpMe3pZ//LibMkCSy0b/7jtyQBE/eaIT2o0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.427.0.tgz"; + sha512 = "wYYbQ57nKL8OfgRbl8k6uXcdnYml+p3LSSfDUAuUEp1HKlQ8lOXFJ3BdLr5qrk7LhpyppSRnWBmh2c3kWa7ANQ=="; }; }; - "@aws-sdk/credential-provider-process-3.413.0" = { + "@aws-sdk/credential-provider-process-3.425.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.413.0.tgz"; - sha512 = "GFJdgS14GzJ1wc2DEnS44Z/34iBZ05CAkvDsLN2CMwcDgH4eZuif9/x0lwzIJBK3xVFHzYUeVvEzsqRPbCHRsw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.425.0.tgz"; + sha512 = "YY6tkLdvtb1Fgofp3b1UWO+5vwS14LJ/smGmuGpSba0V7gFJRdcrJ9bcb9vVgAGuMdjzRJ+bUKlLLtqXkaykEw=="; }; }; - "@aws-sdk/credential-provider-sso-3.414.0" = { + "@aws-sdk/credential-provider-sso-3.427.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.414.0.tgz"; - sha512 = "w9g2hlkZn7WekWICRqk+L33py7KrjYMFryVpkKXOx2pjDchCfZDr6pL1ml782GZ0L3qsob4SbNpbtp13JprnWQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.427.0.tgz"; + sha512 = "c+tXyS/i49erHs4bAp6vKNYeYlyQ0VNMBgoco0LCn1rL0REtHbfhWMnqDLF6c2n3yIWDOTrQu0D73Idnpy16eA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.413.0" = { + "@aws-sdk/credential-provider-web-identity-3.425.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.413.0.tgz"; - sha512 = "5cdA1Iq9JeEHtg59ERV9fdMQ7cS0JF6gH/BWA7HYEUGdSVPXCuwyEggPtG64QgpNU7SmxH+QdDG+Ldxz09ycIA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.425.0.tgz"; + sha512 = "/0R65TgRzL01JU3SzloivWNwdkbIhr06uY/F5pBHf/DynQqaspKNfdHn6AiozgSVDfwRHFjKBTUy6wvf3QFkuA=="; }; }; - "@aws-sdk/credential-providers-3.414.0" = { + "@aws-sdk/credential-providers-3.427.0" = { name = "_at_aws-sdk_slash_credential-providers"; packageName = "@aws-sdk/credential-providers"; - version = "3.414.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.414.0.tgz"; - sha512 = "xv3cN/lu+HRroGWYWtqwBQ+guykyjSKHzYq6FlyfBZyjC6u8hoeNSNilFobIooJOXfrDM0LKr9L+uUlPE+0+lg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.427.0.tgz"; + sha512 = "rKKohSHju462vo+uQnPjcEZPBAfAMgGH6K1XyyCNpuOC0yYLkG87PYpvAQeb8riTrkHPX0dYUHuTHZ6zQgMGjA=="; }; }; - "@aws-sdk/middleware-host-header-3.413.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.425.0" = { + name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; + packageName = "@aws-sdk/middleware-bucket-endpoint"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.425.0.tgz"; + sha512 = "7UTfA10fmDw9cgHLApxRUNPywZTG4S/1TNZgTxndO/1OM9ZHtIatw1iLbqJD35gHrpEYI8Vo14YvcnD2ITuiMw=="; + }; + }; + "@aws-sdk/middleware-expect-continue-3.425.0" = { + name = "_at_aws-sdk_slash_middleware-expect-continue"; + packageName = "@aws-sdk/middleware-expect-continue"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.425.0.tgz"; + sha512 = "CqAmnDST2o7+sKKw2/ffHKiYKE+jZb/Ce9U0P//ZYzqp9R1Wb016ID+W6DoxufyPJAS9dpRMcUDnAssmMIC/EA=="; + }; + }; + "@aws-sdk/middleware-flexible-checksums-3.425.0" = { + name = "_at_aws-sdk_slash_middleware-flexible-checksums"; + packageName = "@aws-sdk/middleware-flexible-checksums"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.425.0.tgz"; + sha512 = "BDwn2vVVsC/AzmHXQlaZhEpKXL7GfKFpH7ZFccZuwEQBcyn8lVCcwtfaRe5P1mEe2wklVzOXd1dw8bt0+BOUPA=="; + }; + }; + "@aws-sdk/middleware-host-header-3.425.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.413.0.tgz"; - sha512 = "r9PQx468EzPHo9wRzZLfgROpKtVdbkteMrdhsuM12bifVHjU1OHr7yfhc1OdWv39X8Xiv6F8n5r+RBQEM0S6+g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.425.0.tgz"; + sha512 = "E5Gt41LObQ+cr8QnLthwsH3MtVSNXy1AKJMowDr85h0vzqA/FHUkgHyOGntgozzjXT5M0MaSRYxS0xwTR5D4Ew=="; }; }; - "@aws-sdk/middleware-logger-3.413.0" = { + "@aws-sdk/middleware-location-constraint-3.425.0" = { + name = "_at_aws-sdk_slash_middleware-location-constraint"; + packageName = "@aws-sdk/middleware-location-constraint"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.425.0.tgz"; + sha512 = "3rt0LpGmL1LCRFuEObS1yERd9OEV+AEIAvhY7b53M7u7SyrjWQtpntWkI365L/QljhgMXQBfps2qO4JtrhQnsA=="; + }; + }; + "@aws-sdk/middleware-logger-3.425.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.413.0.tgz"; - sha512 = "jqcXDubcKvoqBy+kkEa0WoNjG6SveDeyNy+gdGnTV+DEtYjkcHrHJei4q0W5zFl0mzc+dP+z8tJF44rv95ZY3Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.425.0.tgz"; + sha512 = "INE9XWRXx2f4a/r2vOU0tAmgctVp7nEaEasemNtVBYhqbKLZvr9ndLBSgKGgJ8LIcXAoISipaMuFiqIGkFsm7A=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.413.0" = { + "@aws-sdk/middleware-recursion-detection-3.425.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.413.0.tgz"; - sha512 = "C6k0IKJk/A4/VBGwUjxEPG+WOjjnmWAZVRBUzaeM7PqRh+g5rLcuIV356ntV3pREVxyiSTePTYVYIHU9YXkLKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.425.0.tgz"; + sha512 = "77gnzJ5b91bgD75L/ugpOyerx6lR3oyS4080X1YI58EzdyBMkDrHM4FbMcY2RynETi3lwXCFzLRyZjWXY1mRlw=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.413.0" = { + "@aws-sdk/middleware-sdk-s3-3.427.0" = { + name = "_at_aws-sdk_slash_middleware-sdk-s3"; + packageName = "@aws-sdk/middleware-sdk-s3"; + version = "3.427.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.427.0.tgz"; + sha512 = "virGCf9vsqYCLpmngLOZOVSYgVr2cCOCvTuRoT9vf5tD/63JwaC173jnbdoJO6CWI7ID5Iz0eNdgITXVQ2mpew=="; + }; + }; + "@aws-sdk/middleware-sdk-sts-3.425.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.413.0.tgz"; - sha512 = "t0u//JUyaEZRVnH5q+Ur3tWnuyIsTdwA0XOdDCZXcSlLYzGp2MI/tScLjn9IydRrceIFpFfmbjk4Nf/Q6TeBTQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.425.0.tgz"; + sha512 = "JFojrg76oKAoBknnr9EL5N2aJ1mRCtBqXoZYST58GSx8uYdFQ89qS65VNQ8JviBXzsrCNAn4vDhZ5Ch5E6TxGQ=="; }; }; - "@aws-sdk/middleware-signing-3.413.0" = { + "@aws-sdk/middleware-signing-3.425.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.413.0.tgz"; - sha512 = "QFEnVvIKYPCermM+ESxEztgUgXzGSKpnPnohMYNvSZySqmOLu/4VvxiZbRO/BX9J3ZHcUgaw4vKm5VBZRrycxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.425.0.tgz"; + sha512 = "ZpOfgJHk7ovQ0sSwg3tU4NxFOnz53lJlkJRf7S+wxQALHM0P2MJ6LYBrZaFMVsKiJxNIdZBXD6jclgHg72ZW6Q=="; }; }; - "@aws-sdk/middleware-user-agent-3.413.0" = { + "@aws-sdk/middleware-ssec-3.425.0" = { + name = "_at_aws-sdk_slash_middleware-ssec"; + packageName = "@aws-sdk/middleware-ssec"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.425.0.tgz"; + sha512 = "9HTuXnHYAZWkwPC8x9tElsQjFPxDT//orbIFauS7VF5HkLCKn9J6O6lW1wKMxrEnDwfN/Vi3nw479MoPj5Ss0Q=="; + }; + }; + "@aws-sdk/middleware-user-agent-3.427.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.413.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.413.0.tgz"; - sha512 = "eVMJyeWxNBqerhfD+sE9sTjDtwQiECrfU6wpUQP5fGPhJD2cVVZPxuTuJGDZCu/4k/V61dF85IYlsPUNLdVQ6w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.427.0.tgz"; + sha512 = "y9HxYsNvnA3KqDl8w1jHeCwz4P9CuBEtu/G+KYffLeAMBsMZmh4SIkFFCO9wE/dyYg6+yo07rYcnnIfy7WA0bw=="; }; }; - "@aws-sdk/region-config-resolver-3.413.0" = { + "@aws-sdk/region-config-resolver-3.425.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.413.0.tgz"; - sha512 = "h90e6yyOhvoc+1F5vFk3C5mxwB8RSDEMKTO/fxexyur94seczZ1yxyYkTMZv30oc9RUiToABlHNrh/wxL7TZPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.425.0.tgz"; + sha512 = "u7uv/iUOapIJdRgRkO3wnpYsUgV6ponsZJQgVg/8L+n+Vo5PQL5gAcIuAOwcYSKQPFaeK+KbmByI4SyOK203Vw=="; }; }; - "@aws-sdk/token-providers-3.413.0" = { + "@aws-sdk/signature-v4-multi-region-3.425.0" = { + name = "_at_aws-sdk_slash_signature-v4-multi-region"; + packageName = "@aws-sdk/signature-v4-multi-region"; + version = "3.425.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.425.0.tgz"; + sha512 = "7n2FRPE9rLaVa26xXQJ8TExrt53dWN824axQd1a0r5va0SmMQYG/iV5LBmwUlAntUSq46Lse4Q5YnbOVedGOmw=="; + }; + }; + "@aws-sdk/token-providers-3.427.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.413.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.413.0.tgz"; - sha512 = "NfP1Ib9LAWVLMTOa/1aJwt4TRrlRrNyukCpVZGfNaMnNNEoP5Rakdbcs8KFVHe/MJzU+GdKVzxQ4TgRkLOGTrA=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.427.0.tgz"; + sha512 = "4E5E+4p8lJ69PBY400dJXF06LUHYx5lkKzBEsYqWWhoZcoftrvi24ltIhUDoGVLkrLcTHZIWSdFAWSos4hXqeg=="; }; }; - "@aws-sdk/types-3.413.0" = { + "@aws-sdk/types-3.425.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.413.0.tgz"; - sha512 = "j1xib0f/TazIFc5ySIKOlT1ujntRbaoG4LJFeEezz4ji03/wSJMI8Vi4KjzpBp8J1tTu0oRDnsxRIGixsUBeYQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.425.0.tgz"; + sha512 = "6lqbmorwerN4v+J5dqbHPAsjynI0mkEF+blf+69QTaKKGaxBBVaXgqoqul9RXYcK5MMrrYRbQIMd0zYOoy90kA=="; }; }; - "@aws-sdk/util-endpoints-3.413.0" = { + "@aws-sdk/util-arn-parser-3.310.0" = { + name = "_at_aws-sdk_slash_util-arn-parser"; + packageName = "@aws-sdk/util-arn-parser"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.310.0.tgz"; + sha512 = "jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA=="; + }; + }; + "@aws-sdk/util-endpoints-3.427.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.413.0"; + version = "3.427.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.413.0.tgz"; - sha512 = "VAwr7cITNb1L6/2XUPIbCOuhKGm0VtKCRblurrfUF2bxqG/wtuw/2Fm4ahYJPyxklOSXAMSq+RHdFWcir0YB/g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.427.0.tgz"; + sha512 = "rSyiAIFF/EVvity/+LWUqoTMJ0a25RAc9iqx0WZ4tf1UjuEXRRXxZEb+jEZg1bk+pY84gdLdx9z5E+MSJCZxNQ=="; }; }; "@aws-sdk/util-locate-window-3.310.0" = { @@ -283,22 +391,22 @@ let sha512 = "qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="; }; }; - "@aws-sdk/util-user-agent-browser-3.413.0" = { + "@aws-sdk/util-user-agent-browser-3.425.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.413.0.tgz"; - sha512 = "7j/qWcRO2OBZBre2fC6V6M0PAS9n7k6i+VtofPkkhxC2DZszLJElqnooF9hGmVGYK3zR47Np4WjURXKIEZclWg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.425.0.tgz"; + sha512 = "22Y9iMtjGcFjGILR6/xdp1qRezlHVLyXtnpEsbuPTiernRCPk6zfAnK/ATH77r02MUjU057tdxVkd5umUBTn9Q=="; }; }; - "@aws-sdk/util-user-agent-node-3.413.0" = { + "@aws-sdk/util-user-agent-node-3.425.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.413.0"; + version = "3.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.413.0.tgz"; - sha512 = "vHm9TVZIzfWMeDvdmoOky6VarqOt8Pr68CESHN0jyuO6XbhCDnr9rpaXiBhbSR+N1Qm7R/AfJgAhQyTMu2G1OA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.425.0.tgz"; + sha512 = "SIR4F5uQeeVAi8lv4OgRirtdtNi5zeyogTuQgGi9su8F/WP1N6JqxofcwpUY5f8/oJ2UlXr/tx1f09UHfJJzvA=="; }; }; "@aws-sdk/util-utf8-browser-3.259.0" = { @@ -310,6 +418,15 @@ let sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; }; }; + "@aws-sdk/xml-builder-3.310.0" = { + name = "_at_aws-sdk_slash_xml-builder"; + packageName = "@aws-sdk/xml-builder"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz"; + sha512 = "TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -400,13 +517,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.4.0" = { + "@azure/core-util-1.5.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.4.0.tgz"; - sha512 = "eGAyJpm3skVQoLiRqm/xPa+SXi/NPDdSHMxbRAz2lSprd+Zs+qrpQGQQ2VQ3Nttu+nSZR4XoYQC71LbEI7jsig=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.5.0.tgz"; + sha512 = "GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g=="; }; }; "@azure/identity-2.1.0" = { @@ -481,13 +598,13 @@ let sha512 = "jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q=="; }; }; - "@babel/runtime-7.22.15" = { + "@babel/runtime-7.23.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.22.15"; + version = "7.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz"; - sha512 = "T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz"; + sha512 = "hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g=="; }; }; "@colors/colors-1.5.0" = { @@ -499,6 +616,15 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; + "@colors/colors-1.6.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz"; + sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; + }; + }; "@cspotcode/source-map-support-0.8.1" = { name = "_at_cspotcode_slash_source-map-support"; packageName = "@cspotcode/source-map-support"; @@ -544,6 +670,15 @@ let sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; }; }; + "@fastify/busboy-2.0.0" = { + name = "_at_fastify_slash_busboy"; + packageName = "@fastify/busboy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz"; + sha512 = "JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ=="; + }; + }; "@gar/promisify-1.1.3" = { name = "_at_gar_slash_promisify"; packageName = "@gar/promisify"; @@ -652,13 +787,13 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.9" = { + "@grpc/proto-loader-0.7.10" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.9"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.9.tgz"; - sha512 = "YJsOehVXzgurc+lLAxYnlSMc1p/Gu6VAvnfx0ATi2nzvr0YZcjhmZDeY8SeAKv1M7zE3aEJH0Xo9mK1iZ8GYoQ=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz"; + sha512 = "CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -760,13 +895,13 @@ let sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; }; }; - "@js-joda/core-5.5.3" = { + "@js-joda/core-5.6.0" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.5.3"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.3.tgz"; - sha512 = "7dqNYwG8gCt4hfg5PKgM7xLEcgSBcx/UgC92OMnhMmvAnq11QzDFPrxUkNR/u5kn17WWLZ8beZ4A3Qrz4pZcmQ=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.6.0.tgz"; + sha512 = "qCVg3pFw3dXiWcO4H0bMWNiJIuqgEKCu7HIqwkqFyuqa1SawWU3yYJDRkhOTBLt7c+tgEZDobzykv7Obj09Erg=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -832,22 +967,31 @@ let sha512 = "E/ir1Ay8Pmia+b5tvV4KhZ0J0xexz3jJc1w93xx39Iaq5XuZRWC3TNJhJdVp0f2fPti0rVDHnAMHsovBucHBIw=="; }; }; - "@n8n/vm2-3.9.20" = { - name = "_at_n8n_slash_vm2"; - packageName = "@n8n/vm2"; - version = "3.9.20"; + "@n8n/tournament-1.0.2" = { + name = "_at_n8n_slash_tournament"; + packageName = "@n8n/tournament"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.20.tgz"; - sha512 = "qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ=="; + url = "https://registry.npmjs.org/@n8n/tournament/-/tournament-1.0.2.tgz"; + sha512 = "fTpi7F8ra5flGSVfRzohPyG7czAAKCZPlLjdKdwbLJivLoI/Ekhgodov1jfVSCVFVbwQ06gRQRxLEDzl2jl8ig=="; }; }; - "@n8n_io/license-sdk-2.5.1" = { + "@n8n/vm2-3.9.23" = { + name = "_at_n8n_slash_vm2"; + packageName = "@n8n/vm2"; + version = "3.9.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.23.tgz"; + sha512 = "yu+It+L89uljQsCJ2e9cQaXzoXJe9bU69QQIoWUOcUw0u5Zon37DuB7bdNNsjKS1ZdFD+fBWCQpq/FkqHsSjXQ=="; + }; + }; + "@n8n_io/license-sdk-2.6.1" = { name = "_at_n8n_io_slash_license-sdk"; packageName = "@n8n_io/license-sdk"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.5.1.tgz"; - sha512 = "CL4JVJS8nvI8qPFQ1jSG7CiPnNkeKJSgbDxWOLVX4MRjTKrwL8Cpd1LeYMx5g5StmHzkoxz2TDqL8WT6qyMlrQ=="; + url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.6.1.tgz"; + sha512 = "N4yBzgNIRrQlhy+BWyEC9cbf86asPxryWbJpmrfeaqkFpBR6Z5yIqmWRGnLs7XKVC9se8cdWlF7EWKtaH6oDPA=="; }; }; "@n8n_io/riot-tmpl-4.0.1" = { @@ -976,13 +1120,13 @@ let sha512 = "l04iSd0xoh/16TGVpXb81Gg3z7tlQGrEup16BrVLsZBK6SEYpYHRJZnM32BwZrHI97ZSFfuSwVlzoo6HdsaK8A=="; }; }; - "@oclif/screen-3.0.6" = { + "@oclif/screen-3.0.7" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.6.tgz"; - sha512 = "nEv7dFPxCrWrvK6dQ8zya0/Kb54EXVcwIKV9capjSa89ZDoOo+qH0YSo4/eQVECXgW3eUvgKLDIcIt62YBk0HA=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.7.tgz"; + sha512 = "jQBPHcMh5rcIPKdqA6xlzioLOmkaVnjg2MVyjMzBKV8hDhLWNSiZqx7NAWXpP70v2LFvGdVoV8BSbK9iID3eHg=="; }; }; "@opentelemetry/api-1.6.0" = { @@ -1093,13 +1237,13 @@ let sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; - "@redis/client-1.5.9" = { + "@redis/client-1.5.11" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.5.9"; + version = "1.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.9.tgz"; - sha512 = "SffgN+P1zdWJWSXBvJeynvEnmnZrYmtKSRW00xl8pOPFOMJjxRR9u0frSxJpPR6Y4V+k54blJjGW7FgxbTI7bQ=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.11.tgz"; + sha512 = "cV7yHcOAtNQ5x/yQl7Yw1xf53kO0FNDTdDU6bFIMbW6ljB7U7ns0YRM+QIkpoqTAt6zK5k9Fq0QWlUbLcq9AvA=="; }; }; "@redis/graph-1.1.0" = { @@ -1111,22 +1255,22 @@ let sha512 = "16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg=="; }; }; - "@redis/json-1.0.4" = { + "@redis/json-1.0.6" = { name = "_at_redis_slash_json"; packageName = "@redis/json"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz"; - sha512 = "LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw=="; + url = "https://registry.npmjs.org/@redis/json/-/json-1.0.6.tgz"; + sha512 = "rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw=="; }; }; - "@redis/search-1.1.3" = { + "@redis/search-1.1.5" = { name = "_at_redis_slash_search"; packageName = "@redis/search"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.3.tgz"; - sha512 = "4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng=="; + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.5.tgz"; + sha512 = "hPP8w7GfGsbtYEJdn4n7nXa6xt6hVZnnDktKW4ArMaFQ/m/aR7eFvsLQmG/mn1Upq99btPJk+F27IQ2dYpCoUg=="; }; }; "@redis/time-series-1.0.5" = { @@ -1147,13 +1291,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.18.22" = { + "@sap/hana-client-2.18.24" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.18.22"; + version = "2.18.24"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.18.22.tgz"; - sha512 = "iihhrDk70vg9SYHCDWnFiYSBjS3y5TMojPqEPkcPpkNg7YuYlabcdY7xy4iepLpDP6jqa1EijPxPi33zYAnXzw=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.18.24.tgz"; + sha512 = "CbLXVPYntnHc9EWO2zgJ8hTGje76om7XIPPKpu3kBHTs19f8wHKyhmQkJJTeJix0yAnYuv9sXNinlpvRGujMow=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1174,121 +1318,193 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.69.0" = { + "@sentry-internal/tracing-7.73.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.69.0.tgz"; - sha512 = "4BgeWZUj9MO6IgfO93C9ocP3+AdngqujF/+zB2rFdUe+y9S6koDyUC7jr9Knds/0Ta72N/0D6PwhgSCpHK8s0Q=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.73.0.tgz"; + sha512 = "ig3WL/Nqp8nRQ52P205NaypGKNfIl/G+cIqge9xPW6zfRb5kJdM1YParw9GSJ1SPjEZBkBORGAML0on5H2FILw=="; }; }; - "@sentry/core-7.69.0" = { + "@sentry/core-7.73.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz"; - sha512 = "V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.73.0.tgz"; + sha512 = "9FEz4Gq848LOgVN2OxJGYuQqxv7cIVw69VlAzWHEm3njt8mjvlTq+7UiFsGRo84+59V2FQuHxzA7vVjl90WfSg=="; }; }; - "@sentry/integrations-7.69.0" = { + "@sentry/integrations-7.73.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.69.0.tgz"; - sha512 = "FEFtFqXuCo9+L7bENZxFpEAlIODwHl6FyW/DwLfniy9jOXHU7BhP/oICLrFE5J7rh1gNY7N/8VlaiQr3hCnS/g=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.73.0.tgz"; + sha512 = "IjVpn4d+aSL9L1Ntu/oAdRwujz4BzzavDsZf96Xgc/AjBnjAEUT+wT1dAwluThfuKDXmWOJHhZ2cHHMfqI+7vw=="; }; }; - "@sentry/node-7.69.0" = { + "@sentry/node-7.73.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.69.0.tgz"; - sha512 = "T0NgPcmDQvEuz5hy6aEhXghTHHTWsiP3IWoeEAakDBHAXmtpT6lYFQZgb5AiEOt9F5KO/G/1yH3YYdpDAnKhPw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.73.0.tgz"; + sha512 = "i50bRfmgkRRx0XXUbg9jGD/RuznDJxJXc4rBILhoJuhl+BjRIaoXA3ayplfJn8JLZxsNh75uJaCq4IUK70SORw=="; }; }; - "@sentry/types-7.69.0" = { + "@sentry/types-7.73.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz"; - sha512 = "zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.73.0.tgz"; + sha512 = "/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg=="; }; }; - "@sentry/utils-7.69.0" = { + "@sentry/utils-7.73.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.69.0"; + version = "7.73.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz"; - sha512 = "4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.73.0.tgz"; + sha512 = "h3ZK/qpf4k76FhJV9uiSbvMz3V/0Ovy94C+5/9UgPMVCJXFmVsdw8n/dwANJ7LupVPfYP23xFGgebDMFlK1/2w=="; }; }; - "@smithy/abort-controller-2.0.8" = { + "@smithy/abort-controller-2.0.11" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.8.tgz"; - sha512 = "2SOdVj5y0zE37Y9scSXoizoxgi6mgnDabi7a/SOfhl0p+50I0rIkuJTfyAuTPDtQ7e5dD6tSZPCLB3c/YM6Zig=="; - }; - }; - "@smithy/config-resolver-2.0.9" = { - name = "_at_smithy_slash_config-resolver"; - packageName = "@smithy/config-resolver"; - version = "2.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.9.tgz"; - sha512 = "QBkGPLUqyPmis9Erz8v4q5lo/ErnF7+GD5WZHa6JZiXopUPfaaM+B21n8gzS5xCkIXZmnwzNQhObP9xQPu8oqQ=="; - }; - }; - "@smithy/credential-provider-imds-2.0.11" = { - name = "_at_smithy_slash_credential-provider-imds"; - packageName = "@smithy/credential-provider-imds"; version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.11.tgz"; - sha512 = "uJJs8dnM5iXkn8a2GaKvlKMhcOJ+oJPYqY9gY3CM/EieCVObIDjxUtR/g8lU/k/A+OauA78GzScAfulmFjPOYA=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.11.tgz"; + sha512 = "MSzE1qR2JNyb7ot3blIOT3O3H0Jn06iNDEgHRaqZUwBgx5EG+VIx24Y21tlKofzYryIOcWpIohLrIIyocD6LMA=="; }; }; - "@smithy/eventstream-codec-2.0.8" = { + "@smithy/chunked-blob-reader-2.0.0" = { + name = "_at_smithy_slash_chunked-blob-reader"; + packageName = "@smithy/chunked-blob-reader"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz"; + sha512 = "k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg=="; + }; + }; + "@smithy/chunked-blob-reader-native-2.0.0" = { + name = "_at_smithy_slash_chunked-blob-reader-native"; + packageName = "@smithy/chunked-blob-reader-native"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz"; + sha512 = "HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="; + }; + }; + "@smithy/config-resolver-2.0.14" = { + name = "_at_smithy_slash_config-resolver"; + packageName = "@smithy/config-resolver"; + version = "2.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.14.tgz"; + sha512 = "K1K+FuWQoy8j/G7lAmK85o03O89s2Vvh6kMFmzEmiHUoQCRH1rzbDtMnGNiaMHeSeYJ6y79IyTusdRG+LuWwtg=="; + }; + }; + "@smithy/credential-provider-imds-2.0.16" = { + name = "_at_smithy_slash_credential-provider-imds"; + packageName = "@smithy/credential-provider-imds"; + version = "2.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.16.tgz"; + sha512 = "tKa2xF+69TvGxJT+lnJpGrKxUuAZDLYXFhqnPEgnHz+psTpkpcB4QRjHj63+uj83KaeFJdTfW201eLZeRn6FfA=="; + }; + }; + "@smithy/eventstream-codec-2.0.11" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.8.tgz"; - sha512 = "onO4to8ujCKn4m5XagReT9Nc6FlNG5vveuvjp1H7AtaG7njdet1LOl6/jmUOkskF2C/w+9jNw3r9Ak+ghOvN0A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.11.tgz"; + sha512 = "BQCTjxhCYRZIfXapa2LmZSaH8QUBGwMZw7XRN83hrdixbLjIcj+o549zjkedFS07Ve2TlvWUI6BTzP+nv7snBA=="; }; }; - "@smithy/fetch-http-handler-2.1.4" = { + "@smithy/eventstream-serde-browser-2.0.11" = { + name = "_at_smithy_slash_eventstream-serde-browser"; + packageName = "@smithy/eventstream-serde-browser"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.11.tgz"; + sha512 = "p9IK4uvwT6B3pT1VGlODvcVBfPVikjBFHAcKpvvNF+7lAEI+YiC6d0SROPkpjnvCgVBYyGXa3ciqrWnFze6mwQ=="; + }; + }; + "@smithy/eventstream-serde-config-resolver-2.0.11" = { + name = "_at_smithy_slash_eventstream-serde-config-resolver"; + packageName = "@smithy/eventstream-serde-config-resolver"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.11.tgz"; + sha512 = "vN32E8yExo0Z8L7kXhlU9KRURrhqOpPdLxQMp3MwfMThrjiqbr1Sk5srUXc1ed2Ygl/l0TEN9vwNG0bQHg6AjQ=="; + }; + }; + "@smithy/eventstream-serde-node-2.0.11" = { + name = "_at_smithy_slash_eventstream-serde-node"; + packageName = "@smithy/eventstream-serde-node"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.11.tgz"; + sha512 = "Gjqbpg7UmD+YzkpgNShNcDNZcUpBWIkvX2XCGptz5PoxJU/UQbuF9eSc93ZlIb7j4aGjtFfqk23HUMW8Hopg2Q=="; + }; + }; + "@smithy/eventstream-serde-universal-2.0.11" = { + name = "_at_smithy_slash_eventstream-serde-universal"; + packageName = "@smithy/eventstream-serde-universal"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.11.tgz"; + sha512 = "F8FsxLTbFN4+Esgpo+nNKcEajrgRZJ+pG9c8+MhLM4Odp5ejLHw2GMCXd81cGsgmfcbnzdDEXazPPVzOwj89MQ=="; + }; + }; + "@smithy/fetch-http-handler-2.2.3" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "2.1.4"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.4.tgz"; - sha512 = "SL24M9W5ERByoXaVicRx+bj9GJVujDnPn+QO7GY7adhY0mPGa6DSF58pVKsgIh4r5Tx/k3SWCPlH4BxxSxA/fQ=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.3.tgz"; + sha512 = "0G9sePU+0R+8d7cie+OXzNbbkjnD4RfBlVCs46ZEuQAMcxK8OniemYXSSkOc80CCk8Il4DnlYZcUSvsIs2OB2w=="; }; }; - "@smithy/hash-node-2.0.8" = { + "@smithy/hash-blob-browser-2.0.11" = { + name = "_at_smithy_slash_hash-blob-browser"; + packageName = "@smithy/hash-blob-browser"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.11.tgz"; + sha512 = "/6vq/NiH2EN3mWdwcLdjVohP+VCng+ZA1GnlUdx959egsfgIlLWQvCyjnB2ze9Hr6VHV5XEFLLpLQH2dHA6Sgw=="; + }; + }; + "@smithy/hash-node-2.0.11" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.8.tgz"; - sha512 = "yZL/nmxZzjZV5/QX5JWSgXlt0HxuMTwFO89CS++jOMMPiCMZngf6VYmtNdccs8IIIAMmfQeTzwu07XgUE/Zd3Q=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.11.tgz"; + sha512 = "PbleVugN2tbhl1ZoNWVrZ1oTFFas/Hq+s6zGO8B9bv4w/StTriTKA9W+xZJACOj9X7zwfoTLbscM+avCB1KqOQ=="; }; }; - "@smithy/invalid-dependency-2.0.8" = { + "@smithy/hash-stream-node-2.0.11" = { + name = "_at_smithy_slash_hash-stream-node"; + packageName = "@smithy/hash-stream-node"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.11.tgz"; + sha512 = "Jn2yl+Dn0kvwKvSavvR1/BFVYa2wIkaJKWeTH48kno89gqHAJxMh1hrtBN6SJ7F8VhodNZTiNOlQVqCSfLheNQ=="; + }; + }; + "@smithy/invalid-dependency-2.0.11" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.8.tgz"; - sha512 = "88VOS7W3KzUz/bNRc+Sl/F/CDIasFspEE4G39YZRHIh9YmsXF7GUyVaAKURfMNulTie62ayk6BHC9O0nOBAVgQ=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.11.tgz"; + sha512 = "zazq99ujxYv/NOf9zh7xXbNgzoVLsqE0wle8P/1zU/XdhPi/0zohTPKWUzIxjGdqb5hkkwfBkNkl5H+LE0mvgw=="; }; }; "@smithy/is-array-buffer-2.0.0" = { @@ -1300,157 +1516,166 @@ let sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/middleware-content-length-2.0.10" = { + "@smithy/md5-js-2.0.11" = { + name = "_at_smithy_slash_md5-js"; + packageName = "@smithy/md5-js"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.11.tgz"; + sha512 = "YBIv+e95qeGvQA05ucwstmTeQ/bUzWgU+nO2Ffmif5awu6IzSR0Jfk3XLYh4mdy7f8DCgsn8qA63u7N9Lu0+5A=="; + }; + }; + "@smithy/middleware-content-length-2.0.13" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "2.0.10"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.10.tgz"; - sha512 = "EGSbysyA4jH0p3xI6G0jdXoj9Iz9GUnAta6aEaHtXm3wVWtenRf80y2TeVvNkVSr5jwKOdSCjKIRI2l1A/oZLA=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.13.tgz"; + sha512 = "Md2kxWpaec3bXp1oERFPQPBhOXCkGSAF7uc1E+4rkwjgw3/tqAXRtbjbggu67HJdwaif76As8AV6XxbD1HzqTQ=="; }; }; - "@smithy/middleware-endpoint-2.0.8" = { + "@smithy/middleware-endpoint-2.1.0" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "2.0.8"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.8.tgz"; - sha512 = "yOpogfG2d2V0cbJdAJ6GLAWkNOc9pVsL5hZUfXcxJu408N3CUCsXzIAFF6+70ZKSE+lCfG3GFErcSXv/UfUbjw=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.0.tgz"; + sha512 = "e6HZbfrp9CNTJqIPSgkydB9mNQXiq5pkHF3ZB6rOzPPR9PkJBoGFo9TcM7FaaKFUaH4Kc20AX6WwwVyIlNhXTA=="; }; }; - "@smithy/middleware-retry-2.0.11" = { + "@smithy/middleware-retry-2.0.16" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "2.0.11"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.11.tgz"; - sha512 = "pknfokumZ+wvBERSuKAI2vVr+aK3ZgPiWRg6+0ZG4kKJogBRpPmDGWw+Jht0izS9ZaEbIobNzueIb4wD33JJVg=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.16.tgz"; + sha512 = "Br5+0yoiMS0ugiOAfJxregzMMGIRCbX4PYo1kDHtLgvkA/d++aHbnHB819m5zOIAMPvPE7AThZgcsoK+WOsUTA=="; }; }; - "@smithy/middleware-serde-2.0.8" = { + "@smithy/middleware-serde-2.0.11" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.8.tgz"; - sha512 = "Is0sm+LiNlgsc0QpstDzifugzL9ehno1wXp109GgBgpnKTK3j+KphiparBDI4hWTtH9/7OUsxuspNqai2yyhcg=="; - }; - }; - "@smithy/middleware-stack-2.0.1" = { - name = "_at_smithy_slash_middleware-stack"; - packageName = "@smithy/middleware-stack"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.1.tgz"; - sha512 = "UexsfY6/oQZRjTQL56s9AKtMcR60tBNibSgNYX1I2WXaUaXg97W9JCkFyth85TzBWKDBTyhLfenrukS/kyu54A=="; - }; - }; - "@smithy/node-config-provider-2.0.11" = { - name = "_at_smithy_slash_node-config-provider"; - packageName = "@smithy/node-config-provider"; version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.11.tgz"; - sha512 = "CaR1dciSSGKttjhcefpytYjsfI/Yd5mqL8am4wfmyFCDxSiPsvnEWHl8UjM/RbcAjX0klt+CeIKPSHEc0wGvJA=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.11.tgz"; + sha512 = "NuxnjMyf4zQqhwwdh0OTj5RqpnuT6HcH5Xg5GrPijPcKzc2REXVEVK4Yyk8ckj8ez1XSj/bCmJ+oNjmqB02GWA=="; }; }; - "@smithy/node-http-handler-2.1.4" = { + "@smithy/middleware-stack-2.0.5" = { + name = "_at_smithy_slash_middleware-stack"; + packageName = "@smithy/middleware-stack"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.5.tgz"; + sha512 = "bVQU/rZzBY7CbSxIrDTGZYnBWKtIw+PL/cRc9B7etZk1IKSOe0NvKMJyWllfhfhrTeMF6eleCzOihIQympAvPw=="; + }; + }; + "@smithy/node-config-provider-2.1.1" = { + name = "_at_smithy_slash_node-config-provider"; + packageName = "@smithy/node-config-provider"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.1.tgz"; + sha512 = "1lF6s1YWBi1LBu2O30tD3jyTgMtuvk/Z1twzXM4GPYe4dmZix4nNREPJIPOcfFikNU2o0eTYP80+izx5F2jIJA=="; + }; + }; + "@smithy/node-http-handler-2.1.7" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "2.1.4"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.4.tgz"; - sha512 = "8Rw/AusvWDyC6SK8esAcVBeTlQHf94NMFv805suFUJCQ2gwlh0oLDNh+6s2MDOrxcjvLxjjzv1mytM0Mt+0cPQ=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.7.tgz"; + sha512 = "PQIKZXlp3awCDn/xNlCSTFE7aYG/5Tx33M05NfQmWYeB5yV1GZZOSz4dXpwiNJYTXb9jPqjl+ueXXkwtEluFFA=="; }; }; - "@smithy/property-provider-2.0.9" = { + "@smithy/property-provider-2.0.12" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "2.0.9"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.9.tgz"; - sha512 = "25pPZ8f8DeRwYI5wbPRZaoMoR+3vrw8DwbA0TjP+GsdiB2KxScndr4HQehiJ5+WJ0giOTWhLz0bd+7Djv1qpUQ=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.12.tgz"; + sha512 = "Un/OvvuQ1Kg8WYtoMCicfsFFuHb/TKL3pCA6ZIo/WvNTJTR94RtoRnL7mY4XkkUAoFMyf6KjcQJ76y1FX7S5rw=="; }; }; - "@smithy/protocol-http-3.0.4" = { + "@smithy/protocol-http-3.0.7" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "3.0.4"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.4.tgz"; - sha512 = "CGfSWk6TRlbwa8YgrSXdn80Yu7pov3EV/h7TSfiCHhq6/LO3WymmqnzgH1f0qV2bdTDipIkTNp5dGCGN3Af/5g=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.7.tgz"; + sha512 = "HnZW8y+r66ntYueCDbLqKwWcMNWW8o3eVpSrHNluwtBJ/EUWfQHRKSiu6vZZtc6PGfPQWgVfucoCE/C3QufMAA=="; }; }; - "@smithy/querystring-builder-2.0.8" = { + "@smithy/querystring-builder-2.0.11" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.8.tgz"; - sha512 = "+vzIMwjC8Saz97/ptPn+IJRCRRZ+pP95ZIWDRqEqZV/a6hiKbaFoMSa2iCKsnKzR696U2JZXrDqMu3e/FD1+2g=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.11.tgz"; + sha512 = "b4kEbVMxpmfv2VWUITn2otckTi7GlMteZQxi+jlwedoATOGEyrCJPfRcYQJjbCi3fZ2QTfh3PcORvB27+j38Yg=="; }; }; - "@smithy/querystring-parser-2.0.8" = { + "@smithy/querystring-parser-2.0.11" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.8.tgz"; - sha512 = "ArbanNuR7O/MmTd90ZqhDqGOPPDYmxx3huHxD+R3cuCnazcK/1tGQA+SnnR5307T7ZRb5WTpB6qBggERuibVSA=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.11.tgz"; + sha512 = "YXe7jhi7s3dQ0Fu9dLoY/gLu6NCyy8tBWJL/v2c9i7/RLpHgKT+uT96/OqZkHizCJ4kr0ZD46tzMjql/o60KLg=="; }; }; - "@smithy/service-error-classification-2.0.1" = { + "@smithy/service-error-classification-2.0.4" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.1.tgz"; - sha512 = "QHa9+t+v4s0cMuDCcbjIJN67mNZ42/+fc3jKe8P6ZMPXZl5ksKk6a8vhZ/m494GZng5eFTc3OePv+NF9cG83yg=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.4.tgz"; + sha512 = "77506l12I5gxTZqBkx3Wb0RqMG81bMYLaVQ+EqIWFwQDJRs5UFeXogKxSKojCmz1wLUziHZQXm03MBzPQiumQw=="; }; }; - "@smithy/shared-ini-file-loader-2.0.10" = { + "@smithy/shared-ini-file-loader-2.2.0" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "2.0.10"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.10.tgz"; - sha512 = "jWASteSezRKohJ7GdA7pHDvmr7Q7tw3b5mu3xLHIkZy/ICftJ+O7aqNaF8wklhI7UNFoQ7flFRM3Rd0KA+1BbQ=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.0.tgz"; + sha512 = "xFXqs4vAb5BdkzHSRrTapFoaqS4/3m/CGZzdw46fBjYZ0paYuLAoMY60ICCn1FfGirG+PiJ3eWcqJNe4/SkfyA=="; }; }; - "@smithy/signature-v4-2.0.8" = { + "@smithy/signature-v4-2.0.11" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.8.tgz"; - sha512 = "qrtiYMzaLlQ5HSJOaFwnyTQ3JLjmPY+3+pr9IBDpCVM6YtVj22cBLVB9bPOiZMIpkdI7ZRdxLBFlIjh5CO1Bhw=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.11.tgz"; + sha512 = "EFVU1dT+2s8xi227l1A9O27edT/GNKvyAK6lZnIZ0zhIHq/jSLznvkk15aonGAM1kmhmZBVGpI7Tt0odueZK9A=="; }; }; - "@smithy/smithy-client-2.1.5" = { + "@smithy/smithy-client-2.1.11" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "2.1.5"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.5.tgz"; - sha512 = "7S865uKzsxApM8W8Q6zkij7tcUFgaG8PuADMFdMt1yL/ku3d0+s6Zwrg3N7iXCPM08Gu/mf0BIfTXIu/9i450Q=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.11.tgz"; + sha512 = "okjMbuBBCTiieK665OFN/ap6u9+Z9z55PMphS5FYCsS6Zfp137Q3qlnt0OgBAnUVnH/mNGyoJV0LBX9gkTWptg=="; }; }; - "@smithy/types-2.3.2" = { + "@smithy/types-2.3.5" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "2.3.2"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.2.tgz"; - sha512 = "iH0cdKi7HQlzfAM3w2shFk/qZYKAqJWswtpmQpPtlruF+uFZeGEpMJjgDRyhWiddfVM4e2oP4nMaOBsMy6lXgg=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.5.tgz"; + sha512 = "ehyDt8M9hehyxrLQGoA1BGPou8Js1Ocoh5M0ngDhJMqbFmNK5N6Xhr9/ZExWkyIW8XcGkiMPq3ZUEE0ScrhbuQ=="; }; }; - "@smithy/url-parser-2.0.8" = { + "@smithy/url-parser-2.0.11" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.8.tgz"; - sha512 = "wQw7j004ScCrBRJ+oNPXlLE9mtofxyadSZ9D8ov/rHkyurS7z1HTNuyaGRj6OvKsEk0SVQsuY0C9+EfM75XTkw=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.11.tgz"; + sha512 = "h89yXMCCF+S5k9XIoKltMIWTYj+FcEkU/IIFZ6RtE222fskOTL4Iak6ZRG+ehSvZDt8yKEcxqheTDq7JvvtK3g=="; }; }; "@smithy/util-base64-2.0.0" = { @@ -1498,22 +1723,22 @@ let sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-2.0.9" = { + "@smithy/util-defaults-mode-browser-2.0.15" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.9"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.9.tgz"; - sha512 = "JONLJVQWT8165XoSV36ERn3SVlZLJJ4D6IeGsCSePv65Uxa93pzSLE0UMSR9Jwm4zix7rst9AS8W5QIypZWP8Q=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.15.tgz"; + sha512 = "2raMZOYKSuke7QlDg/HDcxQdrp0zteJ8z+S0B9Rn23J55ZFNK1+IjG4HkN6vo/0u3Xy/JOdJ93ibiBSB8F7kOw=="; }; }; - "@smithy/util-defaults-mode-node-2.0.11" = { + "@smithy/util-defaults-mode-node-2.0.19" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.11"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.11.tgz"; - sha512 = "tmqjNsfj+bgZN6jXBe6efZnukzILA7BUytHkzqikuRLNtR+0VVchQHvawD0w6vManh76rO81ydhioe7i4oBzuA=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.19.tgz"; + sha512 = "7pScU4jBFADB2MBYKM3zb5onMh6Nn0X3IfaFVLYPyCarTIZDLUtUl1GtruzEUJPmDzP+uGeqOtU589HDY0Ni6g=="; }; }; "@smithy/util-hex-encoding-2.0.0" = { @@ -1525,31 +1750,31 @@ let sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; }; }; - "@smithy/util-middleware-2.0.1" = { + "@smithy/util-middleware-2.0.4" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.1.tgz"; - sha512 = "LnsBMi0Mg3gfz/TpNGLv2Jjcz2ra1OX5HR/4IaCepIYmtPQzqMWDdhX/XTW1LS8OZ0xbQuyQPcHkQ+2XkhWOVQ=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.4.tgz"; + sha512 = "Pbu6P4MBwRcjrLgdTR1O4Y3c0sTZn2JdOiJNcgL7EcIStcQodj+6ZTXtbyU/WTEU3MV2NMA10LxFc3AWHZ3+4A=="; }; }; - "@smithy/util-retry-2.0.1" = { + "@smithy/util-retry-2.0.4" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.1.tgz"; - sha512 = "naj4X0IafJ9yJnVJ58QgSMkCNLjyQOnyrnKh/T0f+0UOUxJiT8vuFn/hS7B/pNqbo2STY7PyJ4J4f+5YqxwNtA=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.4.tgz"; + sha512 = "b+n1jBBKc77C1E/zfBe1Zo7S9OXGBiGn55N0apfhZHxPUP/fMH5AhFUUcWaJh7NAnah284M5lGkBKuhnr3yK5w=="; }; }; - "@smithy/util-stream-2.0.11" = { + "@smithy/util-stream-2.0.16" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "2.0.11"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.11.tgz"; - sha512 = "2MeWfqSpZKdmEJ+tH8CJQSgzLWhH5cmdE24X7JB0hiamXrOmswWGGuPvyj/9sQCTclo57pNxLR2p7KrP8Ahiyg=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.16.tgz"; + sha512 = "b5ZSRh1KzUzC7LoJcpfk7+iXGoRr3WylEfmPd4FnBLm90OwxSB9VgK1fDZwicfYxSEvWHdYXgvvjPtenEYBBhw=="; }; }; "@smithy/util-uri-escape-2.0.0" = { @@ -1570,6 +1795,15 @@ let sha512 = "rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="; }; }; + "@smithy/util-waiter-2.0.11" = { + name = "_at_smithy_slash_util-waiter"; + packageName = "@smithy/util-waiter"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.11.tgz"; + sha512 = "8SJWUl9O1YhjC77EccgltI3q4XZQp3vp9DGEW6o0OdkUcwqm/H4qOLnMkA2n+NDojuM5Iia2jWoCdbluIiG7TA=="; + }; + }; "@sqltools/formatter-1.2.5" = { name = "_at_sqltools_slash_formatter"; packageName = "@sqltools/formatter"; @@ -1579,40 +1813,49 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.85" = { + "@swc/core-1.3.92" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.85"; + version = "1.3.92"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.85.tgz"; - sha512 = "qnoxp+2O0GtvRdYnXgR1v8J7iymGGYpx6f6yCK9KxipOZOjrlKILFANYlghQxZyPUfXwK++TFxfSlX4r9wK+kg=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.92.tgz"; + sha512 = "vx0vUrf4YTEw59njOJ46Ha5i0cZTMYdRHQ7KXU29efN1MxcmJH2RajWLPlvQarOP1ab9iv9cApD7SMchDyx2vA=="; }; }; - "@swc/helpers-0.5.2" = { + "@swc/counter-0.1.2" = { + name = "_at_swc_slash_counter"; + packageName = "@swc/counter"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/counter/-/counter-0.1.2.tgz"; + sha512 = "9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw=="; + }; + }; + "@swc/helpers-0.5.3" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz"; - sha512 = "E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz"; + sha512 = "FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A=="; }; }; - "@swc/types-0.1.4" = { + "@swc/types-0.1.5" = { name = "_at_swc_slash_types"; packageName = "@swc/types"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/types/-/types-0.1.4.tgz"; - sha512 = "z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg=="; + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz"; + sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.85" = { + "@swc/wasm-1.3.92" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.85"; + version = "1.3.92"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.85.tgz"; - sha512 = "lO2QTgKsq/CQSs0fbojiFFmbMo5Nv1cnDdbyLUpl7q+XXkFA/uBh5zF8Bgv5kqJo2Yoo+ydCbTq7GQLrmcjyMQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.92.tgz"; + sha512 = "hOaY0Nsz3B2b8IdiUF2JKPsa3pH1Aj3E+F+pgfXXgxbsLOgYcdNjWLkuJfHgh/F3TSs8FVs8gCXktO+nAI0fWw=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1741,67 +1984,67 @@ let sha512 = "P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w=="; }; }; - "@types/duplexify-3.6.1" = { + "@types/duplexify-3.6.2" = { name = "_at_types_slash_duplexify"; packageName = "@types/duplexify"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.1.tgz"; - sha512 = "n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ=="; + url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.2.tgz"; + sha512 = "2/0R4riyD/OS6GNJLIhwRaj+8ZbxHUZl3I0a3PHwH7zhZEEAACUWjzaBrY1qVWckueZ5pouDRP0UxX6P8Hzfww=="; }; }; - "@types/es-aggregate-error-1.0.2" = { + "@types/es-aggregate-error-1.0.3" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.2.tgz"; - sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.3.tgz"; + sha512 = "GmY61WWXQemfJp+qmMu6RsrNev0eoEWeWtg46w9pdXje23jRJrf7yETbAkl7F+CfQJSKW7w3//sTYtQTt+R5Lg=="; }; }; - "@types/eslint-8.44.2" = { + "@types/eslint-8.44.4" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.44.2"; + version = "8.44.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz"; - sha512 = "sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.4.tgz"; + sha512 = "lOzjyfY/D9QR4hY9oblZ76B90MYTB3RrQ4z2vBIJKj9ROCRqdkYl2gSUx1x1a4IWPjKJZLL4Aw1Zfay7eMnmnA=="; }; }; - "@types/eslint-scope-3.7.4" = { + "@types/eslint-scope-3.7.5" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz"; + sha512 = "JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA=="; }; }; - "@types/estree-1.0.1" = { + "@types/estree-1.0.2" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"; - sha512 = "LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz"; + sha512 = "VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA=="; }; }; - "@types/express-4.17.17" = { + "@types/express-4.17.19" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.17"; + version = "4.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; - sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz"; + sha512 = "UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg=="; }; }; - "@types/express-serve-static-core-4.17.36" = { + "@types/express-serve-static-core-4.17.37" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.36"; + version = "4.17.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz"; - sha512 = "zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz"; + sha512 = "ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg=="; }; }; "@types/http-errors-2.0.2" = { @@ -1831,13 +2074,13 @@ let sha512 = "b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA=="; }; }; - "@types/lodash-4.14.198" = { + "@types/lodash-4.14.199" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.198"; + version = "4.14.199"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz"; - sha512 = "trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; + sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; }; }; "@types/long-4.0.2" = { @@ -1849,49 +2092,49 @@ let sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; }; }; - "@types/mime-1.3.2" = { + "@types/mime-1.3.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz"; + sha512 = "Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="; }; }; - "@types/multer-1.4.7" = { + "@types/multer-1.4.8" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; - sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.8.tgz"; + sha512 = "VMZOW6mnmMMhA5m3fsCdXBwFwC+a+27/8gctNMuQC4f7UtWcF79KAFGoIfKZ4iqrElgWIa3j5vhMJDp0iikQ1g=="; }; }; - "@types/node-20.6.2" = { + "@types/node-20.8.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.6.2"; + version = "20.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz"; - sha512 = "Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz"; + sha512 = "ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A=="; }; }; - "@types/node-fetch-2.6.5" = { + "@types/node-fetch-2.6.6" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "OZsUlr2nxvkqUFLSaY2ZbA+P1q22q+KrlxWOn/38RX+u5kTkYL2mTujEpzUhGkS+K/QCYp9oagfXG39XOzyySg=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.6.tgz"; + sha512 = "95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw=="; }; }; - "@types/pumpify-1.4.1" = { + "@types/pumpify-1.4.2" = { name = "_at_types_slash_pumpify"; packageName = "@types/pumpify"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pumpify/-/pumpify-1.4.1.tgz"; - sha512 = "l7u/Dnh1OG9T7VH6TvulR0g8oE8hgIW5409mSUKi8Vxw2+JV18aTa06Sv5bvNjrD0zbsB/cuZ/iTFQgFNfzIuw=="; + url = "https://registry.npmjs.org/@types/pumpify/-/pumpify-1.4.2.tgz"; + sha512 = "UBMrvkSFjQNWy0999fubiO8uFIuDJsbap4KnS+xsi2ax40w6mivT2zRPLywPDervsD6EMdvESHF72YMsgHSpXA=="; }; }; "@types/qs-6.9.8" = { @@ -1903,40 +2146,40 @@ let sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; }; }; - "@types/range-parser-1.2.4" = { + "@types/range-parser-1.2.5" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.5.tgz"; + sha512 = "xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA=="; }; }; - "@types/readable-stream-4.0.2" = { + "@types/readable-stream-4.0.3" = { name = "_at_types_slash_readable-stream"; packageName = "@types/readable-stream"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.2.tgz"; - sha512 = "hhzOsMEISZ+mX1l+01F0duYt9wHEbCGmjARed0PcQoVS5zAdu7u5YbWYuNGhw09M1MgGr3kfsto+ut/MnAdKqA=="; + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.3.tgz"; + sha512 = "Z8BOzyIj3UPpn3j5DmDNKIw4wPN9N8a1d1oyteiprWq+wxdgQNC0UfFAQwWjmjyA7uoj7mvoWgxWWH66zYtm4Q=="; }; }; - "@types/send-0.17.1" = { + "@types/send-0.17.2" = { name = "_at_types_slash_send"; packageName = "@types/send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz"; - sha512 = "Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="; + url = "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz"; + sha512 = "aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw=="; }; }; - "@types/serve-static-1.15.2" = { + "@types/serve-static-1.15.3" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz"; - sha512 = "J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz"; + sha512 = "yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg=="; }; }; "@types/stack-trace-0.0.29" = { @@ -1975,31 +2218,31 @@ let sha512 = "c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="; }; }; - "@types/uuid-9.0.4" = { + "@types/uuid-9.0.5" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "9.0.4"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.4.tgz"; - sha512 = "zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz"; + sha512 = "xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ=="; }; }; - "@types/validator-13.11.1" = { + "@types/validator-13.11.2" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.11.1"; + version = "13.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.11.1.tgz"; - sha512 = "d/MUkJYdOeKycmm75Arql4M5+UuXmf4cHdHKsyw1GcvnNgL6s77UkgSgJ8TE/rI5PYsnwYq5jkcWBLuN/MpQ1A=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.11.2.tgz"; + sha512 = "nIKVVQKT6kGKysnNt+xLobr+pFJNssJRi2s034wgWeFBUx01fI8BeHTW2TcRp7VcFu9QCYG8IlChTuovcm0oKQ=="; }; }; - "@types/webidl-conversions-7.0.0" = { + "@types/webidl-conversions-7.0.1" = { name = "_at_types_slash_webidl-conversions"; packageName = "@types/webidl-conversions"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog=="; + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.1.tgz"; + sha512 = "8hKOnOan+Uu+NgMaCouhg3cT9x5fFZ92Jwf+uDLXLu/MFRbXxlWwGeQY7KVHkeSft6RvY+tdxklUBuyY9eIEKg=="; }; }; "@types/whatwg-url-8.2.2" = { @@ -2011,13 +2254,13 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@types/ws-8.5.5" = { + "@types/ws-8.5.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.5"; + version = "8.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz"; - sha512 = "lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz"; + sha512 = "6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ=="; }; }; "@webassemblyjs/ast-1.11.6" = { @@ -2560,6 +2803,15 @@ let sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg=="; }; }; + "assert-2.1.0" = { + name = "assert"; + packageName = "assert"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz"; + sha512 = "eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw=="; + }; + }; "assert-options-0.8.0" = { name = "assert-options"; packageName = "assert-options"; @@ -2578,15 +2830,6 @@ let sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; - "ast-types-0.13.4" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; - sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; - }; - }; "ast-types-0.15.2" = { name = "ast-types"; packageName = "ast-types"; @@ -2596,6 +2839,15 @@ let sha512 = "c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="; }; }; + "ast-types-0.16.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz"; + sha512 = "6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg=="; + }; + }; "async-2.6.4" = { name = "async"; packageName = "async"; @@ -2677,15 +2929,6 @@ let sha512 = "H5Vrb/GMzq72+Of2zrW69i/BTQ4gQd3MQvdZ3X3okfppzHdEjSPkdJN6ia8V2/1J1FmFvEtoxaY4nwraHUGQvg=="; }; }; - "aws-sdk-2.1459.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.1459.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1459.0.tgz"; - sha512 = "My45PgQYhRTh6fOeZ94ELUoXzza/6gTy0J22aK4iy0DEA+uE5gjr1VthnIwbLYNMeEqn8xwJZuNJqvi/WaUUcQ=="; - }; - }; "aws4-1.12.0" = { name = "aws4"; packageName = "aws4"; @@ -2722,22 +2965,22 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.5.0" = { + "axios-1.5.1" = { name = "axios"; packageName = "axios"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz"; - sha512 = "D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"; + sha512 = "Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A=="; }; }; - "axios-retry-3.7.0" = { + "axios-retry-3.8.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.7.0.tgz"; - sha512 = "ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.8.0.tgz"; + sha512 = "CfIsQyWNc5/AE7x/UEReRUadiBmQeoBpSEC+4QyGLJMswTsP1tz0GW2YYPnE7w9+ESMef5zOgLDFpHynNyEZ1w=="; }; }; "balanced-match-1.0.2" = { @@ -2794,13 +3037,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.6.0" = { + "better-sqlite3-8.7.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.6.0.tgz"; - sha512 = "jwAudeiTMTSyby+/SfbHDebShbmC2MCH8mU2+DXi0WJfv13ypEJm47cd3kljmy/H130CazEvkf2Li//ewcMJ1g=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.7.0.tgz"; + sha512 = "99jZU4le+f3G6aIl6PmmV0cxUIWqKieHxsiF7G34CVFiE+/UabpYqkU0NJIkY/96mQKikHeBjtR27vFfs5JpEw=="; }; }; "big-integer-1.6.51" = { @@ -2992,13 +3235,13 @@ let sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg=="; }; }; - "browserslist-4.21.10" = { + "browserslist-4.22.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.10"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz"; - sha512 = "bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz"; + sha512 = "FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="; }; }; "bson-4.7.2" = { @@ -3019,15 +3262,6 @@ let sha512 = "B+QB4YmDx9RStKv8LLSl/aVIEV3nYJc3cJNNTK2Cd1TL+7P+cNpw9mAPeCgc5K+j01Dv6sxUzcITXDx7ZU3F0w=="; }; }; - "buffer-4.9.2" = { - name = "buffer"; - packageName = "buffer"; - version = "4.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; - sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; - }; - }; "buffer-5.7.1" = { name = "buffer"; packageName = "buffer"; @@ -3145,13 +3379,13 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; - "cache-manager-5.2.3" = { + "cache-manager-5.2.4" = { name = "cache-manager"; packageName = "cache-manager"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.3.tgz"; - sha512 = "9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog=="; + url = "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.4.tgz"; + sha512 = "gkuCjug16NdGvKm/sydxGVx17uffrSWcEe2xraBtwRCgdYcFxwJAla4OYpASAZT2yhSoxgDiWL9XH6IAChcZJA=="; }; }; "cache-manager-ioredis-yet-1.2.2" = { @@ -3208,13 +3442,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001534" = { + "caniuse-lite-1.0.30001547" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001534"; + version = "1.0.30001547"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz"; - sha512 = "vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz"; + sha512 = "W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA=="; }; }; "capital-case-1.0.4" = { @@ -3739,22 +3973,13 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "copy-to-2.0.1" = { - name = "copy-to"; - packageName = "copy-to"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz"; - sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; - }; - }; - "core-js-3.32.2" = { + "core-js-3.33.0" = { name = "core-js"; packageName = "core-js"; - version = "3.32.2"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz"; - sha512 = "pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz"; + sha512 = "HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="; }; }; "core-util-is-1.0.3" = { @@ -3874,13 +4099,13 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; - "csv-parse-5.5.0" = { + "csv-parse-5.5.2" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.0.tgz"; - sha512 = "RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.2.tgz"; + sha512 = "YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA=="; }; }; "curlconverter-3.21.0" = { @@ -3919,15 +4144,6 @@ let sha512 = "+Q+lChhl5PBogsB7nO/VZFF3X0WJe8y93dyft50HIg2Bg+c765wM/sXkfBz5pjmGoRESkB/GLesQJLTMBbK4dQ=="; }; }; - "data-uri-to-buffer-3.0.1" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; - sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; - }; - }; "date-fns-2.30.0" = { name = "date-fns"; packageName = "date-fns"; @@ -4027,15 +4243,6 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; "deepmerge-4.3.1" = { name = "deepmerge"; packageName = "deepmerge"; @@ -4045,15 +4252,6 @@ let sha512 = "3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="; }; }; - "default-user-agent-1.0.0" = { - name = "default-user-agent"; - packageName = "default-user-agent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/default-user-agent/-/default-user-agent-1.0.0.tgz"; - sha512 = "bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw=="; - }; - }; "define-data-property-1.1.0" = { name = "define-data-property"; packageName = "define-data-property"; @@ -4081,15 +4279,6 @@ let sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="; }; }; - "degenerator-3.0.4" = { - name = "degenerator"; - packageName = "degenerator"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.4.tgz"; - sha512 = "Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw=="; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -4171,15 +4360,6 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; - "digest-header-1.1.0" = { - name = "digest-header"; - packageName = "digest-header"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/digest-header/-/digest-header-1.1.0.tgz"; - sha512 = "glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg=="; - }; - }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -4360,13 +4540,13 @@ let sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; - "electron-to-chromium-1.4.523" = { + "electron-to-chromium-1.4.549" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.523"; + version = "1.4.549"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz"; - sha512 = "9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.549.tgz"; + sha512 = "gpXfJslSi4hYDkA0mTLEpYKRv9siAgSUgZ+UWyk+J5Cttpd1ThCVwdclzIwQSclz3hYn049+M2fgrP1WpvF8xg=="; }; }; "emoji-regex-8.0.0" = { @@ -4594,15 +4774,6 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "escodegen-1.14.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; - sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; - }; - }; "eslint-config-riot-1.0.0" = { name = "eslint-config-riot"; packageName = "eslint-config-riot"; @@ -4666,15 +4837,6 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -4702,15 +4864,6 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; - "events-1.1.1" = { - name = "events"; - packageName = "events"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha512 = "kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="; - }; - }; "events-3.3.0" = { name = "events"; packageName = "events"; @@ -4810,15 +4963,6 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; - }; - }; "external-editor-3.1.0" = { name = "external-editor"; packageName = "external-editor"; @@ -4855,15 +4999,6 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; "fast-text-encoding-1.0.6" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; @@ -4936,15 +5071,6 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; - "file-uri-to-path-2.0.0" = { - name = "file-uri-to-path"; - packageName = "file-uri-to-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; - sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; - }; - }; "filelist-1.0.4" = { name = "filelist"; packageName = "filelist"; @@ -5008,13 +5134,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.15.2" = { + "follow-redirects-1.15.3" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"; + sha512 = "1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="; }; }; "for-each-0.3.3" = { @@ -5053,15 +5179,6 @@ let sha512 = "WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og=="; }; }; - "formstream-1.3.1" = { - name = "formstream"; - packageName = "formstream"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formstream/-/formstream-1.3.1.tgz"; - sha512 = "FkW++ub+VbE5dpwukJVDizNWhSgp8FhmhI65pF7BZSVStBqe6Wgxe2Z9/Vhsn7l7nXCPwP+G1cyYlX8VwWOf0g=="; - }; - }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -5125,15 +5242,6 @@ let sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; - "ftp-0.3.10" = { - name = "ftp"; - packageName = "ftp"; - version = "0.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; - sha512 = "faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ=="; - }; - }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -5287,15 +5395,6 @@ let sha512 = "zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ=="; }; }; - "get-uri-3.0.2" = { - name = "get-uri"; - packageName = "get-uri"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz"; - sha512 = "+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg=="; - }; - }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -5314,13 +5413,13 @@ let sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; }; - "glob-10.3.4" = { + "glob-10.3.10" = { name = "glob"; packageName = "glob"; - version = "10.3.4"; + version = "10.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz"; - sha512 = "6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; + sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; }; }; "glob-7.2.3" = { @@ -5503,13 +5602,13 @@ let sha512 = "vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="; }; }; - "has-1.0.3" = { + "has-1.0.4" = { name = "has"; packageName = "has"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + url = "https://registry.npmjs.org/has/-/has-1.0.4.tgz"; + sha512 = "qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="; }; }; "has-bigints-1.0.2" = { @@ -5782,15 +5881,6 @@ let sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; }; }; - "ieee754-1.1.13" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; - }; - }; "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; @@ -5863,13 +5953,13 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "infisical-node-1.4.3" = { + "infisical-node-1.5.0" = { name = "infisical-node"; packageName = "infisical-node"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/infisical-node/-/infisical-node-1.4.3.tgz"; - sha512 = "z/gYkctAB6yQoH/9um9znvljsF6WVhsrMw9urZ80O5E1M+/RwZW40mc6LHs2nQpZD90at6SbuzVWQoEwSdEmTw=="; + url = "https://registry.npmjs.org/infisical-node/-/infisical-node-1.5.0.tgz"; + sha512 = "mMdhhu50J7pI4Y89M2HMbNWRyRY6ian3oBIXW+pAWz1z8XWn5yT0ge6/YNXwTPKLnBuR1py+GwiNQUaqxkOXZw=="; }; }; "inflight-1.0.6" = { @@ -5944,15 +6034,6 @@ let sha512 = "1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA=="; }; }; - "ip-1.1.8" = { - name = "ip"; - packageName = "ip"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; - sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; - }; - }; "ip-2.0.0" = { name = "ip"; packageName = "ip"; @@ -6079,15 +6160,6 @@ let sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; - }; - }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -6340,13 +6412,13 @@ let sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; }; }; - "isbot-3.6.13" = { + "isbot-3.7.0" = { name = "isbot"; packageName = "isbot"; - version = "3.6.13"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.13.tgz"; - sha512 = "uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.7.0.tgz"; + sha512 = "9BcjlI89966BqWJmYdTnRub85sit931MyCthSIPtgoOsTjoW7A2MVa09HzPpYE2+G4vyAxfDvR0AbUGV0FInQg=="; }; }; "isexe-2.0.0" = { @@ -6376,13 +6448,13 @@ let sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; }; }; - "jackspeak-2.3.3" = { + "jackspeak-2.3.6" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.3"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz"; - sha512 = "R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; + sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; }; }; "jake-10.8.7" = { @@ -6421,13 +6493,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.14.6" = { + "jose-4.15.2" = { name = "jose"; packageName = "jose"; - version = "4.14.6"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz"; - sha512 = "EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ=="; + url = "https://registry.npmjs.org/jose/-/jose-4.15.2.tgz"; + sha512 = "IY73F228OXRl9ar3jJagh7Vnuhj/GzBunPiZP13K0lOl7Am9SoWW3kEzq3MCllJMTtZqHTiDXQvoRd4U95aU6A=="; }; }; "js-base64-3.7.5" = { @@ -6628,13 +6700,13 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; - "jwks-rsa-3.0.1" = { + "jwks-rsa-3.1.0" = { name = "jwks-rsa"; packageName = "jwks-rsa"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz"; - sha512 = "UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw=="; + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.1.0.tgz"; + sha512 = "v7nqlfezb9YfHHzYII3ef2a2j1XnGeSE/bK3WfumaYCqONAIstJbrEGapz4kadScZzEt7zYCN7bucj8C0Mv/Rg=="; }; }; "jws-3.2.2" = { @@ -6709,15 +6781,6 @@ let sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; }; }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; "libbase64-1.2.1" = { name = "libbase64"; packageName = "libbase64"; @@ -6745,13 +6808,13 @@ let sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; }; }; - "libphonenumber-js-1.10.44" = { + "libphonenumber-js-1.10.47" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.44"; + version = "1.10.47"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.44.tgz"; - sha512 = "svlRdNBI5WgBjRC20GrCfbFiclbF0Cx+sCcQob/C1r57nsoq0xg8r65QbTyVyweQIlB33P+Uahyho6EMYgcOyQ=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.47.tgz"; + sha512 = "b4t7VQDV29xx/ni+58yl9KWPGjnDLDXCeCTLrD4V8vDpObXZRZBrg7uX/HWZ7YXiJKqdBDGgc+barUUTNB6Slw=="; }; }; "libpq-1.8.12" = { @@ -7051,6 +7114,15 @@ let sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; + "lru-cache-10.0.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz"; + sha512 = "IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g=="; + }; + }; "lru-cache-4.0.2" = { name = "lru-cache"; packageName = "lru-cache"; @@ -7069,15 +7141,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -7096,15 +7159,6 @@ let sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; - "lru-cache-9.1.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "9.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz"; - sha512 = "ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ=="; - }; - }; "lru-memoizer-2.2.0" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -7267,15 +7321,6 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.6.0" = { - name = "mime"; - packageName = "mime"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"; - sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; - }; - }; "mime-3.0.0" = { name = "mime"; packageName = "mime"; @@ -7393,13 +7438,13 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; - "minipass-7.0.3" = { + "minipass-7.0.4" = { name = "minipass"; packageName = "minipass"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz"; - sha512 = "LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; + sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; }; }; "minipass-collect-1.0.2" = { @@ -7528,13 +7573,13 @@ let sha512 = "g+GCMHN1CoRUA+wb1Agv0TI4YTSiWr42B5ulkiAfLLHitGK1R+PkSAf3Lr5rPZwi/3F04LiaZEW0Kxro9Fi2TA=="; }; }; - "mongodb-client-encryption-2.9.0" = { + "mongodb-client-encryption-2.9.1" = { name = "mongodb-client-encryption"; packageName = "mongodb-client-encryption"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.9.0.tgz"; - sha512 = "OGMfTnS+JJ49ksWdExQ5048ynaQJLhPjbOi3i44PbU2sdufKH0Z4YZqn1pvd/eQ4WgLfbmSws3u9kAiFNFxpOg=="; + url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.9.1.tgz"; + sha512 = "JBWr6CF60sqOdlaVzlywuLOZQ6D0iDrCz2ZjPAM38ZHVvC9WER5jgHl81JOY+EIAKwZVhJakCqlr809jPQeGUA=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -7555,13 +7600,13 @@ let sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; }; }; - "mqtt-5.0.5" = { + "mqtt-5.1.2" = { name = "mqtt"; packageName = "mqtt"; - version = "5.0.5"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-5.0.5.tgz"; - sha512 = "Ahbzk7nddvYg0aOezbYl/d9o8wcEbZw1NjiH+CmGObxiHsG4HgL7+IaRkph5yxwH679GVMAwtfsyUY2dFBSVSw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-5.1.2.tgz"; + sha512 = "jEyrJGj3qkyTWx/7t5p+u6BY1rpikcl0ydlaHPGJ6rjeCkHVCFcTK+ZP5hVqAei5rwn7h4qtjTezhXHWkSZOHg=="; }; }; "mqtt-packet-6.10.0" = { @@ -7573,13 +7618,13 @@ let sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; - "mqtt-packet-8.2.0" = { + "mqtt-packet-8.2.1" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-8.2.0.tgz"; - sha512 = "21Vo7XdRXUw2qhdTfk8GeOl2jtb8Dkwd4dKxn/epvf37mxTxHodvBJoozTPZGVwh57JXlsh2ChsaxMsAfqxp+A=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-8.2.1.tgz"; + sha512 = "vrHHjwhmuxzQIe3fJWoOLQHF4H5FETUrQGYD5g1qGfEmpjkQUkPONfygA0cI8Wtb3IUCfu66WmZiVSCgGm8oUw=="; }; }; "ms-2.0.0" = { @@ -7672,49 +7717,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-1.6.0" = { + "n8n-core-1.9.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "1.6.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.6.0.tgz"; - sha512 = "VQw8RpmOKQ7xFBB61hb/Te0HT0J5nIRV/LYMwN9YrjzGMh6XuRQkn8el0hlgBR97K52Yo1iyMBR9TKHunAH13Q=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.9.1.tgz"; + sha512 = "XBTVZTW30Ohh+F9IeGFBqhhnj8J5pL9x/i1Ry0ciICEjVjwInxzueFudI93pY3QJwevwAn0vfusw5KV0sx11EQ=="; }; }; - "n8n-editor-ui-1.6.0" = { + "n8n-editor-ui-1.9.3" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "1.6.0"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.6.0.tgz"; - sha512 = "hfVWAfJ3zjhQgSOM89RFgkplW7/9RyClHdYR8PaXgNKm1xV6YkF2ofeF2II+yLxgbxqVjTdpRM7AhohKtEowTw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.9.3.tgz"; + sha512 = "gxme20z+2URuKpupdvfCOPCWJZUCegADO6TGoPSGh0qQLxgN5nWR74Z5V2mM5ceB0Tk4V15cwwO8rB/PIvbUPQ=="; }; }; - "n8n-nodes-base-1.6.0" = { + "n8n-nodes-base-1.9.2" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "1.6.0"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.6.0.tgz"; - sha512 = "SGWCmh6T8yuQVTEcC2ZaRG1DutYcg8M7EuoloYLftO4IVM/drYsx5fOWHUXPU52C9R6WlQI40K4YMzDNHYCOdg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.9.2.tgz"; + sha512 = "nAtyNXsIAt/CSdwdRo11QkNa2RSN/FKAcYs4NldnRhiaHHRmt3jtbmy52p9zG4NfIVNctfHPOH/kED8spoQRaw=="; }; }; - "n8n-nodes-base-1.6.1" = { + "n8n-nodes-base-1.9.3" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "1.6.1"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.6.1.tgz"; - sha512 = "4mZqwJ+uiUmXlnktBhlydkpRTdiuFkDOQElbctPumhNQ4Xfkhzehd3zjr7IjPBA3M+t8EEerVl7SfLUdoPIAMg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.9.3.tgz"; + sha512 = "4VoaSFDO71O6j2vO1UX7s4cTuTiTxtfKxTHsbEUMZobjk5XAZuREBGmMdRbb792z5iXzGU8pX8tkhAtZSv4XwA=="; }; }; - "n8n-workflow-1.6.0" = { + "n8n-workflow-1.9.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "1.6.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.6.0.tgz"; - sha512 = "MkwhM5p0ps3RevX/MWTS1DyFSDZ4p0IJ+gDtU48GZBJGR9nk5HWvmAOFAJJBnyGXCwy+U61d0CQoOZbVKXeGBw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.9.1.tgz"; + sha512 = "DvzREgrb/k7duALtx1rftxVJDjZUDmbzjwqLdwS8nxyzvs0pOqh5xKpSj3q8NDNbF9xaw2H1PI6getFrpMKLSA=="; }; }; "named-placeholders-1.1.3" = { @@ -7798,15 +7843,6 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "netmask-2.0.2" = { - name = "netmask"; - packageName = "netmask"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz"; - sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; - }; - }; "no-case-3.0.4" = { name = "no-case"; packageName = "no-case"; @@ -7816,13 +7852,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.47.0" = { + "node-abi-3.49.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.47.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz"; - sha512 = "2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.49.0.tgz"; + sha512 = "ji8IK8VT2zAQv9BeOqwnpuvJnCivxPCe2HNiPe8P1z1SDhqEFpm7GqctqTWkujb8mLfZ1PWDrjMeiq6l9TN7fA=="; }; }; "node-abort-controller-3.1.1" = { @@ -7960,13 +7996,13 @@ let sha512 = "fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg=="; }; }; - "nodemailer-6.9.5" = { + "nodemailer-6.9.6" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.5"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.5.tgz"; - sha512 = "/dmdWo62XjumuLc5+AYQZeiRj+PRR8y8qKtFCOyuOl1k/hckZd8durUUHs/ucKx6/8kN+wFxqKJlQ/LK/qR5FA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.6.tgz"; + sha512 = "s7pDtWwe5fLMkQUhw8TkWB/wnZ7SRdd9HRZslq/s24hlZvBP3j32N/ETLmnqTpmj4xoBZL9fOWyCIZ7r2HORHg=="; }; }; "nopt-5.0.0" = { @@ -8212,15 +8248,6 @@ let sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; - "optionator-0.8.3" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - }; "oracledb-5.5.0" = { name = "oracledb"; packageName = "oracledb"; @@ -8230,15 +8257,6 @@ let sha512 = "i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw=="; }; }; - "os-name-1.0.3" = { - name = "os-name"; - packageName = "os-name"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; - sha512 = "f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew=="; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -8248,22 +8266,13 @@ let sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; - "osx-release-1.1.0" = { - name = "osx-release"; - packageName = "osx-release"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; - sha512 = "ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A=="; - }; - }; - "otpauth-9.1.4" = { + "otpauth-9.1.5" = { name = "otpauth"; packageName = "otpauth"; - version = "9.1.4"; + version = "9.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/otpauth/-/otpauth-9.1.4.tgz"; - sha512 = "T6T0E1WlzwKWESq8K0Ja47u01XjmDmRY/AiUoMAc6xZI/OsTsD4cqBrfpt2WfJ29W5pRiWkuUuyHdNQl0/Ic+Q=="; + url = "https://registry.npmjs.org/otpauth/-/otpauth-9.1.5.tgz"; + sha512 = "mnic91MZxvj04Ir7FN8Xi6wF3FU8D+s6M5p6FQaSS91/csKswoOI9Dk7kKSnGFAoBYgGTTO+OWScV0nJuzrbPg=="; }; }; "p-cancelable-2.1.1" = { @@ -8338,24 +8347,6 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; - "pac-proxy-agent-5.0.0" = { - name = "pac-proxy-agent"; - packageName = "pac-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; - sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; - }; - }; - "pac-resolver-5.0.1" = { - name = "pac-resolver"; - packageName = "pac-resolver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz"; - sha512 = "cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q=="; - }; - }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -8581,15 +8572,6 @@ let sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="; }; }; - "pause-stream-0.0.11" = { - name = "pause-stream"; - packageName = "pause-stream"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha512 = "e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="; - }; - }; "pdfjs-dist-2.16.105" = { name = "pdfjs-dist"; packageName = "pdfjs-dist"; @@ -8833,15 +8815,6 @@ let sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; }; }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8986,15 +8959,6 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; - "proxy-agent-5.0.0" = { - name = "proxy-agent"; - packageName = "proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz"; - sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; - }; - }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -9049,15 +9013,6 @@ let sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; - }; - }; "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; @@ -9103,15 +9058,6 @@ let sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="; }; }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; - }; - }; "querystringify-2.2.0" = { name = "querystringify"; packageName = "querystringify"; @@ -9265,6 +9211,15 @@ let sha512 = "hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg=="; }; }; + "recast-0.22.0" = { + name = "recast"; + packageName = "recast"; + version = "0.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.22.0.tgz"; + sha512 = "5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -9292,13 +9247,13 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; - "redis-4.6.8" = { + "redis-4.6.10" = { name = "redis"; packageName = "redis"; - version = "4.6.8"; + version = "4.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.8.tgz"; - sha512 = "S7qNkPUYrsofQ0ztWlTHSaK0Qqfl1y+WMIxrzeAGNG+9iUZB4HGeBgkHxE6uJJ6iXrkvLd1RVJ2nvu6H1sAzfQ=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.10.tgz"; + sha512 = "mmbyhuKgDiJ5TWUhiKhBssz+mjsuSI/lSZNPI9QvZOYzWvYGejtb+W3RlDDf8LD6Bdl5/mZeG8O1feUGhXTxEg=="; }; }; "redis-commands-1.7.0" = { @@ -9409,13 +9364,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.6" = { + "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; - sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"; + sha512 = "oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="; }; }; "restore-cursor-3.1.0" = { @@ -9616,22 +9571,13 @@ let sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; }; }; - "sax-1.2.1" = { + "sax-1.3.0" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="; - }; - }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + url = "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz"; + sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; }; }; "sb-promise-queue-2.1.0" = { @@ -9679,15 +9625,6 @@ let sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="; }; }; - "semver-5.7.2" = { - name = "semver"; - packageName = "semver"; - version = "5.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"; - sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="; - }; - }; "semver-6.3.1" = { name = "semver"; packageName = "semver"; @@ -9886,13 +9823,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.19.1" = { + "simple-git-3.20.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz"; - sha512 = "Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.20.0.tgz"; + sha512 = "ozK8tl2hvLts8ijTs18iFruE+RoqmC/mqZhjs/+V7gS5W68JpJ3+FCTmLVqmR59MaUQ52MfGQuWsIqfsTbbJ0Q=="; }; }; "simple-lru-cache-0.0.2" = { @@ -9949,13 +9886,13 @@ let sha512 = "iADMq1kY0v3vJmGTuKcFWSXt15qYUz7wFkArOrsSg0IFfI3nJqIJvK2/ZbEIndg7erIJLtAVX2nSOqPz7DcwbA=="; }; }; - "snowflake-sdk-1.8.0" = { + "snowflake-sdk-1.9.0" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.8.0.tgz"; - sha512 = "zdU1c+ytIZclF4K6D4XPPHa5II6l6cOQdsLdvKP95IwSdTYJz324ESA7fPcg/rwYV7vUKnIZJ9OCjB1mE7D2IQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.9.0.tgz"; + sha512 = "RtFRV2KC+ebQk/kOUg8WV42LnAu9puoan2wMXykgrAj1u4sGP/GgQyQhsAfLGwXWzn+J9JAwij07h3+6HYBmFw=="; }; }; "socks-2.7.1" = { @@ -9967,15 +9904,6 @@ let sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; }; - "socks-proxy-agent-5.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; - sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; - }; - }; "socks-proxy-agent-6.2.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -10165,15 +10093,6 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - }; "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; @@ -10444,13 +10363,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-5.7.1" = { + "swagger-ui-dist-5.9.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "5.7.1"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.7.1.tgz"; - sha512 = "mY+htL+asLQTrwbCOcbzOtgch2TA5A4IqMleEtVleegFAIgzd2w0jyY2IvA8upDOR/AmftudyiI1/h+VBPIc7A=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.9.0.tgz"; + sha512 = "NUHSYoe5XRTk/Are8jPJ6phzBh3l9l33nEyXosM17QInoV95/jng8+PuSGtbD407QoPf93MH3Bkh773OgesJpA=="; }; }; "swagger-ui-express-4.6.3" = { @@ -10561,13 +10480,13 @@ let sha512 = "jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="; }; }; - "terser-5.19.4" = { + "terser-5.21.0" = { name = "terser"; packageName = "terser"; - version = "5.19.4"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz"; - sha512 = "6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g=="; + url = "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz"; + sha512 = "WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -10831,15 +10750,6 @@ let sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; }; }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; "type-fest-0.21.3" = { name = "type-fest"; packageName = "type-fest"; @@ -10966,22 +10876,22 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "undici-5.24.0" = { + "undici-5.26.0" = { name = "undici"; packageName = "undici"; - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.24.0.tgz"; - sha512 = "OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ=="; + url = "https://registry.npmjs.org/undici/-/undici-5.26.0.tgz"; + sha512 = "MLqGMyaJk2ubSl7FrmWuV7ZOsYWmdF7gcBHDRxm4AR8NoodQhgy3vO/D1god79HoetxR0uAeVNB65yj2lNRQnQ=="; }; }; - "unescape-1.0.1" = { - name = "unescape"; - packageName = "unescape"; - version = "1.0.1"; + "undici-types-5.25.3" = { + name = "undici-types"; + packageName = "undici-types"; + version = "5.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/unescape/-/unescape-1.0.1.tgz"; - sha512 = "O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ=="; + url = "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz"; + sha512 = "Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="; }; }; "unique-filename-1.1.1" = { @@ -11029,13 +10939,13 @@ let sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; - "update-browserslist-db-1.0.11" = { + "update-browserslist-db-1.0.13" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"; - sha512 = "dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; + sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; }; }; "upper-case-2.0.2" = { @@ -11065,15 +10975,6 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "url-0.10.3" = { - name = "url"; - packageName = "url"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha512 = "hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="; - }; - }; "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; @@ -11092,15 +10993,6 @@ let sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A=="; }; }; - "urllib-2.41.0" = { - name = "urllib"; - packageName = "urllib"; - version = "2.41.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urllib/-/urllib-2.41.0.tgz"; - sha512 = "pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g=="; - }; - }; "utf-8-validate-5.0.10" = { name = "utf-8-validate"; packageName = "utf-8-validate"; @@ -11155,15 +11047,6 @@ let sha512 = "PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA=="; }; }; - "utility-1.18.0" = { - name = "utility"; - packageName = "utility"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utility/-/utility-1.18.0.tgz"; - sha512 = "PYxZDA+6QtvRvm//++aGdmKG/cI07jNwbROz0Ql+VzFV1+Z0Dy55NI4zZ7RHc9KKpBePNFwoErqIuqQv/cjiTA=="; - }; - }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -11182,24 +11065,6 @@ let sha512 = "yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA=="; }; }; - "uuid-3.4.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - }; - "uuid-8.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz"; - sha512 = "jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="; - }; - }; "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; @@ -11245,15 +11110,6 @@ let sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; - "vm2-3.9.19" = { - name = "vm2"; - packageName = "vm2"; - version = "3.9.19"; - src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.19.tgz"; - sha512 = "J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg=="; - }; - }; "watchpack-2.4.0" = { name = "watchpack"; packageName = "watchpack"; @@ -11389,22 +11245,13 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "win-release-1.1.1" = { - name = "win-release"; - packageName = "win-release"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz"; - sha512 = "iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw=="; - }; - }; - "winston-3.10.0" = { + "winston-3.11.0" = { name = "winston"; packageName = "winston"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz"; - sha512 = "nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g=="; + url = "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz"; + sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; }; }; "winston-transport-4.5.0" = { @@ -11416,15 +11263,6 @@ let sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; - "word-wrap-1.2.5" = { - name = "word-wrap"; - packageName = "word-wrap"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"; - sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="; - }; - }; "wordwrap-1.0.0" = { name = "wordwrap"; packageName = "wordwrap"; @@ -11497,13 +11335,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.14.1" = { + "ws-8.14.2" = { name = "ws"; packageName = "ws"; - version = "8.14.1"; + version = "8.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz"; - sha512 = "4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A=="; + url = "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz"; + sha512 = "wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="; }; }; "xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" = { @@ -11606,15 +11444,6 @@ let sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -11711,10 +11540,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "1.6.1"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-1.6.1.tgz"; - sha512 = "sksFExGzsnwKLzuP7y+VfGaCVFz/1r6eliY8dl/l8hVqmhtBF+sOShZB5GNm1N5oha12C1xbTK14cP+d7fkVaQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-1.9.3.tgz"; + sha512 = "+7DknxJzcLwuqwXnXgt627BM0Ve37QAnioy6f/qhhsQUAPEZ0e78lCHyb4yE62Zmf87fskFSCXl61rMXPFpdjw=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11734,11 +11563,21 @@ in sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/crc32c-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/ie11-detection-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/sha1-browser-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/sha256-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -11759,31 +11598,42 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-cognito-identity-3.414.0" - sources."@aws-sdk/client-sso-3.414.0" - sources."@aws-sdk/client-sts-3.414.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.414.0" - sources."@aws-sdk/credential-provider-env-3.413.0" - sources."@aws-sdk/credential-provider-ini-3.414.0" - sources."@aws-sdk/credential-provider-node-3.414.0" - sources."@aws-sdk/credential-provider-process-3.413.0" - sources."@aws-sdk/credential-provider-sso-3.414.0" - sources."@aws-sdk/credential-provider-web-identity-3.413.0" - sources."@aws-sdk/credential-providers-3.414.0" - sources."@aws-sdk/middleware-host-header-3.413.0" - sources."@aws-sdk/middleware-logger-3.413.0" - sources."@aws-sdk/middleware-recursion-detection-3.413.0" - sources."@aws-sdk/middleware-sdk-sts-3.413.0" - sources."@aws-sdk/middleware-signing-3.413.0" - sources."@aws-sdk/middleware-user-agent-3.413.0" - sources."@aws-sdk/region-config-resolver-3.413.0" - sources."@aws-sdk/token-providers-3.413.0" - sources."@aws-sdk/types-3.413.0" - sources."@aws-sdk/util-endpoints-3.413.0" + sources."@aws-sdk/client-cognito-identity-3.427.0" + sources."@aws-sdk/client-s3-3.427.0" + sources."@aws-sdk/client-sso-3.427.0" + sources."@aws-sdk/client-sts-3.427.0" + sources."@aws-sdk/credential-provider-cognito-identity-3.427.0" + sources."@aws-sdk/credential-provider-env-3.425.0" + sources."@aws-sdk/credential-provider-http-3.425.0" + sources."@aws-sdk/credential-provider-ini-3.427.0" + sources."@aws-sdk/credential-provider-node-3.427.0" + sources."@aws-sdk/credential-provider-process-3.425.0" + sources."@aws-sdk/credential-provider-sso-3.427.0" + sources."@aws-sdk/credential-provider-web-identity-3.425.0" + sources."@aws-sdk/credential-providers-3.427.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.425.0" + sources."@aws-sdk/middleware-expect-continue-3.425.0" + sources."@aws-sdk/middleware-flexible-checksums-3.425.0" + sources."@aws-sdk/middleware-host-header-3.425.0" + sources."@aws-sdk/middleware-location-constraint-3.425.0" + sources."@aws-sdk/middleware-logger-3.425.0" + sources."@aws-sdk/middleware-recursion-detection-3.425.0" + sources."@aws-sdk/middleware-sdk-s3-3.427.0" + sources."@aws-sdk/middleware-sdk-sts-3.425.0" + sources."@aws-sdk/middleware-signing-3.425.0" + sources."@aws-sdk/middleware-ssec-3.425.0" + sources."@aws-sdk/middleware-user-agent-3.427.0" + sources."@aws-sdk/region-config-resolver-3.425.0" + sources."@aws-sdk/signature-v4-multi-region-3.425.0" + sources."@aws-sdk/token-providers-3.427.0" + sources."@aws-sdk/types-3.425.0" + sources."@aws-sdk/util-arn-parser-3.310.0" + sources."@aws-sdk/util-endpoints-3.427.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.413.0" - sources."@aws-sdk/util-user-agent-node-3.413.0" + sources."@aws-sdk/util-user-agent-browser-3.425.0" + sources."@aws-sdk/util-user-agent-node-3.425.0" sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@aws-sdk/xml-builder-3.310.0" sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" sources."@azure/core-client-1.7.3" @@ -11802,7 +11652,7 @@ in ]; }) sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.4.0" + sources."@azure/core-util-1.5.0" (sources."@azure/identity-2.1.0" // { dependencies = [ sources."jwa-2.0.0" @@ -11828,17 +11678,18 @@ in sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - (sources."@babel/runtime-7.22.15" // { + (sources."@babel/runtime-7.23.1" // { dependencies = [ sources."regenerator-runtime-0.14.0" ]; }) - sources."@colors/colors-1.5.0" + sources."@colors/colors-1.6.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" sources."@dabh/diagnostics-2.0.3" sources."@ewoudenberg/difflib-0.1.0" + sources."@fastify/busboy-2.0.0" sources."@gar/promisify-1.1.3" sources."@google-cloud/common-3.10.0" sources."@google-cloud/paginator-3.0.7" @@ -11872,7 +11723,7 @@ in }) (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.9" + sources."@grpc/proto-loader-0.7.10" sources."cliui-8.0.1" sources."long-5.2.3" sources."protobufjs-7.2.5" @@ -11915,7 +11766,7 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@js-joda/core-5.5.3" + sources."@js-joda/core-5.6.0" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -11923,8 +11774,18 @@ in sources."@mapbox/node-pre-gyp-1.0.11" sources."@mongodb-js/zstd-1.2.0" sources."@n8n/client-oauth2-0.7.0" - sources."@n8n/vm2-3.9.20" - sources."@n8n_io/license-sdk-2.5.1" + (sources."@n8n/tournament-1.0.2" // { + dependencies = [ + sources."ast-types-0.16.1" + (sources."recast-0.22.0" // { + dependencies = [ + sources."ast-types-0.15.2" + ]; + }) + ]; + }) + sources."@n8n/vm2-3.9.23" + sources."@n8n_io/license-sdk-2.6.1" sources."@n8n_io/riot-tmpl-4.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -11958,7 +11819,7 @@ in }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.17" - sources."@oclif/screen-3.0.6" + sources."@oclif/screen-3.0.7" sources."@opentelemetry/api-1.6.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -11971,14 +11832,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@redis/bloom-1.2.0" - (sources."@redis/client-1.5.9" // { + (sources."@redis/client-1.5.11" // { dependencies = [ sources."yallist-4.0.0" ]; }) sources."@redis/graph-1.1.0" - sources."@redis/json-1.0.4" - sources."@redis/search-1.1.3" + sources."@redis/json-1.0.6" + sources."@redis/search-1.1.5" sources."@redis/time-series-1.0.5" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ @@ -11986,7 +11847,7 @@ in sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.18.22" // { + (sources."@sap/hana-client-2.18.24" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" @@ -11998,55 +11859,66 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry-internal/tracing-7.69.0" - sources."@sentry/core-7.69.0" - sources."@sentry/integrations-7.69.0" - sources."@sentry/node-7.69.0" - sources."@sentry/types-7.69.0" - sources."@sentry/utils-7.69.0" - sources."@smithy/abort-controller-2.0.8" - sources."@smithy/config-resolver-2.0.9" - sources."@smithy/credential-provider-imds-2.0.11" - sources."@smithy/eventstream-codec-2.0.8" - sources."@smithy/fetch-http-handler-2.1.4" - sources."@smithy/hash-node-2.0.8" - sources."@smithy/invalid-dependency-2.0.8" + sources."@sentry-internal/tracing-7.73.0" + sources."@sentry/core-7.73.0" + sources."@sentry/integrations-7.73.0" + sources."@sentry/node-7.73.0" + sources."@sentry/types-7.73.0" + sources."@sentry/utils-7.73.0" + sources."@smithy/abort-controller-2.0.11" + sources."@smithy/chunked-blob-reader-2.0.0" + sources."@smithy/chunked-blob-reader-native-2.0.0" + sources."@smithy/config-resolver-2.0.14" + sources."@smithy/credential-provider-imds-2.0.16" + sources."@smithy/eventstream-codec-2.0.11" + sources."@smithy/eventstream-serde-browser-2.0.11" + sources."@smithy/eventstream-serde-config-resolver-2.0.11" + sources."@smithy/eventstream-serde-node-2.0.11" + sources."@smithy/eventstream-serde-universal-2.0.11" + sources."@smithy/fetch-http-handler-2.2.3" + sources."@smithy/hash-blob-browser-2.0.11" + sources."@smithy/hash-node-2.0.11" + sources."@smithy/hash-stream-node-2.0.11" + sources."@smithy/invalid-dependency-2.0.11" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/middleware-content-length-2.0.10" - sources."@smithy/middleware-endpoint-2.0.8" - sources."@smithy/middleware-retry-2.0.11" - sources."@smithy/middleware-serde-2.0.8" - sources."@smithy/middleware-stack-2.0.1" - sources."@smithy/node-config-provider-2.0.11" - sources."@smithy/node-http-handler-2.1.4" - sources."@smithy/property-provider-2.0.9" - sources."@smithy/protocol-http-3.0.4" - sources."@smithy/querystring-builder-2.0.8" - sources."@smithy/querystring-parser-2.0.8" - sources."@smithy/service-error-classification-2.0.1" - sources."@smithy/shared-ini-file-loader-2.0.10" - sources."@smithy/signature-v4-2.0.8" - sources."@smithy/smithy-client-2.1.5" - sources."@smithy/types-2.3.2" - sources."@smithy/url-parser-2.0.8" + sources."@smithy/md5-js-2.0.11" + sources."@smithy/middleware-content-length-2.0.13" + sources."@smithy/middleware-endpoint-2.1.0" + sources."@smithy/middleware-retry-2.0.16" + sources."@smithy/middleware-serde-2.0.11" + sources."@smithy/middleware-stack-2.0.5" + sources."@smithy/node-config-provider-2.1.1" + sources."@smithy/node-http-handler-2.1.7" + sources."@smithy/property-provider-2.0.12" + sources."@smithy/protocol-http-3.0.7" + sources."@smithy/querystring-builder-2.0.11" + sources."@smithy/querystring-parser-2.0.11" + sources."@smithy/service-error-classification-2.0.4" + sources."@smithy/shared-ini-file-loader-2.2.0" + sources."@smithy/signature-v4-2.0.11" + sources."@smithy/smithy-client-2.1.11" + sources."@smithy/types-2.3.5" + sources."@smithy/url-parser-2.0.11" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.9" - sources."@smithy/util-defaults-mode-node-2.0.11" + sources."@smithy/util-defaults-mode-browser-2.0.15" + sources."@smithy/util-defaults-mode-node-2.0.19" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.1" - sources."@smithy/util-retry-2.0.1" - sources."@smithy/util-stream-2.0.11" + sources."@smithy/util-middleware-2.0.4" + sources."@smithy/util-retry-2.0.4" + sources."@smithy/util-stream-2.0.16" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" + sources."@smithy/util-waiter-2.0.11" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.85" - sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/core-1.3.92" + sources."@swc/counter-0.1.2" + sources."@swc/helpers-0.5.3" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.92" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.5.0" sources."@tokenizer/token-0.3.0" @@ -12059,40 +11931,40 @@ in sources."@types/big.js-6.2.0" sources."@types/body-parser-1.19.3" sources."@types/connect-3.4.36" - sources."@types/duplexify-3.6.1" - sources."@types/es-aggregate-error-1.0.2" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" - sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.36" + sources."@types/duplexify-3.6.2" + sources."@types/es-aggregate-error-1.0.3" + sources."@types/eslint-8.44.4" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" + sources."@types/express-4.17.19" + sources."@types/express-serve-static-core-4.17.37" sources."@types/http-errors-2.0.2" sources."@types/json-schema-7.0.13" sources."@types/jsonwebtoken-9.0.3" - sources."@types/lodash-4.14.198" + sources."@types/lodash-4.14.199" sources."@types/long-4.0.2" - sources."@types/mime-1.3.2" - sources."@types/multer-1.4.7" - sources."@types/node-20.6.2" - sources."@types/node-fetch-2.6.5" - sources."@types/pumpify-1.4.1" + sources."@types/mime-1.3.3" + sources."@types/multer-1.4.8" + sources."@types/node-20.8.4" + sources."@types/node-fetch-2.6.6" + sources."@types/pumpify-1.4.2" sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.4" - (sources."@types/readable-stream-4.0.2" // { + sources."@types/range-parser-1.2.5" + (sources."@types/readable-stream-4.0.3" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."@types/send-0.17.1" - sources."@types/serve-static-1.15.2" + sources."@types/send-0.17.2" + sources."@types/serve-static-1.15.3" sources."@types/stack-trace-0.0.29" sources."@types/triple-beam-1.3.3" sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.4" - sources."@types/validator-13.11.1" - sources."@types/webidl-conversions-7.0.0" + sources."@types/uuid-9.0.5" + sources."@types/validator-13.11.2" + sources."@types/webidl-conversions-7.0.1" sources."@types/whatwg-url-8.2.2" - sources."@types/ws-8.5.5" + sources."@types/ws-8.5.7" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -12167,9 +12039,10 @@ in }) sources."asn1.js-rfc2560-5.0.1" sources."asn1.js-rfc5280-3.0.0" + sources."assert-2.1.0" sources."assert-options-0.8.0" sources."assert-plus-1.0.0" - sources."ast-types-0.13.4" + sources."ast-types-0.15.2" sources."async-3.2.4" (sources."async-retry-1.3.3" // { dependencies = [ @@ -12190,19 +12063,9 @@ in sources."axios-0.24.0" ]; }) - (sources."aws-sdk-2.1459.0" // { - dependencies = [ - sources."buffer-4.9.2" - sources."events-1.1.1" - sources."ieee754-1.1.13" - sources."isarray-1.0.0" - sources."sax-1.2.1" - sources."uuid-8.0.0" - ]; - }) sources."aws4-1.12.0" sources."axios-0.21.4" - sources."axios-retry-3.7.0" + sources."axios-retry-3.8.0" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" @@ -12217,7 +12080,7 @@ in ]; }) sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.6.0" + sources."better-sqlite3-8.7.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" sources."bignumber.js-9.1.2" @@ -12247,7 +12110,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."bson-5.5.0" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" @@ -12272,14 +12135,14 @@ in sources."yallist-4.0.0" ]; }) - sources."cache-manager-5.2.3" + sources."cache-manager-5.2.4" sources."cache-manager-ioredis-yet-1.2.2" sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001547" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."chalk-4.1.2" @@ -12351,15 +12214,14 @@ in sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."convict-6.2.4" - sources."cookie-0.4.2" + sources."cookie-0.5.0" (sources."cookie-parser-1.4.6" // { dependencies = [ sources."cookie-0.4.1" ]; }) sources."cookie-signature-1.0.6" - sources."copy-to-2.0.1" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.3" sources."create-require-1.1.1" sources."cron-1.7.2" @@ -12370,12 +12232,15 @@ in sources."csrf-3.1.0" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."csv-parse-5.5.0" - sources."curlconverter-3.21.0" + sources."csv-parse-5.5.2" + (sources."curlconverter-3.21.0" // { + dependencies = [ + sources."cookie-0.4.2" + ]; + }) sources."currency-codes-2.1.0" sources."dashdash-1.14.1" sources."data-api-client-1.3.0" - sources."data-uri-to-buffer-3.0.1" sources."date-fns-2.30.0" sources."debug-4.3.4" sources."debuglog-1.0.1" @@ -12383,13 +12248,10 @@ in sources."decompress-response-6.0.0" sources."deep-equal-2.2.2" sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" sources."deepmerge-4.3.1" - sources."default-user-agent-1.0.0" sources."define-data-property-1.1.0" sources."define-lazy-prop-2.0.0" sources."define-properties-1.2.1" - sources."degenerator-3.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.1" @@ -12398,7 +12260,6 @@ in sources."detect-libc-2.0.2" sources."dezalgo-1.0.4" sources."diff-4.0.2" - sources."digest-header-1.1.0" sources."dir-glob-3.0.1" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" @@ -12418,7 +12279,7 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.549" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enabled-2.0.0" @@ -12441,7 +12302,6 @@ in sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - sources."escodegen-1.14.3" sources."eslint-config-riot-1.0.0" sources."eslint-scope-5.1.1" sources."esprima-4.0.1" @@ -12452,7 +12312,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-target-shim-5.0.1" sources."eventemitter3-4.0.7" @@ -12463,7 +12322,6 @@ in sources."expand-tilde-2.0.2" (sources."express-4.18.2" // { dependencies = [ - sources."cookie-0.5.0" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -12482,7 +12340,6 @@ in }) sources."express-prom-bundle-6.6.0" sources."extend-3.0.2" - sources."extend-shallow-2.0.1" (sources."external-editor-3.1.0" // { dependencies = [ sources."iconv-lite-0.4.24" @@ -12491,7 +12348,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fast-text-encoding-1.0.6" sources."fast-xml-parser-4.2.5" sources."fastq-1.15.0" @@ -12520,16 +12376,11 @@ in sources."first-match-0.0.1" sources."flatted-3.2.9" sources."fn.name-1.1.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."foreground-child-3.1.1" sources."form-data-4.0.0" sources."formidable-3.5.1" - (sources."formstream-1.3.1" // { - dependencies = [ - sources."mime-2.6.0" - ]; - }) sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-constants-1.0.0" @@ -12541,13 +12392,6 @@ in ]; }) sources."fs.realpath-1.0.0" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) sources."function-bind-1.1.1" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" @@ -12566,17 +12410,9 @@ in sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" - (sources."get-uri-3.0.2" // { - dependencies = [ - sources."file-uri-to-path-2.0.0" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) sources."getpass-0.1.7" sources."github-from-package-0.0.0" - (sources."glob-10.3.4" // { + (sources."glob-10.3.10" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -12618,7 +12454,7 @@ in ]; }) sources."handlebars-4.7.7" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" @@ -12675,9 +12511,9 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" - (sources."infisical-node-1.4.3" // { + (sources."infisical-node-1.5.0" // { dependencies = [ - sources."axios-1.5.0" + sources."axios-1.5.1" sources."dotenv-16.3.1" ]; }) @@ -12706,7 +12542,6 @@ in sources."is-core-module-2.13.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" @@ -12733,11 +12568,11 @@ in sources."is-weakset-2.0.2" sources."is-wsl-2.2.0" sources."isarray-2.0.5" - sources."isbot-3.6.13" + sources."isbot-3.7.0" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isomorphic-ws-4.0.1" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."jake-10.8.7" (sources."jest-worker-27.5.1" // { dependencies = [ @@ -12746,7 +12581,7 @@ in }) sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.14.6" + sources."jose-4.15.2" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" @@ -12766,7 +12601,7 @@ in sources."jsonwebtoken-9.0.2" sources."jssha-3.3.1" sources."jwa-1.4.1" - sources."jwks-rsa-3.0.1" + sources."jwks-rsa-3.1.0" sources."jws-3.2.2" sources."kafkajs-1.16.0" (sources."kerberos-2.0.3" // { @@ -12782,10 +12617,9 @@ in }) sources."leac-0.6.0" sources."leven-2.1.0" - sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.1" - sources."libphonenumber-js-1.10.44" + sources."libphonenumber-js-1.10.47" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12822,11 +12656,15 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.zipobject-4.1.3" - sources."logform-2.5.1" + (sources."logform-2.5.1" // { + dependencies = [ + sources."@colors/colors-1.5.0" + ]; + }) sources."long-4.0.0" sources."lossless-json-1.0.5" sources."lower-case-2.0.2" - sources."lru-cache-9.1.2" + sources."lru-cache-10.0.1" (sources."lru-memoizer-2.2.0" // { dependencies = [ sources."lru-cache-4.0.2" @@ -12882,7 +12720,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-7.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12924,7 +12762,7 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.43" sources."mongodb-5.9.0" - (sources."mongodb-client-encryption-2.9.0" // { + (sources."mongodb-client-encryption-2.9.1" // { dependencies = [ sources."gaxios-5.1.3" sources."gcp-metadata-5.3.0" @@ -12966,7 +12804,7 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-1.6.0" // { + (sources."n8n-core-1.9.1" // { dependencies = [ sources."@tediousjs/connection-string-0.3.0" (sources."bl-5.1.0" // { @@ -12985,15 +12823,15 @@ in sources."lru-cache-7.18.3" sources."minimatch-5.1.6" sources."mongodb-4.17.1" - (sources."mqtt-5.0.5" // { + (sources."mqtt-5.1.2" // { dependencies = [ sources."buffer-6.0.3" sources."readable-stream-4.4.2" ]; }) - sources."mqtt-packet-8.2.0" + sources."mqtt-packet-8.2.1" sources."mssql-8.1.4" - sources."n8n-nodes-base-1.6.0" + sources."n8n-nodes-base-1.9.2" sources."readable-stream-3.6.2" sources."redis-3.1.2" sources."sprintf-js-1.1.3" @@ -13001,8 +12839,8 @@ in sources."tedious-14.7.0" ]; }) - sources."n8n-editor-ui-1.6.0" - (sources."n8n-nodes-base-1.6.1" // { + sources."n8n-editor-ui-1.9.3" + (sources."n8n-nodes-base-1.9.3" // { dependencies = [ sources."@tediousjs/connection-string-0.3.0" (sources."bl-5.1.0" // { @@ -13030,8 +12868,8 @@ in sources."lru-cache-7.18.3" sources."minimatch-5.1.6" sources."mongodb-4.17.1" - sources."mqtt-5.0.5" - sources."mqtt-packet-8.2.0" + sources."mqtt-5.1.2" + sources."mqtt-packet-8.2.1" sources."mssql-8.1.4" (sources."readable-stream-4.4.2" // { dependencies = [ @@ -13045,11 +12883,7 @@ in sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" ]; }) - (sources."n8n-workflow-1.6.0" // { - dependencies = [ - sources."ast-types-0.15.2" - ]; - }) + sources."n8n-workflow-1.9.1" (sources."named-placeholders-1.1.3" // { dependencies = [ sources."lru-cache-7.18.3" @@ -13063,9 +12897,8 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.3" sources."neo-async-2.6.2" - sources."netmask-2.0.2" sources."no-case-3.0.4" - sources."node-abi-3.47.0" + sources."node-abi-3.49.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-fetch-2.7.0" @@ -13096,7 +12929,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.5" + sources."nodemailer-6.9.6" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."npmlog-5.0.1" @@ -13122,12 +12955,9 @@ in sources."open-7.4.2" sources."openapi-types-10.0.0" sources."openurl-1.1.1" - sources."optionator-0.8.3" sources."oracledb-5.5.0" - sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" - sources."osx-release-1.1.0" - sources."otpauth-9.1.4" + sources."otpauth-9.1.5" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-lazy-3.1.0" @@ -13135,16 +12965,6 @@ in sources."p-map-2.1.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" - (sources."pac-proxy-agent-5.0.0" // { - dependencies = [ - sources."socks-proxy-agent-5.0.1" - ]; - }) - (sources."pac-resolver-5.0.1" // { - dependencies = [ - sources."ip-1.1.8" - ]; - }) sources."packet-reader-1.0.0" sources."pako-1.0.11" sources."param-case-3.0.4" @@ -13172,7 +12992,6 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pause-0.0.1" - sources."pause-stream-0.0.11" sources."pdfjs-dist-2.16.105" sources."peberminta-0.9.0" sources."peek-readable-4.1.0" @@ -13217,7 +13036,6 @@ in sources."pump-3.0.0" ]; }) - sources."prelude-ls-1.1.2" sources."pretty-bytes-5.6.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -13232,13 +13050,6 @@ in sources."proto3-json-serializer-0.1.9" sources."protobufjs-6.11.4" sources."proxy-addr-2.0.7" - (sources."proxy-agent-5.0.0" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."socks-proxy-agent-5.0.1" - sources."yallist-3.1.1" - ]; - }) sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."psl-1.9.0" @@ -13253,7 +13064,6 @@ in sources."python-struct-1.1.3" sources."qs-6.11.0" sources."query-string-7.1.3" - sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."quoted-printable-1.0.1" @@ -13279,14 +13089,10 @@ in ]; }) sources."readdirp-3.6.0" - (sources."recast-0.21.5" // { - dependencies = [ - sources."ast-types-0.15.2" - ]; - }) + sources."recast-0.21.5" sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-4.6.8" + sources."redis-4.6.10" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -13302,7 +13108,7 @@ in }) sources."require-directory-2.1.1" sources."requires-port-1.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" (sources."restore-cursor-3.1.0" // { dependencies = [ sources."signal-exit-3.0.7" @@ -13342,7 +13148,7 @@ in sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" sources."samlify-2.8.10" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."schema-utils-3.3.0" @@ -13388,22 +13194,21 @@ in sources."signal-exit-4.1.0" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.19.1" + sources."simple-git-3.20.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" sources."snappy-7.2.2" - (sources."snowflake-sdk-1.8.0" // { + (sources."snowflake-sdk-1.9.0" // { dependencies = [ - sources."axios-0.27.2" + sources."axios-1.5.1" sources."bignumber.js-2.4.0" sources."debug-3.2.7" sources."glob-7.2.3" sources."mkdirp-1.0.4" sources."tmp-0.2.1" - sources."uuid-3.4.0" ]; }) sources."socks-2.7.1" @@ -13468,7 +13273,7 @@ in sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-5.7.1" + sources."swagger-ui-dist-5.9.0" sources."swagger-ui-express-4.6.3" sources."syslog-client-1.1.1" sources."tapable-2.2.1" @@ -13505,7 +13310,7 @@ in sources."http-proxy-agent-5.0.0" ]; }) - (sources."terser-5.19.4" // { + (sources."terser-5.21.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -13554,7 +13359,6 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typed-array-buffer-1.0.0" @@ -13581,33 +13385,18 @@ in sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" - sources."undici-5.24.0" - sources."unescape-1.0.1" + sources."undici-5.26.0" + sources."undici-types-5.25.3" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."universalify-2.0.0" sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."upper-case-2.0.2" sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" - (sources."url-0.10.3" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-parse-1.5.10" sources."url-value-parser-2.2.0" - (sources."urllib-2.41.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ip-1.1.8" - sources."ms-2.0.0" - sources."pump-3.0.0" - sources."statuses-1.5.0" - ]; - }) sources."utf-8-validate-5.0.10" (sources."utf7-1.0.2" // { dependencies = [ @@ -13618,14 +13407,12 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."util.promisify-1.1.2" - sources."utility-1.18.0" sources."utils-merge-1.0.1" sources."uuencode-0.0.4" sources."uuid-8.3.2" sources."v8-compile-cache-lib-3.0.1" sources."validator-13.7.0" sources."vary-1.1.2" - sources."vm2-3.9.19" sources."watchpack-2.4.0" sources."web-streams-polyfill-3.2.1" sources."webidl-conversions-3.0.1" @@ -13638,12 +13425,7 @@ in sources."which-typed-array-1.1.11" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."win-release-1.1.1" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - (sources."winston-3.10.0" // { + (sources."winston-3.11.0" // { dependencies = [ sources."readable-stream-3.6.2" ]; @@ -13653,13 +13435,12 @@ in sources."readable-stream-3.6.2" ]; }) - sources."word-wrap-1.2.5" sources."wordwrap-1.0.0" sources."worker-loader-3.0.8" sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" sources."xml-1.0.1" sources."xml-crypto-3.2.0" diff --git a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix index 96f5bc2cf0..8fc822416b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix @@ -2,20 +2,23 @@ buildGoModule rec { pname = "nali"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-ZKLxsq7ybom96NKWkioROAVXUoY20zFBZn7ksk4XvT4="; + hash = "sha256-JIP0QX1okCfDj2Y6wZ5TaV3QH0WP3oU3JjaKK6vMfWY="; }; - vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8="; + vendorHash = "sha256-wIp/ShUddz+RIcsEuKWUfxsV/wNB2X1jZtIltBZ0ROM="; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" "-X github.com/zu1k/nali/internal/constant.Version=${version}" ]; + postInstall = '' installShellCompletion --cmd nali \ --bash <($out/bin/nali completion bash) \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix index df3bc9f9f2..290a6519f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ndppd/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ fadenb globin ]; + maintainers = with maintainers; [ fadenb ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix index fe90b8a811..5b493e5460 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-RL0tGhtndahTezQFz/twyLh36h2RXFy7EUnPiLAxP4U="; + hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM="; }; - vendorHash = "sha256-4Wxutkg9OdKs6B8z/P6JMgcE3cGS+6W4V7sKzVBwRJc="; + vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM="; inherit subPackages; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 2463757216..81f7903adc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-FKjsosSSW0U8fQwV6QYhsbuuaTeCt6SfHEcY0v5xUO4="; + hash = "sha256-twczHU41xXJvBg4nTQyJrmNCCSoJWAnRLs4DV0uKpjE="; }; nativeBuildInputs = [ 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 ce94768074..37932a3a4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.10.0"; + version = "3.10.1"; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-BNqMKL888DKuRiM537V7CBuCabg5YmGYGpWARtvs7go="; + sha256 = "sha256-PtWg9IMwZU0HG2pVHdRKgPQH8i2e72Fbs+q5wCwBsfo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 04d43a4c79..91d4c8dccb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.40.1"; + version = "1.41.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-VK6e8+r0A642zP0Pae8qbQCWT+CGpHY7B9ZGobXl92A="; + sha256 = "sha256-uLX5M9DW8wfVKSV+/pwy+ZK6M6OQSq7qYjRcBvOOqOQ="; }; - vendorHash = "sha256-CKKyLtqSzbmvpmDcoyGD79msAudlumqxcXaMTNbCbNI="; + vendorHash = "sha256-vYE/GdN2ooSW4LMg1D5t5zOgATruB4Q449JdNo87fkM="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix index e46a95d71e..a2b2731b3b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nload/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, autoreconfHook }: stdenv.mkDerivation rec { version = "0.7.4"; @@ -20,8 +20,23 @@ stdenv.mkDerivation rec { name = "nload-0.7.4-Eliminate-flicker-on-some-terminals.patch"; sha256 = "10yppy5l50wzpcvagsqkbyf1rcan6aj30am4rw8hmkgnbidf4zbq"; }) + # Patches configure.in file to make configure compile on macOS. + # Patch taken from MacPorts. + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/28814c34711e7545929fd391feb6ce079bd73fd4/net/nload/files/patch-configure.in.diff"; + extraPrefix = ""; + hash = "sha256-lGbBG5ZOgMVnrwlwXVFGbUZx6RkmQwYSVLB3oqkAWRs="; + }) + # Fixes crash on F2 and garbage in adapter name. + # Patch taken from Homebrew. + (fetchpatch { + url = "https://sourceforge.net/p/nload/bugs/_discuss/thread/c9b68d8e/4a65/attachment/devreader-bsd.cpp.patch"; + extraPrefix = ""; + hash = "sha256-umRQDqcRUOGELOx5iB6CPFRkjaD8HXkMCWiKsYdaUa0="; + }) ]; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; buildInputs = [ ncurses ]; meta = { @@ -34,7 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.roland-riegel.de/nload/index.html"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; mainProgram = "nload"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 369cd7e338..b9c88bf3bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -75,7 +75,6 @@ rec { inherit (tor) geoip; }) ]; - disable = !isPy3k; propagatedBuildInputs = [ colorama flask @@ -127,7 +126,6 @@ rec { ./fix-qrcode-gui.patch ]; - disable = !isPy3k; propagatedBuildInputs = [ onionshare pyqt5 diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index 4398c771e5..d4f2a9b26a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; propagatedBuildInputs = with python3Packages; [ - click babel opsdroid_get_image_size slackclient webexteamssdk bleach + click babel opsdroid-get-image-size slackclient webexteamssdk bleach parse emoji puremagic yamale nbformat websockets pycron nbconvert aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex mattermostdriver setuptools voluptuous ibm-watson tailer multidict diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix index 8a46b5a476..3ca2364725 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix @@ -16,8 +16,9 @@ let patches = [ # gradle 7 support + # https://github.com/freenet/fred/pull/827 (fetchpatch { - url = "https://github.com/freenet/fred/pull/827.patch"; + url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index 2fdaf3c52f..27476d3b48 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.19.4"; + version = "0.20.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-AKY99AjVmH9bqaUEQfKncYK9n7MvHjAq5WOslOesAJs="; + sha256 = "sha256-VgKeeKmcBNUrE1gJSuUHTkzY6puYz2hV9XrZryeslRg="; }; enableParallelBuilding = true; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ pstn vrthra ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.unix; changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix index 739c3013e5..94504f2b99 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-MwAWs1rHXYlRUcAWX8LnCLTwEOSI68aA0s7uZGgYR3w="; + sha256 = "sha256-6ZHlDIKrTmr/aRz4k5FtRVxZ7B9Hlh2w42QT4YRsVi0="; }; nativeBuildInputs= [ @@ -38,7 +38,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gnunet=${gnunet}" ]; - patchPhase = "patchShebangs pixmaps/icon-theme-installer"; + postPatch = "patchShebangs pixmaps/icon-theme-installer"; + + postInstall = '' + ln -s $out/share/gnunet-gtk/gnunet_logo.png $out/share/gnunet/gnunet-logo-color.png + ''; meta = gnunet.meta // { description = "GNUnet GTK User Interface"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix index 4ea4ebbb2d..aa2853d3bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/libutp/3.4.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libutp"; - version = "unstable-2023-03-05"; + version = "unstable-2023-10-16"; src = fetchFromGitHub { # Use transmission fork from post-3.4-transmission branch owner = "transmission"; repo = pname; - rev = "9cb9f9c4f0073d78b08d6542cebaea6564ecadfe"; - hash = "sha256-dpbX1h/gpuVIAXC4hwwuRwQDJ0pwVVEsgemOVN0Dv9Q="; + rev = "2589200eac82fc91b65979680e4b3c026dff0278"; + hash = "sha256-wsDqdbMWVm3ubTbg5XClEWutJz1irSIazVLFeCyAAL4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix index 7bc5e2f596..81a625e521 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { broken = stdenv.isDarwin; description = "Client for many p2p networks, with multiple frontends"; - homepage = "http://mldonkey.sourceforge.net/"; + homepage = "https://github.com/ygrek/mldonkey"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix index 41eedcc1b4..59cf07d695 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.11.3"; + version = "2.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A="; + hash = "sha256-6TDfNkEqtSrPpyExJ/68GAalIo9pSNiIDo7KdqwoulQ="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index a82adc4dc3..12aa4b8e50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,58 +1,92 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config -, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg -, debugSupport ? false -, guiSupport ? true, dbus ? null # GUI (disable to run headless) -, webuiSupport ? true # WebUI -, trackerSearch ? true, python3 ? null +{ lib +, stdenv +, fetchFromGitHub + +, boost +, cmake +, Cocoa +, libtorrent-rasterbar +, ninja +, qtbase +, qtsvg +, qttools +, wrapQtAppsHook + +, guiSupport ? true +, dbus +, qtwayland + +, trackerSearch ? true +, python3 + +, webuiSupport ? true }: -assert guiSupport -> (dbus != null); -assert trackerSearch -> (python3 != null); - -mkDerivation rec { - pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "4.5.5"; +let + qtVersion = lib.versions.major qtbase.version; +in +stdenv.mkDerivation rec { + pname = "qbittorrent" + + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + + lib.optionalString (!guiSupport) "-nox"; + version = "4.6.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-rWv+KGw+3385GOKK4MvoSP0CepotUZELiDVFpyDf+9k="; + hash = "sha256-o9zMGjVCXLqdRdXzRs1kFPDMFJXQWBEtWwIfeIyFxJw="; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + cmake + ninja + wrapQtAppsHook + ]; - # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + boost + libtorrent-rasterbar + qtbase + qtsvg + qttools + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals guiSupport [ + dbus + ] ++ lib.optionals (guiSupport && stdenv.isLinux) [ + qtwayland + ] ++ lib.optionals trackerSearch [ + python3 + ]; - buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] - ++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support - ++ lib.optional trackerSearch python3; + cmakeFlags = lib.optionals (qtVersion == "6") [ + "-DQT6=ON" + ] ++ lib.optionals (!guiSupport) [ + "-DGUI=OFF" + "-DSYSTEMD=ON" + "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" + ] ++ lib.optionals (!webuiSupport) [ + "-DWEBUI=OFF" + ]; - # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. - QMAKE_LRELEASE = "lrelease"; - - configureFlags = [ - "--with-boost-libdir=${boost.out}/lib" - "--with-boost=${boost.dev}" ] - ++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files - ++ lib.optional (!webuiSupport) "--disable-webui" - ++ lib.optional debugSupport "--enable-debug"; - - qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}"; + qtWrapperArgs = lib.optionals trackerSearch [ + "--prefix PATH : ${lib.makeBinPath [ python3 ]}" + ]; postInstall = lib.optionalString stdenv.isDarwin '' + APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} - cp -R src/${pname}.app $out/Applications - makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} + cp -R $APP_NAME.app $out/Applications + makeWrapper $out/{Applications/$APP_NAME.app/Contents/MacOS,bin}/$APP_NAME ''; meta = with lib; { description = "Featureful free software BitTorrent client"; - homepage = "https://www.qbittorrent.org/"; - changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ Anton-Latukha kashw2 ]; + homepage = "https://www.qbittorrent.org"; + changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ Anton-Latukha kashw2 paveloom ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 78f5b6cf25..62f0d3933a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { include } EOF + install -Dm0444 -t $out/share/icons ../qt/icons/transmission.svg ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremotesf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremotesf/default.nix index 6880d84721..4cd7358d2b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremotesf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremotesf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; rev = finalAttrs.version; - hash = "sha256-TKtBgMpCWIUl1bohAKCbTcZX2uaPmzeWut/OeNs/rME="; + hash = "sha256-mxk2BRUuet3XSNaKt2Dnnxe5dliazd1ArRSnKyoAp1s="; # We need this for src/libtremotesf fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index c8ac75683a..df91e40eab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { buildPhase = '' runHook preBuild - ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + ${python3Packages.python.pythonOnBuildForHost.interpreter} -O -m compileall . runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix index 07ea170752..d0a358a5ba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . + ${python3Packages.python.pythonOnBuildForHost.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index ff0d808e8f..e0249f813a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.0"; - code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey"; + version = "1.14.2"; + code = "XZAwMrVZidapyDxpd2pCNlGy3BcjdbYCf1Yk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c="; + hash = "sha256-5dTo0/R+RA+C0PKzaCmcSy7YwzT3Qlwq1xMw6wPJt28="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 1dcc539d71..7d53cbbcb8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.4.2"; + version = "3.6.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-i+RD0f3WxdW0PgMNynsIXnOfEdh3vS3NufJyXpw0EU0="; + hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE="; }; - vendorHash = "sha256-lrK4L7oTR5qP34Df0UJnTJATmKUmHVZeGrD9kD+sZFw="; + vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 038d904f45..50143013b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "qv2ray"; - version = "unstable-2023-06-09"; + version = "unstable-2023-07-11"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "aea9981cc28fe25de55207b93d86036b30d467d2"; - hash = "sha256-ySXAF6fkkKsafuSa3DxkOuRjSyiCDUZRevcfJRp7LPM="; + rev = "b3080564809dd8aef864a54ca1b79f0984fe986b"; + hash = "sha256-LwBjuX5x3kQcdEfPLEirWpkMqOigkhNoh/VNmBfPAzw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index b9b8ee29b1..b159bd0a99 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -8,7 +8,7 @@ , alsa-lib , faac , faad2 -, ffmpeg +, ffmpeg_5 # Depends on deprecated libav features , glib , openh264 , openssl @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { cairo cups faad2 - ffmpeg + ffmpeg_5 glib gst-plugins-base gst-plugins-good @@ -190,6 +190,8 @@ stdenv.mkDerivation rec { "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" ]); NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index 77d72060c1..19d1931059 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hmlzv1WaT+KucR7RGPC3bKcIdTxPOvK2s17nDucdu7c="; + sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix index 232b6460ec..b9f4838f58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-aNLAj8rQSRp6fsEu052uc2gJE55A996YJY7tDApjHxA="; + hash = "sha256-wsFZN2qDp0XScqBdwLYZdRsS30g+ex+sYjw2GkBwwI4="; }; - vendorHash = "sha256-8TxuExcxiBTHVA9DTLfElKOq45a2EVLxqmByDyKJQ4c="; + vendorHash = "sha256-SDNCVROfwCTfoQpUyChxtX3rTf0OPFOTzH5PeH4ahUI="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix index 3b0c494bb6..c7d4508c06 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seafile-client/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.3"; + version = "9.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-zoo34mhNZTEwxjSy8XgmZfEjkujmWj34OtDJQSCb/zk="; + sha256 = "sha256-Qt4Y7s2BMwuKXTYjHAzK40HgAsxlk98af3irOXT4/Vs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index e6e97bd0ab..dd94e7bd88 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.55"; + version = "3.59"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-qAyvGisj6GOjyRmqpTsxX/Zy8bx6+cAtmEId5us70+k="; + hash = "sha256-askngehfEBJzJG0MVBA4WCRUPDELWlwJWcRPH6gTvzw="; }; - vendorHash = "sha256-F6Fqv5tUsty/uGwBnKM4r671Gh2T1+9Z2LRGAMF+M2g="; + vendorHash = "sha256-o+moq4arkQLQZcsW4Tahpv1MpGRHwMv+IL5E03W0U5c="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index cfb35e5268..e87ea1bbe5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.5"; + version = "0.13.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-+2YYTnQDU9AkCjWvUEsddgu8GVJk0VUCMkEeWhW/u0w="; + hash = "sha256-oUgxYVnSPlUxQW3egZuzGad1IduvG9pvgFiR9jmljQU="; }; modRoot = "./agent"; - vendorHash = "sha256-lZ7W7YpigcVaLO9HoS5V379nyKHemRh9Z2NjlZbJcPg="; + vendorHash = "sha256-SNQuw9RRWuRndUwUiXwGs95CrXRrk72Gey5h1rtwWeo="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix index b0feaf38ec..f874db1e98 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/kismet/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kismet"; - version = "2022-08-R1"; + version = "2023-07-R1"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - hash = "sha256-IUnM6sVSZQhlP00C3PemlOPaPcAAojcqHuS/mYgnl4E="; + hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc="; }; postPatch = '' @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478 ] ++ lib.optionals (!withNetworkManager) [ "--disable-libnm" ] ++ lib.optionals (!withPython) [ 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 99839d9c99..fb3399ee56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,88 +1,90 @@ { lib , stdenv -, buildPackages , fetchFromGitLab -, pkg-config -, pcre2 -, perl -, flex + +, ApplicationServices +, asciidoctor +, bcg729 , bison -, gettext -, libpcap -, libnl +, buildPackages , c-ares +, cmake +, flex +, gettext +, glib +, gmp , gnutls +, libcap , libgcrypt , libgpg-error -, libmaxminddb -, libopus -, bcg729 -, spandsp3 , libkrb5 -, speexdsp +, libmaxminddb +, libnl +, libopus +, libpcap , libsmi -, lz4 -, snappy -, zstd -, minizip -, sbc -, openssl -, lua5 -, python3 -, libcap -, glib , libssh -, nghttp2 -, zlib -, cmake -, ninja +, lua5 +, lz4 , makeWrapper +, minizip +, nghttp2 +, ninja +, openssl +, pcre2 +, perl +, pkg-config +, python3 +, sbc +, snappy +, spandsp3 +, speexdsp +, SystemConfiguration , wrapGAppsHook +, zlib +, zstd + , withQt ? true , qt6 ? null -, ApplicationServices -, SystemConfiguration -, gmp -, asciidoctor }: assert withQt -> qt6 != null; -let - version = "4.0.8"; - variant = if withQt then "qt" else "cli"; -in -stdenv.mkDerivation { - pname = "wireshark-${variant}"; - inherit version; +stdenv.mkDerivation rec { + pname = "wireshark-${if withQt then "qt" else "cli"}"; + version = "4.0.10"; + outputs = [ "out" "dev" ]; src = fetchFromGitLab { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo="; + hash = "sha256-R8CoatIZC7vkKn4UZ3G7h5qBexfKMdJJ0swi+IxAjG0="; }; - cmakeFlags = [ - "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" - "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" - # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DLEMON_C_COMPILER=cc" - "-DUSE_qt6=ON" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DHAVE_C99_VSNPRINTF_EXITCODE=0" - "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" + patches = [ + ./wireshark-lookup-dumpcap-in-path.patch ]; - # Avoid referencing -dev paths because of debug assertions. - env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + ]; - nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ] - ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ]; - - depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + asciidoctor + bison + cmake + flex + makeWrapper + ninja + perl + pkg-config + python3 + ] ++ lib.optionals withQt [ + qt6.wrapQtAppsHook + wrapGAppsHook + ]; buildInputs = [ gettext @@ -109,14 +111,49 @@ stdenv.mkDerivation { c-ares glib zlib - ] ++ lib.optionals withQt (with qt6; [ qtbase qtmultimedia qtsvg qttools qt5compat ]) - ++ lib.optionals (withQt && stdenv.isLinux) [ qt6.qtwayland ] - ++ lib.optionals stdenv.isLinux [ libcap libnl sbc ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; + ] ++ lib.optionals withQt (with qt6; [ + qt5compat + qtbase + qtmultimedia + qtsvg + qttools + ]) ++ lib.optionals (withQt && stdenv.isLinux) [ + qt6.qtwayland + ] ++ lib.optionals stdenv.isLinux [ + libcap + libnl + sbc + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + gmp + SystemConfiguration + ]; strictDeps = true; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; + cmakeFlags = [ + "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" + # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DLEMON_C_COMPILER=cc" + "-DUSE_qt6=ON" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DHAVE_C99_VSNPRINTF_EXITCODE=0" + "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" + ]; + + # Avoid referencing -dev paths because of debug assertions. + env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; + + dontFixCmake = true; + # Prevent double-wrapping, inject wrapper args manually instead. + dontWrapGApps = true; + + shellHook = '' + # to be able to run the resulting binary + export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 + ''; postPatch = '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt @@ -151,31 +188,20 @@ stdenv.mkDerivation { cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ ''); - dontFixCmake = true; - - # Prevent double-wrapping, inject wrapper args manually instead. - dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - shellHook = '' - # to be able to run the resulting binary - export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 - ''; - meta = with lib; { - homepage = "https://www.wireshark.org/"; - changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; description = "Powerful network protocol analyzer"; - license = licenses.gpl2Plus; - longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network protocol analyzer developed by an international team of networking experts. It runs on UNIX, macOS and Windows. ''; - + homepage = "https://www.wireshark.org"; + changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html"; + license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz paveloom ]; mainProgram = if withQt then "wireshark" else "tshark"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix index 3114a9b7c3..91875c1b55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ssb-patchwork/default.nix @@ -47,7 +47,7 @@ in ''; homepage = "https://www.scuttlebutt.nz/"; license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ]; + maintainers = with maintainers; [ asymmetric picnoir cyplo ]; mainProgram = "ssb-patchwork"; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix index 419fabc934..bd571b1aed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, backintime-common, python3 }: +{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }: let python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]); @@ -21,6 +21,29 @@ mkDerivation { preFixup = '' wrapQtApp "$out/bin/backintime-qt" \ - --prefix PATH : "${backintime-common}/bin:$PATH" + --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" + + substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ + --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + + substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \ + --replace "/usr/bin/backintime-qt" "backintime-qt" + + substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \ + --replace "'which'" "'${lib.getBin which}/bin/which'" \ + --replace "/bin/su" "${lib.getBin su}/bin/su" \ + --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \ + --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ + --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" + + substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ + --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ + --replace "/usr/share/backintime" "$out/share/backintime" + + substituteInPlace "$out/bin/backintime-qt_polkit" \ + --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + + wrapProgram "$out/bin/backintime-qt_polkit" \ + --prefix PATH : "${lib.getBin polkit}/bin:$PATH" ''; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix index e3234af43d..7386c32c27 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix @@ -7,13 +7,12 @@ , pkg-config , wrapGAppsHook4 , cairo +, dbus , gdk-pixbuf , glib , graphene -, gtk3 , gtk4 , libadwaita -, libappindicator-gtk3 , librclone , pango , rclone @@ -21,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4="; + hash = "sha256-U+2imF4hUDJAwwf/RFZXfOgTxA+O8c6C+CzQoEQreJw="; }; - cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY="; + cargoHash = "sha256-9DrJoXT/uD8y7y2r58DMuURSaic+TtlnPPbw/gq9jPA="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -64,10 +63,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cairo + dbus gdk-pixbuf glib graphene - gtk3 gtk4 libadwaita librclone @@ -76,7 +75,6 @@ rustPlatform.buildRustPackage rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}" --prefix PATH : "${lib.makeBinPath [ rclone ]}" ) ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index d82981f2f0..26343f6a76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.64.0"; + version = "1.64.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-miXYBKUTmsqAvVLmxcVCpjgEO3HeKQpUZKSvzaxhqdU="; + hash = "sha256-gOFOcqCgFAiTc6W3v8Z917hGCzxluswqnuOoUht73GA="; }; - vendorHash = "sha256-rpF44yd8ElOkXTT1lSW0l3ZwTqeNdGS1OxrvNY8atzA="; + vendorHash = "sha256-eYIGVCTvUfGbsIMFthEfD0r6aeA7Ly9xJ8PJ6hR2SjA="; subPackages = [ "." ]; @@ -41,6 +41,10 @@ buildGoModule rec { ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell installShellCompletion rclone.$shell done + + # filesystem helpers + ln -s $out/bin/rclone $out/bin/rclonefs + ln -s $out/bin/rclone $out/bin/mount.rclone '' + lib.optionalString (enableCmount && !stdenv.isDarwin) # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, # as the setuid wrapper is required as non-root on NixOS. @@ -59,6 +63,7 @@ buildGoModule rec { homepage = "https://rclone.org"; changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; + mainProgram = "rclone"; maintainers = with maintainers; [ marsam SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 9df26b6bb8..1baf1c40eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; + patches = [ + # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 + # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 + ./rsync-fortified-strlcpy-fix.patch + ]; + buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch new file mode 100644 index 0000000000..296445b4bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch @@ -0,0 +1,49 @@ +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; + diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index f8b381b438..154906bf2e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.89.2"; + version = "1.90.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-tbzdfKA3ojwTvJ+t7jLLy3iKQ/x/0lXDcb2w1XcyEhs="; + hash = "sha256-VEO9LV6hzEd4IDnSPE5H0CDlwgRFEg4cheDx/RUGQug="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-AME5EM2j7PQ/DodK+3BiVepTRbwMqqItQbmCJ2lrGM8="; + vendorHash = "sha256-R713WhFrWT7Cgstk3SLuvvyk3/ZtT1LOH0qqmFcWzKw="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix index 6c6dddee17..7424a3da04 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-12-19"; + version = "unstable-2023-07-11"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; - sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; + rev = "3b52ef573129fb799319630bd438717761111f57"; + sha256 = "sha256-TwHWeTVzUo42t1erD7lMT4vdXiV3/9Hy1sPnrvJpQE8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index daa54ae05a..35c6620c34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.25.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-HDzAqnWRfBlRHVf3V7+Y1IPH4QmZiRpxpEzOUgOYgUk="; + hash = "sha256-R7JTHlNP1guKRfiDjPVi1lnvfUAXuPDNDAMTGmbj3Hc="; }; - vendorHash = "sha256-I/ul8ocHPlvtgbTR+/1FyqF0IbHZZSoAFe/0RFJtOYk="; + vendorHash = "sha256-XYXIj+7xe33hCYM6Z9tqGSgr/P0LVlaPNf3T0PrxU7I="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix b/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix index 01c79a1153..ad4c40cd4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.9.7"; + version = "0.10.4"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-PMcpVBJVJNX+5vICubBUqlyHC0CEZC9EGUfw6O3pCeA="; + hash = "sha256-/31QKCyMeEdpP59B+iXS5hL9W5sWz7R/I2nxBtj+0s4="; }; - vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU="; + vendorHash = "sha256-xYBiO6Zm32Do19I/cm4T6fubXY++Bhkn+RNAmKzM5cY="; subPackages = [ "cmd/trayscale" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix index 4e9bb7f820..d9ee62affa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "upnp-router-control"; - version = "0.3.3"; + version = "0.3.4"; src = fetchzip { url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; - hash = "sha256-d5NmA1tOQtYPjGXYfH0p9CCnWM+aVTX2KuV36QCDxd8="; + hash = "sha256-28F/OB2fHemn7HLVFEDmefRA5AsEaQKy+Qbcv75z9w0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix b/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix index 04d58e74da..4187da1bfa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix @@ -5,6 +5,7 @@ , pkg-config , perl , openssl +, rust-jemalloc-sys , python3 , wrapQtAppsHook , qtbase @@ -173,6 +174,7 @@ rec { buildInputs = [ openssl + rust-jemalloc-sys ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index e99c0fedf9..3e281d59bc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -8,15 +8,16 @@ , gtk3 , xdg-user-dirs , keybinder3 +, libnotify }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.2"; + version = "0.3.8"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE="; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; + hash = "sha256-3ICeKSqzx1zp/KpaAFl9qLSaugWm4HZrKjrDCWz9ok4="; stripRoot = false; }; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 keybinder3 + libnotify ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix b/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix index c490be2381..af8ceeb4b7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/autokey/default.nix @@ -6,17 +6,19 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify +, gnome +, wmctrl }: python3Packages.buildPythonApplication rec { pname = "autokey"; - version = "0.95.10"; + version = "0.96.0"; src = fetchFromGitHub { owner = "autokey"; repo = "autokey"; rev = "v${version}"; - sha256 = "0f0cqfnb49wwdy7zl2f2ypcnd5pc8r8n7z7ssxkq20d4xfxlgamr"; + hash = "sha256-d1WJLqkdC7QgzuYdnxYhajD3DtCpgceWCAxGrk0KKew="; }; # Tests appear to be broken with import errors within the project structure @@ -35,8 +37,20 @@ python3Packages.buildPythonApplication rec { pyinotify xlib pygobject3 + packaging ]; + runtimeDeps = [ + gnome.zenity + wmctrl + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]} --prefix PATH : ${ lib.makeBinPath runtimeDeps }) + ''; + postInstall = '' # remove Qt version which we currently do not support rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index 91fea99ff1..cd640e89bf 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DLINK_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=OFF" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" "-DLINK_MUJS=OFF" "-DLINK_GUMBO=ON" diff --git a/third_party/nixpkgs/pkgs/applications/office/bookletimposer/default.nix b/third_party/nixpkgs/pkgs/applications/office/bookletimposer/default.nix index 6bdaf63b77..87dbbbb732 100644 --- a/third_party/nixpkgs/pkgs/applications/office/bookletimposer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/bookletimposer/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = [ gtk3 - (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ])) + (python3.withPackages (ps: with ps; [ distutils-extra pypdf2 pygobject3 ])) ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix b/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix index 37afa6cc22..efd20632a2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/clockify/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clockify"; - version = "2.0.3"; + version = "2.1.6"; src = fetchurl { - url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb"; - sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8="; + url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; + hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify" $out/bin + --replace "/opt/Clockify/" "" makeWrapper ${electron}/bin/electron $out/bin/clockify \ --add-flags $out/opt/Clockify/resources/app.asar @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://clockify.me"; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "clockify"; platforms = [ "x86_64-linux" ]; - }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index b7e2105a94..2e869daff5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.1"; + version = "1.26.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; + hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools_scm>=8.0' 'setuptools_scm' + ''; + preCheck = '' export HOME=$TEMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index eacda570cc..7c378bc52a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchFromGitHub , fetchurl , fetchpatch , aqbanking @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { # Upstream uploaded a -1 tarball on the same release, remove on next release - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2"; hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; }; @@ -97,12 +98,29 @@ stdenv.mkDerivation rec { enableParallelChecking = true; checkTarget = "check"; + passthru.docs = stdenv.mkDerivation { + pname = "gnucash-docs"; + inherit version; + + src = fetchFromGitHub { + owner = "Gnucash"; + repo = "gnucash-docs"; + rev = version; + hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 libxslt ]; + }; + preFixup = '' gappsWrapperArgs+=( + # documentation + --prefix XDG_DATA_DIRS : ${passthru.docs}/share # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # gsettings schema location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} ) ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 88091fa4b0..105ec84568 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome }: +, libsoup_3, gnome }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.6.6"; + version = "5.7.1"; src = fetchurl { url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ZW/N8YUU8r7SYY/+hqVYrqYW/KQqtuChfQJxXftl3A4="; + hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; - buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix index ae522f53e6..8a1b435cf2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix @@ -15,25 +15,25 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0="; + hash = "sha256-VK3sSXYW/Dev7jCdkgrU9PXFbJ6+R2hy6QMRjj6bJ5M="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c="; + hash = "sha256-KfS13p+mjIh7VShVCT6vFuQY0e/EO/sENOx4GPAORHU="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY="; + hash = "sha256-8M0VZI5I4fLoLLmXkIVeCqouww+CyiXbd+vJc8+2tIs="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ] diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json index b3492b71e6..9c392b0820 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.3.0", + "version": "4.4.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -27,9 +27,10 @@ "devDependencies": { "@types/mime": "^3.0.1", "@types/node": "^18.7.18", - "electron": "^25.5.0", - "electron-builder": "^24.6.3", - "typescript": "~4.9.5" + "@types/typo-js": "^1.2.1", + "electron": "^27.0.2", + "electron-builder": "^24.6.4", + "typescript": "~5.2.2" }, "dependencies": { "dictionary-en": "^3.0.0", diff --git a/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix b/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix index 166210704a..b7d53507c4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/mytetra/default.nix @@ -23,6 +23,10 @@ mkDerivation rec { substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" + + # https://github.com/xintrea/mytetra_dev/issues/164 + substituteInPlace thirdParty/mimetex/mimetex.c \ + --replace "const char *strcasestr" "char *strcasestr" ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 7d9346c153..c5c291511e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , buildNpmPackage , nixosTests , gettext @@ -19,13 +20,13 @@ }: let - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; + hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +52,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; + npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; nativeBuildInputs = [ python3 @@ -91,6 +92,16 @@ python.pkgs.buildPythonApplication rec { inherit version src; + patches = [ + # https://github.com/paperless-ngx/paperless-ngx/pull/4146 + (fetchpatch { + name = "fix-tests-for-python311.patch"; + url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; + hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; + }) + ]; + + nativeBuildInputs = [ gettext ]; @@ -204,7 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zipp zope_interface - zxing_cpp + zxing-cpp ] ++ redis.optional-dependencies.hiredis ++ twisted.optional-dependencies.tls @@ -213,13 +224,13 @@ python.pkgs.buildPythonApplication rec { postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works # for files in `python.sitePackages` - ${python.pythonForBuild.interpreter} -OO -m compileall src + ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src # Collect static files - ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input # Compile string translations using gettext - ${python.pythonForBuild.interpreter} src/manage.py compilemessages + ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages ''; installPhase = '' @@ -242,7 +253,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = with python.pkgs; [ daphne - factory_boy + factory-boy imagehash pdfminer-six pytest-django diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix index ee4fe040bf..d434e000da 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -1,8 +1,15 @@ -{ buildPythonPackage, lib, fetchFromGitLab +{ buildPythonPackage +, lib +, fetchFromGitLab -, isPy3k, isPyPy +, isPy3k +, isPyPy -, distro, setuptools, psutil +, distro +, setuptools +, psutil +, certifi +, setuptools-scm , pkgs }: @@ -10,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-core"; @@ -17,23 +25,33 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_core/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro setuptools psutil + certifi ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; preBuild = '' make l10n_compile ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "Backend part of Paperwork (Python API, no UI)"; homepage = "https://openpaper.work/"; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 9566a60106..cd0290f087 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -9,6 +9,7 @@ , pillow , pygobject3 , distro +, setuptools-scm , pkgs }: @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/openpaperwork-gtk"; @@ -23,12 +25,18 @@ buildPythonPackage rec { disabled = !isPy3k && !isPyPy; patchPhase = '' - echo 'version = "${version}"' > src/openpaperwork_gtk/_version.py chmod a+w -R .. patchShebangs ../tools ''; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index cbb5749642..95608b26e2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,6 +1,5 @@ { buildPythonPackage , lib -, fetchpatch , fetchFromGitLab , pyenchant , scikit-learn @@ -8,7 +7,6 @@ , pycountry , whoosh , termcolor -, levenshtein , pygobject3 , pyocr , natsort @@ -24,34 +22,30 @@ , shared-mime-info , libreoffice , unittestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + format = "pyproject"; sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch - (fetchpatch { - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/0f5cf0fe7ef223000e02c28e4c7576f74a778fe6.patch"; - hash = "sha256-NIK3j2TdydfeK3/udS/Pc+tJa/pPkfAmSPPeaYuaCq4="; - }) ]; patchFlags = [ "-p2" ]; postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein - - echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ distro gtk3 @@ -63,7 +57,6 @@ buildPythonPackage rec { pygobject3 pyocr pypillowfight - levenshtein poppler_gi scikit-learn termcolor @@ -74,6 +67,7 @@ buildPythonPackage rec { gettext shared-mime-info which + setuptools-scm ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index d4ae3070d9..9950075d6b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -13,7 +13,7 @@ , gettext , gobject-introspection , gdk-pixbuf -, texlive +, texliveSmall , imagemagick , perlPackages , writeScript @@ -21,9 +21,7 @@ let documentation_deps = [ - (texlive.combine { - inherit (texlive) scheme-small wrapfig gensymb; - }) + (texliveSmall.withPackages (ps: with ps; [ wrapfig gensymb ])) xvfb-run imagemagick perlPackages.Po4a @@ -34,6 +32,7 @@ in python3Packages.buildPythonApplication rec { inherit src version; pname = "paperwork"; + format = "pyproject"; sample_docs = sample_documents // { # a trick for the update script @@ -43,21 +42,13 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/paperwork-gtk"; - # Patch out a few paths that assume that we're using the FHS: - postPatch = '' - substituteInPlace setup.py \ - --replace python-Levenshtein Levenshtein + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' chmod a+w -R .. patchShebangs ../tools export HOME=$(mktemp -d) - - cat - ../AUTHORS.py > src/paperwork_gtk/_version.py < src/paperwork_shell/_version.py chmod a+w -R .. patchShebangs ../tools ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ openpaperwork-core @@ -37,6 +40,7 @@ buildPythonPackage rec { fabulous getkey psutil + rich ]; nativeCheckInputs = [ @@ -44,7 +48,12 @@ buildPythonPackage rec { openpaperwork-gtk ]; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ + pkgs.gettext + pkgs.which + setuptools-scm + ]; + preBuild = '' make l10n_compile ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix index 6323c2c417..ad0a071bd4 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; + sha256 = "sha256-OFVj9INDiOpGd5N3ziMBWt3/IdmpInc+jEAxW3GcvOA="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index cf7b59f6fa..e507692d62 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.4"; + version = "0.65.6"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-2+1lwaO2+kq/EjJoA4EvGCMLH6iErR9KtWINLoO17+w="; + hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix index e90184b522..ff7ce41212 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -46,6 +46,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 67f0bbc0ad..1303afb9d6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.10.0"; + version = "23.11.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-wPZrKAWaWv88BeVu6e73b9/Ydo0ew4GLig46fyNSxtc="; + hash = "sha256-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix index 2d9148b482..c576319643 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.3.0"; + version = "6.5.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-axdkoqCLg0z1kLa/S0kS4d8yGFuKJRDPRte9c8PYniU="; + sha256 = "sha256-RO8PhEjvDye6p6vgqNexIJ1ymTlVtF8yWQAUbJGaZYk="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index 813c29e1ef..f2940b1e3f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.3.2"; + version = "4.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; + hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo - substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " + substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " installShellCompletion --zsh contrib/completion/zsh/_todo ''; @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { "todoman" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' @@ -90,9 +90,9 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; - license = licenses.isc; - maintainers = with maintainers; [ leenaars antonmosich ]; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ leenaars antonmosich ]; mainProgram = "todo"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 67fa25115f..8376b49b81 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11704"; + version = "11.1.0.11708"; src = if useChineseVersion then fetchurl { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE="; + hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk="; } else fetchurl { url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI="; + hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4="; }; unpackCmd = "dpkg -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix index c9e787f6d9..b21f3edaa5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.75.1"; + version = "0.75.2"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; + hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + mainProgram = "zim"; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 9be6994d6a..32e42a8b94 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.27"; + version = "6.0.30"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-+nCPLVVBkEu0g2Kxt/XYAt6sYxYm05nPcmPNS2OejRs="; + hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index 6ce255675b..21b80fcf51 100644 --- a/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "QubesOS"; repo = pname; rev = "v${version}"; - sha256 = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; + hash = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0"; }; buildInputs = [ xen ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index b64771be55..073909b80e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,16 +8,16 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.9"; + version = "2.5.0"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-sygkddnSou1U2ZEwNhKvHCkFEl91pYSYOjbKPLqgGj4="; + hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo="; }; - postPath = '' + postPatch = '' substituteInPlace index.php \ --replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');" ''; diff --git a/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix index 5f130c2665..3a5d85f994 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/csdr/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csdr"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "sha256-Cmms+kQzTP+CMDRXCbtWuizosFe9FywLobjBOUA79O0="; + sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix index e5af2fc020..99503d5d03 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix @@ -8,6 +8,7 @@ , hamlib , hamlibSupport ? true , perl +, portaudio , python3 , espeak , udev @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "direwolf"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; rev = version; - sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5"; + hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4="; }; nativeBuildInputs = [ cmake ]; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix b/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix index 6c3fbc16c4..329d87d80f 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/ebook2cw/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert ebooks to Morse MP3s/OGGs"; - homepage = "http://fkurz.net/ham/ebook2cw.html"; + homepage = "https://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix index 8eb813af97..483fbfc291 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flamp/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "flamp"; - version = "2.2.07"; + version = "2.2.09"; src = fetchgit { url = "https://git.code.sf.net/p/fldigi/flamp"; rev = "v${finalAttrs.version}"; - hash = "sha256-BnKL1iwaw1iJC5qcGCvdMr461n0BSYxk61dbAnhpz2c="; + hash = "sha256-ev+Ik/e1zQGTH4FeiCDPHbrcXlctencEo4R0+M2Kg+g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix index c2aa051e70..e660f0c9da 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.03"; + version = "2.0.04"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-/5hOryoupl7MYWekx2hL3q+2GMXA6rohjvYy2XTkJBI="; + sha256 = "sha256-+AcQ7l1RXFDVVraYySBUE/+ZCyCOMiM2L4LyRXFquUc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix index cd4e69529e..66a932b9c9 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix @@ -25,16 +25,18 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-SBWwAmIsa9HfaZpH8TioMm9IaoZ+x4HNHaOBps0vA0A="; + hash = "sha256-3SQ3a1gg4/cXy8BJXazTgh6nkS/KQpM0fCA6JcbHOPc="; }; postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" sed -i "/hdiutil/d" src/CMakeLists.txt diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 074f46a7fa..dc8df16838 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.17"; + version = "2.17.3"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-QnwkiH8KqoHa2Q3knh0OAyGBySAArEtdpO+lTzqJ4j0="; + hash = "sha256-dHbDy/aIsqBQG1raeN9nM/QtiFgy+Qhoj/ThN8LV6gI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix index d909751969..49e13f4ab0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gridtracker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.0402"; + version = "1.23.1112"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-6SQuFN8Fi0fbWCYrQIIeSaXR2haI7uux4txCPKEoJvo="; + sha256 = "sha256-0A1/P57RtUExxflr2XayHPEyr28B6UDYY7pVCAJpWX0="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix index a08293c8ef..c7f1891e2c 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub, cmake -, fetchpatch , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT @@ -8,25 +7,15 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "22.09.1"; + version = "23.10.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY="; + sha256 = "sha256-o58UNc4r+MQbH00727YTV17M7D29BbH8CgUXCORKk7E="; }; - patches = [ - # Pull gcc-13 fix pending upstream inclusion: - # https://github.com/myriadrf/LimeSuite/pull/384 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/myriadrf/LimeSuite/commit/4ab51835d0fde4ffe6b7be2ac3dfa915e7d4d26e.patch"; - hash = "sha256-53nLeluMtTPXxchbpftPE8Z1QMyi0UKp+0nRF4ufUgo="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index ec26a7ddb9..776313d491 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "multimon-ng"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; rev = version; - sha256 = "sha256-Qk9zg3aSrEfC16wQqL/EMG6MPobX8dnJ1OLH8EMap0I="; + sha256 = "sha256-IJnvOVajkcjaa0DDo8hbkkVvBnDqPKQUN8wJHlafo70="; }; buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix index 440c1c955a..ed3fa1715f 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - sha256 = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; + hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index f55371fd68..1a986b6b0d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -24,7 +24,7 @@ , libbladeRF , mbelib , ninja -, opencv3 +, opencv4 , pkg-config , qtcharts , qtdeclarative @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.16.0"; + version = "7.17.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-k35TZ2H8GX3gSYyb27hTY6gHHnxPkFwp1v4OJXhvV7A="; + hash = "sha256-v2ESMFAbsYbZVVIHlGCU01QPDorUZyLiUEhexr6zF5o="; }; nativeBuildInputs = [ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { libusb1 limesuite mbelib - opencv3 + opencv4 qtcharts qtdeclarative qtgamepad diff --git a/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix b/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix index 085706658a..a207ba2f14 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/tqsl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { openssl zlib lmdb - (curl.override { inherit openssl; }) + curl wxGTK32 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index 5dbed65484..6a196cdea3 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -49,9 +49,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uhd"; - # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "4.4.0.0"; + # NOTE: Use the following command to update the package, and the uhdImageSrc attribute: + # + # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true + # + version = "4.5.0.0"; outputs = [ "out" "dev" ]; @@ -59,14 +61,24 @@ stdenv.mkDerivation (finalAttrs: { owner = "EttusResearch"; repo = "uhd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; + # The updateScript relies on the `src` using `hash`, and not `sha256. To + # update the correct hash for the `src` vs the `uhdImagesSrc` + hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; - sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; + # Please don't convert this to a hash, in base64, see comment near src's + # hash. + sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly"; + }; + passthru = { + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file + ]; }; - # TODO: Add passthru.updateScript that will update both of the above hashes... cmakeFlags = [ "-DENABLE_LIBUHD=ON" diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/update.sh b/third_party/nixpkgs/pkgs/applications/radio/uhd/update.sh new file mode 100755 index 0000000000..e52fb05904 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix nix-prefetch-github + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift +latest_release=$(curl --silent https://api.github.com/repos/EttusResearch/uhd/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-) +# Update version, if needed +if grep -q 'version = "'$version $fname; then + echoerr Current version $version is the latest available + exit 0; +fi +echoerr got version $version +sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname +# Verify the sed command above did not fail +grep -q $version $fname +# Update srcHash +srcHash="$(nix-prefetch-github EttusResearch uhd --rev v${version} | jq --raw-output .hash)" +sed -i -E 's#(hash = ").*(";)#\1'$srcHash'\2#g' $fname +grep -q $srcHash $fname +imageHash="$(nix-prefetch-url https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz)" +sed -i -E 's#(sha256 = ").*(";)#\1'$imageHash'\2#g' $fname +grep -q $imageHash $fname diff --git a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix index 00cc0eaca1..23fb34db0e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/wsjtx/default.nix @@ -1,27 +1,22 @@ -{ lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, - docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, +{ lib, stdenv, fetchgit, asciidoc, asciidoctor, cmake, pkg-config, + fftw, fftwFloat, gfortran, hamlib_4, libtool, libusb1, qtbase, qtmultimedia, qtserialport, qttools, boost, texinfo, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "wsjtx"; version = "2.6.1"; - # This is a "superbuild" tarball containing both wsjtx and a hamlib fork - src = fetchurl { - url = "https://sourceforge.net/projects/wsjt/files/wsjtx-${version}/wsjtx-${version}.tgz"; - sha256 = "sha256-YNDiy0WkmmrVhbCQiCGp/yw6wlZNYQQmIP82wt3Mdl8="; + src = fetchgit { + url = "http://git.code.sf.net/p/wsjt/wsjtx"; + rev = "wsjtx-${version}"; + hash = "sha256-fELx3B9JqCCL5vaIHab3of5ah9qdu5lemqjUnvY5DdM="; }; - # Hamlib builds with autotools, wsjtx builds with cmake - # Omitting pkg-config because it causes issues locating the built hamlib nativeBuildInputs = [ - asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool - qttools texinfo wrapQtAppsHook + asciidoc asciidoctor cmake gfortran libtool + pkg-config qttools texinfo wrapQtAppsHook ]; - buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport boost ]; - - # Remove Git dependency from superbuild since sources are included - patches = [ ./super.patch ]; + buildInputs = [ fftw fftwFloat hamlib_4 libusb1 qtbase qtmultimedia qtserialport boost ]; meta = with lib; { description = "Weak-signal digital communication modes for amateur radio"; @@ -33,9 +28,8 @@ stdenv.mkDerivation rec { contacts under extreme weak-signal conditions. ''; homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html"; - # Older licenses are for the statically-linked hamlib - license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; + license = with licenses; [ gpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ lasandell numinit ]; + maintainers = with maintainers; [ lasandell numinit melling ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/super.patch b/third_party/nixpkgs/pkgs/applications/radio/wsjtx/super.patch deleted file mode 100644 index 2d72fcddf0..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/wsjtx/super.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84fa38a..87e31bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ source tarball." ) - # - # Find_library (USB_LIBRARY NAMES libusb.a usb) - Find_program (PATCH_EXECUTABLE patch REQUIRED) --Find_package (Git REQUIRED) - - # - # extra C flags to minimize hamlib excutable sizes diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix index 69f4011f27..a1fef6404e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnuastro"; - version = "0.20"; + version = "0.21"; src = fetchurl { url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-kkuLtqwc0VFj3a3Dqb/bi4jKx7UJnV+CHs7bw/Cwac0="; + sha256 = "sha256-L7qZPYQiORUXtV9+tRF4iUbXqIaqFYSYT9Rni90nU38="; }; nativeBuildInputs = [ libtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index ce29c5172a..14c684d432 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ="; + sha256 = "sha256-uEgzvhlHHpXyvi3Djfwg3GmYeZq+r48m7OJFIDARpe4="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index d656c39d0b..3b61c8dac2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -70,7 +70,9 @@ stdenv.mkDerivation rec { qtwayland ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = '' + export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major version}0101 +%s) + '' + lib.optionalString stdenv.isDarwin '' export LC_ALL=en_US.UTF-8 ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix index 92cb420139..7678029812 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedtools"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc="; + sha256 = "sha256-rrk+FSv1bGL0D1lrIOsQu2AT7cw2T4lkDiCnzil5fpg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bioawk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bioawk/default.nix new file mode 100644 index 0000000000..cfbb1a551f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bioawk/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, bison +, zlib +}: + +stdenv.mkDerivation { + pname = "bioawk"; + version = "unstable-2017-09-11"; + + src = fetchFromGitHub { + owner = "lh3"; + repo = "bioawk"; + rev = "fd40150b7c557da45e781a999d372abbc634cc21"; + hash = "sha256-WWgz96DPP83J45isWkMbgEvOlibq6WefK//ImV6+AU0="; + }; + + nativeBuildInputs = [ + bison + installShellFiles + ]; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 bioawk -t $out/bin + mv awk.1 bioawk.1 + installManPage bioawk.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "BWK awk modified for biological data"; + homepage = "https://github.com/lh3/bioawk"; + license = licenses.hpnd; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix index daae9c0961..48537a568e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix @@ -13,20 +13,20 @@ }: let pname = "blast-bin"; - version = "2.13.0"; + version = "2.14.1"; srcs = rec { x86_64-linux = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-linux.tar.gz"; - hash = "sha256-QPK3OdT++GoNI1NHyEpu2/hB2hqHYPQ/vNXFAVCwVEc="; + hash = "sha256-OO8MNOk6k0J9FlAGyCOhP+hirEIT6lL+rIInB8dQWEU="; }; aarch64-linux = fetchurl { - url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-arm-linux.tar.gz"; - hash = "sha256-vY8K66k7KunpBUjFsJTTb+ur5n1XmU0/mYxhZsi9ycs="; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz"; + hash = "sha256-JlOyoxZQBbvUcHIMv5muTuGQgrh2uom3rzDurhHQ+FM="; }; x86_64-darwin = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz"; - hash = "sha256-Y0JlOUl9Ego6LTxTCNny3P5c1H3fApPXQm7Z6Zhq9RA="; + hash = "sha256-eMfuwMCD6VlDgeshLslDhYBBp0YOpL+6q/zSchR0bAs="; }; aarch64-darwin = x86_64-darwin; }; @@ -55,6 +55,7 @@ stdenv.mkDerivation { meta = with lib; { inherit (blast.meta) description homepage license; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ natsukium ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index 954b704be0..356e90555f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,26 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib, python3, perl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, python3 +, tbb +, zlib +, runCommand +, bowtie2 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bowtie2"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "BenLangmead"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HaiZmWU6akHXJVWBmCvkG2E61NDrAP7UIxx9DNCEZqE="; + repo = "bowtie2"; + rev = "refs/tags/v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-rWeopeYuCk9ZhJX2SFCcxZWcjXjjTiVRiwkzLQcIgd0="; }; + # because of this flag, gcc on aarch64 cannot find the Threads + # Could NOT find Threads (missing: Threads_FOUND) + # TODO: check with other distros and report upstream + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-m64" "" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ tbb zlib python3 perl ]; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) ["-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"]; + + # ctest fails because of missing dependencies between tests + doCheck = false; + + passthru.tests = { + ctest = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + ${lib.getExe bowtie2} -x ${finalAttrs.src}/example/index/lambda_virus ${finalAttrs.src}/example/reads/longreads.fq -u 10 + ${bowtie2}/bin/bowtie2-build-s -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/small + ${bowtie2}/bin/bowtie2-inspect-s $out/small + ${bowtie2}/bin/bowtie2-build-l -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/large + ${bowtie2}/bin/bowtie2-inspect-l $out/large + ''; + }; + meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; - broken = stdenv.isAarch64; # only x86 is supported + mainProgram = "bowtie2"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix index eaf0b59327..a199e41d50 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix @@ -2,15 +2,17 @@ with python.pkgs; buildPythonApplication rec { pname = "deepTools"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "deeptools"; repo = "deepTools"; rev = version; - sha256 = "07v8vb2x4b0mgw0mvcj91vj1fqbcwizwsniysl2cvmv93gad8gbp"; + sha256 = "sha256-A8YdlMptmJyxWW0EYLjXFIWjIO/mttEC7VYdlCe9MaI="; }; + format = "pyproject"; + propagatedBuildInputs = [ numpy numpydoc @@ -21,9 +23,10 @@ buildPythonApplication rec { matplotlib plotly deeptoolsintervals + importlib-metadata ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; @@ -36,7 +39,7 @@ buildPythonApplication rec { publication-ready visualizations to identify enrichments and for functional annotations of the genome. ''; - license = licenses.gpl3; + license = with licenses; [ mit bsd3 ]; maintainers = with maintainers; [ scalavision ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix index 1c39d209c3..52e2980980 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-oBIY8s/ippf+Xw+3QzMwP0Esc/QpiT6yWeAnqpMix6s="; + hash = "sha256-IxZPbcM52E1bzy6msGmka6Ykgc+OLWTMhWBCn0E4mFI="; }; buildInputs = [ 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 78f226350f..febfde548f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -3,6 +3,7 @@ , cmake , eigen , fetchFromGitHub +, fetchpatch , libcifpp , libmcfp , zlib @@ -15,18 +16,26 @@ let inherit (oldAttrs.src) owner repo rev; hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; }; + patches = [ + (fetchpatch { + # https://github.com/PDB-REDO/libcifpp/issues/51 + name = "fix-build-on-darwin.patch"; + url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch"; + hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0="; + }) + ]; }); in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.3"; + version = "4.4.4.1"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM="; + hash = "sha256-sy6GBCnTGRD1YP00dKIolkr1RMboLGcd0f4kU8gCOnA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix index 34d997252f..8f60b8b991 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/kssd/default.nix @@ -1,38 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, zlib +, kssd +, runCommand +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kssd"; - version = "1.1"; + version = "2.21"; src = fetchFromGitHub { owner = "yhg926"; repo = "public_kssd"; - rev = "v${version}"; - sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-D/s1jL2oKE0rSdRMVljskYFsw5UPOv1L95Of+K+e17w="; }; patches = [ - # Pull upstream patch for -fno-common toolchain support: - # https://github.com/yhg926/public_kssd/pull/9 + # https://github.com/yhg926/public_kssd/pull/11 (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch"; - sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4="; + name = "allocate-enough-memory.patch"; + url = "https://github.com/yhg926/public_kssd/commit/b1e66bbcc04687bc3201301cd742a0b26a87cb5d.patch"; + hash = "sha256-yFyJetpsGKeu+H6Oxrmn5ea4ESVtblb3YJDja4JEAEM="; }) ]; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ zlib libtool ]; + buildInputs = [ zlib ]; installPhase = '' - install -vD kssd $out/bin/kssd + runHook preInstall + + install -vD kssd $out/bin/kssd + + runHook postInstall ''; + passthru.tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + ${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -r ${kssd.src}/test_fna/seqs1 -o $out/reference + ${lib.getExe kssd} dist -L ${kssd.src}/shuf_file/L3K10.shuf -o $out/query ${kssd.src}/test_fna/seqs2 + ${lib.getExe kssd} dist -r $out/reference -o $out/distout $out/query + ''; + }; + meta = with lib; { description = "K-mer substring space decomposition"; license = licenses.asl20; homepage = "https://github.com/yhg926/public_kssd"; maintainers = with maintainers; [ unode ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; + mainProgram = "kssd"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index 8ec08f22b7..7cf1560d24 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1471"; + version = "1499"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-HQ2C7SFfJS6TOJZUm6szhu+hMm41BnH8A7DZE5yh9fM="; + hash = "sha256-uofXtGGDloM1FxW0PYKKwfDOPlAJiapGVKwd1clFzp8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix index 253f4a43a8..3e39fcb291 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mmseqs2/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mmseqs2"; - version = "14-7e284"; + version = "15-6f452"; src = fetchFromGitHub { owner = "soedinglab"; repo = pname; rev = version; - sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU="; + sha256 = "sha256-L+zOWrGkCLz/wqpBuji8H4/93sDFpcfnDOE8FHq1j84="; }; nativeBuildInputs = [ cmake xxd perl installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index e0555055c1..880ea77e9d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-6nnKYnml6BjLb6aKNHbd55nH6gP/5Somo8poxx7yhVk="; + sha256 = "sha256-FcefUf0KwAEEn53XubrB2991ncsCMKicf20fJG6LurQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/poretools/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix index e5ee4b5308..f280f81fae 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.pythonForBuild.interpreter} setup.py install \ + ${python.pythonOnBuildForHost.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix index d02d472662..0cc20b0635 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/raxml/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "RAxML${lib.optionalString useMpi "-mpi"}"; - version = "8.2.12"; + version = "8.2.13"; src = fetchFromGitHub { owner = "stamatak"; repo = "standard-RAxML"; rev = "v${version}"; - sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; + sha256 = "sha256-w+Eqi0GhVira1H6ZnMNeZGBMzDjiGT7JSFpQEVXONyk="; }; buildInputs = lib.optionals useMpi [ mpi ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/trimal/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/trimal/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/vcftools/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix index 2a892dd562..228c77ee5c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/apbs/default.nix @@ -33,6 +33,10 @@ let "-DBUILD_SUPERLU=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + }; + buildInputs = [ blas superlu @@ -65,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace "include(ImportFETK)" "" \ --replace 'import_fetk(''${FETK_VERSION})' "" + + # U was removed in python 3.11 because it had no effect + substituteInPlace tools/manip/inputgen.py \ + --replace '"rU"' '"r"' ''; nativeBuildInputs = [ @@ -88,6 +96,10 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_TESTS=1" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix index 052d791c0b..16eabbcbca 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix @@ -28,8 +28,16 @@ , spfft , enableElpa ? false , elpa -, gpuBackend ? "none" , cudaPackages +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) # gpuVersion needs to be set for both CUDA as well as ROCM hardware. # gpuArch is only required for the ROCM stack. # Change to a value suitable for your target GPU. @@ -37,11 +45,6 @@ # and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems , gpuVersion ? "Mi100" , gpuArch ? "gfx908" -, rocm-core -, hip -, hipblas -, hipfft -, rocblas }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -86,7 +89,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableElpa elpa ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optional (gpuBackend == "rocm") [hip rocm-core hipblas hipfft rocblas] + ++ lib.optional (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocm-core + rocmPackages.hipblas + rocmPackages.hipfft + rocmPackages.rocblas + ] ; propagatedBuildInputs = [ mpi ]; @@ -126,7 +135,7 @@ stdenv.mkDerivation rec { ${lib.strings.optionalString (gpuBackend == "rocm") '' GPUVER = ${gpuVersion} OFFLOAD_CC = hipcc - OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocm-core} + OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocmPackages.rocm-core} OFFLOAD_TARGET = hip CXX = mpicxx CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ @@ -144,7 +153,8 @@ stdenv.mkDerivation rec { -fopenmp -ftree-vectorize -funroll-loops \ -I${lib.getDev libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ -I${lib.getDev sirius}/include/sirius \ - -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include + -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include \ + -fallow-argument-mismatch LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index e5807c6c10..5794d7077a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -12,7 +12,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin + openglSupport ? !stdenv.isDarwin, libGL }: let @@ -21,17 +21,17 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.61"; + version = "2.64"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-rDhYVMDTH9mSu90HZAX8ap4HF//8fYhW/ozzJdIrUgo="; + sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw="; }; nativeBuildInputs = [ pkg-config file ]; buildInputs = with lib; [ gtk2 fftw ] ++ - optional openglSupport gnome2.gtkglext ++ + optionals openglSupport [ gnome2.gtkglext libGL ] ++ optional openexrSupport openexr ++ optional libXmuSupport xorg.libXmu ++ optional fitsSupport cfitsio ++ 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 f80085278e..0b99c9a849 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.1.41"; + version = "16.1.43"; 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-91vPipS5FTqCl7BUSu47aApIfq2e8dD1SW/LEGQWWio="; + hash = "sha256-lqHlnAeJKbj2Xs9AeAKqdWMWkmD8xWR7f3+nJsBx2YE="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index 0f4d76c3f2..5f08bebd47 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "23.4.0"; + version = "23.12.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-+jzGcuAcbXOwsyAL+Hr9Fas2vO2S8ZKSaZeCf/bnl7A="; + hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix index d5c97aa17f..a7d9462a7f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix @@ -54,13 +54,13 @@ let in stdenv.mkDerivation rec { pname = "nwchem"; - version = "7.2.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "nwchemgit"; repo = "nwchem"; rev = "v${version}-release"; - hash = "sha256-/biwHOSMGpdnYRGrGlDounKKLVaG2XkBgCmpE0IKR/Y="; + hash = "sha256-BcYRqPaPR24OTRY0MJgBxi46HvUG4uFaY0unZmu5b9k="; }; nativeBuildInputs = [ @@ -106,6 +106,9 @@ stdenv.mkDerivation rec { # Overwrite script, skipping the download echo -e '#!/bin/sh\n cd ga-${versionGA};autoreconf -ivf' > src/tools/get-tools-github + # /usr/bin/env bash fails in sandbox/Makefile setting + substituteInPlace src/config/makefile.h --replace '/usr/bin/env bash' "${stdenv.shell}" + patchShebangs ./ ''; 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 f8ebf5251f..33c77c063b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -8,7 +8,7 @@ , blas-ilp64 , hdf5-cpp , python3 -, texlive +, texliveMinimal , armadillo , libxc , makeWrapper @@ -43,14 +43,14 @@ let in stdenv.mkDerivation { pname = "openmolcas"; - version = "23.06"; + version = "23.10"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; # The tag keeps moving, fix a hash instead - rev = "1cda3772686cbf99a4af695929a12d563c795ca2"; # 2023-06-12 - sha256 = "sha256-DLRQsRy2jt8V8q2sKmv2hLuKCuMihp/+zcMY/3sg1Fk="; + rev = "c74317e68572d1da82fdce4210b005c2c1b1de53"; # 2023-09-25 + hash = "sha256-wBrASZ6YFsWsu/TreEZ6Q+VxNQwCwMpyPC8AOqmNxos="; }; patches = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation { perl gfortran cmake - texlive.combined.scheme-minimal + texliveMinimal makeWrapper autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index 9d643c6eda..98c35c37e8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dsview"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM="; + sha256 = "sha256-LwrlB+Nwq34YjwGmnbUWS3W//ZHr8Do2Wf2te+2oBeI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix index 775bae9813..160928633a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, groff, pkg-config, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { pname = "geda"; @@ -9,12 +9,20 @@ stdenv.mkDerivation rec { hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; + patches = [ + (fetchpatch { + name = "geda-1.10.2-drop-xorn.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch?id=5589cc7bc6c4f18f75c40725a550b8d76e7f5ca1"; + hash = "sha256-jPQaHjEDwCEfZqDGku+xyIMl5WlWlVcpPv1W6Xf8Grs="; + }) + ]; + configureFlags = [ "--disable-update-xdg-database" "--without-libfam" ]; - nativeBuildInputs = [ groff pkg-config python2 ]; + nativeBuildInputs = [ autoreconfHook groff pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix new file mode 100644 index 0000000000..8ce75a6ce2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -0,0 +1,58 @@ +{ lib +, cppzmq +, curl +, fetchFromGitHub +, glm +, gtkmm3 +, libarchive +, libepoxy +, libgit2 +, librsvg +, libuuid +, opencascade-occt +, pkg-config +, podofo +, sqlite +}: + +# This base is used in horizon-eda and python3Packages.horizon-eda +rec { + pname = "horizon-eda"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "horizon-eda"; + repo = "horizon"; + rev = "v${version}"; + hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cppzmq + curl + glm + gtkmm3 + libarchive + libepoxy + libgit2 + librsvg + libuuid + opencascade-occt + podofo + sqlite + ]; + + CASROOT = opencascade-occt; + + meta = with lib; { + description = "A free EDA software to develop printed circuit boards"; + homepage = "https://horizon-eda.org"; + maintainers = with maintainers; [ guserav jue89 ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index c4c1e798dd..1fbc92f061 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -1,62 +1,33 @@ { stdenv , boost +, callPackage , coreutils -, cppzmq -, curl -, libepoxy -, fetchFromGitHub -, glm -, gtkmm3 -, lib -, libarchive -, libgit2 -, librsvg , libspnav -, libuuid -, opencascade-occt -, pkg-config -, podofo , python3 -, sqlite , wrapGAppsHook }: +let + base = callPackage ./base.nix { }; +in stdenv.mkDerivation rec { - pname = "horizon-eda"; - version = "2.5.0"; + inherit (base) pname version src meta CASROOT; - src = fetchFromGitHub { - owner = "horizon-eda"; - repo = "horizon"; - rev = "v${version}"; - sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + # provide base for python module + passthru = { + inherit base; }; - buildInputs = [ - cppzmq - curl - libepoxy - glm - gtkmm3 - libarchive - libgit2 - librsvg + buildInputs = base.buildInputs ++ [ libspnav - libuuid - opencascade-occt - podofo - python3 - sqlite ]; - nativeBuildInputs = [ + nativeBuildInputs = base.nativeBuildInputs ++ [ boost.dev - pkg-config wrapGAppsHook + python3 ]; - CASROOT = opencascade-occt; - installFlags = [ "INSTALL=${coreutils}/bin/install" "DESTDIR=$(out)" @@ -64,12 +35,4 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - - meta = with lib; { - description = "A free EDA software to develop printed circuit boards"; - homepage = "https://horizon-eda.org"; - maintainers = with maintainers; [ guserav ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/default.nix new file mode 100644 index 0000000000..5170e7efce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/default.nix @@ -0,0 +1,5 @@ +{ kicad }: +{ + kikit = kicad.callPackage ./kikit.nix { addonName = "kikit"; }; + kikit-library = kicad.callPackage ./kikit.nix { addonName = "kikit-library"; }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/kikit.nix new file mode 100644 index 0000000000..6e5fc5ad96 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/addons/kikit.nix @@ -0,0 +1,52 @@ +# For building the multiple addons that are in the kikit repo. +{ stdenv +, bc +, kikit +, zip +, python3 +, addonName +, addonPath +}: +let + # This python is only used when building the package, it's not the python + # environment that will ultimately run the code packaged here. The python env defined + # in KiCad will import the python code packaged here when KiCad starts up. + python = python3.withPackages (ps: with ps; [ click ]); + kikit-module = python3.pkgs.toPythonModule (kikit.override { inherit python3; }); + + # The following different addons can be built from the same source. + targetSpecs = { + "kikit" = { + makeTarget = "pcm-kikit"; + resultZip = "pcm-kikit.zip"; + description = "KiCad plugin and a CLI tool to automate several tasks in a standard KiCad workflow"; + }; + "kikit-library" = { + makeTarget = "pcm-lib"; + resultZip = "pcm-kikit-lib.zip"; + description = "KiKit uses these symbols and footprints to annotate your boards (e.g., to place a tab in a panel)."; + }; + }; + targetSpec = targetSpecs.${addonName}; +in +stdenv.mkDerivation { + name = "kicadaddon-${addonName}"; + inherit (kikit-module) src version; + + nativeBuildInputs = [ python bc zip ]; + propagatedBuildInputs = [ kikit-module ]; + + buildPhase = '' + patchShebangs scripts/setJson.py + make ${targetSpec.makeTarget} + ''; + + installPhase = '' + mkdir $out + mv build/${targetSpec.resultZip} $out/${addonPath} + ''; + + meta = kikit-module.meta // { + description = targetSpec.description; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 3403e410cf..a2e5bbe72a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + # https://gitlab.com/kicad/code/kicad/-/issues/15687 + ./runtime_stock_data_path.patch ]; # tagged releases don't have "unknown" diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index a49c813036..c6c66839e4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,6 @@ { lib, stdenv +, runCommand +, newScope , fetchFromGitLab , gnome , dconf @@ -11,6 +13,8 @@ , callPackages , librsvg , cups +, unzip +, jq , pname ? "kicad" , stable ? true @@ -18,6 +22,7 @@ , libngspice , withScripting ? true , python3 +, addons ? [ ] , debug ? false , sanitizeAddress ? false , sanitizeThreads ? false @@ -27,6 +32,14 @@ , symlinkJoin }: +# `addons`: https://dev-docs.kicad.org/en/addons/ +# +# ```nix +# kicad = pkgs.kicad.override { +# addons = with pkgs.kicadAddons; [ kikit kikit-library ]; +# }; +# ``` + # The `srcs` parameter can be used to override the kicad source code # and all libraries, which are otherwise inaccessible # to overlays since most of the kicad build expression has been @@ -106,6 +119,32 @@ let wxGTK = wxGTK32; python = python3; wxPython = python.pkgs.wxPython_4_2; + addonPath = "addon.zip"; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; + + addonsJoined = + runCommand "addonsJoined" + { + inherit addonsDrvs; + nativeBuildInputs = [ unzip jq ]; + } '' + mkdir $out + + for pkg in $addonsDrvs; do + unzip $pkg/addon.zip -d unpacked + + folder_name=$(jq .identifier unpacked/metadata.json --raw-output | tr . _) + for d in unpacked/*; do + if [ -d "$d" ]; then + dest=$out/share/kicad/scripting/$(basename $d)/$folder_name + mkdir -p $(dirname $dest) + + mv $d $dest + fi + done + rm -r unpacked + done + ''; inherit (lib) concatStringsSep flatten optionalString optionals; in @@ -113,6 +152,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable baseName; inherit kicadSrc kicadVersion; @@ -131,7 +171,7 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (withScripting) - [ wxPython python.pkgs.six python.pkgs.requests ]; + [ wxPython python.pkgs.six python.pkgs.requests ] ++ addonsDrvs; nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) @@ -164,6 +204,17 @@ stdenv.mkDerivation rec { "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" "--set-default KICAD7_TEMPLATE_DIR ${template_dir}" ] + ++ optionals (addons != [ ]) ( + let stockDataPath = symlinkJoin { + name = "kicad_stock_data_path"; + paths = [ + "${base}/share/kicad" + "${addonsJoined}/share/kicad" + ]; + }; + in + [ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] + ) ++ optionals (with3d) [ "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch new file mode 100644 index 0000000000..16f7e493c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch @@ -0,0 +1,15 @@ +diff --git a/common/paths.cpp b/common/paths.cpp +index a74cdd9..790cc58 100644 +--- a/common/paths.cpp ++++ b/common/paths.cpp +@@ -151,6 +151,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir ) + { + wxString path; + ++ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { ++ return path; ++ } ++ + if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) ) + { + // Allow debugging from build dir by placing relevant files/folders in the build root diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch deleted file mode 100644 index 1cef96ea14..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/scripts/makedbh b/scripts/makedbh -index 01e4fa5..d6299c6 100755 ---- a/scripts/makedbh -+++ b/scripts/makedbh -@@ -1,4 +1,4 @@ --#!/bin/csh -f -+#!/usr/bin/env tcsh - # - # makes the "database.h" (1st argument, $1) file from "database.h.in" - # (2nd argument, $2), setting various mask operation definitions diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix index fc68969bd4..c816b35626 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.277"; + version = "8.3.447"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY="; + sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U="; }; nativeBuildInputs = [ python3 ]; @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; - patches = [ - ./0001-strip-bin-prefix.patch - ]; - meta = with lib; { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; 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 94e0741f79..dc4991bf48 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; + hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix index 0ce67ec4db..593e9d9187 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-9/1sgxFqn9d9zlwrzjQosFO3m+2lC83qVcCtzfqY5XY="; + sha256 = "sha256-C7TLOuC0CHredDiWFIAFmOlV8ivX0j4bs3b8IB8FsqE="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index 90601651e5..0c2adf0907 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "5.012"; + version = "5.018"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Y6GkIgkauayJmGhOQg2kWjbcxYVIob6InMopv555Lb8="; + hash = "sha256-f06UzNw2MQ5me03EPrVFhkwxKum/GLDzQbDNTBsJMJs="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix index 0a93759947..06e8a94a4c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilog/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # NOTE(jleightcap): the `make check` target only runs a "Hello, World"-esque sanity check. # the tests in the doInstallCheck phase run a full regression test suite. # however, these tests currently fail upstream on aarch64 diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix index 456b939c60..826181139c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xschem"; - version = "3.1.0"; + version = "3.4.4"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; rev = version; - sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA="; + sha256 = "sha256-1jP1SJeq23XNkOQgcl2X+rBrlka4a04irmfhoKRM1j4="; }; nativeBuildInputs = [ bison flex pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index aee1d25a04..663d6e025c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -16,7 +16,7 @@ , trilinos , withMPI ? false # for doc -, texlive +, texliveMedium , pandoc , enableDocs ? true # for tests @@ -81,16 +81,14 @@ stdenv.mkDerivation rec { gfortran libtool_2 ] ++ lib.optionals enableDocs [ - (texlive.combine { - inherit (texlive) - scheme-medium + (texliveMedium.withPackages (ps: with ps; [ koma-script optional framed enumitem multirow - preprint; - }) + preprint + ])) ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix deleted file mode 100644 index 0cc8bcb0fb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl -, intltool, libtool, pkg-config }: - -stdenv.mkDerivation rec { - pname = "drgeo"; - version = "1.1.0"; - - hardeningDisable = [ "format" ]; - - src = fetchurl { - url = "mirror://sourceforge/ofset/${pname}-${version}.tar.gz"; - sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc"; - }; - patches = [ ./struct.patch ]; - - nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [libglade gtk2 guile libxml2 - perl libtool ]; - - prebuild = '' - cp drgeo.desktop.in drgeo.desktop - ''; - - meta = with lib; { - description = "Interactive geometry program"; - homepage = "https://sourceforge.net/projects/ofset"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/struct.patch b/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/struct.patch deleted file mode 100644 index 7364cae5f5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/drgeo/struct.patch +++ /dev/null @@ -1,68 +0,0 @@ --- drgeo-1.1.0/debian/patches/00list -++ drgeo-1.1.0/debian/patches/00list -@ -7 +7 @@ - -07-fix_ftbfs-gcc-4.5.dpatch -nly in patch2: -nchanged: --- drgeo-1.1.0.orig/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch -++ drgeo-1.1.0/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch -@ -0,0 +1,58 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07-fix_ftbfs-gcc-4.5.dpatch by Fabrice Coutadeur -## -## Description: fix FTBFS with gcc 4.5 with undefined reference to -## `drgeoDialogData' -## Author: Petr Gajdos -## Origin: https://build.opensuse.org/package/files?package=drgeo&project=openSUSE%3A11.3%3AContrib - -...@dpatch@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.cc drgeo-1.1.0/geo/drgeo_dialog.cc ---- drgeo-1.1.0~/geo/drgeo_dialog.cc 2003-10-27 10:17:25.000000000 +0000 -+++ drgeo-1.1.0/geo/drgeo_dialog.cc 2010-11-13 07:26:03.258908003 +0000 -@@ -38,12 +38,7 @@ - // Used in the style dialod callback, I know it's ugly, but so easy - static drgeoFigure *selected_figure; - --struct --{ -- drgeoPoint mouse; -- drgeoFigure *figure; --} --drgeoDialogData; -+DialogData drgeoDialogData; - - - static void drgeo_edit_dialog_cb (GtkWidget * dialog, -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.h drgeo-1.1.0/geo/drgeo_dialog.h ---- drgeo-1.1.0~/geo/drgeo_dialog.h 2003-06-12 22:30:23.000000000 +0000 -+++ drgeo-1.1.0/geo/drgeo_dialog.h 2010-11-13 07:26:03.258908003 +0000 -@@ -34,4 +34,11 @@ - } - - #endif /* __cplusplus */ -+ -+typedef struct -+{ -+ drgeoPoint mouse; -+ drgeoFigure *figure; -+} DialogData; -+ - #endif -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc ---- drgeo-1.1.0~/geo/drgeo_figure.cc 2005-07-14 07:30:01.000000000 +0000 -+++ drgeo-1.1.0/geo/drgeo_figure.cc 2010-11-13 07:26:03.258908003 +0000 -@@ -48,12 +48,7 @@ - #include "drgeo_dialog.h" - #include "traite.h" - --extern struct --{ -- drgeoPoint mouse; -- drgeoFigure *figure; --} --drgeoDialogData; -+extern DialogData drgeoDialogData; - - typedef struct drgeoSearchValue - { diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix index 728cbe6229..790a9b2d21 100644 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.25"; + version = "2.26"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1j4fsPQEaftqmrdk6ZPWKSl7ywA/UPN8bdddGVlPxDQ="; + sha256 = "sha256-8zKPPpbp66tD2zMmcv2H5xeCSdDhUk0uYPhqwpGqx9Y="; }; buildInputs = [ expat ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix index 1d4a11bfb3..1685bb7aba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchFromGitHub -, readline, cmake +{ lib +, stdenv +, fetchFromGitHub +, readline +, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abc-verifier"; - version = "unstable-2023-09-13"; + version = "unstable-2023-10-13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "daad9ede0137dc58487a0abc126253e671a85b14"; - hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ="; + rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43"; + hash = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - installPhase = "mkdir -p $out/bin && mv abc $out/bin"; + installPhase = '' + runHook preInstall + install -Dm755 'abc' "$out/bin/abc" + runHook postInstall + ''; # needed by yosys - passthru.rev = src.rev; + passthru.rev = finalAttrs.src.rev; meta = with lib; { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice Luflosi ]; mainProgram = "abc"; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix index 1d0c72359c..7e4cfad72e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/abella/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "abella"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; - sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; + sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; strictDeps = true; - nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml dune_3 menhir findlib ]); + buildInputs = with ocamlPackages; [ cmdliner yojson ]; installPhase = '' mkdir -p $out/bin - rsync -av abella $out/bin/ + rsync -av _build/default/src/abella.exe $out/bin/abella mkdir -p $out/share/emacs/site-lisp/abella/ rsync -av emacs/ $out/share/emacs/site-lisp/abella/ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix index 15c45466b1..5b9e8f62aa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/aiger/default.nix @@ -5,10 +5,15 @@ stdenv.mkDerivation rec { version = "1.9.9"; src = fetchurl { - url = "http://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; + url = "https://fmv.jku.at/aiger/${pname}-${version}.tar.gz"; sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; + patches = [ + # Fix implicit declaration of `isatty`, which is an error with newer versions of clang. + ./fix-missing-header.patch + ]; + enableParallelBuilding = true; configurePhase = '' @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; - homepage = "http://fmv.jku.at/aiger/"; + homepage = "https://fmv.jku.at/aiger/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/third_party/nixpkgs/pkgs/applications/science/logic/aiger/fix-missing-header.patch new file mode 100644 index 0000000000..5f0101bd7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/aiger/fix-missing-header.patch @@ -0,0 +1,11 @@ +diff -ur a/aigunconstraint.c b/aigunconstraint.c +--- a/aigunconstraint.c 2013-10-06 09:08:03.000000000 -0400 ++++ b/aigunconstraint.c 2023-10-27 08:55:01.678566389 -0400 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + static const char * USAGE = + "usage: aigunconstraint [-h][-v] [ []]\n" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index eb7637f7f2..bc8c6ae485 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-nPjWmg5FepObhquioYxhVPq6UdOHtCo2Hs5V0yndYB0="; + hash = "sha256-9GDBcBH49sheO5AjmDsznMEbw0JSrnSOcIIRN40/aJU="; }; in 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 a49aea8d40..a9b27877ab 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.5.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-3H/vowWfE1jfomYg2hOi3B3zjWa4CaLHAJXnoKWzskU="; + sha256 = "sha256-hY7+gTwBqQegbm5RjLKhM2vfBOjIRz797Z6wd6usj9s="; }; outputs = [ "out" "dev" "lib" ]; @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shnarazk ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://fmv.jku.at/cadical"; + homepage = "https://fmv.jku.at/cadical/"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index fe8180899c..9717e69e9c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -217,7 +217,7 @@ self = stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = "https://coq.inria.fr"; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix index f056b3e433..66ba807c8d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,31 +2,42 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.05"; + version = "2.07"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs="; + hash = "sha256-GXXql4+JZ396BM6W2I3kN0u59xos7UCAtzR0IjMIETY="; }; + /* Fix up the frontend to load the 'default' cryptoverif library + ** from under $out/libexec. By default, it expects to find the files + ** in $CWD which doesn't work. */ + postPatch = '' + substituteInPlace ./src/syntax.ml \ + --replace \"default\" \"$out/libexec/default\" + ''; + strictDeps = true; nativeBuildInputs = [ ocaml ]; - /* Fix up the frontend to load the 'default' cryptoverif library - ** from under $out/libexec. By default, it expects to find the files - ** in $CWD which doesn't work. */ - patchPhase = '' - substituteInPlace ./src/syntax.ml \ - --replace \"default\" \"$out/libexec/default\" + buildPhase = '' + runHook preBuild + + ./build + + runHook postBuild ''; - buildPhase = "./build"; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec cp ./cryptoverif $out/bin cp ./default.cvl $out/libexec cp ./default.ocvl $out/libexec + + runHook postInstall ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix index cfa8f62990..0385909610 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; + url = "https://cs.nyu.edu/acsys/cvc3/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym"; }; @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { [ raskin ]; platforms = platforms.unix; license = licenses.free; - homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; + homepage = "https://cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { updateInfo = { - downloadPage = "http://www.cs.nyu.edu/acsys/cvc3/download.html"; + downloadPage = "https://cs.nyu.edu/acsys/cvc3/download.html"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix index 400d636346..ec1fc6b11d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "2.6"; + version = "3.0"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "sha256-qh896qIpFR5g1gdWAwGkbNJLBqUQCeCpuoYHHkDXPt0="; + hash = "sha256-gBgDC+GH948JMsjzo/SOpWDzJXu0g58YX1VW28PeorI="; }; buildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix index 5f982508c8..d170334052 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "kissat"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "arminbiere"; repo = "kissat"; rev = "rel-${version}"; - sha256 = "sha256-AFUVkkD+toOfVEvIKfz3ncEdABLRxs9yQ8aJx6Q0ETM="; + sha256 = "sha256-zK20/vhbVihrxmd52DjByDUO99pBAr8SlJtQpX5fmwY="; }; outputs = [ "out" "dev" "lib" ]; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shnarazk ]; platforms = platforms.unix; license = licenses.mit; - homepage = "http://fmv.jku.at/kissat"; + homepage = "https://fmv.jku.at/kissat"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix index 12465ad908..ecc929cb5f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; + hash = "sha256-56YtHCiNMP5fJoddSokEl0ws06IwetYLer4aLCnujZA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix index 48def5fc2e..1fef05069a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/picosat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "965"; src = fetchurl { - url = "http://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; + url = "https://fmv.jku.at/picosat/${pname}-${version}.tar.gz"; sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; - homepage = "http://fmv.jku.at/picosat/"; + homepage = "https://fmv.jku.at/picosat/"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ roconnor thoughtpolice ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index 57220aa523..5cd0e5ff9e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "proverif"; - version = "2.04"; + version = "2.05"; src = fetchurl { url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz"; - sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9"; + hash = "sha256-SHH1PDKrSgRmmgYMSIa6XZCASWlj+5gKmmLSxCnOq8Q="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix index d8c762de60..5c7be408bf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix @@ -11,17 +11,18 @@ , uhdm , antlr4 , capnproto +, nlohmann_json }: stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.73"; + version = "1.76"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-z47Eqs3fP53pbEb3s66CqMiO4UpEwox+fKakxtRBakQ="; + hash = "sha256-Vg9NZrgzFRVIsEbZQe8DItDhFOVG1XZoQWBrLzVNwLU="; fetchSubmodules = false; # we use all dependencies from nix }; @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { uhdm capnproto antlr4.runtime.cpp + nlohmann_json ]; cmakeFlags = [ @@ -50,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSURELOG_USE_HOST_UHDM=On" "-DSURELOG_USE_HOST_GTEST=On" "-DSURELOG_USE_HOST_ANTLR=On" + "-DSURELOG_USE_HOST_JSON=On" "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix index c611ccdf5b..ec25d58efc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix @@ -9,13 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; - version = "1.74"; + # When updating this package, also consider updating science/logic/surelog + version = "1.77"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-DiwLo/3RcXY+wG2+7aDx4p6UuQm/eNX/kG35TJzIbe0="; + hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/vampire/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/vampire/default.nix index 253c88705a..a3c1aa3f13 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/vampire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/vampire/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = "https://github.com/vprover/vampire/pull/54.patch"; + url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = "https://github.com/vprover/vampire/pull/55.patch"; + url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index 9fe39c8cef..6165cfe8bd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -47,7 +47,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: configurePhase = concatStringsSep " " ( - [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index d3ca419c48..f4cc1f1fbf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng -, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texLive, tk, xz, zlib +, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "R"; - version = "4.3.1"; + version = "4.3.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jdC/JPECPG9hjDsxc4PSkbSklPQNc7mDrCL/6pnkupk="; + sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo="; }; outputs = [ "out" "tex" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu + pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu bison imake which blas lapack curl tcl tk jdk tzdata ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 5af927294d..42c1603935 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -1,12 +1,13 @@ { config, stdenv, lib , fetchFromGitHub , fetchurl +, fetchpatch , cmake , boost , gflags , glog , hdf5-cpp -, opencv3 +, opencv4 , protobuf , doxygen , blas @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + (fetchpatch { + name = "support-opencv4"; + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; + }) ] ++ lib.optional pythonSupport (substituteAll { src = ./python.patch; inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy @@ -148,7 +154,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; - broken = pythonSupport && (python.isPy310); + broken = (pythonSupport && (python.isPy310)) || cudaSupport; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index 0c70a6e03b..86ec445d9b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "calc"; - version = "2.14.3.5"; + version = "2.15.0.1"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/v${finalAttrs.version}/calc-${finalAttrs.version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/calc-${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-4eXs6NDfsJO5Vr9Mo2jC16hTRAyt++1s+Z/JrWDKwUk="; + hash = "sha256-u/mt9y4805IWYDdEHz94dPb4V+d4YVrrhzz8v3B+q24="; }; postPatch = '' - substituteInPlace Makefile \ + substituteInPlace Makefile.target \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix index c7d19f044d..52a74ff397 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/clp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: stdenv.mkDerivation rec { - version = "1.17.8"; + version = "1.17.9"; pname = "clp"; src = fetchFromGitHub { owner = "coin-or"; repo = "Clp"; rev = "releases/${version}"; - hash = "sha256-3Z6ysoCcDVB8UePiwbZNqvO/o/jgPcv6XFkpJZBK+Os="; + hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix deleted file mode 100644 index 91d208a56e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, fetchpatch -, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi -, onebitSGDSupport ? false -, config -, cudaSupport ? config.cudaSupport, cudaPackages ? { }, addOpenGLRunpath, cudatoolkit, nvidia_x11 -, cudnnSupport ? cudaSupport -}: - -let - inherit (cudaPackages) cudatoolkit cudnn; -in - -assert cudnnSupport -> cudaSupport; -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; - -let - # Old specific version required for CNTK. - cub = fetchFromGitHub { - owner = "NVlabs"; - repo = "cub"; - rev = "1.7.4"; - sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; - }; - -in stdenv.mkDerivation rec { - pname = "CNTK"; - version = "2.7"; - - src = fetchFromGitHub { - owner = "Microsoft"; - repo = "CNTK"; - rev = "v${version}"; - sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI="; - fetchSubmodules = true; - }; - - patches = [ - # Fix build with protobuf 3.18+ - # Remove with onnx submodule bump to 1.9+ - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch"; - extraPrefix = "Source/CNTKv2LibraryDll/proto/onnx/onnx_repo/"; - stripLen = 1; - sha256 = "00raqj8wx30b06ky6cdp5vvc1mrzs7hglyi6h58hchw5lhrwkzxp"; - }) - ]; - - postPatch = '' - # Fix build with protobuf 3.18+ - substituteInPlace Source/CNTKv2LibraryDll/Serialization.cpp \ - --replace 'SetTotalBytesLimit(INT_MAX, INT_MAX)' \ - 'SetTotalBytesLimit(INT_MAX)' \ - --replace 'SetTotalBytesLimit(limit, limit)' \ - 'SetTotalBytesLimit(limit)' - ''; - - nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath; - - # Force OpenMPI to use g++ in PATH. - OMPI_CXX = "g++"; - - # Uses some deprecated tensorflow functions - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] - ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional cudnnSupport cudnn; - - configureFlags = [ - "--with-opencv=${opencv3}" - "--with-libzip=${libzip.dev}" - "--with-openblas=${openblas.dev}" - "--with-boost=${boost.dev}" - "--with-protobuf=${protobuf}" - "--with-mpi=${mpi}" - "--cuda=${if cudaSupport then "yes" else "no"}" - # FIXME - "--asgd=no" - ] ++ lib.optionals cudaSupport [ - "--with-cuda=${cudatoolkit}" - "--with-gdk-include=${cudatoolkit}/include" - "--with-gdk-nvml-lib=${nvidia_x11}/lib" - "--with-cub=${cub}" - ] ++ lib.optional onebitSGDSupport "--1bitsgd=yes"; - - configurePhase = '' - sed -i \ - -e 's,^GIT_STATUS=.*,GIT_STATUS=,' \ - -e 's,^GIT_COMMIT=.*,GIT_COMMIT=v${version},' \ - -e 's,^GIT_BRANCH=.*,GIT_BRANCH=v${version},' \ - -e 's,^BUILDER=.*,BUILDER=nixbld,' \ - -e 's,^BUILDMACHINE=.*,BUILDMACHINE=machine,' \ - -e 's,^BUILDPATH=.*,BUILDPATH=/homeless-shelter,' \ - -e '/git does not exist/d' \ - Tools/generate_build_info - - patchShebangs . - mkdir build - cd build - ${lib.optionalString cudnnSupport '' - mkdir cuda - ln -s ${cudnn}/include cuda - export configureFlags="$configureFlags --with-cudnn=$PWD" - ''} - - ../configure $configureFlags - ''; - - installPhase = '' - mkdir -p $out/bin - # Moving to make patchelf remove references later. - mv lib $out - cp bin/cntk $out/bin - ''; - - postFixup = lib.optionalString cudaSupport '' - for lib in $out/lib/*; do - addOpenGLRunpath "$lib" - done - ''; - - meta = with lib; { - homepage = "https://github.com/Microsoft/CNTK"; - description = "An open source deep-learning toolkit"; - license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ abbradar ]; - # Newer cub is included with cudatoolkit now and it breaks the build. - # https://github.com/Microsoft/CNTK/issues/3191 - # broken = cudaSupport; - broken = true; # at 2022-11-23 - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix index 3cc9290a76..d5ab38ff75 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/colpack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A package comprising of implementations of algorithms for vertex coloring and derivative computation"; - homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; + homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ edwtjo ]; 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 8abcd96f08..603a3c4f60 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 = "unstable-2023-08-03"; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "f202cf0c342e54e994c4d416daecc1b1dc8b9c98"; - hash = "sha256-kp4zWTPYt2DiuPgTK+ib8NbKg2BJVxJDDCvIlWNuwgs="; + rev = "043895fbaed27a4baace7c7c0c1f69ea5a9f3d1a"; + hash = "sha256-roPyRaT89I3HbyvBK/owiigMus1EeKEhhKHFsgfzp10="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix index 752b05fe4f..0dc12b6dcb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas +{ stdenv, lib, fetchurl, fetchpatch, texliveSmall, bison, flex, lapack, blas , autoreconfHook, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , buildPackages, readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL, libGLU, xorg, fltk @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook texlive.combined.scheme-small bison flex + autoreconfHook texliveSmall bison flex ]; # perl is only needed for patchShebangs fixup. diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index d65de87d8e..993da2b898 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake -, opencv3, gtest, blas, gomp, llvmPackages, perl +, opencv4, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest blas.provider ] + buildInputs = [ opencv4 gtest blas.provider ] ++ lib.optional stdenv.cc.isGNU gomp ++ lib.optional stdenv.cc.isClang llvmPackages.openmp # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix index 44647ce813..2480ff3eba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pari/default.nix @@ -7,7 +7,7 @@ , libpthreadstubs , perl , readline -, tex +, texliveBasic , withThread ? true }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libX11 perl readline - tex + texliveBasic ] ++ lib.optionals withThread [ libpthreadstubs ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix index 2e79ca0363..fe9210641d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "polymake"; - version = "4.10"; + version = "4.11"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-YDiyZtbUC76ZVe3oRtzPRBfkEU+qh+d1ZWFhzUyi+Pg="; + sha256 = "sha256-XfbwrNcAEZvQxLV2Z2KFL/vYV3ZbXcyIgC/10hCK3SM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix index efbf80ba16..08555d1264 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/readstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "readstat"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; + patches = [ + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; + hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libiconv ]; @@ -22,5 +29,6 @@ stdenv.mkDerivation rec { description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ swflint ]; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 9fe07603fe..97754c04d9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -104,11 +104,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc="; }) - # https://github.com/sagemath/sage/pull/36006, positively reviewed + # https://github.com/sagemath/sage/pull/36006, landed in 10.2.beta2 (fetchpatch { name = "gmp-6.3-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; - sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; + url = "https://github.com/sagemath/sage/commit/5e841de46c3baa99cd1145b36ff9163e9340a55c.diff"; + sha256 = "sha256-fJPDryLtGBQz9qHDiCkBwjiW2lN6v7HiHgxY7CTeHcs="; + }) + + # https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4 + (fetchpatch { + name = "matplotlib-3.8-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff"; + sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI="; + }) + + # https://github.com/sagemath/sage/pull/35658, landed in 10.1.beta2 + (fetchpatch { + name = "sphinx-7-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/cacd9a89b5c4fdcf84a8dd2b7d5bdc10cc78109a.diff"; + sha256 = "sha256-qJvliTJjR3XBc5pH6Q0jtm8c4bhtZcTcF3O04Ro1uaU="; + }) + + # https://github.com/sagemath/sage/pull/36296, landed in 10.2.beta4 + (fetchpatch { + name = "duplicate-args-region_plot.patch"; + url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff"; + sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index d8d5586e21..f8beabaac1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -78,6 +78,7 @@ , sphinx , sympy , typing-extensions +, nbclassic }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -181,6 +182,8 @@ buildPythonPackage rec { sphinx sympy typing-extensions + + nbclassic ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix index 1f06f0d1ae..f77bd5a922 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/singular/default.nix @@ -17,7 +17,7 @@ # use letters instead of numbers for post-appendix chapters, and we # want it to match the upstream format because sage depends on it. , texinfo4 -, texlive +, texliveSmall , enableDocs ? !stdenv.isDarwin , enableGfanlib ? true }: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { graphviz latex2html texinfo4 - texlive.combined.scheme-small + texliveSmall ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index c475dbd5ef..d30d560f47 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "23.02.1"; + version = "23.10.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - sha256 = "sha256-Lrj/oJNmKlCkNbnCGY2TewCospwajKdWgmKkreHzEIU="; + sha256 = "sha256-3zQzpw0KWNAAvML55O2FMlid9j0GtP8OWy1eqifzVwI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index 4721e94646..45209881f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.24.1"; + version = "7.24.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-CAzAKxNHG8ew9v2B1jK7MxfWGwTfdmDncDe7QT+twd8="; + hash = "sha256-Aaoqf53wagCkzkZUs7mVbE2Z2P6GvxiQYxPrL6ahGqA="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix index 4a8411cd34..2d830e3d10 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; }) + # Backport Python 3.11 fix to v5 from v6.26 + # https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc + ./root5-python311-fix.patch ]; # https://github.com/root-project/root/issues/13216 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 6dc630181b..d2172f614f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchurl +, fetchpatch , makeWrapper , cmake , coreutils @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.28.06"; + version = "6.28.08"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; + hash = "sha256-o+ZLTAH4fNm75X5h75a0FibkmwRGCVBw1B2b+6NSaGI="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/root5-python311-fix.patch b/third_party/nixpkgs/pkgs/applications/science/misc/root/root5-python311-fix.patch new file mode 100644 index 0000000000..3005b3a73f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/root5-python311-fix.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/pyroot/src/MethodProxy.cxx b/bindings/pyroot/src/MethodProxy.cxx +--- a/bindings/pyroot/src/MethodProxy.cxx ++++ b/bindings/pyroot/src/MethodProxy.cxx +@@ -4,10 +4,10 @@ + // Bindings + #include "PyROOT.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 +-#include "code.h" // from Python +-#else ++#if PY_VERSION_HEX < 0x02050000 + #include "compile.h" // from Python ++#elif PY_VERSION_HEX < 0x030b0000 ++#include "code.h" // from Python + #endif + #ifndef CO_NOFREE + // python2.2 does not have CO_NOFREE defined diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 1eded1e419..3acd66f790 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.29.0"; + version = "7.32.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UfUzvDo5OE1LGCBBGoDpxG96RKOaShbqu5TOOILG3AY="; + hash = "sha256-9KuMPqvM8ZCTuomc0R9MBxsK3KIpukDTrlwU6MHysK0="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { pandas pytestCheckHook requests-mock + pillow ]; disabledTestPaths = [ @@ -56,6 +57,8 @@ python3.pkgs.buildPythonApplication rec { "tests/test_tes.py" "tests/test_tibanna.py" "tests/test_linting.py" + "tests/test_google_lifesciences.py" + "tests/test_conda_python_script/test_script.py" ]; disabledTests = [ 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 a2d3f3d9a2..947cc2c7c3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -1,26 +1,32 @@ -{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew -, qtbase, wrapQtAppsHook, python3 -, cmake, libjpeg }: +{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew +, qtbase, wrapQtAppsHook, autoPatchelfHook, python3 +, cmake, libjpeg, llvmPackages }: stdenv.mkDerivation rec { pname = "tulip"; - version = "5.6.1"; + version = "5.7.2"; src = fetchurl { - url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; - sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw"; + url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz"; + hash = "sha256-b+XFCS6Ks+EpwxgYFzWdRomfCpHXmZHXnrQM+ZSLN/0="; }; - buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.isLinux [ libGLU libGL ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; + # error: format string is not a string literal (potentially insecure) + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-format-security"; + # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "A visualization framework for the analysis and visualization of relational data"; longDescription = @@ -36,6 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f6301ff6fc..2ca47d812b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -20,13 +20,17 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2023.2"; + version = "2023.3"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4="; + sha256 = "sha256-Tsj40MevdrE/j9FtuOLBIOdJ3kOa6VVNn2U/gS140cs="; }; + patches = [ ./pkgconfig.patch ]; + + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -64,10 +68,8 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/*.pc \ - --replace '=''${prefix}//' '=/' \ - --replace "$out/$out/" "$out/" + postInstall = '' + moveToOutput share/cmake $dev ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch new file mode 100644 index 0000000000..6740d23123 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch @@ -0,0 +1,24 @@ +diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in +index 646787cb53..9b97ad57f7 100644 +--- a/src/external/muparser/muparser.pc.in ++++ b/src/external/muparser/muparser.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PACKAGE_NAME@ + Description: Mathematical expressions parser library +diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein +index ec1ed6684e..ca1105474a 100644 +--- a/src/gromacs/libgromacs.pc.cmakein ++++ b/src/gromacs/libgromacs.pc.cmakein +@@ -1,4 +1,4 @@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: libgromacs@GMX_LIBS_SUFFIX@ + Description: Gromacs library diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix index 47fb7cf61d..87daa8cac8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/xnec2c/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , autoreconfHook +, wrapGAppsHook , pkg-config , which , gtk3 @@ -20,7 +21,12 @@ stdenv.mkDerivation rec { hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; }; - nativeBuildInputs = [ autoreconfHook pkg-config which ]; + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + pkg-config + which + ]; buildInputs = [ gtk3 blas lapack ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a57aec0301..0ff9233756 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.8"; + version = "4.2.9"; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtgraphicaleffects qtspeech qtx11extras ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wayland ]; - buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; + buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; preConfigure = '' @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EmGtVy/cHiZ2SqOOKmt9vCUQbyT5Sl8XnkRlhn9BdvA="; + sha256 = "sha256-nzBap5ldlLLLBB1ILkOktt9FnBqbo8MALLOETiqoAzk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index fdc8b6317a..51815c26ae 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE="; + hash = "sha256-vf0o0wBcG3878YD4mTUhni2aTUU9AJkG4an1oaRc4yw="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 0e7c6a27e2..528c82fe81 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , mkDerivation , qtbase -, qtquick1 , qmltermwidget , qtquickcontrols2 , qtgraphicaleffects @@ -28,7 +27,6 @@ mkDerivation rec { buildInputs = [ qtbase - qtquick1 qmltermwidget qtquickcontrols2 qtgraphicaleffects @@ -58,6 +56,6 @@ mkDerivation rec { homepage = "https://github.com/Swordfish90/cool-retro-term"; license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; }; } 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 98934dc2ec..ad9487b082 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.15.3"; + version = "1.16.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg="; + hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM="; }; separateDebugInfo = true; @@ -206,7 +206,7 @@ stdenv.mkDerivation { changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "A fast, lightweight and minimalistic Wayland terminal emulator"; license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; + maintainers = [ maintainers.sternenseemann maintainers.abbe ]; platforms = platforms.linux; # From (presumably) ncurses version 6.3, it will ship a foot # terminfo file. This however won't include some non-standard 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 4431784db2..230a08dd70 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.21"; + version = "3.4.22"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw="; + hash = "sha256-bHHAA9H6oUS0cXkGEaY/A0TLWrshgno3UN5xJA6+8lU="; }; dontFixup = true; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index f120b5290e..f7ab3c8acb 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,6 +7,7 @@ , openssl , installShellFiles , dbus +, sudo , Libsystem , Cocoa , Kernel @@ -29,20 +30,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.30.1"; + version = "0.31.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0="; + hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc="; + vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU="; }).goModules; buildInputs = [ @@ -128,17 +129,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs - ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.pythonForBuild.interpreter} setup.py linux-package \ + ${python.pythonOnBuildForHost.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} - ${python.pythonForBuild.interpreter} setup.py build-launcher + ${python.pythonOnBuildForHost.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -150,6 +151,9 @@ buildPythonApplication rec { bashInteractive zsh fish + ] ++ lib.optionals (!stdenv.isDarwin) [ + # integration tests need sudo + sudo ]; # skip failing tests due to darwin sandbox diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix index 031dfc27f2..e39b61499e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.14.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "sha256-IHJ30qXNVv9tUdePskHl1hd5kPivBb2kH1oOstBr/9s="; + sha256 = "sha256-LBxVZ5Az0vGalbQd437of5a3aoZH51v6OKTfndHkkiM="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index 6179c1719d..b0d8dd7a4b 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "384"; + version = "388"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Me+HB0DOrgIMPEtKlgHH9Hv9RmcsGq8tITpWXWTLw3M="; + hash = "sha256-rEKTReb5N6WUWonUJaJl/ubCFfxmnb3GoDJuIfTF9nQ="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 178f6281c1..5d8df1bec7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.10.0"; + version = "3.12.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-faHZBH/JrCDRQqZT9v6hsj4C9/PbLQxIr+6hNFzsEcg="; + hash = "sha256-Gzx2DdCX8GyxYEi8OH2a21V6JkA50qA+39IInEjLReI="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index d6727d327c..4c99078ab2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { ) ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + postInstall = '' wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix index 9f039c4ab0..4ee553c6c4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + doCheck = false; # fails 1 of 1 tests meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix index 312dc52371..d9742a6a8f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/deepgit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "deepgit"; - version = "4.3"; + version = "4.3.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - hash = "sha256-bA/EySZjuSDYaZplwHcpeP1VakcnG5K1hYTk7cSVbz0="; + hash = "sha256-Ovd9MjgpMJvNySW/FPXYVtpLoCSQP1W1nlcNkgI7sgA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix index 7b4144ff98..2cdae39897 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/diff-so-fancy/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ma27 ]; + maintainers = with maintainers; [ fpletz ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix index 8664808266..f5a8e8b25b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-wial+K5eUZSJ+asFBLrFoJQOLWLHkl5ot4b4CIsg7Tc="; + hash = "sha256-irzzG8qLJaBdRULGRyoYkn0tc4Yfcg/xe2SLriD8mtM="; }; buildCommand = '' 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 22edc08e65..cd3c6ce6dd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.36.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ya+Iuhe+vXNqt6mfpZ3h8jq++82AGMj+Zd4ozGFjuqY="; + hash = "sha256-OvelaxyQNeh6h7wn4Z/vRicufOoxrTdmnWl9hKW00jU="; }; - vendorHash = "sha256-tJDn3pyX5iTIa61OQXbErdBprqxu1N2LXqyJtpDQnBE="; + vendorHash = "sha256-RFForZy/MktbrNrcpp9G6VCB7A98liJvCxS0Yb16sMc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix index 0b460b14a9..7c786bb0b6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghr"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "sha256-aD1HEdoAPFFpJL++fLZIk+pIs+qDNYbTGDMlcRjV6M4="; + sha256 = "sha256-xClqqTVCEGghaf63kN40mwo49lkS8KC4k/36NYIngFI="; }; - vendorHash = "sha256-pqwJPo3ZhsXU1RF4BKPOWQS71+9EitSSTE1+sKlc9+s="; + vendorHash = "sha256-Wzzg66yJaHJUCfC2aH3Pk+B0d5l/+L7/bcNhQxo8ro0="; # Tests require a Github API token, and networking doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix index 5e82daa496..7a1179dba3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA="; + hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60="; }; - cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E="; + cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index 9606b9e15d..4cd4c68673 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-oHW73Y31z+0jOJdSJJa550mJYV8IP2fN+oNwT+3sySM="; + hash = "sha256-E6KgFSlWa/MKG6R2P+K4T+P/JOqaIfxdWpsSFGHbihg="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 986d491935..20183c5fad 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-eu4Ff+7670gCO+j3WSRnvQ1aFXIx0nw1jAZXNuni2bU="; + hash = "sha256-AvnnzLiDQEdfAHPns8ufhdiPPn9d23AnI8Aq2DQS+To="; }; - cargoHash = "sha256-DVMQLsiiaxMZtDqzqnMJQl91NCuMRSPEb8B6AttB4lE="; + cargoHash = "sha256-c2YucWs0UzyWDKWS5KebT3ps+XvWzlI0+ziJ8JX6oiQ="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix index ae99781f83..962bf18b36 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.3.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM="; + hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix index 96dbf0bb96..053da15bd5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,20 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview6"; sha256 = "14m7bg6ric8hpa2kmkhff6hpljfa73snbkj8fqida7hfd0nhggyl"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview6"; sha256 = "12lps97bqgd65z0y4d73ql2rcxaaaylb2x8fqvkb2jbrd76n30wz"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview6"; sha256 = "1kk4ids80gzkf8llasmcairmmz6yfsi7mbld21gb3sdwdf0wf92y"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview6"; sha256 = "18rabqzs5namzi0y6435blm6j54cnwsc8bkq2daj9bim5njy56pm"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview6"; sha256 = "0l9c7zakk17xyag9cl9nxq4j6wzlr6kgzzwpl7zwj7f3vypxlp6v"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview6"; sha256 = "0ni3y5qkpsz2s5hflkipwmpmb21b2mfs6h06rrvrq95m4l0bil7i"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview6"; sha256 = "0m1zbcbypj06xkmyjx56smh5smi02gdvn6xbqi92k185aiiwicj1"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview6"; sha256 = "0wws5z8vmagzh7x47mlgf780579d5zqv0hyd649sycdxkaadcz5r"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview6"; sha256 = "15572ibkb7ihgdmcxzj3avb1g4lcqrjxdxgf66ifvfyjj49vfi8h"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview6"; sha256 = "1hm8ax9bq7vj458f2lrcppv3ylc6zmmdwp6zkbf2s6fv7nhvpmgf"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview6"; sha256 = "1b1y2a3bkwz38a5nvwqhw23gp10a63046qiprapyxp589gbkf8cj"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview6"; sha256 = "0img9zmrppikzgw48j5a3svcrv9skbh13wzrdqnk0648n8fgj9k4"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview6"; sha256 = "04923qvlpgszr1zlcg0pfxzsgqgdjcrpqgkqlrlp62ac6yv8dr9g"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) @@ -107,6 +108,5 @@ (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.14.0"; sha256 = "1j7ifcv621z5kjafs0c1qw4xcgv4kd4hwp0qamhcrllvshd2mabq"; }) - (fetchNuGet { pname = "Tmds.DBus.SourceGenerator"; version = "0.0.4"; sha256 = "16qa3xi0ip2nvgnjjqj64ppjdrf4p4skrfqzfnb39rp0k7v8smfx"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh index e87352a365..fc9ef41996 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh @@ -1,23 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch nix coreutils gnused +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" -cd "$(dirname "$0")" - -set -euo pipefail - -latestVersion="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion="$(nix-instantiate --eval -E "with import ../../../.. {}; git-credential-manager.version" | tr -d '"')" - -if [[ "$latestVersion" == "$currentVersion" ]]; then - echo "up to date" - exit 0 +new_version="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r '.[0].name' | sed 's|^GCM ||')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 fi -echo "updating $currentVersion -> $latestVersion" - -sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix -hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)" -sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix - - -$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) +cd ../../../.. +update-source-version git-credential-manager "$new_version" +$(nix-build -A git-credential-manager.fetch-deps --no-out-link) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix index b7f6aa7bff..9b46a0c501 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-0sgoBvNVQZI8mOfKI5XWVQ6+615gKi1pO/4DPI6/fKA="; + hash = "sha256-Zxdd4JhSoaAFx8neZqdOZSZEOTtupZHnX+5ziYxbw6s="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-STwBiqdUwiyhTySPENqfJLUTMwxaq5nYtrAX6+pcKoc="; + vendorHash = "sha256-cCqbEv4kBnF6FWvfaXCOxadPVXR/AxXS3nXHf6WmsSs="; meta = { description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix index df5b73cf68..a193444ddc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-BoTMaM/6F/vXn9y80baYnP9z0PwgnJrk9inYt0JIb+Q="; + sha256 = "sha256-e1UUAHXTRNgNWrYZuLGdrQIAD8WADmA2B9bVnDNidf8="; }; postPatch = '' 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 e2d185b97f..36cda3dfc7 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.12.156"; + version = "5.12.174"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-AY+1zJsH4KgMiOfGDuNGxn5XmmYrWARapqiEZhckako="; + hash = "sha256-juCiPulDVDDg9+DXUf9Gp/1lMoQ0NKLUTrzOqlv+32w="; }; - cargoHash = "sha256-Rz0bgSlvekay5c/TYCu8FJUN3xnXjVFMa0wcUB72nw8="; + cargoHash = "sha256-Wtw7GBPUci4fbplQDtz1Yxrf+7+3ABIe7GPN/gUER6I="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix index 15534fc01b..e1c55676da 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-nomad/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-nomad"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "rraval"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; + sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA="; }; - cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix index 4d403528bb..5a3a41e05b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-zUw0rjsYdH4mlqKXADvfqWCBM8tCL6BmVHq27JZLpd0="; + sha256 = "sha256-ff8n8SkeppZzJO58OrPQJ0MInZCIz8nTb7lmiCC0ATg="; }; nativeBuildInputs = [ makeWrapper ]; 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 a5f6820342..edf05ff03f 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.37"; + version = "2.39"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0="; + hash = "sha256-Qw0x/YiXMDrlTy6boembfqVRvEYiMWOALJtaMrr7/WI="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix index f2d9d2a9f6..257ace5013 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.11.9"; + version = "0.16.6.1"; pname = "gita"; src = fetchFromGitHub { - sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; - rev = version; + sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA="; + rev = "v${version}"; repo = "gita"; owner = "nosarthur"; }; @@ -26,22 +26,8 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - postUnpack = '' - for case in "\n" ""; do - substituteInPlace source/tests/test_main.py \ - --replace "'gita$case'" "'source$case'" - done - ''; - - nativeCheckInputs = [ - git - pytest - ]; - - checkPhase = '' - git init - pytest tests - ''; + # 3 of the tests are failing + doCheck = false; postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash 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 0cbbe9d469..9082bffce0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "9.5.1"; + version = "9.9.2"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-irKs0yvz2TrKvF34DMOBdmJvH+Lox/ZVbPSaHAl6Vyo="; + sha256 = "sha256-UfzHkgqxEaSsoiDwFLsyIBW2min9AvSBrLPJ2MlKh3U="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-3g49FBbolEhBgSPanLnrWhfxHR5jg4C1p+70rIrQ2GM="; + sha256 = "sha256-ble0n+giM8xmuSewBVdj+RuT2093rW0taNzsyQLO92I="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-8ateh2LswWMOboPASWcYTy6OfK30h7wABIgoZXJ7GTM="; + sha256 = "sha256-QYhYzjqbCO0/pRDK7c5jYifj+/UY7SLpRqQUQ3LBFkE="; }; }; @@ -139,9 +139,15 @@ let nativeBuildInputs = [ unzip ]; installPhase = '' + runHook preInstall + mkdir -p $out/Applications/GitKraken.app cp -R . $out/Applications/GitKraken.app + + runHook postInstall ''; + + dontFixup = true; }; in if stdenv.isDarwin 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 3566e85a27..01773299cf 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": "16.4.1", - "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=", - "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l", + "version": "16.5.1", + "repo_hash": "sha256-7vKdCFDgtXSTlYV9nfLuQ+LZCaGDLU9zp97rob4dj2A=", + "yarn_hash": "1df7lf2grxpfjy1vgwsxw9n310jgjb64vqcxn2a7wzgh0svr1yyf", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.4.1-ee", + "rev": "v16.5.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.4.1", - "GITLAB_PAGES_VERSION": "16.4.1", - "GITLAB_SHELL_VERSION": "14.28.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9", - "GITLAB_WORKHORSE_VERSION": "16.4.1" + "GITALY_SERVER_VERSION": "16.5.1", + "GITLAB_PAGES_VERSION": "16.5.1", + "GITLAB_SHELL_VERSION": "14.29.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0", + "GITLAB_WORKHORSE_VERSION": "16.5.1" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 5590588243..bc5d3aa8b3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -160,6 +160,7 @@ stdenv.mkDerivation { ${replace}/bin/replace-literal -f -r -e '../../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e '../lib' "$out/share/gitlab/lib" config ${replace}/bin/replace-literal -f -r -e "require_relative 'application'" "require_relative '$out/share/gitlab/config/application'" config + ${replace}/bin/replace-literal -f -r -e 'require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"' "require_relative '$out/share/gitlab/lib/gitlab/puma/error_handler'" config ''; buildPhase = '' 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 f89f920c4c..eddab0b53c 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,21 +6,22 @@ }: let - version = "16.4.1"; + version = "16.5.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; commonOpts = { inherit version; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk="; + hash = "sha256-LrkFSsWIPqiEXUV5OyYkB2XUbCMXjbpcCmTacR33vOQ="; }; - vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o="; + vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; 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 0cac9f890e..44fc1630c1 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,17 +2,18 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.84.0"; + version = "3.85.0"; rev = "v${version}-gitlab"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE="; + sha256 = "sha256-F20f1qDsI+moBAL+Tpx5AALgOi0vTH7hZ5RIvRMwY1s="; }; - vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI="; + vendorHash = "sha256-JWuSJD2Mi0om9vA6+mYbArfr2lmGlRua6IM0DhDzSBk="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 11e272e1bc..9a513a1590 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.3.9"; + version = "4.4.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg="; + sha256 = "sha256-Qywf5ACxXqY1iUZCsROTLmWeM8gFcqZvnClRo5DlnjY="; }; - vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA="; + vendorHash = "sha256-2dUlztXnr7OH/gQ0Q4jQpuO1MdkOy1O4BNGiY223DAA="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; 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 7810639eca..72a12a81f3 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,16 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.4.1"; + version = "16.5.1"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-aUpuzgFbxMJwKjTn+QAudOeMBSLtLTjaTmwe25f6qxg="; + hash = "sha256-1fcsliorkl118MyUnZ3yrQjwLBQGsNBBA4dIEFHBJAI="; }; - vendorHash = "sha256-ko0ycT8HlqVfXf7tck0xcs6rDJMpHxjSoI59gTLgqDQ="; + vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q="; 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 01b1193263..882cb5f538 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,19 +2,21 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.28.0"; + version = "14.29.0"; + + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-w/Td4J4t/xrkR5LmFTcAD5U9ZR3HDGqLNxpjkDC0pi4="; + sha256 = "sha256-MhvFLBH0CLiGNTEjHy7vDhLE3YsvbBL8XRNytPEa6uU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-EIJSBUUsWvA93OAyBNey2WA2sV+7YSWbsC1RnWf6nrI="; + vendorHash = "sha256-g1ZaRY0A7oREByNicPvnuxakYrNQNXg4Vy94iyNVdDY="; 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 690af3a806..961d2d6dbd 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,8 +5,9 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.4.1"; + version = "16.5.1"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = data.owner; repo = data.repo; @@ -16,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-C6FVTOY3CdO2y6mKuvgEWDZnWevRTxeOefRF2EbXDv8="; + vendorHash = "sha256-m8cDhI6DzFnSEZscZQfFm8l9MTJqTqxhBFJeTX1HWiE="; 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 d9ee8a8ae7..2107186fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,555 +8,561 @@ if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this BundlerChecksum.patch! end -gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false +# Please see https://docs.gitlab.com/ee/development/feature_categorization/#gemfile +ignore_feature_category = Module.new do + def gem(*arguments, feature_category: nil, **keyword_arguments) # rubocop:disable Lint/UnusedMethodArgument + super(*arguments, **keyword_arguments) + end +end + +extend ignore_feature_category + +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # 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.6' +gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'vite_rails' +gem 'vite_rails' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'bootsnap', '~> 1.16.0', require: false +gem 'bootsnap', '~> 1.16.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'openssl', '~> 3.0' -gem 'ipaddr', '~> 1.2.5' +gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Monorepo Gems group :monorepo do - gem 'gitlab-utils', path: 'gems/gitlab-utils' + gem 'gitlab-utils', path: 'gems/gitlab-utils' # rubocop:todo Gemfile/MissingFeatureCategory end # Responders respond_to and respond_with -gem 'responders', '~> 3.0' +gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sprockets', '~> 3.7.0' +gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.5.0' +gem 'view_component', '~> 3.6.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.4' +gem 'pg', '~> 1.5.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'neighbor', '~> 0.2.3' +gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rugged', '~> 1.6' -gem 'grape-path-helpers', '~> 1.7.1' +gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.11.1' +gem 'faraday', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization -gem 'declarative_policy', '~> 1.1.0' +gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Authentication libraries -gem 'devise', '~> 4.8.1' -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' -gem 'bcrypt', '~> 3.1', '>= 3.1.14' -gem 'doorkeeper', '~> 5.6', '>= 5.6.6' -gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' -gem 'rexml', '~> 3.2.6' -gem 'ruby-saml', '~> 1.15.0' -gem 'omniauth', '~> 2.1.0' -gem 'omniauth-auth0', '~> 3.1' -gem 'omniauth-azure-activedirectory-v2', '~> 2.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md -gem 'omniauth-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 2.0.1' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.0.1' -gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md -gem 'omniauth-google-oauth2', '~> 1.1' -gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 2.1.0' -gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' -gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md -gem 'omniauth_openid_connect', '~> 0.6.1' +gem 'devise', '~> 4.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory +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 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-saml', '~> 1.15.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 +gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +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.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-twitter', '~> 1.4' # 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 # 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' -gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md -gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.21.3' -gem 'jwt', '~> 2.5' +gem 'openid_connect', '= 1.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 'jwt', '~> 2.5' # rubocop:todo Gemfile/MissingFeatureCategory # Kerberos authentication. EE-only -gem 'gssapi', '~> 1.3.1', group: :kerberos -gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos +gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory +gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory # Spam and anti-bot protection -gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' -gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 2.1.0' +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'akismet', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Two-factor authentication -gem 'devise-two-factor', '~> 4.0.2' -gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' +gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rqrcode', '~> 2.0', feature_category: :system_access + +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Pages -gem 'validates_hostname', '~> 1.0.13' -gem 'rubyzip', '~> 2.3.2', require: 'zip' +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' +gem 'acme-client', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Browser detection -gem 'browser', '~> 5.3.1' +gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory # OS detection for usage ping -gem 'ohai', '~> 17.9' +gem 'ohai', '~> 17.9' # rubocop:todo Gemfile/MissingFeatureCategory # GPG -gem 'gpgme', '~> 2.0.23' +gem 'gpgme', '~> 2.0.23' # rubocop:todo Gemfile/MissingFeatureCategory # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.17.1' +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API -gem 'grape', '~> 1.7.1' -gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' -gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] -gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] +gem 'grape', '~> 1.7.1', feature_category: :api +gem 'grape-entity', '~> 0.10.0', feature_category: :api +gem 'grape-swagger', '~> 1.6.1', group: [:development, :test], feature_category: :api +gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api +gem 'grape-path-helpers', '~> 1.7.1', feature_category: :api +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 1.13.19' -gem 'graphiql-rails', '~> 1.8.0' -gem 'apollo_upload_server', '~> 2.1.0' -gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] -gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) +gem 'graphql', '~> 2.0.27', feature_category: :api +gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api +gem 'graphiql-rails', '~> 1.8.0', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.0', feature_category: :api +gem 'graphlient', '~> 0.5.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data -gem 'ffaker', '~> 2.10' +gem 'ffaker', '~> 2.10' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'hashie', '~> 5.0.0' +gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory # Pagination -gem 'kaminari', '~> 1.2.2' +gem 'kaminari', '~> 1.2.2' # rubocop:todo Gemfile/MissingFeatureCategory # HAML -gem 'hamlit', '~> 2.15.0' +gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory # Files attachments -gem 'carrierwave', '~> 1.3' -gem 'mini_magick', '~> 4.10.1' +gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mini_magick', '~> 4.10.1' # rubocop:todo Gemfile/MissingFeatureCategory # for backups -gem 'fog-aws', '~> 3.18' +gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.19', require: 'fog/google' -gem 'fog-local', '~> 0.8' +gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-google', '~> 1.19', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, # which may have knock-on effects on other features using `RestClient`. # 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' -gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' +gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory # for Google storage -gem 'google-cloud-storage', '~> 1.44.0' -gem 'google-apis-core', '~> 0.10.0' -gem 'google-apis-compute_v1', '~> 0.57.0' -gem 'google-apis-container_v1', '~> 0.43.0' -gem 'google-apis-container_v1beta1', '~> 0.43.0' -gem 'google-apis-cloudbilling_v1', '~> 0.21.0' -gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' -gem 'google-apis-iam_v1', '~> 0.36.0' -gem 'google-apis-serviceusage_v1', '~> 0.28.0' -gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' -gem 'google-apis-androidpublisher_v3', '~> 0.34.0' +gem 'google-cloud-storage', '~> 1.44.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-core', '~> 0.10.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-cloudbilling_v1', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-iam_v1', '~> 0.36.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory # Seed data -gem 'seed-fu', '~> 2.3.7' +gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory # Search -gem 'elasticsearch-model', '~> 7.2' -gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.181.1' -gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.134.0' -gem 'faraday_middleware-aws-sigv4', '~>0.3.0' -gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections +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.185.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.136.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 # Markdown and HTML processing -gem 'html-pipeline', '~> 2.14.3' -gem 'deckar01-task_list', '2.3.3' -gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.10' -gem 'kramdown', '~> 2.3.1' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.3.2' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.18' -gem 'asciidoctor-include-ext', '~> 0.4.0', require: false -gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.8.0', require: false -gem 'rouge', '~> 4.1.3' -gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.15', '>= 1.15.4' +gem 'html-pipeline', '~> 2.14.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'deckar01-task_list', '2.3.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'commonmarker', '~> 0.23.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'RedCloth', '~> 4.3.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'org-ruby', '~> 0.9.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'creole', '~> 0.5.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'wikicloth', '0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-include-ext', '~> 0.4.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rouge', '~> 4.1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'nokogiri', '~> 1.15', '>= 1.15.4' # rubocop:todo Gemfile/MissingFeatureCategory # Calendar rendering -gem 'icalendar' +gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory # Diffs -gem 'diffy', '~> 3.4' -gem 'diff_match_patch', '~> 0.1.0' +gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'diff_match_patch', '~> 0.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # Application server -gem 'rack', '~> 2.2.8' +gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingFeatureCategory # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' +gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do - gem 'puma', '~> 6.3', '>= 6.3.1', require: false - gem 'sd_notify', '~> 0.1.0', require: false + gem 'puma', '~> 6.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end # State machine -gem 'state_machines-activerecord', '~> 0.8.0' +gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # CI domain tags -gem 'acts-as-taggable-on', '~> 9.0' +gem 'acts-as-taggable-on', '~> 9.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', '~> 6.5.7' -gem 'sidekiq-cron', '~> 1.8.0' -gem 'redis-namespace', '~> 1.9.0' -gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' +gem 'sidekiq', '~> 6.5.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq-cron', '~> 1.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-namespace', '~> 1.9.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory # Cron Parser -gem 'fugit', '~> 1.8.1' +gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory # HTTP requests -gem 'httparty', '~> 0.21.0' +gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory # Colored output to console -gem 'rainbow', '~> 3.0' +gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Progress bar -gem 'ruby-progressbar', '~> 1.10' +gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory # Linear-time regex library for untrusted regular expressions -gem 're2', '2.0.0' +gem 're2', '2.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 1.2.1' -gem 'version_sorter', '~> 2.3' -gem 'csv_builder', path: 'gems/csv_builder' +gem 'semver_dialects', '~> 1.2.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.8' +gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory # User agent parsing -gem 'device_detector' +gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis', '~> 4.8.0' -gem 'connection_pool', '~> 2.0' +gem 'redis', '~> 4.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.3.0' +gem 'redis-actionpack', '~> 5.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Discord integration -gem 'discordrb-webhooks', '~> 3.4', require: false +gem 'discordrb-webhooks', '~> 3.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Jira integration -gem 'jira-ruby', '~> 2.1.4' -gem 'atlassian-jwt', '~> 0.2.0' +gem 'jira-ruby', '~> 2.1.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'atlassian-jwt', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Slack integration -gem 'slack-messenger', '~> 2.3.4' - -# Hangouts Chat integration -gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' - -# Asana integration -gem 'asana', '~> 0.10.13' +gem 'slack-messenger', '~> 2.3.4' # rubocop:todo Gemfile/MissingFeatureCategory # FogBugz integration -gem 'ruby-fogbugz', '~> 0.3.0' +gem 'ruby-fogbugz', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Kubernetes integration -gem 'kubeclient', '~> 4.11.0' +gem 'kubeclient', '~> 4.11.0' # rubocop:todo Gemfile/MissingFeatureCategory # AI -gem 'ruby-openai', '~> 3.7' -gem 'circuitbox', '2.0.0' +gem 'ruby-openai', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'circuitbox', '2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sanitize user input -gem 'sanitize', '~> 6.0.2' -gem 'babosa', '~> 2.0' +gem 'sanitize', '~> 6.0.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'babosa', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sanitizes SVG input -gem 'loofah', '~> 2.21.3' +gem 'loofah', '~> 2.21.4' # rubocop:todo Gemfile/MissingFeatureCategory # Used to provide license templates -gem 'licensee', '~> 9.16' +gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.7' +gem 'charlock_holmes', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory # Detect mime content type from content -gem 'ruby-magic', '~> 0.6' +gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory # Faster blank -gem 'fast_blank', '~> 1.0.1' +gem 'fast_blank', '~> 1.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Parse time & duration -gem 'gitlab-chronic', '~> 0.10.5' -gem 'gitlab_chronic_duration', '~> 0.11' +gem 'gitlab-chronic', '~> 0.10.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rack-proxy', '~> 0.7.7' +gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sassc-rails', '~> 2.1.0' -gem 'autoprefixer-rails', '10.2.5.1' -gem 'terser', '1.0.2' +gem 'sassc-rails', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'autoprefixer-rails', '10.2.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' -gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.7' -gem 'gon', '~> 6.4.0' -gem 'request_store', '~> 1.5.1' -gem 'base32', '~> 0.3.0' +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'tanuki_emoji', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.3' +gem 'gitlab-license', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Protect against bruteforcing -gem 'rack-attack', '~> 6.7.0' +gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-raven', '~> 3.1' -gem 'sentry-ruby', '~> 5.8.0' -gem 'sentry-rails', '~> 5.8.0' -gem 'sentry-sidekiq', '~> 5.8.0' +gem 'sentry-raven', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-ruby', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-rails', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sentry-sidekiq', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # PostgreSQL query parsing # -gem 'pg_query', '~> 4.2.3' +gem 'pg_query', '~> 4.2.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'premailer-rails', '~> 1.10.3' +gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-labkit', '~> 0.34.0' -gem 'thrift', '>= 0.16.0' +gem 'gitlab-labkit', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n -gem 'rails-i18n', '~> 7.0' -gem 'gettext_i18n_rails', '~> 1.11.0' -gem 'gettext_i18n_rails_js', '~> 1.3' -gem 'gettext', '~> 3.3', require: false, group: :development +gem 'rails-i18n', '~> 7.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext_i18n_rails', '~> 1.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext_i18n_rails_js', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gettext', '~> 3.3', require: false, group: :development # rubocop:todo Gemfile/MissingFeatureCategory -gem 'batch-loader', '~> 2.0.1' +gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Perf bar -gem 'peek', '~> 1.1' +gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory # Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.8.0' +gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics -gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.28', require: 'prometheus/client' +gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'warning', '~> 1.3.0' +gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do - gem 'lefthook', '~> 1.4.7', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.47.2', require: false + gem 'lefthook', '~> 1.5.2', require: false, feature_category: :tooling + gem 'rubocop', feature_category: :tooling + gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 2.0', '>= 2.0.1' + gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.0', '>= 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler - gem 'better_errors', '~> 2.10.1' + gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'sprite-factory', '~> 1.7' + gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem "listen", "~> 3.7" + gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory end group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 7.0.2' - gem 'parser', '~> 3.2', '>= 3.2.2.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.6.4' + gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'bullet', '~> 7.1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'awesome_print', require: false + gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 6.0.3' + gem 'database_cleaner', '~> 1.7.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' + gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'spring', '~> 4.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' + gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 10.1.0', require: false + gem 'gitlab-styles', '~> 10.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'haml_lint', '~> 0.40.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false + gem 'haml_lint', '~> 0.40.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.11.0', require: false - gem 'benchmark-memory', '~> 0.1', require: false + gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false + # Profiling data from CI/CD pipelines + gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'simple_po_parser', '~> 1.1.6', require: false + gem 'knapsack', '~> 1.21.1', feature_category: :tooling + gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling + gem 'test_file_finder', '~> 0.1.3', feature_category: :tooling - gem 'png_quantizator', '~> 0.2.1', require: false + gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parallel', '~> 1.19', require: false + gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test_file_finder', '~> 0.1.3' + gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pact', '~> 1.63' + gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.0.0', require: false + gem 'gitlab-dangerfiles', '~> 4.3.2', require: false, feature_category: :tooling end group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 2.1.0', require: false - gem 'undercover', '~> 0.4.4', require: false + gem 'simplecov', '~> 0.21', 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 end # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false + gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end # Gems required in various pipelines group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec' - gem 'rspec_flaky', path: 'gems/rspec_flaky' + gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec_flaky', path: 'gems/rspec_flaky' # rubocop:todo Gemfile/MissingFeatureCategory end group :test do - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.2' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', '~> 1.0', require: false + gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling + gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling - gem 'capybara', '~> 3.39', '>= 3.39.2' - gem 'capybara-screenshot', '~> 1.0.26' - gem 'selenium-webdriver', '= 4.12.0' + gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.14' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'graphlyte', '~> 1.0.0' + gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'shoulda-matchers', '~> 5.1.0', require: false - gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.19.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 1.2.2' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - gem 'axe-core-rspec' + gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'test-prof', '~> 1.2.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false + gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false + gem 'gitlab_quality-test_tooling', '~> 1.3.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end -gem 'octokit', '~> 6.0' +gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'email_reply_trimmer', '~> 0.1' -gem 'html2text' +gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'stackprof', '~> 0.2.25', require: false -gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 1.0', require: false -gem 'activerecord-explain-analyze', '~> 0.1', require: false +gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory +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 # OAuth -gem 'oauth2', '~> 2.0' +gem 'oauth2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Health check -gem 'health_check', '~> 3.0' +gem 'health_check', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # System information -gem 'vmstat', '~> 2.3.0' -gem 'sys-filesystem', '~> 1.4.3' +gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory # NTP client -gem 'net-ntp' +gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory # SSH keys support -gem 'ssh_data', '~> 1.3' +gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Spamcheck GRPC protocol definitions -gem 'spamcheck', '~> 1.3.0' +gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.3.0-rc1' +gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfile/MissingFeatureCategory # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.2.0' +gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'grpc', '~> 1.55.0' +gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-protobuf', '~> 3.24', '>= 3.24.3' +gem 'google-protobuf', '~> 3.24', '>= 3.24.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'toml-rb', '~> 2.2.0' +gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory # Feature toggles -gem 'flipper', '~> 0.26.2' -gem 'flipper-active_record', '~> 0.26.2' -gem 'flipper-active_support_cache_store', '~> 0.26.2' -gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.8.0' +gem 'flipper', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'flipper-active_record', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'flipper-active_support_cache_store', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'unleash', '~> 3.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-experiment', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Structured logging -gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.8' +gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grape_logging', '~> 1.8', feature_category: :api # DNS Lookup -gem 'gitlab-net-dns', '~> 0.9.2' +gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list -gem 'countries', '~> 4.0.0' +gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'retriable', '~> 3.1.2' +gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory # LRU cache -gem 'lru_redux' +gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` @@ -565,62 +571,62 @@ gem 'lru_redux' # `config/initializers/mail_starttls_patch.rb` has also been patched to # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is # released. -gem 'mail', '= 2.8.1' -gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false +gem 'mail', '= 2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # rubocop:todo Gemfile/MissingFeatureCategory # File encryption -gem 'lockbox', '~> 1.3.0' +gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Email validation -gem 'valid_email', '~> 0.1' +gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON -gem 'jsonb_accessor', '~> 1.3.10' -gem 'json', '~> 2.6.3' -gem 'json_schemer', '~> 0.2.18' -gem 'oj', '~> 3.13.21' -gem 'oj-introspect', '~> 0.7' -gem 'multi_json', '~> 1.14.1' -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' +gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json', '~> 2.6.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json_schemer', '~> 0.2.18' # rubocop:todo Gemfile/MissingFeatureCategory +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 +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'webauthn', '~> 3.0' +gem 'webauthn', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory # IPAddress utilities -gem 'ipaddress', '~> 0.8.3' +gem 'ipaddress', '~> 0.8.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'parslet', '~> 1.8' +gem 'parslet', '~> 1.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ed25519', '~> 1.3.0' +gem 'ed25519', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # rubocop:todo Gemfile/MissingFeatureCategory # Vulnerability advisories -gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/MissingFeatureCategory # Work with RPM packages -gem 'arr-pm', '~> 0.0.12' +gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.0.22.pre.alpha1' +gem 'devfile', '~> 0.0.23.pre.alpha1' # rubocop:todo Gemfile/MissingFeatureCategory # Apple plist parsing -gem 'CFPropertyList', '~> 3.0.0' -gem 'app_store_connect' +gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'app_store_connect' # rubocop:todo Gemfile/MissingFeatureCategory # For phone verification -gem 'telesignenterprise', '~> 2.2' +gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt -gem 'net-protocol', '~> 0.1.3' +gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory # Lock this until we make DNS rebinding work with the updated net-http: # https://gitlab.com/gitlab-org/gitlab/-/issues/413528 -gem 'net-http', '= 0.1.1' +gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'duo_api', '~> 1.3' +gem 'duo_api', '~> 1.3' # 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 2a8f80bf39..052a59d6b7 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 @@ -23,6 +23,16 @@ PATH error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) +PATH + remote: gems/gitlab-http + specs: + gitlab-http (0.1.0) + activesupport (~> 7) + httparty (~> 0.21.0) + ipaddress (~> 0.8.3) + nokogiri (~> 1.15.4) + railties (~> 7) + PATH remote: gems/gitlab-rspec specs: @@ -64,7 +74,7 @@ PATH remote: gems/rspec_flaky specs: rspec_flaky (0.1.0) - activesupport (>= 6.1, < 7.1) + activesupport (>= 6.1, < 8) rspec (~> 3.0) PATH @@ -155,70 +165,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.6) - actionpack (= 7.0.6) - activesupport (= 7.0.6) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.6) - actionpack (= 7.0.6) - activejob (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.6) - actionpack (= 7.0.6) - actionview (= 7.0.6) - activejob (= 7.0.6) - activesupport (= 7.0.6) + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.6) - actionview (= 7.0.6) - activesupport (= 7.0.6) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.6) - actionpack (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.6) - activesupport (= 7.0.6) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.6) - activesupport (= 7.0.6) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (7.0.6) - activesupport (= 7.0.6) - activerecord (7.0.6) - activemodel (= 7.0.6) - activesupport (= 7.0.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.6) - actionpack (= 7.0.6) - activejob (= 7.0.6) - activerecord (= 7.0.6) - activesupport (= 7.0.6) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.6) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -240,11 +250,6 @@ GEM activesupport (>= 6.0.0) jwt (>= 1.4, <= 2.5.0) arr-pm (0.0.12) - asana (0.10.13) - faraday (~> 1.0) - faraday_middleware (~> 1.0) - faraday_middleware-multi_json (~> 0.0) - oauth2 (>= 1.4, < 3) asciidoctor (2.0.18) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) @@ -265,7 +270,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.181.1) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -273,7 +278,7 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) @@ -321,12 +326,12 @@ GEM msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) - bullet (7.0.2) + bullet (7.1.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.7.0.1) + bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) - thor (>= 0.18, < 2) + thor (~> 1.0) byebug (11.1.3) capybara (3.39.2) addressable @@ -340,7 +345,7 @@ GEM capybara-screenshot (1.0.26) capybara (>= 1.0, < 4) launchy - carrierwave (1.3.3) + carrierwave (1.3.4) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -357,7 +362,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-utils (16.10.17) - chunky_png (1.3.5) + chunky_png (1.4.0) circuitbox (2.0.0) citrus (3.0.2) claide (1.1.0) @@ -371,7 +376,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.10) concurrent-ruby (1.2.2) - connection_pool (2.3.0) + connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) cose (1.3.0) @@ -405,6 +410,7 @@ GEM danger-gitlab (8.0.0) danger gitlab (~> 4.2, >= 4.2.0) + dartsass (1.49.8) database_cleaner (1.7.0) date (3.3.3) dead_end (3.1.1) @@ -429,7 +435,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.22.pre.alpha1) + devfile (0.0.23.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -437,11 +443,11 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-two-factor (4.0.2) - activesupport (< 7.1) - attr_encrypted (>= 1.3, < 4, != 2) + devise-two-factor (4.1.1) + activesupport (~> 7.0) + attr_encrypted (>= 1.3, < 5, != 2) devise (~> 4.0) - railties (< 7.1) + railties (~> 7.0) rotp (~> 6.0) diff-lcs (1.5.0) diff_match_patch (0.1.0) @@ -500,7 +506,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) erubi (1.12.0) - escape_utils (1.2.1) + escape_utils (1.3.0) et-orbi (1.2.7) tzinfo ethon (0.16.0) @@ -510,8 +516,8 @@ GEM expgen (0.1.1) parslet expression_parser (0.9.0) - extended-markdown-filter (0.6.0) - html-pipeline (~> 2.0) + extended-markdown-filter (0.7.0) + html-pipeline (~> 2.9) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -547,9 +553,6 @@ GEM faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) faraday (>= 0.15) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.10.0) @@ -637,17 +640,17 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.3.0.pre.rc1) + gitaly (16.5.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (4.0.0) + gitlab-dangerfiles (4.3.2) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) - rake + rake (~> 13.0) gitlab-experiment (0.8.0) activesupport (>= 3.0) request_store (>= 1.0) @@ -678,15 +681,15 @@ GEM rubocop-performance (~> 1.15) rubocop-rails (~> 2.17) rubocop-rspec (~> 2.22) - gitlab_chronic_duration (0.11.0) + gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.0.0) - activesupport (>= 6.1, < 7.1) + gitlab_quality-test_tooling (1.3.0) + activesupport (>= 6.1, < 7.2) gitlab (~> 4.19) http (~> 5.0) nokogiri (~> 1.10) @@ -755,7 +758,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.24.3) + google-protobuf (3.24.4) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -802,19 +805,19 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (1.13.19) - graphql-client (0.17.0) + graphql (2.0.27) + graphql-client (0.18.0) activesupport (>= 3.0) - graphql (~> 1.10) - graphql-docs (2.1.0) - commonmarker (~> 0.16) + graphql + graphql-docs (4.0.0) + commonmarker (~> 0.23, >= 0.23.6) + dartsass (~> 1.49) escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) - graphql (~> 1.12) - html-pipeline (~> 2.9) - sass (~> 3.4) - grpc (1.55.0) + graphql (~> 2.0) + html-pipeline (~> 2.14, >= 2.14.3) + grpc (1.58.0) google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) gssapi (1.3.1) @@ -847,7 +850,6 @@ GEM thor tilt hana (1.3.7) - hangouts-chat (0.0.5) hashdiff (1.0.1) hashie (5.0.0) health_check (3.1.0) @@ -883,6 +885,7 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) + influxdb-client (2.9.0) invisible_captcha (2.1.0) rails (>= 5.2) ipaddr (1.2.5) @@ -946,7 +949,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.4.7) + lefthook (1.5.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -981,7 +984,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) lookbook (2.0.1) @@ -1011,9 +1014,9 @@ GEM memoist (0.16.2) memory_profiler (1.0.1) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.1003) mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) @@ -1098,7 +1101,7 @@ GEM hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (2.0.1) + omniauth-alicloud (3.0.0) omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) @@ -1184,7 +1187,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1210,7 +1213,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.28.0) + prometheus-client-mmap (0.28.1) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1225,7 +1228,7 @@ GEM tty-markdown tty-prompt public_suffix (5.0.0) - puma (6.3.1) + puma (6.4.0) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1250,20 +1253,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.6) - actioncable (= 7.0.6) - actionmailbox (= 7.0.6) - actionmailer (= 7.0.6) - actionpack (= 7.0.6) - actiontext (= 7.0.6) - actionview (= 7.0.6) - activejob (= 7.0.6) - activemodel (= 7.0.6) - activerecord (= 7.0.6) - activestorage (= 7.0.6) - activesupport (= 7.0.6) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 7.0.6) + railties (= 7.0.8) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1276,9 +1279,9 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.6) - actionpack (= 7.0.6) - activesupport (= 7.0.6) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -1295,8 +1298,7 @@ GEM optimist (>= 3.0.0) rbtree (0.4.6) rchardet (1.8.0) - rdoc (6.3.2) - re2 (2.0.0) + re2 (2.1.3) mini_portile2 (~> 2.8.4) recaptcha (5.12.3) json @@ -1335,12 +1337,12 @@ GEM nokogiri rexml (3.2.6) rinku (2.0.0) - rotp (6.2.0) + rotp (6.3.0) rouge (4.1.3) - rqrcode (0.7.0) - chunky_png - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) + 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) @@ -1439,11 +1441,6 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass (3.5.5) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.0) @@ -1459,7 +1456,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.12.0) + selenium-webdriver (4.14.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -1580,11 +1577,11 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.2.2) + test-prof (1.2.3) test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) @@ -1649,7 +1646,7 @@ GEM unparser (0.6.7) diff-lcs (~> 1.3) parser (>= 3.2.0) - uri (0.12.1) + uri (0.12.2) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1665,7 +1662,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.5.0) + view_component (3.6.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1701,8 +1698,8 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - websocket (1.2.9) - websocket-driver (0.7.5) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wikicloth (0.8.1) @@ -1735,7 +1732,6 @@ DEPENDENCIES apollo_upload_server (~> 2.1.0) app_store_connect arr-pm (~> 0.0.12) - asana (~> 0.10.13) asciidoctor (~> 2.0.18) asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.8.0) @@ -1745,8 +1741,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.181.1) - aws-sdk-s3 (~> 1.134.0) + aws-sdk-core (~> 3.185.1) + aws-sdk-s3 (~> 1.136.0) axe-core-rspec babosa (~> 2.0) base32 (~> 0.3.0) @@ -1757,8 +1753,8 @@ DEPENDENCIES better_errors (~> 2.10.1) bootsnap (~> 1.16.0) browser (~> 5.3.1) - bullet (~> 7.0.2) - bundler-audit (~> 0.7.0.1) + bullet (~> 7.1.1) + bundler-audit (~> 0.9.1) bundler-checksum (~> 0.1.0)! capybara (~> 3.39, >= 3.39.2) capybara-screenshot (~> 1.0.26) @@ -1769,7 +1765,7 @@ DEPENDENCIES cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) - connection_pool (~> 2.0) + connection_pool (~> 2.4) countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) @@ -1780,11 +1776,11 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.22.pre.alpha1) + devfile (~> 0.0.23.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! - devise-two-factor (~> 4.0.2) + devise-two-factor (~> 4.1.1) diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) @@ -1816,11 +1812,12 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.11.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 16.3.0.pre.rc1) + gitaly (~> 16.5.0.pre.rc1) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.0.0) + gitlab-dangerfiles (~> 4.3.2) gitlab-experiment (~> 0.8.0) gitlab-fog-azure-rm (~> 1.8.0) + gitlab-http! gitlab-labkit (~> 0.34.0) gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.23) @@ -1832,9 +1829,9 @@ DEPENDENCIES gitlab-sidekiq-fetcher! gitlab-styles (~> 10.1.0) gitlab-utils! - gitlab_chronic_duration (~> 0.11) + gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.0.0) + gitlab_quality-test_tooling (~> 1.3.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1847,7 +1844,7 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.24, >= 3.24.3) + google-protobuf (~> 3.24, >= 3.24.4) gpgme (~> 2.0.23) grape (~> 1.7.1) grape-entity (~> 0.10.0) @@ -1858,20 +1855,20 @@ DEPENDENCIES graphiql-rails (~> 1.8.0) graphlient (~> 0.5.0) graphlyte (~> 1.0.0) - graphql (~> 1.13.19) - graphql-docs (~> 2.1.0) - grpc (~> 1.55.0) + graphql (~> 2.0.27) + graphql-docs (~> 4.0.0) + grpc (~> 1.58.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.40.0) hamlit (~> 2.15.0) - hangouts-chat (~> 0.0.5) hashie (~> 5.0.0) health_check (~> 3.0) html-pipeline (~> 2.14.3) html2text httparty (~> 0.21.0) icalendar + influxdb-client (~> 2.9) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) @@ -1887,14 +1884,14 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.4.7) + lefthook (~> 1.5.2) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.16) listen (~> 3.7) lockbox (~> 1.3.0) lograge (~> 0.5) - loofah (~> 2.21.3) + loofah (~> 2.21.4) lookbook (~> 2.0, >= 2.0.1) lru_redux mail (= 2.8.1) @@ -1917,7 +1914,7 @@ DEPENDENCIES oj (~> 3.13.21) oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 2.0.1) + omniauth-alicloud (~> 3.0.0) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) @@ -1939,31 +1936,30 @@ DEPENDENCIES org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) - parser (~> 3.2, >= 3.2.2.3) + parser (~> 3.2, >= 3.2.2.4) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.4) pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.28) + prometheus-client-mmap (~> 0.28, >= 0.28.1) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (~> 6.3, >= 6.3.1) + puma (~> 6.4) rack (~> 2.2.8) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.6) + rails (~> 7.0.8) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) - rdoc (~> 6.3.2) - re2 (= 2.0.0) + re2 (= 2.1.3) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) @@ -1973,7 +1969,7 @@ DEPENDENCIES retriable (~> 3.1.2) rexml (~> 3.2.6) rouge (~> 4.1.3) - rqrcode-rails3 (~> 0.1.7) + rqrcode (~> 2.0) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) rspec-rails (~> 6.0.3) @@ -1993,7 +1989,7 @@ DEPENDENCIES sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (= 4.12.0) + selenium-webdriver (~> 4.14) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) @@ -2022,7 +2018,7 @@ DEPENDENCIES tanuki_emoji (~> 0.7) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.2.2) + test-prof (~> 1.2.3) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2034,7 +2030,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.5.0) + view_component (~> 3.6.0) vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) @@ -2045,4 +2041,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.19 + 2.4.20 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 6dcac890ea..e239df5e9e 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 @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -248,17 +248,6 @@ src: }; version = "0.0.12"; }; - asana = { - dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6pqazhi9922y79763m0alvdmvm90i806qgb1a8l4fnimzx7l1n"; - type = "gem"; - }; - version = "0.10.13"; - }; asciidoctor = { groups = ["default"]; platforms = []; @@ -411,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; + sha256 = "0wvrz7d2rw17ihj2fmvaq91cg35pvk1asl4skncsk4w3mx7dlajp"; type = "gem"; }; - version = "3.181.1"; + version = "3.185.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; type = "gem"; }; - version = "1.134.0"; + version = "1.136.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -684,10 +673,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; + sha256 = "172v1vjqqlfk8dw3xh7j4m2wfmp74zwsh2v2jqppgzibmpcqjxxd"; type = "gem"; }; - version = "7.0.2"; + version = "7.1.1"; }; bundler-audit = { dependencies = ["thor"]; @@ -695,10 +684,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; + sha256 = "0gdx0019vj04n1512shhdx7hwphzqmdpw4vva2k551nd47y1dixx"; type = "gem"; }; - version = "0.7.0.1"; + version = "0.9.1"; }; bundler-checksum = { dependencies = []; @@ -752,10 +741,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8k7bbwknqmq64mygl2a137vx3cs8xrjmdp8l3whm6f5vg480hg"; + sha256 = "089s8rbwddzcyw1ky34h90flz5wzqzi2lvajykbxn3l3s6mjsxw1"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; cbor = { groups = ["default"]; @@ -825,10 +814,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn"; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.0"; }; circuitbox = { groups = ["default"]; @@ -951,10 +940,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; cork = { dependencies = ["colored2"]; @@ -1083,6 +1072,16 @@ src: }; version = "8.0.0"; }; + dartsass = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i8kivfa4i1m2msw2h5zigxdnar5fvln7xhym85qyp35lmi74zi6"; + type = "gem"; + }; + version = "1.49.8"; + }; database_cleaner = { groups = ["development" "test"]; platforms = []; @@ -1192,10 +1191,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hglq61xxs8hgj2aq6g94w9ry90jq9aivb3c6fycxz1srdq26lsl"; + sha256 = "02p4cxz9w9nsghgmwmw32f9g80df8simagzpafhkvc5grdwwd8pv"; type = "gem"; }; - version = "0.0.22.pre.alpha1"; + version = "0.0.23.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1234,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35"; + sha256 = "15cbgb0hyq78myc6aaszzdrd9qll9n3qdhykmrx22qiyac3mnpy9"; type = "gem"; }; - version = "4.0.2"; + version = "4.1.1"; }; diff-lcs = { groups = ["default" "development" "test"]; @@ -1558,10 +1557,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5"; + sha256 = "029c7kynhkxw8fgq9q171xi68ajfqrb22r7drvkar018j8871yyz"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; et-orbi = { dependencies = ["tzinfo"]; @@ -1632,10 +1631,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + sha256 = "0f7isjr3vpvmyc3arqcgn1fc69axxd73xk87nk31ibpv15sfzvn8"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; factory_bot = { dependencies = ["activesupport"]; @@ -1804,17 +1803,6 @@ src: }; version = "0.3.0"; }; - faraday_middleware-multi_json = { - dependencies = ["faraday_middleware" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; - type = "gem"; - }; - version = "0.0.6"; - }; fast_blank = { groups = ["default"]; platforms = []; @@ -2131,10 +2119,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hsccw9njvvsic0qn5x1aia0yz66sy4bsw1pixc5jf2g990wrnam"; + sha256 = "0lw3lfq0wii1jg6112ry2c3g01dphwl8yp61xyh66ijds1d525zd"; type = "gem"; }; - version = "16.3.0.pre.rc1"; + version = "16.5.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2164,10 +2152,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04j81xsasbfzc9xs0sgizc76qj26ka629yrcd9l6m3iqj0byiaz3"; + sha256 = "15hax19xpav0i8mhg3y1zf4528hx18r6zg6dy8lwdk7s60gdi2wp"; type = "gem"; }; - version = "4.0.0"; + version = "4.3.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2191,6 +2179,16 @@ src: }; version = "1.8.0"; }; + gitlab-http = { + dependencies = ["activesupport" "httparty" "ipaddress" "nokogiri" "railties"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-http"; + type = "path"; + }; + version = "0.1.0"; + }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; @@ -2310,10 +2308,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19jba5gxlb25mvd85rn3hfzyzsqw4cq7ml13mzq1y0x94hbj1zf2"; + sha256 = "0vf1zw3z45m6ldwjvvzvbc6gr0spcbl1x1vny4qwid8msi26jxhd"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -2332,10 +2330,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nriqgy9rlnachzrq63xakskdgjg9b3bdgh2fb2b63kai8bbwc5h"; + sha256 = "0bk5lhaqfww0swi6xl1wqj6g97xmxlva6b8yyag23743k052x4qc"; type = "gem"; }; - version = "1.0.0"; + version = "1.3.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2583,10 +2581,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3"; + sha256 = "1jpjf9p3yf11f1fx74whp4zbxwcaf7jd5y10gknx61fr5z50791q"; type = "gem"; }; - version = "3.24.3"; + version = "3.24.4"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2735,10 +2733,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njsbxx82vqi8hdn4nad62abmh0x0w3mis3mq79q3xr11srisn23"; + sha256 = "0dlb8hbgs7yas59pwf4k7qrczbgkvrpcjqd2f5cmjj02fxdbwn8z"; type = "gem"; }; - version = "1.13.19"; + version = "2.0.27"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2746,21 +2744,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgb1r4vkyrq8hzhkii48hn7cdlkmnrswzjsl0xqxg1diz705bss"; + sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; graphql-docs = { - dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + dependencies = ["commonmarker" "dartsass" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmmifirvm4hay8qy6hjsdwms56sk973cq1b9c85b97xz0129f3y"; + sha256 = "1mq2zafz0n5yd0i251w1a37l3dk7dn2mhw5snzhjdnv3jaard0pn"; type = "gem"; }; - version = "2.1.0"; + version = "4.0.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -2768,10 +2766,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bk1l7mi98givcd4rj0h9izj97nwgff4lp7xi89mp3z9wpw354sj"; + sha256 = "00lx7sql179ak7rx5vg76z45y558d5wj0gldql4qjcaxjnzcryqc"; type = "gem"; }; - version = "1.55.0"; + version = "1.58.0"; }; gssapi = { dependencies = ["ffi"]; @@ -2859,16 +2857,6 @@ src: }; version = "1.3.7"; }; - hangouts-chat = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; - type = "gem"; - }; - version = "0.0.5"; - }; hashdiff = { groups = ["default" "test"]; platforms = []; @@ -3079,6 +3067,16 @@ src: }; version = "0.1.8"; }; + influxdb-client = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00lzkgzr6zmnlbqcfsb38b4d3762wslx0v32nsy6052jksvas7xm"; + type = "gem"; + }; + version = "2.9.0"; + }; invisible_captcha = { dependencies = ["rails"]; groups = ["default"]; @@ -3351,10 +3349,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112m3ypr3z3n23l0axy057wkbzwhf52p20pya2nylwd8jmck1gi2"; + sha256 = "02k7gr457gdi4zjgxr9ga44f8lb8q0yyiqmwhaylr70n76zqrmrp"; type = "gem"; }; - version = "1.4.7"; + version = "1.5.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -3465,14 +3463,14 @@ src: }; loofah = { dependencies = ["crass" "nokogiri"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c"; type = "gem"; }; - version = "2.21.3"; + version = "2.21.4"; }; lookbook = { dependencies = ["activemodel" "css_parser" "htmlbeautifier" "htmlentities" "marcel" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; @@ -3603,24 +3601,24 @@ src: }; mime-types = { dependencies = ["mime-types-data"]; - groups = ["danger" "default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { - groups = ["danger" "default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.1003"; }; mini_histogram = { groups = ["default" "test"]; @@ -4067,10 +4065,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ls87xxzhh1bbm4iqz221hz57y7iq1ifn33i7vvx1d02r9dl4k5i"; + sha256 = "0gh1d69w6p62hj18bh2p5fdykg9za1yifpq18swp9ms0pcx4yp4w"; type = "gem"; }; - version = "2.0.1"; + version = "3.0.0"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -4408,10 +4406,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; + sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; type = "gem"; }; - version = "3.2.2.3"; + version = "3.2.2.4"; }; parslet = { groups = ["default" "development" "test"]; @@ -4536,10 +4534,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yyd1mvzbv64jc700d2vvdcr4cmb2gwf68368g0bwp1ybn64xqgk"; + sha256 = "0ap52y7lng1cnqmg5bp4hazllppar33fpczwmh6gn9v9l64kkywj"; type = "gem"; }; - version = "0.28.0"; + version = "0.28.1"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4601,10 +4599,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -4739,10 +4737,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4794,10 +4792,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "7.0.6"; + version = "7.0.8"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4881,26 +4879,16 @@ src: }; version = "1.8.0"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; - type = "gem"; - }; - version = "6.3.2"; - }; re2 = { dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09c9f692ixym8sqk26f175jw53a00h2s4xad6z141axpi2mmy1q9"; + sha256 = "13xfrx1wwq7n2qsw449fq8h611n05v400i9dz9k6pdia019hp8q3"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.3"; }; recaptcha = { dependencies = ["json"]; @@ -5107,10 +5095,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; type = "gem"; }; - version = "6.2.0"; + version = "6.3.0"; }; rouge = { groups = ["default" "development" "test"]; @@ -5123,26 +5111,25 @@ src: version = "4.1.3"; }; rqrcode = { - dependencies = ["chunky_png"]; + dependencies = ["chunky_png" "rqrcode_core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "0.7.0"; + version = "2.2.0"; }; - rqrcode-rails3 = { - dependencies = ["rqrcode"]; + rqrcode_core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; + sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; type = "gem"; }; - version = "0.1.7"; + version = "1.2.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -5530,28 +5517,6 @@ src: }; version = "6.0.2"; }; - sass = { - dependencies = ["sass-listen"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; - type = "gem"; - }; - version = "3.5.5"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; sassc = { dependencies = ["ffi"]; groups = ["default"]; @@ -5612,10 +5577,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs"; + sha256 = "094x2gzfxpp4wzyy3fcbb5ah3abvdd41ilzwv5g0hgqx0a0nywjm"; type = "gem"; }; - version = "4.12.0"; + version = "4.14.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -6161,10 +6126,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08j5456rdpgxvv8bs44x81jrxzpxb79wxfxdq4fqwxyircxzi2jj"; + sha256 = "1mhzw33lv7h8d7pyh65lis5svnmm8m6fnszbsfg3j3xk9hcl0an5"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6192,10 +6157,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; thread_safe = { groups = ["default" "test"]; @@ -6517,10 +6482,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "0.12.1"; + version = "0.12.2"; }; uri_template = { groups = ["default"]; @@ -6602,10 +6567,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bz86m3bbnhy8j1gmpm76jcgqfyjafqwyxjdd1bk2f5jmgswvqy3"; + sha256 = "18s2b8g23agnykjjdw74ha0hhzx8n73gn41vsqxmhlgxnh8mr93s"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6719,10 +6684,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -6730,10 +6695,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default" "test"]; 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 64efc4731a..bd39ff1776 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-VJZwNLFePUNIRHEyiEr1tiLaB2tuL6Ah81LNuM/1H14="; + hash = "sha256-ML0sVsegrG96rBfpnD7GgOf9TWe/ojRo9UJwMFpDsKs="; }; - cargoHash = "sha256-vEp0wLxmmmv33oRO7eOxOoOsV87/7DQ8db5RUfqUb88="; + cargoHash = "sha256-gz4VY4a4AK9laIQo2MVTabyKzMyc7jRHrYsrfOLx+Ao="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix index 5da7aab1b6..cf804ddfb5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao="; + hash = "sha256-COgoj5MrX7VBwjgfH+Ud7gp0gE7gpsYoyd0Jv4uXoec="; }; - vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ="; + vendorHash = "sha256-btvFro0K0+9potwForIj/7h41l+LbUE0Gym9aHaWtEE="; subPackages = [ "." diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix index d0e6a1018a..723f4c59e3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.32.0"; + version = "1.34.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-7XFekLlWcifqGJL6IIONpixdMAyGBJJmqo+l6RKCfC8="; + hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U="; }; - vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg="; + vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix index 0c20b51fbc..40b8a9b207 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs="; + hash = "sha256-XqS2oG3/dPHBC/sWN9B7BliSv4IJ1iskrQRTh8vQNd4="; }; - cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc="; + cargoHash = "sha256-0mUkXez+5Z8UGKMrUUjt+aF4zv3EJKgnFoQ068gTlX0="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/darwin-fix.patch b/third_party/nixpkgs/pkgs/applications/version-management/guilt/darwin-fix.patch new file mode 100644 index 0000000000..54c11059be --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/guilt/darwin-fix.patch @@ -0,0 +1,20 @@ +uname -s is used to determine the differences between the command line +utilities like stat or awk in linux and darwin. However, in nix, guilt +will be using the nix versions of this programs, not the ones +installed in the system. Therefore, guilt should use the command-line +parameters that the linux forms of these commands expect, even if it +is being run on Darwin. + +diff --git a/guilt b/guilt +index bf50343..cfc9332 100755 +--- a/guilt ++++ b/guilt +@@ -986,7 +986,7 @@ guards_file="$GUILT_DIR/$branch/guards" + pager="more" + [ ! -z "$PAGER" ] && pager="$PAGER" + +-UNAME_S=`uname -s` ++UNAME_S="Linux" + + if [ -r "$GUILT_PATH/os.$UNAME_S" ]; then + . "$GUILT_PATH/os.$UNAME_S" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix new file mode 100644 index 0000000000..664db771e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/guilt/default.nix @@ -0,0 +1,92 @@ +{ asciidoc +, docbook_xml_dtd_45 +, docbook_xsl +, fetchFromGitHub +, gawk +, git +, gnused +, lib +, makeWrapper +, openssl +, perl +, stdenv +, xmlto +}: + +stdenv.mkDerivation rec { + pname = "guilt"; + version = "0.37-rc1"; + + src = fetchFromGitHub { + owner = "jeffpc"; + repo = "guilt"; + rev = "v${version}"; + sha256 = "sha256-7OgRbMGYWtGvrZxKfJe0CkpmU3AUkPebF5NyTsfXeGA="; + }; + + doCheck = true; + + patches = [ + ./guilt-help-mandir.patch + ./darwin-fix.patch + ]; + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + perl + xmlto + ]; + buildInputs = [ + gawk + git + gnused + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + makeFlags = [ + "PREFIX=$(out)" + ]; + + postBuild = '' + make -j $NIX_BUILD_CORES doc + ''; + + preCheck = '' + patchShebangs regression/run-tests regression/*.sh + ''; + + postInstall = '' + make PREFIX=$out install-doc + ''; + + postFixup = '' + wrapProgram $out/bin/guilt --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + meta = with lib; { + description = "Manage patches like quilt, on top of a git repository"; + longDescription = '' + Andrew Morton originally developed a set of scripts for + maintaining kernel patches outside of any SCM tool. Others + extended these into a suite called quilt]. The basic idea behind + quilt is to maintain patches instead of maintaining source + files. Patches can be added, removed or reordered, and they can + be refreshed as you fix bugs or update to a new base + revision. quilt is very powerful, but it is not integrated with + the underlying SCM tools. This makes it difficult to visualize + your changes. + + Guilt allows one to use quilt functionality on top of a Git + repository. Changes are maintained as patches which are + committed into Git. Commits can be removed or reordered, and the + underlying patch can be refreshed based on changes made in the + working directory. The patch directory can also be placed under + revision control, so you can have a separate history of changes + made to your patches. + ''; + homepage = "https://github.com/jeffpc/guilt"; + maintainers = with lib.maintainers; [ javimerino ]; + license = [ licenses.gpl2 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/guilt/guilt-help-mandir.patch b/third_party/nixpkgs/pkgs/applications/version-management/guilt/guilt-help-mandir.patch new file mode 100644 index 0000000000..54f1149f29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/guilt/guilt-help-mandir.patch @@ -0,0 +1,15 @@ +nixpkgs' post-installation fixup moves the pages to share/man. Tell guilt-help so that it can find them. + +diff --git a/guilt-help b/guilt-help +index 93442a3..b29e059 100755 +--- a/guilt-help ++++ b/guilt-help +@@ -34,7 +34,7 @@ case $# in + ;; + esac + +-MANDIR=`dirname $0`/../man ++MANDIR=`dirname $0`/../share/man + MANDIR=`(cd "$MANDIR"; pwd)` + exec man -M "$MANDIR" "$page" + diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix index ced7717a2c..92457cdbf4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix @@ -1,21 +1,21 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib , nix-update-script }: buildGoModule rec { pname = "gut"; - version = "0.2.10"; + version = "0.3.0"; src = fetchFromGitHub { owner = "julien040"; repo = "gut"; rev = version; - hash = "sha256-y6GhLuTqOaxAQjDgqh1ivDwGhpYY0a6ZNDdE3Pox3is="; + hash = "sha256-l7yjZEcpsnVisd93EqIug1n0k18m4tUmCQFXC6b63cg="; }; - vendorHash = "sha256-91iyAFD/RPEkMarKKVwJ4t92qosP2Db1aQ6dmNZNDwU="; + vendorHash = "sha256-G9oDMHLmdv/vQfofTqKAf21xaGp+lvW+sedLmaj+A5A="; ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ]; @@ -24,10 +24,10 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = { - description = "An easy-to-use git client for Windows, macOS, and Linux"; - homepage = "https://github.com/slackhq/go-audit"; - maintainers = [ lib.maintainers.paveloom ]; - license = [ lib.licenses.mit ]; + meta = with lib; { + description = "An alternative git CLI"; + homepage = "https://gut-cli.dev"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix index 0ed9d70c46..4486c71605 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix @@ -23,13 +23,15 @@ buildGoModule rec { patches = [ # Fix `fish` completions + # https://github.com/github/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/pull/3036.patch"; + url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions + # https://github.com/github/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/pull/2948.patch"; + url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix index a9929cca64..5acd1a6343 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix @@ -30,6 +30,14 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch"; sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns"; }) + + # Merged upstream, fixes builds with newer rustc + (fetchpatch { + name = "josh-fix-builds-with-rust-173.patch"; + url = "https://github.com/josh-project/josh/commit/7b8259b81a9acabb528ddebc4ab30fc712f756fb.patch"; + sha256 = "sha256-YfrVlH6Ox05ZbmB/15HVaFlOyRTOFbYflq0edi6/X9k="; + includes = [ "josh-proxy/src/bin/josh-proxy.rs" ]; + }) ]; cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix index ed8e486681..a4e68c190a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix @@ -20,23 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA="; + hash = "sha256-yEW7+0MnJlW0WeZ6UItaCDrihPLA52mLcu15tJwZx9w="; }; - cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM="; - - buildNoDefaultFeatures = true; - buildFeatures = [ - # enable 'packaging' feature, which enables extra features such as support - # for watchman - "packaging" - ]; + cargoHash = "sha256-xA9SDq1Kc0u8qFEPFFCic9uwE2Y/BXJzUHBCs1Czxtw="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = true; # nextest is the upstream integration framework diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix index 1fb7c16557..62ea51f5e7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.5.1"; + version = "1.5.2"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-v6COZt4ylhpPfPNQLSN0XDpjVk8E2ZUDIP4TU+Uzk5A="; + hash = "sha256-9lAgKHcUAhg3Z8fMNYu3JrjfSd0HaT7YhvjKlpLMi0E="; }; vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix index 224efe8c1a..fc8ec7b55d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { gnome.adwaita-icon-theme ]; - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ pygobject3 pycairo ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix index 2db433b3f8..56e23ee1f6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { revert = true; sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c"; }) + ./monotone-1.1-gcc-14.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch b/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch new file mode 100644 index 0000000000..a5b79b6d02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone/monotone-1.1-gcc-14.patch @@ -0,0 +1,17 @@ +Unsetting __STRICT_ANSI__ is not a supported configuration for gcc +nowadays. gcc-14 started failing libstdc++ build as it uses gcc +extensions without __STRICT_ANSI__: https://gcc.gnu.org/PR111824 +--- a/src/base.hh ++++ b/src/base.hh +@@ -34,11 +34,6 @@ + #define WIN32_LEAN_AND_MEAN + #endif + +-// Cygwin somehow enables strict ansi, which we don't want. +-#ifdef __STRICT_ANSI__ +-#undef __STRICT_ANSI__ +-#endif +- + #include + #include // it would be nice if there were a + diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix index e2cf8e1013..d7dcd14055 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4d/default.nix @@ -7,23 +7,19 @@ let # Upstream replaces minor versions, so use cached URLs. srcs = { - "i686-linux" = fetchurl { - url = "https://web.archive.org/web/20220907001049/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86/helix-core-server.tgz"; - sha256 = "e9cf27c9dd2fa6432745058a93896d151543aff712fce9f7322152d6ea88a12a"; - }; "x86_64-linux" = fetchurl { - url = "https://web.archive.org/web/20220907001202/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "9c272b67574264a4f49fe846ccda24fbd4baeb282665af74b6fbccff26a43558"; + url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362"; }; "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20220907001334/https://ftp.perforce.com/perforce/r22.1/bin.macosx1015x86_64/helix-core-server.tgz"; - sha256 = "2500a23fe482a303bd400f0de460b7624ad3f940fef45246004b9f956e90ea45"; + url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz"; + sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11"; }; }; in stdenv.mkDerivation { pname = "p4d"; - version = "2022.1.2305383"; + version = "2023.1.2513900"; src = assert lib.assertMsg (builtins.hasAttr stdenv.hostPlatform.system srcs) "p4d is not available for ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 1ea92e333d..63f7bf7fbb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.7"; src = fetchCrate { inherit version pname; - hash = "sha256-1cIb4QsDYlOCGrQrLgEwIjjHZ3WwD2o0o0bF+OOqEtI="; + hash = "sha256-BXDz9po8i937/xYoIW4S/FddtcWxSmtRUWYIphgh060="; }; - cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; + cargoHash = "sha256-+KF1G4bDfcjHHzZR93lIR8muO6s3j5jDobr3A7Arr+Q="; doCheck = false; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock index 2c0463dc21..20f5616cc3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -38,35 +38,27 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -86,6 +78,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" @@ -105,19 +109,67 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.71" +name = "anstream" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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 = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" dependencies = [ "backtrace", ] [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -133,9 +185,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[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 = "assert-json-diff" @@ -156,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "bzip2", @@ -186,17 +238,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -205,7 +257,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "num_cpus", "once_cell", "tokio", @@ -213,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -227,6 +279,7 @@ name = "atexit" version = "0.1.0" dependencies = [ "once_cell", + "tracing", ] [[package]] @@ -261,7 +314,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap", + "indexmap 1.9.3", "once_cell", "pem", "simple_asn1", @@ -274,9 +327,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "0.4.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cbf586c80ada5e5ccdecae80d3ef0854f224e2dd74435f8d87e6831b8d0a38" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2", @@ -295,15 +348,19 @@ name = "backingstore" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "configloader", + "constructors", "eagerepo", "edenapi", - "env_logger 0.10.0", + "env_logger 0.10.1", "identity", + "indexedlog", "libc", "log", "manifest", - "parking_lot 0.11.2", + "parking_lot", + "repo", "revisionstore", "tracing", "tracing-collector", @@ -311,27 +368,35 @@ dependencies = [ "types", ] +[[package]] +name = "backingstore-benches" +version = "0.1.0" +dependencies = [ + "backingstore", + "configloader", + "identity", + "minibench", + "procinfo", + "repo", + "tempfile", + "types", +] + [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.1" @@ -340,18 +405,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindag" @@ -376,6 +432,7 @@ dependencies = [ "pyblackbox", "pybytes", "pycats", + "pycext", "pycheckout", "pyclientinfo", "pycliparser", @@ -389,6 +446,7 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", + "pyedenclient", "pyerror", "pyexchange", "pyfail", @@ -399,10 +457,12 @@ dependencies = [ "pyidentity", "pyindexedlog", "pyio", + "pylinelog", "pylock", "pylz4", "pymanifest", "pymetalog", + "pymodules", "pymutationstore", "pynodeipc", "pynodemap", @@ -420,9 +480,12 @@ dependencies = [ "pysptui", "pystatus", "pythreading", + "pytoml", "pytracing", "pytreestate", + "pyversion", "pyvlq", + "pywebview", "pyworker", "pyworkingcopy", "pyxdiff", @@ -430,6 +493,14 @@ dependencies = [ "pyzstore", ] +[[package]] +name = "bindings-lib" +version = "0.1.0" +dependencies = [ + "cpython", + "hgcommands", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -451,6 +522,21 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + [[package]] name = "blackbox" version = "0.1.0" @@ -461,7 +547,7 @@ dependencies = [ "lazy_static", "libc", "minibench", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_alt", "serde_cbor", @@ -472,20 +558,18 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.7", ] [[package]] name = "blake3" -version = "1.3.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", @@ -493,7 +577,6 @@ dependencies = [ "cfg-if 1.0.0", "constant_time_eq", "digest 0.10.7", - "rayon", ] [[package]] @@ -516,9 +599,9 @@ dependencies = [ [[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", @@ -527,9 +610,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", @@ -537,9 +620,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -547,40 +630,30 @@ dependencies = [ [[package]] name = "bufsize" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bbc61bc8800fb287f3394487c159af745cdf2e74743f12245d874ce20eb529" +checksum = "da2a4f1be8d12d1d69cbcfd3e740dddba696710847cf8630f6676860045345e8" dependencies = [ - "bytes 1.4.0", + "bytes", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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 = "0.4.12" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -618,7 +691,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "thiserror", @@ -628,11 +701,12 @@ dependencies = [ [[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 = [ "jobserver", + "libc", ] [[package]] @@ -656,12 +730,12 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.28", + "futures 0.3.29", "io", "manifest", "manifest-tree", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -684,18 +758,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", - "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] @@ -706,7 +777,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -720,19 +791,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.3", "once_cell", "regex", "strsim 0.10.0", "termcolor", - "terminal_size", + "terminal_size 0.2.6", "textwrap 0.16.0", "unicase", ] +[[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive 4.4.7", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.6.0", + "strsim 0.10.0", + "terminal_size 0.3.0", + "unicase", + "unicode-width", +] + [[package]] name = "clap_derive" version = "3.2.25" @@ -746,6 +842,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -755,6 +863,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + [[package]] name = "clidispatch" version = "0.1.0" @@ -765,11 +879,13 @@ dependencies = [ "configloader", "configmodel", "hgplain", + "hostname 0.1.0", "identity", "indexedlog", "io", "network-doctor", "repo", + "sampling", "termlogger", "thiserror", "thrift-types", @@ -784,10 +900,20 @@ name = "clientinfo" version = "0.1.0" dependencies = [ "anyhow", - "configmodel", "hostname 0.1.0", + "lazy_static", + "rand 0.8.5", "serde", "serde_json", + "tracing", +] + +[[package]] +name = "clientinfo_async" +version = "0.1.0" +dependencies = [ + "clientinfo", + "tokio", ] [[package]] @@ -796,7 +922,8 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "cpython_ext", + "indexmap 1.9.3", + "serde", "shlex", "thiserror", ] @@ -824,32 +951,55 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" + +[[package]] +name = "codegen" +version = "0.1.0" +dependencies = [ + "zstdelta", +] [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "quote", ] [[package]] -name = "colored" -version = "1.9.3" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "atty", + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +dependencies = [ + "is-terminal", "lazy_static", "winapi 0.3.9", ] [[package]] name = "comfy-table" -version = "6.1.4" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ "crossterm", "strum", @@ -857,19 +1007,42 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "commandserver" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "configmodel", + "dirs 2.0.2", + "fn-error-context", + "fs2", + "identity", + "libc", + "nodeipc", + "once_cell", + "procutil", + "serde", + "spawn-ext", + "system-command", + "tracing", + "udsipc", + "version", +] + [[package]] name = "commitcloudsubscriber" version = "0.1.0" dependencies = [ "anyhow", "filetime", - "futures 0.3.28", + "futures 0.3.29", "hostcaps", "identity", "lazy_static", "log", "mime", - "parking_lot 0.11.2", + "parking_lot", "regex", "reqwest", "reqwest-eventsource", @@ -881,6 +1054,42 @@ dependencies = [ "tokio", ] +[[package]] +name = "commits-git" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "factory", + "fs-err", + "futures 0.3.29", + "gitdag", + "metalog", + "minibytes", + "parking_lot", + "refencode", + "storemodel", + "tracing", + "types", +] + +[[package]] +name = "commits-trait" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "futures 0.3.29", + "metalog", + "minibytes", + "serde", + "storemodel", + "types", +] + [[package]] name = "conch-parser" version = "0.1.1" @@ -899,11 +1108,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "crossbeam-utils 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -913,13 +1122,11 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_types", "const-cstr", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "thiserror", "thrift_compiler", "tracing", @@ -933,25 +1140,55 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_thrift_types", "const-cstr", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "thiserror", "thrift_compiler", "tracing", "tracing-futures", ] +[[package]] +name = "config_thrift_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "config_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + [[package]] name = "configloader" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.11.0", + "base64 0.13.1", "configmodel", "configset", "dirs 2.0.2", @@ -962,19 +1199,17 @@ dependencies = [ "hostname 0.3.1", "http-client", "identity", - "lazy_static", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", "regex", "serde", "serde_json", "serde_urlencoded 0.7.1", - "sha2 0.10.6", + "sha2 0.10.8", "staticconfig", - "tempdir", "tempfile", + "testutil", "tracing", "types", "unionconfig", @@ -1001,9 +1236,9 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap", + "indexmap 1.9.3", "minibytes", - "tempdir", + "tempfile", "tracing", "util", ] @@ -1028,9 +1263,21 @@ checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constructors" +version = "0.1.0" +dependencies = [ + "commits-git", + "eagerepo", + "edenapi", + "gitstore", + "hgcommits", + "once_cell", +] [[package]] name = "control-point" @@ -1038,13 +1285,41 @@ version = "0.1.0" dependencies = [ "anyhow", "lazy_static", - "parking_lot 0.11.2", + "parking_lot", "serde_json", - "tempdir", + "tempfile", "tracing", "util", ] +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + [[package]] name = "copytrace" version = "0.1.0" @@ -1055,10 +1330,13 @@ dependencies = [ "dag", "git2", "hg-metrics", + "lru-cache", "manifest", "manifest-tree", + "parking_lot", "pathhistory", "pathmatcher", + "serde", "storemodel", "thiserror", "tokio", @@ -1086,9 +1364,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1114,7 +1392,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "itertools", "tokio", ] @@ -1125,10 +1403,9 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "io", "libc", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde", "serde_bytes", @@ -1146,20 +1423,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.4", - "crossbeam-epoch 0.8.2", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", -] - [[package]] name = "crossbeam" version = "0.8.2" @@ -1168,10 +1431,10 @@ checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-epoch 0.9.14", - "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.15", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1183,16 +1446,6 @@ dependencies = [ "crossbeam-utils 0.6.6", ] -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -1200,18 +1453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1221,49 +1463,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.14", - "crossbeam-utils 0.8.15", + "crossbeam-epoch", + "crossbeam-utils 0.8.16", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", - "memoffset 0.8.0", + "crossbeam-utils 0.8.16", + "memoffset 0.9.0", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-queue" version = "0.3.8" @@ -1271,7 +1487,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1286,45 +1502,34 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", - "parking_lot 0.12.1", - "signal-hook 0.3.15", + "parking_lot", + "signal-hook 0.3.17", "signal-hook-mio", "winapi 0.3.9", ] [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi 0.3.9", ] @@ -1339,16 +1544,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "csscolorparser" version = "0.6.2" @@ -1356,7 +1551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.1", + "phf 0.11.2", ] [[package]] @@ -1371,11 +1566,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.3.1" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.2", + "nix 0.27.1", "windows-sys 0.48.0", ] @@ -1390,15 +1585,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.10", "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.62+curl-8.1.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274ef7ef7c1113c7611af49ce248a700afa1171045a1aaa40137030773f993b8" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -1407,7 +1602,51 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi 0.3.9", + "windows-sys 0.48.0", +] + +[[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.39", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -1416,16 +1655,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "byteorder", "dag-types", "dev-logger", "drawdag", "fail", "fs2", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", - "indexmap", + "indexmap 1.9.3", "mincode", "minibytes", "nonblocking", @@ -1466,15 +1705,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core 0.9.7", + "parking_lot_core", "rayon", "serde", ] @@ -1490,9 +1729,18 @@ dependencies = [ [[package]] name = "deltae" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef311e2c0a388b9ba56c839ac68d33b92d18ce7104d0acc4375cb479e2b9a53" +checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "dev-logger" @@ -1590,12 +1838,12 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "configloader", "configmodel", "dag", "edenapi_trait", + "factory", "fail", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "http", "identity", @@ -1603,7 +1851,7 @@ dependencies = [ "metalog", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "storemodel", "tempfile", "thiserror", @@ -1623,7 +1871,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "structopt", ] @@ -1634,23 +1882,23 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bytes 1.4.0", + "bytes", "chrono", + "clientinfo", + "clientinfo_async", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hg-http", "http-client", "itertools", - "lazy_static", "metrics", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pprint", "progress-model", - "rand 0.8.5", "repo_name", "serde", "serde_cbor", @@ -1669,10 +1917,10 @@ dependencies = [ "anyhow", "blake2", "cloned", - "crossbeam 0.8.2", + "crossbeam", "edenapi", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "itertools", "minibytes", "tokio", @@ -1689,7 +1937,7 @@ dependencies = [ "auth", "configmodel", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "http", "http-client", "minibytes", @@ -1704,7 +1952,9 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.4.0", + "blake2", + "blake3", + "bytes", "dag-types", "insta_ext", "paste", @@ -1716,38 +1966,56 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", + "sha1", + "sha2 0.10.8", "thiserror", "type_macros", "types", ] [[package]] -name = "edenfs_client" +name = "edenfs-client" version = "0.1.0" dependencies = [ "anyhow", - "byteorder", - "chrono", + "async-runtime", + "clientinfo", "fbthrift_socket", + "fs-err", "identity", - "io", "serde", - "sha2 0.10.6", - "status", - "thiserror", "thrift-types", - "tokio", "tokio-uds-compat", "toml", + "tracing", + "types", +] + +[[package]] +name = "edenfs_ffi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cxx", + "cxx-build", + "futures 0.3.29", + "identity", + "manifest", + "manifest-tree", + "once_cell", + "pathmatcher", + "repo", + "sparse", + "tokio", "types", - "util", ] [[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 = "encode_unicode" @@ -1766,23 +2034,23 @@ dependencies = [ [[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 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -1797,9 +2065,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1809,24 +2077,28 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ - "cc", "libc", + "windows-sys 0.48.0", ] [[package]] @@ -1873,6 +2145,14 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "factory" +version = "0.1.0" +dependencies = [ + "anyhow", + "tracing", +] + [[package]] name = "fail" version = "0.4.0" @@ -1884,6 +2164,16 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "faster-hex" version = "0.6.1" @@ -1899,31 +2189,52 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#5ed29aacd750ec0eb3914f255feab6705fe9d90e" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", + "fb303_core_types", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "thiserror", "thrift_compiler", "tracing", "tracing-futures", ] +[[package]] +name = "fb303_core_types" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "fbinit_macros", "quickcheck", @@ -1932,7 +2243,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quote", @@ -1942,18 +2253,18 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#68e4e25248eee387a2aa869cac55a18e1041649b" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#7ba2d200ef5654b277c9ae85fe8b3bdbe15433e0" dependencies = [ "anyhow", "async-trait", - "base64 0.11.0", + "base64 0.13.1", "bufsize", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "ghost", "num-derive", "num-traits", - "ordered-float 1.1.1", + "ordered-float", "panic-message", "serde_json", "thiserror", @@ -1962,34 +2273,34 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "byteorder", - "bytes 1.4.0", - "tokio-util 0.6.10", + "bytes", + "tokio-util 0.7.10", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "bytes 1.4.0", + "bytes", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tokio-tower", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "tokio", ] @@ -2018,13 +2329,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -2042,16 +2353,23 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "futures 0.1.31", - "libc", - "miniz_oxide 0.4.4", - "tokio-io", + "miniz_oxide", +] + +[[package]] +name = "fn-error-context" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2077,9 +2395,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2096,6 +2414,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "fs-err" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f" +dependencies = [ + "autocfg", +] + [[package]] name = "fs2" version = "0.4.3" @@ -2147,9 +2474,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2162,9 +2489,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2172,15 +2499,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2189,9 +2516,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2199,7 +2526,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2210,26 +2537,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -2239,9 +2566,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2288,9 +2615,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2299,20 +2626,20 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.9" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" +checksum = "ef81e7cedce6ab54cd5dc7b3400c442c8d132fe03200a1be0637db7ef308ff17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -2320,7 +2647,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2337,7 +2664,7 @@ dependencies = [ "dag", "git2", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "tracing", ] @@ -2347,7 +2674,8 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "factory", + "fs-err", "git2", "minibytes", "storemodel", @@ -2362,33 +2690,34 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", "regex", + "serde", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tracing", ] @@ -2404,7 +2733,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash 0.4.7", + "ahash 0.4.8", ] [[package]] @@ -2415,11 +2744,12 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", + "allocator-api2", ] [[package]] @@ -2448,18 +2778,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.3" 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 = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2487,7 +2808,7 @@ name = "hg-metrics" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -2505,8 +2826,10 @@ dependencies = [ "cliparser", "clone", "comfy-table", + "commandserver", "configloader", "configmodel", + "constructors", "cpython", "cpython_ext", "ctrlc", @@ -2514,39 +2837,43 @@ dependencies = [ "debugtop", "eagerepo", "edenapi", - "edenfs_client", + "edenfs-client", "exchange", "fail", "flate2", "formatter", + "fs-err", "fsyncglob", "hg-http", + "hg-metrics", "hgplain", "hgtime", "hostname 0.3.1", "identity", "indexedlog", "libc", + "metalog", "metrics-render", "migration", "mincode", "minibytes", "network-doctor", "nodeipc", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "procinfo", "progress-model", "progress-render", "pyconfigloader", + "pyedenclient", + "pyio", + "pymodules", "python3-sys", "pytracing", "rand 0.8.5", "repo", "repo_name", "revisionstore", - "revsets", "runlog", "sampling", "serde", @@ -2573,19 +2900,17 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "commits-trait", "dag", "edenapi", - "futures 0.3.28", - "gitdag", - "metalog", + "factory", + "fs-err", + "futures 0.3.29", "minibytes", - "parking_lot 0.11.2", - "refencode", + "parking_lot", "revlogindex", - "serde", "storemodel", "streams", - "thiserror", "tracing", "types", "zstore", @@ -2605,6 +2930,8 @@ dependencies = [ "identity", "libc", "pyblackbox", + "tracing", + "webview-app", "winapi 0.3.9", ] @@ -2636,18 +2963,27 @@ dependencies = [ "humantime", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2666,13 +3002,13 @@ 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 1.4.0", + "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.9", ] [[package]] @@ -2681,7 +3017,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes", "http", "pin-project-lite", ] @@ -2693,19 +3029,20 @@ dependencies = [ "anyhow", "assert_matches", "async-compression", - "atty", - "crossbeam 0.8.2", + "async-runtime", + "clientinfo", + "crossbeam", "curl", "curl-sys", - "env_logger 0.10.0", - "futures 0.3.28", + "env_logger 0.10.1", + "futures 0.3.29", "http", "lru-cache", "maplit", "mockito", "once_cell", "openssl", - "parking_lot 0.11.2", + "parking_lot", "paste", "pin-project 0.4.30", "regex", @@ -2715,7 +3052,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tracing", "url", "zstd", @@ -2729,9 +3066,9 @@ 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 = "humantime" @@ -2741,11 +3078,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2754,9 +3091,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2765,10 +3102,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -2782,7 +3120,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.4.0", + "bytes", "hyper", "native-tls", "tokio", @@ -2791,16 +3129,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2819,11 +3157,22 @@ dependencies = [ "anyhow", "dirs 2.0.2", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "tracing", ] +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.3.0" @@ -2834,6 +3183,16 @@ dependencies = [ "unicode-normalization", ] +[[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 = "ignore" version = "0.4.20" @@ -2851,12 +3210,27 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "im" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core 0.6.4", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + [[package]] name = "indexedlog" version = "0.1.0" dependencies = [ "atomicfile", "byteorder", + "configmodel", "dev-logger", "fs2", "hex", @@ -2872,6 +3246,7 @@ dependencies = [ "tracing", "twox-hash", "vlqencoding", + "winapi 0.3.9", ] [[package]] @@ -2888,10 +3263,20 @@ dependencies = [ ] [[package]] -name = "insta" -version = "1.29.0" +name = "indexmap" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "insta" +version = "1.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -2921,60 +3306,69 @@ dependencies = [ name = "io" version = "0.1.0" dependencies = [ - "atty", "configmodel", "hgplain", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pipe", "streampager", - "terminal_size", + "terminal_size 0.3.0", "termwiz", + "time-interval", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +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-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.24", "windows-sys 0.48.0", ] [[package]] -name = "itertools" -version = "0.10.5" +name = "is-wsl" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -2987,24 +3381,24 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -3050,9 +3444,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3070,14 +3464,25 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.7+1.45.0" +version = "0.1.8+1.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" 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.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libssh2-sys" version = "0.2.23" @@ -3094,9 +3499,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3113,6 +3518,23 @@ dependencies = [ "safemem", ] +[[package]] +name = "linelog" +version = "0.1.0" +dependencies = [ + "im", + "rand_chacha 0.3.1", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -3125,6 +3547,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + [[package]] name = "local-encoding" version = "0.2.0" @@ -3138,9 +3566,9 @@ dependencies = [ [[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", @@ -3148,21 +3576,20 @@ 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 1.0.0", "value-bag", ] [[package]] name = "lru" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.2", ] [[package]] @@ -3211,12 +3638,12 @@ name = "manifest-tree" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "manifest", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -3247,20 +3674,20 @@ 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]] -name = "maybe-uninit" -version = "2.0.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -3277,15 +3704,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.6.5" @@ -3297,9 +3715,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3314,7 +3732,7 @@ dependencies = [ "lazy_static", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -3330,7 +3748,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "once_cell", ] @@ -3387,7 +3805,7 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes", "memmap2", "quickcheck", "serde", @@ -3401,33 +3819,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3441,7 +3849,7 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.6", + "sha2 0.10.8", "toml", ] @@ -3483,14 +3891,14 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "dag", "drawdag", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "tempdir", + "tempfile", "types", "vlqencoding", ] @@ -3535,7 +3943,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3543,14 +3951,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", - "static_assertions", ] [[package]] @@ -3560,11 +3967,17 @@ dependencies = [ "anyhow", "filedescriptor 0.7.3", "libc", - "once_cell", + "nodeipc_derive", + "paste", "serde", "serde_json", + "winapi 0.3.9", ] +[[package]] +name = "nodeipc_derive" +version = "0.1.0" + [[package]] name = "nodemap" version = "0.1.0" @@ -3601,7 +4014,7 @@ dependencies = [ name = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", ] [[package]] @@ -3616,9 +4029,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3648,20 +4061,20 @@ dependencies = [ [[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 0.3.3", "libc", ] @@ -3676,18 +4089,18 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -3696,12 +4109,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "openssl" -version = "0.10.52" +name = "open" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" dependencies = [ - "bitflags", + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openssl" +version = "0.10.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +dependencies = [ + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3718,7 +4142,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -3729,9 +4153,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3741,23 +4165,15 @@ dependencies = [ [[package]] name = "ordered-float" -version = "1.1.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", + "rand 0.8.5", "serde", ] -[[package]] -name = "ordered-float" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-multimap" version = "0.3.1" @@ -3770,18 +4186,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi 0.3.9", -] +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -3797,20 +4204,9 @@ checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[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.6", -] +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3819,41 +4215,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pathhistory" @@ -3866,6 +4254,7 @@ dependencies = [ "dev-logger", "manifest", "manifest-tree", + "sha1", "storemodel", "tokio", "tracing", @@ -3877,14 +4266,17 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", + "fancy-regex", + "fs-err", + "glob", "globset", "ignore", - "parking_lot 0.11.2", - "regex-automata", - "regex-syntax 0.6.29", + "parking_lot", + "regex-automata 0.3.9", "tempfile", "thiserror", + "tracing", "types", "util", ] @@ -3902,25 +4294,31 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "perthread" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" [[package]] name = "pest" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -3928,26 +4326,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] @@ -3961,45 +4359,45 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -4013,9 +4411,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -4031,11 +4429,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.0", + "pin-project-internal 1.1.3", ] [[package]] @@ -4051,20 +4449,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[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" @@ -4089,16 +4487,16 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.1", - "indexmap", + "base64 0.21.5", + "indexmap 2.1.0", "line-wrap", "quick-xml", "serde", - "time 0.3.21", + "time", ] [[package]] @@ -4108,7 +4506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", @@ -4117,6 +4515,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "pprint" version = "0.1.0" @@ -4133,13 +4537,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -4169,9 +4571,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4185,14 +4587,25 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "procutil" +version = "0.1.0" +dependencies = [ + "libc", + "once_cell", + "tracing", + "winapi 0.3.9", +] + [[package]] name = "progress-model" version = "0.1.0" dependencies = [ "arc-swap", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "paste", + "thread_local", "tokio", "tracing", ] @@ -4203,9 +4616,26 @@ version = "0.1.0" dependencies = [ "progress-model", "termwiz", + "unicode-segmentation", "unicode-width", ] +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[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 = "pulldown-cmark" version = "0.0.3" @@ -4222,6 +4652,7 @@ dependencies = [ "atexit", "cpython", "cpython_ext", + "procutil", ] [[package]] @@ -4250,7 +4681,6 @@ name = "pybytes" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "minibytes", "python3-sys", ] @@ -4259,12 +4689,19 @@ dependencies = [ name = "pycats" version = "0.1.0" dependencies = [ - "anyhow", "cats", "cpython", "cpython_ext", "pyconfigloader", - "url", +] + +[[package]] +name = "pycext" +version = "0.1.0" +dependencies = [ + "cc", + "cpython", + "python3-sys", ] [[package]] @@ -4285,8 +4722,6 @@ dependencies = [ "pystatus", "pytreestate", "storemodel", - "treestate", - "types", "vfs", ] @@ -4297,7 +4732,6 @@ dependencies = [ "clientinfo", "cpython", "cpython_ext", - "pyconfigloader", ] [[package]] @@ -4308,7 +4742,6 @@ dependencies = [ "cliparser", "configmodel", "cpython", - "cpython_ext", "pyconfigloader", ] @@ -4325,27 +4758,23 @@ dependencies = [ name = "pyconfigloader" version = "0.1.0" dependencies = [ - "anyhow", "configloader", "cpython", "cpython_ext", "util", - "version", ] [[package]] name = "pycopytrace" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "configmodel", "copytrace", "cpython", "cpython_ext", "dag", - "parking_lot 0.11.2", - "pymanifest", + "parking_lot", "storemodel", "types", ] @@ -4359,11 +4788,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.28", + "futures 0.3.29", "hgcommits", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyedenapi", + "pyio", "pymetalog", "storemodel", ] @@ -4373,7 +4803,6 @@ name = "pydiffhelpers" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", ] [[package]] @@ -4382,7 +4811,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "encoding", + "dirs 2.0.2", ] [[package]] @@ -4390,7 +4819,6 @@ name = "pydoctor" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "network-doctor", "pyconfigloader", ] @@ -4407,14 +4835,12 @@ dependencies = [ name = "pyeagerepo" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "cpython", "cpython_ext", "dag", "eagerepo", "edenapi_types", - "pyconfigloader", "pydag", "pyedenapi", "storemodel", @@ -4426,7 +4852,6 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "blake2", "cpython", "cpython_async", "cpython_ext", @@ -4434,17 +4859,26 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "minibytes", "progress-model", "pyconfigloader", - "pyprogress", "pyrevisionstore", "revisionstore", "types", ] +[[package]] +name = "pyedenclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", + "types", +] + [[package]] name = "pyerror" version = "0.1.0" @@ -4455,15 +4889,14 @@ dependencies = [ "cpython_ext", "dag", "edenapi", - "hgcommits", "http-client", "indexedlog", "metalog", + "pathmatcher", "repo", "repolock", "revisionstore", "revlogindex", - "treestate", "types", ] @@ -4502,7 +4935,6 @@ dependencies = [ name = "pygitstore" version = "0.1.0" dependencies = [ - "anyhow", "cpython", "cpython_ext", "gitstore", @@ -4551,13 +4983,21 @@ dependencies = [ name = "pyio" version = "0.1.0" dependencies = [ - "clidispatch", "cpython", "cpython_ext", + "io", "pyconfigloader", "termstyle", ] +[[package]] +name = "pylinelog" +version = "0.1.0" +dependencies = [ + "cpython", + "linelog", +] + [[package]] name = "pylock" version = "0.1.0" @@ -4585,7 +5025,7 @@ dependencies = [ "cpython_ext", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "types", @@ -4598,7 +5038,17 @@ dependencies = [ "cpython", "cpython_ext", "metalog", - "parking_lot 0.11.2", + "parking_lot", +] + +[[package]] +name = "pymodules" +version = "0.1.0" +dependencies = [ + "cpython", + "minibytes", + "pybytes", + "python-modules", ] [[package]] @@ -4658,6 +5108,7 @@ dependencies = [ "cpython", "cpython_ext", "pathmatcher", + "tracing", "types", ] @@ -4676,6 +5127,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "procutil", "spawn-ext", ] @@ -4714,7 +5166,7 @@ dependencies = [ "cpython", "cpython_ext", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "renderdag", ] @@ -4722,16 +5174,20 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "pydag", + "pyeagerepo", "pyedenapi", "pymetalog", + "pyrevisionstore", "pyworkingcopy", "repo", "repolock", + "revisionstore", "util", "workingcopy", ] @@ -4746,10 +5202,10 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "io", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "revisionstore", "storemodel", @@ -4762,7 +5218,6 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "dag", "pybytes", "pydag", "revlogindex", @@ -4787,6 +5242,17 @@ dependencies = [ "cpython_ext", "status", "types", + "util", +] + +[[package]] +name = "python-modules" +version = "0.1.0" +dependencies = [ + "codegen", + "once_cell", + "phf 0.11.2", + "zstdelta", ] [[package]] @@ -4804,6 +5270,16 @@ name = "pythreading" version = "0.1.0" dependencies = [ "cpython", + "rand 0.8.5", +] + +[[package]] +name = "pytoml" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "toml", ] [[package]] @@ -4814,7 +5290,7 @@ dependencies = [ "cpython_ext", "lazy_static", "mincode", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde_json", "tracing", @@ -4830,7 +5306,7 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "treestate", @@ -4838,15 +5314,33 @@ dependencies = [ "vfs", ] +[[package]] +name = "pyversion" +version = "0.1.0" +dependencies = [ + "cpython", + "version", +] + [[package]] name = "pyvlq" version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "pyio", "vlqencoding", ] +[[package]] +name = "pywebview" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "webview-app", +] + [[package]] name = "pyworker" version = "0.1.0" @@ -4854,7 +5348,7 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", - "crossbeam 0.7.3", + "crossbeam", "memmap2", "minibytes", "pyrevisionstore", @@ -4873,15 +5367,16 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", + "fs-err", "io", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pyconfigloader", - "pymanifest", "pypathmatcher", "pystatus", "pytreestate", - "storemodel", + "sparse", + "types", "workingcopy", ] @@ -4916,9 +5411,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -4937,7 +5432,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quickcheck", @@ -4958,9 +5453,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -5011,6 +5506,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -5063,7 +5559,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.11", + "serde", ] [[package]] @@ -5076,10 +5573,19 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.7.0" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.4", +] + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -5087,14 +5593,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-utils 0.8.15", - "num_cpus", + "crossbeam-deque", + "crossbeam-utils 0.8.16", ] [[package]] @@ -5106,53 +5610,53 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "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_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.9", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -5164,13 +5668,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.2" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -5182,6 +5687,28 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -5190,9 +5717,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remove_dir_all" @@ -5207,7 +5740,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dag", "itertools", "nonblocking", @@ -5221,18 +5754,20 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits-trait", "configloader", "configmodel", + "constructors", "eagerepo", "edenapi", + "factory", "fail", - "gitstore", - "hgcommits", + "fs-err", "identity", "manifest-tree", "metalog", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "refencode", "repolock", "revisionstore", @@ -5262,8 +5797,9 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", + "fs-err", "fs2", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "thiserror", "tracing", @@ -5272,12 +5808,14 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.1", - "bytes 1.4.0", + "base64 0.21.5", + "bytes", + "cookie", + "cookie_store", "encoding_rs", "futures-core", "futures-util", @@ -5302,10 +5840,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tower-service", "url", "wasm-bindgen", @@ -5318,9 +5857,9 @@ dependencies = [ [[package]] name = "reqwest-eventsource" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" dependencies = [ "eventsource-stream", "futures-core", @@ -5339,18 +5878,18 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "auth", - "bincode", - "blake2", - "blake3", "byteorder", + "clientinfo", + "clientinfo_async", "configmodel", - "crossbeam 0.8.2", + "crossbeam", "curl", "edenapi", "edenapi_types", "fbinit", - "futures 0.3.28", + "fn-error-context", + "fs-err", + "futures 0.3.29", "hex", "hg-http", "hg-metrics", @@ -5359,7 +5898,6 @@ dependencies = [ "http", "http-client", "indexedlog", - "lazy_static", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5369,8 +5907,7 @@ dependencies = [ "minibytes", "mockito", "mpatch", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "quickcheck", "quickcheck_arbitrary_derive", @@ -5383,7 +5920,8 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.6", + "sha2 0.10.8", + "stats", "storemodel", "tempfile", "thiserror", @@ -5422,7 +5960,7 @@ dependencies = [ "lz4-pyframe", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "radixbuf", "tempfile", "thiserror", @@ -5435,7 +5973,9 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "configmodel", "dag", + "edenapi", "metalog", "refencode", "thiserror", @@ -5445,17 +5985,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom 0.2.11", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5468,7 +6007,7 @@ dependencies = [ "fs2", "hg-http", "libc", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "rand 0.8.5", "repo", @@ -5496,23 +6035,36 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", @@ -5522,9 +6074,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -5534,18 +6086,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.1", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -5553,15 +6105,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -5583,18 +6135,19 @@ name = "sampling" version = "0.1.0" dependencies = [ "configmodel", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", + "serde", + "serde_json", "tracing", ] [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5604,7 +6157,7 @@ dependencies = [ "anyhow", "clap 2.34.0", "commitcloudsubscriber", - "env_logger 0.10.0", + "env_logger 0.10.1", "libc", "log", "serde", @@ -5615,15 +6168,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scratch" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -5631,11 +6190,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5644,9 +6203,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5672,9 +6231,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5686,11 +6245,11 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", "byteorder", - "bytes 1.4.0", + "bytes", "serde", "serde_bytes", "thiserror", @@ -5698,9 +6257,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] @@ -5717,31 +6276,40 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5765,16 +6333,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[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 1.0.0", "cpufeatures", @@ -5802,9 +6370,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 1.0.0", "cpufeatures", @@ -5813,9 +6381,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", ] @@ -5831,9 +6399,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -5847,9 +6415,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -5863,7 +6431,7 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio", - "signal-hook 0.3.15", + "signal-hook 0.3.17", ] [[package]] @@ -5877,26 +6445,37 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple_asn1" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" dependencies = [ "chrono", "num-bigint", "num-traits", + "thiserror", ] [[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 = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] [[package]] name = "skeptic" @@ -5910,33 +6489,43 @@ dependencies = [ [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[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 0.3.9", ] +[[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 = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "itertools", "quickcheck", @@ -5947,7 +6536,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.28", + "futures 0.3.29", "globset", "once_cell", "pathmatcher", @@ -5969,9 +6558,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "static_assertions" @@ -5984,7 +6573,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.1", + "phf 0.11.2", "staticconfig_macros", ] @@ -5993,7 +6582,30 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap", + "indexmap 1.9.3", +] + +[[package]] +name = "stats" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "fbinit", + "futures 0.3.29", + "once_cell", + "perthread", + "stats_traits", + "tokio_shim", +] + +[[package]] +name = "stats_traits" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "auto_impl", + "dashmap", + "fbinit", ] [[package]] @@ -6008,10 +6620,13 @@ name = "storemodel" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", - "auto_impl", - "futures 0.3.28", + "configmodel", + "edenapi_trait", + "futures 0.3.29", "minibytes", + "serde", "types", ] @@ -6022,7 +6637,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap", + "indexmap 1.9.3", "lazy_static", "lru", "memmap2", @@ -6046,7 +6661,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "futures 0.3.29", "pin-project 0.4.30", "tokio", ] @@ -6114,9 +6729,71 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "1.0.0-alpha.5" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +checksum = "b15df12a8db7c216a04b4b438f90d50d5335cd38f161b56389c9f5c9d96d0873" + +[[package]] +name = "sval_buffer" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e80556bc8acea0446e574ce542ad6114a76a0237f28a842bc01ca3ea98f479" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d93d2259edb1d7b4316179f0a98c62e3ffc726f47ab200e07cfe382771f57b8" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532f7f882226f7a5a4656f5151224aaebf8217e0d539cb1595b831bace921343" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e03bd8aa0ae6ee018f7ae95c9714577687a4415bd1a5f19b26e34695f7e072" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ed054f2fb8c2a0ab5d36c1ec57b412919700099fc5e32ad8e7a38b23e1a9e1" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff191c4ff05b67e3844c161021427646cde5d6624597958be158357d9200586" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] [[package]] name = "syn" @@ -6131,9 +6808,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6152,6 +6829,31 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-command" +version = "0.1.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]] name = "tempdir" version = "0.3.7" @@ -6164,22 +6866,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6190,7 +6892,17 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", + "windows-sys 0.48.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -6203,7 +6915,7 @@ dependencies = [ "dirs 4.0.0", "fnv", "nom 5.1.3", - "phf 0.11.1", + "phf 0.11.2", "phf_codegen", ] @@ -6245,7 +6957,7 @@ checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" dependencies = [ "anyhow", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "cassowary", "cfg-if 1.0.0", "filedescriptor 0.8.2", @@ -6260,7 +6972,7 @@ dependencies = [ "nix 0.24.3", "num-derive", "num-traits", - "ordered-float 3.7.0", + "ordered-float", "pest", "pest_derive", "phf 0.10.1", @@ -6281,6 +6993,14 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "testutil" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -6296,28 +7016,28 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size", + "terminal_size 0.2.6", "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -6341,14 +7061,12 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "sorted_vector_map", "thiserror", "thrift_compiler", + "thrift_types", "tracing", "tracing-futures", ] @@ -6362,7 +7080,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", "thiserror", "thrift", ] @@ -6370,33 +7088,44 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "clap 2.34.0", + "clap 4.4.8", + "serde", "which", ] [[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +name = "thrift_types" +version = "0.1.0" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "anyhow", + "codegen_includer_proc_macro", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "sorted_vector_map", + "thiserror", + "thrift_compiler", ] [[package]] name = "time" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.9", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -6404,19 +7133,33 @@ 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-interval" +version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] +[[package]] +name = "tinyfiledialogs" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25fa0bc43a6566e2cc6d7ac96df3fa5a57beba34445bead1b368ba8fe9ca568" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -6434,44 +7177,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", - "bytes 1.4.0", + "backtrace", + "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - [[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.16", + "syn 2.0.39", ] [[package]] @@ -6486,9 +7218,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -6503,7 +7235,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", ] [[package]] @@ -6512,11 +7244,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4322b6e2ebfd3be4082c16df4341505ef333683158b55f22afaf3f61565d728" dependencies = [ - "crossbeam 0.8.2", + "crossbeam", "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.0", + "pin-project 1.1.3", "tokio", "tower", "tower-service", @@ -6526,10 +7258,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "async-io", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tracing", "uds_windows", @@ -6541,7 +7273,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -6553,23 +7285,39 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", + "futures-io", "futures-sink", + "futures-util", + "hashbrown 0.14.2", "pin-project-lite", + "slab", "tokio", "tracing", ] +[[package]] +name = "tokio_shim" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "futures 0.3.29", + "pin-project 0.4.30", + "thiserror", + "tokio", + "tokio-stream", +] + [[package]] name = "toml" -version = "0.7.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -6579,20 +7327,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6627,11 +7375,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 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6648,22 +7395,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap", + "indexmap 1.9.3", "libc", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_json", "tracing", @@ -6673,9 +7420,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6687,20 +7434,20 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-task", - "pin-project 1.1.0", + "pin-project 1.1.3", "tracing", ] [[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", ] @@ -6719,7 +7466,7 @@ name = "tracing-runtime-callsite" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", "regex", "tracing", ] @@ -6728,10 +7475,7 @@ dependencies = [ name = "tracing-sampler" version = "0.1.0" dependencies = [ - "once_cell", "sampling", - "serde", - "serde_json", "tempfile", "tracing", "tracing-serde", @@ -6750,21 +7494,21 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "time 0.3.21", + "time", "tracing", "tracing-core", "tracing-log", @@ -6799,8 +7543,10 @@ name = "treestate" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "atomicfile", + "bitflags 1.3.2", "byteorder", + "fs-err", "fs2", "identity", "itertools", @@ -6809,7 +7555,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.6", + "sha2 0.10.8", "tempfile", "thiserror", "tracing", @@ -6848,9 +7594,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" @@ -6876,9 +7622,9 @@ dependencies = [ [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uds_windows" @@ -6890,11 +7636,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "udsipc" +version = "0.1.0" +dependencies = [ + "anyhow", + "fn-error-context", + "fs-err", + "nodeipc", + "uds_windows", +] + [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -6907,9 +7664,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -6928,9 +7685,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -6943,24 +7700,24 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap", + "indexmap 1.9.3", "staticconfig", ] [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] @@ -6985,20 +7742,20 @@ dependencies = [ "once_cell", "rand 0.8.5", "shellexpand", - "tempdir", "tempfile", "thiserror", + "widestring", "winapi 0.3.9", ] [[package]] name = "uuid" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "atomic", - "getrandom 0.2.9", + "getrandom 0.2.11", "serde", "sha1_smol", ] @@ -7011,13 +7768,38 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba39dc791ecb35baad371a3fc04c6eab688c04937d2e0ac6c22b612c0357bf" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e06c10810a57bbf45778d023d432a50a1daa7d185991ae06bcfb6c654d0945" dependencies = [ - "ctor", "sval", - "version_check", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", ] [[package]] @@ -7047,7 +7829,7 @@ name = "vfs" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "dashmap", "fsinfo", "identity", @@ -7086,15 +7868,15 @@ 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.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -7102,11 +7884,10 @@ dependencies = [ [[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", ] @@ -7116,12 +7897,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" @@ -7130,9 +7905,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7140,24 +7915,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7167,9 +7942,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7177,28 +7952,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -7210,11 +7985,11 @@ dependencies = [ [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "maplit", "serde", "serde_bser", @@ -7226,31 +8001,41 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "webview-app" +version = "0.1.0" dependencies = [ - "ring", - "untrusted", + "anyhow", + "base64 0.13.1", + "dirs 2.0.2", + "open", + "serde", + "serde_json", + "tinyfiledialogs", + "tracing", + "version", + "webview-sys", ] [[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +name = "webview-sys" +version = "0.6.2" dependencies = [ - "webpki", + "cc", ] [[package]] @@ -7282,7 +8067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" dependencies = [ "log", - "ordered-float 3.7.0", + "ordered-float", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -7301,15 +8086,22 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.24", ] +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.2.8" @@ -7340,9 +8132,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 0.3.9", ] @@ -7354,27 +8146,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.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 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -7392,7 +8169,7 @@ 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]] @@ -7412,17 +8189,17 @@ dependencies = [ [[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]] @@ -7433,9 +8210,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -7445,9 +8222,9 @@ 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_i686_gnu" @@ -7457,9 +8234,9 @@ 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_msvc" @@ -7469,9 +8246,9 @@ 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_x86_64_gnu" @@ -7481,9 +8258,9 @@ 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_gnullvm" @@ -7493,9 +8270,9 @@ 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_msvc" @@ -7505,26 +8282,27 @@ 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 = "winnow" -version = "0.4.6" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" 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 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -7534,16 +8312,19 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags", + "bitflags 1.3.2", + "configloader", "configmodel", - "crossbeam 0.8.2", - "edenfs_client", - "futures 0.3.28", + "crossbeam", + "edenfs-client", + "fs-err", + "futures 0.3.29", + "hgtime", "identity", "io", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "repolock", @@ -7552,10 +8333,8 @@ dependencies = [ "sparse", "status", "storemodel", - "tempdir", "tempfile", "thiserror", - "thrift-types", "tokio", "tracing", "treestate", @@ -7596,32 +8375,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zerocopy" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -7645,7 +8442,7 @@ dependencies = [ "lru-cache", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "serde", "sha1", diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix index 85a4e4d901..3a51d280db 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix @@ -16,9 +16,12 @@ , fixup_yarn_lock , glibcLocales , libiconv +, Cocoa , CoreFoundation +, CoreGraphics , CoreServices , Security +, WebKit , enableMinimal ? false }: @@ -45,7 +48,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-NwOexCU+TdZAdruivqRuqhwt0veryeGykLdH6vth+p4="; + hash = "sha256-+LxvPJkyq/6gtcBQepZ5pVGXP1/h30zhCHVfUGPUzFE="; }; addonsSrc = "${src}/addons"; @@ -53,7 +56,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-AlY7/cdGr4i87+wMhPBh/+LFDoF8aC23OLDEHu9lYqU="; + sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU="; }; # Builds the NodeJS server that runs with `sl web` @@ -77,6 +80,14 @@ let yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + # TODO: build-tar.py tries to run 'yarn install'. We patched + # shebangs node_modules, so we don't want 'yarn install' + # changing files. We should disable the 'yarn install' in + # build-tar.py to be safe. + ${python3Packages.python}/bin/python3 build-tar.py \ + --output isl-dist.tar.xz \ + --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' + runHook postBuild ''; @@ -84,8 +95,7 @@ let runHook preInstall mkdir -p $out - cd isl - node release.js $out + install isl-dist.tar.xz $out/isl-dist.tar.xz runHook postInstall ''; @@ -103,14 +113,20 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-MKyj91z+hciJOg4Lhb6ik7zUgCwuHsX8N9HVSP2JkKE="; - "fb303_core-0.0.0" = "sha256-5AU54rpeDub2Iol56S4X+xfdU07zWAtOyCNRBZLzUZA="; - "fbthrift-0.0.1+unstable" = "sha256-n4ES6zRyTgsNxbrM4AUraJ6W4tLHiKdfSyL3Yd0ET34="; - "serde_bser-0.3.1" = "sha256-PkQx2/axT/7LQ4Mvfz1AYBWKXGvaTHkOP2jtljvuYxY="; + "cloned-0.1.0" = "sha256-dtAyQq6fgxvr1RXPQHGiCQesvitsKpVkis4c50uolLc="; + "fb303_core-0.0.0" = "sha256-j+4zPXxewRxJsPQaAfvcpSkGNKw3d+inVL45Ibo7Q4E="; + "fbthrift-0.0.1+unstable" = "sha256-fsIL07PFu645eJFttIJU4sRSjIVuA4BMJ6kYAA0BpwY="; + "serde_bser-0.3.1" = "sha256-h50EJL6twJwK90sBXu40Oap4SfiT4kQAK1+bA8XKdHw="; }; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock + '' + lib.optionalString (!enableMinimal) '' + # If asked, we optionally patch in a hardcoded path to the + # 'nodejs' package, so that 'sl web' always works. Without the + # patch, 'sl web' will still work if 'nodejs' is in $PATH. + substituteInPlace lib/config/loader/src/builtin_static/core.rs \ + --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);' ''; # Since the derivation builder doesn't have network access to remain pure, @@ -122,23 +138,8 @@ python3Packages.buildPythonApplication { sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py ''; - # Now, copy the "sl web" (aka edenscm-isl) results into the output of this - # package, so that the command can actually work. NOTES: - # - # 1) This applies on all systems (so no conditional a la postFixup) - # 2) This doesn't require any kind of fixup itself, so we leave it out - # of postFixup for that reason, too - # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, - # so that 'sl web' always works - # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB - preFixup = '' - sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - '' + lib.optionalString (!enableMinimal) '' - chmod +w $sitepackages/edenscm-isl/run-isl - substituteInPlace $sitepackages/edenscm-isl/run-isl \ - --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + postInstall = '' + install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; postFixup = lib.optionalString stdenv.isLinux '' @@ -159,9 +160,12 @@ python3Packages.buildPythonApplication { ] ++ lib.optionals stdenv.isDarwin [ curl libiconv + Cocoa CoreFoundation + CoreGraphics CoreServices Security + WebKit ]; HGNAME = "sl"; @@ -183,6 +187,9 @@ python3Packages.buildPythonApplication { echo "OK!" ''; + # Expose isl to nix repl as sapling.isl. + passthru.isl = isl; + meta = with lib; { description = "A Scalable, User-Friendly Source Control System"; homepage = "https://sapling-scm.com"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json b/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json index 36d89f3cd1..7e7ca0b09d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json @@ -1,78 +1,5 @@ { - "links": [ - { - "sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab", - "url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl" - }, - { - "sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b", - "url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl" - }, - { - "sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d", - "url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl" - }, - { - "sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw", - "url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip" - }, - { - "sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0", - "url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl" - }, - { - "sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz", - "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl" - }, - { - "sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v", - "url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8", - "url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl" - }, - { - "sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y", - "url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl" - }, - { - "sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26", - "url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl" - }, - { - "sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f", - "url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl" - }, - { - "sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn", - "url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl" - }, - { - "sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn", - "url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl" - }, - { - "sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h", - "url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl" - }, - { - "sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa", - "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" - }, - { - "sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj", - "url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm", - "url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz" - }, - { - "sha256": "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7", - "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" - } - ], - "version": "0.2.20230523-092610+f12b7eee", - "versionHash": "11350811807294821405" + "links": [], + "version": "0.2.20231113-145254+995db0d6", + "versionHash": "214505116687308775" } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix index 79e1cb1a29..5ba5e26d3f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "scriv"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-TfWX7gp7PcwNUxXXZJ3wke/LGz/wjwtRppg0ByfRcRg="; + hash = "sha256-vdGtdJGkaUzH2JoxuFsfM57OodlxbEHuLl81giKUn6U="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix new file mode 100644 index 0000000000..1e5720f0d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/silver-platter/default.nix @@ -0,0 +1,44 @@ +{ buildPythonApplication +, lib +, fetchFromGitHub +, setuptools +, setuptools-rust +, rustPlatform +, cargo +, rustc +, breezy +, dulwich +, jinja2 +, pyyaml +, ruamel-yaml +}: + +buildPythonApplication rec { + pname = "silver-platter"; + version = "0.5.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jelmer"; + repo = "silver-platter"; + rev = version; + hash = "sha256-QkTT9UcJuGDAwpp/CtXobPvfTYQzFakBR72MhF//Bpo="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-QLnKu9D23FVp1jCSuxN3odPZ1ToAZ6i/FNS8BkmNuQw="; + }; + + propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ]; + nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; + + meta = with lib; { + description = "Automate the creation of merge proposals for scriptable changes"; + homepage = "https://jelmer.uk/code/silver-platter"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lukegb ]; + mainProgram = "svp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix index 0af4b1ceee..4831959d0f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/builds.nix @@ -8,31 +8,32 @@ , pyyaml , markdown , ansi2html +, lxml , python , unzip }: let - version = "0.83.0"; + version = "0.86.10"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-u/y+sYu/09LypWI/ngghbge5SvkuLQpray10j0SjlOo="; + hash = "sha256-frwJgwJst2/NWd8VR0KbsVwm8JfWuekkY2oIIAdh3Fw="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-DfVWr/4J4ZrhHpy9CXPaAQcbag/9FmDgiexcNo0lEsk="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.20"; }); + vendorHash = "sha256-2khk7j22KON4MsuvFUNKSUpouJtVIOxE0hkh63iaxZ4="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.29"; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "${src.name}/worker"; pname = "buildsrht-worker"; - vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; + vendorHash = "sha256-obdaeRwMhuiCV2kVwDo1c+rU/hmsbiL1IgAf7AcIpoc="; }; in buildPythonPackage rec { @@ -50,7 +51,9 @@ buildPythonPackage rec { celery pyyaml markdown + # Unofficial dependencies ansi2html + lxml ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index e31bc13c82..b413aa2c00 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -1,94 +1,78 @@ { lib , fetchFromSourcehut -, fetchNodeModules , buildPythonPackage -, pgpy , flask -, bleach -, misaka , humanize -, html5lib -, markdown -, psycopg2 -, pygments -, requests , sqlalchemy -, cryptography -, beautifulsoup4 , sqlalchemy-utils -, prometheus-client -, celery -, alembic -, importlib-metadata +, psycopg2 +, markdown , mistletoe -, minio -, sassc -, nodejs +, bleach +, requests +, beautifulsoup4 +, pygments +, cryptography +, prometheus-client +, alembic , redis +, celery +, html5lib +, importlib-metadata +, tinycss2 +, sassc +, minify }: buildPythonPackage rec { pname = "srht"; - version = "0.69.0"; + version = "0.69.15"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "core.sr.ht"; rev = version; - sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc="; + sha256 = "sha256-T9yewweqnWL3IW5PHGyAcsIWCGn1ayK2rwrHVukYpgE="; fetchSubmodules = true; }; - node_modules = fetchNodeModules { - src = "${src}/srht"; - nodejs = nodejs; - sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8="; - }; - patches = [ - # Disable check for npm - ./disable-npm-install.patch # Fix Unix socket support in RedisQueueCollector patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; propagatedNativeBuildInputs = [ sassc - nodejs + minify ]; propagatedBuildInputs = [ - pgpy flask - bleach - misaka humanize - html5lib - markdown - psycopg2 - pygments - requests - mistletoe sqlalchemy - cryptography - beautifulsoup4 sqlalchemy-utils + psycopg2 + markdown + mistletoe + bleach + requests + beautifulsoup4 + pygments + cryptography prometheus-client - - # Unofficial runtime dependencies? - celery alembic - importlib-metadata - minio redis + celery + # Used transitively through beautifulsoup4 + html5lib + # Used transitively trough bleach.css_sanitizer + tinycss2 + # Used by srht.debug + importlib-metadata ]; PKGVER = version; - preBuild = '' - cp -r ${node_modules} srht/node_modules - ''; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "srht" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix index 9c9f6f4033..8682057b78 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/default.nix @@ -1,19 +1,20 @@ -{ python3 +{ lib +, stdenv +, python3 , callPackage , recurseIntoAttrs , nixosTests , config +, fetchPypi }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 let - fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python3.override { packageOverrides = self: super: { - srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; + srht = self.callPackage ./core.nix { }; buildsrht = self.callPackage ./builds.nix { }; gitsrht = self.callPackage ./git.nix { }; @@ -26,6 +27,54 @@ let todosrht = self.callPackage ./todo.nix { }; scmsrht = self.callPackage ./scm.nix { }; + + # sourcehut is not (yet) compatible with SQLAlchemy 2.x + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.46"; + src = fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + nativeCheckInputs = with super; [ pytestCheckHook mock ]; + disabledTestPaths = [] + # Disable incompatible tests on Darwin. + ++ lib.optionals stdenv.isDarwin [ "test/aaa_profiling" ]; + }); + + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "2.5.1"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; + }; + propagatedBuildInputs = with self; [ + flask + sqlalchemy + ]; + }); + + # sourcehut is not (yet) compatible with factory-boy 3.x + factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { + version = "2.12.0"; + src = fetchPypi { + pname = "factory_boy"; + inherit version; + hash = "sha256-+vSNYIoXNfDQo8nL9TbWT5EytUfa57pFLE2Zp56Eo3A="; + }; + nativeCheckInputs = (with super; [ + django + flask + mongoengine + pytestCheckHook + ]) ++ (with self; [ + sqlalchemy + flask-sqlalchemy + ]); + postPatch = ""; + }); }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/disable-npm-install.patch b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/disable-npm-install.patch deleted file mode 100644 index 3a8d1c82b3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/disable-npm-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.py b/setup.py -index d63bac8..e1d0c35 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,9 +5,6 @@ import glob - import os - import sys - --if subprocess.call(["npm", "i"], cwd="srht") != 0: -- sys.exit(1) -- - ver = os.environ.get("PKGVER") or subprocess.run(['git', 'describe', '--tags'], - stdout=subprocess.PIPE).stdout.decode().strip() - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix deleted file mode 100644 index bbc18d0442..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, jq }: { src, nodejs, sha256 }: - -# Only npm >= 5.4.2 is deterministic, see: -# https://github.com/npm/npm/issues/17979#issuecomment-332701215 -assert lib.versionAtLeast nodejs.version "8.9.0"; - -stdenv.mkDerivation { - name = "node_modules"; - - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "recursive"; - - nativeBuildInputs = [ jq nodejs ]; - - buildCommand = '' - cp -r ${src}/* . - HOME=. npm install --force --ignore-scripts --only=production - for f in $(find node_modules -name package.json); do - # https://github.com/npm/npm/issues/10393 - jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp - mv $f.tmp $f - done - mv node_modules $out - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index 4327e395d5..8737e4266f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -1,5 +1,5 @@ { unzip -, gqlgenVersion ? "0.17.2" +, gqlgenVersion ? "0.17.20" }: { overrideModAttrs = (_: { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index eae70b3724..3a5163f9d1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -4,32 +4,38 @@ , buildPythonPackage , python , srht -, pygit2 , scmsrht +, pygit2 +, minio , unzip }: let - version = "0.78.20"; + version = "0.84.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ="; + sha256 = "sha256-sAkTsQlWtNDQ5vAhA2EeOvuJcj9A6AG8pgDyIKtr65s="; }; gitApi = buildGoModule ({ inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; + vendorHash = "sha256-LAYp0zgosZnFEbtxzjuTH9++0lbxhACr705HqXJz3D0="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); gitDispatch = buildGoModule { inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; + vendorHash = "sha256-EDvSZ3/g0xDSohrsAIpNhk+F0yy8tbnTW/3tURTonMc="; + + postPatch = '' + substituteInPlace gitsrht-dispatch/main.go \ + --replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch + ''; }; gitKeys = buildGoModule { @@ -37,6 +43,11 @@ let pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; + + postPatch = '' + substituteInPlace gitsrht-keys/main.go \ + --replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys + ''; }; gitShell = buildGoModule { @@ -44,6 +55,11 @@ let pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; + + postPatch = '' + substituteInPlace gitsrht-shell/main.go \ + --replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell + ''; }; gitUpdateHook = buildGoModule { @@ -51,6 +67,11 @@ let pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + + postPatch = '' + substituteInPlace gitsrht-update-hook/main.go \ + --replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook + ''; }; in @@ -65,8 +86,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht - pygit2 scmsrht + pygit2 + minio ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index 7f25ec99aa..f448109a6d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -3,7 +3,7 @@ , buildGoModule , buildPythonPackage , srht -, hglib +, python-hglib , scmsrht , unidiff , python @@ -12,26 +12,29 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.31.3"; + version = "0.32.4"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hg.sr.ht"; rev = version; - sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0="; + sha256 = "mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60="; vc = "hg"; }; postPatch = '' substituteInPlace Makefile \ --replace "all: api hgsrht-keys" "" + + substituteInPlace hgsrht-shell \ + --replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell ''; hgsrht-api = buildGoModule ({ inherit src version; pname = "hgsrht-api"; modRoot = "api"; - vendorHash = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; + vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); hgsrht-keys = buildGoModule { @@ -39,12 +42,17 @@ buildPythonPackage rec { pname = "hgsrht-keys"; modRoot = "hgsrht-keys"; vendorHash = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; + + postPatch = '' + substituteInPlace hgsrht-keys/main.go \ + --replace /var/log/hgsrht-keys /var/log/sourcehut/hgsrht-keys + ''; }; propagatedBuildInputs = [ - srht - hglib + python-hglib scmsrht + srht unidiff ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix index c3a9c509f8..6f1b17b01c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,21 +1,35 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage +, python , srht , pyyaml +, unzip }: buildPythonPackage rec { pname = "hubsrht"; - version = "0.14.14"; + version = "0.17.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; + sha256 = "sha256-A+lvRsPz5EBnM0gB4PJuxSMpELZTrK14ORxDbTKPXWg="; }; + postPatch = '' + substituteInPlace Makefile --replace "all: api" "" + ''; + + hubsrht-api = buildGoModule ({ + inherit src version; + pname = "hubsrht-api"; + modRoot = "api"; + vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + propagatedBuildInputs = [ srht pyyaml @@ -23,9 +37,13 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht + ''; + + postInstall = '' + ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api ''; - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "hubsrht" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index b875a46fca..24b56b9dd3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -3,31 +3,30 @@ , buildGoModule , buildPythonPackage , srht -, asyncpg , aiosmtpd +, asyncpg , pygit2 , emailthreads -, redis , python , unzip }: buildPythonPackage rec { pname = "listssrht"; - version = "0.51.11"; + version = "0.57.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY="; + sha256 = "sha256-nQZRSTAyTWxcPHrRVCZ5TgcrNgrlxBFc1vRds0cQwA0="; }; listssrht-api = buildGoModule ({ inherit src version; pname = "listssrht-api"; modRoot = "api"; - vendorHash = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; + vendorHash = "sha256-E5Zzft9ANJT/nhhCuenZpdo3t9QYLmA+AyDyrbGectE="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); postPatch = '' @@ -37,11 +36,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht - pygit2 - asyncpg aiosmtpd + asyncpg + pygit2 + # Unofficial dependency emailthreads - redis ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix index dadc508edd..b01d739a06 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/man.nix @@ -1,22 +1,35 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , pygit2 , python +, unzip }: buildPythonPackage rec { pname = "mansrht"; - version = "0.15.26"; + version = "0.16.1"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; + sha256 = "sha256-94G9/Kzt1gaQ2CaXtsJYCB6W5OTdn27XhVdpNJ9a5cE="; }; + postPatch = '' + substituteInPlace Makefile --replace "all: api" "" + ''; + + mansrht-api = buildGoModule ({ + inherit src version; + pname = "mansrht-api"; + modRoot = "api"; + vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + propagatedBuildInputs = [ srht pygit2 @@ -27,6 +40,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${mansrht-api}/bin/api $out/bin/mansrht-api + ''; + pythonImportsCheck = [ "mansrht" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index 205409bb4d..28cab58521 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -2,38 +2,34 @@ , fetchFromSourcehut , buildPythonPackage , buildGoModule -, pgpy -, srht -, redis -, bcrypt -, qrcode -, stripe -, zxcvbn , alembic -, pystache +, bcrypt , dnspython -, sshpubkeys -, weasyprint +, qrcode +, redis +, srht +, stripe , prometheus-client +, zxcvbn , python , unzip }: let - version = "0.61.3"; + version = "0.64.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU="; + hash = "sha256-eiNvoy68PvjZ3iwdeNPjsXJjxAXb2PMF1/HvJquWa/U="; }; metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; modRoot = "api"; - vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }); + vendorHash = "sha256-D3stDSb99uXze49kKZgGrAq5Zmg6hkIzIpsQKlnKVtE="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); in buildPythonPackage rec { @@ -46,19 +42,15 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - pgpy - srht - redis - bcrypt - qrcode - stripe - zxcvbn alembic - pystache - sshpubkeys - weasyprint - prometheus-client + bcrypt dnspython + qrcode + redis + srht + stripe + prometheus-client + zxcvbn ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix index abcef1648f..ca60843868 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix @@ -6,13 +6,13 @@ buildGoModule (rec { pname = "pagessrht"; - version = "0.7.4"; + version = "0.13.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY="; + sha256 = "sha256-vUN6c6cyhcLI8bKrFYKoxlBQ29VS/bowpSfBRmi47wg="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule (rec { --replace "all: server" "" ''; - vendorHash = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; + vendorHash = "sha256-GKuHkUqSVBLN3k8YsFtxdmdHFkqKo9YZqDk2GBmbfWo="; postInstall = '' mkdir -p $out/share/sql/ @@ -35,4 +35,4 @@ buildGoModule (rec { }; # There is no ./loaders but this does not cause troubles # to go generate -} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; }) +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; }) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix index 253ea8c0b9..d62ee38fc2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/paste.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.13.8"; + version = "0.15.1"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis="; + sha256 = "sha256-IUFX7/V8AWqN+iuisLAyu7lMNIUCzSMoOfcZiYJTnrM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix index 1edc951cbe..810f3007c2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/scm.nix @@ -2,25 +2,23 @@ , fetchFromSourcehut , buildPythonPackage , srht -, redis , pyyaml , buildsrht }: buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.22"; + version = "0.22.23"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; + sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; }; propagatedBuildInputs = [ srht - redis pyyaml buildsrht ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index cee340e0d2..0a5cefc130 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -3,24 +3,22 @@ , buildGoModule , buildPythonPackage , srht -, redis , alembic -, pystache , pytest -, factory_boy +, factory-boy , python , unzip }: buildPythonPackage rec { pname = "todosrht"; - version = "0.72.2"; + version = "0.74.6"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8="; + sha256 = "sha256-j12pCGfKf6+9R8NOBIrH2V4OuSMuncU6S1AMWFVoHts="; }; postPatch = '' @@ -32,14 +30,12 @@ buildPythonPackage rec { inherit src version; pname = "todosrht-api"; modRoot = "api"; - vendorHash = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; + vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); propagatedBuildInputs = [ srht - redis alembic - pystache ]; preBuild = '' @@ -54,7 +50,7 @@ buildPythonPackage rec { # pytest tests fail nativeCheckInputs = [ pytest - factory_boy + factory-boy ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh index 54727e0317..e9efc0816e 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh @@ -7,16 +7,26 @@ root=../../../.. tmp=$(mktemp -d) trap 'rm -rf "$tmp"' EXIT +attr_path() { + case "$1" in + pagessrht) printf "sourcehut.$1";; + *) printf "sourcehut.python.pkgs.$1";; + esac +} + default() { - (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') + local p="$(attr_path "$1")" + (cd "$root" && nix-instantiate --eval --strict -A $p.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/') } version() { - (cd "$root" && nix-instantiate --eval --strict -A "sourcehut.python.pkgs.$1.version" | tr -d '"') + local p="$(attr_path "$1")" + (cd "$root" && nix-instantiate --eval --strict -A $p.version | tr -d '"') } src_url() { - nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"' + local p="$(attr_path "$1")" + nix-instantiate --eval --strict --expr " with import $root {}; let src = $p.drvAttrs.src; in src.meta.homepage" | tr -d '"' } get_latest_version() { @@ -35,8 +45,9 @@ update_version() { default_nix="$(default "$1")" oldVersion="$(version "$1")" version="$(get_latest_version "$1")" + local p="$(attr_path "$1")" - (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") + (cd "$root" && update-source-version "$p" "$version") # Update vendorHash of Go modules retry=true diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix index 12450fc440..196cdea93d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-rQNX54zmVHZKplEUNaKyVtCrC8Q4DdxLzNSStiYvDGA="; + hash = "sha256-+ipNSdEaz3nVBTYS+A4Fauan0DaKZR69No95FTS2/4o="; }; - cargoHash = "sha256-ju8JQnohidBsydwwm6gNx1L24brmDWYXwNgfCl7G/aA="; + cargoHash = "sha256-G0g+53HWxhJfozMGByhmgnxws6P10FY9fAOleqhn+Mk="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 84ddb35415..068e9cca20 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -10,9 +10,9 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2090"; - aarch64sha256 = "96nJn+7bVoLM6D14pFujlj3JOQL5PwdU1+SWzEjoYhU="; - x64sha256 = "bu51gsu0XxZBF8/HncPttcKiIRpC7qsKTgR9cktKOnI="; + buildVersion = "2092"; + aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; + x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; dev = true; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 6f03b139cf..ecb5093f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -114,6 +114,7 @@ let description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; homepage = "https://subversion.apache.org/"; + mainProgram = "svn"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix index 188a0b115f..e4b54078ed 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/tig/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 srapenne ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch new file mode 100644 index 0000000000..6bdfcf2c2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch @@ -0,0 +1,28 @@ +diff --git a/AniLibria.pro b/AniLibria.pro +index 407dbde..ae69502 100644 +--- a/AniLibria.pro ++++ b/AniLibria.pro +@@ -21,17 +21,17 @@ windows { + DEFINES += NO_NEED_STANDART_PLAYER + } + +-#unix { +-# LIBS += -lvlc ++unix { ++ LIBS += -lvlc + + # INCLUDEPATH += /usr/include/ + # DEPENDPATH += /usr/include/ + +-# INCLUDEPATH += /usr/include/vlc/plugins +-# DEPENDPATH += /usr/include/vlc/plugins ++ INCLUDEPATH += @VLC_PATH@/vlc/plugins ++ DEPENDPATH += @VLC_PATH@/vlc/plugins + +-# CONFIG += buildwithvlc +-#} ++ CONFIG += buildwithvlc ++} + + buildwithvlc { + DEFINES += USE_VLC_PLAYER diff --git a/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix index 76cc3565d1..4b5102f25c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -10,17 +10,18 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems +, libvlc }: mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-mCDw8V/Uzewm32rj+mkkm5atS5nJAFJ3ry1boTn+gqI="; + sha256 = "sha256-N5caLFM6YJtarMaA7Ps5uWXmOtKM2KvHneDkN8ooJpw="; }; sourceRoot = "source/src"; @@ -30,11 +31,13 @@ mkDerivation rec { patches = [ ./0001-fix-installation-paths.patch ./0002-disable-version-check.patch + ./0003-build-with-vlc.patch ]; preConfigure = '' substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' + --replace "\$\$PREFIX" '${placeholder "out"}' \ + --replace '@VLC_PATH@' '${libvlc}/include' ''; qtWrapperArgs = [ @@ -58,6 +61,7 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia + libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good diff --git a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix index 04833eb4e8..235c5c58f3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { fuzzywuzzy jsbeautifier pycryptodome - pySmartDL + pysmartdl pyqt5 requests requests-cache diff --git a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix index ea7ba432a4..856bc95a47 100644 --- a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -93,5 +93,13 @@ stdenv.mkDerivation rec { # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; + # Downstream we experience: + # + # https://github.com/NixOS/nixpkgs/issues/239424 + # + # Upstream doesn't have a contact page / Bug tracker, so it's not easy to + # notify them about it. Using firejail might help, as some commented + # downstream. + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix index 1270fbae33..90081d4e59 100644 --- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix @@ -1,55 +1,32 @@ { lib -, fetchFromGitHub , fetchPypi +, fetchpatch , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - # Upstream is pinning releases incl. dependencies of their dependencies - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.31.0"; - src = fetchFromGitHub { - owner = "jstasiak"; - repo = "python-zeroconf"; - rev = version; - hash = "sha256-8pYbIkPsg16VelwqpYSzqfAJaCU37lun+XZ/crzCDZU="; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - - pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { - version = "9.2.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-bTRZNXXPd1Zd9Hr0x13UfGplgx7BiowQtTZ7LxwXLwo="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "catt"; - version = "0.12.7"; - format = "setuptools"; + version = "0.12.11"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Q9ePWRLwuuTG+oPKFg7xn1gj4uAVlXUxegWdyH3Yd90="; + hash = "sha256-0bqYYfWwF7yYoAbjZPhi/f4CLcL89imWGYaMi5Bwhtc="; }; - propagatedBuildInputs = [ + patches = [ + (fetchpatch { + # set explicit build-system + url = "https://github.com/skorokithakis/catt/commit/08e7870a239e85badd30982556adc2aa8a8e4fc1.patch"; + hash = "sha256-QH5uN3zQNVPP6Th2LHdDBF53WxwMhoyhhQUAZOeHh4k="; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ click ifaddr pychromecast diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix index 9e8e88ecfb..954ea58b45 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -17,6 +17,7 @@ , gjs , gtk4 , gst_all_1 +, libGL , libadwaita , appstream-glib , libsoup @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk4 + libGL libadwaita libsoup wayland diff --git a/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix b/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix index d83c57ae9f..3a097d3e13 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dra-cla/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2023-03-10"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "fd5e43bb32b5bc9013382917d1efacda9c3071a8"; - hash = "sha256-SMtuflVsxe0PWmzabSDy+vhIN2bTqyiYAT/T1ChY+xY="; + rev = "12e9557fb8dfdff7350e0102a625170bb69acf01"; + hash = "sha256-cGY/FRV2BAS4fzJqIfD7FlIPIS0fCIIBenQYjB2dEsc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix index 33034d9ef9..a3fd87e614 100644 --- a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -1,14 +1,16 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron_22 }: +{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: stdenv.mkDerivation rec { pname = "freetube"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "0yr5k9s3r4yvcx85bzwn6y4m03964ljnmhz7nf068zj87m9q8rcc"; + sha256 = "add96ad3509d4d5c6d8658b005dfd046963cd6bb0a4e1f3e88f726a86c05810f"; }; + passthru.tests = nixosTests.freetube; + appimageContents = appimageTools.extractType2 { name = "${pname}-${version}"; inherit src; @@ -35,9 +37,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Electron version is set to 22 in order to match upstream postFixup = '' - makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar ''; @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://freetubeapp.io/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ryneeverett alyaeanyx ]; - inherit (electron_22.meta) platforms; + inherit (electron.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix b/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix index 42d5b281bb..5414193640 100644 --- a/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/frigate/default.nix @@ -5,7 +5,6 @@ , fetchurl , fetchpatch , frigate -, opencv4 , nixosTests }: @@ -26,28 +25,6 @@ let python = python3.override { packageOverrides = self: super: { - # https://github.com/blakeblackshear/frigate/blob/v0.12.0/requirements-wheels.txt#L7 - opencv = super.toPythonModule ((opencv4.override { - enablePython = true; - pythonPackages = self; - }).overrideAttrs (oldAttrs: rec { - version = "4.5.5"; - src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv"; - rev = "refs/tags/${version}"; - hash = "sha256-TJfzEAMh4JSshZ7oEZPgB59+NBACsj6Z5TCzVOBaEP4="; - }; - contribSrc = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_contrib"; - rev = "refs/tags/${version}"; - hash = "sha256-skuH9GYg0mivGaJjxbggXk4x/0bbQISrAawA3ZUGfCk="; - }; - postUnpack = '' - cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" - ''; - })); }; }; @@ -129,7 +106,7 @@ python.pkgs.buildPythonApplication rec { imutils matplotlib numpy - opencv + opencv4 openvino paho-mqtt peewee diff --git a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix index 2d50099141..b73933e36a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-x3tgH2eoLVELQKbgNLvJPGQsay8iOfMY/BGLOEov3OM="; + hash = "sha256-6UXgAb42DttNgmO5KRFC5M6kuYrv+GIxQ0EQ4P5cgUI="; domain = "invent.kde.org"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix index e44949f54b..a2a9d8d112 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kazam/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 9334dbfa28..1bc68436de 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.4.0"; + version = "1.4.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-m7DHQVg0pcLGCHTdecCTGfanUWhuPMHdllbg+47hxEI="; + hash = "sha256-4lPJIFBF4zXr1bEyv9tVUPXw9JFt2by/tcOwihib6aQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 1e8e2ae2f4..61e5147be3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.9"; + version = "20.3.13"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-Z5p/lw7qg6aacJ0eSqswaiwTOsUmuDbNlRRs51LdjRw="; + sha256 = "sha256-xvU+DcVEaQ/1sm6o21/6N1znCtzrct0qDhMxXGFZjL4="; }; extraCMakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix index f219a3fd1f..e5d26ef4a6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,18 +1,13 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "unstable-2022-11-28"; + version = "0.2.6"; - # video search doesn't work for the version on kodi.tv - # if the result contains channels - # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 - src = fetchFromGitHub { - owner = "TheAssassin"; - repo = "kodi-invidious-plugin"; - rev = "85b66525632d94630c9301d9c490fc002a335d77"; - hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; + sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o="; }; propagatedBuildInputs = [ @@ -23,10 +18,13 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.invidious"; + }; }; meta = with lib; { - homepage = "https://github.com/TheAssassin/kodi-invidious-plugin"; + homepage = "https://github.com/petterreinholdtsen/kodi-invidious-plugin"; description = "A privacy-friendly way of watching YouTube content"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix index ab034c1375..3352ae4c63 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.20.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-k2O8a0P+TzQVoFQJkzmdqmkKh3Aj7OlsnuhJfUwxOmI="; + sha256 = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8="; }; propagatedBuildInputs = [ @@ -24,6 +24,6 @@ buildKodiAddon rec { homepage = "https://github.com/CastagnaIT/plugin.video.netflix"; description = "Netflix VOD Services Add-on"; license = licenses.mit; - maintainers = teams.kodi.members; + maintainers = teams.kodi.members ++ [ maintainers.pks ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 652dd3a402..a3b2e81fa6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "20.6.2"; + version = "20.6.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-AQI7s6PAro+CZ6IoKGm8ii1ZKibfNc2oVVeCCZP+DTg="; + sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 4c83d73f50..ba6470af87 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.11.0"; + version = "20.11.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-58Dma0UtD6Uy4zu4aQT2FY0emLiQpA4RChhnneMzFZI="; + sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio="; }; extraBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix new file mode 100644 index 0000000000..3100325ddd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: + +buildKodiAddon rec { + pname = "radioparadise"; + namespace = "script.radioparadise"; + version = "1.0.5"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; + sha256 = "sha256-/X/8Q741piNHue5i/kgV+UYpBECyGzkFuN+PUzdeQnA="; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.radioparadise"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/alxndr42/script.radioparadise"; + description = "Radio Paradise addon for Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix new file mode 100644 index 0000000000..f6946842de --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -0,0 +1,40 @@ +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, kodi, inputstreamhelper }: + +buildKodiAddon rec { + pname = "sendtokodi"; + namespace = "plugin.video.sendtokodi"; + version = "0.9.557"; + + src = fetchFromGitHub { + owner = "firsttris"; + repo = "plugin.video.sendtokodi"; + rev = "v${version}"; + hash = "sha256-Ga+9Q7x8+sEmQmteHbSyCahZ/T/l28BAEM84w7bf7z8="; + }; + + patches = [ + ./use-packaged-deps.patch + ]; + + propagatedBuildInputs = [ + inputstreamhelper + ]; + + postPatch = '' + # Remove vendored youtube-dl and yt-dlp libraries. + rm -r lib/ + ''; + + passthru = { + # Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via + # the Python path. + pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ]; + }; + + meta = with lib; { + homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; + description = "Plays various stream sites on Kodi using youtube-dl"; + license = licenses.mit; + maintainers = teams.kodi.members ++ [ maintainers.pks ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch new file mode 100644 index 0000000000..abfea58a7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch @@ -0,0 +1,16 @@ +diff --git a/service.py b/service.py +index 1d7b6e4..9782993 100644 +--- a/service.py ++++ b/service.py +@@ -241,9 +241,9 @@ def playlistIndex(url, playlist): + + # Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+) + if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: +- from lib.youtube_dl import YoutubeDL ++ from youtube_dl import YoutubeDL + else: +- from lib.yt_dlp import YoutubeDL ++ from yt_dlp import YoutubeDL + + # patch broken strptime (see above) + patch_strptime() diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix new file mode 100644 index 0000000000..4ffc697912 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -0,0 +1,26 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "somafm"; + namespace = "plugin.audio.somafm"; + version = "2.0.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; + sha256 = "sha256-auPLm7QFabU4tXJPjTl17KpE+lqWM2Edbd2HrXPRx40="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.somafm"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/Soma-FM-Kodi-Add-On/plugin.audio.somafm"; + description = "SomaFM addon for Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix index bdc4be3a23..3d3683ed87 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,13 +1,15 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, infotagger, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, six, requests, infotagger, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.1"; + version = "7.0.2.2"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-Wdju7d2kFX0V1J1TB75qEVq0UWN2xYYFNlD8UTt1New="; + src = fetchFromGitHub { + owner = "anxdpanic"; + repo = "plugin.video.youtube"; + rev = "v${version}"; + hash = "sha256-BUeE/8oQYBiq4XgIp4nv0hjEQz3nnkDWCnAf4kpptwk="; }; propagatedBuildInputs = [ @@ -19,9 +21,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; - }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index bb2c340835..0f0008bd7a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -116,7 +116,7 @@ in stdenv.mkDerivation { # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453 (fetchpatch { name = "Fix fmt10 compat"; - url = "https://github.com/xbmc/xbmc/pull/23453.patch"; + url = "https://github.com/xbmc/xbmc/compare/acca69baa2eae65123e78ee2f77249181725ef5d...26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c.patch"; hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix index bd6f41c7fe..0e6b52f8f7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix @@ -6,7 +6,7 @@ let pname = "losslesscut"; - version = "3.55.2"; + version = "3.58.0"; metaCommon = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -15,22 +15,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-oQYDK/BHxC/zJuocDH+HcItcPQIsxAaKoD+49TAA+ds="; + hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-dmtnGv5XQn2ANpYyFu9jtTGr1b7GdDrV3Oajd5bMr0k="; + hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-uU48Clhk4FllM7osHRR4D7xGZCmcvylqlUt6JqCrm/8="; + hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-YkPF6sgL/oGXSXCdQt+7iW2n5f9Tk2ItchwRAwq7IPY="; + hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30="; }; in ( diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix index c4443af00d..70b3ad8e1e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, fetchPypi , cairo , ffmpeg -, texlive +, texliveInfraOnly , python3 }: @@ -21,11 +20,10 @@ let # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt # # these two combined add up to: - manim-tinytex = { - inherit (texlive) + manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [ # tinytex - scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex + amsfonts amsmath atbegshi atveryend auxhook babel bibtex bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def @@ -41,54 +39,36 @@ let # manim-latex standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super - babel-english gnu-freefont mathastext cbfonts-fd; - }; + babel-english gnu-freefont mathastext cbfonts-fd + ]); - python = python3.override { - packageOverrides = self: super: { - networkx = super.networkx.overridePythonAttrs (oldAttrs: rec { - pname = "networkx"; - version = "2.8.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4="; - }; - }); - - watchdog = super.watchdog.overridePythonAttrs (oldAttrs: rec{ - pname = "watchdog"; - version = "2.3.1"; - src = fetchPypi { - inherit pname version; - hash = "sha256-2fntJu0iqdMxggqEMsNoBwfqi1QSHdzJ3H2fLO6zaQY="; - }; - }); - }; - }; + python = python3; in python.pkgs.buildPythonApplication rec { pname = "manim"; - format = "pyproject"; - version = "0.16.0.post0"; + pyproject = true; + version = "0.18.0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; - repo = pname; + repo = "manim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M="; + sha256 = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM="; }; nativeBuildInputs = with python.pkgs; [ poetry-core ]; + patches = [ + ./pytest-report-header.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" \ --replace 'cloup = "^0.13.0"' 'cloup = "*"' \ - --replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \ - --replace 'click = ">=7.2<=9.0"' 'click = ">=7.2,<=9.0"' # https://github.com/ManimCommunity/manim/pull/2954 ''; buildInputs = [ cairo ]; @@ -119,6 +99,7 @@ in python.pkgs.buildPythonApplication rec { screeninfo skia-pathops srt + svgelements tqdm watchdog ]; @@ -126,13 +107,13 @@ in python.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg - (texlive.combine manim-tinytex) + manim-tinytex ]) ]; nativeCheckInputs = [ ffmpeg - (texlive.combine manim-tinytex) + manim-tinytex ] ++ (with python.pkgs; [ pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix b/third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix index 70c3efbb61..1bffaf6e74 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix +++ b/third_party/nixpkgs/pkgs/applications/video/manim/failing_tests.nix @@ -71,4 +71,7 @@ # mismatching expecation on the new commandline "test_manim_new_command" + # This tests checks if the manim executable is a python script. In our case it is not. + # It is a wrapper shell script instead. + "test_manim_checkhealth_subcommand" ] diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch b/third_party/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch new file mode 100644 index 0000000000..7aa87d373e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/manim/pytest-report-header.patch @@ -0,0 +1,22 @@ +diff --git a/conftest.py b/conftest.py +index dacb730a..149c6702 100644 +--- a/conftest.py ++++ b/conftest.py +@@ -33,17 +33,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): + with tempconfig({"media_dir": str(tmpdir)}): + assert config.media_dir == str(tmpdir) + yield tmpdir +- +- +-def pytest_report_header(config): +- ctx = moderngl.create_standalone_context() +- info = ctx.info +- ctx.release() +- return ( +- f"\nCairo Version: {cairo.cairo_version()}", +- "\nOpenGL information", +- "------------------", +- f"vendor: {info['GL_VENDOR'].strip()}", +- f"renderer: {info['GL_RENDERER'].strip()}", +- f"version: {info['GL_VERSION'].strip()}\n", +- ) diff --git a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix index b3c7fd7c8d..61f59854de 100644 --- a/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-FTfkVD2uBfCBbP7fjjfG21bOGDVd2j6bhPLHGPm3xh4="; + hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix b/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix index 6187584940..6db16f1aec 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mediathekview/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: stdenv.mkDerivation rec { - version = "13.9.1"; + version = "14.0.0"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; + sha256 = "sha256-vr0yqKVRodtXalHEIsm5gdEp9wPU9U5nnYhMk7IiPF4="; }; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://mediathekview.de/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; + mainProgram = "mediathek"; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 70ed0976f7..96c4113f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "79.0"; + version = "80.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-M+CST7A/obfuGH4lyV68vrhmzEIFCa7DRgApKbPh/uQ="; + hash = "sha256-/RqTfnxivghViFryCvj5RXSBziztb1Drb7tT89cGZ3o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/motion/default.nix b/third_party/nixpkgs/pkgs/applications/video/motion/default.nix index ddec8efb6a..372ace9ffa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/motion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "sha256-3TmmLAU/muiI90hrYrctzgVbWS4rXjxzAa0ctVYKSSY="; + sha256 = "sha256-f23glk91HWSEW/Glq/DdEikTQeg1eELEg4XG9zTsU78="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mov-cli/default.nix b/third_party/nixpkgs/pkgs/applications/video/mov-cli/default.nix index 35789cb395..23954a05c5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mov-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mov-cli/default.nix @@ -1,24 +1,34 @@ { lib , python3 , fetchFromGitHub +, mpv }: python3.pkgs.buildPythonPackage rec { pname = "mov-cli"; - version = "unstable-2022-06-30"; + version = "1.5.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "mov-cli"; repo = "mov-cli"; - rev = "b89e807e8ffc830b0b18c8e98712441c03774b8e"; - sha256 = "sha256-D+OeXcLdkbG4ASbPQYIWf7J1CRZ9jH3UXxfTL4WleY0="; + rev = version; + sha256 = "sha256-WhoP4FcoO9+O9rfpC3oDQkVIpVOqxfdLRygHgf1O01g="; }; + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.getBin mpv}/bin" + ]; - propagatedBuildInputs = with python3.pkgs; [ setuptools httpx click beautifulsoup4 colorama ]; - - postPatch = '' - substituteInPlace setup.py --replace "bs4" "beautifulsoup4" - ''; + propagatedBuildInputs = with python3.pkgs; [ + poetry-core + krfzf-py + pycrypto + setuptools + httpx + click + beautifulsoup4 + colorama + ]; meta = with lib; { homepage = "https://github.com/mov-cli/mov-cli"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 057b987416..33fb4fc782 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , python3 -, ffmpeg_5 +, ffmpeg , freefont_ttf , freetype , libass @@ -19,6 +19,7 @@ , libuchardet , libiconv , xcbuild +, sigtool , waylandSupport ? stdenv.isLinux , wayland @@ -154,12 +155,12 @@ in stdenv'.mkDerivation (finalAttrs: { pkg-config python3 ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ - ffmpeg_5 + ffmpeg freetype libass libpthreadstubs @@ -203,6 +204,11 @@ in stdenv'.mkDerivation (finalAttrs: { postBuild = lib.optionalString stdenv.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + # Swap binary and bundle symlink to sign bundle executable as symlinks cannot be signed + rm build/mpv.app/Contents/MacOS/mpv-bundle + mv build/mpv.app/Contents/MacOS/mpv build/mpv.app/Contents/MacOS/mpv-bundle + ln -s mpv-bundle build/mpv.app/Contents/MacOS/mpv + codesign --force --sign - build/mpv.app/Contents/MacOS/mpv-bundle popd ''; @@ -250,6 +256,7 @@ in stdenv'.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; + mainProgram = "mpv"; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/acompressor.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/acompressor.nix index d10ef5f9df..d82d12f163 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/acompressor.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/acompressor.nix @@ -1,27 +1,17 @@ -{ stdenvNoCC +{ lib +, buildLua , mpv-unwrapped -, lib }: -stdenvNoCC.mkDerivation rec { +buildLua { + inherit (mpv-unwrapped) src version; pname = "mpv-acompressor"; - version = mpv-unwrapped.version; - - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/acompressor.lua"; - - dontBuild = true; - dontUnpack = true; - - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/acompressor.lua - ''; - - passthru.scriptName = "acompressor.lua"; + scriptPath = "TOOLS/lua/acompressor.lua"; meta = with lib; { + inherit (mpv-unwrapped.meta) license; description = "Script to toggle and control ffmpeg's dynamic range compression filter."; homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua"; - license = licenses.gpl2Plus; maintainers = with maintainers; [ nicoo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix new file mode 100644 index 0000000000..b86642305f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -0,0 +1,22 @@ +{ lib +, stdenvNoCC }: + +let fileName = pathStr: lib.last (lib.splitString "/" pathStr); +in +lib.makeOverridable ( + { pname, scriptPath ? "${pname}.lua", ... }@args: + stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { + dontBuild = true; + preferLocalBuild = true; + + outputHashMode = "recursive"; + installPhase = '' + runHook preInstall + install -m644 -Dt $out/share/mpv/scripts ${scriptPath} + runHook postInstall + ''; + + passthru.scriptName = fileName scriptPath; + meta.platforms = lib.platforms.all; + } args) +) diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix new file mode 100644 index 0000000000..bffc27bd1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -0,0 +1,20 @@ +{ lib +, fetchFromGitHub +, buildLua }: + +buildLua { + pname = "chapterskip"; + + version = "unstable-2022-09-08"; + src = fetchFromGitHub { + owner = "po5"; + repo = "chapterskip"; + rev = "b26825316e3329882206ae78dc903ebc4613f039"; + hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; + }; + + meta = { + homepage = "https://github.com/po5/chapterskip"; + maintainers = with lib.maintainers; [ nicoo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix index 40a1050cd3..4f90b0c62e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, fetchgit, lib +{ lib, fetchgit, buildLua , yad, mkvtoolnix-cli, libnotify }: -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { @@ -22,15 +22,9 @@ stdenvNoCC.mkDerivation { 'yad_exe = "${yad}/bin/yad"' \ --replace 'notify_send_exe = "notify-send"' \ 'notify_send_exe = "${libnotify}/bin/notify-send"' \ - ''; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp convert_script.lua $out/share/mpv/scripts - ''; - passthru.scriptName = "convert_script.lua"; + scriptPath = "convert_script.lua"; meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix index 8b928e7085..cdc641043f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/default.nix @@ -3,30 +3,32 @@ , config }: -lib.recurseIntoAttrs +let buildLua = callPackage ./buildLua.nix { }; +in lib.recurseIntoAttrs ({ - acompressor = callPackage ./acompressor.nix { }; + acompressor = callPackage ./acompressor.nix { inherit buildLua; }; autocrop = callPackage ./autocrop.nix { }; autodeint = callPackage ./autodeint.nix { }; autoload = callPackage ./autoload.nix { }; - convert = callPackage ./convert.nix { }; + chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; + convert = callPackage ./convert.nix { inherit buildLua; }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; - quality-menu = callPackage ./quality-menu.nix { }; + quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; sponsorblock = callPackage ./sponsorblock.nix { }; thumbfast = callPackage ./thumbfast.nix { }; - thumbnail = callPackage ./thumbnail.nix { }; + thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; uosc = callPackage ./uosc.nix { }; visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; cutter = callPackage ./cutter.nix { }; } - // (callPackage ./occivink.nix { })) + // (callPackage ./occivink.nix { inherit buildLua; })) // lib.optionalAttrs config.allowAliases { youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 720fdaae5b..8ec05a3cf6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,6 +1,6 @@ -{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }: +{ lib, buildLua, fetchFromGitHub, yt-dlp }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-playlistmanager"; version = "unstable-2023-08-09"; @@ -17,21 +17,12 @@ stdenvNoCC.mkDerivation rec { 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', ''; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D -t $out/share/mpv/scripts playlistmanager.lua - runHook postInstall - ''; - - passthru.scriptName = "playlistmanager.lua"; + scriptPath = "playlistmanager.lua"; meta = with lib; { description = "Mpv lua script to create and manage playlists"; homepage = "https://github.com/jonniek/mpv-playlistmanager"; license = licenses.unlicense; - platforms = platforms.all; maintainers = with maintainers; [ lunik1 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix index da723fd910..167e2fef6a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/occivink.nix @@ -1,14 +1,17 @@ { lib -, stdenvNoCC , fetchFromGitHub +, buildLua }: let - script = { n, ... }@p: - stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { - pname = "mpv_${n}"; - passthru.scriptName = "${n}.lua"; + camelToKebab = let + inherit (lib.strings) match stringAsChars toLower; + isUpper = match "[A-Z]"; + in stringAsChars (c: if isUpper c != null then "-${toLower c}" else c); + mkScript = name: args: + buildLua (lib.attrsets.recursiveUpdate rec { + pname = camelToKebab name; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; @@ -17,37 +20,26 @@ let }; version = "unstable-2022-10-02"; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp -r scripts/${n}.lua $out/share/mpv/scripts/ - ''; + scriptPath = "scripts/${pname}.lua"; meta = with lib; { homepage = "https://github.com/occivink/mpv-scripts"; license = licenses.unlicense; - platforms = platforms.all; maintainers = with maintainers; [ nicoo ]; }; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - } p); + } args); in -{ +lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` - seekTo = script { - n = "seek-to"; + seekTo = { meta.description = "Mpv script for seeking to a specific position"; outputHash = "sha256-3RlbtUivmeoR9TZ6rABiZSd5jd2lFv/8p/4irHMLshs="; }; - blacklistExtensions = script { - n = "blacklist-extensions"; + blacklistExtensions = { meta.description = "Automatically remove playlist entries based on their extension."; outputHash = "sha256-qw9lz8ofmvvh23F9aWLxiU4YofY+YflRETu+nxMhvVE="; }; - } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix index 45d358843b..d0eb2ca011 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -1,33 +1,22 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , oscSupport ? false }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-quality-menu"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc="; + hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp quality-menu.lua $out/share/mpv/scripts - '' + lib.optionalString oscSupport '' - cp quality-menu-osc.lua $out/share/mpv/scripts - '' + '' - runHook postInstall - ''; - passthru.scriptName = "quality-menu.lua"; + scriptPath = if oscSupport then "*.lua" else passthru.scriptName; meta = with lib; { description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix index fb231d87ca..88209f049f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { postPatch = '' substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"' + --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' ''; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix index 60b392a6aa..29509bd033 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,30 +1,21 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3 }: +{ lib, buildLua, fetchFromGitHub, python3 }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "mpv-thumbnail-script"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "marzzzello"; repo = "mpv_thumbnail_script"; rev = version; - sha256 = "sha256-6J1eeuSYyUJmWLIl9WsQ4NzQOBJNO3Cnl5jcPEal4vM="; + sha256 = "sha256-J24Rou7BTE7zoiPlBkWuO9dtYJiuzkuwB4FROuzXzag="; }; nativeBuildInputs = [ python3 ]; + postPatch = "patchShebangs concat_files.py"; + dontBuild = false; - postPatch = '' - patchShebangs concat_files.py - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts - runHook postInstall - ''; - - passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua"; + scriptPath = "mpv_thumbnail_script_{client_osc,server}.lua"; meta = with lib; { description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index b427318121..a86c9671a4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -97,7 +97,7 @@ let '' + lib.optionalString stdenv.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" - makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} + makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv-bundle" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 8b3866d624..fee8325bf6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -118,12 +118,12 @@ stdenv.mkDerivation rec { postUnpack = '' mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ for i in ${libcef}/share/cef/*; do - cp -r $i cef/Release/ - cp -r $i cef/Resources/ + ln -s $i cef/Release/ + ln -s $i cef/Resources/ done - cp -r ${libcef}/lib/libcef.so cef/Release/ - cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - cp -r ${libcef}/include cef/ + ln -s ${libcef}/lib/libcef.so cef/Release/ + ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + ln -s ${libcef}/include cef/ ''; cmakeFlags = [ @@ -145,6 +145,9 @@ stdenv.mkDerivation rec { blackmagic-desktop-video ]; in '' + # Remove libcef before patchelf, otherwise it will fail + rm $out/lib/obs-plugins/libcef.so + qtWrapperArgs+=( --prefix LD_LIBRARY_PATH : "$out/lib:${lib.makeLibraryPath wrapperLibraries}" ''${gappsWrapperArgs[@]} @@ -154,6 +157,9 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so addOpenGLRunpath $out/lib/obs-plugins/*.so + + # Link libcef again after patchelfing other libs + ln -s ${libcef}/lib/libcef.so $out/lib/obs-plugins/libcef.so ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix index 63bad0fe64..d3d1ceb2de 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -42,6 +42,8 @@ obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { }; + obs-rgb-levels-filter = callPackage ./obs-rgb-levels-filter.nix { }; obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 9ffa56533f..f6eb8b34f4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-TY+sR7IaOlbFeeh7GL5dgM779pcpiCqzBo7VTK8Uz0E="; + sha256 = "sha256-7qgFUZmKldIfnUXthzWd07CtOmaJROnqCGnzjlZlN3E="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index 8e22719548..622ba7d66e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-D4ONz/4S5Kt23Tmfa6jvw0X7680R9YDqG8/N6HhIQLE="; + sha256 = "sha256-9HPQ17swMlsCnKkYQXIUzEbx2vKuBUfGf58Up2hHVGI="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = " Audio device and application capture for OBS Studio using PipeWire "; + description = "Audio device and application capture for OBS Studio using PipeWire"; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; maintainers = with maintainers; [ Elinvention ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix new file mode 100644 index 0000000000..994a56d4c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libcaption +, obs-studio +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-replay-source"; + version = "1.6.12"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-replay-source"; + rev = finalAttrs.version; + sha256 = "sha256-MzugH6r/jY5Kg7GIR8/o1BN36FenBzMnqrPUceJmbPs="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcaption obs-studio qtbase ]; + + postInstall = '' + mkdir -p "$out/lib" "$out/share" + mv "$out/obs-plugins/64bit" "$out/lib/obs-plugins" + rm -rf "$out/obs-plugins" + mv "$out/data" "$out/share/obs" + ''; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Replay source for OBS studio"; + homepage = "https://github.com/exeldro/obs-replay-source"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 7cfa508815..8fd1b5f96f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , obs-studio , cmake , zlib @@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # fix build with qt 6.6.0 + # treewide: replace deprecated qAsConst with std::as_const() + # https://github.com/univrsal/tuna/pull/176 + (fetchpatch2 { + url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch"; + hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k="; + }) + ]; + postInstall = '' mkdir $out/lib $out/share mv $out/obs-plugins/64bit $out/lib/obs-plugins diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 48ee9ee639..9b7ec4090d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-AbSI6HBdOEI54bUVqqF+b4LcCyzW30XlS9SXX2ajkas="; + hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index a94cb71f10..f418e99733 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-hFweWZalWMGbGXhM6uxaGoWkr9srqxRChJo5yUBiBXs="; + hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix index e90781c3d9..5daac65313 100644 --- a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , which , frei0r @@ -34,12 +35,19 @@ stdenv.mkDerivation { "-DBUILD_QT6=1" ]; + patches = [ + (fetchpatch { + # Taken from https://github.com/olive-editor/olive/pull/2294. + name = "olive-editor-openimageio-2.3-compat.patch"; + url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch"; + hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag="; + }) + ]; + # https://github.com/olive-editor/olive/issues/2200 - patchPhase = '' - runHook prePatch + postPatch = '' substituteInPlace ./app/node/project/serializer/serializer230220.cpp \ --replace 'QStringRef' 'QStringView' - runHook postPatch ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix index 8335e01e2d..38366782f3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt + '' + lib.optionalString stdenv.isDarwin '' + # Darwin requires both Magick++ and MagickCore or it will fail to link. + substituteInPlace src/CMakeLists.txt \ + --replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)' ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/video/qarte/default.nix b/third_party/nixpkgs/pkgs/applications/video/qarte/default.nix index dd2a7dadc2..be2ac3c741 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qarte/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qarte/default.nix @@ -4,12 +4,12 @@ let pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]); in mkDerivation { pname = "qarte"; - version = "4.17.1"; + version = "5.5.0"; src = fetchbzr { - url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; - rev = "74"; - sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4"; + url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-5"; + rev = "88"; + sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw="; }; buildInputs = [ pythonEnv ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix index e78472ee29..b6b577790c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; - version = "23.08.22"; + version = "23.10.22"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Ug7WAqZ+BxspQUXweL/OnVBGCsU60DOWNexbi0GpDo0="; + hash = "sha256-yDymUXuILgT4AFTt302GniPi/WNwrTCOuOfdUiKOIyk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix index ba7992b974..8cd9676060 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; - version = "23.6.0"; + version = "23.6.0.10170"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = "smplayer"; rev = "v${finalAttrs.version}"; - hash = "sha256-xGy6/9aUftBTSo9HJ3zyuRSagqimP9XvXKP/4oBQTo4="; + hash = "sha256-ByheWIXvCw9jL3lY63oRzRZhl0jZz4jr+rw5Wi7Mm8w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index 07c9b4bb69..ba1f724cbf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.2.1"; + version = "6.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI="; + hash = "sha256-k8Dfrl0Xie5zF/GhVdP/RKGajDyGblAwu49UekX1WEQ="; }; nativeCheckInputs = with python3Packages; [ @@ -23,10 +23,6 @@ python3Packages.buildPythonApplication rec { pytest-trio ]; - nativeBuildInputs = with python3Packages; [ - versioningit - ]; - propagatedBuildInputs = (with python3Packages; [ certifi isodate diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix index 59da5b3244..04c1296b0e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.41"; + version = "5.45"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo="; + hash = "sha256-2WJXOv15oZRk2doecd+xOURygbX4oGyeMAJiiuiRBi4="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix index 3ced362b94..808552d4f9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.3.3"; + version = "3.3.6"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + sha256 = "sha256-aHhQljWE1om/mILM+TXB9uPTrUwNNc4Loiejbakj9NU="; rev = "V${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix index b46723fbf8..e0173ab6c8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/nopacity/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: stdenv.mkDerivation rec { pname = "vdr-skin-nopacity"; - version = "1.1.14"; + version = "1.1.16"; src = fetchFromGitLab { repo = "SkinNopacity"; owner = "kamel5"; - sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ="; + sha256 = "sha256-5TTilBKlNsFBm5BaCoRV1LzZgpad2lOIQGyk94jGYls="; rev = version; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix index a8378ecc3d..437c8d16cf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.12.1"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-/Q+O/6kK55E+JN1khRvM7F6H/Vnp/OOD80eU4zmrBt8="; + sha256 = "sha256-eE2cxqV/XpGyxneVzpP7f215IReH1nwGEkfCHbxUgVs="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 13f8f40ed6..8f2358fdd6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -102,11 +102,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.18"; + version = "3.0.20"; src = fetchurl { url = "http://get.videolan.org/vlc/${finalAttrs.version}/vlc-${finalAttrs.version}.tar.xz"; - hash = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew="; + hash = "sha256-rccoW00nIc3fQOtScMraKqoQozTLVG/VWgY1NEe6KbU="; }; nativeBuildInputs = [ @@ -220,12 +220,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; }) - # patch to build with recent libplacebo - # https://code.videolan.org/videolan/vlc/-/merge_requests/3027 - (fetchpatch { - url = "https://code.videolan.org/videolan/vlc/-/commit/65ea8d19d91ac1599a29e8411485a72fe89c45e2.patch"; - hash = "sha256-Zz+g75V6X9OZI3sn614K9Uenxl3WtRHKSdLkWP3b17w="; - }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index e601f0443c..6f445da73d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-epz/KoXo84zzCD1dzclRWgeQSqrgwEtaIGvrTPuN9hw="; + sha256 = "sha256-4tQ/fLaAbjfc3mt2qJsW9scku/CGUs74SehDaZgLPj4="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix b/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix index 56000407fc..26202ee18b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "stefantalpalaru"; repo = "w_scan2"; rev = version; - sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + hash = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix index f5b90bb2c8..925fa38a19 100644 --- a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, electron_22, buildNpmPackage, fetchFromGitHub }: +{ lib, stdenv, electron, buildNpmPackage, fetchFromGitHub, fetchpatch }: buildNpmPackage { pname = "webtorrent-desktop"; - version = "0.25-pre"; + version = "0.25-pre-1eb612"; src = fetchFromGitHub { owner = "webtorrent"; repo = "webtorrent-desktop"; - rev = "fce078defefd575cb35a5c79d3d9f96affc8a08f"; - sha256 = "sha256-gXFiG36qqR0QHTqhaxgQKDO0UCHkJLnVwUTQB/Nct/c="; + rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c"; + sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg="; }; - npmDepsHash = "sha256-pEuvstrZ9oMdJ/iU6XwEQ1BYOyQp/ce6sYBTrMCjGMc="; + patches = [ + # electron 27 fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; + }) + # startup fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; + }) + ]; + npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE="; makeCacheWritable = true; npmRebuildFlags = [ "--ignore-scripts" ]; installPhase = '' @@ -31,7 +43,7 @@ buildNpmPackage { cat > $out/bin/WebTorrent <' -i cardboard/ViewAnimation.h # gcc12 - ''; - - # "Inherited" from Nixpkgs expression for wlroots - mesonFlags = [ - "-Dman=true" - "-Dwlroots:logind-provider=systemd" - "-Dwlroots:libseat=disabled" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; # gcc12 - - meta = { - homepage = "https://gitlab.com/cardboardwm/cardboard"; - description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ AndersonTorres ]; - inherit (wayland.meta) platforms; - knownVulnerabilities = [ - "CVE-2020-11104 (inherited from cereal 1.3.0)" - "CVE-2020-11105 (inherited from cereal 1.3.0)" - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/Cargo.lock b/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/Cargo.lock new file mode 100644 index 0000000000..2156ab5c8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/Cargo.lock @@ -0,0 +1,6214 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[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.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[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 = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "ashpd" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +dependencies = [ + "async-std", + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[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-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "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", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.26", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[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-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.20", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[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 = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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 = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byte-unit" +version = "4.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calendrical_calculations" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.2.0", + "rustix 0.38.20", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.3", + "rustix 0.38.20", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" +dependencies = [ + "thiserror", + "x11rb 0.9.0", +] + +[[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", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorgrad" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" +dependencies = [ + "csscolorparser", +] + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concat-in-place" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b80dba65d26e0c4b692ad0312b837f1177e8175031af57fd1de4f3bc36b430" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cosmic-bg-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-bg#6a6fe4e387e46c2e159df56a9768220a6269ccf4" +dependencies = [ + "colorgrad", + "cosmic-config", + "derive_setters", + "image", + "ron", + "serde", + "tracing", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-comp#7300e23ce8708313e90689146914b452545e5446" +dependencies = [ + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "atomicwrites", + "calloop 0.12.3", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-panel-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#021faaf459cbb47e7f5b94316cfd93ccaed7ecf6" +dependencies = [ + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "cosmic-settings" +version = "0.1.0" +dependencies = [ + "anyhow", + "apply", + "ashpd 0.6.7", + "async-channel", + "color-eyre", + "cosmic-comp-config", + "cosmic-panel-config", + "cosmic-settings-desktop", + "cosmic-settings-page", + "cosmic-settings-system", + "cosmic-settings-time", + "derivative", + "derive_setters", + "dirs 5.0.1", + "downcast-rs", + "env_logger", + "freedesktop-desktop-entry", + "generator", + "i18n-embed", + "i18n-embed-fl", + "image", + "itertools 0.11.0", + "libcosmic", + "log", + "notify", + "once_cell", + "regex", + "ron", + "rust-embed", + "serde", + "slotmap", + "tokio", + "tracing", + "tracing-subscriber", + "url", +] + +[[package]] +name = "cosmic-settings-desktop" +version = "0.1.0" +dependencies = [ + "cosmic-bg-config", + "cosmic-config", + "dirs 5.0.1", + "freedesktop-icons", + "futures-lite", + "image", + "rayon", + "smithay-client-toolkit 0.17.0", + "tokio", + "tracing", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-settings-page" +version = "0.1.0" +dependencies = [ + "derive_setters", + "downcast-rs", + "generator", + "libcosmic", + "once_cell", + "regex", + "slotmap", +] + +[[package]] +name = "cosmic-settings-system" +version = "0.1.0" +dependencies = [ + "bumpalo", + "byte-unit", + "concat-in-place", + "const_format", + "memchr", + "sysinfo", +] + +[[package]] +name = "cosmic-settings-time" +version = "0.1.0" +dependencies = [ + "icu_calendar", + "icu_timezone", + "timedate-zbus", + "zbus", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[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 = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[package]] +name = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +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 = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[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 = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +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 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.5", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "iced_winit", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.17.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.17.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools 0.10.5", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.17.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia 0.10.0", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.17.0", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "iced_winit" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "raw-window-handle", + "thiserror", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icu_calendar" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b520c5675775e3838447c33fc55bf558148c6824ef0d20ff7a9e0df7345a281c" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75d8d1a514ca7e6dc547be930f2fd661d578909c07cf1c1adade81c3f7a78840" + +[[package]] +name = "icu_locid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "icu_timezone" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e6401cd210ccda98b2e7fc707831b29c6efe319efbbec460f957b6f331f626" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7e214a653bac59b768c42f82d252f13af95e8a9cb07b6108b8bc723c561b43" + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[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 = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "apply", + "ashpd 0.5.0", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "smithay-client-toolkit 0.17.0", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "litemap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[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.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum 0.5.11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[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 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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 = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +dependencies = [ + "ttf-parser 0.19.2", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.6", +] + +[[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 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.20", + "tracing", + "windows-sys 0.48.0", +] + +[[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 = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia 0.10.0", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.38", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[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-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 = "sctk-adwaita" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.5.10", + "smithay-client-toolkit 0.16.1", + "tiny-skia 0.8.4", +] + +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[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 = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "calloop 0.10.6", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit//?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop 0.12.3", + "calloop-wayland-source", + "cursor-icon", + "dlib", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb 0.11.1", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "unicode-xid", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#d4374b93f0ec2c0ace42d3feafec22d3af1940d8" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.3.5", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "timedate-zbus" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "609052c48ae1d9e27999ac4a159843a290bffab5fdc13856889b940aefc185b7" +dependencies = [ + "zbus", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path 0.8.4", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tracing", + "windows-sys 0.48.0", +] + +[[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.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.5", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" +dependencies = [ + "indexmap 2.0.2", + "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.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[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-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "utf8-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +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 = "window_clipboard" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +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-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.5", +] + +[[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.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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.28.6" +source = "git+https://github.com/pop-os/winit.git?branch=master#4060baa6ad2237092fed166d96f18d5394f92ef1" +dependencies = [ + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", + "core-foundation", + "core-graphics", + "dispatch", + "instant", + "libc", + "log", + "mio", + "ndk", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "sctk-adwaita", + "smithay-client-toolkit 0.16.1", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-protocols 0.29.5", + "wayland-scanner 0.29.5", + "web-sys", + "windows-sys 0.45.0", + "x11-dl", +] + +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + +[[package]] +name = "writeable" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" +dependencies = [ + "gethostname", + "nix 0.22.3", + "winapi", + "winapi-wsapoll", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#fa62a8c865cc5ba391a48fe4753a8687d8ab8ded" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2 0.7.1", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9685bb4deb98dab812e87c296a9631fc00d7ca4bc5c2c5f304f375bbed711a8a" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/default.nix new file mode 100644 index 0000000000..0e35500371 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, cmake +, makeWrapper +, cosmic-icons +, just +, pkg-config +, libxkbcommon +, libinput +, fontconfig +, freetype +, wayland +, expat +, udev +, which +, lld +, util-linuxMinimal +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-settings"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; + hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; + "cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA="; + "cosmic-comp-config-0.1.0" = "sha256-q0LP8TODETobYg0S6XDsP0Lw/RJIB8YB4jiUkRHpsio="; + "cosmic-config-0.1.0" = "sha256-+mnvf/IM9cqoZv5zHW8uBAqeY2pG3IOiOWIESVExnqg="; + "cosmic-panel-config-0.1.0" = "sha256-U5FYZ5hjJ5s6lYfWrgyuy8zLjiXGQV+OKwf6nzHZT6w="; + "smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-gPHJhYmDb3Pj7eM8eFv1kPoODk0BGiw+yMj9ROXIjAU="; + "winit-0.28.6" = "sha256-8IQ6HyvD09v8+KWO5jbAkouRTTX/Des4Pn/sjGrtdok="; + "xdg-shell-wrapper-config-0.1.0" = "sha256-pvaI/joul7jWTdIrPq3PbBcQGMLZLd2rTu1aIwXiZN8="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; + buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" + ]; + + postInstall = '' + wrapProgram "$out/bin/cosmic-settings" \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-settings"; + description = "Settings for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index d46811290a..ac5353daeb 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cwm"; - version = "7.1"; + version = "7.4"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo="; + hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 14a38ec9ef..402b358474 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -10,6 +10,7 @@ , git , hyprland-protocols , jq +, libGL , libdrm , libexecinfo , libinput @@ -40,13 +41,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.30.0"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-a0nqm82brOC0QroGOXxcIKxOMAfl9I6pfFOYjCeRzO0="; + hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4="; }; patches = [ @@ -57,9 +58,15 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp - substituteInPlace meson.build \ - --replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \ - --replace "@GIT_DIRTY@" "" + + # Generate version.h + cp src/version.h.in src/version.h + substituteInPlace src/version.h \ + --replace "@HASH@" '${finalAttrs.src.rev}' \ + --replace "@BRANCH@" "" \ + --replace "@MESSAGE@" "" \ + --replace "@TAG@" "" \ + --replace "@DIRTY@" "" ''; nativeBuildInputs = [ @@ -82,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cairo git hyprland-protocols + libGL libdrm libinput libxkbcommon diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 4188a13c34..8191582dfb 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "98a745d926d8048bc30aef11b421df207a01c279"; - hash = "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM="; + rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1"; + hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I="; }; pname = 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 32c2a8085d..80308ee138 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 @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , file +, libGL , libjpeg , mesa , pango @@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ file + libGL libjpeg mesa pango 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 17f5388342..a4a747fba3 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 @@ -6,11 +6,13 @@ , ninja , cairo , fribidi +, libGL , libdatrie , libjpeg , libselinux , libsepol , libthai +, libxkbcommon , pango , pcre , util-linux @@ -23,13 +25,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk="; + hash = "sha256-bys8S7wuY9FJRLD5WriktWED5Hi7nCKSiNbs1Rvfk4s="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -43,11 +45,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo fribidi + libGL libdatrie libjpeg libselinux libsepol libthai + libxkbcommon pango pcre wayland @@ -91,5 +95,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ fufexan ]; 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 37c4bb0300..4657ab2464 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 @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.1.0"; + version = "1.2.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-K1cqx+NP4lxPwRVPLEeSUfagaMI3m5hdYvQe7sZr7BU="; + hash = "sha256-IKcRTKzlcDsbD5xydRNc9s4c4KjcQHaZgOc5kWPOAtU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix index b9079c8828..9d21716bc7 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.22"; + version = "4.23"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks="; + sha256 = "sha256-YQJqcZbJE50POq3ScZfosyDFduOkUOAddMGspIQETEY="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager"; homepage = "https://i3wm.org"; - maintainers = with maintainers; [ modulistic fpletz globin ]; + maintainers = with maintainers; [ modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix index 47875ec47c..f9f6de9212 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }: +{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch, libGL }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -21,6 +21,8 @@ i3lock-color.overrideAttrs (oldAttrs : rec { }) ]; + buildInputs = oldAttrs.buildInputs ++ [ libGL ]; + meta = with lib; { description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index 8656db60c4..596aa8ceea 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, - libxkbfile, libjpeg_turbo, xcbutilxrm + libxkbfile, libjpeg_turbo, xcbutilxrm, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; + libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm xorg.xcbutil ]; makeFlags = [ "all" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix index b8dffa259d..b7cca2b663 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, - xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: + xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, xorg }: stdenv.mkDerivation rec { pname = "i3lock"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage xcbutilxrm - pam libX11 libev cairo libxkbcommon libxkbfile ]; + pam libX11 libev cairo libxkbcommon libxkbfile xorg.xcbutil ]; meta = with lib; { description = "A simple screen locker like slock"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix index 1c06fc2ae2..43a1c13ee0 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, xorg, python3, pkg-config, cairo, libxkbcommon }: +, xorg, python3, pkg-config, cairo, expat, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; - buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; + buildInputs = [ cairo expat libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix index 0e233dd86a..1b58fa0f2c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/jay/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, libGL , libinput , libxkbcommon , mesa @@ -22,6 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; buildInputs = [ + libGL libxkbcommon mesa pango diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index ecf9450164..6f323b963e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.31.1"; + version = "0.32.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-ZdZKymmOzhlJtsFl+ix5kERnfgjCggDpvDhL4vzS4mc="; + sha256 = "sha256-4LsB/7zKRkoxNQQVxwrSSIqGP7KQ0WHBnSVY+ClWTxo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix b/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix index 820609884d..0efb67f641 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix @@ -1,24 +1,26 @@ -{ picom, lib, fetchFromGitHub }: +{ picom, lib, fetchFromGitHub, installShellFiles }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-allusive"; - version = "0.3.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "allusive-dev"; repo = "picom-allusive"; rev = version; - hash = "sha256-lk4Ll0mi9h3BAqwgOzFQw4WYKnSW9XTl3PjoK2E4WKg="; + hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; }; + nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs; + postInstall = '' - chmod +x $out/bin/picom-trans + installManPage $src/man/picom.1.gz '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); - meta = { + meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // { description = "A fork of picom featuring improved animations and other features"; homepage = "https://github.com/allusive-dev/picom-allusive"; license = with lib.licenses; [ mit mpl20 ]; - maintainers = with lib.maintainers; [ allusive ]; + maintainers = with lib.maintainers; [ allusive iogamaster ]; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix index a830a6a575..38fa09e86f 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre2, json_c, libevdev +, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -44,8 +44,6 @@ stdenv.mkDerivation (finalAttrs: { # Use /run/current-system/sw/share and /etc instead of /nix/store # references: ./sway-config-nixos-paths.patch - # Drop ambient capabilities after getting SCHED_RR - ./drop_ambient_capabilities.patch ]; strictDeps = true; @@ -58,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wayland libxkbcommon pcre2 json_c libevdev + libGL wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit (finalAttrs) enableXWayland; }) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch b/third_party/nixpkgs/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch deleted file mode 100644 index 17010ede25..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e7d9098e81289ae99d07ec3eac1fec1d303b8fe4 Mon Sep 17 00:00:00 2001 -From: Thiago Kenji Okada -Date: Thu, 5 Oct 2023 15:23:35 +0100 -Subject: [PATCH] drop ambient capabilities - -Within NixOS the only possibility to gain cap_sys_nice is using the -security.wrapper infrastructure. However to pass the capabilities to the -wrapped program, they are raised to the ambient set. To fix this we make -sure to drop the ambient capabilities during sway startup and realtime -setup. Otherwise all programs started by sway also gain cap_sys_nice, -which is not something we want. - -Co-authored-by: Rouven Czerwinski ---- - sway/realtime.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sway/realtime.c b/sway/realtime.c -index 11154af0..06f872a8 100644 ---- a/sway/realtime.c -+++ b/sway/realtime.c -@@ -3,6 +3,7 @@ - #include - #include - #include "sway/server.h" -+#include "sys/prctl.h" - #include "log.h" - - static void child_fork_callback(void) { -@@ -10,6 +11,8 @@ static void child_fork_callback(void) { - - param.sched_priority = 0; - -+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0); -+ - int ret = pthread_setschedparam(pthread_self(), SCHED_OTHER, ¶m); - if (ret != 0) { - sway_log(SWAY_ERROR, "Failed to reset scheduler policy on fork"); --- -2.42.0 - diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index 133b561be6..c633b19abc 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -8,8 +8,10 @@ , wf-config , cairo , doctest +, libGL , libdrm , libexecinfo +, libevdev , libinput , libjpeg , libxkbcommon @@ -18,19 +20,20 @@ , wayland-scanner , wlroots , pango +, nlohmann_json , xorg }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to="; }; nativeBuildInputs = [ @@ -42,8 +45,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wf-config + libGL libdrm libexecinfo + libevdev libinput libjpeg libxkbcommon @@ -52,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { wayland cairo pango + nlohmann_json ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 110fcfe75f..9652664443 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -8,22 +9,32 @@ , wf-config , gtkmm3 , gtk-layer-shell +, libevdev +, libinput , libxkbcommon , xcbutilwm }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo="; + hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA="; }; + patches = [ + (fetchpatch { + name = "check-dependency-libevdev.patch"; + url = "https://github.com/WayfireWM/wayfire-plugins-extra/commit/f3bbf1fcbafd28016e36be7a5043bd82574ac9e4.patch"; + hash = "sha256-8X1lpf8H8NuA845cIslahKDQKW/IA/KiMExU4Snk72o="; + }) + ]; + postPatch = '' substituteInPlace metadata/meson.build \ --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" @@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire wf-config + libevdev + libinput libxkbcommon xcbutilwm gtkmm3 diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix index 48be049560..1acd161e62 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wcm.nix @@ -12,20 +12,22 @@ , wayland-scanner , wayland-protocols , gtk3 +, gtkmm3 , libevdev , libxml2 +, libxkbcommon }: stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-UwHJ4Wi83ATnA1CQKNSt8Qga7ooLnAY7QARz2FXvUIo="; }; nativeBuildInputs = [ @@ -43,8 +45,10 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols gtk3 + gtkmm3 libevdev libxml2 + libxkbcommon ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix index 923c3930c9..0151ad66f4 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + hash = "sha256-4QszCGlJqehnavTOdR2vZ95XuHKiNUIsA893sa9qph8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix index 7af794db78..229a872349 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -11,18 +11,19 @@ , gtkmm3 , gtk-layer-shell , pulseaudio +, libdbusmenu-gtk3 }: stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-shell"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { gtkmm3 gtk-layer-shell pulseaudio + libdbusmenu-gtk3 ]; mesonFlags = [ "--sysconfdir /etc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 467396a6d8..3d2c720e13 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch2 , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland +, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland , wayland-protocols, xcbutilcursor , demoSupport ? true @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland + cairo libGL libdrm libevdev libinput libxkbcommon mesa seatd wayland wayland-protocols ] ++ lib.optional hdrSupport libdisplay-info ++ lib.optional jpegSupport libjpeg diff --git a/third_party/nixpkgs/pkgs/build-support/agda/default.nix b/third_party/nixpkgs/pkgs/build-support/agda/default.nix index 63adf2a276..893383a759 100644 --- a/third_party/nixpkgs/pkgs/build-support/agda/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/agda/default.nix @@ -47,6 +47,7 @@ let "lagda.org" "lagda.rst" "lagda.tex" + "lagda.typ" ]; defaults = diff --git a/third_party/nixpkgs/pkgs/build-support/agda/lib.nix b/third_party/nixpkgs/pkgs/build-support/agda/lib.nix index 80a0974192..e6e391b2ce 100644 --- a/third_party/nixpkgs/pkgs/build-support/agda/lib.nix +++ b/third_party/nixpkgs/pkgs/build-support/agda/lib.nix @@ -6,7 +6,7 @@ * interfaceFile "Everything.agda" == "Everything.agdai" * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" */ - interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; + interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai"; /* Takes an arbitrary derivation and says whether it is an agda library package * that is not marked as broken. diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix index 3afff79eaa..7b9bb23940 100644 --- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix @@ -26,10 +26,11 @@ rec { ]; }; - extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" { + extract = args@{ name ? "${args.pname}-${args.version}", postExtract ? "", src, ... }: pkgs.runCommand "${name}-extracted" { buildInputs = [ appimage-exec ]; } '' appimage-exec.sh -x $out ${src} + ${postExtract} ''; # for compatibility, deprecated diff --git a/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix b/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix index 27f9ad9628..8c610c5122 100644 --- a/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/binary-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages }: +{ lib, stdenv, coreutils, jq, python3, nix, xz }: # This function is for creating a flat-file binary cache, i.e. the kind created by # nix copy --to file:///some/path and usable as a substituter (with the file:// prefix). @@ -19,15 +19,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = lib.makeBinPath (with buildPackages; [ coreutils jq python3 nix xz ]); + nativeBuildInputs = [ coreutils jq python3 nix xz ]; - builder = builtins.toFile "builder" '' - . .attrs.sh - - export out=''${outputs[out]} - - mkdir $out - mkdir $out/nar + buildCommand = '' + mkdir -p $out/nar python ${./make-binary-cache.py} diff --git a/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py b/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py index 16dd8a7e96..589d005562 100644 --- a/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py +++ b/third_party/nixpkgs/pkgs/build-support/binary-cache/make-binary-cache.py @@ -3,7 +3,7 @@ import json import os import subprocess -with open(".attrs.json", "r") as f: +with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f: closures = json.load(f)["closure"] os.chdir(os.environ["out"]) diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index a6802f4ab5..b5e03164ac 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -83,7 +83,7 @@ let etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' 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 7212ffa40d..6a5e82427f 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 @@ -3,7 +3,6 @@ , glibcLocales # The GraalVM derivation to use , graalvmDrv -, name ? "${args.pname}-${args.version}" , executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src @@ -13,14 +12,15 @@ , nativeImageBuildArgs ? [ (lib.optionalString stdenv.isDarwin "-H:-CheckToolchain") "-H:Name=${executable}" + "-march=compatibility" "--verbose" + "-J-Dsun.stdout.encoding=UTF-8" + "-J-Dsun.stderr.encoding=UTF-8" ] # Extra arguments to be passed to the native-image , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # Locale to be used by GraalVM compiler -, LC_ALL ? "en_US.UTF-8" , meta ? { } , ... } @ args: @@ -40,7 +40,7 @@ let ]; in stdenv.mkDerivation ({ - inherit dontUnpack LC_ALL jar; + inherit dontUnpack jar; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh index 8d02b4e512..8cd63e4609 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -10,6 +10,13 @@ for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do hardeningEnableMap["$flag"]=1 done +# fortify3 implies fortify enablement - make explicit before +# we filter unsupported flags because unsupporting fortify3 +# doesn't mean we should unsupport fortify too +if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then + hardeningEnableMap["fortify"]=1 +fi + # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do unset -v "hardeningEnableMap[$flag]" @@ -19,7 +26,7 @@ for flag in @hardening_unsupported_flags@; do fi done -# make fortify and fortify3 mutually exclusive +# now make fortify and fortify3 mutually exclusive if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then unset -v "hardeningEnableMap['fortify']" fi diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 9dcd29c644..b8d170df01 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -31,7 +31,6 @@ cxxLibrary=1 cInclude=1 expandResponseParams "$@" -linkType=$(checkLinkType "${params[@]}") declare -ag positionalArgs=() declare -i n=0 @@ -175,6 +174,7 @@ extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_ extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) if [ "$dontLink" != 1 ]; then + linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@) # Add the flags that should only be passed to the compiler when # linking. @@ -246,7 +246,7 @@ if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then fi if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp --tmpdir cc-params.XXXXXX) + responseFile=$(mktemp "${TMPDIR:-/tmp}/cc-params.XXXXXX") trap 'rm -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index e1da3ceb5b..8ac11436c5 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -110,7 +110,20 @@ let gccForLibs_solib = getLib gccForLibs + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; - # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu + # The following two functions, `isGccArchSupported` and + # `isGccTuneSupported`, only handle those situations where a flag + # (`-march` or `-mtune`) is accepted by one compiler but rejected + # by another, and both compilers are relevant to nixpkgs. We are + # not trying to maintain a complete list of all flags accepted by + # all versions of all compilers ever in nixpkgs. + # + # The two main cases of interest are: + # + # - One compiler is gcc and the other is clang + # - One compiler is pkgs.gcc and the other is bootstrap-files.gcc + # -- older compilers (for example bootstrap's GCC 5) fail with + # -march=too-modern-cpu + isGccArchSupported = arch: if targetPlatform.isPower then false else # powerpc does not allow -march= if isGNU then @@ -159,6 +172,51 @@ let else false; + isGccTuneSupported = tune: + # for x86 -mtune= takes the same values as -march, plus two more: + if targetPlatform.isx86 then + { + generic = true; + intel = true; + }.${tune} or (isGccArchSupported tune) + # on arm64, the -mtune= values are specific processors + else if targetPlatform.isAarch64 then + (if isGNU then + { + cortex-a53 = versionAtLeast ccVersion "4.8"; # gcc 8c075f + cortex-a72 = versionAtLeast ccVersion "5.1"; # gcc d8f70d + "cortex-a72.cortex-a53" = versionAtLeast ccVersion "5.1"; # gcc d8f70d + }.${tune} or false + else if isClang then + { + cortex-a53 = versionAtLeast ccVersion "3.9"; # llvm dfc5d1 + }.${tune} or false + else false) + else if targetPlatform.isPower then + # powerpc does not support -march + true + else if targetPlatform.isMips then + # for mips -mtune= takes the same values as -march + isGccArchSupported tune + else + false; + + # Clang does not support as many `-mtune=` values as gcc does; + # this function will return the best possible approximation of the + # provided `-mtune=` value, or `null` if none exists. + # + # Note: this function can make use of ccVersion; for example, `if + # versionOlder ccVersion "12" then ...` + findBestTuneApproximation = tune: + let guess = if isClang + then { + # clang does not tune for big.LITTLE chips + "cortex-a72.cortex-a53" = "cortex-a72"; + }.${tune} or tune + else tune; + in if isGccTuneSupported guess + then guess + else null; darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin ( if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" @@ -469,6 +527,7 @@ stdenv.mkDerivation { '' + optionalString (libcxx.isLLVM or false) '' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags '' @@ -558,10 +617,12 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? gcc.thumb) '' echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before '' - + optionalString (targetPlatform ? gcc.tune && - isGccArchSupported targetPlatform.gcc.tune) '' - echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before - '' + + (let tune = if targetPlatform ? gcc.tune + then findBestTuneApproximation targetPlatform.gcc.tune + else null; + in optionalString (tune != null) '' + echo "-mtune=${tune}" >> $out/nix-support/cc-cflags-before + '') # TODO: categorize these and figure out a better place for them + optionalString targetPlatform.isWindows '' diff --git a/third_party/nixpkgs/pkgs/build-support/closure-info.nix b/third_party/nixpkgs/pkgs/build-support/closure-info.nix index 6b3ff6fd62..f2aa4964d9 100644 --- a/third_party/nixpkgs/pkgs/build-support/closure-info.nix +++ b/third_party/nixpkgs/pkgs/build-support/closure-info.nix @@ -4,7 +4,7 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, buildPackages }: +{ stdenv, coreutils, jq }: { rootPaths }: @@ -19,18 +19,24 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; + nativeBuildInputs = [ coreutils jq ]; - builder = builtins.toFile "builder" + empty = rootPaths == []; + + buildCommand = '' - . .attrs.sh - out=''${outputs[out]} mkdir $out - jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths + if [[ -n "$empty" ]]; then + echo 0 > $out/total-nar-size + touch $out/registration $out/store-paths + else + jq -r ".closure | map(.narSize) | add" < "$NIX_ATTRS_JSON_FILE" > $out/total-nar-size + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < "$NIX_ATTRS_JSON_FILE" | head -n -1 > $out/registration + jq -r '.closure[].path' < "$NIX_ATTRS_JSON_FILE" > $out/store-paths + fi + ''; } diff --git a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix index be1fd72776..1a98f98fb8 100644 --- a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin }: +{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: -{ pubGetScript ? "dart pub get" +{ sdkSetupScript ? "" +, pubGetScript ? "dart pub get" # Output type to produce. Can be any kind supported by dart # https://dart.dev/tools/dart-compile#types-of-output @@ -18,12 +19,16 @@ , dartEntryPoints ? null # Used when wrapping aot, jit, kernel, and js builds. # Set to null to disable wrapping. -, dartRuntimeCommand ? - if dartOutputType == "aot-snapshot" then "${dart}/bin/dartaotruntime" - else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then "${dart}/bin/dart" - else if dartOutputType == "js" then "${nodejs}/bin/node" - else null +, dartRuntimeCommand ? if dartOutputType == "aot-snapshot" then "${dart}/bin/dartaotruntime" + else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then "${dart}/bin/dart" + else if dartOutputType == "js" then "${nodejs}/bin/node" + else null +, runtimeDependencies ? [ ] +, extraWrapProgramArgs ? "" +, customPackageOverrides ? { } +, autoDepsList ? false +, depsListFile ? null , pubspecLockFile ? null , vendorHash ? "" , ... @@ -31,44 +36,92 @@ let dartDeps = (fetchDartDeps.override { - dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p "$out/bin" - makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + dart = symlinkJoin { + name = "dart-fod"; + paths = [ dart ]; + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + }; }) { buildDrvArgs = args; - inherit pubGetScript vendorHash pubspecLockFile; + inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile; }; - inherit (dartHooks.override { inherit dart; }) dartConfigHook dartBuildHook dartInstallHook; -in -assert !(builtins.isString dartOutputType && dartOutputType != "") -> - throw "dartOutputType must be a non-empty string"; -stdenv.mkDerivation (args // { - inherit pubGetScript dartCompileCommand dartOutputType dartRuntimeCommand - dartCompileFlags dartJitFlags; + inherit (dartHooks.override { inherit dart; }) dartConfigHook dartBuildHook dartInstallHook dartFixupHook; + + baseDerivation = stdenv.mkDerivation (finalAttrs: args // { + inherit sdkSetupScript pubGetScript dartCompileCommand dartOutputType + dartRuntimeCommand dartCompileFlags dartJitFlags runtimeDependencies; dartEntryPoints = if (dartEntryPoints != null) then writeText "entrypoints.json" (builtins.toJSON dartEntryPoints) else null; - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ - dart - dartDeps - dartConfigHook - dartBuildHook - dartInstallHook - makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ - darwin.sigtool - ]; + runtimeDependencyLibraryPath = lib.makeLibraryPath finalAttrs.runtimeDependencies; - # When stripping, it seems some ELF information is lost and the dart VM cli - # runs instead of the expected program. Don't strip if it's an exe output. - dontStrip = args.dontStrip or (dartOutputType == "exe"); + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + dart + dartDeps + dartConfigHook + dartBuildHook + dartInstallHook + dartFixupHook + makeWrapper + jq + ] ++ lib.optionals stdenv.isDarwin [ + darwin.sigtool + ]; - passthru = { inherit dartDeps; } // (args.passthru or { }); + preUnpack = '' + ${lib.optionalString (!autoDepsList) '' + if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.dartDeps.depsListFile}')"}; }; then + echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ + '\nPlease choose one of the following solutions:' \ + '\n - Duplicate the following file and pass it to the depsListFile argument.' \ + '\n ${finalAttrs.passthru.dartDeps.depsListFile}' \ + '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'. + exit 1 + fi + ''} + ${args.preUnpack or ""} + ''; - meta = (args.meta or { }) // { platforms = args.meta.platforms or dart.meta.platforms; }; -}) + # When stripping, it seems some ELF information is lost and the dart VM cli + # runs instead of the expected program. Don't strip if it's an exe output. + dontStrip = args.dontStrip or (dartOutputType == "exe"); + + passthru = { inherit dartDeps; } // (args.passthru or { }); + + meta = (args.meta or { }) // { platforms = args.meta.platforms or dart.meta.platforms; }; + }); + + packageOverrideRepository = (callPackage ../../../development/compilers/dart/package-overrides { }) // customPackageOverrides; + productPackages = builtins.filter (package: package.kind != "dev") + (if autoDepsList + then lib.importJSON dartDeps.depsListFile + else + if depsListFile == null + then [ ] + else lib.importJSON depsListFile); +in +assert !(builtins.isString dartOutputType && dartOutputType != "") -> +throw "dartOutputType must be a non-empty string"; +builtins.foldl' + (prev: package: + if packageOverrideRepository ? ${package.name} + then + prev.overrideAttrs + (packageOverrideRepository.${package.name} { + inherit (package) + name + version + kind + source + dependencies; + }) + else prev) + baseDerivation + productPackages diff --git a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh index 3e90199523..f22d7d2ce6 100644 --- a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh @@ -3,6 +3,9 @@ dartConfigHook() { echo "Executing dartConfigHook" + echo "Setting up SDK" + eval "$sdkSetupScript" + echo "Installing dependencies" eval doPubGet "$pubGetScript" --offline diff --git a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh new file mode 100644 index 0000000000..c5a9bedd06 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/dart-fixup-hook.sh @@ -0,0 +1,32 @@ +# shellcheck shell=bash + +dartFixupHook() { + echo "Executing dartFixupHook" + + declare -a wrapProgramArgs + + # Add runtime library dependencies to the LD_LIBRARY_PATH. + # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). + # + # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, + # which is not what application authors expect. + echo "$runtimeDependencyLibraryPath" + if [[ ! -z "$runtimeDependencyLibraryPath" ]]; then + wrapProgramArgs+=(--suffix LD_LIBRARY_PATH : \"$runtimeDependencyLibraryPath\") + fi + + if [[ ! -z "$extraWrapProgramArgs" ]]; then + wrapProgramArgs+=("$extraWrapProgramArgs") + fi + + if [ ${#wrapProgramArgs[@]} -ne 0 ]; then + for f in "$out"/bin/*; do + echo "Wrapping $f..." + eval "wrapProgram \"$f\" ${wrapProgramArgs[@]}" + done + fi + + echo "Finished dartFixupHook" +} + +postFixupHooks+=(dartFixupHook) diff --git a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/default.nix index 463061c54a..134989426d 100644 --- a/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dart/build-dart-application/hooks/default.nix @@ -12,4 +12,7 @@ dartInstallHook = makeSetupHook { name = "dart-install-hook"; } ./dart-install-hook.sh; + dartFixupHook = makeSetupHook { + name = "dart-fixup-hook"; + } ./dart-fixup-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix index e523b60797..51052cae18 100644 --- a/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -169,6 +169,8 @@ let dart pub deps --json | jq .packages > $out runHook postBuild ''; + + dontInstall = true; } // (removeAttrs buildDrvInheritArgs [ "name" "pname" ])); # As of Dart 3.0.0, Pub checks the revision of cached Git-sourced packages. diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 1ac0a69f74..70fd3635b7 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -446,7 +446,7 @@ rec { ''; postMount = '' - mkdir -p mnt/{dev,proc,sys} mnt${storeDir} + mkdir -p mnt/{dev,proc,sys,tmp} mnt${storeDir} # Mount /dev, /sys and the nix store as shared folders. mount --rbind /dev mnt/dev diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 686d89f8c1..f8ed3a3889 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -158,6 +158,22 @@ stdenvNoCC.mkDerivation (args // { dotnet-sdk ]; + # Parse the version attr into a format acceptable for the Version msbuild property + # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string + versionForDotnet = if !(lib.hasAttr "version" args) || args.version == null + then null else let + components = lib.pipe args.version [ + lib.splitVersion + (lib.filter (x: (lib.strings.match "[0-9]+" x) != null)) + (lib.filter (x: (lib.toInt x) < 65535)) # one version component in dotnet has to fit in 16 bits + ]; + in if (lib.length components) == 0 + then null + else lib.concatStringsSep "." ((lib.take 4 components) + ++ (if (lib.length components) < 4 + then lib.replicate (4 - (lib.length components)) "0" + else [ ])); + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" ]; @@ -172,7 +188,7 @@ stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; - } // lib.optionalAttrs (nugetDepsFile != null) { + } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { fetch-deps = let flags = dotnetFlags ++ dotnetRestoreFlags; diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index e9567b64cf..0acfeced9b 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -24,8 +24,13 @@ dotnetBuildHook() { dotnetBuildFlags+=("-p:UseAppHost=true") fi + local versionFlags=() if [ "${version-}" ]; then - local -r versionFlag="-p:Version=${version-}" + versionFlags+=("-p:InformationalVersion=${version-}") + fi + + if [ "${versionForDotnet-}" ]; then + versionFlags+=("-p:Version=${versionForDotnet-}") fi dotnetBuild() { @@ -43,7 +48,7 @@ dotnetBuildHook() { -p:Deterministic=true \ --configuration "@buildType@" \ --no-restore \ - ${versionFlag-} \ + ${versionFlags[@]} \ ${runtimeIdFlags[@]} \ ${dotnetBuildFlags[@]} \ ${dotnetFlags[@]} diff --git a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix index 9371b77023..7ce15e98c8 100644 --- a/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/expand-response-params/default.nix @@ -1,5 +1,12 @@ { stdenv }: +# A "response file" is a sequence of arguments that is passed via a +# file, rather than via argv[]. + +# For more information see: +# https://gcc.gnu.org/wiki/Response_Files +# https://www.intel.com/content/www/us/en/docs/dpcpp-cpp-compiler/developer-guide-reference/2023-0/use-response-files.html + stdenv.mkDerivation { name = "expand-response-params"; src = ./expand-response-params.c; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh index 991864719a..4515e0e82f 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "$stdenv/setup" echo "exporting \`$url' (revision $rev) into \`$out'" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh index 4b49e9676e..7e4dde4a64 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup (echo "#!$SHELL"; \ diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh index 75b9066dba..39838db255 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tagtext="" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix b/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix index da19848326..f8a229ccb6 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchdocker/credentials.nix @@ -1,3 +1,4 @@ +{ lib }: # We provide three paths to get the credentials into the builder's # environment: # diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 4eb70f672d..489914a2a8 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "${stdenv}/setup" echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix b/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix index 6a7b977db2..95b193490a 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -1,7 +1,7 @@ { stdenv, lib, haskellPackages, writeText, gawk }: let awk = "${gawk}/bin/awk"; - dockerCredentialsFile = import ./credentials.nix; + dockerCredentialsFile = import ./credentials.nix { inherit lib; }; in { fetcher , name diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh index 36b758ab57..fe828d0ada 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "Cloning Fossil $url [$rev] into $out" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh index 77f6381b09..95176beea8 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh @@ -3,7 +3,7 @@ # - revision specified and remote has a HEAD # - revision specified and remote without HEAD # -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (rev $rev) into $out" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix index 1d06ce44a9..66bb3b7c09 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix @@ -90,6 +90,7 @@ stdenvNoCC.mkDerivation { ${netrcPhase} # required that git uses the netrc file mv {,.}netrc + export NETRC=$PWD/.netrc export HOME=$PWD ''; 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 018cf692b8..a3ea029767 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -207,7 +207,10 @@ checkout_ref(){ # Update submodules init_submodules(){ - clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} + # shallow with leaveDotGit will change hashes + [[ -z "$deepClone" ]] && [[ -z "$leaveDotGit" ]] && \ + clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} --progress --depth 1 || \ + clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} --progress } clone(){ @@ -257,9 +260,15 @@ make_deterministic_repo(){ cd "$repo" # Remove files that contain timestamps or otherwise have non-deterministic # properties. - rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD \ - .git/refs/remotes/origin/HEAD .git/config - + if [ -f .git ]; then + local dotgit_content=$(<.git) + local dotgit_dir="${dotgit_content#gitdir: }" + else + local dotgit_dir=".git" + fi + pushd "$dotgit_dir" >/dev/null + rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config + popd >/dev/null # Remove all remote branches. git branch -r | while read -r branch; do clean_git branch -rD "$branch" @@ -277,7 +286,7 @@ make_deterministic_repo(){ # Do a full repack. Must run single-threaded, or else we lose determinism. clean_git config pack.threads 1 clean_git repack -A -d -f - rm -f .git/config + rm -f "$dotgit_dir/config" # Garbage collect unreferenced objects. # Note: --keep-largest-pack prevents non-deterministic ordering of packs @@ -323,7 +332,7 @@ clone_user_rev() { find "$dir" -name .git -print0 | xargs -0 rm -rf else find "$dir" -name .git | while read -r gitdir; do - make_deterministic_repo "$(readlink -f "$gitdir/..")" + make_deterministic_repo "$(readlink -f "$(dirname "$gitdir")")" done fi } @@ -416,8 +425,8 @@ fi tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) +ln -s "${NETRC:-$HOME/.netrc}" "$tmpHomePath/.netrc" HOME="$tmpHomePath" -ln -s "$NIX_BUILD_TOP/.netrc" "$HOME/" unset XDG_CONFIG_HOME export GIT_CONFIG_NOSYSTEM=1 diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix index a18be65327..23e5fa2990 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/tests.nix @@ -1,15 +1,13 @@ -{ testers, fetchgit, ... }: - -{ +{ testers, fetchgit, ... }: { simple = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "simple-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; }; sparseCheckout = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "sparse-checkout-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sparseCheckout = [ @@ -20,7 +18,7 @@ }; sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchgit { - name = "nix-source"; + name = "sparse-checkout-non-cone-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sparseCheckout = [ @@ -30,4 +28,48 @@ nonConeMode = true; sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4="; }; + + leave-git = testers.invalidateFetcherByDrvHash fetchgit { + name = "leave-git-nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko="; + leaveDotGit = true; + }; + + submodule-simple = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-simple-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-rmP8PQT0wJBopdtr/hsB7Y/L1G+ZPdHC2r9LB05Qrj4="; + fetchSubmodules = true; + }; + + submodule-leave-git = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-leave-git-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk="; + leaveDotGit = true; + fetchSubmodules = true; + }; + + submodule-deep = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-deep-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + deepClone = true; + fetchSubmodules = true; + }; + + submodule-leave-git-deep = testers.invalidateFetcherByDrvHash fetchgit { + name = "submodule-leave-git-deep-source"; + url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; + rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; + sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + deepClone = true; + leaveDotGit = true; + fetchSubmodules = true; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh index 1ce2947577..20dfde4b10 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "getting $url${rev:+ ($rev)} into $out" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchipfs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchipfs/builder.sh index ca77962b53..1ddd111b15 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchipfs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchipfs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh index 1aabd7949e..de929fad55 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup set -x diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh index aa4d049aba..e187747f14 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh index 5782151524..e553446346 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchtorrent/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchtorrent/default.nix new file mode 100644 index 0000000000..beb2415df7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetchtorrent/default.nix @@ -0,0 +1,60 @@ +{ lib, runCommand, transmission_noSystemd, rqbit, writeShellScript, formats, cacert, rsync }: +let + urlRegexp = ''.*xt=urn:bt[im]h:([^&]{64}|[^&]{40}).*''; +in +{ url +, name ? + if (builtins.match urlRegexp url) == null then + "bittorrent" + else + "bittorrent-" + builtins.head (builtins.match urlRegexp url) +, config ? if (backend == "transmission") then { } else throw "json config for configuring fetchFromBitorrent only works with the transmission backend" +, hash +, backend ? "transmission" +, recursiveHash ? true +, postFetch ? "" +, postUnpack ? "" +}: +let + afterSuccess = writeShellScript "fetch-bittorrent-done.sh" '' + ${postUnpack} + # Flatten the directory, so that only the torrent contents are in $out, not + # the folder name + shopt -s dotglob + mv -v $downloadedDirectory/*/* $out + rm -v -rf $downloadedDirectory + unset downloadedDirectory + ${postFetch} + kill $PPID + ''; + jsonConfig = (formats.json {}).generate "jsonConfig" config; +in +runCommand name { + nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchtorrent"); + outputHashAlgo = if hash != "" then null else "sha256"; + outputHash = hash; + outputHashMode = if recursiveHash then "recursive" else "flat"; + + # url will be written to the derivation, meaning it can be parsed and utilized + # by external tools, such as tools that may want to seed fetchtorrent calls + # in nixpkgs + inherit url; +} +(if (backend == "transmission") then '' + export HOME=$TMP + export downloadedDirectory=$out/downloadedDirectory + mkdir -p $downloadedDirectory + mkdir -p $HOME/.config/transmission + cp ${jsonConfig} $HOME/.config/transmission/settings.json + function handleChild { + # This detects failures and logs the contents of the transmission fetch + find $out + exit 0 + } + trap handleChild CHLD + transmission-cli --port $(shuf -n 1 -i 49152-65535) --portmap --finish ${afterSuccess} --download-dir $downloadedDirectory --config-dir "$HOME"/.config/transmission "$url" +'' else +'' + export HOME=$TMP + rqbit --disable-dht-persistence --http-api-listen-addr "127.0.0.1:$(shuf -n 1 -i 49152-65535)" download -o $out --exit-on-finish "$url" +'') diff --git a/third_party/nixpkgs/pkgs/build-support/fetchtorrent/tests.nix b/third_party/nixpkgs/pkgs/build-support/fetchtorrent/tests.nix new file mode 100644 index 0000000000..b36c82c632 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetchtorrent/tests.nix @@ -0,0 +1,25 @@ +{ testers, fetchtorrent, ... }: + +{ + http-link = testers.invalidateFetcherByDrvHash fetchtorrent { + url = "https://webtorrent.io/torrents/wired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "transmission"; + }; + magnet-link = testers.invalidateFetcherByDrvHash fetchtorrent { + url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "transmission"; + }; + http-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent { + url = "https://webtorrent.io/torrents/wired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "rqbit"; + }; + magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent { + url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; + hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; + backend = "rqbit"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh index e8eaba9348..a82728ef10 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup source $mirrorsFile diff --git a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix index a0ed1211ed..3e13621165 100644 --- a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix @@ -1,34 +1,28 @@ { lib , callPackage -, stdenvNoCC , runCommand , makeWrapper , wrapGAppsHook -, llvmPackages_13 +, fetchDartDeps +, buildDartApplication , cacert , glib , flutter -, jq }: # absolutely no mac support for now { pubGetScript ? "flutter pub get" , flutterBuildFlags ? [ ] -, runtimeDependencies ? [ ] -, customPackageOverrides ? { } -, autoDepsList ? false -, depsListFile ? null -, vendorHash ? "" -, pubspecLockFile ? null -, nativeBuildInputs ? [ ] -, preUnpack ? "" -, postFixup ? "" , extraWrapProgramArgs ? "" , ... }@args: -let - flutterSetupScript = '' + +(buildDartApplication.override { + dart = flutter; + fetchDartDeps = fetchDartDeps.override { dart = flutter; }; +}) (args // { + sdkSetupScript = '' # Pub needs SSL certificates. Dart normally looks in a hardcoded path. # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48 # @@ -54,136 +48,56 @@ let flutter config --enable-linux-desktop >/dev/null ''; - deps = callPackage ../dart/fetch-dart-deps { dart = flutter; } { - sdkSetupScript = flutterSetupScript; - inherit pubGetScript vendorHash pubspecLockFile; - buildDrvArgs = args; - }; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ wrapGAppsHook ]; + buildInputs = (args.buildInputs or [ ]) ++ [ glib ]; - baseDerivation = llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // { - inherit flutterBuildFlags runtimeDependencies; + dontDartBuild = true; + buildPhase = args.buildPhase or '' + runHook preBuild - outputs = [ "out" "debug" ]; + mkdir -p build/flutter_assets/fonts - nativeBuildInputs = [ - makeWrapper - deps - flutter - jq - glib - wrapGAppsHook - ] ++ nativeBuildInputs; + doPubGet flutter pub get --offline -v + flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} - dontWrapGApps = true; + runHook postBuild + ''; - preUnpack = '' - ${lib.optionalString (!autoDepsList) '' - if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then - echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ - '\nPlease choose one of the following solutions:' \ - '\n - Duplicate the following file and pass it to the depsListFile argument.' \ - '\n ${finalAttrs.passthru.depsListFile}' \ - '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'. - exit 1 - fi - ''} + dontDartInstall = true; + installPhase = args.installPhase or '' + runHook preInstall - ${preUnpack} - ''; + built=build/linux/*/release/bundle - configurePhase = '' - runHook preConfigure + mkdir -p $out/bin + mv $built $out/app - ${flutterSetupScript} + for f in $(find $out/app -iname "*.desktop" -type f); do + install -D $f $out/share/applications/$(basename $f) + done - runHook postConfigure - ''; + for f in $(find $out/app -maxdepth 1 -type f); do + ln -s $f $out/bin/$(basename $f) + done - buildPhase = '' - runHook preBuild + # make *.so executable + find $out/app -iname "*.so" -type f -exec chmod +x {} + - mkdir -p build/flutter_assets/fonts + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral + for f in $(find $out/app -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") + patchelf --set-rpath "$newrp" "$f" + fi + done - doPubGet flutter pub get --offline -v - flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)} + runHook postInstall + ''; - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - built=build/linux/*/release/bundle - - mkdir -p $out/bin - mv $built $out/app - - for f in $(find $out/app -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 - ln -s $f $out/bin/$(basename $f) - done - - # make *.so executable - find $out/app -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 - 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") - patchelf --set-rpath "$newrp" "$f" - fi - done - - runHook postInstall - ''; - - postFixup = '' - # Add runtime library dependencies to the LD_LIBRARY_PATH. - # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). - # - # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, - # which is not what application authors expect. - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' \ - ''${gappsWrapperArgs[@]} \ - ${extraWrapProgramArgs} - done - - ${postFixup} - ''; - - passthru = (args.passthru or {}) // { - inherit (deps) depsListFile; - }; - }); - - packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides; - productPackages = builtins.filter (package: package.kind != "dev") - (if autoDepsList - then lib.importJSON deps.depsListFile - else - if depsListFile == null - then [ ] - else lib.importJSON depsListFile); -in -builtins.foldl' - (prev: package: - if packageOverrideRepository ? ${package.name} - then - prev.overrideAttrs - (packageOverrideRepository.${package.name} { - inherit (package) - name - version - kind - source - dependencies; - }) - else prev) - baseDerivation - productPackages + dontWrapGApps = true; + extraWrapProgramArgs = '' + ''${gappsWrapperArgs[@]} \ + ${extraWrapProgramArgs} + ''; +}) diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index 09b43063fb..d0fd8928c9 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -297,6 +297,7 @@ let } // meta; }); in +lib.warnIf (args' ? vendorSha256) "`vendorSha256` is deprecated. Use `vendorHash` instead" lib.warnIf (buildFlags != "" || buildFlagsArray != "") "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index 78ae4a01da..8965b8793c 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "eyre" version = "0.6.8" @@ -20,9 +14,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91766b1121940d622933a13e20665857648681816089c9bc2075c4b75a6e4f6b" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ "log", "plain", @@ -37,12 +31,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "make-initrd-ng" @@ -54,9 +45,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "plain" @@ -66,18 +57,18 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.42" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -93,9 +84,9 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", @@ -104,9 +95,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.98" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -115,6 +106,6 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 53096a8423..daa688976c 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -195,7 +195,7 @@ fn handle_path( .wrap_err_with(|| format!("failed to resolve symlink of {:?}", source))?; // Create the link, then push its target to the queue - if !target.exists() { + if !target.exists() && !target.is_symlink() { unix::fs::symlink(&link_target, &target).wrap_err_with(|| { format!("failed to symlink {:?} to {:?}", link_target, target) })?; diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix index 7cfc0e9f9c..2aefab8ac7 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs }: +{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs: { name ? "${args.pname}-${args.version}" , src ? null @@ -34,16 +34,16 @@ , npmPruneFlags ? npmInstallFlags # Value for npm `--workspace` flag and directory in which the files to be installed are found. , npmWorkspace ? null +, nodejs ? topLevelArgs.nodejs +, npmDeps ? fetchNpmDeps { + inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch; + name = "${name}-npm-deps"; + hash = npmDepsHash; +} , ... } @ args: let - npmDeps = fetchNpmDeps { - inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch; - name = "${name}-npm-deps"; - hash = npmDepsHash; - }; - # .override {} negates splicing, so we need to use buildPackages explicitly npmHooks = buildPackages.npmHooks.override { inherit nodejs; diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index 79e2c4b268..a2f77bdc6d 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -14,7 +14,7 @@ npmInstallHook() { local dest="$packageOut/$(dirname "$file")" mkdir -p "$dest" cp "${npmWorkspace-.}/$file" "$dest" - done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm pack --json --dry-run ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") + done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm pack --json --dry-run --loglevel=warn --no-foreground-scripts ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") # Based on code from Python's buildPythonPackage wrap.sh script, for # supporting both the case when makeWrapperArgs is an array and a diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock index 482eb6c7be..4f6e177fd9 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.lock @@ -4,24 +4,24 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[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", @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bitflags" @@ -59,9 +59,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -74,9 +74,9 @@ dependencies = [ [[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" [[package]] name = "castaway" @@ -86,9 +86,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 = "cfg-if" @@ -98,32 +101,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] -[[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" @@ -184,9 +177,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.63+curl-8.1.2" +version = "0.4.67+curl-8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" +checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34" dependencies = [ "cc", "libc", @@ -194,7 +187,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys", ] [[package]] @@ -209,9 +202,9 @@ dependencies = [ [[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 = "env_logger" @@ -228,25 +221,14 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[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 = "event-listener" version = "2.5.3" @@ -262,6 +244,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "fnv" version = "1.0.7" @@ -295,7 +283,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -327,9 +315,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "http" @@ -367,25 +355,14 @@ 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", - "libc", - "windows-sys", -] - [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.2", + "rustix", "windows-sys", ] @@ -416,21 +393,21 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -440,27 +417,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -471,16 +442,6 @@ 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 = "once_cell" version = "1.18.0" @@ -495,9 +456,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -507,9 +468,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "percent-encoding" @@ -519,18 +480,18 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -539,9 +500,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" @@ -593,18 +554,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -641,9 +602,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -651,14 +612,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -672,9 +631,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -683,42 +654,28 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustix" -version = "0.37.22" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" -dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys", "windows-sys", ] [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -740,24 +697,24 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -766,9 +723,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -777,9 +734,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", @@ -788,9 +745,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -799,9 +756,9 @@ dependencies = [ [[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", ] @@ -829,9 +786,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -840,23 +797,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.1", "redox_syscall", - "rustix 0.37.22", + "rustix", "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -921,9 +877,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" @@ -933,9 +889,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -948,9 +904,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -972,15 +928,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -1010,9 +966,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", ] @@ -1034,9 +990,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1049,42 +1005,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_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_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_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_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_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_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml index 41347b6c2c..0f7735a6e8 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/Cargo.toml @@ -6,17 +6,17 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.71" +anyhow = "1.0.75" backoff = "0.4.0" -base64 = "0.21.2" +base64 = "0.21.4" digest = "0.10.7" env_logger = "0.10.0" isahc = { version = "1.7.2", default_features = false } -rayon = "1.7.0" -serde = { version = "1.0.164", features = ["derive"] } -serde_json = "1.0.99" -sha1 = "0.10.5" -sha2 = "0.10.7" -tempfile = "3.6.0" -url = { version = "2.4.0", features = ["serde"] } -walkdir = "2.3.3" +rayon = "1.8.0" +serde = { version = "1.0.188", features = ["derive"] } +serde_json = "1.0.107" +sha1 = "0.10.6" +sha2 = "0.10.8" +tempfile = "3.8.0" +url = { version = "2.4.1", features = ["serde"] } +walkdir = "2.4.0" diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index b37652ffdf..86e9120de0 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -4,7 +4,7 @@ use rayon::prelude::*; use serde_json::{Map, Value}; use std::{ fs, - io::{self, Read}, + io::Write, process::{Command, Stdio}, }; use tempfile::{tempdir, TempDir}; @@ -106,7 +106,7 @@ impl Package { let specifics = match get_hosted_git_url(&resolved)? { Some(hosted) => { - let mut body = util::get_url_with_retry(&hosted)?; + let body = util::get_url_body_with_retry(&hosted)?; let workdir = tempdir()?; @@ -120,7 +120,7 @@ impl Package { .stdin(Stdio::piped()) .spawn()?; - io::copy(&mut body, &mut cmd.stdin.take().unwrap())?; + cmd.stdin.take().unwrap().write_all(&body)?; let exit = cmd.wait()?; @@ -154,13 +154,7 @@ impl Package { pub fn tarball(&self) -> anyhow::Result> { match &self.specifics { - Specifics::Registry { .. } => { - let mut body = Vec::new(); - - util::get_url_with_retry(&self.url)?.read_to_end(&mut body)?; - - Ok(body) - } + Specifics::Registry { .. } => Ok(util::get_url_body_with_retry(&self.url)?), Specifics::Git { workdir } => Ok(Command::new("tar") .args([ "--sort=name", diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs index 7a220f681c..7dd928fdc4 100644 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/util.rs @@ -4,7 +4,7 @@ use isahc::{ Body, Request, RequestExt, }; use serde_json::{Map, Value}; -use std::{env, path::Path}; +use std::{env, io::Read, path::Path}; use url::Url; pub fn get_url(url: &Url) -> Result { @@ -28,7 +28,7 @@ pub fn get_url(url: &Url) -> Result { if let Some(host) = url.host_str() { if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") { if let Ok(tokens) = serde_json::from_str::>(&npm_tokens) { - if let Some(token) = tokens.get(host).and_then(|val| val.as_str()) { + if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) { request = request.header("Authorization", format!("Bearer {token}")); } } @@ -38,15 +38,23 @@ pub fn get_url(url: &Url) -> Result { Ok(request.body(())?.send()?.into_body()) } -pub fn get_url_with_retry(url: &Url) -> Result { +pub fn get_url_body_with_retry(url: &Url) -> Result, isahc::Error> { retry(ExponentialBackoff::default(), || { - get_url(url).map_err(|err| { - if err.is_network() || err.is_timeout() { - backoff::Error::transient(err) - } else { - backoff::Error::permanent(err) - } - }) + get_url(url) + .and_then(|mut body| { + let mut buf = Vec::new(); + + body.read_to_end(&mut buf)?; + + Ok(buf) + }) + .map_err(|err| { + if err.is_network() || err.is_timeout() { + backoff::Error::transient(err) + } else { + backoff::Error::permanent(err) + } + }) }) .map_err(|backoff_err| match backoff_err { backoff::Error::Permanent(err) diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/fixup.js index 8b91e7efa6..732e569aba 100755 --- a/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/fixup.js +++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-yarn-deps/fixup.js @@ -21,6 +21,8 @@ const fixupYarnLock = async (lockContents, verbose) => { if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) pkg.resolved = urlToName(url) + if (hash) + pkg.resolved += `#${hash}` return [dep, pkg] }) diff --git a/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix b/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix index 6aecf43457..778aa35fa6 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix @@ -13,10 +13,12 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer composer-local-repo-plugin + phpDrv phpDrv.composerHooks.composerInstallHook ]; @@ -53,6 +55,13 @@ let runHook postInstall ''; + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = previousAttrs.installCheckPhase or '' + runHook preCheckInstall + + runHook postCheckInstall + ''; + composerRepository = phpDrv.mkComposerRepository { inherit composer composer-local-repo-plugin; inherit (finalAttrs) patches pname src vendorHash version; @@ -61,8 +70,13 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; }; + COMPOSER_CACHE_DIR="/dev/null"; + COMPOSER_DISABLE_NETWORK="1"; + COMPOSER_MIRROR_PATH_REPOS="1"; + meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix b/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix index 30b0b48de7..5b31f86e61 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix @@ -32,6 +32,7 @@ let composerNoDev = previousAttrs.composerNoDev or true; composerNoPlugins = previousAttrs.composerNoPlugins or true; composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; @@ -41,6 +42,7 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer composer-local-repo-plugin + phpDrv phpDrv.composerHooks.composerRepositoryHook ]; @@ -74,6 +76,13 @@ let runHook postInstall ''; + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = previousAttrs.installCheckPhase or '' + runHook preCheckInstall + + runHook postCheckInstall + ''; + COMPOSER_CACHE_DIR = "/dev/null"; COMPOSER_MIRROR_PATH_REPOS = "1"; COMPOSER_HTACCESS_PROTECT = "0"; diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh index b1b5e2ac55..6fe1c4e5f7 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -35,31 +35,33 @@ composerInstallConfigureHook() { cp composer.lock $out/ echo - echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' - echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo -e "\e[31mERROR: No composer.lock found\e[0m" echo - echo 'To fix the issue:' - echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" - echo " cp $out/composer.lock " - echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' - echo ' composerLock = ./composer.lock;' + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' echo exit 1 fi echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" - if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then + if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then echo - echo "ERROR: vendorHash is out of date" + echo -e "\e[31mERROR: vendorHash is out of date\e[0m" echo - echo "composer.lock is not the same in $composerRepository" + echo -e "\e[31mcomposer.lock is not the same in $composerRepository\e[0m" echo - echo "To fix the issue:" - echo '1. Set vendorHash to an empty string: `vendorHash = "";`' - echo '2. Build the derivation and wait for it to fail with a hash mismatch' - echo '3. Copy the "got: sha256-..." value back into the vendorHash field' - echo ' You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";' + echo -e "\e[31mTo fix the issue:\e[0m" + echo -e '\e[31m1. Set vendorHash to an empty string: `vendorHash = "";`\e[0m' + echo -e '\e[31m2. Build the derivation and wait for it to fail with a hash mismatch\e[0m' + echo -e '\e[31m3. Copy the "got: sha256-..." value back into the vendorHash field\e[0m' + echo -e '\e[31m You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";\e[0m' echo exit 1 @@ -77,9 +79,9 @@ composerInstallBuildHook() { # because the file contains hardcoded nix store paths, we generate it here. composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . - # Remove all the repositories of type "composer" + # Remove all the repositories of type "composer" and "vcs" # from the composer.json file. - jq -r -c 'del(try .repositories[] | select(.type == "composer"))' composer.json | sponge composer.json + jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json # Configure composer to disable packagist and avoid using the network. composer config repo.packagist false @@ -88,7 +90,6 @@ composerInstallBuildHook() { # Since the composer.json file has been modified in the previous step, the # composer.lock file needs to be updated. - COMPOSER_DISABLE_NETWORK=1 \ COMPOSER_ROOT_VERSION="${version}" \ composer \ --lock \ @@ -106,7 +107,26 @@ composerInstallBuildHook() { composerInstallCheckHook() { echo "Executing composerInstallCheckHook" - composer validate --no-ansi --no-interaction + if ! composer validate --strict --no-ansi --no-interaction --quiet; then + if [ ! -z "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi echo "Finished composerInstallCheckHook" } @@ -118,10 +138,7 @@ composerInstallInstallHook() { # the autoloader. # The COMPOSER_ROOT_VERSION environment variable is needed only for # vimeo/psalm. - COMPOSER_CACHE_DIR=/dev/null \ - COMPOSER_DISABLE_NETWORK=1 \ COMPOSER_ROOT_VERSION="${version}" \ - COMPOSER_MIRROR_PATH_REPOS="1" \ composer \ --no-ansi \ --no-interaction \ diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh b/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh index 3aae1f9fa8..03783d9d63 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -3,6 +3,7 @@ declare version declare composerNoDev declare composerNoPlugins declare composerNoScripts +declare composerStrictValidation preConfigureHooks+=(composerRepositoryConfigureHook) preBuildHooks+=(composerRepositoryBuildHook) @@ -31,14 +32,16 @@ composerRepositoryConfigureHook() { cp composer.lock $out/ echo - echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' - echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo -e "\e[31mERROR: No composer.lock found\e[0m" echo - echo 'To fix the issue:' - echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" - echo " cp $out/composer.lock " - echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' - echo ' composerLock = ./composer.lock;' + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' echo exit 1 @@ -55,7 +58,6 @@ composerRepositoryBuildHook() { # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin # nix-community/composer-local-repo-plugin. - COMPOSER_CACHE_DIR=/dev/null \ composer-local-repo-plugin --no-ansi build-local-repo ${composerNoDev:+--no-dev} -r repository echo "Finished composerRepositoryBuildHook" @@ -64,7 +66,26 @@ composerRepositoryBuildHook() { composerRepositoryCheckHook() { echo "Executing composerRepositoryCheckHook" - composer validate --no-ansi --no-interaction + if ! composer validate --strict --no-ansi --no-interaction --quiet; then + if [ ! -z "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi echo "Finished composerRepositoryCheckHook" } diff --git a/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix index c19bc75758..240ec64072 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix @@ -1,9 +1,9 @@ { lib , makeSetupHook +, diffutils , jq , moreutils , makeBinaryWrapper -, php , cacert , buildPackages }: @@ -12,18 +12,18 @@ composerRepositoryHook = makeSetupHook { name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils php cacert ]; + propagatedBuildInputs = [ jq moreutils cacert ]; substitutions = { }; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook { name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ]; + propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ]; substitutions = { # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. - diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; }; } ./composer-install-hook.sh; } diff --git a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index b18f422dbf..48d05b7a00 100644 --- a/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -71,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { composer global config --quiet minimum-stability dev composer global config --quiet prefer-stable true - composer global config --quiet autoloader-suffix "nixPredictableAutoloaderSuffix" composer global config --quiet apcu-autoloader false composer global config --quiet allow-plugins.nix-community/composer-local-repo-plugin true composer global config --quiet repo.packagist false diff --git a/third_party/nixpkgs/pkgs/build-support/references-by-popularity/default.nix b/third_party/nixpkgs/pkgs/build-support/references-by-popularity/default.nix index dfc25275f3..2171c622f0 100644 --- a/third_party/nixpkgs/pkgs/build-support/references-by-popularity/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/references-by-popularity/default.nix @@ -6,11 +6,8 @@ path: runCommand "closure-paths" exportReferencesGraph.graph = path; __structuredAttrs = true; preferLocalBuild = true; - PATH = "${coreutils}/bin:${python3}/bin"; - builder = builtins.toFile "builder" - '' - . .attrs.sh - python3 ${./closure-graph.py} .attrs.json graph > ''${outputs[out]} - ''; - } - "" + nativeBuildInputs = [ coreutils python3 ]; +} +'' + python3 ${./closure-graph.py} "$NIX_ATTRS_JSON_FILE" graph > ''${outputs[out]} +'' diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 37bf3ec26f..e842b6a3f5 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,6 +1,5 @@ { lib, stdenv , mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI -, rust }: { crateName, @@ -21,7 +20,7 @@ (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--target" (rust.toRustTargetSpec stdenv.hostPlatform) + "--target" stdenv.hostPlatform.rust.rustcTargetSpec ] ++ lib.optionals (needUnstableCLI dependencies) [ "-Z" "unstable-options" ] ++ extraRustcOpts @@ -41,6 +40,7 @@ ); binRustcOpts = lib.concatStringsSep " " ( + [ "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ] ++ baseRustcOpts ); diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 60310f1787..a6f2528a82 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: { build , buildDependencies @@ -124,8 +124,8 @@ in '' export CARGO_PKG_AUTHORS="${authors}" export CARGO_PKG_DESCRIPTION="${crateDescription}" - export CARGO_CFG_TARGET_ARCH=${rust.toTargetArch stdenv.hostPlatform} - export CARGO_CFG_TARGET_OS=${rust.toTargetOs stdenv.hostPlatform} + export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.rust.platform.arch} + export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" @@ -136,8 +136,8 @@ in '' export CARGO_MANIFEST_DIR=$(pwd) export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" - export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" + export TARGET="${stdenv.hostPlatform.rust.rustcTargetSpec}" + export HOST="${stdenv.buildPlatform.rust.rustcTargetSpec}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index 4e3e2045e8..d569142af6 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -10,7 +10,6 @@ , fetchCrate , pkgsBuildBuild , rustc -, rust , cargo , jq , libiconv @@ -71,18 +70,14 @@ let inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv rust echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; }; installCrate = import ./install-crate.nix { inherit stdenv; }; - - # Allow access to the rust attribute set from inside buildRustCrate, which - # has a parameter that shadows the name. - rustAttrs = rust; in /* The overridable pkgs.buildRustCrate function. @@ -310,7 +305,7 @@ crate_: lib.makeOverridable depsMetadata = lib.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); hashedMetadata = builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString (mkRustcFeatureArgs crateFeatures) + - "___" + depsMetadata + "___" + rustAttrs.toRustTarget stdenv.hostPlatform); + "___" + depsMetadata + "___" + stdenv.hostPlatform.rust.rustcTarget); in lib.substring 0 10 hashedMetadata; @@ -366,6 +361,10 @@ crate_: lib.makeOverridable meta = { mainProgram = crateName; + badPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; }; } // extraDerivationAttrs ) diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix index 9b2e62fc24..cf2ddbd084 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix @@ -1,7 +1,6 @@ { lib , importCargoLock , fetchCargoTarball -, rust , stdenv , callPackage , cargoBuildHook @@ -62,7 +61,6 @@ assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null) -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; -assert buildType == "release" || buildType == "debug"; let @@ -79,18 +77,13 @@ let sha256 = args.cargoSha256; } // depsExtraArgs); - target = rust.toRustTargetSpec stdenv.hostPlatform; + target = stdenv.hostPlatform.rust.rustcTargetSpec; targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; - # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 - # the "${}" is needed to transform the path into a /nix/store path before baseNameOf - shortTarget = if targetIsJSON then - (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) - else target; - sysroot = callPackage ./sysroot { } { - inherit target shortTarget; + inherit target; + shortTarget = stdenv.hostPlatform.rust.cargoShortTarget; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; @@ -162,10 +155,15 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "riscv32-linux" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mipsel-linux" + "mips64el-linux" "riscv32-linux" "armv6l-netbsd" "x86_64-redox" "wasm32-wasi" ]; + badPlatforms = [ + # Rust is currently unable to target the n32 ABI + lib.systems.inspect.patterns.isMips64n32 + ]; } // meta; }) diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index a6d53056d9..bb95b7bdc3 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, rustPlatform, buildPackages }: +{ lib, stdenv, rustPlatform, buildPackages }: { shortTarget, originalCargoToml, target, RUSTFLAGS }: @@ -26,7 +26,7 @@ in rustPlatform.buildRustPackage { done export RUST_SYSROOT=$(rustc --print=sysroot) - host=${rust.toRustTarget stdenv.buildPlatform} + host=${stdenv.buildPlatform.rust.rustcTarget} cp -r $RUST_SYSROOT/lib/rustlib/$host $out ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh index af94e02e38..ed982c7ff3 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -17,7 +17,7 @@ cargoBuildHook() { fi if [ "${cargoBuildType}" != "debug" ]; then - cargoBuildProfileFlag="--${cargoBuildType}" + cargoBuildProfileFlag="--profile ${cargoBuildType}" fi if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then @@ -30,13 +30,8 @@ cargoBuildHook() { ( set -x - env \ - "CC_@rustBuildPlatform@=@ccForBuild@" \ - "CXX_@rustBuildPlatform@=@cxxForBuild@" \ - "CC_@rustTargetPlatform@=@ccForHost@" \ - "CXX_@rustTargetPlatform@=@cxxForHost@" \ - cargo build -j $NIX_BUILD_CORES \ - --target @rustTargetPlatformSpec@ \ + @setEnv@ cargo build -j $NIX_BUILD_CORES \ + --target @rustHostPlatformSpec@ \ --frozen \ ${cargoBuildProfileFlag} \ ${cargoBuildNoDefaultFeaturesFlag} \ diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 57fc2779cf..971a140ec1 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -17,7 +17,7 @@ cargoCheckHook() { fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--${cargoCheckType}" + cargoCheckProfileFlag="--profile ${cargoCheckType}" fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then @@ -29,7 +29,7 @@ cargoCheckHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" ( set -x diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh index 69ce726693..24a6e6fa9e 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -1,7 +1,7 @@ cargoInstallPostBuildHook() { echo "Executing cargoInstallPostBuildHook" - releaseDir=target/@shortTarget@/$cargoBuildType + releaseDir=target/@targetSubdirectory@/$cargoBuildType tmpDir="${releaseDir}-tmp"; mkdir -p $tmpDir @@ -21,7 +21,7 @@ cargoInstallHook() { # rename the output dir to a architecture independent one - releaseDir=target/@shortTarget@/$cargoBuildType + releaseDir=target/@targetSubdirectory@/$cargoBuildType tmpDir="${releaseDir}-tmp"; mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep "${tmpDir}$") diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index de85683ead..29ba18a6a1 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -17,7 +17,7 @@ cargoNextestHook() { fi if [ "${cargoCheckType}" != "debug" ]; then - cargoCheckProfileFlag="--${cargoCheckType}" + cargoCheckProfileFlag="--cargo-profile ${cargoCheckType}" fi if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then @@ -29,7 +29,7 @@ cargoNextestHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" ( set -x diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix index 2eb388fe07..7703ff4aba 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/default.nix @@ -9,32 +9,20 @@ , rust , rustc , stdenv -, target ? rust.toRustTargetSpec stdenv.hostPlatform + +# This confusingly-named parameter indicates the *subdirectory of +# `target/` from which to copy the build artifacts. It is derived +# from a stdenv platform (or a JSON file). +, target ? stdenv.hostPlatform.rust.cargoShortTarget }: -let - targetIsJSON = lib.hasSuffix ".json" target; - - # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 - # the "${}" is needed to transform the path into a /nix/store path before baseNameOf - shortTarget = if targetIsJSON then - (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) - else target; - ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; - cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - rustBuildPlatform = rust.toRustTarget stdenv.buildPlatform; - rustTargetPlatform = rust.toRustTarget stdenv.hostPlatform; - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in { +{ cargoBuildHook = callPackage ({ }: makeSetupHook { name = "cargo-build-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { - inherit ccForBuild ccForHost cxxForBuild cxxForHost - rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec setEnv; }; } ./cargo-build-hook.sh) {}; @@ -43,7 +31,7 @@ in { name = "cargo-check-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { - inherit rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec; }; } ./cargo-check-hook.sh) {}; @@ -52,7 +40,7 @@ in { name = "cargo-install-hook.sh"; propagatedBuildInputs = [ ]; substitutions = { - inherit shortTarget; + targetSubdirectory = target; }; } ./cargo-install-hook.sh) {}; @@ -61,7 +49,7 @@ in { name = "cargo-nextest-hook.sh"; propagatedBuildInputs = [ cargo cargo-nextest ]; substitutions = { - inherit rustTargetPlatformSpec; + inherit (rust.envVars) rustHostPlatformSpec; }; } ./cargo-nextest-hook.sh) {}; @@ -77,24 +65,27 @@ in { diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; cargoConfig = '' - [target."${rust.toRustTarget stdenv.buildPlatform}"] - "linker" = "${ccForBuild}" + [target."${stdenv.buildPlatform.rust.rustcTarget}"] + "linker" = "${rust.envVars.ccForBuild}" ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${shortTarget}"] - "linker" = "${ccForHost}" + [target."${stdenv.hostPlatform.rust.rustcTarget}"] + "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] ''; }; } ./cargo-setup-hook.sh) {}; - maturinBuildHook = callPackage ({ }: + maturinBuildHook = callPackage ({ pkgsHostTarget }: makeSetupHook { name = "maturin-build-hook.sh"; - propagatedBuildInputs = [ cargo maturin rustc ]; + propagatedBuildInputs = [ + pkgsHostTarget.maturin + pkgsHostTarget.cargo + pkgsHostTarget.rustc + ]; substitutions = { - inherit ccForBuild ccForHost cxxForBuild cxxForHost - rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; + inherit (rust.envVars) rustTargetPlatformSpec setEnv; }; } ./maturin-build-hook.sh) {}; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 62d5619660..d5ff069290 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -9,12 +9,7 @@ maturinBuildHook() { ( set -x - env \ - "CC_@rustBuildPlatform@=@ccForBuild@" \ - "CXX_@rustBuildPlatform@=@cxxForBuild@" \ - "CC_@rustTargetPlatform@=@ccForHost@" \ - "CXX_@rustTargetPlatform@=@cxxForHost@" \ - maturin build \ + @setEnv@ maturin build \ --jobs=$NIX_BUILD_CORES \ --frozen \ --target @rustTargetPlatformSpec@ \ diff --git a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix index aa5ba14c13..dad8ab5282 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix @@ -1,66 +1,81 @@ -{ lib }: +{ lib +, stdenv +, buildPackages +, targetPackages +}: rec { - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch - toTargetArch = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.arch - else if platform.isAarch32 then "arm" - else if platform.isMips64 then "mips64" # never add "el" suffix - else if platform.isPower64 then "powerpc64" # never add "le" suffix - else platform.parsed.cpu.name; + # These environment variables must be set when using `cargo-c` and + # several other tools which do not deal well with cross + # compilation. The symptom of the problem they fix is errors due + # to buildPlatform CFLAGS being passed to the + # hostPlatform-targeted compiler -- for example, `-m64` being + # passed on a build=x86_64/host=aarch64 compilation. + envVars = let + ccForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + cxxForHost = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os - toTargetOs = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.os or "none" - else if platform.isDarwin then "macos" - else platform.parsed.kernel.name; + # Unfortunately we must use the dangerous `targetPackages` here + # because hooks are artificially phase-shifted one slot earlier + # (they go in nativeBuildInputs, so the hostPlatform looks like + # a targetPlatform to them). + ccForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"; - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family - toTargetFamily = platform: - if platform ? rustc.platform.target-family - then - ( - # Since https://github.com/rust-lang/rust/pull/84072 - # `target-family` is a list instead of single value. - let - f = platform.rustc.platform.target-family; - in - if builtins.isList f then f else [ f ] - ) - else lib.optional platform.isUnix "unix" - ++ lib.optional platform.isWindows "windows"; + rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget; + rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec; + rustHostPlatform = stdenv.hostPlatform.rust.rustcTarget; + rustHostPlatformSpec = stdenv.hostPlatform.rust.rustcTargetSpec; + rustTargetPlatform = stdenv.targetPlatform.rust.rustcTarget; + rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec; + in { + inherit + ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec + ccForHost cxxForHost rustHostPlatform rustHostPlatformSpec + ccForTarget cxxForTarget rustTargetPlatform rustTargetPlatformSpec; - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor - toTargetVendor = platform: let - inherit (platform.parsed) vendor; - in platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; - - # Returns the name of the rust target, even if it is custom. Adjustments are - # because rust has slightly different naming conventions than we do. - toRustTarget = platform: let - inherit (platform.parsed) cpu kernel abi; - cpu_ = platform.rustc.platform.arch or { - "armv7a" = "armv7"; - "armv7l" = "armv7"; - "armv6l" = "arm"; - "armv5tel" = "armv5te"; - "riscv64" = "riscv64gc"; - }.${cpu.name} or cpu.name; - vendor_ = toTargetVendor platform; - in platform.rustc.config - or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - - # Returns the name of the rust target if it is standard, or the json file - # containing the custom target spec. - toRustTargetSpec = platform: - if platform ? rustc.platform - then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) - else toRustTarget platform; - - # Returns true if the target is no_std - # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 - IsNoStdTarget = platform: let rustTarget = toRustTarget platform; in - builtins.any (t: lib.hasInfix t rustTarget) ["-none" "nvptx" "switch" "-uefi"]; + # Prefix this onto a command invocation in order to set the + # variables needed by cargo. + # + setEnv = '' + env \ + '' + # Due to a bug in how splicing and targetPackages works, in + # situations where targetPackages is irrelevant + # targetPackages.stdenv.cc is often simply wrong. We must omit + # the following lines when rustTargetPlatform collides with + # rustHostPlatform. + + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' + "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ + "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ + '' + '' + "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \ + "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \ + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \ + '' + '' + "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \ + "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \ + "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \ + "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" \ + "HOST_CXX=${buildPackages.stdenv.cc}/bin/c++" \ + ''; + }; +} // lib.mapAttrs (old: new: platform: + # TODO: enable warning after 23.05 is EOL. + # lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead." + lib.getAttrFromPath new platform.rust) +{ + toTargetArch = [ "platform" "arch" ]; + toTargetOs = [ "platform" "os" ]; + toTargetFamily = [ "platform" "target-family" ]; + toTargetVendor = [ "platform" "vendor" ]; + toRustTarget = [ "rustcTarget" ]; + toRustTargetSpec = [ "rustcTargetSpec" ]; + toRustTargetSpecShort = [ "cargoShortTarget" ]; + toRustTargetForUseInEnvVars = [ "cargoEnvVarTarget" ]; + IsNoStdTarget = [ "isNoStdTarget" ]; } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py index 965384b876..261f558548 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -174,7 +174,7 @@ class Dependency: found: bool = False # Whether it was found somewhere -def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = []) -> list[Dependency]: +def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = [], extra_args: List[str] = []) -> list[Dependency]: try: with open_elf(path) as elf: @@ -213,7 +213,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if file_is_dynamic_executable: print("setting interpreter of", path) subprocess.run( - ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()], + ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()] + extra_args, check=True) rpath += runtime_deps @@ -250,7 +250,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if rpath: print("setting RPATH to:", rpath_str) subprocess.run( - ["patchelf", "--set-rpath", rpath_str, path.as_posix()], + ["patchelf", "--set-rpath", rpath_str, path.as_posix()] + extra_args, check=True) return dependencies @@ -262,7 +262,8 @@ def auto_patchelf( runtime_deps: List[Path], recursive: bool = True, ignore_missing: List[str] = [], - append_rpaths: List[Path] = []) -> None: + append_rpaths: List[Path] = [], + extra_args: List[str] = []) -> None: if not paths_to_patch: sys.exit("No paths to patch, stopping.") @@ -275,7 +276,7 @@ def auto_patchelf( dependencies = [] for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch): if not path.is_symlink() and path.is_file(): - dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths) + dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, extra_args) missing = [dep for dep in dependencies if not dep.found] @@ -333,6 +334,12 @@ def main() -> None: type=Path, help="Paths to append to all runtime paths unconditionally", ) + parser.add_argument( + "--extra-args", + nargs="*", + type=str, + help="Extra arguments to pass to patchelf" + ) print("automatically fixing dependencies for ELF files") args = parser.parse_args() @@ -344,7 +351,8 @@ def main() -> None: args.runtime_dependencies, args.recursive, args.ignore_missing, - append_rpaths=args.append_rpaths) + append_rpaths=args.append_rpaths, + extra_args=args.extra_args) interpreter_path: Path = None # type: ignore diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index 0625565606..371389df42 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -63,6 +63,7 @@ autoPatchelf() { local appendRunpathsArray=($appendRunpaths) local runtimeDependenciesArray=($runtimeDependencies) + local patchelfFlagsArray=($patchelfFlags) @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \ --ignore-missing "${ignoreMissingDepsArray[@]}" \ @@ -70,7 +71,8 @@ autoPatchelf() { --libs "${autoPatchelfLibs[@]}" \ "${extraAutoPatchelfLibs[@]}" \ --runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}" \ - --append-rpaths "${appendRunpathsArray[@]}" + --append-rpaths "${appendRunpathsArray[@]}" \ + --extra-args "${patchelfFlagsArray[@]}" } # XXX: This should ultimately use fixupOutputHooks but we currently don't have diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 55e196e654..e103fe77d9 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -36,5 +36,5 @@ fixDarwinDylibNames() { fixDarwinDylibNamesIn() { local dir="$1" - fixDarwinDylibNames $(find "$dir" -name "*.dylib") + fixDarwinDylibNames $(find "$dir" -name "*.dylib" -o -name "*.so" -o -name "*.so.*") } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh index 88a50befd7..6cd01f6bf6 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh @@ -193,8 +193,23 @@ makeCWrapper() { addFlags() { local n flag before after var + + # Disable file globbing, since bash will otherwise try to find + # filenames matching the the value to be prefixed/suffixed if + # it contains characters considered wildcards, such as `?` and + # `*`. We want the value as is, except we also want to split + # it on on the separator; hence we can't quote it. + local reenableGlob=0 + if [[ ! -o noglob ]]; then + reenableGlob=1 + fi + set -o noglob # shellcheck disable=SC2086 before=($1) after=($2) + if (( reenableGlob )); then + set +o noglob + fi + var="argv_tmp" printf '%s\n' "char **$var = calloc(${#before[@]} + argc + ${#after[@]} + 1, sizeof(*$var));" printf '%s\n' "assert($var != NULL);" 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 8b8732af06..744c7807f4 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }: let inherit (lib) @@ -311,6 +311,8 @@ rec { Similar to writeShellScriptBin and writeScriptBin. Writes an executable Shell script to /nix/store//bin/ and checks its syntax with shellcheck and the shell's -n option. + Individual checks can be foregone by putting them in the excludeShellChecks + list, e.g. [ "SC2016" ]. Automatically includes sane set of shellopts (errexit, nounset, pipefail) and handles creation of PATH based on runtimeInputs @@ -338,6 +340,7 @@ rec { , runtimeInputs ? [ ] , meta ? { } , checkPhase ? null + , excludeShellChecks ? [ ] }: writeTextFile { inherit name meta; @@ -362,11 +365,12 @@ rec { # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v) # but we still want to use writeShellApplication on those platforms let - shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck.compiler; + shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler; + excludeOption = lib.optionalString (excludeShellChecks != [ ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'"; shellcheckCommand = lib.optionalString shellcheckSupported '' # use shellcheck which does not include docs # pandoc takes long to build and documentation isn't needed for just running the cli - ${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target" + ${lib.getExe shellcheck-minimal} ${excludeOption} "$target" ''; in if checkPhase == null then '' diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix index 683f4b9fd0..cbd1b388ef 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/default.nix @@ -25,6 +25,7 @@ recurseIntoAttrs { then callPackage ./references.nix {} else null; writeCBin = callPackage ./writeCBin.nix {}; + writeShellApplication = callPackage ./writeShellApplication.nix {}; writeScriptBin = callPackage ./writeScriptBin.nix {}; writeShellScript = callPackage ./write-shell-script.nix {}; writeShellScriptBin = callPackage ./writeShellScriptBin.nix {}; diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellApplication.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellApplication.nix new file mode 100644 index 0000000000..6ce6f0720f --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/writeShellApplication.nix @@ -0,0 +1,29 @@ +/* + Run with: + + cd nixpkgs + nix-build -A tests.trivial-builders.writeShellApplication +*/ + +{ lib, writeShellApplication, runCommand }: +let + pkg = writeShellApplication { + name = "test-script"; + excludeShellChecks = [ "SC2016" ]; + text = '' + echo -e '#!/usr/bin/env bash\n' \ + 'echo "$SHELL"' > /tmp/something.sh # this line would normally + # ...cause shellcheck error + ''; + }; +in + assert pkg.meta.mainProgram == "test-script"; + runCommand "test-writeShellApplication" { } '' + + echo Testing if writeShellApplication builds without shellcheck error... + + target=${lib.getExe pkg} + + touch $out + '' + diff --git a/third_party/nixpkgs/pkgs/build-support/writers/data.nix b/third_party/nixpkgs/pkgs/build-support/writers/data.nix index 48f9bc547e..45ed5360ea 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/data.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/data.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, dasel }: +{ lib, pkgs, formats, runCommand, dasel }: let daselBin = lib.getExe dasel; @@ -23,7 +23,7 @@ rec { # writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; # myConfig = writeJSON "config.json" { hello = "world"; } # - makeDataWriter = { input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: + makeDataWriter = lib.warn "pkgs.writers.makeDataWriter is deprecated. Use pkgs.writeTextFile." ({ input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); let name = last (builtins.split "/" nameOrPath); @@ -40,41 +40,25 @@ rec { mkdir -p $out/$(dirname "${nameOrPath}") mv tmp $out/${nameOrPath} ''} - ''; + ''); - # Writes the content to text. - # - # Example: - # writeText "filename.txt" "file content" - writeText = makeDataWriter { - input = toString; - output = "cp $inputPath $out"; - }; + inherit (pkgs) writeText; # Writes the content to a JSON file. # # Example: # writeJSON "data.json" { hello = "world"; } - writeJSON = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w json > $out"; - }; + writeJSON = (pkgs.formats.json {}).generate; # Writes the content to a TOML file. # # Example: # writeTOML "data.toml" { hello = "world"; } - writeTOML = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w toml > $out"; - }; + writeTOML = (pkgs.formats.toml {}).generate; # Writes the content to a YAML file. # # Example: # writeYAML "data.yaml" { hello = "world"; } - writeYAML = makeDataWriter { - input = builtins.toJSON; - output = "${daselBin} -f $inputPath -r json -w yaml > $out"; - }; + writeYAML = (pkgs.formats.yaml {}).generate; } diff --git a/third_party/nixpkgs/pkgs/build-support/writers/test.nix b/third_party/nixpkgs/pkgs/build-support/writers/test.nix index 2411f8c03a..005daf0be5 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/test.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/test.nix @@ -7,6 +7,7 @@ , python3Packages , pypy3Packages , runCommand +, testers , writers , writeText }: @@ -36,14 +37,7 @@ let let expectedFile = writeText "${file.name}-expected" expected; in - runCommand "run-${file.name}" {} '' - if ! diff -u ${file} ${expectedFile}; then - echo 'test ${file.name} failed' - exit 1 - fi - - touch $out - ''; + testers.testEqualContents { expected = expectedFile; actual = file; assertion = "${file.name} matches"; }; in lib.recurseIntoAttrs { bin = lib.recurseIntoAttrs { @@ -261,7 +255,9 @@ lib.recurseIntoAttrs { toml = expectDataEqual { file = writeTOML "data.toml" { hello = "world"; }; - expected = "hello = 'world'\n"; + expected = '' + hello = "world" + ''; }; yaml = expectDataEqual { diff --git a/third_party/nixpkgs/pkgs/by-name/_9/_9base/config-substitutions.patch b/third_party/nixpkgs/pkgs/by-name/_9/_9base/config-substitutions.patch new file mode 100644 index 0000000000..f95083c99b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/_9/_9base/config-substitutions.patch @@ -0,0 +1,56 @@ +diff --git a/config.mk b/config.mk +index 1ebfd49..ec076b3 100644 +--- a/config.mk ++++ b/config.mk +@@ -1,25 +1,17 @@ + # Customize to fit your system + + # paths +-PREFIX = /usr/local/plan9 + MANPREFIX = ${PREFIX}/share/man + + VERSION = 7 +-OBJTYPE = 386 +-#OBJTYPE = arm +-#OBJTYPE = x86_64 +-#OBJTYPE     = sun4u + + # Linux/BSD + #CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\"" + CFLAGS += -c -I. -DPLAN9PORT -DPREFIX="\"${PREFIX}\"" +-LDFLAGS += -static + + # Solaris + #CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\"" + #LDFLAGS = -dn + + # compiler +-AR = ar rc +-CC = cc + YACC = ../yacc/9yacc +diff --git a/lib9/Makefile b/lib9/Makefile +index b83ab2b..e3744a4 100644 +--- a/lib9/Makefile ++++ b/lib9/Makefile +@@ -221,7 +221,7 @@ uninstall: + + ${LIB}: ${OFILES} + @echo AR ${TARG} +- @${AR} ${LIB} ${OFILES} ++ @${AR} rc ${LIB} ${OFILES} + + .c.o: + @echo CC $< +diff --git a/troff/Makefile b/troff/Makefile +index b4e3d88..3aac6bf 100644 +--- a/troff/Makefile ++++ b/troff/Makefile +@@ -6,7 +6,7 @@ TARG = troff + OFILES = n1.o n2.o n3.o n4.o n5.o t6.o n6.o n7.o n8.o n9.o t10.o\ + n10.o t11.o ni.o hytab.o suftab.o dwbinit.o mbwc.o + MANFILES = troff.1 +-TROFFDIR = ${PREFIX}/lib/troff ++TROFFDIR = ${PREFIX_TROFF}/lib/troff + + include ../std.mk + diff --git a/third_party/nixpkgs/pkgs/by-name/_9/_9base/dont-strip.patch b/third_party/nixpkgs/pkgs/by-name/_9/_9base/dont-strip.patch new file mode 100644 index 0000000000..9385f70b79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/_9/_9base/dont-strip.patch @@ -0,0 +1,12 @@ +diff --git a/sam/Makefile b/sam/Makefile +index 17ada1f..1e9e9b8 100644 +--- a/sam/Makefile ++++ b/sam/Makefile +@@ -10,7 +10,6 @@ MANFILES = sam.1 + include ../config.mk + + all: ${TARG} +- @strip ${TARG} + @echo built ${TARG} + + install: ${TARG} diff --git a/third_party/nixpkgs/pkgs/by-name/_9/_9base/getcallerpc-use-macro-or-stub.patch b/third_party/nixpkgs/pkgs/by-name/_9/_9base/getcallerpc-use-macro-or-stub.patch new file mode 100644 index 0000000000..d7047a9a99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/_9/_9base/getcallerpc-use-macro-or-stub.patch @@ -0,0 +1,115 @@ +diff --git a/lib9/Makefile b/lib9/Makefile +index b83ab2b..2836b38 100644 +--- a/lib9/Makefile ++++ b/lib9/Makefile +@@ -145,7 +145,7 @@ LIB9OFILES=\ + exitcode.o\ + fcallfmt.o\ + get9root.o\ +- getcallerpc-$(OBJTYPE).o\ ++ getcallerpc.o\ + getenv.o\ + getfields.o\ + getnetconn.o\ +diff --git a/lib9/getcallerpc-386.c b/lib9/getcallerpc-386.c +deleted file mode 100644 +index 1367370..0000000 +--- a/lib9/getcallerpc-386.c ++++ /dev/null +@@ -1,7 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- return (((ulong*)(x))[-1]); +-} +diff --git a/lib9/getcallerpc-PowerMacintosh.c b/lib9/getcallerpc-PowerMacintosh.c +deleted file mode 100644 +index 679a72c..0000000 +--- a/lib9/getcallerpc-PowerMacintosh.c ++++ /dev/null +@@ -1,7 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- return (((ulong*)(x))[-4]); +-} +diff --git a/lib9/getcallerpc-arm.c b/lib9/getcallerpc-arm.c +deleted file mode 100644 +index 9bb4a95..0000000 +--- a/lib9/getcallerpc-arm.c ++++ /dev/null +@@ -1,8 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- return ((ulong*)x)[-2]; +-} +- +diff --git a/lib9/getcallerpc-power.c b/lib9/getcallerpc-power.c +deleted file mode 100644 +index b4bf698..0000000 +--- a/lib9/getcallerpc-power.c ++++ /dev/null +@@ -1,11 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- ulong *lp; +- +- lp = x; +- +- return lp[-1]; +-} +diff --git a/lib9/getcallerpc-ppc.c b/lib9/getcallerpc-ppc.c +deleted file mode 100644 +index 679a72c..0000000 +--- a/lib9/getcallerpc-ppc.c ++++ /dev/null +@@ -1,7 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- return (((ulong*)(x))[-4]); +-} +diff --git a/lib9/getcallerpc-x86_64.c b/lib9/getcallerpc-x86_64.c +deleted file mode 100644 +index 1367370..0000000 +--- a/lib9/getcallerpc-x86_64.c ++++ /dev/null +@@ -1,7 +0,0 @@ +-#include +- +-ulong +-getcallerpc(void *x) +-{ +- return (((ulong*)(x))[-1]); +-} +diff --git a/lib9/getcallerpc.c b/lib9/getcallerpc.c +new file mode 100644 +index 0000000..7d2cdd7 +--- /dev/null ++++ b/lib9/getcallerpc.c +@@ -0,0 +1,12 @@ ++#include ++ ++/* ++ * On gcc and clang, getcallerpc is a macro invoking a compiler builtin. ++ * If the macro in libc.h did not trigger, there's no implementation. ++ */ ++#undef getcallerpc ++ulong ++getcallerpc(void *v) ++{ ++ return 1; ++} +\ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix b/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix new file mode 100644 index 0000000000..809b9da39a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/_9/_9base/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchgit +, pkg-config +, patches ? [ ] +, pkgsBuildHost +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation { + pname = "9base"; + version = "unstable-2019-09-11"; + + src = fetchgit { + url = "https://git.suckless.org/9base"; + rev = "63916da7bd6d73d9a405ce83fc4ca34845667cce"; + hash = "sha256-CNK7Ycmcl5vkmtA5VKwKxGZz8AoIG1JH/LTKoYmWSBI="; + }; + + patches = [ + # expects to be used with getcallerpc macro or stub patch + # AR env var is now the location of `ar` not including the arg (`ar rc`) + ./config-substitutions.patch + ./dont-strip.patch + # plan9port dropped their own getcallerpc implementations + # in favour of using gcc/clang's macros or a stub + # we can do this here too to extend platform support + # https://github.com/9fans/plan9port/commit/540caa5873bcc3bc2a0e1896119f5b53a0e8e630 + # https://github.com/9fans/plan9port/commit/323e1a8fac276f008e6d5146a83cbc88edeabc87 + ./getcallerpc-use-macro-or-stub.patch + ] ++ patches; + + # the 9yacc script needs to be executed to build other items + preBuild = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace ./yacc/9yacc \ + --replace "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}" + ''; + + enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + NIX_CFLAGS_COMPILE = [ + # workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: diffio.o:(.bss+0x16): multiple definition of `bflag'; diffdir.o:(.bss+0x6): first defined here + "-fcommon" + # hide really common warning that floods the logs: + # warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + "-D_DEFAULT_SOURCE" + ]; + LDFLAGS = lib.optionalString enableStatic "-static"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + installFlags = [ + "PREFIX_TROFF=${placeholder "troff"}" + ]; + + outputs = [ "out" "man" "troff" ]; + + meta = with lib; { + homepage = "https://tools.suckless.org/9base/"; + description = "9base is a port of various original Plan 9 tools for Unix, based on plan9port"; + longDescription = '' + 9base is a port of various original Plan 9 tools for Unix, based on plan9port. + It also contains the Plan 9 libc, libbio, libregexp, libfmt and libutf. + The overall SLOC is about 66kSLOC, so this userland + all libs is much smaller than, e.g. bash. + 9base can be used to run werc instead of the full blown plan9port. + ''; + license = with licenses; [ mit /* and */ lpl-102 ]; + maintainers = with maintainers; [ jk ]; + platforms = platforms.unix; + # needs additional work to support aarch64-darwin + # due to usage of _DARWIN_NO_64_BIT_INODE + broken = stdenv.isAarch64 && stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ab/aba/package.nix b/third_party/nixpkgs/pkgs/by-name/ab/aba/package.nix new file mode 100644 index 0000000000..14a32c6137 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ab/aba/package.nix @@ -0,0 +1,60 @@ +{ fetchFromSourcehut +, just +, lib +, nix-update-script +, rustPlatform +, scdoc +}: +let + version = "0.7.1"; +in +rustPlatform.buildRustPackage { + pname = "aba"; + inherit version; + + src = fetchFromSourcehut { + owner = "~onemoresuza"; + repo = "aba"; + rev = version; + hash = "sha256-Sz9I1Dw7wmoUPpTBNfbYbehfNO8FK6r/ubofx+FGb04="; + domain = "sr.ht"; + }; + + cargoSha256 = "sha256-Ihoh+yp12qN74JHvJbEDoYz+eoMwPOQar+yBEy+bqb0="; + + nativeBuildInputs = [ + just + scdoc + ]; + + postPatch = '' + # Suppress messages of command not found. jq is not needed for the build, but just calls it anyway. + sed -i '/[[:space:]]*|[[:space:]]*jq -r/s/jq -r .*/: \\/' ./justfile + # Let only nix strip the binary by disabling cargo's `strip = true`, like buildRustPackage does. + sed -i '/strip[[:space:]]*=[[:space:]]*true/s/true/false/' ./Cargo.toml + ''; + + preBuild = '' + justFlagsArray+=( + PREFIX=${builtins.placeholder "out"} + MANIFEST_OPTS="--frozen --locked --profile=release" + INSTALL_OPTS=--no-track + ) + ''; + + # There are no tests + doCheck = false; + dontUseJustCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An address book for aerc"; + homepage = "https://sr.ht/~onemoresuza/aba/"; + changelog = "https://git.sr.ht/~onemoresuza/aba/tree/main/item/CHANGELOG.md"; + downloadPage = "https://git.sr.ht/~onemoresuza/aba/refs/${version}"; + maintainers = with lib.maintainers; [ onemoresuza ]; + license = lib.licenses.isc; + mainProgram = "aba"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ac/action-validator/package.nix b/third_party/nixpkgs/pkgs/by-name/ac/action-validator/package.nix new file mode 100644 index 0000000000..724e2337b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ac/action-validator/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "action-validator"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "mpalmer"; + repo = "action-validator"; + rev = "v${version}"; + hash = "sha256-22oYPYGnNp4K68pbNMolGcIGDYqjT/3FibO/jv3IEvg="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-CVDqXuAxI1vCZV4w8DS3fOrsYFvJoI35fbe+hnSahLc="; + + meta = with lib; { + description = "Tool to validate GitHub Action and Workflow YAML files"; + homepage = "https://github.com/mpalmer/action-validator"; + license = licenses.gpl3Plus; + mainProgram = "action-validator"; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix new file mode 100644 index 0000000000..81ac5acc2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ai/airlift/package.nix @@ -0,0 +1,48 @@ +{ lib +, python3 +, fetchPypi +, argparse +, kubernetes-helm +, kind +, docker +}: + +python3.pkgs.buildPythonApplication rec { + + pname = "airlift"; + pyproject = true; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-1LE3fpfX4NExJdUdSjt4BXvxQTLJ8zrRkGHkxo/6Pb8="; + }; + buildInputs = [ + kubernetes-helm + kind + docker + ]; + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ + argparse + halo + pyyaml + hiyapyco + jinja2 + dotmap + requests + ]; + pythonImportsCheck = [ + "airlift" + ]; + meta = with lib; { + description = "A flexible, configuration driven CLI for Apache Airflow local development"; + homepage = "https://github.com/jl178/airlift"; + license = licenses.mit; + changelog = "https://github.com/jl178/airlift/releases/tag/v${version}"; + maintainers = with maintainers; [ jl178 ]; + mainProgram = "airlift"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/al/algol68g/package.nix b/third_party/nixpkgs/pkgs/by-name/al/algol68g/package.nix index a5dbf958e8..1622952b3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/algol68g/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/algol68g/package.nix @@ -1,29 +1,44 @@ { lib , stdenv , fetchurl +, curl +, gmp , gsl +, mpfr +, ncurses , plotutils , postgresql +, pkg-config , withPDFDoc ? true }: stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "3.3.24"; + version = "3.4.2"; src = fetchurl { url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz"; - hash = "sha256-vSbj3YlyCs4bADpDqxAkcSC1VsoQZ2j+jIKe577WtDU="; + hash = "sha256-hKiRMU98sZhGgHhjgtwUNSIv2iPgb4T+dgYw58IGK8Q="; }; - outputs = [ "out" "man" ] ++ lib.optional withPDFDoc "doc"; + outputs = [ "out" "man" ] ++ lib.optionals withPDFDoc [ "doc" ]; + + nativeBuildInputs = [ + pkg-config + ]; buildInputs = [ + curl + mpfr + ncurses + gmp gsl plotutils postgresql ]; + strictDeps = true; + postInstall = let pdfdoc = fetchurl { url = "https://jmvdveer.home.xs4all.nl/learning-algol-68-genie.pdf"; @@ -47,8 +62,8 @@ stdenv.mkDerivation (finalAttrs: { scientific library and PostgreSQL. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "a68g"; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/al/alpine-make-rootfs/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alpine-make-rootfs/package.nix new file mode 100644 index 0000000000..1fcfc23710 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/al/alpine-make-rootfs/package.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, apk-tools, coreutils, findutils, gnugrep, gnused, gnutar, gzip, rsync, util-linux, wget +}: +stdenvNoCC.mkDerivation rec { + pname = "alpine-make-rootfs"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "alpinelinux"; + repo = "alpine-make-rootfs"; + rev = "v${version}"; + hash = "sha256-B5qYQ6ah4hFZfb3S5vwgevh7aEHI3YGLoA+IyipaDck="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/alpine-make-rootfs --set PATH ${lib.makeBinPath [ + apk-tools coreutils findutils gnugrep gnused gnutar gzip rsync util-linux wget + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alpinelinux/alpine-make-rootfs"; + description = "Make customized Alpine Linux rootfs (base image) for containers"; + mainProgram = "alpine-make-rootfs"; + maintainers = with maintainers; [ danielsidhion ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-firmware/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch rename to third_party/nixpkgs/pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-lib/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-oss/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-plugins-wrapper/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-plugins-wrapper/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-plugins/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-plugins/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-tools/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-tools/package.nix index 10f7f2e64d..b52e152009 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-tools/package.nix @@ -5,7 +5,9 @@ , fltk13 , gtk2 , gtk3 +, makeWrapper , pkg-config +, psmisc }: stdenv.mkDerivation (finalAttrs: { @@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + makeWrapper pkg-config ]; @@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { fltk13 gtk2 gtk3 + psmisc ]; env.TOOLSET = lib.concatStringsSep " " [ @@ -91,6 +95,15 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + fixupPhase = '' + runHook preFixup + + wrapProgram $out/bin/hdajackretask \ + --prefix PATH : ${lib.makeBinPath [ psmisc ]} + + runHook postFixup + ''; + meta = { homepage = "http://www.alsa-project.org/"; description = "ALSA Tools"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-topology-conf/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-topology-conf/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix index 75ec2932c8..b7203a7376 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-N09oM7/XfQpGdeSqK/t53v6FDlpGpdRUKkWWL0ueJyo="; + hash = "sha256-nCHj8B/wC6p1jfF+hnzTbiTrtBpr7ElzfpkQXhbyrpc="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix rename to third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix index da559b5fcc..401c66beb7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/al/alsa-utils/package.nix @@ -1,5 +1,33 @@ -{lib, stdenv, fetchurl, fetchpatch, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{ lib +, stdenv +, fetchurl +, fetchpatch +, alsa-lib +, alsa-plugins +, gettext +, makeWrapper +, ncurses +, libsamplerate +, pciutils +, which +, fftw +, pipewire +, withPipewireLib ? true +, symlinkJoin +}: +let + plugin-packages = [ alsa-plugins ] ++ lib.optional withPipewireLib pipewire; + + # Create a directory containing symlinks of all ALSA plugins. + # This is necessary because ALSA_PLUGIN_DIR must reference only one directory. + plugin-dir = symlinkJoin { + name = "all-plugins"; + paths = map + (path: "${path}/lib/alsa-lib") + plugin-packages; + }; +in stdenv.mkDerivation rec { pname = "alsa-utils"; version = "1.2.10"; @@ -30,6 +58,7 @@ stdenv.mkDerivation rec { postFixup = '' mv $out/bin/alsa-info.sh $out/bin/alsa-info wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch rename to third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch rename to third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix similarity index 64% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix rename to third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix index 613bac4c9e..a6a8a690d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -1,18 +1,18 @@ { lib , writeShellScriptBin -, buildGoPackage +, buildGoModule , makeWrapper +, darwin , fetchFromGitHub , coreutils , nettools -, busybox , util-linux , stdenv , dmidecode , bashInteractive , nix-update-script , testers -, ssm-agent +, amazon-ssm-agent , overrideEtc ? true }: @@ -29,22 +29,29 @@ let -r) echo "''${VERSION:-unknown}";; esac ''; + + binaries = { + "core" = "amazon-ssm-agent"; + "agent" = "ssm-agent-worker"; + "cli-main" = "ssm-cli"; + "worker" = "ssm-document-worker"; + "logging" = "ssm-session-logger"; + "sessionworker" = "ssm-session-worker"; + }; in -buildGoPackage rec { +buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.1630.0"; - - goPackagePath = "github.com/aws/${pname}"; - - nativeBuildInputs = [ makeWrapper ]; + version = "3.2.1798.0"; src = fetchFromGitHub { - rev = "refs/tags/${version}"; owner = "aws"; repo = "amazon-ssm-agent"; - hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao="; + rev = "refs/tags/${version}"; + hash = "sha256-A7M8UbOJT9zvbcwlARMwA7a+LGk8KYmo9j31yzh5FDQ="; }; + vendorHash = null; + patches = [ # Some tests use networking, so we skip them. ./0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch @@ -54,6 +61,12 @@ buildGoPackage rec { ./0002-version-gen-don-t-use-unnecessary-constants.patch ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + darwin.DarwinTools + ]; + # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138 # The updater is not built because it cannot work on NixOS subPackages = [ @@ -65,10 +78,7 @@ buildGoPackage rec { "agent/framework/processor/executer/outofproc/sessionworker" ]; - ldflags = [ - "-s" - "-w" - ]; + ldflags = [ "-s" "-w" ]; postPatch = '' printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh @@ -94,57 +104,58 @@ buildGoPackage rec { ''; preBuild = '' - pushd go/src/${goPackagePath} - # Note: if this step fails, please patch the code to fix it! Please only skip # tests if it is not feasible for the test to pass in a sandbox. make quick-integtest make pre-release make pre-build - - popd ''; - postBuild = '' - pushd go/bin + installPhase = '' + runHook preInstall - mv core amazon-ssm-agent - mv agent ssm-agent-worker - mv cli-main ssm-cli - mv worker ssm-document-worker - mv logging ssm-session-logger - mv sessionworker ssm-session-worker + declare -A map=(${builtins.concatStringsSep " " (lib.mapAttrsToList (name: value: "[\"${name}\"]=\"${value}\"") binaries)}) - popd + for key in ''${!map[@]}; do + install -D -m 0555 -T "$GOPATH/bin/''${key}" "$out/bin/''${map[''${key}]}" + done + + # These templates retain their `.template` extensions on installation. The + # amazon-ssm-agent.json.template is required as default configuration when an + # amazon-ssm-agent.json isn't present. Here, we retain the template to show + # we're using the default configuration. + + # seelog.xml isn't actually required to run, but it does ship as a template + # with debian packages, so it's here for reference. Future work in the nixos + # module could use this template and substitute a different log level. + + install -D -m 0444 -t $out/etc/amazon/ssm amazon-ssm-agent.json.template + install -D -m 0444 -T seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template + + runHook postInstall ''; - # These templates retain their `.template` extensions on installation. The - # amazon-ssm-agent.json.template is required as default configuration when an - # amazon-ssm-agent.json isn't present. Here, we retain the template to show - # we're using the default configuration. - - # seelog.xml isn't actually required to run, but it does ship as a template - # with debian packages, so it's here for reference. Future work in the nixos - # module could use this template and substitute a different log level. - postInstall = '' - mkdir -p $out/etc/amazon/ssm - cp go/src/${goPackagePath}/amazon-ssm-agent.json.template $out/etc/amazon/ssm/amazon-ssm-agent.json.template - cp go/src/${goPackagePath}/seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template - ''; + checkFlags = [ + # Skip time dependent/flaky test + "-skip=TestSendStreamDataMessageWithStreamDataSequenceNumberMutexLocked" + ]; postFixup = '' - wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin + wrapProgram $out/bin/amazon-ssm-agent \ + --prefix PATH : "${lib.makeBinPath [ bashInteractive ]}" ''; passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = ssm-agent; + package = amazon-ssm-agent; command = "amazon-ssm-agent --version"; }; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; @@ -152,8 +163,5 @@ buildGoPackage rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; - - # Darwin support is broken - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/argagg/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argagg/package.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/libraries/argagg/default.nix rename to third_party/nixpkgs/pkgs/by-name/ar/argagg/package.nix index 7ff9eaac1e..bb8507abbe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argagg/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/argagg/package.nix @@ -4,27 +4,22 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argagg"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "vietjtnguyen"; - repo = pname; - rev = version; - hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; + repo = "argagg"; + rev = finalAttrs.version; + hash = "sha256-G0PzoKpUyb1MaziLvHgasq98jPODUu4EgPzywRjuIN8="; }; - patches = [ - # Fix compilation of macro catch statement - ./0001-catch.diff - ]; - nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://github.com/vietjtnguyen/argagg"; description = "Argument Aggregator"; longDescription = '' @@ -38,9 +33,9 @@ stdenv.mkDerivation rec { types until you access them, so the result structures end up just being pointers into the original command line argument C-strings. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; badPlatforms = [ "aarch64-darwin" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix b/third_party/nixpkgs/pkgs/by-name/ar/argtable/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix rename to third_party/nixpkgs/pkgs/by-name/ar/argtable/package.nix index 9752b96003..1820620269 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argtable/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/argtable/package.nix @@ -4,29 +4,29 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argtable"; - version = "3.2.1"; - srcVersion = "v${version}.52f24e5"; + version = "3.2.2"; + srcVersion = "v${finalAttrs.version}.f25c624"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; - rev = srcVersion; - hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; + rev = finalAttrs.srcVersion; + hash = "sha256-X89xFLDs6NEgjzzwy8kplvTgukQd/CV3Xa9A3JXecf4="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" true) ]; postPatch = '' patchShebangs tools/build ''; - meta = with lib; { + meta = { homepage = "https://github.com/argtable/argtable3"; description = "A single-file, ANSI C command-line parsing library"; longDescription = '' @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { handling logic and textual descriptions of the command line syntax, which are essential but tedious to implement for a robust CLI program. ''; - license = with licenses; bsd3; - maintainers = with maintainers; [ AndersonTorres artuuge ]; - platforms = with platforms; all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres artuuge ]; + platforms = lib.platforms.all; }; -} +}) # TODO: a NixOS test suite # TODO: multiple outputs # TODO: documentation diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix index 15ad34b39d..eeb4dd4fef 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix @@ -21,7 +21,8 @@ buildNpmPackage { # Remove after next release patches = [ (fetchpatch { - url = "https://github.com/OpenAsar/arrpc/pull/50.patch"; + # https://github.com/OpenAsar/arrpc/pull/50 + url = "https://github.com/OpenAsar/arrpc/commit/7fa6c90204450eb3952ce9cddfecb0a5ba5e4313.patch"; hash = "sha256-qFlrbe2a4x811wpmWUcGDe2CPlt9x3HI+/t0P2v4kPc="; }) ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix new file mode 100644 index 0000000000..c1f4a8a3d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +, python3Packages +, fetchFromGitHub +}: +python3Packages.buildPythonApplication rec { + pname = "arxiv-latex-cleaner"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "google-research"; + repo = "arxiv-latex-cleaner"; + rev = "v${version}"; + hash = "sha256-1IWSDKEoAM4hBKAEEcPq7X89WYDprifDL2GTEJQtdcQ="; + }; + + propagatedBuildInputs = with python3Packages; [ + pillow + pyyaml + regex + absl-py + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} -m unittest arxiv_latex_cleaner.tests.arxiv_latex_cleaner_test + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://github.com/google-research/arxiv-latex-cleaner"; + description = "Easily clean the LaTeX code of your paper to submit to arXiv"; + license = licenses.asl20; + maintainers = with maintainers; [ arkivm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix new file mode 100644 index 0000000000..19dcf84116 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: +let + pname = "asm-lsp"; + version = "0.4.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "bergercookie"; + repo = "asm-lsp"; + rev = "v${version}"; + hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0="; + + meta = { + description = "Language server for NASM/GAS/GO Assembly"; + homepage = "https://github.com/bergercookie/asm-lsp"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ NotAShelf ]; + mainProgram = pname; + platforms = lib.platforms.linux; + }; +} 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 3ac77c214a..b1979b00b0 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 @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.12.4"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8="; + hash = "sha256-Wee+npgL0+7pv9ph3S93fIXr8z/FWp/TBthJhVSx3zI="; }; - cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo="; + cargoHash = "sha256-OFNqBkPAKaSqDQUWisupj6FlDbm3kw0xq5nbvj04H5U="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ax/axmldec/package.nix b/third_party/nixpkgs/pkgs/by-name/ax/axmldec/package.nix new file mode 100644 index 0000000000..c11a33904c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ax/axmldec/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, boost +, zlib +}: + +stdenv.mkDerivation rec { + pname = "axmldec"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "ytsutano"; + repo = "axmldec"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw="; + }; + + nativeBuildInputs = [ cmake doxygen ]; + buildInputs = [ boost zlib ]; + + meta = with lib; { + description = "Stand-alone binary AndroidManifest.xml decoder"; + longDescription = '' + This tool accepts either a binary or a text XML file and prints the + decoded XML to the standard output or a file. It also allows you to + extract the decoded AndroidManifest.xml directly from an APK file. + ''; + homepage = "https://github.com/ytsutano/axmldec"; + license = licenses.isc; + mainProgram = "axmldec"; + maintainers = with maintainers; [ franciscod ]; + platforms = platforms.unix ++ platforms.windows; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/base16-shell-preview/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/base16-shell-preview/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/misc/base16-shell-preview/default.nix rename to third_party/nixpkgs/pkgs/by-name/ba/base16-shell-preview/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile b/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile new file mode 100644 index 0000000000..b5d29f5f4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'bashly' diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile.lock new file mode 100644 index 0000000000..0021014b37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/bashly/Gemfile.lock @@ -0,0 +1,59 @@ +GEM + remote: https://rubygems.org/ + specs: + bashly (1.1.1) + colsole (>= 0.8.1, < 2) + completely (~> 0.6.1) + filewatcher (~> 2.0) + gtx (~> 0.1) + lp (~> 0.2) + mister_bin (~> 0.7) + psych (>= 3.3.2, < 7) + tty-markdown (~> 0.7) + colsole (1.0.0) + completely (0.6.1) + colsole (>= 0.8.1, < 2) + mister_bin (~> 0.7) + docopt_ng (0.7.1) + filewatcher (2.1.0) + module_methods (~> 0.1.0) + gtx (0.1.0) + kramdown (2.4.0) + rexml + lp (0.2.1) + mister_bin (0.7.6) + colsole (>= 0.8.1, < 2) + docopt_ng (~> 0.7, >= 0.7.1) + module_methods (0.1.0) + pastel (0.8.0) + tty-color (~> 0.5) + psych (5.1.1.1) + stringio + rexml (3.2.6) + rouge (4.1.3) + stringio (3.0.8) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + tty-color (0.6.0) + tty-markdown (0.7.2) + kramdown (>= 1.16.2, < 3.0) + pastel (~> 0.8) + rouge (>= 3.14, < 5.0) + strings (~> 0.2.0) + tty-color (~> 0.5) + tty-screen (~> 0.8) + tty-screen (0.8.1) + unicode-display_width (2.5.0) + unicode_utils (1.4.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + bashly + +BUNDLED WITH + 2.3.26 diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bashly/gemset.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashly/gemset.nix new file mode 100644 index 0000000000..e24c0b3483 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/bashly/gemset.nix @@ -0,0 +1,231 @@ +{ + bashly = { + dependencies = ["colsole" "completely" "filewatcher" "gtx" "lp" "mister_bin" "psych" "tty-markdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rhzbpv8j5qcm5a84m4vzrryb0j8z90q6djbpid4ay2fr492kvkq"; + type = "gem"; + }; + version = "1.1.1"; + }; + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg"; + type = "gem"; + }; + version = "1.0.0"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01nk1cigb09z6rjy41qrhqf58cgpqm43xwjdkz33mfmwrnz04cw1"; + type = "gem"; + }; + version = "0.6.1"; + }; + docopt_ng = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950"; + type = "gem"; + }; + version = "0.7.1"; + }; + filewatcher = { + dependencies = ["module_methods"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03f9v57c5zag09mi10yjhdx7y0vv2w5wrnwzbij9hhkwh43rk077"; + type = "gem"; + }; + version = "2.1.0"; + }; + gtx = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10hfhicvv371gy1i16x6vry1xglvxl0zh7qr6f14pqsx32qih6ff"; + type = "gem"; + }; + version = "0.1.0"; + }; + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; + type = "gem"; + }; + version = "2.4.0"; + }; + lp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ns1aza32n929w7smg1dsn4g6qlfi7k1jrvssyn35cicmwn0gyyr"; + type = "gem"; + }; + version = "0.2.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt_ng"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas"; + type = "gem"; + }; + version = "0.7.6"; + }; + module_methods = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1886wjscfripgzlmyvcd0jmlzwr6hxvklm2a5rm32dw5bf7bvjki"; + type = "gem"; + }; + version = "0.1.0"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + psych = { + dependencies = ["stringio"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + type = "gem"; + }; + version = "5.1.1.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + type = "gem"; + }; + version = "3.2.6"; + }; + rouge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw"; + type = "gem"; + }; + version = "4.1.3"; + }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ix96dxbjqlpymdigb4diwrifr0bq7qhsrng95fkkp18av326nqk"; + type = "gem"; + }; + version = "3.0.8"; + }; + strings = { + dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-markdown = { + dependencies = ["kramdown" "pastel" "rouge" "strings" "tty-color" "tty-screen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; + type = "gem"; + }; + version = "0.7.2"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + type = "gem"; + }; + version = "2.5.0"; + }; + unicode_utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bashly/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bashly/package.nix new file mode 100644 index 0000000000..5a3d6661ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ba/bashly/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, bundlerApp +}: + +let + bashlyBundlerApp = bundlerApp { + pname = "bashly"; + gemdir = ./.; + exes = [ "bashly" ]; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + name = "bashly"; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir $out; + cd $out; + + mkdir bin; pushd bin; + ln -vs ${bashlyBundlerApp}/bin/bashly; + + runHook postInstall + ''; + + meta = { + description = "Bash command line framework and CLI generator"; + homepage = "https://github.com/DannyBen/bashly"; + license = lib.licenses.mit; + mainProgram = "bashly"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix similarity index 65% rename from third_party/nixpkgs/pkgs/tools/misc/bat/default.nix rename to third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix index 400aec1cd7..29de95279e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bat/package.nix @@ -4,27 +4,27 @@ , fetchFromGitHub , pkg-config , less -, Security , libiconv , installShellFiles , makeWrapper +, darwin }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - hash = "sha256-cGHxB3Wp8yEcJBMtSOec6l7iBsMLhUtJ7nh5fijnWZs="; + hash = "sha256-1RjlJEmY/jMf0IYQbrWrT1CHFyiqgarOl72u9xjjQiQ="; }; - cargoHash = "sha256-wZNdYGCLKD80gV1QUTgKsFSNYkbDubknPB3e6dsyEgs="; + cargoHash = "sha256-b7wNWdKQ4QLeCf7bNZRfzT9hD/D/oDglU7Xyb65IrGY="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 @@ -38,7 +38,21 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${lib.makeBinPath [ less ]}" ''; - checkFlags = [ "--skip=pager_more" "--skip=pager_most" ]; + # Skip test cases which depends on `more` + checkFlags = [ + "--skip=alias_pager_disable_long_overrides_short" + "--skip=config_read_arguments_from_file" + "--skip=env_var_bat_paging" + "--skip=pager_arg_override_env_noconfig" + "--skip=pager_arg_override_env_withconfig" + "--skip=pager_basic" + "--skip=pager_basic_arg" + "--skip=pager_env_bat_pager_override_config" + "--skip=pager_env_pager_nooverride_config" + "--skip=pager_more" + "--skip=pager_most" + "--skip=pager_overwrite" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/be/bemoji/package.nix b/third_party/nixpkgs/pkgs/by-name/be/bemoji/package.nix new file mode 100644 index 0000000000..68f83bf432 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/be/bemoji/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "bemoji"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "marty-oehme"; + repo = "bemoji"; + rev = version; + hash = "sha256-XXNrUaS06UHF3cVfIfWjGF1sdPE709W2tFhfwTitzNs="; + }; + + strictDeps = true; + dontBuild = true; + + postInstall = '' + install -Dm555 bemoji -t $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/marty-oehme/bemoji/"; + description = "Emoji picker with support for bemenu/wofi/rofi/dmenu and wayland/X11"; + license = licenses.mit; + mainProgram = "bemoji"; + platforms = platforms.all; + maintainers = with maintainers; [ laurent-f1z1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bi/bitbake-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitbake-language-server/package.nix new file mode 100644 index 0000000000..8d314053e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bi/bitbake-language-server/package.nix @@ -0,0 +1,63 @@ +{ lib +, nix-update-script +, python3 +, fetchFromGitHub +, cmake +, ninja +}: +let + tree-sitter-bitbake = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-bitbake"; + rev = "v1.0.0"; + hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE="; + }; +in +python3.pkgs.buildPythonApplication rec { + pname = "bitbake-language-server"; + version = "0.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = pname; + rev = version; + hash = "sha256-UOeOvaQplDn7jM+3sUZip1f05TbczoaRQKMxVm+euDU="; + }; + + nativeBuildInputs = with python3.pkgs; [ + cmake + ninja + pathspec + pyproject-metadata + scikit-build-core + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + lsprotocol + platformdirs + pygls + tree-sitter + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # The scikit-build-core runs CMake internally so we must let it run the configure step itself. + dontUseCmakeConfigure = true; + SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" [ + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + "-DFETCHCONTENT_QUIET=OFF" + "-DFETCHCONTENT_SOURCE_DIR_TREE-SITTER-BITBAKE=${tree-sitter-bitbake}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Language server for bitbake"; + homepage = "https://github.com/Freed-Wu/bitbake-language-server"; + changelog = "https://github.com/Freed-Wu/bitbake-language-server/releases/tag/v${version}"; + license = licenses.gpl3; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bk/bk/package.nix b/third_party/nixpkgs/pkgs/by-name/bk/bk/package.nix new file mode 100644 index 0000000000..9741278bb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bk/bk/package.nix @@ -0,0 +1,38 @@ +{ fetchCrate +, go-md2man +, installShellFiles +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "bk"; + version = "0.6.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y="; + }; + + cargoHash = "sha256-pE5loMwNMdHL3GODiw3kVVHj374hf3+vIDEYTqvx5WI="; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postBuild = '' + sed -i '$ a # Source and further info' README.md + sed -i '$ a https://github.com/aeosynth/bk' README.md + go-md2man -in README.md -out bk.1 + ''; + + postInstall = '' + installManPage bk.? + ''; + + meta = with lib; { + homepage = "https://github.com/aeosynth/bk"; + description = "A terminal epub reader written in rust"; + license = licenses.mit; + maintainers = with maintainers; [ vuimuich ]; + mainProgram = "bk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluetility/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluetility/package.nix new file mode 100644 index 0000000000..1188ffd2b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bl/bluetility/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "bluetility"; + version = "1.5.1"; + + src = fetchurl { + url = "https://github.com/jnross/Bluetility/releases/download/${finalAttrs.version}/Bluetility.app.zip"; + hash = "sha256-Batnv06nXXxvUz+DlrH1MpeL4f5kNSPDH6Iqd/UiFbw="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Bluetooth Low Energy browse"; + homepage = "https://github.com/jnross/Bluetility"; + license = licenses.mit; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix index 44811a33b6..2080271e8a 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-yebThnIOpZ5crYsSZtbDj8Gn6DznTNJ4T/TsFR3gWvs="; + sha256 = "sha256-KciQakwus7cKjtfp5x8nDV7bbTXlzILcL3ivCJAV6Vk="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/bo/borealis-cursors/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/borealis-cursors/package.nix new file mode 100644 index 0000000000..e88f5fb722 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/bo/borealis-cursors/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "borealis-cursors"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "alvatip"; + repo = "Borealis-cursors"; + rev = finalAttrs.version; + hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -a Borealis-cursors $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "Cursor theme using a custom color palette inspired by boreal colors"; + homepage = "https://www.gnome-look.org/s/Gnome/p/1717914"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ argrat ]; + }; +}) 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 4dfa1375ef..e8667bc468 100644 --- a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "0.17.0"; + version = "0.27.2"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-4FF9SEgWuIPQSarOBTaEvgdgRTkR1caRYr/bjfFmTLE="; + hash = "sha256-FhlwwdX845Say6I/g9HYRTexh94DXhc/K9jmqFiHwVY="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix b/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix new file mode 100644 index 0000000000..ae21cc0e50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/c2/c2fmzq/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "c2FmZQ"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = "c2FmZQ"; + repo = "c2FmZQ"; + rev = "v${version}"; + hash = "sha256-xrQBL/Xjzsg0jZ7cFuDfjCQhmt/dTD8FoCSlw0sX5MQ="; + }; + + ldflags = [ "-s" "-w" ]; + + sourceRoot = "source/c2FmZQ"; + + vendorHash = "sha256-Hz6P+ptn1i+8Ek3pp8j+iB8NN5Xks50jyZuT8Ullxbo="; + + subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; + + passthru.tests = { inherit (nixosTests) c2fmzq; }; + + meta = with lib; { + description = "Securely encrypt, store, and share files, including but not limited to pictures and videos"; + homepage = "https://github.com/c2FmZQ/c2FmZQ"; + license = licenses.gpl3Only; + mainProgram = "c2FmZQ-server"; + maintainers = with maintainers; [ hmenke ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cardboard/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cardboard/package.nix new file mode 100644 index 0000000000..4bed07f0bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cardboard/package.nix @@ -0,0 +1,137 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, fetchgit +, ffmpeg +, libGL +, libX11 +, libcap +, libdrm +, libinput +, libpng +, libxcb +, libxkbcommon +, mesa +, meson +, ninja +, pandoc +, pixman +, pkg-config +, unzip +, wayland +, wayland-protocols +, xcbutilerrors +, xcbutilimage +, xcbutilwm +}: + +let + allSources = { + # cereal.wrap + cereal-wrap = fetchurl { + name = "cereal-1.3.0.tar.gz"; + url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; + hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; + }; + cereal-wrapdb = fetchurl { + name = "cereal-1.3.0-1-wrap.zip"; + url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; + hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; + }; + + # expected.wrap + expected-wrap = fetchgit { + name = "expected"; + url = "https://gitlab.com/cardboardwm/expected"; + rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; + sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; + }; + + # wlroots.wrap + wlroots-wrap = fetchgit { + name = "wlroots"; + url = "https://github.com/swaywm/wlroots"; + rev = "0.12.0"; + sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; + }; + + # the source itself + cardboard = fetchFromGitLab { + owner = "cardboardwm"; + repo = "cardboard"; + rev = "b54758d85164fb19468f5ca52588ebea576cd027"; + hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; + }; + }; +in +stdenv.mkDerivation { + pname = "cardboard"; + version = "unstable-2021-05-10"; + + src = allSources.cardboard; + + outputs = [ "out" "dev" "lib" "man" ]; + + nativeBuildInputs = [ + meson + ninja + pandoc + pkg-config + unzip + ]; + + buildInputs = [ + ffmpeg + libGL + libX11 + libcap + libdrm + libinput + libpng + libxcb + libxkbcommon + mesa + pixman + wayland + wayland-protocols + xcbutilerrors + xcbutilimage + xcbutilwm + ]; + + postPatch = '' + pushd subprojects + tar xvf ${allSources.cereal-wrap} + unzip ${allSources.cereal-wrapdb} + cp -r ${allSources.expected-wrap} ${allSources.expected-wrap.name} + cp -r ${allSources.wlroots-wrap} ${allSources.wlroots-wrap.name} + popd + + # gcc12 + sed '1i#include ' -i cardboard/ViewAnimation.h + ''; + + # "Inherited" from Nixpkgs expression for wlroots + mesonFlags = [ + (lib.mesonBool "man" true) + (lib.mesonOption "wlroots:logind-provider" "systemd") + (lib.mesonEnable "wlroots:libseat" false) + ]; + + # gcc12 + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; + + passthru = { + providedSessions = [ "cardboard" ]; + }; + + meta = { + homepage = "https://gitlab.com/cardboardwm/cardboard"; + description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; + license = lib.licenses.gpl3Only; + mainProgram = "cardboard"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix new file mode 100644 index 0000000000..0b759f5209 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-xwin/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-xwin"; + version = "0.14.9"; + + src = fetchFromGitHub { + owner = "rust-cross"; + repo = "cargo-xwin"; + rev = "v${version}"; + hash = "sha256-y2hlzewDWYxkKhr77JB3lkYo5hexcdmPiCRbXLtnolM="; + }; + + cargoHash = "sha256-uIFjWgoNCU5kUX4i1Law/YE0TmFLOi6V3Y4b9BpQlI4="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Cross compile Cargo project to Windows MSVC target with ease"; + homepage = "https://github.com/rust-cross/cargo-xwin"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cb/cbmbasic/package.nix b/third_party/nixpkgs/pkgs/by-name/cb/cbmbasic/package.nix new file mode 100644 index 0000000000..a7d6d84101 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cb/cbmbasic/package.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, runCommand +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cbmbasic"; + version = "unstable-2022-12-18"; + + src = fetchFromGitHub { + owner = "mist64"; + repo = "cbmbasic"; + rev = "352a313313dd0a15a47288c8f8031b54ac8c92a2"; + hash = "sha256-aA/ivRap+aDd2wi6KWXam9eP/21lOn6OWTeZ4i/S9Bs="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin/ + mv cbmbasic $out/bin/ + + runHook postInstall + ''; + + # NOTE: cbmbasic uses microsoft style linebreaks `\r\n`, and testing has to + # accommodate that, else you get very cryptic diffs + passthru = { + tests.run = runCommand "cbmbasic-test-run" { + nativeBuildInputs = [finalAttrs.finalPackage]; + } '' + echo '#!${lib.getExe finalAttrs.finalPackage}' > helloI.bas; + echo 'PRINT"Hello, World!"' >> helloI.bas; + chmod +x helloI.bas + + diff -U3 --color=auto <(./helloI.bas) <(echo -e "Hello, World!\r"); + + echo '#!/usr/bin/env cbmbasic' > hello.bas; + echo 'PRINT"Hello, World!"' >> hello.bas; + chmod +x hello.bas + + diff -U3 --color=auto <(cbmbasic ./hello.bas) <(echo -e "Hello, World!\r"); + + touch $out; + ''; + }; + + meta = with lib; { + description = "Portable version of Commodore's version of Microsoft BASIC 6502 as found on the Commodore 64"; + longDescription = '' + "Commodore BASIC" (cbmbasic) is a 100% compatible version of Commodore's + version of Microsoft BASIC 6502 as found on the Commodore 64. You can use + it in interactive mode or pass a BASIC file as a command line parameter. + + This source does not emulate 6502 code; all code is completely native. On + a 1 GHz CPU you get about 1000x speed compared to a 1 MHz 6502. + ''; + homepage = "https://github.com/mist64/cbmbasic"; + license = licenses.bsd2; + maintainers = [ maintainers.cafkafk ]; + mainProgram = "cbmbasic"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cd/cdk/package.nix b/third_party/nixpkgs/pkgs/by-name/cd/cdk/package.nix new file mode 100644 index 0000000000..410e341cf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cd/cdk/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchurl +, ncurses +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cdk"; + version = "5.0-20230201"; + + src = fetchurl { + url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz"; + hash = "sha256-oxJ7Wf5QX16Jjao90VsM9yShJ0zmgWW3eb4vKdTE8vY="; + }; + + buildInputs = [ + ncurses + ]; + + enableParallelBuilding = true; + + meta = { + description = "Curses development kit"; + homepage = "https://invisible-island.net/cdk/"; + changelog = "https://invisible-island.net/cdk/CHANGES.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin AndersonTorres ]; + inherit (ncurses.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ce/celeste-classic/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/celeste-classic/package.nix new file mode 100644 index 0000000000..bbea59a5b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ce/celeste-classic/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchzip +, autoPatchelfHook +, SDL2 +, practiceMod ? false +}: + +let + directory = if practiceMod then "CELESTE*Practice*" else "CELESTE"; + srcbin = if practiceMod then "celeste_practice_mod" else "celeste"; + outbin = if practiceMod then "celeste-classic-pm" else "celeste-classic"; +in +stdenvNoCC.mkDerivation { + pname = outbin; + version = "unstable-2020-12-08"; + + # From https://www.speedrun.com/celestep8/resources + src = fetchzip { + url = "https://www.speedrun.com/static/resource/174ye.zip?v=f3dc98f"; + hash = "sha256-GANHqKB0N905QJOLaePKWkUuPl9UlL1iqvkMMvw/CC8="; + extension = "zip"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + install -Dsm755 ${directory}/${srcbin} $out/lib/${outbin}/${outbin} + install -Dm444 ${directory}/data.pod $out/lib/${outbin}/data.pod + mkdir -p $out/bin + ln -s $out/lib/${outbin}/${outbin} $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "A PICO-8 platformer about climbing a mountain, made in four days${lib.optionalString practiceMod " (Practice Mod)"}"; + homepage = "https://celesteclassic.github.io/"; + license = licenses.unfree; + platforms = platforms.linux; + mainProgram = outbin; + maintainers = with maintainers; [ mrtnvgr ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix index c0ada66edc..64ee44b1ad 100644 --- a/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ce/celluloid/package.nix @@ -5,6 +5,7 @@ , desktop-file-utils , glib , gtk4 +, libGL , libepoxy , libadwaita , meson @@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk4 + libGL libadwaita libepoxy mpv diff --git a/third_party/nixpkgs/pkgs/by-name/ce/certspotter/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/certspotter/package.nix new file mode 100644 index 0000000000..e40c580618 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ce/certspotter/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, lowdown +}: + +buildGoModule rec { + pname = "certspotter"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "SSLMate"; + repo = "certspotter"; + rev = "v${version}"; + hash = "sha256-nyeqpDMRZRuHjfl3cI/I00KpVg3udjr0B8MEBZcF7nY="; + }; + + vendorHash = "sha256-6dV9FoPV8UfS0z5RuuopE99fHcT3RAWCdDi7jpHzVRE="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ lowdown ]; + + postInstall = '' + cd man + make + mkdir -p $out/share/man/man8 + mv *.8 $out/share/man/man8 + ''; + + meta = with lib; { + description = "Certificate Transparency Log Monitor"; + homepage = "https://github.com/SSLMate/certspotter"; + changelog = "https://github.com/SSLMate/certspotter/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mpl20; + mainProgram = "certspotter"; + maintainers = with maintainers; [ chayleaf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix new file mode 100644 index 0000000000..3d06120716 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ci/cidr-merger/package.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cidr-merger"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "zhanhb"; + repo = "cidr-merger"; + rev = "v${version}"; + sha256 = "sha256-Kb+89VP7JhBrTE4MM3H/dqoIBgDLnVhKqkgHdymYCgk="; + }; + + vendorHash = "sha256-cPri384AX/FdfNtzt3xj4bF+/izSa4sZuAohK0R/7H4="; + + meta = with lib; { + description = "A simple command line tool to merge ip/ip cidr/ip range, supports IPv4/IPv6"; + homepage = "https://github.com/zhanhb/cidr-merger"; + license = licenses.mit; + maintainers = with maintainers; [ cyounkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix rename to third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix index 4ef014bfa5..fdc8724af6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.2.6"; + version = "3.3.1"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; - hash = "sha256-HEqjvL16Ca3Al3I6VK50CU6zHFj9Nn/SAXXCfRU4rgo="; + hash = "sha256-Y3UPfBH+Sa1f529J1JXx8Ul0zi3b1mkOvo1tbxBSYRk="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix new file mode 100644 index 0000000000..6d74c5e268 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ci/circom/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "circom"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = "iden3"; + repo = "circom"; + rev = "v${version}"; + hash = "sha256-2YusBWAYDrTvFHYIjKpALphhmtsec7jjKHb1sc9lt3Q="; + }; + + cargoHash = "sha256-G6z+DxIhmm1Kzv8EQCqvfGAhQn5Vrx9LXrl+bWBVKaM="; + doCheck = false; + + meta = with lib; { + description = "zkSnark circuit compiler"; + homepage = "https://github.com/iden3/circom"; + changelog = "https://github.com/iden3/circom/blob/${src.rev}/RELEASES.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer7/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix rename to third_party/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer7/package.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer8/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix rename to third_party/nixpkgs/pkgs/by-name/ci/ciscoPacketTracer8/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix new file mode 100644 index 0000000000..5abe53ddb8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/clamtk/package.nix @@ -0,0 +1,69 @@ +{ lib +, perlPackages +, fetchFromGitHub +, makeWrapper +, gobject-introspection +, perl +, clamav +}: + +perlPackages.buildPerlPackage rec { + pname = "clamtk"; + version = "6.16"; + + src = fetchFromGitHub { + owner = "dave-theunsub"; + repo = "clamtk"; + rev = "v${version}"; + hash = "sha256-o6OaXOXLykTUuF/taKnEhZRV04/3nlU5aNY05ANr1Ko="; + }; + + nativeBuildInputs = [ makeWrapper gobject-introspection ]; + buildInputs = [ perl clamav ]; + propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ]; + + preConfigure = "touch Makefile.PL"; + # no tests implemented + doCheck = false; + outputs = [ "out" "man" ]; + + postPatch = '' + # Set correct nix paths in perl scripts + substituteInPlace lib/App.pm \ + --replace /usr/bin/freshclam ${lib.getBin clamav}/bin/freshclam \ + --replace /usr/bin/sigtool ${lib.getBin clamav}/bin/sigtool \ + --replace /usr/bin/clamscan ${lib.getBin clamav}/bin/clamscan \ + --replace /usr/bin/clamdscan ${lib.getBin clamav}/bin/clamdscan \ + --replace /usr/share/pixmaps $out/share/pixmaps + + # We want to catch the crontab wrapper on NixOS and the + # System crontab on non-NixOS so we don't give a full path. + substituteInPlace lib/Schedule.pm \ + --replace "( -e '/usr/bin/crontab' )" "(1)" \ + --replace /usr/bin/crontab crontab + ''; + + installPhase = '' + runHook preInstall + + install -D lib/*.pm -t $out/lib/perl5/site_perl/ClamTk + install -D clamtk.desktop -t $out/share/applications + install -D images/* -t $out/share/pixmaps + install -D clamtk.1.gz -t $out/share/man/man1 + install -D -m755 clamtk -t $out/bin + wrapProgram $out/bin/clamtk --prefix PERL5LIB : $PERL5LIB --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" + + runHook postInstall + ''; + + meta = with lib; { + description = '' + Easy to use, lightweight front-end for ClamAV (Clam Antivirus). + ''; + license = licenses.gpl1Plus; + homepage = "https://github.com/dave-theunsub/clamtk"; + platforms = platforms.linux; + maintainers = with maintainers; [ jgarcia ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clarity-city/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clarity-city/package.nix new file mode 100644 index 0000000000..3d3fc445d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/clarity-city/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "clarity-city"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = "clarity-city"; + rev = "v${finalAttrs.version}"; + hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 TrueType/*.ttf -t $out/share/fonts/truetype + install -Dm644 OpenType/*.otf -t $out/share/fonts/opentype + install -Dm644 Webfonts/EOT/*.eot -t $out/share/fonts/eot + install -Dm644 Webfonts/WOFF/*.woff -t $out/share/fonts/woff + install -Dm644 Webfonts/WOFF2/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + meta = with lib; { + description = "An open source sans-serif typeface"; + homepage = "https://github.com/vmware/clarity-city"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ sagikazarmark ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix index 84f485d398..feced814f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.nongnu.org/lzip/clzip.html"; description = "C language version of lzip"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/001-search-path.diff similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/001-search-path.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/001-search-path.diff diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/002-application-services.diff similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/002-application-services.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/002-application-services.diff diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/003-libuv-application-services.diff similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/003-libuv-application-services.diff diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/004-cygwin.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/004-cygwin.diff similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/004-cygwin.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/004-cygwin.diff diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff similarity index 61% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index 76aa91cff9..ffd3077d30 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff +++ b/third_party/nixpkgs/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,6 +1,7 @@ ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -391,13 +391,6 @@ if(ENABLE_IPV6 AND NOT WIN32) +diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt +--- cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt 2023-10-22 21:51:09.231609901 -0300 +@@ -414,13 +414,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) set(use_core_foundation ON) @@ -14,9 +15,10 @@ endif() endif() ---- a/Utilities/cmcurl/lib/curl_setup.h -+++ b/Utilities/cmcurl/lib/curl_setup.h -@@ -257,11 +257,7 @@ +diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h +--- cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h 2023-10-22 21:52:00.214748294 -0300 +@@ -260,11 +260,7 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) @@ -28,9 +30,10 @@ #endif #ifdef USE_LWIPSOCK ---- a/Utilities/cmcurl/lib/hostip.c -+++ b/Utilities/cmcurl/lib/hostip.c -@@ -68,10 +68,6 @@ +diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/hostip.c cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c +--- cmake-3.27.7/Utilities/cmcurl/lib/hostip.c 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c 2023-10-22 21:53:29.249989934 -0300 +@@ -67,10 +67,6 @@ #include "curl_memory.h" #include "memdebug.h" @@ -38,10 +41,10 @@ -#include -#endif - - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) - /* alarm-based timeouts can only be used with all the dependencies satisfied */ -@@ -661,23 +657,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && \ + defined(SIGALRM) && \ +@@ -743,23 +739,6 @@ return CURLRESOLV_ERROR; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff b/third_party/nixpkgs/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/third_party/nixpkgs/pkgs/by-name/cm/cmake/check-pc-files-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/check-pc-files-hook.sh diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix index 00715130a0..a573147915 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cm/cmake/package.nix @@ -16,11 +16,17 @@ , texinfo , xz , zlib -, isBootstrap ? false -, useOpenSSL ? !isBootstrap -, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, isBootstrap ? null +, isMinimalBuild ? ( + if isBootstrap != null + then lib.warn + "isBootstrap argument is deprecated and will be removed; use isMinimalBuild instead" + isBootstrap + else false) +, useOpenSSL ? !isMinimalBuild +, useSharedLibraries ? (!isMinimalBuild && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" -, buildDocs ? !(isBootstrap || (uiToolkits == [])) +, buildDocs ? !(isMinimalBuild || (uiToolkits == [])) , darwin , libsForQt5 }: @@ -34,17 +40,17 @@ in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; # Minimal, bootstrap cmake does not have toolkits -assert isBootstrap -> (uiToolkits == []); +assert isMinimalBuild -> (uiToolkits == []); stdenv.mkDerivation (finalAttrs: { pname = "cmake" - + lib.optionalString isBootstrap "-boot" + + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.26.4"; + version = "3.27.7"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg="; + hash = "sha256-CPcaEGA2vwUfaSdg75VYwFd8Qqw56Wugl+dmK9QVjY4="; }; patches = [ @@ -57,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff + ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; @@ -90,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase - ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; + ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; @@ -104,12 +110,23 @@ stdenv.mkDerivation (finalAttrs: { configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; + # The configuration script is not autoconf-based, although being similar; + # triples and other interesting info are passed via CMAKE_* environment + # variables and commandline switches + configurePlatforms = [ ]; + configureFlags = [ "CXXFLAGS=-Wno-elaborated-enum-base" "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" ] ++ (if useSharedLibraries - then [ "--no-system-jsoncpp" "--system-libs" ] - else [ "--no-system-libs" ]) # FIXME: cleanup + then [ + "--no-system-cppdap" + "--no-system-jsoncpp" + "--system-libs" + ] + else [ + "--no-system-libs" + ]) # FIXME: cleanup ++ lib.optional qt5UI "--qt-gui" ++ lib.optionals buildDocs [ "--sphinx-build=${sphinx}/bin/sphinx-build" @@ -129,15 +146,17 @@ stdenv.mkDerivation (finalAttrs: { # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and # strip. Otherwise they are taken to be relative to the source root of the # package being built. - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${stdenv.cc.targetPrefix}c++") + (lib.cmakeFeature "CMAKE_C_COMPILER" "${stdenv.cc.targetPrefix}cc") + (lib.cmakeFeature "CMAKE_AR" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar") + (lib.cmakeFeature "CMAKE_RANLIB" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib") + (lib.cmakeFeature "CMAKE_STRIP" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip") - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" - # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}" + (lib.cmakeBool "CMAKE_USE_OPENSSL" useOpenSSL) + (lib.cmakeBool "BUILD_CursesDialog" cursesUI) ]; # make install attempts to use the just-built cmake @@ -148,10 +167,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; enableParallelBuilding = true; - # This isn't an autoconf configure script; triples are passed via - # CMAKE_SYSTEM_NAME, etc. - configurePlatforms = [ ]; - doCheck = false; # fails meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh rename to third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix b/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix index f73f391f71..48bcff3f32 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/cockpit/package.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchzip -, fetchurl , fetchFromGitHub , autoreconfHook , bashInteractive @@ -14,7 +12,6 @@ , gettext , git , glib -, glibc , glib-networking , gnused , gnutls @@ -26,6 +23,7 @@ , makeWrapper , nodejs , nixosTests +, nix-update-script , openssh , openssl , pam @@ -47,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "287"; + version = "303"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc="; + hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg="; fetchSubmodules = true; }; @@ -108,6 +106,7 @@ stdenv.mkDerivation rec { --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' patchShebangs \ + build.js \ test/common/pixel-tests \ test/common/run-tests \ test/common/tap-cdp \ @@ -126,9 +125,6 @@ stdenv.mkDerivation rec { cp node_modules/.package-lock.json package-lock.json - substituteInPlace src/systemd_ctypes/libsystemd.py \ - --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 - for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do # some files substituteInPlace report as missing and it's safe to ignore them substituteInPlace "$(realpath "$f")" \ @@ -150,6 +146,7 @@ stdenv.mkDerivation rec { "--disable-pcp" # TODO: figure out how to package its dependency "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" "--with-admin-group=root" # TODO: really? Maybe "wheel"? + "--enable-old-bridge=yes" ]; enableParallelBuilding = true; @@ -213,12 +210,12 @@ stdenv.mkDerivation rec { make check -j$NIX_BUILD_CORES || true test/static-code npm run eslint - npm run stylelint + npm run stylelint || true ''; passthru = { tests = { inherit (nixosTests) cockpit; }; - updateScript = ./update.sh; + updateScript = nix-update-script {}; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix new file mode 100644 index 0000000000..d84cb848cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/codeium/package.nix @@ -0,0 +1,69 @@ +{ stdenv, lib, fetchurl, gzip, autoPatchelfHook }: +let + + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + plat = { + x86_64-linux = "linux_x64"; + aarch64-linux = "linux_arm"; + x86_64-darwin = "macos_x64"; + aarch64-darwin = "macos_arm"; + + }.${system} or throwSystem; + + hash = { + x86_64-linux = "sha256-6dbgmYyXOUuWGOFXcO9eEZVoRjRLWK906SJh27wZ+PY="; + aarch64-linux = "sha256-cO1+ZVXC25zO5msU6Nbp29vkkNFRQ2jKSxtCZw1H104="; + x86_64-darwin = "sha256-3KMSoFQz7kYinD4QbS82dIq6UDetfdky6ClIfP83ISg="; + aarch64-darwin = "sha256-bj8PVJ4pfrNXo1yn5UbkHflskZMS61+LM9hi9mtdXtk="; + }.${system} or throwSystem; + + bin = "$out/bin/codeium_language_server"; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "codeium"; + version = "1.4.16"; + src = fetchurl { + name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; + url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; + inherit hash; + }; + + nativeBuildInputs = [ gzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + gzip -dc $src > ${bin} + chmod +x ${bin} + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = rec { + description = "Codeium language server"; + longDescription = '' + Codeium proprietary language server, patched for Nix(OS) compatibility. + bin/language_server_x must be symlinked into the plugin directory, replacing the existing binary. + For example: + ```shell + ln -s "$(which codeium_language_server)" /home/a/.local/share/JetBrains/Rider2023.1/codeium/662505c9b23342478d971f66a530cd102ae35df7/language_server_linux_x64 + ``` + ''; + homepage = "https://codeium.com/"; + downloadPage = homepage; + changelog = homepage; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ anpin ]; + mainProgram = "codeium"; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeium/update.sh b/third_party/nixpkgs/pkgs/by-name/co/codeium/update.sh new file mode 100755 index 0000000000..268886b576 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/codeium/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch jq + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find package.nix in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://github.com/Exafunction/codeium/releases/download/language-server-v${VER}/language_server_${ARCH}.gz" + nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")" +} + +replace_hash() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' ) + +CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64") +CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm") +CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64") +CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm") + +sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV" + +replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH" +replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH" +replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH" +replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH" diff --git a/third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix b/third_party/nixpkgs/pkgs/by-name/co/codespelunker/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/codespelunker/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/codespelunker/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix b/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix index 3908d14ef5..9b5d37dc16 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix @@ -27,13 +27,13 @@ assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl); stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE="; + hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY="; }; strictDeps = true; @@ -75,9 +75,8 @@ stdenv.mkDerivation (finalAttrs: { # MUSL: https://github.com/containers/composefs/issues/204 substituteInPlace tests/Makefile \ --replace " check-checksums" "" - '' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) '' - # seccomp sandbox breaks these tests - # MUSL: https://github.com/containers/composefs/issues/206 + '' + lib.optionalString enableValgrindCheck '' + # valgrind is incompatible with seccomp substituteInPlace tests/test-checksums.sh \ --replace "composefs-from-json" "composefs-from-json --no-sandbox" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix b/third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/connman/connman-gtk/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/connman-gtk/package.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix b/third_party/nixpkgs/pkgs/by-name/co/connman-ncurses/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/connman/connman-ncurses/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/connman-ncurses/package.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix b/third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/connman/connman-notify/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/connman-notify/package.nix diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch b/third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch rename to third_party/nixpkgs/pkgs/by-name/co/connman/create-libppp-compat.h.patch diff --git a/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix b/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix new file mode 100644 index 0000000000..a90fb1ffd7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/connman/package.nix @@ -0,0 +1,176 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dbus +, file +, glib +, gnutls +, iptables +, libmnl +, libnftnl # for nftables +, nixosTests +, openconnect +, openvpn +, pkg-config +, polkit +, ppp +, pptp +, readline +, vpnc +, dnsType ? "internal" # or "systemd-resolved" +, enableBluetooth ? true +, enableClient ? true +, enableDatafiles ? true +, enableDundee ? true +, enableEthernet ? true +, enableGadget ? true +, enableHh2serialGps ? false +, enableIospm ? false +, enableL2tp ? false +, enableLoopback ? true +, enableNeard ? true +, enableNetworkManager ? null +, enableNetworkManagerCompatibility ? + if enableNetworkManager == null + then false + else lib.warn "enableNetworkManager option is deprecated; use enableNetworkManagerCompatibility instead" enableNetworkManager +, enableOfono ? true +, enableOpenconnect ? true +, enableOpenvpn ? true +, enablePacrunner ? true +, enablePolkit ? true +, enablePptp ? true +, enableStats ? true +, enableTist ? false +, enableTools ? true +, enableVpnc ? true +, enableWifi ? true +, enableWireguard ? true +, enableWispr ? true +, firewallType ? "iptables" # or "nftables" +}: + +let + inherit (lib) + enableFeature + enableFeatureAs + optionals + withFeatureAs; +in +assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; +stdenv.mkDerivation (finalAttrs: { + pname = "connman"; + version = "1.42"; + + src = fetchurl { + url = "mirror://kernel/linux/network/connman/connman-${finalAttrs.version}.tar.xz"; + hash = "sha256-o+a65G/Age8una48qk92Sd6JLD3mIsICg6wMqBQjwqo="; + }; + + patches = [ + # simply the middle section of upstream commit a48864a2e5d2a725dfc6eef567108bc13b43857f + # dist tarball is broken, hence this patch as a workaround + ./create-libppp-compat.h.patch + ] ++ optionals stdenv.hostPlatform.isMusl [ + # Fix Musl build by avoiding a Glibc-only API. + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; + hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + file + pkg-config + ]; + + buildInputs = [ + glib + dbus + libmnl + gnutls + readline + ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ; + + postPatch = '' + sed -i "s@/usr/bin/file@file@g" ./configure + ''; + + configureFlags = [ + # directories flags + "--sysconfdir=/etc" + "--localstatedir=/var" + ] ++ [ + # production build flags + (enableFeature false "maintainer-mode") + (enableFeatureAs true "session-policy-local" "builtin") + # for building and running tests + # (enableFeature true "tests") # installs the tests, we don't want that + (enableFeature true "tools") + (enableFeature enableLoopback "loopback") + (enableFeature enableEthernet "ethernet") + (enableFeature enableWireguard "wireguard") + (enableFeature enableGadget "gadget") + (enableFeature enableWifi "wifi") + # enable IWD support for wifi as it doesn't require any new dependencies and + # it's easier for the NixOS module to use only one connman package when IWD + # is requested + (enableFeature enableWifi "iwd") + (enableFeature enableBluetooth "bluetooth") + (enableFeature enableOfono "ofono") + (enableFeature enableDundee "dundee") + (enableFeature enablePacrunner "pacrunner") + (enableFeature enableNeard "neard") + (enableFeature enableWispr "wispr") + (enableFeature enableTools "tools") + (enableFeature enableStats "stats") + (enableFeature enableClient "client") + (enableFeature enableDatafiles "datafiles") + (enableFeature enablePolkit "polkit") + (enableFeature enablePptp "pptp") + (enableFeature enableWireguard "wireguard") + (enableFeature enableNetworkManagerCompatibility "nmcompat") + (enableFeature enableHh2serialGps "hh2serial-gps") + (enableFeature enableL2tp "l2tp") + (enableFeature enableIospm "iospm") + (enableFeature enableTist "tist") + ] ++ [ + (enableFeatureAs enableOpenconnect "openconnect" "builtin") + (enableFeatureAs enableOpenvpn "openvpn" "builtin") + (enableFeatureAs enableVpnc "vpnc" "builtin") + ] ++ [ + (withFeatureAs true "dbusconfdir" "${placeholder "out"}/share") + (withFeatureAs true "dbusdatadir" "${placeholder "out"}/share") + (withFeatureAs true "tmpfilesdir" "${placeholder "out"}/tmpfiles.d") + (withFeatureAs true "systemdunitdir" "${placeholder "out"}/systemd/system") + (withFeatureAs true "dns-backend" "${dnsType}") + (withFeatureAs true "firewall" "${firewallType}") + (withFeatureAs enableOpenconnect "openconnect" "${openconnect}/sbin/openconnect") + (withFeatureAs enableOpenvpn "openvpn" "${openvpn}/sbin/openvpn") + (withFeatureAs enableVpnc "vpnc" "${vpnc}/sbin/vpnc") + (withFeatureAs enablePptp "pptp" "${pptp}/sbin/pptp") + ]; + + doCheck = true; + + passthru.tests.connman = nixosTests.connman; + + meta = { + description = "A daemon for managing internet connections"; + homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/"; + license = lib.licenses.gpl2Only; + mainProgram = "connmanctl"; + maintainers = with lib.maintainers; [ eclairevoyant AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix b/third_party/nixpkgs/pkgs/by-name/co/connman_dmenu/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/connman/connman_dmenu/default.nix rename to third_party/nixpkgs/pkgs/by-name/co/connman_dmenu/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/Cargo.lock new file mode 100644 index 0000000000..367af6f2b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/Cargo.lock @@ -0,0 +1,6294 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel 1.9.0", + "atspi", + "futures-lite 1.13.0", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[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.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[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 = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock 2.8.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 1.13.0", + "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-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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.1.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "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.21", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.21", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite 1.13.0", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[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 = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.0", + "async-lock 3.1.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.0.1", + "piper", + "tracing", +] + +[[package]] +name = "bluer" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d76ba39a871348200bbbf7dbff9fbaec30f0b988420f7391bfd9fdc5f8b5144" +dependencies = [ + "custom_debug", + "dbus", + "dbus-crossroads", + "dbus-tokio", + "displaydoc", + "futures", + "hex", + "lazy_static", + "libc", + "log", + "macaddr", + "nix 0.26.4", + "num-derive", + "num-traits", + "pin-project", + "serde", + "serde_json", + "strum", + "tokio", + "tokio-stream", + "uuid", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.21", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +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 = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.48.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", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-app-list" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "cosmic-protocols", + "freedesktop-desktop-entry", + "freedesktop-icons", + "futures", + "futures-util", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "itertools 0.11.0", + "libcosmic", + "log", + "nix 0.26.4", + "once_cell", + "pretty_env_logger 0.5.0", + "rand", + "ron", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "serde", + "shlex", + "tokio", + "url", + "xdg", +] + +[[package]] +name = "cosmic-applet-audio" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "icon-loader", + "libcosmic", + "libpulse-binding", + "libpulse-glib-binding", + "mpris2-zbus", + "pretty_env_logger 0.4.0", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "serde", + "tokio", + "tracing", + "url", + "zbus", +] + +[[package]] +name = "cosmic-applet-battery" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "futures", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "libcosmic", + "log", + "once_cell", + "pretty_env_logger 0.5.0", + "rust-embed 6.8.1", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-bluetooth" +version = "0.1.0" +dependencies = [ + "anyhow", + "bluer", + "futures", + "futures-util", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "itertools 0.10.5", + "libcosmic", + "log", + "once_cell", + "pretty_env_logger 0.5.0", + "rand", + "rust-embed 6.8.1", + "slotmap", + "tokio", +] + +[[package]] +name = "cosmic-applet-graphics" +version = "0.1.0" +dependencies = [ + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "libcosmic", + "once_cell", + "rust-embed 6.8.1", + "tracing", + "zbus", +] + +[[package]] +name = "cosmic-applet-network" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-dbus-networkmanager", + "cosmic-time", + "futures", + "futures-util", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "itertools 0.10.5", + "libcosmic", + "log", + "pretty_env_logger 0.5.0", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "slotmap", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-notifications" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytemuck", + "cosmic-notifications-config", + "cosmic-notifications-util", + "cosmic-time", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "libcosmic", + "nix 0.26.4", + "ron", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "sendfd", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "zbus", +] + +[[package]] +name = "cosmic-applet-power" +version = "0.1.0" +dependencies = [ + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "icon-loader", + "libcosmic", + "libpulse-binding", + "libpulse-glib-binding", + "logind-zbus", + "nix 0.26.4", + "once_cell", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-status-area" +version = "0.1.0" +dependencies = [ + "futures", + "libcosmic", + "serde", + "tokio", + "zbus", +] + +[[package]] +name = "cosmic-applet-tiling" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.7.0", + "libcosmic", + "once_cell", + "rust-embed 8.0.0", + "tracing", +] + +[[package]] +name = "cosmic-applet-time" +version = "0.1.0" +dependencies = [ + "chrono", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "icon-loader", + "libcosmic", + "nix 0.26.4", + "once_cell", + "rust-embed 6.8.1", +] + +[[package]] +name = "cosmic-applet-workspaces" +version = "0.1.0" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "cosmic-protocols", + "futures", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", + "libcosmic", + "log", + "nix 0.26.4", + "once_cell", + "pretty_env_logger 0.5.0", + "rust-embed 6.8.1", + "xdg", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit 0.18.0", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-dbus-networkmanager" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" +dependencies = [ + "bitflags 2.4.1", + "derive_builder", + "procfs", + "thiserror", + "time", + "zbus", + "zvariant", +] + +[[package]] +name = "cosmic-notifications-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#886042bec827ba40257a31a567d7124904dd6a29" +dependencies = [ + "cosmic-config", + "serde", +] + +[[package]] +name = "cosmic-notifications-util" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#886042bec827ba40257a31a567d7124904dd6a29" +dependencies = [ + "bytemuck", + "fast_image_resize", + "serde", + "tracing", + "url", + "zbus", +] + +[[package]] +name = "cosmic-panel-button" +version = "0.1.0" +dependencies = [ + "freedesktop-desktop-entry", + "libcosmic", +] + +[[package]] +name = "cosmic-panel-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c" +dependencies = [ + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cosmic-time" +version = "0.3.0" +source = "git+https://github.com/pop-os/cosmic-time#71116b2eefb536bedbd3438e70cba49d54c3a5d5" +dependencies = [ + "float-cmp", + "libcosmic", + "once_cell", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "custom_debug" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +dependencies = [ + "custom_debug_derive", +] + +[[package]] +name = "custom_debug_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[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", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[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", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "futures-channel", + "futures-util", + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-crossroads" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" +dependencies = [ + "dbus", +] + +[[package]] +name = "dbus-tokio" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007688d459bc677131c063a3a77fb899526e17b7980f390b69644bdbc41fad13" +dependencies = [ + "dbus", + "libc", + "tokio", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[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 = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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 = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime 2.1.0", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fast_image_resize" +version = "2.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc789a40040e11bbe4ba31ca319406805a12fe3f8d71314bbc4bd076602ad55a" +dependencies = [ + "num-traits", + "thiserror", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +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 = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glib" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" +dependencies = [ + "bitflags 2.4.1", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +dependencies = [ + "heck", + "proc-macro-crate 2.0.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +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 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[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.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.8", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed 6.8.1", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed 8.0.0", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed 0.13.9", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", + "unic-langid", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed 0.14.1", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +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 = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.18.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.18.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools 0.10.5", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.18.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.18.0", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "icon-loader" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a8c09d5f0ce32daff2039f6f1830a4920f5eb23f00e62412bfb5f878a1be2e" +dependencies = [ + "dashmap", + "rust-ini", + "xdg", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[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 = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[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.3", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" +dependencies = [ + "apply", + "ashpd", + "cosmic-config", + "cosmic-panel-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "ron", + "slotmap", + "smithay-client-toolkit 0.18.0", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libpulse-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3557a2dfc380c8f061189a01c6ae7348354e0c9886038dc6c171219c08eaff" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libpulse-sys", + "num-derive", + "num-traits", + "winapi", +] + +[[package]] +name = "libpulse-glib-binding" +version = "2.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72bb604d4f32d4c60e02581a67f9d9fd7500cb963ad984cee032013edeaf6bee" +dependencies = [ + "glib", + "glib-sys", + "libpulse-binding", + "libpulse-mainloop-glib-sys", +] + +[[package]] +name = "libpulse-mainloop-glib-sys" +version = "1.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f9e6fbee0a60ac3f5751e3cc68eeaf9bff9d2687502df17b5c726220217531" +dependencies = [ + "glib-sys", + "libpulse-sys", + "pkg-config", +] + +[[package]] +name = "libpulse-sys" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" +dependencies = [ + "libc", + "num-derive", + "num-traits", + "pkg-config", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "logind-zbus" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3" +dependencies = [ + "serde", + "zbus", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "macaddr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" + +[[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.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mpris2-zbus" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" +dependencies = [ + "serde", + "thiserror", + "time", + "zbus", + "zvariant", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[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.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[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 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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 0.3.3", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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 = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.6", +] + +[[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 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger 0.7.1", + "log", +] + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger 0.10.1", + "log", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "procfs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +dependencies = [ + "bitflags 2.4.1", + "hex", + "lazy_static", + "procfs-core", + "rustix 0.38.21", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.4.1", + "hex", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[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.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl 6.8.1", + "rust-embed-utils 7.8.1", + "walkdir", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl 8.0.0", + "rust-embed-utils 8.0.0", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils 7.8.1", + "syn 2.0.39", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils 8.0.0", + "syn 2.0.39", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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.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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[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-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 = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.2", +] + +[[package]] +name = "self_cell" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "serde" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[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 = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit//?rev=e63ab5f#e63ab5f01964bc48766fc4c3bf79cc05dc59874c" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "pkg-config", + "rustix 0.38.21", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.8", + "version-compare", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "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.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "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.39", +] + +[[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.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[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.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[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-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "getrandom", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +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" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.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-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-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.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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#f2ca1c3dee8f66c40bdc91cb39de69a62aaaf22f" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix new file mode 100644 index 0000000000..b71f6d1996 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-applets/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, just +, pkg-config +, util-linuxMinimal +, dbus +, glib +, libxkbcommon +, pulseaudio +, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-applets"; + version = "unstable-2023-11-13"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-applets"; + rev = "21fc43e5781a7fbe7e7f39a0b68963dc8c2d486d"; + hash = "sha256-WOUlYIh4a8qQhga4weKcuJYxNL5fa4FzNFuRB1T32oU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; + "cosmic-client-toolkit-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "cosmic-config-0.1.0" = "sha256-6g/Om3SFLa+3fu2dkifbXbFP3ksXTbsjb6Xu7tDB570="; + "cosmic-dbus-networkmanager-0.1.0" = "sha256-eSUyDME39UhoimO/gd2mJDaunCrLNXesO9C69IwtjgM="; + "cosmic-notifications-config-0.1.0" = "sha256-QsLlm+jxsmc90Jc73qKgi52PVZoSwuGXDXw+iSJTALw="; + "cosmic-panel-config-0.1.0" = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + "cosmic-time-0.3.0" = "sha256-Vx9MrdnAwqDCnA6WgT/cXxs4NDWvAVZ6hv0FXi2A8t4="; + "smithay-client-toolkit-0.18.0" = "sha256-9NwNrEC+csTVtmXrNQFvOgohTGUO2VCvqOME7SnDCOg="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; + "xdg-shell-wrapper-config-0.1.0" = "sha256-3Dc2fU8xBVUmAs0Q1zEdcdG7vlxpBO+UIlyM/kzGcC4="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ just pkg-config util-linuxMinimal ]; + buildInputs = [ dbus glib libxkbcommon pulseaudio wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "target" "${stdenv.hostPlatform.rust.cargoShortTarget}/release" + ]; + + # Force linking to libwayland-client, which is always dlopen()ed. + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-applets"; + description = "Applets for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock new file mode 100644 index 0000000000..10627f9f08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/Cargo.lock @@ -0,0 +1,5647 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +dependencies = [ + "enumn", + "serde", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" +dependencies = [ + "android-properties", + "bitflags 2.4.1", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[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.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +dependencies = [ + "backtrace", +] + +[[package]] +name = "appendlist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[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 = "as-raw-xcb-connection" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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 = "block-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dd7cf50912cddc06dc5ea7c08c5e81c1b2c842a70d19def1848d54c586fed92" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "async-task", + "bitflags 2.4.1", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgmath" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +dependencies = [ + "approx 0.4.0", + "num-traits", +] + +[[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", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-comp" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags 2.4.1", + "bytemuck", + "calloop", + "cosmic-comp-config", + "cosmic-config", + "cosmic-protocols", + "edid-rs", + "egui", + "egui_plot", + "glow", + "i18n-embed", + "i18n-embed-fl", + "iced_tiny_skia", + "id_tree", + "indexmap 2.1.0", + "keyframe", + "lazy_static", + "libc", + "libcosmic", + "libsystemd", + "log-panics", + "once_cell", + "ordered-float", + "png", + "puffin", + "puffin_egui", + "regex", + "renderdoc", + "ron", + "rust-embed", + "sendfd", + "serde", + "serde_json", + "smithay", + "smithay-egui", + "thiserror", + "tiny-skia 0.10.0", + "tracing", + "tracing-journald", + "tracing-subscriber", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", + "xcursor", + "xdg", + "xkbcommon", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +dependencies = [ + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "atomicwrites", + "calloop", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-protocols", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.27.1", +] + +[[package]] +name = "drm-ffi" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d" +dependencies = [ + "drm-sys", + "nix 0.27.1", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae" + +[[package]] +name = "ecolor" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "edid-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" + +[[package]] +name = "egui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +dependencies = [ + "accesskit", + "ahash 0.8.6", + "epaint", + "nohash-hasher", + "serde", +] + +[[package]] +name = "egui_extras" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" +dependencies = [ + "egui", + "enum-map", + "log", + "mime_guess", + "resvg 0.28.0", + "serde", + "tiny-skia 0.8.4", + "usvg 0.28.0", +] + +[[package]] +name = "egui_glow" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" +dependencies = [ + "bytemuck", + "egui", + "glow", + "log", + "memoffset 0.6.5", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "egui_plot" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" +dependencies = [ + "egui", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "emath" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-map" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53337c2dbf26a3c31eccc73a37b10c1614e8d4ae99b6a50d553e8936423c1f16" +dependencies = [ + "enum-map-derive", + "serde", +] + +[[package]] +name = "enum-map-derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "enumn" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "epaint" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +dependencies = [ + "ab_glyph", + "ahash 0.8.6", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot 0.12.1", + "serde", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "etagere" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf70b9ea3a235a7432b4f481854815e2d4fb2fe824c1f5fb09b8985dd06b3e9" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree 0.18.1", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend 0.3.2", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "gethostname" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +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 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.6", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "iced_core", + "iced_futures", + "iced_renderer", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "bitflags 1.3.2", + "instant", + "log", + "palette", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "iced_core", + "iced_futures", + "thiserror", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo 0.9.5", + "log", + "raw-window-handle 0.5.2", + "resvg 0.35.0", + "rustc-hash", + "softbuffer", + "tiny-skia 0.10.0", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle 0.5.2", + "resvg 0.35.0", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "id_tree" +version = "1.8.0" +source = "git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone#632a57d6d49160e18d7300fa7edae52281ec5482" +dependencies = [ + "snowflake", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951" + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev 0.7.0", +] + +[[package]] +name = "input-sys" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[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 = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "keyframe" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9" +dependencies = [ + "mint", + "num-traits", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" +dependencies = [ + "apply", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "taffy", + "thiserror", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libseat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" +dependencies = [ + "errno", + "libseat-sys", + "log", +] + +[[package]] +name = "libseat-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libsystemd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e" +dependencies = [ + "hmac", + "libc", + "log", + "nix 0.26.4", + "nom", + "once_cell", + "serde", + "sha2", + "thiserror", + "uuid", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "lz4_flex" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" + +[[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.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types 0.3.2", + "log", + "objc", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.1", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[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 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-float" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx 0.5.1", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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.6", +] + +[[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 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.48.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" +dependencies = [ + "quote", + "syn 2.0.39", +] + +[[package]] +name = "puffin" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "cfg-if", + "lz4_flex", + "once_cell", + "parking_lot 0.12.1", + "serde", +] + +[[package]] +name = "puffin_egui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5af236782d21bdd5a6eb2f8cc9a91f8d601c073b7f7d568c95c26604cc12b87" +dependencies = [ + "egui", + "indexmap 1.9.3", + "natord", + "once_cell", + "puffin", + "time", + "vec1", + "web-time", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox 0.0.1", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" +dependencies = [ + "bitflags 1.3.2", + "float-cmp", + "libloading 0.7.4", + "once_cell", + "renderdoc-sys", + "winapi", + "wio", +] + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c115863f2d3621999cf187e318bc92b16402dfeff6a48c74df700d77381394c1" +dependencies = [ + "log", + "pico-args", + "rgb", + "svgtypes 0.8.2", + "tiny-skia 0.8.4", + "usvg 0.28.0", +] + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes 0.11.0", + "tiny-skia 0.10.0", + "usvg 0.35.0", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.5", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b9de9831a129b122e7e61f242db509fa9d0838008bf0b29bb0624669edfe48a" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.39", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[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 = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", +] + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "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 = "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 = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay" +version = "0.3.0" +source = "git+https://github.com/smithay//smithay?rev=d5b352b#d5b352b33525d21b38ad8d7ebd54c99d39246464" +dependencies = [ + "appendlist", + "ash", + "bitflags 2.4.1", + "calloop", + "cc", + "cgmath", + "cursor-icon", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "encoding_rs", + "errno", + "gbm", + "gl_generator", + "glow", + "indexmap 2.1.0", + "input", + "lazy_static", + "libc", + "libloading 0.8.1", + "libseat", + "nix 0.27.1", + "once_cell", + "pkg-config", + "profiling", + "rand", + "rustix", + "scan_fmt", + "scopeguard", + "smallvec", + "tempfile", + "thiserror", + "tracing", + "udev 0.8.0", + "wayland-backend 0.3.2", + "wayland-egl", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-server", + "wayland-sys 0.31.1", + "winit", + "x11rb 0.12.0", + "xkbcommon", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +dependencies = [ + "bitflags 2.4.1", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "rustix", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkeysym", +] + +[[package]] +name = "smithay-egui" +version = "0.1.0" +source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0#cdc652e0d4823b16a5bd9badd288e38512789dc5" +dependencies = [ + "cgmath", + "egui", + "egui_extras", + "egui_glow", + "image", + "log", + "memoffset 0.9.0", + "smithay", + "xkbcommon", +] + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + +[[package]] +name = "snowflake" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1" + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics 0.22.3", + "fastrand 1.9.0", + "foreign-types 0.3.2", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle 0.5.2", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb 0.11.1", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +dependencies = [ + "siphasher", +] + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo 0.9.5", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path 0.8.4", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", +] + +[[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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "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.39", +] + +[[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-journald" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes 1.0.11", + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[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-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "usvg" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5b7c2b30845b3348c067ca3d09e20cc6e327c288f0ca4c48698712abf432e9" +dependencies = [ + "base64 0.13.1", + "data-url", + "flate2", + "imagesize 0.10.1", + "kurbo 0.8.3", + "log", + "rctree", + "roxmltree 0.15.1", + "simplecss", + "siphasher", + "strict-num", + "svgtypes 0.8.2", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64 0.21.5", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize 0.12.0", + "kurbo 0.9.5", + "log", + "roxmltree 0.18.1", + "simplecss", + "siphasher", + "svgtypes 0.11.0", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo 0.9.5", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes 0.11.0", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec1" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +dependencies = [ + "wayland-backend 0.3.2", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-protocols", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.5.2", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.5.2", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types 0.3.2", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle 0.5.2", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +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" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.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-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.5", +] + +[[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.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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "161598019a9da35ab6c34dc46cd13546cba9dbf9816475d4dd9a639455016563" +dependencies = [ + "ahash 0.8.6", + "android-activity", + "atomic-waker", + "bitflags 2.4.1", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics 0.23.1", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.0", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.6.0", + "redox_syscall 0.3.5", + "rustix", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.12.0", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname 0.2.3", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.11.1", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname 0.3.0", + "libc", + "libloading 0.7.4", + "nix 0.26.4", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[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 = "xkbcommon-dl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +dependencies = [ + "bitflags 2.4.1", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix new file mode 100644 index 0000000000..29864f1cd8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-comp/package.nix @@ -0,0 +1,73 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeBinaryWrapper +, pkg-config +, libinput +, libglvnd +, libxkbcommon +, mesa +, seatd +, udev +, xwayland +, wayland +, xorg +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-comp"; + version = "unstable-2023-11-13"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-comp"; + rev = "d051d141979820f50b75bd686c745fb7f84fcd05"; + hash = "sha256-8okRiVVPzmuPJjnv1YoQPQFI8g0j1DQhwUoO51dHgGA="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cosmic-config-0.1.0" = "sha256-5WajbfcfCc0ZRpJfysqEydthOsF04ipb35QVWuWKrEs="; + "cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0="; + "smithay-0.3.0" = "sha256-e6BSrsrVSBcOuF8m21m74h7DWZnYHGIYs/4D4ABvqNM="; + "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; + }; + }; + + separateDebugInfo = true; + + nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; + buildInputs = [ libglvnd libinput libxkbcommon mesa seatd udev wayland ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client, which is always dlopen()ed except by the + # obscure winit backend. + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + # These libraries are only used by the X11 backend, which will not + # be the common case, so just make them available, don't link them. + postInstall = '' + wrapProgram $out/bin/cosmic-comp \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr + ]} \ + --prefix PATH : ${lib.makeBinPath [ xwayland ]} + ''; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-comp"; + description = "Compositor for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/Cargo.lock new file mode 100644 index 0000000000..3aa66b780b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/Cargo.lock @@ -0,0 +1,4877 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.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", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[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 = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +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 = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[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-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "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", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.26", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[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-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.20", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] +name = "bindgen" +version = "0.69.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "042e2e131c066e496ea7880ef6cfeec415a9adc79fc882a65979394f8840bf7c" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.38", +] + +[[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 = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.2.0", + "rustix 0.38.20", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.20", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", +] + +[[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", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorgrad" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" +dependencies = [ + "csscolorparser", +] + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cosmic-bg-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-bg#6a6fe4e387e46c2e159df56a9768220a6269ccf4" +dependencies = [ + "colorgrad", + "cosmic-config", + "derive_setters", + "image", + "ron", + "serde", + "tracing", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "atomicwrites", + "calloop", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-greeter" +version = "0.1.0" +dependencies = [ + "chrono", + "cosmic-bg-config", + "cosmic-config", + "env_logger", + "freedesktop_entry_parser", + "greetd_ipc", + "libcosmic", + "log", + "pam-client", + "pwd", + "shlex", + "tokio", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[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 = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop_entry_parser" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4" +dependencies = [ + "nom", + "thiserror", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[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-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.1", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "greetd_ipc" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839390036de887ed0e6a58a82fc03619b27c96f24ac6425f7c9a6c397a6482f6" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +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 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[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.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +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 = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.17.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.17.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.17.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.17.0", + "thiserror", + "unicode-segmentation", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[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 = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +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", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[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 = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#f3eb41c1d2a6aaef76f40bc872a71153f90fc113" +dependencies = [ + "apply", + "ashpd", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "smithay-client-toolkit 0.17.0", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[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.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.1", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[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.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[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.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[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 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[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 = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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 = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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 = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pam-client" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd776116a7ada5ebbe31f54cdc5b1030ed7265686cf7c8a21c057a2f8dab9a" +dependencies = [ + "bitflags 1.3.2", + "enum-repr", + "libc", + "pam-sys", + "rpassword", + "rustversion", +] + +[[package]] +name = "pam-sys" +version = "1.0.0-alpha5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9484729b3e52c0bacdc5191cb6a6a5f31ef4c09c5e4ab1209d3340ad9e997b" +dependencies = [ + "bindgen", + "libc", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.6", +] + +[[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 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.20", + "tracing", + "windows-sys 0.48.0", +] + +[[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 = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "pwd" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" +dependencies = [ + "libc", + "thiserror", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rpassword" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +dependencies = [ + "libc", + "serde", + "serde_json", + "winapi", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[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-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.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "dlib", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#23ff477566b0239f04d3b89a2b3a4da2495e9577" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.3.5", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.4", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "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.38", +] + +[[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 = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[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.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[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-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +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" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.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-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-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.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_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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2 0.7.1", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix new file mode 100644 index 0000000000..754c181d9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-greeter/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, cmake +, just +, pkg-config +, libxkbcommon +, linux-pam +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "cosmic-greeter"; + version = "unstable-2023-11-08"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "a497ed8b1e67aaa9eb878d4ba225b40a71e1706c"; + sha256 = "sha256-P37i0JYP21gGE7NIq9G3WVUa0vv2MdFJmo/GuRDuV8A="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; + "cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA="; + "cosmic-config-0.1.0" = "sha256-c2pGujYQ3WbbiHGhPo2kG8/NiydmpfFNQrlrb1nk/RY="; + "smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-8gctP/nRiYxTSDrLyXi/oQbA7bE41ywgMbyotY1N8Zk="; + }; + }; + + nativeBuildInputs = [ rustPlatform.bindgenHook cmake just pkg-config ]; + buildInputs = [ libxkbcommon wayland linux-pam ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-greeter" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-greeter"; + description = "Greeter for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix new file mode 100644 index 0000000000..c188082f8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-icons/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, just +, pop-icon-theme +, hicolor-icon-theme +}: +stdenvNoCC.mkDerivation rec { + pname = "cosmic-icons"; + version = "unstable-2023-08-30"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "14d8e2048087be1ad444f9b3ebb75885509f72c6"; + sha256 = "sha256-WbdgHmTn403x95x9wEYL0T9ksbN+YLzEB2yE0UrF9T0="; + }; + + nativeBuildInputs = [ just ]; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + ]; + + propagatedBuildInputs = [ + pop-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + meta = with lib; { + description = "System76 Cosmic icon theme for Linux"; + homepage = "https://github.com/pop-os/cosmic-icons"; + license = with licenses; [ + cc-by-sa-40 + ]; + maintainers = with maintainers; [ a-kenji ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/Cargo.lock similarity index 54% rename from third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/Cargo.lock index c0c7795d90..b1c6a41f5c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/Cargo.lock @@ -3,10 +3,13 @@ version = 3 [[package]] -name = "Inflector" -version = "0.11.4" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] [[package]] name = "adler" @@ -14,111 +17,20 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[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.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "almost" +version = "0.2.0" 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 = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "annotate-snippets" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" - -[[package]] -name = "annotate-snippets" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36" -dependencies = [ - "unicode-width", - "yansi-term", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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 = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "anyhow" @@ -127,43 +39,183 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "argfile" -version = "0.1.6" +name = "appendlist" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1287c4f82a41c5085e65ee337c7934d71ab43d5187740a81fb69129013f6a5f6" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" dependencies = [ - "fs-err", - "os_str_bytes", + "num-traits", ] [[package]] -name = "arrayvec" -version = "0.7.4" +name = "approx" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "term", + "num-traits", ] [[package]] -name = "assert_cmd" -version = "2.0.12" +name = "async-broadcast" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", + "event-listener 2.5.3", + "futures-core", +] + +[[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-executor" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "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", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.24", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[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-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.18", + "windows-sys", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.18", + "signal-hook-registry", + "slab", + "windows-sys", +] + +[[package]] +name = "async-task" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.18", + "tempfile", + "windows-sys", ] [[package]] @@ -172,35 +224,32 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] -name = "bincode" -version = "1.3.3" +name = "bit_field" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -213,38 +262,104 @@ name = "bitflags" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bstr" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ - "memchr", - "regex-automata 0.3.8", "serde", ] [[package]] -name = "bumpalo" -version = "3.13.0" +name = "block" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "cachedir" -version = "0.3.0" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "tempfile", + "generic-array", ] [[package]] -name = "cast" -version = "0.3.0" +name = "blocking" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.0", + "log", + "polling 3.2.0", + "rustix 0.38.18", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.18", + "wayland-backend", + "wayland-client", +] [[package]] name = "cc" @@ -262,239 +377,163 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chic" -version = "1.2.2" +name = "cgmath" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "annotate-snippets 0.6.1", -] - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", + "approx 0.4.0", "num-traits", - "wasm-bindgen", - "windows-targets 0.48.5", ] [[package]] -name = "ciborium" -version = "0.2.1" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "ciborium-io", - "ciborium-ll", + "crossbeam-utils", +] + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit", + "wayland-client", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" +dependencies = [ + "atomicwrites", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", "serde", ] [[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clap" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_complete_command" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" -dependencies = [ - "clap", - "clap_complete", - "clap_complete_fig", - "clap_complete_nushell", -] - -[[package]] -name = "clap_complete_fig" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9bae21b3f6eb417ad3054c8b1094aa0542116eba4979b1b271baefbfa6b965" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_complete_nushell" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", "quote", - "syn 2.0.37", + "syn 1.0.109", ] [[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "clearscreen" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" +name = "cosmic-notifications-util" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-notifications#4021beac8b95e2915eba08b29b9ceb6b72309462" dependencies = [ - "nix", - "terminfo", - "thiserror", - "which", - "winapi", + "bytemuck", + "serde", + "tracing", + "url", ] [[package]] -name = "codspeed" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3238416c10f19985b52a937c5b3efc3ed7efe8f7ae263d2aab29a09bca9f57" +name = "cosmic-panel-bin" +version = "0.1.0" dependencies = [ - "colored", + "anyhow", + "bytemuck", + "cosmic-client-toolkit", + "cosmic-config", + "cosmic-notifications-util", + "cosmic-panel-config", + "cosmic-theme", + "csscolorparser", + "freedesktop-desktop-entry", + "image", + "itertools", + "launch-pad", "libc", - "serde_json", + "log-panics", + "notify", + "ron", + "sendfd", + "serde", + "shlex", + "smithay", + "smithay-client-toolkit", + "tokio", + "tracing", + "tracing-futures", + "tracing-journald", + "tracing-subscriber", + "transpose", + "wayland-egl", + "wayland-protocols", + "wayland-protocols-wlr", + "xdg", + "xdg-shell-wrapper", + "xdg-shell-wrapper-config", + "zbus", ] [[package]] -name = "codspeed-criterion-compat" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecc18f65b942d2b033545bb3bd8430a23eecbbe53fad3b1342fb0e5514bca7b" +name = "cosmic-panel-config" +version = "0.1.0" dependencies = [ - "codspeed", - "colored", - "criterion", + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", ] [[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] [[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ - "is-terminal", + "almost", + "cosmic-config", + "csscolorparser", "lazy_static", - "windows-sys 0.48.0", + "palette", + "ron", + "serde", ] [[package]] -name = "configparser" -version = "3.0.2" +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "encode_unicode", - "lazy_static", "libc", - "unicode-width", - "windows-sys 0.45.0", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" -dependencies = [ - "log", - "web-sys", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - [[package]] name = "crc32fast" version = "1.3.2" @@ -504,40 +543,6 @@ 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", - "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.8" @@ -568,7 +573,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.9.0", "scopeguard", ] @@ -588,57 +593,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "darling" -version = "0.20.3" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "darling_core", - "darling_macro", + "generic-array", + "typenum", ] [[package]] -name = "darling_core" -version = "0.20.3" +name = "csscolorparser" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.37", + "syn 1.0.109", ] [[package]] -name = "darling_macro" -version = "0.20.3" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "darling_core", - "quote", - "syn 2.0.37", + "block-buffer", + "crypto-common", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "dirs" -version = "4.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ "dirs-sys 0.3.7", ] @@ -652,16 +657,6 @@ dependencies = [ "dirs-sys 0.4.1", ] -[[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" version = "0.3.7" @@ -682,37 +677,58 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dlib" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libc", - "redox_users", - "winapi", + "libloading", ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "downcast-rs" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] -name = "drop_bomb" -version = "0.1.5" +name = "drm" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" +checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" +dependencies = [ + "bitflags 2.4.0", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.27.1", +] [[package]] -name = "dyn-clone" -version = "1.0.13" +name = "drm-ffi" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d" +dependencies = [ + "drm-sys", + "nix 0.27.1", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae" [[package]] name = "either" @@ -721,31 +737,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] -name = "ena" -version = "0.14.2" +name = "enumflags2" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ - "log", + "enumflags2_derive", + "serde", ] [[package]] -name = "encode_unicode" -version = "0.3.6" +name = "enumflags2_derive" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -756,38 +765,75 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "fern" -version = "0.6.2" +name = "fdeflate" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ - "log", + "simd-adler32", ] [[package]] @@ -799,37 +845,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flake8-to-ruff" -version = "0.0.292" -dependencies = [ - "anyhow", - "clap", - "colored", - "configparser", - "itertools 0.11.0", - "log", - "once_cell", - "pep440_rs", - "pretty_assertions", - "regex", - "ruff_linter", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "strum", - "strum_macros", - "toml", + "windows-sys", ] [[package]] @@ -843,10 +859,13 @@ dependencies = [ ] [[package]] -name = "fnv" -version = "1.0.7" +name = "flume" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] [[package]] name = "form_urlencoded" @@ -858,10 +877,17 @@ dependencies = [ ] [[package]] -name = "fs-err" -version = "2.9.0" +name = "freedesktop-desktop-entry" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] [[package]] name = "fsevent-sys" @@ -872,6 +898,144 @@ dependencies = [ "libc", ] +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-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-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +dependencies = [ + "libc", +] + +[[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.10" @@ -879,102 +1043,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] -name = "glob" -version = "0.3.1" +name = "gettext-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] [[package]] -name = "globset" -version = "0.4.13" +name = "gettext-sys" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" dependencies = [ - "aho-corasick", - "bstr", - "fnv", + "cc", + "temp-dir", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", "log", - "regex", + "xml-rs", ] [[package]] name = "half" -version = "1.8.2" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hexf-parse" -version = "0.2.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[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.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", + "bitflags 1.3.2", + "instant", + "log", + "thiserror", + "twox-hash", ] [[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ - "cc", + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", ] -[[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.4.0" @@ -986,73 +1156,34 @@ dependencies = [ ] [[package]] -name = "ignore" -version = "0.4.20" +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "imara-diff" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" -dependencies = [ - "ahash", - "hashbrown 0.12.3", -] - -[[package]] -name = "imperative" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" -dependencies = [ - "phf", - "rust-stemmers", + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", - "serde", + "hashbrown", ] -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", - "vt100", -] - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - [[package]] name = "inotify" version = "0.9.6" @@ -1073,34 +1204,6 @@ dependencies = [ "libc", ] -[[package]] -name = "insta" -version = "1.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" -dependencies = [ - "console", - "globset", - "lazy_static", - "linked-hash-map", - "regex", - "serde", - "similar", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "insta-cmd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809d3023d1d6e8d5c2206f199251f75cb26180e41f18cb0f22dd119161cb5127" -dependencies = [ - "insta", - "serde", - "serde_json", -] - [[package]] name = "instant" version = "0.1.12" @@ -1111,37 +1214,21 @@ dependencies = [ ] [[package]] -name = "is-macro" -version = "0.3.0" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" -dependencies = [ - "Inflector", - "pmutil 0.6.1", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys", ] [[package]] -name = "itertools" -version = "0.10.5" +name = "io-lifetimes" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" [[package]] name = "itertools" @@ -1153,10 +1240,13 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.9" +name = "jpeg-decoder" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" @@ -1167,6 +1257,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + [[package]] name = "kqueue" version = "1.0.8" @@ -1188,33 +1284,19 @@ dependencies = [ ] [[package]] -name = "lalrpop" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +name = "launch-pad" +version = "0.1.0" +source = "git+https://github.com/pop-os/launch-pad.git#699fd1801260cd4425dfd472d0e36fdf17bb7f36" dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.7.5", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", + "log", + "nix 0.26.4", + "rand", + "slotmap", + "thiserror", + "tokio", + "tokio-util", ] -[[package]] -name = "lalrpop-util" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" - [[package]] name = "lazy_static" version = "1.4.0" @@ -1222,85 +1304,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-parse-float" -version = "0.8.5" +name = "lebe" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] -name = "libcst" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" -dependencies = [ - "chic", - "libcst_derive", - "memchr", - "paste", - "peg", - "regex", - "thiserror", -] - -[[package]] -name = "libcst_derive" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ - "cc", - "libc", + "cfg-if", + "windows-sys", ] -[[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.4.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[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" @@ -1318,6 +1366,25 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "backtrace", + "log", +] + +[[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" @@ -1327,18 +1394,39 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[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.0" @@ -1348,15 +1436,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mimalloc" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" -dependencies = [ - "libmimalloc-sys", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1370,6 +1449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -1381,27 +1461,9 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys 0.48.0", + "windows-sys", ] -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nextest-workspace-hack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3" - [[package]] name = "nix" version = "0.26.4" @@ -1411,6 +1473,19 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "libc", ] [[package]] @@ -1439,7 +1514,7 @@ dependencies = [ "log", "mio", "walkdir", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1453,19 +1528,72 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.16" +name = "num-integer" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "number_prefix" -version = "0.4.0" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +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.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] [[package]] name = "once_cell" @@ -1473,12 +1601,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - [[package]] name = "option-ext" version = "0.2.0" @@ -1486,12 +1608,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "os_str_bytes" -version = "6.5.1" +name = "ordered-stream" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" dependencies = [ - "memchr", + "futures-core", + "pin-project-lite", ] [[package]] @@ -1501,111 +1624,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "parking_lot" -version = "0.12.1" +name = "palette" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" dependencies = [ + "approx 0.5.1", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "parking" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" + +[[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", ] [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", + "instant", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.2.16", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-absolutize" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "peg" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pep440_rs" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" -dependencies = [ - "lazy_static", - "regex", - "serde", - "unicode-width", -] - -[[package]] -name = "pep508_rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0713d7bb861ca2b7d4c50a38e1f31a4b63a2e2df35ef1e5855cc29e108453e2" -dependencies = [ - "once_cell", - "pep440_rs", - "regex", - "serde", - "thiserror", - "tracing", - "unicode-width", - "url", + "winapi", ] [[package]] @@ -1614,33 +1684,14 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - [[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", - "phf_shared 0.11.2", + "phf_macros", + "phf_shared", ] [[package]] @@ -1649,17 +1700,21 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.2", + "phf_shared", "rand", ] [[package]] -name = "phf_shared" -version = "0.10.0" +name = "phf_macros" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "siphasher", + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -1671,6 +1726,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -1678,32 +1753,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "pmutil" -version = "0.5.3" +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "atomic-waker", + "fastrand 2.0.1", + "futures-io", ] [[package]] -name = "pmutil" -version = "0.6.1" +name = "pkg-config" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", ] [[package]] -name = "portable-atomic" -version = "1.4.3" +name = "polling" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "polling" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.18", + "tracing", + "windows-sys", +] [[package]] name = "ppv-lite86" @@ -1712,114 +1825,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "precomputed-hash" -version = "0.1.1" +name = "proc-macro-crate" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "anstyle", - "difflib", - "itertools 0.10.5", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "once_cell", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] -name = "pyproject-toml" -version = "0.7.0" +name = "profiling" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "569e259cd132eb8cec5df8b672d187c5260f82ad352156b5da9549d4472e64b0" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" dependencies = [ - "indexmap", - "pep440_rs", - "pep508_rs", - "serde", - "toml", + "profiling-procmacros", ] [[package]] -name = "quick-junit" -version = "0.3.3" +name = "profiling-procmacros" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d" +checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" dependencies = [ - "chrono", - "indexmap", - "nextest-workspace-hack", - "quick-xml", - "thiserror", - "uuid", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", ] [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -1914,14 +1970,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.0", ] [[package]] @@ -1935,13 +1991,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.0", ] [[package]] @@ -1952,624 +2008,55 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] -name = "result-like" -version = "0.4.6" +name = "ron" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "result-like-derive", -] - -[[package]] -name = "result-like-derive" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42" -dependencies = [ - "pmutil 0.5.3", - "proc-macro2", - "quote", - "syn 1.0.109", - "syn-ext", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ruff_benchmark" -version = "0.0.0" -dependencies = [ - "codspeed-criterion-compat", - "criterion", - "mimalloc", - "once_cell", - "ruff_linter", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "serde", - "serde_json", - "tikv-jemallocator", - "ureq", - "url", -] - -[[package]] -name = "ruff_cache" -version = "0.0.0" -dependencies = [ - "filetime", - "glob", - "globset", - "itertools 0.11.0", - "regex", - "ruff_macros", - "seahash", -] - -[[package]] -name = "ruff_cli" -version = "0.0.292" -dependencies = [ - "annotate-snippets 0.9.1", - "anyhow", - "argfile", - "assert_cmd", - "bincode", + "base64", "bitflags 2.4.0", - "cachedir", - "chrono", - "clap", - "clap_complete_command", - "clearscreen", - "colored", - "filetime", - "glob", - "ignore", - "insta", - "insta-cmd", - "is-macro", - "itertools 0.11.0", - "itoa", - "log", - "mimalloc", - "notify", - "path-absolutize", - "rayon", - "regex", - "ruff_cache", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "shellexpand", - "similar", - "strum", - "tempfile", - "test-case", - "thiserror", - "tikv-jemallocator", - "tracing", - "ureq", - "walkdir", - "wild", -] - -[[package]] -name = "ruff_dev" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "ignore", - "imara-diff", - "indicatif", - "indoc", - "itertools 0.11.0", - "libcst", - "once_cell", - "pretty_assertions", - "rayon", - "regex", - "ruff_cli", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_workspace", - "schemars", - "serde", - "serde_json", - "similar", - "strum", - "strum_macros", - "tempfile", - "toml", - "tracing", - "tracing-indicatif", - "tracing-subscriber", -] - -[[package]] -name = "ruff_diagnostics" -version = "0.0.0" -dependencies = [ - "anyhow", - "log", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_formatter" -version = "0.0.0" -dependencies = [ - "drop_bomb", - "insta", - "ruff_cache", - "ruff_macros", - "ruff_text_size", - "rustc-hash", - "schemars", - "serde", - "static_assertions", - "tracing", - "unicode-width", -] - -[[package]] -name = "ruff_index" -version = "0.0.0" -dependencies = [ - "ruff_macros", - "static_assertions", -] - -[[package]] -name = "ruff_linter" -version = "0.0.292" -dependencies = [ - "aho-corasick", - "annotate-snippets 0.9.1", - "anyhow", - "bitflags 2.4.0", - "chrono", - "clap", - "colored", - "fern", - "glob", - "globset", - "imperative", - "insta", - "is-macro", - "itertools 0.11.0", - "libcst", - "log", - "memchr", - "natord", - "once_cell", - "path-absolutize", - "pathdiff", - "pep440_rs", - "pretty_assertions", - "pyproject-toml", - "quick-junit", - "regex", - "result-like", - "ruff_cache", - "ruff_diagnostics", - "ruff_index", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_index", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_semantic", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "semver", - "serde", - "serde_json", - "similar", - "smallvec", - "strum", - "strum_macros", - "tempfile", - "test-case", - "thiserror", - "toml", - "typed-arena", - "unicode-width", - "unicode_names2", - "wsl", -] - -[[package]] -name = "ruff_macros" -version = "0.0.0" -dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "ruff_python_trivia", - "syn 2.0.37", -] - -[[package]] -name = "ruff_notebook" -version = "0.0.0" -dependencies = [ - "anyhow", - "insta", - "itertools 0.11.0", - "once_cell", - "ruff_diagnostics", - "ruff_source_file", - "ruff_text_size", - "serde", - "serde_json", - "serde_with", - "test-case", - "thiserror", - "uuid", -] - -[[package]] -name = "ruff_python_ast" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "serde", - "smallvec", - "static_assertions", -] - -[[package]] -name = "ruff_python_codegen" -version = "0.0.0" -dependencies = [ - "once_cell", - "ruff_python_ast", - "ruff_python_literal", - "ruff_python_parser", - "ruff_source_file", -] - -[[package]] -name = "ruff_python_formatter" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 2.4.0", - "clap", - "countme", - "insta", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_cache", - "ruff_formatter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "similar", - "smallvec", - "static_assertions", - "thiserror", - "tracing", - "unicode-width", -] - -[[package]] -name = "ruff_python_index" -version = "0.0.0" -dependencies = [ - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", -] - -[[package]] -name = "ruff_python_literal" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "hexf-parse", - "is-macro", - "itertools 0.11.0", - "lexical-parse-float", - "rand", - "unic-ucd-category", -] - -[[package]] -name = "ruff_python_parser" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "ruff_python_ast", - "ruff_text_size", - "rustc-hash", - "static_assertions", - "tiny-keccak", - "unicode-ident", - "unicode_names2", -] - -[[package]] -name = "ruff_python_resolver" -version = "0.0.0" -dependencies = [ - "env_logger", - "insta", - "log", - "tempfile", -] - -[[package]] -name = "ruff_python_semantic" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "is-macro", - "ruff_index", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "ruff_python_stdlib" -version = "0.0.0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ruff_python_trivia" -version = "0.0.0" -dependencies = [ - "insta", - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", - "unicode-ident", -] - -[[package]] -name = "ruff_shrinking" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "fs-err", - "regex", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", - "shlex", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "ruff_source_file" -version = "0.0.0" -dependencies = [ - "insta", - "memchr", - "once_cell", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_text_size" -version = "0.0.0" -dependencies = [ - "schemars", - "serde", - "serde_test", - "static_assertions", -] - -[[package]] -name = "ruff_wasm" -version = "0.0.0" -dependencies = [ - "console_error_panic_hook", - "console_log", - "js-sys", - "log", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "serde", - "serde-wasm-bindgen", - "wasm-bindgen", - "wasm-bindgen-test", -] - -[[package]] -name = "ruff_workspace" -version = "0.0.0" -dependencies = [ - "anyhow", - "colored", - "dirs 5.0.1", - "glob", - "globset", - "ignore", - "itertools 0.11.0", - "log", - "once_cell", - "path-absolutize", - "pep440_rs", - "regex", - "ruff_cache", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_source_file", - "rustc-hash", - "schemars", - "serde", - "shellexpand", - "strum", - "tempfile", - "toml", -] - -[[package]] -name = "rust-stemmers" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -dependencies = [ "serde", "serde_derive", ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.10" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.10", + "windows-sys", ] -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - [[package]] name = "same-file" version = "1.0.6" @@ -2580,28 +2067,10 @@ dependencies = [ ] [[package]] -name = "schemars" -version = "0.8.15" +name = "scan_fmt" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" [[package]] name = "scoped-tls" @@ -2616,27 +2085,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.0" +name = "sendfd" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" dependencies = [ - "ring", - "untrusted", + "libc", ] -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" - [[package]] name = "serde" version = "1.0.188" @@ -2646,17 +2102,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_derive" version = "1.0.188" @@ -2665,89 +2110,40 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] -name = "serde_derive_internals" -version = "0.26.0" +name = "serde_repr" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] -name = "serde_json" -version = "1.0.107" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_test" -version = "1.0.176" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_with" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.37", + "cfg-if", + "cpufeatures", + "digest", ] [[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", ] -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs 5.0.1", -] - [[package]] name = "shlex" version = "1.2.0" @@ -2755,10 +2151,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] -name = "similar" -version = "2.2.1" +name = "signal-hook-registry" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" @@ -2766,6 +2171,24 @@ 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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + [[package]] name = "smallvec" version = "1.11.1" @@ -2773,10 +2196,100 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] -name = "spin" -version = "0.5.2" +name = "smithay" +version = "0.3.0" +source = "git+https://github.com/smithay/smithay#a8f3c46f0bd0153160a3ba117502ba47c38ab0dc" +dependencies = [ + "appendlist", + "bitflags 2.4.0", + "calloop", + "cgmath", + "cursor-icon", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "errno", + "gbm", + "gl_generator", + "indexmap", + "lazy_static", + "libc", + "libloading", + "nix 0.27.1", + "once_cell", + "profiling", + "rand", + "rustix 0.38.18", + "scan_fmt", + "smallvec", + "tempfile", + "thiserror", + "tracing", + "wayland-backend", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-server", + "wayland-sys", + "xkbcommon", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit//#05e3f7f3d91f7953514b6fe04742dc57f5527819" +dependencies = [ + "bitflags 2.4.0", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "pkg-config", + "rustix 0.38.18", + "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.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[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" @@ -2785,45 +2298,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "string_cache" -version = "0.8.7" +name = "strength_reduce" +version = "0.2.4" 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", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.37", -] +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" [[package]] name = "syn" @@ -2838,9 +2316,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2848,13 +2326,10 @@ dependencies = [ ] [[package]] -name = "syn-ext" -version = "0.4.0" +name = "temp-dir" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6" -dependencies = [ - "syn 1.0.109", -] +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" @@ -2863,84 +2338,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminfo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" -dependencies = [ - "dirs 4.0.0", - "fnv", - "nom", - "phf", - "phf_codegen", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-case" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "test-case-macros" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", - "test-case-core", + "rustix 0.38.18", + "windows-sys", ] [[package]] @@ -2960,7 +2361,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2974,42 +2375,14 @@ dependencies = [ ] [[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" +name = "tiff" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] @@ -3028,15 +2401,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "toml" -version = "0.7.8" +name = "tokio" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.4", + "tokio-macros", + "tracing", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", ] [[package]] @@ -3044,9 +2447,6 @@ name = "toml_datetime" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -3055,8 +2455,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -3068,7 +2466,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3082,7 +2479,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3096,13 +2493,22 @@ dependencies = [ ] [[package]] -name = "tracing-indicatif" -version = "0.3.5" +name = "tracing-futures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "indicatif", + "pin-project", "tracing", +] + +[[package]] +name = "tracing-journald" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +dependencies = [ + "libc", "tracing-core", "tracing-subscriber", ] @@ -3137,51 +2543,39 @@ dependencies = [ ] [[package]] -name = "typed-arena" -version = "2.0.2" +name = "transpose" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" dependencies = [ - "unic-char-range", + "num-integer", + "strength_reduce", ] [[package]] -name = "unic-char-range" -version = "0.9.0" +name = "twox-hash" +version = "1.6.3" 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-category" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "matches", - "unic-char-property", - "unic-char-range", - "unic-ucd-version", + "cfg-if", + "static_assertions", ] [[package]] -name = "unic-ucd-version" -version = "0.9.0" +name = "typenum" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" dependencies = [ - "unic-common", + "tempfile", + "winapi", ] [[package]] @@ -3205,48 +2599,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_names2" -version = "0.6.0" -source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" -dependencies = [ - "phf", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "url", - "webpki-roots", -] - [[package]] name = "url" version = "2.4.1" @@ -3256,36 +2608,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "rand", - "uuid-macro-internal", - "wasm-bindgen", -] - -[[package]] -name = "uuid-macro-internal" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", ] [[package]] @@ -3301,46 +2623,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vt100" -version = "0.15.2" +name = "waker-fn" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" -dependencies = [ - "itoa", - "log", - "unicode-width", - "vte", -] - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -3379,7 +2665,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3413,7 +2699,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3425,29 +2711,156 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] -name = "wasm-bindgen-test" -version = "0.3.37" +name = "wasm-timer" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "console_error_panic_hook", + "futures", "js-sys", - "scoped-tls", + "parking_lot", + "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-bindgen-test-macro", + "web-sys", ] [[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.37" +name = "wayland-backend" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.0", + "nix 0.26.4", + "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.4.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +dependencies = [ + "wayland-backend", + "wayland-sys", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" dependencies = [ "proc-macro2", + "quick-xml", "quote", ] +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.0", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "pkg-config", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -3459,30 +2872,10 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.25.2" +name = "weezl" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "wild" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" -dependencies = [ - "glob", -] +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "winapi" @@ -3502,9 +2895,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", ] @@ -3515,46 +2908,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[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-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.5", -] - -[[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", + "windows-targets", ] [[package]] @@ -3563,93 +2923,51 @@ 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", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -[[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.5" @@ -3658,39 +2976,208 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] [[package]] -name = "wsl" -version = "0.1.0" +name = "xcursor" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" dependencies = [ - "linked-hash-map", + "nom", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "xdg" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] -name = "yansi-term" -version = "0.1.2" +name = "xdg-home" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ + "nix 0.26.4", "winapi", ] + +[[package]] +name = "xdg-shell-wrapper" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper//?branch=feat-security-context#50a388c795e1fa06d80bb44166675a42fca05f07" +dependencies = [ + "anyhow", + "cosmic-client-toolkit", + "itertools", + "libc", + "once_cell", + "rand", + "ron", + "rustix 0.38.18", + "serde", + "shlex", + "smithay", + "smithay-client-toolkit", + "tempfile", + "tracing", + "wayland-backend", + "wayland-egl", + "wayland-protocols", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper//?branch=feat-security-context#50a388c795e1fa06d80bb44166675a42fca05f07" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix new file mode 100644 index 0000000000..7c8c31f511 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmic-panel/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, just +, pkg-config +, rust +, rustPlatform +, libglvnd +, libxkbcommon +, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-panel"; + version = "unstable-2023-11-13"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-panel"; + rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c"; + sha256 = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cosmic-client-toolkit-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "cosmic-config-0.1.0" = "sha256-eynEjV7eTRoOUA1v4Ac0FP2h9KQtIDx32WkY0hR4xig="; + "cosmic-notifications-util-0.1.0" = "sha256-F1+Y74JdpehRPTANzERwNVE6Q6n5f5HAFtawLQVMFrA="; + "launch-pad-0.1.0" = "sha256-tnbSJ/GP9GTnLnikJmvb9XrJSgnUnWjadABHF43L1zc="; + "smithay-0.3.0" = "sha256-OI+wtDeJ/2bJyiTxL+F53j1CWnZ0aH7XjUmM6oN45Ow="; + "smithay-client-toolkit-0.18.0" = "sha256-GhCZ7Eb6q7SwA+NeHSiHwx/Fnrw3R6Zm5N2meMOJ2/4="; + "xdg-shell-wrapper-0.1.0" = "sha256-8+RXbYiYeoIGUOsJ7yCc2iYtIGKIwDCzSdq9ISuWxIE="; + }; + }; + + nativeBuildInputs = [ just pkg-config ]; + buildInputs = [ libglvnd libxkbcommon wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "bin-src" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" + ]; + + # Force linking to libEGL, which is always dlopen()ed. + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-panel"; + description = "Panel for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/cosmocc.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/cosmocc.nix new file mode 100644 index 0000000000..fb3ca66025 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/cosmocc.nix @@ -0,0 +1,25 @@ +{ runCommand, cosmopolitan }: + +let + cosmocc = runCommand "cosmocc-${cosmopolitan.version}" + { + pname = "cosmocc"; + inherit (cosmopolitan) version; + + passthru.tests = { + cc = runCommand "c-test" { } '' + ${cosmocc}/bin/cosmocc ${./hello.c} + ./a.out > $out + ''; + }; + + meta = cosmopolitan.meta // { + description = "compilers for Cosmopolitan C/C++ programs"; + }; + } '' + mkdir -p $out/bin + install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin + sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* + ''; +in +cosmocc diff --git a/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/fix-paths.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/fix-paths.patch rename to third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/fix-paths.patch diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/hello.c b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/hello.c new file mode 100644 index 0000000000..f8edd23561 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/hello.c @@ -0,0 +1,6 @@ +#include + +int main() { + printf("Hello world!\n"); + return 0; +} diff --git a/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/package.nix new file mode 100644 index 0000000000..defc3efb8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cosmopolitan/package.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchFromGitHub +, bintools-unwrapped +, callPackage +, coreutils +, substituteAll +, unzip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cosmopolitan"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "jart"; + repo = "cosmopolitan"; + rev = finalAttrs.version; + hash = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; + }; + + patches = [ + # make sure tests set PATH correctly + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils; + }) + ]; + + nativeBuildInputs = [ + bintools-unwrapped + unzip + ]; + + strictDeps = true; + + outputs = [ "out" "dist" ]; + + # slashes are significant because upstream uses o/$(MODE)/foo.o + buildFlags = [ + "o/cosmopolitan.h" + "o//cosmopolitan.a" + "o//libc/crt/crt.o" + "o//ape/ape.o" + "o//ape/ape.lds" + ]; + + checkTarget = "o//test"; + + enableParallelBuilding = true; + + doCheck = true; + dontConfigure = true; + dontFixup = true; + + preCheck = let + failingTests = [ + # some syscall tests fail because we're in a sandbox + "test/libc/calls/sched_setscheduler_test.c" + "test/libc/thread/pthread_create_test.c" + "test/libc/calls/getgroups_test.c" + # fails + "test/libc/stdio/posix_spawn_test.c" + ]; + in lib.concatStringsSep ";\n" (map (t: "rm -v ${t}") failingTests); + + installPhase = '' + runHook preInstall + + mkdir -p $out/{include,lib} + install o/cosmopolitan.h $out/include + install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib + cp -RT . "$dist" + + runHook postInstall + ''; + + passthru = { + cosmocc = callPackage ./cosmocc.nix { + cosmopolitan = finalAttrs.finalPackage; + }; + }; + + meta = { + homepage = "https://justine.lol/cosmopolitan/"; + description = "Your build-once run-anywhere c library"; + license = lib.licenses.isc; + maintainers = lib.teams.cosmopolitan.members; + platforms = lib.platforms.x86_64; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix b/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix new file mode 100644 index 0000000000..e4e346f8c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/co/cowsql/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libuv +, raft-cowsql +, sqlite +, incus +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cowsql"; + version = "1.15.4"; + + src = fetchFromGitHub { + owner = "cowsql"; + repo = "cowsql"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JbLiwWXOrEhqCdM8tWwxl68O5Sga4T7NYCXzqP9+Dh0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libuv + raft-cowsql.dev + sqlite + ]; + + enableParallelBuilding = true; + + doCheck = true; + + outputs = [ "dev" "out" ]; + + passthru = { + inherit (incus) tests; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + meta = with lib; { + changelog = "https://github.com/cowsql/cowsql/releases/tag/${version}"; + description = "Embeddable, replicated and fault tolerant SQL engine"; + homepage = "https://github.com/cowsql/cowsql"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ adamcstephens ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix rename to third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix index d6e3bb28e1..e287d379fe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/cp/cpu-x/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.5.3"; + version = "5.0.1"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-o48NkOPabfnwsu+nyXJOstW6g0JSUgIrEFx1nNCR7XE="; + sha256 = "sha256-g3k9P7EevVeDHvnc1dG8cI4C7xhjrDy7gwdoWj6G6zA="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix index 16ee303ab3..7ce48825da 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix @@ -28,6 +28,6 @@ buildNpmPackage rec { homepage = "https://github.com/facebook/create-react-app"; license = lib.licenses.mit; mainProgram = "create-react-app"; - maintainers = with lib.maintainers; [ ma27 ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix new file mode 100644 index 0000000000..5c11cab2f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cr/cryptor/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeBinaryWrapper +, meson +, ninja +, pkg-config +, vala +, wrapGAppsHook +, gocryptfs +, gtk3 +, json-glib +, libgee +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cryptor"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "moson-mo"; + repo = "cryptor"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bgOOueOKSc6dLyxGU+ds9XYWM5mO+qCKC4dkCu2B1sQ="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + json-glib + libgee + ]; + + postInstall = '' + wrapProgram $out/bin/cryptor \ + --prefix PATH : "${lib.makeBinPath [ gocryptfs ]}" + ''; + + meta = { + description = "Simple gocryptfs GUI"; + homepage = "https://github.com/moson-mo/cryptor"; + license = lib.licenses.bsd3; + mainProgram = "cryptor"; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix b/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix new file mode 100644 index 0000000000..3e32c22d2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cy/cyme/package.nix @@ -0,0 +1,53 @@ +{ + lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, stdenv +, darwin +, libusb1 +, udev +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "cyme"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "tuna-f1sh"; + repo = "cyme"; + rev = "v${version}"; + hash = "sha256-UXh97pHJ9wa/xSslHLB7WVDwLKJYvLPgmPX8RvKrsTI="; + }; + + cargoHash = "sha256-hSd53K50Y4K/fYGfsT2fHUaipVSpeYN6/EOFlv4ocuE="; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + darwin.DarwinTools + ]; + + buildInputs = [ + libusb1 + ] ++ lib.optionals stdenv.isLinux [ + udev + ]; + + checkFlags = lib.optionals stdenv.isDarwin [ + # system_profiler is not available in the sandbox + "--skip=test_run" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/tuna-f1sh/cyme"; + description = "A modern cross-platform lsusb"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; + mainProgram = "cyme"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/dark-mode-notify/default.nix b/third_party/nixpkgs/pkgs/by-name/da/dark-mode-notify/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/os-specific/darwin/dark-mode-notify/default.nix rename to third_party/nixpkgs/pkgs/by-name/da/dark-mode-notify/package.nix index 31d1a2c8d8..777400e805 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/dark-mode-notify/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/da/dark-mode-notify/package.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation (final: { platforms = [ "aarch64-darwin" ]; license = lib.licenses.mit; maintainers = with lib.maintainers; [ YorikSar ]; + mainProgram = "dark-mode-notify"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/db/dbus-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbus-cpp/package.nix new file mode 100644 index 0000000000..2e834111c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/db/dbus-cpp/package.nix @@ -0,0 +1,127 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, dbus +, doxygen +, graphviz +, gtest +, libxml2 +, lomiri +, pkg-config +, process-cpp +, properties-cpp +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dbus-cpp"; + version = "5.0.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lib-cpp/dbus-cpp"; + rev = finalAttrs.version; + hash = "sha256-t8SzPRUuKeEchT8vAsITf8MwbgHA+mR5C9CnkdVyX7s="; + }; + + outputs = [ + "out" + "dev" + "doc" + "examples" + ]; + + patches = [ + # Handle already-stolen dbus call better + # Remove when version > 5.0.3 + (fetchpatch { + name = "0001-dbus-cpp-src-Dont-steal-a-pending-dbus-call-more-then-once.patch"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/9f3d1ff2b1c6c732285949c3dbb35e40cf55ea92.patch"; + hash = "sha256-xzOCIJVsK2J+X9RsV930R9uw6h4UxqwSaNOgv8v4qQU="; + }) + + # Fix GCC13 compilation + # Remove when version > 5.0.3 + (fetchpatch { + name = "0002-dbus-cpp-Add-missing-headers-for-GCC13.patch"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/c761b1eec084962dbe64d35d7f7b86dcbe57a3f7.patch"; + hash = "sha256-/tKe3iHWxP9jWtpdgwwRynj8565u9LxCt4WXJDXzgX4="; + }) + ]; + + postPatch = '' + substituteInPlace doc/CMakeLists.txt \ + --replace 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' + + # Warning on aarch64-linux breaks build due to -Werror + substituteInPlace CMakeLists.txt \ + --replace '-Werror' "" + + # pkg-config output patching hook expects prefix variable here + substituteInPlace data/dbus-cpp.pc.in \ + --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + '' + lib.optionalString (!finalAttrs.doCheck) '' + sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + buildInputs = [ + boost + lomiri.cmake-extras + dbus + libxml2 + process-cpp + properties-cpp + ]; + + nativeCheckInputs = [ + dbus + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DDBUS_CPP_ENABLE_DOC_GENERATION=ON" + ]; + + # Too flaky on ARM CI & for some amd64 users + doCheck = false; + + # DBus, parallelism messes with communication + enableParallelChecking = false; + + preFixup = '' + moveToOutput libexec/examples $examples + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "A dbus-binding leveraging C++-11"; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "dbus-cppc"; + platforms = platforms.linux; + pkgConfigModules = [ + "dbus-cpp" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/de/debianutils/package.nix b/third_party/nixpkgs/pkgs/by-name/de/debianutils/package.nix index 97623aaeef..4d20c77dd5 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/debianutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.13"; + version = "5.14"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-h6swRil0sldRaZT7/LMEmV6Ah3zoppiHeGO3xTJlrac="; + hash = "sha256-gbqtBFWq6KtmGLvGkmhpSHkpoDglfAT1KjDoZ4Y0SbI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix b/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix new file mode 100644 index 0000000000..9e9be57ec2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_image +, unixtools +, multimarkdown +}: + +stdenv.mkDerivation rec { + pname = "decker"; + version = "1.32"; + + src = fetchFromGitHub { + owner = "JohnEarnest"; + repo = "Decker"; + rev = "v${version}"; + hash = "sha256-ch/Lit9qA6XEkPJdcQ03+r0asOKMwy0jRJMHG9VMEig="; + }; + + buildInputs = [ + SDL2 + SDL2_image + multimarkdown + unixtools.xxd + ]; + + doCheck = true; + + postPatch = '' + patchShebangs ./scripts + ''; + + buildPhase = '' + runHook preBuild + make lilt + make decker + make docs + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm0755 ./c/build/lilt -t $out/bin + install -Dm0755 ./c/build/decker -t $out/bin + install -Dm0644 ./syntax/vim/ftdetect/lil.vim -t $out/share/vim-plugins/decker/ftdetect + install -Dm0644 ./syntax/vim/syntax/lil.vim -t $out/share/vim-plugins/decker/syntax + + # Fixing the permissions of the installed files on the documentation. + chmod a-x ./docs/images/* \ + ./docs/*.md \ + ./examples/decks/*.deck \ + ./examples/lilt/*.lil + + # This example has a shebang so we'll leave it as an executable. + chmod a+x ./examples/lilt/podcasts.lil + + mkdir -p $out/share/doc/decker + cp -r ./docs/*.html ./docs/images ./examples $out/share/doc/decker + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://beyondloom.com/decker"; + description = "Multimedia platform for creating and sharing interactive documents"; + license = licenses.mit; + mainProgram = "decker"; + platforms = platforms.all; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/de/deltachat-repl/package.nix b/third_party/nixpkgs/pkgs/by-name/de/deltachat-repl/package.nix new file mode 100644 index 0000000000..3de470c085 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/de/deltachat-repl/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, libdeltachat +, perl +, pkg-config +}: + +rustPlatform.buildRustPackage { + pname = "deltachat-repl"; + + inherit (libdeltachat) version src cargoLock buildInputs; + + nativeBuildInputs = [ + perl + pkg-config + ]; + + cargoBuildFlags = [ "--package" "deltachat-repl" ]; + + doCheck = false; + + meta = libdeltachat.meta // { + description = "Delta Chat CLI client"; + mainProgram = "deltachat-repl"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix rename to third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix index fc494445e8..23f75bb1c9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dialog/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/dialog/package.nix @@ -3,23 +3,24 @@ , fetchurl , libtool , ncurses -, enableShared ? !stdenv.isDarwin +, enableShared ? !stdenv.isDarwin && !stdenv.hostPlatform.isStatic , unicodeSupport ? true -, withLibrary ? false +, withLibrary ? true }: assert unicodeSupport -> ncurses.unicodeSupport; - stdenv.mkDerivation (finalAttrs: { pname = "dialog"; - version = "1.3-20230209"; + version = "1.3-20231002"; src = fetchurl { url = "https://invisible-island.net/archives/dialog/dialog-${finalAttrs.version}.tgz"; - hash = "sha256-DCYoIwUmS+IhfzNfN5j0ix3OPPEsWgdr8jHK33em1qg="; + hash = "sha256-MVZAqwcZIl1cvKsTBYXAXweR/PBzBypf6UeZaaorgzs="; }; - nativeBuildInputs = lib.optional withLibrary libtool; + nativeBuildInputs = lib.optionals withLibrary [ + libtool + ]; buildInputs = [ ncurses @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; license = lib.licenses.lgpl21Plus; + mainProgram = "dialog"; maintainers = with lib.maintainers; [ AndersonTorres spacefrogg ]; inherit (ncurses.meta) platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix b/third_party/nixpkgs/pkgs/by-name/di/diesel-cli-ext/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix rename to third_party/nixpkgs/pkgs/by-name/di/diesel-cli-ext/package.nix index 3e78409039..7b118b3ce7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/diesel-cli-ext/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/di/diesel-cli-ext/package.nix @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { description = "Provides different tools for projects using the diesel_cli"; homepage = "https://crates.io/crates/diesel_cli_ext"; license = with licenses; [ asl20 mit ]; + mainProgram = "diesel_ext"; maintainers = with maintainers; [ siph ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix new file mode 100644 index 0000000000..9bc24e5315 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/di/disarchive/package.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchurl +, guile +, autoreconfHook +, guile-gcrypt +, guile-lzma +, guile-quickcheck +, makeWrapper +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "disarchive"; + version = "0.5.0"; + + src = fetchurl { + url = "https://files.ngyro.com/disarchive/disarchive-${version}.tar.gz"; + hash = "sha256-Agt7v5HTpaskXuYmMdGDRIolaqCHUpwd/CfbZCe9Ups="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + guile-gcrypt + guile-lzma + makeWrapper + pkg-config + ]; + + buildInputs = [ + guile + zlib + ]; + + propagatedBuildInputs = [ + guile-gcrypt + guile-lzma + ]; + + doCheck = !stdenv.isDarwin; + + nativeCheckInputs = [ + guile-quickcheck + ]; + + postInstall = '' + wrapProgram $out/bin/disarchive \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" + ''; + + meta = with lib; { + description = "Disassemble software into data and metadata"; + homepage = "https://ngyro.com/software/disarchive.html"; + license = licenses.gpl3Plus; + mainProgram = "disarchive"; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/doggo/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doggo/package.nix similarity index 67% rename from third_party/nixpkgs/pkgs/tools/networking/doggo/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/doggo/package.nix index ebebb1fcca..cdd19bc37b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/doggo/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/doggo/package.nix @@ -1,31 +1,21 @@ -{ lib -, buildGoModule +{ buildGoModule , fetchFromGitHub , installShellFiles -, fetchpatch +, lib }: buildGoModule rec { pname = "doggo"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "mr-karan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qc6RYz2bVaY/IBGIXUYO6wyh7iUDAJ1ASCK0dFwZo6s="; + hash = "sha256-hzl7BE3vsE2G9O2nwN/gkqQTJ+9aDfNIjmpmgN1AYq8="; }; - patches = [ - # go 1.20 support - # https://github.com/mr-karan/doggo/pull/66 - (fetchpatch { - url = "https://github.com/mr-karan/doggo/commit/7db5c2144fa4a3f18afe1c724b9367b03f84aed7.patch"; - hash = "sha256-cx8s23e02zIvJOtuqTz8XC9ApYODh96Ubl1KhsFUZ9g="; - }) - ]; - - vendorHash = "sha256-GVLfPK1DFVSfNSdIxYSaspHFphd8ft2HUK0SMeWiVUg="; + vendorHash = "sha256-uonybBLABPj9CPtc+y82ajvQI7kubK+lKi4eLcZIUqA="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix b/third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/dosbox-staging/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/do/dotbot/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotbot/package.nix new file mode 100644 index 0000000000..a2b979f671 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/do/dotbot/package.nix @@ -0,0 +1,43 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "dotbot"; + version = "1.20.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anishathalye"; + repo = "dotbot"; + rev = "v${version}"; + hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE="; + }; + + preCheck = '' + patchShebangs bin/dotbot + ''; + + nativeBuildInputs = with python3Packages; [ setuptools ]; + + propagatedBuildInputs = with python3Packages; [ pyyaml ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + meta = with lib; { + description = "A tool that bootstraps your dotfiles"; + longDescription = '' + Dotbot is designed to be lightweight and self-contained, with no external + dependencies and no installation required. Dotbot can also be a drop-in + replacement for any other tool you were using to manage your dotfiles, and + Dotbot is VCS-agnostic -- it doesn't make any attempt to manage your + dotfiles. + ''; + homepage = "https://github.com/anishathalye/dotbot"; + changelog = + "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ludat ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix rename to third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix index a7aafbbf3d..6135efc73c 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-hRBF0Xl1SSoW+vbp9c1iCuFBVIzLtueNJaqoFMF8lJ4="; + hash = "sha256-RKAIZNty+iXeMfsjDOlOyvngx4XU5CSEi0Wap21lFAI="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libqt5pas ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}"; + env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}"; postPatch = '' patchShebangs build.sh install/linux/install.sh @@ -63,12 +63,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://doublecmd.sourceforge.io/"; description = "Two-panel graphical file manager written in Pascal"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + license = lib.licenses.gpl2Plus; + mainProgram = "doublecmd"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; }) # TODO: deal with other platforms too diff --git a/third_party/nixpkgs/pkgs/by-name/dt/dtcmp/package.nix b/third_party/nixpkgs/pkgs/by-name/dt/dtcmp/package.nix new file mode 100644 index 0000000000..cd8f54e25d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/dt/dtcmp/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mpi, lwgrp }: + +stdenv.mkDerivation rec { + pname = "dtcmp"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "dtcmp"; + rev = "v${version}"; + hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ lwgrp ]; + + configureFlags = [ "--with-lwgrp=${lib.getDev lwgrp}" ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "MPI datatype comparison library"; + homepage = "https://github.com/LLNL/dtcmp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/dv/dvb-apps/package.nix b/third_party/nixpkgs/pkgs/by-name/dv/dvb-apps/package.nix new file mode 100644 index 0000000000..ad28bcd0ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/dv/dvb-apps/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, perl +, fetchpatch +}: +stdenv.mkDerivation { + pname = "dvb-apps"; + version = "1.1.1-unstable-2014-03-21"; + + src = fetchurl { + url = "https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2"; + hash = "sha256-854vDr7X4yvOg1IgYq1NQU9n/M1d8bZHYYUkSX4V4Fc="; + }; + + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-zSbbKSJgW4L983DR0GVXtgAHK6ILOQC3Gz2iGnmWOp8="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-GZunNYlhktalPOZ4ZST1MwooBvdDGA6ckscx/7mx8ok="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-+j+tP8O3mho+gcsDPzQUJaE39ZAgimMAJoRP1J1HrBk="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-jrRE1yySLbQWbF+SaugFN8VuEIfveSvjR0nKpmKffpQ="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-zIROx0HEvtZqvNBLlKp3aI3S2CihuS6l/OWf6WFFCrY="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-dLPlscdDOd7Kq+2sEhgJ/PBY1zN/0/fh3TU6JOELaYw="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch?id=ec6d38022bd905cb5460d4812e52434fd1f9663c"; + hash = "sha256-034TYxH1qHcdkwVxuAcNHORfBWhw/k8P+11QAc3jp74="; + }) + (fetchpatch { + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=779520;filename=bug779520.patch;msg=17"; + hash = "sha256-UL5lKDfloXvngsabnslpVXbe/dmt4dzVK5W8JkIieps="; + }) + ]; + + buildInputs = [ perl ]; + + installFlags = [ "prefix=$(out)" ]; + + dontConfigure = true; # skip configure + + meta = { + description = "Linux DVB API applications and utilities"; + homepage = "https://linuxtv.org/"; + maintainers = with lib.maintainers; [ volfyd ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ec/ecc/package.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecc/package.nix index 733e7a1f3c..b79fa4bd18 100644 --- a/third_party/nixpkgs/pkgs/by-name/ec/ecc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ec/ecc/package.nix @@ -53,18 +53,18 @@ let in rustPlatform.buildRustPackage rec { pname = "ecc"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "eunomia-bpf"; repo = "eunomia-bpf"; rev = "v${version}"; - hash = "sha256-UiwS+osyC3gtbQH0bWNsx1p3xYr993/FAZ5d5NKnaBM="; + hash = "sha256-EK/SZ9LNAk88JpHJEoxw12NHje6QdCqO/vT2TfkWlb0="; }; sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-j2HPSmU/JARfw2mE1IiXFT/dcdxxnp+agC2DN0Kc5nw="; + cargoHash = "sha256-ymBEzFsMTxKSdJRYoDY3AC0QpgtcMlU0fQV03emCxQc="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix new file mode 100644 index 0000000000..16a8cd98f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, python3Packages # for tests +, openssl # for tests +, enableManpages ? true +, docutils # for manpages +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eiwd"; + version = "2.8-1"; + + src = fetchFromGitHub { + owner = "illiliti"; + repo = "eiwd"; + rev = finalAttrs.version; + hash = "sha256-SD/RJFuGBwFT4G73f93VrWO/6mGKQxjVhmNrpKRA/WY="; + fetchSubmodules = true; + }; + + outputs = [ + "out" "doc" + ] ++ lib.optionals enableManpages [ + "man" + ] ++ lib.optionals finalAttrs.doCheck [ + "test" + ]; + + postUnpack = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ] ++ lib.optionals enableManpages [ + docutils # only for the man pages + ]; + + checkInputs = [ + python3Packages.python + (lib.getBin openssl) + ]; + + configureFlags = [ + "--disable-dbus" + ] ++ lib.optionals (!enableManpages) [ + "--disable-manual-pages" + ]; + + enableParallelBuilding = true; + + # override this to false if you don't want to build python3 + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + # prevent the `install-data-local` Makefile rule from running; + # all it does is attempt to `mkdir` the `localstatedir`. + preInstall = '' + mkdir install-data-local + substituteInPlace Makefile --replace \ + '$(MKDIR_P) -m 700 $(DESTDIR)$(daemon_storagedir)' \ + 'true' + ''; + + postInstall = '' + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd + '' + lib.optionalString finalAttrs.doCheck '' + mkdir -p $test/bin + cp -a test/* $test/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/illiliti/eiwd/"; + description = "Fork of iwd (wifi daemon) which does not require dbus"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix index 91f98463a8..a670490ef0 100644 --- a/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.161.0"; + version = "0.163.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-hlHwzZ0U3G6IGJjeHZPlO2+thJ1UKxHhRb28EQ39pZk="; + hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk="; }; - vendorHash = "sha256-9rT2zkgwxDQlxTWF1zHpYOOI7uK5Q/GYFWIrKgP2GaQ="; + vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; doCheck = false; 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 04f68bbd9f..96098d190b 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.14.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-6Hb+Zt9brnmxVXVUPhJa6yh8fccrD56UXoCw/wZGowI="; + hash = "sha256-q72IIKUWZBroDcxMEa1ppTPda9lg/KtEpCNOqlg9ZhU="; }; - cargoHash = "sha256-01LuDse7bbq8jT7q8P9ncyQUqCAXR9pK6GmsaDUNYck="; + cargoHash = "sha256-UBayjaQX+bRkciookfQYUrCCewMXlIL3Z1I2ZJIbX6o="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fantomas/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fantomas/package.nix new file mode 100644 index 0000000000..8461ab3c29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fa/fantomas/package.nix @@ -0,0 +1,17 @@ +{ buildDotnetGlobalTool, lib }: + +buildDotnetGlobalTool { + pname = "fantomas"; + version = "6.2.3"; + + nugetSha256 = "sha256-Aol10o5Q7l8s6SdX0smVdi3ec2IgAx+gMksAMjXhIfU="; + + meta = with lib; { + description = "F# source code formatter"; + homepage = "https://github.com/fsprojects/fantomas"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "fantomas"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-material-color/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-material-color/package.nix new file mode 100644 index 0000000000..0385c33e70 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-material-color/package.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-material-color"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "hosxy"; + repo = "Fcitx5-Material-Color"; + rev = finalAttrs.version; + hash = "sha256-i9JHIJ+cHLTBZUNzj9Ujl3LIdkCllTWpO1Ta4OT1LTc="; + }; + + installPhase = '' + runHook preInstall + + # https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-material-color/-/blob/main/PKGBUILD?ref_type=heads#L16 + install -Dm644 arrow.png radio.png -t $out/share/${finalAttrs.pname}/ + for _variant in black blue brown deepPurple indigo orange pink red sakuraPink teal; do + _variant_name=Material-Color-$_variant + install -dm755 $_variant_name $out/share/fcitx5/themes/$_variant_name + ln -sv ../../../$pname/arrow.png $out/share/fcitx5/themes/$_variant_name/ + ln -sv ../../../$pname/radio.png $out/share/fcitx5/themes/$_variant_name/ + install -Dm644 theme-$_variant.conf $out/share/fcitx5/themes/$_variant_name/theme.conf + sed -i "s/^Name=.*/Name=$_variant_name/" $out/share/fcitx5/themes/$_variant_name/theme.conf + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Fcitx5 themes based on Material color"; + homepage = "https://github.com/hosxy/Fcitx5-Material-Color"; + license = licenses.asl20; + maintainers = with maintainers; [ Cryolitia h7x4 ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-nord/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-nord/package.nix new file mode 100644 index 0000000000..6ab7fc15f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-nord/package.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation { + pname = "fcitx5-nord"; + version = "unstable-2021-07-27"; + + src = fetchFromGitHub { + owner = "tonyfettes"; + repo = "fcitx5-nord"; + rev = "bdaa8fb723b8d0b22f237c9a60195c5f9c9d74d1"; + hash = "sha256-qVo/0ivZ5gfUP17G29CAW0MrRFUO0KN1ADl1I/rvchE="; + }; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/fcitx5/themes/ + cp -rv Nord* $out/share/fcitx5/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Fcitx5 theme based on Nord color"; + homepage = "https://github.com/tonyfettes/fcitx5-nord"; + license = licenses.mit; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fi/firewalk/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/firewalk/package.nix new file mode 100644 index 0000000000..8909a61062 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fi/firewalk/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchurl +, libnet +, libpcap +, libdnet +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "firewalk"; + version = "5.0"; + + src = fetchurl { + url = "https://salsa.debian.org/pkg-security-team/firewalk/-/archive/upstream/${finalAttrs.version}/firewalk-upstream-${finalAttrs.version}.tar.gz"; + hash = "sha256-f0sHzcH3faeg7epfpWXbgaHrRWaWBKMEqLdy38+svGo="; + }; + + buildInputs = [ libnet libpcap libdnet ]; + + meta = with lib; { + description = "Gateway ACL scanner"; + homepage = "http://packetfactory.openwall.net/projects/firewalk/"; + license = licenses.bsd2; + maintainers = with maintainers; [ tochiaha ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/fl/flip/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flip/package.nix new file mode 100644 index 0000000000..f7957c0990 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fl/flip/package.nix @@ -0,0 +1,32 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake +}: + +stdenv.mkDerivation { + pname = "flip"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "NVlabs"; + repo = "flip"; + rev = "8303adb2060d69423d040453995f4ad1a030a1cc"; + hash = "sha256-jSB79qOtnW/cjApIDcLRqGabnzCIwS7saA+aF1TcyV0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A tool for visualizing and communicating the errors in rendered images."; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ zmitchell ]; + mainProgram = "flip"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/radio/fm-tune/default.nix b/third_party/nixpkgs/pkgs/by-name/fm/fm-tune/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/radio/fm-tune/default.nix rename to third_party/nixpkgs/pkgs/by-name/fm/fm-tune/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix b/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix new file mode 100644 index 0000000000..1378e40f52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fo/fortune-kind/package.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, libiconv +, makeBinaryWrapper +, installShellFiles +, fortuneAlias ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "fortune-kind"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "cafkafk"; + repo = "fortune-kind"; + rev = "v${version}"; + hash = "sha256-93BEy9FX3bZTYNewotBv1ejmMSnSdu9XnC4TgIvcYG0="; + }; + + cargoHash = "sha256-xm6BOYnxUoCRuMAAFyWRcKEcqrs5FmnOgIO/Gj1bCoI="; + + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + + buildNoDefaultFeatures = true; + + MAN_OUT = "./man"; + + preBuild = '' + mkdir -p "./$MAN_OUT"; + ''; + + preInstall = '' + installManPage man/fortune-kind.1 + installShellCompletion \ + --fish man/fortune-kind.fish \ + --bash man/fortune-kind.bash \ + --zsh man/_fortune-kind + mkdir -p $out + cp -r $src/fortunes $out/fortunes; + ''; + + postInstall = '' + wrapProgram $out/bin/fortune-kind \ + --prefix FORTUNE_DIR : "$out/fortunes" + ''+ lib.optionalString fortuneAlias '' + ln -s fortune-kind $out/bin/fortune + ''; + + meta = with lib; { + description = "A kinder, curated fortune, written in rust"; + longDescription = '' + Historically, contributions to fortune-mod have had a less-than ideal + quality control process, and as such, many of the fortunes that a user may + receive from the program read more like cryptic inside jokes, or at the + very worst, locker-room banter. One of the major goals of fortune-kind is + defining and applying a somewhat more rigorous moderation and editing + process to the fortune adoption workflow. + ''; + homepage = "https://github.com/cafkafk/fortune-kind"; + changelog = "https://github.com/cafkafk/fortune-kind/releases/tag/v${version}"; + license = licenses.gpl3Only; + mainProgram = "fortune-kind"; + maintainers = with maintainers; [ cafkafk ]; + platforms = platforms.unix ++ platforms.windows; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/Cargo.lock new file mode 100644 index 0000000000..f887187a7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/Cargo.lock @@ -0,0 +1,1312 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[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_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "built" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +dependencies = [ + "cargo-lock", + "chrono", + "git2", +] + +[[package]] +name = "bumpalo" +version = "3.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" + +[[package]] +name = "cargo-lock" +version = "8.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +dependencies = [ + "semver", + "serde", + "toml", + "url", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[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-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap", + "log", +] + +[[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", + "quote", + "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 = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +dependencies = [ + "core-foundation-sys 0.6.2", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.13", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.107", +] + +[[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.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[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 = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "framework_lib" +version = "0.1.0" +dependencies = [ + "built", + "clap", + "clap-verbosity-flag", + "env_logger", + "guid_macros", + "hidapi", + "lazy_static", + "libc", + "log", + "nix", + "no-std-compat", + "num", + "num-derive", + "num-traits", + "plain", + "redox_hwio", + "regex", + "rusb", + "smbios-lib", + "spin 0.9.4", + "uefi", + "uefi-services", + "windows 0.42.0", +] + +[[package]] +name = "framework_tool" +version = "0.1.0" +dependencies = [ + "framework_lib", +] + +[[package]] +name = "framework_uefi" +version = "0.1.0" +dependencies = [ + "framework_lib", + "log", + "uefi", + "uefi-services", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "git2" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "guid_macros" +version = "0.11.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[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.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hidapi" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a090a12b53564bcb2f6053b8be08d5f9e7b91f26953d6e8e08c9affd8aeb4ec9" +dependencies = [ + "cc", + "libc", + "pkg-config", + "winapi", +] + +[[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.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys 0.8.4", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[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 = "io-kit-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" +dependencies = [ + "core-foundation-sys 0.6.2", + "mach 0.2.3", +] + +[[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 = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "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 = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libgit2-sys" +version = "0.14.2+1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libusb1-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "libc", + "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", +] + +[[package]] +name = "mach" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +dependencies = [ + "libc", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[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 = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.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", + "quote", + "version_check", +] + +[[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 = "ptr_meta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_hwio" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74" + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rusb" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" +dependencies = [ + "libc", + "libusb1-sys", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +dependencies = [ + "proc-macro2", + "quote", + "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 = "smbios-lib" +version = "0.9.1" +source = "git+https://github.com/FrameworkComputer/smbios-lib.git?branch=no-std#b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c" +dependencies = [ + "core-foundation", + "core-foundation-sys 0.6.2", + "getopts", + "io-kit-sys", + "libc", + "mach 0.3.2", + "no-std-compat", + "serde", + "serde_json", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[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.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "ucs2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad643914094137d475641b6bab89462505316ec2ce70907ad20102d28a79ab8" +dependencies = [ + "bit_field", +] + +[[package]] +name = "uefi" +version = "0.20.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "bitflags", + "derive_more", + "log", + "ptr_meta", + "ucs2", + "uefi-macros", +] + +[[package]] +name = "uefi-macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0caeb0e7b31b9f1f347e541106be10aa8c66c76fa722a3298a4cd21433fabd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "uefi-services" +version = "0.17.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "cfg-if", + "log", + "uefi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.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 = "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 = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[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" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5" +dependencies = [ + "windows_aarch64_gnullvm 0.42.0", + "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 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[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.0", + "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 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/package.nix new file mode 100644 index 0000000000..d97b49fccf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fr/framework-tool/package.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "framework-tool"; + + # Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock, + # so use unstable for now + version = "unstable-2023-11-14"; + + src = fetchFromGitHub { + owner = "FrameworkComputer"; + repo = "framework-system"; + rev = "491a587342a5d79366a25d803b7065169314279c"; + hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "smbios-lib-0.9.1" = + "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo="; + "uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + meta = with lib; { + description = "Swiss army knife for Framework laptops"; + homepage = "https://github.com/FrameworkComputer/framework-system"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "framework_tool"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix new file mode 100644 index 0000000000..f3aeca9006 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/fr/freecell-solver/package.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, cmake +, cmocka +, gmp +, gperf +, libtap +, ninja +, perl +, pkg-config +, python3 +, rinutils +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "freecell-solver"; + version = "6.8.0"; + + src = fetchurl { + url = "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${finalAttrs.version}.tar.xz"; + hash = "sha256-lfeKSxXS+jQCcf5PzFNUBlloGRuiLbDUDoGykbjVPTI="; + }; + + outputs = [ "out" "dev" "doc" "man" ]; + + pythonPath = with python3.pkgs; [ + cffi + pysol-cards + random2 + six + ]; + + nativeBuildInputs = [ + cmake + cmocka + gperf + ninja + perl + pkg-config + python3 + ] + ++ (with perl.pkgs; TaskFreecellSolverTesting.buildInputs ++ [ + GamesSolitaireVerify + HTMLTemplate + Moo + PathTiny + StringShellQuote + TaskFreecellSolverTesting + TemplateToolkit + TextTemplate + ]) + ++ [ python3.pkgs.wrapPython ] + ++ finalAttrs.pythonPath; + + buildInputs = [ + gmp + libtap + rinutils + ]; + + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "FCS_WITH_TEST_SUITE" false) # needs freecell-solver + (lib.cmakeBool "BUILD_STATIC_LIBRARY" false) + ]; + + postFixup = '' + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + ''; + + meta = { + homepage = "https://fc-solve.shlomifish.org/"; + description = "A FreeCell automatic solver"; + longDescription = '' + FreeCell Solver is a program that automatically solves layouts of Freecell + and similar variants of Card Solitaire such as Eight Off, Forecell, and + Seahaven Towers, as well as Simple Simon boards. + ''; + license = lib.licenses.mit; + mainProgram = "fc-solve"; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gash-utils/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gash-utils/package.nix index eeaf2b02a4..bea8d6730e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ga/gash-utils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ga/gash-utils/package.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GUILE_LOAD_PATH : "${gash}/${guile.siteDir}" + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" done ''; diff --git a/third_party/nixpkgs/pkgs/by-name/ga/gato/package.nix b/third_party/nixpkgs/pkgs/by-name/ga/gato/package.nix new file mode 100644 index 0000000000..38297c71dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ga/gato/package.nix @@ -0,0 +1,54 @@ +{ lib +, python3 +, git +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gato"; + version = "1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "praetorian-inc"; + repo = "gato"; + rev = "refs/tags/${version}"; + hash = "sha256-M9ONeLjEKQD5Kys7OriM34dEBWDKW3qrBk9lu2TitGE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=gato" "" + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + cryptography + packaging + pyyaml + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ + git + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gato" + ]; + + meta = with lib; { + description = "GitHub Self-Hosted Runner Enumeration and Attack Tool"; + homepage = "https://github.com/praetorian-inc/gato"; + changelog = "https://github.com/praetorian-inc/gato/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "gato"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ge/geopard/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ge/geopard/Cargo.lock new file mode 100644 index 0000000000..42ebac5c5a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/geopard/Cargo.lock @@ -0,0 +1,1590 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +dependencies = [ + "async-lock", + "autocfg", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "windows-sys 0.42.0", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-native-tls" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" +dependencies = [ + "async-std", + "native-tls", + "thiserror", + "url", +] + +[[package]] +name = "async-net" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +dependencies = [ + "async-io", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" + +[[package]] +name = "async-trait" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "095183a3539c7c7649b2beb87c2d3f0591f3a7fed07761cc546d244e27e0238c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "cairo-rs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-expr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[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 = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "field-offset" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[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 = "futures" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" + +[[package]] +name = "futures-executor" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" + +[[package]] +name = "futures-task" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" + +[[package]] +name = "futures-util" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +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.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5042053ee765aeef08d9d7e3f0f1e36a4d37f1659b3f93ad3d6997515dbb64a" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f0fb00507af1e9299681dd09965f720e2b5ea95536d49a5681e8994ef10c7a" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gemini" +version = "0.1.0" +dependencies = [ + "async-native-tls", + "async-net", + "futures", + "log", + "once_cell", + "regex", + "thiserror", + "url", +] + +[[package]] +name = "geopard" +version = "1.4.0" +dependencies = [ + "anyhow", + "async-fs", + "async-native-tls", + "async-net", + "async-trait", + "env_logger", + "futures", + "gemini", + "gtk4", + "libadwaita", + "log", + "once_cell", + "serde", + "thiserror", + "toml", + "url", +] + +[[package]] +name = "gio" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65acfc24267314eee46f49e0a531e08fd6c3025040d1cfb4a7cd8e41c5e06116" +dependencies = [ + "bitflags", + "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.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d3076ecb86c8c3a672c9843d6232b3a344fb81d304d0ba1ac64b23343efa46" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78b6a0901e258cb03c761ca94c84d519427ede489cae12cd5ba0d7d584e69e9" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55e93d79ed130f0f0b58bc0aa29fb0e40c9dfd63997fec51f8adf780d1520bc4" +dependencies = [ + "anyhow", + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a0985cf568e18cf63b443c9a14f4bdaa947fed7437476000dba84926a20b25" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a0155d388840c77d61b033b66ef4f9bc7f4133d83df83572d6b4fb234a3be7d" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fa9cd285a72a95124b65c069a9cb1b8fb8e310be71783404c39fccf3bf7774c" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a445ae1e50cbf181a1d5c61b920a7e7e8657b96e0ecdbbf8911a86fad462a32" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f" +dependencies = [ + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "once_cell", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gtk4-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65463dc801460e498d5e7ffa6e9ae2cfbed7d05fabd1ca5a8d024adbc89eeda6" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[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.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 = "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", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +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 = "libadwaita" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +dependencies = [ + "bitflags", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "once_cell", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[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 = "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 = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "openssl" +version = "0.10.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "pango" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "243c048be90312220fb3bd578176eed8290568274a93c95040289d39349384bc" +dependencies = [ + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[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 = "polling" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +dependencies = [ + "autocfg", + "cfg-if", + "libc", + "log", + "wepoll-ffi", + "windows-sys 0.42.0", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[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-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "security-framework" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[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", + "quote", + "syn", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[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 = "system-deps" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "tempfile" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "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", + "quote", + "syn", +] + +[[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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775c11906edafc97bc378816b94585fbd9a054eabaf86fdd0ced94af449efab7" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[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 = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[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" +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.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "winnow" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95fb4ff192527911dd18eb138ac30908e7165b8944e528b6af93aa4c842d345" +dependencies = [ + "memchr", +] diff --git a/third_party/nixpkgs/pkgs/by-name/ge/geopard/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/geopard/package.nix new file mode 100644 index 0000000000..2ed0b1aacd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/geopard/package.nix @@ -0,0 +1,73 @@ +{ stdenv +, cargo +, rustc +, fetchFromGitHub +, glib +, gtk4 +, libadwaita +, rustPlatform +, openssl +, pkg-config +, lib +, wrapGAppsHook4 +, meson +, ninja +, gdk-pixbuf +, cmake +, desktop-file-utils +, gettext +, blueprint-compiler +, appstream-glib +}: + +stdenv.mkDerivation rec { + pname = "geopard"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "ranfdev"; + repo = pname; + rev = version; + hash = "sha256-elHxtFEGkdhEPHxuJtcMYwWnvo6vDaHiOyN51EOzym0="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ + openssl + gettext + glib # for glib-compile-schemas + meson + ninja + pkg-config + wrapGAppsHook4 + cmake + blueprint-compiler + desktop-file-utils + appstream-glib + blueprint-compiler + cargo + rustc + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + desktop-file-utils + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + ]; + + meta = with lib; { + homepage = "https://github.com/ranfdev/Geopard"; + description = "Colorful, adaptive gemini browser"; + maintainers = with maintainers; [ jfvillablanca ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "geopard"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/germinal/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/germinal/default.nix rename to third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix index aef24f675b..4d7409bf4a 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ge/germinal/package.nix @@ -1,29 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoreconfHook -, pkg-config , appstream-glib +, autoreconfHook , dbus , pango , pcre2 +, pkg-config , tmux , vte , wrapGAppsHook , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "germinal"; version = "26"; src = fetchFromGitHub { owner = "Keruspe"; repo = "Germinal"; - rev = "v${version}"; - sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + wrapGAppsHook + ]; + buildInputs = [ appstream-glib dbus @@ -48,11 +54,12 @@ stdenv.mkDerivation rec { passthru.tests.test = nixosTests.terminal-emulators.germinal; - meta = with lib; { + meta = { description = "A minimal terminal emulator"; homepage = "https://github.com/Keruspe/Germinal"; - license = with licenses; gpl3Plus; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + mainProgram = "germinal"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ge/gerrit-queue/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/gerrit-queue/package.nix new file mode 100644 index 0000000000..e9369e8f02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/gerrit-queue/package.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gerrit-queue"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "flokli"; + repo = "gerrit-queue"; + rev = "v${version}"; + hash = "sha256-JkAYqqet6y89RTBU9FuxkMwJiGM6opL0reXbojSal3Y="; + }; + vendorHash = "sha256-+Ig4D46NphzpWKXO23Haea9EqVtpda8v9zLPJkbe3bQ="; + + meta = with lib; { + description = "Merge bot for Gerrit"; + homepage = "https://github.com/flokli/gerrit-queue"; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ]; + mainProgram = "gerrit-queue"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ge/geticons/package.nix b/third_party/nixpkgs/pkgs/by-name/ge/geticons/package.nix new file mode 100644 index 0000000000..f3afda0f13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ge/geticons/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +, gitUpdater +}: + +rustPlatform.buildRustPackage rec { + pname = "geticons"; + version = "1.2.2"; + + src = fetchFromSourcehut { + owner = "~zethra"; + repo = pname; + rev = version; + hash = "sha256-HEnUfOLeRTi2dRRqjDPVwVVHo/GN9wE28x5qv3qOpCY="; + }; + + cargoHash = "sha256-Znwni7uMnG9cpZbztUMY1j73K+XrDLv5zyNEZDoxWg4="; + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "CLI utility to get icons for apps on your system or other generic icons by name"; + homepage = "https://git.sr.ht/~zethra/geticons"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ Madouura ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix new file mode 100644 index 0000000000..366796bd7c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/gickup/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "gickup"; + version = "0.10.22"; + + src = fetchFromGitHub { + owner = "cooperspencer"; + repo = "gickup"; + rev = "refs/tags/v${version}"; + hash = "sha256-pF8sckOSmih5rkDv7kvSL9gU4XwBrEIycjzEce01i64="; + }; + + vendorHash = "sha256-kEy6Per8YibUHRp7E4jzkOgATq3Ub5WCNIe0WiHo2Ro="; + + ldflags = ["-X main.version=${version}"]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to backup repositories"; + homepage = "https://github.com/cooperspencer/gickup"; + changelog = "https://github.com/cooperspencer/gickup/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ adamcstephens ]; + mainProgram = "gickup"; + license = lib.licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-get/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-get/package.nix new file mode 100644 index 0000000000..8cd852c5d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gi/git-get/package.nix @@ -0,0 +1,52 @@ +{ lib, fetchFromGitHub, git, buildGoModule }: + +let config-module = "git-get/pkg/cfg"; +in +buildGoModule rec { + pname = "git-get"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "grdl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-v98Ff7io7j1LLzciHNWJBU3LcdSr+lhwYrvON7QjyCI="; + # 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 = '' + git -C $out rev-parse HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git -C $out 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-C+XOjMDMFneKJNeBh0KWPx8yM7XiiIpTlc2daSfhZhY="; + + doCheck = false; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X ${config-module}.commit=$(cat COMMIT)" + ldflags+=" -X ${config-module}.date=$(cat SOURCE_DATE_EPOCH)" + ''; + + ldflags = [ + "-s" + "-w" + "-X ${config-module}.version=v${version}" + ]; + + preInstall = '' + mv "$GOPATH/bin/get" "$GOPATH/bin/git-get" + mv "$GOPATH/bin/list" "$GOPATH/bin/git-list" + ''; + + meta = with lib; { + description = "A better way to clone, organize and manage multiple git repositories"; + homepage = "https://github.com/grdl/git-get"; + license = licenses.mit; + maintainers = with maintainers; [ sumnerevans ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitmoji-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitmoji-cli/package.nix index a6f23e10bc..7787bd4ccf 100644 --- a/third_party/nixpkgs/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitmoji-cli"; - version = "8.5.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "carloscuesta"; repo = "gitmoji-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ="; + hash = "sha256-cIc0AaP1AwhoVJLnonC9qvDWNZW4L6/jsQ3Q6z5VXI0="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o="; + hash = "sha256-HXMRCTiUti/GZ1dzd+XbFOao3+QLC1t7H0TT9MS5lz4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix similarity index 97% rename from third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix rename to third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix index 59022bcca5..d505faa8f4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gm/gmic/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.2.6"; + version = "3.3.1"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-kaI5rcAz3Cw/xzWgJhMRu/cQwVrvLRAPiB5BhzPMOHY="; + hash = "sha256-HagGabJ1jkg5SkMlr0Y5rGFw64jPW8QLuR0I2idM1N0="; }; # TODO: build this from source diff --git a/third_party/nixpkgs/pkgs/servers/http/go-camo/default.nix b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/servers/http/go-camo/default.nix rename to third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix index a7761f341c..69dccb0031 100644 --- a/third_party/nixpkgs/pkgs/servers/http/go-camo/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-27kAVuFJaGKt7q9E2tchAD6kSukO4xkhU+1JTPfT3Qk="; + sha256 = "sha256-qELWl8kWQzgwQ8Mwp7MAxlYhHV6Us3kTuMjKVwJjZFs="; }; - vendorHash = "sha256-LVQnQ8Tpkzpc6aUsUgwz2xTttccHynJPsQKvWGiRAIU="; + vendorHash = "sha256-PF7WqA3hdV+eFu++eoCo1m2m4o92vUtArH0uS+rjxGU="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix b/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix new file mode 100644 index 0000000000..aab0ab3d63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/go/go-judge/package.nix @@ -0,0 +1,36 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-judge"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "criyle"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iKSOD/jh7NgGUNeQxFqlZDcctUXBDC1Tjxsm0Q2iZ3I="; + }; + + vendorHash = "sha256-GVsRflqqt+PwVGWaNGMH4prKQ5pWqPRlsTBJZtC+7zo="; + + tags = [ "nomsgpack" ]; + + subPackages = [ "cmd/go-judge" ]; + + preBuild = '' + echo v${version} > ./cmd/go-judge/version/version.txt + ''; + + CGO_ENABLED = 0; + + meta = with lib; { + description = "High performance sandbox service based on container technologies"; + homepage = "https://github.com/criyle/go-judge"; + license = licenses.mit; + mainProgram = "go-judge"; + maintainers = with maintainers; [ criyle ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grun/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grun/package.nix new file mode 100644 index 0000000000..aef41add61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gr/grun/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, gtk2 +, pkg-config +, autoreconfHook +}: + +stdenv.mkDerivation { + pname = "grun"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "lrgc"; + repo = "grun"; + rev = "release_0_9_3"; + hash = "sha256-VbvX0wrgMIPmPnu3aQdtQ6H0X3umi8aJ42QvmmeMrJ0="; + }; + + buildInputs = [ + gtk2 + ]; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = { + description = "An application launcher written in C and using GTK for the interface"; + homepage = "https://github.com/lrgc/grun"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ gpl2Only ]; + maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-aspell/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-aspell/package.nix new file mode 100644 index 0000000000..cf5e51e254 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-aspell/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, guile +, autoreconfHook +, pkg-config +, aspell +, texinfo +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-aspell"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "spk121"; + repo = "guile-aspell"; + rev = finalAttrs.version; + hash = "sha256-CvLECZLwf4MujAQCL3I81O5xFvq6ezVhV0BjbqI3mR0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + guile + autoreconfHook + pkg-config + texinfo + ]; + + buildInputs = [ + guile + ]; + + propagatedBuildInputs = [ + aspell + ]; + + meta = with lib; { + description = "Guile bindings for the aspell library"; + homepage = "https://github.com/spk121/guile-aspell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ snowflake ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix index 3ad6ff9dd2..c75d4ee0f0 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix @@ -3,6 +3,7 @@ , fetchgit , avahi , gmp +, buildPackages , autoreconfHook , pkg-config , texinfo @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; buildInputs = [ guile ]; propagatedBuildInputs = [ avahi gmp ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix new file mode 100644 index 0000000000..f60a03b6da --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzlib/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, guile +, pkg-config +, texinfo +, lzlib +}: + +stdenv.mkDerivation rec { + pname = "guile-lzlib"; + version = "0.0.2"; + + src = fetchurl { + url = "https://notabug.org/guile-lzlib/guile-lzlib/archive/${version}.tar.gz"; + hash = "sha256-hiPbd9RH57n/v8vCiDkOcGprGomxFx2u1gh0z+x+T4c="; + }; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + propagatedBuildInputs = [ guile lzlib ]; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + # tests fail on darwin + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "A GNU Guile library providing bindings to lzlib"; + homepage = "https://notabug.org/guile-lzlib/guile-lzlib"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix index d9be1253ac..66dddeb88f 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ guile pkg-config - scheme-bytestructures ]; buildInputs = [ guile ]; propagatedBuildInputs = [ xz ]; + propagatedNativeBuildInputs = [ scheme-bytestructures ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix new file mode 100644 index 0000000000..0a7a0c836a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-quickcheck/package.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, guile +}: + +stdenv.mkDerivation rec { + pname = "guile-quickcheck"; + version = "0.1.0"; + + src = fetchurl { + url = "https://files.ngyro.com/guile-quickcheck/guile-quickcheck-${version}.tar.gz"; + hash = "sha256-y5msW+mbQ7YeucRS2VNUPokOKoP8g6ysKJ2UMWiIvA4="; + }; + + strictDeps = true; + nativeBuildInputs = [ guile pkg-config ]; + buildInputs = [ guile ]; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + homepage = "https://ngyro.com/software/guile-quickcheck.html"; + description = "Guile library providing tools for randomized, property-based testing"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-sjson/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-sjson/package.nix new file mode 100644 index 0000000000..8f9b49f95e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-sjson/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, autoreconfHook +, guile +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-sjson"; + version = "0.2.2"; + + src = fetchFromGitLab { + owner = "dustyweb"; + repo = "guile-sjson"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MmnEZhJTbZDIO8vWVCoTt4rGbOjfPZQ3bqAGv4ei69o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + ]; + + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "S-expression based json reader/writer for Guile"; + homepage = "https://gitlab.com/dustyweb/guile-sjson"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ galaxy ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix new file mode 100644 index 0000000000..6bb4451fa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-zstd/package.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchFromGitea +, autoreconfHook +, pkg-config +, guile +, texinfo +, zstd +}: + +stdenv.mkDerivation rec { + pname = "guile-zstd"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "guile-zstd"; + repo = "guile-zstd"; + rev = "v${version}"; + hash = "sha256-IAyDoqb7qHAy666hxs6CCZrFnfwwV8AaR92XlQQ6FLE="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ zstd ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "A GNU Guile library providing bindings to zstd"; + homepage = "https://notabug.org/guile-zstd/guile-zstd"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix new file mode 100644 index 0000000000..e20a969f83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix @@ -0,0 +1,138 @@ +{ lib +, stdenv +, fetchurl +, 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 +}: + +stdenv.mkDerivation rec { + pname = "guix"; + version = "1.4.0"; + + src = fetchurl { + url = "mirror://gnu/guix/guix-${version}.tar.gz"; + hash = "sha256-Q8dpy/Yy7wVEmsH6SMG6FSwzSUxqvH5HE3u6eyFJ+KQ="; + }; + + postPatch = '' + sed nix/local.mk -i -E \ + -e "s|^sysvinitservicedir = .*$|sysvinitservicedir = $out/etc/init.d|" \ + -e "s|^openrcservicedir = .*$|openrcservicedir = $out/etc/openrc|" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + 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 + ]; + + buildInputs = [ + bzip2 + guile + libgcrypt + sqlite + ]; + + propagatedBuildInputs = [ + disarchive + 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 + scheme-bytestructures + ]; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-bash-completion-dir=$(out)/etc/bash_completion.d" + ]; + + enableParallelBuilding = true; + + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" + done + ''; + + meta = with lib; { + description = "Functional package manager with a Scheme interface"; + longDescription = '' + GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof. + In addition to standard package management features, Guix supports + transactional upgrades and roll-backs, unprivileged package management, + per-user profiles, and garbage collection. + It provides Guile Scheme APIs, including high-level embedded + domain-specific languages (EDSLs), to describe how packages are built + and composed. + A user-land free software distribution for GNU/Linux comes as part of + Guix. + Guix is based on the Nix package manager. + ''; + homepage = "http://www.gnu.org/software/guix"; + license = licenses.gpl3Plus; + mainProgram = "guix"; + maintainers = with maintainers; [ cafkafk ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hachimarupop/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hachimarupop/package.nix new file mode 100644 index 0000000000..3ebf82409a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/hachimarupop/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "hachimarupop"; + version = "unstable-2022-07-11"; + + src = fetchFromGitHub { + owner = "noriokanisawa"; + repo = "HachiMaruPop"; + rev = "67d96c274032f5a2e1d33c1ec53498fde9110079"; + hash = "sha256-b1moyTVy0hHGu9/LrQ9k6Isd/LYTSxiuqz3BzrYVbXY="; + }; + + installPhase = '' + runHook preInstall + install -Dm444 fonts/ttf/*.ttf -t $out/share/fonts/truetype/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/noriokanisawa/HachiMaruPop"; + description = "A cute, Japanese font"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/haunt/package.nix similarity index 85% rename from third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix rename to third_party/nixpkgs/pkgs/by-name/ha/haunt/package.nix index c5794591ed..989fce392b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/haunt/package.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , autoreconfHook +, callPackage , guile , guile-commonmark , guile-reader @@ -10,12 +11,12 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "haunt"; version = "0.2.6"; src = fetchurl { - url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + url = "https://files.dthompson.us/haunt/haunt-${finalAttrs.version}.tar.gz"; hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs="; }; @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config ]; + buildInputs = [ guile guile-commonmark @@ -55,14 +57,13 @@ stdenv.mkDerivation rec { --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/haunt --version - runHook postInstallCheck - ''; + passthru = { + tests = { + expectVersion = callPackage ./tests/001-test-version.nix { }; + }; + }; - meta = with lib; { + meta = { homepage = "https://dthompson.us/projects/haunt.html"; description = "Guile-based static site generator"; longDescription = '' @@ -81,8 +82,8 @@ stdenv.mkDerivation rec { feeds, authors should feel empowered to tweak, replace, or create builders to do things that aren't provided out-of-the-box. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres AluisioASG ]; - platforms = guile.meta.platforms; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres AluisioASG ]; + inherit (guile.meta) platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ha/haunt/tests/001-test-version.nix b/third_party/nixpkgs/pkgs/by-name/ha/haunt/tests/001-test-version.nix new file mode 100644 index 0000000000..726a7ac957 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ha/haunt/tests/001-test-version.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, haunt +}: + +stdenv.mkDerivation { + pname = "haunt-test-version"; + inherit (haunt) version; + + nativeBuildInputs = [ haunt ]; + + dontInstall = true; + + buildCommand = '' + haunt --version + + touch $out + ''; + + meta.timeout = 10; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix b/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix similarity index 58% rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix rename to third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix index fa161a8147..ed9f77ec56 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ha/havoc/package.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , libxkbcommon , pkg-config +, wayland , wayland-protocols , wayland-scanner -, wayland }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "havoc"; version = "0.5.0"; src = fetchFromGitHub { owner = "ii8"; - repo = pname; - rev = version; + repo = "havoc"; + rev = finalAttrs.version; hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; }; @@ -38,19 +38,19 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$$out" ]; postInstall = '' - install -D -m 644 havoc.cfg -t $out/etc/${pname}/ - install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + install -Dm 644 havoc.cfg -t $out/etc/havoc/ + install -Dm 644 README.md -t $out/share/doc/havoc-${finalAttrs.version}/ ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/ii8/havoc"; description = "A minimal terminal emulator for Wayland"; - license = with licenses; [ mit publicDomain ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - # fatal error: 'sys/epoll.h' file not found - broken = stdenv.isDarwin; + license = with lib.licenses; [ mit publicDomain ]; + mainProgram = "havoc"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + broken = stdenv.isDarwin; # fatal error: 'sys/epoll.h' file not found }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix index ceaa22bb66..9f520d7c48 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { name = "headphones-toolbox"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { - url = "https://github.com/george-norton/headphones-toolbox/releases/download/headphones-toolbox-beta-v5/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-47F/bTi7ctIbfRnYVbksYUsHmL+3KYWccNg5dKPGR/U="; + url = "https://github.com/ploopyco/headphones-toolbox/releases/download/app-v${finalAttrs.version}/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; + hash = "sha256-lWjmpybGcL3sbBng8zCTUtwYhlrQ6cCrKkhiu+g9MsE="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A UI for configuring Ploopy Headphones"; - homepage = "https://github.com/george-norton/headphones-toolbox"; + homepage = "https://github.com/ploopyco/headphones-toolbox/"; maintainers = with maintainers; [ knarkzel nyanbinary ]; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix new file mode 100644 index 0000000000..bf2bda5100 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/hi/hifile/package.nix @@ -0,0 +1,41 @@ +{ lib, appimageTools, fetchurl }: + +let + version = "0.9.9.5"; + pname = "hifile"; + + src = fetchurl { + url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; + hash = "sha256-Ks/NLPm5loo9q8pT0LdtfcrC38203beNE74sbEpyuJM="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/HiFile.desktop $out/share/applications/HiFile.desktop + install -m 444 -D ${appimageContents}/HiFile.png $out/share/icons/hicolor/512x512/apps/HiFile.png + substituteInPlace $out/share/applications/HiFile.desktop \ + --replace 'Exec=HiFile' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Dual-pane graphical file manager for Windows, macOS and Linux"; + longDescription = '' + HiFile is the next evolution of file managers. Its mission is to increase your productivity whenever you work with files or folders. It aims to be better in every way - more convenient, more versatile, more efficient, more elegant, more customizable, and more fun. + ''; + homepage = "https://www.hifile.app/"; + downloadPage = "https://www.hifile.app/download"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ ymstnt ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ho/homeassistant-satellite/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/homeassistant-satellite/package.nix new file mode 100644 index 0000000000..26f90237f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -0,0 +1,56 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "homeassistant-satellite"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "synesthesiam"; + repo = "homeassistant-satellite"; + rev = "v${version}"; + hash = "sha256-iosutOpkpt0JJIMyALuQSDLj4jk57ITShVyPYlQgMFg="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + ]; + + passthru.optional-dependencies = { + pulseaudio = with python3.pkgs; [ + pasimple + pulsectl + ]; + silerovad = with python3.pkgs; [ + numpy + onnxruntime + ]; + webrtc = with python3.pkgs; [ + webrtc-noise-gain + ]; + }; + + pythonImportsCheck = [ + "homeassistant_satellite" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/synesthesiam/homeassistant-satellite/blob/v${version}/CHANGELOG.md"; + description = "Streaming audio satellite for Home Assistant"; + homepage = "https://github.com/synesthesiam/homeassistant-satellite"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "homeassistant-satellite"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ho/hottext/lock.json b/third_party/nixpkgs/pkgs/by-name/ho/hottext/lock.json new file mode 100644 index 0000000000..5675adc7ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ho/hottext/lock.json @@ -0,0 +1 @@ +{"depends":[{"method":"fetchzip","path":"/nix/store/vx0a8hw7hs5an0dnbrn6l16bd6is7hdr-source","rev":"07f6ba8ab96238e5bd1264cf0cea1d1746abb00c","sha256":"005nrldaasfl09zdsni1vi8s7dk0y85ijv6rm2wpj94435x66s36","url":"https://github.com/treeform/flatty/archive/07f6ba8ab96238e5bd1264cf0cea1d1746abb00c.tar.gz","ref":"0.3.4","packages":["flatty"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/lk4hcmvwvliliyyidx7k3fk9yfijddc5-source","rev":"b2e71179174e040884ebf6a16cbac711c84620b9","sha256":"0pi6cq43ysm1wy5vva3i2dqvyh4dqppjjjl04yj9wfq7mngpqaa1","url":"https://github.com/treeform/chroma/archive/b2e71179174e040884ebf6a16cbac711c84620b9.tar.gz","ref":"0.2.7","packages":["chroma"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/bah1zq369ikykm6dz3r0hzhcq4s88sxq-source","rev":"a2a5165c36e0098dea526712890fb7e988ba27f2","sha256":"0n42hlvh0d9wkjr01p04jnkyn7y4y62pwjdcqw52absapbpsr1lb","url":"https://github.com/treeform/typography/archive/a2a5165c36e0098dea526712890fb7e988ba27f2.tar.gz","ref":"0.7.14","packages":["typography"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/9hfg3703m28w76ics7rn0hw1qymz0jrh-source","rev":"156e424306756a106442aca985eed61a8d12097b","sha256":"0hg9iq509rjsgd33cp3452v7whgbc30b5lnajifkls0z66rc2ndh","url":"https://github.com/guzba/nimsimd/archive/156e424306756a106442aca985eed61a8d12097b.tar.gz","ref":"1.2.6","packages":["nimsimd"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/xjk8cg4dmja48rcswy0nphy3xhmf7nsz-source","rev":"f3e73f722fbb0e5d496fbc59ee860a9fd49983de","sha256":"12mqlczckhxcrg6il213fn7mcnqz3khwkh7i4bn57l55nzrhfvrh","url":"https://github.com/treeform/pixie/archive/f3e73f722fbb0e5d496fbc59ee860a9fd49983de.tar.gz","ref":"5.0.6","packages":["pixie"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/f9dp6njaay5rf32f6l9gkw0dm25gim47-source","rev":"7282ae1247f2f384ebeaec3826d7fa38fd0e1df1","sha256":"1plw9lfrm42qar01rnjhm0d9mkzsc7c3b8kz43w5pb8j8drx1lyn","url":"https://github.com/treeform/vmath/archive/7282ae1247f2f384ebeaec3826d7fa38fd0e1df1.tar.gz","ref":"2.0.0","packages":["vmath"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/16h19n8ndv42v8gn2vfdisdszv2wrln1-source","rev":"fb09637d6ebd6416b322a2b9bb95dd513040dea7","sha256":"1lyfnirwpy12lq9gr0sbnkf7ih7ayfvb1acjxk2z5gzlgxm1azp1","url":"https://github.com/treeform/print/archive/fb09637d6ebd6416b322a2b9bb95dd513040dea7.tar.gz","ref":"1.0.2","packages":["print"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/zrm3y895iwn057y5c4374bviih962w0v-source","rev":"d0c9ad33ae72aece49093d7688fc78a7101aa4b0","sha256":"14qgxcnyznjc180kdbilqzzya589rqaznfpp75yp37n47zdknfw0","url":"https://github.com/guzba/crunchy/archive/d0c9ad33ae72aece49093d7688fc78a7101aa4b0.tar.gz","ref":"0.1.9","packages":["crunchy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/da49jl6rhz6jlix6mds0alhlbq1qlkfy-source","rev":"84d4702e838d684b7304882ffe796f57ef422fb6","sha256":"1vilid9xx5mp2yvssa3wf6g9svqdan87090klis891k9w1dd8i51","url":"https://github.com/nim-lang/sdl2/archive/84d4702e838d684b7304882ffe796f57ef422fb6.tar.gz","ref":"v2.0.5","packages":["sdl2"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/rpa0bv740i3yagp0ldkb68jp6scw4i5l-source","rev":"d7eaf00c24820ad0317c9926737402e62431e931","sha256":"0wrvdpvbwv4ysjsqc6hhvd97vql4k0m5l0zdrsrjlljd1n5g2haq","url":"https://github.com/treeform/bumpy/archive/d7eaf00c24820ad0317c9926737402e62431e931.tar.gz","ref":"1.1.2","packages":["bumpy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/b98qlpki45417ws4pmjq052q1s7333wc-source","rev":"a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82","sha256":"0zmavr2jnyyqkvvi6hlg2kh6qv6lzakwvsqjy0sjm3qdsna0aldg","url":"https://github.com/guzba/zippy/archive/a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82.tar.gz","ref":"0.10.10","packages":["zippy"],"srcDir":"src"}]} diff --git a/third_party/nixpkgs/pkgs/by-name/ho/hottext/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/hottext/package.nix new file mode 100644 index 0000000000..e164ff1122 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ho/hottext/package.nix @@ -0,0 +1,41 @@ +{ lib, nim2Packages, fetchFromSourcehut, gentium, makeDesktopItem, nim_lk, SDL2 }: + +nim2Packages.buildNimPackage (finalAttrs: { + pname = "hottext"; + version = "20231003"; + + nimBinOnly = true; + + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "hottext"; + rev = finalAttrs.version; + hash = "sha256-ncH/1PV4vZY7JCUJ87FPz5bdrQsNlYxzGdc5BQNfQeA="; + }; + + buildInputs = [ SDL2 ]; + + nimFlags = nim_lk.passthru.nimFlagsFromLockFile ./lock.json; + + HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; + + desktopItem = makeDesktopItem { + categories = [ "Utility" ]; + comment = finalAttrs.meta.description; + desktopName = finalAttrs.pname; + exec = finalAttrs.pname; + name = finalAttrs.pname; + }; + + postInstall = '' + cp -r $desktopItem/* $out + ''; + + meta = finalAttrs.src.meta // { + description = "Simple RSVP speed-reading utility"; + license = lib.licenses.unlicense; + homepage = "https://git.sr.ht/~ehmry/hottext"; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "hottext"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix index e891fe01f3..a53a4dddda 100644 --- a/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-c5R5V5J1ETBl6JAdNDSxa94OeMyqbTAUmJHJCo1B+WQ="; + hash = "sha256-AXa+K+njXkrJeqABD04WHpmvAzAL1Mw11ZhCfFNJxhY="; }; - cargoHash = "sha256-D/WKv8rhb/ZGuVEZDp83PZxJydHbnZUQp+kVNlMBUCs="; + cargoHash = "sha256-tNuv+D75wox3HlUZSJJ67KEBKmGJXBkXHfvDsNHeM6A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ic/icewm/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/icewm/package.nix index 4df2536516..186810876b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ic/icewm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-SgSbcWNib2BXyTOBDI1J2TzXhnXoRH0GK3rJvyLID7w="; + hash = "sha256-bnoNkBsNJ/6CVmm5I/nwy6LGxYhxPXssjZ3TT7FdEz8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix new file mode 100644 index 0000000000..0cf8ef3e17 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/im/immersed-vr/package.nix @@ -0,0 +1,31 @@ +{ lib +, appimageTools +, fetchurl +}: +appimageTools.wrapType2 rec { + pname = "immersed-vr"; + version = "9.6"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://web.archive.org/web/20231011083250/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; + hash = "sha256-iA0SQlPktETFXEqCbSoWV9NaWVahkPa6qO4Cfju0aBQ="; + }; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + ''; + + extraPkgs = pkgs: with pkgs; [ + libthai + ]; + + meta = with lib; { + description = "A VR coworking platform"; + homepage = "https://immersed.com"; + license = licenses.unfree; + maintainers = with maintainers; [ haruki7049 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix new file mode 100644 index 0000000000..4c256481bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix @@ -0,0 +1,100 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, acl +, cowsql +, hwdata +, libcap +, lxc +, pkg-config +, sqlite +, udev +, installShellFiles +, nix-update-script +, nixosTests +}: + +buildGoModule rec { + pname = "incus-unwrapped"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "lxc"; + repo = "incus"; + rev = "refs/tags/incus-${version}"; + hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; + }; + + vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s="; + + postPatch = '' + substituteInPlace internal/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + + excludedPackages = [ + "cmd/incus-agent" + "cmd/incus-migrate" + "cmd/lxd-to-incus" + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + lxc + acl + libcap + cowsql.dev + sqlite + udev.dev + ]; + + ldflags = [ "-s" "-w" ]; + tags = [ "libsqlite3" ]; + + # required for go-cowsql. + CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; + + postBuild = '' + make incus-agent incus-migrate + ''; + + preCheck = + let skippedTests = [ + "TestValidateConfig" + "TestConvertNetworkConfig" + "TestConvertStorageConfig" + "TestSnapshotCommon" + "TestContainerTestSuite" + ]; in + '' + # Disable tests requiring local operations + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + + postInstall = '' + installShellCompletion --bash --name incus ./scripts/bash/incus + ''; + + passthru = { + tests.incus = nixosTests.incus; + + updateScript = nix-update-script { + extraArgs = [ + "-vr" "incus-\(.*\)" + ]; + }; + }; + + meta = { + description = "Powerful system container and virtual machine manager"; + homepage = "https://linuxcontainers.org/incus"; + changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ adamcstephens ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix b/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix new file mode 100644 index 0000000000..e02876407a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/in/incus/package.nix @@ -0,0 +1,117 @@ +{ lib +, incus-unwrapped +, linkFarm +, makeWrapper +, stdenv +, symlinkJoin +, writeShellScriptBin +, acl +, apparmor-parser +, apparmor-profiles +, attr +, bash +, btrfs-progs +, criu +, dnsmasq +, gnutar +, gptfdisk +, gzip +, iproute2 +, iptables +, OVMF +, qemu_kvm +, qemu-utils +, rsync +, spice-gtk +, squashfsTools +, util-linux +, virtiofsd +, xz +}: +let + binPath = lib.makeBinPath [ + acl + attr + bash + btrfs-progs + criu + dnsmasq + gnutar + gptfdisk + gzip + iproute2 + iptables + qemu_kvm + qemu-utils + rsync + squashfsTools + util-linux + virtiofsd + xz + + (writeShellScriptBin "apparmor_parser" '' + exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" + '') + ]; + + clientBinPath = [ + spice-gtk + ]; + + ovmf-2mb = OVMF.override { + secureBoot = true; + csmSupport = false; + fdSize2MB = true; + }; + + ovmf-4mb = OVMF.override { + secureBoot = true; + csmSupport = false; + fdSize4MB = true; + }; + + ovmf-4mb-csm = OVMF.override { + secureBoot = true; + csmSupport = false; + fdSize2MB = false; + fdSize4MB = true; + }; + + ovmf-prefix = if stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF"; + + # mimic ovmf from https://github.com/canonical/incus-pkg-snap/blob/3abebe1dfeb20f9b7729556960c7e9fe6ad5e17c/snapcraft.yaml#L378 + # also found in /snap/incus/current/share/qemu/ on a snap install + ovmf = linkFarm "incus-ovmf" [ + { name = "OVMF_CODE.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } + { name = "OVMF_CODE.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_CODE.fd"; } + { name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } + { name = "OVMF_CODE.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } + + { name = "OVMF_VARS.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.2MB.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.4MB.ms.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + { name = "OVMF_VARS.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } + ]; +in +symlinkJoin { + name = "incus-${incus-unwrapped.version}"; + + paths = [ incus-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/incusd --prefix PATH : ${lib.escapeShellArg binPath}:${qemu_kvm}/libexec:$out/bin --set INCUS_OVMF_PATH ${ovmf} + + wrapProgram $out/bin/incus --prefix PATH : ${lib.makeBinPath clientBinPath} + ''; + + passthru = { + inherit (incus-unwrapped) tests; + }; + + inherit (incus-unwrapped) meta pname version; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasper/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix rename to third_party/nixpkgs/pkgs/by-name/ja/jasper/package.nix index 2df3e554c9..fbd8b9f165 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jasper/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/jasper/package.nix @@ -5,23 +5,31 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "2.0.32"; + version = "4.0.1"; src = fetchFromGitHub { owner = "jasper-software"; - repo = pname; - rev = "version-${version}"; - hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I="; + repo = "jasper"; + rev = "version-${finalAttrs.version}"; + hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = [ cmake pkg-config ]; - meta = with lib; { + # Since "build" already exists and is populated, cmake tries to use it, + # throwing uncomprehensible error messages... + cmakeBuildDir = "build-directory"; + + strictDeps = true; + + meta = { homepage = "https://jasper-software.github.io/jasper/"; description = "Image processing/coding toolkit"; longDescription = '' @@ -41,8 +49,11 @@ stdenv.mkDerivation rec { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = licenses.free; # MIT-like - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + + # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling. + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/third_party/nixpkgs/pkgs/by-name/ji/jitterentropy-rngd/package.nix new file mode 100644 index 0000000000..feb7d1e2fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ji/jitterentropy-rngd/package.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "jitterentropy-rngd"; + version = "1.2.8"; + + src = fetchFromGitHub { + owner = "smuellerDD"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LDym636ss3B1G/vrqatu9g5vbVEeDX0JQcxZ/IxGeY0="; + }; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + make install DESTDIR= PREFIX=$out UNITDIR=$out/lib/systemd/system + + runHook postInstall + ''; + + meta = with lib; { + description = ''A random number generator, which injects entropy to the kernel''; + homepage = "https://github.com/smuellerDD/jitterentropy-rngd"; + changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}"; + license = [ licenses.gpl2Only licenses.bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ thillux ]; + mainProgram = "jitterentropy-rngd"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix index 3403edcaac..d630bdf22b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf3_23, + protobuf_23, grpc, pandoc, python3, @@ -87,14 +87,14 @@ stdenv.mkDerivation rec { # For future updates: The currently used version can be found in the file # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json # under the key .repositories.protobuf - protobuf3_23 + protobuf_23 python3 ]; postPatch = '' sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf3_23}"' etc/repos.json > etc/repos.json.patched + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json diff --git a/third_party/nixpkgs/pkgs/by-name/kc/kconfig-frontends/package.nix b/third_party/nixpkgs/pkgs/by-name/kc/kconfig-frontends/package.nix new file mode 100644 index 0000000000..954ca475a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kc/kconfig-frontends/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchurl +, bash +, bison +, flex +, gperf +, ncurses +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kconfig-frontends"; + version = "4.11.0.1"; + + src = fetchurl { + url = "https://bitbucket.org/nuttx/tools/downloads/kconfig-frontends-${finalAttrs.version}.tar.bz2"; + hash = "sha256-yxg4z+Lwl7oJyt4n1HUncg1bKeK3FcCpbDPQtqELqxM="; + }; + + patches = [ + # This patch is a fixed file, there is no need to normalize it + (fetchurl { + url = "https://bitbucket.org/nuttx/tools/downloads/gperf3.1_kconfig_id_lookup.patch"; + hash = "sha256-cqAWjRnMA/fJ8wnEfUxoPEW0hIJY/mprE6/TQMY6NPI="; + }) + ]; + + outputs = [ "out" "lib" "dev" "doc" ]; + + nativeBuildInputs = [ + bison + flex + gperf + pkg-config + ]; + + buildInputs = [ + bash + ncurses + python3 + ]; + + strictDeps = true; + + configureFlags = [ + "--enable-frontends=conf,mconf,nconf" + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + + meta = { + description = "Out of Linux tree packaging of the kconfig infrastructure"; + longDescription = '' + Configuration language and system for the Linux kernel and other + projects. Features simple syntax and grammar, limited yet adequate option + types, simple organization of options, and direct and reverse + dependencies. + ''; + homepage = "https://bitbucket.org/nuttx/tools/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/kd/kdsingleapplication/package.nix b/third_party/nixpkgs/pkgs/by-name/kd/kdsingleapplication/package.nix new file mode 100644 index 0000000000..22522dd6dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt6 +}: + +stdenv.mkDerivation rec { + pname = "KDSingleApplication"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "KDAB"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5YprRbfiFI2UGMJqDf+3VDwXV904USEpMEpoNm0g7KY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + + cmakeFlags = [ "-DKDSingleApplication_QT6=true" ]; + dontWrapQtApps = true; + + meta = with lib; { + description = "KDAB's helper class for single-instance policy applications"; + homepage = "https://www.kdab.com/"; + maintainers = with maintainers; [ hellwolf ]; + platforms = platforms.unix; + license = licenses.mit; + changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${version}"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/kermit-terminal/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix rename to third_party/nixpkgs/pkgs/by-name/ke/kermit-terminal/package.nix index 4bcd3191af..a0c0008917 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/kermit-terminal/package.nix @@ -15,11 +15,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "orhun"; - repo = finalAttrs.pname; + repo = "kermit"; rev = finalAttrs.version; hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ cmake pkg-config @@ -33,12 +35,13 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.test = nixosTests.terminal-emulators.kermit; - meta = with lib; { + meta = { homepage = "https://github.com/orhun/kermit"; description = "A VTE-based, simple and froggy terminal emulator"; changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl3Only; + mainProgram = "kermit"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ke/kew/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/kew/package.nix new file mode 100644 index 0000000000..54f3f6717b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ke/kew/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, ffmpeg +, fftwFloat +, chafa +, freeimage +, glib +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "kew"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "ravachol"; + repo = "kew"; + rev = "v${version}"; + hash = "sha256-Om7v8eTlYxXQYf1MG+L0I5ICQ2LS7onouhPGosuK8NM="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ ffmpeg freeimage fftwFloat chafa glib ]; + + installFlags = [ + "MAN_DIR=${placeholder "out"}/share/man" + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A command-line music player for Linux"; + homepage = "https://github.com/ravachol/kew"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ demine ]; + mainProgram = "kew"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kikit/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kikit/default.nix new file mode 100644 index 0000000000..45209545aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/kikit/default.nix @@ -0,0 +1,87 @@ +{ bc +, zip +, lib +, fetchFromGitHub +, bats +, buildPythonApplication +, pythonOlder +, callPackage +, kicad +, numpy +, click +, markdown2 +, pytestCheckHook +, commentjson +, wxPython_4_2 +, pcbnew-transition +, pybars3 +, versioneer +}: +let + solidpython = callPackage ./solidpython { }; + + # https://github.com/yaqwsx/KiKit/issues/574 + # copy-pasted from nixpkgs#8d8e62e74f511160a599471549a98bc9e4f4818d + shapely = callPackage ./shapely { }; +in +buildPythonApplication rec { + pname = "kikit"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yaqwsx"; + repo = "KiKit"; + rev = "v${version}"; + hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo="; + }; + + propagatedBuildInputs = [ + kicad + numpy + click + markdown2 + commentjson + # https://github.com/yaqwsx/KiKit/issues/575 + wxPython_4_2 + pcbnew-transition + pybars3 + shapely + # https://github.com/yaqwsx/KiKit/issues/576 + solidpython + ]; + + nativeBuildInputs = [ + versioneer + bc + zip + ]; + + nativeCheckInputs = [ + pytestCheckHook + bats + ]; + + pythonImportsCheck = [ + "kikit" + ]; + + preCheck = '' + export PATH=$PATH:$out/bin + + make test-system + + # pytest needs to run in a subdir. See https://github.com/yaqwsx/KiKit/blob/v1.3.0/Makefile#L43 + cd test/units + ''; + + meta = with lib; { + description = "Automation for KiCAD boards"; + homepage = "https://github.com/yaqwsx/KiKit/"; + changelog = "https://github.com/yaqwsx/KiKit/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly matusf ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kikit/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kikit/package.nix new file mode 100644 index 0000000000..5f1daa8aa5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/kikit/package.nix @@ -0,0 +1,2 @@ +{ python3 }: +(python3.pkgs.callPackage ./default.nix { }) diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/default.nix new file mode 100644 index 0000000000..7f136a1338 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, pythonOlder +, geos +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "Shapely"; + version = "1.8.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + + nativeBuildInputs = [ + geos # for geos-config + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + + patches = [ + # Patch to search form GOES .so/.dylib files in a Nix-aware way + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + + preCheck = '' + rm -r shapely # prevent import of local shapely + ''; + + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # FIXME(lf-): these logging tests are broken, which is definitely our + # fault. I've tried figuring out the cause and failed. + # + # It is apparently some sandbox or no-sandbox related thing on macOS only + # though. + "test_error_handler_exception" + "test_error_handler" + "test_info_handler" + ]; + + pythonImportsCheck = [ "shapely" ]; + + meta = with lib; { + description = "Geometric objects, predicates, and operations"; + homepage = "https://pypi.python.org/pypi/Shapely/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/library-paths.patch b/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/library-paths.patch new file mode 100644 index 0000000000..12f93e757f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/kikit/shapely/library-paths.patch @@ -0,0 +1,31 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 88c5f53..1ccd6e4 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): + alt_paths = [ + 'libgeos_c.so.1', + 'libgeos_c.so', ++ '@libgeos_c@', + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': + "/usr/local/lib/libgeos_c.dylib", + # homebrew Apple Silicon + "/opt/homebrew/lib/libgeos_c.dylib", ++ "@libgeos_c@", + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +diff --git a/tests/test_dlls.py b/tests/test_dlls.py +index c71da8e..c36262c 100644 +--- a/tests/test_dlls.py ++++ b/tests/test_dlls.py +@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): + '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) + os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) + 'libgeos_c.so.1', +- 'libgeos_c.so']) ++ 'libgeos_c.so', ++ '@libgeos_c@']) diff --git a/third_party/nixpkgs/pkgs/by-name/ki/kikit/solidpython/default.nix b/third_party/nixpkgs/pkgs/by-name/ki/kikit/solidpython/default.nix new file mode 100644 index 0000000000..c03637907a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -0,0 +1,66 @@ +# SolidPython is an unmaintained library with old dependencies. +{ buildPythonPackage +, callPackage +, fetchFromGitHub +, fetchFromGitLab +, fetchpatch +, lib +, pythonRelaxDepsHook + +, poetry-core +, prettytable +, pypng +, ply +, setuptools +, euclid3 +}: +buildPythonPackage rec { + pname = "solidpython"; + version = "1.1.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SolidCode"; + repo = "SolidPython"; + rev = "d962740d600c5dfd69458c4559fc416b9beab575"; + hash = "sha256-3fJta2a5c8hV9FPwKn5pj01aBtsCGSRCz3vvxR/5n0Q="; + }; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + ply + setuptools + euclid3 + + prettytable + ]; + + pythonRelaxDeps = [ + # SolidPython has PrettyTable pinned to a hyper-specific version due to + # some ancient bug with Poetry. They aren't interested in unpinning because + # SolidPython v1 seems to be deprecated in favor of v2: + # https://github.com/SolidCode/SolidPython/issues/207 + "PrettyTable" + ]; + + pythonRemoveDeps = [ + # The pypng dependency is only used in an example script. + "pypng" + ]; + + pythonImportsCheck = [ + "solid" + ]; + + meta = with lib; { + description = "Python interface to the OpenSCAD declarative geometry language"; + homepage = "https://github.com/SolidCode/SolidPython"; + changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/km/kmsvnc/package.nix b/third_party/nixpkgs/pkgs/by-name/km/kmsvnc/package.nix new file mode 100644 index 0000000000..000dc8115b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/km/kmsvnc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libdrm +, libvncserver +, libxkbcommon +, libva +}: + +stdenv.mkDerivation rec { + pname = "kmsvnc"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "isjerryxiao"; + repo = "kmsvnc"; + rev = "v${version}"; + hash = "sha256-Dz1y4t8u9/rnmOiYMWMq6aEq3kV47uiIK7K4DSvjZNc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libdrm + libvncserver + libxkbcommon + libva + ]; + + meta = with lib; { + description = "A VNC server for DRM/KMS capable GNU/Linux devices"; + homepage = "https://github.com/isjerryxiao/kmsvnc"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "kmsvnc"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix new file mode 100644 index 0000000000..b6578f4a02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/kokkos/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, cmake +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kokkos"; + version = "4.1.00"; + + src = fetchFromGitHub { + owner = "kokkos"; + repo = "kokkos"; + rev = finalAttrs.version; + hash = "sha256-bPgXn1Lv+EiiKEHgTVhRFhcELUnZCphaXDlrTYq6cpY="; + }; + + nativeBuildInputs = [ + cmake + python3 + ]; + + cmakeFlags = [ + (lib.cmakeBool "Kokkos_ENABLE_TESTS" true) + ]; + + postPatch = '' + patchShebangs . + ''; + + doCheck = true; + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "C++ Performance Portability Programming EcoSystem"; + homepage = "https://github.com/kokkos/kokkos"; + license = with licenses; [ asl20-llvm ]; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix new file mode 100644 index 0000000000..75876d9906 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ko/konbucase/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook +, pantheon +, gtksourceview5 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "konbucase"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "ryonakano"; + repo = "konbucase"; + rev = finalAttrs.version; + hash = "sha256-g3EDa9EXymi6c8dRHFZYGEAT7k8M2TXUAzZVKTnLzyk="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + pantheon.granite7 + gtksourceview5 + ]; + + postInstall = '' + mv $out/bin/com.github.ryonakano.konbucase $out/bin/konbucase + substituteInPlace $out/share/applications/com.github.ryonakano.konbucase.desktop \ + --replace 'Exec=com.github.ryonakano.konbucase' 'Exec=${placeholder "out"}/bin/konbucase' + ''; + + meta = with lib; { + homepage = "https://github.com/ryonakano/konbucase"; + description = "A case converting app suitable for coding or typing"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ galaxy ]; + platforms = platforms.linux; + mainProgram = "konbucase"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch new file mode 100644 index 0000000000..1f6941f55f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/expose-password-hashing.patch @@ -0,0 +1,36 @@ +diff --git a/lib/LANraragi/Controller/Config.pm b/lib/LANraragi/Controller/Config.pm +index 2cd2c999..0bd8ab6e 100644 +--- a/lib/LANraragi/Controller/Config.pm ++++ b/lib/LANraragi/Controller/Config.pm +@@ -50,6 +50,15 @@ sub index { + ); + } + ++sub make_password_hash { ++ my $ppr = Authen::Passphrase::BlowfishCrypt->new( ++ cost => 8, ++ salt_random => 1, ++ passphrase => shift, ++ ); ++ return $ppr->as_rfc2307; ++} ++ + # Save the given parameters to the Redis config + sub save_config { + +@@ -95,14 +104,7 @@ sub save_config { + my $password = $self->req->param('newpassword'); + + if ( $password ne "" ) { +- my $ppr = Authen::Passphrase::BlowfishCrypt->new( +- cost => 8, +- salt_random => 1, +- passphrase => $password, +- ); +- +- my $pass_hashed = $ppr->as_rfc2307; +- $confhash{password} = $pass_hashed; ++ $confhash{password} = make_password_hash($password); + } + } + diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch new file mode 100644 index 0000000000..eb6b88f68f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch @@ -0,0 +1,34 @@ +diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm +index e6b833c4..d677030b 100644 +--- a/lib/LANraragi.pm ++++ b/lib/LANraragi.pm +@@ -144,8 +144,13 @@ sub startup { + shutdown_from_pid( get_temp . "/minion.pid" ); + + my $miniondb = $self->LRR_CONF->get_redisad . "/" . $self->LRR_CONF->get_miniondb; ++ my $redispassword = $self->LRR_CONF->get_redispassword; ++ ++ # If the password is non-empty, add the required delimiters ++ if ($redispassword) { $redispassword = "x:" . $redispassword . "@"; } ++ + say "Minion will use the Redis database at $miniondb"; +- $self->plugin( 'Minion' => { Redis => "redis://$miniondb" } ); ++ $self->plugin( 'Minion' => { Redis => "redis://$redispassword$miniondb" } ); + $self->LRR_LOGGER->info("Successfully connected to Minion database."); + $self->minion->missing_after(5); # Clean up older workers after 5 seconds of unavailability + +diff --git a/lib/LANraragi/Model/Config.pm b/lib/LANraragi/Model/Config.pm +index f52056d4..63e1f5d3 100644 +--- a/lib/LANraragi/Model/Config.pm ++++ b/lib/LANraragi/Model/Config.pm +@@ -42,8 +42,8 @@ sub get_minion { + my $miniondb = get_redisad . "/" . get_miniondb; + my $password = get_redispassword; + +- # If the password is non-empty, add the required @ +- if ($password) { $password = $password . "@"; } ++ # If the password is non-empty, add the required delimiters ++ if ($password) { $password = "x:" . $password . "@"; } + + return Minion->new( Redis => "redis://$password$miniondb" ); + } diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch new file mode 100644 index 0000000000..f545bd4759 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/fix-paths.patch @@ -0,0 +1,100 @@ +diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm +index e6b833c4..4b90e4c5 100644 +--- a/lib/LANraragi.pm ++++ b/lib/LANraragi.pm +@@ -21,6 +21,8 @@ use LANraragi::Utils::Minion; + use LANraragi::Model::Search; + use LANraragi::Model::Config; + ++use FindBin; ++ + # This method will run once at server start + sub startup { + my $self = shift; +@@ -30,7 +32,7 @@ sub startup { + say "ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!"; + + # Load package.json to get version/vername/description +- my $packagejson = decode_json( Mojo::File->new('package.json')->slurp ); ++ my $packagejson = decode_json( Mojo::File->new("$FindBin::Bin/../package.json")->slurp ); + + my $version = $packagejson->{version}; + my $vername = $packagejson->{version_name}; +diff --git a/lib/LANraragi/Model/Archive.pm b/lib/LANraragi/Model/Archive.pm +index 73e824dd..8bcea29c 100644 +--- a/lib/LANraragi/Model/Archive.pm ++++ b/lib/LANraragi/Model/Archive.pm +@@ -13,6 +13,7 @@ use Time::HiRes qw(usleep); + use File::Basename; + use File::Copy "cp"; + use File::Path qw(make_path); ++use FindBin; + + use LANraragi::Utils::Generic qw(remove_spaces remove_newlines render_api_response); + use LANraragi::Utils::TempFolder qw(get_temp); +@@ -126,7 +127,7 @@ sub serve_thumbnail { + } else { + + # If the thumbnail doesn't exist, serve the default thumbnail. +- $self->render_file( filepath => "./public/img/noThumb.png" ); ++ $self->render_file( filepath => "$FindBin::Bin/../public/img/noThumb.png" ); + } + return; + +diff --git a/lib/LANraragi/Utils/Generic.pm b/lib/LANraragi/Utils/Generic.pm +index 14736893..4352f023 100644 +--- a/lib/LANraragi/Utils/Generic.pm ++++ b/lib/LANraragi/Utils/Generic.pm +@@ -17,6 +17,8 @@ use Sys::CpuAffinity; + use LANraragi::Utils::TempFolder qw(get_temp); + use LANraragi::Utils::Logging qw(get_logger); + ++use FindBin; ++ + # Generic Utility Functions. + use Exporter 'import'; + our @EXPORT_OK = +@@ -161,7 +163,7 @@ sub start_shinobu { + my $mojo = shift; + + my $proc = Proc::Simple->new(); +- $proc->start( $^X, "./lib/Shinobu.pm" ); ++ $proc->start( $^X, "$FindBin::Bin/../lib/Shinobu.pm" ); + $proc->kill_on_destroy(0); + + $mojo->LRR_LOGGER->debug( "Shinobu Worker new PID is " . $proc->pid ); +@@ -201,7 +203,7 @@ sub get_css_list { + + #Get all the available CSS sheets. + my @css; +- opendir( my $dir, "./public/themes" ) or die $!; ++ opendir( my $dir, "$FindBin::Bin/../public/themes" ) or die $!; + while ( my $file = readdir($dir) ) { + if ( $file =~ /.+\.css/ ) { push( @css, $file ); } + } +diff --git a/lib/LANraragi/Utils/Logging.pm b/lib/LANraragi/Utils/Logging.pm +index ee29c507..6bdfc1bd 100644 +--- a/lib/LANraragi/Utils/Logging.pm ++++ b/lib/LANraragi/Utils/Logging.pm +@@ -18,7 +18,7 @@ our @EXPORT_OK = qw(get_logger get_plugin_logger get_logdir get_lines_from_file) + # Get the Log folder. + sub get_logdir { + +- my $log_folder = "$FindBin::Bin/../log"; ++ my $log_folder = "./log"; + + # Folder location can be overriden by LRR_LOG_DIRECTORY + if ( $ENV{LRR_LOG_DIRECTORY} ) { +diff --git a/lib/LANraragi/Utils/TempFolder.pm b/lib/LANraragi/Utils/TempFolder.pm +index 792b1c1b..f0eb341b 100644 +--- a/lib/LANraragi/Utils/TempFolder.pm ++++ b/lib/LANraragi/Utils/TempFolder.pm +@@ -20,7 +20,7 @@ our @EXPORT_OK = qw(get_temp get_tempsize clean_temp_full clean_temp_partial); + #Get the current tempfolder. + #This can be called from any process safely as it uses FindBin. + sub get_temp { +- my $temp_folder = "$FindBin::Bin/../public/temp"; ++ my $temp_folder = "./public/temp"; + + # Folder location can be overriden by LRR_TEMP_DIRECTORY + if ( $ENV{LRR_TEMP_DIRECTORY} ) { diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch new file mode 100644 index 0000000000..9d260f5a49 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/install.patch @@ -0,0 +1,63 @@ +diff --git a/tools/cpanfile b/tools/cpanfile +index 359c61fe..ca3b7ec7 100755 +--- a/tools/cpanfile ++++ b/tools/cpanfile +@@ -20,7 +20,7 @@ requires 'Sort::Naturally', 1.03; + requires 'Authen::Passphrase', 0.008; + requires 'File::ReadBackwards', 1.05; + requires 'URI::Escape', 1.74; +-requires 'URI', 5.09; ++requires 'URI', 5.05; + + # Used by Installer + requires 'IPC::Cmd', 1.02; +diff --git a/tools/install.pl b/tools/install.pl +index 0cbb847d..1bd61fa0 100755 +--- a/tools/install.pl ++++ b/tools/install.pl +@@ -91,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { + $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; + } + +-#Load IPC::Cmd +-install_package( "IPC::Cmd", $cpanopt ); +-install_package( "Config::AutoConf", $cpanopt ); +-IPC::Cmd->import('can_run'); +-require Config::AutoConf; +- +-say("\r\nWill now check if all LRR software dependencies are met. \r\n"); +- +-#Check for Redis +-say("Checking for Redis..."); +-can_run('redis-server') +- or die 'NOT FOUND! Please install a Redis server before proceeding.'; +-say("OK!"); +- +-#Check for GhostScript +-say("Checking for GhostScript..."); +-can_run('gs') +- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.'; +-say("OK!"); +- +-#Check for libarchive +-say("Checking for libarchive..."); +-Config::AutoConf->new()->check_header("archive.h") +- or die 'NOT FOUND! Please install libarchive and ensure its headers are present.'; +-say("OK!"); +- + #Check for PerlMagick + say("Checking for ImageMagick/PerlMagick..."); + my $imgk; +@@ -154,12 +128,6 @@ if ( $back || $full ) { + #Clientside Dependencies with Provisioning + if ( $front || $full ) { + +- say("\r\nObtaining remote Web dependencies...\r\n"); +- +- if ( system("npm install") != 0 ) { +- die "Something went wrong while obtaining node modules - Bailing out."; +- } +- + say("\r\nProvisioning...\r\n"); + + #Load File::Copy diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix new file mode 100644 index 0000000000..74ec38eeae --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanraragi/package.nix @@ -0,0 +1,130 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +, makeBinaryWrapper +, perl +, ghostscript +, nixosTests +}: + +let + perlEnv = perl.withPackages (_: cpanDeps); + + cpanDeps = with perl.pkgs; [ + ImageMagick + locallib + Redis + Encode + ArchiveLibarchiveExtract + ArchiveLibarchivePeek + NetDNSNative + SortNaturally + AuthenPassphrase + FileReadBackwards + URI + LogfileRotate + Mojolicious + MojoliciousPluginTemplateToolkit + MojoliciousPluginRenderFile + MojoliciousPluginStatus + IOSocketSSL + CpanelJSONXS + Minion + MinionBackendRedis + ProcSimple + ParallelLoops + SysCpuAffinity + FileChangeNotify + ModulePluggable + TimeLocal + ] ++ lib.optional stdenv.isLinux LinuxInotify2; +in +buildNpmPackage rec { + pname = "lanraragi"; + version = "0.8.90"; + + src = fetchFromGitHub { + owner = "Difegue"; + repo = "LANraragi"; + rev = "v.${version}"; + hash = "sha256-ljnREUGCKvUJvcQ+aJ6XqiMTkVmfjt/0oC47w3PCj/k="; + }; + + patches = [ + (fetchpatch { + name = "add-package-lock-json.patch"; # Can be removed when updating to 0.9.0 + url = "https://github.com/Difegue/LANraragi/commit/c5cd8641795bf7e40deef4ae955ea848dde44050.patch"; + hash = "sha256-XKxRzeugkIe6N4XRN6+O1wEZpxo6OzU0OaG0ywKFv38="; + }) + ./install.patch + ./fix-paths.patch + ./expose-password-hashing.patch + ./fix-minion-redis-password.patch # Should be upstreamed + ]; + + npmFlags = [ "--legacy-peer-deps" ]; + + npmDepsHash = "sha256-UQsChPU5b4+r5Kv6P/3rJCGUzssiUNSKo3w4axNyJew="; + + nativeBuildInputs = [ + perl + makeBinaryWrapper + perl.pkgs.Appcpanminus + ] ++ cpanDeps; + + nativeCheckInputs = with perl.pkgs; [ + TestMockObject + TestTrap + TestDeep + ]; + + buildPhase = '' + runHook preBuild + + perl ./tools/install.pl install-full + rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map + + runHook postBuild + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + rm tests/plugins.t # Uses network + prove -r -l -v tests + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/lanraragi + cp -r lib public script templates package.json $out/share/lanraragi + + makeWrapper ${perlEnv}/bin/perl $out/bin/lanraragi \ + --prefix PATH : ${lib.makeBinPath [ ghostscript ]} \ + --add-flags "$out/share/lanraragi/script/launcher.pl -f $out/share/lanraragi/script/lanraragi" + + runHook postInstall + ''; + + passthru = { + inherit perlEnv; + tests = { inherit (nixosTests) lanraragi; }; + }; + + meta = { + changelog = "https://github.com/Difegue/LANraragi/releases/tag/${src.rev}"; + description = "Web application for archival and reading of manga/doujinshi"; + homepage = "https://github.com/Difegue/LANraragi"; + license = lib.licenses.mit; + mainProgram = "lanraragi"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/la/lanzaboote-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lanzaboote-tool/package.nix new file mode 100644 index 0000000000..919ab7d68f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -0,0 +1,55 @@ +{ systemd +, stdenv +, makeWrapper +, binutils-unwrapped +, sbsigntool +, rustPlatform +, fetchFromGitHub +, lib +}: +rustPlatform.buildRustPackage rec { + pname = "lanzaboote-tool"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "lanzaboote"; + rev = "v${version}"; + hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs="; + }; + + sourceRoot = "source/rust/tool"; + cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; + + env.TEST_SYSTEMD = systemd; + doCheck = lib.meta.availableOn stdenv.hostPlatform systemd; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + # Clean PATH to only contain what we need to do objcopy. + # This is still an unwrapped lanzaboote tool lacking of the + # UEFI stub location. + mv $out/bin/lzbt $out/bin/lzbt-unwrapped + wrapProgram $out/bin/lzbt-unwrapped \ + --set PATH ${lib.makeBinPath [ binutils-unwrapped sbsigntool ]} + ''; + + nativeCheckInputs = [ + binutils-unwrapped + sbsigntool + ]; + + meta = with lib; { + description = "Lanzaboote UEFI tooling for SecureBoot enablement on NixOS systems"; + homepage = "https://github.com/nix-community/lanzaboote"; + license = licenses.gpl3Only; + mainProgram = "lzbt"; + maintainers = with maintainers; [ raitobezarius nikstur ]; + # Broken on aarch64-linux and any other architecture for now. + # Wait for 0.4.0. + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lc/lcab/package.nix b/third_party/nixpkgs/pkgs/by-name/lc/lcab/package.nix new file mode 100644 index 0000000000..54f6159ab1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lc/lcab/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lcab"; + version = "1.0b12"; + + src = fetchurl { + # Original site is no longer available + url = "http://deb.debian.org/debian/pool/main/l/lcab/lcab_${finalAttrs.version}.orig.tar.gz"; + hash = "sha256-Bl8sF5O2XyhHHA9xt88SCnBk8o0cRLB8q/SewOl/H8g="; + }; + + patches = [ + # Fix version number + (fetchurl { + url = "https://salsa.debian.org/debian/lcab/-/raw/f72d6db6504123bd124b1a4be21ead8cc1535c9e/debian/patches/20-version.patch"; + hash = "sha256-Yb6E8nQVdicmjcGnxR7HHdsd7D+ThXk02UHiaB+PLvE="; + }) + ]; + + meta = with lib; { + description = "Create cabinet (.cab) archives"; + homepage = "http://ohnopub.net/~ohnobinki/lcab"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + mainProgram = "lcab"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/le/lemminx/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lemminx/package.nix index fe078ba84a..11fe3f070b 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/lemminx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/lemminx/package.nix @@ -56,7 +56,8 @@ maven.buildMavenPackage rec { !XMLSchemaDiagnosticsTest, !MissingChildElementCodeActionTest, !XSDValidationExternalResourcesTest, - !DocumentLifecycleParticipantTest" + !DocumentLifecycleParticipantTest, + !DTDValidationExternalResourcesTest" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix new file mode 100644 index 0000000000..7d39841ec6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libaribcaption/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake + +, fontconfig +, freetype + +, ApplicationServices +, CoreFoundation +, CoreGraphics +, CoreText +}: + +stdenv.mkDerivation rec { + pname = "libaribcaption"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "xqq"; + repo = "libaribcaption"; + rev = "v${version}"; + hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + fontconfig + freetype + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + CoreFoundation + CoreGraphics + CoreText + ]; + + meta = with lib; { + description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; + homepage = "https://github.com/xqq/libaribcaption"; + changelog = "https://github.com/xqq/libaribcaption/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ chayleaf ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/libcircle/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcircle/package.nix new file mode 100644 index 0000000000..d176bbacc8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/libcircle/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mpi +, lwgrp +}: + +stdenv.mkDerivation rec { + pname = "libcircle"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "libcircle"; + rev = "v${version}"; + hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "API for distributing embarrassingly parallel workloads using self-stabilization"; + homepage = "http://hpc.github.io/libcircle/"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix similarity index 58% rename from third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix index cb3de44757..56df13aabd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libcpuid/package.nix @@ -2,25 +2,15 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-lhoHqdS5tke462guORg+PURjVmjAgviT5KJHp6PyvUA="; + sha256 = "sha256-Zs5GKvSasdfLqo8oErDQNAuXRG27Bm9vNwyooqbol0Q="; }; - patches = [ - # Fixes cross-compilation to NetBSD - # https://github.com/anrieff/libcpuid/pull/190 - (fetchpatch { - name = "pass-pthread-to-linker.patch"; - url = "https://github.com/anrieff/libcpuid/commit/c28436e7239f28dab0e2a3bcdbce95f41e1363b1.patch"; - sha256 = "sha256-J2mB010JcE4si0rERjcrL9kJgbWHKaQCIZPDkmRvcq4="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/third_party/nixpkgs/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix similarity index 79% rename from third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix rename to third_party/nixpkgs/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index 31412e72ec..5fc90574d4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, wrapQtAppsHook +, qt6 }: stdenv.mkDerivation rec { @@ -19,15 +18,14 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/client"; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; - - cmakeFlags = [ ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + dontWrapQtApps = true; meta = with lib; { description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API"; homepage = "https://owncloud.org"; - maintainers = with maintainers; [ qknight hellwolf ]; + maintainers = with maintainers; [ hellwolf ]; platforms = platforms.unix; license = licenses.asl20; changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/by-name/li/lint-staged/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lint-staged/package.nix new file mode 100644 index 0000000000..c93044c71a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/lint-staged/package.nix @@ -0,0 +1,37 @@ +{ lib, buildNpmPackage, fetchFromGitHub, testers, lint-staged }: + +buildNpmPackage rec { + pname = "lint-staged"; + version = "14.0.1"; + + src = fetchFromGitHub { + owner = "okonet"; + repo = "lint-staged"; + rev = "v${version}"; + hash = "sha256-xuHrxi/1zfeY2dd625iLDNJFoNO28JJrPvmECdqeZXk="; + }; + + npmDepsHash = "sha256-4lyTBmcX5k//kbFHmzbOQJp+Jd9TPY7bzm51QuiXUzE="; + + dontNpmBuild = true; + + # Fixes `lint-staged --version` output + postPatch = '' + substituteInPlace package.json --replace \ + '"version": "0.0.0-development"' \ + '"version": "${version}"' + ''; + + passthru.tests.version = testers.testVersion { package = lint-staged; }; + + meta = with lib; { + description = "Run linters on git staged files"; + longDescription = '' + Run linters against staged git files and don't let 💩 slip into your code base! + ''; + homepage = src.meta.homepage; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + mainProgram = "lint-staged"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/li/litmus/package.nix b/third_party/nixpkgs/pkgs/by-name/li/litmus/package.nix new file mode 100644 index 0000000000..11068ea39f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/li/litmus/package.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, libproxy +, neon +, zlib +}: + +stdenv.mkDerivation rec { + version = "0.14"; + pname = "litmus"; + + src = fetchFromGitHub { + owner = "notroj"; + repo = "litmus"; + rev = version; + # Required for neon m4 macros, bundled neon not used + fetchSubmodules = true; + hash = "sha256-jWz0cnytgn7px3vvB9/ilWBNALQiW5/QvgguM27I3yQ="; + }; + + postPatch = '' + # neon version requirements are broken, remove them: + # configure: incompatible neon library version 0.32.5: wanted 0.27 28 29 30 31 32 + # configure: using bundled neon (0.32.5) + sed -i /NE_REQUIRE_VERSIONS/d configure.ac + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + expat + libproxy + neon + zlib + ]; + + autoreconfFlags = [ "-I" "neon/macros" ]; + + meta = with lib; { + description = "WebDAV server protocol compliance test suite"; + homepage = "http://www.webdav.org/neon/litmus/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.lorenz ]; + mainProgram = "litmus"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix new file mode 100644 index 0000000000..400e8f0250 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix @@ -0,0 +1,130 @@ +{ lib +, cmake +, darwin +, fetchFromGitHub +, nix-update-script +, stdenv +, symlinkJoin + +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } + +, rocmSupport ? config.rocmSupport +, rocmPackages ? { } + +, openclSupport ? false +, clblast + +, openblasSupport ? true +, openblas +, pkg-config +}: + +let + cudatoolkit_joined = symlinkJoin { + name = "${cudaPackages.cudatoolkit.name}-merged"; + paths = [ + cudaPackages.cudatoolkit.lib + cudaPackages.cudatoolkit.out + ] ++ lib.optionals (lib.versionOlder cudaPackages.cudatoolkit.version "11") [ + # for some reason some of the required libs are in the targets/x86_64-linux + # directory; not sure why but this works around it + "${cudaPackages.cudatoolkit}/targets/${stdenv.system}" + ]; + }; + metalSupport = stdenv.isDarwin && stdenv.isAarch64; +in +stdenv.mkDerivation (finalAttrs: { + pname = "llama-cpp"; + version = "1483"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "llama.cpp"; + rev = "refs/tags/b${finalAttrs.version}"; + hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; + }; + + postPatch = '' + substituteInPlace ./ggml-metal.m \ + --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" + ''; + + nativeBuildInputs = [ cmake ] ++ lib.optionals openblasSupport [ pkg-config ]; + + buildInputs = lib.optionals metalSupport + (with darwin.apple_sdk.frameworks; [ + Accelerate + CoreGraphics + CoreVideo + Foundation + MetalKit + ]) + ++ lib.optionals cudaSupport [ + cudatoolkit_joined + ] ++ lib.optionals rocmSupport [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.rocblas + ] ++ lib.optionals openclSupport [ + clblast + ] ++ lib.optionals openblasSupport [ + openblas + ]; + + cmakeFlags = [ + "-DLLAMA_NATIVE=OFF" + "-DLLAMA_BUILD_SERVER=ON" + ] + ++ lib.optionals metalSupport [ + "-DCMAKE_C_FLAGS=-D__ARM_FEATURE_DOTPROD=1" + "-DLLAMA_METAL=ON" + ] + ++ lib.optionals cudaSupport [ + "-DLLAMA_CUBLAS=ON" + ] + ++ lib.optionals rocmSupport [ + "-DLLAMA_HIPBLAS=1" + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + ] + ++ lib.optionals openclSupport [ + "-DLLAMA_CLBLAST=ON" + ] + ++ lib.optionals openblasSupport [ + "-DLLAMA_BLAS=ON" + "-DLLAMA_BLAS_VENDOR=OpenBLAS" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for f in bin/*; do + test -x "$f" || continue + cp "$f" $out/bin/llama-cpp-"$(basename "$f")" + done + + ${lib.optionalString metalSupport "cp ./bin/ggml-metal.metal $out/bin/ggml-metal.metal"} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + attrPath = "llama-cpp"; + extraArgs = [ "--version-regex" "b(.*)" ]; + }; + + meta = with lib; { + description = "Port of Facebook's LLaMA model in C/C++"; + homepage = "https://github.com/ggerganov/llama.cpp/"; + license = licenses.mit; + mainProgram = "llama-cpp-main"; + maintainers = with maintainers; [ dit7ya elohmeier ]; + broken = stdenv.isDarwin && stdenv.isx86_64; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix new file mode 100644 index 0000000000..a29db52765 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ll/llm-ls/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +let + pname = "llm-ls"; + version = "0.4.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "llm-ls"; + rev = version; + sha256 = "sha256-aMoT/rH6o4dHCSiSI/btdKysFfIbHvV7R5dRHIOF/Qs="; + }; + + cargoHash = "sha256-Z6BO4kDtlIrVdDk1fiwyelpu1rj7e4cibgFZRsl1pfA="; + + meta = with lib; { + description = "LSP server leveraging LLMs for code completion (and more?)"; + homepage = "https://github.com/huggingface/llm-ls"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + platforms = platforms.all; + badPlatforms = platforms.darwin; + mainProgram = "llm-ls"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ln/lngen/package.nix b/third_party/nixpkgs/pkgs/by-name/ln/lngen/package.nix new file mode 100644 index 0000000000..1b06a5b196 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ln/lngen/package.nix @@ -0,0 +1,23 @@ +{ lib +, haskellPackages +, fetchFromGitHub +}: + +haskellPackages.mkDerivation { + pname = "lngen"; + version = "unstable-2023-10-17"; + src = fetchFromGitHub { + owner = "plclub"; + repo = "lngen"; + rev = "c7645001404e0e2fec2c56f128e30079b5b3fac6"; + hash = "sha256-2vUYHtl9yAadwdTtsjTI0klP+nRSYGXVpaSwD9EBTTI="; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = with haskellPackages; [ base syb parsec containers mtl ]; + executableHaskellDepends = with haskellPackages; [ base ]; + homepage = "https://github.com/plclub/lngen"; + description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; + maintainers = with lib.maintainers; [ chen ]; + license = lib.licenses.mit; +} diff --git a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix similarity index 74% rename from third_party/nixpkgs/pkgs/games/lunar-client/default.nix rename to third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix index 24fbdf6396..1506e5c0cb 100644 --- a/third_party/nixpkgs/pkgs/games/lunar-client/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix @@ -1,6 +1,7 @@ { appimageTools , fetchurl , lib +, makeWrapper }: let @@ -9,7 +10,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-6OAGNkMyHOZI5wh92OtalnvUVFWNAS9PvkFS0e4YXhk="; + hash = "sha512-YUddAvsPbuuOvhJZsWDvgF/7yghABU6Av7DcKNX1bKZqE3BzMAAQADJuNuNL4+UydoTaHetXvRO8oJCbrqgtAQ=="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -19,6 +20,9 @@ appimageTools.wrapType2 rec { extraInstallCommands = '' mv $out/bin/{${pname}-${version},${pname}} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png substituteInPlace $out/share/applications/lunar-client.desktop \ @@ -26,6 +30,8 @@ appimageTools.wrapType2 rec { --replace 'Icon=launcher' 'Icon=lunar-client' ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Free Minecraft client with mods, cosmetics, and performance boost."; homepage = "https://www.lunarclient.com/"; diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh new file mode 100755 index 0000000000..aa0adbff2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl yq +set -eu -o pipefail + +target="$(dirname "$(readlink -f "$0")")/package.nix" +host="https://launcherupdates.lunarclientcdn.com" +metadata=$(curl "$host/latest-linux.yml") +version=$(echo "$metadata" | yq .version -r) +sha512=$(echo "$metadata" | yq .sha512 -r) + +sed -i "s@version = .*;@version = \"$version\";@g" "$target" +sed -i "s@hash.* = .*;@hash = \"sha512-$sha512\";@g" "$target" diff --git a/third_party/nixpkgs/pkgs/by-name/lu/lunarvim/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunarvim/package.nix new file mode 100644 index 0000000000..5dcd5585ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lu/lunarvim/package.nix @@ -0,0 +1,147 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, makeWrapper +, cargo +, curl +, fd +, fzf +, git +, gnumake +, gnused +, gnutar +, gzip +, lua-language-server +, neovim +, nodejs +, nodePackages +, ripgrep +, tree-sitter +, unzip +, nvimAlias ? false +, viAlias ? false +, vimAlias ? false +, globalConfig ? "" +}: + +stdenv.mkDerivation (finalAttrs: { + inherit nvimAlias viAlias vimAlias globalConfig; + + pname = "lunarvim"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "LunarVim"; + repo = "LunarVim"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-z1Cw3wGpFDmlrAIy7rrjlMtzcW7a6HWSjI+asEDcGPA="; + }; + + # Pull in the fix for Nerd Fonts until the next release + patches = [ + ( + fetchpatch { + url = "https://github.com/LunarVim/LunarVim/commit/d187cbd03fbc8bd1b59250869e0e325518bf8798.patch"; + sha256 = "sha256-ktkQ2GiIOhbVOMjy1u5Bf8dJP4SXHdG4j9OEFa9Fm7w="; + } + ) + ]; + + nativeBuildInputs = [ + gnused + makeWrapper + ]; + + runtimeDeps = [ + stdenv.cc + cargo + curl + fd + fzf + git + gnumake + gnutar + gzip + lua-language-server + neovim + nodejs + nodePackages.neovim + ripgrep + tree-sitter + unzip + ]; + + buildPhase = '' + runHook preBuild + + mkdir -p share/lvim + cp init.lua utils/installer/config.example.lua share/lvim + cp -r lua snapshots share/lvim + + mkdir bin + cp utils/bin/lvim.template bin/lvim + chmod +x bin/lvim + + # LunarVim automatically copies config.example.lua, but we need to make it writable. + sed -i "2 i\\ + if [ ! -f \$HOME/.config/lvim/config.lua ]; then \\ + cp $out/share/lvim/config.example.lua \$HOME/.config/lvim/config.lua \\ + chmod +w \$HOME/.config/lvim/config.lua \\ + fi + " bin/lvim + + substituteInPlace bin/lvim \ + --replace NVIM_APPNAME_VAR lvim \ + --replace RUNTIME_DIR_VAR \$HOME/.local/share/lvim \ + --replace CONFIG_DIR_VAR \$HOME/.config/lvim \ + --replace CACHE_DIR_VAR \$HOME/.cache/lvim \ + --replace BASE_DIR_VAR $out/share/lvim \ + --replace nvim ${neovim}/bin/nvim + + # Allow language servers to be overridden by appending instead of prepending + # the mason.nvim path. + echo "lvim.builtin.mason.PATH = \"append\"" > share/lvim/global.lua + echo ${ lib.strings.escapeShellArg finalAttrs.globalConfig } >> share/lvim/global.lua + sed -i "s/add_to_path()/add_to_path(true)/" share/lvim/lua/lvim/core/mason.lua + sed -i "/Log:set_level/idofile(\"$out/share/lvim/global.lua\")" share/lvim/lua/lvim/config/init.lua + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r bin share $out + + for iconDir in utils/desktop/*/; do + install -Dm444 $iconDir/lvim.svg -t $out/share/icons/hicolor/$(basename $iconDir)/apps + done + + install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications + + wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \ + --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \ + --prefix CC : ${stdenv.cc.targetPrefix}cc + '' + lib.optionalString finalAttrs.nvimAlias '' + ln -s $out/bin/lvim $out/bin/nvim + '' + lib.optionalString finalAttrs.viAlias '' + ln -s $out/bin/lvim $out/bin/vi + '' + lib.optionalString finalAttrs.vimAlias '' + ln -s $out/bin/lvim $out/bin/vim + '' + '' + runHook postInstall + ''; + + meta = with lib; { + description = "IDE layer for Neovim"; + homepage = "https://www.lunarvim.org/"; + changelog = "https://github.com/LunarVim/LunarVim/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ prominentretail ]; + platforms = platforms.unix; + mainProgram = "lvim"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix b/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix new file mode 100644 index 0000000000..c9c657bee3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lw/lwgrp/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, mpi, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lwgrp"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "lwgrp"; + rev = "v${version}"; + hash = "sha256-f0tYn9FbrOz8iMoG8Is8vYDNfYHTfxLKNnyxJA+Msdk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Data structures and operations to group MPI processes as an ordered set"; + homepage = "https://github.com/LLNL/lwgrp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch b/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch new file mode 100644 index 0000000000..ea3d240da8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch @@ -0,0 +1,25 @@ +From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001 +From: Adam Stephens +Date: Fri, 27 Oct 2023 13:26:11 -0400 +Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file + path + +Signed-off-by: Adam Stephens +--- + cmd/lxd-to-incus/targets.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go +index f2b405e0e4..ed84d3ebce 100644 +--- a/cmd/lxd-to-incus/targets.go ++++ b/cmd/lxd-to-incus/targets.go +@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool { + return false + } + +- if !util.PathExists("/lib/systemd/system/incus.service") { ++ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service") ++ if err != nil { + return false + } + diff --git a/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/package.nix new file mode 100644 index 0000000000..8e58ede27c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "lxd-to-incus"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "lxc"; + repo = "incus"; + rev = "refs/tags/incus-${version}"; + hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; + }; + + patches = [ + ./d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch + ]; + + modRoot = "cmd/lxd-to-incus"; + + vendorHash = "sha256-J95b4fm+VwndoxS8RQF8V8ufI3RjclqzAskEd3ut4bU="; + + CGO_ENABLED = 0; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "-vr" "incus-\(.*\)" + ]; + }; + }; + + meta = { + description = "LXD to Incus migration tool"; + homepage = "https://linuxcontainers.org/incus"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ adamcstephens ]; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/m2/m2-mesoplanet/package.nix b/third_party/nixpkgs/pkgs/by-name/m2/m2-mesoplanet/package.nix new file mode 100644 index 0000000000..d4f7419f91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/m2/m2-mesoplanet/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, mescc-tools +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-mesoplanet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Mesoplanet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-hE7xvX84q3tk0XakveYDJhrhfBnpoItQs456NCzFfws="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ mescc-tools ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Mesoplanet $out/bin/M2-Mesoplanet + + runHook postInstall + ''; + + meta = with lib; { + description = "Macro Expander Saving Our m2-PLANET"; + homepage = "https://github.com/oriansj/M2-Mesoplanet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Mesoplanet"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/m2/m2-planet/package.nix b/third_party/nixpkgs/pkgs/by-name/m2/m2-planet/package.nix new file mode 100644 index 0000000000..926d829ba6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/m2/m2-planet/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2-planet"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2-Planet"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-xVwUO67PlRiBj/YBnnTXFGh3jH470fcbaNjABoyYes4="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + # Upstream overrides the optimisation to be -O0, which is incompatible with fortify. Let's disable it. + hardeningDisable = [ "fortify" ]; + + installPhase = '' + runHook preInstall + + install -D bin/M2-Planet $out/bin/M2-Planet + + runHook postInstall + ''; + + meta = with lib; { + description = "PLAtform NEutral Transpiler"; + homepage = "https://github.com/oriansj/M2-Planet"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + mainProgram = "M2-Planet"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/m2/m2libc/package.nix b/third_party/nixpkgs/pkgs/by-name/m2/m2libc/package.nix new file mode 100644 index 0000000000..6c7b695ef7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/m2/m2libc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "m2libc"; + version = "unstable-2023-05-22"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "M2libc"; + rev = "de7c75f144176c3b9be77695d9bf94440445aeae"; + hash = "sha256-248plvODhBRfmx7zOmf05ICbk8vzSbaceZJ0j+wPaAY="; + }; + + patches = [ + # # aarch64: syscall: mkdir -> mkdirat + # https://github.com/oriansj/M2libc/pull/17 + (fetchpatch { + url = "https://github.com/oriansj/M2libc/commit/ff7c3023b3ab6cfcffc5364620b25f8d0279e96b.patch"; + hash = "sha256-QAKddv4TixIQHpFa9SVu9fAkeKbzhQaxjaWzW2yJy7A="; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -r . $out/include/M2libc + + runHook postInstall + ''; + + meta = with lib; { + description = "More standards compliant C library written in M2-Planet's C subset"; + homepage = "https://github.com/oriansj/m2libc"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "riscv32-linux" "riscv64-linux" ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix new file mode 100644 index 0000000000..28d7631e39 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -0,0 +1,39 @@ +{ lib +, maven +, fetchFromGitHub +, nix-update-script +}: + +maven.buildMavenPackage rec { + pname = "mariadb-connector-java"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "mariadb-corporation"; + repo = "mariadb-connector-j"; + rev = "refs/tags/${version}"; + hash = "sha256-JuMm01ihgVoKpe8wyuUIDyzSxMODRg7dQpTCyVA/K10="; + }; + + mvnHash = "sha256-Px4Qxb1tTvRKZum1xfe0mdX+EyimnyyfzrydiaDaYRo="; + + # Disable tests because they require networking + mvnParameters = "-DskipTests"; + + installPhase = '' + runHook preInstall + install -m444 -D target/mariadb-java-client-${version}.jar $out/share/java/mariadb-java-client.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases"; + homepage = "https://mariadb.com/kb/en/about-mariadb-connector-j/"; + changelog = "https://mariadb.com/kb/en/mariadb-connector-j-release-notes/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ anthonyroussel ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix new file mode 100644 index 0000000000..d15f6bf67b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +}: + +buildNpmPackage rec { + pname = "mathjax-node-cli"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "mathjax"; + repo = "mathjax-node-cli"; + rev = version; + hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY="; + }; + + patches = [ + # https://github.com/mathjax/mathjax-node-cli/pull/20 + (fetchpatch { + name = "add-package-lock.patch"; + url = "https://github.com/mathjax/mathjax-node-cli/commit/ac304d896d840dc5004045f012abab40648d20fd.patch"; + hash = "sha256-kIfxF5II/PHtzBhhMbO2RcEuZQCNFrLeAnL536WBXq8="; + }) + ]; + + npmDepsHash = "sha256-gGTRr8CN6aP/T/jUqt4E53DYVaz7ykaoG519+3sPdXo="; + + dontNpmBuild = true; + + meta = { + description = "CLI tools for mathjax-node"; + homepage = "https://github.com/mathjax/mathjax-node-cli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix index 1eba5cf035..d315725761 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "matrix-commander-rs"; - version = "0.1.32"; + version = "0.3.0"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-Bp4bP77nWi0XLhI4/wsry6fEW2BR90Y+XqV/WCinwJo="; + hash = "sha256-aecmd7LtHowH+nqLcRNDSfAxZDKtBTrG1KNyRup8CYI="; }; - cargoHash = "sha256-HPkpCnlSZ9sY40gc4dLOdcBhATvJVeqk7GJ0+XqjHVk="; + cargoHash = "sha256-2biUWLWE0XtmB79yxFahQqLmqwH/6q50IhkcbUrBifU="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/mc/mcuboot-imgtool/package.nix b/third_party/nixpkgs/pkgs/by-name/mc/mcuboot-imgtool/package.nix new file mode 100644 index 0000000000..812c07f834 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mc/mcuboot-imgtool/package.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, python3Packages +, nix-update-script +}: + +python3Packages.buildPythonApplication rec { + pname = "mfgtool-imgtool"; + version = "2.0.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "imgtool"; + hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ + cbor2 + click + cryptography + intelhex + ]; + + meta = with lib; { + description = "MCUboot's image signing and key management"; + homepage = "https://github.com/mcu-tools/mcuboot/tree/main/scripts"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + mainProgram = "imgtool"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/me/memtree/package.nix b/third_party/nixpkgs/pkgs/by-name/me/memtree/package.nix new file mode 100644 index 0000000000..2165b46e2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/memtree/package.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, python3Packages +}: + +python3Packages.buildPythonApplication { + pname = "memtree"; + version = "unstable-2023-11-04"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nbraud"; + repo = "memtree"; + rev = "093caeef26ee944b5bf4408710f63494e442b5ff"; + hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo="; + }; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + rich + ]; + + nativeCheckInputs = with python3Packages; [ + hypothesis + pytest + ]; + + checkPhase = '' + runHook preCheck + python -m pytest -v + runHook postCheck + ''; + + pythonImportChecks = [ "memtree" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Render cgroups tree annotated by memory usage"; + homepage = "https://github.com/nbraud/memtree"; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix new file mode 100644 index 0000000000..e90bd8d10b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mercure/package.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, testers +, mercure +}: + +buildGoModule rec { + pname = "mercure"; + version = "0.15.5"; + + src = fetchFromGitHub { + owner = "dunglas"; + repo = "mercure"; + rev = "v${version}"; + hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA="; + }; + + sourceRoot = "source/caddy"; + + vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw="; + + subPackages = [ "mercure" ]; + excludedPackages = [ "../cmd/mercure" ]; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks v${version} Caddy'" + ]; + + doCheck = false; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + version = "v${version}"; + package = mercure; + command = "mercure version"; + }; + }; + + meta = with lib; { + description = "An open, easy, fast, reliable and battery-efficient solution for real-time communications"; + homepage = "https://github.com/dunglas/mercure"; + changelog = "https://github.com/dunglas/mercure/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ gaelreyrol ]; + platforms = platforms.unix; + mainProgram = "mercure"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/meritous/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meritous/package.nix similarity index 60% rename from third_party/nixpkgs/pkgs/games/meritous/default.nix rename to third_party/nixpkgs/pkgs/by-name/me/meritous/package.nix index c7631f2370..8b0a176938 100644 --- a/third_party/nixpkgs/pkgs/games/meritous/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meritous/package.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "meritous"; - version = "1.4"; + version = "1.5"; src = fetchFromGitLab { owner = "meritous"; repo = "meritous"; - rev = "314af46d84d2746eec4c30a0f63cbc2e651d5303"; - sha256 = "1hrwm65isg5nwzydyd8gvgl3p36sbj09rsn228sppr8g5p9sm10x"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg="; }; prePatch = '' substituteInPlace Makefile \ - --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \ - --replace sld-config ${lib.getDev SDL}/bin/sdl-config + --replace "prefix=/usr/local" "prefix=$out" \ + --replace sdl-config ${lib.getDev SDL}/bin/sdl-config + substituteInPlace src/audio.c \ --replace "filename[64]" "filename[256]" ''; @@ -31,10 +32,11 @@ stdenv.mkDerivation { meta = with lib; { description = "Action-adventure dungeon crawl game"; - homepage = "http://www.asceai.net/meritous/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/meritous/meritous"; + changelog = "https://gitlab.com/meritous/meritous/-/blob/master/NEWS"; + license = licenses.gpl3Only; + mainProgram = "meritous"; maintainers = [ maintainers.alexvorobiev ]; platforms = platforms.linux; }; -} - +}) diff --git a/third_party/nixpkgs/pkgs/by-name/me/mescc-tools-extra/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mescc-tools-extra/package.nix new file mode 100644 index 0000000000..892c185060 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mescc-tools-extra/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, m2libc +, perl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools-extra"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "oriansj"; + repo = "mescc-tools-extra"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-LS9Eq1z+OsDF7Jq0TfF4u8jEJ5bjcLZNfKtnpIbtG20="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ perl ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://github.com/oriansj/mescc-tools-extra"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/me/mescc-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/me/mescc-tools/package.nix new file mode 100644 index 0000000000..635e375aa8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/mescc-tools/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromSavannah +, m2libc +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mescc-tools"; + version = "1.5.1"; + + src = fetchFromSavannah { + repo = "mescc-tools"; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-jFDrmzsjKEQKOKlsch1ceWtzUhoJAJVyHjXGVhjE9/U="; + }; + + # Don't use vendored M2libc + postPatch = '' + rmdir M2libc + ln -s ${m2libc}/include/M2libc M2libc + ''; + + enableParallelBuilding = true; + + doCheck = true; + checkTarget = "test"; + nativeCheckInputs = [ which ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Collection of tools written for use in bootstrapping"; + homepage = "https://savannah.nongnu.org/projects/mescc-tools"; + license = licenses.gpl3Only; + maintainers = teams.minimal-bootstrap.members; + inherit (m2libc.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/001-fix-rpath.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/fix-rpath.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/001-fix-rpath.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/002-clear-old-rpath.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/002-clear-old-rpath.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/more-env-vars.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/003-more-env-vars.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/004-gir-fallback-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/004-gir-fallback-path.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/disable-bitcode.patch rename to third_party/nixpkgs/pkgs/by-name/me/meson/006-disable-bitcode.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/emulator-hook.sh b/third_party/nixpkgs/pkgs/by-name/me/meson/emulator-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/emulator-hook.sh rename to third_party/nixpkgs/pkgs/by-name/me/meson/emulator-hook.sh diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix rename to third_party/nixpkgs/pkgs/by-name/me/meson/package.nix index aa09a5d235..6239927848 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix @@ -3,50 +3,38 @@ , fetchFromGitHub , fetchpatch , installShellFiles +, coreutils +, darwin +, libxcrypt , ninja , pkg-config , python3 -, zlib -, coreutils , substituteAll -, Foundation -, OpenGL -, AppKit -, Cocoa -, libxcrypt +, zlib }: +let + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation OpenGL; +in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-bJAmkE+sL9DqKpcjZdBf4/z9lz+m/o0Z87hlAwbVbTY="; + hash = "sha256-dgYYz3tQDG6Z4eE77WO2dXdardxVzzGaFLQ5znPcTlw="; }; patches = [ - # Meson is currently inspecting fewer variables than autoconf does, which - # makes it harder for us to use setup hooks, etc. Taken from - # https://github.com/mesonbuild/meson/pull/6827 - ./more-env-vars.patch - - # Unlike libtool, vanilla Meson does not pass any information - # about the path library will be installed to to g-ir-scanner, - # breaking the GIR when path other than ${!outputLib}/lib is used. - # We patch Meson to add a --fallback-library-path argument with - # library install_dir to g-ir-scanner. - ./gir-fallback-path.patch - - # In common distributions, RPATH is only needed for internal libraries so + # In typical distributions, RPATH is only needed for internal libraries so # meson removes everything else. With Nix, the locations of libraries # are not as predictable, therefore we need to keep them in the RPATH. # At the moment we are keeping the paths starting with /nix/store. # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 (substituteAll { - src = ./fix-rpath.patch; + src = ./001-fix-rpath.patch; inherit (builtins) storeDir; }) @@ -56,50 +44,89 @@ python3.pkgs.buildPythonApplication rec { # But this can cause much bigger problem for Nix as it can produce # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. - ./clear-old-rpath.patch + ./002-clear-old-rpath.patch + + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. + # https://github.com/mesonbuild/meson/pull/6827 + ./003-more-env-vars.patch + + # Unlike libtool, vanilla Meson does not pass any information about the path + # library will be installed to to g-ir-scanner, breaking the GIR when path + # other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with library + # install_dir to g-ir-scanner. + ./004-gir-fallback-path.patch # Patch out default boost search paths to avoid impure builds on # unsandboxed non-NixOS builds, see: # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 - ./boost-Do-not-add-system-paths-on-nix.patch + ./005-boost-Do-not-add-system-paths-on-nix.patch # Nixpkgs cctools does not have bitcode support. - ./disable-bitcode.patch + ./006-disable-bitcode.patch # Fix passing multiple --define-variable arguments to pkg-config. # https://github.com/mesonbuild/meson/pull/10670 (fetchpatch { url = "https://github.com/mesonbuild/meson/commit/d5252c5d4cf1c1931fef0c1c98dd66c000891d21.patch"; - sha256 = "GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; + hash = "sha256-GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; excludes = [ "docs/yaml/objects/dep.yaml" ]; }) ]; - setupHook = ./setup-hook.sh; + buildInputs = lib.optionals (python3.pythonOlder "3.9") [ + libxcrypt + ]; - nativeCheckInputs = [ ninja pkg-config ]; - checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; - checkPhase = '' - runHook preCheck + nativeBuildInputs = [ installShellFiles ]; - patchShebangs 'test cases' - substituteInPlace 'test cases/native/8 external program shebang parsing/script.int.in' \ - --replace /usr/bin/env ${coreutils}/bin/env + nativeCheckInputs = [ + ninja + pkg-config + ]; + + checkInputs = [ + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + OpenGL + ]; + + checkPhase = lib.concatStringsSep "\n" ([ + "runHook preCheck" + '' + patchShebangs 'test cases' + substituteInPlace \ + 'test cases/native/8 external program shebang parsing/script.int.in' \ + --replace /usr/bin/env ${coreutils}/bin/env + '' + ] + # Remove problematic tests + ++ (builtins.map (f: ''rm -vr "${f}";'') [ # requires git, creating cyclic dependency - rm -r 'test cases/common/66 vcstag' + ''test cases/common/66 vcstag'' # requires glib, creating cyclic dependency - rm -r 'test cases/linuxlike/6 subdir include order' - rm -r 'test cases/linuxlike/9 compiler checks with dependencies' + ''test cases/linuxlike/6 subdir include order'' + ''test cases/linuxlike/9 compiler checks with dependencies'' # requires static zlib, see #66461 - rm -r 'test cases/linuxlike/14 static dynamic linkage' + ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. - rm -r 'test cases/osx/7 bitcode' - HOME="$TMPDIR" python ./run_project_tests.py + ''test cases/osx/7 bitcode'' + ]) + ++ [ + ''HOME="$TMPDIR" python ./run_project_tests.py'' + "runHook postCheck" + ]); - runHook postCheck + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson ''; postFixup = '' @@ -117,18 +144,9 @@ python3.pkgs.buildPythonApplication rec { --replace "python3 -c " "${python3.interpreter} -c " ''; - buildInputs = lib.optionals (python3.pythonOlder "3.9") [ - libxcrypt - ]; + setupHook = ./setup-hook.sh; - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --zsh data/shell-completions/zsh/_meson - installShellCompletion --bash data/shell-completions/bash/meson - ''; - - meta = with lib; { + meta = { homepage = "https://mesonbuild.com"; description = "An open source, fast and friendly build system made in Python"; longDescription = '' @@ -140,8 +158,8 @@ python3.pkgs.buildPythonApplication rec { second spent waiting for the build system to actually start compiling code. ''; - license = licenses.asl20; - maintainers = with maintainers; [ mbe AndersonTorres ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (python3.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh new file mode 100644 index 0000000000..85849fbec7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh @@ -0,0 +1,87 @@ +# shellcheck shell=bash disable=SC2206 + +mesonConfigurePhase() { + runHook preConfigure + + local flagsArray=() + + if [ -z "${dontAddPrefix-}" ]; then + flagsArray+=("--prefix=$prefix") + fi + + # See multiple-outputs.sh and meson’s coredata.py + flagsArray+=( + "--libdir=${!outputLib}/lib" + "--libexecdir=${!outputLib}/libexec" + "--bindir=${!outputBin}/bin" + "--sbindir=${!outputBin}/sbin" + "--includedir=${!outputInclude}/include" + "--mandir=${!outputMan}/share/man" + "--infodir=${!outputInfo}/share/info" + "--localedir=${!outputLib}/share/locale" + "-Dauto_features=${mesonAutoFeatures:-enabled}" + "-Dwrap_mode=${mesonWrapMode:-nodownload}" + ${crossMesonFlags} + "--buildtype=${mesonBuildType:-plain}" + ) + + flagsArray+=( + $mesonFlags + "${mesonFlagsArray[@]}" + ) + + echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" + + meson setup build "${flagsArray[@]}" + cd build || { echoCmd 'mesonConfigurePhase' "could not cd to build"; exit 1; } + + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echoCmd 'mesonConfigurePhase' "enabled parallel building" + fi + + if [[ ${checkPhase-ninjaCheckPhase} = ninjaCheckPhase && -z $dontUseMesonCheck ]]; then + checkPhase=mesonCheckPhase + fi + if [[ ${installPhase-ninjaInstallPhase} = ninjaInstallPhase && -z $dontUseMesonInstall ]]; then + installPhase=mesonInstallPhase + fi + + runHook postConfigure +} + +mesonCheckPhase() { + runHook preCheck + + local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}") + + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" + meson test --no-rebuild "${flagsArray[@]}" + + runHook postCheck +} + +mesonInstallPhase() { + runHook preInstall + + local flagsArray=() + + if [[ -n "$mesonInstallTags" ]]; then + flagsArray+=("--tags" "${mesonInstallTags// /,}") + fi + flagsArray+=( + $mesonInstallFlags + "${mesonInstallFlagsArray[@]}" + ) + + echoCmd 'mesonInstallPhase flags' "${flagsArray[@]}" + meson install --no-rebuild "${flagsArray[@]}" + + runHook postInstall +} + +if [ -z "${dontUseMesonConfigure-}" ] && [ -z "${configurePhase-}" ]; then + # shellcheck disable=SC2034 + setOutputFlags= + configurePhase=mesonConfigurePhase +fi diff --git a/third_party/nixpkgs/pkgs/by-name/mi/migra/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/migra/package.nix new file mode 100644 index 0000000000..8fd3ef6332 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/migra/package.nix @@ -0,0 +1,59 @@ +{ lib +, python3 +, fetchFromGitHub +, postgresql +, postgresqlTestHook +, +}: +python3.pkgs.buildPythonApplication rec { + pname = "migra"; + version = "3.0.1647431138"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + rev = version; + hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + schemainspect + six + sqlbag + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + postgresql + postgresqlTestHook + ]; + preCheck = '' + export PGUSER="nixbld"; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # See this issue: https://github.com/djrobstep/migra/issues/232 + "test_excludeschema" + "test_fixtures" + "test_rls" + "test_singleschema" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + + meta = with lib; { + description = "Like diff but for PostgreSQL schemas"; + homepage = "https://github.com/djrobstep/migra"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mi/minecraftia/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/minecraftia/package.nix new file mode 100644 index 0000000000..584730ea8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/minecraftia/package.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation { + pname = "minecraftia"; + version = "1.0"; + + src = fetchzip { + url = "https://fontlibrary.org/assets/downloads/minecraftia/71962a7e3d4a70435c030466a12f1d63/minecraftia.zip"; + hash = "sha256-AZFSts0GpBttbhl1LHMORiqqc9o7ZWhh5hbjhSnxAlA="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/Minecraftia.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://fontlibrary.org/en/font/minecraftia"; + description = "Cool Minecraft font"; + license = licenses.cc-by-sa-30; + platforms = platforms.all; + maintainers = with lib.maintainers; [ gepbird ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mi/minetest-mapserver/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/minetest-mapserver/package.nix new file mode 100644 index 0000000000..629a46511f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -0,0 +1,28 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "minetest-mapserver"; + version = "4.7.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "mapserver"; + rev = "v${version}"; + hash = "sha256-qThdNXb17mh3Ph57d3oUl/KhP64AKPZJOCVsvr2SDWk="; + }; + + vendorHash = "sha256-VSyzdiPNcHDH/ebM2A0pTAyiMblMaJGEIULsIzupmaw="; + + meta = with lib; { + description = "Realtime mapserver for minetest"; + mainProgram = "mapserver"; + homepage = "https://github.com/${pname}/mapserver/blob/master/readme.md"; + changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}"; + license = with licenses; [ mit cc-by-sa-30 ]; + platforms = platforms.all; + maintainers = with maintainers; [ gm6k ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modern-cpp-kafka/package.nix new file mode 100644 index 0000000000..daa3396255 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/modern-cpp-kafka/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, boost +, rdkafka +, gtest +, rapidjson +}: + +stdenv.mkDerivation rec { + pname = "modern-cpp-kafka"; + version = "2023.03.07"; + + src = fetchFromGitHub { + repo = "modern-cpp-kafka"; + owner = "morganstanley"; + rev = "v${version}"; + hash = "sha256-7hkwM1YbveQpDRqwMZ3MXM88LTwlAT7uB8NL0t409To="; + }; + + patches = [ + (fetchpatch { + name = "fix-avoid-overwriting-library-paths.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/pull/221.patch"; + hash = "sha256-UsQcMvJoRTn5kgXhmXOyqfW3n59kGKO596U2WjtdqAY="; + }) + (fetchpatch { + name = "add-pkg-config-cmake-config.patch"; + url = "https://github.com/morganstanley/modern-cpp-kafka/pull/222.patch"; + hash = "sha256-OjoSttnpgEwSZjCVKc888xJb5f1Dulu/rQqoGmqXNM4="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + propagatedBuildInputs = [ rdkafka ]; + + cmakeFlags = [ + "-DLIBRDKAFKA_INCLUDE_DIR=${rdkafka.out}/include" + "-DGTEST_LIBRARY_DIR=${gtest.out}/lib" + "-DGTEST_INCLUDE_DIR=${gtest.dev}/include" + "-DRAPIDJSON_INCLUDE_DIRS=${rapidjson.out}/include" + "-DCMAKE_CXX_FLAGS=-Wno-uninitialized" + ]; + + checkInputs = [ gtest rapidjson ]; + + meta = with lib; { + description = "A C++ API for Kafka clients (i.e. KafkaProducer, KafkaConsumer, AdminClient)"; + homepage = "https://github.com/morganstanley/modern-cpp-kafka"; + license = licenses.asl20; + maintainers = with maintainers; [ ditsuke ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/mommy/default.nix b/third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix similarity index 67% rename from third_party/nixpkgs/pkgs/tools/misc/mommy/default.nix rename to third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix index ae04e92c63..24e83eef6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mommy/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix @@ -23,28 +23,15 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-LT21MJg2rF84o2rWKguEP4UUOOu27nNGls95sBYgICw="; + hash = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; }; - patches = [ - # 🫣 mommy finds your config with an environment variable now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/d5785521fe2ce9ec832dbfe20abc483545b1df97.patch"; - hash = "sha256-GacUjQyvvwRRYKIHHTTAL0mQSPMZbbxacqilBaw807Y="; - }) - # 💜 mommy follows the XDG base directory specification now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/71806bc0ace2822ac32dc8dd5bb0b0881d849982.patch"; - hash = "sha256-Znq3VOgYI7a13Fqyz9nevtrvn7S5Jb2uBc78D0BG8rY="; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = [ shellspec ]; installFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix new file mode 100644 index 0000000000..a27be47afa --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/monaspace/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "monaspace"; + version = "1.000"; + + src = fetchzip { + url = "https://github.com/githubnext/monaspace/releases/download/v${finalAttrs.version}/monaspace-v${finalAttrs.version}.zip"; + stripRoot = false; + hash = "sha256-H8NOS+pVkrY9DofuJhPR2OlzkF4fMdmP2zfDBfrk83A="; + }; + + outputs = [ "out" "woff" ]; + + installPhase = '' + runHook preInstall + + pushd monaspace-v${finalAttrs.version}/fonts/ + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 variable/*.ttf -t $out/share/fonts/truetype + install -Dm644 webfonts/*.woff -t $woff/share/fonts/woff + popd + + runHook postInstall + ''; + + meta = { + description = "An innovative superfamily of fonts for code"; + longDescription = '' + Since the earliest days of the teletype machine, code has been set in + monospaced type — letters, on a grid. Monaspace is a new type system that + advances the state of the art for the display of code on screen. + + Every advancement in the technology of computing has been accompanied by + advancements to the display and editing of code. CRTs made screen editors + possible. The advent of graphical user interfaces gave rise to integrated + development environments. + + Even today, we still have limited options when we want to layer additional + meaning on top of code. Syntax highlighting was invented in 1982 to help + children to code in BASIC. But beyond colors, most editors must + communicate with developers through their interfaces — hovers, underlines, + and other graphical decorations. + + Monaspace offers a more expressive palette for code and the tools we use + to work with it. + ''; + homepage = "https://monaspace.githubnext.com/"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix new file mode 100644 index 0000000000..eecbbca3b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mo/monophony/package.nix @@ -0,0 +1,71 @@ +{ lib +, fetchFromGitLab +, python3Packages +, wrapGAppsHook4 +, gst_all_1 +, gobject-introspection +, yt-dlp +, libadwaita +, libsoup_3 +, glib-networking +}: +python3Packages.buildPythonApplication rec { + pname = "monophony"; + version = "2.3.1"; + format = "other"; + + sourceRoot = "source/source"; + src = fetchFromGitLab { + owner = "zehkira"; + repo = "monophony"; + rev = "v${version}"; + hash = "sha256-dpRTHsujaIwzgr+qY5LC9xtXz40g3akdpEiHuxiilZM="; + }; + + pythonPath = with python3Packages; [ + mpris-server + pygobject3 + ytmusicapi + ]; + + nativeBuildInputs = [ + python3Packages.nuitka + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = + [ + libadwaita + # needed for gstreamer https + libsoup_3 + glib-networking + ] + ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gstreamer + ]); + + installFlags = [ "prefix=$(out)" ]; + + preFixup = '' + buildPythonPath "$pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix PATH : "${lib.makeBinPath [yt-dlp]}" + # needed for gstreamer https + --prefix LD_LIBRARY_PATH : "${libsoup_3.out}/lib" + ) + ''; + + meta = with lib; { + homepage = "https://gitlab.com/zehkira/monophony"; + description = "Linux app for streaming music from YouTube"; + longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account."; + license = licenses.agpl3Plus; + mainProgram = "monophony"; + platforms = platforms.linux; + maintainers = with maintainers; [ quadradical ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/mp/mpifileutils/package.nix b/third_party/nixpkgs/pkgs/by-name/mp/mpifileutils/package.nix new file mode 100644 index 0000000000..92300592c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/mp/mpifileutils/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mpi +, attr +, dtcmp +, libarchive +, libcircle +, bzip2 +, openssl +}: + +stdenv.mkDerivation rec { + pname = "mpifileutils"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "mpifileutils"; + rev = "v${version}"; + hash = "sha256-3nls82awMMCwlfafsOy3AY8OvT9sE+BvvsDOY14YvQc="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + attr + dtcmp + libarchive + libcircle + bzip2 + openssl + ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Suite of MPI-based tools to manage large datasets"; + homepage = "https://hpc.github.io/mpifileutils"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix new file mode 100644 index 0000000000..37d746f7c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ms/msolve/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, flint +, gmp +, mpfr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msolve"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "algebraic-solving"; + repo = "msolve"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE="; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + flint + gmp + mpfr + ]; + + doCheck = true; + + meta = with lib; { + description = "Library for polynomial system solving through algebraic methods"; + homepage = "https://msolve.lip6.fr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix new file mode 100644 index 0000000000..4cd0658f3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/my/mystmd/package.nix @@ -0,0 +1,39 @@ +{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }: + +buildNpmPackage rec { + pname = "mystmd"; + version = "1.1.27"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "mystmd"; + rev = "mystmd@${version}"; + hash = "sha256-aMoL125DjXM/HL+ebCkjywwEv1VTKPmF2CV/TJd1LMU="; + }; + + npmDepsHash = "sha256-i1tbHCI/z/kiGIROlVMvnt7x4f8D7pzTk1BcSPFDwFw="; + + dontNpmInstall = true; + + installPhase = '' + runHook preInstall + + install -D packages/mystmd/dist/myst.cjs $out/bin/myst + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = mystmd; + version = "v${version}"; + }; + + meta = with lib; { + description = "Command line tools for working with MyST Markdown"; + homepage = "https://github.com/executablebooks/mystmd"; + changelog = "https://github.com/executablebooks/mystmd/blob/${src.rev}/packages/myst-cli/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "myst"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/n2/n2/package.nix b/third_party/nixpkgs/pkgs/by-name/n2/n2/package.nix new file mode 100644 index 0000000000..dd35f134d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/n2/n2/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "n2"; + version = "unstable-2023-10-10"; + + src = fetchFromGitHub { + owner = "evmar"; + repo = "n2"; + rev = "90041c1f010d27464e3b18e38440ed9855ea62ef"; + hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY="; + }; + + cargoHash = "sha256-jrIo0N3o2fYe3NgNG33shkMd0rJxi5evtidCL9BcfVc="; + + meta = with lib; { + homepage = "https://github.com/evmar/n2"; + description = "A ninja compatible build system"; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} 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 new file mode 100644 index 0000000000..e0dd291ef7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "namespace-cli"; + version = "0.0.302"; + + src = fetchFromGitHub { + owner = "namespacelabs"; + repo = "foundation"; + rev = "v${version}"; + hash = "sha256-I4ZkPdxidT2670NU5o1QTaee4fuDJNEirg7peuHqaJQ="; + }; + + vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; + + subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; + + ldflags = [ + "-s" + "-w" + "-X namespacelabs.dev/foundation/internal/cli/version.Tag=v${version}" + ]; + + meta = with lib; { + mainProgram = "nsc"; + maintainers = with maintainers; [ techknowlogick ]; + license = licenses.asl20; + changelog = "https://github.com/namespacelabs/foundation/releases/tag/v${version}"; + homepage = "https://github.com/namespacelabs/foundation"; + description = "A command line interface for the Namespaces platform"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ne/net-news-wire/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/net-news-wire/package.nix new file mode 100644 index 0000000000..95873d5da0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/net-news-wire/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "net-news-wire"; + version = "6.1.4"; + + src = fetchurl { + url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip"; + hash = "sha256-dNdbniXGre8G2/Ac0GB3GHJ2k1dEiHmAlTX3dJOEC7s="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + unzip + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -R NetNewsWire.app $out/Applications/ + runHook postInstall + ''; + + meta = with lib; { + description = "RSS reader for macOS and iOS"; + longDescription = '' + It's like podcasts — but for reading. + NetNewsWire shows you articles from your favorite blogs and news sites and keeps track of what you've read. + ''; + homepage = "https://github.com/Ranchero-Software/NetNewsWire"; + changelog = + "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/mac-${version}"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ jakuzure ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix index 33d72747be..029fd53cdc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-68/BmVoAFaIg4vgjzhedSBqm6H9VDu3M7JemfPEcpjQ="; + hash = "sha256-r5Du9Gwt+deeUe6AJDN85o4snybvzZIIsyt+cfgMq2Q="; }; - vendorHash = "sha256-CsW4tW6+INw93A7uXtHeVnxRrE5unHXhm2SOmQkJwYA="; + vendorHash = "sha256-/RNteV+Ys7TVTJtQsWcGK/1C6mf/sQUahIeEzefBe3A="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock similarity index 84% rename from third_party/nixpkgs/pkgs/development/tools/language-servers/nls/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock index 73d8e2b515..6890e1bf90 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ni/nickel/Cargo.lock @@ -19,21 +19,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -55,9 +56,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -69,15 +70,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -93,9 +94,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -189,9 +190,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "beef" @@ -231,19 +232,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -254,17 +245,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "regex-automata", @@ -273,9 +258,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" @@ -345,9 +330,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -355,36 +340,36 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", "terminal_size", ] [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -398,9 +383,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -455,7 +440,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "entities", "memchr", "once_cell", @@ -506,9 +491,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -668,9 +653,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -680,13 +665,57 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] +[[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.69", + "quote 1.0.33", + "scratch", + "syn 2.0.38", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + [[package]] name = "debugid" version = "0.8.0" @@ -698,9 +727,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -709,7 +741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "rustc_version", "syn 1.0.109", @@ -717,9 +749,18 @@ dependencies = [ [[package]] name = "deunicode" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" +checksum = "71dbf1bf89c23e9cd1baf5e654f622872655f195b36588dc9dc38f7eda30758c" +dependencies = [ + "deunicode 1.4.1", +] + +[[package]] +name = "deunicode" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[package]] name = "diff" @@ -733,22 +774,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", ] @@ -812,7 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" dependencies = [ "base64 0.13.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -865,25 +897,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "error-code" version = "2.3.1" @@ -906,9 +927,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -917,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -941,9 +962,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -966,9 +987,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -981,9 +1002,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -991,15 +1012,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1008,38 +1029,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1063,17 +1084,6 @@ dependencies = [ "version_check", ] -[[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.10" @@ -1082,7 +1092,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1108,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -1133,9 +1143,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1154,9 +1173,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "humantime" @@ -1187,12 +1206,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1203,18 +1222,18 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inferno" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" +checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" dependencies = [ "ahash", - "indexmap 2.0.0", + "indexmap 2.0.2", "is-terminal", "itoa", "log", @@ -1227,9 +1246,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1239,37 +1258,17 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.13", + "hermit-abi 0.3.3", + "rustix", "windows-sys 0.48.0", ] -[[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" @@ -1303,15 +1302,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - [[package]] name = "lalrpop" version = "0.19.12" @@ -1351,9 +1341,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "line-wrap" @@ -1364,6 +1354,15 @@ dependencies = [ "safemem", ] +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1372,21 +1371,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1415,7 +1408,7 @@ checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "regex-syntax 0.6.29", "syn 1.0.109", @@ -1465,10 +1458,19 @@ dependencies = [ ] [[package]] -name = "malachite" -version = "0.3.2" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7f4730c30071ba374fac86ad35b1cb7a0716f774737768667ea3fa1828e3" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] +name = "malachite" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" dependencies = [ "malachite-base", "malachite-nz", @@ -1477,36 +1479,33 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06bfa98a4b4802af5a4263b4ad4660e28e51e8490f6354eb9336c70767e1c5" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" dependencies = [ - "itertools 0.9.0", - "rand", - "rand_chacha", + "itertools 0.11.0", "ryu", - "sha3", ] [[package]] name = "malachite-nz" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e21c64b7af5be3dc8cef16f786243faf59459fe4ba93b44efdeb264e5ade4" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" dependencies = [ "embed-doc-image", - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "serde", ] [[package]] name = "malachite-q" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755e541d5134b5016594c9043094172c4dda9259b3ce824a7b8101941850360" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" dependencies = [ - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "malachite-nz", "serde", @@ -1514,18 +1513,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "digest 0.10.7", + "cfg-if", + "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -1554,6 +1554,47 @@ dependencies = [ "autocfg", ] +[[package]] +name = "metrics" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +dependencies = [ + "ahash", + "metrics-macros", + "portable-atomic", +] + +[[package]] +name = "metrics-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "metrics-util" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +dependencies = [ + "aho-corasick", + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.13.1", + "indexmap 1.9.3", + "metrics", + "num_cpus", + "ordered-float", + "quanta", + "radix_trie", + "sketches-ddsketch", +] + [[package]] name = "minimad" version = "0.12.0" @@ -1574,13 +1615,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -1601,13 +1642,15 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.2.1" +version = "1.3.0" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "clap_complete", "directories", "git-version", "insta", + "metrics", + "metrics-util", "nickel-lang-core", "nickel-lang-utils", "serde", @@ -1617,17 +1660,19 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.2.0" +version = "0.3.0" dependencies = [ "ansi_term", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-reporting", "comrak", "criterion", + "cxx", + "cxx-build", "indexmap 1.9.3", - "indoc 2.0.3", + "indoc 2.0.4", "js-sys", "lalrpop", "lalrpop-util", @@ -1635,8 +1680,10 @@ dependencies = [ "malachite", "malachite-q", "md-5", + "metrics", "nickel-lang-utils", "once_cell", + "pkg-config", "pprof", "pretty", "pretty_assertions", @@ -1653,10 +1700,12 @@ dependencies = [ "similar", "simple-counter", "strip-ansi-escapes", + "strsim", "termimad", "test-generator", "toml", "topiary", + "topiary-queries", "tree-sitter-nickel 0.1.0", "typed-arena", "unicode-segmentation", @@ -1666,18 +1715,20 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.2.1" +version = "1.3.0" dependencies = [ "anyhow", "assert_cmd", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-lsp", "codespan-reporting", + "criterion", "csv", "derive_more", "env_logger", + "glob", "insta", "lalrpop", "lalrpop-util", @@ -1709,7 +1760,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.1.0" +version = "0.3.0" dependencies = [ "nickel-lang-core", ] @@ -1737,9 +1788,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1750,7 +1801,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -1798,16 +1849,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "ordered-float" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "pad" @@ -1830,13 +1884,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -1854,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -1886,14 +1940,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "indexmap 1.9.3", "line-wrap", - "quick-xml 0.29.0", + "quick-xml 0.30.0", "serde", "time", ] @@ -1926,6 +1980,18 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "portable-atomic" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "pprof" version = "0.11.1" @@ -1948,12 +2014,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - [[package]] name = "precomputed-hash" version = "0.1.1" @@ -1962,13 +2022,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -2037,16 +2097,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "pyckel" -version = "1.2.1" +version = "1.3.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -2097,7 +2157,7 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "pyo3-macros-backend", "quote 1.0.33", "syn 1.0.109", @@ -2109,11 +2169,27 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] +[[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + [[package]] name = "quick-xml" version = "0.26.0" @@ -2125,9 +2201,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2147,7 +2223,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", ] [[package]] @@ -2161,51 +2237,19 @@ dependencies = [ ] [[package]] -name = "rand" -version = "0.7.3" +name = "raw-cpuid" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[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", + "bitflags 1.3.2", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2213,14 +2257,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2234,9 +2276,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2247,32 +2289,32 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2288,10 +2330,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "rgb" -version = "0.8.36" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -2313,28 +2361,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" 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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -2373,7 +2407,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -2406,16 +2440,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "semver" -version = "1.0.18" +name = "scratch" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2433,13 +2473,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2459,27 +2499,27 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -2494,30 +2534,18 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -2558,9 +2586,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple-counter" @@ -2574,6 +2602,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "sketches-ddsketch" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" + [[package]] name = "slab" version = "0.4.9" @@ -2589,14 +2623,14 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" dependencies = [ - "deunicode", + "deunicode 0.4.5", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "stable_deref_trait" @@ -2684,18 +2718,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.33" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] @@ -2724,20 +2758,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.13", + "redox_syscall 0.4.1", + "rustix", "windows-sys 0.48.0", ] @@ -2754,9 +2788,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2777,11 +2811,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -2811,32 +2845,33 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2844,15 +2879,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2893,9 +2928,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "pin-project-lite", @@ -2908,9 +2943,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2927,9 +2962,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -2940,7 +2975,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -2950,9 +2985,9 @@ dependencies = [ [[package]] name = "topiary" version = "0.2.3" -source = "git+https://github.com/tweag/topiary.git?rev=refs/heads/main#7e6cb4f8b505eacee57aaf3c1ab0f3cf539da159" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "futures", "itertools 0.11.0", "log", @@ -2976,6 +3011,11 @@ dependencies = [ "web-tree-sitter-sys", ] +[[package]] +name = "topiary-queries" +version = "0.2.3" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" + [[package]] name = "tree-sitter" version = "0.20.10" @@ -2988,8 +3028,8 @@ dependencies = [ [[package]] name = "tree-sitter-bash" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#bdcd56c5a3896f7bbb7684e223c43d9f24380351" +version = "0.20.4" +source = "git+https://github.com/tree-sitter/tree-sitter-bash#7331995b19b8f8aba2d5e26deb51d2195c18bc94" dependencies = [ "cc", "tree-sitter", @@ -2998,7 +3038,7 @@ dependencies = [ [[package]] name = "tree-sitter-facade" version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" +source = "git+https://github.com/tweag/tree-sitter-facade.git#1b290e795e700a57d8bd303f98a9715ab1c4f598" dependencies = [ "js-sys", "tree-sitter", @@ -3009,9 +3049,8 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" +version = "0.20.1" +source = "git+https://github.com/tree-sitter/tree-sitter-json.git#3fef30de8aee74600f25ec2e319b62a1a870d51e" dependencies = [ "cc", "tree-sitter", @@ -3039,8 +3078,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocaml" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1163abc658cf8ae0ecffbd8f4bd3ee00a2b98729de74f3b08f0e24f3ac208a" +source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" dependencies = [ "cc", "tree-sitter", @@ -3049,8 +3087,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocamllex" version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e774222086fd065999b6605fb231fbfc386bf782aa7dbad52503ff00b429a62" +source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" dependencies = [ "cc", "tree-sitter", @@ -3068,8 +3105,7 @@ dependencies = [ [[package]] name = "tree-sitter-rust" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" +source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#48e053397b587de97790b055a1097b7c8a4ef846" dependencies = [ "cc", "tree-sitter", @@ -3077,9 +3113,8 @@ dependencies = [ [[package]] name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" +version = "0.5.1" +source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" dependencies = [ "cc", "tree-sitter", @@ -3093,9 +3128,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unescape" @@ -3132,9 +3167,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3186,9 +3221,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -3218,7 +3253,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", ] @@ -3241,12 +3276,6 @@ dependencies = [ "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.11.0+wasi-snapshot-preview1" @@ -3274,7 +3303,7 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-shared", @@ -3308,7 +3337,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-backend", @@ -3360,9 +3389,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", ] @@ -3507,9 +3536,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -3534,3 +3563,23 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ede7d7c7970ca2215b8c1ccf4d4f354c4733201dfaaba72d44ae5b37472e4901" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b27b1bb92570f989aac0ab7e9cbfbacdd65973f7ee920d9f0e71ebac878fd0b" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix rename to third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix index 4d4be8601e..e509f73599 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ni/nickel/package.nix @@ -3,38 +3,50 @@ , fetchFromGitHub , python3 , nix-update-script -, stdenv }: rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tweag"; - repo = pname; + repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-g7pRTwa2sniIOmgdYCxfYxGRtxnQP8zaVWuPjzEZTSg="; + hash = "sha256-MBonps3yFEpw9l3EAJ6BXNNjY2fUGzWCP+7h0M8LEAY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM="; - "tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; + "topiary-0.2.3" = "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q="; + "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + "tree-sitter-json-0.20.1" = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; + "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; + "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; + "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; + "tree-sitter-rust-0.20.4" = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; + }; }; - cargoBuildFlags = [ "-p nickel-lang-cli" ]; + cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; nativeBuildInputs = [ python3 ]; + outputs = [ "out" "nls" ]; + + postInstall = '' + mkdir -p $nls/bin + mv $out/bin/nls $nls/bin/nls + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/lock.json b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/lock.json new file mode 100644 index 0000000000..38a4f8c8e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/lock.json @@ -0,0 +1 @@ +{"depends":[{"method":"fetchzip","packages":["npeg"],"path":"/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source","ref":"1.2.1","rev":"26d62fdc40feb84c6533956dc11d5ee9ea9b6c09","sha256":"0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh","srcDir":"src","url":"https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"},{"method":"fetchzip","packages":["preserves"],"path":"/nix/store/nrcpzf9hx70kry3gwhrdzcs3qicjncjh-source","ref":"20231021","rev":"edece399be70818208bf2263c30cb2bcf435bbff","sha256":"0xmw35wmw3a4lja9q4qvlvpxv3xk0hnkjg4fwfw6f3inh6zfiqki","srcDir":"src","url":"https://git.syndicate-lang.org/ehmry/preserves-nim/archive/edece399be70818208bf2263c30cb2bcf435bbff.tar.gz"}]} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix new file mode 100644 index 0000000000..833860b357 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim_lk/package.nix @@ -0,0 +1,52 @@ +{ lib, buildPackages, nim2Packages, fetchFromSourcehut, openssl }: + +nim2Packages.buildNimPackage (finalAttrs: { + pname = "nim_lk"; + version = "20231031"; + nimBinOnly = true; + + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "nim_lk"; + rev = finalAttrs.version; + hash = "sha256-dXm3dfXAxgucek19f1KdRShOsJyELPTB32qgGSKId6A="; + }; + + buildInputs = [ openssl ]; + + nimFlags = finalAttrs.passthru.nimFlagsFromLockFile ./lock.json; + + meta = finalAttrs.src.meta // { + description = "Generate Nix specific lock files for Nim packages"; + homepage = "https://git.sr.ht/~ehmry/nim_lk"; + mainProgram = "nim_lk"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ehmry ]; + }; + + passthru.nimFlagsFromLockFile = let + fetchDependency = let + methods = { + fetchzip = { url, sha256, ... }: + buildPackages.fetchzip { + name = "source"; + inherit url sha256; + }; + git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }: + buildPackages.fetchgit { + inherit fetchSubmodules leaveDotGit rev sha256 url; + }; + }; + in attrs@{ method, ... }: methods.${method} attrs // attrs; + in lockFile: + with builtins; + lib.pipe lockFile [ + readFile + fromJSON + (getAttr "depends") + (map fetchDependency) + (map ({ outPath, srcDir, ... }: ''--path:"${outPath}/${srcDir}"'')) + ]; + +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix new file mode 100644 index 0000000000..5a5179cfcd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-health/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, rustPlatform +, fetchCrate +, libiconv +, openssl +, pkg-config +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-health"; + version = "0.2.3"; + + src = fetchCrate { + inherit version; + pname = "nix_health"; + hash = "sha256-WdzzEFk9VPld6AFTNRsaQbMymw1+mNn/TViGO/Qv0so="; + }; + + cargoHash = "sha256-xmuosy9T/52D90uXMQAIxtaYDOlCekNCtzpu/3GyQXE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libiconv openssl ] + # Use a newer SDK for CoreFoundation, because the sysinfo crate requires + # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; + [ IOKit + CoreFoundation + ]); + + meta = with lib; { + description = "Check the health of your Nix setup"; + homepage = "https://zero-to-flakes.com/health/"; + license = licenses.asl20; + maintainers = with maintainers; [ srid ]; + mainProgram = "nix-health"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix new file mode 100644 index 0000000000..56bde6ac04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-search-cli/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, unstableGitUpdater +}: + +buildGoModule { + pname = "nix-search-cli"; + version = "unstable-2023-09-12"; + + src = fetchFromGitHub { + owner = "peterldowns"; + repo = "nix-search-cli"; + rev = "f3f1c53c72dadac06472a7112aeb486ab5dda695"; + hash = "sha256-YM1Lf7py79rU8aJE0PfQaMr5JWx5J1covUf1aCjRkc8="; + }; + + vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M="; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "CLI for searching packages on search.nixos.org"; + homepage = "https://github.com/peterldowns/nix-search-cli"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + platforms = platforms.all; + mainProgram = "nix-search"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/deps.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixops-dns/deps.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/package-management/nixops/deps.nix rename to third_party/nixpkgs/pkgs/by-name/ni/nixops-dns/deps.nix diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixops-dns/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/package-management/nixops/nixops-dns.nix rename to third_party/nixpkgs/pkgs/by-name/ni/nixops-dns/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh new file mode 100755 index 0000000000..17e7ce8a72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/nixos-firewall-tool.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash + +set -euo pipefail + +ip46tables() { + iptables -w "$@" + ip6tables -w "$@" + +} + +show_help() { + echo "nixos-firewall-tool" + echo "" + echo "Can temporarily manipulate the NixOS firewall" + echo "" + echo "Open TCP port:" + echo " nixos-firewall-tool open tcp 8888" + echo "" + echo "Show all firewall rules:" + echo " nixos-firewall-tool show" + echo "" + echo "Open UDP port:" + echo " nixos-firewall-tool open udp 51820" + echo "" + echo "Reset firewall configuration to system settings:" + echo " nixos-firewall-tool reset" +} + +if [[ -z ${1+x} ]]; then + show_help + exit 1 +fi + +case $1 in + "open") + protocol="$2" + port="$3" + + ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept + ;; + "show") + ip46tables --numeric --list nixos-fw + ;; + "reset") + systemctl restart firewall.service + ;; + -h|--help|help) + show_help + exit 0 + ;; + *) + show_help + exit 1 + ;; +esac diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix new file mode 100644 index 0000000000..78af5cb8d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nixos-firewall-tool/package.nix @@ -0,0 +1,15 @@ +{ writeShellApplication, iptables, lib }: + +writeShellApplication { + name = "nixos-firewall-tool"; + text = builtins.readFile ./nixos-firewall-tool.sh; + runtimeInputs = [ + iptables + ]; + + meta = with lib; { + description = "Temporarily manipulate the NixOS firewall"; + license = licenses.mit; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/nl/nls/package.nix b/third_party/nixpkgs/pkgs/by-name/nl/nls/package.nix new file mode 100644 index 0000000000..d060207f7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nl/nls/package.nix @@ -0,0 +1,21 @@ +{ symlinkJoin +, nickel +}: + +symlinkJoin { + name = "nls-${nickel.version}"; + pname = "nls"; + inherit (nickel) version; + + paths = [ nickel.nls ]; + + meta = { + inherit (nickel.meta) homepage changelog license maintainers; + description = "A language server for the Nickel programming language"; + longDescription = '' + The Nickel Language Server (NLS) is a language server for the Nickel + programming language. NLS offers error messages, type hints, and + auto-completion right in your favorite LSP-enabled editor. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix b/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix rename to third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix index eb929c9923..902b78272d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nncp/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/nn/nncp/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "nncp"; - version = "8.9.0"; + version = "8.10.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz"; - hash = "sha256-JZ+svDNU7cwW58ZOJ4qszbR/+j7Cr+oLNig/RqqCS10="; + sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/no/nofi/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nofi/package.nix new file mode 100644 index 0000000000..d1b39b7896 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/no/nofi/package.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, dbus, pkg-config}: + +rustPlatform.buildRustPackage rec { + pname = "nofi"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "ellsclytn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; + }; + + cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "An interruption-free notification system for Linux"; + homepage = "https://github.com/ellsclytn/nofi/"; + changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; + license = [ licenses.asl20 /* or */ licenses.mit ]; + mainProgram = pname; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix new file mode 100644 index 0000000000..258e1b44c3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/no/nom/package.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "nom"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "guyfedwards"; + repo = "nom"; + rev = "v${version}"; + hash = "sha256-6tk8NRuBbRMoaz3CmUUOC6thxIgjk/MWl50+YgQ6l5o="; + }; + + vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; + + meta = with lib; { + homepage = "https://github.com/guyfedwards/nom"; + description = "RSS reader for the terminal"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nadir-ishiguro ]; + mainProgram = "nom"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ns/nsf-ordlista/package.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsf-ordlista/package.nix new file mode 100644 index 0000000000..d3ec535c44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ns/nsf-ordlista/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenvNoCC +, fetchzip +}: +stdenvNoCC.mkDerivation { + pname = "nsf-ordlista"; + version = "unstable-2023-08-20"; + src = fetchzip { + url = "http://www2.scrabbleforbundet.no/wp-content/uploads/2023/08/nsf2023.zip"; + hash = "sha256-bcVqZ2yPHurl6sRNgeLNAyyR8WR9ewmtn85Xuw/rZ3s="; + }; + + installPhase = '' + runHook preInstall + install -Dm444 nsf2023.txt $out/share/wordlists/nsf.txt + runHook postInstall + ''; + + meta = with lib; { + description = "Wordlist from the Norwegian Scrabble Federation"; + homepage = "https://www2.scrabbleforbundet.no/"; + downloadPage = "https://www2.scrabbleforbundet.no/?p=4881#more-4881"; + license = licenses.unfree; + maintainers = with maintainers; [ h7x4 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix b/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix similarity index 69% rename from third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix rename to third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix index 9f9673faa2..4e3229b77d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ns/nsxiv/package.nix @@ -10,18 +10,20 @@ , conf ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nsxiv"; - version = "31"; + version = "32"; src = fetchFromGitea { domain = "codeberg.org"; owner = "nsxiv"; repo = "nsxiv"; - rev = "v${version}"; - hash = "sha256-X1ZMr5OADs9GIe/kp/kEqKMMHZMymd58m9+f0SPzn7s="; + rev = "v${finalAttrs.version}"; + hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI="; }; + outputs = [ "out" "man" "doc" ]; + buildInputs = [ giflib imlib2 @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { libwebp ] ++ lib.optional stdenv.isDarwin libinotify-kqueue; - preBuild = lib.optionalString (conf!=null) '' + postPatch = lib.optionalString (conf != null) '' cp ${(builtins.toFile "config.def.h" conf)} config.def.h ''; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; makeFlags = [ "CC:=$(CC)" ]; @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-all" ]; - meta = with lib; { + meta = { homepage = "https://nsxiv.codeberg.page/"; description = "New Suckless X Image Viewer"; longDescription = '' @@ -59,9 +61,9 @@ stdenv.mkDerivation rec { - Display image information in status bar - Display image name/path in X title ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres sikmir ]; - platforms = platforms.unix; - changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${src.rev}/etc/CHANGELOG.md"; + changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${finalAttrs.src.rev}/etc/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres sikmir ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/nu/nuget/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nuget/package.nix index ff262c68ff..6bf41690a2 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/nuget/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nu/nuget/package.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation (attrs: { license = licenses.mit; sourceProvenance = [ sourceTypes.binaryBytecode ]; maintainers = [ maintainers.mdarocha ]; - platforms = [ "x86_64-linux" ]; + inherit (mono.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix new file mode 100644 index 0000000000..c658fd5930 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, testers +, fetchFromGitHub +, rustPlatform +, darwin +, numbat +}: + +rustPlatform.buildRustPackage rec { + pname = "numbat"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "numbat"; + rev = "v${version}"; + hash = "sha256-mwDpdQEIgvdGbcXEtA3TLP1e2yFNRCdcljaOzDEoKjg="; + }; + + cargoHash = "sha256-hGNfB82m2w9wDiPs8PMUExWOBN9ZQ+XVs1v8jhHuVhA="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules"; + + postInstall = '' + mkdir -p $out/share/${pname} + cp -r $src/${pname}/modules $out/share/${pname}/ + ''; + + passthru.tests.version = testers.testVersion { + package = numbat; + }; + + meta = with lib; { + description = "High precision scientific calculator with full support for physical units"; + longDescription = '' + A statically typed programming language for scientific computations + with first class support for physical dimensions and units + ''; + homepage = "https://numbat.dev"; + changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + mainProgram = "numbat"; + maintainers = with maintainers; [ giomf atemu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix b/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix new file mode 100644 index 0000000000..612575d2b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/oa/oauth2l/package.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "oauth2l"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "oauth2l"; + rev = "v${version}"; + hash = "sha256-bL1bys/CBo/P9VfWc/FB8JHW/aBwC521V8DB1sFBIAA="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = "export HOME=$(mktemp -d)"; + + # tests fail on linux for some reason + doCheck = stdenv.isDarwin; + + meta = with lib; { + description = "Simple CLI for interacting with Google API authentication"; + homepage = "https://github.com/google/oauth2l"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "oauth2l"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix new file mode 100644 index 0000000000..0240966e2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, perlPackages +, fetchFromGitHub +, makeWrapper +, shortenPerlShebang +, coreutils +, dmidecode +, findutils +, inetutils +, ipmitool +, iproute2 +, lvm2 +, nmap +, pciutils +, usbutils +, util-linux +, testers +, ocsinventory-agent +, nix-update-script +}: + +perlPackages.buildPerlPackage rec { + version = "2.10.1"; + pname = "ocsinventory-agent"; + + src = fetchFromGitHub { + owner = "OCSInventory-NG"; + repo = "UnixAgent"; + rev = "refs/tags/v${version}-MAC"; + hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg="; + }; + + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + + buildInputs = with perlPackages; [ + perl + DataUUID + IOCompress + IOSocketSSL + LWP + LWPProtocolHttps + NetIP + NetNetmask + NetSNMP + ParseEDID + ProcDaemon + ProcPIDFile + XMLSimple + ] ++ lib.optionals stdenv.isLinux (with perlPackages; [ + NetCUPS # cups-filters is broken on darwin + ]) ++ lib.optionals stdenv.isDarwin (with perlPackages; [ + MacSysProfile + ]); + + postInstall = let + runtimeDependencies = [ + coreutils # uname, cut, df, stat, uptime + findutils # find + inetutils # ifconfig + ipmitool # ipmitool + nmap # nmap + pciutils # lspci + ] ++ lib.optionals stdenv.isLinux [ + dmidecode # dmidecode + iproute2 # ip + lvm2 # pvs + usbutils # lsusb + util-linux # last, lsblk, mount + ]; + in lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/ocsinventory-agent + '' + '' + wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} + ''; + + passthru = { + tests.version = testers.testVersion { + package = ocsinventory-agent; + command = "ocsinventory-agent --version"; + # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm + version = "2.10.0"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "OCS Inventory unified agent for Unix operating systems"; + longDescription = '' + Open Computers and Software Inventory (OCS) is an application designed + to help a network or system administrator to keep track of the hardware and + software configurations of computers that are installed on the network. + ''; + homepage = "https://ocsinventory-ng.org"; + changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}"; + downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases"; + license = licenses.gpl2Only; + mainProgram = "ocsinventory-agent"; + maintainers = with maintainers; [ totoroot anthonyroussel ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/oc/octorpki/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/octorpki/package.nix new file mode 100644 index 0000000000..87a8498d28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/oc/octorpki/package.nix @@ -0,0 +1,50 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: + +buildGoModule rec { + pname = "octorpki"; + version = "1.5.10"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "cfrpki"; + rev = "v${version}"; + hash = "sha256-eqIAauwFh1Zbv3Jkk8plz1OR3ZW8fs0ugNwwTnSHSFM="; + }; + + patches = [ + # https://github.com/cloudflare/cfrpki/pull/150 + (fetchpatch { + url = "https://github.com/cloudflare/cfrpki/commit/fd0c4e95b880c463430c91ce1f86205b9309399b.patch"; + hash = "sha256-cJ0mWkjtGvgTIH5eEum8h2Gy2PqR+nPto+mj5m/I/d4="; + }) + ]; + + ldflags = [ + "-X main.version=v${version}" + "-X main.talpath=${placeholder "out"}/share/tals" + ]; + + subPackages = [ + "cmd/octorpki" + ]; + + postInstall = '' + mkdir -p $out/share + cp -R cmd/octorpki/tals $out/share/tals + ''; + + vendorHash = null; + + meta = with lib; { + homepage = "https://github.com/cloudflare/cfrpki#octorpki"; + changelog = "https://github.com/cloudflare/cfrpki/releases/tag/v${version}"; + description = "A software used to download RPKI (RFC 6480) certificates and validate them"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = teams.wdz.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix index 357772d5f8..6aa02d62fe 100644 --- a/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "3.25.0"; + version = "3.26.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs="; + hash = "sha256-tR4CB4i91XHoyFtZH1LsDxVI791v0LCtvCd28Ahlxlc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix new file mode 100644 index 0000000000..6ffd81584f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/on/onedrivegui/package.nix @@ -0,0 +1,87 @@ +{ lib +, python3Packages +, fetchFromGitHub +, writeText +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, onedrive +}: + +let + version = "1.0.3"; + + setupPy = writeText "setup.py" '' + from setuptools import setup + setup( + name='onedrivegui', + version='${version}', + scripts=[ + 'src/OneDriveGUI.py', + ], + ) + ''; + +in +python3Packages.buildPythonApplication rec { + pname = "onedrivegui"; + inherit version; + + src = fetchFromGitHub { + owner = "bpozdena"; + repo = "OneDriveGUI"; + rev = "v${version}"; + hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs="; + }; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; + + # wrap manually to avoid having a bash script in $out/bin with a .py extension + dontWrapPythonPrograms = true; + + doCheck = false; # No tests defined + pythonImportsCheck = [ "OneDriveGUI" ]; + + desktopItems = [ + (makeDesktopItem { + name = "OneDriveGUI"; + exec = "onedrivegui"; + desktopName = "OneDriveGUI"; + comment = "OneDrive GUI Client"; + type = "Application"; + icon = "OneDriveGUI"; + terminal = false; + categories = [ "Utility" ]; + }) + ]; + + postPatch = '' + # Patch OneDriveGUI.py so DIR_PATH points to shared files location + sed -i src/OneDriveGUI.py -e "s@^DIR_PATH =.*@DIR_PATH = '$out/share/OneDriveGUI'@" + cp ${setupPy} ${setupPy.name} + ''; + + postInstall = '' + mkdir -p $out/share/OneDriveGUI + # we do not need the `ui` directory - only resources + cp -r src/resources $out/share/OneDriveGUI + install -Dm444 -t $/out/share/icons/hicolor/48x48/apps src/resources/images/OneDriveGUI.png + # we put our own executable wrapper in place instead + rm -r $out/bin/* + + makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \ + --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ + --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \ + --add-flags $out/lib/${python3Packages.python.libPrefix}/site-packages/OneDriveGUI.py + ''; + + meta = with lib; { + homepage = "https://github.com/bpozdena/OneDriveGUI"; + description = "A simple GUI for Linux OneDrive Client, with multi-account support"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jgarcia ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix b/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix new file mode 100644 index 0000000000..f4087401ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/on/onedriver/package.nix @@ -0,0 +1,64 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, pkg-config +, webkitgtk +, glib +, fuse +, installShellFiles +}: +let + pname = "onedriver"; + version = "0.13.0-2"; + + src = fetchFromGitHub { + owner = "jstaf"; + repo = "onedriver"; + rev = "v${version}"; + hash = "sha256-Bcjgmx9a4pTRhkzR3tbOB6InjvuH71qomv4t+nRNc+w="; + }; +in +buildGoModule { + inherit pname version src; + vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ webkitgtk glib fuse ]; + + ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ]; + + subPackages = [ + "cmd/onedriver" + "cmd/onedriver-launcher" + ]; + + postInstall = '' + echo "Running postInstall" + install -Dm644 ./resources/onedriver.svg $out/share/icons/onedriver/onedriver.svg + install -Dm644 ./resources/onedriver.png $out/share/icons/onedriver/onedriver.png + install -Dm644 ./resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png + + install -Dm644 ./resources/onedriver.desktop $out/share/applications/onedriver.desktop + + mkdir -p $out/share/man/man1 + installManPage ./resources/onedriver.1 + + substituteInPlace $out/share/applications/onedriver.desktop \ + --replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \ + --replace "/usr/share/icons" "$out/share/icons" + ''; + + meta = with lib; { + description = "A network filesystem for Linux"; + longDescription = '' + onedriver is a network filesystem that gives your computer direct access to your files on Microsoft OneDrive. + This is not a sync client. Instead of syncing files, onedriver performs an on-demand download of files when + your computer attempts to use them. onedriver allows you to use files on OneDrive as if they were files on + your local computer. + ''; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + maintainers = [ maintainers.massimogengarelli ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-english-wordnet/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-english-wordnet/package.nix new file mode 100644 index 0000000000..ccd661753c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/open-english-wordnet/package.nix @@ -0,0 +1,73 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, gzip +, python3 +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation (self: { + pname = "open-english-wordnet"; + version = "2022"; + + src = fetchFromGitHub { + owner = "globalwordnet"; + repo = "english-wordnet"; + rev = "${self.version}-edition"; + hash = "sha256-a1fWIp39uuJZL1aFX/r+ttLB1+kwh/XPHwphgENTQ5M="; + }; + + patches = lib.mapAttrsToList (rev: hash: fetchpatch { + url = "https://github.com/globalwordnet/english-wordnet/commit/${rev}.patch"; + inherit hash; + }) { + # Upstream commit bumping the version number, accidentally ommited from the tagged release + "bc07902f8995b62c70f01a282b23f40f30630540" = "sha256-1e4MG/k86g3OFUhiShCCbNXnvDKrYFr1KlGVsGl++KI="; + # PR #982, “merge.py: Make result independent of filesystem order” + "6da46a48dd76a48ad9ff563e6c807b8271fc83cd" = "sha256-QkkJH7NVGy/IbeSWkotU80IGF4esz0b8mIL9soHdQtQ="; + }; + + # TODO(nicoo): make compression optional? + nativeBuildInputs = [ + gzip + (python3.withPackages (p: with p; [ pyyaml ])) + ]; + + # TODO(nicoo): generate LMF and WNDB versions with separate outputs + buildPhase = '' + runHook preBuild + + echo Generating wn.xml + python scripts/from-yaml.py + python scripts/merge.py + + echo Compressing + gzip --best --no-name --stdout ./wn.xml > 'oewn:${self.version}.xml.gz' + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/share/wordnet 'oewn:${self.version}.xml.gz' + runHook postInstall + ''; + + meta = with lib; { + description = "Lexical network of the English language"; + longDescription = '' + Open English WordNet is a lexical network of the English language grouping + words into synsets and linking them according to relationships such as + hypernymy, antonymy and meronymy. It is intended to be used in natural + language processing applications and provides deep lexical information + about the English language as a graph. + + Open English WordNet is a fork of the Princeton Wordnet developed under an + open source methodology. + ''; + homepage = "https://en-word.net/"; + license = licenses.cc-by-40; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/op/openai-triton-llvm/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openai-triton-llvm/package.nix new file mode 100644 index 0000000000..2fb56d0a63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openai-triton-llvm/package.nix @@ -0,0 +1,125 @@ +{ config +, lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, ninja +, git +, doxygen +, sphinx +, libxml2 +, libxcrypt +, libedit +, libffi +, mpfr +, zlib +, ncurses +, python3Packages +, buildDocs ? true +, buildMan ? true +, buildTests ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openai-triton-llvm"; + version = "14.0.6-f28c006a5895"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildMan [ + "man" + ]; + + # See https://github.com/openai/triton/blob/main/python/setup.py and https://github.com/ptillet/triton-llvm-releases/releases + src = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + rev = "f28c006a5895fc0e329fe15fead81e37457cb1d1"; + hash = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ninja + git + python3Packages.python + ] ++ lib.optionals (buildDocs || buildMan) [ + doxygen + sphinx + python3Packages.recommonmark + ]; + + buildInputs = [ + libxml2 + libxcrypt + libedit + libffi + mpfr + ]; + + propagatedBuildInputs = [ + zlib + ncurses + ]; + + sourceRoot = "${finalAttrs.src.name}/llvm"; + + cmakeFlags = [ + "-DLLVM_TARGETS_TO_BUILD=${ + let + # Targets can be found in + # https://github.com/llvm/llvm-project/tree/f28c006a5895fc0e329fe15fead81e37457cb1d1/clang/lib/Basic/Targets + # NOTE: Unsure of how "host" would function, especially given that we might be cross-compiling. + llvmTargets = [ "AMDGPU" "NVPTX" ] + ++ lib.optionals stdenv.isAarch64 [ "AArch64" ] + ++ lib.optionals stdenv.isx86_64 [ "X86" ]; + in + lib.concatStringsSep ";" llvmTargets + }" + "-DLLVM_ENABLE_PROJECTS=llvm;mlir" + "-DLLVM_INSTALL_UTILS=ON" + ] ++ lib.optionals (buildDocs || buildMan) [ + "-DLLVM_INCLUDE_DOCS=ON" + "-DMLIR_INCLUDE_DOCS=ON" + "-DLLVM_BUILD_DOCS=ON" + # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_HTML=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals buildTests [ + "-DLLVM_INCLUDE_TESTS=ON" + "-DMLIR_INCLUDE_TESTS=ON" + "-DLLVM_BUILD_TESTS=ON" + ]; + + postPatch = '' + # `CMake Error: cannot write to file "/build/source/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied` + chmod +w -R ../mlir + + # FileSystem permissions tests fail with various special bits + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + rm unittests/Support/Path.cpp + + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + ''; + + doCheck = buildTests; + requiredSystemFeatures = [ "big-parallel" ]; + + meta = with lib; { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = "https://github.com/llvm/llvm-project"; + license = with licenses; [ ncsa ]; + maintainers = with maintainers; [ SomeoneSerge Madouura ]; + platforms = platforms.linux; + # Consider the derivation broken if we're not building for CUDA or ROCm, or if we're building for aarch64 + # and ROCm is enabled. See https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344. + broken = stdenv.isAarch64 && !config.cudaSupport; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix index 6c94e9edfe..ed81711d8f 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: { "-DTBB_ROOT=${tbb.out}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-flax-vector-conversions"; + meta = { description = "Intel Open Path Guiding Library"; homepage = "https://github.com/OpenPathGuidingLibrary/openpgl"; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/package.nix new file mode 100644 index 0000000000..e196507f67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/package.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, wget +, unzip +, mawk +, sqlite +, which +, lua5_3 +, installShellFiles +, makeWrapper +}: +let + luaEnv = lua5_3.withPackages (p: with p; [ luasql-sqlite3 luautf8 ]); +in +stdenv.mkDerivation rec { + pname = "openrussian-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "rhaberkorn"; + repo = "openrussian-cli"; + rev = version; + hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/rhaberkorn/openrussian-cli/commit/984e555acbadbd1aed7df17ab53e2c586a2f8f68.patch"; + hash = "sha256-/z4YrEeuejtCtwiFXksFREwgQoWvtI0Kl9w75KDQfF8="; + }) + # Work around https://github.com/dumblob/mysql2sqlite/issues/75 + ./use-mawk.patch + ]; + + nativeBuildInputs = [ + pkg-config + wget + unzip + sqlite + which + installShellFiles + makeWrapper + mawk + ]; + + buildInputs = [ luaEnv ]; + + makeFlags = [ + "LUA=${luaEnv}/bin/lua" + "LUAC=${luaEnv}/bin/luac" + ]; + + dontConfigure = true; + + # Can't use "make install" here + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/openrussian + cp openrussian-sqlite3.db $out/share/openrussian + cp openrussian $out/bin + + wrapProgram $out/bin/openrussian \ + --prefix LUA_PATH ';' '${lua5_3.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua5_3.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' + + runHook postInstall + ''; + + postInstall = '' + installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash + installManPage ./openrussian.1 + ''; + + meta = with lib; { + description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; + license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; + maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/use-mawk.patch b/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/use-mawk.patch new file mode 100644 index 0000000000..d0cfa814ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/openrussian-cli/use-mawk.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8fe3880..281ce2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ openrussian-sql.zip: + + openrussian-sqlite3.db : openrussian-sql.zip mysql2sqlite postprocess.sql + $(RM) $@ +- unzip -p $< openrussian.sql | awk -f ./mysql2sqlite - | sqlite3 $@ ++ unzip -p $< openrussian.sql | mawk -f ./mysql2sqlite - | sqlite3 $@ + sqlite3 $@ -batch sendin = in; +- if (ssemp (fet) != NULL) +- { +- sem_post (ssemp (fet)); +- } ++ sem_post (ssemp (fet)); + + if (dtSendFree (fet) == 0) + { diff --git a/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix b/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix new file mode 100644 index 0000000000..c0d96e44f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pt/pterm/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, libsndfile +, wxGTK32 +, SDL +}: + +stdenv.mkDerivation rec { + pname = "pterm"; + version = "6.0.4"; + + buildInputs = [ libsndfile SDL wxGTK32 ]; + + src = fetchurl { + url = "https://www.cyber1.org/download/linux/pterm-${version}.tar.bz2"; + hash = "sha256-0OJvoCOGx/a51Ja7n3fOTeQJEcdyn/GhaJ0NtVCyuC8="; + }; + + patches = [ ./0001-dtnetsubs-remove-null-check.patch ]; + + preBuild = '' + substituteInPlace Makefile.common Makefile.wxpterm --replace "/bin/echo" "echo" + echo "exit 0" > wxversion.py + ''; + + hardeningDisable = [ "format" ]; + + env.PTERMVERSION = "${version}"; + + installPhase = '' + runHook preInstall + + install -Dm755 "pterm" "$out/bin/pterm" + + runHook postInstall + ''; + + meta = with lib; { + description = "terminal emulator for the Cyber1 mainframe-based CYBIS system"; + homepage = "https://www.cyber1.org/"; + license = licenses.zlib; + maintainers = with maintainers; [ sarcasticadmin ]; + mainProgram = "pterm"; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/pyp/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyp/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/text/pyp/default.nix rename to third_party/nixpkgs/pkgs/by-name/py/pyp/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix new file mode 100644 index 0000000000..751dbbd61e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/py/pyprland/package.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "pyprland"; + version = "1.5.3"; + format = "pyproject"; + + disabled = python3Packages.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "hyprland-community"; + repo = "pyprland"; + rev = version; + hash = "sha256-PmE52pbEhc4+SkuyEeVUZoMVcbgK6CYA8HNwYPpgaIw="; + }; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + + postInstall = '' + # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin + chmod -x $out/${python3Packages.python.sitePackages}/pyprland/command.py + ''; + + pythonImportsCheck = [ + "pyprland" + "pyprland.common" + "pyprland.plugins" + "pyprland.plugins.interface" + ]; + + meta = with lib; { + mainProgram = "pypr"; + description = "An hyperland plugin system"; + homepage = "https://github.com/hyprland-community/pyprland"; + license = licenses.mit; + maintainers = with maintainers; [ iliayar ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix b/third_party/nixpkgs/pkgs/by-name/py/pyspread/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix rename to third_party/nixpkgs/pkgs/by-name/py/pyspread/package.nix index 61a4c7694b..43aa9b304f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pyspread/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/py/pyspread/package.nix @@ -2,19 +2,24 @@ , python3 , fetchPypi , copyDesktopItems -, wrapQtAppsHook -, qtsvg +, libsForQt5 , makeDesktopItem }: -python3.pkgs.buildPythonApplication rec { +let + # get rid of rec pname = "pyspread"; - version = "2.0.2"; - + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8="; + hash = "sha256-vbBu/dMXQf14F7qWvyHX5T8/AkjeZhaQt1eQ6Nidpsc="; }; + inherit (libsForQt5) + qtsvg + wrapQtAppsHook; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; nativeBuildInputs = [ copyDesktopItems @@ -35,18 +40,20 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; + strictDeps = true; + doCheck = false; # it fails miserably with a core dump pythonImportsCheck = [ "pyspread" ]; desktopItems = [ - (makeDesktopItem rec { - name = pname; - exec = name; - icon = name; + (makeDesktopItem { + name = "pyspread"; + exec = "pyspread"; + icon = "pyspread"; desktopName = "Pyspread"; genericName = "Spreadsheet"; - comment = meta.description; + comment = "A Python-oriented spreadsheet application"; categories = [ "Office" "Development" "Spreadsheet" ]; }) ]; @@ -55,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - meta = with lib; { + meta = { homepage = "https://pyspread.gitlab.io/"; description = "A Python-oriented spreadsheet application"; longDescription = '' @@ -68,8 +75,8 @@ python3.pkgs.buildPythonApplication rec { that can be accessed from other cells. These objects can represent anything including lists or matrices. ''; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "pyspread"; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/pz/pzip/package.nix b/third_party/nixpkgs/pkgs/by-name/pz/pzip/package.nix new file mode 100644 index 0000000000..f2797c6791 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pz/pzip/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, unzip +}: + +buildGoModule rec { + pname = "pzip"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ybirader"; + repo = "pzip"; + rev = "v${version}"; + hash = "sha256-bb2TSSyA7TwgoV53M/7WkNcTq8F0EjCA7ObHfnGL9l0="; + }; + + vendorHash = "sha256-MRZlv4eN1Qbu+QXr//YexTDYSK4pCXAPO7VvGqZhjho="; + + nativeBuildInputs = [ + unzip + ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A fast concurrent zip archiver and extractor"; + homepage = "https://github.com/ybirader/pzip"; + changelog = "https://github.com/ybirader/pzip/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "pzip"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix new file mode 100644 index 0000000000..32cf796082 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/qr/qrtool/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "qrtool"; + version = "0.8.4"; + + src = fetchFromGitHub { + owner = "sorairolake"; + repo = "qrtool"; + rev = "v${version}"; + sha256 = "sha256-FoWUGhNfVILpYxmsnSzRIM1+R9/xFxCF7W1sdiHaAiA="; + }; + + cargoSha256 = "sha256-mtejnHCkN2krgFAneyyBpvbv5PZO3GigM2DJqrbHim4="; + + meta = with lib; { + maintainers = with maintainers; [ philiptaron ]; + description = "An utility for encoding or decoding QR code"; + license = licenses.asl20; + homepage = "https://sorairolake.github.io/qrtool/book/index.html"; + changelog = "https://sorairolake.github.io/qrtool/book/changelog.html"; + mainProgram = "qrtool"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quicksand/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicksand/package.nix new file mode 100644 index 0000000000..189c1dfdf5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/qu/quicksand/package.nix @@ -0,0 +1,40 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation { + pname = "quicksand"; + version = "2.0-unstable-2021-01-15"; + + src = fetchFromGitHub { + owner = "andrew-paglinawan"; + repo = "QuicksandFamily"; + rev = "be4b9d638e1c79fa42d4a0ab0aa7fe29466419c7"; + hash = "sha256-zkxm2u35Ll2qyCoUeuA0eumVjNSel+y1kkWoHxeNI/g="; + sparseCheckout = ["fonts"]; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/quicksand + + install -Dm444 fonts/*.ttf -t $out/share/fonts/quicksand/ + install -Dm444 fonts/statics/*.ttf -t $out/share/fonts/quicksand/ + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/andrew-paglinawan/QuicksandFamily"; + description = "A sans serif font designed using geometric shapes"; + longDescription = '' + Quicksand is a sans serif typeface designed by Andrew Paglinawan + in 2008 using geometric shapes as it's core foundation. It is + designed for display purposes but legible enough to use in small + sizes as well. Quicksand Family is available in three styles + which are Light, Regular and Bold including true italics for each weight. + ''; + license = with lib.licenses; [ ofl ]; + maintainers = with lib.maintainers; [ hubble ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix index 20ce7b39fb..2b52d2370b 100644 --- a/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "quicktype"; - version = "23.0.75"; # version from https://npm.im/quicktype + version = "23.0.78"; # version from https://npm.im/quicktype src = fetchFromGitHub { owner = "quicktype"; repo = "quicktype"; - rev = "9b570a73a896306778940c793c0037a38815304a"; # version not tagged - hash = "sha256-boCBgIoM2GECipZTJlp9IaeXT24aR8tawS1X8CFDDqw="; + rev = "317deefa6a0c8ba0201b9b2b50d00c7e93c41d78"; # version not tagged + hash = "sha256-KkyxS3mxOmUA8ZpB0tqdpdafvP429R5Y39C3CszTiZk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-missing-dir-test.patch b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-missing-dir-test.patch new file mode 100644 index 0000000000..ddfec9b22e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-missing-dir-test.patch @@ -0,0 +1,23 @@ +diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c +index 638c39c..c8758d2 100644 +--- a/test/unit/test_uv_fs.c ++++ b/test/unit/test_uv_fs.c +@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) + return MUNIT_OK; + } + +-/* If the directory doesn't exist, it an error is returned. */ +-TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) +-{ +- const char *parent = data; +- char errmsg[RAFT_ERRMSG_BUF_SIZE]; +- char dir[128]; +- sprintf(errmsg, "%s/sub", parent); +- sprintf(errmsg, "directory '%s' does not exist", dir); +- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); +- return MUNIT_OK; +-} +- + /* If the process can't access the directory, an error is returned. */ + TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) + { diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-net-tests.patch b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-net-tests.patch new file mode 100644 index 0000000000..7c8be29fea --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/disable-net-tests.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index 2137932..93abdb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ + test/integration/test_uv_bootstrap.c \ + test/integration/test_uv_load.c \ + test/integration/test_uv_recover.c \ +- test/integration/test_uv_recv.c \ +- test/integration/test_uv_send.c \ + test/integration/test_uv_set_term.c \ +- test/integration/test_uv_tcp_connect.c \ +- test/integration/test_uv_tcp_listen.c \ + test/integration/test_uv_snapshot_put.c \ + test/integration/test_uv_truncate.c \ + test/integration/test_uv_work.c diff --git a/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/package.nix new file mode 100644 index 0000000000..f4e94d8f41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ra/raft-cowsql/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libuv +, lz4 +, pkg-config +, incus +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "raft-cowsql"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "cowsql"; + repo = "raft"; + rev = "refs/tags/v${version}"; + hash = "sha256-CMcKXX2u+qiroleg5GIovTOVAg9ycXBsRDqfsOCL3yo="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libuv lz4 ]; + + enableParallelBuilding = true; + + patches = [ + # network tests either hang indefinitely, or fail outright + ./disable-net-tests.patch + + # missing dir check is flaky + ./disable-missing-dir-test.patch + ]; + + preConfigure = '' + substituteInPlace configure --replace /usr/bin/ " " + ''; + + doCheck = true; + + outputs = [ "dev" "out" ]; + + passthru = { + inherit (incus) tests; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + meta = with lib; { + description = "Asynchronous C implementation of the Raft consensus protocol"; + homepage = "https://github.com/cowsql/raft"; + license = licenses.lgpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ adamcstephens ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix b/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix new file mode 100644 index 0000000000..f775d7d542 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/reactphysics3d/package.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation (finalAttrs: { + pname = "reactphysics3d"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "DanielChappuis"; + repo = "reactphysics3d"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AUdsUXsygsGfS8H+AHEV1fSrrX7zGmfsaTONYUG3zqk="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open source C++ physics engine library"; + homepage = "https://www.reactphysics3d.com"; + maintainers = with maintainers; [ rexxDigital ]; + license = licenses.zlib; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix b/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix new file mode 100644 index 0000000000..3b62c387d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "regols"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "kitagry"; + repo = "regols"; + rev = "v${version}"; + hash = "sha256-2ZwmIlv3kJ26p15t7NvB9sX2GO+B3ypeNl50b7XA0Iw="; + }; + + vendorHash = "sha256-N6gtkZSNLXz3B961grM3xHzm7x4/kzcLkDOgiFLGp8U="; + + meta = with lib; { + description = "OPA Rego language server"; + homepage = "https://github.com/kitagry/regols"; + license = licenses.mit; + maintainers = with maintainers; [ alias-dev ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix b/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix index 2e91085570..ae8d185bb5 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AmokHuginnsson/replxx"; description = "A readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed"; license = licenses.bsd3; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix index 1f8ca9b845..73150d42b8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix @@ -6,14 +6,14 @@ }: buildGoModule rec { pname = "rimgo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "rimgo"; repo = "rimgo"; rev = "v${version}"; - hash = "sha256-C878ABs978viVtIuv3fPn2F2anOg2GB/+f5jaCO13tc="; + hash = "sha256-C6xixULZCDs+rIP7IWBVQNo34Yk/8j9ell2D0nUoHBg="; }; vendorHash = "sha256-u5N7aI9RIQ3EmiyHv0qhMcKkvmpp+5G7xbzdQcbhybs="; diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix new file mode 100644 index 0000000000..f869a6e2ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ri/river-bnf/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromSourcehut +, wayland +, wayland-scanner +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "river-bnf"; + version = "unstable-2023-10-10"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "bb8ded380ed5d539777533065b4fd33646ad5603"; + hash = "sha256-rm9Nt3WLgq9QOXzrkYBGp45EALNYFTQGInxfYIN0XcU="; + }; + + nativeBuildInputs = [ + wayland-scanner + ]; + + buildInputs = [ + wayland.dev + ]; + + postPatch = '' + substituteInPlace Makefile --replace '/usr/local' $out + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Switch back'n'forth between river tags"; + homepage = "https://git.sr.ht/~leon_plickat/river-bnf"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ adamcstephens ]; + mainProgram = "river-bnf"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix rename to third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix index 83881cee29..bc64a8315f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/robodoc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/robodoc/package.nix @@ -4,15 +4,15 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "robodoc"; version = "4.99.44"; src = fetchFromGitHub { owner = "gumpu"; repo = "ROBODoc"; - rev = "v${version}"; - sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; postConfigure = lib.optionalString stdenv.isDarwin '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; + platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rockyou/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rockyou/package.nix new file mode 100644 index 0000000000..7e6bb2f34c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ro/rockyou/package.nix @@ -0,0 +1,20 @@ +{ seclists +, stdenvNoCC +}: +stdenvNoCC.mkDerivation { + pname = "rockyou"; + inherit (seclists) version src; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/wordlists/ + tar -xvzf ${seclists}/share/wordlists/seclists/Passwords/Leaked-Databases/rockyou.txt.tar.gz -C $out/share/wordlists/ + + runHook postInstall + ''; + + meta = seclists.meta // { + description = "A famous wordlist often used for brute force attacks"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/rqbit/default.nix b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/applications/networking/p2p/rqbit/default.nix rename to third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix index a60b3e9ddf..0505cbb1b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/rq/rqbit/package.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, darwin }: rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-7n+T+y60RjmZC7bE96Ljg0xVg4bSzV/LFgezTld4zfI="; + hash = "sha256-9yYHxlvRlO8iJ3SPi0+4lEgBgAaqaDffKChqAe4OsYU="; }; - cargoHash = "sha256-hcuZ4hqGJT/O7vFefKPGZlkqhdsAl5LGAcSRQAEopnM="; + cargoHash = "sha256-dUQiW6J3Wycp5D3mAwGwruU6CkQ534OyP1GdsY7jzEw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ikatson/rqbit"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; + mainProgram = "rqbit"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/rs/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/text/rs/default.nix rename to third_party/nixpkgs/pkgs/by-name/rs/rs/package.nix diff --git a/third_party/nixpkgs/pkgs/tools/text/rst2html5/default.nix b/third_party/nixpkgs/pkgs/by-name/rs/rst2html5/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/text/rst2html5/default.nix rename to third_party/nixpkgs/pkgs/by-name/rs/rst2html5/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix b/third_party/nixpkgs/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix new file mode 100644 index 0000000000..9f88ebd503 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "rtl-sdr-osmocom"; + version = "2.0.1"; + + src = fetchFromGitea { + domain = "gitea.osmocom.org"; + owner = "sdr"; + repo = "rtl-sdr"; + rev = "v${version}"; + hash = "sha256-+RYSCn+wAkb9e7NRI5kLY8a6OXtJu7QcSUht1R6wDX0="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \ + --replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}" + + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; + + nativeBuildInputs = [ pkg-config cmake ]; + + propagatedBuildInputs = [ libusb1 ]; + + cmakeFlags = lib.optionals stdenv.isLinux [ + "-DINSTALL_UDEV_RULES=ON" + "-DWITH_RPC=ON" + ]; + + meta = with lib; { + description = "Software to turn the RTL2832U into a SDR receiver"; + longDescription = '' + This packages the rtl-sdr library by the Osmocom project. This is the upstream codebase of the unsuffixed "rtl-sdr" package, which is a downstream fork. A list of differences can be found here: + https://github.com/librtlsdr/librtlsdr/blob/master/README_improvements.md + + The Osmocom upstream has a regular release schedule, so this package will likely support newer SDR dongles. It should be compatible with most software that currently depends on the "rtl-sdr" nixpkg, but comptabiliy should be manually confirmed. + ''; + homepage = "https://gitea.osmocom.org/sdr/rtl-sdr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ skovati ]; + platforms = platforms.unix; + mainProgram = "rtl_sdr"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/Cargo.lock new file mode 100644 index 0000000000..433552efa7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/Cargo.lock @@ -0,0 +1,1998 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +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 = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", + "libc", + "nix", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[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.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bindgen" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" +dependencies = [ + "bitflags", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + +[[package]] +name = "bindgen" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" +dependencies = [ + "bitflags", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom 5.1.2", +] + +[[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 = "clang-sys" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "claxon" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[package]] +name = "combine" +version = "4.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" +dependencies = [ + "bytes", + "memchr", +] + +[[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 = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f73df0f29f4c3c374854f076c47dc018f19acaa63538880dba0937ad4fa8d7" +dependencies = [ + "bindgen 0.53.3", +] + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "jni", + "js-sys", + "lazy_static", + "libc", + "mach", + "ndk", + "ndk-glue", + "nix", + "oboe", + "parking_lot 0.11.2", + "stdweb", + "thiserror", + "web-sys", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot 0.12.0", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +dependencies = [ + "winapi", +] + +[[package]] +name = "darling" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "encoding_rs" +version = "0.8.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "ffmpeg-decoder" +version = "0.1.3" +dependencies = [ + "ffmpeg-sys-next", + "log", + "rodio", + "thiserror", +] + +[[package]] +name = "ffmpeg-sys-next" +version = "4.4.0" +source = "git+https://github.com/Kingtous/rust-ffmpeg-sys.git?branch=fix/4.4.0#2c8b92401886d8a6d3b94e77fd73c84e95c627ee" +dependencies = [ + "bindgen 0.54.0", + "cc", + "libc", + "num_cpus", + "pkg-config", + "vcpkg", +] + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "pin-utils", +] + +[[package]] +name = "getrandom" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "h2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hound" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" + +[[package]] +name = "http" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[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 = "ipnet" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +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 = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +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 = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" + +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +dependencies = [ + "cc", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "m3u8-rs" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50fe05791a7f418b59d6cddebdc293d77c9c1f652adbff855c071d4507cd883b" +dependencies = [ + "nom 7.1.1", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "minimp3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" +dependencies = [ + "minimp3-sys", + "slice-deque", + "thiserror", +] + +[[package]] +name = "minimp3-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" +dependencies = [ + "cc", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "mio" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + +[[package]] +name = "mp3-duration" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "native-tls" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5cc68637e21fe8f077f6a1c9e0b9ca495bb74895226b476310f613325884" + +[[package]] +name = "ndk-glue" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ffb7443daba48349d545028777ca98853b018b4c16624aa01223bc29e078da" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "object" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2" +dependencies = [ + "jni", + "ndk", + "ndk-glue", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + +[[package]] +name = "open" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a82915836ef43159bb6a3c64d884c42329ccd0b8afdca737cf1e3dd701709dc" +dependencies = [ + "pathdiff", + "winapi", +] + +[[package]] +name = "openssl" +version = "0.10.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + +[[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.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[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" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", +] + +[[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", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project-lite" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro-crate" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +dependencies = [ + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro2" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "reqwest" +version = "0.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rodio" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" +dependencies = [ + "claxon", + "cpal", + "hound", + "lewton", + "minimp3", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustplayer" +version = "1.1.1" +dependencies = [ + "bytes", + "crossterm", + "dirs", + "failure", + "ffmpeg-decoder", + "m3u8-rs", + "mp3-duration", + "open", + "rand", + "regex", + "reqwest", + "rodio", + "tokio", + "tui", +] + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +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.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" + +[[package]] +name = "serde_json" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +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 = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "signal-hook" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" + +[[package]] +name = "slice-deque" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" +dependencies = [ + "libc", + "mach", + "winapi", +] + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[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", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +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.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +dependencies = [ + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "once_cell", + "parking_lot 0.12.0", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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-util" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tui" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" +dependencies = [ + "bitflags", + "cassowary", + "crossterm", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[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", + "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.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" + +[[package]] +name = "web-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +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-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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/dynamic-lib.patch b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/dynamic-lib.patch new file mode 100644 index 0000000000..c1f5ca165f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/dynamic-lib.patch @@ -0,0 +1,13 @@ +diff --git a/thirdparty/ffmpeg-decoder-rs/Cargo.toml b/thirdparty/ffmpeg-decoder-rs/Cargo.toml +index 9db9ac9..4546253 100644 +--- a/thirdparty/ffmpeg-decoder-rs/Cargo.toml ++++ b/thirdparty/ffmpeg-decoder-rs/Cargo.toml +@@ -20,7 +20,7 @@ default = [] + rodio_source = ['rodio'] + + [dependencies] +-ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample", "static"] } ++ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample"] } + + thiserror = "1.0" + log = "0.4" diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/package.nix new file mode 100644 index 0000000000..71c86fe5dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustplayer/package.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, alsa-lib +, ffmpeg_4 +}: + +rustPlatform.buildRustPackage { + pname = "rustplayer"; + version = "unstable-2022-12-29"; + + src = fetchFromGitHub { + owner = "Kingtous"; + repo = "RustPlayer"; + rev = "a369bc19ab4a8c568c73be25c5e6117e1ee5d848"; + sha256 = "sha256-x82EdA7ezCzux1C85IcI2ZQ3M95sH6/k97Rv6lqc5eo="; + }; + + # This patch is from the source + patches = [ + ./dynamic-lib.patch + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ffmpeg-sys-next-4.4.0" = "sha256-TBgf+J+ud7nnVjf0r98/rujFPEayjEaVi+vnSE6/5Ak="; + }; + }; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + buildInputs = [ alsa-lib openssl ffmpeg_4 ]; + + checkFlags = [ + # network required + "--skip=fetch_and_play" + ]; + + meta = with lib; { + homepage = "https://github.com/Kingtous/RustPlayer"; + description = "A local audio player and network m3u8 radio player using a terminal interface"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ oluceps ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scala-update/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scala-update/package.nix new file mode 100644 index 0000000000..d15292c4d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scala-update/package.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, coursier, buildGraalvmNativeImage }: + +let + baseName = "scala-update"; + version = "0.2.2"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/cs fetch io.github.kitlangton:scala-update_2.13:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "kNnFzzHn+rFq4taqRYjBYaDax0MHW+vIoSFVN3wxA8M="; + }; +in buildGraalvmNativeImage { + pname = baseName; + inherit version; + + buildInputs = [ deps ]; + + src = "${deps}/share/java/${baseName}_2.13-${version}.jar"; + + extraNativeImageBuildArgs = + [ "--no-fallback" "--enable-url-protocols=https" "update.Main" ]; + + buildPhase = '' + runHook preBuild + + native-image ''${nativeImageBuildArgs[@]} -cp $(JARS=("${deps}/share/java"/*.jar); IFS=:; echo "''${JARS[*]}") + + runHook postBuild + ''; + + installCheckPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" + ''; + + meta = with lib; { + description = "Update your Scala dependencies interactively"; + homepage = "https://github.com/kitlangton/scala-update"; + license = licenses.asl20; + maintainers = [ maintainers.rtimush ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix new file mode 100644 index 0000000000..3b56828469 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scalingo/package.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "scalingo"; + version = "1.29.1"; + + src = fetchFromGitHub { + owner = pname; + repo = "cli"; + rev = version; + hash = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; + }; + + vendorHash = null; + + preCheck = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + rm $out/bin/dists + ''; + + meta = with lib; { + description = "Command line client for the Scalingo PaaS"; + homepage = "https://doc.scalingo.com/platform/cli/start"; + changelog = "https://github.com/Scalingo/cli/blob/master/CHANGELOG.md"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ cimm ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scd2html/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scd2html/package.nix new file mode 100644 index 0000000000..17cd4f2116 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scd2html/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromSourcehut +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "scd2html"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = pname; + rev = "v${version}"; + hash = "sha256-oZSHv5n/WOrvy77tC94Z8pYugLpHkcv7U1PrzR+8fHM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + scdoc + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "LDFLAGS+=-static" "LDFLAGS+=" + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "scd2html generates HTML from scdoc source files"; + homepage = "https://git.sr.ht/~bitfehler/scd2html"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + mainProgram = "scd2html"; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/scimark/default.nix b/third_party/nixpkgs/pkgs/by-name/sc/scimark/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/misc/scimark/default.nix rename to third_party/nixpkgs/pkgs/by-name/sc/scimark/package.nix index 5726556e68..c9a88e6d2b 100644 --- a/third_party/nixpkgs/pkgs/misc/scimark/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/scimark/package.nix @@ -4,12 +4,12 @@ , unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scimark"; version = "4c"; src = fetchurl { - url = "https://math.nist.gov/scimark2/${pname}${version}.zip"; + url = "https://math.nist.gov/scimark2/scimark${finalAttrs.version}.zip"; hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE="; }; @@ -20,17 +20,21 @@ stdenv.mkDerivation rec { dontConfigure = true; installPhase = '' - install -d $out/bin/ - install scimark4 $out/bin/ + runHook preInstall + + install -Dm755 scimark4 -t $out/bin/ + + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://math.nist.gov/scimark2/index.html"; description = "Scientific and numerical computing benchmark (ANSI C version)"; - license = licenses.publicDomain; - maintainers = with maintainers; [ AndersonTorres ]; + downloadPage = "https://math.nist.gov/scimark2/download_c.html"; + license = lib.licenses.publicDomain; mainProgram = "scimark4"; - platforms = platforms.all; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) # TODO [ AndersonTorres ]: Java version diff --git a/third_party/nixpkgs/pkgs/by-name/sd/sdcc/package.nix b/third_party/nixpkgs/pkgs/by-name/sd/sdcc/package.nix new file mode 100644 index 0000000000..eaac606fbd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sd/sdcc/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, bison +, boost +, flex +, gputils +, texinfo +, zlib +, withGputils ? false +, excludePorts ? [] +}: + +assert lib.subtractLists [ + "ds390" "ds400" "gbz80" "hc08" "mcs51" "pic14" "pic16" "r2k" "r3ka" "s08" + "stm8" "tlcs90" "z80" "z180" +] excludePorts == []; +stdenv.mkDerivation (finalAttrs: { + pname = "sdcc"; + version = "4.2.0"; + + src = fetchurl { + url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; + hash = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; + }; + + outputs = [ "out" "doc" "man" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoconf + bison + flex + ]; + + buildInputs = [ + boost + texinfo + zlib + ] ++ lib.optionals withGputils [ + gputils + ]; + + configureFlags = let + excludedPorts = excludePorts + ++ (lib.optionals (!withGputils) [ "pic14" "pic16" ]); + in + map (f: "--disable-${f}-port") excludedPorts; + + preConfigure = '' + if test -n "''${dontStrip-}"; then + export STRIP=none + fi + ''; + + meta = { + homepage = "https://sdcc.sourceforge.net/"; + description = "Small Device C Compiler"; + longDescription = '' + SDCC is a retargettable, optimizing ANSI - C compiler suite that targets + the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), + Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) + HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit + 2000/3000, Rabbit 3000A). Work is in progress on supporting the Microchip + PIC16 and PIC18 targets. It can be retargeted for other microprocessors. + ''; + license = if withGputils + then lib.licenses.unfreeRedistributable + else lib.licenses.gpl2Plus; + mainProgram = "sdcc"; + maintainers = with lib.maintainers; [ bjornfor yorickvp ]; + platforms = lib.platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/se/seclists/package.nix b/third_party/nixpkgs/pkgs/by-name/se/seclists/package.nix new file mode 100644 index 0000000000..f452eb313f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/seclists/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "seclists"; + version = "2023.3"; + + src = fetchFromGitHub { + owner = "danielmiessler"; + repo = "SecLists"; + rev = "2023.3"; + hash = "sha256-mJgCzp8iKzSWf4Tud5xDpnuY4aNJmnEo/hTcuGTaOWM="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/wordlists/seclists + find . -maxdepth 1 -type d -regextype posix-extended -regex '^./[A-Z].*' -exec cp -R {} $out/share/wordlists/seclists \; + find $out/share/wordlists/seclists -name "*.md" -delete + + runHook postInstall + ''; + + meta = with lib; { + description = "A collection of multiple types of lists used during security assessments, collected in one place"; + homepage = "https://github.com/danielmiessler/seclists"; + license = licenses.mit; + maintainers = with maintainers; [ tochiaha janik pamplemousse ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/by-name/se/serial-unit-testing/package.nix b/third_party/nixpkgs/pkgs/by-name/se/serial-unit-testing/package.nix new file mode 100644 index 0000000000..dd45dc760c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/se/serial-unit-testing/package.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, udev +}: + +rustPlatform.buildRustPackage rec { + pname = "serial-unit-testing"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "markatk"; + repo = "serial-unit-testing"; + rev = "v${version}"; + hash = "sha256-SLwTwEQdwbus9RFskFjU8m4fS9Pnp8HsgnKkBvTqmSI="; + }; + + cargoHash = "sha256-PoV2v0p0L3CTtC9VMAx2Z/ZsSAIFi2gh2TtOp64S6ZQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + udev + ]; + + # tests require a serial port + doCheck = false; + + meta = with lib; { + description = "Automate testing of serial communication with any serial port device"; + homepage = "https://github.com/markatk/serial-unit-testing"; + changelog = "https://github.com/markatk/serial-unit-testing/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ rudolfvesely ]; + mainProgram = "sut"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix index adbe013805..83059f1a28 100644 --- a/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.3.4"; + version = "0.3.12"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-1lOcr3XiQCh1T07iYRlGwMzsmQx1QYgkrStWlUM1XCo="; + hash = "sha256-vGtHz1lSKbucR4MmXv542lv9kbON9Cwo7vB5TaeqoX8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-j133hlcfRKTkIcNdZQmGn5yiWfKHp/5UVwLAs1njNdM="; + vendorHash = "sha256-vE9gh0u8j2NViK2dUd39zZtUuaoKv0hf8VhSX/P4ar8="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/third_party/nixpkgs/pkgs/by-name/si/signal-export/package.nix b/third_party/nixpkgs/pkgs/by-name/si/signal-export/package.nix new file mode 100644 index 0000000000..d1e20fa68a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/signal-export/package.nix @@ -0,0 +1,40 @@ +{ lib +, python3 +, fetchPypi +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "signal-export"; + version = "1.6.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1efc8jclXE4PQ/K9q1GC0mGqYo5lXXOIYEzz3RDNBGA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + typer + beautifulsoup4 + emoji + markdown + pysqlcipher3 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + mainProgram = "sigexport"; + homepage = "https://github.com/carderne/signal-export"; + description = "Export your Signal chats to markdown files with attachments."; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ phaer picnoir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix new file mode 100644 index 0000000000..c79cbf38f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/si/simde/package.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "simde"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "simd-everywhere"; + repo = "simde"; + rev = "v${version}"; + hash = "sha256-pj+zaD5o9XYkTavezcQFzM6ao0IdQP1zjP9L4vcCyEY="; + }; + + nativeBuildInputs = [ meson ninja ]; + + meta = with lib; { + homepage = "https://simd-everywhere.github.io"; + description = "Implementations of SIMD instruction sets for systems which don't natively support them"; + license = with licenses; [mit]; + maintainers = with maintainers; [ whiteley ]; + platforms = flatten (with platforms; [ + arm + armv7 + aarch64 + x86 + power + mips + ]); + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix b/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix index 05d049a7d4..8518092203 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix @@ -21,10 +21,16 @@ , eigen , libvdwxc , llvmPackages -, gpuBackend ? "none" , cudaPackages -, hip -, rocblas +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -67,8 +73,10 @@ stdenv.mkDerivation rec { libvdwxc ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ hip rocblas ] - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocblas + ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = [ mpi ]; @@ -87,7 +95,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (gpuBackend == "rocm") [ "-DUSE_ROCM=ON" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${rocmPackages.clr}" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix b/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix similarity index 73% rename from third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix rename to third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix index 23529f6b0a..c6cb6e6a1c 100644 --- a/third_party/nixpkgs/pkgs/misc/sound-of-sorting/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/so/sound-of-sorting/package.nix @@ -7,9 +7,9 @@ , darwin }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sound-of-sorting"; - version = "unstable-2022-10-12"; + version = "0.6.5-unstable-2022-10-12"; src = fetchFromGitHub { owner = "bingmann"; @@ -26,13 +26,16 @@ stdenv.mkDerivation { wxGTK32 SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ; + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; meta = { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; license = lib.licenses.gpl3Plus; + mainProgram = "sound-of-sorting"; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; + inherit (SDL2.meta) platforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix index dcc43ccd24..55b20defd5 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix @@ -6,11 +6,16 @@ , mpi , gfortran , llvmPackages -, gpuBackend ? "none" , cudaPackages -, hip -, rocfft -, hipfft +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -35,8 +40,11 @@ stdenv.mkDerivation rec { fftw ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ hip rocfft hipfft ] - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocfft + rocmPackages.hipfft + ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = [ mpi ]; @@ -53,7 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional (gpuBackend == "cuda") "-DSPFFT_GPU_BACKEND=CUDA" ++ lib.optionals (gpuBackend == "rocm") [ "-DSPFFT_GPU_BACKEND=ROCM" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${rocmPackages.clr}" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spice-autorandr/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spice-autorandr/package.nix new file mode 100644 index 0000000000..e79f4cb18b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sp/spice-autorandr/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, libX11 +, libXrandr +}: + +stdenv.mkDerivation { + pname = "spice-autorandr"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "seife"; + repo = "spice-autorandr"; + rev = "0f61dc921b638761ee106b5891384c6348820b26"; + hash = "sha256-eBvzalWT3xI8+uNns0/ZyRes91ePpj0beKb8UBVqo0E="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 libXrandr ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $pname $out/bin/ + + runHook postInstall + ''; + + meta = { + description = "Automatically adjust the client window resolution in Linux KVM guests using the SPICE driver."; + longDescription = '' + Some desktop environments update the display resolution automatically, + this package is only useful when running without a DE or with a DE that + does not update display resolution automatically. + + This package relies on `spice-vdagent` running an updating the xrandr modes. Enable + `spice-vdagent` by adding `services.spice-autorandr.enable = true` to your `configuration.nix`. + ''; + homepage = "https://github.com/seife/spice-autorandr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + dmytrokyrychuk + ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix b/third_party/nixpkgs/pkgs/by-name/sp/spigot/package.nix similarity index 84% rename from third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix rename to third_party/nixpkgs/pkgs/by-name/sp/spigot/package.nix index 5f50307537..421af163cd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/spigot/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spigot/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, callPackage , cmake , gmp , halibut @@ -32,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + passthru.tests = { + approximation = callPackage ./tests/approximation.nix { + spigot = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; description = "A command-line exact real calculator"; diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spigot/tests/approximation.nix b/third_party/nixpkgs/pkgs/by-name/sp/spigot/tests/approximation.nix new file mode 100644 index 0000000000..ffb329e6a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, spigot +}: + +stdenv.mkDerivation { + pname = "spigot-approximation"; + inherit (spigot) version; + + nativeBuildInputs = [ spigot ]; + + dontInstall = true; + + buildCommand = '' + [ "$(spigot -b2 -d32 '(pi/1-355/113)')" = "-0.00000000000000000000010001111001" ] + [ "$(spigot -b2 -d32 '(e/1-1457/536)')" = "-0.00000000000000000001110101101011" ] + touch $out + ''; + + meta.timeout = 10; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix index 3143fbeb73..210fb04af9 100644 --- a/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix @@ -6,10 +6,16 @@ , blas , gfortran , llvmPackages -, gpuBackend ? "none" , cudaPackages -, hip -, rocblas +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; @@ -39,8 +45,10 @@ stdenv.mkDerivation rec { blas ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ hip rocblas rocblas ] - ++ lib.optional stdenv.isDarwin llvmPackages.openmp + ++ lib.optionals (gpuBackend == "rocm") [ + rocmPackages.clr + rocmPackages.rocblas + ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp ; propagatedBuildInputs = [ mpi ]; diff --git a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix new file mode 100644 index 0000000000..0a289e0989 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "stats"; + version = "2.9.11"; + + src = fetchurl { + url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; + hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS system monitor in your menu bar"; + homepage = "https://github.com/exelban/stats"; + license = licenses.mit; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/st/steamguard-cli/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix rename to third_party/nixpkgs/pkgs/by-name/st/steamguard-cli/package.nix index 643a5ad07e..d93cfa4b28 100644 --- a/third_party/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/st/steamguard-cli/package.nix @@ -1,20 +1,29 @@ -{ lib +{ installShellFiles +, lib , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-p3v7XiOXWH6F1oIiARr0K3sYOXCcNS97+THIG7k72wk="; + hash = "sha256-qfyo63u6gBkGNxVBmFsz9YXs6duRU/VnFly40C13vI8="; }; - cargoHash = "sha256-qQA7UdtFqGPyCRHdV+FfbQFiPaOeW4rT4dYC3BeHDw0="; + cargoHash = "sha256-B8/WCSHC905wDxYGLYVMT0QxgMiGR0/VMVzOlyTKPss="; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd steamguard \ + --bash <($out/bin/steamguard completion --shell bash) \ + --fish <($out/bin/steamguard completion --shell fish) \ + --zsh <($out/bin/steamguard completion --shell zsh) \ + ''; meta = with lib; { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix index 0c2f34cf5f..f329dcfa79 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix @@ -1,32 +1,41 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , makeDesktopItem , copyDesktopItems , pkg-config +, desktopToDarwinBundle , xorg +, wayland +, wayland-protocols +, libxkbcommon , libglvnd , mpv -, glfw3 +, darwin , waylandSupport ? false }: +assert waylandSupport -> stdenv.isLinux; + buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.5.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-4SLAUqLMoUxTSi4I/QeHqudO62Gmhpm1XbCGf+3rPlc="; + hash = "sha256-DVduZ1qPbcDlH+B5hibC2HUjwEUV+CpDDpMI8GdPwro"; }; - vendorHash = "sha256-6Yp5OoybFpoBuIKodbwnyX3crLCl8hJ2r4plzo0plsY="; + vendorHash = "sha256-Dj6I+gt0gB5HWTWdFXCV5UpLuvg+HhuygRJAdvV/Yp8"; nativeBuildInputs = [ copyDesktopItems pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle ]; # go-glfw doesn't support both X11 and Wayland in single build @@ -35,9 +44,26 @@ buildGoModule rec { buildInputs = [ libglvnd mpv + ] ++ lib.optionals stdenv.isLinux [ xorg.libXxf86vm xorg.libX11 - ] ++ (glfw3.override { inherit waylandSupport; }).buildInputs; + ] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor + xorg.libXi + xorg.libXext + ] ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + wayland + wayland-protocols + libxkbcommon + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Kernel + darwin.apple_sdk_11_0.frameworks.OpenGL + darwin.apple_sdk_11_0.frameworks.UserNotifications + darwin.apple_sdk_11_0.frameworks.MediaPlayer + ]; postInstall = '' for dimension in 128 256 512;do @@ -66,7 +92,7 @@ buildGoModule rec { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; description = "A lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; maintainers = with maintainers; [ zane sochotnicky ]; }; diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock new file mode 100644 index 0000000000..2510e29c9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/Cargo.lock @@ -0,0 +1,5198 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +dependencies = [ + "generic-array", +] + +[[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", + "serde", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "aide" +version = "0.10.0" +source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d" +dependencies = [ + "aide-macros", + "axum", + "bytes", + "cfg-if", + "http", + "indexmap 1.9.3", + "schemars", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "aide-macros" +version = "0.6.0" +source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "amq-protocol" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d40d8b2465c7959dd40cee32ba6ac334b5de57e9fca0cc756759894a4152a5d" +dependencies = [ + "amq-protocol-tcp", + "amq-protocol-types", + "amq-protocol-uri", + "cookie-factory", + "nom", + "serde", +] + +[[package]] +name = "amq-protocol-tcp" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb2100adae7da61953a2c3a01935d86caae13329fadce3333f524d6d6ce12e2" +dependencies = [ + "amq-protocol-uri", + "tcp-stream", + "tracing", +] + +[[package]] +name = "amq-protocol-types" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "156ff13c8a3ced600b4e54ed826a2ae6242b6069d00dd98466827cef07d3daff" +dependencies = [ + "cookie-factory", + "nom", + "serde", + "serde_json", +] + +[[package]] +name = "amq-protocol-uri" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "751bbd7d440576066233e740576f1b31fdc6ab86cfabfbd48c548de77eca73e4" +dependencies = [ + "amq-protocol-types", + "percent-encoding", + "url", +] + +[[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.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +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", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[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", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-global-executor-trait" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33dd14c5a15affd2abcff50d84efd4009ada28a860f01c14f9d654f3e81b3f75" +dependencies = [ + "async-global-executor", + "async-trait", + "executor-trait", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.23", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-reactor-trait" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6012d170ad00de56c9ee354aef2e358359deb1ec504254e0e5a3774771de0e" +dependencies = [ + "async-io", + "async-trait", + "futures-core", + "reactor-trait", +] + +[[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 2.0.29", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[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" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http 0.3.5", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-server" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197b070de3ae5fc503d531d4dc7680e016438c2ffc848a1fefebc5c53f35cc17" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "openssl", + "pin-project-lite", + "tokio", + "tokio-openssl", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-encode" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17bd29f7c70f32e9387f4d4acfa5ea7b7749ef784fb78cf382df97069337b8c" + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bb8" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" +dependencies = [ + "async-trait", + "futures-channel", + "futures-util", + "parking_lot", + "tokio", +] + +[[package]] +name = "bb8-redis" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd456361ba8e4e7f5fe58e1697ce078a149c85ebce13bf9c6b483d3f566fc9c3" +dependencies = [ + "async-trait", + "bb8", + "redis", +] + +[[package]] +name = "binstring" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0d60973d9320722cb1206f412740e162a33b8547ea8d6be75d7cff237c7a85" + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[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 = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher 0.4.4", +] + +[[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 = "chacha20" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +dependencies = [ + "cfg-if", + "cipher 0.3.0", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +dependencies = [ + "aead", + "chacha20", + "cipher 0.3.0", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "coarsetime" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" +dependencies = [ + "libc", + "once_cell", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util 0.7.8", +] + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "crc16" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" + +[[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-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[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 = "ct-codecs" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[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", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468 0.6.0", + "zeroize", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468 0.7.0", + "zeroize", +] + +[[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 = "des" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dyn-clone" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der 0.7.8", + "digest", + "elliptic-curve", + "rfc6979", + "signature 2.1.0", + "spki 0.7.2", +] + +[[package]] +name = "ed25519-compact" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e18997d4604542d0736fae2c5ad6de987f0a50530cbcc14a7ce5a685328a252d" +dependencies = [ + "ct-codecs", + "getrandom", +] + +[[package]] +name = "ed25519-compact" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" +dependencies = [ + "ct-codecs", + "getrandom", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468 0.7.0", + "pkcs8 0.10.2", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[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 = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[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 = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "executor-trait" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a1052dd43212a7777ec6a69b117da52f5e52f07aec47d00c1a2b33b85d06b08" +dependencies = [ + "async-trait", +] + +[[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set", + "regex", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "tempfile", + "toml", + "uncased", + "version_check", +] + +[[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", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa5de57a62c2440ece64342ea59efb7171aa7d016faf8dfcb8795066a17146b" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[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-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util 0.7.8", + "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "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 = "hmac-sha1-compact" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9d405ec732fa3fcde87264e54a32a84956a377b3e3107de96e59b798c84a7" + +[[package]] +name = "hmac-sha256" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" +dependencies = [ + "digest", +] + +[[package]] +name = "hmac-sha512" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ce1f4656bae589a3fab938f9f09bf58645b7ed01a2c5f8a3c238e01a4ef78a" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +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 = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "git+https://github.com/svix/hyper/?rev=b901ca7c#b901ca7c7772c427d63d150e1bf1c2ce7ce0d733" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-openssl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +dependencies = [ + "http", + "hyper", + "linked_hash_set", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot", + "tokio", + "tokio-openssl", + "tower-layer", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "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.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[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.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[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 = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inherent" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[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 = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +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", + "libc", + "windows-sys", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.3", + "widestring", + "windows-sys", + "winreg 0.50.0", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +dependencies = [ + "serde", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.4", + "windows-sys", +] + +[[package]] +name = "iso8601" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "296af15e112ec6dc38c9fd3ae027b5337a75466e8eed757bd7d5cf742ea85eb6" +dependencies = [ + "nom", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonschema" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ca9e2b45609132ae2214d50482c03aeee78826cd6fd53a8940915b81acedf16" +dependencies = [ + "ahash", + "anyhow", + "base64 0.13.1", + "bytecount", + "clap", + "fancy-regex", + "fraction", + "iso8601", + "itoa", + "lazy_static", + "memchr", + "num-cmp", + "parking_lot", + "percent-encoding", + "regex", + "reqwest", + "serde", + "serde_json", + "time 0.3.23", + "url", + "uuid", +] + +[[package]] +name = "jwt-simple" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733741e7bcd1532b56c9ba6c698c069f274f3782ad956f0d2c7f31650cedaa1b" +dependencies = [ + "anyhow", + "binstring", + "coarsetime", + "ct-codecs", + "ed25519-compact 2.0.4", + "hmac-sha1-compact", + "hmac-sha256", + "hmac-sha512", + "k256", + "p256", + "p384", + "rand", + "rsa 0.7.2", + "serde", + "serde_json", + "spki 0.6.0", + "thiserror", + "zeroize", +] + +[[package]] +name = "k256" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature 2.1.0", +] + +[[package]] +name = "lapin" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f3067a1fcfbc3fc46455809c023e69b8f6602463201010f4ae5a3b572adb9dc" +dependencies = [ + "amq-protocol", + "async-global-executor-trait", + "async-reactor-trait", + "async-trait", + "executor-trait", + "flume", + "futures-core", + "futures-io", + "parking_lot", + "pinky-swear", + "reactor-trait", + "serde", + "tracing", + "waker-fn", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[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 = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[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 = "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[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 = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[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", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-cmp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" + +[[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-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "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-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +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.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "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 2.0.29", +] + +[[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.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "opentelemetry-http" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry", + "prost", + "thiserror", + "tokio", + "tonic", + "tonic-build", +] + +[[package]] +name = "ordered-float" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p12" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" +dependencies = [ + "cbc", + "cipher 0.4.4", + "des", + "getrandom", + "hmac", + "lazy_static", + "rc2", + "sha1", + "yasna", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pear" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pinky-swear" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d894b67aa7a4bf295db5e85349078c604edaa6fa5c8721e8eca3c7729a27f2ac" +dependencies = [ + "doc-comment", + "flume", + "parking_lot", + "tracing", +] + +[[package]] +name = "pkcs1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" +dependencies = [ + "der 0.6.1", + "pkcs8 0.9.0", + "spki 0.6.0", + "zeroize", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.8", + "pkcs8 0.10.2", + "spki 0.7.2", +] + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.8", + "spki 0.7.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[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", +] + +[[package]] +name = "poly1305" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +dependencies = [ + "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 = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes", + "heck 0.3.3", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +dependencies = [ + "bytes", + "prost", +] + +[[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.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +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 = "rc2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "reactor-trait" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "438a4293e4d097556730f4711998189416232f009c137389e0f961d2bc0ddc58" +dependencies = [ + "async-trait", + "futures-core", + "futures-io", +] + +[[package]] +name = "redis" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" +dependencies = [ + "async-trait", + "bytes", + "combine", + "crc16", + "futures", + "futures-util", + "itoa", + "log", + "native-tls", + "percent-encoding", + "pin-project-lite", + "rand", + "ryu", + "sha1_smol", + "tokio", + "tokio-native-tls", + "tokio-util 0.7.8", + "url", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "trust-dns-resolver", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.22.6", + "winreg 0.10.1", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rsa" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" +dependencies = [ + "byteorder", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1 0.4.1", + "pkcs8 0.9.0", + "rand_core", + "signature 1.6.4", + "smallvec", + "subtle", + "zeroize", +] + +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1 0.7.5", + "pkcs8 0.10.2", + "rand_core", + "signature 2.1.0", + "spki 0.7.2", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-connector" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060bcc1795b840d0e56d78f3293be5f652aa1611d249b0e63ffe19f4a8c9ae23" +dependencies = [ + "log", + "rustls", + "rustls-native-certs", + "rustls-webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "schemars" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sea-bae" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd3534a9978d0aa7edd2808dc1f8f31c4d0ecd31ddf71d997b3c98e9f3c9114" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "sea-orm" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f6c7daef05dde3476d97001e11fca7a52b655aa3bf4fd610ab2da1176a2ed5" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "log", + "ouroboros", + "sea-orm-macros", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "sqlx", + "strum 0.25.0", + "thiserror", + "time 0.3.23", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sea-orm-macros" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd90e73d5f5b184bad525767da29fbfec132b4e62ebd6f60d2f2737ec6468f62" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "sea-bae", + "syn 2.0.29", + "unicode-ident", +] + +[[package]] +name = "sea-query" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aeb899964df7038e7274306b742951b82a04f835bca8a4683a4c254a6bf35fa" +dependencies = [ + "chrono", + "derivative", + "inherent", + "ordered-float", + "serde_json", +] + +[[package]] +name = "sea-query-binder" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +dependencies = [ + "chrono", + "sea-query", + "serde_json", + "sqlx", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der 0.7.8", + "generic-array", + "pkcs8 0.10.2", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "sentry" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" +dependencies = [ + "httpdate", + "native-tls", + "reqwest", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", + "sentry-panic", + "sentry-tracing", + "tokio", + "ureq", +] + +[[package]] +name = "sentry-backtrace" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-debug-images" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e" +dependencies = [ + "findshlibs", + "once_cell", + "sentry-core", +] + +[[package]] +name = "sentry-panic" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tracing" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f" +dependencies = [ + "debugid", + "getrandom", + "hex", + "serde", + "serde_json", + "thiserror", + "time 0.3.23", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c679fa27b429f2bb57fd4710257e643e86c966e716037259f8baa33de594a1b6" +dependencies = [ + "axum", + "futures", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_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 = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "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 = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.8", +] + +[[package]] +name = "sqlformat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.24.0", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa 0.9.2", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "svix" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4a0071892c06482d6585e7b15146b088f777d4da18aa924d9f960d59b7e4f4" +dependencies = [ + "base64 0.13.1", + "hmac-sha256", + "http", + "reqwest", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "time 0.3.23", + "url", +] + +[[package]] +name = "svix-ksuid" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c0c2b19ae442a1842ba35f7eeff46e684bb24cb4a9571f41b48e5181e5eadd5" +dependencies = [ + "base-encode", + "byteorder", + "chrono", + "getrandom", +] + +[[package]] +name = "svix-server" +version = "1.13.0" +dependencies = [ + "aide", + "anyhow", + "axum", + "axum-server", + "base64 0.13.1", + "bb8", + "bb8-redis", + "blake2", + "bytes", + "chacha20poly1305", + "chrono", + "clap", + "dotenv", + "ed25519-compact 1.0.16", + "enum_dispatch", + "figment", + "form_urlencoded", + "futures", + "hmac-sha256", + "http", + "hyper", + "hyper-openssl", + "indexmap 1.9.3", + "ipnet", + "jsonschema", + "jwt-simple", + "lapin", + "num_enum", + "once_cell", + "openssl", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-otlp", + "rand", + "redis", + "regex", + "reqwest", + "schemars", + "sea-orm", + "sentry", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha2", + "sqlx", + "strum 0.24.1", + "strum_macros", + "svix", + "svix-ksuid", + "svix-server_derive", + "thiserror", + "tikv-jemallocator", + "time 0.3.23", + "tokio", + "tower", + "tower-http 0.4.3", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "trust-dns-resolver", + "url", + "urlencoding", + "validator", +] + +[[package]] +name = "svix-server_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +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 = "tcp-stream" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da30af7998f51ee1aa48ab24276fe303a697b004e31ff542b192c088d5630a5" +dependencies = [ + "cfg-if", + "p12", + "rustls-connector", + "rustls-pemfile", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall", + "rustix 0.38.4", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[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", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[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-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +dependencies = [ + "async-stream", + "async-trait", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util 0.6.10", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +dependencies = [ + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util 0.7.8", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +dependencies = [ + "bitflags 2.3.3", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", + "uuid", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "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 = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64 0.21.2", + "log", + "native-tls", + "once_cell", + "url", +] + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "validator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +dependencies = [ + "idna 0.2.3", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive", + "validator_types", +] + +[[package]] +name = "validator_derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +dependencies = [ + "if_chain", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "validator_types", +] + +[[package]] +name = "validator_types" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[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 = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[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.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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] +name = "yansi" +version = "1.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix new file mode 100644 index 0000000000..e7de972488 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sv/svix-server/package.nix @@ -0,0 +1,54 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, protobuf, stdenv +, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "svix-server"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "svix"; + repo = "svix-webhooks"; + rev = "v${version}"; + hash = "sha256-6758ej7bTvwZPWifl239rQMazM8uw+Y4+3EbjE8XsTg="; + }; + + sourceRoot = "source/server"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "aide-0.10.0" = "sha256-hUUer5D6OA4F0Co3JgygY3g89cKIChFest67ABIX+4M="; + "hyper-0.14.23" = "sha256-7MBCAjKYCdDbqCmYg3eYE74h7K7yTjfVoo0sjxr4g/s="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + protobuf + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + OPENSSL_NO_VENDOR = 1; + + # disable tests because they require postgres and redis to be running + doCheck = false; + + meta = with lib; { + mainProgram = "svix-server"; + description = "The enterprise-ready webhooks service"; + homepage = "https://github.com/svix/svix-webhooks"; + changelog = + "https://github.com/svix/svix-webhooks/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swipe-guess/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swipe-guess/package.nix new file mode 100644 index 0000000000..2f6d5f8fe9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sw/swipe-guess/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromSourcehut +}: + +stdenv.mkDerivation rec { + pname = "swipe-guess"; + version = "0.2.1"; + + src = fetchFromSourcehut { + owner = "~earboxer"; + repo = "swipeGuess"; + rev = "v${version}"; + hash = "sha256-8bPsnqjLeeZ7btTre9j1T93VWY9+FdBdJdxyvBVt34s="; + }; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + ${lib.getExe stdenv.cc} swipeGuess.c -o swipeGuess + + runHook postBuild + ''; + + postInstall = '' + install -Dm555 swipeGuess -t $out/bin + ''; + + meta = { + description = "Completion plugin for touchscreen-keyboards on mobile devices"; + homepage = "https://git.sr.ht/~earboxer/swipeGuess/"; + license = lib.licenses.agpl3Only; + mainProgram = "swipeGuess"; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/X11/sxhkd/default.nix b/third_party/nixpkgs/pkgs/by-name/sx/sxhkd/package.nix similarity index 80% rename from third_party/nixpkgs/pkgs/tools/X11/sxhkd/default.nix rename to third_party/nixpkgs/pkgs/by-name/sx/sxhkd/package.nix index ab15c38168..ea688c23e7 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/sxhkd/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/sx/sxhkd/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = [ asciidoc ]; @@ -40,13 +42,16 @@ stdenv.mkDerivation (finalAttrs: { xcbutilwm ]; + strictDeps = true; + makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Simple X hotkey daemon"; homepage = "https://github.com/baskerville/sxhkd"; - license = licenses.bsd2; - maintainers = with maintainers; [ vyp AndersonTorres ncfavier ]; - platforms = platforms.linux; + license = lib.licenses.bsd2; + mainProgram = "sxhkd"; + maintainers = with lib.maintainers; [ vyp AndersonTorres ncfavier ]; + inherit (libxcb.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/Cargo.lock index 25fa9ef795..29b24ea9cc 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/Cargo.lock @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -82,15 +82,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -157,14 +157,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -174,26 +174,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.23", - "slab", - "socket2 0.4.9", - "waker-fn", -] - [[package]] name = "async-lock" version = "2.8.0" @@ -205,13 +185,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -238,11 +218,11 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 2.0.0", + "fastrand", "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -258,7 +238,7 @@ checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand 2.0.0", + "fastrand", "tokio", "tracing", "zeroize", @@ -298,7 +278,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "fastrand 2.0.0", + "fastrand", "http", "percent-encoding", "tracing", @@ -307,9 +287,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a531d010f9f556bf65eb3bcd8d24f1937600ab6940fede4d454cd9b1f031fb34" +checksum = "73018483d9cb78e1a0d4dcbc94327b01d532e7cb28f26c5bceff97f8f0e4c6eb" dependencies = [ "aws-credential-types", "aws-http", @@ -450,7 +430,7 @@ dependencies = [ "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand 2.0.0", + "fastrand", "http", "http-body", "hyper", @@ -544,7 +524,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "bytes", - "fastrand 2.0.0", + "fastrand", "http", "http-body", "once_cell", @@ -693,12 +673,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.4" @@ -732,11 +706,11 @@ checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -749,7 +723,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.33", + "syn 2.0.38", "which", ] @@ -761,9 +735,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -776,26 +750,27 @@ dependencies = [ [[package]] name = "breakpad-symbols" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1d08190a0784c68f8eb9f53e4ce78e85ae4f1aaf900a6b8a203ac8573ba488" +checksum = "d74d84f4b64599b9ce996914673a5b4d60181c3895c7eb26369459ccc41fb37d" dependencies = [ "async-trait", + "cachemap2", "circular", "debugid", + "futures-util", "minidump-common", "nom", "range-map", "thiserror", - "tokio", "tracing", ] [[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", @@ -804,9 +779,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -829,15 +804,15 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "d1a12477b7237a01c11a80a51278165f9ba0edd28fa6db00a65ab230320dc58c" [[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" @@ -876,6 +851,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "cachemap2" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7bba2f68a9fefca870fed897de7c655f9d5c1eaf1cd9517db96c9a3861f648b" + [[package]] name = "cadence" version = "0.29.1" @@ -896,9 +877,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -911,7 +892,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.20", "serde", "serde_json", ] @@ -943,9 +924,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -975,9 +956,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -985,9 +966,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1004,7 +985,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -1028,15 +1009,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.15.7" @@ -1076,9 +1048,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -1181,9 +1153,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1193,9 +1165,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1244,10 +1216,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1367,17 +1340,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum-primitive-derive" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e" -dependencies = [ - "num-traits", - "quote", - "syn 1.0.109", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1386,25 +1348,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "error-chain" version = "0.12.4" @@ -1434,18 +1385,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -1473,9 +1415,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1520,7 +1462,7 @@ dependencies = [ "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -1571,21 +1513,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" -[[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-macro" version = "0.3.28" @@ -1594,7 +1521,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -1634,11 +1561,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64", "dirs-next", "hyper", "hyper-rustls", - "ring", + "ring 0.16.20", "rustls", "rustls-pemfile", "serde", @@ -1727,9 +1654,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1739,9 +1666,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1851,7 +1778,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1889,16 +1816,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1955,12 +1882,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1974,9 +1901,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1997,24 +1924,13 @@ 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", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -2022,9 +1938,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" @@ -2045,7 +1961,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2055,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -2096,9 +2012,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2135,13 +2051,13 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" dependencies = [ - "base64 0.21.4", + "base64", "pem", - "ring", + "ring 0.17.5", "serde", "serde_json", "simple_asn1", @@ -2240,9 +2156,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2262,21 +2178,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2329,9 +2239,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-owned" @@ -2341,18 +2251,19 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -2390,9 +2301,9 @@ dependencies = [ [[package]] name = "minidump" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae58b2a19e3bac45c7fbf0dcd674534664a00c84ca103d6561b1bf678bd4c4ef" +checksum = "e20da5c0aab8b6d683d8a15ca70db468d3f6ddfe38269837c22c7bab7ba2627c" dependencies = [ "debugid", "encoding_rs", @@ -2409,13 +2320,13 @@ dependencies = [ [[package]] name = "minidump-common" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9114b15d86ee5e5c3e3b4d05821d17237adbf98c11dd07fc8f5a9b037a010ee5" +checksum = "6b23ab3a13de24f89fa3060579288f142ac4d138d37eec8a398ba59b0ca4d577" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "debugid", - "enum-primitive-derive", + "num-derive", "num-traits", "range-map", "scroll", @@ -2424,9 +2335,9 @@ dependencies = [ [[package]] name = "minidump-processor" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ebfa889f81c8bd7e93b8754592ada37384dd2335f4fde46333ecc8d50769dcc" +checksum = "e402963e1997711e1cc491a35fc2c4a4822d4eb95d939e0401c72cb9faacb19f" dependencies = [ "async-trait", "breakpad-symbols", @@ -2446,9 +2357,9 @@ dependencies = [ [[package]] name = "minidump-unwind" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7133c7cae61b2e7166cf386d6d17a8b4b33888871273b5cdfbed667b03539bd" +checksum = "8bfe80a00f234a23ae2e42336e0b7e40d6b1c330712777bb7e2c7bebb6c3bf80" dependencies = [ "async-trait", "breakpad-symbols", @@ -2508,12 +2419,12 @@ dependencies = [ [[package]] name = "moka" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" +checksum = "d8017ec3548ffe7d4cef7ac0e12b044c01164a74c0f3119420faeaf13490ad8b" dependencies = [ - "async-io", "async-lock", + "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", @@ -2522,7 +2433,6 @@ dependencies = [ "parking_lot 0.12.1", "quanta", "rustc_version 0.4.0", - "scheduled-thread-pool", "skeptic", "smallvec", "tagptr", @@ -2636,6 +2546,17 @@ dependencies = [ "serde", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2648,9 +2569,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2695,7 +2616,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -2712,7 +2633,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2762,12 +2683,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - [[package]] name = "parking_lot" version = "0.11.2" @@ -2786,7 +2701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -2805,13 +2720,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2849,11 +2764,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.13.1", + "base64", + "serde", ] [[package]] @@ -2864,9 +2780,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ "memchr", "thiserror", @@ -2875,9 +2791,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" dependencies = [ "pest", "pest_generator", @@ -2885,22 +2801,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" dependencies = [ "once_cell", "pest", @@ -2943,7 +2859,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2978,24 +2894,14 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] -name = "polling" -version = "2.8.0" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -3016,7 +2922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -3035,16 +2941,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "process-event" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -3166,9 +3072,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3176,14 +3082,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3204,6 +3108,15 @@ 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_users" version = "0.4.3" @@ -3217,14 +3130,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3238,13 +3151,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3255,9 +3168,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -3265,7 +3178,7 @@ version = "0.11.18" source = "git+https://github.com/getsentry/reqwest?branch=restricted-connector#04ea4c720aca814c3f1de500b3e6fe3b0feeae4c" dependencies = [ "async-compression", - "base64 0.21.4", + "base64", "bytes", "encoding_rs", "futures-core", @@ -3320,11 +3233,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3352,33 +3279,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" 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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -3389,7 +3302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -3412,17 +3325,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64", ] [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3455,15 +3368,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot 0.12.1", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -3493,7 +3397,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -3502,8 +3406,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3540,9 +3444,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -3690,22 +3594,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -3756,7 +3660,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -3776,9 +3680,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", @@ -3787,9 +3691,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3798,9 +3702,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", ] @@ -3833,9 +3737,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple_asn1" @@ -3881,19 +3785,19 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smart-default" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -3909,9 +3813,9 @@ dependencies = [ [[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", @@ -3919,9 +3823,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4016,7 +3920,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -4077,7 +3981,7 @@ version = "0.106.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebf4d6804b1da4146c4c0359d129e3dd43568d321f69d7953d9abbca4ded76ba" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "is-macro", "num-bigint", "scoped-tls", @@ -4130,7 +4034,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -4142,7 +4046,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -4166,14 +4070,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "symbolic" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b5247a96aeefec188691938459892bffd23f1c3e9900dc08ac5248fe3bf08e" +checksum = "2a912286ceb858457147868b59790ba9296ae3b178b01de8d628da71c2ddb800" dependencies = [ "symbolic-cfi", "symbolic-common", @@ -4187,9 +4091,9 @@ dependencies = [ [[package]] name = "symbolic-cfi" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d3f3ef8f19bfb21ba96eb86505e8afb4e3d2226422fad44c0e40162fe435a4" +checksum = "4cdfebccc9e4b18af8203440bdffacba82975b07c7736568e89b05ab703330e2" dependencies = [ "symbolic-common", "symbolic-debuginfo", @@ -4198,9 +4102,9 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0e9bc48b3852f36a84f8d0da275d50cb3c2b88b59b9ec35fdd8b7fa239e37d" +checksum = "fac08504d60cf5bdffeb8a6a028f1a4868a5da1098bb19eb46239440039163fb" dependencies = [ "debugid", "memmap2", @@ -4211,9 +4115,9 @@ dependencies = [ [[package]] name = "symbolic-debuginfo" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef9a1b95a8ea7b5afb550da0d93ecc706de3ce869a9674fc3bc51fadc019feb" +checksum = "7f197ae562da1dec76244875041cbd244e517bf6bc88a9537ae874c555b019c7" dependencies = [ "debugid", "dmsort", @@ -4243,9 +4147,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691e53bdc0702aba3a5abc2cffff89346fcbd4050748883c7e2f714b33a69045" +checksum = "8b212728d4f6c527c1d50d6169e715f6e02d849811843c13e366d8ca6d0cf5c4" dependencies = [ "cc", "cpp_demangle", @@ -4256,11 +4160,11 @@ dependencies = [ [[package]] name = "symbolic-il2cpp" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaaade4f5b4815046bc327fe7c56f255c18f57de222efaa8212b554319e7303" +checksum = "ed26a4b1f8891a17ce1962d2c38093431dce2741078f5e7d7efcd13741ca2ff6" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde_json", "symbolic-common", "symbolic-debuginfo", @@ -4268,9 +4172,9 @@ dependencies = [ [[package]] name = "symbolic-ppdb" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95399a30236ac95fd9ce69a008b8a18e58859e9780a13bcb16fda545802f876" +checksum = "13d6a54ddbea124f82a17564effd044078054f8bab037eb9fcdfee776d5bfbde" dependencies = [ "flate2", "indexmap 1.9.3", @@ -4284,9 +4188,9 @@ dependencies = [ [[package]] name = "symbolic-sourcemapcache" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01364d2f47e67743d871b6b5fd289d47407f39820ee9523b6eb387aa06810346" +checksum = "abf09a8b5eccc4a89664a1cdc1951a36b3ad6bc8d447c801aa9bf2b903d63cba" dependencies = [ "itertools", "js-source-scopes", @@ -4299,11 +4203,11 @@ dependencies = [ [[package]] name = "symbolic-symcache" -version = "12.4.0" +version = "12.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4339f37007c0fd6d6dddaf6f04619a4a5d6308e71eabbd45c30e0af124014259" +checksum = "ea05762ece95fa2bd2b06b389e953fdf7392cf8cbab06314892df71f54815bc6" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "symbolic-common", "symbolic-debuginfo", "symbolic-il2cpp", @@ -4314,7 +4218,7 @@ dependencies = [ [[package]] name = "symbolicator" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "axum", @@ -4331,6 +4235,8 @@ dependencies = [ "serde_json", "symbolic", "symbolicator-crash", + "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-sources", "symbolicator-test", @@ -4350,27 +4256,80 @@ dependencies = [ [[package]] name = "symbolicator-crash" -version = "23.9.1" +version = "23.11.0" dependencies = [ "bindgen", "cmake", ] [[package]] -name = "symbolicator-service" -version = "23.9.1" +name = "symbolicator-js" +version = "23.11.0" +dependencies = [ + "data-url", + "futures", + "humantime", + "insta", + "moka", + "once_cell", + "regex", + "reqwest", + "sentry", + "serde", + "serde_json", + "sha2", + "symbolic", + "symbolicator-service", + "symbolicator-sources", + "symbolicator-test", + "tempfile", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "symbolicator-native" +version = "23.11.0" dependencies = [ "anyhow", "apple-crash-report-parser", "async-trait", + "chrono", + "futures", + "insta", + "minidump", + "minidump-processor", + "minidump-unwind", + "moka", + "once_cell", + "regex", + "sentry", + "serde", + "serde_json", + "symbolic", + "symbolicator-service", + "symbolicator-sources", + "symbolicator-test", + "tempfile", + "test-assembler", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "symbolicator-service" +version = "23.11.0" +dependencies = [ + "anyhow", "aws-config", "aws-credential-types", "aws-sdk-s3", "aws-types", - "backtrace", "cadence", "chrono", - "data-url", "filetime", "flate2", "futures", @@ -4378,18 +4337,11 @@ dependencies = [ "humantime", "humantime-serde", "idna 0.4.0", - "insta", "ipnetwork", "jsonwebtoken", - "lazy_static", - "minidump", - "minidump-processor", - "minidump-unwind", "moka", "once_cell", - "parking_lot 0.12.1", "rand", - "regex", "reqwest", "sentry", "serde", @@ -4397,12 +4349,10 @@ dependencies = [ "serde_yaml", "sha-1", "sha2", - "sourcemap", "symbolic", "symbolicator-sources", "symbolicator-test", "tempfile", - "test-assembler", "thiserror", "tokio", "tokio-util", @@ -4415,13 +4365,13 @@ dependencies = [ [[package]] name = "symbolicator-sources" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "aws-types", "glob", "insta", - "lazy_static", + "once_cell", "serde", "serde_yaml", "symbolic", @@ -4430,7 +4380,7 @@ dependencies = [ [[package]] name = "symbolicator-stress" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "axum", @@ -4441,6 +4391,8 @@ dependencies = [ "serde", "serde_json", "serde_yaml", + "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-test", "tempfile", @@ -4450,7 +4402,7 @@ dependencies = [ [[package]] name = "symbolicator-test" -version = "23.9.1" +version = "23.11.0" dependencies = [ "axum", "humantime", @@ -4468,7 +4420,7 @@ dependencies = [ [[package]] name = "symbolicli" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -4479,6 +4431,8 @@ dependencies = [ "serde_json", "serde_yaml", "symbolic", + "symbolicator-js", + "symbolicator-native", "symbolicator-service", "symbolicator-sources", "tempfile", @@ -4491,13 +4445,13 @@ dependencies = [ [[package]] name = "symsorter" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "chrono", "clap", "console", - "lazy_static", + "once_cell", "rayon", "regex", "serde", @@ -4521,9 +4475,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4561,9 +4515,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand", "redox_syscall 0.3.5", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -4589,22 +4543,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -4619,14 +4573,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -4634,15 +4589,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -4664,9 +4619,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -4674,7 +4629,7 @@ dependencies = [ "mio 0.8.8", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -4687,14 +4642,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "tokio-metrics" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b2fc67d5dec41db679b9b052eb572269616926040b7831e32c8a152df77b84" +checksum = "eace09241d62c98b7eeb1107d4c5c64ca3bd7da92e8c218c153ab3a78f9be112" dependencies = [ "futures-util", "pin-project-lite", @@ -4735,9 +4690,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -4749,9 +4704,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", @@ -4770,11 +4725,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -4803,7 +4758,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -4836,11 +4791,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", @@ -4849,20 +4803,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -4990,9 +4944,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5047,9 +5001,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5070,12 +5024,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "ureq" -version = "2.7.1" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64", "log", "native-tls", "once_cell", @@ -5108,9 +5068,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -5140,12 +5100,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.4.0" @@ -5192,7 +5146,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5226,7 +5180,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5239,7 +5193,7 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-split" -version = "23.9.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -5326,7 +5280,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.13", + "rustix", ] [[package]] @@ -5353,9 +5307,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", ] @@ -5367,10 +5321,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -5509,9 +5463,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -5528,9 +5482,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yaml-rust" @@ -5587,30 +5541,28 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix index 15114ccff2..9a11cb5e5a 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "23.9.1"; + version = "23.11.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-QsU9hxBF7Te3vO6in/nWn6hYbovI1jOWYXB6PcqWGTA="; + hash = "sha256-eXMMk12ZxRs5k3DaRhGADwLbE62L8e4N3R5Rw8kZMKI="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncrclone/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncrclone/package.nix new file mode 100644 index 0000000000..b4a24b5746 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncrclone/package.nix @@ -0,0 +1,31 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "syncrclone"; + version = "unstable-2023-03-23"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "jwink3101"; + repo = "syncrclone"; + rev = "137c9c4cc737a383b23cd9a5a21bb079e6a8fc59"; + hash = "sha256-v81hPeu5qnMG6Sb95D88jy5x/GO781bf7efCYjbOaxs="; + }; + + pythonImportsCheck = [ + "syncrclone" + ]; + + meta = with lib; { + description = "Bidirectional sync tool for rclone"; + homepage = "https://github.com/Jwink3101/syncrclone"; + changelog = "https://github.com/Jwink3101/syncrclone/blob/${src.rev}/docs/changelog.md"; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.mit; + maintainers = with maintainers; [ prominentretail ]; + mainProgram = "syncrclone"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sy/synthesia/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/synthesia/package.nix new file mode 100644 index 0000000000..44c48bb59b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/synthesia/package.nix @@ -0,0 +1,76 @@ +{ lib +, fetchurl +, stdenvNoCC +, runtimeShell +, copyDesktopItems +, makeDesktopItem +, wineWowPackages +}: + +let + icon = fetchurl { + name = "synthesia.png"; + url = "https://cdn.synthesia.app/images/headerIcon.png"; + hash = "sha256-M9cQqHwwjko5pchdNtIMjYwd4joIvBphAYnpw73qYzM="; + }; +in +stdenvNoCC.mkDerivation rec { + pname = "synthesia"; + version = "10.9"; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Synthesia"; + comment = meta.description; + exec = pname; + icon = pname; + categories = [ "Game" "Audio" ]; + startupWMClass = "synthesia.exe"; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + wineWowPackages.stable + ]; + + src = fetchurl { + url = "https://cdn.synthesia.app/files/Synthesia-${version}-installer.exe"; + hash = "sha256-BFTsbesfMqxY1731ss6S0w8BcUaoqjVrr62VeU1BfrU="; + }; + + dontUnpack = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cat <<'EOF' > $out/bin/${pname} + #!${runtimeShell} + export PATH=${wineWowPackages.stable}/bin:$PATH + export WINEARCH=win64 + export WINEPREFIX="''${SYNTHESIA_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/${pname}"}/wine" + export WINEDLLOVERRIDES="mscoree=" # disable mono + if [ ! -d "$WINEPREFIX" ] ; then + mkdir -p "$WINEPREFIX" + wine ${src} /S + fi + wine "$WINEPREFIX/drive_c/Program Files (x86)/Synthesia/Synthesia.exe" + EOF + chmod +x $out/bin/${pname} + install -Dm644 ${icon} $out/share/icons/hicolor/48x48/apps/${pname}.png + runHook postInstall + ''; + + meta = with lib; { + description = "A fun way to learn how to play the piano"; + homepage = "https://synthesiagame.com/"; + downloadPage = "https://synthesiagame.com/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ ners ]; + platforms = wineWowPackages.stable.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix new file mode 100644 index 0000000000..5da79686b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sy/systemctl-tui/package.nix @@ -0,0 +1,30 @@ +{ lib +, rustPlatform +, fetchCrate +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "systemctl-tui"; + version = "0.2.2"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-q/LzehMspiqxQOgALh1smhmL1803xr4GzIw9t+jE6NM="; + }; + + cargoHash = "sha256-GNuWag8Y1aSkBMzXcHpwfVU80zmhusLIOrKtZSe/jI0="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; + + meta = with lib; { + description = "A simple TUI for interacting with systemd services and their logs"; + homepage = "https://crates.io/crates/systemctl-tui"; + license = licenses.mit; + maintainers = with maintainers; [ siph ]; + mainProgram = "systemctl-tui"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix new file mode 100644 index 0000000000..5274a1c11f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, python3 +, darwin +, libsecret +, pkg-config +}: + +let + version = "0.0.14"; +in +buildNpmPackage { + pname = "tailwindcss-language-server"; + inherit version; + + src = fetchFromGitHub { + owner = "tailwindlabs"; + repo = "tailwindcss-intellisense"; + rev = "@tailwindcss/language-server@v${version}"; + hash = "sha256-EE1Gd0cmcJmyleoXVNtMJ8IKYpQIzRf2F42HOORHbwo="; + }; + + makeCacheWritable = true; + npmDepsHash = "sha256-gQgGIo/cS0P1B5lSmNpd8WOgucf3RbRk1YOvMXNbxb0="; + npmWorkspace = "packages/tailwindcss-language-server"; + + buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); + + nativeBuildInputs = [ python3 pkg-config ]; + + meta = with lib; { + description = "Intelligent Tailwind CSS tooling for Visual Studio Code"; + homepage = "https://github.com/tailwindlabs/tailwindcss-intellisense"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada]; + mainProgram = "tailwindcss-language-server"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ta/taschenrechner/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/taschenrechner/package.nix new file mode 100644 index 0000000000..eeb2b841ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ta/taschenrechner/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitLab +}: + +rustPlatform.buildRustPackage rec { + pname = "taschenrechner"; + version = "1.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.fem-net.de"; + owner = "mabl"; + repo = "taschenrechner"; + rev = version; + hash = "sha256-PF9VCdlgA4c4Qw8Ih3JT29/r2e7i162lVAbW1QSOlWo="; + }; + + cargoHash = "sha256-SFgStvpcqEwus1JBs5ZyMHO1UD0oWV7mvS6o4v5gIFc="; + + meta = with lib; { + description = "A cli-calculator written in Rust"; + homepage = "https://gitlab.fem-net.de/mabl/taschenrechner"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ netali ]; + mainProgram = "taschenrechner"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/tecoc/default.nix b/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/applications/editors/tecoc/default.nix rename to third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix index 94889a13ef..a5531b3aa8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tecoc/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/tecoc/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecoc"; - version = "unstable-2023-04-21"; + version = "unstable-2023-06-21"; src = fetchFromGitHub { owner = "blakemcbride"; repo = "TECOC"; - rev = "021d1d15242b9d6c84d70c9ffcf1871793898f0a"; - hash = "sha256-VGIO+uiAZkdzLYmJztmnKTS4HDIVow4AimaneHj7E1M="; + rev = "b4a96395a18c7e64ccaef0e25fdde3b7ef33ac4b"; + hash = "sha256-KTOGsTtxJh2sneU2VoDNUHcL3m8zt+3rBZTDvK1n02A="; }; buildInputs = [ ncurses ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { TECOC is a portable C implementation of TECO-11. ''; license = { - url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; + url = "https://github.com/blakemcbride/TECOC/blob/${finalAttrs.src.rev}/doc/readme-1st.txt"; }; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix new file mode 100644 index 0000000000..de64c81093 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -0,0 +1,61 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, go +, testers +, terraform-plugin-docs +, nix-update-script +}: + +buildGoModule rec { + pname = "terraform-plugin-docs"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform-plugin-docs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5vbi69GMgkzvN3aEQbNTbk99rg+kfvAvUrdDsuyIm9s="; + }; + + vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0="; + + nativeBuildInputs = [ makeWrapper ]; + + subPackages = [ + "cmd/tfplugindocs" + ]; + + allowGoReference = true; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + postInstall = '' + wrapProgram $out/bin/tfplugindocs --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + passthru = { + tests.version = testers.testVersion { + command = "tfplugindocs --version"; + package = terraform-plugin-docs; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Generate and validate Terraform plugin/provider documentation"; + homepage = "https://github.com/hashicorp/terraform-plugin-docs"; + changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}"; + license = licenses.mpl20; + mainProgram = "tfplugindocs"; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix b/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix new file mode 100644 index 0000000000..21b75c31a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/te/textsnatcher/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, wrapGAppsHook +, pkg-config +, pantheon +, libhandy +, libportal +, glib +, gtk3 +, desktop-file-utils +, scrot +, tesseract +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "textsnatcher"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "RajSolai"; + repo = "TextSnatcher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-phqtPjwKB5BoCpL+cMeHvRLL76ZxQ5T74cpAsgN+/JM="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + pantheon.granite + libhandy + libportal + gtk3 + glib + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ scrot tesseract ]} + ) + ''; + + meta = with lib; { + description = "Copy Text from Images with ease, Perform OCR operations in seconds"; + homepage = "https://textsnatcher.rf.gd/"; + changelog = "https://github.com/RajSolai/TextSnatcher/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ galaxy ]; + mainProgram = "com.github.rajsolai.textsnatcher"; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/th/thud/package.nix b/third_party/nixpkgs/pkgs/by-name/th/thud/package.nix index f007174df8..5a4d3f68b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/th/thud/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/th/thud/package.nix @@ -2,20 +2,21 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "thud"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "donovanglover"; repo = "thud"; rev = version; - hash = "sha256-3MxmVKs0huXPnL9mqDniaIarkAvJmwSOMii2ntXtOos="; + hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I="; }; - cargoHash = "sha256-Hk3HlcA253FAA9hw5p9W+Mvec84zLo7bEmM2/BbmjiM="; + cargoHash = "sha256-rmVVdes7GuGV+ClqJGxNIrs7oSwe8/ZHFD6OfP/UW7A="; nativeBuildInputs = [ installShellFiles @@ -25,14 +26,16 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/thud.thumbnailer $out/share/thumbnailers/thud.thumbnailer substituteInPlace $out/share/thumbnailers/thud.thumbnailer --replace "thud" "$out/bin/thud" - installManPage man/thud.1 + installManPage target/man/thud.1 installShellCompletion --cmd thud \ - --bash <(cat completions/thud.bash) \ - --fish <(cat completions/thud.fish) \ - --zsh <(cat completions/_thud) + --bash <(cat target/completions/thud.bash) \ + --fish <(cat target/completions/thud.fish) \ + --zsh <(cat target/completions/_thud) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Generate directory thumbnails for GTK-based file browsers from images inside them"; homepage = "https://github.com/donovanglover/thud"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilda/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tilda/package.nix similarity index 62% rename from third_party/nixpkgs/pkgs/applications/terminal-emulators/tilda/default.nix rename to third_party/nixpkgs/pkgs/by-name/ti/tilda/package.nix index 01cc4f527a..031d3225a3 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ti/tilda/package.nix @@ -1,40 +1,47 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook -, pkg-config , expat , gettext -, gtk +, gtk3 , libconfuse -, pcre2 -, vte , makeWrapper +, pcre2 +, pkg-config +, vte , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tilda"; version = "1.5.4"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; - rev = "${pname}-${version}"; - sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; + rev = "tilda-${finalAttrs.version}"; + hash = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + makeWrapper + pkg-config + ]; + buildInputs = [ gettext - gtk + gtk3 libconfuse pcre2 vte ]; - LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build + # ugly hack for xgettext to work during build + env.LD_LIBRARY_PATH = "${lib.getLib expat}/lib"; - # The config locking scheme relies on the binary being called "tilda", + # The config locking scheme relies on the binary being called "tilda" # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' mkdir $out/bin/wrapped @@ -45,12 +52,11 @@ stdenv.mkDerivation rec { passthru.tests.test = nixosTests.terminal-emulators.tilda; - meta = with lib; { - description = "A Gtk based drop down terminal for Linux and Unix"; + meta = { homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + description = "A Gtk based drop down terminal for Linux and Unix"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} - +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tinyalsa/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinyalsa/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/tinyalsa/default.nix rename to third_party/nixpkgs/pkgs/by-name/ti/tinyalsa/package.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinycompress/default.nix b/third_party/nixpkgs/pkgs/by-name/ti/tinycompress/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tinycompress/default.nix rename to third_party/nixpkgs/pkgs/by-name/ti/tinycompress/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch new file mode 100644 index 0000000000..c638727d3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/189.patch @@ -0,0 +1,71 @@ +Index: tkdiff +=================================================================== +diff --git a/tkdiff b/tkdiff +--- a/tkdiff (revision 188) ++++ b/tkdiff (revision 189) +@@ -111,7 +111,7 @@ + } + + # Determine the name of the temporary directory, the rc file name, +-# and possible VPATH EnvVar, all of which are platform dependent. ++# NULLdev, and possible VPATH EnvVar, all of which are platform dependent. + # + # Much MAY likely be overridden by a preference in .tkdiffrc, + # EXCEPT (obviously) when no such file actually exists yet +@@ -126,6 +126,9 @@ + set opts(tmpdir) C:/temp + } + ++ # Reserved filename which is actually a NULL device ++ set opts(NULLdev) "nul" ++ + # Split up and store a VPATH if it exists + if {[info exists ::env(VPATH)]} { + set finfo(Vpath) [split $::env(VPATH) ";"] +@@ -145,6 +148,9 @@ + set opts(tmpdir) $::env(TMPDIR) + } {set opts(tmpdir) /tmp } + ++ # Reserved filename which is actually a NULL device (Unix-like platforms) ++ set opts(NULLdev) "/dev/null" ++ + # Split up and store a VPATH if it exists + if {[info exists ::env(VPATH)]} { + set finfo(Vpath) [split $::env(VPATH) ":"] +@@ -2106,7 +2112,7 @@ + # 1 Failed (PLUS a 'pushed' HARD-error message to the caller) + ############################################################################### + proc get-file {fn ndx {probe 0}} { +- global g finfo ++ global g opts finfo + + # Ancestor files are stored into a slightly adjusted array element name + # N.B> 'ndx' AS PASSED *can* be an EXPRESSION (not just a number): resolve! +@@ -2121,7 +2127,7 @@ + } elseif {!$tildechk} { + # DO NOT REPORT non-existence if this attempt was ONLY a probe + if {$probe} { return 1 } { set MSG "File '$fn' does not exist" } +- } elseif {[file isfile $fn]} { ++ } elseif {[file isfile $fn] || $fn == $opts(NULLdev)} { + set finfo(${A}lbl,$ndx) [shortNm [set finfo(${A}pth,$ndx) "$fn"]] + } else { set MSG "'$fn' exists, but is not a file" } + +@@ -2857,7 +2863,7 @@ + # Align various label decorations to the CURRENT input file pairing + ############################################################################### + proc alignDecor {pairnum} { +- global g w finfo ++ global g w opts finfo + + # Establish if 3way mode is NOW active and what file indices are in use + set g(is3way) [info exists finfo(albl,$pairnum)] +@@ -2874,7 +2880,8 @@ + set finfo(lbl,$LR) $finfo(ulbl,$ndx($n)) ;# Override lbl display + } else {set finfo(lbl,$LR) $finfo(lbl,$ndx($n))} + +- if {![info exists finfo(tmp,$ndx($n))]} { ++ if {![info exists finfo(tmp,$ndx($n))] \ ++ && $finfo(pth,$ndx($n)) != $opts(NULLdev)} { + # (N.B> Tip data will ALSO be used by report generation heading) + set g(tooltip,${LR}Label) "{$finfo(pth,$ndx($n))\n" + append g(tooltip,${LR}Label) \ diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch new file mode 100644 index 0000000000..0fc50db302 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/194.patch @@ -0,0 +1,15 @@ +Index: tkdiff +=================================================================== +diff --git a/tkdiff b/tkdiff +--- a/tkdiff (revision 193) ++++ b/tkdiff (revision 194) +@@ -4557,7 +4557,8 @@ + } + } + } +- } ++ # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP ++ } { $w(acTxWdg) SEE @1,1 } + } + + ############################################################################### diff --git a/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix new file mode 100644 index 0000000000..b057a07e56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tk/tkdiff/package.nix @@ -0,0 +1,50 @@ +{ diffutils, fetchzip, lib, makeBinaryWrapper, stdenv, tk }: + +stdenv.mkDerivation (finalAttrs: { + pname = "tkdiff"; + version = "5.6"; + + src = fetchzip { + url = "mirror://sourceforge/tkdiff/tkdiff-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}.zip"; + hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk="; + }; + + patches = [ + # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file" + # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk + ./189.patch + + # fix regression: trigger redraw when inline recursive diff requested + # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \ + # sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d' + ./194.patch + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin tkdiff + wrapProgram $out/bin/tkdiff \ + --prefix PATH : ${lib.makeBinPath [ diffutils tk ]} + + runHook postInstall + ''; + + meta = { + description = "A graphical front end to the diff program"; + homepage = "https://tkdiff.sourceforge.io/"; + license = lib.licenses.gpl2Plus; + longDescription = '' + TkDiff is a graphical front end to the diff program. It provides a + side-by-side view of the differences between two text files, along + with several innovative features such as diff bookmarks, a graphical + map of differences for quick navigation, and a facility for slicing + diff regions to achieve exactly the merge output desired. + ''; + mainProgram = "tkdiff"; + maintainers = with lib.maintainers; [ mikaelfangel ]; + platforms = tk.meta.platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix new file mode 100644 index 0000000000..e74ea6e558 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "tlrc"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "tldr-pages"; + repo = "tlrc"; + rev = "v${version}"; + hash = "sha256-Jdie9ESSbRV07SHjITfQPwDKTedHMbY01FdEMlNOr50="; + }; + + cargoHash = "sha256-2OXyPtgdRGIIc7jIES9zhRpFiaodcEnaK88k+rUVSJo="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage tldr.1 + + installShellCompletion \ + --name tldr --bash $releaseDir/build/tlrc-*/out/tldr.bash \ + --zsh $releaseDir/build/tlrc-*/out/_tldr \ + --fish $releaseDir/build/tlrc-*/out/tldr.fish + ''; + + meta = with lib; { + description = "Official tldr client written in Rust"; + homepage = "https://github.com/tldr-pages/tlrc"; + changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "tldr"; + maintainers = with maintainers; [ acuteenvy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff b/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff new file mode 100644 index 0000000000..8248bdb8bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tp/tplay/cargo.diff @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0eb70e4..8d81ba0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2069,7 +2069,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + + [[package]] + name = "tplay" +-version = "0.4.4" ++version = "0.4.5" + dependencies = [ + "clap", + "crossbeam-channel", diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix new file mode 100644 index 0000000000..619192ddf5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tp/tplay/package.nix @@ -0,0 +1,51 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, clang +, ffmpeg +, openssl +, alsa-lib +, libclang +, opencv +}: +rustPlatform.buildRustPackage rec { + pname = "tplay"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "maxcurzi"; + repo = "tplay"; + rev = "v${version}"; + hash = "sha256-qt5I5rel88NWJZ6dYLCp063PfVmGTzkUUKgF3JkhLQk="; + }; + + cargoHash = "sha256-0kHh7Wb9Dp+t2G9/Kz/3K43bQdFCl+q2Vc3W32koc2I="; + cargoPatches = [ ./cargo.diff ]; + checkFlags = [ + # requires network access + "--skip=pipeline::image_pipeline::tests::test_process" + "--skip=pipeline::image_pipeline::tests::test_to_ascii" + "--skip=pipeline::image_pipeline::tests::test_to_ascii_ext" + "--skip=pipeline::runner::tests::test_time_to_send_next_frame" + ]; + + nativeBuildInputs = [ pkg-config clang ffmpeg ]; + buildInputs = [ + openssl.dev + alsa-lib.dev + libclang.lib + ffmpeg.dev + opencv + ]; + + env.LIBCLANG_PATH = "${libclang.lib}/lib"; + + meta = { + description = "Terminal Media Player"; + homepage = "https://github.com/maxcurzi/tplay"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ demine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tp/tpm2-totp/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-totp/package.nix new file mode 100644 index 0000000000..766c6e138a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tp/tpm2-totp/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, tpm2-tss +, autoreconfHook +, autoconf-archive +, pkg-config +, qrencode +}: + +stdenv.mkDerivation rec { + pname = "tpm2-totp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = "tpm2-totp"; + rev = "v${version}"; + hash = "sha256-aeWhI2GQcWa0xAqlmHfcbCMg78UqcD6eanLlEVNVnRM="; + }; + + preConfigure = '' + echo '0.3.0' > VERSION + ''; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = [ + tpm2-tss + qrencode + ]; + + meta = with lib; { + description = "Attest the trustworthiness of a device against a human using time-based one-time passwords"; + homepage = "https://github.com/tpm2-software/tpm2-totp"; + changelog = "https://github.com/tpm2-software/tpm2-totp/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + mainProgram = "tpm2-totp"; + platforms = platforms.all; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix new file mode 100644 index 0000000000..9c0086dfff --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/package.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, squashfsTools +, makeBinaryWrapper +, alsa-lib +, atk +, at-spi2-atk +, cups +, gtk3 +, libdrm +, libsecret +, libxkbcommon +, mesa +, pango +, sqlite +, systemd +, wayland +, xorg +}: + +stdenv.mkDerivation rec { + pname = "tradingview"; + version = "2.6.1"; + revision = "44"; + src = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${revision}.snap"; + hash = "sha512-Hd00TWjPskd0QDzpOSwQCuMw20nW4n1xxRkT1rA95pzbXtw7XFxrJdMWkzWDbucuokU2qR2b5tovAHAgw9E0tQ=="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeBinaryWrapper + squashfsTools + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + atk + at-spi2-atk + cups + gtk3 + libdrm + libsecret + libxkbcommon + mesa + pango + sqlite + systemd + wayland + xorg.libxcb + xorg.libX11 + xorg.libXext + ]; + + unpackPhase = '' + runHook preUnpack + unsquashfs $src + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r squashfs-root $out/share/tradingview + rm -rf $out/share/tradingview/meta + + install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications + substituteInPlace $out/share/applications/tradingview.desktop --replace \$\{SNAP}/meta/gui/icon.png tradingview + + mkdir $out/share/icons + cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png + + mkdir $out/bin + makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath buildInputs } + + runHook postInstall + ''; + + meta = with lib; { + description = "Charting platform for traders and investors"; + homepage = "https://www.tradingview.com/desktop/"; + changelog = "https://www.tradingview.com/support/solutions/43000673888/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ prominentretail ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "tradingview"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tradingview/update.sh b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/update.sh new file mode 100644 index 0000000000..863521bfde --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/tradingview/update.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq git gnused gnugrep + +# +# Get latest version of TradingView from Snapcraft. +# + +snap_info=($( + curl -s -H 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/tradingview' \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' +)) + +# "revision" is the actual version identifier; "version" is for human consumption. +revision="${snap_info[0]}" +sha512="${snap_info[1]}" +sri=$(nix hash to-sri --type "sha512" $sha512) +upstream_version="${snap_info[2]}" +last_updated="${snap_info[3]}" + +echo "Latest release is $upstream_version from $last_updated." + +# +# Read the current TradingView version. +# + +nixpkgs="$(git rev-parse --show-toplevel)" +tradingview_nix="$nixpkgs/pkgs/applications/finance/tradingview/default.nix" +current_nix_version=$( + grep 'version\s*=' "$tradingview_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' +) + +echo "Current nix version: $current_nix_version" + +if [[ "$current_nix_version" = "$upstream_version" ]]; then + echo "TradingView is already up-to-date" + exit 0 +fi + +# +# Find and replace. +# + +echo "Updating from ${current_nix_version} to ${upstream_version}, released ${last_updated}" + +sed --regexp-extended \ + -e 's/revision\s*=\s*"[0-9]+"\s*;/revision = "'"${revision}"'";/' \ + -e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${sri}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ + -i "$tradingview_nix" + +# +# Attempt a build. +# + +export NIXPKGS_ALLOW_UNFREE=1 + +if ! nix-build -A tradingview "$nixpkgs"; then + echo "The updated TradingView failed to build." + exit 1 +fi + +# +# Commit changes. +# +git add "$tradingview_nix" +git commit -m "tradingview: ${current_nix_version} -> ${upstream_version}" + diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix index 1a9d5569f2..c8fc25f206 100644 --- a/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.28.12"; + version = "2.30.7"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-uWCpCjYFtK2pNeHHZWhWI6YZ+cllQpkKz//nHracl5s="; + hash = "sha256-W0hcIeWbgORWBYuNbVJRA8NNnuBEG8HMLeVBxXtd2VQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix new file mode 100644 index 0000000000..6c8b7055fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config +, openssl, libiconv, CoreServices, Security }: + +rustPlatform.buildRustPackage rec { + pname = "trunk-ng"; + version = "0.17.10"; + + src = fetchFromGitHub { + owner = "ctron"; + repo = "trunk"; + rev = "v${version}"; + hash = "sha256-F2g/GMxnS5r44i3NIJGOic9f+H5+JbFi3dqMqI6h6JQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = if stdenv.isDarwin + then [ libiconv CoreServices Security ] + else [ openssl ]; + + # requires network + checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; + + cargoHash = "sha256-37nCqRTgbsg2cXu4xwYC/qfodPIxx97Qns8FQe9NroQ="; + + meta = with lib; { + homepage = "https://github.com/ctron/trunk"; + description = "Build, bundle & ship your Rust WASM application to the web"; + maintainers = with maintainers; [ ctron ]; + license = with licenses; [ asl20 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tusc-sh/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tusc-sh/package.nix new file mode 100644 index 0000000000..f5b1ce36e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/tu/tusc-sh/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeShellApplication +, curl +, coreutils +, jq +}: + +let + tusc = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tusc-sh"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "adhocore"; + repo = "tusc.sh"; + rev = finalAttrs.version; + hash = "sha256-EKlcE+rsVh5lUd8dQzAwXDjiUvrrud5yWfF6JWSZQFE="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 tusc.sh -t $out/bin + + runHook postInstall + ''; + +}); +in +writeShellApplication { + name = "tusc"; + runtimeInputs = [ tusc curl coreutils jq ]; + text = '' + tusc.sh "$@" + ''; + meta = with lib; { + description = "Tus 1.0.0 client protocol implementation for bash"; + homepage = "https://github.com/adhocore/tusc.sh"; + changelog = "https://github.com/adhocore/tusc.sh/blob/${tusc.version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "tusc"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuxmux/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxmux/package.nix index 9714c63696..b5c7eaf0c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/tuxmux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/tuxmux/package.nix @@ -2,26 +2,25 @@ , stdenv , fetchFromGitHub , rustPlatform -, openssl +, libiconv , pkg-config , installShellFiles -, darwin }: rustPlatform.buildRustPackage rec { pname = "tuxmux"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "edeneast"; repo = pname; rev = "v${version}"; - hash = "sha256-QySDC/aEU9Fo0UbRUNvgBQLfESYzENGfS8Tl/ycn1YY="; + hash = "sha256-BZ1Vo1NIpzUBGyvd/UbxLaFbrLzoaP8kn/8GoAYBmlo="; }; - cargoHash = "sha256-MlLTaN+KMeF0A1hh0oujLYWqjwrbmoNzoRoXjeCUf7I="; + cargoHash = "sha256-HIYQPHLMhQtpCIkl5EzjJGHXzBtw7mY85l5bqapw3rg="; - buildInputs = [ openssl ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]); + buildInputs = [ libiconv ]; nativeBuildInputs = [ pkg-config installShellFiles ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/text/txr/default.nix b/third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/text/txr/default.nix rename to third_party/nixpkgs/pkgs/by-name/tx/txr/package.nix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc-ng/default.nix b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/os-specific/linux/uclibc-ng/default.nix rename to third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix index 43c9bbfa8f..b1d4a6474e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/uc/uclibc-ng/package.nix @@ -56,12 +56,12 @@ let UCLIBC_HAS_FPU n ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; version = "1.0.44"; src = fetchurl { - url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; + url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; sha256 = "sha256-ffnZh5VYJzgvHCQA2lE0Vr7Ltvhovf03c3Jl8cvuyZQ="; }; @@ -108,7 +108,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + # Derivations may check for the existance of this attribute, to know what to + # link to. + libiconv = libiconvReal; + }; + + meta = { homepage = "https://uclibc-ng.org"; description = "Embedded C library"; longDescription = '' @@ -126,16 +132,9 @@ stdenv.mkDerivation rec { processors. Alpha, FR-V, HPPA, IA64, LM32, NIOS2, Tile and Sparc64 are experimental and need more testing. ''; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ rasendubi AndersonTorres ]; - platforms = platforms.linux; - badPlatforms = platforms.aarch64; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ rasendubi AndersonTorres ]; + platforms = lib.platforms.linux; + badPlatforms = lib.platforms.aarch64; }; - - passthru = { - # Derivations may check for the existance of this attribute, to know what to - # link to. - libiconv = libiconvReal; - }; - -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic-nf/package.nix b/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic-nf/package.nix new file mode 100644 index 0000000000..5a993276ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic-nf/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "udev-gothic-nf"; + version = "1.3.1"; + + src = fetchzip { + url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_NF_v${version}.zip"; + hash = "sha256-4392vZX5CWg+tEpti1N+WQSx4ES5ZXoSiow6ufxqmsY="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 *.ttf -t $out/share/fonts/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "A programming font that combines BIZ UD Gothic, JetBrains Mono and nerd-fonts"; + homepage = "https://github.com/yuru7/udev-gothic"; + license = licenses.ofl; + maintainers = with maintainers; [ haruki7049 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic/package.nix new file mode 100644 index 0000000000..ef50de5d60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ud/udev-gothic/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "udev-gothic"; + version = "1.3.1"; + + src = fetchzip { + url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_v${version}.zip"; + hash = "sha256-W1ekR3fWuS/ks1reCBAvZ5lR+aGh9qfaxn80Q2KlRM0="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 *.ttf -t $out/share/fonts/${pname} + runHook postInstall + ''; + + meta = with lib; { + description = "A programming font that combines BIZ UD Gothic and JetBrains Mono"; + homepage = "https://github.com/yuru7/udev-gothic"; + license = licenses.ofl; + maintainers = with maintainers; [ haruki7049 ]; + platforms = platforms.all; + }; +} 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 e4c8fb1c04..1a6f813254 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.0.17"; + version = "0.2.0"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; - rev = "refs/tags/${version}"; - hash = "sha256-vZo3JKvvlL//4P+EqcsDXyamAMnCBARSF/H6OJTayF4="; + rev = version; + hash = "sha256-RAMQC9weEvTV44nAXjwMYv+4O5aSNNM5UOf/xBb4SBE="; }; - cargoHash = "sha256-AkBcvFz7mrYUNTokcfoSXwWpw7SupI0+52GL4QXUu24="; + cargoHash = "sha256-ZBedAIHwbRiR9i6w0CWIiE+OJvTkmxiEihn7zLAV/Dg="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -41,13 +41,14 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional audioSupport "audio"; - passthru.tests.run = runCommand "uiua-test-run" {nativeBuildInputs = [uiua];} '' + passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' uiua init; diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') touch $out; ''; - meta = with lib; { + meta = { + changelog = "https://github.com/uiua-lang/uiua/releases/tag/${src.rev}"; description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; longDescription = '' Uiua combines the stack-oriented and array-oriented paradigms in a single @@ -55,8 +56,8 @@ rustPlatform.buildRustPackage rec { high information density and little syntactic noise. ''; homepage = "https://www.uiua.org/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "uiua"; - maintainers = with maintainers; [ cafkafk tomasajt ]; + maintainers = with lib.maintainers; [ cafkafk tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix new file mode 100644 index 0000000000..aa659df3b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix @@ -0,0 +1,23 @@ +{ lib, stdenvNoCC, uiua }: + +stdenvNoCC.mkDerivation { + pname = "uiua386"; + + inherit (uiua) src version; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/fonts/truetype ./site/Uiua386.ttf + + runHook postInstall + ''; + + meta = { + description = "A Uiua font"; + homepage = "https://uiua.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ skykanin ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/un/unsilence/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unsilence/package.nix new file mode 100644 index 0000000000..a8c9ef1d9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/un/unsilence/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, python3Packages +, ffmpeg +, +}: +python3Packages.buildPythonPackage rec { + pname = "unsilence"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "lagmoellertim"; + repo = "unsilence"; + rev = version; + sha256 = "sha256-M4Ek1JZwtr7vIg14aTa8h4otIZnPQfKNH4pZE4GpiBQ="; + }; + + nativeBuildInputs = with python3Packages; [ + rich + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + python3Packages.rich + python3Packages.setuptools # imports pkg_resources.parse_version + ]; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; + + doCheck = false; + pythonImportsCheck = [ "unsilence" ]; + + pythonRelaxDeps = [ "rich" ]; + + meta = with lib; { + homepage = "https://github.com/lagmoellertim/unsilence"; + description = "Console Interface and Library to remove silent parts of a media file"; + license = licenses.mit; + maintainers = with maintainers; [ esau79p ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix new file mode 100644 index 0000000000..05e38ca802 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildGo121Module +}: +buildGo121Module rec { + pname = "uplosi"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "edgelesssys"; + repo = pname; + rev = "v${version}"; + hash = "sha256-9hOeKnjH6r3CPQSe6fQ6PXlVPEJ9NiyXvp5N1krG2XA="; + }; + + vendorHash = "sha256-RsjUPLe8omoN+XGyNhHDxzNfZR7VVTkh/f/On1oCRqM="; + + CGO_ENABLED = "0"; + ldflags = [ "-s" "-w" "-buildid=" "-X main.version=${version}" ]; + flags = [ "-trimpath" ]; + + meta = with lib; { + description = "Upload OS images to cloud provider"; + homepage = "https://github.com/edgelesssys/uplosi"; + changelog = "https://github.com/edgelesssys/uplosi/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "uplosi"; + maintainers = with maintainers; [ katexochen malt3 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix similarity index 86% rename from third_party/nixpkgs/pkgs/applications/misc/usql/default.nix rename to third_party/nixpkgs/pkgs/by-name/us/usql/package.nix index 66a9eedeff..2faeda9b09 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/us/usql/package.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg="; + hash = "sha256-XfzCJOr0lOkimUKbOW0+qFNQMmYc0DBgi+0ItmEOjwE="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI="; + vendorHash = "sha256-sijt6YOp1pFNhaxLIOLH90Z5ODVbWFj/mp8Csx8n+ac="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) @@ -35,7 +35,7 @@ buildGoModule rec { "impala" ]; - # These tags and flags are copied from build-release.sh + # These tags and flags are copied from build.sh tags = [ "most" "sqlite_app_armor" @@ -46,7 +46,6 @@ buildGoModule rec { "sqlite_stat4" "sqlite_userauth" "sqlite_vtable" - "sqlite_icu" "no_adodb" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/uu/uuu/completion.bash b/third_party/nixpkgs/pkgs/by-name/uu/uuu/completion.bash new file mode 100644 index 0000000000..702fe98333 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/uu/uuu/completion.bash @@ -0,0 +1,4 @@ +_uuu_autocomplete() { + COMPREPLY=($(uuu $1 $2 $3)) +} +complete -o nospace -F _uuu_autocomplete uuu diff --git a/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix b/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix new file mode 100755 index 0000000000..6441c53c5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/uu/uuu/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script + +, cmake +, installShellFiles +, pkg-config + +, bzip2 +, libusb1 +, openssl +, zlib +, zstd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uuu"; + version = "1.5.141"; + + src = fetchFromGitHub { + owner = "nxp-imx"; + repo = "mfgtools"; + rev = "uuu_${finalAttrs.version}"; + hash = "sha256-N5L6k2oVXfnER7JRoX0JtzgEhb/vFMexu7hUKQhmcoE="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + cmake + installShellFiles + pkg-config + ]; + + buildInputs = [ + bzip2 + libusb1 + openssl + zlib + zstd + ]; + + postPatch = '' + # Avoid the need of calling Git during the build. + echo "uuu_${finalAttrs.version}" > .tarball-version + ''; + + postInstall = '' + installShellCompletion --bash --name uuu.bash ${./completion.bash} + + mkdir -p $out/lib/udev/rules.d + cat <($out/bin/uuu -udev) > $out/lib/udev/rules.d/70-uuu.rules + ''; + + meta = with lib; { + description = "Freescale/NXP I.MX Chip image deploy tools"; + homepage = "https://github.com/nxp-imx/mfgtools"; + license = licenses.bsd3; + maintainers = with maintainers; [ otavio ]; + mainProgram = "uuu"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix index f858733d12..251a16c8b6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2023-09-06"; + version = "unstable-2023-11-12"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "d7f96acb93742744fec32ba667a4b4438dcf90cf"; - hash = "sha256-kaYT61qDSPtpNd0M3IHxR8EzhnsB5uNH075+Xag1Vv8="; + rev = "86c46be310032bc6588bdc813fae1bc235fac60b"; + hash = "sha256-qyFIJORrjONwyasDvO3COUcE4VJAjZEa3QJDQ+rhwqY="; }; outputs = [ "out" "projects" ]; @@ -31,8 +31,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build.sh substituteInPlace build.sh \ - --replace "-L/usr/local/lib " "" \ - --replace "\$(brew --prefix)/lib/libSDL2.a " "" + --replace "-L/usr/local/lib " "" ''; buildPhase = '' @@ -65,9 +64,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; - # ofborg complains about an error trying to link inexistent SDL2 library - # For full logs, run: - # 'nix log /nix/store/bmyhh0lpifl9swvkpflqldv43vcrgci1-uxn-unstable-2023-08-10.drv'. - broken = stdenv.isDarwin; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/va/valijson/package.nix b/third_party/nixpkgs/pkgs/by-name/va/valijson/package.nix new file mode 100644 index 0000000000..777e192aee --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/va/valijson/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "valijson"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tristanpenman"; + repo = "valijson"; + rev = "v${version}"; + hash = "sha256-COVFBZtuTd1nyI/25feUYCurBwPlQV3qbxSSkn6aLl4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Header-only C++ library for JSON Schema validation, with support for many popular parsers"; + homepage = "https://github.com/tristanpenman/valijson"; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vercel-pkg/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vercel-pkg/package.nix new file mode 100644 index 0000000000..d3313069e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ve/vercel-pkg/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation rec { + pname = "pkg"; + version = "5.8.1"; + + src = fetchFromGitHub { + owner = "vercel"; + repo = "pkg"; + rev = version; + hash = "sha256-h3rHR3JE9hVcd3oiE7VL2daYXGTQo7NcOHGC6pmE/xs="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-KesP3X7LwZ7KSIxcCPXdn/sWcX9TJlwT9z/SdotS2ZQ="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline prepare + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/pkg" + cp -r . "$out/lib/node_modules/pkg" + + makeWrapper "${nodejs}/bin/node" "$out/bin/pkg" \ + --add-flags "$out/lib/node_modules/pkg/lib-es5/bin.js" + + runHook postInstall + ''; + + meta = { + description = "Package your Node.js project into an executable"; + homepage = "https://github.com/vercel/pkg"; + license = lib.licenses.mit; + mainProgram = "pkg"; + maintainers = with lib.maintainers; [ cmcdragonkai ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix new file mode 100644 index 0000000000..0094284f81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/package.nix @@ -0,0 +1,166 @@ +{ lib +, stdenv +, stdenvNoCC +, gcc13Stdenv +, fetchFromGitHub +, substituteAll +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, vencord +, electron +, pipewire +, libpulseaudio +, libicns +, jq +, moreutils +, nodePackages +}: +stdenv.mkDerivation (finalAttrs: { + pname = "vesktop"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "Vencord"; + repo = "Vesktop"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wGOyDGY0FpAVS5+MTiKrOpDyd13ng0RLGAENW5tXuR4="; + }; + + # NOTE: This requires pnpm 8.10.0 or newer + # https://github.com/pnpm/pnpm/pull/7214 + pnpmDeps = + assert lib.versionAtLeast nodePackages.pnpm.version "8.10.0"; + stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; + + nativeBuildInputs = [ + jq + moreutils + nodePackages.pnpm + ]; + + pnpmPatch = builtins.toJSON { + pnpm.supportedArchitectures = { + os = [ "linux" ]; + cpu = [ "x64" "arm64" ]; + }; + }; + + postPatch = '' + mv package.json package.json.orig + jq --raw-output ". * $pnpmPatch" package.json.orig > package.json + ''; + + # 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 + + 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 + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHash = "sha256-nNXe0vSQiQTkiRqgScKlpkpG/BJc2eIY2ueAd9sk36c="; + }; + + nativeBuildInputs = [ + copyDesktopItems + nodePackages.pnpm + nodePackages.nodejs + makeWrapper + ]; + + patches = [ + (substituteAll { inherit vencord; src = ./use_system_vencord.patch; }) + ]; + + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + preBuild = '' + export HOME=$(mktemp -d) + export STORE_PATH=$(mktemp -d) + + cp -Tr "$pnpmDeps" "$STORE_PATH" + chmod -R +w "$STORE_PATH" + + pnpm config set store-dir "$STORE_PATH" + pnpm install --offline --frozen-lockfile --ignore-script + patchShebangs node_modules/{*,.*} + ''; + + postBuild = '' + pnpm build + # using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD + ./node_modules/.bin/electron-builder \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} + ''; + + # this is consistent with other nixpkgs electron packages and upstream, as far as I am aware + # yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names + installPhase = + let + # this is mainly required for venmic + libPath = lib.makeLibraryPath [ + libpulseaudio + pipewire + gcc13Stdenv.cc.cc.lib + ]; + in + '' + runHook preInstall + + mkdir -p $out/opt/Vesktop/resources + cp dist/linux-*unpacked/resources/app.asar $out/opt/Vesktop/resources + + pushd build + ${libicns}/bin/icns2png -x icon.icns + for file in icon_*x32.png; do + file_suffix=''${file//icon_} + install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vencorddesktop.png + done + + makeWrapper ${electron}/bin/electron $out/bin/vencorddesktop \ + --prefix LD_LIBRARY_PATH : ${libPath} \ + --add-flags $out/opt/Vesktop/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "vencorddesktop"; + desktopName = "Vesktop"; + exec = "vencorddesktop %U"; + icon = "vencorddesktop"; + startupWMClass = "VencordDesktop"; + genericName = "Internet Messenger"; + keywords = [ "discord" "vencord" "electron" "chat" ]; + }) + ]; + + passthru = { + inherit (finalAttrs) pnpmDeps; + }; + + meta = with lib; { + description = "An alternate client for Discord with Vencord built-in"; + homepage = "https://github.com/Vencord/Vesktop"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "vencorddesktop"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vesktop/use_system_vencord.patch b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/use_system_vencord.patch new file mode 100644 index 0000000000..242fdcbb21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ve/vesktop/use_system_vencord.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/constants.ts b/src/main/constants.ts +index d5c5fa6..a1b32f1 100644 +--- a/src/main/constants.ts ++++ b/src/main/constants.ts +@@ -16,7 +16,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes"); + // needs to be inline require because of circular dependency + // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised + export const VENCORD_FILES_DIR = +- (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist"); ++ (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || "@vencord@"; + + export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`; + diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix b/third_party/nixpkgs/pkgs/by-name/vi/virtio-win/package.nix similarity index 97% rename from third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix rename to third_party/nixpkgs/pkgs/by-name/vi/virtio-win/package.nix index 97fecfaeda..5c1bb96b9e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/vi/virtio-win/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libarchive }: stdenv.mkDerivation rec { - pname = "win-virtio"; + pname = "virtio-win"; version = "0.1.240-1"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh b/third_party/nixpkgs/pkgs/by-name/vi/virtio-win/update.sh similarity index 88% rename from third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh rename to third_party/nixpkgs/pkgs/by-name/vi/virtio-win/update.sh index b35dd1d9fc..99a0f30fe4 100755 --- a/third_party/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/update.sh +++ b/third_party/nixpkgs/pkgs/by-name/vi/virtio-win/update.sh @@ -9,4 +9,4 @@ version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ sort -Vu | \ tail -n1)" -update-source-version win-virtio "$version" +update-source-version virtio-win "$version" diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wait4x/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wait4x/package.nix new file mode 100644 index 0000000000..9daad7d2a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/wait4x/package.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +let + pname = "wait4x"; + version = "2.13.0"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "atkrad"; + repo = pname; + rev = "v${version}"; + hash = "sha256-vhYWt1vRL1iTtdZRhk3HsBnmhcp4hieN+8vsyQS4hpo="; + }; + + vendorHash = "sha256-WY8FPRjjAFcDLMbU22pL3rFTw7fBPwCbXJDjhHDI4Kw="; + + # Tests make network access + doCheck = false; + + meta = with lib; { + description = "Wait4X allows you to wait for a port or a service to enter the requested state"; + homepage = "https://github.com/atkrad/wait4x"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + mainProgram = "wait4x"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix new file mode 100644 index 0000000000..4b78fa9b9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "warp-terminal"; + version = "0.2023.11.07.08.02.stable_00"; + + src = fetchurl { + url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg"; + hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Rust-based terminal"; + homepage = "https://www.warp.dev"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) 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 new file mode 100644 index 0000000000..253829d9ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchgit +, buildGoModule +, installShellFiles +}: + +buildGoModule { + pname = "waybar-mpris"; + version = "unstable-2022-01-27"; + + src = fetchgit { + url = "https://git.hrfee.pw/hrfee/waybar-mpris"; + rev = "485ec0ec0af80a0d63c10e94aebfc59b16aab46b"; + hash = "sha256-BjLxWnDNsR2ZnNklNiKzi1DeoPpaZsRdKbVSwNwYhJ4="; + }; + + vendorHash = "sha256-85jFSAOfNMihv710LtfETmkKRqcdRuFCHVuPkW94X/Y="; + + nativeBuildInputs = [ installShellFiles ]; + + CGO_LDFLAGS = "-s -w"; + + GOFLAGS = "-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"; + + meta = with lib; { + description = "A waybar component/utility for displaying and controlling MPRIS2 compliant media players individually"; + homepage = "https://git.hrfee.pw/hrfee/waybar-mpris"; + license = licenses.mit; + mainProgram = "waybar-mpris"; + maintainers = with maintainers; [ khaneliman ]; + }; +} + 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 b736f0c20e..edda82b7f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix @@ -10,16 +10,16 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "0.1.3"; + version = "1.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; - rev = "v${version}"; - hash = "sha256-DbXc1Q/ZIqlIMocFld3fOmUp44rU3fEzazHKSDdqMNs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-oGpiFwbPBQHF0wRHliltU8B+QmClcoFfbjpAYzOFPqs="; }; nativeBuildInputs = [ @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = licenses.asl20; - maintainers = with maintainers; [ julienmalka ]; + maintainers = with maintainers; [ julienmalka federicoschonborn ]; mainProgram = "waycheck"; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix new file mode 100644 index 0000000000..e563137c1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wa/wayidle/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +}: + +rustPlatform.buildRustPackage rec { + pname = "wayidle"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~whynothugo"; + repo = "wayidle"; + rev = "v${version}"; + hash = "sha256-6wULrwGnXLdrX/THanJThbykKjNKpGukw9dj0jX0/dM="; + }; + + cargoHash = "sha256-zF2s3XSXnN7jVtv/0axzHiIJd/cb6wMYAOQILXp1U5U="; + + meta = with lib; { + description = "Execute a program when a Wayland compositor reports being N seconds idle"; + homepage = "https://git.sr.ht/~whynothugo/wayidle"; + license = licenses.isc; + maintainers = with maintainers; [ tomfitzhenry ]; + mainProgram = "wayidle"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/third_party/nixpkgs/pkgs/by-name/wb/wb32-dfu-updater/package.nix new file mode 100644 index 0000000000..fb144b7d6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libusb1 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wb32-dfu-updater"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "WestberryTech"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "USB programmer for downloading and uploading firmware to/from USB devices."; + longDescription = '' + wb32-dfu-updater is a host tool used to download and upload firmware to/from WB32 MCU via USB. (wb32-dfu-updater_cli is the command line version). + ''; + homepage = "https://github.com/WestberryTech/wb32-dfu-updater"; + license = licenses.asl20; + maintainers = [ maintainers.liketechnik ]; + mainProgram = "wb32-dfu-updater_cli"; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/we/websecprobe/package.nix b/third_party/nixpkgs/pkgs/by-name/we/websecprobe/package.nix new file mode 100644 index 0000000000..fb81063526 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/we/websecprobe/package.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "websecprobe"; + version = "0.0.10"; + pyproject = true; + + src = fetchPypi { + pname = "WebSecProbe"; + inherit version; + hash = "sha256-QvXOyQUptMyim/bgvhihjgGs7vX0qX8MqK2ol8q9ePc="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + tabulate + ]; + + postInstall = '' + mv $out/bin/WebSecProbe $out/bin/$pname + ''; + + pythonImportsCheck = [ + "WebSecProbe" + ]; + + meta = with lib; { + description = "Web Security Assessment Tool"; + homepage = "https://github.com/spyboy-productions/WebSecProbe/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "websecprobe"; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix rename to third_party/nixpkgs/pkgs/by-name/wh/whatsapp-emoji-font/package.nix diff --git a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix new file mode 100644 index 0000000000..6baf519b8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix @@ -0,0 +1,26 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "whistle"; + version = "2.9.59"; + + src = fetchFromGitHub { + owner = "avwo"; + repo = "whistle"; + rev = "v${version}"; + hash = "sha256-2eb31qV49r8U4arj4TuA+lyi9HTBPRgmW3vR+qF6QfE="; + }; + + npmDepsHash = "sha256-HkBcizAao4uV+EDJc3z8P97ivMhbYr27hwY7x2jqEIc="; + + dontNpmBuild = true; + + meta = with lib; { + description = "HTTP, HTTP2, HTTPS, Websocket debugging proxy"; + homepage = "https://github.com/avwo/whistle"; + changelog = "https://github.com/avwo/whistle/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "whistle"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix index e22b02825b..a6b78b70b2 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/AlsaMixer-app.nix @@ -1,38 +1,47 @@ -{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }: +{ lib +, stdenv +, alsa-lib +, dockapps-sources +, libX11 +, libXext +, libXpm +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "AlsaMixer.app"; - version = "0.2.1"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext alsa-lib ]; + sourceRoot = "${finalAttrs.src.name}/AlsaMixer.app"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}) - ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + libX11 + libXpm + libXext + ]; + + hardeningDisable = [ "fortify" ]; dontConfigure = true; - preInstall = '' - install -d ${placeholder "out"}/bin - ''; - installPhase = '' runHook preInstall - install -t ${placeholder "out"}/bin AlsaMixer.app + install -D -t ${placeholder "out"}/bin/ AlsaMixer.app + pushd ${placeholder "out"}/bin + ln -vs AlsaMixer.app AlsaMixer runHook postInstall ''; - postInstall = '' - ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer - ''; - - meta = with lib; { + meta = { description = "Alsa mixer application for Windowmaker"; homepage = "https://www.dockapps.net/alsamixerapp"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix new file mode 100644 index 0000000000..6ac10e374e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/cputnik.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXext +, libXpm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cputnik"; + + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/cputnik/src"; + + buildInputs = [ + libX11 + libXpm + libXext + ]; + + preBuild = '' + makeFlagsArray+=( + INCS="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include" + LIBS="-L${libX11}/lib -L${libXext}/lib -L${libXpm}/lib -lX11 -lXpm -lXext" + ) + ''; + + hardeningDisable = [ "format" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin/ cputnik + + runHook postInstall + ''; + + meta = { + description = "A Calendar clock with antialiased text"; + homepage = "https://www.dockapps.net/wmcalclock"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/default.nix index 8a66fdbd67..84cfe01bdd 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/default.nix @@ -1,20 +1,29 @@ { config, lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: { - dockapps-sources = pkgs.fetchgit { - url = "https://repo.or.cz/dockapps.git"; - rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea"; - sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w="; + dockapps-sources = { + pname = "dockapps-sources"; + version = "2023-10-11"; # Shall correspond to src.rev + + src = pkgs.fetchFromRepoOrCz { + repo = "dockapps"; + rev = "1bbb32008ecb58acaec9ea70e00b4ea1735408fc"; + hash = "sha256-BLUDe/cIIuh9mCtafbcBSDatUXSRD83FeyYhcbem5FU="; + }; }; - libdockapp = callPackage ./libdockapp.nix { }; + AlsaMixer-app = self.callPackage ./AlsaMixer-app.nix { }; - AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; + cputnik = self.callPackage ./cputnik.nix { }; - wmCalClock = callPackage ./wmCalClock.nix { }; + libdockapp = self.callPackage ./libdockapp.nix { }; - wmsm-app = callPackage ./wmsm-app.nix { }; + wmCalClock = self.callPackage ./wmCalClock.nix { }; - wmsystemtray = callPackage ./wmsystemtray.nix { }; + wmcube = self.callPackage ./wmcube.nix { }; + + wmsm-app = self.callPackage ./wmsm-app.nix { }; + + wmsystemtray = self.callPackage ./wmsystemtray.nix { }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix index aaf99ec932..12446bfc72 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix @@ -1,30 +1,36 @@ -{ lib, stdenv, dockapps-sources, autoreconfHook, pkg-config -, libX11, libXext, libXpm, mkfontdir, fontutil }: +{ lib +, stdenv +, autoreconfHook +, dockapps-sources +, fontutil +, libX11 +, libXext +, libXpm +, mkfontdir +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdockapp"; - version = "0.7.3"; - src = dockapps-sources; + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/libdockapp"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ]; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}) - ''; - # There is a bug on --with-font configureFlags = [ "--with-examples=no" "--with-font=no" ]; - meta = with lib; { + meta = { description = "A library providing a framework for dockapps"; homepage = "https://www.dockapps.net/libdockapp"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix index 9f49b4508c..1dc130971d 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmCalClock.nix @@ -1,17 +1,23 @@ -{ lib, stdenv, dockapps-sources -, libX11, libXpm, libXext }: +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXext +, libXpm +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmCalClock"; - version = "1.25"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - buildInputs = [ libX11 libXpm libXext ]; + sourceRoot = "${finalAttrs.src.name}/wmCalClock"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}/Src) - ''; + buildInputs = [ + libX11 + libXpm + libXext + ]; preBuild = '' makeFlagsArray+=( @@ -28,11 +34,11 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" ]; - meta = with lib; { + meta = { description = "A Calendar clock with antialiased text"; homepage = "https://www.dockapps.net/wmcalclock"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix new file mode 100644 index 0000000000..5aaa00e23e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmcube.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, dockapps-sources +, libX11 +, libXpm +, libXext +, libdockapp +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wmcube"; + + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/wmcube/wmcube"; + + buildInputs = [ + libX11 + libXext + libXpm + libdockapp + ]; + + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; + + preBuild = '' + makeFlagsArray=( + CC="${stdenv.cc.targetPrefix}cc" + PREFIX="${placeholder "out"}" + VERSION="${finalAttrs.version}" + LIBDIR="-L${lib.getLib libX11}/lib -L${lib.getLib libXext}/lib \ +-L${lib.getLib libXpm}/lib -L${lib.getLib libdockapp}/lib" + INCDIR="-I${lib.getDev libX11}/lib -I${lib.getDev libXext}/lib \ +-I${lib.getDev libXpm}/lib -I${lib.getDev libdockapp}/lib" + LIBS="-lm -lXpm -lXext -lX11 -ldockapp" + ) + ''; + + preInstall = '' + mkdir -pv $out/{bin,doc/wmcube-${finalAttrs.version},share/wmcube,man/man1} + ''; + + meta = { + description = "System monitor for Windowmaker"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix index 5c68a39a1e..6becfce957 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsm-app.nix @@ -1,20 +1,25 @@ -{ lib, stdenv, dockapps-sources +{ lib +, stdenv +, dockapps-sources , libX11 , libXpm , libXext -, libdockapp }: +, libdockapp +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmsm.app"; - version = "0.2.1"; - src = dockapps-sources; + inherit (dockapps-sources) version src; - buildInputs = [ libX11 libXpm libXext libdockapp ]; + sourceRoot = "${src.name}/wmsm.app/wmsm"; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}/wmsm) - ''; + buildInputs = [ + libX11 + libXext + libXpm + libdockapp + ]; env.NIX_CFLAGS_COMPILE = "-std=gnu89"; @@ -24,7 +29,9 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; installPhase = '' runHook preInstall @@ -32,12 +39,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + installFlags = [ + "PREFIX=${placeholder "out"}/bin" + ]; - meta = with lib; { + meta = { description = "System monitor for Windowmaker"; homepage = "https://www.dockapps.net/wmsmapp"; - license = licenses.gpl2; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix index ced4cad805..7f17475d31 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/dockapps/wmsystemtray.nix @@ -1,22 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, libXpm, libXext, libXfixes, libXmu }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXext +, libXfixes +, libXmu +, libXpm +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmsystemtray"; version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; + url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-${finalAttrs.version}.tar.gz"; + hash = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; + nativeBuildInputs = [ + pkg-config + ]; - meta = with lib; { + buildInputs = [ + libX11 + libXext + libXfixes + libXmu + libXpm + ]; + + meta = { description = "A system tray for Windowmaker"; homepage = "http://wmsystemtray.sourceforge.net"; license = licenses.gpl2Only; - maintainers = [ maintainers.bstrik ]; + maintainers = [ ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/package.nix index 2381c16f41..6c39eadeb0 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/windowmaker/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromRepoOrCz , autoreconfHook +, callPackage , pkg-config , imagemagick , libX11 @@ -62,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: { "--with-x" ]; + passthru = { + dockapps = callPackage ./dockapps { }; + }; + meta = { homepage = "http://windowmaker.org/"; description = "NeXTSTEP-like window manager"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wiremock/default.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix similarity index 51% rename from third_party/nixpkgs/pkgs/tools/networking/wiremock/default.nix rename to third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix index bfa0f9adf2..0e4e565931 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wiremock/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper, gitUpdater }: stdenv.mkDerivation rec { pname = "wiremock"; - version = "2.35.0"; + version = "3.3.1"; + src = fetchurl { - url = "mirror://maven/com/github/tomakehurst/wiremock-jre8-standalone/${version}/wiremock-jre8-standalone-${version}.jar"; - hash = "sha256-rhVq4oEuPPpHDEftBzEA707HeSc3Kk4gPw471THz61c="; + url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar"; + hash = "sha256-VgUJeQJeHNmmX1cS2s5hTljQZ8fIYr9uHYWMXjZjJzY="; }; dontUnpack = true; @@ -20,10 +21,17 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/wiremock/wiremock.jar" ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/wiremock/wiremock.git"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + meta = { description = "A flexible tool for building mock APIs"; homepage = "https://wiremock.org/"; - maintainers = with lib.maintainers; [ bobvanderlinden ]; + changelog = "https://github.com/wiremock/wiremock/releases/tag/${version}"; + maintainers = with lib.maintainers; [ bobvanderlinden anthonyroussel ]; + mainProgram = "wiremock"; platforms = jre.meta.platforms; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/by-name/wo/wordlists/package.nix b/third_party/nixpkgs/pkgs/by-name/wo/wordlists/package.nix new file mode 100644 index 0000000000..16106707fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wo/wordlists/package.nix @@ -0,0 +1,70 @@ +{ lib +, callPackage +, nmap +, rockyou +, runtimeShell +, seclists +, symlinkJoin +, tree +, wfuzz +, lists ? [ + nmap + rockyou + seclists + wfuzz + ] +}: + +symlinkJoin rec { + pname = "wordlists"; + version = "unstable-2023-10-10"; + + name = "${pname}-${version}"; + paths = lists; + + postBuild = '' + mkdir -p $out/bin + + # Create a command to show the location of the links. + cat >> $out/bin/wordlists << __EOF__ + #!${runtimeShell} + ${tree}/bin/tree ${placeholder "out"}/share/wordlists + __EOF__ + chmod +x $out/bin/wordlists + + # Create a handy command for easy access to the wordlists. + # e.g.: `cat "$(wordlists_path)/rockyou.txt"`, or `ls "$(wordlists_path)/dirbuster"` + cat >> $out/bin/wordlists_path << __EOF__ + #!${runtimeShell} + printf "${placeholder "out"}/share/wordlists\n" + __EOF__ + chmod +x $out/bin/wordlists_path + ''; + + meta = with lib; { + description = "A collection of wordlists useful for security testing"; + longDescription = '' + The `wordlists` package provides two scripts. One is called {command}`wordlists`, + and it will list a tree of all the wordlists installed. The other one is + called {command}`wordlists_path` which will print the path to the nix store + location of the lists. You can for example do + {command}`$(wordlists_path)/rockyou.txt` to get the location of the + [rockyou](https://en.wikipedia.org/wiki/RockYou#Data_breach) + wordlist. If you want to modify the available wordlists you can override + the `lists` attribute`. In your nixos configuration this would look + similiar to this: + + ```nix + environment.systemPackages = [ + (pkgs.wordlists.override { lists = with pkgs; [ rockyou ] }) + ] + ``` + + you can use this with nix-shell by doing: + {command}`nix-shell -p 'wordlists.override { lists = with (import {}); [ nmap ]; }' + If you want to add a new package that provides wordlist/s the convention + is to copy it to {file}`$out/share/wordlists/myNewWordlist`. + ''; + maintainers = with maintainers; [ janik pamplemousse ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/wo/worker/package.nix b/third_party/nixpkgs/pkgs/by-name/wo/worker/package.nix new file mode 100644 index 0000000000..772efc7015 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wo/worker/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchurl +, libX11 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "worker"; + version = "4.12.1"; + + src = fetchurl { + url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz"; + hash = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; + }; + + buildInputs = [ libX11 ]; + + outputs = [ "out" "man" ]; + + strictDeps = true; + + meta = { + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; + description = "Advanced orthodox file manager"; + longDescription = '' + Worker is a two-pane file manager for the X Window System on UN*X. The + directories and files are shown in two independent panels supporting a lot + of advanced file manipulation features. The main focus is to make managing + files easy with full keyboard control, also assisting in finding files and + directories by using history of accessed directories, live filtering, and + access to commands by using the keyboard. + ''; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "worker"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix b/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix new file mode 100644 index 0000000000..ed6c0c9b67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ws/wslay/package.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, cunit }: + +stdenv.mkDerivation rec { + pname = "wslay"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "tatsuhiro-t"; + repo = "wslay"; + rev = "release-${version}"; + hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "WSLAY_TESTS" true) + ]; + + doCheck = true; + + checkInputs = [ cunit ]; + + meta = with lib; { + homepage = "https://tatsuhiro-t.github.io/wslay/"; + description = "The WebSocket library in C"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pingiun ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix b/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix similarity index 68% rename from third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix rename to third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix index ba6175f59b..720d08a060 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wtfis/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/wt/wtfis/package.nix @@ -5,30 +5,37 @@ let pname = "wtfis"; - version = "0.6.1"; -in python3.pkgs.buildPythonApplication { - inherit pname version; - + version = "0.7.1"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; rev = "refs/tags/v${version}"; - hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko="; + hash = "sha256-X3e0icyhNPg8P6+N9k6a9WwBJ8bXRPdo3fj4cj+yY6w="; }; - - patches = [ - # TODO: get rid of that newbie patch - ./000-pyproject-remove-versions.diff - ]; +in python3.pkgs.buildPythonApplication { + inherit pname version src; format = "pyproject"; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ python3.pkgs.hatchling python3.pkgs.pydantic + python3.pkgs.python-dotenv python3.pkgs.rich python3.pkgs.shodan - python3.pkgs.python-dotenv + ]; + + pythonRelaxDeps = [ + "pydantic" + "python-dotenv" + "requests" + "rich" + "shodan" + "types-requests" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xosview/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix rename to third_party/nixpkgs/pkgs/by-name/xo/xosview/package.nix index 3b09b150a0..e18ef0ac3c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xosview/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xo/xosview/package.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hills"; - repo = finalAttrs.pname; + repo = "xosview"; rev = finalAttrs.version; hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw="; }; + outputs = [ "out" "man" ]; + dontConfigure = true; buildInputs = [ @@ -28,12 +30,13 @@ stdenv.mkDerivation (finalAttrs: { "PLATFORM=linux" ]; - meta = with lib; { + meta = { homepage = "http://www.pogo.org.uk/~mark/xosview/"; description = "A classic system monitoring tool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + license = lib.licenses.gpl2Plus; + mainProgram = "xosview"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; linux; }; }) -# TODO: generalize to other platforms + diff --git a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix b/third_party/nixpkgs/pkgs/by-name/xo/xosview2/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix rename to third_party/nixpkgs/pkgs/by-name/xo/xosview2/package.nix index bd4234bae1..51d6b685ce 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xo/xosview2/package.nix @@ -6,16 +6,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "xosview2"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "mirror://sourceforge/xosview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA="; + url = "mirror://sourceforge/xosview/xosview2-${finalAttrs.version}.tar.gz"; + hash = "sha256-kEp6n9KmZ+6sTFyJr1V8Ssq9aZuh69c4U1YIiqvxIxw="; }; + outputs = [ "out" "man" ]; + buildInputs = [ libX11 ]; - meta = with lib; { + meta = { homepage = "https://xosview.sourceforge.net/index.html"; description = "Lightweight graphical operating system monitor"; longDescription = '' @@ -35,8 +37,9 @@ stdenv.mkDerivation (finalAttrs: { connect to it on a network, then you can popup an xosview instance and monitor what is going on. ''; - license = with licenses; [ gpl2 bsdOriginal ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ gpl2 bsdOriginal ]; + mainProgram = "xosview2"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xscreensaver/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix rename to third_party/nixpkgs/pkgs/by-name/xs/xscreensaver/package.nix index 1ec3b6905a..2f4af30ff3 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/xs/xscreensaver/package.nix @@ -24,19 +24,21 @@ , perlPackages , pkg-config , systemd -, forceInstallAllHacks ? false +, forceInstallAllHacks ? true , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; - version = "6.06"; + version = "6.08"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; - hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac="; + hash = "sha256-XPUrpSXO7PlLLyvWNIXr3zGOEvzA8q2tfUwQbYVedqM="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ intltool makeWrapper @@ -65,7 +67,13 @@ stdenv.mkDerivation (finalAttrs: { perlPackages.MozillaCA perlPackages.perl ] - ++ lib.optional withSystemd systemd; + ++ lib.optionals withSystemd [ systemd ]; + + postPatch = '' + pushd hacks + patchShebangs check-configs.pl munge-ad.pl xml2man.pl + popd + ''; preConfigure = '' # Fix installation paths for GTK resources. diff --git a/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix b/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix new file mode 100644 index 0000000000..80023f676c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/xs/xsct/package.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +, libX11 +, libXrandr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xsct"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "faf0"; + repo = "sct"; + rev = finalAttrs.version; + hash = "sha256-XhrkaK85I/U2ChO5mZYah/TaXz03yahfMEbfgzXqytU="; + }; + + buildInputs = [ + libX11 + libXrandr + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Set color temperature of screen"; + homepage = "https://github.com/faf0/sct"; + license = licenses.unlicense; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = with platforms; linux ++ freebsd ++ openbsd; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix rename to third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix index 5154ef60bd..3845e65fec 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,28 +2,25 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.4.7"; + version = "0.5.1"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY="; + sha256 = "sha256-JeeOT3fb+4+eUyWl7rAXa5+Yf1XCT20xJeCdhBC0oeo="; }; - vendorHash = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc="; - - # Change the default location of the management socket on Linux - # systems so that the yggdrasil system service unit does not have to - # be granted write permission to /run. - patches = [ ./change-runtime-dir.patch ]; + vendorHash = "sha256-yu725RgKDRmpNFNuffBFKZjZOFyzt00kKGuz696JHk0="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" - "-s" "-w" + "-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock" + "-s" + "-w" ]; passthru.tests.basic = nixosTests.yggdrasil; @@ -33,6 +30,6 @@ buildGoModule rec { "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; - maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; + maintainers = with maintainers; [ ehmry gazally lassulus ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/yu/yunfaavatar/package.nix b/third_party/nixpkgs/pkgs/by-name/yu/yunfaavatar/package.nix new file mode 100644 index 0000000000..369f89d7c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/yu/yunfaavatar/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + bash, + imagemagick, + makeWrapper, +}: +stdenvNoCC.mkDerivation rec { + pname = "yunfaavatar"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "yunfachi"; + repo = "yunfaAvatar"; + rev = version; + hash = "sha256-hCpbe+gW9hkiVOKq7a55n5s3bMpyCNGWiY3D2b4VYxg="; + }; + + strictDeps = true; + nativeBuildInputs = [makeWrapper]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + wrapProgram "$out/bin/yunfaavatar" \ + --prefix PATH : "${lib.makeBinPath [imagemagick]}" + ''; + + meta = with lib; { + description = "Utility for automatic centralized changing of avatar in Github, Discord, Steam, Shikimori, and many more"; + homepage = "https://github.com/yunfachi/yunfaAvatar"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [yunfachi]; + mainProgram = "yunfaavatar"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zesarux/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zesarux/package.nix new file mode 100644 index 0000000000..e19dd5b60f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ze/zesarux/package.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, SDL2 +, aalib +, alsa-lib +, libXext +, libXxf86vm +, libcaca +, libpulseaudio +, libsndfile +, ncurses +, openssl +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zesarux"; + version = "unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "chernandezba"; + repo = "zesarux"; + rev = "02e734b088c3b880b2d260a9812404f029dfc92a"; + hash = "sha256-1PWFpUNekDKyCUNuV/cNUZ7hWGZBMu0nxswD6pap8pg="; + }; + + nativeBuildInputs = [ + which + ]; + + buildInputs = [ + SDL2 + aalib + alsa-lib + libXxf86vm + libXext + libcaca + libpulseaudio + libsndfile + ncurses + openssl + ]; + + strictDeps = true; + + sourceRoot = "${finalAttrs.src.name}/src"; + + postPatch = '' + patchShebangs ./configure *.sh + ''; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--c-compiler ${stdenv.cc.targetPrefix}cc" + "--enable-cpustats" + "--enable-memptr" + "--enable-sdl2" + "--enable-ssl" + "--enable-undoc-scfccf" + "--enable-visualmem" + ]; + + installPhase = '' + runHook preInstall + + ./generate_install_sh.sh + patchShebangs ./install.sh + ./install.sh + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/chernandezba/zesarux"; + description = "ZX Second-Emulator And Released for UniX"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix index f2e1f26f3b..b9ec209dda 100644 --- a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix +++ b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix @@ -14,7 +14,7 @@ let workDir = "console"; bufArgs = "../proto --include-imports --include-wkt"; outputPath = "src/app/proto"; - hash = "sha256-s0dzmcjKd8ot7t+KlRlNVA9oiIDKVMnGOT/HjdaUjGI="; + hash = "sha256-NmlKjKWxmqatyR6OitlQ7bfl6U6PS6KWqTALwX42HS4="; }; in mkYarnPackage rec { @@ -26,7 +26,7 @@ mkYarnPackage rec { packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-48IC4LxqbkH+95k7rCmhRWT+qAlJ9CDXWwRjbric9no="; + hash = "sha256-rSKoIznYVDNgrBmut7YSxNhgPJnbIeO+/s0HnrYWPUc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.json b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.json index 0add6d2556..5819fdd77a 100644 --- a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.json +++ b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.json @@ -12,20 +12,20 @@ }, "private": true, "dependencies": { - "@angular/animations": "^16.2.0", - "@angular/cdk": "^16.2.0", - "@angular/common": "^16.2.0", - "@angular/compiler": "^16.2.0", - "@angular/core": "^16.2.0", - "@angular/forms": "^16.2.0", - "@angular/material": "^16.2.0", - "@angular/material-moment-adapter": "^16.2.0", - "@angular/platform-browser": "^16.2.0", - "@angular/platform-browser-dynamic": "^16.2.0", - "@angular/router": "^16.2.0", - "@angular/service-worker": "^16.2.0", + "@angular/animations": "^16.2.5", + "@angular/cdk": "^16.2.4", + "@angular/common": "^16.2.5", + "@angular/compiler": "^16.2.5", + "@angular/core": "^16.2.5", + "@angular/forms": "^16.2.5", + "@angular/material": "^16.2.4", + "@angular/material-moment-adapter": "^16.2.4", + "@angular/platform-browser": "^16.2.5", + "@angular/platform-browser-dynamic": "^16.2.5", + "@angular/router": "^16.2.5", + "@angular/service-worker": "^16.2.5", "@ctrl/ngx-codemirror": "^6.1.0", - "@grpc/grpc-js": "^1.8.14", + "@grpc/grpc-js": "^1.9.3", "@ngx-translate/core": "^14.0.0", "angular-oauth2-oidc": "^15.0.1", "angularx-qrcode": "^16.0.0", @@ -41,8 +41,8 @@ "libphonenumber-js": "^1.10.30", "material-design-icons-iconfont": "^6.1.1", "moment": "^2.29.4", - "opentype.js": "^1.3.4", "ngx-color": "^9.0.0", + "opentype.js": "^1.3.4", "rxjs": "~7.8.0", "tinycolor2": "^1.6.0", "tslib": "^2.4.1", @@ -50,29 +50,29 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.2.0", - "@angular-eslint/builder": "16.1.0", - "@angular-eslint/eslint-plugin": "16.1.0", - "@angular-eslint/eslint-plugin-template": "16.1.0", - "@angular-eslint/schematics": "16.1.0", - "@angular-eslint/template-parser": "16.1.0", - "@angular/cli": "^16.2.0", - "@angular/compiler-cli": "^16.2.0", - "@angular/language-service": "^16.2.0", + "@angular-devkit/build-angular": "^16.2.2", + "@angular-eslint/builder": "16.2.0", + "@angular-eslint/eslint-plugin": "16.2.0", + "@angular-eslint/eslint-plugin-template": "16.2.0", + "@angular-eslint/schematics": "16.2.0", + "@angular-eslint/template-parser": "16.2.0", + "@angular/cli": "^16.2.2", + "@angular/compiler-cli": "^16.2.5", + "@angular/language-service": "^16.2.5", "@bufbuild/buf": "^1.23.1", "@types/file-saver": "^2.0.2", "@types/google-protobuf": "^3.15.3", - "@types/jasmine": "~4.3.3", + "@types/jasmine": "~4.3.6", "@types/jasminewd2": "~2.0.10", "@types/jsonwebtoken": "^9.0.1", - "@types/node": "^18.15.11", + "@types/node": "^20.7.0", "@types/opentype.js": "^1.3.4", - "@types/qrcode": "^1.5.0", + "@types/qrcode": "^1.5.2", "@types/uuid": "^9.0.2", "@typescript-eslint/eslint-plugin": "^5.59.11", "@typescript-eslint/parser": "^5.60.1", "codelyzer": "^6.0.2", - "eslint": "^8.44.0", + "eslint": "^8.50.0", "jasmine-core": "~4.6.0", "jasmine-spec-reporter": "~7.0.0", "karma": "^6.4.2", @@ -80,7 +80,7 @@ "karma-coverage-istanbul-reporter": "^3.0.3", "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.1.0", - "prettier": "^2.8.7", + "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.2", "protractor": "~7.0.0", "typescript": "^4.9.5" diff --git a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.nix b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.nix index cd4780965e..03216c4062 100644 --- a/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.nix @@ -15,14 +15,14 @@ }: let - version = "2.37.2"; + version = "2.40.3"; zitadelRepo = fetchFromGitHub { owner = "zitadel"; repo = "zitadel"; rev = "v${version}"; - hash = "sha256-iWEL7R7eNDV4c1CZhmxxiHHI9ExwU6gnmHI6ildaXWY="; + hash = "sha256-WqsK6DAYkLs5wBNvkVGarLMm/unBLtipFkl07pR90HI="; }; - goModulesHash = "sha256-lk4jEiI85EKk0G4JCHvCazqBBTfiNJqSfzvrJgDZ1Nc="; + goModulesHash = "sha256-IVf1YVnhyEYgZqM31Cv3aBFnPG7v5WW6fCEvlN+sTIE="; buildZitadelProtocGen = name: buildGo121Module { @@ -91,7 +91,7 @@ let protoc-gen-zitadel ]; outputPath = ".artifacts"; - hash = "sha256-+9UFBWBuSYNbfimKwJUSoiUh+8bDHGnPdx1MKDul1U4="; + hash = "sha256-xrEF1B4pMoCZs1WO9F6IoqHnSyt5BhPVTIABMWK/q2E="; }; in buildGo121Module rec { 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 26fa5ec670..afb7ba4c06 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 = "58.10"; + version = "58.11"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-eBokpah7j3QQChprvjeigt2/sEpkq6ZS4rQhIP5cAYo="; + hash = "sha256-XewHMsHF65LvoRzPFiDQcClVSTfSCn69iDRjwKTLpRs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/zp/zpix-pixel-font/package.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpix-pixel-font/package.nix new file mode 100644 index 0000000000..6a785c9d8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/zp/zpix-pixel-font/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenvNoCC +, fetchurl +}: +stdenvNoCC.mkDerivation rec { + pname = "zpix-pixel-font"; + version = "3.1.8"; + + srcs = [ + (fetchurl { + name = "zpix-pixel-font.bdf"; + url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.bdf"; + hash = "sha256-qE6YPKuk1FRRrTvmy4YIDuxRfslma264piUDj1FWtk4="; + }) + (fetchurl { + name = "zpix-pixel-font.ttf"; + url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.ttf"; + hash = "sha256-UIgLGsVTbyhYMKfTYiA+MZmV4dFT9HX3sxTdrcc4vE0="; + }) + ]; + + dontUnpack = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 ''${srcs[0]} $out/share/fonts/misc/zpix.bdf + install -Dm444 ''${srcs[1]} $out/share/fonts/truetype/zpix.ttf + runHook postInstall + ''; + + meta = with lib; { + description = "A pixel font supporting multiple languages like English, Chinese and Japanese"; + homepage = "https://github.com/SolidZORO/zpix-pixel-font/"; + changelog = "https://github.com/SolidZORO/zpix-pixel-font/blob/master/CHANGELOG.md"; + license = licenses.unfree; + maintainers = [ maintainers.adriangl ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix b/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix new file mode 100644 index 0000000000..f97e16d661 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/zw/zwave-js-server/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nixosTests +}: + +buildNpmPackage rec { + pname = "zwave-js-server"; + version = "1.33.0"; + + src = fetchFromGitHub { + owner = "zwave-js"; + repo = pname; + rev = version; + hash = "sha256-Lll3yE1v4ybJTjKO8dhPXMD/3VCn+9+fpnN7XczqaE4="; + }; + + npmDepsHash = "sha256-Re9fo+9+Z/+UGyDPlNWelH/4tLxcITPYXOCddQE9YDY="; + + # For some reason the zwave-js dependency is in devDependencies + npmFlags = [ "--include=dev" ]; + + passthru = { + tests = { + inherit (nixosTests) zwave-js; + }; + }; + + meta = { + changelog = "https://github.com/zwave-js/zwave-js-server/releases/tag/${version}"; + description = "Small server wrapper around Z-Wave JS to access it via a WebSocket"; + license = lib.licenses.asl20; + homepage = "https://github.com/zwave-js/zwave-js-server"; + maintainers = with lib.maintainers; [ graham33 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/common-updater/nix-update.nix b/third_party/nixpkgs/pkgs/common-updater/nix-update.nix index 269e1b6e64..342b1677c6 100644 --- a/third_party/nixpkgs/pkgs/common-updater/nix-update.nix +++ b/third_party/nixpkgs/pkgs/common-updater/nix-update.nix @@ -4,4 +4,4 @@ , extraArgs ? [ ] }: -[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index 08916f3e56..6eb1e3e741 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-08-13"; + version = "unstable-2023-08-27"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "c17abb7dfb733fede4cf776a932e9696ccc7a4f2"; - hash = "sha256-9s/1sJEA4nowzQRpySOFzY+PxiUdz1Z3D931rMet4CA="; + rev = "44317b20616699b13b2b6276c86d796f4ae0c8dd"; + hash = "sha256-qxj9sEQYOZ+me2IhDS5S2GRSho4KWWrEm+5MNxfw1VI="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc0..18f4d13197 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , extra-cmake-modules , pkg-config @@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; }; + patches = [ + # fix build with qt 6.6.0 + # treewide: replace deprecated qAsConst with std::as_const() + # https://github.com/zealdocs/zeal/pull/1565 + (fetchpatch2 { + url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; + hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' @@ -62,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://zealdocs.org/"; changelog = "https://github.com/zealdocs/zeal/releases"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; inherit (qtbase.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix index d735e64296..895e70a544 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.138"; + version = "1.141"; src = fetchzip { - url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; - sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ="; + url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; @@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf - install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf + install -Dm644 CommitMono-${version}/*.otf -t $out/share/fonts/opentype + install -Dm644 CommitMono-${version}/ttfautohint/*.ttf -t $out/share/fonts/truetype runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8..059350da7d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf diff --git a/third_party/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix new file mode 100644 index 0000000000..fdf83df42e --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/fg-virgil/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fg-virgil"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "excalidraw"; + repo = "excalidraw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-iziCCHacaShPqb0f5nI8cCinFFs5fB3TcMJrifNhg4I="; + }; + + installPhase = '' + runHook preInstall + + install -D -m 444 public/Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.ttf -t $out/share/fonts/ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/excalidraw/virgil"; + description = "The font that powers Excalidraw"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ drupol ]; + license = lib.licenses.ofl; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index 53592152a3..dec1ea062b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { description = "Pan-unicode version of Fixedsys, a classic DOS font"; platforms = lib.platforms.all; license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.ninjatrappeur ]; + maintainers = [ lib.maintainers.picnoir ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix index a6f748f2f0..dfc808971b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix @@ -44,11 +44,11 @@ in hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { - version = "5.15.3"; - hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; + version = "5.15.4"; + hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.1.1"; - hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; + version = "6.4.2"; + hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 4503b09354..d0f0551668 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2022-11-14"; + version = "unstable-2023-10-20"; # Adobe Blank is split out in a separate output, # because it causes crashes with `libfontconfig`. @@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f"; - sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA="; + rev = "990be3ed8f77e31c26bf07b148d6a74b8e6241cf"; + sha256 = "sha256-ffLXzaniHkWxGQpvlJpiO6/SAdbI3FONgTaq8Xu+WY0="; }; postPatch = '' @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation { rm -rv ofl/cabincondensed \ ofl/signikanegative \ ofl/signikanegativesc \ + ofl/*_todelist \ axisregistry/tests/data if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then @@ -67,5 +68,6 @@ stdenvNoCC.mkDerivation { platforms = platforms.all; hydraPlatforms = []; maintainers = with maintainers; [ manveru ]; + sourceProvenance = [ sourceTypes.binaryBytecode ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix index 1708534c63..f9876e8f0a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/intel-one-mono/default.nix @@ -2,16 +2,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "intel-one-mono"; - version = "1.2.1"; + version = "1.3.0"; srcs = [ (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip"; - hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0="; + hash = "sha256-iZIfkXH+GplVwES4LaQBIaCWs7OKmEto9J2SpzvagSs="; }) (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip"; - hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY="; + hash = "sha256-EeUTEMuoTHKmuO5Uj0jjiDRF9t7jxbIy45nTWozlgfc="; }) ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index fa1787d8f7..5d2be4826f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix index fbe2f9533b..fb788b2876 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix @@ -1,4 +1,4 @@ -{ lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }: +{ lib, iosevka, fetchFromGitHub, buildNpmPackage }: let sets = [ @@ -20,17 +20,17 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes | ]; - version = "1.3.0"; - src = fetchFromSourcehut { - owner = "~protesilaos"; + version = "1.4.0"; + src = fetchFromGitHub { + owner = "protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-ajzUbobNf+Je8ls9htOCLPsB0OPSiqZzrc8bO6hQvio="; + sha256 = "sha256-kfEEJ6F1/dsG9CSLWcr0QOOnQxHPgPgb4QhgFrHTklE="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: let superBuildNpmPackage = buildNpmPackage; in - (iosevka.override rec { + (iosevka.override { inherit set privateBuildPlan; buildNpmPackage = args: superBuildNpmPackage (args // { @@ -39,11 +39,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "7ef24b8d87fe50793444f9f84b140767f7e47029"; - hash = "sha256-RVBgJVMNyxV1KeNniwySsJUOmLDh6sFZju8szvzKlH4="; + rev = "f6e57fbf0b1242ad3069d45c815d79b9d68871a2"; + hash = "sha256-cS3SCKzUjVXF+n0Rt5eBLzieATB7W+hwEbzh6OQrMo4="; }; - npmDepsHash = "sha256-yogUBf+yfjfK8DE4gGgoGaTaYZagW8R1pCn7y0rEPt4="; + npmDepsHash = "sha256-c+ltdh5e3+idclYfqp0Xh9IUwoj7XYP1uzJG6+a5gFU="; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 8630b13db7..04f89b6d2a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.2.0"; + version = "27.3.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-jRUwXnsYzM4BH+tEM6xuoB3/MFqbnR0deT3Slgkemvs="; + hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I="; }; - npmDepsHash = "sha256-6ikjJScy6iL8lZ9eE2JBz7+egRCNli4XC9hnEalX408="; + npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg="; nativeBuildInputs = [ remarshal diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 0094fc3e6f..4035a0961a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1jn883s4vvpfih31yxap2hg6xya9jfjnqa8f7iqkqyxxqrnx7zzm"; - iosevka-aile = "1p2s5nslifmdbjbqqlk02kl0rvpmr5pkq71hr9xim2dqb11kmcdl"; - iosevka-curly = "0rs7jmgpl1ki7b9i3l78fn63xbgd02wraixqb1yjc3lmxi9jbhxn"; - iosevka-curly-slab = "09rf82w41fbw7pm1ak9vv1i9450h2ia7x434gn9czx01wnb3s2zb"; - iosevka-etoile = "1621a74z378rz4l1gn9dr7fqqvnd1g7ipr5bw13qhwl5ljf170xs"; - iosevka-slab = "06x3hbi05bzlaci7hr3wk8j92zn97i41bw8xjnj8sh63mla36w9p"; - iosevka-ss01 = "1plp7lk9yzizfz9c5k4m51ynvp0zkz7r7vgx416rkwb3yh23fjpv"; - iosevka-ss02 = "0zpl9a8nccnrywaxj61glj4x7ai1fas9x463xqpy38w686n0jjyn"; - iosevka-ss03 = "1xrxvsj2ja9miwvgq7p6kxysn8858gk8qh2pp1bw1n67vppvhkp9"; - iosevka-ss04 = "1y0ac2dq8xmrbw84nar2jsxbyf9nck8fxh3dbl8vhvpnbwan150w"; - iosevka-ss05 = "1z722m5chr8jq24i7czph1qgkasah7y7i4wv2wv0n2j89mc2fbc2"; - iosevka-ss06 = "1fzsj9389cah6zp23vlr375j107jxfabqxaa7iv1hjbw3fa2vmdk"; - iosevka-ss07 = "18psmz6kfhdmpac408w1fsqfarahn60bypm8ci8y3gd8bk8js13c"; - iosevka-ss08 = "0hjlrly98hd4w5l6cm361h4cyvkdrlf3bp1g6f438aip0bj2y94w"; - iosevka-ss09 = "13jdlmamfbxnkqii6bkh0xm71fgqdvgnqs88dnq8pjyqhbl32sca"; - iosevka-ss10 = "15ak510q6di9hsy2p8k7gkp5d1kzgrmk2m55zh90w5irbr5fmbjp"; - iosevka-ss11 = "0x42pjik0iy2v11iq8i83wa88f6b6qymc3v2sih28rjhijxl7lsm"; - iosevka-ss12 = "15s7imcm4w61555crah1pxzc9yn3zffkj13zk8zidgk6v7jzb6rs"; - iosevka-ss13 = "1q3d3fyjsk6iwq1w6dv9rc7ivk021i3v2px574dfbqlswvb2sg86"; - iosevka-ss14 = "0r1fkrcqcccx4zz9qgzgq9si8xcbn7y1f2821cjs6cbfaxmrkwmc"; - iosevka-ss15 = "0vgwgkfnch5rn7kc9rblg1km4pzqwsglb31zqnx3rxhszm66j9q6"; - iosevka-ss16 = "009whnydn5rb6dj06scnc3722y8sddsv4jl42r70x2zzra14qdgk"; - iosevka-ss17 = "01j1gqrmlx3b6rlv6sg3kv9j39s2dwqvj35h4v0v7min2vn1hydj"; - iosevka-ss18 = "1pbwqgrkv560237marp5msq1y93llxvjrpixka15a79a7lmpd36i"; - sgr-iosevka = "0p31qdby1znrsz4hplrq81ngv1l2pxbn9x26hcpjxrbgv2mmvhfq"; - sgr-iosevka-aile = "00zapw8mk0z40jw69ynvdzhpd67rvi9lp509hf3vb7x3cq1ka1wz"; - sgr-iosevka-curly = "1rgxkc2ps8pmp3mgi2b51lv4j5cc5q7m6iizw8gbfl36qmzlfdlh"; - sgr-iosevka-curly-slab = "1fdxr0mkb40fa0605i8b8h51pg8p3cskjsggil9gp1376wzhr42q"; - sgr-iosevka-etoile = "1r91042avgn0f0p2rf09pam4wfjndkj7wml9vs082kc40aqgh9m5"; - sgr-iosevka-fixed = "13b5nkyxpm9izj0dmwc97lqbfvbxqyjg3677hpi6ywl3c6m1h542"; - sgr-iosevka-fixed-curly = "06r0lzcrhf9897yi9h6xh5n1mfb8j4v21nz81igs616w7gjlz0dk"; - sgr-iosevka-fixed-curly-slab = "1l9qaialwq2xygznylbwkizbqwghzl4625d845f8kwyl9krd92na"; - sgr-iosevka-fixed-slab = "199s1cdn22rjirrh1f9xhqbh77namriw077g11hykr4ibwy6sc6n"; - sgr-iosevka-fixed-ss01 = "1y51qk0pfq9r8hpcgmcykrvddl8rw5rjfysrbsjvf6zi59z5rk02"; - sgr-iosevka-fixed-ss02 = "12x3qrw6baxfwbj2wgawf9qpbk8nv7ccd9grqgw7b4qmy5j31n39"; - sgr-iosevka-fixed-ss03 = "1sf8xybh8l76dbm8vgk0y4lgdm5lb5pb4kgnipygqj9z0kasj07d"; - sgr-iosevka-fixed-ss04 = "0pbpqnv6kdnnl4yix3ysfrnxg3ainsl9m0pnkb1i21q5sav20ph5"; - sgr-iosevka-fixed-ss05 = "1vgfiqxwfg3m68dlk4s1x5ms293nbwgdq34y80hysp8pfzl7d07z"; - sgr-iosevka-fixed-ss06 = "17f3rxsh2nla6a8fhim88vxqj1kzafvcfbara1iwzsw3fw9gz2ai"; - sgr-iosevka-fixed-ss07 = "1j3r197jx51b7l5cpm2g5b7mzq53wp05f8ra3cz04r69qc0dj8i5"; - sgr-iosevka-fixed-ss08 = "1gj784bi4wy0282xbq3f24sqlm7b2s1gz2f8sna4bd5bgci8avb7"; - sgr-iosevka-fixed-ss09 = "0hhqvghq0mxbjzfhfcjgij94b40129vhg6x4slgk579kdfmr21y4"; - sgr-iosevka-fixed-ss10 = "044dam3cg2s29j0zbq03ypyyskws31dfvyyp01smds7njf8f2w39"; - sgr-iosevka-fixed-ss11 = "1xxmcai145rfjhlx4n5hcs7kdz298pxn9b3if85cpmdd9qhdmy48"; - sgr-iosevka-fixed-ss12 = "13rbsql91z2ndbx121j1yb3m10a2fwil0jilhfjj17rn0kh0a5qi"; - sgr-iosevka-fixed-ss13 = "19y6x2jln772afqy7y2k97kzpin73y5wq72fh7c9n9cmh1n24628"; - sgr-iosevka-fixed-ss14 = "0ndm0yk95a10qv95c9d5qhjx4vzc28wkahlxjadndxh82hn8zlqm"; - sgr-iosevka-fixed-ss15 = "107lwn4d01hry6jyk2blxdy7gx80ka6wrgxs80l5czx4jsk6kr66"; - sgr-iosevka-fixed-ss16 = "0ka5rp7svqp5hs2zdf0bq5lfhgfmqij93f53q1a0snispx1qnsn6"; - sgr-iosevka-fixed-ss17 = "18kvws3r66b1lqqpyphpf1nk6qdv6pv9c36zf0kpi7hpfcp1dvaa"; - sgr-iosevka-fixed-ss18 = "1s9gzh2ghs66rjjz7317x163072gy2fxbqmvhghngd7bpvbajdd6"; - sgr-iosevka-slab = "0b78y7pikcrlilzn2xlvg5f7liqp0zvzcknx9l47nh32sqn11f5j"; - sgr-iosevka-ss01 = "1nrj6dl3znakj3h0fvd37k71gcp2l0yfgqggdn6ms4cyyrq16z38"; - sgr-iosevka-ss02 = "0mhn1jx2ibllp8h05lm9ms8wh960yyncblx4pkj95sswm5kdv8vv"; - sgr-iosevka-ss03 = "0xxanqcpqh5fvhfad6cyk89yr2nza9lpig6dralizi8b1vxl7bnl"; - sgr-iosevka-ss04 = "1566hvq2lwnh6p7v55j8khi56y61cg88g7vnb306a0rakg5jv17y"; - sgr-iosevka-ss05 = "111pwbwp8fkiph6mrzblbx1nzdnzv9d6aphmkxlmrf1cs19jv71k"; - sgr-iosevka-ss06 = "0p57cqqfhyhri2r1ss8pcd2hdn4pvp0dwr8ls1iws5gaj2s5zbjx"; - sgr-iosevka-ss07 = "0clchkildx4vmk4xpd3xjx0xbihfkn61pcha00md4qf471ysnpmp"; - sgr-iosevka-ss08 = "17ici8in0sh2zy1ya9319k9qqjzg5nl7ky6mbb2skpgmh85figfp"; - sgr-iosevka-ss09 = "0fcwxcvzpc9l5dvmkqxf1g32xr4fk5rr389d6s3qbkdxdlc2vx63"; - sgr-iosevka-ss10 = "1d59vw8caj9nlpmfijwpgkbb6kxphgdrw2hd5ldcvxs0ny0r8fcd"; - sgr-iosevka-ss11 = "0d60zpdq7n73cn0lgnwhddxzw3x0i2cpqwpc1k78s8r8h36qmd05"; - sgr-iosevka-ss12 = "15sc20f2kf6i0wlcfy60ss2j6dyg6figd18g22zmm7msz2lda1b0"; - sgr-iosevka-ss13 = "0qi8ala5dm3r9gljwf5i84624h6arasd9mhww8nk3822cx8c8jd0"; - sgr-iosevka-ss14 = "0i9p2rz8ppwl6x9d2j4gry7l386nbv4g2jrrna6bwgk4nh12izg0"; - sgr-iosevka-ss15 = "0d4s197v96ka5c4b63kisiy8j694vskspc5vry4bgj4pbl7vl6lg"; - sgr-iosevka-ss16 = "1a02r483ihfnlzx0kir6p84q6bscrs798i5qaw7qiz3zi8kxdrgb"; - sgr-iosevka-ss17 = "1hi7dikls7x5zn79waki77bcp4w5hzx12mqmh0zx77aah3ghcax1"; - sgr-iosevka-ss18 = "1mkjyn5mjnlwrxfhxr1f3ja2fd6lbv54fxx0xy9zm1banz0pp3y1"; - sgr-iosevka-term = "0cmycg6vygxi3c1pdqddmh8mqpcrnkmn9y5c8xjzd1lygm41668q"; - sgr-iosevka-term-curly = "1q7r3qclmkniin8hx8digwk1rfgfcm4jz6mvjay5sfi5wa6g9fd0"; - sgr-iosevka-term-curly-slab = "07bf92s5zf9vny3560dr8zwxdg1jpdvz5ksmqcm74ib1024yk17r"; - sgr-iosevka-term-slab = "1am42m5jggfy0fv3580rsksklaiq8827da1s20ngiyxfzcgbgwf3"; - sgr-iosevka-term-ss01 = "09igqk8b4hmgmh1q1idvcjpz0vj15yzrsmcqhyrs1ygxyl2d6g5v"; - sgr-iosevka-term-ss02 = "143czw61bilpim4lqqzp9d2gz4igijyl2p87iy3f5pvh75qzk8fx"; - sgr-iosevka-term-ss03 = "02s7dsjxsm6dgp2rcz6n9dyi6priz9k5q5wd1rajfs6rgb01j1h7"; - sgr-iosevka-term-ss04 = "10paacm4gb0823pqacj1ps8s79k6zbayrqqqnhvklkqki2iiay4g"; - sgr-iosevka-term-ss05 = "0nn49fgxciwpfddcksb5krhvyqbr2zfx2zq1m5nswb70nzwwk8sj"; - sgr-iosevka-term-ss06 = "1r6xlbf9si5ycg96av2pjjak82qgj1sqdq634wkl41x4mj39zkjl"; - sgr-iosevka-term-ss07 = "1sfjv2ggqrgxjqykgycia62xa2g523yf61gix9dp79gyg6ga25nr"; - sgr-iosevka-term-ss08 = "0rk66nzjc4d7bjx9sfgnlzsx52mdrdmgl4xri6jd0ad3543j43bh"; - sgr-iosevka-term-ss09 = "0y12s0ynb5fda8kprwlbw6a9kkb7fwjfna2axgz5rxlz0ja14gs1"; - sgr-iosevka-term-ss10 = "0hy31v083cd9lcb7xfvh6lj4nvzlqkbm8lni092sp21iv43xpp4f"; - sgr-iosevka-term-ss11 = "0wb1c4l8327vsnkpj34grplw1v1mlr3wdavi7i0z5383qx4l3cn0"; - sgr-iosevka-term-ss12 = "0x8zgm1yl37ij1hq6bcdf0whfbyv4gdkqk94yi3xm74a744pzsvx"; - sgr-iosevka-term-ss13 = "1ia9q4gn9a6mr0n4vb6d8mnnp9s6l5v5y4fgi6ip0g49n0n8fw4r"; - sgr-iosevka-term-ss14 = "0ipfjn23jaz6xjb0v2pbirrvi18czir6nijh79kxrrs1k83mc4yq"; - sgr-iosevka-term-ss15 = "0pdlsd8qsp80y5rgp3vrhl1wjbj4b3bgqyavz1ayqccg939dvzqv"; - sgr-iosevka-term-ss16 = "0bz3i0cnijq84skhsjgy0p6p6ww364gnkrny1hgcw7w21d69n2x5"; - sgr-iosevka-term-ss17 = "1sfpaqviv1gqz4c29kmrm1v3zbr3615w90w96s5yxh2lr6zqxi7v"; - sgr-iosevka-term-ss18 = "02f7i400qk9pbyid4dr6p690sqphz52pvgprqp54q1lw07jksqa6"; + iosevka = "0l14c39r68x14maw9hyiqd0lqz7q2pq4drw68i0j4jwa58l0r2x1"; + iosevka-aile = "1pl59kga3ab2jm3y4lh0lqp9nqjggykqrpnh27s99abkf5cvgkzr"; + iosevka-curly = "1nv3r2c2zj9y3zgaa2r8s0w4l28a3pzkyvcm1br650mb4l469j6c"; + iosevka-curly-slab = "1ik3affc11w0q3xjrm9pdpzp6hdq9623f1nhsbc4ih5980mvki0j"; + iosevka-etoile = "16fsysywpf7zdkl0sszi5im42idlmxl273ml0zs9dajd5zdwhm08"; + iosevka-slab = "1xksbmzzfp6mnd90nfnqyg02ps36makrcr311l1xcl9v4drcnsiq"; + iosevka-ss01 = "1pzl1adnbi4m2bi4p754k82viqksxjd39q5sqljjrs60p5mwxbw6"; + iosevka-ss02 = "0r1vrg6b6c4ixw0fzi4g3q7c1hah2szw2rv5gkqmdg0kiw6sddl1"; + iosevka-ss03 = "0rg6hb0xjzmf8s410x7v5m1pv246p1xfxfggw4lhs19h6f7jcy0v"; + iosevka-ss04 = "1690xgfyk6gqxwx70dsvq5ba7vf5906pf1qrrd916fkg2a28fxxp"; + iosevka-ss05 = "1zbiq0hczg2dhld82nyw7x6rkh6y812cvawqqpjmhzxjhd2wn6hv"; + iosevka-ss06 = "0290w7812pqlix1zmpanksbinzkzv6gw0y5k5dvaf4jrg5c3163m"; + iosevka-ss07 = "0z7irkdcwwxpj52a6j1b4s1xz9nlib6jm66fxva7pqd9dhsjp1ph"; + iosevka-ss08 = "1jd12mjcnjs6md3lj182ph9zlb66cmmm2cz49fwdxpx54laawn3i"; + iosevka-ss09 = "0zggxrk2a315rzz684c06pk0vmp9cw5bcn9zkh61hcn0mii10xdv"; + iosevka-ss10 = "14mshgnpq5sn4z81a8cwsq6hjarlrmwfqyhkyzcmqymi6gyljs6k"; + iosevka-ss11 = "14p8fbvd4b4vddnmydyn0v5iffkq1s15pdxpmmwl2aplxnrgshiy"; + iosevka-ss12 = "1r2p1f0mdkx7sqkv29gdpq78c905gcc7kfbr8l907awhv80fzsgg"; + iosevka-ss13 = "0ara2w4zav48rk019hnhr3fq8kqzzvlgshq18cq5gralbcgjw883"; + iosevka-ss14 = "1yqmm13bafrz7siq7q95921ipn3p6ms3dmsxn5zbcmm3pdxxyq1c"; + iosevka-ss15 = "1y84vzqpwa060q3qrxc77kk3hnrgyjqwwxq4s9fq8hww9d01jb5d"; + iosevka-ss16 = "0cszx4s3bi9j5l46sh33dkn9cqn9s7v6rk23d4srlfg19bfs19ga"; + iosevka-ss17 = "0ld6pr8rx1ldszgdd2ixmfj341ry9ajfcpk6k1f9jmfilp4cjnzr"; + iosevka-ss18 = "19787429v0am3qsjyxlgqwbkn50s54w26481h46ybn7nrskgxl7a"; + sgr-iosevka = "1i5zg7wwyczf2ljxjvwk4n75j1nvn6wavc3w1zycfcgim458x8s6"; + sgr-iosevka-aile = "0m0imj778l6zb4y5kb882z4f6abw6q1ww0d8fn4vyqk2csm3kx9v"; + sgr-iosevka-curly = "071jpj9cj56hszqjy5cmj40gq6n47fp117ckypi0npk6cvrvrl7a"; + sgr-iosevka-curly-slab = "1f33iy0nrkm76alyzs7bjdfvc7c4j7cqrzrk769y40wx68l5sbji"; + sgr-iosevka-etoile = "19rgrrk4p9k94s887vv2kqb7zj1wjh5kjncalzbisjpv8ns6l3qq"; + sgr-iosevka-fixed = "03ccy1f8hswslr7n9dhj9l3zvfkahqi742giim34f360f5chpmdi"; + sgr-iosevka-fixed-curly = "14czka86s0yj1h0mq4ajn5yx1lnb9l3hp9yw8h558dy8hf6xk9pi"; + sgr-iosevka-fixed-curly-slab = "1i0hjw0121l83znyfq3zl0z1pl4p57yf2qqrp35qqp0vpsxnjlcy"; + sgr-iosevka-fixed-slab = "1cz1lj2qa8yiwbxpk3c6hdkgg44q9019yai3iz0c17gw8vwj6xxh"; + sgr-iosevka-fixed-ss01 = "1966jyi9j01s094kz1k67ds4k4z1sfahwfxsasi59bc4r5srq3p7"; + sgr-iosevka-fixed-ss02 = "1l08id1p2z2m8vrprlrg0rphspbz17lnc1l483wadffbfrlqrhpr"; + sgr-iosevka-fixed-ss03 = "0g98s0w2lvskq9fyh47b8rx7rha24k4vzza9svl25kx55ixznzjm"; + sgr-iosevka-fixed-ss04 = "0wjq34b6xv17ma75lysmwfqxyp57zr0h9hrxyl9c6sgdmlvf7jqx"; + sgr-iosevka-fixed-ss05 = "080i32z64y9dm19fagc5jh3gkynbim0w03i42bc19im07ryyq79h"; + sgr-iosevka-fixed-ss06 = "17ggkvz3y17zqkn1m864vgqbc5zvn63gsh39n4w1p9wi9v360984"; + sgr-iosevka-fixed-ss07 = "1nazbkhr46larr0hgxwx2h5zvi9yr3qlg2npnmpprwqrhvlvlpah"; + sgr-iosevka-fixed-ss08 = "08i420lx329py3slc99r73hysdnjbc12nm15fs17f505c2zj7war"; + sgr-iosevka-fixed-ss09 = "0zc9wmxjrpzss7cdczg6af6sckdr22k0q9gj90hggyyjlc08cvz0"; + sgr-iosevka-fixed-ss10 = "15qzf9zir1rqfpfspkgy9azf6m73lgpl79xhidf47hkvcw9zxjr7"; + sgr-iosevka-fixed-ss11 = "1z6kji0h5vb3my47h2ccdl2vafh58pyqwp83yy3xgsvsj2qd0835"; + sgr-iosevka-fixed-ss12 = "0wyk8kyllm35wlsqkxgh3sxvn3f52w7kicq64hdax8k8piaj584x"; + sgr-iosevka-fixed-ss13 = "052jrfqwi4qbs9k9mqmdk2s82qb8q6175ajy3f6186grnzd73nnq"; + sgr-iosevka-fixed-ss14 = "0wba9g5q8h5n5c50rncbbkbkc06xs9zxydxz1b0a6dl37drgmvkf"; + sgr-iosevka-fixed-ss15 = "1kds5pl4vxcniksfp4mslpfr0ba30m754w7vxvzvqamgazmyf0pp"; + sgr-iosevka-fixed-ss16 = "12hb9laxbhkbgf2rnbzq7zwwl7bg3n3n2yyjlr3vlsik5kd7aznz"; + sgr-iosevka-fixed-ss17 = "18rvf78xif6p06nzha9nvp725f6mr79f1rk0a6n7ifh1ygdy4lvx"; + sgr-iosevka-fixed-ss18 = "019gzj9s3wh3i9bxalazx9x8nfljf191idh6ygxpqjz4z3yzxh9n"; + sgr-iosevka-slab = "0l9bcvrfbxp0pi3hj3zlirq800h63dyqf8dy307r7xg8m3l48xgr"; + sgr-iosevka-ss01 = "1rb49rx12vgdjvkbyyg63pmxbwqd4v5cfvn5q3k2q4w5m3yhsbm9"; + sgr-iosevka-ss02 = "07xz0iayqk2hqalmrj8c7kp8b80d6qgazrxwvs22y8nymignzq2s"; + sgr-iosevka-ss03 = "0skq1kqmkwhs9d1p0lpksxqdgvpjz2krlfqa7idq1sdykpwsvmhi"; + sgr-iosevka-ss04 = "0cgjh4c3vmmcgb43g0l2dmwcwnwwwqkrr80b9rsbrx43v6lkavda"; + sgr-iosevka-ss05 = "16y8rm0byaf2xqh31h4vfan6il2m98a225nv3vsb7f42ga185vw0"; + sgr-iosevka-ss06 = "0v9nd1h0gzgwa5sw9lrxvd5g77y9wn3fqsw86ivpsqn1vmgpqrzq"; + sgr-iosevka-ss07 = "1h49qx02kn683ax3vh090r7fwlq7ya802zywcws2b9h2hs6p799x"; + sgr-iosevka-ss08 = "1zk08x7chnj1ach4ghh26kr9kndzlgzzsrrw9aa3f0s7qk1lx2yg"; + sgr-iosevka-ss09 = "12mrzd7viia71r9ixw1bzsqfaycxpl8zf20qv83ndbjsgzxh9ary"; + sgr-iosevka-ss10 = "1cq8ii94jdskd0p5g2iigprbzzs3qnjxj7m2rkhl8mricwxdxxs4"; + sgr-iosevka-ss11 = "1wmzaqcy0xy831010fsdhlm3aly2j01j7z10ka83ga3h8ymg1wla"; + sgr-iosevka-ss12 = "00xfyvf50ykippnr1cfxy17s0k0gqkgx61vf7x9dmsgl2y6qigpl"; + sgr-iosevka-ss13 = "0ynmx67c96qslzggjign8g3q7k11ny0mdrdwa7zwi2p0mm61n2jd"; + sgr-iosevka-ss14 = "19s3a6csc4wq4cjjc2qll8fv00hmzsp5z7hwaq09wls8swz5kmmq"; + sgr-iosevka-ss15 = "0d8ljkjcf0y263lwpnlh07305k6xlznk9gysk63dhcyxv0ajhrq1"; + sgr-iosevka-ss16 = "12jbanrv31zxkh5a3a4w2wv0gqvj03mcs7v0zpnylp8jgfmpf8qa"; + sgr-iosevka-ss17 = "1p088x66grn9bs4k1y6mxb0ka4y4vm74v6nbm74qsarjbyc0kx0a"; + sgr-iosevka-ss18 = "0ff8lnhhgknj2sq40fkx7pqmiklnjl9ryjrnjcjviwzvs2dgzbmh"; + sgr-iosevka-term = "0ny2p3hmzwbmzwxr8k1hbv0r3fqwngnz6kind1p3yddrqz8l5rrz"; + sgr-iosevka-term-curly = "0qdys5q9fw273q58yvs71kqhal2mrh1400kf33mjp80pm1dy0j5j"; + sgr-iosevka-term-curly-slab = "1bfn60arcb78lllf1lpdi2gscazvy3k9irp3ik0x12qdf9jgzgw0"; + sgr-iosevka-term-slab = "1grdywa132zl3m5vf7w47lq7wgk6p5n8nab6rgg7pim839f1cn9q"; + sgr-iosevka-term-ss01 = "14an4f8gm741zz22g854zxbfys2z33sf20kjrlzdp239376k72b7"; + sgr-iosevka-term-ss02 = "0lqzcn4ykvkvylnlp4c1cfcl72hy3i18q15zng79d8v439w7cbds"; + sgr-iosevka-term-ss03 = "0kmfmdv5rvfgm8p85dcqb28fsmkwsrgpjkjh1n787nvd2vs96l23"; + sgr-iosevka-term-ss04 = "0p6hspr95p8hxas05rgp2dq00425i7nnz3nbyfrv4mnjzj66ir60"; + sgr-iosevka-term-ss05 = "0izgz7rgjivzzvqywj3d2gma2sh83nhvc4scb7x3cbwwkzg9m5jx"; + sgr-iosevka-term-ss06 = "0syp2mqnqq2gs4zsa3vvx0yz7pa23s995jc8sjrh01la6kpdk332"; + sgr-iosevka-term-ss07 = "0dzfrw30aych0a0ic643w11ww42rncgyzvm5fkgqnkj1zjsdpgsw"; + sgr-iosevka-term-ss08 = "0d9b2rwcdpwbdlsyjcd3qd0pip9km4hg9ihjymsi3xj7bihd0wp5"; + sgr-iosevka-term-ss09 = "06bbj7c99wpjfh7ib7990nayxvbwy69ijlrjbi2mj45pm5i5lswq"; + sgr-iosevka-term-ss10 = "1i6cfzgbnga999851k7gg6b5awq1i9253fz8sngsb6b34c45zw5c"; + sgr-iosevka-term-ss11 = "1jb4lg0cjwv8xvhc5j9qp921zawgp2say6dnj6zncv0ys0rs6qwm"; + sgr-iosevka-term-ss12 = "01w3vj7pw0714r6xp4rq5rlirch9h2d22mk76hsnqb0igzhlkvhy"; + sgr-iosevka-term-ss13 = "0ywjr4j31v31z1cvvz7jvn7mcj2zhdpgljmvsfvix1j26cy5lr95"; + sgr-iosevka-term-ss14 = "1cxsxriayzvrxzr3i6k6dwq08ywl9dk78iz4jqgy5jvrh942km0w"; + sgr-iosevka-term-ss15 = "0j6rvsww2783hrdca3hfvv02s2whswwld7icf0bijdb3p799qi6w"; + sgr-iosevka-term-ss16 = "0hgi40g030s1ylnp1whxz47wg2lzzqwhblx894dzz7rpnwbgff38"; + sgr-iosevka-term-ss17 = "0hbdhc3z75n814r2xffnw6lnkwc31p0fmrvsan3z0db35c5kz54i"; + sgr-iosevka-term-ss18 = "18c3i4l4j9wi7rx191hzmhlc8zblyqpx7bhq9g2lxs9asp8svqsa"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix index 0d3944b2da..df5569f537 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix @@ -1,10 +1,9 @@ { lib, stdenvNoCC, texlive }: -stdenvNoCC.mkDerivation { - pname = "iwona"; - version = "0.995b"; +stdenvNoCC.mkDerivation rec { + inherit (src) pname version; - src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs); + src = texlive.pkgs.iwona; installPhase = '' runHook preInstall @@ -20,7 +19,7 @@ stdenvNoCC.mkDerivation { # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website - license = licenses.lppl13c; + license = src.meta.license; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix index 4e42cf1c41..88ef4e588c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "1.003"; + version = "2.200"; - src = fetchFromGitHub { - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; - hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + src = fetchzip { + url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; + hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall - local out_ttf=$out/share/fonts/junicode-ttf - mkdir -p $out_ttf - cp legacy/*.ttf $out_ttf + install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf + install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf + install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2 + + install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix index b42316dc02..4ca0673605 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { description = "Fallback font of last resort"; homepage = "https://github.com/unicode-org/last-resort-font"; license = licenses.ofl; - maintainers = with maintainers; [ V ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix index 5bc4b86c8a..2fc6731b85 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.105"; + version = "1.106"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-rufBz5u6dV91oD211JuCUP2Km3RoFwkZ1OhRxyoGxpQ="; + hash = "sha256-AXEOoU9gvml1bqjPTYV+mmhVGLG4R6mH8e/h3wQgySo="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix index 65045dc6d2..cd15891f2f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.300"; + version = "1.311"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-pPN8siF/8D78sEcXoF+vZ4BIeYWyXAuk4HBQJP+G3O8="; + hash = "sha256-R7j6SBWGbkS4cJI1J8M5NDIDeJDFMjtXZnGiyxm2rjg="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix index 25923f3cfc..1a6537a009 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.2.96"; + version = "7.3.67"; src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM="; + sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ="; sparseCheckout = [ "fonts" ]; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 79288cb5f4..fee51ebacf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -35,13 +35,13 @@ rec { }: stdenvNoCC.mkDerivation rec { inherit pname; - version = "23.8.1"; + version = "23.11.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-TYCJzioZcNFV8N5wLr7Fo69g/p5GQF/tbGgYoLUV7Us="; + hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; @@ -160,8 +160,8 @@ rec { noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; - version = "2.001"; - sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg="; + version = "2.002"; + sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; }; noto-fonts-color-emoji = @@ -253,9 +253,11 @@ rec { metadata.files; installPhase = '' + runHook preInstall for src in $srcs; do install -D $src $out/share/fonts/noto/$(stripHash $src) done + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json index 2f22a24a34..e9ad1c327f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json @@ -1,7 +1,7 @@ { - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A=" + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-B8XBpYycOYBjrhjlnyiz42YukIoOjGTd3NN3EY00NiQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-Zfwh9q2GrL5Dwp+J/8Ddd2IXCaUXpQ7dE3CqgCMMyPs=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-/O5b2DzM8g97NAdJgIC/RsQ7E5P7USKq7TXyDuUE3WQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-vrjB8GlhzWAe6jG/Srpy8R431VivNtWbCa5Uh4ATnmU=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-EbnZt8h4Lcl0yJoOKmXlF1nfcP5hZv7n4cEQ10yBkcg=" } diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.json b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.json index 66b0292906..c729634b9e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.json +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.json @@ -13,18 +13,18 @@ "subsets": [ "emoji" ], - "version": "v46", - "lastModified": "2023-09-07", + "version": "v47", + "lastModified": "2023-09-27", "files": { - "300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", - "regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", - "500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", - "600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", - "700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" + "300": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", + "regular": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", + "500": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", + "600": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", + "700": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" }, "category": "sans-serif", "kind": "webfonts#webfont", - "menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" + "menu": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" } ] } diff --git a/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix b/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix index 8c4cbd1037..9f62ad8dd4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchzip }: let - version = "1.3.8"; + version = "1.3.9"; mkPretendard = { pname, typeface, hash }: stdenvNoCC.mkDerivation { @@ -35,24 +35,24 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - hash = "sha256-Re4Td9uA8Qn/xv39Bo9i3gShYWQ1mRX44Vyx7/i4xwI="; + hash = "sha256-n7RQApffpL/8ojHcZbdxyanl9Tlc8HP8kxLFBdArUfY="; }; pretendard-gov = mkPretendard { pname = "pretendard-gov"; typeface = "PretendardGOV"; - hash = "sha256-GQv/Ia91QgXZwFX+WdE7aRFUJFWhCMLFY86gu4Ii2w8="; + hash = "sha256-qoDUBOmrk6WPKQgnapThfKC01xWup+HN82hcoIjEe0M="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - hash = "sha256-7OLInF1XUQxyHyb9a0zyfCLZrdcxMTM2QeBe3lwLJ0A="; + hash = "sha256-1nTk1LPoRSfSDgDuGWkcs6RRIY4ZOqDBPMsxezMos6Q="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - hash = "sha256-DCR6KUAblVjhapqMn2p0nzndEJm4OCawGV3nAWZvSBs="; + hash = "sha256-gkYqqxSICmSIrBuPRzBaOlGGM/rJU1z7FiFvu9RhK5s="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index 631904942b..14dc6514e8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.42.1"; + version = "0.42.2"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-e6ig+boWzYiOzENkIsj/z9FFt2pZc+T0dYoFoeONMFM="; + hash = "sha256-RkPHlOPXQiAswtekrOCmYcPNlNSvcqyaM4juSHJxEeY="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix index f01c50b426..d0571fae0b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sil-abyssinica"; - version = "2.200"; + version = "2.201"; src = fetchzip { url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + hash = "sha256-DJWp3T9uBLnztSq9r5YCSWaBjIK/0Aljg1IiU0FLrdE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix index c66d649de1..8364c84f1f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.16"; + version = "1.0.20"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-58gRCEJix9pnZEcoo6bm2zWduP0xXl3WWC6mt36SGuo="; + hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix index 961f846a6c..68b8eae40e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.74"; + version = "0.77"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-WPoqWhCKk2gZ/cdIjvmiNZ95xZ9sqnGzZuw4OEHxtrI="; + hash = "sha256-xnIDCuCUP8ErUsWTJedWpy4lo77Ji+FO2vO9BRDAmV0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix index 7784f4ac8c..7f2e9a1b15 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.02"; + version = "15.1.04"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-fmhm74zc6wJK2f5XkDq/BRc5Lv+rCvcDRodgHCSiUQA="; + hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-cCDXjSbpCe1U+Fx/xH/9NXWg6bkdRBV5AawFR0NyOHM="; + hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 33ed947ae6..e7820a8584 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.02"; + version = "15.1.04"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-OTIwWA2p+7ldqEB5O6J18zU5RVoswC0t1G72fFeCKpU="; + hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix b/third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix index 74aedaa378..e26a32b159 100644 --- a/third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/hackneyed/default.nix @@ -1,29 +1,41 @@ -{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: +{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; }; - buildInputs = [ imagemagick6 inkscape xcursorgen ]; + nativeBuildInputs = [ imagemagick inkscape xcursorgen ]; postPatch = '' patchShebangs *.sh - substituteInPlace make-png.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape ''; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "INKSCAPE=inkscape" + "INSTALL=install" + "PREFIX=$(out)" + "VERBOSE=1" + "XCURSORGEN=xcursorgen" + ]; + buildFlags = [ "theme" "theme.left" ]; + # The Makefile declares a dependency on the value of $(INKSCAPE) for some reason; + # it's unnecessary for building though. + prePatch = '' + substituteInPlace GNUmakefile \ + --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' + ''; + meta = with lib; { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1b6be1d9bb..a5e65ed344 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.09.11"; + version = "23.10.09"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-9GTNE9Gt+dxdfOLD0Qv1utSkwigalAPxixGSC5Nj8XM="; + sha256 = "sha256-H5zkBV8WV03mPKAq0IqFXv/O2qE3zT9UJJMo4tt1Agc="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 395fd1ed31..0868f1c159 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.09.11"; + version = "23.10.09"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-YipdEvmQnqiuxheYS+y5t37uonzr/nH54PVLm4xp31E="; + sha256 = "sha256-NAvgrD0ckAC0vpF7BkEVWGmsuoWeMuSOdp2c9wEzv4s="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix new file mode 100644 index 0000000000..b636bba4a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, jdupes +, adwaita-icon-theme +, hicolor-icon-theme +, numix-icon-theme-circle +, gitUpdater +, allColorVariants ? false +, colorVariants ? [] +}: + +let + pname = "reversal-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2023-05-13"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = pname; + rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; + hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + adwaita-icon-theme + hicolor-icon-theme + numix-icon-theme-circle + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install many small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + + name= ./install.sh \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + -d $out/share/icons + + rm $out/share/icons/*/{AUTHORS,COPYING} + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A colorful Design Rectangle icon theme"; + homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix b/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix index 3f7aa63526..17a6d31b8a 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.11"; + version = "1.0.14"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-ECrRWWS/Am0lfCIJw/BVZg53oLw79Im8d8KgAYxE+pw="; + hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix index 6e32d09dac..9b1043467f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchFromGitHub , adwaita-icon-theme -, libsForQt5 +, breeze-icons , gtk3 , hicolor-icon-theme , jdupes @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-25"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "nob0Isx785YRP4QIj2CK+v99CUiRwtkge1dNXCCwaDs="; + hash = "sha256-il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + breeze-icons hicolor-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix index b94137ccf4..b344ca0d4a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230912"; + version = "20231012"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-MyNlgsa+8OS7vkMq74KKmUVzBhmDpF4ED2Xdgl3GIS4="; + sha256 = "sha256-KXmHaoIZ01M6Nu2LlVgTZarUp+5VPpLfnkc7d/Xl4z0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix index 8774f812ec..eefd161632 100644 --- a/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-10"; + version = "2023-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-PQn8dyx4l3r7N52rv/Woth6J61+WvVL+SHKMkVVtFsw="; + hash = "sha256-Nyje7hf5UdCMHbqZoLpHclDDa4pz+BAyqJcsmPBfSG8="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 52e6c59285..7574c16cba 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230911"; + version = "20231004"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-3lGzQ95ZS9yr9dX+wCTmX6Q+IsbMCfBa4zhcyxsG4+w="; + sha256 = "sha256-C/FqLczkQ9thoAdBI2aDDKgp5ByTWVOJ9bcD9ICqyFM="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 55df79358b..cbfd42dfc8 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "ad59313651a92d9b7356f616268c7a3d80f52886", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz", - "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc", - "msg": "Update from Hackage at 2023-09-13T23:29:30Z" + "commit": "49d09494dd24eae895fe1260e2c26157f740e451", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", + "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", + "msg": "Update from Hackage at 2023-10-21T19:49:07Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix index 24fbeb0b0e..a44a382c4b 100644 --- a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; + sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 197793db6c..8de13f2eaf 100644 --- a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "dev" ]; @@ -23,9 +23,15 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; + sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; }; + patches = [ + # Submitted upstream at + # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 + ./fix-clang-warnings.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch new file mode 100644 index 0000000000..2d185549c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 1780c44..7998a51 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include ')) + + + if get_option('build-translations') +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba06..4ca6d06 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) diff --git a/third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix b/third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix index 55ba01c615..900e5ef86c 100644 --- a/third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/sing-geosite/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , substituteAll , v2ray-domain-list-community @@ -11,7 +11,7 @@ let geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; }; in -buildGoModule rec { +buildGo120Module { pname = "sing-geosite"; inherit (v2ray-domain-list-community) version; diff --git a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index 44b5e7423d..e20872482d 100644 --- a/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.21"; + version = "3.22"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-dv8aC4giD0JqaYN19eCHzEbmwXhqX+ZrKrwit9tzf5Y="; + hash = "sha256-ZADijP8TKMSXJApY7pVTJoqsEPPL8PX7dUFJHFX5utw="; }; # List of file formats to package. diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8fe5f108fa..40cce28dc5 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230926092720"; + version = "20231031055637"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-S6bd8C9TuKj/FaTmMyCcEVi/4LBgseWWxr/XlEhc45Y="; + hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k="; }; - vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; + vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 5dbaa6c9c9..fb9064a437 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -8,18 +8,18 @@ }: let - generator = pkgsBuildBuild.buildGoModule { + generator = pkgsBuildBuild.buildGo120Module { pname = "v2ray-geoip"; - version = "unstable-2023-03-27"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9321a7f5e301a957228eba44845144b4555b6658"; - hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs="; + rev = "3182dda7b38c900f28505b91a44b09ec486e6f36"; + hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM="; }; - vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc="; + vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc="; meta = with lib; { description = "GeoIP for V2Ray"; diff --git a/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix index 205fcabc71..646f4ae491 100644 --- a/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rgb"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; - sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; + url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${finalAttrs.version}.tar.xz"; + hash = "sha256-/APX9W5bKmF2aBZ/iSeUjM5U+TCX58zZ8FYHf0ee03s="; }; nativeBuildInputs = [ pkg-config ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "X11 colorname to RGB mapping database"; license = licenses.mit; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = "https://xorg.freedesktop.org/"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix index 5191199e64..abe1ea4cea 100644 --- a/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix +++ b/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # we can't use fetchurl since stdenv does not handle unpacking *.zip's by default. src = fetchzip { - # Linked on http://www.schristiancollins.com/generaluser.php: + # Linked on https://www.schristiancollins.com/generaluser.php: url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits"; - homepage = "http://www.schristiancollins.com/generaluser.php"; + homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; maintainers = with maintainers; [ ckie ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix index 10356feed6..d5ff1d0018 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/default.nix @@ -7,7 +7,7 @@ # reference ./shas.nix for available themes selected_themes ? [], }: let - version = "2020-12-28"; + version = "1.0"; # this file is generated via ./update.sh # borrowed from pkgs/data/fonts/nerdfonts themeShas = import ./shas.nix; diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix index cb128478cd..51a7178f09 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix @@ -1,322 +1,322 @@ { "abstract_ring" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz"; - sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring.tar.gz"; + sha = "0hfrzm974nm8f237vzlyjjh4pikva3n7fqr1p7jmx04g857g4rjq"; }; "abstract_ring_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz"; - sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring_alt.tar.gz"; + sha = "0gx6l6w9d9z6am3x99igp6v1kykpwd39sjhalfsl21x1ah2cfmbh"; }; "alienware" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz"; - sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/alienware.tar.gz"; + sha = "0pq9zdhdz5vg97zfzsj9kh63szsm9qww2j7bgp2w4z6pg42xcswh"; }; "angular" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz"; - sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular.tar.gz"; + sha = "15rsljiv1nhgcsgjiwsb2jiwah1ghxa95dbj3hlddx8d337nxljc"; }; "angular_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz"; - sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular_alt.tar.gz"; + sha = "12v4d7yjd81vch6cm2jphkb24gnc5d2kncfi4lsan6vhamija49f"; }; "black_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz"; - sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/black_hud.tar.gz"; + sha = "07iy216xij19m6jy76z2rafmjm8mv4k7mwpp145xayz52zhs66s8"; }; "blockchain" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz"; - sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/blockchain.tar.gz"; + sha = "1w0hz1fyj4p9qxwdhib9c7gxx582wb9fz2dyd77l9xqjkps78fjx"; }; "circle" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz"; - sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle.tar.gz"; + sha = "16xrz3v85kpxc4palm8flc7lhscfl6psm1dz999r802yivxl5ikg"; }; "circle_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz"; - sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_alt.tar.gz"; + sha = "0hsia8rq059kyxrnikr6brwmg7pa5kbm3j9gj4ky1a83dwpx18lg"; }; "circle_flow" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz"; - sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_flow.tar.gz"; + sha = "109m9hdirrr9a6gxgqpq80yz0lx4s7bv7nihdfjzg7rhl0icgw93"; }; "circle_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz"; - sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_hud.tar.gz"; + sha = "1xmc30z5k583zrknx2g7rmq41vw9chyxhdacpxvxzyvnp0828z0j"; }; "circuit" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz"; - sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circuit.tar.gz"; + sha = "0linpkxhx01v7q2s3c7z8py0h697z7a4jhwbs2gp47p2923xggij"; }; "colorful" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz"; - sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful.tar.gz"; + sha = "0m89prph31a0r0rxax989n72wdk3d5ywl8h3lygas8k7g908xr3p"; }; "colorful_loop" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz"; - sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_loop.tar.gz"; + sha = "0nbdh6v8zn1xxm44sgr1904wik8pv0yrqjg84dym10k7hvfnb1af"; }; "colorful_sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz"; - sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_sliced.tar.gz"; + sha = "1yadpyiwiixxily7wzhd8myxnrvhzdc9m6lj7g4ll3hlwygw7rz1"; }; "connect" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz"; - sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/connect.tar.gz"; + sha = "0gwd27vlr23zbf0mw34gd55f3s32a70q1s03z36dsf01bbyrvwz5"; }; "cross_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz"; - sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cross_hud.tar.gz"; + sha = "1j79c99n3r94vrf6f8n2a42jjfywaf7vf6q34awdqcl188hc3qzi"; }; "cubes" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz"; - sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cubes.tar.gz"; + sha = "11r6q9f4vz64rxz8wshhhpyp7knwn2klw50z98bn3qbmwl3zfh8c"; }; "cuts" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz"; - sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts.tar.gz"; + sha = "1bf8yrwha2bibnpf8abc0bxsj0g9sg3m1fpagxcpr61m0cl4i3vq"; }; "cuts_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz"; - sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts_alt.tar.gz"; + sha = "00yrhfnfnmirzij5wd592cfn90crw3774a6wdxq4s538wrpmzhik"; }; "cyanide" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz"; - sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cyanide.tar.gz"; + sha = "0bbrqg77m0655l9x90334b8yn60kni062p17h4rf6kp9qbi86gg0"; }; "cybernetic" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz"; - sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cybernetic.tar.gz"; + sha = "0chk52pfl81npffda6hy1pag6n8l5ssq61mc0qaa4nqfwpyvqqvw"; }; "dark_planet" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz"; - sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dark_planet.tar.gz"; + sha = "1bbwdzgmvrdxkd379r1w2rkl0r5ixlh56xn59c47bmfbjl19927d"; }; "darth_vader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz"; - sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/darth_vader.tar.gz"; + sha = "1czq929j87zila0v49kikjqdw8bmssmn5cp573i3qb9kry5xdlm7"; }; "deus_ex" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz"; - sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/deus_ex.tar.gz"; + sha = "1la8rlvy9gh593vx2w9wjq2hmsp58fd2gx9l9g2222mmzpk1hmcc"; }; "dna" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz"; - sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dna.tar.gz"; + sha = "1mkq23khwsbnz8spf00amk48fx5vnk3rpzapx37rpx1klgxpm89q"; }; "double" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz"; - sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/double.tar.gz"; + sha = "11grxa2wblii4yxxrwfbbmwlwk26sm6mw9y00wfadijx2iyx30i1"; }; "dragon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz"; - sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dragon.tar.gz"; + sha = "1hlvr2s8zhlf8mg9pskwby94kh15g8icxn3833cdqqhmgvc0d7l5"; }; "flame" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz"; - sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/flame.tar.gz"; + sha = "1yszmhmmjgdkjvqpij3gjwz8vxjhmklf7clbpz947254zgwxyn5g"; }; "glitch" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz"; - sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glitch.tar.gz"; + sha = "15gwhfnrn0p80wdaymnlvrcig5cjb4m5qz56hbhg4jdwcjdlppbd"; }; "glowing" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz"; - sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glowing.tar.gz"; + sha = "09h7dn805lrg04j5lp30l3qc6kb8xxilibdg0pxfadwyljblwl1f"; }; "green_blocks" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz"; - sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_blocks.tar.gz"; + sha = "09xx5fbnby567s9s8hmryalm9k9vs520lymiprw06nig49rmy4v2"; }; "green_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz"; - sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_loader.tar.gz"; + sha = "09vw6c9albsv28y4bdlp54csq5bl0vrd20yjph00jxhvhizffk3k"; }; "hexagon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz"; - sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon.tar.gz"; + sha = "17api8ndiqjxyj7prxz0bv1dpq0h0wvphnll4lb2dlhxp61bjmj3"; }; "hexagon_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz"; - sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_2.tar.gz"; + sha = "030yr5nb6q7bw1f1dh9kcdmd87x25f1fn60v45vmk7k07y1s10c8"; }; "hexagon_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz"; - sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_alt.tar.gz"; + sha = "1f6i8signlscp0av3kcmdw0xm13pf2dy2lz3c6wq9d9203ibry1p"; }; "hexagon_dots" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz"; - sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots.tar.gz"; + sha = "13mi9f8saw9zk8zdxp003ipigyd4y26iydn0pd1c0vr5fbz483rq"; }; "hexagon_dots_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz"; - sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots_alt.tar.gz"; + sha = "1gkzh5i84cwv64f3r8rgpzyj8h1kpn92m4syf67kn5sdhqykvqkz"; }; "hexagon_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz"; - sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_hud.tar.gz"; + sha = "17k5378fsydvcps9rxd117rfqlijnrsj1ggyqx445a5yrwy6rx55"; }; "hexagon_red" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz"; - sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_red.tar.gz"; + sha = "0x8i1k54qff7agwq9gqi2z59lww8qglck105bv87ylgy5z6150sx"; }; "hexa_retro" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz"; - sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexa_retro.tar.gz"; + sha = "0bwx2nvvr6bkqnmnv2kh9slbi11lv0h3hnzql99d9llr3vlid5ip"; }; "hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz"; - sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud.tar.gz"; + sha = "0zng0rn4lacxf9v1azndzv5v7pl84f0amschccdlnymilyy564ck"; }; "hud_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz"; - sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_2.tar.gz"; + sha = "14ldw37gpysnw3k1cssh8q1hgxnrh954pgq5x5xhrlv2w6rsbfzq"; }; "hud_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz"; - sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_3.tar.gz"; + sha = "0lc3x51gjfc58y45yzfnpy2i07vk9vdzbjl5yawv3wh97jy5x6x7"; }; "hud_space" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz"; - sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_space.tar.gz"; + sha = "13ipj1l737bs9rnhh5vviq6bm5hdghpyq6s5hc1fhg2cgldfnq0i"; }; "ibm" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz"; - sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ibm.tar.gz"; + sha = "0acs1f468xfpsvzy400f8ba7890n3pp69c9b20lb8slamm9l4swd"; }; "infinite_seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz"; - sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/infinite_seal.tar.gz"; + sha = "07g4qmkfc9yqjpbs0yr277ij3pbhc1p51gzpnnbc3viwm1zzrs6p"; }; "ironman" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz"; - sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ironman.tar.gz"; + sha = "0w5z22529jrgd2ab7fqibm2sd57740qxyqqrzhyvgd4l5axn1yzd"; }; "liquid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz"; - sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/liquid.tar.gz"; + sha = "01lwzb2yid7hb1f2nc0jycll9kvq89jcz7s7w81vqirx4by8p8n8"; }; "loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz"; - sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader.tar.gz"; + sha = "0vx66kb56n6dy74k6yjk5w8apc8q1hmr8mrpgl420lzdqm4ggrgz"; }; "loader_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz"; - sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_2.tar.gz"; + sha = "0rir3gfi8bq4m8s0xhbd2ppny6q60b42wq9vs826axk2g58jczrw"; }; "loader_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz"; - sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_alt.tar.gz"; + sha = "0pfg304xmgc46ai9d5m51p05i7zbvhfzfsscn7yk6kiw09b21fpz"; }; "lone" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz"; - sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/lone.tar.gz"; + sha = "0xx959215w8qcpbzn9w3ip4shq3ib7dcni43z4m9jwa28aa3v7y8"; }; "metal_ball" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz"; - sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/metal_ball.tar.gz"; + sha = "18nbikv736yd1q4qf9nq0fzspmxlkq1z6kl0jzady8ifkny1kvlw"; }; "motion" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz"; - sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/motion.tar.gz"; + sha = "0nbvgsgkpkdx83v45fb4z6ywiz3cpdmbsx8jcxhaa0cpywvq40bh"; }; "optimus" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz"; - sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/optimus.tar.gz"; + sha = "0zxv3b21mxkl0dvhs6nzd94vlsphc8h1zzvkcgng6cqg9n1c206p"; }; "owl" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz"; - sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/owl.tar.gz"; + sha = "1ylkpydmy65xilqzkdps18kr0yyqggkxaysmmik3sz01qs6xjrz6"; }; "pie" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz"; - sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pie.tar.gz"; + sha = "1x834k0qsa8c7z3ds0vk6cw2r1f4ydmyk8yz1hdw8lxys17n9rj8"; }; "pixels" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz"; - sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pixels.tar.gz"; + sha = "072ag60r2n3jjj64r1nzsj5p97gjcfrvd72axm1z741rz5xaigki"; }; "polaroid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz"; - sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/polaroid.tar.gz"; + sha = "0m748kj5qps9vwwww44i1lj64r0mg0hqnfkg7dhqrf7nl0saw4da"; }; "red_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz"; - sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/red_loader.tar.gz"; + sha = "18vvlknnp3kiviacmp0cbmagrqzbhli6qv6vbzw362cv2mxhid85"; }; "rings" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz"; - sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings.tar.gz"; + sha = "0xhwnxr5hcxqr64vr45lkvwzbbcpzxfbdlad006r16m480ncripw"; }; "rings_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz"; - sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings_2.tar.gz"; + sha = "0vdjby6kyazxy042ljyv59pg4zfsvzzssf20w4r7ircfyiqypajs"; }; "rog" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz"; - sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog.tar.gz"; + sha = "0az3vxndzym39w7357mmr6zyzfy32pg036v6jim895z10093b0y0"; }; "rog_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz"; - sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog_2.tar.gz"; + sha = "13yfqb06ihzma80lfsb0mlsaq0j6qakqx607pr5rmhl6765bz116"; }; "seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz"; - sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal.tar.gz"; + sha = "14k98v41ng3had7n6q1z513yc53zzkji7gm4n2jpjj5rd1jd2xr8"; }; "seal_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz"; - sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_2.tar.gz"; + sha = "0kwn7njj7anci9ihf8aqs7k7qv2vsnqc81sj5db672qn4hxpy50v"; }; "seal_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz"; - sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_3.tar.gz"; + sha = "0pjqq7qlmb0mf0xnm001b1f5jcbfzd3a3hzsf0jysacb5wmpzspp"; }; "sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz"; - sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sliced.tar.gz"; + sha = "1xrlhg1glykj73x9spq609y4ygfy3xw4azk3npjfh3ky5l0jqxjg"; }; "sphere" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz"; - sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sphere.tar.gz"; + sha = "1nav61fr7wba1vbas8wci3fpyx0pidgiv9wm4zxdrw7hqw8akkpn"; }; "spin" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz"; - sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spin.tar.gz"; + sha = "1yb39jmvifb1ijh5i804d06c97samhf8w4p0w1xwxq29j6ihsvw9"; }; "spinner_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz"; - sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spinner_alt.tar.gz"; + sha = "136nhpxlc2kar9jwz4pdxpg30b66n7bqy5mk9lm4v90pwf5m3kbs"; }; "splash" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz"; - sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/splash.tar.gz"; + sha = "1wnmqqm07yrbd5ha31dd2iihmrjr555hd8fgra9fy9zh2pw9wgf2"; }; "square" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz"; - sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square.tar.gz"; + sha = "1wkixypxchsi11d8qfackcbvcjhifys9xlsc61rd7hfgz2nwjmww"; }; "square_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz"; - sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square_hud.tar.gz"; + sha = "13bbzxv4gq66z0h801m8fi3n2rk41212nhapa5xb3xgh7v23my04"; }; "target" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz"; - sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target.tar.gz"; + sha = "0vk8abdxhs93bj9l21db2ai7w945z472rwwn1m4070vrhs2fvzn4"; }; "target_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz"; - sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target_2.tar.gz"; + sha = "0n6f1lnmry5zv3y592gp0r2rn297h806zhcgd7yfp0z2zgay67nz"; }; "tech_a" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz"; - sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_a.tar.gz"; + sha = "13gdq6h3m7skryr95vi0a30ylrapxg1nkc8cv8vn025gj6bafa83"; }; "tech_b" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz"; - sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_b.tar.gz"; + sha = "1l383plabzlkccqjhf8x02jskykr4wkj2wy6knk9kg6qrq8w870l"; }; "unrap" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz"; - sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/unrap.tar.gz"; + sha = "0571pvnhmny9642rfg7sw6csrz7bka2424zfryg858c0hg6aqrnk"; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh index 82eb991655..0fe5db726b 100755 --- a/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh +++ b/third_party/nixpkgs/pkgs/data/themes/adi1090x-plymouth-themes/update.sh @@ -8,27 +8,21 @@ curl_args=( '--silent' ) # optionally takes a GITHUB_TOKEN to overcome api rate limiting. if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi -# get last master ref -curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master ) -last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' ) - -unset curl_args[-1] -curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 ) - -theme_archives=$(curl "${curl_args[@]}" \ - | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)') +# get latest release assets +curl_args+=( --url https://api.github.com/repos/adi1090x/plymouth-themes/releases/latest ) +theme_archives=$(curl "${curl_args[@]}" | jq -r '.assets' ) dirname="$(dirname "$0")" printf '{\n' > "$dirname/shas.nix" -repo_url="https://github.com/adi1090x/files/raw/$last_ref" - while read -r file_path do - name=$(basename $file_path) - printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix" -done < <(jq -r '.[]' <<<"$theme_archives") + name="$(basename $file_path)" + name="${name/.tar.gz/}" + + printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name}" "$file_path" "$(nix-prefetch-url "$file_path")" >>"$dirname/shas.nix" +done < <(jq -r '.[].browser_download_url' <<<"$theme_archives") printf '}\n' >> "$dirname/shas.nix" diff --git a/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix index 27811203c8..79dcc88a6f 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.9"; + version = "5.1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg="; + sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix new file mode 100644 index 0000000000..203b260e25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, stdenvNoCC +, ... }: + +stdenvNoCC.mkDerivation (self: { + name = "alacritty-theme"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "alacritty"; + repo = "alacritty-theme"; + rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928"; + hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0="; + }; + + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + + sourceRoot = "${self.src.name}/themes"; + installPhase = '' + runHook preInstall + install -Dt $out *.yaml + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Collection of Alacritty color schemes"; + homepage = "https://alacritty.org/"; + license = licenses.asl20; + maintainers = [ maintainers.nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin/default.nix new file mode 100644 index 0000000000..59e030eb9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin/default.nix @@ -0,0 +1,189 @@ +let + validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; +in +{ fetchFromGitHub +, lib +, stdenvNoCC +, accent ? "blue" +, variant ? "macchiato" +, themeList ? validThemes +}: +let + pname = "catppuccin"; + + validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ]; + validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; + + selectedSources = map (themeName: builtins.getAttr themeName sources) themeList; + sources = { + bat = fetchFromGitHub { + name = "bat"; + owner = "catppuccin"; + repo = "bat"; + rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + + bottom = fetchFromGitHub { + name = "bottom"; + owner = "catppuccin"; + repo = "bottom"; + rev = "c0efe9025f62f618a407999d89b04a231ba99c92"; + hash = "sha256-VaHX2I/Gn82wJWzybpWNqU3dPi3206xItOlt0iF6VVQ="; + }; + + btop = fetchFromGitHub { + name = "btop"; + owner = "catppuccin"; + repo = "btop"; + rev = "1.0.0"; + hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk="; + }; + + hyprland = fetchFromGitHub { + name = "hyprland"; + owner = "catppuccin"; + repo = "hyprland"; + rev = "v1.2"; + hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8="; + }; + + k9s = fetchFromGitHub { + name = "k9s"; + owner = "catppuccin"; + repo = "k9s"; + rev = "516f44dd1a6680357cb30d96f7e656b653aa5059"; + hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA="; + }; + + kvantum = fetchFromGitHub { + name = "kvantum"; + owner = "catppuccin"; + repo = "Kvantum"; + rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; + sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + }; + + lazygit = fetchFromGitHub { + name = "lazygit"; + owner = "catppuccin"; + repo = "lazygit"; + rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8"; + hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U="; + }; + + plymouth = fetchFromGitHub { + name = "plymouth"; + owner = "catppuccin"; + repo = "plymouth"; + rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c"; + hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; + }; + + refind = fetchFromGitHub { + name = "refind"; + owner = "catppuccin"; + repo = "refind"; + rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5"; + hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso="; + }; + + rofi = fetchFromGitHub { + name = "rofi"; + owner = "catppuccin"; + repo = "rofi"; + rev = "5350da41a11814f950c3354f090b90d4674a95ce"; + hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; + }; + + waybar = fetchFromGitHub { + name = "waybar"; + owner = "catppuccin"; + repo = "waybar"; + rev = "v1.0"; + hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw="; + }; + }; +in +lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] +lib.checkListOfEnum "${pname}: accent" validAccents [ accent ] +lib.checkListOfEnum "${pname}: themes" validThemes themeList + +stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2023-10-09"; + + srcs = selectedSources; + + unpackPhase = '' + for s in $selectedSources; do + b=$(basename $s) + cp $s ''${b#*-} + done + ''; + + installPhase = '' + runHook preInstall + + local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}") + local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}") + + '' + lib.optionalString (lib.elem "bat" themeList) '' + mkdir -p $out/bat + cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/" + + '' + lib.optionalString (lib.elem "btop" themeList) '' + mkdir -p $out/btop + cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" + + '' + lib.optionalString (lib.elem "bottom" themeList) '' + mkdir -p $out/bottom + cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + + '' + lib.optionalString (lib.elem "hyprland" themeList) '' + mkdir -p $out/hyprland + cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" + + '' + lib.optionalString (lib.elem "k9s" themeList) '' + mkdir -p $out/k9s + cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/" + + '' + lib.optionalString (lib.elem "kvantum" themeList) '' + mkdir -p $out/share/Kvantum + cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum + + '' + lib.optionalString (lib.elem "lazygit" themeList) '' + mkdir -p $out/lazygit/{themes,themes-mergable} + cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/" + cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/" + + '' + lib.optionalString (lib.elem "plymouth" themeList) '' + mkdir -p $out/share/plymouth/themes/catppuccin-${variant} + cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + + '' + lib.optionalString (lib.elem "rofi" themeList) '' + mkdir -p $out/rofi + cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/ + + '' + lib.optionalString (lib.elem "refind" themeList) '' + mkdir -p $out/refind/assets + cp ${sources.refind}/${variant}.conf $out/refind/ + cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ + + '' + lib.optionalString (lib.elem "waybar" themeList) '' + mkdir -p $out/waybar + cp ${sources.waybar}/${variant}.css $out/waybar/ + + '' + '' + runHook postInstall + ''; + + meta = { + description = "Soothing pastel themes"; + homepage = "https://github.com/catppuccin/catppuccin"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.khaneliman ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix index 6b56064b87..71e7fb9a28 100644 --- a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -23,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-08-12"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; + hash = "sha256-NxIWH3qLW8sEguovAv9wfgnlnmPlTipRJTmMo3rSHNY="; }; nativeBuildInputs = [ @@ -64,8 +63,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; - meta = with lib; { description = "A modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix index 7a8444afbe..61ddd00abd 100644 --- a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20230606"; + version = "20231026"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-NnCRWADyAOR5yyOjB18zSQov+5FfKhhCSkDXBAL80wo="; + hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index 31422625a4..b59b1393c6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString wallpapers '' mkdir -p $out/share/backgrounds - cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/ + cp -a wallpaper/Graphite/*.png $out/share/backgrounds/ ${lib.optionalString (builtins.elem "nord" tweaks) '' cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/ ''} diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 6873cd31f8..16a60de928 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "10.3"; + version = "17.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; + rev = "247f9c539d6eef8ae3a5f59beed42a40b1f10434"; + hash = "sha256-uT7KnpIdxypUqKhXOao3Bz3vJecJKK+GjcAp9biNyHc="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index eccff020ce..d19ed938bf 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-03"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; + sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix index 8d977671fe..16eefee7bb 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -2,119 +2,151 @@ , stdenv , fetchFromGitHub , gtk-engine-murrine +, breeze-icons +, plasma-framework +, plasma-workspace , jdupes }: stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2023-05-12"; + version = "unstable-2023-10-17"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006"; - sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8="; + rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4"; + hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c"; - sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ="; + rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a"; + hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61"; - sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8="; + rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011"; + hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e19b75f56e5c328352c183fc960a0be54e99836e"; - sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE="; + rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9"; + hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c"; - sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM="; + rev = "566e38c40bca86df93d0e9226c33d5d525d34454"; + hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3"; - sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4="; + rev = "b43efee28129634fdefe70f2a03c401efc7dc22f"; + hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f"; - sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI="; + rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66"; + hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0eea9185946fee20b6d7472548226a3652dea7ae"; - sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU="; + rev = "a24b42411d8ea0dc63bf0778e443be251858e586"; + hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM="; name = "Nordic-Polar-standard-buttons"; }) ]; sourceRoot = "."; + outputs = [ "out" "sddm" ]; + nativeBuildInputs = [ jdupes ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontWrapQtApps = true; + installPhase = '' runHook preInstall + # install theme files mkdir -p $out/share/themes cp -a Nordic* $out/share/themes + + # remove uneeded files rm -r $out/share/themes/*/.gitignore rm -r $out/share/themes/*/Art + rm -r $out/share/themes/*/FUNDING.yml rm -r $out/share/themes/*/LICENSE rm -r $out/share/themes/*/README.md rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js} rm -r $out/share/themes/*/src rm -r $out/share/themes/*/cinnamon/*.scss - rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} + rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} + rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss} rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + # move wallpapers to appropriate directory + mkdir -p $out/share/wallpapers/Nordic + mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/ + rmdir $out/share/themes/Nordic/extras{/wallpapers,} + # move kde related contents to appropriate directories - mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons} mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ - mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ + mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ + + mkdir -p $sddm/share/sddm/themes + mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/ + rm -rf $out/share/themes/Nordic/kde - # Replace duplicate files with hardlinks to the first file in each - # set of duplicates, reducing the installed size in about 65% - jdupes -L -r $out/share + # Replace duplicate files with symbolic links to the first file in + # each set of duplicates, reducing the installed size in about 53% + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${breeze-icons} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + meta = with lib; { description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index 2d07ac3ae3..351c1c2220 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-05-27"; + version = "2023-10-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; + hash = "sha256-GhSzTtbuvbAuXxKNm29sJX5kXE2s2jMDB6Ww6Q7GNSo="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix index a117562174..dc3273e695 100644 --- a/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -1,38 +1,38 @@ { lib -, stdenvNoCC -, fetchFromGitHub +, callPackage +, runCommand , gtk-engine-murrine +, gnome-themes-extra }: -stdenvNoCC.mkDerivation { - pname = "tokyo-night-gtk"; - version = "2023.01.17"; +let + prefix = "tokyo-night-gtk"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; - sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; - }; + packages = lib.mapAttrs' (type: content: { + name = type; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + value = lib.mapAttrs' (variantName: variant: { + name = variantName; + value = callPackage ./generic.nix { inherit prefix type variantName variant; }; + }) content; + }) (lib.importJSON ./variants.json); +in packages // { + # Not using `symlinkJoin` because it's massively inefficient in this case + full = runCommand "${prefix}_full" { + preferLocalBuild = true; - dontBuild = true; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + } '' + mkdir -p $out/share/{icons,themes,${prefix}} - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cp -a themes/* $out/share/themes - runHook postInstall + ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: + '' + ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} + ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true + '' + ))} ''; - - meta = with lib; { - description = "A GTK theme based on the Tokyo Night colour palette."; - homepage = "www.pling.com/p/1681315/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ garaiza-93 ]; - }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix new file mode 100644 index 0000000000..35bf498666 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeScript +, gtk-engine-murrine +, gnome-themes-extra +, prefix ? "" +, type ? "" +, variantName ? "" +, variant ? "" +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${prefix}_${type}-${variantName}"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "e9790345a6231cd6001f1356d578883fac52233a"; + hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{${type},${prefix}} + cp -a ${type}/Tokyonight-${variant} $out/share/${type} + cp -a LICENSE $out/share/${prefix} + + runHook postInstall + ''; + + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts tree jq + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" + + rev="$(echo $res | jq '.sha' --raw-output)" + version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" + update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash + + commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' + commonjq2='reduce inputs as $in (.; . + $in)' + commontree="-dJ -L 1 --noreport ${finalAttrs.src}" + + echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ + $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ + jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ + "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" + ''; + + # For "full" in default.nix + ptype = type; + pvariant = variant; + }; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette"; + homepage = "https://www.pling.com/p/1681315"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ garaiza-93 Madouura ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json new file mode 100644 index 0000000000..6489d9c649 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json @@ -0,0 +1,18 @@ +{ + "icons": { + "dark": "Dark", + "dark-cyan": "Dark-Cyan", + "light": "Light", + "moon": "Moon" + }, + "themes": { + "dark-b": "Dark-B", + "dark-bl": "Dark-BL", + "dark-b-lb": "Dark-B-LB", + "dark-bl-lb": "Dark-BL-LB", + "storm-b": "Storm-B", + "storm-bl": "Storm-BL", + "storm-b-lb": "Storm-B-LB", + "storm-bl-lb": "Storm-BL-LB" + } +} diff --git a/third_party/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix b/third_party/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix new file mode 100644 index 0000000000..4fbb0f5b8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, kdeclarative +, kirigami2 +, plasma-framework +, plasma-workspace +}: + +stdenv.mkDerivation rec { + pname = "utterly-nord-plasma"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0"; + hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8="; + }; + + propagatedUserEnvPkgs = [ + breeze-icons + kdeclarative.bin + kirigami2 + plasma-framework.bin + plasma-workspace + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} + + cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + + cp -a *.colors $out/share/color-schemes/ + + cp -a wallpaper $out/share/wallpapers/Utterly-Nord + + cp -a kvantum $out/share/Kvantum/Utterly-Nord + cp -a kvantum-solid $out/share/Kvantum/Utterly-Nord-Solid + cp -a kvantum-light $out/share/Kvantum/Utterly-Nord-Light + cp -a kvantum-light-solid $out/share/Kvantum/Utterly-Nord-Light-Solid + + cp -a *.colorscheme $out/share/konsole/ + + cp -a sddm $out/share/sddm/themes/Utterly-Nord + + runHook postInstall + ''; + + meta = with lib; { + description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; + homepage = "https://himdek.com/Utterly-Nord-Plasma/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix b/third_party/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix new file mode 100644 index 0000000000..40bdb2f71d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "utterly-round-plasma-style"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "c3677d5223286f69871f6745cdb3b71367229d40"; + hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme} + + cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark + cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid + cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light + cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid + + cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round + cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid + + runHook postInstall + ''; + + meta = with lib; { + description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme"; + homepage = "https://himdek.com/Utterly-Round-Plasma-Style/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix index 518bf72d5b..fb9a63b21f 100644 --- a/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-06-30"; + version = "2023-10-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-ctEaS+zWkmiVoq0WVA3ecHc2rm8LFQC/kqi/KEXAyXw="; + sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/000-openal.patch b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/000-openal.patch deleted file mode 100644 index f8e02a4cb0..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/000-openal.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt ---- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 -+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300 -@@ -362,10 +360,8 @@ - if (EXISTS ${EXTERNAL_SRC_DIR}/git/openal AND STATIC_OPENAL) - amsg("${CL_YEL}Building OpenAL static from external/git mirror${CL_RST}") - ExternalProject_Add(OpenAL -- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal -+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/openal" - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal_static -- UPDATE_COMMAND "" -- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/openal" - ${EXTERNAL_DEFS} - ${CMAKE_EXTERNAL_DEFS} - -DALSOFT_BACKEND_DSOUND=OFF diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch deleted file mode 100644 index eff3c0a5aa..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/001-luajit.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt ---- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 -+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300 -@@ -419,12 +415,7 @@ - set(LUA_TAG "luajit51") - if (EXISTS ${EXTERNAL_SRC_DIR}/git/luajit) - ExternalProject_Add(luajit -- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/luajit -- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/luajit" -- CONFIGURE_COMMAND "" -- GIT_TAG "v2.1.0-beta3" -- UPDATE_COMMAND "" -- INSTALL_COMMAND "" -+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/luajit" - BUILD_IN_SOURCE 1 - BUILD_COMMAND "${EXTMAKE_CMD}" - DEFAULT_CC=${CMAKE_C_COMPILER} diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/002-libuvc.patch b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/002-libuvc.patch deleted file mode 100644 index 48d25fe827..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/002-libuvc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur source-old/src/frameserver/decode/default/CMakeLists.txt source-new/src/frameserver/decode/default/CMakeLists.txt ---- source-old/src/frameserver/decode/default/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 -+++ source-new/src/frameserver/decode/default/CMakeLists.txt 2021-10-29 12:01:31.989933725 -0300 -@@ -62,10 +62,8 @@ - if (STATIC_LIBUVC) - pkg_check_modules(LIBUSB_1 REQUIRED libusb-1.0) - ExternalProject_Add(libuvc -- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/frameserver/decode/libuvc" -+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/libuvc" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libuvc_static" -- UPDATE_COMMAND "" -- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/libuvc" - ${EXTERNAL_DEFS} - ${CMAKE_EXTERNAL_DEFS} - -DBUILD_UVC_STATIC=ON diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix deleted file mode 100644 index bd39c0843a..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchgit, fetchFromGitHub }: -{ - letoram-openal-src = fetchFromGitHub { - owner = "letoram"; - repo = "openal"; - rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; - sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; - }; - freetype-src = fetchgit { - url = "git://git.sv.nongnu.org/freetype/freetype2.git"; - rev = "275b116b40c9d183d42242099ea9ff276985855b"; - sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA="; - }; - libuvc-src = fetchFromGitHub { - owner = "libuvc"; - repo = "libuvc"; - rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916"; - hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI="; - }; - luajit-src = fetchgit { - url = "https://luajit.org/git/luajit-2.0.git"; - rev = "899093a9e0fa5b16f27016381ef4b15529dadff2"; - sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI="; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix index 22c214728f..1a46c693b0 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchgit , SDL2 , cmake , espeak @@ -21,21 +20,21 @@ , libXfixes , libdrm , libffi +, libjpeg , libusb1 , libuvc , libvlc , libvncserver , libxcb , libxkbcommon -, lua5_1 -, luajit , makeWrapper , mesa , mupdf , openal , openjpeg -, pcre +, pcre2 , pkg-config +, ruby , sqlite , tesseract , valgrind @@ -44,28 +43,54 @@ , xcbutil , xcbutilwm , xz -, buildManPages ? true, ruby +, buildManPages ? true , useBuiltinLua ? true -, useStaticFreetype ? false -, useStaticLibuvc ? false +, useEspeak ? !stdenv.isDarwin +, useStaticLibuvc ? true , useStaticOpenAL ? true -, useStaticSqlite ? false +, useStaticSqlite ? true +, useTracy ? true }: let - cmakeFeatureFlag = feature: flag: - "-D${feature}=${if flag then "on" else "off"}"; + allSources = { + letoram-arcan-src = fetchFromGitHub { + owner = "letoram"; + repo = "arcan"; + rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf"; + hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls="; + }; + letoram-openal-src = fetchFromGitHub { + owner = "letoram"; + repo = "openal"; + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; + hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; + }; + libuvc-src = fetchFromGitHub { + owner = "libuvc"; + repo = "libuvc"; + rev = "68d07a00e11d1944e27b7295ee69673239c00b4b"; + hash = "sha256-IdV18mnPTDBODpS1BXl4ulkFyf1PU2ZmuVGNOIdQwzE="; + }; + luajit-src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = "656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48"; + hash = "sha256-/gGQzHgYuWGqGjgpEl18Rbh3Sx2VP+zLlx4N9/hbYLc="; + }; + tracy-src = fetchFromGitHub { + owner = "wolfpld"; + repo = "tracy"; + rev = "93537dff336e0796b01262e8271e4d63bf39f195"; + hash = "sha256-FNB2zTbwk8hMNmhofz9GMts7dvH9phBRVIdgVjRcyQM="; + }; + }; in stdenv.mkDerivation (finalAttrs: { - pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; - version = "0.6.2.1"; + pname = "arcan"; + version = "0.6.2.1-unstable-2023-10-14"; - src = fetchFromGitHub { - owner = "letoram"; - repo = "arcan"; - rev = finalAttrs.version; - hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM="; - }; + src = allSources.letoram-arcan-src; nativeBuildInputs = [ cmake @@ -77,7 +102,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - espeak ffmpeg file freetype @@ -94,19 +118,18 @@ stdenv.mkDerivation (finalAttrs: { libXfixes libdrm libffi + libjpeg libusb1 libuvc libvlc libvncserver libxcb libxkbcommon - lua5_1 - luajit mesa - mupdf.dev + mupdf openal - openjpeg.dev - pcre + openjpeg + pcre2 sqlite tesseract valgrind @@ -115,40 +138,29 @@ stdenv.mkDerivation (finalAttrs: { xcbutil xcbutilwm xz - ]; - - patches = [ - # Nixpkgs-specific: redirect vendoring - ./000-openal.patch - ./001-luajit.patch - ./002-libuvc.patch + ] + ++ lib.optionals useEspeak [ + espeak ]; # Emulate external/git/clone.sh postUnpack = let - inherit (import ./clone-sources.nix { inherit fetchFromGitHub fetchgit; }) - letoram-openal-src freetype-src libuvc-src luajit-src; + inherit (allSources) + letoram-openal-src libuvc-src luajit-src tracy-src; + prepareSource = flag: source: destination: + lib.optionalString flag '' + cp -va ${source}/ ${destination} + chmod --recursive 744 ${destination} + ''; in '' pushd $sourceRoot/external/git/ '' - + (lib.optionalString useStaticOpenAL '' - cp -a ${letoram-openal-src}/ openal - chmod --recursive 744 openal - '') - + (lib.optionalString useStaticFreetype '' - cp -a ${freetype-src}/ freetype - chmod --recursive 744 freetype - '') - + (lib.optionalString useStaticLibuvc '' - cp -a ${libuvc-src}/ libuvc - chmod --recursive 744 libuvc - '') - + (lib.optionalString useBuiltinLua '' - cp -a ${luajit-src}/ luajit - chmod --recursive 744 luajit - '') + - '' + + prepareSource useStaticOpenAL letoram-openal-src "openal" + + prepareSource useStaticLibuvc libuvc-src "libuvc" + + prepareSource useBuiltinLua luajit-src "luajit" + + prepareSource useTracy tracy-src "tracy" + + '' popd ''; @@ -156,11 +168,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./src/platform/posix/paths.c \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/share" - - substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID" + substituteInPlace ./src/CMakeLists.txt \ + --replace "SETUID" "# SETUID" ''; - # INFO: Arcan build scripts require the manpages to be generated before the + # INFO: Arcan build scripts require the manpages to be generated *before* the # `configure` phase preConfigure = lib.optionalString buildManPages '' pushd doc @@ -169,17 +181,15 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DBUILD_PRESET=everything" # The upstream project recommends tagging the distribution - "-DDISTR_TAG=Nixpkgs" - "-DENGINE_BUILDTAG=${finalAttrs.version}" - (cmakeFeatureFlag "HYBRID_SDL" true) - (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua) - (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua) - (cmakeFeatureFlag "STATIC_FREETYPE" useStaticFreetype) - (cmakeFeatureFlag "STATIC_LIBUVC" useStaticLibuvc) - (cmakeFeatureFlag "STATIC_OPENAL" useStaticOpenAL) - (cmakeFeatureFlag "STATIC_SQLite3" useStaticSqlite) + (lib.cmakeFeature "DISTR_TAG" "Nixpkgs") + (lib.cmakeFeature "ENGINE_BUILDTAG" finalAttrs.src.rev) + (lib.cmakeFeature "BUILD_PRESET" "everything") + (lib.cmakeBool "BUILTIN_LUA" useBuiltinLua) + (lib.cmakeBool "DISABLE_JIT" useBuiltinLua) + (lib.cmakeBool "STATIC_LIBUVC" useStaticLibuvc) + (lib.cmakeBool "STATIC_SQLite3" useStaticSqlite) + (lib.cmakeBool "ENABLE_TRACY" useTracy) "../src" ]; @@ -187,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { "format" ]; - meta = with lib; { + meta = { homepage = "https://arcan-fe.com/"; description = "Combined Display Server, Multimedia Framework, Game Engine"; longDescription = '' @@ -196,8 +206,8 @@ stdenv.mkDerivation (finalAttrs: { e.g. game development, real-time streaming video, monitoring and surveillance, up to and including desktop compositors and window managers. ''; - license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ bsd3 gpl2Plus lgpl2Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/cat9/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/cat9/default.nix index 5e96b0f5fb..7bc6005b0c 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/cat9/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/cat9/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; - version = "unstable-2023-02-11"; + version = "unstable-2023-06-25"; src = fetchFromGitHub { owner = "letoram"; repo = "cat9"; - rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897"; - hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ="; + rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05"; + hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix index 14047669bd..f6677b9823 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; - version = "unstable-2023-01-19"; + version = "unstable-2023-08-11"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2"; - hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA="; + rev = "728d7fc3292cc162b1cea505c8a71512b2e84925"; + hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix index a9a1e24a97..9474535133 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2023-02-05"; + version = "unstable-2023-03-02"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e"; - hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; + rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e"; + hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix index 7faf261747..2614db09c8 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -12,15 +12,15 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop-view"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-USsySJuDov2oe9UXyzACBAyYIRLKSXOMXdia8Ix/8TE="; + repo = "budgie-desktop-view"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE="; }; nativeBuildInputs = [ @@ -38,16 +38,12 @@ stdenv.mkDerivation rec { gtk3 ]; - preInstall = '' - substituteInPlace ../scripts/mesonPostInstall.sh --replace "update-desktop-database -q" "update-desktop-database $out/share/applications" - ''; - - meta = with lib; { + meta = { description = "The official Budgie desktop icons application/implementation"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view"; mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; - platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; - license = licenses.asl20; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ federicoschonborn ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix index 1066aec81e..8c07bcab6a 100644 --- a/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -35,16 +35,16 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.8.1"; + version = "10.8.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; - repo = pname; - rev = "v${version}"; + repo = "budgie-desktop"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-KhCQ5v6R6sS5Vjl10QhSuAxAPTDDAvJ6uu6VKTdX7m4="; + hash = "sha256-K5XUYcFjDJCHhjb/UTO206+UT6lI2P7X1v3SqlYbwPM="; }; patches = [ @@ -97,11 +97,11 @@ stdenv.mkDerivation rec { "budgie-desktop" ]; - meta = with lib; { + meta = { description = "A feature-rich, modern desktop designed to keep out the way of the user"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; - platforms = platforms.linux; - maintainers = [ maintainers.federicoschonborn ]; - license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ federicoschonborn ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 30caaaf6e3..78a4f7d94b 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -37,6 +37,7 @@ let cinnamon-settings-daemon cinnamon-common gnome.gnome-terminal + gsettings-desktop-schemas gtk3 ] ++ extraGSettingsOverridePackages; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix index 22dd4d15a2..11db728d4a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20230601120342/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20231010134817/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-yd2FyGAznXGnHJLkMsSNqIx0sbKHl3cNMr7tpue7BlA="; + hash = "sha256-u1hD0q67bKYKv/xMqqgxA6660v03xjVL4X7zxnNwGf8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 3094c1e8c6..d716bc38bc 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.18"; + version = "5.12.20"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-oHJOqfvrIQTspsTTnVyruiIAdh0kX12LzgGgSCYXfLE="; + hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 54a06d446c..01902209c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.7"; + version = "6.0.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-vXykC/x9F+cPTSqKTWimUhnr+IsfoeQncdj75sXG4/g="; + hash = "sha256-7Yyw4aw+44JX9SKuwmJSrLz04WETvs3E3cnt0/O+Ls0="; }; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch new file mode 100644 index 0000000000..76729d488b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch @@ -0,0 +1,17 @@ +diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go +index 679beea3..ccbfc508 100644 +--- a/bin/backlight_helper/ddcci/ddcci.go ++++ b/bin/backlight_helper/ddcci/ddcci.go +@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) { + displayHandleMap: make(map[string]*displayHandle), + } + +- status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5) +- if status < C.int(0) { +- return nil, fmt.Errorf("brightness: Error setting retries: %d", status) +- } +- + err := ddc.RefreshDisplays() + if err != nil { + return nil, err + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index b9a1da5ca2..1309b6d3f4 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -62,6 +62,7 @@ buildGoPackage rec { src = ./0005-fix-custom-wallpapers-path.diff; inherit coreutils; }) + ./0006-fix-build-with-ddcutil-2.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix index 505bfc7dbd..8312a4ca17 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evince/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { sha256 = "O4uhWBpHpun1f2tqoI8PtnVJxgEhqiTjEUDpOUe4NiI="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ appstream desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix index e9fd74c922..f266c48091 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -23,6 +23,7 @@ , gnome , gsettings-desktop-schemas , gsound +, gst_all_1 , gtk4 , ibus , libgnomekbd @@ -134,7 +135,11 @@ stdenv.mkDerivation rec { tracker-miners # for search locations dialog udisks2 upower - ]; + ] ++ (with gst_all_1; [ + # For animations in Mouse panel. + gst-plugins-base + gst-plugins-good + ]); preConfigure = '' # For ITS rules diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 4412a3064e..176cb4271b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.4"; + version = "44.5"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HdUebujZL7y5XObd8Ruf7OiNImIsAQFf+pNgFpzUGGY="; + sha256 = "wWr84Dgd1ZNCfXCER6nR+sdInrApRe+zfpBMp0qSSjU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix index c471417d61..bb658fcd44 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -17,8 +17,6 @@ , libadwaita , librsvg , rustc -, rust -, writeText , cargo }: @@ -60,16 +58,6 @@ stdenv.mkDerivation rec { librsvg ]; - mesonFlags = - let - # ERROR: 'rust' compiler binary not defined in cross or native file - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 0497078a12..d9aa514bb0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.4"; + version = "44.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "M3IKWGywqacyr1oH7RPj89MqGml4EjURQKVLygBrlAw="; + sha256 = "8kfg7WXrYvKwd1RtUoPtbUf0Ar2mpDFkE1AdjK7Slnk="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix index b171ef2022..6ff36b1c19 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + mainProgram = "zenity"; description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index 51c3c83609..e6bcc1b411 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-EasyScreenCast"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "EasyScreenCast"; repo = "EasyScreenCast"; rev = finalAttrs.version; - hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o="; + hash = "sha256-G7wdRFA0qL+6inVRLAmKoP0E0IOyvlmQIUwbDv/DbLI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix index 643b7ddecc..867c82881c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/back/default.nix @@ -11,11 +11,11 @@ gsmakeDerivation rec { pname = "gnustep-back"; - version = "0.29.0"; + version = "0.30.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM="; + sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix index faf44e50e0..500e31f0d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/base/default.nix @@ -14,10 +14,10 @@ }: gsmakeDerivation rec { pname = "gnustep-base"; - version = "1.28.0"; + version = "1.29.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; + hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/builder.sh b/third_party/nixpkgs/pkgs/desktops/gnustep/make/builder.sh index 736635ab50..79ead3f7b7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/builder.sh +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup providedPreConfigure="$preConfigure"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix index def8e297b5..f9b4ae553c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnustep-make"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo="; + sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix new file mode 100644 index 0000000000..c612011cbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +, cmake-extras +, glib +, intltool +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-schemas"; + version = "0.1.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-schemas"; + rev = finalAttrs.version; + hash = "sha256-FrDUFqdD0KW2VG2pTA6LMb6/9PdNtQUlYTEo1vnW6QQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # glib-compile-schemas + pkg-config + intltool + ]; + + buildInputs = [ + cmake-extras + glib + ]; + + cmakeFlags = [ + "-DGSETTINGS_LOCALINSTALL=ON" + "-DGSETTINGS_COMPILE=ON" + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "GSettings / AccountsService schema files for Lomiri"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-schemas"; + license = licenses.lgpl21Plus; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-schemas" + ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix index 4aa91bae9f..2b559a6a72 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/default.nix @@ -7,6 +7,9 @@ let packages = self: let inherit (self) callPackage; in { + #### Data + lomiri-schemas = callPackage ./data/lomiri-schemas { }; + #### Development tools / libraries cmake-extras = callPackage ./development/cmake-extras { }; deviceinfo = callPackage ./development/deviceinfo { }; diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 11150c2ca1..04abf4f88f 100644 --- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deviceinfo"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/deviceinfo"; rev = finalAttrs.version; - hash = "sha256-oKuX9JbYWIjroKgA2Y+/oqPkC26DPy3e6yHFU8mmbxQ="; + hash = "sha256-x0Xm4Z3hpvO5p/5JxMRloFqn58cRH2ak8rKtuxmmVVQ="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix index b95dd4b6fd..4a9a878d31 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/compton-conf/default.nix @@ -19,18 +19,18 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; + hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0="; }; nativeBuildInputs = [ cmake pkg-config lxqt.lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools libconfig ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix index fbac7dbd03..eacdac5541 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/default.nix @@ -18,6 +18,7 @@ let lxqt-admin = callPackage ./lxqt-admin {}; lxqt-config = callPackage ./lxqt-config {}; lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-menu-data = callPackage ./lxqt-menu-data {}; lxqt-notificationd = callPackage ./lxqt-notificationd {}; lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; lxqt-policykit = callPackage ./lxqt-policykit {}; @@ -26,7 +27,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 @@ -36,7 +37,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = qt5.callPackage ./compton-conf {}; + compton-conf = callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; @@ -50,7 +51,6 @@ let libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra - pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager qt5.qtsvg # provides QT5 plugins for svg icons @@ -68,6 +68,7 @@ let lxqt-admin lxqt-config lxqt-globalkeys + lxqt-menu-data lxqt-notificationd lxqt-openssh-askpass lxqt-policykit diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix index a19a8a2083..c945107aaf 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -4,6 +4,7 @@ , cmake , pkg-config , lxqt-build-tools +, lxqt-menu-data , pcre , libexif , xorg @@ -16,29 +17,30 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg="; + hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ + lxqt-menu-data pcre libexif xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp qtx11extras - qttools libfm menu-cache ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix index c7a34a9c49..f7fba687bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms="; + hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg polkit-qt kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix index 4f155f3957..f2c42ccca5 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc="; + hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix index 4fdfa341e9..5e3514310c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/libsysstat/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0z2r8041vqssm59lkb3ka7qis9br4wvavxzd45m3pnqlp7wwhkbn"; + hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix index f33e6986d8..ec95c19b0c 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -18,24 +18,24 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E="; + hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg qtimageformats # add-on module to support more image file formats diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix index 993721b443..fd20c68ba8 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,23 +14,23 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o="; + hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix index 540c04b85c..fc911cf27e 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY="; + hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index b8e31a378c..40cad3cb60 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -16,19 +16,20 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU="; + hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -37,7 +38,6 @@ mkDerivation rec { libfm-qt menu-cache qtbase - qttools qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f31d1561bb..b3874abfa5 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; + hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 2c8c5d9b4a..64b54b3e6b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,11 +1,11 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , pkg-config , glib , lxqt-build-tools +, lxqt-menu-data , qtbase , qtx11extras , qttools @@ -21,31 +21,32 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk="; + hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ glib.bin qtbase qtx11extras - qttools qtsvg kwindowsystem libkscreen liblxqt libqtxdg + lxqt-menu-data xorg.libpthreadstubs xorg.libXdmcp xorg.libXScrnSaver diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 6bdcc59bc3..83235bfdae 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo="; + hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-menu-data/default.nix new file mode 100644 index 0000000000..5ac4a5b0b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qttools +, gitUpdater +}: + +mkDerivation rec { + pname = "lxqt-menu-data"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = pname; + rev = version; + hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + qttools + ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/lxqt/lxqt-menu-data"; + description = "Menu files for LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.lxqt.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 47792b3538..a39c560d48 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw="; + hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg kwindowsystem liblxqt diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a14cbd7da2..ab23fc36da 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM="; + hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem @@ -47,5 +47,6 @@ mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.lxqt.members; + mainProgram = "lxqt-openssh-askpass"; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix index fb901742ea..16895a1aa9 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -14,9 +14,9 @@ , libstatgrab , libsysstat , lm_sensors -, lxmenu-data , lxqt-build-tools , lxqt-globalkeys +, lxqt-menu-data , gitUpdater , menu-cache , pcre @@ -30,19 +30,20 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0="; + hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -57,13 +58,12 @@ mkDerivation rec { libstatgrab libsysstat lm_sensors - lxmenu-data lxqt-globalkeys + lxqt-menu-data menu-cache pcre qtbase qtsvg - qttools qtx11extras solid xorg.libXdmcp diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 0478c108e2..da3480b73e 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,24 +19,24 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg="; + hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg polkit diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 32834a4a49..1823e7fb5d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,23 +18,23 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE="; + hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 4b27307520..264575b019 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,18 +15,19 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg="; + hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -35,7 +36,6 @@ mkDerivation rec { libqtxdg qtbase qtsvg - qttools qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix index 7300331ab9..3d5bdf0a01 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4="; + hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix index 6de643d727..421d166734 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk="; + hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 6d5fd9da85..73794bad7a 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,23 +16,23 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs="; + hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cbc1949b2..a9a957091d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; + hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix index 2adfc9ac2d..4ebd052a5e 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,25 +15,25 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zxwQfKowgpLjfxSV2t7Ly8o7DFqoIxi60zIVCcKDQWo="; + hash = "sha256-ExBcP+j1uf9Y8f6YfZsqyD6YTx1PriS3w8I6qdqQGeE="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ pcre qtbase - qttools qtx11extras xorg.libpthreadstubs xorg.libXdmcp diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 3bff6b7f1e..f5b69b2e85 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -3,38 +3,34 @@ , fetchFromGitHub , cmake , pkg-config -, lxqt +, lxqt-build-tools , libpulseaudio -, pcre , qtbase , qttools -, qtx11extras , gitUpdater }: mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ="; + hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools - qtx11extras libpulseaudio - pcre ]; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b26c30b14e..ea2f604745 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -4,43 +4,43 @@ , cmake , pkg-config , libexif -, lxqt +, lxqt-build-tools +, lxqt-menu-data , qtbase , qttools , qtx11extras , qtimageformats , libfm-qt , menu-cache -, lxmenu-data , gitUpdater }: mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo="; + hash = "sha256-+U8eV6oDpaJfTzejsVtbcaQrfSjWUnVpnIDbkvVCY/c="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ libexif + lxqt-menu-data qtbase - qttools qtx11extras qtimageformats # add-on module to support more image file formats libfm-qt menu-cache - lxmenu-data ]; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix index 64ce835d3a..91f11e8d13 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qlipper/default.nix @@ -15,16 +15,16 @@ mkDerivation rec { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; + hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834="; }; nativeBuildInputs = [ cmake + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix index 4873c1055c..0b6b81a4e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qps/default.nix @@ -14,18 +14,19 @@ mkDerivation rec { pname = "qps"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY="; + hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -33,7 +34,6 @@ mkDerivation rec { liblxqt libqtxdg qtbase - qttools qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix index e49b717cb2..0a1bf1f82d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,23 +13,23 @@ mkDerivation rec { pname = "qterminal"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU="; + hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtermwidget ]; @@ -43,6 +43,6 @@ mkDerivation rec { description = "A lightweight Qt-based terminal emulator"; license = licenses.gpl2Plus; platforms = with platforms; unix; - maintainers = with maintainers; [ globin ] ++ teams.lxqt.members; + maintainers = with maintainers; teams.lxqt.members; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix index 719183095a..e92df23f2d 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,23 +11,23 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs="; + hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/qtxdg-tools/default.nix index aa8ea1acd9..10476a00cf 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtxdg-tools"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc="; + hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix index f4f94e2378..59513dfebf 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,25 +17,25 @@ mkDerivation rec { pname = "screengrab"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4="; + hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78="; }; nativeBuildInputs = [ cmake pkg-config perl # needed by LXQtTranslateDesktop.cmake + qttools autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 9f6a8f3ecf..622a445bb9 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw="; + hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix index 8fb4738a9a..fc5a8e93d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.26.1"; + version = "1.26.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MP1ubwCjggD24uiYrX+nl4drsGDx0DQd0vc5MnnhTAc="; + sha256 = "gT7fCKNvmV7DwVBBMf+K+70CH24VhmQ/5dztXnPleQ0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index 5ae845b104..b65a91e004 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -4,6 +4,7 @@ , pkg-config , gettext , glib +, glib-networking , libxml2 , gtk3 , libsoup @@ -13,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo="; + sha256 = "ylCoFYZlXPU6j5Z2a5zpCk0H7Q/hYr1eFdra3QBgx/Y="; }; strictDeps = true; @@ -30,11 +31,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 libsoup tzdata ]; + propagatedBuildInputs = [ + glib + glib-networking # for obtaining IWIN forecast data + gtk3 + ]; + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-locations-compression" diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix index 7d0d1eec00..b6445151f5 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -4,7 +4,7 @@ , pkg-config , gettext , gtk3 -, libindicator-gtk3 +, libayatana-indicator , mate , hicolor-icon-theme , wrapGAppsHook @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; }; + postPatch = '' + # Find installed Unity & Ayatana (new-style) indicators + substituteInPlace src/applet-main.c \ + --replace '/usr/share' '/run/current-system/sw/share' + ''; + nativeBuildInputs = [ pkg-config gettext @@ -28,11 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libindicator-gtk3 + libayatana-indicator mate.mate-panel hicolor-icon-theme ]; + configureFlags = [ "--with-ayatana-indicators" ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index 3ba0d855a2..6c39e69f0c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3"; + sha256 = "HrX7m2y0qK2DCyboR6m70B1WiqvTg8Yo7p8IQJuJKOc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix index 19d8f1f531..f4c2d76d52 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool - python3Packages.distutils_extra + python3Packages.distutils-extra gobject-introspection ]; 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 74f5592e8e..9024b82354 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 @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.4.4"; + version = "unstable-2023-09-05"; # 2.4.4 does not support networkmanager 1.44 src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-g62+DF84eEI+TvUr1OkeqLnCLz/b7e+xwuTNZS0WJQA="; + rev = "3b69132788ff8734a481d498b49207e05a4f7d70"; + hash = "sha256-XWiihU/FK6oeWQWRYsc/IxqafuvwA89ZE3o/WzaxudE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index ebf99d6ed0..61d9c120b2 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.1.2"; + version = "7.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU="; + sha256 = "sha256-0fDbR28gh7F8Bcnofn48BBP1CTsYnfmY5kG72ookOXw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index a140d9cdcb..782fcf0fa8 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-wj9bvcES8JAgDtW0Damfd8VQNLK+SCFTDVWp/nYGcgI="; + sha256 = "sha256-KYnrQnh/Zz3EjMAqasdk2CZMXzw15txKtPm/K5+FzhI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 65f33dbda8..533240fc8f 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.8/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.9/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index c26af1cfac..c20ded466e 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,475 +4,475 @@ { aura-browser = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/aura-browser-5.27.8.tar.xz"; - sha256 = "0963d09whxld1l6fmi3z5qdkdvhl49khak3zjrq3cgs9sifvx08h"; - name = "aura-browser-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/aura-browser-5.27.9.tar.xz"; + sha256 = "1962h3m52yzvj60r9y6cwfzqz4sgg0867n420w27r40cz23nr0fy"; + name = "aura-browser-5.27.9.tar.xz"; }; }; bluedevil = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/bluedevil-5.27.8.tar.xz"; - sha256 = "09bq19xh5cms6zkp8rkf954mz6bf6k6cv345z28ai9a7l386y2rv"; - name = "bluedevil-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/bluedevil-5.27.9.tar.xz"; + sha256 = "0vjbcaalsmkbx1bccflpvjpdmw8gcym28qqybp0h2z983mj6i0b6"; + name = "bluedevil-5.27.9.tar.xz"; }; }; breeze = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-5.27.8.tar.xz"; - sha256 = "0i1ywyq848g51glw8qkk2v5syp05c5d0dhyv1s6g393lrd9q596d"; - name = "breeze-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-5.27.9.tar.xz"; + sha256 = "0ks6y9qhwkqbbfivnbw46vk41kapaxgdzmhnbzzywpwpbqlidias"; + name = "breeze-5.27.9.tar.xz"; }; }; breeze-grub = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-grub-5.27.8.tar.xz"; - sha256 = "08jws31cci1qyxsy5als31rrcld2j87bqq5ir9v1cch7j8vq1cz0"; - name = "breeze-grub-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-grub-5.27.9.tar.xz"; + sha256 = "1bbmwj5b0xzqrb3w318l805an6rnvbnrd03ad05qnf84fg24cvn9"; + name = "breeze-grub-5.27.9.tar.xz"; }; }; breeze-gtk = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-gtk-5.27.8.tar.xz"; - sha256 = "1kpaxw7c41159bkxbv8kcjzrhdyizrllfvilrsiszr6vfcmla3s0"; - name = "breeze-gtk-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-gtk-5.27.9.tar.xz"; + sha256 = "03h1kbrh1rp7h4pslghpb9fjnyg0gg8khkds0la4bvjy85a3jsx8"; + name = "breeze-gtk-5.27.9.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/breeze-plymouth-5.27.8.tar.xz"; - sha256 = "0p1vmmlvdg29whvsmvwgxpj4slr11z2wacnnbvq91y98q9jb1p8f"; - name = "breeze-plymouth-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/breeze-plymouth-5.27.9.tar.xz"; + sha256 = "1wqnfzwjgwma2cxvnawwicj3z8kxwh0yjvrh3x5kzc586q0zj01r"; + name = "breeze-plymouth-5.27.9.tar.xz"; }; }; discover = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/discover-5.27.8.tar.xz"; - sha256 = "1lqg0bcqmcvvhdlxgll8psppxyq0m7r4w5awfjjcpgajmsxzrigi"; - name = "discover-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/discover-5.27.9.tar.xz"; + sha256 = "1m97zn2q22842dhamavpa6q49bm0vxl3kq1qgr3nhbmskk1swfg7"; + name = "discover-5.27.9.tar.xz"; }; }; drkonqi = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/drkonqi-5.27.8.tar.xz"; - sha256 = "0b6vs4acsakhxkz44yjyhzdqba7yzm0nbabsnp8wqkp1dm8cr3wb"; - name = "drkonqi-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/drkonqi-5.27.9.tar.xz"; + sha256 = "04nx1wkgz5cdc615611jn1672mnrsl2z3a8xznrqr6cbfpw9ghsm"; + name = "drkonqi-5.27.9.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/flatpak-kcm-5.27.8.tar.xz"; - sha256 = "0mgdmbb0zkvzs3kwvgwk6sn5vj80m3wnccm53x9j5j02a40631nw"; - name = "flatpak-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/flatpak-kcm-5.27.9.tar.xz"; + sha256 = "0zcadkabnp37ab0p5adih9kh81iapn5hzc0j07rx81kk40j9p58s"; + name = "flatpak-kcm-5.27.9.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kactivitymanagerd-5.27.8.tar.xz"; - sha256 = "1n9jx3nxpdklm9cl82kz4racxq1f51gqfidp0mdxx7w3wzhnqjyl"; - name = "kactivitymanagerd-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kactivitymanagerd-5.27.9.tar.xz"; + sha256 = "1gn9a2rkyqljm9ry54kwfca7crmad71fr7fkan9l5cjsjrqqk3sn"; + name = "kactivitymanagerd-5.27.9.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kde-cli-tools-5.27.8.tar.xz"; - sha256 = "18v72ja1wdyql8a8r8bjzmgz5x7pqg2s2akv156py1x9gfah5fm2"; - name = "kde-cli-tools-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kde-cli-tools-5.27.9.tar.xz"; + sha256 = "01kx8xg6mlkl3n710vas536vwrni023h1655bs0ixzp12ngsdw86"; + name = "kde-cli-tools-5.27.9.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kde-gtk-config-5.27.8.tar.xz"; - sha256 = "1lyrlqm34rll830ykak83c2r22v4blbgchnr6grchaz3hd1njz4p"; - name = "kde-gtk-config-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kde-gtk-config-5.27.9.tar.xz"; + sha256 = "04lrc6anqljfyqhw9mwanxhjbbknfd1hkk2baxlhi49f9rzdhjw0"; + name = "kde-gtk-config-5.27.9.tar.xz"; }; }; kdecoration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kdecoration-5.27.8.tar.xz"; - sha256 = "12f8n0y3syj9yim7vjzrawyw9471yzqrb2irsdm5jjpsqqzkxbfy"; - name = "kdecoration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kdecoration-5.27.9.tar.xz"; + sha256 = "0zjk51pww3z6vsgdm5dxya2b3ngrdpxbmizdcin40zj37mkpz7bm"; + name = "kdecoration-5.27.9.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kdeplasma-addons-5.27.8.tar.xz"; - sha256 = "0ik59yfbal16k06jl89r1bl8n342rysw4p02y089jbg1n658cdbb"; - name = "kdeplasma-addons-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kdeplasma-addons-5.27.9.tar.xz"; + sha256 = "0ysg5rzr0zywxx9wyg82x3l0skg7ld0wn270i4rryia8agdx49ps"; + name = "kdeplasma-addons-5.27.9.tar.xz"; }; }; kgamma5 = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kgamma5-5.27.8.tar.xz"; - sha256 = "05ily30mh3wr17ax58ahkwkaa2fa0nkp8mi73s2w7y6g38khqgs8"; - name = "kgamma5-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kgamma5-5.27.9.tar.xz"; + sha256 = "1ks4f1v2cm770j0q2fpd432kpmsg6daa29hjvcbdczfg8gxrnjn8"; + name = "kgamma5-5.27.9.tar.xz"; }; }; khotkeys = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/khotkeys-5.27.8.tar.xz"; - sha256 = "07m1ca39lxgiq29ls9n3bmrdycr18znwbcy4lq14i4g18f027qlc"; - name = "khotkeys-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/khotkeys-5.27.9.tar.xz"; + sha256 = "1s6whyqbz331j8nyz0f5k54ww22awcyq0gqpg2sfjwm5rclms6kn"; + name = "khotkeys-5.27.9.tar.xz"; }; }; kinfocenter = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kinfocenter-5.27.8.tar.xz"; - sha256 = "1k6rm87i4hls6b3x9prl2aqx3lpikisf3w3p35r6kcxsd2gn4vxg"; - name = "kinfocenter-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kinfocenter-5.27.9.tar.xz"; + sha256 = "0qp89b2js74qnfcc3b79ywi8g329scc0xypz9kjlzcncp6q79gq3"; + name = "kinfocenter-5.27.9.tar.xz"; }; }; kmenuedit = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kmenuedit-5.27.8.tar.xz"; - sha256 = "17zk2jb3jbvw396r83481zj9md3k8hy90al3yz9i41ihyj9hl25f"; - name = "kmenuedit-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kmenuedit-5.27.9.tar.xz"; + sha256 = "1ngbf7jrgsp5qnk38zw22vm07lpr2hizi5l5n6jy4754d756ndn8"; + name = "kmenuedit-5.27.9.tar.xz"; }; }; kpipewire = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kpipewire-5.27.8.tar.xz"; - sha256 = "1027a23m7kxmw6gxs93wssgc22pg91jhnmbxm1mghd2695nlrrjs"; - name = "kpipewire-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kpipewire-5.27.9.tar.xz"; + sha256 = "086h2mfb8isravj9wypvislwwg2yf72rkzly4zsnx3r0dh8lyyqv"; + name = "kpipewire-5.27.9.tar.xz"; }; }; kscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kscreen-5.27.8.tar.xz"; - sha256 = "06q4iyn7mg0mmcardafzx6vzd1i3cm2kxdc22daw4mm0kqwjpjql"; - name = "kscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kscreen-5.27.9.tar.xz"; + sha256 = "0nz1lm2i4h2w9m6pdw2diqii11sx38lwz2yrk4mzxsq229c97rij"; + name = "kscreen-5.27.9.tar.xz"; }; }; kscreenlocker = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kscreenlocker-5.27.8.tar.xz"; - sha256 = "05px5ksppa6ladldwmksyhyyxbwwlzsy7dxwicvcbd7c521r6gws"; - name = "kscreenlocker-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kscreenlocker-5.27.9.tar.xz"; + sha256 = "0kc7j69rbf66ji8s250iza4aq1cvpfgz43r59vrzr1in1a6a9077"; + name = "kscreenlocker-5.27.9.tar.xz"; }; }; ksshaskpass = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/ksshaskpass-5.27.8.tar.xz"; - sha256 = "1bcrhmnkivig68lavk50qfhal4v7bycqh2npa7dnca4lanx1ki37"; - name = "ksshaskpass-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/ksshaskpass-5.27.9.tar.xz"; + sha256 = "0wwarxw8xrmwmyfscvy9dr5r2g8zmdk0qjipydg3i8dcpxqd1n67"; + name = "ksshaskpass-5.27.9.tar.xz"; }; }; ksystemstats = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/ksystemstats-5.27.8.tar.xz"; - sha256 = "0nli13g5mzm3lj4hba9vz90ikn6j2644pbdp8qmrmfzs991ma5if"; - name = "ksystemstats-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/ksystemstats-5.27.9.tar.xz"; + sha256 = "0lbr84jv70qqayq6a8nvmcbd582696zpcrf108kzpxzd0smbbnij"; + name = "ksystemstats-5.27.9.tar.xz"; }; }; kwallet-pam = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwallet-pam-5.27.8.tar.xz"; - sha256 = "0mgv2blyzq36r0y47nvj7n9wi2k7jf855karxh77rbra8arglxxs"; - name = "kwallet-pam-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwallet-pam-5.27.9.tar.xz"; + sha256 = "1kjjrd84fxnpm9jv7n9ndbnfch2x904l2xxi0g85fv4ipfm0z6bn"; + name = "kwallet-pam-5.27.9.tar.xz"; }; }; kwayland-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwayland-integration-5.27.8.tar.xz"; - sha256 = "11bkd11m6srnmwy8vz11228mb1rfhfni9s0arwrzqq8xgjivfzbs"; - name = "kwayland-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwayland-integration-5.27.9.tar.xz"; + sha256 = "1rg2vyry9lv9d1bkhwnlhxx8pjridbqhs1758kgls5dk9q4g05wn"; + name = "kwayland-integration-5.27.9.tar.xz"; }; }; kwin = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwin-5.27.8.tar.xz"; - sha256 = "1s9j0wkwsqvqnld8ndgldhg6ifnpml73cswbx4yay1c8cilcs9p7"; - name = "kwin-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwin-5.27.9.tar.xz"; + sha256 = "1fvqamjhl5vij7kqd7sk0xcpv12rv965a1qk9pbnd2gqlqgnjkyr"; + name = "kwin-5.27.9.tar.xz"; }; }; kwrited = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/kwrited-5.27.8.tar.xz"; - sha256 = "0y45kh4zdsh2jb8r51kpdacayyf6nba0xnhgks9bk70i6g9vj5s9"; - name = "kwrited-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/kwrited-5.27.9.tar.xz"; + sha256 = "1x2mci8bnwpfcccc9ps7aaqpmg7yzc37hdr13vaqy71i8qkf7a76"; + name = "kwrited-5.27.9.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/layer-shell-qt-5.27.8.tar.xz"; - sha256 = "1aw8qs85k714nccb9gnslk3af1gj52b8x2ll9jgvbfhh2yx2lbvp"; - name = "layer-shell-qt-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/layer-shell-qt-5.27.9.tar.xz"; + sha256 = "0vw8cvp27is951dlzfzwkrx7l6480wdxsdfp16ihsa34yzcpw837"; + name = "layer-shell-qt-5.27.9.tar.xz"; }; }; libkscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/libkscreen-5.27.8.tar.xz"; - sha256 = "0843db3f6b11nfr41bjf22jc74ff36x727sy548a75z2ipajymll"; - name = "libkscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/libkscreen-5.27.9.tar.xz"; + sha256 = "0awvqchf48027f1zfl4n0llavl6nfnp30jvg7sx9anvzx6jb4ggs"; + name = "libkscreen-5.27.9.tar.xz"; }; }; libksysguard = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/libksysguard-5.27.8.tar.xz"; - sha256 = "0zgx8miggiasfk519sqccd54mxa237is06v6nhpixv8a7ccc0950"; - name = "libksysguard-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/libksysguard-5.27.9.tar.xz"; + sha256 = "0xi1fb1irp9nxnnqgqwhdza5rf6bw2hpqlz5l0mwipd0xdgarx3h"; + name = "libksysguard-5.27.9.tar.xz"; }; }; milou = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/milou-5.27.8.tar.xz"; - sha256 = "1rq8kkk609n0ccm0hrhp06lz82rny42dy3iz085048iasfl7d72d"; - name = "milou-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/milou-5.27.9.tar.xz"; + sha256 = "1y2si9gpmj363asvqd2iil14fwzmdd66f1fpsig05w1680dc35p8"; + name = "milou-5.27.9.tar.xz"; }; }; oxygen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/oxygen-5.27.8.tar.xz"; - sha256 = "12y4hfygd7v004cs1ydx01mbypljpvwjwdcww08570dz9zc8aasz"; - name = "oxygen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/oxygen-5.27.9.tar.xz"; + sha256 = "0wx96v6v65yjal1x2c25adp3hnfrmsd2r1m5fzicfcbdk33yn834"; + name = "oxygen-5.27.9.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/oxygen-sounds-5.27.8.tar.xz"; - sha256 = "01d4lnfyrpyz7fxj5damdjlwdlfm7lywz82mk1xgs6g0f7lxg5yn"; - name = "oxygen-sounds-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/oxygen-sounds-5.27.9.tar.xz"; + sha256 = "0n9plr4xs6wl4v4qm71mxbvgl22cz5c5523bjv5mv5jgvp5wpzg1"; + name = "oxygen-sounds-5.27.9.tar.xz"; }; }; plank-player = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plank-player-5.27.8.tar.xz"; - sha256 = "1bgdmiy6bzy08xjj2vd546p632dghpd1q5xlbbjhs6ck4a60q64k"; - name = "plank-player-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plank-player-5.27.9.tar.xz"; + sha256 = "0vfmab3fab7izz43j6hssly001sp773swc53xf6z4dx0j210zb3d"; + name = "plank-player-5.27.9.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-bigscreen-5.27.8.tar.xz"; - sha256 = "0bigadshjprfsd7wlyn8apmb50ncwr74kb13hbnhh5kqadzv8kfl"; - name = "plasma-bigscreen-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-bigscreen-5.27.9.tar.xz"; + sha256 = "14dq3smb8rnpazr8mjs034gg9fidzj08nyggkqqwjiq774khv4wb"; + name = "plasma-bigscreen-5.27.9.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-browser-integration-5.27.8.tar.xz"; - sha256 = "1rwmnkkwf52i9c5dj11mr4ny3gylw6mb2g5iwzp7kqyaknnyqjlw"; - name = "plasma-browser-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-browser-integration-5.27.9.tar.xz"; + sha256 = "1d9f6fppaqxiwxixxngsvpawx2zbdnj9mwl47x107axnc7gn6355"; + name = "plasma-browser-integration-5.27.9.tar.xz"; }; }; plasma-desktop = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-desktop-5.27.8.tar.xz"; - sha256 = "1bmw7v8c8a4h63hjfg3ddg1r3ff6s0pri6fmml9430ynk850lrnz"; - name = "plasma-desktop-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-desktop-5.27.9.tar.xz"; + sha256 = "1rgjq7sla2x0icphaph2682k67n89znlyhp9nw95p8czpyqgbmkd"; + name = "plasma-desktop-5.27.9.tar.xz"; }; }; plasma-disks = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-disks-5.27.8.tar.xz"; - sha256 = "0yg2b8nqcws7sw25pxf4iwhr9qdg983x69arfls85xyjkkchnz4q"; - name = "plasma-disks-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-disks-5.27.9.tar.xz"; + sha256 = "0ikz5wv5429bc5i1ms8bdgmkm6x0f3jhs79ry8x2xq9q8f9cdraw"; + name = "plasma-disks-5.27.9.tar.xz"; }; }; plasma-firewall = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-firewall-5.27.8.tar.xz"; - sha256 = "05w9716bs2fh126v85n6vy5ydglh0xbsasdzzq10mdbkmswjrfbf"; - name = "plasma-firewall-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-firewall-5.27.9.tar.xz"; + sha256 = "0mkkz6n7yi382lm5hsgn5pwi8dxz4csmry5jvrscmhg9azcwghpr"; + name = "plasma-firewall-5.27.9.tar.xz"; }; }; plasma-integration = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-integration-5.27.8.tar.xz"; - sha256 = "14f732s64mchqfspd5f29x0h03lysk57vvciribzndj5bgkzn77v"; - name = "plasma-integration-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-integration-5.27.9.tar.xz"; + sha256 = "1csx7sr9ilr2q5mm6qar945srqm6qak95g9x02g70pyl6d58fajq"; + name = "plasma-integration-5.27.9.tar.xz"; }; }; plasma-mobile = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-mobile-5.27.8.tar.xz"; - sha256 = "0xzsil3jprpld5hq7b1al4pkbcckdx1iywq9kf4r0hvw70v9r7hn"; - name = "plasma-mobile-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-mobile-5.27.9.tar.xz"; + sha256 = "095fjn91zcipkh2blwjs70ff39yfrmh73ny2h6f2djkhgnr1xng0"; + name = "plasma-mobile-5.27.9.tar.xz"; }; }; plasma-nano = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-nano-5.27.8.tar.xz"; - sha256 = "1556i16x3cjs42jb1wkyi0y43p1cgmf5hq6hs8kxmdsnky0mbwn2"; - name = "plasma-nano-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-nano-5.27.9.tar.xz"; + sha256 = "1g3dyqwx05506mgq3v7n9n1j5dlnhf7lbb8kbk7whk8lfjc468n6"; + name = "plasma-nano-5.27.9.tar.xz"; }; }; plasma-nm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-nm-5.27.8.tar.xz"; - sha256 = "0rischaaq8hbvrkdhhyasss5fq39q2i8n86qhq6alj4s571r6m57"; - name = "plasma-nm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-nm-5.27.9.tar.xz"; + sha256 = "0k2qxyf09k3nk2n2dyg7a1xwx45r7m72nz0azvidlpy0v1j64g1a"; + name = "plasma-nm-5.27.9.tar.xz"; }; }; plasma-pa = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-pa-5.27.8.tar.xz"; - sha256 = "02yp7vyzjghhxpzsl8ahza09c2cb2l64jwax2r67kfhsvcr428v9"; - name = "plasma-pa-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-pa-5.27.9.tar.xz"; + sha256 = "07am1kk6sj9kr5vl2333lnlh3xjd8f7wkww7ra6vjif21wy7gm94"; + name = "plasma-pa-5.27.9.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-remotecontrollers-5.27.8.tar.xz"; - sha256 = "1xzs4gjfwfbva12j11fh626w1a8wi2aifc30dnga5c9yghfg75m2"; - name = "plasma-remotecontrollers-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-remotecontrollers-5.27.9.tar.xz"; + sha256 = "10zk35yrzpzkjw6a1g7mlr6w0nsi33h1hzrwqsvsqyac5j0yi25y"; + name = "plasma-remotecontrollers-5.27.9.tar.xz"; }; }; plasma-sdk = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-sdk-5.27.8.tar.xz"; - sha256 = "1fwhfks4a0x4h55g08d5mfdncm2r8c1x35xkbsa7xzm5wdf1v5lz"; - name = "plasma-sdk-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-sdk-5.27.9.tar.xz"; + sha256 = "10rshr3d618gis6spi93zj5q012jhi9mm3ixgbvbxvhlzp8k0b3x"; + name = "plasma-sdk-5.27.9.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-systemmonitor-5.27.8.tar.xz"; - sha256 = "09qc6l6d17w61bdjn03a45dqp2sw8s8bp5bjh8cq61zrc7yfpimx"; - name = "plasma-systemmonitor-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-systemmonitor-5.27.9.tar.xz"; + sha256 = "1c9lyzfx21033335160j3cndkv19icm1lf9nnn88f7gz0zhkz73c"; + name = "plasma-systemmonitor-5.27.9.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-thunderbolt-5.27.8.tar.xz"; - sha256 = "05c7k0p6jb1s1bv4i5cilcid68s4pd5h4qp22hajmv14xk6a8pdk"; - name = "plasma-thunderbolt-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-thunderbolt-5.27.9.tar.xz"; + sha256 = "0rbmj0b0ckyaz5sqrrzxp4n049asb5hxyap0lslhg9js2vjdk239"; + name = "plasma-thunderbolt-5.27.9.tar.xz"; }; }; plasma-vault = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-vault-5.27.8.tar.xz"; - sha256 = "1r6yv9xp0cc0ly04wcnlkwf711jrpb3v5ix8w7rwvki9cnlah1w9"; - name = "plasma-vault-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-vault-5.27.9.tar.xz"; + sha256 = "1p6wdvqprr3bfia0lchvmk8c5ii3c629c9c8qy2r4c0xy3l0f42i"; + name = "plasma-vault-5.27.9.tar.xz"; }; }; plasma-welcome = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-welcome-5.27.8.tar.xz"; - sha256 = "1laqdh014hmsivnncn5j1annmk6p82dadda3hnr94996fanphpqv"; - name = "plasma-welcome-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-welcome-5.27.9.tar.xz"; + sha256 = "1la7sb1ar06x79p80fh1qa09r3qd1gk53f3acr5az5k7gmjhpi1n"; + name = "plasma-welcome-5.27.9.tar.xz"; }; }; plasma-workspace = { - version = "5.27.8"; + version = "5.27.9.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-workspace-5.27.8.tar.xz"; - sha256 = "1w0fnv9n8jcv34nw28v9hc08zb6lnwlwjql5041h13pja6cd4rd5"; - name = "plasma-workspace-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz"; + sha256 = "8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8"; + name = "plasma-workspace-5.27.9.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plasma-workspace-wallpapers-5.27.8.tar.xz"; - sha256 = "1qkzrgx90r79l2xvwwasiyby58ag00f3bimfgfwm2lk8qa4zm5mg"; - name = "plasma-workspace-wallpapers-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-wallpapers-5.27.9.tar.xz"; + sha256 = "1gkk4ihpqbyfq394n1dhfkwrdfhnrvkgqbfp7xba82iygcx3zcwf"; + name = "plasma-workspace-wallpapers-5.27.9.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/plymouth-kcm-5.27.8.tar.xz"; - sha256 = "1spv976q95zip2cs9lwb7hlmcn2cr6gna0cky0lvagpi02kznpqj"; - name = "plymouth-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plymouth-kcm-5.27.9.tar.xz"; + sha256 = "15cximix1cajylbb0c14q2rz1573kiby7c4h9iysap3ask7g633b"; + name = "plymouth-kcm-5.27.9.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.8"; + version = "1-5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/polkit-kde-agent-1-5.27.8.tar.xz"; - sha256 = "13fgz47q1khra7vwl5wkm99bk279gmgivykg3jm9qy57rhakg5sq"; - name = "polkit-kde-agent-1-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/polkit-kde-agent-1-5.27.9.tar.xz"; + sha256 = "14h883ghn22xpjwbdld168m59zdmd6i5a7p6gszv2c6y3lpw3f03"; + name = "polkit-kde-agent-1-5.27.9.tar.xz"; }; }; powerdevil = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/powerdevil-5.27.8.tar.xz"; - sha256 = "0jvp6sm6jrxk4j3h30076rv2jp21vpn17sins92phcms1i0yjry5"; - name = "powerdevil-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/powerdevil-5.27.9.tar.xz"; + sha256 = "1x78cjlkiz6jl79jhcd3l04glpxzsqbb6rhw1f5az7i3ywc2qh7f"; + name = "powerdevil-5.27.9.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/qqc2-breeze-style-5.27.8.tar.xz"; - sha256 = "1h7i3myr56by8j12rc09665qdxn2jhh4jxq25fg27g704ci3b55v"; - name = "qqc2-breeze-style-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/qqc2-breeze-style-5.27.9.tar.xz"; + sha256 = "1allsvr51si8v5b4xvzhpms3i4446vr9a9cfwhg72ll8ssfa46ld"; + name = "qqc2-breeze-style-5.27.9.tar.xz"; }; }; sddm-kcm = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/sddm-kcm-5.27.8.tar.xz"; - sha256 = "1fgflgnirwa9i03fvrsq4dm6g9ikdwm1qqfha2xgk9ji2987rsj6"; - name = "sddm-kcm-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/sddm-kcm-5.27.9.tar.xz"; + sha256 = "0s5swqzmvb3hxsn66r99r70ha2gx9913c5vlffv1mawf5p2pzvk1"; + name = "sddm-kcm-5.27.9.tar.xz"; }; }; systemsettings = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/systemsettings-5.27.8.tar.xz"; - sha256 = "1f9zfjw6wcq1rvzvsldg49n0axbi40fnf2qic4lj1yrdb9qi351y"; - name = "systemsettings-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/systemsettings-5.27.9.tar.xz"; + sha256 = "0q9qy7i1ndf0pw2irf15l9mvc451s0gwz7hx0wjf5kjppwx2z9ab"; + name = "systemsettings-5.27.9.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.8"; + version = "5.27.9"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.8/xdg-desktop-portal-kde-5.27.8.tar.xz"; - sha256 = "0lrz4xfc7d6fv6dl4zxafkd5r2089f2rypkw90zsfqv39hjdy7vy"; - name = "xdg-desktop-portal-kde-5.27.8.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/xdg-desktop-portal-kde-5.27.9.tar.xz"; + sha256 = "1i2xqks1lx68rf79j67mzibsya43288sf0sl6azhwc14cw15xcdb"; + name = "xdg-desktop-portal-kde-5.27.9.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix index 1c438df1b8..b127208114 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix @@ -17,6 +17,7 @@ , kactivities , kactivities-stats , kirigami2 +, kirigami-addons , kcrash , plasma-workspace }: @@ -41,6 +42,7 @@ mkDerivation { kactivities kactivities-stats kirigami2 + kirigami-addons kcrash plasma-workspace ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index 9c5d44ade8..0cec370e1a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - python3Packages.distutils_extra + python3Packages.distutils-extra file which intltool @@ -64,6 +64,12 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8d75389b07..b3f1537a8a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,9 +1,12 @@ { lib , mkXfceDerivation +, dbus , glib , gtk3 +, gtk-layer-shell , libcanberra-gtk3 , libnotify +, libX11 , libxfce4ui , libxfce4util , sqlite @@ -14,15 +17,19 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.8.2"; + version = "0.9.3"; + odd-unstable = false; - sha256 = "sha256-M8L2HWTuQDl/prD7s6uptkW4XDscpk6fc+epoxjFNS8="; + sha256 = "sha256-kgTKJAUB/w/6vtNm2Ewb2v62t0kFK+T8e5Q3/nKwrMg="; buildInputs = [ + dbus gtk3 + gtk-layer-shell glib libcanberra-gtk3 libnotify + libX11 libxfce4ui libxfce4util sqlite diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 5271fd6c04..3a685614f0 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -2,6 +2,8 @@ , mkXfceDerivation , glib , gtk3 +, gtk-layer-shell +, libX11 , libxfce4ui , vte , xfconf @@ -15,9 +17,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.1.0"; + version = "1.1.1"; + odd-unstable = false; - sha256 = "sha256-ilxiP1Org5/uSQOzfRgODmouH0BmK3CmCJj1kutNuII="; + sha256 = "sha256-LDfZTZ2EaboIYz+xQNC2NKpJiN8qqfead2XzpKVpL6c="; nativeBuildInputs = [ libxslt @@ -28,6 +31,8 @@ mkXfceDerivation { buildInputs = [ glib gtk3 + gtk-layer-shell + libX11 libxfce4ui vte xfconf diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index 473757ae20..b08a59a5aa 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -1,5 +1,4 @@ { mkXfceDerivation -, fetchpatch , lib , docbook_xsl , exo @@ -22,18 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.7"; + version = "4.18.8"; - sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU="; - - patches = [ - # Fix log spam with new GLib - # https://gitlab.xfce.org/xfce/thunar/-/issues/1204 - (fetchpatch { - url = "https://gitlab.xfce.org/xfce/thunar/-/commit/2f06fcdbedbc59d9f90ccd3df07fce417cea391d.patch"; - sha256 = "sha256-nvYakT4GJkQYmubgZF8GJIA/m7+6ZPbmD0HSgMcCh10="; - }) - ]; + sha256 = "sha256-+VS8Mn9J8VySNEKUMq4xUXXvVgMpWkNVdpv5dzxhZ/M="; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix index 25b3e6f805..7504c8e09d 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-dev-tools"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-VgQiTRMPD1VeUkUnFkX78C2VrsrXFWCdmupL8PQc7+c="; + sha256 = "sha256-JUyFlifNVhSnIMaI9qmgCtGIgkpmzYybMfuhPgJiDOg="; nativeBuildInputs = [ autoreconfHook diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix index a25b76f7e0..459044eb2a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,11 +1,16 @@ -{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }: +{ lib +, mkXfceDerivation +, libxfce4util +, gobject-introspection +, vala +}: mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.18.1"; + version = "4.18.3"; - sha256 = "sha256-HS+FzzTTAH8lzBBai3ESdnuvvvZW/vAVSmGe57mwcoo="; + sha256 = "sha256-Iu/LHyk/lOvu8uJuJRDxIkabiX0vZB4H99vVKRiugVo="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 1c0cd3f147..f63453250b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.8.0"; + version = "2.8.1"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU="; + sha256 = "sha256-cKEybD/eTHdS1LXSS1r6QTBnfDiX7nYwnmGKTaagbrs="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 53a74684cb..99285b53cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -11,10 +11,10 @@ mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; - version = "0.5.1"; + version = "0.5.2"; odd-unstable = false; - sha256 = "sha256-TV70IaZClIyQnMGsJEPN0VxHzZAS5F5jSTLm8VwYuwI="; + sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU="; nativeBuildInputs = [ intltool diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 421d5f7ffb..b7b2cc9c7d 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -43,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_14; + elixir = elixir_1_15; elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix { inherit erlang; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index 3240a8eebc..9475ed35f8 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,16 +4,16 @@ let pname = "elixir-ls"; - version = "0.16.0"; + version = "0.17.3"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-tEKwM5o3uXJ0cLY5USnQJ+HOGTSv6NDJvq+F/iqFEWs="; + hash = "sha256-E+tlnkwJiyG8x29um/G7OqIDCJ/laDMTm3z7VvdWy6s="; fetchSubmodules = true; }; in -mixRelease { +mixRelease { inherit pname version src elixir; stripDebug = true; @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-jpjqMIQ9fS4nkkKWZ80Mx5vULm5bvnNHy52ZQcR0y8c="; + hash = "sha256-ltSYZYsXWiq5ASvRmR7ETgK9e8bj4f9bhZAZEIceLkw="; }; # elixir-ls is an umbrella app diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/mix-release.nix b/third_party/nixpkgs/pkgs/development/beam-modules/mix-release.nix index d48dc38a4b..e5b44bc5dc 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/mix-release.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,19 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }@inputs: +{ stdenv +, lib +, elixir +, erlang +, hex +, git +, rebar +, rebar3 +, fetchMixDeps +, findutils +, makeWrapper +, coreutils +, gnused +, gnugrep +, gawk +}@inputs: { pname , version @@ -10,80 +25,104 @@ , mixEnv ? "prod" , compileFlags ? [ ] - # mix fixed output derivation dependencies + # Mix dependencies provided as a fixed output derivation , mixFodDeps ? null - # mix dependencies generated by mix2nix - # this assumes each dependency is built by buildMix or buildRebar3 - # each dependency needs to have a setup hook to add the lib path to $ERL_LIBS - # this is how mix will find dependencies + # Mix dependencies generated by mix2nix + # + # This assumes each dependency is built by buildMix or buildRebar3. Each + # dependency needs to have a setup hook to add the lib path to $ERL_LIBS. + # This is how Mix finds dependencies. , mixNixDeps ? { } , elixir ? inputs.elixir , hex ? inputs.hex.override { inherit elixir; } -# This reduces closure size, but can lead to some hard to understand runtime -# errors, so use with caution. See e.g. -# https://github.com/whitfin/cachex/issues/205 -# https://framagit.org/framasoft/mobilizon/-/issues/1169 + # Remove releases/COOKIE + # + # People have different views on the nature of cookies. Some believe that they are + # secrets, while others believe they are just ids for clustering nodes instead of + # secrets. + # + # If you think cookie is secret, you can set this attr to true, then it will be + # removed from nix store. If not, you can set it to false. + # + # For backward compatibility, it is set to true by default. + # + # You can always specify a custom cookie by using RELEASE_COOKIE environment + # variable, regardless of the value of this attr. +, removeCookie ? true + + # This reduces closure size, but can lead to some hard to understand runtime + # errors, so use with caution. See e.g. + # https://github.com/whitfin/cachex/issues/205 + # https://framagit.org/framasoft/mobilizon/-/issues/1169 , stripDebug ? false , ... }@attrs: let - # remove non standard attributes that cannot be coerced to strings + # Remove non standard attributes that cannot be coerced to strings overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ]; in assert mixNixDeps != { } -> mixFodDeps == null; assert stripDebug -> !enableDebugInfo; stdenv.mkDerivation (overridable // { - # rg is used as a better grep to search for erlang references in the final release - nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ]; - buildInputs = buildInputs ++ builtins.attrValues mixNixDeps; + nativeBuildInputs = nativeBuildInputs ++ + # Erlang/Elixir deps + [ erlang elixir hex git ] ++ + # Mix deps + (builtins.attrValues mixNixDeps) ++ + # other compile-time deps + [ findutils makeWrapper ]; + + buildInputs = buildInputs; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; + DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation - # the api with `mix local.rebar rebar path` makes a copy of the binary - # some older dependencies still use rebar + # The API with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar. MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; + LC_ALL = "C.UTF-8"; postUnpack = '' - export HEX_HOME="$TEMPDIR/hex" + # Mix and Hex export MIX_HOME="$TEMPDIR/mix" + export HEX_HOME="$TEMPDIR/hex" # Rebar export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" ${lib.optionalString (mixFodDeps != null) '' - # compilation of the dependencies will require - # that the dependency path is writable - # thus a copy to the TEMPDIR is inevitable here + # Compilation of the dependencies will require that the dependency path is + # writable, thus a copy to the $TEMPDIR is inevitable here. export MIX_DEPS_PATH="$TEMPDIR/deps" cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" - '' - } - + ''} '' + (attrs.postUnpack or ""); configurePhase = attrs.configurePhase or '' runHook preConfigure ${./mix-configure-hook.sh} - # this is needed for projects that have a specific compile step + + # This is needed for projects that have a specific compile step # the dependency needs to be compiled in order for the task - # to be available - # Phoenix projects for example will need compile.phoenix + # to be available. + # + # Phoenix projects for example will need compile.phoenix. mix deps.compile --no-deps-check --skip-umbrella-children # Symlink dependency sources. This is needed for projects that require # access to the source of their dependencies. For example, Phoenix - # applications need javascript assets to build asset bundles. + # projects need javascript assets to build asset bundles. ${lib.optionalString (mixNixDeps != { }) '' mkdir -p deps @@ -113,7 +152,6 @@ stdenv.mkDerivation (overridable // { runHook postBuild ''; - installPhase = attrs.installPhase or '' runHook preInstall @@ -122,42 +160,50 @@ stdenv.mkDerivation (overridable // { runHook postInstall ''; - # Stripping of the binary is intentional - # even though it does not affect beam files - # it is necessary for NIFs binaries postFixup = '' - if [ -e "$out/bin/${pname}.bat" ]; then # absent in special cases, i.e. elixir-ls - rm "$out/bin/${pname}.bat" # windows file - fi - # contains secrets and should not be in the nix store - # TODO document how to handle RELEASE_COOKIE - # secrets should not be in the nix store. - # This is only used for connecting multiple nodes - if [ -e $out/releases/COOKIE ]; then # absent in special cases, i.e. elixir-ls + # Remove files for Microsoft Windows + rm -f "$out"/bin/*.bat + + # Wrap programs in $out/bin with their runtime deps + for f in $(find $out/bin/ -type f -executable); do + wrapProgram "$f" \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + gnused + gnugrep + gawk + ]} + done + '' + lib.optionalString removeCookie '' + if [ -e $out/releases/COOKIE ]; then rm $out/releases/COOKIE fi - # removing unused erlang reference from resulting derivation to reduce - # closure size - if [ -e $out/erts-* ]; then - echo "ERTS found in $out - removing references to erlang to reduce closure size" - # there is a link in $out/erts-*/bin/start always - # TODO: - # sometimes there are links in dependencies like bcrypt compiled binaries - # at the moment those are not removed since substituteInPlace will - # error on binaries - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do - echo "removing reference to erlang in $file" - substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" - done - fi '' + lib.optionalString stripDebug '' - # strip debug symbols to avoid hardreferences to "foreign" closures actually + # Strip debug symbols to avoid hardreferences to "foreign" closures actually # not needed at runtime, while at the same time reduce size of BEAM files. erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop ''; - # TODO investigate why the resulting closure still has - # a reference to erlang. - # uncommenting the following will fail the build - # disallowedReferences = [ erlang ]; + # TODO: remove erlang references in resulting derivation + # + # # Step 1 - investigate why the resulting derivation still has references to erlang. + # + # The reason is that the generated binaries contains erlang reference. Here's a repo to + # demonstrate the problem - . + # + # + # # Step 2 - remove erlang references from the binaries + # + # As said in above repo, it's hard to remove erlang references from `.beam` binaries. + # + # We need more experienced developers to resolve this issue. + # + # + # # Tips + # + # When resolving this issue, it is convenient to fail the build when erlang is referenced, + # which can be achieved by using: + # + # disallowedReferences = [ erlang ]; + # }) diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix index b884809505..621887d6cd 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -84,7 +84,8 @@ let runHook postInstall ''; - postInstall = '' + # Release will generate a binary which will cause a read null byte failure, see #261354 + postInstall = lib.optionalString (releaseType == "escript") '' for dir in $out/rel/*/erts-*; do echo "ERTS found in $dir - removing references to erlang to reduce closure size" for f in $dir/bin/{erl,start}; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 26f7d9138c..f5645f563d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }: +{ lib, stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, firefox-unwrapped, zip, pkg-config, npapi_sdk, bash, bc }: stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config bc ]; - buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; + buildInputs = [ cargo rustc glib firefox-unwrapped zip npapi_sdk ]; preConfigure = '' configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") diff --git a/third_party/nixpkgs/pkgs/development/compilers/asl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/asl/default.nix index b8c900a20b..5a7ca86927 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/asl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/asl/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchzip -, tex +, texliveMedium , buildDocs ? false }: @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "doc" "man" ]; - nativeBuildInputs = lib.optionals buildDocs [ tex ]; + nativeBuildInputs = lib.optionals buildDocs [ texliveMedium ]; postPatch = lib.optionalString (!buildDocs) '' substituteInPlace Makefile --replace "all: binaries docs" "all: binaries" diff --git a/third_party/nixpkgs/pkgs/development/compilers/aspectj/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/aspectj/builder.sh index 7ea0a40d37..31ec97942e 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/aspectj/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/aspectj/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/third_party/nixpkgs/pkgs/development/compilers/ballerina/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ballerina/default.nix index b16c5f32fb..29ca546324 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ballerina/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.6.0"; + version = "2201.8.2"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - sha256 = "sha256-yttRswqNq8Tam1OwnC9klwrryDDqdHMzzRs9T9pYlnU="; + hash = "sha256-vTrVcWo7fjcj9oZqIzvVTTynf4dSh5D7PAUYj3Vs8Gg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 5a139fb290..dcadf054bc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "114"; + version = "116"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-bzHNIQy0AN8mIFGG+638p/MBSqlkWuaOzKGSsMDAPH4="; + hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index 6637b769dd..6776ad1ee6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -19,7 +19,7 @@ , gmp-static , verilog , asciidoctor -, tex +, texliveFull , which }: @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { ghcWithPackages perl pkg-config - tex + texliveFull ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix index 9722d466ae..179326cfeb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/c0/default.nix @@ -10,17 +10,18 @@ , libpng , ncurses , readline +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "c0"; - version = "unstable-2022-10-25"; + version = "unstable-2023-09-05"; src = fetchFromBitbucket { owner = "c0-lang"; repo = "c0"; - rev = "7ef3bc9ca232ec41936e93ec8957051e48cacfba"; - sha256 = "sha256-uahF8fOp2ZJE8EhZke46sbPmN0MNHzsLkU4EXkV710U="; + rev = "608f97eef5d81bb85963d66f955730dd93996f67"; + hash = "sha256-lRIEtclx+NKxAO72nsvnxVeEGCEe6glC6w8MXh1HEwY="; }; patches = [ @@ -67,6 +68,10 @@ stdenv.mkDerivation rec { mv $out/c0-mode/ $out/share/emacs/site-lisp/ ''; + passthru.updateScript = unstableGitUpdater { + url = "https://bitbucket.org/c0-lang/c0.git"; + }; + meta = with lib; { description = "A small safe subset of the C programming language, augmented with contracts"; homepage = "https://c0.cs.cmu.edu/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix index 31eda13e26..daf086e587 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw="; + hash = "sha256-5UOLfsNgtg5EDDId23ysmWfeqMeh8R2UfMeBAtFCx6s="; }; - cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg="; + cargoHash = "sha256-YoPStyPeEqLoUvGLEPwXR8XVhXtb6XwFuPNoDCiT7OA="; nativeCheckInputs = [ rustfmt diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix index 5385baf8da..fc7dfa78ce 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "9.6.2"; + version = "9.6.4"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-cUaVeJ4brTUY5s1fvIroIE92ED1a0roFo/HAY+stXQI="; + hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0="; }; nativeBuildInputs = lib.optional stdenv.isDarwin cctools; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix index f33e594b7e..29cf5b115b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # There is not enough space in the load command to accomodate a full path to the store, + # so use `@executable_path` to specify a relative path to chicken’s lib folder. + sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ + -i Makefile.macosx + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin @@ -31,7 +38,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" - "POSTINSTALL_PROGRAM=install_name_tool" + "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index cb56eabc5d..78535382a7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting egg ${eggName} (version $version) into $out" diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix index 270384565a..a5fd3f9483 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/overrides.nix @@ -68,10 +68,22 @@ in scheme2c-compatibility = old: addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); - sdl-base = addToBuildInputs pkgs.SDL; - sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; - sdl2-image = addToBuildInputs pkgs.SDL2_image; - sdl2-ttf = addToBuildInputs pkgs.SDL2_ttf; + sdl-base = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL old) // + # needed for sdl-config to be in PATH + (addToNativeBuildInputs pkgs.SDL old)); + sdl2 = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); + sdl2-image = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_image old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); + sdl2-ttf = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2_ttf old) // + # needed for sdl2-config to be in PATH + (addToNativeBuildInputs pkgs.SDL2 old)); soil = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy; sqlite3 = addToBuildInputs pkgs.sqlite; stemmer = old: @@ -80,7 +92,10 @@ in stfl = old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old); - taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; + taglib = old: + (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) // ( + # needed for tablib-config to be in PATH + addToNativeBuildInputs pkgs.taglib old); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix index f8eaae9a04..129388005b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.56.1"; + version = "1.58.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-MOwjfSUd5Dvlvek763AMZWK29dUoc2fblb5qtByTqLA="; + sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix index 02fff2b3d9..39dfa67d23 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230802"; + version = "20231112"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; + sha256 = "sha256-oH1/QZX8cF9sZikP5XpNdfsMepJrgW+uX0OGHhJVbmw="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 022c4e5431..c9ffed829b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -148,6 +148,11 @@ let # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 substituteInPlace spec/compiler/loader/unix_spec.cr \ --replace 'it "parses file paths"' 'pending "parses file paths"' + '' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) '' + # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require + # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205). + substituteInPlace src/llvm/lib_llvm.cr \ + --replace '@[Link("stdc++")]' '@[Link("c++", "-l${stdenv.cc.libcxx.cxxabi.libName}")]' ''; # Defaults are 4 diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix index 1f934ef5d4..681549fa62 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix @@ -361,7 +361,7 @@ backendStdenv.mkDerivation rec { description = "A compiler for NVIDIA GPUs, math libraries, and tools"; homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; - license = licenses.unfree; + license = licenses.nvidiaCuda; maintainers = teams.cuda.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 038841a709..1e4a3ab178 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -39,7 +39,7 @@ let inherit (lib.meta) getExe; inherit (lib.strings) optionalString; in -backendStdenv.mkDerivation { +backendStdenv.mkDerivation (finalAttrs: { # NOTE: Even though there's no actual buildPhase going on here, the derivations of the # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are @@ -164,11 +164,15 @@ backendStdenv.mkDerivation { outputSpecified = true; meta = { - inherit description platforms; - license = lib.licenses.unfree; + inherit platforms; + description = "${description}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; + license = lib.licenses.nvidiaCudaRedist // { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.license_path or "${pname}/LICENSE.txt"}"; + }; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = lib.teams.cuda.members; # Force the use of the default, fat output by default (even though `dev` exists, which # causes Nix to prefer that output over the others if outputSpecified isn't set). outputsToInstall = [ "out" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix index b0893562c2..ee10acbdeb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - homepage = "https://www.dartlang.org/"; + homepage = "https://dart.dev"; maintainers = with maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/default.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/flutter-secure-storage-linux/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/flutter-secure-storage-linux/default.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/handy-window/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/handy-window/default.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/matrix/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/matrix/default.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/olm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/olm/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/flutter/package-overrides/olm/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/dart/package-overrides/olm/default.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix index 12de25fb6c..0526825ee2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.0.6"; in +let version = "3.1.3"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0adasw9niwbsyk912330c83cqnppk56ph7yxalml23ing6x8wq32"; + sha256 = "00bjyjya5hb1aaywbbaqbsxas5q93xvxrz9sd3x40m3792zxdbfx"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "0wj58cygjra1qq0ivsbjb710n03zi0jzx0iw5m2p8nr7w8ns551c"; + sha256 = "0nansfrnzb8ximg15my8yv5kc2gih60rkann7r008h7zk5cd8nkr"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "06wqq97d2v0bxp2pmc940dhbh8n8yf6p9r0sb1sldgv7f4r47qiy"; + sha256 = "08njr5n7z94dfkmbi9wcdv5yciy94nzfgvjbdhsjswyq3h030a1b"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "1hg1g4pyr8cgy6ak4n9akidrmj6s5n86dqrx3ybi81c8z5lqw4r2"; + sha256 = "0ff73ws20i2j5lk2h2dy6k3fbfx7l9na9gqyji37c0dc67vxyl01"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "1hbh3gahnny2wfs31r64940z5scrgd8jf29mrzfadkpz54g0aizz"; + sha256 = "1703vsmw0m867gqzd2wy93bab0gg7z40r9rfin4lzhxw20x2brs4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix index d2679c184d..0f6abb574a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix @@ -6,6 +6,7 @@ { stdenv , lib , fetchFromGitHub +, removeReferencesTo , makeWrapper , which , writeTextFile @@ -20,7 +21,8 @@ , installShellFiles , git , unzip -, dmd_bin ? "${callPackage ./bootstrap.nix { }}/bin" +, dmdBootstrap ? callPackage ./bootstrap.nix { } +, dmd_bin ? "${dmdBootstrap}/bin" }: let @@ -155,6 +157,7 @@ stdenv.mkDerivation rec { fi ${dmd_bin}/rdmd dmd/compiler/src/build.d -j$buildJobs HOST_DMD=${dmd_bin}/dmd $buildFlags + make -C dmd/druntime -f posix.mak DMD=${pathToDmd} $buildFlags -j$buildJobs echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile echo ${lib.getLib curl}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile make -C phobos -f posix.mak $buildFlags -j$buildJobs DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" @@ -195,7 +198,7 @@ stdenv.mkDerivation rec { installManPage dmd/docs/man/man*/* mkdir -p $out/include/dmd - cp -r {druntime/import/*,phobos/{std,etc}} $out/include/dmd/ + cp -r {dmd/druntime/import/*,phobos/{std,etc}} $out/include/dmd/ mkdir $out/lib cp phobos/generated/${osname}/release/${bits}/libphobos2.* $out/lib/ @@ -209,6 +212,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmd_bin}/dmd '{}' + + ''; + + disallowedReferences = [ dmdBootstrap ]; + meta = with lib; { description = "Official reference compiler for the D language"; homepage = "https://dlang.org/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index ee63a6a241..c60133da3c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.22"; + version = "6.0.24"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a936856b-96f0-4525-8f74-b96b792c3664/2da9be398c92985d3f95c3336361d1ba/aspnetcore-runtime-6.0.22-linux-x64.tar.gz"; - sha512 = "a42f600823e19611ddb202bde1a8da8d0e9dadb22262cb2122f8c85af12bddee8793524d9e2096c188b267bdd852ef90bf93533c2d4f2f3151742cfc20fdc244"; + url = "https://download.visualstudio.microsoft.com/download/pr/8f5a65c0-9bc8-497d-9ce2-4658c461dc55/b6c01c3cd060552d987501ba6bbde09f/aspnetcore-runtime-6.0.24-linux-x64.tar.gz"; + sha512 = "b14ed20bb6c2897fb05cf11154aa22df3c68b6f90d2e9bc6ccc623897a565f51c3007c9a6edcdbab2090c710047a3d8eed0bcc6df19f3993d1be4c6387238da5"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/000ddf12-2c8b-4d97-9b3d-f76c8fef461e/c2dfb5a82b7952cb272c0f5dbeb7fcb1/aspnetcore-runtime-6.0.22-linux-arm64.tar.gz"; - sha512 = "bd3dc49cd2b637edc3797206a0b6b07b40f774a25c3c6932bc86d345cfb90f4af7c0927e1b39cf4fc638ce67a5291b0ab7a5bfb030c629f8e4e0d9ce76715532"; + url = "https://download.visualstudio.microsoft.com/download/pr/d562ba2b-8e2c-48e5-9853-f8616a9cb4e4/f4e251ba67b718083c28017e3b0c6349/aspnetcore-runtime-6.0.24-linux-arm64.tar.gz"; + sha512 = "db5de0888441e93466f84aac459d5ea0c9079c9b8e00308abb0ccc687922bbe48ace22b5cbdeb0f38d89cd115440deab5d0b4f1499611822dfb8a0e9f13c4309"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/447de6fd-79ad-4a1d-a7ea-48f57a8e1280/27c1a55772876bf109b7c2caa5038d9d/aspnetcore-runtime-6.0.22-osx-x64.tar.gz"; - sha512 = "c899865b0c3b409273fc9d4eec1e0d37406021acbc40d34aea8566fbd1cdce541bf0f1011a625ec0f61798ae334d244f72874943da790dc3d4b98611b140a954"; + url = "https://download.visualstudio.microsoft.com/download/pr/cf267621-f2f5-47d8-90b4-e8a4555de21b/aa82da20c081e6359b1ffbc8261b5c73/aspnetcore-runtime-6.0.24-osx-x64.tar.gz"; + sha512 = "8cfab4466ab5a82c7e0110541708b08f894427036f54e2e8add649b9777c86b856f7d5fbd4c2709bc74343b5b1de937b13bff2f0b7e68726072f93b417632603"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4f2055fb-f5f2-4953-8341-4c56ae1f2893/52d66998e9326c7172d77a706e752861/aspnetcore-runtime-6.0.22-osx-arm64.tar.gz"; - sha512 = "c39e137d351125fefc078882311eb7de37ec8188444767a15b56d6f242bf5855e0e79cfb205a45c5083e86f039b5e7202727a1f8eaab92706e5c705ba782aafb"; + url = "https://download.visualstudio.microsoft.com/download/pr/516e1a2a-0256-48d9-8212-c95a6c9d93de/6abbcc369ef1d3e03e6e28f0438ee295/aspnetcore-runtime-6.0.24-osx-arm64.tar.gz"; + sha512 = "1590236034ca91d347b045843d790288024b19939d34f356c6914bdc7ce000af9ceea63a9ce69fa599d126fbc6dae405a3a42cd4a02edf5ffa067388da8b4da4"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.22"; + version = "6.0.24"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f812da49-53de-4f59-93d2-742a61229149/35ff2eb90bf2583d21ad25146c291fe4/dotnet-runtime-6.0.22-linux-x64.tar.gz"; - sha512 = "c24ed83cd8299963203b3c964169666ed55acaa55e547672714e1f67e6459d8d6998802906a194fc59abcfd1504556267a839c116858ad34c56a2a105dc18d3d"; + url = "https://download.visualstudio.microsoft.com/download/pr/872b4f32-dd0d-49e5-bca3-2b27314286a7/e72d2be582895b7053912deb45a4677d/dotnet-runtime-6.0.24-linux-x64.tar.gz"; + sha512 = "3a72ddae17ecc9e5354131f03078f3fbfa1c21d26ada9f254b01cddcb73869cb33bac5fc0aed2200fbb57be939d65829d8f1514cd0889a2f5858d1f1eec136eb"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1cd7db66-695f-48d8-9e79-d61df9774345/4c363363f91445c542e8a997e3568ac4/dotnet-runtime-6.0.22-linux-arm64.tar.gz"; - sha512 = "bef57f12a8f9ad3c41767b85158f76c996f38db56bd4b8d800d9ccd107be3e1d47a3d2917a252bdd937e3c30547e431dfbc295c7ffce8eb4ab072ade426c53f4"; + url = "https://download.visualstudio.microsoft.com/download/pr/8292f37d-c0b7-4371-b307-990c488ffce0/95142913864b1f8cf45d3bc432a8c193/dotnet-runtime-6.0.24-linux-arm64.tar.gz"; + sha512 = "43ec6b177d18ad5dbdd83392f861668ea71160b01f7540c18eee425d24ad0b5eee88dfc0f4ad9ec1cca2d8cf09bca4ac806d8e0f315b52c7b4a7a969532feacc"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1dc97bc-8a17-4211-831f-8dd2c01399ce/9972b4153b37a16773b13ea0dcd12268/dotnet-runtime-6.0.22-osx-x64.tar.gz"; - sha512 = "cea7d3de081cdc6053861398700211561e2c7990be2e8d982b007f485321c5b6255622069d4c4adf2c0ddaefbd2438625617b10294d7c05dcd36d283bae40567"; + url = "https://download.visualstudio.microsoft.com/download/pr/3adf2172-7ded-4053-bc86-b5236b1a3830/80038eb1ea0019995c76660f18e9a290/dotnet-runtime-6.0.24-osx-x64.tar.gz"; + sha512 = "25afb6eb9d9404332efe32407e1dcef080a79372b8631b7720daf62bdea42c4fd36c1fdc12c6333c9c1754a1cb29f5ce64a1436e6392db396a9dce647a8f2c16"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/48cddb0a-2a08-4d83-b571-00772a73d05e/5489b285d12781a983a0f17f26973369/dotnet-runtime-6.0.22-osx-arm64.tar.gz"; - sha512 = "5038b29e5794271284d8316cbc454c8b1f1e54c30fd15305051008ff005a79ae22367bb2a50b03ffa4ce00228d1d82a3361d675a1a1a2c8ffaee3dffdd7c4eac"; + url = "https://download.visualstudio.microsoft.com/download/pr/87743def-9e7c-4157-8ca5-d818496e41ff/97ab6a39043f45d7701f91c422a663f4/dotnet-runtime-6.0.24-osx-arm64.tar.gz"; + sha512 = "fbbf6b385172700e4864db9db6f85bcec6fe447d504d181878ae7a3d7b4e06f19920c7aecbdb4c4700bc65f51abb7409cb68e99dda4af14319909bb2816c22ff"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.414"; + version = "6.0.416"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d97d1625-d7ed-444c-a7e9-e7b469842960/d8b97220d0d79119e3026da2b956854e/dotnet-sdk-6.0.414-linux-x64.tar.gz"; - sha512 = "79bb0576df990bb1bdb2008756587fbf6068562887b67787f639fa51cf1a73d06a7272a244ef34de627dee4bb82377f91f49de9994cbaeb849412df4e711db40"; + url = "https://download.visualstudio.microsoft.com/download/pr/675f1077-ab10-40cf-ac18-d146a14ea18a/522055f875b0a2474dacfa25729d3231/dotnet-sdk-6.0.416-linux-x64.tar.gz"; + sha512 = "5a3c60c73b68e9527406a93c9cc18941d082ac988d0b4bfea277da3465c71777dded1b3389f0dde807eda6a8186fcf68d617d2473a52203cb75127ab3dafc64d"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2afb4da-478b-4ffa-aeeb-a37a313d6fc8/0897a8456d42f306519de9a15b1e14ef/dotnet-sdk-6.0.414-linux-arm64.tar.gz"; - sha512 = "225367725fa2af00240654863c4dbe2370b95542d8c411a78017e37e13031a67049bcf570b94d9fdc9f61b1d13db7bf7ff9772bceccb70f43dd468302a47016c"; + url = "https://download.visualstudio.microsoft.com/download/pr/a56a7895-ec29-44fe-9fbf-3ea6a1bedd3d/47393de218098a0d63e9629b008abf07/dotnet-sdk-6.0.416-linux-arm64.tar.gz"; + sha512 = "b121ba30bd8bab2f8744f32442d93807b60dac90f8b6caa395d87151b2ffc335f93a95843f08a412d0b90c82d587301b73ea96f5a520658be729c65a061a8a80"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25ec70da-5c05-4d55-9f1c-fe103417da1d/afcf8ecac02c9e8a927c128c9a72ec1f/dotnet-sdk-6.0.414-osx-x64.tar.gz"; - sha512 = "399c9fcef1ac858685f67d33079a49fd814d90926d47161680eda23820281acbd3b0a98fc7dffedeb9e2072f68880d74de3e4ff4d369046af157817dce61d5a1"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd03f404-c806-4eae-9bda-0d002437c227/314b39bd905ad559bf38421d8184f0b1/dotnet-sdk-6.0.416-osx-x64.tar.gz"; + sha512 = "cccd47ac03198f7c2335abbf9ebaf11d76e229cd2690f334bafd70363de7045e600c33057d16689fba6ed95bb2f80ee8cd8258152c07c1972323471dcc6f2df1"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/72bd5609-d0bd-4fb5-a563-6f426038a7d9/01507b650934aab36c340284d0819ba3/dotnet-sdk-6.0.414-osx-arm64.tar.gz"; - sha512 = "02c65256834ed5cb947089ae4f0b2f5ad0bda44fd3abd06d9f5003e2090017a384a569ef08fa7f4abfdb368345c34242569cb81980c0463529469e522e742042"; + url = "https://download.visualstudio.microsoft.com/download/pr/ac99e470-ab07-4f1f-901a-3d14c9dd909d/a2a51c3f12ba268e22166cdeca54cc65/dotnet-sdk-6.0.416-osx-arm64.tar.gz"; + sha512 = "7099b3dba1137e1f429adebc3ebb4cd002d6528dd74426a687c2919b7d01acea49cb65c2cff1f1f2e283d96159440c60d909258d2350b8e76df3e513152b23f6"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0naka2szh9yxbqh99b4hswmxdspknckxm1dc7y56b8685gpwj202"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "1xvqqc7bzj764g3scp0saqxlfiv866crgi8chz57vhjp9sgd61jw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0nwnrchpajsllg2gxnxgyxgdbdamsnvpav1yv746bdjh0anb4yr0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "0ss0avj940d47pykh7sqsks6g15ny0qwp67kcbzb9nc5h6gi4p18"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "1gcv99y295fnhy12fyx8wqvbhbj6mz8p5bm66ppwdxb3zykjg2l8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "026r38a7by7wdfd3virjdaah3y2sjjmnabgf5l25vdnwpwc7c31d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "1bfff1342735kp4d9rhmwf8jflj40dvpy1gb3gvd7dri8vqhk3fg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "1d58anf2ws7gs52fyjj3i0fr62dva9va605vswl95d4w8av5bgnj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "0ygdqsd312kqpykwb0k2942n45q1w3yn1nia6m1ahf7b74926qb5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "075z4rn6nx5jqgxksdcr743mrbd6lw8hvsxkbmyg5ikqxfwqa1ny"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.22"; sha256 = "0fqpl1fr213b4fb3c6xw3fy6669yxqcp1bzcnayw80yrskw8lpxs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "04xvsm3kjh04d0cbw524f021kliylgi2ghcm7w0bm38p29022jh0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1ib0x1w33wqy7lgzjf14dvgx981xpjffjqd800d7wgxisgmakrmr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.22"; sha256 = "10dah19xqs4qkvirjj921hrkyrkv3a6gis562f4grqggmr6kb9a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.22"; sha256 = "0gri1gqznm5c8fsb6spqb3j88a3b0br0iy50y66fh4hz9wc4fwzm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.22"; sha256 = "04b1p8whw3jqxdxck1z5m5zpa56jfqrzspa7ahaq9xqqfacsfnzx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.22"; sha256 = "170d8md31m3cfxwbanpv2amr5cmd1kkl9wl2w0jz9ggiwykc81nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.22"; sha256 = "0k1i74wn6j7nq0bd8m6jrpl65wda6qc9pglppvz4ybk0n2ab1rbi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.22"; sha256 = "038bjwk201p2kzs3jflrkhlnszf7cwalafq0nvs2v8bp7jlnx5ib"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.22"; sha256 = "0pvab3a6h8cv1qjwkl90n44jh9z3aajgwq5dyq11hckxq5iga09n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.22"; sha256 = "0h1jr5lacsxqw4dx4fclxfbn711vvdkj7j7l2wq2iqhfkdj6r7d7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.22"; sha256 = "1bjy3zmrmaq97xp0f3nzs3ax330ji632avrfpg8xz4vc5p8s1xpc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.22"; sha256 = "1g190wngdz8758knb5ckgzip6hw6a72cjwiqgszmyh6hfisi553r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0px26kil779qjcram05smv4lq600l35r0klwh4qrwlrjq4pj2250"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "01gbl9dgky4h7ijxryz3527l39v23lkcvk4fs4w91ra4pris2n8p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0qplswzqx17xa649mpr3cvlap926hlylvk1hh77cpqyrx5wz7855"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "03nbcav8if0yjkxfkkk5sknc0zdl9nk3lhd847qa602dsigabaz9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "09gfqdxbh36bjx20fw9k94b9qa9bwffhrq0ldwn834mx31bgrfs8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "1sq1ygsrpv2sl85wrs8382wgkjic0zylaj1y8kcvhczcmkpk3wr5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "0svzrwz3zi40xab1v1fd1rk2vcmxj1y6a4q6ap5hx0y7pck3xlcr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "0596z83qqgrjvih2sqzjhm2i6ww8s3c4dhjfjl35d5a676j44n31"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "1nn254xv1hi5c4rg38fbfkln3031vv545lv9f4df31i8c1yfzz24"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "06hswqx0p4gdvb4r1ff77kwcmwsswhc0h79dffnmfdrll0a10yca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0rii1mcsrbz6j0mcnbak51rm7afbxhilkvlfgxqvipgdg0xq0nyv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "15k8187hcs54l1wjh5qd3w48sjcpad0z2dn2ng92kmay74jl1yjy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0nwcbkmxpjqafpbi7i1lrw3k235jn8a3g5aimnvppfi2plpys8f0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "11cgpvhrq80r2fra1fqpcarp02nfn69v27av4svmglkv0gqc0fvw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1x37zyxhv830480kdn96k1w6lh2yby31dpdh6w9yj475fh5na3dn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0l7whkm7lidyq2qdbrrvwi3qjk19w2712g9ks1mr4zgqcc29cipx"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1sj3a6g1l7g1w4c7wrxnswqz1n7kk7f0m63zx2jmqhvx5igpnnvw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1c25fmcb0x2alhnhlfclh5vk4b2rrd675vm21wh4jyjv56vls6js"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "04k53x0vc7zwlzxc8n5qg12wxg2r7nppp19sp9q4qfampyr92r2z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0pgjn0mkgwrwam03zwyi0f9vz7msnnblw2wxg67wwij1azmjnb20"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0p0xga68ms5m4a0f89jgja8r79ps03d3ka4m9ni9z7yzhq83fq6n"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "17hr4fpl6a8nq3qphhg7m8z5ad0l5az4whh9dk28n0yis76dy5fn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0qvqnz9b4cljffmms8yms9rijyfc18igbvg5l0qa4y50416r6i1i"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1m56r3admq89lwp4cxsinzcrr8hdl6rr87vj439p9xkpc8yw83a2"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0zwl7c2vjwwifqb9rfl5s3xfffhhlzffh12zjgd0lzhx7y6fn8iw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "14h04a5skmdlqd2yr00h3ybgw9mnvyv9zlpg7vij7qgdvq4zz8p9"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1gw9wmg6nqgahgk04g04rfg3v9d8rs4qfhiz6g4n4h6v8lxwirjw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "12wscn8jkpbgcj1kwwipyin0b61i99r0z6pwg5wrgrirvv0a9jnh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1pl1g7s58ay6dryc1mk1haw3g2ywv1iakqv9wazk9cd8d5ls1mpp"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0inrily1l901723j2ak983i79vl8ppb01khrpwvfnibcycj8l2d5"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0vawg1744bxbjxcb5jaqkxcz59bgpg5c231qckjiza2ycrw5nfhk"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1xywy4lipml6ifi7w8aghnrbp8br421iqjfni8pr25d9fri83rk9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0smyxwpihifgbyx8kpqbynp9az0m86k1s1ikdbinahglhj9bxca6"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1ixmmhyq37s8v76fsj35ffpgvab5lzh9wf4z3x0kkp9v561knh05"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "172wq4gdf64ri5qs9s33wyca5rg2mm9vbfzljf6dszy47847n5yd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0iginfaq7smfipidp8vr2jjw0i4xq8fq8km1ki3z6gkxp8p2w3i8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mb10yml3spgamwllqsxx0n7gimj8nac0lc7cz5yq56fipp4i14g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1bj7rkqiiy1wrfyiq47h671n5igphzd7xrpda7myzh0xcsvqhxab"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10yxzymgg8cxhymqhrcr9vqg102fyvh5dc2zrdaqxsf64hv469g6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0yv8jv3gbsji81pn72jx6is60gy4v4f657kbp4kk7f1q78vx1046"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1jsnywr0vd4lkwi6gr6s06pv2bl8dsjhj4q6vxk276i6bfxss5jd"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "02g350h6537fnv9zsw6i4anbaq5f4mrfsqlrsindxbfmqapnbm5w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0ipl5zjcmlzm0ia00hkqgzc20f6k7bsk68rr1yc3rzzmp6gcjgml"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "19dqa1s2gz2rfbqsqsnzxxybbkd2y412ck19y06vzbjwc3r5v358"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mn6zmgc0n7lbc6vxvnyxf5znvdzsqhvkyfhpfga67npj2i8w7fc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0razqiq1hhzrf46m71vx8n8gvraavndig5119g8wh7rlxhrrdwk0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "14v8vrfx3ncclki3nfhg83p01d7abwqsfmgqyjwka2slhjrapgpn"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1pqdmbcs3scxa1xqw4sa7y9dky9nd5z4vzzx5frjxx3255f8zcm9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0yabmsv8lnrvsylxvs96vswwky4slp3h9c0gn7x0agpwh7wzhwg5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "18zhyrldffv5scvwvc6v9p0dg606d204m1rdijr2sx1g4sg3gplg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "032zmbhry64pzk9vlmgk8pc1bwz0jcx8dnbz1w34wp8wwx8f0cdz"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0gcfaki5mf40x3yw97dci8dwlsyhjvjy0ysbid1g80ag9mkjqh4b"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "08057y5d4sjk77f24lnsiv8dbn2axgz8mp5sfzvmaqzzig3w3j3v"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zx164azcsrss62m8dk8g8nkl9kq8z7n1mn756jskdrdmdslqxjz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.22"; sha256 = "0i9gw5d7gqjbir7ip9904zj6n3sr81xv8lf290xbr163l2f181iq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.22"; sha256 = "1si0dmcjdwdm4z6x412hvyq35jps0rv1y483s83wkv22b0j7l3in"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.22"; sha256 = "0166gwarhhnary19lf80ff33bkx00mkm24f17bc8j6v7g3a7zvq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "0g2sc6359k3z3f6h2pqg8np2cbk57gpzbyqyn5ixlv34gv3pfhfc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1x7wclv93q8wp7rip5nwnsxbqcami92yilvzbp0yn42ddkw177ds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.22"; sha256 = "0km8184kma8kgz7iyl3j6apj1n7vskzdhzmq3myy3y36ysqrb4wf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.22"; sha256 = "0nhd7q0piy6frfv7fx00lf7hdd0l6mpj3bb5w2c1ijfqlcny88ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.22"; sha256 = "0vhpqbywilqkyyvlra6sq94vc5p76da962g550lmw18yfkzk5i1q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.22"; sha256 = "05yyssk0vin5s7r5cs43il19ki424ikpcifw1nrglw5ar700pw50"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.22"; sha256 = "09if60d7175yaraf1ljg47lcxg3wpnm3yd33a68g60zd3qi80har"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.22"; sha256 = "10bq9y4vmw09a5apyzqa8zgn8r1i0wysrqaj0rw7bjjl3iz4vifv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.22"; sha256 = "1l56sx3rjmdq8i5cwdzd90vkbx5nyzbbc7rzckmbw7lbi92ys8lc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.22"; sha256 = "0gqv5n9kb8avfn9hqn50ybm12hxxrz35gvvfrppdwdqain13ypca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.22"; sha256 = "04kkaxkqxw67cn58h46li5kxv0axkdh9f2mr22n4llysbfamzcd1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10rlwyacci7l8j028n486a1icbsx4lvfq92k88a4h75ys5iy9r63"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1n313j4lrdsr7yw8r0kxcd1137w4kqmsypjjadcdcq3wm1c8207p"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "126sn9p98shb8pbf4wd5vf94fl2jbmvshdkdmq4knyn8n6bg3kvf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1wav33bqfz7237cr55x3l27f06ybdrm9zl2dnapjp79ipp73vqj7"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "07p1gccdwhq7rsvlniwvy8ja4dbxisv4822yawffkwwmpnh94byj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "09q14pyk13ki8wc29wy87adq393g35aanfsp4bdag8gb68qlq847"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0hvjnnviv8rc3hgw9ypzvx9b19riyb0kyq34g9sg2y3bamhahd86"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zjdfjp161n48s8x4jx1f957j49x4g10f61p2b721cc616wfpvik"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.22"; sha256 = "1qcv9286f4c035naqfjmscqn11hid1ak5qw4lv51i0qijd6bkqad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.22"; sha256 = "141zgcsw9v8pyf0cgg6g433ba1xg87343gpcy9mpnj2jpczhh0cr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.22"; sha256 = "0cm4bv0izfyh6ynr9zdjy2gn6c6vsqfrc9b0pjmadgf07mw9sns8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.22"; sha256 = "1jci3jmzxjqi0h2fwmxqh8vss3cnfw0nv6bw7s13a4jzx1127cxi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.22"; sha256 = "1yx5y4s9ihdgk7pmc2il516w790d6rkklsqlxj5w4yy9vmj16mk6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.22"; sha256 = "19jrak7w0dbyn2jrvxqzjizafglw1w6v84qfqywbbqkhplr6km3a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.22"; sha256 = "0pdzn9s2qdw8ngk2ygnj6xil544h801xhxi0lz0d80dws2w8440f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.22"; sha256 = "1savfrhbcalhdfkc3z6008d7rx0hzr4ry3nvcw7kchx6mxf2pkxf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.24"; sha256 = "1xiw3kdc76b9hqf0pyg9vapdxwv637ma1b63am9dpvm8qprn01nh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "08670zhn2ywkwy0d7sj89rikxccy5qg0vsjwpbypvzndawng0bb9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.24"; sha256 = "1iwnzs8pfrkvqyp0idxc7bx4k8970zfbsdrk1xc3v4jw99hj0q2i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.24"; sha256 = "1d7j7b8vvbrdf4hiji5snmn8yi39scd2kvnbs5f9sy26424fz22y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0knx6lhlqxn3lkgakpab0663788q0si00m9ga7wdn2mzqq0s9yx0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.24"; sha256 = "0qci0ghi0cnm26pym6qlp8cricnbgzdxzwzc8ay1sdhha8dbh375"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.24"; sha256 = "1qr67bb1wqjs43xwypnqlrx3fzhhm9gyjwdniqr01c48yg8d33yw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.24"; sha256 = "07sr9hqzbm1p5cmvzwia30yv5cjf5b1bm0l4bx45sg53g8niramp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.24"; sha256 = "0cvvmh90vil156qqgy2kbv1j6sgrp4z977f3zrwbsw4pj9azdalx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.24"; sha256 = "1czq36l5l01f6r1mahzg8fim1qjxgs345mcyx1f4gq024dw1fmfb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.24"; sha256 = "0lriw4f48f0q2vyagbngnffshdismn3msn7d6dj0lb2xdkzsz1f1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.24"; sha256 = "034p01vm5jfz94qzqcvpph5fjk6rnkjwqlsm39ipc38f4r4a9iif"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.24"; sha256 = "1671gfqabmbqnjq1djx17j5q3zbaf6ivapixyhsla1bz1gadm3g4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.24"; sha256 = "0l2d49an5bmdfd7hgykkd82n7i1l9kpj5k3vfwdkv5274iaiqagz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.24"; sha256 = "1vyy01i4w2wcx82mrjjsbp98v9sjn1cwhdvkhrw8yrrb04lcxbir"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.24"; sha256 = "1ij8xlr044laq4lhl833994hpr636hyisx072c6wmmm21vr9i312"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.24"; sha256 = "1mdhpqdwcly31x08n6wk39n970h98kqgr6hrh8grqln2fqz2xgw8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.24"; sha256 = "02l6javfqwsaialkimmpsq3v4dhb1j4sxy19yvr5w5sdjmq1jh5y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.24"; sha256 = "0g99fqr27h1ya2why3inhcqhyrxrg3g0hvcnqvqp153njcbdl9qg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.24"; sha256 = "0i6gfdlb815322n4rj7mgagrdhpj8kha73r8h0w9y0bkwgjlqw6v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.24"; sha256 = "11nfqmjk11446nl4n35w2l94dsjbbm03lwz47vffibcqmymd57xh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.24"; sha256 = "1n0s52gzfc0i4wwbcfpqh02z3kdjxjpgpvslia1cf8v5wqn690pm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.24"; sha256 = "0j30fyz0cavqd059iviglpx1c3q7mlplvzhnwl2m46hdj18ln8pa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "1zcn4px94z67j60cidynm5ab8cln1rrxabv7c24mlajqnkfw14sb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.24"; sha256 = "1hw8rxghsagw8vd6f5sgl16s7x5d5ix0pf9zqs9zis1wfm41lgv9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.24"; sha256 = "0w2aq1bmbpbb2b79frr2j7xnf2h5mszip2wgaxzbl1vfsnq4zs3z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0rylvdvdc5rdmw2vcqi0fdzmiwwa1pwlqiavqnb2pslhhq8qg4mh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.24"; sha256 = "1wb4w0izm4njhgh4dji4zv072cw5h2jkw7qdaa98130ai5czg5x2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.24"; sha256 = "1crdfd8p83syn7m4n7vm82lr9lcrz5vq7k4jrk6g3xfgl4jkym2n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.24"; sha256 = "1pc0f31pvfzgdgwlnvpjysvjmzakskllccrsh5qp28ccrr67ck0m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.24"; sha256 = "1lpb81zpfdiz4c1jyfq7y7m4v6icq8b8dg5ainrxjzjz8qjmn7qc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1x3h6w52ab7cwxvshnjbhb9vdfifbnjmwn2kgw2ngl6qxvygikv3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0ncqxzbpgfgdhrvl3j3csmr749nlzxp7gqf467wsgxd9kri848rv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1a5935lb2rb9hj6m08fh6r0br8y3i7vq5xzy48hanjdb6cair3k1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0l5n8pl4i8khrz3nv045saihvndbgwqqip44yc5r5abjbpljp5zq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0yv1bmgg85g2abph7wmkv9y7p4s5l51wa3j18rcd7wx63cjik1sa"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1m17lihc3fya44y4vpnacbia773gpg4bqd0gy3lw86gx7rs4n343"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "04q13b76icmbp7cpjwfbw5hlqxnqlrgs0d0xsp7hxlqvnpg1ba9a"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "14p0wpb8w26zagjnp9jvbdqzvgg04s3b9midhz47zr78qjqa0k41"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1n66dxxkh5ax83wp640znw80s1j03sq6zbpi1wsvmm9xbasskjw6"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0yg3fc5x7frqmvnca244rhwbqwmrcyrqwp0kv2102fs08fjcyk5v"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0fdnvq997sq16fkc9sjaghzmbahvp5k6zk24s8s51ypbniynwpq7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1n9bjddbmi6w9bsz4vpc9fx3wyn6ygvh05wcd98d3rf0p3ynghcx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "14h9xxha2qb2smnk2iy6inhwmsjmkpv4kd92l42i0is19k1sq852"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "18mmlg42j8hs9qlq74pxhpj1sm53gqclsrpdjq3d4gpfg6zz7h02"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "05s0qdlyasjrr8vf6kfx18vixn05iwsk23hpsp7qdjvx560kdza5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1x7nqpb0psqk7q9ifhw149b6awcpm8lgpy2pxz03frdnbpjms7x5"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1jigailv8p3nmmy8qpscxyq8zrdlwkfrls3qicn9arp9ni8phmgs"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1pycy8jspvdga940frd06smsipq10bip9ipd466pnqicaa8nawjn"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1gm99469wb35v169dpprrnkwkvbzh6v2lapkw4v8mx4nylfc84dx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1sgjiaync06gy6a1zmpyvikbk3l868k2qg3jag1dyyyl2s1hp02c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "14nh4hlk9znngl1kl2bhi0ybpsn1kmxb0hq122zqjwvjbfqahlzd"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0y6a53kfhwaddm7yw263yyn6c5fghihlh76mmfi1hba9bf9615qs"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0ya7bx3lg92bil8mswp9awhlr2gg2z77kmw90l3ax7srymbimzfn"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1x1hlgn4j9vql8p7szrjrli46lyjn4a4km9v3hj5rg3ppm1wd7wl"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "12b1l6fc9dajvb877kffidyqiicfkk1cxpr5w6cgcvfif3cxak87"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1dpkwqwj4ldasixv2lkg1smql3cgxavswyk53pflr604v1519f9g"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1ma16r7q1y8000wcwa3rxk5p4j6pw4gdfhbf64cymcahn49azh63"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1kf26qd6ajcafssk674c44nmqr68bp9fibgrglqz67hz9r8w84bb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0sm8r6zdwxnwv947yszq8p5dl05j846lk2l0dxbd78r83iskmpkm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0059gcn5qkbkqcrrcn75nvw54jcc3q06jyq87l4hbvm9l1w6igrg"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "137nq1bv3q48cn14annxsf2zqg19ppg81fkan6vjbb9vwvcvkx25"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0gz9ipmh5sn4fds2baqfzc8gzalwmifxs2h3qril1rawxkz29s0z"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1h2pp8p38ilp1hlrjzh70vq2s7k9n4jmcsjpcmzghdaahdg2m8kf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1npxp73s5pj6cmy9j2cxnfr3cvbm86g6jmq6194qpax9b3xh3a8r"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "06v40vi7ckrn1rl8ynygxaxr0dj0ll5qqsx8k11qk8dpc6849zrd"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "17lk8414hnpn1lpxnqqlkk612l5dyp9yr8kk3hqz7ygi5i7m0igh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1qlxjg6ynf5fkswb65bk0sg20yklq207x1frq2hrccm5s2f53v8w"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1a5wq6y4qixjd8xadw4wfwx7qrbz9rvhfq5f61sfgsc14lkqjs0r"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1biz5x9pznlnik0k9jz462z5f3x87frmxayikcb655ydbaiwibkl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1qvqfkpr8vrfn3p3ws1k4b7mv4n4swc31grvs7bvx6ah8qfacjgs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.24"; sha256 = "0l1j6ybwawk6w01ffaj2rs6wac6p0lps2wsq21pc5imjcbm2mgyg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.24"; sha256 = "18cysr0gbw18hkvc03r6gmllp2s63a0s5xvp02iryrdhaa0vr0qz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.24"; sha256 = "08kjhz9cw50vw3rd904r873fvdm7z4w8lf9k77ws834k92hr2yrp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.24"; sha256 = "0ygdkff2qln45nc9yb2pcrpx3p01bf2bk5ygm34p5mcfqys9yhpa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.24"; sha256 = "1fy1hr14igy4lix4vmwkjj13cbyjjfhx8izch9cd9hc4f1y25767"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.24"; sha256 = "09h7bvwsi2bpd8c9p11amqj2mw0hl4rzla333xmz28p3jf2l06yh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.24"; sha256 = "15sqxccpc9s8djhk1cb1rqlgw20qd2bx8iij0i11riblqg8n37in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.24"; sha256 = "0vxb0a7zvhhljv8w5bz7ryn8hl28r9j0s20xm1rj4ifggpfkgzgm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.24"; sha256 = "0is94agm1v7q3qhxx8qkfxip92zikd65xq70mg7nl0qms8p4cc41"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.24"; sha256 = "10yk9qlw0v0dkwmzhx58spbpab7xlkxnlzji9dcknmb2yxh4g870"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.24"; sha256 = "0bln3fn5pyc9s03yyfln517682jcnmfnw7v207swdn2qrdcfgdk2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.24"; sha256 = "1yxr2n4p6ijc5hi5ym7hbafqgc6b0ckl7wzh2w829mmg16ww4nsc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.24"; sha256 = "1bryp4rpa21q7fmlr71j6p9r9p30f09mzddkg3d85ll7faap7iqx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0v2bc1is8786h50nhzf74sm90l1knn85a3f7phxpp8mdsn13ff9z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1wmgjg4fl9c321yklb0nl0rzj83646xzcf9akj6nzz9ihmq5jp5v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0ikg13k88chg6wv8d9bpivnn1ldpnx2yqs348sk6l4i2m1wyz5dz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1d3qs0cm2nmf99rv0milmh3g6y5riz66xlkppc6dhn8p1lqrgaf5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1w5gjdv7dpig78m334bavlhl6938g5h7bsx26wlzb3rzc9vbyv5f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "06fhdy6hm78hsscdlc8i22wm439z3fw4003i5r03vvwlpgwm7y3c"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "157gd8fi7vx2cbak8k1vxri8fy54f4q02n6xi0jip8al4l018kn5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0sps772kj4sa7cb6rcwlssizbxj7w7zvqfaflalm9zq2m23v7q3s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.24"; sha256 = "0wsmpychdx33pcn6ag6wk0z728jfzi3gds0azh7mv8qizg5b7ak1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.24"; sha256 = "0lc7ckk83bc301kqascqgh2cw0f20rmi1j9144yikpr38x4irg78"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.24"; sha256 = "0k0vyq8dixgp87mskkhdn8bbhdpza1imjfx1jqycms6l4m3aiffh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.24"; sha256 = "1g9dl6n77b9bfraz83hsb3qc74g3wjciwr1r5q3m8w44iaqx6vf0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.24"; sha256 = "1iabbhilq865ccrdq6z765ay6xgqlpcb1abzkaw1kr4lcdp5qh4q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.24"; sha256 = "1hvz3zfgmk6pc7q4f400fnd578yfrah69fm5ybk4lxywkydazjn7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.24"; sha256 = "12d30k8ia8sl4n4q4dzqx2daj7zs20h439x2lgj9bn9gxbrc9kw6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.24"; sha256 = "1ibh79yqbbxxvk8h1nr30kmcj7lz7y733sxdbvj5a28nbvka6axs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.24"; sha256 = "1xdnk0my2j1smvm1lyb9xxda78nx9pnl7pnjyaxbyli918qayyjg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.24"; sha256 = "1wxdh02z70dx4x3vx6bq1krc69irrdiar7662wqkcic3lkgqhdpm"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "18h52kg8brvdm2kagjm4lfkmy42sqmxc3avv7wgn1nxrlfdl221l"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1xbvhii2p53l6xklg2m54pyk6ja4480hkyykas5m7gvzwglnlh2n"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0c8gpc4qpr2v6hwn7qswdwyv689gczksvfw9wmqij0nmy2fyrdyz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0x94xqff4s0nnwslpmyw1g50k4vsrb6g2xvqmiis2lg8422xi7jg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.24"; sha256 = "1s9vsk81c8bkbviig3x0i45skhsifxwn7sgcg417pvzj27l495a8"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index a9ab7b4a6c..837e3b3379 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.11"; + version = "7.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/dc2c0a53-85a8-4fda-a283-fa28adb5fbe2/8ccade5bc400a5bb40cd9240f003b45c/aspnetcore-runtime-7.0.11-linux-x64.tar.gz"; - sha512 = "a5691a53a1be91751bea5c1f6faa2e93d19f5be61dc5a4953a6d6ce33359f78126873022fa1a25e2694dd85ef9671b566bf8b6c5f399f1eb017ae26833867019"; + url = "https://download.visualstudio.microsoft.com/download/pr/a4ac0f7a-a65f-4222-bd1a-c1a94f7df32b/2c62b82c325a8c396db10f09cfa952c5/aspnetcore-runtime-7.0.13-linux-x64.tar.gz"; + sha512 = "930c83d7b553529f37b1516848f64ac5bde479bc5dff5e89edaddc4f7b552924f9b51b58367df8cadb9055b4a7220bfa5a4d39e09fb6b51f4bcacf3b82416ba3"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cd1c8c35-921d-44dd-8296-f76126a73e86/5c7c20fb1df66c7b1853f77ffe858d1c/aspnetcore-runtime-7.0.11-linux-arm64.tar.gz"; - sha512 = "e8864d261487d3077b0637e710d9348209dd7fe19a0cdd60edde2e43d238f1e534b9485282230c8b1cea0faf4bff1887f07dc919dbeb9ea7f97d4b26b9c7aa91"; + url = "https://download.visualstudio.microsoft.com/download/pr/53990197-c340-4514-b12f-a6c6580cc1b8/c25e55e6e23e7bc94701dc982525d66c/aspnetcore-runtime-7.0.13-linux-arm64.tar.gz"; + sha512 = "a091c7bc7dabf944ad2888908e8becb0b9ed6a8f3f0475c845559804bfb35d6d76fb81ecafac4d9a589b64837258304d94d5c412ef8c75e138582072081f270e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6df3136e-ba50-43e8-a68f-93e347c63693/e1b7ad4c0009723ab3a83db65969d0b7/aspnetcore-runtime-7.0.11-osx-x64.tar.gz"; - sha512 = "c0925ba2ff686438a40e5b61b660dca48103b37ad42f30828a1bf20ac2f9750a0f2643beb533eef877519f56757f3d4c50ccc5c1c172527883981b0d7974677f"; + url = "https://download.visualstudio.microsoft.com/download/pr/1858183b-b0ae-4866-86b9-af2efc7bf05b/d69c3f2f527c182a841c7233dedc496a/aspnetcore-runtime-7.0.13-osx-x64.tar.gz"; + sha512 = "d635ac072df5f5cf587470c656b6a55e880eeba2f00c12cb6e239d7cbd0a52d92b094379de80ff60fea426049d96e54e095417f089890eb92630d3c07a20a67e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7ea90e7-5d92-44d8-9b55-211182814710/af6bbc87d7505be5d4b22f130076a65d/aspnetcore-runtime-7.0.11-osx-arm64.tar.gz"; - sha512 = "799460d18543a4e3fcb0b0ed824bbc248afd9374bf74142d12a65d422aa8eb939914c870f3d575ad121d035c19adcf4423815a34e24969b9eda15a2048de8b68"; + url = "https://download.visualstudio.microsoft.com/download/pr/a7823689-d818-4744-8bd3-fef504768c3b/7160531d6f935155772e4b0d4a0e3b78/aspnetcore-runtime-7.0.13-osx-arm64.tar.gz"; + sha512 = "6734869eaa22f163d8fed52ea3b1f11f22ceb0876337114a0b9927a96e4fb82f826b6ddea3dd7061ac02da2e13c32c9ae6c946ca5ce53007869a97c0cdae3f94"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.11"; + version = "7.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/948e3f45-a2c8-4d34-954e-a360851b7ff2/aad7d4a9b73242625bc33b0e9c124478/dotnet-runtime-7.0.11-linux-x64.tar.gz"; - sha512 = "110db17f1bc9e5577488e7f5425c6c639851af68c8d7dd17b0616469755c27d3c8a78ab01aaab13ed4849c676230bfeef9113f1dc4cda34c5be7aa1d199e7d57"; + url = "https://download.visualstudio.microsoft.com/download/pr/084709e8-8937-4c46-a361-28212cb2838b/4c5d7393c6e79f816a1591264411c22c/dotnet-runtime-7.0.13-linux-x64.tar.gz"; + sha512 = "00a0b9c101c665ea9e751ce645c68840b02450c4a9f268149e6f59da1f179e85f0932475b8a72162b5271fdfe2ddc88eb21d09aa78bdd7dc285983445503f758"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6079be92-f70b-447f-bdbb-ee85e5b04d14/249738ad78341a40f9765599281579da/dotnet-runtime-7.0.11-linux-arm64.tar.gz"; - sha512 = "567b39c4b8ff278349fa76522351e6f399eadd9a86189150a312fa7a4d365c60ccad8a06564ff4b8acaaeb907222d6b154b711e324989f7f6c234dc5a85ea0da"; + url = "https://download.visualstudio.microsoft.com/download/pr/08f8d331-b20e-4400-a1b9-ddd7b4977fad/b162a6c808f713914ad3ec65f88521d9/dotnet-runtime-7.0.13-linux-arm64.tar.gz"; + sha512 = "e3a465923ed3325f3d427a4737e0e23bfcd549b1ad2c2374e65a3d865553790e644a57a0aef676893050085a389a846737ce6ddf6f2f53e7bae7d3f6253c06d5"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ffaab50c-bc8e-4b4a-a1e1-7bd859a3e7dc/5e6a62a33021d44df7807e3fcca4d111/dotnet-runtime-7.0.11-osx-x64.tar.gz"; - sha512 = "5e714641c1693abe2662ee71f6aae7ddb35a8a3869939f024f63666d7e90fdf2e5e25af5d7e53c81fab293706640c391ce6be4f737df3fe2a0d769bdf443178c"; + url = "https://download.visualstudio.microsoft.com/download/pr/30e43cae-eb9e-4d8e-b1ab-bcc4773f9fae/06137966e03cd705d55a86e10d8a6340/dotnet-runtime-7.0.13-osx-x64.tar.gz"; + sha512 = "e28407e6e466ce8708a9648e59df6b574da5794c61418217edcbcd068bb72086761a7a9f09c3c35cca3f7bba9c8aac28c8cb6b64b6fbfefbc3016dc1f6292ab3"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6120c903-2058-4ea6-a62a-6b246750c2c9/28d586c9ecacc7fe95a65f98dc6acd6d/dotnet-runtime-7.0.11-osx-arm64.tar.gz"; - sha512 = "546ec5050ebc70ed17252d401cc43c9bd628fbaa40a6a764a4ca567fb37d0db14a6c0e28a190bdd74254e886aff9fed542830224f0dbaea32792235386648ea8"; + url = "https://download.visualstudio.microsoft.com/download/pr/ee9ebef3-f459-4337-bd45-521c818fae52/58efc8c2ea98c0fdcd8ebb15700a0565/dotnet-runtime-7.0.13-osx-arm64.tar.gz"; + sha512 = "d0ebff0a46471ae1450de439b870b775e88901e05d3716261371e2283b5ae469bc03b71f545d08839990e7473517bb583bb6174215e412f10d873c9de5972f06"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.401"; + version = "7.0.403"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/61f29db0-10a5-4816-8fd8-ca2f71beaea3/e15fb7288eb5bc0053b91ea7b0bfd580/dotnet-sdk-7.0.401-linux-x64.tar.gz"; - sha512 = "2544f58c7409b1fd8fe2c7f600f6d2b6a1929318071f16789bd6abf6deea00bd496dd6ba7f2573bbf17c891c4f56a372a073e57712acfd3e80ea3eb1b3f9c3d0"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff8c660f-ffa9-4814-ac2d-4089e6ec4eb5/dc806d344844f1d58d8015d105e85c65/dotnet-sdk-7.0.403-linux-x64.tar.gz"; + sha512 = "2e96fa4ee32885a4433be12aac0e10998f9e7f0fe4791f33cd31966c0e0d345d978514787a36c5f0f43c7754e9639a5d52fc96c9f44cf56c0cfc9a8ad2620dd6"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/799b3459-f1de-4c88-ae38-fd1aa76c2d73/db275a0fe9776b55cf0f81cb0788b6a9/dotnet-sdk-7.0.401-linux-arm64.tar.gz"; - sha512 = "7c6ba2047998c906353f8e8d7fa73589867f46cbc2d4ece6cc7ee4ca3402b6a18717089b98002c7d15e16ca6fd5b11e42037b5fb0e25aff39075d67d8be49e25"; + url = "https://download.visualstudio.microsoft.com/download/pr/558bb19a-c08f-4aa4-bcbc-481e9b050031/4de7724688881c9ce6f0e5cfb8a2acb6/dotnet-sdk-7.0.403-linux-arm64.tar.gz"; + sha512 = "0980f3f888f1267a5dee5c916ae8d0931f0c6789f1e7334fb7b4d5ab27a1876ec014d30be8977d314e4aa7302b197dde09ed39cdc5ed84b366307148d5350deb"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7190497a-9e02-4369-ba8a-29e7a4acc69e/45af3f104e254cc37cf48227bc8e464c/dotnet-sdk-7.0.401-osx-x64.tar.gz"; - sha512 = "7c0ffdc756e13606982a58f21e8fe6fb4a0cfe0210ffba925e81f70b0266715f17d2dd9efeac72c23d552f099c173b04c1c31d07a050151ffc65578ba2d922aa"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff4be5da-8947-4b41-ad0d-84c98bc6d36d/4a20953b6b2aaa5ffd0f0a37e723698b/dotnet-sdk-7.0.403-osx-x64.tar.gz"; + sha512 = "50a38d89af656ac5a3110761182c1b8b6ca15821eb4fde8d0eaebb6dfbeb4c9046a80c00004cdbdb4e5165c6cca1f2c6ef0ca5ff84fc9c32b4c298a9f620bac6"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4246aa3e-4c90-4022-b3d2-5bf36547bfa6/8f75268f923723fb2c4a44b271dbc042/dotnet-sdk-7.0.401-osx-arm64.tar.gz"; - sha512 = "64878c33a80a13eeff58304832b8a00bdea7da088d8683903c4adbf9f6aaab4ea9bd55f5148c76518526d483ee43ab8a76f07afd60da5fc8081456f0448ac3ed"; + url = "https://download.visualstudio.microsoft.com/download/pr/ac1ec933-8265-46e4-b725-5843d483aba9/f41605b8581d114a5131f7761f703a20/dotnet-sdk-7.0.403-osx-arm64.tar.gz"; + sha512 = "6083b9f469dccf097a6a1bd4a264ab5438bce653ceceb54cfba25526845783e43e57e6b57eb6c7b4157108d9572ca62d8df2ecdbc1a0a36d9f08310b9bb3c9a1"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "1l9vydgqzsl8mcx2b58gwkiqy46v14by5fh6im0ibcpv1l8raijj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "0hmsqy4yc3023mcp5rg0h59yv3f8cnjhxw1g4i8md67vm5y04lfv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "0dazipajzj78i4x8f7m8c7sa890il4b46pxzfyz2vq21jb2g9lv9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0d6ny4i84fxzadvxamicr5qlmpnb1d6zndw8rkrqsaskpl57l0dm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "18sk9wka8z5354ca77q43hi0615yjssdjbyi0hqq92w6zmg43vgc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "0wxw7vgygg6hqzq479n0pfjizr69wq7ja03a0qh8bma8b9q2mn6f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "1lvjhrv6c4mmqa645ml4rfj29ardpgxq7rw2jsnxr4qyv1d8iba4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0fmnfq59454vc4jsynvqf768m8qzzbnl9gv8w4q15wz1aqy02789"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "05ywwfn5lzx6y999f7gwmablkxi2zvska4sg20ihmjzp3xakcmk0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "0b3sqvy48477yxzh1jfwjz69nrpnhpmy063zb5qj69birpcqriyk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.11"; sha256 = "07i1axzlpkprd9imiqxvaxwwxzdrmq8s9vd8k22gdv742wysf5pn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "1i9z9q6b4zna1vg53cz2zxp4fv09jsr521nab4yvavzn2khsb32l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "1j0zbd4rmmd3ylgixsvyj145g2r6px6b9d9k4yxxg6d61x90c165"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.11"; sha256 = "0jc8gq3p0qhd5ws9cwwrjghvqbxb5p0chp43na9knkw6m0wxdxdz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.11"; sha256 = "03nkxjn4wq30rw0163rqi8sngfxmcvwgm0wg7sgyb1cdh0q1ai68"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.11"; sha256 = "0azkiy2r6zbgbcgv8ymdlhwydmap79fw4ws1svyl2yy6ws3mynfk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.11"; sha256 = "0wsy6m1i8znx4y2jf04fnzr6kwzrbqyqvzj6inmdpdnk845lfcw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.11"; sha256 = "12hh69sr4wf8sjcw3q71vky51sn854ffahbq6rgz3njzvbvc0dbj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.11"; sha256 = "1j1k735gkwba93n5yck87wppfpsbny979hppcygwrk81myf3fv03"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.11"; sha256 = "0hj29pn703vmhkr5x5rx1a0g91f0dx4h7synn1zk4fyzdc5bvj02"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.11"; sha256 = "1wrwzn4zg5fh00pbiv1s4b8fbcz99vv4x2w0m192k1pz84ywgw8w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.11"; sha256 = "0ifshdx19bgnbgynbk6iy6gybnxmp63nylrn7068x66hvcavh7kh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.11"; sha256 = "0px0ha4a256rawssqmzsi2grmydxzi31r9xxqdq2sn8dfpvdshzk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "14159534yavrgrw04r63rcgvdnfv83xcplvb8h2nhrjgsl2kmabk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "1gzwc96fs222ddia0k1924cn7gxm2a4anqgcxhmavx56x76wsy6f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "1mfyq49hcjpj93zhxvy48hh3xji8jfj1hc8caf5wap4jna9rn2dx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0s3jx6gmjh907kzcqmd26202vl0knbxqbkf55m4wsk7ar3mgc8m8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "0vxza49wwiia0d3m887yiaprp3xnax2bgzhj5bf080b4ayapzkf9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "018qf23b0jixfh3fm74zqaakk01qx6yq21gk2mdn68b0xhnvlzma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "06x84avjby7q10shqgfzw6z9d2smgwibg51vfw0dzaw648x9mh0a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0i7x1da6drv8wl2ml9cpzbdalnmlkz86l50wgkirgnwczh3ia054"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "12xmw2kcpf5rh8sv4y0mqzp917f7q8g4mfh5navqw4jmnxyb26qq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "17n1m76ac0i10vkp3y04fd8wyxf2ywjwc6m9a8z1gxgwbmfajs8h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "08flk8ygkyzys0iwv447gndnmfqf9b02api0dcqnzq7zhbgvhxyr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x9pbqldaz0h2zmw363q68a9zxp5d8xw45s1i40fb2nwl19qqvk8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1x1n63nav3x1is0v6glzjy8wbk343ns7n34q831hw98l4v4gs8c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1lpyhwb27fk0d07ibq05fyvhx5lis7gzy3fb2wk617vbwa4aj5vn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1yzjid5v639xa91l2hk7kxj2a9nszq4qbydxwlw0z1c1vgzx6lzd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "10k58ncj2q9d2aszwbqldyprficbg0dlv7vy874h8ws1ds43hgpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1cbzcxwm5q51sd3ba3cfnkmwf72blqy01j98j3p94xj0fp44s82q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0k7xdk2k7jrrlas8g6yw0jbmm6gch6ay2vgnayb4nay0l82zczrs"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1nyj6d3ys9c0ffhy2vjgvkbc7z7qa4p7j0z1w76zrawmiikj0j9p"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "02faahlcq4bl2v0rkbpf1gv0a45vk4xcazbcb28iybdnqmz0jb7v"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1nksv1xyss8nhin1ac179w05dfn1181amkk4mb340r1zc348qm6j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "031n5cmmz6z01z7gwq249xc1rysgzvvy0s7jznn9mfbyk7b3f3cz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1f8s6y4pyxj0w8l3hbvsyph776c4j0w51h7y7bfb6ldpaa4rf7fz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1njk2rc9b1vv9i5v098iycgfsc1wq752x0dj0qpiz5ahmknwgjn0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0bgdv0j8mhqsvw7zv225n4x4dlbhassl5klga9zhxxh1dnhfhnv0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "02pkvvpib02rv0i00abygckw0q5rr5ykv2ffn1f15lvfcakssmzf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1spyrjrb5nbawj3npa4xjjl3yq5d2fd1z77bqc2kjnsvmspqcwdn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16ddj8gdwhnbynwdfrk56pk1nh38zs7amibpw156iqc0plwpilgc"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "04shzps9lbqwm2njzp8p8iay9b4spj62rgnz79qnjk10drbf4f35"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0szgfr0r9zqkmbbmcvjnylyvkz9ppfbx1k1dnib6wyxfaiapnl69"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0gpprrzbvv89kxg9k4sa6j7b16i153zy53ailnr3gqaxw3lvp8ra"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1gz3g8gvj5gyazlr24x9cxg81rq6wlzy42zc77dxsrlivxx2jwpb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0m9h8f9vjpwkf7rcfriqfga11gchv28r7g6w22kc3gxdrba87vzz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "09zmxhxsjbp9qwjhwc6qlckavi62iqqqa0xhd7cd0x834c2v7jag"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1hb45sddw3fxlh7yajj2z2s5zzw3sz117p2qi5ihqb0p7chpibv1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x7n2pgxaj2iq6piqav7vfb24n49szrdyalxa31ypkwb4b47s3lp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1qznwkwrcl098xwzp9hj0qrz0ch69g0mbg332md94pnzw70wjg1g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "060hg3kiy679h8n71vx7vn6wsrcb10cvnr9yzkr9j060rdiz1jw3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0mjqsvqd8basizxfjrwj1a5ibjajpm1n9xg800cnfi8m7i9gm9wn"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "010icnyhwfxz7gv5s28p88zvg20lsm1fxlgwdcwgns7swiv6vj75"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0ccyrh87fl4bsxr3a6h54cbnxpm7igm32jfh87s6if1ikb9wp09x"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1mgi1gl3gvd5rirj91rar32s2ww6f3hf82xpbc3w8bjn6dlnd541"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0sck1d3dgk78rr6dmsdyrqibp8sk4k61286zvc9h2lzl3fdxizj9"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "017x7dyjvizddd1fq87hijjw9n4dq9naqqksj25pc591f7zr181m"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1ajc5ipw7wjw0c07zpf2bjx3sch3d72njpdwg2j561a6v76cj8vx"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0mkjr1shvvrh5rx3q76dp2jrk040ivy1k34bkirms4kh8y680jx4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1ni1q83679hchrsmbr15ylj1kcbmaw3lsgfp3ml8m2xig1x2hngw"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0ivy2mi36wgmpm0m3rwmiirzbvfypdm63sh4nw6cwkhfzcy7ngif"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0j1ywgpg2m6pcq9c5cnmac0shjwq6y6lr0p05hzrrkl9amsbgl10"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0bnm6nq7y93z3q33hgsw112ch1kz39bkw46yn6bl3gs2vwl7pjxs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1n31igwjmjsl5rdzyamcr3hr7qgj4950z3ki78adfgcl0z1a98kf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16cvmpkiaah393pxrl955gd31b9pc3z5pm3wd74r6sd687irgi20"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1had0cfkfr9jpbl4lf53dn43c1yccsns9wh45di87in58sr52k1w"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0xr7anzg7hazhczm5kh28l2lvagzxk4y56rb2xlmmmdjs6y32rpw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.11"; sha256 = "0knl5q76l171fnc3q8yl5f81vv5bkg5m67xm6h0c2szal6s2492c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.11"; sha256 = "0cxw0ck22ngw3l4d7v2yswqiy7rbcrxgbjf2d98s1k73vrpv4czv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.11"; sha256 = "01km0wqrga2bd2mir9syh2qiglrp5y233ahyf5vhf5crb9m01g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "040zkvkgyx0cdzgr21x6ysm4m1nb3y64yn80ffbkr7rlfqfyd2rn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "15b62hxrpfy19xvyxlyligixxpa9sysfgi47xi4imx5055fhwphh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.11"; sha256 = "0i8h7ifrni8hnawg59wkicrnz4xz7ihidnd7s9xz1iwigaq3q65l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.11"; sha256 = "0a8fa0758i1gqb44n2v7ha5mzqp9n7rnwc0f9vac11glkvjwba0c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.11"; sha256 = "0g16xzqqdzzrk22dqvn0wf55lh3rk77v8m2kmk7ac9ha77pm5a09"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.11"; sha256 = "1ddhka5hpwbfqmz7gklg7w8vy6vy8kja1wxbfyvcx806wj4z6zzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.11"; sha256 = "0gjmkkgd85vbd6zj69hr81jn2cbj9zlhxkskmhjsm70k6x9iwbxj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.11"; sha256 = "0avrzj53p512565m904v54x72xmkvznr3jp5r7psjvs4hvbdg26b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.11"; sha256 = "0f1fimz923ahxw6cgz6fkz2m1b3clzi9k9yb08y8zc6dc5jc9kav"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.11"; sha256 = "1hsp6kyw0l88f2i2r9xsyri907v7n0m9ncpr8j4kbwr0ibqnnnxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.11"; sha256 = "1shdz0sx66vjv26hlyqvyakh8swmq0238w74lwpihpml1bz2bafd"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1zd472n2831hmpb14zzcqc5p0rdwkpm1qzw3ciqs3rcapna3bzs1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1ngxsy9fcsx8rjk71skx9ih1lrj3hp809si2i0rykp8sk95gihvi"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0s5cslrzmv9i2755s251bcf0hpkr8kh5kfad89pympryl0snqc6z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "151h7vkpd86psgh3ykxfnfj74sccbvzii07mb1p6ia52l9jihx2p"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0k0x4v8rhp6hv30r15g2bny46zx2d32dlf4a5xlrz7va7n95ld86"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0cdj4sp2z7gh861m5w98hr64inrf1pr302h0dhabipkj8891rp7q"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1xbvxv7qhgyxl1a1w9jm46zrkia54r8liw5ssjj4kg9cagdxml4m"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1gh9wxaldind6xfq6ychizaq18s2kf5n377h6wbxra8055nr96gs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.11"; sha256 = "1iy49hg0drhcrqfn6wrvk9cywdbv9hz061yz3216kih02pfs3hv5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.11"; sha256 = "0bxcmi9zx1cqwxf1bzk3n9cmigm7flhid4qr7nzkmlpczdbnk2w7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.11"; sha256 = "0vhqzbispsdcwywqzz7wvbmm9sr66j2d67nhbvcm283s9ms6wcdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.11"; sha256 = "08aib3f9rid6h04r7wk8129qmhs9fcz2qav6bmmjd9gjf9i8iz9y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.11"; sha256 = "18r221rvnx66n56yxqlwh7lddis1zg6z0qajnraf430k8ilbjwj1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.11"; sha256 = "04wg0nvq7yl7llk0gc7jc29iv7bw8ablaajw3hrzv0yx6kkhbb4z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.11"; sha256 = "036vlbafkjnlkqml7h04wbf6qkxnhshl6m9a8x4kdf9w19bcs0k9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.11"; sha256 = "1c336daa0871l42lwwq7jgh7mkbdbc877dw864wwv2i638rdbnp9"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1mzr6qxz2vnc0zy3gs87ignrq7yiid61b3v22ifv9cpz4x6vdd72"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1y41fwdkski1hl93x1lgkdg81jnjf2k57n5adnl8faqb0ybdbijc"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "155qq0kls43bigrn7iikpw7zn0am51zaf7nya4gb3ayy9cy6s35n"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1yzlmivfm66m6axqlxv99yw8iffl6kn4bamxzzy7wwwvh25y8440"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1qd1rm707kiwdp5kbp8vqnspvgjdd93x3iny6pjhaavjk0mpbrwg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "12341d3xya1icjphf8vscnygcnd3ydb5c1b2k5gq7nfpdsdcxym5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1b1qhysd110a0l8p97yvwgl3q837h2bw56xmqxfsrk4qvnp9n4il"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.13"; sha256 = "01iggc6rxg20min4aa3x8v1baqr9qikf99nal80llyb02fq265hs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.13"; sha256 = "0x760p4jx5qydsljc2d5r0qkvnghv0axzcpgyzm8pvbfq1kijrj2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.13"; sha256 = "0z2qsiccm7hkkdxd8l9yp9ykswggaykzqawjg51wxh7nq5rmz24y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.13"; sha256 = "10nks106xh2c6w352bzamba8ags8yvbwkiiw0mj5imrqgi0kvd52"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.13"; sha256 = "012xh79xc2z79jmqjxmgwjw8pbg1my8v12glx3dm3i5p7syccfq4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.13"; sha256 = "0nnkr84pr5zrds8mzf8jkcg9aj85ssjybdqj5khmmjjvailljjyn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.13"; sha256 = "0jan2ajrdmjgxc4hlany11rmsz6pipn8z10jxl6jrab4zb7xv0jk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.13"; sha256 = "106ng227iyydd5sv0b7w0snibyxvgrq8z0jivfbydzng84ijpwnn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.13"; sha256 = "1kw6jdvlssj9bpg67lx1xmwpiad1krpldbbab7f5wyq6yvchd30d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.13"; sha256 = "0411abg5ay308zgw34p0jdim6n6913mgal41azph3wqakw3fsiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.13"; sha256 = "0rm0jsznzbpp6r8y4hgcy6y1x6460hb38fdxikbbfnppinpdy549"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.13"; sha256 = "1d2p5phx9rsi960nji298px9idnama424vipjv76vknc4j7qbsvf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.13"; sha256 = "1blzmczw1hxxfsifh95p9xxyksyvkgyp808xki2ylyyi69dlz5s6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.13"; sha256 = "096r8swgq0iw4f7bkcjz85b43qqdzfcsg4qh8xkk4nrfkkilwycw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.13"; sha256 = "1rfgwi1gr1jyym50yvcw295v3q2333jqfi42bain0xxq3fa539j9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.13"; sha256 = "0d410mpgv8y0yj7kixxaylw5j2b8f9krravcq8i5zpdbxzjbzxrz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.13"; sha256 = "1rkfpifnc2n1ijgxpb86rraa7jyl8mj1w65lpwhw777wk039vbz6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.13"; sha256 = "01miqpbazjc1hmyl9w4shnig3ijga4ddbyjmhr98sin6fkrs4797"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.13"; sha256 = "17a0lzd7zhvvvx0dw79isri74nhwhdi8hdiaaz9svl03pbs7gybs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.13"; sha256 = "1d7placw1v8i8n3bq687nvvckq4jxz2kxqj9q0q7nlwjzl3vpyab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.13"; sha256 = "1kwy9c5q95kpf1xs2v3mir7qzj1px8rgv0bvlcw3nn3k7bwk9504"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.13"; sha256 = "14cv63fa1bzlvjfxicj6df3ay0df59a77rmyb0b95582zdm51hyy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.13"; sha256 = "1c5l1q53k8vrdapk3iafc1njdp9y2lqsyf8k9xzjhxkx2asr3gsb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.13"; sha256 = "1k6hj6k05gkgbh1pspvbdryzdxchfs6as6509fsm1rp8s327fh33"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.13"; sha256 = "112nfx12kz48v5izvqbkiv74r4n7293bdgkwcyvbf5nzmkkm49v3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.13"; sha256 = "0yw489apwhpr36m0450f88ximlj8hmfx4m6fdscxfy7bl9az4y3r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.13"; sha256 = "1kmwsx7d1pf2ayl44rja1fj3qpd8valpigly9hzv1kgxbq95wp1d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.13"; sha256 = "0w8iz1qm9lxsfy3vdgq6nhhkkasmdqpp2flbawr4w4z0qs082mp5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.13"; sha256 = "04rfjbqr89dw631w541z6h1gi7lk7nx6cv25p789hv4289qnkirw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.13"; sha256 = "1b22qn4j8bdnm8i4mz544cazmz84bxv2xc6cv38qz7rw17fy28hh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.13"; sha256 = "1bsrfvp7gfga84ks48wjjc0j0y4gsvzp4dmw4xqs3y4f8wc1f1jq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "04xwjavsgxyhmiq6hw0sb8lcrpsmcfjqvg2i3qgaf85rcy8vsqx9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1fwj19yg50j4mkd58b0fg440a939vy9lzfyyx4qapssba9wilv5b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "08y9k3kn5lfdk11vlqnsf87vvl7vi8w2an8mpll0drw9yawf2zws"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1j4m58i3dqj3nivnxkh91ic1q0z0visfi9r9aqzf2iwmq7njsxgx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0km9sjb6f1s88y8v668wnv3lkls3hn5lrgazagmwgs0hw6x70xpm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0swj57pqrh3435s8jcqci86ifkqhf977ipgmsqa6l0dz365nchl9"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0176s7imvc1fg78xmjxznv7jr99p0nxsariw48axpm6c5fqv5hhx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1idvvmbqwg16nxkyblrkxbrbhrz8qwfcw5iyyjpylkjkawklxrc4"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1gihrv3yny5s98sgsaafgfh7nhr4yw7biyz6kqxi8hbwnyddsx8x"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1kdywv9r7ij8krz65wpyj5pfffhnqg6s7n2s1bhj249x0ggx31lr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0xpiqma99vqq8i8v6szrqxj056sfc1yjwx16hmm7bl30b1a0vzh8"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "13w733b4pxvani3b3yxdpq72jfaj6amvqzg48zl44i52lrbi5a77"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "06j19xdcpw867qn8bfwsafadb1nxzz1wyj2d19dzvhxpxj8vvia5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0s6kxlwkwvb3csgibsm8rq30k3mf2vr6qjx72fzzhkw20b1gsazr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0mhkylq4mhgm82vlicd6fxrmq90mm6a58k1xjpq6njmzmdy6485l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1fs15j6mzn1nx3kjzz47b44sz45vbfjyr34xfq67sh7frba5ka41"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0p1dhgw2avg0gqy99ykpdzx869rhbbvca6xk9499vyf7sam4k6rr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0psmzbjz0pp7k9mrqxzlwhwbr9yxwfnn08yj54yvpafxlwyka413"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1qgcq5qfhnaxrmcipd4jn8cjy2lm0wf2z82xqfnsamz4p4h0ssln"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0lk9mlgr3mq5ls6llc92vi7k88wv35x58s80f4gix04dal14jrx2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1h4x03zk6qj9pg68xcfxvjg971z7jfhsk0a10wa6iavl979bnyhg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0a3dl5laq2zwl5s5gj7lf18l3kh1k2h9x1myfbw8pp5g5pcq1igp"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0zn7myvbcqrgi4sfcwjxfqd5zhfqp06zzjl3383a8xl2679qf0jz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "01jqs98r0xazngnrdz7lq7hk047laafmwd8d075k3p132cnafq3y"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0jjfx2xjcg3kridkdf199yaxcynhglcjq9j5v8z5jlhgwxqy9v0f"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0gvwiljarc0fgd84gb5zdh4550nbzhd934aba2c4jl5wl1773cla"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "02rv25ssljf5b8jhs8za6hbfh9nab9lk4yfpp7na7izgm4lfaw3w"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0kslp81hsmqq6m6sa5hdrfch8scw130smn2jixrjqhqx5qvh1srm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1wv5xxmygp4spdpzq0g2j0rzr3jjrmvi930gfl4hfpwd9mqmr9qy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1r893njy0lr89as72qag659cg4hq0w1r6awby45a3iiyzwj6nc70"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1znngzk9jlrzq9vmd5qghaji8brjbbyqcg8fcina0gwq427rcvr3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1kwfa6637bg7gc6f40aivqnq1g6cwqjjn3xlxl02bsghcn8z16l2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0vgql6x47b6fzr4zr6r308znfnrkafp7v8q8f0i7ma23rm38dmjf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0gsjmrnrk5v4pp14yzqn0q9lwwlpdlbsb3py626q9zjhlabqz524"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1z3bnv9892bi4lp08q5i29xiyra2d38dg7ai1ar4cc4z7vphfcw6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1fm1y8cdfw30iic0dx3f98gziw0bn4ya0af2g79r1p21arki2lck"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0a1ckhf994dnyr8llabi2za8chgzc2pi9kg5kxd4gvah0l4ghbzr"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0bxxahlr8xsmyq2n59d0wphrvi0b2qlb2j085mx56zhysj9s9drz"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0gv0d0lrgbg3h5ldfqyginvi7hy38fpz6573f3r840k0cz5f8m04"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "18s4pdmxv3rwlsr4ygfjs1r6ci4q4znjx0vf5r7n4fbynscr31pn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.13"; sha256 = "1na7w99yqhp6h6m50fa020fi9qldjwbdp2k6b2dcfw0lfi3f0dl2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.13"; sha256 = "06cqhkkv4kysgsd31r14axvav3m490lhs5b4mc2ssc4r15g0ym95"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.13"; sha256 = "0y384akvxkdqij1ywlf2g8afny5ss5wgpfx18xfd0nmcpxbl4fa6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.13"; sha256 = "0nqqqdkvk3xfjr009kdn30900wgrj2hzpzzrpga7y7c38nlpmsqi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.13"; sha256 = "1ip83wmb7ldfl02261acgm29ixzv9pxxliddmw3asp02ins45x58"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.13"; sha256 = "0b8lydw8sf6bcvg5rcvwl8a2x6lwama30h9nc1clsfhd5vljdgzf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.13"; sha256 = "0jhgwkw13mm744vfz6gbhajx9kajy9n4ph7kykqnnfmz1n7w6ryq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.13"; sha256 = "15iz2jmlk445193jz9rifc86fcz801x0qg2ikjqxnj7dn1zz24rr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.13"; sha256 = "02lfq0ifxclr9af5ndfz48ds17a1m8g7a29f6j6m1qhnil29jkj5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.13"; sha256 = "13z1p7w98gsj1lrqq14p2xjmgj0lm5xl2yqacxlc60gsb91f40s0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.13"; sha256 = "1xb96ch2k96m48nmgwisk9bi7c49ix3di7yd9zjqci3gp854d8ka"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.13"; sha256 = "0wj0vv2c0wx0p5wxkcr5hdbqdp08kmp08d7r2rjz6jfdd49h9i7m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.13"; sha256 = "1rrgksmcz4fpzwa8yiahk3wdyg7xnng6jmm3kvzh15y4mw8xir7x"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "17f2pgpp560m1pr2n2l4h0b8zbpz8p6nvqigp82k1g1ys95qbhdy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1ic5h46g8cskifldj1b8rgzfzkc1scygrqpmw00xnncp3kzwxkl2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0crxk42iy7qm13bcpd8ra6kdd3gd2bg88vg5ky9czbm0di57w17d"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1h643k0g83g3yw8p7s0qvsfpqagp75f98x008qqrw127li716y8g"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1svvamildi5sw88jllrl0qkb7pdx7g9ccp53ly11lrzls2y1nxc2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1q94dzclwp30g3dvw6681djz4pxz0mr2i8w8yb43ikcqm99k6y2n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1vrlcqfaxdhmd79lry7nbqa8023vs7zd6728c16rjlkiq69r9yjv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "17da9plgd1jbdfiqm000xg0aj2c37h8qmm23k96sdg8kl5dkfl2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.13"; sha256 = "1cplbbiib4h7x5g0j79ijkj4kvw146vnqrmp7h2pbk5912mprzi8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.13"; sha256 = "09s2ykhprx49iwqv2bnsa0nvfvjj6hxh40fy13b90kcpkw1d4vjw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.13"; sha256 = "0dfmwfqb57k5j2b2s4ysg3hm0hzswnrjxilglxcr1r8irk7gr5i3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.13"; sha256 = "0sb24snynvr1bsrhgy4x45z1rjknjfpfs80r0hkhxj184scqakj3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.13"; sha256 = "02hhkhl52cpy3cfl3yfjpyxm4bgkmv4yi2y83fzfrfqim44dslx0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.13"; sha256 = "0g4bn4kv87rln4yjl1igz0mi8rcd90ws1jprn1aqdcxzqqzapzjk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.13"; sha256 = "0hg6y7fd5kx3c6adssxqmwgr606l9h8b31a282lvsw978dmbybj1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.13"; sha256 = "1xxd33h6gn2xmcgv5g8q5c2l3gp77pdf1b6dzvfmwm9xnq6ms3ci"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.13"; sha256 = "1h98p62vh2f5hxziznrd6lljg9p9rc5v72rn6wj1dpgb97zr535r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.13"; sha256 = "13dd70r5y5k7zniwqzzicg5n10kjjb7an02irw9vxbzw35vhn9nr"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "00gyzw6v3npfppkakq78s73si75jgxcgssz9zwccd8gpa3rg82m9"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "03l7nwkx12k3h883x4wnpnkxwk2h2y44c9z96a5f7xm73idfnppg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0b9cmcc5cp6ays7qvb22s9fsw7mmfqyvn7krh7ywihap074ddzrq"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0nn2advczdrnjl0nfl877876bkimwbblr8wkafr24fjkza7al4s9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.13"; sha256 = "102rlvqhzkw74gpfn8zip1qwbkpbx6mklgxfis874d5np1x1wql2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "092bgrnwpzk9y0ar9xcd2n5j8ilba3f7l296n3hkvgz0mmzihc80"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "1p3x1abm40kwqaxhpp3xszpg39hmlqwxw5kml1jf7drmnij79496"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "03l6ykmd3q1f5karl4njbb6977hymg2zdsb6b590267czfh0xap3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "05xyp2f5fp5j75k6c4v8lp0clq66mbxrlc5l0lja5s502cypvj83"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "0gzsb4hhk82dpwilaiwin3qgp7mj2jhxa7ync68a4m20x1y5d5vi"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "0cbvq87q4pdyvawxq2ix1y6y8mminx9kl6g3nxfmp7ss20qd025f"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "1vn2pv1d0ir01zga0bpahhzmkn2lr7m0c5bf0s1i92acsq0z9z21"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix index e7bcfdbdd8..d1da16d88e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -3,176 +3,176 @@ # v8.0 (go-live) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.0-rc.1.23421.29"; + version = "8.0.0-rc.2.23480.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/02f4c6c2-c137-448d-a189-9ee3a3f6f99f/192f2c750089fa0194f04f5a805bd21e/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-x64.tar.gz"; - sha512 = "d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa"; + url = "https://download.visualstudio.microsoft.com/download/pr/0d7fb51b-f30e-4b84-b4c2-b739ec8f7978/68e9fc71fb2c4f01a9c7f25672caf1d1/aspnetcore-runtime-8.0.0-rc.2.23480.2-linux-x64.tar.gz"; + sha512 = "5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4037e0-6e5e-4a40-9c83-555d30d9c21f/f607c58db3f81aea2c7e56b0ddbf9ac6/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-arm64.tar.gz"; - sha512 = "ba8035da535cb3bffa720e962e6f9e0f88b36e1221b588f2a126ee4b43c02e4d8c27958017d29e5ab68121fab6a564fe0a27099c4103ee3d527f8554b4ab495e"; + url = "https://download.visualstudio.microsoft.com/download/pr/c5d92a9c-c318-422e-b66a-7849199de735/6c3bc3f5958917851fe7dacd383bcaea/aspnetcore-runtime-8.0.0-rc.2.23480.2-linux-arm64.tar.gz"; + sha512 = "a539170e9f0cc07801142b4f301554bbb76f22c3bc8dc4c421ca5c9be4dad93931acbb5a1d516f5fca57d739d33d10bccd33a480eb9e0d40e0f7594c38e405ea"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c3612fc1-f335-4b1c-a08a-08267100ff43/dd06c8e7021c27becdfed27838be253f/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-x64.tar.gz"; - sha512 = "28c2cc2b1b32a3d4b287f2ceec42ac7fce59870bd6a72f6767d347fa0a9c53210c5328e4d747ce010512dad149109ff072840c9da9301c8bd66a178169458518"; + url = "https://download.visualstudio.microsoft.com/download/pr/76affdcb-9294-41e4-a5c7-91629309e11b/75a24f3cf07097a94c58e22acf1e709a/aspnetcore-runtime-8.0.0-rc.2.23480.2-osx-x64.tar.gz"; + sha512 = "b798c397e2ddd8564024859f8aca2b9043863376b8327661ed83fb626bb51c26b1d5ef5a0ce6848031f14c480d4ba936aa0c4bddde8f38aea993d72ade10153b"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6dbd02b7-f3e8-46b5-a3e9-ea482762a02d/430b0d87ec687b4a9968ca143ea95789/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-arm64.tar.gz"; - sha512 = "dadb90494fb36a1d38b12d2903a385b76ee7325eba59d44acf4e10c3019bcfd636cf0b9a7c3070516325c6be4f5421c11fad7a2293ccc2b1c7a5d3c62bbf07e1"; + url = "https://download.visualstudio.microsoft.com/download/pr/32f5d2b8-3b63-4d4d-8a7f-876adad4efc0/c1f62a3e480fb0e38faa957d34c0be54/aspnetcore-runtime-8.0.0-rc.2.23480.2-osx-arm64.tar.gz"; + sha512 = "9cf9dce54fa4d1ca27955170c5378b826400e4ae45a9312f97f3a9d87ec31bd3231d70e482c36499fdc0d83f80af8860cd87d70dbbbf614f0312c6f73f71e744"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.0-rc.1.23419.4"; + version = "8.0.0-rc.2.23479.6"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8cac1522-acbe-4052-9f6a-19341a8f9dae/1cf1396b382e22cb1ba21a27f3b79725/dotnet-runtime-8.0.0-rc.1.23419.4-linux-x64.tar.gz"; - sha512 = "53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c"; + url = "https://download.visualstudio.microsoft.com/download/pr/4fb768da-b0ff-495f-8673-869c2f7e59bf/527c1e1d55a9fbcdd86018bc62b07a03/dotnet-runtime-8.0.0-rc.2.23479.6-linux-x64.tar.gz"; + sha512 = "f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/78e40734-8864-48f7-8c03-971ee500d93a/4b2fd807bb790d9ac3cd8585ff8cb6ad/dotnet-runtime-8.0.0-rc.1.23419.4-linux-arm64.tar.gz"; - sha512 = "6f5ca722ec2c4a400b9c19b17a3d9a10cf92b265c90c1e1b4822c12117580c286e99134f7c223f3dcd71171d5799e1498d38129dbd1bdff606fd64fe451458ba"; + url = "https://download.visualstudio.microsoft.com/download/pr/d16acf4b-d37e-4e3e-8f8c-73c7eff96bf0/ceb8eee1c24d194d8614f3b0a885e9ce/dotnet-runtime-8.0.0-rc.2.23479.6-linux-arm64.tar.gz"; + sha512 = "7f92e7d5f51d1623e2ebccb79da1f047c4a125b565cedb0a4be3d9deb2010c1f8c03276a926eb9a7866bc1ef9c6585724c41d268e9d2fda8012613aa6fa4f95d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29e68c3a-f37a-4dea-b7dc-bb1890b28d48/3ee60668c4ccd17ea565d6c204ef1f64/dotnet-runtime-8.0.0-rc.1.23419.4-osx-x64.tar.gz"; - sha512 = "ffb0a22c0e4b9cbefc99a1e016683987dc4046abd9f49f5e48bbb93d0434e818c66274422728b328c97ca1dcd6419c7fbb88ba747edff6a8e92213141ce42bc6"; + url = "https://download.visualstudio.microsoft.com/download/pr/d8b1d5c7-2328-49bb-92d4-7c3db905a1bf/500d836a2747b281059ff025cac9a79e/dotnet-runtime-8.0.0-rc.2.23479.6-osx-x64.tar.gz"; + sha512 = "50ab2233f01534784759439752312749731f5e3a46947da40052186bd87459fb19162c0354fb9c44feb8e3693b6dcd6d791782f63c86add4179c6ed6f6c4ff28"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/59ecb50d-0abc-4bd1-ae81-8a252027d3e0/43ed857eea3316732b1a5cb0c68eaa50/dotnet-runtime-8.0.0-rc.1.23419.4-osx-arm64.tar.gz"; - sha512 = "f5810ed4c8ce565f1eb3505b7994e54ddf6d87f8903f739016daafc01ba532caa1b84e39e4e42b73f392703af973dfcaa2165b4630301a859fb49ba411d6ecdb"; + url = "https://download.visualstudio.microsoft.com/download/pr/148f6949-ee92-475f-b45c-814139f2bccb/1e031945c3524f31abac2c8442794875/dotnet-runtime-8.0.0-rc.2.23479.6-osx-arm64.tar.gz"; + sha512 = "8c9b86c1dc4fc0c6d5086d3a1f5fd28b38e2d94746a1529f3d9783e7240e067fd830098be81052629253c1548b43f4937cea92370212a556448320e294ef887e"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.100-rc.1.23455.8"; + version = "8.0.100-rc.2.23502.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8cccb582-1956-422a-8655-fad2fa12c247/4e86a676860c2ced06228a5c8d21718d/dotnet-sdk-8.0.100-rc.1.23455.8-linux-x64.tar.gz"; - sha512 = "b182c4d496f1e3d6ff109c304972f5011a343750ed11ed8ab273ad0bd2d1441b7393fbc20968b54f61acacd8c372528f9a91a7a956362787a362b4821a434d81"; + url = "https://download.visualstudio.microsoft.com/download/pr/9144f37e-b370-41ee-a86f-2d2a69251652/bc1d544112ec134184a5aec7f7a1eaf9/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz"; + sha512 = "45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7f0829c2-839e-4882-9e21-fa4fc6bac32d/5ade892179b687046b1252638b8cde01/dotnet-sdk-8.0.100-rc.1.23455.8-linux-arm64.tar.gz"; - sha512 = "686a10b89217fd5d28e4b587dc231d0bb2630fe7dfc7423611406fae8812ce1b53aae3e079b924280fe589686153919272f4b5ba0c0292d68ae50a75530d015a"; + url = "https://download.visualstudio.microsoft.com/download/pr/0247681a-1a4a-4a32-a1a6-4149d56af27e/5bcbf1d8189c2649b16d27f5199e04a4/dotnet-sdk-8.0.100-rc.2.23502.2-linux-arm64.tar.gz"; + sha512 = "b07059a8b6b5586134a63a20c952f4f029372791d53e4a3a1363d39b8beb62b4c7dbc23c7de202397310c79aaaa110d35d0dd5d996420eaed0ed7f77e2dbc669"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/17670d0d-05c3-4e4b-8d72-5e31bb7f7000/44395256cb038899393d7958db2bf2e8/dotnet-sdk-8.0.100-rc.1.23455.8-osx-x64.tar.gz"; - sha512 = "184a845b4b395f4c00b3c9e846977a2af446686ac0e4c916f2736f3e891d3045341a8f391517a19f50900ed262ca4999d28e872bd6d0faa0729f6a5c4ad183bd"; + url = "https://download.visualstudio.microsoft.com/download/pr/2cb4fcbd-ba5d-41c4-9907-8120aa4b5f23/98fd104ada4105462cefb1123a0df533/dotnet-sdk-8.0.100-rc.2.23502.2-osx-x64.tar.gz"; + sha512 = "48268afc73335c19c96bd77bea49eedd461056b1b640703ebae39b3003875ba0b0dbdc13ce7aec0c74ae842bd01647cd1c225ec555439972f3e16300245a48fc"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/91a1c0c5-ab26-4dfc-8aee-6c0cb2354774/7e12ab1e86fbabc3417eb4036d955f67/dotnet-sdk-8.0.100-rc.1.23455.8-osx-arm64.tar.gz"; - sha512 = "a658e0dd633175ac5c7d7c1481cdc44f431e85094e29d0f21f5632f447469a452f5fcf5cf6e42cd4d0053fabca6bb4a7e5cc0f859f09cecbd062301c24cfaf79"; + url = "https://download.visualstudio.microsoft.com/download/pr/6c9084b3-c512-41be-afe5-84e156f250b1/6e1c12684b4c5b95f122f0659f337ab3/dotnet-sdk-8.0.100-rc.2.23502.2-osx-arm64.tar.gz"; + sha512 = "c7f955ba587cb00aa688dbba987acfd4203519da0dc5914ae7e1ecdf8f95089a84402b4d833c7b6186bdc1f70215e399646117242a054c1555087aced61d119a"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ws54phj14833xz9w53frr3pnq6ps0pfrbz173i9gj5xkhjf3mpb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1sz6skh1ddvdcib8ydi6km593ah3cchgz2fs61kj03z6jg2vz9la"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8681ixjxyixznhwakwb19cs8hnwq7pq87n4dpzqpm531jmjkcm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1hmza9icxnxj6dcdivxmngpvrg2ncri1gh849rbfzk04swylp6f5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1m6a47bnrl8n9ahnh01mg2fkc20lmfjjg3f7xzbdngnikm6vzcxv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ygb60mpk1rkz67v1d9vf3f7zfvdzg5a4ckc1yqcfb2n4a64rdbv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "027xhd1r4my8952fajl0smpdikj4ndn1j5gkyhwrg4z45xx35q18"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0cir3vy94ki9v0zzkm49f33mxmp25i2v0c3gp4fhmnhpsfn0x7rb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23421.29"; sha256 = "1ydhf3l9c7grakdr1qsqdgbdvp0zqrc4b66xj7imgpx1k92i2m2c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-rc.1.23421.29"; sha256 = "1mpha730nn451zp3j7h72a4jiwmgq4sqx4r9943v60yzn93j9nhm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8y9ra1qc0jx04jdkqcqnwaqlkr9ah081c68qslj7a2izhz1sbp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "16vy79c7byrqwd9f7vm0xbah3k4y6yis0flm9jkfk0hp4bb0y0js"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q8dsj0l622jxwxxmasmwcp1mdxi6fxyr5swhw9pd0vq3i8y13m5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1254rvx06wjblf0y2msh1zdg0fky861l8x5f5w7hm5l14ys1firb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q258zk3kkc3qk39yyfvqw3vlcmz4nf4wxdwg79dfp7i6wcny72v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0r5f54vyj38b7simbk0481zfawxr3z5q7sivfm23nmfwxpir80ma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "10kjms0wx5iialcvd0fp64vriv4cyk7k22wqh3km9mh43i620px7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03sgkb2ar63wllisx8rmpc3yrngl61yhlmqinwbc5bhyaxpmqnk5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0b747vkvsapy5p4sgv0nw1hs1hak04pbnsqysj4r7ypf4f9bnrhs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0lnxq6risl59ig9svhra6papn0i9rs2pr4zgnysnbfg7gvd3fiwh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1h8xa2kvg6pl8fc1js9lgbvcckh12c496j5hqjiclj6cbsfr3i2g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hrxbkqp97mqp6rjpm3azcpvmkkaxz37jl7ybv1bh2m3f0zk66jy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1x5pq1y4gn1gwnqmq9mj02wki5yncidlnmaf2przz8yingfw0hq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1855npscp1ziab6a50fh0vzv8j4z0sarp94cl3c1myk9ndnkzksn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03ib84r9xjfzifr5g0b7hifyb5nc6ynk5s3pjifcsplhfhr7hhvq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1arzm0mqdj0hnlsfcki8z3zbbp5mpv73133wc8yxpymh6f000bv2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0f403j2sis8p7y1w2nkbp03xq8qq06f7q94d8clm9c98vppw75sj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ngwm0hpg00z8hi9kfrc4p8ii51piymn1kkgkbh5wcdz2rmfayc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "00whfl9s9qd43jv68rff5g6da0k6y11yc2pg6v681967fnq31jqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rbyh9a41wvygzfja0wm305bqisnsqxhlfhynvb8p5yv1dsg7w4w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s8f5mrwnb66azhbrxpy3ab1b7crr3zj1q8fvsym80kl6xapzwva"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "13a7z8m4izwjd0qh3p01kxadxagq59klw173dqn5l57wzzj8vsxs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "059c21fq6kql04kn56yq5ahm5wc3321b12q50hsg5lk6w3w7xgj7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "110aymhj4rj39vpvbkyph9mdx347xydkdcfsdvw1ablfya1p933f"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kynd77v947b6lxhjwynm9yvz5mp6wb4d4jbl8ccqzw0f4g57qxq"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ix7jjpqzxjyjqfac2csv2j8zr0xai601m14r5swqs3fy1cpm8zg"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "19g1awn1ywnmwm6z547011d3q1k2wn58sbg4dm5y4pinmcfm37wm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wyafqqjxksrp052rqvwxaqc3m6yzhj095w8myqbjnxwyfzsikcr"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "183lwi2xm45699zhynw7zgd4sa3zpap6p8h2036i94kfr24ir61n"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "041n6jrvwlchdvy7xnmwk0khvf4ybmyq5lvwaiav1xxw0a1dyn3h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6011bq71b3whz9lg7kc8lgf19jn221qzj694m6qqlzrbb3g2s2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qkdinyq87rfgiasjgwaggid86xw6kcbjx97w183z4fb65l561mh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "08h2djggfpjh0q38bq2hjqk5xf48iz343352n6yvsa40rmn7p0fv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j4gw5c2p0fvjdhnyg2fcwlfvdgh4sk0v1w3w004xkf9j5jv1sf1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hh73hk9iq15i46k0h2c1y6ixpi5w0i38f8sk5cijbvkpb1cahwc"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0n3qcyyd0qdnv63ym0rlrw5gvq4g4s65qq6qr5nxpn46iwgz9p07"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1grdchbc8cw94ly9ihnz675c6kg0rnwzdkciwsspnkixfmr8n4wb"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ndrih51r1ggdbgbjn2gyvwarl0i6qkzp9ravvx92jn02k4bb5yg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "13x9gnxzk6k6ipijgmi9bivkj4ibqlsb04fs1c0ag0vsdacpwm4d"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rfkyclsv8451xm8hh8hd55sw9vbr8i60wi67dnjbip61ydl0sfz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1bp2aixzvmvmzkaqq4diqw78azg82751s64s2wn2zkjb9big5d2g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mycvp040slw87cl1cnzcfaxmrdjj728sw6dnhyc9z6x75prn7sv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a0c3adk3v7qcrxw5wizqxmbkj3fs57r3a0179c8s92vhh4y31l8"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "1dgy2n8acl6kcjpaa6s869v52rvvpkra9wrh6af0zy3z7lrjw3za"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "18rzizk0db8ivbl6hm80r5lzyz2i1gjj1k32nsbhh6x6x57b9a05"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a8cnaalpb7v09ijm38anh9wyvkd2sza5q87ggmhc0ji10gdlsrr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1qfyiwpvh1lw48h3jhry2vkk3qq42avgzfq58xspc87g4km7nq45"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0mnpsvlnw2h4ggw6h3y7cb58a0255p4501m7d2k9jyx2fvkrbiqc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "15h0vxsg91v0yprbg8yf7ny9h0xdy93s4xp7i1x8vqfxizh89l4x"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wiqmcib5cwxfsyvhf7gq6r76caycmyns08q8hifqksj6lfbi64d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qcnaz0slz50lzpdhghr6gxck5x8ljyhc4p8apsk52ir66cb9sfw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0x1bgi69ylpr280ayzj60dxbirqab4ysxjwzqfwglbjdvqkkwn38"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0fdng2vpzljjpdqjnz2pr8naznlx0vgkbypigjfdkpcrmmdhq004"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bwbyzcqcbqnaybkb106sq68035vh7kl8i1zlfq6hgd7rsbc5xnx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "060bkh4viwpc1fkhxkpisbxwvfcld1lbm7wjlyl69p84nikyllnf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ma4h0bbham9z57i9fdgf3arz6x5cvc5mmcwr0zm7bzyrc049mdd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0m95wrq9q8d965yxjkx1mxjnhq35kqhlc868nfkw7i0bgshizaqf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bk9wb7vmb5d8pr2lh1zg0gqkx013b760b6mdhpfc0qp3jfqza5j"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0s5yrj4hgamn6r69z5a8phm8v2wcq4f725jzlpfa90wnys09qn64"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "17mla05aq6ab4amw6arq068i3vf3f56gdzhm1s9k2298gfjk71c3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "059v72l55w71i4410jifilgzv9f08mkal7yq87smm5pfmqnl2v35"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qxnryxvmn6rd8aa1v8knsh974v99n7pqz7lzhyln5f5dr0rpr1s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "024blpk2224i4mvkkdmjrk2zlb7kh1shahkbbk71l7rniagyd2aa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "04k93say7b842bvh2x853skj5ymxsq3b11vf6rkfcqz6b7hvn7pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-rc.1.23419.4"; sha256 = "139j4mdjhqnysgal1zifnhwpmnhd8i6a0x46bjxcwskqm3n85c2y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "08mfzspgv3sjcvc2smcsab4q35mbj7cn6ky08nr5clvmf32ddkbd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1wq65zww0ng7w8078bi10km23s7wf1fr2srmzzsk2ailhwhp0ky2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1285632nhb4gqnxqy1rknfzsqn6cg2xaz1p0chdiqdjlw6n8456x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0q5pkl6bji11bskxhgnimbbl9zzv3ly335h169qdi98xig7npv2s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0998hg6n48j7zrhkx7kyn5hk0axf7h9g61qh4gbfpn353zf6ajbx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s1i1xlszd7rfrg76m616rlwg96zsap81wcjvj68nijfmv563snz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aif2k51bxc59rskjivcp7lwdnmdw7dnh5gw5aj0hgd1shljms9y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j5l7zqr8jkj4bgrnmf9ay0zfc43m47q78f8xkiv96pa2bxp9b29"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aklq0jrjcqgihc6l7cn1j5swz3kxsq02zrvl745a197k2jr10hm"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "17ffbsy4cfplaw8cdly3gqfgkzqxmbgrbwnqca6b7lak1ab53mr3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kk6w9sid9hkqggxxnmzmz3ng14qq049qhz06zq40lhcgbyik96h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "14s7gxqid5yrlja1aimaq3r40bj2p5karn8ma80368m3zlslm1dw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0k24km7x79kxy4blmgzclvqw4m8smlprb0hyi279s1ddg0vpplc4"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1davz97niy36wpsim42yrjm77k6sflcsc0sy5nb6lq9kxj02hypy"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "00xw4yjkvdl0x1c60cbbh5gf51cmax2laplhlgilkyazjzrbf3xr"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "08yqn96i057lfdrs7xjbambw7sr2aalhskkblvyhqykf8sw24ckb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1w5p3lngqmp5yqwh96kjdhdlzszik5vw9nx7snsfysjwyhgbr8b0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0zwvkqg0nf981gr6wff2ci2dhb6rc9girg3s0gqz7ysldbxnznsd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kc57i32xqmrjif82czr7ivsrzf41wmdc0zjkk3qak3j8s0j629f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1l8mz0l6g4zv2qnrfsj85miknhq230942l8xvw62bzw4rv89lcp1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1d7m6zgiakdqi6ga0xdaamqjk6y8bxd2fxirmrgzpr0l57zqwhc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "084pm2qnh8mn5cpf4zs7drqs5zifbph0s6m9h62xgrixw3jv4i6x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0szyl8qyc5yc2ah9if4xk20wgny5cbr7hmdl2mzqpbpn5fcm36b6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mavnwcgnzx1dn7h0cg172p0yv00xdaspi6vk34df1s6d4cc35vh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0xqxz80rr7h1qlgw6ax2pqj33ngv31xbzljhpd60iv229lfzdvia"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6ivz7pcwk7w7fq283q2n88bm0rw7acfl8w9nj8iyag8gi7rpyp"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0al490xcj68xp13q2xl15wd03zld1l3qf88sd651q6jixgwrzbm6"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wan79hagmkh2in263lbpsydr96l4s6i48qylpgn3fzwdv24idb3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0jb3gx2ydf4jq0szk071g4l4286alffa6hc4xhy3zqax4vggyakz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0v4g1bva86vxvkhfcimmr30i5d7xm0r9sknf84az2b450b5vfgpm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0944c1j5gd3hvw7aij5y8wydbv70zb7dw8gs4qpavwjg8vcbs9cx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-rc.2.23480.2"; sha256 = "0406jvshxa3j1bc7ss9d717ybbjnf5n6260i9ir231nzmkdw4ich"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "150ja9f96yw7j4mf39kxa541xkmgzmfjgm7jwdmlaln2v97chsk4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1z6lj26cqf3qg3xhhlp8g8k9q93ysr1j2ly41xwi5sccd2x8vwil"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "10a4pvibil5slnca0bzzpf6nbvan219yg6d6srr9hnqwi2a2la62"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1qcmw41rbk56y7l79f9xqli44f8xa7rqi2bnncfngfbd54q3ijcj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "0zq25xvypv6fnyy3gx7ivk41z5nyz89x52bf9ayry3391hc5avd1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "18rwiycm6nhm7mz2gk22yaqmq1sdfsvq971li08czyia2lgxk6wz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1qiigv37ikmpbb8j0j2zp1asly13xb8bxj45zh58paycaks01sss"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-rc.2.23480.2"; sha256 = "1f8d7mc4kil4xfyj1ki53yqm30cbpms8v1kxpv3harp5dkkgykwi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-rc.2.23480.2"; sha256 = "0za8iyskzp7f9mjn8nizz3wjmrpylyv24a70vwavbq0h0h8rplsm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.2.23480.2"; sha256 = "1vac7gcv8nqyjn4jylfh5yix8282siarbm5dwvnrsw41ngndgcff"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "0cx4606hlbi9x55vbd99vrbkmhnaz3dcqc7x3sh3ih9f2mpzv5q2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1l1n2wb374mlwpbk5ivka3j073l8mi89fh92p503iaa47xf95ixl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1xc9hkx2qam19nfnkanm5yvd3iycvw1npql2limskf20qrwr5f7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "06rk4p7p4ypx7xd2c0dxb142frv9w4gv8720j99392rpzrp1qnmi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0ib3f4wqzx10298gd47j6sqak80f6idrqw37crvgfixsggik23wi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "12yxilcrlwkwrjiyl72sdryjwh1ilxnqq51zm5r10gadips2rzqq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1mbzfbh023xlx2mghhm2f0d4hx9bl9b09d0lfhvf9zlcxhwj8wni"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "05csm5zlrssg94p2vg8zicjxqbx92l5igglsjbwb5dqbvdihz1ih"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "08ify83j27lx0pgjkz4kcg88a2rv89bxqd8fagaafqrjw3s0d68x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "00lhcw22qfskdljfnk5amfy2j5x8c3mfvgam1s91awh3p4iizx1d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1pmxwyaynv50fp32b4g2nhys1shpajnpc0q43kgsfs31hmrq32z4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0shzhwgpp35vi2y3fvd0rs458lnwn1wk2361x9q50wcpadiv72hw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1w9j05l8n1r40liq6i04cmc74hbxj4p2j04yqsfww6rx8r4ls241"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1j17rgswixgbli421sgd17cfsrykdv46jmd0337mdgxf2xj99c37"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "04h64nkpxrkp63p52csb4nrkyg8l1gg6r0m3xzl0h8303w88wwi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0d84yjd67fpl8j1j9dccqqfpg8n717qvxk5y8mhp4rahfi53zk58"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1q6mqcjj4cf3x1mlh0ca5pd1vglq5i9ci0irrm45xqaz8n5190cx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0l9i4y94lmv9m4m44i1gff6a1s8fhdmznz015yf177pbsymm1kjv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "1bzh85sps3i0ga6pbdrcbd4a0knpq0n41pnknfz6fhyqn9xchpcy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1h36s9sk8dx8dj5g0dkpcnl2g31jbibjal7344zcs6s7d7zjifc5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1zggzn0z7clh6sic4hja5arhhraaldna4pyprxk88hkfs2h7k3s5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1m8rvvlglivcrqadqjfggrh55c1sm1xyw3fd354v7xxpyd7nsak2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0rr4xpy6l7pm4zqr2faqihx7qpia9w3y81bzk0zn9rs2wa2g3pj1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mdavjwsl7g080ik8brjnxvzvsznqva02854nsba4i8qkrmgq63x"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0a1pnyc8hg1x6q9i0fg1zp5aip7rqxwirnjw7vshdqacadcr86wi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "00v40ws0qhl87injb20dszay6cz0ig1ralqz0n2v2bymgcdbh1bx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0qiqj1i4z3smgpza66cpr1ad8ycbbk9iqs150ribwz350ypa5b00"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0ir0njnhcig7b9drq3qjlid38111h7810b1i8nz0qs1hjza3iryg"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0x7yvqh099bhvsb5zg1mjxyglf1hahz7w36cvz1x5i4d6z63639m"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0nw4gmjndfnlxaxji31k9llgn6cf4csxzjfpp01qkn7v2wmfl5jx"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1kx93ay2gx48llqd6l4l8ii29im1ilp5axz99ggfarbsvz8iw648"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0rbhkxhd1aias78dqhyj3h0byw0pj72nvqydsl3s6zzb44a42v1l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0dzcdapx5pi24zc2zrxgbz82y0p06s7hg7wh56waa4kbgc7rzfbx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0crsvb0hdp0c5a7d0mrc3i0dwvlvfv1hw44acf3z832q41py3gid"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ps9lwwnww8s877sx8lpp6m03kgxgv3bvi9d3rxhfq83yzhawg2v"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "068s9idrwapxsfv169chsdrsw3v74ihhing3x8mvyfwjkswnfm1p"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1qqphry16s89i7dwnb6n65vkc18mpivin2mdjp357a3jgi2c8z2m"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0m7qph06wxhsw8id1xshyp1bdfk04bdiwfrz3j6ayk6ihg2mw2fg"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "06khkpzfhscsrw7bcvq1ag6by6n2296w8ik0zbi5mq2jm5lx4h4s"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "06sq2dsxg1gl3g5g2x9y2snh9xczi09ci90mb4im21x2dd5i91m2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0bmhncabzz56r2ac46k1jqsjzgaflvnycbwkh9ksdywm91fcca8k"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "01q00rdyg4dby0zvfkzc8sgyn2434bpzfzjxv3xpc4am05n7nikf"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1n55lqdriy3kvxmcg2kfgri6si4avf6hi7hxl3pxi3y7ki2aqgq6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "04yzid7r8ahscjsbphi1272vwjwy6frz1817w15wwby2szprwhqm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "17xkhj0c41zwpfxm0yvllp12f3zqvl85kg0kwjjfi6z3v3grw9wa"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1lcbw3yvrm5iha9wjnsvw79nhjcb1px3h5pwhhy3dqcr9l09jnql"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "114s3bqv2diclr44mgshpsvybcldjprh40i51ibz7n4i0kf43km3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1a068b45d9wh489mv3cnkxk64qb7piqf4nbc6li37mnk5vqkkkan"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "08p6d8h7sfliy3ynzz9wnrp3b4gvdn9ldkyrqgph57kyjgvalk1k"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "17zrq7cvbmd89rfyhykllijhdlbb9yf90rfv8bkb3cwm12mxibdn"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0698kzvm0fpgyq1m4h09x3d0nzzf9xvypds1zbn32nynil2wrfi1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "15wbakil6wmcbq65zdn6lsnslzi3lcpsxqiycqk97s9h735n7r88"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vvfd9rw5xbhxvid2qsbssnvfjimjadpckkh1cjh2wwb5phx2za6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1j6cvvgxjpqzvf81i0daizcr01fxabbvggba1ljsvzn08ky14azg"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1s0b8aphk0yzikfsfd40mnq70x5izx9gwxk3rh5q52fk2h7p8vn0"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vv5a04q6k5ch1xacz96dgvj9174fbmq03i6lfj1pkmvmknxwmk3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1kwm3zwwijqf52piv867463injdnajx8hhv2bszbl569v0mpyald"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "06zl77hfg9ha54xmwqmd4nvjzj1zfpdl3gxw72wqi98w1imfakjj"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0fnx3ig9mx68kwcqp3hqzxys6vqfwc4iz1acxqbs1h0r7k83ka40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0n54h4b8l7xhxz6vx3qbz7b466dvlc7sjyrw9v4p3axzpgaz63yp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1cyacd6297nm6cw8w0wxkwl06khb4ng94qdwlzfx5hs2gday34mc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "15ldwj8r25lric5hnyp0kgj3fi1rzlhbvzr1pyzndhb79kqmw9h5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1r3lssmrxjs4r1qfkxm4hq60n9hzdalv8637fzyrp0gqxd7nzl2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-rc.2.23479.6"; sha256 = "1l9a6flcj2ysxp0msvdz3p9zj6rc3r8dvr7gngn0qh17nklifk4x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vds01dh5wzwiicjx9zvbhf9sdn6g22y5vy46w6c8vyr5kj9bhw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1qza3phfq6hmiig4qy0x14ghcsr9ha69yabsds84fpa7mx2w8xsd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1d106zdvv90z6da6w5lxn31x79hnb7in3mm1c0hxmy7lfs2nx33j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1bykc1r1ljvqqz6v5qzvh2zqzbiav8983657fn1yn5qwdqrfc19l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0cac6scv56d4l8bfni7nan7jkj6c79c0vipxl3pabdpsyhkpw7fb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0i1wkbi0ld3a8mnk809z1vw9zla0w2b5q1gkxj9p59jgyp4hvgy2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0h70028z3dvvdh2r0v3m21w8zqi4w6x6fcqb58k2981dcrvgfzza"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "0y8fr3940y8w4qz2pm07h3kv0gvjmygpij6h0nshkmbvhmx76ccw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mf4vmh7sx8lshrc8b6al3nnx9lzylrz8xklngqnskbdw25a6z0i"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0z0z98zx7b146lbyl5rhf9vx8sq8qmra0sf9yh99k83dxi17lcgl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1rs79c6lw9clp735p8bh48wwfiz93kwb8d8dj2zksa4hp1s5am31"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "108qga3arini479gpr5l4abgrg9aiqshj2iyyrsn4g39b3k2kys7"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1fn7hqmlqihxprqkig3kpi7mm7qiqm0knrpn1pj94r5bf089jhyl"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0x45ii2slpfbh2ln3d6bdmvl1dmqm0m282lfk57fxlp89ra2n37v"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ph3lijgmj9n1ah1s88h4509l20ljlylzra8fl2397nrk5nampnj"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0biam46326xx3f07vbz2pa0xvcs6j7v6hy9sdzvvzjdlbr2vkxch"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ln1sqw852h2aamksl4xbrxn8rpsf9v0f302nj86rlnkcd36nvgg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1vkdzpsma3h6fkd2q6p7igffhiih2w33mnmihjjcqyg0abxcrisf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1c9c4sdz7ijywj1h2lrqh0g66kwphawh9wz4n1liqdc8iczq5s33"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0c6waw5dwkj0s9l51bbgk1m31a89a6w40m7sq2h4my5pa0fc646p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "02ajhidm312xy397rmw6vvwc84jj59gdv9qwimhkwj3jli51cc5s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "07p2gz8j3pvq6fj1ikp65hzyhw8f76qbsap7ri90myhzy92cfqd7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "11wdcm9wf2674l3pybv83pi95d7103xh1psq5kkx72zahwjc40sm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "19v4j3p17hdadgsc6gzqb86iy3ndrkslqfnyvskypcczrk4d272z"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1rl7n1v9zv6fgxv4g8jrm8b2siic8bglwwylacq9mvmfk4ckcnd2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1gc5ilas07492zc5fb5iqrhhas4mx86xx3ga7p1dwgwlmhbpzq6l"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0qb1rz9qxdjs9ig68chxxjcgnya8aff4c0ipd66afn9q1k7faw7r"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1fipxybzd7vah2y5rndb5kpn2n8mqcizp2m1lbi4fwi4mlmc6mqf"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0fgfvrxz02p1w1i0s0a5i8xq1cvd4l9pj40m1rj8dr7b2sck45xy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0yhql04nzmfawp8qy5m2byx2b768vpf0lj4l88gyjkblpacr37hi"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mmdhddwx8xa1rspcmfakiv4lyk3h8y64yizir252r2pf5knh40q"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 296c815e31..9ae727f937 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -69,7 +69,7 @@ let attoparsec = self.attoparsec_0_13_2_5; # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5 - aeson = self.aeson_1_5_6_0; + aeson = doJailbreak self.aeson_1_5_6_0; # elm-instrument needs this indents = self.callPackage ./packages/indents.nix {}; @@ -197,6 +197,15 @@ in lib.makeScope pkgs.newScope (self: with self; { }; }; + elm-graphql = + nodePkgs."@dillonkearns/elm-graphql" // { + meta = with lib; nodePkgs."@dillonkearns/elm-graphql".meta // { + description = " Autogenerate type-safe GraphQL queries in Elm."; + license = licenses.bsd3; + maintainers = [ maintainers.pedrohlc ]; + }; + }; + elm-review = nodePkgs.elm-review // { meta = with lib; nodePkgs.elm-review.meta // { @@ -265,6 +274,17 @@ in lib.makeScope pkgs.newScope (self: with self; { } ); + elm-land = nodePkgs."elm-land".overrideAttrs ( + old: { + meta = with lib; nodePkgs."elm-land".meta // { + description = "A production-ready framework for building Elm applications."; + homepage = "https://elm.land/"; + license = licenses.bsd3; + maintainers = [ maintainers.zupo ]; + }; + } + ); + lamdera = callPackage ./packages/lamdera.nix {}; elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix index d9727996e0..e3dda4c31a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix @@ -7,16 +7,16 @@ let arch = if stdenv.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "b13110bacc3f71c2a3e12c52172a821a85cc13243a95249ca18c8beb296c0ce8"; - "aarch64-linux" = "afbc71f0570b86215942d1b4207fe3de0299e6fdfd2e6caac78bf688c81b9bd1"; - "x86_64-darwin" = "50a3df09b02b34e1653beb1507c6de0f332674e088ded7c66af4e5987753304e"; - "aarch64-darwin" = "174a5bfec355361c4f030861405513818be25fd7e4325f7221aa71ebd27475d3"; + "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; + "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; + "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; + "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json index 6b3f7b5851..8112b01bc9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json @@ -3,6 +3,7 @@ "elm-coverage", "elm-doc-preview", "@elm-tooling/elm-language-server", + "elm-land", "elm-live", "elm-spa", "elm-test", @@ -13,5 +14,6 @@ "elm-optimize-level-2", "elm-pages", "elm-review", - "elm-git-install" + "elm-git-install", + "@dillonkearns/elm-graphql" ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index a30c6ac53d..bfc0fcdf7b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@babel/cli-7.12.10" = { @@ -40,13 +40,13 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.22.20" = { + "@babel/compat-data-7.23.2" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.22.20"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"; - sha512 = "BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz"; + sha512 = "0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="; }; }; "@babel/core-7.12.10" = { @@ -265,13 +265,13 @@ let sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; }; }; - "@babel/helpers-7.23.1" = { + "@babel/helpers-7.23.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.1"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz"; - sha512 = "chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz"; + sha512 = "lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ=="; }; }; "@babel/highlight-7.22.20" = { @@ -859,13 +859,13 @@ let sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; }; }; - "@babel/traverse-7.23.0" = { + "@babel/traverse-7.23.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.0"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz"; - sha512 = "t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"; + sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; }; }; "@babel/types-7.23.0" = { @@ -1372,13 +1372,13 @@ let sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; }; }; - "@jridgewell/trace-mapping-0.3.19" = { + "@jridgewell/trace-mapping-0.3.20" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.19"; + version = "0.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"; - sha512 = "kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; + sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1399,6 +1399,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1570,22 +1633,22 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-cache-semantics-4.0.2" = { + "@types/http-cache-semantics-4.0.3" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; - sha512 = "FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="; }; }; - "@types/http-proxy-1.17.12" = { + "@types/http-proxy-1.17.13" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.12"; + version = "1.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz"; - sha512 = "kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz"; + sha512 = "GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="; }; }; "@types/jest-27.5.2" = { @@ -1597,13 +1660,13 @@ let sha512 = "mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA=="; }; }; - "@types/json-schema-7.0.13" = { + "@types/json-schema-7.0.14" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.13"; + version = "7.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; - sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz"; + sha512 = "U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="; }; }; "@types/keyv-3.1.4" = { @@ -1615,13 +1678,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.199" = { + "@types/lodash-4.14.200" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.199"; + version = "4.14.200"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; - sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz"; + sha512 = "YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q=="; }; }; "@types/minimatch-5.1.2" = { @@ -1642,13 +1705,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.8.2" = { + "@types/node-20.8.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.2"; + version = "20.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz"; - sha512 = "Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; + sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; }; }; "@types/node-8.10.66" = { @@ -1660,31 +1723,31 @@ let sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; }; }; - "@types/parse-json-4.0.0" = { + "@types/parse-json-4.0.1" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz"; + sha512 = "3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="; }; }; - "@types/q-1.5.6" = { + "@types/q-1.5.7" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz"; - sha512 = "IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.7.tgz"; + sha512 = "HBPgtzp44867rkL+IzQ3560/E/BlobwCjeXsuKqogrcE99SKgZR4tvBBCuNJZMhUFMz26M7cjKWZg785lllwpA=="; }; }; - "@types/responselike-1.0.1" = { + "@types/responselike-1.0.2" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz"; - sha512 = "TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz"; + sha512 = "/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA=="; }; }; "@types/rimraf-2.0.5" = { @@ -1696,22 +1759,22 @@ let sha512 = "YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g=="; }; }; - "@types/source-list-map-0.1.3" = { + "@types/source-list-map-0.1.4" = { name = "_at_types_slash_source-list-map"; packageName = "@types/source-list-map"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.3.tgz"; - sha512 = "I9R/7fUjzUOyDy6AFkehCK711wWoAXEaBi80AfjZt1lIkbe6AcXKd3ckQc3liMvQExWvfOeh/8CtKzrfUFN5gA=="; + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.4.tgz"; + sha512 = "Kdfm7Sk5VX8dFW7Vbp18+fmAatBewzBILa1raHYxrGEFXT0jNl9x3LWfuW7bTbjEKFNey9Dfkj/UzT6z/NvRlg=="; }; }; - "@types/tapable-1.0.9" = { + "@types/tapable-1.0.10" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.9.tgz"; - sha512 = "fOHIwZua0sRltqWzODGUM6b4ffZrf/vzGUmNXdR+4DzuJP42PMbM5dLKcdzlYvv8bMJ3GALOzkk1q7cDm2zPyA=="; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.10.tgz"; + sha512 = "q8F20SdXG5fdVJQ5yxsVlH+f+oekP42QeHv4s5KlrxTMT0eopXn7ol1rhxMcksf8ph7XNv811iVDE2hOpUvEPg=="; }; }; "@types/tmp-0.0.33" = { @@ -1723,31 +1786,31 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.2" = { + "@types/uglify-js-3.17.3" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.2"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.2.tgz"; - sha512 = "9SjrHO54LINgC/6Ehr81NjAxAYvwEZqjUHLjJYvC4Nmr9jbLQCIZbWSvl4vXQkkmR1UAuaKDycau3O1kWGFyXQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.3.tgz"; + sha512 = "ToldSfJ6wxO21cakcz63oFD1GjqQbKzhZCD57eH7zWuYT5UEZvfUoqvrjX5d+jB9g4a/sFO0n6QSVzzn5sMsjg=="; }; }; - "@types/webpack-4.41.34" = { + "@types/webpack-4.41.35" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.34"; + version = "4.41.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.34.tgz"; - sha512 = "CN2aOGrR3zbMc2v+cKqzaClYP1ldkpPOgtdNvgX+RmlWCSWxHxpzz6WSCVQZRkF8D60ROlkRzAoEpgjWQ+bd2g=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.35.tgz"; + sha512 = "XRC6HLGHtNfN8/xWeu1YUQV1GSE+28q8lSqvcJ+0xt/zW9Wmn4j9pCSvaXPyRlCKrl5OuqECQNEJUy2vo8oWqg=="; }; }; - "@types/webpack-sources-3.2.1" = { + "@types/webpack-sources-3.2.2" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.1.tgz"; - sha512 = "iLC3Fsx62ejm3ST3PQ8vBMC54Rb3EoCprZjeJGI5q+9QjfDLGt9jeg/k245qz1G9AQnORGk0vqPicJFPT1QODQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.2.tgz"; + sha512 = "acCzhuVe+UJy8abiSFQWXELhhNMZjQjQKpLNEi1pKGgKXZj0ul614ATcx4kkhunPost6Xw+aCq8y8cn1/WwAiA=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1957,13 +2020,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.10.0" = { + "acorn-8.11.2" = { name = "acorn"; packageName = "acorn"; - version = "8.10.0"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"; - sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz"; + sha512 = "nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="; }; }; "address-1.0.3" = { @@ -2875,13 +2938,13 @@ let sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; - "browserify-sign-4.2.1" = { + "browserify-sign-4.2.2" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; + sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; }; }; "browserify-zlib-0.2.0" = { @@ -2965,13 +3028,13 @@ let sha512 = "9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="; }; }; - "bufferutil-4.0.7" = { + "bufferutil-4.0.8" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; - sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz"; + sha512 = "4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw=="; }; }; "builtin-status-codes-3.0.0" = { @@ -3091,13 +3154,13 @@ let sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; - "call-bind-1.0.2" = { + "call-bind-1.0.5" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; + sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; }; }; "call-me-maybe-1.0.2" = { @@ -3190,13 +3253,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001546" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001546"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"; - sha512 = "zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3478,6 +3541,15 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; + "cliui-8.0.1" = { + name = "cliui"; + packageName = "cliui"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; + }; + }; "clone-1.0.4" = { name = "clone"; packageName = "clone"; @@ -3937,13 +4009,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.33.0" = { + "core-js-compat-3.33.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.0"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz"; - sha512 = "0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz"; + sha512 = "axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw=="; }; }; "core-util-is-1.0.2" = { @@ -4018,6 +4090,15 @@ let sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; }; }; + "cross-fetch-3.1.8" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "3.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz"; + sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; + }; + }; "cross-spawn-5.0.1" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -4414,13 +4495,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.0" = { + "define-data-property-1.1.1" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; - sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; + sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; }; }; "define-properties-1.2.1" = { @@ -4792,13 +4873,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.542" = { + "electron-to-chromium-1.4.576" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.542"; + version = "1.4.576"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.542.tgz"; - sha512 = "6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz"; + sha512 = "yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA=="; }; }; "elliptic-6.5.4" = { @@ -4981,6 +5062,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -5044,13 +5134,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.22.2" = { + "es-abstract-1.22.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; - sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; + sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5062,13 +5152,13 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-set-tostringtag-2.0.1" = { + "es-set-tostringtag-2.0.2" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; + sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; }; }; "es-to-primitive-1.2.1" = { @@ -5422,6 +5512,15 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; + "extract-files-9.0.0" = { + name = "extract-files"; + packageName = "extract-files"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-files/-/extract-files-9.0.0.tgz"; + sha512 = "CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ=="; + }; + }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -5818,6 +5917,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "form-data-3.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -5827,13 +5935,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fraction.js-4.3.6" = { + "fraction.js-4.3.7" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz"; - sha512 = "n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"; + sha512 = "ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="; }; }; "fragment-cache-0.2.1" = { @@ -5890,15 +5998,6 @@ let sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; - "fs-extra-5.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; - }; - }; "fs-extra-6.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -6025,13 +6124,13 @@ let sha512 = "5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="; }; }; - "function-bind-1.1.1" = { + "function-bind-1.1.2" = { name = "function-bind"; packageName = "function-bind"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"; + sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="; }; }; "function.prototype.name-1.1.6" = { @@ -6079,13 +6178,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.1" = { + "get-intrinsic-1.2.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; - sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; + sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6367,6 +6466,24 @@ let sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; + "graphql-16.8.1" = { + name = "graphql"; + packageName = "graphql"; + version = "16.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; + sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + }; + }; + "graphql-request-3.7.0" = { + name = "graphql-request"; + packageName = "graphql-request"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-request/-/graphql-request-3.7.0.tgz"; + sha512 = "dw5PxHCgBneN2DDNqpWu8QkbbJ07oOziy8z+bK/TAXufsOLaETuVO4GkXrbs0WjhdKhBMN3BkpN/RIvUHkmNUQ=="; + }; + }; "gray-matter-4.0.3" = { name = "gray-matter"; packageName = "gray-matter"; @@ -6457,13 +6574,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-property-descriptors-1.0.0" = { + "has-property-descriptors-1.0.1" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; + sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; }; }; "has-proto-1.0.1" = { @@ -6565,6 +6682,15 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; + "hasown-2.0.0" = { + name = "hasown"; + packageName = "hasown"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; + sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -7069,13 +7195,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.5" = { + "internal-slot-1.0.6" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; - sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; + sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; }; }; "invert-kv-1.0.0" = { @@ -7141,22 +7267,13 @@ let sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; - "is-accessor-descriptor-0.1.6" = { + "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "0.1.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz"; + sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="; }; }; "is-arguments-1.1.1" = { @@ -7258,31 +7375,22 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.13.0" = { + "is-core-module-2.13.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"; - sha512 = "Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; + sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; }; }; - "is-data-descriptor-0.1.4" = { + "is-data-descriptor-1.0.1" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; - version = "0.1.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz"; + sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; "is-date-object-1.0.5" = { @@ -7294,22 +7402,22 @@ let sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; - "is-descriptor-0.1.6" = { + "is-descriptor-0.1.7" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz"; + sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="; }; }; - "is-descriptor-1.0.2" = { + "is-descriptor-1.0.3" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz"; + sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="; }; }; "is-directory-0.3.1" = { @@ -8023,13 +8131,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.3" = { + "keyv-4.5.4" = { name = "keyv"; packageName = "keyv"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz"; - sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz"; + sha512 = "oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="; }; }; "killable-1.0.1" = { @@ -8059,15 +8167,6 @@ let sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - }; "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; @@ -9031,6 +9130,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-3.0.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz"; + sha512 = "+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="; + }; + }; "moment-2.29.4" = { name = "moment"; packageName = "moment"; @@ -9256,6 +9364,15 @@ let sha512 = "DWTRQR8b54rvschcZRREdsz7K84lnS8A6YJu8du3QLQ8f204SJbyTaA6NzYYbfUG97OTRKRv/0KZl82cTfpLhA=="; }; }; + "node-fetch-2.7.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"; + sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; + }; + }; "node-forge-0.10.0" = { name = "node-forge"; packageName = "node-forge"; @@ -9472,13 +9589,13 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-inspect-1.12.3" = { + "object-inspect-1.13.1" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; + sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; }; }; "object-is-1.1.5" = { @@ -10876,13 +10993,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.3.0" = { + "punycode-2.3.1" = { name = "punycode"; packageName = "punycode"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"; + sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; "q-1.5.1" = { @@ -11434,13 +11551,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.6" = { + "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; - sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"; + sha512 = "oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="; }; }; "resolve-alpn-1.2.1" = { @@ -11740,13 +11857,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.68.0" = { + "sass-1.69.5" = { name = "sass"; packageName = "sass"; - version = "1.68.0"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; - sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; }; "sax-1.2.4" = { @@ -11965,6 +12082,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "set-function-length-1.1.1" = { + name = "set-function-length"; + packageName = "set-function-length"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; + sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + }; + }; "set-function-name-2.0.1" = { name = "set-function-name"; packageName = "set-function-name"; @@ -12370,13 +12496,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.15" = { + "spdx-license-ids-3.0.16" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.15"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz"; - sha512 = "lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; + sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; }; }; "spdy-4.0.2" = { @@ -12424,13 +12550,13 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "sshpk-1.17.0" = { + "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz"; + sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; "ssri-10.0.5" = { @@ -12838,13 +12964,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "sudo-prompt-8.2.5" = { @@ -13018,13 +13144,22 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.21.0" = { + "terser-5.15.1" = { name = "terser"; packageName = "terser"; - version = "5.21.0"; + version = "5.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz"; - sha512 = "WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; + sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; + }; + }; + "terser-5.24.0" = { + name = "terser"; + packageName = "terser"; + version = "5.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz"; + sha512 = "ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw=="; }; }; "terser-5.3.8" = { @@ -13252,6 +13387,15 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; + }; + }; "traverse-0.3.9" = { name = "traverse"; packageName = "traverse"; @@ -13450,6 +13594,15 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typescript-4.9.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz"; + sha512 = "CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA=="; + }; + }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -13504,6 +13657,15 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; + "undici-types-5.26.5" = { + name = "undici-types"; + packageName = "undici-types"; + version = "5.26.5"; + src = fetchurl { + url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; + sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; + }; + }; "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -13612,13 +13774,13 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-2.0.0" = { + "universalify-2.0.1" = { name = "universalify"; packageName = "universalify"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"; + sha512 = "gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="; }; }; "unpipe-1.0.0" = { @@ -13882,13 +14044,22 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vite-4.4.11" = { + "vite-4.3.9" = { name = "vite"; packageName = "vite"; - version = "4.4.11"; + version = "4.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz"; - sha512 = "ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A=="; + url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; + sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + }; + }; + "vite-4.5.0" = { + name = "vite"; + packageName = "vite"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz"; + sha512 = "ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw=="; }; }; "vm-browserify-1.1.2" = { @@ -13999,6 +14170,15 @@ let sha512 = "weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ=="; }; }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; + }; + }; "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; @@ -14098,6 +14278,15 @@ let sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -14161,13 +14350,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.11" = { + "which-typed-array-1.1.13" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.11"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; - sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; + sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; }; }; "winston-2.1.1" = { @@ -14359,6 +14548,15 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrap-ansi-8.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -14485,6 +14683,15 @@ let sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; + "y18n-5.0.8" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + }; "yaeti-0.0.6" = { name = "yaeti"; packageName = "yaeti"; @@ -14548,6 +14755,15 @@ let sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; + "yargs-17.7.2" = { + name = "yargs"; + packageName = "yargs"; + version = "17.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"; + sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -14575,6 +14791,15 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-21.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -14718,7 +14943,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -14741,7 +14966,7 @@ in }) sources."serve-static-1.13.2" sources."setprototypeof-1.1.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."sums-0.2.4" @@ -14956,7 +15181,7 @@ in sources."picomatch-2.3.1" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -14980,7 +15205,7 @@ in ]; }) sources."split-1.0.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -15064,7 +15289,7 @@ in sources."body-parser-1.20.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -15072,7 +15297,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."clone-response-1.0.3" @@ -15089,6 +15314,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexer3-0.1.5" @@ -15109,16 +15335,18 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" + sources."gopd-1.0.1" sources."got-9.6.0" - sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" @@ -15151,7 +15379,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" @@ -15192,6 +15420,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -15305,6 +15534,148 @@ in bypassCache = true; reconstructLock = true; }; + elm-land = nodeEnv.buildNodePackage { + name = "elm-land"; + packageName = "elm-land"; + version = "0.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.4.tgz"; + sha512 = "ruspCQ7s+ZOSILEJ8psXuQMb4ASGfgXCqmMjiLIyV7oX42nSpQGYADTXwiAwo+E7ESev1TWspn/DkAxsuDo6Qg=="; + }; + dependencies = [ + sources."@adobe/css-tools-4.3.1" + sources."@esbuild/android-arm-0.17.19" + sources."@esbuild/android-arm64-0.17.19" + sources."@esbuild/android-x64-0.17.19" + sources."@esbuild/darwin-arm64-0.17.19" + sources."@esbuild/darwin-x64-0.17.19" + sources."@esbuild/freebsd-arm64-0.17.19" + sources."@esbuild/freebsd-x64-0.17.19" + sources."@esbuild/linux-arm-0.17.19" + sources."@esbuild/linux-arm64-0.17.19" + sources."@esbuild/linux-ia32-0.17.19" + sources."@esbuild/linux-loong64-0.17.19" + sources."@esbuild/linux-mips64el-0.17.19" + sources."@esbuild/linux-ppc64-0.17.19" + sources."@esbuild/linux-riscv64-0.17.19" + sources."@esbuild/linux-s390x-0.17.19" + sources."@esbuild/linux-x64-0.17.19" + sources."@esbuild/netbsd-x64-0.17.19" + sources."@esbuild/openbsd-x64-0.17.19" + sources."@esbuild/sunos-x64-0.17.19" + sources."@esbuild/win32-arm64-0.17.19" + sources."@esbuild/win32-ia32-0.17.19" + sources."@esbuild/win32-x64-0.17.19" + sources."@jridgewell/gen-mapping-0.3.3" + sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/source-map-0.3.5" + sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."anymatch-3.1.3" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-from-1.1.2" + sources."chokidar-3.5.3" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."copy-anything-2.0.6" + sources."cross-spawn-6.0.5" + sources."debug-3.2.7" + sources."errno-0.1.8" + sources."esbuild-0.17.19" + sources."fill-range-7.0.1" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.3" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.11" + sources."iconv-lite-0.6.3" + sources."image-size-0.5.5" + sources."immutable-4.3.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."is-what-3.14.1" + sources."isexe-2.0.0" + sources."less-4.2.0" + sources."lodash-4.17.21" + sources."make-dir-2.1.0" + sources."mime-1.6.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."mkdirp-0.5.6" + sources."ms-2.1.3" + sources."nanoid-3.3.6" + sources."needle-3.2.0" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parse-node-version-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."postcss-8.4.31" + sources."prr-1.0.1" + sources."readdirp-3.6.0" + sources."rimraf-2.6.3" + sources."rollup-3.29.4" + sources."safer-buffer-2.1.2" + sources."sass-1.69.5" + sources."sax-1.3.0" + sources."semver-5.7.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + (sources."stylus-0.61.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + sources."source-map-0.7.4" + ]; + }) + sources."sugarss-4.0.1" + sources."temp-0.9.4" + sources."terser-5.15.1" + sources."to-regex-range-5.0.1" + sources."tslib-2.6.2" + sources."typescript-4.9.3" + sources."undici-types-5.26.5" + sources."vite-4.3.9" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Reliable web apps for everyone"; + homepage = "https://elm.land"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; @@ -15437,7 +15808,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."chokidar-3.4.2" sources."commander-2.20.3" sources."concat-map-0.0.1" @@ -15588,10 +15959,10 @@ in sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.2" - sources."@types/responselike-1.0.1" + sources."@types/node-20.8.10" + sources."@types/responselike-1.0.2" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" sources."caw-2.0.1" @@ -15619,7 +15990,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -15640,6 +16011,7 @@ in sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" + sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."url-to-options-1.0.1" sources."which-2.0.2" @@ -15660,15 +16032,16 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.2.0.tgz"; - sha512 = "YhBRf4S4WxvjzyhHHMmXc2CHVtwwHqXU4h8jxUwcZ+elMz3GiGB4nYRCdZIWrKE1bw5W0TDRcQ4gsc9SgpSxbw=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.3.0.tgz"; + sha512 = "6TG+4L/yEamiHpxVQUJPRgHoeEOmk5LhWuVRECMHTKPpvuM2BCYMGwCMUGJ0Wh64RW8oERIdnicsvUDlvDwiTg=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."ajv-6.12.6" - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -15684,15 +16057,21 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffers-0.1.1" - sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."chokidar-3.2.1" sources."chownr-1.1.4" - sources."cliui-5.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."cliui-8.0.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-7.0.0" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -15702,18 +16081,31 @@ in ]; }) sources."dashdash-1.14.1" - sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" (sources."elm-test-0.19.1" // { dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."has-flag-3.0.0" + (sources."supports-color-7.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) ]; }) sources."elmi-to-json-1.2.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-9.2.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -15726,11 +16118,16 @@ in ]; }) sources."find-parent-dir-0.3.1" - sources."find-up-3.0.0" sources."firstline-2.0.2" + sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-5.0.0" + (sources."fs-extra-11.1.1" // { + dependencies = [ + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" + ]; + }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -15741,33 +16138,34 @@ in sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jackspeak-2.3.6" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.2" - sources."locate-path-3.0.0" sources."lodash-4.17.15" + sources."lru-cache-10.0.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" + sources."mkdirp-3.0.1" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -15781,16 +16179,17 @@ in sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -15801,21 +16200,42 @@ in ]; }) sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."rimraf-2.7.1" + (sources."rimraf-5.0.5" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-10.3.10" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.2" - sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."signal-exit-4.1.0" sources."split-1.0.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - sources."tar-4.4.19" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."supports-color-7.2.0" + (sources."tar-4.4.19" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) (sources."temp-0.9.0" // { dependencies = [ sources."rimraf-2.6.3" @@ -15828,19 +16248,39 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.1" + (sources."unzip-stream-0.3.1" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-2.0.1" - sources."which-module-2.0.1" - sources."wrap-ansi-5.1.0" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-3.1.1" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + (sources."yargs-17.7.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) + sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -15907,7 +16347,7 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" + sources."@babel/compat-data-7.23.2" sources."@babel/core-7.12.10" sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" @@ -15944,7 +16384,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" sources."@babel/parser-7.23.0" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -16010,7 +16450,7 @@ in sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" + sources."@babel/traverse-7.23.2" sources."@babel/types-7.23.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -16021,30 +16461,30 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.12" - sources."@types/json-schema-7.0.13" + sources."@types/http-proxy-1.17.13" + sources."@types/json-schema-7.0.14" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.2" - sources."@types/parse-json-4.0.0" - sources."@types/q-1.5.6" - sources."@types/source-list-map-0.1.3" - sources."@types/tapable-1.0.9" - (sources."@types/uglify-js-3.17.2" // { + sources."@types/node-20.8.10" + sources."@types/parse-json-4.0.1" + sources."@types/q-1.5.7" + sources."@types/source-list-map-0.1.4" + sources."@types/tapable-1.0.10" + (sources."@types/uglify-js-3.17.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.34" // { + (sources."@types/webpack-4.41.35" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-3.2.1" // { + (sources."@types/webpack-sources-3.2.2" // { dependencies = [ sources."source-map-0.7.4" ]; @@ -16176,7 +16616,7 @@ in sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { + (sources."browserify-sign-4.2.2" // { dependencies = [ sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" @@ -16192,7 +16632,7 @@ in sources."bytes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -16200,7 +16640,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001546" + sources."caniuse-lite-1.0.30001561" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16220,18 +16660,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."clean-css-4.2.4" // { @@ -16299,7 +16728,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.33.0" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16379,7 +16808,7 @@ in sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -16424,7 +16853,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.542" + sources."electron-to-chromium-1.4.576" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -16462,9 +16891,9 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.2" + sources."es-abstract-1.22.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -16497,18 +16926,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -16598,7 +17016,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" - sources."fraction.js-4.3.6" + sources."fraction.js-4.3.7" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -16607,12 +17025,12 @@ in sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -16652,7 +17070,7 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" @@ -16674,6 +17092,7 @@ in ]; }) sources."hash.js-1.1.7" + sources."hasown-2.0.0" sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -16732,13 +17151,13 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."invert-kv-1.0.0" sources."ip-1.1.8" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" @@ -16748,10 +17167,10 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" + sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -16908,17 +17327,11 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -17284,7 +17697,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -17376,7 +17789,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -17434,6 +17847,7 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -17459,18 +17873,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -17510,7 +17913,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -17520,25 +17923,14 @@ in sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."ssri-6.0.2" sources."stable-0.1.8" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -17677,6 +18069,7 @@ in ]; }) sources."unbox-primitive-1.0.2" + sources."undici-types-5.26.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" @@ -17846,7 +18239,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -17987,13 +18380,13 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.8.tgz"; - sha512 = "ls6ZI5CMlFji/P2yg1A+Krv6A1zjm4Q1+gpkMjZsAcmg2gABjN6R4ZATbD6/+hosSaAvsnZ1rRUTCPRsncYg+w=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.9.tgz"; + sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; }; dependencies = [ - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@esbuild/android-arm-0.17.19" sources."@esbuild/android-arm64-0.17.19" sources."@esbuild/android-x64-0.17.19" @@ -18022,7 +18415,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -18039,14 +18432,14 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.199" + sources."@types/lodash-4.14.200" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" @@ -18074,7 +18467,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" (sources."cacache-17.1.4" // { @@ -18091,7 +18484,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" @@ -18117,6 +18510,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-1.0.3" @@ -18177,20 +18571,22 @@ in sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globby-13.1.4" + sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" - sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ @@ -18323,7 +18719,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.4.2" @@ -18352,7 +18748,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" @@ -18369,7 +18765,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.68.0" + sources."sass-1.69.5" sources."sax-1.3.0" sources."section-matter-1.0.0" sources."semver-6.3.1" @@ -18389,6 +18785,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -18429,11 +18826,10 @@ in sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -18450,7 +18846,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.21.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -18462,15 +18858,16 @@ in sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."undici-types-5.26.5" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" - (sources."vite-4.4.11" // { + (sources."vite-4.5.0" // { dependencies = [ sources."@esbuild/android-arm-0.18.20" sources."@esbuild/android-arm64-0.18.20" @@ -18494,7 +18891,7 @@ in sources."@esbuild/win32-arm64-0.18.20" sources."@esbuild/win32-ia32-0.18.20" sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.8.2" + sources."@types/node-20.8.10" sources."esbuild-0.18.20" ]; }) @@ -18544,10 +18941,10 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.2" - sources."@types/responselike-1.0.1" + sources."@types/node-20.8.10" + sources."@types/responselike-1.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -18622,7 +19019,7 @@ in sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -18694,7 +19091,8 @@ in sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" @@ -18752,4 +19150,60 @@ in bypassCache = true; reconstructLock = true; }; + "@dillonkearns/elm-graphql" = nodeEnv.buildNodePackage { + name = "_at_dillonkearns_slash_elm-graphql"; + packageName = "@dillonkearns/elm-graphql"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@dillonkearns/elm-graphql/-/elm-graphql-4.3.1.tgz"; + sha512 = "De5PhJpuv2sqcglfhxLp4iB2Zxha6ejbhvajHeziE8ZZRsVXBcoDdh+aScWOQR0GR/t5cF4iGgNf6a5aPO9faA=="; + }; + dependencies = [ + sources."asynckit-0.4.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."cross-fetch-3.1.8" + sources."cross-spawn-5.1.0" + sources."delayed-stream-1.0.0" + sources."encoding-0.1.13" + sources."extract-files-9.0.0" + sources."form-data-3.0.1" + sources."fs.realpath-1.0.0" + sources."glob-7.2.3" + sources."graphql-16.8.1" + sources."graphql-request-3.7.0" + sources."iconv-lite-0.6.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."isexe-2.0.0" + sources."lru-cache-4.1.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."node-fetch-2.7.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pseudomap-1.0.2" + sources."safer-buffer-2.1.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "[![Build Status](https://github.com/dillonkearns/elm-graphql/workflows/CI/badge.svg)](https://github.com/dillonkearns/elm-graphql/actions?query=branch%3Amaster) [![Elm package](https://img.shields.io/elm-package/v/dillonkearns/elm-graphql.svg)](https://pa"; + homepage = "https://github.com/dillonkearns/elm-graphql#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix index 37ccb5f1a0..436fda2a05 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.45"; + version = "3.1.47"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; + npmDepsHash = "sha256-Qft+//za5ed6Oquxtcdpv7g5oOc2WmWuRJ/CDe+FEiI="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; + hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI="; rev = version; }; @@ -85,6 +85,9 @@ stdenv.mkDerivation rec { cp -r . $appdir chmod -R +w $appdir + mkdir -p $appdir/node_modules + cp -r ${nodeModules}/* $appdir/node_modules + mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix index fd1a8d4839..6d052179eb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.21"; + version = "0.6.25"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-NS9LpnCAYmninAcliwdEXPSYqqQZ8impaaK2eceoi3k="; + hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg="; }; - cargoHash = "sha256-JJPbArXb3Hmf7bDRlYM0ZOnaolYnDtc41EFazFtApWc="; + cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix index 47a84a6e5f..9ce582623f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.40.0"; + version = "0.41.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-NVQY2TgIR9ROy4x8PWxCjuaOkNx0bcUA4oZHjpQbHc4="; + sha256 = "sha256-bDeqwk+grkCxmGE9H8Ks7Q8KvLxNCzaLe44DlR6E7YE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix index e3c1791de6..ff18036677 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -74,20 +74,20 @@ in { inherit wrapFlutter; stable = mkFlutter { - version = "3.13.4"; - engineVersion = "9064459a8b0dcd32877107f6002cc429a71659d1"; - dartVersion = "3.1.2"; + version = "3.13.8"; + engineVersion = "767d8c75e898091b925519803830fc2721658d07"; + dartVersion = "3.1.4"; dartHash = { - x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg="; - aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw="; - x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM="; - aarch64-darwin = "sha256-BMbjSNJuh3RC+ObbJf2l6dacv2Hsn2/uygKDrP5EiuU="; + x86_64-linux = "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE="; + aarch64-linux = "sha256-/tWWWwTOgXHbwzotc7ZDDZa8+cbX6NODGYrjLK9gPPg="; + x86_64-darwin = "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M="; + aarch64-darwin = "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI="; }; flutterHash = rec { - x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw="; + x86_64-linux = "sha256-ouI1gjcynSQfPTnfTVXQ4r/NEDdhmzUsKdcALLRiCbg="; aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-BpxeCE9vTnmlIp6OS7BTPkOFptidjXbf2qVOVUAqstY="; - aarch64-darwin = "sha256-rccuxrE9nzC86uKGL96Etxxs4qMbVXJ1jCn/wjp9WlQ="; + x86_64-darwin = "sha256-k6KNazP/I71zG5mbx3iEtXBJ8EZi9Qq+7PgL/HAJrgE="; + aarch64-darwin = "sha256-Duvw8EqrGb3PmBHBH/prZjyij2xJd9sLkNfPRYpC0pQ="; }; patches = flutter3Patches; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index b027a2a8ce..7bfb60d7a9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,118 +1,117 @@ { - "9064459a8b0dcd32877107f6002cc429a71659d1" = { + "767d8c75e898091b925519803830fc2721658d07" = { skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { - "artifacts.zip" = "sha256-AABHJH/EOOQzEcD0O/XftA1AAV8tNFX3dj0OsJJ3/9A="; + "artifacts.zip" = "sha256-pnUDY2sUN2r/LrivyNkfTUpQC90GKOI6Ya+0lgIz+c0="; }; android-arm-profile = { - "artifacts.zip" = "sha256-MLlQFtjrGDQc3mH2T7CUlR/wDOPS7HRfgUuoLXjtd+E="; - "linux-x64.zip" = "sha256-S2/5ZFhNkDxUqsUZCFrwTERTUZIZpOiFijhcLZnozLI="; - "darwin-x64.zip" = "sha256-IwtYSpcg+5JmnkHuj6LGVp7GWiuUzETOPgKYRQczWzc="; + "artifacts.zip" = "sha256-/kDNI+no4u2Ri/FqqsQEp2iEqifULYGqzz8w0G4pzCM="; + "linux-x64.zip" = "sha256-fUfaDJIo1VcdJHcd0jO98Az3OdNQ+JtA5Mp6nQVVU4E="; + "darwin-x64.zip" = "sha256-J7vDD5VEsgnWmbI8acM3vQwrnrqcfMaCijiItDfniLY="; }; android-arm-release = { - "artifacts.zip" = "sha256-NLvwaB4UkYBRzg4cxzNZkileDFQk6GT/8nRugHU98Is="; - "linux-x64.zip" = "sha256-dua4xvVqsJY1d/eyA8j6NPnpAbotigPIs8SRj28F87w="; - "darwin-x64.zip" = "sha256-2B1+s6sngbN0+sPP1qKVpeMF6RIZZToF88baiqcNQT4="; + "artifacts.zip" = "sha256-tVAFHHG8A8vlgQu6l6ybdfm6OmBf2vrYf3PZByWvs08="; + "linux-x64.zip" = "sha256-lrejG7zpUBox9kPvs1uPM/lyR1d/SAc1w+c6kcqghHI="; + "darwin-x64.zip" = "sha256-8lKOsqLgbnuoCR87v84dn8V3PRzl1+maWFIHopiGvbc="; }; android-arm64 = { - "artifacts.zip" = "sha256-Hf+S8XuAzD9HCU4FVmjN0jvTTxPtzEm+k++8IgaXOyM="; + "artifacts.zip" = "sha256-rcU2mX0nP1ot+6DU+uxvILUOAuwTPGH23UQ6riBs0d4="; }; android-arm64-profile = { - "artifacts.zip" = "sha256-k4miTzdDL+gg9LxzjBVRtAuwhKELBiVDsvQ+aVeWTeI="; - "linux-x64.zip" = "sha256-2ErIxNdX1NfHrjiqZzNwISKybeS9SGOlqFh7G8KCAcE="; - "darwin-x64.zip" = "sha256-1FdvI6llPjAeSc7+e97rvG7SvvFHqZH+4MREuRyF1DA="; + "artifacts.zip" = "sha256-x4TEJWi3c6mEPGh+3l4PtRqsg4Tq7mxHtGz+4MqwzPw="; + "linux-x64.zip" = "sha256-PsDKOq3DXaNeNtaFtDQJ9JIEESXBHm8XHHpOw2u1cGg="; + "darwin-x64.zip" = "sha256-K4W1CEBOlZVsHjuhvKCUZWv45VSohRd23vviaLqMNjQ="; }; android-arm64-release = { - "artifacts.zip" = "sha256-y64Xhi5QFirZadU+fW8MOpkEarq/KPoEmmo0XRYf3/E="; - "linux-x64.zip" = "sha256-8dKrP9wQ9hDHNNrz1ZiYLV6zeGB60ikyrRFS6xdu+4Q="; - "darwin-x64.zip" = "sha256-2/eyFFAAUnuDtDoVh6L5emRXaQ03kwNRf6yIceWX3eU="; + "artifacts.zip" = "sha256-w+J4sNhYoj44IiHpZ0BkemCYlE9wOTvWL57Y8RCstkI="; + "linux-x64.zip" = "sha256-MJsmck27V14/f0IAT6b/R47p8/eCMX9Nn//PEAbEeOY="; + "darwin-x64.zip" = "sha256-xXa5GFatJPiwBANqeWUpAdM9gibD4xH85aI6YpJrcpI="; }; android-x64 = { - "artifacts.zip" = "sha256-b3AtOxad05vaXQzeCBtSf3G8ZiM0tOG0JRu4vbNtfgI="; + "artifacts.zip" = "sha256-doNUwEJkwncHPIf2c8xOZByUU8dmogtWlc6q7n7ElDY="; }; android-x64-profile = { - "artifacts.zip" = "sha256-TVOtSjKc8WkvYsY+aK7OH9eTA/q7tmtnSdQArPWS2vM="; - "linux-x64.zip" = "sha256-IHv3TGI1Yvhoq1ehVyVUn3JtPTCFyEtxdysvr/SWFxY="; - "darwin-x64.zip" = "sha256-B4XooSrLRJh3XADfIAv/YBDCT/Mpg2di0oE4SZlU8I8="; + "artifacts.zip" = "sha256-N3AjdHdzj4s6v3f3Gf6n/1Xk0W7xFQP70SneCNlj2sk="; + "linux-x64.zip" = "sha256-pNn75iZqLwOGO3ZmymmrSasDPMmDWwp9ZWBv9Xti4cU="; + "darwin-x64.zip" = "sha256-6O4lA/4wZ91ODUUYHe4HpjvraAEbhHiehBmf3sT37Dc="; }; android-x64-release = { - "artifacts.zip" = "sha256-EaImhQlUnG/zYHDROkdgQdGHD9AfDJULowS785aVoCM="; - "linux-x64.zip" = "sha256-ZBvtCVUNf0D1P1lz4vmIrhsn9hZmJZ5Tn65v9Wot6bk="; - "darwin-x64.zip" = "sha256-IbMANAKyz7uFG5oqOKMj0KTVhaCBryBKdobvgS9bOgI="; + "artifacts.zip" = "sha256-odDS/m8fgSA24EYt+W2sEDmOlPO17FZxxomWuYUHmns="; + "linux-x64.zip" = "sha256-sVQYmu0KaPADlL59XZc26Ks+TbmaJxRGPiJKlWxUhRA="; + "darwin-x64.zip" = "sha256-dep/CmBIDkvqYKQPWMCDTDbFhVvOk6N7JAF8v3dr/P8="; }; android-x86 = { - "artifacts.zip" = "sha256-ElFkaxlyLVbexdocyQ1AIKgfr93ol1EDyf+aFDt4I10="; + "artifacts.zip" = "sha256-MzTFQ0XPtd9OXvKfM98bwpxN/xfEcXox24gn/4aS/Do="; }; android-x86-jit-release = { - "artifacts.zip" = "sha256-ptrhyXrx8xGuRQYs8nBryzyDuCiIMsgMmqxi3kHXQ4s="; + "artifacts.zip" = "sha256-cUsBqJxOOluwnYEFzdtZof8c4Vp1D81HkEEH8aRGLyY="; }; darwin-arm64 = { - "artifacts.zip" = "sha256-nG23DmYeKoMJnuTPMnvouPHzK3XNKBrEIZ5zijiCoAg="; - "font-subset.zip" = "sha256-Kx3G5FmN2bVgIvYiQP9og8kgl28ZCXThpcmByAv+f6U="; + "artifacts.zip" = "sha256-df+rmN0RqLM7MgEKjTcybMY0bFYCB1jsTvaVE1J0BzY="; + "font-subset.zip" = "sha256-hJ5fECxN4oZX6E9ivzSDGejNSj56t2SKccbyfozXxps="; }; darwin-arm64-profile = { - "artifacts.zip" = "sha256-Uzg5F2NPlVN/cui4ixJ3JxBttn0KQMEyKEVLmecssuU="; + "artifacts.zip" = "sha256-EaXOr998zE4cG5G5FRtsDGt3jjg1GjkRGE/ZDD3Coto="; }; darwin-arm64-release = { - "artifacts.zip" = "sha256-qZ1jYvvkBcaIHqZszFTOcuCDWnEmm/vsJt2aSZvgO+s="; + "artifacts.zip" = "sha256-1XMoM8jDRoUSPMauKD5lsgC25B7Htod8wYouDKSEGJY="; }; darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk="; - "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s="; - "artifacts.zip" = "sha256-aZf99m1KlIpEuwwMMWAksp9d/SQQXt8jOTs/6GJUhcw="; - "font-subset.zip" = "sha256-ZfdDnRPDOqNsj3dCHStLWXWCMOzodmR4ojQrMQt6hQY="; - "gen_snapshot.zip" = "sha256-1xi4EJsiOIJSaBSIhl7p4L0aWtLYR1vGz4yYzNdVuQw="; + "FlutterEmbedder.framework.zip" = "sha256-vzvt0pwo1HbIxxym/jn2Y+1+Iqm/Gw2TfymEcuUHIXQ="; + "FlutterMacOS.framework.zip" = "sha256-cMTCULaVOKDq8VrqCmZLo0IPBve0GSh0K2yvtdCvX8c="; + "artifacts.zip" = "sha256-8BViZUz4b0XurQJM+FCU2toONKmhajabCc66gBUVGgY="; + "font-subset.zip" = "sha256-VgqNdUmvTbSedQtJNT+Eq90GWS4hXCDCBDBjno6s1dk="; + "gen_snapshot.zip" = "sha256-4O0ZfKt96x8/Jwh8DgBoPFiv84Tqf9tR/f0PVRJlJiQ="; }; darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo="; - "artifacts.zip" = "sha256-kZ6io/+ohx5jKhu1i/l0UZbTB1gk6BSn1VryZJxPcjU="; - "gen_snapshot.zip" = "sha256-5AUul5CQ6A8YGb6/PAfbPH7G/c+9rElDftmL3WIi4ZQ="; + "FlutterMacOS.framework.zip" = "sha256-IrXK0Mjllic3OKaYKKpAE9gPIceTO32hGqgxGR66QmY="; + "artifacts.zip" = "sha256-IHllbxwRMrEWA1MI0DRCYYRzYAdQIL8B9b5rZHsOvjc="; + "gen_snapshot.zip" = "sha256-bPI6pHrWQR1X7CzytbJA90TYe3cg1yN+9v7JtsCCrbQ="; }; darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-DN5R/U+pcCgFyR6wLcp11Bjvov4sS0J3crMWOx0dNBI="; - "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs="; - "artifacts.zip" = "sha256-Lpz0WLAdspPybLhTnS2fsReTAZ0qkJmMvY+u8iCe53s="; - "gen_snapshot.zip" = "sha256-RLO5V6B/xzI5ljbIY7Yj4m1aFYYJ0PeO6nAyAN/ufnM="; + "FlutterMacOS.dSYM.zip" = "sha256-HjU8sLPwvOwO3LP7krpZZW6/t3sN3rX2frFnBp1Kk0I="; + "FlutterMacOS.framework.zip" = "sha256-GuTWojZFdSEeOiSYxH8XGSWsxcrkUpnXA61B0NpDa5A="; + "artifacts.zip" = "sha256-tQCm1HHrhffNz9a0lNIHXLBqFMbT4QiaibKvRKuuhJ4="; + "gen_snapshot.zip" = "sha256-0na+yx0Nxe/FuHVZqhgbRniZLInShoKE3USaJg0829o="; }; - "flutter_patched_sdk.zip" = "sha256-d1KBJex2XgFbM0GgtcMFGDG2MN00zPd5HyAP54vBIaw="; - "flutter_patched_sdk_product.zip" = "sha256-TG0OfcYQHy7Um1nl7xHXGl0oGGkna1tKSWhtnLTo2Ic=" - ; + "flutter_patched_sdk.zip" = "sha256-AVjXLND3nJAaGyBAhytBRUvbkJtwZEcndQSrq+D2c08="; + "flutter_patched_sdk_product.zip" = "sha256-31qgieDI897sXtEf8ok2SdFgrlN57bwhT3FUfdofZi0="; ios = { - "artifacts.zip" = "sha256-bTtAJ4mrJZmT9IcDppfvm1ih3lNqJqywgatN3k48hoI="; + "artifacts.zip" = "sha256-RicBTTBX5aIQwfcolDrKe0MVG9uTp56RYMWgR75AVEw="; }; ios-profile = { - "artifacts.zip" = "sha256-4bqMbZ0ASURIRp6Zfs25Nww+5FasRqdXcppX2KSWK0g="; + "artifacts.zip" = "sha256-6EXHvy36K+rRGpjt0GL/DyuOhpAGeaOrZAZvPZuLyys="; }; ios-release = { - "Flutter.dSYM.zip" = "sha256-LsYX9BTj9FXaW4f+7q6S/raZNx97FmGdJvegYrFiCAc="; - "artifacts.zip" = "sha256-KZBpNSeXCqfRydOdFzcaYdde3OCw7oI7x9/1l/4WlSk="; + "Flutter.dSYM.zip" = "sha256-zYqlX4QhxnDb9LasMcBcPO/+30LCfVbwC+z+wZiiEqk="; + "artifacts.zip" = "sha256-DVpynf2LxU6CPC1BPQbi8OStcIwJKX55rDSWNiJ4KNk="; }; linux-arm64 = { - "artifacts.zip" = "sha256-YBXe02wlxxpWT2pDUSILK/GXpKGx2vQo55E8zDOd4IQ="; - "font-subset.zip" = "sha256-02PHMUCPn6VBaQazfjEqVCGDPeGRXVTMXW8eAOuQRhY="; + "artifacts.zip" = "sha256-djesma+IqQZgGlxQj4Gv6hAkQhQKQp7Gsa1I4hksqNc="; + "font-subset.zip" = "sha256-Wo11dks0uhLI2nu+9QJ7aLmvfsPcuqvcmquak4qv5XM="; }; linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-ZTWenA3msfvFjoPA5ByX1/kXTDtd6H0H6i8AP2K9Zt8="; + "linux-arm64-flutter-gtk.zip" = "sha256-6T2Ycxe3GTVnFGfBFfXLZwPklIndQ6hojnCSnMeXJso="; }; linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-CDXfWkg/WHT9A8EAzo78KiUI3uN1rZyvrPSDH5fyiQU="; + "linux-arm64-flutter-gtk.zip" = "sha256-ycInFHuRu7r+50GsoFR4v/rIRiAQaQ9zFemd2d9AnpQ="; }; linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-62dlbrqCj5mbIQXxMPzXTXHSJdJH4nao1a1c1WOSB1Y="; + "linux-arm64-flutter-gtk.zip" = "sha256-J60MU8pHDVL9DyX5A3YdCRkKXnTgvALhHiEzYiPSSuA="; }; linux-x64 = { - "artifacts.zip" = "sha256-YVKajJeP6hFkLJk0HPIrEg/ig0tzkGj34z3ZA3VB8fE="; - "font-subset.zip" = "sha256-OFWcMnVi6AQoXKYcyMU8JN4/XM3OgSes0hzz8odTc8w="; + "artifacts.zip" = "sha256-ZUMRJ0dzaeRQUYy5S7gDLWa3w9CVhNPORN9l+lwxAMs="; + "font-subset.zip" = "sha256-pmtHAgIj5tXzUsDrrxB5JwfLDNzMCqouUCOyYN5BOEQ="; }; linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-Z8xCDor+sBwXg63r0o7RudzoWj5AsAUkc53F6dvEsLY="; + "linux-x64-flutter-gtk.zip" = "sha256-otmghZAiUlpLYfFaWd18UWlfctKcYsMRBMP78ZyBj/E="; }; linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-x7n84R4y7/jH/rUbe86Gm0oLM5aLSTB2UjjeIpRJ1zQ="; + "linux-x64-flutter-gtk.zip" = "sha256-bT6xMYlwTB9JOV1790cJqTSEXYstdI4sZCQzFzcpa5s="; }; linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-B/Rtkln/rLS9M1gciXRnKvhPwR6bJrjGhrE9o1waamI="; + "linux-x64-flutter-gtk.zip" = "sha256-E8Eogr0nD7yaxjuoNhpvF4tTx9N53y3iOkI71Eqx5Ko="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix index 47b64fe474..f525bcc7ab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/wrapper.nix @@ -177,6 +177,7 @@ in ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ]; passthru = flutter.passthru // { + inherit (flutter) version; unwrapped = flutter; inherit engineArtifacts; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder-darwin.sh index 39db051828..8a8600f1f6 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh index c471378c27..568c309410 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index ee45e1e9ab..8bb3366655 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2023.04.25"; + version = "2023.09.03"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - hash = "sha256-LF8eXi/es337QJ2fs5u9pLqegJkh1kDLjK8p4CcSGGc="; + hash = "sha256-ymoP5DvaLdrdwJcnhZnLEvwNxUFzhkICajPyK4lvacc="; }; strictDeps = true; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { stdint yojson fileutils + memtrace menhirLib pprint sedlex diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index 33391c1569..60b9fb792d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -5,7 +5,8 @@ stampYmd ? 0, stampHms ? 0, gambit-support, optimizationSetting ? "-O1", - gambit-params ? pkgs.gambit-support.stable-params }: + gambit-params ? pkgs.gambit-support.stable-params, + rev ? git-version }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling @@ -30,6 +31,11 @@ gccStdenv.mkDerivation rec { inherit src version git-version; bootstrap = gambit-support.gambit-bootstrap; + passthru = { + inherit src version git-version rev stampYmd stampHms optimizationSetting openssl; + }; + + nativeBuildInputs = [ git autoconf ]; # TODO: if/when we can get all the library packages we depend on to have static versions, @@ -47,6 +53,7 @@ gccStdenv.mkDerivation rec { "--enable-c-opt=${optimizationSetting}" "--enable-c-opt-rts=-O2" "--enable-gcc-opts" + "--enable-trust-c-tco" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-openssl" @@ -70,6 +77,9 @@ gccStdenv.mkDerivation rec { # "--enable-char-size=1" # default is 4 # "--enable-march=native" # Nope, makes it not work on machines older than the builder ] ++ gambit-params.extraOptions + # TODO: pick an appropriate architecture to optimize on on x86-64? + # https://gcc.gnu.org/onlinedocs/gcc-4.8.4/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options + # ++ lib.optional pkgs.stdenv.isx86_64 "--enable-march=core-avx2" # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498 ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix index cb4f5f9501..a0f95192cb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/default.nix @@ -2,7 +2,7 @@ callPackage ./build.nix rec { version = "4.9.5"; - git-version = version; + git-version = "v${version}"; src = fetchurl { url = "https://gambitscheme.org/4.9.5/gambit-v4_9_5.tgz"; sha256 = "sha256-4o74218OexFZcgwVAFPcq498TK4fDlyDiUR5cHP4wdw="; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index 6e42b9252f..1209ca10aa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -13,16 +13,17 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; substituteInPlace include/makefile.in \ - --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; + --replace "\$\$(\$(GIT) describe --tag --always | sed 's/-bootstrap\$\$//')" "v${git-version}" \ + --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"v${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;"; + grep -i ' version=\|echo..#define ___STAMP_VERSION' include/makefile.in # XXX DEBUG -- REMOVE ME ''; modules = true; - #extraOptions = []; - extraOptions = ["--enable-trust-c-tco" "CFLAGS=-foptimize-sibling-calls"]; + extraOptions = ["CFLAGS=-foptimize-sibling-calls"]; }; unstable-params = stable-params // { stable = false; - extraOptions = ["--enable-trust-c-tco"]; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable + extraOptions = []; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 092cbdb724..597cbedb13 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,15 +1,16 @@ { callPackage, fetchFromGitHub, gambit-support }: -callPackage ./build.nix { - version = "unstable-2023-08-06"; - git-version = "4.9.5-5-gf1fbe9aa"; - stampYmd = 20230806; - stampHms = 195822; +callPackage ./build.nix rec { + version = "unstable-2023-10-07"; + git-version = "4.9.5-59-g342399c7"; + stampYmd = 20231007; + stampHms = 170745; + rev = "342399c736ec560c0ff4faeaeb9599b45633f26c"; src = fetchFromGitHub { owner = "gambit"; repo = "gambit"; - rev = "f1fbe9aa0f461e89f2a91bc050c1373ee6d66482"; - sha256 = "0b0gd6cwj8zxwcqglpsnmanysiq4mvma2mrgdfr6qy99avhbhzxm"; + inherit rev; + sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f"; }; gambit-params = gambit-support.unstable-params; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 5fd186802c..8f18579f93 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "12.2.rel1"; + version = "12.3.rel1"; platform = { aarch64-darwin = "darwin-arm64"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; sha256 = { - aarch64-darwin = "0j12n631bmbfvnfbmv4q7cfhmh4l7ka3vcjcvyw0vjqb4msyia91"; - aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; - x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; - x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; + aarch64-darwin = "sha256-Oy7uC99xwbvrPDt0JPv3vZ1cPw9aOkp4FZyeOtIZ570="; + aarch64-linux = "sha256-FMBIfVdT9gcdJOVoiB98fmf4DdgxZd7FFks3MTlK9DE="; + x86_64-darwin = "sha256-5u2L+TD62c4z4SCrkLNpV7H3efzKpt5snKmliYLAQpE="; + x86_64-linux = "sha256-EqKBVkQxjrzOr4S+q7Zl0JJLbnniEEhFLFMxpWMyswk="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/13/default.nix new file mode 100644 index 0000000000..14d7d215a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, ncurses5 +, python38 +, libxcrypt-legacy +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "13.2.rel1"; + + platform = { + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + sha256 = { + aarch64-darwin = "39c44f8af42695b7b871df42e346c09fee670ea8dfc11f17083e296ea2b0d279"; + aarch64-linux = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a"; + x86_64-darwin = "075faa4f3e8eb45e59144858202351a28706f54a6ec17eedd88c9fb9412372cc"; + x86_64-linux = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + done + ''; + + postFixup = '' + mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped + cat < $out/bin/arm-none-eabi-gdb + #!${runtimeShell} + export PYTHONPATH=${python38}/lib/python3.8 + export PYTHONHOME=${python38}/bin/python3.8 + exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" + EOF + chmod +x $out/bin/arm-none-eabi-gdb + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak prtzl ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix new file mode 100644 index 0000000000..70b4b75369 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/all.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, gccStdenv +, gcc7Stdenv +, callPackage +, isl_0_11, isl_0_14, isl_0_17, isl_0_20 +, libcCross +, threadsCrossFor +, noSysDirs +, texinfo5 +, cloog_0_18_0, cloog +, lowPrio +, wrapCC +}@args: + +let + versions = import ./versions.nix; + gccForMajorMinorVersion = majorMinorVersion: + let + atLeast = lib.versionAtLeast majorMinorVersion; + attrName = "gcc${lib.replaceStrings ["."] [""] majorMinorVersion}"; + pkg = lowPrio (wrapCC (callPackage ./default.nix ({ + inherit noSysDirs; + inherit majorMinorVersion; + reproducibleBuild = true; + profiledCompiler = false; + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { }; + isl = if stdenv.isDarwin then null + else if atLeast "9" then isl_0_20 + else if atLeast "7" then isl_0_17 + else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) + else if atLeast "4.9" then isl_0_11 + else /* "4.8" */ isl_0_14; + } // lib.optionalAttrs (majorMinorVersion == "4.8") { + texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump + } // lib.optionalAttrs (!(atLeast "6")) { + cloog = if stdenv.isDarwin + then null + else if atLeast "4.9" then cloog_0_18_0 + else /* 4.8 */ cloog; + } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { + # gcc 10 is too strict to cross compile gcc <= 8 + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + }))); + in + lib.nameValuePair attrName pkg; +in +lib.listToAttrs (map gccForMajorMinorVersion versions.allMajorVersions) + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix index e7dc570a56..239d602680 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix @@ -31,7 +31,23 @@ let # SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib"; -in '' - echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in - echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in - '' +in +'' + echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in + echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in +'' + + # Meanwhile, crt{i,n}.S are not present on certain platforms + # (e.g. LoongArch64), resulting in the following error: + # + # No rule to make target '../../../gcc-xx.x.x/libgcc/config/loongarch/crti.S', needed by 'crti.o'. Stop. + # + # For LoongArch64 and S390, a hacky workaround is to simply touch them, + # as the platform forces .init_array support. + # + # https://www.openwall.com/lists/musl/2022/11/09/3 + # + # 'parsed.cpu.family' won't be correct for every platform. ++ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390) '' + touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S +'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix index f3bf14e36f..c8342ae900 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/libgcc.nix @@ -36,7 +36,7 @@ lib.optionals (lib.versionAtLeast version "11.0") (let targetPlatformSlash = - if hostPlatform.config == targetPlatform.config + if hostPlatform == targetPlatform then "" else "${targetPlatform.config}/"; @@ -83,7 +83,7 @@ in lib.optionalString (!langC) '' rm -f $out/lib/libgcc_s.so* '' - + lib.optionalString (hostPlatform.config != targetPlatform.config) '' + + lib.optionalString (hostPlatform != targetPlatform) '' mkdir -p $lib/lib/ ln -s ${targetPlatformSlash}lib $lib/lib '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 6c36c0a21e..77179d7397 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -116,13 +116,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # Normally (for host != target case) --without-headers automatically # enables 'inhibit_libc=true' in gcc's gcc/configure.ac. But case of -# gcc->clang "cross"-compilation manages to evade it: there +# gcc->clang or dynamic->static "cross"-compilation manages to evade it: there # hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. # We explicitly inhibit libc headers use in this case as well. + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && - targetPlatform.config == hostPlatform.config && - (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM or false)) '' + targetPlatform.config == hostPlatform.config) '' export inhibit_libc=true '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix index eb77b6f365..01f1725130 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix @@ -33,6 +33,7 @@ , nukeReferences , callPackage , majorMinorVersion +, darwin # only for gcc<=6.x , langJava ? false @@ -47,18 +48,8 @@ }: let - version = { - "13" = "13.2.0"; - "12" = "12.3.0"; - "11" = "11.4.0"; - "10" = "10.5.0"; - "9" = "9.5.0"; - "8" = "8.5.0"; - "7" = "7.5.0"; - "6" = "6.5.0"; - "4.9"= "4.9.4"; - "4.8"= "4.8.5"; - }."${majorMinorVersion}"; + versions = import ./versions.nix; + version = versions.fromMajorMinor majorMinorVersion; majorVersion = lib.versions.major version; atLeast13 = lib.versionAtLeast version "13"; @@ -117,8 +108,8 @@ let inherit version; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; - stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + stageNameAddon = optionalString withoutTargetLibc "-nolibc"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; javaAwtGtk = langJava && x11Support; xlibs = [ @@ -255,18 +246,8 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ else if atLeast6 then "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz" else "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - ${if is10 || is11 || is13 then "hash" else "sha256"} = { - "13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; - "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; - "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; - "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; - "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; - "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; - "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; - "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; - "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; - "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; - }."${version}"; + ${if is10 || is11 || is13 then "hash" else "sha256"} = + versions.srcHashForVersion version; }; inherit patches; @@ -311,17 +292,15 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER'${lib.optionalString atLeast6 ", \\`UCLIBC_DYNAMIC_LINKER',"} and \`${if atLeast6 then "MUSL" else "UCLIBC"}_DYNAMIC_LINKER' macros..." + '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q ${lib.optionalString (!atLeast6) "LIBC"}_DYNAMIC_LINKER "$header" || continue - echo " fixing \`$header'..." + echo " fixing $header..." sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'${lib.optionalString atLeast6 " \\"} - '' + lib.optionalString atLeast6 '' -${""} -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' - '' + '' -${""} done + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done '' + lib.optionalString (atLeast6 && targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' @@ -329,9 +308,7 @@ ${""} done )) + lib.optionalString (atLeast7 && targetPlatform.isAvr) ('' makeFlagsArray+=( - '' + (lib.optionalString atLeast10 '' '-s' # workaround for hitting hydra log limit - '') + '' 'LIMITS_H_TEST=false' ) ''); @@ -432,10 +409,15 @@ ${""} done maintainers ; } // lib.optionalAttrs (!atLeast11) { - badPlatforms = if !is49 then [ "aarch64-darwin" ] else lib.platforms.darwin; + badPlatforms = if !(is48 || is49) then [ "aarch64-darwin" ] else lib.platforms.darwin; }; } // optionalAttrs is7 { env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; +} // lib.optionalAttrs (!atLeast10 && stdenv.hostPlatform.isDarwin) { + # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools. + preBuild = '' + makeFlagsArray+=('STRIP=${lib.getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip') + ''; } // optionalAttrs (!atLeast7) { env.langJava = langJava; } // optionalAttrs atLeast6 { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch new file mode 100644 index 0000000000..08dbfec6b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/11/libgcc-aarch64-darwin-detection.patch @@ -0,0 +1,21 @@ +diff -u a/libgcc/config.host b/libgcc/config.host +--- a/libgcc/config.host 2023-11-05 11:01:55.778638446 -0500 ++++ b/libgcc/config.host 2023-11-05 11:07:29.405103979 -0500 +@@ -227,7 +227,7 @@ + tmake_file="$tmake_file t-slibgcc-darwin" + # newer toolsets produce warnings when building for unsupported versions. + case ${host} in +- *-*-darwin1[89]* | *-*-darwin2* ) ++ *-*-darwin1[89]* | *-*-darwin2* | aarch64*-*-darwin*) + tmake_file="t-darwin-min-8 $tmake_file" + ;; + *-*-darwin9* | *-*-darwin1[0-7]*) +diff -ur a/libgcc/config/t-darwin-rpath b/libgcc/config/t-darwin-rpath +--- a/libgcc/config/t-darwin-rpath 2023-11-05 11:34:18.691150009 -0500 ++++ b/libgcc/config/t-darwin-rpath 2023-11-05 11:50:36.968920904 -0500 +@@ -2,4 +2,4 @@ + SHLIB_RPATH = @rpath + + # Which does not work for Darwin < 9 +-HOST_LIBGCC2_CFLAGS += -mmacosx-version-min=10.5 ++SHLIB_LOADER_PATH = -Wl,-rpath,@loader_path diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000..d938d67a2d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,85 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -60,6 +60,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename) + if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) + break; + if (!map) +- return filename; ++ { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ return s; ++ } ++ } ++ return filename; ++ } + name = filename + map->old_len; + name_len = strlen (name) + 1; + +@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (dwarf2out.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000..57ae2111f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,84 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -69,6 +69,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename) + break; + if (!map) + { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = realname ? realname : filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ if (realname != filename) ++ free (const_cast (realname)); ++ return s; ++ } ++ } + if (realname != filename) + free (const_cast (realname)); + return filename; +@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch new file mode 100644 index 0000000000..095713eb6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/4.9/darwin-clang-as.patch @@ -0,0 +1,16 @@ +diff -ur a/libgcc/config/t-darwin b/libgcc/config/t-darwin +--- a/libgcc/config/t-darwin 2012-07-14 09:50:59.000000000 -0400 ++++ b/libgcc/config/t-darwin 2023-11-05 21:26:11.696825584 -0500 +@@ -7,12 +7,6 @@ + crttme.o: $(srcdir)/config/darwin-crt-tm.c + $(crt_compile) $(DARWIN_EXTRA_CRT_BUILD_CFLAGS) -DEND -c $< + +-# -pipe because there's an assembler bug, 4077127, which causes +-# it to not properly process the first # directive, causing temporary +-# file names to appear in stabs, causing the bootstrap to fail. Using -pipe +-# works around this by not having any temporary file names. +-HOST_LIBGCC2_CFLAGS += -pipe +- + # Use unwind-dw2-fde-darwin + LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/config/unwind-dw2-fde-darwin.c \ + $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch new file mode 100644 index 0000000000..1ac870e572 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/gcc8-darwin-as-gstabs.patch @@ -0,0 +1,96 @@ +Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982 + +diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h +--- a/gcc/config/darwin.h 2021-05-14 04:42:08.000000000 -0400 ++++ b/gcc/config/darwin.h 2023-11-06 08:53:27.629155053 -0500 +@@ -233,12 +233,18 @@ + + #define DSYMUTIL "\ndsymutil" + ++/* Spec that controls whether the debug linker is run automatically for ++ a link step. This needs to be done if there is a source file on the ++ command line which will result in a temporary object (and debug is ++ enabled). */ ++ + #define DSYMUTIL_SPEC \ + "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ + %{v} \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ ++ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\ ++ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" + + #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC + +@@ -469,18 +475,31 @@ + /* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf + debugging data. */ + ++#ifdef HAS_AS_STABS_DIRECTIVE ++/* We only pass a debug option to the assembler if that supports stabs, since ++ dwarf is not uniformly supported in the assemblers. */ + #define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}" ++#else ++#define ASM_DEBUG_SPEC "" ++#endif ++ ++#undef ASM_DEBUG_OPTION_SPEC ++#define ASM_DEBUG_OPTION_SPEC "" ++ + #define ASM_FINAL_SPEC \ + "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform } %. */ + +-/* Prefer DWARF2. */ +-#undef PREFERRED_DEBUGGING_TYPE +-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG +-#define DARWIN_PREFER_DWARF +- +-/* Since DWARF2 is default, conditions for running dsymutil are different. */ +-#undef DSYMUTIL_SPEC +-#define DSYMUTIL_SPEC \ +- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ +- %{v} \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" +- +-/* Tell collect2 to run dsymutil for us as necessary. */ +-#define COLLECT_RUN_DSYMUTIL 1 +- +-/* Only ask as for debug data if the debug style is stabs (since as doesn't +- yet generate dwarf.) */ +- +-#undef ASM_DEBUG_SPEC +-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}" +- + #undef ASM_OUTPUT_ALIGNED_COMMON + #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ + do { \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch new file mode 100644 index 0000000000..454139c539 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/gcc9-darwin-as-gstabs.patch @@ -0,0 +1,99 @@ +Backported from https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b2cee5e1e89c8f939bc36fe9756befcb93d96982 + +diff -ur a/gcc/config/darwin.h b/gcc/config/darwin.h +--- a/gcc/config/darwin.h 2022-05-27 03:21:10.947379000 -0400 ++++ b/gcc/config/darwin.h 2023-11-06 12:18:27.209236423 -0500 +@@ -230,12 +230,18 @@ + + #define DSYMUTIL "\ndsymutil" + ++/* Spec that controls whether the debug linker is run automatically for ++ a link step. This needs to be done if there is a source file on the ++ command line which will result in a temporary object (and debug is ++ enabled). */ ++ + #define DSYMUTIL_SPEC \ + "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ + %{v} \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \ +- %{gdwarf-2:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ ++ %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|\ ++ .f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ ++ %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" + + #define LINK_COMMAND_SPEC LINK_COMMAND_SPEC_A DSYMUTIL_SPEC + +@@ -463,21 +469,31 @@ + %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \ + %{static}" ASM_MMACOSX_VERSION_MIN_SPEC + +-/* Default ASM_DEBUG_SPEC. Darwin's as cannot currently produce dwarf +- debugging data. */ +- ++#ifdef HAS_AS_STABS_DIRECTIVE ++/* We only pass a debug option to the assembler if that supports stabs, since ++ dwarf is not uniformly supported in the assemblers. */ + #define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}" ++#else ++#define ASM_DEBUG_SPEC "" ++#endif ++ ++#undef ASM_DEBUG_OPTION_SPEC ++#define ASM_DEBUG_OPTION_SPEC "" ++ + #define ASM_FINAL_SPEC \ + "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %. */ + +-/* Prefer DWARF2. */ +-#undef PREFERRED_DEBUGGING_TYPE +-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG +-#define DARWIN_PREFER_DWARF +- +-/* Since DWARF2 is default, conditions for running dsymutil are different. */ +-#undef DSYMUTIL_SPEC +-#define DSYMUTIL_SPEC \ +- "%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\ +- %{v} \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -idsym}}}\ +- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm|.s|.f|.f90|.f95|.f03|.f77|.for|.F|.F90|.F95|.F03: \ +- %{g*:%{!gstabs*:%{%:debug-level-gt(0): -dsym}}}}}}}}}}}" +- +-/* Tell collect2 to run dsymutil for us as necessary. */ +-#define COLLECT_RUN_DSYMUTIL 1 +- +-/* Only ask as for debug data if the debug style is stabs (since as doesn't +- yet generate dwarf.) */ +- +-#undef ASM_DEBUG_SPEC +-#define ASM_DEBUG_SPEC "%{g*:%{%:debug-level-gt(0):%{gstabs:--gstabs}}}" +- + #undef ASM_OUTPUT_ALIGNED_COMMON + #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ + do { \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/clang-genconditions.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/clang-genconditions.patch new file mode 100644 index 0000000000..655afd2abb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/clang-genconditions.patch @@ -0,0 +1,34 @@ +From https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92061#c5 + +--- a/gcc/genconditions.c 2019-01-01 12:37:19.064943662 +0100 ++++ b/gcc/genconditions.c 2019-10-11 10:57:11.464595789 +0200 +@@ -57,8 +57,9 @@ write_header (void) + \n\ + /* It is necessary, but not entirely safe, to include the headers below\n\ + in a generator program. As a defensive measure, don't do so when the\n\ +- table isn't going to have anything in it. */\n\ +-#if GCC_VERSION >= 3001\n\ ++ table isn't going to have anything in it.\n\ ++ Clang 9 is buggy and doesn't handle __builtin_constant_p correctly. */\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + \n\ + /* Do not allow checking to confuse the issue. */\n\ + #undef CHECKING_P\n\ +@@ -170,7 +171,7 @@ struct c_test\n\ + vary at run time. It works in 3.0.1 and later; 3.0 only when not\n\ + optimizing. */\n\ + \n\ +-#if GCC_VERSION >= 3001\n\ ++#if GCC_VERSION >= 3001 && __clang_major__ < 9\n\ + static const struct c_test insn_conditions[] = {\n"); + + traverse_c_tests (write_one_condition, 0); +@@ -191,7 +192,7 @@ write_writer (void) + " unsigned int i;\n" + " const char *p;\n" + " puts (\"(define_conditions [\");\n" +- "#if GCC_VERSION >= 3001\n" ++ "#if GCC_VERSION >= 3001 && __clang_major__ < 9\n" + " for (i = 0; i < ARRAY_SIZE (insn_conditions); i++)\n" + " {\n" + " printf (\" (%d \\\"\", insn_conditions[i].value);\n" diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix index 0afc658651..c4b0dbf91b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix @@ -63,8 +63,8 @@ in ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ ({ - "13" = [ ./13/no-sys-dirs-riscv.patch ]; - "12" = [ ./no-sys-dirs-riscv.patch ]; + "13" = [ ./13/no-sys-dirs-riscv.patch ./13/mangle-NIX_STORE-in-__FILE__.patch ]; + "12" = [ ./no-sys-dirs-riscv.patch ./12/mangle-NIX_STORE-in-__FILE__.patch ]; "11" = [ ./no-sys-dirs-riscv.patch ]; "10" = [ ./no-sys-dirs-riscv.patch ]; "9" = [ ./no-sys-dirs-riscv-gcc9.patch ]; @@ -178,6 +178,9 @@ in # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 ++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch +# libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target. +++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch + # openjdk build fails without this on -march=opteron; is upstream in gcc12 ++ optionals (is11) [ ./11/gcc-issue-103910.patch ] @@ -191,12 +194,19 @@ in sha256 = "sha256-XtykrPd5h/tsnjY1wGjzSOJ+AyyNLsfnjuOZ5Ryq9vA="; }) +# Fix undefined symbol errors when building older versions with clang +++ optional (!atLeast11 && stdenv.cc.isClang && stdenv.hostPlatform.isDarwin) ./clang-genconditions.patch + ## gcc 9.0 and older ############################################################################## ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch ++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch +# Make Darwin bootstrap respect whether the assembler supports `--gstabs`, +# which is not supported by the clang integrated assembler used by default on Darwin. +++ optional (is9 && hostPlatform.isDarwin) ./9/gcc9-darwin-as-gstabs.patch + ## gcc 8.0 and older ############################################################################## @@ -204,6 +214,10 @@ in ++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch ++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch +# Make Darwin bootstrap respect whether the assembler supports `--gstabs`, +# which is not supported by the clang integrated assembler used by default on Darwin. +++ optional (is8 && hostPlatform.isDarwin) ./8/gcc8-darwin-as-gstabs.patch + ## gcc 7.0 and older ############################################################################## @@ -240,6 +254,12 @@ in ./6/gnat-glibc234.patch ] +# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input. +# Fortunately, it does not exhibit the problem GCC has with the cctools assembler. +# This patch can be dropped should darwin.cctools-llvm ever implement support. +++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch + + ## gcc 4.9 and older ############################################################################## ++ optional (!atLeast6) ./parallel-bconfig.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/versions.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/versions.nix new file mode 100644 index 0000000000..261ffc6345 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/versions.nix @@ -0,0 +1,38 @@ +let + majorMinorToVersionMap = { + "13" = "13.2.0"; + "12" = "12.3.0"; + "11" = "11.4.0"; + "10" = "10.5.0"; + "9" = "9.5.0"; + "8" = "8.5.0"; + "7" = "7.5.0"; + "6" = "6.5.0"; + "4.9"= "4.9.4"; + "4.8"= "4.8.5"; + }; + + fromMajorMinor = majorMinorVersion: + majorMinorToVersionMap."${majorMinorVersion}"; + + # TODO(amjoseph): convert older hashes to SRI form + srcHashForVersion = version: { + # NOTE: there is no need to remove hashes of obsolete minor + # versions when adding a new minor version. + "13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; + "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; + "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; + "9.5.0" = "13ygjmd938m0wmy946pxdhz9i1wq7z4w10l6pvidak0xxxj9yxi7"; + "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; + "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; + "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; + "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; + "4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2"; + }."${version}"; + +in { + inherit fromMajorMinor; + inherit srcHashForVersion; + allMajorVersions = builtins.attrNames majorMinorToVersionMap; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix index 227f11b7c5..9ce26d0b21 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix @@ -1,8 +1,11 @@ { pkgs, gccStdenv, lib, coreutils, - openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, + openssl, zlib, sqlite, + version, git-version, src, gambit-support, - gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: + gambit-git-version, + gambit-stampYmd, + gambit-stampHms, + gambit-params }: # We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix let stdenv = gccStdenv; in @@ -12,16 +15,13 @@ stdenv.mkDerivation rec { inherit version; inherit src; - buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; + buildInputs_libraries = [ openssl zlib sqlite ]; # TODO: either fix all of Gerbil's dependencies to provide static libraries, # or give up and delete all tentative support for static libraries. #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit ] - ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; - - env.NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; + buildInputs = buildInputs_libraries; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; @@ -29,6 +29,17 @@ stdenv.mkDerivation rec { grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; done ; + substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ; + substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ; + #rmdir src/gambit + #cp -a ${pkgs.gambit-unstable.src} ./src/gambit + chmod -R u+w ./src/gambit + ( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} ) + for f in src/bootstrap/gerbil/compiler/driver__0.scm \ + src/build/build-libgerbil.ss \ + src/gerbil/compiler/driver.ss ; do + substituteInPlace "$f" --replace '"gcc"' '"${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"' ; + done ''; ## TODO: make static compilation work. @@ -40,26 +51,42 @@ stdenv.mkDerivation rec { # OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING! # ZLIB=${makeStaticLibraries zlib}/lib/libz.a # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING! -# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING! -# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING! -# MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a -# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING! -# LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + configureFlags = [ + "--prefix=$out/gerbil" + "--enable-zlib" + "--enable-sqlite" + "--enable-shared" + "--disable-deprecated" + "--enable-march=" # Avoid non-portable invalid instructions + ]; + configurePhase = '' - (cd src && ./configure \ - --prefix=$out/gerbil \ - --with-gambit=${gambit}/gambit \ - --enable-libxml \ - --enable-libyaml \ - --enable-zlib \ - --enable-sqlite \ - --enable-mysql \ - --enable-lmdb \ - --enable-leveldb) + export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \ + CXX=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}g++ \ + CPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + CXXCPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \ + LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \ + XMKMF=${coreutils}/bin/false + unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS + (cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms}) + ./configure ${builtins.concatStringsSep " " configureFlags} + (cd src/gambit ; + substituteInPlace config.status \ + ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) + ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ + --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" + ./config.status + ) ''; + extraLdOptions = [ + "-L${zlib}/lib" + "-L${openssl.out}/lib" + "-L${sqlite.out}/lib" + ]; + buildPhase = '' runHook preBuild @@ -68,7 +95,7 @@ stdenv.mkDerivation rec { export GERBIL_BUILD_CORES=$NIX_BUILD_CORES export GERBIL_GXC=$PWD/bin/gxc export GERBIL_BASE=$PWD - export GERBIL_HOME=$PWD + export GERBIL_PREFIX=$PWD export GERBIL_PATH=$PWD/lib export PATH=$PWD/bin:$PATH ${gambit-support.export-gambopt gambit-params} @@ -76,13 +103,17 @@ stdenv.mkDerivation rec { # Build, replacing make by build.sh ( cd src && sh build.sh ) + f=build/lib/libgerbil.so.ldd ; [ -f $f ] && : + substituteInPlace "$f" --replace '(' \ + '(${lib.strings.concatStrings (map (x: "\"${x}\" " ) extraLdOptions)}' + runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/gerbil $out/bin - (cd src; ./install) + ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall ''; @@ -98,4 +129,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fare ]; }; + + outputsToInstall = [ "out" ]; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/default.nix index eeafde520d..29e6d35750 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/default.nix @@ -1,12 +1,18 @@ -{ callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: callPackage ./build.nix rec { - version = "0.17"; - git-version = version; + version = "0.18"; + git-version = "0.18"; src = fetchFromGitHub { - owner = "vyzo"; + owner = "mighty-gerbils"; repo = "gerbil"; - rev = "v${version}"; - sha256 = "0xzi9mhrmzcajhlz5qcnz4yjlljvbkbm9426iifgjn47ac0965zw"; + rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9"; + sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8="; + fetchSubmodules = true; }; + inherit gambit-support; + gambit-params = gambit-support.unstable-params; + gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version + gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd + gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 3d53c4da87..dd06417d1a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -2,8 +2,8 @@ { pname = "gerbil-crypto"; - version = "unstable-2023-03-27"; - git-version = "0.0-18-ge57f887"; + version = "unstable-2023-09-27"; + git-version = "0.0-23-g341e09d"; gerbil-package = "clan/crypto"; gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ]; nativeBuildInputs = [ pkgs.pkg-config ]; @@ -13,10 +13,10 @@ pre-src = { fun = fetchFromGitHub; - owner = "fare"; + owner = "mighty-gerbils"; repo = "gerbil-crypto"; - rev = "e57f88742d9b41640b4a7d9bd3e86c688d4a83f9"; - sha256 = "08hrk3s82hbigvza75vgx9kc7qf64yhhn3xm5calc859sy6ai4ka"; + rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f"; + sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index d2d95284f0..521447593d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,24 +2,25 @@ rec { pname = "gerbil-ethereum"; - version = "unstable-2023-05-30"; - git-version = "0.0-375-g989a5ca"; + version = "unstable-2023-10-06"; + git-version = "0.1-1-g08b08fc"; softwareName = "Gerbil-ethereum"; - gerbil-package = "mukn/ethereum"; + gerbil-package = "clan/ethereum"; version-path = "version"; - gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-crypto gerbil-poo gerbil-persist ]; + gerbilInputs = with gerbilPackages; [ + gerbil-utils gerbil-crypto gerbil-poo gerbil-persist gerbil-leveldb ]; pre-src = { fun = fetchFromGitHub; - owner = "fare"; + owner = "mighty-gerbils"; repo = "gerbil-ethereum"; - rev = "989a5ca78958e42c4a1ec242786ade89f1887e48"; - sha256 = "0bs2knhx3hy3k72yidgaplwjd48y86arqscdik8hgxwmhm9z8kwp"; + rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab"; + sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b"; }; postInstall = '' - cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/mukn/ethereum/scripts/ + cp scripts/{croesus.prv,genesis.json,logback.xml,yolo-evm.conf,yolo-kevm.conf,run-ethereum-test-net.ss} $out/gerbil/lib/clan/ethereum/scripts/ mkdir -p $out/bin cat > $out/bin/run-ethereum-test-net <&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix index 73ce0c9185..f373d963ed 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -210,6 +210,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix index f5f0c93171..6be098972e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.2.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix index d3a57b6c9f..909d090c17 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; @@ -368,7 +369,9 @@ stdenv.mkDerivation rec { # Recache package db which needs to happen for Hadrian bindists # where we modify the package db before installing + '' - "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache + shopt -s nullglob + package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d) + "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; # In nixpkgs, musl based builds currently enable `pie` hardening by default diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix index 6aa87a1520..3ed263a433 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix index c5aa589776..6246630f54 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.5.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix index 651ff1e7d4..124303c0c8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.6.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix index 74c0088473..a627f74179 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.7.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix index 973e62f955..a0451f57c6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.8.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix index 3c51fb981a..7b921ecc44 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.2.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix index 87ce19f660..2bddbea7bc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.3.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix index fa184a6fe1..e7465a9500 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.4.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix index 91032cb03d..9442f2bf19 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.5.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix index 3b0bef212a..b64b3ba5ec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.6.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ./docs-sphinx-7.patch # Work around a type not being defined when including Rts.h in bytestring's cbits # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix new file mode 100644 index 0000000000..7ee135a13b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.7.nix @@ -0,0 +1,389 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || stdenv.targetPlatform.isAarch64) +, # LLVM is conceptually a run-time-only dependency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, enableProfiledLibs ? true + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.7"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) + ./docs-sphinx-7.patch + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.8.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.8.1.nix new file mode 100644 index 0000000000..7c8c476c5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.8.1.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.1"; + sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix index c7b4aa1f87..5687555d5d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix @@ -150,12 +150,15 @@ # GHC's build system hadrian built from the GHC-to-build's source tree # using our bootstrap GHC. -, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian { +, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } { ghcSrc = ghcSrc; ghcVersion = version; userSettings = hadrianUserSettings; # Disable haddock generating pretty source listings to stay under 3GB on aarch64-linux - enableHyperlinkedSource = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + enableHyperlinkedSource = + # TODO(@sternenseemann): Disabling currently doesn't work with GHC >= 9.8 + lib.versionAtLeast version "9.8" || + !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); } , # Whether to build sphinx documentation. @@ -263,6 +266,11 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + patches = [ + (if lib.versionAtLeast version "9.8" + then ./docs-sphinx-7-ghc98.patch + else ./docs-sphinx-7.patch ) + ]; postPatch = '' patchShebangs --build . ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch new file mode 100644 index 0000000000..3fc1a0f215 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -28 +28 @@ +- ++ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7.patch new file mode 100644 index 0000000000..49fa45d1b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/docs-sphinx-7.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -67 +67 @@ +- ++ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix index 951b708381..6b8d657f34 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20230527"; - rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664"; - sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2"; + version = "9.9.20231014"; + rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695"; + sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9"; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 496999c36a..bc2dfbda09 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -6,27 +6,27 @@ , pkg-config , openssl , Security -, libiconv , nix-update-script +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.31.0"; + version = "0.32.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MLR7gY4NPb223NiPvTih88DQO2LvaYHsduWSH9QQa6M="; + hash = "sha256-1FIeH4NFyYQinqzCBZ9m2Jm6f5tLJDJxVdb4D3+fQ4w="; }; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ Security libiconv ]; + lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-I+5Vrpy5/9wFMB2dQYH9aqf/VonkDyIAyJmSHm5S6mk="; + cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI="; passthru.updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix index 9753a1077a..ff55201ebd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.3.1"; + version = "13.1.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; + hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix index 3f1268a9d6..e3233b059d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix @@ -13,7 +13,7 @@ # docs , help2man , texinfo -, texlive +, texliveBasic # test , writeText }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libtool help2man texinfo - texlive.combined.scheme-basic + texliveBasic ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix index e608a25462..1caf96c715 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -55,6 +55,6 @@ in stdenv.mkDerivation rec { homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix deleted file mode 100644 index 5d43be23c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ lib -, stdenv -, fetchpatch -, fetchurl -, tzdata -, substituteAll -, iana-etc -, Security -, Foundation -, xcbuild -, mailcap -, buildPackages -, pkgsBuildTarget -, threadsCross -, testers -, skopeo -, buildGo118Module -}: - -let - useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; - - skopeoTest = skopeo.override { buildGoModule = buildGo118Module; }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "go"; - version = "1.18.10"; - - src = fetchurl { - url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-nO3MpYhF3wyUdK4AJ0xEqVyd+u+xMvxZkhwox8EG+OY="; - }; - - strictDeps = true; - buildInputs = [ ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - - postPatch = '' - patchShebangs . - ''; - - patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; - iana = iana-etc; - }) - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; - inherit mailcap; - }) - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - (substituteAll { - src = ./tzdata-1.17.patch; - inherit tzdata; - }) - ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.16.patch - - # runtime: support riscv64 SV57 mode - (fetchpatch { - url = "https://github.com/golang/go/commit/1e3c19f3fee12e5e2b7802a54908a4d4d03960da.patch"; - sha256 = "sha256-mk/9gXwQEcAkiRemF6GiNU0c0fhDR29/YcKgQR7ONTA="; - }) - ]; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - - GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; - - buildPhase = '' - runHook preBuild - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - - pushd src - ./make.bash - popd - runHook postBuild - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' - rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} - ''} - ''); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap skopeoTest; - tests = { - skopeo = testers.testVersion { package = skopeoTest; }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "go version"; - version = "go${finalAttrs.version}"; - }; - }; - }; - - meta = with lib; { - changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; - description = "The Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix index dfa88fe613..06002f4930 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.20.8"; + version = "1.20.11"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ONcXFPpSeflyQEUZVtjkfjwbal3ny4QTeUnWK13TGC4="; + hash = "sha256-01XFrjqPd2PJ7J3CUVOq43OVjLy2DdCekai1bHYhsvw="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix index e0562ad32b..c12af4db34 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.1"; + version = "1.21.4"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k="; + hash = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/tzdata-1.17.patch b/third_party/nixpkgs/pkgs/development/compilers/go/tzdata-1.17.patch deleted file mode 100644 index 5532c8d323..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/tzdata-1.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go -index 4ea029dbde..af94a4d90b 100644 ---- a/src/time/zoneinfo_unix.go -+++ b/src/time/zoneinfo_unix.go -@@ -20,6 +20,7 @@ import ( - // Many systems use /usr/share/zoneinfo, Solaris 2 has - // /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ. - var zoneSources = []string{ -+ "@tzdata@/share/zoneinfo/", - "/usr/share/zoneinfo/", - "/usr/share/lib/zoneinfo/", - "/usr/lib/locale/TZ/", diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index da582e3ea1..c18e7bcba0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "23.1.1"; "hashes" = { "aarch64-linux" = { - sha256 = "0n0zz86h7jsqgdiyj6vj7qw57ny40jpmfvylyxq70riy86a4zp67"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "1jv9icfh3w8gdch0h3l8mm6q96z3lv89s8zv788wvkkb87zv8w8m"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0nnv255f2bqc4l88iw48f71874ryjn16bb8qn1yk7daj1pck80vj"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "108qdf0ss9l0x6k983v9yg6m5i7aqwfdxjqa5fx62xj027wi5pqk"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "16kp66l0176sbd8jzvq3y3z7d9zvkqzdaw8vrvnk2qkipa136n0k"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "019s7vlr8a6x60g0yh36pdf2vvan1v2wmq8z4xrcgpl96zpwwn5h"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "17clq7n1n5ww22rh9gp5h9ljhjvggcik8amhd70pwl4cjgv9mhsv"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "0qbanbivkj62cjg2ll4ia23c435i1cvwy7pq19dvj8s204mpl8l2"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-aarch64.tar.gz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 377a05426c..e9454dca72 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "21.0.0"; + "version" = "21.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "199h3d6zayw28xlyggldap6nafh5fnpfbshs0rsf94dfgv7r4kmv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-aarch64_bin.tar.gz"; + sha256 = "0vb1bdbn4lqig4jihynacbyrj551m1pcmj6qh86kdwx0kn9400yy"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "06dkb1yimk5q3yzjk6kjsrs2pkbjxgz9jr5vj6wfb2y5ri0jjhkc"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-x64_bin.tar.gz"; + sha256 = "1gvkxqmbsh7pklh9bkhndh08nnjcmgq0xpzc96dgacqnlr4fx0sj"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1qbz3xfxj7nwb01cy99hd22k3pim8j43blcdcys48l8xcb234nlk"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-x64_bin.tar.gz"; + sha256 = "0sks663ldc0m3rhc882mzn44kipzbjw7325dhkpwy874p47j9zns"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0dqgsp0bhqvv07b9kb0cxqm5cw47kapzbfbw13570ydgc0gfg3f5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-aarch64_bin.tar.gz"; + sha256 = "0i7zzq1czgc4lk1z278zp4cml4kdryafhrma5rqaja75933jpi2h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix index addd6749e7..51e40dd590 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "23.1.1"; "hashes" = { "aarch64-linux" = { - sha256 = "05q0xqm7qa9mw7v4kwyhbqsx27x19msf9rbbzq60dinp5724r721"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "0d8lxbfafgyirgs06bmfbmww61h8w3sr95z7y4x0ykfs7mghsnpd"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0bfcqcax9424vsdqzr18mxkhi2wpzc4xaji98anm8mcjkyl1r89q"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "1304yvllffnhwmpbcdsgcwkhc5w5w7r1rhxdwb709if8kglx793y"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1yj9nk670hgh9104s1j207mqldagfvvvscj4bfgf3jlbcq5hvlhn"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "09lfski3dj3zzp7cdfrndjafx48ln0wdgb7cs3an3krh6xjchi8l"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1nmqyn4vzwjsvq7dly8qn1xx973jg027xfbs988vf3nljnhkpq5l"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "152mrz5hfnmsf5k1gd6rsb6yacy3zyjm2jl8q3zjl18n784np57b"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-macos-aarch64.tar.gz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix index 40f17993a0..f95bff23f6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix @@ -57,15 +57,15 @@ stdenv.mkDerivation (finalAttrs: { inherit arch platform hareflags; }; in - '' - runHook preConfigure + '' + runHook preConfigure - export HARECACHE="$NIX_BUILD_TOP/.harecache" - export BINOUT="$NIX_BUILD_TOP/.bin" - cat ${config-file} > config.mk + export HARECACHE="$NIX_BUILD_TOP/.harecache" + export BINOUT="$NIX_BUILD_TOP/.bin" + cat ${config-file} > config.mk - runHook postConfigure - ''; + runHook postConfigure + ''; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { qbe ]; in - '' - wrapProgram $out/bin/hare --prefix PATH : ${binPath} - ''; + '' + wrapProgram $out/bin/hare --prefix PATH : ${binPath} + ''; setupHook = ./setup-hook.sh; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A systems programming language designed to be simple, stable, and robust"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = with lib.maintainers; [ onemoresuza ]; inherit (harec.meta) platforms badPlatforms; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix index 15aff4a7d8..6b71e0df02 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = with lib.maintainers; [ onemoresuza ]; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ + # UPDATE: https://github.com/hshq/harelang provides a MacOS port platforms = with lib.platforms; lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); badPlatforms = lib.platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip-common/0000-fixup-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/hip-common/0000-fixup-paths.patch deleted file mode 100644 index f3fd732555..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/hip-common/0000-fixup-paths.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/bin/hipcc.pl b/bin/hipcc.pl -index da9559b..7aaa540 100755 ---- a/bin/hipcc.pl -+++ b/bin/hipcc.pl -@@ -185,7 +185,7 @@ if ($HIP_PLATFORM eq "amd") { - chomp($HIP_CLANG_TARGET); - - if (! defined $HIP_CLANG_INCLUDE_PATH) { -- $HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include"); -+ $HIP_CLANG_INCLUDE_PATH = abs_path("@clang@/resource-root/include"); - } - if (! defined $HIP_INCLUDE_PATH) { - $HIP_INCLUDE_PATH = "$HIP_PATH/include"; -@@ -206,8 +206,8 @@ if ($HIP_PLATFORM eq "amd") { - print ("HIP_CLANG_TARGET=$HIP_CLANG_TARGET\n"); - } - -- $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; -- $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH/..\""; -+ $HIPCXXFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; -+ $HIPCFLAGS .= " -isystem \"$HIP_CLANG_INCLUDE_PATH\""; - $HIPLDFLAGS .= " -L\"$HIP_LIB_PATH\""; - if ($isWindows) { - $HIPLDFLAGS .= " -lamdhip64"; -@@ -625,7 +625,7 @@ if($HIP_PLATFORM eq "amd"){ - $targetsStr = $ENV{HCC_AMDGPU_TARGET}; - } elsif (not $isWindows) { - # Else try using rocm_agent_enumerator -- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; -+ $ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; - $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; - $targetsStr =~ s/\n/,/g; - } -@@ -724,16 +724,16 @@ if ($HIP_PLATFORM eq "amd") { - - if (not $isWindows and not $compileOnly) { - if ($linkType eq 0) { -- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; -+ $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; - } else { - $toolArgs = ${toolArgs} . " -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; - } - # To support __fp16 and _Float16, explicitly link with compiler-rt -- $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; -+ $HIP_CLANG_BUILTIN_LIB="@clang@/resource-root/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; - if (-e $HIP_CLANG_BUILTIN_LIB) { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " -+ $toolArgs .= " -L@clang@/resource-root/lib/$HIP_CLANG_TARGET -lclang_rt.builtins " - } else { -- $toolArgs .= " -L$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/linux -lclang_rt.builtins-x86_64 " -+ $toolArgs .= " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 " - } - } - } -diff --git a/bin/hipconfig.pl b/bin/hipconfig.pl -index 5ddb8e9..6a76a2e 100755 ---- a/bin/hipconfig.pl -+++ b/bin/hipconfig.pl -@@ -77,7 +77,7 @@ if ($HIP_COMPILER eq "clang") { - $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -D__HIP_PLATFORM_AMD__="; - - $HIP_PATH_INCLUDE = $HIP_PATH."/include"; -- $HIP_CLANG_INCLUDE = $HIP_CLANG_PATH."/../lib/clang/".$HIP_CLANG_VERSION; -+ $HIP_CLANG_INCLUDE = "@clang@/resource-root/include"; - if($isWindows) { - $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\""; - } else { -@@ -168,7 +168,7 @@ if (!$printed or $p_full) { - print ("HIP_CLANG_PATH : $HIP_CLANG_PATH\n"); - if ($isWindows) { - system("\"$HIP_CLANG_PATH/clang++\" --version"); -- system("\"$HIP_CLANG_PATH/llc\" --version"); -+ system("\"@llvm@/bin/llc\" --version"); - printf("hip-clang-cxxflags : "); - $win_output = `perl \"$HIP_PATH/bin/hipcc\" --cxxflags`; - printf("$win_output \n"); -@@ -177,7 +177,7 @@ if (!$printed or $p_full) { - printf("$win_output \n"); - } else { - system("$HIP_CLANG_PATH/clang++ --version"); -- system("$HIP_CLANG_PATH/llc --version"); -+ system("@llvm@/bin/llc --version"); - print ("hip-clang-cxxflags : "); - system("$HIP_PATH/bin/hipcc --cxxflags"); - printf("\n"); -@@ -219,8 +219,8 @@ if (!$printed or $p_full) { - system ("uname -a"); - } - -- if (-e "/usr/bin/lsb_release") { -- system ("/usr/bin/lsb_release -a"); -+ if (-e "@lsb_release@/bin/lsb_release") { -+ system ("@lsb_release@/bin/lsb_release -a"); - } - - print "\n" ; -diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in -index 9250a68..f6e27b7 100644 ---- a/hip-lang-config.cmake.in -+++ b/hip-lang-config.cmake.in -@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) - - - #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") --file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") -+file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "@clang@/resource-root/include") - find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h - HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} - ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -@@ -89,7 +89,7 @@ find_path(HSA_HEADER hsa/hsa.h - PATHS - "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY - "${_IMPORT_PREFIX}/include" -- "${ROCM_PATH}/include" -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -97,7 +97,7 @@ if (NOT HSA_HEADER) - endif() - - get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) --file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/lib/*") -+file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") - find_library(CLANGRT_BUILTINS - NAMES - clang_rt.builtins diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip/0000-fixup-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/hip/0000-fixup-paths.patch deleted file mode 100644 index 423857218e..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/hip/0000-fixup-paths.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/hip-config.cmake.in b/hip-config.cmake.in -index 89d1224..dc9ba05 100755 ---- a/hip-config.cmake.in -+++ b/hip-config.cmake.in -@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang") - file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT) - endif() - else() -- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") -+ set(HIP_CLANG_ROOT "@clang@") - endif() - if(NOT HIP_CXX_COMPILER) - set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) -@@ -171,7 +171,7 @@ if(HIP_COMPILER STREQUAL "clang") - get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) - get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) - endif() -- file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) -+ file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "@clang@/resource-root/include") - find_path(HIP_CLANG_INCLUDE_PATH stddef.h - HINTS - ${HIP_CLANG_INCLUDE_SEARCH_PATHS} -@@ -209,7 +209,7 @@ if(NOT WIN32) - "${_IMPORT_PREFIX}/include" - #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility - "${_IMPORT_PREFIX}/../include" -- ${ROCM_PATH}/include -+ "@rocm_runtime@/include" - ) - - if (NOT HSA_HEADER) -@@ -291,7 +291,7 @@ if(HIP_COMPILER STREQUAL "clang") - endif() - endif() - -- file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*") -+ file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "@clang@/resource-root/lib/*") - find_library(CLANGRT_BUILTINS - NAMES - clang_rt.builtins -diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh -index 0a1572b..2feb19a 100755 ---- a/src/hip_embed_pch.sh -+++ b/src/hip_embed_pch.sh -@@ -149,7 +149,7 @@ EOF - - $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && - -- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && -+ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && - - rm -rf $tmp - } -@@ -195,7 +195,7 @@ EOF - set -x - $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib --hip-version=4.4 -isystem $HIP_INC_DIR -isystem $HIP_BUILD_INC_DIR -isystem $HIP_AMD_INC_DIR --cuda-device-only -D__HIPCC_RTC__ -x hip $tmp/hipRTC_header.h -E -o $tmp/hiprtc && - cat $macroFile >> $tmp/hiprtc && -- $LLVM_DIR/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && -+ @llvm@/bin/llvm-mc -o $tmp/hiprtc_header.o $tmp/hipRTC_header.mcin --filetype=obj && - $LLVM_DIR/bin/clang $tmp/hiprtc_header.o -o $rtc_shared_lib_out -shared && - $LLVM_DIR/bin/clang -O3 --rocm-path=$HIP_INC_DIR/.. -std=c++14 -nogpulib -nogpuinc -emit-llvm -c -o $tmp/tmp.bc --cuda-device-only -D__HIPCC_RTC__ --offload-arch=gfx906 -x hip-cpp-output $tmp/hiprtc && - rm -rf $tmp diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix deleted file mode 100644 index 26fce1d8d4..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/hip/default.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rocmUpdateScript -, substituteAll -, makeWrapper -, hip-common -, hipcc -, rocclr -, roctracer -, cmake -, perl -, llvm -, rocminfo -, rocm-thunk -, rocm-comgr -, rocm-device-libs -, rocm-runtime -, rocm-opencl-runtime -, cudatoolkit -, numactl -, libxml2 -, libX11 -, libglvnd -, doxygen -, graphviz -, fontconfig -, python3Packages -, buildDocs ? true -, buildTests ? false -, useNVIDIA ? false -}: - -let - hipPlatform = if useNVIDIA then "nvidia" else "amd"; - - wrapperArgs = [ - "--prefix PATH : $out/bin" - "--prefix LD_LIBRARY_PATH : ${rocm-runtime}" - "--set HIP_PLATFORM ${hipPlatform}" - "--set HIP_PATH $out" - "--set HIP_CLANG_PATH ${stdenv.cc}/bin" - "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode" - "--set HSA_PATH ${rocm-runtime}" - "--set ROCM_PATH $out" - ] ++ lib.optionals useNVIDIA [ - "--set CUDA_PATH ${cudatoolkit}" - ]; -in stdenv.mkDerivation (finalAttrs: { - pname = "hip-${hipPlatform}"; - version = "5.4.4"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ]; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "hipamd"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FcuylhkG7HqLYXH1J6ND6IVEIbDzHp7h7jg2ZZ4XoFM="; - }; - - patches = [ - (substituteAll { - src = ./0000-fixup-paths.patch; - inherit llvm; - clang = stdenv.cc; - rocm_runtime = rocm-runtime; - }) - - # https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9 - (fetchpatch { - url = "https://github.com/ROCm-Developer-Tools/hipamd/commit/be33ec55acc104a59d01df5912261d007c7f3ee9.patch"; - hash = "sha256-eTC4mUIN1FwRce1n38uDOlITFL/vpcOhvnaZTo5R7lo="; - }) - ]; - - nativeBuildInputs = [ - makeWrapper - cmake - perl - python3Packages.python - python3Packages.cppheaderparser - ] ++ lib.optionals buildDocs [ - doxygen - graphviz - fontconfig - ]; - - buildInputs = [ - numactl - libxml2 - libX11 - libglvnd - ]; - - propagatedBuildInputs = [ - stdenv.cc - llvm - rocminfo - rocm-thunk - rocm-comgr - rocm-device-libs - rocm-runtime - rocm-opencl-runtime - ] ++ lib.optionals useNVIDIA [ - cudatoolkit - ]; - - cmakeFlags = [ - "-DROCM_PATH=${rocminfo}" - "-DHIP_PLATFORM=${hipPlatform}" - "-DHIP_COMMON_DIR=${hip-common}" - "-DHIPCC_BIN_DIR=${hipcc}/bin" - "-DHIP_LLVM_ROOT=${stdenv.cc}" - "-DROCCLR_PATH=${rocclr}" - "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" - "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" - # Temporarily set variables to work around upstream CMakeLists issue - # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ lib.optionals buildTests [ - "-DHIP_CATCH_TEST=1" - ]; - - postPatch = '' - export HIP_CLANG_PATH=${stdenv.cc}/bin - patchShebangs src - '' + lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf - ''; - - doCheck = buildTests; - checkTarget = "build_tests"; - - preCheck = lib.optionalString buildTests '' - export ROCM_PATH=$PWD - export DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode - patchShebangs bin - ''; - - postInstall = '' - patchShebangs $out/bin - cp -a $out/bin/hipcc $out/bin/hipcc-pl - cp -a $out/bin/hipconfig $out/bin/hipconfig-pl - wrapProgram $out/bin/hipcc --set HIP_USE_PERL_SCRIPTS 0 - wrapProgram $out/bin/hipconfig --set HIP_USE_PERL_SCRIPTS 0 - wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipcc-pl --set HIP_USE_PERL_SCRIPTS 1 - wrapProgram $out/bin/hipconfig-pl --set HIP_USE_PERL_SCRIPTS 1 - wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs} - wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs} - ''; - - passthru = { - # All known and valid general GPU targets - # We cannot use this for each ROCm library, as each defines their own supported targets - # See: https://github.com/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix - gpuTargets = lib.forEach [ - "803" - "900" - "906" - "908" - "90a" - "1010" - "1012" - "1030" - ] (target: "gfx${target}"); - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - meta = with lib; { - description = "C++ Heterogeneous-Compute Interface for Portability specifically for AMD platform"; - homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - # Tests require GPU, also include issues - broken = - versions.minor finalAttrs.version != versions.minor hip-common.version || - versions.minor finalAttrs.version != versions.minor hipcc.version || - buildTests; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hipcc/0000-fixup-paths.patch b/third_party/nixpkgs/pkgs/development/compilers/hipcc/0000-fixup-paths.patch deleted file mode 100644 index 4f52c1ad11..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/hipcc/0000-fixup-paths.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c21f247..5bd3e45 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,6 @@ if (NOT WIN32) # C++17 does not require the std lib linking - target_link_libraries(hipconfig.bin ${LINK_LIBS} ) # for hipconfig.bin - endif() - --set(HIP_VERSION_MAJOR 4 PARENT_SCOPE) --set(HIP_VERSION_MINOR 4 PARENT_SCOPE) --set(HIP_VERSION_PATCH 4 PARENT_SCOPE) -+set(HIP_VERSION_MAJOR @version_major@) -+set(HIP_VERSION_MINOR @version_minor@) -+set(HIP_VERSION_PATCH @version_patch@) -diff --git a/src/hipBin_amd.h b/src/hipBin_amd.h -index f94e4a5..f0b1b83 100644 ---- a/src/hipBin_amd.h -+++ b/src/hipBin_amd.h -@@ -207,7 +207,7 @@ void HipBinAmd::initializeHipCXXFlags() { - hipClangIncludePath = getCompilerIncludePath(); - hipCXXFlags += " -isystem \"" + hipClangIncludePath; - fs::path hipCXXFlagsTempFs = hipCXXFlags; -- hipCXXFlagsTempFs /= "..\""; -+ hipCXXFlagsTempFs /= "\""; - hipCXXFlags = hipCXXFlagsTempFs.string(); - const EnvVariables& var = getEnvVariables(); - // Allow __fp16 as function parameter and return type. -@@ -266,7 +266,7 @@ void HipBinAmd::printCompilerInfo() const { - string cmd = hipClangPath + "/clang++ --version"; - system(cmd.c_str()); // hipclang version - cout << "llc-version :" << endl; -- cmd = hipClangPath + "/llc --version"; -+ cmd = "@llvm@/bin/llc --version"; - system(cmd.c_str()); // llc version - cout << "hip-clang-cxxflags :" << endl; - cmd = hipPath + "/bin/hipcc --cxxflags"; -@@ -278,7 +278,7 @@ void HipBinAmd::printCompilerInfo() const { - } else { - string cmd = hipClangPath + "/clang++ --version"; - system(cmd.c_str()); // hipclang version -- cmd = hipClangPath + "/llc --version"; -+ cmd = "@llvm@/bin/llc --version"; - system(cmd.c_str()); // llc version - cout << "hip-clang-cxxflags :" << endl; - cmd = hipPath + "/bin/hipcc --cxxflags"; -@@ -331,10 +331,7 @@ string HipBinAmd::getCppConfig() { - hipPathInclude /= "include"; - - const string& compilerPath = getCompilerPath(); -- hipClangInclude = compilerPath; -- hipClangInclude = hipClangInclude.parent_path(); -- hipClangInclude /= "lib/clang/"; -- hipClangInclude /= compilerVersion; -+ hipClangInclude = "@clang@/resource-root/include"; - string hipClangPath = hipClangInclude.string(); - - const OsType& osInfo = getOSInfo(); -@@ -442,17 +439,7 @@ string HipBinAmd::getHipCC() const { - - - string HipBinAmd::getCompilerIncludePath() { -- string hipClangVersion, includePath, compilerIncludePath; -- const string& hipClangPath = getCompilerPath(); -- hipClangVersion = getCompilerVersion(); -- fs::path includePathfs = hipClangPath; -- includePathfs = includePathfs.parent_path(); -- includePathfs /= "lib/clang/"; -- includePathfs /= hipClangVersion; -- includePathfs /= "include"; -- includePathfs = fs::absolute(includePathfs).string(); -- compilerIncludePath = includePathfs.string(); -- return compilerIncludePath; -+ return "@clang@/resource-root/include"; - } - - -@@ -506,8 +493,8 @@ void HipBinAmd::printFull() { - cout << endl << "== Envirnoment Variables" << endl; - printEnvironmentVariables(); - getSystemInfo(); -- if (fs::exists("/usr/bin/lsb_release")) -- system("/usr/bin/lsb_release -a"); -+ if (fs::exists("@lsb_release@/bin/lsb_release")) -+ system("@lsb_release@/bin/lsb_release -a"); - cout << endl; - } - -@@ -993,7 +980,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { - } else if (os != windows) { - // Else try using rocm_agent_enumerator - string ROCM_AGENT_ENUM; -- ROCM_AGENT_ENUM = roccmPath + "/bin/rocm_agent_enumerator"; -+ ROCM_AGENT_ENUM = "@rocminfo@/bin/rocm_agent_enumerator"; - targetsStr = ROCM_AGENT_ENUM +" -t GPU"; - SystemCmdOut sysOut = hipBinUtilPtr_->exec(targetsStr.c_str()); - regex toReplace("\n+"); -@@ -1097,7 +1084,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { - string hipClangVersion, toolArgTemp; - if (linkType == 0) { - toolArgTemp = " -L"+ hipLibPath + "-lamdhip64 -L" + -- roccmPath+ "/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; -+ "@rocm_runtime@/lib -lhsa-runtime64 -ldl -lnuma " + toolArgs; - toolArgs = toolArgTemp; - } else { - toolArgTemp = toolArgs + " -Wl,--enable-new-dtags -Wl,-rpath=" + hipLibPath + ":" -@@ -1107,8 +1094,7 @@ void HipBinAmd::executeHipCCCmd(vector argv) { - - hipClangVersion = getCompilerVersion(); - // To support __fp16 and _Float16, explicitly link with compiler-rt -- toolArgs += " -L" + hipClangPath + "/../lib/clang/" + -- hipClangVersion + "/lib/linux -lclang_rt.builtins-x86_64 "; -+ toolArgs += " -L@clang@/resource-root/lib/linux -lclang_rt.builtins-x86_64 "; - } - if (!var.hipccCompileFlagsAppendEnv_.empty()) { - HIPCXXFLAGS += " " + var.hipccCompileFlagsAppendEnv_ + " "; -diff --git a/src/hipBin_nvidia.h b/src/hipBin_nvidia.h -index 6feb315..b61739d 100644 ---- a/src/hipBin_nvidia.h -+++ b/src/hipBin_nvidia.h -@@ -157,8 +157,8 @@ void HipBinNvidia::printFull() { - cout << endl << "== Envirnoment Variables" << endl; - printEnvironmentVariables(); - getSystemInfo(); -- if (fs::exists("/usr/bin/lsb_release")) -- system("/usr/bin/lsb_release -a"); -+ if (fs::exists("@lsb_release@/bin/lsb_release")) -+ system("@lsb_release@/bin/lsb_release -a"); - } - - // returns hip include diff --git a/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 47459664af..4eef8acb06 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,5 +1,5 @@ # -*- shell-script -*- -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup function extract diff --git a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix index 606d77c173..3f7c286d59 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4"; + sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 377f66ca97..9d5e53700c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -27,6 +27,13 @@ , udev }: +let + arch = { + "aarch64-linux" = "aarch64"; + "x86_64-linux" = "x64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + cpu = stdenv.hostPlatform.parsed.cpu.name; +in openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; javaVersion = "17.0.7"; @@ -57,22 +64,22 @@ openjdk17.overrideAttrs (oldAttrs: rec { buildPhase = '' runHook preBuild - mkdir -p jcef_linux_x64/jmods - cp ${jetbrains.jcef}/* jcef_linux_x64/jmods + mkdir -p jcef_linux_${arch}/jmods + cp ${jetbrains.jcef}/* jcef_linux_${arch}/jmods sed \ -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \ -e "s/SOURCE_DATE_EPOCH=.*//" \ -e "s/export SOURCE_DATE_EPOCH//" \ -i jb/project/tools/common/scripts/common.sh - sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_x64.sh + sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_${arch}.sh sed \ -e "s/create_image_bundle \"jb/#/" \ -e "s/echo Creating /exit 0 #/" \ - -i jb/project/tools/linux/scripts/mkimages_x64.sh + -i jb/project/tools/linux/scripts/mkimages_${arch}.sh patchShebangs . - ./jb/project/tools/linux/scripts/mkimages_x64.sh ${build} ${if debugBuild then "fd" else "jcef"} + ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else "jcef"} runHook postBuild ''; @@ -84,9 +91,9 @@ openjdk17.overrideAttrs (oldAttrs: rec { in '' runHook preInstall - mv build/linux-x86_64-server-${buildType}/images/jdk/man build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} - rm -rf build/linux-x86_64-server-${buildType}/images/jdk - mv build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} build/linux-x86_64-server-${buildType}/images/jdk + mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build} + rm -rf build/linux-${cpu}-server-${buildType}/images/jdk + mv build/linux-${cpu}-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build} build/linux-${cpu}-server-${buildType}/images/jdk '' + oldAttrs.installPhase + "runHook postInstall"; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 165c9bea58..a36eae8be5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -73,6 +73,23 @@ let rpath = lib.makeLibraryPath [ ]; buildType = if debugBuild then "Debug" else "Release"; +platform = { + "aarch64-linux" = "linuxarm64"; + "x86_64-linux" = "linux64"; +}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +arches = { + "linuxarm64" = { + depsArch = "arm64"; + projectArch = "arm64"; + targetArch = "arm64"; + }; + "linux64" = { + depsArch = "amd64"; + projectArch = "x86_64"; + targetArch = "x86_64"; + }; +}.${platform}; +inherit (arches) depsArch projectArch targetArch; in stdenv.mkDerivation rec { pname = "jcef-jetbrains"; @@ -92,12 +109,15 @@ in stdenv.mkDerivation rec { hash = "sha256-3HuW8upR/bZoK8euVti2KpCZh9xxfqgyHmgoG1NjxOI="; }; cef-bin = let - fileName = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_linux64_minimal"; - urlName = builtins.replaceStrings ["+"] ["%2B"] fileName; - in fetchzip rec { - name = fileName; + name = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_${platform}_minimal"; + hash = { + "linuxarm64" = "sha256-gCDIfWsysXE8lHn7H+YM3Jag+mdbWwTQpJf0GKdXEVs="; + "linux64" = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw="; + }.${platform}; + urlName = builtins.replaceStrings ["+"] ["%2B"] name; + in fetchzip { url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; - hash = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw="; + inherit name hash; }; clang-fmt = fetchurl { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; @@ -128,7 +148,7 @@ in stdenv.mkDerivation rec { mkdir jcef_build cd jcef_build - cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${buildType} .. + cmake -G "Ninja" -DPROJECT_ARCH="${projectArch}" -DCMAKE_BUILD_TYPE=${buildType} .. runHook postConfigure ''; @@ -137,7 +157,7 @@ in stdenv.mkDerivation rec { postBuild = '' export JCEF_ROOT_DIR=$(realpath ..) - ../tools/compile.sh linux64 Release + ../tools/compile.sh ${platform} Release ''; # Mostly taken from jb/tools/common/create_modules.sh @@ -148,8 +168,8 @@ in stdenv.mkDerivation rec { export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType} export JB_TOOLS_DIR=$(realpath ../jb/tools) export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux - export OUT_CLS_DIR=$(realpath ../out/linux64) - export TARGET_ARCH=x86_64 DEPS_ARCH=amd64 + export OUT_CLS_DIR=$(realpath ../out/${platform}) + export TARGET_ARCH=${targetArch} DEPS_ARCH=${depsArch} export OS=linux export JOGAMP_DIR="$JCEF_ROOT_DIR"/third_party/jogamp/jar @@ -183,7 +203,11 @@ in stdenv.mkDerivation rec { jar uf gluegen-rt.jar module-info.class rm module-info.class module-info.java mkdir lib + '' + # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec + + lib.optionalString (platform != "linuxarm64") '' extract_jar "$JOGAMP_DIR"/gluegen-rt-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH" + '' + '' cd ../jogl cp "$JOGAMP_DIR"/gluegen-rt.jar . @@ -193,7 +217,11 @@ in stdenv.mkDerivation rec { jar uf jogl-all.jar module-info.class rm module-info.class module-info.java mkdir lib + '' + # see https://github.com/JetBrains/jcef/commit/f3b787e3326c1915d663abded7f055c0866f32ec + + lib.optionalString (platform != "linuxarm64") '' extract_jar "$JOGAMP_DIR"/jogl-all-natives-"$OS"-"$DEPS_ARCH".jar lib natives/"$OS"-"$DEPS_ARCH" + '' + '' cd ../jcef cp "$OUT_CLS_DIR"/jcef.jar . diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix index 85c0d7043e..04e768d0bf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.3"; + version = "1.9.4"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; + sha256 = "07d20c4c2518833e2265ca0acee15b355463361aa4efdab858dad826cf94325c"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; + sha256 = "541d0c5a9378f8d2fc384bb8595fc6ffe20d61054629a6e314fb2f8dfe2f2ade"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; + sha256 = "67eec264f6afc9e9bf72c0f62c84d91c2ebdfaed6a0aa11606e3c983d278b441"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; + sha256 = "67542975e86102eec95bc4bb7c30c5d8c7ea9f9a0b388f0e10f546945363b01a"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix index 002cca08aa..715414e7da 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; + hash = "sha256-YYQ7lkf9BtOymU8yd6ZN4ctaWlKX2TC4yOO8DpN0ACQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/README.md b/third_party/nixpkgs/pkgs/development/compilers/julia/README.md index d37c01bc8c..e9843fa3c9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/README.md +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/README.md @@ -20,5 +20,5 @@ minimal set of broken or incompatible tests you think you have a good reason to disable, is your best bet at arriving at a solid derivation. [readme]: https://github.com/JuliaLang/julia/blob/master/README.md -[build]: https://github.com/JuliaLang/julia/blob/master/doc/build/build.md +[build]: https://github.com/JuliaLang/julia/tree/master/doc/src/devdocs/build [release_process]: https://julialang.org/blog/2019/08/release-process diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 6fd5b88019..50b9d0fade 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.10"; + version = "1.9.20"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x"; + sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix index 4f6dddb3fa..b50f6287c9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.10"; + version = "1.9.20"; src = let getArch = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { getHash = arch: { "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; - "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; + "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; }.${arch}; in fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix index 2e34ac852b..8624e64c65 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.34.0"; - sha256 = "sha256-MAXG6ceSWFOMg5eXZnZ6WePXTzy5CsLLDc5ddXO+txk="; + version = "1.35.0"; + sha256 = "sha256-bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A="; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix index b68500f4ee..0d0926aab1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_14, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_16, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_14.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_16.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix index c4e6f2827e..c09ec676e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -133,7 +133,17 @@ in stdenv.mkDerivation (rec { hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; stripLen = 1; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 10 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix index e0bcf03e00..6040f3d162 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , fetch +, fetchpatch , cmake , llvm , targetLlvm @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix index 8eca980d60..7b461df438 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , src +, fetchpatch , cmake , llvm , targetLlvm @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${pname}"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index 863d31874e..6a3b8cbaba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -266,11 +266,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -281,10 +283,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -293,16 +297,22 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); }); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix index e6f339ff6d..8a1c054789 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -227,6 +227,8 @@ in stdenv.mkDerivation (rec { --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index fc0d7533c9..9b6ab0a77c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -119,9 +119,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix index 9dbe65ed68..541db8c400 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/default.nix @@ -255,14 +255,6 @@ in let [ "-rtlib=compiler-rt" "-Wno-unused-command-line-argument" "-B${targetLlvmLibraries.compiler-rt}/lib" - - # Combat "__cxxabi_config.h not found". Maybe this could be fixed by - # copying these headers into libcxx? Note that building libcxx - # outside of monorepo isn't supported anymore, might be related to - # https://github.com/llvm/llvm-project/issues/55632 - # ("16.0.3 libcxx, libcxxabi: circular build dependencies") - # Looks like the machinery changed in https://reviews.llvm.org/D120727. - "-I${lib.getDev targetLlvmLibraries.libcxx.cxxabi}/include/c++/v1" ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional @@ -279,11 +271,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -294,10 +288,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -306,17 +302,29 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ./libclc { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libclc/default.nix similarity index 69% rename from third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/llvm/16/libclc/default.nix index 9148deeee6..6fa0751f90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libclc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }: +{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: stdenv.mkDerivation rec { pname = "libclc"; - version = "16.0.3"; + inherit version; - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "llvmorg-${version}"; - hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; - }; - sourceRoot = "${src.name}/libclc"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ llvm_14 ]; + buildInputs = [ llvm ]; strictDeps = true; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch rename to third_party/nixpkgs/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxx/default.nix index c387764b4f..78cd632024 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!headersOnly) [ cxxabi ] - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" # If we're only building the headers we don't actually *need* a functioning # C/C++ compiler: diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 04bfee14aa..90c57dc52a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { # CMake however checks for this anyways; this flag tells it not to. See: # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 "-DCMAKE_CXX_COMPILER_WORKS=ON" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, @@ -74,8 +72,11 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/add-table-base.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/add-table-base.patch new file mode 100644 index 0000000000..15fc903a5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/add-table-base.patch @@ -0,0 +1,190 @@ +From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 +From: Sam Clegg +Date: Fri, 25 Aug 2023 13:56:16 -0700 +Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting + +This is similar to `--global-base` but determines where to place the +table segments rather than that data segments. + +See https://github.com/emscripten-core/emscripten/issues/20097 + +Differential Revision: https://reviews.llvm.org/D158892 +--- + test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ + wasm/Driver.cpp | 19 ++++++++-- + wasm/Options.td | 5 ++- + wasm/Writer.cpp | 8 ----- + 4 files changed, 93 insertions(+), 11 deletions(-) + create mode 100644 test/wasm/table-base.s + +diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s +new file mode 100644 +index 000000000000000..56fff414fd31d96 +--- /dev/null ++++ b/test/wasm/table-base.s +@@ -0,0 +1,72 @@ ++# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o ++ ++# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT ++ ++# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 ++ ++.globl _start ++_start: ++ .functype _start () -> () ++ i32.const _start ++ drop ++ end_function ++ ++# CHECK-DEFAULT: - Type: TABLE ++# CHECK-DEFAULT-NEXT: Tables: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: ElemType: FUNCREF ++# CHECK-DEFAULT-NEXT: Limits: ++# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] ++# CHECK-DEFAULT-NEXT: Minimum: 0x2 ++# CHECK-DEFAULT-NEXT: Maximum: 0x2 ++ ++# CHECK-DEFAULT: - Type: GLOBAL ++# CHECK-DEFAULT-NEXT: Globals: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: true ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 66560 ++# CHECK-DEFAULT-NEXT: - Index: 1 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: false ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 1 ++ ++# CHECK-DEFAULT: - Type: EXPORT ++# CHECK-DEFAULT: - Name: __table_base ++# CHECK-DEFAULT-NEXT: Kind: GLOBAL ++# CHECK-DEFAULT-NEXT: Index: 1 ++ ++# CHECK-100: - Type: TABLE ++# CHECK-100-NEXT: Tables: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: ElemType: FUNCREF ++# CHECK-100-NEXT: Limits: ++# CHECK-100-NEXT: Flags: [ HAS_MAX ] ++# CHECK-100-NEXT: Minimum: 0x65 ++# CHECK-100-NEXT: Maximum: 0x65 ++ ++# CHECK-100: - Type: GLOBAL ++# CHECK-100-NEXT: Globals: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: true ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 66560 ++# CHECK-100-NEXT: - Index: 1 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: false ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 100 ++ ++# CHECK-100: - Type: EXPORT ++# CHECK-100: - Name: __table_base ++# CHECK-100-NEXT: Kind: GLOBAL ++# CHECK-100-NEXT: Index: 1 +diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp +index 84304881f5ca34e..c2f5f0185781f36 100644 +--- a/wasm/Driver.cpp ++++ b/wasm/Driver.cpp +@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { + + config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); + config->globalBase = args::getInteger(args, OPT_global_base, 0); ++ config->tableBase = args::getInteger(args, OPT_table_base, 0); + config->maxMemory = args::getInteger(args, OPT_max_memory, 0); + config->zStackSize = + args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); +@@ -573,6 +574,17 @@ static void setConfigs() { + if (config->exportTable) + error("-shared/-pie is incompatible with --export-table"); + config->importTable = true; ++ } else { ++ // Default table base. Defaults to 1, reserving 0 for the NULL function ++ // pointer. ++ if (!config->tableBase) ++ config->tableBase = 1; ++ // The default offset for static/global data, for when --global-base is ++ // not specified on the command line. The precise value of 1024 is ++ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that ++ // emscripten used prior to wasm-ld). ++ if (!config->globalBase && !config->relocatable && !config->stackFirst) ++ config->globalBase = 1024; + } + + if (config->relocatable) { +@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { + warn("-Bsymbolic is only meaningful when combined with -shared"); + } + +- if (config->globalBase && config->isPic) { +- error("--global-base may not be used with -shared/-pie"); ++ if (config->isPic) { ++ if (config->globalBase) ++ error("--global-base may not be used with -shared/-pie"); ++ if (config->tableBase) ++ error("--table-base may not be used with -shared/-pie"); + } + } + +diff --git a/wasm/Options.td b/wasm/Options.td +index 50417d2928e0a34..bb764396bf4df14 100644 +--- a/wasm/Options.td ++++ b/wasm/Options.td +@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, + HelpText<"Remove maximum size from function table, allowing table to grow">; + + def global_base: JJ<"global-base=">, +- HelpText<"Where to start to place global data">; ++ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; + + def import_memory: FF<"import-memory">, + HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; +@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, + def stack_first: FF<"stack-first">, + HelpText<"Place stack at start of linear memory rather than after data">; + ++def table_base: JJ<"table-base=">, ++ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; ++ + defm whole_archive: B<"whole-archive", + "Force load of all members in a static library", + "Do not force load of all members in a static library (default)">; +diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp +index f25d358dc5bae6f..0576bf2907e49c4 100644 +--- a/wasm/Writer.cpp ++++ b/wasm/Writer.cpp +@@ -358,13 +358,6 @@ void Writer::layoutMemory() { + memoryPtr = config->globalBase; + } + } else { +- if (!config->globalBase && !config->relocatable && !config->isPic) { +- // The default offset for static/global data, for when --global-base is +- // not specified on the command line. The precise value of 1024 is +- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that +- // emscripten used prior to wasm-ld). +- config->globalBase = 1024; +- } + memoryPtr = config->globalBase; + } + +@@ -1685,7 +1678,6 @@ void Writer::run() { + // For PIC code the table base is assigned dynamically by the loader. + // For non-PIC, we start at 1 so that accessing table index 0 always traps. + if (!config->isPic) { +- config->tableBase = 1; + if (WasmSym::definedTableBase) + WasmSym::definedTableBase->setVA(config->tableBase); + if (WasmSym::definedTableBase32) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/default.nix index cc18aee76a..84943e8eff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/lld/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + ./add-table-base.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix index c70f9d37a5..9475b5c994 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -221,6 +221,8 @@ in --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch deleted file mode 100644 index 2811df7d29..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/0000-fix-openmp.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/libomptarget/plugins/amdgpu/impl/impl.cpp b/libomptarget/plugins/amdgpu/impl/impl.cpp -index 80e024789..3a14e0889 100644 ---- a/libomptarget/plugins/amdgpu/impl/impl.cpp -+++ b/libomptarget/plugins/amdgpu/impl/impl.cpp -@@ -21,10 +21,11 @@ bool is_locked(void *ptr, hsa_status_t *err_p, void **agentBaseAddress) { - info.size = sizeof(hsa_amd_pointer_info_t); - err = hsa_amd_pointer_info(ptr, &info, nullptr, nullptr, nullptr); - -- if (err != HSA_STATUS_SUCCESS) -+ if (err != HSA_STATUS_SUCCESS) { - DP("Error when getting pointer info\n"); -- else -+ } else { - is_locked = (info.type == HSA_EXT_POINTER_TYPE_LOCKED); -+ } - - if (is_locked && agentBaseAddress != nullptr) { - // When user passes in a basePtr+offset we need to fix the diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix deleted file mode 100644 index b6df2354f5..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ /dev/null @@ -1,603 +0,0 @@ -{ lib -, stdenv -, callPackage -, overrideCC -, wrapCCWith -, wrapBintoolsWith -, runCommand -, lit -, glibc -, spirv-llvm-translator -, xz -, swig -, lua5_3 -, gtest -, hip -, rocm-comgr -, vulkan-loader -, vulkan-headers -, glslang -, shaderc -, perl -, rocm-device-libs -, rocm-runtime -, elfutils -, python3Packages -}: - -let - # Stage 1 - # Base - llvm = callPackage ./llvm.nix { - requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 - }; - - # Projects - clang-unwrapped = callPackage ./llvm.nix rec { - targetName = "clang"; - targetDir = targetName; - extraBuildInputs = [ llvm ]; - - extraCMakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" - "-DCLANG_INCLUDE_DOCS=ON" - "-DCLANG_INCLUDE_TESTS=ON" - ]; - - extraPostPatch = '' - # Looks like they forgot to add finding libedit to the standalone build - ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules - - substituteInPlace CMakeLists.txt \ - --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" - - # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` - rm test/Analysis/scan-build/*.test - rm test/Analysis/scan-build/rebuild_index/rebuild_index.test - - # `does not depend on a module exporting 'baz.h'` - rm test/Modules/header-attribs.cpp - - # `fatal error: 'stdio.h' file not found` - rm test/OpenMP/amdgcn_emit_llvm.c - ''; - - extraPostInstall = '' - mv bin/clang-tblgen $out/bin - ''; - }; - - lld = callPackage ./llvm.nix rec { - buildMan = false; # No man pages to build - targetName = "lld"; - targetDir = targetName; - extraBuildInputs = [ llvm ]; - extraCMakeFlags = [ "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" ]; - checkTargets = [ "check-lld" ]; - }; - - # Runtimes - runtimes = callPackage ./llvm.nix { - buildDocs = false; - buildMan = false; - buildTests = false; - targetDir = "runtimes"; - - targetRuntimes = [ - # "libc" https://github.com/llvm/llvm-project/issues/57719 - "libunwind" - "libcxxabi" - "libcxx" - "compiler-rt" - ]; - - extraBuildInputs = [ llvm ]; - - extraCMakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" - "-DLIBCXX_INCLUDE_BENCHMARKS=OFF" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - extraLicenses = [ lib.licenses.mit ]; - }; - - # Stage 2 - # Helpers - rStdenv = overrideCC stdenv (wrapCCWith rec { - inherit bintools; - libcxx = runtimes; - cc = clang-unwrapped; - - extraPackages = [ - llvm - lld - ]; - - nixSupport.cc-cflags = [ - "-resource-dir=$out/resource-root" - "-fuse-ld=lld" - "-rtlib=compiler-rt" - "-unwindlib=libunwind" - "-Wno-unused-command-line-argument" - ]; - - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/resource-root - ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root - ln -s ${runtimes}/lib $out/resource-root - ''; - }); - - bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; - - bintools-unwrapped = runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } '' - mkdir -p $out/bin - - for prog in ${lld}/bin/*; do - ln -s $prog $out/bin/$(basename $prog) - done - - for prog in ${llvm}/bin/*; do - ln -sf $prog $out/bin/$(basename $prog) - done - - ln -s ${llvm}/bin/llvm-ar $out/bin/ar - ln -s ${llvm}/bin/llvm-as $out/bin/as - ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp - ln -s ${llvm}/bin/llvm-nm $out/bin/nm - ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy - ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump - ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib - ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf - ln -s ${llvm}/bin/llvm-size $out/bin/size - ln -s ${llvm}/bin/llvm-strip $out/bin/strip - ln -s ${lld}/bin/lld $out/bin/ld - ''; -in rec { - inherit - llvm - clang-unwrapped - lld - bintools - bintools-unwrapped; - - # Runtimes - libc = callPackage ./llvm.nix rec { - stdenv = rStdenv; - targetName = "libc"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - isBroken = true; # https://github.com/llvm/llvm-project/issues/57719 - }; - - libunwind = callPackage ./llvm.nix rec { - stdenv = rStdenv; - buildMan = false; # No man pages to build - targetName = "libunwind"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - - extraCMakeFlags = [ - "-DLIBUNWIND_INCLUDE_DOCS=ON" - "-DLIBUNWIND_INCLUDE_TESTS=ON" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - ]; - }; - - libcxxabi = callPackage ./llvm.nix rec { - stdenv = rStdenv; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "libcxxabi"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - targetName - "libcxx" - ]; - - extraCMakeFlags = [ - "-DLIBCXXABI_INCLUDE_TESTS=ON" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXX_INCLUDE_DOCS=OFF" - "-DLIBCXX_INCLUDE_TESTS=OFF" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - "-DLIBCXX_INSTALL_LIBRARY=OFF" - "-DLIBCXX_INSTALL_HEADERS=OFF" - ]; - }; - - libcxx = callPackage ./llvm.nix rec { - stdenv = rStdenv; - buildMan = false; # No man pages to build - targetName = "libcxx"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - "libcxxabi" - targetName - ]; - - extraCMakeFlags = [ - "-DLIBCXX_INCLUDE_DOCS=ON" - "-DLIBCXX_INCLUDE_TESTS=ON" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXXABI_INCLUDE_TESTS=OFF" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - "-DLIBCXXABI_INSTALL_LIBRARY=OFF" - "-DLIBCXXABI_INSTALL_HEADERS=OFF" - ]; - - # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered - extraPostPatch = '' - chmod +w -R ../libcxx/test/{libcxx,std} - rm -rf ../libcxx/test/libcxx/input.output/filesystems - rm ../libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp - rm ../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp - rm ../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp - rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace_initializer_list.pass.cpp - rm ../libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp - rm -rf ../libcxx/test/std/utilities/optional/optional.object/optional.object.ctor - rm -rf ../libcxx/test/std/input.output/filesystems/{class.directory_entry,class.directory_iterator,class.rec.dir.itr,fs.op.funcs} - ''; - }; - - compiler-rt = callPackage ./llvm.nix rec { - stdenv = rStdenv; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "compiler-rt"; - targetDir = "runtimes"; - - targetRuntimes = [ - "libunwind" - "libcxxabi" - "libcxx" - targetName - ]; - - extraCMakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0114=NEW" - "-DCOMPILER_RT_INCLUDE_TESTS=ON" - "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON" - "-DCOMPILER_RT_CXX_LIBRARY=libcxx" - "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these - - # Workaround having to build combined - "-DLIBUNWIND_INCLUDE_DOCS=OFF" - "-DLIBUNWIND_INCLUDE_TESTS=OFF" - "-DLIBUNWIND_USE_COMPILER_RT=ON" - "-DLIBUNWIND_INSTALL_LIBRARY=OFF" - "-DLIBUNWIND_INSTALL_HEADERS=OFF" - "-DLIBCXXABI_INCLUDE_TESTS=OFF" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - "-DLIBCXXABI_USE_COMPILER_RT=ON" - "-DLIBCXXABI_INSTALL_LIBRARY=OFF" - "-DLIBCXXABI_INSTALL_HEADERS=OFF" - "-DLIBCXX_INCLUDE_DOCS=OFF" - "-DLIBCXX_INCLUDE_TESTS=OFF" - "-DLIBCXX_USE_COMPILER_RT=ON" - "-DLIBCXX_CXX_ABI=libcxxabi" - "-DLIBCXX_INSTALL_LIBRARY=OFF" - "-DLIBCXX_INSTALL_HEADERS=OFF" - ]; - - extraPostPatch = '' - # `No such file or directory: 'ldd'` - substituteInPlace ../compiler-rt/test/lit.common.cfg.py \ - --replace "'ldd'," "'${glibc.bin}/bin/ldd'," - - # We can run these - substituteInPlace ../compiler-rt/test/CMakeLists.txt \ - --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)" - ''; - - extraLicenses = [ lib.licenses.mit ]; - }; - - # Stage 3 - # Helpers - rocmClangStdenv = overrideCC stdenv clang; - - clang = wrapCCWith rec { - # inherit libc libcxx bintools; - inherit libcxx bintools; - - # We do this to avoid HIP pathing problems, and mimic a monolithic install - cc = stdenv.mkDerivation (finalAttrs: { - inherit (clang-unwrapped) pname version; - dontUnpack = true; - - installPhase = '' - runHook preInstall - - clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share} - - for path in ${llvm} ${clang-unwrapped} ${lld} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do - cp -as $path/* $out - chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}} - rm -f $out/lib/libc++.so - done - - ln -s $out/lib/* $out/lib/clang/$clang_version/lib - ln -s $out/include/* $out/lib/clang/$clang_version/include - - runHook postInstall - ''; - - passthru.isClang = true; - }); - - extraPackages = [ - llvm - lld - libunwind - libcxxabi - compiler-rt - ]; - - nixSupport.cc-cflags = [ - "-resource-dir=$out/resource-root" - "-fuse-ld=lld" - "-rtlib=compiler-rt" - "-unwindlib=libunwind" - "-Wno-unused-command-line-argument" - ]; - - extraBuildCommands = '' - clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` - mkdir -p $out/resource-root - ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root - - # Not sure why, but hardening seems to make things break - rm $out/nix-support/add-hardening.sh - touch $out/nix-support/add-hardening.sh - - # GPU compilation uses builtin `lld` - substituteInPlace $out/bin/{clang,clang++} \ - --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" - ''; - }; - - # Base - # Unfortunately, we cannot build `clang-tools-extra` separately. - clang-tools-extra = callPackage ./llvm.nix { - stdenv = rocmClangStdenv; - buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` - targetName = "clang-tools-extra"; - - targetProjects = [ - "clang" - "clang-tools-extra" - ]; - - extraBuildInputs = [ gtest ]; - - extraCMakeFlags = [ - "-DLLVM_INCLUDE_DOCS=OFF" - "-DLLVM_INCLUDE_TESTS=OFF" - "-DCLANG_INCLUDE_DOCS=OFF" - "-DCLANG_INCLUDE_TESTS=ON" - "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON" - ]; - - extraPostInstall = '' - # Remove LLVM and Clang - for path in `find ${llvm} ${clang-unwrapped}`; do - if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then - rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true - fi - done - - # Cleanup empty directories - find $out -type d -empty -delete - ''; - }; - - # Projects - libclc = let - spirv = (spirv-llvm-translator.override { inherit llvm; }); - in callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - targetName = "libclc"; - targetDir = targetName; - extraBuildInputs = [ spirv ]; - - # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0 - # Try removing the `spirv-mesa3d` and `clspv` patches next update - # `clspv` tests fail, unresolved calls - extraPostPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ - "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ - --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ - "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ - --replace " spirv-mesa3d-" "" \ - --replace " spirv64-mesa3d-" "" \ - --replace "NOT \''${t} MATCHES" \ - "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" - ''; - - checkTargets = [ ]; - }; - - lldb = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildTests = false; # ld.lld: error: unable to find library -lllvm_gtest_main - targetName = "lldb"; - targetDir = targetName; - extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ]; - - extraBuildInputs = [ - xz - swig - lua5_3 - gtest - ]; - - extraCMakeFlags = [ - "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" - "-DLLDB_INCLUDE_TESTS=ON" - "-DLLDB_INCLUDE_UNITTESTS=ON" - ]; - }; - - mlir = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildDocs = false; # No decent way to hack this to work - buildMan = false; # No man pages to build - targetName = "mlir"; - targetDir = targetName; - extraNativeBuildInputs = [ hip ]; - - extraBuildInputs = [ - rocm-comgr - vulkan-headers - vulkan-loader - glslang - shaderc - ]; - - extraCMakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" - "-DMLIR_INCLUDE_DOCS=ON" - "-DMLIR_INCLUDE_TESTS=ON" - "-DMLIR_ENABLE_ROCM_RUNNER=ON" - "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON" - "-DMLIR_ENABLE_VULKAN_RUNNER=ON" - "-DROCM_TEST_CHIPSET=gfx000" # CPU runner - ]; - - extraPostPatch = '' - chmod +w ../llvm - mkdir -p ../llvm/build/bin - ln -s ${lit}/bin/lit ../llvm/build/bin/llvm-lit - - substituteInPlace test/CMakeLists.txt \ - --replace "FileCheck count not" "" \ - --replace "list(APPEND MLIR_TEST_DEPENDS mlir_rocm_runtime)" "" - - substituteInPlace lib/ExecutionEngine/CMakeLists.txt \ - --replace "return()" "" - - # Remove problematic tests - rm test/CAPI/execution_engine.c - rm test/Target/LLVMIR/llvmir-intrinsics.mlir - rm test/Target/LLVMIR/llvmir.mlir - rm test/Target/LLVMIR/openmp-llvm.mlir - rm test/mlir-cpu-runner/*.mlir - rm test/mlir-vulkan-runner/*.mlir - ''; - - extraPostInstall = '' - mkdir -p $out/bin - mv bin/mlir-tblgen $out/bin - ''; - - checkTargets = [ "check-${targetName}" ]; - }; - - polly = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - targetName = "polly"; - targetDir = targetName; - checkTargets = [ "check-${targetName}" ]; - }; - - flang = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildTests = false; # `Executable "flang1" doesn't exist!` - targetName = "flang"; - targetDir = targetName; - extraNativeBuildInputs = [ python3Packages.sphinx-markdown-tables ]; - extraBuildInputs = [ mlir ]; - - extraCMakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0116=NEW" - "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang" - "-DFLANG_INCLUDE_TESTS=OFF" - "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen" - ]; - - extraPostPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace "FileCheck" "" \ - --replace "count" "" \ - --replace "not" "" - - substituteInPlace docs/CMakeLists.txt \ - --replace "CLANG_TABLEGEN_EXE clang-tblgen" "CLANG_TABLEGEN_EXE ${clang-unwrapped}/bin/clang-tblgen" - ''; - }; - - openmp = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildTests = false; # Too many failures, most pass - targetName = "openmp"; - targetDir = targetName; - extraPatches = [ ./0000-fix-openmp.patch ]; - extraNativeBuildInputs = [ perl ]; - - extraBuildInputs = [ - rocm-device-libs - rocm-runtime - elfutils - ]; - - extraCMakeFlags = [ - "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs - "-DCLANG_TOOL=${clang}/bin/clang" - "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler" - "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin" - "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped" - "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" - ]; - - extraPostPatch = '' - # We can't build this target at the moment - substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \ - --replace "gfx1010" "" - ''; - - checkTargets = [ "check-${targetName}" ]; - extraLicenses = [ lib.licenses.mit ]; - }; - - # Runtimes - pstl = callPackage ./llvm.nix rec { - stdenv = rocmClangStdenv; - buildDocs = false; # No documentation to build - buildMan = false; # No man pages to build - buildTests = false; # Too many errors - targetName = "pstl"; - targetDir = "runtimes"; - targetRuntimes = [ targetName ]; - checkTargets = [ "check-${targetName}" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix index 573712b677..e380cf735f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.12"; + version = "2023.13"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-0hEcbLq8thlgMtCcWt8SR5XsNgQfNH4+qdE0cHfRveo="; + sha256 = "sha256-7lMIIJ3iduyxZKwK65tle3c+az2G2Mpi4JwAeCCsTxw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix index 104b7ce688..1fa448fe9d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/lunarml/default.nix @@ -5,16 +5,19 @@ , lua5_3 }: +let + version = "0.0.20231113"; +in stdenvNoCC.mkDerivation { - pname = "lunarml"; + inherit version; - version = "unstable-2023-09-21"; + pname = "lunarml"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "c6e23ae68149bda550ddb75c0df9f422aa379b3a"; - sha256 = "DY4gOCXfGV1OVdGXd6GGvbHlQdWWxMg5TZzkceeOu9o="; + rev = "refs/tags/v${version}"; + hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix index 0f556f85da..e8eb62a15f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mcpp/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; + patches = [ + ./readlink.patch + ]; + configureFlags = [ "--enable-mcpplib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/mcpp/readlink.patch b/third_party/nixpkgs/pkgs/development/compilers/mcpp/readlink.patch new file mode 100644 index 0000000000..0f5fc6d7e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/mcpp/readlink.patch @@ -0,0 +1,24 @@ +From 1c4b0f26614bff331eb8a9f2b514309af6f31fd0 Mon Sep 17 00:00:00 2001 +From: Jose +Date: Mon, 26 Jun 2023 16:43:43 +0200 +Subject: [PATCH] Add 'unistd' header for readlink (#8) + +--- + src/system.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/system.c b/src/system.c +index a3501f9..646caf6 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -37,6 +37,11 @@ + * 2. append the system-dependent routines in this file. + */ ++ ++#ifndef _MSC_VER ++# include // For readlink() ++#endif ++ + #if PREPROCESSED + #include "mcpp.H" + #else 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 ea5d154898..1abbac512a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -4,7 +4,7 @@ , makeWrapper , gnum4 , texinfo -, texLive +, texliveSmall , automake , autoconf , libtool @@ -85,7 +85,7 @@ stdenv.mkDerivation { $out/lib/mit-scheme${arch}-${version} ''; - nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ]; + nativeBuildInputs = [ makeWrapper gnum4 texinfo (texliveSmall.withPackages (ps: with ps; [ epsf ps.texinfo ])) automake ghostscript autoconf libtool ]; # XXX: The `check' target doesn't exist. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 831c8182b9..a91273a352 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.4"; + version = "4.7.5"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-ASWPINMxR5Rlly1C0yB3llfhju/dDW2HBbHSIF4ecR8="; + sha256 = "sha256-LAlJCAF8nyXVUlkOEdcoxq5bZn1bd7dqwx6PxOxJRsM="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix index a8bf26bacd..0996702ec6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/bootstrap.nix @@ -2,7 +2,6 @@ , fetchurl , mrustc , mrustc-minicargo -, rust , llvm_12 , llvmPackages_12 , libffi @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" - "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" + "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; buildPhase = '' @@ -129,7 +128,7 @@ stdenv.mkDerivation rec { cp run_rustc/${outputDir}/prefix/bin/rustc_binary $out/bin/rustc cp -r run_rustc/${outputDir}/prefix/lib/* $out/lib/ - cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/ + cp $out/lib/rustlib/${stdenv.targetPlatform.rust.rustcTarget}/lib/*.so $out/lib/ runHook postInstall ''; @@ -146,4 +145,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix index 6570199f85..eae17cbce9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mrustc/default.nix @@ -4,9 +4,9 @@ }: let - version = "0.10"; + version = "0.10.1"; tag = "v${version}"; - rev = "b364724f15fd6fce8234ad8add68107c23a22151"; + rev = "b6754f574f8846eb842feba4ccbeeecb10bdfacc"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "thepowersgang"; repo = "mrustc"; rev = tag; - sha256 = "0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0"; + hash = "sha256-sYnx5dUTaQbK4ugnSzAJwIUwZKPUhThmNA+WlY+LEWc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix b/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix index 40e39d411d..fff5762a38 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; installCheckPhase = '' bin/neko bin/test.n diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/ocaml/builder.sh index 88acc0654c..85b26848f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix index 81a7faf739..152ee99fcb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/odin/default.nix @@ -12,13 +12,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2023-08"; + version = "dev-2023-11"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-pmgrauhB5/JWBkwrAm7tCml9IYQhXyGXsNVDKTntA0M="; + hash = "sha256-5plcr+j9aFSaLfLQXbG4WD1GH6rE7D3uhlUbPaDEYf8="; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { description = "A fast, concise, readable, pragmatic and open sourced programming language"; homepage = "https://odin-lang.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ luc65r astavie ]; + maintainers = with maintainers; [ luc65r astavie znaniye ]; platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix index e717a910f7..ab0696e172 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -67,7 +67,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -96,6 +95,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix index b012459ba0..5d5d9f7747 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -72,7 +72,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -101,6 +100,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib @@ -161,7 +166,7 @@ let disallowedReferences = [ openjdk-bootstrap ]; - meta = import ./meta.nix lib version; + meta = (import ./meta.nix lib version) // { broken = true; }; passthru = { architecture = ""; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix index 0f4f17d078..348fd3996c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath @@ -27,7 +27,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -67,7 +67,6 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" @@ -96,6 +95,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib @@ -157,7 +162,7 @@ let disallowedReferences = [ openjdk-bootstrap ]; - meta = import ./meta.nix lib version; + meta = (import ./meta.nix lib version) // { broken = true; }; passthru = { architecture = ""; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix index 54bce680a1..2447b0783c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 +, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk15-bootstrap , setJavaClassPath @@ -30,7 +30,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -70,15 +70,13 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -99,6 +97,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix index 802449e402..4b0874a03a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap , setJavaClassPath @@ -31,7 +31,7 @@ let nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ @@ -74,15 +74,13 @@ let "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-freetype=system" - "--with-harfbuzz=system" "--with-libjpeg=system" "--with-giflib=system" "--with-libpng=system" "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -103,6 +101,12 @@ let buildFlags = [ "all" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix index 9aa952156d..d2c71683c9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix index 48d68f7b07..2c496721be 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix @@ -88,8 +88,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -110,6 +109,12 @@ let buildFlags = [ "images" ]; + postBuild = '' + cd build/linux* + make images + cd - + ''; + installPhase = '' mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix index 214831a3d5..51fd0d8eb5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix index 105a1cc7b3..2be834a27b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix @@ -98,8 +98,7 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index d5ec912bfe..6d550538b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -42,6 +42,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix index b7ee8a0258..5ec888e49e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -47,6 +47,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix index a6300c3858..65d6697c6e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -49,6 +49,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix index bb909a3162..802a0eb9b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/19.nix @@ -51,6 +51,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix index 430b32187b..d570db3b9a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/20.nix @@ -38,6 +38,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix index 4b17873685..2f0d83f9f2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -38,6 +38,7 @@ let buildPhase = '' runHook preBuild + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES export GRADLE_USER_HOME=$(mktemp -d) ln -s $config gradle.properties export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" diff --git a/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix index d6f11798f1..c406d4c9d5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opensycl/default.nix @@ -2,16 +2,15 @@ , fetchFromGitHub , llvmPackages_15 , lld_15 -, rocm-device-libs , python3 -, rocm-runtime , cmake , boost , libxml2 , libffi , makeWrapper -, hip -, rocmSupport ? false +, config +, rocmPackages +, rocmSupport ? config.rocmSupport }: let inherit (llvmPackages_15) stdenv; @@ -40,8 +39,8 @@ stdenv.mkDerivation rec { llvmPackages_15.libclang.dev llvmPackages_15.llvm ] ++ lib.optionals rocmSupport [ - hip - rocm-runtime + rocmPackages.clr + rocmPackages.rocm-runtime ]; # opensycl makes use of clangs internal headers. Its cmake does not successfully discover them automatically on nixos, so we supply the path manually @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { --add-flags "-L${llvmPackages_15.openmp}/lib" \ --add-flags "-I${llvmPackages_15.openmp.dev}/include" \ '' + lib.optionalString rocmSupport '' - --add-flags "--rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + --add-flags "--rocm-device-lib-path=${rocmPackages.rocm-device-libs}/amdgcn/bitcode" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index c33c35e614..7631ca8b08 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A="; + sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix b/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix index d0766fe137..aadc72c174 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/pforth/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://www.softsynth.com/pforth/"; + homepage = "https://www.softsynth.com/pforth/"; description = "Portable Portable ANS-like Forth written in ANSI 'C'"; changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md"; license = lib.licenses.bsd0; diff --git a/third_party/nixpkgs/pkgs/development/compilers/polyml/default.nix b/third_party/nixpkgs/pkgs/development/compilers/polyml/default.nix index 2f22f8cd61..9516788470 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/polyml/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/polyml/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "polyml"; - version = "5.9"; + version = "5.9.1"; prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "sha256-4oo4AB54CivhS99RuZVTP9+Ic0CDpsBb+OiHvOhmZnM="; + sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 4b25058f39..cad2e06783 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.11"; + version = "0.15.12"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "1ffhcwzb4cazxviqdl9zwg0jnbhsisg2pbxkqbk63zj2grjcpg86"; + sha256 = "0s8j9svgxir0rb0wxkshwal60962g5z0pysdyrjgcr9r77y5gffk"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0h923269zb9hwlifcv8skz17zlggh8hsxhrgf33h2inl1midvgq5"; + sha256 = "13d2mmphxy9f9yy242qsm58hipr612jymwy7lhf0is4y4m2lvrk2"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0vrbgmgmmwbyxl969k59zkfrq5dxshspnzskx8zmhcy4flamz8av"; + sha256 = "05xwplibkv86iiwpv29vg3zxp5yw7waw86zh08q3p0qx355wjy73"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_72.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_73.nix similarity index 55% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_72.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_73.nix index 05e55d24a7..37e75e0a7a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_72.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_73.nix @@ -11,6 +11,7 @@ { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost @@ -19,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.72.0"; - rustcSha256 = "sha256-6p1hu7UddrbqaBFW9p8OBZa1lyLwRBSwHG4QC0tb46E="; + rustcVersion = "1.73.0"; + rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -34,25 +35,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.71.1"; + bootstrapVersion = "1.72.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21"; - x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4"; - x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01"; - arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258"; - armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60"; - aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f"; - aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c"; - x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c"; - aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351"; - powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537"; - riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea"; - mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed"; + i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911"; + x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410"; + x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac"; + arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110"; + armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb"; + aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b"; + aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f"; + x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e"; + aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983"; + powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c"; + riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101"; }; - selectRustPackage = pkgs: pkgs.rust_1_72; + selectRustPackage = pkgs: pkgs.rust_1_73; rustcPatches = [ ]; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix index 7c0b46d559..97ac692702 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, rust, callPackage, version, hashes }: +{ stdenv, fetchurl, callPackage, version, hashes }: let - platform = rust.toRustTarget stdenv.hostPlatform; + platform = stdenv.hostPlatform.rust.rustcTarget; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix index 46e238ff47..8eb628aa53 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsBuildHost, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, rustPlatform, rust, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable @@ -116,6 +116,6 @@ rustPlatform.buildRustPackage.override { broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform; }; } -// lib.optionalAttrs (rust.toRustTarget stdenv.buildPlatform != rust.toRustTarget stdenv.hostPlatform) { +// lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget) { HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config"; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index 90e921651f..efd7042c23 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -13,6 +13,7 @@ }: { stdenv, lib , buildPackages +, targetPackages , newScope, callPackage , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild @@ -21,7 +22,7 @@ let # Use `import` to make sure no packages sneak in here. - lib' = import ../../../build-support/rust/lib { inherit lib; }; + lib' = import ../../../build-support/rust/lib { inherit lib stdenv buildPackages targetPackages; }; # Allow faster cross compiler generation by reusing Build artifacts fastCross = (stdenv.buildPlatform == stdenv.hostPlatform) && (stdenv.hostPlatform != stdenv.targetPlatform); in @@ -29,7 +30,7 @@ in lib = lib'; # Backwards compat before `lib` was factored out. - inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget; + inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget toRustTargetForUseInEnvVars envVars; # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions to build @@ -72,7 +73,7 @@ in patches = rustcPatches; # Use boot package set to break cycle - inherit (bootstrapRustPackages) cargo rustc; + inherit (bootstrapRustPackages) cargo rustc rustfmt; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh b/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh index dd2c116a34..ebf8d900bb 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh @@ -19,7 +19,6 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu - mips64el-unknown-linux-gnuabi64 ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 0cf5020962..1758abb6be 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc +, darwin, cargo, cmake, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -24,13 +24,15 @@ let inherit (lib) optionals optional optionalString concatStringsSep; inherit (darwin.apple_sdk.frameworks) Security; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "${targetPackages.stdenv.cc.targetPrefix}rustc"; inherit version; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; inherit sha256; + # See https://nixos.org/manual/nixpkgs/stable/#using-git-bisect-on-the-rust-compiler + passthru.isReleaseTarball = true; }; __darwinAllowLocalNetworking = true; @@ -51,7 +53,7 @@ in stdenv.mkDerivation rec { # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE} # environment variables. # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53 - "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.buildPlatform)}" = + "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] stdenv.buildPlatform.rust.rustcTarget}" = "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config"; NIX_LDFLAGS = toString ( @@ -66,39 +68,48 @@ in stdenv.mkDerivation rec { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; - setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; - setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; - ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}"; + ccPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}"; + cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}"; + setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}"; + setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}"; + setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}"; + ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; + cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; in [ "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" + ] ++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [ + # release tarballs vendor the rustfmt source; when + # git-bisect'ing from upstream's git repo we must prevent + # attempts to download the missing source tarball + "--set=build.rustfmt=${rustfmt}/bin/rustfmt" + ] ++ [ "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" - "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" + "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. "--target=${concatStringsSep "," ([ - (rust.toRustTargetSpec stdenv.targetPlatform) + stdenv.targetPlatform.rust.rustcTargetSpec # (build!=target): When cross-building a compiler we need to add # the build platform as well so rustc can compile build.rs # scripts. ] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.buildPlatform) + stdenv.buildPlatform.rust.rustcTargetSpec # (host!=target): When building a cross-targeting compiler we # need to add the host platform as well so rustc can compile # build.rs scripts. ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.hostPlatform) + stdenv.hostPlatform.rust.rustcTargetSpec ])}" "${setBuild}.cc=${ccForBuild}" @@ -129,7 +140,7 @@ in stdenv.mkDerivation rec { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [ + ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 @@ -141,12 +152,12 @@ in stdenv.mkDerivation rec { buildPhase = if fastCross then " runHook preBuild - mkdir -p build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-{std,rustc}/${rust.toRustTargetSpec stdenv.hostPlatform}/release/ - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/libstd-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/libstd.so - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/librustc_driver-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc.so - ln -s ${rustc}/bin/rustc build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/rustc-main - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.libstd.stamp - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.librustc.stamp + mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp python ./x.py --keep-stage=0 --stage=1 build library/std runHook postBuild @@ -159,8 +170,8 @@ in stdenv.mkDerivation rec { mkdir -v $out/bin $doc $man makeWrapper ${rustc}/bin/rustc $out/bin/rustc --add-flags "--sysroot $out" makeWrapper ${rustc}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" - ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${rust.toRustTargetSpec stdenv.hostPlatform} $out/lib/rustlib/ - echo rust-std-${rust.toRustTargetSpec stdenv.hostPlatform} >> $out/lib/rustlib/components + ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man @@ -203,6 +214,14 @@ in stdenv.mkDerivation rec { # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 + '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' + mkdir .cargo + cat > .cargo/config <<\EOF + [source.crates-io] + replace-with = "vendored-sources" + [source.vendored-sources] + directory = "vendor" + EOF ''; # rustc unfortunately needs cmake to compile llvm-rt but doesn't @@ -263,7 +282,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members; + maintainers = with maintainers; [ havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = [ # Platforms with host tools from @@ -272,13 +291,12 @@ in stdenv.mkDerivation rec { "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "mipsel-linux" "mips64el-linux" - "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" - "s390x-linux" "x86_64-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" "i686-windows" "x86_64-windows" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix index b53be1633d..40f6237dbe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustfmt.nix @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; + mainProgram = "rustfmt"; maintainers = with maintainers; [ globin basvandijk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix index a4de7b8b87..8156c48256 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" +{ lib, stdenv, callPackage, clisp, fetchurl, fetchpatch, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -26,8 +25,48 @@ let sha256 = "sha256-fSiakSMgIgKL8BKJAMMr8A5MVDDDLyivBZTIpZKphlQ="; }; }; + # Collection of pre-built SBCL binaries for platforms that need them for + # bootstrapping. Ideally these are to be avoided. If CLISP (or any other + # non-binary-distributed Lisp) can run on any of these systems, that entry + # should be removed from this list. + bootstrapBinaries = rec { + # This build segfaults using CLISP. + x86_64-darwin = { + version = "2.2.9"; + system = "x86-64-darwin"; + sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; + }; + i686-linux = { + version = "1.2.7"; + system = "x86-linux"; + sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; + }; + armv7l-linux = { + version = "1.2.14"; + system = "armhf-linux"; + sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; + }; + armv6l-linux = armv7l-linux; + x86_64-freebsd = { + version = "1.2.7"; + system = "x86-64-freebsd"; + sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; + }; + x86_64-solaris = { + version = "1.2.7"; + system = "x86-64-solaris"; + sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; + }; + }; + sbclBootstrap = callPackage ./bootstrap.nix { + cfg = bootstrapBinaries.${stdenv.hostPlatform.system}; + }; + bootstrapLisp = + if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) + then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" + else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; -in with versionMap.${version}; +in stdenv.mkDerivation rec { pname = "sbcl"; @@ -35,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - inherit sha256; + inherit (versionMap.${version}) sha256; }; nativeBuildInputs = [ texinfo ]; @@ -108,7 +147,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ + sh make.sh --prefix=$out --xc-host="${bootstrapLisp}" ${ lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) @@ -142,5 +181,17 @@ stdenv.mkDerivation rec { } ''); - meta = sbclBootstrap.meta; + meta = with lib; { + description = "Lisp compiler"; + homepage = "https://sbcl.org"; + license = licenses.publicDomain; # and FreeBSD + maintainers = lib.teams.lisp.members; + platforms = attrNames bootstrapBinaries ++ [ + # These aren’t bootstrapped using the binary distribution but compiled + # using a separate (lisp) host + "x86_64-linux" + "aarch64-darwin" + "aarch64-linux" + ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix index 05634d0c83..e23557c5a6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/bootstrap.nix @@ -1,59 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper, cfg }: -let - options = rec { - aarch64-darwin = { - version = "2.1.2"; - system = "arm64-darwin"; - sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; - }; - x86_64-darwin = { - version = "2.2.9"; - system = "x86-64-darwin"; - sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; - }; - x86_64-linux = { - version = "1.3.16"; - system = "x86-64-linux"; - sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; - }; - i686-linux = { - version = "1.2.7"; - system = "x86-linux"; - sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; - }; - aarch64-linux = { - version = "1.3.16"; - system = "arm64-linux"; - sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; - }; - armv7l-linux = { - version = "1.2.14"; - system = "armhf-linux"; - sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; - }; - armv6l-linux = armv7l-linux; - x86_64-freebsd = { - version = "1.2.7"; - system = "x86-64-freebsd"; - sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; - }; - x86_64-solaris = { - version = "1.2.7"; - system = "x86-64-solaris"; - sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; - }; - }; - cfg = options.${stdenv.hostPlatform.system}; -in -assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { pname = "sbcl-bootstrap"; - version = cfg.version; + inherit (cfg) version; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/sbcl-${version}-${cfg.system}-binary.tar.bz2"; - sha256 = cfg.sha256; + inherit (cfg) sha256; }; nativeBuildInputs = [ makeWrapper ]; @@ -73,12 +26,4 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; - - meta = with lib; { - description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = licenses.publicDomain; # and FreeBSD - maintainers = lib.teams.lisp.members; - platforms = attrNames options; - }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix deleted file mode 100644 index 5e5a0bee51..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null -, excludePorts ? [] }: - -let - # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 - excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]); -in - -stdenv.mkDerivation rec { - pname = "sdcc"; - version = "4.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; - }; - - enableParallelBuilding = true; - - buildInputs = [ boost gputils texinfo zlib ]; - - nativeBuildInputs = [ autoconf bison flex ]; - - configureFlags = map (f: "--disable-${f}-port") excludedPorts; - - preConfigure = '' - if test -n "''${dontStrip-}"; then - export STRIP=none - fi - ''; - - meta = with lib; { - description = "Small Device C Compiler"; - longDescription = '' - SDCC is a retargettable, optimizing ANSI - C compiler suite that targets - the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim - (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based - (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, - Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and - PIC18 targets. It can be retargeted for other microprocessors. - ''; - homepage = "https://sdcc.sourceforge.net/"; - license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; - maintainers = with maintainers; [ bjornfor yorickvp ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix index 6a06213e95..68ceb1a7d7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; + sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; }; patches = [ @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index c5e8ee5a62..f19501a6d7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -13,13 +13,17 @@ let llvmMajor = lib.versions.major llvm.version; isROCm = lib.hasPrefix "rocm" llvm.pname; - # ROCm will always be at the latest version + # ROCm, if actively updated will always be at the latest version branch = - if llvmMajor == "16" then rec { + if llvmMajor == "17" || isROCm then rec { + version = "17.0.0"; + rev = "v${version}"; + hash = "sha256-Rzm5Py9IPFtS9G7kME+uSwZ/0gPGW6MlL35ZWk4LfHM="; + } else if llvmMajor == "16" then rec { version = "16.0.0"; rev = "v${version}"; hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; - } else if llvmMajor == "15" || isROCm then rec { + } else if llvmMajor == "15" then rec { version = "15.0.0"; rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; @@ -51,10 +55,10 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config cmake spirv-tools ] + nativeBuildInputs = [ pkg-config cmake ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers ] + buildInputs = [ spirv-headers spirv-tools ] ++ lib.optionals (!isROCm) [ llvm ]; nativeCheckInputs = [ lit ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/squeak/default.nix b/third_party/nixpkgs/pkgs/development/compilers/squeak/default.nix index 818ad22fae..79627eba7c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/squeak/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/squeak/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchzip , autoconf, automake, autoreconfHook, clang, dos2unix, file, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool -, libuuid, openssl, pango, xorg +, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libGL, libpulseaudio +, libtool, libuuid, openssl, pango, xorg , squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null , squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null , squeakVmVersion ? null @@ -88,6 +88,7 @@ in stdenv.mkDerivation { glib glibc gnugrep + libGL libpulseaudio libtool libuuid diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix index efb35bd74c..b0da48c68a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix @@ -5,6 +5,7 @@ { lib , stdenv +, fetchpatch , callPackage , cmake , ninja @@ -23,6 +24,15 @@ in stdenv.mkDerivation { inherit (sources) version; src = sources.swift-corelibs-foundation; + patches = [ + # from https://github.com/apple/swift-corelibs-foundation/pull/4811 + # fix build with glibc >=2.38 + (fetchpatch { + url = "https://github.com/apple/swift-corelibs-foundation/commit/47260803a108c6e0d639adcebeed3ac6a76e8bcd.patch"; + hash = "sha256-1JUSQW86IHKkBZqxvpk0P8zcSKntzOTNlMoGBfgeT4c="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja swift ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py index 79bf8aeca2..bb60d6903d 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 18, 19, 20) +feature_versions = (8, 11, 16, 17, 18, 19, 20, 21) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index fe0c5792a5..5122b6ed72 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -22,4 +22,7 @@ in jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix index af9202aa40..87a00a3739 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -23,4 +23,7 @@ in jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json index e4744a7996..00a0e72997 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json +++ b/third_party/nixpkgs/pkgs/development/compilers/temurin-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "d5e2235d3707526f7c9ba3f0dc194e60d5dec33eceff2a2dcf9d874464cc0e9e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -26,10 +26,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c2a571a56e5bd3f30956b17b048880078c7801ed9e8754af6d1e38b9176059a9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -57,19 +57,35 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "68d0f0c468064e944e304cab64fc162335d4d9bc0ddab7e6ff7a395a0bceda74", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "6cf2d4925c387c4cdc0bf2e71de3690527141b5244695d0b3109ce83a8512235", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" } } }, @@ -78,20 +94,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "6a3d1759bdf91433411d37ca2ad1505a7f214c1401797834e9884165c2457368", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "70e5d108f51ae7c7b2435d063652df058723e303a18b4f72f17f75c5320052d3", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -119,19 +135,35 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "0e95fa3719f7989908dfcc77ef701c6fe1111c4195ee3c6858faab5fd37525c5", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "7040d865493f13204194c5a1add63e22516b1fa4481264baa6a5b2614a275a0e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" } } } @@ -140,36 +172,36 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "8c3146035b99c55ab26a2982f4b9abd2bf600582361cf9c732539f713d271faf", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "armv6l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "armv7l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "262ff98d6d88a7c7cc522cb4ec4129491a0eb04f5b17dcca0da57cfcdcf3830d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "60ea98daa09834fdd3162ca91ddc8d92a155ab3121204f6f643176ee0c2d0d5e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -208,36 +240,36 @@ }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "armv6l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "armv7l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -311,9 +343,9 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "b16c0271899de1f0e277dc0398bfff11b54511765f104fa938929ac484dc926d", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jdk", "powerpc64le": { @@ -325,113 +357,135 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "12", + "sha256": "9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "aarch64": { - "build": "7", - "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "70636c2fa4927913e9e869d471607a99d3a521c1fa3f3687b889c2acba67c493", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "armv6l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "armv7l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "9d9813d2840360ffdbc449c45e71124e8170c31a3b6cce9151fbb31352064406", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "15d091e22aa0cad12a241acff8c1634e7228b9740f8d19634250aa6fe0c19a33", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "8dc527e5c5da62f80ad3b6a2cd7b1789f745b1d90d5e83faba45f7a1d0b6cab8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "armv6l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "armv7l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "286e37ce06316185377eea847d2aa9f1523b9f1428684e59e772f2f6055e89b9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "156861bb901ef18759e05f6f008595220c7d1318a46758531b957b0c950ef2c3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "armv6l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "armv7l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -505,9 +559,9 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "4b04fcfabf833403cc74dd19105a387563f9ff0fef975c4101f3d74c53eb7745", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jre", "powerpc64le": { @@ -519,43 +573,65 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "daacf24c15bf7f38a957a98a312911a36ba7f7d97004920a7875791f20e8e1ed", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "powerpc64le": { + "build": "12", + "sha256": "05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "aarch64": { - "build": "7", - "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "37b997f12cd572da979283fccafec9ba903041a209605b50fcb46cc34f1a9917", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "armv6l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "armv7l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "0ecb0aeb54fb9d3c9e1a7ea411490127e8e298d93219fafc4dd6051a5b74671f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "91d31027da0d985be3549714389593d9e0da3da5057d87e3831c7c538b9a2a0f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } } @@ -564,18 +640,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "3be236f2cf9612cd38cd6b7cfa4b8eef642a88beab0cd37c6ccf1766d755b4cc", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "39e30e333d01f70765f0fdc57332bc2c5ae101392bcc315ef06f472d80d8e2d7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -590,18 +666,18 @@ }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "823777266415347983bbd87ccd8136537242ff27e62f307b7e8521494c665f0d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c69b37ea72136df49ce54972408803584b49b2c91b0fbc876d7125e963c7db37", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -639,61 +715,77 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "0d29257c9bcb5f20f5c4643ef9437f36b10376863eddaf6248d09093796c6b30", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "35f3cbc86d7ff0a01facefd741d5cfb675867e0a5ec137f62ba071d2511a45c9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "d152f5b2ed8473ee0eb29c7ee134958d75ea86c8ccbafb5ee04a5545dd76108f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "bcac3231195a95cac397a35410bfa3f0945ec03e5194e7b0c1d0e785a48f8b76", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "43d29affe994a09de31bf2fb6f8ab6d6792ba4267b9a2feacaa1f6e042481b9b", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "89831d03b7cd9922bd178f1a9c8544a36c54d52295366db4e6628454b01acaef", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "ba214f2217dc134e94432085cff4fc5a97e964ffc211d343725fd535f3cd98a0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -731,27 +823,43 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "ee8be9190324285ebc7e9bd47b948eec349221845fa48f1e673e5a1489708750", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "81b475ab029ab224b2c711ccdfa9c25e0300539faad342a4ceefd33772fb38b4", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "b59a5f8b7f8fd1502df274e8ba58215b06934c8261413cb40e344f6ad81e7f1f", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "565d62faac325c098670705fb26a5cc3d4af0a25e86444ddd643f779ad2a3417", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "bc384961d3a866198b1055a80fdff7fb6946aa6823b3ce624cc8c3125a26bed5", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "c21a2648ec21bc4701acfb6b7a1fd90aca001db1efb8454e2980d4c8dcd9e310", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "f1f15920ed299e10c789aef6274d88d45eb21b72f9a7b0d246a352107e344e6a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_mac_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } } diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/third_party/nixpkgs/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch index 7e4c8eded6..2c0bfba4f3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -1,55 +1,25 @@ -From 301b2d82cdbfaffe4dfba1d2cfed068a4115f730 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Sat, 30 Apr 2022 16:18:31 +0300 -Subject: [PATCH 2/3] Add clang header path - - -diff --git a/builder/builtins.go b/builder/builtins.go -index 121398fa..a589988b 100644 ---- a/builder/builtins.go -+++ b/builder/builtins.go -@@ -170,7 +170,7 @@ var aeabiBuiltins = []string{ - var CompilerRT = Library{ - name: "compiler-rt", - cflags: func(target, headerPath string) []string { -- return []string{"-Werror", "-Wall", "-std=c11", "-nostdlibinc"} -+ return []string{"-Werror", "-Wall", "-std=c11", "-isystem", "@clang_include@"} - }, - sourceDir: func() string { - llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins") -diff --git a/builder/picolibc.go b/builder/picolibc.go -index d0786ee3..9a5cf9b0 100644 ---- a/builder/picolibc.go -+++ b/builder/picolibc.go -@@ -30,7 +30,7 @@ var Picolibc = Library{ - "-D_IEEE_LIBM", - "-D__OBSOLETE_MATH_FLOAT=1", // use old math code that doesn't expect a FPU - "-D__OBSOLETE_MATH_DOUBLE=0", -- "-nostdlibinc", -+ "-isystem", "@clang_include@", - "-isystem", newlibDir + "/libc/include", - "-I" + newlibDir + "/libc/tinystdio", - "-I" + newlibDir + "/libm/common", +diff --git a/builder/library.go b/builder/library.go +index 6517355b..b8de1894 100644 +--- a/builder/library.go ++++ b/builder/library.go +@@ -142,7 +142,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ + // Note: -fdebug-prefix-map is necessary to make the output archive + // reproducible. Otherwise the temporary directory is stored in the archive + // itself, which varies each run. +- args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir) ++ args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir, "-isystem", "@clang_include@") + cpu := config.CPU() + if cpu != "" { + // X86 has deprecated the -mcpu flag, so we need to use -march instead. diff --git a/compileopts/config.go b/compileopts/config.go -index a006b673..3a105b49 100644 +index 39fc4f2a..8711b5a8 100644 --- a/compileopts/config.go +++ b/compileopts/config.go -@@ -279,6 +279,7 @@ func (c *Config) CFlags() []string { - path, _ := c.LibcPath("picolibc") - cflags = append(cflags, - "--sysroot="+path, -+ "-isystem", "@clang_include@", - "-isystem", filepath.Join(path, "include"), // necessary for Xtensa - "-isystem", filepath.Join(picolibcDir, "include"), - "-isystem", filepath.Join(picolibcDir, "tinystdio"), -@@ -288,7 +289,6 @@ func (c *Config) CFlags() []string { - path, _ := c.LibcPath("musl") - arch := MuslArchitecture(c.Triple()) - cflags = append(cflags, -- "-nostdlibinc", - "-isystem", filepath.Join(path, "include"), - "-isystem", filepath.Join(root, "lib", "musl", "arch", arch), - "-isystem", filepath.Join(root, "lib", "musl", "include"), --- -2.37.2 - +@@ -264,6 +264,7 @@ func (c *Config) CFlags() []string { + for _, flag := range c.Target.CFlags { + cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT"))) + } ++ cflags = append([]string{"-isystem", "@clang_include@"}, cflags...) + switch c.Target.Libc { + case "darwin-libSystem": + root := goenv.Get("TINYGOROOT") diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch b/third_party/nixpkgs/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch new file mode 100644 index 0000000000..924533a491 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch @@ -0,0 +1,12 @@ +diff --git a/compileopts/config.go b/compileopts/config.go +index 39fc4f2a..fb5d4575 100644 +--- a/compileopts/config.go ++++ b/compileopts/config.go +@@ -269,6 +269,7 @@ func (c *Config) CFlags() []string { + root := goenv.Get("TINYGOROOT") + cflags = append(cflags, + "--sysroot="+filepath.Join(root, "lib/macos-minimal-sdk/src"), ++ "-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"), // necessary for Nix + ) + case "picolibc": + root := goenv.Get("TINYGOROOT") diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix index 6e59699ea9..5901ab7f96 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix @@ -13,7 +13,6 @@ , libxml2 , xar , wasi-libc -, avrgcc , binaryen , avrdude , gdb @@ -33,37 +32,48 @@ let ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor} ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor} ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor} - ln -s ${gdb}/bin/gdb $out/gdb-multiarch + # GDB upstream does not support ARM darwin + ${lib.optionalString (!(stdenv.isDarwin && stdenv.isAarch64)) "ln -s ${gdb}/bin/gdb $out/gdb-multiarch" } ''; in buildGoModule rec { pname = "tinygo"; - version = "0.26.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "rI8CADPWKdNvfknEsrpp2pCeZobf9fAp0GDIWjupzZA="; + sha256 = "sha256-hOccfMKuvTKYKDRcEgTJ8k/c/H+qNDpvotWIqk6p2u8="; fetchSubmodules = true; }; - vendorHash = "sha256-ihQd/RAjAQhgQZHbNiWmAD0eOo1MvqAR/OwIOUWtdAM="; + vendorHash = "sha256-2q3N6QhfRmwbs4CTWrFWr1wyhf2jPS2ECAn/wrrpXdM="; patches = [ ./0001-Makefile.patch + # clang.cc does not have any paths in the include path. + # For TinyGo, we want to have no include paths, _except_ for the built-in + # Clang header files (things like stdint.h). That's why we use -nostdlibinc. + # So to make Clang work like we want, we will have to manually add this one + # include path. + # We can't use a regular clang command (something like + # llvmPackages.clangUseLLVM) because there are various bugs, see: + # https://github.com/NixOS/nixpkgs/issues/259397 + # https://github.com/NixOS/nixpkgs/issues/259386 (substituteAll { src = ./0002-Add-clang-header-path.patch; - clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include"; + clang_include = "${clang.cc.lib}/lib/clang/${llvmMajor}/include"; }) #TODO(muscaln): Find a better way to fix build ID on darwin ./0003-Use-out-path-as-build-id-on-darwin.patch + ./0004-fix-darwin-build.patch ]; - nativeCheckInputs = [ avrgcc binaryen ]; + nativeCheckInputs = [ binaryen ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; @@ -107,10 +117,9 @@ buildGoModule rec { substituteInPlace builder/buildid.go \ --replace "OUT_PATH" "$out" - # TODO: Fix mingw and darwin - # Disable windows and darwin cross-compile tests + # TODO: Fix mingw + # Disable windows cross-compile tests sed -i "/GOOS=windows/d" Makefile - sed -i "/GOOS=darwin/d" Makefile '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile \ --replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo" @@ -121,30 +130,18 @@ buildGoModule rec { export HOME=$TMPDIR ''; - postBuild = let - tinygoForBuild = if (stdenv.buildPlatform.canExecute stdenv.hostPlatform) - then "build/tinygo" - else "${buildPackages.tinygo}/bin/tinygo"; - in '' + postBuild = '' # Move binary mkdir -p build mv $GOPATH/bin/tinygo build/tinygo - make gen-device + make gen-device -j $NIX_BUILD_CORES export TINYGOROOT=$(pwd) - finalRoot=$out/share/tinygo - - for target in thumbv6m-unknown-unknown-eabi-cortex-m0 thumbv6m-unknown-unknown-eabi-cortex-m0plus thumbv7em-unknown-unknown-eabi-cortex-m4; do - mkdir -p $finalRoot/pkg/$target - for lib in compiler-rt picolibc; do - ${tinygoForBuild} build-library -target=''${target#*eabi-} -o $finalRoot/pkg/$target/$lib $lib - done - done ''; checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) '' - make ''${tinygoTests[@]} XTENSA=0 ${lib.optionalString stdenv.isDarwin "AVR=0"} + make ''${tinygoTests[@]} XTENSA=0 ''; installPhase = '' @@ -153,7 +150,7 @@ buildGoModule rec { make build/release wrapProgram $out/bin/tinygo \ - --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:${bootstrapTools} + --prefix PATH : ${lib.makeBinPath [ go avrdude openocd binaryen ]}:${bootstrapTools} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix index cae9a17ccc..9fe0e42cb1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/uasm/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://www.terraspace.co.uk/uasm.html"; + homepage = "https://www.terraspace.co.uk/uasm.html"; description = "A free MASM-compatible assembler based on JWasm"; platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh index 8252143e99..33acdf1dae 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/setup-hook.sh @@ -7,6 +7,15 @@ make_vala_find_vapi_files() { addEnvHooks "$hostOffset" make_vala_find_vapi_files +disable_incompabile_pointer_conversion_warning() { + # Work around incompatible function pointer conversion errors with clang 16 + # by setting ``-Wno-incompatible-function-pointer-types` in an env hook. + # See https://gitlab.gnome.org/GNOME/vala/-/issues/1413. + NIX_CFLAGS_COMPILE+=" -Wno-incompatible-function-pointer-types" +} + +addEnvHooks "$hostOffset" disable_incompabile_pointer_conversion_warning + _multioutMoveVapiDirs() { moveToOutput share/vala/vapi "${!outputDev}" moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}" diff --git a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix index bfc90c76fe..2a8ea72b9f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vlang/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "weekly.2023.19"; + version = "weekly.2023.44"; ptraceSubstitution = '' #include #include @@ -9,12 +9,12 @@ let # Required for bootstrap. vc = stdenv.mkDerivation { pname = "v.c"; - version = "unstable-2023-05-14"; + version = "unstable-2023-10-30"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "f7c2b5f2a0738d0d236161c9de9f31dd0280ac86"; - sha256 = "sha256-xU3TvyNgc0o4RCsHtoC6cZTNaue2yuAiolEOvP37TKA="; + rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b"; + hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak="; }; # patch the ptrace reference for darwin @@ -30,8 +30,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "6e970bd0a7459ad7798588f1ace4aa46c5e789a2"; - hash = "sha256-hFf7c8ZNMU1j7fgmDakuO7tBVr12Wq0dgQddJnkMajE="; + rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca"; + hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -45,7 +45,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - sha256 = "sha256-fHn1z2q3LmSycCOa1ii4DoHvbEW4uJt3Psq3/VuZNVQ="; + hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -97,6 +97,7 @@ stdenv.mkDerivation { $out/lib/v -v $out/lib/cmd/tools/vdoc $out/lib/v -v $out/lib/cmd/tools/vast $out/lib/v -v $out/lib/cmd/tools/vvet + $out/lib/v -v $out/lib/cmd/tools/vcreate runHook postInstall ''; @@ -110,7 +111,7 @@ stdenv.mkDerivation { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; + maintainers = with maintainers; [ Madouura delta231 ]; mainProgram = "v"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix index ad35d95bff..1a621f54ac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix @@ -7,6 +7,7 @@ , asttokens , pycryptodome , importlib-metadata +, cbor2 , recommonmark , semantic-version , sphinx @@ -28,14 +29,14 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.9"; + version = "0.3.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4UBSH4qRBgsy+VO9XzosWedM65R1lTo9ml2C95T9OAA="; + hash = "sha256-jcH1AcqrQX+wzpxoppRFh/AUfsfMfTiJzzpFwZRm5Ik="; }; nativeBuildInputs = [ @@ -55,6 +56,7 @@ buildPythonPackage rec { pycryptodome semantic-version importlib-metadata + cbor2 # docs recommonmark diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 0ea755f734..6d086d57b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -69,15 +69,15 @@ let } // (yosys-symbiflow); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${pname}-${version}"; - hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; + rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; }; enableParallelBuilding = true; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." exit 1 fi ''; @@ -150,6 +150,6 @@ in stdenv.mkDerivation rec { homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ shell thoughtpolice emily ]; + maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 481d247590..2afa372b6e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -7,20 +7,16 @@ , yosys , zlib , yosys-symbiflow -, uhdm -, capnproto -, surelog -, antlr4 , pkg-config }: let - version = "1.20230808"; + version = "1.20230906"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "yosys-f4pga-plugins"; rev = "v${version}"; - hash = "sha256-wksAHLgLjVZE4Vk2QVcJN1mnQ9mxWCZHk55oO99cVJ0="; + hash = "sha256-XIn5wFw8i2njDN0Arua5BdZ0u1q6a/aJAs48YICehsc="; }; # Supported symbiflow plugins. @@ -37,7 +33,6 @@ # "ql-qlf" "sdc" "xdc" - "systemverilog" ]; static_gtest = gtest.overrideAttrs (old: { @@ -56,10 +51,6 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { yosys readline zlib - uhdm - surelog - capnproto - antlr4.runtime.cpp ]; # xdc has an incorrect path to a test which has yet to be patched diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix new file mode 100644 index 0000000000..cc4ce429b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, antlr4 +, capnproto +, readline +, surelog +, uhdm +, yosys +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "yosys-synlig"; + plugin = "synlig"; + + # The module has automatic regular releases, with date + short git hash + GIT_VERSION = "2023-10-26-f0252f6"; + + # Derive our package version from GIT_VERSION, remove hash, just keep date. + version = builtins.concatStringsSep "-" ( + lib.take 3 (builtins.splitVersion finalAttrs.GIT_VERSION)); + + src = fetchFromGitHub { + owner = "chipsalliance"; + repo = "synlig"; + rev = "${finalAttrs.GIT_VERSION}"; + hash = "sha256-BGZQbUcIImpz3SjFvMq3Pr1lseNLZnsMvpHy0IsICe4="; + fetchSubmodules = false; # we use all dependencies from nix + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + antlr4.runtime.cpp + capnproto + readline + surelog + uhdm + yosys + ]; + + buildPhase = '' + runHook preBuild + + # Remove assumptions that submodules are available. + rm -f third_party/Build.*.mk + + # Create a stub makefile include that delegates the parameter-gathering + # to yosys-config + cat > third_party/Build.yosys.mk << "EOF" + t := yosys + ts := ''$(call GetTargetStructName,''${t}) + + ''${ts}.src_dir := ''$(shell yosys-config --datdir/include) + ''${ts}.mod_dir := ''${TOP_DIR}third_party/yosys_mod/ + EOF + + make -j $NIX_BUILD_CORES build@systemverilog-plugin \ + LDFLAGS="''$(yosys-config --ldflags --ldlibs)" + runHook postBuild + ''; + + # Check that the plugin can be loaded successfully and parse simple file. + doCheck = true; + checkPhase = '' + runHook preCheck + echo "module litmustest(); endmodule;" > litmustest.sv + yosys -p "plugin -i build/release/systemverilog-plugin/systemverilog.so;\ + read_systemverilog litmustest.sv" + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/yosys/plugins + cp ./build/release/systemverilog-plugin/systemverilog.so \ + $out/share/yosys/plugins/systemverilog.so + runHook postInstall + ''; + + meta = with lib; { + description = "SystemVerilog support plugin for Yosys"; + homepage = "https://github.com/chipsalliance/synlig"; + license = licenses.asl20; + maintainers = with maintainers; [ hzeller ]; + platforms = platforms.all; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix index 72d88dec6f..150148cfe0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix @@ -23,11 +23,12 @@ mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.15" "8.16"; out = "2.11.1"; } + { case = range "8.15" "8.17"; out = "2.12"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw="; release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0="; release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w="; release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; @@ -39,7 +40,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix index fc40fc9789..7ca44f39e0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-lsp/default.nix @@ -7,15 +7,15 @@ mkCoqDerivation rec { useDune = true; - release."0.1.7+8.16".sha256 = "sha256-ZBxwrnnCmT5q4C7ocQ+M+aSJQNnEjeN2HFw4bzPozYs="; - release."0.1.7+8.17".sha256 = "sha256-f671wzGQannGjRbmBRHFKXz24BTPX7oVeHUxnv4Vd6Y="; - release."0.1.7+8.18".sha256 = "sha256-J+bRIzjdIPRu7DvAGVBKB43O3UJliTo8XQ87OTzsFyc="; + release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; + release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; + release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isEq "8.16"; out = "0.1.7+8.16"; } - { case = isEq "8.17"; out = "0.1.7+8.17"; } - { case = isEq "8.18"; out = "0.1.7+8.18"; } + { case = isEq "8.16"; out = "0.1.8+8.16"; } + { case = isEq "8.17"; out = "0.1.8+8.17"; } + { case = isEq "8.18"; out = "0.1.8+8.18"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index 0f1f84dcea..a6ef9e0b8a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -8,6 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (isGe "1.15.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } @@ -16,6 +17,7 @@ { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM"; release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU="; release."1.1.1".sha256 = "sha256-ExAdC3WuArNxS+Sa1r4x5aT7ylbCvP/BZXfkdQNAvZ8="; release."1.1.0".sha256 = "1vyhfna5frkkq2fl1fkg2mwzpg09k3sbzxxpyp14fjay81xajrxr"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix index 7a745a3df3..a33fd8b87e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } + { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } ] null; @@ -13,6 +14,7 @@ mkCoqDerivation rec { "8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi"; "8.13.0".sha256 = "1wzr7mdsnf1rq7q0dvmv55vxzysy85b00ahwbs868bl7m8fk8x5b"; "8.16.0".sha256 = "sha256-ZE/EEIndxHfo/9Me5NX4ZfcH0ZAQ4sRfZY7LRZfLXBQ="; + "8.18.0".sha256 = "sha256-ow3mfarZ1PvBGf5WLnI8LdF3E+8A6fN7cOcXHrZJLo0="; }; preConfigure = "patchShebangs ./configure.sh"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix index 38151f3726..9addbedb36 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix @@ -7,12 +7,14 @@ mkCoqDerivation { owner = "arthuraa"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.18"; out = "0.1.1"; } + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ + { cases = [(range "8.17" "8.18") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.11" "8.18") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; + release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index 7240ffdf0d..bce21f0e6c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -9,6 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ + { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } @@ -16,6 +17,7 @@ releaseRev = v: "v${v}"; + release."0.4.0".sha256 = "sha256-hItFO2XY2LTPSofPTKt3AfOEfiLliaYdzUXgDv4ea9Y="; release."0.3.1".sha256 = "sha256-KcuG/11Yq5ACem4FyVnQqHKvy3tNK7hd0ir2SJzzMN0="; release."0.3.0".sha256 = "sha256:14rm0726f1732ldds495qavg26gsn30w6dfdn36xb12g5kzavp38"; release."0.2.2".sha256 = "sha256:1clzza73gccy6p6l95n6gs0adkqd3h4wgl4qg5l0qm4q140grvm7"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 195b73dea6..53f98c1386 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -10,11 +10,13 @@ mkCoqDerivation { release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; + release."1.3.1".sha256 = "sha256-wBizm1hJXPYBu0tHFNScQHd22FebsJYoggT5OlhY/zM="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.0"; } - { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } + { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; } + { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; } + { cases = [ (isGe "8.11") (range "1.12" "1.18") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index 8406fcbd13..ffdb5193ae 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.17" coq.coq-version then "1.5.3" else null; + defaultVersion = if lib.versions.range "8.8" "8.18" coq.coq-version then "1.5.4" else null; + release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA="; release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s="; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index 2c9f4e4cf2..0d28bbc052 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup +{ lib, mkCoqDerivation, coq, mathcomp, mathcomp-finmap , fourcolor, hierarchy-builder, version ? null }: mkCoqDerivation { @@ -6,16 +6,20 @@ mkCoqDerivation { release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU="; + release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; + release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; releaseRev = v: "v${v}"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.16"; out = "0.9.1"; } - { case = range "8.12" "8.12"; out = "0.9"; } + defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ + { cases = [ (isGe "8.16") (range "2.0.0" "2.1.0") ]; out = "0.9.3"; } + { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } + { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } + { cases = [ (range "8.12" "8.13") (range "1.12.0" "1.14.0") ]; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup fourcolor hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp-finmap mathcomp.fingroup fourcolor hierarchy-builder ]; meta = with lib; { description = "Library of formalized graph theory results in Coq"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix index 1e31323f2e..9ac4f1c383 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -7,6 +7,7 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "4.9.0"; } { case = range "8.12" "8.17"; out = "4.8.0"; } { case = range "8.12" "8.16"; out = "4.6.0"; } { case = range "8.8" "8.16"; out = "4.5.2"; } @@ -14,6 +15,8 @@ mkCoqDerivation rec { { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.9.0".sha256 = "sha256-+5NppyQahcc1idGu/U3B+EIWuZz2L3/oY7dIJR6pitE="; + release."4.8.1".sha256 = "sha256-gknZ3bA90YY2AvwfFsP5iMhohwkQ8G96mH+4st2RPDc="; release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY="; release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ="; release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris-named-props/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris-named-props/default.nix new file mode 100644 index 0000000000..c4d1677504 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris-named-props/default.nix @@ -0,0 +1,17 @@ +{ lib, mkCoqDerivation, coq, version ? null, iris }: + +mkCoqDerivation rec { + pname = "iris-named-props"; + owner = "tchajed"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.16" "8.18"; out = "2023-08-14"; } + ] null; + release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; + release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc"; + propagatedBuildInputs = [ iris ]; + meta = { + description = "Named props for Iris"; + maintainers = with lib.maintainers; [ ineol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix index 81d9e21d8d..30d3cb8e51 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -6,11 +6,13 @@ mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.16" "8.18"; out = "4.1.0"; } { case = range "8.13" "8.17"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."4.1.0".sha256 = "sha256-nTZUeZOXiH7HsfGbMKDE7vGrNVCkbMaWxdMWUcTUNlo="; release."4.0.0".sha256 = "sha256-Jc9TmgGvkiDaz9IOoExyeryU1E+Q37GN24NIM397/Gg="; release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; @@ -29,6 +31,6 @@ mkCoqDerivation rec { meta = with lib; { description = "The Coq development of the Iris Project"; license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ineol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix index 6ae6956110..69d65d4b55 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { pname = "math-classes"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "8.18.0"; } { case = range "8.12" "8.17"; out = "8.17.0"; } { case = range "8.6" "8.16"; out = "8.15.0"; } ] null; @@ -12,6 +13,7 @@ mkCoqDerivation { release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; release."8.17.0".sha256 = "sha256-WklL8pgYTd0l4TGt7h7tWj1qcFcXvoPn25+XKF1pIKA="; + release."8.18.0".sha256 = "sha256-0WwPss8+Vr37zX616xeuS4TvtImtSbToFQkQostIjO8="; propagatedBuildInputs = [ bignums ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index bfdd3e9b60..a665ea0db3 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,12 +9,14 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls="; release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U="; + release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ]; 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 7e608fc61f..5cbfbdf0c6 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,8 @@ let repo = "analysis"; owner = "math-comp"; + release."0.6.6".sha256 = "sha256-tWtv6yeB5/vzwpKZINK9OQ0yQsvD8qu9zVSNHvLMX5Y="; + release."0.6.5".sha256 = "sha256-oJk9/Jl1SWra2aFAXRAVfX7ZUaDfajqdDksYaW8dv8E="; release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; release."0.6.0".sha256 = "sha256-0msICcIrK6jbOSiBu0gIVU3RHwoEEvB88CMQqW/06rg="; release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k="; @@ -24,7 +26,9 @@ let release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } + { cases = [ (isGe "8.17") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } + { cases = [ (isGe "8.14") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } + { cases = [ (isGe "8.14") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix index 6951169387..0b44790911 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.2"; } ] null; release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 234d25f909..fa6032a7f0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.17") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.18") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } 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 d0bb3fb54a..a649916892 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,7 +7,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ { cases = [ (isGe "8.17") (isGe "0.6.0") ]; out = "0.5.2"; } - { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.2") ]; out = "0.5.1"; } + { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index cbc6b8cc71..5746c9c638 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn"; @@ -19,6 +20,7 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (isGe "8.13") (isGe "1.13.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index bbb94420ab..bc4ed1f1f7 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.17.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.18.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 6adcb3af7d..f95f1d425e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,9 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ - { case = isGe "8.15"; out = "1.17.0"; } + { case = isGe "8.17"; out = "1.18.0"; } + { case = range "8.15" "8.18"; out = "1.17.0"; } + { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } @@ -34,7 +36,9 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; + "1.18.0".sha256 = "sha256-mJJ/zvM2WtmBZU3U4oid/zCMvDXei/93v5hwyyqwiiY="; "1.17.0".sha256 = "sha256-bUfoSTMiW/GzC1jKFay6DRqGzKPuLOSUsO6/wPSFwNg="; "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; "1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index b11283e8c5..d2bb38f868 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -8,9 +8,10 @@ owner = "math-comp"; inherit version; - defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } - { cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; } + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.16") (isGe "2.1.0") ]; out = "2.1.0"; } + { cases = [ (isGe "8.16") "2.0.0" ]; out = "2.0.0"; } + { cases = [ (isGe "8.15") (range "1.15.0" "1.18.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } @@ -20,6 +21,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; "1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU="; "1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY="; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix index 2fc26cbfef..fd5a37c677 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix @@ -1,20 +1,22 @@ -{ lib, mkCoqDerivation, coq, ssreflect, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: mkCoqDerivation { pname = "reglang"; releaseRev = v: "v${v}"; + release."1.2.0".sha256 = "sha256-gSqQ7D2HLwM4oYopTWkMFYfYXxsH/7VxI3AyrLwNf3o="; release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg="; release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.18"; out = "1.1.3"; } + defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.2.0"; } + { cases = [ (range "8.10" "8.18") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect ]; meta = with lib; { description = "Regular Language Representations in Coq"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 4eb721e2f1..370ab6e95f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -6,11 +6,13 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.16" "8.18"; out = "1.9.0"; } { case = range "8.13" "8.17"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.9.0".sha256 = "sha256-OXeB+XhdyzWMp5Karsz8obp0rTeMKrtG7fu/tmc9aeI="; release."1.8.0".sha256 = "sha256-VkIGBPHevHeHCo/Q759Q7y9WyhSF/4SMht4cOPuAXHU="; release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; @@ -27,6 +29,6 @@ mkCoqDerivation rec { meta = with lib; { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.ineol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/vcfloat/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/vcfloat/default.nix new file mode 100644 index 0000000000..5d1805c257 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/vcfloat/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, interval, compcert, flocq, bignums, version ? null }: + +with lib; mkCoqDerivation { + pname = "vcfloat"; + owner = "VeriNum"; + inherit version; + sourceRoot = "source/vcfloat"; + postPatch = '' + coq_makefile -o Makefile -f _CoqProject *.v + ''; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.16" "8.17"; out = "2.1.1"; } + ] null; + release."2.1.1".sha256 = "sha256-bd/XSQhyFUAnSm2bhZEZBWB6l4/Ptlm9JrWu6w9BOpw="; + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ interval compcert flocq bignums ]; + + meta = { + description = "A tool for Coq proofs about floating-point round-off error"; + maintainers = with maintainers; [ quinn-dougherty ]; + license = licenses.lgpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix b/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix index 556db9dc30..0f6bd8b6be 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/avrdude/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf , libftdi1, readline # documentation building is broken on darwin -, docSupport ? (!stdenv.isDarwin), texlive, texinfo, texi2html, unixtools }: +, docSupport ? (!stdenv.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: stdenv.mkDerivation rec { pname = "avrdude"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [ unixtools.more - texlive.combined.scheme-medium + texliveMedium texinfo texi2html ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix index fa3adc2fdf..093e0ef195 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/blisp/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; - maintainers = [ maintainers.fortuneteller2k ]; + maintainers = [ maintainers.bdd ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix index eb44e39c49..615000e6ee 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hidapi libftdi1 libusb1 - udev zlib + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform udev) [ + udev ]; meta = { - broken = stdenv.isDarwin; # error: Package ‘systemd-253.6’ is not available on the requested Darwin platform. description = "Universal utility for programming FPGAs"; homepage = "https://github.com/trabucayre/openFPGALoader"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ danderson ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix b/third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix index 71bc394987..62dea5d4c4 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nmrpflash"; - version = "0.9.20"; + version = "0.9.22"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; rev = "v${version}"; - sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM="; + sha256 = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index a9384d9b2b..e3e0f2672c 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.9.1"; + version = "6.9.2"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; + sha256 = "sha256-x3ZRMtTvFGz2/0gJMx4zOx9rSnrSkCEl3pj5raeyVHg="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix index 199845598a..4ff90b4f85 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.3"; + version = "0.3.4"; src = fetchCrate { inherit version pname; - hash = "sha256-pZufVz7m91MiD1TfzTzS6mL0eBxawcr43GAfvDJVqfU="; + hash = "sha256-rdBUEOyE4bHqPXZs3MxT/oivagKmJIVE/hI9mp0RY0k="; }; - cargoHash = "sha256-FAJZ/3eNhxPvIKXnE9lpejQuMi+yeBaA5ra9Peb2yIM="; + cargoHash = "sha256-mPz8m/9VGKSqXan/R1k1JTZ9a44CwCL6JefVyeeREeE="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix index 2b4fd46ea2..ac5d373955 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { hash = "sha256-vbm31EsOJiMeTs2tu5KPXckxPcAQbi3/PGJ5EHCC5VQ="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile libgcrypt pkg-config texinfo ]; buildInputs = [ guile diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix index 84d53b66e1..6afddd8d36 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo + autoreconfHook guile pkg-config texinfo ]; buildInputs = [ guile diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix index 91ffe90b04..952d2558d0 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, buildPackages , gnutls , guile , libtool @@ -17,13 +18,23 @@ stdenv.mkDerivation rec { hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; - buildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + nativeBuildInputs = [ gnutls guile libtool texinfo + pkg-config + ]; + + buildInputs = [ + gnutls + guile ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix index 81febc3171..cb34e22e62 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; + strictDeps = true; nativeBuildInputs = [ - pkg-config texinfo + guile pkg-config texinfo ]; buildInputs = [ guile diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix index 75e45b00d4..8c38432e3e 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-lib/default.nix @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { hash = "sha256-5O87hF8SGILHwM8E+BocuP02DG9ktWuGjeVUYhT5BN4="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix index edc6d73fff..fcb6e8c7a8 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { libffi ]; - env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + env = { + GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix index 430249f2c9..4b309f7fbe 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sqlite3/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM="; }; + strictDeps = true; nativeBuildInputs = [ autoreconfHook + guile pkg-config texinfo ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3fa9c44e7c..d329664ddd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-08-15"; + version = "unstable-2023-11-02"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/0365d9b77086d26ca5197fb48019cedbb0dce5d2.tar.gz"; - sha256 = "15aia2v05cmblabhb287cf1yqy4dlzw0g905h79fcvkgygnn2ib8"; + url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz"; + sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 69723242df..723b8e5efb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -20,11 +20,11 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible - process = self.process_1_6_17_0; + process = self.process_1_6_18_0; })); # cabal-install needs most recent versions of Cabal and Cabal-syntax, @@ -39,8 +39,8 @@ self: super: { # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_1_0; - Cabal-syntax = cself.Cabal-syntax_3_10_1_0; + Cabal = cself.Cabal_3_10_2_0; + Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -50,22 +50,22 @@ self: super: { # cabal-install, but we need to recompile process even if the correct # version is available to prevent inconsistent dependencies: # process depends on directory. - process = cself.process_1_6_17_0; + process = cself.process_1_6_18_0; # hspec < 2.10 depends on ghc (the library) directly which in turn # depends on directory, causing a dependency conflict which is practically # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_4; - hspec-discover = cself.hspec-discover_2_11_4; - hspec = cself.hspec_2_11_4; + hspec-core = cself.hspec-core_2_11_6; + hspec-discover = cself.hspec-discover_2_11_6; + hspec = cself.hspec_2_11_6; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_11* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_4 = dontCheck csuper.hspec-discover_2_11_4; + hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -96,10 +96,7 @@ self: super: { ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### - haskell-language-server = (lib.pipe super.haskell-language-server [ - dontCheck - (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … - ]).overrideScope (lself: lsuper: { + haskell-language-server = dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -110,7 +107,12 @@ self: super: { # otherwise we have different versions of ghc-paths # around which have the same abi-hash, which can lead to confusions and conflicts. ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; - }); + })); + + # hasn't bumped upper bounds + # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" + # https://github.com/ennocramer/floskell/issues/48 + floskell = dontCheck (doJailbreak super.floskell); # 2023-04-03: https://github.com/haskell/haskell-language-server/issues/3546#issuecomment-1494139751 # There will probably be a new revision soon. @@ -119,19 +121,6 @@ self: super: { # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); - # Test ldap server test/ldap.js is missing from sdist - # https://github.com/supki/ldap-client/issues/18 - ldap-client-og = dontCheck super.ldap-client-og; - - stylish-haskell = - # Too-strict upper bounds, no Hackage revisions - doJailbreak - # For -fghc-lib see cabal.project in haskell-language-server. - (if lib.versionAtLeast super.ghc.version "9.2" - then enableCabalFlag "ghc-lib" super.stylish-haskell - else super.stylish-haskell - ); - hiedb = lib.pipe super.hiedb @@ -153,6 +142,10 @@ self: super: { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + # Test ldap server test/ldap.js is missing from sdist + # https://github.com/supki/ldap-client/issues/18 + ldap-client-og = dontCheck super.ldap-client-og; + vector = overrideCabal (old: { # Too strict bounds on doctest which isn't used, but is part of the configuration jailbreak = true; @@ -161,16 +154,6 @@ self: super: { "vector-tests-O0" "vector-tests-O2" ]; - patches = [ - # Workaround almost guaranteed floating point errors in test suite with quickcheck 2.14.3 - # https://github.com/haskell/vector/issues/460 - (pkgs.fetchpatch { - name = "vector-quickcheck-2.14.3-float-workaround.patch"; - url = "https://github.com/haskell/vector/commit/df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c.patch"; - sha256 = "040wg8mqlkdnrl5axy9wk0mlpn8rpc4vc4afpxignj9i7yc4pfjj"; - stripLen = 1; - }) - ]; }) super.vector; # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3 @@ -201,11 +184,6 @@ self: super: { }) ] super.aeson); - # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6 - aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: { - th-abstraction = hfinal.th-abstraction_0_5_0_0; - }); - # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; @@ -214,9 +192,10 @@ self: super: { aeson-better-errors = doJailbreak super.aeson-better-errors; # 2023-08-09: Jailbreak because of vector < 0.13 - monad-bayes = doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_4; - }); + # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 + monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override { + hspec = self.hspec_2_11_6; + })); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 # https://github.com/haskell/statistics/issues/205 @@ -316,12 +295,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - # - # The patch can be removed once the commit being pulled is in a release. - patat = appendPatch (fetchpatch { - url = "https://github.com/jaspervdj/patat/pull/143/commits/cb5d5b6439204b5bd52939e42a11518ac81139fe.patch"; - sha256 = "sha256-EPiyxziPtn2fAExKknI2uKUGahWCFnv7K8bpVkAgezQ="; - }) (super.patat.override { pandoc = self.pandoc_3_1_8; }); + patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -352,7 +326,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-+buXiG9auq46+reMrs2rBWoxHgPkHmP8BY5BugooU+Q="; + sha256 = "14x7avdvf0fjqncwxydlrv32lbyfiqrm346nvypzg27gq46fvkcg"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -664,7 +638,6 @@ self: super: { saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server - sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; shake-language-c = dontCheck super.shake-language-c; @@ -890,10 +863,6 @@ self: super: { ''; }) super.ghc-mod; - # 2022-03-20: descriptive is unmaintained since 2018 and archived on github.com - # It does not support aeson 2.0 - descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; }; - # Apply compatibility patches until a new release arrives # https://github.com/phadej/spdx/issues/33 spdx = appendPatches [ @@ -1193,39 +1162,33 @@ self: super: { jailbreak = assert drv.version == "1.0.9" && drv.revision == "1"; true; }) super.dhall-nixpkgs); + crypton-connection = super.crypton-connection.override { + # requires tls >= 1.7 + tls = self.tls_1_9_0; + }; + stack = lib.pipe super.stack [ (self.generateOptparseApplicativeCompletions [ "stack" ]) - # Seems to be an unnecessarily strict dep on ansi-terminal - doJailbreak - - # The below patch has unix line endings, but the actual file - # has CRLF line endings. The following override changes the - # file to unix line endings before applying the patch. - (overrideCabal (oldAttrs: { - prePatch = oldAttrs.prePatch or "" + '' - "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" src/main/BuildInfo.hs - ''; + # stack-2.13.1 requires a bunch of the latest packages. + (drv: drv.overrideScope (hfinal: hprev: { + ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 + crypton = hprev.crypton_0_33; # needs crypton >= 0.33 + hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal + hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 + http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 + http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network + optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 + pantry = dontCheck hprev.pantry_0_9_2; # needs pantry >= 0.9.2, tests access network + syb = dontCheck hprev.syb; # cyclic dependencies + tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 + temporary = dontCheck hprev.temporary; # cyclic dependencies })) - # stack-2.11.1 has a bug when building without git. - # https://github.com/commercialhaskell/stack/pull/6127 - (appendPatch - (fetchpatch { - name = "stack-fix-building-without-git.patch"; - url = "https://github.com/commercialhaskell/stack/pull/6127/commits/086f93933d547736a7007fc4110f7816ef21f691.patch"; - hash = "sha256-1nwzMoumWceVu8RNnH2mmSxYT24G1FAnFRJvUMeD3po="; - includes = [ "src/main/BuildInfo.hs" ]; - }) - ) ]; - # Too strict version bound on hashable-time. - # Tests require newer package version. - aeson_1_5_6_0 = dontCheck (doJailbreak super.aeson_1_5_6_0); - # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; @@ -1415,7 +1378,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); # Test suite requires database @@ -1460,13 +1423,20 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # 2022-09-20: We have overridden lsp to not be the stackage version. - # dhall-lsp-server needs the older 1.4.0.0 lsp - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = dontCheck (super.lsp_1_4_0_0.override { - lsp-types = super.lsp-types_1_4_0_1; - }); - }; + dhall-lsp-server = + # 2022-09-20: We have overridden lsp to not be the stackage version. + # dhall-lsp-server needs the older 1.4.0.0 lsp + let overridden-dhall-lsp-server = super.dhall-lsp-server.override { + lsp = dontCheck (super.lsp_1_4_0_0.override { + lsp-types = super.lsp-types_1_4_0_1; + }); + }; + in appendPatch (fetchpatch { + # This patch can be removed once the change question is in a tracked release. + url = "https://github.com/dhall-lang/dhall-haskell/pull/2539/commits/5dd0f0ba2d836fea3ef499c7aed04e83269c203f.patch"; + sha256 = "sha256-xjVuLDBptDGfTf7MVmPb0WuuFWRLpgDYX2ybbgjAjzs="; + relative = "dhall-lsp-server"; + }) overridden-dhall-lsp-server; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { @@ -1509,11 +1479,6 @@ self: super: { # See: https://github.com/robstewart57/rdf4h/issues/39 rdf4h = dontCheck super.rdf4h; - # hasn't bumped upper bounds - # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" - # https://github.com/ennocramer/floskell/issues/48 - floskell = dontCheck (doJailbreak super.floskell); - # hasn't bumped upper bounds # test fails because of a "Warning: Unused LANGUAGE pragma" # https://github.com/ennocramer/monad-dijkstra/issues/4 @@ -1639,7 +1604,7 @@ self: super: { hspec-contrib = dontCheck super.hspec-contrib; # github.com/ucsd-progsys/liquidhaskell/issues/1729 - liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. @@ -1706,19 +1671,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - hspec_2_11_4 = doDistribute (super.hspec_2_11_4.override { - hspec-discover = self.hspec-discover_2_11_4; - hspec-core = self.hspec-core_2_11_4; + hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override { + hspec-discover = self.hspec-discover_2_11_6; + hspec-core = self.hspec-core_2_11_6; }); - hspec-meta_2_11_4 = doDistribute (super.hspec-meta_2_11_4.override { + hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_4 = doDistribute (super.hspec-discover_2_11_4.override { - hspec-meta = self.hspec-meta_2_11_4; + hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { + hspec-meta = self.hspec-meta_2_11_6; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_4 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6 # is overlayed to hspec-core. - hspec-core_2_11_4 = doDistribute (dontCheck (super.hspec-core_2_11_4.override { + hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; })); @@ -1794,11 +1759,6 @@ self: super: { # compatible with Cabal 3. No upstream repository found so far readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; - # 2020-12-05: this package requires a newer version of http-client, - # but it still compiles with older version: - # https://github.com/turion/essence-of-live-coding/pull/86 - essence-of-live-coding-warp = doJailbreak super.essence-of-live-coding-warp; - # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; @@ -1883,10 +1843,6 @@ self: super: { # pandoc-cli requires pandoc >= 3.1 pandoc = self.pandoc_3_1_8; - # pandoc depends on crypton-connection, which requires tls >= 1.7 - tls = self.tls_1_9_0; - crypton-connection = unmarkBroken super.crypton-connection; - # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. http-client-tls = self.http-client-tls_0_3_6_3; @@ -2159,7 +2115,7 @@ self: super: { # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); large-hashable = lib.pipe (super.large-hashable.override { @@ -2406,7 +2362,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 @@ -2449,11 +2405,6 @@ self: super: { ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; hasura-ekg-core = doJailbreak super.hasura-ekg-core; - # https://github.com/Synthetica9/nix-linter/issues/65 - nix-linter = super.nix-linter.overrideScope (self: super: { - aeson = self.aeson_1_5_6_0; - }); - # Test suite doesn't support hspec 2.8 # https://github.com/zellige/hs-geojson/issues/29 geojson = dontCheck super.geojson; @@ -2704,11 +2655,6 @@ self: super: { # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; - # Tests fail due to the newly-build fourmolu not being in PATH - # https://github.com/fourmolu/fourmolu/issues/231 - fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0; - fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0; - # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. # https://github.com/vincenthz/hs-gauge/pull/106 gauge = appendPatch (pkgs.fetchpatch { @@ -2728,4 +2674,15 @@ self: super: { # https://github.com/kowainik/typerep-map/pull/128 typerep-map = doJailbreak super.typerep-map; + # Too strict bounds on base + kewar = doJailbreak super.kewar; + + # Tests rely on (missing) submodule + unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core; + + # Workaround for Cabal failing to find nonexistent SDL2 library?! + # https://github.com/NixOS/nixpkgs/issues/260863 + sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; + sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index d452618667..5964e0d789 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -99,21 +99,7 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; }) super.hnix); - haskell-language-server = let - # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` - additionalDeps = with self.haskell-language-server.scope; [ - hls-haddock-comments-plugin - (unmarkBroken hls-splice-plugin) - hls-tactics-plugin - ]; - in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { - Cabal = lself.Cabal_3_6_3_0; - aeson = lself.aeson_1_5_6_0; - lens-aeson = doJailbreak lself.lens-aeson_1_1_3; - lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0 - hls-overloaded-record-dot-plugin = null; - })); + haskell-language-server = throw "haskell-language-server dropped support for ghc 8.10 in version 2.3.0.0 please use a newer ghc version or an older nixpkgs version"; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; @@ -122,27 +108,12 @@ self: super: { mod = super.mod_0_1_2_2; path-io = doJailbreak super.path-io; - hls-cabal-plugin = super.hls-cabal-plugin.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; ormolu = self.ormolu_0_5_0_1; fourmolu = dontCheck self.fourmolu_0_9_0_0; hlint = self.hlint_3_4_1; stylish-haskell = doJailbreak self.stylish-haskell_0_14_3_0; - hls-tactics-plugin = unmarkBroken (addBuildDepends (with self.hls-tactics-plugin.scope; [ - aeson extra fingertree generic-lens ghc-exactprint ghc-source-gen ghcide - hls-graph hls-plugin-api hls-refactor-plugin hyphenation lens lsp megaparsec - parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers - ]) super.hls-tactics-plugin); - - # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies. - # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` - hls-haddock-comments-plugin = unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [ - ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lsp-types unordered-containers - ]) super.hls-haddock-comments-plugin); - mime-string = disableOptimization super.mime-string; # weeder 2.3.* no longer supports GHC 8.10 @@ -196,10 +167,6 @@ self: super: { apply-refact = self.apply-refact_0_9_3_0; - hls-hlint-plugin = super.hls-hlint-plugin.override { - inherit (self) apply-refact; - }; - # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7c2d382886..4535262740 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -76,9 +76,7 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; - fourmolu = self.fourmolu_0_10_1_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; + stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; doctest = dontCheck super.doctest; # Apply patches from head.hackage. @@ -91,16 +89,15 @@ self: super: { # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported. # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self..scope` additionalDeps = with self.haskell-language-server.scope; [ - hls-haddock-comments-plugin (unmarkBroken hls-splice-plugin) - hls-tactics-plugin ]; - in addBuildDepends additionalDeps (super.haskell-language-server.overrideScope (lself: lsuper: { + in addBuildDepends additionalDeps (disableCabalFlag "fourmolu" (super.haskell-language-server.overrideScope (lself: lsuper: { # Needed for modern ormolu and fourmolu. # Apply this here and not in common, because other ghc versions offer different Cabal versions. Cabal = lself.Cabal_3_6_3_0; hls-overloaded-record-dot-plugin = null; - })); + hls-fourmolu-plugin = null; + }))); # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5); diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix new file mode 100644 index 0000000000..99f4833332 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -0,0 +1,52 @@ +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +self: super: { + llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + + # Disable GHC core libraries + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + Cabal-syntax = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-experimental = null; + ghc-heap = null; + ghc-internal = null; + ghc-platform = null; + ghc-prim = null; + ghc-toolchain = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + semaphore-compat = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 29e7aab249..0c1bf8518e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -71,10 +71,9 @@ self: super: { Cabal-syntax = self.Cabal-syntax_3_8_1_0; }; - fourmolu = self.fourmolu_0_10_1_0.override { - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - }; + stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0; + haskell-language-server = disableCabalFlag "fourmolu" (super.haskell-language-server.override { hls-fourmolu-plugin = null; }); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7b9feb98dc..d13e4cfe9c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -111,7 +111,32 @@ in { # https://github.com/kowainik/relude/issues/436 relude = dontCheck super.relude; - fourmolu = overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu); + inherit + ( + let + hls_overlay = lself: lsuper: { + ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231014; + ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; + Cabal-syntax = lself.Cabal-syntax_3_10_2_0; + }; + in + lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { + haskell-language-server = allowInconsistentDependencies super.haskell-language-server; + # Tests fail due to the newly-build fourmolu not being in PATH + # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu = dontCheck super.fourmolu_0_14_0_0; + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); + hlint = super.hlint_3_6_1; + stylish-haskell = super.stylish-haskell; + } + ) + haskell-language-server + # HLS from 2.3 needs at least formolu 0.14. + # This means we need to bump a lot of other tools, too, because they all us ghc-lib-parser + # We do this globally to prevent inconsistent formatting or lints between hls and the command line tools. + fourmolu + ormolu + hlint + stylish-haskell + ; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 098a856f78..91213b0274 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -65,20 +65,25 @@ self: super: { # Version deviations from Stackage LTS # - doctest = doDistribute super.doctest_0_22_1; + doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 some = doDistribute self.some_1_0_5; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; th-desugar = doDistribute self.th-desugar_1_15; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; - base-compat = doDistribute self.base-compat_0_13_0; - base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; + base-compat = doDistribute self.base-compat_0_13_1; + base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; + fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; free = doJailbreak super.free; + # Because we bumped the version of base-compat above.^ + cabal-plan = unmarkBroken super.cabal-plan; + cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds; + # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6 file-io = unmarkBroken super.file-io; @@ -86,10 +91,16 @@ self: super: { # https://github.com/mokus0/th-extras/pull/21 th-extras = doJailbreak super.th-extras; - ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; + ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; + # Tests fail due to the newly-build fourmolu not being in PATH + # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu = dontCheck super.fourmolu_0_14_0_0; + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); + hlint = super.hlint_3_6_1; + # v0.1.6 forbids base >= 4.18 singleton-bool = doDistribute super.singleton-bool_0_1_7; @@ -141,16 +152,6 @@ self: super: { sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }) (doJailbreak super.language-haskell-extract); - # Patch for support of mtl-2.3 - monad-par = appendPatch - (pkgs.fetchpatch { - name = "monad-par-mtl-2.3.patch"; - url = "https://github.com/simonmar/monad-par/pull/75/commits/ce53f6c1f8246224bfe0223f4aa3d077b7b6cc6c.patch"; - sha256 = "1jxkl3b3lkjhk83f5q220nmjxbkmni0jswivdw4wfbzp571djrlx"; - stripLen = 1; - }) - (doJailbreak super.monad-par); - # Patch 0.17.1 for support of mtl-2.3 xmonad-contrib = appendPatch (pkgs.fetchpatch { @@ -175,23 +176,19 @@ self: super: { hls-floskell-plugin = null; }; - fourmolu = super.fourmolu_0_13_1_0; - ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); - stylish-haskell = super.stylish-haskell_0_14_5_0; - # Newer version of servant required for GHC 9.6 - servant = self.servant_0_20; + servant = self.servant_0_20_1; servant-server = self.servant-server_0_20; servant-client = self.servant-client_0_20; servant-client-core = self.servant-client-core_0_20; - # Select versions compatible with servant_0_20 + # Select versions compatible with servant_0_20_1 servant-docs = self.servant-docs_0_13; servant-swagger = self.servant-swagger_1_2; # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; # Jailbreak strict upper bounds: http-api-data <0.6 - servant_0_20 = doJailbreak super.servant_0_20; + servant_0_20_1 = doJailbreak super.servant_0_20_1; servant-server_0_20 = doJailbreak super.servant-server_0_20; servant-client_0_20 = doJailbreak super.servant-client_0_20; servant-client-core_0_20 = doJailbreak super.servant-client-core_0_20; @@ -203,8 +200,8 @@ self: super: { hw-prim = dontCheck (doJailbreak super.hw-prim); stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; - rebase = doJailbreak super.rebase_1_20; - rerebase = doJailbreak super.rerebase_1_20; + rebase = doJailbreak super.rebase_1_20_1_1; + rerebase = doJailbreak super.rerebase_1_20_1_1; hiedb = dontCheck super.hiedb; retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 @@ -214,8 +211,6 @@ self: super: { HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb ]) super.ghc-exactprint_1_7_0_1); - hlint = super.hlint_3_6_1; - inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super) hls-cabal-plugin algebraic-graphs @@ -254,7 +249,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -264,20 +261,19 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; # The curl executable is required for withApplication tests. - warp_3_3_28 = addTestToolDepend pkgs.curl super.warp_3_3_28; + warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29; # The NCG backend for aarch64 generates invalid jumps in some situations, # the workaround on 9.6 is to revert to the LLVM backend (which is used # for these sorts of situations even on 9.2 and 9.4). # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 - tls = appendConfigureFlags - (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ]) - super.tls; + tls = if pkgs.stdenv.hostPlatform.isAarch64 then self.forceLlvmCodegenBackend super.tls else super.tls; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 4588933abc..cab8134973 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -1,10 +1,3 @@ -## -## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes: -## -## 1. "8.7" strings -## 2. llvm 6 -## 3. disabled library update: parallel -## { pkgs, haskellLib }: with haskellLib; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d610dd360f..5723167b40 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -99,6 +99,8 @@ broken-packages: - affection # failure in job https://hydra.nixos.org/build/233213076 at 2023-09-02 - affine-invariant-ensemble-mcmc # failure in job https://hydra.nixos.org/build/233237176 at 2023-09-02 - Agata # failure in job https://hydra.nixos.org/build/233221026 at 2023-09-02 + - agda2hs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239252884 at 2023-11-10 + - agda2train # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239247619 at 2023-11-10 - Agda-executable # failure in job https://hydra.nixos.org/build/233332629 at 2023-09-02 - agda-language-server # failure in job https://hydra.nixos.org/build/233332694 at 2023-09-02 - agda-snippets # failure in job https://hydra.nixos.org/build/233332749 at 2023-09-02 @@ -139,6 +141,7 @@ broken-packages: - altfloat # failure in job https://hydra.nixos.org/build/233197874 at 2023-09-02 - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02 - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02 + - amazonka-contrib-rds-utils # failure building library in job https://hydra.nixos.org/build/237240275 at 2023-10-21 - amazonka-iam-policy # failure in job https://hydra.nixos.org/build/233233098 at 2023-09-02 - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02 - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02 @@ -163,6 +166,12 @@ broken-packages: - antfarm # failure in job https://hydra.nixos.org/build/233225661 at 2023-09-02 - antigate # failure in job https://hydra.nixos.org/build/233194081 at 2023-09-02 - antimirov # failure in job https://hydra.nixos.org/build/233210987 at 2023-09-02 + - antiope-athena # failure building library in job https://hydra.nixos.org/build/237246022 at 2023-10-21 + - antiope-es # failure building library in job https://hydra.nixos.org/build/237237240 at 2023-10-21 + - antiope-messages # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237239158 at 2023-10-21 + - antiope-optparse-applicative # failure in job https://hydra.nixos.org/build/237235649 at 2023-10-21 + - antiope-sns # failure in job https://hydra.nixos.org/build/237241347 at 2023-10-21 + - antiope-sqs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237241846 at 2023-10-21 - antiope-swf # failure in job https://hydra.nixos.org/build/233206369 at 2023-09-02 - antiquoter # failure in job https://hydra.nixos.org/build/233221962 at 2023-09-02 - antisplice # failure in job https://hydra.nixos.org/build/233238144 at 2023-09-02 @@ -290,6 +299,7 @@ broken-packages: - awesome-prelude # failure in job https://hydra.nixos.org/build/233232761 at 2023-09-02 - awesomium-raw # failure in job https://hydra.nixos.org/build/233241036 at 2023-09-02 - aws-cloudfront-signer # failure in job https://hydra.nixos.org/build/233194723 at 2023-09-02 + - aws-easy # failure building library in job https://hydra.nixos.org/build/237244335 at 2023-10-21 - aws-ec2 # failure in job https://hydra.nixos.org/build/233201556 at 2023-09-02 - aws-ec2-knownhosts # failure in job https://hydra.nixos.org/build/233237078 at 2023-09-02 - aws-general # failure in job https://hydra.nixos.org/build/233211106 at 2023-09-02 @@ -298,6 +308,8 @@ broken-packages: - aws-performance-tests # failure in job https://hydra.nixos.org/build/233259271 at 2023-09-02 - aws-route53 # failure in job https://hydra.nixos.org/build/233218200 at 2023-09-02 - aws-sdk-text-converter # failure in job https://hydra.nixos.org/build/233237525 at 2023-09-02 + - aws-ses-easy # failure building library in job https://hydra.nixos.org/build/237249788 at 2023-10-21 + - aws-simple # failure building library in job https://hydra.nixos.org/build/237242730 at 2023-10-21 - azubi # failure in job https://hydra.nixos.org/build/233258480 at 2023-09-02 - azure-acs # failure in job https://hydra.nixos.org/build/233252578 at 2023-09-02 - azure-email # failure in job https://hydra.nixos.org/build/233255535 at 2023-09-02 @@ -457,6 +469,7 @@ broken-packages: - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02 - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02 - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02 + - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21 - bloomfilter-redis # failure in job https://hydra.nixos.org/build/233226393 at 2023-09-02 - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02 - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02 @@ -601,6 +614,7 @@ broken-packages: - cairo-core # failure in job https://hydra.nixos.org/build/233248151 at 2023-09-02 - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02 - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02 + - calamity # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238601583 at 2023-10-21 - caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02 - calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02 - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02 @@ -618,6 +632,7 @@ broken-packages: - ca-patterns # failure in job https://hydra.nixos.org/build/233246800 at 2023-09-02 - capped-list # failure in job https://hydra.nixos.org/build/233232627 at 2023-09-02 - capri # failure in job https://hydra.nixos.org/build/233247984 at 2023-09-02 + - caps # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237244140 at 2023-10-21 - caramia # failure in job https://hydra.nixos.org/build/233257225 at 2023-09-02 - carbonara # failure in job https://hydra.nixos.org/build/233201166 at 2023-09-02 - carettah # failure in job https://hydra.nixos.org/build/233230612 at 2023-09-02 @@ -730,6 +745,7 @@ broken-packages: - clash-prelude # failure in job https://hydra.nixos.org/build/233252128 at 2023-09-02 - Clash-Royale-Hack-Cheats # failure in job https://hydra.nixos.org/build/233216034 at 2023-09-02 - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02 + - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21 - classy-influxdb-simple # failure in job https://hydra.nixos.org/build/233253418 at 2023-09-02 - classy-parallel # failure in job https://hydra.nixos.org/build/233213514 at 2023-09-02 - classyplate # failure in job https://hydra.nixos.org/build/233212613 at 2023-09-02 @@ -794,6 +810,7 @@ broken-packages: - collate # failure in job https://hydra.nixos.org/build/233243978 at 2023-09-02 - collections-api # failure in job https://hydra.nixos.org/build/233220769 at 2023-09-02 - collections # failure in job https://hydra.nixos.org/build/233251207 at 2023-09-02 + - co-log-polysemy-formatting # failure building executable 'example' in job https://hydra.nixos.org/build/237249360 at 2023-10-21 - co-log-sys # failure in job https://hydra.nixos.org/build/233206587 at 2023-09-02 - colonnade # failure in job https://hydra.nixos.org/build/233248956 at 2023-09-02 - colorless # failure in job https://hydra.nixos.org/build/233220728 at 2023-09-02 @@ -954,6 +971,7 @@ broken-packages: - crdt-event-fold # failure in job https://hydra.nixos.org/build/233191438 at 2023-09-02 - crdt # failure in job https://hydra.nixos.org/build/233254930 at 2023-09-02 - creatur # failure in job https://hydra.nixos.org/build/233252591 at 2023-09-02 + - credentials # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237240683 at 2023-10-21 - credential-store # failure in job https://hydra.nixos.org/build/233230143 at 2023-09-02 - crem # failure in job https://hydra.nixos.org/build/233240415 at 2023-09-02 - cr # failure in job https://hydra.nixos.org/build/233235318 at 2023-09-02 @@ -974,7 +992,6 @@ broken-packages: - cryptoids-types # failure in job https://hydra.nixos.org/build/233242596 at 2023-09-02 - crypto-keys-ssh # failure in job https://hydra.nixos.org/build/233222227 at 2023-09-02 - crypto-multihash # failure in job https://hydra.nixos.org/build/233220770 at 2023-09-02 - - crypton-connection # failure in job https://hydra.nixos.org/build/233230068 at 2023-09-02 - crypto-numbers # failure in job https://hydra.nixos.org/build/233225721 at 2023-09-02 - crypto-pubkey-openssh # failure in job https://hydra.nixos.org/build/233207007 at 2023-09-02 - crypto-random-effect # failure in job https://hydra.nixos.org/build/233236324 at 2023-09-02 @@ -1012,6 +1029,7 @@ broken-packages: - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02 - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02 - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02 + - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 - dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02 @@ -1019,6 +1037,7 @@ broken-packages: - danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02 - Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02 - dao # failure in job https://hydra.nixos.org/build/233240654 at 2023-09-02 + - dap # failure in job https://hydra.nixos.org/build/237239767 at 2023-10-21 - darcs2dot # failure in job https://hydra.nixos.org/build/233209236 at 2023-09-02 - darcs-buildpackage # failure in job https://hydra.nixos.org/build/233213566 at 2023-09-02 - darcs-cabalized # failure in job https://hydra.nixos.org/build/233234765 at 2023-09-02 @@ -1152,6 +1171,7 @@ broken-packages: - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02 - derp-lib # failure in job https://hydra.nixos.org/build/233199053 at 2023-09-02 - describe # failure in job https://hydra.nixos.org/build/233207296 at 2023-09-02 + - descriptive # failure building library in job https://hydra.nixos.org/build/237623359 at 2023-10-21 - desktop-portal # failure in job https://hydra.nixos.org/build/233241462 at 2023-09-02 - deterministic-game-engine # failure in job https://hydra.nixos.org/build/233259188 at 2023-09-02 - detrospector # failure in job https://hydra.nixos.org/build/233209424 at 2023-09-02 @@ -1165,7 +1185,6 @@ broken-packages: - dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02 - dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02 - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02 - - dhall-lsp-server # failure in job https://hydra.nixos.org/build/233216852 at 2023-09-02 - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02 - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02 - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 @@ -1199,6 +1218,7 @@ broken-packages: - digest-pure # failure in job https://hydra.nixos.org/build/233194135 at 2023-09-02 - DigitalOcean # failure in job https://hydra.nixos.org/build/233231291 at 2023-09-02 - digitalocean-kzs # failure in job https://hydra.nixos.org/build/233251576 at 2023-09-02 + - digit # failure in job https://hydra.nixos.org/build/237241758 at 2023-10-21 - dijkstra-simple # failure in job https://hydra.nixos.org/build/233218373 at 2023-09-02 - DimensionalHash # failure in job https://hydra.nixos.org/build/233230945 at 2023-09-02 - diophantine # failure in job https://hydra.nixos.org/build/233229215 at 2023-09-02 @@ -1220,6 +1240,7 @@ broken-packages: - disjoint-set # failure in job https://hydra.nixos.org/build/233201934 at 2023-09-02 - disjoint-set-stateful # failure in job https://hydra.nixos.org/build/233253300 at 2023-09-02 - diskhash # failure in job https://hydra.nixos.org/build/233230362 at 2023-09-02 + - disposable # timeout - distance # failure in job https://hydra.nixos.org/build/233255082 at 2023-09-02 - Dist # failure in job https://hydra.nixos.org/build/233217811 at 2023-09-02 - distributed-closure # failure in job https://hydra.nixos.org/build/233223516 at 2023-09-02 @@ -1312,6 +1333,7 @@ broken-packages: - dynamic-mvector # failure in job https://hydra.nixos.org/build/233252826 at 2023-09-02 - dynamic-object # failure in job https://hydra.nixos.org/build/233216605 at 2023-09-02 - DynamicTimeWarp # failure in job https://hydra.nixos.org/build/233238244 at 2023-09-02 + - dynamodb-simple # failure building library in job https://hydra.nixos.org/build/237238415 at 2023-10-21 - dyna-processing # failure in job https://hydra.nixos.org/build/234451875 at 2023-09-13 - dynloader # failure in job https://hydra.nixos.org/build/233239248 at 2023-09-02 - DysFRP # failure in job https://hydra.nixos.org/build/233214134 at 2023-09-02 @@ -1331,6 +1353,7 @@ broken-packages: - easytest # failure in job https://hydra.nixos.org/build/233209710 at 2023-09-02 - ebeats # failure in job https://hydra.nixos.org/build/233235039 at 2023-09-02 - ebnf-bff # failure in job https://hydra.nixos.org/build/233221694 at 2023-09-02 + - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21 - eccrypto-ed25519-bindings # failure in job https://hydra.nixos.org/build/233217399 at 2023-09-02 - ecma262 # failure in job https://hydra.nixos.org/build/233260026 at 2023-09-02 - ecta-plugin # failure in job https://hydra.nixos.org/build/233224764 at 2023-09-02 @@ -1360,6 +1383,7 @@ broken-packages: - either-unwrap # failure in job https://hydra.nixos.org/build/233254495 at 2023-09-02 - ejdb2-binding # failure in job https://hydra.nixos.org/build/233253666 at 2023-09-02 - ekg-bosun # failure in job https://hydra.nixos.org/build/233250564 at 2023-09-02 + - ekg-cloudwatch # failure in job https://hydra.nixos.org/build/237236508 at 2023-10-21 - ekg-elastic # failure in job https://hydra.nixos.org/build/233204565 at 2023-09-02 - ekg-elasticsearch # failure in job https://hydra.nixos.org/build/233234000 at 2023-09-02 - ekg-json # failure in job https://hydra.nixos.org/build/233245374 at 2023-09-02 @@ -1446,6 +1470,7 @@ broken-packages: - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02 - eventstore # failure in job https://hydra.nixos.org/build/233202734 at 2023-09-02 - evoke # failure in job https://hydra.nixos.org/build/233213948 at 2023-09-02 + - EVP # failure in job https://hydra.nixos.org/build/237241792 at 2023-10-21 - ewe # failure in job https://hydra.nixos.org/build/233217228 at 2023-09-02 - exact-cover # failure in job https://hydra.nixos.org/build/233203182 at 2023-09-02 - exact-real-positional # failure in job https://hydra.nixos.org/build/233239627 at 2023-09-02 @@ -1483,8 +1508,10 @@ broken-packages: - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02 - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02 - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 + - extensions # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239249292 at 2023-11-10 - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02 - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02 + - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21 - extractelf # failure in job https://hydra.nixos.org/build/233240806 at 2023-09-02 - Extra # failure in job https://hydra.nixos.org/build/233243671 at 2023-09-02 - extralife # failure in job https://hydra.nixos.org/build/233236550 at 2023-09-02 @@ -1556,6 +1583,7 @@ broken-packages: - FileManipCompat # failure in job https://hydra.nixos.org/build/233254887 at 2023-09-02 - FileManip # failure in job https://hydra.nixos.org/build/233237292 at 2023-09-02 - fileneglect # failure in job https://hydra.nixos.org/build/233209920 at 2023-09-02 + - filepather # failure in job https://hydra.nixos.org/build/237242258 at 2023-10-21 - Files # failure in job https://hydra.nixos.org/build/233207543 at 2023-09-02 - filesystem-conduit # failure in job https://hydra.nixos.org/build/233239975 at 2023-09-02 - FileSystem # failure in job https://hydra.nixos.org/build/233230289 at 2023-09-02 @@ -1599,6 +1627,7 @@ broken-packages: - flay # failure in job https://hydra.nixos.org/build/233235511 at 2023-09-02 - flexible-time # failure in job https://hydra.nixos.org/build/233208099 at 2023-09-02 - flickr # failure in job https://hydra.nixos.org/build/233212718 at 2023-09-02 + - Flint2 # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239246414 at 2023-11-10 - float-binstring # failure in job https://hydra.nixos.org/build/233203257 at 2023-09-02 - floating-bits # failure in job https://hydra.nixos.org/build/233223171 at 2023-09-02 - flock # failure in job https://hydra.nixos.org/build/233245164 at 2023-09-02 @@ -1708,7 +1737,6 @@ broken-packages: - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 - fusion # failure in job https://hydra.nixos.org/build/233204359 at 2023-09-02 - - futhark # failure in job https://hydra.nixos.org/build/236673091 at 2023-10-04 - futhask # failure in job https://hydra.nixos.org/build/233229281 at 2023-09-02 - futun # failure in job https://hydra.nixos.org/build/233245115 at 2023-09-02 - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02 @@ -1806,7 +1834,9 @@ broken-packages: - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02 - ghci-lib # failure in job https://hydra.nixos.org/build/233216644 at 2023-09-02 - ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02 + - ghcjs-base-stub # timeout - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 + - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 @@ -1827,12 +1857,13 @@ broken-packages: - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02 - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02 - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02 + - gi-adwaita # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239685049 at 2023-11-10 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - - gi-graphene # failure in job https://hydra.nixos.org/build/233205231 at 2023-09-02 + - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 @@ -1845,7 +1876,6 @@ broken-packages: - GiST # failure in job https://hydra.nixos.org/build/233199759 at 2023-09-02 - gist # failure in job https://hydra.nixos.org/build/233221381 at 2023-09-02 - git-all # failure in job https://hydra.nixos.org/build/233252935 at 2023-09-02 - - git-brunch # failure in job https://hydra.nixos.org/build/233250960 at 2023-09-02 - git-checklist # failure in job https://hydra.nixos.org/build/233203228 at 2023-09-02 - git-cuk # failure in job https://hydra.nixos.org/build/233211733 at 2023-09-02 - git-date # failure in job https://hydra.nixos.org/build/233259193 at 2023-09-02 @@ -1952,6 +1982,7 @@ broken-packages: - gridfs # failure in job https://hydra.nixos.org/build/233213958 at 2023-09-02 - grids # failure in job https://hydra.nixos.org/build/233218294 at 2023-09-02 - grm # failure in job https://hydra.nixos.org/build/233259788 at 2023-09-02 + - groot # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248418 at 2023-10-21 - GroteTrap # failure in job https://hydra.nixos.org/build/233203176 at 2023-09-02 - groundhog # failure in job https://hydra.nixos.org/build/233199269 at 2023-09-02 - grouped-list # failure in job https://hydra.nixos.org/build/233240891 at 2023-09-02 @@ -2077,6 +2108,7 @@ broken-packages: - HaPy # failure in job https://hydra.nixos.org/build/233256693 at 2023-09-02 - haquery # failure in job https://hydra.nixos.org/build/233216714 at 2023-09-02 - harchive # failure in job https://hydra.nixos.org/build/233259819 at 2023-09-02 + - harfbuzz-pure # failure in job https://hydra.nixos.org/build/237235780 at 2023-10-21 - harg # failure in job https://hydra.nixos.org/build/233232453 at 2023-09-02 - HARM # failure in job https://hydra.nixos.org/build/233232650 at 2023-09-02 - HarmTrace-Base # failure in job https://hydra.nixos.org/build/233213843 at 2023-09-02 @@ -2169,6 +2201,7 @@ broken-packages: - haskintex # failure in job https://hydra.nixos.org/build/233238166 at 2023-09-02 - haskmon # failure in job https://hydra.nixos.org/build/233228390 at 2023-09-02 - haskoin # failure in job https://hydra.nixos.org/build/233201668 at 2023-09-02 + - haskoin-store # failure in job https://hydra.nixos.org/build/238048371 at 2023-10-21 - haskoin-util # failure in job https://hydra.nixos.org/build/233222171 at 2023-09-02 - haskoin-wallet # failure in job https://hydra.nixos.org/build/233206922 at 2023-09-02 - haskore # failure in job https://hydra.nixos.org/build/233238668 at 2023-09-02 @@ -2255,6 +2288,7 @@ broken-packages: - heddit # failure in job https://hydra.nixos.org/build/233229058 at 2023-09-02 - hedgehog-checkers # failure in job https://hydra.nixos.org/build/233229405 at 2023-09-02 - hedgehog-generic # failure in job https://hydra.nixos.org/build/233204695 at 2023-09-02 + - hedgehog-gen # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237243271 at 2023-10-21 - hedgehog-golden # failure in job https://hydra.nixos.org/build/233219619 at 2023-09-02 - hedgehog-lens # failure in job https://hydra.nixos.org/build/233251825 at 2023-09-02 - hedgehog-servant # failure in job https://hydra.nixos.org/build/233258223 at 2023-09-02 @@ -2379,7 +2413,7 @@ broken-packages: - hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02 - hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02 - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02 - - hledger-iadd # failure in job https://hydra.nixos.org/build/233198670 at 2023-09-02 + - hledger-iadd # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/238288021 at 2023-10-21 - hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02 - hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02 - hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02 @@ -2572,6 +2606,7 @@ broken-packages: - hsns # failure in job https://hydra.nixos.org/build/233240328 at 2023-09-02 - hsnsq # failure in job https://hydra.nixos.org/build/233215245 at 2023-09-02 - hsntp # failure in job https://hydra.nixos.org/build/233206211 at 2023-09-02 + - hs-opentelemetry-propagator-datadog # failure in job https://hydra.nixos.org/build/237245341 at 2023-10-21 - hsoptions # failure in job https://hydra.nixos.org/build/233198363 at 2023-09-02 - hsoz # failure in job https://hydra.nixos.org/build/233217005 at 2023-09-02 - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02 @@ -2693,6 +2728,7 @@ broken-packages: - huttons-razor # failure in job https://hydra.nixos.org/build/233224736 at 2023-09-02 - hVOIDP # failure in job https://hydra.nixos.org/build/233227778 at 2023-09-02 - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02 + - hw-aws-sqs-conduit # failure building library in job https://hydra.nixos.org/build/237235400 at 2023-10-21 - hw-ci-assist # failure in job https://hydra.nixos.org/build/233207990 at 2023-09-02 - hw-dsv # failure in job https://hydra.nixos.org/build/233252280 at 2023-09-02 - hw-dump # failure in job https://hydra.nixos.org/build/233208818 at 2023-09-02 @@ -2770,6 +2806,7 @@ broken-packages: - imapget # failure in job https://hydra.nixos.org/build/233235664 at 2023-09-02 - imgur # failure in job https://hydra.nixos.org/build/233191096 at 2023-09-02 - imj-prelude # failure in job https://hydra.nixos.org/build/233234877 at 2023-09-02 + - imm # failure in job https://hydra.nixos.org/build/237239261 at 2023-10-21 - immortal-worker # failure in job https://hydra.nixos.org/build/233246961 at 2023-09-02 - ImperativeHaskell # failure in job https://hydra.nixos.org/build/233240920 at 2023-09-02 - impl # failure in job https://hydra.nixos.org/build/233203425 at 2023-09-02 @@ -2800,6 +2837,7 @@ broken-packages: - inj-base # failure in job https://hydra.nixos.org/build/233198720 at 2023-09-02 - inject-function # failure in job https://hydra.nixos.org/build/233252462 at 2023-09-02 - injections # failure in job https://hydra.nixos.org/build/233207796 at 2023-09-02 + - inline-c-cuda # failure in job https://hydra.nixos.org/build/237234701 at 2023-10-21 - inline-c-objc # failure in job https://hydra.nixos.org/build/233223704 at 2023-09-02 - inline-r # failure in job https://hydra.nixos.org/build/233210520 at 2023-09-02 - in-other-words-plugin # failure in job https://hydra.nixos.org/build/233202396 at 2023-09-02 @@ -2827,6 +2865,7 @@ broken-packages: - interruptible # failure in job https://hydra.nixos.org/build/233209873 at 2023-09-02 - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02 - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02 + - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10 - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02 - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02 - int-interval-map # failure in job https://hydra.nixos.org/build/233244556 at 2023-09-02 @@ -2895,6 +2934,7 @@ broken-packages: - java-adt # failure in job https://hydra.nixos.org/build/233256402 at 2023-09-02 - java-bridge # failure in job https://hydra.nixos.org/build/233219258 at 2023-09-02 - javascript-bridge # failure in job https://hydra.nixos.org/build/233217052 at 2023-09-02 + - javascript-extras # timeout - Javav # failure in job https://hydra.nixos.org/build/233243825 at 2023-09-02 - javav # failure in job https://hydra.nixos.org/build/233246644 at 2023-09-02 - jbi # failure in job https://hydra.nixos.org/build/233221466 at 2023-09-02 @@ -2992,6 +3032,7 @@ broken-packages: - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02 - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02 - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02 + - kdt # test failure in job https://hydra.nixos.org/build/239264029 at 2023-11-10 - keccak # failure in job https://hydra.nixos.org/build/233200469 at 2023-09-02 - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02 - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02 @@ -3229,6 +3270,7 @@ broken-packages: - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02 - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02 - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 + - llvm-ffi # failure in job https://hydra.nixos.org/build/237230725 at 2023-10-21 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02 @@ -3553,6 +3595,7 @@ broken-packages: - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02 + - monus-weighted-search # timeout - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02 - morfette # failure in job https://hydra.nixos.org/build/233249575 at 2023-09-02 - morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02 @@ -3695,6 +3738,7 @@ broken-packages: - networked-game # failure in job https://hydra.nixos.org/build/233239577 at 2023-09-02 - network-house # failure in job https://hydra.nixos.org/build/233193957 at 2023-09-02 - network-manager-tui # failure in job https://hydra.nixos.org/build/233247972 at 2023-09-02 + - network-messagepack-rpc-websocket # timeout - network-metrics # failure in job https://hydra.nixos.org/build/233259963 at 2023-09-02 - network-msg # failure in job https://hydra.nixos.org/build/233236413 at 2023-09-02 - network-msgpack-rpc # failure in job https://hydra.nixos.org/build/233222467 at 2023-09-02 @@ -3720,6 +3764,7 @@ broken-packages: - nextstep-plist # failure in job https://hydra.nixos.org/build/233227343 at 2023-09-02 - NGrams # failure in job https://hydra.nixos.org/build/233230426 at 2023-09-02 - ngrams-loader # failure in job https://hydra.nixos.org/build/233211319 at 2023-09-02 + - ngx-export-healthcheck # failure in job https://hydra.nixos.org/build/238601669 at 2023-10-21 - ngx-export-log # failure in job https://hydra.nixos.org/build/233193133 at 2023-09-02 - niagra # failure in job https://hydra.nixos.org/build/233234016 at 2023-09-02 - nibblestring # failure in job https://hydra.nixos.org/build/233224888 at 2023-09-02 @@ -4006,6 +4051,7 @@ broken-packages: - patches-vector # failure in job https://hydra.nixos.org/build/233244862 at 2023-09-02 - Pathfinder # failure in job https://hydra.nixos.org/build/233236573 at 2023-09-02 - path-formatting # failure in job https://hydra.nixos.org/build/233199358 at 2023-09-02 + - path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21 - PathTree # failure in job https://hydra.nixos.org/build/233216203 at 2023-09-02 - patronscraper # failure in job https://hydra.nixos.org/build/233258571 at 2023-09-02 - pattern-trie # failure in job https://hydra.nixos.org/build/233237252 at 2023-09-02 @@ -4081,6 +4127,7 @@ broken-packages: - phone-push # failure in job https://hydra.nixos.org/build/233246934 at 2023-09-02 - phonetic-languages-constaints # failure in job https://hydra.nixos.org/build/233232580 at 2023-09-02 - phonetic-languages-simplified-generalized-examples-array # failure in job https://hydra.nixos.org/build/233245242 at 2023-09-02 + - phonetic-languages-simplified-generalized-properties-array # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248983 at 2023-10-21 - phonetic-languages-simplified-properties-array # failure in job https://hydra.nixos.org/build/233195530 at 2023-09-02 - phonetic-languages-simplified-properties-array-old # failure in job https://hydra.nixos.org/build/233258258 at 2023-09-02 - phonetic-languages-vector # failure in job https://hydra.nixos.org/build/233258156 at 2023-09-02 @@ -4663,6 +4710,7 @@ broken-packages: - ron # failure in job https://hydra.nixos.org/build/233197052 at 2023-09-02 - rope # failure in job https://hydra.nixos.org/build/233198109 at 2023-09-02 - rosebud # failure in job https://hydra.nixos.org/build/233225772 at 2023-09-02 + - rose-trees # timeout - rosmsg # failure in job https://hydra.nixos.org/build/233248569 at 2023-09-02 - rospkg # failure in job https://hydra.nixos.org/build/233229989 at 2023-09-02 - rosso # failure in job https://hydra.nixos.org/build/233230103 at 2023-09-02 @@ -4767,10 +4815,8 @@ broken-packages: - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - - sdl2-gfx # failure in job https://hydra.nixos.org/build/233236795 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 - seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02 @@ -4835,7 +4881,6 @@ broken-packages: - servant-http-streams # failure in job https://hydra.nixos.org/build/233242852 at 2023-09-02 - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02 - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02 - - servant-JuicyPixels # failure in job https://hydra.nixos.org/build/233222224 at 2023-09-02 - servant-kotlin # failure in job https://hydra.nixos.org/build/233598190 at 2023-09-02 - servant-namedargs # failure in job https://hydra.nixos.org/build/233258674 at 2023-09-02 - servant-nix # failure in job https://hydra.nixos.org/build/233236159 at 2023-09-02 @@ -4980,6 +5025,7 @@ broken-packages: - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 + - skews # timeout - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02 - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02 - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02 @@ -5071,6 +5117,7 @@ broken-packages: - sparse-merkle-trees # failure in job https://hydra.nixos.org/build/233251228 at 2023-09-02 - sparse-tensor # failure in job https://hydra.nixos.org/build/233224869 at 2023-09-02 - spars # failure in job https://hydra.nixos.org/build/233221560 at 2023-09-02 + - SpatialMath # failure in job https://hydra.nixos.org/build/237243985 at 2023-10-21 - special-functors # failure in job https://hydra.nixos.org/build/233215268 at 2023-09-02 - special-keys # failure in job https://hydra.nixos.org/build/233191988 at 2023-09-02 - spectacle # failure in job https://hydra.nixos.org/build/233207488 at 2023-09-02 @@ -5101,6 +5148,7 @@ broken-packages: - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02 - sql-simple # failure in job https://hydra.nixos.org/build/233252834 at 2023-09-02 - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02 + - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21 - srcinst # failure in job https://hydra.nixos.org/build/233221356 at 2023-09-02 - srt-attoparsec # failure in job https://hydra.nixos.org/build/233248456 at 2023-09-02 - sscan # failure in job https://hydra.nixos.org/build/233248144 at 2023-09-02 @@ -5112,6 +5160,7 @@ broken-packages: - stack2cabal # failure in job https://hydra.nixos.org/build/233663091 at 2023-09-02 - stack2nix # failure in job https://hydra.nixos.org/build/233662912 at 2023-09-02 - stackage-cli # failure in job https://hydra.nixos.org/build/233213721 at 2023-09-02 + - stackage-curator # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237229157 at 2023-10-21 - stackage-metadata # failure in job https://hydra.nixos.org/build/233197359 at 2023-09-02 - stackage-to-hackage # failure in job https://hydra.nixos.org/build/233233948 at 2023-09-02 - stackage-types # failure in job https://hydra.nixos.org/build/233239995 at 2023-09-02 @@ -5321,6 +5370,7 @@ broken-packages: - tagsoup-selection # failure in job https://hydra.nixos.org/build/233228969 at 2023-09-02 - tagtree # failure in job https://hydra.nixos.org/build/233209409 at 2023-09-02 - tahoe-capabilities # failure in job https://hydra.nixos.org/build/233253813 at 2023-09-02 + - tahoe-chk # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237298038 at 2023-10-21 - tai64 # failure in job https://hydra.nixos.org/build/233257422 at 2023-09-02 - tai # failure in job https://hydra.nixos.org/build/233210483 at 2023-09-02 - tailwind # failure in job https://hydra.nixos.org/build/233238757 at 2023-09-02 @@ -5330,6 +5380,7 @@ broken-packages: - tamarin-prover-utils # failure in job https://hydra.nixos.org/build/233235417 at 2023-09-02 - Tape # failure in job https://hydra.nixos.org/build/233191662 at 2023-09-02 - tapioca # failure in job https://hydra.nixos.org/build/233207781 at 2023-09-02 + - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-autocollect # failure in job https://hydra.nixos.org/build/233256957 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 @@ -5369,6 +5420,7 @@ broken-packages: - templatepg # failure in job https://hydra.nixos.org/build/233250442 at 2023-09-02 - template-toolkit # failure in job https://hydra.nixos.org/build/233195990 at 2023-09-02 - template-yj # failure in job https://hydra.nixos.org/build/233236245 at 2023-09-02 + - templatise # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237235933 at 2023-10-21 - tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02 - tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02 - ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02 @@ -5434,6 +5486,7 @@ broken-packages: - thank-you-stars # failure in job https://hydra.nixos.org/build/233219923 at 2023-09-02 - th-build # failure in job https://hydra.nixos.org/build/233224794 at 2023-09-02 - th-dict-discovery # failure in job https://hydra.nixos.org/build/233204140 at 2023-09-02 + - theatre-dev # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239251083 at 2023-11-10 - THEff # failure in job https://hydra.nixos.org/build/233221239 at 2023-09-02 - themoviedb # failure in job https://hydra.nixos.org/build/233233008 at 2023-09-02 - thentos-cookie-session # failure in job https://hydra.nixos.org/build/233234700 at 2023-09-02 @@ -5527,6 +5580,7 @@ broken-packages: - tonalude # failure in job https://hydra.nixos.org/build/233204874 at 2023-09-02 - tonaparser # failure in job https://hydra.nixos.org/build/233224261 at 2023-09-02 - toodles # failure in job https://hydra.nixos.org/build/233245612 at 2023-09-02 + - toolbox # failure in job https://hydra.nixos.org/build/237240871 at 2023-10-21 - Top # failure in job https://hydra.nixos.org/build/233234827 at 2023-09-02 - topkata # failure in job https://hydra.nixos.org/build/233231937 at 2023-09-02 - torch # failure in job https://hydra.nixos.org/build/233222854 at 2023-09-02 @@ -5577,6 +5631,7 @@ broken-packages: - tremulous-query # failure in job https://hydra.nixos.org/build/233200947 at 2023-09-02 - TrendGraph # failure in job https://hydra.nixos.org/build/233258651 at 2023-09-02 - trhsx # failure in job https://hydra.nixos.org/build/233231297 at 2023-09-02 + - tries # timeout - trim # failure in job https://hydra.nixos.org/build/233195034 at 2023-09-02 - tripLL # failure in job https://hydra.nixos.org/build/233217806 at 2023-09-02 - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02 @@ -5978,6 +6033,8 @@ broken-packages: - writer-cps-morph # failure in job https://hydra.nixos.org/build/233241891 at 2023-09-02 - wsdl # failure in job https://hydra.nixos.org/build/233208187 at 2023-09-02 - wsedit # failure in job https://hydra.nixos.org/build/233232333 at 2023-09-02 + - ws # failure building executable 'ws' in job https://hydra.nixos.org/build/237237311 at 2023-10-21 + - wss-client # timeout - wtk # failure in job https://hydra.nixos.org/build/233220668 at 2023-09-02 - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02 - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02 @@ -6151,7 +6208,9 @@ broken-packages: - zeolite-lang # failure in job https://hydra.nixos.org/build/233217146 at 2023-09-02 - zero # failure in job https://hydra.nixos.org/build/233209286 at 2023-09-02 - zeromq3-haskell # failure in job https://hydra.nixos.org/build/233215557 at 2023-09-02 + - zeromq4-clone-pattern # timeout - zeromq4-conduit # failure in job https://hydra.nixos.org/build/233198244 at 2023-09-02 + - zeromq4-patterns # timeout - zeromq-haskell # failure in job https://hydra.nixos.org/build/233196050 at 2023-09-02 - zettelkast # failure in job https://hydra.nixos.org/build/233211485 at 2023-09-02 - ZFS # failure in job https://hydra.nixos.org/build/233257824 at 2023-09-02 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8f6af23747..b500247fd0 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -47,9 +47,8 @@ default-package-overrides: - implicit-hie < 0.1.3 - hie-bios < 0.13 - # 2023-07-06: newer versions of stylish-haskell require - # ghc-lib-parser-ex >= 9.6, but LTS-21 contains ghc-lib-parser-ex-9.4 - - stylish-haskell < 0.14.5.0 + # pandoc-crossref 0.3.17 needs pandoc >= 3.1.8 + - pandoc-crossref < 0.3.17.0 # 2023-09-17: reflex-dom 0.6.3.0 is broken https://github.com/reflex-frp/reflex-dom/issues/462 - reflex-dom < 0.6.2.0 @@ -58,6 +57,9 @@ default-package-overrides: # https://github.com/obsidiansystems/dependent-sum-template/issues/5 - dependent-sum-template < 0.1.2 + # hls-floskell-plugin 2.4 does not yet support floskell 0.11 + - floskell < 0.11 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -92,12 +94,15 @@ extra-packages: - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib == 9.6.* # 2023-03-17: preserve for GHC 9.6 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser == 9.6.* # 2023-10-24: preserve for GHC 9.6 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser-ex == 9.6.* # 2023-10-24: preserve for GHC 9.6 - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x @@ -121,17 +126,13 @@ extra-packages: - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - ormolu == 0.5.0.1 # 2022-02-21: for hls on ghc 8.10 + - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - - fourmolu == 0.9.0.0 # 2022-09-21: for hls on ghc 8.10 - - fourmolu == 0.10.1.0 # 2023-04-18: for hls on ghc 9.0 and 9.2 - - fourmolu == 0.13.* # 2023-09-16: latest version compatible with hls 2.2.* on ghc 9.6 - - mod == 0.1.2.2 # needed for hls on ghc 8.10 - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer - - stylish-haskell == 0.14.3.0 # 2022-09-19: needed for hls on ghc 8.8 + - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - th-abstraction < 0.6 # 2023-09-11: needed for aeson-2.2.0.0 @@ -156,6 +157,8 @@ package-maintainers: - hnix-store-remote arturcygan: - hevm + athas: + - futhark berberman: - nvfetcher - arch-web @@ -171,6 +174,7 @@ package-maintainers: centromere: - nfc dalpd: + - dhall-lsp-server - espial - ghc-vis - patat @@ -210,6 +214,9 @@ package-maintainers: - vulkan-utils erictapen: - hakyll + evenbrenden: + - unleash-client-haskell + - unleash-client-haskell-core Gabriella439: - annah - bench @@ -281,8 +288,6 @@ package-maintainers: maralorn: - cabal-fmt - clay - - ema - - emanote - eventlog2html - generic-optics - ghc-debug-brick @@ -325,11 +330,12 @@ package-maintainers: ncfavier: - lambdabot nomeata: + - cabal-plan-bounds - candid - leb128-cereal - - tasty-expected-failure - lhs2tex - rec-def + - tasty-expected-failure peti: - cabal2spec - funcmp @@ -380,6 +386,11 @@ package-maintainers: - taffybar - arbtt - lentil + sheepforce: + - mpi-hs + - mpi-hs-store + - mpi-hs-cereal + - mpi-hs-binary shlok: - streamly-archive - streamly-lmdb @@ -400,6 +411,9 @@ package-maintainers: - ttn-client - update-nix-fetchgit - zre + srid: + - ema + - emanote sternenseemann: # also maintain upstream package - cabal2nix diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 9f46ba60bd..8be7c0fe44 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.11 +# Stackage LTS 21.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -115,9 +115,9 @@ default-package-overrides: - attoparsec-run ==0.0.2.0 - attoparsec-time ==1.0.3 - audacity ==0.0.2.1 - - authenticate ==1.3.5.1 + - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.4 + - autodocodec ==0.2.1.0 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 @@ -148,8 +148,8 @@ default-package-overrides: - base-compat ==0.12.3 - base-compat-batteries ==0.12.3 - basement ==0.0.16 - - base-orphans ==0.9.0 - - base-prelude ==1.6.1 + - base-orphans ==0.9.1 + - base-prelude ==1.6.1.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - battleship-combinatorics ==0.0.1 @@ -182,7 +182,7 @@ default-package-overrides: - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - binary-orphans ==1.0.4.1 - - binary-parser ==0.5.7.3 + - binary-parser ==0.5.7.4 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -199,7 +199,7 @@ default-package-overrides: - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0 - Blammo ==1.1.2.1 - - blank-canvas ==0.7.3 + - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.3 @@ -209,7 +209,7 @@ default-package-overrides: - blaze-builder ==0.4.2.3 - blaze-colonnade ==1.2.2.1 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.8 + - blaze-markup ==0.8.3.0 - blaze-svg ==0.3.7 - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 @@ -245,10 +245,10 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag ==1.0.0.1 - bugsnag-haskell ==0.0.4.4 - - bugsnag-hs ==0.2.0.11 + - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - - bugzilla-redhat ==1.0.1 + - bugzilla-redhat ==1.0.1.1 - burrito ==2.0.1.6 - bv ==0.5 - byteable ==0.1.1 @@ -259,13 +259,13 @@ default-package-overrides: - byte-order ==0.1.3.0 - byteorder ==1.0.4 - bytes ==0.17.3 - - byteset ==0.1.1.0 + - byteset ==0.1.1.1 - byteslice ==0.2.11.1 - bytesmith ==0.3.10.0 - bytestring-builder ==0.10.8.2.0 - bytestring-lexing ==0.5.0.10 - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.6 + - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.10 - bytestring-trie ==0.2.7.2 @@ -279,7 +279,7 @@ default-package-overrides: - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 - cabal-install-solver ==3.8.1.0 - - cabal-rpm ==2.1.2 + - cabal-rpm ==2.1.3 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -365,14 +365,14 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.2.3 + - comfort-array ==0.5.3 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.0.1 + - comfort-blas ==0.0.1 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - - comfort-graph ==0.0.3.2 + - comfort-graph ==0.0.4 - commonmark ==0.2.3 - - commonmark-extensions ==0.2.3.5 + - commonmark-extensions ==0.2.3.6 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.1 @@ -391,7 +391,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.3 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.19 + - concurrent-output ==1.10.20 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -416,10 +416,10 @@ default-package-overrides: - constraints ==0.13.4 - constraints-extras ==0.4.0.0 - constraint-tuples ==0.1.2 - - context ==0.2.0.1 - - context-http-client ==0.2.0.1 - - context-resource ==0.2.0.1 - - context-wai-middleware ==0.2.0.1 + - context ==0.2.0.2 + - context-http-client ==0.2.0.2 + - context-resource ==0.2.0.2 + - context-wai-middleware ==0.2.0.2 - contiguous ==0.6.3.0 - contravariant ==1.5.5 - contravariant-extras ==0.3.5.3 @@ -539,14 +539,14 @@ default-package-overrides: - DBFunctor ==0.1.2.1 - dbus ==1.2.29 - dbus-hslogger ==0.1.0.1 - - debian ==4.0.4 + - debian ==4.0.5 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - dec ==0.0.5 - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.3 + - deferred-folds ==0.9.18.5 - dejafu ==2.4.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -567,6 +567,7 @@ default-package-overrides: - dhall-yaml ==1.2.12 - di ==1.3 - diagrams ==1.4.1 + - diagrams-cairo ==1.4.2.1 - diagrams-canvas ==1.4.1.2 - diagrams-contrib ==1.4.5.1 - diagrams-core ==1.5.1 @@ -656,7 +657,7 @@ default-package-overrides: - editor-open ==0.6.0.0 - effectful ==2.2.2.0 - effectful-core ==2.2.2.2 - - effectful-plugin ==1.1.0.1 + - effectful-plugin ==1.1.0.2 - effectful-th ==1.0.0.1 - either ==5.0.2 - either-both ==0.1.1.1 @@ -701,7 +702,7 @@ default-package-overrides: - errors-ext ==0.4.2 - ersatz ==0.4.13 - esqueleto ==3.5.10.3 - - event-list ==0.1.2 + - event-list ==0.1.2.1 - eventstore ==1.4.2 - every ==0.0.1 - evm-opcodes ==0.1.2 @@ -741,6 +742,7 @@ default-package-overrides: - fast-logger ==3.2.2 - fast-math ==1.0.2 - fastmemo ==0.1.1 + - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 - fcf-family ==0.2.0.0 - fdo-notify ==0.3.1 @@ -859,28 +861,27 @@ default-package-overrides: - genvalidity-case-insensitive ==0.0.0.1 - genvalidity-containers ==1.0.0.1 - genvalidity-criterion ==1.1.0.0 - - genvalidity-hspec ==1.0.0.2 + - genvalidity-hspec ==1.0.0.3 - genvalidity-hspec-aeson ==1.0.0.0 - genvalidity-hspec-binary ==1.0.0.0 - genvalidity-hspec-cereal ==1.0.0.0 - - genvalidity-hspec-hashable ==1.0.0.0 + - genvalidity-hspec-hashable ==1.0.0.1 - genvalidity-hspec-optics ==1.0.0.0 - genvalidity-hspec-persistent ==1.0.0.0 - - genvalidity-mergeful ==0.3.0.0 + - genvalidity-mergeful ==0.3.0.1 - genvalidity-mergeless ==0.3.0.0 - - genvalidity-path ==1.0.0.1 - - genvalidity-persistent ==1.0.0.1 + - genvalidity-persistent ==1.0.0.2 - genvalidity-property ==1.0.0.0 - genvalidity-scientific ==1.0.0.0 - genvalidity-sydtest ==1.0.0.0 - genvalidity-sydtest-aeson ==1.0.0.0 - - genvalidity-sydtest-hashable ==1.0.0.0 + - genvalidity-sydtest-hashable ==1.0.0.1 - genvalidity-sydtest-lens ==1.0.0.0 - genvalidity-sydtest-persistent ==1.0.0.0 - genvalidity-text ==1.0.0.1 - genvalidity-time ==1.0.0.1 - genvalidity-typed-uuid ==0.1.0.1 - - genvalidity-unordered-containers ==1.0.0.0 + - genvalidity-unordered-containers ==1.0.0.1 - genvalidity-uuid ==1.0.0.1 - genvalidity-vector ==1.0.0.0 - geodetics ==0.1.2 @@ -900,11 +901,11 @@ default-package-overrides: - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.12 - ghc-syntax-highlighter ==0.0.9.0 - - ghc-tcplugins-extra ==0.4.4 + - ghc-tcplugins-extra ==0.4.5 - ghc-trace-events ==0.1.2.7 - - ghc-typelits-extra ==0.4.5 - - ghc-typelits-knownnat ==0.7.8 - - ghc-typelits-natnormalise ==0.7.8 + - ghc-typelits-extra ==0.4.6 + - ghc-typelits-knownnat ==0.7.9 + - ghc-typelits-natnormalise ==0.7.9 - ghc-typelits-presburger ==0.7.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.27 @@ -954,7 +955,7 @@ default-package-overrides: - glpk-headers ==0.5.1 - GLURaw ==2.0.0.5 - GLUT ==2.7.0.16 - - gmail-simple ==0.1.0.4 + - gmail-simple ==0.1.0.5 - gnuplot ==0.5.7 - goldplate ==0.2.1.1 - google-isbn ==1.0.3 @@ -984,7 +985,7 @@ default-package-overrides: - hackage-security ==0.6.2.3 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.1.0 + - hakyll ==4.16.2.0 - hal ==1.0.0.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 @@ -1000,7 +1001,7 @@ default-package-overrides: - happy-meta ==0.2.1.0 - harp ==0.4.3.6 - HasBigDecimal ==0.2.0.0 - - hasbolt ==0.1.6.2 + - hasbolt ==0.1.6.3 - hashable ==1.4.3.0 - hashing ==0.1.1.0 - hashmap ==1.3.3 @@ -1034,7 +1035,7 @@ default-package-overrides: - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.2 + - HaTeX ==3.22.4.0 - HaXml ==1.25.13 - haxr ==3000.11.5 - HCodecs ==0.5.2 @@ -1069,7 +1070,7 @@ default-package-overrides: - hfsevents ==0.1.6 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.4.0 + - hi-file-parser ==0.1.5.0 - highlighting-kate ==0.6.4 - hindent ==6.0.0 - hinfo ==0.0.3.0 @@ -1111,7 +1112,7 @@ default-package-overrides: - hpack-dhall ==0.5.7 - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.1.1 - - HPDF ==1.6.1 + - HPDF ==1.6.2 - hpp ==0.6.5 - hpqtypes ==1.11.1.1 - hpqtypes-extras ==1.16.4.4 @@ -1120,7 +1121,7 @@ default-package-overrides: - hruby ==0.5.0.0 - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.9 + - hsc2hs ==0.68.10 - hscolour ==1.24.4 - hsdns ==1.8 - hse-cpp ==0.2 @@ -1128,7 +1129,7 @@ default-package-overrides: - hset ==2.2.0 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - - hsini ==0.5.2.1 + - hsini ==0.5.2.2 - hsinstall ==2.8 - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 @@ -1180,7 +1181,7 @@ default-package-overrides: - HSvm ==0.1.1.3.25 - hsx2hs ==0.14.1.11 - hsx-jmacro ==7.3.8.2 - - HsYAML ==0.2.1.1 + - HsYAML ==0.2.1.2 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - htaglib ==1.2.0 @@ -1209,7 +1210,7 @@ default-package-overrides: - httpd-shed ==0.4.1.1 - http-io-streams ==0.1.6.2 - http-link-header ==1.2.1 - - http-media ==0.8.1.0 + - http-media ==0.8.1.1 - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - http-streams ==0.8.9.8 @@ -1219,7 +1220,7 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.6 - hvect ==0.4.0.1 - - hvega ==0.12.0.5 + - hvega ==0.12.0.7 - hw-balancedparens ==0.4.1.3 - hw-bits ==0.7.2.2 - hw-conduit ==0.2.1.1 @@ -1282,15 +1283,15 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.2.1 + - indexed-traversable ==0.1.3 - indexed-traversable-instances ==0.1.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 - infinite-list ==0.1 - ini ==0.4.2 - inj ==1.0 - - inline-c ==0.9.1.8 - - inline-c-cpp ==0.5.0.1 + - inline-c ==0.9.1.10 + - inline-c-cpp ==0.5.0.2 - inline-r ==1.0.1 - input-parsers ==0.3.0.1 - insert-ordered-containers ==0.2.5.3 @@ -1332,7 +1333,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.9 + - isomorphism-class ==0.1.0.10 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1343,7 +1344,7 @@ default-package-overrides: - jmacro ==0.6.18 - jose ==0.10 - jose-jwt ==0.9.6 - - journalctl-stream ==0.6.0.4 + - journalctl-stream ==0.6.0.5 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1357,11 +1358,11 @@ default-package-overrides: - JuicyPixels ==3.3.8 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 - - junit-xml ==0.1.0.2 + - junit-xml ==0.1.0.3 - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.5 - - kansas-comet ==0.4.1 + - kansas-comet ==0.4.2 - katip ==0.8.7.4 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.2 @@ -1375,11 +1376,11 @@ default-package-overrides: - keyed-vals-mem ==0.2.2.0 - keyed-vals-redis ==0.2.2.0 - keys ==3.12.3 - - ki ==1.0.1.0 + - ki ==1.0.1.1 - kind-apply ==0.4.0.0 - kind-generics ==0.5.0.0 - kind-generics-th ==0.2.3.3 - - ki-unlifted ==1.0.0.1 + - ki-unlifted ==1.0.0.2 - kleene ==0.1 - kmeans ==0.1.3 - knob ==0.2.2 @@ -1454,10 +1455,10 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.8.1 + - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.6 + - list-t ==1.0.5.7 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1548,9 +1549,9 @@ default-package-overrides: - microlens ==0.4.13.1 - microlens-aeson ==2.5.1 - microlens-contra ==0.1.0.3 - - microlens-ghc ==0.4.14.1 + - microlens-ghc ==0.4.14.2 - microlens-mtl ==0.2.0.3 - - microlens-platform ==0.4.3.3 + - microlens-platform ==0.4.3.4 - microlens-th ==0.4.3.14 - microspec ==0.2.1.3 - microstache ==1.0.2.3 @@ -1571,7 +1572,7 @@ default-package-overrides: - mintty ==0.1.4 - misfortune ==0.1.2.1 - missing-foreign ==0.1.1 - - MissingH ==1.6.0.0 + - MissingH ==1.6.0.1 - mixed-types-num ==0.5.12 - mmap ==0.5.9 - mmark ==0.0.7.6 @@ -1603,7 +1604,7 @@ default-package-overrides: - monad-memo ==0.5.4 - monadoid ==0.0.3 - monadology ==0.1 - - monad-par ==0.3.5 + - monad-par ==0.3.6 - monad-parallel ==0.8 - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 @@ -1645,7 +1646,7 @@ default-package-overrides: - multi-containers ==0.2 - multimap ==1.2.1 - multipart ==0.2.1 - - MultipletCombiner ==0.0.6 + - MultipletCombiner ==0.0.7 - multiset ==0.3.4.3 - murmur3 ==1.0.5 - murmur-hash ==0.1.0.10 @@ -1672,7 +1673,7 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.5.1.3 + - neat-interpolation ==0.5.1.4 - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 @@ -1687,7 +1688,7 @@ default-package-overrides: - netwire-input-glfw ==0.0.11 - network ==3.1.4.0 - network-bsd ==2.8.1.0 - - network-byte-order ==0.1.6 + - network-byte-order ==0.1.7 - network-conduit-tls ==1.3.2 - network-info ==0.2.1 - network-ip ==0.3.0.3 @@ -1711,11 +1712,11 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.5 - - non-empty ==0.3.4 + - non-empty ==0.3.5 - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.2.0 + - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 @@ -1841,7 +1842,7 @@ default-package-overrides: - pcg-random ==0.1.4.0 - pcre2 ==2.2.1 - pcre-heavy ==1.0.0.3 - - pcre-light ==0.4.1.0 + - pcre-light ==0.4.1.2 - pcre-utils ==0.1.9 - pdc ==0.1.1 - pdf-toolbox-content ==0.1.1 @@ -1852,8 +1853,8 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.4 - perfect-hash-generator ==1.0.0 - - persistent ==2.14.5.2 - - persistent-discover ==0.1.0.6 + - persistent ==2.14.6.0 + - persistent-discover ==0.1.0.7 - persistent-documentation ==0.1.0.4 - persistent-iproute ==0.2.5 - persistent-lens ==1.0.0 @@ -1861,18 +1862,18 @@ default-package-overrides: - persistent-mtl ==0.5.0.1 - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.5.2 - - persistent-qq ==2.12.0.5 + - persistent-postgresql ==2.13.6.1 + - persistent-qq ==2.12.0.6 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 - - persistent-sqlite ==2.13.1.1 + - persistent-sqlite ==2.13.2.0 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.2.0 - - phantom-state ==0.2.1.3 + - phantom-state ==0.2.1.4 - phatsort ==0.6.0.0 - picosat ==0.1.6 - pid1 ==0.1.3.1 @@ -1908,9 +1909,9 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.1 + - polysemy ==1.9.1.3 - polysemy-fs ==0.1.0.0 - - polysemy-plugin ==0.4.5.0 + - polysemy-plugin ==0.4.5.1 - polysemy-webserver ==0.2.1.2 - pontarius-xmpp ==0.5.6.6 - pooled-io ==0.0.2.3 @@ -1919,7 +1920,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - posix-pty ==0.2.2 - possibly ==1.0.0.0 - - postgres-options ==0.2.0.0 + - postgres-options ==0.2.1.0 - postgresql-binary ==0.13.1 - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 @@ -1955,7 +1956,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.7 + - primitive-extras ==0.10.1.8 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 @@ -1997,7 +1998,7 @@ default-package-overrides: - PyF ==0.11.1.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.8 + - qrcode-core ==0.9.9 - qrcode-juicypixels ==0.8.5 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 @@ -2009,7 +2010,7 @@ default-package-overrides: - quickcheck-classes-base ==0.6.2.0 - quickcheck-groups ==0.0.0.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.29.1 + - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - quickcheck-monoid-subclasses ==0.1.0.0 - quickcheck-simple ==0.1.1.1 @@ -2097,7 +2098,7 @@ default-package-overrides: - rel8 ==1.4.1.0 - relapse ==1.0.0.1 - reliable-io ==0.0.2 - - relude ==1.2.0.0 + - relude ==1.2.1.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2122,10 +2123,10 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.5.0 + - rio-prettyprint ==0.1.7.0 - rng-utils ==0.3.1 - rocksdb-haskell ==1.0.1 - - rocksdb-haskell-jprupp ==2.1.4 + - rocksdb-haskell-jprupp ==2.1.6 - rocksdb-query ==0.4.2 - roles ==0.2.1.0 - rollbar ==1.1.3 @@ -2136,7 +2137,7 @@ default-package-overrides: - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - - rrb-vector ==0.2.0.0 + - rrb-vector ==0.2.0.1 - RSA ==2.4.1 - rss ==3000.2.0.7 - rss-conduit ==0.6.0.1 @@ -2167,11 +2168,11 @@ default-package-overrides: - sample-frame-np ==0.0.5 - sampling ==0.3.5 - sandi ==0.5 - - sandwich ==0.1.5.0 + - sandwich ==0.1.5.2 - sandwich-hedgehog ==0.1.3.0 - sandwich-quickcheck ==0.1.0.7 - sandwich-slack ==0.1.2.0 - - sandwich-webdriver ==0.2.3.0 + - sandwich-webdriver ==0.2.3.1 - say ==0.1.0.1 - sbp ==4.15.0 - sbv ==10.2 @@ -2232,7 +2233,7 @@ default-package-overrides: - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - - servant-multipart-client ==0.12.1 + - servant-multipart-client ==0.12.2 - servant-openapi3 ==2.0.1.6 - servant-pipes ==0.15.3 - servant-rate-limit ==0.2.0.0 @@ -2260,7 +2261,7 @@ default-package-overrides: - SHA ==1.6.4.4 - shake ==0.19.7 - shake-plus ==0.3.4.0 - - shakespeare ==2.1.0 + - shakespeare ==2.1.0.1 - shakespeare-text ==1.1.0 - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 @@ -2291,7 +2292,7 @@ default-package-overrides: - simple-vec3 ==0.6.0.1 - since ==0.0.0 - singleton-bool ==0.1.6 - - singleton-nats ==0.4.6 + - singleton-nats ==0.4.7 - singletons ==3.0.2 - singletons-base ==3.1.1 - singletons-presburger ==0.7.2.0 @@ -2326,7 +2327,7 @@ default-package-overrides: - some-dict-of ==0.1.0.2 - sop-core ==0.5.0.2 - sort ==1.0.0.0 - - sorted-list ==0.2.1.0 + - sorted-list ==0.2.1.2 - sound-collage ==0.2.1 - sourcemap ==0.1.7 - sox ==0.2.3.2 @@ -2338,7 +2339,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - splice ==0.6.1.1 - split ==0.2.3.5 - - splitmix ==0.1.0.4 + - splitmix ==0.1.0.5 - splitmix-distributions ==1.0.0 - split-record ==0.1.1.4 - Spock ==0.14.0.0 @@ -2358,7 +2359,7 @@ default-package-overrides: - srt ==0.1.2.0 - srtree ==1.0.0.5 - stache ==2.3.4 - - stack-all ==0.4.1 + - stack-all ==0.4.2 - stack-clean-old ==0.4.8 - stack-templatizer ==0.1.1.0 - state-codes ==0.1.3 @@ -2368,7 +2369,7 @@ default-package-overrides: - stateWriter ==0.4.0 - static-canvas ==0.2.0.3 - static-text ==0.2.0.7 - - statistics ==0.16.2.0 + - statistics ==0.16.2.1 - statistics-linreg ==0.3 - status-notifier-item ==0.3.1.0 - step-function ==0.2.0.1 @@ -2378,7 +2379,7 @@ default-package-overrides: - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.11 + - stm-hamt ==1.2.0.13 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.7 - stm-split ==0.0.2.1 @@ -2387,10 +2388,10 @@ default-package-overrides: - storable-endian ==0.2.6.1 - storable-record ==0.0.7 - storable-tuple ==0.1 - - storablevector ==0.2.13.1 - - store ==0.7.16 - - store-core ==0.4.4.4 - - store-streaming ==0.2.0.3 + - storablevector ==0.2.13.2 + - store ==0.7.18 + - store-core ==0.4.4.6 + - store-streaming ==0.2.0.5 - stratosphere ==0.60.0 - Stream ==0.4.7.2 - streaming ==0.2.4.0 @@ -2438,28 +2439,28 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.7 - - swish ==0.10.5.0 + - swish ==0.10.7.0 - syb ==0.7.2.4 - - sydtest ==0.15.1.0 + - sydtest ==0.15.1.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 - - sydtest-discover ==0.0.0.3 + - sydtest-discover ==0.0.0.4 - sydtest-hedgehog ==0.4.0.0 - sydtest-hedis ==0.0.0.0 - sydtest-mongo ==0.0.0.0 - - sydtest-persistent ==0.0.0.1 - - sydtest-persistent-postgresql ==0.2.0.2 - - sydtest-persistent-sqlite ==0.2.0.2 + - sydtest-persistent ==0.0.0.2 + - sydtest-persistent-postgresql ==0.2.0.3 + - sydtest-persistent-sqlite ==0.2.0.3 - sydtest-process ==0.0.0.0 - sydtest-rabbitmq ==0.1.0.0 - sydtest-servant ==0.2.0.2 - sydtest-typed-process ==0.0.0.0 - - sydtest-wai ==0.2.0.0 + - sydtest-wai ==0.2.0.1 - sydtest-webdriver ==0.0.0.1 - - sydtest-webdriver-screenshot ==0.0.0.1 + - sydtest-webdriver-screenshot ==0.0.0.2 - sydtest-webdriver-yesod ==0.0.0.1 - - sydtest-yesod ==0.3.0.1 + - sydtest-yesod ==0.3.0.2 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2489,10 +2490,10 @@ default-package-overrides: - tar-conduit ==0.3.2.1 - tardis ==0.4.4.0 - tasty ==1.4.3 - - tasty-ant-xml ==1.1.8 + - tasty-ant-xml ==1.1.9 - tasty-autocollect ==0.4.1 - - tasty-bench ==0.3.4 - - tasty-dejafu ==2.1.0.0 + - tasty-bench ==0.3.5 + - tasty-dejafu ==2.1.0.1 - tasty-discover ==5.0.0 - tasty-expected-failure ==0.12.3 - tasty-fail-fast ==0.0.3 @@ -2502,7 +2503,7 @@ default-package-overrides: - tasty-hslua ==1.1.0 - tasty-hspec ==1.2.0.3 - tasty-html ==0.4.2.1 - - tasty-hunit ==0.10.0.3 + - tasty-hunit ==0.10.1 - tasty-hunit-compat ==0.2.0.1 - tasty-inspection-testing ==0.2 - tasty-kat ==0.0.3 @@ -2510,8 +2511,8 @@ default-package-overrides: - tasty-lua ==1.1.0 - tasty-program ==1.1.0 - tasty-quickcheck ==0.10.2 - - tasty-rerun ==1.1.18 - - tasty-silver ==3.3.1.1 + - tasty-rerun ==1.1.19 + - tasty-silver ==3.3.1.2 - tasty-smallcheck ==0.8.2 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 @@ -2544,7 +2545,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8.2 + - texmath ==0.12.8.3 - text-ansi ==0.2.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2552,7 +2553,7 @@ default-package-overrides: - text-builder-linear ==0.1.1.1 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - - text-icu ==0.8.0.2 + - text-icu ==0.8.0.4 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2564,7 +2565,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10.4 - - text-show-instances ==3.9.6 + - text-show-instances ==3.9.7 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2588,7 +2589,7 @@ default-package-overrides: - th-printf ==0.7 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - threads ==0.5.1.7 + - threads ==0.5.1.8 - threads-extras ==0.1.0.3 - thread-supervisor ==0.2.0.0 - th-reify-compat ==0.0.1.5 @@ -2667,7 +2668,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.9 - - typed-process ==0.2.11.0 + - typed-process ==0.2.11.1 - typed-uuid ==0.2.0.0 - type-equality ==1 - type-errors ==0.2.0.2 @@ -2688,7 +2689,7 @@ default-package-overrides: - typst-symbols ==0.1.4 - tz ==0.1.3.6 - tzdata ==0.2.20230322.0 - - tztime ==0.1.0.0 + - tztime ==0.1.1.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - ulid ==0.3.2.0 @@ -2728,7 +2729,7 @@ default-package-overrides: - universum ==1.8.2 - unix-bytestring ==0.4.0 - unix-compat ==0.7 - - unix-time ==0.4.10 + - unix-time ==0.4.11 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -2748,17 +2749,16 @@ default-package-overrides: - utf8-string ==1.0.2 - utility-ht ==0.0.17 - uuid ==1.3.15 - - uuid-types ==1.0.5 + - uuid-types ==1.0.5.1 - valida ==1.1.0 - valida-base ==0.2.0 - validate-input ==0.5.0.0 - validationt ==0.3.0 - - validity ==0.12.0.1 + - validity ==0.12.0.2 - validity-aeson ==0.2.0.5 - validity-bytestring ==0.4.1.1 - validity-case-insensitive ==0.0.0.0 - validity-containers ==0.5.0.4 - - validity-path ==0.4.0.1 - validity-persistent ==0.0.0.0 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 @@ -2772,7 +2772,7 @@ default-package-overrides: - vault ==0.3.1.5 - vcs-ignore ==0.0.2.0 - vec ==0.5 - - vector ==0.13.0.0 + - vector ==0.13.1.0 - vector-algorithms ==0.9.0.1 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 @@ -2789,7 +2789,7 @@ default-package-overrides: - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==6.0.1 + - versions ==6.0.2 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2809,7 +2809,7 @@ default-package-overrides: - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - wai-extra ==3.1.13.0 - - wai-feature-flags ==0.1.0.6 + - wai-feature-flags ==0.1.0.7 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 - wai-middleware-bearer ==1.0.3 @@ -2918,17 +2918,17 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.17 - - Yampa ==0.14.4 + - Yampa ==0.14.5 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - - yesod-auth ==1.6.11.1 + - yesod-auth ==1.6.11.2 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.1.1 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.4 + - yesod-core ==1.6.24.5 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.6 @@ -2945,7 +2945,7 @@ default-package-overrides: - yesod-routes-flow ==3.0.0.2 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.15 + - yesod-test ==1.6.16 - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d33f3f2c1..9eaabf6c8a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,7 +22,6 @@ dont-distribute-packages: - Advise-me - AlgoRhythm - AlignmentAlgorithms - - Allure - AndroidViewHierarchyImporter - Annotations - ApplePush @@ -33,6 +32,7 @@ dont-distribute-packages: - BPS - Barracuda - BerlekampAlgorithm + - BesselJ - BioHMM - Biobase - BiobaseBlast @@ -113,6 +113,7 @@ dont-distribute-packages: - Fin - Finance-Treasury - FiniteCategories + - FiniteCategoriesGraphViz - FiniteMap - FirstOrderTheory - Flippi @@ -250,8 +251,8 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 + - LPFP - LPPaver - - LambdaHack - LambdaINet - LambdaPrettyQuote - LambdaShell @@ -403,6 +404,7 @@ dont-distribute-packages: - UTFTConverter - UrlDisp - ViennaRNA-extras + - Vis - WEditorBrick - WEditorHyphen - WL500gPControl @@ -485,8 +487,6 @@ dont-distribute-packages: - amby - ampersand - amqp-streamly - - amqp-utils_0_6_4_0 - - amqp_0_22_2 - analyze-client - anatomy - animate-example @@ -599,6 +599,7 @@ dont-distribute-packages: - babylon - backblaze-b2-hs - backdropper + - balkon - ballast - bamboo - bamboo-launcher @@ -747,7 +748,6 @@ dont-distribute-packages: - cakyrespa - cal3d-examples - cal3d-opengl - - calamity - calc - calculator - caldims @@ -847,6 +847,8 @@ dont-distribute-packages: - clash-vhdl - clashilator - classify-frog + - classy-effects + - classy-effects-th - classy-miso - clckwrks - clckwrks-cli @@ -986,6 +988,7 @@ dont-distribute-packages: - craftwerk-cairo - craftwerk-gtk - craze + - credentials-cli - crf-chain1 - crf-chain1-constrained - crf-chain2-generic @@ -1145,10 +1148,12 @@ dont-distribute-packages: - distributed-process-systest - distributed-process-task - distributed-process-tests + - distributed-process-zookeeper - distributed-static - distribution-plot - dixi - dl-fedora + - dl-fedora_1_0 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1479,9 +1484,11 @@ dont-distribute-packages: - ghc-dump-util - ghc-imported-from - ghc-instances + - ghc-lib_9_8_1_20231009 - ghc-mod - ghc-plugs-out - ghc-session + - ghc_9_8_1 - ghci-pretty - ghcide-bench - ghcjs-dom-hello @@ -1491,7 +1498,6 @@ dont-distribute-packages: - ght - gi-cairo-again - gi-ges - - gi-gsk - gi-gstpbutils - gi-gtk-declarative-app-simple - gi-gtk_4_0_8 @@ -1720,8 +1726,6 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters - - google-maps-geocoding - - google-static-maps - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -1887,7 +1891,6 @@ dont-distribute-packages: - haskell-pdf-presenter - haskell-platform-test - haskell-reflect - - haskell-snake - haskell-src-exts-observe - haskell-token-utils - haskell-tools-ast @@ -1933,7 +1936,6 @@ dont-distribute-packages: - haskoin-crypto - haskoin-protocol - haskoin-script - - haskoin-store - haskoon - haskoon-httpspec - haskoon-salvia @@ -2004,6 +2006,8 @@ dont-distribute-packages: - hedgehog-checkers-lens - hedgehog-gen-json - hedis-pile + - heftia + - heftia-effects - heist-aeson - heist-async - heist-extra @@ -2027,6 +2031,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner + - hetzner_0_5_0_0 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2183,9 +2188,7 @@ dont-distribute-packages: - htoml-parse - htsn-import - http-client-auth - - http-client-restricted_0_1_0 - http-client-rustls - - http-client-tls_0_3_6_3 - http-enumerator - http-exchange - http-exchange-instantiations @@ -2488,6 +2491,7 @@ dont-distribute-packages: - ldapply - leaky - lean + - learn-physics_0_6_6 - learning-hmm - legion - legion-discovery @@ -2539,6 +2543,7 @@ dont-distribute-packages: - liquid-prelude - liquid-vector - liquidhaskell + - liquidhaskell-boot - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser @@ -2812,7 +2817,6 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt_0_8_6_0 - net-spider - net-spider-cli - net-spider-pangraph @@ -2826,7 +2830,6 @@ dont-distribute-packages: - nettle-openflow - network-anonymous-i2p - network-anonymous-tor - - network-conduit-tls_1_4_0 - network-connection - network-enumerator - network-hans @@ -3017,6 +3020,7 @@ dont-distribute-packages: - phonetic-languages-simplified-common - phonetic-languages-simplified-examples-array - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-lists-examples - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double @@ -3109,6 +3113,7 @@ dont-distribute-packages: - potoki-conduit - potoki-hasql - potoki-zlib + - powerqueue-sqs - pqueue-mtl - practice-room - pred-set @@ -3339,7 +3344,6 @@ dont-distribute-packages: - repo-based-blog - repr - representable-tries - - req_3_13_1 - reserve - resin - resource-simple @@ -3562,7 +3566,6 @@ dont-distribute-packages: - shady-gen - shady-graphics - shake-bindist - - shake-futhark - shake-minify-css - shakebook - shaker @@ -3739,6 +3742,7 @@ dont-distribute-packages: - stackage-sandbox - stackage-setup - stackage-upload + - stackage2nix - stackctl - starrover2 - stateful-mtl @@ -3772,6 +3776,7 @@ dont-distribute-packages: - stripe-tests - strongswan-sql - structural-induction + - structured-haskell-mode - structured-mongoDB - stunts - stutter @@ -3827,7 +3832,6 @@ dont-distribute-packages: - tagged-th - tagsoup-navigate - tagstew - - tahoe-chk - tahoe-directory - tahoe-great-black-swamp - tahoe-ssk @@ -4178,7 +4182,6 @@ dont-distribute-packages: - workflow-extra - workflow-pure - workflow-types - - wraxml - wrecker - wrecker-ui - wright @@ -4190,7 +4193,6 @@ dont-distribute-packages: - wumpus-drawing - wumpus-microprint - wumpus-tree - - wuss_2_0_1_4 - wx - wxAsteroids - wxFruit @@ -4310,4 +4312,5 @@ dont-distribute-packages: - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile + - zoovisitor - zuramaru diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index c0e514aed8..037019be4d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -93,13 +93,6 @@ self: super: builtins.intersectAttrs super { doCheck = false; }) super.ghcide; - # Test suite needs executable - agda2lagda = overrideCabal (drv: { - preCheck = '' - export PATH="$PWD/dist/build/agda2lagda:$PATH" - '' + drv.preCheck or ""; - }) super.agda2lagda; - hiedb = overrideCabal (drv: { preCheck = '' export PATH=$PWD/dist/build/hiedb:$PATH @@ -185,6 +178,14 @@ self: super: builtins.intersectAttrs super { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + # Test suite needs executable + agda2lagda = overrideCabal (drv: { + preCheck = '' + export PATH="$PWD/dist/build/agda2lagda:$PATH" + '' + drv.preCheck or ""; + }) super.agda2lagda; + + audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; }) super.audacity); @@ -1341,4 +1342,24 @@ self: super: builtins.intersectAttrs super { gi-webkit2 gi-webkit2webextension ; + + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. + # Also adds required test dependencies for checks to pass + mpi-hs = + let validMpi = [ "openmpi" "mpich" "mvapich" ]; + mpiImpl = pkgs.mpi.pname; + disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); + in lib.pipe + (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] + ++ disableUnused + ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) + ); + inherit (lib.mapAttrs (_: addTestToolDepends + [ pkgs.openssh pkgs.mpiCheckPhaseHook ] + ) super) + mpi-hs-store + mpi-hs-cereal + mpi-hs-binary + ; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index 7001e4220b..0b8af6ba6d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -811,5 +811,18 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != []) { inherit postPhases; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } + +# Implicit pointer to integer conversions are errors by default since clang 15. +# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. +// lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; +} + +# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`. +# Works around https://github.com/NixOS/nixpkgs/issues/166205. +# This can be dropped once a fix has been committed to cc-wrapper. +// lib.optionalAttrs (stdenv.cc.isClang && stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; +} ) ) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index f7749e4094..7377db003b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,39 +811,39 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, case-insensitive + ({ mkDerivation, aeson, alex, ansi-terminal, array, async, base + , binary, blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, dlist, edit-distance , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev , happy, hashable, haskeline, monad-control, mtl, murmur-hash - , parallel, pretty, process, regex-tdfa, split, stm, STMonadTrans - , strict, text, time, time-compat, transformers + , parallel, peano, pretty, process, regex-tdfa, split, stm + , STMonadTrans, strict, text, time, time-compat, transformers , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.3"; - sha256 = "05k0insn1c2dbpddl1slcdn972j8vgkzzy870yxl43j75j0ckb5y"; - revision = "4"; - editedCabalFile = "1xfhn4ap5h5aj9vp9m474p98jz7g4azf5m7ngwbj7ivhgnkl32wh"; + version = "2.6.4"; + sha256 = "0jzgynv737f4lwamyx1lihrabib0qcaik3cs5zrxryjpj5qvqb2v"; + revision = "1"; + editedCabalFile = "1n3w7ajswgafyjzc8ym1dqpmralnsaj3923qxvs4n0xdc6rc72r9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - case-insensitive containers data-hash deepseq directory dlist - edit-distance equivalence exceptions filepath ghc-compact gitrev - hashable haskeline monad-control mtl murmur-hash parallel pretty - process regex-tdfa split stm STMonadTrans strict text time - time-compat transformers unordered-containers uri-encode vector - vector-hashtables zlib + aeson ansi-terminal array async base binary blaze-html boxes + bytestring case-insensitive containers data-hash deepseq directory + dlist edit-distance equivalence exceptions filepath ghc-compact + gitrev hashable haskeline monad-control mtl murmur-hash parallel + peano pretty process regex-tdfa split stm STMonadTrans strict text + time time-compat transformers unordered-containers uri-encode + vector vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.abbradar lib.maintainers.iblech lib.maintainers.turion @@ -867,15 +867,17 @@ self: { }) {}; "AhoCorasick" = callPackage - ({ mkDerivation, array, base, hashable, mtl, unordered-containers + ({ mkDerivation, array, base, containers, hashable, mtl, tasty + , tasty-hunit, unordered-containers }: mkDerivation { pname = "AhoCorasick"; - version = "0.0.3"; - sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza"; + version = "0.0.4"; + sha256 = "12ddmnmlf46g23j31q0rgh67bh0brjb6p5iax5qi78n39c0pwlz5"; libraryHaskellDepends = [ array base hashable mtl unordered-containers ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Aho-Corasick string matching algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -994,7 +996,6 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Allure"; }) {}; @@ -1167,6 +1168,23 @@ self: { broken = true; }) {}; + "AsyncRattus" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, hashtables + , simple-affine-space, transformers + }: + mkDerivation { + pname = "AsyncRattus"; + version = "0.1.0.1"; + sha256 = "0q1ly8452dyyhgfy94k122mrk6v9wwzmszfp41rs8asqfvlj905f"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc hashtables simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "An asynchronous modal FRP language"; + license = lib.licenses.bsd3; + }) {}; + "AttoBencode" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual , bytestring, containers, QuickCheck, test-framework @@ -1519,6 +1537,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "BesselJ" = callPackage + ({ mkDerivation, base, gamma, numerical-integration + , system-cxx-std-lib, tasty, tasty-hunit + }: + mkDerivation { + pname = "BesselJ"; + version = "0.2.0.1"; + sha256 = "1s5pmaycxrxkidndg23y3b6rpk0vfqc5l603kh273fgvmif5h77l"; + libraryHaskellDepends = [ + base gamma numerical-integration system-cxx-std-lib + ]; + testHaskellDepends = [ base gamma tasty tasty-hunit ]; + description = "Bessel J-function, Anger J-function, Weber E-function, and Anger-Weber function"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "BiGUL" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell, th-extras }: @@ -2074,6 +2109,8 @@ self: { pname = "Blammo"; version = "1.1.2.1"; sha256 = "0j71glqsvzrmvj5ag32n48ib8wyyasjw0vdz2g93l2g2zhmsyz8y"; + revision = "1"; + editedCabalFile = "12kfvkvc78d386w4v8wdhwb3xd6470cnpqsaxd5kwldvvaz5hznj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2816,15 +2853,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_1_0" = callPackage + "Cabal_3_10_2_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.1.0"; - sha256 = "1vlqrh75s1n82ymd7yxbmy9py1n35fvdhw7hn1ph2y1i9j7apnqb"; + version = "3.10.2.0"; + sha256 = "0nsnf14ja30vhsqf2scaqb1a4wjr8491i83nxi4r9m47m40yw8sc"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2895,15 +2932,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_10_1_0" = callPackage + "Cabal-syntax_3_10_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers, unix }: mkDerivation { pname = "Cabal-syntax"; - version = "3.10.1.0"; - sha256 = "08pmafs761bk892s2arf8s17wswhxr8ar642vsh6hxrjalihk01v"; + version = "3.10.2.0"; + sha256 = "0j2j4r93rjidrgfjgwfm25l369yq3zklcqvgq4891k9ik98irkvs"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3076,8 +3113,8 @@ self: { pname = "Chart"; version = "1.9.4"; sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; - revision = "1"; - editedCabalFile = "0l9irzb4zq5jhgl1rvwgxz6rrzxjndj4arjv7adlzs5zl43iazqr"; + revision = "3"; + editedCabalFile = "0yppwi2cqy46dzasbdvq2120m8zrak1lj1qhlv5x7dzbdrji0529"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -5242,6 +5279,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "EVP" = callPackage + ({ mkDerivation, base, containers, data-default-class, text, yaml + }: + mkDerivation { + pname = "EVP"; + version = "0"; + sha256 = "1hix7vl8yaagmdzr6flxfxqmnvv04mcja9rp539iiixmams5q5jd"; + libraryHaskellDepends = [ + base containers data-default-class text yaml + ]; + testHaskellDepends = [ base text ]; + description = "Environment Variable Parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "Earley" = callPackage ({ mkDerivation, base, criterion, deepseq, ListLike, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -6235,26 +6289,45 @@ self: { }) {}; "FiniteCategories" = callPackage - ({ mkDerivation, base, containers, directory, fgl, filepath - , graphviz, process, random, text, WeakSets + ({ mkDerivation, base, containers, directory, filepath, random + , text, WeakSets }: mkDerivation { pname = "FiniteCategories"; - version = "0.2.0.0"; - sha256 = "1sv1p5q3nja0hh60k6d86l50hl8na7y9mmp45zgx7ai9kpwa30ap"; + version = "0.5.0.0"; + sha256 = "022cli3n96389dkcff85kbg95a2v4zmr66pmv36g1pjxvgsr6ffn"; libraryHaskellDepends = [ - base containers directory fgl filepath graphviz process random text - WeakSets + base containers directory filepath random text WeakSets ]; testHaskellDepends = [ - base containers directory fgl filepath graphviz process random text - WeakSets + base containers directory filepath random text WeakSets ]; description = "Finite categories and usual categorical constructions on them"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; }) {}; + "FiniteCategoriesGraphViz" = callPackage + ({ mkDerivation, base, containers, directory, fgl, filepath + , FiniteCategories, graphviz, process, random, text, WeakSets + }: + mkDerivation { + pname = "FiniteCategoriesGraphViz"; + version = "0.2.0.0"; + sha256 = "1ff4mqbqlpki959d9qcq6h91v4p93iq4llac47kgzv98mcwvy146"; + libraryHaskellDepends = [ + base containers directory fgl filepath FiniteCategories graphviz + process random text WeakSets + ]; + testHaskellDepends = [ + base containers directory fgl filepath FiniteCategories graphviz + process random text WeakSets + ]; + description = "Transform objects of the package FiniteCategories into graphs using GraphViz"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "FiniteMap" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -6303,6 +6376,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "Flint2" = callPackage + ({ mkDerivation, base, flint, gmp, groups, QuickCheck }: + mkDerivation { + pname = "Flint2"; + version = "0.1.0.1"; + sha256 = "1jw0x82mgqy4pxwxpyv0crz7n72kv255iq4pxr8c5xkvsw6w2w5i"; + libraryHaskellDepends = [ base groups QuickCheck ]; + librarySystemDepends = [ flint gmp ]; + libraryPkgconfigDepends = [ flint gmp ]; + testHaskellDepends = [ base ]; + description = "Haskell bindings for the flint library for number theory"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) flint; inherit (pkgs) gmp;}; + "Flippi" = callPackage ({ mkDerivation, base, cgi, containers, directory, haskell98 , old-time, parsec, xhtml @@ -8978,8 +9067,8 @@ self: { }: mkDerivation { pname = "HList"; - version = "0.5.2.0"; - sha256 = "00gfghf3dxa4f3r5kvwd8n2yfgc4paa7vbk1h8mlxykb7kxwx2n1"; + version = "0.5.3.0"; + sha256 = "0azwcaky2jlf4ldbj3aasv8i457g67ih9aap6qgjcmdz6q8ad2f4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base-orphans ghc-prim mtl profunctors semigroups tagged @@ -9181,8 +9270,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.6.1"; - sha256 = "078rx1p3352ha64yg2y7w085inkk2p2m8j7ajafw6xrfcfybzw1l"; + version = "1.6.2"; + sha256 = "0a28fg6h0aw8l3fb278jf1xh3jjkjcl3i9cj1j86a991j0mabl3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9560,8 +9649,8 @@ self: { ({ mkDerivation, base, containers, hashable, hashtables }: mkDerivation { pname = "HSet"; - version = "0.0.1"; - sha256 = "0snix2qdj1d66v6qj6fl0zizl617kjzbmxiswdd5i0b5lzjkpagb"; + version = "0.0.2"; + sha256 = "0iz040fl4pmn1h6mqkma1c66yfmfyx4yzhyn0985jc692lj1ysqh"; libraryHaskellDepends = [ base containers hashable hashtables ]; description = "Faux heterogeneous sets"; license = lib.licenses.bsd3; @@ -9727,8 +9816,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; - revision = "2"; - editedCabalFile = "1bpq8xjyrgcxs6yf6wh7ada2xrln1dqi02b5ilj8gwn1p30hq8nr"; + revision = "3"; + editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -10009,8 +10098,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.2"; - sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj"; + version = "3.22.4.0"; + sha256 = "1amna2ya9ika0x9nzxnn7a6450lz5nivm9kn8c9qz9g5d41fayx6"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10100,6 +10189,8 @@ self: { pname = "HaXml"; version = "1.25.13"; sha256 = "0wxkp9bnbnjrjrzsmpm6nknzn0ijiiajd5kms81kgyfypm4m91ax"; + revision = "1"; + editedCabalFile = "0rj3d04yw276hwbw09x2ydm5pmkfmm917cc540bwi9x108ksbr1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11167,6 +11258,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.7.6"; sha256 = "18n7yhffqhgl2favmwlky9j0xx61bhs1akhf7ccc3ajapf8y4bb6"; + revision = "1"; + editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11284,10 +11377,8 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.2.1.1"; - sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; - revision = "5"; - editedCabalFile = "018lvykffss0mmip9qr9bhqrmxvsznxwfyqi8jqi85r5vjy97n6h"; + version = "0.2.1.2"; + sha256 = "1k8azk85jqwqcfbw9bcpj3vqy3y0xd525c9pwm2hjppna8jkxm86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11301,6 +11392,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "HsYAML_0_2_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.1.3"; + sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl , scientific, text, unordered-containers, vector @@ -11309,8 +11422,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "8"; - editedCabalFile = "0wprpy6312ly8dh5w2fdr5ni0p3ywfn8m6axmzh8i79zjaffnxcl"; + revision = "10"; + editedCabalFile = "1x99nqpd037a5p0lqk6qn9cmdafgcajk4gnvxd5dw5gdpyq85x3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12607,8 +12720,8 @@ self: { }: mkDerivation { pname = "LDAPv3"; - version = "0.1.1.0"; - sha256 = "164d3n9gi236qghbb0pyqi7f9c3w5xmj1p5h315zcrcc1hydac0m"; + version = "0.1.2.0"; + sha256 = "09x8s9yh821lcc60sxifcy2pbzghnp9aw0vk6mcnrj0lb741f6f4"; libraryHaskellDepends = [ base binary bytestring containers deepseq int-cast newtype parsec text text-short @@ -12625,24 +12738,36 @@ self: { "LPFP" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib - , gloss, gnuplot, linear, not-gloss, spatial-math + , gloss, gnuplot, linear, SpatialMath, Vis }: mkDerivation { pname = "LPFP"; - version = "1.1"; - sha256 = "0r5h06aqd6b74shfzl45rzmfd8plpmbp00k244mrxh2qjhscra71"; + version = "1.1.1"; + sha256 = "1j4jhkrwpvzj5dr3j63l78g0y555vcgdcp6kqk2s8nm4ja7apysi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers diagrams-cairo diagrams-lib gloss gnuplot not-gloss - spatial-math + base containers diagrams-cairo diagrams-lib gloss gnuplot linear + SpatialMath Vis ]; executableHaskellDepends = [ - base diagrams-cairo diagrams-lib gloss gnuplot linear not-gloss - spatial-math + base diagrams-cairo diagrams-lib gloss gnuplot linear SpatialMath + Vis ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "LPFP-core" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "LPFP-core"; + version = "1.1.1"; + sha256 = "030n95g1hq2ikawbwifgqzjfdg2y6hyl8vpvybg7ha36hb6vafn1"; + libraryHaskellDepends = [ base containers ]; + description = "Code for the book Learn Physics with Functional Programming"; + license = lib.licenses.bsd3; }) {}; "LPPaver" = callPackage @@ -12824,7 +12949,6 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "LambdaHack"; }) {}; @@ -13203,10 +13327,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.8.1"; - sha256 = "10i1ynfhafnmiw0ka9w0v05y5dcdcifsh0kx5f8py1k5ax1ha4by"; - revision = "1"; - editedCabalFile = "1kalhs60wszshvni5awwnmr7bzbz0j602z76lik44arcxghf3ck8"; + version = "4.7.8.2"; + sha256 = "1m7rmz8qkyb6c2mag4p39gw9cjhw7xdsshvb7vik8694l3qplqxd"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14003,28 +14125,6 @@ self: { }) {}; "MissingH" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time - , parsec, process, regex-compat, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.6.0.0"; - sha256 = "0krd15c5c1k92zm1w2qmqwib2gg93bxqz76xmyhcjkx1l229cfzw"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process regex-compat time - unix - ]; - testHaskellDepends = [ - base containers directory filepath HUnit old-time parsec - regex-compat time unix - ]; - description = "Large utility library"; - license = lib.licenses.bsd3; - }) {}; - - "MissingH_1_6_0_1" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time , parsec, process, regex-compat, time, unix @@ -14033,6 +14133,8 @@ self: { pname = "MissingH"; version = "1.6.0.1"; sha256 = "0f5d7ws2vqm1vpwjab9cp691jn5j3dxycfn4w5p1rb4aim504aa9"; + revision = "1"; + editedCabalFile = "08zq00a2anzs6i7ml8dsbah45skgb95nljqn86ixa2gqya6ki253"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -14044,7 +14146,6 @@ self: { ]; description = "Large utility library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "MissingK" = callPackage @@ -14267,8 +14368,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "3"; - editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz"; + revision = "4"; + editedCabalFile = "0hz8l2yx9p5qwis7lxsnk7n3zss00hw3rxphhj6ih56ppjv7d6h3"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14518,18 +14619,6 @@ self: { }) {}; "MultipletCombiner" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "MultipletCombiner"; - version = "0.0.6"; - sha256 = "18kfn355zib3mhssm4zqnr3ily4snxsjnkxhca453vhhs6n8fca2"; - libraryHaskellDepends = [ base HUnit ]; - testHaskellDepends = [ base HUnit ]; - description = "A Haskell implementation for combining SU(n) multiplets"; - license = lib.licenses.bsd3; - }) {}; - - "MultipletCombiner_0_0_7" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "MultipletCombiner"; @@ -14539,7 +14628,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "A Haskell implementation for combining SU(n) multiplets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Munkres" = callPackage @@ -14869,8 +14957,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.3.0"; - sha256 = "1334i8hqacsd2nr9798dibdfn7dci2r4afhhghch5nwcxm15qk6i"; + version = "3.4.0"; + sha256 = "0j2z1rb6jny4kpn43d7pp1kdj1djpmai95k6glhydb9ls7k9zpc0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15666,6 +15754,8 @@ self: { pname = "OneTuple"; version = "0.4.1.1"; sha256 = "0axv63061gzjg6b31h9zg6v54fms6ggd1m8v6kcclmqyxva69ry9"; + revision = "1"; + editedCabalFile = "10p6wvv3z8xp2zgai9ay2dnzp8zzry5mglr61sgzp1i02znzsbb3"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base foldable1-classes-compat hashable template-haskell @@ -16118,6 +16208,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; + revision = "1"; + editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17208,12 +17300,14 @@ self: { }) {}; "QuickCheck-GenT" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, random }: + ({ mkDerivation, base, mmorph, QuickCheck, random, transformers }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.2.2"; - sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz"; - libraryHaskellDepends = [ base mtl QuickCheck random ]; + version = "0.2.2.1"; + sha256 = "16kn7l98h7px3644gjc24a8pgisy1gr3w5k4gzw71dp6msqcbnqh"; + libraryHaskellDepends = [ + base mmorph QuickCheck random transformers + ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; }) {}; @@ -17791,6 +17885,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "Rattus_0_5_1_1" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space + , transformers + }: + mkDerivation { + pname = "Rattus"; + version = "0.5.1.1"; + sha256 = "171ssph6mx12cfc1wx63qn41s7w7fsv686kr6zchd2dg6pwn60gz"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "A modal FRP language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -19853,6 +19965,28 @@ self: { mainProgram = "SpacePrivateers"; }) {}; + "SpatialMath" = callPackage + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens + , linear, QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "SpatialMath"; + version = "0.2.7.1"; + sha256 = "0ikl4yzrp3blhrw6i29xympvw6s6wfkbmq446gnkbnfv455xmdgw"; + revision = "1"; + editedCabalFile = "1jc32ff5005hjhi72jc8qb7r2lvzi5dq54yk102pq4015kr4n5q6"; + libraryHaskellDepends = [ + base binary cereal ghc-prim lens linear + ]; + testHaskellDepends = [ + base doctest QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "3d math including quaternions/euler angles/dcms and utility functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "SpinCounter" = callPackage ({ mkDerivation, base, monad-loops, ref-mtl, stm }: mkDerivation { @@ -21736,6 +21870,25 @@ self: { broken = true; }) {}; + "Vis" = callPackage + ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL + , OpenGLRaw, SpatialMath, time, vector, vector-binary-instances + }: + mkDerivation { + pname = "Vis"; + version = "0.7.7.0"; + sha256 = "1qsk7qc1d5j4wbn65ah1p33k548q68sd7w0sv4i3c7qj61hpmh09"; + revision = "2"; + editedCabalFile = "0ipr0qq2szrck21akrip2ib82xxsys84y4hdm2mk1cvs3vy1f8mm"; + libraryHaskellDepends = [ + base binary bmp bytestring GLUT OpenGL OpenGLRaw SpatialMath time + vector vector-binary-instances + ]; + description = "Painless 3D graphics, no affiliation with gloss"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21753,8 +21906,8 @@ self: { }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.5"; - sha256 = "1brqn6zx4ynljc424dpwrxj5fjmvl0mgp7wycnzpfxpfmwwqib4a"; + version = "0.11.0.1"; + sha256 = "0v8grsc28sni1mapnr56mvmg956q8nw6qqkdfwwhksyykfz6w9fm"; libraryHaskellDepends = [ base bytestring system-cxx-std-lib transformers vector vulkan ]; @@ -21947,8 +22100,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.4.0.0"; - sha256 = "1wx5m6x8xswjzavwxkhmpha4b8mb61qjsw1n0726acxmjrxrkw3y"; + version = "1.5.0.0"; + sha256 = "1h6n8z1f097rgzymx4ivqbkwiv7c9ignkpbybp342rw3k6cd7rk3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -22811,8 +22964,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.4"; - sha256 = "1lj1fj77ajckxhv9avx22djyl4jp44693y54j6hyx0xfp4dafhr5"; + version = "0.14.5"; + sha256 = "1pr9g5rhxx9v54f4d0cjwy9yr6wd32ssi23wms8kmf9avjbi0gms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24981,6 +25134,8 @@ self: { pname = "ad"; version = "4.5.4"; sha256 = "034n4zabzbbxc8bbc6drc0pam0cn12ijad0z2i3gdcqqn93bcap1"; + revision = "1"; + editedCabalFile = "1ngiimld502c4lhp5fba5lbcv007kqhwipmrk1918rdj722hxkvg"; libraryHaskellDepends = [ adjunctions array base comonad containers data-reify erf free nats reflection semigroups transformers @@ -25028,6 +25183,17 @@ self: { broken = true; }) {}; + "adaptive-cubature" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "adaptive-cubature"; + version = "0.1.1.0"; + sha256 = "07zi06qqmrn14awz7vxn5rx1j62fc9xp2qx52s1j91kh9zy8pzxn"; + libraryHaskellDepends = [ base ]; + description = "Multidimensional integration"; + license = lib.licenses.gpl3Only; + }) {}; + "adaptive-tuple" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -25218,8 +25384,8 @@ self: { pname = "adjunctions"; version = "4.4.2"; sha256 = "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql"; - revision = "1"; - editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp"; + revision = "2"; + editedCabalFile = "07bqjrmlhz67y2jnflphqd521yji9gw40dpp5wy54gcdnzk6l81h"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -25527,7 +25693,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_0_0" = callPackage + "aeson_2_2_1_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist , exceptions, filepath, generic-deriving, generically, ghc-prim @@ -25541,15 +25707,17 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.0.0"; - sha256 = "0z1f65iv0sigiqmm4vwbj3bzmn0ka0m56nkalhv2h5r9jc0y4rfx"; + version = "2.2.1.0"; + sha256 = "0zsxkb7lizn1c1a5q4jzg4wyxb17njx2rahxf9fdn4hdx38fykli"; + revision = "1"; + editedCabalFile = "1jrny4i1hc335yz5vc2r1nx1lnpy5q5jqqg1fc2y2cw2vam62fm2"; libraryHaskellDepends = [ base bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable - integer-conversion network-uri OneTuple primitive QuickCheck - scientific semialign strict tagged template-haskell text - text-iso8601 text-short th-abstraction these time time-compat - unordered-containers uuid-types vector witherable + integer-conversion integer-logarithms network-uri OneTuple + primitive QuickCheck scientific semialign strict tagged + template-haskell text text-iso8601 text-short th-abstraction these + time time-compat unordered-containers uuid-types vector witherable ]; testHaskellDepends = [ base base-compat base-orphans base16-bytestring bytestring @@ -26531,6 +26699,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-unqualified-ast" = callPackage + ({ mkDerivation, aeson, base, scientific, text, vector }: + mkDerivation { + pname = "aeson-unqualified-ast"; + version = "1.0.0.3"; + sha256 = "09a0mj7cwwh9jppg8a9n69zq86gma3ssqzxjwfy1nqwqa0sa1dd2"; + libraryHaskellDepends = [ aeson base scientific text vector ]; + description = "Aliases to \"aeson\" AST making it importable unqualified"; + license = lib.licenses.mit; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -26910,7 +27089,9 @@ self: { ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "agda2hs"; + broken = true; }) {}; "agda2lagda" = callPackage @@ -26933,6 +27114,32 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2train" = callPackage + ({ mkDerivation, aeson, aeson-pretty, Agda, async, base, bytestring + , containers, deepseq, directory, file-embed, filepath, mtl, pretty + , unordered-containers + }: + mkDerivation { + pname = "agda2train"; + version = "0.0.3.0"; + sha256 = "0kc49cwkdj7fgfbi4nwwdk675bnnw2zqj09snlczm3yc0357gkfa"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson Agda async base containers file-embed mtl pretty + ]; + executableHaskellDepends = [ + aeson aeson-pretty Agda async base bytestring containers deepseq + directory file-embed filepath mtl pretty unordered-containers + ]; + doHaddock = false; + description = "Agda backend to generate training data for machine learning purposes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "agda2train"; + broken = true; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27167,8 +27374,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.9.1"; - sha256 = "15l6lgzl64ym21rzf6dbp927bj0s23kx9rp2z34k36ghy4sbdqjz"; + version = "6.0.0"; + sha256 = "1pqib3g333zhzpra22qxilwbw6v54dnzciqwi5668rhwnv66a8h4"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27183,8 +27390,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.3.2"; - sha256 = "1bd85lk70h6p4a1v0h8dhbnsx5sc8cyj916kaq1hn6r0ykkrnsjd"; + version = "0.4"; + sha256 = "0civg85a1rv3n2400fi9hi30zb1l1sycxjccxxmkd8kk4izcjxkz"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl mwc-random random ]; @@ -27216,8 +27423,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.3.3"; - sha256 = "0ps0spjd7himcfgr9ahh27c24isdvxrihf4qv2sr7cs33n6h7hsj"; + version = "5.4.0"; + sha256 = "1b4izqmafs1biak33fgz5pr8xcjsr35g19r9d3y6sznjcc48d58b"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -27232,8 +27439,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "5.1"; - sha256 = "0ya9zl73zjq6xnr5b6a15jcw9dvsjhlj2xz0xlc402v96siwb690"; + version = "5.4.1"; + sha256 = "1jg6cb4c4njw0n4kzx6ghdhd3zmza0h2vvzsi1w7jy2rzipzc1bm"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo colour lens @@ -27249,8 +27456,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.3"; - sha256 = "10m85nx1jdvv3vyg6rmpjiajpch4pnyamh3vxw6b4dwn140zlqq8"; + version = "5.4.1"; + sha256 = "1mcyiz9b91zbsy098h5192j047rnws1hkqg59dnhk2dwg4kvapmn"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -27265,8 +27472,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "5.1"; - sha256 = "13vgcm5dmqml9751wylvshxvgx8bgki2ymfp87l1llrp8qfxy95j"; + version = "5.4.1"; + sha256 = "1g7xw4yc0bpgigq3zy1s7cw3kp6x4y9hplm23gwzf7kf5b0c8ivx"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams colour containers filepath lens @@ -27281,8 +27488,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.6.2"; - sha256 = "09dfb212jjyd4fwqbl1bmm5k2sndzpx47vw688vgnx37zd94jwwj"; + version = "0.7.1"; + sha256 = "140v910ivhryb5jan6an083xcjcghgdyqary0qyi4isjiikahlpq"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -27299,8 +27506,8 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.6.2"; - sha256 = "0misn0pkrkfyyzg859y57ida2xc9ibmz5ykizj1fw30zsby57skl"; + version = "0.7"; + sha256 = "19zmzl8irs779m2g7284114fdk1z99kq6fnbw1cb2zwj3xl0212r"; libraryHaskellDepends = [ aivika aivika-transformers array base containers mtl mwc-random random @@ -27315,8 +27522,8 @@ self: { }: mkDerivation { pname = "aivika-realtime"; - version = "0.3.1"; - sha256 = "0wvv41ip4izwa22l7p6zz1sdr8vchlakvm5vka33r5gkq10fw6s9"; + version = "0.4"; + sha256 = "1v02fmcp271w3zbq68nzjlqhs2yn9v4ks6vcanjrcc9mrkfwz0m6"; libraryHaskellDepends = [ aivika aivika-transformers async base containers mtl mwc-random random stm time vector @@ -27331,8 +27538,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.9.1"; - sha256 = "0ii7g6a29fksg3lrk6vvlhaafdjssqypz92spksnpgjfv7iamk99"; + version = "6.0.0"; + sha256 = "1fr6zrf401sg5a8w3k0fman4d6qg9cfy9j1vsw58l5z609ma79jx"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -27640,8 +27847,8 @@ self: { pname = "algebra"; version = "4.3.1"; sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; - revision = "2"; - editedCabalFile = "1yrqg6p9p7vfzv8gjbcvln5gd221kslg6zvn5d1722wfa06g4g1j"; + revision = "3"; + editedCabalFile = "1cfjlq0xlv645864hrn7blg0li6lkpxlhsas01a5wigf2kdy1dsv"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -28072,8 +28279,8 @@ self: { ({ mkDerivation, assoc, base, bifunctors, lens, semigroupoids }: mkDerivation { pname = "alignment"; - version = "0.1.0.3"; - sha256 = "09icpp5s8sfygcq423mczmapn0ssc9s9i9v5cr78bf687wqy7yqv"; + version = "0.1.0.4"; + sha256 = "0579myc2fr0ksbsykyl6bw2v204vmvmkyc4phgm8dnmh921zchpz"; libraryHaskellDepends = [ assoc base bifunctors lens semigroupoids ]; @@ -30067,7 +30274,9 @@ self: { ]; description = "A Haskell equivalent of \"aws rds generate-db-auth-token\""; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "generate-db-auth-token"; + broken = true; }) {}; "amazonka-controltower" = callPackage @@ -32666,6 +32875,30 @@ self: { license = lib.licenses.mpl20; }) {}; + "amazonka-mtl" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base, Blammo + , conduit, hspec, lens, markdown-unlit, mtl, resourcet, text, time + , unliftio-core + }: + mkDerivation { + pname = "amazonka-mtl"; + version = "0.1.1.0"; + sha256 = "0r7fmffqj3yl6vwidfny4s2ynhkfx9h0di6l7pm79j5m5fp5vdvr"; + revision = "1"; + editedCabalFile = "1hsrc72v7qqbpzi5pqbjb8ysrhiiydk7fi6i9078nf8f1jammd4h"; + libraryHaskellDepends = [ + amazonka amazonka-core base conduit lens mtl resourcet + unliftio-core + ]; + testHaskellDepends = [ + amazonka-core amazonka-s3 base Blammo conduit hspec lens + markdown-unlit mtl text time + ]; + testToolDepends = [ markdown-unlit ]; + description = "MTL-style type-class and deriving-via newtypes for Amazonka"; + license = lib.licenses.mit; + }) {}; + "amazonka-mwaa" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , case-insensitive, tasty, tasty-hunit, text, time @@ -35675,8 +35908,8 @@ self: { pname = "ansi-terminal-game"; version = "1.9.1.3"; sha256 = "0ln6cx98g7nv6yv600m7p721pscln1c10wkmmykwlfvsrrvnvk7w"; - revision = "1"; - editedCabalFile = "116hl7fm358hqx55w7r1svbwj7gv3m3brxmzqs5qaahqcixndsqx"; + revision = "2"; + editedCabalFile = "01kfj2qz0s5jygd49ixj2cgzcmikbqb3rhwxs4n8cx3acqzx6cpx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35888,6 +36121,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-contract" = callPackage @@ -35971,6 +36206,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-messages" = callPackage @@ -35995,6 +36232,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-optparse-applicative" = callPackage @@ -36016,6 +36255,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-s3" = callPackage @@ -36098,6 +36339,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-sqs" = callPackage @@ -36124,6 +36367,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "antiope-swf" = callPackage @@ -36446,16 +36691,13 @@ self: { }) {}; "apecs-physics" = callPackage - ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + ({ mkDerivation, apecs, base, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.5"; - sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; - revision = "1"; - editedCabalFile = "0kzg82azksva8l13548qk4bkx5ww1z0ca1bv141gp4fr0vamw446"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.6"; + sha256 = "14x26x6c747fh1yrl50g0pwcirbk7r7qxvy48h8y8zrm0n158n5c"; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector ]; @@ -37212,8 +37454,8 @@ self: { }: mkDerivation { pname = "appendful-persistent"; - version = "0.1.0.0"; - sha256 = "0aw463j5qyjazzj7w325fn85nyz3i7rml1c5f02ps06n9rhw0w1k"; + version = "0.1.0.1"; + sha256 = "02l78jqyc20q1i4d1b83ds63pd2nl189wg29zbvwryjcajr8ci3f"; libraryHaskellDepends = [ appendful base containers microlens persistent ]; @@ -37910,8 +38152,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; - revision = "1"; - editedCabalFile = "1kpjz5x3f0g1jz0bkji0xnysgzbvg4livjgg4bbq3r1123d3rryy"; + revision = "3"; + editedCabalFile = "1924crg373xid7pxcpi178njmiiaq1m8cf59y96zjhaw4z07054q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37945,6 +38187,8 @@ self: { pname = "arch-web"; version = "0.2"; sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; + revision = "1"; + editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -38549,6 +38793,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; + revision = "2"; + editedCabalFile = "0fxzpwvn8n2sfnjl6qqsh556sjyng4gw2ddfbvhzf346xb3nrnzv"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -39815,6 +40061,8 @@ self: { pname = "assoc"; version = "1.1"; sha256 = "1x0dyv2kg1yrhkbkw4a62ixc9xmag6a6685chsi4k79xidafd8ks"; + revision = "1"; + editedCabalFile = "0li6d6mm2cavdmabs9l1z3bjhq8qzrdbl6dzh672dxma2wfgvl2n"; libraryHaskellDepends = [ base tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -40042,8 +40290,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "3"; - editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6"; + revision = "4"; + editedCabalFile = "0bax7cvg85jhg7n1rl2mdj90j4qn27ssaprkw7wr1r0lw3yfx34v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -40973,8 +41221,8 @@ self: { pname = "attoparsec"; version = "0.14.4"; sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; - revision = "4"; - editedCabalFile = "07sqs9rnxyjgrz22nxsx9xwj5hkljnyw8bqcbb75kbqi6c9ky6ba"; + revision = "5"; + editedCabalFile = "1bmih9b4b3vdad8mpwy6k15ay2k8zbxl0z5x40b47ml1p0wraw7c"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -41005,14 +41253,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "attoparsec-aeson_2_2_0_0" = callPackage + "attoparsec-aeson_2_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , integer-conversion, primitive, scientific, text, vector }: mkDerivation { pname = "attoparsec-aeson"; - version = "2.2.0.0"; - sha256 = "1r228cpyd27658csc5pabbwjwf1q5q93a3f1fkymjh4ib4rzw27s"; + version = "2.2.0.1"; + sha256 = "02f406d5jh038qn8cccr0fbxkczhgzplmnfb448hrl25gcxg5ifg"; libraryHaskellDepends = [ aeson attoparsec base bytestring integer-conversion primitive scientific text vector @@ -41181,6 +41429,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-iso8601_1_1_0_1" = callPackage + ({ mkDerivation, attoparsec, base, integer-conversion, text, time + , time-compat + }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.1.0.1"; + sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; + libraryHaskellDepends = [ + attoparsec base integer-conversion text time time-compat + ]; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -41294,21 +41558,21 @@ self: { }) {}; "attoparsec-uri" = callPackage - ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip - , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck - , text, vector + ({ mkDerivation, attoparsec, base, bytedump, ip, QuickCheck + , quickcheck-instances, strict, tasty, tasty-quickcheck, text + , vector }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.7"; - sha256 = "0p3j4m5ps4j8phm2c00rk6m06vidckf14fy50xgcq2zr8b1lk79n"; + version = "0.0.9"; + sha256 = "0vplsw0i9v7lmrx6hqdihvzh0626zx3nxwv8sk8r3pj3hy4xh1jz"; libraryHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip QuickCheck - quickcheck-instances strict text vector + attoparsec base bytedump ip QuickCheck quickcheck-instances strict + text vector ]; testHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip QuickCheck - quickcheck-instances strict tasty tasty-quickcheck text vector + attoparsec base bytedump ip QuickCheck quickcheck-instances strict + tasty tasty-quickcheck text vector ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; @@ -41531,19 +41795,20 @@ self: { }) {}; "authenticate" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, containers, html-conduit, http-conduit - , http-types, network-uri, resourcet, text, transformers - , unordered-containers, xml-conduit + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , blaze-builder, bytestring, case-insensitive, conduit, containers + , html-conduit, http-conduit, http-types, network-uri, resourcet + , text, transformers, unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.5.1"; - sha256 = "1rhbvdgwdr68gp13p5piddfdqf3l9lmx4w7k249lc98y23780c3x"; + version = "1.3.5.2"; + sha256 = "1lsa5fgwxrz87l94d7whag2gpg0f3bxfn0244mi0byl6j5zpl0wp"; libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers html-conduit http-conduit http-types network-uri - resourcet text transformers unordered-containers xml-conduit + aeson attoparsec attoparsec-aeson base blaze-builder bytestring + case-insensitive conduit containers html-conduit http-conduit + http-types network-uri resourcet text transformers + unordered-containers xml-conduit ]; description = "Authentication methods for Haskell web applications"; license = lib.licenses.mit; @@ -41688,18 +41953,19 @@ self: { }) {}; "autodocodec" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hashable, mtl - , scientific, text, time, unordered-containers, validity - , validity-scientific, vector + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , hashable, mtl, scientific, text, time, unordered-containers + , validity, validity-scientific, vector }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.4"; - sha256 = "08075y8dfl32hhla8da7lrg0kzrlhj2rhfn5aqz11qm3vkwwbd6q"; + version = "0.2.1.0"; + sha256 = "0i65xldrrygy7y64y2s47fwm1n87zr753q777ii7gd2qs8hqx1wy"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector ]; + testHaskellDepends = [ base doctest ]; description = "Self-documenting encoder and decoder"; license = lib.licenses.mit; }) {}; @@ -42423,6 +42689,8 @@ self: { pname = "aws-arn"; version = "0.3.1.0"; sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; + revision = "1"; + editedCabalFile = "029q777z4pd0vnj9c4v1ivzjb7azj6aq8gb55bwidw21lq55p98r"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -42560,7 +42828,9 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "aws-easy-demo"; + broken = true; }) {}; "aws-ec2" = callPackage @@ -43049,6 +43319,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-sign4" = callPackage @@ -43090,6 +43362,8 @@ self: { ]; description = "Dead simple bindings to commonly used AWS Services"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-sns" = callPackage @@ -43147,6 +43421,8 @@ self: { pname = "aws-sns-verify"; version = "0.0.0.3"; sha256 = "1l6w3am550ls656s9hnjib6zj0g6471brsj4vn9c7i03qqwgdgmy"; + revision = "1"; + editedCabalFile = "1azc52s8akmf7kvlvxmnxkcbn5fhca9za5kzzypjanfj2ysdjpzr"; libraryHaskellDepends = [ aeson base bytestring crypton-x509 crypton-x509-validation errors http-conduit memory network-uri pem regex-tdfa text @@ -43839,6 +44115,7 @@ self: { doHaddock = false; description = "Text layout engine built on top of HarfBuzz"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "ballast" = callPackage @@ -44096,6 +44373,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "barbies_2_0_5_0" = callPackage + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "barbies"; + version = "2.0.5.0"; + sha256 = "1j8c45k1x9vi9w44qnc8nyy0y4p97clvbq07vby7wn26zdawl8nm"; + libraryHaskellDepends = [ base distributive transformers ]; + testHaskellDepends = [ + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "barbies-layered" = callPackage ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec , hspec-discover, transformers @@ -44283,12 +44577,12 @@ self: { broken = true; }) {}; - "base_4_18_0_0" = callPackage + "base_4_19_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.18.0.0"; - sha256 = "0wx6a14k4gp7kmsy3bpz752q5gvnka0k69bi65zn2arpq89s8nsn"; + version = "4.19.0.0"; + sha256 = "03cipapd0b522zsh65a65q4nvrq8f6himh7sdag49fpr2hnw4vr6"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -44306,12 +44600,12 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat_0_13_0" = callPackage + "base-compat_0_13_1" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; - version = "0.13.0"; - sha256 = "03d3rr7v27giv90dz8128mzfa76qxkbvkzm7fiwh76l4v9sn1xlb"; + version = "0.13.1"; + sha256 = "08c43vzhq0dsnd8lqzrpimlj3h2386ybb8qksdk01fy8as6rw7fv"; libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; @@ -44333,14 +44627,14 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat-batteries_0_13_0" = callPackage + "base-compat-batteries_0_13_1" = callPackage ({ mkDerivation, base, base-compat, foldable1-classes-compat , ghc-prim, hspec, hspec-discover, OneTuple, QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.13.0"; - sha256 = "161g4g8ncnwbqafxp5hdbmv4qfmscf7b3pd88l49nkyns50ays1p"; + version = "0.13.1"; + sha256 = "00m8lx2raldr6xvlc92za11a2sj3x0031vi6v3as0cnvl58mnliy"; libraryHaskellDepends = [ base base-compat foldable1-classes-compat ghc-prim OneTuple ]; @@ -44442,8 +44736,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.9.0"; - sha256 = "0qkfs49gm0zv946h47bi8nshp6b2d6d5drlslm4adm8y4kcd8gk1"; + version = "0.9.1"; + sha256 = "0wpi3q4y9rhk5k9mz8bjy8qbl3pfxm4qqbxym3b15cn5haijvgsv"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -44455,8 +44749,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "1.6.1"; - sha256 = "0rbx6k85svqrkw5ixp2xal8bg6xrz729g7rrhkgsr3ixv38k943j"; + version = "1.6.1.1"; + sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241"; libraryHaskellDepends = [ base ]; description = "Featureful preludes formed solely from the \"base\" package"; license = lib.licenses.mit; @@ -44548,6 +44842,8 @@ self: { pname = "base16-bytestring"; version = "1.0.2.0"; sha256 = "1167f9jaivnabn6kg2gc421ac9njb67fr4v0adbj3qph7qa92nhx"; + revision = "1"; + editedCabalFile = "1zg2c9jwpbmwnpfw5ail1bvnhasrx8zks8rzn3q7kz69ks7yi556"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -44597,6 +44893,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "base32_0_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, memory + , QuickCheck, random-bytestring, tasty, tasty-hunit + , tasty-quickcheck, text, text-short + }: + mkDerivation { + pname = "base32"; + version = "0.4"; + sha256 = "1m08m51d49lfs5rfc5kjj0g19xq53c2ldngcykld6a4ma0fqdrws"; + libraryHaskellDepends = [ + base bytestring deepseq text text-short + ]; + testHaskellDepends = [ + base bytestring memory QuickCheck random-bytestring tasty + tasty-hunit tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq memory random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base32 encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "base32-bytestring" = callPackage ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion , hspec, QuickCheck @@ -45561,6 +45881,8 @@ self: { pname = "bcp47-orphans"; version = "0.1.0.6"; sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q"; + revision = "1"; + editedCabalFile = "0mf4plqqr6aw9jprp3fmmkpvk2g3h8hjn4wkp23ni07v818mlvlf"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent serialise text @@ -46511,8 +46833,8 @@ self: { }: mkDerivation { pname = "betris"; - version = "0.2.3.0"; - sha256 = "0nqwz88hfhfrcfdd3224cc54yzdqz8hgq358pxyvp5im006didcx"; + version = "0.2.3.1"; + sha256 = "076v2ss2jpslpwwl8bk4ijhwlpgrn1k5mi6mzhb62kp2yf1w8m58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46852,8 +47174,8 @@ self: { pname = "bifunctors"; version = "5.6.1"; sha256 = "1z2p9l2c0i6irbhfib5z7089jg8s22jj2jrc3dm525mynmqi8f06"; - revision = "1"; - editedCabalFile = "0f4swdx6nvjzci5mwiwcqxsg7xqsf7vqvignq4k644sclrih2v38"; + revision = "2"; + editedCabalFile = "0ma7m6as59vdmk1ysip0gslrc2sc84van5z1blvzl2wzyvc7xyl2"; libraryHaskellDepends = [ assoc base comonad containers foldable1-classes-compat tagged template-haskell th-abstraction transformers @@ -47312,8 +47634,8 @@ self: { pname = "binary-instances"; version = "1.0.4"; sha256 = "0pv4idgzl2wkm15ih594gbw6wihwrdspa91j5ajgwr4ikx6f3v3h"; - revision = "2"; - editedCabalFile = "04y9j42c3avfhf35jzh52w0zrp0m4j8cvbn3zqjjybyvhw3jgihf"; + revision = "3"; + editedCabalFile = "1ih6sdi3lhrpv78l9mikpz15r0yplnxgm9ml728ai4ja4hjjfwbb"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable primitive scientific tagged text text-binary time-compat @@ -47385,8 +47707,8 @@ self: { pname = "binary-orphans"; version = "1.0.4.1"; sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "2"; - editedCabalFile = "1q9fbn41fi4wfk8mrm9izy5jna86gmy7gxhz94crqfhp5f89v58l"; + revision = "3"; + editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary OneTuple QuickCheck quickcheck-instances tagged tasty @@ -47397,18 +47719,16 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , transformers + ({ mkDerivation, base, base-prelude, bytestring, mtl, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "binary-parser"; - version = "0.5.7.3"; - sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; + version = "0.5.7.4"; + sha256 = "06lkx75q6ffbdjl442l035xf5rl5ykjzw4488w0xnxzlmyl4v0ms"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ - base base-prelude bytestring mtl QuickCheck quickcheck-instances - tasty tasty-hunit tasty-quickcheck text transformers + base-prelude bytestring tasty tasty-hunit tasty-quickcheck ]; description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; @@ -47704,6 +48024,23 @@ self: { broken = true; }) {}; + "binder" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, lens + , text, transformers + }: + mkDerivation { + pname = "binder"; + version = "0.3"; + sha256 = "0swl5l3h3631fjlxn3k2vdbbj604p4bfjcfm6x3vzx3al9hnjcc8"; + libraryHaskellDepends = [ base containers lens text transformers ]; + testHaskellDepends = [ + base containers hspec lens text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Variable binding for abstract syntax tree"; + license = lib.licenses.mit; + }) {}; + "binding-core" = callPackage ({ mkDerivation, base, HTF, HUnit, QuickCheck, random, stm }: mkDerivation { @@ -50284,10 +50621,8 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.3"; - sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "16"; - editedCabalFile = "1kkc6m89sk0xjhpji416wjpk8672w32m5l2pvd3386v1yvd1x7vj"; + version = "0.7.4"; + sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -50645,10 +50980,10 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.8"; - sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23"; - revision = "5"; - editedCabalFile = "17ibcxcv51a1xc1cvvwzfvih3v42f4z4j6ipk944im2lgqvjcwfl"; + version = "0.8.3.0"; + sha256 = "1s1hb477smr0m8rvpp7vr768hvwv5rsv4w07phdqyzqz9a5sq1l6"; + revision = "1"; + editedCabalFile = "1f97jb8xz7i713jsisnibixfpfmhv6y2ss3751f0cf47p745ldm8"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -50905,8 +51240,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.8.0.0"; - sha256 = "030q47qxk8hzrff1dz0m7409kg3a7fg978c0776dw1l0bljk0v0a"; + version = "0.8.1.0"; + sha256 = "12rsch1ind86fn97518ypycqvrj86cs7q8sykfj3ikzfkn12cssg"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson lens safe-money servant servant-docs servant-multipart-api @@ -51089,6 +51424,8 @@ self: { ]; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bloomfilter" = callPackage @@ -52231,6 +52568,8 @@ self: { pname = "boring"; version = "0.2.1"; sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; + revision = "1"; + editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; @@ -52445,6 +52784,17 @@ self: { broken = true; }) {}; + "bounded-qsem" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bounded-qsem"; + version = "0.1.0.1"; + sha256 = "0pds88mz4rarx4qx4mkwn6ya7fijicks6v2p1ic08ynp5vg6npdf"; + libraryHaskellDepends = [ base ]; + description = "Bounded quantity semaphores"; + license = lib.licenses.mit; + }) {}; + "bounded-queue" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit }: mkDerivation { @@ -53002,8 +53352,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.5"; - sha256 = "18113bfyak9bsn7fwjx01511g4v3qls8w5qls1q407gx3dafhyw2"; + version = "0.1.1.6"; + sha256 = "0m4m6sw4fhfy75dirnwchg3jr175d9c7splkhfkb6p4i8995m5kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53075,8 +53425,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.3"; - sha256 = "1f299fss8p7111wr56a8346zqkl02b7pcp9n6pri7wh2zrc4lw8i"; + version = "2.2.0.4"; + sha256 = "1mjwzkh6236y09h8xqzcgddypyipr2h8b4x308lh51cqb07rjczq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54072,23 +54422,6 @@ self: { }) {}; "bugsnag-hs" = callPackage - ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client - , text, time, unordered-containers - }: - mkDerivation { - pname = "bugsnag-hs"; - version = "0.2.0.11"; - sha256 = "0xdl77nm1lzj4lyxd6s86v8whxls3a9rsgck4b188sgcv6bvcad6"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring http-client text time unordered-containers - ]; - testHaskellDepends = [ aeson base bytestring hedgehog ]; - description = "A Bugsnag client for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "bugsnag-hs_0_2_0_12" = callPackage ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client , text, time, unordered-containers }: @@ -54103,7 +54436,6 @@ self: { testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bugsnag-wai" = callPackage @@ -54166,22 +54498,20 @@ self: { }) {}; "bugzilla-redhat" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, hspec, http-conduit, http-types, iso8601-time - , resourcet, text, time, transformers, unordered-containers, vector + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , hspec, http-conduit, http-types, iso8601-time, resourcet, text + , time, unordered-containers, vector }: mkDerivation { pname = "bugzilla-redhat"; - version = "1.0.1"; - sha256 = "19dir39yxqd5psf3gj4f3vhcbdad1np7374nkxfk0gg4xxvywcvi"; - revision = "2"; - editedCabalFile = "0gqsmxrydy6isyfx4g8snpg50i3f0jcw9yyr385ys28zw7ak29qr"; + version = "1.0.1.1"; + sha256 = "0ka3dh5gqimwny7s3qalkynlyarkmnwd5pcy92b4g4vaqk7k3pvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base blaze-builder bytestring connection containers - http-conduit http-types iso8601-time resourcet text time - transformers unordered-containers vector + aeson base blaze-builder bytestring containers http-conduit + http-types iso8601-time resourcet text time unordered-containers + vector ]; testHaskellDepends = [ aeson base hspec time ]; description = "A Haskell interface to the Bugzilla native REST API"; @@ -54741,8 +55071,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.3.1"; - sha256 = "1ffsmfldgmyln6h6xmfs2cvb57l8yrz9243aywpa5wziaarqc5sm"; + version = "1.3.2"; + sha256 = "0mdgqsqf52dw72saq3dndvzx8yx51gi60zbka39km47r6si4nnjq"; libraryHaskellDepends = [ base binary deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -54873,8 +55203,8 @@ self: { pname = "byte-order"; version = "0.1.3.0"; sha256 = "0lr5ijhc165qhviabklnl0zpbk5400wb1fqd1xn7x0ga1vvclxhl"; - revision = "1"; - editedCabalFile = "0gkp45pasdg9k98yaw3fpsch4wy50q5n4wdmqlsffciimc0k11x1"; + revision = "2"; + editedCabalFile = "136zdv7hfxp4vyd5ckc9rmadg8szjr7vrwxyjq6jlhapgh3afcqh"; libraryHaskellDepends = [ base primitive primitive-unaligned wide-word ]; @@ -54920,6 +55250,8 @@ self: { pname = "bytebuild"; version = "0.3.14.0"; sha256 = "0ql3fyd0l4gm3wbziky8r3bgd97kazpqbmiqwhrxvznf201zkhfy"; + revision = "1"; + editedCabalFile = "0pgm553m4abfq7bhrz4r0hymww32sqy4ln0j3v3ydb93x6l1fp1v"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset run-st @@ -55098,10 +55430,8 @@ self: { ({ mkDerivation, base, binary }: mkDerivation { pname = "byteset"; - version = "0.1.1.0"; - sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k"; - revision = "1"; - editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p"; + version = "0.1.1.1"; + sha256 = "1sy7xp2zvmhlldgb18ah3g17382p9q2i0w3zxrzriq0ib9lrln1x"; libraryHaskellDepends = [ base binary ]; description = "Set of bytes"; license = lib.licenses.bsd3; @@ -55518,18 +55848,16 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, bytestring, criterion, quickcheck-instances + , rerebase, tasty, tasty-quickcheck }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.6"; - sha256 = "0zqi65jpf6f3gyhcg11hfn7b457c3zsmgsyqx8gi9sqh5pzn34kw"; + version = "0.4.5.7"; + sha256 = "1wblyys69avihm41lyxs04yvg1p85jp598w5ralv85mrgirb39np"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; @@ -55602,6 +55930,25 @@ self: { license = lib.licenses.mit; }) {}; + "bytestring-tree-builder_0_2_7_11" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.11"; + sha256 = "1kwj10nibw6bd0nkwg090nn27ayaq85x211ss2zvi63qs37cjmxp"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base-prelude bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base-prelude bytestring criterion ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -56356,8 +56703,10 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.1"; - sha256 = "1fz71v2yx3rykvzswvqza5v9jwdhy2ahxj003gkkhfwfc2qjip3p"; + version = "5.2.2"; + sha256 = "1xafkjh4g60gcgrcl1l8xyla3firjxkaaks44plq1z9gnnwlfb90"; + revision = "1"; + editedCabalFile = "10saybpzsp3vwlbb3dv9glnmz8g9i79k3n3l2klmwmnggi8s35ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56556,8 +56905,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.7"; - sha256 = "1j21ynngk937p7jq361zn5kq0wiwnn6lypqm4z8z9mwa9knc2sv3"; + version = "0.1.9"; + sha256 = "00bcyx7i7h04hn2s8j7p4fsa64l48zizsdmmzqrhfiafwapmfg4n"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -57077,6 +57426,7 @@ self: { license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; mainProgram = "cabal-plan-bounds"; + maintainers = [ lib.maintainers.nomeata ]; }) {}; "cabal-progdeps" = callPackage @@ -57113,21 +57463,22 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, http-client, http-client-tls, http-conduit - , optparse-applicative, process, simple-cabal, simple-cmd - , simple-cmd-args, time, unix + ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file + , directory, extra, filepath, http-client, http-client-tls + , http-conduit, http-query, optparse-applicative, process + , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "2.1.2"; - sha256 = "0593260apchmhkvn48m7fgffi3w668ky0n8fyhbx8557kqv55w6f"; + version = "2.1.3"; + sha256 = "0wkb1h08ns93gkwycbsi7ap49px05kaybw5badjg1633n0i2bmww"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal directory extra filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix + aeson base bytestring Cabal cached-json-file directory extra + filepath http-client http-client-tls http-conduit http-query + optparse-applicative process simple-cabal simple-cmd + simple-cmd-args text time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = lib.licenses.gpl3Only; @@ -57182,19 +57533,21 @@ self: { }) {}; "cabal-sort" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , explicit-exception, fgl, filepath, process, transformers + ({ mkDerivation, base, bytestring, Cabal, comfort-graph, containers + , directory, explicit-exception, filepath, non-empty + , optparse-applicative, process, shell-utility, transformers , utility-ht }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.5"; - sha256 = "0lxw7kbqpaf4j03rrlivkb0imvnw0wsnxjy8gvcjs0jb101dzf8g"; + version = "0.1.2"; + sha256 = "1pvqnviv1dv9fdaghj1rzyhjnbjymprypn595w1svl2x8ylzw871"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal containers directory explicit-exception fgl - filepath process transformers utility-ht + base bytestring Cabal comfort-graph containers directory + explicit-exception filepath non-empty optparse-applicative process + shell-utility transformers utility-ht ]; description = "Topologically sort cabal packages"; license = lib.licenses.bsd3; @@ -57668,6 +58021,8 @@ self: { pname = "cache"; version = "0.1.3.0"; sha256 = "0d75257kvjpnv95ja50x5cs77pj8ccfr0nh9q5gzvcps83qdksa2"; + revision = "1"; + editedCabalFile = "17mn9vm493c2bihz1ivmg1rzy4mnjyvm1y2chrj2hbhf8wixx58s"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -57855,84 +58210,71 @@ self: { ({ mkDerivation, aeson, ascii-progress, async, base , base64-bytestring, bytestring, cachix-api, concurrent-extra , conduit, conduit-concurrent-map, conduit-extra, conduit-zstd - , containers, cookie, cryptonite, deepseq, dhall, directory - , ed25519, either, extra, filepath, fsnotify - , hercules-ci-cnix-store, here, hnix-store-core, hspec - , hspec-discover, http-client, http-client-tls, http-conduit - , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, network-uri, nix, optparse-applicative - , pretty-terminal, prettyprinter, process, protolude, resourcet - , retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary - , text, time, unix, unordered-containers, uri-bytestring, uuid - , vector, versions, websockets, wuss + , containers, cryptonite, deepseq, dhall, directory, ed25519 + , either, extra, filepath, fsnotify, hercules-ci-cnix-store, here + , hnix-store-core, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-types, immortal, katip, lukko + , lzma-conduit, megaparsec, memory, netrc, network, nix + , optparse-applicative, pretty-terminal, prettyprinter, process + , protolude, resourcet, retry, safe-exceptions, servant + , servant-auth, servant-auth-client, servant-client + , servant-client-core, servant-conduit, stm, stm-chans, stm-conduit + , systemd, temporary, text, time, unix, unordered-containers + , uri-bytestring, uuid, vector, versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.6"; - sha256 = "0p47zrm7v474bzrxj24dfcf9y22bs6yvdjravzc9n79skidd3bv6"; + version = "1.6.1"; + sha256 = "1xha1m9cik1sm877mk2vk96z4qc3570663cw1b4dw51v1qn57pbr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ascii-progress async base base64-bytestring bytestring cachix-api concurrent-extra conduit conduit-concurrent-map - conduit-extra conduit-zstd containers cookie cryptonite deepseq - dhall directory ed25519 either extra filepath fsnotify + conduit-extra conduit-zstd containers cryptonite deepseq dhall + directory ed25519 either extra filepath fsnotify hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types inline-c-cpp katip lukko - lzma-conduit megaparsec memory mmorph netrc network-uri - optparse-applicative pretty-terminal prettyprinter process - protolude resourcet retry safe-exceptions servant servant-auth - servant-auth-client servant-client servant-client-core - servant-conduit stm stm-chans stm-conduit systemd temporary text - time unix unordered-containers uri-bytestring uuid vector versions - websockets wuss + http-client-tls http-conduit http-types immortal katip lukko + lzma-conduit megaparsec memory netrc network optparse-applicative + pretty-terminal prettyprinter process protolude resourcet retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-conduit stm stm-chans stm-conduit systemd + temporary text time unix unordered-containers uri-bytestring uuid + vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ - aeson async base cachix-api conduit http-conduit katip protolude - safe-exceptions stm stm-chans stm-conduit time uuid websockets wuss + aeson async base cachix-api katip protolude safe-exceptions + stm-chans stm-conduit time uuid websockets ]; - executableToolDepends = [ hspec-discover ]; testHaskellDepends = [ aeson base bytestring cachix-api dhall directory extra here hspec protolude servant-auth-client servant-client-core temporary ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; + testToolDepends = [ hspec-discover ]; + description = "Command-line client for Nix binary cache hosting https://cachix.org"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.domenkozar ]; }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , conduit, cookie, cryptonite, deepseq, deriving-aeson, exceptions - , hspec, hspec-discover, http-api-data, http-media, jose, lens - , memory, nix-narinfo, protolude, resourcet, safe-exceptions - , servant, servant-auth, servant-auth-swagger, servant-client - , servant-swagger, servant-swagger-ui-core, stm-chans, string-conv - , swagger2, text, time, transformers, unordered-containers, uuid - , websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit + , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover + , http-media, jose, memory, nix-narinfo, protolude, resourcet + , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text + , time, unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.6"; - sha256 = "0yca7xrxhxlgx3y0w4k2mwrzgg72wz6iq5bppxaa4f70538ckp57"; + version = "1.6.1"; + sha256 = "07axz6yj1058807zwd6l6nqnklxia2rph7af5cghrxpvnsnk4vcc"; libraryHaskellDepends = [ - aeson async base base16-bytestring bytestring conduit cookie - cryptonite deepseq deriving-aeson exceptions http-api-data - http-media jose lens memory nix-narinfo protolude resourcet - safe-exceptions servant servant-auth servant-auth-swagger - servant-client stm-chans string-conv swagger2 text time - transformers unordered-containers uuid websockets - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring conduit cookie cryptonite - hspec http-api-data http-media lens memory protolude servant - servant-auth servant-auth-swagger servant-swagger - servant-swagger-ui-core string-conv swagger2 text transformers - unordered-containers + aeson async base bytestring conduit cryptonite deriving-aeson + exceptions http-media jose memory nix-narinfo protolude resourcet + safe-exceptions servant servant-auth stm-chans swagger2 text time + unordered-containers uuid websockets ]; + testHaskellDepends = [ aeson base bytestring hspec protolude ]; testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = lib.licenses.asl20; @@ -58256,6 +58598,7 @@ self: { description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "calamity-commands" = callPackage @@ -58424,8 +58767,8 @@ self: { pname = "call-alloy"; version = "0.4.0.3"; sha256 = "0aabh7a43cyprwywv8622q860ys2i7mlasigbxaklyj558xma59f"; - revision = "1"; - editedCabalFile = "1fq8qi0y39naha72widlqyz9smcd82v6q5wmvymmgvgw5yj93yw6"; + revision = "2"; + editedCabalFile = "0hwlxg2nmi3wq316wb20f0kv077v9lrjb7705acnnl2a099jx7j5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory extra filepath mtl @@ -58633,21 +58976,21 @@ self: { "candid" = callPackage ({ mkDerivation, base, base32, bytestring, cereal, constraints - , containers, crc, directory, dlist, doctest, file-embed, filepath - , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative - , parser-combinators, prettyprinter, row-types, scientific - , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, template-haskell, text - , transformers, unordered-containers, vector + , containers, digest, directory, dlist, doctest, file-embed + , filepath, hex-text, leb128-cereal, megaparsec, mtl + , optparse-applicative, parser-combinators, prettyprinter + , row-types, scientific, smallcheck, split, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun, tasty-smallcheck, template-haskell + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "candid"; - version = "0.4.0.2"; - sha256 = "04gy0nlk28hd5glzbscfhh0f01kxvxvjy2pcis8m0n4r6n7l2qlr"; + version = "0.5"; + sha256 = "1va9n08m6y9avbjxgclhasmnbf41bqx0j1s4j12rsblhci5cxqpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base32 bytestring cereal constraints containers crc dlist + base base32 bytestring cereal constraints containers digest dlist file-embed hex-text leb128-cereal megaparsec mtl parser-combinators prettyprinter row-types scientific split template-haskell text transformers unordered-containers vector @@ -59031,6 +59374,8 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic capabilities with late binding"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "captcha-2captcha" = callPackage @@ -59722,14 +60067,15 @@ self: { }) {}; "casr-logbook" = callPackage - ({ mkDerivation, base, containers, digit, lens, lucid, text, time + ({ mkDerivation, attoparsec, base, containers, digit, lens, lucid + , text, time }: mkDerivation { pname = "casr-logbook"; - version = "0.6.12"; - sha256 = "1s4v5a22apd7sw8c7ri8sazi1gqjg7p6b8y9j1g8avx5zc1m58f7"; + version = "0.6.13"; + sha256 = "1401mwcf5av11f37kz1hk5axzji21an4irk6fqypakply4q5kvqd"; libraryHaskellDepends = [ - base containers digit lens lucid text time + attoparsec base containers digit lens lucid text time ]; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; @@ -59940,8 +60286,8 @@ self: { pname = "cassava"; version = "0.5.3.0"; sha256 = "1gp954w05bj83z4i6isq2qxi1flqwppsgxxrp1f75mrs8cglbj5l"; - revision = "4"; - editedCabalFile = "0iabyfiwj08gfzrllaz836n28gx2jybszw45jcsy7y333wwcsg7q"; + revision = "5"; + editedCabalFile = "081c6gzskkdvajc38f8ng8471d58a25k7wpl3azjviqm6vzfl2c4"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -60928,8 +61274,8 @@ self: { pname = "cereal-conduit"; version = "0.8.0"; sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; - revision = "1"; - editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; + revision = "2"; + editedCabalFile = "1w26az4pj699qbpa9pz55g4svkbs92ls5k6wkzjn40ghisnjk2q6"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -61251,6 +61597,8 @@ self: { pname = "cfn-flip"; version = "0.1.0.3"; sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; + revision = "1"; + editedCabalFile = "0816bw34b174wpxjw99lz8z8qi2l5w00dppb7kysjdbwh8a3gws0"; libraryHaskellDepends = [ aeson base bytestring conduit libyaml text unliftio unliftio-core yaml @@ -61742,6 +62090,8 @@ self: { pname = "charset"; version = "0.3.10"; sha256 = "1y9571120f428rkif97w4vwjas9x0916qgl9kkm71yxjz7dm2ihy"; + revision = "1"; + editedCabalFile = "0m92xqpmfnhv6ii1rdfplw4w6fkmzxciwi02vjxsk1ga5bzjw1mc"; libraryHaskellDepends = [ array base bytestring containers unordered-containers ]; @@ -62505,6 +62855,8 @@ self: { pname = "chimera"; version = "0.3.3.0"; sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; + revision = "1"; + editedCabalFile = "197xa0hgf2w4yhifnkqck6biipz8ffjg61y59plamb9rjv62k0bv"; libraryHaskellDepends = [ adjunctions base distributive mtl primitive transformers vector ]; @@ -62517,6 +62869,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "chimera_0_3_4_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, infinite-list + , mtl, primitive, QuickCheck, random, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers + , vector + }: + mkDerivation { + pname = "chimera"; + version = "0.3.4.0"; + sha256 = "1g3bpwhka21x6rl8c8zdwywn7vbq7gp5mc8hb5w24bh0j7cxr67l"; + libraryHaskellDepends = [ + adjunctions base distributive infinite-list mtl primitive + transformers vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; + description = "Lazy infinite streams with O(1) indexing and applications for memoization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -63988,8 +64364,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.6.5"; - sha256 = "0ixnnv4nyir5sjrygdnsvz59yx214bz35cx2lfvx63aws07nm1gl"; + version = "1.6.6"; + sha256 = "0hzcqkbmpwybvi5rvzhkf3n7rdbimbqzyi1ijagfsivjvfkxs1m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64009,12 +64385,12 @@ self: { "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, async - , attoparsec, base, base16-bytestring, binary, bytestring - , clash-prelude, concurrent-supply, containers, cryptohash-sha256 - , data-binary-ieee754, data-default, deepseq, directory, dlist - , exceptions, extra, filepath, ghc, ghc-bignum, ghc-boot-th - , ghc-typelits-knownnat, Glob, hashable, haskell-src-exts - , haskell-src-meta, hint, interpolate, lens, mtl + , attoparsec, attoparsec-aeson, base, base16-bytestring, binary + , bytestring, clash-prelude, concurrent-supply, containers + , cryptohash-sha256, data-binary-ieee754, data-default, deepseq + , directory, dlist, exceptions, extra, filepath, ghc, ghc-bignum + , ghc-boot-th, ghc-typelits-knownnat, Glob, hashable + , haskell-src-exts, haskell-src-meta, hint, interpolate, lens, mtl , ordered-containers, pretty-show, prettyprinter, primitive , quickcheck-text, stringsearch, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, terminal-size @@ -64023,29 +64399,30 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.6.5"; - sha256 = "0n7r9448qzvy9l4ggqgk31ac3pbxnbjdmgc5pzx72alijdjpvgh1"; + version = "1.6.6"; + sha256 = "0v31cp9f6bciag31f5zdxmz1cdlk2aw3skrgam40psaxmksih6ns"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array async attoparsec base - base16-bytestring binary bytestring clash-prelude concurrent-supply - containers cryptohash-sha256 data-binary-ieee754 data-default - deepseq directory dlist exceptions extra filepath ghc ghc-bignum - ghc-boot-th hashable haskell-src-meta hint interpolate lens mtl - ordered-containers pretty-show prettyprinter primitive - template-haskell temporary terminal-size text time transformers - trifecta unordered-containers vector vector-binary-instances yaml + aeson aeson-pretty ansi-terminal array async attoparsec + attoparsec-aeson base base16-bytestring binary bytestring + clash-prelude concurrent-supply containers cryptohash-sha256 + data-binary-ieee754 data-default deepseq directory dlist exceptions + extra filepath ghc ghc-bignum ghc-boot-th hashable haskell-src-meta + hint interpolate lens mtl ordered-containers pretty-show + prettyprinter primitive template-haskell temporary terminal-size + text time transformers trifecta unordered-containers vector + vector-binary-instances yaml ]; executableHaskellDepends = [ - aeson base bytestring containers deepseq directory Glob - stringsearch yaml + aeson attoparsec-aeson base bytestring containers deepseq directory + Glob stringsearch yaml ]; testHaskellDepends = [ - aeson aeson-pretty base base16-bytestring bytestring clash-prelude - concurrent-supply containers data-default deepseq ghc - ghc-typelits-knownnat haskell-src-exts lens pretty-show + aeson aeson-pretty attoparsec-aeson base base16-bytestring + bytestring clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens pretty-show quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell text transformers unordered-containers ]; @@ -64063,8 +64440,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.6.5"; - sha256 = "1hbdqv4zzhhb7dnmn5zcc0c6gh72xkyj5j4r7pcz2scidgvwdw5q"; + version = "1.6.6"; + sha256 = "1hnhlkimgrhcn26y78xpf4f3p5dix4qp0cjlvpp1vz1w9fl2va6v"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -64105,8 +64482,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.6.5"; - sha256 = "1iqyrcclzh5pfkckfh81h4kbmagwp7d69f9wdv6vv09p1gki6dx9"; + version = "1.6.6"; + sha256 = "06dwpyf4f9i2l7gqd67by3j5jjzj5wd5rs8bqbw0b718idmcga8z"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -64137,8 +64514,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.6.5"; - sha256 = "0z7clyw3s05w9f2yrbwym7q386qql8z48zf9mqhzl6hpy62x3as1"; + version = "1.6.6"; + sha256 = "0li04hy6jj92wcp9j5gr92a71w1pbzj87hv75m66i94ifj6ybq39"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -64302,6 +64679,61 @@ self: { mainProgram = "classify-frog"; }) {}; + "classy-effects" = callPackage + ({ mkDerivation, base, classy-effects-base, classy-effects-th + , tasty, tasty-discover, tasty-hunit + }: + mkDerivation { + pname = "classy-effects"; + version = "0.1.0.0"; + sha256 = "15c1sln37qc0b0fdg8pyifp84q829918jvzwbjdvfzkq9hvwdb0w"; + libraryHaskellDepends = [ + base classy-effects-base classy-effects-th + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "An interface for a handler-independent, typeclass-based effect system"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "classy-effects-base" = callPackage + ({ mkDerivation, base, compdata, tasty, tasty-discover, tasty-hunit + }: + mkDerivation { + pname = "classy-effects-base"; + version = "0.1.0.0"; + sha256 = "047bz8ii9qx708cjdgpajrv2lry9wfracj6f1m7rm38vmhr9yj55"; + libraryHaskellDepends = [ base compdata ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "An interface for a handler-independent, typeclass-based effect system"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "classy-effects-th" = callPackage + ({ mkDerivation, base, classy-effects-base, extra, lens, mtl, tasty + , tasty-discover, tasty-hunit, template-haskell, th-abstraction + }: + mkDerivation { + pname = "classy-effects-th"; + version = "0.1.0.0"; + sha256 = "1w7gm3nl2ddp19a0g7id6qhdj8vzpvs2y9hvfrcyk81yfhx6km6c"; + libraryHaskellDepends = [ + base classy-effects-base extra lens mtl template-haskell + th-abstraction + ]; + testHaskellDepends = [ + base classy-effects-base tasty tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Automatic compliance with the classy-effects protocols"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "classy-influxdb-simple" = callPackage ({ mkDerivation, aeson, async-io-either, base, bytestring, lens , mtl, scientific, text, time, vector, wreq @@ -65504,8 +65936,8 @@ self: { }: mkDerivation { pname = "closed-intervals"; - version = "0.2.0.1"; - sha256 = "0ixh65ijhr0skxzfwps3g24zasizmds6mddg02akfs522lrmznji"; + version = "0.2.1.0"; + sha256 = "0awwdd4ij22lqg048mki32zimlrs7vipq66av708y2f34nbb3d91"; libraryHaskellDepends = [ base containers filtrable time ]; testHaskellDepends = [ base containers doctest-exitcode-stdio doctest-lib QuickCheck time @@ -65941,6 +66373,8 @@ self: { pname = "cmark-gfm"; version = "0.2.6"; sha256 = "0sd8q42j51ba7ymyxk5360mhvhbnirsd371d3sggl6sbslxzp34m"; + revision = "1"; + editedCabalFile = "1385k2xvxy9ssw69g606vwnpm07sf919prciwvnaipsxiwwbjwl6"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -66348,25 +66782,22 @@ self: { "co-log" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, doctest - , exceptions, filepath, Glob, hedgehog, markdown-unlit, mtl, text - , transformers, typerep-map, vector + , co-log-core, containers, contravariant, dependent-map + , dependent-sum, directory, doctest, exceptions, filepath, Glob + , hedgehog, mtl, text, transformers, unliftio-core, vector }: mkDerivation { pname = "co-log"; - version = "0.5.0.0"; - sha256 = "1afzqh3kncmlxjdsw6v0pwb24mlfa492jdryn8pr00pskrmcr8mg"; + version = "0.6.0.2"; + sha256 = "1mnwxga6rj7lwp5zqqfqs7d6gi1q4a3ay5gcg3fakh4ci8lfzl47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring chronos co-log-core containers - contravariant directory exceptions filepath mtl text transformers - typerep-map vector + contravariant dependent-map dependent-sum directory exceptions + filepath mtl text transformers unliftio-core vector ]; - executableHaskellDepends = [ - base bytestring co-log-core mtl text typerep-map - ]; - executableToolDepends = [ markdown-unlit ]; + executableHaskellDepends = [ base bytestring dependent-map mtl ]; testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; @@ -66391,14 +66822,27 @@ self: { pname = "co-log-core"; version = "0.3.2.0"; sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; - revision = "1"; - editedCabalFile = "0ljr9pam99q2mgqig8yf1pmz5j0jxk6dq9c2rvzyc4jbv6bnbwnf"; + revision = "2"; + editedCabalFile = "0zfmgjdp2hp7x9a1kma1mvn51mm4kdhvrzq450mk0ysh026xfjls"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; }) {}; + "co-log-core_0_3_2_1" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.3.2.1"; + sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "co-log-json" = callPackage ({ mkDerivation, aeson, base, bytestring, co-log-core, containers , string-conv, text @@ -66418,10 +66862,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.3"; - sha256 = "1c6pyfynzd95vxywl7c110nh8z0rzhvfh9hzbq1nn4ik5whqjnbp"; - revision = "1"; - editedCabalFile = "1h35a10zh6xjqjrvj38r9kn49zzvf9lvqrpfgd6vnnsjvyi3jzsx"; + version = "0.0.1.4"; + sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -66452,7 +66894,9 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "co-log-sys" = callPackage @@ -67661,8 +68105,8 @@ self: { pname = "colourista"; version = "0.1.0.2"; sha256 = "0g06116kjg9pbp0l7n33agqbks3kw5z4rjqyhylha8miah5sxbwn"; - revision = "1"; - editedCabalFile = "0wjngfcnqaibdds17q8r8v8yvbl94qxbjhmill4vi1fzfsiw4yrg"; + revision = "3"; + editedCabalFile = "1q07rz48xrs68gg3pywdivw2m97xbgcb4337jfzdsb0wv6n8z2r5"; libraryHaskellDepends = [ ansi-terminal base bytestring text ]; testHaskellDepends = [ base bytestring hspec text ]; description = "Convenient interface for printing colourful messages"; @@ -67827,8 +68271,8 @@ self: { }: mkDerivation { pname = "combinat"; - version = "0.2.10.0"; - sha256 = "125yf5ycya722k85iph3dqv63bpj1a862c0ahs2y0snyd2qd6h35"; + version = "0.2.10.1"; + sha256 = "179w7qnn3dhh71xgi21k9y0215z5v2gsa54yn1i1rhvg63z6fvkd"; libraryHaskellDepends = [ array base compact-word-vectors containers random transformers ]; @@ -67979,8 +68423,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.5.2.3"; - sha256 = "0x9pwk25bpq63nllqc00mmjbrvwzz0nw8pgxbdakpmm2ymyj9p14"; + version = "0.5.3"; + sha256 = "18s3yg8d2mfj2gkkxg1m2w3lrv1zdgv3bh2fsxzwnygr2p9451r1"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -68020,15 +68464,15 @@ self: { "comfort-blas" = callPackage ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, QuickCheck, transformers, utility-ht + , netlib-ffi, QuickCheck, semigroups, transformers, utility-ht }: mkDerivation { pname = "comfort-blas"; - version = "0.0.0.1"; - sha256 = "19wfmn6fxl31kd0f4r5gcrpp50k9j735pnbzdw4p16p9p71cqb5k"; + version = "0.0.1"; + sha256 = "1yfmhv712dnnwlh62gcq2vchmg8vcv54l50jy1mibpx1is7kjcr9"; libraryHaskellDepends = [ base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi transformers utility-ht + netlib-ffi semigroups transformers utility-ht ]; testHaskellDepends = [ base comfort-array containers doctest-exitcode-stdio doctest-lib @@ -68048,6 +68492,8 @@ self: { pname = "comfort-fftw"; version = "0.0.0.1"; sha256 = "10934ckhl5hj4k331cdhdz6512m3hyn4bm4w1xwqja4j0arndklb"; + revision = "1"; + editedCabalFile = "1vlj4jn5qzv71dw5fd32wb7gkjhs0f91yc2qxbcv2dbdzqbzkrwr"; libraryHaskellDepends = [ base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck ]; @@ -68087,20 +68533,20 @@ self: { "comfort-graph" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio - , QuickCheck, semigroups, transformers, utility-ht + , doctest-lib, QuickCheck, semigroups, transformers, utility-ht }: mkDerivation { pname = "comfort-graph"; - version = "0.0.3.2"; - sha256 = "13g6dcqcnysh1l0hsm3j3q9il9r987brxc3557m69k0ag0wk5m4b"; + version = "0.0.4"; + sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc"; revision = "1"; - editedCabalFile = "0f0zgf8nk5bihs1z3kz37c4ansg7pk9d3pbvnazabqqwv4c11kl5"; + editedCabalFile = "0lkk5p558x0dv8vfy329g2amaai76gkxdnb8nzy3miw76vvi5xrw"; libraryHaskellDepends = [ base containers QuickCheck semigroups transformers utility-ht ]; testHaskellDepends = [ - base containers doctest-exitcode-stdio QuickCheck transformers - utility-ht + base containers doctest-exitcode-stdio doctest-lib QuickCheck + transformers utility-ht ]; description = "Graph structure with type parameters for nodes and edges"; license = lib.licenses.bsd3; @@ -68307,27 +68753,6 @@ self: { }) {}; "commonmark-extensions" = callPackage - ({ mkDerivation, base, commonmark, containers, emojis, filepath - , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "commonmark-extensions"; - version = "0.2.3.5"; - sha256 = "03mpbc66k3h6mm3k46bsn7pkp46ik930prgy6qvqqinzjvwlg207"; - libraryHaskellDepends = [ - base commonmark containers emojis filepath network-uri parsec text - transformers - ]; - testHaskellDepends = [ - base commonmark parsec tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-extensions_0_2_3_6" = callPackage ({ mkDerivation, base, commonmark, containers, emojis, filepath , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text , transformers @@ -68346,7 +68771,6 @@ self: { benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-pandoc" = callPackage @@ -68470,8 +68894,8 @@ self: { pname = "comonad"; version = "5.0.8"; sha256 = "04rxycp2pbkrvhjgpgx08jmsipjz4cdmhv59dbp47k4jq8ndyv7g"; - revision = "1"; - editedCabalFile = "0zlgkcd61cwsdbgjz03pfbjxhj6dc25792h7rwh0zy677vbsn6hz"; + revision = "2"; + editedCabalFile = "1qy55616zcl1fmdzkr9kbb84nqmmx2aakz0hfyc66jgv0fyvykaa"; libraryHaskellDepends = [ base containers distributive indexed-traversable tagged transformers transformers-compat @@ -68576,8 +69000,8 @@ self: { pname = "compact"; version = "0.2.0.0"; sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; - revision = "1"; - editedCabalFile = "1013dkawaw3c6hvlfn9x584pq8z65fvbnp79dl6ll6r0a75rivvm"; + revision = "2"; + editedCabalFile = "1x38yjkl9b2ss6p9bdhpk5h1p4p3rlar09a31cpa8cgj959ws1da"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -68837,6 +69261,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "compdata_0_13_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl + , QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, th-expand-syns + , transformers, tree-view, uniplate + }: + mkDerivation { + pname = "compdata"; + version = "0.13.1"; + sha256 = "001k1pd28cgbspd2n74p29hc69ch9mmkqfazki7qj17kzcaq5n2l"; + revision = "1"; + editedCabalFile = "12bhc1vpnlshq2kap9p3j6a7pxwdm7b761rr64g6c5xdla5y3vpq"; + libraryHaskellDepends = [ + base containers deepseq mtl QuickCheck template-haskell + th-expand-syns transformers tree-view + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 + th-expand-syns transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq mtl QuickCheck random + template-haskell th-expand-syns transformers uniplate + ]; + description = "Compositional Data Types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "compdata-automata" = callPackage ({ mkDerivation, base, compdata, containers, criterion, projection }: @@ -70173,8 +70627,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.19"; - sha256 = "16g749ghsqp0n6xqk9z3hj8di97r09gvw0dfk7jfq5crc02b69j2"; + version = "1.10.20"; + sha256 = "1ji1fh0dd2wl9vi9y9205hr49wjakrx5iwkk84idb7pvjnmba8wf"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -71365,8 +71819,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "2"; - editedCabalFile = "0vd9s4qhf7qx1l7fsxi1j6kacnk8jzclmqy9195rd9q0xsw5dfm6"; + revision = "3"; + editedCabalFile = "1awzybmy87y3am6qsvcx083g2xs62p1gk9jhbnpnr39kgld5zn17"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -71401,8 +71855,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "3"; - editedCabalFile = "1qiqaad3zpgvwpcb5p1q9aaska82bfm75qrsfdcdlwc70r7w57gj"; + revision = "4"; + editedCabalFile = "0l6s3pp6jdqbz8v4v9pc5lxpfvkcxli3i06nx5953pd68nd2viqs"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -72137,6 +72591,25 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_14" = callPackage + ({ mkDerivation, base, binary, boring, deepseq, ghc-prim, hashable + , hspec, hspec-discover, mtl, transformers, type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.14"; + sha256 = "19f4rprxzlddc2w66ib612lfvz9vh979xvffyimnn3zdphm342dq"; + libraryHaskellDepends = [ + base binary boring deepseq ghc-prim hashable mtl transformers + type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -72350,12 +72823,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "containers_0_6_7" = callPackage + "containers_0_7" = callPackage ({ mkDerivation, array, base, deepseq, template-haskell }: mkDerivation { pname = "containers"; - version = "0.6.7"; - sha256 = "0x684l54zpz2xh8jqyc1q107aggf9v3a5vz9cmgcx9l8bvyfy5l5"; + version = "0.7"; + sha256 = "09732p786v3886vgk5c272fid62wlwqa4wrncjwg0n3isba04sfg"; libraryHaskellDepends = [ array base deepseq template-haskell ]; description = "Assorted concrete container types"; license = lib.licenses.bsd3; @@ -72481,8 +72954,8 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.0.1"; - sha256 = "089v5dkpmlqrpdghhhmwca91dzzigsxwygjpg71ig5352cdfwdf4"; + version = "0.2.0.2"; + sha256 = "0wrqjpdiwpv3gcxqbfn0ixqfxfp6d1xnj6slkkz744bl1dmxdhaf"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ async base ghc-prim hspec ]; testToolDepends = [ hspec-discover ]; @@ -72544,8 +73017,8 @@ self: { }: mkDerivation { pname = "context-http-client"; - version = "0.2.0.1"; - sha256 = "1sm36mrnc80pnafpyikcalajy2kz1rxp7d40sgqng1s48k6d8js1"; + version = "0.2.0.2"; + sha256 = "06mr9r9c5vb1y6y532pwpb6dmp2nm0bzzpcjdqwj4h8lncd4pn12"; libraryHaskellDepends = [ base context http-client ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -72562,8 +73035,8 @@ self: { }: mkDerivation { pname = "context-resource"; - version = "0.2.0.1"; - sha256 = "1hcmzd82nxbxask6qckb9ivpxlrxhph9pwk379vkx235jgqy79gj"; + version = "0.2.0.2"; + sha256 = "0rmzl16hxp9vqc4y2j3f3wf73l0xdvi50ff82c4swg12hb0ln5bl"; libraryHaskellDepends = [ base context exceptions ]; testHaskellDepends = [ async base context hspec ]; testToolDepends = [ hspec-discover ]; @@ -72592,8 +73065,8 @@ self: { }: mkDerivation { pname = "context-wai-middleware"; - version = "0.2.0.1"; - sha256 = "1y34137h0zjqxs4f5mbjyq500sazsryl20sfx4p5b227nb8lyplh"; + version = "0.2.0.2"; + sha256 = "0sb18dqg6586fcz3vdhaya9b2vpyj7llnn6nmxzpq7m4qap6j74f"; libraryHaskellDepends = [ base context wai ]; testHaskellDepends = [ async base bytestring case-insensitive context hspec http-client @@ -72828,6 +73301,22 @@ self: { license = lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_4" = callPackage + ({ mkDerivation, base, contravariant, template-haskell + , template-haskell-compat-v0208 + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.5.4"; + sha256 = "13i9cip0qb8piib2sfq35qvb978npra2w53zvc28fxxnik9icfig"; + libraryHaskellDepends = [ + base contravariant template-haskell template-haskell-compat-v0208 + ]; + description = "Extras for the \"contravariant\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -73740,6 +74229,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, githash, hashable, hourglass, mtl + , prettyprinter, process, safe-exceptions, stm, template-haskell + , terminal-size, text, text-short, transformers, typed-process + , unix, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.7.0.0"; + sha256 = "17xbah7g8apcksn5x32cqwcfxd6xw5z1msx0rsjg2nyyn559p2vb"; + libraryHaskellDepends = [ + base bytestring core-data core-text directory exceptions filepath + fsnotify githash hashable hourglass mtl prettyprinter process + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix unliftio-core + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl @@ -75158,6 +75669,8 @@ self: { testHaskellDepends = [ base ]; description = "Secure Credentials Storage and Distribution"; license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "credentials-cli" = callPackage @@ -75182,6 +75695,7 @@ self: { ]; description = "Secure Credentials Administration"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "credentials"; }) {}; @@ -76263,8 +76777,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; - revision = "2"; - editedCabalFile = "112lx16przdk80m269rqizma0lxaij52l4haspb0cd07rbgp50cd"; + revision = "3"; + editedCabalFile = "1v7gv0xa9yfkxq3g9j79ppzn6hjf467aajzb4x5882yflibfi9ki"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -76283,8 +76797,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; - revision = "2"; - editedCabalFile = "1v495qn836flf4nhn43sbq14bhqfljvcpncmfrnvkhbrp5drxgi5"; + revision = "3"; + editedCabalFile = "08f68cjmdrwx76id4hcyp3jxs8dsnb1jv9pfkm5x7gsvxmrk6pdw"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -76303,8 +76817,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.1"; sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; - revision = "2"; - editedCabalFile = "1g7lpcn3zhrp4a65gj71v2164387r0m42pyavlx6bbifhyar1kkj"; + revision = "3"; + editedCabalFile = "1204ybm4685yc78mpyriwbplg3ppciid3g1b79562zwqc58hdnq3"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -76326,8 +76840,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.102.0"; sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z"; - revision = "1"; - editedCabalFile = "1y9d4f495gb5gdwsmzamgrq9yl16fx1bsaw6pr5236q6yahz0sb1"; + revision = "2"; + editedCabalFile = "1v1d8bv54vwwz31z8pdni6pa5lzm5zaxkzdg0857jzghzkdzg7d5"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -76515,8 +77029,6 @@ self: { ]; description = "Simple and easy network connections API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crypton-x509" = callPackage @@ -78328,8 +78840,8 @@ self: { }: mkDerivation { pname = "daemons"; - version = "0.3.0"; - sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3"; + version = "0.4.0"; + sha256 = "10fcxk749q90mlwgknqn6l5mff8b09acmikxzh5jkk5sr6bj86hz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78347,6 +78859,8 @@ self: { ]; description = "Daemons in Haskell made fun and easy"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dag" = callPackage @@ -78501,6 +79015,32 @@ self: { broken = true; }) {}; + "dap" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , containers, hspec, lifted-base, monad-control, mtl, network + , network-simple, stm, string-conversions, text, time + , transformers-base, unordered-containers + }: + mkDerivation { + pname = "dap"; + version = "0.1.0.0"; + sha256 = "1iq6vd2s6qz5mmcqfg8a9a4y9i9k4v6ak4n3jl5n5mdqbrli7ipz"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers lifted-base + monad-control mtl network network-simple stm text time + transformers-base unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bytestring containers hspec + lifted-base monad-control mtl network network-simple stm + string-conversions text time transformers-base unordered-containers + ]; + description = "A debug adaptor protocol library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "dapi" = callPackage ({ mkDerivation, base, containers, explicit-exception, multiarg , old-locale, parsec, prednote, rainbow, text, time, transformers @@ -79044,8 +79584,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; - revision = "1"; - editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; + revision = "2"; + editedCabalFile = "0g0xvsrinssn2a6z9sdaa2px5ra3rvr2lm5zixlpaq845f5y52dd"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -79797,8 +80337,8 @@ self: { pname = "data-fix"; version = "0.3.2"; sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; - revision = "4"; - editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2"; + revision = "5"; + editedCabalFile = "1waspjvz1r21r7ax6b2ni5wmbg6diky70s0iv18kpjlanvw6yzfd"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -81357,6 +81897,17 @@ self: { broken = true; }) {}; + "day-comonoid" = callPackage + ({ mkDerivation, base, comonad, kan-extensions }: + mkDerivation { + pname = "day-comonoid"; + version = "0.1"; + sha256 = "0v1p0jw51rx6p2nz9bg1qlv2zhgpwdn7y208zihr3lgz3c62fqng"; + libraryHaskellDepends = [ base comonad kan-extensions ]; + description = "A comonoid w.r.t. Day"; + license = lib.licenses.bsd3; + }) {}; + "daytripper" = callPackage ({ mkDerivation, base, bytestring, directory, falsify , optparse-applicative, tagged, tasty, tasty-hunit @@ -81601,7 +82152,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_0" = callPackage + "dbus_1_3_1" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -81610,8 +82161,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.3.0"; - sha256 = "0qvlq4qaxvpyx9ckiaqlj210gm98fqbd9f7bwq021vwdm3xwzh3c"; + version = "1.3.1"; + sha256 = "0n3ghygqdbhgknv9hr650lv9vfk8jb6qfcw7p39kxjw9qxxbfvm3"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -82208,8 +82759,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "4.0.4"; - sha256 = "11510xb7a9nlvaygrmwbx9imagj8517iz2am6jv88934m0l5iy1n"; + version = "4.0.5"; + sha256 = "1s0pin0qbdakigm0ijnyvs8k27d4p8rdcysymh405ay90kqwp6p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82767,8 +83318,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "9"; - editedCabalFile = "1ww3328aga9s7knbl8xxvsff13gdnl3rdqplpx11rl6k6gnr032k"; + revision = "10"; + editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -82856,21 +83407,20 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector + , primitive, quickcheck-instances, rerebase, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.3"; - sha256 = "0x27yqcmpcdfnpf7hn0v574wr641xg23k8fn18w9klc0l3m3089v"; + version = "0.9.18.5"; + sha256 = "1riczgknn87b7cqpk8crq33zwkq80gv5ha9ang5ib5rlg6fmckn4"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; @@ -83845,6 +84395,20 @@ self: { broken = true; }) {}; + "derive-has-field" = callPackage + ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: + mkDerivation { + pname = "derive-has-field"; + version = "0.0.1.1"; + sha256 = "0aai12n4acvxga6w6jz4npca1581ks7x1y6y337y0n46mqlsy6kf"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ + base hspec template-haskell th-abstraction + ]; + description = "Derive HasField instances with Template Haskell"; + license = lib.licenses.mit; + }) {}; + "derive-lifted-instances" = callPackage ({ mkDerivation, base, bifunctors, reflection, template-haskell }: mkDerivation { @@ -83980,6 +84544,8 @@ self: { pname = "deriving-compat"; version = "0.6.5"; sha256 = "1wrjapgp6sy2h8jql05ryyzmiadlkfy5qw1brka466j6ag7jwha7"; + revision = "1"; + editedCabalFile = "093kv76593jr1af12c5idqr97mbkf9vs93zbhrw7kcqwiydpsi91"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -84196,6 +84762,8 @@ self: { ]; description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "desert" = callPackage @@ -84227,8 +84795,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.3.1.0"; - sha256 = "00pr8l4m1g5mcnxv8w8dab2iah1935fq79az7chsa6jgki6lflqf"; + version = "0.3.2.0"; + sha256 = "0xl8bib8wsnf8ylmmpln25fnw48zq0js7r9blb0km6sskwdvx6kw"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory modern-uri network random text unix @@ -85112,10 +85680,10 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-lsp-server"; - maintainers = [ lib.maintainers.Gabriella439 ]; - broken = true; + maintainers = [ + lib.maintainers.dalpd lib.maintainers.Gabriella439 + ]; }) {}; "dhall-nix" = callPackage @@ -85560,6 +86128,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "di-monad_1_3_5" = callPackage + ({ mkDerivation, base, conduit, containers, di-core, exceptions + , monad-control, mtl, pipes, pipes-safe, primitive, resourcet, stm + , streaming, transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "di-monad"; + version = "1.3.5"; + sha256 = "0l22yqigv7nkc54bcnz2fy8kxnl8dgj1wzs8cf24fy1apahz8kx0"; + libraryHaskellDepends = [ + base conduit containers di-core exceptions monad-control mtl pipes + pipes-safe primitive resourcet stm streaming transformers + transformers-base unliftio-core + ]; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "di-polysemy" = callPackage ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { @@ -85956,8 +86543,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6"; sha256 = "1a0wl8lspwkby5x45j1wa1xq27bs67x5vwj8jzavym56a3f2pjcb"; - revision = "2"; - editedCabalFile = "0dxs255ryr1wl3b1ba797290xg0qf22j2n89047ispzsk0n6scjb"; + revision = "3"; + editedCabalFile = "09b3hdmsk5byjm1jcq03zjb8fz7h3lid747abi3fq9bvsaqsp5ka"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -86248,6 +86835,8 @@ self: { pname = "dialogue"; version = "0.1.0"; sha256 = "03rlcyvkzm9fyqdsgswx9sgw2jdiplngw9a1rknngwnwnx5mqbpm"; + revision = "1"; + editedCabalFile = "1g4297n8xdnjs8ylxvs3whqq2d984g57fyxb7dm46dm809mhbhd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory ]; @@ -86892,8 +87481,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.11"; - sha256 = "1ic9qvlqrdi3a8wlgrahl6mrc43sc9x1k9p7myydzai4zg1wr013"; + version = "0.12"; + sha256 = "1z765d5rsz3gh0rq8601gq5fhzm3yvk175vchw9qnanv7zn596wx"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -86904,6 +87493,8 @@ self: { ]; description = "A data-type representing digits 0-9 and other combinations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "digitalocean-kzs" = callPackage @@ -87391,6 +87982,8 @@ self: { pname = "directory"; version = "1.3.8.1"; sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; + revision = "1"; + editedCabalFile = "1yd7hqs70486gbf7yms6gbx2zm34m1hakx5rh3dd4rd38w4hlfxx"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -88095,6 +88688,8 @@ self: { libraryHaskellDepends = [ base ghcjs-base-stub stm ]; description = "Allows storing different resource-releasing actions together"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dist-upload" = callPackage @@ -89021,6 +89616,31 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra + , filepath, http-client, http-client-tls, http-directory + , http-types, optparse-applicative, regex-posix, simple-cmd + , simple-cmd-args, simple-prompt, text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "1.0"; + sha256 = "1rg77n4q2xpvbibh57nki0vdbq1r3n1h1ci99v670p06q8j99myz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args simple-prompt text time unix + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -89933,7 +90553,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_1" = callPackage + "doctest_0_22_2" = callPackage ({ mkDerivation, base, code-page, deepseq, directory, exceptions , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover , HUnit, mockery, process, QuickCheck, setenv, silently @@ -89941,8 +90561,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.1"; - sha256 = "0xszdclizmlf5gsnn4fwbvncjs6fbif9a5956pnxr50g5fxfi6xk"; + version = "0.22.2"; + sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90109,6 +90729,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.1"; + sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -91967,8 +92614,8 @@ self: { pname = "dual-tree"; version = "0.2.3.1"; sha256 = "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh"; - revision = "1"; - editedCabalFile = "0prbgzh1bhgrg6qxp5l2m33f5xcjjjpzbm32xx2rgyi4w1yf3587"; + revision = "2"; + editedCabalFile = "1qlrrvw3j9h12nj105aa5ckri5580xgbi16gph70i5w2crmrvphw"; libraryHaskellDepends = [ base monoid-extras semigroups ]; testHaskellDepends = [ base monoid-extras QuickCheck semigroups testing-feat @@ -92856,6 +93503,8 @@ self: { ]; description = "Typesafe library for working with DynamoDB database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dynloader" = callPackage @@ -93315,8 +93964,8 @@ self: { }: mkDerivation { pname = "ebird-cli"; - version = "0.1.0.0"; - sha256 = "0h21yfda4hhs0kx05yfr20qwzdhfm5p2h280x3nr2kgj9wq889wi"; + version = "0.2.0.0"; + sha256 = "0vla1xz74qjpfa0qjfkvlp19mdv58dp1kr0m0g9jg07aqjwa4r92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93326,7 +93975,7 @@ self: { executableHaskellDepends = [ base ]; description = "A command-line utility for interacting with the eBird API"; license = lib.licenses.mit; - mainProgram = "ebird"; + mainProgram = "ebird-cli"; }) {}; "ebird-client" = callPackage @@ -93422,7 +94071,9 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ec2-unikernel"; + broken = true; }) {}; "eccrypto" = callPackage @@ -94120,18 +94771,6 @@ self: { }) {}; "effectful-plugin" = callPackage - ({ mkDerivation, base, containers, effectful-core, ghc }: - mkDerivation { - pname = "effectful-plugin"; - version = "1.1.0.1"; - sha256 = "1clm190xhf9wibck7i5slzchbq926f2xfxij6zxqv656fx9l5vf6"; - libraryHaskellDepends = [ base containers effectful-core ghc ]; - testHaskellDepends = [ base effectful-core ]; - description = "A GHC plugin for improving disambiguation of effects"; - license = lib.licenses.bsd3; - }) {}; - - "effectful-plugin_1_1_0_2" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { pname = "effectful-plugin"; @@ -94141,7 +94780,6 @@ self: { testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-st" = callPackage @@ -94345,6 +94983,8 @@ self: { pname = "egison-pattern-src"; version = "0.2.1.2"; sha256 = "14g13m9c4353j8hir5inqhfzwapkxdkbvkzfbrrgca6hyj7mn1vf"; + revision = "1"; + editedCabalFile = "0p81fpqrhb9vjcfp79cy62ckj9qmyc5ixqbywsjqi46wgcai26im"; libraryHaskellDepends = [ base containers free megaparsec mtl parser-combinators prettyprinter recursion-schemes text @@ -94744,6 +95384,8 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ekg-core" = callPackage @@ -95113,17 +95755,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "eliminators_0_9_3" = callPackage + "eliminators_0_9_4" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.3"; - sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; - revision = "1"; - editedCabalFile = "0nxnc1y8lnwmbg1igd8mndkav0ilvb20pbs0d2yvxr032bi35jc4"; + version = "0.9.4"; + sha256 = "1qr02xlmb6nfd505z0iw7bj7kpha8wyvcr31rm92r1a78pwvysaf"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -95857,7 +96497,7 @@ self: { ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.maralorn ]; + maintainers = [ lib.maintainers.srid ]; }) {}; "ema-extra" = callPackage @@ -96183,7 +96823,7 @@ self: { badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; - maintainers = [ lib.maintainers.maralorn ]; + maintainers = [ lib.maintainers.srid ]; }) {}; "embed-config" = callPackage @@ -97655,8 +98295,8 @@ self: { }: mkDerivation { pname = "error-codes"; - version = "0.1.2.0"; - sha256 = "1ylbbanzwxh2ggqj1f4c4mib91swvvp3mk5cxn1d2ppkkssx7h8z"; + version = "0.1.3.0"; + sha256 = "15i7xyq3jll98cj1dd7rk5dm0aba4sf504f89fqy69ciacd35ckj"; libraryHaskellDepends = [ base bytestring primitive primitive-unlifted text text-short ]; @@ -97810,8 +98450,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; - revision = "4"; - editedCabalFile = "0sji6ny86f4j9ch1cyf2p1mcr5b2ighvw4bb9rssvypxb6k2r68f"; + revision = "5"; + editedCabalFile = "0ljfsadhqbqjivrr08x11zazpl115902ikvyhxq6nmg6zp54w7al"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -97895,6 +98535,39 @@ self: { broken = true; }) {}; + "ersatz_0_5" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, HUnit, lens, mtl, parsec, process, semigroups + , streams, temporary, test-framework, test-framework-hunit + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.5"; + sha256 = "1fzaany3mzzmizfzdglwqni3q842ip5z86apgdla2ynhq0hlmh3m"; + revision = "1"; + editedCabalFile = "0mg4bip6ngviyriyx3d0d588h5mm8a985gdhijd6y98yd86krb43"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups streams temporary transformers + unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ + array base containers data-default HUnit test-framework + test-framework-hunit + ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -98130,6 +98803,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto-compat" = callPackage + ({ mkDerivation, base, conduit, esqueleto, hspec, persistent + , resourcet, transformers + }: + mkDerivation { + pname = "esqueleto-compat"; + version = "0.0.2.0"; + sha256 = "0r76i5597lmd31384k0961hvps57xcf9dadscvd729yrf0plahvk"; + libraryHaskellDepends = [ + base conduit esqueleto persistent resourcet transformers + ]; + testHaskellDepends = [ base hspec ]; + description = "Compatibility operators for Persistent and Esqueleto"; + license = lib.licenses.bsd3; + }) {}; + "esqueleto-pgcrypto" = callPackage ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent , persistent-postgresql, QuickCheck, text, transformers, unliftio @@ -98993,10 +99682,8 @@ self: { }: mkDerivation { pname = "event-list"; - version = "0.1.2"; - sha256 = "177q99iswmanh34wlgklw1djvv5v1c0b5ysyi7mdmb70fsw30kk2"; - revision = "1"; - editedCabalFile = "19n1snzzqg4mkpss2b29zsv8h4n1nmzcmyclap11gcsjmv75mwzh"; + version = "0.1.2.1"; + sha256 = "0wkrzflrkaa7qg4lwzgfm0dhmghgiqph4hnpnd4smpv98sz3bcq0"; libraryHaskellDepends = [ base non-negative QuickCheck semigroups transformers utility-ht ]; @@ -100422,8 +101109,8 @@ self: { }: mkDerivation { pname = "exitcode"; - version = "0.1.0.6"; - sha256 = "07knpcak3ca38r7g9x4ixi36rg6zllrn2azbqlkgmmdqwqmcaj7w"; + version = "0.1.0.9"; + sha256 = "0g63q2y1ipgnylfjp28yly6lbps7gbnam7lpg1x8hnmlvfz89mj7"; libraryHaskellDepends = [ base bifunctors filepath lens mtl process semigroupoids semigroups transformers @@ -100452,17 +101139,15 @@ self: { }) {}; "exon" = callPackage - ({ mkDerivation, base, criterion, flatparse, generics-sop - , ghc-hs-meta, hedgehog, incipit-base, tasty, tasty-hedgehog - , template-haskell + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell }: mkDerivation { pname = "exon"; - version = "1.5.0.0"; - sha256 = "0j3l228ygb8gg8lgfmmajq78hv2y6078rqlmps8gs62vvbfrsnri"; + version = "1.6.0.1"; + sha256 = "0r26dvc4dc865x84pz8y4yh43pzzgdy524aggwn3q2m3frdc7zba"; libraryHaskellDepends = [ - base flatparse generics-sop ghc-hs-meta incipit-base - template-haskell + base ghc incipit-base parsec template-haskell ]; testHaskellDepends = [ base hedgehog incipit-base tasty tasty-hedgehog template-haskell @@ -100743,8 +101428,8 @@ self: { pname = "explicit-exception"; version = "0.2"; sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; - revision = "1"; - editedCabalFile = "0k1299cvh6ayh26nidxnywpdmby5v52k23kyaxzla5i611306v10"; + revision = "2"; + editedCabalFile = "0wixdj39wxyfy82yp344nn38b6d1cmf32jmx89x98j4pvqb65cy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -101057,8 +101742,8 @@ self: { pname = "extended-reals"; version = "0.2.4.0"; sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; - revision = "1"; - editedCabalFile = "07qsnn05q9n2l4jh7agql44l2z7rqnwdcp9bssri4chs0jvk15rg"; + revision = "2"; + editedCabalFile = "1v4vcrf66bapldw5jswkp4jb1v1qlr5cx2mgjnxb8mszir7s6p1f"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -101079,8 +101764,8 @@ self: { pname = "extensible"; version = "0.9"; sha256 = "06zmc71r4cqglkv3av38djbkakvw9zxc3901xi2h65fwxn4npvnc"; - revision = "1"; - editedCabalFile = "1k8z4dnwkjisba6w5qjxyxvh7ibp6nvl82d6l8apjh7hriapwfx9"; + revision = "2"; + editedCabalFile = "19d0w4ifmjlkw7i36ah9xqcy3b9na7hcjnvj6grk5iqnlmkz6six"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable incremental membership prettyprinter primitive profunctors @@ -101238,8 +101923,8 @@ self: { }: mkDerivation { pname = "extensions"; - version = "0.1.0.0"; - sha256 = "1b4wiw228hlk0ywjzpgw7rg9nwfmav82c976ipn0ql0gyh7v27xc"; + version = "0.1.0.1"; + sha256 = "1rf6jhmms6ll7mn9rh81amzb7nd4zjqcnxdzivw50dxcrcfmdiq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101256,7 +101941,9 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; + broken = true; }) {}; "external-sort" = callPackage @@ -101302,6 +101989,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "extism-pdk" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, containers + , extism-manifest, json, messagepack + }: + mkDerivation { + pname = "extism-pdk"; + version = "0.2.0.0"; + sha256 = "0aqbzd9vnnfxn0wh5q6axcwq44iq2z5gq276qcbcfppd03vf83mm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal containers extism-manifest json + messagepack + ]; + executableHaskellDepends = [ base ]; + description = "Extism Plugin Development Kit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix @@ -101880,6 +102588,8 @@ self: { pname = "faktory"; version = "1.1.2.4"; sha256 = "0mn888cjk8ag94il7zcbk6q5cq2vf2dxf1b8ba8ki2rypxld5m7a"; + revision = "1"; + editedCabalFile = "10gpavyqdx9kcrp963wgx0jfvm4xf97yg92y4gvk5vkpjipmx5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101909,6 +102619,8 @@ self: { pname = "faktory"; version = "1.1.2.5"; sha256 = "0ax5hk98k4v8vnhv6rvbjxhynqkzijb5l7dbaxp15mh6yd2y981f"; + revision = "1"; + editedCabalFile = "072nm86gyqgnrcfdq466nkpkcsp417zibj1ni2s9b7ndw63x4k1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102792,8 +103504,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.3.2"; - sha256 = "0qzfn271ka46f11hrbzq8axc3npkx1n5y5pihpg1gdccqmw6aazq"; + version = "1.3.3"; + sha256 = "1j4g4q37ly0np6zyyswfx79i5hn3pj4zzby0y5k62jin2v6xvq3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103169,14 +103881,24 @@ self: { }) {}; "fec" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, criterion, data-serializer + , deepseq, extra, hspec, QuickCheck, quickcheck-instances, random + }: mkDerivation { pname = "fec"; - version = "0.1.1"; - sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.0"; + sha256 = "018vwvx2ailk7yc8a5jxbnykca212gr8p7kv3v6k8dnp881flilw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring deepseq extra ]; + executableHaskellDepends = [ base bytestring criterion random ]; + testHaskellDepends = [ + base bytestring data-serializer hspec QuickCheck + quickcheck-instances random + ]; description = "Forward error correction of ByteStrings"; - license = "GPL"; + license = lib.licenses.gpl2Plus; + mainProgram = "benchmark-zfec"; }) {}; "fedora-composes" = callPackage @@ -104105,14 +104827,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_1_1" = callPackage + "fgl_5_8_2_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.1.1"; - sha256 = "1bccd85756nk09hgv6h52k4vkxw2xdqbk5m20g8q6301rdpgs239"; + version = "5.8.2.0"; + sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -104623,20 +105345,22 @@ self: { }) {}; "filepather" = callPackage - ({ mkDerivation, base, bytestring, contravariant, directory - , filepath, lens, mmorph, mtl, semigroupoids, semigroups, time - , transformers + ({ mkDerivation, base, bytestring, containers, contravariant + , directory, exitcode, filepath, lens, mmorph, mtl, semigroupoids + , time, transformers }: mkDerivation { pname = "filepather"; - version = "0.4.1"; - sha256 = "0pvb828gsq4rip8vf66bxacd3jrb9z6pz3g2vd4zcnya5wgy47fh"; + version = "0.5.5"; + sha256 = "05dqkpdhlw6lkkrwvdk2g6bcymr1mpn55ky4vzyd9729xglk5c5p"; libraryHaskellDepends = [ - base bytestring contravariant directory filepath lens mmorph mtl - semigroupoids semigroups time transformers + base bytestring containers contravariant directory exitcode + filepath lens mmorph mtl semigroupoids time transformers ]; description = "Functions on System.FilePath"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "filepattern" = callPackage @@ -105441,8 +106165,8 @@ self: { }: mkDerivation { pname = "fits-parse"; - version = "0.3.4"; - sha256 = "0kahw1bciy793wabn5v0xzxzr2csy99byycls7g3f3q0hly2y293"; + version = "0.3.6"; + sha256 = "19mwisig0ffxyni6b1yqs9vxnl5161vxl7zj5bj96njw1f3sjxqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106723,6 +107447,42 @@ self: { mainProgram = "floskell"; }) {}; + "floskell_0_11_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, attoparsec + , attoparsec-aeson, base, bytestring, containers, criterion + , data-default, deepseq, directory, exceptions, filepath, ghc-prim + , haskell-src-exts, hspec, monad-dijkstra, mtl + , optparse-applicative, text, transformers, unordered-containers + }: + mkDerivation { + pname = "floskell"; + version = "0.11.0"; + sha256 = "07l14zr1igq2vbs6m09ffc9ddchwbakmhb1bjnxldb3rsvaqnjc3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base bytestring containers + data-default directory filepath haskell-src-exts monad-dijkstra mtl + text transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson-pretty ansi-wl-pprint base bytestring directory ghc-prim + haskell-src-exts optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring deepseq exceptions haskell-src-exts hspec text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq exceptions ghc-prim + haskell-src-exts text + ]; + description = "A flexible Haskell source code pretty printer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "floskell"; + }) {}; + "flow" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -107371,6 +108131,20 @@ self: { license = lib.licenses.mit; }) {}; + "focus_1_0_3_2" = callPackage + ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "focus"; + version = "1.0.3.2"; + sha256 = "11n2dh0ilc2hqh96ivy1k2y3pi8y1ll11awp4r3h40w17023yjz2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "A general abstraction for manipulating elements of container data structures"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "focuslist" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , genvalidity, genvalidity-containers, genvalidity-hspec, hedgehog @@ -107469,8 +108243,8 @@ self: { pname = "foldable1-classes-compat"; version = "0.1"; sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; - revision = "3"; - editedCabalFile = "0ggamxlpw70njjb7rc8xxb432ra7drmjnfgazb5zqbb1a32bjjfh"; + revision = "4"; + editedCabalFile = "0kpsp659y563h2vanhrdnbza9skq1j9sm6y3fg2j4p1xsgnkqjzv"; libraryHaskellDepends = [ base containers ghc-prim tagged transformers ]; @@ -107798,8 +108572,8 @@ self: { }: mkDerivation { pname = "fontconfig-pure"; - version = "0.2.0.0"; - sha256 = "0i8crknwzqbhzkzfq1jjrm9cy1jabi7hd4mw3mg6qcma6zzi5q46"; + version = "0.4.0.0"; + sha256 = "05nlnr5v1gfi0wrksdpzszpvj1vj5ff2wv2nzm7g43dr9j33xyf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108624,78 +109398,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_9_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , pretty, process, QuickCheck, syb, template-haskell, temporary - , text, th-lift-instances, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.9.0.0"; - sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l"; - revision = "1"; - editedCabalFile = "0hbjn9qzbr7a9571isi4i651gdi60qqa40idpfg87qlg2sd61485"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser gitrev - optparse-applicative text yaml - ]; - testHaskellDepends = [ - base containers Diff directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - - "fourmolu_0_10_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal-syntax, containers, Diff, directory, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, template-haskell - , temporary, text, th-lift-instances, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.10.1.0"; - sha256 = "0gkzd2wf8hji5j0pxjv7l43m405zwsvppj7hax69j86346mb8hp4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal-syntax containers - Diff directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser gitrev - optparse-applicative text yaml - ]; - testHaskellDepends = [ - base containers Diff directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, Diff, directory, dlist @@ -108732,43 +109434,6 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_13_1_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, deepseq, Diff, directory - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, scientific, syb - , temporary, text, th-env, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.13.1.0"; - sha256 = "05vkqygrmgfgmsd8a4vxq8mq0c1z9cb3hja28aszd6llfv427dm1"; - revision = "1"; - editedCabalFile = "0jqgixycw8cv0q7amx5fs4ml9knql70ghg31br3hjkcy0vb2hi5v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary bytestring Cabal-syntax - containers deepseq Diff directory file-embed filepath - ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml - ]; - executableHaskellDepends = [ - base Cabal-syntax containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml - ]; - testHaskellDepends = [ - base bytestring Cabal-syntax containers Diff directory filepath - ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io - pretty process QuickCheck temporary text yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu_0_14_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory @@ -109033,10 +109698,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fractionizer"; - version = "0.10.0.0"; - sha256 = "0bda0bv4skc53x1x37p71a7n2a994wp45y1143447fv87bj4pmjx"; + version = "0.17.0.0"; + sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243"; libraryHaskellDepends = [ base ]; - description = "Allows to approximate the fractional numbers in the range [0.005, 1] with sum of 2 or 3 unit fractions of special types."; + description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types."; license = lib.licenses.mit; }) {}; @@ -109177,39 +109842,46 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, aws-xray-client-persistent - , aws-xray-client-wai, base, Blammo, bugsnag, bytestring + , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers - , datadog, doctest, dotenv, ekg-core, envparse, errors, exceptions - , extra, filepath, Glob, hashable, hspec, hspec-core - , hspec-expectations-lifted, hspec-junit-formatter, http-client - , http-conduit, http-link-header, http-types, hw-kafka-client - , immortal, lens, lens-aeson, memcache, monad-control - , monad-validate, MonadRandom, mtl, network-uri + , cookie, datadog, doctest, dotenv, ekg-core, envparse, errors + , exceptions, extra, filepath, Glob, hashable, hs-opentelemetry-api + , hs-opentelemetry-instrumentation-persistent + , hs-opentelemetry-instrumentation-wai + , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec + , hspec-core, hspec-expectations-lifted, hspec-junit-formatter + , http-client, http-conduit, http-link-header, http-types + , hw-kafka-client, immortal, lens, lens-aeson, memcache + , monad-control, monad-validate, MonadRandom, mtl, network-uri , nonempty-containers, path-pieces, persistent - , persistent-postgresql, postgresql-simple, primitive, QuickCheck - , resource-pool, resourcet, retry, safe, scientist, semigroupoids - , template-haskell, text, time, transformers, transformers-base - , typed-process, unliftio, unliftio-core, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core + , persistent-postgresql, postgresql-simple, primitive, pureMD5 + , QuickCheck, resource-pool, resourcet, retry, safe, scientist + , semigroupoids, serialise, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml + , yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.9.4.0"; - sha256 = "0z2hra1vc7ky1q5l6bjrnf78cdadf6dml5xzqqq085px4bcy4ca3"; + version = "1.10.2.0"; + sha256 = "18d8594pz123kbhvw3igazs5ngd8rrs050ivb1hmksr6x2r6b6mm"; libraryHaskellDepends = [ - aeson aws-xray-client-persistent aws-xray-client-wai base Blammo - bugsnag bytestring case-insensitive cassava conduit conduit-extra - containers datadog doctest dotenv ekg-core envparse errors - exceptions extra filepath Glob hashable hspec hspec-core - hspec-expectations-lifted hspec-junit-formatter http-client - http-conduit http-link-header http-types hw-kafka-client immortal - lens memcache monad-control monad-validate MonadRandom mtl - network-uri nonempty-containers path-pieces persistent - persistent-postgresql postgresql-simple primitive resource-pool - resourcet retry safe scientist semigroupoids template-haskell text - time transformers transformers-base typed-process unliftio - unliftio-core unordered-containers vector wai wai-extra yaml - yesod-core + aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 + Blammo bugsnag bytestring case-insensitive cassava conduit + conduit-extra containers cookie datadog doctest dotenv ekg-core + envparse errors exceptions extra filepath Glob hashable + hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent + hs-opentelemetry-instrumentation-wai + hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec + hspec-core hspec-expectations-lifted hspec-junit-formatter + http-client http-conduit http-link-header http-types + hw-kafka-client immortal lens memcache monad-control monad-validate + MonadRandom mtl network-uri nonempty-containers path-pieces + persistent persistent-postgresql postgresql-simple primitive + pureMD5 resource-pool resourcet retry safe scientist semigroupoids + serialise template-haskell text time transformers transformers-base + typed-process unliftio unliftio-core unordered-containers vector + wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ aeson base Blammo bugsnag bytestring cassava conduit errors hspec @@ -109272,8 +109944,8 @@ self: { pname = "free"; version = "5.2"; sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; - revision = "2"; - editedCabalFile = "0gpw6n6pzy12ycwhi47cdzf90lxn94ajkqrvc12yvypzh2k5yaqk"; + revision = "3"; + editedCabalFile = "0w5yl0kg77nxrizd1d0r3d2f1wqy1wsq4mmpwxk7h7gq34d6rmsd"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -111607,8 +112279,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.3"; - sha256 = "0vqww2fmn2ksnxwrkzmxizgcnd0k20dgq9v20fqnn3xkyi7a5das"; + version = "0.25.5"; + sha256 = "1jikcawlhx0529dvdikz52qyb3q1hp1avagzdmgdggj5yik9wc38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111631,9 +112303,8 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; - broken = true; + maintainers = [ lib.maintainers.athas ]; }) {}; "futhark-data" = callPackage @@ -111903,21 +112574,21 @@ self: { }) {}; "fuzzyset" = callPackage - ({ mkDerivation, base, data-default, hspec, ieee754, text - , text-metrics, unordered-containers, vector + ({ mkDerivation, base, hspec, ieee754, mtl, text, text-metrics + , transformers, unordered-containers, vector }: mkDerivation { pname = "fuzzyset"; - version = "0.2.3"; - sha256 = "02rc846kfrkd0gd3j37gkmf87z09rzfa9bz2f0i2b83mh8ppk1sl"; + version = "0.3.1"; + sha256 = "07i0ygbikr5rdmwp00yrql6xjprzhkqb5jr12w1l56n1xssf71zx"; libraryHaskellDepends = [ - base data-default text text-metrics unordered-containers vector + base mtl text text-metrics transformers unordered-containers vector ]; testHaskellDepends = [ - base data-default hspec ieee754 text text-metrics + base hspec ieee754 mtl text text-metrics transformers unordered-containers vector ]; - description = "Fuzzy set for approximate string matching"; + description = "Fuzzy set data structure for approximate string matching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -113444,6 +114115,8 @@ self: { pname = "generic-data"; version = "1.1.0.0"; sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; + revision = "1"; + editedCabalFile = "1njfdpp8rckkibixp89rz8dh4qmz67404gbwq2l0qmfcglzf997p"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -113505,6 +114178,8 @@ self: { pname = "generic-deriving"; version = "1.14.5"; sha256 = "0jcl6cdf3pdg57yhf90rhdscszna0znvwhlffdcq3bnzkc2797za"; + revision = "1"; + editedCabalFile = "1fv2fy6f0wmsxghyn1ywl3zqvdlcv6sd6hqw02pgvhjjzavsysc0"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -113777,18 +114452,21 @@ self: { "generic-persistence" = callPackage ({ mkDerivation, base, convertible, generic-deriving, HDBC - , HDBC-sqlite3, hspec, hspec-discover, QuickCheck, resource-pool + , HDBC-postgresql, HDBC-sqlite3, hspec, hspec-discover, QuickCheck + , raw-strings-qq, resource-pool, template-haskell }: mkDerivation { pname = "generic-persistence"; - version = "0.4.0.0"; - sha256 = "18k08qr3zc56zgk6m2g6mh5138v0lf7rh4warvz8vfpxm5wvbn7i"; + version = "0.6.0"; + sha256 = "00clpi6ijwagp3zrjb94kwv03wxcx4aqq22zn32kxhz8b3w71jd1"; libraryHaskellDepends = [ - base convertible generic-deriving HDBC resource-pool + base convertible generic-deriving HDBC raw-strings-qq resource-pool + template-haskell ]; testHaskellDepends = [ - base convertible generic-deriving HDBC HDBC-sqlite3 hspec - hspec-discover QuickCheck resource-pool + base convertible generic-deriving HDBC HDBC-postgresql HDBC-sqlite3 + hspec hspec-discover QuickCheck raw-strings-qq resource-pool + template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; @@ -113960,8 +114638,8 @@ self: { pname = "generically"; version = "0.1.1"; sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; - revision = "1"; - editedCabalFile = "0pkyhym7q9v03pplpfjg80vmpk0cbgc56panfx9vcbzadvxmx6rb"; + revision = "2"; + editedCabalFile = "0z2rjz0ap63zjpj4166fxl09zfrlpmzn85pi3l0vhlr8pi4w13ip"; libraryHaskellDepends = [ base base-orphans ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -114032,6 +114710,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "generics-sop_0_5_1_4" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generics-sop"; + version = "0.5.1.4"; + sha256 = "0zkri1w7qdqlxcfx0kzld7ai5g7xzxwxjxjfa7wnjx09fqhiqsk1"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell th-abstraction + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -114478,8 +115176,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "1.0.0.2"; - sha256 = "00sv0mzlvny5ch7c9fnd19szqd0pjrkvi080x1i62qa5fdzs5yc4"; + version = "1.0.0.3"; + sha256 = "0z4ykzbww4ydxf6f10hkrlmwbn4mkildbj2r57m8llyih8y51rhd"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck transformers validity @@ -114559,8 +115257,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "1.0.0.0"; - sha256 = "14fg796iivlpp4gqsmma9zf0z9iqk524ydyqmza83qrjh8v2ff5v"; + version = "1.0.0.1"; + sha256 = "07i60jkwx1dnazhc5v2z5ya0840lmpijhlj56nz0j3jq88hrf2wm"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec genvalidity-property hashable hspec QuickCheck validity @@ -114613,24 +115311,27 @@ self: { }) {}; "genvalidity-mergeful" = callPackage - ({ mkDerivation, base, containers, criterion, genvalidity - , genvalidity-containers, genvalidity-criterion, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid - , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid + ({ mkDerivation, autodocodec, autodocodec-yaml, base, containers + , criterion, genvalidity, genvalidity-containers + , genvalidity-criterion, genvalidity-sydtest + , genvalidity-sydtest-aeson, genvalidity-time, genvalidity-uuid + , mergeful, mtl, pretty-show, QuickCheck, random + , safe-coloured-text, sydtest, sydtest-discover, time, uuid }: mkDerivation { pname = "genvalidity-mergeful"; - version = "0.3.0.0"; - sha256 = "0dd22kdlydhdns86awmmzbnr9bwrb84623zcyb5b9aaxmq75ifza"; + version = "0.3.0.1"; + sha256 = "1k18biwqva6wkdhapwfr56xrbsvyqp6183p0fi2kma4rv3g4hfpy"; libraryHaskellDepends = [ base containers genvalidity genvalidity-containers genvalidity-time mergeful QuickCheck ]; testHaskellDepends = [ - base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random - time uuid + autodocodec autodocodec-yaml base containers genvalidity-sydtest + genvalidity-sydtest-aeson genvalidity-uuid mergeful mtl pretty-show + QuickCheck random safe-coloured-text sydtest time uuid ]; + testToolDepends = [ sydtest-discover ]; benchmarkHaskellDepends = [ base criterion genvalidity-criterion mergeful ]; @@ -114719,8 +115420,8 @@ self: { }: mkDerivation { pname = "genvalidity-persistent"; - version = "1.0.0.1"; - sha256 = "1h3illab5k0rzmyi1pjc4yij2dsxn9gnmrvdgll32plxkdmyp0jr"; + version = "1.0.0.2"; + sha256 = "1ia99sv51zbp3mhk6apskhx95rfjly7z47p6r78mbm0j6m36a2vy"; libraryHaskellDepends = [ base containers genvalidity genvalidity-containers persistent QuickCheck validity-containers validity-persistent @@ -114816,8 +115517,8 @@ self: { }: mkDerivation { pname = "genvalidity-sydtest-hashable"; - version = "1.0.0.0"; - sha256 = "05482ynm19k9wj0hvvlfimvdng1wkl35409lp1r6vj02b7ml4i2z"; + version = "1.0.0.1"; + sha256 = "1vmav4h4lcdwcbl2kpd3c3cqcb6x09ldfzkr84a75i38x9x07s52"; libraryHaskellDepends = [ base genvalidity genvalidity-sydtest hashable QuickCheck sydtest validity @@ -114946,8 +115647,8 @@ self: { }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "1.0.0.0"; - sha256 = "1sd67x2kw7l0kbsaa67x3an94sv1hvnkbb8r42v36cc5jjaw29dk"; + version = "1.0.0.1"; + sha256 = "0880shsq544dhciabc19fhzi3hdjggb5vkg327hg3vg6xbvq250k"; libraryHaskellDepends = [ base genvalidity hashable QuickCheck unordered-containers validity validity-unordered-containers @@ -115479,21 +116180,24 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_6_1" = callPackage + "ghc_9_8_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, stm, template-haskell, time, transformers, unix + , process, semaphore-compat, stm, template-haskell, time + , transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.6.1"; - sha256 = "1jrcqhg4qc1lj8cfv8apzpw0479g42lv5pw8dr3dvmhg21njp386"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "9.8.1"; + sha256 = "15863rp4lcpz2h7f0ncix7n53b5yxk5ndp0g8hk4z1b1y2dwm0w3"; + setupHaskellDepends = [ + base Cabal containers directory filepath process + ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-boot ghc-heap ghci hpc process stm - template-haskell time transformers unix + exceptions filepath ghc-boot ghc-heap ghci hpc process + semaphore-compat stm template-haskell time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -115568,14 +116272,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_6_1" = callPackage + "ghc-boot_9_8_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.6.1"; - sha256 = "1vmlkp0sh5jlqgjj137kz02gb362913bzhvl3ij8vhdvd76r9116"; + version = "9.8.1"; + sha256 = "080qalf35kvf9qgyn9w59m1szwl5n8ahvjdzqr7vrd5kf0f9cczz"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -115586,12 +116290,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_6_1" = callPackage + "ghc-boot-th_9_8_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.6.1"; - sha256 = "1swd7wwjn80fvinfixqavd3akfdsxm7i3ymy1gyccbj03md4wz2b"; + version = "9.8.1"; + sha256 = "16vsirgz8g0zmika6pr638mh4s5xrgwsc6dgnhyhwryg10mabp66"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -115604,8 +116308,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; - revision = "4"; - editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b"; + revision = "5"; + editedCabalFile = "1q56xwm9rvjaix9l2bvfgkkcr0mg9n8f23a7mvvd8ij9b34pd3qa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -116150,12 +116854,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_6_1" = callPackage + "ghc-heap_9_8_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.6.1"; - sha256 = "1ksbhlddq6s4r5mvg7q8xvpa02rq6al5768ca3qkqha8ssnziw53"; + version = "9.8.1"; + sha256 = "1z0gghf7ki2sz60ikgdw3d42djphl5lf27z8mfnzcvxp3p6ajxmz"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -116200,10 +116904,8 @@ self: { }: mkDerivation { pname = "ghc-hs-meta"; - version = "0.1.2.0"; - sha256 = "13i4fcc3wfx94n75cxp00p62mnm0raf2xqj2afrzcw3q6mc0l0y4"; - revision = "1"; - editedCabalFile = "18wp54bnfx7ks9zvsjpykpkpr7gwqql6bq8n85mydgx9zm5638dz"; + version = "0.1.3.0"; + sha256 = "1w1l7l3c96k30v715sbf4vhzw7q86p4piwq91i9zqijgy0wl9rz6"; libraryHaskellDepends = [ base bytestring ghc ghc-boot template-haskell ]; @@ -116351,7 +117053,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_6_2_20230523" = callPackage + "ghc-lib_9_6_3_20231014" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -116359,8 +117061,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.6.2.20230523"; - sha256 = "0wlmljbalbfm2y9i2c5ygnsks4gbfzw6ap725bffjcpwd8ma8cq4"; + version = "9.6.3.20231014"; + sha256 = "0ax6g4vvwv2913dl2l1jisf7v3c28p4h0mc0z45g6iap6gkndnf7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116373,6 +117075,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib_9_8_1_20231009" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts + , semaphore-compat, stm, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.8.1.20231009"; + sha256 = "09qlh8yjfi1380p3sibhfc16n7kx1yz22g1lvr5zjpwq4i3pjnpm"; + revision = "1"; + editedCabalFile = "1y25kfansr726l508mc86a6i20gvca6mr0b5fibicjmg4s5z908l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts semaphore-compat stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_8_10_7_20220219" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, pretty, process @@ -116434,15 +117160,38 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_6_2_20230523" = callPackage + "ghc-lib-parser_9_6_3_20231014" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.2.20230523"; - sha256 = "104q0lw7maz1ma67invxz6aw9pn99j3f9l15nl3387pgxb666gjq"; + version = "9.6.3.20231014"; + sha256 = "1k3p7j63cbr4v9cyj5acqbhj16198x7fjc7cpl8pvyv6m4lr571q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ghc-lib-parser_9_8_1_20231009" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.8.1.20231009"; + sha256 = "1s3w8ggzil7dskns0fyk744xmi8b5q98lcqvw188z92h5md9yi2j"; + revision = "1"; + editedCabalFile = "1sck4dgbl8sakz7r1vc79paacic4ll92cw8hzbl658ykkn3qr6mh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116534,6 +117283,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.8.0.0"; + sha256 = "1xchnw1x27k3v02h0mpvm0m78jkhb1kvybjgrky7a3wfn3irv1nj"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -116773,13 +117542,13 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-prim_0_10_0" = callPackage + "ghc-prim_0_11_0" = callPackage ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.10.0"; - sha256 = "1n9skdsfiya4hlfw44f4p9a14xwnmjxgpdcddlqxkc3gscs62m6q"; + version = "0.11.0"; + sha256 = "118c37r8q94x0za1x6iqlfl429czgp5ii6mjdb1f7ba3nx9azzl5"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ rts ]; librarySystemDepends = [ c ]; @@ -117023,13 +117792,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_10_0" = callPackage + "ghc-syntax-highlighter_0_0_11_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.10.0"; - sha256 = "145xjyraqd62k5amyqi9028rr9v2lgz3irmgz5v2hppza1i5qy72"; + version = "0.0.11.0"; + sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -117176,8 +117945,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.4"; - sha256 = "0yfyxwjsg0r6biy8mskc0xpm32z6zldhzxlvy9dr22h8ds57089w"; + version = "0.4.5"; + sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -117234,8 +118003,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.5"; - sha256 = "1asr1ykmqalvbyrhf91vsnx989vw3qp28w8sl3pgwns1azirsz7r"; + version = "0.4.6"; + sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -117255,8 +118024,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.8"; - sha256 = "08pa3gbzxmz5iif9ggg7xvg0bz0h4h4bdnwkvy6lljh2r4fyw8r7"; + version = "0.7.9"; + sha256 = "1h3d0vjz3j9cgng330dj4zlvnvjkwzk2f76w1q6b5vda5pq676cd"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -117275,8 +118044,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.8"; - sha256 = "0hny036kinnn73byyhdwvmp2s5c27zs7krrz01kx5xk7mmhhx2nn"; + version = "0.7.9"; + sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-tcplugins-extra transformers ]; @@ -117559,17 +118328,16 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, binary, bytestring, case-insensitive - , co-log-core, containers, cryptohash-sha1, data-default, deepseq - , dependent-map, dependent-sum, Diff, directory, dlist, enummapset - , exceptions, extra, filepath, fingertree, focus, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events - , gitrev, Glob, haddock-library, hashable, hie-bios, hie-compat - , hiedb, hls-graph, hls-plugin-api, implicit-hie - , implicit-hie-cradle, lens, list-t, lsp, lsp-test, lsp-types - , monoid-subclasses, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, case-insensitive, co-log-core, containers + , cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, enummapset, exceptions + , extra, filepath, fingertree, focus, fuzzy, ghc, ghc-boot + , ghc-boot-th, ghc-check, ghc-paths, ghc-trace-events, gitrev, Glob + , haddock-library, hashable, hie-bios, hie-compat, hiedb, hls-graph + , hls-plugin-api, implicit-hie, implicit-hie-cradle, lens, list-t + , lsp, lsp-test, lsp-types, monoid-subclasses, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, QuickCheck, random, regex-tdfa , row-types, safe-exceptions, shake, sorted-list, sqlite-simple , stm, stm-containers, syb, tasty, tasty-expected-failure @@ -117579,13 +118347,13 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.2.0.0"; - sha256 = "0rsai3xk50qxr234vwz6rmh1na9jxnacjibx71c3qj6pnh60ynl4"; + version = "2.4.0.0"; + sha256 = "1pscx95wmykrrlycpavh1j8vwp3x0k1cfvq9ndpz3qmj8djyyxb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array async base base16-bytestring binary - bytestring case-insensitive co-log-core containers cryptohash-sha1 + aeson array async base base16-bytestring binary bytestring + case-insensitive co-log-core containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob @@ -117624,8 +118392,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "2.1.0.0"; - sha256 = "1ka6yfjrdam9jlgmkmirpbqr4yjhm372l7qlfby11cvjcq13bbh0"; + version = "2.4.0.0"; + sha256 = "0glpjp3qrnbmbn8xi78lgx88v3lppljny9lxyi45dzf71hzab2yc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117705,6 +118473,8 @@ self: { ]; description = "Allow GHCJS projects to compile under GHC and develop using intero"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-codemirror" = callPackage @@ -117811,6 +118581,8 @@ self: { ]; description = "GHCJS bindings for the JavaScript Fetch API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-hplay" = callPackage @@ -118032,6 +118804,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghostscript-parallel" = callPackage + ({ mkDerivation, base, directory, optparse-applicative, pooled-io + , process, shell-utility, utility-ht + }: + mkDerivation { + pname = "ghostscript-parallel"; + version = "0.0"; + sha256 = "0ybxcghkrhr1g5sw3v4r3rn7ck4qic2vlv4zdfpg3bs3bi5f7x1j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory optparse-applicative pooled-io process shell-utility + utility-ht + ]; + description = "Let Ghostscript render pages in parallel"; + license = lib.licenses.bsd3; + mainProgram = "gs-parallel"; + }) {}; + "ght" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, directory , filepath, iteratee, iteratee-compress, mmap, mtl, old-locale, SHA @@ -118080,6 +118871,8 @@ self: { description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -118582,7 +119375,7 @@ self: { "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , gi-gobject, graphene, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -118594,12 +119387,10 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ graphene-gobject ]; + libraryPkgconfigDepends = [ graphene ]; description = "Graphene bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {graphene-gobject = null;}; + }) {inherit (pkgs) graphene;}; "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -118624,6 +119415,7 @@ self: { description = "Gsk bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage @@ -119524,6 +120316,18 @@ self: { mainProgram = "gibbon"; }) {}; + "gigaparsec" = callPackage + ({ mkDerivation, base, containers, selective, tasty, tasty-hunit }: + mkDerivation { + pname = "gigaparsec"; + version = "0.1.0.0"; + sha256 = "177y3rnsg4zy94j2snpcnqdq754b33ni7m07fs7srbyarpm6kd21"; + libraryHaskellDepends = [ base containers selective ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + description = "Refreshed parsec-style library for compatiblity with Scala parsley"; + license = lib.licenses.bsd3; + }) {}; + "gimlh" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -119758,7 +120562,7 @@ self: { ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, aws, base , blaze-builder, bloomfilter, bup, byteable, bytestring, Cabal , case-insensitive, clientsession, concurrent-output, conduit - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , containers, crypto-api, crypton, curl, data-default, DAV, dbus , deepseq, directory, disk-free-space, dlist, edit-distance , exceptions, fdo-notify, feed, filepath, filepath-bytestring, free , git, git-lfs, gnupg, hinotify, http-client @@ -119778,8 +120582,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230828"; - sha256 = "0pb6834dwjs9kdki977rfkdyg58dfzy8wfwvswrz3n7h6bcnjd0b"; + version = "10.20230926"; + sha256 = "06m4f0prdcdhg5glqw9dknsiglb3bisk0jk2r1p95dqhma4x3pp7"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -119794,7 +120598,7 @@ self: { executableHaskellDepends = [ aeson ansi-terminal async attoparsec aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession - concurrent-output conduit containers crypto-api cryptonite + concurrent-output conduit containers crypto-api crypton data-default DAV dbus deepseq directory disk-free-space dlist edit-distance exceptions fdo-notify feed filepath filepath-bytestring free git-lfs hinotify http-client @@ -119851,9 +120655,7 @@ self: { ]; description = "git checkout command-line tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "git-brunch"; - broken = true; }) {}; "git-checklist" = callPackage @@ -120361,8 +121163,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "3"; - editedCabalFile = "17dfigfd2p2h8zpvxfnr1y1ghl7a2f89k50rni4ibh1mn6x1j49r"; + revision = "4"; + editedCabalFile = "0lk7dhwgcgjxrryvag1qwnpb6ds5cmrcwj755n5f60nz4hm0hvqs"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -120738,6 +121540,31 @@ self: { broken = true; }) {}; + "gitlab-haskell_1_0_0_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , connection, http-client, http-conduit, http-types, mtl, tasty + , tasty-hunit, temporary, text, time, transformers, tree-diff, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "1.0.0.3"; + sha256 = "0jddsxj746pfziq4i3z750v290r3m0v3wifz3kisb6ais3794cjn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-client http-conduit + http-types mtl temporary text time transformers unix + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring tasty tasty-hunit text + tree-diff unordered-containers vector + ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -121031,8 +121858,8 @@ self: { pname = "gl"; version = "0.9"; sha256 = "1kb1igc9cyjavf3f3ccv9xhhsfn46pcrsw47qd9m5793nnmg13ii"; - revision = "2"; - editedCabalFile = "1lcqk3hb4s7qq4mxp0cykzinpgk8s1lbn05ay7i92q2h75jyhvk6"; + revision = "3"; + editedCabalFile = "19vnbwjldls1s8x8dr0rv7fgg4h4w423ly2lzcjdq3q1cdydh7h7"; libraryHaskellDepends = [ base containers fixed half transformers ]; @@ -122057,8 +122884,8 @@ self: { }: mkDerivation { pname = "gmail-simple"; - version = "0.1.0.4"; - sha256 = "1xjgww7hn27x4vmj23ji3i2r2552kkinbc0170k6sc5f2bxdda6f"; + version = "0.1.0.5"; + sha256 = "10h39d9hkqf4plgr5dh6lwsy2fdk62ciwn41dsn61pvvq01qpsyz"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring containers cryptonite http-api-data http-conduit http-media jwt text time @@ -122230,6 +123057,8 @@ self: { pname = "gnuplot"; version = "0.5.7"; sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; + revision = "1"; + editedCabalFile = "1x0ik81nmrxi77p1k4f7j4d5s9ajs0cy9jhr41b0qhvfsimyf0cn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -124795,8 +125624,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "3"; - editedCabalFile = "17v3xw6jqx74nfzgd4snqgj560i0v822vfvwkp5rq0xn1a8p4nxz"; + revision = "4"; + editedCabalFile = "03jfrffs2ip7i4qqxhy8cjynygnaahpw1z19xg4j2fh32h669i53"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124947,7 +125776,6 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -125082,7 +125910,6 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-translate" = callPackage @@ -125193,8 +126020,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.3"; - sha256 = "0rxkpxm7606lpiw4csixqfmd025f7rp6ivv86c6ximjlqzz1krhz"; + version = "0.6.6.4"; + sha256 = "052n39bnz55d8lmi3d79s0zxhzbspz6a5rw965qqbryi82hgrdp4"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -126591,6 +127418,8 @@ self: { pname = "graphs"; version = "0.7.2"; sha256 = "1isdy8qx3q00pb3jinvvmfvzhwblr3yhj4dzmlv0hdj0yi9j8bly"; + revision = "1"; + editedCabalFile = "1yhlaqgzwm52llhirhff90cvgb92pirmwmn63vwh44b83nx6m2xc"; libraryHaskellDepends = [ array base containers transformers transformers-compat void ]; @@ -126641,6 +127470,8 @@ self: { pname = "graphula"; version = "2.0.2.2"; sha256 = "066lcn262x4l826sglybrz4mp58ishcj0h1r5h41aiy09mcf4g3v"; + revision = "2"; + editedCabalFile = "1wfvg8mkiyw5vh20syawrl201dwjx4ggd03pg1f06499anykcs8z"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text unliftio unliftio-core @@ -127179,29 +128010,28 @@ self: { }) {}; "grisette" = callPackage - ({ mkDerivation, array, base, bytestring, call-stack, deepseq - , doctest, generic-deriving, Glob, hashable, hashtables, intern - , loch-th, mtl, parallel, prettyprinter, QuickCheck, sbv, tasty - , tasty-hunit, tasty-quickcheck, tasty-test-reporter - , template-haskell, text, th-compat, transformers - , unordered-containers, vector + ({ mkDerivation, array, base, bytestring, deepseq, doctest + , generic-deriving, Glob, hashable, hashtables, HUnit, intern + , loch-th, mtl, parallel, prettyprinter, QuickCheck, sbv + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-compat, transformers + , unordered-containers }: mkDerivation { pname = "grisette"; - version = "0.3.1.0"; - sha256 = "0cph7bid3qx6zqnyhr8vaixr0mjf6hkfp0pi3h47rzrj0mm2ph3v"; + version = "0.3.1.1"; + sha256 = "15bzr7z0893p9yb85968lvisc76crnfqnrkxfv0qlff5png6ygrs"; libraryHaskellDepends = [ - array base bytestring call-stack deepseq generic-deriving hashable - hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv + array base bytestring deepseq generic-deriving hashable hashtables + intern loch-th mtl parallel prettyprinter QuickCheck sbv template-haskell text th-compat transformers unordered-containers - vector ]; testHaskellDepends = [ - array base bytestring call-stack deepseq doctest generic-deriving - Glob hashable hashtables intern loch-th mtl parallel prettyprinter - QuickCheck sbv tasty tasty-hunit tasty-quickcheck - tasty-test-reporter template-haskell text th-compat transformers - unordered-containers vector + array base bytestring deepseq doctest generic-deriving Glob + hashable hashtables HUnit intern loch-th mtl parallel prettyprinter + QuickCheck sbv template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text th-compat transformers + unordered-containers ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -127314,7 +128144,9 @@ self: { ]; description = "Command line utility to manage AWS ECS resources"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "groot"; + broken = true; }) {}; "gross" = callPackage @@ -130036,8 +130868,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.3"; sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; - revision = "3"; - editedCabalFile = "0kiqfglppvwb718z05chwpl50bv5yfvrfx67w5qhx4kpi4bsxcvs"; + revision = "4"; + editedCabalFile = "1yybcwkpkkdzivpv35z05dmi9f3awyw0c03vhm26wa87wvmpsqir"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130062,8 +130894,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; - revision = "6"; - editedCabalFile = "1999rc45cq04gf4c28zn8hylx47kxhij7q9p1wzgd706f0l6c33q"; + revision = "8"; + editedCabalFile = "1gzk9hrq0rv94msbvnkynzj5pnh94ixray8dl639zr29qh55cbib"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -130087,8 +130919,8 @@ self: { pname = "hackage-security-HTTP"; version = "0.1.1.1"; sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; - revision = "6"; - editedCabalFile = "10y3yd4nlk71xwhkrwnw4bcnpp2wf2mkvf9ahx3n6qdcqjh1gk4s"; + revision = "7"; + editedCabalFile = "004wgr36a1f835ixmqnsa41c3161yh8kykbjvj3wyx52bwp9xa26"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -130394,8 +131226,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.27.0"; - sha256 = "094207chb9vw7nnz5bznnifzyk9waxwylv0r7n1nyahbjs013lyn"; + version = "2.29.1"; + sha256 = "15492x6z95mwkv2d463kc8cb3naabfjrwl0pyz1cr6wakrlds6m0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -130442,8 +131274,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.27.0"; - sha256 = "198j5cn6zasb44w3yb8dqhsx6bv2xndh6xfc8ypjfg491qs8819z"; + version = "2.29.1"; + sha256 = "0i6zpyd42a6hg9xmh2qi1j7sxacm2bwdnz4mljhx34314bp8xkyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory exceptions @@ -131123,8 +131955,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.1.0"; - sha256 = "0w1x2m1395a47b0712v4j8qjhha8sjqlmxdmfbxnr65nz36340jj"; + version = "4.16.2.0"; + sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131339,8 +132171,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.4"; sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "4"; - editedCabalFile = "0lqh8dijpzw1piy3b8j2haqkkx0cqlpfs0i7x7636y2r9yl0kxl7"; + revision = "5"; + editedCabalFile = "01jpc6jp8brayi9v7ynchjgpx40dpzjcwy5lgmzkx043w5xcm6sn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131590,6 +132422,30 @@ self: { broken = true; }) {}; + "hakyllbars" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , directory, filepath, hakyll, hspec, MissingH, mtl, network-uri + , pandoc, parsec, process, scientific, text, time + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hakyllbars"; + version = "1.0.0.2"; + sha256 = "0zw1jp64zzflgy9hwdd00zkh3vbi8vbfi0qswmqdgr6dk0c390g0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring data-default directory filepath hakyll + MissingH mtl network-uri pandoc parsec process scientific text time + unordered-containers vector yaml + ]; + executableHaskellDepends = [ base hakyll MissingH pandoc time ]; + testHaskellDepends = [ base hspec parsec ]; + description = "A Hakyll compiler for Handlebars-like templates"; + license = lib.licenses.bsd3; + mainProgram = "hakyllbars-site"; + }) {}; + "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, exceptions @@ -133425,23 +134281,30 @@ self: { }) {}; "harfbuzz-pure" = callPackage - ({ mkDerivation, base, bytestring, derive-storable, freetype2 - , harfbuzz, parallel, text + ({ mkDerivation, base, bytestring, criterion, deepseq + , derive-storable, file-embed, filepath, freetype2, harfbuzz + , parallel, text }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.3.2"; - sha256 = "0dkr860mrbyy734k7z7b3l32fvf691iyn2kwmip7g06wkabd2a50"; + version = "1.0.4.0"; + sha256 = "1qhwkm9sgjw1pqy3ich6fq6xzwan07yn2i485pwpadfi2ylsv3k7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring derive-storable freetype2 text + base bytestring deepseq derive-storable freetype2 text ]; libraryPkgconfigDepends = [ harfbuzz ]; - executableHaskellDepends = [ base bytestring parallel text ]; + executableHaskellDepends = [ + base bytestring criterion file-embed filepath parallel text + ]; + benchmarkHaskellDepends = [ + base criterion file-embed filepath parallel text + ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; - mainProgram = "shape-text"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) harfbuzz;}; "harg" = callPackage @@ -133650,10 +134513,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.6.2"; - sha256 = "1y7vjng3qjy5jaj3c90b5a08xrn49c4bb2wa9s612ny5qc98dl9g"; - revision = "1"; - editedCabalFile = "029sw5fqcqpzsx2ahkngfimyd9kyjn7abg0cvz4pb8y96ypl3cs7"; + version = "0.1.6.3"; + sha256 = "0ji2kk89sprw95c2p5i8m763jik1ibzgpbwif3vmr2idmmpjilz0"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -133677,8 +134538,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.3.0"; - sha256 = "0cvbwybvxzy5bq6y6sh9pvjjr0s5pslz32a0ip9bklg7ivvpd8f7"; + version = "0.0.3.1"; + sha256 = "1hbnzbv8rhsqhz1n2575dm22spfglcs0f237y1rrprfsxm7isqwy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133990,6 +134851,8 @@ self: { pname = "hashable"; version = "1.4.3.0"; sha256 = "1xdhg8mn1i3bci7sbw9nx18sxadkz6fw7rfbnw4n4y4i51nb3vrj"; + revision = "1"; + editedCabalFile = "153i7nzxqmimb565yrq0c6wnypmmzvf2rvvqldja1xqdzan6igzk"; libraryHaskellDepends = [ base bytestring containers deepseq filepath ghc-bignum ghc-prim text @@ -134577,6 +135440,8 @@ self: { pname = "haskeline"; version = "0.8.2.1"; sha256 = "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"; + revision = "1"; + editedCabalFile = "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -135484,8 +136349,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.2.0.0"; - sha256 = "0896ji6drjkmpsgzhq64ls3wgk2fg8imr3hdxyjlb8izkrq1vvmy"; + version = "2.4.0.0"; + sha256 = "0jzbvss1ayvq43cljvn5j2bnyrmbgwv12ik81ivqsa6dnf3xbiqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136057,7 +136922,6 @@ self: { description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-snake"; }) {}; @@ -137507,8 +138371,8 @@ self: { }: mkDerivation { pname = "haskintex"; - version = "0.8.0.1"; - sha256 = "12q6j9z7hwb93sli4wk4lidlf3m7y3dazpp5ymvpbxnb7wjzirr6"; + version = "0.8.0.2"; + sha256 = "1wp46yh0267kcjxq0x4in51bxam2lm4n85mcsm3v6nzznf0dddr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137821,55 +138685,53 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16, base64, bytes , bytestring, cereal, conduit, containers, data-default, deepseq - , ekg-core, ekg-statsd, filepath, foldl, hashable, hashtables - , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec - , hspec-discover, http-types, lens, monad-control, monad-logger - , mtl, network, nqe, optparse-applicative, QuickCheck, random - , rocksdb-haskell-jprupp, rocksdb-query, scotty, stm - , string-conversions, text, time, transformers, unliftio - , unordered-containers, vault, wai, wai-extra, wai-websockets, warp - , websockets, wreq + , filepath, hashable, hashtables, haskoin-core, haskoin-node + , haskoin-store-data, hedis, hspec, hspec-discover, http-types + , lens, monad-control, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp + , rocksdb-query, scotty, statsd-rupp, stm, string-conversions, text + , time, transformers, unliftio, unordered-containers, vault, wai + , wai-websockets, warp, websockets, wreq }: mkDerivation { pname = "haskoin-store"; - version = "1.0.1"; - sha256 = "19i4m1hgf5gzlxq3pkq8wcn0z264b701xljzxsaq5zwdp9hvx9iy"; + version = "1.2.2"; + sha256 = "0jz4y90lp54wh2crlxvvc21gfiwdf0rmcj8f712wbgb648lyzha8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base16 bytes bytestring cereal conduit - containers data-default deepseq ekg-core ekg-statsd foldl hashable - hashtables haskoin-core haskoin-node haskoin-store-data hedis - http-types lens monad-control monad-logger mtl network nqe random - rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions - text time transformers unliftio unordered-containers vault wai - wai-extra wai-websockets warp websockets wreq + containers data-default deepseq hashable hashtables haskoin-core + haskoin-node haskoin-store-data hedis http-types lens monad-control + monad-logger mtl network nqe random rocksdb-haskell-jprupp + rocksdb-query scotty statsd-rupp stm string-conversions text time + transformers unliftio unordered-containers vault wai wai-websockets + warp websockets wreq ]; executableHaskellDepends = [ aeson aeson-pretty base base16 bytes bytestring cereal conduit - containers data-default deepseq ekg-core ekg-statsd filepath foldl - hashable hashtables haskoin-core haskoin-node haskoin-store-data - hedis http-types lens monad-control monad-logger mtl network nqe - optparse-applicative random rocksdb-haskell-jprupp rocksdb-query - scotty stm string-conversions text time transformers unliftio - unordered-containers vault wai wai-extra wai-websockets warp - websockets wreq + containers data-default deepseq filepath hashable hashtables + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe optparse-applicative + random rocksdb-haskell-jprupp rocksdb-query scotty statsd-rupp stm + string-conversions text time transformers unliftio + unordered-containers vault wai wai-websockets warp websockets wreq ]; testHaskellDepends = [ aeson aeson-pretty base base16 base64 bytes bytestring cereal - conduit containers data-default deepseq ekg-core ekg-statsd foldl - hashable hashtables haskoin-core haskoin-node haskoin-store-data - hedis hspec http-types lens monad-control monad-logger mtl network - nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty - stm string-conversions text time transformers unliftio - unordered-containers vault wai wai-extra wai-websockets warp - websockets wreq + conduit containers data-default deepseq hashable hashtables + haskoin-core haskoin-node haskoin-store-data hedis hspec http-types + lens monad-control monad-logger mtl network nqe QuickCheck random + rocksdb-haskell-jprupp rocksdb-query scotty statsd-rupp stm + string-conversions text time transformers unliftio + unordered-containers vault wai wai-websockets warp websockets wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "haskoin-store"; + broken = true; }) {}; "haskoin-store-data" = callPackage @@ -137900,7 +138762,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_0_2" = callPackage + "haskoin-store-data_1_2_2" = callPackage ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network @@ -137909,8 +138771,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.0.2"; - sha256 = "1h5barixyfvjaqdk9k14l4n4nz6gaxn37zhwydd296gbzzg6fg0y"; + version = "1.2.2"; + sha256 = "0zqyj4dq0j2f0bn4qwvrar1b6jvcaqni296lhigpwy0h0jv8080f"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -138215,8 +139077,8 @@ self: { pname = "hasktags"; version = "0.73.0"; sha256 = "0w0g50ggdmkpxgwqdwdbizw3cz8q86l1xwhvj3bjczh72q5xa0nh"; - revision = "1"; - editedCabalFile = "1zxfnrrcbkv5if0sk8qq9f7bbhm8b7xcmavvl0ad5j1zhk9nlqy5"; + revision = "2"; + editedCabalFile = "175kmkz4k2dssn4dg0d288allkqwx8y6m3p7pcgg88km8d2p0mgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138841,6 +139703,35 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_6_3_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, network-ip + , postgresql-binary, postgresql-libpq, profunctors + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers, uuid + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.6.3.3"; + sha256 = "1w4lpiy4jynzdp1b5fn36zv5jyfgnh0fp8rr6dz7247ajzx7lfq4"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-strict-builder + contravariant dlist hashable hashtables mtl network-ip + postgresql-binary postgresql-libpq profunctors scientific text + text-builder time transformers uuid vector + ]; + testHaskellDepends = [ + contravariant-extras quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -139054,8 +139945,8 @@ self: { pname = "hasql-listen-notify"; version = "0.1.0"; sha256 = "0bq4s4x76spjziqgda0shdzfwdhgz1fhsbdg63r3l0m01ixg1a50"; - revision = "1"; - editedCabalFile = "13k436xbjv74zw1yhl5xqa5bld0l838d5s7z72mfxk3kk6dbh9rx"; + revision = "2"; + editedCabalFile = "0h0dk2wkgxmwbkz1hhpyhi7q7m3lz9l5n9kdvxmibsx811qmizhh"; libraryHaskellDepends = [ base bytestring hasql mtl postgresql-libpq text ]; @@ -139450,8 +140341,8 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.2.2.0"; - sha256 = "1rrcpvkkg4l1lzmrhf4vihp4a56xg28cysdshlvl8anbf1ga3q41"; + version = "0.2.3.0"; + sha256 = "1wz4sjrnivq9jbgg9q6wgxmknvflnkdvrdrxdrxwmvmvi2g1qybp"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder exceptions hasql mtl resourcet safe-exceptions transformers unliftio-core @@ -141061,8 +141952,8 @@ self: { }: mkDerivation { pname = "hdf5"; - version = "1.8.10"; - sha256 = "05mpfbs1hcpm92yg8x75vn7j559ivm3gixc8qj8b3xk2mz30ckai"; + version = "1.8.11"; + sha256 = "1vczdmm389zg002ay1x4ia4xx6k41zz0qj5979di03mjlrzq9nws"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector @@ -141810,6 +142701,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; + revision = "1"; + editedCabalFile = "1gk52hz1ssib7cbam7nk8nws9322rsgkn7ym45dgwjbvqbz3wqs7"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -141864,8 +142757,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; - revision = "1"; - editedCabalFile = "06d6wjpg2dqip714az5w01kgz3rl4w8i61l09fb4mx79a43y6pa5"; + revision = "2"; + editedCabalFile = "1x66hrfnw3aqvhcvasfj8vk69nqss32ygnl9lfpy6rhhbwvpsf8c"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -141891,19 +142784,19 @@ self: { "hedgehog-extras" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog - , http-conduit, hw-aeson, mmorph, mtl, network, process, resourcet - , stm, tar, temporary, text, time, transformers, unliftio + , http-conduit, mmorph, mtl, network, process, resourcet, stm, tar + , temporary, text, time, transformers, unliftio , unordered-containers, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.7.0"; - sha256 = "08144dhnnbbl7mmlypx4ji6hsifjf4ssvqh3zhyjk6zwnj5jng13"; + version = "0.4.7.1"; + sha256 = "03inmpmfh5lmrv62szrz96wrknsmpfivcgyilklpmw1k3ijm8a9x"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory - exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl - network process resourcet stm tar temporary text time transformers - unliftio unordered-containers yaml zlib + exceptions filepath hedgehog http-conduit mmorph mtl network + process resourcet stm tar temporary text time transformers unliftio + unordered-containers yaml zlib ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; @@ -141951,6 +142844,8 @@ self: { ]; description = "Customizable Gen for ADT using Generics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hedgehog-gen-json" = callPackage @@ -142270,6 +143165,53 @@ self: { broken = true; }) {}; + "heftia" = callPackage + ({ mkDerivation, base, classy-effects-base, constraints, extensible + , free, kan-extensions, membership, mtl, tasty, tasty-discover + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "heftia"; + version = "0.1.0.0"; + sha256 = "1j7gfzdlb7wqrx47mcvvlm621p262fjx5s4ylgmq0r1w7g5blazw"; + libraryHaskellDepends = [ + base classy-effects-base constraints extensible free kan-extensions + membership mtl transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "Higher-order version of Freer"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "heftia-effects" = callPackage + ({ mkDerivation, base, classy-effects, extensible, extra + , ghc-typelits-knownnat, heftia, loglevel, mtl, tasty + , tasty-discover, tasty-hunit, text, time, transformers + }: + mkDerivation { + pname = "heftia-effects"; + version = "0.1.0.0"; + sha256 = "1ra1f7cvaasgdvp9v6cslkhp2av1hf4dn0dkls5a1i68593gxhxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base classy-effects extensible heftia mtl transformers + ]; + executableHaskellDepends = [ + base classy-effects extra ghc-typelits-knownnat heftia loglevel + text time + ]; + testHaskellDepends = [ + base classy-effects heftia tasty tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Handlers for standard effects using Heftia"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hegg" = callPackage ({ mkDerivation, base, containers, tasty, tasty-bench, tasty-hunit , tasty-quickcheck, transformers @@ -143616,6 +144558,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hetzner_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, country, directory, http-conduit, ip, megaparsec + , scientific, text, time, yaml + }: + mkDerivation { + pname = "hetzner"; + version = "0.5.0.0"; + sha256 = "0xrmbjv52w0gzdfvkgc6mxmq7887qsywz2xb8yrls1szw938x6q8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers country http-conduit ip + megaparsec scientific text time yaml + ]; + executableHaskellDepends = [ + base blaze-html bytestring directory time + ]; + testHaskellDepends = [ base ]; + description = "Hetzner Cloud and DNS library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hetzner-docs"; + }) {}; + "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text }: @@ -144673,6 +145640,8 @@ self: { pname = "hgettext"; version = "0.1.40.1"; sha256 = "1wdwrp4zjhjjq49yihid9x4lhx26nbixax84njj02d79wq2kmdb7"; + revision = "1"; + editedCabalFile = "07rr74szf26mbfj3840ln2r7sjjl8asql14yga8kw82cynzhzym5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144758,8 +145727,8 @@ self: { pname = "hgmp"; version = "0.1.2.1"; sha256 = "08w0b6yla086vk802xqcqslpkqpjx2h2hc6l3jyymms77qyn70f6"; - revision = "1"; - editedCabalFile = "01mgxv6gchzxkd8aqzl97mbs4bidnpvkb6462pz7s96c5kgm0z2q"; + revision = "2"; + editedCabalFile = "15n60g7bp59f6sbch4ww2k5dgjbghghw0k0jifn3rgiiki14gsxk"; libraryHaskellDepends = [ base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -144986,15 +145955,18 @@ self: { }) {}; "hi-file-parser" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, vector + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.4.0"; - sha256 = "0kaazv6qfpg7n52wms08hf63ic776p9wyyylsh0d4yrh1sbh1s52"; - libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; + version = "0.1.5.0"; + sha256 = "0j6ici0s52fpyf092d3zw4qrvwmz744q538wnxxj48i8fxm7b95m"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; testHaskellDepends = [ - base binary bytestring hspec mtl rio vector + base binary bytestring hspec mtl rio text vector ]; description = "Parser for GHC's hi files"; license = lib.licenses.bsd3; @@ -146200,6 +147172,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hint_0_9_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random + , stm, temporary, text, transformers, typed-process, unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0.8"; + sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; + libraryHaskellDepends = [ + base containers directory exceptions filepath ghc ghc-boot + ghc-paths random temporary transformers unix + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath HUnit stm + text typed-process unix + ]; + description = "A Haskell interpreter built on top of the GHC API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -146787,8 +147781,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.6.1"; - sha256 = "15961xpyw5zibqqr8svix1d96njvgzxh464ahx5fyprmznxwkj59"; + version = "0.6.9"; + sha256 = "02ihihlxxvcndm7hjiwknj1dar4d3hdwrg83zsr6q1w7gssr9bbi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147042,8 +148036,8 @@ self: { ({ mkDerivation, base, some }: mkDerivation { pname = "hkd"; - version = "0.2"; - sha256 = "1sq0w5n6y7m2qqpl9s04hsg14qc7p8xrj4x1s1lhw9qbapwb8g8w"; + version = "0.2.1"; + sha256 = "1ya8nh6grbdps7gr7aa0rbmj7xprs00qjrkazsyzak4jn829l14z"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -147134,6 +148128,28 @@ self: { mainProgram = "hkgr"; }) {}; + "hkgr_0_4_3_2" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd-args, simple-prompt, typed-process + , xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.4.3.2"; + sha256 = "1c87hpd4p4mq3cx5m52c7hkwp18f5klkkfx342q2zmkks97lf1zb"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal + simple-cmd-args simple-prompt typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hkgr"; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -147434,10 +148450,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.18"; - sha256 = "0j2p785hxjzmisz2yi5841zdfyl1sqjwzacm7ijz9px8gx812kbc"; - revision = "2"; - editedCabalFile = "0833bg0awc4sr3hlslirbivrcvy0varmhdklx0dwx0mz1gikyp9r"; + version = "1.3.19"; + sha256 = "12x9qdn0p2sq0z1q1gnxnajkvdlyk25xywq7yi7il1hqdrz1mkmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148010,8 +149024,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint }: mkDerivation { pname = "hlint-plugin"; - version = "1.0.1"; - sha256 = "1npzxf380wq24zmvrxid318afh6g41nl5pb7bqldf4y6m9wamp1k"; + version = "1.0.2"; + sha256 = "1vyaqqa40wsbsg8lddx9qswrfpwvnrdhc310wsl4a3s7zr08q96g"; libraryHaskellDepends = [ base containers ghc hlint ]; description = "GHC plugin for hlint"; license = lib.licenses.bsd3; @@ -148158,8 +149172,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.2.0.0"; - sha256 = "05jz7nf4mp0z0bag0ym42c511c05w0hx3ai18kwamavin68a41kb"; + version = "2.4.0.0"; + sha256 = "0w3hk0cnrj7llchfrr3zdqh8m3bfz8xkax6r6a6vr3gcmyl7cwim"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -148192,8 +149206,8 @@ self: { }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.2.0.0"; - sha256 = "1lmf1cni6kclcdvwd70n40n14hd6b3din6apnmbwbdh84i7z43s6"; + version = "2.4.0.0"; + sha256 = "1gv3jb6i7q2bwi6fzxl7gc9rjkws924l7nybkaj8m2zjzpchqqvr"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl process-extras text transformers @@ -148212,8 +149226,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.2.0.0"; - sha256 = "0pl5zn09vbbfklkf49azd447353rb4x6mr95kswlckvk8qvxcb5n"; + version = "2.4.0.0"; + sha256 = "17mmf5dsgsi08gvv6lalg2w92vsb6vx0vrl5n905wvngij3vydr3"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -148236,8 +149250,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.2.0.0"; - sha256 = "0ng0567z3fpsxzkxx60jhk6d3a1cllcgrdscijcndqknr38c97jk"; + version = "2.4.0.0"; + sha256 = "03zjkx2i89yn5xlw4y8vdm8b7l40y04g0shck4cl9vj7sixfbpl0"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -148257,8 +149271,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.2.0.0"; - sha256 = "0vpv87mnbk7d18vxl01r6f7pyz94107v9mc4mnbb2z2fmq6bcsfj"; + version = "2.4.0.0"; + sha256 = "1hz96bklyzhs625hhyzs3vzq2a5rvvdik22ijz3ixd7wgp2nqw18"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -148278,8 +149292,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.2.0.0"; - sha256 = "042z92xjdxjp5f6zig692nq2f8dk1m5rhhjqqczn3zkw0zs9v96v"; + version = "2.4.0.0"; + sha256 = "1qk332msaj7lhin5dc8fyc319ls74i1f5mac118bhsz8ikrsdd64"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -148300,8 +149314,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.2.0.0"; - sha256 = "0w6hh36szkjgpvxx07cckjr3jnrk80y2ib2mfga7xmw55pmcvrg8"; + version = "2.4.0.0"; + sha256 = "0lif9fg273i84w0nxslq2c8x62p5i8ymff1nhdqhmqac391agjka"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -148326,8 +149340,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.2.0.0"; - sha256 = "05ap5rzrr8qjqn18l5gyn598iksmjf563f6ksg9mv5hkpzbiin1j"; + version = "2.4.0.0"; + sha256 = "0qqhbwwj66ysgnfnl7fahv9mhfxxj46p37633hn142fhzr8vmp51"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -148368,8 +149382,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.2.0.0"; - sha256 = "00mpdx9szdmbgh5glfi9lbwfb8qdqqi7jyi61d5fcppmniy51vcl"; + version = "2.4.0.0"; + sha256 = "0vd04sym8490briy8fpmbqy49vp70zw5c3r41kc9d65pglj8ph2y"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -148387,8 +149401,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.2.0.0"; - sha256 = "0gh2vxdnyxhxhldfnrsj41p099jd113z1a8qnn4p4d0ba7j2qsic"; + version = "2.4.0.0"; + sha256 = "175whhrpngi1pi86xb2rkgbnv9kd8gwwy6d80xc0jrx62nv6q0na"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -148408,8 +149422,8 @@ self: { }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.2.0.0"; - sha256 = "1xhc2zb56q1bziiypdll0898nz26pvwgmqfwps3dh8agixfpvn15"; + version = "2.4.0.0"; + sha256 = "165c7knyr926ypcsyq3yafmahzn6hcnk0a6j3n0nx24wmv1912ww"; libraryHaskellDepends = [ aeson base containers ghc ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148427,8 +149441,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.2.0.0"; - sha256 = "1kj1f7k0fdcj1mqijng56qax42y9aywkd3gi2pvivdsfd7rnc9dr"; + version = "2.4.0.0"; + sha256 = "1pj61iximld14qkbjk4icbxrnnys7gmq03y4whr9qxdh93ij7b0q"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -148444,8 +149458,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.2.0.0"; - sha256 = "16i26nk6zrjgrz1yf7xariygiin2h8xa0sqwfnm81nybzszr50h6"; + version = "2.4.0.0"; + sha256 = "113xfdv9f83z5sbcra6065j2snhf6h964858rcj1xw6jb5sjhfrb"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -148467,8 +149481,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.2.0.0"; - sha256 = "1pbqy9ndxkcn57lpwfgd2y38gs8vq55sqxhw44rdfsw6gjpmw1xj"; + version = "2.4.0.0"; + sha256 = "1hhvgw8k216m1cw50q5lsgl0zm5a6bp18ycpmpi4nwggazzr3hpj"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -148490,8 +149504,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.2.0.0"; - sha256 = "0c306fb54kylj8bg6l4nm0f5fw88hyyk59nzps4w16gciqbdjlw1"; + version = "2.4.0.0"; + sha256 = "0h9sf9416mg2wrgq1jmwjbm1bm9hav1qp6jn1imhlwg59ck99j25"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -148530,8 +149544,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.2.0.0"; - sha256 = "0qrygjvgm5x88j7cjw9dhzli38by0gzmda8f8bkqi8v1qx09ny76"; + version = "2.4.0.0"; + sha256 = "136fjmsm6anjxp30ysii0n63fz895k273xwn6i85s6vl3bvlyvxk"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -148554,8 +149568,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.2.0.0"; - sha256 = "1z3iiqw7h08cpz99wciaqwdcsrnvpxff95jswidzk696lnlzyvbh"; + version = "2.4.0.0"; + sha256 = "01mj0g5nghhkbhannvh45rsxnb0sffdhx6ly98im4y19xmx50gkr"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -148566,21 +149580,23 @@ self: { }) {}; "hls-ormolu-plugin" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, mtl, ormolu - , text + ({ mkDerivation, aeson, base, containers, extra, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-types, mtl, ormolu, process-extras, text, transformers }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.2.0.0"; - sha256 = "0c6kj7870q5fi00cgx3z4cpvldsdvn4brjg4v7vv32grfj7nwdc1"; + version = "2.4.0.0"; + sha256 = "0xi6qds51ds6z2l6h53d16krjc19wibcpkbxhb9v6ar0fdffbnvx"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp - mtl ormolu text + mtl ormolu process-extras text transformers ]; testHaskellDepends = [ - base filepath hls-test-utils lsp-types ormolu text + aeson base containers filepath hls-plugin-api hls-test-utils + lsp-types ormolu text ]; + testToolDepends = [ ormolu ]; description = "Integration with the Ormolu code formatter"; license = lib.licenses.asl20; }) {}; @@ -148593,8 +149609,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.2.0.0"; - sha256 = "1cllpyqnwfy7kk2h17igzv2ly71qm1k76mm2wjjgpy3qfh3fz7wm"; + version = "2.4.0.0"; + sha256 = "02frs42fx0snvwld950yk039c7m5m66fgz92rpkhbrnm225i0084"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148619,8 +149635,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.2.0.0"; - sha256 = "0j95g116vv92wx7mm7anjifx3w494f4bycw0ad7wxf57qrb063l1"; + version = "2.4.0.0"; + sha256 = "1yqnxsh9n5dk1kky5j36sm6lsb1zvk5r28mb3p99a9yvhcqp0zqy"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -148646,8 +149662,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.2.0.0"; - sha256 = "07dy9r63ixvzf5isbw8nl9vfpym17h66vzmxn79kgnh8xkx11rgm"; + version = "2.4.0.0"; + sha256 = "04cy5530227m1hr62h76w7918315sxq8iqvhd9igllwh3ackyx9j"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -148666,8 +149682,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.2.0.0"; - sha256 = "0viam4zzkbbi8lv4c86bqhy3r00x7qjrbwwaqakdgfhn4l8d97r6"; + version = "2.4.0.0"; + sha256 = "1zianxwdvbm49s9bvzk0wji4i2zyy36i5g9isdzv70hw5rl82jvx"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -148689,8 +149705,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.2.0.0"; - sha256 = "0c7b00kx4imxvs4ydbr1g409ikl6lh0r9wl1m749xzx5dhblmwbh"; + version = "2.4.0.0"; + sha256 = "02s6n5wy46kfsy91vsfkk92qi23ji525n7g5f3nbnvmmpvd4kn8y"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -148737,8 +149753,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.2.0.0"; - sha256 = "094kk4fi2bih43gqr9ndp7vfqbmsw0gzsgpmpbh6k2ad00csj5w6"; + version = "2.4.0.0"; + sha256 = "0ydnrmxq5ix0ly0mwsl3nxxrbwr6r975fcdw7cwz0bmyrma48w3h"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -148760,8 +149776,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.2.0.0"; - sha256 = "0ssx703pphm0m9930cjklwr02hx0y9qnrh6936ws55zvkpgq81fa"; + version = "2.4.0.0"; + sha256 = "15llh584scavr6snr8bjc8kp8dz7vyh3vclsz2pzpkdcbr8ifhri"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -148809,8 +149825,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.2.0.0"; - sha256 = "0vzawa9zq6bjb81847my2a62n091vm4292miq0jynbi1g075jgh5"; + version = "2.4.0.0"; + sha256 = "0d42bjq4iyk5376rg4s97rv8j19y6cc9w1s7i0qm8zcbkp8vkgmc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -148842,8 +149858,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.2.0.0"; - sha256 = "0rgkk4kfcwnzl2xvvj9v184xniapsn3lcbrxfzqw41qpl59k21xk"; + version = "2.4.0.0"; + sha256 = "0dz6wmj9qdccdhpdz4qa8c68a8hx8p6h9ycnj6fg2yihg9j33qqb"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -148874,8 +149890,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.2.0.0"; - sha256 = "1pn87ba17x1fbd80nw7a2klgf8yh2swj037j36ljm5c4b07xbj3b"; + version = "2.4.0.0"; + sha256 = "0flb9sjaf3pbyr23a4399ygvf8ii692w9axbskfx9mwqndgc1jlw"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -151180,14 +152196,13 @@ self: { , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed , lens, memory, monad-loops, mtl, openpgp-asciiarmor , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time - , time-locale-compat, transformers, unordered-containers, vector - , yaml + , resourcet, text, time, time-locale-compat, transformers + , unordered-containers, vector, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.23.7"; - sha256 = "0mzq83bszlyxl3if35172nvzn930777nm1q9clkkyvqh2nrkfhdh"; + version = "0.23.8"; + sha256 = "009l8c4zzbmh8q8x9f7zj21ysvma03ksxdknjfcb7z189mafb2qm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151196,8 +152211,8 @@ self: { graphviz hOpenPGP http-client http-client-tls http-types ixset-typed lens memory monad-loops mtl openpgp-asciiarmor optparse-applicative prettyprinter prettyprinter-ansi-terminal - prettyprinter-convert-ansi-wl-pprint resourcet text time - time-locale-compat transformers unordered-containers vector yaml + resourcet text time time-locale-compat transformers + unordered-containers vector yaml ]; executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; @@ -151676,31 +152691,35 @@ self: { , hs-opentelemetry-exporter-otlp, hs-opentelemetry-propagator-w3c , hs-opentelemetry-sdk, hs-opentelemetry-utils-exceptions , hs-opentelemetry-vendor-honeycomb, http-types - , optparse-applicative, text, time, typed-process, unliftio + , optparse-applicative, posix-escape, text, time, typed-process + , unliftio }: mkDerivation { pname = "hotel-california"; - version = "0.0.1.0"; - sha256 = "11l3pkdnkyya5sr4v00wjv7p1shikvmcc75g74l5a2b7n7p7ill1"; + version = "0.0.3.0"; + sha256 = "11r2bd9ralfv2vzd5ikw83bgz014hhs36g4bxfjxk5gqq65fkkh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; executableHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; testHaskellDepends = [ base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb - http-types optparse-applicative text time typed-process unliftio + http-types optparse-applicative posix-escape text time + typed-process unliftio ]; license = lib.licenses.bsd3; mainProgram = "hotel"; @@ -151969,36 +152988,36 @@ self: { mainProgram = "hpack"; }) {}; - "hpack_0_35_5" = callPackage + "hpack_0_36_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit - , infer-license, interpolate, mockery, pretty, QuickCheck + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck , scientific, template-haskell, temporary, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "hpack"; - version = "0.35.5"; - sha256 = "1qm7fam54b2910nxg3xgv8bpqnkl06szl0gd7wvd6gi9ar8h3nr0"; + version = "0.36.0"; + sha256 = "0ypaagr7a5bvziybbzr3b4lixs3dv6fdkjj3lq7h71z51wd4xpm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob http-client http-client-tls http-types - infer-license pretty scientific text transformers + infer-license mtl pretty scientific text transformers unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob http-client http-client-tls http-types - infer-license pretty scientific text transformers + infer-license mtl pretty scientific text transformers unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bifunctors bytestring Cabal containers crypton deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit infer-license interpolate mockery pretty + http-types HUnit infer-license interpolate mockery mtl pretty QuickCheck scientific template-haskell temporary text transformers unordered-containers vector yaml ]; @@ -152320,14 +153339,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_0_0" = callPackage + "hpc-codecov_0_4_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.0.0"; - sha256 = "0y545jm79p5jzvid27nqfyv5814iykk5wxdixv25mar49w5zd494"; + version = "0.4.2.0"; + sha256 = "1vfx7x9w72lca9zv489fb5h0jqc50ijmikjij6hkb3flbyskdzqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153023,6 +154042,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "hreader_1_1_1" = callPackage + ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl + , tagged, transformers, transformers-base + }: + mkDerivation { + pname = "hreader"; + version = "1.1.1"; + sha256 = "0am8kyy046l9laqxx60nm3v6haz00wbrs1naxg0yq8z8yqcn4qvv"; + libraryHaskellDepends = [ + base exceptions hset mmorph monad-control mtl tagged transformers + transformers-base + ]; + testHaskellDepends = [ base hset transformers-base ]; + description = "Generalization of MonadReader and ReaderT using hset"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hreader-lens" = callPackage ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action , profunctors @@ -154013,6 +155050,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-propagator-datadog" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq + , hs-opentelemetry-api, hs-opentelemetry-sdk, hspec, hspec-discover + , http-types, pretty-hex, primitive, QuickCheck, text + }: + mkDerivation { + pname = "hs-opentelemetry-propagator-datadog"; + version = "0.0.0.0"; + sha256 = "0mpf3jl741336fhljhgdgfxvpxyblcyqphgs7kp8hv6d6nmwyl19"; + revision = "1"; + editedCabalFile = "0bfvcfmyq0npwjnzh0v9kcv2ghhhnnr2wcw5d65bb59vfwhw7gys"; + libraryHaskellDepends = [ + base bytestring hs-opentelemetry-api hs-opentelemetry-sdk + http-types primitive text + ]; + testHaskellDepends = [ + base bytestring hs-opentelemetry-api hspec pretty-hex primitive + QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq hs-opentelemetry-api primitive + ]; + description = "Datadog Propagator for OpenTelemetry"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-opentelemetry-propagator-w3c" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hs-opentelemetry-api , http-types, text @@ -154281,19 +155347,20 @@ self: { "hs-samtools" = callPackage ({ mkDerivation, ascii, attoparsec, base, bitvec, bytestring - , containers, crypton, generic-deriving, hspec, pcre-heavy - , regex-tdfa, streamly, streamly-bytestring, streamly-core + , containers, crypton, generic-deriving, hspec, parser-combinators + , pcre-heavy, regex-tdfa, streamly, streamly-bytestring + , streamly-core }: mkDerivation { pname = "hs-samtools"; - version = "0.6.0.1"; - sha256 = "0i3klgjjai1ax8nyijb3qrach93d6r2pmsxbf2vq56cg3d8j3ym7"; + version = "0.7.0.0"; + sha256 = "0fkvq2bg8q0ikg8hwb4lmdjss7jis9ghwnykds6rpa3mlkg22m5g"; libraryHaskellDepends = [ ascii attoparsec base bitvec bytestring containers crypton - generic-deriving pcre-heavy regex-tdfa streamly streamly-bytestring - streamly-core + generic-deriving parser-combinators pcre-heavy regex-tdfa streamly + streamly-bytestring streamly-core ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base bytestring containers hspec ]; description = "Read and write SAM, BAM, and CRAM files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -154986,8 +156053,10 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.9"; - sha256 = "02mwsgad10dg640alay7br1zrkn9vhwdf62iwf01921c1g710ny9"; + version = "0.68.10"; + sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; + revision = "1"; + editedCabalFile = "0bgym1x99i2jn7b8kx9lz28gc3lsd7kag8rmizd42lcs2wmcm328"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -156218,8 +157287,8 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.5.2.1"; - sha256 = "1j4kcmqx4cq0zjimdn1fvm7a26phwl95bh405d68n5qc2qmncyyb"; + version = "0.5.2.2"; + sha256 = "1qnzrh7nn4j8y2qcvmliqnv07bqfq49wpxmgwrvb87bpp70gaq2c"; libraryHaskellDepends = [ base containers mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit tasty-quickcheck tasty-th @@ -156378,8 +157447,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "8"; - editedCabalFile = "10lqpvvg1fsv69v8v4nynwimln1flhd32d173pgpywmniaf40yy7"; + revision = "9"; + editedCabalFile = "1isrz8a09n88fww66qdrq76xlglai8sq14jk2ibv79g045qapj1g"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -157199,14 +158268,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_4" = callPackage + "hspec_2_11_6" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.4"; - sha256 = "0yk34qspm97l32qpk6i0gijvr4xfnhq89wch12mifxv2pcxywdpi"; + version = "2.11.6"; + sha256 = "0czsm39vizhm8fjr09sb8652haxb0f81zprr8k7yjpk1kyq5582p"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -157221,8 +158290,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.4"; - sha256 = "09z0jxiv02j83q79aws948vr6vfqzpv5dm4dwwfqgxa715s9mlg8"; + version = "2.11.6"; + sha256 = "0il6vaxkw7d6shjvhj0dp6fhrixwh4aspcqpa0myf8m4vmlp9alb"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -157348,7 +158417,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_4" = callPackage + "hspec-core_2_11_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -157357,8 +158426,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.4"; - sha256 = "0h1ilavzz23wr3659rx9crp0mijr8sz9qqhfm9fwq5hq91n6g1r8"; + version = "2.11.6"; + sha256 = "1j6pzpmkxrjv7ady2vlf7bx9ayphm2l3bls3fycs9h1lv3k0cni3"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -157441,14 +158510,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_4" = callPackage + "hspec-discover_2_11_6" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.4"; - sha256 = "05j8jbjkl18c0w6nnaf0ymr449pp4vhnlkdri5470jyzqsawp879"; + version = "2.11.6"; + sha256 = "0i87w82gfzkl0dzcg1mvw8jr7ccqd25gq55zbqala8fqanplp7xp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -157499,6 +158568,8 @@ self: { pname = "hspec-expectations-json"; version = "1.0.2.0"; sha256 = "0vl5brjbvjdbv2i4zq2ww7l0gg11l0ssmr4m7xqdn7as2798q1q1"; + revision = "2"; + editedCabalFile = "085mc79w056c7jinmldav7d1916y61x3p2ikb2api8symaa377n3"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -157840,7 +158911,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_4" = callPackage + "hspec-meta_2_11_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq , directory, filepath, haskell-lexer, hspec-expectations, HUnit , process, QuickCheck, quickcheck-io, random, stm, tf-random, time @@ -157848,8 +158919,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.4"; - sha256 = "1bzgr0sxm3arrbm6dj819sd3f2h7q5siv1n3lzw648ijhqrlkpja"; + version = "2.11.6"; + sha256 = "0vn0q7a2r1j8ixlwls8q55gyihv9398wga9804qy51f33y345zqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159972,6 +161043,8 @@ self: { pname = "http-api-data"; version = "0.6"; sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; + revision = "1"; + editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -160034,6 +161107,8 @@ self: { pname = "http-client"; version = "0.7.14"; sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; + revision = "1"; + editedCabalFile = "1w1blf2r8riwibv79rcfxij7j60x0sdiqyf7nr5i5rjqbb0sh2k1"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -160665,10 +161740,8 @@ self: { }: mkDerivation { pname = "http-exchange-instantiations"; - version = "0.1.1.0"; - sha256 = "0fvkmhd8571r4k548l9x8n3ybdnlh9b8rczkcxv3f32xim0k9rx9"; - revision = "1"; - editedCabalFile = "1rn4yfwlxv1j4d917v0fggdl1qy47vl8dhibvvdma1v2554dgrcv"; + version = "0.1.3.0"; + sha256 = "002wa8lqpz4idnzkzz918ql9zghg01gnyp4pwar494yfsysiy4v8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160732,8 +161805,8 @@ self: { pname = "http-io-streams"; version = "0.1.6.2"; sha256 = "0nil98dnw0y6g417mr9c9dan071ri3726dv0asgwwplq5mwy780q"; - revision = "1"; - editedCabalFile = "1ayqy22q2ld87qx3zjpfzrkhryjmjn7zc7adgw0jhahmg2lbd6q9"; + revision = "2"; + editedCabalFile = "0sgk4mgm1r8nnna0lxjw8daa9784rl91qvh4m2ba675f7a016f5c"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -160843,27 +161916,6 @@ self: { }) {}; "http-media" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, tasty, tasty-quickcheck, utf8-string - }: - mkDerivation { - pname = "http-media"; - version = "0.8.1.0"; - sha256 = "1ydrs7iichc06mfj65x1f3g1piy06b7gbjidjf1lf3jp325k2him"; - revision = "1"; - editedCabalFile = "119vhcwlgra8s097jwxvkp51grr3kabjfy7a60jpqybrsncfjn0a"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers utf8-string - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck tasty - tasty-quickcheck utf8-string - ]; - description = "Processing HTTP Content-Type and Accept headers"; - license = lib.licenses.mit; - }) {}; - - "http-media_0_8_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, tasty, tasty-quickcheck, utf8-string }: @@ -160880,7 +161932,6 @@ self: { ]; description = "Processing HTTP Content-Type and Accept headers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "http-mock" = callPackage @@ -161190,6 +162241,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-streams_0_8_9_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson + , base, base64-bytestring, blaze-builder, bytestring + , case-insensitive, directory, filepath, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, random, snap-core + , snap-server, text, transformers, unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.9.9"; + sha256 = "1yvabr0bh7b5pbklhq6aw8pam2zasp77g38fakgjnpgb76s4mwqv"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring + blaze-builder bytestring case-insensitive directory filepath + HsOpenSSL http-common io-streams mtl network network-uri + openssl-streams text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams random snap-core snap-server + text transformers unordered-containers + ]; + description = "An HTTP client using io-streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -161329,6 +162410,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_4_2_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover + , http-types, network, network-byte-order, network-run, psqueues + , random, stm, text, time-manager, typed-process, unix-time + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "4.2.2"; + sha256 = "0kdd4r52jfh1j8jfjcs1mshfasfk1m2ffrcrxxj6cdi7sgxm2377"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + unliftio + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring crypton + directory filepath Glob hspec http-types network network-byte-order + network-run random text typed-process unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge + network-byte-order stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -161445,16 +162560,18 @@ self: { }) {}; "http2-tls" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, http2 - , network, network-run, recv, time-manager, tls, unliftio + ({ mkDerivation, base, bytestring, crypton-x509-store + , crypton-x509-validation, data-default-class, http2, network + , network-run, recv, time-manager, tls, unliftio }: mkDerivation { pname = "http2-tls"; - version = "0.0.1"; - sha256 = "104qqirzg4q3gy4qw8d0mhp94xiavzzr6ziwnwjc1xm1zv8m37nb"; + version = "0.1.0"; + sha256 = "1sans4zmcpc48xw8k1g6kgfg68xka5azgpcr3rd7g70ijj6zchjs"; libraryHaskellDepends = [ - base bytestring data-default-class http2 network network-run recv - time-manager tls unliftio + base bytestring crypton-x509-store crypton-x509-validation + data-default-class http2 network network-run recv time-manager tls + unliftio ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -161471,8 +162588,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.4"; - sha256 = "02w2f17m6n46rr0212c7fp33vrgb13zj41mncm9wyvwkmmm47gmv"; + version = "0.0.6"; + sha256 = "12pjwmiplch1pn89qnc5ijsb9kf554wdw7w3lf6xfi1fjzkizjr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162371,8 +163488,8 @@ self: { }: mkDerivation { pname = "hvega"; - version = "0.12.0.5"; - sha256 = "0zxd6kdzragrmjanipf19dgbbbjvb1zfpmd2lw00akj8h2ddyy5i"; + version = "0.12.0.7"; + sha256 = "1x5xrkm7k1q9j0kijdf5qx7542c4mrpamq1s6r5nq2zj80f3xxk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -162460,6 +163577,8 @@ self: { testHaskellDepends = [ base ]; description = "AWS SQS conduit"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-balancedparens" = callPackage @@ -162822,8 +163941,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.1"; sha256 = "1ilgqrx8jvgvmns99d74qz8c11ifyrccbvszfzwwhk28fhai0k7s"; - revision = "3"; - editedCabalFile = "129bnprzh8nglbi5x8i5dlc4v5qr7cqg6bajy6id1168r26ciwcq"; + revision = "4"; + editedCabalFile = "0fwdbd7m7b9743y6w1ci3m7m0bgw7w0r0h7pvn2xrhvyjvp9rjqh"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -164917,8 +166036,8 @@ self: { pname = "hyphenation"; version = "0.8.2"; sha256 = "05330kd99cg9v6w26sj87wk2nfvpmn2r177kr66vr9n0rlmia60y"; - revision = "2"; - editedCabalFile = "0l5b5a8cl9prqghgr8nfxzc3wx2w021mkp784k8af40ci0qgidsi"; + revision = "3"; + editedCabalFile = "033kzil5036pnlx10ghh7vcsxcya6kn0vxnalgbpryg8ca7vy0cz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers file-embed text unordered-containers @@ -166372,8 +167491,8 @@ self: { }: mkDerivation { pname = "ihp-hsx"; - version = "1.0.0"; - sha256 = "0ln4xgr3wamhjd34q8vvd0z8chh4prqq7javl9n4ljvriyky13p7"; + version = "1.1.0"; + sha256 = "0jzibardrljskif47x30z4nyxd4zw94lfg4cqhhp9jw8sgrk1vpp"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring containers ghc megaparsec string-conversions template-haskell text @@ -166789,6 +167908,8 @@ self: { ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "immortal_0_2_2_1" = callPackage @@ -167337,8 +168458,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.8.0.0"; - sha256 = "15pfxy2xzff9598v076gd7fl0k235y2ydm8pirvqj485zj7mgyyg"; + version = "0.9.0.1"; + sha256 = "0zalzp5p59cqz3zky1y0xvw5g44z386z5smffmzhx1gjk6v0b3pk"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -167618,8 +168739,8 @@ self: { pname = "indents"; version = "0.5.0.1"; sha256 = "0dpcwiz0dwn5aqdsc50plfaawh86adhf7jx5dsmhn5q5nz32qn51"; - revision = "1"; - editedCabalFile = "0zbcf8m4n63ff06hjp0mr18i59y5wd6c1k5z1j6rnl7kymghkjrg"; + revision = "2"; + editedCabalFile = "0rdj5w8d5ykb2sh88xsdgddxyp50dij4zb8bbb9220yfs0l18dsy"; libraryHaskellDepends = [ base mtl parsec ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; description = "indentation sensitive parser-combinators for parsec"; @@ -167754,12 +168875,16 @@ self: { }) {}; "indexed-traversable" = callPackage - ({ mkDerivation, array, base, containers, transformers }: + ({ mkDerivation, array, base, containers, foldable1-classes-compat + , transformers + }: mkDerivation { pname = "indexed-traversable"; - version = "0.1.2.1"; - sha256 = "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"; - libraryHaskellDepends = [ array base containers transformers ]; + version = "0.1.3"; + sha256 = "1nak3bq3yzai8b38mflmpsbirx8d6v29zcj9m193m3ppnrgr4chx"; + libraryHaskellDepends = [ + array base containers foldable1-classes-compat transformers + ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; }) {}; @@ -167773,8 +168898,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1.2"; sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; - revision = "1"; - editedCabalFile = "1vyfs8xwxm2ipgiinzrp41pl0cy2xrmx7a9iim4vlz1sca1yv4xl"; + revision = "2"; + editedCabalFile = "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -168433,23 +169558,24 @@ self: { }) {}; "inline-c" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + ({ mkDerivation, base, bytestring, containers, hashable, hspec, mtl + , parsec, parsers, prettyprinter, QuickCheck, raw-strings-qq , regex-posix, split, template-haskell, transformers , unordered-containers, vector }: mkDerivation { pname = "inline-c"; - version = "0.9.1.8"; - sha256 = "1qa1rspwyac0f68g7qll17a0wc2a4qrr9fkfarpymfhm7gxzf947"; + version = "0.9.1.10"; + sha256 = "1cd4bqb4gzd8sgh8icnnzdyqnh81x7150ibx7mqjaygj9672w3bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers hashable mtl parsec - parsers template-haskell transformers unordered-containers vector + base bytestring containers hashable mtl parsec parsers + prettyprinter template-haskell transformers unordered-containers + vector ]; testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck + base containers hashable hspec parsers prettyprinter QuickCheck raw-strings-qq regex-posix split template-haskell transformers unordered-containers vector ]; @@ -168465,8 +169591,8 @@ self: { }: mkDerivation { pname = "inline-c-cpp"; - version = "0.5.0.1"; - sha256 = "16wf59kgs6zw8ypyb6wy842j04b2pdiwhfmpsvlvjkqhpqn2q406"; + version = "0.5.0.2"; + sha256 = "0m8rkmjmqh8xy41ci87z3c7x9z2r5p8j4qwibqw189rrgy5g1471"; libraryHaskellDepends = [ base bytestring containers inline-c safe-exceptions system-cxx-std-lib template-haskell text @@ -168480,6 +169606,30 @@ self: { maintainers = [ lib.maintainers.roberth ]; }) {}; + "inline-c-cuda" = callPackage + ({ mkDerivation, base, bytestring, containers, cudart, hspec + , inline-c, inline-c-cpp, process, safe-exceptions + , template-haskell, text, vector + }: + mkDerivation { + pname = "inline-c-cuda"; + version = "0.1.0.0"; + sha256 = "0ra61w37yhl5vcd07v25h69iq4n0kwfryp9zgxnxgc6lzzph4xpw"; + libraryHaskellDepends = [ + base bytestring containers inline-c inline-c-cpp process + safe-exceptions template-haskell text + ]; + librarySystemDepends = [ cudart ]; + testHaskellDepends = [ + base bytestring containers hspec inline-c inline-c-cpp + safe-exceptions template-haskell vector + ]; + description = "Lets you embed CUDA code into Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cudart = null;}; + "inline-c-objc" = callPackage ({ mkDerivation, base, containers, hspec, inline-c , template-haskell @@ -169081,17 +170231,18 @@ self: { }) {}; "integer-conversion" = callPackage - ({ mkDerivation, base, bytestring, primitive, QuickCheck - , quickcheck-instances, tasty, tasty-bench, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, primitive, QuickCheck, tasty + , tasty-bench, tasty-quickcheck, text }: mkDerivation { pname = "integer-conversion"; - version = "0.1"; - sha256 = "07fry6pwxlq4jrlnl9klp0xfxc9zhgsv34jkzbcywcgdm9dk1jgh"; + version = "0.1.0.1"; + sha256 = "0fbgqizla2jdchnii1lqp2yla3lkm04w4qn5laxmhm5n3k7p1b10"; + revision = "1"; + editedCabalFile = "055v4jxls9ajf3jmi04wzra9iapfpg7jn93cbmdh2grj6lkahmqf"; libraryHaskellDepends = [ base bytestring primitive text ]; testHaskellDepends = [ - base bytestring QuickCheck quickcheck-instances tasty - tasty-quickcheck text + base bytestring QuickCheck tasty tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench text ]; description = "Conversion from strings to Integer"; @@ -169119,8 +170270,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "4"; - editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk"; + revision = "5"; + editedCabalFile = "03f07vv1xqvv53fiarn4rpj2hzsa9bx7lw883axmgzv49qrzq3ad"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -169765,22 +170916,25 @@ self: { }) {}; "interval-patterns" = callPackage - ({ mkDerivation, base, containers, groups, heaps, hspec, lattices - , QuickCheck, semirings, time, time-compat + ({ mkDerivation, base, containers, deepseq, groups, hashable, heaps + , hspec, lattices, QuickCheck, semirings, time, time-compat }: mkDerivation { pname = "interval-patterns"; - version = "0.7.0.3"; - sha256 = "16521q6jb0lxncsy3wav6p5jfp8jv1sw0simlyfjx0nl6gjpbz40"; + version = "0.7.2"; + sha256 = "1cwv7yfc64zffa05mq300bb6zwdkgk85mjh10dzgnj1g1rd5z593"; libraryHaskellDepends = [ - base containers groups heaps lattices semirings time time-compat + base containers deepseq groups hashable heaps lattices semirings + time time-compat ]; testHaskellDepends = [ - base containers groups heaps hspec lattices QuickCheck semirings - time time-compat + base containers deepseq groups hashable heaps hspec lattices + QuickCheck semirings time time-compat ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interval-tree-clock" = callPackage @@ -169986,6 +171140,8 @@ self: { pname = "invariant"; version = "0.6.2"; sha256 = "0271grdzgjfa86hvy50vrqh8k7n0l48i524k3bgyjmwa13l8ar63"; + revision = "1"; + editedCabalFile = "1zxvv6q03jsn343pdx53knmjq8l6p2fggvqyfkpgjgvcwf7iaf23"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors StateVar stm tagged template-haskell th-abstraction @@ -170314,8 +171470,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "2"; - editedCabalFile = "12q3nhd4wqyv1m7wvzvs5a8yyarcjdrvdhmb4c5hx3zrs5l7sflw"; + revision = "3"; + editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -170493,6 +171649,8 @@ self: { pname = "ip"; version = "1.7.7"; sha256 = "0yhhmy51s2sbm1qlbx2z9h6bizswi2ck15fxxl76vc3dzbd7gj27"; + revision = "1"; + editedCabalFile = "17b89zp1qvfk9vyhh7hv5c4n276ciqpap2s2rxd1c11ykb010c0y"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -171526,26 +172684,47 @@ self: { "isomorphism-class" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.9"; - sha256 = "1d0vgmabjyiqpkgrn1hq6a77nyf7imi50ki9gq8a528l2k7sifig"; + version = "0.1.0.10"; + sha256 = "1017zzav1s00jsxjv419zcrm5i334n9zz42isz6b85hiixqm848v"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers hashable primitive QuickCheck - quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text - unordered-containers vector + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; }) {}; + "isomorphism-class_0_1_0_11" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.11"; + sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text + unordered-containers vector + ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -172538,8 +173717,8 @@ self: { }: mkDerivation { pname = "jacobi-elliptic"; - version = "0.1.1.0"; - sha256 = "1vwfs1br5p35zjw58zpziakda48lxmwsmvl554y10djkby25g71k"; + version = "0.1.3.0"; + sha256 = "13inf9szcf4bl81ddd5x2jppkhssydg8szihpnwsl8gs4lml0jdg"; libraryHaskellDepends = [ base elliptic-integrals jacobi-theta ]; testHaskellDepends = [ base elliptic-integrals tasty tasty-hunit ]; description = "Neville Theta Functions and Jacobi Elliptic Functions"; @@ -172564,8 +173743,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.2.0"; - sha256 = "1wc16b61vbvh2bigcva11qbjpqg7kwvzgc0znxzsilywrl3iv1nf"; + version = "0.2.2.1"; + sha256 = "0gpyaqrfajcxlgxqjd1kk30a571ini6ikw6n6l2ryzw2971z127n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -172959,7 +174138,9 @@ self: { executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "javascript-extras-test"; + broken = true; }) {}; "javasf" = callPackage @@ -173782,8 +174963,8 @@ self: { }: mkDerivation { pname = "journalctl-stream"; - version = "0.6.0.4"; - sha256 = "0ckaxaja4152mvlhypd36x2cqw4wiiid11ph6ih9w4c0g9244njf"; + version = "0.6.0.5"; + sha256 = "1nkv3vfpqndi7hks5mrz6cynvv9fly27zckiln5na3sjbnx3mmyv"; libraryHaskellDepends = [ aeson base bytestring conduit process text time unordered-containers @@ -174634,6 +175815,8 @@ self: { pname = "json-query"; version = "0.2.2.0"; sha256 = "1k0rxrki8qa6gx0kqrhn9k98pn8hz3xg4kxn045r920bacfgsvi2"; + revision = "1"; + editedCabalFile = "1h99j6lsjp4dwmyvkav1j25y4glrsk8xny2rsp81bjblhgi5kfci"; libraryHaskellDepends = [ array-chunks base bytebuild bytestring contiguous json-syntax primitive primitive-unlifted profunctors scientific-notation @@ -174830,8 +176013,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.3.0.2"; - sha256 = "0g1y6kfrysnpyha7b752y5vk8mxvbwqw3bhag8g0ylnl4wbl00xf"; + version = "0.3.0.3"; + sha256 = "00w04dv56z97wdps2y6467jhzg93fw6qddswg219ixjjgdl6r723"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl prettyprinter text unordered-containers @@ -174876,8 +176059,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.1.0.1"; - sha256 = "0p65dwqp5dlrb6wcds0yjmmcn7xc57acrw4al3lzn2mqad3aq7ij"; + version = "0.1.0.2"; + sha256 = "1y2w13py1jlmzh9wr37hc9mw16fh4lw25sfilxagqhm69fkglk8w"; libraryHaskellDepends = [ aeson base json-spec lens openapi3 text ]; @@ -174933,16 +176116,16 @@ self: { , contiguous, gauge, natural-arithmetic, neat-interpolation , primitive, QuickCheck, run-st, scientific, scientific-notation , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , text-short, vector, word-compat, zigzag + , text-short, transformers, vector, word-compat, zigzag }: mkDerivation { pname = "json-syntax"; - version = "0.2.6.1"; - sha256 = "0zhmzpxcv4jybw669kaz93am46l4da3v0sa14avmvw7z8yd08mqm"; + version = "0.2.7.0"; + sha256 = "07502z9i8y7z87ps6m0vz0wprrlwkyniwwlgmbr403kjihn1fj3l"; libraryHaskellDepends = [ array-builder array-chunks base bytebuild byteslice bytesmith bytestring contiguous natural-arithmetic primitive run-st - scientific-notation text text-short word-compat zigzag + scientific-notation text text-short transformers word-compat zigzag ]; testHaskellDepends = [ aeson array-chunks base bytebuild byteslice bytestring containers @@ -175742,19 +176925,6 @@ self: { }) {}; "junit-xml" = callPackage - ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }: - mkDerivation { - pname = "junit-xml"; - version = "0.1.0.2"; - sha256 = "0sm738irwvmdnn8cvf0rnvp8s5gmr0ih241l27sasqq18nra2v04"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base text xml-conduit ]; - testHaskellDepends = [ base tasty tasty-golden ]; - description = "Producing JUnit-style XML test reports"; - license = lib.licenses.bsd3; - }) {}; - - "junit-xml_0_1_0_3" = callPackage ({ mkDerivation, base, filepath, tasty, tasty-golden, temporary , text, xml-conduit }: @@ -175769,7 +176939,6 @@ self: { ]; description = "Producing JUnit-style XML test reports"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "jupyter" = callPackage @@ -176240,8 +177409,8 @@ self: { pname = "kan-extensions"; version = "5.2.5"; sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; - revision = "1"; - editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2"; + revision = "2"; + editedCabalFile = "1kwqhslcw4clcngjs24arsv1wdrvrisafi5h2pszlh2zarksgnzv"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -176291,10 +177460,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4.1"; - sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "8"; - editedCabalFile = "02b9q0s45wlrszr623mzv5zx7vya61ix697w6f2mjnicip9hga90"; + version = "0.4.2"; + sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -176972,6 +178139,8 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keccak" = callPackage @@ -177709,8 +178878,8 @@ self: { ({ mkDerivation, aeson, base, containers, HTF, text }: mkDerivation { pname = "keuringsdienst"; - version = "0.1.0.5"; - sha256 = "111f7895mqrvmdnpm7n4h7q1z5vyb6mdgy33abvrib9x0rsjyqbi"; + version = "0.1.1.0"; + sha256 = "0nwkwpm5c4na8yr0m18drd5g3si0f0kkvrc0v3kphnva0l3j1c4l"; libraryHaskellDepends = [ aeson base containers text ]; testHaskellDepends = [ aeson base containers HTF text ]; description = "Data validation in Haskell made easy"; @@ -177952,8 +179121,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "4"; - editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9"; + revision = "5"; + editedCabalFile = "0qp6xvqjw4k98g3di4pnv7hvlhgfcab28nm3pdi48c1gk14qv1kf"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -177997,7 +179166,7 @@ self: { "keystore" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools , array, asn1-encoding, asn1-types, base, base64-bytestring - , byteable, bytestring, containers, crypto-pubkey-types, cryptonite + , byteable, bytestring, containers, crypto-pubkey-types, crypton , directory, filepath, lens, memory, mtl, old-locale , optparse-applicative, pbkdf, process, raw-strings-qq, regex , regex-base, regex-tdfa, safe, setenv, text, time @@ -178005,15 +179174,15 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.9.0.0"; - sha256 = "1wv9rsqz80n70z2fn2s7j4scxcx4dsdr54b8l29232vqzjyqnaxr"; + version = "0.9.0.2"; + sha256 = "07mhnd22b4lyhls9criaxw62scbp71qznmpnxpnz64lwnm5iljmb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint api-tools array asn1-encoding asn1-types base base64-bytestring byteable bytestring containers - crypto-pubkey-types cryptonite directory filepath lens memory mtl + crypto-pubkey-types crypton directory filepath lens memory mtl old-locale optparse-applicative pbkdf regex regex-base regex-tdfa safe setenv text time unordered-containers vector ]; @@ -178092,8 +179261,8 @@ self: { ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.1.0"; - sha256 = "0jwm1f26c89715vm8z5mwr8dzrgj7vjp4b0drhrivzcp381v28jb"; + version = "1.0.1.1"; + sha256 = "1rvjwq765wy99j60x7d5v7zyq8hf52gfjiypc37a9r7gx1y4hir9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; @@ -178117,12 +179286,10 @@ self: { ({ mkDerivation, base, ki, unliftio-core }: mkDerivation { pname = "ki-unlifted"; - version = "1.0.0.1"; - sha256 = "1nfa6g2qi791aqg0whdf02pzng01wvbcxvzy6yf5sa20c6fsqn4b"; - revision = "1"; - editedCabalFile = "0va6m6hpj1hqhlfrfy6n4gipgcq9m03193xq5pbq61fr8ixn64l7"; + version = "1.0.0.2"; + sha256 = "11b4jm161znazwf2pn3qdn4dbz1g5a12dvhm03ddx6lrha7yv1xv"; libraryHaskellDepends = [ base ki unliftio-core ]; - description = "A lightweight structured-concurrency library"; + description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; }) {}; @@ -178460,20 +179627,23 @@ self: { }) {}; "kmonad" = callPackage - ({ mkDerivation, base, cereal, lens, megaparsec, mtl - , optparse-applicative, resourcet, rio, time, unix, unliftio + ({ mkDerivation, base, cereal, hspec, hspec-discover, lens + , megaparsec, mtl, optparse-applicative, resourcet, rio + , template-haskell, time, unix, unliftio }: mkDerivation { pname = "kmonad"; - version = "0.4.1"; - sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + version = "0.4.2"; + sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cereal lens megaparsec mtl optparse-applicative resourcet rio - time unix unliftio + template-haskell time unix unliftio ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -178502,8 +179672,10 @@ self: { }: mkDerivation { pname = "knead"; - version = "1.0"; - sha256 = "144x124wqdywrn158d3jzrhja09gzakfsfgvwvb9p67vzns7nv42"; + version = "1.0.1"; + sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; + revision = "1"; + editedCabalFile = "1h7w7y5s5mx7pxgmff45pfhh7cnxg9w2bv8787s80cfnnypwv3as"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -178671,8 +179843,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "1.1"; - sha256 = "0xm6qxfxfl9qf8mmsns783mvwhx3p81h2iwak6kww8j5lsdv2n6w"; + version = "1.1.1"; + sha256 = "0hrvbcsc15q9ks5zb7s1fhb3skfcsf11ihhni6baszxkw27jqspi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180250,19 +181422,19 @@ self: { }) {}; "lambdasound" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, bytestring + ({ mkDerivation, ansi-terminal, base, bytestring , bytestring-to-vector, deepseq, directory, falsify, filepath , hashable, hashtables, massiv, proteaaudio-sdl, random, tasty , tasty-bench, tasty-hunit, text, transformers, vector, wave, zlib }: mkDerivation { pname = "lambdasound"; - version = "1.0.1"; - sha256 = "0g98gg397srwg5mcx4x56sgnmz5lm9jr1qd505i7r6maiq05v539"; + version = "1.1"; + sha256 = "0lvryqcqpvab87y0ks05l4li1ycawfzf90dhrcwhwyn8h6rh3a68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base binary bytestring bytestring-to-vector deepseq + ansi-terminal base bytestring bytestring-to-vector deepseq directory filepath hashable hashtables massiv proteaaudio-sdl random text transformers vector wave zlib ]; @@ -180451,8 +181623,8 @@ self: { }: mkDerivation { pname = "language-Modula2"; - version = "0.1.3"; - sha256 = "0izh9scx1hky2f47qq0gbfwwcvn984h3icpbw475z5qbid0j3856"; + version = "0.1.4"; + sha256 = "06rqi2g0rbypjj6d11n1lw6vk6xfqf2i7zarwaiy9ay7csgclq9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181404,8 +182576,8 @@ self: { }: mkDerivation { pname = "language-oberon"; - version = "0.3.2"; - sha256 = "0k4r2h02znhs4l5nm88pwva0d7d3p9bga1rrdjga6rjd1ihhbfx1"; + version = "0.3.3"; + sha256 = "0w59dqpwafrlxn6ff7icgd7qsb9nyjmd1cc5ficxc701w8b20yli"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181577,8 +182749,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; - revision = "1"; - editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; + revision = "2"; + editedCabalFile = "024fn653gmxw4ndmqvg1d3lwmxbvrlllc9iw2zw0c3nkcgcv39sg"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -182026,6 +183198,8 @@ self: { pname = "large-anon"; version = "0.3.0"; sha256 = "07jy3q9x1h49c6zmad2x2s9id4lldklgd133m67l3sfh61qz72vv"; + revision = "1"; + editedCabalFile = "0jyyrlicgs0l4rg4vji8r68hm3iai3x4lmnl0ckr5f525y4yf3g1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182055,6 +183229,8 @@ self: { pname = "large-generics"; version = "0.2.1"; sha256 = "0av3j1a1400fsvdmmfji358nknf54n7592fvlilm4kahm4grjl1z"; + revision = "1"; + editedCabalFile = "0j2dmwf0ccggs25npzrrvz6zpachdbywn2crdlyl1dim3m6psrrh"; libraryHaskellDepends = [ aeson base deepseq generics-sop primitive sop-core ]; @@ -182110,6 +183286,8 @@ self: { pname = "large-records"; version = "0.4"; sha256 = "0g09ly8fck613lbs3g2w1slqrxp6fvvrn7i232w5g7nafgsdalfy"; + revision = "1"; + editedCabalFile = "0wcw9rnp2mkchq2xccsyiqqncxq09lj0nyk661a8xpggflsjbhwb"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell @@ -182422,6 +183600,8 @@ self: { pname = "lattices"; version = "2.2"; sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; + revision = "1"; + editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; libraryHaskellDepends = [ base base-compat containers deepseq foldable1-classes-compat hashable integer-logarithms QuickCheck tagged transformers @@ -183436,6 +184616,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "learn-physics_0_6_6" = callPackage + ({ mkDerivation, base, gloss, gnuplot, hmatrix, SpatialMath + , vector-space, Vis + }: + mkDerivation { + pname = "learn-physics"; + version = "0.6.6"; + sha256 = "175sbdinjvf8sp3z597ql49zpvab6gllygv1nrygln3xfsk23d97"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base gloss gnuplot hmatrix SpatialMath vector-space Vis + ]; + executableHaskellDepends = [ base gloss gnuplot SpatialMath Vis ]; + description = "Haskell code for learning physics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "learn-physics-examples" = callPackage ({ mkDerivation, base, gloss, gnuplot, learn-physics, not-gloss , spatial-math @@ -183493,17 +184692,20 @@ self: { }) {}; "leb128-binary" = callPackage - ({ mkDerivation, base, binary, bytestring, hedgehog, tasty - , tasty-hedgehog, tasty-hunit + ({ mkDerivation, base, binary, bytestring, deepseq, hedgehog, tasty + , tasty-bench, tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "leb128-binary"; - version = "0.1.1"; - sha256 = "06i32qa79iwjb76caj5c1b32xi29mq1h0zfakz270p6q89hwkp1v"; + version = "0.1.2"; + sha256 = "1bw7xk269kxd9y5983dr57nxdg8a28hbwdnzgkxn7p6z461rgpqh"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hedgehog tasty tasty-hedgehog tasty-hunit ]; + benchmarkHaskellDepends = [ + base binary bytestring deepseq tasty-bench + ]; description = "Signed and unsigned LEB128 codec for binary library"; license = lib.licenses.asl20; }) {}; @@ -183758,8 +184960,8 @@ self: { pname = "lens"; version = "5.2.3"; sha256 = "0kcr1dqvnjmi05yd9m9ylipk5210jwd7d00c9scq9n49vnl8q7nz"; - revision = "1"; - editedCabalFile = "0bbycnw01xxiidjjwg902wbla9mp0m17a2lpm5qw0za1gsnyl4q1"; + revision = "2"; + editedCabalFile = "0pnhyw3v9dbirh461hcyhds1mpj06qhs81ij7c387wyzdb3qfwk3"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -184705,6 +185907,8 @@ self: { pname = "lhs2tex"; version = "1.24"; sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; + revision = "1"; + editedCabalFile = "06vcx5i474sskqzk99l8qcxadzhz2rbmkjfyxk8aqp62pbxcq9r9"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -184995,14 +186199,14 @@ self: { broken = true; }) {}; - "libiserv_9_6_1" = callPackage + "libiserv_9_6_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghci, unix }: mkDerivation { pname = "libiserv"; - version = "9.6.1"; - sha256 = "0pv57knqj7pj6rg333hlzicappvvwgxpw3m39rqx1y06cgq6h93l"; + version = "9.6.3"; + sha256 = "1gq5gppahw443smf04fr6jjjsc7znpkzg2kq4gdmn1vzdxjh1z25"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghci unix ]; @@ -185200,8 +186404,8 @@ self: { ({ mkDerivation, base, bytestring, data-default, modbus, vector }: mkDerivation { pname = "libmodbus"; - version = "1.1.2"; - sha256 = "1yd7wqnb78zqhlfg5byjkbyly33a9r7m1893d8c52wl244bmng3q"; + version = "1.1.3"; + sha256 = "1lpdpa01b43i5x4s0qfvb86dqvh8rhn5pn19yh34hf8fa693cqck"; libraryHaskellDepends = [ base bytestring data-default vector ]; librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; @@ -186036,8 +187240,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "5"; - editedCabalFile = "142b5q8vcl583h23syr2i2i3ngcdxpfvds08h9cb0qqp789c5ys3"; + revision = "6"; + editedCabalFile = "0px8gjhzw1fvzbd1jha8kcc3p603hc8ki4kwi26vhg7n3ldy5nay"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -186082,6 +187286,8 @@ self: { pname = "lifted-async"; version = "0.10.2.4"; sha256 = "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv"; + revision = "2"; + editedCabalFile = "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -186217,8 +187423,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.8.1"; - sha256 = "1h971r7i36ay0v9nalgjfsz7vnpd1ps74g0d8lawcm00s4fgw8as"; + version = "0.8.2"; + sha256 = "17n684whz5b80zg1jr7l5dp5qz2fa6g3hgqn5b8mjhqlrgqsmfwn"; libraryHaskellDepends = [ ansi-terminal base binary bytestring colour composition containers extra monad-loops mtl network random safe text time transformers @@ -186637,8 +187843,8 @@ self: { pname = "linear"; version = "1.22"; sha256 = "1ddr0c54kbi9bw7d62i6h3jiss3q0qmrdpkvckajz6qf5lwkxr6g"; - revision = "2"; - editedCabalFile = "0ksiy3rkswrwdlz0fsq26dmc4xvw0fm8y7ixdpvgdfpkjr255c8y"; + revision = "3"; + editedCabalFile = "1fmq4i3qimccjsn7859q1rk7adpcy9d3zvybl0n7kljn04ag00k4"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -186706,8 +187912,8 @@ self: { pname = "linear-base"; version = "0.3.1"; sha256 = "1gm8bwyi39x5x29xb6nq13x9x9p30vm29s11k4pkcql70sj4pv0h"; - revision = "1"; - editedCabalFile = "153nkw2i7n22xzfj8q2xmzsh77pr7pay8v3gc1xli491qmsc0fcd"; + revision = "2"; + editedCabalFile = "0bfpjjr2y16h2x3gphsljgzcqrlwbmrxxqsikgn2idwy73pvd32l"; libraryHaskellDepends = [ base containers ghc-prim hashable linear-generics primitive storable-tuple text transformers vector @@ -186725,6 +187931,35 @@ self: { license = lib.licenses.mit; }) {}; + "linear-base_0_4_0" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable + , hashtables, hedgehog, inspection-testing, linear-generics, mmorph + , MonadRandom, primitive, random, random-shuffle, storable-tuple + , tasty, tasty-bench, tasty-hedgehog, tasty-inspection-testing + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.4.0"; + sha256 = "092xnbn29829zz1nq96h2fcw3qpkanzrhw09cjs90f19xhcs1vxw"; + libraryHaskellDepends = [ + base containers ghc-prim hashable linear-generics primitive + storable-tuple text transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog inspection-testing linear-generics mmorph + storable-tuple tasty tasty-hedgehog tasty-inspection-testing text + vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq hashable hashtables MonadRandom random + random-shuffle tasty-bench unordered-containers vector + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -187759,14 +188994,15 @@ self: { , containers, deepseq, directory, fgl, filepath, git, hashable , intern, lens-family, megaparsec, mtl, nettools , optparse-applicative, parallel, parser-combinators, pretty - , process, rest-rewrite, stm, store, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-rerun, text - , transformers, unordered-containers, vector, z3 + , process, rest-rewrite, smtlib-backends, smtlib-backends-process + , stm, store, syb, tagged, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, transformers, typed-process + , unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.0.2.1"; - sha256 = "1gq867m9b48381zi3m5xari9j34xva4gchajahbpi4fvy54gp6h3"; + version = "0.9.2.5"; + sha256 = "0i9487xz1cfmn3nv58wlm685ljvqq1iqfyz1rkx549wa5h4zmdjq"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -187774,15 +189010,16 @@ self: { aeson ansi-terminal array ascii-progress async attoparsec base binary boxes bytestring cereal cmdargs containers deepseq directory fgl filepath hashable intern lens-family megaparsec mtl parallel - parser-combinators pretty process rest-rewrite stm store syb text - transformers unordered-containers vector + parser-combinators pretty process rest-rewrite smtlib-backends + smtlib-backends-process stm store syb text transformers + typed-process unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers directory filepath hashable mtl optparse-applicative process stm tagged tasty tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun text transformers - unordered-containers + typed-process unordered-containers ]; testSystemDepends = [ git nettools z3 ]; doCheck = false; @@ -187809,34 +189046,34 @@ self: { }) {}; "liquid-parallel" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, parallel + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , parallel }: mkDerivation { pname = "liquid-parallel"; - version = "3.2.2.0.1"; - sha256 = "0c9qf1achk9n6l6rlncsm7harmdxph90by61lmjk3fw251c9ib03"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; + version = "3.2.2.0.2"; + sha256 = "0a1frfdklhhfwlzrpxcrx1jnqanhzs2qrqm6xlyahnknbwhhc51g"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquid-platform" = callPackage - ({ mkDerivation, cmdargs, filepath, liquid-base, liquid-bytestring - , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell + ({ mkDerivation, base, cmdargs, containers, filepath + , liquid-prelude, liquid-vector, liquidhaskell, liquidhaskell-boot , process }: mkDerivation { pname = "liquid-platform"; - version = "0.9.0.2"; - sha256 = "1y2vwjs00k786diwmzljrzwaj3nnmsm4kysq49hdzl9vkfx8nvca"; + version = "0.9.2.5"; + sha256 = "149bbnyhqmhcdpxbhs1h5hypc2xg4yjlj8j9wxcjwfdfq5bw8h7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - cmdargs filepath liquid-base liquid-bytestring liquid-containers - liquid-prelude liquid-vector liquidhaskell process + base cmdargs containers filepath liquid-prelude liquid-vector + liquidhaskell liquidhaskell-boot process ]; description = "A battery-included platform for LiquidHaskell"; license = lib.licenses.bsd3; @@ -187845,16 +189082,16 @@ self: { }) {}; "liquid-prelude" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, liquid-base - , liquidhaskell + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell, liquidhaskell-boot }: mkDerivation { pname = "liquid-prelude"; - version = "0.9.0.2"; - sha256 = "176iwwsnx80x716qym2i6hjyq7v38lq2nkwnmhdb1v3c5wrp4z67"; - setupHaskellDepends = [ base Cabal liquidhaskell ]; + version = "0.9.2.5"; + sha256 = "1333z82xycs4mzbayj7n1ah4bd6mdz7pasw7g8gvcq0gqakqlxzd"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - bytestring containers liquid-base liquidhaskell + base bytestring containers ghc-prim liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = lib.licenses.bsd3; @@ -187862,60 +189099,71 @@ self: { }) {}; "liquid-vector" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , vector + }: mkDerivation { pname = "liquid-vector"; - version = "0.12.3.1"; - sha256 = "15v4prdf35b11iym05dmr3n58i260zk69yzf31cha7rqbgr5lhd7"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; + version = "0.12.3.1.2"; + sha256 = "1pc05sr1w827k7sv7x3kdrvssy4zbq4k0dn3fhd9jp62sciyf5ia"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquidhaskell" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal - , cmdargs, containers, data-default, data-fix, deepseq, Diff - , directory, exceptions, extra, filepath, fingertree, free, ghc - , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable - , hscolour, liquid-fixpoint, megaparsec, mtl, optics - , optparse-applicative, pretty, process, recursion-schemes, split - , syb, tasty, tasty-ant-xml, tasty-hunit, template-haskell - , temporary, text, th-compat, time, transformers - , unordered-containers, vector, z3 + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell-boot, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.0.2.1"; - sha256 = "174bazw76hrn3rlvcmsag87rv66r9vwm6008hw540gjvj2g1w0z4"; - revision = "1"; - editedCabalFile = "1ycl8vg7nzslkvsiimfv67fa095cgkzpzxila6wpnnsmf6d9m06z"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; + version = "0.9.2.5.0"; + sha256 = "1a508khibgy94z9fk91z22wl7qqdw8l4wcfcjxk0z7z7f05llrim"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - aeson base binary bytestring Cabal cereal cmdargs containers - data-default data-fix deepseq Diff directory exceptions extra - filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash - gitrev hashable hscolour liquid-fixpoint megaparsec mtl optics - optparse-applicative pretty recursion-schemes split syb - template-haskell temporary text th-compat time transformers - unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory extra filepath ghc liquid-fixpoint megaparsec - process syb tasty tasty-ant-xml tasty-hunit text + base bytestring containers ghc-prim liquidhaskell-boot ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "liquid"; }) {inherit (pkgs) z3;}; + "liquidhaskell-boot" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal + , cmdargs, containers, data-default, data-fix, deepseq, Diff + , directory, exceptions, extra, filepath, fingertree, free, ghc + , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable + , hscolour, liquid-fixpoint, megaparsec, mtl, optparse-applicative + , pretty, recursion-schemes, split, syb, tasty, tasty-ant-xml + , tasty-hunit, template-haskell, temporary, text, th-compat, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "liquidhaskell-boot"; + version = "0.9.2.5.0"; + sha256 = "10k8pisygfdy23i2zb538rl7yf3gac4wxa550dsqnzkmkfcr82yz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring Cabal cereal cmdargs containers + data-default data-fix deepseq Diff directory exceptions extra + filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash + gitrev hashable hscolour liquid-fixpoint megaparsec mtl + optparse-applicative pretty recursion-schemes split syb + template-haskell temporary text th-compat time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base directory filepath ghc ghc-paths liquid-fixpoint megaparsec + syb tasty tasty-ant-xml tasty-hunit time + ]; + description = "Liquid Types for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "liquidhaskell-cabal" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -188109,8 +189357,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.5.6"; - sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; + version = "1.0.5.7"; + sha256 = "0ikbgml3ky1pzahqxisi17g2j5ya2ps75cq96cv9cz4cf9kqk4j0"; libraryHaskellDepends = [ base foldl logict mmorph monad-control mtl transformers transformers-base @@ -188489,8 +189737,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "3"; - editedCabalFile = "0k1b9pbdlrz9n4aaj07arbzbzz4l4dy0srh3x8px3d0rjpvwyld7"; + revision = "5"; + editedCabalFile = "16vs060sfdbkmrl8p9cvmn0rl7zwr4l7lvm9lwvmnl0vww1f41r1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188776,8 +190024,10 @@ self: { }: mkDerivation { pname = "llvm-dsl"; - version = "0.1"; - sha256 = "1x3br3g227gh7hydfllzwjp3lv9lgq9p1rnrh09sw4whcv4crhbb"; + version = "0.1.1"; + sha256 = "15ad2kv7d4hr732zlxk6f2faw76xavaynpi2d18kch41x1giivxv"; + revision = "1"; + editedCabalFile = "0iq6v0z6g7lzg8pnijanphcj51fhbvishs5vzylhjvhjikfcv9lc"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat storable-enum storable-record tfp transformers unsafe utility-ht @@ -188815,8 +190065,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.11"; - sha256 = "1ck6cama0l89rgjcqhnasvzzy1pacr9h2z6v32pi7xci3h7ijhy2"; + version = "0.12"; + sha256 = "0syd18037lg1g1yg4nk5pmmwwzgxzrlgg9jzli47q5v346dk0mv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188838,14 +190088,16 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "13.0"; - sha256 = "039yrihb8lwnbjzif4g8cg0i9xhzaghkklfpksmisrq0ikvyy43r"; + version = "16.0"; + sha256 = "14cf6qhdq69ggx41259ih55g6z1vn0694wrh3s8m6f7adq990ra9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {LLVM = null;}; "llvm-ffi-tools" = callPackage @@ -188854,10 +190106,8 @@ self: { }: mkDerivation { pname = "llvm-ffi-tools"; - version = "0.0.0.1"; - sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk"; - revision = "1"; - editedCabalFile = "1wmwrhjs732izgbihbbb7l856pgxa1q5f32z06935ykwfwy160x7"; + version = "0.0.1"; + sha256 = "0si1v4fbkjzaizp5b6lqkcaf9qy1r4bkf8sbvr0q10caq3c66swd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189129,8 +190379,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.1"; - sha256 = "0p285ssw0wii8pn1ml110wjpzd6hb8h1yb0zff0hyhzs8k23pm7a"; + version = "16.0"; + sha256 = "1nscccmk0nf52p9r0af354p4n4vr1fbaym4x164wwwid7xc1x65g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190666,6 +191916,8 @@ self: { pname = "long-double"; version = "0.1.1.1"; sha256 = "0xq2f0ziinlw1drgg3q6p7303rkzbasc9jwrz8lgjfl3wv24qk8l"; + revision = "1"; + editedCabalFile = "07hbfv5mcz39j4j9z63s4xs5d077hxc138vrcyzp552nns78cms7"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -190679,6 +191931,8 @@ self: { pname = "longboi"; version = "1.0.0"; sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; + revision = "1"; + editedCabalFile = "08ij5rlcj7c6w4gaqixd080v2j4p979r83irbdyma6djimfyvnb7"; libraryHaskellDepends = [ base ]; description = "Dependently-typed linked list implementation"; license = lib.licenses.mit; @@ -191145,6 +192399,19 @@ self: { license = lib.licenses.mit; }) {}; + "lpeg_1_1_0" = callPackage + ({ mkDerivation, base, lua, tasty, tasty-hunit }: + mkDerivation { + pname = "lpeg"; + version = "1.1.0"; + sha256 = "0yav34yxrkbgnkcd3870smay5s3cypyd28m0fsg2jhlikgmhj5a1"; + libraryHaskellDepends = [ base lua ]; + testHaskellDepends = [ base lua tasty tasty-hunit ]; + description = "LPeg – Parsing Expression Grammars For Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lrucache" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -191503,8 +192770,8 @@ self: { }: mkDerivation { pname = "ltext"; - version = "0.1.3"; - sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6"; + version = "0.1.4"; + sha256 = "1znfwnv1m0pzzdlc6i89wh7gz8igv77r286ymwx5qzn86nkq6wxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192016,8 +193283,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; - revision = "4"; - editedCabalFile = "0ij1wcciiplk381xzxr7xcnywfbh5caflffnvlzqmg8bz3j4xdcs"; + revision = "5"; + editedCabalFile = "01szqdkxgk00anqifx1xvnyim6j9lv02aqdshdbls376vi2nay0p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -192706,8 +193973,8 @@ self: { pname = "machines"; version = "0.7.3"; sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; - revision = "2"; - editedCabalFile = "13msrrbravjx51j40jn5namgbkfc44dv565ry5pdb5l389gzfl1k"; + revision = "3"; + editedCabalFile = "0w0q2kq8m8fkgrf0yj0fd5yb5b1svyxvfgjml5yvc2cqxfdh7mm7"; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers @@ -195163,6 +196430,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "math-functions_0_3_4_3" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.4.3"; + sha256 = "0ri9vf9bcs4q8bj9451sjc4q5cfxc8bcjjx6wqgsdk3yx2sxb1jd"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector + ]; + testHaskellDepends = [ + base data-default-class deepseq erf primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector vector-th-unbox + ]; + benchmarkHaskellDepends = [ + base data-default-class random tasty-bench vector + ]; + description = "Collection of tools for numeric computations"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, bimap, containers, hspec , ilist, lens, linear, matrix, mtl, random, vector @@ -196676,6 +197967,8 @@ self: { pname = "megaparsec"; version = "9.5.0"; sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; + revision = "4"; + editedCabalFile = "0f6g05w18kn34rcjkxfdsg4sibxsz41p2xac7wfc9wqpr0l9kg55"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -196722,6 +198015,8 @@ self: { pname = "megaparsec-tests"; version = "9.5.0"; sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; + revision = "2"; + editedCabalFile = "1zh7ggvc1453b734mmc7yyd8f6qrr34bnvab0507l1nflml7w9bb"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -197430,25 +198725,26 @@ self: { }) {}; "mergeful-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeful, genvalidity-persistent, hspec, mergeful - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity, validity-persistent + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeful, genvalidity-persistent, genvalidity-sydtest + , mergeful, microlens, monad-logger, mtl, path, path-io, persistent + , persistent-sqlite, persistent-template, QuickCheck, sydtest + , sydtest-discover, text, validity, validity-persistent }: mkDerivation { pname = "mergeful-persistent"; - version = "0.1.0.0"; - sha256 = "13i2bajgxwmyr5w8qfswlpizhsajnnhgs96hav74sj5m5i6z0dpi"; + version = "0.3.0.1"; + sha256 = "1cbxikv2amab82fkqr78pwax9z8bh04ybjanif6nlfyrq598annc"; libraryHaskellDepends = [ base containers mergeful microlens mtl persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeful - genvalidity-persistent hspec mergeful monad-logger mtl path path-io - persistent persistent-sqlite persistent-template QuickCheck text - validity validity-persistent + base containers genvalidity genvalidity-mergeful + genvalidity-persistent genvalidity-sydtest mergeful monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity validity-persistent ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -197471,25 +198767,26 @@ self: { }) {}; "mergeless-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeless, genvalidity-persistent, hspec, mergeless - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeless, genvalidity-persistent + , genvalidity-sydtest, mergeless, microlens, monad-logger, mtl + , path, path-io, persistent, persistent-sqlite, persistent-template + , QuickCheck, sydtest, sydtest-discover, text, validity }: mkDerivation { pname = "mergeless-persistent"; - version = "0.1.0.0"; - sha256 = "05fazha6q5lmpagfazlrly7ms0p1jag9n6llwmr0zspx0raq35mb"; + version = "0.1.0.1"; + sha256 = "1m6nbkc43vjjavg9wqimb6ql98m70qy5nagz6l8gjc3icz8dmc00"; libraryHaskellDepends = [ base containers mergeless microlens persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeless - genvalidity-persistent hspec mergeless monad-logger mtl path - path-io persistent persistent-sqlite persistent-template QuickCheck - text validity + base containers genvalidity genvalidity-mergeless + genvalidity-persistent genvalidity-sydtest mergeless monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -198149,8 +199446,8 @@ self: { pname = "microaeson"; version = "0.1.0.1"; sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "7"; - editedCabalFile = "01skh5580zxf1032b25wm410jr52kaxq822jz6n568sfx90hmfl7"; + revision = "8"; + editedCabalFile = "1w9pm69vm0r3zkmcls3zd6b0vc3ifvsjmwj2wk7gc23pj4bwzwlb"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -198273,6 +199570,8 @@ self: { pname = "microlens"; version = "0.4.13.1"; sha256 = "1z6ph89sgdhgdf8sqaw9g978mlnvlc4k8y50pssaxxplizpanm0a"; + revision = "1"; + editedCabalFile = "07d5lm0p98aly7wfm1ishm8dy6ccgg2mklrxkgry9s3qblmnw9gw"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; @@ -198304,6 +199603,8 @@ self: { pname = "microlens-contra"; version = "0.1.0.3"; sha256 = "1jxm6shmvacbic6i6hask0kv89kramnk77pcxpv4gv4xydjsr88n"; + revision = "1"; + editedCabalFile = "086z6n3c606zmv1fxc9j2jhsvh1v7nszawklg1xddyzk9jgcyzpv"; libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = lib.licenses.bsd3; @@ -198328,8 +199629,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.14.1"; - sha256 = "1h6wcgv50mxqz09wkamqjgw90382a4m31mq7q57vmzmkl489nw2n"; + version = "0.4.14.2"; + sha256 = "17fdc5jpqlq3q61mf6qia7a18kqq4nfpbrv2j2n4a4cx62kcbraq"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -198345,6 +199646,8 @@ self: { pname = "microlens-mtl"; version = "0.2.0.3"; sha256 = "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd"; + revision = "1"; + editedCabalFile = "0xw3hjsfdg0hz12bk9yh2zqs2xi4jxaspwkd968ajxq13rmygxlj"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -198358,8 +199661,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.4.3.3"; - sha256 = "13s6m07whp3h05vqm2hz3qv5ai51ll6q4s3kf8nr3pif6wxqbisy"; + version = "0.4.3.4"; + sha256 = "01j7z0637wirp6y0a4zfzqaky0dmpn1c3y9vdq5hf5igycc1v6yh"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -198462,8 +199765,8 @@ self: { pname = "microstache"; version = "1.0.2.3"; sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; - revision = "2"; - editedCabalFile = "0rafypnzzxmxhbc3lyd8ylyfrygijipbgh267slzkwfa8hikd0nz"; + revision = "3"; + editedCabalFile = "0bl84aym5p31wlyqwh5vicyrdw3nvig65xxdlx4ql8hjr71l7mvi"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -199046,6 +200349,18 @@ self: { license = lib.licenses.mit; }) {}; + "mime-types_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.2.0"; + sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "min-max-pqueue" = callPackage ({ mkDerivation, base, containers, criterion, hedgehog , integer-logarithms, random @@ -199469,6 +200784,19 @@ self: { broken = true; }) {}; + "miniterion" = callPackage + ({ mkDerivation, base, deepseq, directory, tasty, tasty-hunit }: + mkDerivation { + pname = "miniterion"; + version = "0.1.1.0"; + sha256 = "0byjlkmi6hr5wpqfbcmqyz7yzcs5nw7gc3x3878a32f9jz92a8jr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base directory tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; + description = "Simple and lightweight benchmark utilities"; + license = lib.licenses.mit; + }) {}; + "minitypeset-opengl" = callPackage ({ mkDerivation, base, containers, filepath, OpenGL, stb-truetype }: @@ -200536,8 +201864,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.5.0.0"; - sha256 = "00q7rmbjkjjabs9a4cfhqb0d37g124j0j4jb64qbi77m0pa7l9dv"; + version = "0.5.0.1"; + sha256 = "0y2gb58afghdhqapq96qwcq1938ixy4iv27lj7d0khcsal3706kr"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -200687,28 +202015,6 @@ self: { license = lib.licenses.mit; }) {}; - "mod_0_1_2_2" = callPackage - ({ mkDerivation, base, deepseq, integer-gmp, primitive - , quickcheck-classes, quickcheck-classes-base, semirings, tasty - , tasty-bench, tasty-quickcheck, vector - }: - mkDerivation { - pname = "mod"; - version = "0.1.2.2"; - sha256 = "0m92yd323kjjwnphqlima2aj0hh7i1gnpblc8a29ks25gj0sv66v"; - libraryHaskellDepends = [ - base deepseq integer-gmp primitive semirings vector - ]; - testHaskellDepends = [ - base primitive quickcheck-classes quickcheck-classes-base semirings - tasty tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ base tasty-bench ]; - description = "Fast type-safe modular arithmetic"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "mod" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-bignum, primitive , quickcheck-classes, quickcheck-classes-base, semirings, tasty @@ -200794,6 +202100,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; + revision = "1"; + editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -201190,8 +202498,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.1.1"; - sha256 = "13y8s9dargzd5vy6m36dq2pnr23fibnx6r19iz414qsdbizp3196"; + version = "1.2.0"; + sha256 = "0v65asbmndgp5ljzdizgrrhwwbf6ajqaaaky5v51ivic8csb1dfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201280,8 +202588,8 @@ self: { pname = "monad-chronicle"; version = "1.0.1"; sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "2"; - editedCabalFile = "1f0plhhr8n5bcki3fn0nbbsjb4jwydk6fhqqnmwrb0g0n3cvj1gz"; + revision = "3"; + editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -201378,12 +202686,12 @@ self: { }: mkDerivation { pname = "monad-control-aligned"; - version = "0.0.1.1"; - sha256 = "1xhiw1g0p8zljhy8yz43ljnwhhqn6dwxqi06mdsfji365p9qzrs4"; + version = "0.0.2.1"; + sha256 = "18qk48nzivc51pdk0a1pd4s4yzs015kmrmmfdygmfgsy8h68b78p"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; - description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *"; + description = "Lift control operations, like exception catching, through monad transformers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -201989,10 +203297,10 @@ self: { }: mkDerivation { pname = "monad-par"; - version = "0.3.5"; - sha256 = "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2"; - revision = "2"; - editedCabalFile = "1q4npp0vrsjpxk7n7rcf3lgqg1sf2qx628ciiw48al9y9xlznsaz"; + version = "0.3.6"; + sha256 = "10b2wir7g7pr7gf3d8azkv829fl2fmxzgy8wc4livlwks0vax9jf"; + revision = "1"; + editedCabalFile = "0n329g47a5bfx21fd2j1w2y0ngka87mpfsy1c6yxw57s5x0wda77"; libraryHaskellDepends = [ abstract-deque abstract-par array base containers deepseq monad-par-extras mtl mwc-random parallel @@ -202629,19 +203937,17 @@ self: { }) {}; "monadic-bang" = callPackage - ({ mkDerivation, base, containers, exceptions, fused-effects, ghc - , ghc-boot, ghc-paths, transformers + ({ mkDerivation, base, containers, fused-effects, ghc, ghc-boot + , ghc-paths, transformers }: mkDerivation { pname = "monadic-bang"; - version = "0.1.1.0"; - sha256 = "143xi2yav13n28zppfrlk8xllm56ciw0lghbbdnafkf208szv91c"; + version = "0.2.1.0"; + sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; - testHaskellDepends = [ - base exceptions ghc ghc-boot ghc-paths transformers - ]; + testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; }) {}; @@ -203191,8 +204497,8 @@ self: { pname = "monoid-extras"; version = "0.6.2"; sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; - revision = "1"; - editedCabalFile = "1xl89p6qcir69qg0kn4443swl4kcgl3vm8dbfi86dgr5z6zvpxhc"; + revision = "2"; + editedCabalFile = "08ydfb0n886qzy940lfvyv1pcj51yhpa0kz6pwn7lm22fh1hb5pf"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -203250,8 +204556,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.4"; - sha256 = "1hg0vpm6nhdqxxpx9329gj135fqrfsw0kdlxd1ycfini69jsbxn6"; + version = "1.1.5"; + sha256 = "1knxn3qxn630lpc7nq6v4z5mysahs8w6hk29dnfkhgf7bc80ilrb"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -203287,6 +204593,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_2_4_1" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, primes, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.2.4.1"; + sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; + libraryHaskellDepends = [ + base bytestring commutative-semigroups containers primes text + vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -203307,6 +204635,8 @@ self: { pname = "monoidal-containers"; version = "0.6.4.0"; sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; + revision = "1"; + editedCabalFile = "0dav6640nvxizgqqkwqmpi9z04n2swhxmyl68xm94c9np356q5iw"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -203446,26 +204776,29 @@ self: { }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , dbus, desktop-portal, directory, modern-uri, monomer - , monomer-hagrid, random, text + ({ mkDerivation, async, base, bytestring, c2hs, containers + , data-default-class, dbus, desktop-portal, directory, libpipewire + , libspa, modern-uri, monomer, monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.12.0"; - sha256 = "185vv9ihrjssncpkhfh7gchw6whx0ll951y7j4pznnn6s0b3k2yk"; + version = "0.0.13.2"; + sha256 = "1lklf9n1ck1yyyc73f36i495rgq2anxm33ghcmlssy8allpv1k8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring containers data-default-class dbus desktop-portal - directory modern-uri monomer monomer-hagrid random text + async base bytestring containers data-default-class dbus + desktop-portal directory modern-uri monomer monomer-hagrid random + text ]; + executablePkgconfigDepends = [ libpipewire libspa ]; + executableToolDepends = [ c2hs ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "monomer-flatpak-example"; - }) {}; + }) {libpipewire = null; libspa = null;}; "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default @@ -203474,8 +204807,8 @@ self: { }: mkDerivation { pname = "monomer-hagrid"; - version = "0.3.1.0"; - sha256 = "12ym5n1gxyx6aavyikj3hi3biyz3jqsph2x6fsryc60qmhz667wm"; + version = "0.3.1.1"; + sha256 = "1akfgsz0j0ybgs2zynp9hbssbn8v457az2g6z094fylgcg2s3aix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203639,6 +204972,8 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "Efficient search weighted by an ordered monoid with monus"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monzo" = callPackage @@ -204664,8 +205999,31 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; + "mpi-hs_0_7_3_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: + mkDerivation { + pname = "mpi-hs"; + version = "0.7.3.0"; + sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring monad-loops ]; + libraryPkgconfigDepends = [ ompi ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + executablePkgconfigDepends = [ ompi ]; + testHaskellDepends = [ base monad-loops ]; + testPkgconfigDepends = [ ompi ]; + description = "MPI bindings for Haskell"; + license = lib.licenses.asl20; + badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sheepforce ]; + }) {ompi = null;}; + "mpi-hs-binary" = callPackage ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: mkDerivation { @@ -204682,6 +206040,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-cereal" = callPackage @@ -204700,6 +206059,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-store" = callPackage @@ -204718,6 +206078,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mplayer-spot" = callPackage @@ -205185,8 +206546,8 @@ self: { pname = "msgpack"; version = "1.0.1.0"; sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; - revision = "1"; - editedCabalFile = "1gdn6cwkczn4i9ssx4m5v352hh5k20pd4c93am0inrldq8zncyx8"; + revision = "2"; + editedCabalFile = "07m8xrwfxp0p6dgg7bz1vwsypcwi9ix84bxva462261ncyaayd9p"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 deepseq hashable mtl text unordered-containers vector @@ -206794,6 +208155,8 @@ self: { pname = "multistate"; version = "0.8.0.4"; sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; + revision = "1"; + editedCabalFile = "0m1wv2yv1isw1qkzfa2fgjx0md7irp9djcgy16739wvl8hnj1ciq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206950,6 +208313,8 @@ self: { pname = "murmur-hash"; version = "0.1.0.10"; sha256 = "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9"; + revision = "1"; + editedCabalFile = "18wlx3hsba3kvpa1z95dz0xglr97lf62irlr6wg6i0613br58sh3"; libraryHaskellDepends = [ base bytestring ]; description = "MurmurHash2 implementation for Haskell"; license = lib.licenses.bsd3; @@ -208112,6 +209477,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mysql-json-table" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, mysql + , mysql-simple + }: + mkDerivation { + pname = "mysql-json-table"; + version = "0.1.0.0"; + sha256 = "1mc4xjgvwj1h687f4rh8sy5q102rg17ppszfyph8h0hkahy6nqxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit mysql mysql-simple + ]; + executableHaskellDepends = [ base conduit mysql-simple ]; + description = "Using MySQL to store id-to-json tables"; + license = lib.licenses.mit; + mainProgram = "mysql-json-table-test"; + }) {}; + "mysql-pure" = callPackage ({ mkDerivation, attoparsec, base, binary, binary-ieee754 , blaze-textual, bytestring, bytestring-lexing, case-insensitive @@ -208344,12 +209728,12 @@ self: { }) {}; "n-tuple" = callPackage - ({ mkDerivation, base, singletons, vector }: + ({ mkDerivation, base, singletons-base, vector }: mkDerivation { pname = "n-tuple"; - version = "0.0.2.0"; - sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva"; - libraryHaskellDepends = [ base singletons vector ]; + version = "0.0.3"; + sha256 = "0x9shjhkshfa81sdhppx9h8xdkm0j0v73lvkzhgp93hzavb9sffi"; + libraryHaskellDepends = [ base singletons-base vector ]; description = "Homogeneous tuples of arbitrary length"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -208554,8 +209938,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "4"; - editedCabalFile = "05m3mw2prbag8bshayvvigxr70jk32398sn3n5gjv1nfhbsplwcr"; + revision = "5"; + editedCabalFile = "0yhv6qxdjsip5sd3z2gvwhjfq2n3l9qx6n990xfm4mz0dn935v1f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -208687,8 +210071,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.1.3.0"; - sha256 = "0a0nnq5zhjnh8s5ykny4rvzck4s7n5vj82qwlww8jm3fnv4sj9ax"; + version = "1.1.4.0"; + sha256 = "1brmqlnp107zwfx6j6rl91fr7v0kc07pd1izca9yg8plhk0qkgvj"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -209286,8 +210670,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "11"; - editedCabalFile = "1j4gmkamz6r7xggyfyb3by8lbmaah164haqakbxi2kb7y0v4kl24"; + revision = "12"; + editedCabalFile = "0nlyhp29s2c93d1rflrw4wkzpp98i9zr11fca2vd6z31yc7dg5pg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -209425,20 +210809,16 @@ self: { }) {}; "neat-interpolation" = callPackage - ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text + ({ mkDerivation, base, megaparsec, rerebase, tasty, tasty-hunit + , template-haskell, text }: mkDerivation { pname = "neat-interpolation"; - version = "0.5.1.3"; - sha256 = "01v5ccv16gw13mjxdxcxnbs6ggzmqh4vwzybzkzqzm40la163aqz"; + version = "0.5.1.4"; + sha256 = "1drs0aghqxr960sciwjqsnpkhphlp3s4idpqrzh8f3frn7ik7dwf"; libraryHaskellDepends = [ base megaparsec template-haskell text ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A quasiquoter for neat and simple multiline text interpolation"; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "Quasiquoter for neat and simple multiline text interpolation"; license = lib.licenses.mit; }) {}; @@ -209799,8 +211179,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "9.0.2"; - sha256 = "197q5fapwj5rnlqvwlzajjn8sjb960mgxqd7sbw2sih6cj63a9a2"; + version = "10.0.0"; + sha256 = "16m926ajdjmma835l5p3s6w288j93sv4hcl8609a153cj5i1ni6f"; libraryHaskellDepends = [ attoparsec base errors exceptions extractable-singleton hashable monad-control-aligned mtl poly-arity pred-trie regex-compat text @@ -210343,8 +211723,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "12"; - editedCabalFile = "1xk4q5jmnhynyajylvzsdfhnhd64hk9fmym7z1prg1v2z8764bmp"; + revision = "13"; + editedCabalFile = "01c405f31al4qv6fq3apx1p5s4szzkla2nhmwwzpf6lvl5rz8y8h"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -210807,15 +212187,12 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "network-byte-order"; - version = "0.1.6"; - sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; - revision = "1"; - editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; + version = "0.1.7"; + sha256 = "0yc6s2zdxkr2awmf56vqwds417ix8rgq33ffsk44wdk7gyny0328"; libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = lib.licenses.bsd3; }) {}; @@ -211129,6 +212506,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -211652,8 +213031,8 @@ self: { }: mkDerivation { pname = "network-unexceptional"; - version = "0.1.3.1"; - sha256 = "0g99931i44f07byxv14a89d2rda12ibzv1b3vxi6rkwqikrh3jk3"; + version = "0.2.0.0"; + sha256 = "042mav0nrvffm31xd0skx5fjq8qd1608ar76wq4vg03az6xdy97d"; libraryHaskellDepends = [ base byteslice bytestring error-codes network posix-api primitive primitive-addr stm @@ -211672,6 +213051,8 @@ self: { pname = "network-uri"; version = "2.6.4.2"; sha256 = "0a3jg6aykwm1yw32nh137hi6r86w2640xwl1p18352bf29rqj64w"; + revision = "1"; + editedCabalFile = "12350bi5sqamk1mdgkm757q3p2q96bvhm2yvl98mcawnfdrvbzvg"; libraryHaskellDepends = [ base deepseq parsec template-haskell th-compat ]; @@ -212337,8 +213718,8 @@ self: { }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.5.0.3"; - sha256 = "1czpf9sjsqzzzf78aqvp8n3ja0bdhchwj3i79qzf3mvhhkcfqj3i"; + version = "0.5.1.2"; + sha256 = "1vv5pl6lazbq6g11nsj6ks14by1shjplxllfi9rmij49w67q0xln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -212354,21 +213735,28 @@ self: { "ngx-export-healthcheck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , enclosed-exceptions, http-client, http-client-brread-timeout - , http-client-tls, http-types, ngx-export, safe, snap-core - , snap-server, text, time, vector + , crypton-connection, crypton-x509, crypton-x509-system + , crypton-x509-validation, data-default-class, enclosed-exceptions + , http-client, http-client-brread-timeout, http-client-tls + , http-types, ngx-export, safe, snap-core, snap-server, text, time + , tls, unordered-containers, vector }: mkDerivation { pname = "ngx-export-healthcheck"; - version = "1.6"; - sha256 = "0haz3md5hx6rs9apdqd4ivm3f0vqvxa099ig3liw4mjjqnzmhdhy"; + version = "1.6.2"; + sha256 = "1zmmgf0m99m4dcg6q5zxjkbikiwkgn39mdifdvxd0fy5p8ff851a"; libraryHaskellDepends = [ - aeson async base bytestring containers enclosed-exceptions - http-client http-client-brread-timeout http-client-tls http-types - ngx-export safe snap-core snap-server text time vector + aeson async base bytestring containers crypton-connection + crypton-x509 crypton-x509-system crypton-x509-validation + data-default-class enclosed-exceptions http-client + http-client-brread-timeout http-client-tls http-types ngx-export + safe snap-core snap-server text time tls unordered-containers + vector ]; description = "Active health checks and monitoring of Nginx upstreams"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ngx-export-log" = callPackage @@ -212394,8 +213782,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.0"; - sha256 = "08549xn2rcx4nipzpcq379y5irkv0llrhis497d6zfqa3lgjyzk0"; + version = "1.2.2"; + sha256 = "18jbvjziy3dakp59bhz4gx9b6w74g1y7mwcmlgmy5wc0snqx22j8"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -212414,8 +213802,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.4"; - sha256 = "1phxcz622yz2als564ab0bs425lz44lbp9q0nmxgnp03bxlcn9gs"; + version = "1.2.5"; + sha256 = "0myggkgscm4yl4f9wdhpf571dz5yrdfb09ajl1ybic7yl8nmm9zq"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -213610,8 +214998,10 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.4"; - sha256 = "0x88vi1llky86fdrzgvfilgl724jp3kfj8mn8zf9vwjbilap5qy1"; + version = "0.3.5"; + sha256 = "0xnxisshns862l5khb70i6pkzc9l95j33vkqlk046xl6galcxdvd"; + revision = "1"; + editedCabalFile = "15rjy9al76b001qd5nyzfpadxwhhsla02q50pm8d5p1a9y4z0vzp"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -213774,8 +215164,8 @@ self: { }: mkDerivation { pname = "nonempty-vector"; - version = "0.2.2.0"; - sha256 = "0nfvqp59jk8j0r4mj1v8q87hfznhkrscbgz2z7i7cva8fgqjrivg"; + version = "0.2.3"; + sha256 = "18xcsw2c9gy03dvrlanh799j1ab6dkpd6wwgj8b681r12ha04dqa"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck vector @@ -215062,6 +216452,8 @@ self: { pname = "numeric-prelude"; version = "0.4.4"; sha256 = "04x6ry2sxr5hsiz4098dn2gqyjqywiq2xk0anf6wc4xrvasgccjs"; + revision = "1"; + editedCabalFile = "0w5an2w06vpi75qj9972qbsiz4n72mr6mkib4ivlrrirndsyda79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215160,12 +216552,12 @@ self: { }) {}; "numerical-integration" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, system-cxx-std-lib }: mkDerivation { pname = "numerical-integration"; - version = "0.1.0.2"; - sha256 = "0vg9pdlqv5wl84q7jcjgd3g6hir1kkd5acmplivpn2gq9hdf8mwi"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.3"; + sha256 = "1yzajs03wyv8y9n1j7npp66yw7gbjd04069ybw391w21m83wgz9j"; + libraryHaskellDepends = [ base system-cxx-std-lib ]; description = "Numerical integration"; license = lib.licenses.bsd3; }) {}; @@ -215744,6 +217136,42 @@ self: { mainProgram = "play-o-clock"; }) {}; + "o-clock_1_4_0" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec-expectations + , markdown-unlit, tasty, tasty-hedgehog, tasty-hunit-compat + , type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "1.4.0"; + sha256 = "1qmv0hq1z3x5h3mxpdd3prf9yhk7688hdm09zf8l36iq2602vj5g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec-expectations markdown-unlit tasty + tasty-hedgehog tasty-hunit-compat type-spec + ]; + testToolDepends = [ doctest markdown-unlit ]; + description = "Type-safe time library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "play-o-clock"; + }) {}; + + "oalg-base" = callPackage + ({ mkDerivation, array, base, deepseq, random, time }: + mkDerivation { + pname = "oalg-base"; + version = "1.0.0.0"; + sha256 = "1x5k59wj08fr7h1ycwwalf669xia9573hhykl0x09zz50zfjzl41"; + libraryHaskellDepends = [ array base deepseq random time ]; + testHaskellDepends = [ array base deepseq random time ]; + description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems"; + license = lib.licenses.bsd3; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -216345,6 +217773,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ods2csv" = callPackage + ({ mkDerivation, base, bytestring, non-empty, optparse-applicative + , shell-utility, spreadsheet, tagchup, utf8-string, utility-ht + , xml-basic, zip-archive + }: + mkDerivation { + pname = "ods2csv"; + version = "0.1"; + sha256 = "16f4n8a1a3jq0dk8ds6sn7vljh69slhdbdvbw8mzzvhwjdxmk7cq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring non-empty optparse-applicative shell-utility + spreadsheet tagchup utf8-string utility-ht xml-basic zip-archive + ]; + description = "Convert Open Document Spreadsheet ODS to CSV"; + license = lib.licenses.bsd3; + mainProgram = "ods2csv"; + }) {}; + "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri , test-framework, test-framework-hunit @@ -216416,8 +217864,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.10"; - sha256 = "0v5ax7xyl5hnq37h97cajg679xxvdv6z7mjwa2h0nj3g70wkxd9f"; + version = "1.0.11"; + sha256 = "0q0hfmckply8n3jg1jkj4n4gaf6bc7l86amrjmdiml1mmfmaqvqf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -216439,8 +217887,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.0.10"; - sha256 = "04kkk6r947dq7v23x95dp6kkp3adkynh6b23px3ij5g83k86kv2g"; + version = "1.0.11"; + sha256 = "13bqy731qbhszjxy0l06zff5lyqiypnybxxg8hvmsj0r4p041fa2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base filepath IfElse mtl ogma-extra ogma-language-c @@ -216462,8 +217910,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.10"; - sha256 = "0r2qlzs8dyxv9mvj7nr4akihxxx36bdlndp7x6fp848yasbik8bg"; + version = "1.0.11"; + sha256 = "0ksrf2ahbnlydklvmgpkhxwcykxwxvaisr8ch6vbhv34r123rg45"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -216480,8 +217928,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.10"; - sha256 = "09yb37ccrg6wq7dflngfjnjwach3k633cw17il2vg6wh7r1b3ffw"; + version = "1.0.11"; + sha256 = "0kpmw1jkjw7adg05ijd1cr72d85jnwq5vywhpnx9lczsns7vp6i8"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -216499,8 +217947,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.10"; - sha256 = "15hakc95xiy9yhzqm7hm5mrzxlam03g1a4rsppglv6zpn55764rb"; + version = "1.0.11"; + sha256 = "0xv2crz6qzskc0k94pv7p4y3xdw4vg1axp559hw47yn6q7nlvbkh"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -216516,8 +217964,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.10"; - sha256 = "1m6bbxkdxk7p20vb47abb796cx9qb3s87g9rjady9bncyyz0f199"; + version = "1.0.11"; + sha256 = "0js0xg83j2g6s6zja4sa81vhccj0w1jsjba2c9cw8r8pinr97jjb"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -216530,8 +217978,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.10"; - sha256 = "0lvh0cvn2m47pv87hv5ad2s5s1qfr2aii2zn53xlra5jm2ilmjav"; + version = "1.0.11"; + sha256 = "1cqbxa5nrfczjzq9jnn3b5g737x08q6ca0kflcj9d6my53381v2h"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -216551,8 +217999,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.10"; - sha256 = "1ryqnhfpvpigmfyidrfql54pj5z3633iddlnnvn9q6qgpch4a4s0"; + version = "1.0.11"; + sha256 = "0096phlf3sp6fw7bq16wra304gxf1s1kpqzjzp49z8xdnszhl0ln"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -216571,8 +218019,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.10"; - sha256 = "0n56k5f1gbk345qxdd9wjv3n4w0za05zg00xvqdmc3lmpdn31g9k"; + version = "1.0.11"; + sha256 = "1ixxsbh443zd83xl9m329myfw91a316kc1f9a58a60x8akmafvqx"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -217479,7 +218927,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_10_0_0" = callPackage + "opaleye_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -217489,10 +218937,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.0.0"; - sha256 = "0x181722a8ml9a6nbcj5v9q8npjkc22qrahqkfrfrh69hb0zpqp4"; - revision = "2"; - editedCabalFile = "1vi9rr5zdk9mjpmgk27wcrdddv7rzmh94s30nc20987iqf3sc6ck"; + version = "0.10.2.0"; + sha256 = "0an98lspk77zxg4phvll5zjxviq3q4iwc75p9k7aqqa1hvm4wrdj"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -218445,8 +219891,8 @@ self: { pname = "openssl-streams"; version = "1.2.3.0"; sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; - revision = "1"; - editedCabalFile = "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp"; + revision = "2"; + editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -218553,6 +219999,24 @@ self: { mainProgram = "eventlog-to-lightstep"; }) {}; + "opentelemetry-plugin" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , hs-opentelemetry-api, hs-opentelemetry-propagator-w3c + , hs-opentelemetry-sdk, mwc-random, text, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-plugin"; + version = "1.0.0"; + sha256 = "10j37spgz06xa7n16bbqx9zwhh9yc7avbhmwlvhraikpcjfmz7j9"; + libraryHaskellDepends = [ + base bytestring containers ghc hs-opentelemetry-api + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random + text unordered-containers + ]; + description = "GHC plugin for open telemetry"; + license = lib.licenses.bsd3; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -218810,8 +220274,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.2.2"; - sha256 = "0d2zxq6y943kwpis9nbbj7cn8amy315bxy56mjj54bkg3jm43jn7"; + version = "0.3.0"; + sha256 = "1bbs2rv0rfsz3mmi04qxjirmbm9ghsx8cffa15lm4n8sxpkafz82"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -218828,8 +220292,8 @@ self: { ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }: mkDerivation { pname = "opentracing-http-client"; - version = "0.2.2"; - sha256 = "03adv17m82imw7bq618zm6x79gq6avvhcz3i0jak4157f3lwdq6b"; + version = "0.3.0"; + sha256 = "1wjhb15ay6l5ynby90abrlkw7i9iwnkifzfpi39bbk7884wkl6a7"; libraryHaskellDepends = [ base http-client lens mtl opentracing text ]; @@ -218846,8 +220310,8 @@ self: { }: mkDerivation { pname = "opentracing-jaeger"; - version = "0.2.2"; - sha256 = "1wy8n4ci3hs2glwahhgzzl6g4dw370ay2dg8bf1af8a27sl3dhjn"; + version = "0.3.0"; + sha256 = "0a1kk98ab98pwkh9znssz8s2yfg660n509rkiwslarm910lyqmvp"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types lens mtl network opentracing pinch QuickCheck safe-exceptions text @@ -218862,8 +220326,8 @@ self: { ({ mkDerivation, base, lens, opentracing, text, wai }: mkDerivation { pname = "opentracing-wai"; - version = "0.2.2"; - sha256 = "1yfbh7pp2rp16xm5bqij9f6m0cm23zrd0jsndkngl1mxjkv6l24i"; + version = "0.3.0"; + sha256 = "1j9bamsy6yflxhk6xy1li2a1jqva07r7w3jf509wfiq4474i345k"; libraryHaskellDepends = [ base lens opentracing text wai ]; description = "Middleware adding OpenTracing tracing for WAI applications"; license = lib.licenses.asl20; @@ -218874,8 +220338,8 @@ self: { ({ mkDerivation, aeson, base, opentracing, text }: mkDerivation { pname = "opentracing-zipkin-common"; - version = "0.2.2"; - sha256 = "1vridakdz07yfiyr92byd8kab2zc68izpv1j8dh4a0xnks8910wk"; + version = "0.3.0"; + sha256 = "1ha0f6y2rj5j7634z5pcas1425rlx0i94xiwiwqy9za54hhqaa3i"; libraryHaskellDepends = [ aeson base opentracing text ]; description = "Zipkin OpenTracing Backend Commons"; license = lib.licenses.asl20; @@ -218890,8 +220354,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v1"; - version = "0.2.2"; - sha256 = "0z263yksbcgyfzsb6fj6id3bdsbhb0b92bfjm0myclj8f703hxbj"; + version = "0.3.0"; + sha256 = "1hcpmr5nr7h045nf4m82q1j7xcqi8hrm6fdw4q2xx38vz3hnph9v"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types iproute lens opentracing opentracing-zipkin-common pinch QuickCheck text @@ -218909,8 +220373,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v2"; - version = "0.2.2"; - sha256 = "1hqbr4ifabyg6sr40jw9hqi2xq00wqy8srw9q6hj5qxqnvl39110"; + version = "0.3.0"; + sha256 = "1bkvg8krw9jv4c48an0g6z140ghln91vcc0igcxzj50y7vmczrh7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring exceptions http-client http-types lens opentracing opentracing-zipkin-common text @@ -219210,8 +220674,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "4"; - editedCabalFile = "0l9kafjxrqnkqqb2mdwc6rjhhyp7j5mabaxzmgq6fzl8cr9qbjfk"; + revision = "5"; + editedCabalFile = "0a9h1bll1m9v40cv7ifv2sy3k6sfcq325s7cpk33wh65awf5zpl7"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -220180,40 +221644,6 @@ self: { broken = true; }) {}; - "ormolu_0_5_0_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring - , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , QuickCheck, syb, template-haskell, temporary, text - , th-lift-instances - }: - mkDerivation { - pname = "ormolu"; - version = "0.5.0.1"; - sha256 = "1rnf4x352k856avfllk4rc9v0wwkydr030cmp7j29p0y9cwf5pkg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser megaparsec - MemoTrie mtl syb template-haskell text th-lift-instances - ]; - executableHaskellDepends = [ - base containers filepath ghc-lib-parser gitrev optparse-applicative - text - ]; - testHaskellDepends = [ - base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec megaparsec path path-io QuickCheck temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "ormolu"; - }) {}; - "ormolu_0_5_2_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, Diff, directory, dlist, file-embed @@ -220812,8 +222242,8 @@ self: { }: mkDerivation { pname = "pa-field-parser"; - version = "0.2.0.1"; - sha256 = "1dkyi4gzsp2d0hfl8plmmirz6hlgy6ncd8nvxb34ax9nxi880c6v"; + version = "0.3.0.0"; + sha256 = "0myd5zcxz7cx731a9ymqnny34k2gjav7x7053f358r5dymmjp32j"; libraryHaskellDepends = [ aeson aeson-better-errors attoparsec base case-insensitive containers pa-error-tree pa-prelude scientific semigroupoids @@ -220825,18 +222255,18 @@ self: { "pa-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty, base - , base64-bytestring, bytestring, containers, hspec-core - , hspec-expectations, pa-error-tree, pa-label, pa-prelude - , scientific, text, time, vector + , base64-bytestring, bytestring, containers, pa-error-tree + , pa-field-parser, pa-label, pa-prelude, scientific, text, time + , vector }: mkDerivation { pname = "pa-json"; - version = "0.2.1.0"; - sha256 = "1j260q8mfd46fg4iijfva2b3db7k9zfyjpn1qblkhpf073x79hnh"; + version = "0.3.0.0"; + sha256 = "0fwjv244kbbc9zixf64654fwdykk8h4qc7iv7w7l08bywmjrgrs5"; libraryHaskellDepends = [ aeson aeson-better-errors aeson-pretty base base64-bytestring - bytestring containers hspec-core hspec-expectations pa-error-tree - pa-label pa-prelude scientific text time vector + bytestring containers pa-error-tree pa-field-parser pa-label + pa-prelude scientific text time vector ]; description = "Our JSON parsers/encoders"; license = lib.licenses.bsd3; @@ -220855,16 +222285,17 @@ self: { "pa-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, error, exceptions - , mtl, profunctors, PyF, semigroupoids, text, these - , validation-selective + , mtl, profunctors, PyF, scientific, semigroupoids + , template-haskell, text, these, validation-selective, vector }: mkDerivation { pname = "pa-prelude"; - version = "0.1.0.0"; - sha256 = "1as9kj351ph10nqzqxfnqyhnm7d10gc0jlnh3q9m8wdzmkimciam"; + version = "0.2.0.0"; + sha256 = "00gkyypa17ic2s019jmrxwjaylnfryn6nlg20ky1iip935y5y0b8"; libraryHaskellDepends = [ base bytestring containers error exceptions mtl profunctors PyF - semigroupoids text these validation-selective + scientific semigroupoids template-haskell text these + validation-selective vector ]; description = "The Possehl Analytics Prelude"; license = lib.licenses.bsd3; @@ -221828,6 +223259,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.16.0"; sha256 = "1vp4x4vgc17y0c4grfffrw0nx5iiimj7jm00mwc2p4x8v3gvd1qr"; + revision = "1"; + editedCabalFile = "00ghadmbwv14vpc5fh85q1y06z5pzlwh6ryr68l5vg66dk2241g4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -221855,6 +223288,45 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "pandoc-crossref_0_3_17_0" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-ghc + , microlens-mtl, microlens-th, mtl, open-browser + , optparse-applicative, pandoc, pandoc-cli, pandoc-types, syb + , template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.17.0"; + sha256 = "16kgnwylczhs126ivps56r667acln441srdasavvnk35hsvgmccf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-default directory filepath microlens + microlens-ghc microlens-mtl microlens-th mtl pandoc pandoc-types + syb template-haskell text utility-ht + ]; + executableHaskellDepends = [ + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text + ]; + testHaskellDepends = [ + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text + ]; + testToolDepends = [ pandoc-cli ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "pandoc-csv2table" = callPackage ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { @@ -223441,8 +224913,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "6"; - editedCabalFile = "1f14frciafrs63a581lm7s1zxv71wa04ydzf80gldfi7x73c6ln6"; + revision = "7"; + editedCabalFile = "192gkkmr47vfqbb9yal9q38ps0v1wgkji7d6ykpjd4gyk1p414xr"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -223722,14 +225194,12 @@ self: { }) {}; "park-bench" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, array, base, bytestring, ghc-prim, text }: mkDerivation { pname = "park-bench"; - version = "0.1.0.1"; - sha256 = "0ricvj3q4y8xdb47py9q6j23xw6fcy6l1000qm5naqkqkfz6rp35"; - revision = "2"; - editedCabalFile = "15lczl28f4cyldsx0rhg9kwi5xxykh8yw1la9s9gn28dx35809bz"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.0"; + sha256 = "15vbhljsnqjm3hjqxlzifvkbcysmwz3fqw2hmdlwkzsyncz4p6j9"; + libraryHaskellDepends = [ array base bytestring ghc-prim text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; }) {}; @@ -223879,14 +225349,16 @@ self: { mainProgram = "parseargs-example"; }) {}; - "parsec_3_1_16_1" = callPackage - ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }: + "parsec_3_1_17_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, mtl, tasty, tasty-hunit + , text + }: mkDerivation { pname = "parsec"; - version = "3.1.16.1"; - sha256 = "0ihjbmsn9hrryjid0ydh6vryzq2mnzavhdb7hxc8d9kfszjn46d4"; + version = "3.1.17.0"; + sha256 = "0dlx2ypfbbddlv75m9axirxb30srb9kzvpa3haf88g7cq6z01iaq"; libraryHaskellDepends = [ base bytestring mtl text ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; + testHaskellDepends = [ base deepseq mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; @@ -224251,8 +225723,8 @@ self: { pname = "parsers"; version = "0.12.11"; sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; - revision = "1"; - editedCabalFile = "11slps7yccraacb67c862g2iv1sh7m09dnvbafhyw134krch0i5v"; + revision = "2"; + editedCabalFile = "1wx06q6hkib00brrf4rpvbgrcipjmb1g3xhwdqjhkh31skhlimii"; libraryHaskellDepends = [ attoparsec base base-orphans binary charset containers mtl parsec scientific text transformers unordered-containers @@ -224574,6 +226046,18 @@ self: { license = "unknown"; }) {}; + "partialord" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "partialord"; + version = "0.0.2"; + sha256 = "1cnsjn3s154ar439gcphblm1pwvqn6w88c1hyvin7xapnssrg32g"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + description = "Data structure supporting partial orders"; + license = lib.licenses.bsd3; + }) {}; + "partly" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, bytestring, optparse-applicative, QuickCheck, vector @@ -224866,27 +226350,27 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-types, process, QuickCheck, skylighting, tasty + , pandoc-types, process, QuickCheck, random, skylighting, tasty , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, wcwidth, yaml + , unordered-containers, vector, wcwidth, yaml }: mkDerivation { pname = "patat"; - version = "0.9.0.0"; - sha256 = "1g7i2mjrppnvz4c7v0w4a4c3s30b74s1adnssi1rmahm4qf1cqmn"; + version = "0.10.1.1"; + sha256 = "0ndfqrnrl94rw4lnc3jmyijgpxj9xgl3m3f4iz8ilc4w36j96vpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc pandoc-types process - skylighting terminal-size text time unordered-containers wcwidth - yaml + network-uri optparse-applicative pandoc pandoc-types process random + skylighting terminal-size text time unordered-containers vector + wcwidth yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory pandoc QuickCheck tasty tasty-hunit tasty-quickcheck - text + ansi-terminal base directory pandoc QuickCheck tasty tasty-hunit + tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -224942,6 +226426,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; + revision = "2"; + editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225022,6 +226508,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "path_0_9_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-hspec, genvalidity-property + , hashable, hspec, mtl, QuickCheck, template-haskell, text + , validity + }: + mkDerivation { + pname = "path"; + version = "0.9.5"; + sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + text + ]; + testHaskellDepends = [ + aeson base bytestring filepath genvalidity genvalidity-hspec + genvalidity-property hspec mtl QuickCheck template-haskell validity + ]; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-binary-instance" = callPackage ({ mkDerivation, base, binary, path }: mkDerivation { @@ -225072,6 +226581,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-extra_0_3_1" = callPackage + ({ mkDerivation, attoparsec, base, path, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "path-extra"; + version = "0.3.1"; + sha256 = "0si91qq7bssfpzsnqjwbgp4iifg5clsk4yyxd1yxrk9pxl5vc0wa"; + libraryHaskellDepends = [ attoparsec base path text ]; + testHaskellDepends = [ + attoparsec base path QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; + description = "URLs without host information"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-formatting" = callPackage ({ mkDerivation, base, formatting, path }: mkDerivation { @@ -225131,6 +226658,19 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "path-sing" = callPackage + ({ mkDerivation, base, hashable, path }: + mkDerivation { + pname = "path-sing"; + version = "0.1.0.0"; + sha256 = "14d84jwa3gdxp0pjlnck870skmqilxn98ymi15n7wqbkhf6mi5aw"; + libraryHaskellDepends = [ base hashable path ]; + description = "A singleton wrapper for the `path` library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "path-text-utf8" = callPackage ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { @@ -225251,6 +226791,8 @@ self: { pname = "pathtype"; version = "0.8.1.2"; sha256 = "1ikbl1yzlimf5yjvi6agliraqdi6mf6m7ig5rx97wh03vrx58hfk"; + revision = "1"; + editedCabalFile = "0iy54kvjh9nf7n870pqggw82rmx8w5hz8hv96dq9swn7dvpq52wj"; libraryHaskellDepends = [ base deepseq directory doctest-exitcode-stdio QuickCheck semigroups tagged time transformers utility-ht @@ -225783,19 +227325,6 @@ self: { }) {}; "pcre-light" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: - mkDerivation { - pname = "pcre-light"; - version = "0.4.1.0"; - sha256 = "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ pcre ]; - testHaskellDepends = [ base bytestring containers HUnit mtl ]; - description = "Portable regex library for Perl 5 compatible regular expressions"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) pcre;}; - - "pcre-light_0_4_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: mkDerivation { pname = "pcre-light"; @@ -225806,7 +227335,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit mtl ]; description = "Portable regex library for Perl 5 compatible regular expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -227125,8 +228653,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.5.2"; - sha256 = "13j9aawkdiy5wqx8q4xbnskjr35g0pgx1l0iv3ir0z60xfl717gz"; + version = "2.14.6.0"; + sha256 = "0fz5ns6m677vrhmvzfgpmh0d5nmkn3ax3m7b4hb0j3h6jw3k0avf"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html bytestring conduit containers deepseq fast-logger http-api-data @@ -227223,8 +228751,8 @@ self: { }: mkDerivation { pname = "persistent-discover"; - version = "0.1.0.6"; - sha256 = "1p4qvyjrf142192g9chxpdawpb55vk3dxrb1w0clwrhbz2w1q6q9"; + version = "0.1.0.7"; + sha256 = "0limmps83v9grv6j58vz996bafbxp267nv3s7mizmp1g68yvqcba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227652,8 +229180,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.5.2"; - sha256 = "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i"; + version = "2.13.6.1"; + sha256 = "0mv7a2qrcn34996as1wqxwxlhyqfis0m6q4wkfzyrpmy881zc6lh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227716,8 +229244,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.5"; - sha256 = "1mkgrczllayf8mq773rqp11d677fqjxcblmb3l97m0k1qyvpjq1h"; + version = "2.12.0.6"; + sha256 = "1z017xb7mq3npbz1jw7d9b2x8ylwr4qcpi7d87pi6dw89nwqcwwd"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -227834,8 +229362,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.1.1"; - sha256 = "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"; + version = "2.13.2.0"; + sha256 = "1v846ymm46b1g1bv95brrnndp7vi3qkfjdfwjqxsdi9c9hixwq87"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -228442,8 +229970,8 @@ self: { ({ mkDerivation, base, criterion, transformers, vector }: mkDerivation { pname = "phantom-state"; - version = "0.2.1.3"; - sha256 = "0wqjjghsxjhqj4z6snqcc0lkx84d84qnxlpkc5nignxywksbka8x"; + version = "0.2.1.4"; + sha256 = "07gb7qiv3g2klqnhxnjj4rdvvhy72vvv92h7p88k6547la6znn40"; libraryHaskellDepends = [ base transformers ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; @@ -228543,12 +230071,23 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "phladiprelio-general-datatype" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "phladiprelio-general-datatype"; + version = "0.3.1.0"; + sha256 = "1pbd6hd1pb28shag6xa08caamz6f02dn71v9asyyqznxpljf4771"; + libraryHaskellDepends = [ base ]; + description = "Extended functionality of PhLADiPreLiO"; + license = lib.licenses.mit; + }) {}; + "phladiprelio-general-shared" = callPackage ({ mkDerivation, base, phonetic-languages-phonetics-basics }: mkDerivation { pname = "phladiprelio-general-shared"; - version = "0.1.0.0"; - sha256 = "08k08584ylmfflrv3wsm00j8gcd3mj8lkqpp2mw3mv0x0bdb7hmb"; + version = "0.1.1.0"; + sha256 = "1iwia8gs6pm7i7nz3a3kqnrmbmg3js1dq66g2s1li71p7gdn32ac"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics ]; @@ -228558,8 +230097,8 @@ self: { "phladiprelio-general-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-general-shared, phladiprelio-tests - , phonetic-languages-constraints-array + , phladiprelio-general-datatype, phladiprelio-general-shared + , phladiprelio-tests, phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics , phonetic-languages-simplified-base, rev-scientific @@ -228567,12 +230106,12 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.8.0.0"; - sha256 = "0bq82h7y2qd5kx3gig579v9n6znvyfz1bzkjjkcbp9rpywkk0gy8"; + version = "0.10.0.0"; + sha256 = "19sydm9r3ggkbkr53akzv8z504kv2dqcbncf86ivkv9qh56rxk3f"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit - phladiprelio-general-shared phladiprelio-tests - phonetic-languages-constraints-array + phladiprelio-general-datatype phladiprelio-general-shared + phladiprelio-tests phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-simplified-base rev-scientific @@ -228621,7 +230160,8 @@ self: { "phladiprelio-ukrainian-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-tests, phladiprelio-ukrainian-shared + , phladiprelio-general-datatype, phladiprelio-tests + , phladiprelio-ukrainian-shared , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-simplified-base @@ -228630,12 +230170,13 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.10.0.0"; - sha256 = "01xxrhfcfcw9s0h2zyn3vbwvbidklygm5z46cbax2ks81qqd01mi"; + version = "0.11.0.1"; + sha256 = "166v5cpdyxs754pmhlm05sbbbvlys8bfmgjr0grrqw6f1rnm1x2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit phladiprelio-tests + async base cli-arguments directory halfsplit + phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base @@ -228643,7 +230184,8 @@ self: { rhythmic-sequences ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - async base cli-arguments directory halfsplit phladiprelio-tests + async base cli-arguments directory halfsplit + phladiprelio-general-datatype phladiprelio-tests phladiprelio-ukrainian-shared phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base @@ -228917,8 +230459,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.10.0.2"; - sha256 = "1crikva3lb3jhnfsaca6lv8fgbv56jn3f8zbfylfbb8hvqk507h3"; + version = "0.10.1.0"; + sha256 = "0i2mpfpycy004kc96ajraxrjzdzg1k04yjn18wf1k9x5q5n3xm24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229131,6 +230673,7 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -229150,6 +230693,8 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -229305,8 +230850,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.10.0.0"; - sha256 = "0ska3m86vs4xab1skzgaqdihqsnz9ag471fns880hj2lgjxn7jzb"; + version = "0.11.0.0"; + sha256 = "0rijqyvavk2i7439n25wzb4dggz9xv2hfxw7557p5jqii15jxvcs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -230299,8 +231844,8 @@ self: { }: mkDerivation { pname = "pipes-binary"; - version = "0.4.3"; - sha256 = "1r3byrp8z99rkz2z7pjrz88i4y8qy1qy38ih363ky65r87hbw6d3"; + version = "0.4.4"; + sha256 = "1grylcr2iiqa9wlki821lgabll4d53lmrzxw5nycpva546z8v13b"; libraryHaskellDepends = [ base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse transformers @@ -231325,6 +232870,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.2"; sha256 = "0s42dnack5yasbx958dshhlhq58qd41vw2plwr9c20d6lkd95wh5"; + revision = "1"; + editedCabalFile = "1xkan9nazclmnsvqqdzxz2y83hddhwbypkw0vvmcs3h3kai5mgga"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -232644,8 +234191,8 @@ self: { pname = "pointed"; version = "5.0.4"; sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; - revision = "1"; - editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl"; + revision = "2"; + editedCabalFile = "1ik9mdz5gdkw5bzj1ymsh8c6kihrl07j1imh1k5rwylnq1pmvlmc"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -232712,8 +234259,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.15"; sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; - revision = "2"; - editedCabalFile = "1m23ll2r9aizgp21jssyxxqa20lg93carpn7gwdfzafakwjzdg26"; + revision = "3"; + editedCabalFile = "0vw7i9p71bvvnawn2xdxvbyk17n92wlqndq8w2y3nlj3g7ivwmrd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233080,6 +234627,8 @@ self: { pname = "poly"; version = "0.5.1.0"; sha256 = "0ycjdan9l92glnqr0lms2kdjfs5dg9c2ky2w2rdmrc6nzzxajd9k"; + revision = "1"; + editedCabalFile = "1fhq09zg8fiz8k8ijv13vxdzy8rq8bn5nm370pbjz60kg40lymwc"; libraryHaskellDepends = [ base deepseq finite-typelits primitive semirings vector vector-algorithms vector-sized @@ -233322,8 +234871,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.1"; - sha256 = "0k6nq182lx5yca3c7i24byq1aik1f09ydy6g34nfd27lraa31w2b"; + version = "1.9.1.3"; + sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -233436,15 +234985,15 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.6.0.0"; - sha256 = "1zmq8pi0fdzbgz8nkfiwkn2vf6a6k5wgc7xc19v5xkmaps5aiwgp"; + version = "0.6.0.2"; + sha256 = "1d53m5i0v1g5c66wvy8ji7gmw0vzz9qh57hf0wx44kk45myva4ad"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; testHaskellDepends = [ base chronos incipit-core polysemy-test polysemy-time tasty ]; - description = "Polysemy effects for Chronos"; + description = "A Polysemy effect for Chronos"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -233457,16 +235006,15 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.12.1.0"; - sha256 = "0js5hl84nfmb2i5si67wrf9d0i69piaj44v3sbia6yncq85fj7vn"; + version = "0.13.0.1"; + sha256 = "15blkrrh27wadi746qn590agsp0xqrxd6cnvzr9wkfkvv9hcizvj"; libraryHaskellDepends = [ async base containers incipit-core polysemy polysemy-resume polysemy-time stm stm-chans torsor unagi-chan unix ]; testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin - polysemy-resume polysemy-test polysemy-time stm tasty - tasty-hedgehog time unix + polysemy-test polysemy-time stm tasty tasty-hedgehog time unix ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; @@ -233592,8 +235140,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.12.0.0"; - sha256 = "016z753yk9ix8vqbmkll67pp2w2qznnbbayvi7x8q6cwm464cavq"; + version = "0.13.0.1"; + sha256 = "15zcnskyy9c60lmidbvyg5rkmnvbbp62x9cix8p4cak19d6rqp1k"; libraryHaskellDepends = [ aeson base case-insensitive exon http-client http-client-tls http-types polysemy polysemy-plugin prelate time @@ -233669,8 +235217,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.9.0.0"; - sha256 = "1sgmgbh7gkyhp7rmdx2rj6dibwhi6z2qzg4cbnjsx8asz6xa188h"; + version = "0.10.0.1"; + sha256 = "0wm7qzwaqyhrmwpxvshi5168sbzyb8vya1fmi58jz3plmyz9drws"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -233716,8 +235264,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.9.0.0"; - sha256 = "0zwcv6b0m5phwiy0c1z3wfnbw0976qg744dpb6k66wdr3yvpl05f"; + version = "0.10.0.1"; + sha256 = "1srydqn5snp8lqdvwixkh956isl58172syvk2k020knwji5qgw9z"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -233725,7 +235273,7 @@ self: { testHaskellDepends = [ base incipit-core polysemy polysemy-log polysemy-test stm tasty ]; - description = "Di adapters for Polysemy.Log"; + description = "Di adapters for polysemy-log"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -233855,8 +235403,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.4.5.0"; - sha256 = "1q06276pqw1zm4x5hq0ax7ia12d32cajvhwpmx2nwqj5yh7jyygh"; + version = "0.4.5.1"; + sha256 = "066ggw99m93xk9gk5ymmx1dpfwlq5anf9mgzv05lbzysg2v15b6p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -233879,8 +235427,8 @@ self: { }: mkDerivation { pname = "polysemy-process"; - version = "0.12.1.0"; - sha256 = "0009h21pwfkwfyb5qk6v9gw5gh2ksap3xbcbny2icn88dhqs42k6"; + version = "0.13.0.1"; + sha256 = "05n7k3jlssa448ixmxc9fmyb1szwfs9pcmvfg2ya40f2p5p8blkx"; libraryHaskellDepends = [ base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans @@ -233944,8 +235492,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.7.0.0"; - sha256 = "0f2hlccg7qpx9dd1k73ni59yl447m3v2s6r8h9n2k1klxc21jr07"; + version = "0.8.0.1"; + sha256 = "03qw5aivq39vjg88liz57pgw6frr68kx2lb8bfqxyjsf4anzg8nq"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -234012,8 +235560,9 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.8.0.0"; - sha256 = "1i4nsl7vml8m2nca357bsp9yy92h74zl9k80jdv4kab5bk7l1avd"; + version = "0.9.0.0"; + sha256 = "09aysv1l95q3mx70n0bcnsanrvlynlnz2zl2zg6v2a8vdhnkw7s7"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty tasty-hedgehog transformers @@ -234033,15 +235582,15 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.6.0.0"; - sha256 = "0kl5p1iwd0q7cm05zfvgq0nwhjds547p1mrzqzjwdcy8p4xflr2p"; + version = "0.6.0.2"; + sha256 = "1zg0xyhp7zn9hl76zag097cpdzs38iap3zkc3bpy5amkkbw05kax"; libraryHaskellDepends = [ aeson base incipit-core template-haskell time torsor ]; testHaskellDepends = [ base incipit-core polysemy-test tasty time ]; - description = "Polysemy effects for time"; + description = "A Polysemy effect for time"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -234548,6 +236097,8 @@ self: { pname = "pooled-io"; version = "0.0.2.3"; sha256 = "0ysgfwlppilj21sqhbcq7xbyc5hnc26mzb58y7mm9rd5piw3v7mc"; + revision = "1"; + editedCabalFile = "1c2ggwlgr22zwc15x175hl08ql3fls278nwzdb3igqggdv5kx6cz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235151,8 +236702,8 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.7.0.0"; - sha256 = "1wza7flfy2v5c44a0w1mr486ljba6n6wp2gn79zhknq8m0hd3q50"; + version = "0.7.1.0"; + sha256 = "1195h6g521235dsk3gcyj5f4vnh9y1shld8w70gvwrfz07g28fjp"; libraryHaskellDepends = [ base byte-order byteslice primitive primitive-addr primitive-offset run-st text-short @@ -235379,8 +236930,8 @@ self: { }: mkDerivation { pname = "postgres-options"; - version = "0.2.0.0"; - sha256 = "1dfr15bg77117y27rr1kvbxcsyh36ha30c8rgiqd15y7pjd4apy4"; + version = "0.2.1.0"; + sha256 = "0vck8hv2yry7yvvyg4gps17b0h1dfgjiv9zzl2fc9gks8ksarcha"; libraryHaskellDepends = [ base bytestring generic-monoid split uri-bytestring ]; @@ -235413,8 +236964,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.11.1.0"; - sha256 = "1q7pgklgc0d93hwacv3akx1vi29hvanj7lpyl29nzzwwk2y2pird"; + version = "0.11.2.1"; + sha256 = "0zlm0gk4sxm84kx205n5z0r0nw13kajk7400zbi9v2xslwjpgxnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235462,6 +237013,32 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_13_1_1" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, criterion, network-ip + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.13.1.1"; + sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -235664,6 +237241,8 @@ self: { pname = "postgresql-migration"; version = "0.2.1.7"; sha256 = "0r8pmy9905549vavbmps4627d2a5agz7hq0wv9663xdibvqsaf78"; + revision = "1"; + editedCabalFile = "1s5kcfnbsh5y1jsybvpl92j32wp43n8pd56981wynnrhh3kinlbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236805,6 +238384,7 @@ self: { ]; description = "A Amazon SQS backend for powerqueue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ppm" = callPackage @@ -237306,16 +238886,16 @@ self: { ({ mkDerivation, aeson, base, exon, extra, generic-lens, incipit , microlens, microlens-ghc, polysemy-chronos, polysemy-conc , polysemy-log, polysemy-process, polysemy-resume, polysemy-time - , template-haskell, zeugma + , template-haskell }: mkDerivation { pname = "prelate"; - version = "0.6.0.0"; - sha256 = "1scwlszwk0gscxwlpn31k1iqillfy0agp0pqpxnfp1z1krma5mjj"; + version = "0.7.0.1"; + sha256 = "0xbl3677vj3lf1lkp1whvmh50vx9b78j30k4flddcrziyivrfm6z"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process - polysemy-resume polysemy-time template-haskell zeugma + polysemy-resume polysemy-time template-haskell ]; description = "A Prelude"; license = "BSD-2-Clause-Patent"; @@ -238122,8 +239702,8 @@ self: { pname = "prettyprinter-interp"; version = "0.2.0.0"; sha256 = "0ml068y49n0s6p0nq0qfv5dmpkpkbd9p06hkj582yn2a1h32x0ff"; - revision = "1"; - editedCabalFile = "0p820l7raf812kr66sk63fwg9y9r0wmwm70cg6mvqb4hzdcycwkh"; + revision = "3"; + editedCabalFile = "079c6ri9aahi4whnxzyh5d3nnawmjvn1kjkq6jdsnp96bflkkhv9"; libraryHaskellDepends = [ base prettyprinter string-interpolate template-haskell text ]; @@ -238401,14 +239981,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive_0_9_0_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, tagged, tasty, tasty-bench + , tasty-quickcheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.9.0.0"; + sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + benchmarkHaskellDepends = [ + base deepseq tasty-bench transformers + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-addr"; version = "0.1.0.2"; sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; - revision = "1"; - editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f"; + revision = "2"; + editedCabalFile = "1s18b6xm6906ldj8wd2b2j885xbgvf5mzabd4mpl1ic7a9205qgn"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = lib.licenses.bsd3; @@ -238485,25 +240090,48 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.7"; - sha256 = "0z3l1hcnqbzz14k3j4ylfh48v048l0y9waa6k447x8vqrkbrzm56"; + version = "0.10.1.8"; + sha256 = "1c91izq58s0v9z4p2kb91af179n4dagvwkqqp46fzvam6n2xcrw3"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector ]; testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; }) {}; + "primitive-extras_0_10_1_10" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.10"; + sha256 = "1b83m53dwd2wagqzf0sy6wzsh3kj8prwdkkh6xbm6x0sqmr5ky8l"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -238658,8 +240286,8 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.2"; sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; - revision = "1"; - editedCabalFile = "1kndcxl120bl0wzjjd8s2nxcw4qw5y3q6vzdqxn8p4xblk1vxajk"; + revision = "4"; + editedCabalFile = "0ya85xy2zs5fr3hb3hhhps34nrncj3ski7h2zc9d68i5zlhiacmf"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; @@ -239137,14 +240765,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_17_0" = callPackage + "process_1_6_18_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.17.0"; - sha256 = "01mzhfsj0zmqkaisciby0g28lvdj0w1qbggsp5wlr1jw1x74ap2c"; + version = "1.6.18.0"; + sha256 = "0zm3v2m95a7bsnndl1pvdj9a7gd4v84pb34rmgsqjkwpwi7lqpxa"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -239511,8 +241139,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "2"; - editedCabalFile = "0v595d8b2lv89nxyhgmzyp90i1h9vzlhbp6ry9gf99n7rdp525fw"; + revision = "3"; + editedCabalFile = "0a9i5gxa5ls17vj6blymfl63zndk887mylc4k7bzj014xl177hsg"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -242253,8 +243881,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.10"; - sha256 = "08pashk8pm4yjsaq2g94sqa2yd3rfq9fwpxa9qccvjv6in9zybf1"; + version = "0.15.12"; + sha256 = "0rsllqg7k7xkgda1j2vk6sfb9k18vp6d16xwkz4bhjsakrl28dqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242454,24 +244082,26 @@ self: { }) {}; "purview" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover - , QuickCheck, raw-strings-qq, scotty, stm, text, time, wai - , wai-extra, wai-websockets, warp, websockets + ({ mkDerivation, aeson, base, blaze-builder, bytestring, hspec + , hspec-discover, http-types, QuickCheck, raw-strings-qq, stm + , template-haskell, text, time, wai, wai-websockets, warp + , websockets }: mkDerivation { pname = "purview"; - version = "0.1.0.0"; - sha256 = "1h3nyr3ka38vg9ydraa6yh0xzhh0nasj3d40l0jsfrvj2xpr72di"; + version = "0.2.0.2"; + sha256 = "0lp4b1qj3bchn046ilnx7zzisw1ydsdwci76glrhca7sbnw992ww"; libraryHaskellDepends = [ - aeson base bytestring raw-strings-qq scotty stm text wai wai-extra - wai-websockets warp websockets + aeson base blaze-builder bytestring http-types raw-strings-qq stm + template-haskell text wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck raw-strings-qq scotty stm - text time wai wai-extra wai-websockets warp websockets + aeson base blaze-builder bytestring hspec http-types QuickCheck + raw-strings-qq stm template-haskell text time wai wai-websockets + warp websockets ]; testToolDepends = [ hspec-discover ]; - description = "Build server rendered, interactive websites"; + description = "A simple, fun way to build websites"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -243393,8 +245023,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.8"; - sha256 = "1f8ydz1s07p5817l746vxvsh8xprbkrffhmgv2wkqx61s05rc5ch"; + version = "0.9.9"; + sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -243567,8 +245197,8 @@ self: { pname = "quadratic-irrational"; version = "0.1.1"; sha256 = "11nksvr6wnbrphq3ymg93w2xpqw6in3j1qpgbl2f3x9bgiss2l7s"; - revision = "1"; - editedCabalFile = "0br41cjzrl08ma9kgnhh2vp3ixad0gvvvv9751wpc6chr7a59ic8"; + revision = "2"; + editedCabalFile = "1r6fjnjyncbcfvmgkfflmkmrs0gzr1a299pvnklh04bz1xgzbayy"; libraryHaskellDepends = [ arithmoi base containers integer-roots transformers ]; @@ -244009,8 +245639,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.5"; - sha256 = "1zpic6v03432hld44jldxh0j1fmb226qkgmjrydyybaxihkkkvj4"; + version = "0.1.7"; + sha256 = "09pdlp49ix56cnshscq1knmakwcgwjq1p24i2rf4yyfc8hkj3bfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244192,12 +245822,17 @@ self: { }) {}; "quickcheck-combinators" = callPackage - ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: + ({ mkDerivation, base, QuickCheck, unfoldable-restricted + , unit-constraint + }: mkDerivation { pname = "quickcheck-combinators"; - version = "0.0.5"; - sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; - libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; + version = "0.0.6"; + sha256 = "1ya5qryz8am1xzniq68lacpzf45g8f8wsb4dyq5q210mj367rx48"; + libraryHaskellDepends = [ + base QuickCheck unfoldable-restricted unit-constraint + ]; + description = "Simple type-level combinators for augmenting QuickCheck instances"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -244300,10 +245935,10 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.29.1"; - sha256 = "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"; - revision = "2"; - editedCabalFile = "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip"; + version = "0.3.30"; + sha256 = "07c4ipssd4q823x2biry43h182y3rg26yqsv14z4yiajmz9rlvmx"; + revision = "1"; + editedCabalFile = "0khr8jyxb0kxqmpi8sn7f0i89cwj4fq2chsygl4f02kflkji53dp"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -244823,8 +246458,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1.5"; - sha256 = "0j8mcn9616r40hdl0jy6mqac7i31mhlsgv421m1hc8pj1kabpc0i"; + version = "2.2"; + sha256 = "0ggqj7zl7ai1jn6jgb7y986f8vr76ln0dxn3nwbpgspvv6dngix8"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -245347,8 +246982,8 @@ self: { pname = "quotet"; version = "0.0.1.1"; sha256 = "16fwbf9q2ivpi3j7y26lsbqvwwk7vidjn6q9iz4x6sq8adhy45rz"; - revision = "2"; - editedCabalFile = "1czfh5jrrllpy9kgd2i2d5dx5rljz7k0ik9gdc3gw6qnlxkdnzni"; + revision = "3"; + editedCabalFile = "1k5lh7nk1yircafndxh4i4wl0jiblivlqrrqv5npc8r9d0sw3kf0"; libraryHaskellDepends = [ base mtl template-haskell th-compat ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; @@ -245431,8 +247066,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.7"; - sha256 = "1sx2p1xqash0737z0s5hg2848j9zf02941ksmwd7dlmfaz35x57h"; + version = "0.3.8"; + sha256 = "1l4lxha5c73855h19wpjk5l3vkkqz63rr4iicwilil92r4wrav51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -246026,6 +247661,8 @@ self: { pname = "random"; version = "1.2.1.1"; sha256 = "0xlv1k4sj87akwvj54kq4nrfkzi6qcz1941bf78pnkbaxpvp44iy"; + revision = "1"; + editedCabalFile = "12c7232yns0r38yxy72pvgq2zfj0yfwfi7lwc64cfp4x2n0zihg7"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest smallcheck stm tasty tasty-hunit @@ -246257,8 +247894,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.12"; - sha256 = "0iv8n0xar8sxw01inbvm05cy5ccmlaf0dd044zlcq0977ynaj8f9"; + version = "0.3.0.13"; + sha256 = "10mxlfwakkpkc7rdk5wx5955d7xipakka4vikbvhk9gyhvphvn5q"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -246555,8 +248192,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.2"; - sha256 = "1qhb6ijziq3g58qs3b22k1cg8601a4vd4vaka6cq0ny5x8x54b8v"; + version = "1.5.3"; + sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base data-functor-logistic distributive template-haskell @@ -247661,8 +249298,8 @@ self: { pname = "reactive-banana"; version = "1.3.2.0"; sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; - revision = "1"; - editedCabalFile = "0p8f47drw5cfjhds3rz7kwl5ljp3rnmir4b1ngfcic2ryzpacj53"; + revision = "2"; + editedCabalFile = "0kynywzvkxwcmmfaxq1fdacsi53ml4gf17rb7ibwvc29wngbbbp3"; libraryHaskellDepends = [ base containers deepseq hashable pqueue semigroups stm these transformers unordered-containers vault @@ -248378,7 +250015,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_20" = callPackage + "rebase_1_20_1_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -248387,8 +250024,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.20"; - sha256 = "17r3h5gvr9q6dp8h0vvgm60rn2yjikbrzb8q20xxymhynxh7s74x"; + version = "1.20.1.1"; + sha256 = "1fwshqfshqxdjfxb9flbch40mjdjqfc3vl7q1j9b1dcv7jfyjv0h"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -248762,6 +250399,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "recursion-schemes_5_2_2_5" = callPackage + ({ mkDerivation, base, comonad, containers, data-fix, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.2.2.5"; + sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; + libraryHaskellDepends = [ + base comonad containers data-fix free template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -249202,8 +250857,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "5"; - editedCabalFile = "18b7vr5gzj2739wlxdb0qyzl2sd5y67mmwvkm27vlzvzbff61lxn"; + revision = "6"; + editedCabalFile = "02l86v7s9z8by8ym770q2c0wsi2vsic7kvsdqwzxba8krz52kc1b"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -249507,6 +251162,8 @@ self: { pname = "reflection"; version = "2.1.7"; sha256 = "1z8mwkqb0ljxpc45hkj0jiyhjfl1frpxqhdnp0xm6w98n2l1ifvc"; + revision = "1"; + editedCabalFile = "011s5ci385yccv576d1mh0n7v5k2pbmqkx1swlb5sq1sk3qb7dgj"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base containers hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -249696,6 +251353,8 @@ self: { pname = "reflex-dom"; version = "0.6.3.1"; sha256 = "162nnk5vk115p06mlf0d3bsr295814jk6d61hi58k97axgrlb6sn"; + revision = "1"; + editedCabalFile = "188hri01svjh6f63a9iivzvfkda2mvnmvgwnm6nfbkd1ns88h0yd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249781,10 +251440,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.8.0.0"; - sha256 = "17zj8a7wmbf4019gb6m9bb4nybbqmbc11qydc8l9h9p3kavhbd0j"; - revision = "1"; - editedCabalFile = "0ysr37d3paqjgbri8xk98w1a98pdq8ak1p1ddn2dayvk1w2s8q9c"; + version = "0.8.1.0"; + sha256 = "1sapgw5rdjh4c28249l7gdvz8598a14hsilr06ivqbsidn5xazia"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive commutative-semigroups constraints containers @@ -250656,8 +252313,8 @@ self: { pname = "regex-base"; version = "0.94.0.2"; sha256 = "1w9fxad1dwi040r3db9i2cjhhrl86p3hngj13ixbcnqgb27l16bv"; - revision = "2"; - editedCabalFile = "1q1h2001s1mpsp0yvpfb63d59xxsbgzing0h7h5qwpppz49w6xis"; + revision = "4"; + editedCabalFile = "09wbpmii665rphflaxnlr78i8yyjc3x8wq68w1ak73rms7yb48h3"; libraryHaskellDepends = [ array base bytestring containers text ]; description = "Common \"Text.Regex.*\" API for Regex matching"; license = lib.licenses.bsd3; @@ -250855,8 +252512,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; - revision = "5"; - editedCabalFile = "0hc9833rwxq8g1x5bq0q4qwjp6w2qgs3fp7jpnlf6b7w5xvr72im"; + revision = "6"; + editedCabalFile = "1rlp866y6mcbgad2sa3qq9zw12np1h4jfc7c3yba5kmarblj4jid"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -250873,8 +252530,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "5"; - editedCabalFile = "0lsciwi4akvk6s6h69ga359lj7cnn6p2i6dmqsy5nvar8m22i0cn"; + revision = "6"; + editedCabalFile = "1rn3649yqqrbd177mbyk12gdpbm3kdzjgnjqxfv68crah237y08j"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -250922,8 +252579,8 @@ self: { pname = "regex-posix"; version = "0.96.0.1"; sha256 = "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7"; - revision = "2"; - editedCabalFile = "1f2n45hv9m7vsc7b7izkiavn56rwi2p3vy392601ak17qqnclyfl"; + revision = "3"; + editedCabalFile = "1zdrsydysxj9kgkzjq6pdvidsy4m2bwbx9s7ydr6df0cav66lvc1"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -250990,8 +252647,8 @@ self: { pname = "regex-tdfa"; version = "1.3.2.2"; sha256 = "1dvmplkhma32y68v4vvpbwmjbg3hzd7qhsyq6pim1fs68b2xaglk"; - revision = "1"; - editedCabalFile = "03jwla88hxzf7mpp1pimjcfwfbm0icr3wbp4cjibl10853v65x6d"; + revision = "2"; + editedCabalFile = "165gd2gr0x9d3yvdzp8hdiapwz3cgdfbai15zbqdy0cq312d3bwj"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -252087,10 +253744,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.0.0"; - sha256 = "0wqj5ipsm3wwl401q5c5w6q6q07qd825y2d10j3q9gqsvyrpgqfb"; - revision = "1"; - editedCabalFile = "1vbmqnahjkvv6wla19vd8pl2k8i0di54c1q37ahx02i4zmnwv6zr"; + version = "1.2.1.0"; + sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -253184,12 +254839,12 @@ self: { }) {}; "require-callstack" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "require-callstack"; - version = "0.1.0.0"; - sha256 = "0c51v7zyd8r7winsw7q5xvswk7r34awfyg471dnq4zq52rmwdvx5"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "15zy46r66qslmqpirydnzkqy8s241kzzp6wiqksi29gzipbzgha3"; + libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "Propagate HasCallStack with constraints"; license = lib.licenses.mit; @@ -253243,12 +254898,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_20" = callPackage + "rerebase_1_20_1_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.20"; - sha256 = "1p4sbhsyz251w7m9iq4wvqh4xbwcc7pm6q97wrh6h77zrj1yq1zj"; + version = "1.20.1.1"; + sha256 = "1rwqk72y0ky8xc3r5j1f04f8a7g37l8j5ybcadxf0wsbnhnz0lli"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -253407,8 +255062,8 @@ self: { pname = "resolv"; version = "0.2.0.2"; sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "2"; - editedCabalFile = "1pcprxb456s7l654l7rh2mx7ahxn0fjj8hqq1rjl08b29f50am8k"; + revision = "3"; + editedCabalFile = "0i9h81lrl0gdk6i1yrg2kqdx89fzr0wb29b6p7g2y3bnnmd2cs28"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -254835,8 +256490,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rhythmic-sequences"; - version = "0.4.0.0"; - sha256 = "095x356x585f3vszgfwrffvdd47c2gpqvmypssx9g727vz38sf0i"; + version = "0.4.1.0"; + sha256 = "0giigbk8wsai1w32db3lakgbh8h60fa83mzq2h3mr4i3gr1syxii"; libraryHaskellDepends = [ base ]; description = "Improved library to deal with rhythmicity of short sequences"; license = lib.licenses.mit; @@ -255133,6 +256788,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "richenv" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover + , QuickCheck, quickcheck-instances, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "richenv"; + version = "0.1.0.1"; + sha256 = "0jpj1xgwgw8lvah2jkmhvwiyx47n57bvayn5msyhqvrjsbdk90yk"; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck quickcheck-instances text + unordered-containers yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "Rich environment variable setup for Haskell"; + license = lib.licenses.mit; + }) {}; + "richreports" = callPackage ({ mkDerivation, ascetic, base, MissingH }: mkDerivation { @@ -255384,8 +257058,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.5.0"; - sha256 = "03aihavij5i0r1h5wvc9q1bdqzpc4kd7cz8rklvhwgblr8fzxnxw"; + version = "0.1.7.0"; + sha256 = "04493n596jgj49wx9jgvfpjsfnmd37dqh497b6lbm67cp4nxb9p5"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -255513,8 +257187,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20220128"; - sha256 = "01bmmz6l5fq825ni1dk5d38x0p8k5fw2ingc3gzj8yzjmhfwp318"; + version = "0.0.20230928"; + sha256 = "139cxdvb9lg0p9nkqkrwicsiwlhq8vphq6l1dhv8s6aia556w6kw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -256000,8 +257674,8 @@ self: { }: mkDerivation { pname = "rock"; - version = "0.3.1.1"; - sha256 = "0r6z9all4ynsam4z3ln0ad0zycfk6pxvwavfzr4icfwg5ifj01hi"; + version = "0.3.1.2"; + sha256 = "0zcqff2k3fnq1243lmznwvdrqy942i84q1xknwqqs9d060pyfsvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256041,26 +257715,6 @@ self: { }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage - ({ mkDerivation, base, bytestring, data-default, directory, hspec - , QuickCheck, resourcet, rocksdb, string-conversions, unliftio - }: - mkDerivation { - pname = "rocksdb-haskell-jprupp"; - version = "2.1.4"; - sha256 = "0c647kahnglwf881hd3ksan1p7j4m65s84wyw8i4jvikm4jzgqsh"; - libraryHaskellDepends = [ - base bytestring data-default directory resourcet unliftio - ]; - librarySystemDepends = [ rocksdb ]; - testHaskellDepends = [ - base bytestring data-default directory hspec QuickCheck resourcet - string-conversions unliftio - ]; - description = "Haskell bindings for RocksDB"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) rocksdb;}; - - "rocksdb-haskell-jprupp_2_1_6" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, hspec , QuickCheck, resourcet, rocksdb, unliftio }: @@ -256078,7 +257732,6 @@ self: { ]; description = "Haskell bindings for RocksDB"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage @@ -256577,6 +258230,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rose-trie" = callPackage @@ -256785,15 +258440,13 @@ self: { }: mkDerivation { pname = "rounded"; - version = "1.1"; - sha256 = "0hja4ak3qd80zg996jwyi1kndj2vfsp10vwr4wyrcvppzl4gj4a0"; - revision = "1"; - editedCabalFile = "02zrazan3ljalfy1cnr3d0cdw7n426k5wg5xkifk87vb8ds2wx1j"; + version = "1.1.1"; + sha256 = "0d3ybivsnd3ykxjss7aqby0b0qx8kjw07r7afqnicafmz2ccyzh4"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection ]; librarySystemDepends = [ gmp mpfr ]; - libraryPkgconfigDepends = [ mpfr ]; + libraryPkgconfigDepends = [ gmp mpfr ]; testHaskellDepends = [ base long-double ]; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = lib.licenses.bsd3; @@ -257217,8 +258870,8 @@ self: { }: mkDerivation { pname = "rrb-vector"; - version = "0.2.0.0"; - sha256 = "17lmf79dzynpw43ibs7xzq31bvim5wj7a91k5h3bdzwjwwh1sy0x"; + version = "0.2.0.1"; + sha256 = "05wg7nz9p3ipn9az37yvaw48gmhchfc9hnqrfbsrbr9jghvm536v"; libraryHaskellDepends = [ base deepseq indexed-traversable primitive ]; @@ -257960,31 +259613,35 @@ self: { }) {}; "rzk" = callPackage - ({ mkDerivation, aeson, alex, array, base, bifunctors, bytestring - , doctest, Glob, happy, mtl, optparse-generic, QuickCheck - , template-haskell, text + ({ mkDerivation, aeson, alex, array, base, bifunctors, BNFC + , bytestring, Cabal, co-log-core, data-default-class, directory + , doctest, filepath, Glob, happy, lens, lsp, lsp-types, mtl + , optparse-generic, process, QuickCheck, stm, template-haskell + , text, with-utf8, yaml }: mkDerivation { pname = "rzk"; - version = "0.5.4"; - sha256 = "1zyvhlncvibk50cm80wa9y6yrwk3wj50y80xhp7fjz5h88wvv04x"; - revision = "1"; - editedCabalFile = "193n0ix496s5jqha633n5siawmawskch5wil2jlls4kx97krw109"; + version = "0.6.7"; + sha256 = "1k7ngvdsn59q7b7j9q1cfm1r6vwxqhbaal7qnxy0r9y6vcc6ggxf"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - aeson array base bifunctors bytestring mtl optparse-generic - template-haskell text + aeson array base bifunctors bytestring co-log-core + data-default-class directory filepath Glob lens lsp lsp-types mtl + optparse-generic stm template-haskell text yaml ]; - libraryToolDepends = [ alex happy ]; + libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson array base bifunctors bytestring mtl optparse-generic - template-haskell text + array base bifunctors bytestring directory Glob mtl + optparse-generic template-haskell text with-utf8 yaml ]; + executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base bifunctors bytestring doctest Glob mtl - optparse-generic QuickCheck template-haskell text + array base bifunctors bytestring directory doctest Glob mtl + optparse-generic QuickCheck template-haskell text yaml ]; + testToolDepends = [ alex BNFC happy ]; description = "An experimental proof assistant for synthetic ∞-categories"; license = lib.licenses.bsd3; mainProgram = "rzk"; @@ -258242,6 +259899,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.4"; sha256 = "1xhyljfvf1zpr7gpi9xgqmi9xsiv5vcjz52gz65zyq4v1kaxhl9w"; + revision = "1"; + editedCabalFile = "1laifqnsvli7x74asal5l4qhsvgvc6hycjqmrg7qmmabsldjddwb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec transformers void ]; description = "Safe, consistent, and easy exception handling"; @@ -258623,8 +260282,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "7"; - editedCabalFile = "1haylxnkj7if9q2kmhp5cvb7xi68fk00q0nqjvfc0giih9mjr1ck"; + revision = "8"; + editedCabalFile = "03w9x2p5cnwngwl698p12vm62gbbd5n3ckw6p9hm0j177jdhsynr"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -259306,49 +260965,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lifted-async, microlens, microlens-th - , monad-control, monad-logger, mtl, optparse-applicative - , pretty-show, process, safe, safe-exceptions, stm - , string-interpolate, template-haskell, text, time, transformers - , transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.5.0"; - sha256 = "0bv18q6cpfm7f4yp71b6wgp8i4ikcwwp74kz6ih8pv5lgl59j2rj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lifted-async - microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_5_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, deepseq, directory, exceptions , filepath, free, haskell-src-exts, lifted-async, microlens @@ -259359,8 +260975,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.5.1"; - sha256 = "1a4frv835zvflycbnbasj6pygzbnnvpsxl3ahp247zxap7v9gkch"; + version = "0.1.5.2"; + sha256 = "0xran6qv8nfv4yw55pncd12z7843f25y4sc94s5dd26kpvn78kr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259389,7 +261005,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -259465,50 +261080,6 @@ self: { }) {}; "sandwich-webdriver" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, exceptions, filepath, http-client, http-client-tls - , http-conduit, lifted-base, microlens, microlens-aeson - , monad-control, monad-logger, mtl, network, process, random - , regex-compat, retry, safe, safe-exceptions, sandwich - , string-interpolate, temporary, text, time, transformers, unix - , unliftio, unordered-containers, vector, webdriver - }: - mkDerivation { - pname = "sandwich-webdriver"; - version = "0.2.3.0"; - sha256 = "1220apnh5kj1y41b129rvawcj9yp3lgdlbwysr11wmah6ya9awy9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random regex-compat retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix unliftio - unordered-containers vector webdriver - ]; - description = "Sandwich integration with Selenium WebDriver"; - license = lib.licenses.bsd3; - mainProgram = "sandwich-webdriver-exe"; - }) {}; - - "sandwich-webdriver_0_2_3_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, exceptions, filepath, http-client, http-client-tls , http-conduit, lifted-base, microlens, microlens-aeson @@ -259549,7 +261120,6 @@ self: { ]; description = "Sandwich integration with Selenium WebDriver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sandwich-webdriver-exe"; }) {}; @@ -259685,6 +261255,18 @@ self: { mainProgram = "sat-micro"; }) {}; + "sat-simple" = callPackage + ({ mkDerivation, base, containers, minisat, unliftio-core }: + mkDerivation { + pname = "sat-simple"; + version = "0.1.0.0"; + sha256 = "0w80zfhlh4w506iajkan09vi71q7rbxfl65vsglnwhxsk2kdk3nw"; + libraryHaskellDepends = [ base containers minisat unliftio-core ]; + testHaskellDepends = [ base containers ]; + description = "A high-level wrapper over minisat"; + license = lib.licenses.bsd3; + }) {}; + "satchmo" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, hashable, lens, minisat, mtl, process @@ -259919,15 +261501,19 @@ self: { }) {}; "sayable" = callPackage - ({ mkDerivation, base, bytestring, exceptions, prettyprinter, text + ({ mkDerivation, base, bytestring, exceptions, hspec, prettyprinter + , tasty, tasty-ant-xml, tasty-hspec, text }: mkDerivation { pname = "sayable"; - version = "1.1.1.0"; - sha256 = "0a44mx9mcjqx0mzrz3ppiwbn0gfcnrls4kczwppkh68lykbax68h"; + version = "1.2.2.0"; + sha256 = "0dmvdf8zs8sf4lwyjzryb2bszfzwgi0wbh232s41g35070sdhy5q"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; + testHaskellDepends = [ + base hspec prettyprinter tasty tasty-ant-xml tasty-hspec text + ]; description = "Data structures, classes and operators for constructing context-adjusted pretty output"; license = lib.licenses.isc; }) {}; @@ -260954,8 +262540,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "5"; - editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16"; + revision = "7"; + editedCabalFile = "1wkf63yiklpxgagvsq13ddvhg128l4yk50ajz2giclxl36mmb5wh"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -261188,6 +262774,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "scotty_0_20_1" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, cookie, data-default-class, directory + , exceptions, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, lucid, monad-control, mtl, network, regex-compat + , stm, text, time, transformers, transformers-base + , transformers-compat, unliftio, wai, wai-extra, warp, weigh + }: + mkDerivation { + pname = "scotty"; + version = "0.20.1"; + sha256 = "1770kj78zdi137pskiyx28id64vilmhylnkgy139pvxa95n8i6kd"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive cookie + data-default-class exceptions http-types monad-control mtl network + regex-compat stm text time transformers transformers-base + transformers-compat unliftio wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring directory hspec hspec-wai http-types + lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring lucid mtl text transformers weigh + ]; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -261980,9 +263597,7 @@ self: { executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; description = "Haskell bindings to SDL2_gfx"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl2-gfx-example"; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -262076,8 +263691,6 @@ self: { description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -262530,15 +264143,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_0_0" = callPackage + "secp256k1-haskell_1_0_1" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.0.0"; - sha256 = "0pg6kb9xd0ihxc2bfjisbhln85rfww71yy3kx7shh0qyi02q81s7"; + version = "1.0.1"; + sha256 = "02mk6w2hkvd008f4wyz67n2bqp63dckyixnk0brpfvk29vm9my9m"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -263050,6 +264663,8 @@ self: { pname = "semialign"; version = "1.3"; sha256 = "0v657hpbngbwygpmqz47dw7nwn5cbilf0khjdka8sjjqkwql73k2"; + revision = "1"; + editedCabalFile = "08sjh4vpkjc4mibrb34kn6rim7cbnsm57h383ycm5c6nl5ffzsbv"; libraryHaskellDepends = [ base containers hashable indexed-traversable indexed-traversable-instances semigroupoids tagged these @@ -263166,6 +264781,8 @@ self: { pname = "semigroupoids"; version = "6.0.0.1"; sha256 = "0d3rsxby1j4m0ak3v62jbjzw1f2n55qxnb2jsrgj1y5xj6c8m8vx"; + revision = "1"; + editedCabalFile = "1ia31jmv4m228j7mwcl58ala7z18d3iqygki3qv6akhi3i2kp8j7"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive foldable1-classes-compat hashable tagged @@ -264121,7 +265738,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "servant_0_20" = callPackage + "servant_0_20_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, constraints, deepseq, hspec , hspec-discover, http-api-data, http-media, http-types, mmorph @@ -264131,10 +265748,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.20"; - sha256 = "09vmz4jy6968hq8bf2b43bzpca8h8sps1h2xqf9y6wcarxbws1pi"; - revision = "3"; - editedCabalFile = "01d2dddk6yrck2fl38fisracrw3wnf26ldvy0m06fd7ilyw4fifb"; + version = "0.20.1"; + sha256 = "1s8vapj8qb8l5snjzxd63d9rvxwa1vw6g77cg8nynrzzppwp7xwl"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -264157,8 +265772,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.1.0"; - sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; + version = "0.3.1.1"; + sha256 = "037if4mgccbbi2n52dfvkn63sbcymvsj3a6njz1wk4gjb7rgsgrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -264169,9 +265784,7 @@ self: { ]; description = "Servant support for JuicyPixels"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "image-conversion"; - broken = true; }) {}; "servant-aeson-specs" = callPackage @@ -265746,6 +267359,8 @@ self: { pname = "servant-lucid"; version = "0.9.0.6"; sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; + revision = "1"; + editedCabalFile = "1b76mpiicbx9n062q7br0da6hbmwrbkkc881rh87l0snl03rzpmp"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -265868,8 +267483,8 @@ self: { pname = "servant-multipart"; version = "0.12.1"; sha256 = "1p55kb3zhq25ncp7wimhggssn68abfgsnlldk13rk1iajaj6y8y5"; - revision = "4"; - editedCabalFile = "0z4n3a1cdb082nwh3ig68wjk617cvwpq0n9ivsab55nvsr2wsm8q"; + revision = "5"; + editedCabalFile = "0pf761m9l6jnqhljjj4i6zr9il8r9ajpqfxzqjgjsnbsg6872ykg"; libraryHaskellDepends = [ base bytestring directory lens resourcet servant servant-docs servant-foreign servant-multipart-api servant-server @@ -265889,8 +267504,8 @@ self: { pname = "servant-multipart-api"; version = "0.12.1"; sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; - revision = "4"; - editedCabalFile = "0fgkmnfz0mgld1rwdli05kx2wfdxy5fv37i73v3xyx65hn9hfcy0"; + revision = "5"; + editedCabalFile = "05243nl7sbc7p5rvqssiqha1qv38a0qp0ppb227pg0x748xh7ai4"; libraryHaskellDepends = [ base bytestring servant text transformers ]; @@ -265906,10 +267521,8 @@ self: { }: mkDerivation { pname = "servant-multipart-client"; - version = "0.12.1"; - sha256 = "07haaf9nq96lfv2dhqf4319vl321f53v0mypbbg3swzb6rrfkw9h"; - revision = "3"; - editedCabalFile = "1jq89aizhkdivmgj9gispipf2mdyq1fnlq102lr5jm1vgrmfmbpx"; + version = "0.12.2"; + sha256 = "0djvbfc1yk8dzadav3lfrq99m7grcxxgxaifj8nc173yfdjdq4y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266044,8 +267657,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "4"; - editedCabalFile = "1x3pbd5bix864xiavhsq72965ffzalifix0hkdr5gahqfjk088dc"; + revision = "5"; + editedCabalFile = "0jy5yp7ag9783mw09dln0jkjgrhy7li4ilgcmydgl4d84izy3zhn"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -266227,8 +267840,8 @@ self: { }: mkDerivation { pname = "servant-prometheus"; - version = "1.0.0"; - sha256 = "1m4kb6k4idlr9j1p72w041inhx9c3srxxxrnfj8fpywji6adxili"; + version = "1.1.0"; + sha256 = "0sykw9b5pkrccf4kdggg941dpafjfxsh0854f0v92c3582nr5xbq"; libraryHaskellDepends = [ base clock ghc-prim hashable http-types prometheus-client servant text wai @@ -267131,8 +268744,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.5.5.0.0"; sha256 = "1sjgakdln2nx9ki13vk557rfqwqjksagl32q7y3m8mc9y9s80py7"; - revision = "1"; - editedCabalFile = "1gagm56yy19lbwkcfx9jz7lkhvqxka0xy5pzqks1k2kbz16v8vvs"; + revision = "2"; + editedCabalFile = "0a2d33cc1zw2l4r5ay7022qqf2kzld8rpsy66ky5k9xcpfwgxwn1"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -267150,8 +268763,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; - revision = "7"; - editedCabalFile = "157jdld3izr32m5fr2y7s8fw16hamh7hb8cm7ybry3fvmsj01zpc"; + revision = "8"; + editedCabalFile = "1bz2d1v43v0s41b547as0sarzfb3q4q20i15kgrlcbxvqdcrcbmk"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -267168,8 +268781,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.4"; sha256 = "04s4syfmnjwa52xqm29x2sfi1ka6p7fpjff0pxry099rh0d59hkm"; - revision = "5"; - editedCabalFile = "1yb32cgkhydc9gpr22yzqkgmf8d6kvgvb8ypsmp81aiq3v94r2ki"; + revision = "6"; + editedCabalFile = "1mqbhf6yfraqlriq7l6yvi5hkf93fdb6cwks6s6pyf9qxvd6pn5c"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -267186,8 +268799,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.4.1.22.3"; sha256 = "0ln2sz7ffhddk4dqvczpxb5g8f6bic7sandn5zifpz2jg7lgzy0f"; - revision = "5"; - editedCabalFile = "1jxsyi45892n4gg2ihhf66jarplvifm0hp66srzkc7lchhz9lzz2"; + revision = "6"; + editedCabalFile = "1p2086msm6zdlagb7l5zwm84cg8q74v10svw0q1hdjahn547n5zs"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -268876,7 +270489,6 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -269117,32 +270729,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, file-embed, ghc-prim, hspec - , HUnit, parsec, process, scientific, template-haskell, text - , th-lift, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.1.0"; - sha256 = "1qcz9v1dgpxfdn06zy1g064d7jmwadfz3b834n9rvmg5ssjd4n9z"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions file-embed ghc-prim parsec process scientific - template-haskell text th-lift time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - }) {}; - - "shakespeare_2_1_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, file-embed, ghc-prim, hspec , HUnit, parsec, process, scientific, template-haskell, text @@ -269165,7 +270751,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -272311,10 +273896,8 @@ self: { ({ mkDerivation, base, singletons, singletons-base }: mkDerivation { pname = "singleton-nats"; - version = "0.4.6"; - sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; - revision = "2"; - editedCabalFile = "044gxxa9j076p1g4vca4j8w5brx2qg5yqdvqjvmz6fv5kms4b8jd"; + version = "0.4.7"; + sha256 = "18n2p5cl75rl2afvq4qy3vilcvbyx8wz0qh4w4m9aqakk3lyv87i"; libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; @@ -272339,8 +273922,8 @@ self: { pname = "singletons"; version = "3.0.2"; sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; - revision = "1"; - editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy"; + revision = "2"; + editedCabalFile = "040hwa1r4vx64v62ffw2nfn29h91ns082zqc47jsp5ciwl69821p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -272369,15 +273952,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_2" = callPackage + "singletons-base_3_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.2"; - sha256 = "0m96dz9k5wls5m3vls65clws1yfd73skblv878yj06lw9nmwshy9"; + version = "3.3"; + sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -272426,14 +274009,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_2" = callPackage + "singletons-th_3_3" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.2"; - sha256 = "1r4m9h9wwq86lww3aq7jxzias78ix79kgnj24slaps848d7hhpkp"; + version = "3.3"; + sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -272721,6 +274304,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "size-based_0_1_3_2" = callPackage + ({ mkDerivation, base, dictionary-sharing, template-haskell + , testing-type-modifiers + }: + mkDerivation { + pname = "size-based"; + version = "0.1.3.2"; + sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + libraryHaskellDepends = [ + base dictionary-sharing template-haskell testing-type-modifiers + ]; + description = "Sized functors, for size-based enumerations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat @@ -273079,6 +274678,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -273613,6 +275214,23 @@ self: { license = lib.licenses.mit; }) {}; + "slave-thread_1_1_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, rerebase + , SafeSemaphore, stm-containers, tasty, tasty-hunit + }: + mkDerivation { + pname = "slave-thread"; + version = "1.1.0.3"; + sha256 = "02ydjlm87z75h44ci8iamidf63yjxrpal5bqaim6iy0ixdg13c5r"; + libraryHaskellDepends = [ + base deferred-folds focus foldl stm-containers + ]; + testHaskellDepends = [ rerebase SafeSemaphore tasty tasty-hunit ]; + description = "A fundamental solution to ghost threads and silent exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "sleep" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -273757,6 +275375,8 @@ self: { pname = "slist"; version = "0.2.1.0"; sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; + revision = "1"; + editedCabalFile = "0a3m4y2jy40xz7j4zgxj409nmhscz63yzikcqjgz1l9yl39i7437"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest Glob hedgehog hspec hspec-hedgehog @@ -275040,8 +276660,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "2"; - editedCabalFile = "0gpnjqvcgpbvv72m94q1qghs7dzrc10s0qdr71yar0zmv2j06pnj"; + revision = "3"; + editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -275300,8 +276920,8 @@ self: { pname = "snap-templates"; version = "1.0.0.2"; sha256 = "1gz410718j77plw4lx5l0ajgb6ics1nd6msdk88zj1lanbfwnz7l"; - revision = "1"; - editedCabalFile = "0p2vkq4d8wci18z7fqnhlz9k9zv5wgv1p95x5fcl0dafkyylgx41"; + revision = "2"; + editedCabalFile = "0iz7h7m4g8s126fqsnpcslpz6k2fznayzbn2zgb7s3fjl14fxnis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -277071,6 +278691,8 @@ self: { pname = "some"; version = "1.0.5"; sha256 = "0pwivkyhdndh9f79gsz5gx51if8wm3r8mvbkysz2pq5m77g7kpmh"; + revision = "1"; + editedCabalFile = "060vrbwlc4xrwkh92q3jkgdy7zjzrzlg2k0ll0wklxaph9siphzr"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -277119,8 +278741,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; - revision = "2"; - editedCabalFile = "0db36xhswrsc30cw5c5s7h6g1ykcb3bkjjnixaqqshxln6cwfsig"; + revision = "3"; + editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -277186,17 +278808,32 @@ self: { }) {}; "sorted-list" = callPackage - ({ mkDerivation, base, criterion, deepseq }: + ({ mkDerivation, base, criterion, deepseq, QuickCheck }: mkDerivation { pname = "sorted-list"; - version = "0.2.1.0"; - sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l"; + version = "0.2.1.2"; + sha256 = "0g4b8pcvqjx7qqrd4ga53n8ff2k0hcmkzj6wzq560i2lqiyzjpx5"; libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Type-enforced sorted lists and related functions"; license = lib.licenses.bsd3; }) {}; + "sorted-list_0_2_2_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.2.0"; + sha256 = "0dqgk1fxmk9z97wc5lii5rhalbjhfq6i9db95scj7g91lrv0zrrr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Type-enforced sorted lists and related functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sortee" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { @@ -277301,6 +278938,24 @@ self: { broken = true; }) {}; + "sound-change" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, mtl, parser-combinators, syb, template-haskell + }: + mkDerivation { + pname = "sound-change"; + version = "0.1.0.0"; + sha256 = "1xg9drlf5kaqkx3fyyvz386cwpdk7ynyypkalr7fxax0q0cmcs08"; + libraryHaskellDepends = [ + base containers megaparsec mtl parser-combinators syb + template-haskell + ]; + testHaskellDepends = [ base containers hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Apply sound changes to words"; + license = lib.licenses.mit; + }) {}; + "sound-collage" = callPackage ({ mkDerivation, base, comfort-array, comfort-fftw, containers , filepath, numeric-prelude, optparse-applicative, pathtype @@ -278687,6 +280342,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "split_0_2_4" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "split"; + version = "0.2.4"; + sha256 = "1crixdmpjzahfiwkkm995rj5ymnm60rknqy252dv23pks00f77vl"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Combinator library for splitting lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "split-channel" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -278751,10 +280419,8 @@ self: { }: mkDerivation { pname = "splitmix"; - version = "0.1.0.4"; - sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "2"; - editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; + version = "0.1.0.5"; + sha256 = "00ihw7vji8ydik7f5lk9iwj21j829lpl22wa4nqz2igg26b7mw4x"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -279183,15 +280849,19 @@ self: { }) {}; "sqids" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, split, text - , transformers + ({ mkDerivation, base, bytestring, containers, hspec, mtl, split + , text, transformers }: mkDerivation { pname = "sqids"; - version = "0.1.4.0"; - sha256 = "0nw5g8azgh4mw8nvvrryy8ck37xyv92p36rvpa73ickn5a20bp06"; - libraryHaskellDepends = [ base containers mtl text transformers ]; - testHaskellDepends = [ base containers hspec mtl split text ]; + version = "0.2.0.0"; + sha256 = "0sabrvwhzf9xvj9gwnwxjvg4f2qv7qgaabvl7nhrv12zxfjvh5jm"; + libraryHaskellDepends = [ + base bytestring containers mtl text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec mtl split text transformers + ]; description = "A small library that lets you generate YouTube-looking IDs from numbers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -279471,7 +281141,9 @@ self: { testHaskellDepends = [ base ]; description = "Initial project template from stack"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "sqsd-local"; + broken = true; }) {}; "squares" = callPackage @@ -280142,30 +281814,24 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , casa-client, casa-types, colour, conduit, conduit-extra - , containers, cryptonite, cryptonite-conduit, deepseq, directory - , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify - , generic-deriving, hackage-security, hashable, hi-file-parser + , casa-client, companion, conduit, conduit-extra, containers + , crypton, directory, echo, exceptions, extra, file-embed, filelock + , filepath, fsnotify, generic-deriving, ghc-boot, hi-file-parser , hpack, hpc, hspec, hspec-discover, http-client, http-client-tls - , http-conduit, http-download, http-types, memory, microlens - , mintty, mono-traversable, mtl, mustache, neat-interpolation - , network-uri, open-browser, optparse-applicative, pantry, path - , path-io, persistent, persistent-sqlite, persistent-template - , pretty, primitive, process, project-template, QuickCheck, random - , raw-strings-qq, retry, rio, rio-prettyprint, semigroups - , smallcheck, split, stm, streaming-commons, tar, template-haskell - , text, text-metrics, th-reify-many, time, tls, transformers - , typed-process, unicode-transforms, unix, unix-compat, unliftio - , unordered-containers, vector, yaml, zip-archive, zlib + , http-conduit, http-download, http-types, memory, microlens, mtl + , mustache, neat-interpolation, open-browser, optparse-applicative + , pantry, path, path-io, persistent, persistent-sqlite, pretty + , process, project-template, QuickCheck, random, raw-strings-qq + , rio, rio-prettyprint, split, stm, tar, template-haskell, text + , time, transformers, unix, unix-compat, unordered-containers + , vector, yaml, zlib }: mkDerivation { pname = "stack"; - version = "2.11.1"; - sha256 = "0qihckfj5p9xbq0d8xd9c7zy5jpdl2hrvcc0nq8x67k9a7vqwwx1"; - revision = "2"; - editedCabalFile = "11cjn404f7kmpmls01pq1j1xac838hv7x725fhvrz2w3fhphbbsp"; + version = "2.13.1"; + sha256 = "0qdhrm50g0gsyk2q7fxp40all42z3rn53qmfakc3qyj4p9rxdf20"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -280174,55 +281840,43 @@ self: { isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template random retry rio rio-prettyprint semigroups split - stm streaming-commons tar template-haskell text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template random rio rio-prettyprint split stm tar + template-haskell text time transformers unix unix-compat + unordered-containers vector yaml zlib ]; executableHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc http-client http-client-tls http-conduit - http-download http-types memory microlens mintty mono-traversable - mtl mustache neat-interpolation network-uri open-browser - optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template random retry rio rio-prettyprint semigroups split - stm streaming-commons tar template-haskell text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template random rio rio-prettyprint split stm tar + template-haskell text time transformers unix unix-compat + unordered-containers vector yaml zlib ]; testHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal casa-client casa-types colour - conduit conduit-extra containers cryptonite cryptonite-conduit - deepseq directory echo exceptions extra file-embed filelock - filepath fsnotify generic-deriving hackage-security hashable - hi-file-parser hpack hpc hspec http-client http-client-tls - http-conduit http-download http-types memory microlens mintty - mono-traversable mtl mustache neat-interpolation network-uri - open-browser optparse-applicative pantry path path-io persistent - persistent-sqlite persistent-template pretty primitive process - project-template QuickCheck random raw-strings-qq retry rio - rio-prettyprint semigroups smallcheck split stm streaming-commons - tar template-haskell text text-metrics th-reify-many time tls - transformers typed-process unicode-transforms unix unix-compat - unliftio unordered-containers vector yaml zip-archive zlib + aeson aeson-warning-parser ansi-terminal array async attoparsec + base base64-bytestring bytestring Cabal casa-client companion + conduit conduit-extra containers crypton directory echo exceptions + extra file-embed filelock filepath fsnotify generic-deriving + ghc-boot hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mtl mustache + neat-interpolation open-browser optparse-applicative pantry path + path-io persistent persistent-sqlite pretty process + project-template QuickCheck random raw-strings-qq rio + rio-prettyprint split stm tar template-haskell text time + transformers unix unix-compat unordered-containers vector yaml zlib ]; testToolDepends = [ hspec-discover ]; doCheck = false; @@ -280241,18 +281895,17 @@ self: { "stack-all" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd - , simple-cmd-args, text, unordered-containers + , simple-cmd-args, text }: mkDerivation { pname = "stack-all"; - version = "0.4.1"; - sha256 = "11s886069z75abp7x0iqvbjfn4hhkzjj5d0mxbljwcfw6v8mq8c4"; + version = "0.4.2"; + sha256 = "0rgdfbsakkmd1nhx2mhwqsnrkpvfv1fhplh3aza0fz548s2zpshl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base cached-json-file config-ini directory extra filepath http-query process simple-cmd simple-cmd-args text - unordered-containers ]; description = "CLI tool for building across Stackage major versions"; license = lib.licenses.bsd3; @@ -280767,6 +282420,8 @@ self: { ]; description = "Tools for curating Stackage bundles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stackage-install" = callPackage @@ -281009,6 +282664,7 @@ self: { ]; description = "Convert Stack files into Nix build instructions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stackage2nix"; }) {}; @@ -281043,27 +282699,28 @@ self: { "stackctl" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka , amazonka-cloudformation, amazonka-core, amazonka-ec2 - , amazonka-lambda, amazonka-sso, amazonka-sts, base, Blammo - , bytestring, cfn-flip, conduit, containers, envparse, errors - , exceptions, extra, filepath, Glob, hspec, hspec-golden, lens - , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck - , resourcet, rio, semigroups, text, time, transformers - , typed-process, unliftio, unordered-containers, uuid, yaml + , amazonka-lambda, amazonka-mtl, amazonka-sso, amazonka-sts, base + , Blammo, bytestring, cfn-flip, conduit, containers, envparse + , errors, exceptions, extra, filepath, Glob, hspec, hspec-golden + , lens, lens-aeson, monad-logger, mtl, optparse-applicative + , QuickCheck, resourcet, rio, semigroups, text, text-metrics, time + , transformers, typed-process, unliftio, unordered-containers, uuid + , yaml }: mkDerivation { pname = "stackctl"; - version = "1.5.0.0"; - sha256 = "1q60gi10aqr1f3baa02lg0r39gvvgqfdjr25pk2sy11n6dbcw19q"; + version = "1.6.0.0"; + sha256 = "0pb7w53zyq8kkczg6q29nkic8i5w2ma2hsvn0x0g8iq4i016c23c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation - amazonka-core amazonka-ec2 amazonka-lambda amazonka-sso - amazonka-sts base Blammo bytestring cfn-flip conduit containers - envparse errors exceptions extra filepath Glob lens lens-aeson - monad-logger mtl optparse-applicative QuickCheck resourcet rio - semigroups text time transformers typed-process unliftio - unordered-containers uuid yaml + amazonka-core amazonka-ec2 amazonka-lambda amazonka-mtl + amazonka-sso amazonka-sts base Blammo bytestring cfn-flip conduit + containers envparse errors exceptions extra filepath Glob lens + lens-aeson monad-logger mtl optparse-applicative QuickCheck + resourcet rio semigroups text text-metrics time transformers + typed-process unliftio unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -281158,12 +282815,12 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.0.1.0"; - sha256 = "13q0pf0vjh19w9sshxa45gbfmhv707sizx6mf5s35003654a0bxm"; + version = "0.1.0.1"; + sha256 = "1f4sk6j9dbnjrb3hjjj9gpbzs66mkmij208vqyvb4z284agfhzng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base64 blaze-html bytestring clay colourista containers + array base base64 blaze-html bytestring clay colourista cryptohash-sha1 dir-traverse directory extensions filepath ghc ghc-boot-th gitrev microaeson optparse-applicative pretty-simple process relude slist text tomland trial trial-optparse-applicative @@ -281704,8 +283361,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.16.2.0"; - sha256 = "1gsql118657j74v7r3yidzymzjvlcjvvs1pd37dg2lrz3xndyddk"; + version = "0.16.2.1"; + sha256 = "1r2ww0r7mki27830bfg3xf7s9pdv1yj4hdqncpc89xyil1lc1h57"; libraryHaskellDepends = [ aeson async base binary data-default-class deepseq dense-linear-algebra math-functions mwc-random parallel primitive @@ -282340,14 +283997,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_1_0" = callPackage + "stm_2_5_2_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.1.0"; - sha256 = "11c84d5qqvw2kfx6arw0vaf9h7pxwnyw8xvaf7fxjmhg4p8x16ib"; - revision = "1"; - editedCabalFile = "0wq35b8f0w577byhv0k1954pcy5bbv22w34qln0nlz62x8sgw1kr"; + version = "2.5.2.1"; + sha256 = "16xis3rj5i0qlr1nc8ybmcrjhhqc2mh4l4lblmi04k2x00aycas1"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -282454,6 +284109,28 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "stm-containers_1_2_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable + , list-t, quickcheck-instances, rerebase, stm-hamt, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-containers"; + version = "1.2.0.3"; + sha256 = "1cchysjykxiq3s85xaafxkz8kg1czygjs17jlk6ic3ihv2ybr34j"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t stm-hamt transformers + ]; + testHaskellDepends = [ + deferred-folds focus foldl free list-t quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Containers for STM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "stm-delay" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -282505,8 +284182,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.11"; - sha256 = "0dw5vrsc9dwbxnydibwlwhrrg2db2d2frlddw24nfhvydba12p3j"; + version = "1.2.0.13"; + sha256 = "0nbnh7ibdlcp0bw1jzmkdcq8ysdqz3f9143pd3yj635mp0dyxgya"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -282522,6 +284199,32 @@ self: { license = lib.licenses.mit; }) {}; + "stm-hamt_1_2_0_14" = callPackage + ({ mkDerivation, async, base, criterion, deferred-folds, focus + , free, hashable, list-t, primitive, primitive-extras, QuickCheck + , quickcheck-instances, random, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.0.14"; + sha256 = "0rhqndyy3xq3xn408r17zshvjkibjc2562yzxx5qmjq8qsnlnjxd"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t primitive + primitive-extras transformers + ]; + testHaskellDepends = [ + deferred-folds focus QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async criterion focus free random rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stm-incremental" = callPackage ({ mkDerivation, base, hspec, stm }: mkDerivation { @@ -282932,10 +284635,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.13.1"; - sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; - revision = "3"; - editedCabalFile = "0iwdlamw4fm49qfawx7xp9alvv94l6q1xqrqav9k1q6486m27q99"; + version = "0.2.13.2"; + sha256 = "03nq5930yjpdvnyh93pjxzh3xjsracnnzcyqc0j3yiwadggbjy35"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck semigroups syb transformers unsafe utility-ht @@ -282981,8 +284682,8 @@ self: { "store" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec + , clock, containers, contravariant, criterion, cryptohash-sha1 + , deepseq, directory, filepath, free, ghc-prim, hashable, hspec , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base , monad-control, mono-traversable, nats, network, primitive , resourcet, safe, smallcheck, store-core, syb, template-haskell @@ -282992,20 +284693,20 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.16"; - sha256 = "125n9jcqjcyk7ypky4i0fydy1msgn8ldrhyhclqp1w0p7s2wazsg"; + version = "0.7.18"; + sha256 = "1qvfh7j1k8gfkllbvln5kfi45n59690yfkzdlazmajji8d8mp8z0"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable nats network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void + bytestring containers contravariant cryptohash-sha1 deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq + bytestring clock containers contravariant cryptohash-sha1 deepseq directory filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell @@ -283016,8 +284717,8 @@ self: { benchmarkHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control + cryptohash-sha1 deepseq directory filepath free ghc-prim hashable + hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell text th-lift th-lift-instances th-orphans th-reify-many th-utilities time transformers @@ -283033,10 +284734,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4.4.4"; - sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; - revision = "1"; - editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g"; + version = "0.4.4.6"; + sha256 = "1b4yhznw2xzi6qmbahf6p2sl9l8d1af36687gpwygd12h71qv17d"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -283046,13 +284745,13 @@ self: { "store-streaming" = callPackage ({ mkDerivation, async, base, bytestring, conduit, free, hspec - , hspec-smallcheck, network, resourcet, smallcheck, store - , store-core, streaming-commons, text, transformers, void + , hspec-discover, hspec-smallcheck, network, resourcet, smallcheck + , store, store-core, streaming-commons, text, transformers, void }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.3"; - sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q"; + version = "0.2.0.5"; + sha256 = "07xpsa3m7vjlv01gfay23v5ycy8fcddv551vbgs5bkg8vn7a5gvk"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -283062,6 +284761,7 @@ self: { resourcet smallcheck store store-core streaming-commons text transformers void ]; + testToolDepends = [ hspec-discover ]; description = "Streaming interfaces for `store`"; license = lib.licenses.mit; }) {}; @@ -283511,6 +285211,8 @@ self: { pname = "streaming-commons"; version = "0.2.2.6"; sha256 = "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"; + revision = "1"; + editedCabalFile = "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm"; libraryHaskellDepends = [ array async base bytestring directory network process random stm text transformers unix zlib @@ -284019,8 +285721,8 @@ self: { pname = "streamly-fsnotify"; version = "1.1.1.0"; sha256 = "1xcw4rsrysh96d91wjmyzb5s7cls3rf0ilpv8dn525iqzv11fl3l"; - revision = "3"; - editedCabalFile = "14jr2rx2iwyv2ibyyaahgw9xchn14r12ikkrxykc7nw0c4211x3i"; + revision = "4"; + editedCabalFile = "0b7yjszv2xapxqfghhdi7129dvsmgkzgzd361ancmfhmbkxvwlz4"; libraryHaskellDepends = [ base filepath fsnotify semirings streamly text time ]; @@ -284250,6 +285952,8 @@ self: { pname = "strict"; version = "0.5"; sha256 = "1zd0d59dfr23n0yn1azxb0v05b1d85qjym11wg821mf2vsahjkrz"; + revision = "1"; + editedCabalFile = "0zfqrgw7wn56yfdk164w5bw87zid6pbp84qygnmdylarcnrxfmxx"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -284279,6 +285983,8 @@ self: { pname = "strict-base-types"; version = "0.8"; sha256 = "11cv7jbk37mmm3q6rjclw659qv9pav8f0aw8rbp3lj1sgfjyis9q"; + revision = "1"; + editedCabalFile = "1apyy4qi26d3j4chhd4csg1ymhvyajdvpq6hcs6mm9c2n20iw0yk"; libraryHaskellDepends = [ aeson base quickcheck-instances strict strict-lens ]; @@ -284308,6 +286014,8 @@ self: { pname = "strict-containers"; version = "0.2"; sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; + revision = "1"; + editedCabalFile = "0imlmrqsc3v341dvs5r9r6cynvn2szfy1a1ldxfs3axjzyszvsqv"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable primitive strict template-haskell unordered-containers vector @@ -284504,6 +286212,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-tuple_0_1_5_3" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hashable }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.5.3"; + sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; + libraryHaskellDepends = [ base bifunctors deepseq hashable ]; + testHaskellDepends = [ base ]; + description = "Strict tuples"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-tuple-lens" = callPackage ({ mkDerivation, base, lens, strict-tuple }: mkDerivation { @@ -285510,6 +287231,7 @@ self: { ]; description = "Structured editing Emacs mode for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "structured-haskell-mode"; maintainers = [ lib.maintainers.peti ]; }) {}; @@ -285688,42 +287410,7 @@ self: { broken = true; }) {}; - "stylish-haskell_0_14_3_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th - , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl - , optparse-applicative, random, regex-tdfa, strict, syb - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.14.3.0"; - sha256 = "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson mtl regex-tdfa syb text - ]; - executableHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson mtl optparse-applicative regex-tdfa strict syb text - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath ghc ghc-boot ghc-boot-th ghc-lib-parser-ex HsYAML - HsYAML-aeson HUnit mtl random regex-tdfa syb test-framework - test-framework-hunit text - ]; - description = "Haskell code prettifier"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "stylish-haskell"; - }) {}; - - "stylish-haskell" = callPackage + "stylish-haskell_0_14_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc, ghc-boot, ghc-boot-th , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl @@ -285754,10 +287441,11 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; }) {}; - "stylish-haskell_0_14_5_0" = callPackage + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc-lib-parser , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl @@ -285787,7 +287475,6 @@ self: { ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stylish-haskell"; }) {}; @@ -287526,8 +289213,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.5.0"; - sha256 = "0q642rv2mcb228b99qc7l94m8hrdw5zqby14jzblr6c4wwcahh5a"; + version = "0.10.7.0"; + sha256 = "0b783gir0zm248skrhjbnxn50wgyp9114lzn1ah5l047yr0cac63"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -287716,26 +289403,26 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base - , bytestring, containers, dlist, envparse, filepath, MonadRandom - , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck - , quickcheck-io, random, random-shuffle, safe, safe-coloured-text - , safe-coloured-text-terminfo, stm, svg-builder, sydtest-discover - , text, vector + , bytestring, containers, dlist, envparse, fast-myers-diff + , filepath, MonadRandom, mtl, optparse-applicative, path, path-io + , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle + , safe, safe-coloured-text, safe-coloured-text-terminfo, stm + , svg-builder, sydtest-discover, text, vector }: mkDerivation { pname = "sydtest"; - version = "0.15.1.0"; - sha256 = "0rviw43ks6rnl1m7wf8ffd70cnizz53svnsz2f9k69787xyqn6zb"; + version = "0.15.1.1"; + sha256 = "01p49ijq32qrls94fgdjay95c826x3yvi13k2l0izimww5fhw9pi"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers dlist - envparse filepath MonadRandom mtl optparse-applicative path path-io - pretty-show QuickCheck quickcheck-io random random-shuffle safe - safe-coloured-text safe-coloured-text-terminfo stm svg-builder text - vector + envparse fast-myers-diff filepath MonadRandom mtl + optparse-applicative path path-io pretty-show QuickCheck + quickcheck-io random random-shuffle safe safe-coloured-text + safe-coloured-text-terminfo stm svg-builder text vector ]; testHaskellDepends = [ - base bytestring path path-io QuickCheck random safe-coloured-text - stm text vector + base bytestring fast-myers-diff path path-io QuickCheck random + safe-coloured-text stm text vector ]; testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; @@ -287805,8 +289492,8 @@ self: { }: mkDerivation { pname = "sydtest-discover"; - version = "0.0.0.3"; - sha256 = "1q0lblsi9shad3kn4vlampfxjl4kq6h04lpf5a2xwwjjbhl40ns2"; + version = "0.0.0.4"; + sha256 = "1arg5451fvlfxs04ic22ivj424lpssbc5cgqxgl9kyhspxq77hcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287860,8 +289547,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.4.0.0"; - sha256 = "0li8h3mh2s4ga8cpb0phaqyx6q1lw2w58b6yhs3s16a8cqh58k7x"; + version = "0.4.0.1"; + sha256 = "1bw33c71ra3m1wslmmclqkwnac9vbi871qigir5y4fr1p2arjgrn"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -287900,8 +289587,8 @@ self: { }: mkDerivation { pname = "sydtest-persistent"; - version = "0.0.0.1"; - sha256 = "19shysqqn4dz33lgmlshnk1aksp8f9rnxmzzag2hmbrywbrjwr1q"; + version = "0.0.0.2"; + sha256 = "09pjw6gd3vhny0irhpi93zy7snklrh2fjalsj8xszjb8j6md7d5p"; libraryHaskellDepends = [ base bytestring mtl persistent sydtest text unliftio ]; @@ -287916,15 +289603,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.2.0.2"; - sha256 = "1lrps2avkhshipip85gv8v151j3gkwxg6lfbii0085s077f8in1m"; + version = "0.2.0.3"; + sha256 = "1srzasbr9f5gqfzsa4qjd65pk3jlpk0gslphynzzbp4kf6gmsvkj"; libraryHaskellDepends = [ - base monad-logger mtl persistent persistent-postgresql sydtest + base monad-logger mtl persistent-postgresql sydtest sydtest-persistent tmp-postgres ]; - testHaskellDepends = [ - base persistent persistent-postgresql sydtest - ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "An persistent-postgresql companion library for sydtest"; license = "unknown"; @@ -287938,13 +289623,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.2.0.2"; - sha256 = "17sb4q2lrdbi4d5h7gj5lwxszla5dbzs25ira2ddlgghs68bar3g"; + version = "0.2.0.3"; + sha256 = "1wc4sgfjljwvcb90d3a4ys5m88fd68mbzyl6f2jfjx55yn55rnyw"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-sqlite sydtest sydtest-persistent ]; - testHaskellDepends = [ base persistent persistent-sqlite sydtest ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; @@ -288024,20 +289709,18 @@ self: { "sydtest-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-client - , http-types, mtl, network, pretty-show, stm, sydtest - , sydtest-discover, text, time, wai, warp + , http-types, mtl, network, sydtest, sydtest-discover, text, time + , wai, warp }: mkDerivation { pname = "sydtest-wai"; - version = "0.2.0.0"; - sha256 = "1zyhgwi8vhjg7mahp98fjgvkhqvh6zwfw3pmhwk57raavzsg2ksb"; + version = "0.2.0.1"; + sha256 = "0fmgn8g9ka275qkanzrlqr4wqwjcq2a99yvkh4jz53vspyiml78q"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-types mtl network - pretty-show sydtest text time wai warp - ]; - testHaskellDepends = [ - base http-client http-types stm sydtest wai + sydtest text time wai warp ]; + testHaskellDepends = [ base http-client http-types sydtest wai ]; testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; @@ -288075,8 +289758,8 @@ self: { }: mkDerivation { pname = "sydtest-webdriver-screenshot"; - version = "0.0.0.1"; - sha256 = "0wh481za6x9bq4axazq6zpm0cgi98hsh4xiy02c90fxybzdk4mg9"; + version = "0.0.0.2"; + sha256 = "18qg09cagga87bs2yahb2cv78agg90548w8a6p27nxhyq9jzamd7"; libraryHaskellDepends = [ base bytestring JuicyPixels mtl path path-io sydtest sydtest-webdriver webdriver @@ -288125,8 +289808,8 @@ self: { }: mkDerivation { pname = "sydtest-yesod"; - version = "0.3.0.1"; - sha256 = "1sfq18n25qczhp24hz95spg4ppigajysg0if5ah0k96k1q3p3f51"; + version = "0.3.0.2"; + sha256 = "194qdvsfphc8paq9ap5fijphrin20zpr4g5nza8dpv7qkpb82znr"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers cookie exceptions http-client http-client-tls http-types mtl network @@ -288134,8 +289817,8 @@ self: { yesod-test ]; testHaskellDepends = [ - base bytestring conduit cookie http-client http-types monad-logger - mtl path path-io persistent persistent-sqlite QuickCheck sydtest + base bytestring conduit cookie http-client monad-logger mtl path + path-io persistent persistent-sqlite QuickCheck sydtest sydtest-persistent-sqlite sydtest-wai text yesod yesod-core ]; testToolDepends = [ sydtest-discover ]; @@ -289061,8 +290744,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "3"; - editedCabalFile = "0fgrj8a1cgnhcbdyhj478plaj68mrakk945cbpc9brxzcs835x0y"; + revision = "4"; + editedCabalFile = "0xacplyxilmrly1nxdiz42divjiky7lz5aq5lizn7ax2n0jy1sdg"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -289153,8 +290836,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "1.0"; - sha256 = "1kkn0rdwidwrrx27bzj3d6hk273fl1v88c6bdqvw0hy3lqmrfvzb"; + version = "1.1.0.1"; + sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289185,6 +290868,8 @@ self: { pname = "synthesizer-midi"; version = "0.6.1.2"; sha256 = "1xnpvk0mny8lbx17zdgl55wp86pqhfg9ckv41b3qd5vrki2dj6nc"; + revision = "1"; + editedCabalFile = "061dgdfrv1zrjpih29x50kpl57ghb3ys6wpra5ai9k0wxdpr9zqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290496,39 +292181,38 @@ self: { "tahoe-chk" = callPackage ({ mkDerivation, aeson, async, base, base32, base64-bytestring - , binary, bytestring, cereal, cipher-aes128, concurrency - , containers, crypto-api, cryptonite, directory, extra, fec - , filepath, hedgehog, megaparsec, memory, monad-loops - , network-byte-order, optparse-applicative, parser-combinators - , primitive, scientific, tagged, tasty, tasty-hedgehog, tasty-hunit - , temporary, text, tree-diff, utility-ht, vector, yaml + , binary, bytestring, concurrency, containers, cryptonite, deepseq + , directory, extra, fec, filepath, hedgehog, lens, megaparsec + , memory, network-byte-order, optparse-applicative + , parser-combinators, primitive, scientific, tasty, tasty-hedgehog + , tasty-hunit, temporary, text, tree-diff, utility-ht, vector, yaml }: mkDerivation { pname = "tahoe-chk"; - version = "0.1.0.2"; - sha256 = "18gbk1zk11nq08vfxqjb9ayf1k1vhic21mdp7v4fwxjrqkvxlwpr"; + version = "0.2.0.0"; + sha256 = "0lpap46y47czds1l9rf5b45rhqaigypq8w5jnmds8jhi90x5cjzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base32 base64-bytestring binary bytestring cereal - cipher-aes128 concurrency containers crypto-api cryptonite - directory extra fec filepath megaparsec memory monad-loops - network-byte-order parser-combinators primitive tagged text - tree-diff utility-ht + aeson async base base32 base64-bytestring binary bytestring + concurrency containers cryptonite deepseq directory extra fec + filepath lens megaparsec memory network-byte-order + parser-combinators primitive text tree-diff utility-ht ]; executableHaskellDepends = [ base base32 bytestring optparse-applicative text ]; testHaskellDepends = [ - aeson base base32 base64-bytestring binary bytestring cereal - cipher-aes128 containers crypto-api cryptonite directory fec - filepath hedgehog megaparsec scientific tagged tasty tasty-hedgehog - tasty-hunit temporary text tree-diff vector yaml + aeson base base32 base64-bytestring binary bytestring containers + cryptonite directory fec filepath hedgehog lens megaparsec memory + scientific tasty tasty-hedgehog tasty-hunit temporary text + tree-diff vector yaml ]; description = "The Tahoe-LAFS' Content-Hash-Key (CHK) cryptographic protocol"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "tahoe-chk-encrypt"; + broken = true; }) {}; "tahoe-directory" = callPackage @@ -290540,6 +292224,8 @@ self: { pname = "tahoe-directory"; version = "0.1.0.0"; sha256 = "1659q860y776bx39nw3x7afqdazs5b31b5p9asc3g7al697xl6li"; + revision = "1"; + editedCabalFile = "0f7djrfakakc8390qsy9n2c5lwwppjivvia5f0p96nw2279mkyd9"; libraryHaskellDepends = [ base bytestring megaparsec tahoe-capabilities tahoe-chk tahoe-ssk text @@ -290554,44 +292240,51 @@ self: { }) {}; "tahoe-great-black-swamp" = callPackage - ({ mkDerivation, aeson, async, base, base32, base32string - , base64-bytestring, binary, bytestring, cborg, cborg-json - , connection, containers, deriving-aeson, directory, filepath - , foldl, hspec, hspec-expectations, hspec-wai, http-api-data - , http-client, http-client-tls, http-media, http-types, megaparsec - , network-uri, optparse-applicative, primitive, QuickCheck - , quickcheck-instances, safe-exceptions, scientific, serialise - , servant, servant-client, servant-docs, servant-js, servant-server - , tahoe-chk, temporary, text, unordered-containers, utf8-string - , vector, wai, wai-extra, warp, warp-tls + ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base + , base32, base32string, base64, base64-bytestring, binary + , bytestring, cborg, cborg-json, connection, containers, cryptonite + , data-default-class, deriving-aeson, directory, filepath, foldl + , hspec, hspec-expectations, hspec-wai, http-api-data, http-client + , http-client-tls, http-media, http-types, http2, lens, megaparsec + , memory, network, network-simple-tls, network-uri + , optparse-applicative, primitive, QuickCheck, quickcheck-instances + , safe-exceptions, scientific, serialise, servant, servant-client + , servant-docs, servant-js, servant-server, tahoe-chk, temporary + , text, tls, unordered-containers, utf8-string, vector, wai + , wai-extra, warp, warp-tls, x509, x509-store, x509-validation + , yaml }: mkDerivation { pname = "tahoe-great-black-swamp"; - version = "0.3.0.1"; - sha256 = "16n8jv5pb0z8x3dczpcqq29lmn24irinh81p9m75qad88i8p3r57"; + version = "0.3.1.0"; + sha256 = "1317sa6jq4vb5nxd4n6i9h799p3i0ghxl866sfkrppay9pncblzq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base64-bytestring binary bytestring cborg - cborg-json containers deriving-aeson directory filepath foldl - http-api-data http-media http-types primitive safe-exceptions + aeson asn1-encoding asn1-types async base base64 base64-bytestring + binary bytestring cborg cborg-json connection containers cryptonite + data-default-class deriving-aeson directory filepath foldl + http-api-data http-client http-client-tls http-media http-types + http2 memory network network-uri primitive safe-exceptions scientific serialise servant-client servant-docs servant-server - text unordered-containers utf8-string vector wai warp warp-tls + text tls unordered-containers utf8-string vector wai warp warp-tls + x509 x509-store x509-validation ]; executableHaskellDepends = [ - aeson async base base32 base64-bytestring binary bytestring cborg - connection containers deriving-aeson directory filepath foldl - http-client http-client-tls http-types megaparsec network-uri - optparse-applicative primitive safe-exceptions serialise servant - servant-client servant-js tahoe-chk text unordered-containers - vector warp + aeson async base base32 binary bytestring cborg connection + containers deriving-aeson directory filepath foldl http-client + http-client-tls http-types lens megaparsec optparse-applicative + primitive safe-exceptions serialise servant servant-client + servant-js tahoe-chk text unordered-containers vector warp ]; testHaskellDepends = [ - aeson async base base32string binary bytestring cborg containers - deriving-aeson directory filepath foldl hspec hspec-expectations - hspec-wai http-types primitive QuickCheck quickcheck-instances - safe-exceptions serialise servant temporary text - unordered-containers vector wai-extra + aeson async base base32string base64 binary bytestring cborg + connection containers data-default-class deriving-aeson directory + filepath foldl hspec hspec-expectations hspec-wai http-client + http-types network network-simple-tls primitive QuickCheck + quickcheck-instances safe-exceptions serialise servant + servant-client temporary text tls unordered-containers vector + wai-extra warp warp-tls x509 x509-store yaml ]; description = "An implementation of the \"Great Black Swamp\" LAFS protocol"; license = lib.licenses.bsd3; @@ -290606,8 +292299,8 @@ self: { }: mkDerivation { pname = "tahoe-ssk"; - version = "0.2.1.0"; - sha256 = "1qkzkdqqyjh2qzkl03f3wg4xlpmb8n1hq95bmdqwx1212aap3qxx"; + version = "0.3.0.0"; + sha256 = "0ham4qgdva5md76mv4gy5gfaw55h9a509967r7cxbaxlz1f1gdj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -291024,8 +292717,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "6"; - editedCabalFile = "0c1659c2jiiibzv3r24mqjh4w7z93wxc3r332crshwvja07wpnv3"; + revision = "9"; + editedCabalFile = "1bp2ql3z5pyswq9095pfmhink1awgmnsch3ps99vziqq61jcvg1v"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -291283,7 +292976,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; + broken = true; }) {}; "taskpool" = callPackage @@ -291350,6 +293045,8 @@ self: { pname = "tasty"; version = "1.5"; sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; + revision = "1"; + editedCabalFile = "1r6jld0az8pyycsn6z5jxz7yrhyi4k2ahv442fcvw54q6c0i3j9d"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -291366,8 +293063,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.8"; - sha256 = "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"; + version = "1.1.9"; + sha256 = "00zgsd6jjfwasr69d0y781vhjr7d8p1jbaaz4pn75ljf33akd92l"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -291458,30 +293155,17 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.3.4"; - sha256 = "07nfm7wahfybnlazisf4xn70l25c4lzm190lpakwprdgmzmp3rjd"; - libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; - benchmarkHaskellDepends = [ base ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_3_5" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: mkDerivation { pname = "tasty-bench"; version = "0.3.5"; sha256 = "1xldjnm4wa16mcrrp09gi75c8n9b0pq9va3zf50m1smylhfh1hfw"; - revision = "1"; - editedCabalFile = "1q8yx3lm8wb75yn81rmxwi6d30xqcjkxdjjicfv5ipyb8xx0hnc6"; + revision = "2"; + editedCabalFile = "1paw2y3298519j7fkmq6gann4bmx0yynxb6nsfib11c6kg11djc1"; libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; benchmarkHaskellDepends = [ base ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-bench-fit" = callPackage @@ -291493,6 +293177,8 @@ self: { pname = "tasty-bench-fit"; version = "0.1"; sha256 = "0dn8zfiwrpw8f3q5lnb7n3rp5sazrfxbcfk3cffh7s55mgb74rbk"; + revision = "2"; + editedCabalFile = "1b779czhl7qh8ajagp13lvwrgmnbpvwyndn0rf0qmxq1bp6l2yj0"; libraryHaskellDepends = [ base containers deepseq infinite-list regression-simple tasty tasty-bench @@ -291526,28 +293212,17 @@ self: { }) {}; "tasty-coverage" = callPackage - ({ mkDerivation, base, filepath, hpc, tasty }: + ({ mkDerivation, base, containers, filepath, hpc, tasty }: mkDerivation { pname = "tasty-coverage"; - version = "0.1.2.0"; - sha256 = "1d302a16n06x61hlbi3654c808rij74rczpzarjq1mrna07fnh1f"; - libraryHaskellDepends = [ base filepath hpc tasty ]; + version = "0.1.3.0"; + sha256 = "00yzx1qw4bcdpa55ldjk2f284z2i46xlp8l6a9jpwcxndwv48raa"; + libraryHaskellDepends = [ base containers filepath hpc tasty ]; description = "Ingredient for tasty which generates per-test coverage reports"; license = lib.licenses.bsd3; }) {}; "tasty-dejafu" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "2.1.0.0"; - sha256 = "0pj7w81kcvbdk9fv10gwmjfivpa6a9m1ldvr9ck484lnb9684a9s"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_1_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -291556,7 +293231,6 @@ self: { libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -291725,8 +293399,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "1"; - editedCabalFile = "1mwg576azkwzv13rk72cnbag4823hwpr8zgcfcrvx8wx5ha2r55p"; + revision = "2"; + editedCabalFile = "0im9603m995svkb3bvdrr7w1k2xz34hlw3dyam1123264ff1ka7x"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -291819,6 +293493,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; + revision = "2"; + editedCabalFile = "17q4xwj2glc8d482r33kq472yhkx7nai987x80nw3ilmp942bxzd"; libraryHaskellDepends = [ base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -291853,17 +293529,6 @@ self: { }) {}; "tasty-hunit" = callPackage - ({ mkDerivation, base, call-stack, tasty }: - mkDerivation { - pname = "tasty-hunit"; - version = "0.10.0.3"; - sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"; - libraryHaskellDepends = [ base call-stack tasty ]; - description = "HUnit support for the Tasty test framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-hunit_0_10_1" = callPackage ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; @@ -291872,7 +293537,6 @@ self: { libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-hunit-adapter" = callPackage @@ -292188,24 +293852,6 @@ self: { }) {}; "tasty-rerun" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative, split - , stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; - version = "1.1.18"; - sha256 = "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"; - revision = "4"; - editedCabalFile = "1i2van23247h62sz94kjiyyb6xvz88z6kkjqqsbxi4m74pga27hn"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative split stm tagged tasty - transformers - ]; - description = "Rerun only tests which failed in a previous test run"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-rerun_1_1_19" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative, split , stm, tagged, tasty, transformers }: @@ -292213,13 +293859,14 @@ self: { pname = "tasty-rerun"; version = "1.1.19"; sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; + revision = "2"; + editedCabalFile = "01gliss91bx2xfpz4f99g82sqahir5g2rnwn531ccn8jp1m917di"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers ]; description = "Rerun only tests which failed in a previous test run"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-silver" = callPackage @@ -292230,10 +293877,10 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3.1.1"; - sha256 = "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"; + version = "3.3.1.2"; + sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; revision = "1"; - editedCabalFile = "0bnpygmlz5qbjymyngcn19bnhn57m2p6m62f0r8pmrs1q7h4l7aq"; + editedCabalFile = "1dzw6hvfxrbnfjb9b5ca6adbg3qbdh1rsbji4b3jm0hhgi40gkxr"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -292247,7 +293894,7 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-silver_3_3_1_2" = callPackage + "tasty-silver_3_3_1_3" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, silently, stm, tagged, tasty @@ -292255,8 +293902,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3.1.2"; - sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; + version = "3.3.1.3"; + sha256 = "1gg4jkcgc3xiw43bw09shylxgd1rkrynyap17zh0yfzd9jrk3i4v"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -292403,8 +294050,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.4"; - sha256 = "08a9zzzwq87p0bnb0x18xgqag2lfni9x6x74i8yrbb0b5pj22ixy"; + version = "0.1.0.5"; + sha256 = "12v1avr74zsaq2dnssbip7pc6qalh8w7ilqb5z8azplg6h83vh93"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -292435,8 +294082,8 @@ self: { pname = "tasty-wai"; version = "0.1.2.0"; sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg"; - revision = "1"; - editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c"; + revision = "2"; + editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -292490,8 +294137,8 @@ self: { ({ mkDerivation, base, lens, tax, time }: mkDerivation { pname = "tax-ato"; - version = "2023.1"; - sha256 = "0qh547w29ll5792dxsqa1vnkmwviamwrnq1kkr9p05ipgp5n5bh3"; + version = "2023.2"; + sha256 = "0gycqjcswlh5gcrxjrkcvib7af8w2n5biy9yrwzmd6hvd4dj97dz"; libraryHaskellDepends = [ base lens tax time ]; description = "Tax types and computations for Australia"; license = lib.licenses.agpl3Plus; @@ -293294,6 +294941,8 @@ self: { pname = "template"; version = "0.2.0.10"; sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; + revision = "1"; + editedCabalFile = "15i6342smkak53fycln810pq59qyb330f656l95kbxzx5zdpzz1r"; libraryHaskellDepends = [ base mtl text ]; description = "Simple string substitution"; license = lib.licenses.bsd3; @@ -293314,12 +294963,12 @@ self: { broken = true; }) {}; - "template-haskell_2_20_0_0" = callPackage + "template-haskell_2_21_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.20.0.0"; - sha256 = "05r8176xx3bivb473zdvsgndss8lna1g9xy55agkh4cir84mvgp4"; + version = "2.21.0.0"; + sha256 = "0p8f53dscddr513r8p3ljwyc1pa7n520prxb47bz8dj5mvjxm89d"; libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; @@ -293337,6 +294986,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9.3"; + sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Backward-compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -293478,6 +295139,38 @@ self: { license = lib.licenses.mit; }) {}; + "templatise" = callPackage + ({ mkDerivation, base, bytestring, Cabal-syntax, directory + , exceptions, extra, filepath, hspec, http-client, http-conduit + , mtl, network-uri, optparse-applicative, parsec, process, tasty + , tasty-golden, tasty-hspec, temporary, text, time + }: + mkDerivation { + pname = "templatise"; + version = "0.1.0.3"; + sha256 = "0fxwmvyr9rslr0jbji98xhz2zdk46xznnhavzfa0d3nl4kglkp1q"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal-syntax exceptions extra filepath http-client + http-conduit mtl network-uri optparse-applicative parsec process + text time + ]; + executableHaskellDepends = [ base filepath optparse-applicative ]; + testHaskellDepends = [ + base bytestring Cabal-syntax directory filepath hspec mtl + network-uri optparse-applicative process tasty tasty-golden + tasty-hspec temporary text + ]; + doHaddock = false; + description = "You can use template.hs to create a new Haskell GitHub repository."; + license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + mainProgram = "initialise"; + broken = true; + }) {}; + "tempo" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, ConfigFile , directory, filepath, http-conduit, MissingH, mtl, process @@ -294059,6 +295752,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox_1_1_0_2" = callPackage + ({ mkDerivation, base, termbox-bindings-hs }: + mkDerivation { + pname = "termbox"; + version = "1.1.0.2"; + sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; + libraryHaskellDepends = [ base termbox-bindings-hs ]; + description = "termbox"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-banana" = callPackage ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { @@ -294096,8 +295801,8 @@ self: { pname = "termbox-bindings-c"; version = "0.1.0"; sha256 = "1q7frripz88zgcfmx2lab2vrj19gywnskng07zf7icsj9j6bdwyw"; - revision = "1"; - editedCabalFile = "08qnbv5p0lys69qv0dcq896p47kvj770y4hvpqa7ywfm124fwcs3"; + revision = "2"; + editedCabalFile = "04hnf96p6n9fxczk2hbp53kl3gm06f8zx469nvzl48qjvcxhxc2i"; libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294109,8 +295814,8 @@ self: { pname = "termbox-bindings-hs"; version = "0.1.0"; sha256 = "07m6lp997skqp04a430ynsrzdpwcczblxawvlcbizffsznkmnl64"; - revision = "1"; - editedCabalFile = "19n2flldk0v6db6fipc4j2an0kyk3rw4229fmqd94kswy898cv6d"; + revision = "2"; + editedCabalFile = "0bpz5drzp1gfncbpsc9jjz6qyvjjn4c9w16ci79nj60zi7b5q9b5"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294131,6 +295836,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-tea_0_1_0_1" = callPackage + ({ mkDerivation, base, ki, termbox }: + mkDerivation { + pname = "termbox-tea"; + version = "0.1.0.1"; + sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki termbox ]; + description = "termbox + The Elm Architecture"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termcolor" = callPackage ({ mkDerivation, base, cli }: mkDerivation { @@ -295192,8 +296911,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8.2"; - sha256 = "0g004qg97wyvaw3zd47mlb1xclf8jniwgfmvd1q8m3y958np81qp"; + version = "0.12.8.3"; + sha256 = "0lmzvh0izx192h1gik9vfs24xp13mpw2bwagmdd57sr7gpyln9zp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295335,6 +297054,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ansi_0_3_0_1" = callPackage + ({ mkDerivation, base, text, text-builder-linear }: + mkDerivation { + pname = "text-ansi"; + version = "0.3.0.1"; + sha256 = "0iiq5zlcjh25mf9b4vlhyc1dwglwh8b03qj1wasbngzvmphvcy00"; + libraryHaskellDepends = [ base text text-builder-linear ]; + description = "Text styling for ANSI terminals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-ascii" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, deepseq , hashable, megaparsec, optics-core, optics-extra, template-haskell @@ -295384,6 +297115,24 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_7_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder-dev + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.7.1"; + sha256 = "1x2k1mwwwjbyc56c9dm454k24imwq17dym5pfbj33iqn9i4n7ki3"; + libraryHaskellDepends = [ base bytestring text text-builder-dev ]; + testHaskellDepends = [ + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-dev" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , isomorphism-class, QuickCheck, quickcheck-instances, rerebase @@ -295406,6 +297155,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_4_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes + , quickcheck-instances, rerebase, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.4.1"; + sha256 = "095kqq7wwnabfyj6380xy94a0v0d76mkwspdw8lj2m4ykq23agw1"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class QuickCheck + quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat quickcheck-classes quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench , tasty-quickcheck, text @@ -295599,8 +297372,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.8.0.2"; - sha256 = "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d"; + version = "0.8.0.4"; + sha256 = "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; libraryPkgconfigDepends = [ icu ]; @@ -295668,6 +297441,8 @@ self: { pname = "text-iso8601"; version = "0.1"; sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; + revision = "1"; + editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; libraryHaskellDepends = [ base integer-conversion text time time-compat ]; @@ -296045,8 +297820,8 @@ self: { pname = "text-short"; version = "0.1.5"; sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; - revision = "2"; - editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2"; + revision = "3"; + editedCabalFile = "1471cn6gd4kgqk4cr0nqcz8qq1qwbd8qyxg35klrx9ic334wjwww"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -296071,8 +297846,8 @@ self: { pname = "text-show"; version = "3.10.4"; sha256 = "0kjpl9wbvn5zcpwjyrvdnkcp260rizff598cmqh4py8225fl5bmz"; - revision = "1"; - editedCabalFile = "0ac5v51am20ni6ddkppzzhzynlnyn0d51gwxc47rmy8dsh22y72a"; + revision = "2"; + editedCabalFile = "1wwpgl9y775604ypx86p8kya4xsin7h9bl21b6ris74k6lnabsrz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -296094,30 +297869,32 @@ self: { "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.9.6"; - sha256 = "1xmifjcx52jpa3qlmd5v11x429kn5qm64k2a7ai1lwpmy3mvpa90"; + version = "3.9.7"; + sha256 = "1rxsg0i304wanzgd792nj7pgkmw3iq0n7pwsg27h55vi7kp2rmiw"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers unix unordered-containers - uuid-types vector xhtml + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml ]; testHaskellDepends = [ aeson base base-compat bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -296513,6 +298290,8 @@ self: { pname = "th-abstraction"; version = "0.6.0.0"; sha256 = "0c0sqn9bz2rgrqdfkricbs2p6vn7is89qcpqw7hvc00c3z56xsk9"; + revision = "1"; + editedCabalFile = "0z7cn1qcnkslajjqcma23sh0qglbpvb5y9bgbzfzqal1lak9z5fq"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -296679,22 +298458,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_15" = callPackage + "th-desugar_1_16" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction , th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.15"; - sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; + version = "1.16"; + sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat ]; testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-abstraction - th-orphans + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -297124,8 +298903,8 @@ self: { pname = "th-test-utils"; version = "1.2.1"; sha256 = "1vk5fj66w7smq4yc614ixh7s78n3djggpzcxmakyxfz01vz20gay"; - revision = "2"; - editedCabalFile = "0sjxy0v6g567n0vs8myi3vx0hbhhmd8k3jgjwsmp7zrvhzbfyw91"; + revision = "3"; + editedCabalFile = "1lacygmbb36ka1bd4kmi6mfjicpdzagf73433kjvqrk1316bayc0"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -297275,6 +299054,24 @@ self: { license = lib.licenses.mit; }) {}; + "theatre-dev" = callPackage + ({ mkDerivation, async, base, contravariant, hspec, rerebase, stm + , unagi-chan, vector + }: + mkDerivation { + pname = "theatre-dev"; + version = "0.0.1"; + sha256 = "0mvgbp5ba23gcjykki8x7wsdmdzqknm82rshf10rk9rc120jg5f6"; + libraryHaskellDepends = [ + async base contravariant stm unagi-chan vector + ]; + testHaskellDepends = [ hspec rerebase ]; + description = "Minimalistic actor library experiments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, mtl, relude, tasty, tasty-hunit, text, time @@ -297389,6 +299186,8 @@ self: { pname = "these"; version = "1.2"; sha256 = "1f6lmjmy3yl1d2ycfsfk7q4sd0m3zrrap2plc11pd47pnxs73vd8"; + revision = "1"; + editedCabalFile = "0vpcgbyrykzzyycwda8k6dcjvjcncrwlish4gkw2i80wi7v247h1"; libraryHaskellDepends = [ assoc base binary deepseq foldable1-classes-compat hashable ]; @@ -297402,6 +299201,8 @@ self: { pname = "these-lens"; version = "1.0.1.3"; sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; + revision = "1"; + editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; @@ -297413,8 +299214,8 @@ self: { pname = "these-optics"; version = "1.0.1.2"; sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; - revision = "2"; - editedCabalFile = "02nq13avrvv0vqvhn9pa8jsnkbi1d40644ig1w83rz64y092dbwk"; + revision = "3"; + editedCabalFile = "0srsap1s1vi96xbw9vzpk14jyxajqlpmwn1bw190qjqnilxkqg48"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; @@ -297665,16 +299466,13 @@ self: { }) {}; "threads" = callPackage - ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm - , test-framework, test-framework-hunit + ({ mkDerivation, base, concurrent-extra, HUnit, stm, test-framework + , test-framework-hunit }: mkDerivation { pname = "threads"; - version = "0.5.1.7"; - sha256 = "1l226792dqlp772aaxqr3qzz8yq72702g708k16gi8lrkfhgxxp0"; - revision = "1"; - editedCabalFile = "18xxmb0x8lr6c90jc1vv078jm932aia9hm722l5wxmwly4a2n4wp"; - setupHaskellDepends = [ base Cabal ]; + version = "0.5.1.8"; + sha256 = "17jaq8gn5p3pgvwvswam379vdmdcq2241n3kwy6mmrisa45db564"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit @@ -298041,6 +299839,8 @@ self: { pname = "thyme"; version = "0.4"; sha256 = "098kqmirzcllfpfsxivc42dsvvlih89xfzkmif8gjzcqiw6agx41"; + revision = "1"; + editedCabalFile = "0y7xc8q2n8lbfi0q4isj29w5qdy3bjlb8yywdyajjp9k1kp23vnr"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers deepseq hashable mtl old-locale profunctors QuickCheck random template-haskell text time @@ -298215,6 +300015,8 @@ self: { pname = "tidal"; version = "1.9.4"; sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; + revision = "2"; + editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -298501,8 +300303,8 @@ self: { pname = "time-compat"; version = "1.9.6.1"; sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; - revision = "5"; - editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx"; + revision = "6"; + editedCabalFile = "0lpv1x3q4j7h0rn9pjdcf8armvkdgzw905hkprgzb9h33bq1wqqp"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -299152,6 +300954,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "timer-wheel_1_0_0" = callPackage + ({ mkDerivation, atomic-primops, base, ki, primitive, random + , tasty-bench + }: + mkDerivation { + pname = "timer-wheel"; + version = "1.0.0"; + sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; + libraryHaskellDepends = [ atomic-primops base ki primitive ]; + testHaskellDepends = [ base ki random ]; + benchmarkHaskellDepends = [ base ki random tasty-bench ]; + description = "A timer wheel"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -300929,8 +302747,8 @@ self: { pname = "toml-reader"; version = "0.2.1.0"; sha256 = "1nq4f1a1gkm0xv1crq3fwp6xmr79kz6m4ls0nkj75mkcqk0mpd05"; - revision = "2"; - editedCabalFile = "13vd6wrm3nvlxnjyzlcqd7bylfznjxl5nv1f2b4yh004ii7vn7fk"; + revision = "3"; + editedCabalFile = "1q6fgn4xcssp1q819igbiihjhwfkb6jzaxsd5h35jr847lmw9mjw"; libraryHaskellDepends = [ base containers megaparsec parser-combinators text time ]; @@ -301258,6 +303076,18 @@ self: { broken = true; }) {}; + "toolbox" = callPackage + ({ mkDerivation, base, containers, template-haskell, time }: + mkDerivation { + pname = "toolbox"; + version = "0.5.0.0"; + sha256 = "1z6rcs85nykz92m59ny2xbj3w78ix6xxlmm1nvsigdn7fwq6kb0h"; + libraryHaskellDepends = [ base containers template-haskell time ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -301719,8 +303549,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.3.0"; - sha256 = "0gn07n03brkfab7c6sq3227k8b3i4v0k83lhxqxsgwz80i0mkx5i"; + version = "2.7.2"; + sha256 = "046pyd7mwhw5csisqvr38z6ipz2fyvajqfxbjl96anwi9g2pxlr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -302851,8 +304681,8 @@ self: { pname = "tree-diff"; version = "0.3.0.1"; sha256 = "1bkjsklsqxq8i8p3zx73pck4ca1kv21zjvn9xhbhz191gygprrj0"; - revision = "3"; - editedCabalFile = "1skq2bqfsj1f4hqy5cwm8k0a8bgqbdqspcxccismbgxxqqg60d22"; + revision = "4"; + editedCabalFile = "1m13fy6igixsjg02nx2hhlxmhy2isvx28b1wzmllsdd99lmdasy5"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -303436,6 +305266,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "trifecta" = callPackage @@ -303450,6 +305282,8 @@ self: { pname = "trifecta"; version = "2.1.3"; sha256 = "05jnq2q27ichv9x6g9dx7ljppy3mkyv8ppzb0ynmfmpkcbghpbrf"; + revision = "1"; + editedCabalFile = "1rgx5415y996vbpfpnkjf48hgfjvid6wbzhfq88zqf0j4kbi7m75"; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq fingertree ghc-prim @@ -304013,6 +305847,25 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.3.0.0"; + sha256 = "16px3ws0bzkzpf1hy7il40p7shv8w093fjim0rc1c45y40jp7p09"; + revision = "1"; + editedCabalFile = "1mqxayy3nh39lnmsdr7hsz6xlan95m05s49l0349s4724syflscz"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -304370,8 +306223,8 @@ self: { pname = "tuples"; version = "0.1.0.0"; sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; - revision = "1"; - editedCabalFile = "06ns2npjh487pbzq6f5iwqvl0n9a6d5fywlm032nj3mxdmaynj2j"; + revision = "2"; + editedCabalFile = "08d8f4svxfn6165438dvd4zh61wldrl7gsly8ip6x5svyvj3ygqb"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck @@ -304518,6 +306371,33 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "turtle_1_6_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, directory, doctest, exceptions, filepath, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, tasty, tasty-bench, tasty-hunit + , temporary, text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.6.2"; + sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions filepath foldl hostname managed optional-args + optparse-applicative process stm streaming-commons temporary text + time transformers unix unix-compat + ]; + testHaskellDepends = [ + base doctest filepath tasty tasty-hunit temporary + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Shell programming, Haskell-style"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -305489,8 +307369,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "5"; - editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m"; + revision = "6"; + editedCabalFile = "1992xb0qnn7jzc42q9dmkkqw0ddnz0cjl4anmga4dfc172pkxxgb"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -305706,8 +307586,8 @@ self: { ({ mkDerivation, base, persistent, text, type-level-kv-list }: mkDerivation { pname = "type-level-kv-list-persistent"; - version = "0.2.0.0"; - sha256 = "1n9niak3d4vnrpfsr7ydnbphlgviqwwzrnjg84grjx0rfm2ffxy2"; + version = "0.2.0.1"; + sha256 = "1rz68s1npb716ixkvq306yw5fm65ybkq5a9lzfginm3z5fhq8qh8"; libraryHaskellDepends = [ base persistent text type-level-kv-list ]; @@ -306242,8 +308122,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.5.2.2"; - sha256 = "17h6ig2phgdr5gq7pdswn50yjdqz7ci1nh4grwpz8m0qykkqj4v4"; + version = "0.5.2.3"; + sha256 = "0043a2nw5413ipixxf77k1c58h9ndrjh79v8cq46jw900qk4268z"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -306279,12 +308159,13 @@ self: { "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core + , hspec-discover, process, stm, temporary, transformers + , unliftio-core }: mkDerivation { pname = "typed-process"; - version = "0.2.11.0"; - sha256 = "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"; + version = "0.2.11.1"; + sha256 = "0j21v5ijnxkpwn9hng6achjypr1hnpfxkmjfvqssq6ynj6hdvifm"; libraryHaskellDepends = [ async base bytestring process stm transformers unliftio-core ]; @@ -306292,6 +308173,7 @@ self: { async base base64-bytestring bytestring hspec process stm temporary transformers unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; }) {}; @@ -306302,15 +308184,15 @@ self: { }: mkDerivation { pname = "typed-process-effectful"; - version = "1.0.0.0"; - sha256 = "08rp0nycr0yp9zplxjdgslg4z8imvdprv10zwn4085n02y7z2bd9"; + version = "1.0.0.1"; + sha256 = "1n3ba3jf48hc3w5y20k987aahz9pdzrqm54w0572x30ng3j8jic4"; libraryHaskellDepends = [ base bytestring effectful effectful-core typed-process ]; testHaskellDepends = [ base effectful effectful-core tasty tasty-hunit ]; - description = "A binding of the @typed-process@ library for the @effectful@ effect system"; + description = "A binding of the typed-process library for the effectful effect system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -306679,8 +308561,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.10.0.1"; - sha256 = "0ynmmxry5wqpjak0dj3pv6j0cpv8865v10s7bcr1sbbzr00nsci9"; + version = "0.10.1.1"; + sha256 = "11116iqgdpqpmzj0rjqg7bmfyg3zgvwp2ndh4q8m7cy9gcwab734"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -306920,8 +308802,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "3"; - editedCabalFile = "03viai54yr4m59vavvgf070q50nsnpwxnzjnj3sbbxxs1sg3ncpv"; + revision = "5"; + editedCabalFile = "0r1wbf0c0fpns8vyr2xrrkkclzjcy212zb9ldsrcxx7jyz5nr0jj"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -306947,8 +308829,8 @@ self: { pname = "tzdata"; version = "0.2.20230322.0"; sha256 = "1qir5cy2cyk4p923l3ibimvc0rn4h5pwx0wmjarx69bmxzm7jib7"; - revision = "1"; - editedCabalFile = "0xzpdsgzfqbhr5xk6k26rdkd18js08dc0vwbh2v3fbshf97nfr02"; + revision = "3"; + editedCabalFile = "05z8d4l8pizzrs3rldhn8abyfaf263mx25y2z5l34bcj006iqgnm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -306968,8 +308850,8 @@ self: { }: mkDerivation { pname = "tztime"; - version = "0.1.0.0"; - sha256 = "0d605i6q281cmr3zxrhh51cahlgc4v0sdbzzrzyjwzdnf8rhj5nl"; + version = "0.1.1.0"; + sha256 = "00jnfqmnqvg67wdc5h59a34sjfpbdwcscwgsbhm5488sn1201hm0"; libraryHaskellDepends = [ base deepseq directory filepath mtl safe-exceptions template-haskell text time time-compat tz @@ -307522,6 +309404,26 @@ self: { mainProgram = "ulid-exe"; }) {}; + "ulid-tight" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, hspec + , hspec-discover, primitive, random, template-haskell, text, time + }: + mkDerivation { + pname = "ulid-tight"; + version = "0.1"; + sha256 = "0gbf3xlzms9f3y1bbxmlgaccr1qwh3vypxzx4y0bd5z22d4l7g8h"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable primitive random + template-haskell text time + ]; + testHaskellDepends = [ + base binary hashable hspec primitive random text + ]; + testToolDepends = [ hspec-discover ]; + description = "Another ULID implementation with tight memory representation"; + license = lib.licenses.mit; + }) {}; + "una" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , io-storage, process @@ -307944,6 +309846,8 @@ self: { pname = "unfoldable"; version = "1.0.1"; sha256 = "1h1zps55adzhfsfq1bgwc235qywpad9z7rfqid81l4405pi5zw83"; + revision = "1"; + editedCabalFile = "1hl63gcidca977jbjj37vwkd96v4bjgvdpjm8xz33g8jcs7f9a8m"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -309321,6 +311225,8 @@ self: { pname = "universe-base"; version = "1.1.3.1"; sha256 = "0bbkwmvpnfwvgwxvj0j591l984icrpq2js974nm8ribrblqfzrx3"; + revision = "1"; + editedCabalFile = "12mjh2hsqghayxybpvzka7chxds2h342w584n8g7hmld3y7qmjg4"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -309333,8 +311239,8 @@ self: { pname = "universe-dependent-sum"; version = "1.3"; sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5"; - revision = "3"; - editedCabalFile = "0v4n1z9zrsxfbr4nc44qq446wzkg5wk490np7vaq8780ygdz50gy"; + revision = "4"; + editedCabalFile = "0jd55qf6is8gi06r1q0a5vg0vgvr994vc7ybd0kfcsp2ybpk8zvg"; libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; @@ -309364,8 +311270,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.3"; sha256 = "02fxra5g76dk2jpbvmj0mj5bylj4400fcp3np3s5d31qgsjh2sn6"; - revision = "2"; - editedCabalFile = "175fxp19cf6m6scy6nxh5kbc6cnv9sqa0i00ly6swjsy5vy986am"; + revision = "3"; + editedCabalFile = "02zv257ga1n4qzb2r97fpzblm28db04ws3d02fy1nlry9hcwk554"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -309394,8 +311300,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1.1"; sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4"; - revision = "3"; - editedCabalFile = "1skyr1b7jvlbphlnf373qx78qd41cz643cn7ssyncwbv30ndbs23"; + revision = "4"; + editedCabalFile = "0s6779rs0p0wrarn749rasifiij8x8mihbg8m6cgazs1cxpfykjd"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = lib.licenses.bsd3; @@ -309409,8 +311315,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "5"; - editedCabalFile = "0d0xsfjhb9vaama4l4qq41l02y2lv0ri917rzmxskp6zw0dvwa57"; + revision = "6"; + editedCabalFile = "04vj4sp5kk90ncln7mmm52pbwbvx8zpkxfvzzxk1jbf20bc7x83n"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -309471,19 +311377,17 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_2_0" = callPackage + "unix_2_8_3_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit - , time + , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.2.0"; - sha256 = "1z2dp2lakl07m2vjcxaljbb4p581b64r6w55lghpm2vsggqvf8fl"; - revision = "1"; - editedCabalFile = "1ljvvq4fc7nqiyk6zy5svqcds2xnb3lc419q266ivr2345hp59bj"; + version = "2.8.3.0"; + sha256 = "1asxibqs77gmgvqxigsf1mch3m4qgznfm1fpqhw0xh9fsil7ip59"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ - base bytestring filepath tasty tasty-hunit + base bytestring filepath tasty tasty-hunit tasty-quickcheck ]; description = "POSIX functionality"; license = lib.licenses.bsd3; @@ -309657,24 +311561,6 @@ self: { }) {}; "unix-time" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover - , old-locale, old-time, QuickCheck, template-haskell, time - }: - mkDerivation { - pname = "unix-time"; - version = "0.4.10"; - sha256 = "1g196sh2jj0mhk6jh9pmsrh06y6p8j5cd9x1wfqwfyx8rgw4njky"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring hspec old-locale old-time QuickCheck - template-haskell time - ]; - testToolDepends = [ hspec-discover ]; - description = "Unix time parser/formatter and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "unix-time_0_4_11" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, template-haskell, time }: @@ -309690,7 +311576,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unjson" = callPackage @@ -309731,6 +311616,50 @@ self: { mainProgram = "unlambda"; }) {}; + "unleash-client-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, http-client-tls + , http-media, mtl, servant, servant-client, text, time + , unleash-client-haskell-core, unliftio + }: + mkDerivation { + pname = "unleash-client-haskell"; + version = "0.6.0"; + sha256 = "1vl31yvcqrsq1j56hqi34qf280ibhv9rk9sfddkiw43qi58gs0v4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers http-client-tls http-media mtl servant + servant-client text time unleash-client-haskell-core + ]; + executableHaskellDepends = [ + base mtl servant-client text unleash-client-haskell-core unliftio + ]; + description = "Unleash feature toggle client"; + license = lib.licenses.mit; + mainProgram = "example"; + maintainers = [ lib.maintainers.evenbrenden ]; + }) {}; + + "unleash-client-haskell-core" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , containers, hspec, murmur3, random, text, text-show, time + , versions + }: + mkDerivation { + pname = "unleash-client-haskell-core"; + version = "0.10.0"; + sha256 = "0biki24hxvnvzd3zrvlb5f30nwlzzshm0sbajd2q55wpx98008fc"; + libraryHaskellDepends = [ + aeson base containers murmur3 random text text-show time versions + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring hspec text + ]; + description = "Unleash feature toggle client core"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.evenbrenden ]; + }) {}; + "unlift" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base }: mkDerivation { @@ -309955,8 +311884,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; - revision = "2"; - editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s"; + revision = "3"; + editedCabalFile = "1p9a2mvfbfz2d4cyr16b03bxvb6c4yj7k1ch601xwq1rkr1cla0w"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -310699,8 +312628,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; - revision = "2"; - editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"; + revision = "3"; + editedCabalFile = "007c8lv0x2p75f7m57c2hvp82i1c7jblwszbxaghba1xwi7jwhqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310991,8 +312920,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "9.0.1"; - sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg"; + version = "11.0.0"; + sha256 = "1qndb850ghicp0iyc4rpw6zz0ms18lj4zsclhzhyrnm60h85jin7"; libraryHaskellDepends = [ attoparsec-uri base exceptions mmorph monad-control monad-control-aligned monad-logger mtl path path-extra resourcet @@ -311752,8 +313681,8 @@ self: { pname = "uuid"; version = "1.3.15"; sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; - revision = "2"; - editedCabalFile = "06j1hk4alypnwd4v55w6lfm1jrsaqh85k350qmymw0sqbrd9rmx3"; + revision = "3"; + editedCabalFile = "089q2i4rmw8iqzjn2fif4yarnbb7gsnsa4c4zhl24l2hlyakymbx"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -311858,22 +313787,20 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder - , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text }: mkDerivation { pname = "uuid-types"; - version = "1.0.5"; - sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; - revision = "4"; - editedCabalFile = "08anv4hc75n1npjl4b8hrww97imgh6bsm1mfqn33n29ga84jcrp4"; + version = "1.0.5.1"; + sha256 = "0b6a5mvc6bc10lgiyfick9mnkdnlw8xj27dbbvx2pjdkh9lnvv0b"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random template-haskell text ]; testHaskellDepends = [ - base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit + base binary bytestring QuickCheck tasty tasty-hunit tasty-quickcheck template-haskell ]; description = "Type definitions for Universally Unique Identifiers"; @@ -312358,8 +314285,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.12.0.1"; - sha256 = "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w"; + version = "0.12.0.2"; + sha256 = "1a916c8pwxc89p4zib07hnfiwqvv16k9v1lqggpvc6xbglcqidi9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -312425,8 +314352,8 @@ self: { ({ mkDerivation, base, network-uri, validity }: mkDerivation { pname = "validity-network-uri"; - version = "0.0.0.0"; - sha256 = "01ni4i1i16p20s2yx5pqlk4yw1byki04wb4vafx57n84fyd629mp"; + version = "0.0.0.1"; + sha256 = "15y3bs6kglfdv3dzdiczl2jzq5krklv7wlap71b6gzddwlmzmglr"; libraryHaskellDepends = [ base network-uri validity ]; description = "Validity instances for URI"; license = lib.licenses.mit; @@ -312792,8 +314719,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "3"; - editedCabalFile = "0avlxhj4m8sb1b9rh203jsaapw6q55bpgy4jnhjyq6an8dhnsg9i"; + revision = "4"; + editedCabalFile = "0nmy4c95kss381n38by7li9x1ffgxz1bvyw0dh52xklbi7v144bh"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -313179,10 +315106,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.13.0.0"; - sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "5"; - editedCabalFile = "0j239l4jjjyxaly65fpyg8458k8srgnsy5kn8710c7hmqwl222qx"; + version = "0.13.1.0"; + sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -313202,8 +315127,8 @@ self: { pname = "vector-algorithms"; version = "0.9.0.1"; sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "2"; - editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk"; + revision = "3"; + editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -313625,8 +315550,8 @@ self: { pname = "vector-sized"; version = "1.5.0"; sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; - revision = "2"; - editedCabalFile = "1xck60sdci3vw39jp6qpbljhv06v43ih8bvxh6p40bwb6mxzn2wh"; + revision = "3"; + editedCabalFile = "1rj53ya87vnglqdnzfvb4w01k3g3wqkcc1i7ip2xryz6pw6vg18w"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -313770,8 +315695,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "4"; - editedCabalFile = "08pvbwy6cb2hb15wczqp9056rxj86f2kc972py4sj5adkmf9mzrj"; + revision = "5"; + editedCabalFile = "1mw2ssj6a772cvw2mf0r5qvz4blaq8k194p6bj0wnl1plr16r90b"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -314121,17 +316046,18 @@ self: { "versions" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , parser-combinators, tasty, tasty-hunit, text + , parser-combinators, tasty, tasty-hunit, template-haskell, text }: mkDerivation { pname = "versions"; - version = "6.0.1"; - sha256 = "1znrvdq2f1014pq0x16y264km4wbdy634xis2w5rhrdnp8l46ldy"; + version = "6.0.2"; + sha256 = "06wi1ir0h7jzcjgd1fq17ggjqh8zb3i3nyd79l0kdkjy7x39rysg"; libraryHaskellDepends = [ - base deepseq hashable megaparsec parser-combinators text + base deepseq hashable megaparsec parser-combinators + template-haskell text ]; testHaskellDepends = [ - base megaparsec microlens tasty tasty-hunit text + base megaparsec microlens tasty tasty-hunit template-haskell text ]; description = "Types and parsers for software version numbers"; license = lib.licenses.bsd3; @@ -314811,8 +316737,8 @@ self: { pname = "visualize-cbn"; version = "0.1.0.2"; sha256 = "1vlidljhy0ykflgf7k8gawlqazcrkvcs7r8wbv7h9x6wfnx0w334"; - revision = "2"; - editedCabalFile = "1c50m624jqyhr7hx75vsik2z2h3hj5f0jpim156hwiirdi266d9n"; + revision = "3"; + editedCabalFile = "0318c6m8226183wlx0hvkrzldvdfh9f358hz4xxfm28jg44i2vb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -315273,6 +317199,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_39" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, containers, deepseq, directory, filepath, microlens + , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.39"; + sha256 = "0x1j4m9gx8fdw651w6m49f91vjy98qkdxpr614z3nmf4sxzbpzp5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath microlens microlens-mtl microlens-th mtl + parsec stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -315354,8 +317305,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.5"; - sha256 = "0b2r0malnzalz0s59sa4ryyy1qg8ii886g15dhkmzcpz29yzwrc3"; + version = "3.26.1"; + sha256 = "0cfy3zgszbf56hw086fgprd45yh5hidrmbhsa07smy1r3rhynlda"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -315389,8 +317340,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10.2"; - sha256 = "1qn5k5p83p3lprksmscnb4ylychgfvfryvag9hkin3y2bzr8qwpm"; + version = "0.5.10.6"; + sha256 = "0xr9grpw0l7xhz2rs28kwdazvipghavcn3l6bcr1alb2axayv0rd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -315818,26 +317769,6 @@ self: { }) {}; "wai-feature-flags" = callPackage - ({ mkDerivation, aeson, base, bytestring, splitmix, text - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "wai-feature-flags"; - version = "0.1.0.6"; - sha256 = "1djmzcl6bdjdvljzjjgj3avr8cd0cbrfshj1zrhzf0829v4viq9s"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring splitmix text unordered-containers wai - ]; - executableHaskellDepends = [ base wai warp ]; - description = "Feature flag support for WAI applications"; - license = lib.licenses.bsd3; - mainProgram = "example-app"; - }) {}; - - "wai-feature-flags_0_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp }: @@ -315854,7 +317785,6 @@ self: { executableHaskellDepends = [ base wai warp ]; description = "Feature flag support for WAI applications"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example-app"; }) {}; @@ -315958,6 +317888,8 @@ self: { pname = "wai-handler-hal"; version = "0.2.0.0"; sha256 = "1skmwcs048h60nxq2wz2amaj148g1a6zk4vbnl17h6xi28s603lx"; + revision = "1"; + editedCabalFile = "0kdn4iv5fb0l4w4j2v4g9pyr2n56v4531k4xahysd2l034dyf6l7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -316502,8 +318434,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.6.2"; - sha256 = "18ay8ng3gmyn25iziwlw82z5vbbkc6pgp5d0iz29qmc2lm6y6wgw"; + version = "0.7.0"; + sha256 = "1gh4fgc9c4cy32ifq7wxmxk3px2827bji7159xmh06n41c1bv14s"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -316856,8 +318788,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.2"; sha256 = "1ynm0xcr3pj5bbph78p1kpyxvd0n3a0gfdbm6yb7i004ixaqf33c"; - revision = "3"; - editedCabalFile = "055n8krn781qd7mb4lclkfkhw43flkvkg93bpljj1b23wnaaxxf9"; + revision = "4"; + editedCabalFile = "0kmy18qq2mc5mlmnx6xaj1wkk63jl0s4fn16zbd6cyb6jb8n2lq4"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash-sha1 directory expiring-cache-map filepath http-types mime-types @@ -317950,15 +319882,15 @@ self: { license = lib.licenses.mit; }) {}; - "warp-tls_3_4_2" = callPackage + "warp-tls_3_4_3" = callPackage ({ mkDerivation, base, bytestring, data-default-class, network , recv, streaming-commons, tls, tls-session-manager, unliftio, wai , warp }: mkDerivation { pname = "warp-tls"; - version = "3.4.2"; - sha256 = "0aarqazsfihz8qd2kjkg6b0g2li2k72423n7sb3ff8mdkblh7zri"; + version = "3.4.3"; + sha256 = "1fldcdd7x2r1vl7qjycrlfwk10z58ap15najlbfdfa1lnvwc50jd"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -318917,8 +320849,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.7.0.0"; - sha256 = "18zhmdq53pkcg5c86fgjb7z6kql9f1bs33grgf714299vrl4dfak"; + version = "0.8.0.0"; + sha256 = "1qsywsshgj270zpzw5x5ljdmfy7v8vb8fmdqap118g4sci3ir3b8"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -319905,8 +321837,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.3.1"; - sha256 = "191bs505r33yhzb07vqk9rq16a5cajsh5rkg9h7k2c15v81mdc8s"; + version = "0.1.6.0"; + sha256 = "1f2vvhvm6r009c30rbb4b7sm57z1kvj9z9j5fwb8xzqqvkkc63hp"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -320151,8 +322083,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.5"; - sha256 = "02wl88sma18zhn1pav966kgldiwh942mws01qyp6nxgcx0p9i76s"; + version = "1.5.1"; + sha256 = "021i7ypxlz9lv0fkc1zkl4i6lydhy7jbq1w3565i8cdf4q7mlxrm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -320351,8 +322283,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "2"; - editedCabalFile = "1zq74zgh82zcxnn9knha6qn36k4sqm93mcck45h8pd6c7yzfc0jx"; + revision = "3"; + editedCabalFile = "13qxbck4ia474hlj1244awp2awjn3scppif3p1vwa3i92q6cf37g"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -321048,8 +322980,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; - revision = "1"; - editedCabalFile = "1qizgsiqsraj8w0qndcyw7grcmiylx63vp3lgw2dplchva8p3hp7"; + revision = "3"; + editedCabalFile = "1g6qbs7lc6ng873ql5gflg62acn3pzy17dvck2hbxj02fdnjxlbr"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -321934,23 +323866,22 @@ self: { "wraxml" = callPackage ({ mkDerivation, base, containers, data-accessor - , explicit-exception, HaXml, hxt, hxt-filter, polyparse, tagchup + , explicit-exception, HaXml, hxt, hxt-unicode, polyparse, tagchup , tagsoup, transformers, utility-ht, xml-basic }: mkDerivation { pname = "wraxml"; - version = "0.4.4.3"; - sha256 = "11b48rjpj2glm5bxg8mw9m73qfprb2a8gc57s06sh0n50295di2z"; + version = "0.5"; + sha256 = "1zzslycz4hzg2l3pma0yfwdnqf08cw14b1ac5lzjm4z548bhzg0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-accessor explicit-exception HaXml hxt - hxt-filter polyparse tagchup tagsoup transformers utility-ht + hxt-unicode polyparse tagchup tagsoup transformers utility-ht xml-basic ]; description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "wrecker" = callPackage @@ -322363,7 +324294,9 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "ws"; + broken = true; }) {}; "ws-chans" = callPackage @@ -322487,6 +324420,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -322575,6 +324510,8 @@ self: { pname = "wuerfelschlange"; version = "0.1"; sha256 = "1vgz6mz0cxc4hgp80v51qac306yikgixqwv1zcsjcnrmnz2qqy44"; + revision = "1"; + editedCabalFile = "17gh2xifinjj30mmknl63rffllysqlbdlcj7js9x6szb8scapdax"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -324581,8 +326518,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.4"; sha256 = "11aldkcd3lcxax42f4080127hqs1k95k84h5griwq27ig8gmbxdc"; - revision = "3"; - editedCabalFile = "0qfnwz5hfgzyw4a24jzgsshaipjm5bvybkz0gwpcw6zpid160p6n"; + revision = "4"; + editedCabalFile = "1b0426fb6nfb9rg118xnhn9m8fqayd23r09ybgr5r3sv0jgzjh2b"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -325303,6 +327240,8 @@ self: { pname = "xss-sanitize"; version = "0.3.7.2"; sha256 = "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"; + revision = "1"; + editedCabalFile = "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0"; libraryHaskellDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -326303,8 +328242,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.4"; - sha256 = "18h94h0pylgn4q6pzkhs3j5qchj9kafw09xh4kgdp2394b7xk4iy"; + version = "0.14.5"; + sha256 = "154k37qydkch91khxd52mfa6jv2k6gcxyiypcsnx3hcp88mfr9pm"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -326949,28 +328888,29 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form + ({ mkDerivation, aeson, attoparsec-aeson, authenticate, base + , base16-bytestring, base64-bytestring, binary, blaze-builder + , blaze-html, blaze-markup, bytestring, conduit, conduit-extra + , containers, cryptonite, data-default, email-validate, file-embed + , http-client, http-client-tls, http-conduit, http-types, memory + , network-uri, nonce, persistent, random, safe, shakespeare + , template-haskell, text, time, transformers, unliftio + , unliftio-core, unordered-containers, wai, yesod-core, yesod-form , yesod-persistent }: mkDerivation { pname = "yesod-auth"; - version = "1.6.11.1"; - sha256 = "01ljcqmn0s79a77ry25q4333ni4w5swacah3rwhnhhrd5xnv1jxx"; + version = "1.6.11.2"; + sha256 = "0yqyggdvfi0kg4qa0is3lqifz40kgyjll445yxcpv6m8vcd2r1a1"; libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent + aeson attoparsec-aeson authenticate base base16-bytestring + base64-bytestring binary blaze-builder blaze-html blaze-markup + bytestring conduit conduit-extra containers cryptonite data-default + email-validate file-embed http-client http-client-tls http-conduit + http-types memory network-uri nonce persistent random safe + shakespeare template-haskell text time transformers unliftio + unliftio-core unordered-containers wai yesod-core yesod-form + yesod-persistent ]; description = "Authentication for Yesod"; license = lib.licenses.mit; @@ -327315,6 +329255,8 @@ self: { pname = "yesod-auth-oauth2"; version = "0.7.1.1"; sha256 = "1giac751jkygddf09a1h75dd4qv6kjjw5992447k53m1j398dpbn"; + revision = "1"; + editedCabalFile = "10m6k53idxr968595780v29kv9sjrp5irzv4b4bi10n3dxg85lf3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -327596,28 +329538,28 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, entropy - , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit - , memory, monad-logger, mtl, network, parsec, path-pieces - , primitive, random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 + ({ mkDerivation, aeson, async, attoparsec-aeson, auto-update, base + , blaze-html, blaze-markup, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, entropy, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, memory, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.4"; - sha256 = "1r7jpilg42jn1hyg8wxg92jh496c9jhghkrxh8fi0x4rbrcswxj3"; + version = "1.6.24.5"; + sha256 = "08w8rd69hswj9swi8krbfc063hvnm3vvn5n5vlx025xrgy5jfky2"; libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq entropy fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 + aeson attoparsec-aeson auto-update base blaze-html blaze-markup + bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie deepseq entropy fast-logger + http-types memory monad-logger mtl parsec path-pieces primitive + random resourcet shakespeare template-haskell text time + transformers unix-compat unliftio unordered-containers vector wai + wai-extra wai-logger warp word8 ]; testHaskellDepends = [ async base bytestring clientsession conduit conduit-extra @@ -328918,8 +330860,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.15"; - sha256 = "16q4f1l3m4l8iy5vmaa8c0vm2iiqhpghf3kykymlh41xy96mqpn3"; + version = "1.6.16"; + sha256 = "12kvr7z81sfla7kc32iw9qsfhxps1mhairmwayi9x0vg6mxf7vs1"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive conduit containers cookie hspec-core @@ -330535,7 +332477,9 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -330600,7 +332544,9 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; + broken = true; }) {}; "zeromq4-simple" = callPackage @@ -330677,8 +332623,8 @@ self: { }: mkDerivation { pname = "zeugma"; - version = "0.8.1.0"; - sha256 = "0cgfz01cjdnj04i33rh62gzmdhl9x2f2hbr3nry8avvkl657spd3"; + version = "0.9.0.1"; + sha256 = "1idiinilcxw97fff6yq59a4472y8qy7b28gx2nnzsi6ajq9azazk"; libraryHaskellDepends = [ base chronos hedgehog incipit polysemy polysemy-chronos polysemy-test tasty tasty-expected-failure tasty-hedgehog diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix index fa6d2a20a9..f3a25e293d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix @@ -407,7 +407,9 @@ rec { self: super: let - haskellPaths = builtins.attrNames (builtins.readDir directory); + haskellPaths = + lib.filter (lib.hasSuffix ".nix") + (builtins.attrNames (builtins.readDir directory)); toKeyVal = file: { name = builtins.replaceStrings [ ".nix" ] [ "" ] file; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 753945ea6f..c39c934bed 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -625,4 +625,18 @@ in package-set { inherit pkgs lib callPackage; } self // { else pkg ) { }; + /* + Modify given Haskell package to force GHC to employ the LLVM + codegen backend when compiling. Useful when working around bugs + in a native codegen backend GHC defaults to. + + Example: + forceLlvmCodegenBackend tls + + Type: drv -> drv + */ + forceLlvmCodegenBackend = haskellLib.overrideCabal (drv: { + configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; + buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ]; + }); } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index fa0446148b..f78e333ae1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -7,6 +7,8 @@ # files. self: super: { + changelog-d = self.callPackage ../misc/haskell/changelog-d {}; + dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated @@ -36,4 +38,5 @@ self: super: { # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {}; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix index 50daaf1362..bde8daed6f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/package-list.nix @@ -10,12 +10,13 @@ let let version = pkg.version or ""; in - lib.optionalString (isPvpVersion version) + lib.optionalString (isPvpVersion version && (pkg.meta.hydraPlatforms or null) != lib.platforms.none) ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"''; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); in runCommand "hackage-package-list" { } # This command will make a join between all packages on hackage and haskellPackages.*. + # It ignores packages marked as broken (according to hydraPlatforms) # It creates a valid csv file which can be uploaded to hackage.haskell.org. # The call is wrapped in echo $(...) to trim trailing newline, which hackage requires. '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix b/third_party/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix new file mode 100644 index 0000000000..732b363158 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/clojure-tools.nix @@ -0,0 +1,15 @@ +# This file tracks the Clojure tools version required by babashka. +# See https://github.com/borkdude/deps.clj#deps_clj_tools_version for background. +# The `updateScript` provided in default.nix takes care of keeping it in sync, as well. +{ clojure +, fetchurl +}: +clojure.overrideAttrs (previousAttrs: { + pname = "babashka-clojure-tools"; + version = "1.11.1.1413"; + + src = fetchurl { + url = previousAttrs.src.url; + hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.bash b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.bash new file mode 100644 index 0000000000..9746fd02a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.bash @@ -0,0 +1,5 @@ +_bb_tasks() { + COMPREPLY=( $(compgen -W "$(bb tasks |tail -n +3 |cut -f1 -d ' ')" -- ${COMP_WORDS[COMP_CWORD]}) ); +} +# autocomplete filenames as well +complete -f -F _bb_tasks bb diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.fish b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.fish new file mode 100644 index 0000000000..36cf89fbce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.fish @@ -0,0 +1,9 @@ +function __bb_complete_tasks + if not test "$__bb_tasks" + set -g __bb_tasks (bb tasks |tail -n +3 |cut -f1 -d ' ') + end + + printf "%s\n" $__bb_tasks +end + +complete -c bb -a "(__bb_complete_tasks)" -d 'tasks' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.zsh b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.zsh new file mode 100644 index 0000000000..5082197405 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/completions/bb.zsh @@ -0,0 +1,6 @@ +_bb_tasks() { + local matches=(`bb tasks |tail -n +3 |cut -f1 -d ' '`) + compadd -a matches + _files # autocomplete filenames as well +} +compdef _bb_tasks bb diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix index 1ae30244b2..7f8281dd1d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix @@ -4,96 +4,116 @@ , removeReferencesTo , fetchurl , writeScript +, installShellFiles }: -buildGraalvmNativeImage rec { - pname = "babashka-unwrapped"; - version = "1.3.184"; +let + babashka-unwrapped = buildGraalvmNativeImage rec { + pname = "babashka-unwrapped"; + version = "1.3.186"; - src = fetchurl { - url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ="; - }; + src = fetchurl { + url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; + sha256 = "sha256-T7inTJHSnUySituU0fcgZ0xWjIY3yb8BlSakqym67ew="; + }; - graalvmDrv = graalvmCEPackages.graalvm-ce; + graalvmDrv = graalvmCEPackages.graalvm-ce; - executable = "bb"; + executable = "bb"; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo installShellFiles ]; - extraNativeImageBuildArgs = [ - "-H:+ReportExceptionStackTraces" - "--no-fallback" - "--native-image-info" - "--enable-preview" - ]; - - doInstallCheck = true; - - installCheckPhase = '' - $out/bin/bb --version | grep '${version}' - $out/bin/bb '(+ 1 2)' | grep '3' - $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' - ''; - - # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, - # not sure the implications of this but this file is not available in - # graalvm-ce anyway. - postInstall = '' - remove-references-to -t ${graalvmDrv} $out/bin/${executable} - ''; - - passthru.updateScript = writeScript "update-babashka" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -euo pipefail - - readonly latest_version="$(curl \ - ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -s "https://api.github.com/repos/babashka/babashka/releases/latest" \ - | jq -r '.tag_name')" - - # v0.6.2 -> 0.6.2 - update-source-version babashka "''${latest_version/v/}" - ''; - - meta = with lib; { - description = "A Clojure babushka for the grey areas of Bash"; - longDescription = '' - The main idea behind babashka is to leverage Clojure in places where you - would be using bash otherwise. - - As one user described it: - - I’m quite at home in Bash most of the time, but there’s a substantial - grey area of things that are too complicated to be simple in bash, but - too simple to be worth writing a clj/s script for. Babashka really - seems to hit the sweet spot for those cases. - - Goals: - - - Low latency Clojure scripting alternative to JVM Clojure. - - Easy installation: grab the self-contained binary and run. No JVM needed. - - Familiarity and portability: - - Scripts should be compatible with JVM Clojure as much as possible - - Scripts should be platform-independent as much as possible. Babashka - offers support for linux, macOS and Windows. - - Allow interop with commonly used classes like java.io.File and System - - Multi-threading support (pmap, future, core.async) - - Batteries included (tools.cli, cheshire, ...) - - Library support via popular tools like the clojure CLI - ''; - homepage = "https://github.com/babashka/babashka"; - changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - maintainers = with maintainers; [ - bandresen - bhougland - DerGuteMoritz - jlesquembre - thiagokokada + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "--no-fallback" + "--native-image-info" + "--enable-preview" ]; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/bb --version | fgrep '${version}' + $out/bin/bb '(+ 1 2)' | fgrep '3' + $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' + $out/bin/bb '(prn "bépo àê")' | fgrep 'bépo àê' + ''; + + # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, + # not sure the implications of this but this file is not available in + # graalvm-ce anyway. + postInstall = '' + remove-references-to -t ${graalvmDrv} $out/bin/${executable} + installShellCompletion --cmd bb --bash ${./completions/bb.bash} + installShellCompletion --cmd bb --zsh ${./completions/bb.zsh} + installShellCompletion --cmd bb --fish ${./completions/bb.fish} + ''; + + passthru.updateScript = writeScript "update-babashka" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq libarchive + + set -euo pipefail + shopt -s inherit_errexit + + latest_version="$(curl \ + ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -fsL "https://api.github.com/repos/babashka/babashka/releases/latest" \ + | jq -r '.tag_name')" + + if [ "$(update-source-version babashka-unwrapped "''${latest_version/v/}" --print-changes)" = "[]" ]; then + # no need to update babashka.clojure-tools when babashka-unwrapped wasn't updated + exit 0 + fi + + clojure_tools_version=$(curl \ + -fsL \ + "https://github.com/babashka/babashka/releases/download/''${latest_version}/babashka-''${latest_version/v/}-standalone.jar" \ + | bsdtar -qxOf - borkdude/deps.clj \ + | ${babashka-unwrapped}/bin/bb -I -o -e "(or (some->> *input* (filter #(= '(def version) (take 2 %))) first last last last) (throw (ex-info \"Couldn't find expected '(def version ...)' form in 'borkdude/deps.clj'.\" {})))") + + update-source-version babashka.clojure-tools "$clojure_tools_version" \ + --file="pkgs/development/interpreters/babashka/clojure-tools.nix" + ''; + + meta = with lib; { + description = "A Clojure babushka for the grey areas of Bash"; + longDescription = '' + The main idea behind babashka is to leverage Clojure in places where you + would be using bash otherwise. + + As one user described it: + + I’m quite at home in Bash most of the time, but there’s a substantial + grey area of things that are too complicated to be simple in bash, but + too simple to be worth writing a clj/s script for. Babashka really + seems to hit the sweet spot for those cases. + + Goals: + + - Low latency Clojure scripting alternative to JVM Clojure. + - Easy installation: grab the self-contained binary and run. No JVM needed. + - Familiarity and portability: + - Scripts should be compatible with JVM Clojure as much as possible + - Scripts should be platform-independent as much as possible. Babashka + offers support for linux, macOS and Windows. + - Allow interop with commonly used classes like java.io.File and System + - Multi-threading support (pmap, future, core.async) + - Batteries included (tools.cli, cheshire, ...) + - Library support via popular tools like the clojure CLI + ''; + homepage = "https://github.com/babashka/babashka"; + changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.epl10; + maintainers = with maintainers; [ + bandresen + bhougland + DerGuteMoritz + jlesquembre + thiagokokada + ]; + }; }; -} +in +babashka-unwrapped diff --git a/third_party/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix b/third_party/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix index e82e56067c..29468265eb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix @@ -1,11 +1,12 @@ { stdenvNoCC , lib , babashka-unwrapped -, clojure +, callPackage , makeWrapper +, installShellFiles , rlwrap - -, jdkBabashka ? clojure.jdk +, clojureToolsBabashka ? callPackage ./clojure-tools.nix { } +, jdkBabashka ? clojureToolsBabashka.jdk # rlwrap is a small utility to allow the editing of keyboard input, see # https://book.babashka.org/#_repl @@ -18,31 +19,41 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "babashka"; - inherit (babashka-unwrapped) version meta doInstallCheck installCheckPhase; + inherit (babashka-unwrapped) version meta doInstallCheck; dontUnpack = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = let unwrapped-bin = "${babashka-unwrapped}/bin/bb"; in '' mkdir -p $out/clojure_tools - ln -s -t $out/clojure_tools ${clojure}/*.edn - ln -s -t $out/clojure_tools ${clojure}/libexec/* + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/* makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ --inherit-argv0 \ --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ - --set-default DEPS_CLJ_TOOLS_VERSION ${clojure.version} \ --set-default JAVA_HOME ${jdkBabashka} + installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/zsh/site-functions/_bb '' + lib.optionalString withRlwrap '' substituteInPlace $out/bin/bb \ --replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"' ''; + installCheckPhase = '' + ${babashka-unwrapped.installCheckPhase} + # Needed for Darwin compat, see https://github.com/borkdude/deps.clj/issues/114 + export CLJ_CONFIG="$TMP/.clojure" + $out/bin/bb clojure --version | grep -wF '${clojureToolsBabashka.version}' + ''; + passthru.unwrapped = babashka-unwrapped; + passthru.clojure-tools = clojureToolsBabashka; }) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix index ac6257164c..127541c727 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -29,6 +29,7 @@ , x11Support ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) , dllSupport ? true , withModules ? [ + "asdf" "pcre" "rawsock" ] @@ -41,6 +42,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null let ffcallAvailable = stdenv.isLinux && (libffcall != null); + # Some modules need autoreconf called in their directory. + shouldReconfModule = name: name != "asdf"; in stdenv.mkDerivation { @@ -92,7 +95,7 @@ stdenv.mkDerivation { cd modules/${x} autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" ) - '') withModules); + '') (builtins.filter shouldReconfModule withModules)); configureFlags = [ "builddir" ] ++ lib.optional (!dllSupport) "--without-dynamic-modules" @@ -110,6 +113,8 @@ stdenv.mkDerivation { cd builddir ''; + doCheck = true; + postInstall = lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix index 7766326622..fe11d552a8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.6"; - sha256 = "sha256-eRwyqylldsJOsGAwm61m7jX1yrVDrTPS0qO23lJkcKc="; + version = "1.15.7"; + sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix index da1ab11a52..c66d829433 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.13"; - sha256 = "sha256-2+Fmj6qUJoutLXbexgPRpJbspnzuwSfu4OpyRd+7N3Y="; + version = "24.3.4.14"; + sha256 = "sha256-+OEA7bVomZox/iHhkRQPt91WayyxZQDkDI92B5Ez24Q="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix index ee9a58c4e4..dc129ecdec 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.6"; - sha256 = "iImrVaoS5bajaZZQoZoG3VzWHFmWvId8xQPKLhl9iQo="; + version = "25.3.2.7"; + sha256 = "sha256-JMHfnnvjAIrJ2YhSzk1qVeS7qGx2HDf2J+8+WFD5Bv8="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix index 5df6e99977..a0e55bad3c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/26.nix @@ -1,7 +1,6 @@ -{ lib, mkDerivation }: +{ mkDerivation }: mkDerivation { - version = "26.1.1"; - sha256 = "sha256-Y0sArUFkGxlAAgrgUxn5Rjnd72geG08VO9FBxg/fJAg="; + version = "26.1.2"; + sha256 = "sha256-exLLdg7z/HKJI81w33vcQUDF6NG5n2WKtcYwdPxN+0A="; } - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index 21fba0864a..7b1a9b8b08 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-IQM/uKDxt18rVOd6MOKhQZC26vjxVe+3Yn479ITFDFs="; + sha256 = "sha256-TQG0YNwD3WU50fftFv5nGUK9ucxDXYnbQVv8Dewhwm8="; }; - cargoHash = "sha256-6kyxAHxphZjwfHo7OHrATSKFzrpXIRHVTjynDawlWew="; + cargoHash = "sha256-F2CduT0/vjoVHua5WshYxsxf4P0QBa+BjFVp7iTsFkU="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix index 0708fb3d29..a09afadf52 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix @@ -10,6 +10,7 @@ , libffi , libtool , libunistring +, libxcrypt , makeWrapper , pkg-config , pkgsBuildBuild @@ -48,6 +49,8 @@ builder rec { libtool libunistring readline + ] ++ lib.optionals stdenv.isLinux [ + libxcrypt ]; propagatedBuildInputs = [ boehmgc @@ -59,6 +62,8 @@ builder rec { # flags, see below. libtool libunistring + ] ++ lib.optionals stdenv.isLinux [ + libxcrypt ]; # According to @@ -98,9 +103,6 @@ builder rec { # See below. "--without-threads" ] - # Disable JIT on Apple Silicon, as it is not yet supported - # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 ++ lib.optional (stdenv.isDarwin) "--disable-lto"; @@ -114,8 +116,9 @@ builder rec { + '' sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; - s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|-lcrypt|-L${libxcrypt}/lib -lcrypt|g ; + s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ; s|includedir=$out|includedir=$dev|g " ''; @@ -125,6 +128,9 @@ builder rec { doCheck = false; doInstallCheck = doCheck; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + setupHook = ./setup-hook-3.0.sh; passthru = rec { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix index 3c44239dc2..f186021eb3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -1,19 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, nix-update-script +, runCommand +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "janet"; - version = "1.31.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "janet-lang"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Dj2fj1dsdAMl/H0vNKTf9qjPB4GVRpgWPVR+PuZWZMc="; + repo = "janet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-24d9N59pTfQATWmAZN4dAFT8RTTlUlBPKokcQ/Fd2No="; }; postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ + '' + lib.optionalString stdenv.isDarwin '' + # error: Socket is not connected + substituteInPlace meson.build \ + --replace "'test/suite-ev.janet'," "" ''; nativeBuildInputs = [ meson ninja ]; @@ -29,6 +40,21 @@ stdenv.mkDerivation rec { $out/bin/janet -e '(+ 1 2 3)' ''; + passthru = { + tests.run = runCommand "janet-test-run" { + nativeBuildInputs = [finalAttrs.finalPackage]; + } '' + echo "(+ 1 2 3)" | janet | tail -n 1 > arithmeticTest.txt; + diff -U3 --color=auto <(cat arithmeticTest.txt) <(echo "6"); + + echo "(print \"Hello, World!\")" | janet | tail -n 2 > ioTest.txt; + diff -U3 --color=auto <(cat ioTest.txt) <(echo -e "Hello, World!\nnil"); + + touch $out; + ''; + updateScript = nix-update-script {}; + }; + meta = with lib; { description = "Janet programming language"; homepage = "https://janet-lang.org/"; @@ -36,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix index ed0ddc7da2..e478ff9454 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix @@ -5,12 +5,15 @@ , asciidoc , pkg-config , inetutils +, tcl , sqlite , readline , SDL , SDL_gfx , openssl + +, SDLSupport ? true }: stdenv.mkDerivation rec { @@ -27,15 +30,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config asciidoc + tcl ]; buildInputs = [ sqlite readline + openssl + ] ++ (lib.optionals SDLSupport [ SDL SDL_gfx - openssl - ]; + ]); configureFlags = [ "--shared" @@ -44,11 +49,10 @@ stdenv.mkDerivation rec { "--with-ext=binary" "--with-ext=sqlite3" "--with-ext=readline" - "--with-ext=sdl" "--with-ext=json" "--enable-utf8" "--ipv6" - ]; + ] ++ (lib.optional SDLSupport "--with-ext=sdl"); enableParallelBuilding = true; @@ -58,6 +62,9 @@ stdenv.mkDerivation rec { rm tests/exec2.test # requires internet access rm tests/ssl.test + # test fails due to timing in some environments + # https://github.com/msteveb/jimtcl/issues/282 + rm tests/timer.test ''; # test posix-1.6 needs the "hostname" command diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix index 30b7aabbcd..1bafd6cb72 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-D9maTCNNJ9ivj76SEjddFSYNu+RLEZG+3SgOWEAD7aU="; + sha256 = "sha256-9SsSXLZFwqsAeWFGsba8OG9bdmfQjn6qQHHQK6IdHK8="; }; - vendorHash = "sha256-ioC7R5Pm2nmHXI+/ko1UoNJCvEFzvhZcAcVtaFECz2c="; + vendorHash = "sha256-VRQUbGJTC2v8w/l4iaNn3vPX3AdV9Likp2nuG0PQieU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 7c329f56fe..a316a407d8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, gitUpdater, mkRubyVersion, makeBinaryWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.3.0"; + version = "9.4.4.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk="; + hash = "sha256-arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -52,12 +52,15 @@ stdenv.mkDerivation (finalAttrs: { devEnv = callPackage ../ruby/dev.nix { ruby = finalAttrs.finalPackage; }; + updateScript = gitUpdater { + url = "https://github.com/jruby/jruby.git"; + }; }; meta = with lib; { description = "Ruby interpreter written in Java"; homepage = "https://www.jruby.org/"; - changelog = "https://github.com/jruby/jruby/releases/tag/${version}"; + changelog = "https://github.com/jruby/jruby/releases/tag/${finalAttrs.version}"; license = with licenses; [ cpl10 gpl2 lgpl21 ]; platforms = jre.meta.platforms; maintainers = [ maintainers.fzakaria ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index 51d44e7f1e..2fda54bef5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -1,5 +1,5 @@ # similar to interpreters/python/default.nix -{ stdenv, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: +{ stdenv, config, lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, makeBinaryWrapper }: let @@ -39,7 +39,13 @@ let selfHostHost = luaOnHostForHost.pkgs; selfTargetTarget = luaOnTargetForTarget.pkgs or {}; }; + + aliases = final: prev: + lib.optionalAttrs config.allowAliases + (import ../../lua-modules/aliases.nix lib final prev); + extensions = lib.composeManyExtensions [ + aliases generatedPackages overriddenPackages overrides diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix index 93aece0389..bf81832f46 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.598"; + version = "0.603"; src = fetchFromGitHub { - owner = "Roblox"; + owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-B3ggPrhvq1kYmclmuomi6PhXIwN8GKBzbKRLIjH0pac="; + hash = "sha256-8jm58F2AQcmjy19fydGLOD5fehaaNHGqXtDPu121jmw="; }; nativeBuildInputs = [ cmake ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua"; homepage = "https://luau-lang.org/"; - changelog = "https://github.com/Roblox/luau/releases/tag/${version}"; + changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix index 96acddb98c..cb6f532e2b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lune/default.nix @@ -8,22 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.7.4"; + version = "0.7.11"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; rev = "v${version}"; - hash = "sha256-um8XsXT0O+gTORrJAVlTku6YURh0wljLaQ7fueF+AoQ="; + hash = "sha256-5agoAXeO16/CihsgvUHt+pgA+/ph6PualTY6xqDQbeU="; fetchSubmodules = true; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rbx_binary-0.7.0" = "sha256-bwGCQMXN8VdycsyS7Om/9CKMkamAa0eBK2I2aPZ/sZs="; - }; - }; + cargoHash = "sha256-kPBPxlsicoFDyOsuJWhvQHDC2uwYQqpd7S+kQPRd8DY="; nativeBuildInputs = [ pkg-config @@ -33,6 +28,22 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + checkFlags = [ + # these all require internet access + "--skip=tests::net_request_codes" + "--skip=tests::net_request_compression" + "--skip=tests::net_request_methods" + "--skip=tests::net_request_query" + "--skip=tests::net_request_redirect" + "--skip=tests::net_socket_wss" + "--skip=tests::net_socket_wss_rw" + "--skip=tests::roblox_instance_custom_async" + "--skip=tests::serde_json_decode" + + # this tries to use the root directory as the CWD + "--skip=tests::process_spawn_cwd" + ]; + meta = with lib; { description = "A standalone Luau script runtime"; homepage = "https://github.com/filiptibell/lune"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix index a78b346be9..e97afb643c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-XTkw0M2an13xlRlDusyHYqwNeHqhq4mryRC5/pk+5Ko="; + sha256 = "sha256-nUQSj2grq4fNyqOZyYZfYvLwoEXI4PZCYdVXvxLGmPk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix index 8030980b77..fe4448c2f8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2023-01-21"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "d10cc61bc54050b07874a8597f8df20534885105"; - hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; + rev = "596fcca5c77932da8a07c249de59a9dff3099495"; + hash = "sha256-gXTlAxW7s3VBiC1fGU0aUlGspHlvyY7FC5KLeU2FyGQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix index 9bb0a75b27..ab9128772d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -93,12 +93,12 @@ let # To avoid confusion later in passthru allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "8.3.0"; + version = "8.4.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-K0gRHLZ7MSgX5dHz4XH1utFRK7Bn4WdLnEspKBiVuXo="; + sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0="; }; buildInputs = [ 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 ed6f3d2715..51651c5d40 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.24"; - hash = "sha256-sK5YBKmtU6fijQoyYpSV+Bb5NbEIMMcfTsFYJxhac8k="; + version = "8.1.25"; + hash = "sha256-qGqIwYQMG8gyvP0vvsO4oZQsgxTaXf9T8J+cmNDBLoo="; }); in 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 a38b0d3957..0720126575 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.11"; - hash = "sha256-OBktrv+r9K9sQnvxesH4JWXZx1IuDb0yIVFilEQ0sos="; + version = "8.2.12"; + hash = "sha256-cEMl9WsbTBf5+VHh/+9cZOFIiWBT804mJhUsuqLwWJM="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix index 2c48babf3b..23b9c2ee8e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.3.nix @@ -2,14 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC3"; - hash = null; - })).overrideAttrs (oldAttrs: { - src = fetchurl { - url = "https://downloads.php.net/~jakub/php-8.3.0RC3.tar.xz"; - hash = "sha256-64JwXVR7WzfeXhq5qOW0cqpzcX09G9t9R2daQyRyRMQ="; + version = "8.3.0RC6"; + phpSrc = fetchurl { + url = "https://downloads.php.net/~eric/php-8.3.0RC6.tar.xz"; + hash = "sha256-Hntdz+vEkh7EQgnB4IrnG2sQ5bG2uJW7T3a0RIbHBe0="; }; - }); + })); in base.withExtensions ({ all, ... }: with all; ([ bcmath diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix index 38ac500814..ba5ce5537b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -33,10 +33,12 @@ let , jq , version - , hash + , phpSrc ? null + , hash ? null , extraPatches ? [ ] , packageOverrides ? (final: prev: { }) , phpAttrsOverrides ? (attrs: { }) + , pearInstallPhar ? (callPackage ./install-pear-nozlib-phar.nix { }) # Sapi flags , cgiSupport ? true @@ -192,6 +194,11 @@ let mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + + defaultPhpSrc = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit hash; + }; in stdenv.mkDerivation ( let @@ -278,6 +285,15 @@ let substituteInPlace configure --replace "-lstdc++" "-lc++" ''; + # When compiling PHP sources from Github, this file is missing and we + # need to install it ourselves. + # On the other hand, a distribution includes this file by default. + preInstall = '' + if [[ ! -f ./pear/install-pear-nozlib.phar ]]; then + cp ${pearInstallPhar} ./pear/install-pear-nozlib.phar + fi + ''; + postInstall = '' test -d $out/etc || mkdir $out/etc cp php.ini-production $out/etc/php.ini @@ -291,10 +307,7 @@ let $dev/share/man/man1/ ''; - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit hash; - }; + src = if phpSrc == null then defaultPhpSrc else phpSrc; patches = [ ./fix-paths-php7.patch ] ++ extraPatches; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix new file mode 100644 index 0000000000..d359a7ed82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/install-pear-nozlib-phar.nix @@ -0,0 +1,8 @@ +{ + fetchurl +}: + +fetchurl { + url = "https://pear.php.net/install-pear-nozlib.phar"; + hash = "sha256-UblKVcsm030tNSA6mdeab+h7ZhANNz7MkFf4Z1iigjs="; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix index b85f99a7b5..4e589cb722 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { passthru = { updateInfo = { - downloadPage = "http://www.software-lab.de/down.html"; + downloadPage = "https://www.software-lab.de/down.html"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/third_party/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py index bb82900c65..d5c99e6475 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py @@ -1,30 +1,34 @@ -import pkg_resources +from importlib.metadata import PathDistribution +from pathlib import Path import collections import sys + do_abort = False packages = collections.defaultdict(list) -for f in sys.path: - for req in pkg_resources.find_distributions(f): - if req not in packages[req.project_name]: - # some exceptions inside buildPythonPackage - if req.project_name in ['setuptools', 'pip', 'wheel']: - continue - packages[req.project_name].append(req) + +for path in sys.path: + for dist_info in Path(path).glob("*.dist-info"): + dist = PathDistribution(dist_info) + + packages[dist._normalized_name].append( + f"{dist._normalized_name} {dist.version} ({dist._path})" + ) for name, duplicates in packages.items(): if len(duplicates) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) - for dup in duplicates: - print(" " + repr(dup)) + for duplicate in duplicates: + print(f"\t{duplicate}") if do_abort: print("") print( - 'Package duplicates found in closure, see above. Usually this ' - 'happens if two packages depend on different version ' - 'of the same dependency.') + "Package duplicates found in closure, see above. Usually this " + "happens if two packages depend on different version " + "of the same dependency." + ) sys.exit(1) 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 9cd806c052..5cdd307e70 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 @@ -56,11 +56,11 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) let buildPackages = pkgsBuildHost; - inherit (passthru) pythonForBuild; + inherit (passthru) pythonOnBuildForHost; - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + pythonOnBuildForHostInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else pythonForBuild.interpreter; + else pythonOnBuildForHost.interpreter; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -133,6 +133,11 @@ let ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + + ] ++ lib.optionals stdenv.isDarwin [ + # Fix darwin build https://bugs.python.org/issue34027 + ../3.7/darwin-libutil.patch + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since @@ -297,9 +302,9 @@ in with passthru; stdenv.mkDerivation ({ # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. - find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + lib.optionalString stdenv.hostPlatform.isCygwin '' cp libpython2.7.dll.a $out/lib ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch new file mode 100644 index 0000000000..ca6a76d0ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch @@ -0,0 +1,107 @@ +From 5330b6af9f832af59aa5c61d9ef6971053a8e709 Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer +Date: Mon, 9 Nov 2020 10:24:35 -0800 +Subject: [PATCH] CPython: Don't use ldconfig + +--- + Lib/ctypes/util.py | 77 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 75 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 0c2510e161..7fb98af308 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -100,53 +100,7 @@ def _is_elf(filename): + return thefile.read(4) == elf_header + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.findall(expr, trace) +- if not res: +- return None +- +- for file in res: +- # Check if the given file is an elf file: gcc can report +- # some files that are linker scripts and not actual +- # shared objects. See bpo-41976 for more details +- if not _is_elf(file): +- continue +- return os.fsdecode(file) ++ return None + + + if sys.platform == "sunos5": +@@ -268,34 +222,7 @@ def find_library(name, is64 = False): + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.33.1 + 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 4e60b15ba4..8bc5c6c586 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -58,6 +58,7 @@ , reproducibleBuild ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" , noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch" +, testers } @ inputs: # Note: this package is used for bootstrapping fetchurl, and thus @@ -91,7 +92,7 @@ let openssl' = if openssl != null then openssl_legacy else null; buildPackages = pkgsBuildHost; - inherit (passthru) pythonForBuild; + inherit (passthru) pythonOnBuildForHost; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -126,7 +127,7 @@ let nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc - pythonForBuild + pythonOnBuildForHost ] ++ optionals (stdenv.cc.isClang && (!stdenv.hostPlatform.useAndroidPrebuilt or false) && (enableLTO || enableOptimizations)) [ stdenv.cc.cc.libllvm.out ]; @@ -147,9 +148,9 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + pythonOnBuildForHostInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" - else pythonForBuild.interpreter; + else pythonOnBuildForHost.interpreter; src = fetchurl { url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; @@ -232,7 +233,7 @@ let ''; execSuffix = stdenv.hostPlatform.extensions.executable; -in with passthru; stdenv.mkDerivation { +in with passthru; stdenv.mkDerivation (finalAttrs: { pname = "python3"; inherit src version; @@ -302,9 +303,12 @@ in with passthru; stdenv.mkDerivation { ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. ./3.7/fix-finding-headers-when-cross-compiling.patch - ] ++ optionals stdenv.hostPlatform.isLoongArch64 [ + ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch + ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ + # backport fix for https://github.com/python/cpython/issues/95855 + ./platform-triplet-detection.patch ] ++ optionals (stdenv.hostPlatform.isMinGW) (let # https://src.fedoraproject.org/rpms/mingw-python3 mingw-patch = fetchgit { @@ -323,7 +327,7 @@ in with passthru; stdenv.mkDerivation { '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ --replace "@mime-types@" "${mailcap}" - '' + optionalString (x11Support && (tix != null)) '' + '' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -384,7 +388,7 @@ in with passthru; stdenv.mkDerivation { "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ - "--with-build-python=${pythonForBuildInterpreter}" + "--with-build-python=${pythonOnBuildForHostInterpreter}" ] ++ optionals stdenv.hostPlatform.isLinux [ # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. @@ -507,9 +511,9 @@ in with passthru; stdenv.mkDerivation { # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. - find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonOnBuildForHostInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + '' # *strip* shebang from libpython gdb script - it should be dual-syntax and # interpretable by whatever python the gdb in question is using, which may @@ -557,7 +561,7 @@ in with passthru; stdenv.mkDerivation { ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. - pythonForBuild buildPackages.bash + pythonOnBuildForHost buildPackages.bash ]; separateDebugInfo = true; @@ -577,8 +581,10 @@ in with passthru; stdenv.mkDerivation { mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version} ''; - nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ]; + nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ]; }; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; enableParallelBuilding = true; @@ -604,8 +610,9 @@ in with passthru; stdenv.mkDerivation { high level dynamic data types. ''; license = licenses.psfl; + pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; maintainers = with maintainers; [ fridh ]; mainProgram = executable; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch new file mode 100644 index 0000000000..ec76546f54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/platform-triplet-detection.patch @@ -0,0 +1,295 @@ +diff --git a/configure.ac b/configure.ac +index ba768aea93..621ac166bd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -936,125 +936,192 @@ cat > conftest.c < ++# if defined(__UCLIBC__) ++# error uclibc not supported ++# elif defined(__dietlibc__) ++# error dietlibc not supported ++# elif defined(__GLIBC__) ++# define LIBC gnu ++# define LIBC_X32 gnux32 ++# if defined(__ARM_PCS_VFP) ++# define LIBC_ARM gnueabihf ++# else ++# define LIBC_ARM gnueabi ++# endif ++# if defined(__loongarch__) ++# if defined(__loongarch_soft_float) ++# define LIBC_LA gnusf ++# elif defined(__loongarch_single_float) ++# define LIBC_LA gnuf32 ++# elif defined(__loongarch_double_float) ++# define LIBC_LA gnu ++# else ++# error unknown loongarch floating-point base abi ++# endif ++# endif ++# if defined(_MIPS_SIM) ++# if defined(__mips_hard_float) ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS gnu ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS gnuabin32 ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS gnuabi64 ++# else ++# error unknown mips sim value ++# endif ++# else ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS gnusf ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS gnuabin32sf ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS gnuabi64sf ++# else ++# error unknown mips sim value ++# endif ++# endif ++# endif ++# if defined(__SPE__) ++# define LIBC_PPC gnuspe ++# else ++# define LIBC_PPC gnu ++# endif ++# else ++# include ++# ifdef __DEFINED_va_list ++# define LIBC musl ++# define LIBC_X32 muslx32 ++# if defined(__ARM_PCS_VFP) ++# define LIBC_ARM musleabihf ++# else ++# define LIBC_ARM musleabi ++# endif ++# if defined(__loongarch__) ++# if defined(__loongarch_soft_float) ++# define LIBC_LA muslsf ++# elif defined(__loongarch_single_float) ++# define LIBC_LA muslf32 ++# elif defined(__loongarch_double_float) ++# define LIBC_LA musl ++# else ++# error unknown loongarch floating-point base abi ++# endif ++# endif ++# if defined(_MIPS_SIM) ++# if defined(__mips_hard_float) ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS musl ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS musln32 ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS musl ++# else ++# error unknown mips sim value ++# endif ++# else ++# if _MIPS_SIM == _ABIO32 ++# define LIBC_MIPS muslsf ++# elif _MIPS_SIM == _ABIN32 ++# define LIBC_MIPS musln32sf ++# elif _MIPS_SIM == _ABI64 ++# define LIBC_MIPS muslsf ++# else ++# error unknown mips sim value ++# endif ++# endif ++# endif ++# if defined(_SOFT_FLOAT) || defined(__NO_FPRS__) ++# define LIBC_PPC muslsf ++# else ++# define LIBC_PPC musl ++# endif ++# else ++# error unknown libc ++# endif ++# endif + # if defined(__x86_64__) && defined(__LP64__) +- x86_64-linux-gnu ++ x86_64-linux-LIBC + # elif defined(__x86_64__) && defined(__ILP32__) +- x86_64-linux-gnux32 ++ x86_64-linux-LIBC_X32 + # elif defined(__i386__) +- i386-linux-gnu ++ i386-linux-LIBC + # elif defined(__aarch64__) && defined(__AARCH64EL__) + # if defined(__ILP32__) +- aarch64_ilp32-linux-gnu ++ aarch64_ilp32-linux-LIBC + # else +- aarch64-linux-gnu ++ aarch64-linux-LIBC + # endif + # elif defined(__aarch64__) && defined(__AARCH64EB__) + # if defined(__ILP32__) +- aarch64_be_ilp32-linux-gnu ++ aarch64_be_ilp32-linux-LIBC + # else +- aarch64_be-linux-gnu ++ aarch64_be-linux-LIBC + # endif + # elif defined(__alpha__) +- alpha-linux-gnu +-# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP) ++ alpha-linux-LIBC ++# elif defined(__ARM_EABI__) + # if defined(__ARMEL__) +- arm-linux-gnueabihf ++ arm-linux-LIBC_ARM + # else +- armeb-linux-gnueabihf +-# endif +-# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) +-# if defined(__ARMEL__) +- arm-linux-gnueabi +-# else +- armeb-linux-gnueabi ++ armeb-linux-LIBC_ARM + # endif + # elif defined(__hppa__) +- hppa-linux-gnu ++ hppa-linux-LIBC + # elif defined(__ia64__) +- ia64-linux-gnu +-# elif defined(__loongarch__) +-# if defined(__loongarch_lp64) +-# if defined(__loongarch_soft_float) +- loongarch64-linux-gnusf +-# elif defined(__loongarch_single_float) +- loongarch64-linux-gnuf32 +-# elif defined(__loongarch_double_float) +- loongarch64-linux-gnu ++ ia64-linux-LIBC ++# elif defined(__loongarch__) && defined(__loongarch_lp64) ++ loongarch64-linux-LIBC_LA ++# elif defined(__m68k__) && !defined(__mcoldfire__) ++ m68k-linux-LIBC ++# elif defined(__mips__) ++# if defined(__mips_isa_rev) && (__mips_isa_rev >=6) ++# if defined(_MIPSEL) && defined(__mips64) ++ mipsisa64r6el-linux-LIBC_MIPS ++# elif defined(_MIPSEL) ++ mipsisa32r6el-linux-LIBC_MIPS ++# elif defined(__mips64) ++ mipsisa64r6-linux-LIBC_MIPS + # else +-# error unknown platform triplet ++ mipsisa32r6-linux-LIBC_MIPS + # endif + # else +-# error unknown platform triplet +-# endif +-# elif defined(__m68k__) && !defined(__mcoldfire__) +- m68k-linux-gnu +-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL) +-# if _MIPS_SIM == _ABIO32 +- mipsisa32r6el-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mipsisa64r6el-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mipsisa64r6el-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) +-# if _MIPS_SIM == _ABIO32 +- mipsisa32r6-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mipsisa64r6-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mipsisa64r6-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) && defined(_MIPSEL) +-# if _MIPS_SIM == _ABIO32 +- mipsel-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mips64el-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mips64el-linux-gnuabi64 +-# else +-# error unknown platform triplet +-# endif +-# elif defined(__mips_hard_float) +-# if _MIPS_SIM == _ABIO32 +- mips-linux-gnu +-# elif _MIPS_SIM == _ABIN32 +- mips64-linux-gnuabin32 +-# elif _MIPS_SIM == _ABI64 +- mips64-linux-gnuabi64 +-# else +-# error unknown platform triplet ++# if defined(_MIPSEL) && defined(__mips64) ++ mips64el-linux-LIBC_MIPS ++# elif defined(_MIPSEL) ++ mipsel-linux-LIBC_MIPS ++# elif defined(__mips64) ++ mips64-linux-LIBC_MIPS ++# else ++ mips-linux-LIBC_MIPS ++# endif + # endif + # elif defined(__or1k__) +- or1k-linux-gnu +-# elif defined(__powerpc__) && defined(__SPE__) +- powerpc-linux-gnuspe ++ or1k-linux-LIBC + # elif defined(__powerpc64__) + # if defined(__LITTLE_ENDIAN__) +- powerpc64le-linux-gnu ++ powerpc64le-linux-LIBC + # else +- powerpc64-linux-gnu ++ powerpc64-linux-LIBC + # endif + # elif defined(__powerpc__) +- powerpc-linux-gnu ++ powerpc-linux-LIBC_PPC + # elif defined(__s390x__) +- s390x-linux-gnu ++ s390x-linux-LIBC + # elif defined(__s390__) +- s390-linux-gnu ++ s390-linux-LIBC + # elif defined(__sh__) && defined(__LITTLE_ENDIAN__) +- sh4-linux-gnu ++ sh4-linux-LIBC + # elif defined(__sparc__) && defined(__arch64__) +- sparc64-linux-gnu ++ sparc64-linux-LIBC + # elif defined(__sparc__) +- sparc-linux-gnu ++ sparc-linux-LIBC + # elif defined(__riscv) + # if __riscv_xlen == 32 +- riscv32-linux-gnu ++ riscv32-linux-LIBC + # elif __riscv_xlen == 64 +- riscv64-linux-gnu ++ riscv64-linux-LIBC + # else + # error unknown platform triplet + # endif +@@ -1102,12 +1169,7 @@ cat > conftest.c <conftest.out 2>/dev/null; then +- PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` +- case "$build_os" in +- linux-musl*) +- PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'` +- ;; +- esac ++ PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | grep -v typedef | tr -d ' '` + AC_MSG_RESULT([$PLATFORM_TRIPLET]) + else + AC_MSG_RESULT([none]) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 7bcd9db22b..8f775699f4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -20,20 +20,20 @@ sourceVersion = { major = "3"; minor = "10"; - patch = "12"; + patch = "13"; suffix = ""; }; - hash = "sha256-r7dL8ZEw56R9EDEsj154TyTgUnmB6raOIFRs+4ZYMLg="; + hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; }; python311 = { sourceVersion = { major = "3"; minor = "11"; - patch = "4"; + patch = "6"; suffix = ""; }; - hash = "sha256-Lw5AnfKrV6qfxMvd+5dq9E5OVb9vYZ7ua8XCKXJkp/Y="; + hash = "sha256-D6t4+n8TP084IQxiYNkNfA1ccZhEZBnOBX7HrC5vXzg="; }; }; @@ -103,6 +103,18 @@ in { inherit passthruFun; }; + python313 = callPackage ./cpython { + self = __splicedPackages.python313; + sourceVersion = { + major = "3"; + minor = "13"; + patch = "0"; + suffix = "a1"; + }; + hash = "sha256-8Cgb8izABBQ2HBT8kZcYPn6y6rtylla2lEIiT7tj7ss="; + inherit (darwin) configd; + inherit passthruFun; + }; # Minimal versions of Python (built without optional dependencies) python3Minimal = (callPackage ./cpython ({ self = __splicedPackages.python3Minimal; @@ -127,7 +139,7 @@ in { enableOptimizations = false; enableLTO = false; mimetypesSupport = false; - } // sources.python310)).overrideAttrs(old: { + } // sources.python311)).overrideAttrs(old: { # TODO(@Artturin): Add this to the main cpython expr strictDeps = true; pname = "python3-minimal"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix index ba51c43822..f7cc10274a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix @@ -1,8 +1,8 @@ self: dontUse: with self; let - inherit (python) pythonForBuild; - pythonInterpreter = pythonForBuild.interpreter; + inherit (python) pythonOnBuildForHost; + pythonInterpreter = pythonOnBuildForHost.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; @@ -68,10 +68,10 @@ in { # set, but in downstream projects that build packages depending on other # versions of this hook's dependencies. passthru.tests = import ./pypa-build-hook-tests.nix { - inherit pythonForBuild runCommand; + inherit pythonOnBuildForHost runCommand; }; } ./pypa-build-hook.sh) { - inherit (pythonForBuild.pkgs) build; + inherit (pythonOnBuildForHost.pkgs) build; }; pipInstallHook = callPackage ({ makePythonHook, pip }: @@ -91,7 +91,7 @@ in { inherit pythonInterpreter pythonSitePackages; }; } ./pypa-install-hook.sh) { - inherit (pythonForBuild.pkgs) installer; + inherit (pythonOnBuildForHost.pkgs) installer; }; pytestCheckHook = callPackage ({ makePythonHook, pytest }: @@ -107,7 +107,7 @@ in { makePythonHook { name = "python-catch-conflicts-hook"; substitutions = { - inherit pythonInterpreter pythonSitePackages setuptools; + inherit pythonInterpreter pythonSitePackages; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; @@ -183,16 +183,14 @@ in { }; } ./setuptools-check-hook.sh) {}; - setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust }: makePythonHook { name = "setuptools-rust-setup-hook"; propagatedBuildInputs = [ setuptools-rust ]; substitutions = { pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; - cargoLinkerVar = lib.toUpper ( - builtins.replaceStrings ["-"] ["_"] ( - rust.toRustTarget stdenv.hostPlatform)); + cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; }; } ./setuptools-rust-hook.sh) {}; @@ -227,6 +225,9 @@ in { sphinxHook = callPackage ({ makePythonHook, installShellFiles }: makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; - propagatedBuildInputs = [ pythonForBuild.pkgs.sphinx installShellFiles ]; + propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ]; + substitutions = { + sphinxBuild = "${pythonOnBuildForHost.pkgs.sphinx}/bin/sphinx-build"; + }; } ./sphinx-hook.sh) {}; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix index d909e34241..4153c21ca4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -1,4 +1,4 @@ -{ pythonForBuild, runCommand }: { +{ pythonOnBuildForHost, runCommand }: { dont-propagate-conflicting-deps = let # customize a package so that its store paths differs mkConflict = pkg: pkg.overrideAttrs { some_modification = true; }; @@ -16,7 +16,7 @@ ''; in # this build must never triger conflicts - pythonForBuild.pkgs.buildPythonPackage { + pythonOnBuildForHost.pkgs.buildPythonPackage { pname = "dont-propagate-conflicting-deps"; version = "0.0.0"; src = projectSource; @@ -24,9 +24,9 @@ propagatedBuildInputs = [ # At least one dependency of `build` should be included here to # keep the test meaningful - (mkConflict pythonForBuild.pkgs.tomli) + (mkConflict pythonOnBuildForHost.pkgs.tomli) # setuptools is also needed to build the example project - pythonForBuild.pkgs.setuptools + pythonOnBuildForHost.pkgs.setuptools ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ca67fa9bea..0307e83d94 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -38,7 +38,7 @@ buildSphinxPhase() { for __builder in "${__sphinxBuilders[@]}"; do echo "Executing sphinx-build with ${__builder} builder" - sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + @sphinxBuild@ -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v done runHook postBuildSphinx diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index fbacf6bb23..c14c6bc096 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -102,13 +102,14 @@ , disabledTestPaths ? [] +# Allow passing in a custom stdenv to buildPython* +, stdenv ? python.stdenv + , ... } @ attrs: assert (pyproject != null) -> (format == null); let - inherit (python) stdenv; - format' = if pyproject != null then if pyproject then @@ -194,7 +195,7 @@ let # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" + "disabledTestPaths" "outputs" "stdenv" ]) // { name = namePrefix + name_; @@ -223,7 +224,7 @@ let ] ++ lib.optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { - inherit (python.pythonForBuild.pkgs.bootstrap) build; + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build; wheel = null; } else @@ -235,7 +236,7 @@ let ] ++ lib.optionals (format' != "other") [( if isBootstrapInstallPackage then pypaInstallHook.override { - inherit (python.pythonForBuild.pkgs.bootstrap) installer; + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer; } else pypaInstallHook @@ -279,7 +280,7 @@ let '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; outputs = outputs ++ lib.optional withDistOutput "dist"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/passthrufun.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/passthrufun.nix index 867027e384..b06433113b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/passthrufun.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/passthrufun.nix @@ -67,6 +67,8 @@ overrides = packageOverrides; python = self; }); + pythonOnBuildForHost_overridden = + pythonOnBuildForHost.override { inherit packageOverrides; self = pythonOnBuildForHost_overridden; }; in rec { isPy27 = pythonVersion == "2.7"; isPy37 = pythonVersion == "3.7"; @@ -89,9 +91,11 @@ in rec { pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; - # TODO: rename to pythonOnBuild - # Not done immediately because its likely used outside Nixpkgs. - pythonForBuild = pythonOnBuildForHost.override { inherit packageOverrides; self = pythonForBuild; }; + # Remove after 24.11 is released. + pythonForBuild = + lib.warnIf (lib.isInOldestRelease 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`" + pythonOnBuildForHost_overridden; + pythonOnBuildForHost = pythonOnBuildForHost_overridden; tests = callPackage ./tests.nix { python = self; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index 91ca84b34b..b5afaf34ce 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -13,7 +13,7 @@ let # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. - makeOverridablePythonPackage = f: origArgs: + makeOverridablePythonPackage = f: lib.mirrorFunctionArgs f (origArgs: let args = lib.fix (lib.extends (_: previousAttrs: { @@ -30,7 +30,7 @@ let overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); __functor = self: result; } - else result; + else result); mkPythonDerivation = if python.isPy3k then ./mk-python-derivation.nix diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index d42e4e85c1..1a6f9c784c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -224,7 +224,7 @@ let '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; outputs = outputs ++ lib.optional withDistOutput "dist"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix index c67a8e0885..8817d091a2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix @@ -8,7 +8,7 @@ makePythonHook { propagatedBuildInputs = [ makeWrapper ]; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; - substitutions.python = python.pythonForBuild; + substitutions.python = python.pythonOnBuildForHost; substitutions.pythonHost = python; substitutions.magicalSedExpression = let # Looks weird? Of course, it's between single quoted shell strings. diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index 0bc35bac51..041ac00b2c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2023.08"; + version = "2023.09"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-oYdXzbT+2L/nDySKq8ZYVuVfNgzLDiskwacOM1L4lzw="; + hash = "sha256-/78Qr/Td+dIBlzK0kYa2E4duxEjMj2haefw9Uia+3EA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 4b0d038846..fc7e541cef 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-tA3BH8YlOHCcbYht2mnZr05vtUfeHn6LGB5Hrylbrpw="; + sha256 = "sha256-IWOgbKYaWKjC2+dc2P3THAVy23F3iQXh2D6od/0e0Jw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix index 4bbeb224ce..b68c540b39 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix @@ -59,14 +59,14 @@ in stdenv.mkDerivation rec { buildPhase = with python3.pkgs; '' runHook preBuild - ${python.pythonForBuild.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES + ${python.pythonOnBuildForHost.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES runHook postBuild ''; installPhase = with python3.pkgs; '' runHook preInstall - ${python.pythonForBuild.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} + ${python.pythonOnBuildForHost.interpreter} module/setup.py install_lib -d $out/${python.sitePackages} mkdir -p $out/share/renpy cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index d650a03331..903a101aa4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -351,8 +351,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "0" "preview2"; - sha256 = "sha256-MM6LD+EbN7WsCI9aV2V0S5NerEW7ianjgXMVMxRPWZE="; + version = rubyVersion "3" "3" "0" "preview3"; + sha256 = "sha256-CWkUG+kuZ+DtuEqPs1SsyY8BvXjmAqI6DxNgRcgvSAk="; cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 71f3f8be9b..8e9e35dae5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.19"; + version = "3.4.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-+ZYpS9UOB16qCjhrKwFGBn43t3KNOv/QIrLKIPAywWs="; + hash = "sha256-gD+nd3bRHT0btWOCZhbIERJEJeAzGtH9mDxBRARqYVY="; }; patches = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md"; homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; + mainProgram = "gem"; maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix index 944741a21b..510ab71bdc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rune/default.nix @@ -7,18 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.12.4"; + version = "0.13.1"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-Fw6vCy6EMLzNbhwOUwCCsGSueDxfh7KMjLhhbvTzclc="; + hash = "sha256-7GScETlQ/rl9vOB9zSfsCM1ay1F5YV6OAxKe82lMU1I="; }; - cargoHash = "sha256-F1FI7ZVNXIFzxIzimq0KXtGNWw26x1eQyqv+hVYaS1E="; + cargoHash = "sha256-T6uYe+ZgXgsGN1714Ka+fxeVDoXgjVdfrrw5Rj/95cE="; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix index 7a4178d82b..82bd58469b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/scheme48/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""' ''; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = with lib; { homepage = "https://s48.org/"; description = "Scheme 48 interpreter for R5RS"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix index 194c67eba9..538f5e7f13 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/shen-sbcl/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; + broken = true; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix index 5beac058eb..ff9bb39e0a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -65,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: rec { ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch + ] ++ lib.optionals (lib.versionAtLeast version "91" && lib.versionOlder version "102") [ + # Fix 91 compatibility with python311 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mozjs91/raw/rawhide/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch"; + hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix index c83f6195bc..bd30fb4f85 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/starlark-rust/default.nix @@ -1,31 +1,19 @@ { lib , rustPlatform , fetchCrate -, fetchpatch -, stdenv }: rustPlatform.buildRustPackage rec { - pname = "starlark"; - version = "0.9.0"; + pname = "starlark-rust"; + version = "0.10.0"; src = fetchCrate { - inherit pname version; - hash = "sha256-h8TBWWw94Ka9C0W0i0aHACq6jO0QOLnLW+wTRzorHcc="; + pname = "starlark_bin"; + inherit version; + hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs="; }; - cargoHash = "sha256-OLzotKyiG0JmtjH0ckRImHMPPxfQZ+8IHZtXlo1f8+Y="; - - patches = [ - # fix test broken due to using `fetchCrate` - # https://github.com/facebookexperimental/starlark-rust/pull/78 - (fetchpatch { - name = "fix-test-rust-loc-when-tested-from-the-crate.patch"; - url = "https://github.com/facebookexperimental/starlark-rust/commit/0e4f90c77868e506268fcb6c9d37368e5b2b8cf5.patch"; - hash = "sha256-c8irAyS2IQ5C6s+0t4+hbW8aFptkwvCu9JHLyZqZsW4="; - stripLen = 1; - }) - ]; + cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74="; meta = with lib; { description = "A Rust implementation of the Starlark language"; @@ -33,6 +21,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/facebookexperimental/starlark-rust/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 || stdenv.isDarwin; + mainProgram = "starlark"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/starlark/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/starlark/default.nix index d6f0ffcbcc..a387765f83 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/starlark/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/starlark/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "starlark"; - version = "unstable-2023-03-02"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "4b1e35fe22541876eb7aa2d666416d865d905028"; - hash = "sha256-TqR8V9cypTXaXlKrAUpP2qE5gJ9ZanaRRs/LmVt/XEo="; + rev = "556fd59b42f68a2fb1f84957741b72811c714e51"; + hash = "sha256-0IiEtZOQEvE2Qm//lI1eyFFL1q/ZQzO9JzmiGsk0HkQ="; }; - vendorHash = "sha256-mMxRw2VucXwKGQ7f7HM0GiQUExxN38qYZDdmEyxtXDA="; + vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index 6aaecc9bd1..79cad7fe64 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake +{ lib, stdenv, mkDerivation, fetchurl, cmake, runtimeShell , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -20,6 +20,10 @@ mkDerivation rec { ./supercollider-3.12.0-env-dirs.patch ]; + postPatch = '' + substituteInPlace common/sc_popen.cpp --replace '/bin/sh' '${runtimeShell}' + ''; + strictDeps = true; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index 8d4903add8..5ee967161f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -62,7 +62,10 @@ let libdir = "lib/${libPrefix}"; tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { name = "tcl-package-hook"; - propagatedBuildInputs = [ buildPackages.makeWrapper ]; + propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ]; + meta = { + inherit (meta) maintainers platforms; + }; } ./tcl-package-hook.sh) {}; # verify that Tcl's clock library can access tzdata tests.tzdata = runCommand "${pname}-test-tzdata" {} '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 408830aa91..86b1317c27 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,23 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "13.0.0"; + version = "14.0.4"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-D8Osn/vlPr9eg5F8O0K/eC/M0prHQM7U96k8Cx9D1/4="; + hash = "sha256-VojHQDp6Vnr466coGkrBrrDVYBqpb985nXiQNpKdJ5g="; fetchSubmodules = true; }; - cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE="; - + # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. + auditable = false; + cargoHash = "sha256-iNEtivaruSOKeD3NJ58TXSyvZSZE8A2GjKN63fKA55w="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; - cargoPatches = [ - # this patch is necessary until cargo-auditable is bumped on the rust platform - ./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch - ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch deleted file mode 100644 index 03870600e3..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= - -Date: Mon, 4 Sep 2023 15:25:15 +0200 -Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation - -`cargo-auditable` fails to process the current `Cargo.toml` as it -is (cargo/rustc 1.72.0 is able to process this crate without any -issues). ---- - crates/c-api/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml -index a464c0dbd..1e793432c 100644 ---- a/crates/c-api/Cargo.toml -+++ b/crates/c-api/Cargo.toml -@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation'] - jitdump = ["wasmtime/jitdump"] - cache = ["wasmtime/cache"] - parallel-compilation = ['wasmtime/parallel-compilation'] --wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common'] -+wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common'] --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix index f0d71673c2..ef302aacc7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2023-01-02"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "464aae9ae90dcb43ab003b922e4ae4d08611c55b"; - hash = "sha256-O8p3dEXqAP2UNPNBla9AtkndxgL8UoVp/QygXOmcgWg="; + rev = "9e2aa26b0574b4ac53c838f6b59fd78f952c3923"; + hash = "sha256-wF+jj4+4uFofW9KhVqRF7EoWViRny2KuSfX/l6UN+yY="; }; doCheck = true; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A Tiny Racket for Scripting"; homepage = "https://github.com/racket/zuo"; diff --git a/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix b/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix index cb1cc3e95f..3dc82f9c07 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "postgresql-jdbc"; - version = "42.5.1"; + version = "42.6.0"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4="; + hash = "sha256-uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE="; inherit version; }; @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jdbc.postgresql.org/"; + changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 9d9233aad2..672facdc23 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub +, fetchurl , cmake , boost , gmp @@ -8,13 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.5.2"; + version = "5.5.3"; - src = fetchFromGitHub { - owner = "CGAL"; - repo = "releases"; - rev = "CGAL-${version}"; - sha256 = "sha256-olMPT/8Q0bf+rooJoNc0k8NrO//O7z0yqBoP8KX39yQ="; + src = fetchurl { + url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; + hash = "sha256-CgT2YmkyVjKLBbq/q7XjpbfbL1pY1S48Ug350IKN3XM="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/third_party/nixpkgs/pkgs/development/libraries/NSPlist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/NSPlist/default.nix index 680e86dd64..0ad1606739 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/NSPlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, flex, cmake }: stdenv.mkDerivation { pname = "NSPlist"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ flex cmake ]; + + preConfigure = '' + # Regenerate the lexer for improved compatibility with clang 16. + flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) + ''; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 7b741b803d..2c05252c84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -49,20 +49,22 @@ , audiofile , libiconv , withStatic ? false +# passthru.tests +, testers }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.3"; + version = "2.28.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; - rev = "release-${version}"; - hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -96,7 +98,7 @@ stdenv.mkDerivation rec { ++ lib.optionals x11Support [ libX11 ]; propagatedBuildInputs = lib.optionals x11Support [ xorgproto ] - ++ dlopenPropagatedBuildInputs; + ++ finalAttrs.dlopenPropagatedBuildInputs; dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] ++ lib.optional dbusSupport dbus @@ -109,7 +111,7 @@ stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] - ++ dlopenBuildInputs + ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; @@ -156,7 +158,7 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs); in lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -180,5 +185,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; + pkgConfigModules = [ "sdl2" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix index 3d599c39c0..83b57b42c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }: +{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; @@ -42,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; + pkgConfigModules = [ "SDL2_gfx" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index d2dd8d5392..e46b9d9c53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_ttf"; version = "2.20.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; homepage = "https://github.com/libsdl-org/SDL_ttf"; + pkgConfigModules = [ "SDL2_ttf" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix index 91e9f0a3ed..12b50cd476 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , SDL, libogg, libvorbis, smpeg, libmikmod , fluidsynth, pkg-config , enableNativeMidi ? false @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + patches = [ + # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. + # https://github.com/libsdl-org/SDL_mixer/issues/287 + (fetchpatch { + name = "fluidsynth-fix-implicit-declaration.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; + hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; + }) + # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. + (fetchpatch { + name = "fluidsynth-fix-function-pointer-conversions.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; + hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; + }) + # Backport of MikMod fixes, which includes incompatible function pointer conversions. + (fetchpatch { + name = "mikmod-fixes.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + }) + # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; + hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion-header-part.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; + hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-signature.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; + hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix index f358a59ad6..f90be3a751 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/clang.patch b/third_party/nixpkgs/pkgs/development/libraries/aalib/clang.patch new file mode 100644 index 0000000000..5f8fa80f38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/clang.patch @@ -0,0 +1,74 @@ +diff -ur a/configure b/configure +--- a/configure 2001-04-26 10:44:54.000000000 -0400 ++++ b/configure 2023-10-21 23:19:52.941161475 -0400 +@@ -1005,7 +1005,7 @@ + #line 1006 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +diff -ur a/src/aafire.c b/src/aafire.c +--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 ++++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 +@@ -1,3 +1,4 @@ ++#include + #include + #include "aalib.h" + +diff -ur a/src/aainfo.c b/src/aainfo.c +--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 +@@ -1,4 +1,4 @@ +- ++#include + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff -ur a/src/aakbdreg.c b/src/aakbdreg.c +--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 ++++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aamoureg.c b/src/aamoureg.c +--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 ++++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aaregist.c b/src/aaregist.c +--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 ++++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 +@@ -1,4 +1,5 @@ + #include ++#include + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aasavefont.c b/src/aasavefont.c +--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 +@@ -1,3 +1,5 @@ ++#include ++#include + #include "aalib.h" + int main(int argc, char **argv) + { +diff -ur a/src/aatest.c b/src/aatest.c +--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 +@@ -1,3 +1,5 @@ ++#include ++#include + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch index 44559d0621..94b548b35c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/darwin.patch @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644 @@ -1,4 +1,4 @@ -#include +#include + #include #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aalib.c b/src/aalib.c index 11fecc8..e3063b4 100644 --- a/src/aalib.c @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644 @@ -1,4 +1,4 @@ -#include +#include + #include #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aarec.c b/src/aarec.c index 70f4ebc..ee43e8a 100644 --- a/src/aarec.c @@ -61,9 +61,9 @@ index 54abec0..765155e 100644 @@ -1,4 +1,4 @@ -#include +#include + #include #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aax.c b/src/aax.c index adcbd82..36e3294 100644 --- a/src/aax.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix index af0fa61740..903364ea27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix index 712f89e383..59294496f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix index d40ca0bd4a..0c1a173eca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202111.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix index 7ca25f4140..a605be3c05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202206.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix index da5f1fc029..4676264c26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch new file mode 100644 index 0000000000..61b57456b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch @@ -0,0 +1,12 @@ +diff -ur a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +--- a/absl/time/CMakeLists.txt 1969-12-31 19:00:01.000000000 -0500 ++++ b/absl/time/CMakeLists.txt 2023-10-30 21:50:32.639061785 -0400 +@@ -55,7 +55,7 @@ + ) + + if(APPLE) +- find_library(CoreFoundation CoreFoundation) ++ set(CoreFoundation "-framework CoreFoundation") + endif() + + absl_cc_library( diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix index 81afbe4886..b782dfbe06 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix @@ -2,14 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-03-07"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - # Last commit that compiles with Agda 2.6.3 - rev = "c6ee57a2da327def241324b4775ec2c67cdab2af"; - hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg="; + rev = "c6e0c3c714486fd6c89ace31443428ba48871685"; + hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc="; }; # We don't need anything in support; avoid installing LICENSE.agda diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index ff520fb85e..2b26a95629 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1a"; + version = "0.1.7.2"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; + sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix index 573b13d3b4..fcc100e7a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2022-01-14"; + version = "unstable-2023-10-04"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "3d143d6d0a3f75966602480665623e87233ff93e"; - hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; + rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; + hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix index 1ecf4b843c..50ca17a10a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k="; + hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8="; }; # The cubical library has several `Everything.agda` files, which are diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 083741d58e..8d039701d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -26,5 +26,6 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 76f69f54d7..10fd1034eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; + hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index 4efa425ee2..afd0ad458b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-wJVx0rwK0Qk07jlP0DyEAZUrAD+47qcVXSnTh5ngZG8="; + sha256 = "sha256-MND1GtnIGUtRrtyUX1eR9UoGGtuTPtVEIIET3QQ6blA="; }; # note: out is unused (but required for outputDoc anyway) diff --git a/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix index f317ae2833..b6fb92ae62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alkimia/default.nix @@ -5,18 +5,18 @@ mkDerivation rec { pname = "alkimia"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lXrcY8C+VN1DPjJoo3MjvlRW5auE7OJ/c6FhapLbhtU="; + sha256 = "sha256-z4Ru6HucxjD1jgvdIzNCloELo7zBdR/i9HIhYYl+4zo="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; # qtwebengine is not a mandatory dependency, but it adds some features # we might need for alkimia's dependents. See: - # https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124 + # https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124 buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix index b3346be1bb..487b0dfde0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix @@ -1,10 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU, libGL, libjpeg, flac -, libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs +{ lib +, alsa-lib +, cmake +, enet +, fetchFromGitHub +, fetchpatch +, flac +, freetype +, gtk3 +, libGL +, libGLU +, libjpeg +, libopus +, libpng +, libpthreadstubs +, libpulseaudio +, libtheora +, libvorbis +, libwebp +, libX11 +, libXcursor , libXdmcp +, libXext +, libXfixes +, libXi +, libXpm +, libXt +, libXxf86dga +, libXxf86misc +, libXxf86vm +, openal +, pcre +, physfs +, pkg-config +, stdenv +, texinfo +, xorgproto +, zlib }: stdenv.mkDerivation rec { @@ -18,15 +49,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - texinfo zlib libpng libvorbis openal libGLU libGL - libjpeg flac enet libtheora freetype physfs libopus - gtk3 pcre + enet + flac + freetype + gtk3 + libGL + libGLU + libjpeg + libopus + libpng + libtheora + libvorbis + libwebp + openal + pcre + physfs + texinfo + zlib ] ++ lib.optionals stdenv.isLinux [ - libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib - libXxf86dga libXxf86misc libXxf86vm libXi libXfixes - libXdmcp libpulseaudio libpthreadstubs + alsa-lib + libpthreadstubs + libpulseaudio + libX11 + libXcursor + libXdmcp + libXext + libXfixes + libXi + libXpm + libXt + libXxf86dga + libXxf86misc + libXxf86vm + xorgproto ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index eacf704aa6..41466a9d77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q3.3"; + version = "2023.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "HHnMiU6mzhUSicXev53PP8y9ealtDMavJLp2F/JAWhI="; + sha256 = "5fSz8sksH3K9k0nIx9DUmGGUfIo4Fc4NMettaVqRsY8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 178b9cf15e..609d29ed69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.2"; + version = "5.18.3"; src = fetchurl { - sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo="; + sha256 = "sha256-lDOBqm00BwfebELq2/e0G3/fk99gQVbZctUMTaeDVE8="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/applet-window-appmenu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/applet-window-appmenu/default.nix new file mode 100644 index 0000000000..09185bfb3c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/applet-window-appmenu/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, kdecoration +, plasma-framework +, plasma-workspace +, libSM +, qtx11extras +, kwindowsystem +, libdbusmenu +, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "applet-window-appmenu"; + version = "unstable-2022-06-27"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "applet-window-appmenu"; + rev = "1de99c93b0004b80898081a1acfd1e0be807326a"; + hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + kdecoration + kwindowsystem + plasma-framework + plasma-workspace + libSM + qtx11extras + libdbusmenu + ]; + + meta = with lib; { + description = "Plasma 5 applet in order to show window menu in your panels"; + homepage = "https://github.com/psifidotos/applet-window-appmenu"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ greydot ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/clang-bdb.patch b/third_party/nixpkgs/pkgs/development/libraries/apr-util/clang-bdb.patch new file mode 100644 index 0000000000..02e9c8378c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/apr-util/clang-bdb.patch @@ -0,0 +1,12 @@ +diff -ur a/build/dbm.m4 b/build/dbm.m4 +--- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 ++++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 +@@ -235,7 +235,7 @@ + #include + #include + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix index b44b410d30..a1cbbc5e66 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; - patches = [ ./fix-libxcrypt-build.patch ] - ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + patches = [ + ./fix-libxcrypt-build.patch + # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. + ./clang-bdb.patch + ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ lib.optional (!stdenv.isCygwin) "--with-crypto" diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index a7acff5fa3..8baf539b26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.28"; + version = "0.8.30"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA="; + sha256 = "sha256-1OxvLpzEKxIXiLJIUr+hCx+sxnH9Z5dBM5Lug1acCok="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff b/third_party/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff deleted file mode 100644 index f99649d568..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/argagg/0001-catch.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 -+++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 -@@ -1307,7 +1307,7 @@ - __FILE__, __LINE__, #expr, #as); \ - try { \ - expr; \ -- } catch(as) { \ -+ } catch(as e) { \ - _DOCTEST_RB.m_threw = true; \ - _DOCTEST_RB.m_threw_as = true; \ - } catch(...) { _DOCTEST_RB.m_threw = true; } \ -@@ -1332,7 +1332,7 @@ - #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) - - #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) --#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) -+#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) - #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) - - #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix index a52dc730f7..16a4f3b7a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argparse"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; rev = "v${version}"; - sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; + sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 3359206b22..76bf38cce1 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 = "12.6.4"; + version = "12.6.5"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-638kP/wy8YMkvH+peNA1hjfnNXyng2vsVbTrVul0k4A="; + hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index d4c3cd394c..2a47de8d56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -7,7 +7,7 @@ , pkg-config , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gsettings-desktop-schemas , makeWrapper , dbus diff --git a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix index 2e8bdc50ca..89f81e26de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { dontAddWafCrossFlags = true; wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; + postPatch = '' + # U was removed in python 3.11 because it had no effect + substituteInPlace waflib/*.py \ + --replace "m='rU" "m='r" \ + --replace "'rU'" "'r'" + ''; + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix index a10aace767..0f420745ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; + buildInputs = [ zlib ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index a5ecbdcfcc..8955c8876a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; + hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix index bb5a4e0dd5..b8b89abc8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; + hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e4..a0869edf4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib +, stdenv +, fetchurl +, lv2 +, meson +, ninja +, pkg-config +, python3 +, libsndfile +, serd +, sord +, sratom +, gitUpdater # test derivations , pipewire @@ -6,24 +18,29 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.12"; + version = "0.24.20"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; }; - patches = [ ./lilv-pkgconfig.patch ]; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ serd sord sratom ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - dontAddWafCrossFlags = true; - passthru.tests = { - inherit pipewire; + mesonFlags = [ "-Ddocs=disabled" ]; + + passthru = { + tests = { + inherit pipewire; + }; + updateScript = gitUpdater { + url = "https://gitlab.com/lv2/lilv.git"; + rev-prefix = "v"; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch deleted file mode 100644 index a5a8c6007e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/lilv.pc.in -+++ b/lilv.pc.in -@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins --Requires: @LILV_PKG_DEPS@ -+Requires: lv2 -+Requires.private: @LILV_PKG_DEPS@ diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix index 59f7d16929..01a3933fe2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "LIBDIR=${placeholder "out"}/lib" ]; + postInstall = '' + mv $out/include/qm-dsp/* $out/include + rmdir $out/include/qm-dsp + ''; + env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index 44b8812b29..7d1bac5747 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zix"; - version = "unstable-2023-02-13"; + version = "0.4.2"; src = fetchFromGitLab { owner = "drobilla"; repo = pname; - rev = "262d4a1522c38be0588746e874159da5c7bb457d"; - hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00="; + rev = "v${version}"; + hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix index c6d656388d..f9974e2ca2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; + # std::unary_function has been removed in c++17 + makeFlags = [ "CXXFLAGS=-std=c++11" ]; + # Even when statically linking, libstdc++.la is put in dependency_libs here, # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the # compiler do what it does best. (libaudiofile.la is a generated file, so we diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 9f5a68187c..944182e141 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; + sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index df43976e6c..2c76371955 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; + sha256 = "sha256-4YuOC90FBcuNYGBsqw3wKYNGkg3MssezvR8bu6BNGeM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index f3b138d274..e473fa97a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.98"; + version = "5.2.109"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-j1vVd9UcwmP3tGGN6NApiMyOql8vYljTqj3CKor1Ckk="; + hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix index fd69db12d3..0383adca64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix @@ -7,15 +7,13 @@ stdenv.mkDerivation rec { pname = "boost-sml"; - # This is first commit since 1.1.6 that passes all tests (test_policies_logging is commented out) - version = "1.1.6"; - working_tests = "24d762d1901f4f6afaa5c5e0d1b7b77537964694"; + version = "1.1.9"; src = fetchFromGitHub { owner = "boost-ext"; repo = "sml"; - rev = "${working_tests}"; - hash = "sha256-ZhIfyYdzrzPTAYevOz5I6tAcUiLRMV8HENKX9jychEY="; + rev = "v${version}"; + hash = "sha256-RYgSpnsmgZybpkJALIzxpkDRfe9QF2FHG+nA3msFaK0="; }; buildInputs = [ boost ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix index 139c002bb3..a9b6a7aa27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,9 @@ { callPackage, fetchpatch, lib, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.1"; - revision = "1"; - sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + baseVersion = "3.2"; + revision = "0"; + sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. badPlatforms = lib.platforms.darwin; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index bff3a490b2..753dda572d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.0"; + version = "0.19.4"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-pGX8BjDupJb7rmaxig0XX9RCKiIw2GjM4TVmcB5HJ+I="; + hash = "sha256-Qi3nyUSwrYBy8lCP+R6/u/WtnZJcgSwb07pZVScAzcU="; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; - doCheck = true; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + + doCheck = !stdenv.isDarwin; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index 69a8978ae6..017b4cf46a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,12 +1,8 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype -, x11Support? !stdenv.isDarwin, libXext, libXrender +{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL # libGLU libGL is no longer a big dependency -, pdfSupport ? true +, xcbSupport ? x11Support, libxcb , darwin , testers }: @@ -17,82 +13,27 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; + hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; }; - patches = [ - # Fixes CVE-2018-19876; see Nixpkgs issue #55384 - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 - # - # This patch is the merged commit from the above PR. - (fetchpatch { - name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; - }) - - # Fix PDF output. - # https://gitlab.freedesktop.org/cairo/cairo/issues/342 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; - }) - - # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 - (fetchpatch { - name = "CVE-2020-35492.patch"; - includes = [ "src/cairo-image-compositor.c" ]; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; - }) - - # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 - ./skip-configure-stderr-check.patch - - # Fixes cairo crash on macOS Big Sur - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; - }) - - # Fix clang build failures on newer LLVM versions - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/119 - (fetchpatch { - name = "fix-types.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; - }) - - # Fix unexpected color addition on grayscale images (usually text). - # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 - # Can be removed after 1.18 release - (fetchpatch { - name = "fix-grayscale-anialias.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; - }) - - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small separateDebugInfo = true; nativeBuildInputs = [ + gtk-doc + meson + ninja pkg-config + python3 ]; buildInputs = [ - libiconv - libintl + docbook_xsl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText @@ -100,49 +41,53 @@ in { Carbon ]); - propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optionals xcbSupport [ libxcb ] ++ optional gobjectSupport glib - ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = [ - "--enable-tee" - ] ++ (if stdenv.isDarwin then [ - "--disable-dependency-tracking" - "--enable-quartz" - "--enable-quartz-font" - "--enable-quartz-image" - "--enable-ft" - ] else (optional xcbSupport "--enable-xcb" - ++ optional glSupport "--enable-gl" - ++ optional pdfSupport "--enable-pdf" - )) ++ optional (!x11Support) "--disable-xlib"; + mesonFlags = [ + "-Dgtk_doc=true" - preConfigure = - # On FreeBSD, `-ldl' doesn't exist. - lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - '' - + - '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - substituteInPlace configure --replace strings $STRINGS - ''; + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; enableParallelBuilding = true; doCheck = false; # fails - postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -151,9 +96,8 @@ in { longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration @@ -162,10 +106,10 @@ in { homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; pkgConfigModules = [ + "cairo-pdf" "cairo-ps" "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-pdf"; + ] ++ lib.optional gobjectSupport "cairo-gobject"; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix index ce310593e2..4e8175d058 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -9,13 +9,13 @@ , examples ? false }: stdenv.mkDerivation rec { pname = "cassandra-cpp-driver"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "datastax"; repo = "cpp-driver"; rev = "refs/tags/${version}"; - sha256 = "sha256-sLKLaBFnGq3NIQV7Tz5aAfsL+LeLw8XDbcJt//H468k="; + sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix new file mode 100644 index 0000000000..fc18eef2ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix @@ -0,0 +1,113 @@ +{ lib +, config +, stdenv +, fetchFromGitHub +, cmake +, libiconv +, llvmPackages +, ninja +, openssl +, python3Packages +, ragel +, yasm +, zlib +, cudaSupport ? config.cudaSupport +, cudaPackages ? {} +, pythonSupport ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "catboost"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "catboost"; + repo = "catboost"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-A1zCIqPOW21dHKBQHRtS+/sstZ2o6F8k71lmJFGn0+g="; + }; + + patches = [ + ./remove-conan.patch + ]; + + postPatch = '' + substituteInPlace cmake/common.cmake \ + --replace "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ + --replace "\''${YASM_BIN}" "${yasm}/bin/yasm" + + shopt -s globstar + for cmakelists in **/CMakeLists.*; do + sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists + ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") '' + sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists + sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists + ''} + done + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + llvmPackages.bintools + ninja + (python3Packages.python.withPackages (ps: with ps; [ six ])) + ragel + yasm + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); + + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + cuda_cccl + libcublas + ]); + + env = { + CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; + NIX_LDFLAGS = "-lc -lm"; + }; + + cmakeFlags = [ + "-DCMAKE_BINARY_DIR=$out" + "-DCMAKE_POSITION_INDEPENDENT_CODE=on" + "-DCATBOOST_COMPONENTS=app;libs${lib.optionalString pythonSupport ";python-package"}" + ] ++ lib.optionals cudaSupport [ + "-DHAVE_CUDA=on" + ]; + + installPhase = '' + runHook preInstall + + mkdir $dev + cp -r catboost $dev + install -Dm555 catboost/app/catboost -t $out/bin + install -Dm444 catboost/libs/model_interface/static/lib/libmodel_interface-static-lib.a -t $out/lib + install -Dm444 catboost/libs/model_interface/libcatboostmodel${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib + install -Dm444 catboost/libs/train_interface/libcatboost${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "High-performance library for gradient boosting on decision trees"; + longDescription = '' + A fast, scalable, high performance Gradient Boosting on Decision Trees + library, used for ranking, classification, regression and other machine + learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. + ''; + license = licenses.asl20; + platforms = platforms.unix; + homepage = "https://catboost.ai"; + maintainers = with maintainers; [ PlushBeaver natsukium ]; + mainProgram = "catboost"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch b/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch new file mode 100644 index 0000000000..6f96b7989a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/remove-conan.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index becd2ad03c..7e3c8c99b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,6 @@ cmake_policy(SET CMP0104 OLD) + + include(cmake/archive.cmake) + include(cmake/common.cmake) +-include(cmake/conan.cmake) + include(cmake/cuda.cmake) + include(cmake/cython.cmake) + include(cmake/fbs.cmake) +@@ -37,21 +36,6 @@ include(cmake/recursive_library.cmake) + include(cmake/swig.cmake) + include(cmake/global_vars.cmake) + +-if (CMAKE_CROSSCOMPILING) +- include(${CMAKE_BINARY_DIR}/conan_paths.cmake) +-else() +- conan_cmake_autodetect(settings) +- conan_cmake_install( +- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} +- INSTALL_FOLDER ${CMAKE_BINARY_DIR} +- BUILD missing +- REMOTE conancenter +- SETTINGS ${settings} +- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" +- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" +- ) +-endif() +- + if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) + elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix index e0d6149362..968f32a0af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gmp , autoreconfHook -, texlive +, texliveSmall }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [gmp]; nativeBuildInputs = [ autoreconfHook - texlive.combined.scheme-small # for building the documentation + texliveSmall # for building the documentation ]; # No actual checks yet (2018-05-05), but maybe one day. # Requested here: https://github.com/cddlib/cddlib/issues/25 diff --git a/third_party/nixpkgs/pkgs/development/libraries/cdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cdk/default.nix deleted file mode 100644 index 27b7b9b9c8..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/cdk/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "cdk"; - version = "5.0-20221025"; - - src = fetchurl { - urls = [ - "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" - "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" - ]; - hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; - }; - - buildInputs = [ - ncurses - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Curses development kit"; - homepage = "https://invisible-island.net/cdk/"; - changelog = "https://invisible-island.net/cdk/CHANGES"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix index 8add9c6234..14b4e54926 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/check/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/check/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; + # fortify breaks the libcompat vsnprintf implementation + hardeningDisable = lib.optionals (stdenv.hostPlatform.isMusl && (stdenv.hostPlatform != stdenv.buildPlatform)) [ "fortify" ]; + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix index 832ca66d6d..dd4d410bb8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-UY6HSth3xuXVfiKolttpYf19rZ2c/X1FXHV7TA/hAiM="; + hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix index 80c4187c95..804aa13ed9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + #doCheck = true; # no tests possible without a display passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix index 41aa304584..987d90e269 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { "--enable-wayland-egl-server" "--enable-gles1" "--enable-gles2" + # Force linking against libGL. + # Otherwise, it tries to load it from the runtime library path. + "LIBS=-lGL" ] ++ lib.optionals stdenv.isDarwin [ "--disable-glx" "--without-x" @@ -82,11 +85,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ - "-I${pango.dev}/include/pango-1.0" - "-I${cairo.dev}/include/cairo" - "-I${harfbuzz.dev}/include/harfbuzz" - ]); + env = { + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; #doCheck = true; # all tests fail (no idea why) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix deleted file mode 100644 index 6f4cdb1cf6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/cosmopolitan/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped, coreutils, substituteAll }: - -stdenv.mkDerivation rec { - pname = "cosmopolitan"; - version = "2.2"; - - src = fetchFromGitHub { - owner = "jart"; - repo = pname; - rev = version; - sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; - }; - - patches = [ - # make sure tests set PATH correctly - (substituteAll { src = ./fix-paths.patch; inherit coreutils; }) - ]; - - nativeBuildInputs = [ bintools-unwrapped unzip ]; - - outputs = [ "out" "dist" ]; - - # slashes are significant because upstream uses o/$(MODE)/foo.o - buildFlags = [ "o/cosmopolitan.h" "o//cosmopolitan.a" "o//libc/crt/crt.o" "o//ape/ape.o" "o//ape/ape.lds" ]; - checkTarget = "o//test"; - enableParallelBuilding = true; - - doCheck = true; - dontConfigure = true; - dontFixup = true; - - preCheck = '' - # some syscall tests fail because we're in a sandbox - rm test/libc/calls/sched_setscheduler_test.c - rm test/libc/thread/pthread_create_test.c - rm test/libc/calls/getgroups_test.c - - # fails - rm test/libc/stdio/posix_spawn_test.c - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/{include,lib} - install o/cosmopolitan.h $out/include - install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib - - cp -RT . "$dist" - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "Your build-once run-anywhere c library"; - platforms = platforms.x86_64; - badPlatforms = platforms.darwin; - license = licenses.isc; - maintainers = teams.cosmopolitan.members; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix index ba5d96a951..4c0badf3df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -1,6 +1,6 @@ let version = "2.9.11"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext -, wordlists ? [ (fetchurl { +, lists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; }) ] @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs util '' + '' - ln -vs ${toString wordlists} dicts/ + ln -vs ${toString lists} dicts/ ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix index c8bc708a2a..5aac0850a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; + url = "https://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance templating engine"; - homepage = "http://ctpp.havoc.ru"; + homepage = "https://ctpp.havoc.ru/"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index f9408818e3..c2799b97e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -5,6 +5,9 @@ , darwin # Accelerate , llvmPackages # openmp , withMkl ? false, mkl +, withCUDA ? false +, withCuDNN ? false +, cudaPackages # Enabling both withOneDNN and withOpenblas is broken # https://github.com/OpenNMT/CTranslate2/issues/1294 , withOneDNN ? false, oneDNN @@ -21,18 +24,20 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-PdCjzLyc5O1rrTtPz8JD08unY7uMNS5fcD3ZLHJDeYg="; + hash = "sha256-ehybfwwMYMKPPeyv05zgDxmw0zr35eoY8wc/tb7DQw0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake + ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_nvcc ]; cmakeFlags = [ @@ -40,6 +45,8 @@ stdenv.mkDerivation rec { # https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53 # https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12 "-DOPENMP_RUNTIME=COMP" + "-DWITH_CUDA=${cmakeBool withCUDA}" + "-DWITH_CUDNN=${cmakeBool withCuDNN}" "-DWITH_DNNL=${cmakeBool withOneDNN}" "-DWITH_OPENBLAS=${cmakeBool withOpenblas}" "-DWITH_RUY=${cmakeBool withRuy}" @@ -49,6 +56,12 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withMkl [ mkl + ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + cudaPackages.libcurand + ] ++ lib.optionals withCuDNN [ + cudaPackages.cudnn ] ++ lib.optionals withOneDNN [ oneDNN ] ++ lib.optionals withOpenblas [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix index bdc35ec23d..0c7ef37961 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.8"; + version = "3.8.1"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-oGJHSyvcgvBJh5fquK6dU70czVg4txcGTuicvrTK2hc="; + hash = "sha256-EzAPIqdfktrZ+FTEzz52nRNnH7CG59ZE9Ww7qMkAAbY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix index d8c3309acb..a809eda31c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.8"; + version = "1.14.10"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; + sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; - homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + homepage = "https://www.freedesktop.org/wiki/Software/dbus/"; changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix index 431f010eed..92b6397c41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A general purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; - maintainers = with maintainers; [ christopherpoole ma27 ]; + maintainers = with maintainers; [ christopherpoole ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix index a82759ba3e..5d2e3b3245 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.8.7"; + version = "1.9.0"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lKV4dRIIkCn/qW8DyqDRHADh0tW0/ocf/29ox9aC0Yo="; + sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix index ea152c0cc0..c9f6711780 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-EKvDH7RwOC4Gu/lturrfnGpzXnJ9azIwAFeuVoa6L/Y="; + hash = "sha256-UG/vV/6WxVLq9mdze8pSDFJIekOgGsg93dzMq6eP6Dg="; }; patches = [ ./version.patch ]; @@ -106,10 +106,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/duckdb/duckdb"; + changelog = "https://github.com/duckdb/duckdb/releases/tag/v${version}"; description = "Embeddable SQL OLAP Database Management System"; + homepage = "https://duckdb.org/"; license = licenses.mit; - platforms = platforms.all; + mainProgram = "duckdb"; maintainers = with maintainers; [ costrouc cpcloud ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/duckdb/version.patch b/third_party/nixpkgs/pkgs/development/libraries/duckdb/version.patch index 9b368eac5d..f40785b430 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/duckdb/version.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/duckdb/version.patch @@ -56,25 +56,3 @@ index 2b49e11288..0a4a69b9a0 100644 message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") -diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py -index fdf2911019..c363cc518a 100644 ---- a/tools/pythonpkg/setup.py -+++ b/tools/pythonpkg/setup.py -@@ -163,8 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: - for ext in extensions: - toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) - --toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) -- - - class get_pybind_include(object): - def __init__(self, user=False): -@@ -343,7 +341,7 @@ setup( - packages=packages, - include_package_data=True, - python_requires='>=3.7.0', -- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], -+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], - use_scm_version=setuptools_scm_conf, - tests_require=['google-cloud-storage', 'mypy', 'pytest'], - classifiers=[ diff --git a/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 5f830ba5c5..0258165d4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.30.2"; + version = "2.32.1"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-ObleQiGxFtyBhlbQTIKIQFXUiuuqKZDCWeqM3/2kJYI="; + sha256 = "sha256-rSrBvzZXex01xKdxtNF0oG9SKh5e9sH15Tp5X7Ykhj4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix index 66e05dc9af..f84b44007e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.12"; + version = "1.1.13"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-KxlUuoj2HJhkqkIX+Pic/0+36g/N3qfAAlnvYO2Y6uQ="; + hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix index 810e04d3a3..0967ba113f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !enableCuda; nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 8d25e36ad7..d4ab53f37b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , aspell , groff , pkg-config @@ -13,15 +14,23 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.1"; + version = "2.6.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-8k4SRpE3rh0DFAu5AypHpZR8NvTR4vErkpBhAF6xUnk="; + hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; + patches = [ + # fix build with clang 16 + (fetchpatch { + url = "https://github.com/AbiWord/enchant/commit/f71eb22e4af7f9917011807a41cf295d3ce0ccbc.patch"; + hash = "sha256-9WWvpU3HKzPlxNBYQAKPppW6G3kOIC2A+MqX5eheBDA="; + }) + ]; + nativeBuildInputs = [ groff pkg-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index bf36c5a9bc..fb2db6a963 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , gettext @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.0"; + version = "0.28.1"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -27,9 +28,16 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-nEoLJWxSJmAonCbW/iZKjLrKMj09mwEaSUXUcUu8GxU="; + hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; + hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -67,8 +75,7 @@ stdenv.mkDerivation rec { "doc" ]; - # https://github.com/Exiv2/exiv2/issues/2762 - doCheck = lib.versionOlder brotli.version "1.1.0"; + doCheck = true; preCheck = '' patchShebangs ../test/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index 2c23409dc8..8389640e4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.10"; + version = "23.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-h4wPUUYG8IZr2jHUlKFO2K3QKGiX9AzyLc2Ma5hR8Tk="; + sha256 = "sha256-iK0cjhq16DU/77p0cM3SMk+gE1PQV0zd96a3kxwXNLk="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index cd02c6bba1..57235b2430 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder diff --git a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix index ec1715b005..eeac7d1456 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch index 683cdbcaf1..da14750090 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -180,14 +180,16 @@ index d9fc8251..d8ddb96e 100755 @@ -1,10 +1,10 @@ #!/bin/sh - if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then +-if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then - cp /usr/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" -+ cp @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" ++if test -d "$1/exports/share/icons/hicolor"; then ++ @coreutils@/bin/cp -f @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" for dir in "$1"/exports/share/icons/*; do if test -f "$dir/index.theme"; then - if ! gtk-update-icon-cache --quiet "$dir"; then +- echo "Failed to run gtk-update-icon-cache for $dir" + if ! @gtk3@/bin/gtk-update-icon-cache --quiet "$dir"; then - echo "Failed to run gtk-update-icon-cache for $dir" ++ @coreutils@/bin/echo "Failed to run gtk-update-icon-cache for $dir" exit 1 fi diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger diff --git a/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix index 8d1c19a48a..ab74a09d07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.4"; + version = "5.4.5"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; + sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix index b42fdbd60c..97c356a3aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.20"; + version = "1.4.6"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0="; + hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 6e6989d930..1687bf5c51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.1"; + version = "2.13.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6mfjsBmxEE0WZ6onT13DB9jL1gazmbwy3zCKd/GlZL8="; + sha256 = "sha256-EpkcTlXFBt1/m3ZZM+Yv0r4uBtQhUF15UKEy5PG7SE0="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { fonts. ''; homepage = "https://www.freetype.org/"; + changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; pkgConfigModules = [ "freetype2" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/frugally-deep/default.nix b/third_party/nixpkgs/pkgs/development/libraries/frugally-deep/default.nix new file mode 100644 index 0000000000..f275ec5f02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/frugally-deep/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, cmake +, functionalplus +, eigen +, nlohmann_json +, doctest +, python3Packages +, buildTests ? false # Needs tensorflow +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "frugally-deep"; + version = "0.15.24-p0"; + + src = fetchFromGitHub { + owner = "Dobiasd"; + repo = "frugally-deep"; + rev = "v${finalAttrs.version}"; + hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; + }; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals buildTests [ + python3Packages.python + python3Packages.numpy + ]; + + buildInputs = lib.optionals buildTests [ + doctest + python3Packages.tensorflow + ]; + + propagatedBuildInputs = [ + functionalplus + eigen + nlohmann_json + ]; + + cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ]; + passthru.updateScript = gitUpdater; + + meta = with lib; { + description = "Header-only library for using Keras (TensorFlow) models in C++"; + homepage = "https://github.com/Dobiasd/frugally-deep"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index e23eb42d33..28f083c31b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4="; + hash = "sha256-+69mh1hKL1r7SNwDilaQz5UochMMWFG2lrBLYBF31JY="; }; nativeBuildInputs = [ @@ -233,6 +233,9 @@ stdenv.mkDerivation (finalAttrs: { "test_sentinel2_zipped" # tries to call unwrapped executable "test_SetPROJAuxDbPaths" + # fixed and renamed in 3.8.0RC1 + # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 + "test_visoss_6" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 76e661dfbd..3298be5cc3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -9,7 +9,12 @@ , libiconv , enablePython ? false , python ? null -, swig +, swig4 +, expat +, libuuid +, openjpeg +, zlib +, pkg-config }: stdenv.mkDerivation rec { @@ -27,6 +32,10 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_BUILD_TESTING=ON" + "-DGDCM_USE_SYSTEM_EXPAT=ON" + "-DGDCM_USE_SYSTEM_ZLIB=ON" + "-DGDCM_USE_SYSTEM_UUID=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -38,15 +47,23 @@ stdenv.mkDerivation rec { "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optionals enableVTK [ + buildInputs = [ + expat + libuuid + openjpeg + zlib + ] ++ lib.optionals enableVTK [ vtk ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig python ]; + ] ++ lib.optionals enablePython [ swig4 python ]; disabledTests = [ # require networking: diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index d982b77297..f77daec2ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -19,7 +19,7 @@ , lib , testers , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/gecode/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gecode/3.nix index 36c7120ac6..1d6f158b52 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gecode/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gecode/3.nix @@ -18,10 +18,17 @@ stdenv.mkDerivation rec { (import ./fix-const-weights-clang-patch.nix fetchpatch) ]; + postPatch = '' + substituteInPlace gecode/flatzinc/lexer.yy.cpp \ + --replace "register " "" + ''; + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index 1f3ce471dc..90bdfdb0d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; passthru.tests = { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 9d8f0fd823..4a346fdcff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix index 70d06c107f..1b45be6112 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + patches = [ + (fetchpatch { + name = "gf2x-1.3.0-configure-clang16.patch"; + url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; + hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix index 617d51d85e..fdfb203ba1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2022-03-24"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; repo = pname; - rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533"; - hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU="; + rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; + hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; }; nativeBuildInputs = [ python3 cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch new file mode 100644 index 0000000000..234bc1943c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch @@ -0,0 +1,37 @@ +From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Tue, 31 Oct 2023 14:30:24 +0000 +Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard + +--- + sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7c200599c1..583a426494 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -25,17 +25,17 @@ + /* Get default empty definitions for simd declarations. */ + #include + +-#if __GNUC_PREREQ(9, 0) ++#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __Float32x4_t __f32x4_t; + typedef __Float64x2_t __f64x2_t; +-#elif __glibc_clang_prereq(8, 0) ++#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t; + typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t; + #endif + +-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0) ++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__) + # define __SVE_VEC_MATH_SUPPORTED + typedef __SVFloat32_t __sv_f32_t; + typedef __SVFloat64_t __sv_f64_t; +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz deleted file mode 100644 index 04b4e26475..0000000000 Binary files a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz and /dev/null differ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz new file mode 100644 index 0000000000..6414956807 Binary files /dev/null and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz differ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index f98c0eb1c3..3e17817c0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.37"; - patchSuffix = "-8"; - sha256 = "sha256-Ilfv8RGhgV109GhW2q9AsBnB5VMVbGnUi6DL/Bu5GkM="; + version = "2.38"; + patchSuffix = "-27"; + sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,14 +59,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.36/master && git describe - glibc-2.37-8-g590d0e089b - $ git show --minimal --reverse glibc-2.37.. | gzip -9n --rsyncable - > 2.37-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.38/master && git describe + glibc-2.38-27-g750a45a783 + $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.37-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz + $ zdiff -u 2.38-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz */ - ./2.37-master.patch.gz + ./2.38-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -89,13 +89,26 @@ stdenv.mkDerivation ({ ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch - /* Patch derived from archlinux (at the time of adding they're at 2.37), - https://github.com/archlinux/svntogit-packages/blob/packages/glibc/trunk/reenable_DT_HASH.patch + /* Patch derived from archlinux, + https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/blob/e54d98e2d1aae4930ecad9404ef12234922d9dfd/reenable_DT_HASH.patch - See https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 for context. + See also https://github.com/ValveSoftware/Proton/issues/6051 + & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 */ ./reenable_DT_HASH.patch ] + /* NVCC does not support ARM intrinsics. Since is pulled in by almost + every HPC piece of software, without this patch CUDA compilation on ARM + is effectively broken. See + https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2. + */ + ++ ( + let + isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64; + isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux; + in + lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch + ) ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -135,6 +148,7 @@ stdenv.mkDerivation ({ "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") + "--enable-fortify-source" ] ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [ # This feature is currently supported on # i386, x86_64 and x32 with binutils 2.29 or later, @@ -159,7 +173,7 @@ stdenv.mkDerivation ({ "libc_cv_as_needed=no" ] ++ lib.optional withGd "--with-gd" - ++ lib.optional (!withLibcrypt) "--disable-crypt"; + ++ lib.optional withLibcrypt "--enable-crypt"; makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" @@ -274,7 +288,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 ]; + maintainers = with maintainers; [ eelco ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix index 1c822bf1ed..be3bee081e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -3,7 +3,7 @@ , profilingLibraries ? false , withGd ? false , withLibcrypt? false -, buildPackages +, pkgsBuildBuild , libgcc }: @@ -95,17 +95,26 @@ in "user-defined-trusted-dirs=${libgcc}/lib" ]; - postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' + postInstall = previousAttrs.postInstall + (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else lib.optionalString stdenv.buildPlatform.isLinux '' + '' else lib.optionalString stdenv.buildPlatform.isLinux # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, - # we simply use the one from buildPackages + # we simply use the one from pkgsBuildBuild. + # + # Note that we can't use pkgsBuildHost (aka buildPackages) here, because + # that will cause an eval-time infinite recursion: "buildPackages.glibc + # depended on buildPackages.libgcc, which, since it's GCC, depends on the + # target's bintools, which depend on the target's glibc, which, again, + # depends on buildPackages.glibc, causing an infinute recursion when + # evaluating buildPackages.glibc when glibc hasn't come from stdenv + # (e.g. on musl)." https://github.com/NixOS/nixpkgs/pull/259964 + '' pushd ../glibc-2*/localedata export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata - mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale - ${lib.getBin buildPackages.glibc}/bin/localedef \ + mkdir -p $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale + ${lib.getBin pkgsBuildBuild.glibc}/bin/localedef \ --alias-file=../intl/locale.alias \ -i locales/C \ -f charmaps/UTF-8 \ @@ -115,7 +124,7 @@ in else "--big-endian"} \ C.UTF-8 - cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + cp -r $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale $out/lib popd '') + '' @@ -145,7 +154,7 @@ in ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so touch $out/lib/libpthread.a # Put libraries for static linking in a separate output. Note @@ -154,6 +163,8 @@ in mkdir -p $static/lib mv $out/lib/*.a $static/lib mv $static/lib/lib*_nonshared.a $out/lib + # If libutil.so.1 is missing, libutil.a is required. + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib # Some of *.a files are linker scripts where moving broke the paths. sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ -i "$static"/lib/*.a diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh b/third_party/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh index d91f936c93..27894b09b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/reenable_DT_HASH.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/reenable_DT_HASH.patch index f828b011bd..87a2329d82 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/reenable_DT_HASH.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/reenable_DT_HASH.patch @@ -1,145 +1,28 @@ -From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Fri, 29 Apr 2022 16:37:51 +0200 -Subject: [PATCH] Do not use --hash-style=both for building glibc shared - objects +From 31915e55f9c34f6137ab1c5ac002375a2d5d4589 Mon Sep 17 00:00:00 2001 +From: Frederik Schwan +Date: Fri, 4 Aug 2023 15:19:57 +0200 +Subject: [PATCH] force --hash-style=both to keep compatibility with old niche + software -The comment indicates that --hash-style=both was used to maintain -compatibility with static dlopen, but we had many internal ABI -changes since then, so this compatiblity does not add value anymore. - -Reviewed-by: Carlos O'Donell --- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - config.make.in | 1 + - configure | 28 ++++++++++++++++++++++++++++ - configure.ac | 16 ++++++++++++++++ - 5 files changed, 61 insertions(+) + Makeconfig | 4 ++++ + 1 file changed, 4 insertions(+) -diff --git b/Makeconfig a/Makeconfig -index 760f14e92f..0aa5fb0099 100644 ---- b/Makeconfig -+++ a/Makeconfig -@@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro +diff --git a/Makeconfig b/Makeconfig +index 77d7fd14df..2ae67c4beb 100644 +--- a/Makeconfig ++++ b/Makeconfig +@@ -378,6 +378,10 @@ relro-LDFLAGS = -Wl,-z,relro LDFLAGS.so += $(relro-LDFLAGS) LDFLAGS-rtld += $(relro-LDFLAGS) -+ifeq (yes,$(have-hash-style)) -+# For the time being we unconditionally use 'both'. At some time we -+# should declare statically linked code as 'out of luck' and compile -+# with --hash-style=gnu only. +hashstyle-LDFLAGS = -Wl,--hash-style=both +LDFLAGS.so += $(hashstyle-LDFLAGS) +LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+endif + - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git b/Makerules a/Makerules -index 354528b8c7..428464f092 100644 ---- b/Makerules -+++ a/Makerules -@@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ $(if $(filter yes,$(have-hash-style)), \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ -+ , \ -+ -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ ) \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ -diff --git b/config.make.in a/config.make.in -index fff4c78dd0..bf728c71c0 100644 ---- b/config.make.in -+++ a/config.make.in -@@ -70,6 +70,7 @@ have-libcap = @have_libcap@ - have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ - fno-unit-at-a-time = @fno_unit_at_a_time@ - bind-now = @bindnow@ -+have-hash-style = @libc_cv_hashstyle@ - use-default-link = @use_default_link@ - have-cxx-thread_local = @libc_cv_cxx_thread_local@ - have-loop-to-function = @libc_cv_cc_loop_to_function@ -diff --git b/configure a/configure -index 716dc041b6..5a730dc5fc 100755 ---- b/configure -+++ a/configure -@@ -622,6 +622,7 @@ libc_cv_cc_nofma - libc_cv_mtls_dialect_gnu2 - fno_unit_at_a_time - libc_cv_has_glob_dat -+libc_cv_hashstyle - libc_cv_fpie - libc_cv_z_execstack - ASFLAGS_config -@@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 -+$as_echo_n "checking for --hash-style option... " >&6; } -+if ${libc_cv_hashstyle+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat > conftest.c <&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 -+$as_echo "$libc_cv_hashstyle" >&6; } -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 - $as_echo_n "checking for GLOB_DAT reloc... " >&6; } - if ${libc_cv_has_glob_dat+:} false; then : -diff --git b/configure.ac a/configure.ac -index d08ad4d64e..a045f6608e 100644 ---- b/configure.ac -+++ a/configure.ac -@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) - - AC_SUBST(libc_cv_fpie) - -+AC_CACHE_CHECK(for --hash-style option, -+ libc_cv_hashstyle, [dnl -+cat > conftest.c <&AS_MESSAGE_LOG_FD]) -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest*]) -+AC_SUBST(libc_cv_hashstyle) -+ - AC_CACHE_CHECK(for GLOB_DAT reloc, - libc_cv_has_glob_dat, [dnl - cat > conftest.c < (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tnsxMTpUxpKbgpadQdPP3y9Y21c/tfSR5rul2ErqB3g="; + hash = "sha256-s7B/4/HOf+k6qb5yF4ZgRFSPNcSneSKA7sfhCKMvmBc="; }; - # TODO: Patch is conditional to spare rebuilds during the current staging-next cycle and should be removed during the next bump - patches = lib.optionals qt5Support [ - # Needed until https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083 is merged and released - (fetchpatch { - name = "gst-plugins-good-fix-qt5-without-viv-fb.patch"; - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/03d8ef0b7c6e70eb936de0514831c1aafc763dcf.diff"; - hash = "sha256-17XU/W/TMPg5669O1EBXByAN/VwFu/0idTg5ze3M/D4="; - stripLen = 2; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -90,6 +80,7 @@ stdenv.mkDerivation rec { hotdoc ] ++ lib.optionals qt5Support (with qt5; [ qtbase + qttools ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools @@ -139,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 2309e8717e..7dbd9b61cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-hYPwwfT8sB7tEfoePCESZUOovXOe1Pwdsx91alqwHZo="; + hash = "sha256-d4nmQIOIol8jy/lIz8XGIw1zW7zYt/N/SgHJ40ih46c="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936d..ee467f965c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 885726ee2a..aa211eb51a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-80PrVJZOvU2MBxvl7srVhvKP6wFW4DbgaxSNDn/rscA="; + hash = "sha256-CuM6i1BEO2LxFYGpGB6Qa0HNOHey15nb6nKRLD7aS7M="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 2392d7f341..cf5f93707c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JoBHOyGBWPGEZ8rD4cUCkbf/TgcQ3TUKWeqsvCnAmlQ="; + hash = "sha256-PjFFTJjLL39tLTVezrkzqJL6Dx3Am8NsmryTDY4pykg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index c5d400048d..d2227763f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-qaVQJnyVhN8OjHBDTTBHbo/QAYtzPBwe4z3q9CK9sks="; + hash = "sha256-2bovwmvvmMeOmCxZn1hdRru2X+Ei2onC16tB9GilLHs="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh index 73914495d6..45e640e2a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 539cfc3705..b2afb21b62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch + # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. + ./patches/2.0-clang.patch ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 792f305a83..27afba7833 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -23,7 +23,7 @@ , at-spi2-atk , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , fribidi , xorg diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/third_party/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch new file mode 100644 index 0000000000..1e2e73b983 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/patches/2.0-clang.patch @@ -0,0 +1,49 @@ +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 4317523fb8..3c09cd3ae8 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale, + mark->position = position; + + priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark, +- (GCompareFunc) compare_marks, ++ (GCompareDataFunc) compare_marks, + GINT_TO_POINTER ( + gtk_range_get_inverted (GTK_RANGE (scale)) + )); +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939861..c65e82be26 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth, gboolean _unused) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -35,19 +35,19 @@ create_menu (depth) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Two"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Three"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + return menu; + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix index ec1f00cdc3..d699701930 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.1"; + version = "1.0.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw="; + hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix index 9ffc49e558..d6fe704401 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -17,13 +17,13 @@ }: let - pythonEnv = python3.pythonForBuild.withPackages (ps: with ps; [ + pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ]); in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.6"; + version = "0.4.8"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-CtB9+5dDs+l05NyIFkKJpS1x3zHSykhLW3HiIM0RUWY="; + hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 7fd4572e0b..b88daae22d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, substituteAll , gettext , dbus , glib @@ -53,12 +54,9 @@ stdenv.mkDerivation rec { }; patches = [ - # Hardcode the ssh path again. - # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; - hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; - revert = true; + (substituteAll { + src = ./hardcode-ssh-path.patch; + ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; @@ -76,7 +74,6 @@ stdenv.mkDerivation rec { pkg-config gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 @@ -92,7 +89,7 @@ stdenv.mkDerivation rec { libimobiledevice libbluray libnfs - openssh + libxml2 gsettings-desktop-schemas libsoup_3 ] ++ lib.optionals udevSupport [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/third_party/nixpkgs/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch new file mode 100644 index 0000000000..aaf8e291aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/meson.build b/daemon/meson.build +index 72a16890..718944e1 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -256,7 +256,7 @@ if enable_sftp + '-DDEFAULT_BACKEND_TYPE=sftp', + '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', + '-DMAX_JOB_THREADS=1', +- '-DSSH_PROGRAM="ssh"', ++ '-DSSH_PROGRAM="@ssh_program@"', + ] + + programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} diff --git a/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 227015b76b..6c6818b455 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.1"; + version = "22.7.2"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TSi537RLZGwnyC1nL/Ge3lTlV2FmH1nmAzFSHmaTv04="; + hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 41e29d0d88..88f373dd4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ , ninja , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , icu , graphite2 , harfbuzz # The icu variant uses and propagates the non-icu one. @@ -30,14 +30,15 @@ , gtk4 , mapnik , qt5 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; version = "7.3.0"; src = fetchurl { - url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; + url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs="; }; @@ -103,6 +104,9 @@ stdenv.mkDerivation rec { passthru.tests = { inherit gimp gtk3 gtk4 mapnik; inherit (qt5) qtbase; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -112,5 +116,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ + "harfbuzz" + "harfbuzz-gobject" + "harfbuzz-subset" + ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix index 7bf7132068..53bd7f067b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Y6ATYXsV8hH22XiXyvacuUhHTuNCzObPlxNX2vZGghM="; + hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 91118946a1..dbaa488892 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, python3, hunspell }: let @@ -934,4 +934,37 @@ rec { readmeFile = "README_pt_PT.txt"; license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; + + /* PERSIAN */ + + fa_IR = fa-ir; + fa-ir = mkDict { + pname = "hunspell-dict-fa-ir"; + version = "experimental-2022-09-04"; + dictFileName = "fa-IR"; + readmeFile = "README.md"; + src = fetchFromGitHub { + owner = "b00f"; + repo = "lilak"; + rev = "1a80a8e5c9377ac424d29ef20be894e250bc9765"; + hash = "sha256-xonnrclzgFEHdQ9g8ijm0bo9r5a5Y0va52NoJR5d8mo="; + }; + nativeBuildInputs = [ python3 ]; + buildPhase = '' + runHook preBuild + mkdir build + (cd src && python3 lilak.py) + mv build/* ./ + # remove timestamp from file + sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff + runHook postBuild + ''; + meta = with lib; { + description = "Hunspell dictionary for Persian (Iran)"; + homepage = "https://github.com/b00f/lilak"; + license = licenses.asl20; + maintainers = with maintainers; [ nix-julia ]; + platforms = platforms.all; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index dc49780b32..21396a6bda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' echo "${finalAttrs.version}" > IGRAPH_VERSION + '' + # https://github.com/igraph/igraph/issues/2340 + + lib.optionalString stdenv.isDarwin '' + sed -i "/safelocale/d" tests/CMakeLists.txt ''; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index f85ec4d96b..ab237d9dca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -22,6 +22,8 @@ , enlightenment , xorg , testers + +, gitUpdater }: let @@ -29,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; + hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; }; buildInputs = [ @@ -59,19 +61,25 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "bin" "out" "dev" ]; - passthru.tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; + passthru = { + tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.enlightenment.org/old/legacy-imlib2.git"; + rev-prefix = "v"; + }; }; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { description = "Image manipulation library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 331198e975..b909051aa7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.11"; + version = "22.3.12"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8="; + sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk="; }; nativeBuildInputs = [ cmake ]; 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 cb014ed80b..68028849b6 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 = "23.1.6"; + version = "23.3.5"; outputs = [ "out" "dev" ]; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-Z1xBU+4SdwknXpYUS8EwEURNIsg2+R/U0CcW3FW325M="; + hash = "sha256-7OdLpqO2evNeyxceOtHEI7sJCVybqvrcM1ZZx8bI4xw="; }; patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index 7a68f13066..fa5d2b3b0c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isAarch64 zlib; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.io/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix index a790146608..b3ef27e387 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ OpenGL Cocoa IOKit ]; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.net/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix index 9bbd2135e0..b4351f4e9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-fZnZH2j/IXbfsJkJG8s2ArOrWwVE2kgvSREVaSVoDyo="; + sha256 = "sha256-U0pBoKewZEen7aH3rIvZ8dKKeXKE1+Z5WtfM0HK6/LQ="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index ed1d4af35f..017f0581dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.28"; + version = "1.18.30"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-t3TcT8pUMiXYtejBY360E8Q2Oy5hPpUiJ3b3kqjOwOA="; + sha256 = "sha256-1+4SLu4erutFGCqJ/zb8LdCGhY0bL1S2Fcb+97odYBI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index a00399497e..f891528206 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - nativeBuildInputs = [ autoreconfHook ]; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool ]; nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index a14a220f51..ff2fca37fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-6"; + version = "6.0-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; + sha256 = "sha256-Z4getn/mVYIRANkIOyt7jMpcqHBvq5GXLK/ST5zV1r4="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix index 18c492dc93..8a3b8658fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { ; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; - doCheck = true; + # Tries to link test binaries binaries dynamically and fails + doCheck = !stdenv.hostPlatform.isStatic; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/rust.nix b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/rust.nix new file mode 100644 index 0000000000..1a9968933b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/rust.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, jemalloc +, writeText + +, unprefixed ? false +}: + +let + # On some platforms the unprefixed feature will be ignored: + # https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs + unprefixed' = unprefixed && !stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAndroid; + +in jemalloc.overrideAttrs (oldAttrs: { + configureFlags = oldAttrs.configureFlags ++ [ + "--with-private-namespace=_rjem_" + ] ++ lib.optionals (!unprefixed') [ + "--with-jemalloc-prefix=_rjem_" + ]; + + setupHook = writeText "setup-hook.sh" '' + export JEMALLOC_OVERRIDE="@out@/lib/libjemalloc${stdenv.hostPlatform.extensions.library}" + ''; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 4b54ccc066..0ca03efca0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -7,7 +7,7 @@ , nixosTests , pkg-config , gettext -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection , gi-docgen diff --git a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa..517746aa9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix index 69a2b91553..29bab00879 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Fast and Reliable ARQ Protocol"; homepage = "https://github.com/skywind3000/kcp"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix index 3543fef663..2a264d47c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -25,21 +25,6 @@ mkDerivation { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; - # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups - # where the device id will change on reboot causing baloo to reindex all the files and then having - # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. - # However, without this patch, people tend to disable baloo rather than dealing with the constant - # reindexing. - # - # https://bugs.kde.org/show_bug.cgi?id=402154 - patches = [ - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; - hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; - name = "use_fsid.patch"; - }) - ]; - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index c72caa6d58..f53e0d6c16 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 03e233c287..8815683aef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -29,12 +29,6 @@ mkDerivation { separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch - - # Fix a crash when saving files. - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/-/commit/48322f44323a1fc09305d66d9093fe6c3780709e.patch"; - hash = "sha256-4NxI2mD/TdthvrzgatCAlM6VN3N38i3IJUHh0Bs8Fjk="; - }) ]; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index e9f812d68d..04256007ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -6,6 +6,7 @@ mkDerivation { pname = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix index 78aa189559..c0ed3f7d79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,11 +1,11 @@ { mkDerivation , extra-cmake-modules -, aspell, qtbase, qttools +, aspell, hunspell, qtbase, qttools }: mkDerivation { pname = "sonnet"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ aspell qttools ]; + buildInputs = [ aspell hunspell qttools ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 1fd8a2ba15..f6909957ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; - sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; - name = "attica-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; + sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; + name = "attica-5.112.0.tar.xz"; }; }; baloo = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; - sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; - name = "baloo-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; + sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; + name = "baloo-5.112.0.tar.xz"; }; }; bluez-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; - sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; - name = "bluez-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; + sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; + name = "bluez-qt-5.112.0.tar.xz"; }; }; breeze-icons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; - sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; - name = "breeze-icons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; + sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; + name = "breeze-icons-5.112.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; - sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; - name = "extra-cmake-modules-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/extra-cmake-modules-5.112.0.tar.xz"; + sha256 = "1qn2shanzsv06q34zwhkjhb88j7crdp83qp265gpxmc049vq845c"; + name = "extra-cmake-modules-5.112.0.tar.xz"; }; }; frameworkintegration = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; - sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; - name = "frameworkintegration-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; + sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; + name = "frameworkintegration-5.112.0.tar.xz"; }; }; kactivities = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; - sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; - name = "kactivities-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; + sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; + name = "kactivities-5.112.0.tar.xz"; }; }; kactivities-stats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; - sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; - name = "kactivities-stats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; + sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; + name = "kactivities-stats-5.112.0.tar.xz"; }; }; kapidox = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; - sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; - name = "kapidox-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; + sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; + name = "kapidox-5.112.0.tar.xz"; }; }; karchive = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; - sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; - name = "karchive-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; + sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; + name = "karchive-5.112.0.tar.xz"; }; }; kauth = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; - sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; - name = "kauth-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; + sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; + name = "kauth-5.112.0.tar.xz"; }; }; kbookmarks = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; - sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; - name = "kbookmarks-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; + sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; + name = "kbookmarks-5.112.0.tar.xz"; }; }; kcalendarcore = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; - sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; - name = "kcalendarcore-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; + sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; + name = "kcalendarcore-5.112.0.tar.xz"; }; }; kcmutils = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; - sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; - name = "kcmutils-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; + sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; + name = "kcmutils-5.112.0.tar.xz"; }; }; kcodecs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; - sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; - name = "kcodecs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; + sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; + name = "kcodecs-5.112.0.tar.xz"; }; }; kcompletion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; - sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; - name = "kcompletion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; + sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; + name = "kcompletion-5.112.0.tar.xz"; }; }; kconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; - sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; - name = "kconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; + sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; + name = "kconfig-5.112.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; - sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; - name = "kconfigwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; + sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; + name = "kconfigwidgets-5.112.0.tar.xz"; }; }; kcontacts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; - sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; - name = "kcontacts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; + sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; + name = "kcontacts-5.112.0.tar.xz"; }; }; kcoreaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; - sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; - name = "kcoreaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; + sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; + name = "kcoreaddons-5.112.0.tar.xz"; }; }; kcrash = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; - sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; - name = "kcrash-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; + sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; + name = "kcrash-5.112.0.tar.xz"; }; }; kdav = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; - sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; - name = "kdav-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; + sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; + name = "kdav-5.112.0.tar.xz"; }; }; kdbusaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; - sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; - name = "kdbusaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; + sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; + name = "kdbusaddons-5.112.0.tar.xz"; }; }; kdeclarative = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; - sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; - name = "kdeclarative-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; + sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; + name = "kdeclarative-5.112.0.tar.xz"; }; }; kded = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; - sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; - name = "kded-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; + sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; + name = "kded-5.112.0.tar.xz"; }; }; kdelibs4support = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; - sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; - name = "kdelibs4support-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; + sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; + name = "kdelibs4support-5.112.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; - sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; - name = "kdesignerplugin-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; + sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; + name = "kdesignerplugin-5.112.0.tar.xz"; }; }; kdesu = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; - sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; - name = "kdesu-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; + sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; + name = "kdesu-5.112.0.tar.xz"; }; }; kdewebkit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; - sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; - name = "kdewebkit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; + sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; + name = "kdewebkit-5.112.0.tar.xz"; }; }; kdnssd = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; - sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; - name = "kdnssd-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; + sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; + name = "kdnssd-5.112.0.tar.xz"; }; }; kdoctools = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; - sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; - name = "kdoctools-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; + sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; + name = "kdoctools-5.112.0.tar.xz"; }; }; kemoticons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; - sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; - name = "kemoticons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; + sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; + name = "kemoticons-5.112.0.tar.xz"; }; }; kfilemetadata = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; - sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; - name = "kfilemetadata-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; + sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; + name = "kfilemetadata-5.112.0.tar.xz"; }; }; kglobalaccel = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; - sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; - name = "kglobalaccel-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; + sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; + name = "kglobalaccel-5.112.0.tar.xz"; }; }; kguiaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; - sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; - name = "kguiaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; + sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; + name = "kguiaddons-5.112.0.tar.xz"; }; }; kholidays = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; - sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; - name = "kholidays-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; + sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; + name = "kholidays-5.112.0.tar.xz"; }; }; khtml = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; - sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; - name = "khtml-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; + sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; + name = "khtml-5.112.0.tar.xz"; }; }; ki18n = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; - sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; - name = "ki18n-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; + sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; + name = "ki18n-5.112.0.tar.xz"; }; }; kiconthemes = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; - sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; - name = "kiconthemes-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; + sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; + name = "kiconthemes-5.112.0.tar.xz"; }; }; kidletime = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; - sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; - name = "kidletime-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; + sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; + name = "kidletime-5.112.0.tar.xz"; }; }; kimageformats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; - sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; - name = "kimageformats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; + sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; + name = "kimageformats-5.112.0.tar.xz"; }; }; kinit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; - sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; - name = "kinit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; + sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; + name = "kinit-5.112.0.tar.xz"; }; }; kio = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; - sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; - name = "kio-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; + sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; + name = "kio-5.112.0.tar.xz"; }; }; kirigami2 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; - sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; - name = "kirigami2-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; + sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; + name = "kirigami2-5.112.0.tar.xz"; }; }; kitemmodels = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; - sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; - name = "kitemmodels-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; + sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; + name = "kitemmodels-5.112.0.tar.xz"; }; }; kitemviews = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; - sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; - name = "kitemviews-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; + sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; + name = "kitemviews-5.112.0.tar.xz"; }; }; kjobwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; - sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; - name = "kjobwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; + sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; + name = "kjobwidgets-5.112.0.tar.xz"; }; }; kjs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; - sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; - name = "kjs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; + sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; + name = "kjs-5.112.0.tar.xz"; }; }; kjsembed = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; - sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; - name = "kjsembed-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; + sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; + name = "kjsembed-5.112.0.tar.xz"; }; }; kmediaplayer = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; - sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; - name = "kmediaplayer-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; + sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; + name = "kmediaplayer-5.112.0.tar.xz"; }; }; knewstuff = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; - sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; - name = "knewstuff-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; + sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; + name = "knewstuff-5.112.0.tar.xz"; }; }; knotifications = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; - sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; - name = "knotifications-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; + sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; + name = "knotifications-5.112.0.tar.xz"; }; }; knotifyconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; - sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; - name = "knotifyconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; + sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; + name = "knotifyconfig-5.112.0.tar.xz"; }; }; kpackage = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; - sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; - name = "kpackage-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; + sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; + name = "kpackage-5.112.0.tar.xz"; }; }; kparts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; - sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; - name = "kparts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; + sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; + name = "kparts-5.112.0.tar.xz"; }; }; kpeople = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; - sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; - name = "kpeople-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; + sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; + name = "kpeople-5.112.0.tar.xz"; }; }; kplotting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; - sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; - name = "kplotting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; + sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; + name = "kplotting-5.112.0.tar.xz"; }; }; kpty = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; - sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; - name = "kpty-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; + sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; + name = "kpty-5.112.0.tar.xz"; }; }; kquickcharts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; - sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; - name = "kquickcharts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; + sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; + name = "kquickcharts-5.112.0.tar.xz"; }; }; kross = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; - sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; - name = "kross-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; + sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; + name = "kross-5.112.0.tar.xz"; }; }; krunner = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; - sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; - name = "krunner-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; + sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; + name = "krunner-5.112.0.tar.xz"; }; }; kservice = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; - sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; - name = "kservice-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; + sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; + name = "kservice-5.112.0.tar.xz"; }; }; ktexteditor = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; - sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; - name = "ktexteditor-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; + sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; + name = "ktexteditor-5.112.0.tar.xz"; }; }; ktextwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; - sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; - name = "ktextwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; + sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; + name = "ktextwidgets-5.112.0.tar.xz"; }; }; kunitconversion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; - sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; - name = "kunitconversion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; + sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; + name = "kunitconversion-5.112.0.tar.xz"; }; }; kwallet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; - sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; - name = "kwallet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; + sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; + name = "kwallet-5.112.0.tar.xz"; }; }; kwayland = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; - sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; - name = "kwayland-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; + sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; + name = "kwayland-5.112.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; - sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; - name = "kwidgetsaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; + sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; + name = "kwidgetsaddons-5.112.0.tar.xz"; }; }; kwindowsystem = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; - sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; - name = "kwindowsystem-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; + sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; + name = "kwindowsystem-5.112.0.tar.xz"; }; }; kxmlgui = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; - sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; - name = "kxmlgui-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; + sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; + name = "kxmlgui-5.112.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; - sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; - name = "kxmlrpcclient-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; + sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; + name = "kxmlrpcclient-5.112.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; - sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; - name = "modemmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; + sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; + name = "modemmanager-qt-5.112.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; - sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; - name = "networkmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; + sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; + name = "networkmanager-qt-5.112.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; - sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; - name = "oxygen-icons5-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; + sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; + name = "oxygen-icons5-5.112.0.tar.xz"; }; }; plasma-framework = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; - sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; - name = "plasma-framework-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; + sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; + name = "plasma-framework-5.112.0.tar.xz"; }; }; prison = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; - sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; - name = "prison-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; + sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; + name = "prison-5.112.0.tar.xz"; }; }; purpose = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; - sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; - name = "purpose-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; + sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; + name = "purpose-5.112.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; - sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; - name = "qqc2-desktop-style-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/qqc2-desktop-style-5.112.0.tar.xz"; + sha256 = "1k74vwj07xf3fjfj8ff9zx5ndzq5m3bdnj4zgymkxm1gk3r6gl5y"; + name = "qqc2-desktop-style-5.112.0.tar.xz"; }; }; solid = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; - sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; - name = "solid-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; + sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; + name = "solid-5.112.0.tar.xz"; }; }; sonnet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; - sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; - name = "sonnet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; + sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; + name = "sonnet-5.112.0.tar.xz"; }; }; syndication = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; - sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; - name = "syndication-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; + sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; + name = "syndication-5.112.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; - sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; - name = "syntax-highlighting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; + sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; + name = "syntax-highlighting-5.112.0.tar.xz"; }; }; threadweaver = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; - sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; - name = "threadweaver-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; + sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; + name = "threadweaver-5.112.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index aefbaa6d41..08d0ffae8f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE="; + sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix index 1089c3ddf1..7b81d8ca7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -6,14 +6,14 @@ mkDerivation rec { pname = "kquickimageeditor"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; + sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix index e6b8ced1a0..bff25956f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.26"; + version = "1.28"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-LkV5bi1kMRP2ofBIe+hbOzbSRStWyr3afnNdZqpVDBA="; + sha256 = "sha256-HxdZy2TiQT7pWyhaSq4YJAcqjykzWy1aI3gEZrlbghQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix index bea9f86fc9..5e1fe28297 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kuserfeedback/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { pname = "kuserfeedback"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ="; + hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kweathercore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kweathercore/default.nix index e0e804c110..943dee42c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kweathercore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kweathercore/default.nix @@ -9,14 +9,14 @@ mkDerivation rec { pname = "kweathercore"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4="; + sha256 = "sha256-CnnoPkgz97SfDG13zfyIWweVnp2oxAChTPKFxJC+L8A="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix index 95547fb638..de1af1f447 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg="; + hash = "sha256-NY3KEPzScgeshXoNf0NaRtvGzR98ENu4QMGTG/GWXwg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 4bae576bd1..8c6eeb3f3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.9"; + version = "1.12.10"; src = fetchFromGitHub { - sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; + sha256 = "sha256-0AHChU96LOVCsd+b77nKV4lOt1FtbVfv+OSNvGjekYo="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 0c953b8d87..f2ea91bf8b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-7hFGY255dLgDo93+Nx2we/cfEtwaiaajdVg1VTst1/U="; + hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 2b99c7bdaf..0c97f116a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.2.2"; + version = "1.3"; outputs = [ "out" "dev" ]; @@ -23,16 +23,19 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; + hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po="; }; patches = [ - # Fixed upstream, remove when the new version releases: - # https://gitlab.com/inkscape/lib2geom/-/issues/49 + # Fix compilation with Clang. + # https://gitlab.com/inkscape/lib2geom/-/merge_requests/102 (fetchpatch { - name = "expect-double-eq-in-choose-test.patch"; - url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; - sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; + url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch"; + hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q="; + }) + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch"; + hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA="; }) ]; @@ -60,6 +63,20 @@ stdenv.mkDerivation rec { doCheck = true; + # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 + checkPhase = let + disabledTests = + lib.optionals stdenv.isAarch64 [ + # Broken on all platforms, test just accidentally passes on some. + # https://gitlab.com/inkscape/lib2geom/-/issues/63 + "elliptical-arc-test" + ]; + in '' + runHook preCheck + ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' + runHook postCheck + ''; + meta = with lib; { description = "Easy to use 2D geometry library in C++"; homepage = "https://gitlab.com/inkscape/lib2geom"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix index a569b59621..828a6891e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation { "--${if withX then "with" else "without"}-x" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix index fc55f14f11..7f2c12a9de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff LASzip2 ]; cmakeFlags = [ - "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix index 6be0370a17..c5e40babfd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableButteraugli ? true, libjxl , enableVmaf ? true, libvmaf +, gitUpdater }: let @@ -8,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.6.1"; + version = "3.7.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; + hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; stripRoot = false; }; @@ -64,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; + passthru = { + updateScript = gitUpdater { + url = "https://aomedia.googlesource.com/aom"; + rev-prefix = "v"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + }; + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix index de305474a3..d58ba0bc5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -23,36 +23,31 @@ , cmake , nix , samba -, buildPackages }: -let - autoreconfHook = buildPackages.autoreconfHook269; -in assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.6.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg="; + hash = "sha256-p2JgJ/rvqaQ6yyXSh+ehScUH565ud5bQncl+lOnsWfc="; }; - outputs = [ "out" "lib" "dev" ]; - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (assert finalAttrs.version == "3.6.2"; fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + # Pull fix for test failure on 32-bit systems: + (fetchpatch { + name = "32-bit-tests-fix.patch"; + url = "https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch"; + hash = "sha256-RM3xFM6S2DkM5DJ0kAba8eLzEXuY5/7AaU06maHJ6rM="; }) ]; + outputs = [ "out" "lib" "dev" ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix index 39a6305c6d..0cadea9f99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libayatana-indicator"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; rev = version; - sha256 = "sha256-tOZcrcuZowqDg/LRYTY6PCxKnpEd67k4xAHrIKupunI="; + sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb..3b24089e53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix index 0b378c583a..ebbf02603c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -3,20 +3,15 @@ stdenv.mkDerivation { pname = "libbap"; - version = "master-2020-11-25"; + version = "master-2022-07-13"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d"; - sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; + rev = "4d324dd794f8e022e8eddecbb2ae2e7b28173947"; + hash = "sha256-la47HR+i99ueDEWR91YIXGdKflpE1E0qmmJjeowmGSI="; }; - postPatch = '' - substituteInPlace Makefile.in \ - --replace "-linkpkg" "-thread -linkpkg" - ''; - nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; buildInputs = [ bap ctypes ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index 937937ae82..ce570b76bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index fd5a18f854..6604bb3222 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8="; + hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; }; outputs = [ "out" "dev" "devdoc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix index a502bc0d79..076eccb1c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchgit +, fetchpatch , lib , meson , ninja @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 + name = "libcamera-sphinx7.0-compat.patch"; + url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; + hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; + }) + ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcaption/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcaption/default.nix new file mode 100644 index 0000000000..78cf521405 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libcaption/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, re2c +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcaption"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "szatmary"; + repo = "libcaption"; + rev = finalAttrs.version; + sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ re2c ]; + + meta = with lib; { + description = "Free open-source CEA608 / CEA708 closed-caption encoder/decoder"; + homepage = "https://github.com/szatmary/libcaption"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix index fff5f705d7..efb17eeaf3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmocka @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Pull fix pending upstream inclusion to support + # `CMAKE_INSTALL_INCLUDEDIR`: + # https://github.com/PJK/libcbor/pull/297 + (fetchpatch { + name = "includedir.patch"; + url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; + hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix index 6fb8caa474..e78d845cf5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; + hash = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix index b3087f0abe..64695aaa55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; - homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; platforms = lib.platforms.all; license = lib.licenses.mpl20; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index ab8f187bf9..065d412c91 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchamplain/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ''; maintainers = teams.gnome.members ++ teams.pantheon.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index abfcbfe060..08c35ec940 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -3,19 +3,20 @@ , boost , cmake , fetchFromGitHub +, fetchpatch , eigen , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.1.2"; + version = "5.2.4"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-wx5D0kNKetgc/8LFAgNxTAwni+lJb2rajsxh0AASpeY="; + hash = "sha256-AAEk9gDxtlNDEG8B4HmOJ5Nd+GyWibT+yuMccylU8iQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix index f5a9974f3b..52da371999 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcmis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcmis"; - version = "0.5.2"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tdf"; repo = pname; rev = "v${version}"; - sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; + sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; }; nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix index d7f60b9ad6..dae73136c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo="; + sha256 = "sha256-QvDYdplPhivG4a2otT4MuSY546a2Dw/amWly5aheabQ="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 95d1474c1f..4f813d74a8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U="; + sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix index 9652b4a67f..8a4025cf70 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcpr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, curl }: -let version = "1.10.4"; in +let version = "1.10.5"; in stdenv.mkDerivation { pname = "libcpr"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-8qRNlZgBB71t/FSFPnxFhr02OuD2erLVeoc6wAx3LKk="; + hash = "sha256-mAuU2uF8d+aHvCmotgIrBi/pUp1jkP6G0f98M76zjOw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix index 0b03ec6ee0..cdae594d9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, bison, flex }: stdenv.mkDerivation rec { pname = "libcue"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-43641.patch"; + url = "https://github.com/lipnitsk/libcue/commit/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch"; + hash = "sha256-NjnSMUfman/SwLFWDIhtz2jCOLfpXGGGjO3QwRGURNg="; + }) + ]; + nativeBuildInputs = [ cmake bison flex ]; doCheck = false; # fails all the tests (ctest) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix index e981945ccb..be8be13602 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2022-08-08"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "a0f7f5c139a7daf71de0de201b6c405d852b1dc1"; - sha256 = "6ErOhlD6pOudbTkFTlI2hjBuYT3QuzEiL33/mLnw1aI="; + rev = "03c83f5a57be8c5b1a29a68de5638744f17d28ba"; + sha256 = "ldwE0j9P9h5urWIUCRdY6qrJqKe45hid+NrSNeKEixE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 00fe352021..5271663a10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-jsJTECSR3ptiByfYQ00laeKMKJCv5IDkZmilY3jpRrU="; + hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; }; outputs = [ "out" "dev" ]; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ]; postFixup = '' - # Fix shared library path that will be incorrect on move to "dev" output - substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + # Fix include path that will be incorrect due to the "dev" output + substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \ + --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix index a6744c23e1..89ce56fe6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-aG7U8jP3pvOeFDetYVOx+cE78ys0uSkKNjSgB09ste8="; + sha256 = "sha256-EqCS77MpjfR0Td07WKB7jWRBxAoKRtbAgyyThFOJXL8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 6494f16a87..3bbf449d89 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-dWSDAYn36GDtkghmouGhHzxpa6EVwCslIPqejlLMZNM="; + sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index 1e9b02504b..26a8f66664 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -43,31 +43,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -89,9 +79,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-tzdata" @@ -125,15 +115,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -169,7 +159,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -197,15 +187,28 @@ 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-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -221,12 +224,12 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" +checksum = "2e542b1682eba6b85a721daef0c58e79319ffd0c678565c07ac57c8071c548b5" dependencies = [ - "async-channel", - "base64 0.21.2", + "async-channel 2.1.0", + "base64 0.21.5", "bytes", "chrono", "futures", @@ -247,7 +250,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -281,13 +284,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.70" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -312,13 +315,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.2", + "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -364,9 +367,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -409,9 +412,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -442,22 +445,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "blake3" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", ] [[package]] @@ -499,9 +501,9 @@ dependencies = [ [[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", @@ -510,9 +512,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", @@ -520,9 +522,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -540,27 +542,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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" [[package]] name = "camellia" @@ -574,18 +576,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -620,9 +622,12 @@ dependencies = [ [[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 = "cfb-mode" @@ -651,17 +656,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -703,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstyle", "clap_lex", @@ -722,9 +726,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -751,33 +755,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -786,9 +790,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -820,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -880,16 +884,6 @@ dependencies = [ "itertools", ] -[[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" @@ -937,9 +931,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -957,16 +951,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -982,9 +966,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.3" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", @@ -999,13 +983,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -1098,22 +1082,22 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows 0.32.0", + "windows", ] [[package]] name = "deltachat" -version = "1.121.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", - "async-channel", + "async-channel 2.1.0", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.2", + "base64 0.21.5", "brotli", "chrono", "criterion", @@ -1122,10 +1106,12 @@ dependencies = [ "encoded-words", "escaper", "fast-socks5", + "fd-lock", "format-flowed", "futures", "futures-lite", "hex", + "hickory-resolver", "humansize", "image", "iroh", @@ -1135,13 +1121,14 @@ dependencies = [ "log", "mailparse", "mime", - "num-derive 0.4.0", + "num-derive", "num-traits", "num_cpus", "once_cell", "parking_lot", "percent-encoding", "pgp", + "pin-project", "pretty_assertions", "pretty_env_logger", "proptest", @@ -1157,7 +1144,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "strum", "strum_macros", @@ -1172,19 +1159,18 @@ dependencies = [ "tokio-tar", "tokio-util", "toml", - "trust-dns-resolver", "url", "uuid", ] [[package]] name = "deltachat-jsonrpc" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", - "async-channel", + "async-channel 2.1.0", "axum", - "base64 0.21.2", + "base64 0.21.5", "deltachat", "env_logger", "futures", @@ -1203,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.121.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", @@ -1218,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1238,12 +1224,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "deltachat_ffi" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1273,9 +1259,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468 0.7.0", @@ -1308,6 +1294,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -1416,7 +1411,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1438,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -1466,9 +1461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" @@ -1484,13 +1479,13 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.7", + "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -1508,9 +1503,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", "signature 2.1.0", @@ -1533,22 +1528,22 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0-rc.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 4.0.0-rc.3", - "ed25519 2.2.1", + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "zeroize", ] [[package]] name = "educe" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1558,9 +1553,9 @@ dependencies = [ [[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 = "elliptic-curve" @@ -1583,12 +1578,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.2", + "crypto-bigint 0.5.3", "digest 0.10.7", "ff 0.13.0", "generic-array", @@ -1597,7 +1592,7 @@ dependencies = [ "pem-rfc7468 0.7.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.2", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -1605,7 +1600,7 @@ dependencies = [ [[package]] name = "email" version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e" +source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9" dependencies = [ "base64 0.11.0", "chrono", @@ -1617,6 +1612,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encoded-words" version = "0.2.0" @@ -1697,9 +1698,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[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", ] @@ -1718,34 +1719,34 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1756,29 +1757,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] @@ -1807,10 +1797,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "fallible-iterator" -version = "0.2.0" +name = "event-listener" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "pin-project-lite", +] + +[[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" @@ -1842,12 +1853,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -1856,15 +1864,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1891,27 +1899,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.3.5", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1966,9 +1974,9 @@ version = "1.0.0" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1981,9 +1989,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1991,15 +1999,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2008,15 +2016,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ "fastrand", "futures-core", @@ -2024,37 +2032,36 @@ dependencies = [ "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2092,9 +2099,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2115,9 +2122,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "group" @@ -2143,9 +2150,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2171,27 +2178,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2202,9 +2206,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2212,6 +2216,51 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.3" @@ -2236,7 +2285,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2252,9 +2301,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" dependencies = [ "bytes", "fnv", @@ -2280,15 +2329,15 @@ 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 = "human-panic" -version = "1.1.5" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" +checksum = "7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d" dependencies = [ "backtrace", "os_info", @@ -2330,7 +2379,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2352,16 +2401,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -2388,17 +2437,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.4.0" @@ -2411,9 +2449,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2427,9 +2465,9 @@ dependencies = [ [[package]] name = "imap-proto" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b1b63179418b20aa81002d616c5f21b4ba257da9bca6989ea64dc573933e0" +checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" dependencies = [ "nom", ] @@ -2446,12 +2484,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2463,53 +2501,32 @@ 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", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", + "windows-sys", + "winreg", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546" +source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" dependencies = [ "abao", "anyhow", - "base64 0.21.2", + "base64 0.21.5", "blake3", "bytes", "default-net", @@ -2526,8 +2543,9 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "ring", + "ring 0.16.20", "rustls", + "rustls-webpki", "serde", "serde-error", "ssh-key", @@ -2540,20 +2558,19 @@ dependencies = [ "tracing-futures", "tracing-subscriber", "walkdir", - "webpki", "x509-parser", "zeroize", ] [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] @@ -2567,9 +2584,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jpeg-decoder" @@ -2579,9 +2596,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2639,21 +2656,32 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "openssl-sys", @@ -2669,21 +2697,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2691,9 +2713,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -2727,27 +2749,22 @@ 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]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -2759,9 +2776,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2796,13 +2813,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2817,7 +2834,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -2898,14 +2915,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -2939,9 +2955,9 @@ 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", @@ -2968,24 +2984,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -3022,9 +3027,9 @@ dependencies = [ [[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", "libm", @@ -3042,9 +3047,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3078,11 +3083,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3099,7 +3104,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -3110,18 +3115,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "300.1.6+3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3147,15 +3152,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "overload" version = "0.1.1" @@ -3170,7 +3166,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3179,10 +3175,10 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3193,7 +3189,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3202,17 +3198,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3226,22 +3222,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pem" @@ -3278,12 +3274,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pgp" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" +checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" dependencies = [ "aes", - "base64 0.21.2", + "base64 0.21.5", "bitfield", "block-padding", "blowfish", @@ -3296,11 +3292,12 @@ dependencies = [ "chrono", "cipher", "crc24", + "curve25519-dalek 4.1.1", "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.0.0-rc.3", - "elliptic-curve 0.13.5", + "ed25519-dalek 2.0.0", + "elliptic-curve 0.13.6", "flate2", "generic-array", "hex", @@ -3309,15 +3306,15 @@ dependencies = [ "md-5", "nom", "num-bigint-dig", - "num-derive 0.3.3", + "num-derive", "num-traits", "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.0-pre.2", + "rsa 0.9.3", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "signature 2.1.0", "smallvec", @@ -3329,29 +3326,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3377,7 +3374,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.7", + "der 0.7.8", "pkcs8 0.10.2", "spki 0.7.2", ] @@ -3398,7 +3395,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.7", + "der 0.7.8", "spki 0.7.2", ] @@ -3410,9 +3407,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.0.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "plotters" @@ -3444,9 +3441,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3457,18 +3454,19 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postcard" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", "const_format", + "embedded-io", "postcard-derive", "serde", ] @@ -3484,6 +3482,12 @@ dependencies = [ "syn 1.0.109", ] +[[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" @@ -3492,13 +3496,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -3514,11 +3516,11 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" dependencies = [ - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", ] [[package]] @@ -3547,27 +3549,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "unarray", ] @@ -3579,11 +3580,12 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quic-rpc" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d" +checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7" dependencies = [ "bincode", + "educe", "flume", "futures", "pin-project", @@ -3603,18 +3605,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", @@ -3625,17 +3627,17 @@ dependencies = [ "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -3643,26 +3645,26 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.3.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2 0.4.9", + "socket2 0.5.5", "tracing", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3742,7 +3744,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -3769,9 +3771,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3779,14 +3781,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3796,20 +3796,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.22", + "ring 0.16.20", + "time 0.3.30", "yasna", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -3820,25 +3811,35 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "redox_syscall" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3850,6 +3851,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -3858,17 +3870,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -3889,6 +3901,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -3896,7 +3909,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -3940,11 +3953,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -3977,32 +4004,31 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.0-pre.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.1.0", + "spki 0.7.2", "subtle", "zeroize", ] [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4048,40 +4074,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" 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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" -dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ - "ring", + "ring 0.17.5", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4098,18 +4110,28 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" @@ -4117,7 +4139,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "cfg-if", "clipboard-win", "fd-lock", @@ -4136,9 +4158,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -4157,9 +4179,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" dependencies = [ "lazy_static", "regex", @@ -4171,14 +4193,14 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4188,9 +4210,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4200,18 +4222,18 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4230,12 +4252,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.7", + "der 0.7.8", "generic-array", "pkcs8 0.10.2", "subtle", @@ -4244,9 +4266,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4257,9 +4279,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -4267,24 +4289,24 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -4300,22 +4322,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.10" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4331,9 +4353,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4342,9 +4364,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ "itoa", "serde", @@ -4352,9 +4374,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -4384,9 +4406,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", @@ -4408,9 +4430,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4429,9 +4451,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", ] @@ -4467,36 +4489,36 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[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", @@ -4504,12 +4526,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4544,7 +4566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.7", + "der 0.7.8", ] [[package]] @@ -4555,7 +4577,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" dependencies = [ "base64ct", "pem-rfc7468 0.6.0", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4570,25 +4592,19 @@ dependencies = [ "rand_core 0.6.4", "rsa 0.7.2", "sec1 0.3.0", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "ssh-encoding", "zeroize", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stop-token" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cfg-if", "futures-core", "pin-project-lite", @@ -4614,15 +4630,15 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4644,9 +4660,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4708,38 +4724,37 @@ dependencies = [ [[package]] name = "tagger" -version = "4.3.4" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" +checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.22", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "rustix", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "testdir" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7" +checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869" dependencies = [ "anyhow", "backtrace", @@ -4762,22 +4777,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4803,11 +4818,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -4815,15 +4832,15 @@ 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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -4855,11 +4872,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -4868,9 +4884,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.5", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4885,13 +4901,13 @@ dependencies = [ [[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.23", + "syn 2.0.39", ] [[package]] @@ -4947,9 +4963,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -4959,9 +4975,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4973,9 +4989,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -4985,20 +5001,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -5035,11 +5051,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", @@ -5048,20 +5063,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -5079,12 +5094,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5106,51 +5121,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -5159,13 +5129,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", @@ -5187,15 +5157,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02" +checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5203,9 +5173,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864" +checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" dependencies = [ "darling 0.13.4", "ident_case", @@ -5229,19 +5199,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -5260,9 +5226,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5277,13 +5243,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.0" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] @@ -5301,11 +5273,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -5327,17 +5299,11 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5372,9 +5338,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5382,24 +5348,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -5409,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5419,43 +5385,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "weezl" version = "0.1.7" @@ -5496,9 +5452,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", ] @@ -5523,21 +5479,12 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.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", ] [[package]] @@ -5546,50 +5493,29 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -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", + "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", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5599,15 +5525,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5617,15 +5537,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5635,15 +5549,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5653,27 +5561,15 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5683,34 +5579,19 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winreg" version = "0.50.0" @@ -5718,17 +5599,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -5747,7 +5629,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -5771,17 +5653,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.30", ] [[package]] name = "yerpc" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96" +checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "async-mutex", "async-trait", "axum", @@ -5799,9 +5681,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" +checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe" dependencies = [ "convert_case 0.5.0", "darling 0.14.4", @@ -5810,6 +5692,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -5827,5 +5729,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 395764d955..d62e8bf245 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cargo , cmake +, deltachat-repl , openssl , perl , pkg-config @@ -17,30 +18,32 @@ , libiconv }: -stdenv.mkDerivation rec { +let + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; + "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; + "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; + }; + }; +in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.121.0"; + version = "1.131.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; + hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; }; patches = [ ./no-static-lib.patch ]; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; - "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; - "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; - }; - }; + cargoDeps = rustPlatform.importCargoLock cargoLock; nativeBuildInputs = [ cmake @@ -67,8 +70,12 @@ stdenv.mkDerivation rec { cargoCheckHook ]; - passthru.tests = { - python = python3.pkgs.deltachat; + passthru = { + inherit cargoLock; + tests = { + inherit deltachat-repl; + python = python3.pkgs.deltachat; + }; }; meta = with lib; { @@ -76,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; + maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix index e8b4bbc88b..c70a217f6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdovi/default.nix @@ -5,9 +5,7 @@ , rust , stdenv }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in + rustPlatform.buildRustPackage rec { pname = "libdovi"; version = "3.1.2"; @@ -28,19 +26,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 7b7721197f..63a8522bd0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, gitUpdater }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.115"; + version = "2.4.117"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VUz7/gVCvds5G04+Bb+7/D4oK5Vb1WIY0hwGFkgfZes="; + hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; }; outputs = [ "out" "dev" "bin" ]; @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { "-Detnaviv=disabled" ]; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/mesa/drm.git"; + rev-prefix = "libdrm-"; + # Skip versions like libdrm-2_0_2 that happen to go last when + # sorted. + ignoredVersions = "_"; + }; + }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; downloadPage = "https://dri.freedesktop.org/libdrm/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix index 55191fff89..49c2ab1bdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdv/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; }; - # This fixes an undefined symbol: _sched_setscheduler error on compile. - # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; + # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace encodedv/dvconnect.c \ + --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' + ''; configureFlags = [ "--disable-asm" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix index 6c7b559142..cd98e2229f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + '' + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) + + lib.optionalString stdenv.isDarwin '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; @@ -55,15 +64,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; - # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - preCheck = lib.optionalString stdenv.isDarwin '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" - ''; - doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix index 90853d5f2d..c8db600dce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wrapper library for evdev devices"; - homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; + homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.amorsillo ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index 5029e84d9c..272cd3d9aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkg-config +, exiv2, libgsf, pkg-config +, rpmSupport ? stdenv.isLinux, rpm , gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -52,8 +53,9 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 - libgsf rpm - ] ++ lib.optionals gstreamerSupport + libgsf + ] ++ lib.optionals rpmSupport [ rpm ] + ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. doCheck = false; - doInstallCheck = true; + doInstallCheck = !stdenv.isDarwin; installCheckPhase = "make check"; meta = with lib; { @@ -98,6 +100,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.jorsn ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix index 66a0b7ddba..ab2da122da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw="; }; + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix index 681f9cbfb2..5bfa335314 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" - - # Causes issues in downstream packages which misuse ffi_closure_alloc - # Reenable once these issues are fixed and merged: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 - "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix index d789aafbcb..f5fbf21f94 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, python , qtbase , darwin }: @@ -25,8 +26,8 @@ stdenv.mkDerivation { hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc="; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; - buildInputs = [ eigen zlib libpng boost guile qtbase ] + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; + buildInputs = [ eigen zlib libpng boost guile python qtbase ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' @@ -42,6 +43,14 @@ stdenv.mkDerivation { --replace "LIBFIVE_STDLIB_DIR=$" \ "LIBFIVE_STDLIB_DIR=$out/lib" + substituteInPlace libfive/bind/python/CMakeLists.txt \ + --replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \ + " $out/${python.sitePackages}" \ + + substituteInPlace libfive/bind/python/libfive/ffi.py \ + --replace "os.path.join('libfive', folder)" \ + "os.path.join('$out/${python.sitePackages}/libfive', folder)" \ + export XDG_CACHE_HOME=$(mktemp -d)/.cache ''; @@ -63,12 +72,29 @@ stdenv.mkDerivation { '' + '' # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" + + # Create links since libfive looks for the library in a specific path. + mkdir -p "$out/${python.sitePackages}/libfive/src" + ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/" + mkdir -p "$out/${python.sitePackages}/libfive/stdlib" + ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/" + + # Create links so Studio can find the bindings. + mkdir -p "$out/libfive/bind" + ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python" ''; + pythonImportsCheck = [ + "libfive" + "libfive.runner" + "libfive.shape" + "libfive.stdlib" + ]; + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = "https://libfive.com/"; - maintainers = with maintainers; [ hodapp kovirobi ]; + maintainers = with maintainers; [ hodapp kovirobi wulfsta ]; license = with licenses; [ mpl20 gpl2Plus ]; platforms = with platforms; all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix index 75c9beea9b..1e35d41246 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-DPYTHON_BINDINGS=${onOff pythonSupport}" "-DDOCUMENTATION=${onOff docSupport}" ] ++ lib.optionals pythonSupport [ - "-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}" + "-DPYTHON_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}" "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index fa9562947f..b7ccb7085f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; + sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.unix; + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix index a5f1c2576b..03166a423c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk4 , libgee , gettext @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe6..edfd21a469 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk3 , libgee , gettext @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix index bc9a09ab92..f2d3d15f9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.curl; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 6a6e21662e..a5f914b39a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "2.0.1"; + version = "2.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; + hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index a508593bc4..37c5efc5d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gi-docgen gobject-introspection diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix index 2ad7539ef1..0f7859be9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhugetlbfs/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" "MANDIR=$(man)/share/man" + ] ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [ + # The ARCH logic defaults to querying `uname`, which will return build platform arch + "ARCH=${stdenv.hostPlatform.uname.processor}" ]; # Default target builds tests as well, and the tests want a static @@ -40,10 +43,13 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = flatten [ + systems.inspect.platformPatterns.isStatic + systems.inspect.patterns.isMusl + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix index b118890949..5975502f31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libhv"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ithewei"; repo = "libhv"; rev = "v${finalAttrs.version}"; - hash = "sha256-hzqU06Gc/vNqRKe3DTdP4AihJqeuNpt2mn4GlLuGU6U="; + hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 2cb8642ca8..243c26af8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.16"; + version = "3.0.17"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-3D/0leI3LLKDFOXkKSrmMamLoaXdi/2Z4iPUXqgwtg8="; + sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; }; strictDeps = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; nativeInstallCheckInputs = [ # running libical-glib tests - (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ + (python3.pythonOnBuildForHost.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; + changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix index 45fad4459a..fc2fa9b664 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libicns/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "libicns"; - version = "unstable-2022-04-10"; + version = "0.8.1-unstable-2022-04-10"; src = fetchgit { name = "libicns"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix index 83f69cfaa0..9e1d9e55c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,13 @@ -{ fetchurl, lib, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libidn"; version = "1.41"; src = fetchurl { - url = "mirror://gnu/libidn/${pname}-${version}.tar.gz"; + url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-iE1wY2S4Gr3Re+6Whtj/KudDHFoUZRBHxorfizH9iUU="; }; @@ -15,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin libiconv; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; @@ -36,7 +40,8 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.lgpl2Plus; + pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lsix ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix index 98ca22d2e9..8adc015120 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" ] ++ lib.optionals pythonSupport [ - "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" "-DPYTHON_BINDINGS=on" ] ++ lib.optionals (!avahiSupport) [ "-DHAVE_DNS_SD=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock index 8823a070b8..fdad112994 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock @@ -75,16 +75,6 @@ dependencies = [ "cfg-if", ] -[[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" @@ -135,9 +125,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -152,19 +142,12 @@ dependencies = [ "ahash", ] -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - [[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" dependencies = [ "arrayvec", "lodepng", - "num_cpus", "once_cell", "rayon", "rgb", @@ -173,7 +156,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.2" +version = "4.0.3" dependencies = [ "bitflags", "imagequant", @@ -182,15 +165,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -217,16 +200,6 @@ dependencies = [ "adler", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -235,9 +208,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -245,14 +218,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 9041b373ed..f60a1c7cab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; + hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; }; cargoLock = { @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix index 72fb19fd5a..d10020fa99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-0+NVGxujFOJvxX+Tk4mVYsk2Nl7WK6hjl0oylrT6PXU="; + sha256 = "sha256-C34hcea0htc9ayytjqy/t08yA2xMC18sAkDc9PK/Hhc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix index 806a9729c5..826593b9d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiscsi/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; }; + postPatch = '' + substituteInPlace lib/socket.c \ + --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + ''; + nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix index c75c83764a..8b70a3b715 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-hdV8g/BFTI/QfEgVsf942SR0G5xdqP/+h+vnydt4kf0="; + sha256 = "sha256-q1NoHSiPmFPwkTJqg3L5fEBXF/JjRWvA9e4d532ILE8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix index df27688e10..2623e65f68 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblogging/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config -, systemd ? null +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: stdenv.mkDerivation rec { @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ systemd ]; + buildInputs = lib.optionals withSystemd [ systemd ]; configureFlags = [ "--enable-rfc3195" "--enable-stdlog" - (if systemd != null then "--enable-journal" else "--disable-journal") + (if withSystemd then "--enable-journal" else "--disable-journal") "--enable-man-pages" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 0bc649780c..a9e18f4023 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -7,7 +7,7 @@ , vala , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 896c8b8fe4..9965771c15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -12,7 +12,7 @@ , bash-completion , bash , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , withDocs ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index f293d6fb6e..86cf8dfb9e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.09"; + version = "23.10"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-HDJvFmVyrGwsHIim1Tr35FE4iEDH7r7scdWrv9G7LtM="; + hash = "sha256-duvlAuDzELVZ1d2Qcn2ar9X6uq7KNELzjmKd/AfaDSI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index 5569fdf902..e0ee93c162 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-zqtPBxjTJ+/XxVpfVpyFIwvlj5xCcnTrUv2RGzP8UQc="; + sha256 = "sha256-BIEe3DhPqyK+vAAk/6x8Ui+4t+IUyvtHf5Lk2AZVuC8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix index af3c7f82ae..b835844491 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnet"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "sam-github"; repo = "libnet"; rev = "v${version}"; - sha256 = "sha256-Y/wd9c4whUbfpvWvKzJV6vJN3AlA14XBejchRG6wBc4="; + hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix index e94ce7e12b..589703f574 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -9,19 +9,19 @@ , gdk-pixbuf , gnome , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.2"; + version = "0.8.3"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xfTtPR+G5bEYx2QVqsuGGHPtPm8MazGBuCjPWE/FxhY="; + hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix index 4f9d7d09ca..59e16071ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w="; + sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix index 8618986195..0598fd6451 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpfm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic +, windows }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { version = "4.13.0"; pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; + # Don't install libpfm.so on windows as it doesn't exist + # This target is created only if `ifeq ($(SYS),Linux)` passes + patches = [ ./fix-windows.patch ]; + + # Upstream uses "WINDOWS" instead of "Windows" which is incorrect + # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 + postPatch = '' + substituteInPlace config.mk examples/Makefile \ + --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" @@ -19,6 +33,9 @@ stdenv.mkDerivation (rec { ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; + + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; @@ -29,11 +46,7 @@ stdenv.mkDerivation (rec { (PMU) of modern processors. ''; license = licenses.gpl2; - maintainers = [ maintainers.pierron ]; - platforms = platforms.linux; + maintainers = with maintainers; [ pierron t4ccer ]; + platforms = platforms.linux ++ platforms.windows; }; -} // lib.optionalAttrs ( ! enableShared ) -{ - CONFIG_PFMLIB_SHARED = "n"; -} -) +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpfm/fix-windows.patch b/third_party/nixpkgs/pkgs/development/libraries/libpfm/fix-windows.patch new file mode 100644 index 0000000000..584b9ba6eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libpfm/fix-windows.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Makefile b/lib/Makefile +index 5ca71e3..cd0717f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -428,11 +428,13 @@ install: + -mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) + ifeq ($(CONFIG_PFMLIB_SHARED),y) ++ifeq ($(SYS),Linux) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) + -$(LDCONFIG) + endif ++endif + + tags: + $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpng/12.nix b/third_party/nixpkgs/pkgs/development/libraries/libpng/12.nix index a76a1ada6c..e94bd026a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpng/12.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpng/12.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib +, testers +}: assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpng"; version = "1.2.59"; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; + url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl"; }; @@ -15,18 +17,23 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - passthru = { inherit zlib; }; - configureFlags = [ "--enable-static" ]; postInstall = ''mv "$out/bin" "$dev/bin"''; + passthru = { + inherit zlib; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { description = "The official reference implementation for the PNG file format"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; maintainers = [ ]; branch = "1.2"; + pkgConfigModules = [ "libpng" "libpng12" ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix index f8ae5b828c..e1d412b500 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, zlib, apngSupport ? true }: +{ lib, stdenv, fetchurl, zlib, apngSupport ? true +, testers +}: assert zlib != null; @@ -10,12 +12,12 @@ let }; whenPatched = lib.optionalString apngSupport; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; version = "1.6.40"; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; + url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -27,14 +29,19 @@ in stdenv.mkDerivation rec { doCheck = true; - passthru = { inherit zlib; }; + passthru = { + inherit zlib; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES"; license = licenses.libpng2; + pkgConfigModules = [ "libpng" "libpng16" ]; platforms = platforms.all; maintainers = with maintainers; [ vcunat ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 62ddcd6739..5c7a316250 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; - homepage = "http://libproxy.github.io/libproxy/"; + homepage = "https://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 62aa346e00..6f7583d563 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -17,7 +17,7 @@ , libmbim , libqrtr-glib , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 4a17bd951a..afae47c96d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -4,7 +4,6 @@ , extra-cmake-modules , qtbase , qtmultimedia -, qtquick1 , qttools , libGL , libX11 @@ -25,7 +24,6 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia - qtquick1 libGL libX11 libass diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 2dd4cc6663..e154ab8eaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "libquotient"; version = "0.8.1.2"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; @@ -11,10 +13,10 @@ stdenv.mkDerivation rec { hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; }; - buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ qtbase qtkeychain olm openssl qtmultimedia ]; + cmakeFlags = [ "-DQuotient_ENABLE_E2EE=ON" ]; @@ -28,9 +30,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + # causes cyclic dependency but is not used + rm $out/share/ndk-modules/Android.mk + ''; + meta = with lib; { description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; - homepage = "https://matrix.org/docs/projects/sdk/quotient"; + homepage = "https://quotient-im.github.io/libQuotient/"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens matthiasbeyer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix index bfcdb2d528..9a86643061 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl -, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, zlib +, openssl +, cmake +, SystemConfiguration +}: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "3.6.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; + sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; }; - buildInputs = [ zlib openssl ]; + + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + SystemConfiguration + ]; + nativeBuildInputs = [ cmake ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 58a701bc15..9f53027177 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { in '' # avoid git dependency cp ${printVersion} build-aux/git-version-gen + # failing to build otherwise since glibc-2.38 + sed '1i#include ' -i programs/dwg2SVG.c ''; preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix index a9dc9f349f..613f7d3a2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -100,4 +100,9 @@ in { version = "3.7.3"; hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; + + libressl_3_8 = generic { + version = "3.8.2"; + hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix index 3c0fb1fdff..8bbcb7af80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ vonfry ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index d5738153f0..7ba6f1963e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -15,14 +15,13 @@ , libobjc , rustPlatform , rustc -, rust , cargo-auditable-cargo-wrapper , gi-docgen , python3Packages , gnome , vala , writeScript -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection , _experimental-update-script-combinators @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix index f4293952b9..92f3853b5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsass/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsass"; version = "3.6.5"; # also check sassc for updates src = fetchFromGitHub { owner = "sass"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. @@ -17,16 +19,19 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export LIBSASS_VERSION=${version} + export LIBSASS_VERSION=${finalAttrs.version} ''; nativeBuildInputs = [ autoreconfHook ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A C/C++ implementation of a Sass compiler"; homepage = "https://github.com/sass/libsass"; license = licenses.mit; maintainers = with maintainers; [ codyopel offline ]; + pkgConfigModules = [ "libsass" ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 29cb7616a9..3dfb0c295b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -13,7 +13,7 @@ , libgcrypt , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , gi-docgen , gnome diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix index 75fc2afbf1..e9547cc2af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; + patches = [ + # Fixes building libshout with clang. Can be dropped once the following MR is merged: + # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; + hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; + }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; + hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix deleted file mode 100644 index 2e8b788ecc..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/1.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, m4}: - -stdenv.mkDerivation rec { - pname = "libsigc++"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libsigc++/1.2/libsigc++-${version}.tar.bz2"; - sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ m4]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; - branch = "1.2"; - platforms = platforms.unix; - license = licenses.lgpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix index 14e730d69e..b4eeed32d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A modern and easy-to-use crypto library"; - homepage = "http://doc.libsodium.org/"; + homepage = "https://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; pkgConfigModules = [ "libsodium" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 76931b12fc..4b40eacaa0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.25"; + version = "0.7.26"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-OSYfv8dTyoa2f1T/zCEruKczickP5jS05xjYLQQiFaY="; + sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix index 13c7ccc302..ba4d1b0cd8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -11,7 +11,7 @@ , glib-networking , buildPackages , gobject-introspection -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , libpsl , python3 @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { # HSTS tests fail. doCheck = false; + separateDebugInfo = true; postPatch = '' patchShebangs libsoup/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index eb99010fb8..6d5b0183cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -16,7 +16,7 @@ , sqlite , glib-networking , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages }: stdenv.mkDerivation rec { @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-lpthread"; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + separateDebugInfo = true; postPatch = '' # fixes finding vapigen when cross-compiling diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix index b7bef29735..997e89b823 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix @@ -1,23 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libspf2"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "libspf2"; rev = "v${version}"; - sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; + hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; }; - patches = [ - # glibc-2.34 compat - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch"; - sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA="; - }) - ]; + nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; postPatch = '' # disable static bins compilation @@ -28,9 +23,6 @@ stdenv.mkDerivation rec { -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am ''; - # autoreconf necessary because we modified automake files - nativeBuildInputs = [ autoreconfHook ]; - doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix index a791bcef48..9c62799375 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsv"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "uael"; repo = "sv"; rev = "v${version}"; - sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtcod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtcod/default.nix index 3e77d0876b..3674f25b46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtcod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtcod/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.skeidel ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/third_party/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch rename to third_party/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix index 4b5296c895..54386e57a0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtickit/default.nix @@ -7,9 +7,12 @@ , libtermkey , unibilium }: -stdenv.mkDerivation rec { - pname = "libtickit"; +let version = "0.4.3"; +in +stdenv.mkDerivation { + pname = "libtickit"; + inherit version; src = fetchFromGitHub { owner = "leonerd"; @@ -18,25 +21,33 @@ stdenv.mkDerivation rec { hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; }; - makeFlags = [ - "PREFIX=$(out)" - "LIBTOOL=${lib.getExe libtool}" + patches = [ + # Disabled on darwin, since test assumes TERM=linux + ./001-skip-test-18term-builder-on-macos.patch ]; nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + nativeCheckInputs = [ perl ]; - patches = [ - ./skipTestMacOS.patch + makeFlags = [ + "LIBTOOL=${lib.getExe libtool}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 4fc6449230..8055704b08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch index e0ef9f3478..933e06f323 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/headers.patch @@ -1,9 +1,8 @@ -diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am -index 44522b62..d66e5948 100644 +export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch index ddd33ad490..04fa1bfc88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch @@ -1,3 +1,4 @@ +fix case-insensitive build --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ docfiles = \ @@ -6,15 +7,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 4ec70464e1..83c84fac60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -42,6 +42,11 @@ in stdenv.mkDerivation { moveToOutput "lib/${python.libPrefix}" "$python" ''; + postFixup = '' + substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + ''; + outputs = [ "out" "dev" "python" ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix index 75773296fa..c8e00cf4a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; + homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix index 1feafabfd4..c1e0881bf3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunarr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libunarr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; - hash = "sha256-5wCnhjoj+GTmaeDTCrUnm1Wt9SsWAbQcPSYM//FNeOA="; + hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix index 5779389dda..a42aab3d59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -1,25 +1,15 @@ -{ lib, stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; + sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; }; - patches = [ - # Pull upstream fix for parallel build failures: - # https://github.com/axboe/liburing/pull/891 - (fetchpatch { - name = "parallel.patch"; - url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; - hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix index 7be9bee23a..d8b7cbdab5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , libtool @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; + patches = [ + # Disable io_uring close on selected kernels. Remove on next release + # https://github.com/libuv/libuv/pull/4141 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; + hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; + }) + ]; + outputs = [ "out" "dev" ]; postPatch = let @@ -93,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/219466 separateDebugInfo = !stdenv.hostPlatform.isStatic; - doCheck = true; + doCheck = + # routinely hangs on powerpc64le + !stdenv.hostPlatform.isPower64; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -113,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index 7796ec2515..43fe69af2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; + sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix index f0e4eab164..eb2a6598cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-/juTlK7iRu8XN4kbB1VhmOcKjFD8iBwuIIAJsmF5ihU="; + sha256 = "sha256-oW4vIGgSs5lzmuloCFJPXTmsfH9Djz2KTlsjrOkaT5I="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix index 9e4b96a9d7..941ee900ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvarlink/default.nix @@ -19,18 +19,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE="; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja python3 ]; postPatch = '' - substituteInPlace varlink-wrapper.py \ - --replace "/usr/bin/env python3" "${python3}/bin/python3" - # test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed. # PR that added it https://github.com/varlink/libvarlink/pull/27 substituteInPlace lib/test-object.c \ --replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' "" - patchShebangs lib/test-symbols.sh + patchShebangs lib/test-symbols.sh varlink-wrapper.py ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index f1a9fbe9b2..bb855ac767 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -11,7 +11,7 @@ , libvirt , libxml2 , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection , withDocs ? stdenv.hostPlatform == stdenv.buildPlatform , gtk-doc diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 658a24b8d8..4c3740e4ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "9.7.0"; + version = "9.9.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-7huo2UsbNG/HG2dpdVT5qcJuFmYZE6Jdave8Gb1kHME="; + sha256 = "sha256-8Tmn99wDkRoA+pnOjeCzHoCeR3P3MwCA1kqY6SZpkqw="; fetchSubmodules = true; }; @@ -155,16 +155,12 @@ stdenv.mkDerivation rec { src/storage/storage_backend_disk.c \ src/storage/storage_util.c '' + lib.optionalString isDarwin '' - sed -i '/qemucapabilitiestest/d' tests/meson.build - sed -i '/vircryptotest/d' tests/meson.build - sed -i '/domaincapstest/d' tests/meson.build + # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O. + # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235 + sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build - '' + lib.optionalString (isDarwin && isx86_64) '' - sed -i '/qemucaps2xmltest/d' tests/meson.build - sed -i '/qemuhotplugtest/d' tests/meson.build - sed -i '/virnetdaemontest/d' tests/meson.build ''; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix index 3df8cce6f4..eb5b320b31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, yasm +{ lib, stdenv, fetchFromGitHub, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -75,27 +75,15 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; + hash = "sha256-KTbzZ5/qCH+bCvatYZhFiWcT+L2duD40E2w/BUaRorQ="; }; - patches = [ - (fetchpatch { - # https://www.openwall.com/lists/oss-security/2023/09/28/5 - name = "CVE-2023-5217.patch"; - url = "https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590.patch"; - hash = "sha256-1hHUd/dNGm8dmdYYN60j1aOgC2pdIIq7vqJZ7mTXfps="; - includes = [ - "vp8/encoder/onyx_if.c" - ]; - }) - ]; - postPatch = '' patchShebangs --build \ build/make/*.sh \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix index 27ce41d20f..0e92d28046 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-ketQiAafTm7atp4UxCEvbaAZLmVpWVbcBIAWoNq4vPY="; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix index c03dd99a12..254769349b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.7.0"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; + hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix deleted file mode 100644 index 6b375978a4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }: - -stdenv.mkDerivation rec { - pname = "libxkbcommon"; - version = "0.7.2"; - - src = fetchurl { - url = "http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz"; - sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bison flex xkeyboard_config libxcb ]; - - configureFlags = [ - "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "--with-x-locale-root=${libX11.out}/share/X11/locale" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - preBuild = lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$//' Makefile - ''; - - meta = with lib; { - description = "A library to handle keyboard descriptions"; - homepage = "https://xkbcommon.org"; - license = licenses.mit; - maintainers = with maintainers; [ ttuegel ]; - mainProgram = "xkbcli"; - platforms = with platforms; unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix index 8ba48e15f2..4c9b77d7c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxls/default.nix @@ -30,5 +30,13 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; mainProgram = "xls2csv"; platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2023-38851" + "CVE-2023-38852" + "CVE-2023-38853" + "CVE-2023-38854" + "CVE-2023-38855" + "CVE-2023-38856" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index bc9e2c8c2c..3f8e27789b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -83,7 +83,7 @@ libxml = stdenv.mkDerivation rec { (lib.enableFeature enableShared "shared") (lib.withFeature icuSupport "icu") (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ]; installFlags = lib.optionals pythonSupport [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix index 3a5c895574..356f87ff26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--without-mem-debug" "--without-debugger" (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ] ++ lib.optionals (!cryptoSupport) [ "--without-crypto" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix index 88fdfcca03..d220bcee1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.111"; + version = "2.1.128"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; + sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix index 44f82f1585..4b691ba3d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -33,14 +33,16 @@ stdenv.mkDerivation rec { python ]; + env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + postBuild = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES popd ''; postInstall = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py popd ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 25cb21a314..55d04fb4f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -1,6 +1,8 @@ { config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false -, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: +, cudaSupport ? config.cudaSupport or false, openclSupport ? false +, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false, pythonLibrary ? false +, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost +, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }: assert doCheck -> mpiSupport != true; assert openclSupport -> cudaSupport != true; @@ -21,14 +23,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ lgbm ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "3.3.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-QRuBbMVtD5J5ECw+bAp57bWaRc/fATMcTq+AKikhj1I="; + hash = "sha256-AhXe/Mlor/i0y84wI9jVPKSnyVbSyAV52Y4yiNm7yLQ="; }; nativeBuildInputs = [ cmake ] @@ -38,13 +40,14 @@ stdenv.mkDerivation rec { ++ lib.optionals hdfsSupport [ hadoop ] ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ] ++ lib.optionals javaWrapper [ swig ] - ++ lib.optionals rLibrary [ R ]; + ++ lib.optionals rLibrary [ R pandoc ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals rLibrary [ rPackages.data_table + rPackages.rmarkdown rPackages.jsonlite rPackages.Matrix rPackages.R6 @@ -62,6 +65,7 @@ stdenv.mkDerivation rec { external_libs/compute/include/boost/compute/cl_ext.hpp \ --replace "include - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (!useOpenCL) [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DMIOPEN_BACKEND=HIP" - ] ++ lib.optionals useOpenCL [ - "-DMIOPEN_BACKEND=OpenCL" - ] ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - "-DMIOPEN_TEST_ALL=ON" - "-DMIOPEN_TEST_GFX900=ON" - "-DMIOPEN_TEST_GFX906=ON" - "-DMIOPEN_TEST_GFX908=ON" - "-DMIOPEN_TEST_GFX90A=ON" - "-DMIOPEN_TEST_GFX103X=ON" - "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" \ - --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ - --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' - '' + lib.optionalString buildTests '' - substituteInPlace test/gtest/CMakeLists.txt \ - --replace "enable_testing()" "" - '' + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' + lib.optionalString fetchKDBs '' - ln -sf ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb - ln -sf ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb - ln -sf ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb - ln -sf ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb - ln -sf ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb - ln -sf ${kdbs.gfx90878} src/kernels/gfx90878.kdb - ln -sf ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb - ln -sf ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb - ''; - - # Unfortunately, it seems like we have to call make on these manually - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - '' + lib.optionalString buildTests '' - make -j$NIX_BUILD_CORES check - ''; - - postInstall = '' - rm $out/bin/install_precompiled_kernels.sh - '' + lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} - mv ../doc/pdf/miopen.pdf $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin - patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ - [ hip rocm-comgr ])} $test/bin/* - '' + lib.optionalString fetchKDBs '' - # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it - # Should be fixed in the next miopen kernel generation batch - ln -s ${kdbs.gfx1030_36} $out/share/miopen/db/gfx1030_40.kdb - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/miopen/deps.nix b/third_party/nixpkgs/pkgs/development/libraries/miopen/deps.nix deleted file mode 100644 index e88b61ad97..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/miopen/deps.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl -, mirror -}: - -{ - gfx1030_36 = fetchurl { - sha256 = "sha256-zEXDLkRWAHS15LDA5IRyqG5rO7HHPBiVgPlQ8JjSqNc="; - url = "${mirror}/gfx1030_36.kdb"; - }; - - gfx900_56 = fetchurl { - sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; - url = "${mirror}/gfx900_56.kdb"; - }; - - gfx900_64 = fetchurl { - sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; - url = "${mirror}/gfx900_64.kdb"; - }; - - gfx906_60 = fetchurl { - sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; - url = "${mirror}/gfx906_60.kdb"; - }; - - gfx906_64 = fetchurl { - sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; - url = "${mirror}/gfx906_64.kdb"; - }; - - gfx90878 = fetchurl { - sha256 = "sha256-r7DRhNH+jHUXAu64b9vWsZzGD4w5oSHnxH0l2RN0qlQ="; - url = "${mirror}/gfx90878.kdb"; - }; - - gfx90a68 = fetchurl { - sha256 = "sha256-NT//zIPTbzsPJyaVycxwU6BcMTzGc/d+Z4Ab9FImDko="; - url = "${mirror}/gfx90a68.kdb"; - }; - - gfx90a6e = fetchurl { - sha256 = "sha256-ENZHbf+/MGYgSTpALKh2meuZPNhH5bG+WrW/jzvGpBs="; - url = "${mirror}/gfx90a6e.kdb"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix index 225ce96708..a8afd6e038 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, bash , gnome , meson , python3 @@ -15,12 +17,20 @@ stdenv.mkDerivation rec { sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; + strictDeps = true; + nativeBuildInputs = [ meson python3 ninja ]; + # for shebangs + buildInputs = [ + python3 + bash + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix index ef6134c3e4..b5963e1238 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mongocxx/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-cxx-driver"; rev = "refs/tags/r${finalAttrs.version}"; - hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA="; + hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix index 7ce84cbba8..b37cfffabc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/monocypher/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "monocypher"; - version = "3.1.3"; + version = "4.0.2"; src = fetchurl { url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; - hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4="; + hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w="; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch"; - hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk="; - }) - ]; - - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; - installFlags = [ "PREFIX=$(out)" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index a505dd73fa..622ee233f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-NJLpitq2K1l+8NKS+yRZthI7yABwqKoKML5pYgdaEvA="; }; + outputs = [ "out" "doc" "man" ]; + configureFlags = [ "--enable-shared" "--enable-sharedlib" diff --git a/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix index 987f4022f5..2182c40833 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mvapich/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; buildInputs = with lib; [ @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" - ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] + ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; doCheck = true; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry + patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry done # Ensure the default compilers are the ones mvapich was built with diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index 585dd4072b..ef4e423d05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-CdIZ0ql8QBM7UcEyTmt4P9gZyO8jrkLipAOsJUkpG8g="; + hash = "sha256-ASZyvcP9XVFPf7nTsBx5E+D/7fWzUslPZrmhhNY5DzQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index cb8333704f..9c1c8b422a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, ncurses , pkg-config , abiVersion ? "6" , enableStatic ? stdenv.hostPlatform.isStatic @@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { "/usr/share/terminfo" # upstream default, probably all FHS-based distros "/run/current-system/sw/share/terminfo" # NixOS ]}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ncurses + # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. + ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 4eba7cbbd8..f5efbdcc08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R+PvD7E/z+Gc7h2y0pUYaCkzfgpxzwToOr4pKSrOnxU="; + sha256 = "sha256-bRlz5RW+NUSTgzjRM9alZjSrzmF8/7p4IIXqK/HEcJo="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch new file mode 100644 index 0000000000..7d1723c3ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60c699d..606b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -402,7 +402,7 @@ ELSE(MSVC) + FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ENDIF(MSVC) + +-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) ++CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY) + IF(NOT HAVE_H5FREE_MEMORY) + MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") + SET(NC_HAS_DEF_VAR_FILTER "") diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix index 5f0fade256..945eb21922 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; + patches = [ + # This fix is included upstream, remove with next upgrade + ./cmake-h5free.patch + ]; + preConfigure = '' cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)" ''; @@ -28,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index e26fe4fa00..b208607f7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.54.0"; + version = "1.57.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0="; + sha256 = "sha256-xjdnfLrESU6q+LDgOGFzFGhFgw76/+To3JL7O0KOWtI="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 4aaaefe1eb..21e0cff3b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.15.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-ZnfwPgjBAI2elHrx7uzc3JX2MdeX/hsrFKj4TfMK2tI="; + hash = "sha256-mw0zI7528lvEZlv+/KuST7PWjuu37p/+EGGsjIEto2Q="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index d276311a24..1d716704c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.19.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ=="; + hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 45f7d9d67d..851d687077 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.19.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ="; + hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix index 65ba691e12..cb5aa49ec6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "8e1836f57e8bcdb228dd5baadc71dfbf30b544e0"; - sha256 = "sha256-Q08/Oxv9DLCHp7Hf3NqNa0sHq7qwM6TfGT8gNyiwin8="; + rev = "a54820ff0e1b74554c7f649e8386ee8c4ecd98f5"; + sha256 = "sha256-4Vj8nf3c45Y8LJ79YUOrNAAGMmfygdPtAJrs+JuFiUM="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix index 56713f2a6a..6b0b0304d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/numcpp/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "numcpp"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "dpilger26"; repo = "NumCpp"; rev = "Version_${finalAttrs.version}"; - hash = "sha256-IAku1bcaMkawZxpQbvxcS6VX07ogw4UGo1DX2Wa8xwU="; + hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo="; }; nativeCheckInputs = [gtest python3]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch new file mode 100644 index 0000000000..05de63806f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch @@ -0,0 +1,34 @@ +From 4e8bd61c216969615a492043092bd8298dcd1410 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Mon, 6 Nov 2023 09:33:45 -0500 +Subject: [PATCH] hardcode install_dir + +partially revert https://github.com/elFarto/nvidia-vaapi-driver/commit/60ab79608ae35bd929d3e1387d226547d18e6bed +--- + meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 990c2b2..f5e63d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -71,7 +71,6 @@ if gst_codecs_deps.found() + endif + + nvidia_incdir = include_directories('nvidia-include') +-nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir') + + shared_library( + 'nvidia_drv_video', +@@ -80,7 +79,7 @@ shared_library( + dependencies: deps, + include_directories: nvidia_incdir, + install: true, +- install_dir: nvidia_install_dir, ++ install_dir: get_option('libdir') / 'dri', + gnu_symbol_visibility: 'hidden', + ) + +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 4a1976be29..60ef649ec5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,15 +14,19 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0="; + sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20="; }; + patches = [ + ./0001-hardcode-install_dir.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix index aee255fd96..047711e565 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "5.0.0"; + version = "5.0.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-ZRkXd7D4weCfP6R7UZD2+saNiNa+XXVhfiWIlxBObmU="; + sha256 = "sha256-XSQ2TLozbmofpzagbqcGSxAx0jpR68Gr6so/KKwZhbY="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix index d6d0f1741d..6002ea4646 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/omorfi/default.nix @@ -3,6 +3,7 @@ , autoreconfHook , cg3 , fetchFromGitHub +, fetchpatch , hfst , hfst-ospell , icu @@ -24,6 +25,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; }; + patches = [ + # allow building with python311. + # patch is incorporated upstream and should be removed on the next update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/flammie/omorfi/commit/9736452ae6624060dbea0876a722c3731e776357.patch"; + hash = "sha256-Q4fi5HMmO0fq8YI833vgv2EYp//9Um/xFoRk28WrUMk="; + }) + ]; + # Fix for omorfi-hyphenate.sh file not found error postInstall = '' ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 7448a99439..e6bf2a4c54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.2.1"; + version = "3.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + hash = "sha256-dC4Z1OvqIF8YhuSeVo+E0CohdXYIfkeTEw3/QuYA/90="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index 3062c3cb4e..a1a9dc8757 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.8"; + version = "6.9.9"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; + sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; }; outputs = [ "dev" "lib" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 4a9ee61f56..7a8b8570f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -17,7 +17,7 @@ , microsoft-gsl , iconv , gtest -, protobuf3_21 +, protobuf_21 , pythonSupport ? true }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3Packages.python - protobuf3_21 + protobuf_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -154,6 +154,13 @@ stdenv.mkDerivation rec { "-Donnxruntime_ENABLE_PYTHON=ON" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-but-set-variable" + ]; + }; + doCheck = true; postPatch = '' @@ -177,7 +184,7 @@ stdenv.mkDerivation rec { ''; passthru = { - protobuf = protobuf3_21; + protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch new file mode 100644 index 0000000000..e60ebc9e1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index c122b013..04f36bf0 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + # ZLIB_VERSION_STRING is still available for backward compatibility. + # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html + +- if (@ZLIB_VERSION@) # @ZLIB_VERSION@ +- find_dependency(ZLIB @ZLIB_VERSION@) +- else() +- find_dependency(ZLIB @ZLIB_VERSION_STRING@) +- endif() ++ find_dependency(ZLIB) + endif() + + if (NOT TARGET MINIZIP::minizip-ng) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 40a64077ac..9b5018ef41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -27,32 +27,25 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; + sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE="; }; patches = [ (fetchpatch { - name = "darwin-no-hidden-l.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; - revert = true; - sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; - }) - (fetchpatch { - name = "pkg-config-absolute-path.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; - sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; - }) - (fetchpatch { - name = "minizip-ng-4.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; - hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + # Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891. + name = "opencolorio-yaml-cpp-8.0-compat.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch"; + sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg="; }) + # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. + # Needed for zlib >= 1.3 && cmake < 3.27.4. + ./broken-cmake-zlib-version.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -81,14 +74,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + "-DOCIO_USE_SSE2NEON=OFF" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" - "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 doCheck = stdenv.isx86_64; + # Tends to fail otherwise. + enableParallelChecking = false; meta = with lib; { homepage = "https://opencolorio.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix index 26b2715658..38a50b7502 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "opencore-amr"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 037192d871..e3f458d0d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -1,8 +1,9 @@ { lib, stdenv , fetchFromGitHub , fetchpatch +, callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -14,8 +15,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? config.cudaSupport && - stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , cudaPackages ? { } , enableUnfree ? false , enableIpp ? false @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -289,7 +289,11 @@ stdenv.mkDerivation { hardeningDisable = [ "bindnow" "relro" ]; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { pythonPath = []; } // { + tests = lib.optionalAttrs enableCuda { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv3"; }; + }; + }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 68099a57c6..06360449c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -37,12 +37,11 @@ , blas , enableContrib ? true -, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda , cudaPackages ? {} -, symlinkJoin , nvidia-optical-flow-sdk , enableLto ? true @@ -83,11 +82,16 @@ , Accelerate , bzip2 , callPackage -}: +}@inputs: let version = "4.7.0"; + # It's necessary to consistently use backendStdenv when building with CUDA + # support, otherwise we get libstdc++ errors downstream + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else inputs.stdenv; + src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; @@ -121,11 +125,11 @@ let sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in - if stdenv.hostPlatform.system == "x86_64-linux" then + if effectiveStdenv.hostPlatform.system == "x86_64-linux" then { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } - else if stdenv.hostPlatform.system == "i686-linux" then + else if effectiveStdenv.hostPlatform.system == "i686-linux" then { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; @@ -232,35 +236,12 @@ let #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; + inherit (cudaPackages) cudaFlags cudaVersion; inherit (cudaFlags) cudaCapabilities; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # - libnpp # npp.h - ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in -stdenv.mkDerivation { +effectiveStdenv.mkDerivation { pname = "opencv"; inherit version src; @@ -317,9 +298,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python - ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 + ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk @@ -330,7 +311,7 @@ stdenv.mkDerivation { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) + ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ lib.optional enableOvis ogre @@ -343,11 +324,21 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals effectiveStdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda [ cuda-redist ]; + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart + cuda_cccl # + libnpp # npp.h + ] ++ lib.optionals enableCublas [ + libcublas # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn # cudnn.h + ] ++ lib.optionals enableCufft [ + libcufft # cufft.h + ]); propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; @@ -357,7 +348,9 @@ stdenv.mkDerivation { pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ cuda-native-redist ]; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -369,7 +362,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" @@ -400,17 +393,14 @@ stdenv.mkDerivation { (opencvFlag "ENABLE_LTO" enableLto) (opencvFlag "ENABLE_THIN_LTO" ( enableLto && ( - # Only clang supports thin LTO, so we must either be using clang through the stdenv, - stdenv.cc.isClang || - # or through the backend stdenv. - (enableCuda && backendStdenv.cc.isClang) + # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, + effectiveStdenv.cc.isClang || + # or through the backend effectiveStdenv. + (enableCuda && effectiveStdenv.cc.isClang) ) )) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - # We need to set the C and C++ host compilers for CUDA to the same compiler. - "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" # OpenCV respects at least three variables: @@ -421,7 +411,7 @@ stdenv.mkDerivation { "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" @@ -435,7 +425,7 @@ stdenv.mkDerivation { "-DBUILD_JPEG=OFF" "-DBUILD_PNG=OFF" "-DBUILD_WEBP=OFF" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" @@ -489,14 +479,17 @@ stdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; } + // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") { + // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; - }; }; + } + // lib.optionalAttrs (enableCuda) { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/libstdcxx-test.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/libstdcxx-test.nix new file mode 100644 index 0000000000..d8cc483da9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/libstdcxx-test.nix @@ -0,0 +1,17 @@ +{ python3Packages, runCommand, attrName }: + +runCommand "${python3Packages.${attrName}.name}-libstdcxx-test" +{ + nativeBuildInputs = [ + (python3Packages.python.withPackages (ps: [ + (ps.${attrName}.override { enableCuda = true; }) + ps.scikit-image + ])) + ]; +} '' + python << EOF + import cv2 + from skimage.transform import pyramid_reduce + EOF + touch $out +'' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index a5ce27e270..826c7b2c85 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-cV+qgx3WzdotypgpZhVFxzdKAU2rNVw0KWSdkeN0gLk="; + hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix index a908b4980d..dd6b0ce10c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openfec/default.nix @@ -1,12 +1,17 @@ -{ stdenv, lib, fetchzip, cmake }: +{ stdenv +, lib +, fetchzip +, cmake +, gitUpdater +}: stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2"; + version = "1.4.2.9"; src = fetchzip { - url = "http://openfec.org/files/openfec_v1_4_2.tgz"; - sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA="; }; outputs = [ "out" "dev" ]; @@ -33,6 +38,11 @@ stdenv.mkDerivation rec { ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/roc-streaming/openfec.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Application-level Forward Erasure Correction codes"; homepage = "https://github.com/roc-streaming/openfec"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix index 201bf16ad6..2bfb087085 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.4"; src = fetchFromGitHub { - owner = "ofxa"; + owner = "AcademySoftwareFoundation"; repo = "openfx"; rev = "OFX_Release_1_4_TAG"; sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Image processing plug-in standard"; - homepage = "http://openeffects.org/"; + homepage = "https://openeffects.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.guibou ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openimageio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openimageio/default.nix index 610a458c07..a0f520dcb6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openimageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openimageio/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; }; + # Workaround broken zlib version detecion in CMake < 3.37. + postPatch = '' + substituteInPlace ./src/cmake/Config.cmake.in \ + --replace " @ZLIB_VERSION@" "" + ''; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index 50098de03d..d528e2fc03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 937669fc58..1c4955e2c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix, ucx +, libpsm2, libfabric, pmix, ucx, ucc , config # Enable CUDA support , cudaSupport ? config.cudaSupport, cudatoolkit @@ -25,11 +25,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.5"; + version = "4.1.6"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pkCYa8JXOJ3TeYhv2uYmTIz6VryYtxzjrj372M5h2+M="; + sha256 = "sha256-90CZRIVRbetjtTEa8SLCZRefUyig2FelZ7hdsAsR5BU="; }; postPatch = '' @@ -43,8 +43,10 @@ in stdenv.mkDerivation rec { find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; ''; + outputs = [ "out" "man" ]; + buildInputs = [ zlib ] - ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] + ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core @@ -56,8 +58,8 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" ++ lib.optionals stdenv.isLinux [ - "--with-libnl=${libnl.dev}" - "--with-pmix=${pmix}" + "--with-libnl=${lib.getDev libnl}" + "--with-pmix=${lib.getDev pmix}" "--with-pmix-libdir=${pmix}/lib" "--enable-mpi-cxx" ] ++ lib.optional enableSGE "--with-sge" @@ -66,13 +68,13 @@ in stdenv.mkDerivation rec { # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] - ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ] + ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; enableParallelBuilding = true; postInstall = '' - rm -f $out/lib/*.la + find $out/lib/ -name "*.la" -exec rm -f \{} \; ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 2be34feeaa..3aeafccb1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -18,14 +18,14 @@ # files. let - common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }: stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; inherit patches; @@ -219,9 +219,11 @@ let meta = with lib; { homepage = "https://www.openssl.org/"; + changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; + maintainers = with maintainers; [ thillux ]; pkgConfigModules = [ "libcrypto" "libssl" @@ -238,7 +240,7 @@ in { # and backport this to stable release (23.05). openssl_1_1 = common { version = "1.1.1w"; - sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; + hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -255,8 +257,32 @@ in { }; openssl_3 = common { - version = "3.0.10"; - sha256 = "sha256-F2HU9bE6ECi5tvPUuOF/6wztyTcPav5h1xk9LNzoMyM="; + version = "3.0.12"; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./use-etc-ssl-certs-darwin.patch + else ./use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; + + openssl_3_1 = common { + version = "3.1.4"; + hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 06d65be106..b0ff4b5288 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation rec { "-DNO_OPENCL=1" ]; + preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' + # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1313 + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) + ''; + postInstall = "rm $out/lib/*.a"; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix index 9c99ee6027..a85aa6d14e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "opentracing-cpp"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "opentracing"; repo = "opentracing-cpp"; rev = "v${version}"; - sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx"; + sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix index d6735e77d4..e20499b920 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21"; + version = "1.21.1"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; + sha256 = "sha256-Lg42QqsHYFxeUjZjYFVJFxeJv2MzOpjoShfbIg/095A="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 1abc8a2633..53bfa41a8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-lF8Pauyi+zSNVnpHqq86J3SGUTM6AhFmnT48eyFoYco="; + sha256 = "sha256-qK8l/v6nLuMAitz7DfVDjJyVjEmkeD2jgJkG5qOMCcQ="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index cf75de2bf6..1c65fa1981 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.2.16"; + version = "5.2.109"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; + hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix index 836f9fe625..1494327882 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.c"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; rev = "v${version}"; - hash = "sha256-LxyMbMA6Antt8Uu4jCvmvYT9+Vm4ZUVz4XXFdd0O7Kk="; + hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index f5fc01a6fc..3d866a9229 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -17,7 +17,7 @@ , glib , python3 , x11Support? !stdenv.isDarwin, libXft -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix index a61df952f8..a1f5c9a728 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/parson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "parson"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "kgabis"; repo = "parson"; - rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags - hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470="; + rev = "ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3"; # upstream doesn't use tags + hash = "sha256-IEmCa0nauUzG+zcLpr++ySD7i21zVJh/35r9RaQkok0="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 7730b30b39..c6e67d39c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -38,7 +38,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; - preConfigure = '' + # touch ChangeLog to avoid below error on darwin: + # Makefile.am: error: required file './ChangeLog.md' not found + preConfigure = lib.optionalString stdenv.isDarwin '' + touch ChangeLog + '' + '' ./autogen.sh ''; @@ -48,6 +52,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix deleted file mode 100644 index c45a8e03fd..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, libxpdf, libxml2}: - -stdenv.mkDerivation { - name = "pdf2xml"; - - src = fetchurl { - url = "http://tarballs.nixos.org/pdf2xml.tar.gz"; - sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; - }; - sourceRoot = "pdf2xml/pdf2xml"; - - buildInputs = [libxml2 libxpdf]; - - patches = [./pdf2xml.patch]; - - hardeningDisable = [ "format" ]; - - preBuild = '' - cp Makefile.linux Makefile - - sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile - sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile - sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile - - mkdir exe - - buildFlags+=" CXX=$CXX" - ''; - - installPhase = '' - mkdir -p $out/bin - cp exe/* $out/bin - ''; - - meta = with lib; { - description = "PDF to XML converter"; - homepage = "https://sourceforge.net/projects/pdf2xml/"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch deleted file mode 100644 index 596a3aea67..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pdf2xml/pdf2xml.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux -*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 ---- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 -*************** -*** 30,36 **** - - - # Executable name -! PDFTOXMLEXE=pdftoxml.exe - - # Main target - all: pdftoxmlEXE ---- 30,36 ---- - - - # Executable name -! PDFTOXMLEXE=pdftoxml - - # Main target - all: pdftoxmlEXE -diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc -*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 ---- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 -*************** -*** 11,21 **** - // - //=========================================================================== - - #include -- #include - #include - #include -! #include - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" ---- 11,21 ---- - // - //=========================================================================== - -+ #include - #include - #include - #include -! #include - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix index c811f0d4eb..a6b57f2b34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.12"; + version = "4.6.1"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-n5mzzIDU7Lb2V9YImPvceCBUt9Q+ZeF45CHtW52cGpY="; + hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix index 33ca032672..92b6ae003f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = "http://nhartland.github.io/APFELgrid/"; + homepage = "https://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix index b3ba508220..589233a195 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.4"; + version = "2.4.7.1"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; + hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index f0caef0334..f803bea98f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -16,11 +16,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-JI87WzbddzhEy+c9UfYIkUWDNLmGsll1TFnb9Lvx1SU="; + sha256 = "sha256-WH+qZVbMVMzYmtNUIUYbR2HXgJvBei5y9QNNrqFCIys="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index 8628ca8769..fdfc713d53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM="; }; - latex = texlive.combine { inherit (texlive) - scheme-basic + latex = texliveBasic.withPackages (ps: with ps; [ collection-pstricks collection-fontsrecommended l3kernel @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { xcolor xkeyval xstring - ;}; + ]); nativeBuildInputs = [ rsync makeWrapper ]; buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix index fd1c1ae34b..b08495cae7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/piper-phonemize/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build , cmake @@ -17,24 +18,28 @@ let src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-ng"; - rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; - hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; + hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; }; patches = [ + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) ./espeak-mbrola.patch ]; }); in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "1.1.0"; + version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; - rev = "refs/tags/v${version}"; - hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + rev = "refs/tags/${version}"; + hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; nativeBuildInputs = [ @@ -42,6 +47,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DONNXRUNTIME_DIR=${onnxruntime.dev}" + "-DESPEAK_NG_DIR=${espeak-ng'}" + ]; + buildInputs = [ espeak-ng' onnxruntime diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch deleted file mode 100644 index fab89c4ffd..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 99a4b2d1..d4a4cda7 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,7 @@ endif - - spa_plugindir = pipewire_libdir / spa_name - --alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' -+alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - - pipewire_headers_dir = pipewire_name / 'pipewire' - diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch deleted file mode 100644 index 230f1b3039..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 961ae2a76..692b84dfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -179,6 +179,9 @@ option('udev', - option('udevrulesdir', - type : 'string', - description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') -+option('pipewire_pulse_prefix', -+ type : 'string', -+ description: 'Install directory for the pipewire-pulse daemon') - option('systemd-system-unit-dir', - type : 'string', - description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') -diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index d17f3794f..34afe4f1a 100644 ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -9,7 +9,7 @@ install_data( - - systemd_config = configuration_data() - systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') --systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') -+systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') - - configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch deleted file mode 100644 index b8d8fcb0f9..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index b6b4553b..f21c29d8 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') - pipewire_sysconfdir = prefix / get_option('sysconfdir') - - pipewire_configdir = pipewire_sysconfdir / 'pipewire' --pipewire_confdatadir = pipewire_datadir / 'pipewire' -+pipewire_confdatadir = get_option('pipewire_confdata_dir') -+if pipewire_confdatadir == '' -+ pipewire_confdatadir = pipewire_datadir / 'pipewire' -+endif - modules_install_dir = pipewire_libdir / pipewire_name - - if host_machine.system() == 'linux' -diff --git a/meson_options.txt b/meson_options.txt -index 9bc33fcd..e4bd2dc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -61,6 +61,9 @@ option('jack-devel', - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') -+option('pipewire_confdata_dir', -+ type: 'string', -+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') - option('spa-plugins', - description: 'Enable spa plugins integration', - type: 'feature', diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch deleted file mode 100644 index ca7d351257..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 9c885a38f..c474eb45d 100644 ---- a/src/daemon/minimal.conf.in -+++ b/src/daemon/minimal.conf.in -@@ -111,7 +111,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # - #] - - # An array of rejected paths. -@@ -359,5 +359,5 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ #@pulse_comment@{ path = "" args = "-c pipewire-pulse.conf" } - ] -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 697bf094d..3a7b54ddd 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -142,7 +142,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # - #] - - # An array of rejected paths. -@@ -294,7 +294,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" -+ @sm_comment@{ path = "" args = "@session_manager_args@" - @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } - # - # You can optionally start the pulseaudio-server here as well -@@ -302,6 +302,6 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" -+ @pulse_comment@{ path = "" args = "-c pipewire-pulse.conf" - @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } - ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch deleted file mode 100644 index d8241a809f..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 56599ebd1..3bed2d3e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ else - endif - - spa_plugindir = pipewire_libdir / spa_name --spa_datadir = pipewire_datadir / spa_name -+spa_datadir = pipewire_libdir / spa_name - - alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 1e66d1573f..3876a5c892 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -70,6 +70,7 @@ , tinycompress , ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado +, libselinux }: # Bluetooth codec only makes sense if general bluetooth enabled @@ -80,12 +81,10 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.80"; + version = "0.3.84"; outputs = [ "out" - "lib" - "pulse" "jack" "dev" "doc" @@ -98,30 +97,14 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; + sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; }; patches = [ - # Break up a dependency cycle between outputs. - ./0040-alsa-profiles-use-libdir.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./0050-pipewire-pulse-path.patch # Load libjack from a known location ./0060-libjack-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add option for changing the config install directory - ./0080-pipewire-config-dir.patch - # Remove output paths from the comments in the config templates to break dependency cycles - ./0090-pipewire-config-template-paths.patch - # Place SPA data files in lib output to avoid dependency cycles - ./0095-spa-data-dir.patch - - # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; - hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; - }) ]; strictDeps = true; @@ -142,6 +125,7 @@ let glib libjack2 libusb1 + libselinux libsndfile lilv ncurses @@ -174,9 +158,7 @@ let "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" @@ -185,7 +167,6 @@ let "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" "-Dudev=${mesonEnableFeature (!enableSystemd)}" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" @@ -198,7 +179,6 @@ let "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" - "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" @@ -222,15 +202,6 @@ let ''; postInstall = '' - ${lib.optionalString enableSystemd '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - ''} - - rm $out/bin/pipewire-pulse - mkdir -p $pulse/bin - ln -sf $out/bin/pipewire $pulse/bin/pipewire-pulse - moveToOutput "bin/pw-jack" "$jack" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 2fbbb2a1c0..37dea2ece8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.14"; + version = "0.4.15"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-PKS+WErdZuSU4jrFHQcRbnZIHlnlv06R6ZxIAIBptko="; + hash = "sha256-VwzpPAVfoaV47O7OjXtPQj5s8zfH5rkB22Pdlg7u5Fg="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals (enableDocs || enableGI) [ doxygen - (python3.pythonForBuild.withPackages (ps: with ps; + (python3.pythonOnBuildForHost.withPackages (ps: with ps; lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index 1f16ba86b3..f5fb65f798 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib, pandoc +, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.4"; + version = "5.0.1"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; + hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU="; + fetchSubmodules = true; }; postPatch = '' @@ -18,20 +19,35 @@ stdenv.mkDerivation rec { patchShebangs ./config ''; - nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; + nativeBuildInputs = [ + pandoc + perl + autoconf + automake + libtool + flex + gitMinimal + python3 + ]; buildInputs = [ libevent hwloc munge zlib ]; configureFlags = [ - "--with-libevent=${libevent.dev}" + "--with-libevent=${lib.getDev libevent}" + "--with-libevent-libdir=${lib.getLib libevent}/lib" "--with-munge=${munge}" - "--with-hwloc=${hwloc.dev}" + "--with-hwloc=${lib.getDev hwloc}" + "--with-hwloc-libdir=${lib.getLib hwloc}/lib" ]; preConfigure = '' ./autogen.pl ''; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix index 1459d605ac..b3037c463e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc="; + sha256 = "sha256-2macXa2pi5FebSrTIfSQbIiafNCXczNQEP+PFbFxylw="; rev = "poco-${version}-release"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix b/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix index 96fe45ddc2..dbbd5c86b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o="; + hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index b6de5b02c0..80badcdd4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -25,7 +25,7 @@ , systemdMinimal , elogind , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus - (python3.pythonForBuild.withPackages (pp: with pp; [ + (python3.pythonOnBuildForHost.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { # Avoid dependency cycle. @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/polkit"; + homepage = "https://gitlab.freedesktop.org/polkit/polkit/"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index 3774a3e05d..d2af5d9e1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -4,7 +4,6 @@ , fetchFromGitLab , cairo , cmake -, pcre , boost , cups-filters , curl @@ -20,11 +19,11 @@ , pkg-config , python3 , scribus -, texlive , zlib , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null +, gpgmeSupport ? false, gpgme ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -47,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; + hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; }; nativeBuildInputs = [ @@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ boost - pcre libiconv libintl ] ++ lib.optionals withData [ @@ -88,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: rec { qtbase ] ++ lib.optionals introspectionSupport [ gobject-introspection + ] ++ lib.optionals gpgmeSupport [ + gpgme ]; cmakeFlags = [ @@ -95,9 +95,13 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") + (mkFlag (!minimal) "LCMS") + (mkFlag (!minimal) "LIBTIFF") + (mkFlag (!minimal) "NSS3") (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + (mkFlag gpgmeSupport "GPGME") ] ++ lib.optionals finalAttrs.doCheck [ "-DTESTDATADIR=${testData}" ]; @@ -110,13 +114,24 @@ stdenv.mkDerivation (finalAttrs: rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + # Work around gpgme trying to write to $HOME during qt5 and qt6 tests: + preCheck = lib.optionalString gpgmeSupport '' + HOME_orig="$HOME" + export HOME="$(mktemp -d)" + ''; + + postCheck = lib.optionalString gpgmeSupport '' + export HOME="$HOME_orig" + unset -v HOME_orig + ''; + doCheck = true; passthru = { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribus; + inherit inkscape cups-filters scribus; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix index 589cf7cdf9..a109aad97b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "190700_20210406"; src = fetchurl { - url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + url = "https://files.portaudio.com/archives/pa_stable_v${version}.tgz"; sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable cross-platform Audio API"; - homepage = "http://www.portaudio.com/"; + homepage = "https://www.portaudio.com/"; # Not exactly a bsd license, but alike license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix index c9b456ba83..d49f3e6bd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ppl/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/PIP_Tree.cc \ + --replace "std::auto_ptr" "std::unique_ptr" + substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ + --replace "std::mem_fun_ref" "std::mem_fn" + ''; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/21.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/21.nix new file mode 100644 index 0000000000..09a8c81b3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/21.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/23.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/23.nix new file mode 100644 index 0000000000..abb2cc2f44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/24.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/24.nix new file mode 100644 index 0000000000..6741b8afe5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; +} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix deleted file mode 100644 index fe85be8cf0..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.21.12"; - sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix deleted file mode 100644 index 2d658d5741..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.23.4"; - sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix deleted file mode 100644 index 60ad747194..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.24.3"; - sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; -} // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix similarity index 72% rename from third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix rename to third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix index dd31aba434..bcef33b0ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix @@ -11,7 +11,7 @@ , gtest , zlib , version -, sha256 +, hash # downstream dependencies , python3 @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -37,28 +37,24 @@ stdenv.mkDerivation (finalAttrs: { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ + patches = lib.optionals (lib.versionOlder version "22") [ # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute # https://github.com/protocolbuffers/protobuf/pull/10090 (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./static-executables-have-no-rpath.patch ]; - nativeBuildInputs = - let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in - [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest @@ -71,23 +67,25 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; cmakeFlags = [ "-Dprotobuf_USE_EXTERNAL_GTEST=ON" "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 + # Tests fail to build on 32-bit platforms; fixed in 22.x # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "22") [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 3.24 and 3.23 have different errors. + # FIXME: investigate. 24.x and 23.x have different errors. # At least some of it is not reproduced on some other machine; example: # https://hydra.nixos.org/build/235677717/nixlog/4/tail - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23"); + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.targetPlatform.is32bit; passthru = { tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index 378b6babd7..8c98fdbdd6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,9 +1,9 @@ { lib , stdenv , fetchFromGitHub -, qtbase -, qtquick1 +, fetchpatch , qmake +, qtbase , qtmultimedia , utmp }: @@ -13,39 +13,47 @@ stdenv.mkDerivation { version = "unstable-2022-01-09"; src = fetchFromGitHub { - repo = "qmltermwidget"; owner = "Swordfish90"; + repo = "qmltermwidget"; rev = "63228027e1f97c24abb907550b22ee91836929c5"; hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + ]; buildInputs = [ qtbase - qtquick1 qtmultimedia ] ++ lib.optional stdenv.isDarwin utmp; patches = [ + # Changes required to make it compatible with lomiri-terminal-app + # QML-exposed colorscheme, scrollbar & clipboard functionality + # Remove when https://github.com/Swordfish90/qmltermwidget/pull/39 merged + (fetchpatch { + name = "0001-qmltermwidget-lomiri-submissions.patch"; + url = "https://github.com/Swordfish90/qmltermwidget/compare/63228027e1f97c24abb907550b22ee91836929c5..ffc6b2b2a20ca785f93300eca93c25c4b74ece17.patch"; + hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4="; + }) + # Some files are copied twice to the output which makes the build fails ./do-not-copy-artifacts-twice.patch ]; postPatch = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/' ''; - installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; - dontWrapQtApps = true; meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index e6e6b24360..a2b38046c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,8 +11,8 @@ Check for any minor version changes. , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf +, llvmPackages_15, overrideSDK, overrideLibcxx , darwin -, buildPackages # options , developerBuild ? false @@ -46,13 +46,29 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch - ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch ]; + qtlocation = lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16 + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/"; + hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; + }) + ]; + qtmultimedia = lib.optionals stdenv.isDarwin [ + # build patch for qtmultimedia with xcode 15 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; + stripLen = 1; + hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; + }) + ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs @@ -202,32 +218,24 @@ let qttools = [ ./qttools.patch ]; }; - addPackages = self: with self; + addPackages = self: let - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; + qtModule = callPackage ../qtModule.nix { + inherit patches; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = + (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; + }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; - mkDerivationWith = - import ../mkDerivation.nix - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; + mkDerivationWith = callPackage ../mkDerivation.nix { }; - mkDerivation = mkDerivationWith stdenv.mkDerivation; + mkDerivation = callPackage ({ mkDerivationWith }: mkDerivationWith stdenv.mkDerivation) { }; qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; @@ -281,6 +289,18 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { + # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due + # to the following errors: + # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned + # to be made into a hard error in a future version of clang. Patches are not available for + # the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial. + # * -Wincompatible-function-pointer-types: This is also a downgradable error generated + # starting with clang 16. Patches are available upstream that can be backported. + # Because the first error is non-trivial to fix and suppressing it risks future breakage, + # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. + stdenv = + let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; + in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; postPatch = '' @@ -309,29 +329,33 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ + full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { } + # `with self` is ok to use here because having these spliced is unnecessary + (with self; [ qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); - qmake = makeSetupHook { + qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; - propagatedBuildInputs = [ self.qtbase.dev ]; + ${if stdenv.buildPlatform == stdenv.hostPlatform + then "propagatedBuildInputs" + else "depsTargetTargetPropagated"} = [ qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; - } ../hooks/qmake-hook.sh; + } ../hooks/qmake-hook.sh) { }; - wrapQtAppsHook = makeSetupHook { + wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; - propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; + propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] + ++ lib.optional stdenv.isLinux qtwayland.dev; + } ../hooks/wrap-qt-apps-hook.sh) { }; }; baseScope = makeScopeWithSplicing' { @@ -345,6 +369,12 @@ let }); finalScope = baseScope.overrideScope(final: prev: { - qttranslations = bootstrapScope.qttranslations; + # qttranslations causes eval-time infinite recursion when + # cross-compiling; disabled for now. + qttranslations = + if stdenv.buildPlatform == stdenv.hostPlatform + then bootstrapScope.qttranslations + else null; + qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/modules b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/modules index d6ce8822d5..ccc7dbcb81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/modules +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/modules @@ -21,7 +21,6 @@ qtquickcontrols qtquickcontrols2 qtquicktimeline qtremoteobjects -qtscript qtscxml qtsensors qtserialbus diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch deleted file mode 100644 index e1aa0119aa..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) -Author: K900 -Date: Mon Aug 14 22:44:02 2023 +0300 - - QLibraryPrivate: Actually merge load hints - - Or old and new load hints in mergeLoadHints() instead of just storing - new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects - with no file name differently and just set load hints directly. - - Mention that load hints are merged once the file name is set - in the documentation for QLibrary::setLoadHints(). - - Add a regression test into tst_qfactoryloader. - - Update and extend tst_QPluginLoader::loadHints() to take into account - load hints merging. - - Fixes: QTBUG-114480 - Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 - Reviewed-by: Qt CI Bot - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index 5d2f024267..45b5a3fe27 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) - if (pHnd.loadRelaxed()) - return; - -- loadHintsInt.storeRelaxed(lh); -+ loadHintsInt.fetchAndOrRelaxed(lh); - } - - QFunctionPointer QLibraryPrivate::resolve(const char *symbol) -@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) - - void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) - { -+ // Set the load hints directly for a dummy if this object is not associated -+ // with a file. Such object is not shared between multiple instances. -+ if (fileName.isEmpty()) { -+ loadHintsInt.storeRelaxed(lh); -+ return; -+ } -+ - // this locks a global mutex - QMutexLocker lock(&qt_library_mutex); - mergeLoadHints(lh); -@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const - lazy symbol resolution, and will not export external symbols for resolution - in other dynamically-loaded libraries. - -+ \note Hints can only be cleared when this object is not associated with a -+ file. Hints can only be added once the file name is set (\a hints will -+ be or'ed with the old hints). -+ - \note Setting this property after the library has been loaded has no effect - and loadHints() will not reflect those changes. - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 0a63b93762..ceee5d6385 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr -+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr - d->errorString.clear(); -+ } else { -+ d->setLoadHints(loadHints); - } -- d->setLoadHints(loadHints); - } - - QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index f67f9d66da..8171293497 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897", - "sha256": "0r1bicsjn4addsf0cw2vkf26kxlf8z1fh65w19gnqmcwkrr8hnja" + "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", + "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "7a04a93e97390de2d91e89dc907e8240dd5a0c4f", - "sha256": "1bqy5cmimnlmgd02zpv0ipf74nx350fk0d4pm2j4pqipq1spq3bh" + "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", + "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1170e17043ff51590ccee30447bef1e43a999b0d", - "sha256": "0qhlhz7ng35mb5pmva9ivpxq1ib30dz8f1p93yil78cyl9mwqbbi" + "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", + "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "e24dc54b2b4054413650904288aa7a363eee23a7", - "sha256": "0gpg0avl06jbamgk5f9034cfqwyifgv4nyqx49rp0r9wm2m1cgxb" + "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", + "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7ce22b0633eb9d1eb59854fee4f2f545e1b842e0", - "sha256": "0q173ql5xyacwb5lwyrzhgch1bbjq4mmsfwhyssm3a9phqcj083m" + "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", + "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "eeaf42bccd49e8161fbae82d110026d25a5a9a7f", - "sha256": "0daa72yizb6v28bci72fw1w8y8al0mhb9k7kxn7vg22fbb3iyksf" + "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", + "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d366b0aad8454355acac79eddbab445c1108b1e9", - "sha256": "15ad1cbfdwnl6lnafgd4chdsl9wnwfcqqnd2m0dwj10n2lsa3nmw" + "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", + "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "3e98cdb2780d052fce3d7a3694596a690cd76aca", - "sha256": "15fn0zjfz7jnjgc7m368sna2mvhcp33r85r2kwc9hy7zkp1is6a1" + "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", + "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "9dfbbfb9971db22d51eb40d6636583df5913be01", - "sha256": "1l192k1w5mjw14zq3h3pjb3m0zl56fhgxdjfxhmbncjx0ym98wzr" + "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", + "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c", - "sha256": "1vbfmyb51lv3ms0iyizi05jiba688scjwxwvyrr8qnmg4qrjqjd5" + "rev": "4b52913503e3713200265cd6bc19b301792dbf96", + "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "500ae59f809877e0ada9a68601564882f2733145", - "sha256": "0p8vxp5l7iihd1xww94asnb9xv2v94p9whqbljzn6gwr56wvys5l" + "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", + "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "5aa33ec870977863c400103db94da452edbaf414", - "sha256": "02i3ns2ijiiy0jfad3lxrvvlr38bgarl8246ka0y8aa8by1ih35b" + "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", + "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "664701dc3acfca37500bc84ba03eed4953b684e9", - "sha256": "0nlzjksfzkjhla89warkj7c5h8z2h5ivnhnq1sw2385gfd4q5d8w" + "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", + "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "f65b6a268832fc86e1263a6597f2e369aefecd19", - "sha256": "157in9bvnd9q2jigrrl955y7d2gpj308g8mg7k19r1vaz6h4zlm7" + "rev": "909b79f4810b8ac62baa3544837793cfb132593b", + "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5", - "sha256": "1yrk7kj5dvfcha8w0abvh8xfjn6nbl4njm1r2h2776l3sf46xd4c" + "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", + "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "78d05cfcec57a9e890cb5ddbea604f194e04315d", - "sha256": "1vf0gmf6bh3hadrrk0922dbagmvxi1il3pjiyhmz087bm80km1md" + "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", + "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa", - "sha256": "0sy2s7xnq2xmqm3lcp439wn6zk6znzja489gh531mmkaj13kiqa9" + "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", + "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "a3e675872e4b323f89b94b90b66caa945b576b2e", - "sha256": "0b6da91fja6w3mphsfydp0plcwmk8nywhd5v8irgc98v1hw114dg" + "rev": "736144c5827385000e391e9a55a0f0162b7e8112", + "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "353f50a9851518eb637181c00302cd354e0ae98b", - "sha256": "1y269yamhlf46rwcvwzhdqhajyqj41xxf9x0l1nrcr4n07l4mbr8" + "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", + "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "0ea7cfdfbfa72d467fe542cc48ab3206c177a387", - "sha256": "1bvg32cz4x00j9333yas7cmfzx8rlhika4a9vwdikrr5a64awsl9" + "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", + "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "0472a07a8f39587052216d85a7ed235c531eba2c", - "sha256": "1psal4kldwbhfgg0b234dhgm30s5q83g2krcik1p4sifrzgrry3r" + "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", + "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "4956b556ccb021e4691f314ab907ea2ebb1ca8a6", - "sha256": "0d6w36pvnk616ps7k1ykpk2ahcvn746svwmv3dxvf4capfij96rj" + "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", + "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "d10e7673218fa2b00191a82ad20cd3304a711fa6", - "sha256": "0z5dzgdr92yw3y5vx6l9r9kz81r0vvwi264la9r7j20jqb75i2a5" - }, - "qtscript": { - "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1", - "sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b" + "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", + "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7f276be586be79d41213a8dd05ef31144313d440", - "sha256": "0yiryqzs44nx5lg54gbs7gf5n2d5chybya71kcv0iwn48dbzy33n" + "rev": "e8727aabe55526956295407d27317ec15e12b283", + "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "45c04582b15a9bb4be01ae99aa7fda1bbba7d0df", - "sha256": "0wp9ddna0zidl18707nrqsg8sybaggam0hmm9yxyyfnsr39wms4m" + "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", + "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "b3081c36baee48b43b6285b4811dc6da451e2390", - "sha256": "167bmp5wrp9mflvzhgc2am9nnyw1vb58skdxjn7ag8jq88fhv0zz" + "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", + "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "af58a4c62415fbfd997c43422acf93e2e6ab5155", - "sha256": "1ihjj7gqjy75ccf4qniilddyiknjklc88mxns6sy8wz3ymr58vfh" + "rev": "3380465d5d4977326616c5e57789a81681be650e", + "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "75142c77cda8ef3a5c1cae69863e963797c667b5", - "sha256": "0iaw13vx80yfcchkmrmp6n79i0i6b9rv7k69xxp3wb3l5d3n0ng0" + "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", + "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "37b2c764fb599c96fc415049208e871c729217c8", - "sha256": "11h0n9k6l4r97x6h1m09nzsblwmmkkj46nl80dnvjimb395d71ri" + "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", + "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "9f7af2d08eea7c2a2a2bfe7e6a9b73d1b99f5123", - "sha256": "1vb6s9zy8nw6gd0kmk77bjvxwpnfbhaifrznp019zccckibzffsg" + "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", + "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a680686754d84b91d4cc4252a2fb8af0c58f5f49", - "sha256": "1i92mk6f2ldwq12qa4wnlz52zya4nlpjm3r2vy95vkj69xi2bfk3" + "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", + "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "72373522141dd3206183eb5fa56ae1c36a6d4c2b", - "sha256": "1ndgy8jxn9f7dwg9kydhlbll20qdivfbvdlcxk8qpzilpccd2l3z" + "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", + "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "d4f650b6c29c621c58bc7b7e7c9ddcbbbc72e3b4", - "sha256": "11xqpj36mfyfhcip89i82dyclbkvs77byffax2kscv1kdj3x7w2l" + "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", + "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "74c0625337c8a8de0a465878c7e7d238e8d979ed", - "sha256": "0yz2sg8k3l88ngsgyfb6cljh8x5sicww59m447xk7yngxgyaj75m" + "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", + "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "13202e8a8c0c6d39026344b5a19a0148592160bc", - "sha256": "0gki7hc3684qhqbq7i4wa3w7szy3j6af0yfd50q2mxb1lbxjsdrx" + "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", + "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "89fbe461e7091ae6a4689b7791293a06c9167776", - "sha256": "15vkh80rma5l9mrmg41vhxvqxlzqjzl8x20k33xm11lw2kjsszm5" + "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", + "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "7e941648610ff4033ae8f9709077edd0595364f0", - "sha256": "082w4r674fq7ks5jbh3pj3xb3sqlhn4giy7fy0h3vw170lmcqz0m" + "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", + "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "5afc77f5347113b607ca0262505f3406e1be5bf4", - "sha256": "1a7dm0dxqq817pib1y6m0f09sc2cqd1qkfb9anznsgpmzynvfp6r" + "rev": "1bf19cc6a7972d8543485786418b6631459d3469", + "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "74f81f0bfe17e5aabcebafcb0cf36f739133554c", - "sha256": "1akp4mwvfspxdq5akpyphf6p3ay0z9pzaigiiy198w9q0yvrkgl7" + "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", + "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "0c1dcfe344c03d48d753aeb58f139bc990f2611c", - "sha256": "1cab7y9asivdg9ypwc951pczf4ddgni60l1ajlfsprk48rypr7w1" + "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", + "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" } } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 6729c7c31a..130fcd332b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,25 +1,18 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.10"; - overrides = { - qtscript.version = "5.15.9"; - }; + version = "5.15.11"; mk = name: args: - let - override = overrides.${name} or {}; - in { - version = override.version or version; - src = override.src or - fetchgit { - inherit (args) url rev sha256; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; + inherit version; + src = fetchgit { + inherit (args) url rev sha256; + fetchLFS = false; + fetchSubmodules = true; + deepClone = false; + leaveDotGit = false; + }; }; in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) @@ -76,15 +69,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; }; - qtwebengine = rec { - version = "5.15.14"; + qtscript = rec { + version = "5.15.15"; - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebengine"; - rev = "v${version}-lts"; - hash = "sha256-jIoNwRdr0bZ2p0UMp/KDQuwgNjhzzGlb91UGjQgT60Y="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtscript"; + rev = "v${version}-lts"; + hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; }; + }; + + qtwebengine = rec { + version = "5.15.15"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebengine"; + rev = "v${version}-lts"; + hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + fetchSubmodules = true; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix index 98f9a05fac..a90e229e68 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -1,6 +1,4 @@ -{ lib, debug, wrapQtAppsHook }: - -let inherit (lib) optional; in +{ wrapQtAppsHook }: mkDerivation: diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix index 98d11864e4..f394ff6627 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9f0feaf94e..67e9bd5440 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -29,13 +29,18 @@ , developerBuild ? false , decryptSslTraffic ? false , testers +, buildPackages }: let debugSymbols = debug || developerBuild; + qtPlatformCross = plat: with plat; + if isLinux + then "linux-generic-g++" + else throw "Please add a qtPlatformCross entry for ${plat.config}"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: ({ pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; @@ -83,6 +88,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + # `qtbase` expects to find `cc` (with no prefix) in the + # `$PATH`, so the following is needed even if + # `stdenv.buildPlatform.canExecute stdenv.hostPlatform` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + } // { + propagatedNativeBuildInputs = [ lndir ]; # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked @@ -162,6 +174,13 @@ stdenv.mkDerivation (finalAttrs: { export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ./bin/syncqt.pl -version $version + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # QT's configure script will refuse to use pkg-config unless these two environment variables are set + export PKG_CONFIG_SYSROOT_DIR=/ + export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib + echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf + echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf + echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf ''; postConfigure = '' @@ -186,21 +205,34 @@ stdenv.mkDerivation (finalAttrs: { done ''; - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields - ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' - ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' - ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + env = { + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Wno-warn=free-nonheap-object" + "-Wno-free-nonheap-object" + "-w" + ] ++ [ + ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' + ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] ++ lib.optionals withGtk3 [ - ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' - ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' - ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' + ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' + ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([ + "-Wno-warn=free-nonheap-object" + "-Wno-free-nonheap-object" + "-w" + ]); + }; prefixKey = "-prefix "; @@ -209,6 +241,9 @@ stdenv.mkDerivation (finalAttrs: { # To prevent these failures, we need to override PostgreSQL detection. PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + configurePlatforms = [ ]; + } // { # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ "-plugindir $(out)/$(qtPluginPrefix)" @@ -235,11 +270,16 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-device ${qtPlatformCross stdenv.hostPlatform}" + "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optional debugSymbols "-debug" ++ lib.optionals developerBuild [ "-developer-build" "-no-warnings-are-errors" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-no-warnings-are-errors" ] ++ (if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else [ @@ -381,4 +421,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; }; -}) +})) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix index f5d034bcc3..75766649a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 9725b7babe..81efb4bee0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,8 +2,12 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; buildInputs = lib.optional stdenv.isLinux bluez; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index 80a98f24be..d79320ea13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f19074e08a..f4249b7f95 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,8 +1,10 @@ -{ qtModule, lib, python3, qtbase, qtsvg }: +{ lib +, stdenv +, qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtsvg ]; + propagatedBuildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python3 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix index 4ef4915000..93620e4266 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtdoc"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 147fb0745d..3985726731 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtgamepad"; - qtInputs = [ qtbase qtdeclarative ] + propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optional stdenv.isDarwin GameController; buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index c90280090b..2fe865492e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 402f2ce066..4775bb0b03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,4 +1,6 @@ -{ qtModule +{ lib +, stdenv +, qtModule , qtbase , libwebp , jasper @@ -8,6 +10,11 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; - propagatedBuildInputs = [ libwebp jasper libmng libtiff ]; + propagatedBuildInputs = [ + qtbase libwebp + ] ++ lib.optionals (!jasper.meta.broken) [ + jasper + ] ++ [ + libmng libtiff + ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix index b5fdc918dc..a9897648d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; qmakeFlags = lib.optionals stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix index d94c289953..4231fcb26b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 30e363cff5..da0f5f760b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtmacextras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 704cb7881c..d5dc16c528 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 148ed890fc..bec5f354a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix index 702655c6e7..01692d9f2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix @@ -12,7 +12,7 @@ qtModule { "dev" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtdeclarative ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix index 99b06bbf25..20f0599763 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix index 6c85a91fb7..3b78a2a6c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix index a50ad9e2a3..59070629dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtquickcontrols2"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix index a71f9e8e35..fde78848c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; # cycle is detected in build when adding "dev" "bin" too outputs = [ "out" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix index e7ce86b74a..07993b72a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscript"; - qtInputs = [ qtbase qttools ]; + propagatedBuildInputs = [ qtbase qttools ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix index cf9af0bc75..3314934db2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix index 3fbd032b96..fdea92035b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix index 4fd6d7cb83..3a7285d0a8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 93f3e130ee..7907f91b98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 371162324c..94e66cf400 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtspeech"; - qtInputs = [ ]; + propagatedBuildInputs = [ ]; buildInputs = lib.optionals stdenv.isLinux [ speechd ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix index 59c7cf6744..418c69fb2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix index 32974bdecc..921172c285 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix @@ -20,7 +20,7 @@ qtModule { "bin" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index bac70d146b..37e4348ed2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -2,7 +2,7 @@ qtModule { pname = "qttools"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix index 77f1948dbf..0bfc242d15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 0faabf3752..347a5cf643 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; nativeBuildInputs = [ pkg-config wayland-scanner ]; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix index f49e9e2349..e7d6be5344 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix @@ -1,8 +1,12 @@ -{ qtModule, qtbase, qtdeclarative }: +{ lib +, stdenv +, qtModule +, qtbase +, qtdeclarative +}: qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ]; } - diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1794e3f8ca..3503067aca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,8 +1,11 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, flex, git, gperf, ninja, pkg-config, python, which +, bison, flex, git, gperf, ninja, pkg-config, python, which, python3 , nodejs, qtbase, perl +, buildPackages +, pkgsBuildTarget +, pkgsBuildBuild , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -27,13 +30,45 @@ , pipewireSupport ? stdenv.isLinux , pipewire_0_2 , postPatch ? "" +, nspr +, lndir +, dbusSupport ? !stdenv.isDarwin, expat }: -qtModule { +let + # qtwebengine expects to find an executable in $PATH which runs on + # the build platform yet knows about the host `.pc` files. Most + # configury allows setting $PKG_CONFIG to point to an + # arbitrarily-named script which serves this purpose; however QT + # insists that it is named `pkg-config` with no target prefix. So + # we re-wrap the host platform's pkg-config. + pkg-config-wrapped-without-prefix = stdenv.mkDerivation { + name = "pkg-config-wrapper-without-target-prefix"; + dontUnpack = true; + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config + ''; + }; + + qtPlatformCross = plat: with plat; + if isLinux + then "linux-generic-g++" + else throw "Please add a qtPlatformCross entry for ${plat.config}"; + +in + +qtModule ({ pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison flex git gperf ninja pkg-config python which gn nodejs + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + perl + lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase) + pkgsBuildBuild.pkg-config + (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols) + pkg-config-wrapped-without-prefix ] ++ lib.optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -58,6 +93,12 @@ qtModule { # TODO: be more precise patchShebangs . + + # Fix compatibility with python3.11 + substituteInPlace tools/metrics/ukm/ukm_model.py \ + --replace "r'^(?i)(|true|false)$'" "r'(?i)^(|true|false)$'" + substituteInPlace tools/grit/grit/util.py \ + --replace "mode = 'rU'" "mode = 'r'" ) '' # Prevent Chromium build script from making the path to `clang` relative to @@ -103,16 +144,25 @@ qtModule { --replace "-Wl,-fatal_warnings" "" '') + postPatch; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit - "-Wno-class-memaccess" - ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ - # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 - # TODO: investigate and fix properly - "-march=westmere" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-elaborated-enum-base" - ]); + env = { + NIX_CFLAGS_COMPILE = + toString ( + lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-w " + ] ++ lib.optionals stdenv.cc.isGNU [ + # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit + "-Wno-class-memaccess" + ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ + # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 + # TODO: investigate and fix properly + "-march=westmere" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-elaborated-enum-base" + ]); + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch"; + "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch"; + }; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -120,13 +170,20 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export QMAKE_CC=$CC + export QMAKE_CXX=$CXX + export QMAKE_LINK=$CXX + export QMAKE_AR=$AR ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire" + ++ lib.optional (pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform) "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ + qtdeclarative qtquickcontrols qtlocation qtwebchannel + # Image formats libjpeg libpng libtiff libwebp @@ -219,7 +276,9 @@ qtModule { dontUseNinjaBuild = true; dontUseNinjaInstall = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + mkdir -p $out/libexec + '' + lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf < Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute +Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute path in qmake files In generated qmake files, absolute paths to qt libraries are embedded @@ -46,5 +46,5 @@ index 3ffe354fd8d..441332d4582 100644 else() list(APPEND out_list "${library_path}") -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index ee4af1730e..8ffe0c936b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,7 +1,7 @@ -From 41e32c41f781261726722628122c924abb532575 Mon Sep 17 00:00:00 2001 +From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH 2/6] qtbase: qmake: fix mkspecs for darwin +Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin --- mkspecs/common/mac.conf | 2 +- @@ -26,7 +26,7 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 4acf3b19d5c..aadfce875e2 100644 +index f364716717c..3b40328304d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -39,7 +39,7 @@ index 4acf3b19d5c..aadfce875e2 100644 contains(TEMPLATE, .*app) { !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK -@@ -15,37 +11,6 @@ contains(TEMPLATE, .*app) { +@@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } @@ -77,9 +77,6 @@ index 4acf3b19d5c..aadfce875e2 100644 } !no_objective_c:CONFIG += objective_c -@@ -73,234 +38,6 @@ qt { - } - } -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. @@ -486,5 +483,5 @@ index df191eb13c4..e69de29bb2d 100644 - -load(toolchain) -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 759c71365d..041960352b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,17 +1,17 @@ -From f52f3c2cb1703592eaeb43e80f585a24ce8402d7 Mon Sep 17 00:00:00 2001 +From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Apr 2023 09:34:46 +0800 -Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index cc985a878b4..4e3b383d812 100644 +index 11d2f0ff7df..c78ed0d3485 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3403,8 +3403,7 @@ MakefileGenerator::writePkgConfigFile() +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") // << varGlue("DEFINES","-D"," -D"," ") ; @@ -22,5 +22,5 @@ index cc985a878b4..4e3b383d812 100644 && libDir != QLatin1String("/Library/Frameworks")) { t << " -F${libdir}"; -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch index 0b4da29afd..5ccc9346d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch @@ -1,18 +1,18 @@ -From dd0dfc9cf87966f5d7493a943ec04c665be83cb6 Mon Sep 17 00:00:00 2001 +From b1533ac42718835499ec633ffb3b1bed0d040719 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Apr 2023 09:35:25 +0800 -Subject: [PATCH 4/6] qtbase: fix locating tzdir on NixOS +Subject: [PATCH 04/11] qtbase: fix locating tzdir on NixOS --- src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 960a0944185..a5186acbd91 100644 +index e702a5d6b43..2ac88c1cd10 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,7 +51,11 @@ typedef QHash QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories +@@ -56,7 +56,11 @@ static bool isTzFile(const QString &name); + // zone1970.tab). static QTzTimeZoneHash loadTzTimeZones() { - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); @@ -24,7 +24,7 @@ index 960a0944185..a5186acbd91 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -730,18 +734,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) +@@ -773,18 +777,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return ret; } else { @@ -56,5 +56,5 @@ index 960a0944185..a5186acbd91 100644 } } -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch index 606be2d5ac..8e04bda136 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch @@ -1,7 +1,7 @@ -From 4e8c14f1af9c332826e0454f4fd63e541edbaf5c Mon Sep 17 00:00:00 2001 +From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 5/6] qtbase: deal with a font face at index 0 as Regular for +Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for Variable fonts Reference: https://bugreports.qt.io/browse/QTBUG-111994 @@ -22,5 +22,5 @@ index 474644b871f..c7a117fd134 100644 FcObjectSetDestroy(os); FcPatternDestroy(pattern); -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch index 4933534caf..bab52a38c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -1,7 +1,7 @@ -From 61ae6e04388dd40e11c214d56f22f8f2007bf35f Mon Sep 17 00:00:00 2001 +From 7f573f00fb850a08017d9f1e3c73b4d7efeb84f2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 6/6] qtbase: qt-cmake: always use cmake from path +Subject: [PATCH 06/11] qtbase: qt-cmake: always use cmake from path The generated qt-cmake scripts embeds the absolute path of cmake used during the build of qtbase, bloating the runtime closure of qtbase. @@ -28,5 +28,5 @@ index f719257f602..571ffe788fa 100755 toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" -- -2.39.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch similarity index 92% rename from third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch rename to third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch index 146cba58b8..fc2f55c9b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From 31d808a7b0d52a01c3f2875202cd29410a94b39a Mon Sep 17 00:00:00 2001 +From 95b6bc2a414d381fdeab0899a3b02499c43695e7 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH] qtbase-find-tools-in-PATH +Subject: [PATCH 07/11] qtbase-find-tools-in-PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix @@ -14,13 +14,12 @@ Subject: [PATCH] qtbase-find-tools-in-PATH We can guarantee the build order of qt components in nixpkgs tools in qttools always build before qtdoc qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` - --- cmake/QtDocsHelpers.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake -index 48ed5a32..9409d22d 100644 +index 48ed5a324bf..91d8d41fb1f 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -47,9 +47,14 @@ function(qt_internal_add_docs) @@ -42,5 +41,5 @@ index 48ed5a32..9409d22d 100644 get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") -- -2.38.1 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch similarity index 68% rename from third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch rename to third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index 81f0f76636..d1139e0aec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,19 +1,19 @@ -From 39eb99dcd66f8ffb632fed6308a49896fe5ad2d3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= -Date: Thu, 10 Aug 2023 14:17:03 +0200 -Subject: [PATCH 3/3] Pass to qmlimportscanner the QML2_IMPORT_PATH +From a5cbfb30fc53b3290578af4a87fe4c0463df4247 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:12:56 -0400 +Subject: [PATCH 08/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 676d34d545..7908b07b3c 100644 +index f637416cf22..77749506ccb 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf - argumentList.append(qmlImportsPath); - } +@@ -1293,6 +1293,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + argumentList.append( "-importPath"); + argumentList.append(qmlImportsPath); + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple @@ -26,5 +26,5 @@ index 676d34d545..7908b07b3c 100644 QProcess qmlImportScanner; qmlImportScanner.start(qmlImportScannerPath, argumentList); -- -2.26.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch similarity index 65% rename from third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch rename to third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch index e96cbdbef1..ee2e35f813 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch @@ -1,5 +1,14 @@ +From 28220453d157c0825669145c94ab86e9603265fa Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:14:40 -0400 +Subject: [PATCH 09/11] qtbase: allow translations outside prefix + +--- + cmake/QtBuild.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index b45ec1d208..05f69c131b 100644 +index 1dc576d27af..4348eb97c37 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) @@ -11,3 +20,6 @@ index b45ec1d208..05f69c131b 100644 message(FATAL_ERROR "Path component '${name}' is outside computed install prefix: ${rel_path} ") return() +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch similarity index 84% rename from third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch rename to third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index 32e30679ec..fbb74a055d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,7 +1,8 @@ -From 505391a31aa353b8f1cc5d3feb9861582554d9f1 Mon Sep 17 00:00:00 2001 +From bbd9cf61b686f68d5e5eb78fb0b96a74a8921cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 1/3] Find qmlimportscanner in macdeployqt via environment +Subject: [PATCH 10/11] qtbase: find qmlimportscanner in macdeployqt via + environment The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual @@ -16,10 +17,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 643fe5390a..b8fcc9c9bd 100644 +index 77749506ccb..48979195f40 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1270,6 +1270,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1273,6 +1273,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; @@ -31,5 +32,5 @@ index 643fe5390a..b8fcc9c9bd 100644 if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; -- -2.26.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch similarity index 66% rename from third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch rename to third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index 4436d512d9..ab3354d62b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,8 +1,8 @@ -From 32df59bea18bebc18d6d308750e88be325522d2e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= -Date: Thu, 10 Aug 2023 14:15:34 +0200 -Subject: [PATCH 2/3] Check in the QML folder of this library does actually - exist +From 617d27ee91aaa59c59c4f3a2cca7bab8167d9f5f Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 10:17:00 -0400 +Subject: [PATCH 11/11] qtbase: check in the QML folder of this library does + actually exist In a modularized installation, this folder will be the location where `qtbase` itself is installed, but `qtbase` does not have any QML @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index b8fcc9c9bd..676d34d545 100644 +index 48979195f40..8415680ecda 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1290,9 +1290,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1293,9 +1293,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; @@ -28,8 +28,8 @@ index b8fcc9c9bd..676d34d545 100644 + argumentList.append(qmlImportsPath); + } - // run qmlimportscanner - QProcess qmlImportScanner; + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple -- -2.26.2 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch index 02e578f2d5..a204d52c9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch @@ -1,13 +1,29 @@ +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch index 86507165bd..3df917edf5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch @@ -1,10 +1,10 @@ diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -index 6a3a777..249d4cc 100644 +index d4b0161b2e..e5a0eb1967 100644 --- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc +++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -@@ -20,12 +20,6 @@ - #include "media/base/media_log.h" - #include "media/base/video_frame.h" +@@ -29,12 +29,6 @@ + #include "media/base/video_types.h" + #include "media/video/video_encode_accelerator.h" -// This is a min version of macOS where we want to support SVC encoding via -// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, @@ -15,21 +15,22 @@ index 6a3a777..249d4cc 100644 namespace media { namespace { -@@ -150,8 +144,6 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() { - profile.max_framerate_numerator = kMaxFrameRateNumerator; - profile.max_framerate_denominator = kMaxFrameRateDenominator; - profile.max_resolution = gfx::Size(kMaxResolutionWidth, kMaxResolutionHeight); +@@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { + profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | + VideoEncodeAccelerator::kVariableMode; + profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); + for (const auto& supported_profile : kSupportedProfiles) { - profile.profile = supported_profile; - profiles.push_back(profile); -@@ -595,13 +587,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder}; - std::vector encoder_values{kCFBooleanTrue}; + if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { +@@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( + encoder_values.push_back(kCFBooleanFalse); + } - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- if (require_low_delay_) { +- // Remove the validation once HEVC SVC mode is supported on macOS. +- if (require_low_delay_ && codec == VideoCodec::kH264) { - encoder_keys.push_back( - kVTVideoEncoderSpecification_EnableLowLatencyRateControl); - encoder_values.push_back(kCFBooleanTrue); @@ -38,10 +39,10 @@ index 6a3a777..249d4cc 100644 base::ScopedCFTypeRef encoder_spec = video_toolbox::DictionaryWithKeysAndValues( encoder_keys.data(), encoder_values.data(), encoder_keys.size()); -@@ -669,19 +654,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession() { - } +@@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { - if (num_temporal_layers_ == 2) { + // Remove the validation once HEVC SVC mode is supported on macOS. + if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { - if (!session_property_setter.IsSupported( - kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch index 31516c41be..c430211378 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -1,10 +1,24 @@ +From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:45:24 -0400 +Subject: [PATCH 1/2] qtwebengine: link pulseaudio + +--- + src/core/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 4153ce180..e89f41798 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -341,6 +341,7 @@ - devtools_fast_bundle=false - devtools_skip_typecheck=false - enable_jxl_decoder=false # temporarily because libjxl causes internal compiler error on armv7 +@@ -340,6 +340,7 @@ foreach(arch ${archs}) + use_static_angle=true + chrome_root_store_supported=false + trial_comparison_cert_verifier_supported=false + link_pulseaudio=true ) + extend_gn_list(gnArgArg + ARGS use_v8_context_snapshot v8_use_external_startup_data +-- +2.42.0 - extend_gn_list(gnArgArg \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch index 58f2d96f80..fecdb93cd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch @@ -1,8 +1,18 @@ +From 6f0068359f32d1e7ebaa32650c3b608c008a1127 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:46:28 -0400 +Subject: [PATCH 2/2] qtwebengine: fix path to locales + +--- + src/core/api/CMakeLists.txt | 3 ++- + src/core/web_engine_library_info.cpp | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt -index f860e0ba7..30e1a767a 100644 +index a3cb53e17..fcb6d70c5 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt -@@ -193,7 +193,8 @@ if(QT_FEATURE_framework) +@@ -190,7 +190,8 @@ if(QT_FEATURE_framework) else() install(FILES ${localeFiles} @@ -26,3 +36,6 @@ index c03c9a3b2..430fdfab2 100644 % QLatin1String("qtwebengine_locales"); candidatePaths << fallbackDir(); } +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index ce917a2741..5434be84fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); moveToDev = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index bad7dee1e1..5c7cd6d48b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -4,307 +4,315 @@ { qt3d = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt3d-everywhere-src-6.5.3.tar.xz"; - sha256 = "1p7x70wnqynsvd7w4jkz31amf02hwh49gqsccv5hhlpx50h9ydhd"; - name = "qt3d-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "0apwq6cqxn1xszhaawrz14yyy9akbmh6i5yys3v74kbz4537ma0d"; + name = "qt3d-everywhere-src-6.6.0.tar.xz"; }; }; qt5compat = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz"; - sha256 = "0r34h35w0m17zyncxq2a0kichv5l4j01mximg6m5mqbifziakcpf"; - name = "qt5compat-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt5compat-everywhere-src-6.6.0.tar.xz"; + sha256 = "1jlg3b3jn7m2gih892vcsv36rm430g86rz6bdlk15xr6c6vfv19x"; + name = "qt5compat-everywhere-src-6.6.0.tar.xz"; }; }; qtactiveqt = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtactiveqt-everywhere-src-6.5.3.tar.xz"; - sha256 = "1lawc0jq5w0jqjagkf7d0g9i8rrsdgrd4k34ylriy27djpd53b1j"; - name = "qtactiveqt-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtactiveqt-everywhere-src-6.6.0.tar.xz"; + sha256 = "17ks2sggvx7p7hmg128w494n06nzyf7r5i04nykhmhqlx71wnm6j"; + name = "qtactiveqt-everywhere-src-6.6.0.tar.xz"; }; }; qtbase = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz"; - sha256 = "0imm0x9j7102ymcz7gl0dbnbi8qk2jmijb4gg7wh9sp41cillbyz"; - name = "qtbase-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz"; + sha256 = "03lysc6lp17hyjrwvp0znw02bdysrff8rlsb0nlrfn6b58qm7783"; + name = "qtbase-everywhere-src-6.6.0.tar.xz"; }; }; qtcharts = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz"; - sha256 = "1n9fflfh47wm0fk1995dw56vyqfprwv5ialjfpcxxgzm187816sa"; - name = "qtcharts-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtcharts-everywhere-src-6.6.0.tar.xz"; + sha256 = "1x9c55j8yscb6q18haspqnnvbc6pcgdv5ljrhj0ijxqcqz6spgp6"; + name = "qtcharts-everywhere-src-6.6.0.tar.xz"; }; }; qtconnectivity = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz"; - sha256 = "0nrzpqs3cq0inwp3siskxz9yxxqkz15yaf9aicnggvvic2q328i4"; - name = "qtconnectivity-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtconnectivity-everywhere-src-6.6.0.tar.xz"; + sha256 = "04203igj3fnmw1i7k291j3p987qssss3hz58kjdz33n28xic4a8w"; + name = "qtconnectivity-everywhere-src-6.6.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdatavis3d-everywhere-src-6.5.3.tar.xz"; - sha256 = "0qf07m3bplqpm7pkn3145l2k9h0npv9qbw9gcnydzp0qdsqc1dhi"; - name = "qtdatavis3d-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdatavis3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "17jrs6mh741vfgj8bgkahfzj2xaa7agw9s6q2xcv9s8bkxnryj60"; + name = "qtdatavis3d-everywhere-src-6.6.0.tar.xz"; }; }; qtdeclarative = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz"; - sha256 = "05fjb70n35y42dp7g0sd99rbvmn9133z08k6rlp8ifq6sb9dcka0"; - name = "qtdeclarative-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdeclarative-everywhere-src-6.6.0.tar.xz"; + sha256 = "0cd3gxyklhscq2zymhmv6j4pzgrl0gpx8yyhgwqg1j0qm6q9nlqv"; + name = "qtdeclarative-everywhere-src-6.6.0.tar.xz"; }; }; qtdoc = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdoc-everywhere-src-6.5.3.tar.xz"; - sha256 = "1k430zc8khakpcjbj7vmkgrdyrz0y6bfcfgw4dzc68gcvbwbq27g"; - name = "qtdoc-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdoc-everywhere-src-6.6.0.tar.xz"; + sha256 = "07i6fxczbpma344jgmpcb1y24jlm136y7b698b57ipcvgbc38xnk"; + name = "qtdoc-everywhere-src-6.6.0.tar.xz"; + }; + }; + qtgraphs = { + version = "6.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgraphs-everywhere-src-6.6.0.tar.xz"; + sha256 = "0zsyw5w15xzmaap0r396jpsz7synq5q2knl75807f6q3i7y4gqan"; + name = "qtgraphs-everywhere-src-6.6.0.tar.xz"; }; }; qtgrpc = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtgrpc-everywhere-src-6.5.3.tar.xz"; - sha256 = "10wbq5zcr263g1hi06xpyvh7y2advhhy07asx4aqwf56v9rpmgvf"; - name = "qtgrpc-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgrpc-everywhere-src-6.6.0.tar.xz"; + sha256 = "14pdqwv0yw8dgr5nr04aw73fwkljwrg3yhkflfndwnf7mmgvkffs"; + name = "qtgrpc-everywhere-src-6.6.0.tar.xz"; }; }; qthttpserver = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qthttpserver-everywhere-src-6.5.3.tar.xz"; - sha256 = "0ivcaqf39k7mawd17wf2db3kn8ch2ajm4gqm6wl1iqkp45aqjm05"; - name = "qthttpserver-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qthttpserver-everywhere-src-6.6.0.tar.xz"; + sha256 = "0r9wwf239r3q7i633lld2mbmn98d7jqna1fgfxakri68x7bixbpm"; + name = "qthttpserver-everywhere-src-6.6.0.tar.xz"; }; }; qtimageformats = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz"; - sha256 = "1jwc2gzlymxx82khwbaav83ma8y1rl2v593jq0jd13kkkb22dh29"; - name = "qtimageformats-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtimageformats-everywhere-src-6.6.0.tar.xz"; + sha256 = "11736il80bdcajz01l836z38g1f0k2am9ilmk203gqkn06sjqm71"; + name = "qtimageformats-everywhere-src-6.6.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz"; - sha256 = "12i1g8inp667w95gx4ldc3shb3pjd65c1x74qhmr6k2mq1sc3h60"; - name = "qtlanguageserver-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlanguageserver-everywhere-src-6.6.0.tar.xz"; + sha256 = "03j9kbmv80sj84lbz90692ckg7nd60i6mrbg41lkgxibhqck1jdf"; + name = "qtlanguageserver-everywhere-src-6.6.0.tar.xz"; }; }; qtlocation = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlocation-everywhere-src-6.5.3.tar.xz"; - sha256 = "1k77ck556wkcjzly2z2p9da54hpf8x5mjhyjvn6039xzjzax232k"; - name = "qtlocation-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlocation-everywhere-src-6.6.0.tar.xz"; + sha256 = "1507syiar3dv53km0hl2rf29518arwkk0h2b6fpj5gq8c7kqp5pm"; + name = "qtlocation-everywhere-src-6.6.0.tar.xz"; }; }; qtlottie = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlottie-everywhere-src-6.5.3.tar.xz"; - sha256 = "08jpm4vhcwh0a72np6fmws79v9k3dpsji5gd3ws1rh04n62lcb1x"; - name = "qtlottie-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlottie-everywhere-src-6.6.0.tar.xz"; + sha256 = "0kzq739ziyy8xhzdj57q220sdnjcwnwkgb67gcrsdfd40x8v960x"; + name = "qtlottie-everywhere-src-6.6.0.tar.xz"; }; }; qtmultimedia = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtmultimedia-everywhere-src-6.5.3.tar.xz"; - sha256 = "09zzl3wywhnz5a0ym3q7nbydjcq2vj2bz7gi5p8hrhlqpg9g6r7d"; - name = "qtmultimedia-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtmultimedia-everywhere-src-6.6.0.tar.xz"; + sha256 = "10l7sc8c7gwz47z77acvxz5wba14grwqgfpmnx0qh4gcldn26jxs"; + name = "qtmultimedia-everywhere-src-6.6.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz"; - sha256 = "00m71302b1m4hjzn0hv222yz1d8dvm9n5djgyn38ikazb5smvd1n"; - name = "qtnetworkauth-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtnetworkauth-everywhere-src-6.6.0.tar.xz"; + sha256 = "0c48rk35qh4q9drs53jijgnhxk8adllnk63wy4rk7sq0disc1m90"; + name = "qtnetworkauth-everywhere-src-6.6.0.tar.xz"; }; }; qtpositioning = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtpositioning-everywhere-src-6.5.3.tar.xz"; - sha256 = "13vdklh87jz2p3miaifffi6r0ciw191b9ciaicwk0wry5fdhj6mb"; - name = "qtpositioning-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtpositioning-everywhere-src-6.6.0.tar.xz"; + sha256 = "0fd51wgxcir8b5n6ljcfhagrkv77w6kimjx7mqzd77km7kx20rcd"; + name = "qtpositioning-everywhere-src-6.6.0.tar.xz"; }; }; qtquick3d = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3d-everywhere-src-6.5.3.tar.xz"; - sha256 = "0pffi1wcai6d5w18v39fdwp74za6ydjjcgbgn84y939h7xham0k6"; - name = "qtquick3d-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "1fkshfd0abnxd5ir8wsf57zms99cg1zhrnn40cmnr7g4jjrkxarp"; + name = "qtquick3d-everywhere-src-6.6.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; - sha256 = "1fm4ll8cjbdjn35pbi4763sfxzj49gml2rkdr7mrzwrz4hfk149j"; - name = "qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; + sha256 = "00vwzp5qwccjl65dda8s3lyf3dz1pgwhyls15qqgl338dxl5nfbl"; + name = "qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; - sha256 = "19wwmal5k00l54ybb1ml2c40r4y5a1cwkd36zlri9jycs6x9nrxr"; - name = "qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; + sha256 = "0zzps7wmjmnbkm37j60xc11jppk4g3nnh7qcn91q68mdqygkgjyp"; + name = "qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquicktimeline-everywhere-src-6.5.3.tar.xz"; - sha256 = "0nvv5v5dy3ga1c1whrqdwvicmkys0psb720jycq833yqazn4qgpv"; - name = "qtquicktimeline-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquicktimeline-everywhere-src-6.6.0.tar.xz"; + sha256 = "145mkgcacjf9ak1ydfkrqfk6371zkjgjd2v264krkv9aaza537h7"; + name = "qtquicktimeline-everywhere-src-6.6.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtremoteobjects-everywhere-src-6.5.3.tar.xz"; - sha256 = "18g78q2b9iabc1a9sgbksxj2nsiizaq4lfmxqljjq2cbzd09x74d"; - name = "qtremoteobjects-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtremoteobjects-everywhere-src-6.6.0.tar.xz"; + sha256 = "0szpy60xdmw2spqaczib7mx7k1lnaid8micmy0jh4hmrbgir8496"; + name = "qtremoteobjects-everywhere-src-6.6.0.tar.xz"; }; }; qtscxml = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtscxml-everywhere-src-6.5.3.tar.xz"; - sha256 = "0ld7i84nxxzp3bm96v2ymg53kkb8fpws2vq8b5bibs2zq0m6gn7k"; - name = "qtscxml-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtscxml-everywhere-src-6.6.0.tar.xz"; + sha256 = "0hqhi9z9cbnpbc9dx22ci3a08javb1hi9cn46h1ks1lbbpdx1v2p"; + name = "qtscxml-everywhere-src-6.6.0.tar.xz"; }; }; qtsensors = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsensors-everywhere-src-6.5.3.tar.xz"; - sha256 = "14y25lp296vddk3n4wpf8glshfww73dg47khhvw4s4l3b8rsgl8r"; - name = "qtsensors-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsensors-everywhere-src-6.6.0.tar.xz"; + sha256 = "1624v0wwpdrcbz4x2jdrzb0r7qfh0qcac3k6pfikn45c9rfvxw18"; + name = "qtsensors-everywhere-src-6.6.0.tar.xz"; }; }; qtserialbus = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialbus-everywhere-src-6.5.3.tar.xz"; - sha256 = "13fhm8r0zp8rhbcn9i01s73kdng8afdvh5y0grqw8xqd2ncrav91"; - name = "qtserialbus-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialbus-everywhere-src-6.6.0.tar.xz"; + sha256 = "0k5r57fsdyplbcffq9lnl0bp1smsnqh93kpk3rn5r6gaa9qz1k0q"; + name = "qtserialbus-everywhere-src-6.6.0.tar.xz"; }; }; qtserialport = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialport-everywhere-src-6.5.3.tar.xz"; - sha256 = "1njfhj063gw7v05ynw4frgwisl2cnlkd4xk2yf22hhmiihwsvjwr"; - name = "qtserialport-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialport-everywhere-src-6.6.0.tar.xz"; + sha256 = "0ra0v8vc6y2s9y9irh30g1wnyhgd5xlgg6s0k9czyrvsqkqvpz7c"; + name = "qtserialport-everywhere-src-6.6.0.tar.xz"; }; }; qtshadertools = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz"; - sha256 = "0wrm1yp90fdqwvw8chxd2diic8zl1akr1yyyqmw8w14z80x7n6r0"; - name = "qtshadertools-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtshadertools-everywhere-src-6.6.0.tar.xz"; + sha256 = "0xcqxwvkga11s150jha0b3iwnp4rvkvbfaxy0a0ln52hqmyk541n"; + name = "qtshadertools-everywhere-src-6.6.0.tar.xz"; }; }; qtspeech = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtspeech-everywhere-src-6.5.3.tar.xz"; - sha256 = "170bdch6hvmqkf4y3071ym9aqbmknn0mdbayh9rpw6lj9lng9hkr"; - name = "qtspeech-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtspeech-everywhere-src-6.6.0.tar.xz"; + sha256 = "174zpr582nfgj19qk7qdyf4l85q0gwsjx3qfv37z0238hbzxp6wn"; + name = "qtspeech-everywhere-src-6.6.0.tar.xz"; }; }; qtsvg = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz"; - sha256 = "1vsvbpwh8k863nb94lrl0l8phma176b1kcfl7i3q07yad5xw8hgw"; - name = "qtsvg-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsvg-everywhere-src-6.6.0.tar.xz"; + sha256 = "1pkj7inw76klyld3sy24gcds785lgkjs6zjac9jga0hiypz2bnik"; + name = "qtsvg-everywhere-src-6.6.0.tar.xz"; }; }; qttools = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz"; - sha256 = "0dsy82k7ds5yziy648mxwfz6nq2vq90g43cbnjxjarv97wmx74gw"; - name = "qttools-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttools-everywhere-src-6.6.0.tar.xz"; + sha256 = "16ds0mclns7656hf4phv13pwhigc15z2ghqx7r2nxfrb2jyfx7sf"; + name = "qttools-everywhere-src-6.6.0.tar.xz"; }; }; qttranslations = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttranslations-everywhere-src-6.5.3.tar.xz"; - sha256 = "1qs9x52fqnsgk1wzrvihnr6c5cigx8zimhk3dy1qxhprvh6lrd43"; - name = "qttranslations-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttranslations-everywhere-src-6.6.0.tar.xz"; + sha256 = "13072ll3kwb9kvw3a6sjcdific12vf81xbp41zmi1f34dwirmn50"; + name = "qttranslations-everywhere-src-6.6.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; - sha256 = "0bg678dirmw5b3d46abbidkch0p5hchmqgiwvcvxfh3928aqz01i"; - name = "qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; + sha256 = "0yvpz8mm3g1lj5m3fk95cqw5magfdl4y0y8frsid7gqlym1xp117"; + name = "qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; }; }; qtwayland = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz"; - sha256 = "17rnaap0xa0c6q8b0drm020qny0i3ia8nb0z66xq36zzny48aapp"; - name = "qtwayland-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwayland-everywhere-src-6.6.0.tar.xz"; + sha256 = "1s5p0gfkw96nx4k2fp5s3v2rj8c05k8jc2kif0rwhl6hhlnxihrh"; + name = "qtwayland-everywhere-src-6.6.0.tar.xz"; }; }; qtwebchannel = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebchannel-everywhere-src-6.5.3.tar.xz"; - sha256 = "0jphdg711lhxbxg4dqrxnvkmfr2q9xzrd0h525zw94m7mfk8k7qj"; - name = "qtwebchannel-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebchannel-everywhere-src-6.6.0.tar.xz"; + sha256 = "077mlg2zqr002z7z6yqzl3jqc05g5ahz2m06az3zjhsqdn7b7p7x"; + name = "qtwebchannel-everywhere-src-6.6.0.tar.xz"; }; }; qtwebengine = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebengine-everywhere-src-6.5.3.tar.xz"; - sha256 = "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"; - name = "qtwebengine-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz"; + sha256 = "105pag9a2q611ixn5bvc45kpylhrdz5wgw6bk6zssmrcbbq9zp6m"; + name = "qtwebengine-everywhere-src-6.6.0.tar.xz"; }; }; qtwebsockets = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebsockets-everywhere-src-6.5.3.tar.xz"; - sha256 = "1hx7qy7rgs46ggzifp249d8zz27bjwmbv7f960lwymjdb4bsxqh4"; - name = "qtwebsockets-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebsockets-everywhere-src-6.6.0.tar.xz"; + sha256 = "03pkgp854pb1rzjixhrbyz4ad174wfikjjisry2c90kf1ifb219f"; + name = "qtwebsockets-everywhere-src-6.6.0.tar.xz"; }; }; qtwebview = { - version = "6.5.3"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebview-everywhere-src-6.5.3.tar.xz"; - sha256 = "0jbiwwhjp4lz4r3ym3a4wr3s966d6imffmpb0jlvkah9ji6g276g"; - name = "qtwebview-everywhere-src-6.5.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebview-everywhere-src-6.6.0.tar.xz"; + sha256 = "14ikfl38ajgcv3611zjls7liscfyazf49y1plxk0pipsbndqv955"; + name = "qtwebview-everywhere-src-6.6.0.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix index 9df86514ed..83f46b12a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.4"; + version = "2.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-Ju22lCpwbNxiFeQoaUh3LmtI6RlTO3hOw2Z4/O8PQ6E="; + sha256 = "sha256-tTpCbHiZTb/xmm3oRXsYAUWl1sYyAlGP9ss4xVQgPVo="; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index de80fc0709..860e392275 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.1"; + version = "6.13.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc="; + hash = "sha256-Kdvr3T9hynLCj99+Rc1L0Gq7xkiM0a6xovuqhAncrek="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index e87243fe8e..47cfae6482 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -13,6 +13,7 @@ , python3 , quarto , extraPythonPackages ? ps: with ps; [] +, sysctl }: stdenv.mkDerivation (final: { @@ -60,11 +61,13 @@ stdenv.mkDerivation (final: { mv bin/* $out/bin mv share/* $out/share - runHook preInstall + runHook postInstall ''; passthru.tests = { - quarto-check = runCommand "quarto-check" {} '' + quarto-check = runCommand "quarto-check" { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check touch $out @@ -81,7 +84,7 @@ stdenv.mkDerivation (final: { changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson mrtarantoga ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix index 1e08912fab..ab53b5cc9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.1.2-quic1"; + version = "3.1.4-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${finalAttrs.version}"; - hash = "sha256-erMSGQDmq1S57Y/0GL5Zxw2aygB9XoMJ0x5g+vG6WoM="; + hash = "sha256-WOWoY6rmAAUvuWWXPTWsllUkew5ZIULjL1CEg/RRPsE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index e2dd81b138..2e1163e5f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q="; + hash = "sha256-C3LfrdXNs5AG9B2n2c39fTjv2gri910EYxApGWwtH90="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix index b5da1ad6e1..4e85b3688a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.10"; + version = "1.2.1"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; + sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ec9669f3c7..2f4a2ee6b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; + hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch new file mode 100644 index 0000000000..df334cc912 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch @@ -0,0 +1,35 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 11c1b04c..762eaa75 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,20 +1,14 @@ +-find_package(GTestSrc) ++enable_testing() + +-IF(GTESTSRC_FOUND) +- enable_testing() ++if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) ++ set(gtest_disable_pthreads ON) ++ set(gtest_force_shared_crt ON) ++endif() + +- if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) +- set(gtest_disable_pthreads ON) +- set(gtest_force_shared_crt ON) +- endif() ++include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) +- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) ++set(TEST_LIBRARIES gtest gtest_main) + +- set(TEST_LIBRARIES gtest gtest_main) +- +- add_custom_target(tests ALL) +- add_subdirectory(perftest) +- add_subdirectory(unittest) +- +-ENDIF(GTESTSRC_FOUND) ++add_custom_target(tests ALL) ++add_subdirectory(perftest) ++add_subdirectory(unittest) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch new file mode 100644 index 0000000000..dd06ba6a69 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch @@ -0,0 +1,36 @@ +diff --git a/test/valgrind.supp b/test/valgrind.supp +index c9d3d226..63af7bf9 100644 +--- a/test/valgrind.supp ++++ b/test/valgrind.supp +@@ -24,3 +24,31 @@ + fun:*Uri*Parse_UTF16_Std* + } + ++{ ++ Suppress memcpy_chk valgrind report 5 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_normal* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 6 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_maxDecimalPlaces* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 7 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ ... ++ fun:*Reader*ParseDoubleHandler* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 8 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*Reader*ParseNumber_NormalPrecisionError* ++} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index d3233384d3..b200193aa2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchFromGitHub { - owner = "miloyip"; + owner = "Tencent"; repo = "rapidjson"; rev = "v${version}"; sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) + # One of these three tests reports memcpy overlap after update to glibc-2.38 + ./test-skip-valgrind.diff ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff new file mode 100644 index 0000000000..a791d88699 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff @@ -0,0 +1,7 @@ +--- a/test/unittest/CMakeLists.txt ++++ b/test/unittest/CMakeLists.txt +@@ -82,3 +81,0 @@ +- add_test(NAME valgrind_unittest +- COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix new file mode 100644 index 0000000000..0f4c3d4040 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, graphviz +, gtest +, valgrind +# One of "11" or "17"; default in source is CXX 11 +, cxxStandard ? "11" +, buildDocs ? true +, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin +, buildExamples ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rapidjson"; + version = "unstable-2023-09-28"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildExamples [ + "example" + ]; + + src = fetchFromGitHub { + owner = "Tencent"; + repo = "rapidjson"; + rev = "f9d53419e912910fd8fa57d5705fa41425428c35"; + hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY="; + }; + + patches = lib.optionals buildTests [ + ./0000-unstable-use-nixpkgs-gtest.patch + # https://github.com/Tencent/rapidjson/issues/2214 + ./0001-unstable-valgrind-suppress-failures.patch + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + ]; + + cmakeFlags = [ + (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) + (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) + (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11")) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17")) + ] ++ lib.optionals buildTests [ + (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") + ]; + + doCheck = buildTests; + + nativeCheckInputs = [ + gtest + valgrind + ]; + + postInstall = lib.optionalString buildExamples '' + mkdir -p $example/bin + + find bin -type f -executable \ + -not -name "perftest" \ + -not -name "unittest" \ + -exec cp -a {} $example/bin \; + ''; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ Madouura ]; + broken = (cxxStandard != "11" && cxxStandard != "17"); + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix index 5af34139f9..e655645cd8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -1,13 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch -, mesa, libGLU, glfw -, libX11, libXi, libXcursor, libXrandr, libXinerama -, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib -, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +{ stdenv +, lib +, fetchFromGitHub +, cmake +, fetchpatch +, mesa +, libGLU +, glfw +, libX11 +, libXi +, libXcursor +, libXrandr +, libXinerama +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio , sharedLib ? true , includeEverything ? true , raylib-games +, darwin }: - +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; +in stdenv.mkDerivation (finalAttrs: { pname = "raylib"; version = "4.5.0"; @@ -21,11 +36,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ - mesa glfw libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsa-lib + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = [ libGLU libX11 ]; + + propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -33,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_EXAMPLES=OFF" "-DCUSTOMIZE_BUILD=1" ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; passthru.tests = [ raylib-games ]; @@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; - platforms = platforms.linux; + platforms = platforms.all; changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index c5f74854f7..a1a22fb38e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-09-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; + hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix index 28ed971a25..3bc476ccc0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix @@ -64,7 +64,7 @@ redoxRustPlatform.buildRustPackage rec { ''; # TODO: should be hostPlatform - TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; + TARGET = stdenvNoCC.targetPlatform.rust.rustcTargetSpec; cargoLock = { lockFile = ./Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix deleted file mode 100644 index 09876ea98a..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rocmUpdateScript -, rocm-comgr -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocclr"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "ROCclr"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DbN7kL8oyaPeYQB19Q96L3wX66v62TMSWl0Yor7Q4kE="; - }; - - patches = [ - # Enable support for gfx8 again - # See the upstream issue: https://github.com/RadeonOpenCompute/ROCm/issues/1659 - # And the arch patch: https://github.com/rocm-arch/rocm-arch/pull/742 - (fetchpatch { - url = "https://raw.githubusercontent.com/John-Gee/rocm-arch/d6812d308fee3caf2b6bb01b4d19fe03a6a0e3bd/rocm-opencl-runtime/enable-gfx800.patch"; - hash = "sha256-59jFDIIsTTZcNns9RyMVWPRUggn/bSlAGrky4quu8B4="; - }) - ]; - - postPatch = '' - substituteInPlace device/comgrctx.cpp \ - --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -a * $out/ - - runHook postInstall - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Source package of the Radeon Open Compute common language runtime"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - # rocclr seems to have some AArch64 ifdefs, but does not seem - # to be supported yet by the build infrastructure. Recheck in - # the future. - platforms = [ "x86_64-linux" ]; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/device-install.patch b/third_party/nixpkgs/pkgs/development/libraries/rocfft/device-install.patch deleted file mode 100644 index 355cf30d07..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/device-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt -index 73a8ec9..9bfd4b8 100644 ---- a/library/src/device/CMakeLists.txt -+++ b/library/src/device/CMakeLists.txt -@@ -255,4 +255,10 @@ foreach( sub ${AMDGPU_TARGETS} ) - if( NOT BUILD_SHARED_LIBS ) - set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" ) - endif( ) -+ -+ rocm_install_targets( -+ TARGETS -+ rocfft-device-${sub} -+ COMPONENT device -+ ) - endforeach() diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/split-kernel-compilation.patch b/third_party/nixpkgs/pkgs/development/libraries/rocfft/split-kernel-compilation.patch deleted file mode 100644 index 5d71fe399c..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/split-kernel-compilation.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt -index 3a16304..606b711 100644 ---- a/library/src/CMakeLists.txt -+++ b/library/src/CMakeLists.txt -@@ -250,12 +250,12 @@ foreach( target - - endforeach() - --add_executable( rocfft_aot_helper -+add_executable( rocfft_aot_helper EXCLUDE_FROM_ALL - rocfft_aot_helper.cpp - rocfft_stub.cpp - ) - --add_executable( rocfft_config_search -+add_executable( rocfft_config_search EXCLUDE_FROM_ALL - rocfft_config_search.cpp - rocfft_stub.cpp - ) -@@ -279,10 +279,10 @@ endif() - - target_link_libraries( rocfft PRIVATE ${ROCFFT_DEVICE_LINK_LIBS} ) - --target_link_libraries( rocfft PRIVATE rocfft-device-0 ) --target_link_libraries( rocfft PRIVATE rocfft-device-1 ) --target_link_libraries( rocfft PRIVATE rocfft-device-2 ) --target_link_libraries( rocfft PRIVATE rocfft-device-3 ) -+foreach( sub ${AMDGPU_TARGETS} ) -+ target_link_libraries( rocfft PRIVATE -lrocfft-device-${sub} ) -+endforeach() -+ - foreach( target rocfft rocfft_aot_helper rocfft_config_search ) - # RTC uses dladdr to find the RTC helper program - if( NOT WIN32 ) -@@ -347,7 +347,7 @@ add_custom_command( - DEPENDS rocfft_aot_helper rocfft_rtc_helper - COMMENT "Compile kernels into shipped cache file" - ) --add_custom_target( rocfft_kernel_cache_target ALL -+add_custom_target( rocfft_kernel_cache_target - DEPENDS rocfft_kernel_cache.db - VERBATIM - ) -@@ -392,7 +392,8 @@ else() - endif() - rocm_install(FILES ${ROCFFT_KERNEL_CACHE_PATH} - DESTINATION "${ROCFFT_KERNEL_CACHE_INSTALL_DIR}" -- COMPONENT runtime -+ COMPONENT kernel_cache -+ EXCLUDE_FROM_ALL - ) - - # PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt -index 9f7b85f..73a8ec9 100644 ---- a/library/src/device/CMakeLists.txt -+++ b/library/src/device/CMakeLists.txt -@@ -170,11 +170,11 @@ list( SORT rocfft_device_source ) - # functions callable by rocFFT and depends on amdhip64, and another - # one usable by AOT RTC that contains no device code - list( FILTER rocfft_device_source EXCLUDE REGEX function_pool.cpp ) --add_library( rocfft-function-pool OBJECT -+add_library( rocfft-function-pool OBJECT EXCLUDE_FROM_ALL - function_pool.cpp - ) - target_compile_definitions( rocfft-function-pool PRIVATE FUNCTION_POOL_STANDALONE_BODY= ) --add_library( rocfft-function-pool-standalone OBJECT -+add_library( rocfft-function-pool-standalone OBJECT EXCLUDE_FROM_ALL - function_pool.cpp - ) - target_compile_definitions( rocfft-function-pool-standalone PRIVATE FUNCTION_POOL_STANDALONE_BODY={} ) -@@ -193,26 +193,15 @@ foreach( pool rocfft-function-pool rocfft-function-pool-standalone ) - add_dependencies(${pool} gen_headers_target) - endforeach() - --list( LENGTH rocfft_device_source rocfft_device_source_len ) --math(EXPR split_len "${rocfft_device_source_len} / 4") --math(EXPR split_idx_2 "${rocfft_device_source_len} / 4 * 2") --math(EXPR split_idx_3 "${rocfft_device_source_len} / 4 * 3") -- --list( SUBLIST rocfft_device_source 0 ${split_len} rocfft_device_source_0 ) --list( SUBLIST rocfft_device_source ${split_len} ${split_len} rocfft_device_source_1 ) --list( SUBLIST rocfft_device_source ${split_idx_2} ${split_len} rocfft_device_source_2 ) --list( SUBLIST rocfft_device_source ${split_idx_3} -1 rocfft_device_source_3 ) -- --foreach( sub RANGE 3 ) -- set( rocfft_device_source_var rocfft_device_source_${sub} ) -+foreach( sub ${AMDGPU_TARGETS} ) - if(NOT SINGLELIB) -- add_library( rocfft-device-${sub} -- ${${rocfft_device_source_var}} ) -+ add_library( rocfft-device-${sub} EXCLUDE_FROM_ALL -+ ${rocfft_device_source} ) - else() - # Compile the device lib as a static library, which is then linked - # into librocfft.so Useful for testing purposes. -- add_library( rocfft-device-${sub} STATIC -- ${${rocfft_device_source_var}} ) -+ add_library( rocfft-device-${sub} STATIC EXCLUDE_FROM_ALL -+ ${rocfft_device_source} ) - - # if we're building singlelib, we don't want to export any of the - # device library symbols to the main library -@@ -241,9 +230,7 @@ foreach( sub RANGE 3 ) - # Set AMD GPU architecture options - - # Enable compilation of desired architectures -- foreach( target ${AMDGPU_TARGETS} ) -- target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${target} ) -- endforeach( ) -+ target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${sub} ) - - target_include_directories( rocfft-device-${sub} - PRIVATE $ -@@ -268,9 +255,4 @@ foreach( sub RANGE 3 ) - if( NOT BUILD_SHARED_LIBS ) - set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" ) - endif( ) -- -- rocm_install_targets( -- TARGETS -- rocfft-device-${sub} -- ) - endforeach() diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch deleted file mode 100644 index ae96674517..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/cmake.patch +++ /dev/null @@ -1,365 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62b857b..d21c7f4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,8 +147,8 @@ if (UNIX) - list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) - if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) - configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/src/exportmap.in -- ${CMAKE_CURRENT_BINARY_DIR}/src/exportmap @ONLY) -+ src/exportmap.in -+ src/exportmap @ONLY) - list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS - "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") - # When building a shared library with -fsanitize=address we can't be -@@ -175,10 +175,6 @@ endif() - # the shared header. - list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) - --configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_comgr.h.in -- ${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h @ONLY) -- - include(bc2h) - include(opencl_pch) - include(DeviceLibs) -@@ -212,10 +208,14 @@ target_include_directories(amd_comgr - $ - $) - -+configure_file( -+ include/amd_comgr.h.in -+ include/amd_comgr.h @ONLY) -+ - set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) - set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) - set(AMD_COMGR_VERSION_NAME amd_comgr-config-version.cmake) --set(AMD_COMGR_PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/amd_comgr) -+set(AMD_COMGR_PACKAGE_PREFIX cmake/amd_comgr) - - # Generate the build-tree package. - set(AMD_COMGR_PREFIX_CODE) -@@ -226,13 +226,13 @@ if (NOT COMGR_BUILD_SHARED_LIBS) - endif() - - set(AMD_COMGR_TARGETS_PATH -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - set(AMD_COMGR_VERSION_PATH -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") -+ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") - export(TARGETS amd_comgr -- FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ FILE "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" -+ "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" - @ONLY) - write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" - VERSION "${amd_comgr_VERSION}" -@@ -266,7 +266,7 @@ install(FILES - set(AMD_COMGR_PREFIX_CODE " - # Derive absolute install prefix from config file path. - get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") --string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") -+string(REGEX REPLACE "/" ";" count "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") - foreach(p ${count}) - set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} - get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") -@@ -278,20 +278,20 @@ if (NOT COMGR_BUILD_SHARED_LIBS) - string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") - endif() - --set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -+ "${AMD_COMGR_CONFIG_NAME}.install" - @ONLY) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" - RENAME "${AMD_COMGR_CONFIG_NAME}") - install(EXPORT amd_comgr_export -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" - FILE "${AMD_COMGR_TARGETS_NAME}") - install(FILES - "${AMD_COMGR_VERSION_PATH}" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") - - if(TARGET clangFrontendTool) - set(CLANG_LIBS -diff --git a/cmake/DeviceLibs.cmake b/cmake/DeviceLibs.cmake -index 27e9546..dfe1b57 100644 ---- a/cmake/DeviceLibs.cmake -+++ b/cmake/DeviceLibs.cmake -@@ -1,8 +1,7 @@ - set(INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) - - set(GEN_LIBRARY_INC_FILE ${INC_DIR}/libraries.inc) -- --file(WRITE ${GEN_LIBRARY_INC_FILE} "// Automatically generated file; DO NOT EDIT.\n") -+set(GEN_LIBRARY_DEFS_INC_FILE ${INC_DIR}/libraries_defs.inc) - - # cmake does not provide a way to query targets produced by a project, - # so we have to make one up. Ordinarily, individual library target -@@ -23,6 +22,7 @@ if(NOT AMD_DEVICE_LIBS_TARGETS) - message(FATAL_ERROR "Could not find list of device libraries") - endif() - -+set(TARGETS_INCLUDES "") - foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) - set(header ${AMDGCN_LIB_TARGET}.inc) - -@@ -54,75 +54,52 @@ foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) - add_custom_target(${AMDGCN_LIB_TARGET}_header DEPENDS ${INC_DIR}/${header}) - add_dependencies(amd_comgr ${AMDGCN_LIB_TARGET}_header) - -- file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"${header}\"\n") -+ list(APPEND TARGETS_INCLUDES "#include \"${header}\"") -+endforeach() -+ -+list(JOIN TARGETS_INCLUDES "\n" TARGETS_INCLUDES) -+file(GENERATE OUTPUT ${GEN_LIBRARY_INC_FILE} CONTENT "${TARGETS_INCLUDES}") -+ -+foreach(OPENCL_VERSION 1.2 2.0) -+ string(REPLACE . _ OPENCL_UNDERSCORE_VERSION ${OPENCL_VERSION}) -+ add_custom_command(OUTPUT ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc -+ COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch -+ ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc -+ opencl${OPENCL_UNDERSCORE_VERSION}_c -+ DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch -+ COMMENT "Generating opencl${OPENCL_VERSION}-c.inc" -+ ) -+ set_property(DIRECTORY APPEND PROPERTY -+ ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) -+ add_custom_target(opencl${OPENCL_VERSION}-c.inc_target DEPENDS ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) -+ add_dependencies(amd_comgr opencl${OPENCL_VERSION}-c.inc_target) - endforeach() - --add_custom_command(OUTPUT ${INC_DIR}/opencl1.2-c.inc -- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch -- ${INC_DIR}/opencl1.2-c.inc -- opencl1_2_c -- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch -- COMMENT "Generating opencl1.2-c.inc" --) --set_property(DIRECTORY APPEND PROPERTY -- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl1.2-c.inc) --add_custom_target(opencl1.2-c.inc_target DEPENDS ${INC_DIR}/opencl1.2-c.inc) --add_dependencies(amd_comgr opencl1.2-c.inc_target) --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl1.2-c.inc\"\n") -- --add_custom_command(OUTPUT ${INC_DIR}/opencl2.0-c.inc -- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch -- ${INC_DIR}/opencl2.0-c.inc -- opencl2_0_c -- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch -- COMMENT "Generating opencl2.0-c.inc" --) --set_property(DIRECTORY APPEND PROPERTY -- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl2.0-c.inc) --add_custom_target(opencl2.0-c.inc_target DEPENDS ${INC_DIR}/opencl2.0-c.inc) --add_dependencies(amd_comgr opencl2.0-c.inc_target) --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl2.0-c.inc\"\n") -- --# Generate function to select libraries for a given GFXIP number. --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"llvm/ADT/StringRef.h\"\n") --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "static std::tuple get_oclc_isa_version(llvm::StringRef gfxip) {") -+set(TARGETS_DEFS "") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_TARGET\n#define AMD_DEVICE_LIBS_TARGET(t)\n#endif") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_GFXIP\n#define AMD_DEVICE_LIBS_GFXIP(t, g)\n#endif") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_FUNCTION\n#define AMD_DEVICE_LIBS_FUNCTION(t, f)\n#endif") -+list(APPEND TARGETS_DEFS "") - foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_TARGET(${AMDGCN_LIB_TARGET})") -+ # Generate function to select libraries for a given GFXIP number. - if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_isa_version_.+$") - string(REGEX REPLACE "^oclc_isa_version_(.+)$" "\\1" gfxip ${AMDGCN_LIB_TARGET}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "if (gfxip == \"${gfxip}\") return std::make_tuple(\"${AMDGCN_LIB_TARGET}.bc\", ${AMDGCN_LIB_TARGET}_lib, ${AMDGCN_LIB_TARGET}_lib_size);") -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_GFXIP(${AMDGCN_LIB_TARGET}, \"${gfxip}\")") - endif() --endforeach() --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "return std::make_tuple(nullptr, nullptr, 0); }") -- --# Generate function to select libraries for given feature. --foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -+ # Generate function to select libraries for given feature. - if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_.*_on$") - string(REGEX REPLACE "^oclc_(.*)_on" "\\1" function ${AMDGCN_LIB_TARGET}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "static std::tuple get_oclc_${function}(bool on) { \ -- return std::make_tuple( \ -- on ? \"oclc_${function}_on_lib.bc\" : \"oclc_${function}_off_lib.bc\", \ -- on ? oclc_${function}_on_lib : oclc_${function}_off_lib, \ -- on ? oclc_${function}_on_lib_size : oclc_${function}_off_lib_size \ -- ); }") -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_FUNCTION(${AMDGCN_LIB_TARGET}, ${function})") - endif() - endforeach() - --# Generate function yield all libraries. --file(APPEND ${GEN_LIBRARY_INC_FILE} "\n#include \"llvm/ADT/ArrayRef.h\"\n") --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "llvm::ArrayRef> COMGR::getDeviceLibraries() { \ -- static std::tuple DeviceLibs[] = {") --foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "{\"${AMDGCN_LIB_TARGET}.bc\", llvm::StringRef(reinterpret_cast(${AMDGCN_LIB_TARGET}_lib), ${AMDGCN_LIB_TARGET}_lib_size)},") --endforeach() --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "}; \ -- return DeviceLibs; \ -- }") -+list(APPEND TARGETS_DEFS "") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_TARGET") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_GFXIP") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_FUNCTION") -+ -+list(JOIN TARGETS_DEFS "\n" TARGETS_DEFS) -+file(GENERATE OUTPUT ${GEN_LIBRARY_DEFS_INC_FILE} CONTENT "${TARGETS_DEFS}") - - include_directories(${INC_DIR}) -diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake -index 146fe2b..9134985 100644 ---- a/cmake/bc2h.cmake -+++ b/cmake/bc2h.cmake -@@ -1,40 +1,41 @@ --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c --"#include \n" --"int main(int argc, char **argv){\n" --" FILE *ifp, *ofp;\n" --" int c, i, l;\n" --" if (argc != 4) return 1;\n" --" ifp = fopen(argv[1], \"rb\");\n" --" if (!ifp) return 1;\n" --" i = fseek(ifp, 0, SEEK_END);\n" --" if (i < 0) return 1;\n" --" l = ftell(ifp);\n" --" if (l < 0) return 1;\n" --" i = fseek(ifp, 0, SEEK_SET);\n" --" if (i < 0) return 1;\n" --" ofp = fopen(argv[2], \"wb+\");\n" --" if (!ofp) return 1;\n" --" fprintf(ofp, \"#define %s_size %d\\n\\n\"\n" --" \"#if defined __GNUC__\\n\"\n" --" \"__attribute__((aligned (4096)))\\n\"\n" --" \"#elif defined _MSC_VER\\n\"\n" --" \"__declspec(align(4096))\\n\"\n" --" \"#endif\\n\"\n" --" \"static const unsigned char %s[%s_size+1] = {\",\n" --" argv[3], l,\n" --" argv[3], argv[3]);\n" --" i = 0;\n" --" while ((c = getc(ifp)) != EOF) {\n" --" if (0 == (i&7)) fprintf(ofp, \"\\n \");\n" --" fprintf(ofp, \" 0x%02x,\", c);\n" --" ++i;\n" --" }\n" --" fprintf(ofp, \" 0x00\\n};\\n\\n\");\n" --" fclose(ifp);\n" --" fclose(ofp);\n" --" return 0;\n" --"}\n" --) -+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c -+ CONTENT -+"#include -+int main(int argc, char **argv){ -+ FILE *ifp, *ofp; -+ int c, i, l; -+ if (argc != 4) return 1; -+ ifp = fopen(argv[1], \"rb\"); -+ if (!ifp) return 1; -+ i = fseek(ifp, 0, SEEK_END); -+ if (i < 0) return 1; -+ l = ftell(ifp); -+ if (l < 0) return 1; -+ i = fseek(ifp, 0, SEEK_SET); -+ if (i < 0) return 1; -+ ofp = fopen(argv[2], \"wb+\"); -+ if (!ofp) return 1; -+ fprintf(ofp, \"#define %s_size %d\\n\\n\" -+ \"#if defined __GNUC__\\n\" -+ \"__attribute__((aligned (4096)))\\n\" -+ \"#elif defined _MSC_VER\\n\" -+ \"__declspec(align(4096))\\n\" -+ \"#endif\\n\" -+ \"static const unsigned char %s[%s_size+1] = {\", -+ argv[3], l, -+ argv[3], argv[3]); -+ i = 0; -+ while ((c = getc(ifp)) != EOF) { -+ if (0 == (i&7)) fprintf(ofp, \"\\n \"); -+ fprintf(ofp, \" 0x%02x,\", c); -+ ++i; -+ } -+ fprintf(ofp, \" 0x00\\n};\\n\\n\"); -+ fclose(ifp); -+ fclose(ofp); -+ return 0; -+} -+") - - add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -diff --git a/src/comgr-device-libs.cpp b/src/comgr-device-libs.cpp -index 4d2b914..80786d1 100644 ---- a/src/comgr-device-libs.cpp -+++ b/src/comgr-device-libs.cpp -@@ -35,7 +35,7 @@ - - #include "comgr-device-libs.h" - #include "comgr.h" --#include "libraries.inc" -+#include "comgr-libraries.h" - #include "llvm/ADT/StringSwitch.h" - #include - -diff --git a/src/comgr-libraries.h b/src/comgr-libraries.h -new file mode 100644 -index 0000000..3caa0a0 ---- /dev/null -+++ b/src/comgr-libraries.h -@@ -0,0 +1,34 @@ -+#include "libraries.inc" -+#include "opencl1.2-c.inc" -+#include "opencl2.0-c.inc" -+#include "llvm/ADT/StringRef.h" -+#include "llvm/ADT/ArrayRef.h" -+ -+static std::tuple get_oclc_isa_version(llvm::StringRef gfxip) { -+#define AMD_DEVICE_LIBS_GFXIP(target, target_gfxip) \ -+ if (gfxip == target_gfxip) return std::make_tuple(#target ".bc", target##_lib, target##_lib_size); -+#include "libraries_defs.inc" -+ -+ return std::make_tuple(nullptr, nullptr, 0); -+} -+ -+#define AMD_DEVICE_LIBS_FUNCTION(target, function) \ -+ static std::tuple get_oclc_##function(bool on) { \ -+ return std::make_tuple( \ -+ on ? "oclc_" #function "_on_lib.bc" : "oclc_" #function "_off_lib.bc", \ -+ on ? oclc_##function##_on_lib : oclc_##function##_off_lib, \ -+ on ? oclc_##function##_on_lib_size : oclc_##function##_off_lib_size \ -+ ); \ -+ } -+#include "libraries_defs.inc" -+ -+llvm::ArrayRef> COMGR::getDeviceLibraries() { -+ static std::tuple DeviceLibs[] = { -+#define AMD_DEVICE_LIBS_TARGET(target) \ -+ {#target ".bc", llvm::StringRef(reinterpret_cast(target##_lib), target##_lib_size)}, -+#include "libraries_defs.inc" -+ }; -+ return DeviceLibs; -+} -+ -+ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-core/default.nix deleted file mode 100644 index 9f1a4ab4cc..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, runCommand -, substituteAll -, cmake -}: - -let - rocm_version = with lib; concatStrings (intersperse "0" (splitString "." stdenv.cc.version)); -in stdenv.mkDerivation (finalAttrs: { - pname = "rocm-core"; - version = stdenv.cc.version; - - # Based on https://github.com/rocm-arch/rocm-arch/tree/ad0b15690d403e5822db062ffff4db3912de6669/rocm-core - src = let - rocm_major = lib.versions.major finalAttrs.version; - rocm_minor = lib.versions.minor finalAttrs.version; - rocm_patch = lib.versions.patch finalAttrs.version; - - cmake_lists = substituteAll { - inherit rocm_version; - src = ./src/CMakeLists.txt; - }; - - version_c = substituteAll { - inherit rocm_major rocm_minor rocm_patch; - src = ./src/rocm_version.c; - }; - - version_h = substituteAll { - inherit rocm_major rocm_minor rocm_patch; - src = ./src/rocm_version.h; - }; - in runCommand "rocm-core-${finalAttrs.version}-source" { preferLocalBuild = true; } '' - mkdir -p $out/rocm-core - ln -s ${cmake_lists} $out/CMakeLists.txt - ln -s ${version_c} $out/rocm_version.c - ln -s ${version_h} $out/rocm-core/rocm_version.h - ''; - - nativeBuildInputs = [ cmake ]; - - postInstall = '' - mkdir -p $out/include - cp -a ../rocm-core $out/include - ln -s $out/include/rocm-core/rocm_version.h $out/include - ln -s $out/lib/librocm-core.so.1.0.${rocm_version} $out/lib/librocm-core.so.1 - ''; - - meta = with lib; { - description = "ROCm core"; - homepage = "https://docs.amd.com"; - license = with licenses; [ ncsa ]; # See src/rocm_version.h - maintainers = teams.rocm.members; - platforms = platforms.linux; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/CMakeLists.txt b/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/CMakeLists.txt deleted file mode 100644 index b2d9fc1f53..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.23) -project(rocm-core) -add_library(rocm-core SHARED rocm_version.c) -set_target_properties(rocm-core PROPERTIES VERSION "1.0.@rocm_version@") -install(TARGETS rocm-core LIBRARY DESTINATION lib) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.c b/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.c deleted file mode 100644 index a35dfc6a72..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "rocm-core/rocm_version.h" - -VerErrors getROCmVersion(unsigned int *Major, unsigned int *Minor, - unsigned int *Patch) { - *Major = @rocm_major@; - *Minor = @rocm_minor@; - *Patch = @rocm_patch@; - - return 0; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.h b/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.h deleted file mode 100644 index d112a68b86..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-core/src/rocm_version.h +++ /dev/null @@ -1,82 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// The University of Illinois/NCSA -// Open Source License (NCSA) -// -// Copyright (c) 2014-2021, Advanced Micro Devices, Inc. All rights reserved. -// -// Developed by: -// -// AMD Research and AMD HSA Software Development -// -// Advanced Micro Devices, Inc. -// -// www.amd.com -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal with the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// - Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// - Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimers in -// the documentation and/or other materials provided with the distribution. -// - Neither the names of Advanced Micro Devices, Inc, -// nor the names of its contributors may be used to endorse or promote -// products derived from this Software without specific prior written -// permission. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS WITH THE SOFTWARE. -// -//////////////////////////////////////////////////////////////////////////////// - - -#ifndef _ROCM_VERSION_H_ -#define _ROCM_VERSION_H_ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define ROCM_VERSION_MAJOR @rocm_major@ -#define ROCM_VERSION_MINOR @rocm_minor@ -#define ROCM_VERSION_PATCH @rocm_patch@ - - -typedef enum { - VerSuccess=0, - VerIncorrecPararmeters, - VerValuesNotDefined, - VerErrorMAX //This should always be last value in the enumerations -} VerErrors; - - -// API for getting the verion -// Return val : VerErros : API execution status. The parameters are valid only when the exetution status is SUCCESS==0 -VerErrors getROCmVersion(unsigned int* Major, unsigned int* Minor, unsigned int* Patch) __attribute__((nonnull)) ; -// Usage : -// int mj=0,mn=0,p=0,ret=0; -// ret=getROCMVersion(&mj,&mn,&p); -// if(ret !=VerSuccess ) // error occured -// -// check for the values and -// - - -#ifdef __cplusplus -} // end extern "C" block -#endif - -#endif //_ROCM_VERSION_H_ header guard diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix deleted file mode 100644 index 4602d3646e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, stdenv -, callPackage -, rocm-opencl-runtime -}: - -stdenv.mkDerivation rec { - pname = "rocm-opencl-icd"; - version = rocm-opencl-runtime.version; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/etc/OpenCL/vendors - echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd - ''; - - passthru.impureTests = { rocm-opencl = callPackage ./test.nix { }; }; - - meta = with lib; { - description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix deleted file mode 100644 index ebdb4e3177..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, addOpenGLRunpath -, cmake -, rocm-comgr -, rocm-runtime -, rocclr -, glew -, libX11 -, numactl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-opencl-runtime"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCm-OpenCL-Runtime"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - rocm-comgr - rocm-runtime - glew - libX11 - numactl - ]; - - cmakeFlags = [ - "-DAMD_OPENCL_PATH=${finalAttrs.src}" - "-DROCCLR_PATH=${rocclr}" - ]; - - dontStrip = true; - - # Remove clinfo, which is already provided through the - # `clinfo` package. - postInstall = '' - rm -rf $out/bin - ''; - - # Fix the ICD installation path for NixOS - postPatch = '' - substituteInPlace khronos/icd/loader/linux/icd_linux.c \ - --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch b/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch deleted file mode 100644 index b70163b08e..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp -index 643ff16..c08d98f 100644 ---- a/src/util/hsa_rsrc_factory.cpp -+++ b/src/util/hsa_rsrc_factory.cpp -@@ -127,15 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize - if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); - if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {0}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); -- - // Get Loader API table - loader_api_ = {0}; - status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_); diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/default.nix deleted file mode 100644 index e7e0c9fed6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/rocprofiler/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-runtime -, rocm-thunk -, roctracer -, numactl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocprofiler"; - version = "5.4.3"; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "rocprofiler"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-CpD/+soMN8WTeSb5X7dsnZ596PMkw+4EVsVSvFtKCak="; - }; - - patches = [ ./0000-dont-require-hsa_amd_aqlprofile.patch ]; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - rocm-thunk - rocm-runtime - numactl - ]; - - cmakeFlags = [ - "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs bin test - - substituteInPlace cmake_modules/env.cmake \ - --replace "FATAL_ERROR \"AQL_PROFILE" "WARNING \"AQL_PROFILE" - ''; - - postInstall = '' - patchelf --set-rpath $out/lib:${lib.makeLibraryPath finalAttrs.buildInputs} $out/lib/rocprofiler/librocprof-tool.so - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; - license = with licenses; [ mit ]; # mitx11 - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock index 89fefcd907..68a1719d08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/libraries/rure/Cargo.lock @@ -4,30 +4,42 @@ version = 3 [[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", ] [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -36,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rure" diff --git a/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix index 6dd6d46e30..4e142c5845 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rustc-demangle/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib cp -R crates/capi/include $out ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index c1483f90c4..73092a803d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.50"; + version = "1.3.56"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; + hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index d6d8919ccd..0b4526e6e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -1,9 +1,11 @@ { stdenv , lib , fetchFromGitHub +, bash , cmake , cfitsio , libusb1 +, kmod , zlib , boost , libev @@ -58,6 +60,15 @@ stdenv.mkDerivation rec { # Socket address collisions between tests enableParallelChecking = false; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 2423a6e20e..fdbdb4db24 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -1,6 +1,8 @@ { stdenv , lib +, bash , cmake +, coreutils , cfitsio , libusb1 , zlib @@ -24,6 +26,10 @@ , firmware ? null }: +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in + stdenv.mkDerivation rec { pname = "indi-3rdparty"; @@ -68,6 +74,19 @@ stdenv.mkDerivation rec { "-DWITH_SBIG=off" ]; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/lib/firmware/" "$out/lib/firmware/" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Third party drivers for the INDI astronomical software suite"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 7875051cbf..102a8b901c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -1,7 +1,9 @@ { stdenv , lib +, bash , cmake , cfitsio +, coreutils , libusb1 , zlib , boost @@ -21,7 +23,9 @@ , src , autoPatchelfHook }: - +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in stdenv.mkDerivation rec { pname = "indi-firmware"; @@ -39,7 +43,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - "-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware" + "-DFIRMWARE_INSTALL_DIR=lib/firmware" + "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" @@ -52,8 +57,17 @@ stdenv.mkDerivation rec { done ''; - postFixup = '' - rm $out/lib/udev/rules.d/99-fli.rules + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace "$f" --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/lib/firmware/" "$out/lib/firmware/" + sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i "$f" + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index 5ec1acdf21..f1201df1d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -1,4 +1,4 @@ -{ buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: +{ buildEnv, makeBinaryWrapper, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: buildEnv { name = "${pname}-${version}"; @@ -6,5 +6,13 @@ buildEnv { indilib ] ++ extraDrivers; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out + ''; + + inherit (indilib) meta; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix index 17e454e13e..8f2adb8542 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jh3NWtQSV0uePDMCDNzdI4qpRGbHTel3neRZAA3anQk="; + hash = "sha256-ME0x+1VyfuhJCldwJfjQCtfe9XQk1ptmhv4ghOyNuGA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index a7c388339d..349c3be82b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python - ${python3Packages.python.pythonForBuild.interpreter} setup.py build - ${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix index 0f05315b9d..7cc64937dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , gfortran , blas @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-R7CAFG/x55k5Ieslxeq+DWq1wPip4cI+Yvn1cBbeVNs="; }; + patches = [ + # toml-f 0.4 compatibility + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/da759fd02b8fbf470a5c6d3df9657cca6b1d0a9a.diff"; + hash = "sha256-VaeA2VyK+Eas432HMSpJ0lXxHBBNGpfkUO1eHeWpYl0="; + }) + ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix index 8bf30f9700..3a72cfaaa6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchpatch , meson , ninja , pkg-config @@ -42,8 +43,17 @@ buildPythonPackage { propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; - # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors - patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; + + patches = [ + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors + ./0001-fix-multicharge-dep-needed-for-static-compilation.patch + + # Toml-f 0.4.0 compatibility https://github.com/tblite/tblite/pull/108 + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/e4255519b58a5198a5fa8f3073bef1c78a4bbdbe.diff"; + hash = "sha256-BMwYsdWfK+vG3BFgzusLYfwo0WXrYSPxJoEJIyOvbPg="; + }) + ]; format = "other"; pythonImportsCheck = [ "tblite" "tblite.interface" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index 2ed35d26b9..b03352c54e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -9,7 +9,7 @@ , withOpenMP ? true , blas64 ? false -, withAMDOpt ? false +, withAMDOpt ? true }: stdenv.mkDerivation rec { @@ -37,15 +37,15 @@ stdenv.mkDerivation rec { buildInputs = [ amd-blis aocl-utils ]; cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib" + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" "-DENABLE_BUILTIN_LAPACK2FLAME=ON" "-DENABLE_CBLAS_INTERFACES=ON" "-DENABLE_EXT_LAPACK_INTERFACE=ON" ] - ++ lib.optional (!withOpenMP) "ENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "ENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "ENABLE_AMD_OPT=ON"; + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index a418df7050..744d565edd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen , useMpi ? false , mpi , openssh +, igraph }: # MPI version can only be built with LP64 interface. @@ -11,25 +12,15 @@ assert useMpi -> !blas.isILP64; stdenv.mkDerivation rec { pname = "arpack"; - version = "3.8.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "opencollab"; repo = "arpack-ng"; rev = version; - sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA="; + sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0="; }; - patches = [ - # https://github.com/opencollab/arpack-ng/pull/301 - (fetchpatch { - name = "pkg-config-paths.patch"; - url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch"; - excludes = [ "CHANGES" ]; - sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8"; - }) - ]; - nativeBuildInputs = [ cmake gfortran ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas @@ -56,10 +47,16 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; - passthru = { inherit (blas) isILP64; }; + passthru = { + inherit (blas) isILP64; + tests = { + inherit igraph; + }; + }; meta = { homepage = "https://github.com/opencollab/arpack-ng"; + changelog = "https://github.com/opencollab/arpack-ng/blob/${src.rev}/CHANGES"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 5b78afc15e..2c9aa745ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -48,8 +48,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix index 7f494b245c..5a736f9769 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "bonmin"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Bonmin"; rev = "releases/${version}"; - sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix index 6cb7666e56..60b9de0ab3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - version = "2.11.9"; + version = "2.11.10"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; rev = "releases/${version}"; - hash = "sha256-DgHVbcXd36WW6JQbiq1MUHAiKLs8CTau87rs0T76sGs="; + hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; + stripLen = 1; + extraPrefix = "CoinUtils/"; + hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index b1e03e35df..b9f101d80f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -153,8 +153,14 @@ in description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; sourceProvenance = with sourceTypes; [binaryNativeCode]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; + license = { + shortName = "cuDNN EULA"; + fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + } // lib.optionalAttrs (!useCudatoolkitRunfile) { + redistributable = true; + }; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; # Force the use of the default, fat output by default (even though `dev` exists, which diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index 9b26b352cd..cea4d5b4c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8="; + sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index b3753a6333..6b8588207d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -18,16 +18,14 @@ , gfortran , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , gpuTargets ? [ ] # Non-CUDA targets, that is HIP -, hip -, hipblas -, hipsparse +, rocmPackages , lapack , lib , libpthreadstubs , magmaRelease , ninja -, openmp -, rocmSupport ? false +, config +, rocmSupport ? config.rocmSupport , static ? false , stdenv , symlinkJoin @@ -47,7 +45,7 @@ let # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. - rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets; + rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; @@ -124,11 +122,13 @@ stdenv.mkDerivation { cuda_nvprof.dev # ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ cuda_profiler_api.dev # + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # ]) ++ lists.optionals rocmSupport [ - hip - hipblas - hipsparse - openmp + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.hipsparse + rocmPackages.llvm.openmp ]; cmakeFlags = [ @@ -142,8 +142,8 @@ stdenv.mkDerivation { "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DMAGMA_ENABLE_CUDA=ON" ] ++ lists.optionals rocmSupport [ - "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" - "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" + "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" + "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" "-DMAGMA_ENABLE_HIP=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index c5c7b7e642..d1df264564 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,6 +1,7 @@ { lib , backendStdenv , fetchFromGitHub +, python3 , which , autoAddOpenGLRunpathHook , cuda_cccl @@ -17,13 +18,13 @@ let in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl"; - version = "2.18.5-1"; + version = "2.19.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,7 @@ backendStdenv.mkDerivation (finalAttrs: { which autoAddOpenGLRunpathHook cuda_nvcc + python3 ]; buildInputs = [ @@ -46,7 +48,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' - patchShebangs src/collectives/device/gen_rules.sh + patchShebangs ./src/device/generate.py makeFlagsArray+=( "NVCC_GENCODE=${gencode}" ) @@ -77,7 +79,7 @@ backendStdenv.mkDerivation (finalAttrs: { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter orivej ]; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix index 69e45a6aee..9d826b92f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,40 +1,47 @@ -{ config -, cudaPackages +{ backendStdenv +, config +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaVersion , fetchFromGitHub +, gitUpdater , lib -, mpiSupport ? false , mpi -, stdenv +, mpiSupport ? false +, nccl , which }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.6"; + version = "2.13.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw="; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; }; strictDeps = true; nativeBuildInputs = [ - cudaPackages.cuda_nvcc + cuda_nvcc which ]; buildInputs = [ - cudaPackages.cuda_cudart - cudaPackages.nccl + cuda_cudart + nccl + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # ] ++ lib.optional mpiSupport mpi; makeFlags = [ - "CUDA_HOME=${cudaPackages.cuda_nvcc}" - "NCCL_HOME=${cudaPackages.nccl}" + "CUDA_HOME=${cuda_nvcc}" + "NCCL_HOME=${nccl}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; @@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { cp -r build/* $out/bin/ ''; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.bsd3; broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ]; + maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 950402315a..3fc533e848 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.21"; + version = "0.3.24"; outputs = [ "out" "dev" ]; @@ -149,18 +149,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs="; + sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; }; - patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [ - # https://github.com/xianyi/OpenBLAS/pull/3626 - (fetchpatch { - name = "openblas-0.3.21-fix-loong.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655"; - hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc"; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix index 4422a90883..14befd6d11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openspecfun"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openspecfun"; rev = "v${version}"; - sha256 = "sha256-fX2wc8LHUcF5nN/hiA60ZZ7emRTs0SznOm/0q6lD+Ko="; + sha256 = "sha256-4MPoRMtDTkdvDfhNXKk/80pZjXRNEPcysLNTb5ohxWk="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 8f0c930eff..5cbc235898 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -63,16 +63,16 @@ stdenv.mkDerivation rec { "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" - "-DPython3_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook pkg-config - python.pythonForBuild + python.pythonOnBuildForHost swig4 unzip - ] ++ (with python.pythonForBuild.pkgs; [ + ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf ]); diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix index 8ee048c281..a6bc5a0862 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.8"; + version = "0.108.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-Wyxeyn49QWzGvW6bMwCp39iLkB1eMQUEpIxUgpLcxgA="; + hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw="; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index 67dfef186e..dd2eb9478f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ] ; + env = lib.optionalAttrs stdenv.isDarwin { + # Ensure that there is enough space for the `fixDarwinDylibNames` hook to + # update the install names of the output dylibs. + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + buildFlags = [ # Build individual shared libraries, not demos "library" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix index 26dd00d960..f99e86ffe4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/superlu/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { "-DUSE_XSDK_DEFAULTS=true" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + patches = [ ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix index f515253026..dd28553d60 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -39,7 +39,7 @@ , dia , tetex ? null , ghostscript ? null -, texlive ? null +, texliveMedium ? null # generates python bindings , pythonSupport ? true @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # ncurses is a hidden dependency of waf when checking python buildInputs = lib.optionals pythonSupport [ castxml ncurses ] ++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ] - ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texlive.combined.scheme-medium ] + ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texliveMedium ] ++ [ libxml2 pythonEnv diff --git a/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix index 40c00dfea8..4d820c0e36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-S/8/I2wmWukpP+RGPxKbuO44wIExzeYZL49IO+KOqg4="; + hash = "sha256-AOqwC7CABvQsG9P1PnUg2DIhNmHqYpgbKzm9C2gWNIQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 09989fb7bd..95ba1dc68e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-x9xqcQQQS6hUcZaF8Ei8OmDXUP+y3prVyjlzwm4+4ko="; + hash = "sha256-pEFfs8xjc+6r+60aJF4Sjjy/oSU/+ADWgOBpS3t9rWI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix index be5db122d2..c3ecd3a986 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { extraPrefix = ""; sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0="; }) + (fetchpatch { + url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch"; + hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 873e107513..5ac49ac278 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-81CvuQduIV1R/FN7nbVIQQs79B/Cy1ylOldNXix1KMw="; + sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index 0ef61ca360..c66dfb3fdc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bMHPJVaxckB5KezyurJDLG+wXuFt0ZAm6QNp8lc2Nso="; + sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index 411622c26a..10e055d5ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -1,27 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, swig4 +, lua +, elastix +, itk +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; - rev = "refs/tags/v${version}"; - hash = "sha256-SJSFJEFu1qKowX5/98MslN7GFDS8aF5+EKkQ2983Azg="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JmZUlIdcCQ9yEqxoUwRaxvr/Q7xZm41QA3mtDtoSdyI="; }; - nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk ]; + nativeBuildInputs = [ + cmake + swig4 + ]; + buildInputs = [ + elastix + lua + itk + ]; # 2.0.0: linker error building examples - cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DSimpleITK_USE_ELASTIX=ON" + ]; meta = with lib; { homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; + changelog = "https://github.com/SimpleITK/SimpleITK/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; license = licenses.asl20; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix index f25ac14df8..099a3d838b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { pname = "smpeg"; @@ -16,8 +16,24 @@ stdenv.mkDerivation rec { ./gcc6.patch ./libx11.patch ./gtk.patch + # These patches remove use of the `register` storage class specifier, + # allowing smpeg to build with clang 16, which defaults to C++17. + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; + hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; + }) + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; + hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; + }) ]; + postPatch = '' + substituteInPlace video/gdith.cpp \ + --replace 'register int' 'int' \ + --replace 'register Uint16' 'Uint16' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index f2f9b6ec88..b9f34eeb97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.16"; + version = "1.13.17"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; + sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sol2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sol2/default.nix new file mode 100644 index 0000000000..5ec6159425 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/sol2/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, lib +, stdenv +, cmake +, lua +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sol2"; + version = "3.3.1"; + src = fetchFromGitHub { + owner = "ThePhD"; + repo = "sol2"; + rev = "v${finalAttrs.version}"; + hash = "sha256-7QHZRudxq3hdsfEAYKKJydc4rv6lyN6UIt/2Zmaejx8="; + }; + + nativeBuildInputs = [ cmake lua ]; + + cmakeFlags = [ + "-DSOL2_LUA_VERSION=${lua.version}" + "-DSOL2_BUILD_LUA=FALSE" + ]; + + meta = with lib;{ + description = "Lua API wrapper with advanced features and top notch performance"; + longDescription = '' + sol2 is a C++ library binding to Lua. + It currently supports all Lua versions 5.1+ (LuaJIT 2.0+ and MoonJIT included). + sol2 aims to be easy to use and easy to add to a project. + The library is header-only for easy integration with projects, and a single header can be used for drag-and-drop start up. + ''; + homepage = "https://github.com/ThePhD/sol2"; + license = licenses.mit; + maintainers = with maintainers; [ mrcjkb ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix index bcf6b804ed..c7b83db534 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , ncurses , python3 @@ -10,65 +9,70 @@ , libuuid , numactl , openssl -, fetchurl +, pkg-config +, zlib +, libpcap +, libnl +, libelf +, jansson +, ensureNewerSourcesForZipFilesHook }: -let - # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568 - dpdk' = dpdk.overrideAttrs (old: rec { - name = "dpdk-21.11"; - src = fetchurl { - url = "https://fast.dpdk.org/rel/${name}.tar.xz"; - sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; - }; - }); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spdk"; - version = "21.10"; + + version = "23.09"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-pFynTbbSF1g58VD9bOhe3c4oCozeqE+35kECTQwDBDM="; + sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; + fetchSubmodules = true; }; - patches = [ - # Backport of upstream patch for ncurses-6.3 support. - # Will be in next release after 21.10. - ./ncurses-6.3.patch - - # DPDK 21.11 compatibility. - (fetchpatch { - url = "https://github.com/spdk/spdk/commit/f72cab94dd35d7b45ec5a4f35967adf3184ca616.patch"; - sha256 = "sha256-sSetvyNjlM/hSOUsUO3/dmPzAliVcteNDvy34yM5d4A="; - }) - ]; - nativeBuildInputs = [ python3 + python3.pkgs.setuptools + pkg-config + ensureNewerSourcesForZipFilesHook ]; buildInputs = [ - cunit dpdk' libaio libbsd libuuid numactl openssl ncurses + cunit + dpdk + jansson + libaio + libbsd + libelf + libuuid + libpcap + libnl + numactl + openssl + ncurses + zlib + ]; + + patches = [ + # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 + ./setuptools.patch ]; postPatch = '' patchShebangs . - - # glibc-2.36 adds arc4random, so we don't need the custom implementation - # here anymore. Fixed upstream in https://github.com/spdk/spdk/commit/43a3984c6c8fde7201d6c8dfe1b680cb88237269, - # but the patch doesn't apply here. - sed -i -e '1i #define HAVE_ARC4RANDOM 1' lib/iscsi/iscsi.c ''; enableParallelBuilding = true; - configureFlags = [ "--with-dpdk=${dpdk'}" ]; + configureFlags = [ + "--with-dpdk=${dpdk}" + "--pydir=${placeholder "out"}/${python3.sitePackages}" + ]; env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling - NIX_LDFLAGS = "-lbsd"; + env.NIX_LDFLAGS = "-lbsd"; meta = with lib; { description = "Set of libraries for fast user-mode storage"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch b/third_party/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch deleted file mode 100644 index 174c9b6435..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/spdk/ncurses-6.3.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300 ---- a/app/spdk_top/spdk_top.c -+++ b/app/spdk_top/spdk_top.c -@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali -- mvwprintw(win, row, col, tmp_str); -+ mvwprintw(win, row, col, "%s", tmp_str); -@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64, -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d", -@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -2111 +2111 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time); -+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time); -@@ -2118 +2118 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time); -+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time); -@@ -2124 +2124 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2137 +2137 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2214 +2214 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s", -@@ -2216 +2216 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name); -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name); -@@ -2231 +2231 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period); -+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period); -@@ -2264 +2264 @@ print_bottom_error_message(char *msg) -- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg); -+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg); -@@ -2434 +2434 @@ show_stats(pthread_t *data_thread) -- mvprintw(g_max_row - 1, 1, current_page_str); -+ mvprintw(g_max_row - 1, 1, "%s", current_page_str); diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch b/third_party/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch new file mode 100644 index 0000000000..b3e7644c00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/spdk/setuptools.patch @@ -0,0 +1,25 @@ +From 3a72290ba7e2d71ca887225fc0eb8792ca863be2 Mon Sep 17 00:00:00 2001 +From: Jörg Thalheim +Date: Tue, 24 Oct 2023 14:30:53 +0200 +Subject: [PATCH] python: drop deprecated distutils + +This is scheduled for removal in python 3.12: https://docs.python.org/3/whatsnew/3.12.html + +Change-Id: I728dc0cf4ed20f22016d3d58cca8aee3af2bcd8b +Signed-off-by: Jörg Thalheim +--- + +diff --git a/python/setup.py b/python/setup.py +index 47e2104..ae4dff7 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -2,8 +2,7 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (C) 2023 Intel Corporation. All rights reserved. + +-from distutils.core import setup +-from setuptools import find_packages ++from setuptools import setup, find_packages + from spdk import __version__ + + diff --git a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix index 3b34ab9282..8bee16fef7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, alsa-lib, ncurses }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, alsa-lib +, CoreServices +, AudioUnit +, Cocoa +}: stdenv.mkDerivation rec { pname = "speech_tools"; @@ -9,7 +18,25 @@ stdenv.mkDerivation rec { sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; - buildInputs = [ alsa-lib ncurses ]; + patches = [ + # Fix build on Apple Silicon. Remove in the next release. + (fetchpatch { + url = "https://github.com/festvox/speech_tools/commit/06141f69d21bf507a9becb5405265dc362edb0df.patch"; + hash = "sha256-tRestCBuRhak+2ccsB6mvDxGm/TIYX4eZ3oppCOEP9s="; + }) + ]; + + buildInputs = [ + ncurses + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + AudioUnit + Cocoa + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; # Workaround build failure on -fno-common toolchains: # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of @@ -42,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text-to-speech engine"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.free; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix index 7cb99f0650..73de0a287c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }: +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, gtest, openmp }: stdenv.mkDerivation rec { pname = "spglib"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; }; - nativeBuildInputs = [ cmake gtest ]; + nativeBuildInputs = [ cmake gfortran gtest ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; + doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index 16a68ed67e..d160a6a5f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -36,6 +36,7 @@ , wayland-protocols , wayland-scanner , zlib +, wrapGAppsHook , withPolkit ? stdenv.isLinux }: @@ -88,18 +89,16 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala + wrapGAppsHook ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; - propagatedBuildInputs = [ + buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ]; - - buildInputs = [ cyrus_sasl libepoxy gtk3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index 44ad21d6a1..3e18424d6b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "sdk-${version}"; - hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index f51ce3a500..ec4cc458c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; + hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 31207ad9ed..6028c638a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; + hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix b/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix index 001123ead6..c1c5819ad4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libxcb xcbutil ]; meta = { - homepage = "http://www.freedesktop.org/software/startup-notification"; + homepage = "https://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; license = lib.licenses.lgpl2; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix index 845e815be5..e848b43309 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stfl/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix index 47a512b56a..9201265563 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.6.0"; + version = "6.6.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0="; + hash = "sha256-IfceSu+VsY+VTIu9yQtih3RDlQUz1ZXGgFGrdot2mEs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix index 6eaab96234..aa759ddbbb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taglib/default.nix @@ -3,16 +3,17 @@ , fetchFromGitHub , cmake , zlib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taglib"; version = "1.13.1"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; @@ -28,6 +29,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://taglib.org/"; description = "A library for reading and editing audio file metadata"; @@ -39,5 +42,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl3 mpl11 ]; maintainers = with maintainers; [ ttuegel ]; + pkgConfigModules = [ "taglib" "taglib_c" ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index ff6a334383..b6cc969b9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix index ef4d6603e8..6f65ded6f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "tboox"; repo = pname; rev = "v${version}"; - hash = "sha256-b461JNTS7jNI/qawumDjL2vfC4fAaWB7a++9PpUUDB0="; + hash = "sha256-VM6LOTVwM47caXYiH+6c7t174i0W5MY1dg2Y5yutlcc="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix index 7163f24815..4c6ec8e016 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tecla/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { --replace "stripprog=" "stripprog=\$STRIP # " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = { description = "Command-line editing library"; homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix b/third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix index f578ae000b..0a9004d01a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/text-engine/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , json-glib @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; }; + patches = [ + # Fixes build with newer versions of clang + (fetchpatch { + url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; + hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; buildInputs = [ libadwaita json-glib libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix index 0e67ce8ade..c12178d833 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ti-rpc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=0fb94eef5062d2657d75eee686fa47238fafa312;sf=tgz"; - sha256 = "sha256-3P3xYKeAmLbBI4TdsG1VZBO7py9ktiwhXNtGsnryGNI="; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; + sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw="; name = "${pname}-${version}.tar.gz"; }; @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; + strictDeps = true; preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + enableParallelBuilding = true; + preInstall = '' mkdir -p $out/etc ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 21c63f7122..ea41b8156f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p build/externals/src/ep_catch ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include + + sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix index 63e7106439..2d9cb53e79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinycdb/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sed -i 's,set --, set -x; set --,' Makefile ''; pname = "tinycdb"; - version = "0.78"; + version = "0.80"; # In general, static library (.a) goes to "dev", shared (.so) to # "lib". In case of static build, there is no .so library, so "lib" # output is useless and empty. @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz"; - sha256 = "0g6n1rr3lvyqc85g6z44lw9ih58f2k1i3v18yxlqvnla5m1qyrsh"; + sha256 = "sha256-wyG5BekCwsqZo/+Kjd39iCMkf+Ht7IpLuF+Dhpxjn7g="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix b/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix index d28447c400..696e41ac71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/toml-f/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8FbnUkeJUP4fiuJCroAVDo6U2M7ZkFLpG2OYrapMYtU="; + hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix index a865f88f70..dda352d076 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix @@ -6,24 +6,24 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tomlplusplus"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "marzer"; - repo = pname; - rev = "v${version}"; - hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; + repo = "tomlplusplus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; nativeBuildInputs = [ meson cmake ninja ]; - meta = with lib;{ + 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 = with platforms; unix; + platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index dc849677a5..f6c49b9cfb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk="; + hash = "sha256-drjVB3EOiX6FPsN/Ju906XqVU3CLYLjEE0lF+bgWU8s="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index ce54681799..c8c220927f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -10,7 +10,7 @@ , asciidoc , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , python3 , gi-docgen @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { wrapGAppsNoGuiHook gi-docgen graphviz - (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gobject-introspection vala diff --git a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index ff43ef249e..9df3196ee1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-oCDsvpH9P5onME/t+o7VGttk1cHUpneODz21/0RkVkk="; + sha256 = "sha256-x/Chzho6RTfyOb/Is7bAM8KrvipEqQ/+a6pVCuTG108="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix index e26e6e603f..a92c6bea37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; }; + outputs = [ "out" "dev" ]; + enableParallelBuilding = true; postPatch = '' @@ -42,6 +44,12 @@ stdenv.mkDerivation rec { ++ lib.optional enableAvx "--with-avx" ++ lib.optional enableCuda "--with-cuda=${cudatoolkit}"; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput bin/ucc_info $dev + ''; + meta = with lib; { description = "Collective communication operations API"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index a6dfb9f85c..627cac56bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -3,8 +3,8 @@ , config , enableCuda ? config.cudaSupport , cudatoolkit -, enableRocm ? false -, rocm-core, rocm-runtime, rocm-device-libs, hip +, enableRocm ? config.rocmSupport +, rocmPackages }: let @@ -13,9 +13,12 @@ let inherit (cudatoolkit) name meta; paths = [ cudatoolkit cudatoolkit.lib ]; }; + + rocmList = with rocmPackages; [ rocm-core rocm-runtime rocm-device-libs clr ]; + rocm = symlinkJoin { name = "rocm"; - paths = [ rocm-core rocm-runtime rocm-device-libs hip ]; + paths = rocmList; }; in @@ -30,6 +33,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; }; + outputs = [ "out" "doc" "dev" ]; + nativeBuildInputs = [ autoreconfHook doxygen pkg-config ]; buildInputs = [ @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { rdma-core zlib ] ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ]; + ++ lib.optionals enableRocm rocmList; configureFlags = [ "--with-rdmacm=${lib.getDev rdma-core}" @@ -51,6 +56,14 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}" ++ lib.optional enableRocm "--with-rocm=${rocm}"; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput bin/ucx_info $dev + + moveToOutput share/ucx/examples $doc + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix index 1eae1782b7..aa25f9f2df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/updfparser/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "updfparser"; - version = "unstable-2023-01-10"; - rev = "a421098092ba600fb1686a7df8fc58cd67429f59"; + version = "unstable-2023-08-08"; + rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115"; src = fetchzip { url = "https://indefero.soutade.fr/p/updfparser/source/download/${rev}/"; - sha256 = "sha256-Kt1QDj7E0GaT615kJW2MQKF9BeU5U7/95TQKODpxgNI="; + hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/clang-fix-build.patch new file mode 100644 index 0000000000..eb136e8be3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/clang-fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c +index 57bcdaa..70cf8b7 100755 +--- a/usrsctplib/netinet/sctp_cc_functions.c ++++ b/usrsctplib/netinet/sctp_cc_functions.c +@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + #if defined(__FreeBSD__) && !defined(__Userspace__) + int old_cwnd; + #endif +- uint32_t t_ssthresh, t_cwnd, incr; ++ uint32_t t_ssthresh, incr; + uint64_t t_ucwnd_sbw; + uint64_t t_path_mptcp; + uint64_t mptcp_like_alpha; +@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + + /* MT FIXME: Don't compute this over and over again */ + t_ssthresh = 0; +- t_cwnd = 0; + t_ucwnd_sbw = 0; + t_path_mptcp = 0; + mptcp_like_alpha = 1; +@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + max_path = 0; + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + t_ssthresh += net->ssthresh; +- t_cwnd += net->cwnd; + /* lastsa>>3; we don't need to devide ...*/ + srtt = net->lastsa; + if (srtt > 0) { +diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c +index 3bce9e9..42ce111 100755 +--- a/usrsctplib/netinet/sctp_indata.c ++++ b/usrsctplib/netinet/sctp_indata.c +@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + struct sctp_tmit_chunk *tp1; + int strike_flag = 0; + struct timeval now; +- int tot_retrans = 0; + uint32_t sending_seq; + struct sctp_nets *net; + int num_dests_sacked = 0; +@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + } + + tp1->rec.data.doing_fast_retransmit = 1; +- tot_retrans++; + /* mark the sending seq for possible subsequent FR's */ + /* + * SCTP_PRINTF("Marking TSN for FR new value %x\n", +diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c +index 6a7dff9..a914b3b 100755 +--- a/usrsctplib/netinet/sctp_output.c ++++ b/usrsctplib/netinet/sctp_output.c +@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + struct mbuf *m, *endofchain; + struct sctp_nets *net = NULL; + uint32_t tsns_sent = 0; +- int no_fragmentflg, bundle_at, cnt_thru; ++ int no_fragmentflg, bundle_at; + unsigned int mtu; + int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; + struct sctp_auth_chunk *auth = NULL; +@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + } + } + one_chunk = 0; +- cnt_thru = 0; + /* do we have control chunks to retransmit? */ + if (m != NULL) { + /* Start a timer no matter if we succeed or fail */ +@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ + + /* For auto-close */ +- cnt_thru++; + if (*now_filled == 0) { + (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); + *now = asoc->time_last_sent; +@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, + struct epoch_tracker et; + #endif + ssize_t sndlen = 0, max_len, local_add_more; +- int error, len; ++ int error; + struct mbuf *top = NULL; + int queue_only = 0, queue_only_for_init = 0; + int free_cnt_applied = 0; +@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, + */ + local_add_more = sndlen; + } +- len = 0; + if (non_blocking) { + goto skip_preblock; + } +@@ -14265,7 +14262,6 @@ skip_preblock: + } + sctp_snd_sb_alloc(stcb, sndout); + atomic_add_int(&sp->length, sndout); +- len += sndout; + if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { + sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; + } +diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c +index 89a66bc..a952921 100755 +--- a/usrsctplib/netinet/sctp_pcb.c ++++ b/usrsctplib/netinet/sctp_pcb.c +@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) + } + + void +-sctp_drain() ++sctp_drain(void) + { + /* + * We must walk the PCB lists for ALL associations here. The system +diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c +index bb49e17..8b77f7e 100755 +--- a/usrsctplib/netinet/sctp_sysctl.c ++++ b/usrsctplib/netinet/sctp_sysctl.c +@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); + */ + + void +-sctp_init_sysctls() ++sctp_init_sysctls(void) + { + SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; + SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; +diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c +index 513a5a9..89e9eb2 100755 +--- a/usrsctplib/user_socket.c ++++ b/usrsctplib/user_socket.c +@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip *ip; + struct udphdr *udp; + struct sockaddr_in dst; +@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + +@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip6_hdr *ip6; + struct udphdr *udp; + struct sockaddr_in6 dst; +@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip6_hdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + if (m != NULL) { diff --git a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix index af8979c79d..9723f887b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/usrsctp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; + patches = [ + # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype + # errors. These issues are fixed in the master branch, but a new release with them has not + # been made. The following patch can be dropped once a release has been made. + ./clang-fix-build.patch + ]; + nativeBuildInputs = [ cmake ]; # https://github.com/sctplab/usrsctp/issues/662 diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index f9a6bdd700..7bdb974747 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU="; + sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 652833a393..242294462e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "64"; + version = "65"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-EdIe0hWsx0W9+03O0Avk4DV2jKv8s4wGAKk0NxIAuTU="; + sha256 = "sha256-HrTXhRoKSFeLXYQM7W2FvYf7yCD1diSZGtPop9urrSk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/vc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vc/default.nix index 559ef8d207..02b202365b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU="; + sha256 = "sha256-tbHDGbul68blBAvok17oz7AfhHpEY9Y7RIEsqCQvOJ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix index 8b86df2e1c..e7e818cbea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; + homepage = "https://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 42ce297d45..f64de57fcb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 , libGLU, libepoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.10.4"; + version = "1.0.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; + hash = "sha256-KMGPP2MeuATHFXKr5oW9HuFOMmmYpmkVLvMvQi0cEdg="; }; separateDebugInfo = true; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; - - dontUseCmakeConfigure = true; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; meta = with lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix index bf1d1ae7c1..02309b275b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -1,7 +1,7 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch -, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv +, enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -11,11 +11,12 @@ let inherit (lib) optionalString optionals optional; + version = "${majorVersion}.${minorVersion}"; pythonMajor = lib.substring 0 1 python.pythonVersion; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "vtk${optionalString enableQt "-qvtk"}"; - version = "${majorVersion}.${minorVersion}"; + inherit version; src = fetchurl { url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz"; @@ -25,9 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng libtiff ] - ++ optionals enableQt (if lib.versionOlder majorVersion "9" - then [ qtbase qtx11extras qttools ] - else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) + ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] ++ optionals stdenv.isLinux [ libGLU xorgproto @@ -66,8 +65,8 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1" + "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" + "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] ++ [ @@ -76,9 +75,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_BINDIR=bin" "-DVTK_VERSIONED_INSTALL=OFF" ] ++ optionals enableQt [ - "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" - ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ - "-DVTK_QT_VERSION=5" + "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ @@ -86,6 +83,10 @@ in stdenv.mkDerivation rec { "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + postPatch = optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c @@ -105,7 +106,5 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; platforms = with platforms; unix; - # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope - broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8"); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 48e036ad03..f6c9dcb953 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.261"; + version = "1.3.268.0"; nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; - hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; }; passthru.updateScript = ./update.sh; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh index 7f6292ed23..da4e42ded8 100755 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh @@ -3,7 +3,7 @@ set -euf -o pipefail -V_PACKAGES=( +SDK_PACKAGES=( "vulkan-headers" "vulkan-loader" "vulkan-validation-layers" @@ -11,9 +11,6 @@ V_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" -) - -SDK_PACKAGES=( "spirv-headers" "spirv-cross" "spirv-tools" @@ -21,10 +18,6 @@ SDK_PACKAGES=( nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit -for P in "${V_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:v)(.*)" --commit -done - for P in "${SDK_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit + nix-update "$P" --version-regex "(?:vulkan-sdk-)(.*)" --commit done diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 6e994eaa78..163cea7565 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "v${version}"; - hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index 42295a67d4..b9c5e8ad45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,8 +5,8 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 54e7afb3e5..c79f599f5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.261"; + version = "1.3.270"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + hash = "sha256-P1v5UEAooTDGA10K4uck8lhcrbW2ccl44gWIGVnZ6uo="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix index 098dc64cf1..48b075add0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix @@ -1,23 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, libtiff +, expat +, zlib +, libpng +, libjpeg +}: + +stdenv.mkDerivation (finalAttrs: { pname = "vxl"; version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ libtiff expat zlib libpng libjpeg ]; + nativeBuildInputs = [ + cmake + unzip + ]; + buildInputs = [ + libtiff + expat + zlib + libpng + libjpeg + ]; + + # test failure on aarch64-linux; unknown reason: + cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; + + doCheck = true; meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "https://vxl.sourceforge.net/"; - license = "VXL License"; - maintainers = with lib.maintainers; [viric]; + homepage = "https://vxl.sourceforge.net"; + # license appears contradictory; see https://github.com/vxl/vxl/issues/752 + # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) + license = [ lib.licenses.unfree ]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix index e2a90d2e28..b24c826279 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "sha256-dwDNMLgZrILb559yGs4sNA7D+nD60972+JOy0PKfL0w="; + sha256 = "sha256-GVULv/TkCS9CgSFWlskIamw5Z402n684G6jeTLMCPNc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix index 0dce309ef5..4c49788464 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "19"; + version = "20"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; + hash = "sha256-H92PDrH1FL7S3eMCK1+wqclryjhwghl21bOlRCAr1U4="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 1db2f4ce6d..8192dded7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.1"; + version = "2.42.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk="; + hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index 2c1e15bfbe..ad2b12de89 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitLab +{ lib +, stdenv +, fetchFromGitLab , darwin , abseil-cpp , meson @@ -18,6 +20,8 @@ stdenv.mkDerivation rec { hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ meson ninja @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { abseil-cpp ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix index 9555b9faea..1543484868 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wfa2-lib"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; rev = "v${version}"; - hash = "sha256-PLZhxKMBhKm6E/ENFZ/yWMWIwJG5voaJls2in44OGoQ="; + hash = "sha256-h4e+f+JkQr3qqaBUDly24ZvKxaEGzeJtMXejh8aD5D0="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Wavefront alignment algorithm library v2"; homepage = "https://github.com/smarco/WFA2-lib"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 4c60ccf6c8..d435712474 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -1,41 +1,77 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , Security , autoreconfHook , util-linux , openssl +, cacert +# The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, +# requiring to build a special variant for that software. Example: 'haproxy' +, variant ? "all" +, extraConfigureFlags ? [] +, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang) }: - -stdenv.mkDerivation rec { - pname = "wolfssl"; - version = "5.6.3"; +stdenv.mkDerivation (finalAttrs: { + pname = "wolfssl-${variant}"; + version = "5.6.4"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "refs/tags/v${version}-stable"; - hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; + rev = "refs/tags/v${finalAttrs.version}-stable"; + hash = "sha256-a9a3ca4Zb/XTS5YfPJwnXPYbDjmgD8qylhPQg5pjzJM="; }; + patches = [ + (fetchpatch { + name = "fix-expected-test-response.patch"; + url = "https://github.com/wolfSSL/wolfssl/commit/ca694938fd053a8557f9f08b1b4265292d8bef65.patch"; + hash = "sha256-ETxszjjEMk0WdYgXHWTxTaWZPpyDs9jdko0jtkjzgwI="; + }) + ]; + postPatch = '' patchShebangs ./scripts - # ocsp tests require network access - sed -i -e '/ocsp\.test/d' -e '/ocsp-stapling\.test/d' scripts/include.am + # ocsp stapling tests require network access, so skip them + sed -i -e'2s/.*/exit 77/' scripts/ocsp-stapling.test # ensure test detects musl-based systems too substituteInPlace scripts/ocsp-stapling2.test \ --replace '"linux-gnu"' '"linux-"' ''; - # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed configureFlags = [ - "--enable-all" - "--enable-base64encode" + "--enable-${variant}" + "--enable-reproducible-build" + ] ++ lib.optionals (variant == "all") [ + # Extra feature flags to add while building the 'all' variant. + # Since they conflict while building other variants, only specify them for this one. "--enable-pkcs11" "--enable-writedup" - "--enable-reproducible-build" - "--enable-tls13" - ]; + "--enable-base64encode" + ] ++ [ + # We're not on tiny embedded machines. + # Increase TLS session cache from 33 sessions to 20k. + "--enable-bigcache" + + # Use WolfSSL's Single Precision Math with timing-resistant cryptography. + "--enable-sp=yes${lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"}" + "--enable-sp-math-all" + "--enable-harden" + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ + # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. + "--enable-intelasm" + "--enable-aesni" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + # No runtime detection under ARM and no platform function checks like for X86. + # However, all ARM macOS systems have the supported extensions autodetected in the configure script. + "--enable-armasm=inline" + ] ++ extraConfigureFlags; + + # LTO should help with the C implementations. + env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; outputs = [ "dev" @@ -57,22 +93,23 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ openssl + cacert ]; postInstall = '' - # fix recursive cycle: - # wolfssl-config points to dev, dev propagates bin - moveToOutput bin/wolfssl-config "$dev" - # moveToOutput also removes "$out" so recreate it - mkdir -p "$out" + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" ''; meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; - changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab vifino ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh b/third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh index c3ad173b09..ca5157c6d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/wtk/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 7b018c89f5..5e9b9f2fcb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , cairo +, expat , ffmpeg , libexif , pango @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + expat ffmpeg libexif pango diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index 5dc9829b1a..f058ac7ed0 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.4"; + version = "4.9.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U="; + hash = "sha256-ah9EFj15cP9soVJATVJk4XGYItxcrt4HB6ZTfpsVhS8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 45de5b603b..91a0b00670 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.2.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA="; + hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index 2fb4f995fe..7e62812df8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -26,26 +26,6 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; isCross = stdenv.buildPlatform != stdenv.hostPlatform; - - cmakeCommonFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; - - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ]; - in stdenv.mkDerivation rec { @@ -96,32 +76,54 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + cmakeFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; + + preConfigure = lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"} + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_/source/build) - preBuild = lib.optionalString (multibitdepthSupport) '' - cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + preBuild = lib.optionalString multibitdepthSupport '' make -C ../build-10bits -j $NIX_BUILD_CORES - cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON make -C ../build-12bits -j $NIX_BUILD_CORES ln -s ../build-10bits/libx265.a ./libx265-10.a ln -s ../build-12bits/libx265.a ./libx265-12.a ''; - cmakeFlags = cmakeCommonFlags ++ [ - "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=ON" - (mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM") - (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ] ++ lib.optionals (multibitdepthSupport) [ - "-DEXTRA_LIB=x265-10.a;x265-12.a" - "-DEXTRA_LINK_FLAGS=-L." - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" - ]; - doCheck = unittestsSupport; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index c70b5e1957..73c3b1b571 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -28,8 +28,6 @@ let doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; - # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +44,7 @@ let homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; }; @@ -54,5 +52,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; + xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/third_party/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch deleted file mode 100644 index d763a2a2b4..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc ---- xapian-core.old/tests/api_db.cc -+++ xapian-core.new/tests/api_db.cc -@@ -1020,6 +1020,7 @@ - - // test for keepalives - DEFINE_TESTCASE(keepalive1, remote) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); - - /* Test that keep-alives work */ -diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc ---- xapian-core.old/tests/api_scalability.cc -+++ xapian-core.new/tests/api_scalability.cc -@@ -53,6 +53,7 @@ - } - - DEFINE_TESTCASE(bigoaddvalue1, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - // O(n*n) is bad, but O(n*log(n)) is acceptable. - test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); - return true; -diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc ---- xapian-core.old/tests/api_serialise.cc -+++ xapian-core.new/tests/api_serialise.cc -@@ -110,6 +110,7 @@ - - // Test for serialising a document obtained from a database. - DEFINE_TESTCASE(serialise_document2, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Document origdoc; - origdoc.add_term("foo", 2); - origdoc.add_posting("foo", 10); diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index f5ae2ecfaa..cba74b977d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; + hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix index bde2dfefee..8940ec270f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix @@ -13,13 +13,13 @@ clangStdenv.mkDerivation rec { pname = "xeus-zmq"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = "xeus-zmq"; rev = "${version}"; - hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + hash = "sha256-sfGXo6CPJu5TJrkecLLoaQxrGaJbeQG+QiCkltAwuI8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix index d060986515..172fd0e735 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xeus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xeus"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-bSZ5ImgFztiNYGrn513LLm4OtO1hYGak3xAsBN224g8="; + sha256 = "sha256-kGIVcsgLG6weNfBwgEVTMa8NA9MXSztzi9ML5/gDqAQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 49d042886b..2a44ffc443 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-HKITioCvBZHZWKFWwe9KbrFP+Nbz8adbZJvQiqApjUQ="; + hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; }; nativeBuildInputs = [ cmake ] @@ -144,7 +144,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ abbradar nviets ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix index c9468b10b9..20d546e346 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,36 +3,19 @@ , fetchFromGitHub , gitUpdater , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "yaml-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + rev = version; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; }; - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - name = "yaml-cpp-Fix-generated-cmake-config.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -47,9 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { - rev-prefix = "yaml-cpp-"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A YAML parser and emitter for C++"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix index 4af4ba65a3..2d83211ac0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-mZc8DC26c4hZzHsozhBmuvaIjL3ifQ7GYYGDEsBBPKc="; + hash = "sha256-wmbnkxJHFyqntULxzXF16lt+TfwywLdZamQXvcfSFVM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index 9fa429f9a4..6a0e173db3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -11,25 +10,15 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; + sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - patches = [ - # Backport gcc-13 fix: - # https://github.com/zeromq/libzmq/pull/4480 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; - hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; - }) - ]; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; - license = licenses.lgpl3Plus; + license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 3f2ba22ea4..2d3ba583cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-DC4KPPaMuqML0HEhWJmWjyox4WEbExPDfNnpnWzoaHc="; + hash = "sha256-okNmobCVAC9y7tjZqFd0DBhOjs3WWRPK8jvK1j9G29k="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix index 9c4302433f..ce539d9eb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - hash = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg=="; + hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA=="; }; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix index 9cd78b7b56..1c01063869 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (python3.pkgs) zxing_cpp; + inherit (python3.pkgs) zxing-cpp; }; updateScript = gitUpdater { rev-prefix = "v"; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix index 42afb6d270..31a53b0f94 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/examples/bordeaux-threads.nix @@ -33,7 +33,7 @@ let pname = "bordeaux-threads"; version = "0.8.8"; src = pkgs.fetchzip { - url = "http://github.com/sionescu/bordeaux-threads/archive/v0.8.8.tar.gz"; + url = "https://github.com/sionescu/bordeaux-threads/archive/v0.8.8.tar.gz"; sha256 = "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6"; }; lisp = sbcl; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix index 590a1ea779..b0847ebebe 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/packages.nix @@ -329,23 +329,28 @@ let lispLibs = with self; [ bordeaux-threads closer-mop serapeum ]; }; - nkeymaps = build-asdf-system { + nkeymaps = build-asdf-system rec { pname = "nkeymaps"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/nhooks/2023-02-14/nkeymaps-20230214-git.tgz"; - sha256 = "197vxqby87vnpgcwchs3dqihk1gimp2cx9cc201pkdzvnbrixji6"; + version = "1.1.0"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "nkeymaps"; + rev = version; + hash = "sha256-ewMu2IgEzCYY72vG91IA7l8X78Ph6jpQvbKeOFZdAyM="; }; - lispLibs = with self; [ alexandria fset trivial-package-local-nicknames ]; + lispLibs = with self; [ alexandria fset trivial-package-local-nicknames + str ]; }; - history-tree = build-asdf-system { + history-tree = build-asdf-system rec { pname = "history-tree"; - version = "20230214-git"; - src = pkgs.fetchzip { - url = "http://beta.quicklisp.org/archive/history-tree/2023-02-14/history-tree-20230214-git.tgz"; - sha256 = "12kvnc8vcvg7nmgl5iqgbr4pj0vgb8f8avk9l5czz7f2hj91ysdp"; + version = "0.1.1"; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "history-tree"; + rev = version; + hash = "sha256-lOORalyTybdut/If+dBXS4PlZt2AnZrEI/qjQWS03pk="; }; lispLibs = with self; [ alexandria @@ -359,7 +364,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.7.0"; + version = "3.9.0"; lispLibs = (with super; [ alexandria @@ -449,8 +454,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.7.0"; - sha256 = "sha256-viiyO4fX3uyGuvojQ1rYYKBldRdVNzeJX1KYlYwfWVU="; + rev = "3.9.0"; + sha256 = "sha256-bZoAE0FErgXPylOzh6AfMq3befms9dHms8+slbYdctk="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix b/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix new file mode 100644 index 0000000000..8f4ed9799c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/aliases.nix @@ -0,0 +1,44 @@ + +lib: self: super: + +### Deprecated aliases - for backward compatibility +### +### !!! NOTE !!! +### Use `./remove-attr.py [attrname]` in this directory to remove your alias +### from the `luaPackages` set without regenerating the entire file. + +with self; + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = alias: with lib; + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] + else alias; + + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + # Make sure that we are not shadowing something from node-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in generated.nix" + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; +in + +mapAliases { + lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 +} 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 383ab0f665..fcde2f41dd 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -5,10 +5,10 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { -alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: +alt-getopt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; @@ -22,12 +22,13 @@ buildLuarocksPackage { "date": "2017-01-06T13:50:55+03:00", "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "hash": "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -40,23 +41,18 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ luaOlder, buildLuarocksPackage, luaAtLeast, lua, fetchgit }: +argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "argparse"; - version = "scm-2"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/luarocks/argparse.git", - "rev": "27967d7b52295ea7885671af734332038c132837", - "date": "2020-07-08T11:17:50+10:00", - "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", - "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "0.7.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; + sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; + }).outPath; + src = fetchzip { + url = "https://github.com/luarocks/argparse/archive/0.7.1.zip"; + sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -68,15 +64,17 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +basexx = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "basexx"; - version = "scm-0"; - rockspecDir = "dist"; - + version = "0.4.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = "https://github.com/aiq/basexx/archive/master.tar.gz"; - sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; disabled = (luaOlder "5.1"); @@ -89,11 +87,14 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +binaryheap = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; - + knownRockspec = (fetchurl { + url = "mirror://luarocks/binaryheap-0.4-1.rockspec"; + sha256 = "1ah37lhskmrb26by5ygs7jblx7qnf6mphgw8kwhw0yacvmkcbql4"; + }).outPath; src = fetchurl { url = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz"; sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; @@ -110,7 +111,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +bit32 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -124,12 +125,13 @@ buildLuarocksPackage { "date": "2015-02-17T10:44:04+01:00", "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "hash": "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -142,26 +144,27 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, luafilesystem, luasystem, fetchgit, luaOlder, lua-term, say, mediator_lua, penlight, luassert, lua_cliargs, lua, dkjson }: +busted = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, lua, lua-term, luaOlder, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; - version = "2.1.1-1"; + version = "2.1.2-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.1.1-1.rockspec"; - sha256 = "0f9iz3pa2gmb2vccvygp6zdiji7l8bap0vlgqgrcg331qsrkf70h"; + url = "mirror://luarocks/busted-2.1.2-3.rockspec"; + sha256 = "0ll8jzbpp6a9zdbbjglmq30jmx2zvr0rs83jgsjxmlfzzylkry8p"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/busted.git", - "rev": "e3ed48759b625f2e37bf02ccc057b2b98108f108", - "date": "2022-08-24T17:34:58+03:00", - "path": "/nix/store/7g9rxkyhabgx0acwmzl4r4xfh193avpw-busted", - "sha256": "0nab0s5lhk0nhh58c4jspv5sj4g7839gb5q145hrlgbsxqncp8wy", + "rev": "673cb6bad2ee3876d45e004fcac1c2f8a816344f", + "date": "2023-03-20T10:00:33+01:00", + "path": "/nix/store/k7xnpg0s36gxk5mb59wx1dj8ikiz92ja-busted", + "sha256": "1wsiiiw26yqglqkkailksinzcb9gaffcldrcfhga3zawf2518h8y", + "hash": "sha256-HkEUinBc/aEedCw3ypxTLy32bdSTRjUnpg97I3iMUfM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; @@ -173,7 +176,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, fetchgit, penlight, luaOlder, lua }: +cassowary = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -187,12 +190,13 @@ buildLuarocksPackage { "date": "2022-04-22T11:23:46+03:00", "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", + "hash": "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -205,7 +209,7 @@ buildLuarocksPackage { }; }) {}; -cldr = callPackage({ penlight, luaOlder, lua, fetchgit, buildLuarocksPackage }: +cldr = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -219,12 +223,13 @@ buildLuarocksPackage { "date": "2022-12-06T12:36:06+03:00", "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", + "hash": "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -237,7 +242,7 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ lua, luaAtLeast, fetchzip, luaOlder, buildLuarocksPackage }: +compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; @@ -261,7 +266,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, fetchgit, lpeg }: +cosmo = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -275,12 +280,13 @@ buildLuarocksPackage { "date": "2016-06-17T05:39:58-07:00", "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "hash": "sha256-V3hcEB/PpJFFrx35vE7HO55rUM8GigZOOue0/jR/ZQ0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ lpeg ]; @@ -292,7 +298,7 @@ buildLuarocksPackage { }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, fetchgit }: +coxpcall = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -306,12 +312,13 @@ buildLuarocksPackage { "date": "2018-02-26T19:53:11-03:00", "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "hash": "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -321,7 +328,7 @@ buildLuarocksPackage { }; }) {}; -cqueues = callPackage({ fetchurl, buildLuarocksPackage, lua }: +cqueues = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; @@ -345,7 +352,7 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, tl, fetchgit, luafilesystem }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, luafilesystem, tl }: buildLuarocksPackage { pname = "cyan"; version = "0.3.0-1"; @@ -359,12 +366,13 @@ buildLuarocksPackage { "date": "2023-02-19T18:58:20-06:00", "path": "/nix/store/smpj81z2a2blb3qfpjwx9n52d50rp39w-cyan", "sha256": "0pskargvjn2phgz481b08ndhp3z23s7lqfs8qlwailr7a4f2fc7h", + "hash": "sha256-8DAnHFEn06g4xUg7TI8e4o8Lm0VgBUT+g1dYuV9WU18=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -375,51 +383,24 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: -buildLuarocksPackage { - pname = "cyrussasl"; - version = "1.1.0-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/JorjBauer/lua-cyrussasl", - "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", - "date": "2015-08-21T18:24:54-04:00", - "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", - "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; - description = "Cyrus SASL library for Lua 5.1+"; - license.fullName = "BSD"; - }; -}) {}; - -digestif = callPackage({ luafilesystem, fetchgit, lpeg, lua, buildLuarocksPackage, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "8f8448fa3f27611b32fe6398fe22ef24b8602ec9", - "date": "2023-02-24T22:38:11+01:00", - "path": "/nix/store/s7wxqcj3k8pgb3m86d8rs2ggpl63jxwn-digestif", - "sha256": "0k3srmilrz3ajj76kklksmifkgqrm0y7gr25h0vrrldrf1xp4pk0", + "rev": "c0199f9cd86021c0a89662002d7a3411d12fb168", + "date": "2023-03-10T15:04:26+01:00", + "path": "/nix/store/3s849fwc80lf7pvgsiavqmvc5538cwwd-digestif", + "sha256": "0xccrrfwvcj03nnrzs3iwig7y2ahl706h413hkywcplyd5407dv9", + "hash": "sha256-abcDSGmeXsb9hCMQaMChUAl/XuRx6J+tHUCyzV3OjHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lpeg lua luafilesystem ]; @@ -431,7 +412,7 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, lua, luaAtLeast, luaOlder, fetchurl }: +dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; @@ -454,17 +435,17 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +fennel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.3.0-1.rockspec"; - sha256 = "1by78423n8k8i5sz7ji6w5igm8jkmyvd5x1y519hzmknphjqa263"; + url = "mirror://luarocks/fennel-1.3.1-1.rockspec"; + sha256 = "1dsavrsvngwx8vf1l2sj44arvip3bqkhsfh2sdkwa6r9mnw9zx87"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.3.0.tar.gz"; - sha256 = "0m754c74pj10c1qmc4zl89ifjiqcwafn8qagzfpfmcqv6r46pr23"; + url = "https://fennel-lang.org/downloads/fennel-1.3.1.tar.gz"; + sha256 = "1c7iwyc9f3a9k34fjq77zjk0minl3bl3f7wqlj8i1n2x7598nzgx"; }; disabled = (luaOlder "5.1"); @@ -478,7 +459,7 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: +fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; @@ -500,7 +481,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ lua, luaepnf, fetchgit, cldr, buildLuarocksPackage, penlight, luaOlder }: +fluent = callPackage({ buildLuarocksPackage, cldr, fetchgit, fetchurl, lua, luaOlder, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -514,12 +495,13 @@ buildLuarocksPackage { "date": "2022-04-16T23:08:20+03:00", "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", + "hash": "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ cldr lua luaepnf penlight ]; @@ -532,23 +514,24 @@ buildLuarocksPackage { }; }) {}; -gitsigns-nvim = callPackage({ lua, fetchgit, buildLuarocksPackage }: +gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "f388995990aba04cfdc7c3ab870c33e280601109", - "date": "2023-02-16T11:22:47+00:00", - "path": "/nix/store/i4acpc5h3sv909gyppm1qv2vqjq84xs1-gitsigns.nvim", - "sha256": "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx", + "rev": "ff01d34daaed72f271a8ffa088a7e839a60c640f", + "date": "2023-10-06T09:04:46+01:00", + "path": "/nix/store/2m4fyzkkg6bdbfb4kpjrqgbawvs3khqg-gitsigns.nvim", + "sha256": "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17", + "hash": "sha256-J9j2OeoEvhl1V8Pzr7i/usVZ2LGI4emlpRGDX+uznjI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; @@ -560,17 +543,17 @@ buildLuarocksPackage { }; }) {}; -haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "2.3.0-1"; + version = "2.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-2.3.0-1.rockspec"; - sha256 = "0jcmb0hzyhq14b2xcwdhwr9a9wbmfaw27vzfzkv52is24mwfr0p0"; + url = "mirror://luarocks/haskell-tools.nvim-2.4.0-1.rockspec"; + sha256 = "1sapapkz3ay9yrljmc1lwxjglv27f1zbh6m014r2z59px4ir61dz"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.3.0.zip"; - sha256 = "0lg8g2j9fbikgmhimvz9d0yb63csn85racc09qyszba2kviipr24"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.4.0.zip"; + sha256 = "054vfqsccq1qmqmglnppi2n7ksckldx8b5p62y35y0cbcdyh7wz3"; }; disabled = (luaOlder "5.1"); @@ -583,7 +566,7 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: +http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, lua, luaOlder, luaossl }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -607,7 +590,7 @@ buildLuarocksPackage { }; }) {}; -inspect = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -630,7 +613,7 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit }: +jsregexp = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "jsregexp"; version = "0.0.6-1"; @@ -644,12 +627,13 @@ buildLuarocksPackage { "date": "2023-02-12T14:19:03+01:00", "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", + "hash": "sha256-NSHsqyJEBgNS77e8OLwUKbD33dfirBnvEpZQKVyx8FA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -661,7 +645,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ luaOlder, fetchgit, lua, luaAtLeast, buildLuarocksPackage }: +ldbus = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -675,12 +659,13 @@ buildLuarocksPackage { "date": "2021-11-10T23:58:54+11:00", "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus", "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j", + "hash": "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -692,34 +677,35 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ fetchgit, buildLuarocksPackage, markdown, penlight }: +ldoc = callPackage({ buildLuarocksPackage, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; - version = "scm-3"; + version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "01d648f4ad50c3d14f2acadee6acb26beda56990", - "date": "2022-11-18T00:01:45+01:00", - "path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc", - "sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm", + "url": "https://github.com/lunarmodules/ldoc.git", + "rev": "e4940daf748affb86489b0782ed8abab2e88bebc", + "date": "2023-05-13T08:12:31+03:00", + "path": "/nix/store/sqhilwlh0glw1dxcx6w98wjkp65amvil-ldoc", + "sha256": "0an92jxvhbw2lvg269x6z3874x3wqmbmx52j4gsgxf9ldpizssgd", + "hash": "sha256-7Wn94200uf70I1KUXlfFfHRy0PimJyPepoIvuLsUySo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ markdown penlight ]; meta = { - homepage = "https://github.com/lunarmodules/LDoc"; + homepage = "http://lunarmodules.github.io/ldoc"; description = "A Lua Documentation Tool"; - license.fullName = "MIT/X11"; + license.fullName = "MIT "; }; }) {}; -lgi = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua }: +lgi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -733,12 +719,13 @@ buildLuarocksPackage { "date": "2017-10-09T20:55:55+02:00", "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "hash": "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -750,7 +737,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +linenoise = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -770,7 +757,7 @@ buildLuarocksPackage { }; }) {}; -ljsyscall = callPackage({ lua, fetchurl, buildLuarocksPackage }: +ljsyscall = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; @@ -794,7 +781,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ fetchurl, buildLuarocksPackage, lua }: +lmathx = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -817,7 +804,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, lua, luaOlder }: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -827,7 +814,7 @@ buildLuarocksPackage { }).outPath; src = fetchurl { url = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.c"; - sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; + sha256 = "1bkfwdacj1drzqsfxf352fjppqqwi5d4j084jr9vj9dvjb31rbc1"; }; disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); @@ -841,7 +828,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit }: +loadkit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -851,16 +838,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/loadkit.git", - "rev": "c6c712dab45f6c568821f9ed7b49c790a44d12e7", - "date": "2021-01-07T14:41:10-08:00", - "path": "/nix/store/xvwq7b2za8ciww1gjw7vnspg9183xmfa-loadkit", - "sha256": "15znriijs7izf9f6vmhr6dnvw3pzr0yr0mh6ah41fmdwjqi7jzcz", + "rev": "95b13a36442f59b41ab52df96d52233c4a725dfd", + "date": "2023-08-17T11:36:25-07:00", + "path": "/nix/store/9xcy2p5pxiq0p17szv8p2lagb6xzb8c8-loadkit", + "sha256": "0hivmn5r1scxv3nckm4hqfplq33wiab3ypjwsfdkmp3bdri0dhxs", + "hash": "sha256-usMGYm5r3Dqb01xeP5aKfAxMr8OQ1Mns2J3pkIutO0I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -873,17 +861,17 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +lpeg = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeg"; - version = "1.0.2-1"; + version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lpeg-1.0.2-1.rockspec"; - sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; + url = "mirror://luarocks/lpeg-1.1.0-1.rockspec"; + sha256 = "03af1p00madfhfxjzrsxb0jm0n49ixwadnkdp0vbgs77d2v985jn"; }).outPath; src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"; }; disabled = (luaOlder "5.1"); @@ -897,7 +885,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ lpeg, fetchzip, buildLuarocksPackage, lua }: +lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -919,7 +907,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ fetchurl, lua, luaOlder, buildLuarocksPackage }: +lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -942,30 +930,7 @@ buildLuarocksPackage { }; }) {}; -lpty = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: -buildLuarocksPackage { - pname = "lpty"; - version = "1.2.2-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/lpty-1.2.2-1.rockspec"; - sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg"; - }).outPath; - src = fetchurl { - url = "http://www.tset.de/downloads/lpty-1.2.2-1.tar.gz"; - sha256 = "071mvz79wi9vr6hvrnb1rv19lqp1bh2fi742zkpv2sm1r9gy5rav"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://www.tset.de/lpty/"; - description = "A simple facility for lua to control other programs via PTYs."; - license.fullName = "MIT"; - }; -}) {}; - -lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: +lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; @@ -979,12 +944,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -996,7 +962,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-pcre = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; @@ -1010,12 +976,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1028,7 +995,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-posix = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-posix = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; @@ -1042,12 +1009,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1059,7 +1027,7 @@ buildLuarocksPackage { }; }) {}; -lua-cjson = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cjson = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1073,12 +1041,13 @@ buildLuarocksPackage { "date": "2021-12-10T20:19:58+08:00", "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", + "hash": "sha256-6m8cNI4TM3lzoh47CiohpQW4Lq0OTVR0fK+e087WDQ4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1090,7 +1059,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1104,12 +1073,13 @@ buildLuarocksPackage { "date": "2015-06-03T08:39:04+02:00", "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", + "hash": "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1121,7 +1091,7 @@ buildLuarocksPackage { }; }) {}; -lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }: +lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-curl"; version = "0.3.13-1"; @@ -1144,30 +1114,61 @@ buildLuarocksPackage { }; }) {}; -lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }: +lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "lua-ffi-zlib"; + version = "0.6-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; + sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hamishforbes/lua-ffi-zlib", + "rev": "61e95cb434e4047c8bc65a180c293a05bf754416", + "date": "2023-08-11T09:28:16+12:00", + "path": "/nix/store/gfyr81q84mgpgwyh28xpzlf34ndjkfwc-lua-ffi-zlib", + "sha256": "0r6vima495h0d4f8ibf3fv9b6k7rqnavgvsy78dybslrm7lwsz4p", + "hash": "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/hamishforbes/lua-ffi-zlib"; + description = "A Lua module using LuaJIT's FFI feature to access zlib."; + }; +}) {}; + +lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; - version = "7-3"; + version = "7.0.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-iconv-7-3.rockspec"; - sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72"; + url = "mirror://luarocks/lua-iconv-7.0.0-2.rockspec"; + sha256 = "1bj512kqcj2cxna7si4648fci51fs4bqvdn592i9cahscsc0kk9g"; }).outPath; src = fetchurl { - url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz"; - sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; + url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz"; + sha256 = "0arp0h342hpp4kfdxc69yxspziky4v7c13jbf12yrs8f1lnjzr0x"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://ittner.github.com/lua-iconv/"; + homepage = "https://github.com/lunarmodules/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; }; }) {}; -lua-lsp = callPackage({ fetchgit, inspect, lua, lpeglabel, dkjson, luaAtLeast, luaOlder, buildLuarocksPackage }: +lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, inspect, lpeglabel, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; @@ -1181,12 +1182,13 @@ buildLuarocksPackage { "date": "2020-10-17T15:07:11-04:00", "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", + "hash": "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; @@ -1198,17 +1200,17 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; - version = "0.5.2-1"; + version = "0.5.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec"; - sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc"; + url = "mirror://luarocks/lua-messagepack-0.5.3-1.rockspec"; + sha256 = "0sc11ckizivijgdnqvb0xnagrak6d2caxc5j8jz8ad1b2plp50pq"; }).outPath; src = fetchurl { - url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.2.tar.gz"; - sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; + url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.3.tar.gz"; + sha256 = "17qdigs2pzi38rfqgs63xh44n1vylb6bcmmbz3sby68f0n9p8kq6"; }; disabled = (luaOlder "5.1"); @@ -1221,26 +1223,27 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-protobuf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.4.1-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec"; - sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i"; + url = "mirror://luarocks/lua-protobuf-0.5.0-1.rockspec"; + sha256 = "08z73rsqi7ysdyjcwfqyr8z6i5r43kx5fd8l32wlzv6cx6yvlqc9"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869", - "date": "2022-11-29T21:34:24+08:00", - "path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf", - "sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr", + "rev": "a256c34e12cad643d6ad189bddcbc314da9b0658", + "date": "2023-04-30T02:11:27+08:00", + "path": "/nix/store/n7ihjh36kp2f80016f9y8xydia2pclzq-lua-protobuf", + "sha256": "1kbanbgvmzcfnxq30f8hmirgc1d768lacpjihis9961pc7w96l9n", + "hash": "sha256-NlGT+GE3mJR0hFFepigypwX2cqwQOTBwt479ut+yas0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1253,26 +1256,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +lua-resty-http = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-resty-http"; - version = "0.17.0.beta.1-0"; + version = "0.17.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec"; - sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80"; + url = "mirror://luarocks/lua-resty-http-0.17.1-0.rockspec"; + sha256 = "05gid7c5i459clw707z1jic42s52ap4z66dbr9ims5znaq5s3wdk"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/ledgetech/lua-resty-http", - "rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34", - "date": "2022-02-11T16:44:50+00:00", - "path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http", - "sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb", + "rev": "4ab4269cf442ba52507aa2c718f606054452fcad", + "date": "2023-03-22T09:48:56+00:00", + "path": "/nix/store/ykd1d5fa56i1c286k58jm233lqvdv2mi-lua-resty-http", + "sha256": "0xdhygjqjpfkq1bq8b09fichww57q1z694lz16i3hcc3g4sr4hxg", + "hash": "sha256-r0OSNXmDMTiiCZ+SZH7Ap3AOWXQJLIRXwNNdieXzsHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1284,7 +1288,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ luaOlder, lua-resty-openssl, fetchgit, lua, buildLuarocksPackage }: +lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1298,12 +1302,13 @@ buildLuarocksPackage { "date": "2021-01-20T16:53:57-05:00", "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "hash": "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; @@ -1315,7 +1320,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ lua-resty-http, buildLuarocksPackage, fetchgit, lua-resty-session, luaOlder, lua, lua-resty-jwt }: +lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.6-3"; @@ -1329,12 +1334,13 @@ buildLuarocksPackage { "date": "2023-01-30T19:06:51+01:00", "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", + "hash": "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; @@ -1346,26 +1352,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ fetchgit, buildLuarocksPackage }: +lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.17-1"; + version = "0.8.25-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.17-1.rockspec"; - sha256 = "1b4dv9mdb90n0f6982pnjb05rgb12nkn1j66a1ywcs5fqcmj4sb5"; + url = "mirror://luarocks/lua-resty-openssl-0.8.25-1.rockspec"; + sha256 = "0wy0fjb50kpcyk6mkjj364p4lrfxl0b34xnv2n0wib1brk536s1l"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "dc17f6b2ff3adaa3bcb586f1d09073a4f4f4ec9d", - "date": "2023-01-20T01:36:57+08:00", - "path": "/nix/store/hh9i8ndb861iplkf9mz6vs2akkyibazn-lua-resty-openssl", - "sha256": "14xmxskbw3clqr97y69d311rs6i97vl7dg8pzixsqf4ypgllzvig", + "rev": "f9a153288238e9b7e3d5d40144610410a06a83cd", + "date": "2023-09-05T15:19:20+08:00", + "path": "/nix/store/jnvr2pzvxl2psd5w030m4qnv5dsm8spb-lua-resty-openssl", + "sha256": "08fqgdfi0dr3n2lqrbgwa94dd2f6crn1kb0cfpccphknaypaw7dp", + "hash": "sha256-tx2urld2wsvYdQysGWxmxonWSFL8rYypsCM3EF172CE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -1375,20 +1382,49 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua, lua-resty-openssl /*, lua_pack, lua-ffi-zlib */ }: +lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-ffi-zlib, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.0.3-1"; + version = "4.0.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.0.3-1.rockspec"; - sha256 = "17q8gf0zjdbfgphvjsnlzw1d6158v4ppiqxap6hjqr0prqa5yyfq"; + url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; + sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "3373d8138930b6d1e255bb80d9127503019301d7", - "date": "2023-02-21T20:52:32+02:00", - "path": "/nix/store/pdwd03w7505wkv4fw79a3mdlfijk9ngd-lua-resty-session", - "sha256": "1d105785jzn9x3by4r0baaffr5xmc2ilgd7z7izcwq9z29pnfv02", + "rev": "5f2aed616d16fa7ca04dc40e23d6941740cd634d", + "date": "2023-08-16T18:24:43+03:00", + "path": "/nix/store/s6i1idv9lx52x7lcl0kc2c9sm9pic4kq-lua-resty-session", + "sha256": "08pih1baqhlvsqvcr1zzympmn8v7gskmis6ffhigll37hbzvljcz", + "hash": "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl ]; + + meta = { + homepage = "https://github.com/bungle/lua-resty-session"; + description = "Session Library for OpenResty - Flexible and Secure"; + license.fullName = "BSD"; + }; +}) {}; + +lua-rtoml = callPackage({ luaOlder, luarocks-build-rust-mlua, buildLuarocksPackage, lua, fetchgit }: +buildLuarocksPackage { + pname = "lua-rtoml"; + version = "0.2-0"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lblasc/lua-rtoml.git", + "rev": "e59ad00f5df8426767ddfb355f4ba6093468a168", + "date": "2023-11-02T14:17:41+01:00", + "path": "/nix/store/ynn6bvnwyqrackvyxzysxy294gh9prg1-lua-rtoml", + "sha256": "1y2ncdl3mpwqc1h5xm0rf9g1ns2vswgqffsj9sqrqidmg984jkr4", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -1397,17 +1433,17 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl /* lua_pack lua-ffi-zlib */ ]; + propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; meta = { - homepage = "https://github.com/bungle/lua-resty-session"; - description = "Session Library for OpenResty - Flexible and Secure"; - license.fullName = "BSD"; - broken = true; # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + homepage = "https://github.com/lblasc/lua-rtoml"; + description = "Lua bindings for the Rust toml crate."; + maintainers = with lib.maintainers; [ lblasc ]; + license.fullName = "MIT"; }; }) {}; -lua-subprocess = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; @@ -1418,12 +1454,13 @@ buildLuarocksPackage { "date": "2021-01-09T22:31:54+01:00", "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", + "hash": "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1436,7 +1473,7 @@ buildLuarocksPackage { }; }) {}; -lua-term = callPackage({ fetchurl, buildLuarocksPackage }: +lua-term = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -1457,7 +1494,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1471,12 +1508,13 @@ buildLuarocksPackage { "date": "2017-12-08T16:30:50-08:00", "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "hash": "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1488,7 +1526,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-yajl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; @@ -1502,12 +1540,13 @@ buildLuarocksPackage { "date": "2020-11-12T06:22:23-08:00", "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "hash": "sha256-7oKX8x1HLc5Nk3VC94iwAFpPo57WtdBy4Bbv40HyObs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1520,7 +1559,7 @@ buildLuarocksPackage { }; }) {}; -lua-zlib = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-2"; @@ -1534,12 +1573,13 @@ buildLuarocksPackage { "date": "2017-10-07T08:26:37-07:00", "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", + "hash": "sha256-rOjgjdZxVrQRIWdduYKH0Y/gcAE/gwWHqzDSwooWYbM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1552,7 +1592,7 @@ buildLuarocksPackage { }; }) {}; -lua_cliargs = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchurl }: +lua_cliargs = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1572,7 +1612,7 @@ buildLuarocksPackage { }; }) {}; -luabitop = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +luabitop = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1583,12 +1623,13 @@ buildLuarocksPackage { "date": "2021-08-30T10:14:03+02:00", "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", + "hash": "sha256-PPN3ZRR5+p+F7hVk3gfsdzUg7yyYDVFJ1HzJTFNyp6w=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; @@ -1600,26 +1641,27 @@ buildLuarocksPackage { }; }) {}; -luacheck = callPackage({ argparse, luafilesystem, lua, luaOlder, fetchgit, buildLuarocksPackage }: +luacheck = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.0-1"; + version = "1.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.0-1.rockspec"; - sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza"; + url = "mirror://luarocks/luacheck-1.1.1-1.rockspec"; + sha256 = "11nrryqff2yis5s7jscbyv221p21i9sh924x7g9l3d6ijns8zmba"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f", - "date": "2022-12-19T20:51:56+03:00", - "path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck", - "sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h", + "rev": "ababb6d403d634eb74d2c541035e9ede966e710d", + "date": "2023-06-10T11:27:25+03:00", + "path": "/nix/store/wkrhda7nww45g1waxdv9ghm35mwbvlfq-luacheck", + "sha256": "0abd5rfxv667n8d8v3g9cnkyghiwzhj3yk498gr2agd3mfcni7d7", + "hash": "sha256-p51omaujPSXyQ4lMPyT8PMLnp2XpjY0asseY3V0ubSk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lua luafilesystem ]; @@ -1631,7 +1673,7 @@ buildLuarocksPackage { }; }) {}; -luacov = callPackage({ luaAtLeast, buildLuarocksPackage, luaOlder, lua, fetchgit }: +luacov = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; @@ -1645,12 +1687,13 @@ buildLuarocksPackage { "date": "2021-02-15T18:47:58-03:00", "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "hash": "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -1662,7 +1705,7 @@ buildLuarocksPackage { }; }) {}; -luadbi = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +luadbi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; @@ -1676,12 +1719,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -1693,7 +1737,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-mysql = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit, luadbi, luaAtLeast }: +luadbi-mysql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; @@ -1707,12 +1751,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1724,7 +1769,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-postgresql = callPackage({ lua, fetchgit, buildLuarocksPackage, luaOlder, luaAtLeast, luadbi }: +luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; @@ -1738,12 +1783,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1755,7 +1801,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-sqlite3 = callPackage({ luaAtLeast, lua, luaOlder, buildLuarocksPackage, fetchgit, luadbi }: +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; @@ -1769,12 +1815,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1786,7 +1833,7 @@ buildLuarocksPackage { }; }) {}; -luaepnf = callPackage({ luaOlder, buildLuarocksPackage, lpeg, luaAtLeast, lua, fetchgit }: +luaepnf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; @@ -1800,12 +1847,13 @@ buildLuarocksPackage { "date": "2015-01-15T16:54:10+01:00", "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "hash": "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lpeg lua ]; @@ -1817,7 +1865,7 @@ buildLuarocksPackage { }; }) {}; -luaevent = callPackage({ lua, fetchurl, luaOlder, buildLuarocksPackage }: +luaevent = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; @@ -1840,7 +1888,7 @@ buildLuarocksPackage { }; }) {}; -luaexpat = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua }: +luaexpat = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaexpat"; version = "1.4.1-1"; @@ -1854,12 +1902,13 @@ buildLuarocksPackage { "date": "2022-10-04T16:36:23+02:00", "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", + "hash": "sha256-hmAQcU6AfYar4JzsYfaWZk3hxrDJKq8eHHoGcIeYjKw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1872,7 +1921,7 @@ buildLuarocksPackage { }; }) {}; -luaffi = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +luaffi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1886,12 +1935,13 @@ buildLuarocksPackage { "date": "2021-03-01T11:46:30-05:00", "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "hash": "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1903,7 +1953,7 @@ buildLuarocksPackage { }; }) {}; -luafilesystem = callPackage({ luaOlder, lua, fetchgit, buildLuarocksPackage }: +luafilesystem = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luafilesystem"; version = "1.8.0-1"; @@ -1917,44 +1967,46 @@ buildLuarocksPackage { "date": "2020-04-22T22:16:42-03:00", "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", + "hash": "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/keplerproject/luafilesystem"; + homepage = "https://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }) {}; -lualdap = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +lualdap = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lualdap"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; - sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + url = "mirror://luarocks/lualdap-1.3.1-1.rockspec"; + sha256 = "0c0j9dmrphg0dil4yhahcqzzyxhrv525g65jsz0q6iqwyx10bqbp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lualdap/lualdap", - "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", - "date": "2021-06-05T15:49:42+02:00", - "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", - "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "rev": "5c21b3e0d97a07b103f63edc7e649018e0453427", + "date": "2023-03-15T09:02:07+01:00", + "path": "/nix/store/ah7y5wpp3l0v5bk0gwzdvgzfpczb691k-lualdap", + "sha256": "1y3ap9si894xjlbrwx3c6bcfg60y80av802rscldg9scvm984jrg", + "hash": "sha256-L0uCUt1Mp9co01kAtBVAHpjn2DJsdJ4XlZ0kFHW6avg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1967,7 +2019,7 @@ buildLuarocksPackage { }; }) {}; -lualogging = callPackage({ luasocket, buildLuarocksPackage, fetchgit }: +lualogging = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luasocket }: buildLuarocksPackage { pname = "lualogging"; version = "1.8.2-1"; @@ -1981,12 +2033,13 @@ buildLuarocksPackage { "date": "2023-01-27T20:29:41+01:00", "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", + "hash": "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luasocket ]; @@ -1997,7 +2050,7 @@ buildLuarocksPackage { }; }) {}; -luaossl = callPackage({ buildLuarocksPackage, lua, fetchzip }: +luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "luaossl"; version = "20220711-0"; @@ -2019,7 +2072,7 @@ buildLuarocksPackage { }; }) {}; -luaposix = callPackage({ bit32, lua, luaOlder, fetchzip, luaAtLeast, buildLuarocksPackage }: +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; @@ -2043,7 +2096,7 @@ buildLuarocksPackage { }; }) {}; -luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder, lua }: +luarepl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luarepl"; version = "0.10-1"; @@ -2066,26 +2119,58 @@ buildLuarocksPackage { }; }) {}; -luasec = callPackage({ fetchgit, luaOlder, luasocket, buildLuarocksPackage, lua }: +luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { - pname = "luasec"; - version = "1.2.0-1"; + pname = "luarocks-build-rust-mlua"; + version = "0.1.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.2.0-1.rockspec"; - sha256 = "0zavdkwd701j8zqyzrpn1n5xd242vziq2l79amjdn5mcw81nrsdf"; + url = "mirror://luarocks/luarocks-build-rust-mlua-0.1.2-1.rockspec"; + sha256 = "1sx908fm2ihpxz2mm54xzkfmdzlqdvrqjkh1zz7rcjgmqba4mh1j"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/brunoos/luasec", - "rev": "d9215ee00f6694a228daad50ee85827a4cd13583", - "date": "2022-07-30T08:42:53-03:00", - "path": "/nix/store/77m3g768a230h77nxiw23ay73aryq1zh-luasec", - "sha256": "1rz2lhf243lrsjsyjwxhijhqr88l8l8sndzzv9w4x1j0zpa9sblb", + "url": "https://github.com/khvzak/luarocks-build-rust-mlua", + "rev": "c8080aa0832563b7f8b2cb85a195c1598ce312e0", + "date": "2023-06-29T16:47:41+01:00", + "path": "/nix/store/n7id28r1m11xd550hayv99xhz96vpdjq-luarocks-build-rust-mlua", + "sha256": "1zh1p5k7xpczi5db3k0fw0ljw9w0xxk1qjjcfg5rcznqjf48i3x7", + "hash": "sha256-p4+IiJPYfpbLc0xKHGbvgCcuKeAOzLFaiZ/dfma5Af4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; + + + meta = { + homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; + description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: +buildLuarocksPackage { + pname = "luasec"; + version = "1.3.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; + sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/brunoos/luasec", + "rev": "4c06287052d68fdbe7429b8f967cdc8ee94aa44a", + "date": "2023-08-31T17:09:53-03:00", + "path": "/nix/store/wnl78b5l3dxw52slphmi4rmr1cd8bd3r-luasec", + "sha256": "0rrdfbnkd8pgqwh3f0iyd5cxy7g1h0568a88m3sq1z7715js4yx3", + "hash": "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -2098,7 +2183,7 @@ buildLuarocksPackage { }; }) {}; -luasocket = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; version = "3.1.0-1"; @@ -2112,12 +2197,13 @@ buildLuarocksPackage { "date": "2022-07-27T10:07:00+03:00", "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", + "hash": "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2129,26 +2215,27 @@ buildLuarocksPackage { }; }) {}; -luasql-sqlite3 = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.6.0-1"; + version = "2.6.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec"; - sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; + url = "mirror://luarocks/luasql-sqlite3-2.6.0-2.rockspec"; + sha256 = "1xpbcpl4qhnzpyyszhdsrxhx2qc1dmndh926lv91xwphw7inwdwg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "e2660cbaeb13cb33d8346bb816c6a526241b3c2d", - "date": "2022-10-03T18:44:40-03:00", - "path": "/nix/store/mxzq779w3l19bgb424aa4cqdzxczmwr3-luasql", - "sha256": "052hc174am05plidilzf36vr736sp8vyydfb12qa8xr6mk74f6d1", + "rev": "25bf4ffce9323d28cb6f382f7ec9e8951e3084f9", + "date": "2023-07-19T14:20:27-03:00", + "path": "/nix/store/949886jxp7sx3yx910lc6d1yf3ym9mx5-luasql", + "sha256": "00q73j2nzqsm0vmxjkv83qh1dncmr5dgmkrkyxnb5ggygvcbh7w5", + "hash": "sha256-hR+42H7+vbJs9zPP+lrJldkWIB5oT9nrBlXjb4UcBwM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2161,7 +2248,7 @@ buildLuarocksPackage { }; }) {}; -luassert = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua, say }: +luassert = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, say }: buildLuarocksPackage { pname = "luassert"; version = "1.9.0-1"; @@ -2175,12 +2262,13 @@ buildLuarocksPackage { "date": "2022-08-24T00:00:45+03:00", "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", + "hash": "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; @@ -2192,7 +2280,7 @@ buildLuarocksPackage { }; }) {}; -luasystem = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchurl }: +luasystem = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; @@ -2215,7 +2303,7 @@ buildLuarocksPackage { }; }) {}; -luaunbound = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder, luaAtLeast }: +luaunbound = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunbound"; version = "1.0.0-1"; @@ -2238,7 +2326,7 @@ buildLuarocksPackage { }; }) {}; -luaunit = callPackage({ buildLuarocksPackage, fetchzip, lua, luaAtLeast, luaOlder }: +luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunit"; version = "3.4-1"; @@ -2262,7 +2350,7 @@ buildLuarocksPackage { }; }) {}; -luautf8 = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +luautf8 = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luautf8"; version = "0.1.5-2"; @@ -2286,7 +2374,7 @@ buildLuarocksPackage { }; }) {}; -luazip = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, lua, fetchgit }: +luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2300,12 +2388,13 @@ buildLuarocksPackage { "date": "2017-09-05T14:02:52+03:00", "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "hash": "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2317,23 +2406,24 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, luaAtLeast, luaOlder, lua }: +lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d", - "date": "2023-01-03T10:45:29+11:00", - "path": "/nix/store/wpnvi5bjlp7sl8g2li21qkcd7m1f3d3w-lush.nvim", - "sha256": "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq", + "rev": "966aad1accd47fa11fbe2539234f81f678fef2de", + "date": "2023-09-23T12:10:39+10:00", + "path": "/nix/store/67046ilc92czfvwc5zdkkxg7iw2xjj45-lush.nvim", + "sha256": "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h", + "hash": "sha256-sIRphtmkf340BSuX2V5uIGZRJg7hS8YwTv4KMsWKPTw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2346,7 +2436,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, fetchurl, lua }: +luuid = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2369,7 +2459,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +luv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.44.2-1"; @@ -2392,7 +2482,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, fetchzip, lua, luaOlder, luaAtLeast }: +lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2416,7 +2506,7 @@ buildLuarocksPackage { }; }) {}; -magick = callPackage({ fetchgit, buildLuarocksPackage, lua }: +magick = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; version = "1.6.0-1"; @@ -2430,24 +2520,26 @@ buildLuarocksPackage { "date": "2022-03-10T20:02:11-08:00", "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", + "hash": "sha256-lVnHM6Q2BbG4nLxBFjU5U/WvIL5qn19+TiK5I77GaQU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/leafo/magick.git"; + homepage = "https://github.com/leafo/magick.git"; description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI"; + maintainers = with lib.maintainers; [ donovanglover ]; license.fullName = "MIT"; }; }) {}; -markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: +markdown = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2461,12 +2553,13 @@ buildLuarocksPackage { "date": "2015-09-27T17:49:28+03:00", "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "hash": "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2478,7 +2571,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: +mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2501,7 +2594,7 @@ buildLuarocksPackage { }; }) {}; -middleclass = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +middleclass = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "middleclass"; version = "4.1.1-0"; @@ -2524,23 +2617,24 @@ buildLuarocksPackage { }; }) {}; -moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: +moonscript = callPackage({ argparse, buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", - "rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a", - "date": "2022-11-04T13:38:05-07:00", - "path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript", - "sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97", + "rev": "fbd8ad48737651114a3d3a672b9f8f8b3a7022b7", + "date": "2023-06-23T09:33:37-07:00", + "path": "/nix/store/sy1dkcfp3rg7lvazba36sivpk0bs12r5-moonscript", + "sha256": "02w6lp5kid73dcd5x71666my7413l05ak0xvva6hp8ixbn6qraqn", + "hash": "sha256-FquMjV09oguN2ruDqQqgI5DjqzEmnF4aa+O0OMulhgs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; @@ -2556,14 +2650,14 @@ buildLuarocksPackage { mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; - version = "1.0.9-0"; + version = "1.0.11-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.9-0.rockspec"; - sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn"; + url = "mirror://luarocks/mpack-1.0.11-0.rockspec"; + sha256 = "0alydkccamxldij7ki42imd37630d9qnqg22pndcgkawfclfqzqa"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz"; - sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.11/libmpack-lua-1.0.11.tar.gz"; + sha256 = "15np7603rijavycvrjgjp12y64zs36390lg2hsnr5av790cfrnd2"; }; @@ -2574,7 +2668,38 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ coxpcall, fetchurl, mpack, lua, luaOlder, luv, buildLuarocksPackage }: +nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: +buildLuarocksPackage { + pname = "nui.nvim"; + version = "0.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/nui.nvim-0.2.0-1.rockspec"; + sha256 = "0v2z6lgl6hrzcjlzhis8nrkdkh9kvx8zg3q5svi5gyklg7vmcbc2"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/MunifTanjim/nui.nvim.git", + "rev": "9e3916e784660f55f47daa6f26053ad044db5d6a", + "date": "2023-07-20T10:45:09+06:00", + "path": "/nix/store/8zdhjgipjjhi9b1y40r2yk5np4lp39as-nui.nvim", + "sha256": "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx", + "hash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + + meta = { + homepage = "https://github.com/MunifTanjim/nui.nvim"; + description = "UI Component Library for Neovim."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }: buildLuarocksPackage { pname = "nvim-client"; version = "0.2.4-1"; @@ -2594,23 +2719,24 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40", - "date": "2023-02-24T12:23:36+09:00", - "path": "/nix/store/s1qark9y2zkbwyl2mzg60z9r0h4hajf4-nvim-cmp", - "sha256": "0cy93aj02nkspr83sqsrix12jcnhkl5s2mbpjr5ffhpcrk19vlmx", + "rev": "5dce1b778b85c717f6614e3f4da45e9f19f54435", + "date": "2023-08-26T15:31:42+00:00", + "path": "/nix/store/lvpzc5q7mv66knxh1igvzkrcwkpg8l8q-nvim-cmp", + "sha256": "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq", + "hash": "sha256-WGck3By9GhnBUmzLGi2wnKjDreQx5kBOmHCbC5BZhfo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2622,23 +2748,24 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ luafilesystem, luaOlder, fetchgit, buildLuarocksPackage, lua }: +penlight = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "7e67bcb1c4d95e7ca817356533419b4a72049b96", - "date": "2022-12-28T23:34:46+01:00", - "path": "/nix/store/14kax7nswd7in005cgb0f0r8194s9nsd-penlight", - "sha256": "17gcfi8hqpdp8m0f1nr9n5p1mzxxpq2qwf8zkqvjkb7qv1zqabj1", + "rev": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140", + "date": "2023-09-21T10:51:09+02:00", + "path": "/nix/store/vbi0d32mbaqcra3jligv8ajq17m1wxa4-penlight", + "sha256": "12ppgby8ldh4zxwcr7cknacbdvk30fi92sgyzh1zbgvym4l44g0c", + "hash": "sha256-DDxCKKl+v/UD/P5pkaIDY+62mLKTncx4/wQ2ivx694o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; @@ -2651,23 +2778,24 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ lua, fetchgit, luaOlder, luaAtLeast, luassert, buildLuarocksPackage }: +plenary-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "253d34830709d690f013daf2853a9d21ad7accab", - "date": "2023-02-19T10:05:49+01:00", - "path": "/nix/store/dnzlin3gqpvd35a8c5g5hwg3fl28vxgs-plenary.nvim", - "sha256": "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng", + "rev": "50012918b2fc8357b87cff2a7f7f0446e47da174", + "date": "2023-10-11T15:43:47+02:00", + "path": "/nix/store/jsgaq274w8pbl4pnmpii3izxafpl346g-plenary.nvim", + "sha256": "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd", + "hash": "sha256-zR44d9MowLG1lIbvrRaFTpO/HXKKrO6lbtZfvvTdx+o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; @@ -2679,7 +2807,7 @@ buildLuarocksPackage { }; }) {}; -rapidjson = callPackage({ lua, buildLuarocksPackage, luaOlder, fetchgit }: +rapidjson = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2690,12 +2818,13 @@ buildLuarocksPackage { "date": "2021-04-09T19:59:20+08:00", "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "hash": "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2707,44 +2836,21 @@ buildLuarocksPackage { }; }) {}; -readline = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: -buildLuarocksPackage { - pname = "readline"; - version = "3.2-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/readline-3.2-0.rockspec"; - sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; - }).outPath; - src = fetchurl { - url = "http://www.pjb.com.au/comp/lua/readline-3.2.tar.gz"; - sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua luaposix ]; - - meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; - description = "Interface to the readline library"; - license.fullName = "MIT/X11"; - }; -}) {}; - -rest-nvim = callPackage({ lua, luaAtLeast, buildLuarocksPackage, luaOlder, fetchzip, plenary-nvim }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: buildLuarocksPackage { pname = "rest.nvim"; - version = "0.1-2"; + version = "0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-0.1-2.rockspec"; - sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh"; + url = "mirror://luarocks/rest.nvim-0.2-1.rockspec"; + sha256 = "1yq8gx585c10j8kybp20swyv9q0i3lm5k0rrv4bgsbwz3ychn0k1"; }).outPath; src = fetchzip { - url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip"; - sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; + url = "https://github.com/rest-nvim/rest.nvim/archive/0.2.zip"; + sha256 = "0ycjrrl37z465p71bdkas3q2ky1jmgr2cjnirnskdc6wz14wl09g"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2754,23 +2860,48 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +rustaceanvim = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchzip }: +buildLuarocksPackage { + pname = "rustaceanvim"; + version = "3.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/rustaceanvim-3.0.0-1.rockspec"; + sha256 = "1v1k08spq3zalgya6q3qny6zpwhn0nb5nl5dn0rkcvnc4imvnyfy"; + }).outPath; + src = fetchzip { + url = "https://github.com/mrcjkb/rustaceanvim/archive/3.0.0.zip"; + sha256 = "1prpklbijr7p890nflr9jixf955dlp3ph9zl2rq3xxyl20ncyqbk"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/mrcjkb/rustaceanvim"; + description = "Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "GPL-2.0"; + }; +}) {}; + +say = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "say"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/say.git", - "rev": "45a3057e68c52b34ab59ef167efeb2340e356661", - "date": "2022-08-27T11:00:01+03:00", - "path": "/nix/store/324ryi5hlaisnyp4wpd1hvzcfv508i4s-say", - "sha256": "178pdsswwnja2f106701xmdxsdijjl5smm28dhhdcmjyb4mn8cr2", + "rev": "3e1f783d0aa496eb21d16e85b2235335cb9332df", + "date": "2023-08-13T02:37:27+03:00", + "path": "/nix/store/5biavac0k8z0xg4rr3bm8z3kdi8mm8c0-say", + "sha256": "04dkf0av6n71vmz0h86i5brklvaf9p91lkldn1xldpdr0qqs0x63", + "hash": "sha256-w3SgMQa53UZ7sI1OGtJNTm068yrRIAh+3eFYsxVwsxE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2782,7 +2913,7 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ fetchgit, luaAtLeast, lua, buildLuarocksPackage, luaOlder }: +serpent = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; @@ -2796,12 +2927,13 @@ buildLuarocksPackage { "date": "2017-09-01T21:35:14-07:00", "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "hash": "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2814,7 +2946,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ fetchgit, buildLuarocksPackage, luv }: +sqlite = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2828,12 +2960,13 @@ buildLuarocksPackage { "date": "2022-06-17T15:57:13+03:00", "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", + "hash": "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luv ]; @@ -2844,7 +2977,7 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +std-_debug = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "std._debug"; version = "git-1"; @@ -2855,12 +2988,13 @@ buildLuarocksPackage { "date": "2023-01-31T16:39:35-07:00", "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", + "hash": "sha256-zRU7RaOoaAFPx9XB5fWIgsjJNjJ75HT0/J8j/8an5R8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2872,23 +3006,18 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, std-_debug, luaOlder }: +std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; - version = "git-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/normalize.git", - "rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c", - "date": "2022-01-02T16:33:35-08:00", - "path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize", - "sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "2.0.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/std.normalize-2.0.3-1.rockspec"; + sha256 = "1l83ikiaw4dch2r69cxpl93b9d4wf54vbjb6fcggnkxxgm0amj3a"; + }).outPath; + src = fetchzip { + url = "http://github.com/lua-stdlib/normalize/archive/v2.0.3.zip"; + sha256 = "1gyywglxd2y7ck3hk8ap73w0x7hf9irpg6vgs8yc6k9k4c5g3fgi"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; @@ -2900,7 +3029,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, luaAtLeast, fetchzip, lua, luaOlder }: +stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -2924,7 +3053,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ luafilesystem, buildLuarocksPackage, dkjson, cyan, fetchgit }: +teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -2938,12 +3067,13 @@ buildLuarocksPackage { "date": "2022-12-21T20:33:53-06:00", "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", + "hash": "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ cyan dkjson luafilesystem ]; @@ -2954,17 +3084,17 @@ buildLuarocksPackage { }; }) {}; -telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "0.4.0-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; - sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + url = "mirror://luarocks/telescope-manix-0.5.0-1.rockspec"; + sha256 = "0i5q9sr0vn0w6yqg530jx2fx52k9jr7rss4ibl49f1x3wv6sckv1"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; - sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + url = "https://github.com/mrcjkb/telescope-manix/archive/0.5.0.zip"; + sha256 = "093vkh822ycnc1pri3zmzzqnz235xxam3z1l67zyyqlc1apbarax"; }; disabled = (luaOlder "5.1"); @@ -2977,7 +3107,7 @@ buildLuarocksPackage { }; }) {}; -telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +telescope-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, plenary-nvim }: buildLuarocksPackage { pname = "telescope.nvim"; version = "scm-1"; @@ -2987,16 +3117,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-telescope/telescope.nvim", - "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", - "date": "2023-02-26T13:26:12+01:00", - "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", - "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "rev": "74ce793a60759e3db0d265174f137fb627430355", + "date": "2023-10-11T12:29:23+02:00", + "path": "/nix/store/7k50qqgamc2ldxdf54jqs8sy8m8vcfzr-telescope.nvim", + "sha256": "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4", + "hash": "sha256-RN1J2va4E/HBfaZ1qVvohJvyR4wYhylOqfJ65E8Cm9Q=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; @@ -3008,26 +3139,27 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; - version = "0.15.1-1"; + version = "0.15.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.15.1-1.rockspec"; - sha256 = "0f9wr91pxcvx43jp9ma4yb6f0r9yrc2fm437nx7xm0dyh7kac9p6"; + url = "mirror://luarocks/tl-0.15.2-1.rockspec"; + sha256 = "1qisdflgikry0jdqvnzdcqib2svbafp10n0gfwm3fcrzqsdxy0xr"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "a10fb2c69827c1b0f8e1b8a5c848a06d6da5d3be", - "date": "2023-01-23T18:14:26-03:00", - "path": "/nix/store/x5p9v443g53sz2c8rvxa465gzfiv47wb-tl", - "sha256": "0hql1274wxji54cadalv4j3k82vd9xasvi119cdnm16mh85ir70s", + "rev": "d2fc36b5ff9a52d7265e63eb74cce70fd1cdbcb2", + "date": "2023-04-27T11:28:21-03:00", + "path": "/nix/store/ramhj3a29lrn0bblbgyxn4712a7caq8k-tl", + "sha256": "1dgldi9pgg23iz3xis4i43bnvkwirh7kkycmr5xp75s2cc85zhg0", + "hash": "sha256-4MFfEGNCl3N7yZX5OQ/Mkc9t1yCR6NjHj0O8d1Ns9LU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; @@ -3039,7 +3171,73 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ fetchgit, lua, buildLuarocksPackage, luaOlder }: +toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "toml"; + version = "0.3.0-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/toml-0.3.0-0.rockspec"; + sha256 = "0y4qdzsvf4xwnr49xcpbqclrq9d6snv83cbdkrchl0cn4cx6zpxy"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/LebJe/toml.lua.git", + "rev": "319e9accf8c5cedf68795354ba81e54c817d1277", + "date": "2023-02-19T23:00:49-05:00", + "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", + "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", + "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/LebJe/toml.lua"; + description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: +buildLuarocksPackage { + pname = "toml-edit"; + version = "0.1.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/toml-edit-0.1.4-1.rockspec"; + sha256 = "05bcc1xafcspdf1rcka9bhg7b6z617b4jrcahs1r7grcp78w89vf"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/vhyrro/toml-edit.lua", + "rev": "f6efdab4ca6fab276f172060971781dc42a94f2d", + "date": "2023-10-02T16:54:10+02:00", + "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", + "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", + "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; + + meta = { + homepage = "https://github.com/vhyrro/toml-edit.lua"; + description = "TOML Parser + Formatting and Comment-Preserving Editor"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + +vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -3050,12 +3248,13 @@ buildLuarocksPackage { "date": "2020-05-06T23:13:06-04:00", "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "hash": "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3066,26 +3265,27 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, fetchgit, busted }: +vusted = callPackage({ buildLuarocksPackage, busted, fetchgit, fetchurl }: buildLuarocksPackage { pname = "vusted"; - version = "2.2.0-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.2.0-1.rockspec"; - sha256 = "1ri96pdwhck1sbdnkqj9ksv9hs86pv8v2f6vl25696v9snp9jkzs"; + url = "mirror://luarocks/vusted-2.3.1-1.rockspec"; + sha256 = "03h7l12xk43rql9vxb5nzfimx9srwaazx2r3j2zm1ba2qz06h0qc"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/notomo/vusted.git", - "rev": "f142170d3b802f6cedfcff67b945a260087ecf65", - "date": "2023-01-03T11:23:56+09:00", - "path": "/nix/store/la7h2a39wnjkdg1fzhkgw3hbrhs4c5kf-vusted", - "sha256": "17pdwaqjfkv2b7a801k5fdg2s0s75miiilfdjgmsyv7phighvkvw", + "rev": "2bc6818a756e47240d9284f1dfac21b011ca84ea", + "date": "2023-10-09T11:47:28+09:00", + "path": "/nix/store/jq2yl4adpnyilp3yyw161j1a29bwahqi-vusted", + "sha256": "04lxc78n3h1qhby6b4k9x8hb1c3sgqdid71fsvyg4y6j7rb55a8z", + "hash": "sha256-H6lSVj7SePL81i6cFht+erCwIOppkmX8gjjAYdFhnRI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ busted ]; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix index 7c7ffcccf2..a07b23ff9c 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix @@ -82,11 +82,11 @@ rec { }; */ generateLuarocksConfig = { - externalDeps + externalDeps ? [] # a list of lua derivations - , requiredLuaRocks + , requiredLuaRocks ? [] , extraVariables ? {} - , rocksSubdir + , rocksSubdir ? "rocks-subdir" }: let rocksTrees = lib.imap0 (i: dep: { diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index a389388ff6..e62b32ce6b 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -1,5 +1,6 @@ # do not add pkgs, it messes up splicing { stdenv +, cargo , cmake , curl , cyrus_sasl @@ -27,6 +28,7 @@ , libxcrypt , libyaml , mariadb +, magic-enum , mpfr , neovim-unwrapped , openldap @@ -35,7 +37,10 @@ , pkg-config , postgresql , readline +, rustPlatform +, sol2 , sqlite +, tomlplusplus , unbound , vimPlugins , vimUtils @@ -112,12 +117,6 @@ with prev; ''; }); - cyrussasl = prev.cyrussasl.overrideAttrs (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = cyrus_sasl; } - ]; - }); - fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles @@ -141,10 +140,6 @@ with prev; */ }); - lpty = prev.lpty.overrideAttrs (oa: { - meta.broken = luaOlder "5.1" || luaAtLeast "5.3"; - }); - ldbus = prev.ldbus.overrideAttrs (oa: { extraVariables = { DBUS_DIR = "${dbus.lib}"; @@ -321,7 +316,7 @@ with prev; externalDeps = [ { name = "EVENT"; dep = libevent; } ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaexpat.overrideAttrs (_: { @@ -385,6 +380,11 @@ with prev; ]; }); + # lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { + # # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + # meta.broken = true; + # }); + lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -401,6 +401,17 @@ with prev; meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); + lua-rtoml = prev.lua-rtoml.overrideAttrs (oa: { + + cargoDeps = rustPlatform.fetchCargoTarball { + src = oa.src; + hash = "sha256-EcP4eYsuOVeEol+kMqzsVHd8F2KoBdLzf6K0KsYToUY="; + }; + + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + + }); + lush-nvim = prev.lush-nvim.overrideAttrs (drv: { doCheck = false; }); @@ -513,8 +524,21 @@ with prev; ''; }); - readline = prev.readline.overrideAttrs (oa: { - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ]; + readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: + buildLuarocksPackage ({ + pname = "readline"; + version = "3.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + extraVariables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -523,9 +547,19 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - # Without this, source root is wrongly set to ./readline-2.6/doc - sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; - }); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua luaposix + readline.out + ]; + + meta = { + homepage = "http://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; + })) {}; + sqlite = prev.sqlite.overrideAttrs (drv: { @@ -558,6 +592,29 @@ with prev; ''; }); + toml = prev.toml.overrideAttrs (oa: { + patches = [ ./toml.patch ]; + + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ magic-enum sol2 ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace \ + "TOML_PLUS_PLUS_SRC" \ + "${tomlplusplus.src}" + ''; + }); + + toml-edit = prev.toml-edit.overrideAttrs (oa: { + + cargoDeps = rustPlatform.fetchCargoTarball { + src = oa.src; + hash = "sha256-pLAisfnSDoAToQO/kdKTdic6vEug7/WFNtgOfj0bRAE="; + }; + + nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + + }); + vstruct = prev.vstruct.overrideAttrs (_: { meta.broken = (luaOlder "5.1" || luaAtLeast "5.4"); }); diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch b/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch new file mode 100644 index 0000000000..5f9f57a445 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/toml.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab3884c..9432df7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,26 +38,17 @@ include(FetchContent) + + FetchContent_Declare( + ${TOML++} +- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git" +- GIT_SHALLOW ON +- GIT_SUBMODULES "" +- GIT_TAG "v3.3.0" ++ DOWNLOAD_COMMAND true + ) + + FetchContent_Declare( + ${SOL2} +- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git" +- GIT_SHALLOW ON +- GIT_SUBMODULES "" +- GIT_TAG "v3.3.0" ++ DOWNLOAD_COMMAND true + ) + + FetchContent_Declare( + ${MAGIC_ENUM} +- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git" +- GIT_SHALLOW ON +- GIT_SUBMODULES "" +- GIT_TAG "v0.8.2" ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(${TOML++}) +@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES)) + find_package(Lua) + endif() + +-include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) ++include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) + + set(SOURCES + src/toml.cpp diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/updater/default.nix b/third_party/nixpkgs/pkgs/development/lua-modules/updater/default.nix new file mode 100644 index 0000000000..40c93b21e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/updater/default.nix @@ -0,0 +1,49 @@ +{ buildPythonApplication +, nix +, makeWrapper +, python3Packages +, lib +# , nix-prefetch-git +, nix-prefetch-scripts +, luarocks-nix +}: +let + + path = lib.makeBinPath [ nix nix-prefetch-scripts luarocks-nix ]; +in +buildPythonApplication { + pname = "luarocks-packages-updater"; + version = "0.1"; + + format = "other"; + + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + propagatedBuildInputs = [ + python3Packages.gitpython + ]; + + dontUnpack = true; + + installPhase = + '' + mkdir -p $out/bin $out/lib + cp ${./updater.py} $out/bin/luarocks-packages-updater + cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" ) + wrapPythonProgramsIn "$out" + ''; + + shellHook = '' + export PYTHONPATH="maintainers/scripts:$PYTHONPATH" + export PATH="${path}:$PATH" + ''; + + meta.mainProgram = "luarocks-packages-updater"; +} + + diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages b/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py similarity index 88% rename from third_party/nixpkgs/maintainers/scripts/update-luarocks-packages rename to third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py index 32c2b44260..89a9bd9823 100755 --- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages +++ b/third_party/nixpkgs/pkgs/development/lua-modules/updater/updater.py @@ -1,6 +1,4 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-luarocks-shell.nix -i python3 - +#!/usr/bin/env python # format: # $ nix run nixpkgs#python3Packages.black -- update.py # type-check: @@ -32,12 +30,9 @@ from pluginupdate import update_plugins, FetchConfig, CleanEnvironment PKG_LIST = "maintainers/scripts/luarocks-packages.csv" TMP_FILE = "$(mktemp)" GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG = "maintainers/scripts/luarocks-config.lua" HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! -Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages - +Regenerate it with: nix run nixpkgs#update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ """.format( @@ -76,6 +71,12 @@ class LuaPlugin: # rename Editor to LangUpdate/ EcosystemUpdater class LuaEditor(pluginupdate.Editor): + + def create_parser(self): + parser = super().create_parser() + parser.set_defaults(proc=1) + return parser + def get_current_plugins(self): return [] @@ -101,9 +102,8 @@ class LuaEditor(pluginupdate.Editor): with tempfile.NamedTemporaryFile("w+") as f: f.write(HEADER) header2 = textwrap.dedent( - # header2 = inspect.cleandoc( """ - { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + { stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: final: prev: { """ @@ -165,12 +165,7 @@ def generate_pkg_nix(plug: LuaPlugin): Our cache key associates "p.name-p.version" to its rockspec """ log.debug("Generating nix expression for %s", plug.name) - custom_env = os.environ.copy() - custom_env["LUAROCKS_CONFIG"] = LUAROCKS_CONFIG - # we add --dev else luarocks wont find all the "scm" (=dev) versions of the - # packages - # , "--dev" cmd = ["luarocks", "nix"] if plug.maintainers: @@ -201,7 +196,7 @@ def generate_pkg_nix(plug: LuaPlugin): log.debug("running %s", " ".join(cmd)) - output = subprocess.check_output(cmd, env=custom_env, text=True) + output = subprocess.check_output(cmd, text=True) output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) @@ -211,8 +206,8 @@ def main(): "lua", ROOT, "", - default_in=ROOT.joinpath(PKG_LIST), - default_out=ROOT.joinpath(GENERATED_NIXFILE), + default_in=PKG_LIST, + default_out=GENERATED_NIXFILE, ) editor.run() @@ -220,5 +215,3 @@ def main(): if __name__ == "__main__": main() - -# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : diff --git a/third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix b/third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix index 045e2e8f9a..29c1b8b642 100644 --- a/third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/breakpad/default.nix @@ -1,30 +1,27 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, zlib }: let lss = fetchgit { url = "https://chromium.googlesource.com/linux-syscall-support"; - rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8"; - sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA="; + rev = "v2022.10.12"; + hash = "sha256-rF10v5oH4u9i9vnmFCVVl2Ew3h+QTiOsW64HeB0nRQU="; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "breakpad"; - version = "unstable-3b3469e"; + version = "2023.01.27"; src = fetchgit { url = "https://chromium.googlesource.com/breakpad/breakpad"; - rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff"; - sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8msKz0K10r13TwM3oS6GCIlMdf8k8HBKfKJkPmrUrIs="; }; + buildInputs = [ zlib ]; + postUnpack = '' ln -s ${lss} $sourceRoot/src/third_party/lss ''; - postPatch = '' - substituteInPlace src/client/linux/handler/exception_handler.cc \ - --replace "max(16384" "max(static_cast(16384)" - ''; - meta = with lib; { description = "An open-source multi-platform crash reporting system"; homepage = "https://chromium.googlesource.com/breakpad"; @@ -32,4 +29,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ berberman ]; platforms = platforms.all; }; -} +}) 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 836b8ed702..16fc10fe28 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.261"; + version = "0.6.264"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tIkO37NN48le7Q4d0GHfY2ZZcZ12oQ7dFjH5klpFDzU="; + sha256 = "sha256-bE1tQgFg01FsR/rYgKZCDkhor0NZrHN3ACDbXHcpO6Q="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix index 4bf6f8caca..49f33e016e 100644 --- a/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/datafusion/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "datafusion-cli"; - version = "22.0.0"; + version = "32.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; rev = version; - sha256 = "sha256-TWvbtuLmAdYS8otD2TpVlZx2FJS6DF03U2zM28FNsfc="; + sha256 = "sha256-QJOv2neEOxLvWoGuS3QyBqGOBi1KJQ8feK6LOrHBL8g="; }; sourceRoot = "${src.name}/datafusion-cli"; - cargoSha256 = "sha256-muWWVJDKm4rbpCK0SS7Zj6umFoMKGMScEAd2ZyZ5An8="; + cargoHash = "sha256-NYdxDFUBOBC3nTZB8STdZfOz3Dw0htFCqE0qBRMzQvw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix new file mode 100644 index 0000000000..7abc707540 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/changelog-d.nix @@ -0,0 +1,30 @@ +{ mkDerivation, base, bytestring, cabal-install-parsers +, Cabal-syntax, containers, directory, fetchgit, filepath +, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty +, regex-applicative +}: +mkDerivation { + pname = "changelog-d"; + version = "0.1"; + src = fetchgit { + url = "https://codeberg.org/fgaz/changelog-d"; + sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; + rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cabal-install-parsers Cabal-syntax containers + directory filepath generic-lens-lite mtl parsec pretty + regex-applicative + ]; + executableHaskellDepends = [ + base bytestring Cabal-syntax directory filepath + optparse-applicative + ]; + doHaddock = false; + description = "Concatenate changelog entries into a single one"; + license = lib.licenses.gpl3Plus; + mainProgram = "changelog-d"; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix new file mode 100644 index 0000000000..e4ba565808 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/changelog-d/default.nix @@ -0,0 +1,51 @@ +{ callPackage +, lib +, pkgs +}: + +(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: { + + version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; + + passthru.updateScript = lib.getExe (pkgs.writeShellApplication { + name = "update-changelog-d"; + runtimeInputs = [ + pkgs.cabal2nix + ]; + text = '' + cd pkgs/development/misc/haskell/changelog-d + cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix + ''; + }); + passthru.tests = { + basic = pkgs.runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } '' + mkdir changelogs + cat > changelogs/config < changelogs/a <$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x + ''; + }; + + meta = oldAttrs.meta // { + homepage = "https://codeberg.org/fgaz/changelog-d"; + maintainers = [ lib.maintainers.roberth ]; + }; + +}) diff --git a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix index 113cabc044..6c409a18e7 100644 --- a/third_party/nixpkgs/pkgs/development/misc/juce/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/juce/default.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: { libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.WebKit + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.MetalKit + darwin.apple_sdk.frameworks.WebKit ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix index d162753608..8aed144ff6 100644 --- a/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/newlib/default.nix @@ -31,13 +31,36 @@ stdenv.mkDerivation (finalAttrs: { # newlib expects CC to build for build platform, not host platform preConfigure = '' export CC=cc + '' + + # newlib tries to disable itself when building for Linux *except* + # when native-compiling. Unfortunately the check for "is cross + # compiling" was written when newlib was part of GCC and newlib + # was built along with GCC (therefore newlib was built to execute + # on the targetPlatform, not the hostPlatform). Unfortunately + # when newlib was extracted from GCC, this "is cross compiling" + # logic was not fixed. So we must disable it. + '' + substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs' ''; + configurePlatforms = [ "build" "target" ]; # flags copied from https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53310/gcc-arm-none-eabi-what-were-the-newlib-compilation-options # sort alphabetically configureFlags = [ - "--host=${stdenv.buildPlatform.config}" + "--with-newlib" + + # The newlib configury uses `host` to refer to the platform + # which is being used to compile newlib. Ugh. It does this + # because of its history: newlib used to be distributed with and + # built as part of gcc. + # + # To prevent nixpkgs from going insane, this package presents the + # "normal" view to the outside world: the binaries in $out will + # execute on `stdenv.hostPlatform`. We then fool newlib's build + # process into doing the right thing. + "--host=${stdenv.targetPlatform.config}" + ] ++ (if !nanoizeNewlib then [ "--disable-newlib-supplied-syscalls" "--disable-nls" diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch b/third_party/nixpkgs/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch new file mode 100644 index 0000000000..52d5e6adfe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch @@ -0,0 +1,42 @@ +diff -ur a/decoder.c b/decoder.c +--- a/decoder.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/decoder.c 2023-11-08 17:42:43.981838074 -0500 +@@ -94,7 +94,7 @@ + return PlaceObject(ctx, PyBool_FromLong((long)(value))); + } + +-static int handle_number(void *ctx, const char *value, unsigned int length) ++static int handle_number(void *ctx, const char *value, size_t length) + { + //fprintf(stderr, "handle_number: "); + //fwrite(value, length, 1, stderr); +@@ -127,7 +127,7 @@ + return status; + } + +-static int handle_string(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_string(void *ctx, const unsigned char *value, size_t length) + { + return PlaceObject(ctx, PyString_FromStringAndSize((char *)value, length)); + } +@@ -142,7 +142,7 @@ + return success; + } + +-static int handle_dict_key(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_dict_key(void *ctx, const unsigned char *value, size_t length) + { + PyObject *object = PyString_FromStringAndSize((const char *) value, length); + +diff -ur a/yajl.c b/yajl.c +--- a/yajl.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/yajl.c 2023-11-08 17:41:18.781350335 -0500 +@@ -161,7 +161,7 @@ + } + + static struct PyMethodDef yajl_methods[] = { +- {"dumps", (PyCFunctionWithKeywords)(py_dumps), METH_VARARGS | METH_KEYWORDS, ++ {"dumps", (PyCFunction)(py_dumps), METH_VARARGS | METH_KEYWORDS, + "yajl.dumps(obj [, indent=None])\n\n\ + Returns an encoded JSON string of the specified `obj`\n\ + \n\ diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix index 3e7dbc8e01..2459c492eb 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -42,6 +42,10 @@ rec { hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; + patches = [ + # Fixes several incompatible function pointer conversions, which are errors in clang 16. + ./0014-clang_incompatible_function_pointer_conversions.patch + ]; # just for submodule IIRC nativeBuildInputs = [ git ]; }; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index 8414217002..8d3f7f6e20 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -4,10 +4,10 @@ { cmdLineToolsVersion ? "11.0" , toolsVersion ? "26.1.1" -, platformToolsVersion ? "34.0.4" +, platformToolsVersion ? "34.0.5" , buildToolsVersions ? [ "34.0.0" ] , includeEmulator ? false -, emulatorVersion ? "32.1.14" +, emulatorVersion ? "34.1.9" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false @@ -15,7 +15,7 @@ , abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "25.2.9519653" +, ndkVersion ? "26.1.10909125" , ndkVersions ? [ndkVersion] , useGoogleAPIs ? false , useGoogleTVAddOns ? false diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index 67e6421dbb..70684bc1b3 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -26,14 +26,13 @@ let android = { versions = { cmdLineToolsVersion = "11.0"; - platformTools = "34.0.4"; + platformTools = "34.0.5"; buildTools = "34.0.0"; ndk = [ - "25.1.8937393" # LTS NDK - "26.0.10404224-rc1" + "26.1.10909125" ]; cmake = "3.6.4111459"; - emulator = "33.1.17"; + emulator = "34.1.9"; }; platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ]; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json index ecb649bba9..915a0f8872 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -11,7 +11,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -64,7 +64,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -110,7 +110,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -161,7 +161,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -198,7 +198,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -249,7 +249,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -286,7 +286,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -339,7 +339,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -399,7 +399,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -459,7 +459,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -519,7 +519,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -579,7 +579,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -639,7 +639,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -699,7 +699,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -759,7 +759,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -819,7 +819,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -879,7 +879,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -939,7 +939,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -985,7 +985,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1031,7 +1031,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1077,7 +1077,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1123,7 +1123,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1169,7 +1169,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1215,7 +1215,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1262,7 +1262,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1292,7 +1292,7 @@ } ], "displayName": "Android Emulator Hypervisor Driver for AMD Processors (installer: Deprecated)", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1322,7 +1322,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1350,7 +1350,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1378,7 +1378,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1413,7 +1413,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1441,7 +1441,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1469,7 +1469,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1506,7 +1506,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1534,7 +1534,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1562,7 +1562,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1591,7 +1591,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1619,7 +1619,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1647,7 +1647,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -1675,7 +1675,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", @@ -1703,7 +1703,7 @@ } ], "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", @@ -1731,7 +1731,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-alpha8", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", @@ -1759,7 +1759,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", @@ -1787,7 +1787,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", @@ -1815,7 +1815,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", @@ -1843,7 +1843,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta4", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", @@ -1871,7 +1871,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.0-beta5", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", @@ -1899,7 +1899,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", @@ -1927,7 +1927,7 @@ } ], "displayName": "Solver for ConstraintLayout 1.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", @@ -1962,7 +1962,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", @@ -1997,7 +1997,7 @@ } }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", @@ -2032,7 +2032,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", @@ -2067,7 +2067,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", @@ -2102,7 +2102,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", @@ -2137,7 +2137,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", @@ -2172,7 +2172,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", @@ -2207,7 +2207,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", @@ -2242,7 +2242,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", @@ -2277,7 +2277,7 @@ } }, "displayName": "ConstraintLayout for Android 1.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", @@ -2316,7 +2316,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2354,7 +2354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2394,7 +2394,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2435,7 +2435,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2473,7 +2473,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2515,7 +2515,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2553,7 +2553,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2593,7 +2593,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2634,7 +2634,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2679,7 +2679,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2710,7 +2710,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2748,7 +2748,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2788,7 +2788,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2829,7 +2829,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2874,7 +2874,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2905,7 +2905,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2943,7 +2943,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2986,7 +2986,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3027,7 +3027,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3072,7 +3072,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3110,7 +3110,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3150,7 +3150,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3191,7 +3191,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3236,7 +3236,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3274,7 +3274,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3314,7 +3314,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3355,7 +3355,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3393,7 +3393,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3423,7 +3423,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3455,7 +3455,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3493,7 +3493,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3531,7 +3531,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3569,7 +3569,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3602,7 +3602,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3643,7 +3643,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3684,7 +3684,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3725,7 +3725,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3763,7 +3763,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3795,7 +3795,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3833,7 +3833,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3871,7 +3871,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3909,7 +3909,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3942,7 +3942,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3983,7 +3983,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4024,7 +4024,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4065,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4103,7 +4103,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4140,7 +4140,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4172,7 +4172,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4210,7 +4210,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4248,7 +4248,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4286,7 +4286,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4319,7 +4319,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4360,7 +4360,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4401,7 +4401,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4442,7 +4442,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4487,7 +4487,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4519,7 +4519,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4557,7 +4557,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4595,7 +4595,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4633,7 +4633,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4673,7 +4673,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4714,7 +4714,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4755,7 +4755,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4798,7 +4798,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4843,7 +4843,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4882,7 +4882,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4919,7 +4919,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4951,7 +4951,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4989,7 +4989,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5027,7 +5027,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5060,7 +5060,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5101,7 +5101,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5142,7 +5142,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5226,7 +5226,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5266,7 +5266,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" } }, "dependency:1": { @@ -5281,7 +5286,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5320,7 +5325,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5364,7 +5369,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5401,7 +5406,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5438,7 +5443,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5464,9 +5469,9 @@ "archives": [ { "os": "all", - "sha1": "307bb9e03b215ebcab5d2a9edd47839009c57c8f", - "size": 733341370, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-26_r02.zip" + "sha1": "7a9764f1856119c4ceb311f6c76ff975a4c1e65d", + "size": 733331565, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-26_r03.zip" } ], "dependencies": { @@ -5482,13 +5487,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", "revision": "26-google_apis-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:3": "arm64-v8a", @@ -5518,7 +5523,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" } }, "dependency:1": { @@ -5533,7 +5543,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5569,7 +5579,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" } }, "dependency:1": { @@ -5584,7 +5599,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5622,7 +5637,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" } }, "dependency:1": { @@ -5637,7 +5657,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5682,7 +5702,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5726,7 +5746,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5763,7 +5783,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5800,7 +5820,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5826,9 +5846,9 @@ "archives": [ { "os": "all", - "sha1": "e4c06bbee837cd8266774fc4ddd1c70338ab6848", - "size": 730720117, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-27_r02.zip" + "sha1": "54dd140e1dd2db0fb7879beecf1068bf476ad171", + "size": 730732271, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-27_r03.zip" } ], "dependencies": { @@ -5844,13 +5864,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", "revision": "27-google_apis-arm64-v8a", "revision-details": { - "major:0": "2" + "major:0": "3" }, "type-details": { "abi:3": "arm64-v8a", @@ -5880,7 +5900,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" } }, "dependency:1": { @@ -5895,7 +5920,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5933,7 +5958,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" } }, "dependency:1": { @@ -5948,7 +5978,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -5993,7 +6023,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6032,7 +6062,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6076,7 +6106,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6106,7 +6136,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6136,7 +6166,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6180,7 +6210,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6216,7 +6246,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" } }, "dependency:1": { @@ -6231,7 +6266,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6267,7 +6302,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" } }, "dependency:1": { @@ -6282,7 +6322,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6330,7 +6370,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6366,7 +6406,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" } }, "dependency:1": { @@ -6381,7 +6426,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6417,7 +6462,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" } }, "dependency:1": { @@ -6432,7 +6482,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6472,7 +6522,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -6487,7 +6542,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6519,7 +6574,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6573,7 +6628,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6627,7 +6682,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6653,9 +6708,9 @@ "archives": [ { "os": "all", - "sha1": "e5938d570019150135c3bdf39442d103ea8aca86", - "size": 1169015927, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r12.zip" + "sha1": "5ef4888ce47a24a9e96e45418f9fd26f1c8e0f13", + "size": 1170272392, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r13.zip" } ], "dependencies": { @@ -6671,13 +6726,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", "revision": "29-google_apis-arm64-v8a", "revision-details": { - "major:0": "12" + "major:0": "13" }, "type-details": { "abi:3": "arm64-v8a", @@ -6717,7 +6772,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6763,7 +6818,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6817,7 +6872,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -6865,7 +6920,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" } }, "dependency:1": { @@ -6880,7 +6940,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -6928,7 +6988,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" } }, "dependency:1": { @@ -6943,7 +7008,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -6983,7 +7048,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -6998,7 +7068,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7024,9 +7094,9 @@ "archives": [ { "os": "all", - "sha1": "4096b210414f609e5f83bd846b6f77700ef23ac4", - "size": 768213685, - "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r11.zip" + "sha1": "56c0c2550580f2ba1b33009c77db017dbcb3d470", + "size": 827418923, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r12.zip" } ], "dependencies": { @@ -7037,13 +7107,13 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", "revision": "30-android-wear-arm64-v8a", "revision-details": { - "major:0": "11" + "major:0": "12" }, "type-details": { "abi:2": "arm64-v8a", @@ -7061,9 +7131,9 @@ "archives": [ { "os": "all", - "sha1": "e528d54306411a56ea2391557c95d4654d949d3c", - "size": 856620801, - "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r11.zip" + "sha1": "73a96614a2ddcf586e4c659c436d2360bc25badc", + "size": 901929440, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r12.zip" } ], "dependencies": { @@ -7074,13 +7144,13 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", "revision": "30-android-wear-x86", "revision-details": { - "major:0": "11" + "major:0": "12" }, "type-details": { "abi:2": "x86", @@ -7106,7 +7176,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -7148,7 +7218,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7174,9 +7244,9 @@ "archives": [ { "os": "all", - "sha1": "348aa8836d855745dd89295356330ad0b5622cb3", - "size": 1244297361, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r12.zip" + "sha1": "c3575404189a32f1d77ef0f080a09b8697ebb14b", + "size": 1244307632, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r13.zip" } ], "dependencies": { @@ -7192,13 +7262,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", "revision": "30-google_apis-arm64-v8a", "revision-details": { - "major:0": "12" + "major:0": "13" }, "type-details": { "abi:3": "arm64-v8a", @@ -7228,7 +7298,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" } }, "dependency:1": { @@ -7243,7 +7318,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -7279,7 +7354,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" } }, "dependency:1": { @@ -7294,7 +7374,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -7348,7 +7428,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7396,7 +7476,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" } }, "dependency:1": { @@ -7411,7 +7496,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7459,7 +7544,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" } }, "dependency:1": { @@ -7474,7 +7564,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7514,7 +7604,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -7529,7 +7624,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7561,7 +7656,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -7576,7 +7676,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7620,7 +7720,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7662,7 +7762,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7688,15 +7788,20 @@ "archives": [ { "os": "all", - "sha1": "afdec4698b61bfbcf8471eff418951d7183c7b55", - "size": 1415899601, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-31_r10.zip" + "sha1": "21bcb00f4ac3dc91c4040da7980b8c5f3c681781", + "size": 1415899687, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-31_r11.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" } }, "dependency:1": { @@ -7711,13 +7816,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", "revision": "31-google_apis-arm64-v8a", "revision-details": { - "major:0": "9" + "major:0": "11" }, "type-details": { "abi:3": "arm64-v8a", @@ -7747,7 +7852,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" } }, "dependency:1": { @@ -7762,7 +7872,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -7806,7 +7916,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" } }, "dependency:1": { @@ -7821,7 +7936,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -7857,7 +7972,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -7872,7 +7992,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -7899,20 +8019,111 @@ } }, "32": { + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "39f3c0eedd82f18ed701d516c943656e99ee9d80", + "size": 643079259, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-32_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-32-default-arm64-v8a", + "path": "system-images/android-32/default/arm64-v8a", + "revision": "32-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "5c66a5fd207bdf750bae908573fc50e40451ef96", + "size": 667377292, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-32_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "Intel x86_64 Atom System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-32-default-x86_64", + "path": "system-images/android-32/default/x86_64", + "revision": "32-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, "google_apis": { "arm64-v8a": { "archives": [ { "os": "all", - "sha1": "f64546f7cfcd751d89c8b7799d444676b217c623", - "size": 1536995320, + "sha1": "9e97d7ecd5b6cb9d9141bcbaaec134820ac569e1", + "size": 1536995307, "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-32_r06.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -7927,13 +8138,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", "revision": "32-google_apis-arm64-v8a", "revision-details": { - "major:0": "6" + "major:0": "7" }, "type-details": { "abi:3": "arm64-v8a", @@ -7963,7 +8174,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -7978,7 +8194,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -8022,7 +8238,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8037,7 +8258,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -8085,7 +8306,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8100,7 +8326,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -8140,7 +8366,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -8155,7 +8386,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8187,7 +8418,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -8202,7 +8438,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8228,9 +8464,9 @@ "archives": [ { "os": "all", - "sha1": "d1d540281261cf23895004a18705b62a53928fe6", - "size": 976844607, - "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-33_r02.zip" + "sha1": "949a8b23b3abb217ad2f710bbffe58d4b81dd8db", + "size": 1063091901, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-33_r03.zip" } ], "dependencies": { @@ -8240,12 +8476,93 @@ } } }, - "displayName": "Wear OS 4 - Preview ARM 64 v8a System Image", - "last-available-day": 19579, - "license": "android-sdk-preview-license", + "displayName": "Wear OS 4 ARM 64 v8a System Image", + "last-available-day": 19666, + "license": "android-sdk-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", "revision": "33-android-wear-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 4", + "id:0": "android-wear" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "94de5073c7078126614d8b7510aa4adde4327dd5", + "size": 1100218729, + "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-33_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, + "displayName": "Wear OS 4 Intel x86_64 Atom System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-33-android-wear-x86_64", + "path": "system-images/android-33/android-wear/x86_64", + "revision": "33-android-wear-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 4", + "id:0": "android-wear" + } + } + } + }, + "default": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "69883e92b77f8705af135ee86e1d87589f8f113e", + "size": 672331372, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-33_r02.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-33-default-arm64-v8a", + "path": "system-images/android-33/default/arm64-v8a", + "revision": "33-default-arm64-v8a", "revision-details": { "major:0": "2" }, @@ -8256,8 +8573,8 @@ "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { - "display:1": "Wear OS 4 - Preview", - "id:0": "android-wear" + "display:1": "Default Android System Image", + "id:0": "default" } } }, @@ -8265,24 +8582,29 @@ "archives": [ { "os": "all", - "sha1": "91f88f49e9484a86f18600fbfdfd281619b5ce79", - "size": 1013350511, - "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86_64-33_r02.zip" + "sha1": "d4698590184a21fe1e8754284130ad3006b5fc79", + "size": 694005732, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-33_r02.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" } } }, - "displayName": "Wear OS 4 - Preview Intel x86_64 Atom System Image", - "last-available-day": 19579, - "license": "android-sdk-preview-license", - "name": "system-image-33-android-wear-x86_64", - "path": "system-images/android-33/android-wear/x86_64", - "revision": "33-android-wear-x86_64", + "displayName": "Intel x86_64 Atom System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-33-default-x86_64", + "path": "system-images/android-33/default/x86_64", + "revision": "33-default-x86_64", "revision-details": { "major:0": "2" }, @@ -8293,8 +8615,8 @@ "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { - "display:1": "Wear OS 4 - Preview", - "id:0": "android-wear" + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -8304,15 +8626,20 @@ "archives": [ { "os": "all", - "sha1": "5efee22c6b46ca0b0614d2881e1f8170fbf5649d", - "size": 1629988084, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r13.zip" + "sha1": "9e314318536875458eaf68d02d411c59a386ab59", + "size": 1629980162, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r15.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8327,13 +8654,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", "revision": "33-google_apis-arm64-v8a", "revision-details": { - "major:0": "13" + "major:0": "15" }, "type-details": { "abi:3": "arm64-v8a", @@ -8355,15 +8682,20 @@ "archives": [ { "os": "all", - "sha1": "50bc7f4082ea5dcb2e51fd65ddf243f934bcb40a", - "size": 1545116967, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r13.zip" + "sha1": "966eadeb61cd888a79477851e51349eed103e5c8", + "size": 1545118291, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r15.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8378,13 +8710,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", "revision": "33-google_apis-x86_64", "revision-details": { - "major:0": "13" + "major:0": "15" }, "type-details": { "abi:3": "x86_64", @@ -8422,7 +8754,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8437,7 +8774,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -8473,7 +8810,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8488,7 +8830,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -8520,15 +8862,20 @@ "archives": [ { "os": "all", - "sha1": "d8ec0e59b3ba2c5d43cfc403bc1baffff40007ac", - "size": 880769986, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r01.zip" + "sha1": "81b98fc5c3521a3a872667851c7f6bf61dfcdd5a", + "size": 883278287, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-34_r02.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -8543,13 +8890,13 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", "revision": "34-android-tv-arm64-v8a", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:2": "arm64-v8a", @@ -8567,15 +8914,20 @@ "archives": [ { "os": "all", - "sha1": "33257a883decee2c120893f739d3a1806afdc3ca", - "size": 868584259, - "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r01.zip" + "sha1": "3be0ccf9611c7125e9c43083ae3ca6abba5f45b7", + "size": 880214246, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-34_r02.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" } }, "dependency:1": { @@ -8590,13 +8942,13 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", "revision": "34-android-tv-x86", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:2": "x86", @@ -8611,20 +8963,111 @@ } } }, - "google_apis": { + "default": { "arm64-v8a": { "archives": [ { "os": "all", - "sha1": "e910dfb0002f52753933399ea93957023d2d2e60", - "size": 1592115349, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r07.zip" + "sha1": "ab83da3f827ee72df97ebeedd296d16f616edb38", + "size": 705123892, + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-34_r02.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "ARM 64 v8a System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-34-default-arm64-v8a", + "path": "system-images/android-34/default/arm64-v8a", + "revision": "34-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "f5fe4d75eb589f5f876232422aefbc30f18a8ee7", + "size": 720744990, + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-34_r02.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, + "displayName": "Intel x86_64 Atom System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-34-default-x86_64", + "path": "system-images/android-34/default/x86_64", + "revision": "34-default-x86_64", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "34", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } + } + }, + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "ed608d998425371504ab7cf94a9392274d11f958", + "size": 1588260488, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-34_r10.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -8639,13 +9082,13 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", "revision": "34-google_apis-arm64-v8a", "revision-details": { - "major:0": "7" + "major:0": "10" }, "type-details": { "abi:3": "arm64-v8a", @@ -8667,15 +9110,20 @@ "archives": [ { "os": "all", - "sha1": "ad1a351d22ea0cfb3fe30201da3d410c24d9fd9d", - "size": 1545718157, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r07.zip" + "sha1": "0f71bae97a2957b2f0a90d6f860eeef3c3aad639", + "size": 1541568459, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-34_r10.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -8690,13 +9138,13 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", "revision": "34-google_apis-x86_64", "revision-details": { - "major:0": "7" + "major:0": "10" }, "type-details": { "abi:3": "x86_64", @@ -8720,21 +9168,26 @@ "archives": [ { "os": "macosx", - "sha1": "43aa221d54537389d69ac49111b352362af490b8", - "size": 1553043568, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r07-darwin.zip" + "sha1": "4bc4fd4a2cba586c9e3e36325c1a74244802a04a", + "size": 1563791983, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r06-darwin.zip" }, { "os": "linux", - "sha1": "43aa221d54537389d69ac49111b352362af490b8", - "size": 1553043568, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r07-linux.zip" + "sha1": "4bc4fd4a2cba586c9e3e36325c1a74244802a04a", + "size": 1563791983, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r06-linux.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -8749,13 +9202,13 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", "path": "system-images/android-34/google_apis_playstore/arm64-v8a", "revision": "34-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "7" + "major:0": "10" }, "type-details": { "abi:3": "arm64-v8a", @@ -8777,15 +9230,20 @@ "archives": [ { "os": "all", - "sha1": "29d3e349cc906f3eec80c8238898ebaed6e62233", - "size": 1514892655, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34_r07.zip" + "sha1": "4704341d617f13997d52b74da8c1641a2b796681", + "size": 1502940011, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34_r06.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -8800,13 +9258,13 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-34-google_apis_playstore-x86_64", "path": "system-images/android-34/google_apis_playstore/x86_64", "revision": "34-google_apis_playstore-x86_64", "revision-details": { - "major:0": "7" + "major:0": "10" }, "type-details": { "abi:3": "x86_64", @@ -8827,6 +9285,102 @@ } }, "TiramisuPrivacySandbox": { + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "fc34553283bcd0a52966e503d2a20f7de33a2600", + "size": 1630843209, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-TiramisuPrivacySandbox_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google APIs ARM 64 v8a System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis-arm64-v8a", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis/arm64-v8a", + "revision": "TiramisuPrivacySandbox-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "47c1b56d4974e4fbe22e36580cf6cfdc6aa1de85", + "size": 1521841948, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-TiramisuPrivacySandbox_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, + "displayName": "Google APIs Intel x86_64 Atom System Image", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis-x86_64", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis/x86_64", + "revision": "TiramisuPrivacySandbox-google_apis-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, "google_apis_playstore": { "arm64-v8a": { "archives": [ @@ -8846,7 +9400,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8861,7 +9420,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", @@ -8898,7 +9457,12 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } }, "dependency:1": { @@ -8913,7 +9477,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", @@ -9166,21 +9730,26 @@ "archives": [ { "os": "macosx", - "sha1": "a312b771639410ede98d101e21f0d113201d2cc4", - "size": 1513441966, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r01-darwin.zip" + "sha1": "e6aabf922aa936365236aa1ad5525a453ea7351e", + "size": 1553125173, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r02-darwin.zip" }, { "os": "linux", - "sha1": "a312b771639410ede98d101e21f0d113201d2cc4", - "size": 1513441966, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r01-linux.zip" + "sha1": "e6aabf922aa936365236aa1ad5525a453ea7351e", + "size": 1553125173, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-UpsideDownCakePrivacySandbox_r02-linux.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -9195,17 +9764,17 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-arm-dbt-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/arm64-v8a", "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:4": "arm64-v8a", - "api-level:0": "33", + "api-level:0": "34", "codename:1": "UpsideDownCakePrivacySandbox", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" @@ -9224,15 +9793,20 @@ "archives": [ { "os": "all", - "sha1": "687378b8490f67bbb9b081fdf50c3c86f7f6a6bb", - "size": 1464123578, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCakePrivacySandbox_r01.zip" + "sha1": "c43caa79b262f6baea715f7174e614fb6ebd0922", + "size": 1514888929, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-UpsideDownCakePrivacySandbox_r02.zip" } ], "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" } }, "dependency:1": { @@ -9247,17 +9821,17 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "system-image-UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-UpsideDownCakePrivacySandbox/google_apis_playstore/x86_64", "revision": "UpsideDownCakePrivacySandbox-google_apis_playstore-x86_64", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "abi:4": "x86_64", - "api-level:0": "33", + "api-level:0": "34", "codename:1": "UpsideDownCakePrivacySandbox", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" @@ -9332,7 +9906,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9378,7 +9952,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9424,7 +9998,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9470,7 +10044,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9516,7 +10090,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9562,7 +10136,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9608,7 +10182,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9654,7 +10228,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9700,7 +10274,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -9745,7 +10319,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -9790,7 +10364,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9836,7 +10410,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9882,7 +10456,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9928,7 +10502,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -9974,7 +10548,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10020,7 +10594,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -10065,7 +10639,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10111,7 +10685,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -10156,7 +10730,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -10202,7 +10776,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -10247,7 +10821,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -10292,7 +10866,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -10337,7 +10911,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -10382,7 +10956,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -10427,7 +11001,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -10472,7 +11046,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -10517,7 +11091,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -10562,7 +11136,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -10607,7 +11181,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -10652,7 +11226,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -10697,7 +11271,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -10742,7 +11316,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -10787,7 +11361,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -10832,7 +11406,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -10877,7 +11451,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -10922,7 +11496,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -10967,7 +11541,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -11012,7 +11586,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -11057,7 +11631,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -11102,7 +11676,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11149,7 +11723,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11196,7 +11770,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -11241,7 +11815,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -11286,7 +11860,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -11331,7 +11905,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -11376,7 +11950,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11423,7 +11997,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11470,7 +12044,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -11517,7 +12091,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -11562,7 +12136,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -11607,7 +12181,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -11652,7 +12226,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -11697,7 +12271,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -11742,7 +12316,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -11787,7 +12361,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -11825,7 +12399,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -11863,7 +12437,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -11901,7 +12475,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -11940,7 +12514,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -11978,7 +12552,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -12016,7 +12590,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -12054,7 +12628,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -12092,7 +12666,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -12131,7 +12705,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -12170,7 +12744,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -12250,7 +12824,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -12288,7 +12862,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -12326,7 +12900,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -12364,7 +12938,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -12404,7 +12978,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -12441,7 +13015,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -12516,7 +13090,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -12553,7 +13127,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0-rc01", @@ -12629,7 +13203,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0-alpha15", @@ -12667,7 +13241,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -12705,7 +13279,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -12742,7 +13316,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -12779,7 +13353,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -12816,7 +13390,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -12853,7 +13427,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -12890,7 +13464,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -12927,7 +13501,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -12964,7 +13538,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -13206,6 +13780,44 @@ } } }, + "32.1.15": { + "archives": [ + { + "os": "linux", + "sha1": "b78f4d2c22d6aa5ca83d26ccb68cbf885a273888", + "size": 270191252, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-10696886.zip" + }, + { + "os": "windows", + "sha1": "90bd9f6de3473fe54c779cda87b67a4f381a1ed5", + "size": 333020049, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-10696886.zip" + }, + { + "os": "macosx", + "sha1": "5e53ac67e346cc9b575e2d8cbeac836456218f96", + "size": 309355067, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10696886.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "32.1.15", + "revision-details": { + "major:0": "32", + "micro:2": "15", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "32.1.8": { "archives": [ { @@ -13341,6 +13953,44 @@ } } }, + "33.1.20": { + "archives": [ + { + "os": "macosx", + "sha1": "8c42e2bbef2e05bc49b75c7db85ed64e760bf8bf", + "size": 323263766, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-10871397.zip" + }, + { + "os": "linux", + "sha1": "e3f5d94d29951964cbcdd09e2950d9a674664ac8", + "size": 252025229, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-10871397.zip" + }, + { + "os": "windows", + "sha1": "4be4223b1459a7f04a00abdc9e0532650f024210", + "size": 365300834, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-10871397.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "33.1.20", + "revision-details": { + "major:0": "33", + "micro:2": "20", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "33.1.4": { "archives": [ { @@ -13430,6 +14080,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "34.1.9": { + "archives": [ + { + "os": "macosx", + "sha1": "5d59f7b706d09c339f04dae6dc36f226c2b21381", + "size": 327266989, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11009885.zip" + }, + { + "os": "linux", + "sha1": "ba6ffcefd507be5fc14d1319a60c92c5d80c0ea3", + "size": 253085442, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-11009885.zip" + }, + { + "os": "windows", + "sha1": "7ef53d77d429f77952b643062947c97dac8e2167", + "size": 367238620, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-11009885.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 19666, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "34.1.9", + "revision-details": { + "major:0": "34", + "micro:2": "9", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -13455,7 +14143,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -13492,7 +14180,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", @@ -13538,7 +14226,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -13583,7 +14271,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -13628,7 +14316,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -13673,7 +14361,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -13719,7 +14407,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -13764,7 +14452,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -13811,7 +14499,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -13858,7 +14546,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -13903,7 +14591,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -13948,7 +14636,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -13994,7 +14682,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -14039,7 +14727,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -14085,7 +14773,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -14131,7 +14819,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -14176,7 +14864,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -14222,7 +14910,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -14267,7 +14955,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -14312,7 +15000,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -14357,7 +15045,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -14403,7 +15091,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -14448,7 +15136,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -14493,7 +15181,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -14539,7 +15227,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -14585,7 +15273,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -14631,7 +15319,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -14677,7 +15365,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -14723,7 +15411,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -14769,7 +15457,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -14814,7 +15502,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -14859,7 +15547,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -14904,7 +15592,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -14950,7 +15638,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -14996,7 +15684,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -15042,7 +15730,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -15087,7 +15775,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -15133,7 +15821,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -15179,7 +15867,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -15225,7 +15913,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -15271,7 +15959,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -15316,7 +16004,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -15361,7 +16049,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -15406,7 +16094,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -15422,6 +16110,121 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "26.0.10636728-rc2": { + "archives": [ + { + "os": "macosx", + "sha1": "295be7e8514eff8dae7aa01dc7e9978fa85fa64e", + "size": 983731026, + "url": "https://dl.google.com/android/repository/android-ndk-r26-rc1-darwin.zip" + }, + { + "os": "linux", + "sha1": "6ec8c08204409fea4853bf0317660caadabfc8b0", + "size": 668698776, + "url": "https://dl.google.com/android/repository/android-ndk-r26-rc1-linux.zip" + }, + { + "os": "windows", + "sha1": "d4f4aa8a863e6e7cc0c433f1ecd8a304da4848a7", + "size": 664889050, + "url": "https://dl.google.com/android/repository/android-ndk-r26-rc1-windows.zip" + } + ], + "displayName": "NDK (Side by side) 26.0.10636728", + "last-available-day": 19666, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/26.0.10636728", + "revision": "26.0.10636728-rc2", + "revision-details": { + "major:0": "26", + "micro:2": "10636728", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "26.0.10792818": { + "archives": [ + { + "os": "macosx", + "sha1": "5c74249e80549db0f2feddc58e1838d3d2cc6d42", + "size": 983623748, + "url": "https://dl.google.com/android/repository/android-ndk-r26-darwin.zip" + }, + { + "os": "linux", + "sha1": "d3bef08e0e43acd9e7815538df31818692d548bb", + "size": 668596633, + "url": "https://dl.google.com/android/repository/android-ndk-r26-linux.zip" + }, + { + "os": "windows", + "sha1": "7fcf5789bc248c130af675720353819f72b02b94", + "size": 664790510, + "url": "https://dl.google.com/android/repository/android-ndk-r26-windows.zip" + } + ], + "displayName": "NDK (Side by side) 26.0.10792818", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/26.0.10792818", + "revision": "26.0.10792818", + "revision-details": { + "major:0": "26", + "micro:2": "10792818", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "26.1.10909125": { + "archives": [ + { + "os": "macosx", + "sha1": "44df0485bbd565b89585b687bb748521a98f65a8", + "size": 985051981, + "url": "https://dl.google.com/android/repository/android-ndk-r26b-darwin.zip" + }, + { + "os": "linux", + "sha1": "fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4", + "size": 669320864, + "url": "https://dl.google.com/android/repository/android-ndk-r26b-linux.zip" + }, + { + "os": "windows", + "sha1": "17453c61a59e848cffb8634f2c7b322417f1732e", + "size": 661624075, + "url": "https://dl.google.com/android/repository/android-ndk-r26b-windows.zip" + } + ], + "displayName": "NDK (Side by side) 26.1.10909125", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/26.1.10909125", + "revision": "26.1.10909125", + "revision-details": { + "major:0": "26", + "micro:2": "10909125", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -15454,7 +16257,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15499,7 +16302,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15544,7 +16347,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15589,7 +16392,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -15635,7 +16438,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15680,7 +16483,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -15727,7 +16530,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -15774,7 +16577,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15819,7 +16622,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15864,7 +16667,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15910,7 +16713,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -15955,7 +16758,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16001,7 +16804,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16047,7 +16850,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16092,7 +16895,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16138,7 +16941,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16183,7 +16986,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16228,7 +17031,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16273,7 +17076,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16319,7 +17122,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16364,7 +17167,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16409,7 +17212,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16455,7 +17258,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16501,7 +17304,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16547,7 +17350,7 @@ } }, "displayName": "NDK", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -16705,6 +17508,44 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "34.0.5": { + "archives": [ + { + "os": "macosx", + "sha1": "2650ee512964f189f6a4838cf50a62f398349bbf", + "size": 11194858, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.5-darwin.zip" + }, + { + "os": "linux", + "sha1": "96097475cf7b279fdd8f218f5d043ffe94104ec3", + "size": 6333075, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.5-linux.zip" + }, + { + "os": "windows", + "sha1": "a390d5e377a985476612038335ed5ac6d27c12e4", + "size": 5909544, + "url": "https://dl.google.com/android/repository/platform-tools_r34.0.5-windows.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 19666, + "license": "android-sdk-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "34.0.5", + "revision-details": { + "major:0": "34", + "micro:2": "5", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -16718,7 +17559,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -16750,7 +17591,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -16782,7 +17623,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -16814,7 +17655,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -16846,7 +17687,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -16878,7 +17719,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -16910,7 +17751,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -16942,7 +17783,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -16974,7 +17815,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -17006,7 +17847,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -17050,7 +17891,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17083,7 +17924,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -17115,7 +17956,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -17147,7 +17988,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -17179,7 +18020,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -17211,7 +18052,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -17243,7 +18084,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -17275,7 +18116,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -17307,7 +18148,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -17339,7 +18180,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -17371,7 +18212,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -17415,7 +18256,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17448,7 +18289,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -17480,7 +18321,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -17512,7 +18353,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -17538,13 +18379,13 @@ "archives": [ { "os": "all", - "sha1": "eef99bd4617e80da85187a183eba356d787100d9", - "size": 67334130, - "url": "https://dl.google.com/android/repository/platform-33_r02.zip" + "sha1": "394bc86d8d3452aa4d419b67743025a6fb2cd9d0", + "size": 67334237, + "url": "https://dl.google.com/android/repository/platform-33-ext3_r03.zip" } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -17570,13 +18411,13 @@ "archives": [ { "os": "all", - "sha1": "618f593e7d30c1c9ff530d1bf2fec155d47d43e0", - "size": 63180660, - "url": "https://dl.google.com/android/repository/platform-34-ext7_r01.zip" + "sha1": "f09b07da8aea238a81b71d6fedb815e13aa13e58", + "size": 63180079, + "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip" } ], - "displayName": "Android SDK Platform 34", - "last-available-day": 19579, + "displayName": "Android SDK Platform 34-ext8", + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-34", @@ -17620,7 +18461,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17665,7 +18506,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17710,7 +18551,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17743,7 +18584,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -17775,7 +18616,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -17807,7 +18648,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -17839,7 +18680,7 @@ } ], "displayName": "Android SDK Platform TiramisuPrivacySandbox", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", @@ -17870,7 +18711,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -17896,22 +18737,22 @@ "archives": [ { "os": "all", - "sha1": "e8d6d1516e2ac0feb0e0ec20bcfb2fce483b961e", - "size": 63911495, - "url": "https://dl.google.com/android/repository/platform-UpsideDownCakePrivacySandbox_r01.zip" + "sha1": "5701983e5660f11930e2da0ee28cb53426fd4933", + "size": 63995218, + "url": "https://dl.google.com/android/repository/platform-UpsideDownCakePrivacySandbox_r02.zip" } ], "displayName": "Android SDK Platform UpsideDownCakePrivacySandbox", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-UpsideDownCakePrivacySandbox", "revision": "UpsideDownCakePrivacySandbox", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { - "api-level:0": "33", + "api-level:0": "34", "codename:1": "UpsideDownCakePrivacySandbox", "element-attributes": { "xsi:type": "ns11:platformDetailsType" @@ -17983,7 +18824,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -18019,7 +18860,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -18045,7 +18886,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -18073,7 +18914,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -18100,7 +18941,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -18127,7 +18968,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -18154,7 +18995,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -18181,7 +19022,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -18208,7 +19049,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -18235,7 +19076,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -18262,7 +19103,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -18289,7 +19130,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -18316,7 +19157,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -18343,7 +19184,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -18370,7 +19211,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -18397,7 +19238,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -18424,7 +19265,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -18451,7 +19292,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -18478,7 +19319,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -18505,7 +19346,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -18532,7 +19373,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -18559,7 +19400,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -18580,19 +19421,19 @@ "archives": [ { "os": "all", - "sha1": "41f67d064dbe84f32a763d65a05c40285c2fbb70", - "size": 53812451, + "sha1": "0d2dcece3bbfc032f98986ce7f665b6b97d26bbf", + "size": 45502712, "url": "https://dl.google.com/android/repository/sources-34_r01.zip" } ], "displayName": "Sources for Android 34", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", "revision": "34", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "api-level:0": "34", @@ -18629,12 +19470,15 @@ "dependencies": { "dependency:0": { "element-attributes": { - "path": "patcher;v4" + "path": "emulator" } }, "dependency:1": { "element-attributes": { - "path": "emulator" + "path": "platform-tools" + }, + "min-revision:0": { + "major:0": "20" } }, "dependency:2": { @@ -18647,7 +19491,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 19579, + "last-available-day": 19666, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 53c1dc13cd..f8b5c9f561 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-rZyTdVn0mnNLrGPehah62/AvTgUpNEtzn+Di1O3G3Sg="; + sha256 = "sha256-Bgp2IB8af5FV2W22GlAkzybLB/5UYnJSC607OZHejjo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix index c43260770e..f670f79a8b 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.33.1"; + version = "1.34.1"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "142h53qwmibi9bpdwla9ard771vcri8yibnynvgj5nvfgapj2p4z"; + sha256 = "0whnhcf7a3j01693254qqwfk9d3xa4icv4kyqkn4ihxyibznb91d"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix index d7ddb48ccd..97013e5855 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -49,6 +49,7 @@ mapAliases { "@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01 "@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 @@ -98,6 +99,7 @@ mapAliases { manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 + inherit (pkgs) mathjax-node-cli; # added 2023-11-02 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 inherit (pkgs) mermaid-cli; # added 2023-10-01 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 @@ -106,6 +108,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 = parcel; # added 2023-09-04 + pkg = pkgs.vercel-pkg; # added 2023-10-04 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 diff --git a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix index bd72295569..7b57757a07 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -60,5 +60,4 @@ vscode-html-languageserver-bin = "html-languageserver"; vscode-json-languageserver-bin = "json-languageserver"; webtorrent-cli = "webtorrent"; - "@zwave-js/server" = "zwave-server"; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 74f38684a9..56b4337509 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -188,7 +188,6 @@ , "peerflix" , "peerflix-server" , {"pgrok-build-deps": "../../tools/networking/pgrok/build-deps"} -, "pkg" , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" @@ -310,5 +309,4 @@ , "@yaegassy/coc-nginx" , "yalc" , "yarn" -, "@zwave-js/server" ] diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index ce2a41d5a6..8041c85ff1 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -31,22 +31,22 @@ let sha512 = "1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA=="; }; }; - "@achrinza/node-ipc-9.2.7" = { + "@achrinza/node-ipc-9.2.8" = { name = "_at_achrinza_slash_node-ipc"; packageName = "@achrinza/node-ipc"; - version = "9.2.7"; + version = "9.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.7.tgz"; - sha512 = "/EvNkqB4HNxPWCZASmgrjqG8gIdPOolD67LGASvGMp/FY5ne0rbvpYg5o9x8RmgjAl8KdmNQ4YlV1et9DYiW8g=="; + url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.8.tgz"; + sha512 = "DSzEEkbMYbAUVlhy7fg+BzccoRuSQzqHbIPGxGv19OJ2WKwS3/9ChAnQcII4g+GujcHhyJ8BUuOVAx/S5uAfQg=="; }; }; - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@akryum/winattr-3.0.0" = { @@ -58,31 +58,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@alcalzone/jsonl-db-3.1.0" = { - name = "_at_alcalzone_slash_jsonl-db"; - packageName = "@alcalzone/jsonl-db"; - version = "3.1.0"; + "@alcalzone/ansi-tokenize-0.1.3" = { + name = "_at_alcalzone_slash_ansi-tokenize"; + packageName = "@alcalzone/ansi-tokenize"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/jsonl-db/-/jsonl-db-3.1.0.tgz"; - sha512 = "Wc1nxOyJVBF0NWrG1X7SQcb6mWWtr2i9e1cOSHQsjmnHlBYlFoj82fsP1NCZrHdXBhqQyYpdXP8ZQ8zz0iddFQ=="; - }; - }; - "@alcalzone/pak-0.9.0" = { - name = "_at_alcalzone_slash_pak"; - packageName = "@alcalzone/pak"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.9.0.tgz"; - sha512 = "to2mQdMPxu/fF3at1QozRfEqrKTv7p0kLFXdv/kadjFm9Tph5JZCPC+gzQQhe5Cw2pQc8JkbmvOasENNHlezPQ=="; - }; - }; - "@alcalzone/proper-lockfile-4.1.3-0" = { - name = "_at_alcalzone_slash_proper-lockfile"; - packageName = "@alcalzone/proper-lockfile"; - version = "4.1.3-0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/proper-lockfile/-/proper-lockfile-4.1.3-0.tgz"; - sha512 = "8mlX3l5Xc+pYyiK9G156NyMosNuvvukL+TtNMqw7ti2zgVpz+WqPMPb2J1WU8I03Jbm4cXF+Q0D53hWvQqLQ0Q=="; + url = "https://registry.npmjs.org/@alcalzone/ansi-tokenize/-/ansi-tokenize-0.1.3.tgz"; + sha512 = "3yWxPTq3UQ/FY9p1ErPxIyfT64elWaMvM9lIHnaqpyft63tkxodF5aUElYHrdisWve5cETkh1+KBw1yJuW0aRw=="; }; }; "@alloc/quick-lru-5.2.0" = { @@ -103,31 +85,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1602.4" = { + "@angular-devkit/architect-0.1700.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1602.4"; + version = "0.1700.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.4.tgz"; - sha512 = "SQr/FZ8wEOGC6EM+7V5rWyb/qpK0LFND/WbES5l+Yvwv+TEyPihsh5QCPmvPxi45eFbaHPrXkIZnvxnkxRDN/A=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.0.tgz"; + sha512 = "whi7HvOjv1J3He9f+H8xNJWKyjAmWuWNl8gxNW6EZP/XLcrOu+/5QT4bPtXQBRIL/avZuc++5sNQS+kReaNCig=="; }; }; - "@angular-devkit/core-16.2.4" = { + "@angular-devkit/core-17.0.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.2.4"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.4.tgz"; - sha512 = "VCZ1z1lDbFkbYkQ6ZMEFfmNzkMEOCBKSzAhWutRyd7oM02by4/5SvDSXd5BMvMxWhPJ/567DdSPOfhhnXQkkDg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-17.0.0.tgz"; + sha512 = "QUu3LnEi4A8t733v2+I0sLtyBJx3Q7zdTAhaauCbxbFhDid0cbYm8hYsyG/njor1irTPxSJbn6UoetVkwUQZxg=="; }; }; - "@angular-devkit/schematics-16.2.4" = { + "@angular-devkit/schematics-17.0.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.2.4"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.4.tgz"; - sha512 = "TsSflKJlaHzKgcU/taQg5regmBP/ggvwVtAbJRBWmCaeQJzobFo68+rtwfYfvuQXKAR6KsbSJc97mqmq6zmTwQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.0.0.tgz"; + sha512 = "LD7fjDORuBf139/oJ/gSwbIzQPfsm6Y67s1FD+XLi0QXaRt6dw4r7BMD08l1r//oPQofNgbEH4coGVO4NdCL/A=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -301,13 +283,22 @@ let sha512 = "xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA=="; }; }; - "@astrojs/compiler-1.5.7" = { + "@astrojs/compiler-1.8.2" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "1.5.7"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.5.7.tgz"; - sha512 = "dFU7GAMbpTUGPkRoCoMQrGFlTe3qIiQMSOxIXp/nB1Do4My9uogjEmBHdR5Cwr4i6rc5/1R3Od9v8kU/pkHXGQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz"; + sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; + }; + }; + "@astrojs/compiler-2.3.0" = { + name = "_at_astrojs_slash_compiler"; + packageName = "@astrojs/compiler"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.3.0.tgz"; + sha512 = "pxYRAaRdMS6XUll8lbFM+Lr0DI1HKIDT+VpiC+S+9di5H/nmm3znZOgdMlLiMxADot+56eps+M1BvtKfQremXA=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -418,13 +409,13 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; - "@aws-sdk/client-cloudformation-3.423.0" = { + "@aws-sdk/client-cloudformation-3.445.0" = { name = "_at_aws-sdk_slash_client-cloudformation"; packageName = "@aws-sdk/client-cloudformation"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.423.0.tgz"; - sha512 = "lWsVMSDnTP7zDb1xx+8OkhQu4hISmV8edrBKJqVk9XZ7ktZ6bpITswir5l7qYQ4IFXp8rxcV81LcUj/iJHtrYg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.445.0.tgz"; + sha512 = "rhkU/a5iV1ntUw0ggfde8DRkjdRHmPEwlThZF/TT7leEhRKG97gJo7VztwwsSwrXeNPgXrhn0Qse2VaPDTFdVQ=="; }; }; "@aws-sdk/client-s3-3.296.0" = { @@ -436,13 +427,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.423.0" = { + "@aws-sdk/client-s3-3.445.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.423.0.tgz"; - sha512 = "Sn/6fotTDGp+uUfPU0JrKszHT/cYwZonly6Ahi4R/uxASLQnOEAF7MwVSjms+/LGu72Qs0Tt7B7RKW76GI4OIA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.445.0.tgz"; + sha512 = "2G+3MnO78irZRjlfkdvtlKRQ3yuOfrRMg8mztKpMw0q/9WHtwCcmaUUpl1bXwJ+BcNTVHopLQXdbzCeaxxI92w=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -454,13 +445,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.423.0" = { + "@aws-sdk/client-sso-3.445.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.423.0.tgz"; - sha512 = "znIufHkwhCIePgaYciIs3x/+BpzR57CZzbCKHR9+oOvGyufEPPpUT5bFLvbwTgfiVkTjuk6sG/ES3U5Bc+xtrA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.445.0.tgz"; + sha512 = "me4LvqNnu6kxi+sW7t0AgMv1Yi64ikas0x2+5jv23o6Csg32w0S0xOjCTKQYahOA5CMFunWvlkFIfxbqs+Uo7w=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -481,13 +472,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.423.0" = { + "@aws-sdk/client-sts-3.445.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.423.0.tgz"; - sha512 = "EcpkKu02QZbRX6dQE0u7a8RgWrn/5riz1qAlKd7rM8FZJpr/D6GGX8ZzWxjgp7pRUgfNvinTmIudDnyQY3v9Mg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.445.0.tgz"; + sha512 = "ogbdqrS8x9O5BTot826iLnTQ6i4/F5BSi/74gycneCxYmAnYnyUBNOWVnynv6XZiEWyDJQCU2UtMd52aNGW1GA=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -499,6 +490,15 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; + "@aws-sdk/core-3.445.0" = { + name = "_at_aws-sdk_slash_core"; + packageName = "@aws-sdk/core"; + version = "3.445.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.445.0.tgz"; + sha512 = "6GYLElUG1QTOdmXG8zXa+Ull9IUeSeItKDYHKzHYfIkbsagMfYlf7wm9XIYlatjtgodNfZ3gPHAJfRyPmwKrsg=="; + }; + }; "@aws-sdk/credential-provider-env-3.296.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; @@ -508,13 +508,13 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.418.0" = { + "@aws-sdk/credential-provider-env-3.433.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz"; - sha512 = "e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz"; + sha512 = "Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -535,13 +535,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.423.0" = { + "@aws-sdk/credential-provider-ini-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.423.0.tgz"; - sha512 = "7CsFWz8g7dQmblp57XzzxMirO4ClowGZIOwAheBkmk6q1XHbllcHFnbh2kdPyQQ0+JmjDg6waztIc7dY7Ycfvw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.445.0.tgz"; + sha512 = "R7IYSGjNZ5KKJwQJ2HNPemjpAMWvdce91i8w+/aHfqeGfTXrmYJu99PeGRyyBTKEumBaojyjTRvmO8HzS+/l7g=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -553,13 +553,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.423.0" = { + "@aws-sdk/credential-provider-node-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.423.0.tgz"; - sha512 = "lygbGJJUnDpgo8OEqdoYd51BKkyBVQ1Catiua/m0aHvL+SCmVrHiYPQPawWYGxpH8X3DXdXa0nd0LkEaevrHRg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.445.0.tgz"; + sha512 = "zI4k4foSjQRKNEsouculRcz7IbLfuqdFxypDLYwn+qPNMqJwWJ7VxOOeBSPUpHFcd7CLSfbHN2JAhQ7M02gPTA=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -571,13 +571,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.418.0" = { + "@aws-sdk/credential-provider-process-3.433.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz"; - sha512 = "xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz"; + sha512 = "W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -589,13 +589,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.423.0" = { + "@aws-sdk/credential-provider-sso-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.423.0.tgz"; - sha512 = "zAH68IjRMmW22USbsCVQ5Q6AHqhmWABwLbZAMocSGMasddTGv/nkA/nUiVCJ/B4LI3P81FoPQVrG5JxNmkNH0w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.445.0.tgz"; + sha512 = "gJz7kAiDecdhtApgXnxfZsXKsww8BnifDF9MAx9Dr4X6no47qYsCCS3XPuEyRiF9VebXvHOH0H260Zp3bVyniQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -607,13 +607,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.418.0" = { + "@aws-sdk/credential-provider-web-identity-3.433.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz"; - sha512 = "do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz"; + sha512 = "RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -715,13 +715,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.423.0" = { + "@aws-sdk/lib-storage-3.445.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.423.0.tgz"; - sha512 = "EyE1d/99BxUdfHs144u7h5gkb/GccApHT2uq1QwaLHqee5rw8+oZoAbhrwQ5kyysH2v3GSdcBEeTwonNJo1jSw=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.445.0.tgz"; + sha512 = "sCP3lh71oMkx/B3+tSOGr81cff1Z1Yy5ejh5xa/YuH6OefQUFBM7/EC0CJiNfVXemh3D6O+biKETL+t2rAiZoQ=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -742,13 +742,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.418.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.433.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.418.0.tgz"; - sha512 = "gj/mj1UfbKkGbQ1N4YUvjTTp8BVs5fO1QAL2AjFJ+jfJOToLReX72aNEkm7sPGbHML0TqOY4cQbJuWYy+zdD5g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.433.0.tgz"; + sha512 = "Lk1xIu2tWTRa1zDw5hCF1RrpWQYSodUhrS/q3oKz8IAoFqEy+lNaD5jx+fycuZb5EkE4IzWysT+8wVkd0mAnOg=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -778,13 +778,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.418.0" = { + "@aws-sdk/middleware-expect-continue-3.433.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.418.0.tgz"; - sha512 = "6x4rcIj685EmqDLQkbWoCur3Dg5DRClHMen6nHXmD3CR5Xyt3z1Gk/+jmZICxyJo9c6M4AeZht8o95BopkmYAQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.433.0.tgz"; + sha512 = "Uq2rPIsjz0CR2sulM/HyYr5WiqiefrSRLdwUZuA7opxFSfE808w5DBWSprHxbH3rbDSQR4nFiOiVYIH8Eth7nA=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -796,13 +796,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.418.0" = { + "@aws-sdk/middleware-flexible-checksums-3.433.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.418.0.tgz"; - sha512 = "3O203dqS2JU5P1TAAbo7p1qplXQh59pevw9nqzPVb3EG8B+mSucVf2kKmF7kGHqKSk+nK/mB/4XGSsZBzGt6Wg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.433.0.tgz"; + sha512 = "Ptssx373+I7EzFUWjp/i/YiNFt6I6sDuRHz6DOUR9nmmRTlHHqmdcBXlJL2d9wwFxoBRCN8/PXGsTc/DJ4c95Q=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -814,13 +814,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.418.0" = { + "@aws-sdk/middleware-host-header-3.433.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz"; - sha512 = "LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz"; + sha512 = "mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -832,13 +832,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.418.0" = { + "@aws-sdk/middleware-location-constraint-3.433.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.418.0.tgz"; - sha512 = "cc8M3VEaESHJhDsDV8tTpt2QYUprDWhvAVVSlcL43cTdZ54Quc0W+toDiaVOUlwrAZz2Y7g5NDj22ibJGFbOvw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.433.0.tgz"; + sha512 = "2YD860TGntwZifIUbxm+lFnNJJhByR/RB/+fV1I8oGKg+XX2rZU+94pRfHXRywoZKlCA0L+LGDA1I56jxrB9sw=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -850,13 +850,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.418.0" = { + "@aws-sdk/middleware-logger-3.433.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz"; - sha512 = "StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz"; + sha512 = "We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -868,13 +868,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.418.0" = { + "@aws-sdk/middleware-recursion-detection-3.433.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz"; - sha512 = "kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz"; + sha512 = "HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -895,13 +895,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.418.0" = { + "@aws-sdk/middleware-sdk-s3-3.440.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.418.0"; + version = "3.440.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.418.0.tgz"; - sha512 = "rei32LF45SyqL3NlWDjEOfMwAca9A5F4QgUyXJqvASc43oWC1tJnLIhiCxNh8qkWAiRyRzFpcanTeqyaRSsZpA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.440.0.tgz"; + sha512 = "DVTSr+82Z8jR9xTwDN3YHzxX7qvi0n96V92OfxvSRDq2BldCEx/KEL1orUZjw97SAXhINOlUWjRR7j4HpwWQtQ=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -913,13 +913,13 @@ let sha512 = "0EnHtiRzcRcXaF6zEgcRGUtVgX0RqczwlGXjtryHcxiqU/+adqbRuckC7bdMF4Zva6GVPS25XppvGF4M+UzAEw=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.418.0" = { + "@aws-sdk/middleware-sdk-sts-3.433.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz"; - sha512 = "cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz"; + sha512 = "ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA=="; }; }; "@aws-sdk/middleware-serde-3.296.0" = { @@ -940,13 +940,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.418.0" = { + "@aws-sdk/middleware-signing-3.433.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz"; - sha512 = "onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz"; + sha512 = "jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -958,13 +958,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.418.0" = { + "@aws-sdk/middleware-ssec-3.433.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.418.0.tgz"; - sha512 = "J7K+5h6aP7IYMlu/NwHEIjb0+WDu1eFvO8TCPo6j1H9xYRi8B/6h+6pa9Rk9IgRUzFnrdlDu9FazG8Tp0KKLyg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.433.0.tgz"; + sha512 = "2AMaPx0kYfCiekxoL7aqFqSSoA9du+yI4zefpQNLr+1cZOerYiDxdsZ4mbqStR1CVFaX6U6hrYokXzjInsvETw=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -985,13 +985,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.418.0" = { + "@aws-sdk/middleware-user-agent-3.438.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.418.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz"; - sha512 = "Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.438.0.tgz"; + sha512 = "a+xHT1wOxT6EA6YyLmrfaroKWOkwwyiktUfXKM0FsUutGzNi4fKhb5NZ2al58NsXzHgHFrasSDp+Lqbd/X2cEw=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1048,22 +1048,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.418.0" = { + "@aws-sdk/region-config-resolver-3.433.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz"; - sha512 = "lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.433.0.tgz"; + sha512 = "xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg=="; }; }; - "@aws-sdk/s3-presigned-post-3.423.0" = { + "@aws-sdk/s3-presigned-post-3.445.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.423.0.tgz"; - sha512 = "VEnsFJM/bg+tB2maEiDwAMXQNIpHChnmEbzdyBfhcgxdpCt43/Jpd0Uawy+Mdzcw9b81YMNduE9xEDMSZ5nWAA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.445.0.tgz"; + sha512 = "TBhusn9hrC9xkRkV9wP9TxP5f1t7QclWMBBuvsW60ybbbdPfRA5dRYnuXKQlfjQ7DcQO7K/YLElWAPfBcbJiwg=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1075,13 +1075,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.423.0" = { + "@aws-sdk/s3-request-presigner-3.445.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.423.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.423.0.tgz"; - sha512 = "VwC5WjcFKdmPpQXYn6vKi+9iJtP6a0sY9UJu0fy6yXKK4pm9yk9ZFflq46PWT/Z6JNAR+dvi+hzAZLbvXWpSvA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.445.0.tgz"; + sha512 = "UZrtfYdwkNfPkdCYdLYSshTBHkK1W1f3qf011f5P99sxC5nahBnBiLRMeTeKAxveIkAHKqYKlMVa/+gD65d5yA=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1111,13 +1111,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.418.0" = { + "@aws-sdk/signature-v4-crt-3.438.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.418.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.418.0.tgz"; - sha512 = "4DNHPy8xxtKtyjAQdTwStiuEhe39GTte1KoZY+rRRsB5A6NPQB2N+Q5eEtoN6XGL9x4Ga5vQpseuHFMKB0Ll/A=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.438.0.tgz"; + sha512 = "1lUryu6b+JbL8WGleT6vHj3Yy+tmGLT4Ep+Kxcqktslc3/Eu0EaFV8gbK1SZBKpnfm3dh/3AApHHSLzEAqaYKA=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1129,13 +1129,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.418.0" = { + "@aws-sdk/signature-v4-multi-region-3.437.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.418.0"; + version = "3.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.418.0.tgz"; - sha512 = "LeVYMZeUQUURFqDf4yZxTEv016g64hi0LqYBjU0mjwd8aPc0k6hckwvshezc80jCNbuLyjNfQclvlg3iFliItQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.437.0.tgz"; + sha512 = "MmrqudssOs87JgVg7HGVdvJws/t4kcOrJJd+975ki+DPeSoyK2U4zBDfDkJ+n0tFuZBs3sLwLh0QXE7BV28rRA=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1156,13 +1156,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.418.0" = { + "@aws-sdk/token-providers-3.438.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.418.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz"; - sha512 = "9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.438.0.tgz"; + sha512 = "G2fUfTtU6/1ayYRMu0Pd9Ln4qYSvwJOWCqJMdkDgvXSwdgcOSOLsnAIk1AHGJDAvgLikdCzuyOsdJiexr9Vnww=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1174,13 +1174,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.418.0" = { + "@aws-sdk/types-3.433.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz"; - sha512 = "y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.433.0.tgz"; + sha512 = "0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1291,13 +1291,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.418.0" = { + "@aws-sdk/util-endpoints-3.438.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.418.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz"; - sha512 = "sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.438.0.tgz"; + sha512 = "6VyPTq1kN3GWxwFt5DdZfOsr6cJZPLjWh0troY/0uUv3hK74C9o3Y0Xf/z8UAUvQFkVqZse12O0/BgPVMImvfA=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1309,13 +1309,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.418.0" = { + "@aws-sdk/util-format-url-3.433.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.418.0.tgz"; - sha512 = "7/Xy+8J1txuOYOKsez6vpKTIkHYIIX4c7anjp/aQgUQL23FDwkPisj56cIlevJ7useGugnYw1rUR6fMULGzQ/g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.433.0.tgz"; + sha512 = "Z6T7I4hELoQ4eeIuKIKx+52B9bc3SCPhjgMcFAFQeesjmHAr0drHyoGNJIat6ckvgI6zzFaeaBZTvWDA2hyDkA=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1390,13 +1390,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.418.0" = { + "@aws-sdk/util-user-agent-browser-3.433.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.418.0"; + version = "3.433.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz"; - sha512 = "c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz"; + sha512 = "2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1408,13 +1408,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.418.0" = { + "@aws-sdk/util-user-agent-node-3.437.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.418.0"; + version = "3.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz"; - sha512 = "BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.437.0.tgz"; + sha512 = "JVEcvWaniamtYVPem4UthtCNoTBCfFTwYj7Y3CrWZ2Qic4TqrwLkAfaBGtI2TGrhIClVr77uzLI6exqMTN7orA=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1534,13 +1534,22 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.12.1" = { + "@azure/core-rest-pipeline-1.10.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.12.1"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.1.tgz"; - sha512 = "SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; + "@azure/core-rest-pipeline-1.12.2" = { + name = "_at_azure_slash_core-rest-pipeline"; + packageName = "@azure/core-rest-pipeline"; + version = "1.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.2.tgz"; + sha512 = "wLLJQdL4v1yoqYtEtjKNjf8pJ/G/BqVomAWxcKOR1KbZJyCEnCv04yks7Y1NhJ3JzxbDs307W67uX0JzklFdCg=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -1561,13 +1570,22 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.5.0" = { + "@azure/core-util-1.2.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.5.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.5.0.tgz"; - sha512 = "GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; + }; + }; + "@azure/core-util-1.6.1" = { + name = "_at_azure_slash_core-util"; + packageName = "@azure/core-util"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.6.1.tgz"; + sha512 = "h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ=="; }; }; "@azure/identity-2.1.0" = { @@ -1588,22 +1606,22 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-2.38.2" = { + "@azure/msal-browser-2.38.3" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.38.2"; + version = "2.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.2.tgz"; - sha512 = "71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.3.tgz"; + sha512 = "2WuLFnWWPR1IdvhhysT18cBbkXx1z0YIchVss5AwVA95g7CU5CpT3d+5BcgVGNXDXbUU7/5p0xYHV99V5z8C/A=="; }; }; - "@azure/msal-common-13.3.0" = { + "@azure/msal-common-13.3.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "13.3.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.0.tgz"; - sha512 = "/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.1.tgz"; + sha512 = "Lrk1ozoAtaP/cp53May3v6HtcFSVxdFrg2Pa/1xu5oIvsIwhxW6zSPibKefCOVgd5osgykMi5jjcZHv8XkzZEQ=="; }; }; "@azure/msal-common-7.6.0" = { @@ -1615,13 +1633,22 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.18.3" = { + "@azure/msal-node-1.18.4" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.3.tgz"; - sha512 = "lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz"; + sha512 = "Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg=="; + }; + }; + "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { + name = "_at_azure_slash_opentelemetry-instrumentation-azure-sdk"; + packageName = "@azure/opentelemetry-instrumentation-azure-sdk"; + version = "1.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5.tgz"; + sha512 = "fsUarKQDvjhmBO4nIfaZkfNSApm1hZBzcvpNbSrXdcUBxu7lRvKsV5DnwszX7cnhLyVOW9yl1uigtRQ1yDANjA=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -1678,22 +1705,22 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.22.20" = { + "@babel/compat-data-7.23.3" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.22.20"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"; - sha512 = "BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz"; + sha512 = "BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="; }; }; - "@babel/core-7.23.0" = { + "@babel/core-7.23.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz"; - sha512 = "97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz"; + sha512 = "Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew=="; }; }; "@babel/generator-7.17.7" = { @@ -1714,13 +1741,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.23.0" = { + "@babel/generator-7.23.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"; - sha512 = "lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz"; + sha512 = "keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg=="; }; }; "@babel/helper-annotate-as-pure-7.22.5" = { @@ -1768,13 +1795,13 @@ let sha512 = "29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="; }; }; - "@babel/helper-define-polyfill-provider-0.4.2" = { + "@babel/helper-define-polyfill-provider-0.4.3" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz"; - sha512 = "k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz"; + sha512 = "WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug=="; }; }; "@babel/helper-environment-visitor-7.22.20" = { @@ -1822,13 +1849,13 @@ let sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; }; }; - "@babel/helper-module-transforms-7.23.0" = { + "@babel/helper-module-transforms-7.23.3" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"; - sha512 = "WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; + sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; }; }; "@babel/helper-optimise-call-expression-7.22.5" = { @@ -1930,13 +1957,13 @@ let sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; }; }; - "@babel/helpers-7.23.1" = { + "@babel/helpers-7.23.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.1"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz"; - sha512 = "chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz"; + sha512 = "lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ=="; }; }; "@babel/highlight-7.22.20" = { @@ -1966,40 +1993,40 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.22.5" = { + "@babel/parser-7.23.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"; - sha512 = "DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz"; + sha512 = "uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="; }; }; - "@babel/parser-7.23.0" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"; - sha512 = "vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz"; - sha512 = "FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz"; + sha512 = "iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz"; - sha512 = "Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz"; + sha512 = "WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ=="; + }; + }; + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" = { + name = "_at_babel_slash_plugin-bugfix-v8-static-class-fields-redefine-readonly"; + packageName = "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly"; + version = "7.23.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz"; + sha512 = "XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -2020,22 +2047,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-decorators-7.23.0" = { + "@babel/plugin-proposal-decorators-7.23.3" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.0.tgz"; - sha512 = "kYsT+f5ARWF6AdFmqoEEp+hpqxEB8vGmRWfw2aj78M2vTwS2uHW91EF58iFm1Z9U8Y/RrLu2XKJn46P9ca1b0w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.3.tgz"; + sha512 = "u8SwzOcP0DYSsa++nHd/9exlHb0NAlHCb890qtZZbSwPX2bFv8LBEztxwN7Xg/dS8oAFFidhrI9PBcLBJSkGRQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.22.17" = { + "@babel/plugin-proposal-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.22.17"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.22.17.tgz"; - sha512 = "cop/3quQBVvdz6X5SJC6AhUv3C9DrVTM06LUEXimEdWAhCSyOJIr9NiZDU9leHZ0/aiG0Sh7Zmvaku5TWYNgbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.23.3.tgz"; + sha512 = "Q23MpLZfSGZL1kU7fWqV262q65svLSCIP5kZ/JCW/rKTCm/FrLjpvEd2kfUYMVeHh4QhV/xzyoRAHWrAZJrE3Q=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -2110,13 +2137,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.22.10" = { + "@babel/plugin-syntax-decorators-7.23.3" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz"; - sha512 = "z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz"; + sha512 = "cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -2128,13 +2155,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.22.5" = { + "@babel/plugin-syntax-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.22.5.tgz"; - sha512 = "ODAqWWXB/yReh/jVQDag/3/tl6lgBueQkk/TcfW/59Oykm4c8a55XloX0CTk2k2VJiFWMgHby9xNX29IbCv9dQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.23.3.tgz"; + sha512 = "KeENO5ck1IeZ/l2lFZNy+mpobV3D2Zy5C1YFnWm+YuY5mQiAWc4yAp13dqgguwsBsFVLh4LPCEqCa5qW13N+hw=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -2146,31 +2173,31 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.22.5" = { + "@babel/plugin-syntax-flow-7.23.3" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz"; - sha512 = "9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz"; + sha512 = "YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA=="; }; }; - "@babel/plugin-syntax-import-assertions-7.22.5" = { + "@babel/plugin-syntax-import-assertions-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz"; - sha512 = "rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz"; + sha512 = "lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw=="; }; }; - "@babel/plugin-syntax-import-attributes-7.22.5" = { + "@babel/plugin-syntax-import-attributes-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-attributes"; packageName = "@babel/plugin-syntax-import-attributes"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz"; - sha512 = "KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz"; + sha512 = "pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -2191,13 +2218,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.22.5" = { + "@babel/plugin-syntax-jsx-7.23.3" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz"; - sha512 = "gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz"; + sha512 = "EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -2272,13 +2299,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.22.5" = { + "@babel/plugin-syntax-typescript-7.23.3" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz"; - sha512 = "1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz"; + sha512 = "9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ=="; }; }; "@babel/plugin-syntax-unicode-sets-regex-7.18.6" = { @@ -2290,238 +2317,238 @@ let sha512 = "727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg=="; }; }; - "@babel/plugin-transform-arrow-functions-7.22.5" = { + "@babel/plugin-transform-arrow-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"; - sha512 = "26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; + sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; }; }; - "@babel/plugin-transform-async-generator-functions-7.22.15" = { + "@babel/plugin-transform-async-generator-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-generator-functions"; packageName = "@babel/plugin-transform-async-generator-functions"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz"; - sha512 = "jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz"; + sha512 = "59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.22.5" = { + "@babel/plugin-transform-async-to-generator-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"; - sha512 = "b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; + sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.22.5" = { + "@babel/plugin-transform-block-scoped-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"; - sha512 = "tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; + sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.0" = { + "@babel/plugin-transform-block-scoping-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"; - sha512 = "cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz"; + sha512 = "QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw=="; }; }; - "@babel/plugin-transform-class-properties-7.22.5" = { + "@babel/plugin-transform-class-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-properties"; packageName = "@babel/plugin-transform-class-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz"; - sha512 = "nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz"; + sha512 = "uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg=="; }; }; - "@babel/plugin-transform-class-static-block-7.22.11" = { + "@babel/plugin-transform-class-static-block-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-static-block"; packageName = "@babel/plugin-transform-class-static-block"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz"; - sha512 = "GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz"; + sha512 = "PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ=="; }; }; - "@babel/plugin-transform-classes-7.22.15" = { + "@babel/plugin-transform-classes-7.23.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"; - sha512 = "VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz"; + sha512 = "FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w=="; }; }; - "@babel/plugin-transform-computed-properties-7.22.5" = { + "@babel/plugin-transform-computed-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"; - sha512 = "4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; + sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; }; }; - "@babel/plugin-transform-destructuring-7.23.0" = { + "@babel/plugin-transform-destructuring-7.23.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"; - sha512 = "vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; + sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.22.5" = { + "@babel/plugin-transform-dotall-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"; - sha512 = "5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; + sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.22.5" = { + "@babel/plugin-transform-duplicate-keys-7.23.3" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"; - sha512 = "dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; + sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; }; }; - "@babel/plugin-transform-dynamic-import-7.22.11" = { + "@babel/plugin-transform-dynamic-import-7.23.3" = { name = "_at_babel_slash_plugin-transform-dynamic-import"; packageName = "@babel/plugin-transform-dynamic-import"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz"; - sha512 = "g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz"; + sha512 = "vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.22.5" = { + "@babel/plugin-transform-exponentiation-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"; - sha512 = "vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; + sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; }; }; - "@babel/plugin-transform-export-namespace-from-7.22.11" = { + "@babel/plugin-transform-export-namespace-from-7.23.3" = { name = "_at_babel_slash_plugin-transform-export-namespace-from"; packageName = "@babel/plugin-transform-export-namespace-from"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz"; - sha512 = "xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz"; + sha512 = "yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.22.5" = { + "@babel/plugin-transform-flow-strip-types-7.23.3" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz"; - sha512 = "tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz"; + sha512 = "26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q=="; }; }; - "@babel/plugin-transform-for-of-7.22.15" = { + "@babel/plugin-transform-for-of-7.23.3" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"; - sha512 = "me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz"; + sha512 = "X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw=="; }; }; - "@babel/plugin-transform-function-name-7.22.5" = { + "@babel/plugin-transform-function-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"; - sha512 = "UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; + sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; }; }; - "@babel/plugin-transform-json-strings-7.22.11" = { + "@babel/plugin-transform-json-strings-7.23.3" = { name = "_at_babel_slash_plugin-transform-json-strings"; packageName = "@babel/plugin-transform-json-strings"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz"; - sha512 = "CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz"; + sha512 = "H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A=="; }; }; - "@babel/plugin-transform-literals-7.22.5" = { + "@babel/plugin-transform-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"; - sha512 = "fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; + sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; }; }; - "@babel/plugin-transform-logical-assignment-operators-7.22.11" = { + "@babel/plugin-transform-logical-assignment-operators-7.23.3" = { name = "_at_babel_slash_plugin-transform-logical-assignment-operators"; packageName = "@babel/plugin-transform-logical-assignment-operators"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz"; - sha512 = "qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz"; + sha512 = "+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.22.5" = { + "@babel/plugin-transform-member-expression-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"; - sha512 = "RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; + sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.0" = { + "@babel/plugin-transform-modules-amd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"; - sha512 = "xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; + sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.0" = { + "@babel/plugin-transform-modules-commonjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"; - sha512 = "32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; + sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.23.0" = { + "@babel/plugin-transform-modules-systemjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"; - sha512 = "qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; + sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.22.5" = { + "@babel/plugin-transform-modules-umd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"; - sha512 = "+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; + sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { @@ -2533,112 +2560,112 @@ let sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; }; }; - "@babel/plugin-transform-new-target-7.22.5" = { + "@babel/plugin-transform-new-target-7.23.3" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"; - sha512 = "AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; + sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; }; }; - "@babel/plugin-transform-nullish-coalescing-operator-7.22.11" = { + "@babel/plugin-transform-nullish-coalescing-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-nullish-coalescing-operator"; packageName = "@babel/plugin-transform-nullish-coalescing-operator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz"; - sha512 = "YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz"; + sha512 = "xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA=="; }; }; - "@babel/plugin-transform-numeric-separator-7.22.11" = { + "@babel/plugin-transform-numeric-separator-7.23.3" = { name = "_at_babel_slash_plugin-transform-numeric-separator"; packageName = "@babel/plugin-transform-numeric-separator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz"; - sha512 = "3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz"; + sha512 = "s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw=="; }; }; - "@babel/plugin-transform-object-rest-spread-7.22.15" = { + "@babel/plugin-transform-object-rest-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-rest-spread"; packageName = "@babel/plugin-transform-object-rest-spread"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz"; - sha512 = "fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz"; + sha512 = "VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog=="; }; }; - "@babel/plugin-transform-object-super-7.22.5" = { + "@babel/plugin-transform-object-super-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"; - sha512 = "klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; + sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; }; }; - "@babel/plugin-transform-optional-catch-binding-7.22.11" = { + "@babel/plugin-transform-optional-catch-binding-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-catch-binding"; packageName = "@babel/plugin-transform-optional-catch-binding"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz"; - sha512 = "rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz"; + sha512 = "LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A=="; }; }; - "@babel/plugin-transform-optional-chaining-7.23.0" = { + "@babel/plugin-transform-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"; - sha512 = "sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz"; + sha512 = "zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg=="; }; }; - "@babel/plugin-transform-parameters-7.22.15" = { + "@babel/plugin-transform-parameters-7.23.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"; - sha512 = "hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; + sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; }; }; - "@babel/plugin-transform-private-methods-7.22.5" = { + "@babel/plugin-transform-private-methods-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-methods"; packageName = "@babel/plugin-transform-private-methods"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz"; - sha512 = "PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz"; + sha512 = "UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g=="; }; }; - "@babel/plugin-transform-private-property-in-object-7.22.11" = { + "@babel/plugin-transform-private-property-in-object-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-property-in-object"; packageName = "@babel/plugin-transform-private-property-in-object"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz"; - sha512 = "sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz"; + sha512 = "a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA=="; }; }; - "@babel/plugin-transform-property-literals-7.22.5" = { + "@babel/plugin-transform-property-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"; - sha512 = "TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; + sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; }; }; - "@babel/plugin-transform-react-display-name-7.22.5" = { + "@babel/plugin-transform-react-display-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz"; - sha512 = "PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz"; + sha512 = "GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw=="; }; }; "@babel/plugin-transform-react-jsx-7.22.15" = { @@ -2650,139 +2677,139 @@ let sha512 = "oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.22.5" = { + "@babel/plugin-transform-react-jsx-self-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz"; - sha512 = "nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz"; + sha512 = "qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.22.5" = { + "@babel/plugin-transform-react-jsx-source-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz"; - sha512 = "yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz"; + sha512 = "91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g=="; }; }; - "@babel/plugin-transform-regenerator-7.22.10" = { + "@babel/plugin-transform-regenerator-7.23.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"; - sha512 = "F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; + sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.22.5" = { + "@babel/plugin-transform-reserved-words-7.23.3" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"; - sha512 = "DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; + sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; }; }; - "@babel/plugin-transform-runtime-7.22.15" = { + "@babel/plugin-transform-runtime-7.23.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.15.tgz"; - sha512 = "tEVLhk8NRZSmwQ0DJtxxhTrCht1HVo8VaMzYT4w6lwyKBuHsgoioAUA7/6eT2fRfc5/23fuGdlwIxXhRVgWr4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.3.tgz"; + sha512 = "XcQ3X58CKBdBnnZpPaQjgVMePsXtSZzHoku70q9tUAQp02ggPQNM04BF3RvlW1GSM/McbSOQAzEK4MXbS7/JFg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.22.5" = { + "@babel/plugin-transform-shorthand-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"; - sha512 = "vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; + sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; }; }; - "@babel/plugin-transform-spread-7.22.5" = { + "@babel/plugin-transform-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"; - sha512 = "5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; + sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.22.5" = { + "@babel/plugin-transform-sticky-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"; - sha512 = "zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; + sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; }; }; - "@babel/plugin-transform-template-literals-7.22.5" = { + "@babel/plugin-transform-template-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"; - sha512 = "5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; + sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.22.5" = { + "@babel/plugin-transform-typeof-symbol-7.23.3" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"; - sha512 = "bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; + sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; }; }; - "@babel/plugin-transform-typescript-7.22.15" = { + "@babel/plugin-transform-typescript-7.23.3" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz"; - sha512 = "1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.3.tgz"; + sha512 = "ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.22.10" = { + "@babel/plugin-transform-unicode-escapes-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"; - sha512 = "lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; + sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; }; }; - "@babel/plugin-transform-unicode-property-regex-7.22.5" = { + "@babel/plugin-transform-unicode-property-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-property-regex"; packageName = "@babel/plugin-transform-unicode-property-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz"; - sha512 = "HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz"; + sha512 = "KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.22.5" = { + "@babel/plugin-transform-unicode-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"; - sha512 = "028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; + sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; }; }; - "@babel/plugin-transform-unicode-sets-regex-7.22.5" = { + "@babel/plugin-transform-unicode-sets-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-sets-regex"; packageName = "@babel/plugin-transform-unicode-sets-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz"; - sha512 = "lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz"; + sha512 = "W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2794,22 +2821,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.22.20" = { + "@babel/preset-env-7.23.3" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.22.20"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz"; - sha512 = "11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz"; + sha512 = "ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q=="; }; }; - "@babel/preset-flow-7.22.15" = { + "@babel/preset-flow-7.23.3" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.22.15.tgz"; - sha512 = "dB5aIMqpkgbTfN5vDdTRPzjqtWiZcRESNR88QYnoPR+bmdYoluOzMX9tQerTv0XzSgZYctPfO1oc0N5zdog1ew=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.23.3.tgz"; + sha512 = "7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2821,13 +2848,13 @@ let sha512 = "HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="; }; }; - "@babel/preset-typescript-7.23.0" = { + "@babel/preset-typescript-7.23.3" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.0.tgz"; - sha512 = "6P6VVa/NM/VlAYj5s2Aq/gdVg8FSENCg3wlZ6Qau9AcPaoF5LbN1nyGlR9DTRIw9PpxI94e+ReydsJHcjwAweg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz"; + sha512 = "17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ=="; }; }; "@babel/register-7.22.15" = { @@ -2848,13 +2875,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.23.1" = { + "@babel/runtime-7.23.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.23.1"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz"; - sha512 = "hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz"; + sha512 = "mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg=="; }; }; "@babel/runtime-7.9.0" = { @@ -2875,31 +2902,22 @@ let sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; }; }; - "@babel/traverse-7.17.3" = { + "@babel/traverse-7.23.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.3"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"; + sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; }; }; - "@babel/traverse-7.22.5" = { + "@babel/traverse-7.23.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz"; - sha512 = "7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ=="; - }; - }; - "@babel/traverse-7.23.0" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz"; - sha512 = "t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz"; + sha512 = "+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ=="; }; }; "@babel/types-7.17.0" = { @@ -2920,13 +2938,13 @@ let sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; - "@babel/types-7.23.0" = { + "@babel/types-7.23.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"; - sha512 = "0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz"; + sha512 = "OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw=="; }; }; "@bconnorwhite/module-2.0.2" = { @@ -2938,22 +2956,22 @@ let sha512 = "ck1me5WMgZKp06gnJrVKEkytpehTTQbvsAMbF1nGPeHri/AZNhj87++PSE2LOxmZqM0EtGMaqeLdx7Lw7SUnTA=="; }; }; - "@bmewburn/js-beautify-1.14.7" = { + "@bmewburn/js-beautify-1.14.9" = { name = "_at_bmewburn_slash_js-beautify"; packageName = "@bmewburn/js-beautify"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.7.tgz"; - sha512 = "+s+Lw9+SesDdh4TsZyTRn6dCohzv3ioiR4YEXR8bQ+nl8J0Cz9oy+i/7vfrlLTD47/v1O8WsitR8wqL6epeevw=="; + url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.9.tgz"; + sha512 = "PNz0Y8TElejGkQ3N6aiqoBLLa+kaIAQAgu6KFn/PN625W/t2LZVyoL68df5gRSvbpelrsczvQlVLsNp0mcJFgA=="; }; }; - "@bmewburn/vscode-html-languageserver-1.9.0" = { + "@bmewburn/vscode-html-languageserver-1.10.0" = { name = "_at_bmewburn_slash_vscode-html-languageserver"; packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.9.0.tgz"; - sha512 = "yzZ6OK0W7frfoCqvl0s3KeVUUB22wYs74Qu3Y+VGgvW7yvq5m0M82RZQWghKdtLyQejc4469QlmhQsJmCF7ULg=="; + url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.10.0.tgz"; + sha512 = "0lHL4Y1EJKHdRIEpXPZHnlIoxCKNglADDPloOYFcIoRj/O7zfRDrdPWPJgr2LeJDgXHklX6ltH6wp0Ywxa98AQ=="; }; }; "@braintree/sanitize-url-6.0.4" = { @@ -2992,13 +3010,13 @@ let sha512 = "cIwzC93r3PQ/INeuwtZwkZIG2K8WWN0rRLZQhu+mr48Ay+i6sEki4GYfTsflse7hZ1BeDWrNb/Q9vgY3B31xHQ=="; }; }; - "@bugsnag/js-7.20.2" = { + "@bugsnag/js-7.21.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.20.2"; + version = "7.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.20.2.tgz"; - sha512 = "Q08k0h0h6NFwFGkFmib39Uln2WpvJdqT1EGF1JlyYiGW03Y+VopVb9r37pZrRrN9IY08mxaIEO8la5xeaWAs6A=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.21.0.tgz"; + sha512 = "fFTR7cRBSlLtwa1wPTse92igZUEX2V95KyGGCXq2qb2F2w6hJ6oJDxA0BMPS8qqsciYXRjbfn8HX+TFgO1oErg=="; }; }; "@bugsnag/node-7.19.0" = { @@ -3019,58 +3037,67 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/cli-core-0.18.0" = { + "@cdktf/cli-core-0.19.1" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.18.0.tgz"; - sha512 = "LmT9XZ5T3ywlcLGTknNXqXfE2x7lJqTSdS4FuYdtv+Axrc8FxkIMmEQhefr10plto+P8vxdSGw5yHwMdnDv8tA=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.19.1.tgz"; + sha512 = "wWSz1qLviUs5ErpNg1kxc3Qx5o96wofnGTL4HQn9+SAZj7ta3dwNEojp1uSs4WnpY1tDq6H7vyXKh+FA8prW7g=="; }; }; - "@cdktf/commons-0.18.0" = { + "@cdktf/commons-0.19.1" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.18.0.tgz"; - sha512 = "Ndw+yiAQV0K2gOtpyOHrtlw3GByvrBJKb78qraKD5GmGn9Dw40NAtnnQH+E31U7Hi1iwtSoHY/S3qCK1OozH8w=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.19.1.tgz"; + sha512 = "9X0rL5iOt3Q+CdtKeQeff09kEmZETAVbmFIZTFgdipFFR1eMQ0rGiTNFBr8ro23ZrVUbd74g/oBpc4eGirQe4A=="; }; }; - "@cdktf/hcl2cdk-0.18.0" = { + "@cdktf/hcl2cdk-0.19.1" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.18.0.tgz"; - sha512 = "yL2Og55Ga0QT8yR8t6Dbp2CqzAj3TGspMbptcS468BSFq3OxWtOn4d7EzqvNnKBIVJn1fFUSzv8ooZ4feUhH5w=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.19.1.tgz"; + sha512 = "oFMUadPnDrOaMSTX1dQPuk/GFtSrk9/6B4G4CAYp9iXumqK204U0wEZYDFFEz5ieYhR86n/8YxA1GOOr0DmRZA=="; }; }; - "@cdktf/hcl2json-0.18.0" = { + "@cdktf/hcl2json-0.19.1" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.18.0.tgz"; - sha512 = "wnnGTdXExmG+HCLsAsce3fOTDBpj8MpadMzKU7hxj+/xdGvACnU0JB7wcK0FRIKlbJFmxgwYzFmVrgd7z3Be/g=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.19.1.tgz"; + sha512 = "yQ5fTOK9aLuh3WsYV+ykqv0b1X+5KjqAgxaAU+f9pXNq3ght1Z6o7+jrBsPHpylcj318Bhl0Hc/PX3U/z6M2kg=="; }; }; - "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { + "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" = { name = "_at_cdktf_slash_node-pty-prebuilt-multiarch"; packageName = "@cdktf/node-pty-prebuilt-multiarch"; - version = "0.10.1-pre.10"; + version = "0.10.1-pre.11"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.10.1-pre.10.tgz"; - sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; + url = "https://registry.npmjs.org/@cdktf/node-pty-prebuilt-multiarch/-/node-pty-prebuilt-multiarch-0.10.1-pre.11.tgz"; + sha512 = "qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw=="; }; }; - "@cdktf/provider-generator-0.18.0" = { + "@cdktf/provider-generator-0.19.1" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.18.0.tgz"; - sha512 = "w3MqL9OY41HlC6hAtVQ9AQQFZRekzRhOEXmw7VLBQBf0HHvdNB/sgeyvK1Pbs/SpkzgKWTMP7RWbu0sFtC7KTQ=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.19.1.tgz"; + sha512 = "Gg1DbDxhZ+CVT1uzDtvn3Q8C7MVVH1qBCAw33dLT22Faajut0ZO+/Bdai3/e81/jt4W50fN5b49MeTYG1hHRkw=="; + }; + }; + "@cdktf/provider-schema-0.19.1" = { + name = "_at_cdktf_slash_provider-schema"; + packageName = "@cdktf/provider-schema"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.19.1.tgz"; + sha512 = "31vX00P/fw+kgTVZ0hxKIfd6rTRsj6jc1BJaOOQd5yRM3NzbZdypNVkWsEyIAWp6kmPAHzHujpv5/F7IEPZCRA=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3145,51 +3172,6 @@ let sha512 = "MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A=="; }; }; - "@cloudflare/workerd-darwin-64-1.20230922.0" = { - name = "_at_cloudflare_slash_workerd-darwin-64"; - packageName = "@cloudflare/workerd-darwin-64"; - version = "1.20230922.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230922.0.tgz"; - sha512 = "g1hkVhLna0ICfg1l4iYOTAlfvqzZ4RD/wu5yYFaEOVwA9HlKcB9axmQxCSmeHTHfC763RqXdfBFVgBabp0SK+A=="; - }; - }; - "@cloudflare/workerd-darwin-arm64-1.20230922.0" = { - name = "_at_cloudflare_slash_workerd-darwin-arm64"; - packageName = "@cloudflare/workerd-darwin-arm64"; - version = "1.20230922.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230922.0.tgz"; - sha512 = "FMPN7VO6tG3DWUw4XLTB3bL/UKIo0P2aghXC6BG6QxdzLqPMxXWRRfLahdFYc3uPz0ehqrZaQR5Wybck7b9Bdg=="; - }; - }; - "@cloudflare/workerd-linux-64-1.20230922.0" = { - name = "_at_cloudflare_slash_workerd-linux-64"; - packageName = "@cloudflare/workerd-linux-64"; - version = "1.20230922.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230922.0.tgz"; - sha512 = "EDRdGVgOdd14jt2LJHne3CueUvjnH6lnpAtETj0Ce0SkbdW27GY/YARtcGcPBGO1AKrEnXvMdnvV6EVYp1Yl/w=="; - }; - }; - "@cloudflare/workerd-linux-arm64-1.20230922.0" = { - name = "_at_cloudflare_slash_workerd-linux-arm64"; - packageName = "@cloudflare/workerd-linux-arm64"; - version = "1.20230922.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230922.0.tgz"; - sha512 = "QDf3JqRDwnxdCFni/bLWElJowf5xNmk1h2n4nBB30k1lvcfFiQ0HXgbBMhs2W/x/VUUT2j+hAoIGmvkSNlIj4w=="; - }; - }; - "@cloudflare/workerd-windows-64-1.20230922.0" = { - name = "_at_cloudflare_slash_workerd-windows-64"; - packageName = "@cloudflare/workerd-windows-64"; - version = "1.20230922.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230922.0.tgz"; - sha512 = "Tzoq64YMcHjXRheGyWKHNAfklHS9Us2M1lNZ/6y6ziNB0tF06RNRuD5yRhH1LulSOMxVH/KQAqZ0pNEpt3XyPQ=="; - }; - }; "@colors/colors-1.5.0" = { name = "_at_colors_slash_colors"; packageName = "@colors/colors"; @@ -3199,139 +3181,148 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@commitlint/config-validator-17.6.7" = { + "@colors/colors-1.6.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz"; + sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; + }; + }; + "@commitlint/config-validator-18.1.0" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "17.6.7"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.6.7.tgz"; - sha512 = "vJSncmnzwMvpr3lIcm0I8YVVDJTzyjy7NZAeXbTXy+MPUdAr9pKyyg7Tx/ebOQ9kqzE6O9WT6jg2164br5UdsQ=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-18.1.0.tgz"; + sha512 = "kbHkIuItXn93o2NmTdwi5Mk1ujyuSIysRE/XHtrcps/27GuUKEIqBJp6TdJ4Sq+ze59RlzYSHMKuDKZbfg9+uQ=="; }; }; - "@commitlint/ensure-17.6.7" = { + "@commitlint/ensure-18.1.0" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "17.6.7"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.6.7.tgz"; - sha512 = "mfDJOd1/O/eIb/h4qwXzUxkmskXDL9vNPnZ4AKYKiZALz4vHzwMxBSYtyL2mUIDeU9DRSpEUins8SeKtFkYHSw=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-18.1.0.tgz"; + sha512 = "CkPzJ9UBumIo54VDcpmBlaVX81J++wzEhN3DJH9+6PaLeiIG+gkSx8t7C2gfwG7PaiW4HzQtdQlBN5ab+c4vFQ=="; }; }; - "@commitlint/execute-rule-17.4.0" = { + "@commitlint/execute-rule-18.1.0" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "17.4.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz"; - sha512 = "LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-18.1.0.tgz"; + sha512 = "w3Vt4K+O7+nSr9/gFSEfZ1exKUOPSlJaRpnk7Y+XowEhvwT7AIk1HNANH+gETf0zGZ020+hfiMW/Ome+SNCUsg=="; }; }; - "@commitlint/format-17.4.4" = { + "@commitlint/format-18.1.0" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "17.4.4"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-17.4.4.tgz"; - sha512 = "+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-18.1.0.tgz"; + sha512 = "So/w217tGWMZZb1yXcUFNF2qFLyYtSVqbnGoMbX8a+JKcG4oB11Gc1adS0ssUOMivtiNpaLtkSHFynyiwtJtiQ=="; }; }; - "@commitlint/is-ignored-17.7.0" = { + "@commitlint/is-ignored-18.1.0" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "17.7.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.7.0.tgz"; - sha512 = "043rA7m45tyEfW7Zv2vZHF++176MLHH9h70fnPoYlB1slKBeKl8BwNIlnPg4xBdRBVNPaCqvXxWswx2GR4c9Hw=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-18.1.0.tgz"; + sha512 = "fa1fY93J/Nx2GH6r6WOLdBOiL7x9Uc1N7wcpmaJ1C5Qs6P+rPSUTkofe2IOhSJIJoboHfAH6W0ru4xtK689t0Q=="; }; }; - "@commitlint/lint-17.7.0" = { + "@commitlint/lint-18.1.0" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "17.7.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.7.0.tgz"; - sha512 = "TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-18.1.0.tgz"; + sha512 = "LGB3eI5UYu5LLayibNrRM4bSbowr1z9uyqvp0c7+0KaSJi+xHxy/QEhb6fy4bMAtbXEvygY0sUu9HxSWg41rVQ=="; }; }; - "@commitlint/load-17.7.2" = { + "@commitlint/load-18.2.0" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.7.2"; + version = "18.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.7.2.tgz"; - sha512 = "XA7WTnsjHZ4YH6ZYsrnxgLdXzriwMMq+utZUET6spbOEEIPBCDLdOQXS26P+v3TTO4hUHOEhzUquaBv3jbBixw=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-18.2.0.tgz"; + sha512 = "xjX3d3CRlOALwImhOsmLYZh14/+gW/KxsY7+bPKrzmGuFailf9K7ckhB071oYZVJdACnpY4hDYiosFyOC+MpAA=="; }; }; - "@commitlint/message-17.4.2" = { + "@commitlint/message-18.1.0" = { name = "_at_commitlint_slash_message"; packageName = "@commitlint/message"; - version = "17.4.2"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-17.4.2.tgz"; - sha512 = "3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q=="; + url = "https://registry.npmjs.org/@commitlint/message/-/message-18.1.0.tgz"; + sha512 = "8dT/jJg73wf3o2Mut/fqEDTpBYSIEVtX5PWyuY/0uviEYeheZAczFo/VMIkeGzhJJn1IrcvAwWsvJ1lVGY2I/w=="; }; }; - "@commitlint/parse-17.7.0" = { + "@commitlint/parse-18.1.0" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "17.7.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-17.7.0.tgz"; - sha512 = "dIvFNUMCUHqq5Abv80mIEjLVfw8QNuA4DS7OWip4pcK/3h5wggmjVnlwGCDvDChkw2TjK1K6O+tAEV78oxjxag=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-18.1.0.tgz"; + sha512 = "23yv8uBweXWYn8bXk4PjHIsmVA+RkbqPh2h7irupBo2LthVlzMRc4LM6UStasScJ4OlXYYaWOmuP7jcExUF50Q=="; }; }; - "@commitlint/read-17.5.1" = { + "@commitlint/read-18.1.0" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "17.5.1"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-17.5.1.tgz"; - sha512 = "7IhfvEvB//p9aYW09YVclHbdf1u7g7QhxeYW9ZHSO8Huzp8Rz7m05aCO1mFG7G8M+7yfFnXB5xOmG18brqQIBg=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-18.1.0.tgz"; + sha512 = "rzfzoKUwxmvYO81tI5o1371Nwt3vhcQR36oTNfupPdU1jgSL3nzBIS3B93LcZh3IYKbCIMyMPN5WZ10BXdeoUg=="; }; }; - "@commitlint/resolve-extends-17.6.7" = { + "@commitlint/resolve-extends-18.1.0" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "17.6.7"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.6.7.tgz"; - sha512 = "PfeoAwLHtbOaC9bGn/FADN156CqkFz6ZKiVDMjuC2N5N0740Ke56rKU7Wxdwya8R8xzLK9vZzHgNbuGhaOVKIg=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-18.1.0.tgz"; + sha512 = "3mZpzOEJkELt7BbaZp6+bofJyxViyObebagFn0A7IHaLARhPkWTivXdjvZHS12nAORftv88Yhbh8eCPKfSvB7g=="; }; }; - "@commitlint/rules-17.7.0" = { + "@commitlint/rules-18.1.0" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "17.7.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-17.7.0.tgz"; - sha512 = "J3qTh0+ilUE5folSaoK91ByOb8XeQjiGcdIdiB/8UT1/Rd1itKo0ju/eQVGyFzgTMYt8HrDJnGTmNWwcMR1rmA=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-18.1.0.tgz"; + sha512 = "VJNQ674CRv4znI0DbsjZLVnn647J+BTxHGcrDIsYv7c99gW7TUGeIe5kL80G7l8+5+N0se8v9yn+Prr8xEy6Yw=="; }; }; - "@commitlint/to-lines-17.4.0" = { + "@commitlint/to-lines-18.1.0" = { name = "_at_commitlint_slash_to-lines"; packageName = "@commitlint/to-lines"; - version = "17.4.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.4.0.tgz"; - sha512 = "LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg=="; + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-18.1.0.tgz"; + sha512 = "aHIoSDjG0ckxPLYDpODUeSLbEKmF6Jrs1B5JIssbbE9eemBtXtjm9yzdiAx9ZXcwoHlhbTp2fbndDb3YjlvJag=="; }; }; - "@commitlint/top-level-17.4.0" = { + "@commitlint/top-level-18.1.0" = { name = "_at_commitlint_slash_top-level"; packageName = "@commitlint/top-level"; - version = "17.4.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.4.0.tgz"; - sha512 = "/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g=="; + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-18.1.0.tgz"; + sha512 = "1/USHlolIxJlsfLKecSXH+6PDojIvnzaJGPYwF7MtnTuuXCNQ4izkeqDsRuNMe9nU2VIKpK9OT8Q412kGNmgGw=="; }; }; - "@commitlint/types-17.4.4" = { + "@commitlint/types-18.1.0" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "17.4.4"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-17.4.4.tgz"; - sha512 = "amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-18.1.0.tgz"; + sha512 = "65vGxZmbs+2OVwEItxhp3Ul7X2m2LyLfifYI/NdPwRqblmuES2w2aIRhIjb7cwUIBHHSTT8WXj4ixVHQibmvLQ=="; }; }; "@cronvel/get-pixels-3.4.1" = { @@ -3343,58 +3334,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-7.3.7" = { + "@cspell/cspell-bundled-dicts-8.0.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-7.3.7.tgz"; - sha512 = "Mw7J0RAWGpEup/+eIePw3wi+OlMGNicrD1r9OhdgIgO6sHEi01ibS/RzNNbC7UziLaYEHi8+WfLyGzmp1ZISrQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.0.0.tgz"; + sha512 = "Phbb1ij1TQQuqxuuvxf5P6fvV9U+EVoATNLmDqFHvRZfUyuhgbJuCMzIPeBx4GfTTDWlPs51FYRvZ/Q8xBHsyA=="; }; }; - "@cspell/cspell-json-reporter-7.3.7" = { + "@cspell/cspell-json-reporter-8.0.0" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-7.3.7.tgz"; - sha512 = "bogUQKKZWLttZtxFKjpzHuliIha/ByV2km18gm8dA2uB3IrzD1UJy4sCE8lnaodm6n3VtjnViSkQ5XIVU3gAKQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.0.0.tgz"; + sha512 = "1ltK5N4xMGWjDSIkU+GJd3rXV8buXgO/lAgnpM1RhKWqAmG+u0k6pnhk2vIo/4qZQpgfK0l3J3h/Ky2FcE95vA=="; }; }; - "@cspell/cspell-pipe-7.3.7" = { + "@cspell/cspell-pipe-8.0.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-7.3.7.tgz"; - sha512 = "ZO8v3EwGhjUvhPo1S48+CKv7EPXMoYF7LGERB34K8EXFByb9+J74ojMYj9UgLRV68lFTrDFde3bHoZPPVS1FsA=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.0.0.tgz"; + sha512 = "1MH+9q3AmbzwK1BYhSGla8e4MAAYzzPApGvv8eyv0rWDmgmDTkGqJPTTvYj1wFvll5ximQ5OolpPQGv3JoWvtQ=="; }; }; - "@cspell/cspell-resolver-7.3.7" = { + "@cspell/cspell-resolver-8.0.0" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-7.3.7.tgz"; - sha512 = "WWZcTI5f2cCjr1yRDTMkcVg7Meil3s+0aaKcLCDTGQf9J2UWWjpqDJ6M6keYei3paAjxW2Pk03IRNNwdA3+igQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.0.0.tgz"; + sha512 = "gtALHFLT2vSZ7BZlIg26AY3W9gkiqxPGE75iypWz06JHJs05ngnAR+h6VOu0+rmgx98hNfzPPEh4g+Tjm8Ma0A=="; }; }; - "@cspell/cspell-service-bus-7.3.7" = { + "@cspell/cspell-service-bus-8.0.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-7.3.7.tgz"; - sha512 = "pnDOFpjht7dZYydMygcf0brCSk5BGRvbeWRH6MaMhd+3CdyzyEvtZG3IbBQVNyVvDTA2c/K3rljOAo8y3/lpnw=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.0.0.tgz"; + sha512 = "1EYhIHoZnhxpfEp6Bno6yVWYBuYfaQrwIfeDMntnezUcSmi7RyroQEcp5U7sLv69vhRD2c81o7r8iUaAbPSmIg=="; }; }; - "@cspell/cspell-types-7.3.7" = { + "@cspell/cspell-types-8.0.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-7.3.7.tgz"; - sha512 = "zM2BuZJ3UUgPwF78bssggi8X20nmW3a95EmbNJKfbO6Zf2ui7UMzeP3BwpCZk30A/EixGlFhLf6Xd+eBT/DQqw=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.0.0.tgz"; + sha512 = "dPdxQI8dLJoJEjylaPYfCJNnm2XNMYPuowHE2FMcsnFR9hEchQAhnKVc/aD63IUYnUtUrPxPlUJdoAoj569e+g=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3451,13 +3442,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.25" = { + "@cspell/dict-companies-3.0.27" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.25"; + version = "3.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.25.tgz"; - sha512 = "7phQlGJ/4qCx9fQg/kR8YV0n5TPak4+eleQ7M/e7uhsQR8TwOWsPU1dW23WABoTqJbYCgdUYLxqjQ8458w7jZQ=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.27.tgz"; + sha512 = "gaPR/luf+4oKGyxvW4GbxGGPdHiC5kj/QefnmQqrLFrLiCSXMZg5/NL+Lr4E5lcHsd35meX61svITQAvsT7lyQ=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3469,13 +3460,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-5.0.5" = { + "@cspell/dict-cpp-5.0.9" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "5.0.5"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.5.tgz"; - sha512 = "ojCpQ4z+sHHLJYfvA3SApqQ1BjO/k3TUdDgqR3sVhFl5qjT9yz1/srBNzqCaBBSz/fiO5A8NKdSA9+IFrUHcig=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.9.tgz"; + sha512 = "ql9WPNp8c+fhdpVpjpZEUWmxBHJXs9CJuiVVfW/iwv5AX7VuMHyEwid+9/6nA8qnCxkUQ5pW83Ums1lLjn8ScA=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3523,13 +3514,13 @@ let sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; - "@cspell/dict-css-4.0.11" = { + "@cspell/dict-css-4.0.12" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "4.0.11"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.11.tgz"; - sha512 = "kHQqg3/3Xra2Xki3K4e6s3BHDw5L82geie4q7jRBxQ9CofIgVEMcOqTr2QWKgIWegmACEe7B/CIMH35d4eiafA=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.12.tgz"; + sha512 = "vGBgPM92MkHQF5/2jsWcnaahOZ+C6OE/fPvd5ScBP72oFY9tn5GLuomcyO0z8vWCr2e0nUSX1OGimPtcQAlvSw=="; }; }; "@cspell/dict-dart-2.0.3" = { @@ -3640,13 +3631,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.3.8" = { + "@cspell/dict-en_us-4.3.11" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.3.8"; + version = "4.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.8.tgz"; - sha512 = "rCPsbDHuRnFUbzWAY6O1H9+cLZt5FNQwjPVw2TdQZfipdb0lim984aLGY+nupi1iKC3lfjyd5SVUgmSZEG1QNA=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.11.tgz"; + sha512 = "GhdavZFlS2YbUNcRtPbgJ9j6aUyq116LmDQ2/Q5SpQxJ5/6vVs8Yj5WxV1JD+Zh/Zim1NJDcneTOuLsUGi+Czw=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3658,13 +3649,13 @@ let sha512 = "EllahNkhzvLWo0ptwu0l3oEeAJOQSUpZnDfnKRIh6mJVehuSovNHwA9vrdZ8jBUjuqcfaN2e7c32zN0D/qvWJQ=="; }; }; - "@cspell/dict-filetypes-3.0.1" = { + "@cspell/dict-filetypes-3.0.2" = { name = "_at_cspell_slash_dict-filetypes"; packageName = "@cspell/dict-filetypes"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.1.tgz"; - sha512 = "8z8mY1IbrTyTRumx2vvD9yzRhNMk9SajM/GtI5hdMM2pPpNSp25bnuauzjRf300eqlqPY2MNb5MmhBFO014DJw=="; + url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.2.tgz"; + sha512 = "StoC0wPmFNav6F6P8/FYFN1BpZfPgOmktb8gQ9wTauelWofPeBW+A0t5ncZt9hXHtnbGDA98v4ukacV+ucbnUg=="; }; }; "@cspell/dict-fonts-1.0.14" = { @@ -3685,13 +3676,13 @@ let sha512 = "t9V4GeN/m517UZn63kZPUYP3OQg5f0OBLSd3Md5CU3eH1IFogSvTzHHnz4Wqqbv8NNRiBZ3HfdY/pqREZ6br3Q=="; }; }; - "@cspell/dict-fsharp-1.0.0" = { + "@cspell/dict-fsharp-1.0.1" = { name = "_at_cspell_slash_dict-fsharp"; packageName = "@cspell/dict-fsharp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.0.0.tgz"; - sha512 = "dHPkMHwW4dWv3Lv9VWxHuVm4IylqvcfRBSnZ7usJTRThraetSVrOPIJwr6UJh7F5un/lGJx2lxWVApf2WQaB/A=="; + url = "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.0.1.tgz"; + sha512 = "23xyPcD+j+NnqOjRHgW3IU7Li912SX9wmeefcY0QxukbAxJ/vAN4rBpjSwwYZeQPAn3fxdfdNZs03fg+UM+4yQ=="; }; }; "@cspell/dict-fullstack-1.0.39" = { @@ -3739,13 +3730,13 @@ let sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; }; }; - "@cspell/dict-golang-6.0.3" = { + "@cspell/dict-golang-6.0.4" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.3.tgz"; - sha512 = "KiNnjAeqDBq6zH4s46hzBrKgqIrkSZ9bbHzQ54PbHfe+jurZkSZ4lXz6E+315RNh2TkRLcNppFvaZqJvKZXomA=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.4.tgz"; + sha512 = "jOfewPEyN6U9Q80okE3b1PTYBfqZgHh7w4o271GSuAX+VKJ1lUDhdR4bPKRxSDdO5jHArw2u5C8nH2CWGuygbQ=="; }; }; "@cspell/dict-haskell-1.0.13" = { @@ -3820,13 +3811,13 @@ let sha512 = "kdE4AHHHrixyZ5p6zyms1SLoYpaJarPxrz8Tveo6gddszBVVwIUZ+JkQE1bWNLK740GWzIXdkznpUfw1hP9nXw=="; }; }; - "@cspell/dict-k8s-1.0.1" = { + "@cspell/dict-k8s-1.0.2" = { name = "_at_cspell_slash_dict-k8s"; packageName = "@cspell/dict-k8s"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.1.tgz"; - sha512 = "gc5y4Nm3hVdMZNBZfU2M1AsAmObZsRWjCUk01NFPfGhFBXyVne41T7E62rpnzu5330FV/6b/TnFcPgRmak9lLw=="; + url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.2.tgz"; + sha512 = "tLT7gZpNPnGa+IIFvK9SP1LrSpPpJ94a/DulzAPOb1Q2UBFwdpFd82UWhio0RNShduvKG/WiMZf/wGl98pn+VQ=="; }; }; "@cspell/dict-latex-1.0.25" = { @@ -3874,13 +3865,22 @@ let sha512 = "YiHDt8kmHJ8nSBy0tHzaxiuitYp+oJ66ffCYuFWTNB3//Y0SI4OGHU3omLsQVeXIfCeVrO4DrVvRDoCls9B5zQ=="; }; }; - "@cspell/dict-lua-4.0.1" = { + "@cspell/dict-lua-4.0.2" = { name = "_at_cspell_slash_dict-lua"; packageName = "@cspell/dict-lua"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.1.tgz"; - sha512 = "j0MFmeCouSoC6EdZTbvGe1sJ9V+ruwKSeF+zRkNNNload7R72Co5kX1haW2xLHGdlq0kqSy1ODRZKdVl0e+7hg=="; + url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.2.tgz"; + sha512 = "eeC20Q+UnHcTVBK6pgwhSjGIVugO2XqU7hv4ZfXp2F9DxGx1RME0+1sKX4qAGhdFGwOBsEzb2fwUsAEP6Mibpg=="; + }; + }; + "@cspell/dict-makefile-1.0.0" = { + name = "_at_cspell_slash_dict-makefile"; + packageName = "@cspell/dict-makefile"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.0.tgz"; + sha512 = "3W9tHPcSbJa6s0bcqWo6VisEDTSN5zOtDbnPabF7rbyjRpNo0uHXHRJQF8gAbFzoTzBBhgkTmrfSiuyQm7vBUQ=="; }; }; "@cspell/dict-node-1.0.12" = { @@ -3910,13 +3910,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-5.0.11" = { + "@cspell/dict-npm-5.0.12" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "5.0.11"; + version = "5.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.11.tgz"; - sha512 = "QlgF92q29mT0LbNqlDHb3UgY5jCLcSn+GnA1pvD5ps/zw2LhVl+ZXMHExwSIi7gwTzP3IyJ1f/dT6rnw9wic4A=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.12.tgz"; + sha512 = "T/+WeQmtbxo7ad6hrdI8URptYstKJP+kXyWJZfuVJJGWJQ7yubxrI5Z5AfM+Dh/ff4xHmdzapxD9adaEQ727uw=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3928,13 +3928,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-4.0.3" = { + "@cspell/dict-php-4.0.4" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.3.tgz"; - sha512 = "PxtSmWJCDEB4M8R9ER9ijxBum/tvUqYT26QeuV58q2IFs5IrPZ6hocQKvnFGXItjCWH4oYXyAEAAzINlBC4Opg=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.4.tgz"; + sha512 = "fRlLV730fJbulDsLIouZxXoxHt3KIH6hcLFwxaupHL+iTXDg0lo7neRpbqD5MScr/J3idEr7i9G8XWzIikKFug=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -3955,13 +3955,13 @@ let sha512 = "IHfWLme3FXE7vnOmMncSBxOsMTdNWd1Vcyhag03WS8oANSgX8IZ+4lMI00mF0ptlgchf16/OU8WsV4pZfikEFw=="; }; }; - "@cspell/dict-public-licenses-2.0.4" = { + "@cspell/dict-public-licenses-2.0.5" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.4.tgz"; - sha512 = "KjsfuGwMWvPkp6s0nR+s4mZc9SQhh1tHDOyQZfEVRwi+2ev7f8l7R6ts9sP2Mplb8UcxwO6YmKwxHjN+XHoMoA=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.5.tgz"; + sha512 = "91HK4dSRri/HqzAypHgduRMarJAleOX5NugoI8SjDLPzWYkwZ1ftuCXSk+fy8DLc3wK7iOaFcZAvbjmnLhVs4A=="; }; }; "@cspell/dict-python-1.0.38" = { @@ -3973,13 +3973,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.1.9" = { + "@cspell/dict-python-4.1.10" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.9.tgz"; - sha512 = "JMA4v/ZPJWuDt3PPFz+23VIY3iDIB+xOTQ6nw+WkcJU5yr6FUl5zMU9ModKrgujg3jGRuuJqofErZVPqHNHYAA=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.10.tgz"; + sha512 = "ErF/Ohcu6Xk4QVNzFgo8p7CxkxvAKAmFszvso41qOOhu8CVpB35ikBRpGVDw9gsCUtZzi15Yl0izi4do6WcLkA=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -4000,13 +4000,13 @@ let sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; }; }; - "@cspell/dict-ruby-5.0.0" = { + "@cspell/dict-ruby-5.0.1" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.0.tgz"; - sha512 = "ssb96QxLZ76yPqFrikWxItnCbUKhYXJ2owkoIYzUGNFl2CHSoHCb5a6Zetum9mQ/oUA3gNeUhd28ZUlXs0la2A=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.1.tgz"; + sha512 = "rruTm7Emhty/BSYavSm8ZxRuVw0OBqzJkwIFXcV0cX7To8D1qbmS9HFHRuRg8IL11+/nJvtdDz+lMFBSmPUagQ=="; }; }; "@cspell/dict-rust-1.0.23" = { @@ -4054,22 +4054,22 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.3.3" = { + "@cspell/dict-software-terms-3.3.9" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.3.3"; + version = "3.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.3.3.tgz"; - sha512 = "JKxBPyubapWkeekGquJYo5MLZe1TXAWAC8bqxuarG0cYkWoa7wIqCNH6/9OywRFSBzIYCgoVu2xDP1yRqTEokg=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.3.9.tgz"; + sha512 = "/O3EWe0SIznx18S7J3GAXPDe7sexn3uTsf4IlnGYK9WY6ZRuEywkXCB+5/USLTGf4+QC05pkHofphdvVSifDyA=="; }; }; - "@cspell/dict-sql-2.1.1" = { + "@cspell/dict-sql-2.1.2" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.1.tgz"; - sha512 = "v1mswi9NF40+UDUMuI148YQPEQvWjac72P6ZsjlRdLjEiQEEMEsTQ+zlkIdnzC9QCNyJaqD5Liq9Mn78/8Zxtw=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.2.tgz"; + sha512 = "Pi0hAcvsSGtZZeyyAN1VfGtQJbrXos5x2QjJU0niAQKhmITSOrXU/1II1Gogk+FYDjWyV9wP2De0U2f7EWs6oQ=="; }; }; "@cspell/dict-svelte-1.0.2" = { @@ -4117,22 +4117,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-7.3.7" = { + "@cspell/dynamic-import-8.0.0" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-7.3.7.tgz"; - sha512 = "ac52OLDMYBHkRQ8XzihOWnyfqri3M84ELTZdqBhR5YGcHW/mxKhsmXqudA980SdRRKaicD39yhX4idAFb4AsDg=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.0.0.tgz"; + sha512 = "HNkCepopgiEGuI1QGA6ob4+ayvoSMxvAqetLxP0u1sZzc50LH2DEWwotcNrpVdzZOtERHvIBcGaQKIBEx8pPRQ=="; }; }; - "@cspell/strong-weak-map-7.3.7" = { + "@cspell/strong-weak-map-8.0.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-7.3.7.tgz"; - sha512 = "n+jRgwH0wU+HsfqgCGVzPmWnZl4SyhtvPxusKwXj6L/STGdt8IP2rYl1PFOtyvgjPjh8xXe/jRrq7zH07btiKA=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.0.0.tgz"; + sha512 = "fRlqPSdpdub52vFtulDgLPzGPGe75I04ScId1zOO9ABP7/ro8VmaG//m1k7hsPkm6h7FG4jWympoA3aXDAcXaA=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4252,22 +4252,31 @@ let sha512 = "RUl/439BHKshkhSGFRlZ1kzy68wL4mn8VNKDSZr3p0tciyZ33Mjfpl+vofqnHqXRmDI6nLnZpfJvhY3D88o0pA=="; }; }; - "@edge-runtime/primitives-3.1.1" = { - name = "_at_edge-runtime_slash_primitives"; - packageName = "@edge-runtime/primitives"; - version = "3.1.1"; + "@edge-runtime/ponyfill-2.4.1" = { + name = "_at_edge-runtime_slash_ponyfill"; + packageName = "@edge-runtime/ponyfill"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-3.1.1.tgz"; - sha512 = "ROO22py+KdAfzqWZu6CtVMC4qV6mS0W1jPI51jGXE+uenyBUN7cQTWB9ReQc8Bm4cnjqmhajvpqEx3j7Y9iSOg=="; + url = "https://registry.npmjs.org/@edge-runtime/ponyfill/-/ponyfill-2.4.1.tgz"; + sha512 = "ZbR/EViY3gg2rmEAQTKPa6mXl4aR1/+cFcQe4r1segCjEbTAxT6PWu40odbu/KlZKSysEb2O/BWIC2lJgSJOMQ=="; }; }; - "@edge-runtime/vm-3.1.1" = { + "@edge-runtime/primitives-4.0.5" = { + name = "_at_edge-runtime_slash_primitives"; + packageName = "@edge-runtime/primitives"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-4.0.5.tgz"; + sha512 = "t7QiN5d/KpXgCvIfSt6Nm9Hj3WVdNgc5CpOD73jasY+9EvTI7Ngdj5cXvjcHrPcmYWJZMySPgeEeoL/1N/Llag=="; + }; + }; + "@edge-runtime/vm-3.1.7" = { name = "_at_edge-runtime_slash_vm"; packageName = "@edge-runtime/vm"; - version = "3.1.1"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.1.tgz"; - sha512 = "6NJRRG04/91qnWLZj+wZm27q6fJkTbkZdIJdo/Ig++GTxkAv8Wh/45nIcz9Xg7AzIAMpAkflFdiCrCoZ3hp1Iw=="; + url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.7.tgz"; + sha512 = "hUMFbDQ/nZN+1TLMi6iMO1QFz9RSV8yGG8S42WFPFma1d7VSNE0eMdJUmwjmtav22/iQkzHMmu6oTSfAvRGS8g=="; }; }; "@electron-forge/core-6.4.2" = { @@ -4369,13 +4378,13 @@ let sha512 = "MPAZQ4v6piCED7NT1LTVQf61o6Eg/laNoKbhbrFBSH1i20OUwbtV2MLj6Op292ynI9+1qdHKmFgctr6qPTCAQw=="; }; }; - "@electron/asar-3.2.7" = { + "@electron/asar-3.2.8" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz"; - sha512 = "8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz"; + sha512 = "cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg=="; }; }; "@electron/get-2.0.3" = { @@ -4414,13 +4423,13 @@ let sha512 = "S1vgpzIOS1wCJmsYjdLz97MTUV6UTLcMk/HE3w90HYtVxvW+PQdwxLbgsrECX2bysqcnmM5a0K6mXj/gwVgYtQ=="; }; }; - "@electron/universal-1.4.2" = { + "@electron/universal-1.4.5" = { name = "_at_electron_slash_universal"; packageName = "@electron/universal"; - version = "1.4.2"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.2.tgz"; - sha512 = "ymGwXYBUGFS1DuTqYJwZ0p1gIlELKOf21zPJefij/amzV66vTXRNJ2mAtW0uRsaHfV+pzYTJVrt5oco44DFOMg=="; + url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.5.tgz"; + sha512 = "3vE9WBQnvlulKylrPbyc+9M4xnD7t1JxuCOF0nrFz00XrrkgbqeqxDf90PNcjLiuB4hAZKr1JooVA6KwsXj94w=="; }; }; "@emmetio/abbreviation-2.3.3" = { @@ -4477,15 +4486,6 @@ let sha512 = "LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA=="; }; }; - "@esbuild/android-arm-0.15.18" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz"; - sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; - }; - }; "@esbuild/android-arm-0.17.19" = { name = "_at_esbuild_slash_android-arm"; packageName = "@esbuild/android-arm"; @@ -4504,6 +4504,15 @@ let sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; }; }; + "@esbuild/android-arm-0.19.5" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz"; + sha512 = "bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA=="; + }; + }; "@esbuild/android-arm64-0.17.19" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4522,6 +4531,15 @@ let sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; }; }; + "@esbuild/android-arm64-0.19.5" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz"; + sha512 = "5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ=="; + }; + }; "@esbuild/android-x64-0.17.19" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4540,6 +4558,15 @@ let sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; }; }; + "@esbuild/android-x64-0.19.5" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz"; + sha512 = "9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA=="; + }; + }; "@esbuild/darwin-arm64-0.17.19" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4558,6 +4585,15 @@ let sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; }; }; + "@esbuild/darwin-arm64-0.19.5" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz"; + sha512 = "mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw=="; + }; + }; "@esbuild/darwin-x64-0.17.19" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4576,6 +4612,15 @@ let sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; }; }; + "@esbuild/darwin-x64-0.19.5" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz"; + sha512 = "Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA=="; + }; + }; "@esbuild/freebsd-arm64-0.17.19" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4594,6 +4639,15 @@ let sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; }; }; + "@esbuild/freebsd-arm64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz"; + sha512 = "GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ=="; + }; + }; "@esbuild/freebsd-x64-0.17.19" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4612,6 +4666,15 @@ let sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; }; }; + "@esbuild/freebsd-x64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz"; + sha512 = "1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ=="; + }; + }; "@esbuild/linux-arm-0.17.19" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4630,6 +4693,15 @@ let sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; }; }; + "@esbuild/linux-arm-0.19.5" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz"; + sha512 = "lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ=="; + }; + }; "@esbuild/linux-arm64-0.17.19" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4648,6 +4720,15 @@ let sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; }; }; + "@esbuild/linux-arm64-0.19.5" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz"; + sha512 = "o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA=="; + }; + }; "@esbuild/linux-ia32-0.17.19" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4666,13 +4747,13 @@ let sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; }; }; - "@esbuild/linux-loong64-0.15.18" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.15.18"; + "@esbuild/linux-ia32-0.19.5" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz"; - sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz"; + sha512 = "MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ=="; }; }; "@esbuild/linux-loong64-0.17.19" = { @@ -4693,6 +4774,15 @@ let sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; }; }; + "@esbuild/linux-loong64-0.19.5" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz"; + sha512 = "42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw=="; + }; + }; "@esbuild/linux-mips64el-0.17.19" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4711,6 +4801,15 @@ let sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; }; }; + "@esbuild/linux-mips64el-0.19.5" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz"; + sha512 = "kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg=="; + }; + }; "@esbuild/linux-ppc64-0.17.19" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4729,6 +4828,15 @@ let sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; }; }; + "@esbuild/linux-ppc64-0.19.5" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz"; + sha512 = "yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q=="; + }; + }; "@esbuild/linux-riscv64-0.17.19" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4747,6 +4855,15 @@ let sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; }; }; + "@esbuild/linux-riscv64-0.19.5" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz"; + sha512 = "5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag=="; + }; + }; "@esbuild/linux-s390x-0.17.19" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4765,6 +4882,15 @@ let sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; }; }; + "@esbuild/linux-s390x-0.19.5" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz"; + sha512 = "Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw=="; + }; + }; "@esbuild/linux-x64-0.17.19" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4783,6 +4909,15 @@ let sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; }; }; + "@esbuild/linux-x64-0.19.5" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz"; + sha512 = "psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A=="; + }; + }; "@esbuild/netbsd-x64-0.17.19" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4801,6 +4936,15 @@ let sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; }; }; + "@esbuild/netbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz"; + sha512 = "kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g=="; + }; + }; "@esbuild/openbsd-x64-0.17.19" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4819,6 +4963,15 @@ let sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; }; }; + "@esbuild/openbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz"; + sha512 = "sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA=="; + }; + }; "@esbuild/sunos-x64-0.17.19" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4837,6 +4990,15 @@ let sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; }; }; + "@esbuild/sunos-x64-0.19.5" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz"; + sha512 = "dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg=="; + }; + }; "@esbuild/win32-arm64-0.17.19" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4855,6 +5017,15 @@ let sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; }; }; + "@esbuild/win32-arm64-0.19.5" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz"; + sha512 = "dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg=="; + }; + }; "@esbuild/win32-ia32-0.17.19" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4873,6 +5044,15 @@ let sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; }; }; + "@esbuild/win32-ia32-0.19.5" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz"; + sha512 = "4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw=="; + }; + }; "@esbuild/win32-x64-0.17.19" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4891,6 +5071,15 @@ let sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; }; }; + "@esbuild/win32-x64-0.19.5" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz"; + sha512 = "czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw=="; + }; + }; "@eslint-community/eslint-utils-4.4.0" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -4900,13 +5089,13 @@ let sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint-community/regexpp-4.9.1" = { + "@eslint-community/regexpp-4.10.0" = { name = "_at_eslint-community_slash_regexpp"; packageName = "@eslint-community/regexpp"; - version = "4.9.1"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz"; - sha512 = "Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA=="; + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz"; + sha512 = "Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -4918,13 +5107,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-2.1.2" = { + "@eslint/eslintrc-2.1.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz"; - sha512 = "+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz"; + sha512 = "yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA=="; }; }; "@eslint/js-8.44.0" = { @@ -4936,13 +5125,13 @@ let sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; }; }; - "@eslint/js-8.50.0" = { + "@eslint/js-8.53.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.50.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz"; - sha512 = "NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz"; + sha512 = "Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -5053,13 +5242,13 @@ let sha512 = "4e7hzPj50mQIlsrzOH6XZ36O094mPfPTIDIH4yv49bWNMc7GFLTofB/lcT+QyxiLaJuC0Wlk9yOLB8DIqmtwug=="; }; }; - "@expo/config-8.3.1" = { + "@expo/config-8.4.0" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "8.3.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-8.3.1.tgz"; - sha512 = "5fNGAw5h/MDOc8Ulv9nonafPtOT042B7dF6vrVxSP3CY5qiVu0tCsmbL412wEcrAZ8MY7UMv9e6IzpGTgleYgg=="; + url = "https://registry.npmjs.org/@expo/config/-/config-8.4.0.tgz"; + sha512 = "m3LkkONHrGsoFASyi3VuxJON/McRwMOtU9tw9PC/XEhRy1HfRALxdqTMl0W5X79ra7kCXd8H5EVTbTl9pvU+bw=="; }; }; "@expo/config-plugins-4.1.5" = { @@ -5089,13 +5278,13 @@ let sha512 = "TItGwmKH1GDjA5GlMkXo1A8pqeqppSK40aSVRVQaGZraUj+nuvtpWxNgEWZxWFumiatP2ocWwyWVjfmH+rJY6g=="; }; }; - "@expo/config-plugins-7.5.0" = { + "@expo/config-plugins-7.6.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.5.0.tgz"; - sha512 = "qOKjmgbddLh1vj9ytUT6AduhEans2cHgS42nopVgh5Wz8X+QUvPcCr1Yc8MvLM3OlbswBMCJceeosZa463i0uA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.6.0.tgz"; + sha512 = "2YX5xQhxSWVFS2BzMo8SVJPGuc6R/Ci2o4oeMT5F/JvdUut56pBCZietkkAxX9gOcIYMMTYFJllMn/Ecb5v4yQ=="; }; }; "@expo/config-types-45.0.0" = { @@ -5161,40 +5350,31 @@ let sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-1.0.39" = { + "@expo/eas-build-job-1.0.48" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.39"; + version = "1.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.39.tgz"; - sha512 = "OqCCxLx9HRMFQDiZvfpOfNmGhsTrV15IUOhmbp9iIa+uO/VyPpBvXqiA4ENCN9Jmf6yXtirIranCeJcm+jAuSA=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.48.tgz"; + sha512 = "44N9fKrur7xOtY8DnHcFEzJTPenOBUkfpNous4xziG8u58oXvlraiNaTSi++4EpFfsBS3U+jQAW9UMlJqfu8WA=="; }; }; - "@expo/eas-build-job-1.0.43" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "1.0.43"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.43.tgz"; - sha512 = "LMOoDIEax31uGBGux6/ocbCjUbWK3cUHuCxrsYlU+bvba4pGifegYWt2YQ/HC2477paq+K69IGjOUCHvNWG6Yg=="; - }; - }; - "@expo/eas-json-5.3.1" = { + "@expo/eas-json-5.7.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "5.3.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.3.1.tgz"; - sha512 = "0o2mDv2wyErRyR86738KfyXf6+xuYyK9zpC/WaCRAkGO+sNANeXncxl7SXh7aVa5+YC550AK0L3lWFcM4XeLBg=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.7.0.tgz"; + sha512 = "JNg1vXZzQPxGmvq3BoP40b6k49KWaysNSLpJhGFGy5oHhIC7BOI5P0yTCSdluxhd0Rq5oLc03tnYbqoFGWUT8g=="; }; }; - "@expo/fingerprint-0.2.0" = { + "@expo/fingerprint-0.4.0" = { name = "_at_expo_slash_fingerprint"; packageName = "@expo/fingerprint"; - version = "0.2.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.2.0.tgz"; - sha512 = "k6MhJTrX4CYEwsyGemiLT8rnBwjRBYe0eKYAM3kqw0WbSHzkOJm739sgdswGLmA53iiX6FbB1TsiLnqt+h2U2w=="; + url = "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.4.0.tgz"; + sha512 = "3IXE9ywdX41Zjb+bkIOxBEXqFQikJTWz3VeDU3x9pV2pz2d/qP8dnvbmY3emP2gfhOZesF2oAZqg2ZbrP5gGnw=="; }; }; "@expo/image-utils-0.3.21" = { @@ -5296,15 +5476,6 @@ let sha512 = "PGk34uz4XDyhoNIlPh2D+BDsiXYuW2jXavTiax8d32uvHlRO6FN0cAsqlWD6fx3H2hRn8cU/leTuc4M7pYovCQ=="; }; }; - "@expo/package-manager-0.0.57" = { - name = "_at_expo_slash_package-manager"; - packageName = "@expo/package-manager"; - version = "0.0.57"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.57.tgz"; - sha512 = "Y4RpSL9EqaPF+Vd2GrK6r7Xx7Dv0Xdq3AGAD9C0KwV21WqP/scj/dpjxFY+ABwmdhNsFzYXb8fmDyh4tiKenPQ=="; - }; - }; "@expo/package-manager-1.0.3" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; @@ -5314,6 +5485,15 @@ let sha512 = "NpdwcRar22gJDDug3GEb62Ka6vy+Yi//3zTdYhdkzwekY6qzg7+vZCeEKayFJjvbCjjOPNSrauNR4zD+WJmRIQ=="; }; }; + "@expo/package-manager-1.1.1" = { + name = "_at_expo_slash_package-manager"; + packageName = "@expo/package-manager"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.1.1.tgz"; + sha512 = "NxtfIA25iEiNwMT+s8PEmdKzjyfWd2qkCLJkf6jKZGaH9c06YXyOAi2jvCyM8XuSzJz4pcEH8kz1HkJAInjB7Q=="; + }; + }; "@expo/pkcs12-0.0.8" = { name = "_at_expo_slash_pkcs12"; packageName = "@expo/pkcs12"; @@ -5539,31 +5719,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-39.16.0" = { + "@gitbeaker/core-39.21.2" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "39.16.0"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.16.0.tgz"; - sha512 = "O0CiVt7EwD7zOqMBluEI+PsJL0bIotxcmvQLTh0vd7ylpK0J3QVPpe1/63hI1njaJDpwBR1jfErXD1xxkjQ5zA=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.21.2.tgz"; + sha512 = "HPFQVhbTKu+IaKw5+8TnRPTqAp6SPFzaCbwAEJ7nWLAsI2IRP+iWyASmMDG99RY8TcqnCBrxx3tAClV+QBhflg=="; }; }; - "@gitbeaker/requester-utils-39.16.0" = { + "@gitbeaker/requester-utils-39.21.2" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "39.16.0"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.16.0.tgz"; - sha512 = "SEBGY4yyuuAPU7Bk/oWxHNM/bUhCMToW6r8G0PItM7BfYbF344MpRUYmcKvbFNBycctpU0qoyabWYi5SH3cVaw=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.21.2.tgz"; + sha512 = "RlYJDzfqSEI/q2vY1xn4bQ6/j0kyuoySRUnA8huEdA48IfowNLAigaXxB9cQxBecmnt32JQZitUbxsHpelkQYw=="; }; }; - "@gitbeaker/rest-39.16.0" = { + "@gitbeaker/rest-39.21.2" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "39.16.0"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.16.0.tgz"; - sha512 = "J7JRYO4AuZaeNA75dHeH48ZuOp9111kWUYOlAmwl2VfhTwkjdjjDSKV8/bn7vs/3qLJlyxI1NxoHpOpTyyWEyw=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.21.2.tgz"; + sha512 = "631HpAApQcg2r0kkzp5tveSDclEeI382lNAXoKO9D9ndhZrAzY/gvskCi7FrOJ8+35lfzRmiEUIBpdUbdvblvg=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5647,31 +5827,31 @@ let sha512 = "SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg=="; }; }; - "@graphql-tools/executor-graphql-ws-1.1.0" = { + "@graphql-tools/executor-graphql-ws-1.1.1" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz"; - sha512 = "yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.1.tgz"; + sha512 = "llfLyRpmXqMX6kM3AvepviTxi06UTutphJljQupoU8FaTh0OcGFPjLjVSbgP7tOqI6lD1YbPR7qY83vDeYLarA=="; }; }; - "@graphql-tools/executor-http-1.0.2" = { + "@graphql-tools/executor-http-1.0.3" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.2.tgz"; - sha512 = "JKTB4E3kdQM2/1NEcyrVPyQ8057ZVthCV5dFJiKktqY9IdmF00M8gupFcW3jlbM/Udn78ickeUBsUzA3EouqpA=="; - }; - }; - "@graphql-tools/executor-legacy-ws-1.0.3" = { - name = "_at_graphql-tools_slash_executor-legacy-ws"; - packageName = "@graphql-tools/executor-legacy-ws"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.3.tgz"; - sha512 = "rr3IDeO9Dh+8u8KIro++5kzJJYPHkcrIAWzqXtN663nhInC85iW7Ko91yOYwf7ovBci/7s+4Rqe4ZRyca1LGjQ=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.3.tgz"; + sha512 = "5WZIMBevRaxMabZ8U2Ty0dTUPy/PpeYSlMNEmC/YJjKKykgSfc/AwSejx2sE4FFKZ0I2kxRKRenyoWMHRAV49Q=="; + }; + }; + "@graphql-tools/executor-legacy-ws-1.0.4" = { + name = "_at_graphql-tools_slash_executor-legacy-ws"; + packageName = "@graphql-tools/executor-legacy-ws"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.4.tgz"; + sha512 = "b7aGuRekZDS+m3af3BIvMKxu15bmVPMt5eGQVuP2v5pxmbaPTh+iv5mx9b3Plt32z5Ke5tycBnNm5urSFtW8ng=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -5854,13 +6034,13 @@ let sha512 = "rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA=="; }; }; - "@graphql-tools/utils-10.0.6" = { + "@graphql-tools/utils-10.0.8" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.0.6"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.6.tgz"; - sha512 = "hZMjl/BbX10iagovakgf3IiqArx8TPsotq5pwBld37uIX1JiZoSbgbCIFol7u55bh32o6cfDEiiJgfAD5fbeyQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz"; + sha512 = "yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5980,22 +6160,13 @@ let sha512 = "97bYxNaDe/+GCUAKu0V2qudQmR3NFRnv3SrQd2FTtOAa9OWKwkvoBs2WzT7MkNwP4DIpYL6W/e3CSfShfhzEMw=="; }; }; - "@homebridge/ciao-1.1.7" = { - name = "_at_homebridge_slash_ciao"; - packageName = "@homebridge/ciao"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.1.7.tgz"; - sha512 = "q8XRDFn2peboPHGV+wbLCpp52anKiZsoNHZGA+t3I2iJ0/Qn+/8YNO0ILiJnPlVYos6fHceYiL75fhNIISTBRg=="; - }; - }; - "@hpcc-js/wasm-2.13.1" = { + "@hpcc-js/wasm-2.14.1" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "2.13.1"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz"; - sha512 = "dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.14.1.tgz"; + sha512 = "ncPvj0dEjoye8jD1NAwdThXlZ5mpuGRyRwaNWU6JVBgyT8TewVDmG+RAOXPysyaP1Ui8Lm7562W4KawZtPwa1A=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -6007,13 +6178,13 @@ let sha512 = "A0NOZI+Glp3Xgcz6Na7i7o09+/+xm2m0UCU8gdtM2nIv6/cjLmhMZMqehSpTlgbx9omtLmV8LVqOskPEyWnmZQ=="; }; }; - "@humanwhocodes/config-array-0.11.11" = { + "@humanwhocodes/config-array-0.11.13" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.11.11"; + version = "0.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz"; - sha512 = "N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz"; + sha512 = "JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ=="; }; }; "@humanwhocodes/config-array-0.5.0" = { @@ -6043,6 +6214,15 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; + "@humanwhocodes/object-schema-2.0.1" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz"; + sha512 = "dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw=="; + }; + }; "@hutson/parse-repository-url-3.0.2" = { name = "_at_hutson_slash_parse-repository-url"; packageName = "@hutson/parse-repository-url"; @@ -6070,40 +6250,40 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-0.45.5" = { + "@ibm-cloud/openapi-ruleset-1.14.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "0.45.5"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-0.45.5.tgz"; - sha512 = "8FqJQj8osll6iLOD5JsFWR+kOU1HbCp1Z2PjHeE67Wb/srz7V9B+YyjZOO9QAgLLHwvgt07XS13FQ+ArNNetGg=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.14.2.tgz"; + sha512 = "ovB/kc5Rg1/69AUrEVb0R1spvvqvQpLm5rQUEQ92VyKokBDk8YnTP4H7sb/Xta1yoUR2Rcq+GMkwv15O9OE+qg=="; }; }; - "@ibm-cloud/openapi-ruleset-utilities-0.0.1" = { + "@ibm-cloud/openapi-ruleset-utilities-1.3.0" = { name = "_at_ibm-cloud_slash_openapi-ruleset-utilities"; packageName = "@ibm-cloud/openapi-ruleset-utilities"; - version = "0.0.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-0.0.1.tgz"; - sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-1.3.0.tgz"; + sha512 = "CuG5u6+gSEbU8IKGZqKH+WsH4rFU9KMYriDzG6F+DJ8XbtEd3RTHWMQdAeO/ec2XiyPF2j4VxWEXMzVZJ05bAA=="; }; }; - "@inquirer/checkbox-1.3.12" = { + "@inquirer/checkbox-1.5.0" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "1.3.12"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.3.12.tgz"; - sha512 = "Jz2XAwN6R9ONtb7+QqmUhKtVL7lumunHhUoNuOzBj2mP/pe/sNZzJQKGbwiePPyKot64vzDAJ4qiBES0ubpb+A=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.5.0.tgz"; + sha512 = "3cKJkW1vIZAs4NaS0reFsnpAjP0azffYII4I2R7PTI7ZTMg5Y1at4vzXccOH3762b2c2L4drBhpJpf9uiaGNxA=="; }; }; - "@inquirer/confirm-2.0.13" = { + "@inquirer/confirm-2.0.15" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "2.0.13"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.13.tgz"; - sha512 = "MoobMgUxq0UCEcNm8O2zegEoSbf9DdYQfmW2csTcpIbLfrv3LfPTWoFcgY50cS8CXpP2o/Dog2GH03jWxzNIzg=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.15.tgz"; + sha512 = "hj8Q/z7sQXsF0DSpLQZVDhWYGN6KLM/gNjjqGkpKwBzljbQofGjn0ueHADy4HUY+OqDHmXuwk/bY+tZyIuuB0w=="; }; }; "@inquirer/core-2.3.1" = { @@ -6115,49 +6295,49 @@ let sha512 = "faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw=="; }; }; - "@inquirer/core-5.0.1" = { + "@inquirer/core-5.1.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-5.0.1.tgz"; - sha512 = "mRf9YFdrSa3+nHA8n/SUF/sDJcK6C5KlXS5xYwIB2NWfESYYBM2KTpubJPBR0sJxsrsZZC2WgfYl8TURPvMm8g=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-5.1.1.tgz"; + sha512 = "IuJyZQUg75+L5AmopgnzxYrgcU6PJKL0hoIs332G1Gv55CnmZrhG6BzNOeZ5sOsTi1YCGOopw4rYICv74ejMFg=="; }; }; - "@inquirer/editor-1.2.11" = { + "@inquirer/editor-1.2.13" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "1.2.11"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.11.tgz"; - sha512 = "5WcjiTZsr8utlmfOFcHIC0o2Mdg3nXUf1ij5IZtgJTFd8QOy7N/sfsZHW0p1wY+YSbX6Sxd+YyUCJ2t6xQiyqA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.13.tgz"; + sha512 = "gBxjqt0B9GLN0j6M/tkEcmcIvB2fo9Cw0f5NRqDTkYyB9AaCzj7qvgG0onQ3GVPbMyMbbP4tWYxrBOaOdKpzNA=="; }; }; - "@inquirer/expand-1.1.12" = { + "@inquirer/expand-1.1.14" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "1.1.12"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.12.tgz"; - sha512 = "xNDrp5TO3xclcSqlWClskQd11OyGjnW2lek/4xeWQUrNKO1nN9VAzRAaEAkSpxF5FXG38M9oIBq6SMCYtBx/zw=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.14.tgz"; + sha512 = "yS6fJ8jZYAsxdxuw2c8XTFMTvMR1NxZAw3LxDaFnqh7BZ++wTQ6rSp/2gGJhMacdZ85osb+tHxjVgx7F+ilv5g=="; }; }; - "@inquirer/input-1.2.12" = { + "@inquirer/input-1.2.14" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.12.tgz"; - sha512 = "ruckbVn/Jv+Pkqod7ACKNOtiKkW/DKSmWn11TUsJweuUbQQMWX5V/9nUvbX/4mJV9bFX817rnJhRru3MwjU8jA=="; + url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.14.tgz"; + sha512 = "tISLGpUKXixIQue7jypNEShrdzJoLvEvZOJ4QRsw5XTfrIYfoWFqAjMQLerGs9CzR86yAI89JR6snHmKwnNddw=="; }; }; - "@inquirer/password-1.1.12" = { + "@inquirer/password-1.1.14" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "1.1.12"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.12.tgz"; - sha512 = "vVNxEVbe+XltKZlLBFvo4IcKwGyqmnc5cQkoEOTDYs0Jazrxct3x8bu89FpRhT/e93gm/TnWpqdI47+B7n/sWw=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.14.tgz"; + sha512 = "vL2BFxfMo8EvuGuZYlryiyAB3XsgtbxOcFs4H9WI9szAS/VZCAwdVqs8rqEeaAf/GV/eZOghIOYxvD91IsRWSg=="; }; }; "@inquirer/prompts-2.3.1" = { @@ -6169,22 +6349,22 @@ let sha512 = "YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ=="; }; }; - "@inquirer/rawlist-1.2.12" = { + "@inquirer/rawlist-1.2.14" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.12.tgz"; - sha512 = "j5n4TpK4YP/Wt+hREjzDsqALulOocAEl1e4l8Mt2+2DQ66hWrfBTazkEaQJSeaTLRbm9153NjuObRD1+mQqg7g=="; + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.14.tgz"; + sha512 = "xIYmDpYgfz2XGCKubSDLKEvadkIZAKbehHdWF082AyC2I4eHK44RUfXaoOAqnbqItZq4KHXS6jDJ78F2BmQvxg=="; }; }; - "@inquirer/select-1.2.12" = { + "@inquirer/select-1.3.1" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "1.2.12"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-1.2.12.tgz"; - sha512 = "+KeKbxjJ/qa1yUxwaD38fhhi1nzL2qGigdT/E/GwXLtoWLJ8Rl8hCe37xRB2gP8yK3vhhv6ll8C4bgJtu2hIWA=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-1.3.1.tgz"; + sha512 = "EgOPHv7XOHEqiBwBJTyiMg9r57ySyW4oyYCumGp+pGyOaXQaLb2kTnccWI6NFd9HSi5kDJhF7YjA+3RfMQJ2JQ=="; }; }; "@inquirer/type-1.1.5" = { @@ -6673,13 +6853,13 @@ let sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; }; }; - "@jridgewell/trace-mapping-0.3.19" = { + "@jridgewell/trace-mapping-0.3.20" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.19"; + version = "0.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"; - sha512 = "kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; + sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; }; }; "@jridgewell/trace-mapping-0.3.9" = { @@ -6727,31 +6907,22 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.88.0" = { + "@jsii/check-node-1.91.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.88.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.88.0.tgz"; - sha512 = "AveFyqkJIb8qZvGk5nZal/8mEJB6lWhwqvAQLodHmqE3WzpmZD5+h+aspBVt0El5cEFRJ1k1mrQqhAnJCVpvxg=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.91.0.tgz"; + sha512 = "K9UFkRe4uJNVp1O2o4OBM/3usba6Vw3XF1Mq3TVBAYl1EzpAiA62DojGp30+3zwFlb1lkavVj1hKlCrIWIuJhw=="; }; }; - "@jsii/check-node-1.89.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.89.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.89.0.tgz"; - sha512 = "RMw19IEj6ch6oOGkBrAbtzwshrOXMKlfbX54S0hGrwR1qlSjNS9qqt4p+LRSpurhriEo7oHDegItNGUjPYoNXw=="; - }; - }; - "@jsii/spec-1.89.0" = { + "@jsii/spec-1.91.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.89.0.tgz"; - sha512 = "byzIC5M5FrEaW+GaPGQfPsobfwmEfzHvS7dh5d5fgY4VvvsHBkkhhF/H5xUG+1wQBcdBnqdKyp5CEFm8UEVfqg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.91.0.tgz"; + sha512 = "Ir01bk5CwIFAApRJjRC+JG/f9db5dACEYFSxsHyvXRMu+J/LIANdwD4OPSelWrhbRiQdY6U16BKsRO63uaNRqg=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -6781,22 +6952,22 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/child-process-7.3.0" = { + "@lerna/child-process-7.4.2" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.3.0.tgz"; - sha512 = "rA+fGUo2j/LEq6w1w8s6oVikLbJTWoIDVpYMc7bUCtwDOUuZKMQiRtjmpavY3fTm7ltu42f4AKflc2A70K4wvA=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.2.tgz"; + sha512 = "je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q=="; }; }; - "@lerna/create-7.3.0" = { + "@lerna/create-7.4.2" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-7.3.0.tgz"; - sha512 = "fjgiKjg9VXwQ4ZKKsrXICEKRiC3yo6+FprR0mc55uz0s5e9xupoSGLobUTTBdE7ncNB3ibqml8dfaAn/+ESajQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-7.4.2.tgz"; + sha512 = "1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg=="; }; }; "@lezer/common-1.1.0" = { @@ -6808,22 +6979,22 @@ let sha512 = "XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="; }; }; - "@lezer/lr-1.3.12" = { + "@lezer/lr-1.3.14" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.12"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.12.tgz"; - sha512 = "5nwY1JzCueUdRtlMBnlf1SUi69iGCq2ABq7WQFQMkn/kxPvoACAEnTp4P17CtXxYr7WCwtYPLL2AEvxKPuF1OQ=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz"; + sha512 = "z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug=="; }; }; - "@ljharb/through-2.3.9" = { + "@ljharb/through-2.3.11" = { name = "_at_ljharb_slash_through"; packageName = "@ljharb/through"; - version = "2.3.9"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ljharb/through/-/through-2.3.9.tgz"; - sha512 = "yN599ZBuMPPK4tdoToLlvgJB4CLK8fGl7ntfy0Wn7U6ttNvHYurd81bfUiK/6sMkiIwm65R6ck4L6+Y3DfVbNQ=="; + url = "https://registry.npmjs.org/@ljharb/through/-/through-2.3.11.tgz"; + sha512 = "ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w=="; }; }; "@lmdb/lmdb-darwin-arm64-2.5.3" = { @@ -6835,13 +7006,13 @@ let sha512 = "RXwGZ/0eCqtCY8FLTM/koR60w+MXyvBUpToXiIyjOcBnC81tAlTUHrRUavCEWPI9zc9VgvpK3+cbumPyR8BSuA=="; }; }; - "@lmdb/lmdb-darwin-arm64-2.7.11" = { + "@lmdb/lmdb-darwin-arm64-2.8.5" = { name = "_at_lmdb_slash_lmdb-darwin-arm64"; packageName = "@lmdb/lmdb-darwin-arm64"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.7.11.tgz"; - sha512 = "r6+vYq2vKzE+vgj/rNVRMwAevq0+ZR9IeMFIqcSga+wMtMdXQ27KqQ7uS99/yXASg29bos7yHP3yk4x6Iio0lw=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.8.5.tgz"; + sha512 = "KPDeVScZgA1oq0CiPBcOa3kHIqU+pTOwRFDIhxvmf8CTNvqdZQYp5cCKW0bUk69VygB2PuTiINFWbY78aR2pQw=="; }; }; "@lmdb/lmdb-darwin-x64-2.5.3" = { @@ -6853,13 +7024,13 @@ let sha512 = "337dNzh5yCdNCTk8kPfoU7jR3otibSlPDGW0vKZT97rKnQMb9tNdto3RtWoGPsQ8hKmlRZpojOJtmwjncq1MoA=="; }; }; - "@lmdb/lmdb-darwin-x64-2.7.11" = { + "@lmdb/lmdb-darwin-x64-2.8.5" = { name = "_at_lmdb_slash_lmdb-darwin-x64"; packageName = "@lmdb/lmdb-darwin-x64"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.7.11.tgz"; - sha512 = "jhj1aB4K8ycRL1HOQT5OtzlqOq70jxUQEWRN9Gqh3TIDN30dxXtiHi6EWF516tzw6v2+3QqhDMJh8O6DtTGG8Q=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.8.5.tgz"; + sha512 = "w/sLhN4T7MW1nB3R/U8WK5BgQLz904wh+/SmA2jD8NnF7BLLoUgflCNxOeSPOWp8geP6nP/+VjWzZVip7rZ1ug=="; }; }; "@lmdb/lmdb-linux-arm-2.5.3" = { @@ -6871,13 +7042,13 @@ let sha512 = "mU2HFJDGwECkoD9dHQEfeTG5mp8hNS2BCfwoiOpVPMeapjYpQz9Uw3FkUjRZ4dGHWKbin40oWHuL0bk2bCx+Sg=="; }; }; - "@lmdb/lmdb-linux-arm-2.7.11" = { + "@lmdb/lmdb-linux-arm-2.8.5" = { name = "_at_lmdb_slash_lmdb-linux-arm"; packageName = "@lmdb/lmdb-linux-arm"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.7.11.tgz"; - sha512 = "dHfLFVSrw/v5X5lkwp0Vl7+NFpEeEYKfMG2DpdFJnnG1RgHQZngZxCaBagFoaJGykRpd2DYF1AeuXBFrAUAXfw=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.8.5.tgz"; + sha512 = "c0TGMbm2M55pwTDIfkDLB6BpIsgxV4PjYck2HiOX+cy/JWiBXz32lYbarPqejKs9Flm7YVAKSILUducU9g2RVg=="; }; }; "@lmdb/lmdb-linux-arm64-2.5.3" = { @@ -6889,13 +7060,13 @@ let sha512 = "VJw60Mdgb4n+L0fO1PqfB0C7TyEQolJAC8qpqvG3JoQwvyOv6LH7Ib/WE3wxEW9nuHmVz9jkK7lk5HfWWgoO1Q=="; }; }; - "@lmdb/lmdb-linux-arm64-2.7.11" = { + "@lmdb/lmdb-linux-arm64-2.8.5" = { name = "_at_lmdb_slash_lmdb-linux-arm64"; packageName = "@lmdb/lmdb-linux-arm64"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.7.11.tgz"; - sha512 = "7xGEfPPbmVJWcY2Nzqo11B9Nfxs+BAsiiaY/OcT4aaTDdykKeCjvKMQJA3KXCtZ1AtiC9ljyGLi+BfUwdulY5A=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.8.5.tgz"; + sha512 = "vtbZRHH5UDlL01TT5jB576Zox3+hdyogvpcbvVJlmU5PdL3c5V7cj1EODdh1CHPksRl+cws/58ugEHi8bcj4Ww=="; }; }; "@lmdb/lmdb-linux-x64-2.5.3" = { @@ -6907,13 +7078,13 @@ let sha512 = "qaReO5aV8griBDsBr8uBF/faO3ieGjY1RY4p8JvTL6Mu1ylLrTVvOONqKFlNaCwrmUjWw5jnf7VafxDAeQHTow=="; }; }; - "@lmdb/lmdb-linux-x64-2.7.11" = { + "@lmdb/lmdb-linux-x64-2.8.5" = { name = "_at_lmdb_slash_lmdb-linux-x64"; packageName = "@lmdb/lmdb-linux-x64"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.7.11.tgz"; - sha512 = "vUKI3JrREMQsXX8q0Eq5zX2FlYCKWMmLiCyyJNfZK0Uyf14RBg9VtB3ObQ41b4swYh2EWaltasWVe93Y8+KDng=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.8.5.tgz"; + sha512 = "Xkc8IUx9aEhP0zvgeKy7IQ3ReX2N8N1L0WPcQwnZweWmOuKfwpS3GRIYqLtK5za/w3E60zhFfNdS+3pBZPytqQ=="; }; }; "@lmdb/lmdb-win32-x64-2.5.3" = { @@ -6925,13 +7096,13 @@ let sha512 = "cK+Elf3RjEzrm3SerAhrFWL5oQAsZSJ/LmjL1joIpTfEP1etJJ9CTRvdaV6XLYAxaEkfdhk/9hOvHLbR9yIhCA=="; }; }; - "@lmdb/lmdb-win32-x64-2.7.11" = { + "@lmdb/lmdb-win32-x64-2.8.5" = { name = "_at_lmdb_slash_lmdb-win32-x64"; packageName = "@lmdb/lmdb-win32-x64"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.7.11.tgz"; - sha512 = "BJwkHlSUgtB+Ei52Ai32M1AOMerSlzyIGA/KC4dAGL+GGwVMdwG8HGCOA2TxP3KjhbgDPMYkv7bt/NmOmRIFng=="; + url = "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.8.5.tgz"; + sha512 = "4wvrf5BgnR8RpogHhtpCPJMKBmvyZPhhUtEwMJbXh0ni2BucpfF07jlmyM11zRqQ2XIq6PbC2j7W7UCCcm1rRQ=="; }; }; "@malept/cross-spawn-promise-1.1.1" = { @@ -6979,13 +7150,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.107.4" = { + "@microsoft/rush-lib-5.110.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.107.4.tgz"; - sha512 = "B9s0HhvXbQXHE14q2TcI9FMHYB0WvmlXTdXhsmumJ3tddJQd9jVxIdQd5H5OBGELULLc1UQnnTFAid4/cND6UA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.110.1.tgz"; + sha512 = "+DhfZSUrxl5IOTJK452lahcXc8tPddyb0q8FmQ4LzShjUgOzTQrV3JIKY8BR93WeA47DMl1NpaiKiZEw++uY+w=="; }; }; "@mischnic/json-sourcemap-0.1.1" = { @@ -7006,60 +7177,6 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; - packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz"; - sha512 = "9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ=="; - }; - }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; - packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz"; - sha512 = "lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw=="; - }; - }; - "@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; - packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz"; - sha512 = "MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA=="; - }; - }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; - packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz"; - sha512 = "FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg=="; - }; - }; - "@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; - packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz"; - sha512 = "gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA=="; - }; - }; - "@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" = { - name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; - packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz"; - sha512 = "O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ=="; - }; - }; "@noble/curves-1.1.0" = { name = "_at_noble_slash_curves"; packageName = "@noble/curves"; @@ -7168,22 +7285,31 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/ci-detect-1.4.0" = { - name = "_at_npmcli_slash_ci-detect"; - packageName = "@npmcli/ci-detect"; - version = "1.4.0"; + "@npmcli/agent-2.2.0" = { + name = "_at_npmcli_slash_agent"; + packageName = "@npmcli/agent"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz"; - sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz"; + sha512 = "2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q=="; }; }; - "@npmcli/config-6.3.0" = { + "@npmcli/config-6.4.0" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-6.3.0.tgz"; - sha512 = "gV64pm5cQ7F2oeoSJ5HTfaKxjFsvC4dAbCsQbtbOkEOymM6iZI62yNGCOLjcq/rfYX9+wVn34ThxK7GZpUwWFg=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-6.4.0.tgz"; + sha512 = "/fQjIbuNVIT/PbXvw178Tm97bxV0E0nVUFKHivMKtSI2pcs8xKdaWkHJxf9dTI0G/y5hp/KuCvgcUu5HwAtI1w=="; + }; + }; + "@npmcli/config-8.0.1" = { + name = "_at_npmcli_slash_config"; + packageName = "@npmcli/config"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/config/-/config-8.0.1.tgz"; + sha512 = "NKGmMYv/YTLwJr+qK9CvADSe82NTM9AFwFFpsZpVcPCT3XTdxvJBdXi8xvXWjHSCMb0Cb+7FtU/a5qqguCOhxA=="; }; }; "@npmcli/fs-1.1.1" = { @@ -7195,6 +7321,15 @@ let sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; + "@npmcli/fs-2.1.2" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz"; + sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; + }; + }; "@npmcli/fs-3.1.0" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -7213,6 +7348,15 @@ let sha512 = "9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ=="; }; }; + "@npmcli/git-5.0.3" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.3.tgz"; + sha512 = "UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw=="; + }; + }; "@npmcli/installed-package-contents-2.0.2" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -7240,6 +7384,15 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; + "@npmcli/move-file-2.0.1" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz"; + sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; + }; + }; "@npmcli/name-from-folder-2.0.0" = { name = "_at_npmcli_slash_name-from-folder"; packageName = "@npmcli/name-from-folder"; @@ -7267,6 +7420,15 @@ let sha512 = "gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg=="; }; }; + "@npmcli/promise-spawn-7.0.0" = { + name = "_at_npmcli_slash_promise-spawn"; + packageName = "@npmcli/promise-spawn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz"; + sha512 = "wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ=="; + }; + }; "@npmcli/run-script-6.0.2" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -7276,40 +7438,49 @@ let sha512 = "NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA=="; }; }; - "@nrwl/devkit-16.9.1" = { + "@npmcli/run-script-7.0.2" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz"; + sha512 = "Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w=="; + }; + }; + "@nrwl/devkit-16.10.0" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "16.9.1"; + version = "16.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.9.1.tgz"; - sha512 = "+iR7tg+LOrGWAGmGv0hr45hYUOeKjK/Jm6WV3Ldmx6I7LaaYM5Fu6Ev2KXL669QMzLJpg3kqgKQsneWbFT3MAw=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.10.0.tgz"; + sha512 = "fRloARtsDQoQgQ7HKEy0RJiusg/HSygnmg4gX/0n/Z+SUS+4KoZzvHjXc6T5ZdEiSjvLypJ+HBM8dQzIcVACPQ=="; }; }; - "@nrwl/tao-16.9.1" = { + "@nrwl/tao-16.10.0" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "16.9.1"; + version = "16.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.9.1.tgz"; - sha512 = "KsRBRAE5mSP83ZjO9cPW6ZQZWOtkMfCBih/WE9qpaiHn+hCydtYStyAO2QSic4tHVV+8VpPUQWYnpf5rhkNzWg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.10.0.tgz"; + sha512 = "QNAanpINbr+Pod6e1xNgFbzK1x5wmZl+jMocgiEFXZ67KHvmbD6MAQQr0MMz+GPhIu7EE4QCTLTyCEMlAG+K5Q=="; }; }; - "@nx/devkit-16.9.1" = { + "@nx/devkit-16.10.0" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "16.9.1"; + version = "16.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.9.1.tgz"; - sha512 = "jQMLX8pUKsOIk0tLFzJms5awPxKfJEi0uxY7+IUfRNHcnDkOFiv6gf1QqJ3pobmgwBdbC6Nv/dhDP3JT2wA1gA=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.10.0.tgz"; + sha512 = "IvKQqRJFDDiaj33SPfGd3ckNHhHi6ceEoqCbAP4UuMXOPPVOX6H0KVk+9tknkPb48B7jWIw6/AgOeWkBxPRO5w=="; }; }; - "@oclif/color-1.0.12" = { + "@oclif/color-1.0.13" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.12.tgz"; - sha512 = "pz3MmtQVNwsbVsyIxEWWuSXZTViGfW1v1JjI+3fWMiJ5IqCCeImDafynPDuh7QBwzl2UmjcbmSGyGYqfaFAzJA=="; + url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.13.tgz"; + sha512 = "/2WZxKCNjeHlQogCs1VBtJWlPXjwWke/9gMrwsVsrUt00g2V6LUBvwgwrxhrXepjOmq4IZ5QeNbpDMEOUlx/JA=="; }; }; "@oclif/command-1.8.36" = { @@ -7438,13 +7609,13 @@ let sha512 = "oQl7ZqXhXJUOH26mDPcqcMGmcdIoK/uQPSpUBrfLa1iaQ30slTs0T7KOzg+vwKuPqIIF1nTCPuH67lE8GvUPTw=="; }; }; - "@oclif/plugin-commands-2.2.21" = { + "@oclif/plugin-commands-2.2.24" = { name = "_at_oclif_slash_plugin-commands"; packageName = "@oclif/plugin-commands"; - version = "2.2.21"; + version = "2.2.24"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-commands/-/plugin-commands-2.2.21.tgz"; - sha512 = "PgYDJxILtXS+Ae/4i9Dj/0Ge7coNjrdGyhtndMRp4jqVeS8K2hjKvwMWLaHmUN3tU3RrdUBxJchaJ1bZ03ShBA=="; + url = "https://registry.npmjs.org/@oclif/plugin-commands/-/plugin-commands-2.2.24.tgz"; + sha512 = "bUZOBefMPR59oHngWNHDn+zGRQctVR5iMkO3qRWFUSVYt1VQtqOwAPBtpTIuIxL17/iGTG+U2b8jafn09lQNxA=="; }; }; "@oclif/plugin-help-3.3.1" = { @@ -7456,13 +7627,13 @@ let sha512 = "QuSiseNRJygaqAdABYFWn/H1CwIZCp9zp/PLid6yXvy6VcQV7OenEFF5XuYaCvSARe2Tg9r8Jqls5+fw1A9CbQ=="; }; }; - "@oclif/plugin-help-5.2.15" = { + "@oclif/plugin-help-5.2.18" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "5.2.15"; + version = "5.2.18"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.15.tgz"; - sha512 = "q3gC4kIRlTilA8sG/9Eq2BEW2wo2KWV0ZbQ+8i3uQCvrgY4qoCIp5JTfsbbKR5XWaqPDdZPWhWuS1Rveu5V4FA=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.18.tgz"; + sha512 = "0JjupXUuDzlI0Ojj7/YL42btfUNuvSgZxdi8ZfeYt/uhC1/zvsSkO29KjffPxKEnbhr6jrkjOgy/Vly5JquYLg=="; }; }; "@oclif/plugin-help-5.2.20" = { @@ -7474,13 +7645,13 @@ let sha512 = "u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ=="; }; }; - "@oclif/plugin-not-found-2.4.2" = { + "@oclif/plugin-not-found-2.4.3" = { name = "_at_oclif_slash_plugin-not-found"; packageName = "@oclif/plugin-not-found"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.4.2.tgz"; - sha512 = "NT/MRj5haUhkJJGf7wiF9+PslMfceQzkn8YkmdWON/X0iMPeoEst3aa50eSZvw79id+Kckl9kneJndqrUgWu/w=="; + url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.4.3.tgz"; + sha512 = "nIyaR4y692frwh7wIHZ3fb+2L6XEecQwRDIb4zbEam0TvaVmBQWZoColQyWA84ljFBPZ8XWiQyTz+ixSwdRkqg=="; }; }; "@oclif/plugin-plugins-2.4.7" = { @@ -7528,13 +7699,13 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@oclif/screen-3.0.7" = { + "@oclif/screen-3.0.8" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.7.tgz"; - sha512 = "jQBPHcMh5rcIPKdqA6xlzioLOmkaVnjg2MVyjMzBKV8hDhLWNSiZqx7NAWXpP70v2LFvGdVoV8BSbK9iID3eHg=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.8.tgz"; + sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg=="; }; }; "@octokit/auth-token-2.5.0" = { @@ -7834,6 +8005,24 @@ let sha512 = "OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="; }; }; + "@opentelemetry/api-1.7.0" = { + name = "_at_opentelemetry_slash_api"; + packageName = "@opentelemetry/api"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz"; + sha512 = "AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw=="; + }; + }; + "@opentelemetry/api-logs-0.43.0" = { + name = "_at_opentelemetry_slash_api-logs"; + packageName = "@opentelemetry/api-logs"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.43.0.tgz"; + sha512 = "0CXMOYPXgAdLM2OzVkiUfAL6QQwWVhnMfUXCqLsITY42FZ9TxAhZIHkoc4mfVxvPuXsBnRYGR8UQZX86p87z4A=="; + }; + }; "@opentelemetry/core-1.17.0" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; @@ -7843,6 +8032,60 @@ let sha512 = "tfnl3h+UefCgx1aeN2xtrmr6BmdWGKXypk0pflQR0urFS40aE88trnkOMc2HTJZbMrqEEl4HsaBeFhwLVXsrJg=="; }; }; + "@opentelemetry/core-1.17.1" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.17.1.tgz"; + sha512 = "I6LrZvl1FF97FQXPR0iieWQmKnGxYtMbWA1GrAXnLUR+B1Hn2m8KqQNEIlZAucyv00GBgpWkpllmULmZfG8P3g=="; + }; + }; + "@opentelemetry/core-1.18.1" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz"; + sha512 = "kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg=="; + }; + }; + "@opentelemetry/exporter-metrics-otlp-http-0.43.0" = { + name = "_at_opentelemetry_slash_exporter-metrics-otlp-http"; + packageName = "@opentelemetry/exporter-metrics-otlp-http"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.43.0.tgz"; + sha512 = "k0KHKLS/xEWI4e5xrsnHpRk7Adj7JSFbFeKF4ti1d9soek3y85ZC2fTzDQC+ysUYo/lccoAXGR/gjcYgQOe7pg=="; + }; + }; + "@opentelemetry/instrumentation-0.41.2" = { + name = "_at_opentelemetry_slash_instrumentation"; + packageName = "@opentelemetry/instrumentation"; + version = "0.41.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz"; + sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; + }; + }; + "@opentelemetry/otlp-exporter-base-0.43.0" = { + name = "_at_opentelemetry_slash_otlp-exporter-base"; + packageName = "@opentelemetry/otlp-exporter-base"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.43.0.tgz"; + sha512 = "LXNtRFVuPRXB9q0qdvrLikQ3NtT9Jmv255Idryz3RJPhOh/Fa03sBASQoj3D55OH3xazmA90KFHfhJ/d8D8y4A=="; + }; + }; + "@opentelemetry/otlp-transformer-0.43.0" = { + name = "_at_opentelemetry_slash_otlp-transformer"; + packageName = "@opentelemetry/otlp-transformer"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.43.0.tgz"; + sha512 = "KXYmgzWdVBOD5NvPmGW1nEMJjyQ8gK3N8r6pi4HvmEhTp0v4T13qDSax4q0HfsqmbPJR355oqQSJUnu1dHNutw=="; + }; + }; "@opentelemetry/resources-1.17.0" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; @@ -7852,6 +8095,51 @@ let sha512 = "+u0ciVnj8lhuL/qGRBPeVYvk7fL+H/vOddfvmOeJaA1KC+5/3UED1c9KoZQlRsNT5Kw1FaK8LkY2NVLYfOVZQw=="; }; }; + "@opentelemetry/resources-1.17.1" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.17.1.tgz"; + sha512 = "M2e5emqg5I7qRKqlzKx0ROkcPyF8PbcSaWEdsm72od9txP7Z/Pl8PDYOyu80xWvbHAWk5mDxOF6v3vNdifzclA=="; + }; + }; + "@opentelemetry/resources-1.18.1" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz"; + sha512 = "JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA=="; + }; + }; + "@opentelemetry/sdk-logs-0.43.0" = { + name = "_at_opentelemetry_slash_sdk-logs"; + packageName = "@opentelemetry/sdk-logs"; + version = "0.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.43.0.tgz"; + sha512 = "JyJ2BBRKm37Mc4cSEhFmsMl5ASQn1dkGhEWzAAMSlhPtLRTv5PfvJwhR+Mboaic/eDLAlciwsgijq8IFlf6IgQ=="; + }; + }; + "@opentelemetry/sdk-metrics-1.17.0" = { + name = "_at_opentelemetry_slash_sdk-metrics"; + packageName = "@opentelemetry/sdk-metrics"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.0.tgz"; + sha512 = "HlWM27yGmYuwCoVRe3yg2PqKnIsq0kEF0HQgvkeDWz2NYkq9fFaSspR6kvjxUTbghAlZrabiqbgyKoYpYaXS3w=="; + }; + }; + "@opentelemetry/sdk-metrics-1.17.1" = { + name = "_at_opentelemetry_slash_sdk-metrics"; + packageName = "@opentelemetry/sdk-metrics"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.17.1.tgz"; + sha512 = "eHdpsMCKhKhwznxvEfls8Wv3y4ZBWkkXlD3m7vtHIiWBqsMHspWSfie1s07mM45i/bBCf6YBMgz17FUxIXwmZA=="; + }; + }; "@opentelemetry/sdk-trace-base-1.17.0" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; @@ -7861,6 +8149,15 @@ let sha512 = "2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ=="; }; }; + "@opentelemetry/sdk-trace-base-1.18.1" = { + name = "_at_opentelemetry_slash_sdk-trace-base"; + packageName = "@opentelemetry/sdk-trace-base"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz"; + sha512 = "tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg=="; + }; + }; "@opentelemetry/semantic-conventions-1.17.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; @@ -7870,400 +8167,418 @@ let sha512 = "+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA=="; }; }; - "@orval/angular-6.18.1" = { + "@opentelemetry/semantic-conventions-1.17.1" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.1.tgz"; + sha512 = "xbR2U+2YjauIuo42qmE8XyJK6dYeRMLJuOlUP5SO4auET4VtOHOzgkRVOq+Ik18N+Xf3YPcqJs9dZMiDddz1eQ=="; + }; + }; + "@opentelemetry/semantic-conventions-1.18.1" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz"; + sha512 = "+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA=="; + }; + }; + "@orval/angular-6.20.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.18.1.tgz"; - sha512 = "kyuqiKyNH1NxrMBZheGTYOU+Gfz4J9Re4MEGUvIVd3Y2Pq4+9zBT+oO3O5LYziquA1viDrzBPEK2LIroHze1Cg=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.20.0.tgz"; + sha512 = "BXrK9NCFRw4+IbJUz30npAZQRPG3vpwHcf+tYiwAhFDJQVQOQy4429hLNBc2xPxsCilSQdQ1/by6AaVcTLe3VA=="; }; }; - "@orval/axios-6.18.1" = { + "@orval/axios-6.20.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.18.1.tgz"; - sha512 = "r6cciQatrDb0vWFWEekJYBBL3DE+egbSbGWr938SK5xx/bCLgEQqtDeT3HTS2iGFC8evADH52L0xdx5J/7I/WQ=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.20.0.tgz"; + sha512 = "Dfno2JM2FBKEVlcsI45FfoN6Cygv+Mz6VcXs6ptb+Biy9aUZ5XlWByFwIF/U7XFjV4bWBb6PJHDeBq4dlpplvQ=="; }; }; - "@orval/core-6.18.1" = { + "@orval/core-6.20.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.18.1.tgz"; - sha512 = "sL6U9tVDhfrYPk50JXLhotBGzT7xePLlgT2ZEQmn9+lUBL0j9zk9oXrSgNsCE+mKVPiVOAXt96FXNUOKUaCE6Q=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.20.0.tgz"; + sha512 = "piX1w6wJSK6FYT1YCG8LCM7rraN3EQ0CUtKIi20UJ7EGBH7ss4OvHRSZMw81SER8zZ4uXlSdGFn5EQ9+8AkD1A=="; }; }; - "@orval/msw-6.18.1" = { + "@orval/msw-6.20.0" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.18.1.tgz"; - sha512 = "U/+YzhdgEnT7jYfxD4fqGLmboL20U2Rh85HJEpPT59NbpaizI/cMIpr3CWVPRakPPdWzxrc21E5OK7Z/a05qdw=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.20.0.tgz"; + sha512 = "0BGgM97HDv6gfZ9dtcdWx7MBTy/+Mjc5GbG5NE3gmRIl+A7QMRx0vB+0SDMhxg/eKmYNwruxpJeQWAkYHnClNA=="; }; }; - "@orval/query-6.18.1" = { + "@orval/query-6.20.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.18.1.tgz"; - sha512 = "c7O1m6+DSLCbvIKwEvkfh0JccTvp+BFiZKWskXDdjMgasyrZDj5Aa1Jh8vsbtiofJnLqbevCMqaidNSKe561tA=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.20.0.tgz"; + sha512 = "dZ10Mb9qIcIh83OjrjjWtzpQulHQMyYZgX7yG2YIp1MZ2GHEQdJTHgLe8CdnXB9LJqo2En0DzXSZZdWdxYqfHA=="; }; }; - "@orval/swr-6.18.1" = { + "@orval/swr-6.20.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.18.1.tgz"; - sha512 = "z9bA9KlYMobBNMdEnAg/WFbZllwTh6aU96lcpwuZn4sKl0+2Dxu7TKWm2wxMfhH11Qju85yLob7WyqDIytNoNQ=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.20.0.tgz"; + sha512 = "6TnG72/evQTMoQ+LoVyF/BF4/issxuvpVWJQPKzsrYnyAP5mdyMyTSTmp85R+72VodB00DD6jHdlTu8Rd0NaQw=="; }; }; - "@orval/zod-6.18.1" = { + "@orval/zod-6.20.0" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.18.1.tgz"; - sha512 = "gGGsa+sGtb7Q+Ah5GWU1wC6b/phQ2OVldpsyvqTzMVdsXB6i1P79HplPBRMxeDub/gE7dp1xJm2xy/8lG/j1NA=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.20.0.tgz"; + sha512 = "6fDfyHEBG/23h3ZTcQ26JFSgj6zJgnhYwZEr1B+zBpLewOYuOo8UAVWvVBLZGg1Mba1KDOmSj8Vfbaug7sGVXg=="; }; }; - "@parcel/bundler-default-2.9.3" = { + "@parcel/bundler-default-2.10.2" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.9.3.tgz"; - sha512 = "JjJK8dq39/UO/MWI/4SCbB1t/qgpQRFnFDetAAAezQ8oN++b24u1fkMDa/xqQGjbuPmGeTds5zxGgYs7id7PYg=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.10.2.tgz"; + sha512 = "XlVGsScK5PgIFXNJ0Yx/+nHu1RFCuslCbrb8MIs0yqS790yzvyJF2QHX5WAr7Qc5powij/+2tfBHiViauWwVpA=="; }; }; - "@parcel/cache-2.9.3" = { + "@parcel/cache-2.10.2" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.9.3.tgz"; - sha512 = "Bj/H2uAJJSXtysG7E/x4EgTrE2hXmm7td/bc97K8M9N7+vQjxf7xb0ebgqe84ePVMkj4MVQSMEJkEucXVx4b0Q=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.10.2.tgz"; + sha512 = "B69e5n+bBzYoaJdUOviYeUT7N1iXI3IC5G8dAxKNZ9Zgn+pjZ5BwltbfmP47+NTfQ7LqM8Ea4UJxysQsLdwb+Q=="; }; }; - "@parcel/codeframe-2.9.3" = { + "@parcel/codeframe-2.10.2" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.9.3.tgz"; - sha512 = "z7yTyD6h3dvduaFoHpNqur74/2yDWL++33rjQjIjCaXREBN6dKHoMGMizzo/i4vbiI1p9dDox2FIDEHCMQxqdA=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.10.2.tgz"; + sha512 = "EZrYSIlVg4qiBLHRRqC/BGN2MLG0SKnw4u7kpviwz63I+v36ghqmHGOomwfn4x13nDL+EgOFz4/+Q7QpbMTKug=="; }; }; - "@parcel/compressor-raw-2.9.3" = { + "@parcel/compressor-raw-2.10.2" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.9.3.tgz"; - sha512 = "jz3t4/ICMsHEqgiTmv5i1DJva2k5QRpZlBELVxfY+QElJTVe8edKJ0TiKcBxh2hx7sm4aUigGmp7JiqqHRRYmA=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.10.2.tgz"; + sha512 = "zIbtmL7vGfWkvBwD29zVdDosFR1eKHa29SpPOQXYLmDO0EVdwzYcTQq2OrlZM07o759QUqwXJfuAYxwcBNRTYg=="; }; }; - "@parcel/config-default-2.9.3" = { + "@parcel/config-default-2.10.2" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.9.3.tgz"; - sha512 = "tqN5tF7QnVABDZAu76co5E6N8mA9n8bxiWdK4xYyINYFIEHgX172oRTqXTnhEMjlMrdmASxvnGlbaPBaVnrCTw=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.10.2.tgz"; + sha512 = "BGn7G5MT6VXpnI5Rj8fzHT1ij0YElge3l2KVGSOJ5crho2Fmz7UKmm8kJ9kdcLrzHWOIH07T100YoQuAwKVQaA=="; }; }; - "@parcel/core-2.9.3" = { + "@parcel/core-2.10.2" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.9.3.tgz"; - sha512 = "4KlM1Zr/jpsqWuMXr2zmGsaOUs1zMMFh9vfCNKRZkptf+uk8I3sugHbNdo+F5B+4e2yMuOEb1zgAmvJLeuH6ww=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.10.2.tgz"; + sha512 = "c6hh13oYk9w5creiQ9yCz9GLQ17ZRMonULhJ46J0yoFArynVhNTJ9B5xVst7rS/chOTY8jU0jSdJuxQCR4fjkg=="; }; }; - "@parcel/diagnostic-2.9.3" = { + "@parcel/diagnostic-2.10.2" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.9.3.tgz"; - sha512 = "6jxBdyB3D7gP4iE66ghUGntWt2v64E6EbD4AetZk+hNJpgudOOPsKTovcMi/i7I4V0qD7WXSF4tvkZUoac0jwA=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.10.2.tgz"; + sha512 = "FwtphyiV/TJEiYIRYXBOloXp7XhTW37ifRSLr7RdLbDVyn/P9q/7l0+ORlnOL+WuKwbDQtY+dXYLh/ijTsq7qQ=="; }; }; - "@parcel/events-2.9.3" = { + "@parcel/events-2.10.2" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.9.3.tgz"; - sha512 = "K0Scx+Bx9f9p1vuShMzNwIgiaZUkxEnexaKYHYemJrM7pMAqxIuIqhnvwurRCsZOVLUJPDDNJ626cWTc5vIq+A=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.10.2.tgz"; + sha512 = "Dp8Oqh5UvSuIASfiHP8jrEtdtzzmTKiOG/RkSL3mtp2tK3mu6dZLJZbcdJXrvBTg7smtRiznkrIOJCawALC7AQ=="; }; }; - "@parcel/fs-2.9.3" = { + "@parcel/fs-2.10.2" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.9.3.tgz"; - sha512 = "/PrRKgCRw22G7rNPSpgN3Q+i2nIkZWuvIOAdMG4KWXC4XLp8C9jarNaWd5QEQ75amjhQSl3oUzABzkdCtkKrgg=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.10.2.tgz"; + sha512 = "80SXdFGDJtil9tTbWrYiZRfQ5ehMAT/dq6eY4EYcFg+MvSiwBL/4GfYMfqXn6AamuSVeQlsFCPpunFLNl9YDDA=="; }; }; - "@parcel/fs-search-2.9.3" = { - name = "_at_parcel_slash_fs-search"; - packageName = "@parcel/fs-search"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.9.3.tgz"; - sha512 = "nsNz3bsOpwS+jphcd+XjZL3F3PDq9lik0O8HPm5f6LYkqKWT+u/kgQzA8OkAHCR3q96LGiHxUywHPEBc27vI4Q=="; - }; - }; - "@parcel/graph-2.9.3" = { + "@parcel/graph-3.0.2" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.9.3"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.9.3.tgz"; - sha512 = "3LmRJmF8+OprAr6zJT3X2s8WAhLKkrhi6RsFlMWHifGU5ED1PFcJWFbOwJvSjcAhMQJP0fErcFIK1Ludv3Vm3g=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-3.0.2.tgz"; + sha512 = "cPxCN3+QF+5l4BJ0wnLeb3DPJarWQoD3W984CfuEYy/8Zgo2oayd31soZzkevyTYtp7H4tJKo+I79i2TJdNq5Q=="; }; }; - "@parcel/hash-2.9.3" = { - name = "_at_parcel_slash_hash"; - packageName = "@parcel/hash"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.9.3.tgz"; - sha512 = "qlH5B85XLzVAeijgKPjm1gQu35LoRYX/8igsjnN8vOlbc3O8BYAUIutU58fbHbtE8MJPbxQQUw7tkTjeoujcQQ=="; - }; - }; - "@parcel/logger-2.9.3" = { + "@parcel/logger-2.10.2" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.9.3.tgz"; - sha512 = "5FNBszcV6ilGFcijEOvoNVG6IUJGsnMiaEnGQs7Fvc1dktTjEddnoQbIYhcSZL63wEmzBZOgkT5yDMajJ/41jw=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.10.2.tgz"; + sha512 = "5lufBuBnXDs3hjAaptmeEAxpH0eHe0+2hJvlVv5lE/RwHR7vDjh+FDwzPfCLWNM3TQhPQdZPdHcDsuA539GHcw=="; }; }; - "@parcel/markdown-ansi-2.9.3" = { + "@parcel/markdown-ansi-2.10.2" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.9.3.tgz"; - sha512 = "/Q4X8F2aN8UNjAJrQ5NfK2OmZf6shry9DqetUSEndQ0fHonk78WKt6LT0zSKEBEW/bB/bXk6mNMsCup6L8ibjQ=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.10.2.tgz"; + sha512 = "uZrysHjJ+0vbQNK2bhKy8yoVso8KnoW6O/SW8MiGQ4lpDJdqHShkW08wZUKr4sjl7h/WVFdNsDdgvi2/ANwoRQ=="; }; }; - "@parcel/namer-default-2.9.3" = { + "@parcel/namer-default-2.10.2" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.9.3.tgz"; - sha512 = "1ynFEcap48/Ngzwwn318eLYpLUwijuuZoXQPCsEQ21OOIOtfhFQJaPwXTsw6kRitshKq76P2aafE0BioGSqxcA=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.10.2.tgz"; + sha512 = "wjn3MCus0w9IOjCtQsp5fgb8hgITyxMr0OPF9cBVAhVJI1X9vvd4RurHuLJ3MjvlCqrP1en09yg3ME7VO1kPuA=="; }; }; - "@parcel/node-resolver-core-3.0.3" = { + "@parcel/node-resolver-core-3.1.2" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "3.0.3"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.0.3.tgz"; - sha512 = "AjxNcZVHHJoNT/A99PKIdFtwvoze8PAiC3yz8E/dRggrDIOboUEodeQYV5Aq++aK76uz/iOP0tST2T8A5rhb1A=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.1.2.tgz"; + sha512 = "xvIBgYBRQGmCkfwK/yxVSDtPEvWDVH9poQcGpKHT1jqstYju5crXro0acni5nYF0hWZu7Kttrp9G9fXJQWBksw=="; }; }; - "@parcel/optimizer-css-2.9.3" = { + "@parcel/optimizer-css-2.10.2" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.9.3.tgz"; - sha512 = "RK1QwcSdWDNUsFvuLy0hgnYKtPQebzCb0vPPzqs6LhL+vqUu9utOyRycGaQffHCkHVQP6zGlN+KFssd7YtFGhA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.10.2.tgz"; + sha512 = "05H/Ng90TErSFZkNaUwi7gNCf2gLWi3/w07oIzHu1wjRjjKjZidqaQqZtHTEYoO9ffmhK14Xwh9q4IpOTa0sbQ=="; }; }; - "@parcel/optimizer-htmlnano-2.9.3" = { + "@parcel/optimizer-htmlnano-2.10.2" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.9.3.tgz"; - sha512 = "9g/KBck3c6DokmJfvJ5zpHFBiCSolaGrcsTGx8C3YPdCTVTI9P1TDCwUxvAr4LjpcIRSa82wlLCI+nF6sSgxKA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.10.2.tgz"; + sha512 = "9Sg2xLsfX7CPLd1AO3uVa/Kh9EROKVNHMnmNxlzmO2+LEOU/M1OHalvt4bhC7I+cNFPLN5BePdBv3QMYpO0yyA=="; }; }; - "@parcel/optimizer-image-2.9.3" = { + "@parcel/optimizer-image-2.10.2" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.9.3.tgz"; - sha512 = "530YzthE7kmecnNhPbkAK+26yQNt69pfJrgE0Ev0BZaM1Wu2+33nki7o8qvkTkikhPrurEJLGIXt1qKmbKvCbA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.10.2.tgz"; + sha512 = "X8q7mvWJEIXsEMYHYKbwIRUJvI0W41YWCEW7Ohmn0SSi+KuiO8BW5JEPKs7HboO9bX+i6Yxa/T1h9HgRXhdUug=="; }; }; - "@parcel/optimizer-svgo-2.9.3" = { + "@parcel/optimizer-svgo-2.10.2" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.9.3.tgz"; - sha512 = "ytQS0wY5JJhWU4mL0wfhYDUuHcfuw+Gy2+JcnTm1t1AZXHlOTbU6EzRWNqBShsgXjvdrQQXizAe3B6GFFlFJVQ=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.10.2.tgz"; + sha512 = "Ws+xd6nbetMCZHmRj54tIF8wYuu/JwkEvn5BotLE69l3naf2ELtsQ+PHg9G5jUa+PnSNMHhykIhBOqjxhTeq/w=="; }; }; - "@parcel/optimizer-swc-2.9.3" = { + "@parcel/optimizer-swc-2.10.2" = { name = "_at_parcel_slash_optimizer-swc"; packageName = "@parcel/optimizer-swc"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.9.3.tgz"; - sha512 = "GQINNeqtdpL1ombq/Cpwi6IBk02wKJ/JJbYbyfHtk8lxlq13soenpwOlzJ5T9D2fdG+FUhai9NxpN5Ss4lNoAg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.10.2.tgz"; + sha512 = "/4yMgMgLvF4yCHh0QnZlTUTpKobuFK/lNhB1i5yrtiipRaYcS+OgtakB83grfK+x1KwTbYjzXZBILwqu6GKJDQ=="; }; }; - "@parcel/package-manager-2.9.3" = { + "@parcel/package-manager-2.10.2" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.9.3.tgz"; - sha512 = "NH6omcNTEupDmW4Lm1e4NUYBjdqkURxgZ4CNESESInHJe6tblVhNB8Rpr1ar7zDar7cly9ILr8P6N3Ei7bTEjg=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.10.2.tgz"; + sha512 = "c91YYsIxjX3YhMvtPT7v2MpDOn/Qyw13bi1+0Ftd2JNjUZPlm8+xKizlmgvdi75dgs7dGIUVpvrGLU9LoKthCA=="; }; }; - "@parcel/packager-css-2.9.3" = { + "@parcel/packager-css-2.10.2" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.9.3.tgz"; - sha512 = "mePiWiYZOULY6e1RdAIJyRoYqXqGci0srOaVZYaP7mnrzvJgA63kaZFFsDiEWghunQpMUuUjM2x/vQVHzxmhKQ=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.10.2.tgz"; + sha512 = "+X4dV7mBdOhXSHeg5gAkk0Qju6A1oezYIancqDC17zoFzbHUfD13nHNDOXrEfMNFVWy93lB8vLJwchH54MDMwQ=="; }; }; - "@parcel/packager-html-2.9.3" = { + "@parcel/packager-html-2.10.2" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.9.3.tgz"; - sha512 = "0Ex+O0EaZf9APNERRNGgGto02hFJ6f5RQEvRWBK55WAV1rXeU+kpjC0c0qZvnUaUtXfpWMsEBkevJCwDkUMeMg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.10.2.tgz"; + sha512 = "GonfLzuzEkelJde89sq9P9LowLJrFNkuEt33nRokc1Q5TPNOWfTYb6difjuVIMr/j0c4nWlOzUrkGJsyo++F7w=="; }; }; - "@parcel/packager-js-2.9.3" = { + "@parcel/packager-js-2.10.2" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.9.3.tgz"; - sha512 = "V5xwkoE3zQ3R+WqAWhA1KGQ791FvJeW6KonOlMI1q76Djjgox68hhObqcLu66AmYNhR2R/wUpkP18hP2z8dSFw=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.10.2.tgz"; + sha512 = "SgKJqIvMt+UJM0x3F21yBVsgdHbTnOnBrNJ7VoY3nujQX5fa+pxTf0emWuX1vSUDbBaJOmO/pC9rKwWP5enqfQ=="; }; }; - "@parcel/packager-raw-2.9.3" = { + "@parcel/packager-raw-2.10.2" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.9.3.tgz"; - sha512 = "oPQTNoYanQ2DdJyL61uPYK2py83rKOT8YVh2QWAx0zsSli6Kiy64U3+xOCYWgDVCrHw9+9NpQMuAdSiFg4cq8g=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.10.2.tgz"; + sha512 = "+/O2DeMIB9d+1+zCPOkaf2aTl2rN5TFod/UcMzG/HGFlDVqhkV9xgfwV4rV+Vso5TlyHA4p53BFgvGWQBQJAQw=="; }; }; - "@parcel/packager-svg-2.9.3" = { + "@parcel/packager-svg-2.10.2" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.9.3.tgz"; - sha512 = "p/Ya6UO9DAkaCUFxfFGyeHZDp9YPAlpdnh1OChuwqSFOXFjjeXuoK4KLT+ZRalVBo2Jo8xF70oKMZw4MVvaL7Q=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.10.2.tgz"; + sha512 = "eQx3VJpuuDcen+DcLxlPn95txlnbpEH8TES+Ezym/LFyD8oQQfok/VFHy/iGoG4r1CtH0/c7lFUJE8+LZdwYmQ=="; }; }; - "@parcel/plugin-2.9.3" = { + "@parcel/packager-wasm-2.10.2" = { + name = "_at_parcel_slash_packager-wasm"; + packageName = "@parcel/packager-wasm"; + version = "2.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.10.2.tgz"; + sha512 = "Y/UyyOePb3WmWy2WtmXn4QLLrb7wjWL/ZhVgvhFiQft4lCbdGBGz1BiKEzhFkkN2IGdX06XZolmKCQieAM6zlQ=="; + }; + }; + "@parcel/plugin-2.10.2" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.9.3.tgz"; - sha512 = "qN85Gqr2GMuxX1dT1mnuO9hOcvlEv1lrYrCxn7CJN2nUhbwcfG+LEvcrCzCOJ6XtIHm+ZBV9h9p7FfoPLvpw+g=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.10.2.tgz"; + sha512 = "1u+GJhuqqlYjMAQLBbMExfFCbsbtuSAm6wXmMmTse5cBpFqxgsMumMeztAhcTy0oMnMhbZg2AKZV0XVSMrIgng=="; }; }; - "@parcel/profiler-2.9.3" = { + "@parcel/profiler-2.10.2" = { name = "_at_parcel_slash_profiler"; packageName = "@parcel/profiler"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.9.3.tgz"; - sha512 = "pyHc9lw8VZDfgZoeZWZU9J0CVEv1Zw9O5+e0DJPDPHuXJYr72ZAOhbljtU3owWKAeW+++Q2AZWkbUGEOjI/e6g=="; + url = "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.10.2.tgz"; + sha512 = "YQugGhf12u83O0RJLWbhkPV772nePPxNZjvFJmV++7buPUpgJW2m1lVOrut/s/8ZZIPqcxJe8dyxSSOtvdG7OQ=="; }; }; - "@parcel/reporter-cli-2.9.3" = { + "@parcel/reporter-cli-2.10.2" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.9.3.tgz"; - sha512 = "pZiEvQpuXFuQBafMHxkDmwH8CnnK9sWHwa3bSbsnt385aUahtE8dpY0LKt+K1zfB6degKoczN6aWVj9WycQuZQ=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.10.2.tgz"; + sha512 = "6/cLuiGfMh1ny8ULNOXJkugIvJRVo4tV4XA3vJXH96SYqFSfiWxtHqb6MAVndBy8MezEAv0EsLqc7yR7ygdZJw=="; }; }; - "@parcel/reporter-dev-server-2.9.3" = { + "@parcel/reporter-dev-server-2.10.2" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.9.3.tgz"; - sha512 = "s6eboxdLEtRSvG52xi9IiNbcPKC0XMVmvTckieue2EqGDbDcaHQoHmmwkk0rNq0/Z/UxelGcQXoIYC/0xq3ykQ=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.10.2.tgz"; + sha512 = "mLEcZFPpw0ixlvbT846NwmPEVv1ej7H5dwCQ3r1Ca1nQjyXkmQMM06rdb5M+/gk12WVEDOuienWqBL44Xsz3NA=="; }; }; - "@parcel/reporter-tracer-2.9.3" = { + "@parcel/reporter-tracer-2.10.2" = { name = "_at_parcel_slash_reporter-tracer"; packageName = "@parcel/reporter-tracer"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.9.3.tgz"; - sha512 = "9cXpKWk0m6d6d+4+TlAdOe8XIPaFEIKGWMWG+5SFAQE08u3olet4PSvd49F4+ZZo5ftRE7YI3j6xNbXvJT8KGw=="; + url = "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.10.2.tgz"; + sha512 = "oreu3vIdN5u9ONSNhqypcK3nR91NoreR4B4vwD/1Rqod1ud2Vb9awJZv7QIrkdnEMmGcr5DQ/R872s7XYWeZnA=="; }; }; - "@parcel/resolver-default-2.9.3" = { + "@parcel/resolver-default-2.10.2" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.9.3.tgz"; - sha512 = "8ESJk1COKvDzkmOnppNXoDamNMlYVIvrKc2RuFPmp8nKVj47R6NwMgvwxEaatyPzvkmyTpq5RvG9I3HFc+r4Cw=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.10.2.tgz"; + sha512 = "ENEq8f4wRQlU7p3tCelXWK6xIsL+57q9hQ+b4eRJOEctjfN1/BguxZDh+P+fIlJ1lkqiX4UB/PUkK97uSI5XTQ=="; }; }; - "@parcel/runtime-browser-hmr-2.9.3" = { + "@parcel/runtime-browser-hmr-2.10.2" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.9.3.tgz"; - sha512 = "EgiDIDrVAWpz7bOzWXqVinQkaFjLwT34wsonpXAbuI7f7r00d52vNAQC9AMu+pTijA3gyKoJ+Q4NWPMZf7ACDA=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.10.2.tgz"; + sha512 = "ABlCzDYI16lAZLTTL2g3JZasU/dWuSzRGK5paC6JhIJJwQwPeTwu4PaUoEPKeyk0iE9PzVuXjkBbGuSLXQFmmA=="; }; }; - "@parcel/runtime-js-2.9.3" = { + "@parcel/runtime-js-2.10.2" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.9.3.tgz"; - sha512 = "EvIy+qXcKnB5qxHhe96zmJpSAViNVXHfQI5RSdZ2a7CPwORwhTI+zPNT9sb7xb/WwFw/WuTTgzT40b41DceU6Q=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.10.2.tgz"; + sha512 = "a6TaMVg1Xgy+WJJ0a3sC/Taw5hkN4hmLnz00jg7G6LwoGbBpvjJn8pm4eovkMFJz13RCjmS9q0K+qZnvXh1WYA=="; }; }; - "@parcel/runtime-react-refresh-2.9.3" = { + "@parcel/runtime-react-refresh-2.10.2" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.9.3.tgz"; - sha512 = "XBgryZQIyCmi6JwEfMUCmINB3l1TpTp9a2iFxmYNpzHlqj4Ve0saKaqWOVRLvC945ZovWIBzcSW2IYqWKGtbAA=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.10.2.tgz"; + sha512 = "9xW3g4FH9iizHWscHD2yEWJOCfYkIYMbWsZoj0EOMILqrRd1OZxHH8FbLYBQKT6swRbZI2mM19veVVBBfxco/Q=="; }; }; - "@parcel/runtime-service-worker-2.9.3" = { + "@parcel/runtime-service-worker-2.10.2" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.9.3.tgz"; - sha512 = "qLJLqv1mMdWL7gyh8aKBFFAuEiJkhUUgLKpdn6eSfH/R7kTtb76WnOwqUrhvEI9bZFUM/8Pa1bzJnPpqSOM+Sw=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.10.2.tgz"; + sha512 = "XY1GrY4r+zu0b/pZiTflZHdk9+I3XoxpExgPcZzep5hnq2UdyXbS4yDhmen7pTcqay5U9NmRw/62YrKL+yPang=="; + }; + }; + "@parcel/rust-2.10.2" = { + name = "_at_parcel_slash_rust"; + packageName = "@parcel/rust"; + version = "2.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/rust/-/rust-2.10.2.tgz"; + sha512 = "v/Cyf3iXlzSc6vgvPiEZzqdKAZ1jJ/aZX7y1YSupDh3RoqJI2bZ93kAOyEi+S7P3kshJkQM0px3YveJFOAMUOA=="; }; }; "@parcel/source-map-2.1.1" = { @@ -8275,121 +8590,121 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.9.3" = { + "@parcel/transformer-babel-2.10.2" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.9.3.tgz"; - sha512 = "pURtEsnsp3h6tOBDuzh9wRvVtw4PgIlqwAArIWdrG7iwqOUYv9D8ME4+ePWEu7MQWAp58hv9pTJtqWv4T+Sq8A=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.10.2.tgz"; + sha512 = "lmuksSzEBdPL1nVTznsQi5hQ+4mJ7GP+jvOv/Tvx3MjnzIu1G6Fs5MvNpAwBRXmG/F1+0aw/Wa8J38HYfN05dA=="; }; }; - "@parcel/transformer-css-2.9.3" = { + "@parcel/transformer-css-2.10.2" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.9.3.tgz"; - sha512 = "duWMdbEBBPjg3fQdXF16iWIdThetDZvCs2TpUD7xOlXH6kR0V5BJy8ONFT15u1RCqIV9hSNGaS3v3I9YRNY5zQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.10.2.tgz"; + sha512 = "WxKe1YherQrX0vEfxAsBALEIsztGStmfXF0GAMeynE4q/w1iHQdTzu29tqLrJY7x532Ric8TxnwO8zR0r89DJg=="; }; }; - "@parcel/transformer-html-2.9.3" = { + "@parcel/transformer-html-2.10.2" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.9.3.tgz"; - sha512 = "0NU4omcHzFXA1seqftAXA2KNZaMByoKaNdXnLgBgtCGDiYvOcL+6xGHgY6pw9LvOh5um10KI5TxSIMILoI7VtA=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.10.2.tgz"; + sha512 = "Zkg1HHdYp14ecdtNF+s4d/e1lr8/PAQgBTYhyEVLVC1N7uivjjZ9XClxZlHuZImbQvX3q3PgZS+PocIizhY4rQ=="; }; }; - "@parcel/transformer-image-2.9.3" = { + "@parcel/transformer-image-2.10.2" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.9.3.tgz"; - sha512 = "7CEe35RaPadQzLIuxzTtIxnItvOoy46hcbXtOdDt6lmVa4omuOygZYRIya2lsGIP4JHvAaALMb5nt99a1uTwJg=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.10.2.tgz"; + sha512 = "sR2kTsPykYRujKR7ISn0d6Fhem1pMQoqm0cFTrtC9Te5pfIjZ72NfM9clP7jPK660Gd2DYudhUa48y+qKBfCAw=="; }; }; - "@parcel/transformer-js-2.9.3" = { + "@parcel/transformer-js-2.10.2" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.9.3.tgz"; - sha512 = "Z2MVVg5FYcPOfxlUwxqb5l9yjTMEqE3KI3zq2MBRUme6AV07KxLmCDF23b6glzZlHWQUE8MXzYCTAkOPCcPz+Q=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.10.2.tgz"; + sha512 = "qcVLyikhSVf3oHhzReECkKdPU5uHVH4L0TC5O9ahlsq2IUTqR8Swq+9wUgUN0S2aYFTWreH05bQwBCNrLzF/eQ=="; }; }; - "@parcel/transformer-json-2.9.3" = { + "@parcel/transformer-json-2.10.2" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.9.3.tgz"; - sha512 = "yNL27dbOLhkkrjaQjiQ7Im9VOxmkfuuSNSmS0rA3gEjVcm07SLKRzWkAaPnyx44Lb6bzyOTWwVrb9aMmxgADpA=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.10.2.tgz"; + sha512 = "iVgwuaLNqH3jgoBzMds63zd9FULvYb/s/5Hq9JZJ6pCZrOQoPruurgAW8A/t2IE4CSFkDDNoFvRpjsq1WBsSvA=="; }; }; - "@parcel/transformer-postcss-2.9.3" = { + "@parcel/transformer-postcss-2.10.2" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.9.3.tgz"; - sha512 = "HoDvPqKzhpmvMmHqQhDnt8F1vH61m6plpGiYaYnYv2Om4HHi5ZIq9bO+9QLBnTKfaZ7ndYSefTKOxTYElg7wyw=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.10.2.tgz"; + sha512 = "2/ehCZgj5TOmsAIeGiLwrm6gO/M+X4fZ/O71MhpmXd8zr08j25T0VdSdw5UyopsBvtPYM7DI/FJCviZc7AigCg=="; }; }; - "@parcel/transformer-posthtml-2.9.3" = { + "@parcel/transformer-posthtml-2.10.2" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.9.3.tgz"; - sha512 = "2fQGgrzRmaqbWf3y2/T6xhqrNjzqMMKksqJzvc8TMfK6f2kg3Ddjv158eaSW2JdkV39aY7tvAOn5f1uzo74BMA=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.10.2.tgz"; + sha512 = "0jvqqXfrLqPYBD62aWIMldDnZ9hO/esX6TGKNhAO+85ljeaS2+QZ5XLLb8uPJq8UXB4olhsoEGyGtJSByigndg=="; }; }; - "@parcel/transformer-raw-2.9.3" = { + "@parcel/transformer-raw-2.10.2" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.9.3.tgz"; - sha512 = "oqdPzMC9QzWRbY9J6TZEqltknjno+dY24QWqf8ondmdF2+W+/2mRDu59hhCzQrqUHgTq4FewowRZmSfpzHxwaQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.10.2.tgz"; + sha512 = "h6SoIZ3u+Lq8z8SEEAVsHg4IQbUtkBWCln5SG4qfjGiclUDDA2hcG7grsP06Wb6/U7oEc8n0ksTtaG4dekYIxw=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.9.3" = { + "@parcel/transformer-react-refresh-wrap-2.10.2" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.9.3.tgz"; - sha512 = "cb9NyU6oJlDblFIlzqIE8AkvRQVGl2IwJNKwD4PdE7Y6sq2okGEPG4hOw3k/Y9JVjM4/2pUORqvjSRhWwd9oVQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.10.2.tgz"; + sha512 = "1jpzaEbKwJnDUmF8Kgf3/XvT9BnUWIQ7FWkg5EL5kEx6tq2KLKdzD17nFigNj8fr2V+faX0Qa63h+e3OOpnMAA=="; }; }; - "@parcel/transformer-svg-2.9.3" = { + "@parcel/transformer-svg-2.10.2" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.9.3.tgz"; - sha512 = "ypmE+dzB09IMCdEAkOsSxq1dEIm2A3h67nAFz4qbfHbwNgXBUuy/jB3ZMwXN/cO0f7SBh/Ap8Jhq6vmGqB5tWw=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.10.2.tgz"; + sha512 = "SsCjiM9LZwGne3LUn+GuwhyqklAnr7CER6D0ozdpw+tPOeODsXZXNSktvtpE1Qbia61c/zdlU0yOEuhkeXz29w=="; }; }; - "@parcel/types-2.9.3" = { + "@parcel/types-2.10.2" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.9.3.tgz"; - sha512 = "NSNY8sYtRhvF1SqhnIGgGvJocyWt1K8Tnw5cVepm0g38ywtX6mwkBvMkmeehXkII4mSUn+frD9wGsydTunezvA=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.10.2.tgz"; + sha512 = "fwHJu03ROcc4/Kr/00VfOQUD6aV+6FBLN5bDW1+Xblgrpkb1MSUGTWRuz0YH5X6xhkVigC1llCIR2uHSwA+YBg=="; }; }; - "@parcel/utils-2.9.3" = { + "@parcel/utils-2.10.2" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.9.3.tgz"; - sha512 = "cesanjtj/oLehW8Waq9JFPmAImhoiHX03ihc3JTWkrvJYSbD7wYKCDgPAM3JiRAqvh1LZ6P699uITrYWNoRLUg=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.10.2.tgz"; + sha512 = "XLUhTh0UkPB5n8r7agX9iIz9f+3JsBIVsmqltsJYX7n/GAa6EQtqrIYyZu8cEFeZlZw3zaf7wTmf9xJppdlj7Q=="; }; }; "@parcel/watcher-2.0.4" = { @@ -8518,22 +8833,22 @@ let sha512 = "dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA=="; }; }; - "@parcel/workers-2.9.3" = { + "@parcel/workers-2.10.2" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.9.3.tgz"; - sha512 = "zRrDuZJzTevrrwElYosFztgldhqW6G9q5zOeQXfVQFkkEJCNfg36ixeiofKRU8uu2x+j+T6216mhMNB6HiuY+w=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.10.2.tgz"; + sha512 = "LvifdeORXKGGyhwOwnYxn1AsJ5u6Ihk2RJUxsVA4WYEjz2PSsmLAUDdp48ovssSMnTb9P2g4RrbEG1mJjYtBGA=="; }; }; - "@peculiar/asn1-schema-2.3.6" = { + "@peculiar/asn1-schema-2.3.8" = { name = "_at_peculiar_slash_asn1-schema"; packageName = "@peculiar/asn1-schema"; - version = "2.3.6"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz"; - sha512 = "izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA=="; + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz"; + sha512 = "ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA=="; }; }; "@peculiar/json-schema-1.1.12" = { @@ -8617,13 +8932,13 @@ let sha512 = "3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA=="; }; }; - "@pnpm/dependency-path-2.1.3" = { + "@pnpm/dependency-path-2.1.5" = { name = "_at_pnpm_slash_dependency-path"; packageName = "@pnpm/dependency-path"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.3.tgz"; - sha512 = "OKuLDqRZfAJAb4fnPZyPyrR827ISL1WV5YBs0q4BitPAz8ORUPSXSCFVailLhoyZWLE0Ag6hROy42Jkw/WnCUw=="; + url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.5.tgz"; + sha512 = "Ki7v96NDlUzkIkgujSl+3sDY/nMjujOaDOTmjEeBebPiow53Y9Bw/UnxI8C2KKsnm/b7kUJPeFVbOhg3HMp7/Q=="; }; }; "@pnpm/error-1.4.0" = { @@ -8716,13 +9031,13 @@ let sha512 = "3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw=="; }; }; - "@pnpm/types-9.2.0" = { + "@pnpm/types-9.4.0" = { name = "_at_pnpm_slash_types"; packageName = "@pnpm/types"; - version = "9.2.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/types/-/types-9.2.0.tgz"; - sha512 = "LtkHgtJ5Bjny4poUWyMhOKHc822/zm8NhPx+7VbopfDYnTrKgJwTyTbZjZEyN5KpDw3R1Fr8VYdmv5gn4eyWbw=="; + url = "https://registry.npmjs.org/@pnpm/types/-/types-9.4.0.tgz"; + sha512 = "IRDuIuNobLRQe0UyY2gbrrTzYS46tTNvOEfL6fOf0Qa8NyxUzeXz946v7fQuQE3LSBf8ENBC5SXhRmDl+mBEqA=="; }; }; "@pnpm/write-project-manifest-1.1.7" = { @@ -8734,22 +9049,22 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; - "@prisma/engines-5.3.1" = { + "@prisma/engines-5.5.2" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "5.3.1"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.3.1.tgz"; - sha512 = "6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.5.2.tgz"; + sha512 = "Be5hoNF8k+lkB3uEMiCHbhbfF6aj1GnrTBnn5iYFT7GEr3TsOEp1soviEcBR0tYCgHbxjcIxJMhdbvxALJhAqg=="; }; }; - "@prisma/prisma-schema-wasm-5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59" = { + "@prisma/prisma-schema-wasm-5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a" = { name = "_at_prisma_slash_prisma-schema-wasm"; packageName = "@prisma/prisma-schema-wasm"; - version = "5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59"; + version = "5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59.tgz"; - sha512 = "+zUI7NQDXfcNnU8HgrAj4jRMv8yRfITLzcfv0Urf0adKimM+hkkVG4rX38i9zWMlxekkEBw7NLFx3Gxxy8d3iQ=="; + url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a.tgz"; + sha512 = "dPOyEqjExFgXsfZTzKOuYM2ycWQbep5WtF/23KP8C+xq+XTr1725CMpERa8KaKQlDlRn+aE53qOON/wqXptGdg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -8842,13 +9157,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.37.0" = { + "@putdotio/api-client-8.39.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.37.0"; + version = "8.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.37.0.tgz"; - sha512 = "eHYxjkRWy6uUOvfyP3t5hArTnepUNr60S/D+hwpC8pudrJ8C4xvzI9hNwE6ngX5shGl2YMtCQctW9Op+uKkRog=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.39.0.tgz"; + sha512 = "xQJ+tuKmTo/gy+WFat86Avhqy8mlIZF2ZpbzBQc8173LTvRcrf9E7B8dKqz/P0pjLn+kM/IkiKwmudV9Q8NXdw=="; }; }; "@react-native/normalize-color-2.1.0" = { @@ -8923,148 +9238,130 @@ let sha512 = "mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg=="; }; }; - "@repeaterjs/repeater-3.0.4" = { + "@repeaterjs/repeater-3.0.5" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz"; - sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; + url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.5.tgz"; + sha512 = "l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA=="; }; }; - "@resvg/resvg-js-2.4.1" = { + "@resvg/resvg-js-2.6.0" = { name = "_at_resvg_slash_resvg-js"; packageName = "@resvg/resvg-js"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.4.1.tgz"; - sha512 = "wTOf1zerZX8qYcMmLZw3czR4paI4hXqPjShNwJRh5DeHxvgffUS5KM7XwxtbIheUW6LVYT5fhT2AJiP6mU7U4A=="; + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.6.0.tgz"; + sha512 = "Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA=="; }; }; - "@resvg/resvg-js-android-arm-eabi-2.4.1" = { + "@resvg/resvg-js-android-arm-eabi-2.6.0" = { name = "_at_resvg_slash_resvg-js-android-arm-eabi"; packageName = "@resvg/resvg-js-android-arm-eabi"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.4.1.tgz"; - sha512 = "AA6f7hS0FAPpvQMhBCf6f1oD1LdlqNXKCxAAPpKh6tR11kqV0YIB9zOlIYgITM14mq2YooLFl6XIbbvmY+jwUw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz"; + sha512 = "lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA=="; }; }; - "@resvg/resvg-js-android-arm64-2.4.1" = { + "@resvg/resvg-js-android-arm64-2.6.0" = { name = "_at_resvg_slash_resvg-js-android-arm64"; packageName = "@resvg/resvg-js-android-arm64"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.4.1.tgz"; - sha512 = "/QleoRdPfsEuH9jUjilYcDtKK/BkmWcK+1LXM8L2nsnf/CI8EnFyv7ZzCj4xAIvZGAy9dTYr/5NZBcTwxG2HQg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz"; + sha512 = "N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ=="; }; }; - "@resvg/resvg-js-darwin-arm64-2.4.1" = { + "@resvg/resvg-js-darwin-arm64-2.6.0" = { name = "_at_resvg_slash_resvg-js-darwin-arm64"; packageName = "@resvg/resvg-js-darwin-arm64"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.4.1.tgz"; - sha512 = "U1oMNhea+kAXgiEXgzo7EbFGCD1Edq5aSlQoe6LMly6UjHzgx2W3N5kEXCwU/CgN5FiQhZr7PlSJSlcr7mdhfg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz"; + sha512 = "MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew=="; }; }; - "@resvg/resvg-js-darwin-x64-2.4.1" = { + "@resvg/resvg-js-darwin-x64-2.6.0" = { name = "_at_resvg_slash_resvg-js-darwin-x64"; packageName = "@resvg/resvg-js-darwin-x64"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.4.1.tgz"; - sha512 = "avyVh6DpebBfHHtTQTZYSr6NG1Ur6TEilk1+H0n7V+g4F7x7WPOo8zL00ZhQCeRQ5H4f8WXNWIEKL8fwqcOkYw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz"; + sha512 = "zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA=="; }; }; - "@resvg/resvg-js-linux-arm-gnueabihf-2.4.1" = { + "@resvg/resvg-js-linux-arm-gnueabihf-2.6.0" = { name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.4.1.tgz"; - sha512 = "isY/mdKoBWH4VB5v621co+8l101jxxYjuTkwOLsbW+5RK9EbLciPlCB02M99ThAHzI2MYxIUjXNmNgOW8btXvw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz"; + sha512 = "sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A=="; }; }; - "@resvg/resvg-js-linux-arm64-gnu-2.4.1" = { + "@resvg/resvg-js-linux-arm64-gnu-2.6.0" = { name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; packageName = "@resvg/resvg-js-linux-arm64-gnu"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.4.1.tgz"; - sha512 = "uY5voSCrFI8TH95vIYBm5blpkOtltLxLRODyhKJhGfskOI7XkRw5/t1u0sWAGYD8rRSNX+CA+np86otKjubrNg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz"; + sha512 = "fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A=="; }; }; - "@resvg/resvg-js-linux-arm64-musl-2.4.1" = { + "@resvg/resvg-js-linux-arm64-musl-2.6.0" = { name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; packageName = "@resvg/resvg-js-linux-arm64-musl"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.4.1.tgz"; - sha512 = "6mT0+JBCsermKMdi/O2mMk3m7SqOjwi9TKAwSngRZ/nQoL3Z0Z5zV+572ztgbWr0GODB422uD8e9R9zzz38dRQ=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz"; + sha512 = "ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg=="; }; }; - "@resvg/resvg-js-linux-x64-gnu-2.4.1" = { + "@resvg/resvg-js-linux-x64-gnu-2.6.0" = { name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; packageName = "@resvg/resvg-js-linux-x64-gnu"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.4.1.tgz"; - sha512 = "60KnrscLj6VGhkYOJEmmzPlqqfcw1keDh6U+vMcNDjPhV3B5vRSkpP/D/a8sfokyeh4VEacPSYkWGezvzS2/mg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz"; + sha512 = "n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q=="; }; }; - "@resvg/resvg-js-linux-x64-musl-2.4.1" = { + "@resvg/resvg-js-linux-x64-musl-2.6.0" = { name = "_at_resvg_slash_resvg-js-linux-x64-musl"; packageName = "@resvg/resvg-js-linux-x64-musl"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.4.1.tgz"; - sha512 = "0AMyZSICC1D7ge115cOZQW8Pcad6PjWuZkBFF3FJuSxC6Dgok0MQnLTs2MfMdKBlAcwO9dXsf3bv9tJZj8pATA=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz"; + sha512 = "n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw=="; }; }; - "@resvg/resvg-js-win32-arm64-msvc-2.4.1" = { + "@resvg/resvg-js-win32-arm64-msvc-2.6.0" = { name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; packageName = "@resvg/resvg-js-win32-arm64-msvc"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.4.1.tgz"; - sha512 = "76XDFOFSa3d0QotmcNyChh2xHwk+JTFiEQBVxMlHpHMeq7hNrQJ1IpE1zcHSQvrckvkdfLboKRrlGB86B10Qjw=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz"; + sha512 = "X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q=="; }; }; - "@resvg/resvg-js-win32-ia32-msvc-2.4.1" = { + "@resvg/resvg-js-win32-ia32-msvc-2.6.0" = { name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; packageName = "@resvg/resvg-js-win32-ia32-msvc"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.4.1.tgz"; - sha512 = "odyVFGrEWZIzzJ89KdaFtiYWaIJh9hJRW/frcEcG3agJ464VXkN/2oEVF5ulD+5mpGlug9qJg7htzHcKxDN8sg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz"; + sha512 = "L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg=="; }; }; - "@resvg/resvg-js-win32-x64-msvc-2.4.1" = { + "@resvg/resvg-js-win32-x64-msvc-2.6.0" = { name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; packageName = "@resvg/resvg-js-win32-x64-msvc"; - version = "2.4.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.4.1.tgz"; - sha512 = "vY4kTLH2S3bP+puU5x7hlAxHv+ulFgcK6Zn3efKSr0M0KnZ9A3qeAjZteIpkowEFfUeMPNg2dvvoFRJA9zqxSw=="; - }; - }; - "@rollup/plugin-commonjs-22.0.2" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "22.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz"; - sha512 = "//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz"; + sha512 = "8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw=="; }; }; "@rollup/pluginutils-4.2.1" = { @@ -9076,40 +9373,40 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.14.1" = { + "@rushstack/heft-config-file-0.14.2" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.14.1.tgz"; - sha512 = "PO4NvZX/HtasfRh6Izt/kGxZ0RxFF5CEu+0KER2/0y4KBPsSpuLhNOIwiQpAkYqWjCs95DEl8FZDSRCSRpZwiw=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.14.2.tgz"; + sha512 = "X29DqXN6dyvkZm4hIewFkCCub1lxY8LPsyWSYqkuZ1E5f70ibKBp8P+nf2QzjQ7XcJzqDuq5fWrvPzi5N6M5lg=="; }; }; - "@rushstack/node-core-library-3.60.1" = { + "@rushstack/node-core-library-3.61.0" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "3.60.1"; + version = "3.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.60.1.tgz"; - sha512 = "cWKCImfezPvILKu5eUPkz0Mp/cO/zOSJdPD64KHliBcdmbPHg/sF4rEL7WJkWywXT1RQ/U/N8uKdXMe7jDCXNw=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.61.0.tgz"; + sha512 = "tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ=="; }; }; - "@rushstack/package-deps-hash-4.1.5" = { + "@rushstack/package-deps-hash-4.1.11" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.1.5"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.5.tgz"; - sha512 = "FKNaypRvnX1DZVcAmZsjk9DgiZkK8E8jiWF1On8XUANBaNUMmVi11lSbnbQSpeOm5Eym6aiQTVm/Kic/xyqNFw=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.11.tgz"; + sha512 = "6gpZ7Zn9u4F3CiOwqhQbBKPq06iX7yUt3ooeqIKMfBZ92DKBZOTGDN6ImC4Kev/yUoL5HLVX5+a6xWHW+ptCvg=="; }; }; - "@rushstack/package-extractor-0.6.6" = { + "@rushstack/package-extractor-0.6.12" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.6.6"; + version = "0.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.6.6.tgz"; - sha512 = "qzZ/MXQ9SGWooFfSECEst6HbX34li3spgl//0Srx2YEghcSYAeJo26x5Ani+86GWXFpw3WifnZnXQ4k6sfJr5w=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.6.12.tgz"; + sha512 = "i+TbTu2QXZ96A0QiuCDPmTX7Cwjs250XPVrDS3QhmQTOd1EBatkwd4dzlRJyfZdhiKGuDY2kN7khPiVIOOg6zg=="; }; }; "@rushstack/rig-package-0.5.1" = { @@ -9121,67 +9418,67 @@ let sha512 = "pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.107.4" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.107.4.tgz"; - sha512 = "H0/1kK1SPCzBpIgKZ5ZZp904jPoTD/oe+Oac1sXyIUf436/oTFzsode2CJJClAD3NzjKAX/+PHBsWrfaYkDJmg=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.110.1.tgz"; + sha512 = "r9ZbIHIRlyWc6DkGIshtNthRAH0XIs7Z9O3eQWdGTGry0LZSjeiZGO+YJXKIxhoGUoqSJ5qr12b+lnWprZjeCg=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.107.4" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.107.4.tgz"; - sha512 = "OQTaGxyrnGrC4/yCjkB4Pb/qPefTACmeZqJnOZ1oFPkeuc4o4bB7D0d4mCrKeFL3P47qfhEkuEYDEErQ8Wm9qg=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.110.1.tgz"; + sha512 = "uJkWYUyQjb3Lot9GLj0oJtRiLw+obkcZocvNSTnjKoTZVPT9XNJJzUleldUjBtS9zKqC+XMYRxFRWLfLOikBOQ=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.107.4" = { + "@rushstack/rush-http-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.107.4.tgz"; - sha512 = "fJrE9g5LBobvDLCWqwk9UjkAdEdPE81HCO80kE8DfmCTLqSqEFbonCB49ReIGOsdRg9JxIULYSNc1Owa9yy8UQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.110.1.tgz"; + sha512 = "rYOrKAJi55OrvKNE3xcwAgq3KRnV95DNubkfHT2TuRV4FajkDyhLnB41U6PNlnxv1ax7gYohy/Wb8L/XidxAxA=="; }; }; - "@rushstack/rush-sdk-5.107.4" = { + "@rushstack/rush-sdk-5.110.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.107.4.tgz"; - sha512 = "SJyr6ZQqLTc58sxnI50WzDRegIv+KkgKpixjrUz/rOJJfeiw5aBO+DU/tSGDOnuAdJUWYZFUGiLCLmMOrJmDOQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.110.1.tgz"; + sha512 = "Yp/70meJCicmblyf8XFogF7NYzAM6DpZCPJNuExs33E5X5JiUIxEcupFMEw1huVdGtm+7nDc1ylVl3bwUH4IQg=="; }; }; - "@rushstack/stream-collator-4.1.6" = { + "@rushstack/stream-collator-4.1.12" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.1.6"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.6.tgz"; - sha512 = "rJbQmEsEEPE4guuQuppaSF3XayDya5lSexFE4GK35rMo51CWvKYP94e0RZ13bd0GgipaAy3x2ASMtifbr8ShnA=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.12.tgz"; + sha512 = "03rYjs73hAk13Az9GEutmy5hPRT7zrKuMeOC0U0XVW2pvPfQAbh3mu81qLL0lzieM5bsEafJk+SRtEb7LP0BWg=="; }; }; - "@rushstack/terminal-0.7.5" = { + "@rushstack/terminal-0.7.11" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.7.5"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.7.5.tgz"; - sha512 = "eDrGrhlOi2IOR5bjJ5ILjNz2Q4B8VpCtUnVPBrLZEhjDqlHzblzEt/AeKRo1aIk0n2NsbgdQH9pi8+0TJLDLrA=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.7.11.tgz"; + sha512 = "91M8zjwsrwkLAck2xGXn4tUUu2kZPfDZb3shQoZ3VBkgvOPCopPSDKeuHN2NCN9pRm6BRcbMjj75a4RBtaZKPQ=="; }; }; - "@rushstack/ts-command-line-4.16.1" = { + "@rushstack/ts-command-line-4.17.1" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.16.1"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.16.1.tgz"; - sha512 = "+OCsD553GYVLEmz12yiFjMOzuPeCiZ3f8wTiFHL30ZVXexTyPmgjwXEhg2K2P0a2lVf+8YBy7WtPoflB2Fp8/A=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.17.1.tgz"; + sha512 = "2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -9193,13 +9490,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.2.4" = { + "@schematics/angular-17.0.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.2.4"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.4.tgz"; - sha512 = "ZFPxn0yihdNcg5UpJvnfxIpv4GuW6nYDkgeIlYb5k/a0dKSW8wE8Akcl1JhJtdKJ0RVcn1OwZDmx028JCbZJLA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-17.0.0.tgz"; + sha512 = "9jKU5x/WzaBsfSkUowK1X74FqtMXa6+A60XgW4ACO8i6fwKfPeS+tIrAieeYOX80/njBh7I5CvcpHmWA2SbcXQ=="; }; }; "@scure/base-1.1.3" = { @@ -9229,15 +9526,6 @@ let sha512 = "Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg=="; }; }; - "@search-dump/jsonstream-1.5.0" = { - name = "_at_search-dump_slash_jsonstream"; - packageName = "@search-dump/jsonstream"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@search-dump/jsonstream/-/jsonstream-1.5.0.tgz"; - sha512 = "/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw=="; - }; - }; "@segment/ajv-human-errors-2.11.3" = { name = "_at_segment_slash_ajv-human-errors"; packageName = "@segment/ajv-human-errors"; @@ -9265,211 +9553,58 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry/core-6.19.7" = { + "@sentry-internal/tracing-7.80.0" = { + name = "_at_sentry-internal_slash_tracing"; + packageName = "@sentry-internal/tracing"; + version = "7.80.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.80.0.tgz"; + sha512 = "P1Ab9gamHLsbH9D82i1HY8xfq9dP8runvc4g50AAd6OXRKaJ45f2KGRZUmnMEVqBQ7YoPYp2LFMkrhNYbcZEoQ=="; + }; + }; + "@sentry/core-7.80.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "6.19.7"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz"; - sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.80.0.tgz"; + sha512 = "nJiiymdTSEyI035/rdD3VOq6FlOZ2wWLR5bit9LK8a3rzHU3UXkwScvEo6zYgs0Xp1sC0yu1S9+0BEiYkmi29A=="; }; }; - "@sentry/hub-6.19.7" = { - name = "_at_sentry_slash_hub"; - packageName = "@sentry/hub"; - version = "6.19.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz"; - sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; - }; - }; - "@sentry/minimal-6.19.7" = { - name = "_at_sentry_slash_minimal"; - packageName = "@sentry/minimal"; - version = "6.19.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz"; - sha512 = "wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ=="; - }; - }; - "@sentry/node-6.19.7" = { + "@sentry/node-7.80.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "6.19.7"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-6.19.7.tgz"; - sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.80.0.tgz"; + sha512 = "J35fqe8J5ac/17ZXT0ML3opYGTOclqYNE9Sybs1y9n6BqacHyzH8By72YrdI03F7JJDHwrcGw+/H8hGpkCwi0Q=="; }; }; - "@sentry/types-6.19.7" = { + "@sentry/types-7.80.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "6.19.7"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz"; - sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.80.0.tgz"; + sha512 = "4bpMO+2jWiWLDa8zbTASWWNLWe6yhjfPsa7/6VH5y9x1NGtL8oRbqUsTgsvjF3nmeHEMkHQsC8NHPaQ/ibFmZQ=="; }; }; - "@sentry/utils-6.19.7" = { + "@sentry/utils-7.80.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "6.19.7"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz"; - sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.80.0.tgz"; + sha512 = "XbBCEl6uLvE50ftKwrEo6XWdDaZXHXu+kkHXTPWQEcnbvfZKLuG9V0Hxtxxq3xQgyWmuF05OH1GcqYqiO+v5Yg=="; }; }; - "@serialport/binding-mock-10.2.2" = { - name = "_at_serialport_slash_binding-mock"; - packageName = "@serialport/binding-mock"; - version = "10.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-10.2.2.tgz"; - sha512 = "HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw=="; - }; - }; - "@serialport/bindings-cpp-12.0.1" = { - name = "_at_serialport_slash_bindings-cpp"; - packageName = "@serialport/bindings-cpp"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz"; - sha512 = "r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg=="; - }; - }; - "@serialport/bindings-interface-1.2.2" = { - name = "_at_serialport_slash_bindings-interface"; - packageName = "@serialport/bindings-interface"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz"; - sha512 = "CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA=="; - }; - }; - "@serialport/parser-byte-length-12.0.0" = { - name = "_at_serialport_slash_parser-byte-length"; - packageName = "@serialport/parser-byte-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-12.0.0.tgz"; - sha512 = "0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg=="; - }; - }; - "@serialport/parser-cctalk-12.0.0" = { - name = "_at_serialport_slash_parser-cctalk"; - packageName = "@serialport/parser-cctalk"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-12.0.0.tgz"; - sha512 = "0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw=="; - }; - }; - "@serialport/parser-delimiter-11.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz"; - sha512 = "aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g=="; - }; - }; - "@serialport/parser-delimiter-12.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz"; - sha512 = "gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw=="; - }; - }; - "@serialport/parser-inter-byte-timeout-12.0.0" = { - name = "_at_serialport_slash_parser-inter-byte-timeout"; - packageName = "@serialport/parser-inter-byte-timeout"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz"; - sha512 = "GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w=="; - }; - }; - "@serialport/parser-packet-length-12.0.0" = { - name = "_at_serialport_slash_parser-packet-length"; - packageName = "@serialport/parser-packet-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-12.0.0.tgz"; - sha512 = "p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ=="; - }; - }; - "@serialport/parser-readline-11.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-11.0.0.tgz"; - sha512 = "rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA=="; - }; - }; - "@serialport/parser-readline-12.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-12.0.0.tgz"; - sha512 = "O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w=="; - }; - }; - "@serialport/parser-ready-12.0.0" = { - name = "_at_serialport_slash_parser-ready"; - packageName = "@serialport/parser-ready"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-12.0.0.tgz"; - sha512 = "ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg=="; - }; - }; - "@serialport/parser-regex-12.0.0" = { - name = "_at_serialport_slash_parser-regex"; - packageName = "@serialport/parser-regex"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-12.0.0.tgz"; - sha512 = "dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA=="; - }; - }; - "@serialport/parser-slip-encoder-12.0.0" = { - name = "_at_serialport_slash_parser-slip-encoder"; - packageName = "@serialport/parser-slip-encoder"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-12.0.0.tgz"; - sha512 = "0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA=="; - }; - }; - "@serialport/parser-spacepacket-12.0.0" = { - name = "_at_serialport_slash_parser-spacepacket"; - packageName = "@serialport/parser-spacepacket"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz"; - sha512 = "dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q=="; - }; - }; - "@serialport/stream-12.0.0" = { - name = "_at_serialport_slash_stream"; - packageName = "@serialport/stream"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-12.0.0.tgz"; - sha512 = "9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q=="; - }; - }; - "@serverless/dashboard-plugin-7.0.5" = { + "@serverless/dashboard-plugin-7.1.0" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "7.0.5"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.0.5.tgz"; - sha512 = "OpZJpldLCJmQ/JCvuSCbWaNd6CprQ8yDi9lqrpP3WeR61jOGG8JFxmMs6hjpDd9bKyUMnQ9qAJ+C+QbAxdUosw=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.1.0.tgz"; + sha512 = "mAiTU2ERsDHdCrXJa/tihh/r+8ZwSuYYBqln3SkwuBD/49ct9QrK7S00cpiqFoY/geMFlHpOkriGzCPz6UP/rw=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -9499,22 +9634,22 @@ let sha512 = "7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ=="; }; }; - "@shopify/cli-kit-3.49.5" = { + "@shopify/cli-kit-3.50.2" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.49.5"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.49.5.tgz"; - sha512 = "Ydoh3L2n3X5yiCIN3WpEkRSAFqnyfvk4DJV1btATF+hxnHVdS/w6NzZi1ZVZpE7t3ShN7UylovFARyerVZwYAg=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.2.tgz"; + sha512 = "EqScyHo9EudDz6nGpvwBbkjUmDx5g8Uhy0Ls05ZTWBqGMP9tm9RdLqRYjyq6q6iEjrBMgois4Bw9De6Zcf9JOw=="; }; }; - "@shopify/plugin-did-you-mean-3.49.5" = { + "@shopify/plugin-did-you-mean-3.50.2" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.49.5"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.49.5.tgz"; - sha512 = "kXyn/6oVt8TrFhXhN2kzDwNuDgd/fayS33AiV2RtjbZi0qbCNUyX3nk7WD98K+xjt9dhrV+CuAHq3dZopjggKw=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.2.tgz"; + sha512 = "7i8HlEq06YIq8c3qfkoqa9uO5PhNmf6Cj5V/LZWzmhJgIPeXndJvrAxomyYwAHBugDm6Zx/kKEcIOlk4O4ZQFw=="; }; }; "@sideway/address-4.1.4" = { @@ -9553,6 +9688,15 @@ let sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog=="; }; }; + "@sigstore/bundle-2.1.0" = { + name = "_at_sigstore_slash_bundle"; + packageName = "@sigstore/bundle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz"; + sha512 = "89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng=="; + }; + }; "@sigstore/protobuf-specs-0.2.1" = { name = "_at_sigstore_slash_protobuf-specs"; packageName = "@sigstore/protobuf-specs"; @@ -9571,6 +9715,15 @@ let sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA=="; }; }; + "@sigstore/sign-2.2.0" = { + name = "_at_sigstore_slash_sign"; + packageName = "@sigstore/sign"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz"; + sha512 = "AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA=="; + }; + }; "@sigstore/tuf-1.0.3" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; @@ -9580,6 +9733,15 @@ let sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; }; }; + "@sigstore/tuf-2.2.0" = { + name = "_at_sigstore_slash_tuf"; + packageName = "@sigstore/tuf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz"; + sha512 = "KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA=="; + }; + }; "@sinclair/typebox-0.25.24" = { name = "_at_sinclair_slash_typebox"; packageName = "@sinclair/typebox"; @@ -9670,13 +9832,13 @@ let sha512 = "TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g=="; }; }; - "@smithy/abort-controller-2.0.10" = { + "@smithy/abort-controller-2.0.12" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.10.tgz"; - sha512 = "xn7PnFD3m4rQIG00h1lPuDVnC2QMtTFhzRLX3y56KkgFaCysS7vpNevNBgmNUtmJ4eVFc+66Zucwo2KDLdicOg=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.12.tgz"; + sha512 = "YIJyefe1mi3GxKdZxEBEuzYOeQ9xpYfqnFmWzojCssRAuR7ycxwpoRQgp965vuW426xUAQhCV5rCaWElQ7XsaA=="; }; }; "@smithy/chunked-blob-reader-2.0.0" = { @@ -9697,112 +9859,112 @@ let sha512 = "HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="; }; }; - "@smithy/config-resolver-2.0.11" = { + "@smithy/config-resolver-2.0.16" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "2.0.11"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.11.tgz"; - sha512 = "q97FnlUmbai1c4JlQJgLVBsvSxgV/7Nvg/JK76E1nRq/U5UM56Eqo3dn2fY7JibqgJLg4LPsGdwtIyqyOk35CQ=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.16.tgz"; + sha512 = "1k+FWHQDt2pfpXhJsOmNMmlAZ3NUQ98X5tYsjQhVGq+0X6cOBMhfh6Igd0IX3Ut6lEO6DQAdPMI/blNr3JZfMQ=="; }; }; - "@smithy/credential-provider-imds-2.0.13" = { + "@smithy/credential-provider-imds-2.0.18" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "2.0.13"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.13.tgz"; - sha512 = "/xe3wNoC4j+BeTemH9t2gSKLBfyZmk8LXB2pQm/TOEYi+QhBgT+PSolNDfNAhrR68eggNE17uOimsrnwSkCt4w=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.18.tgz"; + sha512 = "QnPBi6D2zj6AHJdUTo5zXmk8vwHJ2bNevhcVned1y+TZz/OI5cizz5DsYNkqFUIDn8tBuEyKNgbmKVNhBbuY3g=="; }; }; - "@smithy/eventstream-codec-2.0.10" = { + "@smithy/eventstream-codec-2.0.12" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.10.tgz"; - sha512 = "3SSDgX2nIsFwif6m+I4+ar4KDcZX463Noes8ekBgQHitULiWvaDZX8XqPaRQSQ4bl1vbeVXHklJfv66MnVO+lw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.12.tgz"; + sha512 = "ZZQLzHBJkbiAAdj2C5K+lBlYp/XJ+eH2uy+jgJgYIFW/o5AM59Hlj7zyI44/ZTDIQWmBxb3EFv/c5t44V8/g8A=="; }; }; - "@smithy/eventstream-serde-browser-2.0.10" = { + "@smithy/eventstream-serde-browser-2.0.12" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.10.tgz"; - sha512 = "/NSUNrWedO9Se80jo/2WcPvqobqCM/0drZ03Kqn1GZpGwVTsdqNj7frVTCUJs/W/JEzOShdMv8ewoKIR7RWPmA=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.12.tgz"; + sha512 = "0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg=="; }; }; - "@smithy/eventstream-serde-config-resolver-2.0.10" = { + "@smithy/eventstream-serde-config-resolver-2.0.12" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.10.tgz"; - sha512 = "ag1U0vsC5rhRm7okFzsS6YsvyTRe62jIgJ82+Wr4qoOASx7eCDWdjoqLnrdDY0S4UToF9hZAyo4Du/xrSSSk4g=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.12.tgz"; + sha512 = "I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA=="; }; }; - "@smithy/eventstream-serde-node-2.0.10" = { + "@smithy/eventstream-serde-node-2.0.12" = { name = "_at_smithy_slash_eventstream-serde-node"; packageName = "@smithy/eventstream-serde-node"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.10.tgz"; - sha512 = "3+VeofxoVCa+dvqcuzEpnFve8EQJKaYR7UslDFpj6UTZfa7Hxr8o1/cbFkTftFo71PxzYVsR+bsD56EbAO432A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.12.tgz"; + sha512 = "vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw=="; }; }; - "@smithy/eventstream-serde-universal-2.0.10" = { + "@smithy/eventstream-serde-universal-2.0.12" = { name = "_at_smithy_slash_eventstream-serde-universal"; packageName = "@smithy/eventstream-serde-universal"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.10.tgz"; - sha512 = "JhJJU1ULLsn5kxKfFe8zOF2tibjxlPIvIB71Kn20aa/OFs+lvXBR0hBGswpovyYyckXH3qU8VxuIOEuS+2G+3A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.12.tgz"; + sha512 = "xZ3ZNpCxIND+q+UCy7y1n1/5VQEYicgSTNCcPqsKawX+Vd+6OcFX7gUHMyPzL8cZr+GdmJuxNleqHlH4giK2tw=="; }; }; - "@smithy/fetch-http-handler-2.2.0" = { + "@smithy/fetch-http-handler-2.2.4" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "2.2.0"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.0.tgz"; - sha512 = "P2808PM0CsEkXj3rnQAi3QyqRbAAi8iuePYUB5GveJ+dVd1WMv03NM+CYCI14IGXt1j/r7jHGvMJHO+Gv+kdMQ=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.4.tgz"; + sha512 = "gIPRFEGi+c6V52eauGKrjDzPWF2Cu7Z1r5F8A3j2wcwz25sPG/t8kjsbEhli/tS/2zJp/ybCZXe4j4ro3yv/HA=="; }; }; - "@smithy/hash-blob-browser-2.0.10" = { + "@smithy/hash-blob-browser-2.0.12" = { name = "_at_smithy_slash_hash-blob-browser"; packageName = "@smithy/hash-blob-browser"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.10.tgz"; - sha512 = "U2+wIWWloOZ9DaRuz2sk9f7A6STRTlwdcv+q6abXDvS0TRDk8KGgUmfV5lCZy8yxFxZIA0hvHDNqcd25r4Hrew=="; + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.12.tgz"; + sha512 = "riLnV16f27yyePX8UF0deRHAeccUK8SrOxyTykSTrnVkgS3DsjNapZtTbd8OGNKEbI60Ncdb5GwN3rHZudXvog=="; }; }; - "@smithy/hash-node-2.0.10" = { + "@smithy/hash-node-2.0.12" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.10.tgz"; - sha512 = "jSTf6uzPk/Vf+8aQ7tVXeHfjxe9wRXSCqIZcBymSDTf7/YrVxniBdpyN74iI8ZUOx/Pyagc81OK5FROLaEjbXQ=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.12.tgz"; + sha512 = "fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ=="; }; }; - "@smithy/hash-stream-node-2.0.10" = { + "@smithy/hash-stream-node-2.0.12" = { name = "_at_smithy_slash_hash-stream-node"; packageName = "@smithy/hash-stream-node"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.10.tgz"; - sha512 = "L58XEGrownZZSpF7Lp0gc0hy+eYKXuPgNz3pQgP5lPFGwBzHdldx2X6o3c6swD6RkcPvTRh0wTUVVGwUotbgnQ=="; + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.12.tgz"; + sha512 = "x/DrSynPKrW0k00q7aZ/vy531a3mRw79mOajHp+cIF0TrA1SqEMFoy/B8X0XtoAtlJWt/vvgeDNqt/KAeaAqMw=="; }; }; - "@smithy/invalid-dependency-2.0.10" = { + "@smithy/invalid-dependency-2.0.12" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.10.tgz"; - sha512 = "zw9p/zsmJ2cFcW4KMz3CJoznlbRvEA6HG2mvEaX5eAca5dq4VGI2MwPDTfmteC/GsnURS4ogoMQ0p6aHM2SDVQ=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.12.tgz"; + sha512 = "p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA=="; }; }; "@smithy/is-array-buffer-2.0.0" = { @@ -9814,166 +9976,166 @@ let sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/md5-js-2.0.10" = { + "@smithy/md5-js-2.0.12" = { name = "_at_smithy_slash_md5-js"; packageName = "@smithy/md5-js"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.10.tgz"; - sha512 = "eA/Ova4/UdQUbMlrbBmnewmukH0zWU6C67HFFR/719vkFNepbnliGjmGksQ9vylz9eD4nfGkZZ5NKZMAcUuzjQ=="; + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.12.tgz"; + sha512 = "OgDt+Xnrw+W5z3MSl5KZZzebqmXrYl9UdbCiBYnnjErmNywwSjV6QB/Oic3/7hnsPniSU81n7Rvlhz2kH4EREQ=="; }; }; - "@smithy/middleware-content-length-2.0.12" = { + "@smithy/middleware-content-length-2.0.14" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.12.tgz"; - sha512 = "QRhJTo5TjG7oF7np6yY4ZO9GDKFVzU/GtcqUqyEa96bLHE3yZHgNmsolOQ97pfxPHmFhH4vDP//PdpAIN3uI1Q=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.14.tgz"; + sha512 = "poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg=="; }; }; - "@smithy/middleware-endpoint-2.0.10" = { + "@smithy/middleware-endpoint-2.1.3" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "2.0.10"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.10.tgz"; - sha512 = "O6m4puZc16xfenotZUHL4bRlMrwf4gTp+0I5l954M5KNd3dOK18P+FA/IIUgnXF/dX6hlCUcJkBp7nAzwrePKA=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.3.tgz"; + sha512 = "ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ=="; }; }; - "@smithy/middleware-retry-2.0.13" = { + "@smithy/middleware-retry-2.0.18" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "2.0.13"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.13.tgz"; - sha512 = "zuOva8xgWC7KYG8rEXyWIcZv2GWszO83DCTU6IKcf/FKu6OBmSE+EYv3EUcCGY+GfiwCX0EyJExC9Lpq9b0w5Q=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.18.tgz"; + sha512 = "VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA=="; }; }; - "@smithy/middleware-serde-2.0.10" = { + "@smithy/middleware-serde-2.0.12" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.10.tgz"; - sha512 = "+A0AFqs768256H/BhVEsBF6HijFbVyAwYRVXY/izJFkTalVWJOp4JA0YdY0dpXQd+AlW0tzs+nMQCE1Ew+DcgQ=="; - }; - }; - "@smithy/middleware-stack-2.0.4" = { - name = "_at_smithy_slash_middleware-stack"; - packageName = "@smithy/middleware-stack"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.4.tgz"; - sha512 = "MW0KNKfh8ZGLagMZnxcLJWPNXoKqW6XV/st5NnCBmmA2e2JhrUjU0AJ5Ca/yjTyNEKs3xH7AQDwp1YmmpEpmQQ=="; - }; - }; - "@smithy/node-config-provider-2.0.13" = { - name = "_at_smithy_slash_node-config-provider"; - packageName = "@smithy/node-config-provider"; - version = "2.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.13.tgz"; - sha512 = "pPpLqYuJcOq1sj1EGu+DoZK47DUS4gepqSTNgRezmrjnzNlSU2/Dcc9Ebzs+WZ0Z5vXKazuE+k+NksFLo07/AA=="; - }; - }; - "@smithy/node-http-handler-2.1.6" = { - name = "_at_smithy_slash_node-http-handler"; - packageName = "@smithy/node-http-handler"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.6.tgz"; - sha512 = "NspvD3aCwiUNtoSTcVHz0RZz1tQ/SaRIe1KPF+r0mAdCZ9eWuhIeJT8ZNPYa1ITn7/Lgg64IyFjqPynZ8KnYQw=="; - }; - }; - "@smithy/property-provider-2.0.11" = { - name = "_at_smithy_slash_property-provider"; - packageName = "@smithy/property-provider"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.11.tgz"; - sha512 = "kzuOadu6XvrnlF1iXofpKXYmo4oe19st9/DE8f5gHNaFepb4eTkR8gD8BSdTnNnv7lxfv6uOwZPg4VS6hemX1w=="; - }; - }; - "@smithy/protocol-http-3.0.6" = { - name = "_at_smithy_slash_protocol-http"; - packageName = "@smithy/protocol-http"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.6.tgz"; - sha512 = "F0jAZzwznMmHaggiZgc7YoS08eGpmLvhVktY/Taz6+OAOHfyIqWSDNgFqYR+WHW9z5fp2XvY4mEUrQgYMQ71jw=="; - }; - }; - "@smithy/querystring-builder-2.0.10" = { - name = "_at_smithy_slash_querystring-builder"; - packageName = "@smithy/querystring-builder"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.10.tgz"; - sha512 = "uujJGp8jzrrU1UHme8sUKEbawQTcTmUWsh8rbGXYD/lMwNLQ+9jQ9dMDWbbH9Hpoa9RER1BeL/38WzGrbpob2w=="; - }; - }; - "@smithy/querystring-parser-2.0.10" = { - name = "_at_smithy_slash_querystring-parser"; - packageName = "@smithy/querystring-parser"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.10.tgz"; - sha512 = "WSD4EU60Q8scacT5PIpx4Bahn6nWpt+MiYLcBkFt6fOj7AssrNeaNIU2Z0g40ftVmrwLcEOIKGX92ynbVDb3ZA=="; - }; - }; - "@smithy/service-error-classification-2.0.3" = { - name = "_at_smithy_slash_service-error-classification"; - packageName = "@smithy/service-error-classification"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.3.tgz"; - sha512 = "b+m4QCHXb7oKAkM/jHwHrl5gpqhFoMTHF643L0/vAEkegrcUWyh1UjyoHttuHcP5FnHVVy4EtpPtLkEYD+xMFw=="; - }; - }; - "@smithy/shared-ini-file-loader-2.0.12" = { - name = "_at_smithy_slash_shared-ini-file-loader"; - packageName = "@smithy/shared-ini-file-loader"; version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.12.tgz"; - sha512 = "umi0wc4UBGYullAgYNUVfGLgVpxQyES47cnomTqzCKeKO5oudO4hyDNj+wzrOjqDFwK2nWYGVgS8Y0JgGietrw=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.12.tgz"; + sha512 = "IBeco157lIScecq2Z+n0gq56i4MTnfKxS7rbfrAORveDJgnbBAaEQgYqMqp/cYqKrpvEXcyTjwKHrBjCCIZh2A=="; }; }; - "@smithy/signature-v4-2.0.10" = { - name = "_at_smithy_slash_signature-v4"; - packageName = "@smithy/signature-v4"; - version = "2.0.10"; + "@smithy/middleware-stack-2.0.6" = { + name = "_at_smithy_slash_middleware-stack"; + packageName = "@smithy/middleware-stack"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.10.tgz"; - sha512 = "S6gcP4IXfO/VMswovrhxPpqvQvMal7ZRjM4NvblHSPpE5aNBYx67UkHFF3kg0hR3tJKqNpBGbxwq0gzpdHKLRA=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.6.tgz"; + sha512 = "YSvNZeOKWLJ0M/ycxwDIe2Ztkp6Qixmcml1ggsSv2fdHKGkBPhGrX5tMzPGMI1yyx55UEYBi2OB4s+RriXX48A=="; }; }; - "@smithy/smithy-client-2.1.8" = { - name = "_at_smithy_slash_smithy-client"; - packageName = "@smithy/smithy-client"; + "@smithy/node-config-provider-2.1.3" = { + name = "_at_smithy_slash_node-config-provider"; + packageName = "@smithy/node-config-provider"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.3.tgz"; + sha512 = "J6lXvRHGVnSX3n1PYi+e1L5HN73DkkJpUviV3Ebf+8wSaIjAf+eVNbzyvh/S5EQz7nf4KVfwbD5vdoZMAthAEQ=="; + }; + }; + "@smithy/node-http-handler-2.1.8" = { + name = "_at_smithy_slash_node-http-handler"; + packageName = "@smithy/node-http-handler"; version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.8.tgz"; - sha512 = "Puuc4wuhdTSs8wstkNJ/JtpaFwIh0qDE27zawfRVzzjpXprpT+4wROqO2+NVoZ+6GKv7kz7QgZx6AI5325bSeQ=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.8.tgz"; + sha512 = "KZylM7Wff/So5SmCiwg2kQNXJ+RXgz34wkxS7WNwIUXuZrZZpY/jKJCK+ZaGyuESDu3TxcaY+zeYGJmnFKbQsA=="; }; }; - "@smithy/types-2.3.4" = { + "@smithy/property-provider-2.0.13" = { + name = "_at_smithy_slash_property-provider"; + packageName = "@smithy/property-provider"; + version = "2.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.13.tgz"; + sha512 = "VJqUf2CbsQX6uUiC5dUPuoEATuFjkbkW3lJHbRnpk9EDC9X+iKqhfTK+WP+lve5EQ9TcCI1Q6R7hrg41FyC54w=="; + }; + }; + "@smithy/protocol-http-3.0.8" = { + name = "_at_smithy_slash_protocol-http"; + packageName = "@smithy/protocol-http"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.8.tgz"; + sha512 = "SHJvYeWq8q0FK8xHk+xjV9dzDUDjFMT+G1pZbV+XB6OVoac/FSVshlMNPeUJ8AmSkcDKHRu5vASnRqZHgD3qhw=="; + }; + }; + "@smithy/querystring-builder-2.0.12" = { + name = "_at_smithy_slash_querystring-builder"; + packageName = "@smithy/querystring-builder"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.12.tgz"; + sha512 = "cDbF07IuCjiN8CdGvPzfJjXIrmDSelScRfyJYrYBNBbKl2+k7QD/KqiHhtRyEKgID5mmEVrV6KE6L/iPJ98sFw=="; + }; + }; + "@smithy/querystring-parser-2.0.12" = { + name = "_at_smithy_slash_querystring-parser"; + packageName = "@smithy/querystring-parser"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.12.tgz"; + sha512 = "fytyTcXaMzPBuNtPlhj5v6dbl4bJAnwKZFyyItAGt4Tgm9HFPZNo7a9r1SKPr/qdxUEBzvL9Rh+B9SkTX3kFxg=="; + }; + }; + "@smithy/service-error-classification-2.0.5" = { + name = "_at_smithy_slash_service-error-classification"; + packageName = "@smithy/service-error-classification"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.5.tgz"; + sha512 = "M0SeJnEgD2ywJyV99Fb1yKFzmxDe9JfpJiYTVSRMyRLc467BPU0qsuuDPzMCdB1mU8M8u1rVOdkqdoyFN8UFTw=="; + }; + }; + "@smithy/shared-ini-file-loader-2.2.2" = { + name = "_at_smithy_slash_shared-ini-file-loader"; + packageName = "@smithy/shared-ini-file-loader"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.2.tgz"; + sha512 = "noyQUPn7b1M8uB0GEXc/Zyxq+5K2b7aaqWnLp+hgJ7+xu/FCvtyWy5eWLDjQEsHnAet2IZhS5QF8872OR69uNg=="; + }; + }; + "@smithy/signature-v4-2.0.12" = { + name = "_at_smithy_slash_signature-v4"; + packageName = "@smithy/signature-v4"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.12.tgz"; + sha512 = "6Kc2lCZEVmb1nNYngyNbWpq0d82OZwITH11SW/Q0U6PX5fH7B2cIcFe7o6eGEFPkTZTP8itTzmYiGcECL0D0Lw=="; + }; + }; + "@smithy/smithy-client-2.1.12" = { + name = "_at_smithy_slash_smithy-client"; + packageName = "@smithy/smithy-client"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.12.tgz"; + sha512 = "XXqhridfkKnpj+lt8vM6HRlZbqUAqBjVC74JIi13F/AYQd/zTj9SOyGfxnbp4mjY9q28LityxIuV8CTinr9r5w=="; + }; + }; + "@smithy/types-2.4.0" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.4.tgz"; - sha512 = "D7xlM9FOMFyFw7YnMXn9dK2KuN6+JhnrZwVt1fWaIu8hCk5CigysweeIT/H/nCo4YV+s8/oqUdLfexbkPZtvqw=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.4.0.tgz"; + sha512 = "iH1Xz68FWlmBJ9vvYeHifVMWJf82ONx+OybPW8ZGf5wnEv2S0UXcU4zwlwJkRXuLKpcSLHrraHbn2ucdVXLb4g=="; }; }; - "@smithy/url-parser-2.0.10" = { + "@smithy/url-parser-2.0.12" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.10.tgz"; - sha512 = "4TXQFGjHcqru8aH5VRB4dSnOFKCYNX6SR1Do6fwxZ+ExT2onLsh2W77cHpks7ma26W5jv6rI1u7d0+KX9F0aOw=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.12.tgz"; + sha512 = "qgkW2mZqRvlNUcBkxYB/gYacRaAdck77Dk3/g2iw0S9F0EYthIS3loGfly8AwoWpIvHKhkTsCXXQfzksgZ4zIA=="; }; }; "@smithy/util-base64-2.0.0" = { @@ -10021,22 +10183,31 @@ let sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-2.0.12" = { + "@smithy/util-defaults-mode-browser-2.0.16" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.12"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.12.tgz"; - sha512 = "BCsFPdNThMS2312/Zj3/TtFsXfO2BwkbDNsoWbdtZ0cAv9cE6vqGKllYXmq2Gj6u+Vv8V3wUgBUicNol6s/7Sg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.16.tgz"; + sha512 = "Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw=="; }; }; - "@smithy/util-defaults-mode-node-2.0.14" = { + "@smithy/util-defaults-mode-node-2.0.21" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.14"; + version = "2.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.14.tgz"; - sha512 = "EtomtYsWDkBGs0fLeF+7N2df+zIqGix+O4llWqQD+97rbo2hk+GBWeZzBkujKrzFeXNUbPkFqfvZPLdoq4S4XQ=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.21.tgz"; + sha512 = "cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw=="; + }; + }; + "@smithy/util-endpoints-1.0.2" = { + name = "_at_smithy_slash_util-endpoints"; + packageName = "@smithy/util-endpoints"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.2.tgz"; + sha512 = "QEdq+sP68IJHAMVB2ugKVVZEWeKQtZLuf+akHzc8eTVElsZ2ZdVLWC6Cp+uKjJ/t4yOj1qu6ZzyxJQEQ8jdEjg=="; }; }; "@smithy/util-hex-encoding-2.0.0" = { @@ -10048,31 +10219,31 @@ let sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; }; }; - "@smithy/util-middleware-2.0.3" = { + "@smithy/util-middleware-2.0.5" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.3.tgz"; - sha512 = "+FOCFYOxd2HO7v/0hkFSETKf7FYQWa08wh/x/4KUeoVBnLR4juw8Qi+TTqZI6E2h5LkzD9uOaxC9lAjrpVzaaA=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.5.tgz"; + sha512 = "1lyT3TcaMJQe+OFfVI+TlomDkPuVzb27NZYdYtmSTltVmLaUjdCyt4KE+OH1CnhZKsz4/cdCL420Lg9UH5Z2Mw=="; }; }; - "@smithy/util-retry-2.0.3" = { + "@smithy/util-retry-2.0.5" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.3.tgz"; - sha512 = "gw+czMnj82i+EaH7NL7XKkfX/ZKrCS2DIWwJFPKs76bMgkhf0y1C94Lybn7f8GkBI9lfIOUdPYtzm19zQOC8sw=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.5.tgz"; + sha512 = "x3t1+MQAJ6QONk3GTbJNcugCFDVJ+Bkro5YqQQK1EyVesajNDqxFtCx9WdOFNGm/Cbm7tUdwVEmfKQOJoU2Vtw=="; }; }; - "@smithy/util-stream-2.0.13" = { + "@smithy/util-stream-2.0.17" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "2.0.13"; + version = "2.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.13.tgz"; - sha512 = "aeua6pN0WMdQtZNRRJ8J+mop57fezLMsApYbk5Q3q11pyHwZypVPuKoelr7K9PMJZcuYk90dQyUsUAd7hTCeRg=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.17.tgz"; + sha512 = "fP/ZQ27rRvHsqItds8yB7jerwMpZFTL3QqbQbidUiG0+mttMoKdP0ZqnvM8UK5q0/dfc3/pN7g4XKPXOU7oRWw=="; }; }; "@smithy/util-uri-escape-2.0.0" = { @@ -10093,13 +10264,13 @@ let sha512 = "rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="; }; }; - "@smithy/util-waiter-2.0.10" = { + "@smithy/util-waiter-2.0.12" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.10.tgz"; - sha512 = "yQjwWVrwYw+/f3hFQccE3zZF7lk6N6xtNcA6jvhWFYhnyKAm6B2mX8Gzftl0TbgoPUpzCvKYlvhaEpVtRpVfVw=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.12.tgz"; + sha512 = "3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA=="; }; }; "@socket.io/component-emitter-3.1.0" = { @@ -10165,15 +10336,6 @@ let sha512 = "lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="; }; }; - "@stoplight/spectral-cli-6.11.0" = { - name = "_at_stoplight_slash_spectral-cli"; - packageName = "@stoplight/spectral-cli"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.11.0.tgz"; - sha512 = "IURDN47BPIf3q4ZyUPujGpBzuHWFE5yT34w9rTJ1GKA4SgdscEdQO9KoTjOPT4G4cvDlEV3bNxwQ3uRm7+wRlA=="; - }; - }; "@stoplight/spectral-core-1.18.3" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; @@ -10183,22 +10345,13 @@ let sha512 = "YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ=="; }; }; - "@stoplight/spectral-formats-1.5.0" = { + "@stoplight/spectral-formats-1.6.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.5.0.tgz"; - sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; - }; - }; - "@stoplight/spectral-formatters-1.3.0" = { - name = "_at_stoplight_slash_spectral-formatters"; - packageName = "@stoplight/spectral-formatters"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.3.0.tgz"; - sha512 = "ryuMwlzbPUuyn7ybSEbFYsljYmvTaTyD51wyCQs4ROzgfm3Yo5QDD0IsiJUzUpKK/Ml61ZX8ebgiPiRFEJtBpg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.6.0.tgz"; + sha512 = "X27qhUfNluiduH0u/QwJqhOd8Wk5YKdxVmKM03Aijlx0AH1H5mYt3l9r7t2L4iyJrsBaFPnMGt7UYJDGxszbNA=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -10228,31 +10381,13 @@ let sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; - "@stoplight/spectral-ruleset-bundler-1.5.2" = { - name = "_at_stoplight_slash_spectral-ruleset-bundler"; - packageName = "@stoplight/spectral-ruleset-bundler"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.2.tgz"; - sha512 = "4QUVUFAU+S7IQ9XeCu+0TQMYxKFpKnkOAfa9unRQ1iPL2cviaipEN6witpbAptdHJD3UUjx4OnwlX8WwmXSq9w=="; - }; - }; - "@stoplight/spectral-ruleset-migrator-1.9.5" = { - name = "_at_stoplight_slash_spectral-ruleset-migrator"; - packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.5.tgz"; - sha512 = "76n/HETr3UinVl/xLNldrH9p0JNoD8Gz4K75J6E4OHp4xD0P+BA2e8+W30HjIvqm1LJdLU2BNma0ioy+q3B9RA=="; - }; - }; - "@stoplight/spectral-rulesets-1.17.0" = { + "@stoplight/spectral-rulesets-1.18.0" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.17.0.tgz"; - sha512 = "fRWunqvtP9k0vRonwqXQ663Xt1UfmOZRdaO+S02zA3mlKdA5a1vBQjVV9QYK70TXWmqUfmabc1G35FHNT+7iRw=="; + url = "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.18.0.tgz"; + sha512 = "7LiCteW5pofMuBtf1BO+Ig5pT1XV9oqGrUjqWwSqD6jcy8ejE45pOQpef4h4um9tj3Y+tewfdbthLjhu8sdoeA=="; }; }; "@stoplight/spectral-runtime-1.1.2" = { @@ -10363,13 +10498,13 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.91" = { + "@swc/core-1.3.96" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.91"; + version = "1.3.96"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.91.tgz"; - sha512 = "r950d0fdlZ8qbSDyvApn3HyCojiZE8xpgJzQvypeMi32dalYwugdJKWyLB55JIGMRGJ8+lmVvY4MPGkSR3kXgA=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.96.tgz"; + sha512 = "zwE3TLgoZwJfQygdv2SdCK9mRLYluwDOM53I+dT6Z5ZvrgVENmY3txvWDvduzkV+/8IuvrRbVezMpxcojadRdQ=="; }; }; "@swc/counter-0.1.2" = { @@ -10381,13 +10516,13 @@ let sha512 = "9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw=="; }; }; - "@swc/helpers-0.5.2" = { + "@swc/helpers-0.5.3" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz"; - sha512 = "E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz"; + sha512 = "FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A=="; }; }; "@swc/types-0.1.5" = { @@ -10399,13 +10534,13 @@ let sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.91" = { + "@swc/wasm-1.3.97" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.91"; + version = "1.3.97"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.91.tgz"; - sha512 = "SEMDGgLMjJOpizg+fC+L/1K0eVjyup5L462jXt3BlY6BSM7T2RtJLtIai1evMvDX6brK+PVUIPjtY4XMdmyBWQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.97.tgz"; + sha512 = "O9p6R6zN1NV1U64eBmU/2NvJGA79W/vUl9BaQwIgoSf2qrPrKMtexDV/aFk2N/mQriWxaK3HHxJAQSPRWsRs+w=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10453,13 +10588,13 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@textlint/ast-node-types-13.3.3" = { + "@textlint/ast-node-types-13.4.0" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.3.3.tgz"; - sha512 = "KCpJppfX3Km69twa6SmVEJ8mkyAZSrxw3XaaLQSlpc7PWnLUJSCHGPVECI1nSUDhiTd1r6zlRvWuyIAZJiov+A=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.4.0.tgz"; + sha512 = "roVeLjnf8UPntFICb1uEwE2dccC8V/T5N1x7eBxkT3VDmSQkyfIAuGtlpwyH0wNKEwJmjO/2gSm2fCjW5K/rbA=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -10471,139 +10606,139 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-13.3.3" = { + "@textlint/ast-tester-13.4.0" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.3.3.tgz"; - sha512 = "vIIEJ0vDJb3Pr4kseOH9yzUCxx1EbX6PQDg/DgQj9sMAnwVG2sZvy2Uiga4+hj8SphdzaKia9Z+156UZzs+mzA=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.4.0.tgz"; + sha512 = "dmqlPNxgQNaG63gTcMfF2b2VmQn7gnDN2ytF3c6sFB6YyTsiTh9wA/xsUBKqYWOMlYV5pLuO6TvItcUPCtVtZw=="; }; }; - "@textlint/ast-traverse-13.3.3" = { + "@textlint/ast-traverse-13.4.0" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.3.3.tgz"; - sha512 = "tZ25emmWf3mJ4+vM8CO6D7F8l00WXD6MJgnnlY9BHI/HbOlngBfmKhTVizQEwrWfYF80sQO5R9a+N4UEk67Wcg=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.4.0.tgz"; + sha512 = "d64z9uJcyGRwZFNadkOTnSIMZEQfWiOEM4+RbakLF71kpmdMoF8pPK5mOgT0fsHoidGzlNxxUMThkIfSRMtG5w=="; }; }; - "@textlint/config-loader-13.3.3" = { + "@textlint/config-loader-13.4.0" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.3.3.tgz"; - sha512 = "DQA/7dYu3VDHP9Idd0Sn7HzwiFuNdKUXfA79pUGmJzNQUYaW0qADzyQCwfh7LlvhCcBmnLgX+8wb13o6OaHX5g=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.4.0.tgz"; + sha512 = "uebTYdCZAw43BMWIB85EU6eoFe6aVArejeW6P+QR09aZvVIPoT6UJl1JYjGNiq0cVR5kR7bQS1w3Af55CvgOEQ=="; }; }; - "@textlint/feature-flag-13.3.3" = { + "@textlint/feature-flag-13.4.0" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.3.3.tgz"; - sha512 = "ltdwKQTvs9f/TgQ3asBx2EXmsSSsvxa7ySnTXSTZBkbVxqmrGY4zehDRiDCmuFZGVGCvCddY1QzCXy16ybk9Fg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.4.0.tgz"; + sha512 = "L/p2rkuOg6rOS395TXUFIDfmoCyHpHKnA6YFCqNXkDcpxo0W+YXnEdXDMd9P+KlsU9MNTC9nFduO4nHOfFYlPg=="; }; }; - "@textlint/fixer-formatter-13.3.3" = { + "@textlint/fixer-formatter-13.4.0" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.3.3.tgz"; - sha512 = "iCMFS8GrmUetXMIT4/jFxoL5v1QN5ODj1190Lb6D+EdTxsrAWssHOb6m7MOEhfOGYEArAkb3PjSxu7DPLrb50g=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.4.0.tgz"; + sha512 = "iosRUAhQ4bQkwpg6HOCfaLufR5X0ImCOnoy+jqHNQD37ziRQF43B/IMHOqwQdX7MLHp6jPYALFDnl64+gjmKbA=="; }; }; - "@textlint/kernel-13.3.3" = { + "@textlint/kernel-13.4.0" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.3.3.tgz"; - sha512 = "HewzuuX2c2nlR+e8dREWrAYrOiyWb78eeObuW95miMjX/F6TjWmha4qrnrMCWbYbKDwC4en8dNGS4mm0vSdi4A=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.4.0.tgz"; + sha512 = "QRHbaKSeqXzfi+XNISOyNM7h68v6/4QaLfo7CZnBBKxatvVoXUF5B/8MmxYrVB1TX/X9sY50zcwfTaYwZTYCNQ=="; }; }; - "@textlint/linter-formatter-13.3.3" = { + "@textlint/linter-formatter-13.4.0" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.3.3.tgz"; - sha512 = "z8xsk1bo9r8v6Ph76WLTBrfj+0+eyEfRlbTGBs+ie6YAGItBqkLYmDrD26DDfVjIZcXWdCXVX1Et6MOWomb//g=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.4.0.tgz"; + sha512 = "vJGm0mM7TcsespHUxh4GnSWBOqdYyluHlLPLQwg4tCVYLjTgu2Vaz8BDCpwQ9BnRmEr484Qjug0RE1otQUFBrw=="; }; }; - "@textlint/markdown-to-ast-13.3.3" = { + "@textlint/markdown-to-ast-13.4.0" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.3.3.tgz"; - sha512 = "jeqWyChTtJHWxEnH46V6qjr+OCTh6evm45aDqMzdg+b8ocXY+NhudiCMeHcVGoz042UEwc6w4reLn8+Is+SZ+A=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.4.0.tgz"; + sha512 = "rF70kFestQHaqB+cRl4QrvjIn0bjR3birnAXjux9iEXWfrS7cxWyrEWmKkBPO5o8yoGF9q9JKBkDaypPzNsIhg=="; }; }; - "@textlint/module-interop-13.3.3" = { + "@textlint/module-interop-13.4.0" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.3.3.tgz"; - sha512 = "CwfVpRGAxbkhGY9vLLU06Q/dy/RMNnyzbmt6IS2WIyxqxvGaF7QZtFYpKEEm63aemVyUvzQ7WM3yVOoUg6P92w=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.4.0.tgz"; + sha512 = "o3h/ths4OrqeT5XLfTED6R0tjp/DLvbL8eG8b7uUgIEhUlHcSHwEUC6bEX7AzQS6/2DedrCBKLknQcdhl/iQ2A=="; }; }; - "@textlint/source-code-fixer-13.3.3" = { + "@textlint/source-code-fixer-13.4.0" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.3.3.tgz"; - sha512 = "h4jxWSetmcVuGwl71ai72784aneBQ0MkE5Mc3avl8PKIOIOyz0A1D7i9VQENWWIiqU8zyzmHwKGNSGyqWaqE2Q=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.4.0.tgz"; + sha512 = "3jR5XPrSzJmSH8sg3XrkCu9sGSR7OOl78zrbX+1d84nDLdRdjLSa90COc4aJWwOMpKycwZhU6XltTqPJWI50rg=="; }; }; - "@textlint/text-to-ast-13.3.3" = { + "@textlint/text-to-ast-13.4.0" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.3.3.tgz"; - sha512 = "iQdiHAiUfB9XruuYWCb4fY/gD/Q5/MkH1xwUTpS8UJowNgwpTldagUJX1JbZQ2UHux+yRe9JFA+JKm3rrxgQFw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.4.0.tgz"; + sha512 = "oZQ20rA5VqqjUT689q/RDgHSI1ML6ySoEjfXMRBSXaN+7LXKFZdvLg4RQ5ECddNh3MIXcQHdjT7+qxuGyQzy6g=="; }; }; - "@textlint/textlint-plugin-markdown-13.3.3" = { + "@textlint/textlint-plugin-markdown-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.3.3.tgz"; - sha512 = "EhBZ/Q6ZXMVRPDeQbFdFbtc0wE7SC0DWy9lkjKXfcbLKW0ZPTvtjH3JqJtCPBZAYcexB8wKOiHImfwVfQJhJhg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.4.0.tgz"; + sha512 = "+bIOsbfQpdRzjkNDXY1ze4YyPGf1XKlkVVkkVpUlI7rehoVaUWKy2v41Y8gsQZjpBft31EXP1okA9qs7wTYr/w=="; }; }; - "@textlint/textlint-plugin-text-13.3.3" = { + "@textlint/textlint-plugin-text-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.3.3.tgz"; - sha512 = "MN/JMGLanqj8CJGuit8DDiyrO0yf1vxFMLWTDeMIXwSoe8VToHCt2j20zg8XNHGNrUbKj+wuhzhrkrKEI7uWxg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.4.0.tgz"; + sha512 = "k9GAId9bjdZB3oLBfzAjRD+LCOFQILS5o9s8ESPPJhR5apvURr7WkR2bR5/dHuxa0ivvPjksVzS/jyE2kk618g=="; }; }; - "@textlint/types-13.3.3" = { + "@textlint/types-13.4.0" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-13.3.3.tgz"; - sha512 = "i2B7uRh+Iv8ZBKPJ3n4I6uSrTUQq5LdEkhFYNUwnDYxmhudz1o79xm906kri2eM8lxThX/UYYgVuJWpEwS0b+g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-13.4.0.tgz"; + sha512 = "K7JjP0gUOuRgc7xyfZv2NML7dmzcb9UjoBu0QCgCmJP861ikAd1bONH+qE/3brTi4n8MJq9gO9smGjB2upExMA=="; }; }; - "@textlint/utils-13.3.3" = { + "@textlint/utils-13.4.0" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.3.3.tgz"; - sha512 = "roN+K3a36RxGc0tV+8HXVXpoPomEr3LCjNI8+hFmVjOu3RsUdLTyraNBqqaghaE0KgwCPODF0seuG1hteNI8LQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.4.0.tgz"; + sha512 = "cXm9L3Ol/R5DR0YtHCMBa2PicvOoR5YU8Dx7RDJWHfp2rQvMghd3ogDmeol28s/Ei5oXRHY5HE2rWhYLhwrtVg=="; }; }; "@tokenizer/token-0.1.1" = { @@ -10669,13 +10804,13 @@ let sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="; }; }; - "@trivago/prettier-plugin-sort-imports-4.2.0" = { + "@trivago/prettier-plugin-sort-imports-4.2.1" = { name = "_at_trivago_slash_prettier-plugin-sort-imports"; packageName = "@trivago/prettier-plugin-sort-imports"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.0.tgz"; - sha512 = "YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw=="; + url = "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.1.tgz"; + sha512 = "iuy2MPVURGdxILTchHr15VAioItuYBejKfcTmQFlxIuqA7jeaT6ngr5aUIG6S6U096d6a6lJCgaOwlRrPLlOPg=="; }; }; "@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" = { @@ -10741,6 +10876,15 @@ let sha512 = "vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="; }; }; + "@tsconfig/strictest-2.0.2" = { + name = "_at_tsconfig_slash_strictest"; + packageName = "@tsconfig/strictest"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/strictest/-/strictest-2.0.2.tgz"; + sha512 = "jt4jIsWKvUvuY6adJnQJlb/UR7DdjC8CjHI/OaSQruj2yX9/K6+KOvDt/vD6udqos/FUk5Op66CvYT7TBLYO5Q=="; + }; + }; "@tufjs/canonical-json-1.0.0" = { name = "_at_tufjs_slash_canonical-json"; packageName = "@tufjs/canonical-json"; @@ -10750,6 +10894,15 @@ let sha512 = "QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ=="; }; }; + "@tufjs/canonical-json-2.0.0" = { + name = "_at_tufjs_slash_canonical-json"; + packageName = "@tufjs/canonical-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz"; + sha512 = "yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA=="; + }; + }; "@tufjs/models-1.0.4" = { name = "_at_tufjs_slash_models"; packageName = "@tufjs/models"; @@ -10759,6 +10912,15 @@ let sha512 = "qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A=="; }; }; + "@tufjs/models-2.0.0" = { + name = "_at_tufjs_slash_models"; + packageName = "@tufjs/models"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz"; + sha512 = "c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg=="; + }; + }; "@turist/fetch-7.2.0" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; @@ -10777,13 +10939,13 @@ let sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; - "@types/accepts-1.3.5" = { + "@types/accepts-1.3.7" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; - sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; + url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ=="; }; }; "@types/acorn-4.0.6" = { @@ -10813,22 +10975,22 @@ let sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA=="; }; }; - "@types/atob-2.1.2" = { + "@types/atob-2.1.4" = { name = "_at_types_slash_atob"; packageName = "@types/atob"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.2.tgz"; - sha512 = "8GAYQ1jDRUQkSpHzJUqXwAkYFOxuWAOGLhIR4aPd/Y/yL12Q/9m7LsKpHKlfKdNE/362Hc9wPI1Yh6opDfxVJg=="; + url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz"; + sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/bn.js-5.1.2" = { + "@types/bn.js-5.1.5" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; - version = "5.1.2"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz"; - sha512 = "dkpZu0szUtn9UXTmw+e0AJFd4D2XAxDnsCLdc05SfqpqzPEBft8eQr8uaFitfo/dUUOZERaLec2hHMG87A4Dxg=="; + url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz"; + sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; }; }; "@types/body-parser-1.19.2" = { @@ -10840,31 +11002,31 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/body-parser-1.19.3" = { + "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.3"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.3.tgz"; - sha512 = "oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz"; + sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="; }; }; - "@types/bonjour-3.5.11" = { + "@types/bonjour-3.5.13" = { name = "_at_types_slash_bonjour"; packageName = "@types/bonjour"; - version = "3.5.11"; + version = "3.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.11.tgz"; - sha512 = "isGhjmBtLIxdHBDl2xGwUzEM8AOyOvWsADWq7rqirdi/ZQoHnLWErHvsThcEzTX8juDRiZtzp2Qkv5bgNh6mAg=="; + url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz"; + sha512 = "z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ=="; }; }; - "@types/bunyan-1.8.9" = { + "@types/bunyan-1.8.11" = { name = "_at_types_slash_bunyan"; packageName = "@types/bunyan"; - version = "1.8.9"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.9.tgz"; - sha512 = "ZqS9JGpBxVOvsawzmVt30sP++gSQMTejCkIAQ3VdadOcRE8izTyW66hufvwLeH+YEGP6Js2AW7Gz+RMyvrEbmw=="; + url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.11.tgz"; + sha512 = "758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ=="; }; }; "@types/cacheable-request-6.0.3" = { @@ -10876,13 +11038,13 @@ let sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; - "@types/cli-progress-3.11.3" = { + "@types/cli-progress-3.11.5" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; - version = "3.11.3"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.3.tgz"; - sha512 = "/+C9xAdVtc+g5yHHkGBThgAA8rYpi5B+2ve3wLtybYj0JHEBs57ivR4x/zGfSsplRnV+psE91Nfin1soNKqz5Q=="; + url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz"; + sha512 = "D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g=="; }; }; "@types/commander-2.12.2" = { @@ -10894,40 +11056,40 @@ let sha512 = "0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q=="; }; }; - "@types/common-tags-1.8.2" = { + "@types/common-tags-1.8.4" = { name = "_at_types_slash_common-tags"; packageName = "@types/common-tags"; - version = "1.8.2"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.2.tgz"; - sha512 = "Z5UcOnlqxFm0tCCTEhkcVOfSihWOMyKypIWHtQNSYh6fMdPUIVpNdLBYutDpDXVHsMUrYzI2IczUHXIzpUovmQ=="; + url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz"; + sha512 = "S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg=="; }; }; - "@types/concat-stream-2.0.0" = { + "@types/concat-stream-2.0.2" = { name = "_at_types_slash_concat-stream"; packageName = "@types/concat-stream"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.0.tgz"; - sha512 = "t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw=="; + url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.2.tgz"; + sha512 = "hgEx+hdJnfCHa62l6SNHNoe/cRge2HoUZe9KEDwOs2TvyocLTlTuw0rUMiii99kG2avc+BubhNpZ+cu05Gl8oQ=="; }; }; - "@types/connect-3.4.36" = { + "@types/connect-3.4.38" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.36"; + version = "3.4.38"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz"; - sha512 = "P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz"; + sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="; }; }; - "@types/connect-history-api-fallback-1.5.1" = { + "@types/connect-history-api-fallback-1.5.3" = { name = "_at_types_slash_connect-history-api-fallback"; packageName = "@types/connect-history-api-fallback"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.1.tgz"; - sha512 = "iaQslNbARe8fctL5Lk+DsmgWOM83lM+7FzP0eQUJs1jd3kBE8NWqBTIT2S8SqQOJjxvt2eyIjpOuYeRXq2AdMw=="; + url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.3.tgz"; + sha512 = "6mfQ6iNvhSKCZJoY6sIG3m0pKkdUcweVNOLuBBKvoWGzl2yRxOJcYOTRyLKt3nxXvBLJWa6QkW//tgbIwJehmA=="; }; }; "@types/cookie-0.4.1" = { @@ -10939,13 +11101,13 @@ let sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; }; }; - "@types/cookiejar-2.1.2" = { + "@types/cookiejar-2.1.4" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz"; - sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog=="; + url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.4.tgz"; + sha512 = "b698BLJ6kPVd6uhHsY7wlebZdrWPXYied883PDSzpJZYOP97EOn/oGdLCH3jJf157srkFReIZY5v0H1s8Dozrg=="; }; }; "@types/cors-2.8.12" = { @@ -10957,103 +11119,85 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/cors-2.8.14" = { + "@types/cors-2.8.16" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.14"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.14.tgz"; - sha512 = "RXHUvNWYICtbP6s18PnOCaqToK8y14DnLd75c6HfyKf228dxy7pHNOQkxPtvXKp/hINFMDjbYzsj63nnpPMSRQ=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.16.tgz"; + sha512 = "Trx5or1Nyg1Fq138PCuWqoApzvoSLWzZ25ORBiHMbbUT42g578lH1GT4TwYDbiUOLFuDsCkfLneT2105fsFWGg=="; }; }; - "@types/debug-4.1.9" = { + "@types/debug-4.1.12" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.9"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.9.tgz"; - sha512 = "8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"; + sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="; }; }; - "@types/diff-3.5.6" = { + "@types/diff-3.5.8" = { name = "_at_types_slash_diff"; packageName = "@types/diff"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.6.tgz"; - sha512 = "5BV7iGX/NmFGqAQn+YDBK++kO7IbZf0mIn8mwdJACIpZsMUqJvEin0riqNDbmS3SQL8u00dGnbC0FFJQptTSWw=="; + url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz"; + sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; }; }; - "@types/ejs-3.1.3" = { + "@types/ejs-3.1.5" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.3.tgz"; - sha512 = "mv5T/JI/bu+pbfz1o+TLl1NF0NIBbjS0Vl6Ppz1YY9DkXfzZT0lelXpfS5i3ZS3U/p90it7uERQpBvLYoK8e4A=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz"; + sha512 = "nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="; }; }; - "@types/es-aggregate-error-1.0.3" = { + "@types/es-aggregate-error-1.0.5" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.3.tgz"; - sha512 = "GmY61WWXQemfJp+qmMu6RsrNev0eoEWeWtg46w9pdXje23jRJrf7yETbAkl7F+CfQJSKW7w3//sTYtQTt+R5Lg=="; + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.5.tgz"; + sha512 = "N2YcF5clfLoFqpSXr50khdH9cItGytbDXti6UMc4948VivZp0g1tiJxes5yqtWO3LWQf/mArYrQFWarUWj8lcQ=="; }; }; - "@types/eslint-7.29.0" = { + "@types/eslint-8.44.7" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.29.0"; + version = "8.44.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz"; - sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz"; + sha512 = "f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ=="; }; }; - "@types/eslint-8.44.3" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "8.44.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz"; - sha512 = "iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g=="; - }; - }; - "@types/eslint-scope-3.7.5" = { + "@types/eslint-scope-3.7.7" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.5"; + version = "3.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz"; - sha512 = "JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz"; + sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="; }; }; - "@types/estree-0.0.39" = { + "@types/estree-1.0.5" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.39"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz"; + sha512 = "/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="; }; }; - "@types/estree-1.0.2" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz"; - sha512 = "VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA=="; - }; - }; - "@types/estree-jsx-1.0.1" = { + "@types/estree-jsx-1.0.3" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.1.tgz"; - sha512 = "sHyakZlAezNFxmYRo0fopDZW+XvK6ipeZkkp5EAOLjdPfZp8VjZBJ67vSRI99RSCAoqXVmXOHS4fnWoxpuGQtQ=="; + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.3.tgz"; + sha512 = "pvQ+TKeRHeiUGRhvYwRrQ/ISnohKkSJR14fT2yqyZ4e9K5vqc7hrtY2Y1Dw0ZwAzQ6DQsxsaCUuSIIi8v0Cq6w=="; }; }; "@types/express-4.17.14" = { @@ -11065,13 +11209,13 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; - "@types/express-4.17.18" = { + "@types/express-4.17.21" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.18"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz"; - sha512 = "Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz"; + sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="; }; }; "@types/express-serve-static-core-4.17.31" = { @@ -11083,13 +11227,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.37" = { + "@types/express-serve-static-core-4.17.41" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.37"; + version = "4.17.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz"; - sha512 = "ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz"; + sha512 = "OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA=="; }; }; "@types/geojson-7946.0.4" = { @@ -11119,13 +11263,13 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/hast-2.3.6" = { + "@types/hast-2.3.8" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.6"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.6.tgz"; - sha512 = "47rJE80oqPmFdVDCD7IheXBrVdwuBgsYwoczFvKmwfo2Mzsnt+V9OONsYauFmICb6lQPpCuXYJWejBNs4pDJRg=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.8.tgz"; + sha512 = "aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -11137,31 +11281,31 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-cache-semantics-4.0.2" = { + "@types/http-cache-semantics-4.0.4" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; - sha512 = "FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz"; + sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-errors-2.0.2" = { + "@types/http-errors-2.0.4" = { name = "_at_types_slash_http-errors"; packageName = "@types/http-errors"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz"; - sha512 = "lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="; + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz"; + sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="; }; }; - "@types/http-proxy-1.17.12" = { + "@types/http-proxy-1.17.14" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.12"; + version = "1.17.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz"; - sha512 = "kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; + sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; }; }; "@types/inquirer-6.5.0" = { @@ -11173,67 +11317,67 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.6" = { + "@types/inquirer-8.2.10" = { name = "_at_types_slash_inquirer"; packageName = "@types/inquirer"; - version = "8.2.6"; + version = "8.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.6.tgz"; - sha512 = "3uT88kxg8lNzY8ay2ZjP44DKcRaTGztqeIvN2zHvhzIBH/uAPaL75aBtdNRKbA7xXoMbBt5kX0M00VKAnfOYlA=="; + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz"; + sha512 = "IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA=="; }; }; - "@types/is-empty-1.2.1" = { + "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.1.tgz"; - sha512 = "a3xgqnFTuNJDm1fjsTjHocYJ40Cz3t8utYpi5GNaxzrJC2HSD08ym+whIL7fNqiqBCdM9bcqD1H/tORWAFXoZw=="; + url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.3.tgz"; + sha512 = "4J1l5d79hoIvsrKh5VUKVRA1aIdsOb10Hu5j3J2VfP/msDnfTdGPmNp2E1Wg+vs97Bktzo+MZePFFXSGoykYJw=="; }; }; - "@types/istanbul-lib-coverage-2.0.4" = { + "@types/istanbul-lib-coverage-2.0.6" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; - sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz"; + sha512 = "2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="; }; }; - "@types/istanbul-lib-report-3.0.1" = { + "@types/istanbul-lib-report-3.0.3" = { name = "_at_types_slash_istanbul-lib-report"; packageName = "@types/istanbul-lib-report"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz"; - sha512 = "gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz"; + sha512 = "NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA=="; }; }; - "@types/istanbul-reports-3.0.2" = { + "@types/istanbul-reports-3.0.4" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha512 = "kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A=="; + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz"; + sha512 = "pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ=="; }; }; - "@types/jquery-3.5.20" = { + "@types/jquery-3.5.27" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.20"; + version = "3.5.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.20.tgz"; - sha512 = "UI+EGhgYD4LdSZ8gaiziFqXYIIB38VQSDsnAs8jL/div7FGrzrShx4HKCykVzk3tPfiIlusdNP9Wi3G60LCF2Q=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz"; + sha512 = "TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ=="; }; }; - "@types/js-levenshtein-1.1.1" = { + "@types/js-levenshtein-1.1.2" = { name = "_at_types_slash_js-levenshtein"; packageName = "@types/js-levenshtein"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.1.tgz"; - sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; + url = "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.2.tgz"; + sha512 = "/NCbMABw2uacuyE16Iwka1EzREDD50/W2ggRBad0y1WHBvAkvR9OEINxModVY7D428gXBe0igeVX7bUc9GaslQ=="; }; }; "@types/jscodeshift-0.7.2" = { @@ -11245,13 +11389,13 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.13" = { + "@types/json-schema-7.0.15" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.13"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; - sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"; + sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; "@types/json5-0.0.29" = { @@ -11272,22 +11416,22 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/linkify-it-3.0.3" = { + "@types/linkify-it-3.0.5" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz"; - sha512 = "pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g=="; + url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz"; + sha512 = "yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw=="; }; }; - "@types/lodash-4.14.199" = { + "@types/lodash-4.14.201" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.199"; + version = "4.14.201"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; - sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz"; + sha512 = "y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ=="; }; }; "@types/long-4.0.2" = { @@ -11317,40 +11461,49 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/mdast-3.0.13" = { + "@types/mdast-3.0.15" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.13"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.13.tgz"; - sha512 = "HjiGiWedR0DVFkeNljpa6Lv4/IZU1+30VY5d747K7lBudFc3R0Ibr6yJ9lN3BE28VnZyDfLF/VB1Ql1ZIbKrmg=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz"; + sha512 = "LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ=="; }; }; - "@types/mdurl-1.0.3" = { + "@types/mdast-4.0.3" = { + name = "_at_types_slash_mdast"; + packageName = "@types/mdast"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz"; + sha512 = "LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg=="; + }; + }; + "@types/mdurl-1.0.5" = { name = "_at_types_slash_mdurl"; packageName = "@types/mdurl"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.3.tgz"; - sha512 = "T5k6kTXak79gwmIOaDF2UUQXFbnBE0zBUzF20pz7wDYu0RQMzWg+Ml/Pz50214NsFHBITkoi5VtdjFZnJ2ijjA=="; + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz"; + sha512 = "6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA=="; }; }; - "@types/mime-1.3.3" = { + "@types/mime-1.3.5" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz"; - sha512 = "Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz"; + sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="; }; }; - "@types/mime-3.0.2" = { + "@types/mime-3.0.4" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.2.tgz"; - sha512 = "Wj+fqpTLtTbG7c0tH47dkahefpLKEbB+xAZuLq7b4/IDHPl/n6VoXcyUQ2bypFlbSwvCr0y+bD4euTTqTJsPxQ=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.4.tgz"; + sha512 = "iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw=="; }; }; "@types/minimatch-3.0.5" = { @@ -11371,22 +11524,22 @@ let sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; }; - "@types/minimist-1.2.3" = { + "@types/minimist-1.2.5" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz"; - sha512 = "ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A=="; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz"; + sha512 = "hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag=="; }; }; - "@types/ms-0.7.32" = { + "@types/ms-0.7.34" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; - version = "0.7.32"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.32.tgz"; - sha512 = "xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g=="; + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz"; + sha512 = "nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="; }; }; "@types/mute-stream-0.0.1" = { @@ -11398,6 +11551,15 @@ let sha512 = "0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw=="; }; }; + "@types/mute-stream-0.0.4" = { + name = "_at_types_slash_mute-stream"; + packageName = "@types/mute-stream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz"; + sha512 = "CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow=="; + }; + }; "@types/nanoid-3.0.0" = { name = "_at_types_slash_nanoid"; packageName = "@types/nanoid"; @@ -11407,13 +11569,13 @@ let sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ=="; }; }; - "@types/nlcst-1.0.2" = { + "@types/nlcst-1.0.4" = { name = "_at_types_slash_nlcst"; packageName = "@types/nlcst"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.2.tgz"; - sha512 = "ykxL/GDDUhqikjU0LIywZvEwb1NTYXTEWf+XgMSS2o6IXIakafPccxZmxgZcvJPZ3yFl2kdL1gJZz3U3iZF3QA=="; + url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.4.tgz"; + sha512 = "ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg=="; }; }; "@types/node-10.17.60" = { @@ -11452,22 +11614,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.23" = { + "@types/node-16.18.61" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.23"; + version = "16.18.61"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.23.tgz"; - sha512 = "XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g=="; - }; - }; - "@types/node-16.18.55" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.18.55"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.55.tgz"; - sha512 = "Y1zz/LIuJek01+hlPNzzXQhmq/Z2BCP96j18MSXC0S0jSu/IG4FFxmBs7W4/lI2vPJ7foVfEB0hUVtnOjnCiTg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.61.tgz"; + sha512 = "k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q=="; }; }; "@types/node-16.9.1" = { @@ -11479,22 +11632,22 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.18.1" = { + "@types/node-18.18.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.18.1"; + version = "18.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.18.1.tgz"; - sha512 = "3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; + sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; }; }; - "@types/node-20.5.1" = { + "@types/node-18.18.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.5.1"; + version = "18.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz"; - sha512 = "4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.9.tgz"; + sha512 = "0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ=="; }; }; "@types/node-20.5.9" = { @@ -11506,22 +11659,13 @@ let sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; }; }; - "@types/node-20.8.0" = { + "@types/node-20.9.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.0"; + version = "20.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.0.tgz"; - sha512 = "LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ=="; - }; - }; - "@types/node-20.8.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "20.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.1.tgz"; - sha512 = "iN6stS2QGMl50pjH0h/dIfmcEUogljAreQZ+cubPw3ISWp5fJrZw9NOh/sDHJfw92A41hCU+Ls5zTIsNYzcnuA=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz"; + sha512 = "nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw=="; }; }; "@types/node-6.14.13" = { @@ -11542,112 +11686,112 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; - "@types/node-fetch-2.6.6" = { + "@types/node-fetch-2.6.9" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.6"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.6.tgz"; - sha512 = "95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA=="; }; }; - "@types/normalize-package-data-2.4.2" = { + "@types/node-forge-1.3.9" = { + name = "_at_types_slash_node-forge"; + packageName = "@types/node-forge"; + version = "1.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.9.tgz"; + sha512 = "meK88cx/sTalPSLSoCzkiUB4VPIFHmxtXm5FaaqRDqBX2i/Sy8bJ4odsan0b20RBjPh06dAQ+OTTdnyQyhJZyQ=="; + }; + }; + "@types/normalize-package-data-2.4.4" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz"; - sha512 = "lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz"; + sha512 = "37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="; }; }; - "@types/parse-json-4.0.0" = { + "@types/parse-json-4.0.2" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz"; + sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="; }; }; - "@types/parse5-5.0.3" = { - name = "_at_types_slash_parse5"; - packageName = "@types/parse5"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"; - sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; - }; - }; - "@types/prop-types-15.7.8" = { + "@types/prop-types-15.7.10" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; - version = "15.7.8"; + version = "15.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz"; - sha512 = "kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ=="; + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz"; + sha512 = "mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A=="; }; }; - "@types/pug-2.0.7" = { + "@types/pug-2.0.9" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; - version = "2.0.7"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.7.tgz"; - sha512 = "I469DU0UXNC1aHepwirWhu9YKg5fkxohZD95Ey/5A7lovC+Siu+MCLffva87lnfThaOrw9Vb1DUN5t55oULAAw=="; + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.9.tgz"; + sha512 = "Yg4LkgFYvn1faISbDNWmcAC1XoDT8IoMUFspp5mnagKk+UvD2N0IWt5A7GRdMubsNWqgCLmrkf8rXkzNqb4szA=="; }; }; - "@types/qs-6.9.8" = { + "@types/qs-6.9.10" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.8"; + version = "6.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz"; - sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz"; + sha512 = "3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw=="; }; }; - "@types/range-parser-1.2.5" = { + "@types/range-parser-1.2.7" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.5"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.5.tgz"; - sha512 = "xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz"; + sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.2.24" = { + "@types/react-18.2.37" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.24"; + version = "18.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz"; - sha512 = "Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz"; + sha512 = "RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw=="; }; }; - "@types/react-dom-18.2.8" = { + "@types/react-dom-18.2.15" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "18.2.8"; + version = "18.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.8.tgz"; - sha512 = "bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz"; + sha512 = "HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg=="; }; }; - "@types/readdir-glob-1.1.2" = { + "@types/readdir-glob-1.1.4" = { name = "_at_types_slash_readdir-glob"; packageName = "@types/readdir-glob"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.2.tgz"; - sha512 = "vwAYrNN/8yhp/FJRU6HUSD0yk6xfoOS8HrZa8ZL7j+X8hJpaC1hTcAiXX2IxaAkkvrz9mLyoEhYZTE3cEYvA9Q=="; + url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.4.tgz"; + sha512 = "uEJsErL2wFCTcbbmJpIuD8OWYNabgv1oaYP2bOkzZXKtk3c6LCYQEKngIqBj2VR2NMv9DOAXSkxSYOWtHxh2gQ=="; }; }; - "@types/responselike-1.0.1" = { + "@types/responselike-1.0.3" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz"; - sha512 = "TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz"; + sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw=="; }; }; "@types/retry-0.12.0" = { @@ -11659,31 +11803,22 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/retry-0.12.3" = { + "@types/retry-0.12.5" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; - version = "0.12.3"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.3.tgz"; - sha512 = "rkxEZUFIyDEZhC6EfHz6Hwos2zXewCOLBzhdgv7D55qu4OAySNwDZzxbaMpFI6XthdBa5oHhR5s6/9MSuTfw4g=="; + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.5.tgz"; + sha512 = "3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw=="; }; }; - "@types/sarif-2.1.5" = { - name = "_at_types_slash_sarif"; - packageName = "@types/sarif"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.5.tgz"; - sha512 = "onJXseJAteCVczKQbO/Tx8zrvhZwZkAd+T7GGYXZvJJ7pzy7We5NJXcNk2oZoUbcnTP/AjkAH7XtPCkpfRBOnQ=="; - }; - }; - "@types/scheduler-0.16.4" = { + "@types/scheduler-0.16.6" = { name = "_at_types_slash_scheduler"; packageName = "@types/scheduler"; - version = "0.16.4"; + version = "0.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz"; - sha512 = "2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ=="; + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz"; + sha512 = "Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA=="; }; }; "@types/seedrandom-3.0.1" = { @@ -11695,58 +11830,67 @@ let sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; }; }; - "@types/semver-7.5.3" = { + "@types/semver-7.5.5" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.5.3"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz"; - sha512 = "OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz"; + sha512 = "+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg=="; }; }; - "@types/send-0.17.2" = { + "@types/send-0.17.4" = { name = "_at_types_slash_send"; packageName = "@types/send"; - version = "0.17.2"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz"; - sha512 = "aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw=="; + url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz"; + sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA=="; }; }; - "@types/serve-index-1.9.2" = { + "@types/serve-index-1.9.4" = { name = "_at_types_slash_serve-index"; packageName = "@types/serve-index"; - version = "1.9.2"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.2.tgz"; - sha512 = "asaEIoc6J+DbBKXtO7p2shWUpKacZOoMBEGBgPG91P8xhO53ohzHWGCs4ScZo5pQMf5ukQzVT9fhX1WzpHihig=="; + url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz"; + sha512 = "qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug=="; }; }; - "@types/serve-static-1.15.3" = { + "@types/serve-static-1.15.5" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.3"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz"; - sha512 = "yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz"; + sha512 = "PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ=="; }; }; - "@types/sizzle-2.3.4" = { + "@types/shimmer-1.0.5" = { + name = "_at_types_slash_shimmer"; + packageName = "@types/shimmer"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz"; + sha512 = "9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww=="; + }; + }; + "@types/sizzle-2.3.6" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.4"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.4.tgz"; - sha512 = "jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.6.tgz"; + sha512 = "m04Om5Gz6kbjUwAQ7XJJQ30OdEFsSmAVsvn4NYwcTRyMVpKKa1aPuESw1n2CxS5fYkOQv3nHgDKeNa8e76fUkw=="; }; }; - "@types/sockjs-0.3.34" = { + "@types/sockjs-0.3.36" = { name = "_at_types_slash_sockjs"; packageName = "@types/sockjs"; - version = "0.3.34"; + version = "0.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.34.tgz"; - sha512 = "R+n7qBFnm/6jinlteC9DBL5dGiDGjWAvjo4viUanpnc/dG1y7uDoacXPIQ/PQEg1fI912SMHIa014ZjRpvDw4g=="; + url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz"; + sha512 = "MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q=="; }; }; "@types/superagent-3.8.2" = { @@ -11758,40 +11902,40 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; - "@types/supports-color-8.1.1" = { + "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; - version = "8.1.1"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw=="; + url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz"; + sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg=="; }; }; - "@types/through-0.0.31" = { + "@types/through-0.0.33" = { name = "_at_types_slash_through"; packageName = "@types/through"; - version = "0.0.31"; + version = "0.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/through/-/through-0.0.31.tgz"; - sha512 = "LpKpmb7FGevYgXnBXYs6HWnmiFyVG07Pt1cnbgM1IhEacITTiUaBXXvOR3Y50ksaJWGSfhbEvQFivQEFGCC55w=="; + url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz"; + sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ=="; }; }; - "@types/tinycolor2-1.4.4" = { + "@types/tinycolor2-1.4.6" = { name = "_at_types_slash_tinycolor2"; packageName = "@types/tinycolor2"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.4.tgz"; - sha512 = "FYK4mlLxUUajo/mblv7EUDHku20qT6ThYNsGZsTHilcHRvIkF8WXqtZO+DVTYkpHWCaAT97LueV59H/5Ve3bGA=="; + url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz"; + sha512 = "iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw=="; }; }; - "@types/triple-beam-1.3.3" = { + "@types/triple-beam-1.3.5" = { name = "_at_types_slash_triple-beam"; packageName = "@types/triple-beam"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz"; - sha512 = "6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g=="; + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz"; + sha512 = "6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw=="; }; }; "@types/tunnel-0.0.3" = { @@ -11803,40 +11947,40 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/unist-2.0.8" = { + "@types/unist-2.0.10" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.8.tgz"; - sha512 = "d0XxK3YTObnWVp6rZuev3c49+j4Lo8g4L1ZRm9z5L0xpoZycUPshHgczK5gsUMaZOstjVYYi09p5gYvUtfChYw=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz"; + sha512 = "IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA=="; }; }; - "@types/unist-3.0.0" = { + "@types/unist-3.0.2" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz"; - sha512 = "MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz"; + sha512 = "dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="; }; }; - "@types/urijs-1.19.20" = { + "@types/urijs-1.19.23" = { name = "_at_types_slash_urijs"; packageName = "@types/urijs"; - version = "1.19.20"; + version = "1.19.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.20.tgz"; - sha512 = "77Mq/2BeHU894J364dUv9tSwxxyCLtcX228Pc8TwZpP5bvOoMns+gZoftp3LYl3FBH8vChpWbuagKGiMki2c1A=="; + url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.23.tgz"; + sha512 = "3Zbk6RzmIpvKTNEHO2RcPOGHM++BQEITMqBRR1Ju32WbruhV/pygYgxiP3xA0b1B88zjzs0Izzjxsbj768+IjA=="; }; }; - "@types/vscode-1.66.0" = { + "@types/vscode-1.75.1" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.66.0"; + version = "1.75.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz"; - sha512 = "ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.75.1.tgz"; + sha512 = "emg7wdsTFzdi+elvoyoA+Q8keEautdQHyY5LNmHVM4PTpY8JgOTVADrGVyXGepJ6dVW2OS5/xnLUWh+nZxvdiA=="; }; }; "@types/websocket-1.0.2" = { @@ -11857,22 +12001,22 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.6" = { + "@types/ws-8.5.9" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.6"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz"; - sha512 = "8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.9.tgz"; + sha512 = "jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg=="; }; }; - "@types/yargs-15.0.16" = { + "@types/yargs-15.0.18" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.16"; + version = "15.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.16.tgz"; - sha512 = "2FeD5qezW3FvLpZ0JpfuaEWepgNLl9b2gQYiz/ce0NhoB1W/D+VZu98phITXkADYerfr/jb7JcDcVhITsc9bwg=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.18.tgz"; + sha512 = "DDi2KmvAnNsT/EvU8jp1UR7pOJojBtJ3GLZ/uw1MUq4VbbESppPWoHUY4h0OB4BbEbGJiyEsmUcuZDZtoR+ZwQ=="; }; }; "@types/yargs-16.0.5" = { @@ -11884,22 +12028,22 @@ let sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-parser-21.0.1" = { + "@types/yargs-parser-21.0.3" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "21.0.1"; + version = "21.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz"; + sha512 = "I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="; }; }; - "@types/yauzl-2.10.1" = { + "@types/yauzl-2.10.3" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; - version = "2.10.1"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz"; - sha512 = "CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw=="; + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz"; + sha512 = "oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="; }; }; "@types/yoga-layout-1.9.2" = { @@ -11911,15 +12055,6 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-5.62.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz"; - sha512 = "TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag=="; - }; - }; "@typescript-eslint/eslint-plugin-6.0.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; @@ -11929,13 +12064,13 @@ let sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; }; }; - "@typescript-eslint/parser-5.62.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.62.0"; + "@typescript-eslint/eslint-plugin-6.10.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz"; - sha512 = "VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz"; + sha512 = "uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg=="; }; }; "@typescript-eslint/parser-6.0.0" = { @@ -11947,13 +12082,13 @@ let sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; }; }; - "@typescript-eslint/scope-manager-5.62.0" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.62.0"; + "@typescript-eslint/parser-6.10.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz"; - sha512 = "VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz"; + sha512 = "+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog=="; }; }; "@typescript-eslint/scope-manager-6.0.0" = { @@ -11965,13 +12100,13 @@ let sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; }; }; - "@typescript-eslint/type-utils-5.62.0" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.62.0"; + "@typescript-eslint/scope-manager-6.10.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz"; - sha512 = "xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz"; + sha512 = "TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg=="; }; }; "@typescript-eslint/type-utils-6.0.0" = { @@ -11983,13 +12118,13 @@ let sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; }; }; - "@typescript-eslint/types-5.62.0" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.62.0"; + "@typescript-eslint/type-utils-6.10.0" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz"; - sha512 = "87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz"; + sha512 = "wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg=="; }; }; "@typescript-eslint/types-6.0.0" = { @@ -12001,13 +12136,13 @@ let sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; }; }; - "@typescript-eslint/typescript-estree-5.62.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.62.0"; + "@typescript-eslint/types-6.10.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz"; - sha512 = "CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz"; + sha512 = "36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg=="; }; }; "@typescript-eslint/typescript-estree-6.0.0" = { @@ -12019,13 +12154,13 @@ let sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; }; }; - "@typescript-eslint/utils-5.62.0" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.62.0"; + "@typescript-eslint/typescript-estree-6.10.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz"; - sha512 = "n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz"; + sha512 = "ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg=="; }; }; "@typescript-eslint/utils-6.0.0" = { @@ -12037,13 +12172,13 @@ let sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; }; }; - "@typescript-eslint/visitor-keys-5.62.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.62.0"; + "@typescript-eslint/utils-6.10.0" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz"; - sha512 = "07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz"; + sha512 = "v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg=="; }; }; "@typescript-eslint/visitor-keys-6.0.0" = { @@ -12055,6 +12190,15 @@ let sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; }; }; + "@typescript-eslint/visitor-keys-6.10.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz"; + sha512 = "xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg=="; + }; + }; "@ungap/structured-clone-1.2.0" = { name = "_at_ungap_slash_structured-clone"; packageName = "@ungap/structured-clone"; @@ -12100,22 +12244,22 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-7.2.1" = { + "@vercel/build-utils-7.2.3" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "7.2.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.1.tgz"; - sha512 = "WCqSBCPNlANEOsmroCzCZq6ZxArV20RHBbdaZzhZjkGtEReSZx5BSOsrnkewFJFuu5pNGYegAaVi0VCkA1irZQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.3.tgz"; + sha512 = "mo1w4SXUN+obQlg9wMTdc9xLJnrfubpreZmOTyK70icOcCEOXP5sKm044/PM2GZrzkWIXYYAfcMxNnOmWQMR0g=="; }; }; - "@vercel/error-utils-2.0.1" = { + "@vercel/error-utils-2.0.2" = { name = "_at_vercel_slash_error-utils"; packageName = "@vercel/error-utils"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.1.tgz"; - sha512 = "ZUVpRFArh5eyKpJmdfEuCaMpZKQvZgUq0pQ7PdK8m5FgRYEvF4I0TMJH3JnkbYaMMUH82aYWZr+/hFJtEBcmTQ=="; + url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.2.tgz"; + sha512 = "Sj0LFafGpYr6pfCqrQ82X6ukRl5qpmVrHM/191kNYFqkkB9YkjlMAj6QcEsvCG259x4QZ7Tya++0AB85NDPbKQ=="; }; }; "@vercel/fun-1.1.0" = { @@ -12136,22 +12280,22 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.6" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.9" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.6"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.6.tgz"; - sha512 = "ne6Xkqm/Naxc6KON3RwhE3irJVevCRwdMp+VMSXgC8ik+q9tWxtmMa4tbdnregKWEk1cw3ToHN6MkXRdcchpYA=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.9.tgz"; + sha512 = "TwGki2MRL4o75ji/4MOjjpfKP6vq87oME/qpBpcWl+CYt/mx3NaWnNwjhEoEkakrZrrHp0Aw9HYBeAksWsjudw=="; }; }; - "@vercel/go-3.0.2" = { + "@vercel/go-3.0.3" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-3.0.2.tgz"; - sha512 = "g1i1X/h6SfIiCj+wVfNPZPqxhoOQbQXDximoGywTgKpRWZD40ReAjYIL4siemsHHX26ihhaJX2eHX8vWyQ57EQ=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-3.0.3.tgz"; + sha512 = "XhrmpsACxNo64ojhscL//Mq+XEfm3VXlx/UIUcHzJJXdvFnz7DEzh1zs0AtdpVgZbYhPQ7rW3GIejaHrIJnN5w=="; }; }; "@vercel/hydrogen-1.0.1" = { @@ -12163,67 +12307,67 @@ let sha512 = "4PYk4LeIWPTjGtgnxvB0Hdw7aqCau843/96K2xX3z9pa0Hn//pUnZBMz2jrs5MRseCm1Li1LdQAK3u8/vaUnVQ=="; }; }; - "@vercel/next-4.0.8" = { + "@vercel/next-4.0.14" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.0.8"; + version = "4.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.8.tgz"; - sha512 = "rKP63aGivXyw6ihNL+P67qxIQ0de5OTzGV5s650GzkF1RwNLs3coy1NSWlspWL3SlaAXwqWJSIQmhcA8EYaSKA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.14.tgz"; + sha512 = "29x93X278ElpbftrSgHvdY9OGVZkHurm3ST/WbdyE/AASEuqwOvShkpAoQl8idlFJFHPjd4c2v5xv1ZVyEb6sg=="; }; }; - "@vercel/nft-0.24.1" = { + "@vercel/nft-0.24.2" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.24.1"; + version = "0.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.24.1.tgz"; - sha512 = "bGYrA/w98LNl9edxXcAezKs+Ixa2a+RkAvxXK38gH3815v+WkNa2AGY+wQv59vu2f9il9+zIKj6YrnlYIbh+jA=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.24.2.tgz"; + sha512 = "KhY3Ky/lCqE+fHpOXiKOLnXYJ49PZh1dyDSfVtZhmYtmica0NQgyO6kPOAGDNWqD9IOBx8hb65upxxjfnfa1JA=="; }; }; - "@vercel/node-3.0.6" = { + "@vercel/node-3.0.9" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.0.6"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.6.tgz"; - sha512 = "QYsmc5rtuyjSAryAo4qRwsEw9NXhapAbF/OBM0Fdq3kPiwHDfbElJpb7UbeQH19u3q4d+E7Z6wZTbO6bsrzw4g=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.9.tgz"; + sha512 = "vDkxXdO6aZQWrvYOZpUtz7WTcpdUn2cgjmqdEztjK3tnXAp988FcCNTivGG/uDUmsQPIQ/XQvUjkBRLlIWTSeA=="; }; }; - "@vercel/python-4.0.2" = { + "@vercel/python-4.1.0" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-4.0.2.tgz"; - sha512 = "mmUeR3GBuDnaJK3IIHRoPl3bNevcWO3N/YrNAx+zxLPSHzfzmCLZbFVVXbzoKBi/cALiOPcApVhlQXwU26y7xg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-4.1.0.tgz"; + sha512 = "EIQXK5zL6fce0Barh74gc7xyLtRyvgmLZDIVQ8yJLtFxPlPCRY3GXkdJ7Jdcw8Pd0uuVF0vIHatv18xSLbcwtg=="; }; }; - "@vercel/redwood-2.0.3" = { + "@vercel/redwood-2.0.5" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.3.tgz"; - sha512 = "efUqJjRxRhB+nw6OpYw3ptQyXAoWKA/qnzz1UKWfcL2yunCDrdvh2IL3O+Kjt2YqixJAH6DTK1B8lc6NhMoY/g=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.5.tgz"; + sha512 = "9iWTxfMkC7yNnwN2xxOdptiIDAgXe1V1fh3aw92MWt5PBRcFY9RqgIPF7Q3Qa7yzQFgpbHwCnSTqWO+HCEuFtw=="; }; }; - "@vercel/remix-builder-2.0.8" = { + "@vercel/remix-builder-2.0.11" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.0.8"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.8.tgz"; - sha512 = "PQA4Iu47qKOEyOa0WqS3u9lSnVEGfq/9ZVY6+IlZfR1+bmCVx7c2PW7BOSBucwhn1qMD6TF2kka0fz48UXpVXQ=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.11.tgz"; + sha512 = "blp+PPXFZ4KWLHrh0PZfR9Er/yOQAzPJLbmvJtfJIBnes8SVmIWB89xl+P89HVruknK+FNvCotEFCU41DUjoWw=="; }; }; - "@vercel/routing-utils-3.0.0" = { + "@vercel/routing-utils-3.1.0" = { name = "_at_vercel_slash_routing-utils"; packageName = "@vercel/routing-utils"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-3.0.0.tgz"; - sha512 = "u+SoHnL+RzRQIRP+YxvigzzKXQcbgYQF9qCTIuWuoLw5h9thIYWcDJvz3KxrUzxjGZ3dWboXA29KAlT6eeaeFw=="; + url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-3.1.0.tgz"; + sha512 = "Ci5xTjVTJY/JLZXpCXpLehMft97i9fH34nu9PGav6DtwkVUF6TOPX86U0W0niQjMZ5n6/ZP0BwcJK2LOozKaGw=="; }; }; "@vercel/ruby-2.0.2" = { @@ -12235,13 +12379,13 @@ let sha512 = "MqFynhtZ905L210DWAbgkiEQEK39LTtp9eL2Nm6PjzhjNzU6hV0UfK8Z24vU9CC6J4mrUTTZx396fH7XTYJWqg=="; }; }; - "@vercel/static-build-2.0.7" = { + "@vercel/static-build-2.0.10" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.0.7"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.7.tgz"; - sha512 = "MjEgxf9HaK7tjVqS/bSlVSGBxFw3hNHdrVEoGJNwMZEfocgBiFxFGaw0Vxki8FTs+F3cciXdxwi6+O1bjj91GA=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.10.tgz"; + sha512 = "H3YM60+Jx/X9YbHrPaQYflJiSC5fQu9R39j+njIAQAQHiitiqFAnFEzQfOXSp52csb0uJ9XacL94vjzQ/T2S5w=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12334,22 +12478,22 @@ let sha512 = "NwqBBruD1DvVmFVyPinOuuMGqpSroVTnl1R1vOnhbKquButOj+0b2k43Gn1fz/Uqe9hijLCxMEtMIIcW38ny8w=="; }; }; - "@volar/kit-1.10.1" = { + "@volar/kit-1.10.10" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-1.10.1.tgz"; - sha512 = "+aR3rvgER14VfjFflhD6k161uLdshpuK1tQUrnl8phpKtSGJDXHkTl/WkNk2xCEuE4goShS9nTvruTyrI9gGBw=="; + url = "https://registry.npmjs.org/@volar/kit/-/kit-1.10.10.tgz"; + sha512 = "V2SyUPCPUhueqH8j5t48LJ0QsjExGSXzTv/XOdkUHV7hJ/ekyRGFqKxcfBtMq/nK6Tgu2G1ba+6u0d7e6wKcQw=="; }; }; - "@volar/language-core-1.10.1" = { + "@volar/language-core-1.10.10" = { name = "_at_volar_slash_language-core"; packageName = "@volar/language-core"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.1.tgz"; - sha512 = "JnsM1mIPdfGPxmoOcK1c7HYAsL6YOv0TCJ4aW3AXPZN/Jb4R77epDyMZIVudSGjWMbvv/JfUa+rQ+dGKTmgwBA=="; + url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.10.tgz"; + sha512 = "nsV1o3AZ5n5jaEAObrS3MWLBWaGwUj/vAsc15FVNIv+DbpizQRISg9wzygsHBr56ELRH8r4K75vkYNMtsSNNWw=="; }; }; "@volar/language-core-1.4.1" = { @@ -12361,13 +12505,13 @@ let sha512 = "EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ=="; }; }; - "@volar/language-server-1.10.1" = { + "@volar/language-server-1.10.10" = { name = "_at_volar_slash_language-server"; packageName = "@volar/language-server"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.10.1.tgz"; - sha512 = "UXgRMAPKoy4EZBcBT1SFp8YIb5AJqe7Is1/TnqRUq0LBBV2M7HpEeHHI8E4fy05Eg4TlSVRcrlZtiTrY9fRjJg=="; + url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.10.10.tgz"; + sha512 = "F2PRBU+CRjT7L9qe8bjof/uz/LbAXVmgwNU2gOSX2y1bUl3E8DHmD0dB6pwIVublvkx+Ivg/0r3Z6oyxfPPruQ=="; }; }; "@volar/language-server-1.4.1" = { @@ -12379,13 +12523,13 @@ let sha512 = "UxhiN205o8ZfTnMNhRPCtW+ncrBtqZMd+f08Xf99Je4WB+SYyv3VNnIZEQDXfaTXR6mLUgQ1mDwPsUOLKKGY8A=="; }; }; - "@volar/language-service-1.10.1" = { + "@volar/language-service-1.10.10" = { name = "_at_volar_slash_language-service"; packageName = "@volar/language-service"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.10.1.tgz"; - sha512 = "9AfMd8DeBuiw5twyXCL4Dw/9dg7djs2GAMQ5YY6LlN4v6u5IwU+foM/un5F7yzE94v2cuI+NN9LtHeR87AXpRA=="; + url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.10.10.tgz"; + sha512 = "P4fiPWDI6fLGO6BghlksCVHs1nr9gvWAMDyma3Bca4aowxXusxjUVTsnJq0EVorIN5uIr1Xel4B/tNdXt/IKyw=="; }; }; "@volar/language-service-1.4.1" = { @@ -12397,13 +12541,13 @@ let sha512 = "F30uT+xk20ZYpxRwNW9xBEoErSqd9zNW7iuFwSIX9bYO/12RLjB2I+vgM/GdPZnzZ37imXa76ykwqTRXrafigQ=="; }; }; - "@volar/source-map-1.10.1" = { + "@volar/source-map-1.10.10" = { name = "_at_volar_slash_source-map"; packageName = "@volar/source-map"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.1.tgz"; - sha512 = "3/S6KQbqa7pGC8CxPrg69qHLpOvkiPHGJtWPkI/1AXCsktkJ6gIk/5z4hyuMp8Anvs6eS/Kvp/GZa3ut3votKA=="; + url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.10.tgz"; + sha512 = "GVKjLnifV4voJ9F0vhP56p4+F3WGf+gXlRtjFZsv6v3WxBTWU3ZVeaRaEHJmWrcv5LXmoYYpk/SC25BKemPRkg=="; }; }; "@volar/source-map-1.4.1" = { @@ -12415,13 +12559,13 @@ let sha512 = "bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA=="; }; }; - "@volar/typescript-1.10.1" = { + "@volar/typescript-1.10.10" = { name = "_at_volar_slash_typescript"; packageName = "@volar/typescript"; - version = "1.10.1"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.1.tgz"; - sha512 = "+iiO9yUSRHIYjlteT+QcdRq8b44qH19/eiUZtjNtuh6D9ailYM7DVR0zO2sEgJlvCaunw/CF9Ov2KooQBpR4VQ=="; + url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.10.tgz"; + sha512 = "4a2r5bdUub2m+mYVnLu2wt59fuoYWe7nf0uXtGHU8QQ5LDNfzAR0wK7NgDiQ9rcl2WT3fxT2AA9AylAwFtj50A=="; }; }; "@volar/vue-language-core-1.6.5" = { @@ -12478,13 +12622,22 @@ let sha512 = "JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg=="; }; }; - "@vscode/test-electron-2.3.4" = { + "@vscode/test-electron-2.3.6" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.3.4"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.4.tgz"; - sha512 = "eWzIqXMhvlcoXfEFNWrVu/yYT5w6De+WZXR/bafUQhAp8+8GkQo95Oe14phwiRUPv8L+geAKl/QM2+PoT3YW3g=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.6.tgz"; + sha512 = "M31xGH0RgqNU6CZ4/9g39oUMJ99nLzfjA+4UbtIQ6TcXQ6+2qkjOOxedmPBDDCg26/3Al5ubjY80hIoaMwKYSw=="; + }; + }; + "@vscode/vsce-2.22.0" = { + name = "_at_vscode_slash_vsce"; + packageName = "@vscode/vsce"; + version = "2.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.22.0.tgz"; + sha512 = "8df4uJiM3C6GZ2Sx/KilSKVxsetrTBBIUb3c0W4B1EWHcddioVs5mkyDKtMNP0khP/xBILVSzlXxhV+nm2rC9A=="; }; }; "@vue/cli-shared-utils-5.0.8" = { @@ -12523,76 +12676,76 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.3.4" = { + "@vue/compiler-core-3.3.8" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz"; - sha512 = "cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz"; + sha512 = "hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g=="; }; }; - "@vue/compiler-dom-3.3.4" = { + "@vue/compiler-dom-3.3.8" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz"; - sha512 = "wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz"; + sha512 = "+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ=="; }; }; - "@vue/compiler-sfc-2.7.14" = { + "@vue/compiler-sfc-2.7.15" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.14"; + version = "2.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; - sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.15.tgz"; + sha512 = "FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg=="; }; }; - "@vue/compiler-sfc-3.3.4" = { + "@vue/compiler-sfc-3.3.8" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz"; - sha512 = "6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz"; + sha512 = "WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA=="; }; }; - "@vue/compiler-ssr-3.3.4" = { + "@vue/compiler-ssr-3.3.8" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz"; - sha512 = "m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz"; + sha512 = "hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w=="; }; }; - "@vue/reactivity-3.3.4" = { + "@vue/reactivity-3.3.8" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz"; - sha512 = "kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.8.tgz"; + sha512 = "ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw=="; }; }; - "@vue/reactivity-transform-3.3.4" = { + "@vue/reactivity-transform-3.3.8" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz"; - sha512 = "MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz"; + sha512 = "49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw=="; }; }; - "@vue/shared-3.3.4" = { + "@vue/shared-3.3.8" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.3.4"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz"; - sha512 = "7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz"; + sha512 = "8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -13063,22 +13216,22 @@ let sha512 = "AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w=="; }; }; - "@whatwg-node/fetch-0.9.13" = { + "@whatwg-node/fetch-0.9.14" = { name = "_at_whatwg-node_slash_fetch"; packageName = "@whatwg-node/fetch"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.13.tgz"; - sha512 = "PPtMwhjtS96XROnSpowCQM85gCUG2m7AXZFw0PZlGbhzx2GK7f2iOXilfgIJ0uSlCuuGbOIzfouISkA7C4FJOw=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.14.tgz"; + sha512 = "wurZC82zzZwXRDSW0OS9l141DynaJQh7Yt0FD1xZ8niX7/Et/7RoiLiltbVU1fSF1RR9z6ndEaTUQBAmddTm1w=="; }; }; - "@whatwg-node/node-fetch-0.4.19" = { + "@whatwg-node/node-fetch-0.5.0" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.4.19"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.19.tgz"; - sha512 = "AW7/m2AuweAoSXmESrYQr/KBafueScNbn2iNO0u6xFr2JZdPmYsSm5yvAXYk6yDLv+eDmSSKrf7JnFZ0CsJIdA=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.0.tgz"; + sha512 = "q76lDAafvHNGWedNAVHrz/EyYTS8qwRLcwne8SJQdRN5P3HydxU6XROFvJfTML6KZXQX2FDdGY4/SnaNyd7M0Q=="; }; }; "@xmldom/xmldom-0.7.13" = { @@ -13432,78 +13585,6 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-12.0.2" = { - name = "_at_zwave-js_slash_cc"; - packageName = "@zwave-js/cc"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.0.2.tgz"; - sha512 = "jpdLyNcdozlACzHU9MXWHn7wBFM28thwZtdbh4pCyigTH+s8G9csZo8jU4tQHhocGZMY/votrqObyqbgL/Jneg=="; - }; - }; - "@zwave-js/config-12.0.2" = { - name = "_at_zwave-js_slash_config"; - packageName = "@zwave-js/config"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.0.2.tgz"; - sha512 = "9PXR4wa+/2vC2ltLM0fWwypr7GaXao3RQXM1KEb2oyFCvNnCIsjUmmnJiguuRr+7oqhHvgvq5bfyGegd177a3A=="; - }; - }; - "@zwave-js/core-12.0.2" = { - name = "_at_zwave-js_slash_core"; - packageName = "@zwave-js/core"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.0.2.tgz"; - sha512 = "Dqq9yZYWffMIaEGV5ycA5u6HJSXCxTnVGqe7p933zHw8KhKxiab/2zcD7cX2HAyJtPgRbRFH8vs7qy4Qx0P+8Q=="; - }; - }; - "@zwave-js/host-12.0.2" = { - name = "_at_zwave-js_slash_host"; - packageName = "@zwave-js/host"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.0.2.tgz"; - sha512 = "TEzRG5HvYonDK/6cX3DLbaHiU523Du3uQ8DfUNM8zFV0ocDLmjh3g4zWRd0LTngqFAB9+K1SnOjrleaNm/SYzQ=="; - }; - }; - "@zwave-js/nvmedit-12.0.2" = { - name = "_at_zwave-js_slash_nvmedit"; - packageName = "@zwave-js/nvmedit"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.0.2.tgz"; - sha512 = "Rk790S0yeE2YukTX4XLrfGYS4j845WYIKg3sQXEkjm/AjRLlCxEvpp0T1d7HqYBBIuQCG50DVMYWmnnp1WsmFg=="; - }; - }; - "@zwave-js/serial-12.0.2" = { - name = "_at_zwave-js_slash_serial"; - packageName = "@zwave-js/serial"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.0.2.tgz"; - sha512 = "g9Lr870CEzmh1JaSC8Jy2E4F31bLEf2aT7tkutVGQtgoyUxYg7W9p1PdmOSBRIuBJxLXru88NczfSLzIPtlRWg=="; - }; - }; - "@zwave-js/shared-12.0.0" = { - name = "_at_zwave-js_slash_shared"; - packageName = "@zwave-js/shared"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-12.0.0.tgz"; - sha512 = "baypO1WxHJXbGR5BUyM0ibV6iU/S2etKKKY+UR0S1tT45jzC/Jqx9rn3XN/lDZrd+tn66ViZ4twKeLx85skt3Q=="; - }; - }; - "@zwave-js/testing-12.0.2" = { - name = "_at_zwave-js_slash_testing"; - packageName = "@zwave-js/testing"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.0.2.tgz"; - sha512 = "srJf8zOXQ39yM94Zl3BxIgVDLSbgGcC744b7Ika/PaM/q75Y+1i8fbO/qSYygSVN9XvazgdqBzv3s5ZbrhAA3Q=="; - }; - }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -13540,6 +13621,15 @@ let sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; + "JSONStream-1.5.0" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@search-dump/jsonstream/-/jsonstream-1.5.0.tgz"; + sha512 = "/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw=="; + }; + }; "JSV-4.0.2" = { name = "JSV"; packageName = "JSV"; @@ -13675,13 +13765,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.10.0" = { + "acorn-8.11.2" = { name = "acorn"; packageName = "acorn"; - version = "8.10.0"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"; - sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz"; + sha512 = "nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="; }; }; "acorn-8.8.2" = { @@ -13783,6 +13873,15 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; + "acorn-walk-8.3.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz"; + sha512 = "FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA=="; + }; + }; "add-stream-1.0.0" = { name = "add-stream"; packageName = "add-stream"; @@ -13900,6 +13999,15 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; + "aggregate-error-5.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-5.0.0.tgz"; + sha512 = "gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw=="; + }; + }; "airplay-js-0.3.0" = { name = "airplay-js"; packageName = "airplay-js"; @@ -14026,22 +14134,13 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "alcalzone-shared-4.0.8" = { - name = "alcalzone-shared"; - packageName = "alcalzone-shared"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-4.0.8.tgz"; - sha512 = "Rr0efCjNL9lw7miDvU8exL87Y42ehsLU2jUGNQUphhnlvxnTMrHeApWgoOSGZvsE2PhxC3KO7Z+VpQ/IbuV3aA=="; - }; - }; - "alex-9.1.1" = { + "alex-11.0.1" = { name = "alex"; packageName = "alex"; - version = "9.1.1"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-9.1.1.tgz"; - sha512 = "2mYyFfQnzWzDd6lSACRePBj8YP6fzzvclPkfGfYrY6vPNFDoQKrCAAdF0XCKROGJGnbSWX1K5PrxixVTaV5ODw=="; + url = "https://registry.npmjs.org/alex/-/alex-11.0.1.tgz"; + sha512 = "rKLBZxD/lvuykdC6XB8ma9YjDl46j9ayHROZUtC1yJ2jlGpoP7RZR1tBBSjtlr260ixIW6iCkqAnHzmti5Q6CQ=="; }; }; "align-text-0.1.4" = { @@ -14053,13 +14152,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.748" = { + "all-package-names-2.0.773" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.748"; + version = "2.0.773"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.748.tgz"; - sha512 = "/aaO1fGUeOqYYDV6bN6u1Pd3vgk3w8nVxYNzXAkkTTai61lwBhwb6j0XDNrd8rUjibLcJCn21fXgGYLPTClnzw=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.773.tgz"; + sha512 = "ub74H8f5oeGhTMCl5fueOGG0uIamGvFpYuu2ADZdV26tpXNV1xm6G/05ffpYa5UF2FvVFdo5VnTJqnD6e9G4MQ=="; }; }; "amdefine-1.0.1" = { @@ -14548,13 +14647,13 @@ let sha512 = "zy9cHePtMP0YhwG+CfHm0bgwdnga2X3gZexpdCwEj//dpb+TKajtiC8REEUJUSq6Ab4f9cgNy2l8ObXzCXFkEw=="; }; }; - "applicationinsights-2.3.6" = { + "applicationinsights-2.7.3" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "2.3.6"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.3.6.tgz"; - sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.7.3.tgz"; + sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw=="; }; }; "applicationinsights-native-metrics-0.0.10" = { @@ -14611,15 +14710,6 @@ let sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="; }; }; - "archiver-5.3.1" = { - name = "archiver"; - packageName = "archiver"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz"; - sha512 = "8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w=="; - }; - }; "archiver-5.3.2" = { name = "archiver"; packageName = "archiver"; @@ -15385,13 +15475,13 @@ let sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-3.2.4" = { + "async-3.2.5" = { name = "async"; packageName = "async"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + url = "https://registry.npmjs.org/async/-/async-3.2.5.tgz"; + sha512 = "baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="; }; }; "async-done-1.3.2" = { @@ -15556,15 +15646,6 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "atomically-1.7.0" = { - name = "atomically"; - packageName = "atomically"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz"; - sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; - }; - }; "atomically-2.0.2" = { name = "atomically"; packageName = "atomically"; @@ -15637,13 +15718,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.18.0" = { + "aws-crt-1.19.0" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.0.tgz"; - sha512 = "H5Vrb/GMzq72+Of2zrW69i/BTQ4gQd3MQvdZ3X3okfppzHdEjSPkdJN6ia8V2/1J1FmFvEtoxaY4nwraHUGQvg=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.19.0.tgz"; + sha512 = "pBRSpy4TsL/fxW7Lp1xpN1FhnxvtBXFYx3Njo/j/m8GSV3Ytq/mBetYq7vhDb7CJQmFJCWod9I0yShqjiSUuyQ=="; }; }; "aws-sdk-2.1340.0" = { @@ -15655,22 +15736,22 @@ let sha512 = "5amtFHWmJz+x0mKcwKJUBm2nKOJjO0MzzuVhrHFnmDWsUqP1VUsTxENoRdGitwoCH/o+MttLmf1/+lvgkYzbiw=="; }; }; - "aws-sdk-2.1357.0" = { + "aws-sdk-2.1472.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1357.0"; + version = "2.1472.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1357.0.tgz"; - sha512 = "bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1472.0.tgz"; + sha512 = "U7kAHRbvTy753IXKV8Oom/AqlqnsbXG+Kw5gRbKi6VcsZ3hR/EpNMzdRXTWO5U415bnLWGo8WAqIz67PIaaKsw=="; }; }; - "aws-sdk-2.1468.0" = { + "aws-sdk-2.1492.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1468.0"; + version = "2.1492.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1468.0.tgz"; - sha512 = "1DAa0UA779M0VyKKPjTPDtox4KOyFrHnGDLbJrDKzqylC+O0DMR4kh9Oy2vfErhwFwsiPUvWgkknddVS+igVGA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1492.0.tgz"; + sha512 = "3q17ruBkwb3pL87CHSbRlYiwx1LCq7D7hIjHgZ/5SPeKknkXgkHnD20SD2lC8Nj3xGbpIUhoKXcpDAGgIM5DBA=="; }; }; "aws-sign2-0.7.0" = { @@ -15718,15 +15799,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { - name = "axios"; - packageName = "axios"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - }; "axios-0.25.0" = { name = "axios"; packageName = "axios"; @@ -15754,13 +15826,13 @@ let sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; }; - "axios-1.5.1" = { + "axios-1.6.1" = { name = "axios"; packageName = "axios"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"; - sha512 = "Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A=="; + url = "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz"; + sha512 = "vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g=="; }; }; "axobject-query-3.2.1" = { @@ -15835,31 +15907,31 @@ let sha512 = "MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA=="; }; }; - "babel-plugin-polyfill-corejs2-0.4.5" = { + "babel-plugin-polyfill-corejs2-0.4.6" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz"; - sha512 = "19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz"; + sha512 = "jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q=="; }; }; - "babel-plugin-polyfill-corejs3-0.8.4" = { + "babel-plugin-polyfill-corejs3-0.8.6" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.8.4"; + version = "0.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz"; - sha512 = "9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz"; + sha512 = "leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ=="; }; }; - "babel-plugin-polyfill-regenerator-0.5.2" = { + "babel-plugin-polyfill-regenerator-0.5.3" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz"; - sha512 = "tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz"; + sha512 = "8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw=="; }; }; "babel-plugin-react-native-web-0.18.12" = { @@ -15943,15 +16015,6 @@ let sha512 = "gX8v+l+BTue2lmmqD/yQiR6JUUY+5OWNZTI1qyusViqC9R2iv4YFPqT23IcJfpYqlYb3DOiwunfVjKLickdQ6g=="; }; }; - "backslash-0.2.0" = { - name = "backslash"; - packageName = "backslash"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/backslash/-/backslash-0.2.0.tgz"; - sha512 = "Avs+8FUZ1HF/VFP4YWwHQZSGzRPm37ukU1JQYQWijuHhtXdOuAzcZ8PcAzfIw898a8PyBzdn+RtnKA6MzW0X2A=="; - }; - }; "bail-1.0.5" = { name = "bail"; packageName = "bail"; @@ -16087,13 +16150,13 @@ let sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="; }; }; - "bash-language-server-4.10.3" = { + "bash-language-server-5.0.0" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.10.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.10.3.tgz"; - sha512 = "5Ej3637jhQd5HJO3ZNGnVmeeGPprCcdkjL+QpkWeJXmns31aKedAHSEQfKjKAFqcUQ4JwMyXRXnHzut4jKbofg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.0.0.tgz"; + sha512 = "1S5PMQO4PwXDIiPHUE6dYd8vZF1NZqb3i4Astd7UXD4lSWnSo71MqSmTpTs/dTYcvo2/9z2IymbNPPyn/VuM2w=="; }; }; "basic-auth-2.0.1" = { @@ -16816,15 +16879,6 @@ let sha512 = "yL8sYzt0avlYGOY6LqtECkGrJOY3cCLAbFPaNfgE+4fD45ZrdYqLdY8yF4bqyTkpfW9e6W0YqBkN7dIn/PrZoA=="; }; }; - "boxen-4.2.0" = { - name = "boxen"; - packageName = "boxen"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; - sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; - }; - }; "boxen-5.1.2" = { name = "boxen"; packageName = "boxen"; @@ -17095,13 +17149,13 @@ let sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; - "browserify-sign-4.2.1" = { + "browserify-sign-4.2.2" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; + sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; }; }; "browserify-zlib-0.2.0" = { @@ -17392,6 +17446,15 @@ let sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; }; }; + "bufferutil-4.0.8" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz"; + sha512 = "4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw=="; + }; + }; "bufio-1.0.7" = { name = "bufio"; packageName = "bufio"; @@ -17572,6 +17635,15 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; + "cacache-16.1.3" = { + name = "cacache"; + packageName = "cacache"; + version = "16.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz"; + sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; + }; + }; "cacache-17.1.4" = { name = "cacache"; packageName = "cacache"; @@ -17581,6 +17653,15 @@ let sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; }; }; + "cacache-18.0.0" = { + name = "cacache"; + packageName = "cacache"; + version = "18.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.0.tgz"; + sha512 = "I7mVOPl3PUCeRub1U8YoGz2Lqv9WOBpobZ8RyWFXmReuILz+3OAyTa5oH3QPdtKZD7N0Yk00aLfzn0qvp8dZ1w=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -17617,13 +17698,13 @@ let sha512 = "+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="; }; }; - "cacheable-request-10.2.13" = { + "cacheable-request-10.2.14" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "10.2.13"; + version = "10.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.13.tgz"; - sha512 = "3SD4rrMu1msNGEtNSt8Od6enwdo//U9s4ykmXfA2TD58kcLkCobtCDiby7kNyj7a/Q7lz/mAesAFI54rTdnvBA=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz"; + sha512 = "zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ=="; }; }; "cacheable-request-2.1.4" = { @@ -17680,13 +17761,13 @@ let sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA=="; }; }; - "call-bind-1.0.2" = { + "call-bind-1.0.5" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; + sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; }; }; "call-me-maybe-1.0.2" = { @@ -17932,13 +18013,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001542" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001542"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001542.tgz"; - sha512 = "UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "canvas-2.11.2" = { @@ -18067,31 +18148,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.66.1" = { + "cdk8s-2.68.2" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.66.1"; + version = "2.68.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.66.1.tgz"; - sha512 = "lm4eASTSRigaj9dYlSCG/F+O8O5/nLH5IEl3j+IxirPb9Y46nwIdx3JD7l+xwprCSgWQXfUJTxizOS0Gm1uE8g=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.2.tgz"; + sha512 = "95DmLwUW0dv+2RK7J/IdYqgRWDNVV9YN6dZaPIjbzoE0Y1D4HIGe51oCJpaa1bYAMba7v+sippd2pLxA7dxdIA=="; }; }; - "cdk8s-plus-25-2.22.24" = { + "cdk8s-plus-25-2.22.54" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.24"; + version = "2.22.54"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.24.tgz"; - sha512 = "HmRWcN70uf9AXD4dyWG4CfyhecY/puGkoJIQ4qmVWmGJEj2lZzAr2SP1QAe5SGrfqE2zjDKH7ghFKO7c/0rBzA=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.54.tgz"; + sha512 = "ZYeuv3aw5E/SviEP1r49H0CauzacJAkSj3f9InMmI0PlMJNNDrXxly6OxnNxP+hnUXCRMo+YjZMr+tBz4SjaNA=="; }; }; - "cdktf-0.18.0" = { + "cdktf-0.19.1" = { name = "cdktf"; packageName = "cdktf"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.18.0.tgz"; - sha512 = "iTWy2g0mCE2YW2hPxdWEzMwCVgyzDyheHWJTS4OcLZsR+lXETFX0lonoc5XGnX8CHBL4AbFY+EEqCUs5v7A4bQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.19.1.tgz"; + sha512 = "scZhp2+FEgNUd+l5vaDCHABdwFApB1Lcknn2+dUw8aYwNsMoYT0tWs4AzPg22Z4jQFOIQLIXmBxifhr+RahdRg=="; }; }; "center-align-0.1.3" = { @@ -18238,15 +18319,6 @@ let sha512 = "shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="; }; }; - "character-entities-html4-1.1.4" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz"; - sha512 = "HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g=="; - }; - }; "character-entities-html4-2.1.0" = { name = "character-entities-html4"; packageName = "character-entities-html4"; @@ -18589,13 +18661,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.8.0" = { + "ci-info-3.9.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz"; - sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz"; + sha512 = "NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ=="; }; }; "cipher-base-1.0.4" = { @@ -18616,6 +18688,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "cjs-module-lexer-1.2.3" = { + name = "cjs-module-lexer"; + packageName = "cjs-module-lexer"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz"; + sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="; + }; + }; "clap-1.2.3" = { name = "clap"; packageName = "clap"; @@ -18706,6 +18787,15 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; + "clean-stack-5.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-5.2.0.tgz"; + sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ=="; + }; + }; "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; @@ -18940,6 +19030,15 @@ let sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; }; }; + "cli-truncate-4.0.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz"; + sha512 = "nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -19030,6 +19129,15 @@ let sha512 = "Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg=="; }; }; + "clipboardy-4.0.0" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-4.0.0.tgz"; + sha512 = "5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w=="; + }; + }; "cliss-0.0.2" = { name = "cliss"; packageName = "cliss"; @@ -19057,6 +19165,15 @@ let sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w=="; }; }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -19363,13 +19480,13 @@ let sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw=="; }; }; - "codemaker-1.89.0" = { + "codemaker-1.91.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.89.0.tgz"; - sha512 = "Jh9ZrMxzX+jbzNvuHNlmEjXUYMSGVNW151SV2aOXU01V3bMjaSP+exfHFsYQ66x/zGEWcjh33pAu2rY44hyYIQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.91.0.tgz"; + sha512 = "yI9ibYUBdJDI8n5Vffd4kfg7mSy6Fes2FHq3/TrZtqhL5CJcXvI8Lltl6iTWM5f1JkeIeAMQOC45PjscBhWyZg=="; }; }; "coffeescript-2.7.0" = { @@ -19381,15 +19498,6 @@ let sha512 = "hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A=="; }; }; - "collapse-white-space-1.0.6" = { - name = "collapse-white-space"; - packageName = "collapse-white-space"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; - sha512 = "jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="; - }; - }; "collection-map-1.0.0" = { name = "collection-map"; packageName = "collection-map"; @@ -19651,13 +19759,13 @@ let sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; }; }; - "commander-11.0.0" = { + "commander-11.1.0" = { name = "commander"; packageName = "commander"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz"; - sha512 = "9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ=="; + url = "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz"; + sha512 = "yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="; }; }; "commander-2.11.0" = { @@ -20038,15 +20146,6 @@ let sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; }; }; - "conf-7.1.2" = { - name = "conf"; - packageName = "conf"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz"; - sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg=="; - }; - }; "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; @@ -20236,13 +20335,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.2.70" = { + "constructs-10.3.0" = { name = "constructs"; packageName = "constructs"; - version = "10.2.70"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.2.70.tgz"; - sha512 = "z6zr1E8K/9tzJbCQzY0UGX0/oVKPFKu9C/mzEnghCG6TAJINnvlq0CMKm63XqqeMleadZYm5T3sZGJKcxJS/Pg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.3.0.tgz"; + sha512 = "vbK8i3rIb/xwZxSpTjz3SagHn1qq9BChLEfy5Hf6fB3/2eFbrwt2n9kHwQcS0CPTRBesreeAcsJfMq2229FnbQ=="; }; }; "consume-http-header-1.0.0" = { @@ -20372,15 +20471,6 @@ let sha512 = "hQSojc/5imn1GJK3A75m9hEZZhc3urojA5gMpnar4JHmgLnuM3CUIARPpEk86glEKr3c54Po3WV/vCaO/U8g3Q=="; }; }; - "conventional-changelog-conventionalcommits-6.1.0" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz"; - sha512 = "3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw=="; - }; - }; "conventional-changelog-conventionalcommits-7.0.2" = { name = "conventional-changelog-conventionalcommits"; packageName = "conventional-changelog-conventionalcommits"; @@ -20714,22 +20804,22 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.33.0" = { + "core-js-3.33.2" = { name = "core-js"; packageName = "core-js"; - version = "3.33.0"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz"; - sha512 = "HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz"; + sha512 = "XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ=="; }; }; - "core-js-compat-3.33.0" = { + "core-js-compat-3.33.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.0"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz"; - sha512 = "0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz"; + sha512 = "axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw=="; }; }; "core-util-is-1.0.2" = { @@ -20822,13 +20912,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-4.4.0" = { + "cosmiconfig-typescript-loader-5.0.0" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz"; - sha512 = "BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-5.0.0.tgz"; + sha512 = "+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA=="; }; }; "cp-file-10.0.0" = { @@ -20912,13 +21002,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-3.12.0" = { + "create-gatsby-3.12.3" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "3.12.0"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.12.0.tgz"; - sha512 = "cAWZ6046W0kUDAVRwpAEYlHTUAZApN5xmuq24JMDQPO5Qzn1eWe7s2LZ8V3isWOMOHXHKMMVm83NtJYIHql80g=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.12.3.tgz"; + sha512 = "N0K/Z/MD5LMRJcBy669WpSgrn+31zBV72Lv0RHolX0fXa77Yx58HsEiLWz83j/dtciGMQfEOEHFRetUqZhOggA=="; }; }; "create-graphback-1.0.1" = { @@ -20993,15 +21083,6 @@ let sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="; }; }; - "cross-env-7.0.3" = { - name = "cross-env"; - packageName = "cross-env"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"; - sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; - }; - }; "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -21038,6 +21119,15 @@ let sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; }; }; + "cross-inspect-1.0.0" = { + name = "cross-inspect"; + packageName = "cross-inspect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.0.tgz"; + sha512 = "4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ=="; + }; + }; "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -21101,13 +21191,13 @@ let sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; - "crypto-js-4.1.1" = { + "crypto-js-4.2.0" = { name = "crypto-js"; packageName = "crypto-js"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz"; + sha512 = "KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="; }; }; "crypto-random-string-1.0.0" = { @@ -21146,22 +21236,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-7.3.7" = { + "cspell-dictionary-8.0.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-7.3.7.tgz"; - sha512 = "mJ0h2BGxYEqb/1FxKD50WuufKhDaCaIk8pwZQryqazXQCvoTpla0yud3KO61Cke92za8z37Rfb+5xATlywEfaw=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.0.0.tgz"; + sha512 = "R/AzUj7W7F4O4fAOL8jvIiUqPYGy6jIBlDkxO9SZe/A6D2kOICZZzGSXMZ0M7OKYqxc6cioQUMKOJsLkDXfDXw=="; }; }; - "cspell-gitignore-7.3.7" = { + "cspell-gitignore-8.0.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-7.3.7.tgz"; - sha512 = "nP4Gg+zq5y0njzhiNYTLvaJIMAponBhJoTMzkXCOOKYEHJmiRQocfa3gO4t2s8iZ4YVhscbrB2h+dYvo3MLQqg=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.0.0.tgz"; + sha512 = "Uv+ENdUm+EXwQuG9187lKmE1t8b2KW+6VaQHP7r01WiuhkwhfzmWA7C30iXVcwRcsMw07wKiWvMEtG6Zlzi6lQ=="; }; }; "cspell-glob-0.1.25" = { @@ -21173,22 +21263,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-7.3.7" = { + "cspell-glob-8.0.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-7.3.7.tgz"; - sha512 = "DJX5wJ5dhcNzyycukZst+WtbIdpCLTL7DaKS0EKW/57QjzMwwMBgpsF89ufnreGHB8dHrPF85epF9qyOI1SRNg=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.0.0.tgz"; + sha512 = "wOkRA1OTIPhyN7a+k9Qq45yFXM+tBFi9DS5ObiLv6t6VTBIeMQpwRK0KLViHmjTgiA6eWx53Dnr+DZfxcAkcZA=="; }; }; - "cspell-grammar-7.3.7" = { + "cspell-grammar-8.0.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-7.3.7.tgz"; - sha512 = "4cyJ4Alq/wBGTctH7fNTbY9EZCihm11fbrGSYVe8w+msRNx6W8rugsMX009aHiw9zlvGrMAeTD08YFPnBVdfpA=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.0.0.tgz"; + sha512 = "uxpRvbBxOih6SjFQvKTBPTA+YyqYM5UFTNTFuRnA6g6WZeg+NJaTkbQrTgXja4B2r8MJ6XU22YrKTtHNNcP7bQ=="; }; }; "cspell-io-4.1.7" = { @@ -21200,13 +21290,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-7.3.7" = { + "cspell-io-8.0.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-7.3.7.tgz"; - sha512 = "zqGGllG/OM3Of7zaOELdrSoBpCyG9nJuSRCzLfKgnCG4g2zpoMfDZknJaY9VjZODHP99PvYWooF8E6kVxT34Fw=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.0.0.tgz"; + sha512 = "NVdVmQd7SU/nxYwWtO/6gzux/kp1Dt36zKds0+QHZhQ18JJjXduF5e+WUttqKi2oj/vvmjiG4HGFKQVDBcBz3w=="; }; }; "cspell-lib-4.3.12" = { @@ -21218,13 +21308,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-7.3.7" = { + "cspell-lib-8.0.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-7.3.7.tgz"; - sha512 = "KuFn0WTwmK50Ij1KVaXVuheleSOfv3oFIO3PfMuFg7llkfPfaRawF0b61da/EFGckU/hUc8uHRbBuGELlDo3tA=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.0.0.tgz"; + sha512 = "X/BzUjrzHOx7YlhvSph/OlMu1RmCTnybeZvIE67d1Pd7wT1TmZhFTnmvruUhoHxWEudOEe4HjzuNL9ph6Aw+aA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -21236,13 +21326,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-7.3.7" = { + "cspell-trie-lib-8.0.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-7.3.7.tgz"; - sha512 = "Vv8TdTMZD3DE79SorTwn5NoWj8JD7DnYMeUK+5S6JDNLy4Ck+kTEPN6Ic9hvLAxuDmQjmoZI3TizrWvuCG66aA=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.0.0.tgz"; + sha512 = "0rC5e1C0uM78uuS+lC1T18EojWZyNvq4bPOPCisnwuhuWrAfCqrFrX/qDNslWk3VTOPbsEMlFj6OnIGQnfwSKg=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -21569,13 +21659,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.5.0" = { + "csv-parse-5.5.2" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.0.tgz"; - sha512 = "RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.2.tgz"; + sha512 = "YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA=="; }; }; "csv-stream-0.2.0" = { @@ -21605,15 +21695,6 @@ let sha512 = "T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="; }; }; - "cuid-2.1.8" = { - name = "cuid"; - packageName = "cuid"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz"; - sha512 = "xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg=="; - }; - }; "culvert-0.1.2" = { name = "culvert"; packageName = "culvert"; @@ -21632,15 +21713,6 @@ let sha512 = "/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="; }; }; - "cuss-1.21.0" = { - name = "cuss"; - packageName = "cuss"; - version = "1.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.21.0.tgz"; - sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; - }; - }; "cuss-2.2.0" = { name = "cuss"; packageName = "cuss"; @@ -21731,15 +21803,6 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-3.2.2" = { - name = "d3-array"; - packageName = "d3-array"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; - sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; - }; - }; "d3-array-3.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -22010,13 +22073,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.1.0" = { + "d3-graphviz-5.2.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.1.0.tgz"; - sha512 = "PSUmKfbqhixVlTOsT9ziV/wxHAzf31rfq1POUrdfOseJQ3+GQmLTKMWNgyGc5QXtNZq3emsgQycs7W0Hr4wVvw=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.2.0.tgz"; + sha512 = "M/2gQkSe5beBQFmE2Qh8RPZivOV48GR4pVPV8kWQ6lBs1TqIjgGqi/AOvKTLILDLTwVx4KSGHCnH62K8xyDwvg=="; }; }; "d3-hierarchy-1.1.9" = { @@ -22577,15 +22640,6 @@ let sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; }; }; - "debounce-fn-4.0.0" = { - name = "debounce-fn"; - packageName = "debounce-fn"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz"; - sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; - }; - }; "debounce-fn-5.1.2" = { name = "debounce-fn"; packageName = "debounce-fn"; @@ -22865,22 +22919,22 @@ let sha512 = "OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ=="; }; }; - "deep-equal-1.1.1" = { + "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz"; + sha512 = "5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg=="; }; }; - "deep-equal-2.2.2" = { + "deep-equal-2.2.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz"; - sha512 = "xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz"; + sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA=="; }; }; "deep-extend-0.4.2" = { @@ -23036,13 +23090,13 @@ let sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; }; }; - "define-data-property-1.1.0" = { + "define-data-property-1.1.1" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; - sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; + sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; }; }; "define-lazy-prop-2.0.0" = { @@ -23189,13 +23243,13 @@ let sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; - "depcheck-1.4.6" = { + "depcheck-1.4.7" = { name = "depcheck"; packageName = "depcheck"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/depcheck/-/depcheck-1.4.6.tgz"; - sha512 = "Jxy9+u1DE+Svj2N0V/ueEQiOgH2X3KRPAsBfM0m/vCtuiG5QSC//b1mt0rbN/u3BFFEzXqpHzYiwDjmvAydEsw=="; + url = "https://registry.npmjs.org/depcheck/-/depcheck-1.4.7.tgz"; + sha512 = "1lklS/bV5chOxwNKA/2XUUk/hPORp8zihZsXflr8x0kLwmcZ9Y9BsS6Hs3ssvA+2wUVbG0U2Ciqvm1SokNjPkA=="; }; }; "depd-1.1.2" = { @@ -23243,13 +23297,13 @@ let sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="; }; }; - "deps-regex-0.1.4" = { + "deps-regex-0.2.0" = { name = "deps-regex"; packageName = "deps-regex"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/deps-regex/-/deps-regex-0.1.4.tgz"; - sha512 = "3tzwGYogSJi8HoG93R5x9NrdefZQOXgHgGih/7eivloOq6yC6O+yoFxZnkgP661twvfILONfoKRdF9GQOGx2RA=="; + url = "https://registry.npmjs.org/deps-regex/-/deps-regex-0.2.0.tgz"; + sha512 = "PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q=="; }; }; "deps-sort-2.0.1" = { @@ -23387,6 +23441,15 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; + "devlop-1.1.0" = { + name = "devlop"; + packageName = "devlop"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz"; + sha512 = "RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="; + }; + }; "devtools-protocol-0.0.981744" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -23405,22 +23468,22 @@ let sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="; }; }; - "diagnostic-channel-1.1.0" = { + "diagnostic-channel-1.1.1" = { name = "diagnostic-channel"; packageName = "diagnostic-channel"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz"; - sha512 = "fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ=="; + url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz"; + sha512 = "r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw=="; }; }; - "diagnostic-channel-publishers-1.0.5" = { + "diagnostic-channel-publishers-1.0.7" = { name = "diagnostic-channel-publishers"; packageName = "diagnostic-channel-publishers"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz"; - sha512 = "dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg=="; + url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.7.tgz"; + sha512 = "SEECbY5AiVt6DfLkhkaHNeshg1CogdLLANA8xlG/TKvS+XUgvIKl7VspJGYiEdL5OUyzMVnr7o0AwB7f+/Mjtg=="; }; }; "dicer-0.3.0" = { @@ -23504,13 +23567,13 @@ let sha512 = "EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="; }; }; - "diff2html-3.4.44" = { + "diff2html-3.4.45" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.44"; + version = "3.4.45"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.44.tgz"; - sha512 = "h6Ev+OJfTNUxDTUvo+DsH6DNmcFNjNtcaZ2g/WLP5nBnIev7O+JgPFmIc2iFcazqyN/WNOkSR91UZlEl2DPe7w=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.45.tgz"; + sha512 = "1SxsjYZYbxX0GGMYJJM7gM0SpMSHqzvvG0UJVROCDpz4tylH2T+EGiinm2boDmTrMlLueVxGfKNxGNLZ9zDlkQ=="; }; }; "diffie-hellman-5.0.3" = { @@ -24125,13 +24188,13 @@ let sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; }; }; - "dset-3.1.2" = { + "dset-3.1.3" = { name = "dset"; packageName = "dset"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz"; - sha512 = "g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="; + url = "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz"; + sha512 = "20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ=="; }; }; "dtrace-provider-0.6.0" = { @@ -24296,22 +24359,13 @@ let sha512 = "8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw=="; }; }; - "edge-runtime-2.5.1" = { + "edge-runtime-2.5.7" = { name = "edge-runtime"; packageName = "edge-runtime"; - version = "2.5.1"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.1.tgz"; - sha512 = "E0kY1Dqvwvk9yh7dvR56KnCjXf/dlbrrGjO5Sjnz9Ja3WqYT3csv2B8O4erxJiOWfWy9NTukBk4Kb3yrR66gBw=="; - }; - }; - "editorconfig-0.15.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; + url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.7.tgz"; + sha512 = "gA4qSVP0sNwJlkdQ2nahDPASlSl8twUd17o+JolPa1EtXpLTGzIpOETvodgJwXIxa+zaD8bnAXCdsWrx2PhlVQ=="; }; }; "editorconfig-1.0.4" = { @@ -24350,13 +24404,22 @@ let sha512 = "XofXdikjYI7MVBcnXeoOvRR+yFFFHOLs3J7PF5KYQweigtgLshcH4W660PsvHr4lYZ03JBpLyEcUB8DzHZ+BNw=="; }; }; - "electron-to-chromium-1.4.538" = { + "electron-to-chromium-1.4.579" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.538"; + version = "1.4.579"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.538.tgz"; - sha512 = "1a2m63NEookb1beNFTGDihgF3CKL7ksZ7PSA0VloON5DpTEhnOVgaDes8xkrDhkXRxlcN8JymQDGnv+Nn+uvhg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz"; + sha512 = "bJKvA+awBIzYR0xRced7PrQuRIwGQPpo6ZLP62GAShahU9fWpsNN2IP6BSP1BLDDSbxvBVRGAMWlvVVq3npmLA=="; + }; + }; + "electron-to-chromium-1.4.580" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.580"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.580.tgz"; + sha512 = "T5q3pjQon853xxxHUq3ZP68ZpvJHuSMY2+BZaW3QzjS4HvNuvsMmZ/+lU+nCrftre1jFZ+OSlExynXWBihnXzw=="; }; }; "elegant-spinner-1.0.1" = { @@ -24423,13 +24486,13 @@ let sha512 = "dJfbdY/hfeTyf/Ef7Y7ubLYzkBvPQ912wPaeVYpAxvFxkEBf/+hJu4H6vhAvFN6HlxqedlfVn2x1S44FfQ97pg=="; }; }; - "emoji-regex-10.2.1" = { + "emoji-regex-10.3.0" = { name = "emoji-regex"; packageName = "emoji-regex"; - version = "10.2.1"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.2.1.tgz"; - sha512 = "97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA=="; + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz"; + sha512 = "QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="; }; }; "emoji-regex-7.0.3" = { @@ -24459,13 +24522,13 @@ let sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; }; }; - "emojilib-2.4.0" = { + "emojilib-3.0.11" = { name = "emojilib"; packageName = "emojilib"; - version = "2.4.0"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz"; - sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw=="; + url = "https://registry.npmjs.org/emojilib/-/emojilib-3.0.11.tgz"; + sha512 = "OuML9z640prB+0Rms1RgzJrBAqNC9mFdqT2HeFcXSGSGNEiZh9adsaPPxWbqRoMyJPzu+zNKPyGKv4/sPmJDyg=="; }; }; "emojis-list-3.0.0" = { @@ -24594,13 +24657,22 @@ let sha512 = "FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg=="; }; }; - "engine.io-6.5.2" = { + "engine.io-6.5.3" = { name = "engine.io"; packageName = "engine.io"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.2.tgz"; - sha512 = "IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.3.tgz"; + sha512 = "IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw=="; + }; + }; + "engine.io-6.5.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz"; + sha512 = "KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg=="; }; }; "engine.io-client-1.3.1" = { @@ -24630,13 +24702,13 @@ let sha512 = "qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw=="; }; }; - "engine.io-client-6.5.2" = { + "engine.io-client-6.5.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz"; - sha512 = "CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"; + sha512 = "9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q=="; }; }; "engine.io-parser-1.0.6" = { @@ -24828,13 +24900,13 @@ let sha512 = "IsYv64dtlNXTm4huvCBpbXsdZQurYUju9WoYCkSj+SDYpO3v4/dq346QsCnNZ3JcnWw0G3E6+saVkVtmPw98Gg=="; }; }; - "envinfo-7.10.0" = { + "envinfo-7.11.0" = { name = "envinfo"; packageName = "envinfo"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz"; - sha512 = "ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz"; + sha512 = "G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg=="; }; }; "envinfo-7.8.1" = { @@ -24909,13 +24981,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.22.2" = { + "es-abstract-1.22.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; - sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; + sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; }; }; "es-aggregate-error-1.0.11" = { @@ -24963,22 +25035,22 @@ let sha512 = "JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="; }; }; - "es-set-tostringtag-2.0.1" = { + "es-set-tostringtag-2.0.2" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; + sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; }; }; - "es-shim-unscopables-1.0.0" = { + "es-shim-unscopables-1.0.2" = { name = "es-shim-unscopables"; packageName = "es-shim-unscopables"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; + url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz"; + sha512 = "J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw=="; }; }; "es-to-primitive-1.2.1" = { @@ -25107,15 +25179,6 @@ let sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; }; }; - "esbuild-0.15.18" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; - sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; - }; - }; "esbuild-0.17.19" = { name = "esbuild"; packageName = "esbuild"; @@ -25134,6 +25197,15 @@ let sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; }; }; + "esbuild-0.19.5" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz"; + sha512 = "bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -25143,15 +25215,6 @@ let sha512 = "R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g=="; }; }; - "esbuild-android-64-0.15.18" = { - name = "esbuild-android-64"; - packageName = "esbuild-android-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz"; - sha512 = "wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA=="; - }; - }; "esbuild-android-arm64-0.14.47" = { name = "esbuild-android-arm64"; packageName = "esbuild-android-arm64"; @@ -25161,15 +25224,6 @@ let sha512 = "OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ=="; }; }; - "esbuild-android-arm64-0.15.18" = { - name = "esbuild-android-arm64"; - packageName = "esbuild-android-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz"; - sha512 = "G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ=="; - }; - }; "esbuild-darwin-64-0.14.47" = { name = "esbuild-darwin-64"; packageName = "esbuild-darwin-64"; @@ -25179,15 +25233,6 @@ let sha512 = "R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA=="; }; }; - "esbuild-darwin-64-0.15.18" = { - name = "esbuild-darwin-64"; - packageName = "esbuild-darwin-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz"; - sha512 = "2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg=="; - }; - }; "esbuild-darwin-arm64-0.14.47" = { name = "esbuild-darwin-arm64"; packageName = "esbuild-darwin-arm64"; @@ -25197,15 +25242,6 @@ let sha512 = "seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw=="; }; }; - "esbuild-darwin-arm64-0.15.18" = { - name = "esbuild-darwin-arm64"; - packageName = "esbuild-darwin-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz"; - sha512 = "tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA=="; - }; - }; "esbuild-freebsd-64-0.14.47" = { name = "esbuild-freebsd-64"; packageName = "esbuild-freebsd-64"; @@ -25215,15 +25251,6 @@ let sha512 = "ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ=="; }; }; - "esbuild-freebsd-64-0.15.18" = { - name = "esbuild-freebsd-64"; - packageName = "esbuild-freebsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz"; - sha512 = "TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA=="; - }; - }; "esbuild-freebsd-arm64-0.14.47" = { name = "esbuild-freebsd-arm64"; packageName = "esbuild-freebsd-arm64"; @@ -25233,15 +25260,6 @@ let sha512 = "ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ=="; }; }; - "esbuild-freebsd-arm64-0.15.18" = { - name = "esbuild-freebsd-arm64"; - packageName = "esbuild-freebsd-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz"; - sha512 = "R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA=="; - }; - }; "esbuild-linux-32-0.14.47" = { name = "esbuild-linux-32"; packageName = "esbuild-linux-32"; @@ -25251,15 +25269,6 @@ let sha512 = "FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw=="; }; }; - "esbuild-linux-32-0.15.18" = { - name = "esbuild-linux-32"; - packageName = "esbuild-linux-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz"; - sha512 = "lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg=="; - }; - }; "esbuild-linux-64-0.14.47" = { name = "esbuild-linux-64"; packageName = "esbuild-linux-64"; @@ -25269,15 +25278,6 @@ let sha512 = "nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw=="; }; }; - "esbuild-linux-64-0.15.18" = { - name = "esbuild-linux-64"; - packageName = "esbuild-linux-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz"; - sha512 = "hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw=="; - }; - }; "esbuild-linux-arm-0.14.47" = { name = "esbuild-linux-arm"; packageName = "esbuild-linux-arm"; @@ -25287,15 +25287,6 @@ let sha512 = "ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA=="; }; }; - "esbuild-linux-arm-0.15.18" = { - name = "esbuild-linux-arm"; - packageName = "esbuild-linux-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz"; - sha512 = "UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA=="; - }; - }; "esbuild-linux-arm64-0.14.47" = { name = "esbuild-linux-arm64"; packageName = "esbuild-linux-arm64"; @@ -25305,15 +25296,6 @@ let sha512 = "ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw=="; }; }; - "esbuild-linux-arm64-0.15.18" = { - name = "esbuild-linux-arm64"; - packageName = "esbuild-linux-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz"; - sha512 = "54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug=="; - }; - }; "esbuild-linux-mips64le-0.14.47" = { name = "esbuild-linux-mips64le"; packageName = "esbuild-linux-mips64le"; @@ -25323,15 +25305,6 @@ let sha512 = "mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg=="; }; }; - "esbuild-linux-mips64le-0.15.18" = { - name = "esbuild-linux-mips64le"; - packageName = "esbuild-linux-mips64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz"; - sha512 = "Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ=="; - }; - }; "esbuild-linux-ppc64le-0.14.47" = { name = "esbuild-linux-ppc64le"; packageName = "esbuild-linux-ppc64le"; @@ -25341,15 +25314,6 @@ let sha512 = "WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w=="; }; }; - "esbuild-linux-ppc64le-0.15.18" = { - name = "esbuild-linux-ppc64le"; - packageName = "esbuild-linux-ppc64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz"; - sha512 = "b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w=="; - }; - }; "esbuild-linux-riscv64-0.14.47" = { name = "esbuild-linux-riscv64"; packageName = "esbuild-linux-riscv64"; @@ -25359,15 +25323,6 @@ let sha512 = "1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g=="; }; }; - "esbuild-linux-riscv64-0.15.18" = { - name = "esbuild-linux-riscv64"; - packageName = "esbuild-linux-riscv64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz"; - sha512 = "ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg=="; - }; - }; "esbuild-linux-s390x-0.14.47" = { name = "esbuild-linux-s390x"; packageName = "esbuild-linux-s390x"; @@ -25377,15 +25332,6 @@ let sha512 = "eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw=="; }; }; - "esbuild-linux-s390x-0.15.18" = { - name = "esbuild-linux-s390x"; - packageName = "esbuild-linux-s390x"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz"; - sha512 = "VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ=="; - }; - }; "esbuild-netbsd-64-0.14.47" = { name = "esbuild-netbsd-64"; packageName = "esbuild-netbsd-64"; @@ -25395,15 +25341,6 @@ let sha512 = "Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ=="; }; }; - "esbuild-netbsd-64-0.15.18" = { - name = "esbuild-netbsd-64"; - packageName = "esbuild-netbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz"; - sha512 = "98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg=="; - }; - }; "esbuild-openbsd-64-0.14.47" = { name = "esbuild-openbsd-64"; packageName = "esbuild-openbsd-64"; @@ -25413,15 +25350,6 @@ let sha512 = "QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw=="; }; }; - "esbuild-openbsd-64-0.15.18" = { - name = "esbuild-openbsd-64"; - packageName = "esbuild-openbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz"; - sha512 = "yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ=="; - }; - }; "esbuild-sunos-64-0.14.47" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; @@ -25431,15 +25359,6 @@ let sha512 = "uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ=="; }; }; - "esbuild-sunos-64-0.15.18" = { - name = "esbuild-sunos-64"; - packageName = "esbuild-sunos-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz"; - sha512 = "On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw=="; - }; - }; "esbuild-windows-32-0.14.47" = { name = "esbuild-windows-32"; packageName = "esbuild-windows-32"; @@ -25449,15 +25368,6 @@ let sha512 = "H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ=="; }; }; - "esbuild-windows-32-0.15.18" = { - name = "esbuild-windows-32"; - packageName = "esbuild-windows-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz"; - sha512 = "o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ=="; - }; - }; "esbuild-windows-64-0.14.47" = { name = "esbuild-windows-64"; packageName = "esbuild-windows-64"; @@ -25467,15 +25377,6 @@ let sha512 = "/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ=="; }; }; - "esbuild-windows-64-0.15.18" = { - name = "esbuild-windows-64"; - packageName = "esbuild-windows-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz"; - sha512 = "qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw=="; - }; - }; "esbuild-windows-arm64-0.14.47" = { name = "esbuild-windows-arm64"; packageName = "esbuild-windows-arm64"; @@ -25485,15 +25386,6 @@ let sha512 = "HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ=="; }; }; - "esbuild-windows-arm64-0.15.18" = { - name = "esbuild-windows-arm64"; - packageName = "esbuild-windows-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz"; - sha512 = "q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ=="; - }; - }; "esc-exit-3.0.0" = { name = "esc-exit"; packageName = "esc-exit"; @@ -25647,13 +25539,13 @@ let sha512 = "pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw=="; }; }; - "eslint-8.50.0" = { + "eslint-8.53.0" = { name = "eslint"; packageName = "eslint"; - version = "8.50.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz"; - sha512 = "FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -25665,13 +25557,13 @@ let sha512 = "SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg=="; }; }; - "eslint-formatter-pretty-4.1.0" = { + "eslint-formatter-pretty-5.0.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz"; - sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; + url = "https://registry.npmjs.org/eslint-formatter-pretty/-/eslint-formatter-pretty-5.0.0.tgz"; + sha512 = "Uick451FoL22/wXqyScX3inW8ZlD/GQO7eFXj3bqb6N/ZtuuF00/CwSNIKLbFCJPrX5V4EdQBSgJ/UVnmLRnug=="; }; }; "eslint-import-resolver-node-0.3.9" = { @@ -25719,13 +25611,13 @@ let sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; }; }; - "eslint-plugin-react-refresh-0.4.3" = { + "eslint-plugin-react-refresh-0.4.4" = { name = "eslint-plugin-react-refresh"; packageName = "eslint-plugin-react-refresh"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz"; - sha512 = "Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA=="; + url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.4.tgz"; + sha512 = "eD83+65e8YPVg6603Om2iCIwcQJf/y7++MWm4tACtEswFLYMwxwVWAfwN+e19f5Ad/FOyyNg9Dfi5lXhH3Y3rA=="; }; }; "eslint-plugin-unicorn-48.0.1" = { @@ -25746,13 +25638,13 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.17.0" = { + "eslint-plugin-vue-9.18.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.17.0"; + version = "9.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.17.0.tgz"; - sha512 = "r7Bp79pxQk9I5XDP0k2dpUC7Ots3OSWgvGZNu3BxmKK6Zg7NgVtcOB6OCna5Kb9oQwJPl5hq183WD0SY5tZtIQ=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.18.1.tgz"; + sha512 = "7hZFlrEgg9NIzuVik2I9xSnJA5RsmOfueYgsUGUokEDLJ1LHtxO0Pl4duje1BriZ/jDWb+44tcIlC3yi0tdlZg=="; }; }; "eslint-rule-docs-1.1.235" = { @@ -25953,15 +25845,6 @@ let sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -26268,15 +26151,6 @@ let sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; }; }; - "execa-5.0.1" = { - name = "execa"; - packageName = "execa"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; - sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -26286,6 +26160,15 @@ let sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; + "execa-6.1.0" = { + name = "execa"; + packageName = "execa"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz"; + sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; + }; + }; "execa-7.2.0" = { name = "execa"; packageName = "execa"; @@ -26295,6 +26178,15 @@ let sha512 = "UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA=="; }; }; + "execa-8.0.1" = { + name = "execa"; + packageName = "execa"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz"; + sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="; + }; + }; "execall-2.0.0" = { name = "execall"; packageName = "execall"; @@ -26394,13 +26286,13 @@ let sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; }; }; - "expo-48.0.20" = { + "expo-48.0.21" = { name = "expo"; packageName = "expo"; - version = "48.0.20"; + version = "48.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/expo/-/expo-48.0.20.tgz"; - sha512 = "SDRlLRINWWqf/OIPaUr/BsFZLhR5oEj1u9Cn06h1mPeo8pqv6ei/QTSZql4e0ixHIu3PWMPrUx9k/47nnTyTpg=="; + url = "https://registry.npmjs.org/expo/-/expo-48.0.21.tgz"; + sha512 = "Z211SC4wZP4Xd5/RBJhEw4uwSgpfzAvMh6IVdzwEVAJAcV1s48CACcSmIUe+7QJjEPzmb3T5Yo4EJ/JJXJ2o9A=="; }; }; "expo-application-5.1.1" = { @@ -26493,13 +26385,13 @@ let sha512 = "QOPh/iXykNDCAzUual1imSrn2aDakzCGUp2QmxVREr0llajXygroUWlT9sQXh1zKzbNp+a+i/xK375ZeBFiNJA=="; }; }; - "expo-modules-autolinking-1.6.0" = { + "expo-modules-autolinking-1.7.0" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.6.0.tgz"; - sha512 = "1SRzajlW7vLvydhUJnCDYdJXeu80IpNciMvH1YHZRvMnb21+UGhRkBTuqBfWEGcyaPVZxDVN/OWfU26TGa8hJA=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.7.0.tgz"; + sha512 = "abDW+OcImtxsHfQ1xfz6fRuj6KWVW5vMayYnV2zcnqrxwrbFCHdlzLnDNzOdR8lr+0N7L8UhCKGJ5Wzf2J/J3w=="; }; }; "expo-modules-core-1.2.7" = { @@ -26979,6 +26871,15 @@ let sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; }; }; + "fast-glob-3.3.2" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"; + sha512 = "oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow=="; + }; + }; "fast-json-patch-3.1.1" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -27249,15 +27150,6 @@ let sha512 = "CpKgwraLo4YWY9cUEICNJ1WcOVR2WE1Jvot3Nvr7FGBiGOKgkn1CmF4zuCl9VxvEh1nQsdYXtQg+V0etPiED6g=="; }; }; - "figgy-pudding-3.5.2" = { - name = "figgy-pudding"; - packageName = "figgy-pudding"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; - }; - }; "figlet-1.5.0" = { name = "figlet"; packageName = "figlet"; @@ -27339,13 +27231,13 @@ let sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; - "file-entry-cache-7.0.0" = { + "file-entry-cache-7.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.0.tgz"; - sha512 = "OWhoO9dvvwspdI7YjGrs5wD7bPggVHc5b1NFAdyd1fEPIeno3Fj70fjBhklAqzUefgX7KCNDBnvrT8rZhS8Shw=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz"; + sha512 = "uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ=="; }; }; "file-or-stdin-1.0.2" = { @@ -27357,15 +27249,6 @@ let sha512 = "WhYlIPdaYeE6/Pow1Js4QwRQBVXRoRWCZxPLL/YrzUwsZHT8fZuBxP8zZHawLQ8HxwORumP+CoRVuUxkAJD0dw=="; }; }; - "file-stream-rotator-0.6.1" = { - name = "file-stream-rotator"; - packageName = "file-stream-rotator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz"; - sha512 = "u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ=="; - }; - }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -27510,13 +27393,13 @@ let sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg=="; }; }; - "filesize-10.0.12" = { + "filesize-10.1.0" = { name = "filesize"; packageName = "filesize"; - version = "10.0.12"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-10.0.12.tgz"; - sha512 = "6RS9gDchbn+qWmtV2uSjo5vmKizgfCQeb5jKmqx8HyzA3MoLqqyQxN+QcjkGBJt7FjJ9qFce67Auyya5rRRbpw=="; + url = "https://registry.npmjs.org/filesize/-/filesize-10.1.0.tgz"; + sha512 = "GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ=="; }; }; "filesize-6.4.0" = { @@ -27807,13 +27690,13 @@ let sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; - "fkill-8.1.1" = { + "fkill-9.0.0" = { name = "fkill"; packageName = "fkill"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-8.1.1.tgz"; - sha512 = "138B7rFQMEKoJQOVl3NCPyRAaex0ruLvQgqkEWa/CyUY9MFFxZ8TtztiMJSs6/wD60M6kK0OKUOwHRsr3U2RBg=="; + url = "https://registry.npmjs.org/fkill/-/fkill-9.0.0.tgz"; + sha512 = "MdYSsbdCaIRjzo5edthZtWmEZVMfr1qrtYZUHIdO3swCE+CoZA8S5l0s4jDsYlTa9ZiXv0pTgpzE7s4N8NeUOA=="; }; }; "flagged-respawn-1.0.1" = { @@ -27852,13 +27735,13 @@ let sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; }; }; - "flat-cache-3.1.0" = { + "flat-cache-3.1.1" = { name = "flat-cache"; packageName = "flat-cache"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz"; - sha512 = "OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew=="; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz"; + sha512 = "/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q=="; }; }; "flatiron-0.4.3" = { @@ -27906,13 +27789,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.217.2" = { + "flow-parser-0.220.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.217.2"; + version = "0.220.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.217.2.tgz"; - sha512 = "O+nt/FLXa1hTwtW0O9h36iZjbL84G8e1uByx5dDXMC97AJEbZXwJ4ohfaE8BNWrYFyYX0NGfz1o8AtLQvaaD/Q=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.1.tgz"; + sha512 = "RoM3ARqVYvxnwtkM36RjQFzo5Z9p22jUqtuMrN8gzA/8fU6iMLFE3cXkdSFPyfHRXLU8ILH8TCtSFADk1ACPCg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28158,15 +28041,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "format-util-1.0.5" = { - name = "format-util"; - packageName = "format-util"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz"; - sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; - }; - }; "formdata-polyfill-4.0.10" = { name = "formdata-polyfill"; packageName = "formdata-polyfill"; @@ -28221,13 +28095,13 @@ let sha512 = "by7U5W8dkIzcvDofUcO42yl9JbnHTEDBrzu3pt5fKT+Z4Oy85I21K80EYJYdjQGC2qum4Vo55Ag57iiIK4FYuA=="; }; }; - "fraction.js-4.3.6" = { + "fraction.js-4.3.7" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz"; - sha512 = "n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"; + sha512 = "ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="; }; }; "fragment-cache-0.2.1" = { @@ -28572,13 +28446,13 @@ let sha512 = "jVT8q9Ah9JwqfIGKwKzTdbRRthdPpIjEe9kgvxM104Tv+q6SgOAQqJMVP90R0DBRAqejGMHDRWJtl3Ats6BjfQ=="; }; }; - "function-bind-1.1.1" = { + "function-bind-1.1.2" = { name = "function-bind"; packageName = "function-bind"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"; + sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="; }; }; "function.prototype.name-1.1.6" = { @@ -28635,22 +28509,22 @@ let sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ=="; }; }; - "gatsby-core-utils-4.12.0" = { + "gatsby-core-utils-4.12.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.12.0.tgz"; - sha512 = "1vK0cmL8FNHAddQ5WZt0yTPdFSZuMPNUSsHckM+ZdVmRxyif3aZYSi7ofj6sJo/UvhKj7fBqJv/smZYpp2PRqg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.12.1.tgz"; + sha512 = "YW7eCK2M6yGQerT5LkdOHLZTNYMsDvcgeDMRy0q66FWKj7twPZX428I6NaLCMeF5dYoj1HOOO0u96iNlW5jcKQ=="; }; }; - "gatsby-telemetry-4.12.0" = { + "gatsby-telemetry-4.12.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.12.0.tgz"; - sha512 = "pgaGCzKPZKWvNrX/VC/nE1S9Z20fzg4aA4ETD6hlI7ztu+BSyQG+Oebly4SdFGlVSLeq3x3+gOe/LY9Fry7TrA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.12.1.tgz"; + sha512 = "MTHcKt5Cl68DveBpsduwfJdRjoXg48fcjITo1TspbxS2R0WnTZPRohGbA+JmQdY+O1eUSysdrONIjf6r86nhiA=="; }; }; "gauge-2.7.4" = { @@ -28824,6 +28698,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-east-asian-width-1.2.0" = { + name = "get-east-asian-width"; + packageName = "get-east-asian-width"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz"; + sha512 = "2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA=="; + }; + }; "get-installed-path-2.1.1" = { name = "get-installed-path"; packageName = "get-installed-path"; @@ -28833,13 +28716,13 @@ let sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA=="; }; }; - "get-intrinsic-1.2.1" = { + "get-intrinsic-1.2.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; - sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; + sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; }; }; "get-package-info-1.0.0" = { @@ -29031,6 +28914,15 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; + "get-stream-8.0.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz"; + sha512 = "VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="; + }; + }; "get-symbol-description-1.0.0" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -29103,6 +28995,15 @@ let sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; }; }; + "git-clone-0.2.0" = { + name = "git-clone"; + packageName = "git-clone"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-clone/-/git-clone-0.2.0.tgz"; + sha512 = "1UAkEPIFbyjHaddljUKvPhhLRnrKaImT71T7rdvSvWLXw95nLdhdi6Qmlx0KOWoV1qqvHGLq5lMLJEZM0JXk8A=="; + }; + }; "git-config-path-2.0.0" = { name = "git-config-path"; packageName = "git-config-path"; @@ -29265,6 +29166,15 @@ let sha512 = "wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw=="; }; }; + "github-slugger-2.0.0" = { + name = "github-slugger"; + packageName = "github-slugger"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz"; + sha512 = "IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="; + }; + }; "github-url-from-git-1.5.0" = { name = "github-url-from-git"; packageName = "github-url-from-git"; @@ -29499,15 +29409,6 @@ let sha512 = "NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg=="; }; }; - "global-dirs-2.1.0" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; - sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; - }; - }; "global-dirs-3.0.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -29572,13 +29473,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.22.0" = { + "globals-13.23.0" = { name = "globals"; packageName = "globals"; - version = "13.22.0"; + version = "13.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz"; - sha512 = "H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw=="; + url = "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz"; + sha512 = "XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA=="; }; }; "globals-9.18.0" = { @@ -29599,15 +29500,6 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; - "globalyzer-0.1.0" = { - name = "globalyzer"; - packageName = "globalyzer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz"; - sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; - }; - }; "globby-11.0.1" = { name = "globby"; packageName = "globby"; @@ -29671,15 +29563,6 @@ let sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; }; }; - "globrex-0.1.2" = { - name = "globrex"; - packageName = "globrex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"; - sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; - }; - }; "globule-1.3.4" = { name = "globule"; packageName = "globule"; @@ -29986,24 +29869,6 @@ let sha512 = "5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="; }; }; - "graphql-16.4.0" = { - name = "graphql"; - packageName = "graphql"; - version = "16.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.4.0.tgz"; - sha512 = "tYDNcRvKCcfHREZYje3v33NSrSD/ZpbWWdPtBtUUuXx9NCo/2QDxYzNqCnMvfsrnbwRpEHMovVrPu/ERoLrIRg=="; - }; - }; - "graphql-16.6.0" = { - name = "graphql"; - packageName = "graphql"; - version = "16.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.6.0.tgz"; - sha512 = "KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw=="; - }; - }; "graphql-16.8.1" = { name = "graphql"; packageName = "graphql"; @@ -30094,13 +29959,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.14.1" = { + "graphql-ws-5.14.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.14.1"; + version = "5.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.1.tgz"; - sha512 = "aqkls1espsygP1PfkAuuLIV96IbztQ6EaADse97pw8wRIMT3+AL/OYfS8V2iCRkc0gzckitoDRGCQEdnySggiA=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.2.tgz"; + sha512 = "LycmCwhZ+Op2GlHz4BZDsUYHKRiiUz+3r9wbhBATMETNlORQJAaFlAgTFoeRh6xQoQegwYwIylVD1Qns9/DA3w=="; }; }; "growly-1.3.0" = { @@ -30202,13 +30067,13 @@ let sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; }; }; - "has-1.0.3" = { + "has-1.0.4" = { name = "has"; packageName = "has"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + url = "https://registry.npmjs.org/has/-/has-1.0.4.tgz"; + sha512 = "qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="; }; }; "has-ansi-2.0.0" = { @@ -30319,13 +30184,13 @@ let sha512 = "Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="; }; }; - "has-property-descriptors-1.0.0" = { + "has-property-descriptors-1.0.1" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; + sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; }; }; "has-proto-1.0.1" = { @@ -30463,13 +30328,13 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; - "hash-wasm-4.9.0" = { + "hash-wasm-4.10.0" = { name = "hash-wasm"; packageName = "hash-wasm"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.9.0.tgz"; - sha512 = "7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w=="; + url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.10.0.tgz"; + sha512 = "a0NjBNWjavvMalm/pPSEJ00MPDjRG8rv9D5BK7dBQTLGwAOVWqnTEUggaYs5szATB5UK5ULeIQr7QJXbczAZYA=="; }; }; "hash.js-1.1.7" = { @@ -30499,13 +30364,13 @@ let sha512 = "U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="; }; }; - "hast-util-embedded-1.0.6" = { - name = "hast-util-embedded"; - packageName = "hast-util-embedded"; - version = "1.0.6"; + "hasown-2.0.0" = { + name = "hasown"; + packageName = "hasown"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.6.tgz"; - sha512 = "JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw=="; + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; + sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; }; }; "hast-util-embedded-2.0.1" = { @@ -30526,15 +30391,6 @@ let sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; }; }; - "hast-util-from-parse5-6.0.1" = { - name = "hast-util-from-parse5"; - packageName = "hast-util-from-parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz"; - sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; - }; - }; "hast-util-from-parse5-7.1.2" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; @@ -30544,15 +30400,6 @@ let sha512 = "Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw=="; }; }; - "hast-util-has-property-1.0.4" = { - name = "hast-util-has-property"; - packageName = "hast-util-has-property"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz"; - sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; - }; - }; "hast-util-has-property-2.0.1" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; @@ -30562,15 +30409,6 @@ let sha512 = "X2+RwZIMTMKpXUzlotatPzWj8bspCymtXH3cfG3iQKV+wPF53Vgaqxi/eLqGck0wKq1kS9nvoB1wchbCPEL8sg=="; }; }; - "hast-util-is-body-ok-link-1.0.4" = { - name = "hast-util-is-body-ok-link"; - packageName = "hast-util-is-body-ok-link"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz"; - sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; - }; - }; "hast-util-is-body-ok-link-2.0.0" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; @@ -30580,15 +30418,6 @@ let sha512 = "S58hCexyKdD31vMsErvgLfflW6vYWo/ixRLPJTtkOvLld24vyI8vmYmkgLA5LG3la2ME7nm7dLGdm48gfLRBfw=="; }; }; - "hast-util-is-element-1.1.0" = { - name = "hast-util-is-element"; - packageName = "hast-util-is-element"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz"; - sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; - }; - }; "hast-util-is-element-2.1.3" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; @@ -30616,15 +30445,6 @@ let sha512 = "jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA=="; }; }; - "hast-util-phrasing-1.0.5" = { - name = "hast-util-phrasing"; - packageName = "hast-util-phrasing"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-1.0.5.tgz"; - sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; - }; - }; "hast-util-phrasing-2.0.2" = { name = "hast-util-phrasing"; packageName = "hast-util-phrasing"; @@ -30634,15 +30454,6 @@ let sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; - "hast-util-to-nlcst-1.2.8" = { - name = "hast-util-to-nlcst"; - packageName = "hast-util-to-nlcst"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.8.tgz"; - sha512 = "cKMArohUvGw4fpN9PKDCIB+klMojkWzz5zNVNFRdKa0oC1MVX1TaDki1E/tb9xqS8WlUjKifIjmrNmRbEJzrJg=="; - }; - }; "hast-util-to-nlcst-2.2.0" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; @@ -30652,15 +30463,6 @@ let sha512 = "BFBvuoEo9yCHklUSCz6+JG/FAkr+qCVaW1bE0/Y8+SBhuaz7s+suHDpkyQxH7FF2kqctYRhquLRCcmn+PS0IUQ=="; }; }; - "hast-util-to-string-1.0.4" = { - name = "hast-util-to-string"; - packageName = "hast-util-to-string"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz"; - sha512 = "eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w=="; - }; - }; "hast-util-to-string-2.0.0" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; @@ -30670,15 +30472,6 @@ let sha512 = "02AQ3vLhuH3FisaMM+i/9sm4OXGSq1UhOOCpTLLQtHdL3tZt7qil69r8M8iDkZYyC0HCFylcYoP+8IO7ddta1A=="; }; }; - "hast-util-whitespace-1.0.4" = { - name = "hast-util-whitespace"; - packageName = "hast-util-whitespace"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz"; - sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; - }; - }; "hast-util-whitespace-2.0.1" = { name = "hast-util-whitespace"; packageName = "hast-util-whitespace"; @@ -30697,15 +30490,6 @@ let sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; }; }; - "hastscript-6.0.0" = { - name = "hastscript"; - packageName = "hastscript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz"; - sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w=="; - }; - }; "hastscript-7.2.0" = { name = "hastscript"; packageName = "hastscript"; @@ -31066,13 +30850,13 @@ let sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; }; }; - "htmlnano-2.0.4" = { + "htmlnano-2.1.0" = { name = "htmlnano"; packageName = "htmlnano"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.4.tgz"; - sha512 = "WGCkyGFwjKW1GeCBsPYacMvaMnZtFJ0zIRnC2NCddkA+IOEhTqskXrS7lep+3yYZw/nQ3dW1UAX4yA/GJyR8BA=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.1.0.tgz"; + sha512 = "jVGRE0Ep9byMBKEu0Vxgl8dhXYOUk0iNQ2pjsG+BcRB0u0oDF5A9p/iBGMg/PGKYUyMD0OAGu8dVT5Lzj8S58g=="; }; }; "htmlparser2-3.10.1" = { @@ -31336,13 +31120,13 @@ let sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; - "http-status-1.7.0" = { + "http-status-1.7.3" = { name = "http-status"; packageName = "http-status"; - version = "1.7.0"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-status/-/http-status-1.7.0.tgz"; - sha512 = "6HZ8T2ywZKtNKOrRA22x4Z+fK+UiWzimWYSTROVHrZ46RX+hKsg9wCQiodRtfNrKfsvOkwsXA6R9q+TmDY+8nQ=="; + url = "https://registry.npmjs.org/http-status/-/http-status-1.7.3.tgz"; + sha512 = "GS8tL1qHT2nBCMJDYMHGkkkKQLNkIAHz37vgO68XKvzv+XyqB4oh/DfmMHdtRzfqSJPj1xKG2TaELZtlCz6BEQ=="; }; }; "http2-client-1.3.5" = { @@ -31444,6 +31228,15 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; + "human-signals-3.0.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz"; + sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="; + }; + }; "human-signals-4.3.1" = { name = "human-signals"; packageName = "human-signals"; @@ -31453,6 +31246,15 @@ let sha512 = "nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ=="; }; }; + "human-signals-5.0.0" = { + name = "human-signals"; + packageName = "human-signals"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz"; + sha512 = "AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -31489,15 +31291,6 @@ let sha512 = "YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg=="; }; }; - "ibm-openapi-validator-0.97.5" = { - name = "ibm-openapi-validator"; - packageName = "ibm-openapi-validator"; - version = "0.97.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ibm-openapi-validator/-/ibm-openapi-validator-0.97.5.tgz"; - sha512 = "MlXLjQCZRU0yqQ6EFzBhCehkFXp/rXuGsjsEglK+ldDJZV/YQy7dw1V6ROzoiibjm0f00J7L3ubLvlbIlHilGQ=="; - }; - }; "iconv-lite-0.4.23" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -31786,6 +31579,15 @@ let sha512 = "8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg=="; }; }; + "import-in-the-middle-1.4.2" = { + name = "import-in-the-middle"; + packageName = "import-in-the-middle"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz"; + sha512 = "9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw=="; + }; + }; "import-jsx-4.0.1" = { name = "import-jsx"; packageName = "import-jsx"; @@ -31831,13 +31633,22 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-3.0.0" = { + "import-meta-resolve-3.1.1" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz"; - sha512 = "4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg=="; + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.1.1.tgz"; + sha512 = "qeywsE/KC3w9Fd2ORrRDUw6nS/nLwZpXgfrOc2IILvZYnCaEMd+D56Vfg9k4G29gIeVi3XKql1RQatME8iYsiw=="; + }; + }; + "import-meta-resolve-4.0.0" = { + name = "import-meta-resolve"; + packageName = "import-meta-resolve"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz"; + sha512 = "okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA=="; }; }; "imurmurhash-0.1.4" = { @@ -31966,15 +31777,6 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.7" = { - name = "ini"; - packageName = "ini"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; - sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; - }; - }; "ini-1.3.8" = { name = "ini"; packageName = "ini"; @@ -32029,13 +31831,13 @@ let sha512 = "firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg=="; }; }; - "ink-4.2.0" = { + "ink-4.4.1" = { name = "ink"; packageName = "ink"; - version = "4.2.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-4.2.0.tgz"; - sha512 = "q7SeFAEFMyKxTblyVI+CsxHzfiMMP9JUDG0cRmOKEAmJiYrtrDW1YYTv129RXqfn7fMKcVc4h/LbAJvqvZIuEQ=="; + url = "https://registry.npmjs.org/ink/-/ink-4.4.1.tgz"; + sha512 = "rXckvqPBB0Krifk5rn/5LvQGmyXwCUpBfmTwbkQNBY9JY8RSl3b8OftBNEYxg4+SWUhEKcPifgope28uL9inlA=="; }; }; "ink-select-input-4.2.2" = { @@ -32074,13 +31876,13 @@ let sha512 = "7TNlOjJlJXB33vG7yVa+MMO7hCjaC1bCn+zdpSjknWoLbOWMaFdKc7LJvqVkZ0rZv2+akhjXPrcR/dbxissjUw=="; }; }; - "ink-text-input-4.0.3" = { + "ink-text-input-5.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.3"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.3.tgz"; - sha512 = "eQD01ik9ltmNoHmkeQ2t8LszYkv2XwuPSUz3ie/85qer6Ll/j0QSlSaLNl6ENHZakBHdCBVZY04iOXcLLXA0PQ=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-5.0.1.tgz"; + sha512 = "crnsYJalG4EhneOFnr/q+Kzw1RgmXI2KsBaLFE6mpiIKxAtJLUnvygOF2IUKO8z4nwkSkveGRBMd81RoYdRSag=="; }; }; "ink-use-stdout-dimensions-1.0.5" = { @@ -32155,15 +31957,6 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-8.2.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"; - sha512 = "nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg=="; - }; - }; "inquirer-8.2.6" = { name = "inquirer"; packageName = "inquirer"; @@ -32182,13 +31975,22 @@ let sha512 = "B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g=="; }; }; - "inquirer-autocomplete-prompt-1.4.0" = { + "inquirer-9.2.12" = { + name = "inquirer"; + packageName = "inquirer"; + version = "9.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz"; + sha512 = "mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q=="; + }; + }; + "inquirer-autocomplete-prompt-3.0.1" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.4.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz"; - sha512 = "qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-3.0.1.tgz"; + sha512 = "DQBXwX2fVQPVUzu4v4lGgtNgyjcX2+rTyphb2MeSOQh3xUayKAfHAF4y0KgsMi06m6ZiR3xIOdzMZMfQgX2m9w=="; }; }; "inquirer-autosubmit-prompt-0.2.0" = { @@ -32308,13 +32110,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.5" = { + "internal-slot-1.0.6" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; - sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; + sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; }; }; "internmap-2.0.3" = { @@ -32398,13 +32200,13 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; - "inversify-6.0.1" = { + "inversify-6.0.2" = { name = "inversify"; packageName = "inversify"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz"; - sha512 = "B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ=="; + url = "https://registry.npmjs.org/inversify/-/inversify-6.0.2.tgz"; + sha512 = "i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA=="; }; }; "invert-kv-1.0.0" = { @@ -32416,6 +32218,15 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32605,22 +32416,13 @@ let sha512 = "/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="; }; }; - "is-accessor-descriptor-0.1.6" = { + "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "0.1.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz"; + sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="; }; }; "is-alphabetical-1.0.4" = { @@ -32641,15 +32443,6 @@ let sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ=="; }; }; - "is-alphanumeric-1.0.0" = { - name = "is-alphanumeric"; - packageName = "is-alphanumeric"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; - sha512 = "ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA=="; - }; - }; "is-alphanumerical-1.0.4" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; @@ -32821,13 +32614,13 @@ let sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; }; - "is-core-module-2.13.0" = { + "is-core-module-2.13.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"; - sha512 = "Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; + sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; }; }; "is-core-module-2.9.0" = { @@ -32839,22 +32632,13 @@ let sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; - "is-data-descriptor-0.1.4" = { + "is-data-descriptor-1.0.1" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; - version = "0.1.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz"; + sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; "is-date-object-1.0.5" = { @@ -32884,22 +32668,22 @@ let sha512 = "AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A=="; }; }; - "is-descriptor-0.1.6" = { + "is-descriptor-0.1.7" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz"; + sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="; }; }; - "is-descriptor-1.0.2" = { + "is-descriptor-1.0.3" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz"; + sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="; }; }; "is-docker-2.2.1" = { @@ -33172,15 +32956,6 @@ let sha512 = "KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA=="; }; }; - "is-installed-globally-0.3.2" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; - sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; - }; - }; "is-installed-globally-0.4.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -33325,15 +33100,6 @@ let sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg=="; }; }; - "is-npm-4.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; - sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -33640,15 +33406,6 @@ let sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; }; }; - "is-reference-1.2.1" = { - name = "is-reference"; - packageName = "is-reference"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; - sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; - }; - }; "is-reference-3.0.2" = { name = "is-reference"; packageName = "is-reference"; @@ -33901,15 +33658,6 @@ let sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; }; }; - "is-url-superb-4.0.0" = { - name = "is-url-superb"; - packageName = "is-url-superb"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-url-superb/-/is-url-superb-4.0.0.tgz"; - sha512 = "GI+WjezhPPcbM+tqE9LnmsY5qqjwHzTvjJ36wxYX5ujNXefSUJ/T17r5bqDV8yLhcgB59KTPNOc9O9cmHTPWsA=="; - }; - }; "is-url-superb-6.1.0" = { name = "is-url-superb"; packageName = "is-url-superb"; @@ -33991,15 +33739,6 @@ let sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="; }; }; - "is-whitespace-character-1.0.4" = { - name = "is-whitespace-character"; - packageName = "is-whitespace-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; - sha512 = "SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="; - }; - }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -34009,15 +33748,6 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.4" = { - name = "is-word-character"; - packageName = "is-word-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz"; - sha512 = "5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="; - }; - }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -34036,6 +33766,15 @@ let sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; + "is-wsl-3.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz"; + sha512 = "UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw=="; + }; + }; "is-yarn-global-0.3.0" = { name = "is-yarn-global"; packageName = "is-yarn-global"; @@ -34063,6 +33802,15 @@ let sha512 = "rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g=="; }; }; + "is64bit-2.0.0" = { + name = "is64bit"; + packageName = "is64bit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is64bit/-/is64bit-2.0.0.tgz"; + sha512 = "jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -34216,13 +33964,13 @@ let sha512 = "X3HBmm7+Th+l4/kMtqwcHHgELD0Lfl0Ina6S3+grr+mKmTxsrM84NAO1UuRPIxIbGLIl3TCEu45S1kdu21HYbQ=="; }; }; - "istanbul-lib-coverage-3.2.0" = { + "istanbul-lib-coverage-3.2.2" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; - sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz"; + sha512 = "O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="; }; }; "istanbul-lib-hook-3.0.0" = { @@ -34414,13 +34162,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jiti-1.20.0" = { + "jiti-1.21.0" = { name = "jiti"; packageName = "jiti"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz"; - sha512 = "3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA=="; + url = "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz"; + sha512 = "gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q=="; }; }; "jju-1.4.0" = { @@ -34468,13 +34216,13 @@ let sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg=="; }; }; - "joi-17.10.2" = { + "joi-17.11.0" = { name = "joi"; packageName = "joi"; - version = "17.10.2"; + version = "17.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz"; - sha512 = "hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA=="; + url = "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz"; + sha512 = "NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ=="; }; }; "joi-17.7.0" = { @@ -34720,6 +34468,15 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; + "jsdom-11.12.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz"; + sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; + }; + }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -34783,76 +34540,67 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.89.0" = { + "jsii-1.91.0" = { name = "jsii"; packageName = "jsii"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.89.0.tgz"; - sha512 = "NOeltDlkRSu7OXpNS8I4izFtcVKsMppn0pbqM07LWHXrNZT0Y7c/dDtuMyYRIDNcwB6aLtOzLHfls9rd6qrLyg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.91.0.tgz"; + sha512 = "dJ2FbnUfX5Eg9BdZx6Cz2JhDsvzGi2DoQeomzdjO9ltvVUouAFPWkpcUtJdLXaNmHQtPM4/I+AzelUX7w2mWVw=="; }; }; - "jsii-5.1.12" = { + "jsii-5.2.26" = { name = "jsii"; packageName = "jsii"; - version = "5.1.12"; + version = "5.2.26"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.1.12.tgz"; - sha512 = "iY3zLosUEKbeua6IAGJXjFxibiiI0xHFjyYPyewOc56MBRHC7nczWSVGRP+Jgwyo7HWXs4TvJKLG6w8zSuAZrg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.2.26.tgz"; + sha512 = "R5R2mKKMVVs6a8nWJEtMWZXFr845visS4b4q4TK/xBQD7fmI2pylJftCJlePskwlv8W3hFlqSoQ2yp+Hbm8fZg=="; }; }; - "jsii-5.2.11" = { - name = "jsii"; - packageName = "jsii"; - version = "5.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.2.11.tgz"; - sha512 = "HbEgIrWuGswoxgRaKOTOp4m6FPnrL6gpBAc3j78hhPo1k9MCxydiQQAKm73eCRYCwt9/zPBms8O+3Vd6Bi1kRQ=="; - }; - }; - "jsii-pacmak-1.89.0" = { + "jsii-pacmak-1.91.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.89.0.tgz"; - sha512 = "fEvXWBdIOz1WyPrpZRbDaaV1f3UyAN8vYIhzH8mtLklsdFUkS3SZdfFJWEKsa6gjILT+4/CqBtLOEZE0iHy0bg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.91.0.tgz"; + sha512 = "k3Mc8v2nS7OTZxbwXczjSl5/RzGXHPq/BzZ+MRQhP5Z0Ai7QDF++aJxx6GZT9JXOD8zpHpv74QOr6eLPRVRIEQ=="; }; }; - "jsii-reflect-1.89.0" = { + "jsii-reflect-1.91.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.89.0.tgz"; - sha512 = "05g0fUVot46rPGXYWzB3q4w2Cx2Ox7pzWfsGuIz6Kql/d9KoAFWMuGjwQbSbrI2I52RPKfTbM8wATzzp6Q5kdQ=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.91.0.tgz"; + sha512 = "RRFmvscXiBHUOP9ew71gPQ2IptiHYoRaihKoLg5+SQSeCvynaJrBWhNcBy26LHd28HEN2atdzYems0+HgeQNRg=="; }; }; - "jsii-rosetta-1.89.0" = { + "jsii-rosetta-1.91.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.89.0.tgz"; - sha512 = "1hmLO+LtZ6bf2uvYW45YaRBQJD+rVondVkWfT2Ex9xYrkxAsc4304TV2DoQILfZbkaUPezyJ3ejGFlMhliNG0g=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.91.0.tgz"; + sha512 = "v8eW/XiJHklnkmTtCIbyAeDPUVfovU/ZNh1ixvGri/ps5H3iRRpLEmqGJGMm2IEIjNCSmnmIsDMQLw20/7Nu+Q=="; }; }; - "jsii-rosetta-5.1.13" = { + "jsii-rosetta-5.2.2" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.1.13"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.1.13.tgz"; - sha512 = "EmtQU/Q5ex/e2XmysU1ZdEW3vK4feEPDXaivRj5Cf284fuEcWINcD38oPYog0XofPdqeBbf0n+EciBitoEhKGA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.2.2.tgz"; + sha512 = "bMGJKdQLlvYXUawoY+6EMH/5RwOttNCiTxczaJlV27BpxWeqTYIYMAVcb+d+6FTNKvZ2AcbCjqlROW6RDONanQ=="; }; }; - "jsii-srcmak-0.1.951" = { + "jsii-srcmak-0.1.960" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.951"; + version = "0.1.960"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.951.tgz"; - sha512 = "zaKqrsR416yX+QhE1T4mkBWqPpsHQmBnBbsR0f5a32Uknr3+l4PCVtuV5/rgthAG6iE4Pa6c/jO0vcTzyzEY6A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.960.tgz"; + sha512 = "G/VsiDLcNzhIMfwPdVnhnNFz9bpRPISI2JJhHQ2+GgFL2Pk413jGEih3C2n7gQ1Z3mdolSEYGLvqaL3szFT2ng=="; }; }; "json-buffer-3.0.0" = { @@ -34891,24 +34639,6 @@ let sha512 = "GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w=="; }; }; - "json-dup-key-validator-1.0.3" = { - name = "json-dup-key-validator"; - packageName = "json-dup-key-validator"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-dup-key-validator/-/json-dup-key-validator-1.0.3.tgz"; - sha512 = "JvJcV01JSiO7LRz7DY1Fpzn4wX2rJ3dfNTiAfnlvLNdhhnm0Pgdvhi2SGpENrZn7eSg26Ps3TPhOcuD/a4STXQ=="; - }; - }; - "json-logic-js-2.0.2" = { - name = "json-logic-js"; - packageName = "json-logic-js"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.2.tgz"; - sha512 = "ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ=="; - }; - }; "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -34999,15 +34729,6 @@ let sha512 = "YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg=="; }; }; - "json-schema-ref-parser-5.1.3" = { - name = "json-schema-ref-parser"; - packageName = "json-schema-ref-parser"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-5.1.3.tgz"; - sha512 = "CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ=="; - }; - }; "json-schema-to-ts-1.6.4" = { name = "json-schema-to-ts"; packageName = "json-schema-to-ts"; @@ -35107,13 +34828,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.3.387" = { + "json2jsii-0.3.389" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.387"; + version = "0.3.389"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.387.tgz"; - sha512 = "tIyEL9nPXjmKQF73eXSqLMNwzRsj9s2qaLeohIqXxD/l0QCYqPJJIxDpQG+sF6t+/axJYdpprljF34qQKDd3rg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.389.tgz"; + sha512 = "ct6j/QAj/jvGN0Oie3kd2aJ7a6UaB2m+TsDs3OjevqZEb2eE0m9iD5kjISaiIR1PNFl00kOZpILXi0cE/WIxuA=="; }; }; "json3-3.2.6" = { @@ -35314,22 +35035,13 @@ let sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; }; }; - "jsonschema-1.4.1" = { - name = "jsonschema"; - packageName = "jsonschema"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; - sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; - }; - }; - "jsonwebtoken-8.5.1" = { + "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.5.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; "jsonwebtoken-9.0.2" = { @@ -35647,22 +35359,22 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.3" = { + "keyv-4.5.4" = { name = "keyv"; packageName = "keyv"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz"; - sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz"; + sha512 = "oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="; }; }; - "khroma-2.0.0" = { + "khroma-2.1.0" = { name = "khroma"; packageName = "khroma"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-2.0.0.tgz"; - sha512 = "2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g=="; + url = "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz"; + sha512 = "Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="; }; }; "kill-port-process-3.1.0" = { @@ -35854,13 +35566,13 @@ let sha512 = "KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg=="; }; }; - "launch-editor-2.6.0" = { + "launch-editor-2.6.1" = { name = "launch-editor"; packageName = "launch-editor"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"; - sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"; + sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="; }; }; "lazy-1.0.11" = { @@ -35917,6 +35629,15 @@ let sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; "ldap-filter-0.3.3" = { name = "ldap-filter"; packageName = "ldap-filter"; @@ -35971,6 +35692,15 @@ let sha512 = "IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow=="; }; }; + "left-pad-1.3.0" = { + name = "left-pad"; + packageName = "left-pad"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz"; + sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="; + }; + }; "less-4.2.0" = { name = "less"; packageName = "less"; @@ -36070,15 +35800,6 @@ let sha512 = "vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw=="; }; }; - "libnpmconfig-1.2.1" = { - name = "libnpmconfig"; - packageName = "libnpmconfig"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; - sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; - }; - }; "libnpmpublish-7.3.0" = { name = "libnpmpublish"; packageName = "libnpmpublish"; @@ -36124,94 +35845,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lightningcss-1.22.0" = { + "lightningcss-1.22.1" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"; - sha512 = "+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg=="; - }; - }; - "lightningcss-darwin-arm64-1.22.0" = { - name = "lightningcss-darwin-arm64"; - packageName = "lightningcss-darwin-arm64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"; - sha512 = "aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg=="; - }; - }; - "lightningcss-darwin-x64-1.22.0" = { - name = "lightningcss-darwin-x64"; - packageName = "lightningcss-darwin-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz"; - sha512 = "9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ=="; - }; - }; - "lightningcss-freebsd-x64-1.22.0" = { - name = "lightningcss-freebsd-x64"; - packageName = "lightningcss-freebsd-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz"; - sha512 = "xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww=="; - }; - }; - "lightningcss-linux-arm-gnueabihf-1.22.0" = { - name = "lightningcss-linux-arm-gnueabihf"; - packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz"; - sha512 = "epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ=="; - }; - }; - "lightningcss-linux-arm64-gnu-1.22.0" = { - name = "lightningcss-linux-arm64-gnu"; - packageName = "lightningcss-linux-arm64-gnu"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz"; - sha512 = "AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg=="; - }; - }; - "lightningcss-linux-arm64-musl-1.22.0" = { - name = "lightningcss-linux-arm64-musl"; - packageName = "lightningcss-linux-arm64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz"; - sha512 = "RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg=="; - }; - }; - "lightningcss-linux-x64-gnu-1.22.0" = { - name = "lightningcss-linux-x64-gnu"; - packageName = "lightningcss-linux-x64-gnu"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz"; - sha512 = "grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw=="; - }; - }; - "lightningcss-linux-x64-musl-1.22.0" = { - name = "lightningcss-linux-x64-musl"; - packageName = "lightningcss-linux-x64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz"; - sha512 = "t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ=="; - }; - }; - "lightningcss-win32-x64-msvc-1.22.0" = { - name = "lightningcss-win32-x64-msvc"; - packageName = "lightningcss-win32-x64-msvc"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz"; - sha512 = "64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; + sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; }; }; "lilconfig-2.1.0" = { @@ -36268,13 +35908,13 @@ let sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; - "lines-and-columns-2.0.3" = { + "lines-and-columns-2.0.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz"; - sha512 = "cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w=="; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz"; + sha512 = "wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A=="; }; }; "linewise-0.0.3" = { @@ -36331,13 +35971,13 @@ let sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; }; }; - "liquidjs-10.8.4" = { + "liquidjs-10.9.2" = { name = "liquidjs"; packageName = "liquidjs"; - version = "10.8.4"; + version = "10.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/liquidjs/-/liquidjs-10.8.4.tgz"; - sha512 = "HSpYAFBVWxhwWsTKPBJgPm3bnwwIzAZjy17XhX7uJCKJ8H6A1YstZSFmPqMmWfSuJOg43RSx+qWVSA1Fu3+B2w=="; + url = "https://registry.npmjs.org/liquidjs/-/liquidjs-10.9.2.tgz"; + sha512 = "ygPCgYyiFKQNyRi/CK3s3U5RimosBtrIq7TaMYK5ek93mUl9CZ6xxqw2T+1G4kVc9dAmwI71bWLQNKRToV8SsQ=="; }; }; "listenercount-1.0.1" = { @@ -36412,13 +36052,13 @@ let sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; }; }; - "lmdb-2.7.11" = { + "lmdb-2.8.5" = { name = "lmdb"; packageName = "lmdb"; - version = "2.7.11"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/lmdb/-/lmdb-2.7.11.tgz"; - sha512 = "x9bD4hVp7PFLUoELL8RglbNXhAMt5CYhkmss+CEau9KlNoilsTzNi9QDsPZb3KMpOGZXG6jmXhW3bBxE2XVztw=="; + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.8.5.tgz"; + sha512 = "9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ=="; }; }; "load-bmfont-1.4.1" = { @@ -36484,15 +36124,6 @@ let sha512 = "gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ=="; }; }; - "load-plugin-3.0.0" = { - name = "load-plugin"; - packageName = "load-plugin"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz"; - sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; - }; - }; "load-plugin-5.1.0" = { name = "load-plugin"; packageName = "load-plugin"; @@ -36502,6 +36133,15 @@ let sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; }; }; + "load-plugin-6.0.1" = { + name = "load-plugin"; + packageName = "load-plugin"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-6.0.1.tgz"; + sha512 = "YZyxJaWfN4F1xfPCyKFNIOL26vlFukmJY7wegxsriav4y2/0ZiICota6uFvyy52GjUj+tsPSjGLX+2m7kiU0+g=="; + }; + }; "load-yaml-file-0.2.0" = { name = "load-yaml-file"; packageName = "load-yaml-file"; @@ -37078,15 +36718,6 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; - "lodash.intersection-4.4.0" = { - name = "lodash.intersection"; - packageName = "lodash.intersection"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; - sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; - }; - }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -37663,13 +37294,13 @@ let sha512 = "1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g=="; }; }; - "logform-2.5.1" = { + "logform-2.6.0" = { name = "logform"; packageName = "logform"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; - sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz"; + sha512 = "1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ=="; }; }; "logidrom-0.3.1" = { @@ -37690,6 +37321,15 @@ let sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; }; }; + "loglevel-plugin-prefix-0.8.4" = { + name = "loglevel-plugin-prefix"; + packageName = "loglevel-plugin-prefix"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz"; + sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; + }; + }; "long-4.0.0" = { name = "long"; packageName = "long"; @@ -37933,15 +37573,6 @@ let sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; }; }; - "lru-cache-7.14.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; - }; - }; "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -37960,15 +37591,6 @@ let sha512 = "BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ=="; }; }; - "lru_map-0.3.3" = { - name = "lru_map"; - packageName = "lru_map"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz"; - sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; - }; - }; "lt_donthave-1.0.1" = { name = "lt_donthave"; packageName = "lt_donthave"; @@ -38033,22 +37655,13 @@ let sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; }; }; - "magic-string-0.30.1" = { + "magic-string-0.30.5" = { name = "magic-string"; packageName = "magic-string"; - version = "0.30.1"; + version = "0.30.5"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz"; - sha512 = "mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="; - }; - }; - "magic-string-0.30.4" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.30.4"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.4.tgz"; - sha512 = "Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz"; + sha512 = "7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA=="; }; }; "magicli-0.0.5" = { @@ -38150,6 +37763,15 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; + "make-fetch-happen-10.2.1" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "10.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; + sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; + }; + }; "make-fetch-happen-11.1.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -38159,6 +37781,15 @@ let sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; }; }; + "make-fetch-happen-13.0.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz"; + sha512 = "7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A=="; + }; + }; "make-fetch-happen-9.1.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -38249,15 +37880,6 @@ let sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; - "markdown-escapes-1.0.4" = { - name = "markdown-escapes"; - packageName = "markdown-escapes"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; - sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -38501,15 +38123,6 @@ let sha512 = "LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA=="; }; }; - "matcher-1.1.1" = { - name = "matcher"; - packageName = "matcher"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; - sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; - }; - }; "matcher-3.0.0" = { name = "matcher"; packageName = "matcher"; @@ -38528,6 +38141,33 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; + "mathjax-2.7.9" = { + name = "mathjax"; + packageName = "mathjax"; + version = "2.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.9.tgz"; + sha512 = "NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ=="; + }; + }; + "mathjax-node-2.1.1" = { + name = "mathjax-node"; + packageName = "mathjax-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax-node/-/mathjax-node-2.1.1.tgz"; + sha512 = "i29tvqD8yHPB2WhrGV5rvliYnKwTT8a/TO8SCnuYtatpSHxLGy3aF7lDTVLD6B1bfuVMTFB6McZu2TBxk0XGeg=="; + }; + }; + "mathjax-node-sre-3.0.3" = { + name = "mathjax-node-sre"; + packageName = "mathjax-node-sre"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax-node-sre/-/mathjax-node-sre-3.0.3.tgz"; + sha512 = "SBwqD3DEgdYyPQv7vUBqH/uCr0eOI23PbffzmhelFPY8KdVANZkE2hssJA0Dfl23y7uEefsoVOryckMLEmmzaw=="; + }; + }; "mathml-tag-names-2.1.3" = { name = "mathml-tag-names"; packageName = "mathml-tag-names"; @@ -38591,15 +38231,6 @@ let sha512 = "c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ=="; }; }; - "mdast-comment-marker-1.1.2" = { - name = "mdast-comment-marker"; - packageName = "mdast-comment-marker"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz"; - sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; - }; - }; "mdast-comment-marker-2.1.2" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; @@ -38609,15 +38240,6 @@ let sha512 = "HED3ezseRVkBzZ0uK4q6RJMdufr/2p3VfVZstE3H1N9K8bwtspztWo6Xd7rEatuGNoCXaBna8oEqMwUn0Ve1bw=="; }; }; - "mdast-util-compact-2.0.1" = { - name = "mdast-util-compact"; - packageName = "mdast-util-compact"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; - sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; - }; - }; "mdast-util-find-and-replace-1.1.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -38663,6 +38285,15 @@ let sha512 = "4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww=="; }; }; + "mdast-util-from-markdown-2.0.0" = { + name = "mdast-util-from-markdown"; + packageName = "mdast-util-from-markdown"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.0.tgz"; + sha512 = "n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA=="; + }; + }; "mdast-util-frontmatter-0.2.0" = { name = "mdast-util-frontmatter"; packageName = "mdast-util-frontmatter"; @@ -38780,13 +38411,13 @@ let sha512 = "PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ=="; }; }; - "mdast-util-heading-style-1.0.6" = { + "mdast-util-heading-style-2.0.1" = { name = "mdast-util-heading-style"; packageName = "mdast-util-heading-style"; - version = "1.0.6"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz"; - sha512 = "8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw=="; + url = "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-2.0.1.tgz"; + sha512 = "0L5rthU4xKDVbw+UQ7D8Y8xOEsX4JXZvemWoEAsL+WAaeSH+TvVVwFnTb3G/OrjyP4VYQULoNWU+PdZfkmNu4A=="; }; }; "mdast-util-mdx-2.0.1" = { @@ -38834,6 +38465,15 @@ let sha512 = "WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg=="; }; }; + "mdast-util-phrasing-4.0.0" = { + name = "mdast-util-phrasing"; + packageName = "mdast-util-phrasing"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.0.0.tgz"; + sha512 = "xadSsJayQIucJ9n053dfQwVu1kuXg7jCTdYsMK8rqzKZh52nLfSH/k0sAxE0u+pj/zKZX+o5wB+ML5mRayOxFA=="; + }; + }; "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; @@ -38852,13 +38492,13 @@ let sha512 = "bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A=="; }; }; - "mdast-util-to-nlcst-4.0.1" = { - name = "mdast-util-to-nlcst"; - packageName = "mdast-util-to-nlcst"; - version = "4.0.1"; + "mdast-util-to-markdown-2.1.0" = { + name = "mdast-util-to-markdown"; + packageName = "mdast-util-to-markdown"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.1.tgz"; - sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.0.tgz"; + sha512 = "SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ=="; }; }; "mdast-util-to-nlcst-5.2.1" = { @@ -38897,6 +38537,15 @@ let sha512 = "V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg=="; }; }; + "mdast-util-to-string-4.0.0" = { + name = "mdast-util-to-string"; + packageName = "mdast-util-to-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz"; + sha512 = "0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg=="; + }; + }; "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; @@ -38942,15 +38591,6 @@ let sha512 = "+0FV+YXgmt4cxAHY1HtmZFVzVbhWAIuABtxhHuZ9uQGIg3opmK2kg5V62DGntWyfgqA9ZywaTPi4w8ummYDdHA=="; }; }; - "mdns-server-1.0.11" = { - name = "mdns-server"; - packageName = "mdns-server"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mdns-server/-/mdns-server-1.0.11.tgz"; - sha512 = "luzHnhQYmxaqrvYb8akwH2V/lSSyAumDoAK1zmogvpsj7sd4l04AF/LchBYH44NQVm7oo/KBVVFg3AbsJXr12w=="; - }; - }; "mdurl-1.0.1" = { name = "mdurl"; packageName = "mdurl"; @@ -39014,15 +38654,6 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.1.1" = { - name = "mem"; - packageName = "mem"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz"; - sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; - }; - }; "mem-8.1.1" = { name = "mem"; packageName = "mem"; @@ -39032,6 +38663,15 @@ let sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; }; }; + "mem-9.0.2" = { + name = "mem"; + packageName = "mem"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-9.0.2.tgz"; + sha512 = "F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A=="; + }; + }; "memfs-3.6.0" = { name = "memfs"; packageName = "memfs"; @@ -39131,15 +38771,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-7.1.1" = { - name = "meow"; - packageName = "meow"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; - sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; - }; - }; "meow-8.1.2" = { name = "meow"; packageName = "meow"; @@ -39320,6 +38951,15 @@ let sha512 = "uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA=="; }; }; + "micromark-4.0.0" = { + name = "micromark"; + packageName = "micromark"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz"; + sha512 = "o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ=="; + }; + }; "micromark-core-commonmark-1.1.0" = { name = "micromark-core-commonmark"; packageName = "micromark-core-commonmark"; @@ -39329,6 +38969,15 @@ let sha512 = "BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw=="; }; }; + "micromark-core-commonmark-2.0.0" = { + name = "micromark-core-commonmark"; + packageName = "micromark-core-commonmark"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.0.tgz"; + sha512 = "jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA=="; + }; + }; "micromark-extension-footnote-0.3.2" = { name = "micromark-extension-footnote"; packageName = "micromark-extension-footnote"; @@ -39527,6 +39176,15 @@ let sha512 = "XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg=="; }; }; + "micromark-factory-destination-2.0.0" = { + name = "micromark-factory-destination"; + packageName = "micromark-factory-destination"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.0.tgz"; + sha512 = "j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA=="; + }; + }; "micromark-factory-label-1.1.0" = { name = "micromark-factory-label"; packageName = "micromark-factory-label"; @@ -39536,6 +39194,15 @@ let sha512 = "OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w=="; }; }; + "micromark-factory-label-2.0.0" = { + name = "micromark-factory-label"; + packageName = "micromark-factory-label"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.0.tgz"; + sha512 = "RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw=="; + }; + }; "micromark-factory-mdx-expression-1.0.9" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; @@ -39554,6 +39221,15 @@ let sha512 = "cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ=="; }; }; + "micromark-factory-space-2.0.0" = { + name = "micromark-factory-space"; + packageName = "micromark-factory-space"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz"; + sha512 = "TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg=="; + }; + }; "micromark-factory-title-1.1.0" = { name = "micromark-factory-title"; packageName = "micromark-factory-title"; @@ -39563,6 +39239,15 @@ let sha512 = "J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ=="; }; }; + "micromark-factory-title-2.0.0" = { + name = "micromark-factory-title"; + packageName = "micromark-factory-title"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.0.tgz"; + sha512 = "jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A=="; + }; + }; "micromark-factory-whitespace-1.1.0" = { name = "micromark-factory-whitespace"; packageName = "micromark-factory-whitespace"; @@ -39572,6 +39257,15 @@ let sha512 = "v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ=="; }; }; + "micromark-factory-whitespace-2.0.0" = { + name = "micromark-factory-whitespace"; + packageName = "micromark-factory-whitespace"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.0.tgz"; + sha512 = "28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA=="; + }; + }; "micromark-util-character-1.2.0" = { name = "micromark-util-character"; packageName = "micromark-util-character"; @@ -39581,6 +39275,15 @@ let sha512 = "lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg=="; }; }; + "micromark-util-character-2.0.1" = { + name = "micromark-util-character"; + packageName = "micromark-util-character"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.0.1.tgz"; + sha512 = "3wgnrmEAJ4T+mGXAUfMvMAbxU9RDG43XmGce4j6CwPtVxB3vfwXSZ6KhFwDzZ3mZHhmPimMAXg71veiBGzeAZw=="; + }; + }; "micromark-util-chunked-1.1.0" = { name = "micromark-util-chunked"; packageName = "micromark-util-chunked"; @@ -39590,6 +39293,15 @@ let sha512 = "Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ=="; }; }; + "micromark-util-chunked-2.0.0" = { + name = "micromark-util-chunked"; + packageName = "micromark-util-chunked"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.0.tgz"; + sha512 = "anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg=="; + }; + }; "micromark-util-classify-character-1.1.0" = { name = "micromark-util-classify-character"; packageName = "micromark-util-classify-character"; @@ -39599,6 +39311,15 @@ let sha512 = "SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw=="; }; }; + "micromark-util-classify-character-2.0.0" = { + name = "micromark-util-classify-character"; + packageName = "micromark-util-classify-character"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.0.tgz"; + sha512 = "S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw=="; + }; + }; "micromark-util-combine-extensions-1.1.0" = { name = "micromark-util-combine-extensions"; packageName = "micromark-util-combine-extensions"; @@ -39608,6 +39329,15 @@ let sha512 = "Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA=="; }; }; + "micromark-util-combine-extensions-2.0.0" = { + name = "micromark-util-combine-extensions"; + packageName = "micromark-util-combine-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.0.tgz"; + sha512 = "vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ=="; + }; + }; "micromark-util-decode-numeric-character-reference-1.1.0" = { name = "micromark-util-decode-numeric-character-reference"; packageName = "micromark-util-decode-numeric-character-reference"; @@ -39617,6 +39347,15 @@ let sha512 = "m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw=="; }; }; + "micromark-util-decode-numeric-character-reference-2.0.1" = { + name = "micromark-util-decode-numeric-character-reference"; + packageName = "micromark-util-decode-numeric-character-reference"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.1.tgz"; + sha512 = "bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ=="; + }; + }; "micromark-util-decode-string-1.1.0" = { name = "micromark-util-decode-string"; packageName = "micromark-util-decode-string"; @@ -39626,6 +39365,15 @@ let sha512 = "YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ=="; }; }; + "micromark-util-decode-string-2.0.0" = { + name = "micromark-util-decode-string"; + packageName = "micromark-util-decode-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.0.tgz"; + sha512 = "r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA=="; + }; + }; "micromark-util-encode-1.1.0" = { name = "micromark-util-encode"; packageName = "micromark-util-encode"; @@ -39635,6 +39383,15 @@ let sha512 = "EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw=="; }; }; + "micromark-util-encode-2.0.0" = { + name = "micromark-util-encode"; + packageName = "micromark-util-encode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz"; + sha512 = "pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA=="; + }; + }; "micromark-util-events-to-acorn-1.2.3" = { name = "micromark-util-events-to-acorn"; packageName = "micromark-util-events-to-acorn"; @@ -39653,6 +39410,15 @@ let sha512 = "VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q=="; }; }; + "micromark-util-html-tag-name-2.0.0" = { + name = "micromark-util-html-tag-name"; + packageName = "micromark-util-html-tag-name"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.0.tgz"; + sha512 = "xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw=="; + }; + }; "micromark-util-normalize-identifier-1.1.0" = { name = "micromark-util-normalize-identifier"; packageName = "micromark-util-normalize-identifier"; @@ -39662,6 +39428,15 @@ let sha512 = "N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q=="; }; }; + "micromark-util-normalize-identifier-2.0.0" = { + name = "micromark-util-normalize-identifier"; + packageName = "micromark-util-normalize-identifier"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.0.tgz"; + sha512 = "2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w=="; + }; + }; "micromark-util-resolve-all-1.1.0" = { name = "micromark-util-resolve-all"; packageName = "micromark-util-resolve-all"; @@ -39671,6 +39446,15 @@ let sha512 = "b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA=="; }; }; + "micromark-util-resolve-all-2.0.0" = { + name = "micromark-util-resolve-all"; + packageName = "micromark-util-resolve-all"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.0.tgz"; + sha512 = "6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA=="; + }; + }; "micromark-util-sanitize-uri-1.2.0" = { name = "micromark-util-sanitize-uri"; packageName = "micromark-util-sanitize-uri"; @@ -39680,6 +39464,15 @@ let sha512 = "QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A=="; }; }; + "micromark-util-sanitize-uri-2.0.0" = { + name = "micromark-util-sanitize-uri"; + packageName = "micromark-util-sanitize-uri"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz"; + sha512 = "WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw=="; + }; + }; "micromark-util-subtokenize-1.1.0" = { name = "micromark-util-subtokenize"; packageName = "micromark-util-subtokenize"; @@ -39689,6 +39482,15 @@ let sha512 = "kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A=="; }; }; + "micromark-util-subtokenize-2.0.0" = { + name = "micromark-util-subtokenize"; + packageName = "micromark-util-subtokenize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.0.tgz"; + sha512 = "vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg=="; + }; + }; "micromark-util-symbol-1.1.0" = { name = "micromark-util-symbol"; packageName = "micromark-util-symbol"; @@ -39698,6 +39500,15 @@ let sha512 = "uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag=="; }; }; + "micromark-util-symbol-2.0.0" = { + name = "micromark-util-symbol"; + packageName = "micromark-util-symbol"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz"; + sha512 = "8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw=="; + }; + }; "micromark-util-types-1.1.0" = { name = "micromark-util-types"; packageName = "micromark-util-types"; @@ -39707,6 +39518,15 @@ let sha512 = "ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg=="; }; }; + "micromark-util-types-2.0.0" = { + name = "micromark-util-types"; + packageName = "micromark-util-types"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz"; + sha512 = "oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w=="; + }; + }; "micromatch-2.3.11" = { name = "micromatch"; packageName = "micromatch"; @@ -40004,13 +39824,13 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20230922.0" = { + "miniflare-3.20231025.0" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20230922.0"; + version = "3.20231025.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20230922.0.tgz"; - sha512 = "1h8c7b0Ouoml7TmU2mtJo4k/DKMX4ift1vOxyfcktPY/0lqeiRNYulcOCPcF94maI4uATdBIO6Fx/zN2c2Ew0A=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20231025.0.tgz"; + sha512 = "pFcr2BRaGIQ26UfdDo8BMJ6kkd/Jo/FkQ/4K7UG/eORlDepsLrR/sTJddcSSIGl07MA+MGjhzopFTPpFskkS+g=="; }; }; "minilog-3.1.0" = { @@ -40112,6 +39932,24 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-6.2.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz"; + sha512 = "sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg=="; + }; + }; + "minimatch-7.4.6" = { + name = "minimatch"; + packageName = "minimatch"; + version = "7.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz"; + sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw=="; + }; + }; "minimatch-8.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -40247,6 +40085,15 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.1.2" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; + sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; + }; + }; "minipass-fetch-3.0.4" = { name = "minipass-fetch"; packageName = "minipass-fetch"; @@ -40616,15 +40463,6 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.5" = { - name = "msgpackr"; - packageName = "msgpackr"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.5.tgz"; - sha512 = "mpPs3qqTug6ahbblkThoUY2DQdNXcm4IapwOS3Vm/87vmpzLVelvp9h3It1y9l1VPpiFLV11vfOXnmeEwiIXwg=="; - }; - }; "msgpackr-1.9.9" = { name = "msgpackr"; packageName = "msgpackr"; @@ -40634,15 +40472,6 @@ let sha512 = "sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A=="; }; }; - "msgpackr-extract-3.0.2" = { - name = "msgpackr-extract"; - packageName = "msgpackr-extract"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz"; - sha512 = "SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A=="; - }; - }; "muggle-string-0.2.2" = { name = "muggle-string"; packageName = "muggle-string"; @@ -40877,6 +40706,15 @@ let sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; + "nanoid-3.3.7" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"; + sha512 = "eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -41220,15 +41058,6 @@ let sha512 = "V52MLl7BU+tH2Np9tDrIXK8bql3MVUadnMIl/0/oZSGC9keuro0O9UUv9QKp0aMvtN8HRew4G7byY7H4eWsxaQ=="; }; }; - "nlcst-is-literal-1.2.2" = { - name = "nlcst-is-literal"; - packageName = "nlcst-is-literal"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.2.tgz"; - sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; - }; - }; "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; @@ -41238,15 +41067,6 @@ let sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; - "nlcst-normalize-2.1.5" = { - name = "nlcst-normalize"; - packageName = "nlcst-normalize"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.5.tgz"; - sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; - }; - }; "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; @@ -41256,15 +41076,6 @@ let sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; - "nlcst-search-2.0.0" = { - name = "nlcst-search"; - packageName = "nlcst-search"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-2.0.0.tgz"; - sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; - }; - }; "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; @@ -41319,13 +41130,13 @@ let sha512 = "3yZ1vfGKOcv0dyyhUeqA0Qa6RsQ4SfUnL6o2IWR4sVg8kdnJo48XTWbMLdtnfiZTbCUdsMttNwyJcihEdGCZBw=="; }; }; - "node-abi-3.47.0" = { + "node-abi-3.51.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.47.0"; + version = "3.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz"; - sha512 = "2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz"; + sha512 = "SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA=="; }; }; "node-abort-controller-3.1.1" = { @@ -41535,15 +41346,6 @@ let sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; - "node-fetch-3.3.1" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz"; - sha512 = "cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow=="; - }; - }; "node-fetch-3.3.2" = { name = "node-fetch"; packageName = "node-fetch"; @@ -41598,6 +41400,15 @@ let sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; + "node-gyp-10.0.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; + }; + }; "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -41616,22 +41427,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-9.4.0" = { + "node-gyp-9.4.1" = { name = "node-gyp"; packageName = "node-gyp"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz"; - sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; - }; - }; - "node-gyp-build-4.6.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz"; + sha512 = "OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ=="; }; }; "node-gyp-build-4.6.1" = { @@ -41652,22 +41454,13 @@ let sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA=="; }; }; - "node-gyp-build-optional-packages-5.0.6" = { + "node-gyp-build-optional-packages-5.1.1" = { name = "node-gyp-build-optional-packages"; packageName = "node-gyp-build-optional-packages"; - version = "5.0.6"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.6.tgz"; - sha512 = "2ZJErHG4du9G3/8IWl/l9Bp5BBFy63rno5GVmjQijvTuUZKsl6g8RB4KH/x3NLcV5ZBb4GsXmAuTYr6dRml3Gw=="; - }; - }; - "node-gyp-build-optional-packages-5.0.7" = { - name = "node-gyp-build-optional-packages"; - packageName = "node-gyp-build-optional-packages"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz"; - sha512 = "YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w=="; + url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.1.1.tgz"; + sha512 = "+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw=="; }; }; "node-html-parser-5.4.2" = { @@ -41778,15 +41571,6 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; - "node-sarif-builder-2.0.3" = { - name = "node-sarif-builder"; - packageName = "node-sarif-builder"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-2.0.3.tgz"; - sha512 = "Pzr3rol8fvhG/oJjIq2NTVB0vmdNNlz22FENhhPojYRZ4/ee08CfK4YuKmuL54V9MLhI1kpzxfOJ/63LzmZzDg=="; - }; - }; "node-schedule-2.1.0" = { name = "node-schedule"; packageName = "node-schedule"; @@ -42084,13 +41868,13 @@ let sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; - "npm-9.8.1" = { + "npm-9.9.1" = { name = "npm"; packageName = "npm"; - version = "9.8.1"; + version = "9.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.8.1.tgz"; - sha512 = "AfDvThQzsIXhYgk9zhbk5R+lh811lKkLAeQMMhSypf1BM7zUafeIIBzMzespeuVEJ0+LvY36oRQYf7IKLzU3rw=="; + url = "https://registry.npmjs.org/npm/-/npm-9.9.1.tgz"; + sha512 = "D3YZ1ZTxPGDHLLiFU9q3sVrPfYnn6BaJ1hogm3vdWi8oOmHGtTlPUPXAM0iG22UT0JRkBnMDOh6oUhpbEYgg2A=="; }; }; "npm-bundled-1.1.2" = { @@ -42129,22 +41913,22 @@ let sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; - "npm-install-checks-6.2.0" = { + "npm-install-checks-6.3.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.2.0.tgz"; - sha512 = "744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g=="; + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz"; + sha512 = "W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw=="; }; }; - "npm-name-7.1.0" = { + "npm-name-7.1.1" = { name = "npm-name"; packageName = "npm-name"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-name/-/npm-name-7.1.0.tgz"; - sha512 = "0Sxf+7tQUOkQ9HuYVSdvq7gZNAOPp1ZJjHiKzpJhsQw9m1YjNfARC0SxWuuUWefChsbvu+DWrwWFfGQWLHmLjg=="; + url = "https://registry.npmjs.org/npm-name/-/npm-name-7.1.1.tgz"; + sha512 = "lyOwsFndLoozriMEsaqJ5lXvhCATYOEhDvxlom8TNvB9a/htDXuLgpVhMUOBd9zCewUXCyBXAPxrGr2TK2adgQ=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -42174,6 +41958,15 @@ let sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA=="; }; }; + "npm-package-arg-11.0.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz"; + sha512 = "M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -42255,13 +42048,13 @@ let sha512 = "d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q=="; }; }; - "npm-pick-manifest-8.0.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "8.0.1"; + "npm-packlist-8.0.0" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz"; - sha512 = "mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.0.tgz"; + sha512 = "ErAGFB5kJUciPy1mmx/C2YFbvxoJ0QJ9uwkCZOeR6CqLLISPZBOiFModAbSXnjjlwW5lOhuhXva+fURsSGJqyw=="; }; }; "npm-pick-manifest-8.0.2" = { @@ -42273,6 +42066,15 @@ let sha512 = "1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg=="; }; }; + "npm-pick-manifest-9.0.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz"; + sha512 = "VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg=="; + }; + }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -42291,6 +42093,15 @@ let sha512 = "kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA=="; }; }; + "npm-registry-fetch-16.1.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz"; + sha512 = "PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw=="; + }; + }; "npm-registry-utilities-1.0.0" = { name = "npm-registry-utilities"; packageName = "npm-registry-utilities"; @@ -42372,15 +42183,6 @@ let sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; }; }; - "nrf-intel-hex-1.3.0" = { - name = "nrf-intel-hex"; - packageName = "nrf-intel-hex"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.3.0.tgz"; - sha512 = "oXwBJxX/0Jc4fe2Jxjv3Mw9/qw9JdToDLvJuozfVx+twpkc2oSUm8W/OODX6W4kmWOaYA11ORpGLfQ8BP7mndw=="; - }; - }; "nssocket-0.6.0" = { name = "nssocket"; packageName = "nssocket"; @@ -42480,13 +42282,13 @@ let sha512 = "ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="; }; }; - "nx-16.9.1" = { + "nx-16.10.0" = { name = "nx"; packageName = "nx"; - version = "16.9.1"; + version = "16.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-16.9.1.tgz"; - sha512 = "h6jp0fXzEsBO3pwCNS2JbfzJZRgE2DnIo7Sj1/1oBo82o44jNqsPo3nMTj95qhcveJ0qBiKIh+Xw/fghXiRiSQ=="; + url = "https://registry.npmjs.org/nx/-/nx-16.10.0.tgz"; + sha512 = "gZl4iCC0Hx0Qe1VWmO4Bkeul2nttuXdPpfnlcDKSACGu3ZIo+uySqwOF8yBAxSTIf8xe2JRhgzJN1aFkuezEBg=="; }; }; "nyc-15.1.0" = { @@ -42624,13 +42426,13 @@ let sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; }; }; - "object-inspect-1.12.3" = { + "object-inspect-1.13.1" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; + sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; }; }; "object-is-1.1.5" = { @@ -42948,22 +42750,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "ono-4.0.11" = { - name = "ono"; - packageName = "ono"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz"; - sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; - }; - }; - "oo-ascii-tree-1.89.0" = { + "oo-ascii-tree-1.91.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.89.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.89.0.tgz"; - sha512 = "HRFmdGyLTO/xUo9XNHwa8ColVVP6IEeeRKcxbzRIbgRpPcIiDGo99ShecJdkaXOyR+q4Wi6hiX5b7yrsBI/gxA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.91.0.tgz"; + sha512 = "pH4FFNLTO8VG+vNUm4AHmhLNjoSfQlO1UKIrzBGdeScppY785D93GVMH1XkCwbuO7pd9rrh6El5WF3a5QNvaww=="; }; }; "open-0.0.2" = { @@ -43056,13 +42849,13 @@ let sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; - "openpgp-5.10.2" = { + "openpgp-5.11.0" = { name = "openpgp"; packageName = "openpgp"; - version = "5.10.2"; + version = "5.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-5.10.2.tgz"; - sha512 = "nRqMp4o31rBagWB02tgfKCsocXWq4uYobZf9GDVlD5rQXBq/wRIZHiDhGX1dlDAI2inkZcPd2dSZOqmtGnsK1A=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.0.tgz"; + sha512 = "hytHsxIPtRhuh6uAmoBUThHSwHSX3imLu7x4453T+xkVqIw49rl22MRD4KQIAQdCDoVdouejzYgcuLmMA/2OAA=="; }; }; "opentracing-0.14.7" = { @@ -43218,6 +43011,15 @@ let sha512 = "ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ=="; }; }; + "ora-7.0.1" = { + name = "ora"; + packageName = "ora"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz"; + sha512 = "0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw=="; + }; + }; "ordered-binary-1.4.1" = { name = "ordered-binary"; packageName = "ordered-binary"; @@ -43272,6 +43074,15 @@ let sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; }; }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "os-paths-4.4.0" = { name = "os-paths"; packageName = "os-paths"; @@ -43299,13 +43110,13 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ovsx-0.5.2" = { + "ovsx-0.8.3" = { name = "ovsx"; packageName = "ovsx"; - version = "0.5.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/ovsx/-/ovsx-0.5.2.tgz"; - sha512 = "UbLultRCk46WddeA0Cly4hoRhzBJUiLgbIEViXlgOvV54LbsppClDkMLoCevUUBHoiNdMX2NuiSgURAEXgCZdw=="; + url = "https://registry.npmjs.org/ovsx/-/ovsx-0.8.3.tgz"; + sha512 = "LG7wTzy4eYV/KolFeO4AwWPzQSARvCONzd5oHQlNvYOlji2r/zjbdK8pyObZN84uZlk6rQBWrJrAdJfh/SX0Hg=="; }; }; "ow-1.1.1" = { @@ -43632,15 +43443,6 @@ let sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; - "p-queue-7.4.1" = { - name = "p-queue"; - packageName = "p-queue"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz"; - sha512 = "vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA=="; - }; - }; "p-reduce-2.1.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -43875,13 +43677,13 @@ let sha512 = "rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA=="; }; }; - "pad-2.3.0" = { - name = "pad"; - packageName = "pad"; - version = "2.3.0"; + "pacote-17.0.4" = { + name = "pacote"; + packageName = "pacote"; + version = "17.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pad/-/pad-2.3.0.tgz"; - sha512 = "lxrgnOG5AXmzMRT1O5urWtYFxHnFSE+QntgTHij1nvS4W+ubhQLmQRHmZXDeEvk9I00itAixLqU9Q6fE0gW3sw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz"; + sha512 = "eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg=="; }; }; "pako-0.2.9" = { @@ -43992,15 +43794,6 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; - "parse-english-4.2.0" = { - name = "parse-english"; - packageName = "parse-english"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-english/-/parse-english-4.2.0.tgz"; - sha512 = "jw5N6wZUZViIw3VLG/FUSeL3vDhfw5Q2g4E3nYC69Mm5ANbh9ZWd+eligQbeUoyObZM8neynTn3l14e09pjEWg=="; - }; - }; "parse-english-5.0.0" = { name = "parse-english"; packageName = "parse-english"; @@ -44118,13 +43911,13 @@ let sha512 = "SA5aMiaIjXkAiBrW/yPgLgQAQg42f7K3ACO+2l/zOvtQBwX58DMUsFJXelW2fx3yMBmWOVkR6j1MGsdSbCA4UA=="; }; }; - "parse-json-7.1.0" = { + "parse-json-7.1.1" = { name = "parse-json"; packageName = "parse-json"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-7.1.0.tgz"; - sha512 = "ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz"; + sha512 = "SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw=="; }; }; "parse-json-object-1.1.0" = { @@ -44145,15 +43938,6 @@ let sha512 = "/oF7PUUBjCqHmMEE6xIQeX5ZokQ9+miudACzPt4KBU2qi6CxZYPdisPXx4ad7wpZJYi2ZpcW2PacLTU3De3ebw=="; }; }; - "parse-latin-4.3.0" = { - name = "parse-latin"; - packageName = "parse-latin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.3.0.tgz"; - sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; - }; - }; "parse-latin-5.0.1" = { name = "parse-latin"; packageName = "parse-latin"; @@ -44271,6 +44055,15 @@ let sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; }; }; + "parse5-4.0.0" = { + name = "parse5"; + packageName = "parse5"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz"; + sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="; + }; + }; "parse5-5.1.0" = { name = "parse5"; packageName = "parse5"; @@ -44694,13 +44487,13 @@ let sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; }; }; - "path-to-glob-pattern-1.0.2" = { + "path-to-glob-pattern-2.0.1" = { name = "path-to-glob-pattern"; packageName = "path-to-glob-pattern"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-1.0.2.tgz"; - sha512 = "ryF65N5MBB9XOjE5mMOi+0bMrh1F0ORQmqDSSERvv5zD62Cfc5QC6rK1AR1xuDIG1I091CkNENblbteWy1bXgw=="; + url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-2.0.1.tgz"; + sha512 = "tmciSlVyHnX0LC86+zSr+0LURw9rDPw8ilhXcmTpVUOnI6OsKdCzXQs5fTG10Bjz26IBdnKL3XIaP+QvGsk5YQ=="; }; }; "path-to-regexp-0.1.7" = { @@ -44928,6 +44721,15 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; + "picomatch-3.0.1" = { + name = "picomatch"; + packageName = "picomatch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz"; + sha512 = "I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="; + }; + }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -44946,13 +44748,13 @@ let sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; }; }; - "pid-port-0.2.0" = { + "pid-port-1.0.0" = { name = "pid-port"; packageName = "pid-port"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.2.0.tgz"; - sha512 = "xVU9H1FCRSeGrD9Oim5bLg2U7B2BgW0qzK2oahpV5BIf9hwzqQaWyOkOVC0Kgbsc90A9x6525beawx+QK+JduQ=="; + url = "https://registry.npmjs.org/pid-port/-/pid-port-1.0.0.tgz"; + sha512 = "LSNBeKChRPA4Xlrs6+zV588G1hSrFvANtPV5rt/5MPfSPK3V9XPWxx1d29svsrOjngT9ifLisXWCLS7DvO9ZhQ=="; }; }; "pidtree-0.6.0" = { @@ -46197,13 +45999,13 @@ let sha512 = "dLbWOa4xBn+qeWeIF60qRoB6Pk2jX5P3DIVgOQyMyvBpu931Q+8dXz8X0snJiFkQdohDDLnZQECjzsAj75hgZQ=="; }; }; - "prettier-plugin-astro-0.12.0" = { + "prettier-plugin-astro-0.12.1" = { name = "prettier-plugin-astro"; packageName = "prettier-plugin-astro"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.12.0.tgz"; - sha512 = "8E+9YQR6/5CPZJs8XsfBw579zrwZkc0Wb7x0fRVm/51JC8Iys4lBw4ecV8fHwpbQnzve86TUa4fJ08BJzqfWnA=="; + url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.12.1.tgz"; + sha512 = "1mlNIU/cV+25oB4z5wXzOz2fSDcawG3MsVUwgw2i8VSy7voLSENMSpR1juu3U5MAVUo3owuyax11QuylbpuqOQ=="; }; }; "prettier-plugin-svelte-2.10.1" = { @@ -46377,6 +46179,15 @@ let sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; }; }; + "process-exists-5.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-5.0.0.tgz"; + sha512 = "6QPRh5fyHD8MaXr4GYML8K/YY0Sq5dKHGIOrAKS3cYpHQdmygFCcijIu1dVoNKAZ0TWAMoeh8KDK9dF8auBkJA=="; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -46611,13 +46422,13 @@ let sha512 = "YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA=="; }; }; - "property-information-6.3.0" = { + "property-information-6.4.0" = { name = "property-information"; packageName = "property-information"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-6.3.0.tgz"; - sha512 = "gVNZ74nqhRMiIUYWGQdosYetaKc83x8oT41a0LlV3AAFCAZwCpg4vmGkq8t34+cUhp3cnM4XDiU/7xlgK7HGrg=="; + url = "https://registry.npmjs.org/property-information/-/property-information-6.4.0.tgz"; + sha512 = "9t5qARVofg2xQqKtytzt+lZ4d1Qvj8t5B8fEwXK6qOfgRLgH/b13QlgEyDh033NOS31nXeFbYv7CLUDG1CeifQ=="; }; }; "proto-list-1.2.4" = { @@ -46719,6 +46530,15 @@ let sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; }; }; + "ps-list-8.1.1" = { + name = "ps-list"; + packageName = "ps-list"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-8.1.1.tgz"; + sha512 = "OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ=="; + }; + }; "ps-tree-1.2.0" = { name = "ps-tree"; packageName = "ps-tree"; @@ -46935,13 +46755,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.3.0" = { + "punycode-2.3.1" = { name = "punycode"; packageName = "punycode"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"; + sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; "pupa-2.1.1" = { @@ -46998,13 +46818,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.329" = { + "pyright-1.1.335" = { name = "pyright"; packageName = "pyright"; - version = "1.1.329"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.329.tgz"; - sha512 = "5AT98Mi0OYcDiQ5lD1nPJ3cq8gX/HHaXrQ5WjJ/QZkaJtGqnEdrUp5Gq5wBPipWgOnv/l5e50YScaaNDMjoy9Q=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; }; "q-1.5.1" = { @@ -47070,6 +46890,15 @@ let sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; }; }; + "qs-6.10.4" = { + name = "qs"; + packageName = "qs"; + version = "6.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz"; + sha512 = "OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g=="; + }; + }; "qs-6.11.0" = { name = "qs"; packageName = "qs"; @@ -47259,15 +47088,6 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quotation-1.1.3" = { - name = "quotation"; - packageName = "quotation"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/quotation/-/quotation-1.1.3.tgz"; - sha512 = "45gUgmX/RtQOQV1kwM06boP49OYXcKCPrYwdmAvs5YqkpiobhNKKwo524JM6Ma0ko3oN9tXNcWs9+ABq3Ry7YA=="; - }; - }; "quotation-2.0.2" = { name = "quotation"; packageName = "quotation"; @@ -47547,13 +47367,13 @@ let sha512 = "/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="; }; }; - "react-devtools-core-4.28.0" = { + "react-devtools-core-4.28.5" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.28.0"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.0.tgz"; - sha512 = "E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz"; + sha512 = "cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA=="; }; }; "react-dom-18.2.0" = { @@ -47790,6 +47610,15 @@ let sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw=="; }; }; + "read-package-json-7.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz"; + sha512 = "uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg=="; + }; + }; "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -48420,15 +48249,6 @@ let sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; }; }; - "rehype-parse-7.0.1" = { - name = "rehype-parse"; - packageName = "rehype-parse"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz"; - sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; - }; - }; "rehype-parse-8.0.5" = { name = "rehype-parse"; packageName = "rehype-parse"; @@ -48438,15 +48258,6 @@ let sha512 = "Ds3RglaY/+clEX2U2mHflt7NlMA72KspZ0JLUJgBBLpRddBcEw3H8uYZQliQriku22NZpYMfjDdSgHcjxue24A=="; }; }; - "rehype-retext-2.0.4" = { - name = "rehype-retext"; - packageName = "rehype-retext"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-retext/-/rehype-retext-2.0.4.tgz"; - sha512 = "OnGX5RE8WyEs/Snz+Bs8DM9uGdrNUXMhCC7CW3S1cIZVOC90VdewdE+71kpG6LOzS0xwgZyItwrhjGv+oQgwkQ=="; - }; - }; "rehype-retext-3.0.2" = { name = "rehype-retext"; packageName = "rehype-retext"; @@ -48501,6 +48312,15 @@ let sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA=="; }; }; + "remark-15.0.1" = { + name = "remark"; + packageName = "remark"; + version = "15.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-15.0.1.tgz"; + sha512 = "Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A=="; + }; + }; "remark-footnotes-3.0.0" = { name = "remark-footnotes"; packageName = "remark-footnotes"; @@ -48510,15 +48330,6 @@ let sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg=="; }; }; - "remark-frontmatter-2.0.0" = { - name = "remark-frontmatter"; - packageName = "remark-frontmatter"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-2.0.0.tgz"; - sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; - }; - }; "remark-frontmatter-3.0.0" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; @@ -48555,166 +48366,166 @@ let sha512 = "lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig=="; }; }; - "remark-lint-8.0.0" = { + "remark-lint-9.1.2" = { name = "remark-lint"; packageName = "remark-lint"; - version = "8.0.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint/-/remark-lint-8.0.0.tgz"; - sha512 = "ESI8qJQ/TIRjABDnqoFsTiZntu+FRifZ5fJ77yX63eIDijl/arvmDvT+tAf75/Nm5BFL4R2JFUtkHRGVjzYUsg=="; + url = "https://registry.npmjs.org/remark-lint/-/remark-lint-9.1.2.tgz"; + sha512 = "m9e/aPlh7tsvfJfj8tPxrQzD6oEdb9Foko+Ya/6OwUP9EoGMfehv1Qtv26W1DoH58Wn8rT8CD+KuprTWscMmIA=="; }; }; - "remark-lint-blockquote-indentation-2.0.1" = { + "remark-lint-blockquote-indentation-3.1.2" = { name = "remark-lint-blockquote-indentation"; packageName = "remark-lint-blockquote-indentation"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz"; - sha512 = "uJ9az/Ms9AapnkWpLSCJfawBfnBI2Tn1yUsPNqIFv6YM98ymetItUMyP6ng9NFPqDvTQBbiarulkgoEo0wcafQ=="; + url = "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-3.1.2.tgz"; + sha512 = "5DOrFsZd5dXqA4p/VZvWSrqIWNFbBXjX7IV/FkVkxlNhNF/0FMf/4v8x1I2W3mzaZ7yDsWS/egpZnmligq1ckQ=="; }; }; - "remark-lint-checkbox-character-style-3.0.0" = { + "remark-lint-checkbox-character-style-4.1.2" = { name = "remark-lint-checkbox-character-style"; packageName = "remark-lint-checkbox-character-style"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-3.0.0.tgz"; - sha512 = "691OJ5RdBRXVpvnOEiBhMB4uhHJSHVttw83O4qyAkNBiqxa1Axqhsz8FgmzYgRLQbOGd2ncVUcXG1LOJt6C0DQ=="; + url = "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-4.1.2.tgz"; + sha512 = "5ITz+1cCuJ3Jv/Q7rKgDEucCOnIgjWDnSHPJA1tb4TI/D316h+ALbDhZIpP8gyfAm6sBAh3Pwz9XZJN2uJB5UQ=="; }; }; - "remark-lint-checkbox-content-indent-3.0.0" = { + "remark-lint-checkbox-content-indent-4.1.2" = { name = "remark-lint-checkbox-content-indent"; packageName = "remark-lint-checkbox-content-indent"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-3.0.0.tgz"; - sha512 = "+T4+hoY85qZE2drD2rCe14vF7fAgD3Kv2fkFd1HRvv3M5Riy148w/4YeoBI5U5BpybGTVUeEUYLCeJ8zbJLjkw=="; + url = "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-4.1.2.tgz"; + sha512 = "8uaHAm4bSqB7XpnecLRObe00Lj9eoHiecV+44CfJeWyoo50cTPR/hIMfsMtDxsNt4LZP+6oCV9z+vACJqDv8Hg=="; }; }; - "remark-lint-code-block-style-2.0.1" = { + "remark-lint-code-block-style-3.1.2" = { name = "remark-lint-code-block-style"; packageName = "remark-lint-code-block-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz"; - sha512 = "eRhmnColmSxJhO61GHZkvO67SpHDshVxs2j3+Zoc5Y1a4zQT2133ZAij04XKaBFfsVLjhbY/+YOWxgvtjx2nmA=="; + url = "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-3.1.2.tgz"; + sha512 = "3wsWmzzdyEsB9sOzBOf46TSkwwVKXN2JpTEQb6feN0Tl6Vg75F7T9MHqMz7aqk/56bOXSxUzdpXDscGBhziLRA=="; }; }; - "remark-lint-definition-case-2.0.1" = { + "remark-lint-definition-case-3.1.2" = { name = "remark-lint-definition-case"; packageName = "remark-lint-definition-case"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz"; - sha512 = "M+XlThtQwEJLQnQb5Gi6xZdkw92rGp7m2ux58WMw/Qlcg02WgHR/O0OcHPe5VO5hMJrtI+cGG5T0svsCgRZd3w=="; + url = "https://registry.npmjs.org/remark-lint-definition-case/-/remark-lint-definition-case-3.1.2.tgz"; + sha512 = "/VxucJKEFykOe2ILgi0LLia0RaSyOPQXpR+tuX4MK3iKxIm7aT2oINgR9ugLpI15xJ463LyTi5mXf+BGveXeWA=="; }; }; - "remark-lint-definition-spacing-2.0.1" = { + "remark-lint-definition-spacing-3.1.2" = { name = "remark-lint-definition-spacing"; packageName = "remark-lint-definition-spacing"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz"; - sha512 = "xK9DOQO5MudITD189VyUiMHBIKltW1oc55L7Fti3i9DedXoBG7Phm+V9Mm7IdWzCVkquZVgVk63xQdqzSQRrSQ=="; + url = "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-3.1.2.tgz"; + sha512 = "l058jAKfZfCOmlbIzoTll+CrZm9Bh42ZVCHcODPSZC8Yx4terCKgIoks+RWJDEdUbEw0YQoYvPc59ZVmp3BIew=="; }; }; - "remark-lint-double-link-0.1.3" = { + "remark-lint-double-link-0.2.0" = { name = "remark-lint-double-link"; packageName = "remark-lint-double-link"; - version = "0.1.3"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-double-link/-/remark-lint-double-link-0.1.3.tgz"; - sha512 = "0zHUJimo0fNAqQPzwt6ii9pRYCxBU0wqilVlily1RxRyTqhy0ANgTQOERMaf+lkTEN1ADEeoyh9gE7VWzqI+WA=="; + url = "https://registry.npmjs.org/remark-lint-double-link/-/remark-lint-double-link-0.2.0.tgz"; + sha512 = "ljThEYMl7tPwvBFOYwLx3fP4jtdvvyfg1QSs6wQ2bZMdnejPMr9JpCLgAvlslJbmtIE1aU53Yq4iZ7ik1s7m6g=="; }; }; - "remark-lint-emphasis-marker-2.0.1" = { + "remark-lint-emphasis-marker-3.1.2" = { name = "remark-lint-emphasis-marker"; packageName = "remark-lint-emphasis-marker"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz"; - sha512 = "7mpbAUrSnHiWRyGkbXRL5kfSKY9Cs8cdob7Fw+Z02/pufXMF4yRWaegJ5NTUu1RE+SKlF44wtWWjvcIoyY6/aw=="; + url = "https://registry.npmjs.org/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-3.1.2.tgz"; + sha512 = "hPZ8vxZrIfxmLA5B66bA8y3PdHjcCQuaLsySIqi5PM2DkpN6a7zAP3v1znyRSaYJ1ANVWcu00/0bNzuUjflGCA=="; }; }; - "remark-lint-fenced-code-marker-2.0.1" = { + "remark-lint-fenced-code-marker-3.1.2" = { name = "remark-lint-fenced-code-marker"; packageName = "remark-lint-fenced-code-marker"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz"; - sha512 = "lujpjm04enn3ma6lITlttadld6eQ1OWAEcT3qZzvFHp+zPraC0yr0eXlvtDN/0UH8mrln/QmGiZp3i8IdbucZg=="; + url = "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-3.1.2.tgz"; + sha512 = "6XNqjOuhT+0c7Q/22aCsMz61ne9g8HRpYF79EXQPdbzYa+PcfPXMiQKStONY3PfC8OE2/3WXI2zcs8w9x+8+VQ=="; }; }; - "remark-lint-file-extension-1.0.5" = { + "remark-lint-file-extension-2.1.2" = { name = "remark-lint-file-extension"; packageName = "remark-lint-file-extension"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz"; - sha512 = "oVQdf5vEomwHkfQ7R/mgmsWW2H/t9kSvnrxtVoNOHr+qnOEafKKDn+AFhioN2kqtjCZBAjSSrePs6xGKmXKDTw=="; + url = "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-2.1.2.tgz"; + sha512 = "Nq54F5R7F1gyj/IMW6SvkAbVNrH+p38WK3//KCoZLDUYFrH0oXgXXFGHi9CT/O0VEopW+bWJfTn8YAJRs0qI5Q=="; }; }; - "remark-lint-final-newline-1.0.5" = { + "remark-lint-final-newline-2.1.2" = { name = "remark-lint-final-newline"; packageName = "remark-lint-final-newline"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-1.0.5.tgz"; - sha512 = "rfLlW8+Fz2dqnaEgU4JwLA55CQF1T4mfSs/GwkkeUCGPenvEYwSkCN2KO2Gr1dy8qPoOdTFE1rSufLjmeTW5HA=="; + url = "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-2.1.2.tgz"; + sha512 = "K0FdPGPyEB94PwNgopwVJFE8oRWi7IhY2ycXFVAMReI51el7EHB8F1gX14tB6p6zyGy6mUh69bCVU9mMTNeOUg=="; }; }; - "remark-lint-hard-break-spaces-2.0.1" = { + "remark-lint-hard-break-spaces-3.1.2" = { name = "remark-lint-hard-break-spaces"; packageName = "remark-lint-hard-break-spaces"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz"; - sha512 = "Qfn/BMQFamHhtbfLrL8Co/dbYJFLRL4PGVXZ5wumkUO5f9FkZC2RsV+MD9lisvGTkJK0ZEJrVVeaPbUIFM0OAw=="; + url = "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-3.1.2.tgz"; + sha512 = "HaW0xsl3TI7VFAqGWWcZtPqyz0NWu19KKjSO7OGFTUJU4S9YiRnhIxmSFM0ZLSsVAynE+dhzVKa8U7dOpWDcOg=="; }; }; - "remark-lint-heading-style-2.0.1" = { + "remark-lint-heading-style-3.1.2" = { name = "remark-lint-heading-style"; packageName = "remark-lint-heading-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz"; - sha512 = "IrFLNs0M5Vbn9qg51AYhGUfzgLAcDOjh2hFGMz3mx664dV6zLcNZOPSdJBBJq3JQR4gKpoXcNwN1+FFaIATj+A=="; + url = "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-3.1.2.tgz"; + sha512 = "0RkcRPV/H2bPFgeInzBkK1cWUwtFTm83I+Db/Z5tDY02GzKOosHLvxtJyj/1391/opAH1LYbHtHWffir99IUgw=="; }; }; - "remark-lint-link-title-style-2.0.1" = { + "remark-lint-link-title-style-3.1.2" = { name = "remark-lint-link-title-style"; packageName = "remark-lint-link-title-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz"; - sha512 = "+Q7Ew8qpOQzjqbDF6sUHmn9mKgje+m2Ho8Xz7cEnGIRaKJgtJzkn/dZqQM/az0gn3zaN6rOuwTwqw4EsT5EsIg=="; + url = "https://registry.npmjs.org/remark-lint-link-title-style/-/remark-lint-link-title-style-3.1.2.tgz"; + sha512 = "if4MahYJVvQUWlrXDF8GSv4b9VtLSgMSDHeikQp1/hGYlihLl9uGw3nlL5Lf9DqTN0qaT6RPbXOjuuzHlk38sg=="; }; }; - "remark-lint-list-item-bullet-indent-3.0.0" = { + "remark-lint-list-item-bullet-indent-4.1.2" = { name = "remark-lint-list-item-bullet-indent"; packageName = "remark-lint-list-item-bullet-indent"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-3.0.0.tgz"; - sha512 = "X2rleWP8XReC4LXKF7Qi5vYiPJkA4Grx5zxsjHofFrVRz6j0PYOCuz7vsO+ZzMunFMfom6FODnscSWz4zouDVw=="; + url = "https://registry.npmjs.org/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-4.1.2.tgz"; + sha512 = "WgU5nooqIEm6f35opcbHKBzWrdFJA3XcyTfB3nv/v0KX43/h6qFGmmMJ5kEiaFExuQp3dZSdatWuY0YZ9YRbUg=="; }; }; - "remark-lint-list-item-content-indent-2.0.1" = { + "remark-lint-list-item-content-indent-3.1.2" = { name = "remark-lint-list-item-content-indent"; packageName = "remark-lint-list-item-content-indent"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz"; - sha512 = "OzUMqavxyptAdG7vWvBSMc9mLW9ZlTjbW4XGayzczd3KIr6Uwp3NEFXKx6MLtYIM/vwBqMrPQUrObOC7A2uBpQ=="; + url = "https://registry.npmjs.org/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-3.1.2.tgz"; + sha512 = "TB0pmrWiRaQW80Y/PILFQTnHDghRxXNzMwyawlP+DBF9gNom3pEBmb4ZlGQlN0aa3r8VWeIKdv1ylHrfXE0vqA=="; }; }; - "remark-lint-list-item-indent-2.0.1" = { + "remark-lint-list-item-indent-3.1.2" = { name = "remark-lint-list-item-indent"; packageName = "remark-lint-list-item-indent"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz"; - sha512 = "4IKbA9GA14Q9PzKSQI6KEHU/UGO36CSQEjaDIhmb9UOhyhuzz4vWhnSIsxyI73n9nl9GGRAMNUSGzr4pQUFwTA=="; + url = "https://registry.npmjs.org/remark-lint-list-item-indent/-/remark-lint-list-item-indent-3.1.2.tgz"; + sha512 = "tkrra1pxZVE4OVJGfN435u/v0ljruXU+dHzWiKDYeifquD4aWhJxvSApu7+FbE098D/4usVXgMxwFkNhrpZcSQ=="; }; }; "remark-lint-match-punctuation-0.2.1" = { @@ -48726,31 +48537,31 @@ let sha512 = "XgarnmpBHMsCNRnhTNLf/8dDe5/gXdA/mQnBDPG/XZFNMebS6GFnWQpuL3cyzLmuWD62I1A5ouZczRZcrWYrTQ=="; }; }; - "remark-lint-no-auto-link-without-protocol-2.0.1" = { + "remark-lint-no-auto-link-without-protocol-3.1.2" = { name = "remark-lint-no-auto-link-without-protocol"; packageName = "remark-lint-no-auto-link-without-protocol"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz"; - sha512 = "TFcXxzucsfBb/5uMqGF1rQA+WJJqm1ZlYQXyvJEXigEZ8EAxsxZGPb/gOQARHl/y0vymAuYxMTaChavPKaBqpQ=="; + url = "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-3.1.2.tgz"; + sha512 = "mPIdFOGxdDhCMa2qIzjzjDzDoQeyK+/1BBgsseqThuBtoAoXR5l1TZfII2isNbBo6L8d+fMFdx1/3qALoDjtcA=="; }; }; - "remark-lint-no-blockquote-without-marker-4.0.0" = { + "remark-lint-no-blockquote-without-marker-5.1.2" = { name = "remark-lint-no-blockquote-without-marker"; packageName = "remark-lint-no-blockquote-without-marker"; - version = "4.0.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-4.0.0.tgz"; - sha512 = "Y59fMqdygRVFLk1gpx2Qhhaw5IKOR9T38Wf7pjR07bEFBGUNfcoNVIFMd1TCJfCPQxUyJzzSqfZz/KT7KdUuiQ=="; + url = "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-5.1.2.tgz"; + sha512 = "QPbqsrt7EfpSWqTkZJ9tepabPIhBDlNqZkuxxMQYD0OQ2N+tHDUq3zE1JxI5ts1V9o/mWApgySocqGd3jlcKmQ=="; }; }; - "remark-lint-no-emphasis-as-heading-2.0.1" = { + "remark-lint-no-emphasis-as-heading-3.1.2" = { name = "remark-lint-no-emphasis-as-heading"; packageName = "remark-lint-no-emphasis-as-heading"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz"; - sha512 = "z86+yWtVivtuGIxIC4g9RuATbgZgOgyLcnaleonJ7/HdGTYssjJNyqCJweaWSLoaI0akBQdDwmtJahW5iuX3/g=="; + url = "https://registry.npmjs.org/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-3.1.2.tgz"; + sha512 = "2DDx0VkqSExR6oqBiQtOsmdDwT7f3hpnPwPvBCk7BDeDU53JWY1kBAkRObkEptgH3GfpwxIQymIdHXesBpAQAg=="; }; }; "remark-lint-no-empty-sections-4.0.0" = { @@ -48762,94 +48573,94 @@ let sha512 = "Tx1nCu7Dq3dsJ500402sSvM0uVK/6khSuEjx8K8u9aHN+Y4vjL6h88xVzdzCmZq2J2yqyFnvMjG1y7lQv+DRvg=="; }; }; - "remark-lint-no-file-name-articles-1.0.5" = { + "remark-lint-no-file-name-articles-2.1.2" = { name = "remark-lint-no-file-name-articles"; packageName = "remark-lint-no-file-name-articles"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz"; - sha512 = "AQk5eTb3s3TAPPjiglZgqlQj4ycao+gPs8/XkdN1VCPUtewW0GgwoQe7YEuBKayJ6ioN8dGP37Kg/P/PlKaRQA=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-2.1.2.tgz"; + sha512 = "kM4vwBkne7f9euDKsuyxTtrsiafjH+KOwu8ZmuSVWh5U+u0EMcPyN5fxfaQIW+5FkrJA1jwnRu7ciXJBJt74Og=="; }; }; - "remark-lint-no-file-name-consecutive-dashes-1.0.5" = { + "remark-lint-no-file-name-consecutive-dashes-2.1.2" = { name = "remark-lint-no-file-name-consecutive-dashes"; packageName = "remark-lint-no-file-name-consecutive-dashes"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz"; - sha512 = "Mg2IDsi790/dSdAzwnBnsMYdZm3qC2QgGwqOWcr0TPABJhhjC3p8r5fX4MNMTXI5It7B7bW9+ImmCeLOZiXkLg=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-2.1.2.tgz"; + sha512 = "gw06jaaFwBR3s+3E2kJlv+E7rAzS7Nj+MFU7TViwbsYnR7PA96htLVDCjClyNUE7JHUNcv93HdLm8ykg8kRyNA=="; }; }; - "remark-lint-no-file-name-irregular-characters-1.0.5" = { + "remark-lint-no-file-name-irregular-characters-2.1.2" = { name = "remark-lint-no-file-name-irregular-characters"; packageName = "remark-lint-no-file-name-irregular-characters"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz"; - sha512 = "Oe5i99qNUKc2bxmiH421o5B/kqlf1dfjAxpHNLhi2X2dXE91zRGavrlRM/4f4oR0N9Bqb3qB9JZPyMPWrzu9XA=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-2.1.2.tgz"; + sha512 = "2tcqzLm39Jc4THNP2yvJruOz2HtV4yh+eePiySKmhfZk/6ifMyOF/wlKHKcswczSGE4InNTfxJnc/AoxOJEdkw=="; }; }; - "remark-lint-no-file-name-mixed-case-1.0.5" = { + "remark-lint-no-file-name-mixed-case-2.1.2" = { name = "remark-lint-no-file-name-mixed-case"; packageName = "remark-lint-no-file-name-mixed-case"; - version = "1.0.5"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz"; - sha512 = "ilrUCbHZin/ENwr8c3SC2chgkFsizXjBQIB/oZ7gnm1IkCkZPiMyXZAHdpwC/DjbrpGxfMYh9JmIHao4giS5+A=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-2.1.2.tgz"; + sha512 = "0mTrjxBB4/0rV7sef+xjV5Aeb6LuW19X4QbNHW2RW7aMy+mtgJU03wdb8Y0LTnWVFHjUbc+iHrsFeCA/Pu1kew=="; }; }; - "remark-lint-no-file-name-outer-dashes-1.0.6" = { + "remark-lint-no-file-name-outer-dashes-2.1.2" = { name = "remark-lint-no-file-name-outer-dashes"; packageName = "remark-lint-no-file-name-outer-dashes"; - version = "1.0.6"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz"; - sha512 = "rT8CmcIlenegS0Yst4maYXdZfqIjBOiRUY8j/KJkORF5tKH+3O1/S07025qPGmcRihzK3w4yO0K8rgkKQw0b9w=="; + url = "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-2.1.2.tgz"; + sha512 = "VrbHg25Oo9k/bNbS7ye1X7F6ER4uZSubO+t5DHJ4WZ6iVbNtBar/JwzVelY1YxUAutv42OvHfuveh4vKlcNgVA=="; }; }; - "remark-lint-no-heading-content-indent-3.0.0" = { + "remark-lint-no-heading-content-indent-4.1.2" = { name = "remark-lint-no-heading-content-indent"; packageName = "remark-lint-no-heading-content-indent"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-3.0.0.tgz"; - sha512 = "yULDoVSIqKylLDfW6mVUbrHlyEWUSFtVFiKc+/BA412xDIhm8HZLUnP+FsuBC0OzbIZ+bO9Txy52WtO3LGnK1A=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-4.1.2.tgz"; + sha512 = "TTxFsm1f4ZHFxZQCuz7j0QK4RvP6oArTiwazKLr16yaZe1608ypogMek4A30j2xX8WuO9+2uBzLXCY5OBo5x5Q=="; }; }; - "remark-lint-no-heading-indent-3.0.0" = { + "remark-lint-no-heading-indent-4.1.2" = { name = "remark-lint-no-heading-indent"; packageName = "remark-lint-no-heading-indent"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-3.0.0.tgz"; - sha512 = "b8ImhLv2AnRDxtYUODplzsl/7IwQ+lqRmD1bwbZgSerEP9MLaULW3SjH37EyA6z+8rCDjvEyppKKU6zec0TCjg=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-4.1.2.tgz"; + sha512 = "XFoSebfsYV6EFYRCYkCzSw6xxgltN5l3aPH+UfCk/0geMnl3DrCQjbQt9qhxQzBSBa4gA91CGs2DRI5Xxbwzig=="; }; }; - "remark-lint-no-heading-punctuation-2.0.1" = { + "remark-lint-no-heading-punctuation-3.1.2" = { name = "remark-lint-no-heading-punctuation"; packageName = "remark-lint-no-heading-punctuation"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz"; - sha512 = "lY/eF6GbMeGu4cSuxfGHyvaQQBIq/6T/o+HvAR5UfxSTxmxZFwbZneAI2lbeR1zPcqOU87NsZ5ZZzWVwdLpPBw=="; + url = "https://registry.npmjs.org/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-3.1.2.tgz"; + sha512 = "KnvHEVB/DcxJOhUvVteiovAy1+32YY5Vm0UBJqYCFrrHnN/y9ETvOJzlxFy47TaB8x2UyncSEg2JuT66UL4ONQ=="; }; }; - "remark-lint-no-inline-padding-3.0.0" = { + "remark-lint-no-inline-padding-4.1.2" = { name = "remark-lint-no-inline-padding"; packageName = "remark-lint-no-inline-padding"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-3.0.0.tgz"; - sha512 = "3s9uW3Yux9RFC0xV81MQX3bsYs+UY7nPnRuMxeIxgcVwxQ4E/mTJd9QjXUwBhU9kdPtJ5AalngdmOW2Tgar8Cg=="; + url = "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-4.1.2.tgz"; + sha512 = "dGyhWsiqCZS3Slob0EVBUfsFBbdpMIBCvb56LlCgaHbnLsnNYx8PpF/wA5CgsN8BXIbXfRpyPB5cIJwIq5taYg=="; }; }; - "remark-lint-no-multiple-toplevel-headings-2.0.1" = { + "remark-lint-no-multiple-toplevel-headings-3.1.2" = { name = "remark-lint-no-multiple-toplevel-headings"; packageName = "remark-lint-no-multiple-toplevel-headings"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz"; - sha512 = "VKSItR6c+u3OsE5pUiSmNusERNyQS9Nnji26ezoQ1uvy06k3RypIjmzQqJ/hCkSiF+hoyC3ibtrrGT8gorzCmQ=="; + url = "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-3.1.2.tgz"; + sha512 = "9rJSsrwdzwKmtuloBjJobLzjGL7Lgtk3+vMNUyuH9z/nBfkUCN3qxn3Nt9AxL+wwSAsHV6e74W+W2S1ohBLt6A=="; }; }; "remark-lint-no-repeat-punctuation-0.1.4" = { @@ -48861,130 +48672,130 @@ let sha512 = "JJduCs4FimdBcR1AB576SqIYOjt+7t8OjTnnlZMvjnw7lzkuL0+nNNHyNXVPaK6jxaLjEUhrH2/smU6vZFUT7g=="; }; }; - "remark-lint-no-shell-dollars-2.0.2" = { + "remark-lint-no-shell-dollars-3.1.2" = { name = "remark-lint-no-shell-dollars"; packageName = "remark-lint-no-shell-dollars"; - version = "2.0.2"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz"; - sha512 = "zhkHZOuyaD3r/TUUkkVqW0OxsR9fnSrAnHIF63nfJoAAUezPOu8D1NBsni6rX8H2DqGbPYkoeWrNsTwiKP0yow=="; + url = "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-3.1.2.tgz"; + sha512 = "np2MDEhXHviXhbQFjnC1QYv5/fxCV1cIHfGMoJpqiW7Zcu/UGCOo5TE3XswZH4ukHZJ65c3X2A6qfLDW+ur3CQ=="; }; }; - "remark-lint-no-table-indentation-3.0.0" = { + "remark-lint-no-table-indentation-4.1.2" = { name = "remark-lint-no-table-indentation"; packageName = "remark-lint-no-table-indentation"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-3.0.0.tgz"; - sha512 = "+l7GovI6T+3LhnTtz/SmSRyOb6Fxy6tmaObKHrwb/GAebI/4MhFS1LVo3vbiP/RpPYtyQoFbbuXI55hqBG4ibQ=="; + url = "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-4.1.2.tgz"; + sha512 = "5lkO+Yrtni/CDMZi7mlwbB2zzRQLH94DesboXg51aO2UfZlSn5dZNhmN5wkyCU2AiApUhlFNbxfKMHOWFPLdog=="; }; }; - "remark-lint-no-undefined-references-3.0.0" = { + "remark-lint-no-undefined-references-4.2.1" = { name = "remark-lint-no-undefined-references"; packageName = "remark-lint-no-undefined-references"; - version = "3.0.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-3.0.0.tgz"; - sha512 = "0hzaJS9GuzSQVOeeNdJr/s66LRQOzp618xuOQPYWHcJdd+SCaRTyWbjMrTM/cCI5L1sYjgurp410NkIBQ32Vqg=="; + url = "https://registry.npmjs.org/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-4.2.1.tgz"; + sha512 = "HdNg5b2KiuNplcuVvRtsrUiROw557kAG1CiZYB7jQrrVWFgd86lKTa3bDiywe+87dGrGmHd3qQ28eZYTuHz2Nw=="; }; }; - "remark-lint-no-unneeded-full-reference-image-2.0.1" = { + "remark-lint-no-unneeded-full-reference-image-3.1.2" = { name = "remark-lint-no-unneeded-full-reference-image"; packageName = "remark-lint-no-unneeded-full-reference-image"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-2.0.1.tgz"; - sha512 = "ZqkrW6l/n1EmcGdtzBFoDygG2ehd/Wx46Id9Dagg15oLzwvbhp5mJIXArXU2qGrF82w1hfainCaZzyH/OBJtEg=="; + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-3.1.2.tgz"; + sha512 = "o8xIkhLaOK69Rz051KWTvjwfIE4xxx0zUyD5Mw0nt4I9/zQrpHf5+EwfjXdmQjxk116j6/0Q4FyrXB36MTPjhA=="; }; }; - "remark-lint-no-unneeded-full-reference-link-2.0.1" = { + "remark-lint-no-unneeded-full-reference-link-3.1.2" = { name = "remark-lint-no-unneeded-full-reference-link"; packageName = "remark-lint-no-unneeded-full-reference-link"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-link/-/remark-lint-no-unneeded-full-reference-link-2.0.1.tgz"; - sha512 = "OcPQiG6meVpvfydzxkxPdVc8jcXdklQW4gMjY2BevLtVoaIJ+dgNBPazyYHP/0EzpVY2RftD3CZ+5hiLW2rgpA=="; + url = "https://registry.npmjs.org/remark-lint-no-unneeded-full-reference-link/-/remark-lint-no-unneeded-full-reference-link-3.1.2.tgz"; + sha512 = "iFneI8HkcPxlooXbNEmF/fmNsyVu4uOhRqQD5KsDVfJSXZSczcNm5p/SfjthfmK5copxQ0fHhcq0A1J9Iakt9A=="; }; }; - "remark-lint-no-unused-definitions-2.0.1" = { + "remark-lint-no-unused-definitions-3.1.2" = { name = "remark-lint-no-unused-definitions"; packageName = "remark-lint-no-unused-definitions"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-2.0.1.tgz"; - sha512 = "+BMc0BOjc364SvKYLkspmxDch8OaKPbnUGgQBvK0Bmlwy42baR4C9zhwAWBxm0SBy5Z4AyM4G4jKpLXPH40Oxg=="; + url = "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-3.1.2.tgz"; + sha512 = "bOcaJAnjKxT3kASFquUA3fO9xem9wZhVqt8TbqjA84+G4n40qjaLXDs/4vq73aMsSde73K0f3j1u0pMe7et8yQ=="; }; }; - "remark-lint-ordered-list-marker-style-2.0.1" = { + "remark-lint-ordered-list-marker-style-3.1.2" = { name = "remark-lint-ordered-list-marker-style"; packageName = "remark-lint-ordered-list-marker-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz"; - sha512 = "Cnpw1Dn9CHn+wBjlyf4qhPciiJroFOEGmyfX008sQ8uGoPZsoBVIJx76usnHklojSONbpjEDcJCjnOvfAcWW1A=="; + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-3.1.2.tgz"; + sha512 = "62iVE/YQsA0Azaqt8yAJWPplWLS47kDLjXeC2PlRIAzCqbNt9qH3HId8vZ15QTSrp8rHmJwrCMdcqV6AZUi7gQ=="; }; }; - "remark-lint-ordered-list-marker-value-2.0.1" = { + "remark-lint-ordered-list-marker-value-3.1.2" = { name = "remark-lint-ordered-list-marker-value"; packageName = "remark-lint-ordered-list-marker-value"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz"; - sha512 = "blt9rS7OKxZ2NW8tqojELeyNEwPhhTJGVa+YpUkdEH+KnrdcD7Nzhnj6zfLWOx6jFNZk3jpq5nvLFAPteHaNKg=="; + url = "https://registry.npmjs.org/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-3.1.2.tgz"; + sha512 = "kG08nhsFk8rhoXK5EeDN/wN28CxefraDud/MaZnji8LEyxF3HAkzFuETr9laOn8Ey+n8h/C0mpqAwUf4thyJ5g=="; }; }; - "remark-lint-rule-style-2.0.1" = { + "remark-lint-rule-style-3.1.2" = { name = "remark-lint-rule-style"; packageName = "remark-lint-rule-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz"; - sha512 = "hz4Ff9UdlYmtO6Czz99WJavCjqCer7Cav4VopXt+yVIikObw96G5bAuLYcVS7hvMUGqC9ZuM02/Y/iq9n8pkAg=="; + url = "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-3.1.2.tgz"; + sha512 = "0CsX2XcX9pIhAP5N7Y8mhYXp3/Ld+NvxXY1p0LHAq0NZu17UsZLuegvx/s25uFbQs08DcmSqyKnepU9qGGqmTQ=="; }; }; - "remark-lint-strong-marker-2.0.1" = { + "remark-lint-strong-marker-3.1.2" = { name = "remark-lint-strong-marker"; packageName = "remark-lint-strong-marker"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz"; - sha512 = "8X2IsW1jZ5FmW9PLfQjkL0OVy/J3xdXLcZrG1GTeQKQ91BrPFyEZqUM2oM6Y4S6LGtxWer+neZkPZNroZoRPBQ=="; + url = "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-3.1.2.tgz"; + sha512 = "U/g4wngmiI0Q6WBRQG6pZxnDS33Wt/0QYA3+KNFBDykoi1vXsDEorIqy3dEag9z6XHwcMvFDsff6VRUhaOJWQg=="; }; }; - "remark-lint-table-cell-padding-3.0.0" = { + "remark-lint-table-cell-padding-4.1.3" = { name = "remark-lint-table-cell-padding"; packageName = "remark-lint-table-cell-padding"; - version = "3.0.0"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-3.0.0.tgz"; - sha512 = "sEKrbyFZPZpxI39R8/r+CwUrin9YtyRwVn0SQkNQEZWZcIpylK+bvoKIldvLIXQPob+ZxklL0GPVRzotQMwuWQ=="; + url = "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-4.1.3.tgz"; + sha512 = "N9xtnS6MG/H3srAMjqqaF26A7socr87pIgt64dr5rxoSbDRWRPChGQ8y7wKyV8VeyRNF37e3E5KB3bQVqjSYaQ=="; }; }; - "remark-lint-table-pipe-alignment-2.0.1" = { + "remark-lint-table-pipe-alignment-3.1.3" = { name = "remark-lint-table-pipe-alignment"; packageName = "remark-lint-table-pipe-alignment"; - version = "2.0.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz"; - sha512 = "O89U7bp0ja6uQkT2uQrNB76GaPvFabrHiUGhqEUnld21yEdyj7rgS57kn84lZNSuuvN1Oor6bDyCwWQGzzpoOQ=="; + url = "https://registry.npmjs.org/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-3.1.3.tgz"; + sha512 = "bnE8WrB4kSrN+Yr+xN2GHWVgGukeSFU43qPMrpCzTyOSbzep366wORlFKqZmyFPEkIZ/uAUFS0Qm9DND66Yz/A=="; }; }; - "remark-lint-table-pipes-3.0.0" = { + "remark-lint-table-pipes-4.1.2" = { name = "remark-lint-table-pipes"; packageName = "remark-lint-table-pipes"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-3.0.0.tgz"; - sha512 = "QPokSazEdl0Y8ayUV9UB0Ggn3Jos/RAQwIo0z1KDGnJlGDiF80Jc6iU9RgDNUOjlpQffSLIfSVxH5VVYF/K3uQ=="; + url = "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-4.1.2.tgz"; + sha512 = "Ex2cJDXA0hdD9CC5Nu0p3K5LP+AhzPvk4sIOSbevCTSRyCS/SkNk4CQ6pwWBxuPVuHQUkqXkT8lgu8wwr/9A3A=="; }; }; - "remark-lint-unordered-list-marker-style-2.0.1" = { + "remark-lint-unordered-list-marker-style-3.1.2" = { name = "remark-lint-unordered-list-marker-style"; packageName = "remark-lint-unordered-list-marker-style"; - version = "2.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz"; - sha512 = "8KIDJNDtgbymEvl3LkrXgdxPMTOndcux3BHhNGB2lU4UnxSpYeHsxcDgirbgU6dqCAfQfvMjPvfYk19QTF9WZA=="; + url = "https://registry.npmjs.org/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-3.1.2.tgz"; + sha512 = "JFiyB4ZprJGGndCaFB8FssXd48m4Kh+CUqzNgu3lBLEiW8dEAGRlD9M2AzyyA+Q29WJP/FntDCbP22DeON91UA=="; }; }; "remark-mdx-2.0.0" = { @@ -48996,24 +48807,6 @@ let sha512 = "TDnjSv77Oynf+K1deGWZPKSwh3/9hykVAxVm9enAw6BmicCGklREET8s19KYnjGsNPms0pNDJLmp+bnHDVItAQ=="; }; }; - "remark-mdx-2.0.0-next.7" = { - name = "remark-mdx"; - packageName = "remark-mdx"; - version = "2.0.0-next.7"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; - sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; - }; - }; - "remark-message-control-6.0.0" = { - name = "remark-message-control"; - packageName = "remark-message-control"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-6.0.0.tgz"; - sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA=="; - }; - }; "remark-message-control-7.1.1" = { name = "remark-message-control"; packageName = "remark-message-control"; @@ -49032,13 +48825,13 @@ let sha512 = "3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw=="; }; }; - "remark-parse-8.0.3" = { + "remark-parse-11.0.0" = { name = "remark-parse"; packageName = "remark-parse"; - version = "8.0.3"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"; - sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz"; + sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA=="; }; }; "remark-parse-9.0.0" = { @@ -49050,15 +48843,6 @@ let sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; }; }; - "remark-retext-4.0.0" = { - name = "remark-retext"; - packageName = "remark-retext"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-retext/-/remark-retext-4.0.0.tgz"; - sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q=="; - }; - }; "remark-retext-5.0.1" = { name = "remark-retext"; packageName = "remark-retext"; @@ -49068,13 +48852,13 @@ let sha512 = "h3kOjKNy7oJfohqXlKp+W4YDigHD3rw01x91qvQP/cUkK5nJrDl6yEYwTujQCAXSLZrsBxywlK3ntzIX6c29aA=="; }; }; - "remark-stringify-8.1.1" = { + "remark-stringify-11.0.0" = { name = "remark-stringify"; packageName = "remark-stringify"; - version = "8.1.1"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; - sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz"; + sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="; }; }; "remark-stringify-9.0.1" = { @@ -49239,6 +49023,15 @@ let sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw=="; }; }; + "request-3.0.1" = { + name = "request"; + packageName = "request"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz"; + sha512 = "TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ=="; + }; + }; "request-compose-2.1.6" = { name = "request-compose"; packageName = "request-compose"; @@ -49320,15 +49113,6 @@ let sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; }; }; - "require-all-3.0.0" = { - name = "require-all"; - packageName = "require-all"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz"; - sha512 = "jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw=="; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -49356,6 +49140,15 @@ let sha512 = "efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg=="; }; }; + "require-in-the-middle-7.2.0" = { + name = "require-in-the-middle"; + packageName = "require-in-the-middle"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz"; + sha512 = "3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw=="; + }; + }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -49437,15 +49230,6 @@ let sha512 = "ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="; }; }; - "reserved-0.1.2" = { - name = "reserved"; - packageName = "reserved"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/reserved/-/reserved-0.1.2.tgz"; - sha512 = "/qO54MWj5L8WCBP9/UNe2iefJc+L9yETbH32xO/ft/EYPOTCR5k+azvDUgdCOKwZH8hXwPd0b8XBL78Nn2U69g=="; - }; - }; "reserved-words-0.1.2" = { name = "reserved-words"; packageName = "reserved-words"; @@ -49455,22 +49239,13 @@ let sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw=="; }; }; - "resolve-1.22.2" = { + "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; - version = "1.22.2"; + version = "1.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"; - sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; - }; - }; - "resolve-1.22.6" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.6"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; - sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"; + sha512 = "oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="; }; }; "resolve-1.7.1" = { @@ -49482,13 +49257,13 @@ let sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; }; }; - "resolve-2.0.0-next.4" = { + "resolve-2.0.0-next.5" = { name = "resolve"; packageName = "resolve"; - version = "2.0.0-next.4"; + version = "2.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz"; - sha512 = "iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ=="; + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz"; + sha512 = "U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA=="; }; }; "resolve-alpn-1.2.1" = { @@ -49599,6 +49374,15 @@ let sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; + "resolve.exports-2.0.2" = { + name = "resolve.exports"; + packageName = "resolve.exports"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz"; + sha512 = "X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="; + }; + }; "resp-modifier-6.0.2" = { name = "resp-modifier"; packageName = "resp-modifier"; @@ -49689,15 +49473,6 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retext-english-3.0.4" = { - name = "retext-english"; - packageName = "retext-english"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.4.tgz"; - sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; - }; - }; "retext-english-4.1.0" = { name = "retext-english"; packageName = "retext-english"; @@ -49707,15 +49482,6 @@ let sha512 = "Pky2idjvgkzfodO0GH9X4IU8LX/d4ULTnLf7S1WsBRlSCh/JdTFPafXZstJqZehtQWNHrgoCqVOiGugsNFYvIQ=="; }; }; - "retext-equality-5.5.0" = { - name = "retext-equality"; - packageName = "retext-equality"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.5.0.tgz"; - sha512 = "ha7zrQ+Bq4xWifm21IcAzc9xhMWCJYfePUjRRNE2mXi8cFhaq1F8+cD78YA2nd6W2mxd11VGTVKY9O0DmzEywQ=="; - }; - }; "retext-equality-6.6.0" = { name = "retext-equality"; packageName = "retext-equality"; @@ -49725,15 +49491,6 @@ let sha512 = "il0Q8Dlxluc67UQnk49XmwISl3mzf1Lvuat0yZKzR2NuuluzTXI4EK44HA5JOobt/vmYkDaJaDsxHf0MmE4OMA=="; }; }; - "retext-profanities-6.1.0" = { - name = "retext-profanities"; - packageName = "retext-profanities"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-6.1.0.tgz"; - sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; - }; - }; "retext-profanities-7.2.2" = { name = "retext-profanities"; packageName = "retext-profanities"; @@ -49806,13 +49563,13 @@ let sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; - "rfc4648-1.5.2" = { + "rfc4648-1.5.3" = { name = "rfc4648"; packageName = "rfc4648"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.2.tgz"; - sha512 = "tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg=="; + url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.3.tgz"; + sha512 = "MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ=="; }; }; "rfdc-1.3.0" = { @@ -49923,15 +49680,6 @@ let sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="; }; }; - "rollup-2.79.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.79.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"; - sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; - }; - }; "rollup-3.29.4" = { name = "rollup"; packageName = "rollup"; @@ -50346,13 +50094,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.68.0" = { + "sass-1.69.5" = { name = "sass"; packageName = "sass"; - version = "1.68.0"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; - sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; }; "sass-formatter-0.7.8" = { @@ -50526,13 +50274,13 @@ let sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; }; }; - "selfsigned-2.1.1" = { + "selfsigned-2.4.1" = { name = "selfsigned"; packageName = "selfsigned"; - version = "2.1.1"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"; - sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz"; + sha512 = "th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q=="; }; }; "semver-4.3.6" = { @@ -50562,15 +50310,6 @@ let sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="; }; }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; "semver-5.7.2" = { name = "semver"; packageName = "semver"; @@ -50769,13 +50508,13 @@ let sha512 = "eDqaz4MasTn6Mp3dagKzIbiNsJpgpueMEQqCJeN9F9XQRFLDGFJ0kX8R3uMp+mU7J58dWjr4q6eks/nUX/vnJQ=="; }; }; - "sentence-splitter-4.2.1" = { + "sentence-splitter-4.3.0" = { name = "sentence-splitter"; packageName = "sentence-splitter"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-4.2.1.tgz"; - sha512 = "zn7awgCg40lyb+fe6N/fRJS3r+Ag3SmrmiYHZZSM9oQ2HTnwSMooUgQXSMLeQdi5HWMYOnhrovE2JZ3pyGU0dg=="; + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-4.3.0.tgz"; + sha512 = "srJOMqv7JeEmsbVa/N64ULey2N6/OuZzeKWn2Zrj0DiTBlU930JGr/rKKlKQRigzXtLMOtl32/Gm5G3HW8/ULA=="; }; }; "serialize-error-2.1.0" = { @@ -50823,15 +50562,6 @@ let sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; }; - "serialport-12.0.0" = { - name = "serialport"; - packageName = "serialport"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-12.0.0.tgz"; - sha512 = "AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA=="; - }; - }; "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -50922,6 +50652,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "set-function-length-1.1.1" = { + name = "set-function-length"; + packageName = "set-function-length"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; + sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + }; + }; "set-function-name-2.0.1" = { name = "set-function-name"; packageName = "set-function-name"; @@ -51219,15 +50958,6 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; - }; - }; "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; @@ -51264,6 +50994,15 @@ let sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A=="; }; }; + "sigstore-2.1.0" = { + name = "sigstore"; + packageName = "sigstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz"; + sha512 = "kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw=="; + }; + }; "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; @@ -51453,13 +51192,13 @@ let sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; }; }; - "skin-tone-1.0.0" = { + "skin-tone-3.0.0" = { name = "skin-tone"; packageName = "skin-tone"; - version = "1.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; - sha512 = "dXSMc69UbL3huJWTE7acZbg8UaGeiZRys4WRflV+I9rGLa0Z0duusGgg3nWVcizD3IaztFKWAXboXcAihi3zuA=="; + url = "https://registry.npmjs.org/skin-tone/-/skin-tone-3.0.0.tgz"; + sha512 = "+HTlUiUJr3SjmOiKV3dPeGWcl7dgqv09OgFWJxD26vOmYss7DWKCl6sqHEjM1hddov/vXQN2bOKIMr0DMUJVSQ=="; }; }; "slash-1.0.0" = { @@ -52200,22 +51939,22 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.15" = { + "spdx-license-ids-3.0.16" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.15"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz"; - sha512 = "lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; + sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; }; }; - "spdx-license-list-6.7.0" = { + "spdx-license-list-6.8.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; - version = "6.7.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.7.0.tgz"; - sha512 = "NFqavuJxNsHdwSy/0PjmUpcc76XwlmHQRPjVVtE62qmSLhKJUnzSvJCkU9nrY6TsChfGU1xqGePriBkNtNRMiA=="; + url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.8.0.tgz"; + sha512 = "5UdM7r9yJ1EvsPQZWfa41AZjLQngl9iMMysm9XBW7Lqhq7aF8cllfqjS+rFCHB8FFMGSM0yFWue2LUV9mR0QzQ=="; }; }; "spdy-1.32.5" = { @@ -52254,6 +51993,15 @@ let sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; }; }; + "speech-rule-engine-2.4.0" = { + name = "speech-rule-engine"; + packageName = "speech-rule-engine"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-2.4.0.tgz"; + sha512 = "7IXDmpGiQOJWUPVy/rcayqi1aTCrhcQ/bVACu2oyueEuiYzPW8GebYRF4LeyMROL/E0kxkO5U66t0aFWCv0QCQ=="; + }; + }; "speed-limiter-1.0.2" = { name = "speed-limiter"; packageName = "speed-limiter"; @@ -52479,13 +52227,13 @@ let sha512 = "sztRa50SL1LVxZnF1au6QT1SC2z0S1oEOyi2Kpnlg6urDns93aL32YxiJcNkLcY+VHFtVqm/SRv4cb+6LeoBQA=="; }; }; - "sshpk-1.17.0" = { + "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz"; + sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; "sshpk-1.7.1" = { @@ -52614,15 +52362,6 @@ let sha512 = "QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng=="; }; }; - "state-toggle-1.0.3" = { - name = "state-toggle"; - packageName = "state-toggle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz"; - sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; - }; - }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -52947,13 +52686,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.15.1" = { + "streamx-2.15.2" = { name = "streamx"; packageName = "streamx"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz"; - sha512 = "fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz"; + sha512 = "b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg=="; }; }; "strict-uri-encode-1.1.0" = { @@ -53100,6 +52839,15 @@ let sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ=="; }; }; + "string-width-7.0.0" = { + name = "string-width"; + packageName = "string-width"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz"; + sha512 = "GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw=="; + }; + }; "string-width-cjs-4.2.3" = { name = "string-width-cjs"; packageName = "string-width-cjs"; @@ -53190,15 +52938,6 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; - "stringify-entities-3.1.0" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz"; - sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; - }; - }; "stringify-entities-4.0.3" = { name = "stringify-entities"; packageName = "stringify-entities"; @@ -53550,13 +53289,13 @@ let sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "subarg-1.0.0" = { @@ -53775,13 +53514,13 @@ let sha512 = "vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA=="; }; }; - "svelte-4.2.1" = { + "svelte-4.2.2" = { name = "svelte"; packageName = "svelte"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.2.1.tgz"; - sha512 = "LpLqY2Jr7cRxkrTc796/AaaoMLF/1ax7cto8Ot76wrvKQhrPmZ0JgajiWPmg9mTSDqO16SSLiD17r9MsvAPTmw=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.2.2.tgz"; + sha512 = "My2tytF2e2NnHSpn2M7/3VdXT4JdTglYVUuSuK/mXL2XtulPYbeBfl8Dm1QiaKRn0zoULRnL+EtfZHHP0k4H3A=="; }; }; "svelte-preprocess-5.0.4" = { @@ -53793,13 +53532,13 @@ let sha512 = "ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw=="; }; }; - "svelte2tsx-0.6.22" = { + "svelte2tsx-0.6.23" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.22"; + version = "0.6.23"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.22.tgz"; - sha512 = "eFCfz0juaWeanbwGeQV21kPMwH3LKhfrUYRy1PqRmlieuHvJs8VeK7CaoHJdpBZWCXba2cltHVdywJmwOGhbww=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.23.tgz"; + sha512 = "3bwd1PuWUA3oEXy8+85zrLDnmJOsVpShpKVAehGWeYsz/66zMihTpRpUN97VVAKTZbO5tP4wnchHUXYs0zOwdw=="; }; }; "sver-compat-1.5.0" = { @@ -53847,13 +53586,13 @@ let sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; }; }; - "svgo-3.0.2" = { + "svgo-3.0.3" = { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; }; "swagger2openapi-7.0.8" = { @@ -53928,13 +53667,22 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.21.9" = { + "system-architecture-0.1.0" = { + name = "system-architecture"; + packageName = "system-architecture"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/system-architecture/-/system-architecture-0.1.0.tgz"; + sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; + }; + }; + "systeminformation-5.21.16" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.21.9"; + version = "5.21.16"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.9.tgz"; - sha512 = "7pI4mu9P/2MGDV0T49B52E7IULBGj+kRVk6JSYUj5qfAk7N7C7aNX15fXziqrbgZntc6/jjYzWeb/x41jhg/eA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.16.tgz"; + sha512 = "WJZdc5RbmDF1VOJcS+G2oIBeNgmMTyJ8+enHe9stIyBg2XhboUTsSfN9HrFMDV+fgXwJ50kNKgD3TzodsFgB+g=="; }; }; "sywac-1.3.0" = { @@ -53983,13 +53731,13 @@ let sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; - "tailwindcss-3.3.3" = { + "tailwindcss-3.3.5" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz"; - sha512 = "A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz"; + sha512 = "5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA=="; }; }; "tapable-0.2.9" = { @@ -54136,13 +53884,13 @@ let sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; }; }; - "taskkill-4.0.0" = { + "taskkill-5.0.0" = { name = "taskkill"; packageName = "taskkill"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-4.0.0.tgz"; - sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; + url = "https://registry.npmjs.org/taskkill/-/taskkill-5.0.0.tgz"; + sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ=="; }; }; "tcp-port-used-1.0.2" = { @@ -54244,15 +53992,6 @@ let sha512 = "vXPxwOyaNVi9nyczO16mxmHGpl6ASC5/TVhRRHpqeYHvKQm58EaWNvZXxAhR0lYYnBOQFjXjhzeLsaXdjxLjRg=="; }; }; - "tempy-1.0.1" = { - name = "tempy"; - packageName = "tempy"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz"; - sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; - }; - }; "tempy-3.0.0" = { name = "tempy"; packageName = "tempy"; @@ -54262,6 +54001,15 @@ let sha512 = "B2I9X7+o2wOaW4r/CWMkpOO9mdiTRCxXNgob6iGvPmfPWgH/KyUD6Uy5crtWBxIBe3YrNZKR2lSzv1JJKWD4vA=="; }; }; + "tempy-3.1.0" = { + name = "tempy"; + packageName = "tempy"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-3.1.0.tgz"; + sha512 = "7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g=="; + }; + }; "term-size-2.2.1" = { name = "term-size"; packageName = "term-size"; @@ -54316,13 +54064,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.20.0" = { + "terser-5.24.0" = { name = "terser"; packageName = "terser"; - version = "5.20.0"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.20.0.tgz"; - sha512 = "e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz"; + sha512 = "ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -54703,15 +54451,6 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; - "tiny-glob-0.2.9" = { - name = "tiny-glob"; - packageName = "tiny-glob"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz"; - sha512 = "g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg=="; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -54910,15 +54649,6 @@ let sha512 = "+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q=="; }; }; - "to-vfile-6.1.0" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz"; - sha512 = "BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw=="; - }; - }; "to-vfile-7.2.4" = { name = "to-vfile"; packageName = "to-vfile"; @@ -54928,6 +54658,15 @@ let sha512 = "2eQ+rJ2qGbyw3senPI0qjuM7aut8IYXK6AEoOWb+fJx/mQYzviTckm1wDjq91QYHAPBTYzmdJXxMFA6Mk14mdw=="; }; }; + "to-vfile-8.0.0" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-8.0.0.tgz"; + sha512 = "IcmH1xB5576MJc9qcfEC/m/nQCFt3fzMHz45sSlgJyTWjRbKW1HAkJpuf3DgE57YzIlZcwcBZA5ENQbBo4aLkg=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -55162,15 +54901,6 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha512 = "YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ=="; - }; - }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -55216,15 +54946,6 @@ let sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; }; }; - "trim-trailing-lines-1.1.4" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; - sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -55459,15 +55180,6 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.21.0" = { - name = "tsutils"; - packageName = "tsutils"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - }; "tty-browserify-0.0.1" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -55486,6 +55198,15 @@ let sha512 = "i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg=="; }; }; + "tuf-js-2.1.0" = { + name = "tuf-js"; + packageName = "tuf-js"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz"; + sha512 = "eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA=="; + }; + }; "tumblr-0.4.1" = { name = "tumblr"; packageName = "tumblr"; @@ -55666,15 +55387,6 @@ let sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; }; - "type-fest-0.15.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.15.1.tgz"; - sha512 = "n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A=="; - }; - }; "type-fest-0.16.0" = { name = "type-fest"; packageName = "type-fest"; @@ -55774,13 +55486,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.3.3" = { + "type-fest-4.7.1" = { name = "type-fest"; packageName = "type-fest"; - version = "4.3.3"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.3.3.tgz"; - sha512 = "bxhiFii6BBv6UiSDq7uKTMyADT9unXEl3ydGefndVLxFeB44LRbT4K7OJGDYSyDrKnklCC1Pre68qT2wbUl2Aw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.7.1.tgz"; + sha512 = "iWr8RUmzAJRfhZugX9O7nZE6pCxDU8CZ3QxsLuTnGcBLJpCaP2ll3s4eMTBoFnU/CeXY/5rfQSuAEsTGJO4y8A=="; }; }; "type-is-1.6.18" = { @@ -55936,15 +55648,6 @@ let sha512 = "cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="; }; }; - "typescript-5.1.6" = { - name = "typescript"; - packageName = "typescript"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"; - sha512 = "zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="; - }; - }; "typescript-5.2.2" = { name = "typescript"; packageName = "typescript"; @@ -55954,13 +55657,13 @@ let sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; - "typescript-5.3.0-dev.20231002" = { + "typescript-5.4.0-dev.20231109" = { name = "typescript"; packageName = "typescript"; - version = "5.3.0-dev.20231002"; + version = "5.4.0-dev.20231109"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231002.tgz"; - sha512 = "TQXM13rrDgID8W4Ok4KDQAqwLUjLcAXL+NKv0zJiIEQfa0bOM0yoRiSgvcjaCJ4lZT4bScrq3vHspVM2x8rkOQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.4.0-dev.20231109.tgz"; + sha512 = "wX5CSyZbJ0xsgAe0Fyefs8eqEe7o7mp7Nv5EHydBYFpJI/FWZFc4rSF2mGNNZ/1D7JMQgwjCAkZd/2TTF3m/Uw=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -56026,13 +55729,13 @@ let sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; }; }; - "ua-parser-js-1.0.36" = { + "ua-parser-js-1.0.37" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "1.0.36"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.36.tgz"; - sha512 = "znuyCIXzl8ciS3+y3fHJI/2OhQIXbXw9MWC/o3qwyR+RGppjZHrM27CGFSKCJXi2Kctiz537iOu2KnXs1lMQhw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz"; + sha512 = "bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ=="; }; }; "uc.micro-1.0.6" = { @@ -56269,31 +55972,31 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.23.0" = { + "undici-5.26.5" = { name = "undici"; packageName = "undici"; - version = "5.23.0"; + version = "5.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz"; - sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz"; + sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; }; }; - "undici-5.25.3" = { + "undici-5.27.2" = { name = "undici"; packageName = "undici"; - version = "5.25.3"; + version = "5.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.25.3.tgz"; - sha512 = "7lmhlz3K1+IKB6IUjkdzV2l0jKY8/0KguEMdEpzzXCug5pEGIp3DxUg0DEN65DrVoxHiRKpPORC/qzX+UglSkQ=="; + url = "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz"; + sha512 = "iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ=="; }; }; - "unherit-1.1.3" = { - name = "unherit"; - packageName = "unherit"; - version = "1.1.3"; + "undici-types-5.26.5" = { + name = "undici-types"; + packageName = "undici-types"; + version = "5.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz"; - sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; + url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; + sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; "unherit-3.0.1" = { @@ -56323,6 +56026,15 @@ let sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; }; }; + "unicode-emoji-json-0.4.0" = { + name = "unicode-emoji-json"; + packageName = "unicode-emoji-json"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-emoji-json/-/unicode-emoji-json-0.4.0.tgz"; + sha512 = "lVNOwh2AnmbwqtSrEVjAWKQoVzWgyWmXVqPuPkPfKb0tnA0+uYN/4ILCTdy9IRj/+3drAVhmjwjNJQr2dhCwnA=="; + }; + }; "unicode-emoji-modifier-base-1.0.0" = { name = "unicode-emoji-modifier-base"; packageName = "unicode-emoji-modifier-base"; @@ -56368,6 +56080,15 @@ let sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; + "unified-11.0.4" = { + name = "unified"; + packageName = "unified"; + version = "11.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz"; + sha512 = "apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ=="; + }; + }; "unified-8.4.2" = { name = "unified"; packageName = "unified"; @@ -56386,15 +56107,6 @@ let sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; - "unified-diff-3.1.0" = { - name = "unified-diff"; - packageName = "unified-diff"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.1.0.tgz"; - sha512 = "d29qhcADmrvjgSYDLDUmmE/zvVyKUW+O3gRz6Bjj7fcv8kGBlrYBmMjnuBI+wuTou/PXaVl3hPeSh9mXZ0iGSA=="; - }; - }; "unified-diff-4.0.1" = { name = "unified-diff"; packageName = "unified-diff"; @@ -56413,22 +56125,13 @@ let sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; - "unified-engine-11.1.0" = { + "unified-engine-11.1.1" = { name = "unified-engine"; packageName = "unified-engine"; - version = "11.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.0.tgz"; - sha512 = "RS3K5PgNjDRQN9eNIefLUDxpfyWIItmKcjBhD1VnYYT/h7xpheZoZBtb5gtwFyKWZlhKCGRVQknIm1M8qHZfIg=="; - }; - }; - "unified-engine-8.2.0" = { - name = "unified-engine"; - packageName = "unified-engine"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; - sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.1.tgz"; + sha512 = "uVx/R+Q8V5wv5EPdPzBPPscSKpbqWeqqIc0lMfDcn3aS+QDENTpDY+wdPQ5oswuQSpPn/miuP0FspIwo19++IA=="; }; }; "unified-lint-rule-1.0.6" = { @@ -56440,13 +56143,13 @@ let sha512 = "YPK15YBFwnsVorDFG/u0cVVQN5G2a3V8zv5/N6KN3TCG+ajKtaALcy7u14DCSrJI+gZeyYquFL9cioJXOGXSvg=="; }; }; - "unified-message-control-3.0.3" = { - name = "unified-message-control"; - packageName = "unified-message-control"; - version = "3.0.3"; + "unified-lint-rule-2.1.2" = { + name = "unified-lint-rule"; + packageName = "unified-lint-rule"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.3.tgz"; - sha512 = "oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA=="; + url = "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-2.1.2.tgz"; + sha512 = "JWudPtRN7TLFHVLEVZ+Rm8FUb6kCAtHxEXFgBGDxRSdNMnGyTU5zyYvduHSF/liExlFB3vdFvsAHnNVE/UjAwA=="; }; }; "unified-message-control-4.0.0" = { @@ -56503,6 +56206,15 @@ let sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; + "unique-filename-2.0.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz"; + sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; + }; + }; "unique-filename-3.0.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -56521,6 +56233,15 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; + "unique-slug-3.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz"; + sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; + }; + }; "unique-slug-4.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -56566,13 +56287,22 @@ let sha512 = "VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ=="; }; }; - "unist-util-find-1.0.2" = { + "unist-util-find-1.0.4" = { name = "unist-util-find"; packageName = "unist-util-find"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-1.0.2.tgz"; - sha512 = "ft06UDYzqi9o9RmGP0sZWI/zvLLQiBW2/MD+rW6mDqbOWDcmknGX9orQPspfuGRYWr8eSJAmfsBcvOpfGRJseA=="; + url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-1.0.4.tgz"; + sha512 = "T5vI7IkhroDj7KxAIy057VbIeGnCXfso4d4GoUsjbAmDLQUkzAeszlBtzx1+KHgdsYYBygaqUBvrbYCfePedZw=="; + }; + }; + "unist-util-find-3.0.0" = { + name = "unist-util-find"; + packageName = "unist-util-find"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find/-/unist-util-find-3.0.0.tgz"; + sha512 = "T7ZqS7immLjYyC4FCp2hDo3ksZ1v+qcbb+e5+iWxc2jONgHOLXPCpms1L8VV4hVxCXgWTxmBHDztuEZFVwC+Gg=="; }; }; "unist-util-find-all-after-3.0.2" = { @@ -56584,13 +56314,22 @@ let sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ=="; }; }; - "unist-util-find-all-before-3.0.1" = { + "unist-util-find-all-after-5.0.0" = { + name = "unist-util-find-all-after"; + packageName = "unist-util-find-all-after"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-5.0.0.tgz"; + sha512 = "nGmOYvTSdGcI4RvrUNfe0mOsqqbbJOtqCQsppsY9KZjmv3nwM3YRgNBwFPdZ8Y+iv9Z/2PDjR9u6u+uK62XTTg=="; + }; + }; + "unist-util-find-all-before-5.0.0" = { name = "unist-util-find-all-before"; packageName = "unist-util-find-all-before"; - version = "3.0.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-find-all-before/-/unist-util-find-all-before-3.0.1.tgz"; - sha512 = "00YMzXOOu4z/qCHKQI6z7TeERAbIBda0E/1sZqP0cJdGd3d1OtUPvQlMhNCwz4QBFo//GcW2dHOYXPdu3jINdA=="; + url = "https://registry.npmjs.org/unist-util-find-all-before/-/unist-util-find-all-before-5.0.0.tgz"; + sha512 = "zir6a7GsXfdn4YAWR4F3hLNKZjTjLBJurdyquysvmX38xbftS1+qwvEhutxxHLq0Pp1tW5V1TDiuj+qluuOnKw=="; }; }; "unist-util-find-all-between-2.1.0" = { @@ -56611,13 +56350,13 @@ let sha512 = "cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg=="; }; }; - "unist-util-inspect-5.0.1" = { - name = "unist-util-inspect"; - packageName = "unist-util-inspect"; - version = "5.0.1"; + "unist-util-generated-2.0.1" = { + name = "unist-util-generated"; + packageName = "unist-util-generated"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; - sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; + url = "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.1.tgz"; + sha512 = "qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A=="; }; }; "unist-util-inspect-7.0.2" = { @@ -56665,6 +56404,15 @@ let sha512 = "u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw=="; }; }; + "unist-util-is-6.0.0" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz"; + sha512 = "2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw=="; + }; + }; "unist-util-lsp-2.1.0" = { name = "unist-util-lsp"; packageName = "unist-util-lsp"; @@ -56701,15 +56449,6 @@ let sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; }; }; - "unist-util-position-3.1.0" = { - name = "unist-util-position"; - packageName = "unist-util-position"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"; - sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; - }; - }; "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; @@ -56728,15 +56467,6 @@ let sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; - "unist-util-remove-position-2.0.1" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; - sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; - }; - }; "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; @@ -56818,6 +56548,15 @@ let sha512 = "MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg=="; }; }; + "unist-util-visit-5.0.0" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz"; + sha512 = "MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg=="; + }; + }; "unist-util-visit-children-1.1.4" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; @@ -56872,13 +56611,22 @@ let sha512 = "x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg=="; }; }; - "universal-user-agent-6.0.0" = { + "unist-util-visit-parents-6.0.1" = { + name = "unist-util-visit-parents"; + packageName = "unist-util-visit-parents"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz"; + sha512 = "L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw=="; + }; + }; + "universal-user-agent-6.0.1" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; - sha512 = "isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz"; + sha512 = "yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="; }; }; "universalify-0.1.2" = { @@ -56908,13 +56656,13 @@ let sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; }; }; - "universalify-2.0.0" = { + "universalify-2.0.1" = { name = "universalify"; packageName = "universalify"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"; + sha512 = "gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="; }; }; "unix-crypt-td-js-1.1.4" = { @@ -57106,15 +56854,6 @@ let sha512 = "iQSLFuxB2ZFAxXGN28DTxk/GNGlBmtqawvguYDtChAHI9Xjy0z7c7hpw6ywutK34SEDYTpLEsAM1ATMq5pcQsw=="; }; }; - "update-notifier-4.1.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; - sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; - }; - }; "update-notifier-5.1.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -57790,13 +57529,13 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.25.0" = { + "vega-5.26.0" = { name = "vega"; packageName = "vega"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.25.0.tgz"; - sha512 = "lr+uj0mhYlSN3JOKbMNp1RzZBenWp9DxJ7kR3lha58AFNCzzds7pmFa7yXPbtbaGhB7Buh/t6n+Bzk3Y0VnF5g=="; + url = "https://registry.npmjs.org/vega/-/vega-5.26.0.tgz"; + sha512 = "Gvg4SMv6dHdY7aEbbsr6rbUfsI3hVVrEhGKmb5vV8SEqtJqGoeIKT/QZ9Yjw5uQOaGJJqkPcox3WW0n+qGGP/Q=="; }; }; "vega-canvas-1.2.7" = { @@ -57871,13 +57610,13 @@ let sha512 = "Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ=="; }; }; - "vega-functions-5.13.2" = { + "vega-functions-5.14.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.13.2"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.2.tgz"; - sha512 = "YE1Xl3Qi28kw3vdXVYgKFMo20ttd3+SdKth1jUNtBDGGdrOpvPxxFhZkVqX+7FhJ5/1UkDoAYs/cZY0nRKiYgA=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz"; + sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg=="; }; }; "vega-geo-4.4.1" = { @@ -57916,13 +57655,13 @@ let sha512 = "qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA=="; }; }; - "vega-parser-6.2.0" = { + "vega-parser-6.2.1" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz"; - sha512 = "as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.1.tgz"; + sha512 = "F79bQXt6fMkACR+TfFl7ueehKO26yCR/3iRZxhU7/pgHerx/d8K8pf2onMguu3NAN4eitT+PPuTgkDZtcqo9Qg=="; }; }; "vega-projection-1.6.0" = { @@ -57952,31 +57691,31 @@ let sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; }; }; - "vega-scale-7.3.0" = { + "vega-scale-7.3.1" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz"; - sha512 = "pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.1.tgz"; + sha512 = "tyTlaaCpHN2Ik/PPKl/j9ThadBDjPtypqW1D7IsUSkzfoZ7RPlI2jwAaoj2C/YW5jFRbEOx3njmjogp48I5CvA=="; }; }; - "vega-scenegraph-4.10.2" = { + "vega-scenegraph-4.11.0" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz"; - sha512 = "R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.11.0.tgz"; + sha512 = "NQtxA53/w9whUwZScv+/vxSb68frgLwanpy207vaBew46hnFZI9GUWmLWemOww8pJwBnVmnF4jFhUBbKq13HVw=="; }; }; - "vega-selections-5.4.1" = { + "vega-selections-5.4.2" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz"; - sha512 = "EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.2.tgz"; + sha512 = "99FUhYmg0jOJr2/K4TcEURmJRkuibrCDc8KBUX7qcQEITzrZ5R6a4QE+sarCvbb3hi8aA9GV2oyST6MQeA9mgQ=="; }; }; "vega-statistics-1.9.0" = { @@ -57997,22 +57736,22 @@ let sha512 = "z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA=="; }; }; - "vega-transforms-4.10.2" = { + "vega-transforms-4.11.0" = { name = "vega-transforms"; packageName = "vega-transforms"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.2.tgz"; - sha512 = "sJELfEuYQ238PRG+GOqQch8D69RYnJevYSGLsRGQD2LxNz3j+GlUX6Pid+gUEH5HJy22Q5L0vsTl2ZNhIr4teQ=="; + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.0.tgz"; + sha512 = "BeDASz7s9pIFjcSBljJJb8Eg0to2VjU0DvS/UjCQQYtqlfmzz78/mZnHyC+mW06h58ZKN+1QrIfqTZ6uMB4ySw=="; }; }; - "vega-typings-0.24.2" = { + "vega-typings-1.0.0" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.24.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.2.tgz"; - sha512 = "fW02GElYoqweCCaPqH6iH44UZnzXiX9kbm1qyecjU3k5s0vtufLI7Yuz/a/uL37mEAqTMQplBBAlk0T9e2e1Dw=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.0.0.tgz"; + sha512 = "ML8MVdNQurPvOQ6mskp+Zxf7Yy4M5G73QI04aIi51hACqa032qOxgzApZUPEoqBDBczm4zPPF0X9SQgaxJXq4A=="; }; }; "vega-util-1.17.2" = { @@ -58042,13 +57781,13 @@ let sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; }; }; - "vega-voronoi-4.2.1" = { + "vega-voronoi-4.2.2" = { name = "vega-voronoi"; packageName = "vega-voronoi"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz"; - sha512 = "zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q=="; + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.2.tgz"; + sha512 = "Bq2YOp2MGphhQnUuLwl3dsyBs6MuEU86muTjDbBJg33+HkZtE1kIoQZr+EUHa46NBsY1NzSKddOTu8wcaFrWiQ=="; }; }; "vega-wordcloud-4.1.4" = { @@ -58132,15 +57871,6 @@ let sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw=="; }; }; - "vfile-find-up-5.0.1" = { - name = "vfile-find-up"; - packageName = "vfile-find-up"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-5.0.1.tgz"; - sha512 = "YWx8fhWQNYpHxFkR5fDO4lCdvPcY4jfCG7qUMHVvSp14vRfkEYxFG/vUEV0eJuXoKFfiAmMkAS8dekOYnpAJ+A=="; - }; - }; "vfile-find-up-6.1.0" = { name = "vfile-find-up"; packageName = "vfile-find-up"; @@ -58150,15 +57880,6 @@ let sha512 = "plN64Ff/wLPvKC8ucTzyB97cgV7SdIcFL74HLCSmI/79FqOI1WACbNM4noKrJa+dZRgN6Gwp4BQElm/yBDqC3w=="; }; }; - "vfile-location-3.2.0" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; - sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; - }; - }; "vfile-location-4.1.0" = { name = "vfile-location"; packageName = "vfile-location"; @@ -58195,15 +57916,6 @@ let sha512 = "jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="; }; }; - "vfile-reporter-6.0.2" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; - sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; - }; - }; "vfile-reporter-7.0.5" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -58222,22 +57934,13 @@ let sha512 = "NfHyHdkCcy0BsXiLA3nId29TY7W7hgpc8nd8Soe3imATx5N4/+mkLYdMR+Y6Zvu6BXMMi0FZsD4FLCm1dN85Pg=="; }; }; - "vfile-reporter-pretty-5.0.0" = { + "vfile-reporter-pretty-7.0.0" = { name = "vfile-reporter-pretty"; packageName = "vfile-reporter-pretty"; - version = "5.0.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter-pretty/-/vfile-reporter-pretty-5.0.0.tgz"; - sha512 = "pynx5Xvqp6TArfaP6T1JcyZK45Z7iQH6mv4XV7ce0Kry9t15zWaoZqFQvs9PNvivgxm7PFKzZV/l88VswW8Upw=="; - }; - }; - "vfile-sort-2.2.2" = { - name = "vfile-sort"; - packageName = "vfile-sort"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz"; - sha512 = "tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA=="; + url = "https://registry.npmjs.org/vfile-reporter-pretty/-/vfile-reporter-pretty-7.0.0.tgz"; + sha512 = "kPQ8wnn7lSS89B5kvdGfNxq3rz32dsAY2lPSIq0LtK/Dq0zMXchsEo3+UmJeUThqF8POtwtdjp8H8LNShBcpbA=="; }; }; "vfile-sort-3.0.1" = { @@ -58258,15 +57961,6 @@ let sha512 = "lffPI1JrbHDTToJwcq0rl6rBmkjQmMuXkAxsZPRS9DXbaJQvc642eCg6EGxcX2i1L+esbuhq+2l9tBll5v8AeQ=="; }; }; - "vfile-statistics-1.1.4" = { - name = "vfile-statistics"; - packageName = "vfile-statistics"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz"; - sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA=="; - }; - }; "vfile-statistics-2.0.1" = { name = "vfile-statistics"; packageName = "vfile-statistics"; @@ -58285,13 +57979,13 @@ let sha512 = "/qlwqwWBWFOmpXujL/20P+Iuydil0rZZNglR+VNm6J0gpLHwuVM5s7g2TfVoswbXjZ4HuIhLMySEyIw5i7/D8w=="; }; }; - "vfile-to-eslint-2.0.2" = { + "vfile-to-eslint-4.0.0" = { name = "vfile-to-eslint"; packageName = "vfile-to-eslint"; - version = "2.0.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-to-eslint/-/vfile-to-eslint-2.0.2.tgz"; - sha512 = "QvKxY1zCwLiDoM+Y4J46AHTRrY6WgVg9u8Ae/KbLRUmphcscmtIgSnttKefWH0X93JkONO+UD1DrltCpYYmDAQ=="; + url = "https://registry.npmjs.org/vfile-to-eslint/-/vfile-to-eslint-4.0.0.tgz"; + sha512 = "BOMkqUnIghW/SZEVOUKC3p5lUZ8QzavLksEEMKR9Yr7jBuu0noiQVfyB7csOStFVFgpWzx+ApcZjkyFHQkJjmQ=="; }; }; "videostream-3.2.2" = { @@ -58339,13 +58033,13 @@ let sha512 = "NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA=="; }; }; - "vite-4.4.9" = { + "vite-4.4.11" = { name = "vite"; packageName = "vite"; - version = "4.4.9"; + version = "4.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz"; - sha512 = "2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA=="; + url = "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz"; + sha512 = "ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A=="; }; }; "vite-code-inspector-plugin-0.1.9" = { @@ -58402,67 +58096,58 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.13" = { + "volar-service-css-0.0.16" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.13.tgz"; - sha512 = "WAuo7oDYgTQ1cr45EqTGoPGtClj0f5PZDQARgQveXKu0CQgyXn8Bs7c4EjDR0fNLhiG3moBEs2uSUGxjSKghxw=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.16.tgz"; + sha512 = "gK/XD35t/P3SQrUuS8LMlCnE2ItIk+kXI6gPvBYl1NZ7O+tLH8rUWXA32YgpwNoITxYrm/G1seaq08zs4aiPvg=="; }; }; - "volar-service-emmet-0.0.13" = { + "volar-service-emmet-0.0.16" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.13.tgz"; - sha512 = "y/U3up9b3YA8DL36h6KUGnBoH/TUmr1Iv9HWuSeWJKoA6LOt57AOIgzl7+/zY8d+0+C0jGqpV4CM8V5+TjptvQ=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.16.tgz"; + sha512 = "8sWWywzVJOD+PWDArOXDWbiRlM7+peydFhXJT71i4X1WPW32RyPxn6FypvciO+amqpfZP2rXfB9eibIJ+EofSQ=="; }; }; - "volar-service-html-0.0.13" = { + "volar-service-html-0.0.16" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.13.tgz"; - sha512 = "Y4pfmNsIpkDTixJVdobRMDZm5Ax90magUCdYl6HUN0/RstxHb3ogEodTT1GtNmoek/YYTrxbWZYN/Yq49+9zdg=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.16.tgz"; + sha512 = "/oEXXgry++1CnTXQBUNf9B8MZfTlYZuJfZA7Zx9MN7WS4ZPxk3BFOdal/cXH6RNR2ruNEYr5QTW9rsqtoUscag=="; }; }; - "volar-service-prettier-0.0.13" = { + "volar-service-prettier-0.0.16" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.13.tgz"; - sha512 = "4V/v+oNXyoC4QRNCY6JDAD4BvVatuswyH8o7flgO/XHDRIG+WwGo8Avsbmq4TLktjBGFUa4Gb9aK9+RkznEEZQ=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.16.tgz"; + sha512 = "Kj2ZdwJGEvfYbsHW8Sjrew/7EB4PgRoas4f8yAJzUUVxIC/kvhUwLDxQc8+N2IibomN76asJGWe+i6VZZvgIkw=="; }; }; - "volar-service-typescript-0.0.13" = { + "volar-service-typescript-0.0.16" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.13.tgz"; - sha512 = "fwpoA1L/bCXz5hl9W4EYJYNyorocfdfbLQ9lTM3rPVOzjRZVknEE8XP31RMPZhEg3sOxKh18+sLEL7j3bip8ew=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.16.tgz"; + sha512 = "k/qFKM2oxs/3fhbr/vcBSHnCLZ1HN3Aeh+bGvV9Lc9qIhrNyCVsDFOUJN1Qp4dI72+Y+eFSIDCLHmFEZdsP2EA=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.13" = { + "volar-service-typescript-twoslash-queries-0.0.16" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.13"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.13.tgz"; - sha512 = "KGk5ek2v7T8OSY9YdMmqGOT0KkoUQAe8RbPmoZibT9F3vgmmWVgaAoIlDZ1vwt7VfQeZvRmhvRJhqpCA80ZF8Q=="; - }; - }; - "vsce-2.15.0" = { - name = "vsce"; - packageName = "vsce"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-2.15.0.tgz"; - sha512 = "P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.16.tgz"; + sha512 = "0gPrkDTD2bMj2AnSNykOKhfmPnBFE2LS1lF3LWA7qu1ChRnJF0sodwCCbbeNYJ9+yth956ApoU1BVQ8UrMg+yw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -58474,13 +58159,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-6.2.9" = { + "vscode-css-languageservice-6.2.10" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.9"; + version = "6.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.9.tgz"; - sha512 = "9MsOvAi+VycKomQ7KEq4o/hLtjHHrtRLLl8lM9nMcH8cxfNI7/6jVXmsV/7pdbDWu9L3DZhsspN1eMXZwiOymw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.10.tgz"; + sha512 = "sYUZPku4mQ06AWGCbMyjv2tdR6juBW6hTbVPFwbJvNVzdtEfBioQOgkdXg7yMJNWnXkvWSU1FL2kb4Vxu5Cdyw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -58510,13 +58195,13 @@ let sha512 = "jX+7/kUXrdOaRT8vqYR/jLxrGDib+Far8I7n/A6apuEl88k+mhIHZPwc6ezuLeiCKUCaLG4b0dqFwjVa7QL3/w=="; }; }; - "vscode-html-languageservice-5.1.0" = { + "vscode-html-languageservice-5.1.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.0.tgz"; - sha512 = "cGOu5+lrz+2dDXSGS15y24lDtPaML1T8K/SfqgFbLmCZ1btYOxceFieR+ybTS2es/A67kRc62m2cKFLUQPWG5g=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.1.tgz"; + sha512 = "JenrspIIG/Q+93R6G3L6HdK96itSisMynE0glURqHpQbL3dKAKzdm8L40lAHNkwJeBg+BBPpAshZKv/38onrTQ=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -58537,13 +58222,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.3.6" = { + "vscode-json-languageservice-5.3.7" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.3.6"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.6.tgz"; - sha512 = "P4kthBi3GMLKi7Lmp24nkKHAWxbFfCsIDBPlMrK1Tag1aqbl3l60UferDkfAasupDVBM2dekbArzGycUjw8OHA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.7.tgz"; + sha512 = "jdDggN2SLMQw4C/tLr11v6/OK4cMVGy7tbyZRHQvukQ6lcflY3UV+ZMkmwHKCqXz2TmxkjQb536eJW6JMEVeew=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -58618,6 +58303,15 @@ let sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; }; }; + "vscode-jsonrpc-8.2.0-next.2" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.2.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.2.tgz"; + sha512 = "1FQrqLselaLLe5ApFSU/8qGUbJ8tByWbqczMkT2PEDpDYthCQTe5wONPuVphe7BB+FvZwvBFI2kFkY7FtyHc1A=="; + }; + }; "vscode-languageclient-8.1.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -58699,6 +58393,15 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; + "vscode-languageserver-8.2.0-next.3" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "8.2.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.2.0-next.3.tgz"; + sha512 = "fqHRwcIRoxfKke7iLDSeUmdo3uk7o/uWNn/44xdWa4urdhsvpTZ5c1GsL1EX4TAvdDg0qeXy89NBZ5Gld2DkgQ=="; + }; + }; "vscode-languageserver-9.0.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -58762,6 +58465,15 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; + "vscode-languageserver-protocol-3.17.4-next.3" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.4-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.3.tgz"; + sha512 = "GnW3ldfzlsDK9B1/L1edBW1ddSakC59r+DRipTYCcXIT/zCCbLID998Dxn+exgrL33e3/XLQ+7hQQiSz6TnhKQ=="; + }; + }; "vscode-languageserver-protocol-3.17.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -58879,6 +58591,15 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; + "vscode-languageserver-types-3.17.4-next.2" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.4-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.2.tgz"; + sha512 = "r6tXyCXyXQH7b6VHkvRT0Nd9v+DWQiosgTR6HQajCb4iJ1myr3KgueWEGBF1Ph5/YAiDy8kXUhf8dHl7wE1H2A=="; + }; + }; "vscode-languageserver-types-3.17.5" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -58951,22 +58672,22 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "vscode-uri-3.0.7" = { + "vscode-uri-3.0.8" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz"; - sha512 = "eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz"; + sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="; }; }; - "vue-2.7.14" = { + "vue-2.7.15" = { name = "vue"; packageName = "vue"; - version = "2.7.14"; + version = "2.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; - sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz"; + sha512 = "a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ=="; }; }; "vue-codemod-0.0.5" = { @@ -59005,22 +58726,22 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; - "vue-eslint-parser-9.3.1" = { + "vue-eslint-parser-9.3.2" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "9.3.1"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz"; - sha512 = "Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.2.tgz"; + sha512 = "q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg=="; }; }; - "vue-template-compiler-2.7.14" = { + "vue-template-compiler-2.7.15" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.7.14"; + version = "2.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; - sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.15.tgz"; + sha512 = "yQxjxMptBL7UAog00O8sANud99C6wJF+7kgbcwqkvA38vCGF7HWE66w0ZFnS/kX5gSoJr/PQ4/oS3Ne2pW37Og=="; }; }; "w3c-hr-time-1.0.2" = { @@ -59212,13 +58933,13 @@ let sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; }; }; - "web3-utils-1.10.2" = { + "web3-utils-1.10.3" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.2.tgz"; - sha512 = "TdApdzdse5YR+5GCX/b/vQnhhbj1KSAtfrDtRW7YS0kcWp1gkJsN62gw6GzCaNTeXookB7UrLtmDUuMv65qgow=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.3.tgz"; + sha512 = "OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ=="; }; }; "webassemblyjs-1.11.1" = { @@ -59284,13 +59005,13 @@ let sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; }; - "webpack-5.88.2" = { + "webpack-5.89.0" = { name = "webpack"; packageName = "webpack"; - version = "5.88.2"; + version = "5.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"; - sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz"; + sha512 = "qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw=="; }; }; "webpack-cli-5.1.4" = { @@ -59338,13 +59059,13 @@ let sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; - "webpack-merge-5.9.0" = { + "webpack-merge-5.10.0" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz"; - sha512 = "6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz"; + sha512 = "+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA=="; }; }; "webpack-sources-2.3.1" = { @@ -59455,6 +59176,15 @@ let sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; + "whatwg-url-6.5.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; + }; + }; "whatwg-url-7.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -59581,13 +59311,22 @@ let sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w=="; }; }; - "which-typed-array-1.1.11" = { + "which-typed-array-1.1.13" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.11"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; - sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; + sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; + }; + }; + "wicked-good-xpath-1.3.0" = { + name = "wicked-good-xpath"; + packageName = "wicked-good-xpath"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz"; + sha512 = "Gd9+TUn5nXdwj/hFsPVx5cuHHiF5Bwuc30jZ4+ronF1qHK5O7HD0sgmXWSEgwKquT3ClLoKPVbO6qGwVwLzvAw=="; }; }; "wide-align-1.1.5" = { @@ -59689,6 +59428,15 @@ let sha512 = "IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA=="; }; }; + "winreg-1.2.5" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.5.tgz"; + sha512 = "uf7tHf+tw0B1y+x+mKTLHkykBgK2KMs3g+KlzmyMbLvICSHQyB/xOFjTT8qZ3oeTFyU7Bbj4FzXitGG6jvKhYw=="; + }; + }; "winston-0.6.2" = { name = "winston"; packageName = "winston"; @@ -59725,13 +59473,13 @@ let sha512 = "BLxJH3KCgJ2paj2xKYTQLpxdKr9URPDDDLJnRVcbud7izT+m8Xzt5Rod6mnNgEcfT0fRvhEy2Cj3cEnnQpa6qA=="; }; }; - "winston-3.10.0" = { + "winston-3.11.0" = { name = "winston"; packageName = "winston"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz"; - sha512 = "nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g=="; + url = "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz"; + sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; }; }; "winston-3.3.3" = { @@ -59743,22 +59491,13 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.7.1" = { - name = "winston-daily-rotate-file"; - packageName = "winston-daily-rotate-file"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz"; - sha512 = "7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA=="; - }; - }; - "winston-transport-4.5.0" = { + "winston-transport-4.6.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; - sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.6.0.tgz"; + sha512 = "wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg=="; }; }; "with-7.0.2" = { @@ -59860,13 +59599,13 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20230922.0" = { + "workerd-1.20231025.0" = { name = "workerd"; packageName = "workerd"; - version = "1.20230922.0"; + version = "1.20231025.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20230922.0.tgz"; - sha512 = "iFe0tqoHsxgZXCaURVNKYtc0QnWdjORZJ0WzaasdSK4STOwV1aD7yC2v5o3HwnNTaJOpNt7H09AYWKB3y1ju8A=="; + url = "https://registry.npmjs.org/workerd/-/workerd-1.20231025.0.tgz"; + sha512 = "W1PFtpMFfvmm+ozBf+u70TE3Pviv7WA4qzDeejHDC4z+PFDq4+3KJCkgffaGBO86h+akWO0hSsc0uXL2zAqofQ=="; }; }; "workerpool-6.2.1" = { @@ -59878,13 +59617,13 @@ let sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="; }; }; - "workerpool-6.5.0" = { + "workerpool-6.5.1" = { name = "workerpool"; packageName = "workerpool"; - version = "6.5.0"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.5.0.tgz"; - sha512 = "r64Ea3glXY2RVzMeNxB+4J+0YHAVzUdV4cM5nHi4BBC2LvnO1pWFAIYKYuGcPElbg1/7eEiaPtZ/jzCjIUuGBg=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"; + sha512 = "Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="; }; }; "wrap-ansi-2.1.0" = { @@ -60094,6 +59833,15 @@ let sha512 = "61a+9LgtYZxTq1hAonhX8Xwpo2riK4IOR/BIVxioFbCfc3QFKmpE4x9dLExfLHKtUfVZigYa36tThVhO57erEw=="; }; }; + "ws-5.2.3" = { + name = "ws"; + packageName = "ws"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; + }; + }; "ws-6.1.4" = { name = "ws"; packageName = "ws"; @@ -60166,15 +59914,6 @@ let sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; }; - "ws-8.14.1" = { - name = "ws"; - packageName = "ws"; - version = "8.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz"; - sha512 = "4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A=="; - }; - }; "ws-8.14.2" = { name = "ws"; packageName = "ws"; @@ -60472,6 +60211,15 @@ let sha512 = "yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="; }; }; + "xmldom-sre-0.1.31" = { + name = "xmldom-sre"; + packageName = "xmldom-sre"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz"; + sha512 = "f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw=="; + }; + }; "xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -60518,13 +60266,13 @@ let sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; }; }; - "xstate-4.38.2" = { + "xstate-4.38.3" = { name = "xstate"; packageName = "xstate"; - version = "4.38.2"; + version = "4.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.38.2.tgz"; - sha512 = "Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.38.3.tgz"; + sha512 = "SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw=="; }; }; "xstream-11.14.0" = { @@ -60554,15 +60302,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "xxhash-wasm-0.4.2" = { - name = "xxhash-wasm"; - packageName = "xxhash-wasm"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; - sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; - }; - }; "xxhash-wasm-1.0.2" = { name = "xxhash-wasm"; packageName = "xxhash-wasm"; @@ -60635,13 +60374,13 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.3.2" = { + "yaml-2.3.4" = { name = "yaml"; packageName = "yaml"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz"; - sha512 = "N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz"; + sha512 = "8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="; }; }; "yaml-ast-parser-0.0.43" = { @@ -60662,15 +60401,6 @@ let sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; }; }; - "yaml-js-0.2.3" = { - name = "yaml-js"; - packageName = "yaml-js"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.2.3.tgz"; - sha512 = "6xUQtVKl1qcd0EXtTEzUDVJy9Ji1fYa47LtkDtYKlIjhibPE9knNPmoRyf6SGREFHlOAUyDe9OdYqRP4DuSi5Q=="; - }; - }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -60680,6 +60410,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -60734,15 +60473,6 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz"; - sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -60788,6 +60518,15 @@ let sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; }; }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -61013,13 +60752,13 @@ let sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA=="; }; }; - "youch-3.3.2" = { + "youch-3.3.3" = { name = "youch"; packageName = "youch"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/youch/-/youch-3.3.2.tgz"; - sha512 = "9cwz/z7abtcHOIuH45nzmUFCZbyJA1nLqlirKvyNRx4wDMhqsBaifAJzBej7L4fsVPjFxYq3NK3GAcfvZsydFw=="; + url = "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz"; + sha512 = "qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA=="; }; }; "yurnalist-2.1.0" = { @@ -61076,15 +60815,6 @@ let sha512 = "9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ=="; }; }; - "zod-1.11.17" = { - name = "zod"; - packageName = "zod"; - version = "1.11.17"; - src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-1.11.17.tgz"; - sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; - }; - }; "zod-3.21.4" = { name = "zod"; packageName = "zod"; @@ -61103,6 +60833,15 @@ let sha512 = "wvWkphh5WQsJbVk1tbx1l1Ly4yg+XecD+Mq280uBGt9wa5BKSWf4Mhp6GmrkPixhMxmabYY7RbzlwVP32pbGCg=="; }; }; + "zod-3.22.4" = { + name = "zod"; + packageName = "zod"; + version = "3.22.4"; + src = fetchurl { + url = "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz"; + sha512 = "iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg=="; + }; + }; "zod-to-json-schema-3.21.4" = { name = "zod-to-json-schema"; packageName = "zod-to-json-schema"; @@ -61112,15 +60851,6 @@ let sha512 = "fjUZh4nQ1s6HMccgIeE0VP4QG/YRGPmyjO9sAh890aQKPEk3nqbfUXhMFaC+Dr5KvYBm8BCyvfpZf2jY9aGSsw=="; }; }; - "zwave-js-12.0.2" = { - name = "zwave-js"; - packageName = "zwave-js"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.0.2.tgz"; - sha512 = "csC3CCU6qcq3tzDgePoA6ZSMvrkDyxsf95rshg8fF8lbqjFdOwSxB+O2HUEkr6DDyzkO4GA+lMsdUei/OSnejQ=="; - }; - }; "zwitch-1.0.5" = { name = "zwitch"; packageName = "zwitch"; @@ -61145,15 +60875,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.2.4"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.4.tgz"; - sha512 = "OjnlQ2wzhkc1q3iDbWtLeaXoPzS0BtevazT7vmB/MiNVgjDcF3bPFQTcBBvtWAF0wN9jgPC712X8ucwdEAOMlg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-17.0.0.tgz"; + sha512 = "VzKYmN+1wSE2wLBEFu/NHSrRQbeaKkEDO9aZxd7nAnxC5T1Zcva7dfqZIXMHXH2HESYAZCvOS8ikBE/7DCtWWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1602.4" - sources."@angular-devkit/core-16.2.4" - sources."@angular-devkit/schematics-16.2.4" + sources."@angular-devkit/architect-0.1700.0" + sources."@angular-devkit/core-17.0.0" + sources."@angular-devkit/schematics-17.0.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -61165,29 +60895,24 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@ljharb/through-2.3.11" + sources."@npmcli/agent-2.2.0" sources."@npmcli/fs-3.1.0" - sources."@npmcli/git-4.1.0" + sources."@npmcli/git-5.0.3" sources."@npmcli/installed-package-contents-2.0.2" sources."@npmcli/node-gyp-3.0.0" - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@schematics/angular-16.2.4" - sources."@sigstore/bundle-1.1.0" + sources."@npmcli/promise-spawn-7.0.0" + sources."@npmcli/run-script-7.0.2" + sources."@schematics/angular-17.0.0" + sources."@sigstore/bundle-2.1.0" sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."@sigstore/sign-2.2.0" + sources."@sigstore/tuf-2.2.0" + sources."@tufjs/canonical-json-2.0.0" + sources."@tufjs/models-2.0.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" + sources."abbrev-2.0.0" + sources."agent-base-7.1.0" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -61195,107 +60920,92 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" + (sources."anymatch-3.1.3" // { + dependencies = [ + sources."picomatch-2.3.1" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) - sources."chalk-4.1.2" + sources."cacache-18.0.0" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-width-3.0.0" - sources."cliui-8.0.1" + sources."cli-width-4.1.0" + (sources."cliui-8.0.1" // { + dependencies = [ + sources."wrap-ansi-7.0.0" + ]; + }) sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" (sources."cross-spawn-7.0.3" // { dependencies = [ + sources."isexe-2.0.0" sources."which-2.0.2" ]; }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.4" sources."defaults-1.0.4" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" - sources."delegates-1.0.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-5.0.0" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."figures-3.2.0" + sources."figures-5.0.0" sources."fill-range-7.0.1" (sources."foreground-child-3.1.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."fs.realpath-1.0.0" + sources."fs-minipass-3.0.3" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."get-intrinsic-1.2.2" + sources."glob-10.3.10" sources."glob-parent-5.1.2" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" - sources."hosted-git-info-6.1.1" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" + sources."hasown-2.0.0" + sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."ignore-walk-6.0.3" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-8.2.4" + sources."inquirer-9.2.11" sources."ip-2.0.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -61303,32 +61013,33 @@ in sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-number-7.0.0" - sources."is-unicode-supported-0.1.0" + sources."is-unicode-supported-1.3.0" sources."is-wsl-2.2.0" - sources."isexe-2.0.0" + sources."isexe-3.1.1" sources."jackspeak-2.3.6" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" sources."jsonparse-1.3.1" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."magic-string-0.30.1" - sources."make-fetch-happen-11.1.1" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" + ]; + }) + sources."lru-cache-10.0.1" + sources."magic-string-0.30.5" + sources."make-fetch-happen-13.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-fetch-3.0.4" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -61355,62 +61066,53 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."mute-stream-0.0.8" + sources."ms-2.1.2" + sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" + sources."node-gyp-10.0.1" + sources."nopt-7.2.0" + sources."normalize-package-data-6.0.0" sources."normalize-path-3.0.0" sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" + sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" - sources."npm-registry-fetch-14.0.5" - sources."npmlog-6.0.2" - sources."once-1.4.0" + sources."npm-package-arg-11.0.1" + sources."npm-packlist-8.0.0" + sources."npm-pick-manifest-9.0.0" + sources."npm-registry-fetch-16.1.0" sources."onetime-5.1.2" sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-map-4.0.0" - sources."pacote-15.2.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { + (sources."ora-5.4.1" // { dependencies = [ - sources."lru-cache-10.0.1" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) - sources."picomatch-2.3.1" + sources."os-tmpdir-1.0.2" + sources."p-map-4.0.0" + sources."pacote-17.0.4" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-scurry-1.10.1" + sources."picomatch-3.0.1" sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.3.0" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - ]; - }) + sources."punycode-2.3.1" + sources."read-package-json-7.0.0" sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" + (sources."readdirp-3.6.0" // { + dependencies = [ + sources."picomatch-2.3.1" + ]; + }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.2" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -61419,24 +61121,20 @@ in sources."lru-cache-6.0.0" ]; }) - sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" + sources."sigstore-2.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" + sources."socks-proxy-agent-8.0.2" sources."source-map-0.7.4" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."spdx-license-ids-3.0.16" + sources."ssri-10.0.5" sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" @@ -61452,13 +61150,13 @@ in sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" ]; }) - sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."tuf-js-1.1.7" + sources."tuf-js-2.1.0" sources."type-fest-0.21.3" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" @@ -61467,11 +61165,9 @@ in sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.0" sources."wcwidth-1.0.1" - sources."which-3.0.1" - sources."wide-align-1.1.5" - sources."wrap-ansi-7.0.0" + sources."which-4.0.0" + sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.7.2" @@ -61508,13 +61204,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.3.3"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.3.3.tgz"; - sha512 = "ObIjAdjKJFHsKCmaFHc6tbpomMkX1580UbxbgnCr6zEpIZuQobH/zlKwIaSDcmQOQtt8ICs921AYTM+kOg8p6w=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.2.tgz"; + sha512 = "O5SMzoQ65wSxA1KygreI9UJYmHpgt15bSYBxceHwqX7OCDM4Ek8mr6mZn45LGDtwM3dp1uup7kp8exfRPwIFbA=="; }; dependencies = [ - sources."@astrojs/compiler-1.5.7" + sources."@astrojs/compiler-2.3.0" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -61522,21 +61218,21 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@volar/kit-1.10.1" - sources."@volar/language-core-1.10.1" - sources."@volar/language-server-1.10.1" - sources."@volar/language-service-1.10.1" - sources."@volar/source-map-1.10.1" - sources."@volar/typescript-1.10.1" + sources."@volar/kit-1.10.10" + sources."@volar/language-core-1.10.10" + sources."@volar/language-server-1.10.10" + sources."@volar/language-service-1.10.10" + sources."@volar/source-map-1.10.10" + sources."@volar/typescript-1.10.10" (sources."@vscode/emmet-helper-2.9.2" // { dependencies = [ sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.11" + sources."@vscode/l10n-0.0.16" sources."braces-3.0.2" sources."emmet-2.4.6" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -61548,9 +61244,14 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."muggle-string-0.3.1" + sources."path-browserify-1.0.1" sources."picomatch-2.3.1" sources."prettier-3.0.3" - sources."prettier-plugin-astro-0.12.0" + (sources."prettier-plugin-astro-0.12.1" // { + dependencies = [ + sources."@astrojs/compiler-1.8.2" + ]; + }) sources."queue-microtask-1.2.3" sources."request-light-0.7.0" sources."reusify-1.0.4" @@ -61563,38 +61264,21 @@ in sources."typesafe-path-0.2.2" sources."typescript-5.2.2" sources."typescript-auto-import-cache-0.3.0" - sources."volar-service-css-0.0.13" - sources."volar-service-emmet-0.0.13" - sources."volar-service-html-0.0.13" - sources."volar-service-prettier-0.0.13" - sources."volar-service-typescript-0.0.13" - sources."volar-service-typescript-twoslash-queries-0.0.13" - (sources."vscode-css-languageservice-6.2.9" // { - dependencies = [ - sources."@vscode/l10n-0.0.16" - ]; - }) - (sources."vscode-html-languageservice-5.1.0" // { - dependencies = [ - sources."@vscode/l10n-0.0.16" - ]; - }) - sources."vscode-jsonrpc-8.1.0" - (sources."vscode-languageserver-8.1.0" // { - dependencies = [ - sources."vscode-languageserver-protocol-3.17.3" - ]; - }) - (sources."vscode-languageserver-protocol-3.17.5" // { - dependencies = [ - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-types-3.17.5" - ]; - }) + sources."volar-service-css-0.0.16" + sources."volar-service-emmet-0.0.16" + sources."volar-service-html-0.0.16" + sources."volar-service-prettier-0.0.16" + sources."volar-service-typescript-0.0.16" + sources."volar-service-typescript-twoslash-queries-0.0.16" + sources."vscode-css-languageservice-6.2.10" + sources."vscode-html-languageservice-5.1.1" + sources."vscode-jsonrpc-8.2.0" + sources."vscode-languageserver-9.0.1" + sources."vscode-languageserver-protocol-3.17.5" sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -61618,13 +61302,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ sources."semver-6.3.1" @@ -61634,28 +61318,28 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -61663,7 +61347,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -61707,10 +61391,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.7.2"; + version = "18.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.7.2.tgz"; - sha512 = "t3N7TZq7lOeqTOyEgfGcaltHqEJf7YDlPg75MldeVPPyz14jZq/+mbGF9tueDLFX8R6RwdymrN6D+U5XwZ8Iwg=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-18.2.0.tgz"; + sha512 = "F/DCG791kMFmWg5eIdogakuGeg4OiI2kD430ed1a1Hh3epvrJdeIAgcGADAMIOmF+m0S1+VlIYUKG2dvQQ1Izw=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -61734,51 +61418,28 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-17.6.7" - sources."@commitlint/ensure-17.6.7" - sources."@commitlint/execute-rule-17.4.0" - sources."@commitlint/format-17.4.4" - sources."@commitlint/is-ignored-17.7.0" - sources."@commitlint/lint-17.7.0" - sources."@commitlint/load-17.7.2" - sources."@commitlint/message-17.4.2" - sources."@commitlint/parse-17.7.0" - sources."@commitlint/read-17.5.1" - sources."@commitlint/resolve-extends-17.6.7" - sources."@commitlint/rules-17.7.0" - sources."@commitlint/to-lines-17.4.0" - (sources."@commitlint/top-level-17.4.0" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."@commitlint/types-17.4.4" - sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.91" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/minimist-1.2.3" - sources."@types/node-20.5.1" - sources."@types/normalize-package-data-2.4.2" + sources."@commitlint/config-validator-18.1.0" + sources."@commitlint/ensure-18.1.0" + sources."@commitlint/execute-rule-18.1.0" + sources."@commitlint/format-18.1.0" + sources."@commitlint/is-ignored-18.1.0" + sources."@commitlint/lint-18.1.0" + sources."@commitlint/load-18.2.0" + sources."@commitlint/message-18.1.0" + sources."@commitlint/parse-18.1.0" + sources."@commitlint/read-18.1.0" + sources."@commitlint/resolve-extends-18.1.0" + sources."@commitlint/rules-18.1.0" + sources."@commitlint/to-lines-18.1.0" + sources."@commitlint/top-level-18.1.0" + sources."@commitlint/types-18.1.0" + sources."@types/minimist-1.2.5" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."arg-4.1.3" sources."argparse-2.0.1" sources."array-ify-1.0.0" sources."arrify-1.0.1" @@ -61791,10 +61452,9 @@ in sources."color-name-1.1.4" sources."compare-func-2.0.0" sources."conventional-changelog-angular-6.0.0" - sources."conventional-commits-parser-4.0.0" + sources."conventional-commits-parser-5.0.0" sources."cosmiconfig-8.3.6" - sources."cosmiconfig-typescript-loader-4.4.0" - sources."create-require-1.1.1" + sources."cosmiconfig-typescript-loader-5.0.0" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."decamelize-1.2.0" @@ -61803,7 +61463,6 @@ in sources."map-obj-1.0.1" ]; }) - sources."diff-4.0.2" sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -61811,17 +61470,22 @@ in sources."escape-string-regexp-1.0.5" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."fs-extra-11.1.1" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" - sources."git-raw-commits-2.0.11" + (sources."git-raw-commits-2.0.11" // { + dependencies = [ + sources."meow-8.1.2" + sources."split2-3.2.2" + ]; + }) sources."global-dirs-0.1.1" sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-4.1.0" sources."human-signals-2.1.0" (sources."import-fresh-3.3.0" // { @@ -61833,13 +61497,14 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.1" - sources."is-text-path-1.0.1" + sources."is-text-path-2.0.0" sources."isexe-2.0.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" @@ -61848,7 +61513,7 @@ in sources."jsonparse-1.3.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.isfunction-3.0.9" @@ -61861,9 +61526,8 @@ in sources."lodash.uniq-4.5.0" sources."lodash.upperfirst-4.3.1" sources."lru-cache-6.0.0" - sources."make-error-1.3.6" sources."map-obj-4.3.0" - sources."meow-8.1.2" + sources."meow-12.1.1" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" @@ -61872,8 +61536,8 @@ in sources."normalize-package-data-3.0.3" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" @@ -61881,7 +61545,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -61893,6 +61557,10 @@ in }) (sources."read-pkg-up-7.0.1" // { dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."type-fest-0.8.1" ]; }) @@ -61900,7 +61568,7 @@ in sources."redent-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" @@ -61911,8 +61579,8 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."split2-3.2.2" + sources."spdx-license-ids-3.0.16" + sources."split2-4.2.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -61920,18 +61588,16 @@ in sources."strip-indent-3.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."text-extensions-1.9.0" + sources."text-extensions-2.4.0" sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.9.1" - sources."tslib-2.6.2" sources."type-fest-0.18.1" sources."typescript-5.2.2" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" sources."wrap-ansi-7.0.0" @@ -61943,7 +61609,6 @@ in ]; }) sources."yargs-parser-20.2.9" - sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -61959,15 +61624,15 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "17.7.0"; + version = "18.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.7.0.tgz"; - sha512 = "iicqh2o6et+9kWaqsQiEYZzfLbtoWv9uZl8kbI8EGfnc0HeGafQBF7AJ0ylN9D/2kj6txltsdyQs8+2fTMwWEw=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-18.1.0.tgz"; + sha512 = "8vvvtV3GOLEMHeKc8PjRL1lfP1Y4B6BG0WroFd9PJeRiOc3nFX1J0wlJenLURzl9Qus6YXVGWf+a/ZlbCKT3AA=="; }; dependencies = [ sources."array-ify-1.0.0" sources."compare-func-2.0.0" - sources."conventional-changelog-conventionalcommits-6.1.0" + sources."conventional-changelog-conventionalcommits-7.0.2" sources."dot-prop-5.3.0" sources."is-obj-2.0.0" ]; @@ -61984,10 +61649,10 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.107.4"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.107.4.tgz"; - sha512 = "EyHUPDE3iXQvkyqkWdkzRqoT2D8EwLKAjIjy1zte4cihKgdq1RyI8p33EkidUiYQ5fBtcGAOTLyMWvMMRzBVAQ=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.110.1.tgz"; + sha512 = "uH/EmZdfOSesbN9mvVn1GEJPjencrXbOl2mx4fLuMpc4Fxi8eK5nw9NUxt/XBAySS/HiZgD3PKAuFugD3tMuJQ=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -62022,7 +61687,7 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-rest-pipeline-1.12.1" // { + (sources."@azure/core-rest-pipeline-1.12.2" // { dependencies = [ sources."form-data-4.0.0" sources."tslib-2.6.2" @@ -62033,7 +61698,7 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-util-1.5.0" // { + (sources."@azure/core-util-1.6.1" // { dependencies = [ sources."tslib-2.6.2" ]; @@ -62048,15 +61713,15 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/msal-browser-2.38.2" // { + (sources."@azure/msal-browser-2.38.3" // { dependencies = [ - sources."@azure/msal-common-13.3.0" + sources."@azure/msal-common-13.3.1" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.18.3" // { + (sources."@azure/msal-node-1.18.4" // { dependencies = [ - sources."@azure/msal-common-13.3.0" + sources."@azure/msal-common-13.3.1" ]; }) (sources."@azure/storage-blob-12.11.0" // { @@ -62066,7 +61731,7 @@ in ]; }) sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" @@ -62074,27 +61739,23 @@ in sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.22.5" - (sources."@babel/template-7.22.15" // { - dependencies = [ - sources."@babel/parser-7.23.0" - ]; - }) - sources."@babel/traverse-7.22.5" - sources."@babel/types-7.23.0" + sources."@babel/parser-7.23.3" + sources."@babel/template-7.22.15" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@microsoft/rush-lib-5.107.4" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@microsoft/rush-lib-5.110.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" + sources."@opentelemetry/api-1.7.0" sources."@pnpm/crypto.base32-hash-2.0.0" - sources."@pnpm/dependency-path-2.1.3" + sources."@pnpm/dependency-path-2.1.5" sources."@pnpm/error-1.4.0" (sources."@pnpm/link-bins-5.3.25" // { dependencies = [ @@ -62118,21 +61779,18 @@ in sources."graceful-fs-4.2.4" ]; }) - sources."@pnpm/types-9.2.0" + sources."@pnpm/types-9.4.0" (sources."@pnpm/write-project-manifest-1.1.7" // { dependencies = [ sources."@pnpm/types-6.4.0" ]; }) - sources."@rushstack/heft-config-file-0.14.1" - (sources."@rushstack/node-core-library-3.60.1" // { - dependencies = [ - sources."import-lazy-4.0.0" - ]; - }) - sources."@rushstack/package-deps-hash-4.1.5" - (sources."@rushstack/package-extractor-0.6.6" // { + sources."@rushstack/heft-config-file-0.14.2" + sources."@rushstack/node-core-library-3.61.0" + sources."@rushstack/package-deps-hash-4.1.11" + (sources."@rushstack/package-extractor-0.6.12" // { dependencies = [ + sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" ]; }) @@ -62141,13 +61799,13 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.107.4" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.107.4" - sources."@rushstack/rush-http-build-cache-plugin-5.107.4" - sources."@rushstack/rush-sdk-5.107.4" - sources."@rushstack/stream-collator-4.1.6" - sources."@rushstack/terminal-0.7.5" - (sources."@rushstack/ts-command-line-4.16.1" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.110.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.110.1" + sources."@rushstack/rush-http-build-cache-plugin-5.110.1" + sources."@rushstack/rush-sdk-5.110.1" + sources."@rushstack/stream-collator-4.1.12" + sources."@rushstack/terminal-0.7.11" + (sources."@rushstack/ts-command-line-4.17.1" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -62156,20 +61814,20 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-2.0.0" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.14.199" + sources."@types/lodash-4.14.201" sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.3" - sources."@types/node-20.8.0" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" sources."@types/node-fetch-2.6.2" - sources."@types/normalize-package-data-2.4.2" - sources."@types/parse-json-4.0.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-3.3.4" - sources."@vue/compiler-ssr-3.3.4" - sources."@vue/reactivity-transform-3.3.4" - sources."@vue/shared-3.3.4" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -62203,7 +61861,7 @@ in sources."type-fest-0.20.2" ]; }) - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" @@ -62271,10 +61929,12 @@ in sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" - (sources."depcheck-1.4.6" // { + (sources."depcheck-1.4.7" // { dependencies = [ sources."argparse-1.0.10" + sources."ignore-5.2.4" sources."js-yaml-3.14.1" + sources."minimatch-7.4.6" ]; }) (sources."dependency-path-9.2.8" // { @@ -62283,7 +61943,7 @@ in sources."@pnpm/types-8.9.0" ]; }) - sources."deps-regex-0.1.4" + sources."deps-regex-0.2.0" sources."detect-file-1.0.0" sources."detect-indent-6.1.0" sources."dezalgo-1.0.4" @@ -62310,7 +61970,7 @@ in sources."expand-tilde-2.0.2" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.0.0" sources."fill-range-7.0.1" @@ -62322,14 +61982,10 @@ in }) sources."findup-sync-5.0.0" sources."form-data-3.0.1" - (sources."fs-extra-7.0.1" // { - dependencies = [ - sources."universalify-0.1.2" - ]; - }) + sources."fs-extra-7.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" sources."git-repo-info-2.1.1" @@ -62361,9 +62017,9 @@ in }) sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" + sources."hasown-2.0.0" (sources."highlight-es-1.0.3" // { dependencies = [ sources."js-tokens-3.0.2" @@ -62385,7 +62041,7 @@ in sources."resolve-from-4.0.0" ]; }) - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -62403,7 +62059,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-es2016-keyword-1.0.0" sources."is-extglob-2.1.1" @@ -62490,7 +62146,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.4" + sources."magic-string-0.30.5" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -62512,7 +62168,11 @@ in sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" + (sources."minimatch-3.1.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + ]; + }) sources."minimist-1.2.8" (sources."minimist-options-4.1.0" // { dependencies = [ @@ -62527,7 +62187,7 @@ in sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" sources."normalize-package-data-3.0.3" @@ -62623,7 +62283,7 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."pupa-2.1.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -62670,7 +62330,7 @@ in sources."require-from-string-2.0.2" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" (sources."resolve-dir-1.0.1" // { dependencies = [ sources."global-modules-1.0.0" @@ -62680,7 +62340,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" - sources."rfc4648-1.5.2" + sources."rfc4648-1.5.3" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" @@ -62704,7 +62364,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stackframe-1.3.4" @@ -62735,7 +62395,11 @@ in sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."tough-cookie-4.1.3" + (sources."tough-cookie-4.1.3" // { + dependencies = [ + sources."universalify-0.2.0" + ]; + }) sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."true-case-path-2.2.1" @@ -62743,8 +62407,9 @@ in sources."tunnel-0.0.6" sources."type-fest-0.6.0" sources."typedarray-to-buffer-3.1.5" + sources."undici-types-5.26.5" sources."unique-string-2.0.0" - sources."universalify-0.2.0" + sources."universalify-0.1.2" (sources."update-notifier-5.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -62752,6 +62417,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."import-lazy-2.1.0" sources."supports-color-7.2.0" ]; }) @@ -62807,16 +62473,22 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.49.5"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.49.5.tgz"; - sha512 = "E9nA5f1IT7MlV34SVnSekyeTEeCuC6NFqWucXzVU3t6xoTtNCl82v6Mi3laeXPs25c7npoJYv+nUUMjkLzR4jQ=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.2.tgz"; + sha512 = "7Lzgcpk/Ic/mKb4cvXy9CLlU3/VPs0ZLD/8rviL+yV35th/rsYeoeEpTO2xzzYTkhdcQMJM0+TzsggS3sQLKeQ=="; }; dependencies = [ + (sources."@alcalzone/ansi-tokenize-0.1.3" // { + dependencies = [ + sources."ansi-styles-6.2.1" + sources."is-fullwidth-code-point-4.0.0" + ]; + }) sources."@bugsnag/browser-7.21.0" sources."@bugsnag/core-7.19.0" sources."@bugsnag/cuid-3.0.2" - sources."@bugsnag/js-7.20.2" + sources."@bugsnag/js-7.21.0" sources."@bugsnag/node-7.19.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@cspotcode/source-map-support-0.8.1" @@ -62830,11 +62502,61 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.12" + sources."@oclif/color-1.0.13" sources."@oclif/core-2.11.7" - sources."@oclif/plugin-commands-2.2.21" - sources."@oclif/plugin-help-5.2.15" + (sources."@oclif/plugin-commands-2.2.24" // { + dependencies = [ + sources."@oclif/core-2.15.0" + ]; + }) + (sources."@oclif/plugin-help-5.2.18" // { + dependencies = [ + sources."@oclif/core-2.15.0" + ]; + }) sources."@oclif/plugin-plugins-3.1.8" + sources."@opentelemetry/api-1.6.0" + sources."@opentelemetry/api-logs-0.43.0" + sources."@opentelemetry/core-1.17.1" + (sources."@opentelemetry/exporter-metrics-otlp-http-0.43.0" // { + dependencies = [ + sources."@opentelemetry/core-1.17.0" + sources."@opentelemetry/resources-1.17.0" + sources."@opentelemetry/sdk-metrics-1.17.0" + sources."@opentelemetry/semantic-conventions-1.17.0" + ]; + }) + (sources."@opentelemetry/otlp-exporter-base-0.43.0" // { + dependencies = [ + sources."@opentelemetry/core-1.17.0" + sources."@opentelemetry/semantic-conventions-1.17.0" + ]; + }) + (sources."@opentelemetry/otlp-transformer-0.43.0" // { + dependencies = [ + sources."@opentelemetry/core-1.17.0" + sources."@opentelemetry/resources-1.17.0" + sources."@opentelemetry/sdk-metrics-1.17.0" + sources."@opentelemetry/semantic-conventions-1.17.0" + ]; + }) + sources."@opentelemetry/resources-1.17.1" + (sources."@opentelemetry/sdk-logs-0.43.0" // { + dependencies = [ + sources."@opentelemetry/core-1.17.0" + sources."@opentelemetry/resources-1.17.0" + sources."@opentelemetry/semantic-conventions-1.17.0" + ]; + }) + sources."@opentelemetry/sdk-metrics-1.17.1" + (sources."@opentelemetry/sdk-trace-base-1.17.0" // { + dependencies = [ + sources."@opentelemetry/core-1.17.0" + sources."@opentelemetry/resources-1.17.0" + sources."@opentelemetry/semantic-conventions-1.17.0" + ]; + }) + sources."@opentelemetry/semantic-conventions-1.17.1" sources."@pnpm/config.env-replace-1.1.0" (sources."@pnpm/network.ca-file-1.0.2" // { dependencies = [ @@ -62842,45 +62564,45 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.49.5" // { + (sources."@shopify/cli-kit-3.50.2" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" sources."argparse-2.0.1" sources."chalk-5.3.0" + sources."fast-glob-3.3.1" sources."fs-extra-11.1.0" sources."js-yaml-4.1.0" - sources."semver-7.5.3" sources."strip-ansi-7.1.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-3.0.0" sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.49.5" + sources."@shopify/plugin-did-you-mean-3.50.2" sources."@sindresorhus/is-5.6.0" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@szmarczak/http-timer-5.0.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/archiver-5.3.2" - sources."@types/cli-progress-3.11.3" - sources."@types/http-cache-semantics-4.0.2" - sources."@types/node-20.8.0" - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/readdir-glob-1.1.2" - sources."@types/scheduler-0.16.4" - sources."@types/tinycolor2-1.4.4" + sources."@types/cli-progress-3.11.5" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/readdir-glob-1.1.4" + sources."@types/scheduler-0.16.6" + sources."@types/tinycolor2-1.4.6" sources."abort-controller-3.0.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" @@ -62892,7 +62614,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" - sources."archiver-5.3.1" + sources."archiver-5.3.2" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.8" @@ -62904,7 +62626,7 @@ in sources."array-union-2.1.0" sources."as-table-1.0.55" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atomically-2.0.2" @@ -62918,11 +62640,11 @@ in sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."builtins-5.0.1" sources."byline-5.0.0" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" + sources."cacheable-request-10.2.14" sources."camel-case-4.1.2" sources."capital-case-1.0.4" sources."cardinal-2.1.1" @@ -62932,7 +62654,7 @@ in ]; }) sources."change-case-4.1.2" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."clean-stack-3.0.1" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" @@ -63022,7 +62744,7 @@ in }) sources."extract-files-9.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fetch-blob-3.2.0" (sources."figures-5.0.0" // { @@ -63045,7 +62767,7 @@ in sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."fuzzy-0.1.3" sources."get-package-type-0.1.0" sources."get-port-please-3.0.1" @@ -63074,14 +62796,14 @@ in sources."got-12.6.1" sources."graceful-fs-4.2.11" sources."gradient-string-2.0.2" - sources."graphql-16.4.0" + sources."graphql-16.8.1" (sources."graphql-request-5.2.0" // { dependencies = [ sources."form-data-3.0.1" ]; }) - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."header-case-2.0.4" sources."http-cache-semantics-4.1.1" sources."http-call-5.3.0" @@ -63095,7 +62817,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."ink-4.2.0" // { + (sources."ink-4.4.1" // { dependencies = [ (sources."ansi-escapes-6.2.0" // { dependencies = [ @@ -63119,7 +62841,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -63145,7 +62867,7 @@ in sources."json-schema-traverse-1.0.0" sources."json-schema-typed-8.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kill-port-process-3.1.0" sources."latest-version-7.0.0" (sources."lazystream-1.0.1" // { @@ -63154,7 +62876,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."liquidjs-10.8.4" // { + (sources."liquidjs-10.9.2" // { dependencies = [ sources."commander-10.0.1" ]; @@ -63170,6 +62892,7 @@ in sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.isplainobject-4.0.6" + sources."lodash.merge-4.6.2" sources."lodash.union-4.6.0" sources."loglevel-1.8.1" sources."loose-envify-1.4.0" @@ -63198,11 +62921,11 @@ in sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-domexception-1.0.0" - sources."node-fetch-3.3.1" + sources."node-fetch-3.3.2" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-8.0.0" - sources."npm-9.8.1" + sources."npm-9.9.1" sources."npm-run-path-4.0.1" sources."object-treeify-1.1.33" sources."once-1.4.0" @@ -63248,12 +62971,12 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."rc-1.2.8" sources."react-18.2.0" - (sources."react-devtools-core-4.28.0" // { + (sources."react-devtools-core-4.28.5" // { dependencies = [ sources."utf-8-validate-5.0.10" sources."ws-7.5.9" @@ -63271,7 +62994,7 @@ in sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" (sources."restore-cursor-4.0.0" // { @@ -63354,8 +63077,9 @@ in sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."unique-string-3.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."upper-case-2.0.2" sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" @@ -63383,7 +63107,7 @@ in sources."archiver-utils-3.0.4" ]; }) - sources."zod-3.21.4" + sources."zod-3.22.2" sources."zod-to-json-schema-3.21.4" ]; buildInputs = globalBuildInputs; @@ -63415,18 +63139,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -63447,7 +63171,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63456,18 +63180,18 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.1.6" sources."glob-parent-6.0.2" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -63475,7 +63199,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -63496,13 +63220,13 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.3" + sources."tailwindcss-3.3.5" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -63514,10 +63238,11 @@ in }) sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -63549,18 +63274,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -63581,7 +63306,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63590,18 +63315,18 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.1.6" sources."glob-parent-6.0.2" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -63610,7 +63335,7 @@ in sources."mini-svg-data-uri-1.4.4" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -63631,13 +63356,13 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.3" + sources."tailwindcss-3.3.5" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -63649,10 +63374,11 @@ in }) sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -63668,10 +63394,10 @@ in "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.13.tgz"; - sha512 = "C5OKPG8F6IiSbiEgXMxskMsOnbzSGnZvKBxEGHUhBGIB/tlX5rc7Iv/prdwYrUj2Swhjj5TrXuxZgACo+blB4A=="; + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.14.tgz"; + sha512 = "WLkoJWzcYoysef/yPouukwpIB5pdAeXML0B+O2rCLAM/GmGT2jB3+431y7SLghy1ByscILcQt+iUpvTwNjJjPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -63702,18 +63428,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -63734,7 +63460,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63743,18 +63469,18 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.1.6" sources."glob-parent-6.0.2" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -63762,7 +63488,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -63783,13 +63509,13 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.3.3" + sources."tailwindcss-3.3.5" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -63801,10 +63527,11 @@ in }) sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -63836,18 +63563,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -63868,7 +63595,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63877,18 +63604,18 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.1.6" sources."glob-parent-6.0.2" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lodash.castarray-4.4.0" @@ -63899,7 +63626,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -63924,13 +63651,13 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" sources."sucrase-3.34.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.3.3" // { + (sources."tailwindcss-3.3.5" // { dependencies = [ sources."postcss-selector-parser-6.0.13" ]; @@ -63946,10 +63673,11 @@ in }) sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -63965,10 +63693,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.9.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.9.1.tgz"; - sha512 = "fxx1TvWKNEOfwn9ar+T4FzyqmrsjUQjdhc3O3mz7KQU7IotJOoIiC6I00BD8UMxpAblqgOfq0SVCmk9ZzjIXxQ=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.11.0.tgz"; + sha512 = "TycDEH1WPvMj5oEz76eq+iioCzamb5ml1KmfR9KLHsoAucTbj6NGiWNjCCKdduxefbeKP0PQtvVZUnjZnIPafg=="; }; dependencies = [ (sources."@aws-crypto/crc32-3.0.0" // { @@ -64011,44 +63739,45 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.423.0" - sources."@aws-sdk/client-sso-3.423.0" - sources."@aws-sdk/client-sts-3.423.0" - sources."@aws-sdk/credential-provider-env-3.418.0" - sources."@aws-sdk/credential-provider-ini-3.423.0" - sources."@aws-sdk/credential-provider-node-3.423.0" - sources."@aws-sdk/credential-provider-process-3.418.0" - sources."@aws-sdk/credential-provider-sso-3.423.0" - sources."@aws-sdk/credential-provider-web-identity-3.418.0" - (sources."@aws-sdk/lib-storage-3.423.0" // { + sources."@aws-sdk/client-s3-3.445.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" + sources."@aws-sdk/credential-provider-env-3.433.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" + sources."@aws-sdk/credential-provider-process-3.433.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" + sources."@aws-sdk/credential-provider-web-identity-3.433.0" + (sources."@aws-sdk/lib-storage-3.445.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.418.0" - sources."@aws-sdk/middleware-expect-continue-3.418.0" - sources."@aws-sdk/middleware-flexible-checksums-3.418.0" - sources."@aws-sdk/middleware-host-header-3.418.0" - sources."@aws-sdk/middleware-location-constraint-3.418.0" - sources."@aws-sdk/middleware-logger-3.418.0" - sources."@aws-sdk/middleware-recursion-detection-3.418.0" - sources."@aws-sdk/middleware-sdk-s3-3.418.0" - sources."@aws-sdk/middleware-sdk-sts-3.418.0" - sources."@aws-sdk/middleware-signing-3.418.0" - sources."@aws-sdk/middleware-ssec-3.418.0" - sources."@aws-sdk/middleware-user-agent-3.418.0" - sources."@aws-sdk/region-config-resolver-3.418.0" - sources."@aws-sdk/s3-presigned-post-3.423.0" - sources."@aws-sdk/s3-request-presigner-3.423.0" - sources."@aws-sdk/signature-v4-multi-region-3.418.0" - sources."@aws-sdk/token-providers-3.418.0" - sources."@aws-sdk/types-3.418.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.433.0" + sources."@aws-sdk/middleware-expect-continue-3.433.0" + sources."@aws-sdk/middleware-flexible-checksums-3.433.0" + sources."@aws-sdk/middleware-host-header-3.433.0" + sources."@aws-sdk/middleware-location-constraint-3.433.0" + sources."@aws-sdk/middleware-logger-3.433.0" + sources."@aws-sdk/middleware-recursion-detection-3.433.0" + sources."@aws-sdk/middleware-sdk-s3-3.440.0" + sources."@aws-sdk/middleware-sdk-sts-3.433.0" + sources."@aws-sdk/middleware-signing-3.433.0" + sources."@aws-sdk/middleware-ssec-3.433.0" + sources."@aws-sdk/middleware-user-agent-3.438.0" + sources."@aws-sdk/region-config-resolver-3.433.0" + sources."@aws-sdk/s3-presigned-post-3.445.0" + sources."@aws-sdk/s3-request-presigner-3.445.0" + sources."@aws-sdk/signature-v4-multi-region-3.437.0" + sources."@aws-sdk/token-providers-3.438.0" + sources."@aws-sdk/types-3.433.0" sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-endpoints-3.418.0" - sources."@aws-sdk/util-format-url-3.418.0" + sources."@aws-sdk/util-endpoints-3.438.0" + sources."@aws-sdk/util-format-url-3.433.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.418.0" - sources."@aws-sdk/util-user-agent-node-3.418.0" + sources."@aws-sdk/util-user-agent-browser-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.310.0" sources."@httptoolkit/websocket-stream-6.0.1" @@ -64059,69 +63788,74 @@ in sources."@redis/search-1.0.6" sources."@redis/time-series-1.0.3" sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-2.0.10" + sources."@smithy/abort-controller-2.0.12" sources."@smithy/chunked-blob-reader-2.0.0" sources."@smithy/chunked-blob-reader-native-2.0.0" - sources."@smithy/config-resolver-2.0.11" - sources."@smithy/credential-provider-imds-2.0.13" - sources."@smithy/eventstream-codec-2.0.10" - sources."@smithy/eventstream-serde-browser-2.0.10" - sources."@smithy/eventstream-serde-config-resolver-2.0.10" - sources."@smithy/eventstream-serde-node-2.0.10" - sources."@smithy/eventstream-serde-universal-2.0.10" - sources."@smithy/fetch-http-handler-2.2.0" - sources."@smithy/hash-blob-browser-2.0.10" - sources."@smithy/hash-node-2.0.10" - sources."@smithy/hash-stream-node-2.0.10" - sources."@smithy/invalid-dependency-2.0.10" + sources."@smithy/config-resolver-2.0.16" + sources."@smithy/credential-provider-imds-2.0.18" + sources."@smithy/eventstream-codec-2.0.12" + sources."@smithy/eventstream-serde-browser-2.0.12" + sources."@smithy/eventstream-serde-config-resolver-2.0.12" + sources."@smithy/eventstream-serde-node-2.0.12" + sources."@smithy/eventstream-serde-universal-2.0.12" + sources."@smithy/fetch-http-handler-2.2.4" + sources."@smithy/hash-blob-browser-2.0.12" + sources."@smithy/hash-node-2.0.12" + sources."@smithy/hash-stream-node-2.0.12" + sources."@smithy/invalid-dependency-2.0.12" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/md5-js-2.0.10" - sources."@smithy/middleware-content-length-2.0.12" - sources."@smithy/middleware-endpoint-2.0.10" - sources."@smithy/middleware-retry-2.0.13" - sources."@smithy/middleware-serde-2.0.10" - sources."@smithy/middleware-stack-2.0.4" - sources."@smithy/node-config-provider-2.0.13" - sources."@smithy/node-http-handler-2.1.6" - sources."@smithy/property-provider-2.0.11" - sources."@smithy/protocol-http-3.0.6" - sources."@smithy/querystring-builder-2.0.10" - sources."@smithy/querystring-parser-2.0.10" - sources."@smithy/service-error-classification-2.0.3" - sources."@smithy/shared-ini-file-loader-2.0.12" - sources."@smithy/signature-v4-2.0.10" - sources."@smithy/smithy-client-2.1.8" - sources."@smithy/types-2.3.4" - sources."@smithy/url-parser-2.0.10" + sources."@smithy/md5-js-2.0.12" + sources."@smithy/middleware-content-length-2.0.14" + sources."@smithy/middleware-endpoint-2.1.3" + sources."@smithy/middleware-retry-2.0.18" + sources."@smithy/middleware-serde-2.0.12" + sources."@smithy/middleware-stack-2.0.6" + sources."@smithy/node-config-provider-2.1.3" + sources."@smithy/node-http-handler-2.1.8" + sources."@smithy/property-provider-2.0.13" + sources."@smithy/protocol-http-3.0.8" + sources."@smithy/querystring-builder-2.0.12" + sources."@smithy/querystring-parser-2.0.12" + sources."@smithy/service-error-classification-2.0.5" + sources."@smithy/shared-ini-file-loader-2.2.2" + sources."@smithy/signature-v4-2.0.12" + sources."@smithy/smithy-client-2.1.12" + sources."@smithy/types-2.4.0" + sources."@smithy/url-parser-2.0.12" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.12" - sources."@smithy/util-defaults-mode-node-2.0.14" + sources."@smithy/util-defaults-mode-browser-2.0.16" + sources."@smithy/util-defaults-mode-node-2.0.21" + sources."@smithy/util-endpoints-1.0.2" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.3" - sources."@smithy/util-retry-2.0.3" - sources."@smithy/util-stream-2.0.13" + sources."@smithy/util-middleware-2.0.5" + sources."@smithy/util-retry-2.0.5" + sources."@smithy/util-stream-2.0.17" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" - sources."@smithy/util-waiter-2.0.10" + sources."@smithy/util-waiter-2.0.12" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.0" - sources."@types/responselike-1.0.1" - sources."@types/ws-8.5.6" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.18.0" - sources."axios-0.24.0" + sources."aws-crt-1.19.0" + (sources."axios-1.6.1" // { + dependencies = [ + sources."form-data-4.0.0" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -64149,11 +63883,11 @@ in sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-4.1.2" sources."clone-response-1.0.3" sources."cluster-key-slot-1.1.0" @@ -64178,7 +63912,7 @@ in sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cron-parser-3.5.0" - sources."crypto-js-4.1.1" + sources."crypto-js-4.2.0" sources."custom-error-instance-2.1.1" (sources."debug-4.3.4" // { dependencies = [ @@ -64191,7 +63925,7 @@ in ]; }) sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -64245,9 +63979,9 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."generic-pool-3.8.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -64258,12 +63992,12 @@ in sources."cookie-signature-1.2.1" ]; }) - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."hash.js-1.1.7" + sources."hasown-2.0.0" sources."helmet-4.6.0" (sources."help-me-3.0.0" // { dependencies = [ @@ -64286,17 +64020,16 @@ in sources."js-base64-3.7.5" sources."js-sdsl-4.3.0" sources."json-buffer-3.0.1" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" - sources."semver-5.7.2" ]; }) sources."jwa-2.0.0" sources."jwk-to-pem-2.0.5" sources."jws-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."leven-2.1.0" sources."lodash-4.17.21" sources."lodash._baseiteratee-4.7.0" @@ -64305,13 +64038,6 @@ in sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."lodash._stringtopath-4.8.0" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-timeout-0.1.1" @@ -64354,7 +64080,7 @@ in sources."number-allocator-1.0.14" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -64372,6 +64098,7 @@ in sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" sources."querystringify-2.2.0" @@ -64409,6 +64136,7 @@ in sources."serialize-error-2.1.0" sources."serialize-javascript-6.0.1" sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" @@ -64439,6 +64167,7 @@ in sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" + sources."undici-types-5.26.5" sources."unpipe-1.0.0" sources."url-parse-1.5.10" sources."url-value-parser-2.2.0" @@ -64472,7 +64201,7 @@ in sha512 = "+/kSxBAkZbeVBePoG2qRSvCkVIslk1dNlU5wQHAcbzOFTi7pEQR6C+kjoj94I+vGXVGMFfDwOYm07sPsd8dM6w=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -64499,36 +64228,39 @@ in ]; }) sources."@vscode/l10n-0.0.11" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-3.3.4" - sources."@vue/compiler-ssr-3.3.4" - sources."@vue/reactivity-3.3.4" - sources."@vue/reactivity-transform-3.3.4" - sources."@vue/shared-3.3.4" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."acorn-7.4.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."character-parser-2.2.0" sources."de-indent-1.0.2" + sources."define-data-property-1.1.1" sources."emmet-2.4.6" sources."estree-walker-2.0.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."has-1.0.3" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."he-1.2.0" sources."is-expression-4.0.0" sources."is-regex-1.1.4" sources."jsonc-parser-3.2.0" sources."lru-cache-6.0.0" - sources."magic-string-0.30.4" + sources."magic-string-0.30.5" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."object-assign-4.1.1" sources."picocolors-1.0.0" sources."postcss-8.4.31" @@ -64537,23 +64269,23 @@ in sources."pug-parser-6.0.0" sources."request-light-0.7.0" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."source-map-js-1.0.2" sources."token-stream-1.0.0" sources."typesafe-path-0.2.2" sources."typescript-5.2.2" sources."typescript-auto-import-cache-0.2.1" - (sources."vscode-css-languageservice-6.2.9" // { - dependencies = [ - sources."@vscode/l10n-0.0.16" - sources."vscode-languageserver-types-3.17.3" - ]; - }) - (sources."vscode-html-languageservice-5.1.0" // { + (sources."vscode-css-languageservice-6.2.10" // { dependencies = [ sources."@vscode/l10n-0.0.16" ]; }) - (sources."vscode-json-languageservice-5.3.6" // { + (sources."vscode-html-languageservice-5.1.1" // { + dependencies = [ + sources."@vscode/l10n-0.0.16" + ]; + }) + (sources."vscode-json-languageservice-5.3.7" // { dependencies = [ sources."@vscode/l10n-0.0.16" ]; @@ -64573,10 +64305,10 @@ in sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."vue-component-meta-1.6.5" sources."vue-component-type-helpers-1.6.5" - sources."vue-template-compiler-2.7.14" + sources."vue-template-compiler-2.7.15" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -64597,7 +64329,7 @@ in sha512 = "c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA=="; }; dependencies = [ - sources."@achrinza/node-ipc-9.2.7" + sources."@achrinza/node-ipc-9.2.8" sources."@akryum/winattr-3.0.0" sources."@ampproject/remapping-2.2.1" sources."@apollo/protobufjs-1.2.7" @@ -64626,13 +64358,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -64652,13 +64384,13 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/helper-define-polyfill-provider-0.4.2" + sources."@babel/helper-define-polyfill-provider-0.4.3" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-remap-async-to-generator-7.22.20" @@ -64670,7 +64402,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -64681,9 +64413,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.21.0" @@ -64693,12 +64426,12 @@ in sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -64707,66 +64440,66 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.22.15" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.20" // { + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/preset-flow-7.22.15" + sources."@babel/preset-flow-7.23.3" sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.23.0" + sources."@babel/preset-typescript-7.23.3" (sources."@babel/register-7.22.15" // { dependencies = [ sources."make-dir-2.1.0" @@ -64775,10 +64508,10 @@ in ]; }) sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.20" // { dependencies = [ @@ -64798,7 +64531,7 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@node-ipc/js-queue-2.0.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -64817,15 +64550,15 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" - sources."@types/accepts-1.3.5" + sources."@types/accepts-1.3.7" sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.36" + sources."@types/connect-3.4.38" sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.3" + sources."@types/ejs-3.1.5" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.2" - sources."@types/inquirer-8.2.6" + sources."@types/http-errors-2.0.4" + sources."@types/inquirer-8.2.10" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" @@ -64833,13 +64566,13 @@ in ]; }) sources."@types/long-4.0.2" - sources."@types/mime-3.0.2" - sources."@types/node-20.8.0" - sources."@types/normalize-package-data-2.4.2" - sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.5" - sources."@types/serve-static-1.15.3" - sources."@types/through-0.0.31" + sources."@types/mime-3.0.4" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/serve-static-1.15.5" + sources."@types/through-0.0.33" sources."@vue/cli-shared-utils-5.0.8" (sources."@vue/cli-ui-5.0.8" // { dependencies = [ @@ -64848,10 +64581,10 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-2.7.14" - sources."@vue/shared-3.3.4" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-2.7.15" + sources."@vue/shared-3.3.8" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -64895,13 +64628,13 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."babel-core-7.0.0-bridge.0" - (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + (sources."babel-plugin-polyfill-corejs2-0.4.6" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."babel-plugin-polyfill-corejs3-0.8.4" - sources."babel-plugin-polyfill-regenerator-0.5.2" + sources."babel-plugin-polyfill-corejs3-0.8.6" + sources."babel-plugin-polyfill-regenerator-0.5.3" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -64931,7 +64664,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."builtins-1.0.3" sources."bytes-3.1.2" sources."cache-base-1.0.1" @@ -64941,27 +64674,16 @@ in sources."lowercase-keys-1.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."clean-stack-2.2.0" @@ -64992,7 +64714,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.33.0" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -65038,6 +64760,7 @@ in }) sources."deepmerge-4.3.1" sources."defaults-1.0.4" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" sources."define-property-2.0.2" sources."depd-2.0.0" @@ -65053,13 +64776,13 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -65076,18 +64799,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."express-4.18.2" // { @@ -65117,7 +64829,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -65164,7 +64876,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.217.2" + sources."flow-parser-0.220.1" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -65180,10 +64892,10 @@ in sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."fswin-2.17.1227" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -65198,6 +64910,7 @@ in }) sources."globals-11.12.0" sources."globby-11.1.0" + sources."gopd-1.0.1" (sources."got-8.3.2" // { dependencies = [ sources."get-stream-3.0.0" @@ -65209,8 +64922,8 @@ in sources."graphql-tag-2.12.6" sources."graphql-type-json-0.3.2" sources."growly-1.3.0" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" @@ -65226,6 +64939,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" sources."http-errors-2.0.0" @@ -65246,12 +64960,12 @@ in }) sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -65277,11 +64991,11 @@ in sources."iterall-1.3.0" (sources."jake-10.8.7" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" ]; }) sources."javascript-stringify-2.1.0" - sources."joi-17.10.2" + sources."joi-17.11.0" sources."js-message-1.0.7" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -65310,7 +65024,7 @@ in sources."jsonfile-6.1.0" sources."keyv-3.0.0" sources."kind-of-6.0.3" - sources."launch-editor-2.6.0" + sources."launch-editor-2.6.1" sources."leven-3.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" @@ -65381,17 +65095,11 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.4.1" @@ -65452,7 +65160,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-8.4.31" // { dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" ]; }) sources."prepend-http-2.0.0" @@ -65494,7 +65202,7 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."require-directory-2.1.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" @@ -65527,6 +65235,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -65548,18 +65257,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."source-map-0.5.7" ]; }) @@ -65583,24 +65281,13 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -65666,12 +65353,13 @@ in sources."type-is-1.6.18" sources."typescript-4.5.5" sources."unbzip2-stream-1.4.3" + sources."undici-types-5.26.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -65696,7 +65384,7 @@ in sources."validate-npm-package-name-3.0.0" sources."value-or-promise-1.0.11" sources."vary-1.1.2" - sources."vue-2.7.14" + sources."vue-2.7.15" (sources."vue-codemod-0.0.5" // { dependencies = [ sources."inquirer-7.3.3" @@ -65871,18 +65559,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -65959,7 +65647,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-6.3.0" + sources."@npmcli/config-6.4.0" (sources."@npmcli/map-workspaces-3.0.4" // { dependencies = [ sources."glob-10.3.10" @@ -65977,23 +65665,23 @@ in sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" - sources."@types/concat-stream-2.0.0" - sources."@types/debug-4.1.9" - sources."@types/estree-1.0.2" - sources."@types/estree-jsx-1.0.1" - sources."@types/hast-2.3.6" - sources."@types/http-cache-semantics-4.0.2" - sources."@types/is-empty-1.2.1" - sources."@types/mdast-3.0.13" - sources."@types/minimist-1.2.3" - sources."@types/ms-0.7.32" - sources."@types/nlcst-1.0.2" - sources."@types/node-18.18.1" - sources."@types/normalize-package-data-2.4.2" - sources."@types/supports-color-8.1.1" - sources."@types/unist-2.0.8" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" sources."abbrev-2.0.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -66018,7 +65706,7 @@ in sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" + sources."cacheable-request-10.2.14" sources."camelcase-7.0.1" (sources."camelcase-keys-8.0.2" // { dependencies = [ @@ -66031,7 +65719,7 @@ in sources."character-entities-html4-2.1.0" sources."character-entities-legacy-3.0.0" sources."character-reference-invalid-2.0.1" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -66093,7 +65781,7 @@ in sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-stream-6.0.1" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" @@ -66106,9 +65794,9 @@ in sources."got-12.6.1" sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-yarn-3.0.0" + sources."hasown-2.0.0" sources."hast-util-embedded-2.0.1" sources."hast-util-from-parse5-7.1.2" sources."hast-util-has-property-2.0.1" @@ -66140,7 +65828,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" @@ -66158,7 +65846,7 @@ in sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kind-of-6.0.3" sources."kleur-4.1.5" sources."latest-version-7.0.0" @@ -66278,7 +65966,7 @@ in sources."pluralize-8.0.0" sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-6.3.0" + sources."property-information-6.4.0" sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" @@ -66346,7 +66034,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -66387,6 +66075,7 @@ in sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" + sources."undici-types-5.26.5" sources."unherit-3.0.1" (sources."unified-10.1.2" // { dependencies = [ @@ -66397,7 +66086,7 @@ in (sources."unified-engine-10.1.0" // { dependencies = [ sources."is-plain-obj-4.1.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."parse-json-6.0.2" ]; }) @@ -66469,7 +66158,7 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yargs-parser-21.1.1" sources."yocto-queue-1.0.0" sources."zwitch-2.0.4" @@ -66544,11 +66233,11 @@ in }; dependencies = [ sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001542" - sources."electron-to-chromium-1.4.538" + sources."caniuse-lite-1.0.30001561" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" - sources."fraction.js-4.3.6" - sources."nanoid-3.3.6" + sources."fraction.js-4.3.7" + sources."nanoid-3.3.7" sources."node-releases-2.0.13" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" @@ -66608,10 +66297,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.99.1"; + version = "2.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.99.1.tgz"; - sha512 = "uWg4xhBrHNoRMlEgvWzr0MacJ92dLFeJ5AvT7nruxrgShU1fgt/Rsxw1WCXSASaVUsIUGgtO+P89x8cRU2nf7w=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.105.0.tgz"; + sha512 = "3ji+HNlCJUJ3o9h430gdRhocmeQrpM49fibXpvj3rvzBwuyWSTe2t8uohMPScSMETv59sHOlZpOdAEd+WwkuHQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -66629,419 +66318,985 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "0.18.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.6.tgz"; - sha512 = "QGFEPM6m3ejd62pMuxvvqoHxx7AXHmn2Q2ed8lwZe6J01emKXVbW6MkIWjlD4ZFS1WnDqE4V220emoXJemUnkw=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-1.0.0.tgz"; + sha512 = "KNMSnpG0h7zqufvixv+lghJZEY3mvarXAfO9JuLTkziT6mSWj/jOhnq1thQsVn1gIcC9JV+pN+3uCxSELJqwVQ=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { dependencies = [ - sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" ]; }) sources."@babel/helper-validator-identifier-7.22.20" (sources."@babel/highlight-7.22.20" // { dependencies = [ - sources."ansi-styles-3.2.1" sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" ]; }) sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-7.29.0" - sources."@types/estree-1.0.2" - sources."@types/json-schema-7.0.13" - sources."@types/mdast-3.0.13" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."@types/unist-2.0.8" - sources."aggregate-error-3.1.0" + sources."@sindresorhus/is-5.6.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@types/debug-4.1.12" + sources."@types/eslint-8.44.7" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + (sources."@types/hast-2.3.8" // { + dependencies = [ + sources."@types/unist-2.0.10" + ]; + }) + sources."@types/http-cache-semantics-4.0.4" + sources."@types/json-schema-7.0.15" + sources."@types/mdast-4.0.3" + sources."@types/ms-0.7.34" + sources."@types/normalize-package-data-2.4.4" + sources."@types/unist-3.0.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" + sources."ansi-regex-6.0.1" + sources."ansi-styles-3.2.1" sources."append-type-1.0.2" sources."array-to-sentence-1.1.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" + sources."arrify-3.0.0" sources."assert-valid-glob-opts-1.0.0" - sources."bail-1.0.5" + sources."bail-2.0.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bl-4.1.0" + sources."bl-5.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.1" - (sources."cacheable-request-6.1.0" // { + sources."buffer-6.0.3" + sources."cacheable-lookup-7.0.0" + (sources."cacheable-request-10.2.14" // { dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" + sources."get-stream-6.0.1" ]; }) - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."chalk-4.1.2" - sources."character-entities-1.2.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" + sources."chalk-5.3.0" + sources."character-entities-2.0.2" + sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.1" - sources."clone-1.0.4" - sources."clone-response-1.0.3" sources."co-3.1.0" - sources."collapse-white-space-1.0.6" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."cross-spawn-6.0.5" - sources."crypto-random-string-2.0.0" + sources."cross-spawn-7.0.3" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) sources."debug-4.3.4" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { + sources."decode-named-character-reference-1.0.2" + (sources."decompress-response-6.0.0" // { dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."decompress-response-3.3.0" - sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" - (sources."del-6.1.1" // { - dependencies = [ - sources."rimraf-3.0.2" + sources."mimic-response-3.1.0" ]; }) + sources."defer-to-connect-2.0.1" + sources."dequal-2.0.3" + sources."devlop-1.1.0" + sources."diff-5.1.0" sources."dir-glob-3.0.1" - sources."duplexer3-0.1.5" - sources."emoji-regex-9.2.2" - sources."end-of-stream-1.4.4" + sources."eastasianwidth-0.2.0" + sources."emoji-regex-10.3.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."eslint-formatter-pretty-4.1.0" + (sources."eslint-formatter-pretty-5.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."is-unicode-supported-0.1.0" + sources."log-symbols-4.1.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."supports-color-7.2.0" + ]; + }) sources."eslint-rule-docs-1.1.235" - sources."execa-1.0.0" + sources."execa-8.0.1" sources."extend-3.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" - sources."find-up-4.1.0" + sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-stream-4.1.0" - sources."git-clone-0.1.0" - sources."github-slugger-1.5.0" + sources."function-bind-1.1.2" + sources."get-stream-8.0.1" + sources."git-clone-0.2.0" + sources."github-slugger-2.0.0" sources."github-url-to-object-4.0.6" sources."glob-7.2.3" sources."glob-option-error-1.0.0" sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."got-9.6.0" + sources."globby-13.2.2" + (sources."got-13.0.0" // { + dependencies = [ + sources."get-stream-6.0.1" + ]; + }) sources."graceful-fs-4.2.11" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."hosted-git-info-4.1.0" + sources."has-flag-3.0.0" + sources."hasown-2.0.0" + sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" + sources."http2-wrapper-2.2.0" + sources."human-signals-5.0.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" - sources."indent-string-4.0.0" sources."indexed-filter-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" sources."irregular-plurals-3.5.0" - sources."is-alphabetical-1.0.4" - sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.13.0" - sources."is-decimal-1.0.4" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-github-url-1.2.2" sources."is-glob-4.0.3" - sources."is-hexadecimal-1.0.4" - sources."is-interactive-1.0.0" + sources."is-interactive-2.0.0" sources."is-number-7.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-1.1.0" - sources."is-stream-1.1.0" - sources."is-unicode-supported-0.1.0" + sources."is-plain-obj-4.1.0" + sources."is-stream-3.0.0" + sources."is-unicode-supported-1.3.0" sources."is-url-1.2.4" - sources."is-url-superb-4.0.0" + sources."is-url-superb-6.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."keyv-3.1.0" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-3.0.0" + sources."keyv-4.5.4" sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" + sources."kleur-4.1.5" + sources."lines-and-columns-2.0.4" sources."lodash.iteratee-4.7.0" - sources."log-symbols-4.1.0" - sources."longest-streak-2.0.4" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - sources."mdast-comment-marker-1.1.2" - (sources."mdast-util-from-markdown-0.8.5" // { + sources."log-symbols-5.1.0" + sources."longest-streak-3.1.0" + sources."lowercase-keys-3.0.0" + sources."lru-cache-10.0.1" + (sources."mdast-comment-marker-2.1.2" // { dependencies = [ - sources."mdast-util-to-string-2.0.0" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) - sources."mdast-util-heading-style-1.0.6" - (sources."mdast-util-to-markdown-0.6.5" // { + sources."mdast-util-from-markdown-2.0.0" + (sources."mdast-util-heading-style-2.0.1" // { dependencies = [ - sources."mdast-util-to-string-2.0.0" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) - sources."mdast-util-to-string-1.1.0" - sources."meow-9.0.0" + (sources."mdast-util-mdx-expression-1.3.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."mdast-util-from-markdown-1.3.1" + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-string-3.2.0" + sources."micromark-3.2.0" + sources."micromark-core-commonmark-1.1.0" + sources."micromark-factory-destination-1.1.0" + sources."micromark-factory-label-1.1.0" + sources."micromark-factory-space-1.1.0" + sources."micromark-factory-title-1.1.0" + sources."micromark-factory-whitespace-1.1.0" + sources."micromark-util-character-1.2.0" + sources."micromark-util-chunked-1.1.0" + sources."micromark-util-classify-character-1.1.0" + sources."micromark-util-combine-extensions-1.1.0" + sources."micromark-util-decode-numeric-character-reference-1.1.0" + sources."micromark-util-decode-string-1.1.0" + sources."micromark-util-encode-1.1.0" + sources."micromark-util-html-tag-name-1.2.0" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-resolve-all-1.1.0" + sources."micromark-util-sanitize-uri-1.2.0" + sources."micromark-util-subtokenize-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."micromark-util-types-1.1.0" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + ]; + }) + sources."mdast-util-phrasing-4.0.0" + sources."mdast-util-to-markdown-2.1.0" + sources."mdast-util-to-string-4.0.0" + sources."meow-12.1.1" + sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.4" + sources."micromark-4.0.0" + sources."micromark-core-commonmark-2.0.0" + sources."micromark-factory-destination-2.0.0" + sources."micromark-factory-label-2.0.0" + sources."micromark-factory-space-2.0.0" + sources."micromark-factory-title-2.0.0" + sources."micromark-factory-whitespace-2.0.0" + sources."micromark-util-character-2.0.1" + sources."micromark-util-chunked-2.0.0" + sources."micromark-util-classify-character-2.0.0" + sources."micromark-util-combine-extensions-2.0.0" + sources."micromark-util-decode-numeric-character-reference-2.0.1" + sources."micromark-util-decode-string-2.0.0" + sources."micromark-util-encode-2.0.0" + sources."micromark-util-html-tag-name-2.0.0" + sources."micromark-util-normalize-identifier-2.0.0" + sources."micromark-util-resolve-all-2.0.0" + sources."micromark-util-sanitize-uri-2.0.0" + sources."micromark-util-subtokenize-2.0.0" + sources."micromark-util-symbol-2.0.0" + sources."micromark-util-types-2.0.0" sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."min-indent-1.0.1" + sources."mimic-fn-4.0.0" + sources."mimic-response-4.0.0" sources."minimatch-3.1.2" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."mri-1.2.0" sources."ms-2.1.2" - sources."nice-try-1.0.5" - (sources."normalize-package-data-3.0.3" // { + sources."normalize-package-data-6.0.0" + sources."normalize-url-8.0.0" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."semver-7.5.4" + sources."path-key-4.0.0" ]; }) - sources."normalize-url-4.5.1" - sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."p-cancelable-1.1.0" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."parse-entities-2.0.0" + sources."onetime-6.0.0" + sources."ora-7.0.1" + sources."p-cancelable-3.0.0" sources."parse-github-url-1.0.2" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" + (sources."parse-json-7.1.1" // { + dependencies = [ + sources."type-fest-3.13.1" + ]; + }) sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" + sources."path-key-3.1.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."pify-5.0.0" sources."plur-4.0.0" sources."pluralize-8.0.0" - sources."prepend-http-2.0.0" - sources."pump-3.0.0" sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) + sources."quick-lru-5.1.1" + sources."read-pkg-8.1.0" sources."readable-stream-3.6.2" - sources."redent-3.0.0" - sources."remark-13.0.0" - sources."remark-lint-8.0.0" - sources."remark-lint-blockquote-indentation-2.0.1" - sources."remark-lint-checkbox-character-style-3.0.0" - sources."remark-lint-checkbox-content-indent-3.0.0" - sources."remark-lint-code-block-style-2.0.1" - sources."remark-lint-definition-case-2.0.1" - sources."remark-lint-definition-spacing-2.0.1" - (sources."remark-lint-double-link-0.1.3" // { + sources."remark-15.0.1" + (sources."remark-lint-9.1.2" // { dependencies = [ - sources."normalize-url-5.3.1" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-blockquote-indentation-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-checkbox-character-style-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-checkbox-content-indent-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-code-block-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-definition-case-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-definition-spacing-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-double-link-0.2.0" // { + dependencies = [ + sources."@types/unist-2.0.10" + sources."normalize-url-5.3.1" + sources."unist-util-is-5.2.1" + sources."unist-util-visit-4.1.2" + ]; + }) + (sources."remark-lint-emphasis-marker-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-fenced-code-marker-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-file-extension-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-final-newline-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-hard-break-spaces-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-heading-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-link-title-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-list-item-bullet-indent-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-list-item-content-indent-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-list-item-indent-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-match-punctuation-0.2.1" // { + dependencies = [ + sources."unified-lint-rule-1.0.6" + ]; + }) + (sources."remark-lint-no-auto-link-without-protocol-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."mdast-util-to-string-3.2.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-blockquote-without-marker-5.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-emphasis-as-heading-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" ]; }) - sources."remark-lint-emphasis-marker-2.0.1" - sources."remark-lint-fenced-code-marker-2.0.1" - sources."remark-lint-file-extension-1.0.5" - sources."remark-lint-final-newline-1.0.5" - sources."remark-lint-hard-break-spaces-2.0.1" - sources."remark-lint-heading-style-2.0.1" - sources."remark-lint-link-title-style-2.0.1" - sources."remark-lint-list-item-bullet-indent-3.0.0" - sources."remark-lint-list-item-content-indent-2.0.1" - sources."remark-lint-list-item-indent-2.0.1" - sources."remark-lint-match-punctuation-0.2.1" - sources."remark-lint-no-auto-link-without-protocol-2.0.1" - sources."remark-lint-no-blockquote-without-marker-4.0.0" - sources."remark-lint-no-emphasis-as-heading-2.0.1" (sources."remark-lint-no-empty-sections-4.0.0" // { dependencies = [ + sources."mdast-util-to-string-1.1.0" + sources."unified-lint-rule-1.0.6" + sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + ]; + }) + (sources."remark-lint-no-file-name-articles-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-file-name-consecutive-dashes-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-file-name-irregular-characters-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-file-name-mixed-case-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-file-name-outer-dashes-2.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-heading-content-indent-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-heading-indent-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-heading-punctuation-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."mdast-util-to-string-3.2.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-inline-padding-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."mdast-util-to-string-3.2.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-multiple-toplevel-headings-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-repeat-punctuation-0.1.4" // { + dependencies = [ + sources."unified-lint-rule-1.0.6" + ]; + }) + (sources."remark-lint-no-shell-dollars-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-table-indentation-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-undefined-references-4.2.1" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-unneeded-full-reference-image-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-unneeded-full-reference-link-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-no-unused-definitions-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-ordered-list-marker-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-ordered-list-marker-value-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-rule-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-strong-marker-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-table-cell-padding-4.1.3" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-table-pipe-alignment-3.1.3" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-table-pipes-4.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-lint-unordered-list-marker-style-3.1.2" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + (sources."remark-message-control-7.1.1" // { + dependencies = [ + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + sources."remark-parse-11.0.0" + sources."remark-stringify-11.0.0" + sources."resolve-alpn-1.2.1" + sources."responselike-3.0.0" + (sources."restore-cursor-4.0.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."signal-exit-3.0.7" ]; }) - sources."remark-lint-no-file-name-articles-1.0.5" - sources."remark-lint-no-file-name-consecutive-dashes-1.0.5" - sources."remark-lint-no-file-name-irregular-characters-1.0.5" - sources."remark-lint-no-file-name-mixed-case-1.0.5" - sources."remark-lint-no-file-name-outer-dashes-1.0.6" - sources."remark-lint-no-heading-content-indent-3.0.0" - sources."remark-lint-no-heading-indent-3.0.0" - sources."remark-lint-no-heading-punctuation-2.0.1" - sources."remark-lint-no-inline-padding-3.0.0" - sources."remark-lint-no-multiple-toplevel-headings-2.0.1" - sources."remark-lint-no-repeat-punctuation-0.1.4" - sources."remark-lint-no-shell-dollars-2.0.2" - sources."remark-lint-no-table-indentation-3.0.0" - sources."remark-lint-no-undefined-references-3.0.0" - sources."remark-lint-no-unneeded-full-reference-image-2.0.1" - sources."remark-lint-no-unneeded-full-reference-link-2.0.1" - sources."remark-lint-no-unused-definitions-2.0.1" - sources."remark-lint-ordered-list-marker-style-2.0.1" - sources."remark-lint-ordered-list-marker-value-2.0.1" - sources."remark-lint-rule-style-2.0.1" - sources."remark-lint-strong-marker-2.0.1" - sources."remark-lint-table-cell-padding-3.0.0" - sources."remark-lint-table-pipe-alignment-2.0.1" - sources."remark-lint-table-pipes-3.0.0" - sources."remark-lint-unordered-list-marker-style-2.0.1" - sources."remark-message-control-6.0.0" - sources."remark-parse-9.0.0" - sources."remark-stringify-9.0.1" - sources."repeat-string-1.6.1" - sources."resolve-1.22.6" - sources."responselike-1.0.2" - sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."rmfr-2.0.0" sources."run-parallel-1.2.0" + sources."sade-1.8.1" sources."safe-buffer-5.2.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" + (sources."semver-7.5.4" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" + sources."slash-4.0.0" sources."sliced-1.0.1" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - ]; - }) + sources."spdx-license-ids-3.0.16" + sources."stdin-discarder-0.1.0" + sources."string-width-6.1.0" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-eof-1.0.0" - sources."strip-indent-3.0.0" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."temp-dir-2.0.0" - (sources."tempy-1.0.1" // { + sources."strip-ansi-7.1.0" + sources."strip-final-newline-3.0.0" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.3.0" // { dependencies = [ - sources."is-stream-2.0.1" - sources."type-fest-0.16.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."temp-dir-3.0.0" + (sources."tempy-3.1.0" // { + dependencies = [ + sources."type-fest-2.19.0" ]; }) - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."to-vfile-6.1.0" - sources."trim-newlines-3.0.1" - sources."trough-1.0.5" - sources."type-fest-0.18.1" - (sources."unified-9.2.2" // { + sources."to-vfile-8.0.0" + sources."trough-2.1.0" + sources."type-fest-4.7.1" + sources."unified-11.0.4" + (sources."unified-lint-rule-2.1.2" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."@types/unist-2.0.10" + sources."unified-10.1.2" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" ]; }) - sources."unified-lint-rule-1.0.6" - sources."unified-message-control-3.0.3" - sources."unique-string-2.0.0" - (sources."unist-util-find-1.0.2" // { + (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."unist-util-visit-1.4.1" - ]; - }) - (sources."unist-util-find-all-after-3.0.2" // { - dependencies = [ - sources."unist-util-is-4.1.0" - ]; - }) - (sources."unist-util-find-all-before-3.0.1" // { - dependencies = [ - sources."unist-util-is-4.1.0" + sources."@types/unist-2.0.10" + sources."unist-util-is-5.2.1" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-3.1.0" + sources."unist-util-visit-parents-4.1.1" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" ]; }) + sources."unique-string-3.0.0" + sources."unist-util-find-3.0.0" + sources."unist-util-find-all-after-5.0.0" + sources."unist-util-find-all-before-5.0.0" (sources."unist-util-find-all-between-2.1.0" // { dependencies = [ + sources."@types/unist-2.0.10" + sources."unist-util-find-1.0.4" sources."unist-util-is-4.1.0" - ]; - }) - sources."unist-util-generated-1.1.6" - sources."unist-util-is-3.0.0" - sources."unist-util-map-1.0.5" - sources."unist-util-position-3.1.0" - sources."unist-util-stringify-position-2.0.3" - (sources."unist-util-to-list-of-char-0.1.3" // { - dependencies = [ - sources."unist-util-visit-1.4.1" - ]; - }) - (sources."unist-util-visit-2.0.3" // { - dependencies = [ - sources."unist-util-is-4.1.0" + sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" ]; }) - sources."unist-util-visit-parents-2.1.2" - sources."url-parse-lax-3.0.0" + sources."unist-util-generated-2.0.1" + sources."unist-util-is-6.0.0" + sources."unist-util-map-1.0.5" + (sources."unist-util-position-4.0.4" // { + dependencies = [ + sources."@types/unist-2.0.10" + ]; + }) + sources."unist-util-stringify-position-4.0.0" + (sources."unist-util-to-list-of-char-0.1.3" // { + dependencies = [ + sources."unist-util-generated-1.1.6" + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + ]; + }) + (sources."unist-util-visit-5.0.0" // { + dependencies = [ + sources."unist-util-visit-parents-6.0.1" + ]; + }) + (sources."unist-util-visit-parents-5.1.3" // { + dependencies = [ + sources."@types/unist-2.0.10" + sources."unist-util-is-5.2.1" + ]; + }) sources."util-deprecate-1.0.2" - sources."validate-glob-opts-1.0.2" + sources."uvu-0.5.6" + (sources."validate-glob-opts-1.0.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.1" - sources."vfile-location-3.2.0" - sources."vfile-message-2.0.4" - sources."vfile-reporter-pretty-5.0.0" - sources."vfile-statistics-1.1.4" - sources."vfile-to-eslint-2.0.2" - sources."wcwidth-1.0.1" - sources."which-1.3.1" + sources."vfile-6.0.1" + (sources."vfile-location-4.1.0" // { + dependencies = [ + sources."@types/unist-2.0.10" + sources."unist-util-stringify-position-3.0.3" + sources."vfile-5.3.7" + sources."vfile-message-3.1.4" + ]; + }) + sources."vfile-message-4.0.2" + sources."vfile-reporter-pretty-7.0.0" + sources."vfile-statistics-3.0.0" + sources."vfile-to-eslint-4.0.0" + sources."which-2.0.2" sources."wrapped-1.0.1" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."zwitch-1.0.5" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -67161,18 +67416,18 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.12" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -67223,7 +67478,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.2.3" @@ -67236,7 +67491,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -67296,7 +67551,7 @@ in sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { + (sources."browserify-sign-4.2.2" // { dependencies = [ sources."readable-stream-3.6.2" ]; @@ -67307,7 +67562,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.1.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -67325,7 +67580,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."defined-1.0.1" sources."deps-sort-2.0.1" @@ -67348,13 +67603,13 @@ in sources."fast-safe-stringify-2.1.1" sources."for-each-0.3.3" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."glob-7.2.3" sources."gopd-1.0.1" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-1.0.4" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" @@ -67364,6 +67619,7 @@ in ]; }) sources."hash.js-1.1.7" + sources."hasown-2.0.0" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -67375,7 +67631,7 @@ in sources."is-arguments-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-generator-function-1.0.10" sources."is-typed-array-1.1.12" sources."isarray-1.0.0" @@ -67394,7 +67650,7 @@ in sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."once-1.4.0" @@ -67426,10 +67682,11 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."set-function-length-1.1.1" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.8.1" @@ -67463,7 +67720,7 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -67488,8 +67745,8 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.14" - sources."@types/node-20.8.0" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -67506,7 +67763,7 @@ in sources."browser-sync-client-2.29.3" sources."browser-sync-ui-2.29.3" sources."bs-recipes-1.3.4" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" @@ -67533,8 +67790,8 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."engine.io-6.5.2" - sources."engine.io-client-6.5.2" + sources."engine.io-6.5.3" + sources."engine.io-client-6.5.3" sources."engine.io-parser-5.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -67647,7 +67904,8 @@ in sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."ua-parser-js-1.0.36" + sources."ua-parser-js-1.0.37" + sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -67678,16 +67936,16 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.118.1"; + version = "2.172.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.118.1.tgz"; - sha512 = "mq/NLHlcbyi9f2878LmozgDCnOo3Bo5XOOwkCNElzRnL2Qc7p5kNm71q/KJJk6Lt6Wnzofq5418MPmZPjbMgKw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.172.0.tgz"; + sha512 = "gxFAdtebL8JG6ZmqtUvyAVJytqQSbsWpOVzxELPOwlJ6SDxI1kCvdmKOk/s3GAvkD4GLfbPXd+7jlTWL+BpCjg=="; }; dependencies = [ - sources."@colors/colors-1.5.0" + sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.89.0" - sources."@jsii/spec-1.89.0" + sources."@jsii/check-node-1.91.0" + sources."@jsii/spec-1.91.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -67703,8 +67961,8 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.55" - sources."@types/triple-beam-1.3.3" + sources."@types/node-16.18.61" + sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" @@ -67713,7 +67971,7 @@ in sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -67737,8 +67995,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.66.1" - sources."cdk8s-plus-25-2.22.24" + sources."cdk8s-2.68.2" + sources."cdk8s-plus-25-2.22.54" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -67747,7 +68005,7 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.89.0" // { + (sources."codemaker-1.91.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -67766,7 +68024,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.2.70" + sources."constructs-10.3.0" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -67786,7 +68044,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231002" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."emoji-regex-8.0.0" @@ -67801,7 +68059,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fecha-4.2.3" (sources."figures-3.2.0" // { @@ -67822,7 +68080,7 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -67830,8 +68088,8 @@ in sources."graceful-fs-4.2.11" sources."graphql-16.8.1" sources."graphql-tag-2.12.6" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.4" @@ -67845,7 +68103,7 @@ in }) sources."interpret-1.4.0" sources."is-arrayish-0.3.2" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -67856,46 +68114,45 @@ in sources."is-plain-object-5.0.0" sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" - (sources."jsii-1.89.0" // { + (sources."jsii-1.91.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.89.0" // { + (sources."jsii-pacmak-1.91.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.89.0" // { + (sources."jsii-reflect-1.91.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.89.0" // { + (sources."jsii-rosetta-1.91.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.951" // { + (sources."jsii-srcmak-0.1.960" // { dependencies = [ - sources."@jsii/check-node-1.88.0" sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.1.12" // { + (sources."jsii-5.2.26" // { dependencies = [ sources."yargs-17.7.2" ]; }) - sources."typescript-5.1.6" + sources."typescript-5.2.2" sources."yargs-parser-21.1.1" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.387" + sources."json2jsii-0.3.389" sources."jsonfile-6.1.0" sources."kuler-2.0.0" sources."locate-path-5.0.0" @@ -67903,7 +68160,7 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."log4js-6.9.1" - sources."logform-2.5.1" + sources."logform-2.6.0" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -67927,7 +68184,7 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.89.0" + sources."oo-ascii-tree-1.91.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -67939,14 +68196,14 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" sources."rechoir-0.6.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -67972,7 +68229,7 @@ in sources."slice-ansi-4.0.0" sources."snake-case-3.0.4" sources."sort-json-2.0.1" - sources."spdx-license-list-6.7.0" + sources."spdx-license-list-6.8.0" sources."sscaff-1.2.274" sources."stack-trace-0.0.10" sources."stream-chain-2.2.5" @@ -67997,8 +68254,8 @@ in sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."typescript-3.9.10" - sources."universal-user-agent-6.0.0" - sources."universalify-2.0.0" + sources."universal-user-agent-6.0.1" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.10.0" @@ -68006,15 +68263,15 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.1" - sources."winston-3.10.0" - sources."winston-transport-4.5.0" - sources."workerpool-6.5.0" + sources."winston-3.11.0" + sources."winston-transport-4.6.0" + sources."workerpool-6.5.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -68041,10 +68298,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.18.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.18.0.tgz"; - sha512 = "MDXJScjMuBzhNYbRgJCWldL7AJ4T7InWPUGz6LKsX+vfCZqzMwoMXGswA40Uvxd4KGX/PhRRsw6s2jQ4dTatYw=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.19.1.tgz"; + sha512 = "itqPbZKIYpdCCIUGzX/yVSrcD0U16XqpNbnE8hX7E3Kg2Lus5/fjeXX2ijyZw3vp63ScS+5PStEyMNooCh84IA=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -68058,7 +68315,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" (sources."@babel/highlight-7.22.20" // { @@ -68072,85 +68329,93 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" - sources."@cdktf/cli-core-0.18.0" - sources."@cdktf/commons-0.18.0" - (sources."@cdktf/hcl2cdk-0.18.0" // { + sources."@babel/types-7.23.3" + sources."@cdktf/cli-core-0.19.1" + (sources."@cdktf/commons-0.19.1" // { + dependencies = [ + sources."fs-extra-11.1.1" + sources."uuid-9.0.1" + ]; + }) + (sources."@cdktf/hcl2cdk-0.19.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."camelcase-6.3.0" sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."zod-3.22.2" ]; }) - (sources."@cdktf/hcl2json-0.18.0" // { + (sources."@cdktf/hcl2json-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" ]; }) - sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" - (sources."@cdktf/provider-generator-0.18.0" // { + sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" + (sources."@cdktf/provider-generator-0.19.1" // { dependencies = [ - sources."@types/node-16.18.23" + sources."@types/node-18.18.8" ]; }) - (sources."@inquirer/checkbox-1.3.12" // { + (sources."@cdktf/provider-schema-0.19.1" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."fs-extra-11.1.1" + ]; + }) + (sources."@inquirer/checkbox-1.5.0" // { + dependencies = [ + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/confirm-2.0.13" // { + (sources."@inquirer/confirm-2.0.15" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) (sources."@inquirer/core-2.3.1" // { dependencies = [ + sources."@types/mute-stream-0.0.1" sources."cli-spinners-2.9.1" ]; }) - (sources."@inquirer/editor-1.2.11" // { + (sources."@inquirer/editor-1.2.13" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/expand-1.1.12" // { + (sources."@inquirer/expand-1.1.14" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/input-1.2.12" // { + (sources."@inquirer/input-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/password-1.1.12" + sources."@inquirer/password-1.1.14" sources."@inquirer/prompts-2.3.1" - (sources."@inquirer/rawlist-1.2.12" // { + (sources."@inquirer/rawlist-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/select-1.2.12" // { + (sources."@inquirer/select-1.3.1" // { dependencies = [ - sources."@inquirer/core-5.0.1" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -68170,26 +68435,24 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@jsii/check-node-1.88.0" - sources."@jsii/spec-1.89.0" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@jsii/check-node-1.91.0" + sources."@jsii/spec-1.91.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/ci-detect-1.4.0" - sources."@sentry/core-6.19.7" - sources."@sentry/hub-6.19.7" - sources."@sentry/minimal-6.19.7" - sources."@sentry/node-6.19.7" - sources."@sentry/types-6.19.7" - sources."@sentry/utils-6.19.7" - sources."@types/mute-stream-0.0.1" - sources."@types/node-20.8.0" - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/scheduler-0.16.4" + sources."@sentry-internal/tracing-7.80.0" + sources."@sentry/core-7.80.0" + sources."@sentry/node-7.80.0" + sources."@sentry/types-7.80.0" + sources."@sentry/utils-7.80.0" + sources."@types/mute-stream-0.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/wrap-ansi-3.0.0" - sources."@types/yauzl-2.10.1" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" @@ -68214,7 +68477,7 @@ in sources."arr-rotate-1.0.0" sources."array-buffer-byte-length-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.5" @@ -68226,35 +68489,29 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."bufferutil-4.0.7" - sources."call-bind-1.0.2" + sources."bufferutil-4.0.8" + sources."call-bind-1.0.5" sources."camelcase-5.3.1" sources."case-1.6.3" - sources."cdktf-0.18.0" + sources."cdktf-0.19.1" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chownr-1.1.4" - sources."ci-info-2.0.0" + sources."ci-info-3.9.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" sources."cli-truncate-2.1.0" sources."cli-width-4.1.0" - (sources."cliui-8.0.1" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) + sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.89.0" // { + (sources."codemaker-1.91.0" // { dependencies = [ sources."camelcase-6.3.0" sources."decamelize-5.0.1" sources."fs-extra-10.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" ]; }) sources."color-convert-2.0.1" @@ -68262,9 +68519,8 @@ in sources."commonmark-0.30.0" sources."compress-commons-4.1.2" sources."concat-map-0.0.1" - sources."constructs-10.2.70" + sources."constructs-10.3.0" sources."convert-to-spaces-1.0.2" - sources."cookie-0.4.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.3" @@ -68275,14 +68531,14 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.2" // { + (sources."deep-equal-2.2.3" // { dependencies = [ sources."isarray-2.0.5" ]; }) sources."deep-extend-0.6.0" sources."deepmerge-4.3.1" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."detect-indent-5.0.0" sources."detect-libc-2.0.2" @@ -68290,7 +68546,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231002" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."eastasianwidth-0.2.0" @@ -68319,7 +68575,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -68338,13 +68594,18 @@ in ]; }) sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-6.0.1" sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { @@ -68357,13 +68618,13 @@ in sources."graceful-fs-4.2.11" sources."graphology-0.25.4" sources."graphology-types-0.24.7" - sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" @@ -68382,7 +68643,7 @@ in sources."ink-table-3.0.0" sources."ink-testing-library-2.1.0" sources."ink-use-stdout-dimensions-1.0.5" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."interpret-1.4.0" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.2" @@ -68390,8 +68651,12 @@ in sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" - sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" + (sources."is-ci-2.0.0" // { + dependencies = [ + sources."ci-info-2.0.0" + ]; + }) + sources."is-core-module-2.13.1" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -68416,66 +68681,40 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-5.2.11" // { + sources."jsii-5.2.26" + (sources."jsii-pacmak-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.89.0" - sources."typescript-5.2.2" - ]; - }) - (sources."jsii-pacmak-1.89.0" // { - dependencies = [ - sources."@jsii/check-node-1.89.0" sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" - sources."jsii-1.89.0" - sources."jsii-rosetta-1.89.0" - sources."jsonfile-6.1.0" + sources."jsii-1.91.0" + sources."jsii-rosetta-1.91.0" sources."typescript-3.9.10" - sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.89.0" // { + (sources."jsii-reflect-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.89.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-5.1.13" // { - dependencies = [ - sources."jsii-5.1.12" - ]; - }) - (sources."jsii-srcmak-0.1.951" // { + sources."jsii-rosetta-5.2.2" + (sources."jsii-srcmak-0.1.960" // { dependencies = [ sources."fs-extra-9.1.0" - (sources."jsii-5.1.12" // { - dependencies = [ - sources."yargs-17.7.2" - ]; - }) - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."cliui-6.0.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - }) + sources."yargs-15.4.1" ]; }) sources."json-schema-traverse-1.0.0" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.8" @@ -68494,7 +68733,6 @@ in sources."log4js-6.9.1" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" - sources."lru_map-0.3.3" sources."mdurl-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -68514,21 +68752,21 @@ in sources."nan-2.18.0" sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" - sources."node-abi-3.47.0" + sources."node-abi-3.51.0" sources."node-fetch-2.7.0" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."object-hash-2.2.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.89.0" + sources."oo-ascii-tree-1.91.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -68561,11 +68799,11 @@ in sources."prettier-2.8.8" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-18.2.0" - sources."react-devtools-core-4.28.0" + sources."react-devtools-core-4.28.5" (sources."react-reconciler-0.26.2" // { dependencies = [ sources."react-17.0.2" @@ -68580,7 +68818,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -68597,6 +68835,7 @@ in ]; }) sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -68608,7 +68847,7 @@ in sources."simple-get-4.0.1" sources."slice-ansi-3.0.0" sources."sort-json-2.0.1" - sources."spdx-license-list-6.7.0" + sources."spdx-license-list-6.8.0" sources."sscaff-1.2.274" sources."stack-utils-2.0.6" sources."stop-iteration-iterator-1.0.0" @@ -68632,11 +68871,11 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."type-fest-0.12.0" - sources."typescript-5.1.6" - sources."universalify-0.1.2" + sources."typescript-5.2.2" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" @@ -68647,20 +68886,27 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.1" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."widest-line-3.1.0" - sources."workerpool-6.5.0" + sources."workerpool-6.5.1" sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.38.2" - sources."y18n-5.0.8" + sources."xstate-4.38.3" + sources."y18n-4.0.3" sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" + (sources."yargs-17.7.2" // { + dependencies = [ + sources."cliui-8.0.1" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-parser-21.1.1" + ]; + }) + sources."yargs-parser-18.1.3" sources."yauzl-2.10.0" sources."yoga-layout-prebuilt-1.10.0" (sources."zip-stream-4.1.1" // { @@ -68668,7 +68914,7 @@ in sources."archiver-utils-3.0.4" ]; }) - sources."zod-1.11.17" + sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; meta = { @@ -68683,96 +68929,40 @@ in clipboard-cli = nodeEnv.buildNodePackage { name = "clipboard-cli"; packageName = "clipboard-cli"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipboard-cli/-/clipboard-cli-3.0.0.tgz"; - sha512 = "DbwDqv+O4AIbUqLmT3w7J/Fo8uT9bNmy7oRzykTUEIcrEL0DozGNOjxjiwwcKSLLf1fXKmjdLolui+OB3j1vYg=="; + url = "https://registry.npmjs.org/clipboard-cli/-/clipboard-cli-4.0.0.tgz"; + sha512 = "rW5a4YsZJhkDYhN5o4Zm/KP/OyYy9lKIyeF59vYgJXzt3shM4z6/dVwv6DNzOS0N7YOpzNb4+7Nz03+mz6rpSQ=="; }; dependencies = [ - sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/highlight-7.22.20" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."ansi-styles-3.2.1" - sources."arch-2.2.0" - sources."arrify-1.0.1" - sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.2" - sources."chalk-2.4.2" - sources."clipboardy-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."clipboardy-4.0.0" sources."cross-spawn-7.0.3" - sources."decamelize-5.0.1" - (sources."decamelize-keys-1.1.1" // { + sources."execa-8.0.1" + sources."get-stdin-9.0.0" + sources."get-stream-8.0.1" + sources."human-signals-5.0.0" + sources."is-docker-3.0.0" + sources."is-inside-container-1.0.0" + sources."is-stream-3.0.0" + sources."is-wsl-3.1.0" + sources."is64bit-2.0.0" + sources."isexe-2.0.0" + sources."meow-12.1.1" + sources."merge-stream-2.0.0" + sources."mimic-fn-4.0.0" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" + sources."path-key-4.0.0" ]; }) - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."execa-5.1.1" - sources."find-up-5.0.0" - sources."function-bind-1.1.1" - sources."get-stdin-9.0.0" - sources."get-stream-6.0.1" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-4.1.0" - sources."human-signals-2.1.0" - sources."indent-string-5.0.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - sources."meow-10.1.5" - sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - sources."minimist-options-4.1.0" - sources."normalize-package-data-3.0.3" - sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" + sources."onetime-6.0.0" sources."path-key-3.1.1" - sources."quick-lru-5.1.1" - sources."read-pkg-6.0.0" - sources."read-pkg-up-8.0.0" - sources."redent-4.0.0" - sources."semver-7.5.4" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."strip-final-newline-2.0.0" - sources."strip-indent-4.0.0" - sources."supports-color-5.5.0" - sources."trim-newlines-4.1.1" - sources."type-fest-1.4.0" - sources."validate-npm-package-license-3.0.4" + sources."signal-exit-4.1.0" + sources."strip-final-newline-3.0.0" + sources."system-architecture-0.1.0" sources."which-2.0.2" - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -69050,16 +69240,16 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.26"; + version = "1.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.26.tgz"; - sha512 = "J66k2LBOcqDLS4vdEcSymFGW1GXg9LlEIH47Juw5uExpUtJ5Xc9b+fhtZ3djh6QJjJrIeJkbjl+7Jk+Gc49l2g=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.28.tgz"; + sha512 = "XbjcMohLS6V8sonh9sJRFVMCv2YP0dGlFT+y/bQ1qkj1zsyd7WutWAJAqfpopZTJN0SQxbStRcre8CV0fTE5EA=="; }; dependencies = [ sources."isexe-2.0.0" sources."tslib-2.6.2" sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."which-3.0.1" ]; buildInputs = globalBuildInputs; @@ -69280,7 +69470,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chainsaw-0.1.0" sources."chownr-2.0.0" sources."clipboardy-2.3.0" @@ -69298,13 +69488,13 @@ in sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."es-abstract-1.22.2" - sources."es-set-tostringtag-2.0.1" + sources."es-abstract-1.22.3" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."execa-1.0.0" sources."fast-diff-1.3.0" @@ -69326,22 +69516,22 @@ in sources."rimraf-2.7.1" ]; }) - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -69350,7 +69540,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -69404,7 +69594,7 @@ in sources."node-fetch-2.7.0" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."once-1.4.0" @@ -69431,6 +69621,7 @@ in sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" @@ -69475,7 +69666,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -69530,14 +69721,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.325"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.325.tgz"; - sha512 = "TefMcHmsJep6ZvJkTaBvNXkuQcyG4t5qwHmCLqeUm/kBVYXasnZIML7xW3x4iwf7E/c8aAwcZvdzhz4ggoJQOg=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.335.tgz"; + sha512 = "c5G9caUYxOC7PjiagbQhShXpx1Pj92Vya3wVr782rEwOmIxELZsFuiGWhgQEwKhneB+grH6do2QF6mSiUr07Xw=="; }; dependencies = [ - sources."fsevents-2.3.3" - sources."pyright-1.1.329" + sources."pyright-1.1.335" ]; buildInputs = globalBuildInputs; meta = { @@ -69611,10 +69801,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.74.0"; + version = "0.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.74.0.tgz"; - sha512 = "G3RjZWYq/cY/mFwabWfor7q4AdbQeEhJTC8O6pYRSbUe2n+zM++7aVBYElUoFlipFY3qFfN25kGLQ2LO7VXuWg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.75.0.tgz"; + sha512 = "TYMnbzmA4677dx1+HuroM2mqRYFPVINqx67JMpiHBFBSssdxP/PXTp9BbWijziq1dwRNMZnnmEVKwy8sUnVIPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -69629,16 +69819,16 @@ in coc-sh = nodeEnv.buildNodePackage { name = "coc-sh"; packageName = "coc-sh"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.1.1.tgz"; - sha512 = "SJX6u+QhFuFaj8g3euMNqEKIGjgFw9SgKGhBMHrwJ8K9QL+A4oEM1fye6fMy0p6WI9hqPm7eGA/QQ81RUlYoJA=="; + url = "https://registry.npmjs.org/coc-sh/-/coc-sh-1.2.0.tgz"; + sha512 = "CmCSQ8/L6KEBQ5/QuFk4irlLxhAdKnjpu5gMylHWdZL8QQVKamMadURMj/Pm2jTMtV4YCoWFvVnBCAR26pfROg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."bash-language-server-4.10.3" + sources."bash-language-server-5.0.0" sources."braces-3.0.2" sources."domino-2.1.6" sources."encoding-0.1.13" @@ -69800,7 +69990,7 @@ in sources."esprima-4.0.1" sources."fs-extra-9.1.0" sources."gensequence-3.1.1" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" ]; }) (sources."cspell-trie-lib-4.2.8" // { @@ -69847,7 +70037,7 @@ in sources."tslib-1.14.1" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -69885,45 +70075,45 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.22.20" - sources."@babel/core-7.23.0" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.3" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.13" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."@types/parse-json-4.0.0" - sources."@types/unist-2.0.8" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -69947,7 +70137,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69984,7 +70174,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69994,16 +70184,16 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" sources."glob-7.2.3" @@ -70015,8 +70205,8 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."hasown-2.0.0" (sources."hosted-git-info-4.1.0" // { dependencies = [ sources."lru-cache-6.0.0" @@ -70041,7 +70231,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -70059,7 +70249,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kind-of-6.0.3" sources."known-css-properties-0.21.0" sources."lines-and-columns-1.2.4" @@ -70127,7 +70317,7 @@ in sources."postcss-selector-parser-6.0.13" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -70150,7 +70340,7 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -70170,7 +70360,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -70230,10 +70420,10 @@ in coc-sumneko-lua = nodeEnv.buildNodePackage { name = "coc-sumneko-lua"; packageName = "coc-sumneko-lua"; - version = "0.0.39"; + version = "0.0.40"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.39.tgz"; - sha512 = "HbrDZLLmUTBruDKLI4zljhgtTRA5t7tH5ozwBM5Kv+ON4b8eUIvPm5ZFDnUJO/qKKoh2E8cBvdqM3iVLLhT3qw=="; + url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.40.tgz"; + sha512 = "SvWs/4cHh4mul9JYO5JJ+sV8233yPPBgBxfmZalJa7lEd3VIZWN6Qvwn79u75vSzRU+rcBCcRYGnhBtAs3EpxQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70356,13 +70546,13 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.2.3" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.1.2" @@ -70371,7 +70561,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."semver-5.7.2" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -70496,7 +70686,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsites-3.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -70515,6 +70705,7 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."deep-is-0.1.4" + sources."define-data-property-1.1.1" sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" @@ -70555,26 +70746,28 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.22.0" - sources."has-1.0.3" + sources."globals-13.23.0" + sources."gopd-1.0.1" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-expression-4.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -70586,7 +70779,7 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."levn-0.4.1" sources."lodash-4.17.21" sources."lodash.merge-4.6.2" @@ -70609,13 +70802,14 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -70986,13 +71180,13 @@ in concurrently = nodeEnv.buildNodePackage { name = "concurrently"; packageName = "concurrently"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/concurrently/-/concurrently-8.2.1.tgz"; - sha512 = "nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ=="; + url = "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz"; + sha512 = "1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg=="; }; dependencies = [ - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" (sources."chalk-4.1.2" // { @@ -71048,7 +71242,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.2" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" sources."ansi-styles-3.2.1" @@ -71077,22 +71271,22 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."find-up-6.3.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."git-raw-commits-4.0.0" sources."git-semver-tags-7.0.1" sources."handlebars-4.7.8" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-7.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-obj-2.0.0" sources."is-text-path-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" sources."meow-12.1.1" @@ -71101,7 +71295,7 @@ in sources."normalize-package-data-6.0.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - (sources."parse-json-7.1.0" // { + (sources."parse-json-7.1.1" // { dependencies = [ sources."type-fest-3.13.1" ]; @@ -71118,14 +71312,14 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split2-4.2.0" sources."supports-color-5.5.0" sources."temp-dir-3.0.0" sources."tempfile-5.0.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."type-fest-4.3.3" + sources."type-fest-4.7.1" sources."uglify-js-3.17.4" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -71162,7 +71356,7 @@ in sources."cpy-10.1.0" sources."dir-glob-3.0.1" sources."escape-string-regexp-5.0.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -71222,14 +71416,14 @@ in }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/cookiejar-2.1.2" - sources."@types/node-20.8.0" + sources."@types/cookiejar-2.1.4" + sources."@types/node-20.9.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -71252,7 +71446,7 @@ in sources."cycle-onionify-4.0.0" sources."d-1.0.1" sources."debug-3.2.7" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.62" @@ -71276,16 +71470,16 @@ in sources."figures-2.0.0" sources."form-data-2.5.1" sources."formidable-1.2.6" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."globalthis-1.0.3" sources."gopd-1.0.1" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -71316,7 +71510,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.1.0" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" @@ -71333,6 +71527,7 @@ in sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."set-function-length-1.1.1" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -71355,6 +71550,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."type-1.2.0" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" (sources."variable-diff-1.1.0" // { dependencies = [ @@ -71396,10 +71592,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "7.3.7"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-7.3.7.tgz"; - sha512 = "p23EuTu+7b2qioRxC7sV1TVfxIPm7928BtT4jYBHGeONiYP0EOOWNP8ynaksMYLTifQBzH1Q0LO4L5ogHiQsfw=="; + url = "https://registry.npmjs.org/cspell/-/cspell-8.0.0.tgz"; + sha512 = "Nayy25Dh+GAlDFDpVZaQhmidP947rpj1Pn9lmZ3nUFjD9W/yj0h0vrjMLMN4dbonddkmKh4t51C+7NuMP405hg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -71413,20 +71609,20 @@ in sources."chalk-2.4.2" ]; }) - sources."@cspell/cspell-bundled-dicts-7.3.7" - sources."@cspell/cspell-json-reporter-7.3.7" - sources."@cspell/cspell-pipe-7.3.7" - sources."@cspell/cspell-resolver-7.3.7" - sources."@cspell/cspell-service-bus-7.3.7" - sources."@cspell/cspell-types-7.3.7" + sources."@cspell/cspell-bundled-dicts-8.0.0" + sources."@cspell/cspell-json-reporter-8.0.0" + sources."@cspell/cspell-pipe-8.0.0" + sources."@cspell/cspell-resolver-8.0.0" + sources."@cspell/cspell-service-bus-8.0.0" + sources."@cspell/cspell-types-8.0.0" sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-4.0.0" sources."@cspell/dict-bash-4.1.2" - sources."@cspell/dict-companies-3.0.25" - sources."@cspell/dict-cpp-5.0.5" + sources."@cspell/dict-companies-3.0.27" + sources."@cspell/dict-cpp-5.0.9" sources."@cspell/dict-cryptocurrencies-4.0.0" sources."@cspell/dict-csharp-4.0.2" - sources."@cspell/dict-css-4.0.11" + sources."@cspell/dict-css-4.0.12" sources."@cspell/dict-dart-2.0.3" sources."@cspell/dict-data-science-1.0.11" sources."@cspell/dict-django-4.1.0" @@ -71435,40 +71631,41 @@ in sources."@cspell/dict-elixir-4.0.3" sources."@cspell/dict-en-common-misspellings-1.0.2" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.3.8" - sources."@cspell/dict-filetypes-3.0.1" + sources."@cspell/dict-en_us-4.3.11" + sources."@cspell/dict-filetypes-3.0.2" sources."@cspell/dict-fonts-4.0.0" - sources."@cspell/dict-fsharp-1.0.0" + sources."@cspell/dict-fsharp-1.0.1" sources."@cspell/dict-fullstack-3.1.5" sources."@cspell/dict-gaming-terms-1.0.4" sources."@cspell/dict-git-2.0.0" - sources."@cspell/dict-golang-6.0.3" + sources."@cspell/dict-golang-6.0.4" sources."@cspell/dict-haskell-4.0.1" sources."@cspell/dict-html-4.0.5" sources."@cspell/dict-html-symbol-entities-4.0.0" sources."@cspell/dict-java-5.0.6" - sources."@cspell/dict-k8s-1.0.1" + sources."@cspell/dict-k8s-1.0.2" sources."@cspell/dict-latex-4.0.0" sources."@cspell/dict-lorem-ipsum-4.0.0" - sources."@cspell/dict-lua-4.0.1" + sources."@cspell/dict-lua-4.0.2" + sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-node-4.0.3" - sources."@cspell/dict-npm-5.0.11" - sources."@cspell/dict-php-4.0.3" + sources."@cspell/dict-npm-5.0.12" + sources."@cspell/dict-php-4.0.4" sources."@cspell/dict-powershell-5.0.2" - sources."@cspell/dict-public-licenses-2.0.4" - sources."@cspell/dict-python-4.1.9" + sources."@cspell/dict-public-licenses-2.0.5" + sources."@cspell/dict-python-4.1.10" sources."@cspell/dict-r-2.0.1" - sources."@cspell/dict-ruby-5.0.0" + sources."@cspell/dict-ruby-5.0.1" sources."@cspell/dict-rust-4.0.1" sources."@cspell/dict-scala-5.0.0" - sources."@cspell/dict-software-terms-3.3.3" - sources."@cspell/dict-sql-2.1.1" + sources."@cspell/dict-software-terms-3.3.9" + sources."@cspell/dict-sql-2.1.2" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.2" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-7.3.7" - sources."@cspell/strong-weak-map-7.3.7" + sources."@cspell/dynamic-import-8.0.0" + sources."@cspell/strong-weak-map-8.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -71485,23 +71682,23 @@ in sources."clear-module-4.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-11.0.0" + sources."commander-11.1.0" sources."comment-json-4.2.3" sources."concat-map-0.0.1" sources."configstore-6.0.0" sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-4.0.0" - (sources."cspell-dictionary-7.3.7" // { + (sources."cspell-dictionary-8.0.0" // { dependencies = [ sources."fast-equals-4.0.3" ]; }) - sources."cspell-gitignore-7.3.7" - sources."cspell-glob-7.3.7" - sources."cspell-grammar-7.3.7" - sources."cspell-io-7.3.7" - (sources."cspell-lib-7.3.7" // { + sources."cspell-gitignore-8.0.0" + sources."cspell-glob-8.0.0" + sources."cspell-grammar-8.0.0" + sources."cspell-io-8.0.0" + (sources."cspell-lib-8.0.0" // { dependencies = [ sources."find-up-6.3.0" sources."locate-path-7.2.0" @@ -71511,20 +71708,19 @@ in sources."yocto-queue-1.0.0" ]; }) - sources."cspell-trie-lib-7.3.7" + sources."cspell-trie-lib-8.0.0" sources."dot-prop-6.0.1" - sources."encoding-0.1.13" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-equals-5.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" - sources."file-entry-cache-7.0.0" + sources."file-entry-cache-7.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."gensequence-6.0.0" @@ -71535,14 +71731,13 @@ in sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" sources."has-own-prop-2.0.0" - sources."iconv-lite-0.6.3" (sources."import-fresh-3.3.0" // { dependencies = [ sources."parent-module-1.0.1" sources."resolve-from-4.0.0" ]; }) - sources."import-meta-resolve-3.0.0" + sources."import-meta-resolve-3.1.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -71557,14 +71752,13 @@ in sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.7.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -71580,20 +71774,16 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" sources."semver-7.5.4" sources."signal-exit-3.0.7" sources."strip-ansi-7.1.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" sources."type-fest-1.4.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-uri-3.0.7" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" + sources."vscode-uri-3.0.8" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" @@ -71676,7 +71866,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.1.1" sources."dir-glob-3.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -71776,7 +71966,7 @@ in sources."default-browser-id-3.0.0" sources."define-lazy-prop-3.0.0" sources."diff-5.1.0" - sources."diff2html-3.4.44" + sources."diff2html-3.4.45" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."execa-5.1.1" @@ -71884,7 +72074,7 @@ in sources."@oclif/core-2.15.0" ]; }) - (sources."@oclif/plugin-not-found-2.4.2" // { + (sources."@oclif/plugin-not-found-2.4.3" // { dependencies = [ sources."@oclif/core-2.15.0" ]; @@ -71899,20 +72089,20 @@ in sources."@oclif/core-2.15.0" ]; }) - sources."@oclif/screen-3.0.7" - sources."@swc/core-1.3.91" + sources."@oclif/screen-3.0.8" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.3" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -71921,7 +72111,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -71966,7 +72156,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -72089,7 +72279,8 @@ in sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" sources."typescript-5.2.2" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wcwidth-1.0.1" @@ -72114,23 +72305,23 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.103.1"; + version = "6.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.103.1.tgz"; - sha512 = "uyJSUNVOLEhT2EhuUJ6v5U49KVjzXsFMsaxeHlxU6vsxNwdzN/97nCoI9SiTOd1fx7hyC0YkcWhg1195xm+1Ww=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.106.0.tgz"; + sha512 = "jbj++5ILcP+Hn/dX8Cj8YWICYKRPVMVyzaI4wW/O0NMlRnEWrWU5Qo1m3UKRolPuZ/KcP+pIXvUJJHdvUlojsw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@search-dump/jsonstream-1.5.0" sources."@types/node-14.18.63" + sources."JSONStream-1.5.0" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1357.0" + sources."aws-sdk-2.1472.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -72139,11 +72330,12 @@ in sources."buffer-4.9.2" sources."buffer-queue-1.0.0" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" + sources."define-data-property-1.1.1" sources."delay-5.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" @@ -72158,18 +72350,19 @@ in sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."getpass-0.1.7" sources."gopd-1.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."http-signature-1.2.0" - sources."http-status-1.7.0" + sources."hasown-2.0.0" + sources."http-signature-1.3.6" + sources."http-status-1.7.3" sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-2.0.0" @@ -72191,7 +72384,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."jsprim-1.4.2" + sources."jsprim-2.0.2" sources."lodash-4.17.21" sources."lodash.escaperegexp-4.1.2" sources."lodash.groupby-4.6.0" @@ -72202,11 +72395,13 @@ in sources."lodash.isundefined-3.0.1" sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.5" + sources."lru-cache-6.0.0" sources."method-missing-1.2.4" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimist-1.2.8" sources."oauth-sign-0.9.0" + sources."object-inspect-1.13.1" sources."p-finally-1.0.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" @@ -72214,57 +72409,74 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."punycode-1.3.2" - sources."qs-6.5.3" + sources."qs-6.10.4" sources."querystring-0.2.0" + sources."querystringify-2.2.0" (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - (sources."request-2.88.2" // { + (sources."request-3.0.1" // { dependencies = [ + sources."uuid-8.3.2" + ]; + }) + (sources."requestretry-7.1.0" // { + dependencies = [ + sources."http-signature-1.2.0" + sources."jsprim-1.4.2" + sources."punycode-2.3.1" + sources."qs-6.5.3" + sources."request-2.88.2" + sources."tough-cookie-2.5.0" sources."uuid-3.4.0" ]; }) - sources."requestretry-7.1.0" + sources."requires-port-1.0.0" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" sources."s3urls-1.5.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."semver-5.7.1" + sources."semver-7.5.4" + sources."set-function-length-1.1.1" + sources."side-channel-1.0.4" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."socks5-https-client-1.2.1" sources."sprintf-js-1.1.2" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) sources."through-2.3.8" - (sources."tough-cookie-2.5.0" // { + (sources."tough-cookie-4.1.3" // { dependencies = [ - sources."punycode-2.3.0" + sources."punycode-2.3.1" ]; }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."universalify-0.2.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.3.0" + sources."punycode-2.3.1" ]; }) sources."url-0.10.3" + sources."url-parse-1.5.10" sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-8.0.0" sources."verror-1.10.0" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -72296,7 +72508,7 @@ in sources."@electron-forge/template-vite-typescript-6.4.2" sources."@electron-forge/template-webpack-6.4.2" sources."@electron-forge/template-webpack-typescript-6.4.2" - (sources."@electron/asar-3.2.7" // { + (sources."@electron/asar-3.2.8" // { dependencies = [ sources."commander-5.1.0" ]; @@ -72316,27 +72528,28 @@ in }) sources."@electron/osx-sign-1.0.5" sources."@electron/rebuild-3.3.0" - (sources."@electron/universal-1.4.2" // { + (sources."@electron/universal-1.4.5" // { dependencies = [ sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" ]; }) - sources."@isaacs/cliui-8.0.2" + sources."@gar/promisify-1.1.3" sources."@malept/cross-spawn-promise-2.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" + sources."@npmcli/fs-2.1.2" + sources."@npmcli/move-file-2.0.1" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.0" - sources."@types/responselike-1.0.1" - sources."@types/yauzl-2.10.1" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -72349,7 +72562,7 @@ in ]; }) sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."astral-regex-2.0.0" @@ -72366,41 +72579,22 @@ in sources."buffer-crc32-0.2.13" sources."buffer-equal-1.0.1" sources."buffer-from-1.1.2" - (sources."cacache-17.1.4" // { + (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."chalk-4.1.2" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - (sources."cli-truncate-2.1.0" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."cliui-8.0.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - ]; - }) + sources."cli-truncate-2.1.0" + sources."cliui-8.0.1" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -72429,26 +72623,21 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delegates-1.0.0" sources."detect-libc-2.0.2" sources."detect-node-2.1.0" sources."dir-compare-3.3.0" - sources."eastasianwidth-0.2.0" (sources."electron-packager-17.1.2" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) - sources."emoji-regex-9.2.2" + sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - (sources."enquirer-2.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."enquirer-2.4.1" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" @@ -72463,14 +72652,13 @@ in sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" sources."which-1.3.1" ]; }) sources."expand-tilde-2.0.2" sources."exponential-backoff-3.1.1" sources."extract-zip-2.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."filename-reserved-regex-2.0.0" @@ -72485,27 +72673,15 @@ in ]; }) sources."flora-colossus-2.0.0" - sources."foreground-child-3.1.1" sources."fs-extra-10.1.0" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."galactus-1.0.0" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -72526,12 +72702,12 @@ in sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.1" @@ -72543,13 +72719,14 @@ in sources."ieee754-1.2.1" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."interpret-3.1.1" sources."ip-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -72563,21 +72740,12 @@ in sources."is-wsl-2.2.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."junk-3.1.0" - sources."keyv-4.5.3" - (sources."listr2-5.0.8" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - ]; - }) + sources."keyv-4.5.4" + sources."listr2-5.0.8" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -72585,17 +72753,13 @@ in sources."log-symbols-4.1.0" (sources."log-update-4.0.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" sources."slice-ansi-4.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) sources."lowercase-keys-2.0.0" sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" + sources."make-fetch-happen-10.2.1" sources."map-age-cleaner-0.1.3" (sources."matcher-3.0.0" // { dependencies = [ @@ -72609,45 +72773,21 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-3.3.6" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-2.1.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.3" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.47.0" + sources."node-abi-3.51.0" sources."node-api-version-0.1.4" sources."node-fetch-2.7.0" - sources."node-gyp-9.4.0" + sources."node-gyp-9.4.1" sources."nopt-6.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -72664,11 +72804,7 @@ in sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-5.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."ora-5.4.1" sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -72684,11 +72820,6 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) sources."path-type-2.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" @@ -72705,6 +72836,7 @@ in }) sources."plist-3.1.0" sources."progress-2.0.3" + sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."pump-3.0.0" sources."queue-microtask-1.2.3" @@ -72719,16 +72851,12 @@ in sources."readable-stream-3.6.2" sources."rechoir-0.8.0" sources."require-directory-2.1.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.1" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) + sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -72748,12 +72876,8 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - (sources."slice-ansi-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."signal-exit-3.0.7" + sources."slice-ansi-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -72762,27 +72886,12 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."sprintf-js-1.1.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) + sources."ssri-9.0.1" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-outer-1.0.1" @@ -72792,11 +72901,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.2.0" // { dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-5.0.0" ]; }) sources."through-2.3.8" @@ -72805,9 +72910,10 @@ in sources."trim-repeated-1.0.0" sources."tslib-2.6.2" sources."type-fest-0.13.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."unique-filename-2.0.1" + sources."unique-slug-3.0.0" + sources."universalify-2.0.1" sources."username-5.1.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -72815,33 +72921,13 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wide-align-1.1.5" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.7.2" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" (sources."yarn-or-npm-3.0.1" // { dependencies = [ @@ -72869,10 +72955,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "5.4.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.4.0.tgz"; - sha512 = "FnTsvPYY9+5n3aSXHDbTmgU3hisYotKlGow6Fi1fc+wxoEDIaq60opEgB8RdXQZqx8TpJTcmbVzed4Ej74D06Q=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.7.0.tgz"; + sha512 = "kfYqd9I7S5qm0G4mUF2pNyNuHNImLTOdtd339rV+Y2/mcYMYSeu55tMBMGNFYpDMCHGCNf7d0oLJJ4lqhwdgbQ=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" @@ -72901,24 +72987,18 @@ in ]; }) sources."@expo/config-types-49.0.0" - (sources."@expo/eas-build-job-1.0.43" // { + (sources."@expo/eas-build-job-1.0.48" // { dependencies = [ - sources."joi-17.10.2" + sources."joi-17.11.0" sources."semver-7.5.4" ]; }) - (sources."@expo/eas-json-5.3.1" // { + (sources."@expo/eas-json-5.7.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" - (sources."@expo/eas-build-job-1.0.39" // { - dependencies = [ - sources."joi-17.10.2" - sources."semver-7.5.4" - ]; - }) ]; }) - (sources."@expo/fingerprint-0.2.0" // { + (sources."@expo/fingerprint-0.4.0" // { dependencies = [ sources."minimatch-3.1.2" ]; @@ -72935,12 +73015,7 @@ in sources."@expo/logger-1.0.30" sources."@expo/multipart-body-parser-1.1.0" sources."@expo/osascript-2.0.33" - (sources."@expo/package-manager-0.0.57" // { - dependencies = [ - sources."@expo/json-file-8.2.36" - sources."json5-1.0.2" - ]; - }) + sources."@expo/package-manager-1.1.1" sources."@expo/pkcs12-0.0.8" (sources."@expo/plist-0.0.20" // { dependencies = [ @@ -72954,7 +73029,7 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."semver-7.5.3" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@expo/results-1.0.0" @@ -72978,11 +73053,11 @@ in sources."@expo/spawn-async-1.7.2" sources."cross-spawn-7.0.3" sources."fs-extra-11.1.1" - sources."joi-17.10.2" + sources."joi-17.11.0" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."which-2.0.2" ]; }) @@ -72993,7 +73068,7 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73005,25 +73080,25 @@ in sources."fs-extra-9.1.0" sources."has-flag-4.0.0" sources."supports-color-8.1.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/plugin-autocomplete-1.3.10" // { dependencies = [ sources."fs-extra-9.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) - sources."@oclif/screen-3.0.7" + sources."@oclif/screen-3.0.8" sources."@react-native/normalize-color-2.1.0" sources."@segment/ajv-human-errors-2.11.3" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@types/bunyan-1.8.9" - sources."@types/node-20.8.0" + sources."@types/bunyan-1.8.11" + sources."@types/node-20.9.0" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.8.10" @@ -73043,7 +73118,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asn1-0.2.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" @@ -73112,15 +73187,15 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.6.0" // { + (sources."expo-modules-autolinking-1.7.0" // { dependencies = [ - sources."@expo/config-8.3.1" - sources."@expo/config-plugins-7.5.0" + sources."@expo/config-8.4.0" + sources."@expo/config-plugins-7.6.0" sources."@expo/config-types-50.0.0-alpha.2" sources."commander-7.2.0" sources."fs-extra-9.1.0" sources."semver-7.5.3" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."fast-deep-equal-3.1.3" @@ -73135,7 +73210,7 @@ in sources."form-data-4.0.0" (sources."fs-extra-10.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -73156,7 +73231,7 @@ in sources."golden-fleece-1.0.9" sources."graceful-fs-4.2.11" sources."gradle-to-js-2.0.1" - sources."graphql-16.6.0" + sources."graphql-16.8.1" sources."graphql-tag-2.12.6" sources."has-flag-3.0.0" sources."hosted-git-info-3.0.8" @@ -73198,7 +73273,7 @@ in sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."keychain-1.3.0" @@ -73233,13 +73308,7 @@ in sources."moment-2.29.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - (sources."mv-2.1.1" // { - dependencies = [ - sources."glob-6.0.4" - sources."minimatch-3.1.2" - sources."rimraf-2.4.5" - ]; - }) + sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.18.0" sources."nanoid-3.3.4" @@ -73302,7 +73371,7 @@ in sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -73312,7 +73381,12 @@ in sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rimraf-3.0.2" + (sources."rimraf-2.4.5" // { + dependencies = [ + sources."glob-6.0.4" + sources."minimatch-3.1.2" + ]; + }) sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" @@ -73361,6 +73435,7 @@ in sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" sources."type-fest-0.3.1" + sources."undici-types-5.26.5" sources."unique-string-1.0.0" sources."universalify-1.0.0" sources."untildify-4.0.0" @@ -73394,7 +73469,7 @@ in }) sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -73428,318 +73503,141 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "3.3.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-3.3.0.tgz"; - sha512 = "MTy+wgr5KjRbcFplusJBYQIRuwmJaX+pnOq29Zo5rkLNBEvpUkDMOOXKZa6m992hGEBh9FG6h/DDzhqmCJ+a0A=="; + url = "https://registry.npmjs.org/emoj/-/emoj-4.0.1.tgz"; + sha512 = "mUGLcDWX/DPTwVm6SMWbUOIF2fWOtsRCOFEYxOl/huRHsoX0E72tab9+SLO4yty1T6LQ7dwfTQ5mGkvotYWksA=="; }; dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@alcalzone/ansi-tokenize-0.1.3" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" + sources."ajv-8.12.0" + sources."ajv-formats-2.1.1" + (sources."ansi-escapes-6.2.0" // { dependencies = [ - sources."semver-6.3.1" + sources."type-fest-3.13.1" ]; }) - sources."@babel/generator-7.23.0" - sources."@babel/helper-annotate-as-pure-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.15" // { + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."atomically-2.0.2" + sources."auto-bind-5.0.1" + sources."bufferutil-4.0.8" + sources."chalk-5.3.0" + sources."ci-info-3.9.0" + sources."cli-boxes-3.0.0" + sources."cli-cursor-4.0.0" + (sources."cli-truncate-3.1.0" // { dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-6.3.1" - sources."yallist-3.1.1" + sources."slice-ansi-5.0.0" ]; }) - sources."@babel/helper-environment-visitor-7.22.20" - sources."@babel/helper-function-name-7.23.0" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" - sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-proposal-object-rest-spread-7.20.7" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-react-jsx-7.22.15" - sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/scheduler-0.16.4" - sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."arch-2.2.0" - sources."arrify-1.0.1" - sources."astral-regex-2.0.0" - sources."atomically-1.7.0" - sources."auto-bind-4.0.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."browserslist-4.22.1" - sources."bufferutil-4.0.7" - sources."caller-callsite-4.1.0" - sources."caller-path-3.0.1" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001542" - sources."chalk-2.4.2" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-truncate-2.1.0" - sources."clipboardy-2.3.0" - sources."code-excerpt-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - (sources."conf-7.1.2" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."convert-source-map-2.0.0" - sources."convert-to-spaces-1.0.2" - sources."cross-spawn-6.0.5" + sources."clipboardy-4.0.0" + sources."code-excerpt-4.0.0" + sources."conf-11.0.2" + sources."convert-to-spaces-2.0.1" + sources."cross-spawn-7.0.3" sources."csstype-3.1.2" - sources."debounce-fn-4.0.0" - sources."debug-4.3.4" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - }) - sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.538" - sources."emoji-regex-8.0.0" - sources."emojilib-2.4.0" - sources."end-of-stream-1.4.4" - sources."env-paths-2.2.1" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."execa-1.0.0" + sources."debounce-fn-5.1.2" + sources."dot-prop-7.2.0" + sources."eastasianwidth-0.2.0" + sources."emoji-regex-9.2.2" + sources."emojilib-3.0.11" + sources."env-paths-3.0.0" + sources."escape-string-regexp-2.0.0" + sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."find-cache-dir-3.3.2" - sources."find-up-3.0.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.2" - sources."get-stream-4.1.0" - sources."glob-7.2.3" - sources."globals-11.12.0" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-2.8.9" - sources."import-jsx-4.0.1" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."ink-3.2.0" // { + sources."get-stream-8.0.1" + sources."human-signals-5.0.0" + sources."indent-string-5.0.0" + (sources."ink-4.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."signal-exit-3.0.7" + sources."type-fest-0.12.0" ]; }) - (sources."ink-text-input-4.0.3" // { + (sources."ink-text-input-5.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.15.1" + sources."type-fest-3.13.1" ]; }) - sources."is-arrayish-0.2.1" - sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-obj-2.0.0" - sources."is-plain-obj-1.1.0" - sources."is-stream-1.1.0" - sources."is-wsl-2.2.0" + sources."is-ci-3.0.1" + sources."is-docker-3.0.0" + sources."is-fullwidth-code-point-4.0.0" + sources."is-inside-container-1.0.0" + sources."is-lower-case-2.0.2" + sources."is-stream-3.0.0" + sources."is-upper-case-2.0.2" + sources."is-wsl-3.1.0" + sources."is64bit-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."json-schema-typed-7.0.3" - sources."json5-2.2.3" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-3.0.0" + sources."json-schema-traverse-1.0.0" + sources."json-schema-typed-8.0.1" sources."lodash-4.17.21" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) sources."map-age-cleaner-0.1.3" - sources."map-obj-4.3.0" - sources."mem-6.1.1" - (sources."meow-7.1.1" // { + sources."mem-9.0.2" + sources."meow-12.1.1" + sources."merge-stream-2.0.0" + sources."mimic-fn-4.0.0" + sources."node-gyp-build-4.6.1" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."type-fest-0.13.1" + sources."path-key-4.0.0" ]; }) - sources."mimic-fn-3.1.0" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-options-4.1.0" - sources."ms-2.1.2" - sources."nice-try-1.0.5" - sources."node-gyp-build-4.6.1" - sources."node-releases-2.0.13" - sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" - (sources."onetime-5.1.2" // { + sources."onetime-6.0.0" + sources."p-defer-1.0.0" + sources."patch-console-2.0.0" + sources."path-key-3.1.1" + sources."punycode-2.3.1" + sources."react-18.2.0" + (sources."react-devtools-core-4.28.5" // { + dependencies = [ + sources."utf-8-validate-5.0.10" + sources."ws-7.5.9" + ]; + }) + sources."react-reconciler-0.29.0" + sources."require-from-string-2.0.2" + (sources."restore-cursor-4.0.0" // { dependencies = [ sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."signal-exit-3.0.7" ]; }) - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."parse-json-5.2.0" - sources."patch-console-1.0.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."picocolors-1.0.0" - (sources."pkg-dir-4.2.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - ]; - }) - sources."pkg-up-3.1.0" - sources."prop-types-15.8.1" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."quick-lru-4.0.1" - sources."react-16.14.0" - sources."react-devtools-core-4.28.0" - sources."react-is-16.13.1" - (sources."react-reconciler-0.26.2" // { - dependencies = [ - sources."react-17.0.2" - ]; - }) - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."resolve-1.22.6" - sources."resolve-from-3.0.0" - sources."restore-cursor-3.1.0" - sources."rimraf-3.0.2" - sources."scheduler-0.20.2" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."scheduler-0.23.0" + sources."semver-7.5.4" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" - sources."signal-exit-3.0.7" - sources."skin-tone-1.0.0" - (sources."slice-ansi-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - (sources."stack-utils-2.0.6" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-eof-1.0.0" - sources."strip-indent-3.0.0" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."to-fast-properties-2.0.0" - sources."trim-newlines-3.0.1" - sources."type-fest-0.12.0" + sources."signal-exit-4.1.0" + sources."skin-tone-3.0.0" + sources."slice-ansi-6.0.0" + sources."stack-utils-2.0.6" + sources."string-width-5.1.2" + sources."strip-ansi-7.1.0" + sources."strip-final-newline-3.0.0" + sources."stubborn-fs-1.2.5" + sources."system-architecture-0.1.0" + sources."tslib-2.6.2" + sources."type-fest-2.19.0" + sources."unicode-emoji-json-0.4.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" - sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."widest-line-3.1.0" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."utf-8-validate-6.0.3" + sources."when-exit-2.1.1" + sources."which-2.0.2" + sources."widest-line-4.0.1" + sources."wrap-ansi-8.1.0" + sources."ws-8.14.2" sources."yallist-4.0.0" - sources."yargs-parser-18.1.3" - sources."yoga-layout-prebuilt-1.10.0" + sources."yoga-wasm-web-0.3.3" ]; buildInputs = globalBuildInputs; meta = { @@ -73789,24 +73687,25 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.50.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz"; - sha512 = "FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.9.1" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.50.0" - sources."@humanwhocodes/config-array-0.11.11" + sources."@eslint-community/regexpp-4.10.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" + sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" + sources."@humanwhocodes/object-schema-2.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.10.0" + sources."@ungap/structured-clone-1.2.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -73824,7 +73723,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.50.0" + sources."eslint-8.53.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -73838,12 +73737,12 @@ in sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.22.0" + sources."globals-13.23.0" sources."graphemer-1.4.0" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -73859,7 +73758,7 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."levn-0.4.1" sources."locate-path-6.0.0" sources."lodash.merge-4.6.2" @@ -73875,7 +73774,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -73907,10 +73806,10 @@ in esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; - version = "0.7.0"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/esy/-/esy-0.7.0.tgz"; - sha512 = "Cdpf+a/r5o3ynZf410f6Be2BwU0BXhTM7zWnDO7/wA1I1z5nlIWhwc36LOhMyaojMhKMLGyYbFmmFetMXloTlw=="; + url = "https://registry.npmjs.org/esy/-/esy-0.7.2.tgz"; + sha512 = "l8JktgiCkMk8MB9HaSISzSaSSKX19pHtLsRTymZGHHrzk47GrOQLXmez6OJNSgUh07rfasybABAT6yasppC5Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -73932,8 +73831,8 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" @@ -73941,7 +73840,7 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -73961,13 +73860,13 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/helper-define-polyfill-provider-0.4.2" + sources."@babel/helper-define-polyfill-provider-0.4.3" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-remap-async-to-generator-7.22.20" @@ -73979,19 +73878,20 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-decorators-7.23.0" - sources."@babel/plugin-proposal-export-default-from-7.22.17" + sources."@babel/plugin-proposal-decorators-7.23.3" + sources."@babel/plugin-proposal-export-default-from-7.23.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" @@ -74000,16 +73900,16 @@ in sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.22.10" + sources."@babel/plugin-syntax-decorators-7.23.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.22.5" + sources."@babel/plugin-syntax-export-default-from-7.23.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -74018,68 +73918,68 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.22.15" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-react-display-name-7.22.5" + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-react-display-name-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - (sources."@babel/plugin-transform-runtime-7.22.15" // { + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + (sources."@babel/plugin-transform-runtime-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.20" // { + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; @@ -74093,19 +73993,19 @@ in sources."chalk-2.4.2" ]; }) - (sources."@babel/traverse-7.23.0" // { + (sources."@babel/traverse-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" ]; }) - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.7.3" // { dependencies = [ - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -74136,7 +74036,7 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."semver-7.3.2" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."bplist-parser-0.3.2" @@ -74246,7 +74146,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@leichtgewicht/ip-codec-2.0.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -74270,40 +74170,41 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" - sources."@types/body-parser-1.19.3" - sources."@types/bonjour-3.5.11" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" sources."@types/cacheable-request-6.0.3" - sources."@types/connect-3.4.36" - sources."@types/connect-history-api-fallback-1.5.1" - sources."@types/eslint-8.44.3" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/express-4.17.18" - sources."@types/express-serve-static-core-4.17.37" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/express-4.17.21" + sources."@types/express-serve-static-core-4.17.41" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-cache-semantics-4.0.2" - sources."@types/http-errors-2.0.2" - sources."@types/http-proxy-1.17.12" - sources."@types/istanbul-lib-coverage-2.0.4" - sources."@types/istanbul-lib-report-3.0.1" - sources."@types/istanbul-reports-3.0.2" - sources."@types/json-schema-7.0.13" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/http-errors-2.0.4" + sources."@types/http-proxy-1.17.14" + sources."@types/istanbul-lib-coverage-2.0.6" + sources."@types/istanbul-lib-report-3.0.3" + sources."@types/istanbul-reports-3.0.4" + sources."@types/json-schema-7.0.15" sources."@types/keyv-3.1.4" - sources."@types/mime-1.3.3" + sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.0" - sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.5" - sources."@types/responselike-1.0.1" - sources."@types/retry-0.12.3" - sources."@types/send-0.17.2" - sources."@types/serve-index-1.9.2" - sources."@types/serve-static-1.15.3" - sources."@types/sockjs-0.3.34" - sources."@types/ws-8.5.6" - sources."@types/yargs-15.0.16" - sources."@types/yargs-parser-21.0.1" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/responselike-1.0.3" + sources."@types/retry-0.12.5" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" + sources."@types/yargs-15.0.18" + sources."@types/yargs-parser-21.0.3" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" sources."@webassemblyjs/ast-1.11.6" @@ -74326,7 +74227,7 @@ in sources."@xtuc/long-4.2.2" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" @@ -74363,13 +74264,13 @@ in sources."axios-0.21.1" sources."babel-loader-8.3.0" sources."babel-plugin-module-resolver-4.1.0" - (sources."babel-plugin-polyfill-corejs2-0.4.5" // { + (sources."babel-plugin-polyfill-corejs2-0.4.6" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."babel-plugin-polyfill-corejs3-0.8.4" - sources."babel-plugin-polyfill-regenerator-0.5.2" + sources."babel-plugin-polyfill-corejs3-0.8.6" + sources."babel-plugin-polyfill-regenerator-0.5.3" sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.3.2" sources."balanced-match-1.0.2" @@ -74406,7 +74307,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."builtins-1.0.3" sources."bytes-3.1.2" (sources."cacache-15.3.0" // { @@ -74417,12 +74318,12 @@ in }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsite-1.0.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -74436,7 +74337,7 @@ in sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."clean-css-5.3.2" sources."clean-stack-2.2.0" (sources."clean-webpack-plugin-4.0.0" // { @@ -74498,7 +74399,7 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.33.0" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" (sources."cross-spawn-6.0.5" // { @@ -74542,6 +74443,7 @@ in sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" (sources."del-6.1.1" // { dependencies = [ @@ -74564,7 +74466,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -74601,9 +74503,9 @@ in sources."is-stream-1.1.0" ]; }) - (sources."expo-48.0.20" // { + (sources."expo-48.0.21" // { dependencies = [ - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -74686,7 +74588,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."faye-websocket-0.11.4" @@ -74727,9 +74629,9 @@ in sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-port-3.2.0" sources."get-stream-5.2.0" sources."getenv-1.0.0" @@ -74738,17 +74640,19 @@ in sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" sources."globby-11.1.0" + sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."graphql-15.8.0" sources."graphql-tag-2.12.6" sources."handle-thing-2.0.1" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."hasbin-1.2.3" sources."hashids-1.1.4" + sources."hasown-2.0.0" sources."he-1.2.0" sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" @@ -74784,7 +74688,7 @@ in sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -74841,7 +74745,7 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.10.2" + sources."joi-17.11.0" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -74862,10 +74766,10 @@ in sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."launch-editor-2.6.0" + sources."launch-editor-2.6.1" sources."leven-3.1.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" @@ -74932,7 +74836,7 @@ in sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -74961,7 +74865,7 @@ in sources."nth-check-2.1.1" sources."nullthrows-1.1.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -75120,7 +75024,7 @@ in sources."prompts-2.4.2" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qrcode-terminal-0.11.0" sources."qs-6.11.0" sources."querystringify-2.2.0" @@ -75163,7 +75067,7 @@ in }) sources."requires-port-1.0.0" sources."reselect-4.1.8" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" sources."responselike-2.0.1" @@ -75188,7 +75092,7 @@ in ]; }) sources."select-hose-2.0.0" - (sources."selfsigned-2.1.1" // { + (sources."selfsigned-2.4.1" // { dependencies = [ sources."node-forge-1.3.1" ]; @@ -75233,6 +75137,7 @@ in sources."statuses-1.4.0" ]; }) + sources."set-function-length-1.1.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" @@ -75328,7 +75233,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.20.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -75360,7 +75265,8 @@ in sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."ua-parser-js-1.0.36" + sources."ua-parser-js-1.0.37" + sources."undici-types-5.26.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" @@ -75368,7 +75274,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."untildify-3.0.3" sources."update-browserslist-db-1.0.13" @@ -75393,7 +75299,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.88.2" // { + (sources."webpack-5.89.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -75500,46 +75406,46 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - sources."@babel/core-7.23.0" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/minimist-1.2.3" - sources."@types/node-20.8.0" - sources."@types/normalize-package-data-2.4.2" - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/scheduler-0.16.4" - sources."@types/yauzl-2.10.1" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."agent-base-6.0.2" (sources."ansi-escapes-4.3.2" // { @@ -75559,13 +75465,13 @@ in sources."browserslist-4.22.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -75591,7 +75497,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -75604,14 +75510,14 @@ in sources."find-up-4.1.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."globals-11.12.0" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."hasown-2.0.0" (sources."hosted-git-info-4.1.0" // { dependencies = [ sources."lru-cache-6.0.0" @@ -75638,7 +75544,7 @@ in sources."ink-spinner-4.0.3" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -75698,7 +75604,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.28.0" + sources."react-devtools-core-4.28.5" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -75715,7 +75621,7 @@ in }) sources."readable-stream-3.6.2" sources."redent-3.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -75735,7 +75641,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -75755,6 +75661,7 @@ in sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unbzip2-stream-1.4.3" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" @@ -75790,10 +75697,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.0.tgz"; - sha512 = "eEXMUd+tdYj3W4jvMvnOhANmLmQSOpr4pNssVjyiBUHq1QD2t8E+WlNoeTEpX7dO7H+fIXKAWWHyeUvOIYHvGA=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.2.tgz"; + sha512 = "gGfiMOxAZQTuVW2aWMhNTCBu6L/cdt5olLH/wy2teL4ZiM5c1YYCXt/NHP1mOSATV/l9i/CxmGiFomgcDzCDfQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -75817,7 +75724,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.12" + sources."@oclif/color-1.0.13" sources."@oclif/core-2.15.0" (sources."@oclif/errors-1.3.6" // { dependencies = [ @@ -75831,19 +75738,19 @@ in sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.3" - sources."@types/node-20.8.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -75856,7 +75763,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -75940,7 +75847,7 @@ in sources."create-require-1.1.1" sources."cross-fetch-3.1.8" sources."cross-spawn-7.0.3" - sources."csv-parse-5.5.0" + sources."csv-parse-5.5.2" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" @@ -75985,7 +75892,7 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -76144,7 +76051,7 @@ in sources."prettier-2.8.8" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" @@ -76179,7 +76086,7 @@ in sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" sources."stream-chain-2.2.5" sources."stream-json-1.8.0" @@ -76213,7 +76120,8 @@ in sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."typescript-5.2.2" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -76299,97 +76207,58 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.1.0.tgz"; - sha512 = "EkJbYwI1Wt3oujxNlFF0Mq3hqdkDtQz7cPhZnXzUxmNhaxVopDqiwnB3zZmVvt2t6uKvplh21kLTTJ11hWH+0w=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-8.0.0.tgz"; + sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ=="; }; dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."aggregate-error-4.0.1" + sources."@ljharb/through-2.3.11" + sources."aggregate-error-5.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" - sources."ansi-styles-4.3.0" - sources."arrify-3.0.0" + sources."ansi-styles-6.2.1" sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.2" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."chalk-4.1.2" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" - sources."clean-stack-4.2.0" + sources."clean-stack-5.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-truncate-3.1.0" - sources."cli-width-3.0.0" + sources."cli-truncate-4.0.0" + sources."cli-width-4.1.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."decamelize-5.0.1" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) sources."defaults-1.0.4" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."error-ex-1.3.2" + sources."define-data-property-1.1.1" + sources."emoji-regex-10.3.0" sources."esc-exit-3.0.0" sources."escape-string-regexp-5.0.0" - sources."execa-5.1.1" + sources."execa-8.0.1" sources."external-editor-3.1.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."find-up-5.0.0" - sources."fkill-8.1.1" - sources."function-bind-1.1.1" + sources."figures-5.0.0" + sources."fkill-9.0.0" + sources."function-bind-1.1.2" sources."fuzzy-search-3.2.1" - sources."get-stream-6.0.1" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" + sources."get-east-asian-width-1.2.0" + sources."get-intrinsic-1.2.2" + sources."get-stream-8.0.1" + sources."gopd-1.0.1" sources."has-flag-4.0.0" - sources."hosted-git-info-4.1.0" - sources."human-signals-2.1.0" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" + sources."hasown-2.0.0" + sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { + (sources."inquirer-9.2.12" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -76398,125 +76267,98 @@ in sources."strip-ansi-6.0.1" ]; }) - (sources."inquirer-autocomplete-prompt-1.4.0" // { + (sources."inquirer-autocomplete-prompt-3.0.1" // { dependencies = [ - sources."rxjs-6.6.7" - sources."tslib-1.14.1" + sources."ansi-escapes-6.2.0" + sources."run-async-2.4.1" + sources."type-fest-3.13.1" ]; }) - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-1.0.0" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" + sources."is-stream-3.0.0" + sources."is-unicode-supported-1.3.0" sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - (sources."meow-10.1.5" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) + sources."meow-12.1.1" sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - (sources."minimist-options-4.1.0" // { + sources."mimic-fn-4.0.0" + sources."mute-stream-1.0.0" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."arrify-1.0.1" + sources."path-key-4.0.0" ]; }) - sources."mute-stream-0.0.8" - sources."normalize-package-data-3.0.3" - sources."npm-run-path-4.0.1" sources."num-sort-3.0.0" - sources."onetime-5.1.2" + sources."onetime-6.0.0" (sources."ora-5.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" sources."strip-ansi-6.0.1" ]; }) sources."os-tmpdir-1.0.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."pid-port-0.2.0" - (sources."process-exists-4.1.0" // { - dependencies = [ - sources."ps-list-6.3.0" - ]; - }) - sources."ps-list-7.2.0" - sources."quick-lru-5.1.1" - (sources."read-pkg-6.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."read-pkg-up-8.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) + sources."picocolors-1.0.0" + sources."pid-port-1.0.0" + sources."process-exists-5.0.0" + sources."ps-list-8.1.1" sources."readable-stream-3.6.2" - sources."redent-4.0.0" - sources."restore-cursor-3.1.0" - sources."run-async-2.4.1" + (sources."restore-cursor-3.1.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."signal-exit-3.0.7" + ]; + }) + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - (sources."slice-ansi-5.0.0" // { - dependencies = [ - sources."ansi-styles-6.2.1" - ]; - }) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."string-width-5.1.2" + sources."signal-exit-4.1.0" + sources."slice-ansi-5.0.0" + sources."string-width-7.0.0" sources."string_decoder-1.3.0" sources."strip-ansi-7.1.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-4.0.0" + sources."strip-final-newline-3.0.0" sources."supports-color-7.2.0" - sources."taskkill-4.0.0" - sources."through-2.3.8" + (sources."taskkill-5.0.0" // { + dependencies = [ + sources."execa-6.1.0" + sources."get-stream-6.0.1" + sources."human-signals-3.0.1" + sources."signal-exit-3.0.7" + ]; + }) sources."tmp-0.0.33" - sources."trim-newlines-4.1.1" sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-2.0.2" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" ]; }) - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -76544,10 +76386,10 @@ in sources."@scure/base-1.1.3" sources."@scure/bip32-1.3.1" sources."@scure/bip39-1.2.1" - sources."@types/atob-2.1.2" + sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.8.0" - sources."@types/through-0.0.31" + sources."@types/node-20.9.0" + sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -76662,7 +76504,7 @@ in sources."path-exists-4.0.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" @@ -76680,7 +76522,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -76695,13 +76537,14 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.21.3" sources."underscore-1.4.4" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."untildify-4.0.0" sources."uri-js-4.4.1" sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.10.2" + sources."web3-utils-1.10.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.1" @@ -76729,9 +76572,9 @@ in sha512 = "N8aVtvB3bdh3lXPE9Rb+ErISSnJsAkv0GgZ0h6qtN8UXFgcSqJNMyBst9r3SBNk6+n4iBVaZso16mr1SUVvG3Q=="; }; dependencies = [ - sources."@colors/colors-1.5.0" + sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@types/triple-beam-1.3.3" + sources."@types/triple-beam-1.3.5" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -76771,24 +76614,13 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."caller-1.1.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."cliff-0.1.10" // { @@ -76819,8 +76651,8 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" - sources."deep-equal-2.2.2" - sources."define-data-property-1.1.0" + sources."deep-equal-2.2.3" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."director-1.2.7" @@ -76834,19 +76666,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -76875,9 +76696,9 @@ in sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -76887,9 +76708,8 @@ in }) sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" @@ -76899,13 +76719,14 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."i-0.3.7" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.5" - sources."is-accessor-descriptor-1.0.0" + sources."internal-slot-1.0.6" + sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.2" sources."is-arrayish-0.3.2" @@ -76914,9 +76735,9 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-data-descriptor-1.0.0" + sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" + sources."is-descriptor-1.0.3" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -76945,7 +76766,7 @@ in sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" - (sources."logform-2.5.1" // { + (sources."logform-2.6.0" // { dependencies = [ sources."ms-2.1.3" ]; @@ -76983,17 +76804,11 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -77042,6 +76857,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safe-stable-stringify-2.4.3" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -77057,19 +76873,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -77091,18 +76896,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."stop-iteration-iterator-1.0.0" @@ -77147,14 +76941,14 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" - (sources."winston-3.10.0" // { + sources."which-typed-array-1.1.13" + (sources."winston-3.11.0" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."readable-stream-3.6.2" ]; }) - (sources."winston-transport-4.5.0" // { + (sources."winston-transport-4.6.0" // { dependencies = [ sources."readable-stream-3.6.2" ]; @@ -77207,9 +77001,9 @@ in sources."utf-8-validate-6.0.3" ]; }) - sources."@types/bn.js-5.1.2" + sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.8.0" + sources."@types/node-20.9.0" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -77233,6 +77027,7 @@ in sources."module-error-1.0.2" sources."node-gyp-build-4.6.1" sources."queue-microtask-1.2.3" + sources."undici-types-5.26.5" sources."utf-8-validate-5.0.7" sources."ws-8.13.0" ]; @@ -77249,10 +77044,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "5.12.1"; + version = "5.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.12.1.tgz"; - sha512 = "EvICudocJK71H3XYfxivwML5LaiTSVyS8wHEe86d+jKwDhXdzRrEvuWNlCDiJR3wMexwDuwrwcVjl/9sAsWTXA=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.12.4.tgz"; + sha512 = "GD+otyd5LlgSbYK4ODrKyAise/k32G7Qy7H/k+gJ2P8DCG9sU+j//2zNwF7mY8C5dl0SpROqFTL+I0Y1DK4tmQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" @@ -77261,13 +77056,13 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -77284,7 +77079,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-replace-supers-7.22.20" @@ -77294,29 +77089,29 @@ in sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/preset-typescript-7.23.0" - sources."@babel/runtime-7.23.1" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" + sources."@babel/plugin-syntax-typescript-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/preset-typescript-7.23.3" + sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@lmdb/lmdb-darwin-arm64-2.5.3" sources."@lmdb/lmdb-darwin-x64-2.5.3" sources."@lmdb/lmdb-linux-arm-2.5.3" @@ -77332,12 +77127,12 @@ in sources."@turist/fetch-7.2.0" sources."@turist/time-0.0.2" sources."@types/cacheable-request-6.0.3" - sources."@types/common-tags-1.8.2" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/common-tags-1.8.4" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.0" - sources."@types/node-fetch-2.6.6" - sources."@types/responselike-1.0.1" + sources."@types/node-20.9.0" + sources."@types/node-fetch-2.6.9" + sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -77362,7 +77157,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -77399,7 +77194,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-2.0.0" - sources."create-gatsby-3.12.0" + sources."create-gatsby-3.12.3" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.2" @@ -77423,12 +77218,12 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."execa-5.1.1" // { @@ -77457,8 +77252,8 @@ in sources."fs-exists-cached-1.0.0" sources."fs-extra-11.1.1" sources."fs.realpath-1.0.0" - sources."gatsby-core-utils-4.12.0" - sources."gatsby-telemetry-4.12.0" + sources."gatsby-core-utils-4.12.1" + sources."gatsby-telemetry-4.12.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -77468,7 +77263,7 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" - sources."hash-wasm-4.9.0" + sources."hash-wasm-4.10.0" (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -77499,13 +77294,13 @@ in sources."is-valid-path-0.1.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."joi-17.10.2" + sources."joi-17.11.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kleur-3.0.3" sources."lmdb-2.5.3" sources."locate-path-5.0.0" @@ -77616,8 +77411,9 @@ in sources."tslib-1.14.1" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" + sources."undici-types-5.26.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."update-browserslist-db-1.0.13" sources."util-deprecate-1.0.2" sources."utila-0.4.0" @@ -77751,31 +77547,42 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "39.16.0"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.16.0.tgz"; - sha512 = "mAbuolRI/YUZSU9kifwdj8PMVbSTEf2UJlGB2NQNMS+243ijqbSiH/3s68a5SBy4sOGPc9aHtmQ2aWJ3/KhEJg=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.21.2.tgz"; + sha512 = "/0gz7IXErq2rzqsx5rqPKopcJztkmf392R2abrTJXmsuIwBEJxCn3JOd3PvX4G79wXAtV1IIR0lDOTkAagX3mw=="; }; dependencies = [ - sources."@gitbeaker/core-39.16.0" - sources."@gitbeaker/requester-utils-39.16.0" - sources."@gitbeaker/rest-39.16.0" + sources."@gitbeaker/core-39.21.2" + sources."@gitbeaker/requester-utils-39.21.2" + sources."@gitbeaker/rest-39.21.2" sources."ansi-styles-4.3.0" - sources."call-bind-1.0.2" + sources."async-sema-3.1.1" + sources."braces-3.0.2" + sources."call-bind-1.0.5" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."has-1.0.3" + sources."define-data-property-1.1.1" + sources."fill-range-7.0.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."object-inspect-1.12.3" + sources."hasown-2.0.0" + sources."is-number-7.0.0" + sources."micromatch-4.0.5" + sources."object-inspect-1.13.1" + sources."picomatch-2.3.1" sources."qs-6.11.2" + sources."set-function-length-1.1.1" sources."side-channel-1.0.4" sources."supports-color-7.2.0" sources."sywac-1.3.0" + sources."to-regex-range-5.0.1" sources."xcase-2.0.1" ]; buildInputs = globalBuildInputs; @@ -77970,7 +77777,7 @@ in sources."htmlparser2-8.0.2" sources."iconv-lite-0.6.3" sources."idb-keyval-6.2.1" - sources."inversify-6.0.1" + sources."inversify-6.0.2" sources."node-fetch-2.7.0" sources."reflect-metadata-0.1.13" sources."safer-buffer-2.1.2" @@ -78140,8 +77947,8 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.8.0" - sources."@types/parse-json-4.0.0" + sources."@types/node-20.9.0" + sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" sources."aggregate-error-3.1.0" @@ -78170,14 +77977,14 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."callsites-3.1.0" (sources."camel-case-4.1.1" // { @@ -78224,11 +78031,11 @@ in sources."dataloader-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" - sources."deep-equal-2.2.2" + sources."deep-equal-2.2.3" sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" @@ -78254,7 +78061,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" @@ -78270,10 +78077,10 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fullname-4.0.1" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -78298,13 +78105,13 @@ in sources."graphql-ws-4.9.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" @@ -78331,7 +78138,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" @@ -78376,7 +78183,7 @@ in sources."json-stringify-safe-5.0.1" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."jsonpath-plus-4.0.0" @@ -78446,7 +78253,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.4" @@ -78497,7 +78304,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -78523,6 +78330,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.2" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -78537,7 +78345,7 @@ in sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stop-iteration-iterator-1.0.0" sources."string-env-interpolation-1.0.1" (sources."string-width-4.2.3" // { @@ -78568,6 +78376,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" + sources."undici-types-5.26.5" sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.4.1" @@ -78581,7 +78390,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -78625,40 +78434,36 @@ in sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - sources."@babel/core-7.23.0" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-import-assertions-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" sources."@babel/polyfill-7.12.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/batch-execute-9.0.2" sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.3" sources."@graphql-tools/executor-1.2.0" - sources."@graphql-tools/executor-graphql-ws-1.1.0" - sources."@graphql-tools/executor-http-1.0.2" - (sources."@graphql-tools/executor-legacy-ws-1.0.3" // { - dependencies = [ - sources."ws-8.14.1" - ]; - }) + sources."@graphql-tools/executor-graphql-ws-1.1.1" + sources."@graphql-tools/executor-http-1.0.3" + sources."@graphql-tools/executor-legacy-ws-1.0.4" sources."@graphql-tools/graphql-file-loader-8.0.0" sources."@graphql-tools/graphql-tag-pluck-8.0.1" sources."@graphql-tools/import-7.0.0" @@ -78667,7 +78472,7 @@ in sources."@graphql-tools/merge-9.0.0" sources."@graphql-tools/schema-10.0.0" sources."@graphql-tools/url-loader-8.0.0" - sources."@graphql-tools/utils-10.0.6" + sources."@graphql-tools/utils-10.0.8" sources."@graphql-tools/wrap-10.0.1" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" @@ -78675,26 +78480,26 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@repeaterjs/repeater-3.0.4" - sources."@types/estree-1.0.2" - sources."@types/node-20.8.0" - sources."@types/ws-8.5.6" + sources."@repeaterjs/repeater-3.0.5" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.1" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-3.3.4" - sources."@vue/compiler-ssr-3.3.4" - sources."@vue/reactivity-transform-3.3.4" - sources."@vue/shared-3.3.4" + sources."@types/yargs-parser-21.0.3" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@whatwg-node/events-0.1.1" - sources."@whatwg-node/fetch-0.9.13" - sources."@whatwg-node/node-fetch-0.4.19" - sources."acorn-8.10.0" + sources."@whatwg-node/fetch-0.9.14" + sources."@whatwg-node/node-fetch-0.5.0" + sources."acorn-8.11.2" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" @@ -78705,10 +78510,10 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.22.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -78723,6 +78528,7 @@ in sources."core-js-2.6.12" sources."cosmiconfig-8.3.6" sources."cosmiconfig-toml-loader-1.0.0" + sources."cross-inspect-1.0.0" sources."css-tree-2.3.1" sources."dataloader-2.2.2" sources."debug-4.3.4" @@ -78730,8 +78536,8 @@ in sources."dequal-2.0.3" sources."dir-glob-3.0.1" sources."dotenv-10.0.0" - sources."dset-3.1.2" - sources."electron-to-chromium-1.4.538" + sources."dset-3.1.3" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -78740,7 +78546,7 @@ in sources."estree-walker-2.0.2" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-querystring-1.1.2" sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" @@ -78760,7 +78566,7 @@ in }) sources."graphql-language-service-5.2.0" sources."graphql-language-service-server-2.11.5" - sources."graphql-ws-5.14.1" + sources."graphql-ws-5.14.2" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -78778,7 +78584,7 @@ in sources."is-number-7.0.0" sources."is-reference-3.0.2" sources."isomorphic-ws-5.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -78788,7 +78594,7 @@ in sources."locate-character-3.0.0" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" - sources."magic-string-0.30.4" + sources."magic-string-0.30.5" sources."mdn-data-2.0.30" sources."merge2-1.4.1" sources."meros-1.3.0" @@ -78796,7 +78602,7 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-fetch-2.7.0" @@ -78836,17 +78642,18 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.2.1" // { + (sources."svelte-4.2.2" // { dependencies = [ sources."estree-walker-3.0.3" ]; }) - sources."svelte2tsx-0.6.22" + sources."svelte2tsx-0.6.23" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."unixify-1.0.0" sources."update-browserslist-db-1.0.13" sources."urlpattern-polyfill-9.0.0" @@ -78861,7 +78668,7 @@ in ]; }) sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" (sources."wrap-ansi-7.0.0" // { @@ -78911,16 +78718,16 @@ in sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."grunt-known-options-2.0.0" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -78949,7 +78756,7 @@ in sources."path-root-regex-0.1.2" sources."picomatch-2.3.1" sources."rechoir-0.7.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-dir-1.0.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" @@ -78998,12 +78805,13 @@ in sources."array-flatten-1.1.1" sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."ee-first-1.1.1" @@ -79015,11 +78823,13 @@ in sources."finalhandler-1.2.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."has-1.0.3" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" @@ -79033,7 +78843,7 @@ in sources."minimist-1.2.8" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parseurl-1.3.3" @@ -79050,6 +78860,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."statuses-2.0.1" @@ -79137,24 +78948,13 @@ in sources."buffer-equal-1.0.1" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-3.0.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."cliui-3.2.0" @@ -79187,7 +78987,7 @@ in ]; }) sources."default-resolution-2.0.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."detect-file-1.0.0" @@ -79203,18 +79003,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."expand-tilde-2.0.2" @@ -79254,9 +79043,9 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -79273,8 +79062,7 @@ in sources."graceful-fs-4.2.11" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-value-1.0.0" @@ -79283,6 +79071,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" @@ -79291,13 +79080,13 @@ in sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -79354,13 +79143,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -79409,7 +79192,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -79419,6 +79202,7 @@ in sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -79428,18 +79212,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -79459,24 +79232,13 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."stream-exhaust-1.0.2" @@ -79584,15 +79346,12 @@ in }) sources."buffer-from-1.1.2" sources."cache-base-1.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."cliui-3.2.0" @@ -79609,7 +79368,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."default-compare-1.0.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."detect-file-1.0.0" @@ -79626,10 +79385,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."expand-tilde-2.0.2" @@ -79668,9 +79424,9 @@ in sources."for-in-1.0.2" sources."for-own-1.0.0" sources."fragment-cache-0.2.1" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -79678,8 +79434,7 @@ in sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."gulplog-1.0.0" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-value-1.0.0" @@ -79688,6 +79443,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."inherits-2.0.4" @@ -79695,24 +79451,12 @@ in sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -79775,13 +79519,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -79819,7 +79557,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -79828,6 +79566,7 @@ in sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -79838,10 +79577,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -79861,16 +79597,13 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."string-width-1.0.2" @@ -79953,20 +79686,23 @@ in sources."ansi-styles-4.3.0" sources."async-2.6.4" sources."basic-auth-2.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."corser-2.0.1" sources."debug-3.2.7" + sources."define-data-property-1.1.1" sources."eventemitter3-4.0.7" sources."follow-redirects-1.15.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."has-1.0.3" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."he-1.2.0" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-1.18.1" @@ -79976,7 +79712,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.3" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."opener-1.5.2" sources."portfinder-1.0.32" sources."qs-6.11.2" @@ -79984,6 +79720,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."secure-compare-3.0.1" + sources."set-function-length-1.1.1" sources."side-channel-1.0.4" sources."supports-color-7.2.0" sources."union-0.5.0" @@ -80206,7 +79943,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" @@ -80232,7 +79969,7 @@ in sources."slide-1.1.6" sources."source-map-0.5.7" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stream-shift-1.0.1" sources."string-length-1.0.1" sources."string_decoder-0.10.31" @@ -80347,8 +80084,8 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.20" - sources."@types/sizzle-2.3.4" + sources."@types/jquery-3.5.27" + sources."@types/sizzle-2.3.6" sources."ansidec-0.3.4" sources."arch-2.2.0" sources."clipboardy-2.3.0" @@ -80399,22 +80136,25 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.5.tgz"; - sha512 = "5iU2b84SLE3JOlfGU/g6XCzioEdcflmpHRxPLKEMhEzV43DHgBwbdsTagDtXKtO50hi8osrzA85/HOCglrylKA=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.10.0.tgz"; + sha512 = "Qr0HfhN1dGPHCAaboH2ypopDadAQyH3uIcIbegslWZao2msrpJ6sIJwKWc10QJBbS5s/jorA9NCk+x+2fwlhaw=="; }; dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" - sources."@azure/core-http-2.3.2" - sources."@azure/core-tracing-1.0.0-preview.13" - sources."@azure/core-util-1.5.0" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.2.0" sources."@azure/logger-1.0.4" - sources."@bmewburn/js-beautify-1.14.7" - sources."@bmewburn/vscode-html-languageserver-1.9.0" + sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" + sources."@bmewburn/js-beautify-1.14.9" + sources."@bmewburn/vscode-html-languageserver-1.10.0" + sources."@isaacs/cliui-8.0.2" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ + sources."abbrev-1.1.1" sources."nopt-5.0.0" ]; }) @@ -80422,11 +80162,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" - sources."@opentelemetry/core-1.17.0" - sources."@opentelemetry/resources-1.17.0" - sources."@opentelemetry/sdk-trace-base-1.17.0" - sources."@opentelemetry/semantic-conventions-1.17.0" + sources."@one-ini/wasm-0.1.1" + sources."@opentelemetry/api-1.7.0" + sources."@opentelemetry/core-1.18.1" + sources."@opentelemetry/instrumentation-0.41.2" + sources."@opentelemetry/resources-1.18.1" + sources."@opentelemetry/sdk-trace-base-1.18.1" + sources."@opentelemetry/semantic-conventions-1.18.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -80438,15 +80180,18 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.8.0" - sources."@types/node-fetch-2.6.6" - sources."@types/tunnel-0.0.3" + sources."@tootallnate/once-2.0.0" + sources."@types/node-20.9.0" + sources."@types/shimmer-1.0.5" sources."@vscode/l10n-0.0.16" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" - sources."applicationinsights-2.3.6" + sources."ansi-styles-6.2.1" + sources."applicationinsights-2.7.3" sources."applicationinsights-native-metrics-0.0.10" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -80467,103 +80212,105 @@ in sources."braces-3.0.2" sources."caseless-0.12.0" sources."chownr-2.0.0" + sources."cjs-module-lexer-1.2.3" (sources."cls-hooked-4.2.2" // { dependencies = [ sources."semver-5.7.2" ]; }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-10.0.1" sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-4.3.4" sources."deepmerge-4.3.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.2" - (sources."diagnostic-channel-1.1.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."diagnostic-channel-publishers-1.0.5" + sources."diagnostic-channel-1.1.1" + sources."diagnostic-channel-publishers-1.0.7" sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domino-2.1.6" sources."domutils-3.1.0" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."semver-5.7.2" - ]; - }) + sources."editorconfig-1.0.4" sources."emitter-listener-1.1.2" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."entities-4.5.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fill-range-7.0.1" + sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" sources."form-data-4.0.0" - (sources."fs-extra-11.1.1" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."fs-extra-11.1.1" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."function-bind-1.1.2" + (sources."gauge-3.0.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."signal-exit-3.0.7" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."getpass-0.1.7" - sources."glob-8.1.0" + sources."glob-10.3.10" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."html-to-text-9.0.5" sources."htmlparser2-8.0.2" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" + sources."import-in-the-middle-1.4.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jackspeak-2.3.6" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) + sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."leac-0.6.0" sources."long-5.2.3" - sources."lru-cache-7.14.1" + sources."lru-cache-10.0.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -80573,46 +80320,46 @@ in sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-5.1.6" - sources."minipass-5.0.0" + sources."minimatch-9.0.1" + sources."minipass-7.0.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."mkdirp-1.0.4" + sources."module-details-from-path-1.0.3" sources."ms-2.1.2" sources."nan-2.18.0" sources."node-fetch-2.7.0" - sources."nopt-6.0.0" + sources."nopt-7.2.0" sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."parseley-0.12.1" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-scurry-1.10.1" sources."peberminta-0.9.0" sources."performance-now-2.1.0" sources."picomatch-2.3.1" - sources."process-0.11.10" sources."proto-list-1.2.4" sources."protobufjs-7.2.5" - sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" - sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."tough-cookie-2.5.0" sources."uuid-3.4.0" ]; }) - sources."requires-port-1.0.0" + sources."require-in-the-middle-7.2.0" + sources."resolve-1.22.8" sources."reusify-1.0.4" (sources."rimraf-3.0.2" // { dependencies = [ @@ -80624,77 +80371,89 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.3.0" sources."selderee-0.11.0" - (sources."semver-7.3.8" // { + (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" - sources."yallist-4.0.0" ]; }) sources."set-blocking-2.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shimmer-1.2.1" - sources."sigmund-1.0.1" - sources."signal-exit-3.0.7" - sources."sshpk-1.17.0" + sources."signal-exit-4.1.0" + sources."sshpk-1.18.0" sources."stack-chain-1.3.7" - sources."string-width-4.2.3" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.2.0" // { dependencies = [ - sources."yallist-4.0.0" + sources."minipass-5.0.0" ]; }) sources."to-regex-range-5.0.1" - sources."tough-cookie-4.1.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" sources."turndown-plugin-gfm-1.0.2" sources."tweetnacl-0.14.5" - sources."typescript-4.9.5" - sources."universalify-0.2.0" + sources."typescript-5.2.2" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."uri-js-4.4.1" - sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - (sources."vscode-css-languageservice-6.2.9" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.3" - ]; - }) - (sources."vscode-html-languageservice-5.1.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" - ]; - }) + sources."vscode-css-languageservice-6.2.10" + sources."vscode-html-languageservice-5.1.1" sources."vscode-jsonrpc-8.2.0" - (sources."vscode-languageserver-8.0.2" // { + (sources."vscode-languageserver-8.2.0-next.3" // { dependencies = [ - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" - ]; - }) - (sources."vscode-languageserver-protocol-3.17.5" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" + sources."vscode-jsonrpc-8.2.0-next.2" + sources."vscode-languageserver-protocol-3.17.4-next.3" + sources."vscode-languageserver-types-3.17.4-next.2" ]; }) + sources."vscode-languageserver-protocol-3.17.5" sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.7" + sources."vscode-languageserver-types-3.17.5" + sources."vscode-uri-3.0.8" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" + sources."which-2.0.2" + (sources."wide-align-1.1.5" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -80821,10 +80580,11 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.418.0" // { + (sources."@aws-sdk/signature-v4-crt-3.438.0" // { dependencies = [ - sources."@aws-sdk/signature-v4-multi-region-3.418.0" - sources."@aws-sdk/types-3.418.0" + sources."@aws-sdk/signature-v4-multi-region-3.437.0" + sources."@aws-sdk/types-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -80856,7 +80616,7 @@ in sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/util-waiter-3.296.0" sources."@aws-sdk/xml-builder-3.295.0" - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" sources."@braintree/sanitize-url-6.0.4" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" @@ -80887,21 +80647,24 @@ in sources."@mapbox/node-pre-gyp-1.0.11" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@smithy/eventstream-codec-2.0.10" + sources."@smithy/eventstream-codec-2.0.12" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/protocol-http-3.0.6" - sources."@smithy/querystring-parser-2.0.10" - sources."@smithy/signature-v4-2.0.10" - sources."@smithy/types-2.3.4" + sources."@smithy/node-config-provider-2.1.3" + sources."@smithy/property-provider-2.0.13" + sources."@smithy/protocol-http-3.0.8" + sources."@smithy/querystring-parser-2.0.12" + sources."@smithy/shared-ini-file-loader-2.2.2" + sources."@smithy/signature-v4-2.0.12" + sources."@smithy/types-2.4.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.3" + sources."@smithy/util-middleware-2.0.5" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.8.0" - sources."@types/ws-8.5.6" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -80931,7 +80694,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.0" + sources."aws-crt-1.19.0" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -80944,7 +80707,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.12.0" - sources."axios-0.24.0" + sources."axios-1.6.1" sources."b4a-1.6.4" sources."balanced-match-1.0.2" sources."base-64-1.0.0" @@ -80963,14 +80726,14 @@ in sources."braces-3.0.2" sources."buffer-6.0.3" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."builtin-modules-3.3.0" (sources."cacache-15.3.0" // { dependencies = [ sources."minipass-3.3.6" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."canvas-2.11.2" @@ -81015,7 +80778,7 @@ in sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" - sources."crypto-js-4.1.1" + sources."crypto-js-4.2.0" sources."css-3.0.0" sources."cssstyle-3.0.0" sources."cwise-compiler-1.1.3" @@ -81102,6 +80865,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" @@ -81172,7 +80936,7 @@ in (sources."fs-extra-11.1.1" // { dependencies = [ sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -81182,9 +80946,9 @@ in }) sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."get-stream-6.0.1" @@ -81198,17 +80962,18 @@ in sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."he-1.2.0" (sources."help-me-3.0.0" // { dependencies = [ @@ -81316,7 +81081,7 @@ in ]; }) sources."keytar-7.9.0" - sources."khroma-2.0.0" + sources."khroma-2.1.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."leven-2.1.0" @@ -81430,7 +81195,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.3" sources."no-case-2.3.2" - sources."node-abi-3.47.0" + sources."node-abi-3.51.0" sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" @@ -81512,9 +81277,10 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."proper-lockfile-4.1.2" + sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."query-string-7.1.3" sources."querystring-0.2.0" @@ -81559,6 +81325,7 @@ in sources."semver-7.5.4" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."seventh-0.8.3" @@ -81601,7 +81368,7 @@ in }) sources."sprintf-js-1.1.2" sources."sqlite3-5.1.6" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.3.6" @@ -81609,7 +81376,7 @@ in }) sources."statuses-1.5.0" sources."stream-shift-1.0.1" - sources."streamx-2.15.1" + sources."streamx-2.15.2" sources."strict-uri-encode-2.0.0" sources."string-kit-0.17.10" sources."string-padding-1.0.2" @@ -81693,6 +81460,7 @@ in sources."uglify-js-3.17.4" sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" + sources."undici-types-5.26.5" sources."uniq-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -81722,7 +81490,7 @@ in sources."whatwg-mimetype-3.0.0" sources."whatwg-url-12.0.1" sources."which-2.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wide-align-1.1.5" sources."word-wrap-1.2.4" sources."wordwrapjs-3.0.0" @@ -81764,35 +81532,71 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.9"; + version = "1.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"; - sha512 = "coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz"; + sha512 = "rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."@one-ini/wasm-0.1.1" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-6.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-10.0.1" sources."config-chain-1.1.13" + sources."cross-spawn-7.0.3" + sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" - sources."fs.realpath-1.0.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."emoji-regex-9.2.2" + sources."foreground-child-3.1.1" + sources."glob-10.3.10" sources."ini-1.3.8" + sources."is-fullwidth-code-point-3.0.0" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."lru-cache-6.0.0" sources."minimatch-9.0.1" - sources."nopt-6.0.0" - sources."once-1.4.0" + sources."minipass-7.0.4" + sources."nopt-7.2.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."proto-list-1.2.4" sources."semver-7.5.4" - sources."wrappy-1.0.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."which-2.0.2" + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -81835,11 +81639,11 @@ in sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@jsdoc/salty-0.2.5" - sources."@types/linkify-it-3.0.3" + sources."@types/linkify-it-3.0.5" sources."@types/markdown-it-12.2.3" - sources."@types/mdurl-1.0.3" + sources."@types/mdurl-1.0.5" sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -81981,24 +81785,27 @@ in sources."argparse-1.0.10" sources."asap-2.0.6" sources."asynckit-0.4.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-emitter-1.3.0" sources."cookiejar-2.1.4" sources."debug-4.3.4" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" sources."formidable-2.1.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" sources."graphlib-2.1.8" - sources."has-1.0.3" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."hexoid-1.0.0" sources."inherits-2.0.4" sources."js-yaml-3.14.1" @@ -82010,14 +81817,15 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."side-channel-1.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" @@ -82054,7 +81862,7 @@ in sources."basic-auth-2.0.1" sources."body-parser-1.20.2" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-4.1.2" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -82076,6 +81884,7 @@ in sources."cookie-signature-1.0.6" sources."cors-2.8.5" sources."debug-2.6.9" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."ee-first-1.1.1" @@ -82100,14 +81909,16 @@ in sources."finalhandler-1.2.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" @@ -82137,10 +81948,10 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."negotiator-0.6.3" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."parseurl-1.3.3" @@ -82163,6 +81974,7 @@ in }) sources."serve-static-1.15.0" sources."server-destroy-1.0.1" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."statuses-2.0.1" @@ -82263,7 +82075,7 @@ in sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-2.1.1" sources."capture-stack-trace-1.0.2" sources."caseless-0.12.0" @@ -82272,19 +82084,8 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."isobject-3.0.1" - sources."kind-of-5.1.0" ]; }) sources."cli-boxes-1.0.0" @@ -82323,6 +82124,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-extend-0.6.0" + sources."define-data-property-1.1.1" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -82374,19 +82176,20 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fsevents-1.2.13" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" + sources."gopd-1.0.1" sources."got-5.7.1" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."has-value-1.0.0" // { @@ -82404,6 +82207,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -82413,25 +82217,13 @@ in sources."ini-1.3.8" sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -82519,16 +82311,10 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -82567,7 +82353,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -82608,21 +82394,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -82648,7 +82420,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -82664,6 +82436,7 @@ in sources."serve-static-1.15.0" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -82676,18 +82449,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -82703,24 +82465,13 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-string-3.1.0" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -82834,7 +82585,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.37.0" // { + (sources."@putdotio/api-client-8.39.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -82854,7 +82605,7 @@ in ]; }) sources."braces-3.0.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."cardinal-2.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -82882,6 +82633,7 @@ in }) sources."debounce-fn-3.0.1" sources."debug-4.3.4" + sources."define-data-property-1.1.1" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" @@ -82897,7 +82649,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" (sources."figures-3.2.0" // { @@ -82909,15 +82661,17 @@ in sources."find-up-3.0.0" sources."follow-redirects-1.15.3" sources."fs-extra-8.1.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."glob-parent-5.1.2" sources."globby-11.1.0" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.4" @@ -82955,7 +82709,7 @@ in sources."natural-orderby-2.0.3" sources."next-tick-1.1.0" sources."node-downloader-helper-1.0.19" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -82968,7 +82722,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -82983,6 +82737,7 @@ in }) sources."safer-buffer-2.1.2" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" @@ -83022,10 +82777,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.16.8"; + version = "0.16.9"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.8.tgz"; - sha512 = "ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg=="; + url = "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz"; + sha512 = "fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ=="; }; dependencies = [ sources."commander-8.3.0" @@ -83052,13 +82807,13 @@ in sources."@ampproject/remapping-2.2.1" sources."@babel/cli-7.23.0" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -83069,28 +82824,28 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" sources."@babel/node-7.22.19" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/register-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ sources."lru-cache-6.0.0" @@ -83108,7 +82863,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@openpgp/hkp-client-0.0.2" sources."@openpgp/wkd-client-0.0.3" - sources."@peculiar/asn1-schema-2.3.6" + sources."@peculiar/asn1-schema-2.3.8" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.3" sources."@tootallnate/once-1.1.2" @@ -83142,7 +82897,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -83188,10 +82943,10 @@ in sources."browserslist-4.22.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001542" + sources."call-bind-1.0.5" + sources."caniuse-lite-1.0.30001561" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -83212,7 +82967,7 @@ in sources."convert-source-map-2.0.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" + sources."core-js-3.33.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -83235,7 +82990,7 @@ in sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -83251,15 +83006,15 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.4.1" - sources."es-abstract-1.22.2" + sources."es-abstract-1.22.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -83278,7 +83033,7 @@ in ]; }) sources."express-validator-6.15.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -83306,7 +83061,7 @@ in sources."fs-constants-1.0.0" (sources."fs-extra-9.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -83317,13 +83072,13 @@ in }) sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" @@ -83338,15 +83093,16 @@ in sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."growly-1.3.0" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hash-base-3.1.0" + sources."hasown-2.0.0" sources."homedir-polyfill-1.0.3" sources."html-encoding-sniffer-2.0.1" sources."http-errors-2.0.0" @@ -83358,7 +83114,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" @@ -83403,7 +83159,7 @@ in sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."kind-of-6.0.3" @@ -83441,7 +83197,7 @@ in sources."nan-2.18.0" sources."napi-build-utils-1.0.2" sources."negotiator-0.6.3" - (sources."node-abi-3.47.0" // { + (sources."node-abi-3.51.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.5.4" @@ -83463,13 +83219,13 @@ in sources."npmlog-5.0.1" sources."nwsapi-2.2.7" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.getownpropertydescriptors-2.1.7" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."openpgp-5.10.2" + sources."openpgp-5.11.0" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -83525,7 +83281,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."pvtsutils-1.3.5" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -83545,9 +83301,9 @@ in sources."regexp.prototype.flags-1.5.1" sources."require-directory-2.1.1" sources."requires-port-1.0.0" - (sources."resolve-1.22.6" // { + (sources."resolve-1.22.8" // { dependencies = [ - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" ]; }) sources."reusify-1.0.4" @@ -83576,6 +83332,7 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" @@ -83658,7 +83415,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wide-align-1.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -83707,7 +83464,7 @@ in sources."core-util-is-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" @@ -83753,10 +83510,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-7.3.0.tgz"; - sha512 = "Dt8TH+J+c9+3MhTYcm5OxnNzXb87WG7GPNj3kidjYJjJY7KxIMDNU37qBTYRWA1h3wAeNKBplXVQYUPkGcYgkQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-7.4.2.tgz"; + sha512 = "gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -83780,27 +83537,42 @@ in sources."supports-color-5.5.0" ]; }) + sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" - sources."@isaacs/cliui-8.0.2" + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-8.1.0" + ]; + }) sources."@jest/schemas-29.6.3" - sources."@lerna/child-process-7.3.0" - sources."@lerna/create-7.3.0" + sources."@lerna/child-process-7.4.2" + sources."@lerna/create-7.4.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" + sources."@npmcli/fs-2.1.2" sources."@npmcli/git-4.1.0" (sources."@npmcli/installed-package-contents-2.0.2" // { dependencies = [ sources."npm-bundled-3.0.0" ]; }) + (sources."@npmcli/move-file-2.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" - sources."@nrwl/devkit-16.9.1" - sources."@nrwl/tao-16.9.1" - (sources."@nx/devkit-16.9.1" // { + sources."@nrwl/devkit-16.10.0" + sources."@nrwl/tao-16.10.0" + (sources."@nx/devkit-16.10.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.5.3" @@ -83827,15 +83599,46 @@ in sources."@parcel/watcher-2.0.4" sources."@sigstore/bundle-1.1.0" sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" + (sources."@sigstore/sign-1.0.0" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."@sigstore/tuf-1.0.3" sources."@sinclair/typebox-0.27.8" sources."@swc-node/core-1.10.6" sources."@swc-node/register-1.6.8" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" @@ -83846,8 +83649,8 @@ in ]; }) sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ @@ -83869,7 +83672,7 @@ in ]; }) sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."argparse-2.0.1" @@ -83877,9 +83680,9 @@ in sources."array-ify-1.0.0" sources."array-union-2.1.0" sources."arrify-1.0.1" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" - sources."axios-1.5.1" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -83890,36 +83693,33 @@ in sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."byte-size-8.1.1" - (sources."cacache-17.1.4" // { + (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - sources."ssri-10.0.5" + sources."glob-8.1.0" + sources."minimatch-5.1.6" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) ]; }) sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - (sources."chalk-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-2.0.0" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" sources."cli-width-3.0.0" - (sources."cliui-7.0.4" // { + (sources."cliui-8.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" ]; }) @@ -83934,17 +83734,13 @@ in sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colorette-2.0.20" - (sources."columnify-1.6.0" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."columnify-1.6.0" sources."combined-stream-1.0.8" sources."compare-func-2.0.0" sources."concat-map-0.0.1" sources."concat-stream-2.0.0" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-6.0.0" + sources."conventional-changelog-angular-7.0.0" sources."conventional-changelog-core-5.0.1" sources."conventional-changelog-preset-loader-3.0.0" sources."conventional-changelog-writer-6.0.1" @@ -83994,12 +83790,8 @@ in sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" sources."ejs-3.1.9" - sources."emoji-regex-9.2.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."env-paths-2.2.1" @@ -84014,10 +83806,11 @@ in sources."exponential-backoff-3.1.1" (sources."external-editor-3.1.0" // { dependencies = [ + sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -84038,20 +83831,10 @@ in sources."form-data-4.0.0" sources."fs-constants-1.0.0" sources."fs-extra-11.1.1" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."function-bind-1.1.2" + sources."gauge-4.0.4" sources."get-caller-file-2.0.5" (sources."get-pkg-repo-4.2.1" // { dependencies = [ @@ -84081,16 +83864,16 @@ in sources."graceful-fs-4.2.11" sources."handlebars-4.7.8" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."ignore-walk-5.0.1" // { @@ -84107,6 +83890,7 @@ in sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -84118,19 +83902,14 @@ in }) (sources."inquirer-8.2.6" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.2" - sources."emoji-regex-8.0.0" sources."mute-stream-0.0.8" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-6.2.0" ]; }) sources."ip-2.0.0" sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -84195,15 +83974,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-7.18.3" sources."make-dir-4.0.0" - (sources."make-fetch-happen-11.1.1" // { - dependencies = [ - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - ]; - }) + sources."make-fetch-happen-10.2.1" sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ @@ -84231,42 +84002,14 @@ in sources."minimatch-3.0.5" sources."minimist-1.2.8" sources."minimist-options-4.1.0" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-3.3.6" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-2.1.2" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."modify-values-1.0.1" sources."ms-2.1.3" @@ -84280,7 +84023,7 @@ in sources."neo-async-2.6.2" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - (sources."node-gyp-9.4.0" // { + (sources."node-gyp-9.4.1" // { dependencies = [ sources."rimraf-3.0.2" sources."which-2.0.2" @@ -84300,7 +84043,7 @@ in sources."npm-normalize-package-bin-1.0.1" ]; }) - sources."npm-install-checks-6.2.0" + sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" (sources."npm-package-arg-8.1.1" // { dependencies = [ @@ -84325,40 +84068,55 @@ in }) (sources."npm-registry-fetch-14.0.5" // { dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" sources."hosted-git-info-6.1.1" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) sources."npm-package-arg-10.1.0" + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-16.9.1" // { + (sources."nx-16.10.0" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."cli-spinners-2.6.1" - sources."emoji-regex-8.0.0" sources."glob-7.1.4" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."lru-cache-6.0.0" sources."semver-7.5.3" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - (sources."yargs-17.7.2" // { - dependencies = [ - sources."cliui-8.0.1" - ]; - }) + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; }) sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.2" - (sources."ora-5.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -84373,10 +84131,23 @@ in sources."p-waterfall-2.1.1" (sources."pacote-15.2.0" // { dependencies = [ + sources."@npmcli/fs-3.1.0" sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" sources."hosted-git-info-6.1.1" sources."ignore-walk-6.0.3" sources."minimatch-9.0.3" + sources."minipass-5.0.0" sources."npm-package-arg-10.1.0" sources."npm-packlist-7.0.4" (sources."ssri-10.0.5" // { @@ -84384,6 +84155,8 @@ in sources."minipass-7.0.4" ]; }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."parent-module-1.0.1" @@ -84401,6 +84174,7 @@ in (sources."path-scurry-1.10.1" // { dependencies = [ sources."lru-cache-10.0.1" + sources."minipass-7.0.4" ]; }) (sources."path-type-3.0.0" // { @@ -84435,6 +84209,7 @@ in sources."glob-10.3.10" sources."hosted-git-info-6.1.1" sources."minimatch-9.0.3" + sources."minipass-7.0.4" sources."normalize-package-data-5.0.0" ]; }) @@ -84461,7 +84236,7 @@ in sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" @@ -84490,7 +84265,38 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" + (sources."sigstore-1.9.0" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" @@ -84501,28 +84307,15 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" - (sources."ssri-9.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) + sources."ssri-9.0.1" + sources."string-width-4.2.3" + sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) + sources."strip-ansi-6.0.1" sources."strip-ansi-cjs-6.0.1" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" @@ -84530,12 +84323,7 @@ in sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tar-6.1.11" // { - dependencies = [ - sources."fs-minipass-2.1.0" - sources."minipass-3.3.6" - ]; - }) + sources."tar-6.1.11" sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" sources."text-extensions-1.9.0" @@ -84557,15 +84345,46 @@ in sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" sources."tslib-2.6.2" - sources."tuf-js-1.1.7" + (sources."tuf-js-1.1.7" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."type-fest-0.18.1" sources."typedarray-0.0.6" sources."typescript-5.2.2" sources."uglify-js-3.17.4" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.0" - sources."universalify-2.0.0" + sources."unique-filename-2.0.1" + sources."unique-slug-3.0.0" + sources."universal-user-agent-6.0.1" + sources."universalify-2.0.1" sources."upath-2.0.1" sources."util-deprecate-1.0.2" sources."uuid-9.0.1" @@ -84580,23 +84399,10 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-3.0.1" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wide-align-1.1.5" sources."wordwrap-1.0.0" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-6.2.0" + sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" (sources."write-file-atomic-5.0.1" // { dependencies = [ @@ -84621,9 +84427,8 @@ in sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."cliui-7.0.4" + sources."wrap-ansi-7.0.0" ]; }) sources."yargs-parser-20.2.4" @@ -84746,18 +84551,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."collection-visit-1.0.0" @@ -84782,19 +84576,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -84819,6 +84602,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."fsevents-1.2.13" + sources."function-bind-1.1.2" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -84832,6 +84616,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."http-auth-3.1.3" (sources."http-errors-2.0.0" // { dependencies = [ @@ -84840,11 +84625,11 @@ in }) sources."http-parser-js-0.5.8" sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -84877,13 +84662,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -84937,19 +84716,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -84970,18 +84738,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-1.5.0" @@ -85076,32 +84833,21 @@ in sources."blob-0.0.5" sources."body-parser-1.20.2" sources."braces-1.8.5" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."caseless-0.12.0" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."isobject-3.0.1" - sources."kind-of-5.1.0" ]; }) sources."collection-visit-1.0.0" @@ -85122,6 +84868,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" + sources."define-data-property-1.1.1" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -85180,23 +84927,24 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fsevents-1.2.13" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.5.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" ]; }) sources."has-cors-1.1.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."has-value-1.0.0" // { @@ -85214,6 +84962,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."html-entities-1.4.0" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -85222,23 +84971,11 @@ in sources."inherits-2.0.4" sources."innertext-1.0.3" sources."ipaddr.js-1.9.1" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -85302,16 +85039,10 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -85338,7 +85069,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -85375,21 +85106,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -85421,6 +85138,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -85432,18 +85150,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -85480,22 +85187,11 @@ in sources."source-map-url-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -85623,13 +85319,14 @@ in }; dependencies = [ sources."@types/commander-2.12.2" - sources."@types/diff-3.5.6" + sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.8.1" + sources."@types/node-20.9.0" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" sources."luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" + sources."undici-types-5.26.5" ]; buildInputs = globalBuildInputs; meta = { @@ -85702,7 +85399,7 @@ in sha512 = "zave+vI4AMeLp0FlUllAwGbNytSKsS3R2Zgtf3ufVT892Z/L6Ro9osZwE9PNA7s0IkJ4onnuHqatpsaCiAShJw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."boolbase-1.0.0" sources."chalk-5.3.0" sources."cheerio-1.0.0-rc.12" @@ -85732,7 +85429,7 @@ in sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."safer-buffer-2.1.2" sources."sax-1.3.0" ]; @@ -85865,7 +85562,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" @@ -85886,9 +85583,9 @@ in sources."ajv-6.12.6" ]; }) - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" + sources."hasown-2.0.0" sources."http-signature-1.2.0" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" @@ -85896,7 +85593,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" @@ -85965,7 +85662,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readable-stream-2.3.8" sources."readline-1.3.0" @@ -85974,7 +85671,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -85988,7 +85685,7 @@ in sources."slice-ansi-0.0.4" sources."sparkles-1.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -86223,24 +85920,27 @@ in sources."argparse-1.0.10" sources."asap-2.0.6" sources."asynckit-0.4.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."cookiejar-2.1.4" sources."debug-4.3.4" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" sources."formidable-2.1.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" + sources."gopd-1.0.1" sources."graphlib-2.1.8" - sources."has-1.0.3" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."hexoid-1.0.0" sources."inherits-2.0.4" sources."js-yaml-3.14.1" @@ -86257,14 +85957,15 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."side-channel-1.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" @@ -86293,11 +85994,11 @@ in sha512 = "H46Jl2bh/LAFJsitv2MiIK3oCxvQnEK9t3efNMUUkKzsTYlLIikVxGWVk/vJnHzvxoHYBIRB/KHwPAOm+9UStg=="; }; dependencies = [ - sources."@colors/colors-1.5.0" + sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.8.0" - sources."@types/triple-beam-1.3.3" - sources."async-3.2.4" + sources."@types/triple-beam-1.3.5" + sources."async-3.2.5" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -86310,7 +86011,7 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.5.1" + sources."logform-2.6.0" sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" @@ -86325,7 +86026,7 @@ in sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" sources."winston-3.3.3" - sources."winston-transport-4.5.0" + sources."winston-transport-4.6.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -86363,97 +86064,62 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "9.4.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz"; - sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" + sources."@npmcli/agent-2.2.0" sources."@npmcli/fs-3.1.0" - sources."@tootallnate/once-2.0.0" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" + sources."abbrev-2.0.0" + sources."agent-base-7.1.0" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) + sources."brace-expansion-2.0.1" + sources."cacache-18.0.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."debug-4.3.4" // { + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."ms-2.1.2" + sources."which-2.0.2" ]; }) - sources."delegates-1.0.0" + sources."debug-4.3.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."exponential-backoff-3.1.1" sources."foreground-child-3.1.1" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."fs.realpath-1.0.0" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."glob-7.2.3" + sources."fs-minipass-3.0.3" + sources."glob-10.3.10" sources."graceful-fs-4.2.11" - sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.2" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."ip-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" sources."jackspeak-2.3.6" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" + sources."lru-cache-10.0.1" + sources."make-fetch-happen-13.0.0" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-fetch-3.0.4" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -86475,41 +86141,27 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.3" + sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."nopt-6.0.0" - sources."npmlog-6.0.2" - sources."once-1.4.0" + sources."nopt-7.2.0" sources."p-map-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) + sources."path-scurry-1.10.1" + sources."proc-log-3.0.0" sources."promise-retry-2.0.1" - sources."readable-stream-3.6.2" sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) - sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."socks-proxy-agent-8.0.2" + sources."ssri-10.0.5" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -86517,7 +86169,6 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string_decoder-1.3.0" (sources."strip-ansi-7.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -86531,17 +86182,14 @@ in sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" ]; }) sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."util-deprecate-1.0.2" - sources."which-2.0.2" - (sources."wide-align-1.1.5" // { + (sources."which-4.0.0" // { dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."isexe-3.1.1" ]; }) sources."wrap-ansi-8.1.0" @@ -86553,7 +86201,6 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -86682,7 +86329,7 @@ in sha512 = "khGc+Fh8YeuDR2KZ7lCTEvAhbRDiXpmMSfvX6eKxt7TER+WVG0U8TdXyiFq6K+3ELnJz54vITJJ3DZ5hYzijoQ=="; }; dependencies = [ - sources."@babel/runtime-7.23.1" + sources."@babel/runtime-7.23.2" sources."@mapbox/node-pre-gyp-1.0.11" sources."@node-red/editor-api-3.1.0" sources."@node-red/editor-client-3.1.0" @@ -86698,7 +86345,7 @@ in sources."@node-red/util-3.1.0" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."acorn-8.8.2" @@ -86743,12 +86390,12 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."call-bind-1.0.2" + sources."cacheable-request-10.2.14" + sources."call-bind-1.0.5" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-2.0.0" @@ -86782,6 +86429,7 @@ in ]; }) sources."defer-to-connect-2.0.1" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-2.1.0" @@ -86827,7 +86475,7 @@ in sources."fresh-0.5.2" (sources."fs-extra-11.1.1" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -86837,18 +86485,20 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-6.0.1" sources."glob-7.2.3" + sources."gopd-1.0.1" sources."got-12.6.0" sources."graceful-fs-4.2.11" - sources."has-1.0.3" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" + sources."hasown-2.0.0" (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.2" @@ -86882,10 +86532,10 @@ in sources."jsonata-1.8.6" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-3.0.0" @@ -86962,7 +86612,7 @@ in }) sources."oauth2orize-1.11.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -86982,7 +86632,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" @@ -87020,6 +86670,7 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" @@ -87136,21 +86787,21 @@ in }) sources."fs.extra-1.3.2" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -87213,7 +86864,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" (sources."readable-stream-2.3.8" // { dependencies = [ @@ -87221,7 +86872,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" @@ -87234,8 +86885,8 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."sshpk-1.17.0" + sources."spdx-license-ids-3.0.16" + sources."sshpk-1.18.0" sources."ssri-5.3.0" sources."string-width-1.0.2" (sources."string_decoder-1.1.1" // { @@ -87370,7 +87021,7 @@ in sources."path-exists-4.0.0" ]; }) - sources."@ljharb/through-2.3.9" + sources."@ljharb/through-2.3.11" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -87385,13 +87036,13 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.1" - sources."@types/normalize-package-data-2.4.2" - sources."@types/responselike-1.0.1" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/responselike-1.0.3" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.748" + sources."all-package-names-2.0.773" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -87425,11 +87076,12 @@ in sources."get-stream-5.2.0" ]; }) + sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."camelcase-7.0.1" sources."chalk-5.3.0" sources."chardet-0.7.0" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."clean-stack-4.2.0" sources."cli-boxes-3.0.0" sources."cli-cursor-3.1.0" @@ -87479,6 +87131,7 @@ in sources."default-browser-id-3.0.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" + sources."define-data-property-1.1.1" sources."define-lazy-prop-3.0.0" sources."del-7.1.0" sources."dir-glob-3.0.1" @@ -87497,7 +87150,7 @@ in sources."execa-7.2.0" sources."exit-hook-3.2.0" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-5.0.0" sources."fill-range-7.0.1" @@ -87508,23 +87161,28 @@ in }) sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-stream-6.0.1" sources."github-url-from-git-1.5.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."global-dirs-3.0.1" sources."globby-13.2.2" + sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.11" - sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" sources."has-yarn-3.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-6.1.1" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" @@ -87550,7 +87208,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-9.2.11" + sources."inquirer-9.2.12" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -87582,7 +87240,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-docker-3.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -87623,7 +87281,7 @@ in sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."latest-version-7.0.0" sources."lines-and-columns-1.2.4" (sources."listr-0.14.3" // { @@ -87717,7 +87375,7 @@ in ]; }) sources."normalize-url-6.1.0" - sources."npm-name-7.1.0" + sources."npm-name-7.1.1" (sources."npm-run-path-5.1.0" // { dependencies = [ sources."path-key-4.0.0" @@ -87771,7 +87429,7 @@ in sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" + sources."cacheable-request-10.2.14" sources."got-12.6.1" sources."http2-wrapper-2.2.0" sources."lowercase-keys-3.0.0" @@ -87876,6 +87534,7 @@ in ]; }) sources."semver-diff-4.0.0" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -87884,7 +87543,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -87915,6 +87574,7 @@ in sources."types-json-1.2.2" sources."types-pkg-json-1.2.1" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."unique-string-3.0.0" sources."untildify-4.0.0" sources."update-notifier-6.0.2" @@ -87958,10 +87618,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.1.0"; + version = "10.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.1.0.tgz"; - sha512 = "pZ2xybXzNGbJFZEKNbPoEXsE38Xou9VTnxxBk+B3pz0ndsGCs7iWHoUCPSsISU2hjmkWfDkJo3bYKE8RDOg4eg=="; + url = "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz"; + sha512 = "GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -88030,10 +87690,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.18.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.18.1.tgz"; - sha512 = "wV1QPgoafC9JvO48eEZtN99GApuaYCwvsbcAZudHM0MAw2DbKFy0ThIeXLI5VjW+bdInoNd/8RqncCwZSZVSCg=="; + url = "https://registry.npmjs.org/orval/-/orval-6.20.0.tgz"; + sha512 = "hBH0oRgV3Opwd0kOZa3An0+bPESlclzLqLA37jCGky4yNCwG3DTvhgGRqCgB0De6hBoOlOcRs/jh919LfaALIA=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -88041,30 +87701,48 @@ in sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-4.3.1" - sources."@esbuild/android-arm-0.15.18" - sources."@esbuild/linux-loong64-0.15.18" + sources."@esbuild/android-arm-0.19.5" + sources."@esbuild/android-arm64-0.19.5" + sources."@esbuild/android-x64-0.19.5" + sources."@esbuild/darwin-arm64-0.19.5" + sources."@esbuild/darwin-x64-0.19.5" + sources."@esbuild/freebsd-arm64-0.19.5" + sources."@esbuild/freebsd-x64-0.19.5" + sources."@esbuild/linux-arm-0.19.5" + sources."@esbuild/linux-arm64-0.19.5" + sources."@esbuild/linux-ia32-0.19.5" + sources."@esbuild/linux-loong64-0.19.5" + sources."@esbuild/linux-mips64el-0.19.5" + sources."@esbuild/linux-ppc64-0.19.5" + sources."@esbuild/linux-riscv64-0.19.5" + sources."@esbuild/linux-s390x-0.19.5" + sources."@esbuild/linux-x64-0.19.5" + sources."@esbuild/netbsd-x64-0.19.5" + sources."@esbuild/openbsd-x64-0.19.5" + sources."@esbuild/sunos-x64-0.19.5" + sources."@esbuild/win32-arm64-0.19.5" + sources."@esbuild/win32-ia32-0.19.5" + sources."@esbuild/win32-x64-0.19.5" sources."@exodus/schemasafe-1.3.0" - sources."@ibm-cloud/openapi-ruleset-0.45.5" - sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" + sources."@ibm-cloud/openapi-ruleset-1.14.2" + sources."@ibm-cloud/openapi-ruleset-utilities-1.3.0" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" sources."@jsep-plugin/ternary-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.18.1" - sources."@orval/axios-6.18.1" - sources."@orval/core-6.18.1" - sources."@orval/msw-6.18.1" - sources."@orval/query-6.18.1" - sources."@orval/swr-6.18.1" - sources."@orval/zod-6.18.1" - sources."@rollup/plugin-commonjs-22.0.2" - (sources."@rollup/pluginutils-3.1.0" // { + sources."@orval/angular-6.20.0" + sources."@orval/axios-6.20.0" + (sources."@orval/core-6.20.0" // { dependencies = [ - sources."estree-walker-1.0.1" + sources."fs-extra-11.1.1" ]; }) + sources."@orval/msw-6.20.0" + sources."@orval/query-6.20.0" + sources."@orval/swr-6.20.0" + sources."@orval/zod-6.20.0" sources."@stoplight/better-ajv-errors-1.0.3" sources."@stoplight/json-3.21.0" (sources."@stoplight/json-ref-readers-1.2.2" // { @@ -88075,24 +87753,17 @@ in sources."@stoplight/json-ref-resolver-3.1.6" sources."@stoplight/ordered-object-literal-1.0.4" sources."@stoplight/path-1.3.2" - (sources."@stoplight/spectral-cli-6.11.0" // { - dependencies = [ - sources."fast-glob-3.2.12" - ]; - }) (sources."@stoplight/spectral-core-1.18.3" // { dependencies = [ sources."@stoplight/types-13.6.0" + sources."minimatch-3.1.2" ]; }) - sources."@stoplight/spectral-formats-1.5.0" - sources."@stoplight/spectral-formatters-1.3.0" + sources."@stoplight/spectral-formats-1.6.0" sources."@stoplight/spectral-functions-1.7.2" sources."@stoplight/spectral-parsers-1.0.3" sources."@stoplight/spectral-ref-resolver-1.0.4" - sources."@stoplight/spectral-ruleset-bundler-1.5.2" - sources."@stoplight/spectral-ruleset-migrator-1.9.5" - sources."@stoplight/spectral-rulesets-1.17.0" + sources."@stoplight/spectral-rulesets-1.18.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ sources."@stoplight/types-12.5.0" @@ -88101,14 +87772,12 @@ in sources."@stoplight/types-13.20.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" - sources."@types/es-aggregate-error-1.0.3" - sources."@types/estree-0.0.39" - sources."@types/json-schema-7.0.13" - sources."@types/node-20.8.1" - sources."@types/sarif-2.1.5" - sources."@types/urijs-1.19.20" + sources."@types/es-aggregate-error-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" + sources."@types/urijs-1.19.23" sources."abort-controller-3.0.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."ajv-8.12.0" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" @@ -88121,135 +87790,82 @@ in sources."array-buffer-byte-length-1.0.0" sources."array-union-2.1.0" sources."arraybuffer.prototype.slice-1.0.2" - sources."as-table-1.0.55" - sources."ast-types-0.14.2" sources."astring-1.8.6" sources."available-typed-arrays-1.0.5" - sources."backslash-0.2.0" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."builtins-1.0.3" sources."cac-6.7.14" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" - sources."cliui-7.0.4" - sources."clone-1.0.4" + sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."commondir-1.0.1" sources."compare-versions-6.1.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."cuid-2.1.8" - sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" - sources."deepmerge-2.2.1" - sources."defaults-1.0.4" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."dependency-graph-0.11.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."enquirer-2.4.1" - sources."es-abstract-1.22.2" + sources."es-abstract-1.22.3" sources."es-aggregate-error-1.0.11" - sources."es-set-tostringtag-2.0.1" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" - sources."esbuild-0.15.18" - sources."esbuild-android-64-0.15.18" - sources."esbuild-android-arm64-0.15.18" - sources."esbuild-darwin-64-0.15.18" - sources."esbuild-darwin-arm64-0.15.18" - sources."esbuild-freebsd-64-0.15.18" - sources."esbuild-freebsd-arm64-0.15.18" - sources."esbuild-linux-32-0.15.18" - sources."esbuild-linux-64-0.15.18" - sources."esbuild-linux-arm-0.15.18" - sources."esbuild-linux-arm64-0.15.18" - sources."esbuild-linux-mips64le-0.15.18" - sources."esbuild-linux-ppc64le-0.15.18" - sources."esbuild-linux-riscv64-0.15.18" - sources."esbuild-linux-s390x-0.15.18" - sources."esbuild-netbsd-64-0.15.18" - sources."esbuild-openbsd-64-0.15.18" - sources."esbuild-sunos-64-0.15.18" - sources."esbuild-windows-32-0.15.18" - sources."esbuild-windows-64-0.15.18" - sources."esbuild-windows-arm64-0.15.18" + sources."esbuild-0.19.5" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" - (sources."find-up-5.0.0" // { - dependencies = [ - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - }) + sources."find-up-5.0.0" sources."for-each-0.3.3" - sources."format-util-1.0.5" sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-source-2.0.12" + sources."get-intrinsic-1.2.2" sources."get-stream-6.0.1" sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" sources."globby-11.1.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."hpagent-1.2.0" + sources."hasown-2.0.0" sources."http2-client-1.3.5" sources."human-signals-2.1.0" - (sources."ibm-openapi-validator-0.97.5" // { - dependencies = [ - sources."find-up-3.0.0" - ]; - }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" sources."immer-9.0.21" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -88257,7 +87873,6 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" - sources."is-reference-1.2.1" sources."is-regex-1.1.4" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" @@ -88269,20 +87884,13 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."jsep-1.3.8" - sources."json-dup-key-validator-1.0.3" - (sources."json-schema-ref-parser-5.1.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" sources."jsonfile-6.1.0" sources."jsonpath-plus-7.1.0" sources."jsonpointer-5.0.1" - sources."jsonschema-1.4.1" sources."leven-3.1.0" - sources."locate-path-3.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."lodash.isempty-4.4.0" @@ -88292,13 +87900,17 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."magic-string-0.25.9" - sources."matcher-1.1.1" + sources."loglevel-1.8.1" + sources."loglevel-plugin-prefix-0.8.4" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" + (sources."minimatch-6.2.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + ]; + }) sources."ms-2.1.2" (sources."nimma-0.2.2" // { dependencies = [ @@ -88308,7 +87920,6 @@ in sources."node-fetch-2.7.0" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" - sources."node-sarif-builder-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."oas-kit-common-1.0.8" @@ -88316,48 +87927,37 @@ in sources."oas-resolver-2.5.6" sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" - sources."once-1.4.0" sources."onetime-5.1.2" - sources."ono-4.0.11" sources."openapi-types-12.1.3" (sources."openapi3-ts-3.2.0" // { dependencies = [ - sources."yaml-2.3.2" + sources."yaml-2.3.4" ]; }) - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pad-2.3.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pony-cause-1.1.1" - sources."printable-characters-1.0.42" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" sources."regexp.prototype.flags-1.5.1" - sources."require-all-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."reserved-0.1.2" - sources."resolve-1.22.6" sources."reusify-1.0.4" - sources."rollup-2.79.1" sources."run-parallel-1.2.0" sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.2" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -88371,10 +87971,7 @@ in sources."signal-exit-3.0.7" sources."simple-eval-1.0.0" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."stacktracey-2.1.8" sources."string-argv-0.3.2" sources."string-width-4.2.3" sources."string.prototype.trim-1.2.8" @@ -88383,9 +87980,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" sources."swagger2openapi-7.0.8" - sources."text-table-0.2.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tsconfck-2.1.2" @@ -88396,24 +87991,21 @@ in sources."typed-array-length-1.0.4" sources."typescript-5.2.2" sources."unbox-primitive-1.0.2" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.10.0" - sources."validate-npm-package-name-3.0.0" sources."validator-13.11.0" - sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yaml-1.10.2" - sources."yaml-js-0.2.3" - sources."yargs-17.3.1" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yocto-queue-0.1.0" ]; @@ -88430,10 +88022,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.9.3"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.9.3.tgz"; - sha512 = "2GTVocFkwblV/TIg9AmT7TI2fO4xdWkyN8aFUEVtiVNWt96GTR3FgQyHFValfCbcj1k9Xf962Ws2hYXYUr9k1Q=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.10.2.tgz"; + sha512 = "wRvsK9v12Nt2/EIjLp/uvxd3UeRSN9DRoSofDn21Ot+rEw4e98ODvbdSHi6dYr82s4oo6mF823ACmOp1hXd4wg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -88452,87 +88044,86 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@lezer/common-1.1.0" - sources."@lezer/lr-1.3.12" - sources."@lmdb/lmdb-darwin-arm64-2.7.11" - sources."@lmdb/lmdb-darwin-x64-2.7.11" - sources."@lmdb/lmdb-linux-arm-2.7.11" - sources."@lmdb/lmdb-linux-arm64-2.7.11" - sources."@lmdb/lmdb-linux-x64-2.7.11" - sources."@lmdb/lmdb-win32-x64-2.7.11" + sources."@lezer/lr-1.3.14" + sources."@lmdb/lmdb-darwin-arm64-2.8.5" + sources."@lmdb/lmdb-darwin-x64-2.8.5" + sources."@lmdb/lmdb-linux-arm-2.8.5" + sources."@lmdb/lmdb-linux-arm64-2.8.5" + sources."@lmdb/lmdb-linux-x64-2.8.5" + sources."@lmdb/lmdb-win32-x64-2.8.5" sources."@mischnic/json-sourcemap-0.1.1" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-3.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-3.0.2" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-3.0.2" - sources."@parcel/bundler-default-2.9.3" - sources."@parcel/cache-2.9.3" - sources."@parcel/codeframe-2.9.3" - sources."@parcel/compressor-raw-2.9.3" - sources."@parcel/config-default-2.9.3" - sources."@parcel/core-2.9.3" - sources."@parcel/diagnostic-2.9.3" - sources."@parcel/events-2.9.3" - sources."@parcel/fs-2.9.3" - sources."@parcel/fs-search-2.9.3" - sources."@parcel/graph-2.9.3" - sources."@parcel/hash-2.9.3" - sources."@parcel/logger-2.9.3" - sources."@parcel/markdown-ansi-2.9.3" - sources."@parcel/namer-default-2.9.3" - sources."@parcel/node-resolver-core-3.0.3" - sources."@parcel/optimizer-css-2.9.3" - sources."@parcel/optimizer-htmlnano-2.9.3" - sources."@parcel/optimizer-image-2.9.3" - sources."@parcel/optimizer-svgo-2.9.3" - sources."@parcel/optimizer-swc-2.9.3" - sources."@parcel/package-manager-2.9.3" - sources."@parcel/packager-css-2.9.3" - sources."@parcel/packager-html-2.9.3" - sources."@parcel/packager-js-2.9.3" - sources."@parcel/packager-raw-2.9.3" - sources."@parcel/packager-svg-2.9.3" - sources."@parcel/plugin-2.9.3" - sources."@parcel/profiler-2.9.3" - sources."@parcel/reporter-cli-2.9.3" - sources."@parcel/reporter-dev-server-2.9.3" - sources."@parcel/reporter-tracer-2.9.3" - sources."@parcel/resolver-default-2.9.3" - sources."@parcel/runtime-browser-hmr-2.9.3" - sources."@parcel/runtime-js-2.9.3" - sources."@parcel/runtime-react-refresh-2.9.3" - sources."@parcel/runtime-service-worker-2.9.3" - sources."@parcel/source-map-2.1.1" - sources."@parcel/transformer-babel-2.9.3" - sources."@parcel/transformer-css-2.9.3" - (sources."@parcel/transformer-html-2.9.3" // { + sources."@parcel/bundler-default-2.10.2" + sources."@parcel/cache-2.10.2" + sources."@parcel/codeframe-2.10.2" + sources."@parcel/compressor-raw-2.10.2" + sources."@parcel/config-default-2.10.2" + sources."@parcel/core-2.10.2" + sources."@parcel/diagnostic-2.10.2" + sources."@parcel/events-2.10.2" + sources."@parcel/fs-2.10.2" + sources."@parcel/graph-3.0.2" + sources."@parcel/logger-2.10.2" + sources."@parcel/markdown-ansi-2.10.2" + sources."@parcel/namer-default-2.10.2" + sources."@parcel/node-resolver-core-3.1.2" + sources."@parcel/optimizer-css-2.10.2" + sources."@parcel/optimizer-htmlnano-2.10.2" + sources."@parcel/optimizer-image-2.10.2" + sources."@parcel/optimizer-svgo-2.10.2" + sources."@parcel/optimizer-swc-2.10.2" + sources."@parcel/package-manager-2.10.2" + sources."@parcel/packager-css-2.10.2" + sources."@parcel/packager-html-2.10.2" + sources."@parcel/packager-js-2.10.2" + sources."@parcel/packager-raw-2.10.2" + sources."@parcel/packager-svg-2.10.2" + sources."@parcel/packager-wasm-2.10.2" + sources."@parcel/plugin-2.10.2" + sources."@parcel/profiler-2.10.2" + sources."@parcel/reporter-cli-2.10.2" + sources."@parcel/reporter-dev-server-2.10.2" + sources."@parcel/reporter-tracer-2.10.2" + sources."@parcel/resolver-default-2.10.2" + sources."@parcel/runtime-browser-hmr-2.10.2" + sources."@parcel/runtime-js-2.10.2" + sources."@parcel/runtime-react-refresh-2.10.2" + sources."@parcel/runtime-service-worker-2.10.2" + sources."@parcel/rust-2.10.2" + (sources."@parcel/source-map-2.1.1" // { + dependencies = [ + sources."detect-libc-1.0.3" + ]; + }) + sources."@parcel/transformer-babel-2.10.2" + sources."@parcel/transformer-css-2.10.2" + (sources."@parcel/transformer-html-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.9.3" - sources."@parcel/transformer-js-2.9.3" - sources."@parcel/transformer-json-2.9.3" - sources."@parcel/transformer-postcss-2.9.3" - (sources."@parcel/transformer-posthtml-2.9.3" // { + sources."@parcel/transformer-image-2.10.2" + sources."@parcel/transformer-js-2.10.2" + sources."@parcel/transformer-json-2.10.2" + sources."@parcel/transformer-postcss-2.10.2" + (sources."@parcel/transformer-posthtml-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.9.3" - sources."@parcel/transformer-react-refresh-wrap-2.9.3" - (sources."@parcel/transformer-svg-2.9.3" // { + sources."@parcel/transformer-raw-2.10.2" + sources."@parcel/transformer-react-refresh-wrap-2.10.2" + (sources."@parcel/transformer-svg-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.9.3" - sources."@parcel/utils-2.9.3" + sources."@parcel/types-2.10.2" + sources."@parcel/utils-2.10.2" (sources."@parcel/watcher-2.3.0" // { dependencies = [ + sources."detect-libc-1.0.3" sources."node-addon-api-7.0.0" ]; }) @@ -88548,15 +88139,15 @@ in sources."@parcel/watcher-win32-arm64-2.3.0" sources."@parcel/watcher-win32-ia32-2.3.0" sources."@parcel/watcher-win32-x64-2.3.0" - sources."@parcel/workers-2.9.3" - sources."@swc/core-1.3.91" + sources."@parcel/workers-2.10.2" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.10.0" + sources."acorn-8.11.2" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -88584,7 +88175,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -88625,7 +88216,7 @@ in sources."data-urls-1.1.0" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.2" sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domexception-1.0.1" @@ -88634,7 +88225,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -88655,15 +88246,15 @@ in sources."get-port-4.2.0" sources."getpass-0.1.7" sources."glob-8.1.0" - sources."globals-13.22.0" + sources."globals-13.23.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - (sources."htmlnano-2.0.4" // { + (sources."htmlnano-2.1.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) (sources."htmlparser2-7.2.0" // { @@ -88708,19 +88299,14 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - sources."lightningcss-1.22.0" - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" + (sources."lightningcss-1.22.1" // { + dependencies = [ + sources."detect-libc-1.0.3" + ]; + }) sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" - sources."lmdb-2.7.11" + sources."lmdb-2.8.5" sources."lodash-4.17.21" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -88731,15 +88317,10 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.5" - (sources."msgpackr-extract-3.0.2" // { - dependencies = [ - sources."node-gyp-build-optional-packages-5.0.7" - ]; - }) - sources."nanoid-3.3.6" - sources."node-addon-api-4.3.0" - sources."node-gyp-build-optional-packages-5.0.6" + sources."msgpackr-1.9.9" + sources."nanoid-3.3.7" + sources."node-addon-api-6.1.0" + sources."node-gyp-build-optional-packages-5.1.1" sources."node-releases-2.0.13" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" @@ -88786,7 +88367,7 @@ in sources."postcss-selector-parser-6.0.13" (sources."postcss-svgo-6.0.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) sources."postcss-unique-selectors-6.0.0" @@ -88796,7 +88377,7 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" (sources."purgecss-5.0.0" // { dependencies = [ sources."commander-9.5.0" @@ -88819,7 +88400,7 @@ in sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" sources."srcset-4.0.0" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stable-0.1.8" sources."stealthy-require-1.1.1" sources."stylehacks-6.0.0" @@ -88838,7 +88419,7 @@ in }) sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.20.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -88883,7 +88464,6 @@ in sources."ws-6.2.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" - sources."xxhash-wasm-0.4.2" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -88940,7 +88520,7 @@ in sources."bunyan-syslog-udp-0.2.0" sources."busboy-1.6.0" sources."bytes-3.0.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."clarinet-0.11.0" @@ -88966,7 +88546,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -89003,12 +88583,12 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gc-stats-1.4.0" sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."getpass-0.1.7" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -89016,11 +88596,11 @@ in sources."handlebars-4.7.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" sources."hot-shots-6.8.7" @@ -89069,7 +88649,7 @@ in sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."on-finished-2.4.1" @@ -89091,7 +88671,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -89135,12 +88715,13 @@ in ]; }) sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."simplediff-0.1.1" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-2.0.1" sources."streamsearch-1.1.0" sources."string-width-3.1.0" @@ -89208,7 +88789,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chalk-4.1.2" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" @@ -89248,11 +88829,11 @@ in sources."supports-color-7.2.0" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" ]; buildInputs = globalBuildInputs; meta = { @@ -89316,7 +88897,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" @@ -89341,9 +88922,9 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.1.1" + sources."deep-equal-1.1.2" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."dns-equal-1.0.0" sources."dns-packet-1.3.4" @@ -89363,21 +88944,21 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stdin-4.0.1" sources."glob-7.2.3" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" sources."http-headers-3.0.2" @@ -89405,7 +88986,7 @@ in sources."ipaddr.js-2.1.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -89501,7 +89082,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.5.1" sources."repeating-2.0.1" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -89514,6 +89095,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.2" sources."server-destroy-1.0.1" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -89530,7 +89112,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -89645,9 +89227,9 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -89689,6 +89271,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -89734,23 +89317,25 @@ in sources."fs-chunk-store-1.7.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."getpass-0.1.7" sources."glob-7.2.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" ]; }) sources."has-cors-1.1.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."hat-0.0.3" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -89825,7 +89410,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -89855,7 +89440,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -89886,6 +89471,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."simple-concat-1.0.1" @@ -89926,7 +89512,7 @@ in ]; }) sources."speedometer-0.1.4" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-2.0.1" (sources."string2compact-1.3.2" // { dependencies = [ @@ -89993,16 +89579,16 @@ in src = ../../tools/networking/pgrok/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@alloc/quick-lru-5.2.0" sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/generator-7.23.3" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."semver-6.3.1" ]; }) @@ -90017,51 +89603,54 @@ in sources."@babel/helper-environment-visitor-7.22.20" (sources."@babel/helper-function-name-7.23.0" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-hoist-variables-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-module-imports-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" (sources."@babel/helper-simple-access-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-split-export-declaration-7.22.6" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - (sources."@babel/helpers-7.23.1" // { + (sources."@babel/helpers-7.23.2" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" (sources."@babel/template-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" + ]; + }) + (sources."@babel/traverse-7.23.2" // { + dependencies = [ + sources."@babel/generator-7.23.3" + sources."@babel/types-7.23.3" ]; }) - sources."@babel/traverse-7.17.3" sources."@babel/types-7.17.0" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ @@ -90091,48 +89680,48 @@ in sources."@esbuild/win32-ia32-0.18.20" sources."@esbuild/win32-x64-0.18.20" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.9.1" - (sources."@eslint/eslintrc-2.1.2" // { + sources."@eslint-community/regexpp-4.10.0" + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ - sources."globals-13.22.0" + sources."globals-13.23.0" ]; }) sources."@eslint/js-8.44.0" sources."@headlessui/react-1.7.17" sources."@heroicons/react-2.0.18" - sources."@humanwhocodes/config-array-0.11.11" + sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" + sources."@humanwhocodes/object-schema-2.0.1" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@remix-run/router-1.8.0" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tailwindcss/forms-0.5.6" - sources."@trivago/prettier-plugin-sort-imports-4.2.0" + sources."@trivago/prettier-plugin-sort-imports-4.2.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/json-schema-7.0.13" + sources."@types/json-schema-7.0.15" sources."@types/json5-0.0.29" sources."@types/node-20.5.9" - sources."@types/normalize-package-data-2.4.2" - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/react-dom-18.2.8" - sources."@types/scheduler-0.16.4" - sources."@types/semver-7.5.3" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/react-dom-18.2.15" + sources."@types/scheduler-0.16.6" + sources."@types/semver-7.5.5" sources."@typescript-eslint/eslint-plugin-6.0.0" sources."@typescript-eslint/parser-6.0.0" sources."@typescript-eslint/scope-manager-6.0.0" @@ -90142,15 +89731,15 @@ in sources."@typescript-eslint/utils-6.0.0" sources."@typescript-eslint/visitor-keys-6.0.0" sources."@vitejs/plugin-react-4.0.4" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-3.3.4" - sources."@vue/compiler-ssr-3.3.4" - sources."@vue/reactivity-transform-3.3.4" - sources."@vue/shared-3.3.4" - sources."acorn-8.10.0" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" - sources."acorn-walk-8.2.0" + sources."acorn-walk-8.3.0" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -90179,13 +89768,13 @@ in sources."browserslist-4.22.1" sources."buffer-from-1.1.2" sources."builtin-modules-3.3.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chokidar-3.5.3" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."clean-regexp-1.0.0" sources."client-only-0.0.1" (sources."code-inspector-core-0.1.9" // { @@ -90221,7 +89810,7 @@ in sources."csstype-3.1.2" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."detect-libc-1.0.3" @@ -90230,13 +89819,13 @@ in sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.2" + sources."es-abstract-1.22.3" sources."es-iterator-helpers-1.0.15" - sources."es-set-tostringtag-2.0.1" - sources."es-shim-unscopables-1.0.0" + sources."es-set-tostringtag-2.0.2" + sources."es-shim-unscopables-1.0.2" sources."es-to-primitive-1.2.1" sources."esbuild-0.18.20" sources."escalade-3.1.1" @@ -90251,7 +89840,7 @@ in sources."eslint-scope-7.2.2" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.22.0" + sources."globals-13.23.0" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; @@ -90277,12 +89866,12 @@ in dependencies = [ sources."doctrine-2.1.0" sources."estraverse-5.3.0" - sources."resolve-2.0.0-next.4" + sources."resolve-2.0.0-next.5" sources."semver-6.3.1" ]; }) sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-plugin-react-refresh-0.4.3" + sources."eslint-plugin-react-refresh-0.4.4" (sources."eslint-plugin-unicorn-48.0.1" // { dependencies = [ sources."jsesc-3.0.2" @@ -90305,26 +89894,26 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."form-data-4.0.0" - sources."fraction.js-4.3.6" + sources."fraction.js-4.3.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -90335,13 +89924,14 @@ in sources."graceful-fs-4.2.11" sources."grapheme-splitter-1.0.4" sources."graphemer-1.4.0" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -90352,7 +89942,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" sources."is-async-function-2.0.0" @@ -90361,7 +89951,7 @@ in sources."is-boolean-object-1.1.2" sources."is-builtin-module-3.2.1" sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-finalizationregistry-1.0.2" @@ -90386,7 +89976,7 @@ in sources."isexe-2.0.0" sources."iterator.prototype-1.1.2" sources."javascript-natural-sort-0.7.1" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -90396,23 +89986,14 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.2.3" sources."jsx-ast-utils-3.3.5" - sources."keyv-4.5.3" + sources."keyv-4.5.4" (sources."less-4.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."levn-0.4.1" - sources."lightningcss-1.22.0" - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" + sources."lightningcss-1.22.1" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" @@ -90420,7 +90001,7 @@ in sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" - sources."magic-string-0.30.4" + sources."magic-string-0.30.5" (sources."make-dir-2.1.0" // { dependencies = [ sources."pify-4.0.1" @@ -90440,7 +90021,7 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" (sources."needle-3.2.0" // { @@ -90458,7 +90039,7 @@ in sources."normalize-range-0.1.2" sources."object-assign-4.1.1" sources."object-hash-3.0.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."object.entries-1.1.7" @@ -90501,7 +90082,7 @@ in sources."prop-types-15.8.1" sources."proxy-from-env-1.1.0" sources."prr-1.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."react-18.2.0" sources."react-dom-18.2.0" @@ -90533,7 +90114,7 @@ in sources."jsesc-0.5.0" ]; }) - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -90542,10 +90123,11 @@ in sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" - sources."sass-1.68.0" + sources."sass-1.69.5" sources."sax-1.3.0" sources."scheduler-0.23.0" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -90561,7 +90143,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."string.prototype.matchall-4.0.10" sources."string.prototype.trim-1.2.8" sources."string.prototype.trimend-1.0.7" @@ -90570,9 +90152,8 @@ in sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-3.1.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -90584,12 +90165,12 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.3.3" // { + (sources."tailwindcss-3.3.5" // { dependencies = [ sources."glob-parent-6.0.2" ]; }) - (sources."terser-5.20.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -90625,17 +90206,17 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."validate-npm-package-license-3.0.4" - sources."vite-4.4.9" + sources."vite-4.4.11" sources."vite-code-inspector-plugin-0.1.9" sources."webpack-code-inspector-plugin-0.1.9" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-builtin-type-1.1.3" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; @@ -90646,174 +90227,6 @@ in bypassCache = true; reconstructLock = true; }; - pkg = nodeEnv.buildNodePackage { - name = "pkg"; - packageName = "pkg"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz"; - sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA=="; - }; - dependencies = [ - sources."@babel/generator-7.18.2" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/parser-7.18.4" - sources."@babel/types-7.19.0" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."array-union-2.1.0" - sources."at-least-node-1.0.0" - sources."base64-js-1.5.1" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."chalk-4.1.2" - sources."chownr-1.1.4" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."core-util-is-1.0.3" - sources."debug-4.3.4" - sources."decompress-response-6.0.0" - sources."deep-extend-0.6.0" - sources."detect-libc-2.0.2" - sources."dir-glob-3.0.1" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" - sources."expand-template-2.0.3" - sources."fast-glob-3.3.1" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."from2-2.3.0" - sources."fs-constants-1.0.0" - sources."fs-extra-9.1.0" - sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" - sources."github-from-package-0.0.0" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."growly-1.3.0" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."into-stream-6.0.0" - sources."is-core-module-2.9.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."jsesc-2.5.2" - sources."jsonfile-6.1.0" - sources."lru-cache-6.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-response-3.1.0" - sources."minimist-1.2.8" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - (sources."multistream-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."napi-build-utils-1.0.2" - sources."node-abi-3.47.0" - sources."node-fetch-2.7.0" - sources."node-notifier-10.0.1" - sources."once-1.4.0" - sources."p-is-promise-3.0.0" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pkg-fetch-3.4.2" - sources."prebuild-install-7.1.1" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."pump-3.0.0" - sources."queue-microtask-1.2.3" - sources."rc-1.2.8" - sources."readable-stream-2.3.8" - sources."require-directory-2.1.1" - (sources."resolve-1.22.6" // { - dependencies = [ - sources."is-core-module-2.13.0" - ]; - }) - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."shellwords-0.1.1" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."slash-3.0.0" - sources."stream-meter-1.0.4" - sources."string-width-4.2.3" - sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."tunnel-agent-0.6.0" - sources."universalify-2.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Package your Node.js project into an executable"; - homepage = "https://github.com/vercel/pkg#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; @@ -90866,7 +90279,7 @@ in ]; }) sources."ast-types-0.13.4" - sources."async-3.2.4" + sources."async-3.2.5" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.2" @@ -90881,7 +90294,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."chalk-3.0.0" sources."charm-0.1.2" sources."chokidar-3.5.3" @@ -90912,15 +90325,15 @@ in sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-uri-6.0.2" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."http-proxy-agent-7.0.0" sources."https-proxy-agent-7.0.2" sources."iconv-lite-0.4.24" @@ -90929,7 +90342,7 @@ in sources."ini-1.3.8" sources."ip-1.1.8" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -90981,7 +90394,7 @@ in sources."read-1.0.7" sources."readdirp-3.6.0" sources."require-in-the-middle-5.2.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."run-series-1.1.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -91005,7 +90418,7 @@ in sources."sprintf-js-1.1.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.9" + sources."systeminformation-5.21.16" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" sources."tv4-1.3.0" @@ -91036,10 +90449,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "8.8.0"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.8.0.tgz"; - sha512 = "eY5rMiZpzmPI2oVr1irR97bzb036oKwCWvK91wDQndXcqUPlytPtrF0bO668Syw/uA+7hTf5NnM8Mr4ux4BRRA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-8.10.2.tgz"; + sha512 = "B4IJPVumx62UYggbwe8HdQFqS0EJ7KHh/tzqbxEBQ69fUJk9s2xCfU+oxivjkgoyJNsS2nGdJGyhndnxgEjDPA=="; }; buildInputs = globalBuildInputs; meta = { @@ -91088,7 +90501,7 @@ in sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."picocolors-1.0.0" sources."source-map-js-1.0.2" ]; @@ -91118,18 +90531,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.1" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" @@ -91146,7 +90559,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs-extra-11.1.1" @@ -91171,7 +90584,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" @@ -91196,11 +90609,12 @@ in sources."ts-node-10.9.1" sources."tslib-2.6.2" sources."typescript-5.2.2" - sources."universalify-2.0.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yn-3.1.1" @@ -91243,7 +90657,7 @@ in sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.47.0" + sources."node-abi-3.51.0" sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" @@ -91322,13 +90736,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "5.3.1"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-5.3.1.tgz"; - sha512 = "Wp2msQIlMPHe+5k5Od6xnsI/WNG7UJGgFUJgqv/ygc7kOECZapcSz/iU4NIEzISs3H1W9sFLjAPbg/gOqqtB7A=="; + url = "https://registry.npmjs.org/prisma/-/prisma-5.5.2.tgz"; + sha512 = "WQtG6fevOL053yoPl6dbHV+IWgKo25IRN4/pwAGqcWmg7CrtoCzvbDbN9fXUc7QS2KK0LimHIqLsaCOX/vHl8w=="; }; dependencies = [ - sources."@prisma/engines-5.3.1" + sources."@prisma/engines-5.5.2" ]; buildInputs = globalBuildInputs; meta = { @@ -91343,47 +90757,47 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "5.3.1"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.3.1.tgz"; - sha512 = "6ceoPN03gG1JBoZK0ufrmYLLS6g6JbBzpbDewwPc6FI+w3cPAnLmMRfmwqSl6Uy3lUMPzx2iqAHX2mlQovC9Mg=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.5.2.tgz"; + sha512 = "NHGwk2mwXJbQG03U3dUXJXVXRwDqSPnRlUP4ywbD/gQpbw05T/hxa4lBNv0tnI3ge1oPMnS4eLKuZiFwta6nrQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - (sources."@babel/core-7.23.0" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."convert-source-map-2.0.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@prisma/prisma-schema-wasm-5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59" - sources."@types/js-levenshtein-1.1.1" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@prisma/prisma-schema-wasm-5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a" + sources."@types/js-levenshtein-1.1.2" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -91395,7 +90809,7 @@ in sources."browserslist-4.22.1" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -91408,7 +90822,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -91437,7 +90851,7 @@ in sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" + sources."istanbul-lib-coverage-3.2.2" sources."istanbul-lib-hook-3.0.0" sources."istanbul-lib-instrument-4.0.3" sources."istanbul-lib-processinfo-2.0.3" @@ -91506,7 +90920,7 @@ in sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.8" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.3" sources."which-2.0.2" sources."which-module-2.0.1" @@ -91671,7 +91085,7 @@ in ]; }) sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { + (sources."browserify-sign-4.2.2" // { dependencies = [ sources."readable-stream-3.6.2" ]; @@ -91683,7 +91097,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.1.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."cipher-base-1.0.4" sources."colors-1.4.0" sources."combine-source-map-0.8.0" @@ -91706,7 +91120,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."defined-1.0.1" sources."deps-sort-2.0.1" @@ -91729,10 +91143,10 @@ in sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" (sources."glob-7.2.3" // { dependencies = [ sources."minimatch-3.1.2" @@ -91745,8 +91159,8 @@ in }) sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-1.0.4" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."hash-base-3.1.0" // { @@ -91755,6 +91169,7 @@ in ]; }) sources."hash.js-1.1.7" + sources."hasown-2.0.0" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -91768,7 +91183,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -91802,7 +91217,7 @@ in }) sources."mute-stream-0.0.8" sources."node-static-0.7.11" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."once-1.4.0" @@ -91841,12 +91256,13 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" + sources."set-function-length-1.1.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" @@ -91907,10 +91323,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.17.2"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.17.2.tgz"; - sha512 = "HGl62LzelDrfJBmtuUdxAFuEbvt/geEtL/Bzpl/vpJitmYXfbDgOf245wn8rX6h4YgC2AzfVt4wWW+5aNGIsuw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.17.3.tgz"; + sha512 = "d/1bf7YTtOu7l1Vw5ST++VlS6F27BFVHEz4v5yfVoANlNrknOprWqdztNG95AENn+7KAutTuo07lRR9jGLCEgg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -91995,14 +91411,11 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.329"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.329.tgz"; - sha512 = "5AT98Mi0OYcDiQ5lD1nPJ3cq8gX/HHaXrQ5WjJ/QZkaJtGqnEdrUp5Gq5wBPipWgOnv/l5e50YScaaNDMjoy9Q=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; - dependencies = [ - sources."fsevents-2.3.3" - ]; buildInputs = globalBuildInputs; meta = { description = "Type checker for the Python language"; @@ -92022,9 +91435,9 @@ in sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; }; dependencies = [ - sources."@types/prop-types-15.7.8" - sources."@types/react-18.2.24" - sources."@types/scheduler-0.16.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -92054,16 +91467,16 @@ in sources."escape-string-regexp-1.0.5" sources."figures-3.2.0" sources."find-up-2.1.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."indent-string-3.2.0" sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -92118,7 +91531,7 @@ in sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" sources."redent-2.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.2" @@ -92127,7 +91540,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -92161,10 +91574,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.6.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.6.1.tgz"; - sha512 = "1CW0auaXNPmwmvQ7TwpszwVxMi2Xr5cTS3J3EBC/HHgbPF32Dn7aiu/LKWDOGjMbaDwKQiGmfqcoGQ74HUHCMw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.2.tgz"; + sha512 = "G5dhsr/2wormdrYPtZBfRamvnPrHc/8TtYVH3EpIzfMyKSiTprFwn61nFZbcmeK4iKKdLq2MMiiMNqlRmkBU4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -92245,14 +91658,11 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.29.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; - sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.3.0.tgz"; + sha512 = "scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg=="; }; - dependencies = [ - sources."fsevents-2.3.3" - ]; buildInputs = globalBuildInputs; meta = { description = "Next-generation ES module bundler"; @@ -92266,46 +91676,56 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1607"; + version = "0.3.1697"; src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.9.1" - (sources."@eslint/eslintrc-2.1.2" // { + sources."@eslint-community/regexpp-4.10.0" + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" + sources."strip-json-comments-3.1.1" ]; }) - sources."@eslint/js-8.50.0" - sources."@hpcc-js/wasm-2.13.1" - (sources."@humanwhocodes/config-array-0.11.11" // { + sources."@eslint/js-8.53.0" + sources."@hpcc-js/wasm-2.14.1" + (sources."@humanwhocodes/config-array-0.11.13" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" + sources."@humanwhocodes/object-schema-2.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" - sources."@types/json-schema-7.0.13" + sources."@tsconfig/strictest-2.0.2" + sources."@types/json-schema-7.0.15" sources."@types/node-16.11.68" - sources."@types/semver-7.5.3" - sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.62.0" - sources."@typescript-eslint/parser-5.62.0" - sources."@typescript-eslint/scope-manager-5.62.0" - sources."@typescript-eslint/type-utils-5.62.0" - sources."@typescript-eslint/types-5.62.0" - sources."@typescript-eslint/typescript-estree-5.62.0" - sources."@typescript-eslint/utils-5.62.0" - sources."@typescript-eslint/visitor-keys-5.62.0" - sources."@vscode/test-electron-2.3.4" - sources."acorn-8.10.0" + sources."@types/semver-7.5.5" + sources."@types/vscode-1.75.1" + sources."@typescript-eslint/eslint-plugin-6.10.0" + sources."@typescript-eslint/parser-6.10.0" + sources."@typescript-eslint/scope-manager-6.10.0" + sources."@typescript-eslint/type-utils-6.10.0" + sources."@typescript-eslint/types-6.10.0" + sources."@typescript-eslint/typescript-estree-6.10.0" + sources."@typescript-eslint/utils-6.10.0" + sources."@typescript-eslint/visitor-keys-6.10.0" + sources."@ungap/structured-clone-1.2.0" + sources."@vscode/test-electron-2.3.6" + (sources."@vscode/vsce-2.22.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."commander-6.2.1" + sources."minimatch-3.1.2" + ]; + }) + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -92327,9 +91747,15 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."chalk-4.1.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chownr-1.1.4" @@ -92340,7 +91766,6 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" - sources."cross-env-7.0.3" sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" @@ -92360,7 +91785,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - sources."d3-graphviz-5.1.0" + sources."d3-graphviz-5.2.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -92380,6 +91805,7 @@ in sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" + sources."define-data-property-1.1.1" sources."delaunator-5.0.0" sources."detect-libc-2.0.2" sources."dir-glob-3.0.1" @@ -92392,35 +91818,29 @@ in sources."end-of-stream-1.4.4" sources."entities-4.5.0" sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - (sources."eslint-8.50.0" // { + sources."escape-string-regexp-1.0.5" + (sources."eslint-8.53.0" // { dependencies = [ sources."brace-expansion-1.1.11" - sources."eslint-scope-7.2.2" - sources."estraverse-5.3.0" + sources."chalk-4.1.2" + sources."escape-string-regexp-4.0.0" sources."glob-parent-6.0.2" + sources."has-flag-4.0.0" sources."minimatch-3.1.2" + sources."supports-color-7.2.0" ]; }) sources."eslint-config-prettier-8.10.0" - sources."eslint-scope-5.1.1" + sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" - (sources."esquery-1.5.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" + sources."esquery-1.5.0" + sources."esrecurse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -92428,14 +91848,14 @@ in sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."follow-redirects-1.15.3" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { dependencies = [ @@ -92444,13 +91864,15 @@ in ]; }) sources."glob-parent-5.1.2" - sources."globals-13.22.0" + sources."globals-13.23.0" sources."globby-11.1.0" + sources."gopd-1.0.1" sources."graphemer-1.4.0" - sources."has-1.0.3" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."hosted-git-info-4.1.0" sources."htmlparser2-8.0.2" sources."http-proxy-agent-4.0.1" @@ -92477,9 +91899,10 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" + sources."jsonc-parser-3.2.0" sources."jszip-3.10.1" sources."keytar-7.9.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."leven-3.1.0" sources."levn-0.4.1" sources."lie-3.3.0" @@ -92504,14 +91927,13 @@ in sources."mute-stream-0.0.8" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."natural-compare-lite-1.4.0" - sources."node-abi-3.47.0" + sources."node-abi-3.51.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."once-1.4.0" sources."optionator-0.9.3" - (sources."ovsx-0.5.2" // { + (sources."ovsx-0.8.3" // { dependencies = [ sources."commander-6.2.1" ]; @@ -92535,17 +91957,13 @@ in sources."picomatch-2.3.1" sources."prebuild-install-7.1.1" sources."prelude-ls-1.2.1" - sources."prettier-2.8.8" + sources."prettier-3.0.3" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."queue-microtask-1.2.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."strip-json-comments-2.0.1" - ]; - }) + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.8" sources."require-directory-2.1.1" @@ -92559,6 +91977,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.3.0" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -92569,8 +91988,8 @@ in sources."string-width-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ @@ -92580,38 +91999,19 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" + sources."ts-api-utils-1.0.3" sources."tslib-2.6.2" - (sources."tsutils-3.21.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.11" - sources."typescript-4.9.5" + sources."typescript-5.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" - (sources."vsce-2.15.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."brace-expansion-1.1.11" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-6.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."minimatch-3.1.2" - sources."semver-5.7.2" - sources."supports-color-5.5.0" - ]; - }) sources."vscode-jsonrpc-8.1.0" sources."vscode-languageclient-8.1.0" sources."vscode-languageserver-protocol-3.17.3" @@ -92619,7 +92019,7 @@ in sources."which-2.0.2" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."xml2js-0.4.23" + sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -92639,10 +92039,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.68.0"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; - sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -92773,7 +92173,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" @@ -92826,10 +92226,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.35.2"; + version = "3.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.35.2.tgz"; - sha512 = "1RZ4eHl2OaGG2Rzw0l0ZD3byCk2JMCL9/+btzGQGQruuQWu9HwRZGJI7l4A2ghW3Mu6DVwLYLfceNpmEWBZoag=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.36.0.tgz"; + sha512 = "VY7UzP4u1/yuTNpF2Wssrru16qhhReLCjgL2oeHCvhujxPyTFv9TQGSlLhaT0ZUCXhRBphwVwITTRopo6NSUgA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -92863,32 +92263,33 @@ in sources."tslib-1.14.1" ]; }) - (sources."@aws-sdk/client-cloudformation-3.423.0" // { + (sources."@aws-sdk/client-cloudformation-3.445.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/client-sso-3.423.0" - sources."@aws-sdk/client-sts-3.423.0" - sources."@aws-sdk/credential-provider-env-3.418.0" - sources."@aws-sdk/credential-provider-ini-3.423.0" - sources."@aws-sdk/credential-provider-node-3.423.0" - sources."@aws-sdk/credential-provider-process-3.418.0" - sources."@aws-sdk/credential-provider-sso-3.423.0" - sources."@aws-sdk/credential-provider-web-identity-3.418.0" - sources."@aws-sdk/middleware-host-header-3.418.0" - sources."@aws-sdk/middleware-logger-3.418.0" - sources."@aws-sdk/middleware-recursion-detection-3.418.0" - sources."@aws-sdk/middleware-sdk-sts-3.418.0" - sources."@aws-sdk/middleware-signing-3.418.0" - sources."@aws-sdk/middleware-user-agent-3.418.0" - sources."@aws-sdk/region-config-resolver-3.418.0" - sources."@aws-sdk/token-providers-3.418.0" - sources."@aws-sdk/types-3.418.0" - sources."@aws-sdk/util-endpoints-3.418.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" + sources."@aws-sdk/credential-provider-env-3.433.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" + sources."@aws-sdk/credential-provider-process-3.433.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" + sources."@aws-sdk/credential-provider-web-identity-3.433.0" + sources."@aws-sdk/middleware-host-header-3.433.0" + sources."@aws-sdk/middleware-logger-3.433.0" + sources."@aws-sdk/middleware-recursion-detection-3.433.0" + sources."@aws-sdk/middleware-sdk-sts-3.433.0" + sources."@aws-sdk/middleware-signing-3.433.0" + sources."@aws-sdk/middleware-user-agent-3.438.0" + sources."@aws-sdk/region-config-resolver-3.433.0" + sources."@aws-sdk/token-providers-3.438.0" + sources."@aws-sdk/types-3.433.0" + sources."@aws-sdk/util-endpoints-3.438.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.418.0" - sources."@aws-sdk/util-user-agent-node-3.418.0" + sources."@aws-sdk/util-user-agent-browser-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@httptoolkit/websocket-stream-6.0.1" sources."@kwsites/file-exists-1.1.1" @@ -92896,7 +92297,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@serverless/dashboard-plugin-7.0.5" // { + (sources."@serverless/dashboard-plugin-7.1.0" // { dependencies = [ sources."child-process-ext-3.0.2" sources."fs-extra-9.1.0" @@ -92919,58 +92320,59 @@ in ]; }) sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-2.0.10" - sources."@smithy/config-resolver-2.0.11" - sources."@smithy/credential-provider-imds-2.0.13" - sources."@smithy/eventstream-codec-2.0.10" - sources."@smithy/fetch-http-handler-2.2.0" - sources."@smithy/hash-node-2.0.10" - sources."@smithy/invalid-dependency-2.0.10" + sources."@smithy/abort-controller-2.0.12" + sources."@smithy/config-resolver-2.0.16" + sources."@smithy/credential-provider-imds-2.0.18" + sources."@smithy/eventstream-codec-2.0.12" + sources."@smithy/fetch-http-handler-2.2.4" + sources."@smithy/hash-node-2.0.12" + sources."@smithy/invalid-dependency-2.0.12" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/middleware-content-length-2.0.12" - sources."@smithy/middleware-endpoint-2.0.10" - (sources."@smithy/middleware-retry-2.0.13" // { + sources."@smithy/middleware-content-length-2.0.14" + sources."@smithy/middleware-endpoint-2.1.3" + (sources."@smithy/middleware-retry-2.0.18" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@smithy/middleware-serde-2.0.10" - sources."@smithy/middleware-stack-2.0.4" - sources."@smithy/node-config-provider-2.0.13" - sources."@smithy/node-http-handler-2.1.6" - sources."@smithy/property-provider-2.0.11" - sources."@smithy/protocol-http-3.0.6" - sources."@smithy/querystring-builder-2.0.10" - sources."@smithy/querystring-parser-2.0.10" - sources."@smithy/service-error-classification-2.0.3" - sources."@smithy/shared-ini-file-loader-2.0.12" - sources."@smithy/signature-v4-2.0.10" - sources."@smithy/smithy-client-2.1.8" - sources."@smithy/types-2.3.4" - sources."@smithy/url-parser-2.0.10" + sources."@smithy/middleware-serde-2.0.12" + sources."@smithy/middleware-stack-2.0.6" + sources."@smithy/node-config-provider-2.1.3" + sources."@smithy/node-http-handler-2.1.8" + sources."@smithy/property-provider-2.0.13" + sources."@smithy/protocol-http-3.0.8" + sources."@smithy/querystring-builder-2.0.12" + sources."@smithy/querystring-parser-2.0.12" + sources."@smithy/service-error-classification-2.0.5" + sources."@smithy/shared-ini-file-loader-2.2.2" + sources."@smithy/signature-v4-2.0.12" + sources."@smithy/smithy-client-2.1.12" + sources."@smithy/types-2.4.0" + sources."@smithy/url-parser-2.0.12" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.12" - sources."@smithy/util-defaults-mode-node-2.0.14" + sources."@smithy/util-defaults-mode-browser-2.0.16" + sources."@smithy/util-defaults-mode-node-2.0.21" + sources."@smithy/util-endpoints-1.0.2" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.3" - sources."@smithy/util-retry-2.0.3" - sources."@smithy/util-stream-2.0.13" + sources."@smithy/util-middleware-2.0.5" + sources."@smithy/util-retry-2.0.5" + sources."@smithy/util-stream-2.0.17" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" - sources."@smithy/util-waiter-2.0.10" + sources."@smithy/util-waiter-2.0.12" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.199" - sources."@types/node-20.8.1" - sources."@types/responselike-1.0.1" - sources."@types/ws-8.5.6" + sources."@types/lodash-4.14.201" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."abort-controller-3.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -92994,12 +92396,12 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asap-2.0.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.0" - (sources."aws-sdk-2.1468.0" // { + sources."aws-crt-1.19.0" + (sources."aws-sdk-2.1492.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93007,7 +92409,7 @@ in sources."uuid-8.0.0" ]; }) - sources."axios-0.24.0" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -93027,7 +92429,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."builtin-modules-3.3.0" sources."builtins-1.0.3" sources."cacheable-lookup-5.0.4" @@ -93037,7 +92439,7 @@ in ]; }) sources."cachedir-2.4.0" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" @@ -93057,7 +92459,7 @@ in }) sources."chokidar-3.5.3" sources."chownr-2.0.0" - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.2" @@ -93097,7 +92499,7 @@ in ]; }) sources."cross-spawn-7.0.3" - sources."crypto-js-4.1.1" + sources."crypto-js-4.2.0" (sources."d-1.0.1" // { dependencies = [ sources."type-1.2.0" @@ -93145,6 +92547,7 @@ in sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."deferred-0.7.11" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" @@ -93177,7 +92580,7 @@ in sources."ext-name-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-safe-stringify-2.1.1" sources."fast-xml-parser-4.2.5" sources."fastest-levenshtein-1.0.16" @@ -93187,7 +92590,7 @@ in sources."file-type-16.5.4" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-10.0.12" + sources."filesize-10.1.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -93205,8 +92608,8 @@ in sources."fs.realpath-1.0.0" sources."fs2-0.3.9" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" sources."glob-7.2.3" @@ -93216,11 +92619,12 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."graphlib-2.1.8" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.2" @@ -93286,7 +92690,7 @@ in sources."jsonfile-6.1.0" sources."jszip-3.10.1" sources."jwt-decode-2.2.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."lazystream-1.0.1" sources."leven-2.1.0" sources."lie-3.3.0" @@ -93344,7 +92748,7 @@ in sources."number-allocator-1.0.14" sources."object-assign-4.1.1" sources."object-hash-3.0.0" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.2" @@ -93370,8 +92774,9 @@ in sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" @@ -93409,6 +92814,7 @@ in sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -93474,8 +92880,9 @@ in sources."buffer-5.7.1" ]; }) + sources."undici-types-5.26.5" sources."uni-global-1.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."untildify-4.0.0" sources."uri-js-4.4.1" (sources."url-0.10.3" // { @@ -93493,7 +92900,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" sources."write-file-atomic-4.0.2" @@ -93551,7 +92958,7 @@ in sources."blob-0.0.2" sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."cheerio-0.17.0" @@ -93567,6 +92974,7 @@ in sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -93609,17 +93017,19 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."from-0.1.7" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" + sources."gopd-1.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" (sources."htmlparser2-3.7.3" // { dependencies = [ sources."domutils-1.5.1" @@ -93660,7 +93070,7 @@ in sources."negotiator-0.6.3" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parsejson-0.0.1" @@ -93672,7 +93082,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -93691,6 +93101,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."side-channel-1.0.4" sources."slate-irc-0.7.3" @@ -93722,7 +93133,7 @@ in ]; }) sources."split-1.0.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-2.0.1" sources."stream-combiner-0.2.2" sources."string_decoder-0.10.31" @@ -93771,10 +93182,10 @@ in sha512 = "fKmMA8q5OyeZpFCxBa3FuFywQcziQXKBw9B8jwDJ/Ra3H/pkZpQJl9g5s3MIjUo2jwUDHUnaxXgVXObXFdiJBw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."cli-table-0.3.11" sources."colors-1.0.3" - sources."commander-11.0.0" + sources."commander-11.1.0" sources."picomatch-2.3.1" sources."readdirp-3.6.0" ]; @@ -93884,7 +93295,7 @@ in dependencies = [ sources."assert-plus-1.0.0" sources."dashdash-1.14.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" ]; }) sources."json-schema-0.2.2" @@ -93952,15 +93363,15 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.14" - sources."@types/node-20.8.1" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."base64id-2.0.0" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.4" - sources."engine.io-6.5.2" + sources."engine.io-6.5.4" sources."engine.io-parser-5.2.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -93970,6 +93381,7 @@ in sources."object-assign-4.1.1" sources."socket.io-adapter-2.5.2" sources."socket.io-parser-4.2.4" + sources."undici-types-5.26.5" sources."utf-8-validate-5.0.10" sources."vary-1.1.2" sources."ws-8.11.0" @@ -94014,8 +93426,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."agent-base-4.3.0" sources."ansi-escapes-5.0.0" sources."ansi-regex-6.0.1" @@ -94049,10 +93461,10 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."find-up-5.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-4.1.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-3.0.1" @@ -94060,7 +93472,7 @@ in sources."indent-string-5.0.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-2.0.0" sources."is-plain-obj-1.1.0" @@ -94113,7 +93525,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -94159,10 +93571,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "13.0.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-13.0.0.tgz"; - sha512 = "V21cVvge4rhn9Fa7K/fTKcmPM+x1yee6Vhq8ZwgaWh3VPBqApgsaoFB5kLAhiqRo5AmSaRyLU7LIdgnNwH01/w=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-13.0.4.tgz"; + sha512 = "6pns27iQ5yT8jmle4cqvpfXNl29/AGOT4KtmzhtI2zgH1J0RbpZdduqTRzem7UCta+gvrj4HC1O9l6mTSUHoRg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -94214,26 +93626,26 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - sources."@babel/core-7.23.0" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -94243,24 +93655,24 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/estree-1.0.2" - sources."@types/node-20.8.1" - sources."@types/pug-2.0.7" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" sources."arg-4.1.3" @@ -94276,9 +93688,9 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -94295,33 +93707,36 @@ in sources."css-tree-2.3.1" sources."debug-4.3.4" sources."decode-uri-component-0.2.2" + sources."define-data-property-1.1.1" sources."dequal-2.0.3" sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-3.0.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" sources."immutable-4.3.4" @@ -94329,7 +93744,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" (sources."is-expression-4.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -94368,7 +93783,7 @@ in sources."mkdirp-0.5.6" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -94404,7 +93819,7 @@ in sources."pug-walk-2.0.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" @@ -94412,9 +93827,10 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.68.0" + sources."sass-1.69.5" sources."sax-1.3.0" sources."semver-6.3.1" + sources."set-function-length-1.1.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -94432,9 +93848,9 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-4.2.1" // { + (sources."svelte-4.2.2" // { dependencies = [ - sources."magic-string-0.30.4" + sources."magic-string-0.30.5" ]; }) sources."svelte-preprocess-5.0.4" @@ -94444,13 +93860,14 @@ in sources."ts-node-10.9.1" sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -94466,34 +93883,34 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.19"; + version = "0.15.20"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.19.tgz"; - sha512 = "Ge31qUlrLcnYJErDUWqjYDhwUyXxDLN8+2efApqNcV7UZQtBLOZ8Hm+NYYl/MJxjwsKT3eKEe13HJBwB5kciJA=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.20.tgz"; + sha512 = "xO/aL+Afsq/CFbXAMCqtc6lagap9OGmxF7aivjvfBAWbnT0ha+8ZnzxuUPqzVxVeInOEmFdwbfCa5h2QWLh6Jg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" - sources."@babel/core-7.23.0" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -94506,29 +93923,29 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.1" - sources."@types/pug-2.0.7" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ sources."vscode-uri-2.1.2" ]; }) sources."@vscode/l10n-0.0.16" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" sources."arg-4.1.3" @@ -94542,8 +93959,8 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001542" + sources."call-bind-1.0.5" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -94559,40 +93976,43 @@ in sources."debug-4.3.4" sources."decode-uri-component-0.2.2" sources."dedent-js-1.0.1" + sources."define-data-property-1.1.1" sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.579" sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" sources."immutable-4.3.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" (sources."is-expression-4.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -94630,7 +94050,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -94668,15 +94088,16 @@ in sources."pug-walk-2.0.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.68.0" + sources."sass-1.69.5" sources."sax-1.3.0" sources."semver-6.3.1" + sources."set-function-length-1.1.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -94696,19 +94117,20 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.59.2" sources."svelte-preprocess-5.0.4" - sources."svelte2tsx-0.6.22" + sources."svelte2tsx-0.6.23" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" - (sources."vscode-css-languageservice-6.2.9" // { + (sources."vscode-css-languageservice-6.2.10" // { dependencies = [ - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" ]; }) (sources."vscode-html-languageservice-5.0.7" // { @@ -94722,11 +94144,11 @@ in sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -94742,10 +94164,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; dependencies = [ sources."@trysound/sax-0.2.0" @@ -94773,7 +94195,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = "https://svgo.dev"; license = "MIT"; }; production = true; @@ -94783,10 +94205,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz"; - sha512 = "A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz"; + sha512 = "5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -94799,18 +94221,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.1" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -94831,7 +94253,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -94840,18 +94262,18 @@ in sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."glob-7.1.6" sources."glob-parent-6.0.2" - sources."has-1.0.3" + sources."hasown-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -94859,7 +94281,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -94880,7 +94302,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -94897,10 +94319,11 @@ in }) sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -94989,33 +94412,33 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.3.3.tgz"; - sha512 = "1LhJTNBFVNYtl4C6IJXt1XwAJANvquyDuP4NrhcG+1DwT3S7kiUR9vLo5yo046X83VT7ownzS97Q/yC6A7bZXg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.4.0.tgz"; + sha512 = "Op3Tt6J7yOJY8hbYkU6Pakw2tb37SlyS1F/KAVNSKHSeW9Kp/GF+9O6HDmdaM8dhGldy2vVBhxm9/nlXTU1p0w=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@azu/format-text-1.0.2" sources."@azu/style-format-1.0.1" - sources."@textlint/ast-node-types-13.3.3" - sources."@textlint/ast-tester-13.3.3" - sources."@textlint/ast-traverse-13.3.3" - sources."@textlint/config-loader-13.3.3" - sources."@textlint/feature-flag-13.3.3" - sources."@textlint/fixer-formatter-13.3.3" - sources."@textlint/kernel-13.3.3" - sources."@textlint/linter-formatter-13.3.3" - sources."@textlint/markdown-to-ast-13.3.3" - sources."@textlint/module-interop-13.3.3" - sources."@textlint/source-code-fixer-13.3.3" - sources."@textlint/text-to-ast-13.3.3" - sources."@textlint/textlint-plugin-markdown-13.3.3" - sources."@textlint/textlint-plugin-text-13.3.3" - sources."@textlint/types-13.3.3" - sources."@textlint/utils-13.3.3" - sources."@types/mdast-3.0.13" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@textlint/ast-tester-13.4.0" + sources."@textlint/ast-traverse-13.4.0" + sources."@textlint/config-loader-13.4.0" + sources."@textlint/feature-flag-13.4.0" + sources."@textlint/fixer-formatter-13.4.0" + sources."@textlint/kernel-13.4.0" + sources."@textlint/linter-formatter-13.4.0" + sources."@textlint/markdown-to-ast-13.4.0" + sources."@textlint/module-interop-13.4.0" + sources."@textlint/source-code-fixer-13.4.0" + sources."@textlint/text-to-ast-13.4.0" + sources."@textlint/textlint-plugin-markdown-13.4.0" + sources."@textlint/textlint-plugin-text-13.4.0" + sources."@textlint/types-13.4.0" + sources."@textlint/utils-13.4.0" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -95053,12 +94476,12 @@ in sources."flatted-2.0.2" sources."format-0.2.2" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -95066,7 +94489,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -95124,14 +94547,14 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-to-glob-pattern-1.0.2" + sources."path-to-glob-pattern-2.0.1" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" (sources."rc-config-loader-4.1.3" // { dependencies = [ sources."argparse-2.0.1" @@ -95155,14 +94578,14 @@ in sources."remark-parse-9.0.0" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."rimraf-2.6.3" sources."semver-5.7.2" sources."slice-ansi-4.0.0" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -95230,20 +94653,21 @@ in sha512 = "GcAtxXttLsZfN75tSCo3V8/RTlglvhnn7McNTgI0uS4ADr67RoD64bSVIs4p/nY3sMNsf1taPjKnhZIQLuVjZg=="; }; dependencies = [ - sources."call-bind-1.0.2" - sources."define-data-property-1.1.0" + sources."call-bind-1.0.5" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."gopd-1.0.1" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.5.1" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" ]; buildInputs = globalBuildInputs; @@ -95259,390 +94683,542 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-3.0.0.tgz"; - sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-4.0.0.tgz"; + sha512 = "WdDWGMuwqvj2HzFi7qZ/kyMFEH0wu7FlwXItZZBsH67azzmigMih3X8xxr3Gw5SBqQ4SZoqM/KJErqQ1jSCCBA=="; }; dependencies = [ sources."@babel/code-frame-7.22.13" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-13.3.3" - sources."@types/hast-2.3.6" - sources."@types/minimist-1.2.3" - sources."@types/normalize-package-data-2.4.2" - sources."@types/parse5-5.0.3" - sources."@types/unist-2.0.8" - sources."alex-9.1.1" - sources."ansi-align-3.0.1" + sources."@isaacs/cliui-8.0.2" + sources."@npmcli/config-6.4.0" + (sources."@npmcli/map-workspaces-3.0.4" // { + dependencies = [ + sources."glob-10.3.10" + sources."minimatch-9.0.3" + ]; + }) + sources."@npmcli/name-from-folder-2.0.0" + sources."@pnpm/config.env-replace-1.1.0" + (sources."@pnpm/network.ca-file-1.0.2" // { + dependencies = [ + sources."graceful-fs-4.2.10" + ]; + }) + sources."@pnpm/npm-conf-2.2.2" + sources."@sindresorhus/is-5.6.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/acorn-4.0.6" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-jsx-5.3.2" + sources."alex-11.0.1" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."array-iterate-1.1.4" + sources."array-iterate-2.0.1" sources."arrify-1.0.1" - sources."bail-1.0.5" + sources."bail-2.0.2" sources."balanced-match-1.0.2" sources."boundary-2.0.0" - (sources."boxen-4.2.0" // { + (sources."boxen-7.1.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" + sources."chalk-5.3.0" + sources."type-fest-2.19.0" ]; }) - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.14" + sources."camelcase-7.0.1" + (sources."camelcase-keys-8.0.2" // { dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - sources."pump-3.0.0" + sources."type-fest-2.19.0" ]; }) - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."ccount-1.1.0" + sources."ccount-2.0.1" sources."chalk-2.4.2" - sources."character-entities-1.2.4" - sources."character-entities-html4-1.1.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" - sources."collapse-white-space-1.0.6" + sources."character-entities-2.0.2" + sources."character-entities-html4-2.1.0" + sources."character-entities-legacy-3.0.0" + sources."character-reference-invalid-2.0.1" + sources."ci-info-3.9.0" + sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."comma-separated-tokens-1.0.8" - sources."concat-map-0.0.1" + sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) - sources."configstore-5.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."configstore-6.0.0" sources."core-util-is-1.0.3" - sources."crypto-random-string-2.0.0" - sources."cuss-1.21.0" + sources."cross-spawn-7.0.3" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) + sources."cuss-2.2.0" sources."debug-4.3.4" - sources."decamelize-1.2.0" + sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decompress-response-3.3.0" + sources."decode-named-character-reference-1.0.2" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" + sources."defer-to-connect-2.0.1" + sources."dequal-2.0.3" + sources."diff-5.1.0" + sources."dot-prop-6.0.1" sources."duplexer-0.1.2" - sources."duplexer3-0.1.5" - sources."emoji-regex-8.0.0" + sources."eastasianwidth-0.2.0" + sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."escape-goat-2.1.1" + sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" - sources."fault-1.0.4" - sources."figgy-pudding-3.5.2" - sources."figures-3.2.0" - sources."find-up-4.1.0" + sources."fault-2.0.1" + sources."find-up-6.3.0" + sources."foreground-child-3.1.1" + sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."get-stream-4.1.0" // { - dependencies = [ - sources."pump-3.0.0" - ]; - }) + sources."function-bind-1.1.2" + sources."get-stream-6.0.1" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.2.3" - (sources."global-dirs-2.1.0" // { + sources."glob-8.1.0" + (sources."global-dirs-3.0.1" // { dependencies = [ - sources."ini-1.3.7" + sources."ini-2.0.0" ]; }) - sources."got-9.6.0" + sources."got-12.6.1" sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-yarn-2.1.0" - sources."hast-util-embedded-1.0.6" - sources."hast-util-from-parse5-6.0.1" - sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.5" - sources."hast-util-phrasing-1.0.5" - sources."hast-util-to-nlcst-1.2.8" - sources."hast-util-to-string-1.0.4" - sources."hast-util-whitespace-1.0.4" - sources."hastscript-6.0.0" - sources."hosted-git-info-2.8.9" + sources."has-yarn-3.0.0" + sources."hasown-2.0.0" + sources."hast-util-embedded-2.0.1" + sources."hast-util-from-parse5-7.1.2" + sources."hast-util-has-property-2.0.1" + sources."hast-util-is-body-ok-link-2.0.0" + sources."hast-util-is-element-2.1.3" + sources."hast-util-parse-selector-3.1.1" + sources."hast-util-phrasing-2.0.2" + sources."hast-util-to-nlcst-2.2.0" + sources."hast-util-to-string-2.0.0" + sources."hast-util-whitespace-2.0.1" + sources."hastscript-7.2.0" + sources."hosted-git-info-5.2.1" sources."http-cache-semantics-4.1.1" + (sources."http2-wrapper-2.2.0" // { + dependencies = [ + sources."quick-lru-5.1.1" + ]; + }) sources."ignore-5.2.4" - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" + sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" + sources."indent-string-5.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" - sources."is-alphanumerical-1.0.4" + sources."ini-4.1.1" + sources."is-alphabetical-2.0.1" + sources."is-alphanumerical-2.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-ci-2.0.0" - sources."is-core-module-2.13.0" - sources."is-decimal-1.0.4" + sources."is-ci-3.0.1" + sources."is-core-module-2.13.1" + sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-hexadecimal-1.0.4" - sources."is-installed-globally-0.3.2" - sources."is-npm-4.0.0" + sources."is-hexadecimal-2.0.1" + sources."is-installed-globally-0.4.0" + sources."is-npm-6.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-typedarray-1.0.0" - sources."is-whitespace-character-1.0.4" - sources."is-word-character-1.0.4" - sources."is-yarn-global-0.3.0" + sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-3.1.0" + sources."keyv-4.5.4" sources."kind-of-6.0.3" - sources."latest-version-5.1.0" - (sources."libnpmconfig-1.2.1" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."kleur-4.1.5" + sources."latest-version-7.0.0" sources."limit-spawn-0.0.3" sources."lines-and-columns-1.2.4" - sources."load-plugin-3.0.0" - sources."locate-path-5.0.0" - sources."lodash.difference-4.5.0" - sources."lodash.intersection-4.4.0" - sources."longest-streak-2.0.4" - sources."lowercase-keys-1.0.1" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) + sources."load-plugin-5.1.0" + sources."locate-path-7.2.0" + sources."longest-streak-3.1.0" + sources."lowercase-keys-3.0.0" + sources."lru-cache-7.18.3" sources."map-obj-4.3.0" sources."map-stream-0.1.0" - sources."markdown-escapes-1.0.4" - sources."markdown-table-2.0.0" - sources."mdast-comment-marker-1.1.2" - sources."mdast-util-compact-2.0.1" - sources."mdast-util-to-nlcst-4.0.1" - sources."meow-7.1.1" - sources."mimic-response-1.0.1" + sources."markdown-table-3.0.3" + sources."mdast-comment-marker-2.1.2" + (sources."mdast-util-find-and-replace-2.2.2" // { + dependencies = [ + sources."escape-string-regexp-5.0.0" + ]; + }) + sources."mdast-util-from-markdown-1.3.1" + sources."mdast-util-frontmatter-1.0.1" + sources."mdast-util-gfm-2.0.2" + sources."mdast-util-gfm-autolink-literal-1.0.3" + sources."mdast-util-gfm-footnote-1.0.2" + sources."mdast-util-gfm-strikethrough-1.0.3" + sources."mdast-util-gfm-table-1.0.7" + sources."mdast-util-gfm-task-list-item-1.0.2" + sources."mdast-util-mdx-2.0.1" + sources."mdast-util-mdx-expression-1.3.2" + sources."mdast-util-mdx-jsx-2.1.4" + sources."mdast-util-mdxjs-esm-1.3.1" + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-nlcst-5.2.1" + sources."mdast-util-to-string-3.2.0" + sources."meow-11.0.0" + sources."micromark-3.2.0" + sources."micromark-core-commonmark-1.1.0" + sources."micromark-extension-frontmatter-1.1.1" + sources."micromark-extension-gfm-2.0.3" + sources."micromark-extension-gfm-autolink-literal-1.0.5" + sources."micromark-extension-gfm-footnote-1.1.2" + sources."micromark-extension-gfm-strikethrough-1.0.7" + sources."micromark-extension-gfm-table-1.0.7" + sources."micromark-extension-gfm-tagfilter-1.0.2" + sources."micromark-extension-gfm-task-list-item-1.0.5" + sources."micromark-extension-mdx-expression-1.0.8" + sources."micromark-extension-mdx-jsx-1.0.5" + sources."micromark-extension-mdx-md-1.0.1" + sources."micromark-extension-mdxjs-1.0.1" + sources."micromark-extension-mdxjs-esm-1.0.5" + sources."micromark-factory-destination-1.1.0" + sources."micromark-factory-label-1.1.0" + sources."micromark-factory-mdx-expression-1.0.9" + sources."micromark-factory-space-1.1.0" + sources."micromark-factory-title-1.1.0" + sources."micromark-factory-whitespace-1.1.0" + sources."micromark-util-character-1.2.0" + sources."micromark-util-chunked-1.1.0" + sources."micromark-util-classify-character-1.1.0" + sources."micromark-util-combine-extensions-1.1.0" + sources."micromark-util-decode-numeric-character-reference-1.1.0" + sources."micromark-util-decode-string-1.1.0" + sources."micromark-util-encode-1.1.0" + sources."micromark-util-events-to-acorn-1.2.3" + sources."micromark-util-html-tag-name-1.2.0" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-resolve-all-1.1.0" + sources."micromark-util-sanitize-uri-1.2.0" + sources."micromark-util-subtokenize-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."micromark-util-types-1.1.0" + sources."mimic-response-4.0.0" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."minimist-options-4.1.0" + sources."minipass-7.0.4" + sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.2" - sources."nlcst-normalize-2.1.5" - sources."nlcst-search-2.0.0" - sources."nlcst-to-string-2.0.4" - sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.1" - sources."object-keys-1.1.1" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" + sources."nopt-7.2.0" + sources."normalize-package-data-4.0.1" + sources."normalize-url-8.0.0" + sources."npm-normalize-package-bin-3.0.1" + sources."object-keys-0.4.0" sources."once-1.4.0" - sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { + sources."p-cancelable-3.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."package-json-8.1.1" + (sources."parse-english-5.0.0" // { dependencies = [ - sources."semver-6.3.1" + sources."nlcst-to-string-2.0.4" ]; }) - sources."parse-english-4.2.0" - sources."parse-entities-2.0.0" + sources."parse-entities-4.0.1" sources."parse-json-5.2.0" - sources."parse-latin-4.3.0" + (sources."parse-latin-5.0.1" // { + dependencies = [ + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" + ]; + }) sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" + sources."path-exists-5.0.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."pause-stream-0.0.11" sources."pluralize-8.0.0" - sources."prepend-http-2.0.0" + sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-5.6.0" + sources."property-information-6.4.0" + sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."pupa-2.1.1" - sources."quick-lru-4.0.1" - sources."quotation-1.1.3" - sources."rc-1.2.8" - (sources."read-pkg-5.2.0" // { + sources."pupa-3.1.0" + sources."quick-lru-6.1.2" + sources."quotation-2.0.2" + (sources."rc-1.2.8" // { dependencies = [ - sources."type-fest-0.6.0" + sources."ini-1.3.8" ]; }) - (sources."read-pkg-up-7.0.1" // { + (sources."read-package-json-fast-3.0.2" // { dependencies = [ - sources."type-fest-0.8.1" + sources."json-parse-even-better-errors-3.0.0" + ]; + }) + (sources."read-pkg-7.1.0" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" + sources."type-fest-2.19.0" + ]; + }) + (sources."read-pkg-up-9.1.0" // { + dependencies = [ + sources."type-fest-2.19.0" ]; }) sources."readable-stream-1.0.34" - sources."redent-3.0.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."rehype-parse-7.0.1" - sources."rehype-retext-2.0.4" - sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.7" - sources."remark-message-control-6.0.0" - sources."remark-parse-8.0.3" - sources."remark-retext-4.0.0" - sources."remark-stringify-8.1.1" - sources."repeat-string-1.6.1" - sources."resolve-1.22.6" - sources."resolve-from-5.0.0" - sources."responselike-1.0.2" - sources."retext-english-3.0.4" - sources."retext-equality-5.5.0" - sources."retext-profanities-6.1.0" + sources."redent-4.0.0" + sources."registry-auth-token-5.0.2" + sources."registry-url-6.0.1" + sources."rehype-parse-8.0.5" + sources."rehype-retext-3.0.2" + sources."remark-frontmatter-4.0.1" + sources."remark-gfm-3.0.1" + sources."remark-mdx-2.0.0" + sources."remark-message-control-7.1.1" + sources."remark-parse-10.0.2" + sources."remark-retext-5.0.1" + sources."resolve-alpn-1.2.1" + sources."responselike-3.0.0" + sources."retext-english-4.1.0" + sources."retext-equality-6.6.0" + sources."retext-profanities-7.2.2" + sources."sade-1.8.1" sources."safe-buffer-5.2.1" - sources."semver-5.7.2" - (sources."semver-diff-3.1.1" // { + (sources."semver-7.5.4" // { dependencies = [ - sources."semver-6.3.1" + sources."lru-cache-6.0.0" ]; }) - sources."signal-exit-3.0.7" + sources."semver-diff-4.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" sources."sliced-1.0.1" - sources."space-separated-tokens-1.1.5" + sources."space-separated-tokens-2.0.2" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ sources."bubble-stream-error-0.0.1" - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) - sources."sprintf-js-1.0.3" - sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-4.2.3" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-0.10.31" - sources."stringify-entities-3.1.0" - sources."strip-ansi-6.0.1" - sources."strip-indent-3.0.0" + sources."stringify-entities-4.0.3" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."term-size-2.2.1" - sources."textlint-rule-helper-2.3.0" + (sources."textlint-rule-helper-2.3.0" // { + dependencies = [ + sources."unist-util-is-4.1.0" + sources."unist-util-visit-2.0.3" + sources."unist-util-visit-parents-3.1.1" + ]; + }) sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.0.6" + sources."xtend-4.0.2" ]; }) - sources."to-readable-stream-1.0.0" - sources."to-vfile-6.1.0" - sources."trim-0.0.1" - sources."trim-newlines-3.0.1" - sources."trim-trailing-lines-1.1.4" - sources."trough-1.0.5" - sources."type-fest-0.13.1" + sources."to-vfile-7.2.4" + sources."trim-newlines-4.1.1" + sources."trough-2.1.0" + sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unherit-1.1.3" - (sources."unified-9.2.2" // { + sources."undici-types-5.26.5" + sources."unherit-3.0.1" + (sources."unified-10.1.2" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-4.1.0" ]; }) - sources."unified-diff-3.1.0" - (sources."unified-engine-8.2.0" // { + sources."unified-diff-4.0.1" + (sources."unified-engine-10.1.0" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-4.1.0" + sources."lines-and-columns-2.0.4" + sources."parse-json-6.0.2" ]; }) - sources."unified-message-control-3.0.3" - sources."unique-string-2.0.0" - sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.1.0" - sources."unist-util-modify-children-2.0.0" - sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-2.0.1" - sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-2.0.3" + (sources."unified-message-control-4.0.0" // { + dependencies = [ + sources."unist-util-visit-3.1.0" + sources."unist-util-visit-parents-4.1.1" + ]; + }) + sources."unique-string-3.0.0" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.1" + (sources."unist-util-modify-children-2.0.0" // { + dependencies = [ + sources."array-iterate-1.1.4" + ]; + }) + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-3.1.1" - (sources."update-notifier-4.1.3" // { + sources."unist-util-visit-parents-5.1.3" + (sources."update-notifier-6.0.2" // { + dependencies = [ + sources."chalk-5.3.0" + ]; + }) + sources."util-deprecate-1.0.2" + sources."uvu-0.5.6" + sources."validate-npm-package-license-3.0.4" + sources."vfile-5.3.7" + sources."vfile-find-up-6.1.0" + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" + (sources."vfile-reporter-7.0.5" // { + dependencies = [ + sources."supports-color-9.4.0" + ]; + }) + sources."vfile-sort-3.0.1" + sources."vfile-statistics-2.0.1" + sources."walk-up-path-3.0.1" + sources."web-namespaces-2.0.1" + sources."which-2.0.2" + sources."widest-line-4.0.1" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."url-parse-lax-3.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.1" - sources."vfile-find-up-5.0.1" - sources."vfile-location-3.2.0" - sources."vfile-message-2.0.4" - (sources."vfile-reporter-6.0.2" // { - dependencies = [ - sources."supports-color-6.1.0" - ]; - }) - sources."vfile-sort-2.2.2" - sources."vfile-statistics-1.1.4" - sources."web-namespaces-1.1.4" - sources."widest-line-3.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xtend-4.0.2" - sources."yargs-parser-18.1.3" + (sources."write-file-atomic-3.0.3" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) + sources."xdg-basedir-5.1.0" + sources."xtend-2.1.2" + sources."yallist-4.0.0" + sources."yaml-2.3.4" + sources."yargs-parser-21.1.1" + sources."yocto-queue-1.0.0" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -95710,8 +95286,8 @@ in sha512 = "gZMxUU+/O8QIchBQoo50QryknmMKahb2vBj89wVvk+Dhvp70nAJKSkpt2vjZVYBWCxpIKysQlwheBjrFZWpkfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -95725,7 +95301,7 @@ in sources."parse5-5.1.1" sources."property-information-5.6.0" sources."rehype-parse-6.0.2" - sources."sentence-splitter-4.2.1" + sources."sentence-splitter-4.3.0" sources."space-separated-tokens-1.1.5" sources."structured-source-4.0.0" sources."textlint-util-to-string-3.3.2" @@ -95756,8 +95332,8 @@ in sha512 = "VMht14U0+gxRhEnT3/Rfv7yUDF3YGhsSSODwXGnnicwe54Czs2CYALAZIlWA79R4LLqcYFc9pP1i8DeGWvaHeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -95771,7 +95347,7 @@ in sources."parse5-5.1.1" sources."property-information-5.6.0" sources."rehype-parse-6.0.2" - sources."sentence-splitter-4.2.1" + sources."sentence-splitter-4.3.0" sources."space-separated-tokens-1.1.5" sources."structured-source-4.0.0" sources."textlint-util-to-string-3.3.2" @@ -95803,7 +95379,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - sources."@types/unist-2.0.8" + sources."@types/unist-2.0.10" sources."boundary-1.0.1" sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" @@ -95817,7 +95393,7 @@ in sources."structured-source-3.0.2" (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-13.3.3" + sources."@textlint/ast-node-types-13.4.0" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -95848,7 +95424,7 @@ in }; dependencies = [ sources."check-ends-with-period-3.0.2" - sources."emoji-regex-10.2.1" + sources."emoji-regex-10.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -95869,8 +95445,8 @@ in sha512 = "vP99cbTyapn+Hviom2doO3pJtjlhKlZvlHTf21zoB22CxJx2w3S7Ie169neB5U4Xsei+NodHf5tnwT933mO19A=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" @@ -95893,14 +95469,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.0.tgz"; - sha512 = "tbNpzDNLTVsqtDIMXEZNX2i1dvOqryME8Hknopq6Ze3TAjij5N0wBtG63frZLxJ9auE9fZse15sTi4Qe3arNZA=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.1.tgz"; + sha512 = "wKiVhc2B9HP2MFU4x7ZDx+oM5u43ETpKWTLHKvdhPRZ0+davi4M8mFmkZVovDIMO7igsGjixikcvFmnCMg3kmQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" @@ -95933,27 +95509,27 @@ in sources."array-includes-3.1.7" sources."arraybuffer.prototype.slice-1.0.2" sources."available-typed-arrays-1.0.5" - sources."call-bind-1.0.2" - sources."define-data-property-1.1.0" + sources."call-bind-1.0.5" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" - sources."es-abstract-1.22.2" - sources."es-set-tostringtag-2.0.1" + sources."es-abstract-1.22.3" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."for-each-0.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-symbol-description-1.0.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" - sources."has-1.0.3" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."internal-slot-1.0.5" + sources."hasown-2.0.0" + sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -95969,12 +95545,13 @@ in sources."is-typed-array-1.1.12" sources."is-weakref-1.0.2" sources."isarray-2.0.5" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" sources."regexp.prototype.flags-1.5.1" sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."side-channel-1.0.4" sources."string.prototype.trim-1.2.8" @@ -95986,7 +95563,7 @@ in sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" ]; buildInputs = globalBuildInputs; meta = { @@ -96007,8 +95584,8 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.8" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."adverb-where-0.2.6" sources."boundary-2.0.0" sources."commander-2.20.3" @@ -96055,11 +95632,11 @@ in sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.3" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.14" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/cors-2.8.16" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.1" - sources."@types/responselike-1.0.1" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -96091,7 +95668,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ @@ -96100,7 +95677,7 @@ in }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" @@ -96117,7 +95694,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -96130,6 +95707,7 @@ in }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" + sources."define-data-property-1.1.1" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -96178,21 +95756,22 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."got-11.8.5" sources."graceful-fs-4.2.11" sources."grapheme-splitter-1.0.4" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" @@ -96238,7 +95817,7 @@ in sources."json-buffer-3.0.1" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -96362,6 +95941,7 @@ in }) sources."serve-static-1.14.2" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -96412,6 +95992,7 @@ in sources."type-is-1.6.18" sources."ua-parser-js-1.0.33" sources."uc.micro-1.0.6" + sources."undici-types-5.26.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unpipe-1.0.0" @@ -96432,7 +96013,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" @@ -96511,7 +96092,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-constant-time-1.0.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-0.3.1" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -96520,7 +96101,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -96545,7 +96126,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -96554,6 +96135,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."define-data-property-1.1.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -96621,24 +96203,26 @@ in sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."gauge-2.7.4" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" + sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { @@ -96740,7 +96324,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -96763,7 +96347,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -96797,6 +96381,7 @@ in }) sources."serve-static-1.14.1" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" @@ -96833,7 +96418,7 @@ in ]; }) sources."sqlite3-4.1.0" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -97138,10 +96723,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.1" - sources."@types/responselike-1.0.1" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -97192,7 +96777,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-constant-time-1.0.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-0.3.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" @@ -97221,7 +96806,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -97355,7 +96940,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -97460,7 +97045,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -97528,7 +97113,7 @@ in ]; }) sources."sqlite3-5.0.0" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -97557,6 +97142,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" + sources."undici-types-5.26.5" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -97606,10 +97192,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.1" - sources."@types/responselike-1.0.1" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -97660,7 +97246,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-constant-time-1.0.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-0.3.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" @@ -97689,7 +97275,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -97823,7 +97409,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -97928,7 +97514,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -97996,7 +97582,7 @@ in ]; }) sources."sqlite3-5.0.0" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -98025,6 +97611,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" + sources."undici-types-5.26.5" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" @@ -98538,24 +98125,25 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.1" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" sources."tslib-2.6.2" sources."typescript-5.2.2" + sources."undici-types-5.26.5" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" ]; @@ -98593,10 +98181,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "3.3.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.3.2.tgz"; - sha512 = "jzun53CIkTbpAki0nP+hk5baGW+86SNNlVhyIj2ZUy45zUkCnmoetWuAtfRRQYrlIr8x4QB3ymGJPuwDQSd/ew=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.1.0.tgz"; + sha512 = "VbEw1U0jKKQ7pIYRtfQzBl7BroRBWSuS8x483jY0n4sQc0A8P7PgeSb3OycRbaj1rkfsTXZhsxKmsRYmoXAbdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -98656,16 +98244,16 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-6.3.0" + sources."@npmcli/config-6.4.0" sources."@npmcli/map-workspaces-3.0.4" sources."@npmcli/name-from-folder-2.0.0" - sources."@types/concat-stream-2.0.0" - sources."@types/debug-4.1.9" - sources."@types/is-empty-1.2.1" - sources."@types/ms-0.7.32" - sources."@types/node-20.8.1" - sources."@types/supports-color-8.1.1" - sources."@types/unist-3.0.0" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/is-empty-1.2.3" + sources."@types/ms-0.7.34" + sources."@types/node-20.9.0" + sources."@types/supports-color-8.1.3" + sources."@types/unist-3.0.2" sources."@ungap/structured-clone-1.2.0" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" @@ -98680,7 +98268,7 @@ in sources."color-name-1.1.3" ]; }) - sources."ci-info-3.8.0" + sources."ci-info-3.9.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-stream-2.0.0" @@ -98706,7 +98294,7 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."load-plugin-5.1.0" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" @@ -98717,7 +98305,7 @@ in sources."npm-normalize-package-bin-3.0.1" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - sources."parse-json-7.1.0" + sources."parse-json-7.1.1" sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."path-scurry-1.10.1" @@ -98751,7 +98339,14 @@ in sources."trough-2.1.0" sources."type-fest-3.13.1" sources."typedarray-0.0.6" - sources."unified-engine-11.1.0" + sources."undici-types-5.26.5" + (sources."unified-engine-11.1.1" // { + dependencies = [ + sources."@npmcli/config-8.0.1" + sources."import-meta-resolve-4.0.0" + sources."load-plugin-6.0.1" + ]; + }) sources."unist-util-inspect-8.0.0" sources."unist-util-lsp-2.1.0" sources."unist-util-stringify-position-4.0.0" @@ -98760,7 +98355,7 @@ in sources."vfile-message-4.0.2" (sources."vfile-reporter-8.1.0" // { dependencies = [ - sources."emoji-regex-10.2.1" + sources."emoji-regex-10.3.0" sources."string-width-6.1.0" sources."supports-color-9.4.0" ]; @@ -98784,7 +98379,7 @@ in ]; }) sources."yallist-4.0.0" - sources."yaml-2.3.2" + sources."yaml-2.3.4" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -98800,14 +98395,14 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.25.0.tgz"; - sha512 = "2rVTQY8ryM8/Z9WZ5AxOvYwBjSkfohuJ6j5nwLd9wxMetKlyaOuyts3ezIrScda4dThjPvokPJx9843E2mQ04g=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.26.0.tgz"; + sha512 = "UsRZ91+0YKAHtp9mryqgiVbGdBpb5F20HhYXHNAJfDw/uCsYbbLixLGzgTqWIRBYXgr890XMbL4HLbQPqnZC9w=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.2" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -98914,7 +98509,7 @@ in }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -98923,30 +98518,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -98971,13 +98562,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.15.1"; + version = "5.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.15.1.tgz"; - sha512 = "NpHwK8iLtW2OY0uDmtgSXQ2kuIc65vypTSXPD8q5mcfdVGn97OghhJwwRNn5ZYi7v0BEvdKBfMjQIbQhBpcwQA=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.2.tgz"; + sha512 = "lC+yx7bD8EyBu4CHNr7kLfPZ8+uU01xJZyOxNB1XSMdW0oNTKewLrA5be3W6mHgNDl60i4uZ5l463jfFGQ290A=="; }; dependencies = [ - sources."@types/estree-1.0.2" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -99026,7 +98617,7 @@ in }) sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -99035,30 +98626,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -99080,18 +98667,20 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "32.3.1"; + version = "32.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-32.3.1.tgz"; - sha512 = "XPwkXNbsqyqGy4kNo5T2At9TK71rfT/d9t55bUTkhWCHv62CZrZ+HdKrkZf2knx3mi11zeCWAU+2GvX9G1+3hw=="; + url = "https://registry.npmjs.org/vercel/-/vercel-32.5.3.tgz"; + sha512 = "fK5n0qSmckJlzPgZ7yD3Q1+L13o2FeN9hsZbJcr/kIglA0zRj7OoSEK30LWlxJ44T/Uw0MOgVpK8vkAl+Aqpdw=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/cookies-3.4.1" sources."@edge-runtime/format-2.2.0" sources."@edge-runtime/node-utils-2.2.1" - sources."@edge-runtime/primitives-3.1.1" - sources."@edge-runtime/vm-3.1.1" + sources."@edge-runtime/ponyfill-2.4.1" + sources."@edge-runtime/primitives-4.0.5" + sources."@edge-runtime/vm-3.1.7" + sources."@fastify/busboy-2.0.0" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" @@ -99118,11 +98707,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.3.91" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.2" + sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.91" + sources."@swc/wasm-1.3.97" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -99133,38 +98722,38 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/json-schema-7.0.13" + sources."@types/json-schema-7.0.15" sources."@types/node-14.18.33" - sources."@vercel/build-utils-7.2.1" - sources."@vercel/error-utils-2.0.1" + sources."@vercel/build-utils-7.2.3" + sources."@vercel/error-utils-2.0.2" sources."@vercel/fun-1.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" - (sources."@vercel/gatsby-plugin-vercel-builder-2.0.6" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.9" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) - sources."@vercel/go-3.0.2" + sources."@vercel/go-3.0.3" sources."@vercel/hydrogen-1.0.1" - sources."@vercel/next-4.0.8" - sources."@vercel/nft-0.24.1" - (sources."@vercel/node-3.0.6" // { + sources."@vercel/next-4.0.14" + sources."@vercel/nft-0.24.2" + (sources."@vercel/node-3.0.9" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" sources."path-to-regexp-6.2.1" ]; }) - sources."@vercel/python-4.0.2" - (sources."@vercel/redwood-2.0.3" // { + sources."@vercel/python-4.1.0" + (sources."@vercel/redwood-2.0.5" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.0.8" - (sources."@vercel/routing-utils-3.0.0" // { + sources."@vercel/remix-builder-2.0.11" + (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -99172,11 +98761,11 @@ in ]; }) sources."@vercel/ruby-2.0.2" - sources."@vercel/static-build-2.0.7" + sources."@vercel/static-build-2.0.10" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."agent-base-6.0.2" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" @@ -99193,7 +98782,6 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-crc32-0.2.13" - sources."busboy-1.6.0" sources."bytes-3.1.0" sources."chokidar-3.3.1" sources."chownr-1.1.4" @@ -99210,7 +98798,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.2" sources."diff-4.0.2" - (sources."edge-runtime-2.5.1" // { + (sources."edge-runtime-2.5.7" // { dependencies = [ sources."async-listen-3.0.1" sources."signal-exit-4.0.2" @@ -99250,7 +98838,7 @@ in sources."execa-3.2.0" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -99332,11 +98920,10 @@ in sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" sources."promisepipe-3.0.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."raw-body-2.4.1" sources."readable-stream-3.6.2" @@ -99363,7 +98950,6 @@ in sources."once-1.3.3" ]; }) - sources."streamsearch-1.1.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -99384,7 +98970,7 @@ in sources."tslib-2.6.2" sources."typescript-4.9.5" sources."uid-promise-1.0.0" - sources."undici-5.23.0" + sources."undici-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -99467,16 +99053,17 @@ in ]; }) sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.9.1" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.50.0" - sources."@humanwhocodes/config-array-0.11.11" + sources."@eslint-community/regexpp-4.10.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" + sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" + sources."@humanwhocodes/object-schema-2.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.10.0" + sources."@ungap/structured-clone-1.2.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -99486,7 +99073,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."chalk-4.1.2" sources."character-parser-2.2.0" @@ -99498,11 +99085,12 @@ in sources."cssesc-3.0.0" sources."debug-4.3.4" sources."deep-is-0.1.4" + sources."define-data-property-1.1.1" sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.50.0" - sources."eslint-plugin-vue-9.17.0" + sources."eslint-8.53.0" + sources."eslint-plugin-vue-9.18.1" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -99517,26 +99105,28 @@ in sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" - sources."flat-cache-3.1.0" + sources."flat-cache-3.1.1" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.22.0" + sources."globals-13.23.0" + sources."gopd-1.0.1" sources."graphemer-1.4.0" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."hasown-2.0.0" sources."ignore-5.2.4" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" (sources."is-expression-4.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -99552,7 +99142,7 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."levn-0.4.1" sources."locate-path-6.0.0" sources."lodash-4.17.21" @@ -99579,14 +99169,15 @@ in sources."prettier-2.8.8" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sprintf-js-1.0.3" @@ -99616,7 +99207,7 @@ in sources."typescript-4.9.5" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."vue-eslint-parser-9.3.1" + sources."vue-eslint-parser-9.3.2" sources."which-2.0.2" sources."wrappy-1.0.2" sources."xml-name-validator-4.0.0" @@ -99732,7 +99323,7 @@ in sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-4.1.2" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -99803,7 +99394,7 @@ in sha512 = "EwAUg6706mBujMLbb4Czhe9Ax5Dw3x64t/X2hn+vIVvVexAANSifVg3yB7ILZmeRSGmv9uYo6kL5J1c/DiGdaw=="; }; dependencies = [ - (sources."@babel/runtime-7.23.1" // { + (sources."@babel/runtime-7.23.2" // { dependencies = [ sources."regenerator-runtime-0.14.0" ]; @@ -99839,19 +99430,19 @@ in sources."@jimp/tiff-0.16.13" sources."@jimp/types-0.16.13" sources."@jimp/utils-0.16.13" - sources."@resvg/resvg-js-2.4.1" - sources."@resvg/resvg-js-android-arm-eabi-2.4.1" - sources."@resvg/resvg-js-android-arm64-2.4.1" - sources."@resvg/resvg-js-darwin-arm64-2.4.1" - sources."@resvg/resvg-js-darwin-x64-2.4.1" - sources."@resvg/resvg-js-linux-arm-gnueabihf-2.4.1" - sources."@resvg/resvg-js-linux-arm64-gnu-2.4.1" - sources."@resvg/resvg-js-linux-arm64-musl-2.4.1" - sources."@resvg/resvg-js-linux-x64-gnu-2.4.1" - sources."@resvg/resvg-js-linux-x64-musl-2.4.1" - sources."@resvg/resvg-js-win32-arm64-msvc-2.4.1" - sources."@resvg/resvg-js-win32-ia32-msvc-2.4.1" - sources."@resvg/resvg-js-win32-x64-msvc-2.4.1" + sources."@resvg/resvg-js-2.6.0" + sources."@resvg/resvg-js-android-arm-eabi-2.6.0" + sources."@resvg/resvg-js-android-arm64-2.6.0" + sources."@resvg/resvg-js-darwin-arm64-2.6.0" + sources."@resvg/resvg-js-darwin-x64-2.6.0" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.6.0" + sources."@resvg/resvg-js-linux-arm64-gnu-2.6.0" + sources."@resvg/resvg-js-linux-arm64-musl-2.6.0" + sources."@resvg/resvg-js-linux-x64-gnu-2.6.0" + sources."@resvg/resvg-js-linux-x64-musl-2.6.0" + sources."@resvg/resvg-js-win32-arm64-msvc-2.6.0" + sources."@resvg/resvg-js-win32-ia32-msvc-2.6.0" + sources."@resvg/resvg-js-win32-x64-msvc-2.6.0" sources."@tokenizer/token-0.3.0" sources."@types/node-16.9.1" sources."ansi-regex-5.0.1" @@ -99924,7 +99515,7 @@ in sources."tinycolor2-1.6.0" sources."token-types-4.2.1" sources."tspan-0.4.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."utif-2.0.1" sources."util-deprecate-1.0.2" sources."wavedrom-3.3.0" @@ -99951,10 +99542,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.88.2"; + version = "5.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"; - sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz"; + sha512 = "qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.3" @@ -99962,12 +99553,12 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/eslint-8.44.3" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/json-schema-7.0.13" - sources."@types/node-20.8.1" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -99985,16 +99576,16 @@ in sources."@webassemblyjs/wast-printer-1.11.6" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -100021,7 +99612,7 @@ in sources."neo-async-2.6.2" sources."node-releases-2.0.13" sources."picocolors-1.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.3.0" @@ -100030,12 +99621,13 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.20.0" + sources."terser-5.24.0" sources."terser-webpack-plugin-5.3.9" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.88.2" + sources."webpack-5.89.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -100063,12 +99655,12 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/eslint-8.44.3" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/json-schema-7.0.13" - sources."@types/node-20.8.1" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100089,21 +99681,21 @@ in sources."@webpack-cli/serve-2.0.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -100118,14 +99710,15 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.16" sources."find-up-4.1.0" - sources."function-bind-1.1.1" + sources."flat-5.0.2" + sources."function-bind-1.1.2" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.11" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."hasown-2.0.0" sources."import-local-3.1.0" sources."interpret-3.1.1" - sources."is-core-module-2.13.0" + sources."is-core-module-2.13.1" sources."is-plain-object-2.0.4" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -100148,10 +99741,10 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."randombytes-2.1.0" sources."rechoir-0.8.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" @@ -100165,18 +99758,19 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.20.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."terser-webpack-plugin-5.3.9" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.88.2" + sources."webpack-5.89.0" sources."webpack-cli-5.1.4" - sources."webpack-merge-5.9.0" + sources."webpack-merge-5.10.0" sources."webpack-sources-3.2.3" sources."which-2.0.2" sources."wildcard-2.0.1" @@ -100205,30 +99799,31 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@types/body-parser-1.19.3" - sources."@types/bonjour-3.5.11" - sources."@types/connect-3.4.36" - sources."@types/connect-history-api-fallback-1.5.1" - sources."@types/eslint-8.44.3" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/express-4.17.18" - sources."@types/express-serve-static-core-4.17.37" - sources."@types/http-errors-2.0.2" - sources."@types/http-proxy-1.17.12" - sources."@types/json-schema-7.0.13" - sources."@types/mime-1.3.3" - sources."@types/node-20.8.1" - sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.5" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/express-4.17.21" + sources."@types/express-serve-static-core-4.17.41" + sources."@types/http-errors-2.0.4" + sources."@types/http-proxy-1.17.14" + sources."@types/json-schema-7.0.15" + sources."@types/mime-1.3.5" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" sources."@types/retry-0.12.0" - sources."@types/send-0.17.2" - sources."@types/serve-index-1.9.2" - sources."@types/serve-static-1.15.3" - sources."@types/sockjs-0.3.34" - sources."@types/ws-8.5.6" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100247,7 +99842,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -100268,10 +99863,10 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.0.0" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001542" + sources."call-bind-1.0.5" + sources."caniuse-lite-1.0.30001561" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -100292,6 +99887,7 @@ in sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."default-gateway-6.0.3" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -100299,7 +99895,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.580" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" @@ -100333,18 +99929,20 @@ in sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."handle-thing-2.0.1" - sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" (sources."hpack.js-2.1.6" // { dependencies = [ sources."readable-stream-2.3.8" @@ -100374,7 +99972,7 @@ in sources."jest-worker-27.5.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."launch-editor-2.6.0" + sources."launch-editor-2.6.1" sources."loader-runner-4.3.0" sources."media-typer-0.3.0" sources."memfs-3.6.0" @@ -100397,7 +99995,7 @@ in sources."node-releases-2.0.13" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -100417,7 +100015,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -100436,7 +100034,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-4.2.0" sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" + sources."selfsigned-2.4.1" (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -100453,6 +100051,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -100479,7 +100078,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.20.0" + sources."terser-5.24.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -100492,6 +100091,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" + sources."undici-types-5.26.5" sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" @@ -100502,7 +100102,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.88.2" // { + (sources."webpack-5.89.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -100542,15 +100142,15 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.44.3" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/json-schema-7.0.13" - sources."@types/node-20.8.1" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100568,7 +100168,7 @@ in sources."@webassemblyjs/wast-printer-1.11.6" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -100576,11 +100176,11 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001542" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.538" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -100593,7 +100193,7 @@ in sources."estraverse-4.3.0" sources."events-3.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -100625,7 +100225,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -100639,7 +100239,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.20.0" + sources."terser-5.24.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -100649,10 +100249,11 @@ in ]; }) sources."to-regex-range-5.0.1" + sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.88.2" // { + (sources."webpack-5.89.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -100693,7 +100294,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.8.1" + sources."@types/node-20.9.0" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -100756,7 +100357,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ @@ -101004,7 +100605,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.15.1" + sources."streamx-2.15.2" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.1.1" @@ -101028,6 +100629,7 @@ in sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + sources."undici-types-5.26.5" sources."unordered-array-remove-1.0.2" sources."unordered-set-2.0.1" sources."upnp-device-client-1.0.2" @@ -101059,7 +100661,7 @@ in sources."simple-get-4.0.1" ]; }) - sources."winreg-1.2.4" + sources."winreg-1.2.5" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" sources."ws-7.5.9" @@ -101083,15 +100685,15 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "1.0.6"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.6.tgz"; - sha512 = "XXI/8DG+dFXXO9WvewYZwlxAx2MRMt69XYbxPPYWRvpu8dGiTUQ5EeDsOm4yEOsOMvefNxjnq9mqwJxuwRfRyQ=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.9.tgz"; + sha512 = "RQj9MouC+o746pXW7p9IvYg2iehYQsd1xxi42BCR5MvSEPf7TQNmmAuxDsB1pthkL40e+bXktitXUtRFeKg/9g=="; }; dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."chalk-4.1.2" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -101125,18 +100727,13 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.10.1"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.10.1.tgz"; - sha512 = "k7BUIinKVYFHJYo8HVeVjDncjTQIu6Z6/CNnTB9WcsGlJ0MFTsFWdWspWSPgef1vOTrzkfbweZpZCY3YXIew3g=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.15.0.tgz"; + sha512 = "kxzK62rD+LRrDeZZzw8cP6FBub71vJCbfAAb594XobXajgXYh3pFjv18Vm8YLxHzoGMhmAOJPA5b4DHq4HEUCw=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" - sources."@cloudflare/workerd-darwin-64-1.20230922.0" - sources."@cloudflare/workerd-darwin-arm64-1.20230922.0" - sources."@cloudflare/workerd-linux-64-1.20230922.0" - sources."@cloudflare/workerd-linux-arm64-1.20230922.0" - sources."@cloudflare/workerd-windows-64-1.20230922.0" sources."@esbuild-plugins/node-globals-polyfill-0.2.3" sources."@esbuild-plugins/node-modules-polyfill-0.2.2" sources."@esbuild/android-arm-0.17.19" @@ -101162,15 +100759,17 @@ in sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" sources."@fastify/busboy-2.0.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."anymatch-3.1.3" sources."as-table-1.0.55" sources."binary-extensions-2.2.0" sources."blake3-wasm-2.1.5" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."capnp-ts-0.7.0" sources."chokidar-3.5.3" sources."cookie-0.5.0" @@ -101191,10 +100790,10 @@ in sources."is-number-7.0.0" sources."magic-string-0.25.9" sources."mime-3.0.0" - sources."miniflare-3.20230922.0" + sources."miniflare-3.20231025.0" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" @@ -101202,10 +100801,11 @@ in sources."picomatch-2.3.1" sources."printable-characters-1.0.42" sources."readdirp-3.6.0" + sources."resolve.exports-2.0.2" sources."rollup-plugin-inject-3.0.2" sources."rollup-plugin-node-polyfills-0.2.1" sources."rollup-pluginutils-2.8.2" - sources."selfsigned-2.1.1" + sources."selfsigned-2.4.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."sourcemap-codec-1.4.8" @@ -101213,13 +100813,14 @@ in sources."stoppable-1.1.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."undici-5.25.3" + sources."undici-5.27.2" + sources."undici-types-5.26.5" sources."utf-8-validate-6.0.3" - sources."workerd-1.20230922.0" + sources."workerd-1.20231025.0" sources."ws-8.14.2" sources."xxhash-wasm-1.0.2" - sources."youch-3.3.2" - sources."zod-3.22.2" + sources."youch-3.3.3" + sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; meta = { @@ -101345,205 +100946,4 @@ in bypassCache = true; reconstructLock = true; }; - "@zwave-js/server" = nodeEnv.buildNodePackage { - name = "_at_zwave-js_slash_server"; - packageName = "@zwave-js/server"; - version = "1.32.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.32.1.tgz"; - sha512 = "lO2G4FvjTjztvj9KW8pQTwMe5dPNxfZhi+zUvOVoURa773P2h620+i2ARQTGX/o/60cHm1LFETnrtzPqTwVnEg=="; - }; - dependencies = [ - (sources."@alcalzone/jsonl-db-3.1.0" // { - dependencies = [ - sources."fs-extra-10.1.0" - ]; - }) - (sources."@alcalzone/pak-0.9.0" // { - dependencies = [ - sources."execa-5.0.1" - sources."fs-extra-10.1.0" - ]; - }) - sources."@alcalzone/proper-lockfile-4.1.3-0" - sources."@colors/colors-1.5.0" - sources."@dabh/diagnostics-2.0.3" - sources."@homebridge/ciao-1.1.7" - sources."@leichtgewicht/ip-codec-2.0.4" - sources."@serialport/binding-mock-10.2.2" - (sources."@serialport/bindings-cpp-12.0.1" // { - dependencies = [ - sources."@serialport/parser-delimiter-11.0.0" - sources."@serialport/parser-readline-11.0.0" - sources."node-gyp-build-4.6.0" - ]; - }) - sources."@serialport/bindings-interface-1.2.2" - sources."@serialport/parser-byte-length-12.0.0" - sources."@serialport/parser-cctalk-12.0.0" - sources."@serialport/parser-delimiter-12.0.0" - sources."@serialport/parser-inter-byte-timeout-12.0.0" - sources."@serialport/parser-packet-length-12.0.0" - sources."@serialport/parser-readline-12.0.0" - sources."@serialport/parser-ready-12.0.0" - sources."@serialport/parser-regex-12.0.0" - sources."@serialport/parser-slip-encoder-12.0.0" - sources."@serialport/parser-spacepacket-12.0.0" - sources."@serialport/stream-12.0.0" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.2" - sources."@types/triple-beam-1.3.3" - sources."@zwave-js/cc-12.0.2" - sources."@zwave-js/config-12.0.2" - sources."@zwave-js/core-12.0.2" - sources."@zwave-js/host-12.0.2" - sources."@zwave-js/nvmedit-12.0.2" - sources."@zwave-js/serial-12.0.2" - sources."@zwave-js/shared-12.0.0" - sources."@zwave-js/testing-12.0.2" - sources."alcalzone-shared-4.0.8" - sources."ansi-colors-4.1.3" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."axios-0.27.2" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."cliui-8.0.1" - (sources."color-3.2.1" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-string-1.9.1" - sources."colorspace-1.1.4" - sources."combined-stream-1.0.8" - sources."cross-spawn-7.0.3" - sources."dayjs-1.11.10" - sources."debug-4.3.4" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defer-to-connect-2.0.1" - sources."delayed-stream-1.0.0" - sources."dns-packet-5.6.1" - sources."emoji-regex-8.0.0" - sources."enabled-2.0.0" - sources."escalade-3.1.1" - sources."eventemitter3-5.0.1" - sources."execa-5.1.1" - sources."fast-deep-equal-3.1.3" - sources."fecha-4.2.3" - sources."file-stream-rotator-0.6.1" - sources."fn.name-1.1.0" - sources."follow-redirects-1.15.3" - sources."form-data-4.0.0" - sources."form-data-encoder-2.1.4" - sources."fs-extra-11.1.1" - sources."get-caller-file-2.0.5" - sources."get-stream-6.0.1" - sources."globalyzer-0.1.0" - sources."globrex-0.1.2" - sources."got-13.0.0" - sources."graceful-fs-4.2.11" - sources."http-cache-semantics-4.1.1" - sources."http2-wrapper-2.2.0" - sources."human-signals-2.1.0" - sources."inherits-2.0.4" - sources."is-arrayish-0.3.2" - sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-2.0.1" - sources."isexe-2.0.0" - sources."json-buffer-3.0.1" - sources."json-logic-js-2.0.2" - sources."json5-2.2.3" - sources."jsonfile-6.1.0" - sources."keyv-4.5.3" - sources."kuler-2.0.0" - sources."logform-2.5.1" - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."mdns-server-1.0.11" - sources."merge-stream-2.0.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-4.0.0" - sources."minimist-1.2.8" - sources."moment-2.29.4" - sources."ms-2.1.2" - sources."node-addon-api-7.0.0" - sources."node-gyp-build-4.6.1" - sources."normalize-url-8.0.0" - sources."npm-run-path-4.0.1" - sources."nrf-intel-hex-1.3.0" - sources."object-hash-2.2.0" - sources."one-time-1.0.0" - sources."onetime-5.1.2" - sources."p-cancelable-3.0.0" - sources."p-queue-7.4.1" - sources."p-timeout-5.1.0" - sources."path-key-3.1.1" - sources."proper-lockfile-4.1.2" - sources."quick-lru-5.1.1" - sources."readable-stream-3.6.2" - sources."reflect-metadata-0.1.13" - sources."require-directory-2.1.1" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."retry-0.12.0" - sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-2.4.3" - sources."semver-7.5.4" - sources."serialport-12.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."simple-swizzle-0.2.2" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."stack-trace-0.0.10" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-2.0.0" - sources."text-hex-1.0.0" - sources."tiny-glob-0.2.9" - sources."triple-beam-1.4.1" - sources."tslib-2.6.2" - sources."universalify-2.0.0" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."which-2.0.2" - sources."winston-3.10.0" - sources."winston-daily-rotate-file-4.7.1" - sources."winston-transport-4.5.0" - sources."wrap-ansi-7.0.0" - sources."ws-8.14.2" - sources."xstate-4.38.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."zwave-js-12.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Full access to zwave-js driver through Websockets"; - homepage = "https://github.com/zwave-js/zwave-js-server#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index a7afac111e..26b1d43c25 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -257,7 +257,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-HiZtNHXkoSl3Q4cAerUs8c138AiDJJxzYNQT3I4+ea8="; + hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asai/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asai/default.nix new file mode 100644 index 0000000000..b089eba768 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asai/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub, buildDunePackage +, algaeff +, bwd +, eio +, eio_main +, lsp +, notty +}: + +buildDunePackage rec { + pname = "asai"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = pname; + rev = version; + hash = "sha256-Jd90WhSjK4K2amFA5uyGF57NzsgHA8QiccX6qtxO1rQ="; + }; + + propagatedBuildInputs = [ + algaeff + bwd + lsp + eio + eio_main + notty + ]; + + meta = { + description = "A library for constructing and printing compiler diagnostics"; + homepage = "https://redprl.org/asai/asai/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix index 709a9b0929..816a52bbab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix @@ -2,18 +2,17 @@ , ocaml, findlib, ocamlbuild, topkg , js_of_ocaml-compiler , js_of_ocaml-toplevel -, note }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-brr"; - version = "0.0.4"; + version = "0.0.6"; src = fetchurl { url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; - hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw="; + hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; - propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ]; + propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ]; inherit (topkg) buildPhase installPhase; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix index 0d08cc48cb..b1d3d51c86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix @@ -6,8 +6,6 @@ buildDunePackage rec { pname = "camlimages"; version = "5.0.4"; - duneVersion = "3"; - minimalOCamlVersion = "4.07"; src = fetchFromGitLab { @@ -17,6 +15,10 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; + postPatch = '' + substituteInPlace core/{images,units}.ml --replace String.lowercase String.lowercase_ascii + ''; + nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator findlib graphics lablgtk stdio ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 727d407ac5..7ba02d68ff 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -8,14 +8,13 @@ buildDunePackage rec { pname = "carton"; - version = "0.6.0"; + version = "0.7.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix index b19e01ceb3..c9e2504542 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , buildDunePackage +, bos , bwd , cmdliner , containers @@ -16,22 +17,21 @@ , yuujinchou , ounit2 , qcheck +, qcheck-core }: let bantorra = buildDunePackage rec { pname = "bantorra"; - version = "unstable-2022-04-20"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "RedPRL"; repo = "bantorra"; - rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b"; - sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2"; + rev = "d05c34295727dd06d0ac4416dc2e258732e8593d"; + hash = "sha256-s6lUTs3VRl6YhLAn3PO4aniANhFp8ytoTsFAgcOlee4="; }; - duneVersion = "3"; - - propagatedBuildInputs = [ ezjsonm findlib ]; + propagatedBuildInputs = [ bos ezjsonm findlib ]; meta = { description = "Extensible Library Management and Path Resolution"; @@ -41,19 +41,18 @@ let }; kado = buildDunePackage rec { pname = "kado"; - version = "unstable-2022-04-30"; + version = "unstable-2023-10-03"; src = fetchFromGitHub { owner = "RedPRL"; repo = "kado"; - rev = "8dce50e7d759d482b82565090e550d3860d64729"; - sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy"; + rev = "6b2e9ba2095e294e6e0fc6febc280d80c5799c2b"; + hash = "sha256-fP6Ade3mJeyOMjuDIvrW88m6E3jfb2z3L8ufgloz4Tc="; }; - duneVersion = "3"; - propagatedBuildInputs = [ bwd ]; doCheck = true; + checkInputs = [ qcheck-core ]; meta = { description = "Cofibrations in Cartecian Cubical Type Theory"; @@ -65,16 +64,15 @@ in buildDunePackage { pname = "cooltt"; - version = "unstable-2022-04-28"; + version = "unstable-2023-10-03"; - minimalOCamlVersion = "4.13"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchFromGitHub { owner = "RedPRL"; repo = "cooltt"; - rev = "88511e10cb9e17286f585882dee334f3d8ace47c"; - sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw"; + rev = "a5eaf4db195b5166a7102d47d42724f59cf3de19"; + hash = "sha256-48bEf59rtPRrCRjab7+GxppjfR2c87HjQ+uKY2Bag0I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix index bf294b76db..8e475a7987 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix @@ -2,15 +2,21 @@ buildDunePackage rec { pname = "cry"; - version = "0.6.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ="; + sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ="; }; + postPatch = '' + substituteInPlace src/dune --replace bytes "" + ''; + + minimalOCamlVersion = "4.12"; + meta = with lib; { homepage = "https://github.com/savonet/ocaml-cry"; description = "OCaml client for the various icecast & shoutcast source protocols"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix index 3faef36e8e..43584461af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr"; }; + postPatch = '' + substituteInPlace "dum.ml" \ + --replace "Lazy.lazy_is_val" "Lazy.is_val" \ + --replace "Obj.final_tag" "Obj.custom_tag" + ''; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ easy-format ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix index 1f9e18e887..005364039e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix @@ -1,4 +1,6 @@ { lib +, ocaml +, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.13" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -16,16 +18,26 @@ , mdx }: +let + param = { + "0.12" = { + minimalOCamlVersion = "5.0"; + hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; + }; + "0.13" = { + minimalOCamlVersion = "5.1"; + hash = "sha256-glN+4cWxgp/eggdhSk459WC9WCMyhBKQ7V73ZpHzr3A="; + }; + }."${version}"; +in buildDunePackage rec { pname = "eio"; - version = "0.12"; - - minimalOCamlVersion = "5.0"; - duneVersion = "3"; + inherit version; + inherit (param) minimalOCamlVersion; src = fetchurl { url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; + inherit (param) hash; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/linux.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/linux.nix index 62f9800790..b376f70979 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/linux.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/linux.nix @@ -10,7 +10,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix index def30f2a05..410e535512 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/main.nix @@ -11,7 +11,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix index 6c3042e65f..e8dc4072ba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eio/posix.nix @@ -11,7 +11,6 @@ buildDunePackage { inherit (eio) meta src version; minimalOCamlVersion = "5.0"; - duneVersion = "3"; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix index d1f93f5726..082f47313b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionAtLeast ocaml.version "5.0" then throw "erm_xml is not available for OCaml ${ocaml.version}" else diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix index 5f491a1bb6..2449308567 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-expat"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; + hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix index 5940534913..e8bb6128db 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.7"; - - duneVersion = "3"; + version = "1.1.8"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4="; + sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix index f3364cb548..10e837dcd6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; propagatedBuildInputs = [ ffmpeg-avutil diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 73b8ed0f6a..b902f72bc1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 1ff5a89ee3..bce592a8a2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index b2537bd25b..3d27ab8031 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -17,7 +17,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 32342860d1..524bc60009 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -13,7 +13,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index a271b984d1..6cd71ebd58 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -9,7 +9,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index fb6fbda58d..a6012a4417 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a085795831..773b10ee16 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix index d79416b705..c30236e0e2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; + sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix index 2eca9a4644..5d7e5f59b8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }: stdenv.mkDerivation { - pname = "ocaml-fontconfig"; + pname = "ocaml${ocaml.version}-fontconfig"; version = "unstable-2013-11-03"; src = fetchFromGitHub { @@ -11,6 +11,12 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; + postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.03") '' + substituteInPlace extract_consts.ml \ + --replace String.lowercase String.lowercase_ascii \ + --replace String.capitalize String.capitalize_ascii + ''; + nativeBuildInputs = [ pkg-config ocaml ]; buildInputs = [ fontconfig ]; @@ -24,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Fontconfig bindings for OCaml"; license = lib.licenses.gpl2Plus; - platforms = ocaml.meta.platforms or [ ]; + platforms = ocaml.meta.platforms; maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix index 3c56aaf0a0..8a960dedcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib }: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; - let param = if lib.versionAtLeast ocaml.version "4.02" then { version = "0.6"; @@ -12,6 +10,9 @@ let param = }; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "functory is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "ocaml${ocaml.version}-functory"; inherit (param) version; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix index cd20696485..f3206c2385 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, gd, freetype, findlib, zlib, libpng, libjpeg }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gd4o is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-gd4o"; version = "1.0a5"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix index e3bf2fb5d6..db03f7b079 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix @@ -1,28 +1,22 @@ -{ lib, fetchzip, stdenv, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-getopt"; - version = "20120615"; +buildDunePackage rec { + pname = "getopt"; + version = "20230213"; - src = fetchzip { - url = "https://download.ocamlcore.org/ocaml-getopt/ocaml-getopt/${version}/ocaml-getopt-${version}.tar.gz"; - sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; + minimalOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "scemama"; + repo = "ocaml-getopt"; + rev = version; + hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8="; }; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - - strictDeps = true; - doCheck = true; - createFindlibDestdir = true; meta = { - inherit (ocaml.meta) platforms; - homepage = "https://github.com/gildor478/ocaml-getopt"; + homepage = "https://github.com/scemama/ocaml-getopt"; description = "Parsing of command line arguments (similar to GNU GetOpt) for OCaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix index e12454759a..18d3076555 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -4,9 +4,9 @@ buildDunePackage { pname = "hacl-star"; - inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion; + inherit (hacl-star-raw) version src meta doCheck; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ hacl-star-raw diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index de20299cd4..00b524606f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-hacl-star-raw"; - version = "0.7.0"; + version = "0.7.1"; src = fetchzip { url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; - sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY="; + hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ="; stripRoot = false; }; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { ./aligned-alloc.patch ]; - minimalOCamlVersion = "4.08"; - # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c01..ccd2d4eab2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -3,6 +3,7 @@ , fetchpatch , fzf , lib +, ocaml , openssl , zstd }: @@ -264,6 +265,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; doCheck = false; # circular dependency with core_kernel + meta.broken = lib.versionAtLeast ocaml.version "5.1"; }; core_bench = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix index cb885b7b06..abe1649e00 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } : +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, camlp-streams, darwin } : -if lib.versionOlder ocaml.version "4.03" +if lib.versionOlder ocaml.version "4.06" then throw "lablgl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lablgl"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "garrigue"; repo = "lablgl"; rev = "v${version}"; - sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; + hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4="; }; strictDeps = true; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ freeglut ]; + buildInputs = [ freeglut camlp-streams ]; propagatedBuildInputs = [ libGLU libGL diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metadata/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metadata/default.nix new file mode 100644 index 0000000000..789825175e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metadata/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "metadata"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-metadata"; + rev = "v${version}"; + sha256 = "sha256-sSekkyJ8D6mCCmxIyd+pBk/khaehA3BcpUQl2Gln+Ic="; + }; + + minimalOCamlVersion = "4.14"; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-metadata"; + description = "Library to read metadata from files in various formats. "; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 69d8cc440b..3c8b00285e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { duneVersion = "3"; pname = "mirage-crypto"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-DNoUeyCpK/cMXJ639VxnXQOrx2u9Sx8N2c9/w4AW0pw="; + sha256 = "sha256-1rl8t/DcNEpgJRPMAxN8Hn8K4QXQchYUYmz08jHt92Q="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix index 7a7e83d3c6..b55faf222c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix @@ -29,7 +29,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.5.6"; + version = "1.5.8"; minimalOCamlVersion = "4.10"; @@ -38,8 +38,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged - hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54="; + rev = "v${version}"; + hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix index 5bb0da7dd1..9640a33569 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, brr }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "note is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-note"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; - hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY="; + hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ brr ]; + meta = { homepage = "https://erratique.ch/software/note"; description = "An OCaml module for functional reactive programming"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 43bd194b65..7c197f9e87 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -1,6 +1,9 @@ { lib, buildDunePackage, ocaml, ocaml_gettext, dune-configurator, ounit }: -buildDunePackage rec { +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gettext-stub is not available for OCaml ${ocaml.version}" + +buildDunePackage { pname = "gettext-stub"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix index 39794dac45..067b61212a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix @@ -13,13 +13,13 @@ buildDunePackage rec { pname = "ocaml-protoc-plugin"; - version = "4.3.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-protoc-plugin"; rev = version; - hash = "sha256-KFd43Ukz5gMeM3ik2VlfaIPwcZe9yaxk9VcQIrauUGU="; + hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix index 215c026856..ca5c78bca7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, version, astring, base, camlp-streams, cmdliner_1_0 +{ lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk -, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf }: +, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }: # The ocamlformat package have been split into two in version 0.25.1: # one for the library and one for the executable. @@ -23,9 +23,12 @@ rec { "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; + "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc="; }."${version}"; }; + inherit version; + odoc-parser_v = odoc-parser.override { version = if lib.versionAtLeast version "0.24.0" then "2.0.0" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix index cefae4af02..9e271fe186 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -1,6 +1,7 @@ -{ lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }: +# Version can be selected with the 'version' argument, see generic.nix. +{ lib, callPackage, buildDunePackage, menhir, ... }@args: -let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; +let inherit (callPackage ./generic.nix args) src version library_deps; in assert (lib.versionAtLeast version "0.25.1"); diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index a4492b2ead..e1f5f29aa2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -1,25 +1,16 @@ -{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0 }: +# Version can be selected with the 'version' argument, see generic.nix. +{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args: -# for compat with ocaml-lsp -let source = - if lib.versionAtLeast ocaml.version "4.13" - then { - version = "0.26.0"; - sha256 = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; - } else { - version = "0.20.0"; - sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; - }; -in +let + # for compat with ocaml-lsp + version_arg = + if lib.versionAtLeast ocaml.version "4.13" then {} else { version = "0.20.0"; }; -buildDunePackage rec { + inherit (callPackage ./generic.nix (args // version_arg)) src version; + +in buildDunePackage rec { pname = "ocamlformat-rpc-lib"; - inherit (source) version; - - src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - inherit (source) sha256; - }; + inherit src version; minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index a2456dbef3..4c3b660773 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -1,3 +1,4 @@ +# Version can be selected with the 'version' argument, see generic.nix. { lib , callPackage , buildDunePackage @@ -5,10 +6,10 @@ , re , ocamlformat-lib , menhir -, version ? "0.26.0" -}: +, ... +}@args: -let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; +let inherit (callPackage ./generic.nix args) src version library_deps; in lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23") diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix deleted file mode 100644 index 2a33d8b17c..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: - -let - pname = "ocamlsdl"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; - sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; - }; - - strictDeps = true; - - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; - - propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; - createFindlibDestdir = true; - - meta = { - homepage = "http://ocamlsdl.sourceforge.net/"; - description = "OCaml bindings for SDL 1.2"; - license = lib.licenses.lgpl21; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix index cb14143751..3824730765 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "parany"; - version = "14.0.0"; + version = "14.0.1"; minimalOCamlVersion = "4.08"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - hash = "sha256-L5jHm3gZ2XIJ7jMUb/KvpSa/bnprEX75/P3BCMSe9Ok="; + hash = "sha256-QR3Rq30iKhft+9tVCgJLOq9bwJe7bcay/kMTXjjCLjE="; }; propagatedBuildInputs = [ cpu ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix index b52c73d053..fb5f0192c4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex, easy-format, xmlm, base64 }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "piqi is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { version = "0.6.16"; pname = "piqi"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix index 1ffb3e4e2d..3a103ad41a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pprint/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "pprint"; version = "20230830"; - useDune2 = true; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "fpottier"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix index 8358be5003..ed7f2ef559 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix @@ -9,31 +9,15 @@ buildDunePackage rec { pname = "pyml"; - version = "20220905"; + version = "20231101"; src = fetchFromGitHub { owner = "thierry-martinez"; repo = "pyml"; rev = version; - sha256 = "PL4tFIKQLRutSn9Sf84/ImJv0DqkstNnJaNBqWDTKDQ="; + sha256 = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc="; }; - patches = [ - # Fixes test crash. - # https://github.com/thierry-martinez/pyml/issues/85 - (fetchpatch { - url = "https://github.com/thierry-martinez/pyml/commit/a0bc5aca8632bea273f869d622cad2f55e754a7c.patch"; - sha256 = "bOqAokm5DE5rlvkBMQZtwMppRmoK9cvjJeGeP6BusnE="; - excludes = [ - "CHANGES.md" - ]; - }) - (fetchpatch { - url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; - hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; - }) - ]; - buildInputs = [ utop ]; @@ -44,7 +28,8 @@ buildDunePackage rec { ]; nativeCheckInputs = [ - python3.pkgs.numpy python3.pkgs.ipython + python3.pkgs.numpy + python3.pkgs.ipython ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix index 47c1915468..d3d23a5d9f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/default.nix @@ -2,18 +2,16 @@ buildDunePackage rec { pname = "repr"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mirage"; repo = "repr"; rev = version; - hash = "sha256-jF8KmaG07CT26O/1ANc6s1yHFJqhXDtd0jgTA04tIgw="; + hash = "sha256-SM55m5NIaQ2UKAtznNFSt3LN4QA7As0DyTxVeQjOTjI="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - strictDeps = true; propagatedBuildInputs = [ base64 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix index b1091114ce..cd3bf78ead 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix @@ -3,8 +3,7 @@ buildDunePackage { pname = "ppx_repr"; - inherit (repr) src version strictDeps; - duneVersion = "3"; + inherit (repr) src version; propagatedBuildInputs = [ ppx_deriving @@ -12,7 +11,7 @@ buildDunePackage { repr ]; - doCheck = false; # tests fail with ppxlib >= 0.23.0 + doCheck = true; checkInputs = [ alcotest hex diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix new file mode 100644 index 0000000000..e03ac2c209 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix @@ -0,0 +1,37 @@ +{ lib +, bigstringaf +, buildDunePackage +, fetchurl +, iomux +, ptime +, uri +}: + +buildDunePackage rec { + pname = "riot"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q="; + }; + + propagatedBuildInputs = [ + bigstringaf + iomux + ptime + uri + ]; + + doCheck = true; + + meta = { + description = "An actor-model multi-core scheduler for OCaml 5"; + homepage = "https://github.com/leostera/riot"; + changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix index f66abd2bdc..0e2dbda80d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix @@ -13,20 +13,20 @@ , z3 , linksem , num +, yojson }: buildDunePackage rec { pname = "sail"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "rems-project"; repo = "sail"; rev = version; - hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk="; + hash = "sha256-HY/rgWi0S7ZiAWZF0fVIRK6fpoJ7Xp5EQcxoPRCPJ5Y="; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildDunePackage rec { linenoise pprint linksem + yojson ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/semver/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/semver/default.nix index 15bd02f186..5f4880c0cf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/semver/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage, ocaml, alcotest }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") - "semver is not available on OCaml older than 4.02" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-semver"; - version = "0.1.0"; - src = fetchzip { - url = "https://github.com/rgrinberg/ocaml-semver/archive/v${version}.tar.gz"; - sha256 = "sha256-0BzeuVTpuRIQjadGg08hTvMzZtKCl2utW2YK269oETk="; +buildDunePackage rec { + pname = "semver"; + version = "0.2.1"; + src = fetchurl { + url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${version}/semver-${version}.tbz"; + hash = "sha256-CjzDUtoe5Hvt6zImb+EqVIulRUUUQd9MmuJ4BH/2mLg="; }; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - - strictDeps = true; - createFindlibDestdir = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/rgrinberg/ocaml-semver"; description = "Semantic versioning module"; - platforms = ocaml.meta.platforms; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index 74983fef3e..87fb82adcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, ctypes, libsodium }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "sodium is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-sodium"; version = "0.6.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix index c44bcf6ec8..4940f38f1b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uring/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "uring"; - version = "0.7"; + version = "0.8"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "khxV8aZYvdqYGjb1a27JQ+K8yg7OJN4ziJT2hzNIFQM="; + hash = "sha256-4OGst19vqEzuNVxO5xxtzS+mEilEBFoEc7lC3j3sTk4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix index 9dea4a64a5..6c60458f96 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix @@ -2,28 +2,28 @@ , buildDunePackage , fetchurl , xmlm -, lwt +, eio , logs , fmt , cstruct , cmdliner -, alcotest-lwt +, alcotest +, eio_main }: buildDunePackage rec { pname = "wayland"; - version = "1.1"; + version = "2.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; - sha256 = "0b7czgh08i6xcx3fsz6vd19sfyngwi0i27jdzg8cnjgrgwnagv6d"; + hash = "sha256-iCG1zk1tA7gdGGt78c3sQi0NN9Fh3HsCP4cy7Y3pg0s="; }; propagatedBuildInputs = [ - lwt + eio logs fmt cstruct @@ -35,7 +35,8 @@ buildDunePackage rec { ]; checkInputs = [ - alcotest-lwt + alcotest + eio_main ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix index 416438dafb..99b6fb245a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "yaml"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz"; - hash = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc="; + hash = "sha256-xQ0qyii5+WZ5K3HhYDNR5dJO2k39PkRT+9UDZqOggic="; }; minimalOCamlVersion = "4.13"; - duneVersion = "3"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index aa8566ea60..e0cc9fac17 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,14 +1,17 @@ -{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }: +{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +, junit_alcotest +}: buildDunePackage rec { pname = "yaml-sexp"; inherit (yaml) version src; - duneVersion = "3"; - propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ]; + doCheck = true; + checkInputs = [ junit_alcotest ]; + meta = yaml.meta // { description = "ocaml-yaml with sexp support"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix index ca7b893ebc..38a920ae86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0="; + hash = "sha256-1YGDIHsZjcBlhmI5Bm4HTDT54TnA2cQXWjiAl5DogXM="; }; nativeBuildInputs = [ cppo ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix index 5f0c0965b2..48c1fb471f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -4,8 +4,8 @@ }: let params = if lib.versionAtLeast ocaml.version "5.0" then { - version = "4.0.0"; - hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4="; + version = "5.1.0"; + hash = "sha256-J3qkytgJkk2gT83KJ47nNM4cXqVHbx4iTPK+fLwR7Wk="; propagatedBuildInputs = [ algaeff bwd ]; } else { version = "2.0.0"; @@ -18,7 +18,6 @@ buildDunePackage rec { inherit (params) version; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index 70f0be8c7a..b260d946ce 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -9,12 +9,12 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-zarith"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "ocaml"; repo = "Zarith"; rev = "release-${version}"; - sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; + sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; - homepage = "http://forge.ocamlcore.org/projects/zarith"; + homepage = "https://github.com/ocaml/Zarith"; + changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus-gtk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus-gtk/default.nix index c0e0e58606..759a625d26 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/zelus-gtk/default.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "zelus-gtk"; inherit (zelus) version src postPatch; - minimalOCamlVersion = "4.08.1"; + minimalOCamlVersion = "4.10"; nativeBuildInputs = [ zelus diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix index 8348aba3c3..74acc26bb0 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/communications/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "communications"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-SfA81UP0c7VgroxSA/RZVVKZ4arl8Uhpf324F7yGFTo="; + sha256 = "sha256-psQuiBOI1mXXZaH4EesVO91r2ViCc0KrKxKM7Xw+gts="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix index 74df9fcda0..8b17493bb3 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix @@ -8,13 +8,13 @@ buildOctavePackage rec { pname = "control"; - version = "3.5.2"; + version = "3.6.1"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "pkg-control"; - rev = "${pname}-${version}"; - sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s="; + rev = "refs/tags/control-${version}"; + sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g="; }; # Running autoreconfHook inside the src directory fixes a compile issue about diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix index 8dabd86ef9..33caeb1ea5 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/general/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "general"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-owzRp5dDxiUo2uRuvUqD+EiuRqHB2sPqq8NmYtQilM8="; + sha256 = "sha256-amslJm3haXaAehdm6jYJxcGZl+ggUcnJc3i6YJ3QkyM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix index 690c775f67..80f2f6dc15 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/sockets/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "sockets"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-GNwFLNV1u3UKJp9lhLtCclD2VSKC9Mko1hBoSn5dTpI="; + sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix index 9a249c4674..1e05ef98c0 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/splines/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "splines"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "11a34f6a7615fc8x1smk3lx8vslilx4mrxi8f01la3wq68khnq5f"; + sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix index 433a70f19b..552f7a4f8e 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/statistics/default.nix @@ -6,13 +6,13 @@ buildOctavePackage rec { pname = "statistics"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "statistics"; rev = "refs/tags/release-${version}"; - sha256 = "sha256-gFauFIaXKzcPeNvpWHv5FAxYQvZNh7ELrSUIvn43IfQ="; + sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc="; }; requiredOctavePackages = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix index 192115309f..7afebb9ad9 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "stk"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz"; - sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; + sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix index 77353faa4e..35887d2495 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/strings/default.nix @@ -8,11 +8,11 @@ buildOctavePackage rec { pname = "strings"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-agpTD9FN1qdp+BYdW5f+GZV0zqZMNzeOdymdo27mTOI="; + sha256 = "sha256-9l5eYgzw5K85trRAJW9eMYZxvf0RDNxDlD0MtwrSCLc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix index 2bcff7c48e..1ecbce2f52 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/windows/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "windows"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-U5Fe5mTn/ms8w9j6NdEtiRFZkKeyV0I3aR+zYQw4yIs="; + sha256 = "sha256-LH9+3MLme4UIcpm5o/apNmkbmJ6NsRsW5TkGpmiNHP0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch b/third_party/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch new file mode 100644 index 0000000000..ba79c8c0eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Alien-FFI-dont-download.patch @@ -0,0 +1,29 @@ +diff --git a/alienfile b/alienfile +index 18d6b42..5ccf296 100644 +--- a/alienfile ++++ b/alienfile +@@ -11,12 +11,6 @@ plugin 'PkgConfig' => 'libffi'; + + share { + +- plugin 'Download::GitHub' => ( +- github_user => 'libffi', +- github_repo => 'libffi', +- asset => 1, +- ); +- + plugin 'Build::Autoconf' => (); + + my $configure = '--disable-shared --enable-static --disable-builddir'; +diff --git a/t/00_diag.t b/t/00_diag.t +index 51dd784..2bc314c 100644 +--- a/t/00_diag.t ++++ b/t/00_diag.t +@@ -13,7 +13,6 @@ $modules{$_} = $_ for qw( + Alien::Base + Alien::Build + Alien::Build::MM +- Alien::Build::Plugin::Download::GitHub + Alien::Build::Plugin::Probe::Vcpkg + Capture::Tiny + ExtUtils::MakeMaker diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch b/third_party/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch new file mode 100644 index 0000000000..47bc8ee9dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/ArchiveLibarchive-set-findlib-path.patch @@ -0,0 +1,25 @@ +diff --git a/lib/Archive/Libarchive/Lib.pm b/lib/Archive/Libarchive/Lib.pm +index 3fcbcf4..214df7a 100644 +--- a/lib/Archive/Libarchive/Lib.pm ++++ b/lib/Archive/Libarchive/Lib.pm +@@ -3,7 +3,7 @@ package Archive::Libarchive::Lib; + use strict; + use warnings; + use 5.020; +-use FFI::CheckLib 0.30 qw( find_lib_or_die ); ++use FFI::CheckLib qw( find_lib_or_die ); + use Encode qw( decode ); + use experimental qw( signatures ); + +index 3fcbcf4..718caed 100644 +--- a/lib/Archive/Libarchive/Lib.pm ++++ b/lib/Archive/Libarchive/Lib.pm +@@ -23,7 +23,7 @@ L. + + sub lib + { +- $ENV{ARCHIVE_LIBARCHIVE_LIB_DLL} // find_lib_or_die( lib => 'archive', symbol => ['archive_read_free','archive_write_free','archive_free'], alien => ['Alien::Libarchive3'] ); ++ $ENV{ARCHIVE_LIBARCHIVE_LIB_DLL} // find_lib_or_die( lib => 'archive', symbol => ['archive_read_free','archive_write_free','archive_free'], libpath => '@@libarchive@@' ); + } + + sub ffi diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch b/third_party/nixpkgs/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch new file mode 100644 index 0000000000..1ac68ee19d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch @@ -0,0 +1,86 @@ +diff -ur a/gdk.typemap b/gdk.typemap +--- a/gdk.typemap 2017-05-21 15:02:54.000000000 -0400 ++++ b/gdk.typemap 2023-11-03 13:17:43.717890172 -0400 +@@ -23,6 +23,7 @@ + TYPEMAP + + # can be either a pointer or an integer, this handles both cases ++uintptr_t T_UV + GdkNativeWindow T_UV + + # GdkBitmap doesn't get its own type id, but needs to be treated separately. +diff -ur a/xs/GdkDnd.xs b/xs/GdkDnd.xs +--- a/xs/GdkDnd.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkDnd.xs 2023-11-03 13:23:22.478329089 -0400 +@@ -142,12 +142,12 @@ + void + gdk_drag_get_protocol_for_display (class, display, xid) + GdkDisplay *display +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol_for_display (display, xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol_for_display (display, INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (ret + ? newSVGdkDragProtocol (protocol) +@@ -184,12 +184,12 @@ + =cut + void + gdk_drag_get_protocol (class, xid) +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol (xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol (INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (newSVGdkDragProtocol (protocol))); + +diff -ur a/xs/GdkSelection.xs b/xs/GdkSelection.xs +--- a/xs/GdkSelection.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkSelection.xs 2023-11-03 13:26:58.976888906 -0400 +@@ -147,7 +147,7 @@ + ## void gdk_selection_send_notify (guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time_) + void + gdk_selection_send_notify (class, requestor, selection, target, property, time_) +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +@@ -161,7 +161,7 @@ + void + gdk_selection_send_notify_for_display (class, display, requestor, selection, target, property, time_) + GdkDisplay *display +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +diff -ur a/xs/GtkWindow.xs b/xs/GtkWindow.xs +--- a/xs/GtkWindow.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GtkWindow.xs 2023-11-03 13:32:53.673168678 -0400 +@@ -581,13 +581,13 @@ + void + gtk_window_remove_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ## void gtk_window_add_embedded_xid (GtkWindow *window, guint xid) + void + gtk_window_add_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ##void gtk_window_reshow_with_initial_size (GtkWindow *window) + void diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch b/third_party/nixpkgs/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch new file mode 100644 index 0000000000..65c6d238bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index eaf47e0..32766d7 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -146,7 +146,7 @@ extern "C" + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $f (); +-char (*f) (); ++char f; + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/third_party/nixpkgs/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch new file mode 100644 index 0000000000..6ca6e83094 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch @@ -0,0 +1,143 @@ +From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001 +From: Paul Howarth +Date: Sat, 13 Mar 2021 17:46:57 +0000 +Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106 + +GLD is now outputting text with wrapping depending on the terminal +width. This update is enough to get the tests to pass when running +within "expect", which provides a PTY. It's almost certainly not +enough for general use. +--- + t/104_override_usage.t | 8 ++++++++ + t/107_no_auto_help.t | 2 +- + t/109_help_flag.t | 2 +- + t/110_sort_usage_by_attr_order.t | 12 ++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index bc45029..6641540 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,9 +61,17 @@ use Test::Exception; + \t--foo INT A foo + } + : ++ $Getopt::Long::Descriptive::VERSION < 0.106 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo ++} ++ : ++ qq{usage: 104_override_usage.t [-?] [long options...] ++\t--[no-]help (or -?) Prints ++\t this usage information. ++\t aka --usage ++\t--foo INT A foo + } + + ]; +diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t +index 27f87f5..103df43 100644 +--- a/t/107_no_auto_help.t ++++ b/t/107_no_auto_help.t +@@ -60,7 +60,7 @@ END { + warning_like { + throws_ok { Class->new_with_options } + #usage: 107_no_auto_help.t [-?] [long options...] +- qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms, ++ qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms, + 'usage information looks good'; + } + qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/, +diff --git a/t/109_help_flag.t b/t/109_help_flag.t +index 8c658e2..58dbca6 100644 +--- a/t/109_help_flag.t ++++ b/t/109_help_flag.t +@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] ) + local @ARGV = @$args; + + throws_ok { MyClass->new_with_options() } +- qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms, ++ qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms, + 'Help request detected; usage information properly printed'; + } + +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index e7dd177..7ec0c99 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } ++if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++{ ++$expected = <<'USAGE'; ++usage: 110_sort_usage_by_attr_order.t [-?] [long options...] ++ --[no-]help (or -?) Prints ++ this usage information. ++ aka --usage ++ --foo STR Documentation for "foo" ++ --bar STR Documentation for "bar" ++ --baz STR Documentation for "baz" ++USAGE ++} + $expected =~ s/^[ ]{4}/\t/xmsg; + is($obj->usage->text, $expected, 'Usage text has nicely sorted options'); + + +From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001 +From: Paul Howarth +Date: Mon, 15 Mar 2021 10:43:14 +0000 +Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107 + +GLD's use of Term::ReadKey has been reverted, so this update should now +work reliably. Use with GLD 0.106 is not supported. +--- + t/104_override_usage.t | 6 +++--- + t/110_sort_usage_by_attr_order.t | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index 6641540..f7c6a31 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,15 +61,15 @@ use Test::Exception; + \t--foo INT A foo + } + : +- $Getopt::Long::Descriptive::VERSION < 0.106 ? ++ # Note: Getopt::Long::Descriptive 0.106 not supported ++ $Getopt::Long::Descriptive::VERSION < 0.107 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo + } + : + qq{usage: 104_override_usage.t [-?] [long options...] +-\t--[no-]help (or -?) Prints +-\t this usage information. ++\t--[no-]help (or -?) Prints this usage information. + \t aka --usage + \t--foo INT A foo + } +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index 7ec0c99..16cdaa1 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } +-if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++# Note: Getopt::Long::Descriptive 0.106 not supported ++if ( $Getopt::Long::Descriptive::VERSION >= 0.107 ) + { + $expected = <<'USAGE'; + usage: 110_sort_usage_by_attr_order.t [-?] [long options...] +- --[no-]help (or -?) Prints +- this usage information. ++ --[no-]help (or -?) Prints this usage information. + aka --usage + --foo STR Documentation for "foo" + --bar STR Documentation for "bar" diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/third_party/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch index 5e80025011..99bd697307 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch +++ b/third_party/nixpkgs/pkgs/development/perl-modules/Paranoid-blessed-path.patch @@ -1,23 +1,22 @@ -diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm ---- Paranoid-2.05/lib/Paranoid.pm 2017-02-06 05:48:57.000000000 -0500 -+++ /tmp/Paranoid-2.05/lib/Paranoid.pm 2018-05-10 06:40:35.286313299 -0400 -@@ -61,7 +61,7 @@ +diff '--color=auto' -ur Paranoid-2.10/lib/Paranoid.pm Paranoid-2.10-patched/lib/Paranoid.pm +--- Paranoid-2.10/lib/Paranoid.pm 2022-03-08 10:01:04.000000000 +0100 ++++ Paranoid-2.10-patched/lib/Paranoid.pm 2023-10-20 16:57:54.025754755 +0200 +@@ -47,7 +47,7 @@ + %EXPORT_TAGS = ( all => [@EXPORT_OK], ); - my $path = shift; + use constant PTRUE_ZERO => '0 but true'; +-use constant DEFAULT_PATH => '/bin:/sbin:/usr/bin:/usr/sbin'; ++use constant DEFAULT_PATH => '__BLESSED_PATH__'; -- $path = '/bin:/usr/bin' unless defined $path; -+ $path = '__BLESSED_PATH__' unless defined $path; - - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; - $ENV{PATH} = $path; -Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ -diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t ---- Paranoid-2.05/t/01_init_core.t 2016-07-12 04:49:33.000000000 -0400 -+++ /tmp/Paranoid-2.05/t/01_init_core.t 2018-05-10 06:43:41.323183381 -0400 -@@ -35,5 +35,5 @@ + ##################################################################### + # +diff '--color=auto' -ur Paranoid-2.10/t/01_init_core.t Paranoid-2.10-patched/t/01_init_core.t +--- Paranoid-2.10/t/01_init_core.t 2022-01-24 10:30:20.000000000 +0100 ++++ Paranoid-2.10-patched/t/01_init_core.t 2023-10-20 16:58:16.856288407 +0200 +@@ -35,5 +35,4 @@ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' ); is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' ); ok( psecureEnv(), 'psecureEnv 2' ); --is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' ); +-is( $ENV{PATH}, '/bin:/sbin:/usr/bin:/usr/sbin', 'Validated PATH' ); +- +is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' ); - diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch new file mode 100644 index 0000000000..9a19e32bc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch @@ -0,0 +1,47 @@ +From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 16 Jan 2023 18:50:10 -0800 +Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers + +This is now detected with latest clang16+ + +Fixes +error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); + +Signed-off-by: Khem Raj +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..ec2b5ea 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/generic/builder.sh b/third_party/nixpkgs/pkgs/development/perl-modules/generic/builder.sh index 110094ad8a..4da9f7a982 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/generic/builder.sh +++ b/third_party/nixpkgs/pkgs/development/perl-modules/generic/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/third_party/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index e9b501c29e..3b6156d3a7 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/third_party/nixpkgs/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,31 +1,14 @@ -From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001 -From: Tyson Whitehead -Date: Fri, 29 Jun 2018 15:47:00 -0400 -Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order) - ---- - lib/LWP/Protocol/https.pm | 8 ++++++++ - 1 file changed, 8 insertions(+) - diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm -index f7230e2..c78b9ce 100644 +index 645e828..7098f64 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -23,6 +23,14 @@ sub _extra_sock_opts - $ssl_opts{SSL_verify_mode} = 0; +@@ -29,6 +29,9 @@ sub _extra_sock_opts + } } if ($ssl_opts{SSL_verify_mode}) { -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" -+ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; -+ } - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; --- -2.14.0 - ++ if ($ENV{NIX_SSL_CERT_FILE}) { ++ $ssl_opts{SSL_ca_file} //= $ENV{NIX_SSL_CERT_FILE}; ++ } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + if ($Net::HTTPS::SSL_SOCKET_CLASS eq 'IO::Socket::SSL' + && defined &IO::Socket::SSL::default_ca diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/mhonarc.patch b/third_party/nixpkgs/pkgs/development/perl-modules/mhonarc.patch deleted file mode 100644 index 12b8cc2931..0000000000 --- a/third_party/nixpkgs/pkgs/development/perl-modules/mhonarc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/mhamain.pl b/lib/mhamain.pl -index 80980a2..c1259ce 100644 ---- a/lib/mhamain.pl -+++ b/lib/mhamain.pl -@@ -1562,7 +1562,7 @@ sub signal_catch { - ## - sub defineIndex2MsgId { - no warnings qw(deprecated); -- if (!defined(%Index2MsgId)) { -+ unless (%Index2MsgId) { - foreach (keys %MsgId) { - $Index2MsgId{$MsgId{$_}} = $_; - } -diff --git a/lib/mhopt.pl b/lib/mhopt.pl -index 02fb05e..939109b 100644 ---- a/lib/mhopt.pl -+++ b/lib/mhopt.pl -@@ -865,7 +865,7 @@ sub update_data_1_to_2 { - sub update_data_2_1_to_later { - no warnings qw(deprecated); - # we can preserve filter arguments -- if (defined(%main::MIMEFiltersArgs)) { -+ if (%main::MIMEFiltersArgs) { - warn qq/ preserving MIMEARGS...\n/; - %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; - $IsDefault{'MIMEARGS'} = 0; diff --git a/third_party/nixpkgs/pkgs/development/pharo/default.nix b/third_party/nixpkgs/pkgs/development/pharo/default.nix index 2cf98d4936..3c17b2bd79 100644 --- a/third_party/nixpkgs/pkgs/development/pharo/default.nix +++ b/third_party/nixpkgs/pkgs/development/pharo/default.nix @@ -23,8 +23,8 @@ let pharo-sources = fetchurl { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.5-2757766-Linux-x86_64-c-src.zip"; - hash = "sha256-i6WwhdVdyzmqGlx1Fn12mCq5+HnRORT65HEiJo0joCE="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; + hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; }; library_path = makeLibraryPath [ libgit2 @@ -35,7 +35,7 @@ let in stdenv.mkDerivation { pname = "pharo"; - version = "10.0.5"; + version = "10.0.8"; src = pharo-sources; buildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation { cmakeFlags = [ # Necessary to perform the bootstrapping without already having Pharo available. "-DGENERATED_SOURCE_DIR=." + "-DALWAYS_INTERACTIVE=ON" + "-DBUILD_IS_RELEASE=ON" "-DGENERATE_SOURCES=OFF" # Prevents CMake from trying to download stuff. "-DBUILD_BUNDLE=OFF" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix index bc95555311..5153c500f2 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/amqp/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, rabbitmq-c, fetchFromGitHub }: let - version = "1.11.0"; + version = "2.1.1"; in buildPecl { inherit version; pname = "amqp"; @@ -10,7 +10,7 @@ in buildPecl { owner = "php-amqp"; repo = "php-amqp"; rev = "v${version}"; - sha256 = "sha256-CDhNDk78D15MtljbtyYj8euPnCruLZnc2NEHqXDX8HY="; + sha256 = "sha256-QHiQL3INd0zQpmCOcJx7HhN770m9ql0Cs63OTOLOrNQ="; }; buildInputs = [ rabbitmq-c ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix index b1e447a4a7..fec3b438ab 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/box/default.nix @@ -2,23 +2,23 @@ php.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.3.8"; + version = "4.5.0"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-v1J84nqaX36DrLLH5kld+8NIymqtt5/5nJWJNCBVFRE="; + hash = "sha256-6icHXRxqre2RBIRoc3zfQnxGRHh2kIen2oLJ3eQjD/0="; }; - vendorHash = "sha256-LWggAUBMKljxa7HNdJMqOD/sx3IWCOQSqbYEnGntjN0="; + vendorHash = "sha256-n/F/il1u+3amSVf8fr0scZSkXuwxW43iq5F2XQJ3xfM="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; description = "An application for building and managing Phars"; - license = lib.licenses.mit; homepage = "https://github.com/box-project/box"; - maintainers = lib.teams.php.members; + license = lib.licenses.mit; mainProgram = "box"; + maintainers = lib.teams.php.members; }; }) 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 b2bf7da5c2..369b6220ad 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix @@ -8,13 +8,13 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-rJz4BY74BI8gyT4ZlABc4PA+SCsd8guM0m2MTej350g="; + hash = "sha256-zTtMNBZcWjEQB70/6i4pvYEepDVCItJgkwrQ2xrXDAU="; }; vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM="; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/Cargo.lock b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/Cargo.lock index dda6204e31..b2633f3a06 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/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" @@ -20,14 +29,32 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.0.2" +name = "ahash" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check 0.9.4", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -40,7 +67,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", ] [[package]] @@ -50,10 +77,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "anyhow" -version = "1.0.71" +name = "anstyle" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "assert-type-eq" @@ -69,13 +102,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -85,7 +118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", - "libc 0.2.146", + "libc 0.2.149", "winapi", ] @@ -96,16 +129,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base64" -version = "0.21.2" +name = "axum" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[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 0.2.149", + "miniz_oxide", + "object 0.32.1", + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "basic-toml" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" +checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" dependencies = [ "serde", ] @@ -125,20 +224,20 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", "lazycell", "log", "peeking_take_while", - "prettyplease", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.18", + "syn 2.0.38", "which", ] @@ -156,9 +255,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmaps" @@ -168,21 +267,21 @@ checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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", ] @@ -199,7 +298,7 @@ version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" dependencies = [ - "clap", + "clap 3.2.25", "heck", "indexmap 1.9.3", "log", @@ -214,9 +313,12 @@ dependencies = [ [[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 0.2.149", +] [[package]] name = "cc_utils" @@ -243,14 +345,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "winapi", + "windows-targets", ] [[package]] @@ -287,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", - "libc 0.2.146", + "libc 0.2.149", "libloading", ] @@ -299,13 +401,32 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", "strsim", "termcolor", "textwrap", ] +[[package]] +name = "clap" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +dependencies = [ + "anstyle", + "clap_lex 0.5.1", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -315,6 +436,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + [[package]] name = "common-multipart-rfc7578" version = "0.5.0" @@ -331,6 +458,42 @@ dependencies = [ "thiserror", ] +[[package]] +name = "console-api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +dependencies = [ + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures", + "hdrhistogram", + "humantime", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -338,7 +501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", - "libc 0.2.146", + "libc 0.2.149", ] [[package]] @@ -353,7 +516,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", "winapi", ] @@ -368,19 +531,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap", + "clap 4.4.6", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -394,9 +557,9 @@ dependencies = [ [[package]] name = "criterion-perf-events" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a5379f1ceab88909ae1765858b6ca117acc8166d7f4cdca6cfc4bc4646124d" +checksum = "902f0b181e1f7a7865e224df9cff57f164c3d95ad8dfcb81f692faa5087c2f17" dependencies = [ "criterion", "perfcnt", @@ -457,9 +620,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -469,33 +632,28 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "datadog-ipc" version = "0.1.0" dependencies = [ + "anyhow", "bytes", "criterion", + "datadog-ipc-macros", "futures", + "glibc_version", "io-lifetimes", - "libc 0.2.146", - "nix", + "libc 0.2.149", + "memfd", + "nix 0.26.4", + "page_size", "pin-project", "pretty_assertions", "sendfd", @@ -511,11 +669,21 @@ dependencies = [ ] [[package]] -name = "datadog-php-profiling" -version = "0.89.0" +name = "datadog-ipc-macros" +version = "0.0.1" dependencies = [ + "quote", + "syn 2.0.38", +] + +[[package]] +name = "datadog-php-profiling" +version = "0.93.1" +dependencies = [ + "ahash 0.8.3", "anyhow", "bindgen", + "bumpalo", "cc", "cfg-if", "cpu-time", @@ -523,13 +691,14 @@ dependencies = [ "criterion-perf-events", "crossbeam-channel", "datadog-profiling", - "ddcommon 2.2.0 (git+https://github.com/DataDog/libdatadog?tag=v2.2.0)", + "ddcommon 5.0.0", "env_logger", - "indexmap 2.0.0", + "indexmap 2.0.2", "lazy_static", - "libc 0.2.146", + "libc 0.2.149", "log", "once_cell", + "ouroboros", "perfcnt", "rand 0.8.5", "rand_distr", @@ -538,14 +707,14 @@ dependencies = [ [[package]] name = "datadog-profiling" -version = "2.2.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v2.2.0#ef8935ce7e77bedbb3dcbcf9dcc2f41bb0e6db90" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v5.0.0#7b8a01ecfaf03e063feb16896356e71b9a2fc6f3" dependencies = [ "anyhow", "bitmaps", "bytes", "chrono", - "ddcommon 2.2.0 (git+https://github.com/DataDog/libdatadog?tag=v2.2.0)", + "ddcommon 5.0.0", "derivative", "futures", "futures-core", @@ -555,7 +724,7 @@ dependencies = [ "hyper", "hyper-multipart-rfc7578", "indexmap 1.9.3", - "libc 0.2.146", + "libc 0.2.149", "lz4_flex", "mime", "mime_guess", @@ -565,7 +734,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", ] [[package]] @@ -573,8 +742,15 @@ name = "datadog-sidecar" version = "0.0.1" dependencies = [ "anyhow", + "bytes", + "console-subscriber", "datadog-ipc", - "ddcommon 2.2.0", + "datadog-ipc-macros", + "datadog-sidecar-macros", + "datadog-trace-normalization", + "datadog-trace-protobuf", + "datadog-trace-utils", + "ddcommon 0.0.1", "ddtelemetry", "futures", "hashbrown 0.12.3", @@ -582,12 +758,14 @@ dependencies = [ "hyper", "io-lifetimes", "lazy_static", - "libc 0.2.146", + "libc 0.2.149", "manual_future", - "nix", + "nix 0.26.4", "pin-project", + "prctl", "rand 0.8.5", "regex", + "rmp-serde", "sendfd", "serde", "serde_json", @@ -595,10 +773,11 @@ dependencies = [ "sys-info", "tempfile", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-subscriber", "uuid", + "zwohash", ] [[package]] @@ -607,23 +786,76 @@ version = "0.0.1" dependencies = [ "datadog-ipc", "datadog-sidecar", + "datadog-trace-utils", + "ddcommon 0.0.1", "ddcommon-ffi", "ddtelemetry", "ddtelemetry-ffi", - "libc 0.2.146", + "hyper", + "libc 0.2.149", "paste", "tempfile", ] +[[package]] +name = "datadog-sidecar-macros" +version = "0.0.1" +dependencies = [ + "quote", + "syn 2.0.38", +] + +[[package]] +name = "datadog-trace-normalization" +version = "0.0.1" +dependencies = [ + "anyhow", + "datadog-trace-protobuf", + "duplicate", + "rand 0.8.5", +] + +[[package]] +name = "datadog-trace-protobuf" +version = "0.0.1" +dependencies = [ + "prost", + "prost-build", + "protoc-bin-vendored", + "serde", + "serde_bytes", +] + +[[package]] +name = "datadog-trace-utils" +version = "0.0.1" +dependencies = [ + "anyhow", + "datadog-trace-normalization", + "datadog-trace-protobuf", + "ddcommon 0.0.1", + "flate2", + "futures", + "hyper", + "hyper-rustls", + "log", + "prost", + "rmp-serde", + "serde", + "serde_json", + "tokio", +] + [[package]] name = "ddcommon" -version = "2.2.0" +version = "0.0.1" dependencies = [ "anyhow", "futures", "futures-core", "futures-util", "hex", + "http", "hyper", "hyper-rustls", "indexmap 1.9.3", @@ -641,14 +873,15 @@ dependencies = [ [[package]] name = "ddcommon" -version = "2.2.0" -source = "git+https://github.com/DataDog/libdatadog?tag=v2.2.0#ef8935ce7e77bedbb3dcbcf9dcc2f41bb0e6db90" +version = "5.0.0" +source = "git+https://github.com/DataDog/libdatadog?tag=v5.0.0#7b8a01ecfaf03e063feb16896356e71b9a2fc6f3" dependencies = [ "anyhow", "futures", "futures-core", "futures-util", "hex", + "http", "hyper", "hyper-rustls", "lazy_static", @@ -664,18 +897,19 @@ dependencies = [ [[package]] name = "ddcommon-ffi" -version = "2.2.0" +version = "0.0.1" dependencies = [ "anyhow", - "ddcommon 2.2.0", + "ddcommon 0.0.1", + "hyper", ] [[package]] name = "ddtelemetry" -version = "2.2.0" +version = "0.0.1" dependencies = [ "anyhow", - "ddcommon 2.2.0", + "ddcommon 0.0.1", "futures", "hashbrown 0.12.3", "http", @@ -688,7 +922,7 @@ dependencies = [ "serde_json", "sys-info", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-subscriber", "uuid", @@ -696,11 +930,12 @@ dependencies = [ [[package]] name = "ddtelemetry-ffi" -version = "2.2.0" +version = "0.0.1" dependencies = [ + "ddcommon 0.0.1", "ddcommon-ffi", "ddtelemetry", - "libc 0.2.146", + "libc 0.2.149", "paste", "tempfile", ] @@ -709,11 +944,12 @@ dependencies = [ name = "ddtrace-php" version = "0.0.1" dependencies = [ + "bitflags 2.4.0", "cbindgen", "cc_utils", "datadog-sidecar", "datadog-sidecar-ffi", - "ddcommon 2.2.0", + "ddcommon 0.0.1", "ddcommon-ffi", "ddtelemetry", "ddtelemetry-ffi", @@ -744,10 +980,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "educe" -version = "0.4.22" +name = "duplicate" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "a0a4be4cd710e92098de6ad258e6e7c24af11c29c5142f3c6f2a545652480ff8" +dependencies = [ + "heck", + "proc-macro-error", +] + +[[package]] +name = "educe" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -757,21 +1003,21 @@ dependencies = [ [[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 = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -789,45 +1035,37 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", - "libc 0.2.146", - "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 0.2.146", + "libc 0.2.149", + "windows-sys", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -901,7 +1139,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -958,16 +1196,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "libc 0.2.146", + "libc 0.2.149", "wasi", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glibc_version" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803ff7635f1ab4e2c064b68a0c60da917d3d18dc8d086130f689d62ce4f1c33e" +dependencies = [ + "regex", +] + [[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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util 0.7.9", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -980,14 +1252,27 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" + +[[package]] +name = "hdrhistogram" +version = "7.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +dependencies = [ + "base64 0.13.1", + "byteorder", + "flate2", + "nom 7.1.3", + "num-traits", +] [[package]] name = "heck" @@ -1001,23 +1286,14 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", ] [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc 0.2.146", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1025,6 +1301,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + [[package]] name = "http" version = "0.2.9" @@ -1055,9 +1340,9 @@ 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 = "humantime" @@ -1067,21 +1352,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1115,6 +1401,18 @@ dependencies = [ "tokio-rustls", ] +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -1150,21 +1448,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", + "hashbrown 0.14.1", ] [[package]] @@ -1179,21 +1468,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", - "libc 0.2.146", - "windows-sys 0.48.0", + "hermit-abi 0.3.3", + "libc 0.2.149", + "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.3", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1207,9 +1495,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -1246,9 +1534,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1262,15 +1550,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -1284,9 +1572,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lz4_flex" @@ -1318,20 +1606,26 @@ 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]] -name = "memchr" -version = "2.5.0" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ "rustix", ] @@ -1345,6 +1639,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.9.0" @@ -1391,9 +1694,9 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", "wasi", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1406,6 +1709,12 @@ dependencies = [ "tempdir", ] +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + [[package]] name = "nix" version = "0.24.3" @@ -1414,10 +1723,34 @@ checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", - "libc 0.2.146", + "libc 0.2.149", "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc 0.2.149", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "libc 0.2.149", +] + [[package]] name = "nom" version = "4.2.3" @@ -1450,9 +1783,9 @@ 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", @@ -1471,9 +1804,9 @@ dependencies = [ [[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", "libm", @@ -1481,12 +1814,12 @@ dependencies = [ [[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", - "libc 0.2.146", + "hermit-abi 0.3.3", + "libc 0.2.149", ] [[package]] @@ -1500,6 +1833,15 @@ dependencies = [ "ruzstd", ] +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1579,12 +1921,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "output_vt100" -version = "0.1.3" +name = "ouroboros" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" dependencies = [ - "winapi", + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -1593,6 +1950,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "page_size" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" +dependencies = [ + "libc 0.2.149", + "winapi", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -1610,7 +1977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "libc 0.2.146", + "libc 0.2.149", "redox_syscall", "smallvec", "windows-targets", @@ -1618,9 +1985,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "peeking_take_while" @@ -1641,12 +2008,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ba1fd955270ca6f8bd8624ec0c4ee1a251dd3cc0cc18e1e2665ca8f5acb1501" dependencies = [ "bitflags 1.3.2", - "libc 0.2.146", + "libc 0.2.149", "mmap", "nom 4.2.3", "x86", ] +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.0.2", +] + [[package]] name = "phf" version = "0.9.0" @@ -1687,29 +2064,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[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" @@ -1752,32 +2129,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty_assertions" -version = "1.3.0" +name = "prctl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" +dependencies = [ + "libc 0.2.149", + "nix 0.27.1", +] + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] [[package]] name = "prettyplease" -version = "0.2.9" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn 2.0.18", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.38", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check 0.9.4", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check 0.9.4", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1792,6 +2211,28 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -1806,10 +2247,69 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.28" +name = "prost-types" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "protoc-bin-vendored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d" +dependencies = [ + "protoc-bin-vendored-linux-aarch_64", + "protoc-bin-vendored-linux-ppcle_64", + "protoc-bin-vendored-linux-x86_32", + "protoc-bin-vendored-linux-x86_64", + "protoc-bin-vendored-macos-x86_64", + "protoc-bin-vendored-win32", +] + +[[package]] +name = "protoc-bin-vendored-linux-aarch_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435" + +[[package]] +name = "protoc-bin-vendored-linux-ppcle_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516" + +[[package]] +name = "protoc-bin-vendored-linux-x86_32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0" + +[[package]] +name = "protoc-bin-vendored-linux-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924" + +[[package]] +name = "protoc-bin-vendored-macos-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537" + +[[package]] +name = "protoc-bin-vendored-win32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1821,7 +2321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ "fuchsia-cprng", - "libc 0.2.146", + "libc 0.2.149", "rand_core 0.3.1", "rdrand", "winapi", @@ -1833,7 +2333,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", "rand_chacha", "rand_core 0.6.4", ] @@ -1893,9 +2393,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1903,14 +2403,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1933,13 +2431,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.1", + "regex-syntax 0.8.1", ] [[package]] @@ -1951,6 +2450,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.1", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -1959,9 +2469,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "remove_dir_all" @@ -1979,23 +2489,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", - "libc 0.2.146", + "libc 0.2.149", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc 0.2.149", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "rlimit" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", ] +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[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" @@ -2004,26 +2556,25 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "errno", - "io-lifetimes", - "libc 0.2.146", + "libc 0.2.149", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -2042,13 +2593,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64", + "base64 0.21.4", ] +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + [[package]] name = "ruzstd" version = "0.3.1" @@ -2062,9 +2619,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2077,18 +2634,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -2096,31 +2653,31 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", "core-foundation-sys", - "libc 0.2.146", + "libc 0.2.149", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", - "libc 0.2.146", + "libc 0.2.149", ] [[package]] @@ -2129,44 +2686,44 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", "tokio", ] [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2175,24 +2732,24 @@ 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", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "sidecar_mockgen" version = "0.1.0" dependencies = [ - "object", + "object 0.31.1", ] [[package]] @@ -2201,29 +2758,29 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", ] [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -2231,10 +2788,20 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ - "libc 0.2.146", + "libc 0.2.149", "winapi", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc 0.2.149", + "windows-sys", +] + [[package]] name = "spawn_worker" version = "0.0.1" @@ -2243,7 +2810,7 @@ dependencies = [ "cc_utils", "io-lifetimes", "memfd", - "nix", + "nix 0.24.3", "rlimit", "tempfile", ] @@ -2254,6 +2821,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "static_assertions" version = "1.1.0" @@ -2279,15 +2852,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" 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 = "sys-info" version = "0.9.1" @@ -2295,7 +2874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" dependencies = [ "cc", - "libc 0.2.146", + "libc 0.2.149", ] [[package]] @@ -2323,7 +2902,7 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", - "tokio-util 0.7.8", + "tokio-util 0.7.9", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -2355,23 +2934,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2384,22 +2962,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -2446,22 +3024,32 @@ dependencies = [ [[package]] name = "tokio" -version = "1.28.2" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "autocfg", + "backtrace", "bytes", - "libc 0.2.146", + "libc 0.2.149", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.4", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", ] [[package]] @@ -2472,7 +3060,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -2529,9 +3117,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -2551,6 +3139,60 @@ dependencies = [ "serde", ] +[[package]] +name = "tonic" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +dependencies = [ + "async-trait", + "axum", + "base64 0.21.4", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand 0.8.5", + "slab", + "tokio", + "tokio-util 0.7.9", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -2572,13 +3214,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -2641,9 +3283,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.80" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -2666,18 +3308,18 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check 0.9.4", ] [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "untrusted" @@ -2686,10 +3328,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "uuid" -version = "1.3.4" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", ] @@ -2714,9 +3362,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -2758,7 +3406,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2780,7 +3428,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2803,23 +3451,24 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc 0.2.146", + "home", "once_cell", + "rustix", ] [[package]] @@ -2840,9 +3489,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", ] @@ -2862,21 +3511,6 @@ dependencies = [ "windows-targets", ] -[[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.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-sys" version = "0.48.0" @@ -2888,102 +3522,60 @@ dependencies = [ [[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", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "x86" @@ -3005,3 +3597,9 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zwohash" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beaf63e0740cea93ca85de39611a8bc8262a50adacd6321cd209a123676d0447" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix index 618705ff99..7e9d3164cc 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/datadog_trace/default.nix @@ -13,20 +13,20 @@ buildPecl rec { pname = "ddtrace"; - version = "0.89.0"; + version = "0.93.1"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; fetchSubmodules = true; - hash = "sha256-wTGQV80XQsBdmTQ+xaBKtFwLO3S+//9Yli9aReXDlLA="; + hash = "sha256-eiqwcSDwxkuYEsseHdjBE3KFnTnD/7BMyz/DNVAKUIA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "datadog-profiling-2.2.0" = "sha256-PWzC+E2u0hM0HhU0mgZJZvFomEJdQag/3ZK1FibSLG8="; + "datadog-profiling-5.0.0" = "sha256-/Z1vGpAHpU5EO80NXnzyAHN4s3iyA1jOquBS8MH1nOo="; }; }; @@ -47,9 +47,8 @@ buildPecl rec { curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-json.patch b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-json.patch new file mode 100644 index 0000000000..7fd7441612 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-json.patch @@ -0,0 +1,27 @@ +From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 +From: Pol Dellaiera +Date: Sat, 21 Oct 2023 16:46:59 +0200 +Subject: [PATCH] composer.json + +--- + composer.json | 5 +- + 1 file changed, 4 insertion(+), 1 deletion(-) + +diff --git i/composer.json w/composer.json +index 6ac54420..69b75a51 100644 +--- i/composer.json ++++ w/composer.json +@@ -96,7 +96,10 @@ + "bin/grumphp" + ], + "config": { +- "sort-packages": true ++ "sort-packages": true, ++ "platform": { ++ "php": "8.1" ++ } + }, + "extra": { + "class": "GrumPHP\\Composer\\GrumPHPPlugin" +-- +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-lock.patch b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-lock.patch new file mode 100644 index 0000000000..2fc801557c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/composer-lock.patch @@ -0,0 +1,24 @@ +From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 +From: Pol Dellaiera +Date: Sat, 21 Oct 2023 16:46:59 +0200 +Subject: [PATCH] composer.lock + +--- + phar.composer.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/phar.composer.lock b/phar.composer.lock +index 96b692c3..a8cb2a87 100644 +--- a/phar.composer.lock ++++ b/phar.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": "8a069c630e6ddbc4475db9a992430539", ++ "content-hash": "0474062650b24a22c63007631cf35f1e", + "packages": [ + { + "name": "amphp/amp", +-- +2.42.0 diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix index c7c2d9fc32..6367dd996b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/grumphp/default.nix @@ -1,32 +1,48 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ fetchFromGitHub, stdenvNoCC, lib, php }: -mkDerivation (finalAttrs: { +php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "1.15.0"; + version = "2.1.0"; - src = fetchurl { - url = "https://github.com/phpro/grumphp/releases/download/v${finalAttrs.version}/grumphp.phar"; - sha256 = "sha256-EqzJb7DYZb7PnebErLVI/EZLxj0m26cniZlsu1feif0="; + src = fetchFromGitHub { + owner = "phpro"; + repo = "grumphp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RVgreCspdz+A6mdE2H4i8ajmdH8AZ9BOIw2OqLw7HfI="; }; - dontUnpack = true; + patches = [ + ./composer-json.patch + ]; - nativeBuildInputs = [ makeWrapper ]; + composerLock = stdenvNoCC.mkDerivation (finalComposerLockAttrs: { + name = "grumphp-composer-lock"; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/grumphp/grumphp.phar - makeWrapper ${php}/bin/php $out/bin/grumphp \ - --add-flags "$out/libexec/grumphp/grumphp.phar" - runHook postInstall - ''; + src = fetchFromGitHub { + owner = "phpro"; + repo = "grumphp-shim"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JxgRd0p/o3ouZ4MPke8cHqvAPuepY8ax0wx4t8+2dME="; + }; - meta = with lib; { + patches = [ + ./composer-lock.patch + ]; + + installPhase = '' + runHook preInstall + cp phar.composer.lock $out + runHook postInstall + ''; + }); + + vendorHash = "sha256-yefamPAzIabDCzZ9ghKq9iPH7AoCdgCCQ8PKrUN9ifQ="; + + meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; - license = licenses.mit; - maintainers = teams.php.members; + license = lib.licenses.mit; + maintainers = lib.teams.php.members; }; }) diff --git a/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix new file mode 100644 index 0000000000..d170243be2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/meminfo/default.nix @@ -0,0 +1,22 @@ +{ buildPecl, lib, fetchFromGitHub }: + +buildPecl rec { + version = "unstable-2022-03-25"; + pname = "meminfo"; + + src = fetchFromGitHub { + owner = "BitOne"; + repo = "php-meminfo"; + rev = "0ab7f5aea96c4dafce27c7e215b4907db2a2f493"; + hash = "sha256-MO+B+ZNg6OAnxkOtdA15o+G41XbsG1N1WBz7thMCjck="; + }; + + sourceRoot = "${src.name}/extension"; + + meta = { + description = "PHP extension to get insight about memory usage"; + homepage = "https://github.com/BitOne/php-meminfo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix new file mode 100644 index 0000000000..04ef8e6be5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/memprof/default.nix @@ -0,0 +1,33 @@ +{ buildPecl +, lib +, fetchFromGitHub +, judy +}: + +let + version = "3.0.2"; +in buildPecl { + inherit version; + pname = "memprof"; + + src = fetchFromGitHub { + owner = "arnaud-lb"; + repo = "php-memory-profiler"; + rev = version; + hash = "sha256-K8YcvCobErBkaWFTkVGLXXguQPOLIgQuRGWJF+HAIRA="; + }; + + configureFlags = [ + "--with-judy-dir=${judy}" + ]; + + doCheck = true; + + meta = { + changelog = "https://github.com/arnaud-lb/php-memory-profiler/releases/tag/${version}"; + description = "Memory profiler for PHP. Helps finding memory leaks in PHP scripts"; + homepage = "https://github.com/arnaud-lb/php-memory-profiler"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gaelreyrol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix index 618d7806d9..f3ceeca611 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub }: let - version = "1.0.0beta7"; + version = "1.0.0"; in buildPecl { inherit version; pname = "opentelemetry"; @@ -10,7 +10,7 @@ in buildPecl { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-FDCgRN+aV9c6ceKszrHDBmi14dEhrirlU8cbYrmIGdY="; + hash = "sha256-uCsm2vsxXfbEH9spCgWHhmqzyRH9k8kqIAIdQk5CNYg="; }; sourceRoot = "source/ext"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix index cbd689b136..87ea30233f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix @@ -2,13 +2,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-FxGibpGlbNLqWDplCv4T4yUPg5US020niLfC7tHfkCU="; + hash = "sha256-svw+cYL5ISKk6jEvdFmLcC4hEzrFw3kIbDJsymt2tEs="; }; internalDeps = [ php.extensions.session php.extensions.pdo ]; 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 937b1f1001..73b3248806 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 @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.28.0"; + version = "3.37.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-5dhS4QroRY9tGGSsXQfzWw5ObWO5fIoc+nkOUpAjUlQ="; + sha256 = "sha256-zKPkxHPF8StDgs1DC+WKVvo3VGzs+lJElRHliKUXtcw="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-spx/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-spx/default.nix new file mode 100644 index 0000000000..52beeacf3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-spx/default.nix @@ -0,0 +1,32 @@ +{ buildPecl, lib, fetchFromGitHub, zlib }: + +let + version = "0.4.14"; +in buildPecl { + inherit version; + pname = "php-spx"; + + src = fetchFromGitHub { + owner = "NoiseByNorthwest"; + repo = "php-spx"; + rev = "v${version}"; + hash = "sha256-LdR3ilknSUuNTAb9wfIpNGdaR3uwd4C47nZYRzfTfx8="; + }; + + configureFlags = [ + "--with-zlib-dir=${zlib.dev}" + ]; + + preConfigure = '' + substituteInPlace Makefile.frag \ + --replace '$(INSTALL_ROOT)$(prefix)/share/misc/php-spx/assets/web-ui' '${placeholder "out"}/share/misc/php-spx/assets/web-ui' + ''; + + meta = { + changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/${version}"; + description = "A simple & straight-to-the-point PHP profiling extension with its built-in web UI"; + homepage = "https://github.com/NoiseByNorthwest/php-spx"; + license = lib.licenses.php301; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix index 9a85a5ec47..41f860d6e0 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix @@ -2,14 +2,14 @@ let pname = "phpcbf"; - version = "3.7.1"; + version = "3.7.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "sha256-yTwOg8vaIcIfhJzPD0tCl50gAEpaYXLtDqJw7Keub6g="; + sha256 = "sha256-TspzKpl98IpMl+QyZuuBIvkW05uwAqAAYA/dU5P07+E="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix index 0e2d886e6d..84e9effbc1 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix @@ -2,14 +2,14 @@ let pname = "phpcs"; - version = "3.7.1"; + version = "3.7.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "sha256-ehQyOhSvn1gwLRVEJJLuEHaozXLAGKgWy0SWW/OpsBU="; + sha256 = "sha256-IEIUwepbqBT7CyYIwZzKLBC/X/zJ8OPUw0qtwBeVF7c="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix index ba8c0c70c8..c524b3f2b8 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpmd/default.nix @@ -2,14 +2,14 @@ let pname = "phpmd"; - version = "2.13.0"; + version = "2.14.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; - sha256 = "LNR7qT3KIhIeq9WPdXVGsnuzzXN4ze/juDMpt1Ke/A0="; + sha256 = "sha256-C5VDs0G21EyUVlldg05cbrSYG4/fk01VKE7Eq/zODu8="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix index c334164087..4fc9d94647 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, php, fetchFromGitHub }: let - version = "6.0.1"; + version = "6.0.2"; in buildPecl { inherit version; pname = "redis"; @@ -10,7 +10,7 @@ in buildPecl { repo = "phpredis"; owner = "phpredis"; rev = version; - hash = "sha256-0by0TC4TNFIzgMjoyuJG4EavMhkYqmn8TtRaVmgepfc="; + hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M="; }; internalDeps = with php.extensions; [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix index fd0f56924f..c3b5d84ff1 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/snuffleupagus/default.nix @@ -10,13 +10,13 @@ buildPecl rec { pname = "snuffleupagus"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "jvoisin"; repo = "snuffleupagus"; rev = "v${version}"; - hash = "sha256-1a4PYJ/j9BsoeF5V/KKGu7rqsL3YMo/FbaCBfNc4bfw="; + hash = "sha256-NwG8gBaToBaJGrZoCD7bDym7hQidWU0ArckoQCHN81o="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 61e83d9187..3aa24ce15e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.2.2"; + version = "3.3.0alpha3"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-zbgJw2oPzyUTK0UwLAqpShBi+toVsEQcjoG4tIBder0="; + hash = "sha256-LBrKQCR4qpV3yJpTknUNKX6mq+qSdBSveIoYmk5Vmoc="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/a2wsgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/a2wsgi/default.nix index 9a81321898..7cb150264c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/a2wsgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/a2wsgi/default.nix @@ -4,24 +4,22 @@ , asgiref , httpx , pdm-backend -, pdm-pep517 , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "a2wsgi"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qQb2LAJQ6wIBEguTQX3QsSsQW12zWvQxv+hu8NxburI="; + hash = "sha256-sgQ2uS8z25/xQ2vmS4boLhhwluu10aUt4nlKcNuYFRA="; }; nativeBuildInputs = [ pdm-backend - pdm-pep517 ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix index 9aefa22948..24ed871c40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accelerate/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.21.0"; + version = "0.24.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,15 +27,15 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w="; + hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; }; patches = [ - # fix import error when torch>=2.0.1 and torch.distributed is disabled - # https://github.com/huggingface/accelerate/pull/1800 + # https://github.com/huggingface/accelerate/pull/2121 (fetchpatch { - url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch"; - hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I="; + name = "fix-import-error-without-torch_distributed.patch"; + url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; + hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; }) ]; @@ -64,6 +64,19 @@ buildPythonPackage rec { # try to download data: "FeatureExamplesTests" "test_infer_auto_device_map_on_t0pp" + + # require socket communication + "test_explicit_dtypes" + "test_gated" + "test_invalid_model_name" + "test_invalid_model_name_transformers" + "test_no_metadata" + "test_no_split_modules" + "test_remote_code" + "test_transformers_model" + + # set the environment variable, CC, which conflicts with standard environment + "test_patch_environment_key_exists" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index cff7fd06c8..8aa2719385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "1.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA="; + hash = "sha256-7uCR/xUARUakODeLVdI13D9ZksvN9c63o3Q0MlJp8cs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index d38f67d8c4..174fd9c223 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , numpy @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.6"; + version = "0.2.6-unstable-2023-08-20"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; + src = fetchFromGitHub { + owner = "python-acoustics"; + repo = "python-acoustics"; + rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38"; + hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -47,11 +49,6 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; - disabledTestPaths = [ - # ValueError: Unknown window type: "hanning" - "tests/standards/test_iso_1996_2_2007.py" - ]; - pythonImportsCheck = [ "acoustics" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix index 13297b0cd6..4426f930b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "acquire"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 43071fa93f..0197bf2192 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adafruit-nrfutil"; - version = "0.5.3.post17"; + version = "1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = version; - hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + rev = "refs/tags/appveyor-test-release-${version}"; + hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 7bd3f7b403..97966e6bb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.52.3"; + version = "3.54.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-5JEnsTvY4PgAuaoIyTHriJVJUPAHMYETgqbhAuAPJcI="; + hash = "sha256-P+f7eBqD0/KIEry/807dQQCvtokB2cYu4i0H6CTYIWg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index 5c32d58842..78b2cba4d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.6.1"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-ZeajC8FM7Py+DWknVjnwiM4jaCCcnxfC+kTbHEEmyms="; + hash = "sha256-hCiyylnc1WsKz8zQxJhXe4v+SJxKFkwzpmPYnltnc8g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix index ca9fab212c..d8d82edb8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; + hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix index f3d19bd779..7e293f953c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adlfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2023.9.0"; + version = "2023.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gu0qGaOIi5U8CtuhTfbX+AjyYSS6psPrJCM1ZqVe8Ww="; + hash = "sha256-pmKqMNVSW+Jzz4MZaiUbzXFcLzTKj52RJH7WvFMj6NM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix index 947f6d3d12..b238f184f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-rjHiDn8//zjFR27RTGGWZCxKI6pDXu47DFINV8Tq7ZM="; + hash = "sha256-eAHj37d0akxSz4rnf9f0tDknJQe//cMg0Korp1rtxfQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix index ba7fcaa46e..d1ff945196 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aenum"; - version = "3.1.12"; + version = "3.1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PlMckYYKgfiF9+bpfSGa6XcsuJlYAIR4iTXa19l0LvA="; + hash = "sha256-jL12zRjE+HD/ObJChNPqAo++hzGljfOqWB5DTFdblVk="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index 0362b5b3d4..589799c1b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.9.2"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-6SZHr81OiqzKh977RrJtrDvFlAIjguK+1imP3bjxhS8="; + hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix index 214a85f8c9..a821e9d878 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.9.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v0fIhf3P5Xjdn5/ryRNj0Q2YHAisMqi5RTmJQabaUO0="; + hash = "sha256-66faoWBuCW0lQZP8/mBJLT+ErRGBl396HdG1RfPOYcM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index a3e962ea6c..80ff09aa25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -1,26 +1,46 @@ -{ lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, olefile, pytestCheckHook +{ lib +, fetchPypi +, buildPythonPackage +, agate +, openpyxl +, xlrd +, olefile +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.5"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; + hash = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; }; - propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; + propagatedBuildInputs = [ + agate + openpyxl + xlrd + olefile + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "agate" ]; + pythonImportsCheck = [ + "agate" + ]; meta = with lib; { description = "Adds read support for excel files to agate"; - homepage = "https://github.com/wireservice/agate-excel"; - license = licenses.mit; + homepage = "https://github.com/wireservice/agate-excel"; + changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 2b5863d198..a6c515d1d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.9"; + version = "0.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; + hash = "sha256-uyHkkc3KzuYulOtod9KkHQmszVh2mrrCOLwvQt6JTMk="; }; propagatedBuildInputs = [ agate sqlalchemy ]; @@ -27,8 +27,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "agatesql" ]; meta = with lib; { - # https://github.com/wireservice/agate-sql/commit/74af1badd85408909ea72cb6ca8c0b223d178c6f - broken = lib.versionAtLeast sqlalchemy.version "2.0"; description = "Adds SQL read/write support to agate."; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 9d1e0ee96b..ef44979c43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , packaging , setuptools @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + patches = [ + # Removes `register` storage class specifier, which is not allowed in C++17. + (fetchpatch { + url = "https://github.com/pytroll/aggdraw/commit/157ed49803567e8c3eeb7dfeff4c116db35747f7.patch"; + hash = "sha256-QSzpO90u5oSBWUzehRFbXgZ1ApEfLlfp11MUx6w11aI="; + }) + ]; + nativeBuildInputs = [ packaging setuptools 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 76b289d49d..d669fa9838 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.71"; - format = "pyproject"; + version = "9.2.77"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-urTztt+e0toD3tY0QwOmUhi6xzOv6NkrTzV8RerySSo="; + hash = "sha256-Bff44LSWdoXrijTAjnlsaN5iqDbHjfmYqe0FR4dmZxU="; }; nativeBuildInputs = [ @@ -31,7 +31,9 @@ buildPythonPackage rec { # Tests depend on angr (possibly a circular dependency) doCheck = false; - #pythonImportsCheck = [ "ailment" ]; + pythonImportsCheck = [ + "ailment" + ]; meta = with lib; { description = "The angr Intermediate Language"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairq/default.nix index 342a2fc978..13eff25065 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.2.4"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix index bdc21d7089..c494b81b63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -4,13 +4,12 @@ , fetchFromGitHub , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.4"; - format = "pyproject"; + version = "0.3.6"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +17,11 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-7sjiY20jDUHtEnqAMwEHsBboK9XCH5XjE0sHR82YvEA="; + hash = "sha256-K2/q4JQV6GkNXJ6pKDPfhwKvftdezMp5VdOa5iabmvk="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index ac094571d0..39c12ac6e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; + hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 812417a38a..7ec2659269 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -3,7 +3,6 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2023.08.0"; + version = "2023.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,23 +24,9 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y8I4iPvxcK98Olb3JURNK37MKggdhcweKvNBa0ZtG6I="; + hash = "sha256-Q7jb0tJsbVM2vEqKgjXOWJN2OwR9qLchU/4ShOUGPT4="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aioambient/pull/295 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aioambient/commit/fa21a2e82678a231a73c8a1153032980926f4c35.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace 'websockets = ">=11.0.1"' 'websockets = "*"' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix index 2b48f96ae2..4b6c4faa12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -1,23 +1,23 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, setuptools , h2 -, lib , pyjwt , pyopenssl , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioapns"; - version = "3.0"; - format = "pyproject"; + version = "3.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MiFjd9HYaTugjP66O24Tgk92bC91GQHggvy1sdQIu+0="; + hash = "sha256-BUSRIDAxeVKlZteYgGZZkMcUn6hAo1fWCbuZcHZXUhU="; }; nativeBuildInputs = [ @@ -33,11 +33,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aioapns" ]; + pythonImportsCheck = [ + "aioapns" + ]; meta = with lib; { - description = "An efficient APNs Client Library for Python/asyncio"; + description = "An efficient APNs Client Library"; homepage = "https://github.com/Fatal1ty/aioapns"; + changelog = "https://github.com/Fatal1ty/aioapns/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 6f7ef895c3..5f226d2601 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -5,6 +5,8 @@ , buildPythonPackage , dill , fetchFromGitHub +, flask +, flask-cors , moto , pytest-asyncio , pytestCheckHook @@ -14,7 +16,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.5.2"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-twIo5qJht7oZye5lbiPwLFa/5dCwgCm+OkwuCuWU0cU="; + hash = "sha256-e8FBUG08yWNL9B51Uv4ftYx1C0kcdoweOreUtvvvTAk="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -41,6 +43,8 @@ buildPythonPackage rec { nativeCheckInputs = [ dill + flask + flask-cors moto pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix index f20d38b726..86cc79d626 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix @@ -1,7 +1,9 @@ { lib , aiohttp , buildPythonPackage +, colorlog , fetchFromGitHub +, pint , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.0.9"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -18,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-xVSxXiHSyUa31X+eOK5ZXH/+Uwm8lfStY0nZ2mKWFpI="; + hash = "sha256-2wdgG22/Cln5uWQoT3Fs9tOLgB1X8J6AEqxV5R+lqno="; }; postPatch = '' @@ -32,9 +34,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pint ]; nativeCheckInputs = [ + colorlog pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix index 05df5094e6..8feda8b86a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiocsv"; - version = "1.2.4"; + version = "1.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MKuranowski"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-R9gZqiHYKexXXjbAkKu9YqhZnzC/VAMSDzBYT/mF5v0="; + hash = "sha256-4QvVYcTpwhFH57r+iMgmYciWIC2prRnL+ih7qx/CA/U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix new file mode 100644 index 0000000000..79a07c06e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, dataclasses-json +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +}: + +buildPythonPackage rec { + pname = "aioelectricitymaps"; + version = "0.1.5"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jpbede"; + repo = "aioelectricitymaps"; + rev = "refs/tags/v${version}"; + hash = "sha256-XJw3oy5IHyXmdoVxSU15dWHcc4Wd435Lyr/wpz53aZI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dataclasses-json + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aioelectricitymaps" + ]; + + meta = with lib; { + description = "Module for interacting with Electricity maps"; + homepage = "https://github.com/jpbede/aioelectricitymaps"; + changelog = "https://github.com/jpbede/aioelectricitymaps/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 1839f3d19e..d1dc513c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system +, cython_3 +, setuptools + +# dependencies , async-timeout , chacha20poly1305-reuseable -, mock , noiseprotocol , protobuf +, zeroconf + +# tests +, mock , pytest-asyncio , pytestCheckHook -, pythonOlder -, zeroconf }: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "17.0.1"; - format = "setuptools"; + version = "18.4.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,31 +31,36 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CKh517bJA6enZJO3woj9jsL2hMPNfIrKhOO3vTuvyu0="; + hash = "sha256-o1Yv4/wSM2k+L2/JP3teUj129QlyLjoShCRWJ3lIN98="; }; + nativeBuildInputs = [ + setuptools + cython_3 + ]; + propagatedBuildInputs = [ - async-timeout chacha20poly1305-reuseable noiseprotocol protobuf zeroconf + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; + pythonImportsCheck = [ + "aioesphomeapi" + ]; nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "aioesphomeapi" - ]; - meta = with lib; { + changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; - changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index 28d4f5f368..fe72ff28c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "23.1.0"; + version = "23.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,11 +19,11 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss="; + hash = "sha256-EbRQD/AoTMWAlPOMWmD0UdFjRyjt5MUBkJtcydUCdHM="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index ceb3f9603e..7638c4efb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "2.25.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; - rev = "v${version}"; - hash = "sha256-g8nuvna7DpXElvjBehnGKHUsrf+nyQcoKNnyR59RALo="; + rev = "refs/tags/v${version}"; + hash = "sha256-bWwK761gn7HsR9ObcBDfvQH0fJfTAo0QAcL/HcNdHik="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 7eb2a64d38..86c186f422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.5"; + version = "3.0.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rux3fRP1lM42i42K24t27DwAadi+NRJJHDhPAjZXb7s="; + hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-basicauth/default.nix index 9855971564..b7ce89c134 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-basicauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-basicauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.0.0"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "romis2012"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index 9b157264a7..0a60d0af28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.1"; + version = "0.8.3"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0="; + hash = "sha256-aqtSj2aeCHMBj9N3c7gzouK6KEJDvmcoF/pAG8eUHsY="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; 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 b988abe601..ebbcf6ea82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -18,9 +18,7 @@ , aiodns , brotli , faust-cchardet -, asynctest , typing-extensions -, idna-ssl # tests_require , async-generator , freezegun @@ -33,25 +31,23 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.5"; + version = "3.8.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw="; }; patches = [ (fetchpatch { # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should likely be dropped post-3.8.5 + # Merged upstream, should be dropped once updated to 3.9.0 url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; }) - # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly - ./setuptools-67.5.0-compatibility.diff ]; postPatch = '' @@ -75,11 +71,6 @@ buildPythonPackage rec { aiodns brotli faust-cchardet - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest - typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - idna-ssl ]; # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff deleted file mode 100644 index 2f75b6b4c1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 6944b7e2..dfa65d69 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -128,6 +128,7 @@ filterwarnings = - ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning:: - ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core -+ ignore:pkg_resources is deprecated as an API:DeprecationWarning - junit_suite_name = aiohttp_test_suite - norecursedirs = dist docs build .tox .eggs - minversion = 3.8.2 -diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py -index 22e5ea47..a655fd1d 100644 ---- a/tests/test_circular_imports.py -+++ b/tests/test_circular_imports.py -@@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None: - "-W", - "ignore:Creating a LegacyVersion has been deprecated and will " - "be removed in the next major release:DeprecationWarning:", -+ # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing -+ # `gunicorn.util`. -+ "-W", "ignore:pkg_resources is deprecated as an API:" -+ "DeprecationWarning", - "-c", f"import {import_path!s}", - # fmt: on - ) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix index a3b982e22d..1061b4f777 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix @@ -11,43 +11,53 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiojobs"; rev = "refs/tags/v${version}"; - hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-/+PTHLrZyf2UuYkLWkNgzf9amFywDJnP2OKVWvARcAA="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=aiojobs/ --cov=tests/" "" + substituteInPlace pytest.ini \ + --replace "--cov=aiojobs/ --cov=tests/ --cov-report term" "" ''; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - aiohttp + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - __darwinAllowLocalNetworking = true; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + }; nativeCheckInputs = [ pytestCheckHook pytest-aiohttp - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; + disabledTests = [ + # RuntimeWarning: coroutine 'Scheduler._wait_failed' was never awaited + "test_scheduler_must_be_created_within_running_loop" + ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index 77016c323d..671cce69c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.23"; + version = "17.3.25"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q="; + hash = "sha256-EPEfBK/1nbwcajqyv5lFX+02WMvbyFnij2w5J91+UK8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix index b4d39350ba..c7d7b5dd7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-WfHyCjNowtgTBADKeGyBBbO2JQ6YXJFvAtSq0iLzSbw="; + hash = "sha256-P8p21wjmFDvI0iobpQsWkKYleY4M0R3yod3/mJ7V+Og="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 80bc2b2a05..e26c6eb53b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.9"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE="; + hash = "sha256-b462OZzRS9aldfJ+4ztczxbCMK76UM0pSOI1cIi1NM8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix deleted file mode 100644 index 0483793c7b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, asynctest -, pythonOlder -}: - -buildPythonPackage rec { - pname = "aionotify"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "rbarrois"; - repo = "aionotify"; - rev = "v${version}"; - sha256 = "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y"; - }; - - disabled = pythonOlder "3.5"; - - preCheck = '' - substituteInPlace tests/test_usage.py \ - --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" - ''; - - nativeCheckInputs = [ - asynctest - ]; - - meta = with lib; { - homepage = "https://github.com/rbarrois/aionotify"; - description = "Simple, asyncio-based inotify library for Python"; - license = with lib.licenses; [ bsd2 ]; - platforms = platforms.linux; - maintainers = with lib.maintainers; [ ]; - }; -} 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 3ca5f71088..fda31f1a40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ykbw/s932XXX3qWutWUOLV1O9MMgBWPJNveKG8SDhWY="; + hash = "sha256-C34GjCQdkKOTyHw4XNaXvVqqMfKv9KlZjdKfDFsOSOE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix index 3e78733ce4..a596791e74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopegelonline"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "aiopegelonline"; rev = "refs/tags/v${version}"; - hash = "sha256-UbH5S+BfXMAurEvPx0sOzNoV/yypbMCPN3Y3cSherfQ="; + hash = "sha256-r+5b52N/vliKHx6qOLJ4lWcQt1TPEcn5Dz7cZNhRbNg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioprometheus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioprometheus/default.nix index 5c875ea700..273d35fe13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioprometheus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioprometheus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "unstable-2023-03-14"; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "claws"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix index d08eeaec6c..7e62d1f208 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YGVQsw7UhRWXtfn2MQa3GHNlgXR4LJlFnaeLCGjmWfQ="; + hash = "sha256-kSwTHwVSMGyXA0SF74f9gyBN82XhdjdN6DWrQV0PiaU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioquic-mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioquic-mitmproxy/default.nix index 7fab497b26..75ccd60727 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioquic-mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioquic-mitmproxy/default.nix @@ -6,20 +6,24 @@ , pylsqpack , pyopenssl , pytestCheckHook +, pythonOlder +, service-identity , setuptools , wheel }: buildPythonPackage rec { pname = "aioquic-mitmproxy"; - version = "0.9.20.3"; - format = "pyproject"; + version = "0.9.21.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "meitinger"; repo = "aioquic_mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-VcIbtrcA0dBEE52ZD90IbXoh6L3wDUbr2kFJikts6+w="; + hash = "sha256-eD3eICE9jS1jyqMgWwcv6w3gkR0EyGcKwgSXhasXNeA="; }; nativeBuildInputs = [ @@ -32,6 +36,7 @@ buildPythonPackage rec { cryptography pylsqpack pyopenssl + service-identity ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix index 150486cf4a..c5b1c9bb70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -3,7 +3,6 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , freezegun , poetry-core , pyjwt @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,23 +26,9 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg="; + hash = "sha256-psynooRbX34EFYY7FTqy3KdFsv939z/qYfIfyNTVkiM="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aioridwell/pull/234 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aioridwell/commit/79a9dd7462dcfeb0833abca73a1f184827120a6f.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; 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 c4e0d9c5aa..93b345d89a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - hash = "sha256-9Ny1Xby2e1lyrDTZLd6UVASx8/kwjsq4ogMTSKryQqg="; + rev = "refs/tags/v${version}"; + hash = "sha256-PFZ8B2Wtjg3xUFYcnthTW5QXLk//lFH25jwpF7hygxQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix index cc786f115d..873eb8d24a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.8"; + version = "0.4.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-siV2cr8YuU4kWRNHGlV29RjeHxCk6mcbK7J15LZguls="; + hash = "sha256-uN5lbhuPt9axp2ZTTxDgHuDRwlQjXANEkGPgQJL1o90="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix index aadee81a82..dda58fc011 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "2.0.2"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cole"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Wo9WH3fwGN1upLAyj6aThxpQE7hortISjaCATTPee40="; + repo = "aiosmtplib"; + rev = "refs/tags/v${version}"; + hash = "sha256-67Z+k+PBIGP2oGb/52dMtsapUsHufvFcX+wWiMj5Jsg="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module which provides a SMTP client"; homepage = "https://github.com/cole/aiosmtplib"; + changelog = "https://github.com/cole/aiosmtplib/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosql/default.nix index 88a1c7aa37..7160eccace 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosql/default.nix @@ -1,39 +1,57 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, pg8000 +, pytest-asyncio , pytestCheckHook -, sphinxHook +, pythonOlder +, setuptools +, setuptools-scm , sphinx-rtd-theme +, sphinxHook }: buildPythonPackage rec { pname = "aiosql"; - version = "8.0"; - outputs = [ "out" "doc" ]; - format = "pyproject"; + version = "9.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + outputs = [ + "doc" + "out" + ]; src = fetchFromGitHub { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-cE89w1CbDqlkryRr3yAdSxAtWzV1+O+n41ihTwYWelE="; + hash = "sha256-AwuZ3y/qAyZzffTG6mHLk0b+zFB9307VjAX8g1pvWto="; }; sphinxRoot = "docs/source"; nativeBuildInputs = [ - pytestCheckHook - sphinxHook - poetry-core + setuptools + setuptools-scm sphinx-rtd-theme + sphinxHook ]; - pythonImportsCheck = [ "aiosql" ]; + propagatedBuildInputs = [ + pg8000 + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; meta = with lib; { description = "Simple SQL in Python"; homepage = "https://nackjicholson.github.io/aiosql/"; + changelog = "https://github.com/nackjicholson/aiosql/releases/tag/${version}"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ kaction ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index 0e8e7927dd..43f3ae89f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YdVvUP1b/NfXpbJ83ktjtXaVLHS6CQUGCw+EVygB4fU="; + hash = "sha256-g2W2TtCh2ANPjeTdASVgEu+qKfz/Ugh1rDWJcFvOJpI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 02e84b8f7e..0d1423d9ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "63"; + version = "65"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs="; + hash = "sha256-VpDtr5r7BxZDd8G8tPrHRVo+LRhsFoMlVUuOcG/3g0s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix index 64ece4bed8..39607c9fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.3.0"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZFLNgPxR5N+hI988POCYJD9QGivs1fYysyFtmxsJQaA="; + hash = "sha256-+IpWX661Axl2Ke1NGN6W9CMMQMEu7EQ/2PeRkkByAxI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix index ac9b87fb4e..af193fa8dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.3.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-Zitssjoe88T7gphfAQXyv2el7jbMLKTnr1GSe5LTWnI="; + hash = "sha256-sWONjWchXu5pRFXY/ZhOXvF0z/qUc1LjqcaSiVPA1MU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix index 3b91ea1cc4..9d99977249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowaqi"; - version = "2.0.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-waqi"; rev = "refs/tags/v${version}"; - hash = "sha256-WEcCv4PCJ1gmRkQbjhIxx8qi1zps2Z65iFrdBHXPPvA="; + hash = "sha256-FHpZVY7TFjk+2YNBejEwSdYWK41V9bti1JxpWivemw4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix new file mode 100644 index 0000000000..acb6d6bf1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowithings/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, yarl +}: + +buildPythonPackage rec { + pname = "aiowithings"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-withings"; + rev = "refs/tags/v${version}"; + hash = "sha256-6yfhAMQIwhjKXlnN58bL9It8q6CXH9RxKBkB8BfSY1o="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aiowithings" + ]; + + meta = with lib; { + description = "Module to interact with Withings"; + homepage = "https://github.com/joostlek/python-withings"; + changelog = "https://github.com/joostlek/python-withings/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix index edc9b8def3..6c7660f9f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioxmpp/default.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { "benchmarks" ]; + disabledTests = [ + # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' + "test_convert_field_datetime_default_locale" + ]; + meta = { changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; description = "Pure-python XMPP library for asyncio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix index 4a60bfca20..c1bb0f1d3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.9.4"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-TTvTLs27e7+0ip/p5tb9aoMaG1nQPibikiECNzc+fbU="; + hash = "sha256-jnZFwy5PIAZ15p8HRUFTNetZo2Y/X+tIer+gswxFiIs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alexapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alexapy/default.nix index 2aeebd0239..34b36816b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alexapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alexapy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "alexapy"; - version = "1.27.4"; + version = "1.27.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "keatontaylor"; repo = "alexapy"; rev = "refs/tags/v${version}"; - hash = "sha256-Z7h6VX4cwcepo0Kxq9GdHv+XFNg/0s/OhJ/iHubhovs="; + hash = "sha256-M6cv1l6UpUJ0Wn7Swa7Cv+XsDNbzHLNrTJjU5ePL83Q="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix index cbfbe7c27f..8de6117167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-sts"; - version = "3.1.1"; + version = "3.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1pCgIw2Glc5Fyp/eoJJXew80SJz7VDcg9vvUpeZpBYk="; + hash = "sha256-GLzieAX0j/aEKeKj37PtBQJy3c2zWgy1no7/lXiYSU0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix index 2dc57281e8..a67ff5e98d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "allure-behave"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxdB1gliajS6dUUhnD+yRMVj0zglGEwZC6RDmirH+pg="; + hash = "sha256-mxXb7+1tvf5EmVbD6eOmGfza9lAjbEVoxWZBSeZmPxQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix index a08f4bc93a..cdfbf4c142 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "allure-pytest"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hbc7Hb6ZCLpPhLgBGKk+EEnALdWTIJJg2MHJUM8ob2w="; + hash = "sha256-IiQxWejsgc4rUlS0ATgCGYghsbQvEY9p1KKJOWYHx7M="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix index aaba8d9fcc..c358a2f14d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-TaeQF9EZ5tLMmVSwnWgrxsRz5lh0O3BZLLEUawd8BeI="; + hash = "sha256-Xh6NtqiuTg7UxKqJ7/p45rCUQGWiGDEaNAslzeYtgfg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix index b92ee139b6..0b50f23f77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-python-commons/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "allure-python-commons"; - version = "2.12.0"; + version = "2.13.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1cNi3QEWfwhjMYIumxkS1Ob9bLwtGgBt0EjnfoKnrnM="; + hash = "sha256-igNoEzAjGx3q3Ya5f/aIQcZZEyARSuY4Vw8e1g16IDM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix index 14d65a2e1a..b7fbcb5527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -17,23 +17,21 @@ , anywidget , ipython , pytestCheckHook -, vega_datasets +, vega-datasets , sphinx }: buildPythonPackage rec { pname = "altair"; - # current version, 5.0.1, is broken with jsonschema>=4.18 - # we use unstable version instead of patch due to many changes - version = "unstable-2023-08-12"; + version = "5.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "altair-viz"; repo = "altair"; - rev = "56b3b66daae7160c8d82777d2646131afcc3dab4"; - hash = "sha256-uVE3Bth1D1mIhaULB4IxEtOzhQd51Pscqyfdys65F6A="; + rev = "refs/tags/v${version}"; + hash = "sha256-30M+rt5IfD4hvK5CwaW8HfQacDBPjowff/f9o7iido0="; }; nativeBuildInputs = [ @@ -53,7 +51,7 @@ buildPythonPackage rec { anywidget ipython sphinx - vega_datasets + vega-datasets pytestCheckHook ]; @@ -74,6 +72,7 @@ buildPythonPackage rec { description = "A declarative statistical visualization library for Python."; homepage = "https://altair-viz.github.io"; downloadPage = "https://github.com/altair-viz/altair"; + changelog = "https://altair-viz.github.io/releases/changes.html"; license = licenses.bsd3; maintainers = with maintainers; [ teh vinetos ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix index 21db575097..0a2479dd38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.3"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,9 +18,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amzn"; repo = "ion-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw="; + hash = "sha256-pCm3jd/dVqO/uIvT5N/w5yoUWU6ni62Pl2A862e+qSk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon-kclpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon-kclpy/default.nix index 623ab60ed6..fca55e3bc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z0MC4SbZS82beMA7UunEfs4KvrmhW5xAhFeb7WXA7DM="; + hash = "sha256-3BhccRJd6quElXZSix1aVIqWr9wdcTTziDhnIOLiPPo="; }; # argparse is just required for python2.6 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix index bad99ab8f0..36fc48c35f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "amqp"; - version = "5.1.1"; + version = "5.2.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LBsT/swIk+lGxly9XzZCeGHP+k6iIB2Pb8oi4qNzteI="; + hash = "sha256-oez/QlrQY61CpIbJAoB9FIIxFIHIrZWnJpSyl1519/0="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; homepage = "https://github.com/celery/py-amqp"; + changelog = "https://github.com/celery/py-amqp/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 8ea691eb48..0516388b3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.72"; + version = "0.0.73"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-oDC5NWmdo6Ijxz2ER9CjtCZxWkancUNyxVe2ofH4c+Q="; + hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak="; }; propagatedBuildInputs = [ 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 da7b016d13..1c26f847f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.71"; - format = "pyproject"; + version = "9.2.77"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "angr"; + repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-qdH7lLetLoqXvZw+HmxOyiLzYjdbpeZygqwFYwGRTRQ="; + hash = "sha256-EslJnwgZUUN+EtyjGi/7a4Upr2/vbfNXpkc7I+/ZrU8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix index 46e937eb8d..02067d4eba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix @@ -1,33 +1,34 @@ { lib -, isPy3k , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, nose , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "annexremote"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; - rev = "v${version}"; - sha256 = "sha256-h03gkRAMmOq35zzAq/OuctJwPAbP0Idu4Lmeu0RycDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-eBq1nZnNuzTLvc11G/XaenZlVEUke3kpWlZ7P5g4kc8="; }; - nativeCheckInputs = [ - nose + nativeBuildInputs = [ + setuptools + setuptools-scm ]; - checkPhase = '' - nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "annexremote" @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper module to easily develop git-annex remotes"; homepage = "https://github.com/Lykos153/AnnexRemote"; + changelog = "https://github.com/Lykos153/AnnexRemote/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ montag451 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix index 645e3c40c4..85e2379507 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annotated-types/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "annotated-types"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "annotated-types"; repo = "annotated-types"; - rev = "v${version}"; - hash = "sha256-zCsWfJ8BQuov8FN+hlm9XBKWAAQ/KHPK/x024A8k2kE="; + rev = "refs/tags/v${version}"; + hash = "sha256-SZ9/rXYcns4DFM6vk6SRKvuv3MY3T7xO9aW7WAQqtVE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 633811c34c..12002f4933 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.4"; + version = "2.15.5"; src = fetchPypi { inherit pname version; - hash = "sha256-waiq7emF955ZMrohY2OTeffYAlv9myg3jbFkmk71Qe0="; + hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index f7c41aa12b..5c08a0f5bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.3.0"; + version = "8.6.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; + hash = "sha256-lfTlkydNWdU/NvYiB1NbfScq3CcBrHoO169qbYFjemA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index 8344af4390..8086ecec11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , anyio , distro , httpx @@ -16,8 +16,8 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.11"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,11 +25,11 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-bjagT0I0/N76CGf1b8EBNyOTzPBWybr2I2yO5NWO3po="; + hash = "sha256-+EiFp55tPsILl6uuTh9qmeQDMKlUzegn3xUo6BupN2E="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 3508554d30..06112cccdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.1"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,8 +36,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "agronholm"; repo = pname; - rev = version; - hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; + rev = "refs/tags/${version}"; + hash = "sha256-gUFd2gHWIElYfzOvg7Yx7iJyhU6+iAcJpHTVsJtxTsk="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -84,6 +84,10 @@ buildPythonPackage rec { "test_exception_group_children" "test_exception_group_host" "test_exception_group_filtering" + # timing sensitive + # assert threading.active_count() == initial_count + 1 + # assert 4 == (4 + 1) + "test_run_sync_from_thread_pooling" ] ++ lib.optionals stdenv.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix index a83d8748d4..2565a34751 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "anytree"; - version = "2.9.0"; + version = "2.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "c0fec0de"; repo = "anytree"; rev = "refs/tags/${version}"; - hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg="; + hash = "sha256-9rxrHZBlQarfpYQvo6bJPGF+cdSROlwq+8TjXI18HDs="; }; patches = lib.optionals withGraphviz [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index b4c29745e5..25aa924491 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.6.5"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-prriSqvy2S9URnXfTEY88lssU71/cV38egSIqnLHE+Q="; + hash = "sha256-HEy1EGP47FFyuMjvsb+3mGHTQMNJEiDVa4wqaqjbOz0="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix index b58c31ea73..f1a31ee243 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix @@ -10,6 +10,9 @@ , pytest-raisin , pytest-socket , requests-mock +, pook +, numpy +, rich , pebble , python-dateutil , termcolor @@ -20,8 +23,8 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.3.2"; - format = "setuptools"; + version = "2.0.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +32,7 @@ buildPythonPackage rec { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - hash = "sha256-yY8ItXZZp0yVs4viJzduMPq8Q8NKd34uvlGaVUE2GjQ="; + hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; }; propagatedBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { pebble tzlocal setuptools + rich # for example parser aoce. must either be here or checkInputs ]; # Too many failing tests @@ -52,6 +56,33 @@ buildPythonPackage rec { "test_run_and_autosubmit" "test_run_and_no_autosubmit" "test_load_input_from_file" + "test_examples_cache" # IndexError: list index out of range + "test_example_partial" # ValueError: not enough values to unpack (expected 1, got 0) + "test_run_against_examples" # AssertionError: assert '2022/25 - The Puzzle Title' in '' + "test_aocd_no_examples" # SystemExit: 2 + "test_aocd_examples" # SystemExit: 2 + "test_aoce" # SystemExit: 1 + + # TypeError: sequence item 0: expected str instance, bool found + # Likely because they use `pook.get` to get a webpage + "test_submit_prevents_bad_guesses_too_high" + "test_submit_prevents_bad_guesses_too_low" + "test_submit_prevents_bad_guesses_known_incorrect" + "test_submit_correct_answer" + "test_correct_submit_reopens_browser_on_answer_page" + "test_server_error" + "test_submit_when_already_solved" + "test_submitted_too_recently_autoretry" + "test_submitted_too_recently_autoretry_quiet" + "test_submit_when_submitted_too_recently_no_autoretry" + "test_submit_wrong_answer " + "test_correct_submit_records_good_answer" + "test_submits_for_partb_when_already_submitted_parta" + "test_submit_when_parta_solved_but_answer_unsaved" + "test_submit_saves_both_answers_if_possible" + "test_submit_puts_level1_by_default" + "test_cannot_submit_same_bad_answer_twice" + "test_submit_float_warns" ]; nativeCheckInputs = [ @@ -60,6 +91,11 @@ buildPythonPackage rec { pytest-freezegun pytest-raisin pytest-socket + ]; + + checkInputs = [ + pook + numpy requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index 92a9203a93..d0e36a989b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.45.0"; + version = "2.50.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; + hash = "sha256-qaxYWPVdMlegvH/W66UBoQbcQ5Ac/3DNoQs8xo+KfLc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index efea1e3302..0edddd68be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apipkg"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; - rev = "v${version}"; - hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apischema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apischema/default.nix index a60b97d1d9..eb385ccaf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apischema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apischema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apischema"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "wyfo"; repo = "apischema"; rev = "refs/tags/v${version}"; - hash = "sha256-DBFFCLi8cpASyGPNqZvYe3OTLSbNZ8QzaxjQkOiHxFc="; + hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g="; }; passthru.optional-dependencies = { 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 new file mode 100644 index 0000000000..89363e859b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/apple-weatherkit/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, aiohttp +, pythonOlder +, pyjwt +}: + +buildPythonPackage rec { + pname = "apple-weatherkit"; + version = "1.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "tjhorner"; + repo = "python-weatherkit"; + rev = "refs/tags/v${version}"; + hash = "sha256-G/0hyK2rjdSSnVnvAUGyDvsfNMHVgAD7NHfNFmdBCNA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pyjwt + ] ++ pyjwt.optional-dependencies.crypto; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "apple_weatherkit" + ]; + + meta = with lib; { + description = "Python library for Apple WeatherKit"; + homepage = "https://github.com/tjhorner/python-weatherkit"; + changelog = "https://github.com/tjhorner/python-weatherkit/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 0e0944dd32..486b7fd6c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PFgRQQd6EBeQ7eDKsW+ig60DKpsvl9xtNWX7LZGBP9c="; + hash = "sha256-Pu+rHF15eLDmXFCR0c2+kgaGXcPLXRnKXPvdt26Kr/4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index 03e0d95275..b8ec645c42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "9.0.0"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-tyUPXeMdFuzlBY/HrGHLDEwYngzBELayaVVfEh92lbE="; + hash = "sha256-3KorHpJUeWSJKVN/4IN0AqKOIL0sT5MaxkvQqpeilhw="; }; propagatedBuildInputs = [ 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 647a77e035..af7635184a 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.4.3"; + version = "5.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-hALpNLXPg2Apha3KbEixFEH3NuzLe6lnEy9V5otskDM="; + hash = "sha256-ioFTayuPkxXIaaKKVHBLyU47jID6dGWCX1G9kVkD5Yo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix index ce73dadd8d..ab56bf58b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, mox3 , pytestCheckHook }: @@ -24,8 +23,9 @@ buildPythonPackage rec { }) ]; + doCheck = false; # mox3 is disabled on python311 + nativeCheckInputs = [ - mox3 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index 5964274881..59576a129d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.42.0.0"; + version = "3.43.1.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pLkYTyf2BGRLs4bChb+eo2i5gRRUUJDFyfCBTSJ1RkQ="; + hash = "sha256-x+bSft37DgF2tXXCL6ac86g1+mj/wJeDLoCSiVSXedA="; }; buildInputs = [ 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 a2ceae590f..c8383ecc9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -1,4 +1,5 @@ { lib +, backports-strenum , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -8,8 +9,8 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.71"; - format = "pyproject"; + version = "9.2.77"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,13 +18,17 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AZMbE+/2uw7mFtBKwwLWCiVwupnB+EkUrgZFkGiKHtM="; + hash = "sha256-uTkPDhk4Ugyb9HV/0PMwWpuNajpzfTn1dg7gsQnc/zg="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + backports-strenum + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index cc0ae612ce..765a7848ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.1"; - format = "pyproject"; + version = "3.1.6"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N1Us/dpF/y638qIuwTzBiuv4vXfBMtWxmQnMBxNTUuc="; + hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,9 +35,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Bash tab completion for argparse"; - homepage = "https://kislyuk.github.io/argcomplete/"; changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; + description = "Bash tab completion for argparse"; + downloadPage = "https://github.com/kislyuk/argcomplete"; + homepage = "https://kislyuk.github.io/argcomplete/"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix index 82d79c2396..26a527eb4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -61,11 +61,11 @@ , pytest-cov , pytest-mock , pytest-asyncio -, factory_boy +, factory-boy }: let pname = "argilla"; - version = "1.16.0"; + version = "1.19.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SKxIc7T9wmMMGQeebcRVOrB4Y5ETz9LSeKzzqI+wf80="; + hash = "sha256-Idl5Tm1XWgBLVgHPbXiyt9MW4J5wZdPb2J7iIDBnorg="; }; pythonRelaxDeps = [ @@ -166,7 +166,7 @@ buildPythonPackage { pytest-cov pytest-mock pytest-asyncio - factory_boy + factory-boy ] ++ optional-dependencies.server ++ optional-dependencies.postgresql diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 3f1f3f8666..77182cbd6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, libargon2 , cffi , setuptools-scm }: @@ -14,14 +15,19 @@ buildPythonPackage rec { sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; }; + buildInputs = [ libargon2 ]; + nativeBuildInputs = [ setuptools-scm + cffi ]; propagatedBuildInputs = [ cffi ]; + env.ARGON2_CFFI_USE_SYSTEM = 1; + # tarball doesn't include tests, but the upstream tests are minimal doCheck = false; pythonImportsCheck = [ "_argon2_cffi_bindings" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix index 2282a06e5c..da9022c93f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix @@ -1,46 +1,32 @@ -{ cffi -, six -, enum34 -, hypothesis -, pytest -, wheel +{ hypothesis +, pytestCheckHook , buildPythonPackage , fetchPypi -, flit-core -, isPy3k , lib -, stdenv +, hatchling +, hatch-vcs +, hatch-fancy-pypi-readme , argon2-cffi-bindings }: buildPythonPackage rec { pname = "argon2-cffi"; - version = "21.3.0"; + version = "23.1.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; + pname = "argon2_cffi"; + inherit version; + hash = "sha256-h5w+eaJynOdo67fTbUYJ46eKTKLsOp8SKGygV+PQ2wg="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ hatchling hatch-vcs hatch-fancy-pypi-readme ]; - propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] - ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ argon2-cffi-bindings ]; - propagatedNativeBuildInputs = [ - argon2-cffi-bindings - cffi - ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; - ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; - - nativeCheckInputs = [ hypothesis pytest wheel ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "argon2" ]; meta = with lib; { description = "Secure Password Hashes for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix index 1acab31b72..0f0e3ea223 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argos-translate-files/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "argos-translate-files"; - version = "1.1.3"; + version = "1.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; + sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix index 8a1cadfb88..9d958c2e1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argostranslate/default.nix @@ -18,13 +18,13 @@ let in buildPythonPackage rec { pname = "argostranslate"; - version = "1.8.0"; + version = "1.9.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; + sha256 = "sha256-OlVrRfBhbJpIFjWdLQsn7zEteRP6UfkIpGT4Y933QKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix index 23d45893fe..3810934eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.18.1"; + version = "0.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU="; + hash = "sha256-v3CaLMTo/zbNEoE3K+aWnFTCgLetcnN7vOU/sFqLq2k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/array-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/array-record/default.nix index f278c34fbe..0497c542fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/array-record/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/array-record/default.nix @@ -1,27 +1,37 @@ { lib -, absl-py , buildPythonPackage -, etils -, fetchPypi -, importlib-resources +, pythonOlder , python +, fetchPypi +, absl-py +, etils +, importlib-resources , typing-extensions , zipp }: buildPythonPackage rec { pname = "array-record"; - version = "0.4.0"; + version = "0.5.0"; format = "wheel"; - disabled = python.pythonVersion != "3.10"; + # As of 2023-10-31, PyPI includes wheels for Python 3.9, 3.10, and 3.11. + disabled = pythonOlder "3.9"; - src = fetchPypi { + src = let + pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; + in fetchPypi { inherit version format; pname = "array_record"; - dist = "py310"; - python = "py310"; - hash = "sha256-VHDU6RLR/z3/tNxJiDdAruz1cva6cHu5NzMlsKrLYXg="; + dist = pyShortVersion; + python = pyShortVersion; + abi = pyShortVersion; + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + hash = { + cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; + cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; + cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; + }.${pyShortVersion}; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix index fee3f12b80..0a186781b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix @@ -28,20 +28,21 @@ , pyro-ppl #, pystan (not packaged) , numpyro +, bokeh }: buildPythonPackage rec { pname = "arviz"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "arviz-devs"; - repo = pname; + repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-jjA+yltvpPZldIxXXqu1bXCLqpiU5/NBYTPlI9ImGVs="; + hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; }; propagatedBuildInputs = [ @@ -72,6 +73,7 @@ buildPythonPackage rec { pytestCheckHook torchvision zarr + bokeh ]; preCheck = '' @@ -93,6 +95,12 @@ buildPythonPackage rec { "test_plot_pair" # Array mismatch "test_plot_ts" + # The following two tests fail in a common venv-based setup. + # An issue has been opened upstream: https://github.com/arviz-devs/arviz/issues/2282 + "test_plot_ppc_discrete" + "test_plot_ppc_discrete_save_animation" + # Assertion error + "test_data_zarr" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix index 410c8d6a24..87a996a455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -6,11 +6,12 @@ , requests , requests-oauthlib , responses +, six }: buildPythonPackage rec { pname = "asana"; - version = "3.2.1"; + version = "4.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,13 +19,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; - rev = "refs/tags/v${version}"; - hash = "sha256-hvAyKGoNkX3bs7Mz2h7SnOa5T6J88c0YiTR/L8fgfi8="; + rev = "refs/tags/${version}"; + hash = "sha256-B98X8ErmoMIpXu4KKvRGgtElPs/va2+UIR+ARUgafgo="; }; propagatedBuildInputs = [ requests requests-oauthlib + six ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix index 5d138ae856..c990c9477b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic="; + hash = "sha256-z905gEJydRnYtz5iuO+CwL7P7U60IImcO5bJjQuWgho="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf-transform-schemas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf-transform-schemas/default.nix index 545062e0dd..d00e43e756 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf-transform-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf-transform-schemas/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "asdf-transform-schemas"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "asdf_transform_schemas"; inherit version; - hash = "sha256-DPL/eyLMtAj+WN3ZskQaWbpz/jI+QW1ZueCkcop9LdY="; + hash = "sha256-3n/cP+41+5V/wylXh3oOnX3U0uhRvWMaclnxHCvSlMo="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "ASDF schemas for validating transform tags"; homepage = "https://github.com/asdf-format/asdf-transform-schemas"; + changelog = "https://github.com/asdf-format/asdf-transform-schemas/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix index 3fd0437667..a5177a6b7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.3.1"; + version = "6.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-9mhb8PEpRdFjbPBZ/B8he/UcRSLryBQU0Dgjcii7LGY="; + hash = "sha256-w4xpCqNal0BHsmf1cL4k/DKzs/e9WQXTQNJNs8puJUU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix index 8bc58e992c..89abcb1526 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix @@ -7,6 +7,7 @@ , pyparsing , python , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -25,14 +26,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstruct - diskcache - prompt-toolkit pyparsing ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + passthru.optional-depdendencies = { + shell = [ + prompt-toolkit + ]; + cache = [ + diskcache + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + pythonImportsCheck = [ "asn1tools" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix index 7b5a24378d..610238559a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13 + "-W" "ignore::DeprecationWarning" + ]; + # Tests must be run in the build directory. The tests create files # in $HOME/.astropy so we need to set HOME to $TMPDIR. preCheck = '' @@ -66,8 +71,6 @@ buildPythonPackage rec { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = licenses.bsd3; - # Broken since a certain astropy update, due to API incompatibility - broken = true; maintainers = [ maintainers.smaret ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix index 89c959293d..452abd626e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.2.1"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RiIRCypvMLd+FHOv+ql+cRvC8H0/EISEIP8YmO2+lPM="; + hash = "sha256-LgFxuZGyyVmsxsSTGASSNoRKXaHWW6JnLEiAwciUg04="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-timeout/default.nix index 55297bea9c..59c8b51fbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.2"; + version = "4.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IWPhZA3bUreoyA0KZ6CFh+XSRcycVTp0qEcFa8KXaxU="; + hash = "sha256-RkDZa+hNgtAu1Z6itxBaD3szq+hwNwPNCrC/h8QnUi8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix index 2bc90494cc..d376ec1542 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "async-tkinter-loop"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "async_tkinter_loop"; - hash = "sha256-Phxx9RovjU5JOonMt7Zhum0/BGRS5OLRAkLTl4L/BW4="; + hash = "sha256-YwmW+zXAx9TAxgoRLEr7/3o1rrO4eSNScuoTh3ud2Vo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 03b7e8664c..c51c99d00f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.36.1"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-NFSJlBRVgeuhK7IXjNz2g6SbSgveSjaJpSQrxSACG04="; + hash = "sha256-f3x5adxLHT/C5dXfdBH6stKv0y2nuhbpe8jkJex1DKU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix index 9049a22851..feb778c729 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncinotify/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.pythonForBuild.interpreter} ${src}/test.py + ${python.pythonOnBuildForHost.interpreter} ${src}/test.py ''; pythonImportsCheck = ["asyncinotify"]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index bdc436c8fd..f499adc7bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.13.2"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mR5THEu32+xit1SHjZajJGM4qsEaKM48PpkBj7L1gow="; + hash = "sha256-GsMcMzoNg8iIMVIyRVAMqoFFA0I3QbDkZTOe9tpbXik="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index 8cd6af449f..2f61273c16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.8"; + version = "3.10.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4="; + hash = "sha256-Wvp2orIGxy10jJOyskY3QMCciH33pPgX4Yd0nHjRjsM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index c17bae7c80..a4904cdb5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; + hash = "sha256-eDrnDDiijkr5377BVWVAc5QEQCCDBoFynuT4MncCx9g="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index cddb597b43..e462a0d0b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytest-mock , pytestCheckHook , python-socks @@ -11,16 +12,16 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.7"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pogzyb"; - repo = pname; + repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-OiDi9hD2IDDfQoQoPhLpClBnJyI/wlZfGyzqmVI94yA="; + hash = "sha256-5T/h4YzODH7zFyQpG8qVZetTK7V+Ii9jc+MQFgMUA8w="; }; propagatedBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytest-mock pytestCheckHook ]; @@ -52,6 +54,8 @@ buildPythonPackage rec { "test_whois_query_run" "test_whois_query_create_connection" "test_whois_query_send_and_recv" + "test_input_parameters_for_domain_query" + "test__get_top_level_domain" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix old mode 100755 new mode 100644 index fd389308c9..45f61e63c1 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.1"; + version = "3.41.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DSIJOp5c/bqOOIZylhUGyIwIco5isA3ytCRR51WfTyI="; + hash = "sha256-MIzBuIeQfAVlllaU02htx1eufRlpe+V9Kzo+EFF45ME="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix index d856aa544c..20fc37d459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -3,25 +3,25 @@ , fetchPypi , pytestCheckHook , pythonOlder -, pdm-pep517 +, pdm-backend , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "3.1.1"; + version = "4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; + hash = "sha256-D0BDMhnhJO3xFcbDY4CMpvDhz6fRYNhrL7lHkwhtEpQ="; }; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix index 48eb38cad3..2ab159cfc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix @@ -4,21 +4,28 @@ , jax , jaxlib , lib +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "augmax"; - version = "unstable-2022-02-19"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; + + disbaled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "khdlr"; - repo = pname; - # augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. - rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; - sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i"; + repo = "augmax"; + rev = "refs/tags/v${version}"; + hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ einops jax ]; # augmax does not have any tests at the time of writing (2022-02-19), but @@ -30,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently Composable Data Augmentation on the GPU with Jax"; homepage = "https://github.com/khdlr/augmax"; + changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index 06313ed12c..3b0cc0eb80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -5,6 +5,8 @@ , callee , fetchFromGitHub , mock +, poetry-core +, poetry-dynamic-versioning , pyjwt , pytestCheckHook , pythonOlder @@ -13,8 +15,8 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.4.2"; - format = "setuptools"; + version = "4.6.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,9 +24,14 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-RBkAuZQx7mBxVCpo5PoBiEge8+yTmp0XpcnxCkOsM6U="; + hash = "sha256-KNhuonqFt+KrRYctQ426FcnzxISp5sBRs28hFL/Du0Q="; }; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ requests pyjwt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix index a73403518b..e18375c1f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -44,6 +44,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test fails with frequency 1/200 + # https://github.com/alandtse/auth_capture_proxy/issues/25 + "test_return_timer_countdown_refresh_html" + ]; + + pythonImportsCheck = [ + "authcaptureproxy" + ]; + meta = with lib; { changelog = "https://github.com/alandtse/auth_capture_proxy/releases/tag/v${version}"; description = "A proxy to capture authentication information from a webpage"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix index 9446a6dc2b..0897abe77b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.0.1"; + version = "2.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HOUgExt/OWkVJC/pHlciH01CQIUpu+Ouk62v7ShlkeA="; + hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix index b1145ff332..ed0c716bbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autoit-ripper/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "autoit-ripper"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fluG/2XlUh3kPtYtSotrP02c7kdmem92Hy1R93SaTzk="; + hash = "sha256-a30SDJdKoljWjV0O1sZ35NnQPFcJ0XOPcmTanozWpHY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index b34a78351b..9a177d7b49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "autopep8"; - version = "2.0.2"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hhatto"; repo = "autopep8"; rev = "refs/tags/v${version}"; - hash = "sha256-+EZgo7xtYKMgpcntU5FtPrfikDDpnvGHhorhtoqDsvE="; + hash = "sha256-TuaDnZqn9mRUsoDJkj9JK4ztvzl9JTwAk8nghIkZBvw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix index 64f12ed24a..b930fd80b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -9,7 +9,7 @@ , setuptools # runtime -, ffmpeg-headless +, ffmpeg_5-headless # tests , numpy @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg-headless + ffmpeg_5-headless ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aw-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aw-core/default.nix index 7b928767f2..9707e79786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aw-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aw-core/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aw-core"; - version = "0.5.15"; + version = "0.5.16"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-3cz79gSkmbGtCKnLGA4HGG5dLu7QB4ZtMnNGrSYB17U="; + sha256 = "sha256-7xT7bOGzH5G4WpgNo8pDyiQqX0dWNLNHpgssozUa9kQ="; }; disabled = pythonOlder "3.8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index a8107fac2b..00e01ba80b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -1,25 +1,24 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder +, fetchPypi , cmake , ninja -, numpy , pybind11 , scikit-build-core -, typing-extensions +, numpy }: buildPythonPackage rec { pname = "awkward-cpp"; - version = "22"; - format = "pyproject"; + version = "25"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; + hash = "sha256-Fhq6XUt5CYz/l+Lf9WcCnt9rs3byMQIQs7hFexr2tjM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 81881d5193..b4e4774af8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, awkward-cpp +, fetchFromGitHub , hatch-fancy-pypi-readme , hatchling -, numba +, awkward-cpp +, importlib-metadata , numpy , packaging -, setuptools , typing-extensions +, fsspec +, jax +, jaxlib +, numba +, setuptools +, numexpr +, pandas +, pyarrow +, pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "awkward"; - version = "2.3.1"; - format = "pyproject"; + version = "2.4.10"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NLROXEbh4MKvBFuj+4+Wa2u37P9vuQ0Ww8kK+CYWt5E="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "awkward"; + rev = "refs/tags/v${version}"; + hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw="; }; nativeBuildInputs = [ @@ -32,28 +42,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward-cpp + importlib-metadata numpy packaging - ] ++ lib.optionals (pythonOlder "3.11") [ + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions + ] ++ lib.optionals (pythonOlder "3.12") [ + importlib-metadata ]; dontUseCmakeConfigure = true; + pythonImportsCheck = [ "awkward" ]; + nativeCheckInputs = [ - pytestCheckHook + fsspec + jax + jaxlib numba setuptools + numexpr + pandas + pyarrow + pytest-xdist + pytestCheckHook ]; + # The following tests have been disabled because they need to be run on a GPU platform. disabledTestPaths = [ "tests-cuda" ]; - pythonImportsCheck = [ - "awkward" - ]; - meta = with lib; { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index 85a4f6bbe6..a4d3fb4c83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -5,7 +5,6 @@ , click , configparser , fetchFromGitHub -, fetchpatch , fido2 , lxml , poetry-core @@ -19,16 +18,16 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.2.1"; - format = "pyproject"; + version = "2.9.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "venth"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8="; + rev = "refs/tags/v${version}"; + hash = "sha256-IZeEb87NX3fyw1hENF1LldbgbaXXPG3u2AiCeci6MIw="; }; nativeBuildInputs = [ @@ -47,20 +46,6 @@ buildPythonPackage rec { requests-kerberos ]; - patches = [ - # Apply new fido2 api (See: venth/aws-adfs#243) - (fetchpatch { - url = "https://github.com/venth/aws-adfs/commit/09836d89256f3537270d760d8aa30ab9284725a8.diff"; - hash = "sha256-pAAJvOa43BXtyWvV8hsLe2xqd5oI+vzndckRTRol61s="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'boto3 = "^1.20.50"' 'boto3 = "*"' \ - --replace 'botocore = ">=1.12.6"' 'botocore = "*"' - ''; - nativeCheckInputs = [ pytestCheckHook toml @@ -77,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line tool to ease AWS CLI authentication against ADFS"; homepage = "https://github.com/venth/aws-adfs"; + changelog = "https://github.com/venth/aws-adfs/releases/tag/v${version}"; license = licenses.psfl; maintainers = with maintainers; [ bhipple ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index 85a668a2c2..6f19a6a7ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.37.0"; + version = "1.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-ukHDrxx+Jxlp/Ypg1ltz7WN07X16spNdC7YygJhTBJo="; + hash = "sha256-Uxf52UzzCqXFFnQD1DwcSy3ylY+rYq6qbI5XK5JiVto="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 7fe9fdac96..32a8baa448 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.74.0"; + version = "1.78.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; + hash = "sha256-hSXJBEntj3k3Kml+Yuvn19X7YXL+Y1hXBkb8iZ7DxR4="; }; postPatch = '' @@ -57,9 +57,29 @@ buildPythonPackage rec { sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini ''; + disabledTests = [ + # urllib3 2.0 compat + "test_plugin_accepts_different_sar_client" + "test_plugin_accepts_flags" + "test_plugin_accepts_parameters" + "test_plugin_default_values" + "test_plugin_invalid_configuration_raises_exception" + "test_plugin_must_setup_correct_name" + "test_must_process_applications" + "test_must_process_applications_validate" + "test_process_invalid_applications" + "test_process_invalid_applications_validate" + "test_resolve_intrinsics" + "test_sar_service_calls" + "test_sar_success_one_app" + "test_sar_throttling_doesnt_stop_processing" + "test_sleep_between_sar_checks" + "test_unexpected_sar_error_stops_processing" + ]; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/awslabs/serverless-application-model"; + homepage = "https://github.com/aws/serverless-application-model"; changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix index 3be1c09b5f..e2fb2414a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.11.0"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - hash = "sha256-eINfyEHwPlUIWPGKmXPquGGPR/ItL1nt8TBXj6VFqGc="; + hash = "sha256-KVr8I3BzqAlW19TyfDGDDty5qMzKnviqRJkLre8V5bc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 807cd8a029..0927fba08e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.1"; + version = "0.19.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kXf/TKw0YkWuSWNc1rQqbb3q4XWCRRkBAiDUisX/8UI="; + hash = "sha256-skkkwtmSbGJV6MRBJMfNhu+pWEBuMkB7ozTh9wiyYVM="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index d79b3448f2..1d89f2e932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.0"; + version = "2.0.7"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; - rev = version; - sha256 = "1amlaq119mk8fa3fxi3d6vgp83vcd81mbk53jzbixacklmcsp50k"; + rev = "refs/tags/${version}"; + sha256 = "sha256-9PgdLzeSafglguXksMetzopbDlBWlGDSSXiZHfuWgE8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index 806016afbf..54ad818bb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-Sb5yqbEqGmwhPoG21+uMnl8Jdn3Gc455guceQhAflWY="; + hash = "sha256-RjZWK7XfyRYu7vNaxPd0/F5nBN/JH01ZwZXloMS0g68="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix index e9ca9dba6c..1a4da01df6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ax/default.nix @@ -69,6 +69,10 @@ buildPythonPackage rec { disabledTests = [ # exact comparison of floating points "test_optimize_l0_homotopy" + # AssertionError: 5 != 2 + "test_get_standard_plots_moo" + # AssertionError: Expected 'warning' to be called once. Called 3 times + "test_validate_kwarg_typing" ]; pythonImportsCheck = [ "ax" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix index db43d7770d..40726506f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -1,27 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, azure-core -, msrest +{ lib +, pythonOlder +, isodate +, fetchPypi +, buildPythonPackage +, azure-core }: buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; + hash = "sha256-cJIRe68GzY6T7ukhN+coF2m0AD/EFtSh7aZGuyVkAnw="; }; propagatedBuildInputs = [ azure-core - msrest + isodate ]; - pythonImportsCheck = [ "azure.appconfiguration" ]; + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "azure.appconfiguration" + ]; meta = with lib; { description = "Microsoft App Configuration Data Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix index 9cbbd8e64b..f41bc696d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "4.5.1"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6"; + sha256 = "sha256-xK2oOBMG7sQTwBvFCneOJk3D9Pr6nWlvnfhDYUjSrqg="; }; propagatedBuildInputs = [ six requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix index 56d27d60d2..4d9c50bb05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.14.0"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nati9XRCNJgt/cmhj2t1l+oijsR6SC1UVZ35VANd0l8="; + hash = "sha256-o895Xjp/su2mc1WHbsQvWDe28sX/HhLtOb7BC5TFkyg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index 85220841e0..3b6c5fd88b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -1,31 +1,28 @@ { lib +, azure-common +, azure-mgmt-core , buildPythonPackage , fetchPypi -, msrest -, msrestazure -, azure-common -, azure-mgmt-nspkg -, azure-mgmt-core -, isPy3k +, isodate +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "12.0.0"; + version = "13.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + hash = "sha256-yJ8jTeT4Gu23YSHl5GZ0+zdlC3s+GIxS4ir8z/HBkA4="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests @@ -34,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure CDN Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cdn_${version}/sdk/cdn/azure-mgmt-cdn/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index f75b262df3..bc20dcdfb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -4,29 +4,25 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, typing-extensions +, isodate }: buildPythonPackage rec { pname = "azure-mgmt-containerregistry"; - version = "10.1.0"; + version = "10.2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - extension = "zip"; + hash = "sha256-i7i/5ofGxiF9/wTAPnUOaZ6FAgK3EaBqoHeSC8HuXCo="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + isodate ]; # no tests included @@ -40,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Container Registry Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 4707f8bc2a..04cff63317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "26.0.0"; + version = "27.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BpvnSqee5wodtMXPxo/pHCBk8Yy4yPnEdK164d9ILuM="; + hash = "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 9bf335e855..9d2857c1c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -1,39 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.2.0"; + version = "9.3.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; + hash = "sha256-02DisUN2/auBDhPgE9aUvEvYwoQUQC4NYGD/PQZOl/Y="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core ]; - # has no tests + # Module has no tests doCheck = false; + pythonImportsCheck = [ + "azure.mgmt.cosmosdb" + ]; + meta = with lib; { - description = "This is the Microsoft Azure Cosmos DB Management Client Library"; + description = "Module to work with the Microsoft Azure Cosmos DB Management"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cosmosdb_${version}/sdk/cosmos/azure-mgmt-cosmosdb/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 46061f5a00..8b5ae2435d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -4,28 +4,25 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, msrestazure +, isodate }: buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "10.1.0"; + version = "11.0.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - extension = "zip"; + hash = "sha256-00cDFHpaEciRQLHM+Kt3uOtw/geOn5+onrY7lav6EeU="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate ]; # no tests included @@ -39,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure NetApp Files Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 385d55248e..fd6fe1b3e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-redhatopenshift"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LOJldUyWdVShpN8lD8zGdFeYFiKSmODk3WNOP1fJfcs="; + hash = "sha256-BL2a2L2AwJWvs0V+VpSGaS8//AWMy5m6rdAPDJPbrEo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix index 4683d1e294..5ba7400773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -1,30 +1,29 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "9.0.0"; + version = "9.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; + hash = "sha256-U7xu6tsJdNIfEguyG7Xmgn321lDhc0dGD9g+LWiINZk="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest + isodate ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -39,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-search_${version}/sdk/search/azure-mgmt-search/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index a0da387c62..c5190b6d33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; + hash = "sha256-Nb8ZAr8VidYm41lx5aqgCeiECUZytHm3mM0buNTy/fk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-monitor-ingestion/default.nix new file mode 100644 index 0000000000..7058a1bddb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, azure-core +, isodate +, typing-extensions +}: + +buildPythonPackage rec { + pname = "azure-monitor-ingestion"; + version = "1.0.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-idAEqP+HaZs/0fzyBaqO8enTTySg88w3TSIUceiYdDs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + azure-core + isodate + typing-extensions + ]; + + pythonImportsCheck = [ + "azure.monitor.ingestion" + "azure.monitor.ingestion.aio" + ]; + + # requires checkout from mono-repo and a mock account + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-ingestion_${version}/sdk/monitor/azure-monitor-ingestion/CHANGELOG.md"; + description = "Send custom logs to Azure Monitor using the Logs Ingestion API"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-ingestion"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index d57082fecc..562340f93e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.2"; + version = "7.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0iKPBVxP6tP+vnU37QD8vDHeMsfULO02pxt6hg/RIw8="; + hash = "sha256-970pd5G2pXfONqOeoKuxCqD4dba7DTFSLtntK7AojUw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 3afaf383f4..b89653fb67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.14.1"; + version = "12.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f1vV13c/NEUYWZ0Tgha+CwpHZJ5AZWdbhFPrTmf5hGA="; + hash = "sha256-AJjxz6k0TE94HODNUE/zo1JVdRVTwB5yDczQyqjYqio="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix index f861d2ec29..e6f4152579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.7.2"; + version = "12.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-90sni/yKGolR/92StkC4Kad7fNF/qeI1czzVqMW35JY="; + hash = "sha256-sDVzLTLT9mQ3eWYZM4CzDkv99rR2dHhDVExaXyE1VYk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-strenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-strenum/default.nix index a23a79024a..229f9282c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-strenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-strenum/default.nix @@ -1,17 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pytestCheckHook , pythonOlder -, setuptools -, setuptools-scm -, wheel }: buildPythonPackage rec { pname = "backports-strenum"; - version = "1.2.4"; - format = "pyproject"; + version = "1.2.8"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,15 +17,11 @@ buildPythonPackage rec { owner = "clbarnes"; repo = "backports.strenum"; rev = "refs/tags/v${version}"; - hash = "sha256-AhAMVawnBMJ45a3mpthUZvqTeqeCB1Uco4MSusLyA4E="; + hash = "sha256-jbMR9VAGsMAJTP2VQyRr+RPYwWwk8hGAYs4KoZEWa7U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel + poetry-core ]; nativeCheckInputs = [ 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 dd76021cab..5a3a23a4e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix @@ -2,31 +2,29 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, pytestCheckHook +, setuptools , arviz -, blackjax , formulae , graphviz -, numpy -, numpyro , pandas , pymc -, scipy -, setuptools +, blackjax +, numpyro +, pytestCheckHook }: buildPythonPackage rec { pname = "bambi"; - version = "0.10.0"; - format = "pyproject"; + version = "0.13.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bambinos"; - repo = pname; + repo = "bambi"; rev = "refs/tags/${version}"; - hash = "sha256-D04eTAlckEqgKA+59BRljlyneHYoqqZvLYmt/gBLHcU="; + hash = "sha256-9+uTyV3mQlHOKAjXohwkhTzNe/+I5XR/LuH1ZYvhc8I="; }; nativeBuildInputs = [ @@ -36,10 +34,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ arviz formulae - numpy + graphviz pandas pymc - scipy ]; preCheck = '' @@ -48,23 +45,39 @@ buildPythonPackage rec { nativeCheckInputs = [ blackjax - graphviz numpyro pytestCheckHook ]; disabledTests = [ # Tests require network access + "test_alias_equal_to_name" + "test_average_by" + "test_ax" + "test_basic" + "test_censored_response" "test_custom_prior" "test_data_is_copied" "test_distributional_model" + "test_elasticity" + "test_extra_namespace" + "test_fig_kwargs" "test_gamma_with_splines" - "test_non_distributional_model_with_categories" + "test_group_effects" + "test_hdi_prob" + "test_legend" "test_non_distributional_model" "test_normal_with_splines" "test_predict_offset" - # Assertion issue - "test_custom_likelihood_function" + "test_predict_new_groups" + "test_predict_new_groups_fail" + "test_set_alias_warnings" + "test_subplot_kwargs" + "test_transforms" + "test_use_hdi" + "test_with_groups" + "test_with_group_and_panel" + "test_with_user_values" ]; pythonImportsCheck = [ @@ -74,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bambinos.github.io/bambi"; description = "High-level Bayesian model-building interface"; + changelog = "https://github.com/bambinos/bambi/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix index 4546843dbc..31efe43cbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bandcamp-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "bandcamp-api"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; src = fetchPypi { pname = "bandcamp_api"; inherit version; - hash = "sha256-v/iACVcBFC/3x4v7Q/1p+aHGhfw3AQ43eU3sKz5BskI="; + hash = "sha256-7/WXMo7fCDMHATp4hEB8b7fNJWisUv06hbP+O878Phs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/barectf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/barectf/default.nix new file mode 100644 index 0000000000..429e03fbe9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/barectf/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, setuptools +, jsonschema +, pyyaml +, jinja2 +, termcolor +}: + +buildPythonPackage rec { + pname = "barectf"; + version = "3.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "efficios"; + repo = "barectf"; + rev = "v${version}"; + hash = "sha256-JelFfd3WS012dveNlIljhLdyPmgE9VEOXoZE3MBA/Gw="; + }; + + nativeBuildInputs = [ poetry-core ]; + nativeCheckInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ + setuptools # needs pkg_resources at runtime + jsonschema + pyyaml + jinja2 + termcolor + ]; + + pythonImportsCheck = [ "barectf" ]; + + meta = with lib; { + description = "Generator of ANSI C tracers which output CTF data streams "; + homepage = "https://github.com/efficios/barectf"; + license = licenses.mit; + maintainers = with maintainers; [ Madouura ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/bash-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/bash-path.patch new file mode 100644 index 0000000000..98c3cc511a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/bash-path.patch @@ -0,0 +1,22 @@ +diff --git a/bash_kernel/kernel.py b/bash_kernel/kernel.py +index 0496f1e..bd13c4f 100644 +--- a/bash_kernel/kernel.py ++++ b/bash_kernel/kernel.py +@@ -88,7 +88,7 @@ class BashKernel(Kernel): + @property + def banner(self): + if self._banner is None: +- self._banner = check_output(['bash', '--version']).decode('utf-8') ++ self._banner = check_output(['@bash@', '--version']).decode('utf-8') + return self._banner + + language_info = {'name': 'bash', +@@ -116,7 +116,7 @@ class BashKernel(Kernel): + # source code there for comments and context for + # understanding the code here. + bashrc = os.path.join(os.path.dirname(pexpect.__file__), 'bashrc.sh') +- child = pexpect.spawn("bash", ['--rcfile', bashrc], echo=False, ++ child = pexpect.spawn("@bash@", ['--rcfile', bashrc], echo=False, + encoding='utf-8', codec_errors='replace') + # Following comment stolen from upstream's REPLWrap: + # If the user runs 'env', the value of PS1 will be in the output. To avoid diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix new file mode 100644 index 0000000000..1c50b151f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bash-kernel/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, flit-core +, ipykernel +, python +, pexpect +, bash +, substituteAll +}: + +buildPythonPackage rec { + pname = "bash-kernel"; + version = "0.9.1"; + pyproject = true; + + src = fetchPypi { + pname = "bash_kernel"; + inherit version; + hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; + }; + + patches = [ + (substituteAll { + src = ./bash-path.patch; + bash = lib.getExe bash; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + ipykernel + pexpect + ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + ${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Bash Kernel for Jupyter"; + homepage = "https://github.com/takluyver/bash_kernel"; + changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix deleted file mode 100644 index 582e7c5dcc..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/bash_kernel/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, flit-core -, ipykernel -, isPy27 -, python -, pexpect -, bash -}: - -buildPythonPackage rec { - pname = "bash_kernel"; - version = "0.9.0"; - format = "pyproject"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-BCPwUS72+DplThQ5o2lxiJmjjyeUj+IbZlst8dvzp8c="; - }; - - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff"; - sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j"; - }) - ]; - - postPatch = '' - substituteInPlace bash_kernel/kernel.py \ - --replace "'bash'" "'${bash}/bin/bash'" \ - --replace "\"bash\"" "'${bash}/bin/bash'" - ''; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ ipykernel pexpect ]; - - # no tests - doCheck = false; - - preBuild = '' - export HOME=$TMPDIR - ''; - - postInstall = '' - ${python.pythonForBuild.interpreter} -m bash_kernel.install --prefix $out - ''; - - meta = with lib; { - description = "Bash Kernel for Jupyter"; - homepage = "https://github.com/takluyver/bash_kernel"; - changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix index 7f97f5d933..ed5cb1a609 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # workaround https://github.com/idank/bashlex/issues/51 preBuild = '' - ${python.pythonForBuild.interpreter} -c 'import bashlex' + ${python.pythonOnBuildForHost.interpreter} -c 'import bashlex' ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix index 88a019dda8..4f1d0cef7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bbox/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bbox"; - version = "0.9.2"; + version = "0.9.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ucR7mg9eubEefjC7ratEgrb9h++a26z8KV38n3N2kcw="; + hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; }; propagatedBuildInputs = [ pyquaternion numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-docverif/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/beancount-docverif/default.nix index 521652f842..d614b2f12d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-docverif/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi , setuptools-scm , beancount -, pytest, sh +, pytestCheckHook }: buildPythonPackage rec { version = "1.0.1"; - pname = "beancount_docverif"; - - disabled = !isPy3k; + pname = "beancount-docverif"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "beancount_docverif"; + inherit version; hash = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; }; @@ -24,14 +24,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest - sh + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { homepage = "https://github.com/siriobalmelli/beancount_docverif"; description = "Document verification plugin for Beancount"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix index 62dbfd059b..3eba6f3317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix @@ -3,22 +3,24 @@ , fetchPypi , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "beartype"; - version = "0.14.0"; + version = "0.16.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg="; + hash = "sha256-GtqJzy1usw624Vbu0utUkzV3gpN5ENdDgJGOU8Lq4L8="; }; nativeCheckInputs = [ pytestCheckHook + typing-extensions ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix index 22f69a7285..05ebf87f2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "2.3.0"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kuzmoyev"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 3ed31e4ab4..846b58a677 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.36.5"; + version = "0.36.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-f4AgYpqb4s5F46nGi0FjLQ9YRHetLfaA/jLydiewxOM="; + hash = "sha256-+p3As+fi6mw9i5q2klFTM9QQ2JoQarwrphc6tB6C94M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix index d6827f5b50..5d435d9488 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -12,6 +12,7 @@ , cloudpickle , deepmerge , fs +, httpx , inflection , jinja2 , numpy @@ -28,7 +29,7 @@ , pip-tools , prometheus-client , psutil -, pynvml +, nvidia-ml-py , python-dateutil , python-json-logger , python-multipart @@ -68,7 +69,7 @@ }: let - version = "1.1.6"; + version = "1.1.9"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -104,9 +105,15 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-SDahF4oAewWzCofErgYJDId/TBv74gLCxYT/jKEAgpU="; + hash = "sha256-+5enRlk05IGdsNY6KIzYgh7vGRua0duI57o/AIevcdM="; }; + # https://github.com/bentoml/BentoML/pull/4227 should fix this test + postPatch = '' + substituteInPlace tests/unit/_internal/utils/test_analytics.py \ + --replace "requests" "httpx" + ''; + pythonRelaxDeps = [ "opentelemetry-semantic-conventions" ]; @@ -126,6 +133,7 @@ buildPythonPackage { cloudpickle deepmerge fs + httpx inflection jinja2 numpy @@ -142,7 +150,7 @@ buildPythonPackage { pip-tools prometheus-client psutil - pynvml + nvidia-ml-py python-dateutil python-json-logger python-multipart diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix index da6820ef6e..a942651dcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bespon/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { - version = "0.6.0"; - pname = "BespON"; + version = "0.7.0"; + pname = "bespon"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a"; + hash = "sha256-dGtXw4uq6pdyXBVfSi9s7kCFUqA1PO7qWEGY0JNAz8Q="; }; - propagatedBuildInputs = [ ]; + nativeBuildInputs = [ setuptools ]; # upstream doesn't contain tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 40f7ad7cf8..470eaf376a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-Fo30qDBqVxVuD/Ow0jsvN20Hx7Zhvie47CE+1ys1ewU="; + hash = "sha256-69H0hB+yVmyzJ5A2Cb7ZcaaoRzMt618U+TUHYQ03/cY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix index ee6dcb44d5..67b64e2a71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bincopy/default.nix @@ -1,12 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }: +{ lib +, buildPythonPackage +, fetchPypi +, argparse-addons +, humanfriendly +, pyelftools +, pythonOlder +}: buildPythonPackage rec { pname = "bincopy"; - version = "17.14.5"; + version = "20.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X03nw3o9t63PPtxIM6Ij8zVtm/CL5y7G5DHJ8KzSnxg="; + hash = "sha256-FM+0z5cie/Kx9bhWI99MdnrSGa/cn+BzLdLP3/RGr98="; }; propagatedBuildInputs = [ @@ -15,7 +25,9 @@ buildPythonPackage rec { pyelftools ]; - pythonImportsCheck = [ "bincopy" ]; + pythonImportsCheck = [ + "bincopy" + ]; meta = with lib; { description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix index 16786b2e01..1608ecdf89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip-utils/default.nix @@ -1,36 +1,32 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, ecdsa -, coincurve -, pynacl -, crcmod -, ed25519-blake2b -, py-sr25519-bindings , cbor2 +, coincurve +, crcmod +, ecdsa +, ed25519-blake2b +, fetchFromGitHub +, py-sr25519-bindings , pycryptodome +, pynacl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bip-utils"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; + hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "coincurve>=15.0.1,<18.0.0" "coincurve" - ''; - propagatedBuildInputs = [ ecdsa cbor2 @@ -42,6 +38,10 @@ buildPythonPackage rec { pycryptodome ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "bip_utils" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip32/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip32/default.nix new file mode 100644 index 0000000000..96f37498c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip32/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pythonOlder +, setuptools +, base58 +, coincurve +}: + +buildPythonPackage rec { + pname = "bip32"; + version = "3.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + # the PyPi source distribution ships a broken setup.py, so use github instead + src = fetchFromGitHub { + owner = "darosior"; + repo = "python-bip32"; + rev = version; + hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + base58 + coincurve + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bip32" + ]; + + meta = with lib; { + description = "Minimalistic implementation of the BIP32 key derivation scheme"; + homepage = "https://github.com/darosior/python-bip32"; + changelog = "https://github.com/darosior/python-bip32/blob/${version}/CHANGELOG.md"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ arcnmx ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index a301f5757d..e69b31b118 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.1"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5ozu81qIYl0WFpVQdo/MjTiUkT42PCTsv2uMB+sCyPM="; + hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix index 037ea8b5eb..3b1ead8d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.12.0"; + version = "0.12.2"; disabled = !isPy3k; @@ -10,12 +10,12 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - hash = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; + hash = "sha256-jfd2Buy6GSCH0ZeccRREC1NmlS6Mq1qtNv/NLNJOsX0="; }; postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ - "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \ + "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or ctypes.util.find_library('libeay32')" \ "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix index a61a159a71..55a6094c13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, bitarray , setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "bitstring"; - version = "4.0.2"; + version = "4.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,14 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scott-griffiths"; repo = pname; - rev = "bitstring-${version}"; - hash = "sha256-LghfDjf/Z1dEU0gjH1cqMb04ChnW+aGDjmN+RAhMWW8="; + rev = "refs/tags/bitstring-${version}"; + hash = "sha256-e4OnXwEuXz5m8d2PZOL5zDw8iGEzUg8LLk+xs/eGleA="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + bitarray + ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "bitstring" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix index d83eb87baf..e16a6d7a38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.17.0"; + version = "8.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; + hash = "sha256-11up3e2FwX6IWiCaAOuOJI7kB2IUny8qeTYMqFdGfaw="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix index 62fdc0e94a..4e47e69265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blackjax/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , pytestCheckHook +, setuptools-scm , fastprogress , jax , jaxlib @@ -14,24 +14,21 @@ buildPythonPackage rec { pname = "blackjax"; - version = "0.9.6"; - disabled = pythonOlder "3.7"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "blackjax-devs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EieDu9SJxi2cp1bHlxX4vvFZeDGMGIm24GoR8nSyjvE="; + hash = "sha256-hqOKSHyZ/BmOu6MJLeecD3H1BbLbZqywmlBzn3xjQRk="; }; - patches = [ - # remove in next release - (fetchpatch { - name = "fix-lbfgs-args"; - url = "https://github.com/blackjax-devs/blackjax/commit/1aaa6f64bbcb0557b658604b2daba826e260cbc6.patch"; - hash = "sha256-XyjorXPH5Ap35Tv1/lTeTWamjplJF29SsvOq59ypftE="; - }) - ]; + nativeBuildInputs = [ setuptools-scm ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ fastprogress @@ -56,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://blackjax-devs.github.io/blackjax"; description = "Sampling library designed for ease of use, speed and modularity"; + changelog = "https://github.com/blackjax-devs/blackjax/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 8ee08646d1..041fd9d84c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; + hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 61a069305d..f53f614867 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk="; }; + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl --version` + substituteInPlace bleak/backends/bluezdbus/version.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -40,12 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # bleak checks BlueZ's version with a call to `bluetoothctl --version` - substituteInPlace bleak/backends/bluezdbus/__init__.py \ - --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" - ''; - pythonImportsCheck = [ "bleak" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 88bd08c925..9864bbae3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -2,24 +2,37 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pytest-asyncio +, setuptools }: buildPythonPackage rec { pname = "blinker"; - version = "1.5"; + version = "1.6.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; + hash = "sha256-Sv095m7zqfgGdVn7ehy+VVwX3L4VlxsF0bYlw+er4hM="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "blinker" ]; + pythonImportsCheck = [ + "blinker" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; meta = with lib; { - homepage = "https://pythonhosted.org/blinker/"; - description = "Fast, simple object-to-object and broadcast signaling"; + changelog = "https://github.com/pallets-eco/blinker/releases/tag/${version}"; + description = "Fast Python in-process signal/event dispatching system"; + homepage = "https://github.com/pallets-eco/blinker/"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 51e5e3b0f4..9c9a1f99ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -1,19 +1,21 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiofiles +, aiohttp , pytestCheckHook , python-dateutil , python-slugify -, pythonAtLeast , pythonOlder , requests +, setuptools , sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.21.0"; - format = "setuptools"; + version = "0.22.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,10 +23,21 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; + hash = "sha256-J9eBZv/uizkZz53IX1ZfF7IeMOnBonyMD2c5DphW8BQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "wheel~=0.40.0"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + aiofiles + aiohttp python-dateutil python-slugify requests @@ -45,16 +58,10 @@ buildPythonPackage rec { "blinkpy.sync_module" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_download_video_exit" - "test_parse_camera_not_in_list" - "test_parse_downloaded_items" - ]; - meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; - changelog = "https://github.com/fronzbot/blinkpy/releases/tag/v${version}"; + changelog = "https://github.com/fronzbot/blinkpy/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix index d3de7561be..bafd5254b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkstick/default.nix @@ -1,35 +1,27 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyusb -}: +{ lib, buildPythonPackage, fetchFromGitHub, pyusb }: buildPythonPackage rec { pname = "blinkstick"; - version = "1.2.0"; + version = "unstable-2023-05-04"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0rdk3i81s6byw23za0bxvkh7sj5l16qxxgc2c53qjg3klc24wcm9"; + src = fetchFromGitHub { + owner = "arvydas"; + repo = "blinkstick-python"; + rev = "8140b9fa18a9ff4f0e9df8e70c073f41cb8f1d35"; + hash = "sha256-9bc7TD/Ilc952ywLauFd0+3Lh64lQlYuDC1KG9eWDgs="; }; - # Upstream fix https://github.com/arvydas/blinkstick-python/pull/54 - # https://github.com/arvydas/blinkstick-python/pull/54/commits/b9bee2cd72f799f1210e5d9e13207f93bbc2d244.patch - # has line ending issues after 1.2.0 - postPatch = '' - substituteInPlace setup.py --replace "pyusb==1.0.0" "pyusb>=1.0.0" - ''; - propagatedBuildInputs = [ pyusb ]; # Project has no tests doCheck = false; pythonImportsCheck = [ "blinkstick" ]; - meta = with lib; { + meta = { description = "Python package to control BlinkStick USB devices"; homepage = "https://github.com/arvydas/blinkstick-python"; - license = licenses.bsd3; - maintainers = with maintainers; [ np ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ np perstark ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix index 80cec5ca1e..a4c1db3d7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blosc2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.1.1"; + version = "2.2.7"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "python-blosc2"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI="; + hash = "sha256-5a94Zm6sYl/nSfkcFbKG7PkyXwLB6bAoIvfaq0yVGHo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix index 41d8c13dc5..929f1c90b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -48,6 +48,13 @@ buildPythonPackage rec { }) ]; + # ImportError: cannot import name 'setuptools' from 'setuptools' + # this is resolved in the next release, v2 + postPatch = '' + substituteInPlace setup.py \ + --replace "from setuptools import Extension, setup, setuptools" "from setuptools import Extension, setup" + ''; + nativeBuildInputs = [ cmake setuptools-scm ]; buildInputs = [ boost gmp.static pybind11 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 608d7af455..faec6cb365 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.12.0"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zdMqjZ7CEwDnvVvIe1breQ+/4ZwzdLk2CtI+GCY+3uk="; + hash = "sha256-eO17EuZ9K6tLAyEGmTaxw1Cxfz3XPPwNCcIwZ2/uHug="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix index 49573b94ae..ef2980959d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boilerpy3/default.nix @@ -6,7 +6,7 @@ let pname = "boilerpy3"; - version = "1.0.6"; + version = "1.0.7"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "jmriebold"; repo = "BoilerPy3"; rev = "refs/tags/v${version}"; - hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A="; + hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix deleted file mode 100644 index 2c24fe51de..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, python, makeWrapper, unzip -, pipInstallHook -, setuptoolsBuildHook -, wheel, pip, setuptools -}: - -stdenv.mkDerivation rec { - pname = "pip"; - inherit (pip) version; - name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; - - srcs = [ wheel.src pip.src setuptools.src ]; - sourceRoot = "."; - - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - - # Should be propagatedNativeBuildInputs - propagatedBuildInputs = [ - # Override to remove dependencies to prevent infinite recursion. - (pipInstallHook.override{pip=null;}) - (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) - ]; - - postPatch = '' - mkdir -p $out/bin - '' + (pip.postPatch or ""); # `pip` does not necessarily have a `postPatch` field. - - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ python ]; - - dontBuild = true; - - installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) '' - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 - '' + '' - # Give folders a known name - mv pip* pip - mv setuptools* setuptools - mv wheel* wheel - # Set up PYTHONPATH: - # - pip and setuptools need to be in PYTHONPATH to install setuptools, wheel, and pip. - # - $out is where we are installing to and takes precedence, and is where wheel will end so we can install pip. - export PYTHONPATH="$out/${python.sitePackages}:$(pwd)/pip/src:$(pwd)/setuptools:$(pwd)/setuptools/pkg_resources:$PYTHONPATH" - - echo "Building setuptools wheel..." - pushd setuptools - rm pyproject.toml - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - - echo "Building wheel wheel..." - pushd wheel - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - - echo "Building pip wheel..." - pushd pip - rm pyproject.toml - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . - popd - ''; - - meta = { - description = "Version of pip used for bootstrapping"; - license = lib.unique (pip.meta.license ++ setuptools.meta.license ++ wheel.meta.license); - homepage = pip.meta.homepage; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bork/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bork/default.nix new file mode 100644 index 0000000000..5cd247cf28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bork/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +, build +, coloredlogs +, packaging +, toml +, twine +, wheel +}: + +buildPythonPackage rec { + pname = "bork"; + version = "7.0.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "duckinator"; + repo = pname; + rev = "v${version}"; + hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + }; + + propagatedBuildInputs = [ + build + coloredlogs + packaging + toml + twine + wheel + ]; + + pythonImportsCheck = [ + "bork" + "bork.api" + "bork.cli" + ]; + + meta = with lib; { + description = "Python build and release management tool"; + homepage = "https://github.com/duckinator/bork"; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index b8aeb5c157..d3f2548f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.72"; + version = "0.2.75"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-Re+OKgarLe4n54nZyBm0EtzMHcGKqDY6r+7rtvRSqsg="; + hash = "sha256-T3QTNnnkquv0IurwNtblX9CF/gLeMONEFfbJV/n/Wj4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index 369d722b2e..3975fa900a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -363,12 +363,12 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.28.58"; + version = "1.28.78"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LQxPd+RhC/W6z2/BNuyqQmaATi4APVHQf8F2dI21OQc="; + hash = "sha256-LPjWdNfoXewM9M4I/jGqExgpzHq9NvIZ5ymslTUfTe4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index e6ac07612c..779871db10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.57"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; + hash = "sha256-+kuILCUK10tvpfTEAHZGvKKmpw6Pgn+v2kQkwCkPMKg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index a00a32db49..0d65528f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.62"; + version = "1.31.79"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-LOVV5d/y6R/CK9ZxBlNL8+BZO4ONh/iknTuOh/qDpEA="; + hash = "sha256-ZEiLnziQX4pgBBmY+dyUV1QiLZAKM0W0SQWWZ4kMLBc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 1693f2258b..ddb9d35d05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.9"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.57"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vYSdOslfF4E4Xtgx11OgSj7IcKWdZZgXWq7dcdwrr18="; + hash = "sha256-MBQ2F0Y1vsc5siW4QPw2XKAOXBpj5bKhnuZ50gTgG3g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix index 5729a7a40a..39ed52eb94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; - rev = "v${version}"; - hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4="; + rev = "refs/tags/v${version}"; + hash = "sha256-d8EMmA499Zxyagkqx0JCKMZPwSH4LvBya+raD3v3iZU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix index 7a97b99902..e648831403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.24"; + version = "0.12.25"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JIASGnPoc4CYm3fjK9IJLRkOfqfXHm8bj3r36rnVTqM="; + hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottombar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottombar/default.nix index e3e9bb38cc..ab7a9b06d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottombar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottombar/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bottombar"; - version = "1.0"; + version = "2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "evalf"; repo = "bottombar"; rev = "refs/tags/v${version}"; - hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM="; + hash = "sha256-W+Cbcgb664nVT/nsFdDruT688JWG2NZnF5hDDezTgnw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix index a2a71ad0c9..7dd580c345 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.10"; + version = "0.10.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc="; + hash = "sha256-pumkDVyotm8bJEl/rrpNSsP8KZIVIgThGFB/Sy4OdUs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index a6d385e977..84085488ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -2,7 +2,6 @@ , lib , beautifulsoup4 , blender -, blender-with-packages , boxx , bpycv , buildPythonPackage @@ -10,7 +9,7 @@ , fetchPypi , fetchurl , minexr -, opencv3 +, opencv4 , python3Packages , requests , runCommand @@ -33,7 +32,7 @@ buildPythonPackage rec { minexr zcs requests - opencv3 + opencv4 boxx ]; @@ -52,13 +51,8 @@ buildPythonPackage rec { hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; }; - nativeBuildInputs = [ - ((blender-with-packages.override {inherit blender python3Packages;}) { - packages = [ bpycv ]; - }) - ]; } '' - blender-wrapped -b -P ${./bpycv-test.py} + ${blender.withPackages (ps: [ps.bpycv])}/bin/blender-wrapped -b -P ${./bpycv-test.py} ''; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bqplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bqplot/default.nix index 5695be669b..a1737d339a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bqplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bqplot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bqplot"; - version = "0.12.39"; + version = "0.12.40"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI="; + hash = "sha256-7L/ovwTwRFju5G3Cwvgla0wVIdRvlEOOm+GTieT4b7k="; }; # upstream seems in flux for 0.13 release. they seem to want to migrate from diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bqscales/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bqscales/default.nix index 8b0ebb610a..c8fa7879bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bqscales/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bqscales/default.nix @@ -3,6 +3,8 @@ , pythonOlder , fetchPypi , hatchling +, hatch-jupyter-builder +, jupyterlab , jupyter-packaging , ipywidgets , numpy @@ -12,13 +14,13 @@ buildPythonPackage rec { pname = "bqscales"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; + hash = "sha256-SlnNw4dWOzRedwIN3kCyl95qVqkY92QGOMS3Eyoqk0I="; }; # We relax dependencies here instead of pulling in a patch because upstream @@ -35,7 +37,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + hatch-jupyter-builder hatchling + jupyterlab jupyter-packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index cfb919682e..121777da32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "breathe"; - version = "4.34.0"; + version = "4.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,13 +19,15 @@ buildPythonPackage rec { owner = "michaeljones"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OOc3XQjqQa0cVpA+/HHco+koL+0whUm5qC7x3xiEdwQ="; + hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; patches = [ (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/de3504c81c7cefc87c8229743f93232ca00a685d.patch"; - hash = "sha256-UGld5j0F/hnTuS7KUFvgQL52xCUdaJ3/NeuEuHhpCxI="; + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 + name = "breathe-sphinx7.2-support.patch"; + url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; + hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 5fb4dd913e..505137993b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi , cargo , configobj @@ -8,6 +9,7 @@ , dulwich , fastbencode , fastimport +, pygithub , libiconv , merge3 , patiencediff @@ -37,6 +39,14 @@ buildPythonPackage rec { hash = "sha256-fEEvOfo8YWhx+xuiqD/KNstlso5/K1XJnGY64tkLIwE="; }; + patches = [ + # Explicitly track which URLs are used for GitLab + (fetchpatch { + url = "https://github.com/breezy-team/breezy/commit/cc9fdf3774253183f726127c2ee191c24640d898.patch"; + hash = "sha256-HTDAW3CPEZ1YBe0wnv6ncWEd0QRHwHawfTplbVDiOGc="; + }) + ]; + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -66,7 +76,8 @@ buildPythonPackage rec { pyyaml urllib3 ] ++ passthru.optional-dependencies.launchpad - ++ passthru.optional-dependencies.fastimport; + ++ passthru.optional-dependencies.fastimport + ++ passthru.optional-dependencies.github; nativeCheckInputs = [ testtools @@ -109,6 +120,9 @@ buildPythonPackage rec { fastimport = [ fastimport ]; + github = [ + pygithub + ]; }; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix index 6ebd89a7b3..2b3bcbff50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brian2/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "brian2"; - version = "2.5.1"; + version = "2.5.4"; src = fetchPypi { pname = "Brian2"; inherit version; - hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw="; + hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix index b70302fe9e..91e907c3af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "v${version}"; - hash = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; + rev = "refs/tags/v${version}"; + hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotlicffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotlicffi/default.nix index 5e0600d343..fd30ab86c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotlicffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotlicffi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "brotlicffi"; - version = "1.0.9.2"; - disabled = pythonOlder "3.6"; + version = "1.1.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-hyper"; repo = pname; rev = "v${version}"; - sha256 = "0qx7an7772brmx1rbbrqzqnkqqvicc70mx740nl31kzzyv4jjs00"; + sha256 = "sha256-oW4y1WBJ7+4XwNwwSSR0qUqN03cZYXUYQ6EAwce9dzI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix index 3c8df0a178..f65fe77af2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw="; + hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix index 308bba80b3..930ede2cd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "5.0"; + version = "5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-/d+KTcwCU+OQJ7qzgKLiDUeuNwoySFQW8qZq2a4aQ/o="; + hash = "sha256-raDzHpMloEeV0dJOAn7ZsrZdpNZqz/i4eVWzUo1/w2k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix index 9beb8e9239..89bb744eb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pierron yurrriq ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index f86f47e2bd..4b06298f1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -13,22 +13,22 @@ , pytestCheckHook , pythonOlder , setuptools -, toml , tomli +, wheel }: buildPythonPackage rec { pname = "build"; - version = "0.10.0"; + version = "1.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pypa"; - repo = pname; - rev = version; - hash = "sha256-kXFrfTb7+68EV+gSENL81IFSR+ue7Fl6R2gsuFFBJhI="; + repo = "build"; + rev = "refs/tags/${version}"; + hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { passthru.tests = { pytest = buildPythonPackage { pname = "${pname}-pytest"; - inherit version; + inherit src version; format = "other"; dontBuild = true; @@ -63,7 +63,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook setuptools - toml + wheel ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/busypie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/busypie/default.nix new file mode 100644 index 0000000000..9539d3f437 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/busypie/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "busypie"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rockem"; + repo = "busypie"; + rev = "refs/tags/v${version}"; + hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "busypie" + ]; + + meta = with lib; { + description = "Expressive busy wait for Python"; + homepage = "https://github.com/rockem/busypie"; + changelog = "https://github.com/rockem/busypie/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} 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 95b28f4190..4df83b9e45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.15.0"; + version = "0.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A8S3U07P4Olq9f7/q20aHOPAQsQp3OuGHtIAs8B8VEQ="; + hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix index 61e6b3142f..c27d756070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bytewax/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bytewax"; - version = "0.16.2"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bytewax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PHjKEZMNhtLliOSGt4XHQFDm8Rc4TejQUVSqFN6Au38="; + hash = "sha256-Cv2bTgs3XfYOcHK628/RgGol7S6E4WfHb7gHXXjBhig="; }; env = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix index 176c49819d..1a77c2bcb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.0.3"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sanders41"; - repo = pname; + repo = "camel-converter"; rev = "refs/tags/v${version}"; - hash = "sha256-0sNb1zg8cnDjQQnStfe1k8uB1GpmNtd/VwqSqTcLmj0="; + hash = "sha256-ASUwSA63iUgeRfYdO6InZ8YzEbifQh1hr3fUbE3FYac="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=camel_converter --cov-report term-missing" "" + --replace "--cov=camel_converter --cov-report term-missing --no-cov-on-fail" "" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/camelot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/camelot/default.nix index 2e2f9ef875..392bdf9a7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/camelot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/camelot/default.nix @@ -10,15 +10,16 @@ , pandas , tabulate , click -, pdfminer +, pdfminer-six , pypdf -, opencv3 +, opencv4 +, setuptools }: buildPythonPackage rec { pname = "camelot-py"; version = "0.11.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,16 +28,18 @@ buildPythonPackage rec { hash = "sha256-l6fZBtaF5AWaSlSaY646UfCrcqPIJlV/hEPGWhGB3+Y="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ charset-normalizer chardet pandas tabulate click - pdfminer + pdfminer-six openpyxl pypdf - opencv3 + opencv4 ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canals/default.nix index b74594f25e..f06975bbfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canals/default.nix @@ -6,24 +6,24 @@ , mkdocs-mermaid2-plugin , mkdocstrings , networkx -, pygraphviz , pytestCheckHook , pythonOlder , requests +, typing-extensions }: buildPythonPackage rec { pname = "canals"; - version = "0.8.1"; - format = "pyproject"; + version = "0.10.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "deepset-ai"; - repo = pname; + repo = "canals"; rev = "refs/tags/v${version}"; - hash = "sha256-XC4CxvDghz8/LReeYjHEVtd8j2ZN4jd+x7vP6N8BKpc="; + hash = "sha256-zTC9zaY2WQ4Sx/1YeEaw23UH0hoP/ktMwzH8x/rER00="; }; nativeBuildInputs = [ @@ -32,15 +32,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx + requests + typing-extensions ]; passthru.optional-dependencies = { - graphviz = [ - pygraphviz - ]; - mermaid = [ - requests - ]; docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -54,7 +50,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Test requires internet connection to mermaid.ink - "test/pipelines/integration" + "test/pipeline/integration" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix index 072b22a895..09a9f4366a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canopen"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vBJrsdy2Ljs02KEuOKB7WqgxnBdFfJv+II8Lu9qQ/2E="; + hash = "sha256-XxhlG5325HabmILpafk0rnc+8kpFqrwzNLWGmCBI0Iw="; }; nativeBuildInputs = [ @@ -38,8 +38,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/christiansandberg/canopen/"; description = "CANopen stack implementation"; + homepage = "https://github.com/christiansandberg/canopen/"; + changelog = "https://github.com/christiansandberg/canopen/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ sorki ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cantools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cantools/default.nix new file mode 100644 index 0000000000..f5ad88fb5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cantools/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, argparse-addons +, bitstruct +, can +, crccheck +, diskcache +, matplotlib +, parameterized +, pytestCheckHook +, pythonOlder +, textparser +}: + +buildPythonPackage rec { + pname = "cantools"; + version = "39.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LD0IGSJZG8FhHJ8f9S1sivHQMxT4xyTMEU2FbMVVzCg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + argparse-addons + bitstruct + can + crccheck + diskcache + matplotlib + textparser + ]; + + nativeCheckInputs = [ + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cantools" + ]; + + meta = with lib; { + description = "Tools to work with CAN bus"; + homepage = "https://github.com/cantools/cantools"; + changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ gray-heron ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix index dd9d94715e..4e4d10bd27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casa-formats-io/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "casa-formats-io"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; + hash = "sha256-EOX+tal9nrON2K7mHVYSTTxja6mu2k3Bag8bhL3JHJs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 59c29b95bf..3583f0e554 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -3,24 +3,29 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , simpleeval , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.31.2"; - format = "setuptools"; + version = "1.33.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; + owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-Asz91KG/sDlRTwgn7bP0Pa4yiXKt7Hgc1hzEKD8TfHM="; + hash = "sha256-/0yYU33zMtC6Pjm4yyQNavMDoI+5uC2zZci5IL/EY7Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ simpleeval wcmatch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 5d6c520ad3..e985ed544d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, cryptography , cython , eventlet , fetchFromGitHub @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.26.0"; + version = "3.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +34,7 @@ buildPythonPackage rec { owner = "datastax"; repo = "python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-mLQEG41WyFtXY2PJzoM4uaI4Cm+0xSIAPGhijHHbTBk="; + hash = "sha256-5JRbzYl7ftgK6GuvXWdvo52ZlS1th9JyLAYu/UCcPVc="; }; postPatch = '' @@ -56,17 +57,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - eventlet mock nose pytz pyyaml sure - scales - gremlinpython - gevent - twisted - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests @@ -77,6 +73,13 @@ buildPythonPackage rec { '') + '' # increase tolerance for time-based test substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3' + + export HOME=$(mktemp -d) + # cythonize this before we hide the source dir as it references + # one of its files + cythonize -i tests/unit/cython/types_testhelper.pyx + + mv cassandra .cassandra.hidden ''; pythonImportsCheck = [ @@ -105,6 +108,15 @@ buildPythonPackage rec { "test_nts_token_performance" ]; + passthru.optional-dependencies = { + cle = [ cryptography ]; + eventlet = [ eventlet ]; + gevent = [ gevent ]; + graph = [ gremlinpython ]; + metrics = [ scales ]; + twisted = [ twisted ]; + }; + meta = with lib; { description = "A Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix index b02cac817f..007a9543d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix index 1939b7c13a..840c01d876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catboost/default.nix @@ -1,64 +1,50 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder -, clang_12, python -, graphviz, matplotlib, numpy, pandas, plotly, scipy, six -, withCuda ? false, cudatoolkit }: +{ lib +, buildPythonPackage +, catboost +, python +, graphviz +, matplotlib +, numpy +, pandas +, plotly +, scipy +, setuptools +, six +, wheel +}: -buildPythonPackage rec { - pname = "catboost"; - # nixpkgs-update: no auto update - version = "1.0.5"; +buildPythonPackage { + inherit (catboost) pname version src meta; + format = "pyproject"; - disabled = pythonOlder "3.4"; + sourceRoot = "source/catboost/python-package"; - src = fetchFromGitHub { - owner = "catboost"; - repo = "catboost"; - rev = "refs/tags/v${version}"; - hash = "sha256-ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk"; - }; - - nativeBuildInputs = [ clang_12 ]; - - propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] - ++ lib.optionals withCuda [ cudatoolkit ]; - - patches = [ - ./nix-support.patch + nativeBuildInputs = [ + setuptools + wheel ]; - postPatch = '' - # substituteInPlace is too slow for these large files, and the target has lots of numbers in it that change often. - sed -e 's|\$(YMAKE_PYTHON3-.*)/python3|${python.interpreter}|' -i make/*.makefile + propagatedBuildInputs = [ + graphviz + matplotlib + numpy + pandas + plotly + scipy + six + ]; + + buildPhase = '' + runHook preBuild + + # these arguments must set after bdist_wheel + ${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel --no-widget --prebuilt-extensions-build-root-dir=${lib.getDev catboost} + + runHook postBuild ''; - preBuild = '' - cd catboost/python-package - ''; - setupPyBuildFlags = [ "--with-ymake=no" ]; - CUDA_ROOT = lib.optional withCuda cudatoolkit; - enableParallelBuilding = true; + # setup a test is difficult + doCheck = false; - # Tests use custom "ya" tool, not yet supported. - dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "catboost" ]; - - passthru = { - # Do not update to catboost 1.1.x because the patch doesn't apply cleanly - skipBulkUpdate = true; - }; - - meta = with lib; { - description = "High-performance library for gradient boosting on decision trees."; - longDescription = '' - A fast, scalable, high performance Gradient Boosting on Decision Trees - library, used for ranking, classification, regression and other machine - learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. - ''; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - homepage = "https://catboost.ai"; - maintainers = with maintainers; [ PlushBeaver ]; - # _catboost.pyx.cpp:226822:19: error: use of undeclared identifier '_PyGen_Send' - broken = withCuda; - }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch b/third_party/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch deleted file mode 100644 index b8294420e0..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/catboost/nix-support.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py -index fe9251a21f..86b880c5d0 100644 ---- a/catboost/python-package/setup.py -+++ b/catboost/python-package/setup.py -@@ -80,7 +80,7 @@ class Helper(object): - self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None - self.os_sdk = 'local' - self.with_ymake = True -- self.parallel = None -+ self.parallel = os.environ.get('NIX_BUILD_CORES') or None - - def finalize_options(self): - if os.path.exists(str(self.with_cuda)): -@@ -222,11 +222,12 @@ class build_ext(_build_ext): - - def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): - logging.info('Buildling {} with gnu make'.format(catboost_ext)) -- makefile = 'python{}.{}CLANG11-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') -+ makefile = 'python{}.{}CLANG12-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') - make_cmd = [ - 'make', '-f', '../../make/' + makefile, -- 'CC=clang-11', -- 'CXX=clang++-11', -+ 'CC=clang', -+ 'CXX=clang++', -+ 'PYTHON=python{}'.format(python_version()[0]), - 'BUILD_ROOT=' + build_dir, - 'SOURCE_ROOT=' + topsrc_dir, - ] -diff --git a/make/python2.CLANG12-LINUX-X86_64.makefile b/make/python2.CLANG12-LINUX-X86_64.makefile -index b49a36fb3f..33996af995 100644 ---- a/make/python2.CLANG12-LINUX-X86_64.makefile -+++ b/make/python2.CLANG12-LINUX-X86_64.makefile -@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) - SOURCE_ROOT = $(shell pwd) - PYTHON = $(shell which python) - --ifneq ($(MAKECMDGOALS),help) --define _CC_TEST --__clang_major__ __clang_minor__ --endef -- --_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) --$(info _CC_VERSION = '$(_CC_VERSION)') -- --ifneq '$(_CC_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif -- --ifneq ($(MAKECMDGOALS),help) --define _CXX_TEST --__clang_major__ __clang_minor__ --endef -- --_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) --$(info _CXX_VERSION = '$(_CXX_VERSION)') -- --ifneq '$(_CXX_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif - - - all\ -diff --git a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile -index 82935b297e..093cc86532 100644 ---- a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile -+++ b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile -@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) - SOURCE_ROOT = $(shell pwd) - PYTHON = $(shell which python) - --ifneq ($(MAKECMDGOALS),help) --define _CC_TEST --__clang_major__ __clang_minor__ --endef -- --_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) --$(info _CC_VERSION = '$(_CC_VERSION)') -- --ifneq '$(_CC_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif -- --ifneq ($(MAKECMDGOALS),help) --define _CXX_TEST --__clang_major__ __clang_minor__ --endef -- --_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) --$(info _CXX_VERSION = '$(_CXX_VERSION)') -- --ifneq '$(_CXX_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif - - - all\ -diff --git a/make/python3.CLANG12-LINUX-X86_64.makefile b/make/python3.CLANG12-LINUX-X86_64.makefile -index 1c5d646ae4..6c091fbe17 100644 ---- a/make/python3.CLANG12-LINUX-X86_64.makefile -+++ b/make/python3.CLANG12-LINUX-X86_64.makefile -@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) - SOURCE_ROOT = $(shell pwd) - PYTHON = $(shell which python) - --ifneq ($(MAKECMDGOALS),help) --define _CC_TEST --__clang_major__ __clang_minor__ --endef -- --_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) --$(info _CC_VERSION = '$(_CC_VERSION)') -- --ifneq '$(_CC_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif -- --ifneq ($(MAKECMDGOALS),help) --define _CXX_TEST --__clang_major__ __clang_minor__ --endef -- --_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) --$(info _CXX_VERSION = '$(_CXX_VERSION)') -- --ifneq '$(_CXX_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif - - - all\ -diff --git a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile -index fcdb75a719..4e1dbc3cd7 100644 ---- a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile -+++ b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile -@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) - SOURCE_ROOT = $(shell pwd) - PYTHON = $(shell which python) - --ifneq ($(MAKECMDGOALS),help) --define _CC_TEST --__clang_major__ __clang_minor__ --endef -- --_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) --$(info _CC_VERSION = '$(_CC_VERSION)') -- --ifneq '$(_CC_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif -- --ifneq ($(MAKECMDGOALS),help) --define _CXX_TEST --__clang_major__ __clang_minor__ --endef -- --_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) --$(info _CXX_VERSION = '$(_CXX_VERSION)') -- --ifneq '$(_CXX_VERSION)' '12 0' -- $(error clang 12.0 is required) --endif --endif - - - all\ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix index 5a53233fff..3c86e97f49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catppuccin/default.nix @@ -1,27 +1,47 @@ { lib , buildPythonPackage -, fetchPypi -, python +, fetchFromGitHub +, poetry-core +, poetry-dynamic-versioning , pygments +, rich +, pytestCheckHook }: buildPythonPackage rec { pname = "catppuccin"; - version = "1.1.1"; + version = "1.3.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-mHNuV3yIuFL2cixDOr+//+/b9iD2fN82cfLzZkegxKc="; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik="; }; - propagatedBuildInputs = [ pygments ]; + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + passthru.optional-dependencies = { + pygments = [ pygments ]; + rich = [ rich ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + "tests/test_flavour.py" # would download a json to check correctness of flavours + ]; pythonImportsCheck = [ "catppuccin" ]; - meta = with lib; { + meta = { description = "Soothing pastel theme for Python"; homepage = "https://github.com/catppuccin/python"; - maintainers = with maintainers; [ fufexan ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ fufexan tomasajt ]; + license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery-types/default.nix index 6379d041f1..cc77baff04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery-types/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , poetry-core , pythonOlder @@ -9,26 +8,16 @@ buildPythonPackage rec { pname = "celery-types"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-1OLUJxsuxG/sCKDxKiU4i7o5HyaJdIW8rPo8UofMI28="; + hash = "sha256-5cdiVVYF7QWSuu2dUZIwBGzo56EcZ6ghVVwIt87OGWA="; }; - patches = [ - # remove extraneous build dependencies: - # https://github.com/sbdchd/celery-types/pull/138 - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/sbdchd/celery-types/commit/ff83f06a0302084e1a690e2a5a8b25f2c0dfc6e7.patch"; - hash = "sha256-c68SMugg6Qk88FC842/czoxLpk0uVAVSlWsvo4NI9uo="; - }) - ]; - propagatedBuildInputs = [ typing-extensions ]; 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 1c815da264..9c24281e8d 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.7"; + version = "2.2.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tIWrDbtNKTN4WYc0Zy03omauExarg9770d57tAuq4c0="; + hash = "sha256-Q6Ii2fsJYNABhuaRK4nZ6bjjvNsoIcgNVFBXdBgTXIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix index 708decb296..67c45a2666 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, python, mock }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, python +, mock +}: buildPythonPackage rec { pname = "cepa"; @@ -9,6 +15,14 @@ buildPythonPackage rec { hash = "sha256-P7xwGsP8ic1/abxYptDXNbAU+kC2Hiwu/Tge0g21ipY="; }; + patches = [ + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/onionshare/cepa/commit/0bf9aee7151e65594c532826bb04636e1d80fb6f.patch"; + hash = "sha256-roSt9N5OvnOOxKZUee86zGXt0AsZCcbBdV2cLz1MB2k="; + }) + ]; + postPatch = '' rm test/unit/installation.py sed -i "/test.unit.installation/d" test/settings.cfg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix index b789fe5d16..04a4637baf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix @@ -4,20 +4,29 @@ , pyopenssl , tldextract , pytestCheckHook -, pytest-cov +, pythonOlder }: buildPythonPackage rec { pname = "certauth"; version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ikreymer"; repo = "certauth"; - rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; # Repo has no git tags + # Repo has no git tags, https://github.com/ikreymer/certauth/issues/15 + rev = "ad2bae5d40a9e45519fc1f2cd7678174bbc55b3d"; hash = "sha256-Rso5N0jb9k7bdorjPIUMNiZZPnzwbkxFNiTpsJ9pco0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "--cov certauth " "" + ''; + propagatedBuildInputs = [ pyopenssl tldextract @@ -25,10 +34,20 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov ]; - pythonImportsCheck = [ "certauth" ]; + pythonImportsCheck = [ + "certauth" + ]; + + disabledTests = [ + # Tests want to download Public Suffix List + "test_file_wildcard" + "test_file_wildcard_subdomains" + "test_in_mem_parent_wildcard_cert" + "test_in_mem_parent_wildcard_cert_at_tld" + "test_in_mem_parent_wildcard_cert_2" + ]; meta = with lib; { description = "Simple CertificateAuthority and host certificate creation, useful for man-in-the-middle HTTPS proxy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-ovh/default.nix new file mode 100644 index 0000000000..da0dd57cff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, acme +, certbot +, dns-lexicon +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "certbot-dns-ovh"; + + inherit (certbot) src version; + disabled = pythonOlder "3.6"; + + sourceRoot = "${src.name}/certbot-dns-ovh"; + + propagatedBuildInputs = [ + acme + certbot + dns-lexicon + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-o cache_dir=$(mktemp -d)" + + # Monitor https://github.com/certbot/certbot/issues/9606 for a solution + "-W 'ignore:pkg_resources is deprecated as an API:DeprecationWarning'" + "-W 'ignore:Package lexicon.providers is deprecated and will be removed in Lexicon 4>=.:DeprecationWarning'" + "-W 'ignore:Legacy configuration object has been used to load the ConfigResolver.:DeprecationWarning'" + ]; + + meta = certbot.meta // { + description = "OVH DNS Authenticator plugin for Certbot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix index 7931432bd5..8a2fd3bb88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2023.05.07"; + version = "2023.07.22"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-KXm0CtuZJL9VgFeY+DV0rdjaKqPQCqcoGPCkeGieTX8="; + hash = "sha256-V3bptJDNMGXlCMg6GHj792IrjfsG9+F/UpQKxeM0QOc="; }; patches = [ 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 new file mode 100644 index 0000000000..fdbfe0ff71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, dask +, fetchFromGitHub +, matplotlib +, pint +, pooch +, pytestCheckHook +, pythonOlder +, regex +, rich +, scipy +, setuptools +, setuptools-scm +, shapely +, wheel +, xarray +}: + +buildPythonPackage rec { + pname = "cf-xarray"; + version = "0.8.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "cf-xarray"; + rev = "refs/tags/v${version}"; + hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + xarray + ]; + + propagatedBuildInputs = [ + xarray + ]; + + passthru.optional-dependencies = { + all = [ + matplotlib + pint + pooch + regex + rich + shapely + ]; + }; + + nativeCheckInputs = [ + dask + pytestCheckHook + scipy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "cf_xarray" + ]; + + disabledTestPaths = [ + # Tests require network access + "cf_xarray/tests/test_accessor.py" + "cf_xarray/tests/test_helpers.py" + ]; + + meta = with lib; { + description = "An accessor for xarray objects that interprets CF attributes"; + homepage = "https://github.com/xarray-contrib/cf-xarray"; + changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/third_party/nixpkgs/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff index c48c8090dd..fdbec4f6fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -1,7 +1,8 @@ -diff -r bac92fcfe4d7 c/_cffi_backend.c ---- a/c/_cffi_backend.c Mon Jul 18 15:58:34 2022 +0200 -+++ b/c/_cffi_backend.c Sat Aug 20 12:38:31 2022 -0700 -@@ -96,7 +96,7 @@ +diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c +index 537271f..9c3bf94 100644 +--- a/src/c/_cffi_backend.c ++++ b/src/c/_cffi_backend.c +@@ -103,7 +103,7 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 @@ -10,7 +11,7 @@ diff -r bac92fcfe4d7 c/_cffi_backend.c # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 -@@ -6413,7 +6413,7 @@ +@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 0d93941b97..7b2547afff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, setuptools , pytestCheckHook , libffi , pkg-config @@ -13,11 +13,12 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.15.1"; + version = "1.16.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; + hash = "sha256-vLPvQ+WGZbvaL7GYaY/K5ndkg+DEpjGqVkeAbCXgLMA="; }; patches = [ @@ -32,38 +33,12 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff - (fetchpatch { - # Drop py.code usage from tests, no longer depend on the deprecated py package - url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; - }) - (fetchpatch { - # Replace py.test usage with pytest - url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; - }) ] ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") [ # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests # to run and pass when cffi is built with newer versions of clang: # - testing/cffi1/test_verify1.py::test_enum_usage # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument ./clang-pointer-substraction-warning.diff - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # Fix test that failed because python seems to have changed the exception format in the - # final release. This patch should be included in the next version and can be removed when - # it is released. - (fetchpatch { - url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; - hash = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; - }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -74,11 +49,18 @@ if isPyPy then null else buildPythonPackage rec { --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - buildInputs = [ libffi ]; + nativeBuildInputs = [ + pkg-config + setuptools + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libffi + ]; - propagatedBuildInputs = [ pycparser ]; + propagatedBuildInputs = [ + pycparser + ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang @@ -86,18 +68,16 @@ if isPyPy then null else buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isMusl; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - # AssertionError: cannot seem to get an int[10] not completely cleared - # https://foss.heptapod.net/pypy/cffi/-/issues/556 - "test_ffi_new_allocator_1" + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar lnl7 ]; + changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}"; + description = "Foreign Function Interface for Python calling C code"; + downloadPage = "https://github.com/python-cffi/cffi"; homepage = "https://cffi.readthedocs.org/"; license = licenses.mit; - description = "Foreign Function Interface for Python calling C code"; + maintainers = teams.python.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index ed5377d978..f52bf2f667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.79.6"; + version = "0.79.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38="; + hash = "sha256-dVLKMoZzP2q3bejEIslgpQgkPJOJUeEsXyyk8HRP6h0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 8b5ff73d1f..1d1b21ceee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -4,7 +4,7 @@ , pythonOlder # build-system -, cython +, cython_3 , poetry-core , setuptools @@ -17,12 +17,12 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.4.2"; + version = "0.11.0"; in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,11 +30,11 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-RBXEumw5A/XzB/LazUcvq8JM/Ahvcy9lCTYKpGcY7go="; + hash = "sha256-uRndA0NnSQtJTftALzBF3FWZtavRyMwBlnCBqoIXE5Q="; }; nativeBuildInputs = [ - cython + cython_3 poetry-core setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix index 69353dcaec..7c78de37d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "chardet"; - version = "5.1.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DWJxK5VrwVT4X7CiZuKjxZE8KWfgA0hwGzJBHW3vMeU="; + hash = "sha256-Gztv9HmoxBS8P6LAhSmVaVxKAm3NbQYzst0JLKOcHPc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix index d567c41dbe..c2856a4906 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix @@ -1,17 +1,15 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder - - # popular downstream dependencies -, aiohttp , requests }: buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.0.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,18 +18,18 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; + hash = "sha256-CfL5rlrwJs9453z+1xPUzs1B3OyjFBaU6klzY7gJCzA="; }; - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov=charset_normalizer --cov-report=term-missing" "" ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "charset_normalizer" ]; @@ -41,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for encoding and language detection"; homepage = "https://charset-normalizer.readthedocs.io/"; + changelog = "https://github.com/Ousret/charset_normalizer/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/checksumdir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/checksumdir/default.nix index 7492d168d8..78a24bb295 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/checksumdir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/checksumdir/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.2.0"; pyproject = true; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "to-mc"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 11ce178e69..679c5464b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "9.0.0"; + version = "10.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PUetnuGey+wUS0dYOZA2aS/b9npAuW7vH7FFQ2ez0zg="; + hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix index 7d7912ff0f..6bee164124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.82"; + version = "0.1.84"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "deepmind"; - repo = pname; + repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-xBq22AaR2Tp1NSPefEyvCDeUYqRZlAf5LVHWo0luiXk="; + hash = "sha256-LsUMvSMVGjqZuFDcb+/61RtFxweeG6bSFzmJUUMv6rA="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chex is a library of utilities for helping to write reliable JAX code."; homepage = "https://github.com/deepmind/chex"; + changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix index b8ce9ce755..7afec2e1a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "chia-rs"; - version = "0.2.0"; + version = "0.2.10"; src = fetchFromGitHub { owner = "chia-network"; repo = "chia_rs"; - rev = version; - hash = "sha256-kjURkzynrrb5iD5s77Q3nETt71SCGGazm/2lt9HS5JU="; + rev = "refs/tags/${version}"; + hash = "sha256-MFVWdpfvmvGfWIuVdrigGucP52/dB4xCO4Pn1RvUJnM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix index 05fce26d6e..9218d82847 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock , pytestCheckHook +, pytest-asyncio +, pytest-mock , pythonOlder }: buildPythonPackage rec { pname = "circuitbreaker"; - version = "1.4.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,12 +18,13 @@ buildPythonPackage rec { owner = "fabfuel"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; + hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0="; }; nativeCheckInputs = [ - mock pytestCheckHook + pytest-asyncio + pytest-mock ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix index ce188ce681..fe6a04480f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -4,7 +4,6 @@ , pythonAtLeast , pythonOlder , fetchFromGitHub -, fetchpatch , duet , matplotlib , networkx @@ -32,36 +31,24 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; - # Upstream package is broken on Python 3.11 https://github.com/quantumlib/Cirq/issues/6018 - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; + hash = "sha256-KEei5PJ0ammsduZVmMh2vaW3f58DYI4BCrFCl/SjUoo="; }; sourceRoot = "${src.name}/${pname}"; - patches = [ - # https://github.com/quantumlib/Cirq/pull/5991 - (fetchpatch { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8"; - stripLen = 1; - hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U="; - }) - ]; - postPatch = '' substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" \ - --replace "networkx~=2.4" "networkx" \ - --replace "numpy>=1.16,<1.24" "numpy" - ''; + --replace "matplotlib~=3.0" "matplotlib" + ''; propagatedBuildInputs = [ duet @@ -106,6 +93,8 @@ buildPythonPackage rec { "test_json_and_repr_data" # Tests for some changed error handling behavior in SymPy 1.12 "test_custom_value_not_implemented" + # Calibration issue + "test_xeb_to_calibration_layer" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix new file mode 100644 index 0000000000..83a8392b95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ft/default.nix @@ -0,0 +1,36 @@ +{ attrs +, buildPythonPackage +, cachetools +, cirq-core +, ipython +, ipywidgets +, nbconvert +, nbformat +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cirq-ft"; + inherit (cirq-core) version src meta; + + sourceRoot = "${src.name}/${pname}"; + + propagatedBuildInputs = [ + attrs + cachetools + cirq-core + ipython + ipywidgets + nbconvert + nbformat + ]; + + nativeCheckInputs = [ + ipython + pytestCheckHook + ]; + + # cirq's importlib hook doesn't work here + #pythonImportsCheck = [ "cirq_ft" ]; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index 491caa5f92..a49eebfce9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -4,6 +4,7 @@ , protobuf , pytestCheckHook , freezegun +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ cirq-core google-api-core @@ -40,6 +45,8 @@ buildPythonPackage rec { # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient' "test_get_engine_sampler_explicit_project_id" "test_get_engine_sampler" + # Calibration issue + "test_xeb_to_calibration_layer" ]; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index f09f7ce045..be0ec04099 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -31,20 +31,22 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; + pythonRelaxDeps = [ + "attrs" + "certifi" + "h11" + "httpcore" + "httpx" + "idna" + "iso8601" + "pydantic" + "pyjwt" + "pyquil" + "qcs-api-client" + "rfc3986" + ]; + postPatch = '' - substituteInPlace requirements.txt \ - --replace "attrs~=20.3.0" "attrs" \ - --replace "certifi~=2021.5.30" "certifi" \ - --replace "h11~=0.9.0" "h11" \ - --replace "httpcore~=0.11.1" "httpcore" \ - --replace "httpx~=0.15.5" "httpx" \ - --replace "idna~=2.10" "idna" \ - --replace "pyjwt~=1.7.1" "pyjwt" \ - --replace "qcs-api-client~=0.8.0" "qcs-api-client" \ - --replace "iso8601~=0.1.14" "iso8601" \ - --replace "rfc3986~=1.5.0" "rfc3986" \ - --replace "pyquil~=3.0.0" "pyquil" \ - --replace "pydantic~=1.8.2" "pydantic" # Remove outdated test rm cirq_rigetti/service_test.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index f777410524..f53613065f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , cirq-aqt , cirq-core +, cirq-ft , cirq-google , cirq-ionq , cirq-pasqal @@ -16,6 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cirq-aqt cirq-core + cirq-ft cirq-ionq cirq-google cirq-rigetti @@ -32,6 +34,7 @@ buildPythonPackage rec { disabledTestPaths = [ "cirq-aqt" "cirq-core" + "cirq-ft" "cirq-google" "cirq-ionq" "cirq-pasqal" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index b3fb2109a9..e6bff88f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.8.4"; + version = "9.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-j+dtcNInkTcgcLt6IOjqVeI/qSczRNs9PhS9iPoUF+c="; + hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs="; }; propagatedBuildInputs = [ 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 a0f5144fab..52a3bf6482 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.71"; - format = "pyproject"; + version = "9.2.77"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-jdmgtW+oIxx/Xr8EI0z8HIUZ8MYVqaxA0zXJaLZJBJ4="; + hash = "sha256-YLa70xxLDyOOKQg/PzFO90JzS5SyvgcJ2+Nltz0q6T8="; }; nativeBuildInputs = [ 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 3596c4751a..6b56defb4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,29 +16,29 @@ let # The binaries are following the argr projects release cycle - version = "9.2.71"; + version = "9.2.77"; # 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-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc7nSuHQ="; + hash = "sha256-YPxdKwR+pq0S1B9GltE8r3bFWDPpCU8OQ05w+kp4lAs="; }; in buildPythonPackage rec { pname = "cle"; inherit version; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-Uc4W4dXZs3HcSvn5fES0y+14KhED21sS5vzi92QC5hI="; + hash = "sha256-tdfV+DoDcRO+8TjiBc0u1huA+etF4MY5uYj670lqudY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix index 0ac79e306c..fdaf384262 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cleanlab/default.nix @@ -6,36 +6,36 @@ , termcolor , tqdm , pandas +, setuptools # test dependencies +, pytestCheckHook +, pytest-lazy-fixture , tensorflow , torch , datasets , torchvision , keras , fasttext +, hypothesis +, wget +, matplotlib +, skorch }: -let - pname = "cleanlab"; - version = "2.4.0"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; - disabled = pythonOlder "3.8"; +buildPythonPackage rec { + pname = "cleanlab"; + version = "2.5.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cleanlab"; repo = pname; - rev = "v${version}"; - hash = "sha256-XFrjjBJA0OQEAspnQQiSIW4td0USJDXTp9C/91mobp8="; + rev = "refs/tags/v${version}"; + hash = "sha256-5XQQVrhjpvjwtFM79DqttObmw/GQLkMQVXb5jhiC8e0="; }; - # postPatch = '' - # substituteInPlace pyproject.toml \ - # --replace '"rich <= 13.0.1"' '"rich"' \ - # --replace '"numpy < 1.24.0"' '"numpy"' - # ''; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ scikit-learn @@ -44,13 +44,38 @@ buildPythonPackage { pandas ]; + # This is ONLY turned off when we have testing enabled. + # The reason we do this is because of duplicate packages in the enclosure + # when using the packages in nativeCheckInputs. + # Affected packages: grpcio protobuf tensorboard tensorboard-plugin-profile + catchConflicts = (!doCheck); + doCheck = true; + nativeCheckInputs = [ + pytestCheckHook + pytest-lazy-fixture tensorflow torch datasets torchvision keras fasttext + hypothesis + wget + matplotlib + skorch + ]; + + disabledTests = [ + # Requires the datasets we prevent from downloading + "test_create_imagelab" + ]; + + disabledTestPaths = [ + # Requires internet + "tests/test_dataset.py" + # Requires the datasets we just prevented from downloading + "tests/datalab/test_cleanvision_integration.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix index ab3eb9514d..caa812c63a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cleo"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM="; + hash = "sha256-reo/7aPFU5uvZ1YPRTJDRmcMSMFru8e5ss5YmjSe3QU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch b/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch deleted file mode 100644 index 13cc6a68e8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/0001-Fix-quotes-in-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nicolas Benes -Date: Mon, 12 Jun 2023 11:29:32 +0200 -Subject: [PATCH] Fix quotes in test - - -diff --git a/tests/test_basic.py b/tests/test_basic.py -index 077e6c0..90bbdc3 100644 ---- a/tests/test_basic.py -+++ b/tests/test_basic.py -@@ -43,8 +43,8 @@ def test_foobar(runner): - - TEST_INVALID = """Usage: cli [OPTIONS] COMMAND [ARGS]... - {} --Error: No such command "bar". --""".format('Try "cli --help" for help.\n' if _click7 else '') -+Error: No such command 'bar'. -+""".format("Try 'cli --help' for help.\n" if _click7 else '') - - - def test_invalid(runner): -diff --git a/tests/test_foobar.py b/tests/test_foobar.py -index fd6c4e6..ab0ad5d 100644 ---- a/tests/test_foobar.py -+++ b/tests/test_foobar.py -@@ -44,8 +44,8 @@ def test_foobar(runner): - - TEST_INVALID = """Usage: cli [OPTIONS] COMMAND [ARGS]... - {} --Error: No such command "baz". --""".format('Try "cli --help" for help.\n' if _click7 else '') -+Error: No such command 'baz'. -+""".format("Try 'cli --help' for help.\n" if _click7 else '') - - - def test_invalid(runner): --- -2.40.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix index 677cb1309f..18a97769b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-aliases/default.nix @@ -1,23 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , click , pytestCheckHook }: buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.1"; + version = "1.0.3"; + + pyproject = true; src = fetchFromGitHub { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-vzWlCb4m9TdRaVz4DrlRRZ60+9gj60NoiALgvaIG0gA="; + hash = "sha256-HTjo6ID27W7D4MZjeAJMSy5yVd6oKg0Ed9/kDtQZ7Vw="; }; - patches = [ - ./0001-Fix-quotes-in-test.patch + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix index b0ddaef004..27c0c37d21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.16.1"; + version = "1.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + hash = "sha256-dLvrj3yTgfdlW3kEmZtXri3zGlBGQZhsPHzO0rf7foQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix index 6d748af8b5..8569eede0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , importlib-metadata , pytestCheckHook @@ -15,12 +15,16 @@ buildPythonPackage rec { pname = "click"; - version = "8.1.6"; + version = "8.1.7"; + format = "setuptools"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-SO6EmVGRlSegRb/jv3uqipWcQjE04aW5jAXCC6daHL0="; + src = fetchFromGitHub { + owner = "pallets"; + repo = "click"; + rev = "refs/tags/${version}"; + hash = "sha256-8YqIKRyw5MegnRwAO7YTCZateEFQFTH2PHpE8gTPTow="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix index c4598f86d9..e9296435e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix @@ -6,13 +6,14 @@ , pillow , toml , numpy +, pyyaml , python , pytestCheckHook }: buildPythonPackage rec { pname = "clickgen"; - version = "2.1.3"; + version = "2.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,10 +22,10 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; + hash = "sha256-mSaltlX2eNRLJ09zN5Tim8mW8mnjPi10W4QIEpiBQvI="; }; - propagatedBuildInputs = [ pillow toml numpy ]; + propagatedBuildInputs = [ pillow toml numpy pyyaml ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix index 9e986383dc..3c807716e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,12 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.8"; + version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; + hash = "sha256-gkgLAedUtzGv/4P+D56M2Pb5YecyqyVYp06ST62sjdY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix index e2a2915fe3..0a2ffd9a59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.6.8"; + version = "0.6.18"; format = "setuptools"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "clickhouse-connect"; owner = "ClickHouse"; - rev = "v${version}"; - hash = "sha256-T1vUXhOngPvA4wrg5jVzIiqj0B0gEnk/BS5OdopHgkA="; + rev = "refs/tags/v${version}"; + hash = "sha256-8deiWqVRqGF8MFYe4Y/alJqudBc/vOpQAB2DGweXL5Q="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix index f6feaaf395..978c1c3f62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-l/wx6TVS477GZL6dVa1/kNwqtCqtjfKaW5hbZEybjPI="; + hash = "sha256-/FtuvI+4FTMncLJIXuNsCXU5N8N8zk8yJ83U4Qsz6sw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix new file mode 100644 index 0000000000..ae22d4bcaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudpathlib/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, flit-core +, importlib-metadata +, typing-extensions +, cloudpathlib +, azure-storage-blob +, google-cloud-storage +, boto3 +, psutil +, pydantic +, pytestCheckHook +, pytest-cases +, pytest-cov +, pytest-xdist +, python-dotenv +, shortuuid +}: + +buildPythonPackage rec { + pname = "cloudpathlib"; + version = "0.16.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "drivendataorg"; + repo = "cloudpathlib"; + rev = "v${version}"; + hash = "sha256-d4CbzPy3H5HQ4YmSRCRMEYaTpwB7F0Bznd26aKWiHTA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + importlib-metadata + typing-extensions + ]; + + passthru.optional-dependencies = { + all = [ + cloudpathlib + ]; + azure = [ + azure-storage-blob + ]; + gs = [ + google-cloud-storage + ]; + s3 = [ + boto3 + ]; + }; + + pythonImportsCheck = [ "cloudpathlib" ]; + + nativeCheckInputs = [ + azure-storage-blob + boto3 + google-cloud-storage + psutil + pydantic + pytestCheckHook + pytest-cases + pytest-cov + pytest-xdist + python-dotenv + shortuuid + ]; + + meta = with lib; { + description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage"; + homepage = "https://github.com/drivendataorg/cloudpathlib"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index f11a1cff48..bb4340eec4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Bw1RhYFTz1bw+4APZKTyWP/G+LWB3R9WI/QEduEgWTQ="; + hash = "sha256-7aOPerqayuJTHItlpnVVSzOlSGNnqHvtIi5BdovNh3A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix index 88085cd2fd..2e0afcf381 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmaes/default.nix @@ -17,23 +17,38 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CyberAgentAILab"; - repo = pname; + repo = "cmaes"; rev = "refs/tags/v${version}"; hash = "sha256-1mXulG/yqNwKQKDFGBh8uxIYOPSsm8+PNp++CSswc50="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook hypothesis ]; + propagatedBuildInputs = [ + numpy + ]; - pythonImportsCheck = [ "cmaes" ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cmaes" + ]; + + disabledTests = [ + # Disable time-sensitive test + "test_cma_tell" + ]; meta = with lib; { description = "Python library for CMA evolution strategy"; homepage = "https://github.com/CyberAgentAILab/cmaes"; changelog = "https://github.com/CyberAgentAILab/cmaes/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.bcdarwin ]; + maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cntk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cntk/default.nix deleted file mode 100644 index b1bba8cf1e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/cntk/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, buildPythonPackage -, pkgs -, numpy -, scipy -, mpi -, enum34 -, protobuf -, pip -, python -, swig -}: - -let - cntk = pkgs.cntk; -in -buildPythonPackage { - inherit (cntk) name version src; - - nativeBuildInputs = [ swig mpi ]; - buildInputs = [ cntk mpi ]; - propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; - - CNTK_LIB_PATH = "${cntk}/lib"; - CNTK_COMPONENT_VERSION = cntk.version; - CNTK_VERSION = cntk.version; - CNTK_VERSION_BANNER = cntk.version; - - postPatch = '' - cd bindings/python - sed -i 's,"libmpi.so.12","${mpi}/lib/libmpi.so",g' cntk/train/distributed.py - - # Remove distro and libs checks; they aren't compatible with NixOS and besides we guarantee - # compatibility by providing a package. - cat < cntk/cntk_py_init.py - def cntk_check_distro_info(): - pass - def cntk_check_libs(): - pass - EOF - ''; - - postInstall = '' - rm -rf $out/${python.sitePackages}/cntk/libs - ln -s ${cntk}/lib $out/${python.sitePackages}/cntk/libs - # It's not installed for some reason. - cp cntk/cntk_py.py $out/${python.sitePackages}/cntk - ''; - - # Actual tests are broken. - checkPhase = '' - cd $NIX_BUILD_TOP - ${python.interpreter} -c "import cntk" - ''; - - meta = { - inherit (cntk.meta) homepage description license maintainers platforms; - # doesn't support Python 3.7 - broken = lib.versionAtLeast python.version "3.7"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cobs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cobs/default.nix index 4ea171d942..e5ba04c960 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cobs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cobs/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "cobs"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2TsQtTcNyIaJYK77cK2x9zpOYQexaRgwekru79PtuPY="; + hash = "sha256-Kvf4eRzeGufGuTb10MNf4p/rEN4l95wVsK8NZyl4PMA="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index cd9c3b0358..e8c78e1b91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.8.0"; + version = "1.8.1"; # pypi source doesn't include tests src = fetchFromGitHub { owner = "cocotb"; repo = "cocotb"; rev = "refs/tags/v${version}"; - hash = "sha256-k3VizQ9iyDawfDCeE3Zup/KkyD54tFBLdQvRKsbKDLY="; + hash = "sha256-B7SePM8muEL3KFVOY7+OAgQVIRvTs6k29xASK9lgCB4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix index dbc75a3bb1..47f98327cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coffea/default.nix @@ -31,20 +31,20 @@ buildPythonPackage rec { pname = "coffea"; - version = "2023.7.0.rc0"; + version = "2023.10.0.rc1"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-WIJw5NLVN6TrG/0mySqtlqvoNVinmpcWZchSqiNjQ9Q="; + hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "numba>=0.57.0" "numba" \ - --replace "numpy>=1.22.0,<1.25" "numpy" + --replace "numba>=0.58.0" "numba" \ + --replace "numpy>=1.22.0,<1.26" "numpy" ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 29ec01f238..36e7a27446 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -9,18 +9,19 @@ , fastavro , importlib-metadata , requests +, urllib3 }: buildPythonPackage rec { pname = "cohere"; - version = "4.21"; + version = "4.32"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9hFDj0Cd/F1aChU6WFNJ9agLFpxxArWZTZmZ7PhECGY="; + hash = "sha256-OAd0e+mE8hHc6RHBM1vXE68qwrcPcpZ4OB5v9uRQ5oE="; }; patches = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { fastavro importlib-metadata requests + urllib3 ]; # tests require CO_API_KEY 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 967bcab909..f2d2cc7ca9 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 @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.9.29.14"; + version = "2023.11.13.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-88tNPg/0U5ZC2OvH8Bh9EzKzRFF2YClS2tyrswBaUZw="; + hash = "sha256-+hX1msvm4hRl3luhMWgXcmpV2DmGI1oCknSP4QEWtxM="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix index 1a8c55dfde..af696f384f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix @@ -1,24 +1,33 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitLab +, flit-core +, unittestCheckHook }: buildPythonPackage rec { pname = "colored"; - version = "1.4.4"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; + src = fetchFromGitLab { + owner = "dslackw"; + repo = "colored"; + rev = "refs/tags/${version}"; + hash = "sha256-4APFAIN+cmPPd6qbqVC9iU4YntNEjoPbJXZywG1hsBY="; }; - nativeCheckInputs = [ nose ]; + nativeBuildInputs = [ + flit-core + ]; - checkPhase = '' - nosetests - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + unittestFlagsArray = [ + "unittests" + ]; pythonImportsCheck = [ "colored" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix index 70dd66e8f8..d255ff0992 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix index 01936cefd2..e2383dddf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pkginfo -, sphinxHook -, sphinx-rtd-theme , pytestCheckHook }: @@ -25,15 +23,8 @@ buildPythonPackage rec { --replace "--cov" "" ''; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ pkginfo - sphinx-rtd-theme - sphinxHook ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix index 2f42ef87e9..627c163048 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.1.3"; + version = "0.1.4"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-5IUE2g00GT231hjuM7mLPst0QTk2Y+Re302FRDq65C8="; + hash = "sha256-6GvAyiTm+zQ5sSynuJhAg50PaMTY9EFqVVsD3K2wTkY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/command_runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/command_runner/default.nix new file mode 100644 index 0000000000..f5f8586d13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/command_runner/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, psutil }: + +buildPythonPackage rec { + pname = "command_runner"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-UIDzLLIm69W53jvS9M2LVclM+OqRYmLtvuXVAv54ltg="; + }; + + propagatedBuildInputs = [ psutil ]; + + meta = with lib; { + homepage = "https://github.com/netinvent/command_runner"; + description = '' + Platform agnostic command execution, timed background jobs with live + stdout/stderr output capture, and UAC/sudo elevation + ''; + license = licenses.bsd3; + maintainers = teams.wdz.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/complycube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/complycube/default.nix new file mode 100644 index 0000000000..ee99ae8d28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/complycube/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyhumps +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "complycube"; + version = "1.1.6"; + pyproject = true; + + src = fetchPypi rec { + inherit version; + pname = "complycube"; + hash = "sha256-hetcn5RX582CRVmtG5dAvr+NXD+7NKJjaqgOo8LlpqM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyhumps + requests + ]; + + pythonImportsCheck = [ + "complycube" + ]; + + meta = { + homepage = "https://complycube.com"; + description = "Official Python client for the ComplyCube API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix index 0b5e684fdf..f587a29638 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "compreffor"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MGulQEUGPrQ30T3VYzwRRlvzvWkFqNzqsNzAjtjX9xU="; + hash = "sha256-9NMmIJC8Q4hRC/H2S7OrgoWSQ9SRIPHxHvZpPrPCvHo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compressai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compressai/default.nix new file mode 100644 index 0000000000..47487a6f63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/compressai/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pybind11 +, setuptools +, wheel +, numpy +, matplotlib +, pytorch-msssim +, scipy +, torch +, torchvision +, ipywidgets +, jupyter +, plotly +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "compressai"; + version = "1.2.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "InterDigitalInc"; + repo = "CompressAI"; + rev = "refs/tags/v${version}"; + hash = "sha256-nT2vd7t67agIWobJalORbRuns0UJGRGGbTX2/8vbTiY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + matplotlib + pytorch-msssim + scipy + torch + torchvision + ]; + + passthru.optional-dependencies = { + tutorials = [ + ipywidgets + jupyter + ]; + }; + + pythonImportsCheck = [ + "compressai" + "compressai._CXX" + ]; + + preCheck = '' + # We have to delete the source because otherwise it is used intead the installed package. + rm -rf compressai + + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + plotly + pytestCheckHook + ]; + + disabledTests = [ + # Those tests require internet access to download some weights + "test_image_codec" + "test_update" + "test_eval_model_pretrained" + "test_cheng2020_anchor" + "test_pretrained" + ]; + + meta = with lib; { + description = "A PyTorch library and evaluation platform for end-to-end compression research"; + homepage = "https://github.com/InterDigitalInc/CompressAI"; + license = licenses.bsd3Clear; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix index b703e5de59..9dc6d16097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.3.0"; + version = "6.0.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; + hash = "sha256-7JFKseVsZy3h9cNIOWTmj3GzTkV5BLe3bga5Iq7AZ6g="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -18,6 +18,12 @@ buildPythonPackage rec { export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; + preCheck = '' + # avoid FileNotFoundError + # FileNotFoundError: [Errno 2] No such file or directory: 'cfgparser.3' + cd tests + ''; + meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; homepage = "https://github.com/jaraco/configparser"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix index dfefc1b448..f5af82e55f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix @@ -4,8 +4,10 @@ , pythonOlder # build +, meson +, meson-python +, ninja , pybind11 -, setuptools # propagates , numpy @@ -23,7 +25,7 @@ let countourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.0.7"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,12 +34,14 @@ let countourpy = buildPythonPackage rec { owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-n04b9yUoUMH2H7t8um/8h5XaL3hzY/uNMYmOKTVKEPA="; + hash = "sha256-7M+5HMDqQI4UgVfW/MXsVyz/yM6wjTcJEdw7vPvzuNY="; }; nativeBuildInputs = [ + meson + meson-python + ninja pybind11 - setuptools ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix index 9185fe48bb..79faced6c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/coredis"; changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix index 2156bd9782..7a79c38554 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/correctionlib/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , cmake , numpy @@ -10,36 +9,23 @@ , wheel , pybind11 , pydantic -, pytestCheckHook , rich +, awkward +, pytestCheckHook , scipy , zlib }: buildPythonPackage rec { pname = "correctionlib"; - version = "2.2.2"; - format = "pyproject"; + version = "2.4.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-h3eggtPLSF/8ShQ5xzowZW1KSlcI/YBsPu3lsSyzHkw="; + hash = "sha256-bQKcS8vktvD62zvSeaBtoJw36TSpo0gEpKm0HI3AuXg="; }; - patches = [ - (fetchpatch { - name = "ci-maintenance.patch"; - url = "https://github.com/cms-nanoAOD/correctionlib/commit/924031637b040f6e8e4930c46a9f7560c59db23d.patch"; - hash = "sha256-jq3ojMsO2Ex9om8tVpEY9uwwelXPzgQ+KCPN0bgda8w="; - includes = [ "pyproject.toml" ]; - }) - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/cms-nanoAOD/correctionlib/commit/c4fd64ca0e5ce806890e8f0ae8e792dcc4537d38.patch"; - hash = "sha256-8ID2jEnmfYmPxWMtRviBc3t1W4p3Y+lAzijFtYBEtyk="; - }) - ]; - nativeBuildInputs = [ cmake numpy @@ -64,6 +50,7 @@ buildPythonPackage rec { env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeCheckInputs = [ + awkward pytestCheckHook scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix index ecebf7f92c..82ef32b2d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix @@ -14,15 +14,22 @@ buildPythonPackage rec { pname = "corsair-scan"; version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Santandersecurityresearch"; repo = "corsair_scan"; - rev = "v${version}"; - sha256 = "09jsv5bag7mjy0rxsxjzmg73rjl7qknzr0d7a7himd7v6a4ikpmk"; + rev = "refs/tags/v${version}"; + hash = "sha256-s94ZiTL7tBrhUaeB/O3Eh8o8zqtfdt0z8LKep1bZWiY="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + propagatedBuildInputs = [ validators requests @@ -36,16 +43,20 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + pythonImportsCheck = [ + "corsair_scan" + ]; - pythonImportsCheck = [ "corsair_scan" ]; + disabledTests = [ + # Tests want to download Public Suffix List + "test_corsair_scan_401" + "test_corsair_scan_origin" + ]; meta = with lib; { description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations"; homepage = "https://github.com/Santandersecurityresearch/corsair_scan"; + changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index 4e1f780e36..2bcfe6c346 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.2.1"; + version = "7.3.1"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-x38qkJPM8yndUjqbKzyFTCDSo9lott7zuCAnLKZzIkI="; + hash = "sha256-bLf+FYHetnt4LBUxNlQeIJAaoxLO7a8UZ9yzUlV4eVI="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix index b0ca3c0ac0..03d823812c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix @@ -7,7 +7,7 @@ , brotli , hypothesis , lz4 -, memory_profiler +, memory-profiler , numpy , py , pytest-benchmark @@ -44,7 +44,7 @@ buildPythonPackage rec { brotli hypothesis lz4 - memory_profiler + memory-profiler numpy py pytest-benchmark diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix index 6535ab5f6c..fe60eceb93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -1,25 +1,26 @@ { lib , fetchPypi , buildPythonPackage +, dask , urllib3 , geojson +, pandas , pythonOlder , sqlalchemy , pytestCheckHook , pytz -, stdenv }: buildPythonPackage rec { pname = "crate"; - version = "0.31.1"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SYjzyPqKR6BpC5z3P/ASDXe0mwi8Hz413b8Fm7cc5zo="; + hash = "sha256-nEWrfCd2MQCcIM6dLkVYc/cWT5wcT/pvYaY2V3wfuto="; }; propagatedBuildInputs = [ @@ -29,6 +30,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + dask + pandas pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix index eee1f05836..47c2da0f85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "4.3.0"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; + hash = "sha256-+C4cUKXZCpAXil8X4gTK3AhqNVWDrBQYY2Kgkd3+gqc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix index ef4e533a97..098dbe711d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix @@ -1,20 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "cronsim"; - version = "2.3"; + version = "2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; + src = fetchFromGitHub { + owner = "cuu508"; + repo = "cronsim"; + rev = "refs/tags/${version}"; + hash = "sha256-TSVFkMCMmrMXaPJPPNjIML+z98i1iIYuKH7hHiZnJkg="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix new file mode 100644 index 0000000000..7345692977 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab + +# build-system +, setuptools + +# dependencies +, asn1crypto +, attrs +, pathlib2 +, python-dateutil +, six +, urllib3 + +# tests +, beautifulsoup4 +, pyfakefs +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "cryptodatahub"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "coroner"; + repo = "cryptodatahub"; + rev = "v${version}"; + hash = "sha256-eLdK5gFrLnbIBB1NTeQzpdCLPdATVjzPn5LhhUsDuwo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asn1crypto + attrs + pathlib2 + python-dateutil + six + urllib3 + ]; + + pythonImportsCheck = [ "cryptodatahub" ]; + + nativeCheckInputs = [ + beautifulsoup4 + pyfakefs + unittestCheckHook + ]; + + preCheck = '' + # failing tests + rm test/updaters/test_common.py + ''; + + meta = with lib; { + description = "Repository of cryptography-related data"; + homepage = "https://gitlab.com/coroner/cryptodatahub"; + changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mpl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix index f25c46907b..c8cdc1c6d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.8.4"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-7qMNz8F0B3bph/nHkS1VrkcF1bETWAklXFOlMWu3K9s="; + hash = "sha256-8jpWDd/+eEaAp8L4ySpNK91fma005cPMLgzAsSAIpKg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix index afbbe513b2..54be9191a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , attrs -, six , asn1crypto +, cryptodatahub , python-dateutil +, urllib3 +, pytestCheckHook }: buildPythonPackage rec { pname = "cryptoparser"; - version = "0.8.4"; + version = "0.11.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-Sn4sfzu1Y1gC+4K9WdiZW92cYuVbUsBXcNbNQOv0BRw="; + pname = "CryptoParser"; + inherit version; + hash = "sha256-fgPmgZxv/UpaoeBO08xcUbPxmjVV4AUEgivNOvWxd04="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - attrs - six asn1crypto + attrs + cryptodatahub python-dateutil + urllib3 ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix index 4e725dd8cd..26e7080c21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,20 +6,21 @@ , pythonOlder , setuptools , solc-select +, toml }: buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.4"; + version = "0.3.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; rev = "refs/tags/${version}"; - hash = "sha256-CeoACtgvMweDbIvYguK2Ca+iTBFONWcE2b0qUkBbQSU="; + hash = "sha256-aO2K0lc3qjKK8CZAbu/lotI5QJ/R+8npSIRX4a6HdrI="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { pycryptodome setuptools solc-select + toml ]; # Test require network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix index 2da8e6d8cc..bd2a3258d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "css-parser"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GW24Is7yJ0WvaljRgM+CBpSc7Vi0j18+6Y8d4WJ0lbs="; + hash = "sha256-vx6XKtMzROkyBpZPtM2QjZ3e+fzQwB+pPg1zRnU5Q2M="; }; # Test suite not included in tarball yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 75ded7bd3e..ab8615b0fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -6,7 +6,6 @@ , fetchPypi , setuptools , setuptools-scm -, importlib-metadata , cssselect , jaraco-test , lxml @@ -17,15 +16,15 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.7.1"; + version = "2.9.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NA7P2YNdId+PmFAPDfzqCu5By04Z7Lws+U8KbTbXy2w="; + hash = "sha256-iUd7PRfXkOl7n7Te9wh2cGEFV5Wq5vfIKuMulnyb5M0="; }; nativeBuildInputs = [ @@ -33,10 +32,6 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - nativeCheckInputs = [ cssselect jaraco-test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 53d0d78cc0..cc9f4ac69b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Productivity Tools for Plotly + Pandas"; homepage = "https://github.com/santosjorge/cufflinks"; license = licenses.mit; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index 8c1da0f7f5..f6135ecba7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -21,13 +21,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.3.0"; + version = "1.3.2"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - hash = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; + hash = "sha256-NGH6QsGyJAuk2h2YXKc1A5FBV/xMd0FzJ+1tfYWs2+Y="; }; buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); @@ -68,7 +68,7 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; meta = with lib; { - homepage = "http://cvxopt.org/"; + homepage = "https://cvxopt.org/"; description = "Python Software for Convex Optimization"; longDescription = '' CVXOPT is a free software package for convex optimization based on the diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 3d15d8d777..3d34b6edda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -12,19 +12,20 @@ , scs , setuptools , wheel +, pybind11 , useOpenmp ? (!stdenv.isDarwin) }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.3.2"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU="; + hash = "sha256-ep7zTjxX/4yETYbwo4NPtVda8ZIzlHY53guld8YSLj4="; }; # we need to patch out numpy version caps from upstream @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools wheel + pybind11 ]; propagatedBuildInputs = [ @@ -44,7 +46,6 @@ buildPythonPackage rec { osqp scipy scs - setuptools ]; nativeCheckInputs = [ @@ -67,6 +68,8 @@ buildPythonPackage rec { "test_diffcp_sdp_example" "test_huber" "test_partial_problem" + # https://github.com/cvxpy/cvxpy/issues/2174 + "test_scipy_mi_time_limit_reached" ] ++ lib.optionals stdenv.isAarch64 [ "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix index 1959794fcc..85d20fc6f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; + hash = "sha256-8Z0RoBSNSoys0GTJbpO8qM40FaGGroIEA49F4Qjbdrg="; }; nativeBuildInputs = [ cython setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix index b30fa8e565..e8b27794ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.14.4"; + version = "6.15.10"; format = "pyproject"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg="; + hash = "sha256-Bc0md1lpL1EYYdIoYNNeKgW/v3OPliwVdhi7jHcdIyA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of scripts and modules for freezing Python scripts into executables"; homepage = "https://marcelotduarte.github.io/cx_Freeze/"; + changelog = "https://github.com/marcelotduarte/cx_Freeze/releases/tag/${version}"; license = licenses.psfl; maintainers = with maintainers; [ ]; mainProgram = "cxfreeze"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 7061290757..9abc6abced 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,16 +23,16 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.2.2"; + version = "5.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "CycloneDX"; - repo = pname; + repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-7bqIKwKGfMj5YPqZpvWtP881LNOgvJ+DMHs1U63gCN0="; + hash = "sha256-M3aR3lCNtPIve1o16QLSnxrULhtXkuOXNYtOv2FmPMQ="; }; nativeBuildInputs = [ @@ -78,9 +78,16 @@ buildPythonPackage rec { ]; disabledTests = [ - # These tests require network access. + # These tests require network access "test_bom_v1_3_with_metadata_component" "test_bom_v1_4_with_metadata_component" + # AssertionError: - "test_missing_flask_compress_raises" - ]; + pythonImportsCheck = [ "dash" ]; - pythonImportsCheck = [ - "dash" - ]; - - meta = with lib; { + meta = { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; - changelog = "https://github.com/plotly/dash/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ antoinerg ]; + changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ antoinerg tomasajt ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix index a0ae12d7c1..39ae8e5ddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-awkward/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , dask , fetchFromGitHub -, fetchpatch , hatch-vcs , hatchling , pyarrow @@ -14,26 +13,18 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.8.1"; - format = "pyproject"; + version = "2023.11.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dask-contrib"; - repo = pname; + repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; + hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs="; }; - patches = [ - (fetchpatch { - name = "dask-awkward-pyarrow13-test-fixes.patch"; - url = "https://github.com/dask-contrib/dask-awkward/commit/abe7f4504b4f926232e4d0dfa5c601d265773d85.patch"; - hash = "sha256-IYlKTV6YasuKIJutB4cCmHeglGWUwBcvFgx1MZw4hjU="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ @@ -64,6 +55,7 @@ buildPythonPackage rec { # Tests require network access "test_remote_double" "test_remote_single" + "test_from_text" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index 1d144b3db5..98e955894f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dask-gateway-server"; - version = "2022.10.0"; + version = "2023.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-gateway"; rev = version; - hash = "sha256-8yyako49F3rK8oZFmpYOiLVg9K3YF76/XerapQx3uhc="; + hash = "sha256-hwNLcuFN6ItH5KhC2gDUsaZT7qTC48fPR/Qx6u8B1+M="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix index 6b2fbb01d2..5bdcb2458e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2023.6.0"; + version = "2023.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-9b2+vrUH8lZYsEbJg+GmY5zHZ+7PyA9NV2h5VAN0J1s="; + hash = "sha256-ugAqNdvCROCCXURwsGLpnl/lBEAremvTI7MVa/TWt6c="; }; nativeBuildInputs = [ 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 355e16553b..63a13d7799 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -38,16 +38,16 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.8.0"; - format = "pyproject"; + version = "2023.10.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-ZKjfxTJCu3EUOKz16+VP8+cPqQliFNc7AU1FPC1gOXw="; + hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI="; }; nativeBuildInputs = [ @@ -114,7 +114,7 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" substituteInPlace pyproject.toml \ - --replace ', "versioneer[toml]==0.28"' "" \ + --replace ', "versioneer[toml]==0.29"' "" \ --replace " --durations=10" "" \ --replace " --cov-config=pyproject.toml" "" \ --replace "\"-v" "\" " @@ -133,6 +133,10 @@ buildPythonPackage rec { "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... + "test_foldby_tree_reduction" + "test_to_bag" ] ++ [ # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 "test_concat_categorical" @@ -140,6 +144,12 @@ buildPythonPackage rec { "test_dot" "test_dot_nan" "test_merge_column_with_nulls" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part' + "test_to_csv_nodir" + "test_to_json_results" + # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1 + "test_apply" + "test_apply_infer_columns" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index 2f731daa11..bbd16ffb12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3RRHXkM8/GoIcO6Y1EZGbnp/X5gzYkW/PV4bzGay6ZI="; + hash = "sha256-e3iMZBPdldZFuS7FyhbGj9SufnH5hBBt8MEUjixXfqA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index 8d087712a5..f47949a619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.4.0"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-V8Nl6xr96Xnd1gkw9R0aqXkitLESsAyW7ufTYn6ttLg="; + hash = "sha256-y4Pmkgq3hv6mVu0zBsoiqNOcsHM0mxTNiJOCCZ+rwA8="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix index f7d5a9cec9..3eeac2e85b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { version = "0.0.18"; pyproject = true; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI as github repo does not contain tags or release branches src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix index a3f2d67d35..9446920d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.6.0"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; + hash = "sha256-d9NiEY9nqMu0hI29MKs2K5+nz+vb+vQmycUAyziWmpk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix index eae7b663dd..0802ae5cf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.14.4"; + version = "2.14.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; + hash = "sha256-oLB6laY/Si071mBKoWlZpd1fqr/wNtAnhRvBKLjeEuE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index 7063e90a1d..e5d169b6d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -29,22 +29,21 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.4"; + version = "0.64.5"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6zZgbUKszSo13qmrWKo5UAPqS/QaS8omoTJQgWFfULk="; + hash = "sha256-cCzvltq3DFbfRp0gO8RQxGUwBtYJcJoeYHIz06FA7vM="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" \ - --replace "click-default-group-wheel>=1.2.2" "click-default-group" + --replace '"pytest-runner"' "" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix index 4c89eb9ba2..d5ed9bf052 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix @@ -1,31 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "datauri"; - version = "1.1.0"; + version = "2.0.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "fcurella"; repo = "python-datauri"; - rev = "v${version}"; - hash = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; + rev = "refs/tags/v${version}"; + hash = "sha256-k4tlWRasGa2oQykCD9QJl65UAoZQMJVdyCfqlUBBgqY="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "datauri" ]; nativeCheckInputs = [ + pydantic pytestCheckHook ]; - disabledTestPaths = [ - # UnicodeDecodeError: 'utf-8' codec can't decode - "tests/test_file_ebcdic.txt" + disabledTests = [ + "test_pydantic" # incompatible with pydantic v2 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix index d3fc32ab01..a7fbfd1b37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , numpy , packaging , pandas @@ -23,6 +24,21 @@ buildPythonPackage rec { hash = "sha256-OAVHx/a4uupVGXSWN2/3uem9/4i+TUkzTX4kp0uLY44="; }; + patches = [ + # on master branch, to be released as 1.1.2 + (fetchpatch { + name = "xfail-tests-that-are-known-to-fail.patch"; + url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/4a56b766b0ccba900a555167863f1081a76c4c0d.patch"; + hash = "sha256-ra1d8Vewvwhkr7PBHc3KM6IUCWsHxE+B7UP2duTgjew="; + }) + # on master branch, to be released as 1.1.2 + (fetchpatch { + name = "add-import-and-object-reference-due-to-upstream-changes.patch"; + url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/8a7b25f3e708df5cd32afcb702fe16130846b165.patch"; + hash = "sha256-JVbhiOIr5gKMSQpIQ+DgIRqq8V5x5ClQhkQzAmIYqEU="; + }) + ]; + propagatedBuildInputs = [ numpy packaging diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix index 9d456c84d2..5b1e9aeeb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.5.3"; + version = "1.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mzqUdT+dI7U0tHHcr0joIB1UCfKXrDdqhtVFShjIKus="; + hash = "sha256-m458gg5TQ7jznhA9QNi8KQ+ICxdQn58mS0jvyZ88Fmg="; }; nativeBuildInputs = [ 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 e927665bdc..930dd5618c 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 @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.5.5"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aAe3sNa4CxqynsFHoTLEYWo12jEF/LAyYMqnpy5cTbg="; + hash = "sha256-zmZdFOB0jQHamRJ7Zuzr/augP6Y2smAdUvqSXDZDuwo="; }; sourceRoot = "${src.name}/core"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix index b757683e95..46f62dcafd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-redshift/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.5.8"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T7cNszIroOT8TNfOzZpdJDR1+5ybhkXvyvvM5zokVgo="; + hash = "sha256-5sgge55BwvC00Gj3UvLS/uzCgNSi4j4YdVlg/LuJI+s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix index b32f7fbd9a..dccf0ed7f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.5.2"; + version = "1.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oz9BDvxSG4kOteuwKiPccxlsmQtOEwDLVyirDSWy1kY="; + hash = "sha256-AOO3VbU1R3/snH7U7K9XXokBGXtf9Udpv7eR5HCBxss="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix index 016b18f250..164c543a5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix @@ -9,12 +9,17 @@ buildPythonPackage rec { pname = "dbus-deviation"; version = "0.6.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-4GuI7+IjiF0nJd9Rz3ybe0Y9HG8E6knUaQh0MY0Ot6M="; }; + postPatch = '' + sed -i "/'sphinx',/d" setup.py + ''; + nativeBuildInputs = [ setuptools-git sphinx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 88cb1385bf..99264bbae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.11.0"; + version = "2.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8kK0T5b5hzT8CBYKvYOrc7bKEQxXDsTgjApmrILecek="; + hash = "sha256-IT18r7LKOVuiCuE/QzW6X/jkr5EK8sSR038i4LR1bcs="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix index 5e1053fc1a..f929f58de1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; configureFlags = [ - "PYTHON=${python.pythonForBuild.interpreter}" + "PYTHON=${python.pythonOnBuildForHost.interpreter}" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix index dc66675dc0..5c91d6d925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deal-solver"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LXBAWbm8fT/jYNbzB95YeBL9fEknMNJvkTRMbc+nf6c="; + hash = "sha256-DAOeQLFR/JED32uJSW7W9+Xx5f1Et05W8Fp+Vm7sfZo="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Z3-powered solver (theorem prover) for deal"; homepage = "https://github.com/life4/deal-solver"; + changelog = "https://github.com/life4/deal-solver/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gador ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix index 861f9c6847..13704b2093 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.24.0"; + version = "4.24.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5gd46SMucH0rek9talMJ74TMRRvUm5Up6pCusUIHDjE="; + hash = "sha256-bdIoKOOC7qSer9Cp9A55HG960xunKXT2WiXp0UC6tsI="; }; postPatch = '' @@ -77,13 +77,17 @@ buildPythonPackage rec { "test_scheme_contract_is_satisfied_when_setting_arg" "test_scheme_contract_is_satisfied_within_chain" "test_scheme_errors_rewrite_message" - # broken since pytest > 7.1.3 - "test_exception_hook" + # assert errors + "test_doctest" + "test_no_violations" ]; disabledTestPaths = [ # needs internet access "tests/test_runtime/test_offline.py" + # depends on typeguard <4.0.0 for tests, but >=4.0.0 seems fine for runtime + # https://github.com/life4/deal/blob/9be70fa1c5a0635880619b2cea83a9f6631eb236/pyproject.toml#L40 + "tests/test_testing.py" ]; pythonImportsCheck = [ "deal" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix index a6e9011992..4f0d493c0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deap"; - version = "1.3.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; + hash = "sha256-zAHemJLfp9G8mAPasoiS/q0XfwGCyB20c2CiQOrXeP8="; }; propagatedBuildInputs = [ numpy matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debianbts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debianbts/default.nix index 5390e40a20..67b43fdff3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debianbts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debianbts/default.nix @@ -1,31 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, nix-update-script , pysimplesoap -, pytest , pytest-xdist +, pytestCheckHook +, pytest-xdist , pythonOlder , setuptools }: buildPythonPackage rec { pname = "python-debianbts"; - version = "4.0.1"; - format = "pyproject"; + version = "4.0.2"; + pyproject = true; - disabled = pythonOlder "3.7"; - passthru.updateScript = nix-update-script { }; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "b0817d593ccdfb58a5f37b8cb3873bd0b2268b434f2798dc75b206d7550fdf04"; + hash = "sha256-JbPb0lZND96XLZNU97wMuT9iGNXVN2KTsZC2St6FfuU="; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ pysimplesoap ]; - checkInputs = [ - pytest - pytest-xdist + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pysimplesoap + ]; + + # Most tests require network access + doCheck = false; + + pythonImportsCheck = [ + "debianbts" ]; meta = with lib; { @@ -34,6 +45,6 @@ buildPythonPackage rec { downloadPage = "https://pypi.org/project/python-debianbts/"; changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.nicoo ]; + maintainers = with maintainers; [ nicoo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 2cf3658462..85389fba2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -2,10 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, pythonAtLeast , fetchFromGitHub , substituteAll -, fetchpatch , gdb , django , flask @@ -23,7 +21,7 @@ buildPythonPackage rec { version = "1.8.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; @@ -110,13 +108,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; disabledTests = [ - # https://github.com/microsoft/debugpy/issues/1241 - "test_flask_breakpoint_multiproc" - - # DeprecationWarning: pkg_resources is deprecated as an API - # Supposedly fixed in https://github.com/microsoft/debugpy/pull/1374, - # but still fails for a nix build - "test_gevent" + # testsuite gets stuck at this one + "test_attach_pid_client" ]; pythonImportsCheck = [ 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 7f1f0481d2..93deb8c10b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix @@ -11,12 +11,13 @@ , python-dateutil , pyyaml , toml +, tomli-w , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "6.3.0"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-txZ1X1J8DwueDRpLP3OuRA+S9hc5G3YCmEG+AS6ZAkI="; + hash = "sha256-oO5+ZCDgqonxaHR95tSrPkZDar/fzr1FXtl6J2W3PeU="; }; postPatch = '' @@ -52,8 +53,15 @@ buildPythonPackage rec { numpy pytestCheckHook python-dateutil + tomli-w ] ++ passthru.optional-dependencies.cli; + disabledTests = [ + # not compatible with pydantic 2.x + "test_pydantic1" + "test_pydantic2" + ]; + pythonImportsCheck = [ "deepdiff" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index 7b185d6d5a..dd9505625a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "6.1.0"; + version = "6.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9uFKrr0C/RIklpW5KZj8pSv4oEibzSaAJWnTwYKyxD8="; + hash = "sha256-pzEXiWKMP2Wqme/pqfTMHxWH/4YcCS6u865wslHrUqI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix index 8d5d9da29a..3203f0bb97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "defcon"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ="; + hash = "sha256-Vt4m18dfFk7qA+KLwRtMdpxo1wX6GG38rrVsJ/mkzAw="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix index 42c1602a39..3e5ad6939e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation +, chameleon, colander, iso8601, peppercorn, translationstring, zope-deprecation , nose, coverage, beautifulsoup4, flaky, pyramid, pytestCheckHook }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { iso8601 peppercorn translationstring - zope_deprecation + zope-deprecation ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index 4c8dae04e7..ed2cf8a011 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.13"; + version = "1.2.14"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "tantale"; repo = "deprecated"; - rev = "v${version}"; - hash = "sha256-rCDUY/TVmJqhrxDah62lEhqpr05JNZSyiFNTlHvSnmw="; + rev = "refs/tags/v${version}"; + hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix index cc7b6870ad..b3a4dd9d35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix @@ -1,19 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, six }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pythonOlder +}: buildPythonPackage rec { pname = "derpconf"; - version = "0.8.3"; + version = "0.8.4"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15"; + hash = "sha256-66MOqcWIiqJrORJDgAH5iUblHyqJvuf9DIBN56XjKwU="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; + + pythonImportsCheck = [ + "derpconf" + ]; meta = with lib; { - description = "derpconf abstracts loading configuration files for your app"; + description = "Module to abstract loading configuration files for your app"; homepage = "https://github.com/globocom/derpconf"; + changelog = "https://github.com/globocom/derpconf/releases/tag/${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/desktop-entry-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/desktop-entry-lib/default.nix new file mode 100644 index 0000000000..5a6d3c00e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/desktop-entry-lib/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pytestCheckHook +, fetchFromGitea +, setuptools +}: + +buildPythonPackage rec { + pname = "desktop-entry-lib"; + version = "3.1"; + pyproject = true; + disabled = pythonOlder "3.9"; + + # We could use fetchPypi, but then the tests won't run + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "JakobDev"; + repo = pname; + rev = version; + hash = "sha256-+c+FuLv88wc4yVw3iyFFtfbocnWzTCIe2DS0SWoj+VI="; + }; + + nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "desktop_entry_lib" ]; + + meta = with lib; { + description = "Allows reading and writing .desktop files according to the Desktop Entry Specification"; + homepage = "https://codeberg.org/JakobDev/desktop-entry-lib"; + changelog = "https://codeberg.org/JakobDev/desktop-entry-lib/releases/tag/${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ Madouura ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix index 2087784651..064899b8e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.2"; + version = "4.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw="; + hash = "sha256-g9rRJF1JrZ6+s3tj4RZHuGOjt5LJjtK9I5CJmq4CJL4="; }; pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 0a05e08435..203983a228 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -1,45 +1,47 @@ { lib, buildPythonPackage, fetchPypi +, pythonOlder +, setuptools +, setuptools-changelog-shortener , requests -, py , pytestCheckHook , lazy }: buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.2"; + version = "4.0.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; + hash = "sha256-LSd3AfrwXUpvbL234ED5PAoAKG2+h9XAou6uuiBVkZw="; }; - postPatch = '' - substituteInPlace tox.ini \ - --replace "--flake8" "" - ''; + nativeBuildInputs = [ + setuptools + setuptools-changelog-shortener + ]; propagatedBuildInputs = [ requests - py lazy ]; nativeCheckInputs = [ - py pytestCheckHook ]; + pythonImportsCheck = [ + "devpi_common" + ]; + meta = with lib; { homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; + changelog = "https://github.com/devpi/devpi/blob/common-${version}/common/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; - # It fails to build because it depends on packaging <22 while we - # use packaging >22. - # See the following issues for details: - # - https://github.com/NixOS/nixpkgs/issues/231346 - # - https://github.com/devpi/devpi/issues/939 - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix index ec386f8e0b..08a5f2e7f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "devtools"; - version = "0.11.0"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-ogogXZnuSFkWktCin+cyefjqIbGFRBVIeOrZJAa3hOE="; + hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix index f7dda6214a..963161e7c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.23.3"; + version = "0.23.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4b+jmR56y2VV0XxD6FCmNpDB0UKH9+FqcTQuU2jRCXo="; + hash = "sha256-2jRWN2glGEr51fzny8nkqa5c2EdJG5aZPG2eTD7AISY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix index 6990105b75..bab6cd3f6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -3,7 +3,7 @@ , chardet , fetchPypi , jinja2 -, jinja2_pluralize +, jinja2-pluralize , pluggy , pycodestyle , pyflakes @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet jinja2 - jinja2_pluralize + jinja2-pluralize pluggy pygments tomli diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix index 3e05deb5e2..93d9e3288d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix @@ -1,21 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, python }: +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, unittestCheckHook +}: buildPythonPackage rec { pname = "diff-match-patch"; - version = "20200713"; - - meta = { - homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; - description = "Diff, Match and Patch libraries for Plain Text"; - license = lib.licenses.asl20; - }; + version = "20230430"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"; + hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw="; }; - checkPhase = '' - ${python.interpreter} -m unittest -v diff_match_patch.tests - ''; + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; + description = "Diff, Match and Patch libraries for Plain Text"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; } 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 81c3b5c7ed..26e0b58e7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-2OhckgJK1qimF0AcYSa8L+AkzfiN5VojWj0x6kwbgyk="; + hash = "sha256-OopWzb02/xvASTuvg3dDTEoRwOwKOL0c3arqlsXBUuo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix index 09ff7c52bd..3d756312de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix @@ -40,6 +40,9 @@ buildPythonPackage rec { cd digitalocean ''; + # Test tries to access the network + disabledTests = ["TestFirewall"]; + pythonImportsCheck = [ "digitalocean" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix index 3caf068a12..d6fdd2b97d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python +, pythonOlder , setuptools # passthru tests @@ -11,14 +12,16 @@ buildPythonPackage rec { pname = "dill"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/dill-${version}"; - hash = "sha256-lh1o/TqnqtYN9xTZom33y1/7ZhMEAFpheLdtalwgObQ="; + hash = "sha256-1cRGA5RuNjlpc3jq9SAsUYgmPauIV8zRF9SxOmveljI="; }; nativeBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; + changelog = "https://github.com/uqfoundation/dill/releases/tag/dill-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ tjni ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix index aea49cde6f..20d855bf0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix @@ -5,17 +5,21 @@ , pythonOlder , aiofiles , aiohttp +, backports-datetime-fromisoformat +, click , click-log , emoji , glom , jinja2 , pyyaml +, freezegun +, setuptools }: buildPythonPackage rec { pname = "dinghy"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,12 +27,18 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; + hash = "sha256-0U08QHQuNm7qaxhU8sNxeN0fZ4S8N0RYRsWjFUqhZSU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp + backports-datetime-fromisoformat + click click-log emoji glom @@ -37,6 +47,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix index 5d0c946869..9f40226e6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix @@ -9,43 +9,48 @@ , pytz }: -buildPythonPackage rec { - pname = "dirty-equals"; - version = "0.7.0"; - format = "pyproject"; +let + dirty-equals = buildPythonPackage rec { + pname = "dirty-equals"; + version = "0.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "samuelcolvin"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pytz + ]; + + doCheck = false; + passthru.tests.pytest = dirty-equals.overrideAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pydantic + pytest-examples + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirty_equals" + ]; + + meta = with lib; { + description = "Module for doing dirty (but extremely useful) things with equals"; + homepage = "https://github.com/samuelcolvin/dirty-equals"; + changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; }; - - nativeBuildInputs = [ - hatchling - ]; - - propagatedBuildInputs = [ - pytz - ]; - - nativeCheckInputs = [ - pydantic - pytest-examples - pytestCheckHook - ]; - - pythonImportsCheck = [ - "dirty_equals" - ]; - - meta = with lib; { - description = "Module for doing dirty (but extremely useful) things with equals"; - homepage = "https://github.com/samuelcolvin/dirty-equals"; - changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} +in dirty-equals diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix index 5ae671c06a..8c9767f6c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix index 7e022eb179..b1d8bb2b1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-evidence"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix index 0fd868f483..9fa9457b28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { pname = "dissect-fat"; version = "3.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index ff1395b932..55ce876fe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , dissect-cstruct , dissect-util , fetchFromGitHub @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-util ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix index bc0d879825..9671bb33c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-regf"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 7704766d43..dfb7f78675 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -39,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.12"; + version = "3.13"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-ByjeQcoDi0edum2XebF2DQ7d0xeH2nyulj6vt7bztKg="; + hash = "sha256-4dtKAFhxaS8PRoeLY6ZYrE/4P1pbcii1gWQ9RRVOBzs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -108,6 +108,11 @@ buildPythonPackage rec { "test_exec_target_command" # Issue with tar file "test_tar_sensitive_drive_letter" + "test_dpapi_decrypt_blob" + "test_notifications_appdb" + "test_md" + "test_notifications_wpndatabase" + "test_nested_md_lvm" # Tests compare dates and times "yum" # Filesystem access, windows defender tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix index a9224d0d43..e63e7bb4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; version = "1.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix index 735ad9820f..bfbc76b73c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.11"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-PtmvXnmZ6f8YxEejqaVwtaoV7d1Oa7063ZFagH110yk="; + hash = "sha256-rso6TIw8cQnkb58KtGKOfzIzpqJLW05L9sRWIGX3teA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index 3cf3282c0b..1ef6ffb449 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-volume"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix index e9b1c6b46a..6ff4925884 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.9"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-lNa6GiX0hCZFVyiokBzEKGsvimSkUkgR1bkQMhxUbDw="; + hash = "sha256-AgmBU2sC3/okC7LKQC6yMEJ3u69WwAMAANILMASBIjw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix index f966872065..ca91e77a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distlib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y="; + hash = "sha256-na/lSzSgKOr9lQOdXl1IUaE3NFQPEzEGDTHJkW5xR6g="; }; nativeBuildInputs = [ 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 69679a8bbf..80dc392c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "distrax"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - hash = "sha256-x9ORfhGX5catEZMfR+iXkZSRa/wIb0B3CrCWOWf35Ks="; + hash = "sha256-klXT5wfnWUGMrf5sQhYqz7Foc/Ou5y4GIFgtTff1ZFQ="; }; buildInputs = [ 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 fc52b3b9fc..55d5dabdd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,22 +19,21 @@ , tornado , urllib3 , versioneer -, wheel , zict }: buildPythonPackage rec { pname = "distributed"; - version = "2023.8.1"; - format = "pyproject"; + version = "2023.10.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "dask"; - repo = pname; + repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-HJyqDi5MqxEjAWWv8ZqNGAzeFn5rZGPwiDz5KaCm6Xk="; + hash = "sha256-V0L1qY9xtJgKxNEZ69z8CQuXsUs30cqu6xFrsjKWkbY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distutils-extra/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/distutils_extra/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/distutils-extra/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index a2219ae22c..116e3085d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , django , django-allauth , djangorestframework @@ -12,15 +13,23 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "4.0.1"; + version = "5.0.1"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-+ladx0b/bvvUW8zLjtG8IiWWdfPTqqm/KYbEK9uiFaU="; + hash = "sha256-PTFUZ54vKlufKCQyJb+QB/+hI15r+Z0auTjnc38yMLg="; }; + patches = [ + (fetchpatch { + # https://github.com/iMerica/dj-rest-auth/pull/561 + url = "https://github.com/iMerica/dj-rest-auth/commit/be0cf53d94582183320b0994082f0a312c1066d9.patch"; + hash = "sha256-BhZ7BWW8m609cVn1WCyPfpZq/706YVZAesrkcMKTD3A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "coveralls>=1.11.1" "" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix index 2f1c6e3c32..d9987f5b5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.1.9"; + version = "2.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-vwNnhcWYaFoAGesINAuI/mynS9F4Az4ikObEG2L6S/E="; + hash = "sha256-N1awLH0JxbN+/mV3GNWq4rdfRv0Bu/4cOdTmBlEBnXk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-allauth-2fa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth-2fa/default.nix new file mode 100644 index 0000000000..60a2d61bac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth-2fa/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, django-allauth +, django-otp +, fetchFromGitHub +, pythonOlder +, qrcode +, hatchling +}: + +buildPythonPackage rec { + pname = "django-allauth-2fa"; + version = "0.11.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "valohai"; + repo = "django-allauth-2fa"; + rev = "refs/tags/v${version}"; + hash = "sha256-bm2RwhvX2nfhYs74MM0iZl9U2gHgm0lLlh2tuRRcGso="; + }; + + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + django + django-allauth + django-otp + qrcode + ]; + + pythonImportsCheck = [ + "allauth_2fa" + ]; + + meta = with lib; { + description = "django-allauth-2fa adds two-factor authentication to django-allauth"; + homepage = "https://github.com/valohai/django-allauth-2fa"; + changelog = "https://github.com/valohai/django-allauth-2fa/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix index 439c4c2cb5..49864b0b9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix @@ -1,18 +1,35 @@ { lib , buildPythonPackage -, django , fetchFromGitHub -, python3-openid , pythonOlder + +# build-system +, setuptools + +# dependencies +, django +, python3-openid , requests , requests-oauthlib , pyjwt + +# optional-dependencies +, python3-saml +, qrcode + +# tests +, pillow +, pytestCheckHook +, pytest-django + +# passthru tests +, dj-rest-auth }: buildPythonPackage rec { pname = "django-allauth"; - version = "0.54.0"; - format = "setuptools"; + version = "0.57.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +37,12 @@ buildPythonPackage rec { owner = "pennersr"; repo = pname; rev = version; - hash = "sha256-0yJsHJhYeiCHQg/QzFD/metb97rcUJ+LYlsl7fGYmuM="; + hash = "sha256-zhKqvm43rw28UKNFdfJ2C1dIeZfPqmchb1rJykm1lx4="; }; - postPatch = '' - chmod +x manage.py - patchShebangs manage.py - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ django @@ -37,19 +53,34 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkPhase = '' - # test is out of date - rm allauth/socialaccount/providers/cern/tests.py - - ./manage.py test - ''; + passthru.optional-dependencies = { + saml = [ + python3-saml + ]; + mfa = [ + qrcode + ]; + }; pythonImportsCheck = [ "allauth" ]; + nativeCheckInputs = [ + pillow + pytestCheckHook + pytest-django + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + passthru.tests = { + inherit dj-rest-auth; + }; + meta = with lib; { + changelog = "https://github.com/pennersr/django-allauth/blob/${version}/ChangeLog.rst"; description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; + downloadPage = "https://github.com/pennersr/django-allauth"; homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; maintainers = with maintainers; [ derdennisop ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix index fb8ca50269..50b86d7fb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "9.0"; + version = "10.1"; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qEYBHsaHo1gmrsa6q7DQiUJurC7cXhv5e/SQ7R3Tkzc="; + hash = "sha256-unmbYQFLeqfqE1uFLMPLUad1UqA+sgbTzwRfpRhM3ik="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix index 4c6c4e786a..5416cf359f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "7.0.1"; + version = "7.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA="; + hash = "sha256-d6N8c9f6z8cpk2XtZqEr56SH3XRd2GwdM8ouv9OzKHg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index c7fbde5bdf..ba32b75764 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.4.1"; + version = "2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-psJcFDg05nsg00dRUS0IsykGhPJQmO4hKx7jaASlkIU="; + hash = "sha256-Y/olLEDciOoXuLkPX0oxonJuWGrLH/Dtx0wijGHxnl0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix new file mode 100644 index 0000000000..d8bb73ccde --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, django-crispy-forms +}: + +buildPythonPackage rec { + pname = "django-crispy-bootstrap4"; + version = "2023.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "crispy-bootstrap4"; + rev = "refs/tags/${version}"; + hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + django-crispy-forms + ]; + + pythonImportsCheck = [ "crispy_bootstrap4" ]; + + meta = with lib; { + description = "Bootstrap 4 template pack for django-crispy-forms"; + homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix index c1cc31e8ac..81aecd208a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2.0"; + version = "2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; rev = "refs/tags/${version}"; - hash = "sha256-oxOW7gFpjUehWGeqZZjhPwptX0Gpgj5lP0lw0zkYGuE="; + hash = "sha256-UQ5m0JWir20TdLgS+DVVLcMBlIEIfmzv8pkMJtaC0LA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-crontab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crontab/default.nix new file mode 100644 index 0000000000..27ecce4a1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-crontab/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, mock +, nose +}: + +buildPythonPackage rec { + pname = "django-crontab"; + version = "0.7.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "kraiz"; + repo = "django-crontab"; + rev = "refs/tags/${version}"; + hash = "sha256-qX+N3SMUyhMWoWluRCeOPGYKCMBnjg61P281HXHkfJk="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + django + mock + nose + pytestCheckHook + pytest-django + ]; + + # Tests currently fail with: RuntimeError: setup_test_environment() was + # already called and can't be called again without first calling + # teardown_test_environment() + doCheck = false; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + pythonImportsCheck = [ "django_crontab" ]; + + meta = with lib; { + description = "Simple crontab powered job scheduling for Django"; + homepage = "https://github.com/kraiz/django-crontab"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix index bb3cd1acf7..b0e3f6eb0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.9.0"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - hash = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; + hash = "sha256-8yqHqgiZiUwn1OF3b6a0d+gWTtf2s+QQpiptcsqvZL4="; }; # The testsuite fails to modify the base environment diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 3c09cde4d1..eb46b6b869 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , django -, factory_boy +, factory-boy , mock , pip , pygments @@ -16,23 +15,15 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; + hash = "sha256-A2+5FBv0IhTJPkwgd7je+B9Ac64UHJEa3HRBbWr2FxM="; }; - patches = [ - (fetchpatch { - # pygments 2.14 compat for tests - url = "https://github.com/django-extensions/django-extensions/commit/61ebfe38f8fca9225b41bec5418e006e6a8815e1.patch"; - hash = "sha256-+sxaQMmKi/S4IlfHqARPGhaqc+F1CXUHVFyeU/ArW2U="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=django_extensions --cov-report html --cov-report term" "" @@ -45,7 +36,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - factory_boy + factory-boy mock pip pygments # not explicitly declared in setup.py, but some tests require it diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix index 1225a3301a..dcbcede305 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix @@ -1,43 +1,44 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , django -, djangorestframework, python, mock +, djangorestframework +, pytestCheckHook +, pytest-django +, python }: buildPythonPackage rec { pname = "django-filter"; - version = "22.1"; + version = "23.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U="; + hash = "sha256-AV/hVVguGAW0Bik0Tkps88xARQgn0pTQQLS4wXSan6Y="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ django ]; pythonImportsCheck = [ "django_filters" ]; - # Tests fail (needs the 'crispy_forms' module not packaged on nixos) - doCheck = false; - nativeCheckInputs = [ djangorestframework - django - mock + pytestCheckHook + pytest-django ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} runtests.py tests - runHook postCheck - ''; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { description = "Reusable Django application for allowing users to filter querysets dynamically"; - homepage = "https://pypi.org/project/django-filter/"; + homepage = "https://github.com/carltongibson/django-filter"; + changelog = "https://github.com/carltongibson/django-filter/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index ef77abefee..01e1593a82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.3.0"; + version = "3.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig="; + hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix index bc87f6f5df..5f68c82b1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.2.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ws9gUPCr5nM8HGbCt9+6IFjLgAKiCMQRkY/yfIb2mng="; + hash = "sha256-9eFBFTx+M28tbIKflldvDJW1po5ht/5FBX5ImfHGFuk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index 9513a75767..526a18136a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "5.0.0"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T6VgfuheEu5eFYvHVp/x4TT7FXloGqH/Pw7QS+Ib4VM="; + hash = "sha256-qzq3ZF5nTfaCwRRqW936UVGxt7576SEIcsMVa9g2qtQ="; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 6639257740..f5942b9b9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch # propagates , django-gravatar2 @@ -24,6 +25,17 @@ buildPythonPackage rec { hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mailman/django-mailman3/-/commit/840d0d531a0813de9a30e72427e202aea21b40fe.patch"; + hash = "sha256-vltvsIP/SWpQZeXDUB+GWlTu+ghFMUqIT8i6CrYcmGo="; + }) + (fetchpatch { + url = "https://gitlab.com/mailman/django-mailman3/-/commit/25c55e31d28f2fa8eb23f0e83c12f9b0a05bfbf0.patch"; + hash = "sha256-ug5tBmnVfJTn5ufDDVg/cEtsZM59jQYJpQZV51T3qIc="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3' @@ -50,6 +62,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-markup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-markup/default.nix index e373fa30a5..ed33d09372 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-markup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-markup/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , django # optionals @@ -19,14 +20,16 @@ buildPythonPackage rec { pname = "django-markup"; - version = "1.7.2"; - format = "setuptools"; + version = "1.8.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bartTC"; repo = "django-markup"; rev = "refs/tags/v${version}"; - hash = "sha256-NvGlvrXOwDrwHhbFHrWf7Kz9sEzTTyq84/Z6jjRNy8Q="; + hash = "sha256-Hhcp4wVJEcYV1lEZ2jWf7nOlt5m4lVAfC6VmKIdxf4c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix index 1995574762..9db6be33ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mysql/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-mysql"; - version = "4.11.0"; - format = "pyproject"; + version = "4.12.0"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-mysql"; rev = "refs/tags/${version}"; - hash = "sha256-4PxJH5P/a4oNigbTjrZa3q+FeDQTdkvCKonUUl4I8m0="; + hash = "sha256-AieI6zUPFXQsrvoms5bu/Bb3J+DvfLA4rCCsjhYBEZQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix index 00b6fe9c97..76d376d11c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix @@ -1,47 +1,59 @@ -{ beautifulsoup4 -, buildPythonPackage -, django +{ buildPythonPackage , fetchFromGitHub +, fetchpatch , lib -, markdown + +# build-system , poetry-core -, python + +# dependencies +, django +, markdown , pyyaml + +# tests +, beautifulsoup4 +, pytestCheckHook +, pytest-django }: buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { - repo = pname; owner = "torchbox"; + repo = "django-pattern-library"; rev = "v${version}"; - sha256 = "sha256-V299HpbfNLa9cpVhBfzD41oe95xqh+ktQVMMVvm5Xao="; + hash = "sha256-Q8rv7RDlstTSlwmbmHV0vrnCV/lwz6VJf27BUllA34Y="; }; + patches = [ + (fetchpatch { + # https://github.com/torchbox/django-pattern-library/pull/232 + url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch"; + hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ django pyyaml markdown ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api - ''; - - nativeBuildInputs = [ poetry-core ]; - - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 + pytestCheckHook + pytest-django ]; - checkPhase = '' - export DJANGO_SETTINGS_MODULE=tests.settings.dev - ${python.interpreter} -m django test - ''; + env.DJANGO_SETTINGS_MODULE = "tests.settings.dev"; pythonImportsCheck = [ "pattern_library" ]; @@ -51,7 +63,5 @@ buildPythonPackage rec { changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; - # https://github.com/torchbox/django-pattern-library/issues/212 - broken = lib.versionAtLeast django.version "4.2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix index 19b94a6a7c..41b3dee76f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-phonenumber-field"; - version = "7.1.0"; + version = "7.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "stefanfoulis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ey/EuP3WzoGcPPJlDg97cznU5dqDPBLX/aEGPdBm9Fc="; + hash = "sha256-QEmwCdSiaae7mhmCPcV5F01f1GRxmIur3tyhv0XK7I4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix new file mode 100644 index 0000000000..91a216f0ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-pwa/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, python +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "django-pwa"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "silviolleite"; + repo = "django-pwa"; + rev = "refs/tags/v${version}"; + hash = "sha256-tP1+Jm9hdvN/ZliuVHN8tqy24/tOK1LUUiJv1xUqRrY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + django + ]; + + pyImportCheck = [ + "pwa" + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py + runHook postCheck + ''; + + meta = with lib; { + description = "A Django app to include a manifest.json and Service Worker instance to enable progressive web app behavoir"; + homepage = "https://github.com/silviolleite/django-pwa"; + changelog = "https://github.com/silviolleite/django-pwa/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index 7cb06453a7..c6f9ec3bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -1,34 +1,46 @@ -{ arrow +{ lib +, stdenv +, arrow , blessed , buildPythonPackage , croniter , django -, django-redis , django-picklefield +, django-redis , fetchFromGitHub , future -, lib +, pkgs , poetry-core , pytest-django , pytest-mock , pytestCheckHook -, pkgs -, stdenv +, pythonOlder +, redis }: buildPythonPackage rec { pname = "django-q"; version = "1.3.9"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Koed00"; repo = "django-q"; + rev = "refs/tags/v${version}"; hash = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA="; - rev = "v${version}"; }; - nativeBuildInputs = [ poetry-core ]; + # fixes empty version string + # analog to https://github.com/NixOS/nixpkgs/pull/171200 + patches = [ + ./pep-621.patch + ]; + + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ django-picklefield @@ -38,11 +50,13 @@ buildPythonPackage rec { future ]; - # fixes empty version string - # analog to https://github.com/NixOS/nixpkgs/pull/171200 - patches = [ - ./pep-621.patch - ]; + nativeCheckInputs = [ + croniter + django-redis + pytest-django + pytest-mock + pytestCheckHook + ] ++ django-redis.optional-dependencies.hiredis; pythonImportsCheck = [ "django_q" @@ -57,14 +71,6 @@ buildPythonPackage rec { kill $REDIS_PID ''; - nativeCheckInputs = [ - croniter - django-redis - pytest-django - pytest-mock - pytestCheckHook - ]; - # don't bother with two more servers to test disabledTests = [ "test_disque" @@ -76,7 +82,11 @@ buildPythonPackage rec { meta = with lib; { description = "A multiprocessing distributed task queue for Django"; homepage = "https://django-q.readthedocs.org"; + changelog = "https://github.com/Koed00/django-q/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ gador ]; + # django-q is unmaintained at the moment + # https://github.com/Koed00/django-q/issues/733 + broken = lib.versionAtLeast redis.version "5"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix index e7aed3f22b..eeb845d095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix @@ -1,8 +1,8 @@ { lib , fetchFromGitHub -, pythonAtLeast , pythonOlder , buildPythonPackage +, setuptools # propagated , django @@ -18,34 +18,41 @@ , pytestCheckHook }: -let +buildPythonPackage rec { pname = "django-redis"; - version = "5.3.0"; -in -buildPythonPackage { - inherit pname version; - format = "setuptools"; + version = "5.4.0"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-redis"; - rev = version; - hash = "sha256-eX9rUUvpkRrkZ82YalWn8s9DTw6nsbGzi1A6ibRoQGw="; + rev = "refs/tags/${version}"; + hash = "sha256-m7z3c7My24vrSSnyfDQ/LlWhy7pV4U0L8LATMvkfczc="; }; postPatch = '' sed -i '/-cov/d' setup.cfg ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django - hiredis lz4 msgpack redis ]; + passthru.optional-dependencies = { + hiredis = [ + redis + ] ++ redis.optional-dependencies.hiredis; + }; + pythonImportsCheck = [ "django_redis" ]; @@ -65,18 +72,23 @@ buildPythonPackage { pytest-django pytest-mock pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" ]; disabledTests = [ # ModuleNotFoundError: No module named 'test_cache_options' "test_custom_key_function" # ModuleNotFoundError: No module named 'test_client' + "test_delete_pattern_calls_delete_for_given_keys" "test_delete_pattern_calls_get_client_given_no_client" "test_delete_pattern_calls_make_pattern" - "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" "test_delete_pattern_calls_pipeline_delete_and_execute" "test_delete_pattern_calls_scan_iter" - "test_delete_pattern_calls_delete_for_given_keys" + "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-shortuuidfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-shortuuidfield/default.nix new file mode 100644 index 0000000000..dd999963a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-shortuuidfield/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django +, fetchPypi +, shortuuid +, six +}: + +buildPythonPackage rec { + pname = "django-shortuuidfield"; + version = "0.1.3"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-opLA/lU4q+lHsTHiuRTt2axEr8xqQOrscUSOYjGj7wA="; + }; + + propagatedBuildInputs = [ + django + shortuuid + six + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "shortuuidfield" + ]; + + meta = with lib; { + description = "Short UUIDField for Django. Good for use in urls & file names"; + homepage = "https://github.com/benrobster/django-shortuuidfield"; + license = licenses.bsd3; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix index 0b420e9362..9f91aee935 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-silk/default.nix @@ -2,7 +2,7 @@ , autopep8 , buildPythonPackage , django -, factory_boy +, factory-boy , fetchFromGitHub , fetchpatch , freezegun @@ -73,7 +73,7 @@ buildPythonPackage rec { freezegun networkx pydot - factory_boy + factory-boy ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix index 0f505b21d3..4b61d523a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.18"; + version = "0.5.20"; src = fetchPypi { inherit pname version; - hash = "sha256-bh/MT0AF99ae56Llmn6GO105GPNqhaTYEUmJhK7MSM4="; + hash = "sha256-ICcwCae+tEKX6fbHpr0hraPS+pPDFNL2v145TO62opc="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix index 5b638aa05b..1bce8c0d75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix @@ -1,53 +1,90 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django + +# optional-dependencies , azure-storage-blob , boto3 , dropbox , google-cloud-storage , libcloud , paramiko + +# tests +, cryptography +, moto +, pytestCheckHook +, rsa }: buildPythonPackage rec { pname = "django-storages"; - version = "1.13.2"; + version = "1.14"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-y63RXJCc63JH1P/FA/Eqm+w2mZ340L73wx5XF31RJog="; + src = fetchFromGitHub { + owner = "jschneier"; + repo = "django-storages"; + rev = "refs/tags/${version}"; + hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django ]; - preCheck = '' - export DJANGO_SETTINGS_MODULE=tests.settings - # timezone issues https://github.com/jschneier/django-storages/issues/1171 - substituteInPlace tests/test_sftp.py \ - --replace 'test_accessed_time' 'dont_test_accessed_time' \ - --replace 'test_modified_time' 'dont_test_modified_time' - ''; - - nativeCheckInputs = [ - azure-storage-blob - boto3 - dropbox - google-cloud-storage - libcloud - paramiko - ]; + passthru.optional-dependencies = { + azure = [ + azure-storage-blob + ]; + boto3 = [ + boto3 + ]; + dropbox = [ + dropbox + ]; + google = [ + google-cloud-storage + ]; + libcloud = [ + libcloud + ]; + s3 = [ + boto3 + ]; + sftp = [ + paramiko + ]; + }; pythonImportsCheck = [ "storages" ]; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + nativeCheckInputs = [ + cryptography + moto + pytestCheckHook + rsa + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + meta = with lib; { - description = "Collection of custom storage backends for Django"; - homepage = "https://django-storages.readthedocs.io"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; + description = "Collection of custom storage backends for Django"; + downloadPage = "https://github.com/jschneier/django-storages/"; + homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix index fe7e96579c..6dcc875884 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.3"; + version = "4.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2tqzm0bZro83qOh5xZDzmp4EK1ZcA/oMWo91S0QbHyM="; + hash = "sha256-fUoTLDgVGYFehlwnqJ7KQby9BgVoMlByJIFqQ9dcYBw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix index 4260f76e03..81326d195a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , django , djangorestframework , python @@ -10,24 +9,16 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "3.1.0"; + version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPLk6uOHk5CJs9ddHYZJ4AiICXDAaM6dDoL4f9XilQg="; + hash = "sha256-TVLenTckWpufmMDscf3M8dIoPjjohm1Ap65qO2eHoWE="; }; - patches = [ - (fetchpatch { - # Django 4.2 support; https://github.com/jazzband/django-taggit/pull/850 - url = "https://github.com/jazzband/django-taggit/commit/5f19cfbaa14e8d6d4d1679529eb168a87ca97908.patch"; - hash = "sha256-KcsiACLy3+1JoFquu//Kz+iAySZQAVIuBEKzNZaaR9s="; - }) - ]; - propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-webpush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-webpush/default.nix new file mode 100644 index 0000000000..44d670dfee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-webpush/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, pythonOlder +, pythonRelaxDepsHook +, pywebpush +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-webpush"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "safwanrahman"; + repo = "django-webpush"; + rev = "refs/tags/${version}"; + hash = "sha256-Mwp53apdPpBcn7VfDbyDlvLAVAG65UUBhT0w9OKjKbU="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + pywebpush + ]; + + # nothing to test + doCheck = false; + + pythonImportsCheck = [ + "webpush" + ]; + + meta = with lib; { + description = "A Package made for integrating and sending Web Push Notification in Django Application"; + homepage = "https://github.com/safwanrahman/django-webpush/"; + changelog = "https://github.com/safwanrahman/django-webpush/releases/tag/${src.rev}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix index 9c8e138424..077ea73bd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.20"; + version = "3.2.23"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-3sKhFnh7jhSWIBS/eOEgu6RUE1EI4a+em5Gt57KWTEA="; + hash = "sha256-gpaPNkDinvSnc68sKESPX3oI0AHGrAWzLQKu7mUJUIs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index d694ff7fb0..69c438739f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.5"; + version = "4.2.7"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-XlwclUj/t3lrSopHgumi5aPfNhUln8G/0+vHO2RhRsE="; + hash = "sha256-jg8cLCeGtcDjn+GvziTJJgQPrUfI6orTCq8RiN8p/EE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix new file mode 100644 index 0000000000..0ea8de9a4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -0,0 +1,144 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, substituteAll + +# build +, setuptools + +# patched in +, geos +, gdal +, withGdal ? false + +# propagates +, asgiref +, sqlparse + +# extras +, argon2-cffi +, bcrypt + +# tests +, aiosmtpd +, docutils +, geoip2 +, jinja2 +, numpy +, pillow +, pylibmc +, pymemcache +, python +, pywatchman +, pyyaml +, pytz +, redis +, selenium +, tblib +, tzdata +}: + +buildPythonPackage rec { + pname = "Django"; + version = "5.0b1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-yIY15zPwoO9GwhljXiHI9ZeOsqFMORgiRlRUG8XVcDA="; + }; + + patches = [ + (substituteAll { + src = ./django_5_set_zoneinfo_dir.patch; + zoneinfo = tzdata + "/share/zoneinfo"; + }) + # prevent tests from messing with our pythonpath + ./django_5_tests_pythonpath.patch + # disable test that excpects timezone issues + ./django_5_disable_failing_tests.patch + ] ++ lib.optionals withGdal [ + (substituteAll { + src = ./django_5_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + postPatch = '' + substituteInPlace tests/utils_tests/test_autoreload.py \ + --replace "/usr/bin/python" "${python.interpreter}" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asgiref + sqlparse + ]; + + passthru.optional-dependencies = { + argon2 = [ + argon2-cffi + ]; + bcrypt = [ + bcrypt + ]; + }; + + nativeCheckInputs = [ + # tests/requirements/py3.txt + aiosmtpd + docutils + geoip2 + jinja2 + numpy + pillow + pylibmc + pymemcache + pywatchman + pyyaml + pytz + redis + selenium + tblib + tzdata + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + doCheck = !stdenv.isDarwin; + + preCheck = '' + # make sure the installed library gets imported + rm -rf django + + # provide timezone data, works only on linux + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + ''; + + checkPhase = '' + runHook preCheck + + pushd tests + ${python.interpreter} runtests.py --settings=test_sqlite + popd + + runHook postCheck + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + changelog = "https://docs.djangoproject.com/en/${lib.versions.majorMinor version}/releases/${version}/"; + description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."; + homepage = "https://www.djangoproject.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch new file mode 100644 index 0000000000..dd4b3f6ac7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_disable_failing_tests.patch @@ -0,0 +1,21 @@ +diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py +index b204487..243f060 100644 +--- a/tests/settings_tests/tests.py ++++ b/tests/settings_tests/tests.py +@@ -2,7 +2,7 @@ import os + import sys + import unittest + from types import ModuleType, SimpleNamespace +-from unittest import mock ++from unittest import mock, skip + + from django.conf import ENVIRONMENT_VARIABLE, LazySettings, Settings, settings + from django.core.exceptions import ImproperlyConfigured +@@ -335,6 +335,7 @@ class SettingsTests(SimpleTestCase): + getattr(s, "foo") + + @requires_tz_support ++ @skip("Assertion fails, exception does not get raised") + @mock.patch("django.conf.global_settings.TIME_ZONE", "test") + def test_incorrect_timezone(self): + with self.assertRaisesMessage(ValueError, "Incorrect timezone setting: test"): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch new file mode 100644 index 0000000000..c1fdcdc4e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_geos_gdal_lib.patch @@ -0,0 +1,26 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +index 30cba0f..5afc031 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -15,7 +15,7 @@ try: + + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +index 1121b4f..f14ea2f 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -25,7 +25,7 @@ def load_geos(): + + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch new file mode 100644 index 0000000000..166cc56281 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_set_zoneinfo_dir.patch @@ -0,0 +1,13 @@ +diff --git a/django/conf/__init__.py b/django/conf/__init__.py +index 22f1eab..3a752d1 100644 +--- a/django/conf/__init__.py ++++ b/django/conf/__init__.py +@@ -208,7 +208,7 @@ class Settings: + if hasattr(time, "tzset") and self.TIME_ZONE: + # When we can, attempt to validate the timezone. If we can't find + # this file, no check happens and it's harmless. +- zoneinfo_root = Path("/usr/share/zoneinfo") ++ zoneinfo_root = Path("@zoneinfo@") + zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/")) + if zoneinfo_root.exists() and not zone_info_file.exists(): + raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch new file mode 100644 index 0000000000..8355d267a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_5_tests_pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py +index 7f39d7f..b5b0ae7 100644 +--- a/tests/admin_scripts/tests.py ++++ b/tests/admin_scripts/tests.py +@@ -126,6 +126,7 @@ class AdminScriptTestCase(SimpleTestCase): + del test_environ["DJANGO_SETTINGS_MODULE"] + python_path = [base_dir, django_dir, tests_dir] + python_path.extend(ext_backend_base_dirs) ++ python_path.extend(sys.path) + test_environ["PYTHONPATH"] = os.pathsep.join(python_path) + test_environ["PYTHONWARNINGS"] = "" + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index b1b088c44c..69dc84e0c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; rev = "refs/tags/v${version}"; - hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8="; + hash = "sha256-12EdSaGpsX0qDXgJ2QWYj6qAUbsrITQjWowk+gJFwwY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dllogger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dllogger/default.nix new file mode 100644 index 0000000000..2ae7bd683e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dllogger/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "dllogger"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "dllogger"; + rev = "refs/tags/v${version}"; + hash = "sha256-Hpr4yeRl+Dyaz6lRyH/5P6UQT184JEHPqgVlf4qHvOg="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + # use examples as smoke tests since upstream has no tests + checkPhase = '' + runHook preCheck + + python examples/dllogger_example.py + python examples/dllogger_singleton_example.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "dllogger" ]; + + meta = with lib; { + description = "A logging tool for deep learning"; + homepage = "https://github.com/NVIDIA/dllogger"; + changelog = "https://github.com/NVIDIA/dllogger/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dns-lexicon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dns-lexicon/default.nix index bef030ca60..6cc982c5df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dns-lexicon/default.nix @@ -1,62 +1,88 @@ -{ buildPythonPackage -, fetchFromGitHub -, poetry-core +{ lib , beautifulsoup4 +, boto3 +, buildPythonPackage , cryptography +, dnspython +, fetchFromGitHub , importlib-metadata +, localzone +, oci +, poetry-core +, pyotp +, pytest-vcr +, pytestCheckHook +, pythonOlder , pyyaml , requests -, tldextract -, pytestCheckHook -, pytest-vcr -# Optional depedencies -, boto3 -, localzone , softlayer +, tldextract , zeep -, dnspython -, oci -, lib }: buildPythonPackage rec { pname = "dns_lexicon"; - version = "3.14.1"; - format = "pyproject"; + version = "3.16.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Analogj"; repo = "lexicon"; - rev = "v${version}"; - hash = "sha256-flK2G9mdUWMUACQPo6TqYZ388EacIqkq//tCzUS+Eo8="; + rev = "refs/tags/v${version}"; + hash = "sha256-79/zz0TOCpx26TEo6gi9JDBQeVW2azWnxAjWr/FGRLA="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + cryptography + pyotp + pyyaml + requests + tldextract + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + passthru.optional-dependencies = { + route53 = [ + boto3 + ]; + localzone = [ + localzone + ]; + softlayer = [ + softlayer + ]; + ddns = [ + dnspython + ]; + duckdns = [ + dnspython + ]; + oci = [ + oci + ]; + full = [ + boto3 + dnspython + localzone + oci + softlayer + zeep + ]; + }; nativeCheckInputs = [ pytestCheckHook pytest-vcr ] ++ passthru.optional-dependencies.full; - propagatedBuildInputs = [ - beautifulsoup4 - cryptography - importlib-metadata - pyyaml - requests - tldextract - ]; - - passthru.optional-dependencies = { - route53 = [ boto3 ]; - localzone = [ localzone ]; - softlayer = [ softlayer ]; - ddns = [ dnspython ]; - duckdns = [ dnspython ]; - oci = [ oci ]; - full = [ boto3 localzone softlayer zeep dnspython oci ]; - }; - pytestFlagsArray = [ "tests/" ]; @@ -64,11 +90,20 @@ buildPythonPackage rec { disabledTestPaths = [ # Needs network access "tests/providers/test_auto.py" - # Needs network access (and an API token) "tests/providers/test_namecheap.py" ]; + disabledTests = [ + # Tests want to download Public Suffix List + "test_client_legacy_init" + "test_client_basic_init" + "test_client_init" + "test_client_parse_env" + "test_missing" + "action_is_correctly" + ]; + pythonImportsCheck = [ "lexicon" ]; @@ -77,8 +112,7 @@ buildPythonPackage rec { description = "Manipulate DNS records on various DNS providers in a standardized way"; homepage = "https://github.com/AnalogJ/lexicon"; changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ aviallon ]; license = with licenses; [ mit ]; + maintainers = with maintainers; [ aviallon ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix index 8c687f583a..915918bc54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -8,7 +8,7 @@ , pygments , pytestCheckHook , pythonOlder -, restructuredtext_lint +, restructuredtext-lint , setuptools-scm , stevedore , wheel @@ -48,7 +48,7 @@ buildPythonPackage rec { docutils chardet stevedore - restructuredtext_lint + restructuredtext-lint pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index f4c5951531..80c73f2fe0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "docker"; - version = "6.0.1"; + version = "6.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iWxCguXHr1xF6LaDsLDDOTKXT+blD8aQagqDYWqz2pc="; + hash = "sha256-qm0XgwBFul7wFo1eqjTTe+6xE5SMQTr/4dWZH8EfmiA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix index a6297780a8..cdeda778e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docopt-ng/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, pdm-backend }: buildPythonPackage rec { pname = "docopt-ng"; - version = "0.8.1"; + version = "0.9.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; + pname = "docopt_ng"; + inherit version; + hash = "sha256-kcbaELW7by6eJTRYKfuCeMeK8Bn2/ECIetSbBgSDsdc="; }; + nativeBuildInputs = [ + pdm-backend + ]; + pythonImportsCheck = [ "docopt" ]; doCheck = false; # no tests in the package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix index ca7fcae740..136f679fcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.19"; + version = "0.20.1"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-M5laZ1PDC39Xf+v8LFBBH+xqrH9//rfEz+WZEHLc+eY="; + hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; }; # Only Darwin needs LANG, but we could set it in general. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix index 13b41949eb..f65f4f7c90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix @@ -1,29 +1,42 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, lxml +, pytestCheckHook +}: buildPythonPackage rec { pname = "docx2python"; - version = "unstable-2020-11-15"; + version = "2.11.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; - # Pypi does not contain tests src = fetchFromGitHub { owner = "ShayHill"; - repo = pname; - rev = "21b2edafc0a01a6cfb73aefc61747a65917e2cad"; - sha256 = "1nwg17ziwm9a2x7yxsscj8zgc1d383ifsk5w7qa2fws6gf627kyi"; + repo = "docx2python"; + rev = "refs/tags/${version}"; + hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k="; }; - preCheck = "cd test"; # Tests require the `test/resources` folder to be accessible - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ # asserts related to file deletions fail - "test_docx2python.py" - "test_docx_context.py" - "test_google_docs.py" + nativeBuildInputs = [ + poetry-core ]; + + propagatedBuildInputs = [ + lxml + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "docx2python" ]; meta = with lib; { homepage = "https://github.com/ShayHill/docx2python"; description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images"; + changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md"; maintainers = [ maintainers.ivar ]; license = licenses.mit; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix index 4f5337fdb0..069d08f4d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix @@ -2,41 +2,45 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , pytestCheckHook -, mock , mako , decorator , stevedore +, typing-extensions }: buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.2.0"; + version = "1.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-R1VMhgzrSE3Vrvn/H4j+yz1K72u5IRlFD1vLqgJrv7E="; + hash = "sha256-/ZAiwNnLra3yCUI5GpWtrylr6AtC2qjiAvjeHCHxmLI="; }; - preCheck = '' - # Disable concurrency tests that often fail, - # probably some kind of timing issue. - rm tests/test_lock.py - # Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116 - rm tests/cache/test_memcached_backend.py - ''; + nativeBuildInputs = [ + setuptools + ]; - dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ + decorator + stevedore + typing-extensions + ]; - nativeCheckInputs = [ pytestCheckHook mock mako ]; - - propagatedBuildInputs = [ decorator stevedore ]; + nativeCheckInputs = [ + pytestCheckHook + mako + ]; meta = with lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; + homepage = "https://github.com/sqlalchemy/dogpile.cache"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix index 15e0c655f8..f722c80bda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix @@ -6,7 +6,7 @@ , pyparsing , graphviz , pytestCheckHook -, texlive +, texliveSmall }: buildPythonPackage rec { @@ -36,9 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - (texlive.combine { - inherit (texlive) scheme-small preview pstricks; - }) + (texliveSmall.withPackages (ps: with ps; [ preview pstricks ])) ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix index aac2ed2f6b..ef94901e9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "draftjs-exporter"; - version = "2.1.7"; + version = "5.0.0"; src = fetchFromGitHub { repo = "draftjs_exporter"; owner = "springload"; - rev = "v${version}"; - sha256 = "sha256-tw0r9RnQdIwcY+pqnW8fcV0o2LzmxW0MZPn5drNgK80="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix new file mode 100644 index 0000000000..84da4beadd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dramatiq/default.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, gevent +, pika +, prometheus-client +, pylibmc +, pytestCheckHook +, redis +, watchdog +, watchdog-gevent +}: + +buildPythonPackage rec { + pname = "dramatiq"; + version = "1.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Bogdanp"; + repo = "dramatiq"; + rev = "refs/tags/v${version}"; + hash = "sha256-uhradhLIyfHf1meAr7ChuGnvm62mX/lkQQ2Pe7hBWtY="; + }; + + propagatedBuildInputs = [ + prometheus-client + ]; + + passthru.optional-dependencies = { + all = [ + gevent + pika + pylibmc + redis + watchdog + watchdog-gevent + ]; + gevent = [ + gevent + ]; + memcached = [ + pylibmc + ]; + rabbitmq = [ + pika + ]; + redis = [ + redis + ]; + watch = [ + watchdog + watchdog-gevent + ]; + }; + + nativeCheckInputs = [ pytestCheckHook pika redis pylibmc ]; + + postPatch = '' + sed -i ./setup.cfg \ + -e 's:--cov dramatiq::' \ + -e 's:--cov-report html::' \ + -e 's:--benchmark-autosave::' \ + -e 's:--benchmark-compare::' \ + ''; + + disabledTests = [ + # Requires a running redis + "test_after_process_boot_call_has_no_blocked_signals" + "test_cli_can_be_reloaded_on_sighup" + "test_cli_can_watch_for_source_code_changes" + "test_cli_fork_functions_have_no_blocked_signals" + "test_consumer_threads_have_no_blocked_signals" + "test_middleware_fork_functions_have_no_blocked_signals" + "test_redis_broker_can_connect_via_client" + "test_redis_broker_can_connect_via_url" + "test_redis_process_100k_messages_with_cli" + "test_redis_process_10k_fib_with_cli" + "test_redis_process_1k_latency_with_cli" + "test_worker_threads_have_no_blocked_signals" + # Requires a running rabbitmq + "test_rabbitmq_broker_can_be_passed_a_list_of_parameters_for_failover" + "test_rabbitmq_broker_can_be_passed_a_list_of_uri_for_failover" + "test_rabbitmq_broker_can_be_passed_a_semicolon_separated_list_of_uris" + "test_rabbitmq_broker_connections_are_lazy" + "test_rabbitmq_process_100k_messages_with_cli" + "test_rabbitmq_process_10k_fib_with_cli" + "test_rabbitmq_process_1k_latency_with_cli" + ] ++ lib.optionals stdenv.isDarwin [ + # Takes too long for darwin ofborg + "test_retry_exceptions_can_specify_a_delay" + ]; + + pythonImportsCheck = [ "dramatiq" ]; + + meta = with lib; { + description = "Background Processing for Python 3"; + homepage = "https://github.com/Bogdanp/dramatiq"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index 9e476ad5c1..253604370c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , dj-rest-auth , django , django-allauth @@ -37,6 +38,14 @@ buildPythonPackage rec { hash = "sha256-sK+upLh0mi8eHKh1Wt9FoLRjqlHitTSX0Zl54S4Ce6E="; }; + patches = [ + (fetchpatch { + # https://github.com/tfranzel/drf-spectacular/pull/1090 + url = "https://github.com/tfranzel/drf-spectacular/commit/8db4c2458f8403c53db0db352dd94057d285814b.patch"; + hash = "sha256-Ue5y7IB4ie+9CEineMBgMMCLGiF4zqmn60TJvKsV1h0="; + }) + ]; + propagatedBuildInputs = [ django djangorestframework diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix index 4f63c677e6..c4c94d330d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-nPhXJgky9/CgqBnyqbF2+BASHRSpwKd0ePIRFMq29Vc="; + hash = "sha256-PULrKRHrCuDFZcR+5ha0PjkN438QFgf2CrpYhKIqYTs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dtw-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dtw-python/default.nix index f50102fe62..6af3dd1186 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dtw-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dtw-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "1.3.0"; format = "pyproject"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "DynamicTimeWarping"; 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 14289caae4..f75d326887 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.31.0"; + version = "0.32.0"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitLab { domain = "gitlab.mpcdf.mpg.de"; owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo="; + hash = "sha256-D+Gt5RrzljZQHBijaPuCuNsK08VxxJoWhqxSDu4bjH0="; }; buildInputs = [ pybind11 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index e9aac74d83..5ff9956849 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -13,17 +13,19 @@ }: buildPythonPackage rec { - inherit (duckdb) pname version src patches; + inherit (duckdb) pname version src; format = "setuptools"; - postPatch = '' + # 1. let nix control build cores + # 2. default to extension autoload & autoinstall disabled + # 3. unconstrain setuptools_scm version + patches = (duckdb.patches or []) ++ [ ./setup.patch ]; + + postPatch = (duckdb.postPatch or "") + '' # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg - # 1. let nix control build cores - # 2. unconstrain setuptools_scm version - substituteInPlace setup.py \ - --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" + substituteInPlace setup.py --subst-var NIX_BUILD_CORES # avoid dependency on mypy rm tests/stubs/test_stubs.py @@ -54,6 +56,8 @@ buildPythonPackage rec { disabledTests = [ # tries to make http request "test_install_non_existent_extension" + # test is racy and interrupt can be delivered before or after target point + "test_connection_interrupt" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch new file mode 100644 index 0000000000..8c8f790a66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/setup.patch @@ -0,0 +1,30 @@ +diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py +index 30f1e1ccdd..6784169fcb 100644 +--- a/tools/pythonpkg/setup.py ++++ b/tools/pythonpkg/setup.py +@@ -96,7 +96,7 @@ def parallel_cpp_compile( + return + self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) + +- list(multiprocessing.pool.ThreadPool(multiprocessing.cpu_count()).imap(_single_compile, objects)) ++ list(multiprocessing.pool.ThreadPool(@NIX_BUILD_CORES@).imap(_single_compile, objects)) + return objects + + +@@ -163,7 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: + for ext in extensions: + toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) + +-toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) + + + class get_pybind_include(object): +@@ -348,7 +347,7 @@ setup( + packages=packages, + include_package_data=True, + python_requires='>=3.7.0', +- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], ++ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], + use_scm_version=setuptools_scm_conf, + tests_require=['google-cloud-storage', 'mypy', 'pytest'], + classifiers=[ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix index 6a4afe7a57..2e084fe774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "3.8.5"; + version = "3.9.4"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; - rev = "v${version}"; - hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU="; + rev = "refs/tags/v${version}"; + hash = "sha256-R96ezs0INIZAXTcD1eWXuj4MSJvCbtbgzgC3ls7wYyI="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index 28b21cabc1..053fd6504e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, pytest +, pythonOlder +, setuptools , pytestCheckHook , vcrpy , citeproc-py @@ -13,16 +13,20 @@ buildPythonPackage rec { pname = "duecredit"; version = "0.9.2"; - disabled = isPy27; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; hash = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw="; }; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytestCheckHook vcrpy ]; + disabledTests = [ "test_import_doi" ]; # tries to access network preCheck = '' export HOME=$(mktemp -d) @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/duecredit/duecredit"; description = "Simple framework to embed references in code"; + changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix index 088e9dc844..129ec14cd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , freezegun , mock -, nose2 +, pytestCheckHook +, pythonOlder , pytz , setuptools , six @@ -11,13 +12,16 @@ buildPythonPackage rec { pname = "duo-client"; - version = "4.7.1"; + version = "5.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-nnKujvhOtuNnlFrbmYtD7L++S7DK0Qqrc0LyAVYe7Xg="; + hash = "sha256-G0XLZZaQTPD64WXN34wq2z+YtzECgtC2nJXzDxAlgyg="; }; postPatch = '' @@ -26,15 +30,18 @@ buildPythonPackage rec { --replace "flake8" "" ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ setuptools + ]; + + propagatedBuildInputs = [ six ]; nativeCheckInputs = [ freezegun mock - nose2 + pytestCheckHook pytz ]; @@ -42,6 +49,12 @@ buildPythonPackage rec { "duo_client" ]; + disabledTests = [ + # Tests require network access + "test_server_hostname" + "test_server_hostname_with_port" + ]; + meta = with lib; { description = "Python library for interacting with the Duo Auth, Admin, and Accounts APIs"; homepage = "https://github.com/duosecurity/duo_client_python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 72c9915cc8..8f1da6914a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.18.1"; + version = "2.21.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JL72tenKmsWanHl6+olpx7SkFLmFoTyctl+2TnnKcAI="; + hash = "sha256-2RLf2HBkb/vwbr9JecQQfO68ifVgcBIwmRQkXGJh0Fs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index fb7fed4858..217782a34e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "1.0.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mpYSlddzYIUZctF3kGWQWT+kxshIdAckVvaXWuyJnlw="; + hash = "sha256-kTp0CowXtnLXetcnoCeqlXoadgaQhL5mTYTfq9QLIl8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 844e783cc8..2c8ea26721 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.24.0"; + version = "3.30.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tXKZSAM/AwqnsXXmXeOLFTvsYvprcadH0rr78r99aPA="; + hash = "sha256-ZAOuXK1snsDZETnpyyDZT65ZWu47Qxtv7l8Blqg2Qtw="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index a07eb1c2d0..628afaaac4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.0.1"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jcgNNraMgsqTPNCbBcqEewe3jAXer4wn0aKqiUos+k8="; + hash = "sha256-esvDCAsGoaB4t4hiTmoQa69Sgg5crqJyiom/iXxpZow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix index cb899bb04c..7066271182 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.48"; + version = "0.47"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ziv1234"; repo = "python-dynalite-devices"; rev = "refs/tags/v${version}"; - hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g="; + hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dynd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dynd/default.nix index 9323255cc2..61c29fbff4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dynd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dynd/default.nix @@ -1,24 +1,34 @@ { lib , buildPythonPackage -, isPyPy -, isPy3k , cython , numpy -, pkgs +, libdynd +, fetchpatch +, cmake +, fetchFromGitHub }: buildPythonPackage rec { version = "0.7.2"; pname = "dynd"; - disabled = isPyPy || !isPy3k; # tests fail on python2, 2018-04-11 - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "libdynd"; repo = "dynd-python"; rev = "v${version}"; sha256 = "19igd6ibf9araqhq9bxmzbzdz05vp089zxvddkiik3b5gb7l17nh"; }; + patches = [ + # Fix numpy compatibility + # https://github.com/libdynd/dynd-python/issues/746 + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/numpy-compatibility.patch?h=python-dynd&id=e626acabd041069861311f314ac3dbe9e6fd24b7"; + sha256 = "sha256-oA/3G8CGeDhiYXbNX+G6o3QSb7rkKItuCDCbnK3Rt10="; + name = "numpy-compatibility.patch"; + }) + ]; + # setup.py invokes git on build but we're fetching a tarball, so # can't retrieve git version. We hardcode: preConfigure = '' @@ -28,12 +38,22 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # Python 3 works but has a broken import test that I couldn't - # figure out. - doCheck = !isPy3k; - nativeBuildInputs = [ pkgs.cmake ]; - buildInputs = [ pkgs.libdynd.dev cython ]; - propagatedBuildInputs = [ numpy pkgs.libdynd ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + cython + libdynd.dev + ]; + + propagatedBuildInputs = [ + libdynd + numpy + ]; + + # ModuleNotFoundError: No module named 'dynd.config' + doCheck = false; + + pythonImportsCheck = [ "dynd" ]; meta = with lib; { homepage = "http://libdynd.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix index 889116b791..2a06fe02d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easydict/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "easydict"; - version = "1.10"; + version = "1.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8="; + hash = "sha256-3LHS7SjrMAyORs03E0A3Orxi98FNbep0/fxvEGkGHHg="; }; doCheck = false; # No tests in archive 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 ff7f7650fc..1199f75c45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix @@ -4,7 +4,7 @@ , hdf5 , numpy , onnx -, opencv3 +, opencv4 , pillow , pyaml , pyclipper @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hdf5 numpy - opencv3 + opencv4 pillow pyaml pyclipper diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix index 9455cdc1b8..0005a4cb2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jsrJr/iuezh9/KL0PykWB1XKev4Wr5QeDh0ZWNMZSp8="; + hash = "sha256-foq1CwIe86d+s7PlhLlGpnJCwrpOyr+uf5/RMLASSJU="; }; postPatch = '' @@ -52,6 +52,21 @@ buildPythonPackage rec { "edalize" ]; + disabledTests = [ + # disable failures related to pandas 2.1.0 apply(...,errors="ignore") + # behavior change. upstream pins pandas to 2.0.3 as of 2023-10-10 + # https://github.com/olofk/edalize/commit/2a3db6658752f97c61048664b478ebfe65a909f8 + "test_picorv32_artix7_summary" + "test_picorv32_artix7_resources" + "test_picorv32_artix7_timing" + "test_picorv32_kusp_summary" + "test_picorv32_kusp_resources" + "test_picorv32_kusp_timing" + "test_linux_on_litex_vexriscv_arty_a7_summary" + "test_linux_on_litex_vexriscv_arty_a7_resources" + "test_linux_on_litex_vexriscv_arty_a7_timing" + ]; + disabledTestPaths = [ "tests/test_questa_formal.py" "tests/test_slang.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix index 0211a855b3..f3db3a96d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "editables"; - version = "0.3"; + version = "0.5"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; + hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix index f279bb2dc6..73d377e78b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.0"; + version = "0.19.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-aXwQWnhbt4D5OYYMlGLl+il/RJp6mGJLFXw8pj7TYyk="; + hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw="; }; nativeBuildInputs = [ @@ -65,5 +65,6 @@ buildPythonPackage rec { changelog = "https://github.com/tianocore/edk2-pytool-library/releases/tag/v${version}"; license = licenses.bsd2Patent; maintainers = with maintainers; [ nickcao ]; + platforms = platforms.linux; }; } 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 24abaebf7b..354f7b01af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-mUwckBelFVRCXp3hspB8WRFFaLVyRsfp6XbqU8HeHvw="; + hash = "sha256-8UuJA96pkXXRKDzQTjoz7w8TQrS5+nfLdsT0j9/oqz0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix index 03c67d7ce5..9cc5de24e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix @@ -3,16 +3,18 @@ , chainer , fetchFromGitHub , hatchling +, jupyter , nbconvert , numpy , parameterized +, pillow , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "einops"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,21 +23,22 @@ buildPythonPackage rec { owner = "arogozhnikov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/bnp8IhDxp8EB/PoW5Dz+7rOru0/odOrts84aq4qyJw="; + hash = "sha256-wCs3rMnYCk07kJ3iPItxwCQATflKBYHk6tfBCjiF+bc="; }; nativeBuildInputs = [ hatchling ]; nativeCheckInputs = [ chainer + jupyter nbconvert numpy parameterized + pillow pytestCheckHook ]; - # No CUDA in sandbox - EINOPS_SKIP_CUPY = 1; + env.EINOPS_TEST_BACKENDS = "numpy,chainer"; preCheck = '' export HOME=$(mktemp -d); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index c50b5042a6..e00e188492 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.18.0"; + version = "6.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ="; + hash = "sha256-XwAKydZuvNMOIT4GkfID8YW019OfatRekXmGrssZfMw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 2fe746ea7f..e5bdc6571c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.4.0"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d"; + sha256 = "sha256-ZkEK34gfArigMuilsqPuCT/e7eS4FPvwTA9s4EmbdHI="; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index b8c25ce5ac..a07ba8c6d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.16.3"; + version = "8.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; + sha256 = "sha256-0zZ/wBPgT8eq00mm3p+tHuBPttYnsOeJaqUFwS/eXgQ="; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix index 5df9db98fa..3ab17cb180 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.10.0"; + version = "8.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wb2l0FL7rm9Ck7HSWs9PmPyeShn9Hd9fCKnh/jWVy3o="; + hash = "sha256-naLy7xSqHlz8QNbQhM+iydJi8m6DQqBWlDLijOOT7ak="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix index 92b4cad66b..3aeab819b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix @@ -13,18 +13,25 @@ buildPythonPackage rec { pname = "elgato"; - version = "4.0.1"; + version = "5.0.0"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - hash = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4="; + hash = "sha256-TI5wu2FYVUMvgDkbktcwPLnTSD8XUSy8qwOCdrsiopk="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "elgato" ]; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Elgato Key Lights"; homepage = "https://github.com/frenck/python-elgato"; + changelog = "https://github.com/frenck/python-elgato/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax-api/default.nix index 415211cb36..b3e94cca5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elmax-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.4"; + version = "0.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+dR1ccRa4G91yFeSwjgdZ1lEXV/PIgnKN8e9tfy5fTU="; + hash = "sha256-57pmmH7f893H71CMhdnahvbN/5F2yfrVZ6MFpYQ4+mQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix index 76b5b6fbe3..99ae071f4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.3.1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-JW6Yrotm3HjUOUtNFxRorkrJKjzuwIXwjpUuMWEyLV0="; + hash = "sha256-o7UREa+IBiFjmqx0p+4XJCcoHQ/R6r2RtoezEcWvgbg="; }; propagatedBuildInputs = [ @@ -30,18 +30,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # fails with dns.resolver.NoResolverConfiguration due to network sandboxing - "test_deliverability_no_records" - "test_deliverability_found" - "test_deliverability_fails" - "test_deliverability_dns_timeout" - "test_email_example_reserved_domain" - "test_main_single_good_input" - "test_main_multi_input" - "test_main_input_shim" - "test_validate_email__with_caching_resolver" - "test_validate_email__with_configured_resolver" + disabledTestPaths = [ + # dns.resolver.NoResolverConfiguration: cannot open /etc/resolv.conf + "tests/test_deliverability.py" + "tests/test_main.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix deleted file mode 100644 index c9042e3d08..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, argcomplete -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, typeguard -}: - -buildPythonPackage rec { - pname = "enhancements"; - version = "0.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ssh-mitm"; - repo = "python-enhancements"; - rev = version; - hash = "sha256-Nff44WAQwSbkRpUHb9ANsQWWH2B819gtwQdXAjWJJls="; - }; - - propagatedBuildInputs = [ - argcomplete - typeguard - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "enhancements" - ]; - - meta = with lib; { - description = "Library which extends various Python classes"; - homepage = "https://enhancements.readthedocs.io"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix index 76ff49c6a4..af24162ada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a4r20HG13gUBOjjoDhaHJtxv+yhY3oF/d+QV+Fss6Bk="; + hash = "sha256-jAn2VxEZdGzuZ3bL9OfASkjoiPTMrm2zd6WHZ0HwiZ8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index f7fec4c66f..9906725b63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.37"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-HKtUSINJNREvu5t2jMEirkwMG6O9tBnWhACMv4L01TE="; + hash = "sha256-YIU0fboXw2CHkAeC47pcXlZT2KPO0R1UolBVILlLoPg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix index c49579a03f..74f70ee497 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix @@ -13,25 +13,16 @@ buildPythonPackage rec { pname = "envisage"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40="; + hash = "sha256-97GviL86j/8qmsbja7SN6pkp4/YSIEz+lK7WKwMWyeM="; }; - patches = [ - # TODO: remove on next release - (fetchpatch { - name = "fix-mistake-in-menu-group-specification.patch"; - url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch"; - hash = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE="; - }) - ]; - # for the optional dependency ipykernel, only versions < 6 are # supported, so it's not included in the tests, and not propagated propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix index 0accb3ccf6..3b9f4fba9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.4"; + version = "4.1.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; + hash = "sha256-DGSoqkAVdMdZQgRbmvcNFlbhTFNmFRwMu0AMvu3CNio="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix index 853e239500..974bb21392 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/equinox/default.nix @@ -7,19 +7,20 @@ , jaxtyping , typing-extensions , beartype +, optax , pytestCheckHook }: buildPythonPackage rec { pname = "equinox"; - version = "0.10.11"; - format = "pyproject"; + version = "0.11.2"; + pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; - repo = pname; + repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-JffuPplIROPog29FBsWH9cQHSkrFKuXjaTjjEwIqW/0="; + hash = "sha256-qFTKiY/t2LCCWJBOSfaX0hYQInrpXgfhTc+J4iuyVbM="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ beartype + optax pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix index cddeddfef8..511f8d17ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "eradicate"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "wemake-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; + hash = "sha256-ikiqNe1a+OeRraNBbtAx6v3LsTajWlgxm4wR2Tcbmjk="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/et-xmlfile/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/et-xmlfile/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix index e9d3cc28cb..8cc904bb40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix @@ -6,7 +6,7 @@ , eth-hash , eth-typing , eth-utils -, factory_boy +, factory-boy , hypothesis , isPyPy , pyasn1 @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ asn1tools - factory_boy + factory-boy hypothesis pyasn1 pytestCheckHook 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 bc870003ae..b6a3eed265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.4.1"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Uxk7V7KP8UxO4rJ/yh0JxME1bOuTJLQW6dnC7vX239s="; + hash = "sha256-tTDA0bLtG42hrzZ9S5eJHmgKakZY1BkBgyELu7jPH7k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/euclid3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/euclid3/default.nix new file mode 100644 index 0000000000..3d723eca56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/euclid3/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: +buildPythonPackage rec { + pname = "euclid3"; + version = "0.01"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JbgnpXrb/Zo/qGJeQ6vD6Qf2HeYiND5+U4SC75tG/Qs="; + }; + + pythonImportsCheck = [ + "euclid3" + ]; + + meta = with lib; { + description = "2D and 3D vector, matrix, quaternion and geometry module."; + homepage = "http://code.google.com/p/pyeuclid/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eufylife-ble-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eufylife-ble-client/default.nix index a3a228682f..d621663423 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eufylife-ble-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eufylife-ble-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "eufylife-ble-client"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "eufylife_ble_client"; inherit version; - hash = "sha256-Vt9hHUVAM0d+BcotPUD9v8jXrcg7lEDVChLENUHd3rY="; + hash = "sha256-1pnT5B+m2/IDqHqOIZdDx8WwBdZpJe1Bj/HaxY+VW1Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix index 6412e7834a..2e3ca084e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evaluate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "evaluate"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-O3W2m12R94iY3F7xgkIiiIyqI6vqiZPXn4jAqEDjVCw="; + hash = "sha256-axcJg0ZalEd4FOySCiFReKL7wmTCtLaw71YqyLHq8fc="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix index c9ad0cc36d..1f9bedd371 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evohome-async/default.nix @@ -2,28 +2,40 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, hatchling , pythonOlder +, voluptuous }: buildPythonPackage rec { pname = "evohome-async"; - version = "0.3.15"; - disabled = pythonOlder "3.7"; + version = "0.4.9"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "zxdavb"; - repo = pname; - rev = version; - hash = "sha256-/dZRlcTcea26FEpw/XDItKh4ncr/eEFQcdfIE2KIMo8="; + repo = "evohome-async"; + rev = "refs/tags/${version}"; + hash = "sha256-4AhxvUkLiej7OSj9Y19tJnVCzNlC5PF6KB5zTHN8gLA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ aiohttp + voluptuous ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "evohomeasync2" ]; + + pythonImportsCheck = [ + "evohomeasync2" + ]; meta = with lib; { description = "Python client for connecting to Honeywell's TCC RESTful API"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix index 528e849290..eb184c180d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, hatchling +, hatch-vcs +, gevent , pytestCheckHook -, setuptools-scm -, apipkg -, py }: buildPythonPackage rec { pname = "execnet"; - version = "1.9.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"; + hash = "sha256-zFm8RCN0L9ca0icSLrDdRNtR77PcQJW0WsmgjHcAlq8="; }; - patches = [ - (fetchpatch { - # Fix test compat with pytest 7.2.0 - url = "https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch"; - hash = "sha256-AT2qr7AUpFXcPps525U63A7ARcEVmf0HM6ya73Z2vi0="; - }) - ]; - postPatch = '' # remove vbox tests rm testing/test_termination.py @@ -38,21 +29,27 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - apipkg + hatchling + hatch-vcs ]; # sometimes crashes with: OSError: [Errno 9] Bad file descriptor doCheck = !isPyPy; nativeCheckInputs = [ - py # no longer required with 1.10.0 + gevent pytestCheckHook ]; + disabledTests = [ + # gets stuck + "test_popen_io" + # OSError: [Errno 9] Bad file descriptor + "test_stdouterrin_setnull" + ]; + + pytestFlagsArray = [ "-vvv" ]; + pythonImportsCheck = [ "execnet" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix index a5201ed5e0..a236a24059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/experiment-utilities/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "experiment-utilities"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitLab { owner = "creinke"; repo = "exputils"; domain = "gitlab.inria.fr"; rev = "refs/tags/version_${version}"; - hash = "sha256-y+I/TpEC1alP3145ByM6H//lZl2FrpLT/70lzn04P6w="; + hash = "sha256-jo0CBSpUc/F1lJ2vagocngDM1Lopw5/AJnt1QwCunA8="; }; # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix index f6d9ecaf87..642f9c6f86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2305"; + version = "1.3.0.post2311"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-uYwLz5NY+8lO8hZnAhqv+5PlcCSm6OOFWra47pwQhxg="; + hash = "sha256-qIH/cn+QdcjfNwvokbkC+euo6RD75DrqJ5Oj6Ji/9cY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory-boy/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/factory-boy/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fairseq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fairseq/default.nix index 92d8a5e785..35275c3278 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fairseq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fairseq/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # Native build inputs , cython @@ -27,12 +28,12 @@ , hypothesis , pytestCheckHook }: -let + +buildPythonPackage rec { pname = "fairseq"; version = "0.12.3"; -in -buildPythonPackage rec { - inherit version pname; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytorch"; @@ -41,17 +42,25 @@ buildPythonPackage rec { hash = "sha256-XX/grU5ljQCwx33miGoFc/7Uj9fZDtmhm4Fz7L4U+Bc="; }; - disabled = pythonOlder "3.7"; + patches = [ + # https://github.com/facebookresearch/fairseq/pull/5359 + (fetchpatch { + url = "https://github.com/facebookresearch/fairseq/commit/2fa0768c2115b0a4c207cfa3e1b3e4ff3ad9a00c.patch"; + hash = "sha256-aYYP/knQX6q6vhyA6q9uOOYfRhDAuJCo9QJWfFEDuuA="; + }) + ]; nativeBuildInputs = [ cython pythonRelaxDepsHook which ]; + pythonRelaxDeps = [ "hydra-core" "omegaconf" ]; + propagatedBuildInputs = [ cffi hydra-core @@ -74,6 +83,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "fairseq" ]; + preCheck = '' export HOME=$TMPDIR cd tests @@ -82,6 +92,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--import-mode append" ]; + disabledTests = [ # this test requires xformers "test_xformers_single_forward_parity" @@ -96,6 +107,11 @@ buildPythonPackage rec { "test_librispeech_s2t_conformer_s_checkpoint" ]; + disabledTestPaths = [ + # ValueError: mutable default ... for field bar is not allowed: use default_factory + "test_dataclass_utils.py" + ]; + meta = with lib; { description = "Facebook AI Research Sequence-to-Sequence Toolkit"; homepage = "https://github.com/pytorch/fairseq"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index 7e26264bc3..4f0a1e7013 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "17.3.0"; + version = "19.6.1"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-JrKGSlMyCU8sfzlo3uurzmm+Oe1dtNvyK0+guj0aza4="; + hash = "sha256-XWt4gLO+pwgHXd+Rk4QkRT8HBTpZ+PoEU8GHDfb/MpI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 2ceea80472..b1b1080d20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -5,9 +5,10 @@ , hypothesis , lupa , poetry-core +, pybloom-live , pytest-asyncio -, pytestCheckHook , pytest-mock +, pytestCheckHook , pythonOlder , redis , six @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.18.1"; + version = "2.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-XxQGkcwWesPS/N31t04FDq6w773OZnLVTWB42dY4AGA="; + hash = "sha256-pRvUgK4OXVP2GR+Iu4ddqwApw0gYN4FkKjTpwbC1oWM="; }; nativeBuildInputs = [ @@ -52,6 +53,9 @@ buildPythonPackage rec { aioredis = [ aioredis ]; + bf = [ + pybloom-live + ]; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 784b13c354..fb2bcf88fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.13.2"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-ZoxIuUeDkhACWGi+njZuMhO8P6nlErcBkub5VCMNm8Q="; + hash = "sha256-qFA0AVebHd/Ny8x+rUkueLZhYB/PwL7o/qpUnZCRsEA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/farm-haystack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/farm-haystack/default.nix new file mode 100644 index 0000000000..afee9c60f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/farm-haystack/default.nix @@ -0,0 +1,290 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, hatchling +, boilerpy3 +, events +, httpx +, jsonschema +, lazy-imports +, more-itertools +, networkx +, pandas +, pillow +, platformdirs +, posthog +, prompthub-py +, pydantic +, quantulum3 +, rank-bm25 +, requests +, requests-cache +, scikit-learn +, sseclient-py +, tenacity +, tiktoken +, tqdm +, transformers +, openai-whisper +, boto3 +, botocore +# , beir +, selenium +, coverage +, dulwich +# , jupytercontrib +, mkdocs +, mypy +, pre-commit +, psutil +# , pydoc-markdown +, pylint +, pytest +, pytest-asyncio +, pytest-cov +# , pytest-custom-exit-code +, python-multipart +, reno +, responses +, toml +, tox +, watchdog +, elastic-transport +, elasticsearch +# , azure-ai-formrecognizer +, beautifulsoup4 +, markdown +, python-docx +, python-frontmatter +, python-magic +, tika +, black +, huggingface-hub +, sentence-transformers +, mlflow +, rapidfuzz +, scipy +, seqeval +, pdf2image +, pytesseract +, faiss +# , faiss-gpu +, pinecone-client +, onnxruntime +, onnxruntime-tools +# , onnxruntime-gpu +, opensearch-py +, pymupdf +, langdetect +, nltk +, canals +, jinja2 +, openai +, aiorwlock +, ray +, psycopg2 +, sqlalchemy +, sqlalchemy-utils +, weaviate-client +}: + +buildPythonPackage rec { + pname = "farm-haystack"; + version = "1.22.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deepset-ai"; + repo = "haystack"; + rev = "refs/tags/v${version}"; + hash = "sha256-0tRgZqySM9vPhs5lar89Gz/G7/YgRuFZosgTdKuGBH0="; + }; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # We call it faiss, not faiss-cpu. + "faiss-cpu" + ]; + + propagatedBuildInputs = [ + boilerpy3 + events + httpx + jsonschema + lazy-imports + more-itertools + networkx + pandas + pillow + platformdirs + posthog + prompthub-py + pydantic + quantulum3 + rank-bm25 + requests + requests-cache + scikit-learn + sseclient-py + tenacity + tiktoken + tqdm + transformers + ]; + + env.HOME = "$(mktemp -d)"; + + passthru.optional-dependencies = { + # all = [ + # farm-haystack + # ]; + # all-gpu = [ + # farm-haystack + # ]; + audio = [ + openai-whisper + ]; + aws = [ + boto3 + botocore + ]; + # beir = [ + # beir + # ]; + colab = [ + pillow + ]; + crawler = [ + selenium + ]; + dev = [ + coverage + dulwich + # jupytercontrib + mkdocs + mypy + pre-commit + psutil + # pydoc-markdown + pylint + pytest + pytest-asyncio + pytest-cov + # pytest-custom-exit-code + python-multipart + reno + responses + toml + tox + watchdog + ]; + elasticsearch7 = [ + elastic-transport + elasticsearch + ]; + elasticsearch8 = [ + elastic-transport + elasticsearch + ]; + file-conversion = [ + # azure-ai-formrecognizer + beautifulsoup4 + markdown + python-docx + python-frontmatter + python-magic + # python-magic-bin + tika + ]; + formatting = [ + black + ]; + inference = [ + huggingface-hub + sentence-transformers + transformers + ]; + metrics = [ + mlflow + rapidfuzz + scipy + seqeval + ]; + ocr = [ + pdf2image + pytesseract + ]; + only-faiss = [ + faiss + ]; + # only-faiss-gpu = [ + # faiss-gpu + # ]; + only-pinecone = [ + pinecone-client + ]; + onnx = [ + onnxruntime + onnxruntime-tools + ]; + # onnx-gpu = [ + # onnxruntime-gpu + # onnxruntime-tools + # ]; + opensearch = [ + opensearch-py + ]; + pdf = [ + pymupdf + ]; + preprocessing = [ + langdetect + nltk + ]; + preview = [ + canals + jinja2 + lazy-imports + openai + pandas + rank-bm25 + requests + tenacity + tqdm + ]; + ray = [ + aiorwlock + ray + ]; + sql = [ + psycopg2 + sqlalchemy + sqlalchemy-utils + ]; + weaviate = [ + weaviate-client + ]; + }; + + # the setup for test is intensive, hopefully can be done at some point + doCheck = false; + + + pythonImportsCheck = [ "haystack" ]; + + meta = with lib; { + description = "LLM orchestration framework to build customizable, production-ready LLM applications"; + longDescription = '' + LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots + ''; + changelog = "https://github.com/deepset-ai/haystack/releases/tag/${src.rev}"; + homepage = "https://github.com/deepset-ai/haystack"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix index 9f58d04343..cb2ee2cc26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.12"; + version = "2.7.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5ayA/0bdgHDGcKNI8xpkyF6hqR3DIMIQZIjzQzMoKRY="; + hash = "sha256-q1KBBAAKrTzq6USRwBjvT23mXpjQT2gjBsxuZ4w54rY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index c0c4b36d34..428cf9f8d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -1,27 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, pydantic -, starlette -, pytestCheckHook -, pytest-asyncio -, aiosqlite -, databases -, flask -, httpx +, pythonOlder + +# build-system , hatchling -, orjson + +# dependencies +, starlette +, pydantic +, typing-extensions + +# tests +, dirty-equals +, flask , passlib -, peewee +, pytest-asyncio +, pytestCheckHook , python-jose , sqlalchemy , trio -, pythonOlder + +# optional-dependencies +, httpx +, jinja2 +, python-multipart +, itsdangerous +, pyyaml +, ujson +, orjson +, email-validator +, uvicorn }: buildPythonPackage rec { pname = "fastapi"; - version = "0.95.2"; + version = "0.103.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,40 +44,44 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo="; + hash = "sha256-2J8c3S4Ca+c5bI0tyjMJArJKux9qPmu+ohqve5PhSGI="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \ - --replace "starlette==" "starlette>=" - ''; - propagatedBuildInputs = [ starlette pydantic + typing-extensions ]; - nativeCheckInputs = [ - aiosqlite - # databases FIXME incompatible with SQLAlchemy 2.0 - flask + passthru.optional-dependencies.all = [ httpx + jinja2 + python-multipart + itsdangerous + pyyaml + ujson orjson + email-validator + uvicorn + # pydantic-settings + # pydantic-extra-types + ] ++ uvicorn.optional-dependencies.standard; + + nativeCheckInputs = [ + dirty-equals + flask passlib - peewee - python-jose pytestCheckHook pytest-asyncio - sqlalchemy + python-jose trio - ] - ++ passlib.optional-dependencies.bcrypt - ++ pydantic.optional-dependencies.email; + sqlalchemy + ] ++ passthru.optional-dependencies.all + ++ python-jose.optional-dependencies.cryptography; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from @@ -92,6 +110,8 @@ buildPythonPackage rec { "test_trace" # Unexpected number of warnings caught "test_warn_duplicate_operation_id" + # assert state["except"] is True + "test_dependency_gets_exception" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 85b9eecb57..54a475c08b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UPnWVYiZJdP6r7Bm1H9DMXpLi26c9tpXeEkLXVJxWdM="; + hash = "sha256-W+fFZAQU7W6gDqB6LOrG8se6mBATFZWmepTt1HSphbE="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastembed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastembed/default.nix index d3633af2bb..f9b3f71e1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastembed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastembed/default.nix @@ -10,9 +10,9 @@ , pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "fastembed"; - version = "unstable-2023-09-07"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage { src = fetchFromGitHub { owner = "qdrant"; repo = "fastembed"; - rev = "9c5d32f271dfe9ae4730694727ff5df480983942"; + rev = "refs/tags/v${version}"; hash = "sha256-d7Zb0IL0NOPEPsCHe/ZMNELnSCG4+y8JmGAXnCRUd50="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix index 563c4b7e4f..30f2174ff7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faster-whisper/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.7.1"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "guillaumekln"; repo = "faster-whisper"; - rev = "v${version}"; - hash = "sha256-NTk0S+dMChygnC7Wix62AFO4NNSPJuKXyqoEyWiQhII="; + rev = "refs/tags/v${version}"; + hash = "sha256-kHXX5Z4r7+lFRBtTCsPy9DILwsk3T1mcBzmJnCrKTdk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix index 313f57e385..f1d56ef718 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasttext-predict/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fasttext-predict"; - version = "0.9.2.1"; + version = "0.9.2.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw="; + hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix index 3215a90108..74cd6e727d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.2"; + version = "3.12.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; + hash = "sha256-Lm8knx82VCkWBuBGsJ8f1erDmzYGZMJ/Wq0HIBL4vL0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/finvizfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finvizfinance/default.nix index 064b8291b8..a953795b86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/finvizfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/finvizfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "0.14.5"; + version = "0.14.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-yhOa/CS+9UdI+TVMObBsOqIp9XggMJvNjteSMa5DJcM="; + hash = "sha256-ht1bez04MAgugsQqa47q2ED7z8xpiXmzkOYBR7/PZHU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 1fe53065d9..8513c723bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_3 , gdal +, oldest-supported-numpy , setuptools , wheel , attrs @@ -20,8 +21,8 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.4.post1"; - format = "pyproject"; + version = "1.9.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,21 +30,13 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw="; + hash = "sha256-fq/BuyzuK4iOxdpE4h+KRH0CxOEk/wdmbb9KgCfJ1cw="; }; - postPatch = '' - # Remove after https://github.com/Toblerity/Fiona/pull/1225 is released - sed -i '/"oldest-supported-numpy"/d' pyproject.toml - - # Remove after https://github.com/Toblerity/Fiona/pull/1281 is released, - # after which cython also needs to be updated to cython_3 - sed -i 's/Cython~=/Cython>=/' pyproject.toml - ''; - nativeBuildInputs = [ - cython + cython_3 gdal # for gdal-config + oldest-supported-numpy setuptools wheel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 860f449fd8..7a3bd82a51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -5,14 +5,12 @@ , mccabe , pycodestyle , pyflakes -, importlib-metadata -, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "flake8"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.8"; @@ -22,20 +20,15 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-dN9LlLpQ/ZoVIFrAQ1NxMvsHqWsgdJVLUIAFwkheEL4="; + hash = "sha256-N8bufkn1CUREHusVc2mQ1YlNr7lrESEZGmlN68bhgbE="; }; propagatedBuildInputs = [ mccabe pycodestyle pyflakes - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; - # Tests fail on Python 3.7 due to importlib using a deprecated interface - doCheck = pythonAtLeast "3.7"; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix new file mode 100644 index 0000000000..4bb5e9fe30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +# dependencies +, flask +, jsonschema +, mistune +, pyyaml +, six +, werkzeug + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flasgger"; + version = "0.9.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "flasgger"; + repo = "flasgger"; + rev = version; + hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg="; + }; + + patches = [ + (fetchpatch { + # flask 2.3 compat + url = "https://github.com/flasgger/flasgger/commit/ab77be7c6de1d4b361f0eacfa37290239963f890.patch"; + hash = "sha256-ZbE5pPUP23nZAP/qcdeWkwzrZgqJSRES7oFta8U1uVQ="; + }) + ]; + + propagatedBuildInputs = [ + flask + jsonschema + mistune + pyyaml + six + werkzeug + ]; + + pythonImportsCheck = [ + "flasgger" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + doCheck = false; # missing flex dependency + + meta = with lib; { + description = "Easy OpenAPI specs and Swagger UI for your Flask API"; + homepage = "https://github.com/flasgger/flasgger/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index 685c4e8094..c4d686c014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -107,6 +107,8 @@ buildPythonPackage rec { "flask_admin/tests/sqla/test_translation.py" # RuntimeError: Working outside of application context. "flask_admin/tests/sqla/test_multi_pk.py" + # Broken test + "flask_admin/tests/fileadmin/test_fileadmin.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index eaf132e943..6309e0ddd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.3.1"; + version = "4.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-FP92HEGOsufHtaIySqDiScD3QUu3iQhWdtvkOecUvuI="; + hash = "sha256-jKlxD6fScEdH0ZXhG0h9RaVx9AVZ2DmdnV36QuofPHg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix index 63e393a40a..f8a6d3b310 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "flask-babel"; - version = "3.1.0"; + version = "4.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-babel"; repo = "flask-babel"; rev = "refs/tags/v${version}"; - hash = "sha256-KoTHBrGD6M3rkXoxUadRXhroRUbWKaL/rE6Rd2mxw4c="; + hash = "sha256-BAT+oupy4MCSjeZ4hFtSKMkGU9xZtc7Phnz1mIsb2Kc="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix index 4ea6857cbd..abc90cdbb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, flask, six, packaging }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, flask +, packaging +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { - pname = "Flask-Cors"; - version = "3.0.10"; + pname = "flask-cors"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; + src = fetchFromGitHub { + owner = "corydolphin"; + repo = "flask-cors"; + rev = "refs/tags/${version}"; + hash = "sha256-o//ulROKKBv/CBJIGPBFP/+T0TpMHUVjr23Y5g1V05g="; }; - nativeCheckInputs = [ nose packaging ]; - propagatedBuildInputs = [ flask six ]; + nativeBuildInputs = [ + setuptools + ]; - # Exclude test_acl_uncaught_exception_500 test case because is not compatible - # with Flask>=1.1.0. See: https://github.com/corydolphin/flask-cors/issues/253 - checkPhase = '' - nosetests --exclude test_acl_uncaught_exception_500 - ''; + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + packaging + ]; meta = with lib; { description = "A Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; + changelog = "https://github.com/corydolphin/flask-cors/releases/tag/v${version}"; license = with licenses; [ mit ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-dramatiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-dramatiq/default.nix new file mode 100644 index 0000000000..6f8884516f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-dramatiq/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitLab +, poetry-core +, dramatiq +, flask +, requests +, pytestCheckHook +, flask-migrate +, periodiq +, postgresql +, postgresqlTestHook +, psycopg2 +}: + +buildPythonPackage { + pname = "flask-dramatiq"; + version = "0.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitLab { + owner = "bersace"; + repo = "flask-dramatiq"; + rev = "840209e9bf582b4dda468e8bba515f248f3f8534"; + hash = "sha256-qjV1zyVzHPXMt+oUeGBdP9XVlbcSz2MF9Zygj543T4w="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + + patchShebangs --build ./example.py + + sed -i ./tests/unit/pytest.ini \ + -e 's:--cov=flask_dramatiq::' \ + -e 's:--cov-report=term-missing::' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dramatiq + ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + requests + flask-migrate + periodiq + postgresql + postgresqlTestHook + psycopg2 + ] ++ dramatiq.optional-dependencies.rabbitmq; + + postgresqlTestSetupPost = '' + substituteInPlace config.py \ + --replace 'SQLALCHEMY_DATABASE_URI = f"postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST}/{PGDATABASE}"' \ + "SQLALCHEMY_DATABASE_URI = \"postgresql://$PGUSER/$PGDATABASE?host=$PGHOST\"" + python3 ./example.py db upgrade + ''; + + pytestFlagsArray = [ "-x" "tests/func/" "tests/unit"]; + + pythonImportsCheck = [ "flask_dramatiq" ]; + + # Does HTTP requests to localhost + disabledTests = [ + "test_fast" + "test_other" + ]; + + meta = with lib; { + description = "Adds Dramatiq support to your Flask application"; + homepage = "https://gitlab.com/bersace/flask-dramatiq"; + license = licenses.bsd3; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index 1305234e43..ff532ffd12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.3.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; + hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix index c1b8c15bea..134dc8f2e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix @@ -1,34 +1,48 @@ { lib -, asgiref -, blinker , buildPythonPackage , fetchPypi -, flask -, pytestCheckHook -, pythonAtLeast , pythonOlder -, semantic-version + +# build-system +, setuptools + +# dependencies +, flask , werkzeug + +# tests +, asgiref +, blinker +, pytestCheckHook +, semantic-version }: buildPythonPackage rec { pname = "flask-login"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Login"; inherit version; - hash = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; + hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask werkzeug ]; + pythonImportsCheck = [ + "flask_login" + ]; + nativeCheckInputs = [ asgiref blinker @@ -36,15 +50,8 @@ buildPythonPackage rec { semantic-version ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_hashable" - ]; - - pythonImportsCheck = [ - "flask_login" - ]; - meta = with lib; { + changelog = "https://github.com/maxcountryman/flask-login/blob/${version}/CHANGES.md"; description = "User session management for Flask"; homepage = "https://github.com/maxcountryman/flask-login"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 819c9d2392..a7a5da6216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "Flask-Migrate"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fdnoX7ypTpH2mQ+7Xuhzdh706Of7PIVhHQGVbe0jv1s="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix index 32a275177c..dad4b6ddb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flask-mongoengine"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-08-16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,10 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; + rev = "d4526139cb1e2e94111ab7de96bb629d574c1690"; + hash = "sha256-oMQU9Z8boc0q+0KzIQAZ8qSyxiITDY0M9FCg75S9MEY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "1.0.0"; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix index c8d2123689..748e2fbe2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-openid/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "flask-openid"; version = "1.3.0"; - disable = !isPy3k; src = fetchPypi { pname = "Flask-OpenID"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix index d73ad8d35c..f28579e04a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix @@ -1,19 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, flask }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "flask-paginate"; - version = "2022.1.8"; + version = "2023.10.24"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "lixxu"; + repo = "flask-paginate"; + rev = "refs/tags/v${version}"; + hash = "sha256-9633YLHMF9S1DLK7ZS4qmCOzslXdHLSgpKoJFNvkXlA="; }; - propagatedBuildInputs = [ flask ]; + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_paginate" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; meta = with lib; { - homepage = "https://github.com/lixxu/flask-paginate"; description = "Pagination support for Flask"; + homepage = "https://github.com/lixxu/flask-paginate"; + changelog = "https://github.com/lixxu/flask-paginate/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix index 9db70e044e..68072b7ddd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = [ # Broke in flask 2.2 upgrade "test_exception_header_forwarded" + # Broke in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index cdee90d222..6fd8b6b733 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -5,6 +5,7 @@ , aniso8601 , jsonschema , flask +, importlib-resources , werkzeug , pytz , faker @@ -19,22 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-alXuo6TGDX2ko6VIKpAtyrg0EBkxEnC3DabH8GYqEs0="; + hash = "sha256-9o0lgDtjsZta9fVJnD02In6wvxNwPA667WeIkpRv8Z4="; }; propagatedBuildInputs = [ aniso8601 flask + importlib-resources jsonschema pytz werkzeug @@ -58,6 +60,12 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + disabledTests = [ + # broken in werkzeug 2.3 upgrade + "test_media_types_method" + "test_media_types_q" + ]; + pythonImportsCheck = [ "flask_restx" ]; @@ -65,7 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fully featured framework for fast, easy and documented API development with Flask"; homepage = "https://github.com/python-restx/flask-restx"; - changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst"; + changelog = "https://github.com/python-restx/flask-restx/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index e18cc8579b..81abf369a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools # extras: babel , babel @@ -11,7 +12,6 @@ , bcrypt , bleach , flask-mailman -, qrcode # extras: fsqla , flask-sqlalchemy @@ -21,20 +21,21 @@ # extras: mfa , cryptography , phonenumbers +, webauthn +, qrcode # propagates -, blinker , email-validator , flask , flask-login , flask-principal , flask-wtf -, itsdangerous , passlib +, importlib-resources +, wtforms # tests , argon2-cffi -, flask-mongoengine , mongoengine , mongomock , peewee @@ -46,31 +47,30 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.1.2"; - format = "setuptools"; + version = "5.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; + hash = "sha256-wLUHXfDWSp7zWwTIjTH79AWlkkNzb21tChpLSEWr8+U="; }; - postPatch = '' - # This should be removed after updating to version 5.3.0. - sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ - blinker email-validator flask flask-login flask-principal flask-wtf - itsdangerous passlib + importlib-resources + wtforms ]; passthru.optional-dependencies = { @@ -82,7 +82,6 @@ buildPythonPackage rec { bcrypt bleach flask-mailman - qrcode ]; fsqla = [ flask-sqlalchemy @@ -92,12 +91,13 @@ buildPythonPackage rec { mfa = [ cryptography phonenumbers + webauthn + qrcode ]; }; nativeCheckInputs = [ argon2-cffi - flask-mongoengine mongoengine mongomock peewee @@ -112,6 +112,11 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.mfa; + disabledTests = [ + # needs /etc/resolv.conf + "test_login_email_whatever" + ]; + pythonImportsCheck = [ "flask_security" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 550d9adf41..7146c38e5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flask , mock -, pdm-pep517 +, flit-core , pytestCheckHook , pythonOlder , sqlalchemy @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "flask-sqlalchemy"; - version = "3.0.3"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { - pname = "Flask-SQLAlchemy"; + pname = "flask_sqlalchemy"; inherit version; - hash = "sha256-J2QzXzydfr3J7WBEr6+Yqun6UNegdM71Xd4wfslZA+w="; + hash = "sha256-5LaLuIGALdoafYeLL8hMBtHuV/tAuHTT3Jfav6NrgxI="; }; nativeBuildInputs = [ - pdm-pep517 + flit-core ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix index e30abdb7cb..fd915fdc18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { description = "Flask plugin to rewrite file paths to add version info"; homepage = "https://github.com/pilt/flask-versioned"; license = licenses.bsd3; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix index 4954f19f91..a106945df0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix @@ -1,24 +1,34 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage +, pythonOlder +, hatchling , flask , itsdangerous , wtforms , email-validator , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "flask-wtf"; - version = "1.1.1"; + version = "1.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Flask-WTF"; + pname = "flask_wtf"; inherit version; - hash = "sha256-QcQkTprmJtY77UKuR4W5Bme4hbFTXVpAleH2MGDRKqk="; + hash = "sha256-i7Jp65u0a4fnyCM9fn3r3x+LdL+QzBeJmIwps3qXtpU="; }; + nativeBuildInputs = [ + hatchling + setuptools + ]; + propagatedBuildInputs = [ flask itsdangerous @@ -33,10 +43,15 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; maintainers = with maintainers; [ mic92 anthonyroussel ]; homepage = "https://github.com/lepture/flask-wtf/"; + changelog = "https://github.com/wtforms/flask-wtf/releases/tag/v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix index b7914ad377..154625f6c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , asgiref +, blinker , click +, flit-core , importlib-metadata , itsdangerous , jinja2 @@ -19,16 +21,21 @@ buildPythonPackage rec { pname = "flask"; - version = "2.2.5"; + version = "2.3.3"; + format = "pyproject"; src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + inherit pname version; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click + blinker itsdangerous jinja2 werkzeug diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index bea9667a1a..fa0f053f86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -1,53 +1,66 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , jaxlib +, pythonRelaxDepsHook +, setuptools-scm , jax -, keras -, lib -, matplotlib , msgpack , numpy , optax +, pyyaml +, rich +, tensorstore +, typing-extensions +, matplotlib +, cloudpickle +, einops +, keras , pytest-xdist , pytestCheckHook -, pythonRelaxDepsHook , tensorflow -, tensorstore -, fetchpatch -, rich }: buildPythonPackage rec { pname = "flax"; - version = "0.6.5"; + version = "0.7.5"; + pyproject = true; src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-Vv68BK83gTIKj0r9x+twdhqmRYziD0vxQCdHkYSeTak="; + hash = "sha256-NDah0ayQbiO1/sTU1DDf/crPq5oLTnSuosV7cFHlTM8="; }; - nativeBuildInputs = [ jaxlib pythonRelaxDepsHook ]; + nativeBuildInputs = [ + jaxlib + pythonRelaxDepsHook + setuptools-scm + ]; propagatedBuildInputs = [ jax - matplotlib msgpack numpy optax + pyyaml rich tensorstore + typing-extensions ]; - # See https://github.com/google/flax/pull/2882. - pythonRemoveDeps = [ "orbax" ]; + passthru.optional-dependencies = { + all = [ matplotlib ]; + }; pythonImportsCheck = [ "flax" ]; nativeCheckInputs = [ + cloudpickle + einops keras pytest-xdist pytestCheckHook @@ -78,22 +91,6 @@ buildPythonPackage rec { "tests/checkpoints_test.py" ]; - disabledTests = [ - # See https://github.com/google/flax/issues/2554. - "test_async_save_checkpoints" - "test_jax_array0" - "test_jax_array1" - "test_keep0" - "test_keep1" - "test_optimized_lstm_cell_matches_regular" - "test_overwrite_checkpoints" - "test_save_restore_checkpoints_target_empty" - "test_save_restore_checkpoints_target_none" - "test_save_restore_checkpoints_target_singular" - "test_save_restore_checkpoints_w_float_steps" - "test_save_restore_checkpoints" - ]; - meta = with lib; { description = "Neural network library for JAX"; homepage = "https://github.com/google/flax"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flet-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flet-core/default.nix index ed55629dca..bf1e8b2d69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flet-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-8WG7odYiGrew4GwD+MUuzQPmDn7V/GmocBproqsbCNw="; + hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix index 4c41e59726..c6541372d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flet/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "flet"; - version = "0.7.4"; + version = "0.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-vFPjN+5wIygtP035odAOSdF9PQe6eXz6CJ9Q0d8ScFo="; + hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/floret/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/floret/default.nix new file mode 100644 index 0000000000..08f59292a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/floret/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pybind11 +, setuptools +, wheel +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "floret"; + version = "0.10.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "floret"; + rev = "refs/tags/v${version}"; + hash = "sha256-cOVyvRwprR7SvZjH4rtDK8uifv6+JGyRR7XYzOP5NLk="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + pybind11 + ]; + + pythonImportsCheck = [ "floret" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "FastText + Bloom embeddings for compact, full-coverage vectors with spaCy"; + homepage = "https://github.com/explosion/floret"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix index 3479f3b3d5..1562600a23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix index 7fe9ba92b6..01e57845d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.4.1"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-vKv3Hfla+U1teYVB+w8ONj0Ur996noanbg6aaJ6S6+I="; + hash = "sha256-gAHCssJC6sTR6ftkQHrtF/5Nf9dXE4ykRhVusb0Gu3I="; }; postPatch = '' 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 09c2137872..8b29b61fe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "folium"; - version = "0.14.0"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; + hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix index 1f684becb9..a6bd37c015 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.5.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - hash = "sha256-njJArNq7nhdoq0Si3+RUDE+VJSwuUvk+e7WeuNaluK0="; + hash = "sha256-Nb09/BRPR0H3rHrbDIhcrgOyJp55KCIdPvUr/vh2Z0U="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 845ca18e4a..3c167debba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,8 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.38.0"; + version = "4.42.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cdZI2kwR3zzS6eiiXGpeHIp+kgPCPEsTOSTV60pODTM="; + hash = "sha256-fcFFJi9Hr0m74LwFIhhhm/bMfxepAvg4/ymU53MmsPg="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -60,6 +61,7 @@ buildPythonPackage rec { ] ++ lib.concatLists (lib.attrVals ([ "woff" "interpolatable" + "ufo" ] ++ lib.optionals (!skia-pathops.meta.broken) [ "pathops" # broken ] ++ [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix index 098d13e87c..418cd3d958 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formbox/default.nix @@ -1,26 +1,24 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchzip, flit-core, mistune, nh3 }: buildPythonPackage rec { pname = "formbox"; - version = "0.4.1"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = pname; - rev = version; - hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; + src = fetchzip { + url = "https://trong.loang.net/~cnx/formbox/snapshot/formbox-${version}.tar.gz"; + hash = "sha256-sRu0otyeYpxot/Fyiz3wyQJsJvl8nsgIVitzT8frxLE="; }; nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ bleach markdown ]; + propagatedBuildInputs = [ mistune nh3 ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; meta = with lib; { description = "A script to format mbox as HTML/XML"; - homepage = "https://sr.ht/~cnx/formbox"; + homepage = "https://trong.loang.net/~cnx/formbox"; license = licenses.agpl3Plus; maintainers = [ maintainers.McSinyx ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix index 1323f2902c..1b7dd1fc2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "formencode"; - version = "2.0.1"; + version = "2.1.0"; disabled = isPy27; src = fetchPypi { pname = "FormEncode"; inherit version; - sha256 = "8f2974112c2557839d5bae8b76490104c03830785d923abbdef148bf3f710035"; + sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix index ab13f86dc1..d8b6088124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formulae/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WDWpyrHXGBfheE0m5I9K+Dk1urXRMY6yoenN3OaZogM="; + hash = "sha256-nmqGdXqsesRhR06FDS5t64C6+Bz1B97W+PkHrfV7Qmg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix index 3cfe44c55d..e119eb9f3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "formulaic"; - version = "0.5.2"; + version = "0.6.6"; format = "pyproject"; src = fetchFromGitHub { owner = "matthewwardrop"; repo = "formulaic"; - rev = "v${version}"; - hash = "sha256-sIvHTuUS/nkcDjRgZCoEOY2negIOsarzH0PeXJsavWc="; + rev = "refs/tags/v${version}"; + hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix index 957e9f5d05..06ff0d1c7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix @@ -4,33 +4,32 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "frozenlist"; - version = "1.3.3"; - format = "setuptools"; + version = "1.4.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - hash = "sha256-lJWRdXvuzyvJwNSpv0+ojY4rwws3jwDtlLOqYyLPrZc="; + rev = "refs/tags/v${version}"; + hash = "sha256-sI6jnrTxDbW0sNVodpCjBnA31VAAmunwMp9s8GkoHGI="; }; nativeBuildInputs = [ cython - ]; - - nativeCheckInputs = [ - pytestCheckHook + setuptools + wheel ]; postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov=frozenlist" "" + sed -i "/addopts =/d" pytest.ini ''; preBuild = '' @@ -41,6 +40,10 @@ buildPythonPackage rec { "frozenlist" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fschat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fschat/default.nix index ee42f4ce8a..573009b2a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fschat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fschat/default.nix @@ -29,7 +29,7 @@ , protobuf }: let - version = "0.2.30"; + version = "0.2.32"; in buildPythonPackage { pname = "fschat"; @@ -40,7 +40,7 @@ buildPythonPackage { owner = "lm-sys"; repo = "FastChat"; rev = "refs/tags/v${version}"; - hash = "sha256-SkrdRpmbxnt/Xn8TTmozxhr3fPeAFPP7X0cM9vJC9Sc="; + hash = "sha256-3IJcqVULOK0Nf72sgv80q9U8QZ3pNHLYaNwCQohdBB8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index e158692e9a..a90fe66a48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -29,16 +29,16 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.4.0"; + version = "2023.10.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; - rev = version; - hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM="; + rev = "refs/tags/${version}"; + hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; }; propagatedBuildInputs = [ @@ -146,6 +146,11 @@ buildPythonPackage rec { "test_touch" ]; + disabledTestPaths = [ + # JSON decoding issues + "fsspec/implementations/tests/test_dbfs.py" + ]; + pythonImportsCheck = [ "fsspec" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fugashi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fugashi/default.nix index 6a8c1ac9db..264771ed5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fugashi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fugashi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "fugashi"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "polm"; repo = "fugashi"; rev = "refs/tags/v${version}"; - hash = "sha256-VDqRhJiNDbKFE284EAUS0d5T9cl8kgyHjh+r/HjjDY8="; + hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix index 8d73aa1c5e..5aa3fbcc16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "2023.7.26"; format = "wheel"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version format; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fypp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fypp/default.nix index 9504a5839e..a75e141361 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fypp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fypp/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "fypp"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "aradi"; repo = pname; rev = version; - hash = "sha256-iog5Gdcd1F230Nl4JDrKoyYr8JualVgNZQzHLzd4xe8="; + hash = "sha256-MgGVlOqOIrIVoDfBMVpFLT26mhYndxans2hfo/+jdoA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix index 4012144710..e6a12ba415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-4eYDaQwjnYCTnobXRtFrToRyxxH2N2n9sh8z7oPC2Wc="; + hash = "sha256-Lt55HUTBmrg0IX9oWUdh5zyxccViKq0X+9bhDEgUZjQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index aff899a188..423cfd34a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage -, cloudscraper , fetchFromGitHub , garth , pdm-backend , pythonOlder , requests +, withings-sync }: buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.8"; + version = "0.2.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-jNDFSA6Mz0+7UhEVrCKcKDEX3B7yk6igBf59A6YlW2M="; + hash = "sha256-wQWOksI0nfzIMdxgZehMmNytuXWD22GLUNoI7Ki0C3s="; }; nativeBuildInputs = [ @@ -27,9 +27,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cloudscraper garth requests + withings-sync ]; # Tests require a token diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garth/default.nix index 45ba76913a..20c26da372 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.38"; + version = "0.4.41"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-c+wSXADcgl7DpJJxGUus3oA4v+DmjGwjKfp0tJbcxb8="; + hash = "sha256-1CnRgPJTG7cpfa/SyhBwVw0Lj6ENI/YY/q2yNeve9c0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index c06a43b584..b62a886769 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.2.1"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-+ysm3THUet2gKHyVq0QoOxDem7ik4BK7bxVos9thExM="; + hash = "sha256-vlPAAGY6h/nV9bNOUXharm1aeKfaL7ImzbvAPlpMV5k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcsa/default.nix index 9dd8b51fd3..c4ffcabeb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "gcsa"; version = "2.1.0"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kuzmoyev"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix index 3989cf6f72..64159dd7b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "bfacdcadd7903ed6afce6168e1977e473b431677b358f8fd42e80b48cedd19ab"; + hash = "sha256-hNCQQjqIeVIEZb/peECD7ay4014rpRH6Whve8B2Pce0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix index 7ba15e9234..54b36c7de6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "geniushub-client"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "manzanotti"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-amsMZjCsPI8CUfSct4uumn8nVZDESlQFh19LXu3yb7o="; + hash = "sha256-Gq2scYos7E8me1a4x7NanHRq2eYWuU2uSUwM+O1TPb8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix index d3f45cdea7..c53dd68fb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "gentools"; - version = "1.1.0"; + version = "1.2.1"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "ariebovenberg"; repo = pname; - rev = "v${version}"; - sha256 = "1sm6cqi7fv2k3pc68r7wvvjjz8y6cjmz8bvxgqfa4v4wxibwnwrl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RBUIji3FOIRjfp4t7zBAVSeiWaYufz4ID8nTWmhDkf8="; }; propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index d216f43f76..53e1544ed0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,71 +1,78 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , packaging +, setuptools , setuptools-scm , shapely , sqlalchemy , alembic -, psycopg2 , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.13.3"; - format = "setuptools"; + version = "0.14.2"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "GeoAlchemy2"; - inherit version; - hash = "sha256-2Fp96qmiMJAXM/dBnWv/VnS4cwZR3hoH8rZCOqSSXQk="; + src = fetchFromGitHub { + owner = "geoalchemy"; + repo = "geoalchemy2"; + rev = "refs/tags/${version}"; + hash = "sha256-C/F1hpL2DnzC4UPAGGFntlQlULCx5Ufzkw7EIrzRV7I="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ - packaging - shapely sqlalchemy + packaging ]; nativeCheckInputs = [ alembic - psycopg2 pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.shapely; - pytestFlagsArray = [ - # tests require live postgis database - "--deselect=tests/test_pickle.py::TestPickle::test_pickle_unpickle" - "--deselect=tests/gallery/test_specific_compilation.py::test_specific_compilation" - ]; + env = { + SETUPTOOLS_SCM_PRETEND_VERSION = version; + }; disabledTestPaths = [ - # tests require live postgis database + # tests require live databases "tests/gallery/test_decipher_raster.py" "tests/gallery/test_length_at_insert.py" + "tests/gallery/test_insert_raster.py" + "tests/gallery/test_orm_mapped_v2.py" + "tests/gallery/test_specific_compilation.py" "tests/gallery/test_summarystatsagg.py" "tests/gallery/test_type_decorator.py" "tests/test_functional.py" "tests/test_functional_postgresql.py" + "tests/test_functional_mysql.py" "tests/test_alembic_migrations.py" + "tests/test_pickle.py" ]; pythonImportsCheck = [ "geoalchemy2" ]; + passthru.optional-dependencies = { + shapely = [ shapely ]; + }; + meta = with lib; { description = "Toolkit for working with spatial databases"; - homepage = "https://geoalchemy-2.readthedocs.io/"; + homepage = "https://geoalchemy-2.readthedocs.io/"; changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index e176a614e8..e075700ce1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8="; + hash = "sha256-mQ13fjhtFXvUnBok5bDz+zkbgfXEUmwiv77rBpYS5oo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix index b21e40c7a6..938cb99cf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , isPyPy , python @@ -7,6 +8,7 @@ , cffi , cython_3 , greenlet +, importlib-metadata , setuptools , wheel , zope_event @@ -26,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; }; + patches = [ + # Replace deprecated pkg_resources with importlib-metadata + (fetchpatch { + url = "https://github.com/gevent/gevent/commit/bd96d8e14dc99f757de22ab4bb98439f912dab1e.patch"; + hash = "sha256-Y+cxIScuEgAVYmmxBJ8OI+JuJ4G+iiROTcRdWglo3l0="; + includes = [ "src/gevent/events.py" ]; + }) + ]; + nativeBuildInputs = [ cython_3 setuptools @@ -39,6 +50,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + importlib-metadata zope_event zope_interface ] ++ lib.optionals (!isPyPy) [ @@ -50,6 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "gevent" + "gevent.events" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix index 675ea286c2..a872301643 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gios"; - version = "3.1.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7lOY8J42mRmIA18tQrmY3gNEQf6YqzbeULecrGhNwFc="; + hash = "sha256-ACWaYXAxLpqfjPG7KngFrErbMKo9iSsW2Yi8V0q9Ie0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix index 62f9fb1451..b74775a321 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TGkVDZbxxvOOal+rLHeCNUoyOzvg9wQsAMan8LDn938="; + hash = "sha256-ld+INKIGDZA2Y+sTxDPY7MI1nru6x+FeixngaJQzKkg="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 71ff271a14..7ab2855d8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "7.2.1"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-EUlqwAT+QhuRTH+9yaHWIOSCHVbh2fZVI9OFjNuQe70="; + hash = "sha256-dwBKds89CaanZA4b5I6u01Q2s23joQp5SOCjdTXn/Xc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix index 12a2e40aec..db9f369a34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.9"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-IQcUL+vVIjI/c8/GFkmw7kMmOJG/xAlxudgspC8pDvI="; + hash = "sha256-3K+mDSz4ifVYkUvhd2XDPbhh6UCY4y54YqNLoAYDsP0="; }; # Patch path to GLFW shared object diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 76bd9c572f..f497821e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.28.0"; + version = "3.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-mKtqfEpnWftpGReaUrmXf3LftZnMtEizPi4RbIwgnUM="; + hash = "sha256-MJW0B3AXDYSVgNkv8iBA2+pOKrlI7pZeJfunMMxABx8="; }; propagatedBuildInputs = [ @@ -56,6 +56,5 @@ buildPythonPackage rec { homepage = "https://github.com/globus/globus-sdk-python"; changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix index c81a9e2aa6..4e5e919323 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gocardless-pro/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.46.0"; + version = "1.48.0"; format = "setuptools"; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tfaV/pohDu7IIzDa9B3GpnzOs6U+MVoFM3YZ0ErC7zQ="; + hash = "sha256-9229lwCtVu4Pfru6e9JdbP3KUUYojBLuNQ+volP6OX0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 401508f566..38b4af1e3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.31"; + version = "0.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h5FXb8abSpyCDnaRox3J0XFLvl6V9IMcePtTZ3wbTPM="; + hash = "sha256-Uj4f3OcPRqbMaM0ADP6OlPQAXFfCYZS0/qbz9eXGLv0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 24bf908942..ecf2b36ab9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.97.0"; + version = "2.99.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SCdykYlIdqHKftQSfgVegfgeY0PO0bVEpyAK4sEZ3Nc="; + hash = "sha256-5zP9DyyHk7GgANXmmsgbG57AZltEW37YO9u7ADiXMwY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 29adb27c72..2a24f4c04b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-43UGSWSCC0ciGn4bfuH9dwUbYyPD+ePhl4X3irZ+z8U="; + hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 13f0ea961f..4785bed59f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , cachetools , cryptography +, fetchpatch , fetchPypi , flask , freezegun @@ -37,6 +38,18 @@ buildPythonPackage rec { hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; }; + patches = [ + # Although the migration to urllib3-2.0.0 is incomplete, + # the discussion in the following PR has addressed the concerns. + # https://github.com/googleapis/google-auth-library-python/pull/1290 + (fetchpatch { + name = "support-urllib3_2.patch"; + url = "https://github.com/googleapis/google-auth-library-python/commit/9ed006d02d7c9de3e6898ee819648c2fd3367c1d.patch"; + hash = "sha256-64g0GzZeyO8l/s1jqfsogr8pTOBbG9xfp/UeVZNA4q8="; + includes = [ "google/auth/transport/urllib3.py" ]; + }) + ]; + propagatedBuildInputs = [ cachetools pyasn1-modules diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 59fbcd9002..f778b745cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE="; + hash = "sha256-NITSosBPrfpIC+FqVU0B5H5MT0taEjzTcl6GW03X8yU="; }; propagatedBuildInputs = [ @@ -24,7 +24,9 @@ buildPythonPackage rec { grpc-google-iam-v1 ] ++ google-api-core.optional-dependencies.grpc; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.artifactregistry" @@ -34,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Artifact Registry API client library"; - homepage = "https://github.com/googleapis/google-cloud-python"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-artifact-registry-v${version}/packages/google-cloud-artifact-registry/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; 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 f38a83a2c0..c430d23c32 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 @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.19.1"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rmd01HHVOThqSwfnoIrTaMjxqHFuGcKAjwKp3hD4S5o="; + hash = "sha256-lJLC1igiY0OYLu3eyuOvJ2KmFr9n4su8T7LPgWlUtCk="; }; propagatedBuildInputs = [ 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 fcbddee2fd..b12ee489cc 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 @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.11.2"; + version = "2.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w4kzOe8az6zcMLoNYbfkvC5Aq5zCbSNw6+PHYZkEZqI="; + hash = "sha256-VcqQn7w2sTpDHKfniwkwsEXDa8YIV+G1jlbPOu8NVl0="; }; propagatedBuildInputs = [ 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 2ee87fac60..c955aafda5 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 @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.32.0"; + version = "2.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aU+42neWNlPhxw+mCSi0oR+vjh8VgKOQJQU6PhvM5t4="; + hash = "sha256-dpJmSe7NjmmDqd0GrLxm1e/VFvo64+ECNRVwuRpjrmI="; }; propagatedBuildInputs = [ @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Container Engine API client library"; - homepage = "https://github.com/googleapis/python-container"; - changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v${version}/packages/google-cloud-container/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 70ad014608..81a5bb0859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.5.1"; + version = "5.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+tfaWdOR/sFfGih71x1VznI3gZ2quQ4h1rEUCFHZ1DQ="; + hash = "sha256-X6nfuIQzwtDBOLfrtq3hdBA743YszQObJNU8dEjjdg0="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Dataproc API client library"; homepage = "https://github.com/googleapis/python-dataproc"; - changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v${version}/packages/google-cloud-dataproc/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index ddf8472ea7..4fe3dddd30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.3"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c4gPKov6YASVdvuU2FaYqiNn0yrJAbdieP5Qt1ZjRAs="; + hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { disabledTests = [ # Test requires credentials "test_inspect_content" + "test_list_dlp_jobs" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index ec554d61d3..0f9b9eca02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.34.1"; + version = "0.34.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; + hash = "sha256-/GG9jPBw6Hqstidi6ypa8VUHBsmIgdeurrru0RKAr9M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 0869a6e7f2..45c2570881 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.12.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pu3JsiONj9tsJkXaRV3nuo3wqaHSU4FZMqw6mMXuyc0="; + hash = "sha256-vRTS65rjWNIQWM4JHBPeoRkX4m8cQ3OKUenOqLSbTzg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 7f2b2f46d6..1622df5207 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.15.1"; + version = "2.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CGqEWjSm4QWrijpICTkupjZ6ZbKLdWHCYQFTSocF7Tc="; + hash = "sha256-PRhRAJMSraXoq/IP92GvhHS3UwYKtuC31uxHvBHysTY="; }; propagatedBuildInputs = [ 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 8298b6a07b..e7c930e77f 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 @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.3"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8yBC/+jxKsyQ5pz+VBSgnwqB/XxXCChpjGLAjMDoQow="; + hash = "sha256-KsXsWGEUwD0UFRD7V4rfqEuRjyWeU/PmPdh8X6djhG0="; }; propagatedBuildInputs = [ @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Security Command Center API API client library"; - homepage = "https://github.com/googleapis/python-securitycenter"; - changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securitycenter"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v${version}/packages/google-cloud-securitycenter/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; 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 53b865bd75..60988de324 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 @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.21.0"; + version = "2.21.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zhw5u7bysha6VqzjsIcmDpd43Rmt6e+jcAre6SWACa0="; + hash = "sha256-STU3XqrxhlblPiYxdwudV56Ay07Bs9Rt0jNG94mqAWo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index d7c11e3cad..ac134f2472 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.2"; + version = "1.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pn2ofYfcHBxAw7IK5lKqf1AGj8e+DU8W++9XVFPZ5Ws="; + hash = "sha256-ud0MLfv5Oy3AV6RdAkyMbCxM2+55txtfoekTB1eznFE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 0dcee5eea4..bc5ab67b01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.12.0"; + version = "3.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l0I8HDv2FBAvHUJ4F1oDxSPltKzWSLAKNAfQIwKqzNk="; + hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4="; }; propagatedBuildInputs = [ 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 91d97e68b0..95c2ed0662 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 @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.4"; + version = "3.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFdErlCFIDTMR7MqmxuuUNP7Cc0eIWABQYKJHvV2ZpU="; + hash = "sha256-DfgkGrJ3GZuRnKODen3oUFk2P+oOPWYAYIcL587/wEc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix index 2131255d5a..69c9180ce4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-generativeai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-zlLfA8wlXCsBXvzTHNW8y30/DvWMgf7DnpShsvjZXZ4="; + hash = "sha256-WiDoeScro7TcW5nQBmLpVQriL6IzR9CAVqBj36nqivk="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index 7a2f0de78b..31564a0536 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.2"; + version = "3.0.3"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk="; + hash = "sha256-VO/TY/QBzVFxqIumVJjw+Ic0hrqkRBS+7wQKBhcN9Jw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix index dbf098fae7..64dc4d2c71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.58.0"; + version = "1.60.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xyclHsAllH1UUYS6F+NXiED8OiSgUWoCBHntq2YEV98="; + hash = "sha256-5z67QECY20BbqV0eGuCqkcPhWnHaAxou62suI+e8Nwg="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpaw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpaw/default.nix index 913f1616a0..e359c78c66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpaw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpaw/default.nix @@ -74,13 +74,13 @@ let in buildPythonPackage rec { pname = "gpaw"; - version = "22.8.0"; + version = "23.9.1"; src = fetchFromGitLab { owner = "gpaw"; repo = pname; rev = version; - hash = "sha256-Kgf8yuGua7mcGP+jVVmbE8JCsbrfzewRTRt3ihq9YX4="; + hash = "sha256-9nnK4ksTFATO6HexnxfMiih/yoY/noyJZXZOaDG/2kc="; }; # `inetutils` is required because importing `gpaw`, as part of diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix index bea5b01ab1..9d5f406429 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix @@ -1,22 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, fetchpatch, buildPythonPackage , pkg-config -, libgphoto2 }: +, libgphoto2 +, setuptools +, toml +}: buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.4"; + version = "2.5.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c="; + hash = "sha256-l9B6PEIGf8rkUlYApOytW2s9OhgcxMHVlDgfQR5ZnoA="; }; - nativeBuildInputs = [ pkg-config ]; + # only convert first 2 values from setuptools_version to ints to avoid + # parse errors if last value is a string. + patches = fetchpatch { + url = "https://github.com/jim-easterbrook/python-gphoto2/commit/d388971b63fea831eb986d2212d4828c6c553235.patch"; + hash = "sha256-EXtXlhBx2jCKtMl7HmN87liqiHVAFSeXr11y830AlpY="; + }; + + nativeBuildInputs = [ pkg-config setuptools toml ]; buildInputs = [ libgphoto2 ]; doCheck = false; # No tests available + pythonImportsCheck = [ "gphoto2" ]; + meta = with lib; { description = "Python interface to libgphoto2"; homepage = "https://github.com/jim-easterbrook/python-gphoto2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix index 9fd2c80c3c..ea2c09eed4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gptcache/default.nix @@ -4,12 +4,14 @@ , cachetools , numpy , pythonOlder +, redis +, redis-om , requests }: buildPythonPackage rec { pname = "gptcache"; - version = "0.1.37"; + version = "0.1.42"; format = "setuptools"; disabled = pythonOlder "3.8.1"; @@ -18,12 +20,14 @@ buildPythonPackage rec { owner = "zilliztech"; repo = "GPTCache"; rev = "refs/tags/${version}"; - hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w="; + hash = "sha256-rrPs5ZwBooltVcvrs4AHObx69xmZ8F+IP/lJGPVTNXY="; }; propagatedBuildInputs = [ cachetools numpy + redis + redis-om requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix index beada3b4a3..8952e84c5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gpustat"; - version = "1.1"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yPwQVASqwRiE9w7S+gbP0hDTzTicyuSpvDhXnHJGDO4="; + hash = "sha256-wY0+1VGPwWMAxC1pTevHCuuzvlXK6R8dtk1jtfqK+dg="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix index c09b55496b..19474d8d9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix @@ -48,12 +48,12 @@ , torch , tqdm , transformers -, vega_datasets +, vega-datasets }: buildPythonPackage rec { pname = "gradio"; - version = "3.43.1"; + version = "3.44.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -62,7 +62,7 @@ buildPythonPackage rec { # and has more frequent releases compared to github tags src = fetchPypi { inherit pname version; - hash = "sha256-a8eHw8jedrse1dpgup9BL60oXx4wvOk8X5z5DP1DWOs="; + hash = "sha256-3mXs9PwlzUo89VosBWtnsOzDQf/T22Yv7s5j6OLLp3M="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -118,7 +118,7 @@ buildPythonPackage rec { torch tqdm transformers - vega_datasets + vega-datasets ]; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix index 37c2893908..16217cd23a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "graphql-server-core"; version = "2.0.0"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grappelli-safe/default.nix similarity index 63% rename from third_party/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/grappelli-safe/default.nix index 33b4c437dd..916ac60647 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grappelli-safe/default.nix @@ -1,17 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { version = "1.1.1"; - pname = "grappelli_safe"; + pname = "grappelli-safe"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "ee34b3e2a3711498b1f8da3d9daa8a1239efdf255a212181742b6a5890fac039"; + pname = "grappelli_safe"; + inherit version; + hash = "sha256-7jSz4qNxFJix+No9naqKEjnv3yVaISGBdCtqWJD6wDk="; }; + nativeBuildInputs = [ + setuptools + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "grappelli_safe" + ]; + meta = with lib; { description = "A snapshot of django-grappelli for the Mezzanine CMS"; longDescription = '' @@ -26,9 +43,8 @@ buildPythonPackage rec { ''; homepage = "https://github.com/stephenmcd/grappelli-safe"; downloadPage = "http://pypi.python.org/pypi/grappelli_safe/"; - license = licenses.free; + changelog = "https://github.com/stephenmcd/grappelli-safe/releases/tag/v${version}"; + license = licenses.bsd3; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.unix; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index 5ea1e5c55e..afc5b2edad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "2.0.1"; + version = "3.2.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - hash = "sha256-EmbCA4JpY2OIwXrRWjBxA4iNm0ddQODjoGmHIYgvAWs="; + hash = "sha256-yXhEI/8qm526D+Ehqqfb+j+sbbh83Q4OWC+UM7cgCjU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix index 38f9dea754..3b6e9f6f0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeneye-monitor"; - version = "5.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jkeljo"; repo = "greeneye-monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-HU+GWO08caKfQZ0tIDmJYAML4CKUM0CPukm7wD6uSEA="; + hash = "sha256-zNGizNOuZuPRdz82y8IaVvwrTos4lZSqTP5FwOlnRao="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix index 3c5049a8a6..8b885133cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix @@ -1,32 +1,56 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy + +# build-system +, setuptools + +# tests , objgraph , psutil -, pytestCheckHook +, python +, unittestCheckHook }: - -buildPythonPackage rec { +let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "2.0.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-58jcE699sJe+1koFHS3Unp8K9JXCaZXACp7oQmkNNMA="; + hash = "sha256-gWvZSIqUy6eNk+GrtYAA6CZvqcwqqczdbrBpasskAFs="; }; + nativeBuildInputs = [ + setuptools + ]; + + # tests in passthru, infinite recursion via objgraph/graphviz + doCheck = false; + nativeCheckInputs = [ objgraph psutil - pytestCheckHook + unittestCheckHook ]; - doCheck = false; # installed tests need to be executed, not sure how to accomplish that + preCheck = '' + pushd ${placeholder "out"}/${python.sitePackages} + ''; + + unittestFlagsArray = [ + "greenlet.tests" + ]; + + postCheck = '' + popd + ''; + + passthru.tests.pytest = greenlet.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { + changelog = "https://github.com/python-greenlet/greenlet/blob/${version}/CHANGES.rst"; homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = with licenses; [ @@ -34,4 +58,5 @@ buildPythonPackage rec { mit ]; }; -} +}; +in greenlet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greynoise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greynoise/default.nix index 98247e8903..ada5f40962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greynoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greynoise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { version = "2.0.1"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 959c9d39b3..63d985326e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.4"; + version = "0.38.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H4iKxM6uwpAIISSxm4ux+qXsoPfHmpHBRx5MuGxwCE4="; + hash = "sha256-GhohFO5tHb9ByISPUf4U2MrDATE4WjuekcC9QZaP2Ls="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix index 2e3b8b894c..f827c85081 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.58.0"; + version = "1.59.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NWhuF3z+FGHJ+d99r+Uq4iTIppXkgwQYu0ASIyE8DB0="; + hash = "sha256-apOnMd8EDU+ocj6fL/dkl3tqh6en/Q8H9K/lgvkqFN8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix index c202a1f7c6..4c028e4ec7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.56.2"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XNodihNovizaBPkoSotzzuCf8+J37sjd2avPL+92s3I="; + hash = "sha256-4CIcpupsITlhQXmAi4+LMjA30LG977D8TN2agUmZVx4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix index 2bd0c72151..cd0506870a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.58.0"; + version = "1.59.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-5gSKdY0XtsoXBSWOfuXZJtKWCpWuCLoJKd0jPlBazT0="; + hash = "sha256-l5bcvFnc+59tVGXVnn+mKld3o+TVqolPRIVciWpG+os="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index 991549ea9e..e7d6fd5509 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.57.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sJjamd8e6+WDN/j3jlDfmQJzzKzBIm/d60fFkOPfngI="; + hash = "sha256-+TucM+CiYWLvhDG/z/zD4fshfM2Ne1swYbbp+BPmmLU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix index 9e7b61e12b..bb3024d440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.57.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xFMqJlY+Ehn0K3bXqdiGEvL2X3Pm7IPhHHPWTi8ecOk="; + hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index 78e3cdaae7..cd0b0abcb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.57.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LxYTDYac4n7NYjGUVHtkndZXMz7H6GRMxXHGRXgam4U="; + hash = "sha256-qkAY8thmKsTZgwRF09JToRs+CW6K/iCGVUcTeqEWDpM="; }; postPatch = '' 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 922a892be5..3040102f87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YeMdBELr5kfymVUEE8+cqGLgOPBqbbD+vh1e9XbRLB8="; + hash = "sha256-ceoHHEX44DrVgatV2EIS6gT9oVZkAx6OTFMZG/x4q64="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 285a552ac9..f71690c877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.11.3"; + version = "5.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-O6uhT8zfCGiGr0v8pEMZ4uLuDAdFpiTie7EC3rphZQI="; + hash = "sha256-v6kpje5rw3/OfcoMWdSCZdkmETyIJ08cly8lLUt9j64="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 30619532a4..56b79e8c08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.8.2"; + version = "1.8.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-qz4EWAO++yq72/AGwyNOtH/fTRSFbiCo/K98htROUxI="; + hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8="; }; # It's used to locate headers 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 efa4fba851..abc5d52ece 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.5"; + version = "1.22.6"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-vwUjJBXPYBgUKuUd07iXu3NDJoe1zheGv0btximM5bA="; + hash = "sha256-Ud4tbROxLOCV6sl8C5TuWcKuujcSu3Rit4xNV93hdsU="; }; # Python 2.x is not supported. @@ -48,7 +48,7 @@ buildPythonPackage rec { mesonFlags = [ "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" # Exec format error during configure - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix index aaf2886d81..bfdc1b0aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5dM/PzIA8qtw0RepTKmHpqBwYMRwNLhWuEC0aBGL3U="; + hash = "sha256-M/RbNw5SJb1R78MDTqBHNWE0I/9PlqikrrJAy1r02f8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix index c47fb6a804..65d7c2622a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.3"; + version = "3.1.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - hash = "sha256-i3WqXlNnNhBVw9rdnxnzQISFkZHBpc/gqG+rxOWPiyc="; + hash = "sha256-RMWIP4tVSCCEQpr0kZvsN1HwL6rBcLuubfBl175eSNg="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix similarity index 52% rename from third_party/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix index 6f765bd98d..48d87c8dd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guzzle-sphinx-theme/default.nix @@ -1,22 +1,37 @@ -{ lib, buildPythonPackage, sphinx, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, sphinx +}: buildPythonPackage rec { - pname = "guzzle_sphinx_theme"; + pname = "guzzle-sphinx-theme"; version = "0.7.11"; + pyproject = true; + src = fetchPypi { - inherit pname version; - sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; + pname = "guzzle_sphinx_theme"; + inherit version; + hash = "sha256-m4wWOcNDwCw/PbffZg3fb1M7VFTukqX3sC7apXP+0+Y="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = false; # no tests propagatedBuildInputs = [ sphinx ]; + pythonImportsCheck = [ + "guzzle_sphinx_theme" + ]; + meta = with lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 4b5498396d..7cb78248c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.9.0"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W49jmFwLrCu8NhQ65ll3iu+QbnHBA5sCeUgSLYLrui0="; + hash = "sha256-ZwImkTYYSscmGJYCpMWmZjToi41XjT4Znpo8j66BKIs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix index 680e94028c..1c97861f1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix @@ -1,29 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , h5py , pytestCheckHook , netcdf4 , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "h5netcdf"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kyw7Vzvtc3Dr/J6ALNYPGk2lI277EbNu7/iXMk12v1Y="; + hash = "sha256-f2snM73gbqJXW3mmRQ2b1cOJGP9MsqNVvyK76Mhsa88="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 427caf0211..3fb20fad4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -21,7 +21,7 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.8.0"; + version = "3.9.0"; pname = "h5py"; format = "pyproject"; @@ -29,7 +29,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-b+rYLwxAAM841T+cAweA2Bv6AiAhiu4TuQt3Ack32V8="; + hash = "sha256-5gTbZSHB42fGvX+tI5yEf1PMRmRvLSZRNy0Frl6V+Bc="; }; # avoid strict pinning of numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix index 3ea0b24f06..bd92a27122 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hacking"; - version = "5.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qzWyCK8/FHpvlZUnMxw4gK5BrCHMzra/1oqE9OtW4CY="; + hash = "sha256-YdeEb8G58m7CFnjpkHQmkJX5ZNe72M1kbrbIxML4jcE="; }; postPatch = '' 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 20cdce6f98..653bf6a4b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.10.6"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uNf98q4x1usoYWvbDKt2yuTObyUjGgy7aK+VRrpM8wI="; + hash = "sha256-QslmtmS7zrc0Vbq4XEzbx1XaeL0SuhNjyT3OPlCCf04="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index 3364e3e64a..0bb7f35e28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.8.0"; + version = "4.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/${version}"; - hash = "sha256-1NLLNE4LgV0r45nc21xCAAaKuH6bQm2YQWlxzhgajSI="; + hash = "sha256-nnh8PSEcuPN1qGuInJ7uYe83zdne8axbTrHd4g1xoJs="; }; propagatedBuildInputs = [ 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 b93ddbaf1d..e27ef7ffce 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 @@ -4,12 +4,15 @@ , atomicwrites-homeassistant , attrs , buildPythonPackage +, ciso8601 +, cryptography , fetchFromGitHub , pycognito , pytest-aiohttp , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , snitun , syrupy , xmltodict @@ -17,16 +20,16 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.71.0"; - format = "setuptools"; + version = "0.74.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2v8LEVYY7PEzcIMaXcy9h+8O2KrU0zTKyZb2IrO35JQ="; + hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8="; }; postPatch = '' @@ -36,11 +39,17 @@ buildPythonPackage rec { --replace "snitun==" "snitun>=" \ ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ acme aiohttp atomicwrites-homeassistant attrs + ciso8601 + cryptography pycognito snitun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 8ce6f73c54..fe64197781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hatch-jupyter-builder"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; rev = "refs/tags/v${version}"; - hash = "sha256-Ns5jrVfTAA7NuvUok3/13nIpXSSVZ6WRkgHyTuxkSKA="; + hash = "sha256-UywhFJ8d1+lSFOF5ECsknDeQuO7ppckdy5IqAT14ius="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix index ed849eaa52..806bffe56c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatch-nodejs-version"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "agoose77"; repo = "hatch-nodejs-version"; rev = "refs/tags/v${version}"; - hash = "sha256-txF392XiRqHndTEYw6QVk12Oqw9E6cOwF81hUyp2oh4="; + hash = "sha256-hknlb11DCe+b55CfF3Pr62ccWPxVrjQ197ZagSiH/zU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix index af74b15b02..a6246b3a47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hatch-requirements-txt"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "repo-helper"; repo = "hatch-requirements-txt"; rev = "refs/tags/v${version}"; - hash = "sha256-Gyt5Fs8uqVe0cOKtxFeg1n1WMyeK5Iokh71ynb2i5cM="; + hash = "sha256-qk+70o/41BLxCuz3SOXkGYSEmUZOG1oLYcFUmlarqmY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 973e30668d..336f8ed962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.29.1"; + version = "1.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yqwWuRip/QmWqn7Gm3Fth46DooNGhJGLQbnsJE/67bg="; + hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index 1971516a00..89f01e29d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.28"; + version = "0.8.33"; src = fetchPypi { inherit pname version; - hash = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; + hash = "sha256-V/q8Xw5F9I0kB7NccxGSq8iWN2QR/n5LuDb/oD04+Q0="; }; patches = [ # should be included in next release @@ -59,6 +59,5 @@ buildPythonPackage rec { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix index 5d231b2b0a..c5a1ad4141 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.1.3"; + version = "4.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0emCZ+r5dCRBT2xaNsgYskcGcLF/9Jf6K7FFi/PA+60="; + hash = "sha256-xOSGykG6D2Am/gnAPoqLOvIQz6FfxRQe9lPyRHxUoew="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix index 45bd4faf44..9b9268c13e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "hdfs"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "mtth"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KXJDQEc4+T9r8sB41SOgcx8Gth3qAOZceoOpsLbJ+ak="; + hash = "sha256-Pm2E8hB0wbu7npi/sLt9D8jQsH69qNOHLji9CYqST/8="; }; propagatedBuildInputs = [ docopt requests six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix index 7cb1daa10c..1a71c5d179 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/heatzypy/default.nix @@ -5,28 +5,34 @@ , requests , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "heatzypy"; - version = "2.1.5"; - format = "setuptools"; + version = "2.1.9"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Cyr-ius"; - repo = pname; + repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-Z60apquRzhkPbxgGKgDswtW9GUXGt9MbdAsh3Yh31b0="; + hash = "sha256-O2HtCaNtBvjhjlSXLRhEuilI8z7nGgzFa8USYiHfZ+E="; }; postPatch = '' - # https://github.com/Cyr-ius/heatzypy/issues/7 - substituteInPlace setup.py \ - --replace 'version="replace_by_workflow"' 'version="${version}"' + substituteInPlace pyproject.toml \ + --replace "replace_by_workflow" "${version}" ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp requests @@ -40,8 +46,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python module to interact with Heatzy devices"; + description = "Module to interact with Heatzy devices"; homepage = "https://github.com/Cyr-ius/heatzypy"; + changelog = "https://github.com/cyr-ius/heatzypy/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/help2man/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/help2man/default.nix new file mode 100644 index 0000000000..38cff88b4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/help2man/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, jinja2 +, setuptools-scm +, shtab +, tomli +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "help2man"; + version = "0.0.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "help2man"; + rev = version; + hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + jinja2 + setuptools-scm + shtab + tomli + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "help2man" ]; + + meta = with lib; { + description = "Convert --help and --version to man page"; + homepage = "https://github.com/Freed-Wu/help2man"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "help2man"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 1e914096f7..cfb79f88b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "11.0.2"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-qDURFcDm7zvDEv1Z+aoXtFfbilul6q6KlkjBvhkeYkM="; + hash = "sha256-sMvHvHwLuMT0LaH2XFDePuePbwCXjvl66QGdERR0k6g="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix deleted file mode 100644 index 9d6a4cece1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, python, nose, mercurial }: - -buildPythonPackage rec { - pname = "python-hglib"; - version = "2.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2"; - }; - - patches = [ - (substituteAll { - src = ./hgpath.patch; - hg = "${mercurial}/bin/hg"; - }) - - # These two patches are needed to fix the tests. - # They will need to be removed on the next update. - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/python-hglib/raw-rev/12e6aaef0f6e"; - sha256 = "159pmhy23gqcc6rkh5jrni8fba4xbhxwcc0jf02wqr7f82kv8a7x"; - }) - (fetchpatch { - url = "https://www.mercurial-scm.org/repo/python-hglib/raw-rev/1a318162f06f"; - sha256 = "04lxfc15m3yw5kvp133xg8zv09l8kndi146xk3lnbbm07fgcnn1z"; - }) - ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v - ''; - - meta = with lib; { - description = "Mercurial Python library"; - homepage = "http://selenic.com/repo/python-hglib"; - license = licenses.mit; - maintainers = with maintainers; [ dfoxfranke ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch deleted file mode 100644 index 2141aa32a1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 2d0ec6097d78 hglib/__init__.py ---- a/hglib/__init__.py Mon Apr 30 15:43:29 2018 +0900 -+++ b/hglib/__init__.py Tue Mar 19 23:30:01 2019 +0100 -@@ -1,7 +1,7 @@ - import subprocess - from hglib import client, util, error - --HGPATH = 'hg' -+HGPATH = '@hg@' - - def open(path=None, encoding=None, configs=None): - '''starts a cmdserver for the given path (or for a repository found -diff -r 2d0ec6097d78 tests/common.py ---- a/tests/common.py Mon Apr 30 15:43:29 2018 +0900 -+++ b/tests/common.py Tue Mar 19 23:30:01 2019 +0100 -@@ -26,7 +26,7 @@ - os.mkdir(self._testtmp) - os.chdir(self._testtmp) - # until we can run norepo commands in the cmdserver -- os.system('hg init') -+ os.system('@hg@ init') - self.client = hglib.open() - - def tearDown(self): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index 0f3f8ae660..164a9b869e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -1,36 +1,66 @@ { lib , buildPythonPackage -, convertdate , fetchFromGitHub -, hijri-converter -, korean-lunar-calendar -, pytestCheckHook -, python-dateutil , pythonOlder + +# build-system +, setuptools + +# l10n +, polib +, lingua +, chameleon + +# dependencies +, python-dateutil + +# tests +, importlib-metadata +, pytestCheckHook }: buildPythonPackage rec { pname = "holidays"; - version = "0.29"; - format = "setuptools"; + version = "0.36"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dr-prodigy"; repo = "python-holidays"; - rev = "refs/tags/v.${version}"; - hash = "sha256-ijhqu0LzQzpjDSe9ZjNhgdjq/DJuD7oVbRTLX97nGHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-pYlirojeHi10kUcjcvpfBYpIzbYmIlFgOLfy7WRhACU="; }; - propagatedBuildInputs = [ - convertdate - python-dateutil - hijri-converter - korean-lunar-calendar + nativeBuildInputs = [ + setuptools + + # l10n + lingua + chameleon + polib ]; + postPatch = '' + patchShebangs scripts/l10n/*.py + ''; + + preBuild = '' + # make l10n + ./scripts/l10n/generate_po_files.py + ./scripts/l10n/generate_mo_files.py + ''; + + propagatedBuildInputs = [ + python-dateutil + ]; + + doCheck = false; + nativeCheckInputs = [ + importlib-metadata + polib pytestCheckHook ]; @@ -46,9 +76,9 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; - changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; + changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ fab jluttine ]; }; } 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 f2008520e1..47f30ce2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.17.1"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yjDGYVCLIunowRnbw+Sl2FGYe0PDBWXbGAspHY/XcKQ="; + hash = "sha256-urcpYat6GHlNsmk1HZBVI/Kq3K1ZOzIVEpJ86T3J35E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index a0833b2079..c5cd3d2e4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.3"; + version = "1.10.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-77RrqmoCftPc48fFtuuFo0KqGX3n+6aDx2RFkwGCNzQ="; + hash = "sha256-7gkesxQI6QBxyQpHlSSh1w6MDeid0dSdXn+jnxvafD0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index d91b01f52c..86c01c1252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.6.0"; + version = "2023.10.2"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; + hash = "sha256-wAXxz0BryZ6i0yaqNp74PfApwMHYQuSLz5prJEiG1YE="; }; propagatedBuildInputs = [ @@ -25,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "chip.clusters" + "chip.clusters.ClusterObjects" + "chip.tlv" ]; doCheck = false; # no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix index ea6dc79d51..91cc9c65b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.6.0"; + version = "2023.10.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA="; + hash = "sha256-KBFXFD5cSVgE57S1cHghU3kPDrbRquAARN95UriPCnM="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; + hash = "sha256-9x7pjgERvsBuyol8LiuPOlFZ5Up92N9HYg1mH9/0HAU="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -78,12 +78,17 @@ buildPythonPackage rec { pygobject3 ]; + pythonNamespaces = [ + "chip" + "chip.clusters" + ]; + pythonImportsCheck = [ "chip" "chip.ble" - # https://github.com/project-chip/connectedhomeip/pull/24376 - #"chip.configuration" + "chip.configuration" "chip.discovery" + "chip.exceptions" "chip.native" "chip.storage" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 2cdb4b76df..f0260f04d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.15"; + version = "1.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-wetkcHtm5O6mxhyU3/E4yrv6UGHAdKUlae2wJdCXtJI="; + hash = "sha256-rvjdhsvGYllVeenVkU/ikwil4OVHPRIaXs+85q0pM/w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/horizon-eda/default.nix new file mode 100644 index 0000000000..d2385e190e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/horizon-eda/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, callPackage +, horizon-eda +, mesa +, pycairo +, python +, pythonOlder +}: + +let + base = horizon-eda.passthru.base; +in +buildPythonPackage { + inherit (base) pname version src meta CASROOT; + + pyproject = false; + + disabled = pythonOlder "3.9"; + + buildInputs = base.buildInputs ++ [ + mesa + mesa.osmesa + python + ]; + + propagatedBuildInputs = [ + pycairo + ]; + + nativeBuildInputs = base.nativeBuildInputs; + + buildFlags = ["pymodule"]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python.sitePackages} + cp build/horizon.so $out/${python.sitePackages} + + runHook postInstall + ''; + + enableParallelBuilding = true; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix new file mode 100644 index 0000000000..ae13f6585a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, beautifulsoup4 +, html5lib +, requests +, fusepy +}: + +buildPythonPackage rec { + pname = "htmllistparse"; + version = "0.6.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bcimvwPIQ7nTJYQ6JqI1GnlbVzzZKiybgnFiEBnGQII="; + }; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ beautifulsoup4 html5lib requests fusepy ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "htmllistparse" + ]; + + meta = with lib; { + homepage = "https://github.com/gumblex/htmllisting-parser"; + description = "Python parser for Apache/nginx-style HTML directory listing"; + license = licenses.mit; + maintainers = with maintainers; [ hexchen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index 570b75eddc..cc15e00748 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -1,43 +1,40 @@ { lib -, brotlipy +, brotlicffi , buildPythonPackage , decorator -, fetchpatch , fetchPypi , flask , flask-limiter +, flasgger , itsdangerous , markupsafe , raven , six , pytestCheckHook +, setuptools , werkzeug }: buildPythonPackage rec { pname = "httpbin"; - version = "0.7.0"; - format = "setuptools"; + version = "0.10.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; + hash = "sha256-e4WWvrDnWntlPDnR888mPW1cR20p4d9ve7K3C/nwaj0="; }; - patches = [ - (fetchpatch { - # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility - # https://github.com/postmanlabs/httpbin/pull/674 - url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; - hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ - brotlipy + brotlicffi decorator flask flask-limiter + flasgger itsdangerous markupsafe raven @@ -49,10 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "test_httpbin.py" - ]; - disabledTests = [ # Tests seems to be outdated "test_anything" @@ -70,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP Request and Response Service"; - homepage = "https://github.com/kennethreitz/httpbin"; + homepage = "https://github.com/psf/httpbin"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index 9f3905f551..91cd904e3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , certifi , fetchFromGitHub +, hatchling +, hatch-fancy-pypi-readme , h11 , h2 , pproxy @@ -20,8 +22,8 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.17.2"; - format = "setuptools"; + version = "0.18.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,9 +31,14 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qAoORhzBbjXxgtzTqbAxWBxrohzfwDWm5mxxrgeXt48="; + hash = "sha256-UEpERsB7jZlMqRtyHxLYBisfDbTGaAiTtsgU1WUpvtA="; }; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + ]; + propagatedBuildInputs = [ anyio certifi @@ -57,18 +64,19 @@ buildPythonPackage rec { ] ++ passthru.optional-dependencies.http2 ++ passthru.optional-dependencies.socks; - pythonImportsCheck = [ - "httpcore" + disabledTests = [ + # https://github.com/encode/httpcore/discussions/813 + "test_connection_pool_timeout_during_request" + "test_connection_pool_timeout_during_response" + "test_h11_timeout_during_request" + "test_h11_timeout_during_response" + "test_h2_timeout_during_handshake" + "test_h2_timeout_during_request" + "test_h2_timeout_during_response" ]; - preCheck = '' - # remove upstreams pytest flags which cause: - # httpcore.ConnectError: TLS/SSL connection has been closed (EOF) (_ssl.c:997) - rm setup.cfg - ''; - - pytestFlagsArray = [ - "--asyncio-mode=strict" + pythonImportsCheck = [ + "httpcore" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix index 22b6918bcc..43f69ecd3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix @@ -106,6 +106,11 @@ buildPythonPackage rec { "test_valid_xml" "test_xml_format_options" "test_xml_xhtm" + # httpbin compatibility issues + "test_compress_form" + "test_binary_suppresses_when_terminal" + "test_binary_suppresses_when_not_terminal_but_pretty" + "test_binary_included_and_correct_when_suitable" ] ++ lib.optionals stdenv.isDarwin [ # flaky "test_daemon_runner" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix index 83d427c73e..8d8a5e838b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , httpx , pyspnego , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "httpx-ntlm"; - version = "1.1.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,18 +16,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "httpx_ntlm"; inherit version; - hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I="; + hash = "sha256-Qb6KK6hRQ0hOYX3LkX1LGeOuEq/caIYipJAQNJk7U+Q="; }; - patches = [ - # Update version specifiers, https://github.com/ulodciv/httpx-ntlm/pull/15 - (fetchpatch { - name = "update-version-specifiers.patch"; - url = "https://github.com/ulodciv/httpx-ntlm/commit/dac67a957c5c23df29d4790ddbc7cc4bccfc0e35.patch"; - hash = "sha256-YtgRrgGG/x7jvNg+NuQIrkOUdyD6Bk53fRaiXBwiV+o="; - }) - ]; - propagatedBuildInputs = [ httpx pyspnego @@ -44,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "NTLM authentication support for HTTPX"; homepage = "https://github.com/ulodciv/httpx-ntlm"; + changelog = "https://github.com/ulodciv/httpx-ntlm/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix index 992ddf1c69..75be71df04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.6"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rLcYC8IO2eCWAL4QIiUg/kyigybq6VNTUjNDXx4KPHc="; + hash = "sha256-3Dj+rrH5Pil5xQE6sAAD5RTycwlKq+TVsAeB2NVqGjY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 11204ec8b9..7e451532af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qG6fgijNgQKjpSG6sg0+0yqeAU6qV7czR8NgWe63LIg="; + hash = "sha256-zQVavjU66ksO0FB1h32e0YUhOGiQ4jHPvjgLhtxjU6s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix index 2ef88e7bf4..0b0b02b097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huey/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "A little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; - maintainers = [ maintainers.globin ]; + maintainers = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 9fc7e65746..aa11d109db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.16.4"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-fWvEvYiaLiVGmDdfibIHJAsu7nUX+eaE0QGolS3LHO8="; + hash = "sha256-/KbD3TNSbQ9ueXYFLoXnIRIoi/y3l0w72GZ1+JC8ULk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix index da287226ff..11f37dcac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - hash = "sha256-FcEb13XY+YCVt0W05lihfCXIbjtzJ1yuiWrByNUzyxg="; + hash = "sha256-GLFlPZgyyfjn00AZhsfnryrmeDYWvgvEBr/gsUE0pcY="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 7f8c9c5bea..6fe3968971 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; + hash = "sha256-x4bj36HzUjmBDlMXzMrb41j0m4yQAaHy9ot5olC5+KE="; }; nativeBuildInputs = [ 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 39e7f58359..5047eb68ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.8.4"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7/X9qXExNKwN89JkihGJfuQKCbGiVhrTMBiALhi4fCI="; + hash = "sha256-BkxnV90QxJjQYqN0DdjGbjPmNDaDN9hUBjO7nQte7eg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hwdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hwdata/default.nix new file mode 100644 index 0000000000..9e73fb6101 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hwdata/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkgs +, setuptools +}: + +buildPythonPackage rec { + pname = "hwdata"; + version = "2.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xsuchy"; + repo = "python-hwdata"; + rev = "python-hwdata-${version}-1"; + hash = "sha256-hmvxVF9LOkezXnJdbtbEJWhU4uvUJgxQHYeWUoiniF0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + patchPhase = '' + substituteInPlace hwdata.py --replace "/usr/share/hwdata" "${pkgs.hwdata}/share/hwdata" + ''; + + pythonImportsCheck = [ + "hwdata" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Python bindings to hwdata"; + homepage = "https://github.com/xsuchy/python-hwdata"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lurkki ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix index 49638e8258..ad6ae8dbd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -1,41 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , hypothesis , poetry-core , pydantic , pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "hypothesis-auto"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; + pname = "hypothesis_auto"; + inherit version; + hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - patches = [ - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/timothycrosley/hypothesis-auto/commit/8277b4232617c0433f80e9c2844452b9fae67a65.patch"; - hash = "sha256-/0z0nphtQnUBiLYhhzLZT59kQgktSugaBg+ePNxy0qI="; - }) - ]; - - postPatch = '' - # https://github.com/timothycrosley/hypothesis-auto/pull/20 - substituteInPlace pyproject.toml \ - --replace 'pydantic = ">=0.32.2<2.0.0"' 'pydantic = ">=0.32.2, <2.0.0"' \ - --replace 'hypothesis = ">=4.36<6.0.0"' 'hypothesis = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -50,6 +36,10 @@ buildPythonPackage rec { "hypothesis_auto" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index a5692c6315..4cc5aab3bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.68.2"; + version = "6.84.3"; outputs = [ "out" ]; format = "setuptools"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-SgX8esTyC3ulFIv9mZJUoBA5hiv7Izr2hyD+NOudkpE="; + hash = "sha256-wymZ/tJBGcP57B3BuDlBT7kbUxNwW4/SSmvwLSa5PvM="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix index 223ef9fe7a..709c7180f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.3.2"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "neurodata"; repo = pname; - rev = "v${version}"; - hash = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; + rev = "refs/tags/v${version}"; + hash = "sha256-QRE3oSxTEobTQ/7DzCAUOdjzIZmWUn9bgPmJWj6JuZg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index c228a934bd..e8671529be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.7"; + version = "3.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qYXxR+jXjMfqrxJ62j5do33EbjfeoYSq+IeMrO14FnQ="; + hash = "sha256-lIpUG/Z8pVdQnSBvWyaAxfBxhyQQDBKRSi/zr3qtSV0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix index c69df0352c..8da513c5b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM="; + hash = "sha256-ewKQzjtVgx9c6h67epgFNhY4MjR7kFNCr4EKZ+UF2xA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 0fd19ff249..c1237dc588 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -6,11 +6,11 @@ , python-dateutil , pytz , hypothesis -, pytest +, pytestCheckHook }: buildPythonPackage rec { - version = "5.0.7"; + version = "5.0.10"; pname = "icalendar"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-fblcbyctnvd7DOc+tMWzg+90NHzZvH5xiY6BfJakQVo="; + hash = "sha256-sRsUjNClJ58kmCRiwSe7oq20eamj95Vwy/o0xPU8qPw="; }; propagatedBuildInputs = [ @@ -30,9 +30,11 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest + pytestCheckHook ]; + pytestFlagsArray = [ "src/icalendar" ]; + meta = with lib; { changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index 07449e0cce..5e963bd82e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "3.0.3"; + version = "3.0.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - hash = "sha256-EQyu7lV8F/U8cZklYYIMk9ut1FTcoBvGc8Ggx6JerDk="; + hash = "sha256-PnBcGiUvftz/KYg9Qd2GaIcF3OW4lYH301uI5/M5CBI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix index 3429aa52cc..76e1814ddd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.3"; + version = "2.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kLi00Yf/UkSaBTvc+GlgTw263M2SMkyzADnQYLbsMfw="; + hash = "sha256-zuaS9mmq47hUIBObYRuzEYQQdTArFXR3TpK9nfZt/yk="; }; preCheck = '' @@ -50,6 +50,13 @@ buildPythonPackage rec { # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" + # those tests seems to simply re-run some typeguard tests + "tests/test_typeguard.py" + ]; + + pytestFlagsArray = [ + # RuntimeWarning: coroutine '*' was never awaited + "-W" "ignore::RuntimeWarning" ]; pythonImportsCheck = [ "icontract" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix index 8fb0b0c4d0..7e9c676349 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.10.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-aCAtZsHH1tkti2A7OWw9rV4vij1n6T+R8nMa/MRZuF8="; + hash = "sha256-mAczHrFEH1LEH1IEUc7ZXTWtaPBrvIdSvkUqOCupyRs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 891d03cfc0..d53408aa1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.30"; + version = "2.5.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e3+yjd3jrcv4hU+0vCTl+bAzlYcfTdhLHr93briFxdI="; + hash = "sha256-rov80COnU8e6NXwHkafGGbJyhDTMLUSwxkmjmlw8QYU="; }; nativeCheckInputs = [ 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 e2c945c283..eb1c71601c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "210410"; + version = "230915"; format = "other"; src = fetchFromGitHub { owner = "IfcOpenShell"; repo = "IfcOpenShell"; - rev = "blenderbim-${version}"; + rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "1g52asxrqcfj01iqvf03k3bb6rg3v04hh1wc3nmn329a2lwjbxpw"; + sha256 = "sha256-dHw+5AlJbeuUeaxv7eE2XfLjR/K5S00dMSCtoWVcEB8="; }; nativeBuildInputs = [ gcc10 cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 054309a525..853405d047 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cLlPUPzYyOpqk4qHsn22s3Xr/VkGjnHL4JVw2qy2iTc="; + hash = "sha256-+olp+zphcHMvcGKHt0JhxXza1wd7UiydwVFnSQ310Vg="; }; nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix index f73b77699c..e85f78d4ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.8"; + version = "0.11.2"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; format = "setuptools"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-EpWkFKN8fhKkzR2g9Uv0/LxSwi4TkraH5rjde7yR+C8="; + hash = "sha256-evYnUv2PWO+LbVBBQPa708dQb8Wq8SQ92bJ6clQNV/g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix new file mode 100644 index 0000000000..b56459317f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, swig +, wheel +, msgpack +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ihm"; + version = "0.41"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ihmwg"; + repo = "python-ihm"; + rev = "refs/tags/${version}"; + hash = "sha256-weeOizVWFcOxD45QsvEaoknTofZjglCvidyvXpyRKwc="; + }; + + nativeBuildInputs = [ + setuptools + swig + wheel + ]; + + propagatedBuildInputs = [ + msgpack + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # requires network access + "test_validator_example" + ]; + + pythonImportsCheck = [ "ihm" ]; + + meta = with lib; { + description = "Python package for handling IHM mmCIF and BinaryCIF files"; + homepage = "https://github.com/ihmwg/python-ihm"; + changelog = "https://github.com/ihmwg/python-ihm/blob/${src.rev}/ChangeLog.rst"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix index 519ac772a5..ff7c654c9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "image-go-nord"; - version = "0.1.5"; + version = "0.1.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Schrodinger-Hat"; repo = "ImageGoNord-pip"; - rev = "v${version}"; - hash = "sha256-O34COlGsXExJShRd2zvhdescNfYXWLNuGpkjcH3koPU="; + rev = "refs/tags/v${version}"; + hash = "sha256-vXABG3aJ6bwT37hfo909oF8qfAY3ZW18xvr1V8vSy5w="; }; propagatedBuildInputs = [ pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix index f3450d7df1..64da139204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix @@ -3,7 +3,7 @@ , numpy , scikit-image , lib -, opencv3 +, opencv4 }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scikit-image - opencv3 + opencv4 ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index cdffa669ed..3f2b7de89d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/aoFrRD+Bwt/qOX2FcsNKPO5t5HQCvbSoR5pQVjRCqk="; + hash = "sha256-ObzRZgEY7zYPpAR0VlAQcTZGYaqdkCHT0mxY8e4ggfU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 6989a12bf8..7a5aaaf81e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -3,48 +3,104 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, isPyPy , substituteAll -, imageio-ffmpeg + +# build-system +, setuptools + +# native dependencies +, libGL + +# dependencies , numpy , pillow + +# optional-dependencies +, astropy +, av +, imageio-ffmpeg +, pillow-heif , psutil -, pytestCheckHook , tifffile + +# tests +, pytestCheckHook , fsspec -, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.28.1"; - format = "setuptools"; + version = "2.32.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XbUIe+XIFOz34sfTChoVyX7Kl9jCbzHdxU12fUpDvOg="; + hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ + # pillow 10.1.0 compat + (fetchpatch { + name = "imageio-pillow-10.1.0-compat.patch"; + url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch"; + hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA="; + }) + ] ++ lib.optionals (!stdenv.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - imageio-ffmpeg numpy pillow ]; + passthru.optional-dependencies = { + bsdf = []; + dicom = []; + feisem = []; + ffmpeg = [ + imageio-ffmpeg + psutil + ]; + fits = lib.optionals (!isPyPy) [ + astropy + ]; + freeimage = []; + lytro = []; + numpy = []; + pillow = []; + simpleitk = []; + spe = []; + swf = []; + tifffile = [ + tifffile + ]; + pyav = [ + av + ]; + heif = [ + pillow-heif + ]; + }; + nativeCheckInputs = [ fsspec psutil pytestCheckHook - tifffile - ]; + ] + ++ fsspec.optional-dependencies.github + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "-m 'not needs_internet'" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix index 3b02ac4403..2e10ca6cb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix @@ -2,10 +2,10 @@ , fetchFromGitHub , lib , numpy -, opencv3 -, sphinx-rtd-theme +, opencv4 , lxml , xmljson +, pytestCheckHook }: buildPythonPackage rec { @@ -21,8 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy - opencv3 - sphinx-rtd-theme + opencv4 lxml xmljson ]; @@ -32,8 +31,7 @@ buildPythonPackage rec { --replace "'opencv-python>=3'," "" ''; - # failing on NixOS - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "imantics" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index a93b13f818..94f2257cc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.3.0"; + version = "1.4.0"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-dlCPJQDkHW4zNIHwhyKkgk+rI2t+Xn+Fbf3xJPRtaiY="; + hash = "sha256-bTYfAXc/2bRj8TBd9mmg0EGjUcUu6aiZXl8MF0+1xcs="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix index d943fbba0c..58c45f9922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "imapclient"; - version = "2.3.1"; + version = "3.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "mjs"; repo = "imapclient"; - rev = version; - hash = "sha256-aHWRhQOEjYiLlWTiuYo/a4pOhfLF7jz+ltG+yOqgfKI="; + rev = "refs/tags/${version}"; + hash = "sha256-ylYGh+78I+6pdvHuQPw8Gks9TLkXQL5HQiaZDnJK3DA="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default-icc-profile.patch b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default-icc-profile.patch new file mode 100644 index 0000000000..139eafd63c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default-icc-profile.patch @@ -0,0 +1,20 @@ +diff --git a/src/img2pdf.py b/src/img2pdf.py +index 036232b..d2e7829 100755 +--- a/src/img2pdf.py ++++ b/src/img2pdf.py +@@ -3815,14 +3815,7 @@ def gui(): + + + def get_default_icc_profile(): +- for profile in [ +- "/usr/share/color/icc/sRGB.icc", +- "/usr/share/color/icc/OpenICC/sRGB.icc", +- "/usr/share/color/icc/colord/sRGB.icc", +- ]: +- if os.path.exists(profile): +- return profile +- return "/usr/share/color/icc/sRGB.icc" ++ return "@srgbProfile@" + + + def get_main_parser(): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 0450dee30b..a94681ada0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , isPy27 -, fetchPypi +, fetchFromGitea +, substituteAll , fetchpatch +, colord +, setuptools , pikepdf , pillow , stdenv @@ -19,20 +22,37 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.4"; + version = "0.5.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; + pyproject = true; + + src = fetchFromGitea { + domain = "gitlab.mister-muffin.de"; + owner = "josch"; + repo = "img2pdf"; + rev = version; + hash = "sha256-k0GqBTS8PvYDmjzyLCSdQB7oBakrEQYJcQykDNrzgcA="; }; patches = [ - (fetchpatch { - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/148 - url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/57d7e07e6badb252c12015388b58fcb5285d3158.patch"; - hash = "sha256-H/g55spe/oVJRxO2Vh+F+ZgR6aLoRUrNeu5WnuU7k/k="; + (substituteAll { + src = ./default-icc-profile.patch; + srgbProfile = if stdenv.isDarwin then + "/System/Library/ColorSync/Profiles/sRGB Profile.icc" + else + "${colord}/share/color/icc/colord/sRGB.icc"; }) + (fetchpatch { + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 + url = "https://salsa.debian.org/debian/img2pdf/-/raw/4a7dbda0f473f7c5ffcaaf68ea4ad3f435e0920d/debian/patches/fix_tests.patch"; + hash = "sha256-A1zK6yINhS+dvyckZjqoSO1XJRTaf4OXFdq5ufUrBs8="; + }) + + ]; + + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -40,8 +60,11 @@ buildPythonPackage rec { pillow ]; - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/128 - doCheck = !stdenv.isAarch64; + # FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once + # https://github.com/NixOS/nix/issues/9301 is fixed. + __impureHostDeps = lib.optionals stdenv.isDarwin [ + "/System/Library/ColorSync/Profiles" + ]; nativeCheckInputs = [ exiftool @@ -60,16 +83,18 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_tiff_rgb" - "test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154 + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 + "test_miff_cmyk16" ]; pythonImportsCheck = [ "img2pdf" ]; meta = with lib; { + changelog = "https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/${src.rev}/CHANGES.rst"; description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; - license = licenses.lgpl2; + license = licenses.lgpl3Plus; + mainProgram = "img2pdf"; maintainers = with maintainers; [ veprbl dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index c1d896f698..3969b1c9ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, cmake -, numpy -, pytestCheckHook , pythonOlder + +# build-system +, cmake +, scikit-build-core +, pybind11 +, pathspec +, ninja +, pyproject-metadata + +# dependencies +, numpy + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "iminuit"; - version = "2.21.3"; - format = "setuptools"; + version = "2.24.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+zE/DMJ+IhubIhvNd5s6Zo+0x3sPkKv9UzaDPsvawBY="; + hash = "sha256-JatjHDyOAksbzHyW9mM4yqxUpKIyTVXx47pWF4FuRP0="; }; nativeBuildInputs = [ cmake - ]; + scikit-build-core + pybind11 + pathspec + ninja + pyproject-metadata + ] ++ scikit-build-core.optional-dependencies.pyproject; propagatedBuildInputs = [ numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index b470eb12a4..8b6afb522b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.12.0"; + version = "6.0.1"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-S+glib9cHXmZrt8qRRWdEMs8pPGbInH4eSvI5tp7IvY="; + hash = "sha256-Q1lFfkJwhGK5YmoEZXxiCK15nOtB5cWMV/+g5qCYpdQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix index 74336bf5d8..b655ddc470 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imutils/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, opencv3 +, opencv4 }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24"; }; - propagatedBuildInputs = [ opencv3 ]; + propagatedBuildInputs = [ opencv4 ]; # no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix index baffe42e0f..b35e4588a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/in-n-out/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "in-n-out"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "in_n_out"; inherit version; - hash = "sha256-gWKvh4fmgutLNtBH+RQZnYDxEk46QUIM1T3mgOfQolQ="; + hash = "sha256-if65ROQg+vQtPCVCFFaBtNVxRDVZMsK4WWlfzcT5oto="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix index 0acfbac481..324cd61537 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix @@ -2,19 +2,22 @@ , fetchFromGitHub , lib , pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "in-place"; - version = "0.5.0"; + version = "1.0.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "jwodder"; repo = "inplace"; - rev = "v${version}"; - sha256 = "1w6q3d0gqz4mxvspd08l1nhsrw6rpzv1gnyj4ckx61b24f84p5gk"; + rev = "refs/tags/v${version}"; + hash = "sha256-TfWfSb1GslzcT30/xvBg5Xui7ptp7+g89Fq/giLCoQ8="; }; postPatch = '' @@ -32,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "In-place file processing"; homepage = "https://github.com/jwodder/inplace"; + changelog = "https://github.com/jwodder/inplace/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index 9805f72ef8..10f5a56763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "6.0.4"; + version = "7.0.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-GEJkmhe2ytZoEqXJvfrLYxDh57bdijHwJnZt8bYmEus="; + hash = "sha256-Y9qTJa0p2oHsI+BVtBIleVq3k7TstIO+XcH6Nj/UcX4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index ce6bccdd40..e270df9746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , python-dateutil , fetchPypi -, fetchpatch , mock , msgpack , nose @@ -56,6 +55,7 @@ buildPythonPackage rec { # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n' "test_write_points_from_dataframe_with_nan_json" "test_write_points_from_dataframe_with_tags_and_nan_json" + "test_write_points_from_dataframe_with_numeric_precision" # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that "test_query_with_empty_result" # Pandas API changes cause it to no longer infer datetimes in the expected manner diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix index 4cc96646bc..4d04618ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inkex/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, inkscape , fetchFromGitLab , poetry-core , cssselect @@ -8,6 +9,7 @@ , packaging , pillow , pygobject3 +, pyparsing , pyserial , scour , gobject-introspection @@ -15,24 +17,13 @@ , gtk3 }: -buildPythonPackage rec { +buildPythonPackage { pname = "inkex"; - version = "1.2.2"; + inherit (inkscape) version; format = "pyproject"; - src = fetchFromGitLab { - owner = "inkscape"; - repo = "extensions"; - rev = "EXTENSIONS_AT_INKSCAPE_${version}"; - hash = "sha256-jw7daZQTBxLHWOpjZkMYtP1vIQvd/eLgiktWqVSjEgU="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"1.2.0"' '"${version}"' \ - --replace 'scour = "^0.37"' 'scour = ">=0.37"' - ''; + inherit (inkscape) src; nativeBuildInputs = [ poetry-core @@ -42,11 +33,8 @@ buildPythonPackage rec { cssselect lxml numpy - packaging - pillow pygobject3 pyserial - scour ]; pythonImportsCheck = [ "inkex" ]; @@ -58,6 +46,10 @@ buildPythonPackage rec { checkInputs = [ gtk3 + packaging + pillow + pyparsing + scour ]; disabledTests = [ @@ -74,6 +66,13 @@ buildPythonPackage rec { "tests/test_inkex_gui_pixmaps.py" ]; + postPatch = '' + cd share/extensions + + substituteInPlace pyproject.toml \ + --replace 'scour = "^0.37"' 'scour = ">=0.37"' + ''; + meta = { description = "Library for manipulating SVG documents which is the basis for Inkscape extensions"; homepage = "https://gitlab.com/inkscape/extensions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix index e06b86f918..6d5c4a6623 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/insightface/default.nix @@ -69,9 +69,6 @@ buildPythonPackage rec { doCheck = false; # Upstream has no tests meta = with lib; { - # Both protobuf3 and protobuf4 in the build closure. - # related: https://github.com/onnx/onnx/issues/5563 - broken = true; description = "State-of-the-art 2D and 3D Face Analysis Project"; homepage = "https://github.com/deepinsight/insightface"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix index 6266e60f72..ff7dad6f0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,51 +1,50 @@ { lib , aenum -, aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub +, httpx +, poetry-core , pydantic -, pytest-mock +, pytest-asyncio +, pytest-httpx , pytestCheckHook , pythonOlder -, requests +, rich }: buildPythonPackage rec { pname = "intellifire4py"; - version = "2.2.2"; - format = "setuptools"; + version = "3.1.30"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jeeftor"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; + rev = "refs/tags/v${version}"; + hash = "sha256-CIcudKyRPVJX6QvWk6dBbYnO5EULREDhaflJTAfJEvc="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aenum - aiohttp + httpx pydantic - requests - ]; - - nativeCheckInputs = [ - asynctest - pytest-mock - pytestCheckHook - ]; - - disabledTests = [ - # Test file is missing - "test_json_files" + rich ]; pythonImportsCheck = [ "intellifire4py" ]; + nativeCheckInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; meta = with lib; { description = "Module to read Intellifire fireplace status data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix index 3c48dcc4d6..eab0c1c360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -9,36 +10,61 @@ , pillow , pywavelets , numpy +, callPackage +, withOnnx ? false # Enables the rivaGan en- and decoding method }: buildPythonPackage rec { pname = "invisible-watermark"; - version = "0.1.5"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ShieldMnt"; repo = "invisible-watermark"; - rev = version; - hash = "sha256-NGDPEETuM7rYbo8kXYoRWLJWpa/lWLKEvaaiDzSWYZ4="; + rev = "e58e451cff7e092457cd915e445b1a20b64a7c8f"; # No git tag, see https://github.com/ShieldMnt/invisible-watermark/issues/22 + hash = "sha256-6SjVpKFtiiLLU7tZ3hBQr0KT/YEQyywJj0e21/dJRzk="; }; propagatedBuildInputs = [ opencv4 torch - onnx - onnxruntime pillow pywavelets numpy + ] ++ lib.optionals withOnnx [ + onnx + onnxruntime ]; postPatch = '' substituteInPlace setup.py \ --replace 'opencv-python>=4.1.0.25' 'opencv' + substituteInPlace imwatermark/rivaGan.py --replace \ + 'You can install it with pip: `pip install onnxruntime`.' \ + 'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.' ''; + passthru.tests = let + image = "${src}/test_vectors/original.jpg"; + methods = [ "dwtDct" "dwtDctSvd" "rivaGan" ]; + testCases = builtins.concatMap (method: [ + { method = method; withOnnx = true; } + { method = method; withOnnx = false; } + ]) methods; + createTest = { method, withOnnx }: let + testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; + # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 + skipTest = stdenv.isLinux && stdenv.isAarch64 && withOnnx && method == "rivaGan"; + in lib.optionalAttrs (!skipTest) { + "${testName}" = callPackage ./tests/cli.nix { inherit image method testName withOnnx; }; + }; + allTests = builtins.map createTest testCases; + in (lib.attrsets.mergeAttrsList allTests) // { + python = callPackage ./tests/python { inherit image; }; + }; + pythonImportsCheck = [ "imwatermark" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/cli.nix new file mode 100644 index 0000000000..9cb9364657 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/cli.nix @@ -0,0 +1,64 @@ +{ image +, method +, python3Packages +, runCommand +, testName +, withOnnx +}: + +# This file runs one test case. +# There are six test cases in total. method can have three possible values and +# withOnnx two possible values. 3 * 2 = 6. +# +# The case where the method is rivaGan and invisible-watermark is built +# without onnx is expected to fail and this case is handled accordingly. +# +# The test works by first encoding a message into a test image, +# then decoding the message from the image again and checking +# if the message was decoded correctly. + +let + message = if method == "rivaGan" then + "asdf" # rivaGan only supports 32 bits + else + "fnörd1"; + length = (builtins.stringLength message) * 8; + invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; }; + expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0"; +in +runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; } '' + set +e + invisible-watermark \ + --verbose \ + --action encode \ + --type bytes \ + --method '${method}' \ + --watermark '${message}' \ + --output output.png \ + '${image}' + exit_code="$?" + set -euf -o pipefail + if [ "$exit_code" != '${expected-exit-code}' ]; then + echo "Exit code of invisible-watermark was $exit_code while ${expected-exit-code} was expected." + exit 1 + fi + if [ '${expected-exit-code}' == '1' ]; then + echo 'invisible-watermark failed as expected.' + touch "$out" + exit 0 + fi + decoded_message="$(invisible-watermark \ + --action decode \ + --type bytes \ + --method '${method}' \ + --length '${toString length}' \ + output.png \ + )" + + if [ '${message}' != "$decoded_message" ]; then + echo "invisible-watermark did not decode the watermark correctly." + echo "The original message was ${message} but the decoded message was $decoded_message." + exit 1 + fi + touch "$out" +'' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py new file mode 100644 index 0000000000..c1b7e52ff6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +import os +import cv2 +from imwatermark import WatermarkDecoder + +input_file = os.environ['image'] +output_file_path = os.environ['out'] +num_bits = int(os.environ['num_bits']) +method = os.environ['method'] + +bgr = cv2.imread(input_file) + +decoder = WatermarkDecoder('bytes', num_bits) +watermark = decoder.decode(bgr, method) +message = watermark.decode('utf-8') + +with open(output_file_path, 'w') as f: + f.write(message) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix new file mode 100644 index 0000000000..63db588673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix @@ -0,0 +1,42 @@ +{ image +, invisible-watermark +, opencv4 +, python3 +, runCommand +, stdenvNoCC +}: + +# This test checks if the python code shown in the README works correctly + +let + message = "fnörd1"; + method = "dwtDct"; + + pythonWithPackages = python3.withPackages (pp: with pp; [ invisible-watermark opencv4 ]); + pythonInterpreter = pythonWithPackages.interpreter; + + encode = stdenvNoCC.mkDerivation { + name = "encode"; + realBuilder = pythonInterpreter; + args = [ ./encode.py ]; + inherit image message method; + }; + + decode = stdenvNoCC.mkDerivation { + name = "decode"; + realBuilder = pythonInterpreter; + args = [ ./decode.py ]; + inherit method; + image = "${encode}/test_wm.png"; + num_bits = (builtins.stringLength message) * 8; + }; +in +runCommand "invisible-watermark-test-python" { } '' + decoded_message="$(cat '${decode}')" + if [ '${message}' != "$decoded_message" ]; then + echo "invisible-watermark did not decode the watermark correctly." + echo "The original message was ${message} but the decoded message was $decoded_message." + exit 1 + fi + touch "$out" +'' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py new file mode 100644 index 0000000000..59a72cffe7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +import os +import cv2 +from imwatermark import WatermarkEncoder + +input_file_path = os.environ['image'] +output_dir = os.environ['out'] +message = os.environ['message'] +method = os.environ['method'] + +os.mkdir(output_dir) + +bgr = cv2.imread(input_file_path) + +encoder = WatermarkEncoder() +encoder.set_watermark('bytes', message.encode('utf-8')) +bgr_encoded = encoder.encode(bgr, method) + +output_file = os.path.join(output_dir, 'test_wm.png') +cv2.imwrite(output_file, bgr_encoded) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix new file mode 100644 index 0000000000..2d98144e90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, urllib3 +, six +, certifi +, python-dateutil +, asn1crypto +}: + +buildPythonPackage rec { + pname = "ionoscloud"; + version = "6.1.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash= "sha256-QQNDqKZ+X+w5vHFXr793QqRjShNBZ182DyD3fUUxqkc="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ urllib3 six certifi python-dateutil asn1crypto ]; + + # upstream only has codecoverage tests, but no actual tests to go with them + doCheck = false; + + pythonImportsCheck = [ + "ionoscloud" + ]; + + meta = with lib; { + homepage = "https://github.com/ionos-cloud/sdk-python"; + description = "Python API client for ionoscloud"; + changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ hexchen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index 4aec189907..f5911b627c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -5,6 +5,7 @@ , decorator , ipython , isPyPy +, exceptiongroup , tomli , setuptools , unittestCheckHook @@ -30,6 +31,7 @@ buildPythonPackage rec { ipython decorator ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup tomli ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index aeb19ec9f2..74cb52629a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.21.2"; + version = "6.25.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bpITSE5M4fsUJn7kNeGPI8w6BjTmNbn7TtRne4Tg/fg="; + hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix index 9863064f16..f461659c65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipympl/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , ipykernel -, ipython_genutils +, ipython-genutils , ipywidgets , matplotlib , numpy @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - ipython_genutils + ipython-genutils ipywidgets matplotlib numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix new file mode 100644 index 0000000000..e3a7b6c0a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython-genutils/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, nose +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ipython-genutils"; + version = "0.2.0"; + pyproject = true; + + src = fetchPypi { + pname = "ipython_genutils"; + inherit version; + hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + preCheck = '' + substituteInPlace ipython_genutils/tests/test_path.py \ + --replace "setUp" "setup_method" \ + --replace "tearDown" "teardown_method" + ''; + + pythonImportsCheck = [ + "ipython_genutils" + ]; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = "https://ipython.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix index 8853b066ec..2fc59859ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , ipython -, ipython_genutils +, ipython-genutils , pandas , prettytable , pytest @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython - ipython_genutils + ipython-genutils prettytable sqlalchemy sqlparse diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index d0fd08146b..a730531bf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder # Build dependencies @@ -12,6 +11,7 @@ , appnope , backcall , decorator +, exceptiongroup , jedi , matplotlib-inline , pexpect @@ -20,6 +20,7 @@ , pygments , stack-data , traitlets +, typing-extensions # Test dependencies , pytestCheckHook @@ -28,13 +29,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.11.0"; + version = "8.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"; + sha256 = "sha256-K661vmlJ7uv1MhUPgXRvgzPizM4C3hx+7d4/I+1enx4="; }; nativeBuildInputs = [ @@ -52,6 +53,10 @@ buildPythonPackage rec { pygments stack-data traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ] ++ lib.optionals stdenv.isDarwin [ appnope ]; @@ -64,8 +69,8 @@ buildPythonPackage rec { export HOME=$TMPDIR # doctests try to fetch an image from the internet - substituteInPlace pytest.ini \ - --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" + substituteInPlace pyproject.toml \ + --replace '"--ipdoctest-modules",' '"--ipdoctest-modules", "--ignore=IPython/core/display.py",' ''; nativeCheckInputs = [ @@ -83,6 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; + downloadPage = "https://github.com/ipython/ipython/"; homepage = "https://ipython.org/"; changelog = "https://github.com/ipython/ipython/blob/${version}/docs/source/whatsnew/version${lib.versions.major version}.rst"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix deleted file mode 100644 index 2283444c23..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -, glibcLocales -}: - -buildPythonPackage rec { - pname = "ipython_genutils"; - version = "0.2.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; - }; - - nativeCheckInputs = [ nose glibcLocales ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests - ''; - - meta = { - description = "Vestigial utilities from IPython"; - homepage = "https://ipython.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix index 5432d31c54..0de6db55b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.0.6"; + version = "8.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3n13nyBF1g3p9sJfZT/a4tuleJjmoShElLO6ILaJO7g="; + hash = "sha256-QCEe+1Vq3sb6RQzMKnfVnKRKBg9PnxNoM99ZyfU45ug="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix index c3e022cdb3..ade0c71ee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "iso8601"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MoEee4He7iBj6m0ulPiBmobR84EeSdI2I6QfqDK+8D8="; + hash = "sha256-c5lg03x0x3vZvVRqdlYsy1gf49SCD/XDFB60nIOf2o8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix index fd055d35bd..dcfc86c3aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix @@ -1,27 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "iteration-utilities"; - version = "0.11.0"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MSeifert04"; repo = "iteration_utilities"; - rev = "v${version}"; - hash = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; + rev = "refs/tags/v${version}"; + hash = "sha256-KdL0lwlmBEG++JRociR92HdYxzArTeL5uEyUjvvwi1Y="; }; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "iteration_utilities" ]; + pythonImportsCheck = [ + "iteration_utilities" + ]; meta = with lib; { description = "Utilities based on Pythons iterators and generators"; homepage = "https://github.com/MSeifert04/iteration_utilities"; + changelog = "https://github.com/MSeifert04/iteration_utilities/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix index 8c9b32fb11..317fc3e3dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-classes/default.nix @@ -6,14 +6,16 @@ buildPythonPackage rec { pname = "jaraco-classes"; - version = "3.1.1"; + version = "3.3.0"; + format = "pyproject"; + disabled = isPy27; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; - rev = "v${version}"; - sha256 = "0wzrcsxi9gb65inayg0drm08iaw37jm1lqxhz3860i6pwjh503pr"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DW8qf6G6997vBOaO1+Bdx4LBvKfpl/MiiFqWJYKE/pg="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix index 9cd5e9988f..0cc2fa124d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "3.6.0"; + version = "3.9.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.functools"; inherit version; - hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; + hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix index 906733508c..23722cc20c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-itertools/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "jaraco-itertools"; - version = "6.2.1"; + version = "6.4.1"; format = "pyproject"; src = fetchPypi { pname = "jaraco.itertools"; inherit version; - hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; + hash = "sha256-MU/OVi67RepIIqmLvXsi5f6sfVEY28Gk8ess0Ea/+kc="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix index 7265505fe1..a0196265b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix @@ -2,60 +2,35 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cmake -, ninja -, cython -, rapidfuzz-capi -, scikit-build , setuptools -, wheel -, jarowinkler-cpp +, rapidfuzz , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.2.3"; - format = "pyproject"; + version = "2.0.1"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + pyproject = true; src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "refs/tags/v${version}"; - hash = "sha256-j+ZabVsiVitNkTPhGjDg72XogjvPaL453lTW45ITm90="; + hash = "sha256-B3upTBNqMyi+CH7Zx04wceEXjGJnr6S3BIl87AQkfbo="; }; - # We cannot use Cython version 3.0.0 because the code in jarowinkler has not - # been adapted for https://github.com/cython/cython/issues/4280 yet - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'scikit-build==' 'scikit-build>=' \ - --replace 'Cython==3.0.0a11' 'Cython' - ''; - nativeBuildInputs = [ - cmake - cython - ninja - rapidfuzz-capi - scikit-build setuptools - wheel ]; - buildInputs = [ - jarowinkler-cpp + propagatedBuildInputs = [ + rapidfuzz ]; - preBuild = '' - export JAROWINKLER_BUILD_EXTENSION=1 - ''; - - dontUseCmakeConfigure = true; - nativeCheckInputs = [ hypothesis pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index 9453ba1c0c..203aa49db8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -27,17 +27,17 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.18"; + version = "0.4.20"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "google"; - repo = pname; + repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-rDvWHa8jYCAA9iKbWaFUXdE/9L7AepFiNzmqOcc/090="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -108,6 +108,10 @@ buildPythonPackage rec { "test_device_put" "test_make_array_from_callback" "test_make_array_from_single_device_arrays" + + # Fails on some hardware due to some numerical error + # See https://github.com/google/jax/issues/18535 + "testQdwhWithOnRankDeficientInput5" ]; disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 68a1275246..4030bd5e40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.18"; + version = "0.4.20"; inherit (python) pythonVersion; @@ -47,38 +47,101 @@ let # official instructions recommend installing CPU-only versions via PyPI. cpuSrcs = let - getSrcFromPypi = { platform, hash }: fetchPypi { - inherit version platform hash; + getSrcFromPypi = { platform, dist, hash }: fetchPypi { + inherit version platform dist hash; pname = "jaxlib"; format = "wheel"; # See the `disabled` attr comment below. - dist = "cp310"; - python = "cp310"; - abi = "cp310"; + python = dist; + abi = dist; }; in { - "x86_64-linux" = getSrcFromPypi { + "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; - hash = "sha256-MpNomovvSVx4N6gsowOLksTyEgTK261vSXMGxYqlVOE="; + dist = "cp39"; + hash = "sha256-eIE+rz5x5BEkO85zncIWE8p/wDPxV8bnVJdHiknS998="; }; - "aarch64-darwin" = getSrcFromPypi { + "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; - hash = "sha256-if/5O5DQVHFdsLw9O1creZBx5j8ftE7fsWMMX1NjHP0="; + dist = "cp39"; + hash = "sha256-dxInv8/aQiHsN7DpScuZao2ZyHDjF0AaTqUDA0qqg/M="; }; - "x86_64-darwin" = getSrcFromPypi { + "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; - hash = "sha256-4NeHA/0SGdmHXyDGxpK7oJc7dE1meR4LPjzbIwxloqU="; + dist = "cp39"; + hash = "sha256-wva6LkSokEHN+WQLCancVC7YBIxfImPsQpB1LzFcyqM="; + }; + + "3.10-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp310"; + hash = "sha256-Yo2TYnkIelyy4vb5+nC/yY8SjV34i/jJvCe/VRQppmo="; + }; + "3.10-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp310"; + hash = "sha256-ufA/ACE4s4R/Fiq5SN7T44SVEN1Z5OfkJ/98lKxRFmo="; + }; + "3.10-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp310"; + hash = "sha256-hBSrYQyOGMn0BexRWQKYnJdEYYlzHUWuWGHmjVT10TE="; + }; + + "3.11-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp311"; + hash = "sha256-5N0nghTBrsa7d8kt8hZC2ghqlxCNC7U8ApD0PG7DHn8="; + }; + "3.11-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp311"; + hash = "sha256-j13Br64cKe0hFh/cMBbOMuTXqauAvSKE+KzEmN7U6RA="; + }; + "3.11-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp311"; + hash = "sha256-nTnyawU4Ngq9VTE6oDuEfR6iJPRy+E/VLt98cU6eW4M="; + }; + + "3.12-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp312"; + hash = "sha256-qPMoa7cso7DRBWuCJQoiOEzLPL3m76MPZZMYmZUj400="; + }; + "3.12-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp312"; + hash = "sha256-VqTC5egDHaDIvwVa3sAc9Sdtd0CwEFcXjDU/i54h844="; + }; + "3.12-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp312"; + hash = "sha256-1F98Je2rMJJKrksI/EVAsX9n+dOpmDehUeAaMq/BY7o="; }; }; - # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. # When upgrading, you can get these hashes from prefetch.sh. See # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. - gpuSrc = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-p6BNvhhRzVDQdpEoIRau5JovC+eDjlW3bXrahtsGvmI="; + gpuSrcs = { + "3.9" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; + hash = "sha256-VM2HuyMnG+hzrsTQEB5KJpqpBXyyp+eV1LVxmY1ZCGU="; + }; + "3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-TLq3z3T2fjTcO3ESahboKG33mrOpjtj9C92f4d4nJKo="; + }; + "3.11" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; + hash = "sha256-CUXwyJq0HOo2j3Sw+NguBCnFkDuJpc3wfZUc90yyhOY="; + }; + "3.12" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; + hash = "sha256-bAR8FLtiqufU+rL2a1q9c61CjH1eXxGTNGnDUkHlDBA="; + }; }; in @@ -87,15 +150,15 @@ buildPythonPackage { inherit version; format = "wheel"; - disabled = !(pythonVersion == "3.10"); + disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10" || pythonVersion == "3.11" || pythonVersion == "3.12"); # See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6. src = if !cudaSupport then ( - cpuSrcs."${stdenv.hostPlatform.system}" + cpuSrcs."${pythonVersion}-${stdenv.hostPlatform.system}" or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") - ) else gpuSrc; + ) else gpuSrcs."${pythonVersion}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index 35d56ff1a1..ae479120ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.18"; + version = "0.4.20"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -95,7 +95,6 @@ let "absl_py" "astor_archive" "astunparse_archive" - "boringssl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -151,7 +150,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-rDvWHa8jYCAA9iKbWaFUXdE/9L7AepFiNzmqOcc/090="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -264,10 +263,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-0CfGWlwKsUFP1DHUN6+6wX3cHr5x3TE6NbqYlV5me1E="; + x86_64-linux = "sha256-QczClHxHElLZCqIZlHc3z3DXJ7rZQJaMs2XIb+lxarI="; } else { - x86_64-linux = "sha256-sljmyIligXC7d9fdlpqR32xyMR0UslWs04gXJBD8FTA="; - aarch64-linux = "sha256-eJ4KIkHdcA2EVvyBoNum2cOPcHPFoBOtUTAGufO8FJA="; + x86_64-linux = "sha256-mqiJe4u0NYh1PKCbQfbo0U2e9/kYiBqj98d+BPHFSxQ="; + aarch64-linux = "sha256-EuLqamVBJ+qoVMCFIYUT846AghltZolfLGdtO9UeXSM="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; @@ -293,13 +292,7 @@ let --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ --replace "/usr/bin/libtool" "${cctools}/bin/libtool" - '' + (if stdenv.cc.isGNU then '' - sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); + ''; }; inherit meta; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh index 3362e2d0b7..46b2573e3c 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -1,7 +1,8 @@ -#!/usr/bin/env bash +#! /usr/bin/env nix-shell +#! nix-shell -i sh -p jq prefetch () { - expr="(import { system = \"$1\"; config.cudaSupport = $2; }).python3.pkgs.jaxlib-bin.src.url" + expr="(import { system = \"$2\"; config.cudaSupport = $3; }).python$1.pkgs.jaxlib-bin.src.url" url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) echo "$url" sha256=$(nix-prefetch-url "$url") @@ -9,7 +10,9 @@ prefetch () { echo } -prefetch "x86_64-linux" "false" -prefetch "aarch64-darwin" "false" -prefetch "x86_64-darwin" "false" -prefetch "x86_64-linux" "true" +for py in "39" "310" "311" "312"; do + prefetch "$py" "x86_64-linux" "false" + prefetch "$py" "aarch64-darwin" "false" + prefetch "$py" "x86_64-darwin" "false" + prefetch "$py" "x86_64-linux" "true" +done diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix index 70d802019e..36a4302723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxopt/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "jaxopt"; - version = "0.5.5"; + version = "0.8.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-WOsr/Dvguu9/qX6+LMlAKM3EANtYPtDu8Uo2157+bs0="; + repo = "jaxopt"; + rev = "refs/tags/jaxopt-v${version}"; + hash = "sha256-uVOd3knoku5fKBNXOhCikGtjDuW3TtRqev94OM/8Pgk="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://jaxopt.github.io"; description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; + changelog = "https://github.com/google/jaxopt/releases/tag/jaxopt-v${version}"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix index 0d0621c56e..364e65012b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxtyping/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-OYx7Eq5jxSGERHsk611+n+Nq2B915gpJLPZYdO7Lt+k="; + hash = "sha256-22dIuIjFgqRmV9AQok02skVt7fm17/WpzBm3FrJ6/zs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index cd6f4060fc..39bc43bc41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.4"; + version = "1.23.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d0KONiYS/5JXrl5izFSTYeABEhCW+W9cKpMgk9o9LB4="; + hash = "sha256-vAPWMv5vYFl45ZTl+p4HHAXeZ/10VSvubKINoyGPRq4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix index 35749407a3..fca4a554d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix @@ -9,14 +9,14 @@ , pydantic , pyhamcrest , pytestCheckHook -, python-jsonrpc-server +, python-lsp-jsonrpc , pythonOlder , pythonRelaxDepsHook }: buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.40.0"; + version = "0.41.1-unstable-2023-10-04"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pappasam"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; + rev = "c4c470cff67e54593a626b22d1b6b05e56fde3a3"; + hash = "sha256-qFBni97B/GkabbznnZtWTG4dCHFkOx5UQjuevxq+Uvo="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyhamcrest - python-jsonrpc-server + python-lsp-jsonrpc ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix index 5f802767c8..eb90d3c907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -3,16 +3,22 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, attrs -, django_3 -, pytestCheckHook + +# build-system +, setuptools + +# dependencies , parso + +# tests +, attrs +, pytestCheckHook }: buildPythonPackage rec { pname = "jedi"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,15 +26,20 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; + hash = "sha256-MD7lIKwAwULZp7yLE6jiao2PU6h6RIl0SQ/6b4Lq+9I="; fetchSubmodules = true; }; - propagatedBuildInputs = [ parso ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + parso + ]; nativeCheckInputs = [ attrs - django_3 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix index 59b34f6a4f..518f62c540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-git/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , jinja2 , poetry-core }: buildPythonPackage rec { pname = "jinja2-git"; - version = "unstable-2021-07-20"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wemake-services"; repo = "jinja2-git"; - # this is master, we can't patch because of poetry.lock :( - # luckily, there appear to have been zero API changes since then, only - # dependency upgrades - rev = "c6d19b207eb6ac07182dc8fea35251d286c82512"; - sha256 = "0yw0318w57ksn8azmdyk3zmyzfhw0k281fddnxyf4115bx3aph0g"; + rev = "refs/tags/${version}"; + hash = "sha256-XuN2L3/HLcZ/WPWiCtufDOmkxj+q4I6IOgjrGQHfNLk="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ jinja2 ]; + + # the tests need to be run on the git repository + doCheck = false; + pythonImportsCheck = [ "jinja2_git" ]; meta = with lib; { homepage = "https://github.com/wemake-services/jinja2-git"; description = "Jinja2 extension to handle git-specific things"; + changelog = "https://github.com/wemake-services/jinja2-git/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-pluralize/default.nix similarity index 51% rename from third_party/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jinja2-pluralize/default.nix index db19640382..2187c1a241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-pluralize/default.nix @@ -1,12 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, inflect +, pytestCheckHook +}: buildPythonPackage rec { - pname = "jinja2_pluralize"; + pname = "jinja2-pluralize"; version = "0.3.0"; src = fetchPypi { - inherit pname version; - sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z"; + pname = "jinja2_pluralize"; + inherit version; + hash = "sha256-31wtUBe5tUwKZst5DMqfwIlFg3w9v8MjWJID8f+3PBw="; }; propagatedBuildInputs = [ @@ -14,6 +21,14 @@ buildPythonPackage rec { inflect ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jinja2_pluralize" + ]; + meta = with lib; { description = "Jinja2 pluralize filters"; homepage = "https://github.com/audreyr/jinja2_pluralize"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix index a25690408d..fa7e2b18e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/pycontribs/jira"; changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix index b92d1e7175..d042726daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jiwer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jiwer"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jitsi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z+M0/mftitLV2OaaQvTdRehtt16FFeBjqR//S5ad1XE="; + hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix index d60fd41d70..4fc2f49119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - hash = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; + hash = "sha256-43q7pL+zykpGR9KLufRwZDb3tGyKgzO0pxirr6jkazc="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix index 646824b064..f05b886cfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; + hash = "sha256-WFzugrcCEfqeYEO3u4nbbhqklSQ0Dd6K1rYyBuponYg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix index 3353e5ec43..0da22f2cf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jsonschema-spec"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sa97DwPnGMLmT00hVdkoGO7C0vrvtwxvUvv9lq4nCY4="; + hash = "sha256-1Flb3XQCGhrAYzTvriSVhHDb/Z/uvCyZdbav2u7f3sg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index 0f3d69b18d..d8c235efed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.18.4"; + version = "4.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+zZCc1OZ+pWMDSqtcFeQFVRZbGM0n09rKDxJPPaSol0="; + hash = "sha256-bh51aawTvoE5st0sIaVdNQBm7j+A3wbGCLOYzcbzDo8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix index 6388dfc154..315b156290 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jug"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Jug"; inherit version; - hash = "sha256-JWE0eSCAaAJ2vyiKGksYUzS3enCIJYCaT3tVV7fP1BA="; + hash = "sha256-Y2TWqJi7GjmWUFpe1b150NgwRw9VKhCk5EoN5NDcPXU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junit2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junit2html/default.nix new file mode 100644 index 0000000000..7444569503 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/junit2html/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchPypi +, buildPythonPackage +, nix-update-script + +, setuptools +, wheel + +, jinja2 +}: + +buildPythonPackage rec { + pname = "junit2html"; + version = "30.1.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-1q6KpKdrZvp8XvxGCkoorlZDDgvGg/imTX8+NEOBbWs="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + pythonImportsCheck = [ "junit2htmlreport" ]; + + meta = with lib; { + description = "Generate HTML reports from Junit results"; + homepage = "https://pypi.org/project/junit2html/"; + license = licenses.mit; + maintainers = with maintainers; [ otavio ]; + mainProgram = "junit2html"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix index 29a8bb0245..7a2501f317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "jupyter-cache"; - version = "0.6.1"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-Jvg5ARQ+30ry8/9akeLSrSmORuLO4DyAcdN6I6Y8y/w="; + inherit version; + pname = "jupyter_cache"; + hash = "sha256-0Pp9dTPNV5gZjYiJMYJpqME4LtOyL2IsCak1ZSH0hoc="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A defined interface for working with a cache of jupyter notebooks"; homepage = "https://github.com/executablebooks/jupyter-cache"; + changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix index 5aa400a169..014b67cb4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix @@ -11,16 +11,18 @@ , traitlets , isPyPy , py +, pythonOlder +, importlib-metadata }: buildPythonPackage rec { pname = "jupyter_client"; - version = "8.0.3"; + version = "8.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7WVJi+pth2752No+DbPdM8XRKfWyZF9WrgOZN4KWa9A="; + hash = "sha256-YClLLVuGk1bIk/V7God+plENYNRc9LOAV/FnLYVpmsk="; }; nativeBuildInputs = [ @@ -35,6 +37,8 @@ buildPythonPackage rec { pyzmq tornado traitlets + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index de73ea621b..6c2842eb6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; + hash = "sha256-qhcCPAgHlBwt+Lt8NdDa+ZPhNNotCvNtz9WQx6OHvOc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix index e847c341f4..715557bad7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchPypi , pythonOlder -, substituteAll , hatchling , ipykernel +, exceptiongroup , ipython , jupyter-client , jupyter-core @@ -51,6 +51,8 @@ buildPythonPackage rec { pygments pyzmq traitlets + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix index 73ba031e39..5656043625 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, ipython_genutils +, ipython-genutils , jupyter-contrib-core , jupyter-highlight-selected-word , jupyter-nbextensions-configurator @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - ipython_genutils + ipython-genutils jupyter-contrib-core jupyter-highlight-selected-word jupyter-nbextensions-configurator diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix index a25681dda4..fb5880a4f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , hatchling , platformdirs , traitlets @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.2.0"; + version = "5.3.1"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -20,16 +19,11 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-X3P3bTLhpWIa6EHdxZ/KFiQNAnhszha2cfZ8PynZPRs="; + hash = "sha256-kQ7oNEC5L19PTPaX6C2bP5FYuzlsFsS0TABsw6VvoL8="; }; patches = [ ./tests_respect_pythonpath.patch - (fetchpatch { - # add support for platformdirs>=3 - url = "https://github.com/jupyter/jupyter_core/commit/ff4086cdbdac2ea79c18632e4e35acebc1f7cf57.patch"; - hash = "sha256-UhHO58xZ4hH47NBhOhsfBjgsUtA+1EIHxPBvnKA5w28="; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix index a60983e404..98e6ea22df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.6.3"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-k+OyCKUN9hC6J1Ff2DDb2ECLvmWkkK1HtNxfKVXyl8g="; + hash = "sha256-hOx2/WiFpDjtmP+qC6Ew2VY4/gdvXuv2k76qtmS+61M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 4d0831ff97..7283eaed44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index d6bdedc992..6261303981 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -15,6 +15,8 @@ , jsonschema , jupyter-telemetry , jupyterlab +, jupyter-core +, jupyter-server , mock , nbclassic , nodePackages @@ -138,6 +140,8 @@ buildPythonPackage rec { sqlalchemy tornado traitlets + jupyter-core + jupyter-server ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -201,7 +205,6 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index e894a8c88d..7c0522c754 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.41.0"; + version = "0.42.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-UXZ9qgAvCKfPCzchFOtwbv8vNPEtcLU0dwBGTmiHSD4="; + hash = "sha256-GFnox6KnwKWFqsUWY0QYzMShXlH9KFSY3rRJA4RAiCk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix index b7d5ce4cf0..6d57bc5196 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "4.2.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-OqsByMrAQKjTqev6QIUiOwVLf71iGdPHtWD2qXZsovM="; + hash = "sha256-D4jiaAPQ8+TIyL7wip+GHycGp3ym1NkvZQJsCelYFks="; }; propagatedBuildInputs = [ @@ -28,8 +28,5 @@ buildPythonPackage rec { license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ]; - # No support for Jupyterlab > 4 - # https://github.com/jupyter-lsp/jupyterlab-lsp/pull/949 - broken = lib.versionAtLeast jupyterlab.version "4.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix similarity index 60% rename from third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix index 2ec4ccf47e..a408137650 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -1,91 +1,92 @@ { lib , buildPythonPackage , fetchPypi -, hatchling -, jsonschema , pythonOlder -, requests -, pytestCheckHook -, json5 +, hatchling , babel +, importlib-metadata +, jinja2 +, json5 +, jsonschema , jupyter-server -, tomli +, packaging +, requests , openapi-core , pytest-jupyter +, pytestCheckHook , requests-mock , ruamel-yaml , strict-rfc3339 -, importlib-metadata }: buildPythonPackage rec { - pname = "jupyterlab_server"; - version = "2.24.0"; - format = "pyproject"; + pname = "jupyterlab-server"; + version = "2.25.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-Tm+Z4KVXm7vDLkScTbsDlWHU8aeCfVczJz7VZzjyHwc="; + pname = "jupyterlab_server"; + inherit version; + hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw="; }; + postPatch = '' + sed -i "/timeout/d" pyproject.toml + ''; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ - requests - jsonschema - json5 babel + jinja2 + json5 + jsonschema jupyter-server - tomli + packaging + requests ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - nativeCheckInputs = [ - openapi-core - pytestCheckHook - pytest-jupyter - requests-mock - ruamel-yaml - strict-rfc3339 - ]; + passthru.optional-dependencies = { + openapi = [ + openapi-core + ruamel-yaml + ]; + }; - postPatch = '' - sed -i "/timeout/d" pyproject.toml - ''; + nativeCheckInputs = [ + pytest-jupyter + pytestCheckHook + requests-mock + strict-rfc3339 + ] ++ passthru.optional-dependencies.openapi; preCheck = '' export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. - # Use setuptools or check PEP 632 for potential alternatives. - "-W ignore::DeprecationWarning" - ]; - disabledTestPaths = [ - "tests/test_settings_api.py" - "tests/test_themes_api.py" + # require optional language pack packages for tests "tests/test_translation_api.py" - "tests/test_workspaces_api.py" ]; - disabledTests = [ - "test_get_listing" + pythonImportsCheck = [ + "jupyterlab_server" + "jupyterlab_server.pytest_plugin" ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "A set of server components for JupyterLab and JupyterLab like applications"; - homepage = "https://jupyterlab-server.readthedocs.io/"; + homepage = "https://github.com/jupyterlab/jupyterlab_server"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; - license = licenses.bsdOriginal; + license = licenses.bsd3; maintainers = lib.teams.jupyter.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 2418b8db4d..4d668da9bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.7"; + version = "3.0.9"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-w6UO1b9Sigx6hpCWUDr1RwL4bdodtGmu4cktwMAbQ8o="; + hash = "sha256-YAWk6XTHvu6EBg/fujQaMhhJUEbeiuPsZIiOX+Gf20w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 81c7f862f6..6a6acff7aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -9,7 +9,7 @@ , ipykernel , jupyter-core , jupyter-lsp -, jupyterlab_server +, jupyterlab-server , jupyter-server , notebook-shim , jinja2 @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.3"; + version = "4.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4U0c5GphMCgRHQ1Hah19awlAA7dGK6xmn1tHgxeryzk="; + hash = "sha256-bEOuWmof0v36/LNFQASVi95tp2Mxq7RM/8b55Daxm6E="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ipykernel jupyter-core jupyter-lsp - jupyterlab_server + jupyterlab-server jupyter-server notebook-shim jinja2 @@ -69,5 +69,6 @@ buildPythonPackage rec { license = licenses.bsd3; homepage = "https://jupyter.org/"; maintainers = lib.teams.jupyter.members; + mainProgram = "jupyter-lab"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_launcher/default.nix deleted file mode 100644 index 15b53f523b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }: -buildPythonPackage rec { - pname = "jupyterlab_launcher"; - version = "0.13.1"; - disabled = pythonOlder "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "f880eada0b8b1f524d5951dc6fcae0d13b169897fc8a247d75fb5beadd69c5f0"; - }; - - propagatedBuildInputs = [ - jsonschema - notebook - ]; - - # depends on requests and a bunch of other libraries - doCheck = false; - - meta = with lib; { - description = "This package is used to launch an application built using JupyterLab"; - license = with licenses; [ bsd3 ]; - homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix index cc302cc586..ecea9ef4a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.6.0"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kvanzuijlen"; repo = pname; - rev = version; - hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + rev = "refs/tags/${version}"; + hash = "sha256-arUdjZiEJx0L1YcCNxqlE4ItoTEzd/TYVgqDPIqomMg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jwt/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/python-jwt/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/jwt/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/k-diffusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/k-diffusion/default.nix index 272f2d5fc4..4a2c6f0a1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/k-diffusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/k-diffusion/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "k-diffusion"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "crowsonkb"; repo = "k-diffusion"; rev = "refs/tags/v${version}"; - hash = "sha256-jcIA0HfEnVHk9XDXPevGBw81GsXlm1Ztp8ceNirShEA="; + hash = "sha256-ef4NhViHQcV+4T+GXpg+Qev5IC0Cid+XWE3sFVx7w4w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix index e2cb5e76f0..ce68748ac7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, bleach , certifi , fetchPypi , lib @@ -8,19 +9,19 @@ , requests , tqdm , urllib3 -, bleach }: buildPythonPackage rec { pname = "kaggle"; - version = "1.5.13"; + version = "1.5.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g2TFbDYSXLgZWHbZEdC8nvvBcxZ+ljuenveTeJupp/4="; + sha256 = "sha256-prNUL1kM80GlrUQdWuAhvpO9ZEQclsdYsVSQNJWjpgA="; }; propagatedBuildInputs = [ + bleach certifi python-dateutil python-slugify diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix index 5597980acd..c86e2a2d6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , fetchPypi , pyyaml -, pytest +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "kaptan"; version = "0.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; + hash = "sha256-EBMwpE/e3oiFhvMBC9FFwOxIpIBrxWQp+lSHpndAIfg="; }; postPatch = '' @@ -20,9 +22,17 @@ buildPythonPackage rec { substituteInPlace requirements/base.txt --replace 'PyYAML>=3.13,<6' 'PyYAML>=3.13' ''; - propagatedBuildInputs = [ pyyaml ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytest ]; + propagatedBuildInputs = [ + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Configuration manager for python applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix index a9b15b4390..c02c0043ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y="; + hash = "sha256-wjZnro5sIRt8+vQYxA62sGnPi7Ittp3oSqph7aBBEg0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix index 199ab908ef..04d5b17c55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix @@ -4,6 +4,8 @@ , pythonOlder # build +, setuptools +, setuptools-git-versioning , setuptools-scm # propagates @@ -17,8 +19,8 @@ }: buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.5.0"; - format = "setuptools"; + version = "0.7.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,12 +28,14 @@ buildPythonPackage rec { owner = "keboola"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools + setuptools-git-versioning setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index a2a90aa851..f5275ea1a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,14 @@ buildPythonPackage rec { pname = "keras"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; + hash = "sha256-10KdHSExzH6x8uouwzAifH2dONqz398ueN7+5OzEP80="; + python = "py3"; + dist = "py3"; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix index 71faf0c4cf..134f5af063 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.1.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-2fdIStX8mwu7fsw8vzeVoXBpT72EglEzHlS6SLvuzHI="; + hash = "sha256-AXwrm1mUU8kpQHUO27IPF2hxIbKJARS/nTbfFKBicRc="; }; postPatch = '' @@ -62,8 +62,11 @@ buildPythonPackage rec { testtools ]; + # test_keystoneauth_betamax_fixture is incompatible with urllib3 2.0.0 + # https://bugs.launchpad.net/keystoneauth/+bug/2020112 checkPhase = '' - stestr run + stestr run \ + -E "keystoneauth1.tests.unit.test_betamax_fixture.TestBetamaxFixture.test_keystoneauth_betamax_fixture" ''; pythonImportsCheck = [ "keystoneauth1" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix index 031ae5a65c..c387c10ebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, keyutils +, pytestCheckHook +}: buildPythonPackage rec { pname = "keyutils"; @@ -16,8 +22,19 @@ buildPythonPackage rec { substituteInPlace setup.py --replace '"pytest-runner"' "" ''; + preBuild = '' + cython keyutils/_keyutils.pyx + ''; + + preCheck = '' + rm -rf keyutils + ''; + buildInputs = [ keyutils ]; - nativeCheckInputs = [ pytest pytest-runner ]; + nativeBuildInputs = [ cython ]; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix index d3276c622b..dd04b97010 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kivy/default.nix @@ -3,7 +3,7 @@ , pkg-config, cython, docutils , kivy-garden , mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer -, ApplicationServices, AVFoundation, libcxx +, Accelerate, ApplicationServices, AVFoundation, libcxx , withGstreamer ? true , gst_all_1 , pillow, requests, pygments @@ -20,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA="; }; + patches = [ + # Fixes incompatible function pointer conversion errors with clang 16. + # https://github.com/kivy/kivy/pull/8415 + (fetchpatch { + url = "https://github.com/kivy/kivy/commit/a0ec8ff79fcbc1b82391132a89c8fc21ef1c5c55.patch"; + hash = "sha256-2Kpkx75uWPiEiEqkOxBKl3HENKUGVHbQV4haeI5Gl3A="; + }) + ]; + nativeBuildInputs = [ pkg-config cython @@ -35,6 +44,7 @@ buildPythonPackage rec { mesa mtdev ] ++ lib.optionals stdenv.isDarwin [ + Accelerate ApplicationServices AVFoundation libcxx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3de..bc905e7726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; + hash = "sha256-5X5WOlf7IqFC2jTziswvwaXIZLwpyhUXqIq8lj5g1uw="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix index 641388fbdd..c19746970a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix @@ -1,35 +1,46 @@ { lib -, stdenv -, attrs , buildPythonPackage , fetchFromGitHub -, hyperlink -, hypothesis -, incremental -, python , pythonOlder -, treq + +# build-system +, setuptools +, wheel + +# dependencies +, attrs +, hyperlink +, incremental , tubes , twisted -, typing-extensions , werkzeug , zope_interface + +# tests +, idna +, python +, treq }: buildPythonPackage rec { pname = "klein"; - version = "unstable-2022-06-26"; - format = "setuptools"; + version = "unstable-2023-09-05"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "twisted"; repo = pname; - rev = "d8c2b92a3c77aa64c596696fb6f07172ecf94a74"; - hash = "sha256-RDZqavkteUbARV78OctZtLIrE4RoYDVAanjwE5i/ZeM="; + rev = "44b356ede27a667252ae5392014c802f0492c017"; + hash = "sha256-zHdyyx5IseFWr25BGLL0dDM8/5BDehsvbxIci+DEo9s="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ attrs hyperlink @@ -38,17 +49,17 @@ buildPythonPackage rec { tubes werkzeug zope_interface - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ - hypothesis + idna treq ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m twisted.trial klein + runHook postCheck ''; pythonImportsCheck = [ @@ -56,6 +67,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/twisted/klein/releases/tag/${version}"; description = "Klein Web Micro-Framework"; homepage = "https://github.com/twisted/klein"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index af8e8ed29b..f2fb806f47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.2"; + version = "5.3.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-C6IT9jCiyydycorvVqxog9w6LxNDXhAEj26X1IUG270="; + hash = "sha256-FJHfgmz8UXjIDz6J3W37po5ITvM024EHDrXLgJSzEWc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kotsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kotsu/default.nix index 47d78c8b91..f1f9389daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kotsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kotsu/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "0.3.3"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "datavaluepeople"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/krfzf-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/krfzf-py/default.nix new file mode 100644 index 0000000000..d55334d21e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/krfzf-py/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "krfzf-py"; + version = "0.0.6"; + format = "pyproject"; + + src = fetchPypi { + pname = "krfzf_py"; + inherit version; + hash = "sha256-/M9Atu9MLAGmnEdx6tknMJAit2o4Xt971uQ7pb0CBCk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ "fzf" ]; + + meta = with lib; { + description = "A Pythonic Fzf Wrapper"; + downloadPage = "https://github.com/justfoolingaround/fzf.py"; + homepage = "https://pypi.org/project/krfzf-py/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 8e97d083cd..2b28f76d05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "26.1.0"; + version = "27.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-2QkQGZ4Dho2PykH90ijosWWBzhQoCHoWhRL3ruOiDBg="; + hash = "sha256-KqQ7wUu5Se4WYOdtk9vMU3M5oyz0WgIltSEliCD7s10="; }; propagatedBuildInputs = [ 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 f5c9bdfed9..c0b635abf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.38.0"; + version = "3.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-AyQPI19As49GML3kVXtHtRNOKthrpkQ7MCmww+F6owc="; + hash = "sha256-t0Q+6tnUPK2oqjdAwwYeSebgn2EQ1fBivw115L8ndOg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch deleted file mode 100644 index d3e3082b35..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/0001-serialdriver-remove-pyserial-version-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001 -From: Rouven Czerwinski -Date: Wed, 17 Feb 2021 14:03:20 +0100 -Subject: [PATCH] serialdriver: remove pyserial version check - -This check isn't required on NixOS, since pyserial within NixOS already -contains the patches. - -Signed-off-by: Rouven Czerwinski ---- - labgrid/driver/serialdriver.py | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py -index 126f674e..59a92269 100644 ---- a/labgrid/driver/serialdriver.py -+++ b/labgrid/driver/serialdriver.py -@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol): - bindings = {"port": "SerialPort", } - else: - bindings = {"port": {"SerialPort", "NetworkSerialPort"}, } -- if version.parse(serial.__version__) != version.Version('3.4.0.1'): -- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n" -- "You can install the labgrid fork via:\n" -- "pip uninstall pyserial\n" -- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long -- warnings.warn(message) - - txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float)) - timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float)) --- -2.30.0 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix index bcae9b8839..aa4b10d49d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -17,28 +17,30 @@ , pyusb , pyyaml , requests +, setuptools , setuptools-scm +, wheel , xmodem }: buildPythonPackage rec { pname = "labgrid"; - version = "0.4.1"; + version = "23.0.3"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; - rev = "v${version}"; - sha256 = "0ih04lh1q3dysps4vfmk2rhqqrsimssadsxvbxdsnim2yihrrw47"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-yhlBqqCLOt6liw4iv8itG6E4QfIa7cW76QJqefUM5dw="; }; - patches = [ - # Pyserial within Nixpkgs already includes the necessary fix, remove the - # pyserial version check from labgrid. - ./0001-serialdriver-remove-pyserial-version-check.patch + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; - nativeBuildInputs = [ setuptools-scm ]; + pyproject = true; propagatedBuildInputs = [ ansicolors 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 865ce51b07..c2fabc40c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -6,19 +6,18 @@ , pythonRelaxDepsHook , poetry-core , aiohttp +, anyio , async-timeout , dataclasses-json +, jsonpatch , langsmith -, numexpr , numpy -, openapi-schema-pydantic , pydantic , pyyaml , requests , sqlalchemy , tenacity # optional dependencies -, anthropic , atlassian-python-api , azure-core , azure-cosmos @@ -43,7 +42,6 @@ , librosa , lxml , manifest-ml -, markdownify , neo4j , networkx , nlpcloud @@ -54,6 +52,7 @@ , pgvector , pinecone-client , psycopg2 +, pymongo , pyowm , pypdf , pytesseract @@ -63,11 +62,10 @@ , redis , requests-toolbelt , sentence-transformers -, spacy -, steamship , tiktoken , torch , transformers +, typer , weaviate-client , wikipedia # test dependencies @@ -77,8 +75,8 @@ , pytest-asyncio , pytest-mock , pytest-socket -, pytest-vcr , pytestCheckHook +, requests-mock , responses , syrupy , toml @@ -86,8 +84,8 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.285"; - format = "pyproject"; + version = "0.0.334"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -95,18 +93,11 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-3vOfwn8qvPd9dPRnsX14bVSLQQKHLPS5r15S8yAQFpw="; + hash = "sha256-mXPqc8wF9DhEtITm8h5R9kHBcMJ7AEK4kL5Z7V2p8NE="; }; sourceRoot = "${src.name}/libs/langchain"; - postPatch = '' - substituteInPlace langchain/utilities/bash.py \ - --replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", [' - substituteInPlace tests/unit_tests/test_bash.py \ - --replace "/bin/sh" "${bash}/bin/sh" - ''; - nativeBuildInputs = [ poetry-core pythonRelaxDepsHook @@ -122,30 +113,27 @@ buildPythonPackage rec { requests pyyaml numpy - openapi-schema-pydantic dataclasses-json tenacity aiohttp - numexpr langsmith + anyio + jsonpatch ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; passthru.optional-dependencies = { llms = [ - anthropic clarifai cohere openai - # openllm # openlm nlpcloud huggingface-hub manifest-ml torch transformers - # xinference ]; qdrant = [ qdrant-client @@ -183,13 +171,11 @@ buildPythonPackage rec { # azure-search-documents ]; all = [ - anthropic clarifai cohere openai nlpcloud huggingface-hub - # jina manifest-ml elasticsearch opensearch-py @@ -197,7 +183,6 @@ buildPythonPackage rec { faiss sentence-transformers transformers - spacy nltk wikipedia beautifulsoup4 @@ -206,6 +191,8 @@ buildPythonPackage rec { jinja2 pinecone-client # pinecone-text + # marqo + pymongo weaviate-client redis google-api-python-client @@ -239,7 +226,6 @@ buildPythonPackage rec { # O365 jq # docarray - steamship pdfminer-six lxml requests-toolbelt @@ -253,33 +239,35 @@ buildPythonPackage rec { # tigrisdb # nebula3-python # awadb - # esprima - # octoai-sdk + esprima rdflib # amadeus - # xinference librosa python-arango ]; + cli = [ + typer + ]; }; nativeCheckInputs = [ freezegun - markdownify + lark pandas pytest-asyncio pytest-mock pytest-socket - pytest-vcr pytestCheckHook + requests-mock responses syrupy toml - ] ++ passthru.optional-dependencies.all; + ]; pytestFlagsArray = [ # integration_tests have many network, db access and require `OPENAI_API_KEY`, etc. "tests/unit_tests" + "--only-core" ]; disabledTests = [ @@ -291,6 +279,10 @@ buildPythonPackage rec { "test_socket_disabled" ]; + pythonImportsCheck = [ + "langchain" + ]; + meta = with lib; { description = "Building applications with LLMs through composability"; homepage = "https://github.com/hwchase17/langchain"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix index 1ea97ccdb1..8747c0a8d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchainplus-sdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "langchainplus-sdk"; - version = "0.0.20"; + version = "0.0.21"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "langchainplus_sdk"; - hash = "sha256-PTAOLjKQ9ozJ2ELAWflFjeumDndsnnkDCWiMrRv7shk="; + hash = "sha256-frjZnQnOe6IHKrQk+Q/xMc5Akb+eBQ/eBzP545Fq6Xk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix index eb99c9b2b8..555cc9e479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { description = "Python toolkit for working with and comparing the standardized codes for languages"; homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index cdb89dc491..3b81c61288 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.35"; + version = "0.0.63"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-TR4vBsRImMLs7CTlBt1NHL+n65jXxBNbOY7wIlfFBfM="; + hash = "sha256-KE+WMnuWAq1stZuuwZkOPOKQ2lZNKtxzNbZMRoOdmz0="; }; sourceRoot = "${src.name}/python"; @@ -44,12 +44,24 @@ buildPythonPackage rec { disabledTests = [ # These tests require network access "integration_tests" + # due to circular import + "test_as_runnable" + "test_as_runnable_batch" + "test_as_runnable_async" + "test_as_runnable_async_batch" + ]; + + disabledTestPaths = [ + # due to circular import + "tests/integration_tests/test_client.py" ]; pythonImportsCheck = [ "langsmith" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index b5ba6c7583..3158b626c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -1,23 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, python +, fetchpatch , regex , pytestCheckHook , js2py +, setuptools }: buildPythonPackage rec { pname = "lark"; - version = "1.1.5"; + version = "1.1.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-drvF+0PSOdrha2rfpntrM8xIbeb0S7eNtfioxkdjEKw="; + hash = "sha256-k74tozIgJuwtUqKKmYHlfLpCWyT2hdoygRJiIpw+GDE="; }; + patches = [ + # include .lark files in package data + # https://github.com/lark-parser/lark/pull/1308 + (fetchpatch { + url = "https://github.com/lark-parser/lark/commit/656334cb8793fd4e08a12843eaced5a7bb518be3.patch"; + hash = "sha256-pYeNnFfXJ8xkR0KsU/KMWJ8nF+BhP9PXEANiVhT254s="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix index f0da746107..cecba90e33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix @@ -1,38 +1,50 @@ { lib , buildPythonPackage +, dill , fetchFromGitHub , hatchling -, dill , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "latexify-py"; - version = "0.2.0"; + version = "0.3.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "google"; repo = "latexify_py"; rev = "refs/tags/v${version}"; - hash = "sha256-b0/cKMfIONVd6A5AYRyLx/qsFVpUjeAsadQyu/mPYxo="; + hash = "sha256-uWSLs7Dem+cj93RWIincCXzPkjZUwQskpDac/L+fgjQ="; }; - nativeBuildInputs = [ hatchling ]; + nativeBuildInputs = [ + hatchling + ]; - propagatedBuildInputs = [ dill ]; + propagatedBuildInputs = [ + dill + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "latexify" + ]; preCheck = '' cd src ''; - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "latexify" ]; - meta = with lib; { description = "Generates LaTeX math description from Python functions"; homepage = "https://github.com/google/latexify_py"; + changelog = "https://github.com/google/latexify_py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr/config.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr/config.nix index b10ad25972..bc369705e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr/config.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr/config.nix @@ -1,13 +1,54 @@ -{ buildPythonPackage, fetchPypi, lazr_delegates }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, lazr-delegates +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "lazr.config"; - version = "2.2.3"; - - propagatedBuildInputs = [ lazr_delegates ]; + pname = "lazr-config"; + version = "3.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; + pname = "lazr.config"; + inherit version; + hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lazr-delegates + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.config" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # change the directory to avoid a namespace-related problem + # ModuleNotFoundError: No module named 'lazr.delegates' + preCheck = '' + cd $out + ''; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Create configuration schemas, and process and validate configurations"; + homepage = "https://launchpad.net/lazr.config"; + changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix index 40e2e47d51..e0b03e6931 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr/delegates.nix @@ -1,15 +1,46 @@ -{ buildPythonPackage, fetchPypi, nose, zope_interface }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "lazr.delegates"; - version = "2.0.4"; - - propagatedBuildInputs = [ nose zope_interface ]; - - doCheck = false; # cannot import name 'ClassType' from 'types' + pname = "lazr-delegates"; + version = "2.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + pname = "lazr.delegates"; + inherit version; + hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.delegates" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Easily write objects that delegate behavior"; + homepage = "https://launchpad.net/lazr.delegates"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy-imports/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/lazy-imports/default.nix index 31aabf305c..e15b322600 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy_imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy-imports/default.nix @@ -6,7 +6,7 @@ , packaging }: let - pname = "lazy_imports"; + pname = "lazy-imports"; version = "0.3.1"; in buildPythonPackage { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledger-bitcoin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledger-bitcoin/default.nix index edfc9c7f22..c2ad7b47f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -4,18 +4,20 @@ , setuptools , ledgercomm , packaging +, bip32 +, coincurve , typing-extensions }: buildPythonPackage rec { pname = "ledger-bitcoin"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ledger_bitcoin"; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; + hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI="; }; nativeBuildInputs = [ @@ -25,6 +27,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ledgercomm packaging + bip32 + coincurve typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgercomm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgercomm/default.nix index 092378a142..15bac008f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgercomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgercomm/default.nix @@ -2,20 +2,22 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "ledgercomm"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs="; + hash = "sha256-HunJjIRa3IpSL/3pZPf6CroLxEK/l7ihh737VOAILgU="; }; nativeBuildInputs = [ setuptools + setuptools-scm ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix index 47a9d2c39c..037ae3cda6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.22.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-rqbZ2+UfWhh5qEd1GL6W9edHPCSNnK3s/Y2aT3R5wCA="; + hash = "sha256-O39Xe26WKAGcv6DEvwuOL8NZJBem5SYZDX1TPAY7/uA="; }; nativeBuildInputs = [ 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 943ed138f9..43f2e11ef3 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 @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "4.0"; + version = "5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; - rev = version; - sha256 = "1ar7lj1lpisklq2q07d95yhlbfq25g9g61hcj8whj17mq8vrvml1"; + rev = "refs/tags/${version}"; + sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; }; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix new file mode 100644 index 0000000000..24d0e287ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, llvmPackages +, setuptools +, writeText +}: + +let + libclang = llvmPackages.libclang; + + pyproject_toml = writeText "pyproject.toml" '' + [build-system] + requires = ["setuptools>=42", "wheel"] + build-backend = "setuptools.build_meta" + ''; + + setup_cfg = writeText "setup.cfg" '' + [metadata] + name = clang + version = ${libclang.version} + + [options] + packages = clang + ''; +in buildPythonPackage { + pname = "libclang"; + format = "pyproject"; + + inherit (libclang) version src; + + buildInputs = [ setuptools ]; + + postUnpack = '' + # set source root to python bindings + if [ -e "$sourceRoot/clang/bindings/python" ]; then + # LLVM 13+ puts clang sources in subdirectory instead of plain tarball + sourceRoot="$sourceRoot/clang/bindings/python" + else + sourceRoot="$sourceRoot/bindings/python" + fi + ''; + + postPatch = '' + # link in our own build info to build as a python package + ln -s ${pyproject_toml} ./pyproject.toml + ln -s ${setup_cfg} ./setup.cfg + + # set passed libclang for runtime + echo 'Config.set_library_path("${lib.getLib libclang}/lib")' >>./clang/cindex.py + ''; + + meta = libclang.meta // { + description = "Python bindings for the C language family frontend for LLVM"; + maintainers = with lib.maintainers; [ lilyinstarlight ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 991a51203d..abad21fe67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,14 +28,14 @@ buildPythonPackage rec { owner = "instagram"; repo = "libcst"; rev = "refs/tags/v${version}"; - hash = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; + hash = "sha256-kFs7edBWz0GRbgbLDmtpUVi5R+6mYXsJSvceOoPW9ck="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-rPB3bAMdvjgsT3jkEDoWatW8LPwgIaFSbFPqiqANtBY="; + hash = "sha256-fhaHiz64NH6S61fSXj4gNxxcuB+ECxWSSmG5StiFr1k="; }; cargoRoot = "native"; @@ -92,6 +92,7 @@ buildPythonPackage rec { meta = with lib; { description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; + changelog = "https://github.com/Instagram/LibCST/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit asl20 psfl ]; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix new file mode 100644 index 0000000000..1913d07651 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libknot/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, hatchling + +# native dependencies +, knot-dns +}: + +buildPythonPackage rec { + pname = "libknot"; + version = "3.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uttdIl2ONoR9ba6gJXmJkU++UQldcezwTUG+X5mCcbE="; + }; + + postPatch = '' + substituteInPlace libknot/__init__.py \ + --replace "libknot%s.dylib" "${lib.getLib knot-dns}/lib/libknot%s.dylib" \ + --replace "libknot.so%s" "${lib.getLib knot-dns}/lib/libknot.so%s" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + pythonImportsCheck = [ + "libknot" + ]; + + meta = with lib; { + description = "Python bindings for libknot"; + homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/libknot"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + mainProgram = "libknot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix index d07c08bc65..ec6d1e4425 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix @@ -2,39 +2,37 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch +, poetry-core , libsodium , pytestCheckHook }: buildPythonPackage rec { pname = "libnacl"; - version = "1.7.2"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "saltstack"; repo = pname; rev = "v${version}"; - hash = "sha256-nttR9PQimhqd2pByJ5IJzJ4RmSI4y7lcX7a7jcK+vqc="; + hash = "sha256-phECLGDcBfDi/r2y0eGtqgIX/hvirtBqO8UUvEJ66zo="; }; - patches = [ - # Fixes build on 32-bit platforms - (fetchpatch { - name = "fix-crypto_kdf_derive_from_key-32bit.patch"; - url = "https://github.com/saltstack/libnacl/commit/e8a1f95ee1d4d0806fb6aee793dcf308b05d485d.patch"; - hash = "sha256-z6TAVNfPcuWZ/hRgk6Aa8I1IGzne7/NYnUOOQ3TjGVU="; - }) - ]; + nativeBuildInputs = [ poetry-core ]; buildInputs = [ libsodium ]; postPatch = let soext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - substituteInPlace "./libnacl/__init__.py" --replace \ - "ctypes.cdll.LoadLibrary('libsodium${soext}')" \ - "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" + substituteInPlace "./libnacl/__init__.py" \ + --replace \ + "l_path = ctypes.util.find_library('sodium')" \ + "l_path = None" \ + --replace \ + "ctypes.cdll.LoadLibrary('libsodium${soext}')" \ + "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" ''; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 03cdeea14e..a93b6b0d99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { @@ -41,22 +41,23 @@ buildPythonPackage rec { repo = "librosa"; rev = "refs/tags/${version}"; fetchSubmodules = true; # for test data - hash = "sha256-MXzPIcbG8b1JwhEyAZG4DRObGaHq+ipVHMrZCzaxLdE="; + hash = "sha256-zbmU87hI9A1CVcBZ/5FU8z0t6SS4jfJk9bj9kLe/EHI="; }; - patches = [ - # https://github.com/librosa/librosa/pull/1731 - (fetchpatch { - name = "support-scipy-1.11.patch"; - url = "https://github.com/librosa/librosa/commit/12dee8eabed7df14c5622b52c05393ddfeb11f4b.patch"; - hash = "sha256-JxTXU0Mc+QYpsafjoGLaIccD7EdCYJvIVianeosYpw4="; - }) - ]; - nativeBuildInputs = [ setuptools ]; + patches = [ + (fetchpatch { + # https://github.com/librosa/librosa/issues/1754 + # https://github.com/librosa/librosa/pull/1755 + name = "matplotlib-3.8-compat.patch"; + url = "https://github.com/librosa/librosa/commit/beef47885ce1255b43b65e48ea2054ddace37c6c.patch"; + hash = "sha256-rrnlUHXHY2me4BWGs3wFq8WJmz75CbXTWKFp3VdJKzE="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report term-missing --cov librosa --cov-report=xml " "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index 80ad5590d9..bdafac9426 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538"; + sha256 = "4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index abc87f9d78..3e5d6af48a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.7.0"; + version = "9.9.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-DFZPZx+jkxdNha+h50IXxl6wOwA1VjudRICgxD2V4+k="; + hash = "sha256-cajKzRRhKCUKWm+1p3xvCyEbVB2R/70WY584o7V+XaY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index 38ec2aaa5b..d2fc8cbc13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -2,33 +2,47 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system , cmake +, ninja +, pathspec +, pyproject-metadata +, scikit-build-core + +# dependencies +, llvmPackages , numpy , scipy , scikit-learn -, llvmPackages ? null , pythonOlder -, python + +# optionals: gpu +, boost +, cudatoolkit , ocl-icd , opencl-headers -, boost , gpuSupport ? stdenv.isLinux }: buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.5"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; + hash = "sha256-vuWd0mmpOwk/LGENSmaDp+qHxj0+o1xiISPOLAILKrw="; }; nativeBuildInputs = [ cmake + ninja + pathspec + pyproject-metadata + scikit-build-core ]; dontUseCmakeConfigure = true; @@ -37,6 +51,7 @@ buildPythonPackage rec { llvmPackages.openmp ]) ++ (lib.optionals gpuSupport [ boost + cudatoolkit ocl-icd opencl-headers ]); @@ -47,13 +62,7 @@ buildPythonPackage rec { scikit-learn ]; - buildPhase = '' - runHook preBuild - - ${python.pythonForBuild.interpreter} setup.py bdist_wheel ${lib.optionalString gpuSupport "--gpu"} - - runHook postBuild - ''; + pypaBuildFlags = lib.optionalString gpuSupport "--config-setting=cmake.define.USE_CUDA=ON"; postConfigure = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix index 8ee1006704..2146f1b9a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-O4yENynvon9xM8F/r0NMSpSh6Hl2EoTcXgldrwzo24M="; + hash = "sha256-VLfFWFcwLgEEvPUKQ00QjEq1HN28OpE6Eu1eyF+TwXU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix index d929b5e214..10decb4f3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/line-profiler/default.nix @@ -1,19 +1,19 @@ { lib , buildPythonPackage , fetchPypi -, cython +, cython_3 , isPyPy , ipython -, python , scikit-build , cmake , pythonOlder , pytestCheckHook +, ubelt }: buildPythonPackage rec { pname = "line-profiler"; - version = "4.0.2"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -21,22 +21,23 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw="; + hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI="; }; nativeBuildInputs = [ - cython + cython_3 cmake scikit-build ]; - propagatedBuildInputs = [ - ipython - ]; + passthru.optional-dependencies = { + ipython = [ ipython ]; + }; nativeCheckInputs = [ pytestCheckHook - ]; + ubelt + ] ++ passthru.optional-dependencies.ipython; dontUseCmakeConfigure = true; @@ -44,8 +45,9 @@ buildPythonPackage rec { rm -f _line_profiler.c ''; - checkPhase = '' - PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s . + preCheck = '' + rm -r line_profiler + export PATH=$out/bin:$PATH ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linear_operator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linear_operator/default.nix index f42522016c..1bf11865df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linear_operator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linear_operator/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "linear_operator"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; - rev = "v${version}"; - hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix index 21c99442f7..660e3cd2d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix @@ -4,12 +4,13 @@ , pythonOlder , pytestCheckHook , uc-micro-py +, setuptools }: buildPythonPackage rec { pname = "linkify-it-py"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,13 +18,24 @@ buildPythonPackage rec { owner = "tsutsu3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk="; + hash = "sha256-e3k2RblqvzWSSIrJL6ib2dxFw7T5vXlN8DrCV1qEr6w="; }; - propagatedBuildInputs = [ uc-micro-py ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "linkify_it" ]; + propagatedBuildInputs = [ + uc-micro-py + ]; + + pythonImportsCheck = [ + "linkify_it" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Links recognition library with full unicode support"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix index 906f5eb40a..4c1b77bf86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.0.0"; + version = "5.7.2"; disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures src = fetchFromGitHub { owner = "linode"; repo = "python-linode-api"; - rev = version; - sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-RU/GyNYV05iYVNanMqKMmoksXWrxTQ2H2XvaIwSSslA="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix index b4dee1e20b..1467dfaa1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lit"; - version = "15.0.6"; + version = "17.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k="; + hash = "sha256-RIZ65Xa1eQVnsSC8Pw2fAh2slCTRsIQMdazYX0YQrAQ="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix index 1e75776f0c..ef70a50f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -8,7 +8,7 @@ , tiktoken }: let - version = "0.1.590"; + version = "0.11.1"; in buildPythonPackage rec { pname = "litellm"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; - rev = "7cb96e86b4753008cbf8d116aca514750e98d360"; - hash = "sha256-ITMcwGjelNfNGnfBmmdu0Xwph4u0mxiFSfHnysUxWCQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-5Zk1lc7G0dU/AoLE5V+p30wE/gRfYRPsVS3sNgwWzCU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index fd45045076..85c6d0fb50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_cython + ${python.pythonOnBuildForHost.interpreter} setup.py build_cython ''; # On Darwin, the test requires macFUSE to be installed outside of Nix. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix index 2e19ff0d9b..f312371afe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "2.2.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-BLK41TRaYNtpeeDeGZhlvnvkQwWo0uGB19g34waRqFk="; + hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix index e44f6e609d..03af7530a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-Sdyl/ccyhKRP5eb866ly1ZJrrFSQMLdX22R7UNRfDCA="; + hash = "sha256-8HrPnMmzoxgAhu3Qm18FBJ3kNoGOD7bGmI1t7tcETwM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix index 9467f003c7..b03fd98eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.10.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY="; + hash = "sha256-lWl6654nbOBCec24iJ7GGKEcYy/gYDn9wMil3PPqWkk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index 75cc1f9b2c..93e9d8937b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Delgan"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JwhJPX58KrPdX237L43o77spycLAVFv3K9njJiRK30Y="; + hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 1f70289425..ee84d47edf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.1"; + version = "1.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-xCC0AEiHrulxNdBf59ap9oKh/mF1u9IzZsPYFJeHNR0="; + hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix index 7ce32f9cde..801d68dccb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix @@ -3,23 +3,28 @@ , fetchPypi , pytestCheckHook , pythonOlder +, setuptools }: let pname = "lru-dict"; - version = "1.2.0"; + version = "1.3.0"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-E8VngvGdaN302NsBcAQRkoWWFlFMcGsSbQ3y7HKhG9c="; + hash = "sha256-VP0ZZta9H83ngVlsuGBoIU7e6/8dsTos6hEHnj/Qe2s="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix index 702f6257b7..a7860e9154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.8"; + version = "3.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-refOq/QWRv1naCskVm6h1QmCH9/YkDJ90HU3Hzc2w4A="; + hash = "sha256-VGLSVv/+UpgeSTHoOTjEfQSAYfXA3bAI+yKjcKBI1Z4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix index a2e17eb400..5ee4d3ed11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix @@ -4,6 +4,7 @@ , cattrs , fetchFromGitHub , flit-core +, importlib-resources , jsonschema , nox , pyhamcrest @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.0a2"; + version = "2023.0.0b1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AEvs2fb8nhWEFMyLvwNv9HoxxxE50/KW3TGZ5pDf4dc="; + hash = "sha256-Y/Mp/8MskRB6irNU3CBOKmo2Zt5S69h+GyMg71sQ9Uw="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ buildPythonPackage rec { ]; checkInputs = [ + importlib-resources jsonschema pyhamcrest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix deleted file mode 100644 index eae9f78b26..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ludios_wpull/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, chardet -, dnspython -, html5-parser -, lxml -, namedlist -, sqlalchemy -, tornado -, yapsy -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "ludios_wpull"; - version = "3.0.9"; - - # https://github.com/ArchiveTeam/ludios_wpull/issues/20 - disabled = pythonAtLeast "3.9"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "ludios_wpull"; - sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; - }; - - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado yapsy ]; - - # Test suite has tests that fail on all platforms - doCheck = false; - - meta = { - description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ArchiveTeam/ludios_wpull"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ivan ]; - broken = lib.versions.major tornado.version != "4"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix index b3c82f707f..d2481a5bad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g2EEyPhsQZ+VKP/kSjZdQ9ns0NlptH8l2h0vTTLpF54="; + hash = "sha256-mij5WGIl60D7ya1SdIvZ8TEgIZhJ9Xd2kcUnnbO1dD4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 0deabb0661..6081f17c27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.4"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-JQgeujIfVJrIQ5Z0znqYPiKFocEDgF2Fo89QwgS+gfw="; + hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix new file mode 100644 index 0000000000..8df03f5268 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pytest-mypy-plugins +, lxml +}: + +buildPythonPackage rec { + pname = "lxml-stubs"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lxml"; + repo = "lxml-stubs"; + rev = version; + hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + lxml + ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mypy-plugins + ]; + + meta = with lib; { + description = "Type stubs for the lxml package"; + homepage = "https://github.com/lxml/lxml-stubs"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 942699156a..02dd3c540a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "m2r"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; + sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index 95635b94d5..353e2c0e05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,6 +2,11 @@ , stdenv , buildPythonPackage , fetchPypi + +# build-system +, setuptools + +# dependencies , spake2 , pynacl , six @@ -9,12 +14,17 @@ , twisted , autobahn , automat -, hkdf , tqdm , click , humanize , txtorcon + +# optional-dependencies +, noiseprotocol + +# tests , nettools +, unixtools , mock , magic-wormhole-transit-relay , magic-wormhole-mailbox-server @@ -23,13 +33,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.12.0"; + version = "0.13.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; + hash = "sha256-rDvWgoYnDn8UnAYUmo5Anl+jTX/rDoiESibSnu0tFRY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ spake2 pynacl @@ -38,25 +53,30 @@ buildPythonPackage rec { twisted autobahn automat - hkdf tqdm click humanize txtorcon - ] ++ autobahn.optional-dependencies.twisted + ] + ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; + passthru.optional-dependencies = { + dilation = [ + noiseprotocol + ]; + }; + nativeCheckInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server pytestCheckHook - ]; + ] + ++ passthru.optional-dependencies.dilation + ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; - disabledTests = [ - # Expected: (,) Got: Failure instance: Traceback (failure with no frames): : - "test_welcome" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ # These tests doesn't work within Darwin's sandbox "test_version" "test_text" @@ -92,6 +112,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://github.com/magic-wormhole/magic-wormhole"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index fa711c1b4c..2f234cc635 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; + # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c++14"; + }; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix index 6c52490dc0..bb584d6797 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailmanclient/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; homepage = "https://www.gnu.org/software/mailman/"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix index 8fa3393d1e..03d4c5c05d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "maison"; - version = "1.4.0"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbatten5"; - repo = pname; + repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-Ny/n1vDWS6eA9zLIB0os5zrbwvutb+7sQ6iPXeid1M0="; + hash = "sha256-uJW+7+cIt+jnbiC+HvT7KzyNk1enEtELTxtfc4eXAPU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix index fd699821f6..ccc0e99b51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; - rev = "v${version}"; - hash = "sha256-ph+1bb1jhqqDE2d4F8lTf7LAzN7DWpDTGn8qhCiccKA="; + rev = "refs/tags/v${version}"; + hash = "sha256-2kFzB1xLVEvO7Vo39lwQsVirRY6Z8GMczWK2b1oVYTg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix index 3135ded66e..cec9773449 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "0.11.0"; + version = "1.3"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + hash = "sha256-psgUg55NiyONo3ob4UIMrO793UrxGMZV73hj4HRCR8E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix index 443415470b..9fec1f0aa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "manimpango"; - version = "0.4.3"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ManimCommunity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FT3X6TmGfwd8kRPtuqy78ZCGeEGGg6IJEeEpB7ZbIsA="; + hash = "sha256-EBSbvjQyQIXOzvQMbuTwOoV8xSAOYDlCBZ56NLneuQI="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index 587dc99080..8b069fd235 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/marisa-trie"; changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index 3330817fb8..ed3df6f804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -6,6 +6,7 @@ , flit-core , linkify-it-py , markdown +, mdit-py-plugins , mdurl , mistletoe , mistune @@ -25,7 +26,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "2.2.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -34,7 +35,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qdRU1BxczFDGoIEtl0ZMkKNn4p5tec8YuPt5ZwX5fYM="; + hash = "sha256-cmjLElJA61EysTUFMVY++Kw0pI4wOIXOyCY3To9fpQc="; }; # fix downstrem usage of markdown-it-py[linkify] @@ -69,6 +70,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { compare = [ commonmark markdown mistletoe mistune panflute ]; linkify = [ linkify-it-py ]; + plugins = [ mdit-py-plugins ]; rtd = [ attrs myst-parser pyyaml sphinx sphinx-copybutton sphinx-design sphinx-book-theme ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix index e95cbe3c4c..e0e41bf3d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-macros/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { patches = [ # Fixes a bug with markdown>2.4 + # https://github.com/wnielson/markdown-macros/pull/1 (fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + name = "wnielson-markdown-macros-pull-1.patch"; + url = "https://github.com/wnielson/markdown-macros/commit/e38cba9acb6789cc128f6fe9ca427ba71815a20f.patch"; sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix index 97eeb09d7b..f898acad51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9.1"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; + hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix index 64f7ac67fa..5034346b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix @@ -7,20 +7,19 @@ , http-ece , python-dateutil , python-magic -, pytz , requests , six , pytestCheckHook , pytest-mock , pytest-vcr , requests-mock +, setuptools }: buildPythonPackage rec { pname = "mastodon-py"; version = "1.8.1"; - - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "halcy"; @@ -30,26 +29,45 @@ buildPythonPackage rec { }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i '/addopts/d' setup.cfg ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ blurhash - cryptography decorator - http-ece python-dateutil python-magic - pytz requests six ]; + passthru.optional-dependencies = { + blurhash = [ + blurhash + ]; + webpush = [ + http-ece + cryptography + ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-vcr requests-mock + setuptools + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + disabledTests = [ + "test_notifications_dismiss_pre_2_9_2" + "test_status_card_pre_2_9_2" + "test_stream_user_direct" + "test_stream_user_local" ]; pythonImportsCheck = [ "mastodon" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 97b9090cc2..1646d3ac72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, unittestCheckHook +, pytestCheckHook , pythonOlder , fetchFromGitLab , substituteAll @@ -88,9 +88,12 @@ buildPythonPackage rec { install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" ''; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; - unittestFlagsArray = [ "-v" ]; + disabledTests = [ + # Frequently fails when exiftool is updated and adds support for new metadata. + "test_all_parametred" + ]; meta = with lib; { description = "A handy tool to trash your metadata"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index e5df4ea7d4..4ac081e26a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -79,7 +79,7 @@ let in buildPythonPackage rec { - version = "3.7.2"; + version = "3.8.0"; pname = "matplotlib"; format = "pyproject"; @@ -87,7 +87,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-qM25Hd2wRDa9LwmLj99LgTUuaM9NLGdW/MQUeRB2Vps="; + hash = "sha256-34UF4cGdXCwmr/NJeny9PM/C6XBD0eTbPnavo5kWS2k="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 77f47543c5..db6b13b0fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.21.2"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0="; + hash = "sha256-hFSS2Nys95YJgBNED8SBan24iRo2q/UOr6pqUPAF5Ms="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 68bd4b5c29..199b4ab8a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.2"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-c6NSDFQGKtT8Otw+ivNUZ2+Qm/LEDGpZNs3FrYq+N1A="; + hash = "sha256-7ZSPxKRLAgwC1ECxa1eOTH60cMJXs1iv2PE2Vq9f0co="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix index 15e6195580..e96d668265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix @@ -1,21 +1,27 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage + +# build-system +, setuptools + +# dependencies , dateparser , humanize -, pendulum -, pytz -, snaptime , tzlocal -, pytestCheckHook +, pendulum +, snaptime +, pytz + +# tests , freezegun -, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "maya"; version = "0.6.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "kennethreitz"; @@ -24,16 +30,16 @@ buildPythonPackage rec { hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; }; - # fix humanize incompatibility - # https://github.com/timofurrer/maya/commit/d9cd563d1b1ba16bcff4dacb4ef49edd4e32fd1d.patch - # ^ does not apply on 0.6.1 postPatch = '' + # function was made private in humanize substituteInPlace maya/core.py \ - --replace \ - "humanize.time.abs_timedelta" \ - "humanize.time._abs_timedelta" + --replace "humanize.time.abs_timedelta" "humanize.time._abs_timedelta" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dateparser humanize @@ -44,15 +50,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook freezegun - pytest-mock + pytestCheckHook ]; meta = with lib; { description = "Datetimes for Humans"; homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix index bdc0a74007..a34f98cdae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix @@ -3,12 +3,14 @@ , buildPythonPackage , envisage , fetchPypi +, fetchpatch , numpy , packaging , pyface , pygments , pyqt5 , pythonOlder +, pythonAtLeast , traitsui , vtk , wrapQtAppsHook @@ -18,14 +20,31 @@ buildPythonPackage rec { pname = "mayavi"; version = "4.8.1"; format = "setuptools"; - - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; + patches = [ + # Adds compatibility with Python 3.11. + # https://github.com/enthought/mayavi/pull/1199 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch"; + hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0="; + includes = [ "tvtk/src/*" ]; + }) + # Fixes an incompatible function pointer conversion error + # https://github.com/enthought/mayavi/pull/1266 + (fetchpatch { + name = "incompatible-pointer-conversion.patch"; + url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch"; + hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo="; + }) + ]; + postPatch = '' # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix index e50c405334..c0b6eec7f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.9.0"; + version = "1.9.1"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; + hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix index 2b48bcfa45..de5a1d2ac6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-gfm/default.nix @@ -4,7 +4,6 @@ , linkify-it-py , markdown-it-py , mdformat -, mdformat-gfm , mdformat-tables , mdit-py-plugins , poetry-core @@ -45,6 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "test_default_style__api" + "test_default_style__cli" + ]; + pythonImportsCheck = [ "mdformat_gfm" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix index 772d954708..ad3e8580f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.5"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-U6Qh/1GklW9ZXBXmjPLuxga0JS/Cyga1iorcMEA+WP8="; + hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index 878f85600d..e347aa107d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { homepage = "https://github.com/SamuraiT/mecab-python3"; changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index 3060c2f460..0f89f3f425 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -2,25 +2,56 @@ , buildPythonPackage , fetchPypi , html5lib +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mechanize"; - version = "0.4.8"; + version = "0.4.9"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XoasB3c1fgBusEzSj37Z+BHUjf+mA9OJGsbSuSKA3JE="; + hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE="; }; - propagatedBuildInputs = [ html5lib ]; + nativeBuildInputs = [ + setuptools + ]; - doCheck = false; + propagatedBuildInputs = [ + html5lib + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mechanize" + ]; + + disabledTestPaths = [ + # Tests require network access + "test/test_urllib2_localnet.py" + "test/test_functional.py" + ]; + + disabledTests = [ + # Tests require network access + "test_pickling" + "test_password_manager" + ]; meta = with lib; { description = "Stateful programmatic web browsing in Python"; homepage = "https://github.com/python-mechanize/mechanize"; - license = "BSD-style"; + changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix index c37aa8f867..2c58382a47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.8"; + version = "1.1.9"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; + hash = "sha256-WUOxtE0NfXi0fpdasZTqixPhVV2+Refatvf6dgCb0Z8="; }; nativeBuildInputs = [ flit-core ]; 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 df0dd2cb1b..1e0dbb1668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix @@ -33,13 +33,13 @@ assert !lapack.isILP64; buildPythonPackage rec { pname = "meep"; - version = "1.25.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "NanoComp"; repo = pname; - rev = "v${version}"; - hash = "sha256-4rIz2RXLSWzZbRuv8d4nidOa0ULYc4QHIdaYrGu1WkI="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ha6YPlvq2HUTuEqngFOAJUqCahBi7L7O8qsIMMfbrY="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix index 7473514cd6..218772a152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/memory_profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix @@ -4,11 +4,12 @@ }: python.pkgs.buildPythonPackage rec { - pname = "memory_profiler"; + pname = "memory-profiler"; version = "0.61.0"; src = fetchPypi { - inherit pname version; + pname = "memory_profiler"; + inherit version; sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix index cafa77c1e5..c97624c73c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.37.3"; + version = "1.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pq/+giQwxvMey5OS8OtKH8M5fKmDuweuod6+hviY7P8="; + hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index 5de72c96f1..7947ca1f60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.5.9"; + version = "0.4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-Wyg9Y4THnjNTWQsiOanoyEEBqVgsG5MeyoGE69/n8sM="; + hash = "sha256-8DnzTwW4fQQIGAHZJbu2aKkqOUU6a6IGgif5tIZCing="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix index 2f441ca711..fe4e8dd598 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "1.2.1"; + version = "2.1.1"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-SJiAuQSnatBnsZpwF3KyBTd1oiNjCpJEepq7t0QjoAQ="; + hash = "sha256-1wyXndB7xQy1jnfHsIqMQgsvmGYUhjDuSBB2M0GcXC4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 0a0cf8966c..8bfb65056f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.9"; + version = "2.2.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-VHL5wxq9Ckczur5jmmsYzOnQhLwCXftR8rmBGQ80gOo="; + hash = "sha256-W//mDKtTWjcKT43n82OU3h4yKrNZMAVzLzQCjsmkJP0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/add-build-flags.sh b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/add-build-flags.sh index d2535d1fd5..d9327960eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,6 +1,10 @@ -# Add all of mesonFlags to -Csetup-args for pypa builds -for f in $mesonFlags; do - pypaBuildFlags+=" -Csetup-args=$f" - # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html - pipBuildFlags+=" --config-settings=setup-args=$f" -done +mesonPythonBuildFlagsHook() { + # Add all of mesonFlags to -Csetup-args for pypa builds + for f in $mesonFlags; do + pypaBuildFlags+=" -Csetup-args=$f" + # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html + pipBuildFlags+=" --config-settings=setup-args=$f" + done +} + +postConfigureHooks+=(mesonPythonBuildFlagsHook) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix index 4b45ee4e77..84031db71b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.13.1"; + version = "0.14.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-Y7MXAAFCXEL6TP7a25BRy9KJJf+O7XxA02ugCZ48dhg="; + hash = "sha256-uWhmaQMmVE3+RSWDdTrD9DMTIn6f2UFnAajfkK8hIjQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix index 46bf44bf8a..0b210e18d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -8,7 +8,7 @@ , fetchPypi , filebrowser_safe , future -, grappelli_safe +, grappelli-safe , isPyPy , pep8 , pillow @@ -46,7 +46,7 @@ buildPythonPackage rec { django-contrib-comments filebrowser_safe future - grappelli_safe + grappelli-safe pillow pytz requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix index 6ade4b8ecb..2b2a7c9fca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mhcflurry/default.nix @@ -7,7 +7,6 @@ , nose , pandas , pytestCheckHook -, pythonRelaxDepsHook , pyyaml , scikit-learn , tensorflow @@ -16,23 +15,16 @@ buildPythonPackage rec { pname = "mhcflurry"; - version = "2.0.6"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openvax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Cr7L6uo6Kc1PSeG5nK6zQSD7eeCFcUJUzhsX+waz7og="; + hash = "sha256-VyPHcNlZYgNJZb2UBFX55x+nE0GnHixkcsiTNjDCju0="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRemoveDeps = [ - # See https://github.com/openvax/mhcflurry/issues/216. - "np-utils" - ]; - # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. propagatedBuildInputs = [ appdirs @@ -75,10 +67,6 @@ buildPythonPackage rec { "test_run_serial" "test_speed_allele_specific" "test_speed_pan_allele" - - # See https://github.com/openvax/mhcflurry/issues/217 - "test_more" - "test_small" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix index 9b9b25ee37..65702b23c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -6,15 +6,18 @@ , portmidi , python-rtmidi , pytestCheckHook +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "mido"; - version = "1.2.10"; + version = "1.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "17b38a8e4594497b850ec6e78b848eac3661706bfc49d484a36d91335a373499"; + sha256 = "sha256-hCguOs40vKP5hCINstvLmCRc/q+4VCYMAuAAdQ3Khqo="; }; patches = [ @@ -24,6 +27,11 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ python-rtmidi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix index a6d2c883fc..7e18975095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.0.11"; pyproject = true; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI as git repository does not have release tags or branches src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix index 98844b1e8e..c95a26eb6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistletoe/default.nix @@ -1,20 +1,21 @@ { lib , fetchPypi , buildPythonPackage +, parameterized , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "mistletoe"; - version = "1.0.1"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sfia+weaGxpULp7ywI3UUKB6K9k1wDyrIsMorXyk2Og="; + hash = "sha256-fQwas3RwR9Fp+fxLkl0cuj9cE+rwuQw2W3LkflnQCgI="; }; pythonImportsCheck = [ @@ -22,6 +23,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + parameterized pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lune/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock similarity index 56% rename from third_party/nixpkgs/pkgs/development/interpreters/lune/Cargo.lock rename to third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock index 2628328e33..a09043a1cb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lune/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,104 +18,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "1.0.2" +name = "aead" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aho-corasick" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "alloc-no-stdlib" -version = "2.0.4" +name = "anes" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "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.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", -] +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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", -] +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +dependencies = [ + "backtrace", +] [[package]] -name = "arrayref" -version = "0.3.7" +name = "apple-security-framework" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "07831f002eaa83d94f7e2c1300f3268a8f949c35a41dd99faceb6575c191d871" +dependencies = [ + "apple-security-framework-sys", + "bitflags 2.4.0", + "core-foundation", + "core-foundation-sys", + "libc", +] [[package]] -name = "arrayvec" -version = "0.5.2" +name = "apple-security-framework-sys" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "09acfa027e87e9f590474e9ef19d0f12158bf1c72af80ac76806f17e84959a42" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayvec" @@ -123,40 +92,24 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-compression" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-polyfill" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "critical-section", ] [[package]] @@ -166,10 +119,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.68" +name = "axum" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -180,12 +178,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.13.1" @@ -194,15 +186,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] -name = "beef" -version = "0.5.2" +name = "bit_field" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -212,32 +204,16 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] -name = "blake2b_simd" -version = "0.5.11" +name = "blake2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", -] - -[[package]] -name = "blake3" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "cc", - "cfg-if", - "constant_time_eq 0.3.0", "digest", ] @@ -251,53 +227,40 @@ dependencies = [ ] [[package]] -name = "brotli" -version = "3.3.4" +name = "boringtun" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "751787b019c674b9ac353f4eaa285e6711c21badb421cd8c199bf2c83b727f29" dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" -dependencies = [ - "memchr", - "serde", + "aead", + "base64 0.13.1", + "blake2", + "chacha20poly1305", + "hex", + "hmac", + "ip_network", + "ip_network_table", + "libc", + "nix 0.25.1", + "parking_lot", + "rand_core", + "ring", + "tracing", + "untrusted 0.9.0", + "x25519-dalek", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bytecount" -version = "0.6.3" +name = "bytemuck" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -307,15 +270,24 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[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" + +[[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.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -324,113 +296,149 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "2.34.0" +name = "chacha20" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half 1.8.2", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", ] [[package]] name = "clap" -version = "4.3.11" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", - "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.23", ] [[package]] name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "console-api" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "encode_unicode", - "lazy_static", + "prost 0.11.9", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures", + "hdrhistogram", + "humantime", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[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", - "unicode-width", - "windows-sys 0.45.0", ] [[package]] -name = "const_fn" -version = "0.4.9" +name = "core-foundation-sys" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e25dfc584d06a3dbf775d207ff00d7de98d824c952dd2233dfbb261889a42" -dependencies = [ - "time 0.2.27", - "version_check", -] +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" @@ -450,6 +458,82 @@ 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 = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -459,6 +543,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -466,9 +556,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -476,28 +594,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] -name = "derive_more" -version = "0.99.17" +name = "defmt" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", + "bitflags 1.3.2", + "defmt-macros", ] [[package]] -name = "dialoguer" -version = "0.10.4" +name = "defmt-macros" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "54f0216f6c5acb5ae1a47050a6645024e6edafc2ee32d421955eccfef12ef92e" dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", + "defmt-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "defmt-parser" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269924c02afd7f94bc4cecbfa5c379f6ffcf9766b3408fe63d22c728654eccd0" +dependencies = [ + "thiserror", ] [[package]] @@ -511,83 +636,11 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi", -] - -[[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 0.4.3", - "windows-sys 0.48.0", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[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.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" @@ -602,30 +655,15 @@ dependencies = [ "termcolor", ] -[[package]] -name = "equivalent" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" - -[[package]] -name = "erased-serde" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" -dependencies = [ - "serde", -] - [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -639,24 +677,76 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.9.0" +name = "etherparse" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990" dependencies = [ - "instant", + "arrayvec", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half 2.2.1", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -664,40 +754,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.2.0" +name = "futures" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ - "percent-encoding", -] - -[[package]] -name = "full_moon" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9a9bf5e42aec08f4b59be1438d66b01ab0a0f51dca309626e219697b60871c" -dependencies = [ - "bytecount", - "cfg-if", - "derive_more", - "full_moon_derive", - "logos", - "paste", - "serde", - "smol_str", -] - -[[package]] -name = "full_moon_derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b4bd12ce56927d1dc5478d21528ea8c4b93ca85ff8f8043b6a5351a2a3c6f7" -dependencies = [ - "indexmap 1.9.3", - "proc-macro2", - "quote", - "syn 1.0.109", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] @@ -707,6 +775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -715,6 +784,23 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + [[package]] name = "futures-macro" version = "0.3.28" @@ -723,7 +809,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] @@ -744,10 +830,13 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -763,17 +852,6 @@ dependencies = [ "version_check", ] -[[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.10" @@ -782,32 +860,30 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", ] [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "glam" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -815,13 +891,37 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -829,31 +929,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "hashbrown" -version = "0.14.0" +name = "hdrhistogram" +version = "7.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[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.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" dependencies = [ - "libc", + "base64 0.13.1", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin 0.9.8", + "stable_deref_trait", ] [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +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 = "http" @@ -885,9 +1005,9 @@ 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 = "humantime" @@ -912,7 +1032,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -920,60 +1040,34 @@ dependencies = [ ] [[package]] -name = "hyper-rustls" -version = "0.24.1" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tungstenite" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226df6fd0aece319a325419d770aa9d947defa60463f142cd82b329121f906a3" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", - "pin-project", + "pin-project-lite", "tokio", - "tokio-tungstenite", - "tungstenite", + "tokio-io-timeout", ] [[package]] -name = "idna" -version = "0.4.0" +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "glob", - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", ] [[package]] @@ -983,44 +1077,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] -name = "indexmap" -version = "2.0.0" +name = "indoc" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "equivalent", - "hashbrown 0.14.0", + "generic-array", ] [[package]] -name = "instant" -version = "0.1.12" +name = "internet-checksum" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" + +[[package]] +name = "internet-packet" +version = "0.1.0" +source = "git+https://github.com/mhils/internet-packet.git#9d706e0f6a28da91f63e3417c7bb4c2e977a2385" dependencies = [ - "cfg-if", + "internet-checksum", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "ip_network" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" + +[[package]] +name = "ip_network_table" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4099b7cfc5c5e2fe8c5edf3f6f7adf7a714c9cc697534f63a5a5da30397cb2c0" dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", + "ip_network", + "ip_network_table-deps-treebitmap", ] [[package]] -name = "ipnet" -version = "2.8.0" +name = "ip_network_table-deps-treebitmap" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" [[package]] name = "is-terminal" @@ -1028,9 +1137,9 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.3", - "windows-sys 0.48.0", + "hermit-abi", + "rustix", + "windows-sys", ] [[package]] @@ -1043,10 +1152,28 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.8" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" @@ -1063,32 +1190,23 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1102,148 +1220,58 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] -name = "logos" -version = "0.12.1" +name = "lru_time_cache" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" + +[[package]] +name = "macos-certificate-truster" +version = "0.3.11" dependencies = [ - "logos-derive", + "apple-security-framework", ] [[package]] -name = "logos-derive" -version = "0.12.1" +name = "managed" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" -dependencies = [ - "beef", - "fnv", - "proc-macro2", - "quote", - "regex-syntax 0.6.29", - "syn 1.0.109", -] +checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[package]] -name = "luau0-src" -version = "0.5.10+luau581" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8350fc82726c62f543b5b4e12611591b5c86dc38244af7c93c044c2cd0311d" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "cc", + "regex-automata 0.1.10", ] [[package]] -name = "lune" -version = "0.7.4" -dependencies = [ - "anyhow", - "async-compression", - "async-trait", - "console", - "dialoguer", - "directories", - "dunce", - "futures-util", - "hyper", - "hyper-tungstenite", - "lune-roblox", - "lz4_flex", - "mlua", - "once_cell", - "os_str_bytes", - "pin-project", - "rbx_cookie", - "reqwest", - "serde", - "serde_json", - "serde_yaml", - "tokio", - "tokio-tungstenite", - "toml", - "urlencoding", -] - -[[package]] -name = "lune-cli" -version = "0.7.4" -dependencies = [ - "anyhow", - "clap 4.3.11", - "console", - "directories", - "env_logger 0.10.0", - "full_moon", - "futures-util", - "include_dir", - "itertools", - "lune", - "once_cell", - "regex", - "reqwest", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "tokio", -] - -[[package]] -name = "lune-roblox" -version = "0.7.4" -dependencies = [ - "anyhow", - "glam", - "mlua", - "once_cell", - "rand", - "rbx_binary", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "rbx_xml", - "thiserror", -] - -[[package]] -name = "lz4" -version = "1.24.0" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "lz4_flex" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" -dependencies = [ - "twox-hash", -] +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] [[package]] name = "mime" @@ -1251,6 +1279,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[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.1" @@ -1258,6 +1292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -1267,43 +1302,127 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "wasi", + "windows-sys", ] [[package]] -name = "mlua" -version = "0.9.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b5bc62c9f83dc5c6bb36714e30aceca2fb3ac5c91a21590b0cf382b22e65e0" +name = "mitm-wg-test-client" +version = "0.3.11" dependencies = [ - "bstr", - "erased-serde", - "mlua-sys", - "num-traits", + "anyhow", + "boringtun", + "data-encoding", + "hex", + "smoltcp", +] + +[[package]] +name = "mitmproxy" +version = "0.3.11" +dependencies = [ + "anyhow", + "apple-security-framework", + "async-trait", + "boringtun", + "console-subscriber", + "criterion", + "env_logger", + "futures-util", + "image", + "log", + "nix 0.27.1", "once_cell", - "rustc-hash", - "serde", - "serde-value", + "pretty-hex", + "prost 0.12.1", + "rand", + "rand_core", + "smoltcp", + "tokio", + "tokio-util", + "windows 0.51.1", + "x25519-dalek", ] [[package]] -name = "mlua-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5013b291cbd5edd9259173f1ca1e62fc2f5b670c35424361acbbccddf9c679" +name = "mitmproxy_rs" +version = "0.3.11" dependencies = [ - "cc", + "anyhow", + "boringtun", + "console-subscriber", + "data-encoding", + "env_logger", + "log", + "mitmproxy", + "once_cell", + "pyo3", + "pyo3-asyncio", + "pyo3-log", + "rand_core", + "tar", + "tokio", +] + +[[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", - "luau0-src", - "pkg-config", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.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 = "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-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.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1314,15 +1433,15 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1334,28 +1453,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "option-ext" -version = "0.2.0" +name = "oorandom" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "ordered-float" -version = "2.10.0" +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -dependencies = [ - "memchr", -] +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" @@ -1375,17 +1482,11 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] -[[package]] -name = "paste" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" - [[package]] name = "percent-encoding" version = "2.3.0" @@ -1394,29 +1495,29 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1425,23 +1526,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" +name = "platforms" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] -name = "plist" -version = "1.4.3" +name = "plotters" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ - "base64 0.21.2", - "indexmap 1.9.3", - "line-wrap", - "quick-xml", - "serde", - "time 0.3.22", + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", ] [[package]] @@ -1451,53 +1590,198 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "pretty-hex" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.8" +name = "prost" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "profiling-procmacros", + "bytes", + "prost-derive 0.11.9", ] [[package]] -name = "profiling-procmacros" -version = "1.0.8" +name = "prost" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ + "bytes", + "prost-derive 0.12.1", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "quick-xml" -version = "0.28.2" +name = "prost-derive" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ - "memchr", + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost 0.11.9", +] + +[[package]] +name = "pyo3" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +dependencies = [ + "anyhow", + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2cc34c1f907ca090d7add03dc523acdd91f3a4dab12286604951e2f5152edad" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] + +[[package]] +name = "pyo3-build-config" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1529,110 +1813,27 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] -name = "rbx_binary" -version = "0.7.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "log", - "lz4", - "profiling", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "thiserror", -] - -[[package]] -name = "rbx_cookie" -version = "0.1.2" +name = "rayon" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d909d60469944842c9d204fa44afc90d9cb1e1f3f30a29bd1def490edd525a96" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "byteorder 0.5.3", - "clap 2.34.0", - "cookie", - "dirs", - "env_logger 0.9.3", - "log", - "plist", - "winapi", - "winreg", + "either", + "rayon-core", ] [[package]] -name = "rbx_dom_weak" -version = "2.4.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "rbx_types", - "serde", -] - -[[package]] -name = "rbx_reflection" -version = "4.2.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "rbx_types", - "serde", - "thiserror", -] - -[[package]] -name = "rbx_reflection_database" -version = "0.2.6+roblox-572" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "lazy_static", - "rbx_reflection", - "rmp-serde", - "serde", -] - -[[package]] -name = "rbx_types" -version = "1.5.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "blake3", - "lazy_static", - "rand", - "serde", - "thiserror", -] - -[[package]] -name = "rbx_xml" -version = "0.13.0" -source = "git+https://github.com/rojo-rbx/rbx-dom?rev=b6d255e0b5d96155f694ca224676b251059cf2de#b6d255e0b5d96155f694ca224676b251059cf2de" -dependencies = [ - "base64 0.13.1", - "log", - "rbx_dom_weak", - "rbx_reflection", - "rbx_reflection_database", - "xml-rs", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" +name = "rayon-core" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "bitflags 1.3.2", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] @@ -1644,49 +1845,36 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", -] - [[package]] name = "regex" -version = "1.9.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax 0.7.3", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.0" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.5", ] [[package]] @@ -1697,48 +1885,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.2", - "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", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.22.6", - "winreg", -] +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "ring" @@ -1749,301 +1898,113 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] -[[package]] -name = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder 1.4.3", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -dependencies = [ - "byteorder 1.4.3", - "rmp", - "serde", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq 0.1.5", - "crossbeam-utils", -] - [[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 = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver", ] [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" 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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" -dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys", ] [[package]] -name = "rustls" -version = "0.21.3" +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.1", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" -dependencies = [ - "ring", - "untrusted", -] +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "safemem" -version = "0.3.3" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[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 = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "0.9.0" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" -version = "1.0.167" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", "itoa", "ryu", "serde", ] [[package]] -name = "serde_spanned" -version = "0.6.3" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "serde", + "lazy_static", ] -[[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_yaml" -version = "0.9.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" -dependencies = [ - "indexmap 2.0.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2054,27 +2015,40 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.8" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[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.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] -name = "smol_str" -version = "0.1.24" +name = "smoltcp" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229" dependencies = [ - "serde", + "bitflags 1.3.2", + "byteorder", + "cfg-if", + "defmt", + "heapless", + "libc", + "log", + "managed", ] [[package]] @@ -2087,6 +2061,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "spin" version = "0.5.2" @@ -2094,80 +2078,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "standback" -version = "0.2.17" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "version_check", + "lock_api", ] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[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" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "subtle" @@ -2188,9 +2111,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2198,155 +2121,115 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.6.0" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys 0.48.0", + "filetime", + "libc", + "xattr", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "target-lexicon" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" 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.43" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] -name = "time" -version = "0.2.27" +name = "thread_local" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", + "cfg-if", + "once_cell", ] [[package]] -name = "time" -version = "0.3.22" +name = "tiff" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ - "itoa", "serde", - "time-core", - "time-macros 0.2.9", + "serde_json", ] -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.48.0", + "tracing", + "windows-sys", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", ] [[package]] @@ -2357,39 +2240,25 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", ] [[package]] -name = "tokio-rustls" -version = "0.24.1" +name = "tokio-stream" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ - "rustls", + "futures-core", + "pin-project-lite", "tokio", ] -[[package]] -name = "tokio-tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots 0.23.1", -] - [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -2401,39 +2270,67 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] -name = "toml_edit" -version = "0.19.12" +name = "tonic" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", + "async-trait", + "axum", + "base64 0.21.4", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.11.9", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -2448,9 +2345,21 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + [[package]] name = "tracing-core" version = "0.1.31" @@ -2458,6 +2367,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "tracing", + "tracing-core", ] [[package]] @@ -2466,76 +2391,34 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ - "byteorder 1.4.3", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "sha1 0.10.5", - "thiserror", - "url", - "utf-8", - "webpki", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.22" +name = "unindent" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "tinyvec", + "crypto-common", + "subtle", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - [[package]] name = "untrusted" version = "0.7.1" @@ -2543,39 +2426,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.0" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] -name = "urlencoding" -version = "2.1.2" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version_check" @@ -2583,6 +2443,16 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -2592,12 +2462,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2625,22 +2489,10 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.87" @@ -2659,7 +2511,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2681,32 +2533,10 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" +name = "weezl" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.1", -] +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "winapi" @@ -2726,9 +2556,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", ] @@ -2740,12 +2570,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windivert" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "fc6b6833a760d1c36b489314a5541a12a39d162dc8341d8f6f400212b96d3df1" dependencies = [ - "windows-targets 0.42.2", + "etherparse", + "thiserror", + "windivert-sys", + "windows 0.48.0", +] + +[[package]] +name = "windivert-sys" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832bc4af9272458a8a64395b3aabe10dc4089546486fcbd0e19b9b6d28ba6e54" +dependencies = [ + "cc", + "thiserror", + "windows 0.48.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-redirector" +version = "0.3.11" +dependencies = [ + "anyhow", + "env_logger", + "hex", + "internet-packet", + "log", + "lru_time_cache", + "mitmproxy", + "prost 0.12.1", + "tokio", + "windivert", + "winres", ] [[package]] @@ -2754,149 +2643,121 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -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", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +name = "winres" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9482fe6ceabdf32f3966bfdd350ba69256a97c30253dc616fe0005af24f164e" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "memchr", + "toml", ] [[package]] -name = "winreg" -version = "0.10.1" +name = "x25519-dalek" +version = "2.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "ec7fae07da688e17059d5886712c933bb0520f15eff2e09cfa18e30968f4e63a" dependencies = [ - "winapi", + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", ] [[package]] -name = "xml-rs" -version = "0.8.15" +name = "xattr" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +dependencies = [ + "libc", +] [[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix new file mode 100644 index 0000000000..15850ab7cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, rustPlatform +, darwin +}: + +buildPythonPackage rec { + pname = "mitmproxy-rs"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "mitmproxy_rs"; + rev = version; + hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "internet-packet-0.1.0" = "sha256-VtEuCE1sulBIFVymh7YW7VHCuIBjtb6tHoPz2tjxX+Q="; + }; + }; + + buildAndTestSubdir = "mitmproxy-rs"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + pythonImportsCheck = [ "mitmproxy_rs" ]; + + meta = with lib; { + description = "The Rust bits in mitmproxy"; + homepage = " https://github.com/mitmproxy/mitmproxy_rs"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index ece5106a75..1c57361a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder # Mitmproxy requirements +, aioquic , asgiref , blinker , brotli @@ -14,7 +15,7 @@ , hyperframe , kaitaistruct , ldap3 -, mitmproxy-wireguard +, mitmproxy-rs , msgpack , passlib , protobuf @@ -41,19 +42,20 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "9.0.1"; + version = "10.1.1"; disabled = pythonOlder "3.9"; + pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-CINKvRnBspciS+wefJB8gzBE13L8CjbYCkmLmTTeYlA="; + hash = "sha256-/ouMj7UVowvzwjOuusgVfXjvjNPKpuJUuoJf6Sl9P44="; }; propagatedBuildInputs = [ setuptools - # setup.py + aioquic asgiref blinker brotli @@ -65,7 +67,7 @@ buildPythonPackage rec { hyperframe kaitaistruct ldap3 - mitmproxy-wireguard + mitmproxy-rs msgpack passlib protobuf @@ -91,11 +93,6 @@ buildPythonPackage rec { requests ]; - postPatch = '' - # remove dependency constraints - sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py - ''; - __darwinAllowLocalNetworking = true; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix index 8e9975fb22..467da5dd80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.9.2"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6jdQxRqulE5hIzzmdr9kR5gsLrzt0lfJun5blJjTUY0="; + hash = "sha256-JrE12dU0Es4VwUZLcbB8mabifnpxZ7Qt68WJ22HvPm4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 1bc335fdba..986f0d1d2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; - rev = "v${version}" ; - hash = "sha256-l7NUmsdd1FHkbdqtRcMQBfplZJgLCXrN+QuYaQLpz0k="; + rev = "refs/tags/v${version}"; + hash = "sha256-UIbW64ac9kXptJjn86V6vPArnICANiT3QGi5JH45KLY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix index 92470b9b49..a83899c6c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.24.2"; + version = "0.24.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,12 +23,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-XgwQnVNdSHlyMHGbaUH00I3pWno8lb8VhmLEEvwVyy4="; + hash = "sha256-ify+ipUjhk1UFt4aYHEWQLa8KXInnSrfRu0ndsLZ/3w="; }; postPatch = '' sed -i "/--cov/d" pyproject.toml - substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \ + substituteInPlace src/mkdocs_jupyter/tests/test_base_usage.py \ --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index 7f45b1ecc7..59c433145b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.1.13"; + version = "9.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S+cCNcQR8Y1UGj+4Nfy9Z10N/9PRq13fSeR2YFntxWI="; + hash = "sha256-2Z1U71agXxkYp1OFYd/xInAfN5SVI9FQf39b8DkX10o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 54499fdbd0..86037b0c18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-mermaid2-plugin"; - version = "1.0.8"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fralau"; repo = "mkdocs-mermaid2-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-0h/EMfp6D14ZJcQe3U2r/RQ/VNejOK9bLP6AMNiB0Rc="; + hash = "sha256-9vYLkGUnL+rnmZntcgFzOvXQdf6angb9DRsmrBjnPUY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 5ad4ef4484..631f881908 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , fetchFromGitHub , mkdocs @@ -32,6 +31,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Some tests fail with an assertion error failure + doCheck = false; + pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { 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 ff9326a8ba..0bd3f97175 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.4"; + version = "0.6.6"; 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-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; + hash = "sha256-NEFogrLJjOh98rChlJuxAeTj31yyL4OoE/jBUcHbBZM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix index ac3c2c851c..61c8bdcd13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix @@ -14,8 +14,11 @@ , importlib-metadata , jinja2 , markdown +, markupsafe , mergedeep , packaging +, pathspec +, platformdirs , pyyaml , pyyaml-env-tag , watchdog @@ -28,7 +31,7 @@ buildPythonPackage rec { pname = "mkdocs"; - version = "1.4.2"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,29 +39,28 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/NxiKbCd2acYcNe5ww3voM9SGVE2IDqknngqApkDbNs="; + hash = "sha256-9sV1bewsHVJEc2kTyGxDM6SjDTEKEc/HSY6gWBC5tvE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "Markdown >=3.2.1, <3.4" "Markdown" - ''; - nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ click + ghp-import jinja2 markdown + markupsafe mergedeep + packaging + pathspec + platformdirs pyyaml pyyaml-env-tag - ghp-import - importlib-metadata watchdog - packaging + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 1147d6f884..27caba7aae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.7.1"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-/iDDHJl+rIkgXIvzSZ6pTXEzVukz+cMV9GUow+AxNh0="; + hash = "sha256-r/N2ZGqA1cYFkP4Ai8p6utIw/m+FiNBVbpL4Y0EO2ds="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix index fbbdb91feb..d8fb50f586 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix @@ -8,13 +8,13 @@ , mkdocs-autorefs , pymdown-extensions , pytestCheckHook -, pdm-pep517 +, pdm-backend , pythonOlder }: buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw="; + hash = "sha256-t7wxm600XgYl1jsqjOpZdWcmqR9qafdKTaz/xDPdDPY="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -61,6 +61,8 @@ buildPythonPackage rec { disabledTests = [ # Not all requirements are available "test_disabling_plugin" + # Circular dependency on mkdocstrings-python + "test_extended_templates" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 14f4b76b48..41ebc9545c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+ZKujqnHNQI0S69IxOxEeqnvv6iWW8CQho5hYyNPTrA="; + hash = "sha256-3q8PXydgjpUm1p//zKcMgirJDqKQpvPkuz36GyCbARE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 6f9294e83b..0da165ada2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.21.0"; + version = "0.22.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; + hash = "sha256-YLCNLpg2qrdFon0/gdggJd9XovHwRHAdleBFQc18qzE="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmcv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmcv/default.nix index fcc59e417c..923e40d02f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mmcv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mmcv/default.nix @@ -12,6 +12,7 @@ , addict , ninja , which +, pybind11 , onnx , onnxruntime , scipy @@ -49,16 +50,16 @@ let in buildPythonPackage rec { pname = "mmcv"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "open-mmlab"; - repo = pname; + repo = "mmcv"; rev = "refs/tags/v${version}"; - hash = "sha256-36PcvoB0bM0VoNb2psURYFo3krmgHG47OufU6PVjHyw="; + hash = "sha256-an78tRvx18zQ5Q0ca74r4Oe2gJ9F9OfWXLbuP2+rL68="; }; preConfigure = '' @@ -96,7 +97,7 @@ buildPythonPackage rec { nativeBuildInputs = [ ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; - buildInputs = [ torch ] ++ lib.optionals cudaSupport [ cuda-redist ]; + buildInputs = [ pybind11 torch ] ++ lib.optionals cudaSupport [ cuda-redist ]; nativeCheckInputs = [ pytestCheckHook torchvision lmdb onnx onnxruntime scipy pyturbojpeg tifffile ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index 46bc25672e..940c633d41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.3.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jvrk6m1Cd5ig2LXq6sAIbHDhmtG1gH/7WNAc7oet+tg="; + hash = "sha256-djVQkj8ktIOxe1xmi+XuIvdS1WdDzozgTJNJhWAhuBo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index ff8d2856cc..41789a796d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -1,37 +1,51 @@ { lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv + +# build-system +, hatchling + +# dependencies +, decorator +, httptools +, python-magic +, urllib3 + +# optional-dependencies +, xxhash +, pook + +# tests , aiohttp , asgiref -, buildPythonPackage -, decorator , fastapi -, fetchPypi , gevent -, httptools , httpx -, isPy3k -, pook -, pytest-mock +, pytest-asyncio , pytestCheckHook -, python-magic -, pythonOlder , redis +, redis-server , requests , sure -, urllib3 + }: buildPythonPackage rec { pname = "mocket"; - version = "3.11.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OIdLP3hHnPZ9MqrHt6G5t2SSO342+jTACgzxM6RjVYM="; + hash = "sha256-brvBWwTWT2F/usVBRr7wz9L0kct4X1Fddl4mu5LUENA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator httptools @@ -43,52 +57,58 @@ buildPythonPackage rec { pook = [ pook ]; + speedups = [ + xxhash + ]; }; nativeCheckInputs = [ - aiohttp asgiref fastapi gevent httpx - pytest-mock + pytest-asyncio pytestCheckHook redis requests sure - ] ++ passthru.optional-dependencies.pook; + ] ++ lib.optionals (pythonOlder "3.12") [ + aiohttp + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Skip http tests - SKIP_TRUE_HTTP = true; + preCheck = lib.optionalString stdenv.isLinux '' + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; - disabledTestPaths = [ - # Requires a live Redis instance - "tests/main/test_redis.py" - ]; + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; + + # Skip http tests, they require network access + env.SKIP_TRUE_HTTP = true; + + _darwinAllowLocalNetworking = true; disabledTests = [ # tests that require network access (like DNS lookups) - "test_truesendall" - "test_truesendall_with_chunk_recording" - "test_truesendall_with_gzip_recording" - "test_truesendall_with_recording" - "test_wrongpath_truesendall" "test_truesendall_with_dump_from_recording" - "test_truesendall_with_recording_https" - "test_truesendall_after_mocket_session" - "test_real_request_session" "test_asyncio_record_replay" "test_gethostbyname" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/main/test_redis.py" + ]; + pythonImportsCheck = [ "mocket" ]; meta = with lib; { + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; - changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix new file mode 100644 index 0000000000..234a3d14d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mockfs"; + version = "1.1.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mockfs"; + repo = "mockfs"; + rev = "v${version}"; + hash = "sha256-JwSkOI0dz9ZetfE0ZL3CthvcCSXGFYX+yQZy/oC6VBk="; + }; + + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + pythonImportsCheck = [ "mockfs" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A simple mock filesystem for use in unit tests"; + homepage = "https://github.com/mockfs/mockfs"; + changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moddb/default.nix index 102410dc6b..a0205d5c46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moddb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "moddb"; - version = "0.8.1"; + version = "0.9.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ClementJ18"; repo = "moddb"; rev = "v${version}"; - hash = "sha256-Pl/Wc0CL31+ZLFfy6yUfrZzsECifnEpWVGRHZVaFWG4="; + hash = "sha256-2t5QQAmSLOrdNCl0XdsFPdP2UF10/qq69DovqeQ1Vt8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix index 12f47a9e80..a5b38b525f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.15.0"; + version = "1.17.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-gB6lcLymkajRoeOQ70kmZVlBI7oeZgQo1VySfPGeQLQ="; + hash = "sha256-o3BI2lMwctR9tiGmY07dAOQUfv9K4rWkc/xI6uHnVfs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/modelcif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/modelcif/default.nix new file mode 100644 index 0000000000..e3bfea7074 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/modelcif/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, ihm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "modelcif"; + version = "0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ihmwg"; + repo = "python-modelcif"; + rev = "refs/tags/${version}"; + hash = "sha256-u+e2QtG6gO1e31OzPfAuzfCkwZymEZMxa2p0haYplAk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + ihm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # require network access + "test_validate_mmcif_example" + "test_validate_modbase_example" + ]; + + pythonImportsCheck = [ "modelcif" ]; + + meta = with lib; { + description = "Python package for handling ModelCIF mmCIF and BinaryCIF files"; + homepage = "https://github.com/ihmwg/python-modelcif"; + changelog = "https://github.com/ihmwg/python-modelcif/blob/${src.rev}/ChangeLog.rst"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 31d76131c2..f4e1d6a04d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, setuptools , glfw , moderngl , numpy @@ -19,18 +20,22 @@ buildPythonPackage rec { pname = "moderngl-window"; - version = "2.4.4"; - format = "setuptools"; + version = "2.4.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "moderngl"; repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; + hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy moderngl @@ -75,6 +80,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; platforms = platforms.mesaPlatforms; - broken = versionAtLeast pillow.version "2" || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix index 85c23a39c7..e3a4f2418d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix @@ -13,9 +13,9 @@ }: buildPythonPackage rec { - pname = "monai"; - version = "0.5.0"; - format = "pyproject"; + pname = "monai-deploy"; + version = "0.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Project-MONAI"; repo = "monai-deploy-app-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok="; + hash = "sha256-a5WtU+1XjsYsXB/uZS8ufE0fOOWDf+Wy7mOX2xPEQEg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix index 9e896e81e6..c2e27b23d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "monai"; - version = "1.2.0"; + version = "1.3.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-nMxROOBkLPmw1GRKiZq6WGJq93LOpSg/7zIVOg+WzC8="; + hash = "sha256-h//igmSV1cPAFifE1woIluSyGwZBRByYMLqeY3oLHnk="; }; # Ninja is not detected by setuptools for some reason even though it's present: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index cb0be3e5ea..c4b7b7135e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.26.0"; + version = "0.27.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mPz9Nyoyke++e9vBWSKunc9VGHCP8pbmldgKty5HIMA="; + hash = "sha256-UCd7RpsSNDKh3vgVRYrFYWYVLQuK7WI0n/Moukhq5dM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index 37107a1b1b..cebb9c382c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -9,12 +9,13 @@ , pytestCheckHook , pythonOlder , ruamel-yaml +, torch , tqdm }: buildPythonPackage rec { pname = "monty"; - version = "2023.4.10"; + version = "2023.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9of56ErJ03hU+KqxUjR4IiyU4XLJoothSwODlzSWv9Y="; + hash = "sha256-VzOu0gLQcobWQs8uMFzI4CyN+1OVx94VqhJYB+rMpMI="; }; postPatch = '' @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pymongo pytestCheckHook + torch ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 86a1b5d3d3..df38040956 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "9.1.0"; + version = "10.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; + hash = "sha256-Ymw2n6DrN7rAKRvOglmzMv1ZrHkvpUl7WYNzCc1bEUo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix index c30fc5311d..2dc5bd55ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -1,53 +1,55 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder -# build +# build-system , setuptools -# runtime -, aws-xray-sdk +# dependencies , boto3 , botocore -, cfn-lint , cryptography +, jinja2 +, python-dateutil +, requests +, responses +, werkzeug +, xmltodict + +# optional-dependencies +, aws-xray-sdk +, cfn-lint , docker +, ecdsa , flask , flask-cors , graphql-core -, idna -, jinja2 , jsondiff +, multipart , openapi-spec-validator +, py-partiql-parser , pyparsing -, python-dateutil , python-jose , pyyaml -, requests -, responses , sshpubkeys -, werkzeug -, xmltodict # tests , freezegun , pytestCheckHook , pytest-xdist -, sure }: buildPythonPackage rec { pname = "moto"; - version = "4.1.3"; - format = "pyproject"; + version = "4.2.6"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yCAMyqlEDC6dqgvV4L12inGdtaLILqjXgvDj+gmjxeI="; + hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk="; }; nativeBuildInputs = [ @@ -55,104 +57,91 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aws-xray-sdk boto3 botocore - cfn-lint cryptography - docker - flask - flask-cors - graphql-core - idna - jinja2 - jsondiff - openapi-spec-validator - pyparsing - python-dateutil - python-jose - pyyaml requests - responses - sshpubkeys - werkzeug xmltodict + werkzeug + python-dateutil + responses + jinja2 ]; + passthru.optional-dependencies = { + # non-exhaustive list of extras, that was cobbled together for testing + all = [ + aws-xray-sdk + cfn-lint + docker + ecdsa + flask + flask-cors + graphql-core + jsondiff + multipart + openapi-spec-validator + py-partiql-parser + pyparsing + python-jose + pyyaml + setuptools + sshpubkeys + ] ++ python-jose.optional-dependencies.cryptography; + }; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ freezegun pytestCheckHook - sure - ]; + pytest-xdist + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ - # Disable tests that try to access the network - "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" - "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" - "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" - "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" - "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" - "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" - "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" - "--deselect=tests/test_iotdata/test_iotdata.py::test_update" - "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" - "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" - "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "-m" "'not network and not requires_docker'" + + # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" + "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" - # Disable tests that require docker daemon - "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" - "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" + # Fails at resolving google.com + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) - "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + # Download recordings returns faulty JSON + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" - # AssertionError: CloudWatch log event was not found. - "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + # Connection Reset by Peer, when connecting to localhost:5678 + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" - # KeyError: 'global' - "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" - "--deselect=tests/test_iotdata/test_server.py::test_publish" + # Requires docker, but isn't marked + # https://github.com/getmoto/moto/pull/6938 + "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # Blocks test execution - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "--deselect=tests/test_utilities/test_threaded_server.py::test_threaded_moto_server__different_port" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable" - - # AssertionError: expected `{0}` to be greater than `{1}` + # Racy, expects two timestamp two differ + # https://github.com/getmoto/moto/issues/6946 "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe" ]; disabledTestPaths = [ - # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 - "tests/test_sts/test_sts.py" + # Requires pytest-ordering, which is unmaintained + # https://github.com/getmoto/moto/issues/6937 # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_dynamodb/test_dynamodb_statements.py" + "tests/test_lakeformation/test_resource_tags_integration.py" "tests/test_redshiftdata/test_redshiftdata.py" - # Tries to access the network - "tests/test_appsync/test_appsync_schema.py" - "tests/test_awslambda/test_lambda_eventsourcemapping.py" - "tests/test_awslambda/test_lambda_invoke.py" - "tests/test_batch/test_batch_jobs.py" - "tests/test_kinesis/test_kinesis.py" - "tests/test_kinesis/test_kinesis_stream_consumers.py" - ]; + "tests/test_s3/test_s3_file_handles.py" + "tests/test_s3/test_s3.py" + "tests/test_s3/test_s3_select.py" - disabledTests = [ - # only appears in aarch64 currently, but best to be safe - "test_state_machine_list_executions_with_filter" - # tests fail with 404 after Werkzeug 2.2 upgrade, see https://github.com/spulec/moto/issues/5341#issuecomment-1206995825 - "test_appsync_list_tags_for_resource" - "test_s3_server_post_to_bucket_redirect" + # Tries to access the network + "tests/test_batch/test_batch_jobs.py" + + # Threading tests regularly blocks test execution + "tests/test_utilities/test_threaded_server.py" + "tests/test_s3/test_s3_bucket_policy.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix index 704c8697ce..3e4cf4d574 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.1.1"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; + hash = "sha256-iJz3JiW9cVT3G1rLQwWQXcPfPBRGsIwVLs4gauM+pYo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix index ab4b97c245..96b3206f7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix @@ -11,7 +11,6 @@ , tqdm # Advanced image processing (triples size of output) , advancedProcessing ? false -, opencv3 , scikit-image , scikit-learn , scipy @@ -47,7 +46,6 @@ buildPythonPackage rec { requests proglog ] ++ lib.optionals advancedProcessing [ - opencv3 scikit-image scikit-learn scipy 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 887c5446d5..eaf7d30efb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.1.4"; + version = "3.1.5"; src = fetchPypi { inherit pname version; - hash = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA="; + hash = "sha256-pwbnbbklUTXC+10e9Uy097DkrZ4zy62n3idiYgXyoVM="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix index 63a81c47e3..c39b24a17f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.28"; + version = "0.3.31"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/7nfjIdlYoouDOI1vXdr9BSml5gpE0gad7ONAUmOCiE="; + hash = "sha256-aZwazbDljRncB2p7qD95Cms0uQBU8tciUrXcKpsyVTM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpris-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpris-server/default.nix new file mode 100644 index 0000000000..783fc6aab9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpris-server/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, emoji +, pydbus +, pygobject3 +, unidecode +, setuptools +}: +buildPythonPackage rec { + pname = "mpris-server"; + version = "0.4.2"; + pyproject = true; + + src = fetchPypi { + pname = "mpris_server"; + inherit version; + hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + emoji + pydbus + pygobject3 + unidecode + ]; + + pythonImportsCheck = [ "mpris_server" ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "Publish a MediaPlayer2 MPRIS device to D-Bus"; + homepage = "https://pypi.org/project/mpris-server/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ quadradical ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix index 0168dc1071..d9748df707 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.5"; + version = "0.0.6"; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VlAbyTWQCj6fgndEPI1lQKvL+D6TJnqglIT8dRZyEWc="; + hash = "sha256-dBwWiJEL76aXqM2vKn4uQsd86Rm3bMeDSsRRs/aLWCE="; }; buildInputs = [ fftw ]; @@ -33,12 +33,15 @@ buildPythonPackage rec { numpy ]; - doCheck = false; # Package has no tests + # Package has no tests + doCheck = false; + pythonImportsCheck = [ "mrsqm" ]; meta = with lib; { description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; homepage = "https://pypi.org/project/mrsqm"; + changelog = "https://github.com/mlgig/mrsqm/releases/tag/v.${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index 123008106b..ab54e9e5ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.23.0"; + version = "1.24.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JcmjOs+EMB+T0f2+nxqcYM04rw1f/9v6N4E4/HvB6Gs="; + hash = "sha256-qglyiEs8b97FPZoL0VwS5b17cawbZtdG9U0Shwnz+Pg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multi-key-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multi-key-dict/default.nix new file mode 100644 index 0000000000..c959f2e8f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/multi-key-dict/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "multi-key-dict"; + version = "2.0.3"; + pyproject = true; + + src = fetchPypi { + pname = "multi_key_dict"; + inherit version; + hash = "sha256-3uvewXqjChxDLLP0N+gfhiHhwFQqDAYXp09x4jLpk54="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "multi_key_dict" + ]; + + meta = with lib; { + description = "multi_key_dict"; + homepage = "https://github.com/formiaczek/multi_key_dict"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix deleted file mode 100644 index cb539e4dd9..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/multi_key_dict/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "multi_key_dict"; - version = "2.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; - }; - - meta = with lib; { - description = "multi_key_dict"; - homepage = "https://github.com/formiaczek/multi_key_dict"; - license = licenses.mit; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix index ed55b0421c..0953e46a55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multipledispatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "multipledispatch"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a7ab1451fd0bf9b92cab3edbd7b205622fb767aeefb4fb536c2e3de9e0a38bea"; + sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix index 962a70726a..647281b8b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.14"; + version = "0.70.15"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/multiprocess-${version}"; - hash = "sha256-pjYOEOI5No9gT0XchmH6FSJ9uDqEnaLj/PyHT2a90jo="; + hash = "sha256-fpyFBrQXy5TwbHmce3qg1RiM8JnH3J5skl3es1IQPiw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/munch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/munch/default.nix index f6ca7c1d69..0ff62dcbee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/munch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/munch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "munch"; - version = "2.5.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; + sha256 = "sha256-VCyxUUYSYyFqTjfD/Zr8Ql/urziqowJc0qmB+ttCIjU="; }; propagatedBuildInputs = [ six pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mung/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mung/default.nix index 0e5528c112..03fcd29dba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mung/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mung/default.nix @@ -1,47 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , lxml -, matplotlib -, midiutil , numpy , pytestCheckHook , scikit-image -, scikit-learn }: let - rev = "8d0ce91d831b0592c111ddb38fc9aa8eba130ed2"; + version = "1.2"; in buildPythonPackage { pname = "mung"; - version = "unstable-2022-07-10"; + inherit version; + pyproject = true; src = fetchFromGitHub { owner = "OMR-Research"; repo = "mung"; - inherit rev; - hash = "sha256-QzCkB9Wj4dTPuMCMweFw6IsSwBBzV0Nfx7+VX7Plnio="; + rev = "refs/tags/${version}"; + hash = "sha256-NSKaJkJRevTy5gh6/ik8Qe46bOPdznsmXPgh7Xz7vXQ="; }; - format = "setuptools"; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ lxml numpy scikit-image - scikit-learn - matplotlib - midiutil ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "mung" + ]; + meta = with lib; { description = "Music Notation Graph: a data model for optical music recognition"; homepage = "https://github.com/OMR-Research/mung"; - changelog = "https://github.com/OMR-Research/mung/blob/${rev}/CHANGES.md"; + changelog = "https://github.com/OMR-Research/mung/blob/${version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ piegames ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix index 5843cd9432..236af1eb5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; postInstall = '' - ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc + ${python.pythonOnBuildForHost.interpreter} setup.py build_sphinx --build-dir=$doc ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix index 1fcd7123ea..2e92fade6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwoauth/default.nix @@ -41,6 +41,5 @@ buildPythonPackage rec { description = "Python library to perform OAuth handshakes with a MediaWiki installation"; homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix index d23116c5b3..c252f8cc29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/gpodder/mygpoclient"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 37564eeb21..f3c06701eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.19.0"; + version = "7.19.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-Wczk1DNoOpvd7efnZFUf4FSjYqHdkMKMNwNVeQOPeEg="; + hash = "sha256-Gz6OJ2ER60R14aTmhPfodX22FlbicUClBtlqNglTjC4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 90fafe527b..0ee96a6d69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -2,14 +2,12 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build-system , setuptools , types-psutil , types-setuptools -, types-typed-ast # propagates , mypy-extensions @@ -32,7 +30,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.4.1"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,23 +39,14 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-2PeE/L9J6J0IuUpHZasemM8xxefNJrdzYnutgJjevWQ="; + hash = "sha256-qs+axm2+UWNuWzLW8CI4qBV7k7Ra8gBajid8mYKDsso="; }; - patches = [ - (fetchpatch { - # pytest 7.4 compat - url = "https://github.com/python/mypy/commit/0a020fa73cf5339a80d81c5b44e17116a5c5307e.patch"; - hash = "sha256-3HQPo+V7T8Gr92clXAt5QJUJPmhjnGjQgFq0qR0whfw="; - }) - ]; - nativeBuildInputs = [ mypy-extensions setuptools types-psutil types-setuptools - types-typed-ast typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix index 7b85fcf54b..d821adc3bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix @@ -1,11 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, libmysqlclient }: +{ lib +, buildPythonPackage +, fetchPypi +, libmysqlclient +, pkg-config +}: buildPythonPackage rec { pname = "mysqlclient"; - version = "2.1.1"; + version = "2.2.0"; nativeBuildInputs = [ - libmysqlclient + pkg-config ]; buildInputs = [ @@ -17,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-godX5Bn7Ed1sXtJXbsksPvqpOg98OeJjWG0e53nD14I="; + hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix index 3a51d240c5..66c07489df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-docutils/default.nix @@ -13,12 +13,13 @@ buildPythonPackage rec { pname = "myst-docutils"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-fbh97Z/5TnnMHj2bGZ4UvJkPpYtrTTcFOgpLWgHUYk0="; + pname = "myst_docutils"; + inherit version; + hash = "sha256-WmmPEg+bINmeId+pjR6bbp8qzjfSXfEel+sQEdPIu8Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix index 33c06fc246..cf3d309420 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , flit-core , importlib-metadata , ipython @@ -15,46 +14,23 @@ , sphinx-togglebutton , typing-extensions , ipykernel -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "myst-nb"; - version = "0.17.2"; + version = "1.0.0"; + pyproject = true; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; + inherit version; + pname = "myst_nb"; + hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; }; - patches = [ - # Fix compatiblity with myst-parser 1.0. Remove with the next release. - (fetchpatch { - url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; - hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; - excludes = [ - "myst_nb/__init__.py" - "docs/authoring/custom-formats.Rmd" - "docs/authoring/jupyter-notebooks.md" - "docs/index.md" - "pyproject.toml" - "tests/nb_fixtures/reporter_warnings.txt" - ]; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "myst-parser~=0.18.0" "myst-parser" - ''; - nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -71,10 +47,6 @@ buildPythonPackage rec { ipykernel ]; - pythonRelaxDeps = [ - "myst-parser" - ]; - pythonImportsCheck = [ "myst_nb" "myst_nb.sphinx_ext" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix index f2beeb8503..e485b768a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pythonOlder , docutils @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "myst-parser"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,9 +29,17 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kewd6/4yawpRuyCe8Na0BGUMo59tr2fc97VlGbVJ8mI="; + hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; + patches = [ + (fetchpatch { + name = "myst-parser-sphinx7.2-compat.patch"; + url = "https://github.com/executablebooks/MyST-Parser/commit/4f670fc04c438b57a9d4014be74e9a62cc0deba4.patch"; + hash = "sha256-FCvFSsD7qQwqWjSW7R4Gx+E2jaGkifSZqaRbAglt9Yw="; + }) + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix index 4453e33975..370a5300a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix @@ -1,25 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales +, pythonOlder +, unittestCheckHook }: buildPythonPackage rec { pname = "nameparser"; - version = "1.1.2"; + version = "1.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9LbHwQSNUovWqisnz0KgZEfSsx5FqVsgRJUTB48dhu8="; + hash = "sha256-qiQArXHM+AcGdbQDEaJXyTRln5GFSxVOG6bCZHYcBJ0="; }; - LC_ALL="en_US.UTF-8"; - buildInputs = [ glibcLocales ]; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "nameparser" + ]; meta = with lib; { - description = "A simple Python module for parsing human names into their individual components"; + description = "Module for parsing human names into their individual components"; homepage = "https://github.com/derek73/python-nameparser"; + changelog = "https://github.com/derek73/python-nameparser/releases/tag/v${version}"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix index eabbadc1d6..9b835d5273 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix @@ -1,58 +1,76 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi -, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko -, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools +, cffi + +# dependencies +, future +, jinja2 +, junos-eznc +, lxml +, ncclient +, netaddr +, netmiko +, netutils +, paramiko +, pyeapi +, pyyaml +, requests +, scp +, textfsm +, ttp +, ttp-templates +, typing-extensions + +# tests +, pytestCheckHook +, ddt +, mock + }: buildPythonPackage rec { pname = "napalm"; - version = "3.4.1"; - format = "setuptools"; + version = "4.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "napalm-automation"; repo = "napalm"; - rev = version; - hash = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8="; + rev = "refs/tags/${version}"; + hash = "sha256-JqjuYMJcP58UMn1pPYg7x8KpqCKQUs19Ng9HbI2iX38="; }; - patches = [ - # netmiko 4.0.0 support - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch"; - excludes = [ "requirements.txt" ]; - hash = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98="; - }) - (fetchpatch{ - url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch"; - hash = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM="; - }) + nativeBuildInputs = [ + setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "netmiko>=3.3.0,<4.0.0" "netmiko" - ''; - propagatedBuildInputs = [ cffi - paramiko - requests future - textfsm - invoke jinja2 - netaddr - pyyaml - pyeapi - netmiko junos-eznc - ciscoconfparse - scp - setuptools lxml ncclient + netaddr + netmiko + # breaks infinite recursion + (netutils.override { napalm = null; }) + paramiko + pyeapi + pyyaml + requests + scp + setuptools + textfsm + ttp + ttp-templates + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook mock ddt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index fc81042527..53fffeaadc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -3,23 +3,22 @@ , build , buildPythonPackage , fetchFromGitHub +, hatchling +, hatch-vcs , magicgui , napari # reverse dependency, for tests -, psygnal , pydantic , pythonOlder , pytomlpp , pyyaml , rich -, setuptools-scm , typer }: buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.0"; - - format = "pyproject"; + version = "0.7.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,15 +26,14 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-6kHyz7jMZO3385XaNJ4zFBoQiU1SIRyYZsUeMH5EBXo="; + hash = "sha256-PjoLocNTkcAnBNRbPi+MZqZtQ2bjWPIUVz0+k8nIn2A="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - # npe2 *can* build without it, - # but then setuptools refuses to acknowledge it when building napari - setuptools-scm + hatchling + hatch-vcs ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix index 17e2b22924..f72edadaf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, factory_boy +, factory-boy , fetchFromGitHub , httpretty , inflection @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - factory_boy + factory-boy httpretty jsondate mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index b1de4350f5..5028ab345f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.4.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-6t4BTUWjzTbegPvySv9Y6pQrRDwparuYb6rC+HOXWLo="; + hash = "sha256-gpQXCihKvuXzCt1WNOd5W7RxxfVAvpaVP6OuHUiAQkw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 79febaf685..d473041400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , ipykernel -, ipython_genutils +, ipython-genutils , jinja2 , jupyter-client , jupyter-core @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argon2-cffi ipykernel - ipython_genutils + ipython-genutils jinja2 jupyter-client jupyter-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 6c386ee018..745de65f4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -19,7 +19,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2H6Oi1tK/GrtfMTR1j12tZdRzQkFUxXzMSpfCtGPyWE="; + hash = "sha256-uBCYmrl/Zfw58hd12z20jLVwGSPv+M3fMo1mfV2GO/M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index e7fb3dfba4..68d3de53cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -33,7 +33,7 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.7.3"; + version = "7.8.0"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-SlmWv1880WqgQxiXuhqkxkhCwgefQ0s9xrjEslLvM1U="; + hash = "sha256-9bwVoSR+FN1Bzu8MCjvHACDgFldusFeNpi8cW0+VBHk="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix index ac309a9002..8a298ec19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.12"; + version = "2.3.13"; format = "setuptools"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AQWNqCq9IEWMKkkG5bw0pkvWtvIMKkBbAotfTRRTMCQ="; + hash = "sha256-Umkf3CcRRSS+pK3UKeTg+Ru3TW+qHNoQ2F6nUk8jQUU="; }; propagatedBuildInputs = [ @@ -38,11 +39,15 @@ buildPythonPackage rec { # no real tests doCheck = false; - pythonImportsCheck = [ "nbdev" ]; + + pythonImportsCheck = [ + "nbdev" + ]; meta = with lib; { homepage = "https://github.com/fastai/nbdev"; description = "Create delightful software with Jupyter Notebooks"; + changelog = "https://github.com/fastai/nbdev/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rxiao ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index 354a937a61..290663e78a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.9.1"; + version = "5.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-On9S0EBjnL2KOJAhjIsP+5MhFYjFdEbJAJXjK6WIG10="; + hash = "sha256-X5i1uhmX3/F1534MF9XBCpbq7Sy9HeNTPR/DXV4REZI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix index 5919f7e18b..6aaee68058 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix @@ -1,34 +1,50 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , nbformat , nose }: buildPythonPackage rec { pname = "nbmerge"; - version = "unstable-2017-10-23"; + version = "0.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "jbn"; repo = pname; - rev = "fc0ba95e8422340317358ffec4404235defbc06a"; - sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ nbformat ]; + nativeCheckInputs = [ nose ]; checkPhase = '' + runHook preCheck + patchShebangs . nosetests -v PATH=$PATH:$out/bin ./cli_tests.sh + + runHook postCheck ''; + pythonImportsCheck = [ + "nbmerge" + ]; + meta = { description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; inherit (src.meta) homepage; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; + mainProgram = "nbmerge"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 7ad403678c..47ed44420f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.3.2"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-vSLWaGYST1nut+0KAzURRKsr6XRtmYYTrkJiQEK3wa4="; + hash = "sha256-7TGP3J4qepnUV/3aC7FssSGu4PahB70DGWezjOy+/+w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 9e31ebadf6..1e034efa19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.13.0"; + version = "5.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-ykbKNLMnbAGUavyfRtF3q97FRLaeuKOt0pcWHtJ9mCY="; + hash = "sha256-lQNsVpkMRn23qzqAa/K6aPrip67TsL+nXpMRqOXNFik="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index 9f00a33fdf..f181a7d4c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -50,12 +51,16 @@ buildPythonPackage rec { NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR = netcdf; - CURL_DIR = curl.dev; - JPEG_DIR = libjpeg.dev; + env = { + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev hdf5; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + }; pythonImportsCheck = [ "netCDF4" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix index 7258acb2aa..513c3ade94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.2"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; + hash = "sha256-et3m/j6mMzYij0moY2UMLYP7DmgODw0Vi1sPsExBAOE="; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 58f65b6e3d..1612bfac0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , dacite , fetchFromGitHub -, orjson , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "2.1.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,14 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8="; + hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; propagatedBuildInputs = [ aiohttp aqipy-atmotech dacite - orjson ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index c1f43e64f8..517c90b3f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , jinja2 +, jsonschema , napalm , poetry-core , pytestCheckHook @@ -30,6 +31,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jsonschema + napalm + ]; + + passthru.optional-dependencies.optionals = [ + jsonschema napalm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index 5342b12dc8..b793bc57bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mpmSNFNTYYrpgznCtj2CAcOBwpRPOKKrSctFpMZn5BI="; + hash = "sha256-3jRjNUCPhN4Orab/n6+v/5vNoR8KDfqpMRM967FGq2E="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix index e3283a4eb9..7697501636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix @@ -1,45 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , packaging , poetry-core , pytestCheckHook , pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "newversion"; - version = "1.8.2"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; - repo = pname; - rev = version; - hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; + repo = "newversion"; + rev = "refs/tags/${version}"; + hash = "sha256-v9hfk2/hBkWtOobQdaYXNOZTTcEqnMV6JYqtjjoidOs="; }; - patches = [ - # https://github.com/vemel/newversion/pull/9 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; - hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ @@ -53,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 440 version manager"; homepage = "https://github.com/vemel/newversion"; + changelog = "https://github.com/vemel/newversion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix index 9b94c6da08..9a41c79fb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.4.0"; + version = "2.0.1"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "nextdns"; rev = "refs/tags/${version}"; - hash = "sha256-fW/fLbL4IMLN6LmFijH4+ew+cDdJY9tOha+010YEfNs="; + hash = "sha256-NJjnk/FadD4QUqPYxbbS7gsIKVxwR5tpnBth1HFLkr0="; }; propagatedBuildInputs = [ @@ -41,9 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; description = "Module for the NextDNS API"; homepage = "https://github.com/bieniu/nextdns"; + changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix index fd2d7df76e..3b03993656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix @@ -3,24 +3,26 @@ , fetchFromGitHub , niapy , nltk +, numpy , pandas , poetry-core , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.2"; + version = "0.3.5"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "NiaARM"; - rev = version; - hash = "sha256-9/VGr/Ci9f8SiuofX1vWVF/E4eoeQ0ESj9raQk53Zp4="; + rev = "refs/tags/${version}"; + hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les="; }; nativeBuildInputs = [ @@ -30,7 +32,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ niapy nltk + numpy pandas + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix index bec644ecaa..b122c7bbbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.4.1"; - format = "pyproject"; + version = "2.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "yozik04"; - repo = pname; + repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-6WXn8W7C6QCy9afGMTL2NaSYuxQy+u2OYYa0Vc8sbV8="; + hash = "sha256-PCfodp8gyjOUgb4FthMlbanbEtJuc6axM8DkQJ/ykLg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index 5a79242daa..3c21b0b62e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -1,15 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, lxml, matplotlib -, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, hatch-vcs +, lxml +, matplotlib +, nibabel +, numpy +, pandas +, scikit-learn +, scipy +, joblib +, requests +}: buildPythonPackage rec { pname = "nilearn"; - version = "0.10.0"; + version = "0.10.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zH8QaOA4B2Un6tG9NjQ2+I9ejSHou1ezI7MLkm/HVTo="; + hash = "sha256-A+9Npy0a6HsuPyi3cdx+BUZKoXliblfDAFlWJahlQnM="; }; + nativeBuildInputs = [ hatch-vcs ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 # do subset of tests which don't fetch resources @@ -30,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; + changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}"; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix index b0870c9849..cba5f0da29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.10.1"; + version = "0.10.2"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y="; + hash = "sha256-NCaWr7ZqL1XV0QfUD+4+Yn33N1cCP33ib5oJ91OtJLU="; }; # Upstream wants to build against the oldest version of numpy possible, but diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix index 49fdb5e528..55e9233bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nlpcloud/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nlpcloud"; - version = "1.1.44"; + version = "1.1.45"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dOW/M9FJJiCii4+lZJ6Pg2bAdSpul4JRtzYdI7VgJbM="; + hash = "sha256-W/O7GhZuACUFCSCCJUUB6UfMB9WSF8uU7Yd/tgPsE0Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix index 567c78d68f..7cca122333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.9"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-dElqneeZ9S1n+q0VidprZV0M+sWNgdRcts7L1is8r/o="; + hash = "sha256-jqevKKOQrVpeCe305VKYnF6ODD5JEdt7du+deSZXreA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix index bb6f6decc1..981d5dc037 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix @@ -27,17 +27,17 @@ buildPythonPackage rec { ''; preBuild = lib.optionalString (isPy3k) '' - ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests + ${python.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle checkPhase = if isPy3k then '' - ${python.pythonForBuild.interpreter} setup.py build_tests + ${python.pythonOnBuildForHost.interpreter} setup.py build_tests '' else "" + '' rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python.pythonForBuild.interpreter} selftest.py + ${python.pythonOnBuildForHost.interpreter} selftest.py ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix index 648d954be7..b49900e157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.12.0"; + version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lW55ub1VjuCLYgDAWtLHZGW344YMDAU3aGCJKFwyARM="; + hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose3/default.nix index c452a3431c..f9966b2466 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose3/default.nix @@ -5,6 +5,7 @@ , isPyPy , isPy311 , python +, pythonAtLeast , stdenv }: @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "nose3"; version = "1.3.8"; + # https://github.com/jayvdb/nose3/issues/5 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; @@ -24,7 +28,7 @@ buildPythonPackage rec { doCheck = !isPyPy && !stdenv.isDarwin && !isPy311; checkPhase = '' - ${python.pythonForBuild.interpreter} selftest.py + ${python.pythonOnBuildForHost.interpreter} selftest.py ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix index 985cc63158..3bdb114168 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "notebook-shim"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter"; repo = "notebook_shim"; rev = "refs/tags/v${version}"; - hash = "sha256-/z4vXSBqeL2wSqJ0kFNgU0TSGUGByhxHNya8EO55+7s="; + hash = "sha256-eAYZuNYqOMKC6joDbbKk4Q4nrfdbO7b+yZeSvMdWWrI="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 95f387653d..88f4c975a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -7,7 +7,7 @@ , hatchling , jupyter-server , jupyterlab -, jupyterlab_server +, jupyterlab-server , notebook-shim , tornado , pytest-jupyter @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.2"; + version = "7.0.3"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1w1qB0GMgpvV9UM3zpk7cQUmHZAm+dP+aOm4qhog2po="; + hash = "sha256-B/PFBi/Q5uaYZEN6A0erxIXZkaroepLEfWWWmfVxtyk="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter-server jupyterlab - jupyterlab_server + jupyterlab-server notebook-shim tornado ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix index 2f2eceb788..5ae579c8de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "8.0.1"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "alphagov"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZDqUJljCZnGmm0TRclv23I+I9egFdF25P0wIYAQkOVI="; + hash = "sha256-pdBPjc2j0/PSk224r8un22pNQ9g1jMdhPn8XmoKp+ng="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix index b8ed00ca25..9bb930d6cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notmuch2/default.nix @@ -16,9 +16,11 @@ buildPythonPackage { cffi ]; buildInputs = [ - python notmuch cffi + python notmuch ]; + propagatedBuildInputs = [ cffi ]; + # since notmuch 0.35, this package expects _notmuch_config.py that is # generated by notmuch's configure script. We write one which references our # built libraries. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix index ac823c2e45..883eb00384 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix @@ -8,7 +8,6 @@ , numpy , pandas , feedparser -, typeguard }: buildPythonPackage rec { @@ -35,7 +34,6 @@ buildPythonPackage rec { invoke pandas pytestCheckHook - typeguard ]; disabledTests = [ @@ -49,6 +47,8 @@ buildPythonPackage rec { # can't find mypy stubs for pandas: "tests/test_mypy.py" "tests/pandas_/test_mypy_dataframe.py" + # typeguard release broke nptyping compatibility: + "tests/test_typeguard.py" # tries to build wheel of package, broken/unnecessary under Nix: "tests/test_wheel.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch new file mode 100644 index 0000000000..bd3a659054 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch @@ -0,0 +1,15 @@ +diff --git a/nuitka/build/SconsCompilerSettings.py b/nuitka/build/SconsCompilerSettings.py +index 319b72c4e..89d40f2a2 100644 +--- a/nuitka/build/SconsCompilerSettings.py ++++ b/nuitka/build/SconsCompilerSettings.py +@@ -173,8 +173,8 @@ def _enableLtoSettings( + lto_mode = False + reason = "known to be not supported (CondaCC)" + elif isMacOS() and env.gcc_mode and env.clang_mode: +- lto_mode = True +- reason = "known to be supported (macOS clang)" ++ lto_mode = False ++ reason = "known to not be supported (macOS nix clang)" + elif env.mingw_mode and env.clang_mode: + lto_mode = False + reason = "known to not be supported (new MinGW64 Clang)" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index ca2272ac1b..fee04a0e40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -1,44 +1,46 @@ -{ lib, stdenv +{ lib , buildPythonPackage +, ccache , fetchFromGitHub -, vmprof , isPyPy -, pkgs -, scons -, chrpath +, ordered-set +, python3 +, setuptools +, zstandard }: buildPythonPackage rec { pname = "nuitka"; - version = "1.1.5"; - format = "setuptools"; + version = "1.8.4"; + pyproject = true; src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; rev = version; - hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU="; + hash = "sha256-spa3V9KEjqmwnHSuxLLIu9hJk5PrRwNyOw72sfxBVKo="; }; - nativeCheckInputs = [ vmprof ]; - nativeBuildInputs = [ scons ]; - propagatedBuildInputs = [ chrpath ]; + # default lto off for darwin + patches = [ ./darwin-lto.patch ]; - postPatch = '' - patchShebangs tests/run-tests - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${lib.getLib pkgs.util-linux}/lib/libuuid.so"' - ''; + nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ ccache ]; - # We do not want any wrappers here. - postFixup = ""; + propagatedBuildInputs = [ + ordered-set + zstandard + ]; checkPhase = '' - tests/run-tests + runHook preCheck + + ${python3.interpreter} tests/basics/run_all.py search + + runHook postCheck ''; - # Problem with a subprocess (parts) - doCheck = false; + pythonImportsCheck = [ "nuitka" ]; # Requires CPython disabled = isPyPy; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix index 82ba5a8cec..c43cb81eb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.12"; + version = "0.5.13"; pname = "num2words"; src = fetchPypi { inherit pname version; - hash = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; + hash = "sha256-owZHFvu/kNdcRJRQzr+8c6ahPmOyUx0JvezDqxoiCc8="; }; propagatedBuildInputs = [ docopt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index 874cbe2376..cbf8fa40d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -12,7 +12,6 @@ , importlib-metadata , substituteAll , runCommand -, fetchpatch , config @@ -29,15 +28,16 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "unstable-2023-08-11"; + version = "0.58.1"; pname = "numba"; - format = "setuptools"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; + pyproject = true; + + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "numba"; repo = "numba"; - rev = "6f0c5060a69656319ab0bae1d8bb89484cd5631f"; + rev = "refs/tags/${version}"; # Upstream uses .gitattributes to inject information about the revision # hash and the refname into `numba/_version.py`, see: # @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-34qEn/i2X6Xu1cjuiRrmrm/HryNoN+Am4A4pJ90srAE="; + hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; @@ -78,13 +78,6 @@ in buildPythonPackage rec { cuda_toolkit_lib_path = cudatoolkit.lib; }) ]; - # with untagged version we need to specify the correct version ourselves - - postPatch = '' - substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='0.57.1'" - substituteInPlace numba/_version.py \ - --replace 'git_refnames = " (HEAD -> main)"' 'git_refnames = "tag: 0.57.1"' - ''; postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch b/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch deleted file mode 100644 index 8a0214b79f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/numpy-1.24.patch +++ /dev/null @@ -1,644 +0,0 @@ -From c3e6994e07fb6ac57be5d9d33d9046c5453b2256 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 15:41:24 +0000 -Subject: [PATCH 01/13] CUDA intrinsics tests: correct np.float -> np.float16 - -I believe this was written in error and should always have been float16. ---- - numba/cuda/tests/cudapy/test_intrinsics.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numba/cuda/tests/cudapy/test_intrinsics.py b/numba/cuda/tests/cudapy/test_intrinsics.py -index 6e5fc0a0e..46fe8c607 100644 ---- a/numba/cuda/tests/cudapy/test_intrinsics.py -+++ b/numba/cuda/tests/cudapy/test_intrinsics.py -@@ -619,7 +619,7 @@ class TestCudaIntrinsic(CUDATestCase): - arg2 = np.float16(4.) - compiled[1, 1](ary, arg1, arg2) - np.testing.assert_allclose(ary[0], arg2) -- arg1 = np.float(5.) -+ arg1 = np.float16(5.) - compiled[1, 1](ary, arg1, arg2) - np.testing.assert_allclose(ary[0], arg1) - -@@ -631,7 +631,7 @@ class TestCudaIntrinsic(CUDATestCase): - arg2 = np.float16(4.) - compiled[1, 1](ary, arg1, arg2) - np.testing.assert_allclose(ary[0], arg1) -- arg1 = np.float(5.) -+ arg1 = np.float16(5.) - compiled[1, 1](ary, arg1, arg2) - np.testing.assert_allclose(ary[0], arg2) - --- -2.39.1 - -From 550fc6a25a82f76bc1f06bdea39177df635038c2 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 22 Dec 2022 13:02:22 +0000 -Subject: [PATCH 02/13] TestLinalgSvd.test_no_input_mutation: use - reconstruction if necessary - -This test only checked for a plain match when comparing outputs. -However, in some cases a reconstruction check can be necessary, as in -`test_linalg_svd`. ---- - numba/tests/test_linalg.py | 61 ++++++++++++++++++++------------------ - 1 file changed, 32 insertions(+), 29 deletions(-) - -diff --git a/numba/tests/test_linalg.py b/numba/tests/test_linalg.py -index db183059d..b1d4f0a83 100644 ---- a/numba/tests/test_linalg.py -+++ b/numba/tests/test_linalg.py -@@ -1122,6 +1122,32 @@ class TestLinalgSvd(TestLinalgBase): - Tests for np.linalg.svd. - """ - -+ # This checks that A ~= U*S*V**H, i.e. SV decomposition ties out. This is -+ # required as NumPy uses only double precision LAPACK routines and -+ # computation of SVD is numerically sensitive. Numba uses type-specific -+ # routines and therefore sometimes comes out with a different answer to -+ # NumPy (orthonormal bases are not unique, etc.). -+ -+ def check_reconstruction(self, a, got, expected): -+ u, sv, vt = got -+ -+ # Check they are dimensionally correct -+ for k in range(len(expected)): -+ self.assertEqual(got[k].shape, expected[k].shape) -+ -+ # Columns in u and rows in vt dictates the working size of s -+ s = np.zeros((u.shape[1], vt.shape[0])) -+ np.fill_diagonal(s, sv) -+ -+ rec = np.dot(np.dot(u, s), vt) -+ resolution = np.finfo(a.dtype).resolution -+ np.testing.assert_allclose( -+ a, -+ rec, -+ rtol=10 * resolution, -+ atol=100 * resolution # zeros tend to be fuzzy -+ ) -+ - @needs_lapack - def test_linalg_svd(self): - """ -@@ -1150,34 +1176,8 @@ class TestLinalgSvd(TestLinalgBase): - # plain match failed, test by reconstruction - use_reconstruction = True - -- # if plain match fails then reconstruction is used. -- # this checks that A ~= U*S*V**H -- # i.e. SV decomposition ties out -- # this is required as numpy uses only double precision lapack -- # routines and computation of svd is numerically -- # sensitive, numba using the type specific routines therefore -- # sometimes comes out with a different answer (orthonormal bases -- # are not unique etc.). - if use_reconstruction: -- u, sv, vt = got -- -- # check they are dimensionally correct -- for k in range(len(expected)): -- self.assertEqual(got[k].shape, expected[k].shape) -- -- # regardless of full_matrices cols in u and rows in vt -- # dictates the working size of s -- s = np.zeros((u.shape[1], vt.shape[0])) -- np.fill_diagonal(s, sv) -- -- rec = np.dot(np.dot(u, s), vt) -- resolution = np.finfo(a.dtype).resolution -- np.testing.assert_allclose( -- a, -- rec, -- rtol=10 * resolution, -- atol=100 * resolution # zeros tend to be fuzzy -- ) -+ self.check_reconstruction(a, got, expected) - - # Ensure proper resource management - with self.assertNoNRTLeak(): -@@ -1238,8 +1238,11 @@ class TestLinalgSvd(TestLinalgBase): - got = func(X, False) - np.testing.assert_allclose(X, X_orig) - -- for e_a, g_a in zip(expected, got): -- np.testing.assert_allclose(e_a, g_a) -+ try: -+ for e_a, g_a in zip(expected, got): -+ np.testing.assert_allclose(e_a, g_a) -+ except AssertionError: -+ self.check_reconstruction(X, got, expected) - - - class TestLinalgQr(TestLinalgBase): --- -2.39.1 - -From c9ca2d1ae5e09ace729cddf6fba08effcd69a0b7 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 21:39:27 +0000 -Subject: [PATCH 03/13] test_comp_nest_with_dependency: skip on NumPy 1.24 - -Setting an array element with a sequence is removed in NumPy 1.24. ---- - numba/tests/test_comprehension.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/numba/tests/test_comprehension.py b/numba/tests/test_comprehension.py -index 2cdd3dc25..092ed51da 100644 ---- a/numba/tests/test_comprehension.py -+++ b/numba/tests/test_comprehension.py -@@ -11,6 +11,7 @@ from numba import jit, typed - from numba.core import types, utils - from numba.core.errors import TypingError, LoweringError - from numba.core.types.functions import _header_lead -+from numba.np.numpy_support import numpy_version - from numba.tests.support import tag, _32bit, captured_stdout - - -@@ -360,6 +361,7 @@ class TestArrayComprehension(unittest.TestCase): - self.check(comp_nest_with_array_conditional, 5, - assert_allocate_list=True) - -+ @unittest.skipUnless(numpy_version < (1, 24), 'Removed in NumPy 1.24') - def test_comp_nest_with_dependency(self): - def comp_nest_with_dependency(n): - l = np.array([[i * j for j in range(i+1)] for i in range(n)]) --- -2.39.1 - -From e69ad519352ac5a1f7714083968fcbac3ba92f95 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 16:48:37 +0000 -Subject: [PATCH 04/13] Avoid use of np.bool in stencilparfor.py - ---- - numba/stencils/stencilparfor.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/numba/stencils/stencilparfor.py b/numba/stencils/stencilparfor.py -index 5f30893b3..4f23ed903 100644 ---- a/numba/stencils/stencilparfor.py -+++ b/numba/stencils/stencilparfor.py -@@ -21,6 +21,7 @@ from numba.core.ir_utils import (get_call_table, mk_unique_var, - find_callname, require, find_const, GuardException) - from numba.core.errors import NumbaValueError - from numba.core.utils import OPERATORS_TO_BUILTINS -+from numba.np import numpy_support - - - def _compute_last_ind(dim_size, index_const): -@@ -264,7 +265,11 @@ class StencilPass(object): - dtype_g_np_assign = ir.Assign(dtype_g_np, dtype_g_np_var, loc) - init_block.body.append(dtype_g_np_assign) - -- dtype_np_attr_call = ir.Expr.getattr(dtype_g_np_var, return_type.dtype.name, loc) -+ return_type_name = numpy_support.as_dtype( -+ return_type.dtype).type.__name__ -+ if return_type_name == 'bool': -+ return_type_name = 'bool_' -+ dtype_np_attr_call = ir.Expr.getattr(dtype_g_np_var, return_type_name, loc) - dtype_attr_var = ir.Var(scope, mk_unique_var("$np_attr_attr"), loc) - self.typemap[dtype_attr_var.name] = types.functions.NumberClass(return_type.dtype) - dtype_attr_assign = ir.Assign(dtype_np_attr_call, dtype_attr_var, loc) --- -2.39.1 - -From dd96d5996abd8646443501f2bbd7d4e1a9c0eec4 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 15:46:52 +0000 -Subject: [PATCH 05/13] test_hypot: Tweak regex so it matches NumPy 1.24 - -The modified regex matches the existing message produced by NumPy < -1.24, and the new improved message in 1.24. ---- - numba/tests/test_mathlib.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/numba/tests/test_mathlib.py b/numba/tests/test_mathlib.py -index a3f535316..05e3d68f5 100644 ---- a/numba/tests/test_mathlib.py -+++ b/numba/tests/test_mathlib.py -@@ -516,7 +516,7 @@ class TestMathLib(TestCase): - with warnings.catch_warnings(): - warnings.simplefilter("error", RuntimeWarning) - self.assertRaisesRegexp(RuntimeWarning, -- 'overflow encountered in .*_scalars', -+ 'overflow encountered in .*scalar', - naive_hypot, val, val) - - def test_hypot_npm(self): --- -2.39.1 - -From b755c22caeec9e6b0e0606f0cee245648914d592 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 11:29:53 +0000 -Subject: [PATCH 06/13] Don't test summing with timedelta dtype - -This always produced invalid results (though they were consistent -between Numba and NumPy) but now this fails in NumPy 1.24 with an -exception: - -``` -TypeError: The `dtype` and `signature` arguments to ufuncs only select -the general DType and not details such as the byte order or time unit. -You can avoid this error by using the scalar types `np.float64` or the -dtype string notation. -``` - -Note that the exception message is misleading, and using the dtype -string notation does not provide a workaround. ---- - numba/tests/test_array_methods.py | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/numba/tests/test_array_methods.py b/numba/tests/test_array_methods.py -index eee5cfeff..a2312adba 100644 ---- a/numba/tests/test_array_methods.py -+++ b/numba/tests/test_array_methods.py -@@ -1193,7 +1193,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): - pyfunc = array_sum_dtype_kws - cfunc = jit(nopython=True)(pyfunc) - all_dtypes = [np.float64, np.float32, np.int64, np.int32, np.uint32, -- np.uint64, np.complex64, np.complex128, TIMEDELTA_M] -+ np.uint64, np.complex64, np.complex128] - all_test_arrays = [ - [np.ones((7, 6, 5, 4, 3), arr_dtype), - np.ones(1, arr_dtype), -@@ -1207,8 +1207,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): - np.dtype('uint32'): [np.float64, np.int64, np.float32], - np.dtype('uint64'): [np.float64, np.int64], - np.dtype('complex64'): [np.complex64, np.complex128], -- np.dtype('complex128'): [np.complex128], -- np.dtype(TIMEDELTA_M): [np.dtype(TIMEDELTA_M)]} -+ np.dtype('complex128'): [np.complex128]} - - for arr_list in all_test_arrays: - for arr in arr_list: -@@ -1216,15 +1215,15 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): - subtest_str = ("Testing np.sum with {} input and {} output" - .format(arr.dtype, out_dtype)) - with self.subTest(subtest_str): -- self.assertPreciseEqual(pyfunc(arr, dtype=out_dtype), -- cfunc(arr, dtype=out_dtype)) -+ self.assertPreciseEqual(pyfunc(arr, dtype=out_dtype), -+ cfunc(arr, dtype=out_dtype)) - - def test_sum_axis_dtype_kws(self): - """ test sum with axis and dtype parameters over a whole range of dtypes """ - pyfunc = array_sum_axis_dtype_kws - cfunc = jit(nopython=True)(pyfunc) - all_dtypes = [np.float64, np.float32, np.int64, np.int32, np.uint32, -- np.uint64, np.complex64, np.complex128, TIMEDELTA_M] -+ np.uint64, np.complex64, np.complex128] - all_test_arrays = [ - [np.ones((7, 6, 5, 4, 3), arr_dtype), - np.ones(1, arr_dtype), -@@ -1238,9 +1237,7 @@ class TestArrayMethods(MemoryLeakMixin, TestCase): - np.dtype('uint32'): [np.float64, np.int64, np.float32], - np.dtype('uint64'): [np.float64, np.uint64], - np.dtype('complex64'): [np.complex64, np.complex128], -- np.dtype('complex128'): [np.complex128], -- np.dtype(TIMEDELTA_M): [np.dtype(TIMEDELTA_M)], -- np.dtype(TIMEDELTA_Y): [np.dtype(TIMEDELTA_Y)]} -+ np.dtype('complex128'): [np.complex128]} - - for arr_list in all_test_arrays: - for arr in arr_list: --- -2.39.1 - -From 65df00379df1276b7045b44818347a119bb32361 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 10:03:54 +0000 -Subject: [PATCH 07/13] Replace use of deprecated np.bool with np.bool_ - -np.bool was removed in NumPy 1.24. ---- - numba/tests/test_np_functions.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/numba/tests/test_np_functions.py b/numba/tests/test_np_functions.py -index 4cdaf548b..e195ac781 100644 ---- a/numba/tests/test_np_functions.py -+++ b/numba/tests/test_np_functions.py -@@ -932,11 +932,11 @@ class TestNPFunctions(MemoryLeakMixin, TestCase): - yield np.inf, None - yield np.PINF, None - yield np.asarray([-np.inf, 0., np.inf]), None -- yield np.NINF, np.zeros(1, dtype=np.bool) -- yield np.inf, np.zeros(1, dtype=np.bool) -- yield np.PINF, np.zeros(1, dtype=np.bool) -+ yield np.NINF, np.zeros(1, dtype=np.bool_) -+ yield np.inf, np.zeros(1, dtype=np.bool_) -+ yield np.PINF, np.zeros(1, dtype=np.bool_) - yield np.NINF, np.empty(12) -- yield np.asarray([-np.inf, 0., np.inf]), np.zeros(3, dtype=np.bool) -+ yield np.asarray([-np.inf, 0., np.inf]), np.zeros(3, dtype=np.bool_) - - pyfuncs = [isneginf, isposinf] - for pyfunc in pyfuncs: --- -2.39.1 - -From 065475bd8d5f39ad0a2b0d154ca283dec10bf5d0 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Thu, 24 Nov 2022 09:56:06 +0000 -Subject: [PATCH 08/13] Overload np.MachAr only for NumPy < 1.24 - ---- - numba/np/arraymath.py | 4 ++++ - numba/tests/test_np_functions.py | 4 +++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/numba/np/arraymath.py b/numba/np/arraymath.py -index 9885526ee..f6e5f5560 100644 ---- a/numba/np/arraymath.py -+++ b/numba/np/arraymath.py -@@ -4177,6 +4177,10 @@ iinfo = namedtuple('iinfo', _iinfo_supported) - # This module is imported under the compiler lock which should deal with the - # lack of thread safety in the warning filter. - def _gen_np_machar(): -+ # NumPy 1.24 removed np.MachAr -+ if numpy_version >= (1, 24): -+ return -+ - np122plus = numpy_version >= (1, 22) - w = None - with warnings.catch_warnings(record=True) as w: -diff --git a/numba/tests/test_np_functions.py b/numba/tests/test_np_functions.py -index e195ac781..e8a9bccd0 100644 ---- a/numba/tests/test_np_functions.py -+++ b/numba/tests/test_np_functions.py -@@ -4775,6 +4775,7 @@ def foo(): - eval(compile(funcstr, '', 'exec')) - return locals()['foo'] - -+ @unittest.skipIf(numpy_version >= (1, 24), "NumPy < 1.24 required") - def test_MachAr(self): - attrs = ('ibeta', 'it', 'machep', 'eps', 'negep', 'epsneg', 'iexp', - 'minexp', 'xmin', 'maxexp', 'xmax', 'irnd', 'ngrd', -@@ -4817,7 +4818,8 @@ def foo(): - cfunc = jit(nopython=True)(iinfo) - cfunc(np.float64(7)) - -- @unittest.skipUnless(numpy_version >= (1, 22), "Needs NumPy >= 1.22") -+ @unittest.skipUnless((1, 22) <= numpy_version < (1, 24), -+ "Needs NumPy >= 1.22, < 1.24") - @TestCase.run_test_in_subprocess - def test_np_MachAr_deprecation_np122(self): - # Tests that Numba is replaying the NumPy 1.22 deprecation warning --- -2.39.1 - -From 4925287144b9dca5624886ac44a27831178a7198 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Fri, 25 Nov 2022 10:55:04 +0000 -Subject: [PATCH 09/13] _internal.c: Remove NPY_API_VERSION checks - -The API version has long since been greater than 0x7 / 0x8 for any -supported NumPy. ---- - numba/np/ufunc/_internal.c | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c -index 98a643788..3ab725f8f 100644 ---- a/numba/np/ufunc/_internal.c -+++ b/numba/np/ufunc/_internal.c -@@ -285,9 +285,7 @@ static struct _ufunc_dispatch { - PyCFunctionWithKeywords ufunc_accumulate; - PyCFunctionWithKeywords ufunc_reduceat; - PyCFunctionWithKeywords ufunc_outer; --#if NPY_API_VERSION >= 0x00000008 - PyCFunction ufunc_at; --#endif - } ufunc_dispatch; - - static int -@@ -303,10 +301,8 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - if (strncmp(crnt_name, "accumulate", 11) == 0) { - ufunc_dispatch.ufunc_accumulate = - (PyCFunctionWithKeywords)crnt->ml_meth; --#if NPY_API_VERSION >= 0x00000008 - } else if (strncmp(crnt_name, "at", 3) == 0) { - ufunc_dispatch.ufunc_at = crnt->ml_meth; --#endif - } else { - result = -1; - } -@@ -351,9 +347,7 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - && (ufunc_dispatch.ufunc_accumulate != NULL) - && (ufunc_dispatch.ufunc_reduceat != NULL) - && (ufunc_dispatch.ufunc_outer != NULL) --#if NPY_API_VERSION >= 0x00000008 - && (ufunc_dispatch.ufunc_at != NULL) --#endif - ); - } - return result; -@@ -425,13 +419,11 @@ dufunc_outer_fast(PyDUFuncObject * self, - } - - --#if NPY_API_VERSION >= 0x00000008 - static PyObject * - dufunc_at(PyDUFuncObject * self, PyObject * args) - { - return ufunc_dispatch.ufunc_at((PyObject*)self->ufunc, args); - } --#endif - - static PyObject * - dufunc__compile_for_args(PyDUFuncObject * self, PyObject * args, -@@ -609,11 +601,9 @@ static struct PyMethodDef dufunc_methods[] = { - {"outer", - (PyCFunction)dufunc_outer, - METH_VARARGS | METH_KEYWORDS, NULL}, --#if NPY_API_VERSION >= 0x00000008 - {"at", - (PyCFunction)dufunc_at, - METH_VARARGS, NULL}, --#endif - {"_compile_for_args", - (PyCFunction)dufunc__compile_for_args, - METH_VARARGS | METH_KEYWORDS, -@@ -643,11 +633,9 @@ static struct PyMethodDef dufunc_methods_fast[] = { - {"outer", - (PyCFunction)dufunc_outer_fast, - METH_FASTCALL | METH_KEYWORDS, NULL}, --#if NPY_API_VERSION >= 0x00000008 - {"at", - (PyCFunction)dufunc_at, - METH_VARARGS, NULL}, --#endif - {"_compile_for_args", - (PyCFunction)dufunc__compile_for_args, - METH_VARARGS | METH_KEYWORDS, -@@ -791,9 +779,7 @@ MOD_INIT(_internal) - if (PyModule_AddIntMacro(m, PyUFunc_One) - || PyModule_AddIntMacro(m, PyUFunc_Zero) - || PyModule_AddIntMacro(m, PyUFunc_None) --#if NPY_API_VERSION >= 0x00000007 - || PyModule_AddIntMacro(m, PyUFunc_ReorderableNone) --#endif - ) - return MOD_ERROR_VAL; - --- -2.39.1 - -From 783ef5a297f15d16eec61fe38d13648b876e3750 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Tue, 3 Jan 2023 17:08:44 +0000 -Subject: [PATCH 10/13] init_ufunc_dispatch: Handle unexpected ufunc methods - gracefully - -If an unexpected ufunc method was encountered, `init_ufunc_dispatch()` -would return an error code indicating failure without setting an -exception, leading to errors like - -``` -SystemError: initialization of _internal failed without raising an -exception -``` - -as reported in Issue #8615. - -This commit fixes the issue by setting an appropriate exception in this -case. ---- - numba/np/ufunc/_internal.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c -index 3ab725f8f..6ce8989cd 100644 ---- a/numba/np/ufunc/_internal.c -+++ b/numba/np/ufunc/_internal.c -@@ -337,6 +337,8 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - *numpy_uses_fastcall = crnt->ml_flags & METH_FASTCALL; - } - else if (*numpy_uses_fastcall != (crnt->ml_flags & METH_FASTCALL)) { -+ PyErr_SetString(PyExc_RuntimeError, -+ "ufunc.at() flags do not match numpy_uses_fastcall"); - return -1; - } - } -@@ -349,7 +351,11 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - && (ufunc_dispatch.ufunc_outer != NULL) - && (ufunc_dispatch.ufunc_at != NULL) - ); -+ } else { -+ char const * const fmt = "Unexpected ufunc method %s()"; -+ PyErr_Format(PyExc_RuntimeError, fmt, crnt_name); - } -+ - return result; - } - --- -2.39.1 - -From 5c259e46a8e510c2b82c7ff449b167d3b430294b Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Tue, 3 Jan 2023 17:11:10 +0000 -Subject: [PATCH 11/13] init_ufunc_dispatch: Update for NumPy 1.24 - -NumPy 1.24 adds a new method, `resolve_dtypes()`, and a private method -`_resolve_dtypes_and_context()`. We handle these by just ignoring them -(ignoring all private methods in general) in order to provide the same -level of functionality in Numba as for NumPy 1.23. - -There is further room to build new functionality on top of this: - -- Providing an implementation of `resolve_dtypes()` for `DUFunc` - objects. -- Using the `resolve_dtypes()` method in place of logic in Numba that - implements a similar dtype resolution process. ---- - numba/np/ufunc/_internal.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c -index 6ce8989cd..e860081fb 100644 ---- a/numba/np/ufunc/_internal.c -+++ b/numba/np/ufunc/_internal.c -@@ -322,10 +322,15 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - } else if (strncmp(crnt_name, "reduceat", 9) == 0) { - ufunc_dispatch.ufunc_reduceat = - (PyCFunctionWithKeywords)crnt->ml_meth; -+ } else if (strncmp(crnt_name, "resolve_dtypes", 15) == 0) { -+ /* Ignored */ - } else { - result = -1; - } - break; -+ case '_': -+ // We ignore private methods -+ break; - default: - result = -1; /* Unknown method */ - } --- -2.39.1 - -From 3736714982be943eb94f4a259368b1dce525ea64 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Wed, 11 Jan 2023 16:25:19 +0000 -Subject: [PATCH 12/13] Update comment on skipped test - -PR #8691 feedback. ---- - numba/tests/test_comprehension.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/numba/tests/test_comprehension.py b/numba/tests/test_comprehension.py -index 092ed51da..9327b4ed3 100644 ---- a/numba/tests/test_comprehension.py -+++ b/numba/tests/test_comprehension.py -@@ -361,7 +361,9 @@ class TestArrayComprehension(unittest.TestCase): - self.check(comp_nest_with_array_conditional, 5, - assert_allocate_list=True) - -- @unittest.skipUnless(numpy_version < (1, 24), 'Removed in NumPy 1.24') -+ @unittest.skipUnless(numpy_version < (1, 24), -+ 'Setting an array element with a sequence is removed ' -+ 'in NumPy 1.24') - def test_comp_nest_with_dependency(self): - def comp_nest_with_dependency(n): - l = np.array([[i * j for j in range(i+1)] for i in range(n)]) --- -2.39.1 - -From 3cbab7ee436e3452e7d078f8283136671a36d944 Mon Sep 17 00:00:00 2001 -From: Graham Markall -Date: Fri, 27 Jan 2023 12:06:57 +0000 -Subject: [PATCH 13/13] Correct name of ufunc method in fastcall flags error - -The name of the method should be given, which was never `at()`. ---- - numba/np/ufunc/_internal.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/numba/np/ufunc/_internal.c b/numba/np/ufunc/_internal.c -index e860081fb..0a33de170 100644 ---- a/numba/np/ufunc/_internal.c -+++ b/numba/np/ufunc/_internal.c -@@ -342,8 +342,9 @@ init_ufunc_dispatch(int *numpy_uses_fastcall) - *numpy_uses_fastcall = crnt->ml_flags & METH_FASTCALL; - } - else if (*numpy_uses_fastcall != (crnt->ml_flags & METH_FASTCALL)) { -- PyErr_SetString(PyExc_RuntimeError, -- "ufunc.at() flags do not match numpy_uses_fastcall"); -+ PyErr_Format(PyExc_RuntimeError, -+ "ufunc.%s() flags do not match numpy_uses_fastcall", -+ crnt_name); - return -1; - } - } --- -2.39.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix index 63d95622c0..6acc3e53f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.4"; + version = "2.8.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1UMlN0GNGGkbkRXWFdbaoX7oJ1uu8+3xr7v4vGmAYUc="; + hash = "sha256-Yzb426P0VuQaT/w8l+tj2JxzWJ/24XBxQSJLkwJjJg0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 20019633d8..82ceee47d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -1,18 +1,29 @@ { lib , stdenv , fetchPypi -, fetchpatch , python +, pythonAtLeast +, pythonOlder , buildPythonPackage +, writeTextFile + +# build-system +, cython_3 , gfortran -, hypothesis -, pytest -, typing-extensions +, meson-python +, pkg-config +, xcbuild + +# native dependencies , blas , lapack -, writeTextFile -, cython -, pythonOlder + +# tests +, hypothesis +, pytest-xdist +, pytestCheckHook +, setuptools +, typing-extensions }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -41,24 +52,17 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.1"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "1.26.1"; + pyproject = true; + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-mjqfOmFIDMCGEXtCaovYaGnCE/xAcuYG8BxOS2brkr8="; + hash = "sha256-yMbHLUqfgx8yjvsTEmQqHK+vqoiYHZq3Y2jVDQfZPL4="; }; patches = [ - # f2py.f90mod_rules generates code with invalid function pointer conversions, which are - # clang 16 makes an error by default. - (fetchpatch { - url = "https://github.com/numpy/numpy/commit/609fee4324f3521d81a3454f5fcc33abb0d3761e.patch"; - hash = "sha256-6Dbmf/RWvQJPTIjvchVaywHGcKCsgap/0wAp5WswuCo="; - }) - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. @@ -77,10 +81,23 @@ in buildPythonPackage rec { # error: option --single-version-externally-managed not recognized # TypeError: dist must be a Distribution instance rm numpy/core/tests/test_cython.py + + patchShebangs numpy/_build_utils/*.py ''; - nativeBuildInputs = [ gfortran cython ]; - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ + cython_3 + gfortran + meson-python + pkg-config + ] ++ lib.optionals (stdenv.isDarwin) [ + xcbuild.xcrun + ]; + + buildInputs = [ + blas + lapack + ]; # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; @@ -90,7 +107,6 @@ in buildPythonPackage rec { # see https://github.com/xianyi/OpenBLAS/issues/2993 preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; @@ -101,19 +117,43 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ - pytest + pytest-xdist + pytestCheckHook hypothesis + setuptools typing-extensions ]; - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy, sys; sys.exit(numpy.test("fast", verbose=10) is False)' - popd - runHook postCheck + preCheck = '' + cd "$out" ''; + # https://github.com/numpy/numpy/blob/a277f6210739c11028f281b8495faf7da298dbef/numpy/_pytesttester.py#L180 + pytestFlagsArray = [ + "-m" "not\\ slow" # fast test suite + ]; + + # https://github.com/numpy/numpy/issues/24548 + disabledTests = lib.optionals stdenv.isi686 [ + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_float_remainder_overflow" # AssertionError: FloatingPointError not raised by divmod + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + ] ++ lib.optionals stdenv.isAarch32 [ + "test_impossible_feature_enable" # AssertionError: Failed to generate error + "test_features" # AssertionError: Failure Detection + "test_new_policy" # AssertionError: assert False + "test_identityless_reduction_huge_array" # ValueError: Maximum allowed dimension exceeded + "test_unary_spurious_fpexception"# AssertionError: Got warnings: [] + "test_int" # AssertionError: selectedintkind(19): expected 16 but got -1 + "test_real" # AssertionError: selectedrealkind(16): expected 10 but got -1 + "test_quad_precision" # AssertionError: selectedrealkind(32): expected 16 but got -1 + "test_big_arrays" # ValueError: array is too big; `arr.size * arr.dtype.itemsize` is larger tha... + "test_multinomial_pvals_float32" # Failed: DID NOT RAISE + ] ++ lib.optionals stdenv.isAarch64 [ + "test_big_arrays" # OOM on a 16G machine + ]; + passthru = { # just for backwards compatibility blas = blas.provider; @@ -123,9 +163,10 @@ in buildPythonPackage rec { # Disable test # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; + env.NOSE_EXCLUDE = "test_large_file_support"; meta = { + changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index d2b341f5e3..52a6d1c182 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "2.1.1"; + version = "2.3.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ENP1uhzQwFEk990b1RX2wNVpInaSSH80KNihX6XpQtU="; + hash = "sha256-23C3biUUs10Po5qzn3EFaq4+HeWCXIC6WzxOKy59VgM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix index da52ca153e..421131e7f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "7.3"; + version = "8.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8="; + hash = "sha256-6VvzUKKUB5SkmvC7PFPqGayc51t3PTMPwrxgZI5+jHA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index caf4028df5..a8c327a080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.108"; + version = "12.535.133"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE="; + hash = "sha256-sVWa8NV90glVv1jQWv/3sWbd1ElH6zBRyZBWOHmesdw="; }; patches = [ 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 dce4276d57..7b1a3c60d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.1.0"; + version = "16.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7JkV4idZ/euYGGPTg6I+pw2nNOuttmGJMlz3NvJO9Rw="; + hash = "sha256-Obv4MJvO7li+KqI2l6KxfxjpbZVD5KFJwjn/u+UtaQQ="; }; postPatch = '' @@ -67,6 +67,5 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix index 548039d63b..be8a3d8327 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objax/default.nix @@ -1,24 +1,28 @@ { lib -, fetchFromGitHub , buildPythonPackage -, jax +, fetchFromGitHub +, fetchpatch , jaxlib +, jax , numpy , parameterized , pillow , scipy , tensorboard +, keras +, pytestCheckHook +, tensorflow }: buildPythonPackage rec { pname = "objax"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; - rev = "v${version}"; - hash = "sha256-1/XmxFZfU+XMD0Mlcv4xTUYZDwltAx1bZOlPuKWQQC0="; + rev = "refs/tags/v${version}"; + hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk="; }; # Avoid propagating the dependency on `jaxlib`, see @@ -40,6 +44,25 @@ buildPythonPackage rec { "objax" ]; + # This is necessay to ignore the presence of two protobufs version (tensorflow is bringing an + # older version). + catchConflicts = false; + + nativeCheckInputs = [ + keras + pytestCheckHook + tensorflow + ]; + + pytestFlagsArray = [ + "tests/*.py" + ]; + + disabledTests = [ + # Test requires internet access for prefetching some weights + "test_pretrained_keras_weight_0_ResNet50V2" + ]; + meta = with lib; { description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX."; homepage = "https://github.com/google/objax"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix index 18efa2b349..a002597da5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix @@ -1,20 +1,43 @@ { lib -, python , buildPythonPackage , fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "objsize"; - version = "0.6.1"; + version = "0.7.0"; + pyproject= true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "liran-funaro"; - repo = pname; - rev = version; - hash = "sha256-FgRB7EENwNOlC7ynIRxcwucoywNjko494s75kOp5O+w="; + repo = "objsize"; + rev = "refs/tags/${version}"; + hash = "sha256-wy4Tj+Q+4zymRdoN8Z7wcazJTb2lQ+XHY1Kta02R3R0="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "objsize" + ]; + + pytestFlagsArray = [ + "test_objsize.py" + ]; + meta = with lib; { description = "Traversal over objects subtree and calculate the total size"; homepage = "https://github.com/liran-funaro/objsize"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index a00519e095..5101460704 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.112.3"; + version = "2.113.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MeqMaui3gBtEdYGZ5w557hfIOiPKRUdScEUBN9QQWwg="; + hash = "sha256-Ui7/rD307fSdAPexZF9VU4NC9udjEGcFpjg/Ob6GVvo="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 5ed96beeac..05b71d2b45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.0.2"; + version = "15.3.1"; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-DpsNH3djB35WlqDPauCy7Re8pbZLnUE/pPAix4WHPKM="; + hash = "sha256-Yngx9hH/4yftClNqM/yyrOCPH0+4Bl9GIEGjawLdy0s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix index fddfd74834..64abf9f96f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix @@ -3,22 +3,27 @@ , fetchPypi , buildPythonPackage , regex +, pip }: buildPythonPackage rec { pname = "oelint-parser"; - version = "2.11.3"; + version = "2.11.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s="; + hash = "sha256-r8qpD7UDh8ZfsdwVuv0ipihPEX3263t929mMYf143iA="; }; + buildInputs = [ pip ]; propagatedBuildInputs = [ regex ]; pythonImportsCheck = [ "oelint_parser" ]; + # Fail to run inside the code the build. + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = with lib; { 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 f2e19e4a63..d6068b59e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.2"; + version = "2.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kbzqriybzN/86vov3Q+kH2lj9plK1GzWPlc/Nc/nWF0="; + hash = "sha256-mOKVCRp8cLY7p0AVbvphWdB3II6eB6HlN8i1HrVUH+o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch new file mode 100644 index 0000000000..6435d86a68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/0000-add-support-for-dataclasses_missing_type.patch @@ -0,0 +1,21 @@ +diff --git a/omegaconf/omegaconf.py b/omegaconf/omegaconf.py +index efde14a..a2a050e 100644 +--- a/omegaconf/omegaconf.py ++++ b/omegaconf/omegaconf.py +@@ -7,6 +7,7 @@ import pathlib + import sys + import warnings + from collections import defaultdict ++from dataclasses import _MISSING_TYPE + from contextlib import contextmanager + from enum import Enum + from textwrap import dedent +@@ -828,6 +829,8 @@ class OmegaConf: + + if obj is _DEFAULT_MARKER_: + obj = {} ++ if isinstance(obj, _MISSING_TYPE): ++ return OmegaConf.create({}, parent=parent, flags=flags) + if isinstance(obj, str): + obj = yaml.load(obj, Loader=get_yaml_loader()) + if obj is None: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index d506e06d6f..c6dfada82b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -3,6 +3,7 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, setuptools , jre_minimal , pydevd , pytest-mock @@ -15,8 +16,7 @@ buildPythonPackage rec { pname = "omegaconf"; version = "2.3.0"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -31,6 +31,9 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + + # https://github.com/omry/omegaconf/pull/1137 + ./0000-add-support-for-dataclasses_missing_type.patch ]; postPatch = '' @@ -42,6 +45,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools jre_minimal ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix index 39adbdc7cc..03850fc8cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix @@ -1,22 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, cryptography, protobuf }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, protobuf +, pytestCheckHook +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "omemo-dr"; - version = "1.0.0"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-sP5QI+lHoXt0D7ftSqJGEg1vIdgZtYEulN/JVwUgvmE="; + hash = "sha256-KoqMdyMdc5Sb3TdSeNTVomElK9ruUstiQayyUcIC02E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography protobuf ]; - meta = { + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "omemo_dr" + ]; + + meta = with lib; { description = "OMEMO Double Ratchet"; - license = lib.licenses.lgpl3; homepage = "https://dev.gajim.org/gajim/omemo-dr/"; + changelog = "https://dev.gajim.org/gajim/omemo-dr/-/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omrdatasettools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omrdatasettools/default.nix index 4448a686e1..45c6ee0a90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omrdatasettools/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "omrdatasettools"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0cdq02jp8vh78yjq9bncjjl0pb554idrcxkd62rzwk4l6ss2fkw5"; + sha256 = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index df15ebe77e..d0866f6c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -66,14 +66,10 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - '' + lib.optionalString stdenv.isLinux '' + '' + '' # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags substituteInPlace CMakeLists.txt \ --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - '' + lib.optionalString stdenv.isDarwin '' - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix index d45d82da0e..dfe5a03e7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "onnxconverter-common"; rev = "refs/tags/v${version}"; - hash = "sha256-VT9ly0d0Yhw1J6C521oUyaCx4WtFSdpyk8EdIKlre3c="; + hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; }; propagatedBuildInputs = [ @@ -29,6 +29,10 @@ buildPythonPackage rec { onnx ]; + pythonImportsCheck = [ + "onnxconverter_common" + ]; + nativeCheckInputs = [ onnxruntime unittestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch new file mode 100644 index 0000000000..5038a5ba52 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch @@ -0,0 +1,39 @@ +diff --git a/python/setup.py b/python/setup.py +index 2ac3accd2..f26161c72 100644 +--- a/python/setup.py ++++ b/python/setup.py +@@ -101,25 +101,6 @@ def get_thirdparty_packages(triton_cache_path): + # ---- package data --- + + +-def download_and_copy_ptxas(): +- base_dir = os.path.dirname(__file__) +- src_path = "bin/ptxas" +- url = "https://conda.anaconda.org/nvidia/label/cuda-12.0.0/linux-64/cuda-nvcc-12.0.76-0.tar.bz2" +- dst_prefix = os.path.join(base_dir, "triton") +- dst_suffix = os.path.join("third_party", "cuda", src_path) +- dst_path = os.path.join(dst_prefix, dst_suffix) +- if not os.path.exists(dst_path): +- print(f'downloading and extracting {url} ...') +- ftpstream = urllib.request.urlopen(url) +- file = tarfile.open(fileobj=ftpstream, mode="r|*") +- with tempfile.TemporaryDirectory() as temp_dir: +- file.extractall(path=temp_dir) +- src_path = os.path.join(temp_dir, src_path) +- os.makedirs(os.path.split(dst_path)[0], exist_ok=True) +- shutil.copy(src_path, dst_path) +- return dst_suffix +- +- + # ---- cmake extension ---- + + +@@ -200,8 +181,6 @@ class CMakeBuild(build_ext): + subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=self.build_temp) + + +-download_and_copy_ptxas() +- + setup( + name="triton", + version="2.0.0", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix index 0e10642f06..e1ac9cb4ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/default.nix @@ -1,32 +1,28 @@ { lib +, config , buildPythonPackage -, python -, fetchpatch , fetchFromGitHub , addOpenGLRunpath +, pytestCheckHook +, pythonRelaxDepsHook +, pkgsTargetTarget , cmake -, cudaPackages -, llvmPackages +, ninja , pybind11 , gtest , zlib , ncurses , libxml2 , lit +, llvm , filelock , torchWithRocm -, pytest -, pytestCheckHook -, pythonRelaxDepsHook -, pkgsTargetTarget +, python +, cudaPackages +, cudaSupport ? config.cudaSupport }: let - pname = "triton"; - version = "2.0.0"; - - inherit (cudaPackages) cuda_cudart backendStdenv; - # A time may come we'll want to be cross-friendly # # Short explanation: we need pkgsTargetTarget, because we use string @@ -38,20 +34,11 @@ let # pkgsTargetTarget maybe doesn't matter, because ptxas compiles programs to # be executed on the GPU. # Cf. https://nixos.org/manual/nixpkgs/unstable/#sec-cross-infra - ptxas = "${pkgsTargetTarget.cudaPackages.cuda_nvcc}/bin/ptxas"; - - llvm = (llvmPackages.llvm.override { - llvmTargetsToBuild = [ "NATIVE" "NVPTX" ]; - # Upstream CI sets these too: - # targetProjects = [ "mlir" ]; - extraCMakeFlags = [ - "-DLLVM_INSTALL_UTILS=ON" - ]; - }); + ptxas = "${pkgsTargetTarget.cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) in -buildPythonPackage { - inherit pname version; - +buildPythonPackage rec { + pname = "triton"; + version = "2.0.0"; format = "setuptools"; src = fetchFromGitHub { @@ -62,21 +49,6 @@ buildPythonPackage { }; patches = [ - # Prerequisite for llvm15 patch - (fetchpatch { - url = "https://github.com/openai/triton/commit/2aba985daaa70234823ea8f1161da938477d3e02.patch"; - hash = "sha256-LGv0+Ut2WYPC4Ksi4803Hwmhi3FyQOF9zElJc/JCobk="; - }) - (fetchpatch { - url = "https://github.com/openai/triton/commit/e3941f9d09cdd31529ba4a41018cfc0096aafea6.patch"; - hash = "sha256-A+Gor6qzFlGQhVVhiaaYOzqqx8yO2MdssnQS6TIfUWg="; - }) - - # Source: https://github.com/openai/triton/commit/fc7a8e35819bda632bdcf1cf75fd9abe4d4e077a.patch - # The original patch adds ptxas binary, so we include our own clean copy - # Drop with the next update - ./llvm15.patch - # TODO: there have been commits upstream aimed at removing the "torch" # circular dependency, but the patches fail to apply on the release # revision. Keeping the link for future reference @@ -86,72 +58,15 @@ buildPythonPackage { # url = "https://github.com/openai/triton/commit/fc7c0b0e437a191e421faa61494b2ff4870850f1.patch"; # hash = "sha256-f0shIqHJkVvuil2Yku7vuqWFn7VCRKFSFjYRlwx25ig="; # }) + ] ++ lib.optionals (!cudaSupport) [ + ./0000-dont-download-ptxas.patch ]; - postPatch = '' - substituteInPlace python/setup.py \ - --replace \ - '= get_thirdparty_packages(triton_cache_path)' \ - '= os.environ["cmakeFlags"].split()' - '' - # Wiring triton=2.0.0 with llcmPackages_rocm.llvm=5.4.3 - # Revisit when updating either triton or llvm - + '' - substituteInPlace CMakeLists.txt \ - --replace "nvptx" "NVPTX" \ - --replace "LLVM 11" "LLVM" - sed -i '/AddMLIR/a set(MLIR_TABLEGEN_EXE "${llvmPackages.mlir}/bin/mlir-tblgen")' CMakeLists.txt - sed -i '/AddMLIR/a set(MLIR_INCLUDE_DIR ''${MLIR_INCLUDE_DIRS})' CMakeLists.txt - find -iname '*.td' -exec \ - sed -i \ - -e '\|include "mlir/IR/OpBase.td"|a include "mlir/IR/AttrTypeBase.td"' \ - -e 's|include "mlir/Dialect/StandardOps/IR/Ops.td"|include "mlir/Dialect/Func/IR/FuncOps.td"|' \ - '{}' ';' - substituteInPlace unittest/CMakeLists.txt --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" - sed -i 's/^include.*$//' unittest/CMakeLists.txt - sed -i '/LINK_LIBS/i NVPTXInfo' lib/Target/PTX/CMakeLists.txt - sed -i '/LINK_LIBS/i NVPTXCodeGen' lib/Target/PTX/CMakeLists.txt - '' - # TritonMLIRIR already links MLIRIR. Not transitive? - # + '' - # echo "target_link_libraries(TritonPTX PUBLIC MLIRIR)" >> lib/Target/PTX/CMakeLists.txt - # '' - # Already defined in llvm, when built with -DLLVM_INSTALL_UTILS - + '' - substituteInPlace bin/CMakeLists.txt \ - --replace "add_subdirectory(FileCheck)" "" - - rm cmake/FindLLVM.cmake - '' - + - ( - let - # Bash was getting weird without linting, - # but basically upstream contains [cc, ..., "-lcuda", ...] - # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] - old = [ "-lcuda" ]; - new = [ "-lcuda" "-L${addOpenGLRunpath.driverLink}" "-L${cuda_cudart}/lib/stubs/" ]; - - quote = x: ''"${x}"''; - oldStr = lib.concatMapStringsSep ", " quote old; - newStr = lib.concatMapStringsSep ", " quote new; - in - '' - substituteInPlace python/triton/compiler.py \ - --replace '${oldStr}' '${newStr}' - '' - ) - # Triton seems to be looking up cuda.h - + '' - sed -i 's|cu_include_dir = os.path.join.*$|cu_include_dir = "${cuda_cudart}/include"|' python/triton/compiler.py - ''; - nativeBuildInputs = [ - cmake pythonRelaxDepsHook - - # Requires torch (circular dependency) and probably needs GPUs: - # pytestCheckHook + # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: + cmake + ninja # Note for future: # These *probably* should go in depsTargetTarget @@ -159,7 +74,6 @@ buildPythonPackage { # because we only support cudaPackages on x86_64-linux atm lit llvm - llvmPackages.mlir ]; buildInputs = [ @@ -170,17 +84,41 @@ buildPythonPackage { zlib ]; - propagatedBuildInputs = [ - filelock - ]; + propagatedBuildInputs = [ filelock ]; + + postPatch = let + # Bash was getting weird without linting, + # but basically upstream contains [cc, ..., "-lcuda", ...] + # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] + old = [ "-lcuda" ]; + new = [ "-lcuda" "-L${addOpenGLRunpath.driverLink}" "-L${cudaPackages.cuda_cudart}/lib/stubs/" ]; + + quote = x: ''"${x}"''; + oldStr = lib.concatMapStringsSep ", " quote old; + newStr = lib.concatMapStringsSep ", " quote new; + in '' + # Use our `cmakeFlags` instead and avoid downloading dependencies + substituteInPlace python/setup.py \ + --replace "= get_thirdparty_packages(triton_cache_path)" "= os.environ[\"cmakeFlags\"].split()" + + # Already defined in llvm, when built with -DLLVM_INSTALL_UTILS + substituteInPlace bin/CMakeLists.txt \ + --replace "add_subdirectory(FileCheck)" "" + + # Don't fetch googletest + substituteInPlace unittest/CMakeLists.txt \ + --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ + --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" + '' + lib.optionalString cudaSupport '' + # Use our linker flags + substituteInPlace python/triton/compiler.py \ + --replace '${oldStr}' '${newStr}' + ''; # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' - export CC="${backendStdenv.cc}/bin/cc"; - export CXX="${backendStdenv.cc}/bin/c++"; - # Upstream's setup.py tries to write cache somewhere in ~/ - export HOME=$TMPDIR + export HOME=$(mktemp -d) # Upstream's github actions patch setup.cfg to write base-dir. May be redundant echo " @@ -188,52 +126,44 @@ buildPythonPackage { base-dir=$PWD" >> python/setup.cfg # The rest (including buildPhase) is relative to ./python/ - cd python/ + cd python + '' + lib.optionalString cudaSupport '' + export CC=${cudaPackages.backendStdenv.cc}/bin/cc; + export CXX=${cudaPackages.backendStdenv.cc}/bin/c++; # Work around download_and_copy_ptxas() - dst_cuda="$PWD/triton/third_party/cuda/bin" - mkdir -p "$dst_cuda" - ln -s "${ptxas}" "$dst_cuda/" + mkdir -p $PWD/triton/third_party/cuda/bin + ln -s ${ptxas} $PWD/triton/third_party/cuda/bin ''; # CMake is run by setup.py instead dontUseCmakeConfigure = true; - cmakeFlags = [ - "-DMLIR_DIR=${llvmPackages.mlir}/lib/cmake/mlir" - ]; - postFixup = - let - ptxasDestination = "$out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas"; - in - # Setuptools (?) strips runpath and +x flags. Let's just restore the symlink - '' - rm -f ${ptxasDestination} - ln -s ${ptxas} ${ptxasDestination} - ''; + # Setuptools (?) strips runpath and +x flags. Let's just restore the symlink + postFixup = lib.optionalString cudaSupport '' + rm -f $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas + ln -s ${ptxas} $out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas + ''; - checkInputs = [ - cmake # ctest - ]; + checkInputs = [ cmake ]; # ctest dontUseSetuptoolsCheck = true; - preCheck = + + preCheck = '' # build/temp* refers to build_ext.build_temp (looked up in the build logs) - '' - (cd /build/source/python/build/temp* ; ctest) - '' # For pytestCheckHook - + '' - cd test/unit - ''; - pythonImportsCheck = [ - # Circular dependency on torch - # "triton" - # "triton.language" - ]; + (cd /build/source/python/build/temp* ; ctest) + + # For pytestCheckHook + cd test/unit + ''; + + # Circular dependency on torch + # pythonImportsCheck = [ + # "triton" + # "triton.language" + # ]; # Ultimately, torch is our test suite: - passthru.tests = { - inherit torchWithRocm; - }; + passthru.tests = { inherit torchWithRocm; }; pythonRemoveDeps = [ # Circular dependency, cf. https://github.com/openai/triton/issues/1374 @@ -243,11 +173,12 @@ buildPythonPackage { "cmake" "lit" ]; + meta = with lib; { - description = "Development repository for the Triton language and compiler"; - homepage = "https://github.com/openai/triton/"; + description = "Language and compiler for writing highly efficient custom Deep-Learning primitives"; + homepage = "https://github.com/openai/triton"; platforms = lib.platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ SomeoneSerge ]; + maintainers = with maintainers; [ SomeoneSerge Madouura ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/llvm15.patch b/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/llvm15.patch deleted file mode 100644 index 3e20cce238..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-triton/llvm15.patch +++ /dev/null @@ -1,4617 +0,0 @@ -From fc7a8e35819bda632bdcf1cf75fd9abe4d4e077a Mon Sep 17 00:00:00 2001 -From: Christian Sigg -Date: Thu, 16 Feb 2023 15:40:53 +0100 -Subject: [PATCH] Rebase Triton to LLVM-15. (#1070) - -This PR rebases Triton from LLVM-14 to LLVM-15. Most changes are -mechanical, except for the analysis framework changes. ---- - CMakeLists.txt | 6 +- - bin/CMakeLists.txt | 2 +- - bin/FileCheck/FileCheck.cpp | 3 + - bin/triton-opt.cpp | 6 +- - bin/triton-translate.cpp | 7 +- - include/triton/Analysis/Alias.h | 21 +- - include/triton/Analysis/Allocation.h | 2 + - include/triton/Analysis/AxisInfo.h | 56 ++- - include/triton/Analysis/Utility.h | 6 +- - include/triton/Conversion/Passes.td | 4 +- - include/triton/Dialect/Triton/IR/Dialect.h | 7 +- - .../triton/Dialect/Triton/IR/TritonDialect.td | 8 +- - include/triton/Dialect/Triton/IR/TritonOps.td | 12 +- - .../triton/Dialect/Triton/IR/TritonTypes.td | 2 + - .../Dialect/Triton/Transforms/Passes.td | 3 +- - include/triton/Dialect/TritonGPU/IR/Dialect.h | 4 +- - .../Dialect/TritonGPU/IR/TritonGPUAttrDefs.td | 7 + - .../Dialect/TritonGPU/IR/TritonGPUDialect.td | 2 +- - .../Dialect/TritonGPU/IR/TritonGPUOps.td | 13 +- - lib/Analysis/Alias.cpp | 14 +- - lib/Analysis/Allocation.cpp | 30 +- - lib/Analysis/AxisInfo.cpp | 79 ++-- - lib/Analysis/CMakeLists.txt | 2 +- - lib/Analysis/Membar.cpp | 2 +- - lib/Analysis/Utility.cpp | 54 +++ - .../TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp | 3 - - lib/Conversion/TritonGPUToLLVM/DotOpHelpers.h | 10 +- - .../TritonGPUToLLVM/DotOpToLLVM.cpp | 5 - - .../TritonGPUToLLVM/ElementwiseOpToLLVM.cpp | 2 - - .../TritonGPUToLLVM/LoadStoreOpToLLVM.cpp | 5 +- - .../TritonGPUToLLVM/ReduceOpToLLVM.cpp | 2 - - .../TritonGPUToLLVM/TritonGPUToLLVM.cpp | 7 +- - .../TritonGPUToLLVM/TritonGPUToLLVMBase.h | 26 +- - .../TritonGPUToLLVM/TritonGPUToLLVMPass.cpp | 52 +-- - lib/Conversion/TritonGPUToLLVM/Utility.h | 5 +- - .../TritonToTritonGPUPass.cpp | 69 ++-- - lib/Dialect/Triton/IR/CMakeLists.txt | 10 +- - lib/Dialect/Triton/IR/Ops.cpp | 34 +- - lib/Dialect/Triton/Transforms/Combine.cpp | 6 +- - lib/Dialect/Triton/Transforms/Combine.td | 2 +- - lib/Dialect/TritonGPU/IR/Dialect.cpp | 27 +- - lib/Dialect/TritonGPU/Transforms/Coalesce.cpp | 20 +- - lib/Dialect/TritonGPU/Transforms/Combine.cpp | 2 +- - lib/Dialect/TritonGPU/Transforms/Combine.td | 1 + - .../Transforms/DecomposeConversions.cpp | 2 +- - lib/Dialect/TritonGPU/Transforms/Pipeline.cpp | 10 +- - .../Transforms/ReorderInstructions.cpp | 2 +- - .../Transforms/TritonGPUConversion.cpp | 12 +- - .../Transforms/UpdateMmaForVolta.cpp | 6 +- - lib/Dialect/TritonGPU/Transforms/Utility.cpp | 2 +- - lib/Target/LLVMIR/CMakeLists.txt | 3 +- - lib/Target/PTX/PTXTranslation.cpp | 3 + - python/setup.py | 15 +- - python/src/triton.cc | 85 +++-- - python/test/unit/language/test_core.py | 2 +- - python/triton/compiler.py | 4 +- - test/Analysis/test-alias.mlir | 24 +- - test/Analysis/test-alignment.mlir | 344 +++++++++--------- - test/Analysis/test-allocation.mlir | 32 +- - test/Analysis/test-membar.mlir | 38 +- - test/Conversion/triton_ops.mlir | 10 +- - test/Conversion/triton_to_tritongpu.mlir | 6 +- - test/Conversion/tritongpu_to_llvm.mlir | 94 ++--- - test/Target/tritongpu_to_llvmir.mlir | 4 +- - test/Target/tritongpu_to_ptx.mlir | 2 +- - test/Triton/combine.mlir | 40 +- - test/Triton/vecadd.mlir | 4 +- - test/TritonGPU/coalesce.mlir | 2 +- - test/TritonGPU/combine.mlir | 38 +- - test/TritonGPU/loop-pipeline.mlir | 22 +- - test/TritonGPU/matmul.mlir | 4 +- - test/TritonGPU/prefetch.mlir | 4 +- - test/TritonGPU/update-mma-for-volta.mlir | 4 +- - test/lib/Analysis/TestAlias.cpp | 29 +- - test/lib/Analysis/TestAllocation.cpp | 5 +- - test/lib/Analysis/TestAxisInfo.cpp | 51 +-- - test/lib/Analysis/TestMembar.cpp | 7 +- - 78 files changed, 808 insertions(+), 742 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d0d361fc7c..b281a28400 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,7 @@ - cmake_minimum_required(VERSION 3.6) -+ -+cmake_policy(SET CMP0116 OLD) -+ - include(ExternalProject) - - set(CMAKE_CXX_STANDARD 17) -@@ -155,7 +158,6 @@ if(TRITON_BUILD_PYTHON_MODULE) - endif() - endif() - -- - # # Triton - # file(GLOB_RECURSE LIBTRITON_SRC lib/*.cc) - # if (WIN32 AND TRITON_BUILD_PYTHON_MODULE) -@@ -212,7 +214,7 @@ if(TRITON_BUILD_PYTHON_MODULE) - # optimizations - MLIRPass - MLIRTransforms -- MLIRLLVMIR -+ MLIRLLVMDialect - MLIRSupport - MLIRTargetLLVMIRExport - MLIRExecutionEngine -diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt -index 906f635f8b..695b3479fd 100644 ---- a/bin/CMakeLists.txt -+++ b/bin/CMakeLists.txt -@@ -48,7 +48,7 @@ llvm_update_compile_flags(triton-translate) - # MLIR core - MLIROptLib - MLIRIR -- MLIRLLVMIR -+ MLIRLLVMDialect - MLIRPass - MLIRSupport - MLIRTransforms -diff --git a/bin/FileCheck/FileCheck.cpp b/bin/FileCheck/FileCheck.cpp -index 819efc3541..9ac6f1b277 100644 ---- a/bin/FileCheck/FileCheck.cpp -+++ b/bin/FileCheck/FileCheck.cpp -@@ -19,6 +19,7 @@ - #include "llvm/Support/CommandLine.h" - #include "llvm/Support/InitLLVM.h" - #include "llvm/Support/Process.h" -+#include "llvm/Support/SourceMgr.h" - #include "llvm/Support/WithColor.h" - #include "llvm/Support/raw_ostream.h" - #include -@@ -360,6 +361,8 @@ static std::string GetCheckTypeAbbreviation(Check::FileCheckType Ty) { - return "bad-not"; - case Check::CheckBadCount: - return "bad-count"; -+ case Check::CheckMisspelled: -+ return "misspelled"; - case Check::CheckNone: - llvm_unreachable("invalid FileCheckType"); - } -diff --git a/bin/triton-opt.cpp b/bin/triton-opt.cpp -index 9f3b53b7ae..f96232e1b0 100644 ---- a/bin/triton-opt.cpp -+++ b/bin/triton-opt.cpp -@@ -8,7 +8,7 @@ - - #include "mlir/IR/Dialect.h" - #include "mlir/InitAllPasses.h" --#include "mlir/Support/MlirOptMain.h" -+#include "mlir/Tools/mlir-opt/MlirOptMain.h" - - namespace mlir { - namespace test { -@@ -33,8 +33,8 @@ int main(int argc, char **argv) { - // TODO: register Triton & TritonGPU passes - mlir::DialectRegistry registry; - registry.insert(); - - return mlir::asMainReturnCode(mlir::MlirOptMain( -diff --git a/bin/triton-translate.cpp b/bin/triton-translate.cpp -index 05ba15e453..56b5d65857 100644 ---- a/bin/triton-translate.cpp -+++ b/bin/triton-translate.cpp -@@ -3,7 +3,7 @@ - #include "mlir/IR/AsmState.h" - #include "mlir/IR/BuiltinOps.h" - #include "mlir/IR/Dialect.h" --#include "mlir/Parser.h" -+#include "mlir/Parser/Parser.h" - #include "mlir/Pass/Pass.h" - #include "mlir/Pass/PassManager.h" - #include "mlir/Support/FileUtilities.h" -@@ -38,7 +38,7 @@ OwningOpRef loadMLIRModule(llvm::StringRef inputFilename, - mlir::DialectRegistry registry; - registry.insert(); -+ scf::SCFDialect>(); - - context.appendDialectRegistry(registry); - -@@ -50,7 +50,8 @@ OwningOpRef loadMLIRModule(llvm::StringRef inputFilename, - context.loadAllAvailableDialects(); - context.allowUnregisteredDialects(); - -- OwningOpRef module(parseSourceFile(sourceMgr, &context)); -+ OwningOpRef module = -+ parseSourceFile(sourceMgr, &context); - if (!module) { - llvm::errs() << "Parse MLIR file failed."; - return nullptr; -diff --git a/include/triton/Analysis/Alias.h b/include/triton/Analysis/Alias.h -index fa6b906fc9..631df518bc 100644 ---- a/include/triton/Analysis/Alias.h -+++ b/include/triton/Analysis/Alias.h -@@ -2,7 +2,7 @@ - #define TRITON_ANALYSIS_ALIAS_H - - #include "mlir/Analysis/AliasAnalysis.h" --#include "mlir/Analysis/DataFlowAnalysis.h" -+#include "mlir/Analysis/DataFlow/SparseAnalysis.h" - #include "llvm/ADT/DenseSet.h" - - namespace mlir { -@@ -21,7 +21,7 @@ class AliasInfo { - } - - /// The pessimistic value state of a value without alias -- static AliasInfo getPessimisticValueState(MLIRContext *context) { -+ static AliasInfo getPessimisticValueState(MLIRContext *context = nullptr) { - return AliasInfo(); - } - static AliasInfo getPessimisticValueState(Value value) { return AliasInfo(); } -@@ -29,6 +29,10 @@ class AliasInfo { - /// The union of both arguments - static AliasInfo join(const AliasInfo &lhs, const AliasInfo &rhs); - -+ void print(raw_ostream &os) const { -+ llvm::interleaveComma(allocs, os, [&](Value alloc) { alloc.print(os); }); -+ } -+ - private: - /// The set of allocated values that are aliased by this lattice. - /// For now, we only consider aliased value produced by the following -@@ -58,9 +62,13 @@ class AliasInfo { - //===----------------------------------------------------------------------===// - // Shared Memory Alias Analysis - //===----------------------------------------------------------------------===// --class SharedMemoryAliasAnalysis : public ForwardDataFlowAnalysis { -+class SharedMemoryAliasAnalysis -+ : public dataflow::SparseDataFlowAnalysis> { - public: -- using ForwardDataFlowAnalysis::ForwardDataFlowAnalysis; -+ using dataflow::SparseDataFlowAnalysis< -+ dataflow::Lattice>::SparseDataFlowAnalysis; -+ using dataflow::SparseDataFlowAnalysis< -+ dataflow::Lattice>::getLatticeElement; - - /// XXX(Keren): Compatible interface with MLIR AliasAnalysis for future use. - /// Given two values, returns their aliasing behavior. -@@ -70,9 +78,10 @@ class SharedMemoryAliasAnalysis : public ForwardDataFlowAnalysis { - ModRefResult getModRef(Operation *op, Value location); - - /// Computes if the alloc set of the results are changed. -- ChangeResult -+ void - visitOperation(Operation *op, -- ArrayRef *> operands) override; -+ ArrayRef *> operands, -+ ArrayRef *> results) override; - }; - - } // namespace mlir -diff --git a/include/triton/Analysis/Allocation.h b/include/triton/Analysis/Allocation.h -index b7c136d602..89b77034cc 100644 ---- a/include/triton/Analysis/Allocation.h -+++ b/include/triton/Analysis/Allocation.h -@@ -188,6 +188,8 @@ class Allocation { - friend class triton::AllocationAnalysis; - }; - -+template Interval(T, T) -> Interval; -+ - } // namespace mlir - - #endif // TRITON_ANALYSIS_ALLOCATION_H -diff --git a/include/triton/Analysis/AxisInfo.h b/include/triton/Analysis/AxisInfo.h -index fdfbd8fbb3..7083b9c43b 100644 ---- a/include/triton/Analysis/AxisInfo.h -+++ b/include/triton/Analysis/AxisInfo.h -@@ -1,9 +1,10 @@ - #ifndef TRITON_ANALYSIS_AXISINFO_H - #define TRITON_ANALYSIS_AXISINFO_H - --#include "mlir/Analysis/DataFlowAnalysis.h" -+#include "mlir/Analysis/DataFlow/SparseAnalysis.h" - #include "llvm/Support/raw_ostream.h" - -+#include "mlir/Support/LLVM.h" - #include "triton/Analysis/Utility.h" - #include "triton/Dialect/Triton/IR/Dialect.h" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" -@@ -62,7 +63,7 @@ class AxisInfo { - } - - /// The pessimistic value state of the contiguity is unknown. -- static AxisInfo getPessimisticValueState(MLIRContext *context) { -+ static AxisInfo getPessimisticValueState(MLIRContext *context = nullptr) { - return AxisInfo(); - } - static AxisInfo getPessimisticValueState(Value value); -@@ -70,6 +71,22 @@ class AxisInfo { - /// The gcd of both arguments for each dimension - static AxisInfo join(const AxisInfo &lhs, const AxisInfo &rhs); - -+ void print(raw_ostream &os) const { -+ auto print = [&](StringRef name, DimVectorT vec) { -+ os << name << " = ["; -+ llvm::interleaveComma(vec, os); -+ os << "]"; -+ }; -+ print("contiguity", contiguity); -+ print(", divisibility", divisibility); -+ print(", constancy", constancy); -+ os << ", constant_value = "; -+ if (constantValue) -+ os << *constantValue; -+ else -+ os << ""; -+ } -+ - private: - /// The _contiguity_ information maps the `d`-th - /// dimension to the length of the shortest -@@ -147,7 +164,8 @@ class AxisInfoVisitor { - } - - virtual AxisInfo -- getAxisInfo(Operation *op, ArrayRef *> operands) = 0; -+ getAxisInfo(Operation *op, -+ ArrayRef *> operands) = 0; - - virtual bool match(Operation *op) = 0; - }; -@@ -157,15 +175,16 @@ template class AxisInfoVisitorImpl : public AxisInfoVisitor { - public: - using AxisInfoVisitor::AxisInfoVisitor; - -- AxisInfo getAxisInfo(Operation *op, -- ArrayRef *> operands) final { -+ AxisInfo -+ getAxisInfo(Operation *op, -+ ArrayRef *> operands) final { - return getAxisInfo(cast(op), operands); - } - - bool match(Operation *op) final { return isa(op); } - -- virtual AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) { -+ virtual AxisInfo -+ getAxisInfo(OpTy op, ArrayRef *> operands) { - llvm_unreachable("Unimplemented getAxisInfo"); - } - }; -@@ -176,8 +195,9 @@ class BinaryOpVisitorImpl : public AxisInfoVisitorImpl { - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(OpTy op, -+ ArrayRef *> operands) override { - auto lhsInfo = operands[0]->getValue(); - auto rhsInfo = operands[1]->getValue(); - auto rank = lhsInfo.getRank(); -@@ -230,7 +250,8 @@ class AxisInfoVisitorList { - (visitors.emplace_back(std::make_unique()), ...); - } - -- AxisInfo apply(Operation *op, ArrayRef *> operands) { -+ AxisInfo apply(Operation *op, -+ ArrayRef *> operands) { - for (auto &visitor : visitors) - if (visitor->match(op)) - return visitor->getAxisInfo(op, operands); -@@ -241,16 +262,19 @@ class AxisInfoVisitorList { - std::vector> visitors; - }; - --class AxisInfoAnalysis : public ForwardDataFlowAnalysis { -+class AxisInfoAnalysis -+ : public dataflow::SparseDataFlowAnalysis> { - private: - AxisInfoVisitorList visitors; - - public: -- AxisInfoAnalysis(MLIRContext *context); -+ AxisInfoAnalysis(DataFlowSolver &solver); -+ using dataflow::SparseDataFlowAnalysis< -+ dataflow::Lattice>::getLatticeElement; - -- ChangeResult -- visitOperation(Operation *op, -- ArrayRef *> operands) override; -+ void visitOperation(Operation *op, -+ ArrayRef *> operands, -+ ArrayRef *> results) override; - - unsigned getPtrContiguity(Value ptr); - -@@ -261,4 +285,4 @@ class AxisInfoAnalysis : public ForwardDataFlowAnalysis { - - } // namespace mlir - --#endif -\ No newline at end of file -+#endif -diff --git a/include/triton/Analysis/Utility.h b/include/triton/Analysis/Utility.h -index c5ac137dc1..ee7fadb59d 100644 ---- a/include/triton/Analysis/Utility.h -+++ b/include/triton/Analysis/Utility.h -@@ -1,6 +1,7 @@ - #ifndef TRITON_ANALYSIS_UTILITY_H - #define TRITON_ANALYSIS_UTILITY_H - -+#include "mlir/Analysis/DataFlowFramework.h" - #include "mlir/Analysis/SliceAnalysis.h" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" - #include -@@ -12,7 +13,7 @@ namespace mlir { - class ReduceOpHelper { - public: - explicit ReduceOpHelper(triton::ReduceOp op) : op(op) { -- srcTy = op.operand().getType().cast(); -+ srcTy = op.getOperand().getType().cast(); - } - - ArrayRef getSrcShape() { return srcTy.getShape(); } -@@ -103,6 +104,9 @@ SetVector - multiRootGetSlice(Operation *op, TransitiveFilter backwardFilter = nullptr, - TransitiveFilter forwardFilter = nullptr); - -+// Create a basic DataFlowSolver with constant and dead code analysis included. -+std::unique_ptr createDataFlowSolver(); -+ - } // namespace mlir - - #endif // TRITON_ANALYSIS_UTILITY_H -diff --git a/include/triton/Conversion/Passes.td b/include/triton/Conversion/Passes.td -index 70bb20b78e..be00eb2dac 100644 ---- a/include/triton/Conversion/Passes.td -+++ b/include/triton/Conversion/Passes.td -@@ -12,7 +12,6 @@ def ConvertTritonToTritonGPU: Pass<"convert-triton-to-tritongpu", "mlir::ModuleO - - let dependentDialects = ["mlir::arith::ArithmeticDialect", - "mlir::math::MathDialect", -- "mlir::StandardOpsDialect", - // TODO: Does this pass depend on SCF? - "mlir::scf::SCFDialect", - "mlir::triton::TritonDialect", -@@ -41,8 +40,7 @@ def ConvertTritonGPUToLLVM : Pass<"convert-triton-gpu-to-llvm", "mlir::ModuleOp" - "mlir::tensor::TensorDialect", - "mlir::triton::TritonDialect", - "mlir::triton::gpu::TritonGPUDialect", -- "mlir::NVVM::NVVMDialect", -- "mlir::StandardOpsDialect"]; -+ "mlir::NVVM::NVVMDialect"]; - - let options = [ - Option<"computeCapability", "compute-capability", -diff --git a/include/triton/Dialect/Triton/IR/Dialect.h b/include/triton/Dialect/Triton/IR/Dialect.h -index e8012a51df..15869e262e 100644 ---- a/include/triton/Dialect/Triton/IR/Dialect.h -+++ b/include/triton/Dialect/Triton/IR/Dialect.h -@@ -1,14 +1,15 @@ - #ifndef TRITON_DIALECT_TRITON_IR_DIALECT_H_ - #define TRITON_DIALECT_TRITON_IR_DIALECT_H_ - -+#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -+#include "mlir/Dialect/ControlFlow/IR/ControlFlow.h" -+#include "mlir/Dialect/Func/IR/FuncOps.h" - #include "mlir/Dialect/Math/IR/Math.h" --#include "mlir/Dialect/SCF/SCF.h" --#include "mlir/Dialect/StandardOps/IR/Ops.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/Dialect/Tensor/IR/Tensor.h" - #include "mlir/IR/BuiltinOps.h" - #include "mlir/IR/Dialect.h" - #include "mlir/Interfaces/ControlFlowInterfaces.h" -- - #include "triton/Dialect/Triton/IR/Dialect.h.inc" - #include "triton/Dialect/Triton/IR/OpsEnums.h.inc" - #include "triton/Dialect/Triton/IR/Traits.h" -diff --git a/include/triton/Dialect/Triton/IR/TritonDialect.td b/include/triton/Dialect/Triton/IR/TritonDialect.td -index 07b069e14f..d98ce73884 100644 ---- a/include/triton/Dialect/Triton/IR/TritonDialect.td -+++ b/include/triton/Dialect/Triton/IR/TritonDialect.td -@@ -25,12 +25,9 @@ def Triton_Dialect : Dialect { - let dependentDialects = [ - "arith::ArithmeticDialect", - "math::MathDialect", -- "StandardOpsDialect", - "scf::SCFDialect", -- -- // Since LLVM 15 -- // "cf::ControlFlowDialect", -- // "func::FuncDialect" -+ "cf::ControlFlowDialect", -+ "func::FuncDialect" - ]; - - let extraClassDeclaration = [{ -@@ -38,6 +35,7 @@ def Triton_Dialect : Dialect { - }]; - - let hasConstantMaterializer = 1; -+ let useDefaultTypePrinterParser = 1; - } - - include "triton/Dialect/Triton/IR/TritonTypes.td" -diff --git a/include/triton/Dialect/Triton/IR/TritonOps.td b/include/triton/Dialect/Triton/IR/TritonOps.td -index 779e0b648c..0a69211179 100644 ---- a/include/triton/Dialect/Triton/IR/TritonOps.td -+++ b/include/triton/Dialect/Triton/IR/TritonOps.td -@@ -141,11 +141,7 @@ def TT_LoadOp : TT_Op<"load", - "triton::EvictionPolicy":$evict, "bool":$isVolatile)>, - ]; - -- // let assemblyFormat = "operands attr-dict `:` type($result)"; -- let parser = [{ return mlir::triton::parseLoadOp(parser, result); }]; -- -- let printer = [{ return mlir::triton::printLoadOp(p, *this); }]; -- -+ let hasCustomAssemblyFormat = 1; - let hasCanonicalizer = 1; - } - -@@ -170,11 +166,7 @@ def TT_StoreOp : TT_Op<"store", - "triton::EvictionPolicy":$evict)>, - ]; - -- // let assemblyFormat = "operands attr-dict `:` type($value)"; -- let parser = [{ return mlir::triton::parseStoreOp(parser, result); }]; -- -- let printer = [{ return mlir::triton::printStoreOp(p, *this); }]; -- -+ let hasCustomAssemblyFormat = 1; - let hasCanonicalizer = 1; - } - -diff --git a/include/triton/Dialect/Triton/IR/TritonTypes.td b/include/triton/Dialect/Triton/IR/TritonTypes.td -index 66d2a7b9a9..2fe2fd077d 100644 ---- a/include/triton/Dialect/Triton/IR/TritonTypes.td -+++ b/include/triton/Dialect/Triton/IR/TritonTypes.td -@@ -1,6 +1,7 @@ - #ifndef TRITON_TYPES - #define TRITON_TYPES - -+include "mlir/IR/AttrTypeBase.td" - include "triton/Dialect/Triton/IR/TritonDialect.td" - - // -@@ -58,6 +59,7 @@ def TT_Ptr : TritonTypeDef<"Pointer", "ptr"> { - }]> - ]; - -+ let hasCustomAssemblyFormat = 1; - let skipDefaultBuilders = 1; - } - def TT_PtrTensor : TensorOf<[TT_Ptr]>; -diff --git a/include/triton/Dialect/Triton/Transforms/Passes.td b/include/triton/Dialect/Triton/Transforms/Passes.td -index 8f77aed774..a25cdc5680 100644 ---- a/include/triton/Dialect/Triton/Transforms/Passes.td -+++ b/include/triton/Dialect/Triton/Transforms/Passes.td -@@ -16,8 +16,7 @@ def TritonCombineOps : Pass - - let constructor = "mlir::triton::createCombineOpsPass()"; - -- let dependentDialects = ["mlir::arith::ArithmeticDialect", -- /*SelectOp*/"mlir::StandardOpsDialect"]; -+ let dependentDialects = ["mlir::arith::ArithmeticDialect"]; - } - - #endif -diff --git a/include/triton/Dialect/TritonGPU/IR/Dialect.h b/include/triton/Dialect/TritonGPU/IR/Dialect.h -index b4c8daec7b..dfc5f53ab1 100644 ---- a/include/triton/Dialect/TritonGPU/IR/Dialect.h -+++ b/include/triton/Dialect/TritonGPU/IR/Dialect.h -@@ -1,19 +1,17 @@ - #ifndef TRITON_DIALECT_TRITONGPU_IR_DIALECT_H_ - #define TRITON_DIALECT_TRITONGPU_IR_DIALECT_H_ - --#include "mlir/Dialect/GPU/GPUDialect.h" -+#include "mlir/Dialect/GPU/IR/GPUDialect.h" - #include "mlir/Dialect/Tensor/IR/Tensor.h" - #include "mlir/IR/BuiltinOps.h" - #include "mlir/IR/Dialect.h" - - // TritonGPU depends on Triton - #include "triton/Dialect/Triton/IR/Dialect.h" -- - #include "triton/Dialect/TritonGPU/IR/Dialect.h.inc" - #include "triton/Dialect/TritonGPU/IR/Traits.h" - - #define GET_ATTRDEF_CLASSES --#include "triton/Dialect/Triton/IR/AttrInterfaces.h.inc" - #include "triton/Dialect/TritonGPU/IR/TritonGPUAttrDefs.h.inc" - - #define GET_OP_CLASSES -diff --git a/include/triton/Dialect/TritonGPU/IR/TritonGPUAttrDefs.td b/include/triton/Dialect/TritonGPU/IR/TritonGPUAttrDefs.td -index 0242c3cc17..af2aeb03a8 100644 ---- a/include/triton/Dialect/TritonGPU/IR/TritonGPUAttrDefs.td -+++ b/include/triton/Dialect/TritonGPU/IR/TritonGPUAttrDefs.td -@@ -1,6 +1,7 @@ - #ifndef TRITONGPU_ATTRDEFS - #define TRITONGPU_ATTRDEFS - -+include "mlir/IR/AttrTypeBase.td" - include "triton/Dialect/TritonGPU/IR/TritonGPUDialect.td" - include "triton/Dialect/Triton/IR/TritonInterfaces.td" - -@@ -136,6 +137,7 @@ A_{3, 2} A_{3, 3} A_{3, 0} A_{3, 1} ... [phase 1] / - ]; - - let extraClassDeclaration = extraBaseClassDeclaration; -+ let hasCustomAssemblyFormat = 1; - } - - //===----------------------------------------------------------------------===// -@@ -273,6 +275,7 @@ for - // ArrayRefParameter<"unsigned">:$sizePerCTA - ); - -+ let hasCustomAssemblyFormat = 1; - } - - //===----------------------------------------------------------------------===// -@@ -422,6 +425,7 @@ For example, the matrix L corresponding to blockTileSize=[32,16] is: - static constexpr int numBitsToHoldMmaV1ID{5}; - }]; - -+ let hasCustomAssemblyFormat = 1; - } - - def SliceEncodingAttr : DistributedEncoding<"SliceEncoding"> { -@@ -456,6 +460,8 @@ def SliceEncodingAttr : DistributedEncoding<"SliceEncoding"> { - template - SmallVector paddedShape(ArrayRef shape) const; - }]; -+ -+ let hasCustomAssemblyFormat = 1; - } - - def DotOperandEncodingAttr : DistributedEncoding<"DotOperandEncoding"> { -@@ -492,6 +498,7 @@ section 9.7.13.4.1 for more details. - - ]; - -+ let hasCustomAssemblyFormat = 1; - let extraClassDeclaration = extraBaseClassDeclaration; - } - -diff --git a/include/triton/Dialect/TritonGPU/IR/TritonGPUDialect.td b/include/triton/Dialect/TritonGPU/IR/TritonGPUDialect.td -index 87ec1d36c6..6489a721b4 100644 ---- a/include/triton/Dialect/TritonGPU/IR/TritonGPUDialect.td -+++ b/include/triton/Dialect/TritonGPU/IR/TritonGPUDialect.td -@@ -30,7 +30,7 @@ def TritonGPU_Dialect : Dialect { - } - }]; - -- -+ let useDefaultAttributePrinterParser = 1; - } - - #endif -diff --git a/include/triton/Dialect/TritonGPU/IR/TritonGPUOps.td b/include/triton/Dialect/TritonGPU/IR/TritonGPUOps.td -index 510f8d0183..7aba11dc75 100644 ---- a/include/triton/Dialect/TritonGPU/IR/TritonGPUOps.td -+++ b/include/triton/Dialect/TritonGPU/IR/TritonGPUOps.td -@@ -59,7 +59,7 @@ def TTG_AsyncCommitGroupOp : TTG_Op<"async_commit_group"> { - // This is needed because these ops don't - // handle encodings - // e.g., https://github.com/llvm/llvm-project/blob/main/mlir/include/mlir/Dialect/Arith/IR/ArithOps.td#L111 --def TTG_CmpIOp : TTG_Op<"cmpi", [NoSideEffect, Elementwise, -+def TTG_CmpIOp : TTG_Op<"cmpi", [NoSideEffect, Elementwise, - SameOperandsAndResultShape, - SameOperandsAndResultEncoding]> { - let summary = "integer comparison operation"; -@@ -73,7 +73,7 @@ def TTG_CmpIOp : TTG_Op<"cmpi", [NoSideEffect, Elementwise, - let results = (outs TT_BoolLike:$result); - } - --def TTG_CmpFOp : TTG_Op<"cmpf", [NoSideEffect, Elementwise, -+def TTG_CmpFOp : TTG_Op<"cmpf", [NoSideEffect, Elementwise, - SameOperandsAndResultShape, - SameOperandsAndResultEncoding]> { - let summary = "floating-point comparison operation"; -@@ -88,8 +88,8 @@ def TTG_CmpFOp : TTG_Op<"cmpf", [NoSideEffect, Elementwise, - } - - // TODO: migrate to arith::SelectOp on LLVM16 --def TTG_SelectOp : TTG_Op<"select", [NoSideEffect, Elementwise, -- SameOperandsAndResultShape, -+def TTG_SelectOp : TTG_Op<"select", [NoSideEffect, Elementwise, -+ SameOperandsAndResultShape, - SameOperandsAndResultEncoding]> { - let summary = "select operation"; - -@@ -188,10 +188,7 @@ def TTG_InsertSliceAsyncOp : TTG_Op<"insert_slice_async", - } - }]; - -- // The custom parser could be replaced with oilist in LLVM-16 -- let parser = [{ return parseInsertSliceAsyncOp(parser, result); }]; -- -- let printer = [{ return printInsertSliceAsyncOp(p, *this); }]; -+ let hasCustomAssemblyFormat = 1; - } - - def TTG_AllocTensorOp : TTG_Op<"alloc_tensor", [MemoryEffects<[MemAlloc]>, // Allocate shared memory -diff --git a/lib/Analysis/Alias.cpp b/lib/Analysis/Alias.cpp -index a39e4de9aa..208fdd4afc 100644 ---- a/lib/Analysis/Alias.cpp -+++ b/lib/Analysis/Alias.cpp -@@ -18,8 +18,9 @@ AliasInfo AliasInfo::join(const AliasInfo &lhs, const AliasInfo &rhs) { - return ret; - } - --ChangeResult SharedMemoryAliasAnalysis::visitOperation( -- Operation *op, ArrayRef *> operands) { -+void SharedMemoryAliasAnalysis::visitOperation( -+ Operation *op, ArrayRef *> operands, -+ ArrayRef *> results) { - AliasInfo aliasInfo; - bool pessimistic = true; - if (maybeSharedAllocationOp(op)) { -@@ -44,14 +45,11 @@ ChangeResult SharedMemoryAliasAnalysis::visitOperation( - } - - if (pessimistic) { -- return markAllPessimisticFixpoint(op->getResults()); -+ return markAllPessimisticFixpoint(results); - } - // Join all lattice elements -- ChangeResult result = ChangeResult::NoChange; -- for (Value value : op->getResults()) { -- result |= getLatticeElement(value).join(aliasInfo); -- } -- return result; -+ for (auto *result : results) -+ propagateIfChanged(result, result->join(aliasInfo)); - } - - AliasResult SharedMemoryAliasAnalysis::alias(Value lhs, Value rhs) { -diff --git a/lib/Analysis/Allocation.cpp b/lib/Analysis/Allocation.cpp -index 712c08c475..b4de8dcd9d 100644 ---- a/lib/Analysis/Allocation.cpp -+++ b/lib/Analysis/Allocation.cpp -@@ -1,4 +1,5 @@ - #include "triton/Analysis/Allocation.h" -+#include "mlir/Analysis/DataFlowFramework.h" - #include "mlir/Analysis/Liveness.h" - #include "mlir/Analysis/SliceAnalysis.h" - #include "mlir/Dialect/Tensor/IR/Tensor.h" -@@ -33,10 +34,8 @@ constexpr int kPtrBitWidth = 64; - - static std::pair, SmallVector> - getCvtOrder(const Attribute &srcLayout, const Attribute &dstLayout) { -- auto srcBlockedLayout = srcLayout.dyn_cast(); - auto srcMmaLayout = srcLayout.dyn_cast(); - auto srcDotLayout = srcLayout.dyn_cast(); -- auto dstBlockedLayout = dstLayout.dyn_cast(); - auto dstMmaLayout = dstLayout.dyn_cast(); - auto dstDotLayout = dstLayout.dyn_cast(); - assert(!(srcMmaLayout && dstMmaLayout) && -@@ -224,14 +223,12 @@ class AllocationAnalysis { - } - - void getValueAlias(Value value, SharedMemoryAliasAnalysis &analysis) { -- LatticeElement *latticeElement = -- analysis.lookupLatticeElement(value); -- if (latticeElement) { -- auto &info = latticeElement->getValue(); -- if (!info.getAllocs().empty()) { -- for (auto alloc : info.getAllocs()) { -- allocation->addAlias(value, alloc); -- } -+ dataflow::Lattice *latticeElement = -+ analysis.getLatticeElement(value); -+ if (latticeElement && !latticeElement->isUninitialized()) { -+ AliasInfo &info = latticeElement->getValue(); -+ for (auto alloc : info.getAllocs()) { -+ allocation->addAlias(value, alloc); - } - } - } -@@ -244,14 +241,19 @@ class AllocationAnalysis { - getScratchValueSize(op); - }); - // Get the alias values -- SharedMemoryAliasAnalysis aliasAnalysis(operation->getContext()); -- aliasAnalysis.run(operation); -+ std::unique_ptr solver = createDataFlowSolver(); -+ SharedMemoryAliasAnalysis *aliasAnalysis = -+ solver->load(); -+ if (failed(solver->initializeAndRun(operation))) { -+ // TODO: return error instead of bailing out.. -+ llvm_unreachable("failed to run SharedMemoryAliasAnalysis"); -+ } - operation->walk([&](Operation *op) { - for (auto operand : op->getOperands()) { -- getValueAlias(operand, aliasAnalysis); -+ getValueAlias(operand, *aliasAnalysis); - } - for (auto value : op->getResults()) { -- getValueAlias(value, aliasAnalysis); -+ getValueAlias(value, *aliasAnalysis); - } - }); - } -diff --git a/lib/Analysis/AxisInfo.cpp b/lib/Analysis/AxisInfo.cpp -index 0b7142b04d..4af46c3fbb 100644 ---- a/lib/Analysis/AxisInfo.cpp -+++ b/lib/Analysis/AxisInfo.cpp -@@ -1,4 +1,4 @@ --#include "mlir/Analysis/DataFlowAnalysis.h" -+#include "mlir/Analysis/DataFlowFramework.h" - #include "mlir/Dialect/LLVMIR/LLVMDialect.h" - #include "llvm/Support/raw_ostream.h" - -@@ -52,7 +52,7 @@ AxisInfo AxisInfo::getPessimisticValueState(Value value) { - BlockArgument blockArg = value.dyn_cast(); - if (blockArg && blockArg.getOwner()->isEntryBlock()) { - Operation *op = blockArg.getOwner()->getParentOp(); -- if (FuncOp fun = dyn_cast(op)) { -+ if (func::FuncOp fun = dyn_cast(op)) { - Attribute attr = - fun.getArgAttr(blockArg.getArgNumber(), "tt.divisibility"); - if (attr) -@@ -136,8 +136,9 @@ class CastOpAxisInfoVisitor final : public AxisInfoVisitorImpl { - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(OpTy op, -+ ArrayRef *> operands) override { - return operands[0]->getValue(); - } - }; -@@ -147,8 +148,9 @@ class MakeRangeOpAxisInfoVisitor final - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(triton::MakeRangeOp op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(triton::MakeRangeOp op, -+ ArrayRef *> operands) override { - auto start = op.start(); - auto end = op.end(); - return AxisInfo(/*contiguity=*/{end - start}, -@@ -162,8 +164,9 @@ class ConstantOpAxisInfoVisitor final - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(arith::ConstantOp op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(arith::ConstantOp op, -+ ArrayRef *> operands) override { - auto intAttr = op.getValue().dyn_cast(); - auto boolAttr = op.getValue().dyn_cast(); - if (intAttr || boolAttr) { -@@ -416,8 +419,9 @@ class SplatOpAxisInfoVisitor final - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(triton::SplatOp op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(triton::SplatOp op, -+ ArrayRef *> operands) override { - Type _retTy = *op->result_type_begin(); - TensorType retTy = _retTy.cast(); - AxisInfo opInfo = operands[0]->getValue(); -@@ -439,8 +443,9 @@ class ExpandDimsOpAxisInfoVisitor final - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(triton::ExpandDimsOp op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(triton::ExpandDimsOp op, -+ ArrayRef *> operands) override { - AxisInfo opInfo = operands[0]->getValue(); - AxisInfo::DimVectorT contiguity = opInfo.getContiguity(); - AxisInfo::DimVectorT divisibility = opInfo.getDivisibility(); -@@ -458,8 +463,9 @@ class BroadcastOpAxisInfoVisitor final - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(triton::BroadcastOp op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(triton::BroadcastOp op, -+ ArrayRef *> operands) override { - Type _retTy = *op->result_type_begin(); - Type _opTy = *op->operand_type_begin(); - TensorType retTy = _retTy.cast(); -@@ -486,8 +492,9 @@ class CmpOpAxisInfoVisitor final : public AxisInfoVisitorImpl { - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(OpTy op, -+ ArrayRef *> operands) override { - auto resTy = op.getResult().getType().template dyn_cast(); - if (!resTy) - return AxisInfo(); -@@ -596,8 +603,9 @@ class SelectOpAxisInfoVisitor final : public AxisInfoVisitorImpl { - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(OpTy op, -+ ArrayRef *> operands) override { - auto resTy = op.getResult().getType().template dyn_cast(); - if (!resTy) - return AxisInfo(); -@@ -757,8 +765,9 @@ class MaxMinOpAxisInfoVisitor final : public AxisInfoVisitorImpl { - public: - using AxisInfoVisitorImpl::AxisInfoVisitorImpl; - -- AxisInfo getAxisInfo(OpTy op, -- ArrayRef *> operands) override { -+ AxisInfo -+ getAxisInfo(OpTy op, -+ ArrayRef *> operands) override { - auto lhsInfo = operands[0]->getValue(); - auto rhsInfo = operands[1]->getValue(); - std::optional constantValue; -@@ -786,8 +795,8 @@ class MaxMinOpAxisInfoVisitor final : public AxisInfoVisitorImpl { - // AxisInfoAnalysis - //===----------------------------------------------------------------------===// - --AxisInfoAnalysis::AxisInfoAnalysis(MLIRContext *context) -- : ForwardDataFlowAnalysis(context) { -+AxisInfoAnalysis::AxisInfoAnalysis(DataFlowSolver &solver) -+ : dataflow::SparseDataFlowAnalysis>(solver) { - // UnrealizedConversionCast: - // This is needed by TritonGPUToLLVM, to get AxisInfo when the graph is - // in the process of a PartialConversion, where UnrealizedConversionCast -@@ -819,7 +828,7 @@ AxisInfoAnalysis::AxisInfoAnalysis(MLIRContext *context) - visitors.append, - LogicalOpAxisInfoVisitor, - LogicalOpAxisInfoVisitor>(); -- visitors.append, -+ visitors.append, - SelectOpAxisInfoVisitor>(); - visitors.append, - ShROpAxisInfoVisitor>(); -@@ -829,11 +838,12 @@ AxisInfoAnalysis::AxisInfoAnalysis(MLIRContext *context) - MaxMinOpAxisInfoVisitor>(); - } - --ChangeResult AxisInfoAnalysis::visitOperation( -- Operation *op, ArrayRef *> operands) { -+void AxisInfoAnalysis::visitOperation( -+ Operation *op, ArrayRef *> operands, -+ ArrayRef *> results) { - AxisInfo curr = visitors.apply(op, operands); - if (curr.getRank() == 0) { -- return markAllPessimisticFixpoint(op->getResults()); -+ return markAllPessimisticFixpoint(results); - } - // override with hint - auto newContiguity = curr.getContiguity(); -@@ -854,11 +864,8 @@ ChangeResult AxisInfoAnalysis::visitOperation( - curr = mlir::AxisInfo(newContiguity, newDivisibility, newConstancy, - curr.getConstantValue()); - // join all lattice elements -- ChangeResult result = ChangeResult::NoChange; -- for (Value value : op->getResults()) { -- result |= getLatticeElement(value).join(curr); -- } -- return result; -+ for (auto *result : results) -+ propagateIfChanged(result, result->join(curr)); - } - - unsigned AxisInfoAnalysis::getPtrContiguity(Value ptr) { -@@ -884,7 +891,10 @@ unsigned AxisInfoAnalysis::getPtrAlignment(Value ptr) { - auto tensorTy = ptr.getType().dyn_cast(); - if (!tensorTy) - return 1; -- auto axisInfo = lookupLatticeElement(ptr)->getValue(); -+ dataflow::Lattice *latticeElement = getLatticeElement(ptr); -+ if (!latticeElement || latticeElement->isUninitialized()) -+ return 1; -+ auto axisInfo = latticeElement->getValue(); - auto layout = tensorTy.getEncoding(); - auto order = triton::gpu::getOrder(layout); - auto maxMultipleBytes = axisInfo.getDivisibility(order[0]); -@@ -900,8 +910,11 @@ unsigned AxisInfoAnalysis::getMaskAlignment(Value mask) { - auto tensorTy = mask.getType().dyn_cast(); - if (!tensorTy) - return 1; -+ dataflow::Lattice *latticeElement = getLatticeElement(mask); -+ if (!latticeElement || latticeElement->isUninitialized()) -+ return 1; -+ auto maskAxis = latticeElement->getValue(); - auto maskOrder = triton::gpu::getOrder(tensorTy.getEncoding()); -- auto maskAxis = lookupLatticeElement(mask)->getValue(); - auto alignment = std::max(maskAxis.getConstancy(maskOrder[0]), 1); - return alignment; - } -diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt -index afbc692510..1f761f845c 100644 ---- a/lib/Analysis/CMakeLists.txt -+++ b/lib/Analysis/CMakeLists.txt -@@ -8,7 +8,7 @@ add_mlir_library(TritonAnalysis - DEPENDS - TritonTableGen - TritonGPUAttrDefsIncGen -- -+ - LINK_LIBS PUBLIC - MLIRAnalysis - ) -diff --git a/lib/Analysis/Membar.cpp b/lib/Analysis/Membar.cpp -index acc885e827..910274b2ac 100644 ---- a/lib/Analysis/Membar.cpp -+++ b/lib/Analysis/Membar.cpp -@@ -2,7 +2,7 @@ - #include "triton/Analysis/Alias.h" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" - --#include "mlir/Dialect/GPU/GPUDialect.h" -+#include "mlir/Dialect/GPU/IR/GPUDialect.h" - #include "mlir/Dialect/Tensor/IR/Tensor.h" - - namespace mlir { -diff --git a/lib/Analysis/Utility.cpp b/lib/Analysis/Utility.cpp -index d9e917e731..6ea52df272 100644 ---- a/lib/Analysis/Utility.cpp -+++ b/lib/Analysis/Utility.cpp -@@ -1,5 +1,8 @@ - #include "triton/Analysis/Utility.h" -+#include "mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h" -+#include "mlir/Analysis/DataFlow/DeadCodeAnalysis.h" - #include "mlir/IR/Dialect.h" -+#include "mlir/IR/Matchers.h" - #include "triton/Dialect/Triton/IR/Dialect.h" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" - #include -@@ -325,4 +328,55 @@ SetVector multiRootGetSlice(Operation *op, - return multiRootTopologicalSort(slice); - } - -+namespace { -+// Copied from TestDeadCodeAnalysis.cpp, because some dead code analysis -+// interacts with constant propagation, but SparseConstantPropagation -+// doesn't seem to be sufficient. -+struct ConstantAnalysis : public DataFlowAnalysis { -+ using DataFlowAnalysis::DataFlowAnalysis; -+ -+ LogicalResult initialize(Operation *top) override { -+ WalkResult result = top->walk([&](Operation *op) { -+ if (failed(visit(op))) -+ return WalkResult::interrupt(); -+ return WalkResult::advance(); -+ }); -+ return success(!result.wasInterrupted()); -+ } -+ -+ LogicalResult visit(ProgramPoint point) override { -+ Operation *op = point.get(); -+ Attribute value; -+ if (matchPattern(op, m_Constant(&value))) { -+ auto *constant = getOrCreate>( -+ op->getResult(0)); -+ propagateIfChanged(constant, constant->join(dataflow::ConstantValue( -+ value, op->getDialect()))); -+ return success(); -+ } -+ setAllToUnknownConstants(op->getResults()); -+ for (Region ®ion : op->getRegions()) -+ setAllToUnknownConstants(region.getArguments()); -+ return success(); -+ } -+ -+ /// Set all given values as not constants. -+ void setAllToUnknownConstants(ValueRange values) { -+ dataflow::ConstantValue unknownConstant(nullptr, nullptr); -+ for (Value value : values) { -+ auto *constant = -+ getOrCreate>(value); -+ propagateIfChanged(constant, constant->join(unknownConstant)); -+ } -+ } -+}; -+} // namespace -+ -+std::unique_ptr createDataFlowSolver() { -+ auto solver = std::make_unique(); -+ solver->load(); -+ solver->load(); -+ return solver; -+} -+ - } // namespace mlir -diff --git a/lib/Conversion/TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp -index 6a46265bd7..e352eb3698 100644 ---- a/lib/Conversion/TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/ConvertLayoutOpToLLVM.cpp -@@ -159,9 +159,6 @@ struct ConvertLayoutOpConversion - Value smemBase) const { - auto accumNumCTAsEachRep = product(numCTAsEachRep); - auto layout = type.getEncoding(); -- auto blockedLayout = layout.dyn_cast(); -- auto sliceLayout = layout.dyn_cast(); -- auto mmaLayout = layout.dyn_cast(); - auto rank = type.getRank(); - auto sizePerThread = getSizePerThread(layout); - auto accumSizePerThread = product(sizePerThread); -diff --git a/lib/Conversion/TritonGPUToLLVM/DotOpHelpers.h b/lib/Conversion/TritonGPUToLLVM/DotOpHelpers.h -index 4b89965aa9..1d9e00519b 100644 ---- a/lib/Conversion/TritonGPUToLLVM/DotOpHelpers.h -+++ b/lib/Conversion/TritonGPUToLLVM/DotOpHelpers.h -@@ -7,10 +7,8 @@ - #include "mlir/Conversion/LLVMCommon/LoweringOptions.h" - #include "mlir/Conversion/LLVMCommon/Pattern.h" - #include "mlir/Conversion/MathToLLVM/MathToLLVM.h" --#include "mlir/Conversion/SCFToStandard/SCFToStandard.h" --#include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" - #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" --#include "mlir/Dialect/GPU/GPUDialect.h" -+#include "mlir/Dialect/GPU/IR/GPUDialect.h" - #include "mlir/Dialect/LLVMIR/LLVMDialect.h" - #include "mlir/Dialect/Tensor/IR/Tensor.h" - #include "mlir/IR/Matchers.h" -@@ -422,9 +420,9 @@ struct MMA16816ConversionHelper { - MMA16816ConversionHelper(Type dotOperand, MmaEncodingAttr mmaLayout, - Value thread, ConversionPatternRewriter &rewriter, - TypeConverter *typeConverter, Location loc) -- : mmaLayout(mmaLayout), thread(thread), helper(mmaLayout), -- rewriter(rewriter), typeConverter(typeConverter), loc(loc), -- ctx(mmaLayout.getContext()), wpt(mmaLayout.getWarpsPerCTA()) { -+ : mmaLayout(mmaLayout), wpt(mmaLayout.getWarpsPerCTA()), thread(thread), -+ helper(mmaLayout), rewriter(rewriter), typeConverter(typeConverter), -+ loc(loc), ctx(mmaLayout.getContext()) { - helper.deduceMmaType(dotOperand); - - Value _32 = i32_val(32); -diff --git a/lib/Conversion/TritonGPUToLLVM/DotOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/DotOpToLLVM.cpp -index 0f8070ca9f..e4bd47c411 100644 ---- a/lib/Conversion/TritonGPUToLLVM/DotOpToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/DotOpToLLVM.cpp -@@ -115,8 +115,6 @@ struct DotOpConversion : public ConvertTritonGPUOpToLLVMPattern { - auto DTensorTy = D.getType().cast(); - auto AShape = ATensorTy.getShape(); - auto BShape = BTensorTy.getShape(); -- auto DShape = DTensorTy.getShape(); -- auto wpt = mmaLayout.getWarpsPerCTA(); - - bool isARow = ALayout.getIsMMAv1Row().cast().getValue(); - bool isBRow = BLayout.getIsMMAv1Row().cast().getValue(); -@@ -221,7 +219,6 @@ struct DotOpConversion : public ConvertTritonGPUOpToLLVMPattern { - ConversionPatternRewriter &rewriter) const { - auto *ctx = rewriter.getContext(); - auto loc = op.getLoc(); -- auto threadId = getThreadId(rewriter, loc); - - auto A = op.a(); - auto B = op.b(); -@@ -230,12 +227,10 @@ struct DotOpConversion : public ConvertTritonGPUOpToLLVMPattern { - - auto aTensorTy = A.getType().cast(); - auto bTensorTy = B.getType().cast(); -- auto cTensorTy = C.getType().cast(); - auto dTensorTy = D.getType().cast(); - - auto aShape = aTensorTy.getShape(); - auto bShape = bTensorTy.getShape(); -- auto cShape = cTensorTy.getShape(); - - BlockedEncodingAttr dLayout = - dTensorTy.getEncoding().cast(); -diff --git a/lib/Conversion/TritonGPUToLLVM/ElementwiseOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/ElementwiseOpToLLVM.cpp -index deb71b9597..0b9e67674b 100644 ---- a/lib/Conversion/TritonGPUToLLVM/ElementwiseOpToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/ElementwiseOpToLLVM.cpp -@@ -61,7 +61,6 @@ struct FpToFpOpConversion - convertFp16x4ToFp8x4(Location loc, ConversionPatternRewriter &rewriter, - const Value &v0, const Value &v1, const Value &v2, - const Value &v3) { -- auto ctx = rewriter.getContext(); - auto fp16x2VecTy = vec_ty(f16_ty, 2); - Value fp16x2Vec0 = undef(fp16x2VecTy); - Value fp16x2Vec1 = undef(fp16x2VecTy); -@@ -153,7 +152,6 @@ struct FpToFpOpConversion - convertBf16x4ToFp8x4(Location loc, ConversionPatternRewriter &rewriter, - const Value &v0, const Value &v1, const Value &v2, - const Value &v3) { -- auto ctx = rewriter.getContext(); - auto bf16x2VecTy = vec_ty(i16_ty, 2); - Value bf16x2Vec0 = undef(bf16x2VecTy); - Value bf16x2Vec1 = undef(bf16x2VecTy); -diff --git a/lib/Conversion/TritonGPUToLLVM/LoadStoreOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/LoadStoreOpToLLVM.cpp -index 9a8b4702bc..bae675f0cb 100644 ---- a/lib/Conversion/TritonGPUToLLVM/LoadStoreOpToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/LoadStoreOpToLLVM.cpp -@@ -109,7 +109,8 @@ struct LoadOpConversion - DenseElementsAttr constAttr; - int64_t splatVal = 0; - if (other && valueElemTy.isa() && -- matchPattern(other, m_Constant(&constAttr)) && constAttr.isSplat()) { -+ matchPattern(other, m_Constant(&constAttr)) && constAttr.isSplat() && -+ constAttr.getElementType().isa()) { - otherIsSplatConstInt = true; - splatVal = constAttr.getSplatValue().getSExtValue(); - } -@@ -333,7 +334,6 @@ struct StoreOpConversion - elem = rewriter.create(loc, type::i8Ty(ctx), elem); - elem = bitcast(elem, valueElemTy); - -- Type u32Ty = typeConverter->convertType(type::u32Ty(ctx)); - llWord = insert_element(wordTy, llWord, elem, i32_val(elemIdx)); - } - llWord = bitcast(llWord, valArgTy); -@@ -387,7 +387,6 @@ struct AtomicCASOpConversion - ConversionPatternRewriter &rewriter) const override { - auto loc = op.getLoc(); - MLIRContext *ctx = rewriter.getContext(); -- Value ptr = op.ptr(); - - Value llPtr = adaptor.ptr(); - Value llCmp = adaptor.cmp(); -diff --git a/lib/Conversion/TritonGPUToLLVM/ReduceOpToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/ReduceOpToLLVM.cpp -index 69abd889be..1c973dc196 100644 ---- a/lib/Conversion/TritonGPUToLLVM/ReduceOpToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/ReduceOpToLLVM.cpp -@@ -286,7 +286,6 @@ struct ReduceOpConversion - auto srcTy = op.operand().getType().cast(); - auto srcLayout = srcTy.getEncoding(); - auto srcShape = srcTy.getShape(); -- auto srcRank = srcTy.getRank(); - auto order = getOrder(srcLayout); - - auto threadsPerWarp = triton::gpu::getThreadsPerWarp(srcLayout); -@@ -351,7 +350,6 @@ struct ReduceOpConversion - - Value zero = i32_val(0); - Value laneZero = icmp_eq(laneIdAxis, zero); -- Value warpZero = icmp_eq(warpIdAxis, zero); - - for (auto it : accs) { - const SmallVector &key = it.first; -diff --git a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVM.cpp b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVM.cpp -index 5b77150b1a..78cfa076bd 100644 ---- a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVM.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVM.cpp -@@ -11,11 +11,11 @@ using ::mlir::LLVM::getStructFromElements; - using ::mlir::triton::gpu::getElemsPerThread; - using ::mlir::triton::gpu::SharedEncodingAttr; - --struct ReturnOpConversion : public ConvertOpToLLVMPattern<::mlir::ReturnOp> { -- using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; -+struct ReturnOpConversion : public ConvertOpToLLVMPattern { -+ using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; - - LogicalResult -- matchAndRewrite(ReturnOp op, OpAdaptor adaptor, -+ matchAndRewrite(func::ReturnOp op, OpAdaptor adaptor, - ConversionPatternRewriter &rewriter) const override { - unsigned numArguments = op.getNumOperands(); - -@@ -476,7 +476,6 @@ struct ExtractSliceOpConversion - - auto llvmElemTy = getTypeConverter()->convertType(srcTy.getElementType()); - auto elemPtrTy = ptr_ty(llvmElemTy, 3); -- auto resTy = op.getType().dyn_cast(); - smemObj = SharedMemoryObject(gep(elemPtrTy, smemObj.base, offset), - strideVals, offsetVals); - auto retVal = getStructFromSharedMemoryObject(loc, smemObj, rewriter); -diff --git a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h -index bb10d5b24a..00e399f848 100644 ---- a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h -+++ b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMBase.h -@@ -4,6 +4,7 @@ - // TODO: refactor so that it doesn't fail if Allocation.h - // is included after utility.h (due to conflict in `store` macro - // and -+#include "mlir/Dialect/Func/IR/FuncOps.h" - #include "triton/Analysis/Allocation.h" - - // -@@ -39,15 +40,15 @@ void vprintf_array(Value thread, ArrayRef arr, std::string info, - // TODO(Superjomn): remove the code when MLIR v15.0 is included. - // All the rights are reserved by the LLVM community. - --struct FuncOpConversionBase : public ConvertOpToLLVMPattern { -+struct FuncOpConversionBase : public ConvertOpToLLVMPattern { - private: - /// Only retain those attributes that are not constructed by - /// `LLVMFuncOp::build`. If `filterArgAttrs` is set, also filter out argument - /// attributes. -- static void filterFuncAttributes(ArrayRef attrs, -- bool filterArgAttrs, -+ static void filterFuncAttributes(func::FuncOp op, bool filterArgAttrs, - SmallVectorImpl &result) { -- for (const auto &attr : attrs) { -+ -+ for (const auto &attr : op->getAttrs()) { - if (attr.getName() == SymbolTable::getSymbolAttrName() || - attr.getName() == FunctionOpInterface::getTypeAttrName() || - attr.getName() == "std.varargs" || -@@ -65,27 +66,27 @@ struct FuncOpConversionBase : public ConvertOpToLLVMPattern { - } - - protected: -- using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; -+ using ConvertOpToLLVMPattern::ConvertOpToLLVMPattern; - - // Convert input FuncOp to LLVMFuncOp by using the LLVMTypeConverter provided - // to this legalization pattern. - LLVM::LLVMFuncOp -- convertFuncOpToLLVMFuncOp(FuncOp funcOp, -+ convertFuncOpToLLVMFuncOp(func::FuncOp funcOp, - ConversionPatternRewriter &rewriter) const { - // Convert the original function arguments. They are converted using the - // LLVMTypeConverter provided to this legalization pattern. - auto varargsAttr = funcOp->getAttrOfType("func.varargs"); - TypeConverter::SignatureConversion result(funcOp.getNumArguments()); - auto llvmType = getTypeConverter()->convertFunctionSignature( -- funcOp.getType(), varargsAttr && varargsAttr.getValue(), result); -+ funcOp.getFunctionType(), varargsAttr && varargsAttr.getValue(), -+ result); - if (!llvmType) - return nullptr; - - // Propagate argument/result attributes to all converted arguments/result - // obtained after converting a given original argument/result. - SmallVector attributes; -- filterFuncAttributes(funcOp->getAttrs(), /*filterArgAttrs=*/true, -- attributes); -+ filterFuncAttributes(funcOp, /*filterArgAttrs=*/true, attributes); - if (ArrayAttr resAttrDicts = funcOp.getAllResultAttrs()) { - assert(!resAttrDicts.empty() && "expected array to be non-empty"); - auto newResAttrDicts = -@@ -131,7 +132,7 @@ struct FuncOpConversionBase : public ConvertOpToLLVMPattern { - } - auto newFuncOp = rewriter.create( - funcOp.getLoc(), funcOp.getName(), llvmType, linkage, -- /*dsoLocal*/ false, attributes); -+ /*dsoLocal*/ false, LLVM::CConv::C, attributes); - rewriter.inlineRegionBefore(funcOp.getBody(), newFuncOp.getBody(), - newFuncOp.end()); - if (failed(rewriter.convertRegionTypes(&newFuncOp.getBody(), *typeConverter, -@@ -191,8 +192,8 @@ class ConvertTritonGPUOpToLLVMPatternBase { - const Allocation *allocation, - Value smem, - IndexCacheInfo indexCacheInfo) -- : converter(&typeConverter), indexCacheInfo(indexCacheInfo), -- allocation(allocation), smem(smem) {} -+ : converter(&typeConverter), allocation(allocation), smem(smem), -+ indexCacheInfo(indexCacheInfo) {} - - LLVMTypeConverter *getTypeConverter() const { return converter; } - -@@ -861,7 +862,6 @@ class ConvertTritonGPUOpToLLVMPatternBase { - ArrayRef shape) const { - auto parent = sliceLayout.getParent(); - unsigned dim = sliceLayout.getDim(); -- size_t rank = shape.size(); - auto parentIndices = - emitIndices(loc, rewriter, parent, sliceLayout.paddedShape(shape)); - unsigned numIndices = parentIndices.size(); -diff --git a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.cpp b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.cpp -index ff1af09835..6f66af4e34 100644 ---- a/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.cpp -+++ b/lib/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.cpp -@@ -1,10 +1,11 @@ - #include "triton/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.h" - -+#include "mlir/Analysis/DataFlowFramework.h" - #include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" -+#include "mlir/Conversion/ControlFlowToLLVM//ControlFlowToLLVM.h" - #include "mlir/Conversion/GPUToNVVM/GPUToNVVMPass.h" - #include "mlir/Conversion/MathToLLVM/MathToLLVM.h" --#include "mlir/Conversion/SCFToStandard/SCFToStandard.h" --#include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" -+#include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h" - #include "mlir/Dialect/LLVMIR/LLVMDialect.h" - #include "mlir/Dialect/LLVMIR/NVVMDialect.h" - #include "mlir/Pass/Pass.h" -@@ -40,7 +41,6 @@ class TritonLLVMConversionTarget : public ConversionTarget { - addIllegalDialect(); - addIllegalDialect(); - addIllegalDialect(); -- addIllegalDialect(); - addLegalOp(); - } - }; -@@ -51,7 +51,7 @@ class TritonLLVMFunctionConversionTarget : public ConversionTarget { - : ConversionTarget(ctx) { - addLegalDialect(); - addLegalDialect(); -- addIllegalOp(); -+ addIllegalOp(); - addLegalOp(); - } - }; -@@ -69,7 +69,7 @@ struct FuncOpConversion : public FuncOpConversionBase { - : FuncOpConversionBase(converter, benefit), numWarps(numWarps) {} - - LogicalResult -- matchAndRewrite(FuncOp funcOp, OpAdaptor adaptor, -+ matchAndRewrite(func::FuncOp funcOp, OpAdaptor adaptor, - ConversionPatternRewriter &rewriter) const override { - auto newFuncOp = convertFuncOpToLLVMFuncOp(funcOp, rewriter); - if (!newFuncOp) -@@ -133,7 +133,8 @@ class ConvertTritonGPUToLLVM - decomposeBlockedToDotOperand(mod); - - // Step 2 -- decomposeInsertSliceAsyncOp(mod); -+ if (failed(decomposeInsertSliceAsyncOp(mod))) -+ return signalPassFailure(); - - // Step 3 - Allocation allocation(mod); -@@ -142,7 +143,7 @@ class ConvertTritonGPUToLLVM - - // Step 4 - RewritePatternSet scf_patterns(context); -- mlir::populateLoopToStdConversionPatterns(scf_patterns); -+ mlir::populateSCFToControlFlowConversionPatterns(scf_patterns); - mlir::ConversionTarget scf_target(*context); - scf_target.addIllegalOp(); -@@ -159,8 +160,10 @@ class ConvertTritonGPUToLLVM - return signalPassFailure(); - - // Step 6 - get axis and shared memory info -- AxisInfoAnalysis axisInfoAnalysis(mod.getContext()); -- axisInfoAnalysis.run(mod); -+ std::unique_ptr solver = createDataFlowSolver(); -+ AxisInfoAnalysis *axisInfoAnalysis = solver->load(); -+ if (failed(solver->initializeAndRun(mod))) -+ return signalPassFailure(); - initSharedMemory(allocation.getSharedMemorySize(), typeConverter); - mod->setAttr("triton_gpu.shared", - mlir::IntegerAttr::get(mlir::IntegerType::get(context, 32), -@@ -178,38 +181,39 @@ class ConvertTritonGPUToLLVM - - // Normal conversions - populateTritonGPUToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - indexCacheInfo, /*benefit=*/10); - // ConvertLayoutOp - populateConvertLayoutOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - indexCacheInfo, /*benefit=*/10); - // DotOp - populateDotOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - /*benefit=*/10); - // ElementwiseOp - populateElementwiseOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - /*benefit=*/10); - // LoadStoreOp - populateLoadStoreOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - indexCacheInfo, /*benefit=*/10); - // ReduceOp - populateReduceOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - indexCacheInfo, /*benefit=*/10); - // ViewOp - populateViewOpToLLVMPatterns(typeConverter, patterns, numWarps, -- axisInfoAnalysis, &allocation, smem, -+ *axisInfoAnalysis, &allocation, smem, - /*benefit=*/10); - - // Add arith/math's patterns to help convert scalar expression to LLVM. - mlir::arith::populateArithmeticToLLVMConversionPatterns(typeConverter, - patterns); - mlir::populateMathToLLVMConversionPatterns(typeConverter, patterns); -- mlir::populateStdToLLVMConversionPatterns(typeConverter, patterns); -+ mlir::cf::populateControlFlowToLLVMConversionPatterns(typeConverter, -+ patterns); - mlir::populateGpuToNVVMConversionPatterns(typeConverter, patterns); - - if (failed(applyPartialConversion(mod, target, std::move(patterns)))) -@@ -306,9 +310,11 @@ class ConvertTritonGPUToLLVM - }); - } - -- void decomposeInsertSliceAsyncOp(ModuleOp mod) const { -- AxisInfoAnalysis axisInfoAnalysis(mod.getContext()); -- axisInfoAnalysis.run(mod); -+ LogicalResult decomposeInsertSliceAsyncOp(ModuleOp mod) const { -+ std::unique_ptr solver = createDataFlowSolver(); -+ AxisInfoAnalysis *axisInfoAnalysis = solver->load(); -+ if (failed(solver->initializeAndRun(mod))) -+ return failure(); - // TODO(Keren): This is a hacky knob that may cause performance regression - // when decomposition has been performed. We should remove this knob once we - // have thorough analysis on async wait. Currently, we decompose -@@ -342,7 +348,7 @@ class ConvertTritonGPUToLLVM - auto resSharedLayout = - dstTy.getEncoding().dyn_cast(); - auto resElemTy = dstTy.getElementType(); -- unsigned inVec = axisInfoAnalysis.getPtrContiguity(src); -+ unsigned inVec = axisInfoAnalysis->getPtrContiguity(src); - unsigned outVec = resSharedLayout.getVec(); - unsigned minVec = std::min(outVec, inVec); - auto maxBitWidth = -@@ -400,11 +406,11 @@ class ConvertTritonGPUToLLVM - } else if (decomposed) { - // Wait for all previous async ops - OpBuilder builder(asyncWaitOp); -- auto newAsyncWaitOp = -- builder.create(asyncWaitOp.getLoc(), 0); -+ builder.create(asyncWaitOp.getLoc(), 0); - asyncWaitOp.erase(); - } - }); -+ return success(); - } - }; - -diff --git a/lib/Conversion/TritonGPUToLLVM/Utility.h b/lib/Conversion/TritonGPUToLLVM/Utility.h -index d35dac28c5..11976908cf 100644 ---- a/lib/Conversion/TritonGPUToLLVM/Utility.h -+++ b/lib/Conversion/TritonGPUToLLVM/Utility.h -@@ -220,10 +220,7 @@ struct SharedMemoryObject { - ConversionPatternRewriter &rewriter) - : base(base) { - strides = getStridesFromShapeAndOrder(shape, order, loc, rewriter); -- -- for (auto idx : order) { -- offsets.emplace_back(i32_val(0)); -- } -+ offsets.append(order.size(), i32_val(0)); - } - - SmallVector getElems() const { -diff --git a/lib/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.cpp b/lib/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.cpp -index fe42202c34..5f230f787f 100644 ---- a/lib/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.cpp -+++ b/lib/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.cpp -@@ -1,10 +1,10 @@ - #include "triton/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.h" - - #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" --#include "mlir/Dialect/GPU/GPUDialect.h" -+#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" -+#include "mlir/Dialect/GPU/IR/GPUDialect.h" - #include "mlir/Dialect/LLVMIR/LLVMDialect.h" - #include "mlir/Dialect/LLVMIR/NVVMDialect.h" --#include "mlir/Dialect/StandardOps/IR/Ops.h" - #include "mlir/Pass/Pass.h" - #include "mlir/Transforms/DialectConversion.h" - #include "triton/Dialect/Triton/IR/Dialect.h" -@@ -59,10 +59,13 @@ class ArithConstantPattern : public OpConversionPattern { - Type retType = getTypeConverter()->convertType(op.getType()); - auto value = adaptor.getValue().dyn_cast(); - assert(value); -- rewriter.replaceOpWithNewOp( -- op, retType, -- value.reshape(retType) // This is a hack. We just want to add encoding -- ); -+ if (value.getElementType().isInteger(1) && value.isSplat()) -+ // Workaround until https://reviews.llvm.org/D133743 is included. -+ value = DenseElementsAttr::get(retType, value.getSplatValue()); -+ else -+ // This is a hack. We just want to add encoding -+ value = value.reshape(retType); -+ rewriter.replaceOpWithNewOp(op, retType, value); - return success(); - } - }; -@@ -127,12 +130,12 @@ void populateArithmeticPatternsAndLegality( - } - - // this shouldn't exist if mlir's SelectOp checked encodings properly --class StdSelectPattern : public OpConversionPattern { -+class StdSelectPattern : public OpConversionPattern { - public: -- using OpConversionPattern::OpConversionPattern; -+ using OpConversionPattern::OpConversionPattern; - - LogicalResult -- matchAndRewrite(SelectOp op, typename SelectOp::Adaptor adaptor, -+ matchAndRewrite(arith::SelectOp op, OpAdaptor adaptor, - ConversionPatternRewriter &rewriter) const override { - Type retType = this->getTypeConverter()->convertType(op.getType()); - rewriter.replaceOpWithNewOp( -@@ -148,8 +151,8 @@ void populateStdPatternsAndLegality(TritonGPUTypeConverter &typeConverter, - MLIRContext *context = patterns.getContext(); - // Rewrite rule - patterns.add(typeConverter, context); -- target.addLegalOp(); // this is ok because all functions are inlined -- // by the frontend -+ target.addLegalOp(); // this is ok because all functions are -+ // inlined by the frontend - } - - void populateMathPatternsAndLegality(TritonGPUTypeConverter &typeConverter, -@@ -455,18 +458,19 @@ struct TritonPrintfPattern : public OpConversionPattern { - void populateTritonPatterns(TritonGPUTypeConverter &typeConverter, - RewritePatternSet &patterns) { - MLIRContext *context = patterns.getContext(); -- patterns.add< // TODO: view should have custom pattern that views the layout -- TritonGenericPattern, -- TritonGenericPattern, -- TritonGenericPattern, -- TritonGenericPattern, -- TritonGenericPattern, -- TritonGenericPattern, TritonBroadcastPattern, -- TritonGenericPattern, TritonCatPattern, -- TritonReducePattern, TritonTransPattern, TritonExpandDimsPattern, -- TritonMakeRangePattern, TritonDotPattern, TritonLoadPattern, -- TritonStorePattern, TritonExtElemwisePattern, TritonPrintfPattern, -- TritonAtomicRMWPattern>(typeConverter, context); -+ patterns -+ .insert< // TODO: view should have custom pattern that views the layout -+ TritonGenericPattern, -+ TritonGenericPattern, -+ TritonGenericPattern, -+ TritonGenericPattern, -+ TritonGenericPattern, -+ TritonGenericPattern, TritonBroadcastPattern, -+ TritonGenericPattern, TritonCatPattern, -+ TritonReducePattern, TritonTransPattern, TritonExpandDimsPattern, -+ TritonMakeRangePattern, TritonDotPattern, TritonLoadPattern, -+ TritonStorePattern, TritonExtElemwisePattern, TritonPrintfPattern, -+ TritonAtomicRMWPattern>(typeConverter, context); - } - - // -@@ -623,29 +627,28 @@ void populateSCFPatterns(TritonGPUTypeConverter &typeConverter, - - // CF - --class CFBranchPattern : public OpConversionPattern { -+class CFBranchPattern : public OpConversionPattern { - public: -- using OpConversionPattern::OpConversionPattern; -+ using OpConversionPattern::OpConversionPattern; - - LogicalResult -- matchAndRewrite(BranchOp op, BranchOp::Adaptor adaptor, -+ matchAndRewrite(cf::BranchOp op, cf::BranchOp::Adaptor adaptor, - ConversionPatternRewriter &rewriter) const override { -- auto converter = getTypeConverter(); -- auto newOp = rewriter.replaceOpWithNewOp(op, op.getSuccessor(), -- adaptor.getOperands()); -+ auto newOp = rewriter.replaceOpWithNewOp( -+ op, op.getSuccessor(), adaptor.getOperands()); - return success(); - } - }; - --class CFCondBranchPattern : public OpConversionPattern { -+class CFCondBranchPattern : public OpConversionPattern { - public: -- using OpConversionPattern::OpConversionPattern; -+ using OpConversionPattern::OpConversionPattern; - - LogicalResult -- matchAndRewrite(CondBranchOp op, CondBranchOp::Adaptor adaptor, -+ matchAndRewrite(cf::CondBranchOp op, cf::CondBranchOp::Adaptor adaptor, - ConversionPatternRewriter &rewriter) const override { - auto converter = getTypeConverter(); -- auto newOp = rewriter.replaceOpWithNewOp( -+ auto newOp = rewriter.replaceOpWithNewOp( - op, adaptor.getCondition(), op.getTrueDest(), - adaptor.getTrueDestOperands(), op.getFalseDest(), - adaptor.getFalseDestOperands()); -diff --git a/lib/Dialect/Triton/IR/CMakeLists.txt b/lib/Dialect/Triton/IR/CMakeLists.txt -index 2d679b21fd..705554ba6b 100644 ---- a/lib/Dialect/Triton/IR/CMakeLists.txt -+++ b/lib/Dialect/Triton/IR/CMakeLists.txt -@@ -10,11 +10,7 @@ add_mlir_dialect_library(TritonIR - - LINK_LIBS PUBLIC - MLIRIR -- MLIRArithmetic -- MLIRSCF -- -- # Since LLVM 15 -- # MLIRFunc -- # else -- MLIRStandard -+ MLIRArithmeticDialect -+ MLIRSCFDialect -+ MLIRFuncDialect - ) -diff --git a/lib/Dialect/Triton/IR/Ops.cpp b/lib/Dialect/Triton/IR/Ops.cpp -index 3aadbfa0c0..86570359c5 100644 ---- a/lib/Dialect/Triton/IR/Ops.cpp -+++ b/lib/Dialect/Triton/IR/Ops.cpp -@@ -1,10 +1,9 @@ --#include "triton/Dialect/Triton/IR/Dialect.h" --#include "triton/Dialect/Triton/IR/Types.h" -- - #include "mlir/IR/Builders.h" - #include "mlir/IR/BuiltinAttributes.h" - #include "mlir/IR/BuiltinTypes.h" - #include "mlir/IR/OperationSupport.h" -+#include "triton/Dialect/Triton/IR/Dialect.h" -+#include "triton/Dialect/Triton/IR/Types.h" - - namespace mlir { - namespace triton { -@@ -38,8 +37,8 @@ static Type getPointerTypeSameShape(Type type) { - } - - // Parser & printer for assembly forms --ParseResult parseLoadOp(OpAsmParser &parser, OperationState &result) { -- SmallVector allOperands; -+ParseResult LoadOp::parse(OpAsmParser &parser, OperationState &result) { -+ SmallVector allOperands; - Type resultTypes[1]; - SMLoc allOperandLoc = parser.getCurrentLocation(); - if (parser.parseOperandList(allOperands) || -@@ -73,18 +72,18 @@ ParseResult parseLoadOp(OpAsmParser &parser, OperationState &result) { - return success(); - } - --void printLoadOp(OpAsmPrinter &printer, LoadOp loadOp) { -+void LoadOp::print(OpAsmPrinter &printer) { - printer << " "; -- printer << loadOp.getOperation()->getOperands(); -+ printer << getOperation()->getOperands(); - // "operand_segment_sizes" can be deduced, so we don't print it. -- printer.printOptionalAttrDict(loadOp->getAttrs(), -- {loadOp.operand_segment_sizesAttrName()}); -+ printer.printOptionalAttrDict(getOperation()->getAttrs(), -+ {operand_segment_sizesAttrName()}); - printer << " : "; -- printer.printStrippedAttrOrType(loadOp.result().getType()); -+ printer.printStrippedAttrOrType(getResult().getType()); - } - --ParseResult parseStoreOp(OpAsmParser &parser, OperationState &result) { -- SmallVector allOperands; -+ParseResult StoreOp::parse(OpAsmParser &parser, OperationState &result) { -+ SmallVector allOperands; - Type valueType; - SMLoc allOperandLoc = parser.getCurrentLocation(); - if (parser.parseOperandList(allOperands) || -@@ -104,12 +103,12 @@ ParseResult parseStoreOp(OpAsmParser &parser, OperationState &result) { - return success(); - } - --void printStoreOp(OpAsmPrinter &printer, StoreOp storeOp) { -+void StoreOp::print(OpAsmPrinter &printer) { - printer << " "; -- printer << storeOp.getOperation()->getOperands(); -- printer.printOptionalAttrDict(storeOp->getAttrs(), /*elidedAttrs=*/{}); -+ printer << getOperation()->getOperands(); -+ printer.printOptionalAttrDict(getOperation()->getAttrs(), /*elidedAttrs=*/{}); - printer << " : "; -- printer.printStrippedAttrOrType(storeOp.value().getType()); -+ printer.printStrippedAttrOrType(value().getType()); - } - - } // namespace triton -@@ -319,7 +318,8 @@ OpFoldResult SplatOp::fold(ArrayRef operands) { - if (!constOperand) - return {}; - auto shapedType = getType().cast(); -- auto ret = SplatElementsAttr::get(shapedType, {constOperand.getValue()}); -+ auto ret = SplatElementsAttr::get( -+ shapedType, ArrayRef(constOperand.getValue())); - return ret; - } - -diff --git a/lib/Dialect/Triton/Transforms/Combine.cpp b/lib/Dialect/Triton/Transforms/Combine.cpp -index 2261472170..11570283d6 100644 ---- a/lib/Dialect/Triton/Transforms/Combine.cpp -+++ b/lib/Dialect/Triton/Transforms/Combine.cpp -@@ -57,13 +57,13 @@ DenseElementsAttr getConstantValue(Builder &builder, Attribute value, - class CombineSelectMaskedLoadPattern : public mlir::RewritePattern { - public: - CombineSelectMaskedLoadPattern(mlir::MLIRContext *context) -- : mlir::RewritePattern(mlir::SelectOp::getOperationName(), 3, context, -- {triton::LoadOp::getOperationName()}) {} -+ : mlir::RewritePattern(mlir::arith::SelectOp::getOperationName(), 3, -+ context, {triton::LoadOp::getOperationName()}) {} - - mlir::LogicalResult - matchAndRewrite(mlir::Operation *op, - mlir::PatternRewriter &rewriter) const override { -- auto selectOp = llvm::dyn_cast(op); -+ auto selectOp = llvm::dyn_cast(op); - if (!selectOp) - return mlir::failure(); - -diff --git a/lib/Dialect/Triton/Transforms/Combine.td b/lib/Dialect/Triton/Transforms/Combine.td -index 14f286b26e..ded0e346e6 100644 ---- a/lib/Dialect/Triton/Transforms/Combine.td -+++ b/lib/Dialect/Triton/Transforms/Combine.td -@@ -1,9 +1,9 @@ - #ifndef TRITON_PATTERNS - #define TRITON_PATTERNS - --include "mlir/Dialect/StandardOps/IR/Ops.td" - include "mlir/Dialect/Arithmetic/IR/ArithmeticOps.td" - include "triton/Dialect/Triton/IR/TritonOps.td" -+include "mlir/IR/PatternBase.td" - - - // AddIOp(DotOp(a, b, c), d) and c==0 => DotOp(a, b, d) -diff --git a/lib/Dialect/TritonGPU/IR/Dialect.cpp b/lib/Dialect/TritonGPU/IR/Dialect.cpp -index 1fbc609e88..bfc3f3d3da 100644 ---- a/lib/Dialect/TritonGPU/IR/Dialect.cpp -+++ b/lib/Dialect/TritonGPU/IR/Dialect.cpp -@@ -1,14 +1,14 @@ -+#include "triton/Dialect/Triton/IR/Dialect.h" -+ - #include - - #include "mlir/IR/DialectImplementation.h" - #include "mlir/IR/OpImplementation.h" - #include "triton/Analysis/Utility.h" --#include "triton/Dialect/Triton/IR/Dialect.h" -+#include "triton/Dialect/TritonGPU/IR/Dialect.cpp.inc" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" - #include "llvm/ADT/TypeSwitch.h" - --#include "triton/Dialect/TritonGPU/IR/Dialect.cpp.inc" -- - using namespace mlir; - using namespace mlir::triton::gpu; - -@@ -366,7 +366,6 @@ template SmallVector - SliceEncodingAttr::paddedShape(ArrayRef shape) const; - - unsigned SliceEncodingAttr::getElemsPerThread(ArrayRef shape) const { -- size_t rank = shape.size(); - auto parent = getParent(); - return ::getElemsPerThread(parent, paddedShape(shape)); - } -@@ -655,9 +654,9 @@ void DotOperandEncodingAttr::print(mlir::AsmPrinter &printer) const { - // InsertSliceAsyncOp - //===----------------------------------------------------------------------===// - --ParseResult parseInsertSliceAsyncOp(OpAsmParser &parser, -- OperationState &result) { -- SmallVector allOperands; -+ParseResult InsertSliceAsyncOp::parse(OpAsmParser &parser, -+ OperationState &result) { -+ SmallVector allOperands; - Type srcType, dstType; - SMLoc allOperandLoc = parser.getCurrentLocation(); - if (parser.parseOperandList(allOperands) || -@@ -696,18 +695,16 @@ ParseResult parseInsertSliceAsyncOp(OpAsmParser &parser, - return success(); - } - --void printInsertSliceAsyncOp(OpAsmPrinter &printer, -- InsertSliceAsyncOp insertSliceAsyncOp) { -+void InsertSliceAsyncOp::print(OpAsmPrinter &printer) { - printer << " "; -- printer << insertSliceAsyncOp.getOperation()->getOperands(); -+ printer << getOperation()->getOperands(); - // "operand_segment_sizes" can be deduced, so we don't print it. -- printer.printOptionalAttrDict( -- insertSliceAsyncOp->getAttrs(), -- {insertSliceAsyncOp.operand_segment_sizesAttrName()}); -+ printer.printOptionalAttrDict(getOperation()->getAttrs(), -+ {operand_segment_sizesAttrName()}); - printer << " : "; -- printer.printStrippedAttrOrType(insertSliceAsyncOp.src().getType()); -+ printer.printStrippedAttrOrType(src().getType()); - printer << " -> "; -- printer.printStrippedAttrOrType(insertSliceAsyncOp.result().getType()); -+ printer.printStrippedAttrOrType(result().getType()); - } - - //===----------------------------------------------------------------------===// -diff --git a/lib/Dialect/TritonGPU/Transforms/Coalesce.cpp b/lib/Dialect/TritonGPU/Transforms/Coalesce.cpp -index 82407980d3..ee6009f44a 100644 ---- a/lib/Dialect/TritonGPU/Transforms/Coalesce.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/Coalesce.cpp -@@ -27,7 +27,11 @@ struct CoalescePass : public TritonGPUCoalesceBase { - auto origType = ptr.getType().cast(); - // Get the shape of the tensor. - size_t rank = origType.getRank(); -- AxisInfo info = axisInfo.lookupLatticeElement(ptr)->getValue(); -+ dataflow::Lattice *latticeElement = -+ axisInfo.getLatticeElement(ptr); -+ AxisInfo info = latticeElement && !latticeElement->isUninitialized() -+ ? latticeElement->getValue() -+ : AxisInfo(); - // Get the contiguity order of `ptr` - auto order = argSort(info.getContiguity()); - // The desired divisibility is the maximum divisibility -@@ -40,7 +44,7 @@ struct CoalescePass : public TritonGPUCoalesceBase { - for (Value val : op->getResults()) { - if (val.getType() != origType) - continue; -- auto valInfo = axisInfo.lookupLatticeElement(val); -+ auto valInfo = axisInfo.getLatticeElement(val); - auto currOrder = argSort(valInfo->getValue().getContiguity()); - if (order == currOrder) - withSameOrder.insert(val); -@@ -55,7 +59,7 @@ struct CoalescePass : public TritonGPUCoalesceBase { - unsigned elemNumBytes = std::max(elemNumBits / 8, 1u); - unsigned perThread = 1; - for (Value val : withSameOrder) { -- AxisInfo info = axisInfo.lookupLatticeElement(val)->getValue(); -+ AxisInfo info = axisInfo.getLatticeElement(val)->getValue(); - unsigned maxMultipleBytes = info.getDivisibility(order[0]); - unsigned maxMultiple = std::max(maxMultipleBytes / elemNumBytes, 1u); - unsigned maxContig = info.getContiguity(order[0]); -@@ -123,8 +127,10 @@ struct CoalescePass : public TritonGPUCoalesceBase { - void runOnOperation() override { - Operation *op = getOperation(); - // Run axis info analysis -- AxisInfoAnalysis axisInfo(&getContext()); -- axisInfo.run(op); -+ std::unique_ptr solver = createDataFlowSolver(); -+ AxisInfoAnalysis *axisInfo = solver->load(); -+ if (failed(solver->initializeAndRun(op))) -+ return signalPassFailure(); - - // For each i/o operation, we determine what layout - // the pointers should have for best memory coalescing -@@ -146,10 +152,10 @@ struct CoalescePass : public TritonGPUCoalesceBase { - RankedTensorType ty = ptr.getType().template dyn_cast(); - if (!ty || !ty.getElementType().isa()) - return; -- AxisInfo info = axisInfo.lookupLatticeElement(ptr)->getValue(); -+ AxisInfo info = axisInfo->getLatticeElement(ptr)->getValue(); - auto mod = curr->getParentOfType(); - int numWarps = triton::gpu::TritonGPUDialect::getNumWarps(mod); -- auto convertType = getTypeConverter(axisInfo, ptr, numWarps); -+ auto convertType = getTypeConverter(*axisInfo, ptr, numWarps); - layoutMap[ptr] = convertType; - }); - -diff --git a/lib/Dialect/TritonGPU/Transforms/Combine.cpp b/lib/Dialect/TritonGPU/Transforms/Combine.cpp -index efa37ff2dc..089ce3996c 100644 ---- a/lib/Dialect/TritonGPU/Transforms/Combine.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/Combine.cpp -@@ -1,6 +1,6 @@ - #include "Utility.h" - #include "mlir/Analysis/SliceAnalysis.h" --#include "mlir/Dialect/SCF/SCF.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/IR/BlockAndValueMapping.h" - #include "mlir/IR/BuiltinAttributes.h" - #include "mlir/IR/Matchers.h" -diff --git a/lib/Dialect/TritonGPU/Transforms/Combine.td b/lib/Dialect/TritonGPU/Transforms/Combine.td -index 6bf1b14866..6a7b10dbcb 100644 ---- a/lib/Dialect/TritonGPU/Transforms/Combine.td -+++ b/lib/Dialect/TritonGPU/Transforms/Combine.td -@@ -3,5 +3,6 @@ - - include "triton/Dialect/TritonGPU/IR/TritonGPUOps.td" - include "triton/Dialect/Triton/IR/TritonOps.td" -+include "mlir/IR/PatternBase.td" - - #endif -diff --git a/lib/Dialect/TritonGPU/Transforms/DecomposeConversions.cpp b/lib/Dialect/TritonGPU/Transforms/DecomposeConversions.cpp -index 4bd3bc76bf..b2f8defd81 100644 ---- a/lib/Dialect/TritonGPU/Transforms/DecomposeConversions.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/DecomposeConversions.cpp -@@ -1,5 +1,5 @@ - #include "mlir/Analysis/SliceAnalysis.h" --#include "mlir/Dialect/SCF/SCF.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/IR/BlockAndValueMapping.h" - #include "mlir/IR/BuiltinAttributes.h" - #include "mlir/IR/Matchers.h" -diff --git a/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp b/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp -index 9b2f42231e..85f746c1dc 100644 ---- a/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/Pipeline.cpp -@@ -2,6 +2,7 @@ - #include "mlir/IR/BlockAndValueMapping.h" - #include "mlir/IR/TypeUtilities.h" - #include "triton/Analysis/AxisInfo.h" -+#include "triton/Analysis/Utility.h" - #include "triton/Dialect/TritonGPU/IR/Dialect.h" - #include "triton/Dialect/TritonGPU/Transforms/Passes.h" - -@@ -160,15 +161,18 @@ ttg::AllocTensorOp LoopPipeliner::allocateEmptyBuffer(Operation *op, - LogicalResult LoopPipeliner::initialize() { - Block *loop = forOp.getBody(); - -- AxisInfoAnalysis axisInfoAnalysis(forOp.getContext()); -- axisInfoAnalysis.run(forOp->getParentOfType()); -+ std::unique_ptr solver = createDataFlowSolver(); -+ AxisInfoAnalysis *axisInfoAnalysis = solver->load(); -+ if (failed(solver->initializeAndRun(forOp->getParentOfType()))) { -+ return failure(); -+ } - - // can we use forOp.walk(...) here? - SmallVector allLoads; - for (Operation &op : *loop) - if (auto loadOp = dyn_cast(&op)) { - auto ptr = loadOp.ptr(); -- unsigned vec = axisInfoAnalysis.getPtrContiguity(ptr); -+ unsigned vec = axisInfoAnalysis->getPtrContiguity(ptr); - auto tensorTy = ptr.getType().dyn_cast(); - if (!tensorTy) - continue; -diff --git a/lib/Dialect/TritonGPU/Transforms/ReorderInstructions.cpp b/lib/Dialect/TritonGPU/Transforms/ReorderInstructions.cpp -index 0e7dbe5264..b95a4f50a6 100644 ---- a/lib/Dialect/TritonGPU/Transforms/ReorderInstructions.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/ReorderInstructions.cpp -@@ -1,5 +1,5 @@ - #include "mlir/Analysis/SliceAnalysis.h" --#include "mlir/Dialect/SCF/SCF.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/IR/BlockAndValueMapping.h" - #include "mlir/IR/BuiltinAttributes.h" - #include "mlir/IR/Matchers.h" -diff --git a/lib/Dialect/TritonGPU/Transforms/TritonGPUConversion.cpp b/lib/Dialect/TritonGPU/Transforms/TritonGPUConversion.cpp -index 37ac710995..762e887f36 100644 ---- a/lib/Dialect/TritonGPU/Transforms/TritonGPUConversion.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/TritonGPUConversion.cpp -@@ -82,12 +82,12 @@ TritonGPUConversionTarget::TritonGPUConversionTarget( - scf::ReduceReturnOp>(); - - addDynamicallyLegalDialect([&](Operation *op) { -- if (typeConverter.isLegal(op)) -- return true; -- return false; -- }); -+ triton::TritonDialect, scf::SCFDialect>( -+ [&](Operation *op) { -+ if (typeConverter.isLegal(op)) -+ return true; -+ return false; -+ }); - - // We have requirements for the data layouts - addDynamicallyLegalOp([](triton::DotOp dotOp) -> bool { -diff --git a/lib/Dialect/TritonGPU/Transforms/UpdateMmaForVolta.cpp b/lib/Dialect/TritonGPU/Transforms/UpdateMmaForVolta.cpp -index c229104286..c911fd4a5c 100644 ---- a/lib/Dialect/TritonGPU/Transforms/UpdateMmaForVolta.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/UpdateMmaForVolta.cpp -@@ -1,5 +1,5 @@ - #include "Utility.h" --#include "mlir/Dialect/SCF/SCF.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/IR/Matchers.h" - #include "mlir/IR/PatternMatch.h" - #include "mlir/Transforms/GreedyPatternRewriteDriver.h" -@@ -118,8 +118,8 @@ void setOpResultType(Operation *op, ArrayRef newTypes) { - .get("value") - .dyn_cast(); - if (attr) { -- auto newAttr = mlir::DenseElementsAttr::getFromRawBuffer( -- newType, attr.getRawData(), true); -+ auto newAttr = -+ mlir::DenseElementsAttr::getFromRawBuffer(newType, attr.getRawData()); - op->setAttr("value", newAttr); - } - } -diff --git a/lib/Dialect/TritonGPU/Transforms/Utility.cpp b/lib/Dialect/TritonGPU/Transforms/Utility.cpp -index ed15f02f67..6400f1633a 100644 ---- a/lib/Dialect/TritonGPU/Transforms/Utility.cpp -+++ b/lib/Dialect/TritonGPU/Transforms/Utility.cpp -@@ -1,5 +1,5 @@ - #include "Utility.h" --#include "mlir/Dialect/SCF/SCF.h" -+#include "mlir/Dialect/SCF/IR/SCF.h" - #include "mlir/IR/BlockAndValueMapping.h" - #include "mlir/Transforms/GreedyPatternRewriteDriver.h" - -diff --git a/lib/Target/LLVMIR/CMakeLists.txt b/lib/Target/LLVMIR/CMakeLists.txt -index f1bbd0bf4e..ac8973ad19 100644 ---- a/lib/Target/LLVMIR/CMakeLists.txt -+++ b/lib/Target/LLVMIR/CMakeLists.txt -@@ -6,8 +6,7 @@ add_mlir_translation_library(TritonLLVMIR - - LINK_LIBS PUBLIC - MLIRIR -- MLIRLLVMIR -- MLIRSCFToStandard -+ MLIRLLVMDialect - MLIRSupport - MLIRTargetLLVMIRExport - ) -diff --git a/lib/Target/PTX/PTXTranslation.cpp b/lib/Target/PTX/PTXTranslation.cpp -index 4cb0d8193c..6a5453a6e7 100644 ---- a/lib/Target/PTX/PTXTranslation.cpp -+++ b/lib/Target/PTX/PTXTranslation.cpp -@@ -1,11 +1,14 @@ - #include "triton/Target/PTX/PTXTranslation.h" - #include "triton/Target/LLVMIR/LLVMIRTranslation.h" -+#include - - #include "llvm/IR/IRBuilder.h" - #include "llvm/IR/LegacyPassManager.h" - #include "llvm/IR/Module.h" - #include "llvm/IR/Verifier.h" - #include "llvm/MC/TargetRegistry.h" -+#include "llvm/Pass.h" -+#include "llvm/Support/CommandLine.h" - #include "llvm/Support/TargetSelect.h" - #include "llvm/Target/TargetMachine.h" - -diff --git a/python/setup.py b/python/setup.py -index 2ac3accd25..4530b36714 100644 ---- a/python/setup.py -+++ b/python/setup.py -@@ -57,19 +57,10 @@ def get_pybind11_package_info(): - def get_llvm_package_info(): - # download if nothing is installed - system = platform.system() -- if system == "Darwin": -- system_suffix = "apple-darwin" -- elif system == "Linux": -- vglibc = tuple(map(int, platform.libc_ver()[1].split('.'))) -- vglibc = vglibc[0] * 100 + vglibc[1] -- linux_suffix = 'ubuntu-18.04' if vglibc > 217 else 'centos-7' -- system_suffix = f"linux-gnu-{linux_suffix}" -- else: -- raise RuntimeError(f"unsupported system: {system}") -+ system_suffix = {"Linux": "linux-gnu-ubuntu-18.04", "Darwin": "apple-darwin"}[system] - use_assert_enabled_llvm = check_env_flag("TRITON_USE_ASSERT_ENABLED_LLVM", "False") -- release_suffix = "assert" if use_assert_enabled_llvm else "release" -- name = f'llvm+mlir-14.0.6-x86_64-{system_suffix}-{release_suffix}' -- url = f"https://github.com/ptillet/triton-llvm-releases/releases/download/llvm-14.0.6-f28c006a5895/{name}.tar.xz" -+ name = 'llvm+mlir-15.0.7-x86_64-{}-{}'.format(system_suffix, "assert" if use_assert_enabled_llvm else "release") -+ url = "https://github.com/ptillet/triton-llvm-releases/releases/download/llvm-15.0.7-8dfdcc7b7bf6/{}.tar.xz".format(name) - return Package("llvm", name, url, "lib", "LLVM_INCLUDE_DIRS", "LLVM_LIBRARY_DIR", "LLVM_SYSPATH") - - -diff --git a/python/src/triton.cc b/python/src/triton.cc -index c40b117a55..f190eacc34 100644 ---- a/python/src/triton.cc -+++ b/python/src/triton.cc -@@ -8,9 +8,10 @@ - #include "mlir/Pass/PassManager.h" - #include "mlir/Transforms/Passes.h" - --#include "mlir/Parser.h" -+#include "mlir/Parser/Parser.h" - #include "mlir/Support/FileUtilities.h" - -+#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" - #include "mlir/Dialect/LLVMIR/LLVMDialect.h" - #include "triton/Analysis/Allocation.h" - #include "triton/Conversion/TritonGPUToLLVM/TritonGPUToLLVMPass.h" -@@ -195,7 +196,7 @@ void init_triton_ir(py::module &&m) { - std::string attrName = name + "_arg" + std::to_string(id); - mlir::Block *owner = arg.getOwner(); - if (owner->isEntryBlock() && -- !mlir::isa(owner->getParentOp())) { -+ !mlir::isa(owner->getParentOp())) { - owner->getParentOp()->setAttr(attrName, attr); - } - } -@@ -348,7 +349,7 @@ void init_triton_ir(py::module &&m) { - return str; - }) - .def("push_back", -- [](mlir::ModuleOp &self, mlir::FuncOp &funcOp) -> void { -+ [](mlir::ModuleOp &self, mlir::func::FuncOp &funcOp) -> void { - self.push_back(funcOp); - }) - .def("has_function", -@@ -358,16 +359,18 @@ void init_triton_ir(py::module &&m) { - return false; - }) - .def("get_function", -- [](mlir::ModuleOp &self, std::string &funcName) -> mlir::FuncOp { -- return self.lookupSymbol(funcName); -- }) -- .def("get_single_function", [](mlir::ModuleOp &self) -> mlir::FuncOp { -- llvm::SmallVector funcs; -- self.walk([&](mlir::FuncOp func) { funcs.push_back(func); }); -- if (funcs.size() != 1) -- throw std::runtime_error("Expected a single function"); -- return funcs[0]; -- }); -+ [](mlir::ModuleOp &self, -+ std::string &funcName) -> mlir::func::FuncOp { -+ return self.lookupSymbol(funcName); -+ }) -+ .def("get_single_function", -+ [](mlir::ModuleOp &self) -> mlir::func::FuncOp { -+ llvm::SmallVector funcs; -+ self.walk([&](mlir::func::FuncOp func) { funcs.push_back(func); }); -+ if (funcs.size() != 1) -+ throw std::runtime_error("Expected a single function"); -+ return funcs[0]; -+ }); - - m.def("make_attr", - [](const std::vector &values, mlir::MLIRContext &context) { -@@ -388,47 +391,48 @@ void init_triton_ir(py::module &&m) { - registry.insert(); -+ mlir::func::FuncDialect, mlir::scf::SCFDialect>(); - context.appendDialectRegistry(registry); - context.loadAllAvailableDialects(); - - // parse module -- mlir::OwningOpRef module( -- mlir::parseSourceFile(inputFilename, &context)); -+ mlir::OwningOpRef module = -+ mlir::parseSourceFile(inputFilename, &context); -+ if (!module) -+ throw std::runtime_error("Parse MLIR file failed."); - // locations are incompatible with ptx < 7.5 ! - module->walk([](mlir::Operation *op) { - op->setLoc(mlir::UnknownLoc::get(op->getContext())); - }); -- if (!module) -- throw std::runtime_error("Parse MLIR file failed."); - - return module->clone(); - }, - ret::take_ownership); - -- py::class_(m, "function") -+ py::class_(m, "function") - // .def_property_readonly("attrs", &ir::function::attrs) - // .def("add_attr", &ir::function::add_attr); - .def("args", -- [](mlir::FuncOp &self, unsigned idx) -> mlir::BlockArgument { -+ [](mlir::func::FuncOp &self, unsigned idx) -> mlir::BlockArgument { - return self.getArgument(idx); - }) - .def( - "add_entry_block", -- [](mlir::FuncOp &self) -> mlir::Block * { -+ [](mlir::func::FuncOp &self) -> mlir::Block * { - return self.addEntryBlock(); - }, - ret::reference) - .def( - "set_arg_attr", -- [](mlir::FuncOp &self, int arg_no, const std::string &name, int val) { -+ [](mlir::func::FuncOp &self, int arg_no, const std::string &name, -+ int val) { - // set arg attributes "name" to value "val" - auto attrTy = mlir::IntegerType::get(self.getContext(), 32); - self.setArgAttr(arg_no, name, mlir::IntegerAttr::get(attrTy, val)); - }, - ret::reference) -- .def_property_readonly("type", &mlir::FuncOp::getType) -- .def("reset_type", &mlir::FuncOp::setType); -+ .def_property_readonly("type", &mlir::func::FuncOp::getFunctionType) -+ .def("reset_type", &mlir::func::FuncOp::setType); - - py::class_(m, "InsertPoint"); - -@@ -445,13 +449,13 @@ void init_triton_ir(py::module &&m) { - .def("ret", - [](mlir::OpBuilder &self, std::vector &vals) -> void { - auto loc = self.getUnknownLoc(); -- self.create(loc, vals); -+ self.create(loc, vals); - }) - .def("call", -- [](mlir::OpBuilder &self, mlir::FuncOp &func, -+ [](mlir::OpBuilder &self, mlir::func::FuncOp &func, - std::vector &args) -> mlir::OpState { - auto loc = self.getUnknownLoc(); -- return self.create(loc, func, args); -+ return self.create(loc, func, args); - }) - // insertion block/point - .def("set_insertion_point_to_start", -@@ -618,15 +622,16 @@ void init_triton_ir(py::module &&m) { - .def("get_or_insert_function", - [](mlir::OpBuilder &self, mlir::ModuleOp &module, - std::string &funcName, mlir::Type &funcType, -- std::string &visibility) -> mlir::FuncOp { -+ std::string &visibility) -> mlir::func::FuncOp { - if (mlir::Operation *funcOperation = module.lookupSymbol(funcName)) -- return llvm::dyn_cast(funcOperation); -+ return llvm::dyn_cast(funcOperation); - auto loc = self.getUnknownLoc(); - if (auto funcTy = funcType.dyn_cast()) { - llvm::SmallVector attrs = { - mlir::NamedAttribute(self.getStringAttr("sym_visibility"), - self.getStringAttr(visibility))}; -- return self.create(loc, funcName, funcTy, attrs); -+ return self.create(loc, funcName, funcTy, -+ attrs); - } - throw std::runtime_error("invalid function type"); - }) -@@ -658,15 +663,15 @@ void init_triton_ir(py::module &&m) { - [](mlir::OpBuilder &self, mlir::Value condition, - mlir::Block *trueDest, mlir::Block *falseDest) { - auto loc = self.getUnknownLoc(); -- self.create(loc, condition, trueDest, -- falseDest); -+ self.create(loc, condition, trueDest, -+ falseDest); - return; - }) - .def("create_branch", - [](mlir::OpBuilder &self, mlir::Block *dest, - std::vector &args) { - auto loc = self.getUnknownLoc(); -- self.create(loc, dest, args); -+ self.create(loc, dest, args); - return; - }) - // Structured control flow -@@ -792,14 +797,14 @@ void init_triton_ir(py::module &&m) { - .def("create_to_index", - [](mlir::OpBuilder &self, mlir::Value &input) -> mlir::Value { - auto loc = self.getUnknownLoc(); -- return self.create(loc, input, -- self.getIndexType()); -+ return self.create( -+ loc, self.getIndexType(), input); - }) - .def("create_index_to_si", - [](mlir::OpBuilder &self, mlir::Value &input) -> mlir::Value { - auto loc = self.getUnknownLoc(); -- return self.create(loc, input, -- self.getI32Type()); -+ return self.create( -+ loc, self.getI32Type(), input); - }) - .def("create_fmul", - [](mlir::OpBuilder &self, mlir::Value &lhs, -@@ -1316,8 +1321,8 @@ void init_triton_ir(py::module &&m) { - [](mlir::OpBuilder &self, mlir::Value &condition, - mlir::Value &trueValue, mlir::Value &falseValue) -> mlir::Value { - auto loc = self.getUnknownLoc(); -- return self.create(loc, condition, trueValue, -- falseValue); -+ return self.create(loc, condition, -+ trueValue, falseValue); - }) - .def("create_printf", - [](mlir::OpBuilder &self, const std::string &prefix, -@@ -1429,7 +1434,7 @@ void init_triton_ir(py::module &&m) { - self.addPass(mlir::triton::createConvertTritonGPUToLLVMPass()); - }) - .def("add_scf_to_cfg", [](mlir::PassManager &self) { -- self.addPass(mlir::createLowerToCFGPass()); -+ self.addPass(mlir::createConvertSCFToCFPass()); - }); - } - -diff --git a/python/test/unit/language/test_core.py b/python/test/unit/language/test_core.py -index 432544a8a4..018f544714 100644 ---- a/python/test/unit/language/test_core.py -+++ b/python/test/unit/language/test_core.py -@@ -1918,7 +1918,7 @@ def test_convert2d(dtype, shape, src_layout, dst_layout, device='cuda'): - #dst = {dst_layout} - """ + """ - module attributes {"triton_gpu.num-warps" = 4 : i32} { -- func public @kernel_0d1d(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { -+ func.func public @kernel_0d1d(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - %cst = arith.constant dense<128> : tensor<128x1xi32, #src> - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32, #triton_gpu.slice<{dim = 1, parent = #src}>> - %1 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32, #triton_gpu.slice<{dim = 0, parent = #src}>> -diff --git a/python/triton/compiler.py b/python/triton/compiler.py -index 5d167634df..c36589037c 100644 ---- a/python/triton/compiler.py -+++ b/python/triton/compiler.py -@@ -1514,14 +1514,14 @@ def make_hash(fn, **kwargs): - return hashlib.md5((Path(fn).read_text() + triton.runtime.jit.version_key()).encode("utf-8")).hexdigest() - - --# - ^\s*func\s+ : match the start of the string, any leading whitespace, the keyword func, -+# - ^\s*func\.func\s+ : match the start of the string, any leading whitespace, the keyword func, - # and any following whitespace - # - (public\s+)? : optionally match the keyword public and any following whitespace - # - (@\w+) : match an @ symbol followed by one or more word characters - # (letters, digits, or underscores), and capture it as group 1 (the function name) - # - (\((?:%\w+: \S+(?: \{\S+ = \S+ : \S+\})?(?:, )?)*\)) : match a pair of parentheses enclosing - # zero or more arguments separated by commas, and capture it as group 2 (the argument list) --mlir_prototype_pattern = r'^\s*func\s+(?:public\s+)?(@\w+)(\((?:%\w+: \S+(?: \{\S+ = \S+ : \S+\})?(?:, )?)*\))\s*\{\s*$' -+mlir_prototype_pattern = r'^\s*func\.func\s+(?:public\s+)?(@\w+)(\((?:%\w+: \S+(?: \{\S+ = \S+ : \S+\})?(?:, )?)*\))\s*\{\s*$' - ptx_prototype_pattern = r"\.(?:visible|extern)\s+\.(?:entry|func)\s+(\w+)\s*\(([^)]*)\)" - prototype_pattern = { - "ttir": mlir_prototype_pattern, -diff --git a/test/Analysis/test-alias.mlir b/test/Analysis/test-alias.mlir -index b3d5673f85..bb21615e68 100644 ---- a/test/Analysis/test-alias.mlir -+++ b/test/Analysis/test-alias.mlir -@@ -11,7 +11,7 @@ - - // CHECK-LABEL: matmul_loop - // There shouldn't be any aliasing with the dot op encoding. --func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_ptr_init = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> - %b_ptr_init = tt.broadcast %B : (!tt.ptr) -> tensor<32x128x!tt.ptr, #BL> - %a_mask = arith.constant dense : tensor<128x32xi1, #AL> -@@ -36,7 +36,7 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B - } - - // CHECK-LABEL: alloc --func @alloc(%A : !tt.ptr) { -+func.func @alloc(%A : !tt.ptr) { - // CHECK: %cst -> %cst - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x32xf16, #AL> -@@ -46,7 +46,7 @@ func @alloc(%A : !tt.ptr) { - } - - // CHECK-LABEL: convert --func @convert(%A : !tt.ptr) { -+func.func @convert(%A : !tt.ptr) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> - // CHECK: %0 -> %0 - %cst1 = triton_gpu.convert_layout %cst0 : (tensor<16x16xf16, #AL>) -> tensor<16x16xf16, #A_SHARED> -@@ -54,7 +54,7 @@ func @convert(%A : !tt.ptr) { - } - - // CHECK-LABEL: trans --func @trans(%A : !tt.ptr) { -+func.func @trans(%A : !tt.ptr) { - // CHECK: %cst -> %cst - %tensor = arith.constant dense<0.000000e+00> : tensor<16x32xf16, #A_SHARED> - // CHECK: %0 -> %cst -@@ -63,7 +63,7 @@ func @trans(%A : !tt.ptr) { - } - - // CHECK-LABEL: insert_slice_async --func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { -+func.func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<16x16x!tt.ptr, #AL> - %mask = tt.splat %i1 : (i1) -> tensor<16x16xi1, #AL> - %other = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> -@@ -76,7 +76,7 @@ func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - } - - // CHECK-LABEL: insert_slice --func @insert_slice(%A : !tt.ptr, %i1 : i1) { -+func.func @insert_slice(%A : !tt.ptr, %i1 : i1) { - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<16x16x!tt.ptr, #AL> - %mask = tt.splat %i1 : (i1) -> tensor<16x16xi1, #AL> - %other = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> -@@ -90,7 +90,7 @@ func @insert_slice(%A : !tt.ptr, %i1 : i1) { - } - - // CHECK-LABEL: extract_slice --func @extract_slice(%A : !tt.ptr) { -+func.func @extract_slice(%A : !tt.ptr) { - // CHECK: %cst -> %cst - %cst0 = arith.constant dense<0.000000e+00> : tensor<1x16x16xf16, #A_SHARED> - %index = arith.constant 0 : index -@@ -100,7 +100,7 @@ func @extract_slice(%A : !tt.ptr) { - } - - // CHECK-LABEL: if_cat --func @if_cat(%i1 : i1) { -+func.func @if_cat(%i1 : i1) { - // CHECK: %cst -> %cst - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK: %cst_0 -> %cst_0 -@@ -119,7 +119,7 @@ func @if_cat(%i1 : i1) { - } - - // CHECK-LABEL: if_alias --func @if_alias(%i1 : i1) { -+func.func @if_alias(%i1 : i1) { - // CHECK: %cst -> %cst - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK-NEXT: %cst_0 -> %cst_0 -@@ -134,7 +134,7 @@ func @if_alias(%i1 : i1) { - } - - // CHECK-LABEL: for --func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - // CHECK: %cst -> %cst - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: %cst_0 -> %cst_0 -@@ -154,7 +154,7 @@ func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.p - } - - // CHECK-LABEL: for_if --func @for_if(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { -+func.func @for_if(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { - // CHECK: %cst -> %cst - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: %cst_0 -> %cst_0 -@@ -180,7 +180,7 @@ func @for_if(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !t - } - - // CHECK-LABEL: for_if_for --func @for_if_for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { -+func.func @for_if_for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { - // CHECK: %cst -> %cst - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: %cst_0 -> %cst_0 -diff --git a/test/Analysis/test-alignment.mlir b/test/Analysis/test-alignment.mlir -index 0ab34c7a78..af8ea6f856 100644 ---- a/test/Analysis/test-alignment.mlir -+++ b/test/Analysis/test-alignment.mlir -@@ -1,288 +1,288 @@ --// RUN: triton-opt %s -test-print-alignment -split-input-file 2>&1 | FileCheck %s -+// RUN: triton-opt %s -test-print-alignment -split-input-file -o %t 2>&1 | FileCheck %s - --// CHECK-LABEL: cast --func @cast() { -- // CHECK: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [1] -+// CHECK-LABEL: @cast -+func.func @cast() { -+ // CHECK: contiguity = [1], divisibility = [1], constancy = [1], constant_value = 1 - %cst = arith.constant 1 : i32 -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = 1 - %0 = arith.extsi %cst : i32 to i64 -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %cst_tensor = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = tt.bitcast %cst_tensor : tensor<128xi32> -> tensor<128xi64> - return - } - - // ----- - --// CHECK-LABEL: add --func @add() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @add -+func.func @add() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1], constancy = [1], constant_value = - %2 = arith.addi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [127] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 127 - %3 = arith.constant dense<127> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = 128 - %4 = arith.addi %1, %3 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: sub --func @sub() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @sub -+func.func @sub() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1], constancy = [1], constant_value = - %2 = arith.subi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [129] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 129 - %3 = arith.constant dense<129> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = 128 - %4 = arith.subi %3, %1 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: mul --func @mul() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @mul -+func.func @mul() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %2 = arith.muli %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = 128 - %3 = arith.constant dense<128> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = 128 - %4 = arith.muli %3, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [2] ; Constancy: [128] ; ConstantValue: [2] -+ // CHECK-NEXT: contiguity = [1], divisibility = [2], constancy = [128], constant_value = 2 - %5 = arith.constant dense<2> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [256] ; Constancy: [128] ; ConstantValue: [256] -+ // CHECK-NEXT: contiguity = [1], divisibility = [256], constancy = [128], constant_value = 256 - %6 = arith.muli %4, %5 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: div --func @div() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @div -+func.func @div() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %2 = arith.divsi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %3 = arith.divui %1, %0 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [64] ; Constancy: [128] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1], divisibility = [64], constancy = [128], constant_value = 64 - %4 = arith.constant dense<64> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16777216] ; Constancy: [64] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16777216], constancy = [64], constant_value = - %5 = arith.divsi %0, %4 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %6 = arith.divsi %4, %0 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [64] ; Constancy: [128] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1], divisibility = [64], constancy = [128], constant_value = 64 - %7 = arith.divsi %4, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [2] ; Constancy: [128] ; ConstantValue: [66] -+ // CHECK-NEXT: contiguity = [1], divisibility = [2], constancy = [128], constant_value = 66 - %8 = arith.constant dense<66> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [2] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [2], constant_value = - %9 = arith.divui %0, %8 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [8192] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [8192], constancy = [1], constant_value = - %10 = tt.make_range {end = 8320 : i32, start = 8192 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [64] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [64], constant_value = - %11 = arith.divsi %10, %4 : tensor<128xi32> -- return -+ return - } - - // ----- - --// CHECK-LABEL: rem --func @rem() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @rem -+func.func @rem() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 1 - %1 = arith.constant dense<1> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [128] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0 - %2 = arith.remsi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %3 = arith.remui %1, %0 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [64] ; Constancy: [128] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1], divisibility = [64], constancy = [128], constant_value = 64 - %4 = arith.constant dense<64> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [64] ; Divisibility: [64] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [64], divisibility = [64], constancy = [1], constant_value = - %5 = arith.remsi %0, %4 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [64] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [64], constancy = [1], constant_value = - %6 = arith.remsi %4, %0 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [2] ; Constancy: [128] ; ConstantValue: [66] -+ // CHECK-NEXT: contiguity = [1], divisibility = [2], constancy = [128], constant_value = 66 - %7 = arith.constant dense<66> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [2] ; Divisibility: [2] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [2], divisibility = [2], constancy = [1], constant_value = - %8 = arith.remui %0, %7 : tensor<128xi32> -- return -+ return - } - - // ----- - --// CHECK-LABEL: broadcast --func @broadcast() { -- // CHECK: Contiguity: [1] ; Divisibility: [64] ; Constancy: [128] ; ConstantValue: [64] -+// CHECK-LABEL: @broadcast -+func.func @broadcast() { -+ // CHECK: contiguity = [1], divisibility = [64], constancy = [128], constant_value = 64 - %0 = arith.constant dense<64> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [64, 1] ; Constancy: [128, 1] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [64, 1], constancy = [128, 1], constant_value = 64 - %1 = tt.expand_dims %0 {axis = 1 : i32} : (tensor<128xi32>) -> tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [64, 1] ; Constancy: [128, 128] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [64, 1], constancy = [128, 128], constant_value = 64 - %2 = tt.broadcast %1 : (tensor<128x1xi32>) -> tensor<128x128xi32> - return - } - - // ----- - --// CHECK-LABEL: splat --func @splat(%arg0: !tt.ptr {tt.divisibility = 16 : i32}) { -- // CHECK: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [128, 128] ; ConstantValue: [None] -+// CHECK-LABEL: @splat -+func.func @splat(%arg0: !tt.ptr {tt.divisibility = 16 : i32}) { -+ // CHECK: contiguity = [1, 1], divisibility = [16, 16], constancy = [128, 128], constant_value = - %0 = tt.splat %arg0 : (!tt.ptr) -> tensor<128x128x!tt.ptr> - return - } - - // ----- - --// CHECK-LABEL: cmp --func @cmp() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @cmp -+func.func @cmp() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [128] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0 - %1 = arith.constant dense<0> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %2 = arith.cmpi eq, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %3 = arith.cmpi slt, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %4 = arith.cmpi sle, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %5 = arith.cmpi sge, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [8] ; Constancy: [128] ; ConstantValue: [8] -+ // CHECK-NEXT: contiguity = [1], divisibility = [8], constancy = [128], constant_value = 8 - %6 = arith.constant dense<8> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [8] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [8], constant_value = - %7 = arith.cmpi sgt, %0, %6 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = 0 - %8 = arith.cmpi sgt, %1, %6 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: logic --func @logic() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @logic -+func.func @logic() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [64] ; Constancy: [128] ; ConstantValue: [64] -+ // CHECK-NEXT: contiguity = [1], divisibility = [64], constancy = [128], constant_value = 64 - %1 = arith.constant dense<64> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16777216] ; Constancy: [64] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16777216], constancy = [64], constant_value = - %2 = arith.divsi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [8] ; Constancy: [128] ; ConstantValue: [8] -+ // CHECK-NEXT: contiguity = [1], divisibility = [8], constancy = [128], constant_value = 8 - %3 = arith.constant dense<8> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [134217728] ; Constancy: [8] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [134217728], constancy = [8], constant_value = - %4 = arith.divsi %0, %3 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %5 = arith.andi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %6 = arith.ori %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %7 = arith.xori %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [8] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [8], constant_value = - %8 = arith.andi %2, %4 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [8] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [8], constant_value = - %9 = arith.ori %2, %4 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [8] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [8], constant_value = - %10 = arith.xori %2, %4 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: select --func @select() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @select -+func.func @select() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [128] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0 - %1 = arith.constant dense<0> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %2 = arith.cmpi eq, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %3 = arith.cmpi slt, %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [1] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [1], constant_value = 0 - %4 = arith.constant 0 : i1 -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [128] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0 - %7 = tt.splat %4 : (i1) -> tensor<128xi1> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [128] ; ConstantValue: [0] -- %5 = select %4, %3, %7 : tensor<128xi1> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0 -+ %5 = arith.select %4, %3, %7 : tensor<128xi1> -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = - %8 = "triton_gpu.select"(%7, %3, %2) : (tensor<128xi1>, tensor<128xi1>, tensor<128xi1>) -> tensor<128xi1> - return - } - - // ----- - --func @shift() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+func.func @shift() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [8] ; Constancy: [128] ; ConstantValue: [8] -+ // CHECK-NEXT: contiguity = [1], divisibility = [8], constancy = [128], constant_value = 8 - %1 = arith.constant dense<8> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4] ; Constancy: [128] ; ConstantValue: [4] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4], constancy = [128], constant_value = 4 - %2 = arith.constant dense<4> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [274877906944] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [274877906944], constancy = [1], constant_value = - %3 = arith.shli %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [67108864] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [67108864], constancy = [1], constant_value = - %4 = arith.shrsi %0, %2 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = 128 - %5 = arith.shli %1, %2 : tensor<128xi32> - return - } - - // ----- - --func @max_min() { -- // CHECK: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+func.func @max_min() { -+ // CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [64] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [64], constancy = [1], constant_value = - %1 = tt.make_range {end = 192 : i32, start = 64 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %2 = arith.maxsi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %3 = arith.minsi %0, %1 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [8] ; Constancy: [128] ; ConstantValue: [8] -+ // CHECK-NEXT: contiguity = [1], divisibility = [8], constancy = [128], constant_value = 8 - %4 = arith.constant dense<8> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4] ; Constancy: [128] ; ConstantValue: [4] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4], constancy = [128], constant_value = 4 - %5 = arith.constant dense<4> : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [8] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = 8 - %6 = arith.maxsi %4, %5 : tensor<128xi32> - return - } - - // ----- - --// CHECK-LABEL: for --func @for() { -- // CHECK: Contiguity: [1, 1] ; Divisibility: [4611686018427387904, 4611686018427387904] ; Constancy: [128, 32] ; ConstantValue: [0] -+// CHECK-LABEL: @for -+func.func @for() { -+ // CHECK: contiguity = [1, 1], divisibility = [4611686018427387904, 4611686018427387904], constancy = [128, 32], constant_value = 0 - %a_init = arith.constant dense<0> : tensor<128x32xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [128, 32] ; ConstantValue: [1] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 32], constant_value = 1 - %b_init = arith.constant dense<1> : tensor<128x32xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [4, 4] ; Constancy: [128, 32] ; ConstantValue: [4] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [4, 4], constancy = [128, 32], constant_value = 4 - %c_init = arith.constant dense<4> : tensor<128x32xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [1] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [1], constant_value = 128 - %ub = arith.constant 128 : index -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [4611686018427387904] ; Constancy: [1] ; ConstantValue: [0] -+ // CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [1], constant_value = 0 - %lb = arith.constant 0 : index -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16] ; Constancy: [1] ; ConstantValue: [16] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16], constancy = [1], constant_value = 16 - %step = arith.constant 16 : index - %a, %b, %c = scf.for %iv = %lb to %ub step %step iter_args(%a = %a_init, %b = %b_init, %c = %c_init) -> (tensor<128x32xi32>, tensor<128x32xi32>, tensor<128x32xi32>) { -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16], constancy = [1], constant_value = - %t = arith.index_cast %iv : index to i32 -- // CHECK: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [128, 32] ; ConstantValue: [None] -- // CHECK: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [128, 32] ; ConstantValue: [None] -- // CHECK: Contiguity: [1, 1] ; Divisibility: [4, 4] ; Constancy: [128, 32] ; ConstantValue: [4] -+ // CHECK: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 32], constant_value = -+ // CHECK: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 32], constant_value = -+ // CHECK: contiguity = [1, 1], divisibility = [4, 4], constancy = [128, 32], constant_value = 4 - scf.yield %b, %a, %c : tensor<128x32xi32>, tensor<128x32xi32>, tensor<128x32xi32> - } - return -@@ -290,53 +290,53 @@ func @for() { - - // ----- - --// CHECK-LABEL: permute_2d --func @permute_2d(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32 {tt.divisibility = 16 : i32}) { -- // CHECK: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [128, 128] ; ConstantValue: [1] -+// CHECK-LABEL: @permute_2d -+func.func @permute_2d(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32 {tt.divisibility = 16 : i32}) { -+ // CHECK: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 128], constant_value = 1 - %cst = arith.constant dense : tensor<128x128xi1> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [1, 1], constant_value = - %cst_0 = arith.constant dense<0.000000e+00> : tensor<128x128xf32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %1 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128, 1] ; Divisibility: [1073741824, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128, 1], divisibility = [1073741824, 1], constancy = [1, 1], constant_value = - %2 = tt.expand_dims %0 {axis = 1 : i32} : (tensor<128xi32>) -> tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [128, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [128, 1], constant_value = - %3 = tt.splat %arg1 : (i32) -> tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [17179869184, 16] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [17179869184, 16], constancy = [1, 1], constant_value = - %4 = arith.muli %2, %3 : tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [128, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [128, 1], constant_value = - %5 = tt.splat %arg0 : (!tt.ptr) -> tensor<128x1x!tt.ptr> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [1, 1], constant_value = - %6 = tt.addptr %5, %4 : tensor<128x1x!tt.ptr>, tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 128] ; Divisibility: [1, 1073741824] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 128], divisibility = [1, 1073741824], constancy = [1, 1], constant_value = - %7 = tt.expand_dims %1 {axis = 0 : i32}: (tensor<128xi32>) -> tensor<1x128xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [1, 128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [1, 128], constant_value = - %8 = tt.broadcast %6 : (tensor<128x1x!tt.ptr>) -> tensor<128x128x!tt.ptr> -- // CHECK-NEXT: Contiguity: [1, 128] ; Divisibility: [1, 1073741824] ; Constancy: [128, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 128], divisibility = [1, 1073741824], constancy = [128, 1], constant_value = - %9 = tt.broadcast %7 : (tensor<1x128xi32>) -> tensor<128x128xi32> -- // CHECK-NEXT: Contiguity: [1, 128] ; Divisibility: [1, 16] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 128], divisibility = [1, 16], constancy = [1, 1], constant_value = - %10 = tt.addptr %8, %9 : tensor<128x128x!tt.ptr>, tensor<128x128xi32> -- // CHECK-NEXT: Contiguity: [128, 1] ; Divisibility: [1073741824, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128, 1], divisibility = [1073741824, 1], constancy = [1, 1], constant_value = - %11 = tt.expand_dims %0 {axis = 1 : i32}: (tensor<128xi32>) -> tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [128, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [128, 1], constant_value = - %12 = tt.splat %arg2 : (!tt.ptr) -> tensor<128x1x!tt.ptr> -- // CHECK-NEXT: Contiguity: [128, 1] ; Divisibility: [16, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128, 1], divisibility = [16, 1], constancy = [1, 1], constant_value = - %13 = tt.addptr %12, %11 : tensor<128x1x!tt.ptr>, tensor<128x1xi32> -- // CHECK-NEXT: Contiguity: [1, 128] ; Divisibility: [1, 1073741824] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 128], divisibility = [1, 1073741824], constancy = [1, 1], constant_value = - %14 = tt.expand_dims %1 {axis = 0 : i32} : (tensor<128xi32>) -> tensor<1x128xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 16] ; Constancy: [1, 128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 16], constancy = [1, 128], constant_value = - %15 = tt.splat %arg3 : (i32) -> tensor<1x128xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 17179869184] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 17179869184], constancy = [1, 1], constant_value = - %16 = arith.muli %14, %15 : tensor<1x128xi32> -- // CHECK-NEXT: Contiguity: [128, 1] ; Divisibility: [16, 1] ; Constancy: [1, 128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128, 1], divisibility = [16, 1], constancy = [1, 128], constant_value = - %17 = tt.broadcast %13 : (tensor<128x1x!tt.ptr>) -> tensor<128x128x!tt.ptr> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [16, 17179869184] ; Constancy: [128, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [16, 17179869184], constancy = [128, 1], constant_value = - %18 = tt.broadcast %16 : (tensor<1x128xi32>) -> tensor<128x128xi32> -- // CHECK-NEXT: Contiguity: [128, 1] ; Divisibility: [16, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128, 1], divisibility = [16, 1], constancy = [1, 1], constant_value = - %19 = tt.addptr %17, %18 : tensor<128x128x!tt.ptr>, tensor<128x128xi32> -- // CHECK-NEXT: Contiguity: [1, 1] ; Divisibility: [1, 1] ; Constancy: [1, 1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [1, 1], constant_value = - %20 = tt.load %10, %cst, %cst_0 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<128x128xf32> - tt.store %19, %20, %cst : tensor<128x128xf32> - return -@@ -347,29 +347,29 @@ func @permute_2d(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {t - module { - - // This is a tiny test for verifying StoreOp-related alignment, It simply store a constant to a buffer. --// CHECK-LABEL: store_constant_align --func @store_constant_align(%addr: !tt.ptr {tt.divisibility = 16 : i32}, %n: i32 {tt.divisibility = 16 : i32}) { -- // CHECK: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+// CHECK-LABEL: @store_constant_align -+func.func @store_constant_align(%addr: !tt.ptr {tt.divisibility = 16 : i32}, %n: i32 {tt.divisibility = 16 : i32}) { -+ // CHECK: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %pid = tt.get_program_id {axis = 0 : i32} : i32 -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [1] ; ConstantValue: [128] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [1], constant_value = 128 - %c128_i32 = arith.constant 128 : i32 -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [1], constant_value = - %1 = arith.muli %pid, %c128_i32 : i32 -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [1073741824] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = - %2 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [128] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [128], constancy = [128], constant_value = - %3 = tt.splat %1 : (i32) -> tensor<128xi32> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [128] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [128], constancy = [1], constant_value = - %4 = arith.addi %3, %2 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16], constancy = [128], constant_value = - %5 = tt.splat %addr : (!tt.ptr) -> tensor<128x!tt.ptr> -- // CHECK-NEXT: Contiguity: [128] ; Divisibility: [16] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [128], divisibility = [16], constancy = [1], constant_value = - %6 = tt.addptr %5, %4 : tensor<128x!tt.ptr>, tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [16] ; Constancy: [128] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [16], constancy = [128], constant_value = - %9 = tt.splat %n : (i32) -> tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [16] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [16], constant_value = - %mask = arith.cmpi slt, %4, %9 : tensor<128xi32> -- // CHECK-NEXT: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] -+ // CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %cst = arith.constant dense<0.0> : tensor<128xf32> - tt.store %5, %cst, %mask : tensor<128xf32> - return -@@ -381,8 +381,8 @@ func @store_constant_align(%addr: !tt.ptr {tt.divisibility = 16 : i32}, %n: - - // This IR is dumped from vecadd test. - // Note, the hint {tt.divisibility = 16 : i32} for %n_elements affects the alignment of mask. --// CHECK-LABEL: vecadd_mask_align_16 --func @vecadd_mask_align_16(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32 {tt.divisibility = 16 : i32}) { -+// CHECK-LABEL: @vecadd_mask_align_16 -+func.func @vecadd_mask_align_16(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32 {tt.divisibility = 16 : i32}) { - %c64_i32 = arith.constant 64 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c64_i32 : i32 -@@ -394,13 +394,13 @@ func @vecadd_mask_align_16(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %ar - %7 = tt.splat %arg1 : (!tt.ptr) -> tensor<64x!tt.ptr> - %8 = tt.addptr %7, %4 : tensor<64x!tt.ptr>, tensor<64xi32> - %9 = tt.splat %n_elements : (i32) -> tensor<64xi32> -- // CHECK: Contiguity: [1] ; Divisibility: [1] ; Constancy: [16] ; ConstantValue: [None] ( %{{.*}} = arith.cmpi slt, %{{.*}}, %{{.*}} : tensor<64xi32> ) -+ // CHECK: arith.cmpi slt, %{{.*}} => contiguity = [1], divisibility = [1], constancy = [16], constant_value = - %mask = arith.cmpi slt, %4, %9 : tensor<64xi32> - %11 = tt.load %6, %mask {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<64xf32> - %12 = tt.load %8, %mask {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<64xf32> - %13 = arith.addf %11, %12 : tensor<64xf32> - %14 = tt.splat %arg2 : (!tt.ptr) -> tensor<64x!tt.ptr> -- // CHECK: Contiguity: [64] ; Divisibility: [16] ; Constancy: [1] ; ConstantValue: [None] ( %{{.*}} = tt.addptr %{{.*}}, %{{.*}} : tensor<64x!tt.ptr>, tensor<64xi32> ) -+ // CHECK: tt.addptr %{{.*}} => contiguity = [64], divisibility = [16], constancy = [1], constant_value = - %15 = tt.addptr %14, %4 : tensor<64x!tt.ptr>, tensor<64xi32> - tt.store %15, %13, %mask : tensor<64xf32> - return -@@ -410,8 +410,8 @@ func @vecadd_mask_align_16(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %ar - - // This IR is dumped from vecadd test. - // Note, there is no divisibility hint for %n_elements, Triton should assume its divisibility to be 1 by default. --// CHECK-LABEL: vecadd_mask_align_1 --func @vecadd_mask_align_1(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32) { -+// CHECK-LABEL: @vecadd_mask_align_1 -+func.func @vecadd_mask_align_1(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32) { - %c64_i32 = arith.constant 64 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c64_i32 : i32 -@@ -423,7 +423,7 @@ func @vecadd_mask_align_1(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg - %7 = tt.splat %arg1 : (!tt.ptr) -> tensor<64x!tt.ptr> - %8 = tt.addptr %7, %4 : tensor<64x!tt.ptr>, tensor<64xi32> - %9 = tt.splat %n_elements : (i32) -> tensor<64xi32> -- // CHECK: Contiguity: [1] ; Divisibility: [1] ; Constancy: [1] ; ConstantValue: [None] ( %{{.*}} = arith.cmpi slt, %{{.*}}, %{{.*}} : tensor<64xi32> ) -+ // CHECK: arith.cmpi slt, %{{.*}} => contiguity = [1], divisibility = [1], constancy = [1], constant_value = - %10 = arith.cmpi slt, %4, %9 : tensor<64xi32> - %11 = tt.load %6, %10 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<64xf32> - %12 = tt.load %8, %10 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<64xf32> -diff --git a/test/Analysis/test-allocation.mlir b/test/Analysis/test-allocation.mlir -index efb00c404d..f79222aa7b 100644 ---- a/test/Analysis/test-allocation.mlir -+++ b/test/Analysis/test-allocation.mlir -@@ -13,7 +13,7 @@ - module attributes {"triton_gpu.num-warps" = 4 : i32} { - - // CHECK-LABEL: matmul_loop --func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_ptr_init = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> - %b_ptr_init = tt.broadcast %B : (!tt.ptr) -> tensor<32x128x!tt.ptr, #BL> - -@@ -46,7 +46,7 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B - - // Shared memory is available after a tensor's liveness range ends - // CHECK-LABEL: reusable --func @reusable(%A : !tt.ptr) { -+func.func @reusable(%A : !tt.ptr) { - %cst1 = arith.constant dense : tensor<128x32xi1, #AL> - %cst2 = arith.constant dense<0.000000e+00> : tensor<128x32xf16, #AL> - %cst3 = arith.constant dense : tensor<32x128xi1, #AL> -@@ -78,7 +78,7 @@ func @reusable(%A : !tt.ptr) { - // %cst1->%cst4 - // %cst3->%g->%h->%i - // CHECK-LABEL: preallocate --func @preallocate(%A : !tt.ptr) { -+func.func @preallocate(%A : !tt.ptr) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK-NEXT: offset = 1024, size = 512 -@@ -113,7 +113,7 @@ func @preallocate(%A : !tt.ptr) { - - // Unused tensors are immediately released - // CHECK-LABEL: unused --func @unused(%A : !tt.ptr) { -+func.func @unused(%A : !tt.ptr) { - // CHECK: offset = 0, size = 1024 - %cst0 = arith.constant dense<0.000000e+00> : tensor<32x16xf16, #A_SHARED> - // CHECK-NEXT: offset = 0, size = 512 -@@ -128,7 +128,7 @@ func @unused(%A : !tt.ptr) { - - // cst0 is alive through the entire function, it cannot be released before the end of the function - // CHECK-LABEL: longlive --func @longlive(%A : !tt.ptr) { -+func.func @longlive(%A : !tt.ptr) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK-NEXT: offset = 512, size = 512 -@@ -156,7 +156,7 @@ func @longlive(%A : !tt.ptr) { - } - - // CHECK-LABEL: alloc --func @alloc(%A : !tt.ptr) { -+func.func @alloc(%A : !tt.ptr) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x32xf16, #AL> -@@ -167,7 +167,7 @@ func @alloc(%A : !tt.ptr) { - } - - // CHECK-LABEL: scratch --func @scratch() { -+func.func @scratch() { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> - // CHECK: scratch offset = 0, size = 512 - %b = tt.reduce %cst0 {redOp = 1 : i32, axis = 0 : i32} : tensor<16x16xf16, #AL> -> tensor<16xf16, #sliceAd0> -@@ -176,7 +176,7 @@ func @scratch() { - } - - // CHECK-LABEL: trans --func @trans(%A : !tt.ptr) { -+func.func @trans(%A : !tt.ptr) { - // CHECK: offset = 0, size = 1024 - %tensor = arith.constant dense<0.000000e+00> : tensor<16x32xf16, #A_SHARED> - %b = tt.trans %tensor : (tensor<16x32xf16, #A_SHARED>) -> tensor<32x16xf16, #A_SHARED_T> -@@ -184,7 +184,7 @@ func @trans(%A : !tt.ptr) { - } - - // CHECK-LABEL: insert_slice_async --func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { -+func.func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<16x16x!tt.ptr, #AL> - %mask = tt.splat %i1 : (i1) -> tensor<16x16xi1, #AL> - %other = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> -@@ -197,7 +197,7 @@ func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - } - - // CHECK-LABEL: extract_slice --func @extract_slice(%A : !tt.ptr) { -+func.func @extract_slice(%A : !tt.ptr) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<1x16x16xf16, #A_SHARED> - %index = arith.constant 0 : index -@@ -209,7 +209,7 @@ func @extract_slice(%A : !tt.ptr) { - // B0 -> (B1) -> B0 - // Memory used by B1 can be reused by B0. - // CHECK-LABEL: if --func @if(%i1 : i1) { -+func.func @if(%i1 : i1) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK-NEXT: offset = 512, size = 512 -@@ -233,7 +233,7 @@ func @if(%i1 : i1) { - // B0 -> (B1) -> (B2) -> B0 - // Memory used by B0 cannot be reused by B1 or B2. - // CHECK-LABEL: if_else --func @if_else(%i1 : i1) { -+func.func @if_else(%i1 : i1) { - // CHECK: offset = 0, size = 512 - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK-NEXT: offset = 512, size = 512 -@@ -260,7 +260,7 @@ func @if_else(%i1 : i1) { - // Block arguments and yields are memory aliases that do not trigger a new - // allocation. - // CHECK-LABEL: for --func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - // CHECK: offset = 0, size = 8192 - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: offset = 8192, size = 8192 -@@ -275,7 +275,7 @@ func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.p - } - - // CHECK-LABEL: for_if_slice --func @for_if_slice(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { -+func.func @for_if_slice(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { - // CHECK: offset = 0, size = 8192 - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: offset = 8192, size = 8192 -@@ -296,7 +296,7 @@ func @for_if_slice(%lb : index, %ub : index, %step : index, %A : !tt.ptr, % - - // c0 cannot be released in the loop - // CHECK-LABEL: for_use_ancestor --func @for_use_ancestor(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { -+func.func @for_use_ancestor(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { - // CHECK: offset = 0, size = 8192 - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: offset = 8192, size = 8192 -@@ -316,7 +316,7 @@ func @for_use_ancestor(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { -+func.func @for_if_for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr, %i1 : i1) { - // CHECK: offset = 0, size = 8192 - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: offset = 8192, size = 8192 -diff --git a/test/Analysis/test-membar.mlir b/test/Analysis/test-membar.mlir -index 7199e5f53d..17880b2094 100644 ---- a/test/Analysis/test-membar.mlir -+++ b/test/Analysis/test-membar.mlir -@@ -14,7 +14,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - - // CHECK-LABEL: matmul_loop - // There shouldn't be any membar with the dot op encoding. --func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_ptr_init = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> - %b_ptr_init = tt.broadcast %B : (!tt.ptr) -> tensor<32x128x!tt.ptr, #BL> - -@@ -42,7 +42,7 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B - } - - // CHECK-LABEL: raw_single_block --func @raw_single_block(%A : !tt.ptr) { -+func.func @raw_single_block(%A : !tt.ptr) { - %cst1 = arith.constant dense : tensor<128x32xi1, #AL> - %cst2 = arith.constant dense<0.000000e+00> : tensor<128x32xf16, #AL> - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> -@@ -54,7 +54,7 @@ func @raw_single_block(%A : !tt.ptr) { - } - - // CHECK-LABEL: war_single_block --func @war_single_block(%A : !tt.ptr) { -+func.func @war_single_block(%A : !tt.ptr) { - %cst1 = arith.constant dense : tensor<128x32xi1, #AL> - %cst2 = arith.constant dense<0.000000e+00> : tensor<128x32xf16, #AL> - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> -@@ -70,7 +70,7 @@ func @war_single_block(%A : !tt.ptr) { - } - - // CHECK-LABEL: scratch --func @scratch() { -+func.func @scratch() { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK: Membar 1 - %a = tt.cat %cst0, %cst0 {axis = 0} : (tensor<16x16xf16, #A_SHARED>, tensor<16x16xf16, #A_SHARED>) -> tensor<32x16xf16, #A_SHARED> -@@ -81,7 +81,7 @@ func @scratch() { - } - - // CHECK-LABEL: async_wait --func @async_wait() { -+func.func @async_wait() { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - // CHECK: Membar 1 - %a = tt.cat %cst0, %cst0 {axis = 0} : (tensor<16x16xf16, #A_SHARED>, tensor<16x16xf16, #A_SHARED>) -> tensor<32x16xf16, #A_SHARED> -@@ -92,7 +92,7 @@ func @async_wait() { - } - - // CHECK-LABEL: alloc --func @alloc() { -+func.func @alloc() { - %cst0 = triton_gpu.alloc_tensor : tensor<16x16xf16, #A_SHARED> - %a = tt.cat %cst0, %cst0 {axis = 0} : (tensor<16x16xf16, #A_SHARED>, tensor<16x16xf16, #A_SHARED>) -> tensor<32x16xf16, #A_SHARED> - // CHECK: Membar 2 -@@ -101,7 +101,7 @@ func @alloc() { - } - - // CHECK-LABEL: extract_slice --func @extract_slice() { -+func.func @extract_slice() { - %cst0 = arith.constant dense<0.000000e+00> : tensor<1x16x16xf16, #A_SHARED> - %index = arith.constant 0 : index - %cst1 = tensor.extract_slice %cst0[%index, 0, 0][1, 16, 16][1, 1, 1] : tensor<1x16x16xf16, #A_SHARED> to tensor<16x16xf16, #A_SHARED> -@@ -113,14 +113,14 @@ func @extract_slice() { - } - - // CHECK-LABEL: trans --func @trans() { -+func.func @trans() { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x32xf16, #A_SHARED> - %b = tt.trans %cst0 : (tensor<16x32xf16, #A_SHARED>) -> tensor<32x16xf16, #A_SHARED_T> - return - } - - // CHECK-LABEL: insert_slice_async --func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { -+func.func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<16x16x!tt.ptr, #AL> - %mask = tt.splat %i1 : (i1) -> tensor<16x16xi1, #AL> - %other = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> -@@ -135,7 +135,7 @@ func @insert_slice_async(%A : !tt.ptr, %i1 : i1) { - } - - // CHECK-LABEL: insert_slice --func @insert_slice(%A : !tt.ptr, %i1 : i1) { -+func.func @insert_slice(%A : !tt.ptr, %i1 : i1) { - %a_ptr = tt.broadcast %A : (!tt.ptr) -> tensor<16x16x!tt.ptr, #AL> - %mask = tt.splat %i1 : (i1) -> tensor<16x16xi1, #AL> - %other = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #AL> -@@ -153,7 +153,7 @@ func @insert_slice(%A : !tt.ptr, %i1 : i1) { - - // If branch inserted a barrier for %cst0 and %cst1, but else didn't, then the barrier should be inserted in the parent region - // CHECK-LABEL: multi_blocks --func @multi_blocks(%i1 : i1) { -+func.func @multi_blocks(%i1 : i1) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - scf.if %i1 { -@@ -174,7 +174,7 @@ func @multi_blocks(%i1 : i1) { - - // Both branches inserted a barrier for %cst0 and %cst1, then the barrier doesn't need to be inserted in the parent region - // CHECK-LABEL: multi_blocks_join_barrier --func @multi_blocks_join_barrier(%i1 : i1) { -+func.func @multi_blocks_join_barrier(%i1 : i1) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - scf.if %i1 { -@@ -192,7 +192,7 @@ func @multi_blocks_join_barrier(%i1 : i1) { - - // Read yielded tensor requires a barrier - // CHECK-LABEL: multi_blocks_yield --func @multi_blocks_yield(%i1 : i1) { -+func.func @multi_blocks_yield(%i1 : i1) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %a = scf.if %i1 -> (tensor<32x16xf16, #A_SHARED>) { -@@ -212,7 +212,7 @@ func @multi_blocks_yield(%i1 : i1) { - - // Conservatively add a barrier as if the branch (%i1) is never taken - // CHECK-LABEL: multi_blocks_noelse --func @multi_blocks_noelse(%i1 : i1) { -+func.func @multi_blocks_noelse(%i1 : i1) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - scf.if %i1 { -@@ -226,7 +226,7 @@ func @multi_blocks_noelse(%i1 : i1) { - - // Conservatively add a barrier as if the branch (%i2) is never taken - // CHECK-LABEL: multi_blocks_nested_scf --func @multi_blocks_nested_scf(%i1 : i1, %i2 : i1) { -+func.func @multi_blocks_nested_scf(%i1 : i1, %i2 : i1) { - %cst0 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - %cst1 = arith.constant dense<0.000000e+00> : tensor<16x16xf16, #A_SHARED> - scf.if %i1 { -@@ -247,7 +247,7 @@ func @multi_blocks_nested_scf(%i1 : i1, %i2 : i1) { - } - - // CHECK-LABEL: for --func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - %b_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - %c_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> -@@ -262,7 +262,7 @@ func @for(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.p - // Although a_shared and b_shared are synced before entering the loop, - // they are reassociated with aliases (c_shared) and thus require a barrier. - // CHECK-LABEL: for_alias --func @for_alias(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for_alias(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - %b_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: Membar 2 -@@ -282,7 +282,7 @@ func @for_alias(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : - // Although cst2 is not an argument of scf.yield, its memory is reused by cst1. - // So we need a barrier both before and after cst1 - // CHECK-LABEL: for_reuse --func @for_reuse(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for_reuse(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - %b_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: Membar 2 -@@ -302,7 +302,7 @@ func @for_reuse(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : - - - // CHECK-LABEL: for_reuse_nested --func @for_reuse_nested(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @for_reuse_nested(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - %b_shared_init = arith.constant dense<0.00e+00> : tensor<128x32xf16, #A_SHARED> - // CHECK-NEXT: Membar 2 -diff --git a/test/Conversion/triton_ops.mlir b/test/Conversion/triton_ops.mlir -index e9ee502435..0e979b148d 100644 ---- a/test/Conversion/triton_ops.mlir -+++ b/test/Conversion/triton_ops.mlir -@@ -1,6 +1,6 @@ - // RUN: triton-opt %s | FileCheck %s - --func @cast_ops(%scalar_ptr: !tt.ptr, %scalar_f32: f32, %scalar_i64: i64) { -+func.func @cast_ops(%scalar_ptr: !tt.ptr, %scalar_f32: f32, %scalar_i64: i64) { - // scalar -> scalar - // CHECK: i64 -> !tt.ptr - %0 = tt.int_to_ptr %scalar_i64 : i64 -> !tt.ptr -@@ -35,7 +35,7 @@ func @cast_ops(%scalar_ptr: !tt.ptr, %scalar_f32: f32, %scalar_i64: i64) { - return - } - --func @addptr_ops(%scalar_ptr: !tt.ptr, %scalar_i32: i32) { -+func.func @addptr_ops(%scalar_ptr: !tt.ptr, %scalar_i32: i32) { - // scalar -> scalar - // CHECK: !tt.ptr - %0 = tt.addptr %scalar_ptr, %scalar_i32 : !tt.ptr, i32 -@@ -54,7 +54,7 @@ func @addptr_ops(%scalar_ptr: !tt.ptr, %scalar_i32: i32) { - return - } - --func @load_store_ops_scalar(%ptr: !tt.ptr {tt.divisibility = 16 : i32}, %mask : i1) { -+func.func @load_store_ops_scalar(%ptr: !tt.ptr {tt.divisibility = 16 : i32}, %mask : i1) { - // Test if Load/Store ops can handle scalar values - %other = arith.constant 0.0e+0 : f32 - -@@ -76,7 +76,7 @@ func @load_store_ops_scalar(%ptr: !tt.ptr {tt.divisibility = 16 : i32}, %ma - return - } - --func @reduce_ops_infer(%ptr: !tt.ptr, %v : tensor<1x2x4xf32>) { -+func.func @reduce_ops_infer(%ptr: !tt.ptr, %v : tensor<1x2x4xf32>) { - // Test if reduce ops infer types correctly - - // CHECK: %{{.*}} = tt.reduce %{{.*}} -> tensor<2x4xf32> -@@ -101,7 +101,7 @@ func @reduce_ops_infer(%ptr: !tt.ptr, %v : tensor<1x2x4xf32>) { - return - } - --func @dot_ops_infer(%ptr: !tt.ptr, %v : f32) { -+func.func @dot_ops_infer(%ptr: !tt.ptr, %v : f32) { - // Test if reduce ops infer types correctly - %v128x32 = tt.splat %v : (f32) -> tensor<128x32xf32> - %v32x128 = tt.splat %v : (f32) -> tensor<32x128xf32> -diff --git a/test/Conversion/triton_to_tritongpu.mlir b/test/Conversion/triton_to_tritongpu.mlir -index a160bc8815..b461ca542f 100644 ---- a/test/Conversion/triton_to_tritongpu.mlir -+++ b/test/Conversion/triton_to_tritongpu.mlir -@@ -1,6 +1,6 @@ - // RUN: triton-opt %s -split-input-file -convert-triton-to-tritongpu=num-warps=2 | FileCheck %s - --func @ops() { -+func.func @ops() { - // CHECK: module attributes {"triton_gpu.num-warps" = 2 : i32} {{.*}} - %a = arith.constant dense<1.00e+00> : tensor<128x32xf16> - %b = arith.constant dense<2.00e+00> : tensor<32x128xf16> -@@ -11,7 +11,7 @@ func @ops() { - - // ----- - --func @load_ops(%ptr: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @load_ops(%ptr: !tt.ptr {tt.divisibility = 16 : i32}) { - // Test if LoadOp is lowered properly (see #771) - %ptrs = tt.splat %ptr : (!tt.ptr) -> tensor<128x!tt.ptr> - %mask = arith.constant dense : tensor<128xi1> -@@ -30,7 +30,7 @@ func @load_ops(%ptr: !tt.ptr {tt.divisibility = 16 : i32}) { - - // ----- - --func @reduce_ops(%ptr: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @reduce_ops(%ptr: !tt.ptr {tt.divisibility = 16 : i32}) { - // Test if the total number of threadsPerWarp is 32 - // Test if the total number of warps is 2 - // CHECK: #blocked0 = #triton_gpu.blocked<{sizePerThread = [1, 1], threadsPerWarp = [4, 8], warpsPerCTA = [1, 2], order = [0, 1]}> -diff --git a/test/Conversion/tritongpu_to_llvm.mlir b/test/Conversion/tritongpu_to_llvm.mlir -index e9e7d5a340..507b362c99 100644 ---- a/test/Conversion/tritongpu_to_llvm.mlir -+++ b/test/Conversion/tritongpu_to_llvm.mlir -@@ -4,7 +4,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK: llvm.func @test_empty_kernel(%arg0: i32, %arg1: !llvm.ptr) - // Here the 128 comes from the 4 in module attribute multiples 32 - // CHECK: attributes {nvvm.kernel = 1 : ui1, nvvm.maxntid = 128 : i32} {{.*}} -- func @test_empty_kernel(%lb : index, %A : !tt.ptr) { -+ func.func @test_empty_kernel(%lb : index, %A : !tt.ptr) { - // CHECK: llvm.return - return - } -@@ -15,7 +15,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_load -- func @basic_load(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf32, #blocked0>) { -+ func.func @basic_load(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf32, #blocked0>) { - // CHECK: llvm.inline_asm - // CHECK: llvm.inline_asm - %1 = tt.load %a_ptr_init, %cst, %cst_0 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<256xf32, #blocked0> -@@ -28,7 +28,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [2], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: vectorized_load -- func @vectorized_load(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf32, #blocked0>) { -+ func.func @vectorized_load(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf32, #blocked0>) { - // CHECK: llvm.inline_asm - // CHECK-SAME: ld.global.b32 - // CHECK: llvm.inline_asm -@@ -43,7 +43,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [8], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: vectorized_load_f16 -- func @vectorized_load_f16(%a_ptr_init: tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf16, #blocked0>) { -+ func.func @vectorized_load_f16(%a_ptr_init: tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>, %cst_0 : tensor<256xf16, #blocked0>) { - // CHECK: llvm.inline_asm - // CHECK-SAME: ld.global.b16 - // CHECK: llvm.inline_asm -@@ -59,7 +59,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [8], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: masked_load_const_other -- func @masked_load_const_other(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>) { -+ func.func @masked_load_const_other(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>) { - %cst_0 = arith.constant dense<0.000000e+00> : tensor<256xf32, #blocked0> - %1 = tt.load %a_ptr_init, %cst, %cst_0 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<256xf32, #blocked0> - return -@@ -72,7 +72,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [4], threadsPerWarp = [32], warpsPerCTA = [8], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: masked_load_const_other_vec -- func @masked_load_const_other_vec(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>) { -+ func.func @masked_load_const_other_vec(%a_ptr_init : tensor<256x!tt.ptr, #blocked0>, %cst : tensor<256xi1, #blocked0>) { - %cst_0 = arith.constant dense<0.000000e+00> : tensor<256xf32, #blocked0> - %1 = tt.load %a_ptr_init, %cst, %cst_0 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<256xf32, #blocked0> - return -@@ -84,7 +84,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [2], order = [0]}> - module attributes {"triton_gpu.num-warps" = 2 : i32} { - // CHECK-LABEL: global_load_store_no_vec -- func @global_load_store_no_vec(%arg0: !tt.ptr {tt.divisibility = 4 : i32}, %arg1: !tt.ptr {tt.divisibility = 4 : i32}, %arg2: !tt.ptr {tt.divisibility = 4 : i32}, %arg3: i32) { -+ func.func @global_load_store_no_vec(%arg0: !tt.ptr {tt.divisibility = 4 : i32}, %arg1: !tt.ptr {tt.divisibility = 4 : i32}, %arg2: !tt.ptr {tt.divisibility = 4 : i32}, %arg3: i32) { - %c256_i32 = arith.constant 256 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c256_i32 : i32 -@@ -128,7 +128,7 @@ module attributes {"triton_gpu.num-warps" = 2 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [4], threadsPerWarp = [32], warpsPerCTA = [2], order = [0]}> - module attributes {"triton_gpu.num-warps" = 2 : i32} { - // CHECK-LABEL: global_load_store_vec4 -- func @global_load_store_vec4(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { -+ func.func @global_load_store_vec4(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { - %c256_i32 = arith.constant 256 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c256_i32 : i32 -@@ -165,7 +165,7 @@ module attributes {"triton_gpu.num-warps" = 2 : i32} { - #blocked = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [2], order = [0]}> - // Note, the %n_elements doesn't have a "tt.divisibility" hint, so Triton assumes it's divisibility is 1, this should effect the mask's alignment and further restrict the load/store ops' vector width to be 1. - module attributes {"triton_gpu.num-warps" = 2 : i32} { -- func @vecadd_masked_vec1(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32) { -+ func.func @vecadd_masked_vec1(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %n_elements: i32) { - %c64_i32 = arith.constant 64 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c64_i32 : i32 -@@ -195,7 +195,7 @@ module attributes {"triton_gpu.num-warps" = 2 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [8], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: global_load_store_vec2 -- func @global_load_store_vec2(%arg0: !tt.ptr {tt.divisibility = 8 : i32}, %arg1: !tt.ptr {tt.divisibility = 8 : i32}, %arg2: !tt.ptr {tt.divisibility = 8 : i32}, %arg3: i32) { -+ func.func @global_load_store_vec2(%arg0: !tt.ptr {tt.divisibility = 8 : i32}, %arg1: !tt.ptr {tt.divisibility = 8 : i32}, %arg2: !tt.ptr {tt.divisibility = 8 : i32}, %arg3: i32) { - %c256_i32 = arith.constant 256 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c256_i32 : i32 -@@ -240,7 +240,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [8], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: global_load_store_vec8 -- func @global_load_store_vec8(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { -+ func.func @global_load_store_vec8(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { - %c256_i32 = arith.constant 256 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = arith.muli %0, %c256_i32 : i32 -@@ -283,7 +283,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked2 = #triton_gpu.blocked<{sizePerThread = [1, 1], threadsPerWarp = [32, 1], warpsPerCTA = [4, 1], order = [0, 1]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_view_broadcast -- func @basic_view_broadcast(%arg : tensor<256xf32,#blocked0>) { -+ func.func @basic_view_broadcast(%arg : tensor<256xf32,#blocked0>) { - // CHECK: llvm.mlir.undef - // CHECK: %[[T0:.*]] = llvm.extractvalue - // CHECK: %[[T1:.*]] = llvm.extractvalue -@@ -307,7 +307,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [2], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_make_range -- func @basic_make_range() { -+ func.func @basic_make_range() { - // CHECK: nvvm.read.ptx.sreg.tid.x - // CHECK: llvm.mlir.undef - // CHECK: llvm.insertvalue -@@ -322,7 +322,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_addf -- func @basic_addf(%arg0 : tensor<256xf32,#blocked0>, %arg1 : tensor<256xf32,#blocked0>) { -+ func.func @basic_addf(%arg0 : tensor<256xf32,#blocked0>, %arg1 : tensor<256xf32,#blocked0>) { - // CHECK: llvm.fadd - // CHECK: llvm.fadd - %1 = arith.addf %arg0, %arg1 : tensor<256xf32,#blocked0> -@@ -335,7 +335,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_addi -- func @basic_addi(%arg0 : tensor<256xi32,#blocked0>, %arg1 : tensor<256xi32,#blocked0>) { -+ func.func @basic_addi(%arg0 : tensor<256xi32,#blocked0>, %arg1 : tensor<256xi32,#blocked0>) { - // CHECK: llvm.add - // CHECK: llvm.add - %1 = arith.addi %arg0, %arg1 : tensor<256xi32,#blocked0> -@@ -347,7 +347,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_program_id -- func @basic_program_id() { -+ func.func @basic_program_id() { - // CHECK: nvvm.read.ptx.sreg.ctaid.x : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 - return -@@ -359,7 +359,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_addptr -- func @basic_addptr(%arg0 : tensor<256x!tt.ptr,#blocked0>, %arg1 : tensor<256xi32,#blocked0>) { -+ func.func @basic_addptr(%arg0 : tensor<256x!tt.ptr,#blocked0>, %arg1 : tensor<256xi32,#blocked0>) { - // CHECK: llvm.getelementptr - // CHECK: llvm.getelementptr - %0 = tt.addptr %arg0, %arg1 : tensor<256x!tt.ptr, #blocked0>, tensor<256xi32, #blocked0> -@@ -373,7 +373,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK: llvm.mlir.global external @global_smem - // CHECK-LABEL: basic_alloc_tensor -- func @basic_alloc_tensor() { -+ func.func @basic_alloc_tensor() { - // CHECK: llvm.mlir.addressof @global_smem - // CHECK-NEXT: llvm.bitcast - // CHECK-NEXT: llvm.mlir.constant -@@ -390,7 +390,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK: llvm.mlir.global external @global_smem - // CHECK-LABEL: basic_extract_slice -- func @basic_extract_slice() { -+ func.func @basic_extract_slice() { - // CHECK: llvm.mlir.addressof @global_smem - // CHECK: llvm.extractvalue - // CHECK-NEXT: llvm.extractvalue -@@ -423,7 +423,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_async_wait -- func @basic_async_wait() { -+ func.func @basic_async_wait() { - // CHECK: cp.async.wait_group 0x4 - triton_gpu.async_wait {num = 4: i32} - return -@@ -442,7 +442,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #A = #triton_gpu.shared<{vec = 8, perPhase = 1, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_insert_slice_async_fallback -- func @basic_insert_slice_async_fallback(%arg0: !tt.ptr {tt.divisibility = 1 : i32}) { -+ func.func @basic_insert_slice_async_fallback(%arg0: !tt.ptr {tt.divisibility = 1 : i32}) { - %off0_ = tt.make_range {end = 16 : i32, start = 0 : i32} : tensor<16xi32, #slice2d1> - %off1_ = tt.make_range {end = 32 : i32, start = 0 : i32} : tensor<64xi32, #slice3d0> - %off0 = tt.expand_dims %off0_ {axis = 1 : i32} : (tensor<16xi32, #slice2d1>) -> tensor<16x1xi32, #block2> -@@ -481,7 +481,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #A = #triton_gpu.shared<{vec = 8, perPhase = 1, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_insert_slice_async_v4 -- func @basic_insert_slice_async_v4(%arg0: !tt.ptr {tt.divisibility = 32 : i32}) { -+ func.func @basic_insert_slice_async_v4(%arg0: !tt.ptr {tt.divisibility = 32 : i32}) { - %off0_ = tt.make_range {end = 16 : i32, start = 0 : i32} : tensor<16xi32, #slice2d1> - %off1_ = tt.make_range {end = 32 : i32, start = 0 : i32} : tensor<64xi32, #slice3d0> - %off0 = tt.expand_dims %off0_ {axis = 1 : i32} : (tensor<16xi32, #slice2d1>) -> tensor<16x1xi32, #block2> -@@ -523,7 +523,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #A = #triton_gpu.shared<{vec = 1, perPhase = 1, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_insert_slice_async_v1 -- func @basic_insert_slice_async_v1(%arg0: !tt.ptr {tt.divisibility = 4 : i32}) { -+ func.func @basic_insert_slice_async_v1(%arg0: !tt.ptr {tt.divisibility = 4 : i32}) { - %off0_ = tt.make_range {end = 16 : i32, start = 0 : i32} : tensor<16xi32, #slice2d1> - %off1_ = tt.make_range {end = 32 : i32, start = 0 : i32} : tensor<32xi32, #slice3d0> - %off0 = tt.expand_dims %off0_ {axis = 1 : i32} : (tensor<16xi32, #slice2d1>) -> tensor<16x1xi32, #block2> -@@ -568,7 +568,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #A = #triton_gpu.shared<{vec = 1, perPhase = 1, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_insert_slice_async_v1_multictas -- func @basic_insert_slice_async_v1_multictas(%arg0: !tt.ptr {tt.divisibility = 4 : i32}) { -+ func.func @basic_insert_slice_async_v1_multictas(%arg0: !tt.ptr {tt.divisibility = 4 : i32}) { - %off0_ = tt.make_range {end = 32 : i32, start = 0 : i32} : tensor<32xi32, #slice2d1> - %off1_ = tt.make_range {end = 32 : i32, start = 0 : i32} : tensor<32xi32, #slice3d0> - %off0 = tt.expand_dims %off0_ {axis = 1 : i32} : (tensor<32xi32, #slice2d1>) -> tensor<32x1xi32, #block2> -@@ -619,7 +619,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK: basic_splat -- func @basic_splat(%ptr: !tt.ptr) { -+ func.func @basic_splat(%ptr: !tt.ptr) { - // CHECK: llvm.mlir.undef - // CHECK: llvm.insertvalue - // CHECK: llvm.insertvalue -@@ -633,7 +633,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: basic_store -- func @basic_store(%ptrs: tensor<256x!tt.ptr, #blocked0>, %vals: tensor<256xf32, #blocked0>, %mask: tensor<256xi1, #blocked0>) { -+ func.func @basic_store(%ptrs: tensor<256x!tt.ptr, #blocked0>, %vals: tensor<256xf32, #blocked0>, %mask: tensor<256xi1, #blocked0>) { - // CHECK: llvm.inline_asm - // CHECK-SAME: st.global.b32 [ ${{.*}} + 0 ], { ${{.*}} }; - // CHECK: llvm.inline_asm -@@ -650,7 +650,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_blocked_blocked -- func @convert_layout_blocked_blocked(%arg0: tensor<16x16xf32, #blocked0>) { -+ func.func @convert_layout_blocked_blocked(%arg0: tensor<16x16xf32, #blocked0>) { - // CHECK: llvm.mlir.addressof @global_smem - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> -@@ -697,7 +697,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_blocked_blocked_vec -- func @convert_layout_blocked_blocked_vec(%arg0: tensor<16x16xf32, #blocked0>) { -+ func.func @convert_layout_blocked_blocked_vec(%arg0: tensor<16x16xf32, #blocked0>) { - // CHECK: llvm.mlir.addressof @global_smem - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> -@@ -720,7 +720,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_blocked_blocked_multi_rep -- func @convert_layout_blocked_blocked_multi_rep(%arg0: tensor<16x16xf32, #blocked0>) { -+ func.func @convert_layout_blocked_blocked_multi_rep(%arg0: tensor<16x16xf32, #blocked0>) { - // CHECK: llvm.mlir.addressof @global_smem - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> -@@ -751,7 +751,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #dot_operand_b = #triton_gpu.dot_op<{opIdx=1, parent=#mma0}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: convert_dot -- func @convert_dot(%A: tensor<16x16xf16, #blocked0>, %B: tensor<16x16xf16, #blocked0>) { -+ func.func @convert_dot(%A: tensor<16x16xf16, #blocked0>, %B: tensor<16x16xf16, #blocked0>) { - %AA = triton_gpu.convert_layout %A : (tensor<16x16xf16, #blocked0>) -> tensor<16x16xf16, #shared0> - %BB = triton_gpu.convert_layout %B : (tensor<16x16xf16, #blocked0>) -> tensor<16x16xf16, #shared0> - // CHECK: llvm.inline_asm -@@ -775,7 +775,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - // TODO: problems in MLIR's parser on slice layout - // #blocked0 = #triton_gpu.blocked<{sizePerThread = [1, 4], threadsPerWarp = [8, 4], warpsPerCTA = [1, 1], order = [1, 0]}> - // module attributes {"triton_gpu.num-warps" = 1 : i32} { --// func @make_range_sliced_layout() { -+// func.func @make_range_sliced_layout() { - // %0 = tt.make_range {end = 16 : i32, start = 0 : i32} : tensor<16xi32, #triton_gpu.slice<{dim = 0, parent = #blocked0}>> - // return - // } -@@ -788,7 +788,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_mmav2_block -- func @convert_layout_mmav2_blocked(%arg0: tensor<32x16xf32, #mma>) { -+ func.func @convert_layout_mmav2_blocked(%arg0: tensor<32x16xf32, #mma>) { - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> - // CHECK: llvm.store -@@ -808,7 +808,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_mmav1_block -- func @convert_layout_mmav1_blocked(%arg0: tensor<32x64xf32, #mma>) { -+ func.func @convert_layout_mmav1_blocked(%arg0: tensor<32x64xf32, #mma>) { - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> - // CHECK: llvm.store -@@ -831,7 +831,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK: llvm.mlir.global external @global_smem() {addr_space = 3 : i32} : !llvm.array<0 x i8> - // CHECK-LABEL: convert_layout_blocked_shared -- func @convert_layout_blocked_shared(%arg0: tensor<128x32xf32, #blocked0>) { -+ func.func @convert_layout_blocked_shared(%arg0: tensor<128x32xf32, #blocked0>) { - // CHECK: llvm.store - // CHECK-SAME: !llvm.ptr, 3> - // CHECK: llvm.store -@@ -847,7 +847,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked1 = #triton_gpu.blocked<{sizePerThread = [1, 4], threadsPerWarp = [4, 8], warpsPerCTA = [1, 1], order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: convert_blocked1d_to_slice0 -- func @convert_blocked1d_to_slice0(%src:tensor<32xi32, #blocked0>) { -+ func.func @convert_blocked1d_to_slice0(%src:tensor<32xi32, #blocked0>) { - // CHECK-COUNT-4: llvm.load {{.*}} : !llvm.ptr, 3> - %cvt = triton_gpu.convert_layout %src : (tensor<32xi32, #blocked0>) -> tensor<32xi32, #triton_gpu.slice<{dim = 0, parent = #blocked1}>> - return -@@ -860,7 +860,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked1 = #triton_gpu.blocked<{sizePerThread = [1, 4], threadsPerWarp = [4, 8], warpsPerCTA = [1, 1], order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: convert_blocked1d_to_slice1 -- func @convert_blocked1d_to_slice1(%src:tensor<32xi32, #blocked0>) { -+ func.func @convert_blocked1d_to_slice1(%src:tensor<32xi32, #blocked0>) { - // CHECK-COUNT-32: llvm.load {{.*}} : !llvm.ptr, 3> - %cvt = triton_gpu.convert_layout %src : (tensor<32xi32, #blocked0>) -> tensor<32xi32, #triton_gpu.slice<{dim = 1, parent = #blocked1}>> - return -@@ -873,7 +873,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #blocked1 = #triton_gpu.blocked<{sizePerThread = [4], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: convert_blocked_to_blocked_ptr -- func @convert_blocked_to_blocked_ptr(%src:tensor<32x!tt.ptr, #blocked0>) { -+ func.func @convert_blocked_to_blocked_ptr(%src:tensor<32x!tt.ptr, #blocked0>) { - // CHECK: llvm.ptrtoint - // CHECK: llvm.store - // CHECK: nvvm.barrier0 -@@ -892,7 +892,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #dot_operand_a = #triton_gpu.dot_op<{opIdx=0, parent=#mma}> - #dot_operand_b = #triton_gpu.dot_op<{opIdx=1, parent=#mma}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { -- func @matmul_kernel_dot_operand_layout(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, -+ func.func @matmul_kernel_dot_operand_layout(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, - %a:tensor<128x32xf16, #shared>, %b:tensor<32x256xf16, #shared>) { - %cst = arith.constant dense<0.000000e+00> : tensor<128x256xf32, #mma> - // CHECK: ldmatrix.sync.aligned.m8n8.x4.shared.b16 -@@ -918,7 +918,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #dot_operand_a = #triton_gpu.dot_op<{opIdx=0, parent=#mma, isMMAv1Row=true}> - #dot_operand_b = #triton_gpu.dot_op<{opIdx=1, parent=#mma, isMMAv1Row=true}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { -- func @matmul884_kernel_dot_operand_layout(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, -+ func.func @matmul884_kernel_dot_operand_layout(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, - %a:tensor<32x64xf16, #shared0>, %b:tensor<64x64xf16, #shared1>) { - %cst = arith.constant dense<0.000000e+00> : tensor<32x64xf32, #mma> - // CHECK: ldmatrix.sync.aligned.m8n8.x4.shared.b16 -@@ -941,7 +941,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #dot_operand_a = #triton_gpu.dot_op<{opIdx=0, parent=#blocked}> - #dot_operand_b = #triton_gpu.dot_op<{opIdx=1, parent=#blocked}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { -- func @matmul_fmadot(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, -+ func.func @matmul_fmadot(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, - %a:tensor<32x16xf32, #shared>, %b:tensor<16x32xf32, #shared>) { - %cst = arith.constant dense<0.000000e+00> : tensor<32x32xf32, #blocked> - // CHECK: llvm.intr.fmuladd -@@ -965,7 +965,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #dot_operand_b = #triton_gpu.dot_op<{opIdx=1, parent=#mma}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: matmul_tf32dot -- func @matmul_tf32dot(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, -+ func.func @matmul_tf32dot(%ptr:!tt.ptr {tt.divisibility = 16 : i32}, - %a:tensor<32x16xf32, #shared>, %b:tensor<16x32xf32, #shared>) { - %cst = arith.constant dense<0.000000e+00> : tensor<32x32xf32, #mma> - // CHECK: llvm.inline_asm -@@ -1000,7 +1000,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: atomic_add_f32 -- func @atomic_add_f32(%arg0 : tensor<256x!tt.ptr, #blocked0>, %arg1 : tensor<256xi1, #blocked0>, %arg2 : tensor<256xf32, #blocked0>) { -+ func.func @atomic_add_f32(%arg0 : tensor<256x!tt.ptr, #blocked0>, %arg1 : tensor<256xi1, #blocked0>, %arg2 : tensor<256xf32, #blocked0>) { - // CHECK: llvm.inline_asm - // CHECK-SAME: atom.global.gpu.add.f32 - %0 = "tt.atomic_rmw" (%arg0, %arg2, %arg1) {atomic_rmw_op = 5 : i32} : (tensor<256x!tt.ptr, #blocked0>, tensor<256xf32, #blocked0>, tensor<256xi1, #blocked0>) -> tensor<256xf32, #blocked0> -@@ -1012,7 +1012,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - --func @test_get_program_id(%a: tensor<32x!tt.ptr, #blocked0>) { -+func.func @test_get_program_id(%a: tensor<32x!tt.ptr, #blocked0>) { - %blockidx = tt.get_program_id {axis=0:i32} : i32 - %blockidy = tt.get_program_id {axis=1:i32} : i32 - %blockidz = tt.get_program_id {axis=2:i32} : i32 -@@ -1032,7 +1032,7 @@ func @test_get_program_id(%a: tensor<32x!tt.ptr, #blocked0>) { - // ----- - #blocked0 = #triton_gpu.blocked<{sizePerThread = [1], threadsPerWarp = [32], warpsPerCTA = [4], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { -- func @test_get_num_program(%a: tensor<32x!tt.ptr, #blocked0>) { -+ func.func @test_get_num_program(%a: tensor<32x!tt.ptr, #blocked0>) { - // CHECK: nvvm.read.ptx.sreg.nctaid.x - // CHECK: nvvm.read.ptx.sreg.nctaid.y - // CHECK: nvvm.read.ptx.sreg.nctaid.z -@@ -1052,7 +1052,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #blocked0 = #triton_gpu.blocked<{sizePerThread = [2], threadsPerWarp = [32], warpsPerCTA = [1], order = [0]}> - module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK-LABEL: test_index_cache -- func @test_index_cache() { -+ func.func @test_index_cache() { - // CHECK: nvvm.read.ptx.sreg.tid.x - %0 = tt.make_range {end = 256 : i32, start = 0 : i32} : tensor<256xi32, #blocked0> - // CHECK-NOT: nvvm.read.ptx.sreg.tid.x -@@ -1066,7 +1066,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - #shared0 = #triton_gpu.shared<{vec = 8, perPhase = 2, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: test_base_index_cache -- func @test_base_index_cache(%arg0: tensor<128x32xf32, #blocked0>) { -+ func.func @test_base_index_cache(%arg0: tensor<128x32xf32, #blocked0>) { - // CHECK: nvvm.read.ptx.sreg.tid.x - %0 = triton_gpu.convert_layout %arg0 : (tensor<128x32xf32, #blocked0>) -> tensor<128x32xf32, #shared0> - // CHECK-NOT: nvvm.read.ptx.sreg.tid.x -@@ -1080,7 +1080,7 @@ module attributes {"triton_gpu.num-warps" = 1 : i32} { - #shared0 = #triton_gpu.shared<{vec = 8, perPhase = 2, maxPhase = 4, order = [1, 0]}> - module attributes {"triton_gpu.num-warps" = 1 : i32} { - // CHECK-LABEL: test_index_cache_different_block -- func @test_index_cache_different_block(%arg0: tensor<128x32xf32, #blocked0>, %arg1: i1) { -+ func.func @test_index_cache_different_block(%arg0: tensor<128x32xf32, #blocked0>, %arg1: i1) { - // CHECK: nvvm.read.ptx.sreg.tid.x - %0 = triton_gpu.convert_layout %arg0 : (tensor<128x32xf32, #blocked0>) -> tensor<128x32xf32, #shared0> - scf.if %arg1 { -diff --git a/test/Target/tritongpu_to_llvmir.mlir b/test/Target/tritongpu_to_llvmir.mlir -index cafff3ca60..114d3a9eb2 100644 ---- a/test/Target/tritongpu_to_llvmir.mlir -+++ b/test/Target/tritongpu_to_llvmir.mlir -@@ -4,11 +4,11 @@ - // CHECK-LABEL: ; ModuleID = 'LLVMDialectModule' - // CHECK: define void @test_empty_kernel - // CHECK: !nvvm.annotations --// CHECK: !{void (i32, half addrspace(1)*)* @test_empty_kernel, !"maxntidx", i32 128} -+// CHECK: !{ptr @test_empty_kernel, !"maxntidx", i32 128} - - module attributes {"triton_gpu.num-warps" = 4 : i32} { - --func @test_empty_kernel(%lb : index, %A : !tt.ptr) { -+func.func @test_empty_kernel(%lb : index, %A : !tt.ptr) { - - return - } -diff --git a/test/Target/tritongpu_to_ptx.mlir b/test/Target/tritongpu_to_ptx.mlir -index 404e970a29..12742ad9e2 100644 ---- a/test/Target/tritongpu_to_ptx.mlir -+++ b/test/Target/tritongpu_to_ptx.mlir -@@ -6,7 +6,7 @@ - - module attributes {"triton_gpu.num-warps" = 4 : i32} { - --func @test_empty_kernel(%lb : index, %A : !tt.ptr) { -+func.func @test_empty_kernel(%lb : index, %A : !tt.ptr) { - - return - } -diff --git a/test/Triton/combine.mlir b/test/Triton/combine.mlir -index 050a3f7565..5ef6790e69 100644 ---- a/test/Triton/combine.mlir -+++ b/test/Triton/combine.mlir -@@ -2,10 +2,10 @@ - // RUN: triton-opt %s -split-input-file -canonicalize -triton-combine | FileCheck %s - - // CHECK-LABEL: @test_combine_dot_add_pattern --func @test_combine_dot_add_pattern() -> (tensor<128x128xf32>, tensor<128x128xf32>) { -- // CHECK: %[[d:.*]] = arith.constant dense<3.000000e+00> : tensor<128x128xf32> -- // CHECK: %[[b:.*]] = arith.constant dense<2.000000e+00> : tensor<128x128xf32> -- // CHECK: %[[a:.*]] = arith.constant dense<1.000000e+00> : tensor<128x128xf32> -+func.func @test_combine_dot_add_pattern() -> (tensor<128x128xf32>, tensor<128x128xf32>) { -+ // CHECK-DAG: %[[d:.*]] = arith.constant dense<3.000000e+00> : tensor<128x128xf32> -+ // CHECK-DAG: %[[b:.*]] = arith.constant dense<2.000000e+00> : tensor<128x128xf32> -+ // CHECK-DAG: %[[a:.*]] = arith.constant dense<1.000000e+00> : tensor<128x128xf32> - %a = arith.constant dense<1.0> : tensor<128x128xf32> - %b = arith.constant dense<2.0> : tensor<128x128xf32> - %zero = arith.constant dense<0.0> : tensor<128x128xf32> -@@ -24,7 +24,7 @@ func @test_combine_dot_add_pattern() -> (tensor<128x128xf32>, tensor<128x128xf32 - - - // COM: CHECK-LABEL: @test_combine_addptr_pattern --func @test_combine_addptr_pattern(%base: !tt.ptr) -> tensor<8x!tt.ptr> { -+func.func @test_combine_addptr_pattern(%base: !tt.ptr) -> tensor<8x!tt.ptr> { - %off0 = arith.constant 10 : i32 - %off1 = arith.constant 15 : i32 - -@@ -47,46 +47,46 @@ func @test_combine_addptr_pattern(%base: !tt.ptr) -> tensor<8x!tt.ptr> - - - // CHECK-LABEL: @test_combine_select_masked_load_pattern --func @test_combine_select_masked_load_pattern(%ptr: tensor<8x!tt.ptr>, %cond: i1) -> (tensor<8xf32>, tensor<8xf32>) { -+func.func @test_combine_select_masked_load_pattern(%ptr: tensor<8x!tt.ptr>, %cond: i1) -> (tensor<8xf32>, tensor<8xf32>) { - %mask = tt.broadcast %cond : (i1) -> tensor<8xi1> - %false_val = arith.constant dense<0.0> : tensor<8xf32> - - // CHECK: %[[res1:.*]] = tt.load %{{.*}}, %{{.*}}, %{{.*}} {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> - %x = tt.load %ptr, %mask, %false_val {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> -- %0 = select %cond, %x, %false_val : tensor<8xf32> -+ %0 = arith.select %cond, %x, %false_val : tensor<8xf32> - - // CHECK: %[[res2:.*]] = tt.load %{{.*}}, %{{.*}}, %{{.*}} {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> - %y = tt.load %ptr, %mask, %false_val {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> -- %1 = select %cond, %y, %false_val : tensor<8xf32> -+ %1 = arith.select %cond, %y, %false_val : tensor<8xf32> - - // CHECK: return %[[res1]], %[[res2]] : tensor<8xf32>, tensor<8xf32> - return %0, %1 : tensor<8xf32>, tensor<8xf32> - } - - // CHECK-LABEL: @test_combine_select_masked_load_fail_pattern --func @test_combine_select_masked_load_fail_pattern(%ptr: tensor<8x!tt.ptr>, %dummy_load: tensor<8xf32>, %dummy_broadcast: tensor<8xi1>, %cond0: i1, %cond1: i1) -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>) { -+func.func @test_combine_select_masked_load_fail_pattern(%ptr: tensor<8x!tt.ptr>, %dummy_load: tensor<8xf32>, %dummy_broadcast: tensor<8xi1>, %cond0: i1, %cond1: i1) -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>) { - %false_val = arith.constant dense<0.0> : tensor<8xf32> - - // Case 1: value at the "load" position is not an "op". Select should not be canonicalized. -- // CHECK: %{{.*}} = select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -- %0 = select %cond0, %dummy_load, %false_val : tensor<8xf32> -+ // CHECK: %{{.*}} = arith.select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -+ %0 = arith.select %cond0, %dummy_load, %false_val : tensor<8xf32> - - // Case 2: value at the "broadcast" position is not an "op". Select should not be canonicalized. - %real_load0 = tt.load %ptr, %dummy_broadcast, %false_val {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> -- // CHECK: %{{.*}} = select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -- %1 = select %cond0, %real_load0, %false_val : tensor<8xf32> -+ // CHECK: %{{.*}} = arith.select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -+ %1 = arith.select %cond0, %real_load0, %false_val : tensor<8xf32> - - // Case 3: condition of "broadcast" is not the same as the condition of "select". Select should not be canonicalized. - %cond0_ = tt.broadcast %cond0 : (i1) -> tensor<8xi1> - %real_load1 = tt.load %ptr, %cond0_, %false_val {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<8xf32> -- // CHECK: %{{.*}} = select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -- %2 = select %cond1, %real_load1, %false_val : tensor<8xf32> -+ // CHECK: %{{.*}} = arith.select %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> -+ %2 = arith.select %cond1, %real_load1, %false_val : tensor<8xf32> - - return %0, %1, %2 : tensor<8xf32>, tensor<8xf32>, tensor<8xf32> - } - - // CHECK-LABEL: @test_combine_broadcast_constant_pattern --func @test_combine_broadcast_constant_pattern(%cst : f32) -> tensor<8x2xf32> { -+func.func @test_combine_broadcast_constant_pattern(%cst : f32) -> tensor<8x2xf32> { - // CHECK: %[[cst:.*]] = arith.constant dense<1.000000e+00> : tensor<8x2xf32> - %const = arith.constant dense<1.0> : tensor<8xf32> - %bst_out = tt.broadcast %const : (tensor<8xf32>) -> tensor<8x2xf32> -@@ -96,7 +96,7 @@ func @test_combine_broadcast_constant_pattern(%cst : f32) -> tensor<8x2xf32> { - } - - // CHECK-LABEL: @test_canonicalize_masked_load_pattern --func @test_canonicalize_masked_load_pattern(%ptr: tensor<8x!tt.ptr>) -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>) { -+func.func @test_canonicalize_masked_load_pattern(%ptr: tensor<8x!tt.ptr>) -> (tensor<8xf32>, tensor<8xf32>, tensor<8xf32>) { - %true_mask = arith.constant dense : tensor<8xi1> - %false_mask = arith.constant dense : tensor<8xi1> - %other_val = arith.constant dense<0.0> : tensor<8xf32> -@@ -117,7 +117,7 @@ func @test_canonicalize_masked_load_pattern(%ptr: tensor<8x!tt.ptr>) -> (te - } - - // CHECK-LABEL: @test_canonicalize_masked_load_fail_pattern --func @test_canonicalize_masked_load_fail_pattern(%ptr: tensor<8x!tt.ptr>, %mask: tensor<8xi1>) -> (tensor<8xf32>, tensor<8xf32>) { -+func.func @test_canonicalize_masked_load_fail_pattern(%ptr: tensor<8x!tt.ptr>, %mask: tensor<8xi1>) -> (tensor<8xf32>, tensor<8xf32>) { - %other_val = arith.constant dense<0.0> : tensor<8xf32> - - // Case: value at the "mask" position is not an "op". Load should not be canonicalized. -@@ -130,7 +130,7 @@ func @test_canonicalize_masked_load_fail_pattern(%ptr: tensor<8x!tt.ptr>, % - } - - // CHECK-LABEL: @test_canonicalize_masked_store_pattern --func @test_canonicalize_masked_store_pattern(%ptr: tensor<8x!tt.ptr>, %val: tensor<8xf32>) { -+func.func @test_canonicalize_masked_store_pattern(%ptr: tensor<8x!tt.ptr>, %val: tensor<8xf32>) { - %true_mask = arith.constant dense : tensor<8xi1> - %false_mask = arith.constant dense : tensor<8xi1> - -@@ -144,7 +144,7 @@ func @test_canonicalize_masked_store_pattern(%ptr: tensor<8x!tt.ptr>, %val: - } - - // CHECK-LABEL: @test_canonicalize_masked_store_fail_pattern --func @test_canonicalize_masked_store_fail_pattern(%ptr: tensor<8x!tt.ptr>, %val: tensor<8xf32>, %mask: tensor<8xi1>) { -+func.func @test_canonicalize_masked_store_fail_pattern(%ptr: tensor<8x!tt.ptr>, %val: tensor<8xf32>, %mask: tensor<8xi1>) { - // Case: value at the "mask" position is not an "op". Store should not be canonicalized. - // CHECK: tt.store %{{.*}}, %{{.*}}, %{{.*}} : tensor<8xf32> - tt.store %ptr, %val, %mask : tensor<8xf32> -diff --git a/test/Triton/vecadd.mlir b/test/Triton/vecadd.mlir -index 0b69ef3054..f5019b1cdd 100644 ---- a/test/Triton/vecadd.mlir -+++ b/test/Triton/vecadd.mlir -@@ -1,7 +1,7 @@ - // RUN: triton-opt %s -verify-diagnostics - - module { -- func @add_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32__(%arg0: !tt.ptr, %arg1: !tt.ptr, %arg2: !tt.ptr, %arg3: i32, %arg4: i32, %arg5: i32) { -+ func.func @add_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32__(%arg0: !tt.ptr, %arg1: !tt.ptr, %arg2: !tt.ptr, %arg3: i32, %arg4: i32, %arg5: i32) { - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %c256_i32 = arith.constant 256 : i32 - %1 = arith.muli %0, %c256_i32 : i32 -@@ -43,7 +43,7 @@ module { - } - } - // module { --// func @add_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32__(%arg0: !tt.ptr, %arg1: !tt.ptr, %arg2: !tt.ptr, %arg3: i32, %arg4: i32, %arg5: i32) { -+// func.func @add_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32__(%arg0: !tt.ptr, %arg1: !tt.ptr, %arg2: !tt.ptr, %arg3: i32, %arg4: i32, %arg5: i32) { - // %c64 = arith.constant 64 : index - // %c32 = arith.constant 32 : index - // %c0 = arith.constant 0 : index -diff --git a/test/TritonGPU/coalesce.mlir b/test/TritonGPU/coalesce.mlir -index 60e359f527..51cccccfbd 100644 ---- a/test/TritonGPU/coalesce.mlir -+++ b/test/TritonGPU/coalesce.mlir -@@ -19,7 +19,7 @@ module attributes {"triton_gpu.num-warps" = 4 : i32} { - // CHECK: [[store_val:%.*]] = triton_gpu.convert_layout {{.*}} -> tensor<64x64xf32, [[col_layout]]> - // CHECK: [[store_mask:%.*]] = triton_gpu.convert_layout {{.*}} -> tensor<64x64xi1, [[col_layout]]> - // CHECK: tt.store [[store_ptr]], [[store_val]], [[store_mask]] --func @transpose(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, -+func.func @transpose(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, - %arg1: i32 {tt.divisibility = 16 : i32}, - %arg2: !tt.ptr {tt.divisibility = 16 : i32}, - %arg3: i32 {tt.divisibility = 16 : i32}) { -diff --git a/test/TritonGPU/combine.mlir b/test/TritonGPU/combine.mlir -index 2c009ffa48..7e9cb9d504 100644 ---- a/test/TritonGPU/combine.mlir -+++ b/test/TritonGPU/combine.mlir -@@ -9,7 +9,7 @@ - // CHECK: [[col_layout:#.*]] = #triton_gpu.blocked<{sizePerThread = [4, 1], threadsPerWarp = [16, 2], warpsPerCTA = [4, 1], order = [0, 1]}> - // CHECK: [[col_layout_novec:#.*]] = #triton_gpu.blocked<{sizePerThread = [1, 1], threadsPerWarp = [32, 1], warpsPerCTA = [4, 1], order = [0, 1]}> - // CHECK-LABEL: cst --func @cst() -> tensor<1024xi32, #layout1> { -+func.func @cst() -> tensor<1024xi32, #layout1> { - %cst = arith.constant dense<0> : tensor<1024xi32, #layout0> - %1 = triton_gpu.convert_layout %cst : (tensor<1024xi32, #layout0>) -> tensor<1024xi32, #layout1> - // CHECK-NOT: triton_gpu.convert_layout -@@ -18,7 +18,7 @@ func @cst() -> tensor<1024xi32, #layout1> { - } - - // CHECK-LABEL: range --func @range() -> tensor<1024xi32, #layout1> { -+func.func @range() -> tensor<1024xi32, #layout1> { - %0 = tt.make_range {end = 1024 : i32, start = 0 : i32} : tensor<1024xi32, #layout0> - %1 = triton_gpu.convert_layout %0 : (tensor<1024xi32, #layout0>) -> tensor<1024xi32, #layout1> - // CHECK-NOT: triton_gpu.convert_layout -@@ -27,7 +27,7 @@ func @range() -> tensor<1024xi32, #layout1> { - } - - // CHECK-LABEL: splat --func @splat(%arg0: i32) -> tensor<1024xi32, #layout1> { -+func.func @splat(%arg0: i32) -> tensor<1024xi32, #layout1> { - %0 = tt.splat %arg0 : (i32) -> tensor<1024xi32, #layout0> - %1 = triton_gpu.convert_layout %0 : (tensor<1024xi32, #layout0>) -> tensor<1024xi32, #layout1> - // CHECK-NOT: triton_gpu.convert_layout -@@ -36,7 +36,7 @@ func @splat(%arg0: i32) -> tensor<1024xi32, #layout1> { - } - - // CHECK-LABEL: remat --func @remat(%arg0: i32) -> tensor<1024xi32, #layout1> { -+func.func @remat(%arg0: i32) -> tensor<1024xi32, #layout1> { - %0 = tt.make_range {end = 1024 : i32, start = 0 : i32} : tensor<1024xi32, #layout0> - %1 = tt.make_range {end = 1024 : i32, start = 0 : i32} : tensor<1024xi32, #layout0> - %2 = arith.muli %0, %1 : tensor<1024xi32, #layout0> -@@ -56,7 +56,7 @@ func @remat(%arg0: i32) -> tensor<1024xi32, #layout1> { - } - - // CHECK-LABEL: remat_load_store --func @remat_load_store(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @remat_load_store(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - %0 = tt.make_range {end = 64 : i32, start = 0 : i32} : tensor<64xi32, #layout0> - %1 = tt.splat %arg : (!tt.ptr) -> tensor<64x!tt.ptr, #layout0> - %2 = tt.addptr %1, %0 : tensor<64x!tt.ptr, #layout0>, tensor<64xi32, #layout0> -@@ -70,7 +70,7 @@ func @remat_load_store(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - - // Don't rematerialize vectorized loads - // CHECK-LABEL: remat_expensive --func @remat_expensive(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @remat_expensive(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - %0 = tt.make_range {end = 64 : i32, start = 0 : i32} : tensor<64xi32, #layout1> - %1 = tt.splat %arg : (!tt.ptr) -> tensor<64x!tt.ptr, #layout1> - %2 = tt.addptr %1, %0 : tensor<64x!tt.ptr, #layout1>, tensor<64xi32, #layout1> -@@ -85,7 +85,7 @@ func @remat_expensive(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - - // Don't rematerialize loads when original and target layouts are different - // CHECK-LABEL: remat_multi_layout --func @remat_multi_layout(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @remat_multi_layout(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - %0 = tt.make_range {end = 64 : i32, start = 0 : i32} : tensor<64xi32, #layout0> - %1 = tt.splat %arg : (!tt.ptr) -> tensor<64x!tt.ptr, #layout0> - %2 = tt.addptr %1, %0 : tensor<64x!tt.ptr, #layout0>, tensor<64xi32, #layout0> -@@ -100,7 +100,7 @@ func @remat_multi_layout(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - - // Always rematerialize single value loads - // CHECK-LABEL: remat_single_value --func @remat_single_value(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @remat_single_value(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - %0 = tt.splat %arg : (!tt.ptr) -> tensor<1x!tt.ptr, #layout1> - %1 = tt.load %0 {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<1xi32, #layout1> - // CHECK-NOT: triton_gpu.convert_layout -@@ -111,7 +111,7 @@ func @remat_single_value(%arg: !tt.ptr {tt.divisibility = 16 : i32}) { - } - - // CHECK-LABEL: if --func @if(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @if(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - // CHECK-NOT: triton_gpu.convert_layout - %c32_i32 = arith.constant dense<32> : tensor<1024xi32, #layout1> - %0 = tt.get_program_id {axis = 0 : i32} : i32 -@@ -128,7 +128,7 @@ func @if(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - } - - // CHECK-LABEL: if_convert_else_not --func @if_convert_else_not(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @if_convert_else_not(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - %c32_i32 = arith.constant dense<32> : tensor<1024xi32, #layout0> - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = tt.splat %0 : (i32) -> tensor<1024xi32, #layout0> -@@ -149,7 +149,7 @@ func @if_convert_else_not(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 - } - - // CHECK-LABEL: if_not_else_convert --func @if_not_else_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @if_not_else_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - %c32_i32 = arith.constant dense<32> : tensor<1024xi32, #layout0> - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = tt.splat %0 : (i32) -> tensor<1024xi32, #layout0> -@@ -170,7 +170,7 @@ func @if_not_else_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 - } - - // CHECK-LABEL: if_else_both_convert --func @if_else_both_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { -+func.func @if_else_both_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 : i32}) { - %c32_i32 = arith.constant dense<32> : tensor<1024xi32, #layout0> - %0 = tt.get_program_id {axis = 0 : i32} : i32 - %1 = tt.splat %0 : (i32) -> tensor<1024xi32, #layout0> -@@ -200,7 +200,7 @@ func @if_else_both_convert(%arg0: i32, %arg1: !tt.ptr {tt.divisibility = 16 - #blocked4 = #triton_gpu.blocked<{sizePerThread = [4, 1], threadsPerWarp = [16, 2], warpsPerCTA = [4, 1], order = [0, 1]}> - - // CHECK-LABEL: transpose --func @transpose(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32 {tt.divisibility = 16 : i32}) { -+func.func @transpose(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32 {tt.divisibility = 16 : i32}) { - // CHECK-NOT: triton_gpu.convert_layout - // CHECK: [[loaded_val:%.*]] = tt.load {{.*}}, {{%cst.*}}, {{%cst.*}} {cache = 1 : i32, evict = 1 : i32, isVolatile = false} : tensor<64x64xf32, [[row_layout]]> - // CHECK: [[cvt_val:%.*]] = triton_gpu.convert_layout [[loaded_val]] : (tensor<64x64xf32, [[row_layout]]>) -> tensor<64x64xf32, [[col_layout]]> -@@ -241,7 +241,7 @@ func @transpose(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: i32 {tt - } - - // CHECK-LABEL: loop --func @loop(%arg0: !tt.ptr, %arg1: i32, %arg2: !tt.ptr, %arg3: i32, %arg4: i32) { -+func.func @loop(%arg0: !tt.ptr, %arg1: i32, %arg2: !tt.ptr, %arg3: i32, %arg4: i32) { - // CHECK-NOT: triton_gpu.convert_layout - // CHECK: [[loop_ret:%.*]]:2 = scf.for {{.*}} -> (tensor<64x64xf32, [[row_layout]]>, tensor<64x64x!tt.ptr, [[row_layout]]>) - // CHECK-NEXT: {{.*}} = tt.load {{.*}} : tensor<64x64xf32, [[row_layout]]> -@@ -295,7 +295,7 @@ func @loop(%arg0: !tt.ptr, %arg1: i32, %arg2: !tt.ptr, %arg3: i32, %ar - } - - // CHECK-LABEL: vecadd --func @vecadd(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { -+func.func @vecadd(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32) { - // CHECK-NOT: triton_gpu.convert_layout - %c256_i32 = arith.constant 256 : i32 - %0 = tt.get_program_id {axis = 0 : i32} : i32 -@@ -327,7 +327,7 @@ func @vecadd(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: i32 {tt.divisibility = 16 : i32}) { -+func.func @select(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: i32 {tt.divisibility = 16 : i32}) { - // CHECK-NOT: triton_gpu.convert_layout - %cst = arith.constant dense<30000> : tensor<1x1xi32, #blocked2> - %cst_0 = arith.constant dense<30000> : tensor<1x512xi32, #blocked2> -@@ -378,7 +378,7 @@ func @select(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: !tt.ptr {tt.divisibility = 16 : i32}, %arg4: !tt.ptr {tt.divisibility = 16 : i32}, %arg5: !tt.ptr {tt.divisibility = 16 : i32}, %arg6: !tt.ptr {tt.divisibility = 16 : i32}, %arg7: !tt.ptr {tt.divisibility = 16 : i32}, %arg8: !tt.ptr {tt.divisibility = 16 : i32}, %arg9: !tt.ptr {tt.divisibility = 16 : i32}, %arg10: !tt.ptr {tt.divisibility = 16 : i32}, %arg11: !tt.ptr {tt.divisibility = 16 : i32}, %arg12: !tt.ptr {tt.divisibility = 16 : i32}, %arg13: !tt.ptr {tt.divisibility = 16 : i32}, %arg14: !tt.ptr {tt.divisibility = 16 : i32}, %arg15: !tt.ptr {tt.divisibility = 16 : i32}, %arg16: i32 {tt.divisibility = 16 : i32}) { -+func.func public @long_func(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: !tt.ptr {tt.divisibility = 16 : i32}, %arg4: !tt.ptr {tt.divisibility = 16 : i32}, %arg5: !tt.ptr {tt.divisibility = 16 : i32}, %arg6: !tt.ptr {tt.divisibility = 16 : i32}, %arg7: !tt.ptr {tt.divisibility = 16 : i32}, %arg8: !tt.ptr {tt.divisibility = 16 : i32}, %arg9: !tt.ptr {tt.divisibility = 16 : i32}, %arg10: !tt.ptr {tt.divisibility = 16 : i32}, %arg11: !tt.ptr {tt.divisibility = 16 : i32}, %arg12: !tt.ptr {tt.divisibility = 16 : i32}, %arg13: !tt.ptr {tt.divisibility = 16 : i32}, %arg14: !tt.ptr {tt.divisibility = 16 : i32}, %arg15: !tt.ptr {tt.divisibility = 16 : i32}, %arg16: i32 {tt.divisibility = 16 : i32}) { - %cst = arith.constant dense<1.000000e+00> : tensor<1024xf32, #blocked0> - %cst_0 = arith.constant dense<5.000000e-04> : tensor<1024xf32, #blocked0> - %cst_1 = arith.constant dense<0.999499976> : tensor<1024xf32, #blocked0> -@@ -775,7 +775,7 @@ func public @long_func(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: - // A mnist model from torch inductor. - // Check if topological sort is working correct and there's no unnecessary convert - // CHECK-LABEL: mnist --func public @mnist(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: i32 {tt.divisibility = 16 : i32}, %arg3: i32) { -+func.func public @mnist(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: i32 {tt.divisibility = 16 : i32}, %arg3: i32) { - // CHECK-NOT: triton_gpu.convert_layout - %cst = arith.constant dense<10> : tensor<16x1xi32, #blocked2> - %cst_0 = arith.constant dense<10> : tensor<1x16xi32, #blocked3> -@@ -862,7 +862,7 @@ func public @mnist(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt. - #blocked5 = #triton_gpu.blocked<{sizePerThread = [1, 4], threadsPerWarp = [2, 16], warpsPerCTA = [8, 1], order = [1, 0]}> - // cmpf and cmpi have different operands and result types - // CHECK-LABEL: cmp --func public @cmp(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: !tt.ptr {tt.divisibility = 16 : i32}, %arg4: i32 {tt.divisibility = 16 : i32}, %arg5: i32 {tt.divisibility = 16 : i32}) { -+func.func public @cmp(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: !tt.ptr {tt.divisibility = 16 : i32}, %arg4: i32 {tt.divisibility = 16 : i32}, %arg5: i32 {tt.divisibility = 16 : i32}) { - %c64 = arith.constant 64 : index - %c2048 = arith.constant 2048 : index - %c0 = arith.constant 0 : index -diff --git a/test/TritonGPU/loop-pipeline.mlir b/test/TritonGPU/loop-pipeline.mlir -index 6ee3b15fbc..663f2da7b0 100644 ---- a/test/TritonGPU/loop-pipeline.mlir -+++ b/test/TritonGPU/loop-pipeline.mlir -@@ -10,7 +10,7 @@ - #A = #triton_gpu.dot_op<{opIdx = 0, parent = #C}> - #B = #triton_gpu.dot_op<{opIdx = 1, parent = #C}> - --// CHECK: func @matmul_loop -+// CHECK: func.func @matmul_loop - // CHECK-DAG: %[[CONSTANT_0:.*]] = arith.constant 0 : i32 - // CHECK-DAG: %[[CONSTANT_1:.*]] = arith.constant 1 : i32 - // CHECK-DAG: %[[CONSTANT_2:.*]] = arith.constant 2 : i32 -@@ -46,8 +46,8 @@ - // CHECK-DAG: %[[NEXT_PIPELINE_IDX:.*]] = arith.addi %[[PIPELINE_IDX]], %[[CONSTANT_1]] - // CHECK-DAG: %[[NEXT_LOOP_IDX:.*]] = arith.addi %[[LOOP_IDX]], %[[CONSTANT_1]] - // CHECK: scf.yield {{.*}}, {{.*}}, {{.*}}, %[[NEXT_A_BUFFER]], %[[NEXT_B_BUFFER]], %[[NEXT_A]], %[[NEXT_B]], {{.*}}, {{.*}}, {{.*}}, %[[NEXT_PIPELINE_IDX]], %[[NEXT_LOOP_IDX]] --func @matmul_loop(%lb : index, %ub : index, %step : index, -- %A : !tt.ptr {tt.divisibility = 16 : i32}, -+func.func @matmul_loop(%lb : index, %ub : index, %step : index, -+ %A : !tt.ptr {tt.divisibility = 16 : i32}, - %B : !tt.ptr {tt.divisibility = 16 : i32}) { - // A ptrs - %a_ptr_splat = tt.splat %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> -@@ -61,7 +61,7 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, - %b_tmp1 = tt.expand_dims %b_tmp0 {axis = 0 : i32} : (tensor<128xi32, #BLs0>) -> tensor<1x128xi32, #BL> - %b_offs = tt.broadcast %b_tmp1 : (tensor<1x128xi32, #BL>) -> tensor<32x128xi32, #BL> - %b_ptr_init = tt.addptr %b_ptr_splat, %b_offs : tensor<32x128x!tt.ptr, #BL>, tensor<32x128xi32, #BL> -- -+ - - %a_mask = arith.constant dense : tensor<128x32xi1, #AL> - %a_other = arith.constant dense<0.00e+00> : tensor<128x32xf16, #AL> -@@ -88,7 +88,7 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, - } - - --// CHECK: func @matmul_loop_nested -+// CHECK: func.func @matmul_loop_nested - // CHECK-DAG: %[[CONSTANT_0:.*]] = arith.constant 0 : i32 - // CHECK-DAG: %[[CONSTANT_1:.*]] = arith.constant 1 : i32 - // CHECK-DAG: %[[CONSTANT_2:.*]] = arith.constant 2 : i32 -@@ -118,8 +118,8 @@ func @matmul_loop(%lb : index, %ub : index, %step : index, - // CHECK-DAG: %[[NEXT_PIPELINE_IDX:.*]] = arith.addi %[[PIPELINE_IDX]], %[[CONSTANT_1]] - // CHECK-DAG: %[[NEXT_LOOP_IDX:.*]] = arith.addi %[[LOOP_IDX]], %[[CONSTANT_1]] - // CHECK: scf.yield {{.*}}, {{.*}}, {{.*}}, %[[NEXT_A_BUFFER]], %[[NEXT_B_BUFFER]], %[[NEXT_A]], %[[NEXT_B]], {{.*}}, {{.*}}, {{.*}}, %[[NEXT_PIPELINE_IDX]], %[[NEXT_LOOP_IDX]] --func @matmul_loop_nested(%lb : index, %ub : index, %step : index, -- %A : !tt.ptr {tt.divisibility = 16 : i32}, -+func.func @matmul_loop_nested(%lb : index, %ub : index, %step : index, -+ %A : !tt.ptr {tt.divisibility = 16 : i32}, - %B : !tt.ptr {tt.divisibility = 16 : i32}) { - scf.for %iv0 = %lb to %ub step %step { - // A ptrs -@@ -134,7 +134,7 @@ func @matmul_loop_nested(%lb : index, %ub : index, %step : index, - %b_tmp1 = tt.expand_dims %b_tmp0 {axis = 0 : i32} : (tensor<128xi32, #BLs0>) -> tensor<1x128xi32, #BL> - %b_offs = tt.broadcast %b_tmp1 : (tensor<1x128xi32, #BL>) -> tensor<32x128xi32, #BL> - %b_ptr_init = tt.addptr %b_ptr_splat, %b_offs : tensor<32x128x!tt.ptr, #BL>, tensor<32x128xi32, #BL> -- -+ - %a_mask = arith.constant dense : tensor<128x32xi1, #AL> - %a_other = arith.constant dense<0.00e+00> : tensor<128x32xf16, #AL> - %b_mask = arith.constant dense : tensor<32x128xi1, #BL> -@@ -161,7 +161,7 @@ func @matmul_loop_nested(%lb : index, %ub : index, %step : index, - } - - --// CHECK: func @matmul_loop_single_pipeline -+// CHECK: func.func @matmul_loop_single_pipeline - // CHECK-DAG: %[[CONSTANT_0:.*]] = arith.constant 0 : i32 - // CHECK-DAG: %[[CONSTANT_1:.*]] = arith.constant 1 : i32 - // CHECK-DAG: %[[CONSTANT_2:.*]] = arith.constant 2 : i32 -@@ -183,8 +183,8 @@ func @matmul_loop_nested(%lb : index, %ub : index, %step : index, - // CHECK-DAG: %[[NEXT_PIPELINE_IDX:.*]] = arith.addi %[[PIPELINE_IDX]], %[[CONSTANT_1]] - // CHECK-DAG: %[[NEXT_LOOP_IDX:.*]] = arith.addi %[[LOOP_IDX]], %[[CONSTANT_1]] - // CHECK: scf.yield {{.*}}, {{.*}}, %[[NEXT_B_BUFFER]], %[[NEXT_B]], {{.*}}, {{.*}}, %[[NEXT_PIPELINE_IDX]], %[[NEXT_LOOP_IDX]] --func @matmul_loop_single_pipeline(%lb : index, %ub : index, %step : index, -- %A : !tt.ptr {tt.divisibility = 16 : i32}, -+func.func @matmul_loop_single_pipeline(%lb : index, %ub : index, %step : index, -+ %A : !tt.ptr {tt.divisibility = 16 : i32}, - %B : !tt.ptr {tt.divisibility = 16 : i32}) { - // A ptrs - %a_ptr_splat = tt.splat %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> -diff --git a/test/TritonGPU/matmul.mlir b/test/TritonGPU/matmul.mlir -index 9bd5318e1e..01dc3f0ab1 100644 ---- a/test/TritonGPU/matmul.mlir -+++ b/test/TritonGPU/matmul.mlir -@@ -4,7 +4,7 @@ - // CHECK: offset = 49152, size = 49152 - // CHECK: size = 98304 - module { --func @matmul_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32_i32_i32_i32_i32_i32_i32__12c64_13c64_14c64_15c8(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32, %arg4: i32, %arg5: i32, %arg6: i32 {tt.divisibility = 16 : i32}, %arg7: i32, %arg8: i32 {tt.divisibility = 16 : i32}, %arg9: i32, %arg10: i32 {tt.divisibility = 16 : i32}, %arg11: i32) { -+func.func @matmul_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32_i32_i32_i32_i32_i32_i32__12c64_13c64_14c64_15c8(%arg0: !tt.ptr {tt.divisibility = 16 : i32}, %arg1: !tt.ptr {tt.divisibility = 16 : i32}, %arg2: !tt.ptr {tt.divisibility = 16 : i32}, %arg3: i32, %arg4: i32, %arg5: i32, %arg6: i32 {tt.divisibility = 16 : i32}, %arg7: i32, %arg8: i32 {tt.divisibility = 16 : i32}, %arg9: i32, %arg10: i32 {tt.divisibility = 16 : i32}, %arg11: i32) { - %cst = arith.constant dense : tensor<64x64xi1> - %c64 = arith.constant 64 : index - %c0 = arith.constant 0 : index -@@ -22,7 +22,7 @@ func @matmul_kernel__Pfp32_Pfp32_Pfp32_i32_i32_i32_i32_i32_i32_i32_i32_i32__12c6 - %7 = arith.muli %6, %c8_i32 : i32 - %8 = arith.subi %2, %7 : i32 - %9 = arith.cmpi slt, %8, %c8_i32 : i32 -- %10 = select %9, %8, %c8_i32 : i32 -+ %10 = arith.select %9, %8, %c8_i32 : i32 - %11 = arith.remsi %0, %10 : i32 - %12 = arith.addi %7, %11 : i32 - %13 = arith.remsi %0, %5 : i32 -diff --git a/test/TritonGPU/prefetch.mlir b/test/TritonGPU/prefetch.mlir -index 52b4dddec1..b427547890 100644 ---- a/test/TritonGPU/prefetch.mlir -+++ b/test/TritonGPU/prefetch.mlir -@@ -11,7 +11,7 @@ - #B_OP = #triton_gpu.dot_op<{opIdx = 1, parent = #C}> - - --// CHECK: func @matmul_loop -+// CHECK: func.func @matmul_loop - // CHECK-DAG: %[[A0_PREFETCH_SMEM:.*]] = tensor.extract_slice %[[A0:.*]][0, 0] [128, 16] - // CHECK-DAG: %[[A0_PREFETCH:.*]] = triton_gpu.convert_layout %[[A0_PREFETCH_SMEM]] - // CHECK-DAG: %[[B0_PREFETCH_SMEM:.*]] = tensor.extract_slice %[[B0:.*]][0, 0] [16, 128] -@@ -28,7 +28,7 @@ - // CHECK-DAG: %[[NEXT_B_PREFETCH_SMEM:.*]] = tensor.extract_slice {{.*}}[0, 0] [16, 128] - // CHECK-DAG: %[[NEXT_B_PREFETCH:.*]] = triton_gpu.convert_layout %[[NEXT_B_PREFETCH_SMEM]] - // CHECK: scf.yield {{.*}}, {{.*}}, {{.*}}, {{.*}}, {{.*}}, %[[NEXT_A_PREFETCH]], %[[NEXT_B_PREFETCH]] --func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { -+func.func @matmul_loop(%lb : index, %ub : index, %step : index, %A : !tt.ptr, %B : !tt.ptr) { - %a_ptr_init = tt.broadcast %A : (!tt.ptr) -> tensor<128x32x!tt.ptr, #AL> - %b_ptr_init = tt.broadcast %B : (!tt.ptr) -> tensor<32x128x!tt.ptr, #BL> - -diff --git a/test/TritonGPU/update-mma-for-volta.mlir b/test/TritonGPU/update-mma-for-volta.mlir -index d587fffcca..7571ec6185 100644 ---- a/test/TritonGPU/update-mma-for-volta.mlir -+++ b/test/TritonGPU/update-mma-for-volta.mlir -@@ -15,7 +15,7 @@ - // CHECK: [[new_mma:#mma.*]] = #triton_gpu.mma<{versionMajor = 1, versionMinor = 3, warpsPerCTA = [4, 2]}> - module attributes {"triton_gpu.num-warps" = 16 : i32} { - // CHECK-LABEL: dot_mmav1 -- func @dot_mmav1(%A: tensor<64x64xf16, #blocked0>, %B: tensor<64x64xf16, #blocked0>) -> tensor<64x64xf32, #blocked0> { -+ func.func @dot_mmav1(%A: tensor<64x64xf16, #blocked0>, %B: tensor<64x64xf16, #blocked0>) -> tensor<64x64xf32, #blocked0> { - %C = arith.constant dense<0.000000e+00> : tensor<64x64xf32, #blocked0> - %AA = triton_gpu.convert_layout %A : (tensor<64x64xf16, #blocked0>) -> tensor<64x64xf16, #dot_operand_a> - %BB = triton_gpu.convert_layout %B : (tensor<64x64xf16, #blocked0>) -> tensor<64x64xf16, #dot_operand_b> -@@ -50,7 +50,7 @@ module attributes {"triton_gpu.num-warps" = 16 : i32} { - - module attributes {"triton_gpu.num-warps" = 16 : i32} { - // CHECK-LABEL: dot_mmav1 -- func @dot_mmav1(%A: tensor<64x64xf16, #blocked0>, %B: tensor<64x64xf16, #blocked0>) -> tensor<64x64xf32, #blocked0> { -+ func.func @dot_mmav1(%A: tensor<64x64xf16, #blocked0>, %B: tensor<64x64xf16, #blocked0>) -> tensor<64x64xf32, #blocked0> { - %C = arith.constant dense<0.000000e+00> : tensor<64x64xf32, #blocked0> - %AA = triton_gpu.convert_layout %A : (tensor<64x64xf16, #blocked0>) -> tensor<64x64xf16, #dot_operand_a> - %BB = triton_gpu.convert_layout %B : (tensor<64x64xf16, #blocked0>) -> tensor<64x64xf16, #dot_operand_b> -diff --git a/test/lib/Analysis/TestAlias.cpp b/test/lib/Analysis/TestAlias.cpp -index 88a4118fe9..3fd0cfd0d3 100644 ---- a/test/lib/Analysis/TestAlias.cpp -+++ b/test/lib/Analysis/TestAlias.cpp -@@ -9,10 +9,10 @@ using namespace mlir; - namespace { - - struct TestAliasPass -- : public PassWrapper> { -+ : public PassWrapper> { -+ -+ MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAliasPass); - -- // LLVM15+ -- // MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAliasPass); - static void print(StringRef name, SmallVector &vals, - raw_ostream &os) { - if (vals.empty()) -@@ -39,23 +39,24 @@ struct TestAliasPass - auto opName = SymbolTable::getSymbolName(operation).getValue().str(); - os << opName << "\n"; - -- SharedMemoryAliasAnalysis analysis(&getContext()); -- analysis.run(operation); -+ std::unique_ptr solver = createDataFlowSolver(); -+ SharedMemoryAliasAnalysis *analysis = -+ solver->load(); -+ if (failed(solver->initializeAndRun(operation))) -+ return signalPassFailure(); - - AsmState state(operation->getParentOfType()); - // Get operation ids of value's aliases - auto getAllocOpNames = [&](Value value) { -- LatticeElement *latticeElement = -- analysis.lookupLatticeElement(value); -+ dataflow::Lattice *latticeElement = -+ analysis->getLatticeElement(value); - SmallVector opNames; -- if (latticeElement) { -+ if (latticeElement && !latticeElement->isUninitialized()) { - auto &info = latticeElement->getValue(); -- if (!info.getAllocs().empty()) { -- for (auto &alias : info.getAllocs()) { -- auto opName = -- getValueOperandName(alias.getDefiningOp()->getResult(0), state); -- opNames.push_back(std::move(opName)); -- } -+ for (auto &alias : info.getAllocs()) { -+ auto opName = -+ getValueOperandName(alias.getDefiningOp()->getResult(0), state); -+ opNames.push_back(std::move(opName)); - } - } - // Ensure deterministic output -diff --git a/test/lib/Analysis/TestAllocation.cpp b/test/lib/Analysis/TestAllocation.cpp -index 84108c4d36..35e42242bd 100644 ---- a/test/lib/Analysis/TestAllocation.cpp -+++ b/test/lib/Analysis/TestAllocation.cpp -@@ -6,10 +6,9 @@ using namespace mlir; - namespace { - - struct TestAllocationPass -- : public PassWrapper> { -+ : public PassWrapper> { - -- // LLVM15+ -- // MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAllocationPass); -+ MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAllocationPass); - - StringRef getArgument() const final { return "test-print-allocation"; } - StringRef getDescription() const final { -diff --git a/test/lib/Analysis/TestAxisInfo.cpp b/test/lib/Analysis/TestAxisInfo.cpp -index a5205bb0a0..22347c32f0 100644 ---- a/test/lib/Analysis/TestAxisInfo.cpp -+++ b/test/lib/Analysis/TestAxisInfo.cpp -@@ -1,25 +1,15 @@ - #include "mlir/Pass/Pass.h" - #include "triton/Analysis/AxisInfo.h" -+#include "triton/Analysis/Utility.h" - - using namespace mlir; - - namespace { - - struct TestAxisInfoPass -- : public PassWrapper> { -+ : public PassWrapper> { - -- // LLVM15+ -- // MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAlignmentPass); -- -- void print(const std::string &name, raw_ostream &os, ArrayRef vals) { -- os << name << ": ["; -- for (size_t d = 0; d < vals.size(); d++) { -- if (d != 0) -- os << ", "; -- os << vals[d]; -- } -- os << "]"; -- } -+ MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestAxisInfoPass); - - StringRef getArgument() const final { return "test-print-alignment"; } - StringRef getDescription() const final { -@@ -30,38 +20,19 @@ struct TestAxisInfoPass - Operation *operation = getOperation(); - auto &os = llvm::errs(); - auto opName = SymbolTable::getSymbolName(operation).getValue().str(); -- os << opName << "\n"; -- AxisInfoAnalysis analysis(&getContext()); -- analysis.run(operation); -+ os << "@" << opName << "\n"; -+ -+ std::unique_ptr solver = createDataFlowSolver(); -+ AxisInfoAnalysis *analysis = solver->load(); -+ if (failed(solver->initializeAndRun(operation))) -+ return signalPassFailure(); - operation->walk([&](Operation *op) { - if (op->getNumResults() < 1) - return; - for (Value result : op->getResults()) { -- // std::ostringstream oss; -- // result.print(oss); -- // os << " => "; -- LatticeElement *latticeElement = -- analysis.lookupLatticeElement(result); -- if (!latticeElement) { -- os << "None\n"; -- return; -- } -- AxisInfo &info = latticeElement->getValue(); -- print("Contiguity", os, info.getContiguity()); -- os << " ; "; -- print("Divisibility", os, info.getDivisibility()); -- os << " ; "; -- print("Constancy", os, info.getConstancy()); -- os << " ; "; -- auto constantValue = info.getConstantValue(); -- os << "ConstantValue: ["; -- if (constantValue.has_value()) -- os << constantValue.value(); -- else -- os << "None"; -- os << "] ( "; - result.print(os); -- os << " ) "; -+ os << " => "; -+ analysis->getLatticeElement(result)->getValue().print(os); - os << "\n"; - } - }); -diff --git a/test/lib/Analysis/TestMembar.cpp b/test/lib/Analysis/TestMembar.cpp -index df4279fe24..ab9b9f3fb7 100644 ---- a/test/lib/Analysis/TestMembar.cpp -+++ b/test/lib/Analysis/TestMembar.cpp -@@ -1,4 +1,4 @@ --#include "mlir/Dialect/GPU/GPUDialect.h" -+#include "mlir/Dialect/GPU/IR/GPUDialect.h" - #include "mlir/IR/Dialect.h" - #include "mlir/Pass/Pass.h" - #include "triton/Analysis/Allocation.h" -@@ -9,10 +9,9 @@ using namespace mlir; - namespace { - - struct TestMembarPass -- : public PassWrapper> { -+ : public PassWrapper> { - -- // LLVM15+ -- // MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestMembarPass); -+ MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestMembarPass); - - StringRef getArgument() const final { return "test-print-membar"; } - StringRef getDescription() const final { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix index 68eead616b..da10f6ffbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openaiauth/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; + hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openant/default.nix index 71f699e055..ed14282616 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openant/default.nix @@ -1,38 +1,60 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools , pyusb +, influxdb-client +, pyserial +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "openant-unstable"; - version = "2017-02-11"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Tigge"; repo = "openant"; - rev = "ed89281e37f65d768641e87356cef38877952397"; - sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ook9dwcyWvpaGylVDjBxQ2bnXRUBPYQHo6Wub+ISpwE="; }; - # Removes some setup.py hacks intended to install udev rules. - # We do the job ourselves in postInstall below. - postPatch = '' - sed -i -e '/cmdclass=.*/d' setup.py - ''; + nativeBuildInputs = [ + setuptools + ]; postInstall = '' install -dm755 "$out/etc/udev/rules.d" - install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules" + install -m644 resources/42-ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules" ''; propagatedBuildInputs = [ pyusb ]; + passthru.optional-dependencies = { + serial = [ + pyserial + ]; + influx = [ + influxdb-client + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "openant" + ]; + meta = with lib; { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix index b9593b0e13..282c659291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-2OcGaZQwzgxcwrXinmJjFc91620Ri0O79c8WZWfDdlQ="; + hash = "sha256-8zD4SDGH7Pcu54CcBTJ9Q2sbYfWP4OyNh5STatZ7pAk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-pydantic/default.nix deleted file mode 100644 index 1930dc237f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-pydantic/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pydantic -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "openapi-schema-pydantic"; - version = "1.2.4"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-PiLPWLdKafdSzH5fFTf25EFkKC2ycAy7zTu5nd0GUZY="; - }; - - propagatedBuildInputs = [ - pydantic - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # these tests are broken with `pydantic >= 1.10` - # but this library seems to work fine. - # e.g. https://github.com/hwchase17/langchain/blob/d86ed15d8884d5a3f120a433b9dda065647e4534/poetry.lock#L6011-L6012 - "test_pydantic_discriminator_schema_generation" - "test_pydantic_discriminator_openapi_generation" - ]; - - meta = with lib; { - description = "OpenAPI (v3) specification schema as pydantic class"; - homepage = "https://github.com/kuimono/openapi-schema-pydantic"; - changelog = "https://github.com/kuimono/openapi-schema-pydantic/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix new file mode 100644 index 0000000000..72e852d209 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi3/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +, pyyaml +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "openapi3"; + version = "1.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + src = fetchPypi { + inherit pname version; + hash = "sha256-ohpJBXPYnKaa2ny+WFrbL8pJZCV/bzod9THxKBVFXSw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + pyyaml + ]; + + nativeCheckinputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "openapi3" + ]; + + meta = with lib; { + changelog = "https://github.com/Dorthu/openapi3/releases/tag/${version}"; + description = "A Python3 OpenAPI 3 Spec Parser"; + homepage = "https://github.com/Dorthu/openapi3"; + license = licenses.bsd3; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 132ce33264..7250a0841f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "opencensus-ext-azure"; - version = "1.1.9"; + version = "1.1.11"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-UHYIt36djqq2/9X/EbfOuH9U5KapQMS4FDMbTRsDQVE="; + hash = "sha256-IdTU0FGdSCOdBBQskLalH17MBDaE64DPoKcBqiM0YHM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix index 5fd2e6316b..2dd395bab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix @@ -5,8 +5,11 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling +, attrs +, cattrs , httpx , openllm-core +, orjson , soundfile , transformers }: @@ -14,7 +17,7 @@ buildPythonPackage rec { inherit (openllm-core) src version; pname = "openllm-client"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,8 +30,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + attrs + cattrs httpx - openllm-core + orjson ]; passthru.optional-dependencies = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix index 3f2c80cf0a..75b755740d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.2.27"; - format = "pyproject"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U="; + hash = "sha256-M/ckvaHTdKFg7xfUgFxu7pRBrS6TGw0m2U3L88b2DKU="; }; sourceRoot = "source/openllm-core"; @@ -67,6 +67,7 @@ buildPythonPackage rec { ] ++ transformers.optional-dependencies.torch ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.accelerate; + full = with passthru.optional-dependencies; ( vllm ++ fine-tune ); }; # there is no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openllm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openllm/default.nix index 63974fa8be..b9f3d2b6fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openllm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openllm/default.nix @@ -15,6 +15,7 @@ , einops , fairscale , flax +, ghapi , hypothesis , ipython , jax @@ -35,6 +36,7 @@ , pytest-xdist , ray , safetensors +, scipy , sentencepiece , soundfile , syrupy @@ -49,7 +51,7 @@ buildPythonPackage rec { inherit (openllm-core) src version; pname = "openllm"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -68,17 +70,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + accelerate bentoml bitsandbytes click + ghapi openllm-client + openllm-core optimum safetensors tabulate transformers ] ++ bentoml.optional-dependencies.io ++ tabulate.optional-dependencies.widechars - # ++ transformers.optional-dependencies.accelerate ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.torch; @@ -119,13 +123,15 @@ buildPythonPackage rec { ]; gptq = [ # auto-gptq + optimum ]; # ++ autogptq.optional-dependencies.triton; grpc = [ - openllm-client + openllm-client ] ++ openllm-client.optional-dependencies.grpc; llama = [ fairscale sentencepiece + scipy ]; mpt = [ einops @@ -134,7 +140,7 @@ buildPythonPackage rec { openai = [ openai tiktoken - ]; + ] ++ openai.optional-dependencies.embeddings; opt = [ flax jax @@ -156,9 +162,10 @@ buildPythonPackage rec { ray # vllm ]; - all = with passthru.optional-dependencies; ( + full = with passthru.optional-dependencies; ( agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm ); + all = passthru.optional-dependencies.full; }; nativeCheckInputs = [ @@ -176,6 +183,8 @@ buildPythonPackage rec { export HOME=$TMPDIR # skip GPUs test on CI export GITHUB_ACTIONS=1 + # disable hypothesis' deadline + export CI=1 ''; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 03a33ef26a..799c991e40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, et_xmlfile +, et-xmlfile , fetchFromGitLab , jdcal , lxml @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jdcal - et_xmlfile + et-xmlfile lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix index d62c8450cd..5b7a0bc0f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub }: rec { - version = "3.5.1"; + version = "3.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; + hash = "sha256-bboTRZqJq5tKeBQuiEQAXxTHYvoldDQlwbfehjDA8EE="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix index 622917e8a3..ea90e089ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/daemon.nix @@ -11,6 +11,7 @@ , pyudev , setproctitle , wrapGAppsHook +, notify2 }: let @@ -39,6 +40,7 @@ buildPythonPackage (common // { pygobject3 pyudev setproctitle + notify2 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix index f126651473..3f2c965cbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix @@ -1,53 +1,81 @@ -{ aiohttp -, botocore +{ lib , buildPythonPackage -, certifi , fetchFromGitHub -, lib + +# build-system +, setuptools + +# dependencies +, certifi +, python-dateutil +, requests +, six +, urllib3 + +# optional-dependencies +, aiohttp + +# tests +, botocore , mock , pytest-asyncio +, pytest-mock , pytestCheckHook , pyyaml -, requests -, urllib3 +, pytz }: buildPythonPackage rec { pname = "opensearch-py"; - version = "2.3.1"; - format = "setuptools"; + version = "2.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-aM3N47GM5ABvkjP+SZ+Uvnoh6eTF6wvAPJ1xR10ohJg="; + hash = "sha256-nfKUJjB3yAUGiCSLK3xXHQmtDenVZpLjgICR2hMv1aA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - botocore certifi + python-dateutil requests + six urllib3 ]; + passthru.optional-dependencies.async = [ + aiohttp + ]; + nativeCheckInputs = [ + botocore mock pytest-asyncio + pytest-mock pytestCheckHook pyyaml + pytz ] ++ passthru.optional-dependencies.async; disabledTestPaths = [ # require network "test_opensearchpy/test_async/test_connection.py" "test_opensearchpy/test_async/test_server" - "test_opensearchpy/test_connection.py" "test_opensearchpy/test_server" "test_opensearchpy/test_server_secured" ]; - passthru.optional-dependencies.async = [ aiohttp ]; + disabledTests = [ + # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None) + "test_ca_certs_ssl_cert_dir" + "test_no_ca_certs" + ]; meta = { description = "Python low-level client for OpenSearch"; 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 2d2fbc0dbd..00b2128db2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk="; + hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix index 1ccb00617a..289784d4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,15 +14,15 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.18.0"; + version = "1.20.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python"; - rev = "refs/tags/v${self.version}"; - hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-tOg3G6BjHInY5TFYyS7/JA4mQajeP0b1QjrZBGqiqnM="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 71c742c0ba..8a43e9b4cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , hatchling +, backoff , opentelemetry-api , opentelemetry-proto , opentelemetry-sdk @@ -23,6 +24,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + backoff opentelemetry-sdk opentelemetry-proto ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 331a5e8643..4ee758ea56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.39b0"; + version = "1.16.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + hash = "sha256-6tGQjPBej2zv5yJN0S46le3kyD7q3TELYyDmyxlp5Wo="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix index 54b16712fe..72e83c2166 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.35"; + version = "0.0.39"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-bS9KsPMuzQ+4AXsVzKiCevZujU4iW2hZ+eSJheM4NRI="; + hash = "sha256-5JcediHl2TeMhYa6OJqoW5K0SlAjdIrMwj2IHh3qW7I="; }; pythonRemoveDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opsdroid_get_image_size/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opsdroid-get-image-size/default.nix similarity index 60% rename from third_party/nixpkgs/pkgs/development/python-modules/opsdroid_get_image_size/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/opsdroid-get-image-size/default.nix index 0f33da4414..edd09d2750 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opsdroid_get_image_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opsdroid-get-image-size/default.nix @@ -1,15 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi +, setuptools }: buildPythonPackage rec { - pname = "opsdroid_get_image_size"; + pname = "opsdroid-get-image-size"; version = "0.2.2"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "124j2xvfxv09q42qfb8nqlcn55y7f09iayrix3yfyrs2qyzav78a"; + pname = "opsdroid_get_image_size"; + inherit version; + hash = "sha256-Cp2tvsdCZ+/86DF7FRNwx5diGcUWLYcFwQns7nYXkog="; }; + nativeBuildInputs = [ + setuptools + ]; + # test data not included on pypi doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix index 0c8a9a738a..3b38fcc2c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.12.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; + hash = "sha256-fCLMDbWfEAG7pTFKWv67fpr6lNTxRTCBkppgDZR51eY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix index f3b41af020..7a3b3cca06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -13,6 +13,7 @@ , distributed , fakeredis , fastai +, google-cloud-storage , lightgbm , matplotlib , mlflow @@ -43,7 +44,7 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -52,7 +53,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; rev = "refs/tags/v${version}"; - hash = "sha256-uHv8uEJOQO1+AeNSxBtnCt6gDQHLT1RToF4hfolVVX0="; + hash = "sha256-WUjO13NxX0FneOPS4nn6aHq48X95r+GJR/Oxir6n8Pk="; }; nativeBuildInputs = [ @@ -62,7 +63,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic - cmaes colorlog numpy packaging @@ -96,6 +96,8 @@ buildPythonPackage rec { optional = [ boto3 botorch + cmaes + google-cloud-storage matplotlib pandas plotly diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix index de0c449905..cdaa5ee907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-v2IlgQNsfTdWZDOANv4X7/0SStEjyDZeIvJ0LQvSN68="; + hash = "sha256-4o7ZBG8nNdwt1bvN82Z/KE44Tg7H7tPus3mPqKfUfjY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix index 2673151654..e40a9a03e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -8,22 +8,21 @@ , docutils , filelock , lockfile +, numpy , pytest-qt , pytestCheckHook -, python , qasync , qt5 -, writeShellScript -, xvfb-run +, requests-cache }: buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.1.31"; + version = "0.1.35"; src = fetchPypi { inherit pname version; - hash = "sha256-kqh/c0pEWFLqf1BMD79li1MqLpH/4xrdTH9+/7YO/tg="; + hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18="; }; propagatedBuildInputs = [ @@ -34,7 +33,9 @@ buildPythonPackage rec { docutils filelock lockfile + numpy qasync + requests-cache ]; pythonImportsCheck = [ "orangecanvas" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix index ee556ab39f..c89a1a8e2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.21.0"; + version = "4.22.0"; src = fetchPypi { inherit pname version; - hash = "sha256-43JeEdgEb6WS7PySW1x08fn02yl9Q/HwwKo6ojaqiH0="; + hash = "sha256-nV2aBPZzn7K+QECtCVoLLh5smG31zE2G9jFTKlxh9qM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix index cff4a603c8..1100ae7f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -44,8 +44,7 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.35.0"; - format = "pyproject"; + version = "3.36.2"; disabled = pythonOlder "3.7"; @@ -53,7 +52,7 @@ let owner = "biolab"; repo = "orange3"; rev = "refs/tags/${version}"; - hash = "sha256-dj/Z4uOjA4nidd45dnHZDyHZP6Fy/MGC8asqOPV7U7A="; + hash = "sha256-v9lk5vGhBaR2PHZ+Jq0hy1WaCsbeLe+vZlTaHBkfacU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index 934b65298f..fb81938bc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.4"; + version = "3.9.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WS4qynQmJIVdDf0sYK/HFVQ+F5nfoJwx/zzmaL6YTRc="; + hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hGUXPTiKvKygxQzxXAO/+bD34eLnpkhQ7r/g27E+d4I="; + hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix index 90b56b3cd4..e50d9b2788 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; + hash = "sha256-Yd5ex0bcy61zq5Sn2dKeb98s/CMxUWnyGx6jFWQ3RUs="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix index b70de2a16e..50a544c1d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.1.1"; + version = "9.2.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-sHZUtT2HeSro5zmWKtcpxSnJk4oRjYkezp7jHVlxa8k="; + hash = "sha256-/+sBymWmA9VSWQXxqIozGb4Jzixqw3bEMSquwoMJWHg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index 659d8b816b..a8052d4211 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.3.1"; + version = "14.0.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; + hash = "sha256-nAipzYOOv/rSHrMBL64AKg93v5Vpb6RNBbG2OiJ+n8E="; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix index bfa6084481..e4d0f9f75d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-7RBoa3X3xgeCUXemaRVfTiWc459hQ6N19jWbvKpKNc0="; + hash = "sha256-4rgp8gW/HrYgR1bMNAJ9EZSUti0nH+7oYL+BbKegfq0="; }; postPatch = '' 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 f076574bfd..0d55f870e5 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 @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.1.0"; + version = "6.2.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-drwBCNUKypcraP7IKY55G1+8vrmlGifGmGtBsKamLus="; + hash = "sha256-EyK6BfoP88Gor8cn/PlF31qoLWWEcn0uBK8Di1roQkQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix index 62a98425a9..a62410ecdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.18.2"; + version = "2.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-xbbdzuaUvFnXA5glGr/1/s1Bm28d4XbtuvCKaj8Js68="; + hash = "sha256-jDSXPVyy8XvPgsGZXsdfavFPptq28pCwr9C63OZvNrY="; }; nativeBuildInputs = [ @@ -108,6 +108,8 @@ buildPythonPackage rec { "test_crypto_get_compact_deprecated_kms" # RuntimeError "test_crypto_put" + # Tests require network access + "test_write_get_object_response" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix index d902af2c26..26c62b70c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -63,6 +63,8 @@ buildPythonPackage rec { "test_wmts_example_informatievlaanderen" "test_opensearch_creodias" ] ++ lib.optionals stdenv.isDarwin [ + "test_ogcapi_processes_pygeoapi" + "test_ogcapi_records_pycsw" "test_ogcapi_records_pygeoapi" "test_wms_getfeatureinfo_130" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix index 1719401044..e358c2ec49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.0.6"; + version = "1.1.0"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-qHy6+RKh/gjy1mBmIj+1ENcHuIERkOeM6rrd5GNfX+Q="; + hash = "sha256-HI/lIj9ezdCry5fYDi5Pia6hvOjN6/Slm9BMfLeq8AU="; }; in buildPythonPackage { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix index c75d6e87e0..4cc4d283a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix @@ -28,7 +28,7 @@ }: let - version = "2.7.0"; + version = "2.7.1"; in buildPythonPackage { pname = "paddleocr"; @@ -39,7 +39,7 @@ buildPythonPackage { owner = "PaddlePaddle"; repo = "PaddleOCR"; rev = "v${version}"; - hash = "sha256-r7Y666KpY855NCSinCBBUz9PXHfZ56+oZW1/0ISpWe4="; + hash = "sha256-5Dt4UL+7dwJNjcNnCVi3o8bLCt7/m/M6oh1vPu9rza8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix index bd13c28889..2f7cb7138c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix @@ -2,19 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "palettable"; - version = "3.3.2"; - - format = "setuptools"; + version = "3.3.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aoZ8Qlov8ojqtDVr7ewA3gBt7jbJmmFHwuGwXeeJrJ8="; + sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index e64f61e0dd..588dae7b78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -1,13 +1,15 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # build-system , cython +, meson-python +, meson , oldest-supported-numpy -, setuptools +, pkg-config , versioneer , wheel @@ -63,24 +65,37 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.0.3"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; + src = fetchFromGitHub { + owner = "pandas-dev"; + repo = "pandas"; + rev = "refs/tags/v${version}"; + hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace "meson==1.2.1" "meson>=1.2.1" + ''; + nativeBuildInputs = [ - setuptools cython + meson-python + meson numpy - oldest-supported-numpy + pkg-config versioneer wheel - ] ++ versioneer.optional-dependencies.toml; + ] + ++ versioneer.optional-dependencies.toml + ++ lib.optionals (pythonOlder "3.12") [ + oldest-supported-numpy + ]; enableParallelBuilding = true; @@ -193,10 +208,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh - "--skip-db" - "--skip-slow" - "--skip-network" - "-m" "'not single_cpu and not slow_arm'" + "-m" "'not single_cpu and not slow and not network and not db and not slow_arm'" + # https://github.com/pandas-dev/pandas/issues/54907 + "--no-strict-data-files" "--numprocesses" "4" ]; @@ -208,6 +222,9 @@ buildPythonPackage rec { "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" + ] ++ lib.optional stdenv.is32bit [ + # https://github.com/pandas-dev/pandas/issues/37398 + "test_rolling_var_numerical_issues" ]; # Tests have relative paths, and need to reference compiled C extensions @@ -232,9 +249,8 @@ buildPythonPackage rec { ]; meta = with lib; { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; + # pandas devs no longer test i686, it's commonly broken + # broken = stdenv.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix index 4306579bc5..79a073af99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , flit-core , pytestCheckHook -, coveralls , numpy , decopatch , more-itertools @@ -16,23 +14,15 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-suxQht9YS+8G0RXCTuEahaI60daBda7gpncLmwySIbE="; + hash = "sha256-mYE8J7XWlvCS2H3kt0bB8dyPHFDqmW8NiH9UCrNccAU="; }; - patches = [ - (fetchpatch { - name = "replace contextlib2-with-contextlib.patch"; - url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; - hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; - }) - ]; - # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index 278556fe48..278bb0583e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -5,23 +5,23 @@ , fetchpatch , fetchPypi , gssapi +, icecream , invoke , mock , pyasn1 , pynacl -, pytest-relaxed , pytestCheckHook , six }: buildPythonPackage rec { pname = "paramiko"; - version = "2.11.0"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; + hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c="; }; patches = [ @@ -31,11 +31,6 @@ buildPythonPackage rec { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; }) - (fetchpatch { - name = "fix-sftp-tests.patch"; - url = "https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651.patch"; - hash = "sha256-H3nKT8+4CTEDoiqnlhFfuKnc/65GGfwwAm9H2lwrlK8="; - }) ]; propagatedBuildInputs = [ @@ -52,6 +47,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + icecream mock pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); @@ -70,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/paramiko/paramiko/"; + changelog = "https://github.com/paramiko/paramiko/blob/${version}/sites/www/changelog.rst"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix index 10e3cef7a6..1f2ddb3d8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; }) + (fetchpatch { + name = "_raveled_index_for.patch"; + url = "https://github.com/sods/paramz/pull/40/commits/dd68a81cfd28edb48354c6a9b493ef711f00fb5b.patch"; + hash = "sha256-nbnW3lYJDT1WXko3Y28YyELhO0QIAA1Tx0CJ57T1Nq0="; + }) ]; propagatedBuildInputs = [ numpy scipy six decorator ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix index e795ab3d49..e7ebfb5c63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; - rev = "v${version}"; - hash = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; + rev = "refs/tags/v${version}"; + hash = "sha256-dunvcSi+nN5VruvRUPIEpkyUsmeS+kIYDfS8ibDR96s="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix index 1ce34bfaab..7956a2971b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi -, buildPythonPackage, python +{ lib, fetchFromGitHub +, buildPythonPackage +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "parse"; - version = "1.19.0"; + version = "1.19.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"; + src = fetchFromGitHub { + owner = "r1chardj0n3s"; + repo = "parse"; + rev = "refs/tags/${version}"; + hash = "sha256-f08SlkGnwhSh0ajTKFqBAGGFvLj8nWBZVb6uClbRaP4="; }; - checkPhase = '' - ${python.interpreter} test_parse.py - ''; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/r1chardj0n3s/parse"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix index 5002f56409..576b548605 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix @@ -1,36 +1,34 @@ -{ buildPythonPackage -, fetchPypi -, fetchurl -, lib -, nixosTests -, python -, pythonOlder - -# pythonPackages -, hatchling -, dnspython -, expiringdict -, publicsuffix2 -, xmltodict -, geoip2 -, urllib3 -, requests -, imapclient +{ lib +, azure-identity +, azure-monitor-ingestion +, boto3 +, buildPythonPackage , dateparser -, mailsuite +, dnspython , elasticsearch , elasticsearch-dsl -, kafka-python -, tqdm -, lxml -, boto3 -, msgraph-core -, azure-identity +, expiringdict +, fetchPypi +, fetchurl +, geoip2 , google-api-core , google-api-python-client , google-auth , google-auth-httplib2 , google-auth-oauthlib +, hatchling +, imapclient +, kafka-python +, lxml +, mailsuite +, msgraph-core +, nixosTests +, publicsuffixlist +, pythonOlder +, requests +, tqdm +, urllib3 +, xmltodict }: let @@ -41,15 +39,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.4.2"; + version = "8.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; - hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk="; + hash = "sha256-ibxSp1M85WngQKdjlRC4JvLxn0rEn9oVkid/V4iD6zY="; }; postPatch = '' @@ -62,32 +59,34 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dnspython - expiringdict - publicsuffix2 - xmltodict - geoip2 - urllib3 - requests - imapclient + azure-identity + azure-monitor-ingestion + boto3 dateparser - mailsuite + dnspython elasticsearch elasticsearch-dsl - kafka-python - tqdm - lxml - boto3 - msgraph-core - azure-identity + expiringdict + geoip2 google-api-core google-api-python-client google-auth google-auth-httplib2 google-auth-oauthlib + imapclient + kafka-python + lxml + mailsuite + msgraph-core + publicsuffixlist + requests + tqdm + urllib3 + xmltodict ]; # no tests on PyPI, no tags on GitHub + # https://github.com/domainaware/parsedmarc/issues/426 doCheck = false; pythonImportsCheck = [ "parsedmarc" ]; @@ -97,11 +96,12 @@ buildPythonPackage rec { tests = nixosTests.parsedmarc; }; - meta = { + meta = with lib; { changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; description = "Python module and CLI utility for parsing DMARC reports"; homepage = "https://domainaware.github.io/parsedmarc/"; - maintainers = with lib.maintainers; [ talyz ]; - license = lib.licenses.asl20; + mainProgram = "parsedmarc"; + maintainers = with maintainers; [ talyz ]; + license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix index d633b8dfce..52e7664687 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; + hash = "sha256-qg/zXbvMgHrjdNtWMy9MGzm0b2e/KXX1FR4LQYau0NU="; }; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pasimple/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pasimple/default.nix new file mode 100644 index 0000000000..6dc52b2101 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pasimple/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pulseaudio +}: + +buildPythonPackage rec { + pname = "pasimple"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "henrikschnor"; + repo = "pasimple"; + rev = "v${version}"; + hash = "sha256-Z271FdBCqPFcQzVqGidL74nO85rO9clNvP4czAHmdEw="; + }; + + postPatch = '' + substituteInPlace pasimple/pa_simple.py --replace \ + "_libpulse_simple = ctypes.CDLL('libpulse-simple.so.0')" \ + "_libpulse_simple = ctypes.CDLL('${lib.getLib pulseaudio}/lib/libpulse-simple.so.0')" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "pasimple" + "pasimple.pa_simple" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A python wrapper for the \"PulseAudio simple API\". Supports playing and recording audio via PulseAudio and PipeWire"; + homepage = "https://github.com/henrikschnor/pasimple"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix index 2388e2d15c..3a8ec63f3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.5.3"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-W02UY9P3qjIFhR/DCpQZyvjEmJYl0MvMcGt9N4xgbaY="; + hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix index 9083f197aa..62f75cf37c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patator/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "patator"; - version = "0.9"; + version = "1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aMskvcMELuDUeiiLGai5mmxUvb1N3wxYF9m5rAoNihU="; + hash = "sha256-VQ7JPyQOY9X/7LVAvTwftoOegt4KyfERgu38HfmsYDM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix index 93f1fbcabe..ee0329c405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix @@ -1,27 +1,23 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi - -# build time -, setuptools-scm - -# tests -, pytestCheckHook , appdirs +, buildPythonPackage +, fetchPypi , packaging +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "path"; - version = "16.6.0"; + version = "16.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vqOBbh1U9OM6rHjSAxoLDtL5XmnbhbRdUfF9+XBx2mk="; + hash = "sha256-K0d/WIcDPzy+oc/YVT7mpqSY6yVAoZ9KoIKCKq3Oowo="; }; nativeBuildInputs = [ @@ -45,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object-oriented file system path manipulation"; homepage = "https://github.com/jaraco/path"; + changelog = "https://github.com/jaraco/path/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix index 6f60593054..cf9d9eaa48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage -, fetchFromGitHub , dill +, fetchFromGitHub +, multiprocess , pox , ppft -, multiprocess , pythonOlder }: buildPythonPackage rec { pname = "pathos"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; rev = "refs/tags/pathos-${version}"; - hash = "sha256-Jc7pMVjOUSaZydRh87FsHivEAXpX9v6EbZNkHwPeq/Q="; + hash = "sha256-uQv1t3TRbvoQv86wNOdc5k0cgKt9kvnw5/DGbbbE46w="; }; propagatedBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://pathos.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/pathos/releases/tag/pathos-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index b43bcdb238..5b97cea17b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.11.0"; + version = "0.11.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNM41OCRTpHBeSMh5pB7Wlk/GrGFHef8JpVXohsw67w="; + hash = "sha256-4NjQrC8S2mGVbrIwa2n5RptC9N6w88tu1HuczpmWztM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix index 5ec592d53a..c5fc0852b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ecVyq3/thNxGg3NG7a5YVlmS0Ed6eJzUaRpB2Oq5kX0="; + hash = "sha256-tFGF0G+bGMbTNG06q4gauWh0VT9mHuiMzS5gJG4QPCI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix index 26c44f0b07..0562be6ee7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "paypalrestsdk"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f"; + sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o="; }; propagatedBuildInputs = [ requests six pyopenssl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix new file mode 100644 index 0000000000..2ac478308c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -0,0 +1,39 @@ +{ pythonOlder +, buildPythonPackage +, fetchPypi +, lib +, kicad +, versioneer +}: +buildPythonPackage rec { + pname = "pcbnewTransition"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; + }; + + propagatedBuildInputs = [ + kicad + ]; + + nativeBuildInputs = [ + versioneer + ]; + + pythonImportsCheck = [ + "pcbnewTransition" + ]; + + meta = with lib; { + description = "Library that allows you to support both, KiCad 5, 6 and 7 in your plugins"; + homepage = "https://github.com/yaqwsx/pcbnewTransition"; + changelog = "https://github.com/yaqwsx/pcbnewTransition/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix index 704e979c2c..0985d32afb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcpp/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pcpp"; - version = "1.21"; + version = "1.30"; src = fetchFromGitHub { owner = "ned14"; repo = "pcpp"; - rev = "v${version}"; - sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdbfixer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdbfixer/default.nix new file mode 100644 index 0000000000..9b0f0bfe86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdbfixer/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, numpy +, openmm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pdbfixer"; + version = "1.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openmm"; + repo = "pdbfixer"; + rev = version; + hash = "sha256-ZXQWdNQyoVgjpZj/Wimcfwcbxk3CIvg3n5S1glNYUP4="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + openmm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # require network access + "test_build_and_simulate" + "test_mutate_1" + "test_mutate_2" + "test_mutate_3_fails" + "test_mutate_4_fails" + "test_mutate_5_fails" + "test_mutate_multiple_copies_of_chain_A" + "test_pdbid" + "test_url" + ]; + + pythonImportsCheck = [ "pdbfixer" ]; + + meta = with lib; { + description = "PDBFixer fixes problems in PDB files"; + homepage = "https://github.com/openmm/pdbfixer"; + changelog = "https://github.com/openmm/pdbfixer/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "pdbfixer"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix index a43eaae34a..2138d71819 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfplumber/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.9.0"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-cGTn1JTSp1YvksemjlvvToZcVauZ7GKINiNmG5f4zKg="; + hash = "sha256-fd/4I6jjc0Wz2+XHGXAGg0Am3Dmw9R2ZX7nymIj/UnA="; }; postPatch = '' @@ -62,6 +62,13 @@ buildPythonPackage rec { "test__repr_png_" ]; + disabledTestPaths = [ + # Tests requires pypdfium2 + "tests/test_display.py" + # Tests require Ghostscript + "tests/test_repair.py" + ]; + meta = with lib; { description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables"; homepage = "https://github.com/jsvine/pdfplumber"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix index 96f626b24b..0572a1e633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.4"; + version = "2.1.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-46HTamiy+8fiGVeviYqXsjwu+PEBE38y19cBVRc+zm0="; + hash = "sha256-ZEci8VeKYuORs9iAzaEqrtVBh9fMWHlLsFH1e5PRLwA="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 93de496d51..32b8701daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.1"; + version = "19.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ACfS444n/PcgieNbl9os720nGAUQDesBHpzVAgMMRew="; + hash = "sha256-0WixwsBvfRgHxKrs/eAhzDNgFIpPdUbfEdJxnlaGmCA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix index da6f60403c..dc7cefd00c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee-migrate/default.nix @@ -17,24 +17,26 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.10.1"; + version = "1.12.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "klen"; repo = "peewee_migrate"; rev = "refs/tags/${version}"; - hash = "sha256-SBHeXHfhYjyXr+tODryKQfxZKy7l4ez5C6eU6FjS2qI="; + hash = "sha256-jxM2cvlDsoiUlVoxdS3wpUKlwMveMraiR431A8kIdgI="; }; - nativeBuildInputs = [ - poetry-core - ]; - postPatch = '' sed -i '/addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ peewee click @@ -49,6 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # sqlite3.OperationalError: error in table order after drop column... + "test_migrator" + ]; + meta = with lib; { description = "Simple migration engine for Peewee"; homepage = "https://github.com/klen/peewee_migrate"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 7f494813a1..deeccfe698 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.16.2"; + version = "3.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eHTbVhgVqxMR3ZuaC6FPyYbxRpRBi53EfDqERpPBjVQ="; + hash = "sha256-QbbwC55q/BjMGtm3fH8HPd0aETMzLAFwVYFvOS/4dqA="; }; buildInputs = [ 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 d6a4531312..de19d37c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8="; + hash = "sha256-XF7hjPuPoTioVIoiFhaMeyFYjHXmMwPVuJYDrCMUZwo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pegen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pegen/default.nix index d002cda74d..2a7a306274 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pegen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pegen/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pegen"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "we-like-parsers"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix index bb60adfc4b..470c67d6ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; + hash = "sha256-Gy+i/9OTi7S+/+XWFGy8sr2plqWk2p8xq//Ysk4Hsxc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/periodiq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/periodiq/default.nix new file mode 100644 index 0000000000..5ed6a028aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/periodiq/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitLab +, poetry-core +, dramatiq +, pendulum +, setuptools +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "periodiq"; + version = "0.12.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitLab { + owner = "bersace"; + repo = "periodiq"; + rev = "v${version}"; + hash = "sha256-Ar0n+Wi1OUtRdhVxrU7Nz4je8ylaHgPZbXE0a30hzU0="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dramatiq + pendulum + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + + pytestFlagsArray = [ "tests/unit" ]; + + pythonImportsCheck = [ "periodiq" ]; + + meta = with lib; { + description = "Simple Scheduler for Dramatiq Task Queue"; + homepage = "https://pypi.org/project/periodiq/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix index 09feb66549..869fb6146f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "persim"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU="; + hash = "sha256-p6Vumfr+vRDr0D9PnEZItp9vNlCLIb59HpBg1KdyHGE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix index 6a20154da3..efe366123b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "5.0"; + version = "5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hx5jxSExFgeVzcjpw90xP4bg3/NMFRyY3NkSPG2M5nM="; + hash = "sha256-l8zC+ibMm9zDvh/GWqT08or+UgTC1P0kpnRFkI23Rps="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 3eba4ff828..1d288d2f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.148"; - format = "pyproject"; + version = "2.1.151"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XRER28ObI9TsZ5h5LkAXhExGq+c4hpoEun2hagkpUXk="; + hash = "sha256-op7V7Xn0qzcCTyISyi/Z4bhdk/W7Ol5YbmvD2Sl5zkM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 9e0815ddfc..ee580829bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.29.4"; + version = "1.30.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dtKqF1ejC8ceAwfa4Yw3TjNqaRI+awRuIGqWYR+iozA="; + hash = "sha256-wEKA5mocz7UWbbXBZBZMLhuPYq+u3/0hFFGlMproSik="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix index 9ed6cd9b52..8f7f1e96ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix @@ -22,11 +22,11 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "3.5.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - hash = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; + hash = "sha256-8v7qIJnOGtXoqdXZOw7a9g3GHpeyG3XpHZcjk5zlO9I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix index 6fef789e9b..e9ca2003fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgmpy/default.nix @@ -23,7 +23,7 @@ }: let pname = "pgmpy"; - version = "0.1.23"; + version = "0.1.24"; # optional-dependencies = { # all = [ daft ]; # }; @@ -37,8 +37,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pgmpy"; repo = pname; - rev = "v${version}"; - hash = "sha256-4NY37Awhu2mnfZQ/biN1wa9rkGHhTxfZm0+V7D83NR0="; + rev = "refs/tags/v${version}"; + hash = "sha256-IMlo4SBxO9sPoZl0rQGc3FcvvIN/V/WZz+1BD7aBfzs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix index 03fbef0bd4..389a917668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgvector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-qvLDFnrTYibdhjSeeIFI4YdpPRsvNBnQ23uqsLCblEo="; + hash = "sha256-KQROG0cHvKmdWssr7Git3JH0YguRPno/ZzYiQL7VhwU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix index d344fca85e..f543b61b2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools-scm , absl-py , lxml @@ -20,17 +19,6 @@ buildPythonPackage rec { hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM="; }; - patches = [ - # see https://github.com/googlefonts/picosvg/issues/299 - # this patch fixed a failing test case after the update to skia-pathops 0.8 - # as soon as skia-pathops in nixpkgs is updated to 0.8, this patch should be removed - (fetchpatch { - url = "https://github.com/googlefonts/picosvg/commit/4e971ed6cd9afb412b2845d29296a0c24f086562.patch"; - hash = "sha256-OZEipNPCSuuqcy4XggBiuGv4HN604dI4N9wlznyAwF0="; - revert = true; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix index ff3b920718..ead9239f5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -1,11 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , gevent -, nose2 -, mock , twisted , tornado + +# tests +, nose2 +, mock + }: buildPythonPackage rec { @@ -20,9 +28,20 @@ buildPythonPackage rec { hash = "sha256-60Z+y3YXazUghfnOy4e7HzM18iju5m5OEt4I3Wg6ty4="; }; - propagatedBuildInputs = [ gevent tornado twisted ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ nose2 mock ]; + propagatedBuildInputs = [ + gevent + tornado + twisted + ]; + + nativeCheckInputs = [ + nose2 + mock + ]; postPatch = '' # don't stop at first test failure @@ -45,7 +64,9 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/pika/pika/releases/tag/${version}"; description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; + downloadPage = "https://github.com/pika/pika"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 01884677f2..0891ad28ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.3.0"; + version = "8.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; + hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix index 1b17e24115..76f6238349 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix @@ -5,23 +5,28 @@ , pillow , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pilkit"; - version = "unstable-2022-02-17"; - format = "setuptools"; + version = "3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthewwithanm"; repo = pname; - rev = "09ffa2ad33318ae5fd3464655c14c7f01ffc2097"; - hash = "sha256-jtnFffKr0yhSv2jBmXzPa6iP2r41MbmGukfmnvgABhk="; + rev = "refs/tags/${version}"; + hash = "sha256-NmD9PFCkz3lz4AnGoQUpkt35q0zvDVm+kx7lVDFBcHk="; }; - buildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ pillow ]; @@ -44,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A collection of utilities and processors for the Python Imaging Library"; homepage = "https://github.com/matthewwithanm/pilkit/"; - license = licenses.bsd0; + license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix index fe243c6a03..1d0505e22e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix @@ -1,18 +1,30 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub + +# build-system , cmake -, pillow -, pytest , nasm + +# native dependencies , libheif , libaom , libde265 , x265 + +# dependencies +, pillow + +# tests +, opencv4 +, numpy +, pympler +, pytestCheckHook }: buildPythonPackage rec { - pname = "pillow_heif"; + pname = "pillow-heif"; version = "0.13.0"; format = "setuptools"; @@ -23,16 +35,56 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; - nativeBuildInputs = [ cmake nasm ]; - buildInputs = [ libheif libaom libde265 x265 ]; - propagatedBuildInputs = [ pillow ]; - nativeCheckInputs = [ pytest ]; + postPatch = '' + sed -i '/addopts/d' pyproject.toml + ''; + + nativeBuildInputs = [ + cmake + nasm + ]; dontUseCmakeConfigure = true; - pythonImportsCheck = [ "pillow_heif" ]; + buildInputs = [ + libaom + libde265 + libheif + x265 + ]; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ + "pillow_heif" + ]; + + nativeCheckInputs = [ + opencv4 + numpy + pympler + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/bigcat88/pillow_heif/issues/89 + # not reproducible in nixpkgs + "test_opencv_crash" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 + "test_open_heif_compare_non_standard_modes_data" + "test_open_save_disable_16bit" + "test_save_bgr_16bit_to_10_12_bit" + "test_save_bgra_16bit_to_10_12_bit" + "test_premultiplied_alpha" + "test_hdr_save" + "test_I_color_modes_to_10_12_bit" + ]; meta = { + changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/v${version}"; description = "Python library for working with HEIF images and plugin for Pillow"; homepage = "https://github.com/bigcat88/pillow_heif"; license = with lib.licenses; [ bsd3 lgpl3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix index bf3b1991c3..3b5dffb42c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools @@ -13,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.0"; + version = "10.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,19 +20,9 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; + hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; }; - patches = [ - # Pull in zlib-1.3 fix pending upstream inclusion - # https://github.com/python-pillow/Pillow/pull/7344 - (fetchpatch { - name = "zlib-1.3.patch"; - url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch"; - hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index 250ad2f239..7e15814fa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.13.0"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-mblj6SQK/az2al81wMiWXHuyn1+30jfAxrWGv9Nw/gw="; + hash = "sha256-rlnJmGe9LYwIJxV02IjiKtT1iS1O9ik8dAfjsPHsa8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index a003c2bf46..1359096853 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-z5pBkB5J8FnuebMW4bPpk0cT2nd5bH/4PBR12g0lEQw="; + hash = "sha256-b1ONVJzwvpuLKAtv2Rk3uUNt85mMChfGrlM+CpPACUw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 5ee12b7a22..ef4e789249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; + hash = "sha256-eNZJXznKgamGR9yrswrrLEqUTxFhLGxWTkYbi13bebY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pixel-ring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pixel-ring/default.nix new file mode 100644 index 0000000000..c88715270b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pixel-ring/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyusb +, spidev +}: + +buildPythonPackage rec { + pname = "pixel-ring"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "respeaker"; + repo = "pixel_ring"; + rev = version; + hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyusb + spidev + ]; + + dontUsePythonImportsCheck = true; # requires SPI access + + doCheck = false; # no tests + + meta = with lib; { + description = "RGB LED library for ReSpeaker 4 Mic Array, ReSpeaker V2 & ReSpeaker USB 6+1 Mic Array"; + homepage = "https://github.com/respeaker/pixel_ring/tree/master"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index b5fc0c4499..89fc2fd32f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pkg-config , pytestCheckHook @@ -37,6 +38,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; + # ModuleNotFoundError: No module named 'distutils' + # https://github.com/matze/pkgconfig/issues/64 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; 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 6064eb5006..a88ce34ab0 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 @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "16.0.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FoZTfTPKidY0VPHYui25ArFm/MBIC7Ynwo9TyMT7st4="; + hash = "sha256-rVYyS2Wc3PC3BvkzUSe88sSXxJCElmP5s7B1NxSFAWY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ad1fa2d68f..9e6263351d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , plaster , pastedeploy , pytestCheckHook @@ -9,22 +8,14 @@ buildPythonPackage rec { pname = "plaster-pastedeploy"; - version = "0.6"; + version = "1.0.1"; src = fetchPypi { - inherit pname version; - sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; + pname = "plaster_pastedeploy"; + inherit version; + hash = "sha256-viYubS5BpyZIddqi/ihQy7BhVyi83JKCj9xyc244FBI="; }; - patches = [ - # Fix tests compatibility with pastedeploy 2+ - # https://github.com/Pylons/plaster_pastedeploy/pull/17 - (fetchpatch { - url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; - sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; - }) - ]; - propagatedBuildInputs = [ plaster pastedeploy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix index f64a76d3e6..777ba72bcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.9.1"; + version = "3.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gBiXdnBWp0SlpE6TQPONTXEsQ2XFGCANGdNM/gv7V5s="; + hash = "sha256-Ytilbs29oxuwLfoKTXNQxlh8qBF39F2ZRK8imd57A1w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index 57b4cb430b..47ce92cc68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.4"; + version = "4.15.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-NBV4jrLfU5vqQljQh28tJxgaNSo/ilph8xsjdVKCOJg="; + hash = "sha256-VU1HVAxAOraTd4VQIqG/MLkw77xciCICIh1zbzGn/dQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix index 430394c416..eaaed97c01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexwebsocket/default.nix @@ -1,30 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }: +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { pname = "plexwebsocket"; - version = "0.0.13"; - disabled = isPy27; + version = "0.0.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jjlawren"; repo = "python-plexwebsocket"; - rev = "v${version}"; - hash = "sha256-u9zO3d0d4Qg+u4ezVRGkNDpJqHkYIMrEMJzBK5WKk8Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-gT9RWpaR33ROs6ttjH2joNPi99Ng94Tp/R9eZY1eGZk="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - # package does not include tests + # Package does not include tests doCheck = false; - # at least guarantee the module can be imported pythonImportsCheck = [ "plexwebsocket" ]; meta = with lib; { + description = "Library to react to events issued over Plex websockets"; homepage = "https://github.com/jjlawren/python-plexwebsocket/"; - description = "Async library to react to events issued over Plex websockets"; + changelog = "https://github.com/jjlawren/python-plexwebsocket/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 201f2fcfc4..4698a84cef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.13.1"; + version = "5.16.1"; src = fetchPypi { inherit pname version; - hash = "sha256-kO6aH+4N2jDigw4SmFUIHqF70bBqVTpiti3hXK/xohk="; + hash = "sha256-KVrCXt6xjIk6u3Hcrc6gdbeP1v3wfO5CF6ThAJZnkls="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix index 717f530ef1..241dced9f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.10.1"; + version = "0.12.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2RKgS2ONz4IsUaZ4i4VmQjI0jVFfFR2zpkwAAZZvaEE="; + hash = "sha256-o43LNgf8ADweWa4MnVNdrngXZQ0cvC5W5W5bPeiN/pk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix index e6473e98a2..1128d1c69e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix @@ -9,24 +9,23 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.2.0"; + version = "1.3.0"; + + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; + hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; }; nativeBuildInputs = [ setuptools-scm ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - # To prevent infinite recursion with pytest doCheck = false; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 8876eea828..0802156dcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.33.1"; + version = "0.34.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-uJBUim5FlS+Jw3rGEKuorksVIgI5tVRAI7tESeYnGUc="; + hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix index f190dcb6b2..5b8bc870b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix @@ -2,35 +2,22 @@ buildPythonPackage rec { pname = "plyer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "kivy"; repo = pname; - rev = version; - sha256 = "15z1wpq6s69s76r6akzgg340bpc21l2r1j8270gp7i1rpnffcjwm"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; - patches = [ - # fix naming of the DOCUMENTS dir - (fetchpatch { - url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch"; - hash = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; - }) - # fix handling of the ~/.config/user-dirs.dir file - (fetchpatch { - url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch"; - hash = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; - }) - ]; - postPatch = '' rm -r examples # remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016 find -iname "wifi*" -exec rm {} \; substituteInPlace plyer/__init__.py \ --replace "wifi = Proxy('wifi', facades.Wifi)" "" \ - --replace "'wifi'" "" + --replace "'wifi', " "" substituteInPlace plyer/facades/__init__.py \ --replace "from plyer.facades.wifi import Wifi" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix index 130fba959e..20495ba0dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.7.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9e9a18d22a3158fcd74df38761d43a7facc6df75126f2ab9f4e9a5d4d2188652"; + sha256 = "sha256-TOrt8e2Ss6Jrdm/IxWzaG5sjkOwpmxbe3i5f1FCXJho="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix index 17bde3ddf3..f1d152decc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "pmdarima"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alkaline-ml"; repo = "pmdarima"; - rev = "v${version}"; - hash = "sha256-uX4iZZ2deYqVWnqVZT6J0Djf2pXo7ug4MsOsPkKjvSU="; + rev = "refs/tags/v${version}"; + hash = "sha256-LHwPgQRB/vP3hBM8nqafoCrN3ZSRIMWLzqTqDOETOEc="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/podman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/podman/default.nix index 677d6c2a72..4541cac8b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/podman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/podman/default.nix @@ -72,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/containers/podman-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "podman"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index 1205b860b8..fc8da7447f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.6.1"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,47 +24,9 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; + hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; }; - # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/0bdf29e9631fda9436066a07ca8e69a4aa97a31e.patch"; - revert = true; - hash = "sha256-Uqlv17GUcmVkB6ZFePtrbUonsbkiIXay7LLuT/WcPh8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/48447a18a60c43240bf075fc0c2501f6d68f0211.patch"; - revert = true; - hash = "sha256-23GazppqYmuAmkE/xMtuzng2PbxhYNwgtmsvb6lfvig="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/bc97ac6030049a01e5337fcb53493112a9c75a81.patch"; - revert = true; - hash = "sha256-8NAG+Xm/BNL16NONZJRNB3JiRRKvjMsZJH2FWlw+dHk="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/835bc91393fbb983de6227d67b076aea1360ea68.patch"; - revert = true; - hash = "sha256-Z5viypprDY9GGeX6luBsIoSI9D0lN9g14U9uMh4DTfA="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; - revert = true; - hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; - }) - (fetchpatch { - url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; - excludes = [ - "vendors/poetry.lock" - "vendors/pyproject.toml" - ]; - revert = true; - hash = "sha256-mbu16qFH9ymDZ0KIMiYMy7js5OmxY7z5qg6ZfgfgeLs="; - }) - ]; - nativeCheckInputs = [ build git diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock index 0ea668d6b7..b9ba1326cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -25,21 +25,22 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -105,40 +106,6 @@ dependencies = [ "serde", ] -[[package]] -name = "arrow2" -version = "0.17.3" -source = "git+https://github.com/jorgecarleitao/arrow2?rev=2ecd3e823f63884ca77b146a8cd8fcdea9f328fd#2ecd3e823f63884ca77b146a8cd8fcdea9f328fd" -dependencies = [ - "ahash", - "arrow-format", - "avro-schema", - "base64", - "bytemuck", - "chrono", - "chrono-tz", - "dyn-clone", - "either", - "ethnum", - "fallible-streaming-iterator", - "foreign_vec", - "futures", - "getrandom", - "hash_hasher", - "lexical-core", - "lz4", - "multiversion", - "num-traits", - "parquet2", - "regex", - "regex-syntax 0.6.29", - "rustc_version", - "simdutf8", - "streaming-iterator", - "strength_reduce", - "zstd", -] - [[package]] name = "async-stream" version = "0.3.5" @@ -158,18 +125,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -203,9 +170,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -218,9 +185,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bitflags" @@ -228,6 +195,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + [[package]] name = "brotli" version = "3.3.4" @@ -262,35 +238,35 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[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" [[package]] name = "cargo-lock" @@ -306,11 +282,12 @@ dependencies = [ [[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 = [ "jobserver", + "libc", ] [[package]] @@ -321,18 +298,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "time", - "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -384,6 +358,15 @@ dependencies = [ "half", ] +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "comfy-table" version = "7.0.1" @@ -485,7 +468,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -505,10 +488,16 @@ dependencies = [ ] [[package]] -name = "dyn-clone" -version = "1.0.12" +name = "doc-comment" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dyn-clone" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "either" @@ -516,6 +505,15 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum_dispatch" version = "0.3.12" @@ -525,7 +523,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -536,9 +534,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "ethnum" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04" +checksum = "6c8ff382b2fa527fb7fb06eeebfc5bbb3f17e3cc6b9d70b006c41daa8824adac" [[package]] name = "fallible-streaming-iterator" @@ -554,11 +552,12 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -571,6 +570,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foreign_vec" version = "0.1.0" @@ -642,7 +647,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -684,15 +689,15 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -700,7 +705,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -713,6 +718,25 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -730,10 +754,10 @@ dependencies = [ ] [[package]] -name = "hash_hasher" -version = "2.0.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" @@ -763,9 +787,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -782,6 +806,84 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +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.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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -815,6 +917,16 @@ dependencies = [ "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", +] + [[package]] name = "indexmap" version = "2.0.0" @@ -828,15 +940,30 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inventory" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b" +checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] [[package]] name = "itoa" @@ -852,9 +979,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" [[package]] name = "jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" +checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" dependencies = [ "cc", "libc", @@ -862,9 +989,9 @@ dependencies = [ [[package]] name = "jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6" +checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" dependencies = [ "jemalloc-sys", "libc", @@ -973,9 +1100,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libflate" @@ -1009,6 +1136,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys", +] + [[package]] name = "libm" version = "0.2.7" @@ -1017,14 +1154,24 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", ] +[[package]] +name = "libz-ng-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "libz-sys" version = "1.1.12" @@ -1049,9 +1196,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lz4" @@ -1085,15 +1232,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -1109,13 +1256,19 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1133,15 +1286,15 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] [[package]] name = "multiversion" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cda45dade5144c2c929bf2ed6c24bebbba784e9198df049ec87d722b9462bd1" +checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" dependencies = [ "multiversion-macros", "target-features", @@ -1149,9 +1302,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bffdccbd4798b61dce08c97ce8c66a68976f95541aaf284a6e90c1d1c306e1" +checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" dependencies = [ "proc-macro2", "quote", @@ -1192,9 +1345,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1231,9 +1384,9 @@ dependencies = [ [[package]] name = "numpy" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" +checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" dependencies = [ "libc", "ndarray", @@ -1246,13 +1399,43 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] +[[package]] +name = "object_store" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d359e231e5451f4f9fa889d56e3ce34f8724f1a61db2107739359717cf2bbf08" +dependencies = [ + "async-trait", + "base64", + "bytes", + "chrono", + "futures", + "humantime", + "hyper", + "itertools", + "parking_lot", + "percent-encoding", + "quick-xml", + "rand", + "reqwest", + "ring", + "rustls-pemfile", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1292,24 +1475,6 @@ dependencies = [ "futures", ] -[[package]] -name = "parquet2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579fe5745f02cef3d5f236bfed216fd4693e49e4e920a13475c6132233283bce" -dependencies = [ - "async-stream", - "brotli", - "flate2", - "futures", - "lz4", - "parquet-format-safe", - "seq-macro", - "snap", - "streaming-decompression", - "zstd", -] - [[package]] name = "parse-zoneinfo" version = "0.3.0" @@ -1365,9 +1530,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1392,7 +1557,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.31.1" +version = "0.34.2" dependencies = [ "getrandom", "polars-core", @@ -1406,7 +1571,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.31.1" +version = "0.34.2" dependencies = [ "polars-core", "polars-lazy", @@ -1415,35 +1580,48 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "ahash", + "arrow-format", "atoi", + "avro-schema", + "bytemuck", "chrono", "chrono-tz", + "dyn-clone", + "either", "ethnum", + "foreign_vec", + "futures", + "getrandom", "hashbrown 0.14.0", + "lexical-core", + "lz4", "multiversion", "num-traits", "polars-error", + "rustc_version", "serde", - "thiserror", - "version_check", + "simdutf8", + "streaming-iterator", + "strength_reduce", + "zstd", ] [[package]] name = "polars-core" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", "hashbrown 0.14.0", - "indexmap", + "indexmap 2.0.0", "itoap", "ndarray", "num-traits", @@ -1466,19 +1644,29 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "arrow-format", + "avro-schema", + "object_store", "regex", + "simdutf8", "thiserror", ] +[[package]] +name = "polars-ffi" +version = "0.34.2" +dependencies = [ + "polars-arrow", + "polars-core", +] + [[package]] name = "polars-io" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", "async-trait", "bytes", "chrono", @@ -1487,49 +1675,62 @@ dependencies = [ "flate2", "futures", "home", + "itoa", "lexical", "lexical-core", "memchr", "memmap2", "num-traits", + "object_store", "once_cell", + "percent-encoding", "polars-arrow", "polars-core", "polars-error", "polars-json", + "polars-parquet", "polars-time", "polars-utils", "rayon", "regex", + "reqwest", + "ryu", "serde", "serde_json", "simd-json", "simdutf8", + "smartstring", "tokio", + "tokio-util", + "url", ] [[package]] name = "polars-json" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", + "chrono", "fallible-streaming-iterator", "hashbrown 0.14.0", - "indexmap", + "indexmap 2.0.0", + "itoa", "num-traits", "polars-arrow", "polars-error", "polars-utils", + "ryu", "simd-json", + "streaming-iterator", ] [[package]] name = "polars-lazy" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "bitflags", + "bitflags 2.4.0", + "futures", "glob", "once_cell", "polars-arrow", @@ -1544,36 +1745,69 @@ dependencies = [ "pyo3", "rayon", "smartstring", + "tokio", "version_check", ] [[package]] name = "polars-ops" -version = "0.31.1" +version = "0.34.2" dependencies = [ + "ahash", "argminmax", - "arrow2", "base64", + "bytemuck", "chrono", "chrono-tz", "either", + "hashbrown 0.14.0", "hex", - "indexmap", + "indexmap 2.0.0", "jsonpath_lib", "memchr", + "num-traits", "polars-arrow", "polars-core", + "polars-error", "polars-json", "polars-utils", + "rand", + "rand_distr", + "rayon", + "regex", "serde", "serde_json", "smartstring", "version_check", ] +[[package]] +name = "polars-parquet" +version = "0.34.2" +dependencies = [ + "ahash", + "async-stream", + "base64", + "brotli", + "ethnum", + "flate2", + "futures", + "lz4", + "num-traits", + "parquet-format-safe", + "polars-arrow", + "polars-error", + "polars-utils", + "seq-macro", + "simdutf8", + "snap", + "streaming-decompression", + "zstd", +] + [[package]] name = "polars-pipe" -version = "0.31.1" +version = "0.34.2" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1589,23 +1823,28 @@ dependencies = [ "polars-utils", "rayon", "smartstring", + "tokio", "version_check", ] [[package]] name = "polars-plan" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", + "bytemuck", "chrono", "chrono-tz", "ciborium", + "libloading", "once_cell", + "percent-encoding", "polars-arrow", "polars-core", + "polars-ffi", "polars-io", "polars-ops", + "polars-parquet", "polars-time", "polars-utils", "pyo3", @@ -1613,27 +1852,29 @@ dependencies = [ "regex", "serde", "smartstring", - "strum_macros 0.25.1", + "strum_macros 0.25.2", "version_check", ] [[package]] name = "polars-row" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "polars-arrow", "polars-error", "polars-utils", ] [[package]] name = "polars-sql" -version = "0.31.1" +version = "0.34.2" dependencies = [ "polars-arrow", "polars-core", + "polars-error", "polars-lazy", "polars-plan", + "rand", "serde", "serde_json", "sqlparser", @@ -1641,9 +1882,8 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", "atoi", "chrono", "chrono-tz", @@ -1651,6 +1891,7 @@ dependencies = [ "once_cell", "polars-arrow", "polars-core", + "polars-error", "polars-ops", "polars-utils", "regex", @@ -1660,10 +1901,12 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", + "bytemuck", "hashbrown 0.14.0", + "indexmap 2.0.0", "num-traits", "once_cell", "polars-error", @@ -1681,16 +1924,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.18.13" +version = "0.19.12" dependencies = [ "ahash", "built", @@ -1708,6 +1951,9 @@ dependencies = [ "polars-core", "polars-error", "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-plan", "pyo3", "pyo3-built", "serde_json", @@ -1717,9 +1963,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" dependencies = [ "cfg-if", "indoc", @@ -1735,9 +1981,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" dependencies = [ "once_cell", "target-lexicon", @@ -1751,9 +1997,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" dependencies = [ "libc", "pyo3-build-config", @@ -1761,32 +2007,43 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.36", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" dependencies = [ + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.36", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", + "serde", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1839,9 +2096,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1849,14 +2106,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1865,43 +2120,93 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "regex-syntax" -version = "0.7.4" +name = "reqwest" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +dependencies = [ + "base64", + "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", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] [[package]] name = "rle-decode-fast" @@ -1930,6 +2235,37 @@ dependencies = [ "semver", ] +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -1942,12 +2278,31 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[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 = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "semver" version = "1.0.18" @@ -1965,31 +2320,31 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.176" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.176" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -2004,6 +2359,18 @@ 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 = "signal-hook" version = "0.3.17" @@ -2036,10 +2403,12 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.10.0" -source = "git+https://github.com/ritchie46/simd-json?branch=initialize#946b316f686c6ad3050f694ea434248c38aa321d" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec" dependencies = [ "ahash", + "getrandom", "halfbrown", "lexical-core", "once_cell", @@ -2057,15 +2426,15 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[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", ] @@ -2088,6 +2457,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "snap" version = "1.1.0" @@ -2105,10 +2496,26 @@ dependencies = [ ] [[package]] -name = "sqlparser" -version = "0.34.0" +name = "socket2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "sqlparser" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" dependencies = [ "log", ] @@ -2161,15 +2568,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -2185,9 +2592,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" dependencies = [ "proc-macro2", "quote", @@ -2196,9 +2603,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.7" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2216,39 +2623,28 @@ checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", -] - -[[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", + "syn 2.0.36", ] [[package]] @@ -2268,24 +2664,61 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", + "bytes", "libc", "mio", + "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", + "tokio-macros", "windows-sys", ] [[package]] -name = "toml" -version = "0.7.6" +name = "tokio-macros" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -2304,17 +2737,61 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", "winnow", ] +[[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", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -2323,9 +2800,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2344,15 +2821,21 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2384,10 +2867,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +name = "walkdir" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "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" @@ -2416,10 +2912,22 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.87" @@ -2438,7 +2946,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2449,6 +2957,35 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -2465,6 +3002,15 @@ 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" @@ -2491,9 +3037,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2506,77 +3052,106 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_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_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_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_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_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_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 = "winnow" -version = "0.5.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] -name = "xxhash-rust" -version = "0.8.6" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/all_horizontal.patch b/third_party/nixpkgs/pkgs/development/python-modules/polars/all_horizontal.patch new file mode 100644 index 0000000000..3caf548d4a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/all_horizontal.patch @@ -0,0 +1,13 @@ +diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs +index 2d2ede651..be24b8809 100644 +--- a/crates/polars-lazy/src/frame/mod.rs ++++ b/crates/polars-lazy/src/frame/mod.rs +@@ -25,7 +25,7 @@ pub use parquet::*; + use polars_core::frame::explode::MeltArgs; + use polars_core::prelude::*; + use polars_io::RowCount; +-use polars_plan::dsl::all_horizontal; ++use polars_plan::dsl::functions::all_horizontal; + pub use polars_plan::frame::{AllowedOptimizations, OptState}; + use polars_plan::global::FETCH_ROWS; + #[cfg(any(feature = "ipc", feature = "parquet", feature = "csv"))] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index b070ae3797..fc82d86385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -3,19 +3,27 @@ , buildPythonPackage , pythonOlder , rustPlatform +, cmake , libiconv , fetchFromGitHub , typing-extensions +, jemalloc +, rust-jemalloc-sys , darwin }: let pname = "polars"; - version = "0.18.13"; + version = "0.19.12"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-kV30r2wmswpCUmMRaFsCOeRrlTN5/PU0ogaU2JIHq0E="; + hash = "sha256-6tn3Q6oZfMjgQ5l5xCFnGimLSDLOjTWCW5uEbi6yFZY="; + }; + rust-jemalloc-sys' = rust-jemalloc-sys.override { + jemalloc = jemalloc.override { + disableInitExecTls = true; + }; }; in buildPythonPackage { @@ -24,6 +32,13 @@ buildPythonPackage { disabled = pythonOlder "3.6"; src = rootSource; + patches = [ + # workaround for apparent rustc bug + # remove when we're at Rust 1.73 + # https://github.com/pola-rs/polars/issues/12050 + ./all_horizontal.patch + ]; + # Cargo.lock file is sometimes behind actual release which throws an error, # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package @@ -35,9 +50,7 @@ buildPythonPackage { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "arrow2-0.17.3" = "sha256-pM6lNjMCpUzC98IABY+M23lbLj0KMXDefgBMjUPjDlg="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - "simd-json-0.10.0" = "sha256-0q/GhL7PG5SLgL0EETPqe8kn6dcaqtyL+kLU9LL+iQs="; }; }; cargoRoot = "py-polars"; @@ -47,9 +60,20 @@ buildPythonPackage { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + dontUseCmakeConfigure = true; - buildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ + # needed for libz-ng-sys + # TODO: use pkgs.zlib-ng + cmake + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + buildInputs = [ + rust-jemalloc-sys' + ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix new file mode 100644 index 0000000000..ee81658589 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "polling"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "justiniso"; + repo = "polling"; + rev = "v${version}"; + hash = "sha256-Qy2QxCWzAjZMJ6yxZiDT/80I2+rLimoG8/SYxq960Tk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ + "polling" + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + meta = with lib; { + description = "Powerful polling utility in Python"; + homepage = "https://github.com/justiniso/polling"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 8c94f8bd1a..57d6dd0b9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , numpy , scipy , cython @@ -16,14 +15,15 @@ buildPythonPackage rec { pname = "pomegranate"; - version = "0.14.8"; + version = "1.0.0"; + format = "pyproject"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; # no tags for recent versions: https://github.com/jmschrei/pomegranate/issues/974 - rev = "0652e955c400bc56df5661db3298a06854c7cce8"; - sha256 = "16g49nl2bgnh6nh7bd21s393zbksdvgp9l13ww2diwhplj6hlly3"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EnxKlRRfsOIDLAhYOq7bUSbI/NvPoSyYCZ9D5VCXFGQ="; }; propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix index 06c4617c0c..b8ba613ba3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -2,10 +2,12 @@ , buildPythonPackage , isPy27 , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , packaging -, appdirs +, platformdirs , requests , tqdm , paramiko @@ -14,37 +16,26 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; + disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; + hash = "sha256-8XShBBtkR/Du+IYPdtF/YO0vhX3A76OHp/CCKK8F2Zg="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; - propagatedBuildInputs = [ packaging appdirs requests ]; - - preCheck = "HOME=$TMPDIR"; - nativeCheckInputs = [ pytestCheckHook ]; - # tries to touch network - disabledTests = [ - "pooch_custom_url" - "pooch_download" - "pooch_logging_level" - "pooch_update" - "pooch_corrupted" - "check_availability" - "downloader" - "test_retrieve" - "test_stream_download" - "test_fetch" - "decompress" - "extractprocessor_fails" - "processor" - "integration" + propagatedBuildInputs = [ + packaging + platformdirs + requests ]; passthru = { @@ -54,6 +45,33 @@ buildPythonPackage rec { xxhash = [ xxhash ]; }; }; + preCheck = '' + export HOME=$TMPDIR + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # tries to touch network + disabledTests = [ + "check_availability" + "decompress" + "downloader" + "extractprocessor_fails" + "integration" + "pooch_corrupted" + "pooch_custom_url" + "pooch_download" + "pooch_logging_level" + "pooch_update" + "processor" + "test_fetch" + "test_load_registry_from_doi" + "test_retrieve" + "test_stream_download" + + ]; meta = with lib; { description = "A friend to fetch your data files."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix index 4dfd663ac8..7335663161 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix @@ -1,13 +1,17 @@ { lib, buildPythonPackage, fetchPypi +, pythonOlder , pytestCheckHook, setuptools-scm, tempora }: buildPythonPackage rec { pname = "portend"; - version = "3.1.0"; + version = "3.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; + sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -16,6 +20,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "portend" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix index f9b8f7993f..2595e20622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.5.2"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; + hash = "sha256-vVB/1vlvZe4CeB8uZ06dxsmbv6bjw5mS45FiBMnUMfo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix index 455ee183a2..a6251b3ea4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "POT"; inherit version; - hash = "sha256-PKmuPI83DPy7RkOgHHPdPJJz5NT/fpr123AVTzTLwgQ="; + hash = "sha256-gcJTJ6ABl/8Rwf5SIc8YGtHf/mFWRBUuLhFd3d9eWRs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 426450ab40..c7e0c8565c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , socat , psutil -, hglib +, python-hglib , pygit2 , pyuv , i3ipc @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ socat psutil - hglib + python-hglib pygit2 pyuv ] ++ lib.optionals (!stdenv.isDarwin) [ i3ipc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix index 3a868d78d8..cd801f497a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { # darwin seems to hang doCheck = !stdenv.isDarwin; + checkPhase = '' runHook preCheck ${python.interpreter} -m ppft.tests @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; homepage = "https://ppft.readthedocs.io/"; + changelog = "https://github.com/uqfoundation/ppft/releases/tag/ppft-${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix index c817fc390e..b87e0e4c98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pandas , pytestCheckHook , pythonOlder @@ -9,18 +10,22 @@ buildPythonPackage rec { pname = "ppscore"; - version = "unstable-2021-11-25"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "8080labs"; - repo = pname; - rev = "c9268c16b6305c5c38e2fe2fd84f43d97ec1aaca"; - hash = "sha256-qiogjUgcLFauAMpVf2CKNC27c9xR9q7nY69n8/go1ms="; + repo = "ppscore"; + rev = "refs/tags/${version}"; + hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas scikit-learn @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Predictive Power Score (PPS)"; homepage = "https://github.com/8080labs/ppscore/"; + changelog = "https://github.com/8080labs/ppscore/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ evax ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix index 0ce6027c1b..0243ef1bd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { requests-toolbelt ]; + disabledTestPaths = [ + # tests requiring network + "tests/integration" + ]; + pythonImportsCheck = [ "praw" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 9a8ecea7b3..6231ff2b81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # tests requiring network + "tests/integration" + ]; + pythonImportsCheck = [ "prawcore" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix index 672c4c393d..e60bc33383 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "uchagani"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QIUMxs6NOqnljTi1UNp7bCQ9TgBy/u+BWEqgr2C854g="; + hash = "sha256-T+rXJy+9haepF6TKSoOjb6o75YQwQnzAaWRtLMwfGOw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix index b795be68e4..aa8722e56f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-V23pgHQ9GdZ2mukFEMAhkp+dl/CQTGxWHAhF7s1VvHo="; + hash = "sha256-EiPGdrpD4e9izRNJCjHRp+gR+ClzFtLjs6P57WXDs7I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix index 8d5969d18f..87a91743b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "precis-i18n"; - version = "1.0.5"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "byllyfish"; repo = "precis_i18n"; rev = "refs/tags/v${version}"; - hash = "sha256-DSm+KomveGs9ZzNFiT0B1gAjx2fh0BaUdKW0J+kW24U="; + hash = "sha256-0Z8JbakShuB8FFGl3NS8VFpHAQgr2P900HVxUafAmyU="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix index b253525aac..e0d37c51a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "3.0.8"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bHTHAHiAm/3doXvpZIPEHQbXF5NLB8q3khAR2BdYs1c="; + hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix deleted file mode 100644 index fbf7599b31..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj, fetchpatch }: - -buildPythonPackage rec { - pname = "privacyidea-ldap-proxy"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "privacyidea"; - repo = pname; - rev = "v${version}"; - sha256 = "1i2kgxqd38xvb42qj0a4a35w4vk0fyp3n7w48kqmvrxc77p6r6i8"; - }; - - patches = [ - # support for LDAPCompareRequest. - (fetchpatch { - url = "https://github.com/mayflower/privacyidea-ldap-proxy/commit/a13356717379b174f1a6abf767faa0dbd459f5dd.patch"; - hash = "sha256-SBTj9ayQ8JFD8BoYIl77nxWVV3PXnHZ8JMlJnxd/nEk="; - }) - ]; - - propagatedBuildInputs = [ twisted ldaptor configobj ]; - - pythonImportsCheck = [ "pi_ldapproxy" ]; - - meta = with lib; { - description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; - homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; - license = licenses.agpl3Only; - maintainers = [ maintainers.globin ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-pandas/default.nix new file mode 100644 index 0000000000..da6e9c1bcc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-pandas/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, numpy +, pandas +}: + +buildPythonPackage rec { + pname = "prometheus-pandas"; + version = "0.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zysdlYPjvhextAfW4vvGN6mSPVUbWLV+AvQ1hGWCAbw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + pandas + ]; + + # There are no tests. :( + doCheck = false; + + pythonImportsCheck = [ + "prometheus_pandas" + ]; + + meta = with lib; { + homepage = "https://github.com/dcoles/prometheus-pandas"; + license = licenses.mit; + description = "Pandas integration for Prometheus"; + maintainers = with maintainers; [ viktornordling ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix index bd676fc23c..2869c042d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.38"; + version = "3.0.39"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-I6xdUFOKmjjIveBf7LR9C0A+zQZihXqG+Ib3mFY9W5s="; + hash = "sha256-BFBa3mh9wm3EKEsa0ZqDvi8q/oPnqCis4McvOh33Kqw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prophet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prophet/default.nix index 889f835861..5a8e2dfc1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prophet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prophet/default.nix @@ -2,71 +2,58 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch - , setuptools , cmdstanpy , numpy , matplotlib , pandas -, lunarcalendar -, convertdate , holidays -, python-dateutil , tqdm , importlib-resources +, dask +, distributed + , pytestCheckHook }: buildPythonPackage rec { pname = "prophet"; - version = "1.1.4"; - format = "pyproject"; + version = "1.1.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "facebook"; repo = "prophet"; - rev = "refs/tags/v${version}"; - hash = "sha256-pbJ0xL5wDZ+rKgtQQTJPsB1Mu2QXo3S9MMpiYkURsz0="; + rev = version; + hash = "sha256-liTg5Hm+FPpRQajBnnJKBh3JPGyu0Hflntf0isj1FiQ="; }; - patches = [ - # TODO: remove when bumping version from 1.1.4 - (fetchpatch { - name = "fix-stan-file-temp-dest.patch"; - url = "https://github.com/facebook/prophet/commit/374676500795aec9d5cbc7fe5f7a96bf00489809.patch"; - hash = "sha256-sfiQ2V3ZEF0WM9oM1FkL/fhZesQJ1i2EUPYJMdDA2UM="; - relative = "python"; - }) - ]; - - sourceRoot = "${src.name}/python"; + sourceRoot = "source/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; nativeBuildInputs = [ setuptools ]; - # TODO: update when bumping version from 1.1.4 propagatedBuildInputs = [ cmdstanpy numpy matplotlib pandas - lunarcalendar - convertdate holidays - python-dateutil tqdm importlib-resources ]; + passthru.optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; + preCheck = '' - # the generated stan_model directory only exists in build/lib* - cd build/lib* + # use the generated files from $out for testing + mv prophet/tests . + rm -r prophet ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -74,11 +61,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "prophet" ]; meta = { - homepage = "https://facebook.github.io/prophet/"; + changelog = "https://github.com/facebook/prophet/releases/tag/${src.rev}"; description = "A tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth"; - changelog = "https://github.com/facebook/prophet/releases/tag/v${version}"; + homepage = "https://facebook.github.io/prophet/"; license = lib.licenses.mit; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; # cmdstanpy doesn't currently build on darwin }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index d6ef622698..d75842e507 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.2"; + version = "1.22.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; + hash = "sha256-/c0JcTy9QkgHQNL+KcmQ9/vYhaZ+/DKKqL5u4+n3ams="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/3.nix new file mode 100644 index 0000000000..d9e3cce5f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/3.nix @@ -0,0 +1,90 @@ +{ buildPackages +, buildPythonPackage +, fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook +, pythonAtLeast +, tzdata +}: + +assert lib.versionAtLeast protobuf.version "3.21" -> throw "Protobuf 3.20 or older required"; + +buildPythonPackage { + inherit (protobuf) pname src; + + version = protobuf.version; + + sourceRoot = "${protobuf.src.name}/python"; + + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + name = "support-python311.patch"; + url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; + stripLen = 1; # because sourceRoot above + hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; + }) + ]; + + prePatch = '' + if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then + echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" + exit 1 + fi + ''; + + # Remove the line in setup.py that forces compiling with C++14. Upstream's + # CMake build has been updated to support compiling with other versions of + # C++, but the Python build has not. Without this, we observe compile-time + # errors using GCC. + # + # Fedora appears to do the same, per this comment: + # + # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 + # + postPatch = '' + sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + ''; + + nativeBuildInputs = lib.optional isPyPy tzdata; + + buildInputs = [ protobuf ]; + + propagatedNativeBuildInputs = [ + # For protoc of the same version. + buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + ]; + + setupPyGlobalFlags = [ "--cpp_implementation" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + passthru = { + inherit protobuf; + }; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 2676dc90d6..3a42754de7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -11,30 +11,28 @@ , tzdata }: +assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; + let - versionMajor = lib.versions.major protobuf.version; - versionMinor = lib.versions.minor protobuf.version; - versionPatch = lib.versions.patch protobuf.version; + protobufVersionMajor = lib.versions.major protobuf.version; + protobufVersionMinor = lib.versions.minor protobuf.version; in buildPythonPackage { inherit (protobuf) pname src; - # protobuf 3.21 corresponds with its python library 4.21 - version = - if lib.versionAtLeast protobuf.version "3.21" - then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" - else protobuf.version; + # protobuf 21 corresponds with its python library 4.21 + version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; sourceRoot = "${protobuf.src.name}/python"; - patches = lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' (substituteAll { src = ./use-nixpkgs-abseil-cpp.patch; abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] - ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "3.22") [ + ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ (fetchpatch { name = "support-python311.patch"; url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; @@ -69,14 +67,14 @@ buildPythonPackage { propagatedNativeBuildInputs = [ # For protoc of the same version. - buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + buildPackages."protobuf_${protobufVersionMajor}" ]; setupPyGlobalFlags = [ "--cpp_implementation" ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; @@ -90,7 +88,7 @@ buildPythonPackage { "testStrictUtf8Check" ]; - disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "3.23") [ + disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "23") [ # The following commit (I think) added some internal test logic for Google # that broke generator_test.py. There is a new proto file that setup.py is # not generating into a .py file. However, adding this breaks a bunch of diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy-tools/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/proxy-tools/default.nix index 03f3f92f9d..beb91a4333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy_tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy-tools/default.nix @@ -1,17 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { - pname = "proxy_tools"; + pname = "proxy-tools"; version = "0.1.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "proxy_tools"; + inherit version; hash = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA="; }; + nativeBuildInputs = [ + setuptools + ]; + # no tests in pypi doCheck = false; pythonImportsCheck = [ "proxy_tools" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index 015e82de85..a08ff4c7a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.5"; + version = "5.9.6"; format = "setuptools"; + inherit stdenv; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VBBjjk3znFTZV/xRzgMEis2ObWCrwPUQevUeX7Vm6zw="; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; }; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index e2d775f0b3..2406359691 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.10"; + version = "3.1.12"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GdgzHmzPCK3wq/8sCc1NaPEVwl4Q5OBZMp86RXkhE0M="; + hash = "sha256-2fd21aSCjwSwk8G0uS3cPGzLZfPVoJl2V5dG+akfCrE="; }; patches = [ @@ -50,6 +50,14 @@ let libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) + + # https://github.com/psycopg/psycopg/pull/669 + # mark some tests as timing remove on next version update + (fetchpatch { + name = "mark_tests_as_timing.patch"; + url = "https://github.com/psycopg/psycopg/commit/00a3c640dd836328ba15931b400b012171f648c2.patch"; + hash = "sha256-DoVZv1yy9gHOKl0AdVLir+C+UztJZVjboLhS5af2944="; + }) ]; baseMeta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix index b697c66613..43a06e5a9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix @@ -8,31 +8,41 @@ , openssl , sphinxHook , sphinx-better-theme +, buildPackages }: buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.5"; + version = "2.9.7"; format = "setuptools"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 disabled = pythonOlder "3.6" || isPyPy; - src = fetchPypi { - inherit pname version; - hash = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo="; - }; - outputs = [ "out" "doc" ]; + src = fetchPypi { + inherit pname version; + hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; + }; + + postPatch = '' + # Preferably upstream would not depend on pg_config because config scripts are incompatible with cross-compilation, however postgresql's pc file is lacking information. + # some linker flags are added but the linker ignores them because they're incompatible + # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py + substituteInPlace setup.py \ + --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + ''; + nativeBuildInputs = [ - postgresql sphinxHook sphinx-better-theme ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + postgresql + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; @@ -45,6 +55,8 @@ buildPythonPackage rec { "psycopg2" ]; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.postgresql ]; + meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; homepage = "https://www.psycopg.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix index c4a1565ccc..36ae22a67b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix @@ -8,13 +8,14 @@ , pydantic , pytestCheckHook , pythonOlder +, toolz , typing-extensions , wrapt }: buildPythonPackage rec { pname = "psygnal"; - version = "0.9.0"; + version = "0.9.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rYG0XqwFJQojnvM5ygm1RVu9NbeFASns0llOGKaP+4="; + hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -42,6 +43,7 @@ buildPythonPackage rec { numpy pydantic pytestCheckHook + toolz wrapt ]; 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 47bca9e931..f16fa4cedf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -5,20 +5,25 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231002"; - format = "setuptools"; + version = "0.10.0.20231109"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qO8/V0UZb9lWvPb0JbUABFCJbGFu5ulRMOFH4vrhDMw="; + hash = "sha256-cr2rEoGVJ8BeXLfyPq4Auxu7OEOlVnKxlSMUREmji2E="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru.optional-dependencies = { update = [ requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index f35edd5979..626f0913df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , buildPythonPackage +, busypie , cbor2 , fetchFromGitHub , pycryptodomex @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.2.0"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "python"; - rev = "refs/tags/${version}"; - hash = "sha256-AUB6pk3Gkrjc0RRFP0mql+up1baPjyPwuiRz8O6r/GM="; + rev = "refs/tags/v${version}"; + hash = "sha256-V6yw/OscTGwrFcjHEhwtaT7txWLqbVj0uYjuoSAtP2E="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + busypie pytest-asyncio pytest-vcr pytestCheckHook @@ -45,6 +47,11 @@ buildPythonPackage rec { "tests/functional/push" ]; + disabledTests = [ + "test_subscribe" + "test_handshaking" + ]; + pythonImportsCheck = [ "pubnub" ]; @@ -52,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based APIs for PubNub"; homepage = "https://github.com/pubnub/python"; - changelog = "https://github.com/pubnub/python/releases/tag/${version}"; + changelog = "https://github.com/pubnub/python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 6ba0d12588..347d11341e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1.3"; + version = "2023.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WOg62p4Z/+ksH9x4rlRY75GuuJKluPDnN55vph4OZko="; + hash = "sha256-Fd88YDq6h6kYpmbvjhv2P3ZCOMw1ids8W3pfGwHqLwM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix index bc0507055f..b6f1ed0055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchFromGitHub , protobuf , dill , grpcio @@ -46,7 +45,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.51.3" "grpcio" \ + --replace "grpcio~=1.59" "grpcio" \ --replace "semver~=2.13" "semver" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix index 6f3f698fe2..6963d37000 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix @@ -13,18 +13,25 @@ buildPythonPackage rec { pname = "pvo"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-pvoutput"; rev = "refs/tags/v${version}"; - hash = "sha256-6oVACUnK8WVlEx047CUXmSXQ0+M3xnSvyMHw5Wttk7M="; + hash = "sha256-SvsrvGwIAlj/8hdk90+rxigVrx6n3YInvF/4eux2H04="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,13 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "pvo" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix index 1eacc39b8a..d148e539d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-libzfs/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "py-libzfs"; - version = "22.02.4"; + version = "22.12.4.2"; src = fetchFromGitHub { owner = "truenas"; repo = pname; rev = "TS-${version}"; - hash = "sha256-BJG+cw07Qu4aL99pVKNd7JAgr+w/6Uv2eI46EB615/I="; + hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix index 2d01e0cf8f..090883bad3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "1.0.0"; - format = "setuptools"; + version = "1.0.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "ViViDboarder"; repo = "py_nextbus"; rev = "refs/tags/v${version}"; - hash = "sha256-044VDg7bQNNnRGiPZW9gwo3Bzq0LPYKTrd3EgmBOcGA="; + hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix index c6c35ebd29..56036d21c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub -, nix-update-script , pytestCheckHook +, pythonOlder , setuptools , sure }: buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.7"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-RObJSvkqD3T8i470po/CayGC/ae8J6rFQROsrQ1EAGs="; + hash = "sha256-gxoBc7PjS4EQix38VNX6u9cwy4FCjENcUN1euOJJLCo="; }; nativeBuildInputs = [ @@ -32,12 +34,8 @@ buildPythonPackage rec { "py_partiql_parser" ]; - passthru = { - updateScript = nix-update-script { }; - }; - meta = with lib; { - description = "A tokenizer/parser/executor for the PartiQL-language, in Python"; + description = "A tokenizer/parser/executor for the PartiQL-language"; homepage = "https://github.com/getmoto/py-partiql-parser"; changelog = "https://github.com/getmoto/py-partiql-parser/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix index 91d044a366..93ffeacb08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "py-pdf-parser"; - version = "0.11.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GsiGBigvtAgrM0sRffZBG2tVoEaDai+eUxXhMXWNBr0="; + hash = "sha256-nMEmzQVz1LR4omHyxhvrjBXDQQE23S62T0wxZeMnXhg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix index f76f12708f..da14d8a957 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-radix-sr/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python radix tree for IPv4 and IPv6 prefix matching"; homepage = "https://github.com/SEKOIA-IO/py-radix"; license = with licenses; [ isc bsdOriginal ]; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix index c27296e851..028d61f745 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "0.12.0"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-TnO8mkRJfdTO1sA26bqh46EMes2TpLXJwpDdrvPPC9g="; + hash = "sha256-U01XRT6XS0Uxpk+2pYOGAkZiZ5kogMBtcuEU1OJpSMo="; }; nativeBuildInputs = [ @@ -41,6 +41,12 @@ buildPythonPackage rec { "serializable" ]; + disabledTests = [ + # AssertionError: 'The Phoenix + "test_serializable_no_defaultNS" + "test_serializable_with_defaultNS" + ]; + meta = with lib; { description = "Pythonic library to aid with serialisation and deserialisation to/from JSON and XML"; homepage = "https://github.com/madpah/serializable"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-stringmatching/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/py-stringmatching/default.nix index 8c49de1e52..b5bdffca75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-stringmatching/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, nose +, setuptools +, pytestCheckHook , numpy , pythonOlder , six @@ -10,25 +11,33 @@ buildPythonPackage rec { pname = "py-stringmatching"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "py_stringmatching"; inherit version; - sha256 = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; + hash = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy six ]; nativeCheckInputs = [ - nose + pytestCheckHook ]; + preCheck = '' + cd $out + ''; + pythonImportsCheck = [ "py_stringmatching" ]; @@ -38,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/anhaidgroup/py_stringmatching"; changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 9d44aff943..45ac825c6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -6,6 +6,7 @@ , dbus-python , fetchPypi , file +, hatchling , i3 , i3ipc , libnotify @@ -23,13 +24,18 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.51"; + version = "3.54"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU="; + hash = "sha256-xRiXFCILZeiNYJMIJ8Qxga71/7WXeTUsdnRvfvDzpCY="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ pytz requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix deleted file mode 100644 index cfad2238fb..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pySmartDL/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -}: - -buildPythonPackage rec { - pname = "pySmartDL"; - version = "1.3.4"; - src = fetchFromGitHub ({ - owner = "iTaybb"; - repo = pname; - rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b"; - hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; - }); - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/iTaybb/pySmartDL"; - description = "A Smart Download Manager for Python"; - license = licenses.unlicense; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyacaia-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyacaia-async/default.nix new file mode 100644 index 0000000000..7d69f39ceb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyacaia-async/default.nix @@ -0,0 +1,45 @@ +{ lib +, bleak +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "pyacaia-async"; + version = "0.0.10"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "pyacaia_async"; + inherit version; + hash = "sha256-hmzsZIIZsswUvy9AMgfXNC2v6H8Wvgdk9Qa4PoYmhCU="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + bleak + ]; + + # Module has no tests in PyPI releases + doCheck = false; + + pythonImportsCheck = [ + "pyacaia_async" + ]; + + meta = with lib; { + description = "Module to interact with Acaia scales"; + homepage = "https://github.com/zweckj/pyacaia_async"; + license = with licenses; [ gpl3Only mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix index 41fa4afc21..2da0b65e5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyarr"; - version = "4.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; + hash = "sha256-jlcc9Kj1MYSsnvJkKZXXWWJVDx3KIuojjbGtl8kDUpw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix index ff2b4c2dcf..405c39398d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.6.2"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = "refs/tags/${version}"; - hash = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU="; + hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index 1a517aaf6f..6bb98d07f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.0.8"; + version = "3.0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DqRjtMSlyo2PB4ipOpPxFEWl/RuKlT3yWddzCS5NL98="; + hash = "sha256-HvmD1Hi8GCwuox11v0/VdVQlmF5dpPjhgSNfLScz5TY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index 92ccf8e071..5c37066ae9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.5.0"; + version = "7.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-GucatimZTg0Fggrz4bG1x6YSa3wE/uLGB4ufil/km3w="; + hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index 7169a4022f..fb7fedeaef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; configureFlags = [ - "PYTHON=${python.pythonForBuild.interpreter}" + "PYTHON=${python.pythonOnBuildForHost.interpreter}" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 7401af8e47..b5785dfd3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage , aiohttp -, bitarray +, async-timeout , chacha20poly1305-reuseable , cryptography , deepdiff , fetchFromGitHub +, ifaddr , mediafile , miniaudio -, netifaces , protobuf +, pydantic +, pyfakefs , pytest-aiohttp , pytest-asyncio , pytest-httpserver @@ -18,23 +20,25 @@ , pythonRelaxDepsHook , pythonOlder , requests +, setuptools , srptools , stdenv +, tabulate , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.4"; - format = "setuptools"; + version = "0.14.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "postlund"; - repo = pname; + repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw="; + hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; }; postPatch = '' @@ -59,24 +63,28 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ aiohttp - bitarray + async-timeout chacha20poly1305-reuseable cryptography + ifaddr mediafile miniaudio - netifaces protobuf + pydantic requests srptools + tabulate zeroconf ]; nativeCheckInputs = [ deepdiff + pyfakefs pytest-aiohttp pytest-asyncio pytest-httpserver @@ -84,10 +92,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybars3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybars3/default.nix new file mode 100644 index 0000000000..ad7294fd63 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybars3/default.nix @@ -0,0 +1,38 @@ +{ python3 +, fetchPypi +, lib +, pymeta3 +, buildPythonPackage +}: +buildPythonPackage rec { + pname = "pybars3"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI="; + }; + + propagatedBuildInputs = [ + pymeta3 + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pybars" + ]; + + meta = with lib; { + description = "Handlebars.js template support for Python 3 and 2"; + homepage = "https://github.com/wbond/pybars3"; + changelog = "https://github.com/wbond/pybars3/releases/tag/${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index 1cd04164ba..d94cdf524d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -7,22 +7,28 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.3.0"; + version = "1.3.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1MZHKrAITr1O4AW7mFFym9xk2PYsb65b2wdrICn0iO4="; + hash = "sha256-I0CC/dcDnLdQxkTi03/Ck+c0XqOl8nmrrC9PyWLZuZY="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pybase64" ]; + pythonImportsCheck = [ + "pybase64" + ]; meta = with lib; { description = "Fast Base64 encoding/decoding"; homepage = "https://github.com/mayeut/pybase64"; + changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 33660d9165..ec62c32a10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -18,24 +18,14 @@ }: buildPythonPackage rec { - version = "0.15.6"; + version = "0.16.3"; pname = "pybids"; src = fetchPypi { inherit pname version; - hash = "sha256-OjWW08tyVDHkF0X3Pa+10HYD/7Gysp5DkEt9LaVxsdM="; + hash = "sha256-EOJ5NQyNFMpgLA1EaaXkv3/zk+hkPIMaVGrnNba4LMM="; }; - patches = [ - # remove after next release - (fetchpatch { - name = "fix-pybids-sqlalchemy-dep"; - url = "https://github.com/bids-standard/pybids/commit/5f008dfc282394ef94a68d47dba37ceead9eac9a.patch"; - hash = "sha256-gx6w35XqDBZ8cTGHeY/mz2xNQqza9E5z8bRJR7mbPcg="; - excludes = [ "pyproject.toml" ]; # not in PyPI dist - }) - ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "sqlalchemy" ]; @@ -56,8 +46,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bids" ]; - # looks for missing data: - disabledTests = [ "test_config_filename" ]; + disabledTests = [ + # looks for missing data: + "test_config_filename" + # regression associated with formulaic >= 0.6.0 + # (see https://github.com/bids-standard/pybids/issues/1000) + "test_split" + ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix index 3101066ff2..efbc350530 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.20"; + version = "0.3.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "deeptools"; repo = "pyBigWig"; rev = "refs/tags/${version}"; - hash = "sha256-uYKxM0HOG4fus5geBFjbfbv6G1kDvMaAwhk0w/e1YII="; + hash = "sha256-wJC5eXIC9PNlbCtmq671WuoIJVkh3aX7K6WArJWjyFg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index fe29cde9e5..186dca2c17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -12,16 +12,30 @@ , pytestCheckHook , libxcrypt , makeSetupHook +, darwin }: let setupHook = makeSetupHook { name = "pybind11-setup-hook"; substitutions = { out = placeholder "out"; - pythonInterpreter = python.pythonForBuild.interpreter; + pythonInterpreter = python.pythonOnBuildForHost.interpreter; pythonIncludeDir = "${python}/include/python${python.pythonVersion}"; pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; + + # clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11. + # libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6, + # but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a + # support for C++17 aligned allocations on macOS. + # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. + stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + then python.stdenv.override (oldStdenv: { + buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; }; + targetPlatform = oldStdenv.targetPlatform // { darwinMinVersion = "10.13"; }; + hostPlatform = oldStdenv.hostPlatform // { darwinMinVersion = "10.13"; }; + }) + else python.stdenv; in buildPythonPackage rec { pname = "pybind11"; version = "2.11.1"; @@ -41,6 +55,8 @@ in buildPythonPackage rec { buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = [ setupHook ]; + stdenv = stdenv'; + dontUseCmakeBuildDir = true; # Don't build tests if not needed, read the doInstallCheck value at runtime diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix index 004572279a..a104e1e1ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; }; + patches = [ + ./urllib3-2.0-compat.patch + ]; + propagatedBuildInputs = [ requests requests-oauthlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch new file mode 100644 index 0000000000..8b6ef4e91c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch @@ -0,0 +1,21 @@ +diff --git a/pybotvac/robot.py b/pybotvac/robot.py +index f87546f..e9a61de 100644 +--- a/pybotvac/robot.py ++++ b/pybotvac/robot.py +@@ -6,7 +6,6 @@ from datetime import datetime, timezone + from email.utils import format_datetime + + import requests +-import urllib3 + from voluptuous import ( + ALLOW_EXTRA, + All, +@@ -21,8 +20,6 @@ from voluptuous import ( + from .exceptions import NeatoRobotException, NeatoUnsupportedDevice + from .neato import Neato # For default Vendor argument + +-# Disable warning due to SubjectAltNameWarning in certificate +-urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning) + + _LOGGER = logging.getLogger(__name__) + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix index 84c64b79df..6aa58056ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.23.0"; + version = "1.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-tkyVTJUdL2pBpBUpWsiDPKnd5OV88w3TdEOMxMc+hPM="; + hash = "sha256-eAE0YPZAV90MP6g1V1T80suaRV15ts38kYt6Djb78Xk="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix index e1e1e37f0c..db90dcce94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.1.1"; + version = "2.2.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I="; + hash = "sha256-W/sD/Nh2k1z7YvFVnQB9dGa1bXoCTb4QrPk/1mi4Hdk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycardano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycardano/default.nix index 8345a3da20..118e4ed66b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycardano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycardano/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub # Python deps , blockfrost-python +, cachetools , cbor2 , cose , ecpy @@ -29,7 +30,7 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; @@ -37,11 +38,12 @@ in buildPythonPackage rec { owner = "Python-Cardano"; repo = "pycardano"; rev = "v${version}"; - hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; }; propagatedBuildInputs = [ blockfrost-python + cachetools cbor2 cose_0_9_dev8 ecpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycatch22/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycatch22/default.nix index 5fea89e740..c82088d9ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycatch22/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycatch22/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycatch22"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DynamicsAndNeuralSystems"; repo = "pycatch22"; rev = "refs/tags/v${version}"; - hash = "sha256-wjMklOzU9I3Y2HdZ+rOTiffoKda+6X9zwDsmB+HXrSY="; + hash = "sha256-l41LLo9k075EL8rV48bwa4Yw12XuqNJSDYtd9kyqS3U="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { description = "Python implementation of catch22"; homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22"; changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ mbalatsko ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycddl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycddl/default.nix index 3897174006..9cd2d1fab2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycddl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycddl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pycddl"; - version = "0.4.0"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w0CGbPeiXyS74HqZXyiXhvaAMUaIj5onwjl9gWKAjqY="; + hash = "sha256-LdecJPSov2Y/QI4MWb20DcF0EtMuDO0VwiQDUeD55GI="; }; nativeBuildInputs = with rustPlatform; [ maturinBuildHook cargoSetupHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-g96eeaqN9taPED4u+UKUcoitf5aTGFrW2/TOHoHEVHs="; + hash = "sha256-FJET2Xb1cq4aePFhPXpp2oEPIOtpugYWNFAa2Dj0F6Y="; }; nativeCheckInputs = [ pytestCheckHook psutil cbor2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix index 20e7fba1b0..9231fbdf47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-OSdxdhGAZhl625VdIDHQ1aepQR5B0pCTLavfxer1tqc="; + hash = "sha256-qogUjj/GwMGwFEin+xJCSOCf5Ut8bgsFakyoMhkyKgU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix index 4147e01668..e8d33c9390 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.3"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dHgd6vnmlg+VXMp7QUZoT2aic1X05lJGm8hDrowALvk="; + hash = "sha256-5KgZnph9BAE2w3Y93abDHQWmxnFdyVOuW/NdzN66hgA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix index 1b9eba36b9..45e5ff27ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyclipper"; - version = "1.3.0.post4"; + version = "1.3.0.post5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FMqOZ0WOorTtbdweeu9UdoUNWOPrcwc+0SK+55XxyQQ="; + hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix index cdbec27700..250537774c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/default.nix @@ -3,11 +3,12 @@ , fetchPypi , lib , python +, pytestCheckHook }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.10.0"; + version = "2.11.0"; disabled = pythonOlder "3.6"; @@ -15,25 +16,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-NHGHvbR2Mp2Y9pXCE9cpWoRtEVL/T+m6y4qVkLjucFM="; + hash = "sha256-JZvMF4V9ios7SiMnMkt55fAgoTwWB0Zw+cjI+HLqdtA="; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/issues/1151 - # Applies a modified version of an upstream patch that only applied - # to Python 3.12. - ./python-3.11.4-compat.patch + pythonImportsCheck = [ + "pycodestyle" ]; - # https://github.com/PyCQA/pycodestyle/blob/2.10.0/tox.ini#L13 - checkPhase = '' - ${python.interpreter} -m pycodestyle --statistics pycodestyle.py - ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite - ${python.interpreter} -m pycodestyle --max-doc-length=72 --doctest - ${python.interpreter} -m unittest discover testsuite -vv - ''; + nativCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pycodestyle" ]; + # https://github.com/PyCQA/pycodestyle/blob/2.11.0/tox.ini#L16 + postCheck = '' + ${python.interpreter} -m pycodestyle --statistics pycodestyle.py + ''; meta = with lib; { changelog = "https://github.com/PyCQA/pycodestyle/blob/${version}/CHANGES.txt"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch b/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch deleted file mode 100644 index d8a0d79537..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycodestyle/python-3.11.4-compat.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/testsuite/test_api.py b/testsuite/test_api.py -index 8dde32ff..38e34acf 100644 ---- a/testsuite/test_api.py -+++ b/testsuite/test_api.py -@@ -329,7 +329,10 @@ def test_check_nullbytes(self): - count_errors = pep8style.input_file('stdin', lines=['\x00\n']) - - stdout = sys.stdout.getvalue() -- expected = "stdin:1:1: E901 ValueError" -+ if sys.version_info < (3, 11, 4): -+ expected = "stdin:1:1: E901 ValueError" -+ else: -+ expected = "stdin:1:1: E901 SyntaxError: source code string cannot contain null bytes" # noqa: E501 - self.assertTrue(stdout.startswith(expected), - msg='Output %r does not start with %r' % - (stdout, expected)) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix index 22947f9e13..a66c0ef491 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.12.0"; + version = "2023.5.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WepDna9f3Z3dBxWdE6G7nbl3yPK5vMG+7X1rxbZwdjE="; + hash = "sha256-2Aqid2bd5BAnWQ+Wtji0zXjLAmSpyJNGqJ0VroGi6lY="; }; propagatedBuildInputs = [ @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests.py" ]; + disabledTests = [ + # requires network access + "test_srp_requests_http_auth" + ]; + pythonImportsCheck = [ "pycognito" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycomposefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycomposefile/default.nix new file mode 100644 index 0000000000..e7707c763a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycomposefile/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pyyaml +, twine +}: + +buildPythonPackage rec { + pname = "pycomposefile"; + version = "0.0.30"; + + src = fetchPypi { + inherit pname version; + extension = "tar.gz"; + hash = "sha256-GQopIO8F+G5iDz4NF2GTHCpXo4uqKHdHIzffacihylM="; + }; + + nativeBuildInput = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + twine + ]; + + doCheck = false; # tests are broken + + meta = with lib; { + description = "Python library for structured deserialization of Docker Compose files"; + homepage = "https://github.com/smurawski/pycomposefile"; + license = licenses.mit; + maintainers = with maintainers; [ mdarocha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index 06f3afb64d..8c2005c0cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -24,15 +24,15 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2022.2.2"; + version = "2023.1"; src = fetchPypi { inherit pname version; - hash = "sha256-zZLnJGu0WsNFKVWhEHFBEmdM3ztKni9P8lpBWcaE5rs="; + hash = "sha256-F1/2dfDPEOOOmtwD7V3z7Y2Kv32lE0yNzOx1LooKPpE="; }; preConfigure = with lib.versions; '' - ${python.pythonForBuild.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ + ${python.pythonOnBuildForHost.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ --boost-python-libname=boost_python${major python.version}${minor python.version} \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index cacb67496c..fb4aacf3b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch , pythonOlder , curl , openssl @@ -14,24 +13,14 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.1"; + version = "7.45.2"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - hash = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; + hash = "sha256-VzBZC+AnE2Slvd2eJFycwPtxDEy6y92VJkoxItIyJMo="; }; - patches = [ - # Pull upstream patch for curl-3.83: - # https://github.com/pycurl/pycurl/pull/753 - (fetchpatch { - name = "curl-3.83.patch"; - url = "https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1.patch"; - hash = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; - }) - ]; - preConfigure = '' substituteInPlace setup.py --replace '--static-libs' '--libs' export PYCURL_SSL_LIBRARY=openssl @@ -75,6 +64,14 @@ buildPythonPackage rec { "test_libcurl_ssl_gnutls" # AssertionError: assert 'crypto' in ['curl'] "test_ssl_in_static_libs" + # tests that require curl with http3Support + "test_http_version_3" + # https://github.com/pycurl/pycurl/issues/819 + "test_multi_socket_select" + # https://github.com/pycurl/pycurl/issues/729 + "test_multi_socket_action" + # https://github.com/pycurl/pycurl/issues/822 + "test_request_with_verifypeer" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fatal Python error: Segmentation fault "cadata_test" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix new file mode 100644 index 0000000000..b5516bc144 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, can +, cobs +, libpcap +, nunavut +, numpy +, pyserial +}: + +buildPythonPackage rec { + pname = "pycyphal"; + version = "1.15.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KVX+DwcJp1sjpcG1Utl9me1LwWDZPof+O6hoUt1xlXA="; + }; + + propagatedBuildInputs = [ + can + cobs + libpcap + numpy + nunavut + pyserial + ]; + + # Can't seem to run the tests on nix + doCheck = false; + pythonImportsCheck = [ + "pycyphal" + ]; + + meta = with lib; { + description = "A full-featured implementation of the Cyphal protocol stack in Python"; + longDescription = '' + Cyphal is an open technology for real-time intravehicular distributed computing and communication based on modern networking standards (Ethernet, CAN FD, etc.). + ''; + homepage = "https://opencyphal.org/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix index b5de4635b4..18fd4dc70b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix @@ -1,38 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydal"; - version = "20221110.1"; - format = "setuptools"; + version = "20230521.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fD6JHHD42JGONidvIQoZWbt7rfOydvRxkZhv/PW2o5A="; + hash = "sha256-EEeKYeYnxbjLdpH39+v3IQhFSFMWST0310DCl/ttGEU="; }; - postPatch = '' - # this test has issues with an import statement - # rm tests/tags.py - sed -i '/from .tags import/d' tests/__init__.py + nativeBuildInputs = [ + setuptools + ]; - # this assertion errors without obvious reason - sed -i '/self.assertEqual(csv0, str(r4))/d' tests/caching.py + nativeCheckInputs = [ + pytestCheckHook + ]; - # some sql tests fail against sqlite engine - sed -i '/from .sql import/d' tests/__init__.py - ''; + pytestFlagsArray = [ + "tests/*.py" + # these tests already seem to be broken on the upstream + "--deselect=tests/nosql.py::TestFields::testRun" + "--deselect=tests/nosql.py::TestSelect::testGroupByAndDistinct" + "--deselect=tests/nosql.py::TestExpressions::testOps" + "--deselect=tests/nosql.py::TestExpressions::testRun" + "--deselect=tests/nosql.py::TestImportExportUuidFields::testRun" + "--deselect=tests/nosql.py::TestConnection::testRun" + "--deselect=tests/validation.py::TestValidateAndInsert::testRun" + "--deselect=tests/validation.py::TestValidateUpdateInsert::testRun" + "--deselect=tests/validators.py::TestValidators::test_IS_IN_DB" + ]; - pythonImportsCheck = [ "pydal" ]; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m unittest tests - runHook postCheck - ''; + pythonImportsCheck = ["pydal"]; meta = with lib; { description = "Python Database Abstraction Layer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/Cargo.lock deleted file mode 100644 index 05a29d770d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/Cargo.lock +++ /dev/null @@ -1,662 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[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 = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[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 = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -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 = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[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 = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "proc-macro2" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pydantic-core" -version = "2.3.0" -dependencies = [ - "ahash", - "base64", - "enum_dispatch", - "idna 0.3.0", - "mimalloc", - "num-bigint", - "pyo3", - "pyo3-build-config", - "python3-dll-a", - "regex", - "serde", - "serde_json", - "speedate", - "strum", - "strum_macros 0.24.3", - "url", - "version_check", -] - -[[package]] -name = "pyo3" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset", - "num-bigint", - "parking_lot", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" -dependencies = [ - "once_cell", - "python3-dll-a", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "python3-dll-a" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" -dependencies = [ - "cc", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rustversion" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" - -[[package]] -name = "ryu" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" - -[[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.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.25", -] - -[[package]] -name = "serde_json" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "speedate" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54e4ea42510cf6cb46223f6974670faf58ef49e82040e924a295aa3f0c8eaa2" -dependencies = [ - "strum", - "strum_macros 0.25.1", -] - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.1", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.25", -] - -[[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.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "target-lexicon" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" - -[[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 = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna 0.4.0", - "percent-encoding", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix index 7826712acb..6e273aaef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-core/default.nix @@ -14,64 +14,74 @@ , dirty-equals }: -buildPythonPackage rec { - pname = "pydantic-core"; - version = "2.3.0"; - format = "pyproject"; +let + pydantic-core = buildPythonPackage rec { + pname = "pydantic-core"; + version = "2.6.3"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "pydantic"; - repo = "pydantic-core"; - rev = "v${version}"; - hash = "sha256-Wi+b+xiJtVi3KIy6bzT29kyHFSI7mbMNrLa/Iu3cTEY="; + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVACTlzELXPoCtEHMR1s87KJn/qnE0lO1O4RmdjmPM="; + }; + + patches = [ + ./01-remove-benchmark-flags.patch + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-h9SmMLg/W11h/SQz8Te5OoCKdyG6Fctc5ftqbVQFSwU="; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + typing-extensions + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "pydantic_core" ]; + + # escape infinite recursion with pydantic via dirty-equals + doCheck = false; + passthru.tests.pytest = pydantic-core.overrideAttrs { doCheck = true; }; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-timeout + dirty-equals + pytest-mock + ]; + + disabledTests = [ + # RecursionError: maximum recursion depth exceeded while calling a Python object + "test_recursive" + ]; + + disabledTestPaths = [ + # no point in benchmarking in nixpkgs build farm + "tests/benchmarks" + ]; + + meta = with lib; { + description = "Core validation logic for pydantic written in rust"; + homepage = "https://github.com/pydantic/pydantic-core"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; }; - - patches = [ - ./01-remove-benchmark-flags.patch - ]; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ - cargo - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - rustc - typing-extensions - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - ]; - - propagatedBuildInputs = [ - typing-extensions - ]; - - pythonImportsCheck = [ "pydantic_core" ]; - - nativeCheckInputs = [ - pytestCheckHook - hypothesis - pytest-timeout - dirty-equals - pytest-mock - ]; - disabledTests = [ - # RecursionError: maximum recursion depth exceeded while calling a Python object - "test_recursive" - ]; - disabledTestPaths = [ - # no point in benchmarking in nixpkgs build farm - "tests/benchmarks" - ]; - - meta = with lib; { - description = "Core validation logic for pydantic written in rust"; - homepage = "https://github.com/pydantic/pydantic-core"; - license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; - }; -} +in pydantic-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix new file mode 100644 index 0000000000..539873a1a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, phonenumbers +, pycountry +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pydantic-extra-types"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-extra-types"; + rev = "v${version}"; + hash = "sha256-QPBOHIssTsWQlEg2WRpLRKrB6zmae43EExnPn5P4oAY="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + ]; + + passthru.optional-dependencies = { + all = [ + phonenumbers + pycountry + ]; + }; + + pythonImportsCheck = [ "pydantic_extra_types" ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + + meta = with lib; { + description = "Extra Pydantic types"; + homepage = "https://github.com/pydantic/pydantic-extra-types"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-scim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-scim/default.nix index 06a08cb445..9441bcc0eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-scim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-scim/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , fetchFromGitHub , pydantic +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pydantic-scim"; - version = "0.0.7"; - format = "setuptools"; + version = "0.0.8"; + pyproject = true; src = fetchFromGitHub { owner = "chalk-ai"; repo = "pydantic-scim"; rev = "refs/tags/v${version}"; - hash = "sha256-F+uj7kSz6iSb0Vg00VfJ5GcxghooNDKa75S/ZgU7WgI="; + hash = "sha256-Hbc94v/+slXRGDKKbMui8WPwn28/1XcKvHkbLebWtj0="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix new file mode 100644 index 0000000000..c27bb5f275 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pydantic +, python-dotenv +, pytestCheckHook +, pytest-examples +, pytest-mock +}: + +buildPythonPackage rec { + pname = "pydantic-settings"; + version = "2.0.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic-settings"; + rev = "v${version}"; + hash = "sha256-3V6daCibvVr8RKo2o+vHC++QgIYKAOyRg11ATrCzM5Y="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + pydantic + python-dotenv + ]; + + pythonImportsCheck = [ "pydantic_settings" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-examples + pytest-mock + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "Settings management using pydantic"; + homepage = "https://github.com/pydantic/pydantic-settings"; + license = licenses.mit; + broken = lib.versionOlder pydantic.version "2.0.0"; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index ea4943a065..4384e51db2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.9"; + version = "1.10.12"; format = "setuptools"; outputs = [ @@ -48,18 +48,9 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; + hash = "sha256-3XnbPGU90wLCPEryFAOky6Iy73Dvgzzh+GbOKW8hZ4U="; }; - patches = [ - # Fixes racy doctests build failures on really fast machines - # FIXME: remove after next release - (fetchpatch { - url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; - hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; - }) - ]; - postPatch = '' sed -i '/flake8/ d' Makefile ''; 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 794ded6318..5cfd38ff37 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 @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.14.1"; + version = "0.14.3"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-xDYCe8dq4CPfTnBRfjuvkM3aWojuRrgYte8Mw4hKugQ="; + hash = "sha256-t+QM11ogRJrf4tdSW+N5uf6S9tMeUjPkSfo03c1DmNk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix index e804b2c859..fc8965fd35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix @@ -1,21 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, pythonAtLeast }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pygobject3 +}: buildPythonPackage rec { pname = "pydbus"; version = "0.6.0"; + pyproject = true; - # Python 3.11 changed the API of the `inspect` module and pydbus was never - # updated to adapt; last commit was in 2018. - disabled = pythonAtLeast "3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2"; + src = fetchFromGitHub { + owner = "LEW21"; + repo = "pydbus"; + rev = "refs/tags/v${version}"; + hash = "sha256-F1KKXG+7dWlEbToqtF3G7wU0Sco7zH5NqzlL58jyDGw="; }; - propagatedBuildInputs = [ pygobject3 ]; + postPatch = '' + substituteInPlace pydbus/_inspect3.py \ + --replace "getargspec" "getfullargspec" + ''; - pythonImportsCheck = [ "pydbus" ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pygobject3 + ]; + + pythonImportsCheck = [ + "pydbus" + "pydbus.generic" + ]; + + doCheck = false; # requires a working dbus setup meta = { homepage = "https://github.com/LEW21/pydbus"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix index bcfe550d3f..81364bd203 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r6QjtKEnMmWRfDAnxP5zMChCVwyi9Z2lFrYu7hPrTUg="; + hash = "sha256-wzltcerAGh/QfHGg+M7Hlw4SfDEg23K2plSyrmz/m7E="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix index 412373f09a..3a22435412 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , requests +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.3"; + version = "0.3.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gagebenne"; - repo = pname; - rev = version; - hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + repo = "pydexcom"; + rev = "refs/tags/${version}"; + hash = "sha256-46+Ml73F6EUbMwRJB93FD+No/g65RJwnCnFzH4Pb5ek="; }; - propagatedBuildInputs = [ requests ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # tests are interacting with the Dexcom API + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + ]; + + # Tests are interacting with the Dexcom API doCheck = false; - pythonImportsCheck = [ "pydexcom" ]; + + pythonImportsCheck = [ + "pydexcom" + ]; meta = with lib; { description = "Python API to interact with Dexcom Share service"; homepage = "https://github.com/gagebenne/pydexcom"; + changelog = "https://github.com/gagebenne/pydexcom/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index a2100c83c8..ddb4482ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-FNZVu2/7kBGeP4iTH53bsApfHzHFxr5bxqbqkI4T95E="; + hash = "sha256-PF4iA/FPxPYD8OfgWqKRndwi2vURuzh6tlEwduxs/3E="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded @@ -36,6 +36,11 @@ buildPythonPackage { format = "setuptools"; + patches = [ + # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c + ./pillow-10.1.0-compat.patch + ]; + propagatedBuildInputs = [ numpy pillow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch new file mode 100644 index 0000000000..2599f955f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch @@ -0,0 +1,29 @@ +diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py +index ff781025d..a44eb9a41 100644 +--- a/pydicom/pixel_data_handlers/pillow_handler.py ++++ b/pydicom/pixel_data_handlers/pillow_handler.py +@@ -119,18 +119,12 @@ def _decompress_single_frame( + # space prior to compression, setting the value of "mode" to YCbCr + # signals Pillow to not apply any color transformation upon + # decompression. +- if (transfer_syntax in PillowJPEGTransferSyntaxes and +- photometric_interpretation == 'RGB'): +- if 'adobe_transform' not in image.info: +- color_mode = 'YCbCr' +- image.tile = [( +- 'jpeg', +- image.tile[0][1], +- image.tile[0][2], +- (color_mode, ''), +- )] +- image.mode = color_mode +- image.rawmode = color_mode ++ if ( ++ transfer_syntax in PillowJPEGTransferSyntaxes ++ and photometric_interpretation == 'RGB' ++ and "adobe_transform" not in image.info ++ ): ++ image.draft("YCbCr", image.size) + return image + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix index d5cdb74b76..3c87b6b6f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pydiscovergy"; - version = "2.0.4"; + version = "2.0.5"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "pydiscovergy"; rev = "refs/tags/${version}"; - hash = "sha256-yHACEo5481BZVqqEj8WeuIpSWAfBqnmRdOWRPH5RuHQ="; + hash = "sha256-u2G+o/vhPri7CPSnekC8rUo/AvuvePpG51MR+FdH2XA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix index 22c281dce3..dc36f149a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2023.10.0"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-CSjYLiOvnm1kFp4DL3w/YmAsDcbaCfLfGT0xUZy+GZ0="; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 ad6e0b5f31..237570b0e9 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 = "2023.9.0"; + version = "2023.11.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-UPyx/e06N2cAct6/r1y5LXAzKwANQ/ZpADQsjxBv6/Q="; + hash = "sha256-gLP5N07msjuQeeyjbCvZK4TrVyZKUCSSKsjNY5Pa9gQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix index f7923144ba..2ca3ff02ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools , mock , netaddr @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "pyeapi"; - version = "0.8.4"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arista-eosplus"; repo = pname; - rev = "v${version}"; - sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; nativeBuildInputs = [ @@ -36,28 +35,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 - (fetchpatch { - name = "fix-collection-usage.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; - hash = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; - }) - (fetchpatch { - name = "fix-collection-usage-2.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; - hash = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; - excludes = [ - ".github/workflows/ci.yml" - ]; - }) - (fetchpatch { - name = "fix-collection-usage-3.patch"; - url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; - hash = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; - }) - ]; - pytestFlagsArray = [ "test/unit" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix index 5d1d716c40..2021b4e414 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyecoforest"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pjanuario"; repo = "pyecoforest"; rev = "refs/tags/v${version}"; - hash = "sha256-GBt7uHppWLq5nIIVwYsOWmLjWjcwdvJwDE/Gu2KnSIA="; + hash = "sha256-C8sFq0vsVsq6irWbRd0eq18tfKu0qRRBZHt23CiDTGU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix index f8fb18f146..d479564b76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeconet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.20"; + version = "0.1.22"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x94V6qdDHgeeFLAuciC7mHMWbC0d3AtS0aQNaZOCajI="; + hash = "sha256-R6PA/i35vo253J4yowe2fPRZEqStAqmm98k81KDHLQk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix index a009186dd0..0efcb94259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix @@ -6,25 +6,29 @@ , pytest-trio , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm , twisted , typing-extensions -, vcversioner +, wheel }: buildPythonPackage rec { pname = "pyee"; - version = "9.0.4"; - format = "setuptools"; + version = "11.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; + hash = "sha256-J8aCvOYL2txdPiPqzUEB3zKMAoCISj2cB/Ok4+WV3ic="; }; - buildInputs = [ - vcversioner + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index 716846949a..ce1e74e3ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.11.4"; + version = "1.14.3"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-ZFK7Pyn8YsxdxPICtDXx2L+3t/xG3x2HC+F0plDbvHk="; + hash = "sha256-cjkmRGieSKynL8cZORp11/ViK8oCBAZXrgbFKumWKaM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix index 6c7c30fe38..5ef572c481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.2"; + version = "0.2.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g="; + hash = "sha256-HZLWpoo0luAqqwLA3t7cDh0yVP6znrzMoUg7cuexd28="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix index b976989f6b..fd0f1409ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix @@ -3,22 +3,27 @@ , buildPythonPackage , importlib-metadata , importlib-resources +, setuptools , traits , pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.4.4"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0F+qxFOUvVWYWQahIM8AEv58rCxmNJYsBTC2pjUO2yI="; + hash = "sha256-fhNhg0e3pkjtIM29T9GlFkj1AQKR815OD/G/cKcgy/g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ importlib-metadata importlib-resources diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 416ec7c39b..912754373f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-MWxgJmQNFKa0+95x/ZZ0V20bVxDe2o+r3oqtUdeF28M="; + hash = "sha256-PgQPN5IIYIag3CGRsF/nCUOOFoqv4ulPzb7444WSCNg="; }; postPatch = '' @@ -32,6 +32,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) disabledTests = [ "test_open_existing_pipe" ]; + + disabledTestPaths = [ + # try to import opentimelineio but nixpkgs doesn't have it as of 2023-09-16 + "pyfakefs/pytest_tests/segfault_test.py" + ]; + pythonImportsCheck = [ "pyfakefs" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix index b1a38f11f6..2f059d19a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.5"; + version = "0.7.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hllYxPPbLu3dpjHwXfIvTMW0LWtcglTVfN7youZaXTw="; + hash = "sha256-yE9HkAlGj1t90FwmwHDsk3ea2UOl0bG3UtYXxz/SWbI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index d83c027837..2da0f26986 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch, isPy311 , pytestCheckHook }: buildPythonPackage rec { pname = "pyflakes"; - version = "3.0.1"; + version = "3.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; + hash = "sha256-oKrgNMRE2wBxqgd5crpHaNQMgw2VOf1Fv0zT+PaZLvw="; }; - patches = lib.optional isPy311 # could be made unconditional on rebuild - (fetchpatch { - name = "tests-py311.patch"; - url = "https://github.com/PyCQA/pyflakes/commit/836631f2f73d45baa4021453d89fc9fd6f52be58.diff"; - hash = "sha256-xlgql+bN0HsGnTMkwax3ZG/5wrbkUl/kQkjlr3lsgRw="; - }) - ; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index f40dc18712..2ada48a2be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "1.5.8"; + version = "1.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v22rtn3/MrP/BA4oJf/7xrjecDc7ydm1U0gMxNdQTWw="; + hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix index 7df84ea78a..d339389057 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ trio ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_cython + ${python.pythonOnBuildForHost.interpreter} setup.py build_cython ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix index e7539a8145..3c530d199f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "068"; + version = "069"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-BCgSCOnuIqjpROpEtkzkvIXK7dIO0dNYsPmQSwXfmTQ="; + hash = "sha256-IXU00Us1odbfS7jLPMYuCPv2l/5TUZdYKES7xHs+EWg="; }; propagatedBuildInputs = [ pygame python-i18n ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix index 140b233e34..ad506999d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.2.0"; + version = "2.5.1"; disabled = pythonOlder "3.6"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; + rev = "refs/tags/${version}"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-SMkY3uN3kAlb/pbm047W0G8MJ7G8mCsfGVSPhzd5aEo="; + hash = "sha256-0mVbjfNYTfuo8uyd7NFKlneUZMt78mcitQ5nCgPxmFs="; postFetch = "rm -rf $out/docs/reST"; }; @@ -57,9 +57,13 @@ buildPythonPackage rec { ]; preConfigure = '' - ${python.pythonForBuild.interpreter} buildconfig/config.py + ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix index f4f842852b..10336a2754 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygccxml/default.nix @@ -4,12 +4,13 @@ , buildPythonPackage , llvmPackages , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygccxml"; - version = "2.3.0"; - format = "setuptools"; + version = "2.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "gccxml"; repo = "pygccxml"; rev = "refs/tags/v${version}"; - hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; + hash = "sha256-rw99afv68c92LWmKUErB1y0Cts69UEpI0GCxSMvD+B8="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ castxml llvmPackages.libcxxStdenv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix index f5e0bf87b1..a31725a100 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { # for the package to function. Therefore override of buildPhase was # necessary. buildPhase = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace - ${python.pythonForBuild.interpreter} setup.py bdist_wheel + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py bdist_wheel ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index c7e4979d13..5505b1c3a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,7 @@ , cffi , fetchPypi , isPyPy -, libgit2_1_6 +, libgit2 , pycparser , pytestCheckHook , pythonOlder @@ -14,22 +14,22 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.12.2"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VuhdDmbelX1ZnR77JAnTmv7v2PAQCb/aB5a0Kktng1g="; + hash = "sha256-bd43Q2+rFCZK09bLxarj/VVeualoCnv91uVkzXe14rg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${libgit2_1_6}/lib" + export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; buildInputs = [ - libgit2_1_6 + libgit2 ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix index 14bea088c0..78dc32f762 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygitguardian/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.10.0"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-o5Hur51Dh4HWI7f4BpfEi40/inVAJgYF3xXZGPMyF8E="; + hash = "sha256-Vr0+y3Zi7DsXzm2COOlMqUVjlZMRJkaVxT8QpSePhuA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index e27a5d99f4..393ec9f2e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.9"; + version = "2.0.10"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-oJIuQvLSWFBWeOL0o1XFR2waY1LD86N3VAQt23589y8="; + hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix index b98fee9d38..f5d0d0aa21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglm/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pytestCheckHook }: + buildPythonPackage rec { - pname = "PyGLM"; - version = "2.7.0"; + pname = "pyglm"; + version = "2.7.1"; + pyproject = true; src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; - rev = "${version}"; - hash = "sha256-+On4gqfB9hxuINQdcGcrZyOsphfylUNq7tB2uvjsCkE="; + rev = "refs/tags/${version}"; + hash = "sha256-nCkwYZLibQcmlF1Nvv2I6qi+97ue7Q1HVxpw32G5qpo="; fetchSubmodules = true; }; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "glm" + ]; + meta = with lib; { homepage = "https://github.com/Zuzu-Typ/PyGLM"; description = "An OpenGL Mathematics (GLM) library for Python written in C++"; + changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${src.rev}"; license = licenses.zlib; maintainers = with maintainers; [ sund3RRR ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 7ca6b344c9..91d7fa7eb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -3,19 +3,17 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, setuptools-scm +, poetry-core , lsprotocol -, toml , typeguard -, mock , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pygls"; - version = "1.0.1"; - format = "setuptools"; + version = "1.1.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,13 +21,11 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-ovm897Vu6HRziGee3NioM1BA65mLe3F5Z2k0E+A35Gs="; + hash = "sha256-OfLlYTgVCg+oiYww0RjRTjiBwTZBSNqJRryo8gZEmk4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm - toml + poetry-core ]; propagatedBuildInputs = [ @@ -38,7 +34,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytest-asyncio pytestCheckHook ]; @@ -54,9 +49,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; meta = with lib; { - changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; + changelog = "https://github.com/openlawlibrary/pygls/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix index 8f32d26ebc..f2b89cbcef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix @@ -13,13 +13,13 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.15.1"; + version = "2.16.1"; format = "pyproject"; src = fetchPypi { pname = "Pygments"; inherit version; - hash = "sha256-is5NPB3UgYlLIAX1YOrQ+fGe5k/pgzZr4aIeFx0Sd1w="; + hash = "sha256-Ha/wSUggxpvIlB5AeqIPV3N07og2TuEKmP2+Cuzpbik="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index 147198087f..0ce6a2fd3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.0"; + version = "2.19.5"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-gjmZf66AcNaAMqyLerBgRu5RUzV6qrT7DigTNE39AwI="; + hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix index 312faf202b..a5218555b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix @@ -6,18 +6,21 @@ , grpcio , protobuf , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pygnmi"; - version = "0.8.12"; + version = "0.8.13"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "akarneliuk"; repo = "pygnmi"; - rev = "v${version}"; - sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NkByimHk1DoBjMMD7ywplo38VxBpp1pnClYUzhtKwY4="; }; propagatedBuildInputs = [ @@ -35,11 +38,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pygnmi" ]; + pythonImportsCheck = [ + "pygnmi" + ]; meta = with lib; { description = "Pure Python gNMI client to manage network functions and collect telemetry"; homepage = "https://github.com/akarneliuk/pygnmi"; + changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index b8337aea56..6d5615a780 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix index 767eb706bb..a467ff0746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -1,19 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, gobject-introspection, gtk3, pyenchant, pygobject3 }: +{ lib +, buildPythonPackage +, fetchPypi +, gobject-introspection +, gtk3 +, poetry-core +, pyenchant +, pygobject3 +}: buildPythonPackage rec { pname = "pygtkspellcheck"; - version = "5.0.1"; + version = "5.0.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hIHf1LBmFhPWN138jaAAOpmx+frbe6XM22+jG+OWcvw="; + hash = "sha256-rWV/ghoMWHOAmT8ablwOjJSEhtvPqT/UdoZBXL5Nj0s="; }; - nativeBuildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ pyenchant pygobject3 gtk3 ]; + nativeBuildInputs = [ + gobject-introspection + poetry-core + ]; + + propagatedBuildInputs = [ + pyenchant + pygobject3 + gtk3 + ]; doCheck = false; # there are no tests - pythonImportsCheck = [ "gtkspellcheck" ]; + + pythonImportsCheck = [ + "gtkspellcheck" + ]; meta = with lib; { homepage = "https://github.com/koehlma/pygtkspellcheck"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix index 7e59dbf9b1..76197c47c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhepmc"; - version = "2.12.0"; + version = "2.13.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + hash = "sha256-M18Bq6WrAINpgPx5+uh8dufPBxIklRHpbBWUYMC8v10="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix index f8100ad3dd..901bec1614 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.10.2"; + version = "2.11"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-DDMJ7qf6toV1B6zmJANRW2D+CWy/tPkNFPVf91xUQcE="; + hash = "sha256-OrUxJkz+kTKz0qxdcI2ppGSdJfbmgTcwrIjPBAoIqEQ="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix index 4f2794e3e0..d21fcddc42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix @@ -5,6 +5,7 @@ , configparser , distro , fetchFromGitHub +, fetchpatch , gevent , jinja2 , paramiko @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.7"; + version = "2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,9 +28,18 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-drfxNpdhqSxCeB0SbwyKOd3DDA7bFkmDmFQJS3JwOlA="; + hash = "sha256-BYd2UYQJD/HsmpnlQjZvjfg17ShPuA3j4rtv6fTQK/A="; }; + patches = [ + # https://github.com/Fizzadar/pyinfra/pull/1018 + (fetchpatch { + name = "bump-paramiko-major-version.patch"; + url = "https://github.com/Fizzadar/pyinfra/commit/62a8f081279779c4f1eed246139f615cf5fed642.patch"; + hash = "sha256-aT9SeSqXOD76LFzf6R/MWTtavcW6fZT7chkVg9aXiBg="; + }) + ]; + propagatedBuildInputs = [ click colorama diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix index 9848af4492..58fcc8c515 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.5.3"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rGjHVbIl0kXgscKNZ/U1AU3Ij9Y+iOpIXnmO4jeb3jI="; + hash = "sha256-NSE2mZPbKmvlQbBPx0MoqYfAOjmsf9CllX7dxygZfc4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 392595fbc0..de604737ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -3,6 +3,7 @@ , aiohttp , aresponses , backoff +, certifi , fetchFromGitHub , fetchpatch , poetry-core @@ -10,36 +11,23 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, yarl }: buildPythonPackage rec { pname = "pyiqvia"; - version = "2023.08.1"; + version = "2023.10.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "pyiqvia"; rev = "refs/tags/${version}"; - hash = "sha256-vPcb0mwREQri9FuYhWXihWSYnZ2ywBVujPMaNThTbVI="; + hash = "sha256-8eTa2h+1QOL0T13+lg2OzvaQv6CYYKkviQb4J5KPsvM="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/pyiqvia/pull/245 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/pyiqvia/commit/760d5bd1f4d60f3a97f6ea9a9a57860f4be3abdd.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; @@ -47,6 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backoff + certifi + yarl ]; __darwinAllowLocalNetworking = true; @@ -75,6 +65,7 @@ buildPythonPackage rec { https://flustar.com and more). ''; homepage = "https://github.com/bachya/pyiqvia"; + changelog = "https://github.com/bachya/pyiqvia/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix index 292c5f1c11..98496bf4a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjnius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyjnius"; - version = "1.5.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4="; + hash = "sha256-0qfs5u15vx1/l6T21hMC2fHXZSGCo+TIpp267zE5bmA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix index b13aaa716f..5bc06fe170 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pykka"; - version = "4.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xFEEv4UAKv/H//7OIBSb9juwmuH4xWd6BKBXaX2GwFU="; + hash = "sha256-SYgT69/AZX/JDm89PwFqrUL9Ll1iHRKEy78BN4QKz9Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix index 51e3dfdab2..1e18c9f93a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylgnetcast/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylgnetcast"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Drafteed"; repo = "python-lgnetcast"; - rev = "v${version}"; - sha256 = "0pmz52k2sfxj5x2wcwdjks2lqh1gb5zfrjgc6xij8jal4l9xd2dz"; + rev = "refs/tags/v${version}"; + hash = "sha256-UxZ4XM7n0Ryd4D967fXPTA4sqTrZwS8Tj/Q8kNGdk8Q="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API client for the LG Smart TV running NetCast 3 or 4"; homepage = "https://github.com/Drafteed/python-lgnetcast"; + changelog = "https://github.com/Drafteed/python-lgnetcast/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix index 52f59cc3fc..e56b1dfa36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix @@ -10,19 +10,26 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; - disabled = isPyPy || pythonAtLeast "3.11"; + disabled = isPyPy; src = fetchurl { url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"; }; + patches = [ + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/py3-pyliblo/py3.11.patch?id=a7e1eca5533657ddd7e37c43e67e8126e3447258"; + hash = "sha256-4yCWNQaE/9FHGTVuvNEimBNuViWZ9aSJMcpTOP0fnM0="; + }) + ]; + buildInputs = [ liblo cython ]; meta = with lib; { homepage = "https://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index dcfc83c029..978394e60e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , django -, factory_boy +, factory-boy , fetchFromGitHub , pylint-plugin-utils , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - factory_boy + factory-boy pytestCheckHook ]; 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 1ba6e06298..b12ae73b8c 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 @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylint-venv"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jgosmann"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mYG9iZHbA67oJc2sshtV3w8AQaqPsXGqMuLJFI4jAI0="; + hash = "sha256-dsVEHJawsTNKVCVmeOa61wOU5GPeyzAU/eUDFrK9PPg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index fd9ca66dae..e069e90268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -1,9 +1,9 @@ { lib +, async-timeout , buildPythonPackage , cryptography , fetchFromGitHub , pytest-asyncio -, pytest-sugar , pytest-timeout , pytestCheckHook , pythonOlder @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.18.2"; + version = "0.18.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GyYJZIjvy4JYNCUUJpQxt32U8lMS/iQoz4llbCmJQhU="; + hash = "sha256-tjmMu7LUne+hLLTXGqHhci9/PZiuQ10mQaARvL2sdIM="; }; nativeBuildInputs = [ @@ -34,9 +34,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytest-sugar pytest-timeout pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymaging/default.nix deleted file mode 100644 index 8869924bdd..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymaging/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -}: - -buildPythonPackage { - pname = "pymaging"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging"; - rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; - sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; - }; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "http://pymaging.rtfd.org"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix deleted file mode 100644 index 6d12ddd400..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymaging_png/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pymaging -}: - -buildPythonPackage { - pname = "pymaging-png"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging-png"; - rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; - sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; - }; - - propagatedBuildInputs = [ pymaging ]; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "https://github.com/ojii/pymaging-png/"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix index 0ade36294d..d6fbdacf46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nbSxqMmYWi71s74bbB9LAlPKEslTqG/j266cLfNHrwg="; + hash = "sha256-pDFRYhswcuAHG9pcqvzXIy3Ivhxe5R5Ric7AFRh7MK4="; }; propagatedBuildInputs = [ numpy scipy torch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix deleted file mode 100644 index b0b83ca840..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, cryptography -, fetchPypi -, poetry-core -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pymazda"; - version = "0.3.11"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-DiXLY4mfgRbE0Y1tOJnkMSQQj1vcySLVDBthOWe7/dM="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - cryptography - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "pymazda" - ]; - - meta = with lib; { - description = "Python client for interacting with the MyMazda API"; - homepage = "https://github.com/bdr99/pymazda"; - changelog = "https://github.com/bdr99/pymazda/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix index 3120a5a844..5ca2b1ce93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.9.0"; + version = "5.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-iaX1+SHGAJ9V2Jv76as5BcL5DcxURwX3aGa+R9YVtXY="; + hash = "sha256-yY8W3B1yqj0oOkR6+nMbFgCFmTStXkePWnEYPHI8Zto="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 1f4bcb1cce..f6fea35270 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.1.0"; + version = "10.3"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-KqDEmWAWXdDpQPsP9Vrced+Ozz9IZiD8rCG57hPR7Xs="; + hash = "sha256-R35R2dHfjcVQbEa2319FEMjPGl1Y5/u2KEHeR0wTYEo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix index e511c24fcc..4c8d6aee1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; + hash = "sha256-GGoLQalFJPCYTQhcprlFx5olRGW3CX8lYNwMBOjR2KU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix index 079c7e31f1..ad4e529c52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { aiohttp ]; + doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeta3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeta3/default.nix new file mode 100644 index 0000000000..f0350c4153 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeta3/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "pymeta3"; + version = "0.5.1"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "PyMeta3"; + hash = "sha256-GL2jJtmpu/WHv8DuC8loZJZNeLBnKIvPVdTZhoHQW8s="; + }; + + doCheck = false; # Tests do not support Python3 + + pythonImportsCheck = [ + "pymeta" + ]; + + meta = with lib; { + description = "Pattern-matching language based on OMeta for Python 3 and 2"; + homepage = "https://github.com/wbond/pymeta3"; + changelog = "https://github.com/wbond/pymeta3/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix index cab8e00401..4e16030d95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , aiohttp , async-timeout -, pytz , xmltodict +, pythonOlder }: buildPythonPackage rec { pname = "pymetno"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; rev = "refs/tags/${version}"; - hash = "sha256-NikfHQwVviCKWGfY1atirFVaqWQHfXg8WAgZIDnGn4Q="; + hash = "sha256-wRSUIaonjjucLM+A4GsF9Lrq2vZYCquEvblbmjKYpQE="; }; propagatedBuildInputs = [ aiohttp async-timeout - pytz xmltodict ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to communicate with the met.no API"; homepage = "https://github.com/Danielhiversen/pyMetno/"; + changelog = "https://github.com/Danielhiversen/pyMetno/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index 7b17294956..539502db35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -3,14 +3,15 @@ , buildPythonPackage , click , fetchFromGitHub -, mock , prompt-toolkit , pygments , pyserial , pytest-asyncio , pytest-xdist , pytestCheckHook +, pythonOlder , redis +, setuptools , sqlalchemy , twisted , typer @@ -18,16 +19,22 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.5.2"; - format = "setuptools"; + version = "3.5.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FOmR9yqLagqcsAVxqHxziEcnZ5M9QpL2qIp8x2gS2PU="; + hash = "sha256-IgGDYNIRS39t8vHkJSGnDGCTKxpeIYZyedLzyS5pOI0="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru.optional-dependencies = { repl = [ aiohttp @@ -42,7 +49,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - mock pytest-asyncio pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix index 98cbf453e5..f0930c8c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; rev = "refs/tags/v${version}"; - hash = "sha256-1v36cI6JjDZA/uJE85NSMNnoyKI1VCgDrymfnCkpVqU="; + hash = "sha256-h6/yKvAHqvw0L3Z1+PUQi36Ja6yvFiaX7Cn5Ypcg1Zs="; }; postPatch = '' @@ -48,6 +48,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # new test with insufficient monkey patching, try to remove on next bump + "tests/unit/test_mongod.py" + ]; + preCheck = '' export HOME="$(mktemp -d)" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix index 292e7fceea..bb6196f775 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.3.3"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NOlf+wpov/vDtDfy0fJfyRb+899c3u0JktpfQvrpuAc="; + hash = "sha256-aB8lLkOz7wVMqRYWNfgbcw9NjK3Siz8rIAT1py+FOYI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy3/default.nix index c4642b9065..2ef0e9629b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy3/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pymorphy3"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "no-plagiarism"; repo = pname; - rev = version; - hash = "sha256-5MXAYcjZPUrGf5G5e7Yml1SLukrZURA0TCv0GiP56rM="; + rev = "refs/tags/${version}"; + hash = "sha256-JTRG+UtNXnS9GFUrgHNVCktb3HdH98wDFgzDPp6oVcQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix index 9b801e42c8..463de728ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix @@ -19,9 +19,10 @@ buildPythonPackage rec { patches = [ # Fixes a TypeError on Python 3.11 # (see https://github.com/pympler/pympler/issues/148) + # https://github.com/pympler/pympler/pull/149 (fetchpatch { name = "${pname}-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/pull/149.patch"; + url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index 869a2a085e..f649f9bba0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.5.1"; + version = "6.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ZEO7YJBkCMgsD9MnwBn/X3qt39+IiecM453bjDgZDls="; + hash = "sha256-AV6upaZcnbKmQm9tTItRB6LpckappjdHvMH/awn/KeE="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext --inplace + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 0bea5f8c51..1c21e6b90c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -2,9 +2,10 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, python , swig -, xcbuild , mupdf , freetype , harfbuzz @@ -13,33 +14,32 @@ , libjpeg_turbo , gumbo , memstreamHook +, fonttools }: -buildPythonPackage rec { +let + # PyMuPDF needs the C++ bindings generated + mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; +in buildPythonPackage rec { pname = "pymupdf"; - version = "1.22.5"; + version = "1.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyMuPDF"; - inherit version; - hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k="; + src = fetchFromGitHub { + owner = "pymupdf"; + repo = "PyMuPDF"; + rev = version; + hash = "sha256-60KT5+EGP+s7HD4UIeaf9x2QVNU9IUbC5WKEJbrIBCI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf - ''; nativeBuildInputs = [ + pytestCheckHook swig - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild ]; buildInputs = [ - mupdf freetype harfbuzz openjpeg @@ -50,10 +50,40 @@ buildPythonPackage rec { memstreamHook ]; - doCheck = false; + propagatedBuildInputs = [ + mupdf-cxx + ]; + + env = { + # force using system MuPDF (must be defined in environment and empty) + PYMUPDF_SETUP_MUPDF_BUILD = ""; + # provide MuPDF paths + PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib"; + PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include"; + }; + + # TODO: manually add mupdf rpath until upstream fixes it + postInstall = lib.optionalString stdenv.isDarwin '' + for lib in */*.so $out/${python.sitePackages}/*/*.so; do + install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" + done + ''; + + checkInputs = [ + fonttools + ]; + + disabledTests = [ + # fails for indeterminate reasons + "test_color_count" + ] ++ lib.optionals stdenv.isDarwin [ + # darwin does not support OCR right now + "test_tesseract" + ]; pythonImportsCheck = [ "fitz" + "fitz_new" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix index 251c08f026..bd3931e4f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8="; + hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix index acdb8f0b14..73e611d0f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - hash = "sha256-uiNUkNL/3FGGhqctE9AZNdSD4o7jTk829GAT5Gy2Xeo="; + hash = "sha256-6HJ78tKl6If/ezwOrGl3VEYO4eMh/6cZq2j2AMBr0I8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index b7075b9619..fb796ab6c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -14,25 +14,21 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.8"; + version = "0.5.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p8VSVpv2BKEB/VS7odJ8EjieBllF3uOmd3pRjGOkbys="; + hash = "sha256-XV3Gg8A+9V/j3faThZcgyhj4XG5uW7C08UhwJ41SiK0="; }; patches = [ - # Fix sklearn 1.2.0 compat; https://github.com/lmcinnes/pynndescent/issues/207 + # https://github.com/lmcinnes/pynndescent/pull/224 (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/00444be2107b71169b853847e7b334623c58a4e3.patch"; - hash = "sha256-mbe01BwroS5q6hENsj3NejmGGhmk2IeX4LD6Iq6PR0c="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/e56b92776a4a05f2dabb80d25479bd37e7ebd88e.patch"; - hash = "sha256-zVTaW4syGEHh2HAGPyBN3YXqUGe55v/LxKLX/zjXT5Y="; + url = "https://github.com/lmcinnes/pynndescent/commit/86e0d716a3a4d5f4e6a0a3c2952f6fe339524e96.patch"; + hash = "sha256-dfnT5P9Qsn/nSAr4Ysqo/olbLLfoZXvBRz33yzhN3J4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix index 394c6f87b6..88c46532d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynput/default.nix @@ -1,22 +1,61 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-lint +, sphinx + +# dependencies +, xlib +, evdev +, darwin +, six + + # tests +, unittestCheckHook + }: buildPythonPackage rec { pname = "pynput"; version = "1.7.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c"; + src = fetchFromGitHub { + owner = "moses-palmer"; + repo = "pynput"; + rev = "refs/tags/v${version}"; + hash = "sha256-gRq4LS9NvPL98N0Jk09Z0GfoHS09o3zM284BEWS+NW4="; }; - nativeBuildInputs = [ sphinx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; - propagatedBuildInputs = [ setuptools-lint xlib ] - ++ lib.optionals stdenv.isLinux [ - evdev + nativeBuildInputs = [ + setuptools + setuptools-lint + sphinx ]; - doCheck = false; + propagatedBuildInputs = [ + six + ] ++ lib.optionals stdenv.isLinux [ + evdev + xlib + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + Quartz + ]); + + doCheck = false; # requires running X server + + nativeCheckInputs = [ + unittestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix index af2dbc27d6..0f69b51e65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvim-pp/default.nix @@ -7,15 +7,14 @@ buildPythonPackage { pname = "pynvim-pp"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-08-03"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "pynvim_pp"; - rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b"; - hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo="; + rev = "40d0f6053ddbba61f53505eebb0290cfb661661b"; + hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix index edc9eb2644..d2dd95f424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-x56kfnmdVV0Fc7XSI60rrtEl4k3uzpIdZxTofUbkUHU="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix index 699b6c3cf5..19980b7c0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix @@ -5,14 +5,19 @@ , capstone , cmsis-pack-manager , colorama +, importlib-metadata +, importlib-resources , intelhex , intervaltree +, lark , natsort , prettytable , pyelftools , pylink-square , pyusb , pyyaml +, setuptools +, setuptools-scm , typing-extensions , stdenv , hidapi @@ -21,11 +26,12 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.34.3"; + version = "0.36.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "2zDr6fnA2MCTT/hNVvk7u3gugMo+nUF2E2VsOPhJXH4="; + hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg="; }; patches = [ @@ -37,12 +43,25 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "libusb-package>=1.0,<2.0" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ capstone cmsis-pack-manager colorama + importlib-metadata + importlib-resources intelhex intervaltree + lark natsort prettytable pyelftools @@ -54,19 +73,19 @@ buildPythonPackage rec { hidapi ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "pyocd" + ]; - pythonImportsCheck = [ "pyocd" ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "libusb-package>=1.0,<2.0" "" \ - --replace "pylink-square>=0.11.1,<1.0" "pylink-square>=0.11.1,<2.0" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/pyocd/pyOCD/releases/tag/v${version}"; description = "Python library for programming and debugging Arm Cortex-M microcontrollers"; - homepage = "https://pyocd.io/"; + downloadPage = "https://github.com/pyocd/pyOCD"; + homepage = "https://pyocd.io"; license = licenses.asl20; maintainers = with maintainers; [ frogamic sbruder ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index fb82fc0530..8dc1ee0f87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -7,12 +7,15 @@ , isPy3k , substituteAll , pytestCheckHook +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "pyocr"; - version = "0.8.3"; + version = "0.8.5"; disabled = !isPy3k; + format = "pyproject"; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitLab { @@ -21,7 +24,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - hash = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; + hash = "sha256-gE0+qbHCwpDdxXFY+4rjVU2FbUSfSVrvrVMcWUk+9FU="; }; patches = [ @@ -31,18 +34,17 @@ buildPythonPackage rec { }) ]; - # see the logic in setup.py - ENABLE_SETUPTOOLS_SCM = "0"; - preConfigure = '' - echo 'version = "${version}"' > src/pyocr/_version.py - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ pillow ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; + changelog = "https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/blob/${version}/ChangeLog"; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; maintainers = with maintainers; [ symphorien ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch index d490607397..c3c802c206 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch @@ -1,4 +1,4 @@ -commit c4bac00441363fcaeb074682d8226ca523614ea2 +commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd Author: Guillaume Girol Date: Sat Aug 20 17:48:01 2022 +0200 @@ -25,7 +25,7 @@ index 2e5b717..35647e2 100644 LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index 2002614..9ebea5c 100644 +index 1edec8c..434a336 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py +++ b/src/pyocr/libtesseract/tesseract_raw.py @@ -2,7 +2,6 @@ import ctypes @@ -51,7 +51,7 @@ index 2002614..9ebea5c 100644 DPI_DEFAULT = 70 - --if getattr(sys, 'frozen', False): # pragma: no cover +-if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'): - # Pyinstaller integration - libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")] - libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")] @@ -125,10 +125,10 @@ index 0fe0d20..c1fdd27 100644 TESSDATA_EXTENSION = ".traineddata" -diff --git a/tests/tests_cuneiform.py b/tests/tests_cuneiform.py -index 45b7f6a..95f55c6 100644 ---- a/tests/tests_cuneiform.py -+++ b/tests/tests_cuneiform.py +diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py +index b76e93c..266f6b2 100644 +--- a/tests/test_cuneiform.py ++++ b/tests/test_cuneiform.py @@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): # XXX is it useful? which.return_value = True @@ -147,7 +147,7 @@ index 45b7f6a..95f55c6 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -109,7 +109,7 @@ class TestCuneiformTxt(BaseTest): +@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): output = cuneiform.image_to_string(self.image) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -156,7 +156,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -125,7 +125,7 @@ class TestCuneiformTxt(BaseTest): +@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -165,7 +165,7 @@ index 45b7f6a..95f55c6 100644 "-"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT -@@ -142,7 +142,7 @@ class TestCuneiformTxt(BaseTest): +@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -174,7 +174,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -173,7 +173,7 @@ class TestCuneiformTxt(BaseTest): +@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): output = cuneiform.image_to_string(image, builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -183,7 +183,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -227,7 +227,7 @@ class TestCuneiformWordBox(BaseTest): +@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): output = cuneiform.image_to_string(self.image, builder=self.builder) popen.assert_called_once_with( @@ -192,7 +192,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -280,7 +280,7 @@ class TestCuneiformLineBox(BaseTest): +@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): output = cuneiform.image_to_string(self.image, builder=self.builder) popen.assert_called_once_with( @@ -201,11 +201,11 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py -index a5d46d8..8b9e315 100644 ---- a/tests/tests_libtesseract.py -+++ b/tests/tests_libtesseract.py -@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest): +diff --git a/tests/test_libtesseract.py b/tests/test_libtesseract.py +index cc31a50..890c02c 100644 +--- a/tests/test_libtesseract.py ++++ b/tests/test_libtesseract.py +@@ -167,7 +167,8 @@ class TestLibTesseractRaw(BaseTest): args = libtess.TessBaseAPIInit3.call_args[0] self.assertEqual(len(args), 3) self.assertEqual(args[0].value, self.handle) @@ -215,7 +215,7 @@ index a5d46d8..8b9e315 100644 self.assertEqual(args[2].value, lang.encode() if lang else None) self.assertEqual( -@@ -201,7 +202,8 @@ class TestLibTesseractRaw(BaseTest): +@@ -203,7 +204,8 @@ class TestLibTesseractRaw(BaseTest): args = libtess.TessBaseAPIInit3.call_args[0] self.assertEqual(len(args), 3) self.assertEqual(args[0].value, self.handle) @@ -225,11 +225,11 @@ index a5d46d8..8b9e315 100644 self.assertEqual(args[2].value, lang.encode() if lang else None) self.assertEqual( -diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py -index 18d01ef..593cf94 100644 ---- a/tests/tests_tesseract.py -+++ b/tests/tests_tesseract.py -@@ -36,7 +36,7 @@ class TestTesseract(BaseTest): +diff --git a/tests/test_tesseract.py b/tests/test_tesseract.py +index 823818f..2ee5fb4 100644 +--- a/tests/test_tesseract.py ++++ b/tests/test_tesseract.py +@@ -37,7 +37,7 @@ class TestTesseract(BaseTest): def test_available(self, which): which.return_value = True self.assertTrue(tesseract.is_available()) @@ -238,7 +238,7 @@ index 18d01ef..593cf94 100644 @patch("subprocess.Popen") def test_version_error(self, popen): -@@ -162,7 +162,7 @@ class TestTesseract(BaseTest): +@@ -163,7 +163,7 @@ class TestTesseract(BaseTest): for lang in ("eng", "fra", "jpn", "osd"): self.assertIn(lang, langs) popen.assert_called_once_with( @@ -247,7 +247,7 @@ index 18d01ef..593cf94 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -177,7 +177,7 @@ class TestTesseract(BaseTest): +@@ -178,7 +178,7 @@ class TestTesseract(BaseTest): self.assertEqual(te.exception.status, 1) self.assertEqual("unable to get languages", te.exception.message) popen.assert_called_once_with( @@ -256,7 +256,7 @@ index 18d01ef..593cf94 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -254,7 +254,7 @@ class TestTesseract(BaseTest): +@@ -255,7 +255,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_once_with( @@ -265,7 +265,7 @@ index 18d01ef..593cf94 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -277,7 +277,7 @@ class TestTesseract(BaseTest): +@@ -278,7 +278,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_with( @@ -274,7 +274,7 @@ index 18d01ef..593cf94 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -308,7 +308,7 @@ class TestTesseract(BaseTest): +@@ -309,7 +309,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -283,7 +283,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -344,7 +344,7 @@ class TestTesseract(BaseTest): +@@ -345,7 +345,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -292,7 +292,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -377,7 +377,7 @@ class TestTesseract(BaseTest): +@@ -378,7 +378,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -301,7 +301,7 @@ index 18d01ef..593cf94 100644 "--psm", "0", "-l", "osd"], stdin=subprocess.PIPE, shell=False, -@@ -405,7 +405,7 @@ class TestTesseract(BaseTest): +@@ -406,7 +406,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -310,7 +310,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -439,7 +439,7 @@ class TestTesseract(BaseTest): +@@ -440,7 +440,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -319,7 +319,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -473,7 +473,7 @@ class TestTesseract(BaseTest): +@@ -474,7 +474,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -328,7 +328,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -506,7 +506,7 @@ class TestTesseract(BaseTest): +@@ -507,7 +507,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -337,7 +337,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -533,7 +533,7 @@ class TestTesseract(BaseTest): +@@ -534,7 +534,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -346,7 +346,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -567,7 +567,7 @@ class TestTesseract(BaseTest): +@@ -568,7 +568,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index d3e7faf03c..d8cf1f260d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.35"; + version = "4.0.39"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; + hash = "sha256-5Si7cN1tYpnuQphokl3whm4+kZx3K57/ecjheSDY8RY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index db815f0d35..9f33457730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -26,12 +26,12 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1.2"; + version = "2023.1.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-6wDNV0BJ1ZK2edz4v+erSjbJSjn9Gssaa0XWwNe+mmg="; + hash = "sha256-IgF078qQDp1d5a7yqht3pvJVBQHekrA1qRATrq5NTF4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index 4e67fd0783..bc841cc2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postPatch = '' # remove cryptography pin - sed "/cryptography/ s/,<[0-9]*//g" setup.py + sed -i "/cryptography/ s/,<[0-9]*//g" setup.py ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix index 3c70109657..0b36f9b735 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.02.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,16 +23,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EiTTck6hmOGSQ7LyZsbhnH1zgkH8GccejLdJaH2m0F8="; + hash = "sha256-6JYYkEH873beEQf2agAF85YLSb7+n0UVzIuRz3amXpU="; }; patches = [ - # Remove asynctest, https://github.com/bachya/pyopenuv/pull/108 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch"; - hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw="; - }) # This patch removes references to setuptools and wheel that are no longer # necessary and changes poetry to poetry-core, so that we don't need to add # unnecessary nativeBuildInputs. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix index edeb63a224..f164e91b7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.12.2"; + version = "1.13.1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kgCHPp0nsbhzNw/bKwDeDc1mMcmdJUBmZExTZ01nlZY="; + hash = "sha256-LahLR+LbppcPKs0gPT2lEP48XG6pbGMvCBW/EwAIFDQ="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index b9335d108b..0c07a12fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -2,51 +2,40 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub -, fetchpatch , poetry-core , pytest-asyncio , pytest-aiohttp , pytestCheckHook , pythonOlder , ujson +, yarl }: buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2023.08.0"; - format = "pyproject"; + version = "2023.10.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "pyoutbreaksnearme"; rev = "refs/tags/${version}"; - hash = "sha256-Qrq8/dPJsJMJNXobc+Ps6Nbg819+GFuYplovGuWK0nQ="; + hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/pyoutbreaksnearme/pull/174 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/pyoutbreaksnearme/commit/45fba9f689253a0f79ebde93086ee731a4151553.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + certifi ujson + yarl ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index 99a336f99d..31d8adb3b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.12.0"; + version = "1.13.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-r2d/lc7x45usIhT09JSNnHSErJI4zrr+HuLhznoy1CM="; + hash = "sha256-WGFRZhnlTDC9uv9N4sKznIdgjBwpnuT9Gsa8hdlnPAE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index ac7f88d485..ad81b8e7f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -6,7 +6,7 @@ , poetry-core , pythonOlder , substituteAll -, texlive +, texliveSmall }: buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - texlive.combined.scheme-small + texliveSmall pandocfilters ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index b8c0812cfb..84d8439a53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -1,23 +1,23 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , isPyPy , pkgs , python , six +, pytestCheckHook }: buildPythonPackage rec { pname = "pyparted"; - version = "3.12.0"; + version = "3.13.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; - rev = "v${version}"; - hash = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-AiUCCrEbDD0OxrvXs1YN3/1IE7SuVasC2YCirIG58iU="; }; postPatch = '' @@ -31,31 +31,14 @@ buildPythonPackage rec { tests/test__ped_ped.py ''; - patches = [ - ./fix-test-pythonpath.patch - (fetchpatch { - url = "https://github.com/dcantrell/pyparted/commit/07ba882d04fa2099b53d41370416b97957d2abcb.patch"; - hash = "sha256-yYfLdy+TOKfN3gtTMgOWPebPTRYyaOYh/yFTowCbdjg="; - }) - (fetchpatch { - url = "https://github.com/dcantrell/pyparted/commit/a01b4eeecf63b0580c192c7c2db7a5c406a7ad6d.patch"; - hash = "sha256-M/8hYiKUBzaTOxPYDFK5BAvCm6WJGx+693qwj3HzdRA="; - }) - ]; - preConfigure = '' PATH="${pkgs.parted}/sbin:$PATH" ''; nativeBuildInputs = [ pkgs.pkg-config ]; - nativeCheckInputs = [ six ]; + nativeCheckInputs = [ six pytestCheckHook ]; propagatedBuildInputs = [ pkgs.parted ]; - checkPhase = '' - patchShebangs Makefile - make test PYTHON=${python.executable} - ''; - meta = with lib; { homepage = "https://github.com/dcantrell/pyparted/"; description = "Python interface for libparted"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch deleted file mode 100644 index 740bffbef6..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 1980-01-02 00:00:00.000000000 +0100 -+++ b/Makefile 2020-02-18 20:04:14.068243263 +0100 -@@ -39,19 +39,19 @@ - @$(PYTHON) setup.py build - - test: all -- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - $(PYTHON) -m unittest discover -v - - coverage: all - @echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***" -- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - $(COVERAGE) run --branch -m unittest discover -v - $(COVERAGE) report --include="build/lib.*/parted/*" --show-missing - $(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log - - check: clean - env PYTHON=python3 $(MAKE) ; \ -- env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \ -+ env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \ - tests/pylint/runpylint.py - - dist: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix index 585d12e8fb..df58a17aee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.15.1"; + version = "3.16.0"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-0KMZnMIeTkra2Il4HGDBtm8HLP8zpMXgUD4V5U5fYy0="; + hash = "sha256-vE5ujknMpufBuwWqtjkLegTRe4eDAvBVPCVM6It2pHQ="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix index e6ae36f0cf..16ff853422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix @@ -1,30 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder , psutil , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyperf"; - version = "2.5.0"; - format = "setuptools"; + version = "2.6.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n9m+W1ciTmi1pbiPcSbxW2yGZ1c/YqCjn68U1v3ROQk="; + hash = "sha256-ZNj63OanT0ePKYMsHqoqBIVmVev/FyktUjf8gxfDo8U="; }; - patches = [ - (fetchpatch { - name = "fix-pythonpath-in-tests.patch"; - url = "https://github.com/psf/pyperf/commit/d373c5e56c0257d2d7abd705b676bea25cf66566.patch"; - hash = "sha256-2q1fTf+uU3qj3BG8P5otX4f7mSTnQxm4sfmmgIUuszA="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -35,12 +31,21 @@ buildPythonPackage rec { unittestCheckHook ]; - unittestFlagsArray = [ "-s" "pyperf/tests/" "-v" ]; + unittestFlagsArray = [ + "-s" + "pyperf/tests/" + "-v" + ]; + + pythonImportsCheck = [ + "pyperf" + ]; meta = with lib; { description = "Python module to generate and modify perf"; homepage = "https://pyperf.readthedocs.io/"; + changelog = "https://github.com/psf/pyperf/releases/tag/${version}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix index 816afc262f..59a3be3109 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypitoken/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypitoken"; - version = "7.0.0"; + version = "7.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ewjoachim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE="; + hash = "sha256-1SUR6reZywgFpSdD49E5PjEDNrlvsHH4TK6SkXStUws="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix index 6cbef5b8a7..4ba62fc1e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pyproject-api"; - version = "1.5.4"; + version = "1.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-HX+5BypfEOfQ3vg3vha0QCVrEarjMu/Q8id+xgmWGfA="; + hash = "sha256-XQD+36NP2zKUp/QRlgKhwzfMYBh6GVlCYXURXs2qeO8="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index 9590b7d07b..cf2a413a04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -7,7 +7,7 @@ , mako , nose , pyramid -, pyramid_mako +, pyramid-mako , pytestCheckHook , six , tornado @@ -33,7 +33,7 @@ buildPythonPackage rec { nose tornado pyramid - pyramid_mako + pyramid-mako pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 12d2ea182a..c514b9f835 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -12,6 +12,7 @@ , pyqt5_sip , pyqt-builder , libsForQt5 +, enableVerbose ? true , withConnectivity ? false , withMultimedia ? false , withWebKit ? false @@ -19,6 +20,9 @@ , withLocation ? false , withSerialPort ? false , withTools ? false +, pkgsBuildTarget +, buildPackages +, dbusSupport ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -45,6 +49,7 @@ buildPythonPackage rec { # be more verbose '' cat >> pyproject.toml < PyQt_PrintDialog + # QT_NO_PRINTER => PyQt_Printer + # QT_NO_PRINTPREVIEWDIALOG => PyQt_PrintPreviewDialog + # QT_NO_PRINTPREVIEWWIDGET => PyQt_PrintPreviewWidget + # QT_NO_SSL => PyQt_SSL + # QT_SHARED || QT_DLL => shared (otherwise static) + # QT_NO_PROCESS => PyQt_Process + # QT_NO_FPU || Q_PROCESSOR_ARM || Q_OS_WINCE => PyQt_qreal_double + # sizeof (qreal) != sizeof (double) => PyQt_qreal_double + # !Q_COMPILER_CONSTEXPR !Q_COMPILER_UNIFORM_INIT => PyQt_CONSTEXPR + # QT_NO_ACCESSIBILITY => PyQt_Accessibility + # QT_NO_OPENGL => PyQt_OpenGL PyQt_Desktop_OpenGL + # defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_3) => PyQt_Desktop_OpenGL + # QT_NO_RAWFONT => PyQt_RawFont + # QT_NO_SESSIONMANAGER => PyQt_SessionManager + # + + lib.optionalString (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) '' + rm config-tests/cfgtest_QtCore.cpp + rm config-tests/cfgtest_QtGui.cpp + rm config-tests/cfgtest_QtNetwork.cpp + rm config-tests/cfgtest_QtPrintSupport.cpp ''; enableParallelBuilding = true; @@ -68,16 +104,27 @@ buildPythonPackage rec { export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" ''; + # tons of warnings from subpackages, no point in playing whack-a-mole + env = lib.optionalAttrs (!enableVerbose) { + NIX_CFLAGS_COMPILE = "-w"; + }; + outputs = [ "out" "dev" ]; dontWrapQtApps = true; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = [ pkg-config - qmake + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + libsForQt5.qmake + ] ++ [ setuptools lndir sip + ] ++ (with pkgsBuildTarget.targetPackages.libsForQt5; [ + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + qmake + ] ++ [ qtbase qtsvg qtdeclarative @@ -90,11 +137,13 @@ buildPythonPackage rec { ++ lib.optional withLocation qtlocation ++ lib.optional withSerialPort qtserialport ++ lib.optional withTools qttools - ; + ); buildInputs = with libsForQt5; [ dbus + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ qtbase + ] ++ [ qtsvg qtdeclarative pyqt-builder 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 22f2048ba1..51f0341703 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 @@ -132,6 +132,9 @@ buildPythonPackage rec { ++ lib.optional withLocation "PyQt6.QtPositioning" ; + # fix build with qt 6.6 + env.NIX_CFLAGS_COMPILE = "-fpermissive"; + meta = with lib; { description = "Python bindings for Qt6"; homepage = "https://riverbankcomputing.com/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix index 106a439fbb..f9b9bc308c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/pyqt6-sip.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyqt6-sip"; - version = "13.5.2"; + version = "13.6.0"; src = fetchPypi { pname = "PyQt6_sip"; inherit version; - hash = "sha256-6/YmS2/toBujfTtgpLuHSTvbh75w97KlOEp6zUkC2I0="; + hash = "sha256-JIbhWIBxlD1PZle6CQltyf/9IyKtLDAEHnjqPwN7V3g="; }; # There is no test code and the check phase fails with: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index 2b7b4a1377..9e8a876213 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -10,7 +10,7 @@ , pytestCheckHook , freefont_ttf , makeFontsConf -, fetchpatch +, setuptools }: let @@ -20,21 +20,18 @@ let in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.12.2"; + version = "0.13.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "pyqtgraph"; repo = "pyqtgraph"; - rev = "pyqtgraph-${version}"; - sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d"; + rev = "refs/tags/pyqtgraph-${version}"; + hash = "sha256-kFTNhv8pgIRSJX0ePmp1I0+MGfCaW8b86baIYZ2bZQM="; }; - # TODO: remove when updating to 0.12.3 - patches = [ - (fetchpatch { - url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch"; - sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -53,6 +50,11 @@ buildPythonPackage rec { export FONTCONFIG_FILE=${fontsConf} ''; + pytestFlagsArray = [ + # we only want to run unittests + "tests" + ]; + disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [ # small precision-related differences on other architectures, # upstream doesn't consider it serious. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index 7ad39633b7..9dc076a5e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, pythonPackages, fetchPypi, pkg-config -, qmake, qtbase, qtsvg, qtwebengine +, qmake, qtbase, qtsvg, qtwebengine, qtwebchannel, qtdeclarative , wrapQtAppsHook , darwin +, buildPackages }: let inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder; inherit (darwin) autoSignDarwinBinariesHook; -in buildPythonPackage rec { +in buildPythonPackage (rec { pname = "PyQtWebEngine"; version = "5.15.4"; format = "pyproject"; @@ -29,12 +30,18 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkg-config qmake + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + python.pythonOnBuildForHost.pkgs.sip + ] ++ [ qtbase qtsvg qtwebengine pyqt-builder pythonPackages.setuptools + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + qtdeclarative ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; @@ -44,6 +51,9 @@ in buildPythonPackage rec { qtbase qtsvg qtwebengine + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + qtwebchannel + qtdeclarative ]; propagatedBuildInputs = [ pyqt5 ]; @@ -71,6 +81,13 @@ in buildPythonPackage rec { description = "Python bindings for Qt5"; homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; - platforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms; + hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms; }; -} +} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + # TODO: figure out why the env hooks aren't adding these inclusions automatically + env.NIX_CFLAGS_COMPILE = + lib.concatStringsSep " " [ + "-I${lib.getDev qtbase}/include/QtPrintSupport/" + "-I${lib.getDev qtwebchannel}/include/QtWebChannel/" + ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index 36bc915696..8a70748887 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Python RADIUS Implementation"; homepage = "https://github.com/pyradius/pyrad"; license = licenses.bsd3; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix index 8ed0fef4a6..8f9b96e5d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyradios"; - version = "1.0.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O30ExmvWu4spwDytFVPWGjR8w3XSTaWd2Z0LGQibq9g="; + hash = "sha256-Uqg/owmf2popAhyanAUIdSWpXAGCWkQja4P944BpNhc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix index 494a8e0c0b..4a9fd61f26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, pytest, beaker, pyramid }: buildPythonPackage rec { - pname = "pyramid_beaker"; + pname = "pyramid-beaker"; version = "0.8"; src = fetchPypi { - inherit pname version; + pname = "pyramid_beaker"; + inherit version; sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-chameleon/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pyramid-chameleon/default.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-chameleon/test-renderers-pyramid-import.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/test-renderers-pyramid-import.patch rename to third_party/nixpkgs/pkgs/development/python-modules/pyramid-chameleon/test-renderers-pyramid-import.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-exclog/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pyramid-exclog/default.nix index 61a95bae84..c54ff94ff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-exclog/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "pyramid_exclog"; + pname = "pyramid-exclog"; version = "1.1"; src = fetchPypi { - inherit pname version; + pname = "pyramid_exclog"; + inherit version; hash = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-jinja2/default.nix index d83b28e0a4..801ad81664 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-jinja2/default.nix @@ -5,7 +5,7 @@ , markupsafe , jinja2 , pytestCheckHook -, zope_deprecation +, zope-deprecation , pyramid , pythonOlder }: @@ -27,7 +27,7 @@ buildPythonPackage rec { markupsafe jinja2 pyramid - zope_deprecation + zope-deprecation ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix index be9c76eeb8..d55eee1a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "pyramid_mako"; + pname = "pyramid-mako"; version = "1.1.0"; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix new file mode 100644 index 0000000000..c70e7f0b0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyramid +, unittestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "pyramid-multiauth"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = "pyramid_multiauth"; + rev = "refs/tags/${version}"; + hash = "sha256-+Aa+Vc4qCqDe/W5m/RBpYAyOMJkBv+ZGSqElJlkHqs4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyramid + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/mozilla-services/pyramid_multiauth/releases/tag/${version}"; + description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; + homepage = "https://github.com/mozilla-services/pyramid_multiauth"; + license = licenses.mpl20; + maintainers = with maintainers; []; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index a2b24faf10..0589fd0401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -11,7 +11,7 @@ , translationstring , venusian , webob -, zope_deprecation +, zope-deprecation , zope_interface , pythonOlder }: @@ -37,7 +37,7 @@ buildPythonPackage rec { translationstring venusian webob - zope_deprecation + zope-deprecation zope_interface ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix deleted file mode 100644 index 22e32aa4d1..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyramid -}: - -buildPythonPackage rec { - pname = "pyramid_multiauth"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "6d8785558e1d0bbe0d0da43e296efc0fbe0de5071d1f9b1091e891f0e4ec9682"; - }; - - propagatedBuildInputs = [ pyramid ]; - - meta = with lib; { - description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; - homepage = "https://github.com/mozilla-services/pyramid_multiauth"; - license = licenses.mpl20; - maintainers = with maintainers; []; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix index dd9868d207..24bc9312de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyre-extensions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { inherit pname version; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix index 808b0e5428..1ed1b31b5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyreadstat/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, cython +, cython_3 , fetchFromGitHub , libiconv , pandas @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.2"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,11 +22,11 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-CvovylOTTyXm0ucTwNSFZzkcA0H8H76BSg4vjB2Pe4M="; + hash = "sha256-+wa8HxQyEwdGF2LWJXTZ/gOFpC8P9+k5p4Lj3ePP2n8="; }; nativeBuildInputs = [ - cython + cython_3 ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix index 754baf91ad..d60b216405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix @@ -2,17 +2,18 @@ , buildPythonPackage , fetchFromGitHub , contexttimer +, setuptools , versioneer , cython , numpy -, pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,12 +21,18 @@ buildPythonPackage rec { owner = "devitocodes"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JLDn3WEBcdO8YYzt/MWOHB/1kcmbmZUsiH00/4Uwlxo="; + hash = "sha256-z1G8DXG06Capd87x02zqrtYyBrX4xmJP94t4bgaR2PE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace ', "flake8"' "" + ''; + nativeBuildInputs = [ - versioneer cython + setuptools + versioneer ]; propagatedBuildInputs = [ @@ -33,12 +40,12 @@ buildPythonPackage rec { numpy ]; - nativeCheckInputs = [ pytest ]; - # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error - # ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve' - # (most likely due to a circular import) - checkPhase = '' - pytest + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf pyrevolve ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix index 93ea78d692..eacf7436cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "pyro5"; - version = "5.14"; + version = "5.15"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Pyro5"; inherit version; - hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; + hash = "sha256-gsPfyYYLSfiXso/yT+ZxbIQWcsYAr4/kDQ46f6yaP14="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index 106fa03a08..6e7a1ec29c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchpatch, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, setuptools +, pkg-config +, swig +, pcsclite +, PCSC +, pytestCheckHook +}: let # Package does not support configuring the pcsc library. @@ -6,39 +16,47 @@ let in buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.7"; pname = "pyscard"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "pyscard"; + rev = "refs/tags/${version}"; + hash = "sha256-nkDI1OPQ4SsNhWkg53ZTsG7j0+mvpkJI7dsyaOl1a/8="; }; - patches = [ - # present in master - remove after 2.0.2 - (fetchpatch { - name = "darwin-typo-test-fix.patch"; - url = "https://github.com/LudovicRousseau/pyscard/commit/ce842fcc76fd61b8b6948d0b07306d82ad1ec12a.patch"; - sha256 = "0wsaj87wp9d2vnfzwncfxp2w95m0zhr7zpkmg5jccn06z52ihis3"; - }) + nativeBuildInputs = [ + setuptools + swig + ] ++ lib.optionals (!withApplePCSC) [ + pkg-config ]; - postPatch = if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = + if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + + preCheck = '' + # remove src module, so tests use the installed module instead + rm -r smartcard ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) - "-I ${lib.getDev pcsclite}/include/PCSC"; - - propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - nativeBuildInputs = [ swig ]; - meta = with lib; { homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix index 29f795560d..784978b7ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix @@ -10,19 +10,18 @@ , h5py , numpy , scipy -, nose -, nose-exclude +, pytestCheckHook }: buildPythonPackage rec { pname = "pyscf"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "v${version}"; - hash = "sha256-x693NB0oc9X7SuDZlV3VKOmgnIgKA39O9yswDM0outk="; + hash = "sha256-+dZsXiLqqyRWr1eOEVSHZ1KMM760hrDaT07ylZUcGmo="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. @@ -47,8 +46,7 @@ buildPythonPackage rec { scipy ]; - nativeCheckInputs = [ nose nose-exclude ]; - + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyscf" ]; preCheck = '' # Set config used by tests to ensure reproducibility @@ -57,53 +55,43 @@ buildPythonPackage rec { ulimit -s 20000 export PYSCF_CONFIG_FILE=$(pwd)/pyscf/pyscf_config.py ''; - # As defined for the PySCF CI at https://github.com/pyscf/pyscf/blob/master/.github/workflows/run_tests.sh - # minus some additionally numerically instable tests, that are sensitive to BLAS, FFTW, etc. - checkPhase = '' - runHook preCheck - nosetests pyscf/ -v \ - --exclude-dir=examples --exclude-dir=pyscf/pbc/grad \ - --exclude-dir=pyscf/x2c \ - --exclude-dir=pyscf/adc \ - --exclude-dir=pyscf/pbc/tdscf \ - -e test_bz \ - -e h2o_vdz \ - -e test_mc2step_4o4e \ - -e test_ks_noimport \ - -e test_jk_hermi0 \ - -e test_j_kpts \ - -e test_k_kpts \ - -e test_lda \ - -e high_cost \ - -e skip \ - -e call_in_background \ - -e libxc_cam_beta_bug \ - -e test_finite_diff_rks_eph \ - -e test_finite_diff_uks_eph \ - -e test_finite_diff_roks_grad \ - -e test_finite_diff_df_roks_grad \ - -e test_frac_particles \ - -e test_nosymm_sa4_newton \ - -e test_pipek \ - -e test_n3_cis_ewald \ - -e test_veff \ - -I test_kuccsd_supercell_vs_kpts\.py \ - -I test_kccsd_ghf\.py \ - -I test_h_.*\.py \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_krhf_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_ks.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_ks.DiamondTestSupercell3 \ - -I .*_slow.*py -I .*_kproxy_.*py -I test_proxy.py tdscf/*_slow.py gw/*_slow.py + # Numerically slightly off tests + disabledTests = [ + "test_tdhf_singlet" + "test_ab_hf" + "test_ea" + "test_bz" + "h2o_vdz" + "test_mc2step_4o4e" + "test_ks_noimport" + "test_jk_hermi0" + "test_j_kpts" + "test_k_kpts" + "test_lda" + "high_cost" + "skip" + "call_in_background" + "libxc_cam_beta_bug" + "test_finite_diff_rks_eph" + "test_finite_diff_uks_eph" + "test_finite_diff_roks_grad" + "test_finite_diff_df_roks_grad" + "test_frac_particles" + "test_nosymm_sa4_newton" + "test_pipek" + "test_n3_cis_ewald" + "test_veff" + "test_collinear_kgks_gga" + ]; - runHook postCheck - ''; + pytestFlagsArray = [ + "--ignore=pyscf/pbc/tdscf" + "--ignore=pyscf/pbc/gw" + "--ignore-glob=*_slow.*py" + "--ignore-glob=*_kproxy_.*py" + "--ignore-glob=test_proxy.py" + ]; meta = with lib; { description = "Python-based simulations of chemistry framework"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index 886747e316..8cedcfb434 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.9.1"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-HFgQXMUmjWW5syBwtCunQ/TeulPwtF48Nesy9iZ3hlU="; + hash = "sha256-18kVXGpklfvCGOy2jBOG9BAAzE0ZVQ3LONjiwo9YnjU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix index 603800f9a1..43d19bbc38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.35"; + version = "1.0.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E3XUQ7Ltu9zhjWVvl1LN+UUz8B2dAjLa0CZI9ca35nc="; + hash = "sha256-lsHKwFzfkGWuUiZGkt9zwjNDDU7i6gcqcEsi5SQqsSQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix index ffc7486cf2..4e48f1c49d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysequoia/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pkg-config , rustPlatform , cargo @@ -11,24 +11,23 @@ , pcsclite , stdenv , darwin +, libiconv }: buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.14"; + version = "0.1.20"; format = "pyproject"; - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "pysequoia"; - rev = "v${version}"; - hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0="; + src = fetchPypi { + inherit pname version; + hash = "sha256-KavsLp17e4ckX11B0pefiQ1Hma/O9x0VY/uVPiJm4Fs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE="; + hash = "sha256-7Lw6gR6o2HJ/zyG4b0wz4nmU2AIIAhyK9zaQ6w+/RgE="; }; nativeBuildInputs = [ @@ -48,14 +47,18 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + libiconv ]; pythonImportsCheck = [ "pysequoia" ]; meta = with lib; { description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library"; + downloadPage = "https://codeberg.org/wiktor/pysequoia"; homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # Broken since the 0.1.20 update according to ofborg. The errors are not clear... + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 151efb6589..1d4cf2ce60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -10,18 +10,13 @@ , qt5 , shiboken2 }: - -# Only build when Python<=3.10 -# See https://bugreports.qt.io/browse/PYSIDE-1864 -# "There are no plans to support Python versions > 3.10 in the 5.15 branch." -disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.10"; + version = "5.15.11"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "sha256-KvaR02E6Qfg6YEObRlaPwsaW2/rkL3zXsHFS0RXq0zo="; + sha256 = "sha256-2lZ807eFTSegtK/j6J3osvmLem1XOTvlbx/BP3cPryk="; }; patches = [ @@ -70,7 +65,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside2 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside2 cp -r PySide2.egg-info $out/${python.sitePackages}/ ''; @@ -80,4 +75,4 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix index e035167425..17e98a8508 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside6/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside6 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6 cp -r PySide6.egg-info $out/${python.sitePackages}/ ''; 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 4461c02c8c..e6b5578873 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.7"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-qvWrMucaSx7LltWYru30qVPDTVHtuqf8tKGFL+Fl8fU="; + hash = "sha256-OZaUKEEvgEIukEcAHB9ci/XWCU+h1CvQTU3gwWBOBkY="; }; postPatch = '' 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 a4309ea0fe..57d2794b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.5"; + version = "0.10.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-iiE6XHj5632sBlivUHz7HiNRjNpEh+OMqcJ65o2km6I="; + hash = "sha256-CmIhNZraDawiiKg6WuHUVRMwXSVEizg1KEv7o2ZP1Hc="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix index 023b6dde3e..0e033ad99f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests , future }: buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.18"; + version = "0.3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bbernhard"; repo = "pysignalclirestapi"; rev = version; - hash = "sha256-BF4BmnQVfrj7f0N+TN/d7GNuDTbDQfwsCkUn2pVmMWo="; + hash = "sha256-CAZ6UgGz7ZDXlQlngi+hEhczOphvAT/Yl9vLqnrS1Qc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests future diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index 52649fed67..c960cfedfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -1,6 +1,7 @@ { lib , pythonOlder , fetchFromGitHub +, fetchpatch , buildPythonPackage , cython , slurm @@ -20,9 +21,15 @@ buildPythonPackage rec { hash = "sha256-M8seh5pkw2OTiDU4O96D0Lg3+FrlB2w4ehy53kSxyoU="; }; + patches = [ (fetchpatch { + name = "remove-undeclared-KILL_JOB_ARRAY"; + url = "https://github.com/PySlurm/pyslurm/commit/f7a7d8beb8ceb4e4c1b248bab2ebb995dcae77e2.patch"; + hash = "sha256-kQLGiGzAhqP8Z6pObz9vdTRdITd12w7KuUDXsfyLIU8="; + })]; + buildInputs = [ cython slurm ]; - setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + setupPyBuildFlags = [ "--slurm-lib=${lib.getLib slurm}/lib" "--slurm-inc=${lib.getDev slurm}/include" ]; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix index fc21919a63..3edc3b57cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.2.5"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "truenas"; repo = "py-SMART"; - rev = "v${version}"; - hash = "sha256-NqE7Twl1kxXrASyxw35xIOTB+LThU0a45NCxh8SUxfI="; + rev = "refs/tags/v${version}"; + hash = "sha256-1k+5XnIT/AfZmzKUxkyU/uc0eW05CvugpY6OdJCoALc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix new file mode 100644 index 0000000000..b5c052bdfa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysmartdl"; + version = "1.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "iTaybb"; + repo = "pySmartDL"; + rev = "refs/tags/v${version}"; + hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # touch the network + "test_basic_auth" + "test_custom_headers" + "test_download" + "test_hash" + "test_mirrors" + "test_pause_unpause" + "test_speed_limiting" + "test_stop" + "test_timeout" + "test_unicode" + ]; + + pythonImportsCheck = [ + "pySmartDL" + ]; + + meta = with lib; { + homepage = "https://github.com/iTaybb/pySmartDL"; + description = "A Smart Download Manager for Python"; + changelog = "https://github.com/iTaybb/pySmartDL/blob/${src.rev}/ChangeLog.txt"; + license = licenses.unlicense; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix index c6ff75aa90..67dae25bdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.0"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mtdcr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-m1dh607hFqcd4CXWiMfGDmI5s8A0UkdyPzq/V+5OUto="; + hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix index dd8d6ea4fc..4ff2513685 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AustinBrunkhorst"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix index 6309cfc034..f4121a53e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix @@ -7,13 +7,13 @@ , pyyaml , requests , responses -, setuptools-scm +, poetry-core }: buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.14"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,13 +21,11 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g="; + hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools-scm + poetry-core ]; propagatedBuildInputs = [ @@ -41,11 +39,6 @@ buildPythonPackage rec { responses ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - pythonImportsCheck = [ "pysolcast" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix index 4aa6718c82..b735601681 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cs1mq4z2GnWFTlp1P3W+o17gdcOpb53k4qZtAux/xlI="; + hash = "sha256-1Bqbdr0qyjcKYQDQdcAp4iukTFlAknh36UNaOpxWZVg="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix index c553b6242b..9107961653 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.8.0"; + version = "0.9.2"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3nFxUu2P8dGt80HRGYOliGHXLrtc83C96kJW27CgXV0="; + hash = "sha256-A0vVpEI8TKelZ96dIqSc01SX1gU3pDUVSOV6jap2WtU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix index 4051dc789d..36d86db144 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysptk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.2.0"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZchBqagUn26vGmUc3+5S57mnQQ2/4vqOz00DUUF1+U="; + hash = "sha256-QUgBA/bchWTaJ54u/ubcRfoVcDeV77wSnHOjkgfVauE="; }; PYSPTK_BUILD_VERSION = 0; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index ed282f06b2..ff4c6f6692 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -4,16 +4,18 @@ , python , fetchPypi , systemd +, lxml +, psutil , pytest , mock , pkg-config }: buildPythonPackage rec { pname = "pystemd"; - version = "0.10.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; + hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; disabled = python.pythonOlder "3.4"; @@ -22,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ pytest mock ]; + nativeCheckInputs = [ lxml mock psutil pytest ]; checkPhase = "pytest tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index cf6a79853c..a6d073dbd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -5,15 +5,17 @@ , xlib , six , xvfb-run -, sphinx +, setuptools , gobject-introspection , pygobject3 , gtk3 -, libayatana-appindicator }: +, libayatana-appindicator +}: buildPythonPackage rec { pname = "pystray"; version = "0.19.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "moses-palmer"; @@ -22,9 +24,28 @@ buildPythonPackage rec { hash = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs="; }; - nativeBuildInputs = [ gobject-introspection sphinx ]; - propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; - nativeCheckInputs = [ xvfb-run ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'sphinx >=1.3.1'" "" + ''; + + nativeBuildInputs = [ + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + pillow + xlib + six + pygobject3 + gtk3 + libayatana-appindicator + ]; + + nativeCheckInputs = [ + xvfb-run + ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysuez/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysuez/default.nix new file mode 100644 index 0000000000..34f6de5192 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysuez/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysuez"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ooii"; + repo = "pySuez"; + rev = "refs/tags/v${version}"; + hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pysuez" + ]; + + meta = with lib; { + description = "Module to get water consumption data from Suez"; + homepage = "https://github.com/ooii/pySuez"; + changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix index 33daf6af75..92d76cb06d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { preConfigure = '' cd Source - ${python.pythonForBuild.interpreter} setup.py backport - ${python.pythonForBuild.interpreter} setup.py configure \ + ${python.pythonOnBuildForHost.interpreter} setup.py backport + ${python.pythonOnBuildForHost.interpreter} setup.py configure \ --apr-inc-dir=${apr.dev}/include \ --apu-inc-dir=${aprutil.dev}/include \ --pycxx-dir=${pycxx.dev}/include \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index de8736efed..5a99cbb62e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.40.1"; + version = "0.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-qKNsXN9nc3YS1gRNPPQUBgXDs01/rhdtRz707cfaYx8="; + hash = "sha256-n4hTS3LnS8AOr1VNSqcVYul/qiTiLvI2bsOJJLbKA3E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix index 67ba86f6ad..8b37c75e9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pytablewriter"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bxqSZUEG3upWoXt1mo8GI9yd8FHAm111mOGSCCMRVYI="; + hash = "sha256-b3YzDqNATaT/FFG4/x9EGlYlhXKPvgNB2xnm0bzvLJQ="; }; nativeBuildInputs = [ @@ -117,6 +117,7 @@ buildPythonPackage rec { disabledTestPaths = [ "test/writer/binary/test_excel_writer.py" "test/writer/binary/test_sqlite_writer.py" + "test/writer/test_elasticsearch_writer.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index f27757b478..6cbde872a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.2.14"; + version = "3.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V/D+eE6y1kCMZmp9rIcvS/wdcSyW3mYWEJqpCb74NtY="; + hash = "sha256-kY1tPkzmUN5eb6YeUp/WSVmDloVSJbM5TXEFyfoXc/g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index 847fcd4355..8fe421cd93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -14,13 +14,14 @@ , responses , restfly , semver +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "pytenable"; version = "1.4.13"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ defusedxml marshmallow @@ -50,12 +55,20 @@ buildPythonPackage rec { responses ]; + disabledTestPaths = [ + # Disable tests that requires network access + "tests/io/" + ]; + disabledTests = [ # Disable tests that requires a Docker container "test_uploads_docker_push_name_typeerror" "test_uploads_docker_push_tag_typeerror" "test_uploads_docker_push_cs_name_typeerror" "test_uploads_docker_push_cs_tag_typeerror" + # Test requires network access + "test_assets_list_vcr" + "test_events_list_vcr" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix index b3472f306e..06d0dffb24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.17.1"; + version = "2.17.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-xXS0uNR5rlmUjt9/TW/X/pQc5MS/MwHSQGCp7BkAVYg="; + hash = "sha256-FufPCFzSjG8BrHes7t3XsdovX9gqUBG0gMDGKvkRkSA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index 1d77af8880..77dd73e301 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.12"; + version = "0.3.13"; format = "pyproject"; src = fetchFromGitHub { owner = "madmaze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-19eLgcvmEFGiyu6v/EzLG8w+jFQL/5rbfDaiQqAGq5g="; + hash = "sha256-gQMeck6ojlIwyiOCBBhzHHrjQfBMelVksVGd+fyxWZk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4a70b0d980..9cd6ec0491 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , setuptools-scm +, wheel , aiohttp , pytest , pytest-asyncio @@ -10,22 +12,26 @@ buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "1.0.4"; + version = "1.0.5"; - format = "setuptools"; + format = "pyproject"; __darwinAllowLocalNetworking = true; - src = fetchPypi { - inherit pname version; - sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4"; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "pytest-aiohttp"; + rev = "refs/tags/v${version}"; + hash = "sha256-UACf0frMTOAgSsXQ0oqROHKR1zn4OfLPhd9MwBK002Y="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; buildInputs = [ pytest @@ -40,15 +46,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # pytest 7.2.0 incompatibilities - # https://github.com/aio-libs/pytest-aiohttp/issues/50 - "tests/test_fixtures.py" - ]; - meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; - changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/${src.rev}/CHANGES.rst"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 0b941d9be6..3b1def125e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub +{ lib +, stdenv , ansible-core +, buildPythonPackage , coreutils -, coverage +, fetchFromGitHub , pytest , pytestCheckHook , pythonOlder @@ -15,16 +14,16 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "3.2.1"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ansible"; - repo = pname; + repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-fSerRbd7QeEdTfyy2lVLq7FKHWWT0MlutonunHhM5M4="; + hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ="; }; postPatch = '' @@ -49,7 +48,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - coverage pytestCheckHook ]; @@ -74,7 +72,10 @@ buildPythonPackage rec { "test_param_override_with_marker" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = [ + # Test want s to execute pytest in a subprocess + "tests/integration/test_molecule.py" + ] ++ lib.optionals stdenv.isDarwin [ # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" @@ -85,7 +86,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; + description = "Plugin for pytest to simplify calling ansible modules from tests or fixtures"; homepage = "https://github.com/jlaska/pytest-ansible"; changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix index 4110a0191f..a6aa15890b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { "tests" ]; + disabledTests = [ + # should be xfail? or mocking doesn't work + "test_url_fails" + ]; + pythonImportsCheck = [ "pytest_base_url" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix index 135b0c2295..f9011b6d72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -2,6 +2,7 @@ , aspectlib , buildPythonPackage , elasticsearch +, elastic-transport , fetchFromGitHub , fetchpatch , freezegun @@ -11,6 +12,7 @@ , pygal , pytest , pytestCheckHook +, pytest-xdist , pythonOlder , isPy311 }: @@ -45,19 +47,24 @@ buildPythonPackage rec { py-cpuinfo ]; + passthru.optional-dependencies = { + aspect = [ aspectlib ]; + histogram = [ pygal ]; + elasticsearch = [ elasticsearch ]; + }; + pythonImportsCheck = [ "pytest_benchmark" ]; nativeCheckInputs = [ - aspectlib - elasticsearch + elastic-transport freezegun git mercurial - pygal pytestCheckHook - ]; + pytest-xdist + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index 1f11f31e21..7b7189e786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.1.4"; + version = "2.2.2"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; + pname = "pytest_check"; + inherit version; + hash = "sha256-eufpnpDxJ9PQLSnAKostlbWofbPTDczRaen9ZsRP2+g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix index 1cf1db5fe1..5170a7a902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; + hash = "sha256-WoJu2EzAr6IC655EOB19di973ajgwj+feafx9Ez0qJU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix index bca05a0010..90b7e6f55e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,30 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "gabrielcnr"; repo = "pytest-datadir"; - rev = "refs/tags/${version}"; - hash = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; + rev = "refs/tags/v${version}"; + hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { description = "Pytest plugin for manipulating test data directories and files"; homepage = "https://github.com/gabrielcnr/pytest-datadir"; + changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index b3f445cad4..d4f5a3c5c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, numpy , packaging , pytest , pytestCheckHook @@ -11,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.12.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-epeeS+mdkRbgesBmxfANRfOHZ319d5877zDG/6jHkYE="; + hash = "sha256-9lBEDcrt4T7W19pzv7SsWF1AqAREujVC0+buzbJ11J8="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix index 1d03413290..92ed531c6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "0.8.2"; + version = "1.0.1"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-uu2bO2uud711uSOODtHuaQOkKAaunWrv+4dUzVWE1P8="; + hash = "sha256-YD/iFujgOl0TSYnLQTF8Waq+8BPSJQxxuGSrB5j75vY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix index 212938df20..3ac626a3f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-examples/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { "pytest_examples" ]; + disabledTests = [ + # Test fails with latest ruff v0.1.2 + # See https://github.com/pydantic/pytest-examples/issues/26 + "test_ruff_error" + ]; + meta = with lib; { description = "Pytest plugin for testing examples in docstrings and markdown files"; homepage = "https://github.com/pydantic/pytest-examples"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix index efde539cb2..349ccf311d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -10,7 +10,7 @@ # propagated , inflection -, factory_boy +, factory-boy , typing-extensions # tests @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - factory_boy + factory-boy inflection typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix index f972070f53..428e0c5c3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rv3mUvd3d78C3JEgWuxM4gzfKsu71mqRirkfXBRpPT0="; + hash = "sha256-WL4cl7Ibo8TUfgp2ketBAHdIUGw2v1EAT3jfEGkfqV4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix index f5b20cb1b5..3375a7a0a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -1,19 +1,65 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytest-metadata, setuptools-scm }: - -buildPythonPackage rec { +{ lib +, buildNpmPackage +, buildPythonPackage +, fetchPypi +, pythonOlder +, hatch-vcs +, hatchling +, jinja2 +, pytest +, pytest-metadata +}: +let pname = "pytest-html"; - version = "3.2.0"; - disabled = pythonOlder "3.6"; + version = "4.0.2"; src = fetchPypi { - inherit pname version; - hash = "sha256-xOL0uwv/xDf1GtIXSoo+cd+Bu8L2iUYE5gSvGPvmh8M="; + pname = "pytest_html"; + inherit version; + hash = "sha256-iGgrno5ROSRyVGpwohObJ9a8GDSkr9PkHaM8nZ+R5KQ="; }; - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytest-metadata ]; + web-assets = buildNpmPackage { + pname = "${pname}-web-assets"; + inherit version src; + + npmDepsHash = "sha256-aRod+SzVSb4bqEJzthfl/mH+DpbIe+j2+dNtrrhO2xU="; + + installPhase = '' + runHook preInstall + + install -Dm644 src/pytest_html/resources/{app.js,style.css} -t $out/lib + + runHook postInstall + ''; + }; +in + +buildPythonPackage { + inherit pname version src; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + buildInputs = [ pytest web-assets ]; + propagatedBuildInputs = [ jinja2 pytest-metadata ]; + + env.HATCH_BUILD_NO_HOOKS = true; + + preBuild = '' + install -Dm644 ${web-assets}/lib/{app.js,style.css} -t src/pytest_html/resources + ''; + + # tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pytest_html" + ]; meta = with lib; { description = "Plugin for generating HTML reports"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix index edfc988cc6..db94f2b6e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kevin1024"; repo = "pytest-httpbin"; - rev = "v${version}"; - hash = "sha256-S4ThQx4H3UlKhunJo35esPClZiEn7gX/Qwo4kE1QMTI="; + rev = "refs/tags/v${version}"; + hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; }; buildInputs = [ @@ -32,17 +32,16 @@ buildPythonPackage rec { six ]; - preCheck = '' - # Remove assertion that doesn't hold for Flask 2.1.0 - substituteInPlace tests/test_server.py \ - --replace "assert response.headers['Location'].startswith('https://')" "" - ''; - nativeCheckInputs = [ pytestCheckHook requests ]; + disabledTests = [ + # incompatible with flask 2.3 + "test_redirect_location_is_https_for_secure_server" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index da22eea8d7..dbcfafc0a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.22.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-J5Y5G3/8d9hAtDFqweqA73amnXUpPbmb0uTrCslpl9k="; + hash = "sha256-8cuXsHyS9OaYXzKXgwan+mBFocyr39B9G8wr8I1pmg4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix index 335f2de30a..f3b556699e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix @@ -6,22 +6,27 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-json-report"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "numirias"; - repo = pname; - rev = "v${version}"; + repo = "pytest-json-report"; + rev = "refs/tags/v${version}"; hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; @@ -38,6 +43,7 @@ buildPythonPackage rec { disabledTests = [ # pytest-flaky is not available at the moment "test_bug_31" + "test_environment_via_metadata_plugin" ]; pythonImportsCheck = [ @@ -47,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to report test results as JSON"; homepage = "https://github.com/numirias/pytest-json-report"; + changelog = "https://github.com/numirias/pytest-json-report/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix index f9e49cf091..6f5f6484a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.6.2"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-kY4QHrlj0opEBywe4SpwE4Ck6l6JIzEosx6uuXh+yCQ="; + hash = "sha256-ZocpIBHnXTvQdjWU8yVhGK49I+FFct+teDhghiMnvW0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix index 23ac11d84a..4ab9c74be3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-53tGVVy0OJMdIZxUvPn1lTwEB9ZFQ2pgK1cwur/T/js="; + hash = "sha256-XZDOfQhddB51n6hU29LnxbVXMh1pUXmJTrQOIQ6i/zA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix index be52de50f4..0b0f892c7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; + hash = "sha256-8qLcbMhD+mTLH5veweAg56G067H4AnDQIjywINwJaCE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 4c041ce40c..f4c809218f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, chevron , decorator , fetchFromGitHub +, jinja2 +, jsonschema , mypy +, packaging , pytest , pytestCheckHook , pythonOlder , pyyaml , regex +, tomlkit }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.11.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +25,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UlNjqloAl0Qmy3EQ73e+KmsHeJN3eBkkBJxCehpOs48="; + hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0="; }; buildInputs = [ @@ -30,11 +33,18 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - chevron - pyyaml - mypy decorator + jinja2 + jsonschema + mypy + packaging + pyyaml regex + tomlkit + ]; + + pythonImportsCheck = [ + "pytest_mypy_plugins" ]; nativeCheckInputs = [ @@ -46,16 +56,8 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "pytest_mypy_plugins" - ]; - - disabledTests = [ - # ...TypecheckAssertionError: Invalid output: - "with_out" - "add_mypypath_env_var_to_package_searc" - "error_case" - "skip_if_false" + disabledTestPaths = [ + "pytest_mypy_plugins/tests/test_explicit_configs.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix index 80dea1dbea..55923b5ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix @@ -2,30 +2,38 @@ , buildPythonPackage , fetchFromGitHub , flit-core +, ruamel-yaml , pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-param-files"; - version = "0.3.4"; + version = "0.6.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; + rev = "refs/tags/v${version}"; + hash = "sha256-hgEEfKf9Kmah5WDNHoFWQJKLOs9Z5BDHiebXCdDc1zE="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; buildInputs = [ pytest ]; - pythonImportsCheck = [ "pytest_param_files" ]; + propagatedBuildInputs = [ + ruamel-yaml + ]; + + pythonImportsCheck = [ + "pytest_param_files" + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix index 53766a3134..3e27b075ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-yYFzaIPYOsuvS8bGcuwQQNS/CtvGUe1XQdORmfEJQmU="; + hash = "sha256-5qjfZGDM1OqXXNyj81O49ClKKGiAPdgyZZu6TgpskGs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index 5bb9224ac4..c989948afd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.19.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; + hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix index 7c723e4cdc..5549f89334 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, factory_boy +, factory-boy , faker , fetchFromGitHub , importlib-metadata @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - factory_boy + factory-boy faker numpy pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix index a9e56d3c43..e804a0482d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6riee6SqM5vf4HsxBH6OanCx54RudKi7/DGliNAecwM="; + hash = "sha256-gYx4hMHP87q/ie67AsvCezB4VrGYVCfCTVLLgSoQb9k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix index bd413c4d70..567b5b1368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.7.0"; format = "pyproject"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "adamchainz"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index 4f9b9bd5d6..3c0b0ec629 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.0.12"; + version = "2.1.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hv5sgWSbMk13h+nFTcy4aEMJvTyaLbXFhg6ZOKYEvVQ="; + hash = "sha256-M4636yqzChRI37UdGPOZTjj8POLdrOoJtzmECtZZi4k="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/v${version}"; - license = licenses.agpl3Only; + license = licenses.mit; maintainers = with maintainers; [ dmvianna ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix index bd1ce2a597..b1e46802b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix index 36f31a0288..872e9dc8fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pytest-trio"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-trio"; repo = pname; rev = "v${version}"; - sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4"; + sha256 = "sha256-gUH35Yk/pBD2EdCEt8D0XQKWU8BwmX5xtAW10qRhoYk="; }; buildInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 5fde855e58..a00b59c425 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -3,10 +3,10 @@ , callPackage , pythonOlder , fetchPypi -, isPyPy , writeText # build +, setuptools , setuptools-scm # propagates @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.0"; - format = "pyproject"; + version = "7.4.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-tL+MRb1Zk07YQAGtUeEbTuQNQKEinSx5+cWSsKP2vYo="; + hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; }; outputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index e9224b543b..2949b8b7ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -1,15 +1,24 @@ { lib -, arangodb , buildPythonPackage , fetchFromGitHub , pythonOlder , pytestCheckHook -, pyjwt -, pytest -, mock + +# build-system +, setuptools +, setuptools-scm + +# dependencies +, urllib3 , requests , requests-toolbelt -, setuptools +, pyjwt +, importlib-metadata +, packaging + +# tests +, arangodb +, mock }: let @@ -23,8 +32,8 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.5.7"; - format = "setuptools"; + version = "7.8.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,14 +41,24 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-cd2xE5rYLl3NOv/DZjmHRPCe224k4XyPjo9aXV1ZhvU="; + hash = "sha256-lZ+9l1kPE/Piw1QLYW+qjFQmTtZd4m/kDOTOxkTsla0="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ + importlib-metadata requests requests-toolbelt + packaging pyjwt setuptools + urllib3 ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix index 99cf1c63ca..a1fb349c9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix @@ -4,12 +4,13 @@ , python-dateutil , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-crontab"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil ]; @@ -30,6 +35,8 @@ buildPythonPackage rec { "test_07_non_posix_shell" # doctest that assumes /tmp is writeable, awkward to patch "test_03_usage" + # AssertionError: 4 != 0 + "test_19_frequency_at_month" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix index f350f6df61..acb47fceb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix @@ -20,13 +20,13 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.28.7"; + version = "0.29.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AxRgoXPiFFFHQSj5/jU55hwWzHtutfjmD2IKGxYwd0A="; + hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix new file mode 100644 index 0000000000..464697c35b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-docs-theme/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +, sphinx +}: + +buildPythonPackage rec { + pname = "python-docs-theme"; + version = "2023.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "python"; + repo = "python-docs-theme"; + rev = "refs/tags/${version}"; + hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonImportsCheck = [ + "python_docs_theme" + ]; + + meta = with lib; { + description = "Sphinx theme for CPython project"; + homepage = "https://github.com/python/python-docs-theme"; + changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst"; + license = licenses.psfl; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 8df6ee96e7..d4a2ca1dd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; + hash = "sha256-3Ns5fhIHihnpDYDnxvPP00WIZL/o1UWLzgNott4GKNc="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,11 +31,11 @@ buildPythonPackage rec { ''; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext ''; installPhase = '' - ${python.pythonForBuild.interpreter} setup.py install --prefix=$out --single-version-externally-managed + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; @@ -48,8 +48,5 @@ buildPythonPackage rec { platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; - # The generated files in the tarball aren't compatible with python 3.11 - # See https://sourceforge.net/p/enlightenment/mailman/message/37794291/ - broken = python.pythonAtLeast "3.11"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 9a0269c983..990cbd1be3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , pythonOlder , requests +, simple-websocket , tornado , websocket-client }: buildPythonPackage rec { pname = "python-engineio"; - version = "4.6.1"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +26,21 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-za2JY5Gu9MEqi3W1zxcuwYiJ5XLc43ig6Hdx/4JwDbY="; + hash = "sha256-jHXpPnrQlIpmQ2sY4y6AUx/6W8Pf+683s4NmmlwZO58="; + }; + + propagatedBuildInputs = [ + simple-websocket + ]; + + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix index 45c94cdb83..9a1416e0db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ cython ]; preBuild = '' - ${python.pythonForBuild.interpreter} setup.py build_ext -i + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext -i ''; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix index 1019b058e1..4670d58420 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "eyeseast"; repo = pname; - rev = "v${version}"; - sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lkBCKZ1fZF580+4TnHYkfaGJjsWk7/Ksnk7VagZuef8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix index fedf919c7e..a7e27ac64a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac="; + hash = "sha256-8d/cjD7dcA4/bKZtQUjgUPVgfZdjl+ibOFRpC9dyybA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index d6f7e29b9d..98cc6109ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.5.1"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jdfrmFpWOuQgYwV2NrRyRDwAZThWdBFgfLByVIZ5HhQ="; + hash = "sha256-7HneedqHbNB9ZYFUCCQ/puLtA1QlIkTKqji0py9hwBE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index bffdc7dd27..e7c0a2a263 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "2.1.0"; + version = "2.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RuUNH95Txs6JeObYqg2CQl7qxF4YLVQvBDfzj5L9Bk="; + hash = "sha256-iyDRhTV5GSBTVK7ccJhUOrCpE9YuiI1vJM4XroCyIwE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index af0671279a..e4ff8f1e7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -7,7 +7,7 @@ , pyyaml , setuptools , six -, multi_key_dict +, multi-key-dict , testscenarios , requests , requests-mock @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - hash = "sha256-/18dklOdkD+GmwLq8rExREfm1tePdn7c/dkpZ9UyucY="; + hash = "sha256-VufauwYHvbjh1vxtLUMBq+2+2RZdorIG+svTBxy27ss="; }; # test uses timeout mechanism unsafe for use with the "spawn" @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + propagatedBuildInputs = [ pbr pyyaml setuptools six multi-key-dict requests ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 68150935da..6e3f406fe5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -1,18 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , ecdsa , rsa -, pycrypto , pyasn1 -, pycryptodome + +# optional-dependencies , cryptography +, pycrypto +, pycryptodome + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "mpdavis"; @@ -21,27 +31,43 @@ buildPythonPackage rec { hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; - propagatedBuildInputs = [ - cryptography - ecdsa - pyasn1 - pycrypto - pycryptodome - rsa - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner",' "" ''; - pythonImportsCheck = [ "jose" ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ecdsa + pyasn1 + rsa + ]; + + passthru.optional-dependencies = { + cryptography = [ + cryptography + ]; + pycrypto = [ + pycrypto + ]; + pycryptodome = [ + pycryptodome + ]; + }; + + pythonImportsCheck = [ + "jose" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { + changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}"; homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index 78f97117f8..dd2b641737 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7GJnkT7FOYzytQyOCP8zU5hUk4SbeC7gc1qkhl5eXGo="; + hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix index 88610f1930..eae9047c9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - sha256 = "sha256-yvG4Qn9aym0rTDALURxHrWtDhO7g2VYsI+zLgb8z+gE="; + sha256 = "sha256-vf3ZNZyen1W29qk4ST1sus5VTcys9F3067NlUr406bg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 66293eaa30..7631547329 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.8.1"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8wFLZuGWt3qIRUkprxzFgxh+rtmIyMBjeCnzCNTbXzA="; + hash = "sha256-9za0et/W+AwrjqUVoHwk8oqLXk4eqgRON8Z4F5GSKXM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix index 38a31fbb6c..e3f1b0922a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, lzo, nose }: +{ lib, fetchPypi, buildPythonPackage, lzo, pytestCheckHook, setuptools, wheel }: buildPythonPackage rec { pname = "python-lzo"; - version = "1.14"; + version = "1.15"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c"; + hash = "sha256-pXqqAMXDoFFd2fdCa6LPYBdn3BncAj2LmdShOwoye0k="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ lzo ]; - propagatedBuildInputs = [ ]; - nativeCheckInputs = [ nose ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "lzo" + ]; meta = with lib; { homepage = "https://github.com/jd-boyd/python-lzo"; description = "Python bindings for the LZO data compression library"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.jbedo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index ccb013d14e..904cd312d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.7.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,18 +37,9 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; + hash = "sha256-zCw5sj+UgY0egjXGzcbOb7VATeLY80+8Mv9owmdA+f0="; }; - patches = [ - # https://github.com/home-assistant-libs/python-matter-server/pull/379 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix index 9078f41aea..3c04398e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , pytestCheckHook , mock , pyyaml @@ -9,14 +10,19 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.5"; - format = "setuptools"; + version = "0.0.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"; + pname = "python_multipart"; + inherit version; + hash = "sha256-6ZJagLtmhSnxtnx/2wpdrN18v8b7C/8+pEP+Ir3WITI="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-myq/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/python-myq/default.nix index 192959065e..88248abde3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-myq/default.nix @@ -9,8 +9,8 @@ }: buildPythonPackage rec { - pname = "pymyq"; - version = "3.1.11"; + pname = "python-myq"; + version = "3.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,9 +19,14 @@ buildPythonPackage rec { owner = "Python-MyQ"; repo = "Python-MyQ"; rev = "refs/tags/v${version}"; - hash = "sha256-hQnIrmt4CNxIL2+VenGaKL6xMOb/6IMq9NEFLvbbYsE="; + hash = "sha256-kW03swRXZdkh45I/up/FIxv0WGBRqTlDt1X71Ow/hrg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry-core==1.6.1" "poetry-core" + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix index a96501dbbf..6c47e8189a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "named-data"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix index bc3c13478e..cd45cbe7d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-oauth2/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-on-whales/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-on-whales/default.nix new file mode 100644 index 0000000000..9de9819e88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-on-whales/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pydantic +, requests +, tqdm +, typer +}: + +buildPythonPackage rec { + pname = "python-on-whales"; + version = "0.66.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "gabrieldemarmiesse"; + repo = "python-on-whales"; + rev = "refs/tags/v${version}"; + hash = "sha256-Y18NospSDcr9K93xS24vKTnrT8DT1GPRX78clZB040E="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + pydantic + requests + tqdm + typer + ]; + + doCheck = false; # majority of tests require Docker and/or network access + pythonImportsCheck = [ "python_on_whales" ]; + + meta = with lib; { + description = "Docker client for Python, designed to be fun and intuitive"; + homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; + changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix index 40974345dc..0f23163d9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-opensky/default.nix @@ -8,12 +8,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "python-opensky"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-62ncinv6XUGB1dYle/yqSCyJNbGD9BLaOqrF/zjL2fA="; + hash = "sha256-xNXFvCUZ/x5ox3KxmG3eA73wpX4fwhvAVmlfcKiT1V8="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix index 27a5a084fa..500e6beb0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.1"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - hash = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; + hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix index d783efa714..e49dccec82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "python-pptx"; - version = "0.6.22"; + version = "0.6.23"; src = fetchPypi { inherit pname version; - hash = "sha256-OPjukt3jHSS0ViVg5hsDV+XZfs91xDUq5mFtWjKXhlQ="; + hash = "sha256-WHSX/yjneasY27B09tQFKJPIXe3JXtdd8xk2TzMf7e4="; }; # postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index 7fa3607037..3fa39b27fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.34.6"; + version = "0.35.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-c55E5J0PKk9FG3KDIO0R3vGQjYjj8u7zXz8o9oA1Grc="; + hash = "sha256-3XTVHs+mLePudLnr+bAN4pHvHtUcE0D5Hw+50Vxhlzw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index 1d785987cf..8a13ee5e89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.5.6"; + version = "1.5.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_rtmidi"; inherit version; - hash = "sha256-sqCjmbtKXhpWR3eYr9QdAioYtelU9tD/krRbuZvuNxA="; + hash = "sha256-3vsaSyrob/OYwjLFPu2lVOJKSfZ96ELnnOuos8p3N00="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index 59d3058b17..afe1451042 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.33"; + version = "0.0.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU="; + hash = "sha256-cng19NW5Eq3arysl0B3dfK2Hy6lQFBFh7g2hxvxeklU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix index 4cb8273b78..c6b59b0ac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.1.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.6.2"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-QvUuCS8B/6+dgzWrflizLfNlAUeOPpUPtmFaE6LGYGc="; + hash = "sha256-HnZrnsxPmRJzrvJbKS5r+di+msykDwWS7TB5CitIve8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix index 44deb68dc6..3f73bf1e5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.15.2"; + version = "0.16"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rytilahti"; repo = "python-songpal"; rev = "refs/tags/release/${version}"; - hash = "sha256-bAlMOxX4rx4URk+xvlte7l005i3H0VDaH67AWMdhTeY="; + hash = "sha256-wHyq63RG0lhzG33ssWyvzLjc7s1OqquXMN26N2MBHU8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 97e6215f1d..017be9041d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -6,9 +6,9 @@ , requests }: -buildPythonPackage { +buildPythonPackage rec { pname = "python-tado"; - version = "0.16.0"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonPackage { owner = "wmalgadey"; repo = "PyTado"; # https://github.com/wmalgadey/PyTado/issues/62 - rev = "674dbc450170a380e76460c22d6ba943dfedb8e9"; - hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + rev = "refs/tags/${version}"; + hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 9396955184..262f1d22e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.5"; + version = "20.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/AdGpOl87EeVDCAZLjtan7ttE2vUL0gi1qeM18ilYEQ="; + hash = "sha256-t6yHl2uNdGaTLdbQTXp3+zds2pab4T6Pe69mu31HahA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix index a79362a934..50a14d6ccc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram/default.nix @@ -1,42 +1,46 @@ { lib , stdenv -, fetchpatch , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , setuptools , tdlib +, telegram-text +, pytestCheckHook }: buildPythonPackage rec { pname = "python-telegram"; - version = "0.15.0"; + version = "0.18.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA="; + src = fetchFromGitHub { + owner = "alexander-akhmetov"; + repo = "python-telegram"; + rev = version; + hash = "sha256-2Q0nUZ2TMVWznd05+fqYojkRn4xfFZJrlqb1PMuBsAY="; }; - patches = [ - # Search for the system library first, and fallback to the embedded one if the system was not found - (fetchpatch { - url = "https://github.com/alexander-akhmetov/python-telegram/commit/b0af0985910ebb8940cff1b92961387aad683287.patch"; - hash = "sha256-ZqsntaiC2y9l034gXDMeD2BLO/RcsbBII8FomZ65/24="; - }) - ]; - postPatch = '' # Remove bundled libtdjson rm -fr telegram/lib substituteInPlace telegram/tdjson.py \ - --replace "ctypes.util.find_library(\"libtdjson\")" \ + --replace "ctypes.util.find_library(\"tdjson\")" \ "\"${tdlib}/lib/libtdjson${stdenv.hostPlatform.extensions.sharedLibrary}\"" ''; propagatedBuildInputs = [ setuptools + telegram-text + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "TestGetTdjsonTdlibPath" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix index b069de34c3..29a10ced06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix @@ -5,32 +5,50 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "python-twitch-client"; version = "0.7.1"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tsifrer"; - repo = pname; - rev = version; - sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443"; + repo = "python-twitch-client"; + rev = "refs/tags/${version}"; + sha256 = "sha256-gxBpltwExb9bg3HLkz/MNlP5Q3/x97RHxhbwNqqanIM="; }; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ pytestCheckHook responses ]; - pythonImportsCheck = [ "twitch" ]; + pythonImportsCheck = [ + "twitch" + ]; + + disabledTests = [ + # Tests require network access + "test_delete_from_community" + "test_update" + ]; meta = with lib; { description = "Python wrapper for the Twitch API"; homepage = "https://github.com/tsifrer/python-twitch-client"; + changelog = "https://github.com/tsifrer/python-twitch-client/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix index efb1288943..8a187257ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-uinput/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi -, udev }: +{ lib +, buildPythonPackage +, fetchPypi +, udev +}: buildPythonPackage rec { pname = "python-uinput"; @@ -14,6 +17,8 @@ buildPythonPackage rec { NIX_CFLAGS_LINK = "-ludev"; + doCheck = false; # no tests + meta = with lib; { description = "Pythonic API to Linux uinput kernel module"; homepage = "https://tjjr.fi/sw/python-uinput/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ulid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ulid/default.nix new file mode 100644 index 0000000000..db1456dc31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ulid/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, freezegun +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-ulid"; + version = "2.2.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "mdomke"; + repo = "python-ulid"; + rev = "refs/tags/${version}"; + hash = "sha256-d5jCPxWUOfw/OCtbA9Db9+s1D5DAdL+vbPR8zavgbbo="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "ulid" ]; + + meta = with lib; { + description = "ULID implementation for Python"; + homepage = "https://github.com/mdomke/python-ulid"; + changelog = "https://github.com/mdomke/python-ulid/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix index 5dca7585de..75d4e24f86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.12"; + version = "2.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X0jg1qd4rWbaRZqgMBJKOZD50sFq3Eyhw9RU6cEjORo="; + hash = "sha256-3eDfXPMO167QI/umLBjlHTBV67XQ8QYkg4EzfrRTw6M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix index f9a0841fdc..d0fb764422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-youtube/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { pname = "python-youtube"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; src = fetchFromGitHub { owner = "sns-sdks"; repo = "python-youtube"; - rev = "v${version}"; - hash = "sha256-PbPdvUv7I9NKW6w4OJbiUoRNVJ1SoXychSXBH/y5nzY="; + rev = "refs/tags/v${version}"; + hash = "sha256-jUs6n8j1coA37V0RTYqr7pqt+LRABieX7gbyWsXQpUM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix index 981f963db3..7a5d8bccaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix @@ -24,14 +24,23 @@ buildPythonPackage rec { }; patches = [ + # skip tests with expired test data + # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 (fetchpatch { name = "test-expired.patch"; url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff"; hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI="; }) - # skip tests with expired test data - # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 - ./skip-broken-tests.patch + (fetchpatch { + name = "test-expired.patch"; + url = "https://github.com/SAML-Toolkits/python3-saml/commit/ea3a6d4ee6ea0c5cfb0f698d8c0ed25638150f47.patch"; + hash = "sha256-Q9+GM+mCEZK0QVp7ulH2hORVig2411OvkC4+o36DeXg="; + }) + (fetchpatch { + name = "test-expired.patch"; + url = "https://github.com/SAML-Toolkits/python3-saml/commit/feb0d1d954ee4d0ad1ad1d7d536bf9e83fa9431b.patch"; + hash = "sha256-NURGI4FUnFlWRZfkioU9IYmZ+Zk9FKfZchjdn7N9abU="; + }) ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch deleted file mode 100644 index ea845e7da3..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py -index fbe714f..bbed3c2 100644 ---- a/tests/src/OneLogin/saml2_tests/response_test.py -+++ b/tests/src/OneLogin/saml2_tests/response_test.py -@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - response_2 = OneLogin_Saml2_Response(settings, xml_2) - self.assertTrue(response_2.check_one_condition()) - -+ @unittest.skip("test data expired") - def testCheckOneAuthnStatement(self): - """ - Tests the check_one_authnstatement method of SamlResponse -@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'): - response_2.is_valid(self.get_request_data(), raise_exceptions=True) - -+ @unittest.skip("test data expired") - def testIsInValidNoStatement(self): - """ - Tests the is_valid method of the OneLogin_Saml2_Response -@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): - with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'): - response.get_attributes() - -+ @unittest.skip("test data expired") - def testIsInValidDestination(self): - """ - Tests the is_valid method of the OneLogin_Saml2_Response class diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix deleted file mode 100644 index 1a1a05733a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: - -buildPythonPackage rec { - pname = "python_docs_theme"; - version = "2023.9"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "python"; - repo = "python-docs-theme"; - rev = "refs/tags/${version}"; - sha256 = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; - }; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ sphinx ]; - - pythonImportsCheck = [ "python_docs_theme" ]; - - meta = with lib; { - homepage = "https://github.com/python/python-docs-theme"; - description = "Sphinx theme for CPython project"; - license = licenses.psfl; - maintainers = with maintainers; [ kaction ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 3ec700149b..5a2272c668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -12,11 +12,11 @@ let pname = "pythonnet"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { pname = "pythonnet"; inherit version; - sha256 = "sha256-LN0cztxkp8m9cRvj0P0MSniTJHQTncVKppe+3edBx0Y="; + hash = "sha256-jUsulxWKAjh1+GR0WKWPOIF/T+Oa9gq91rDYrfHXfnU="; }; # This buildDotnetModule is used only to get nuget sources, the actual @@ -70,6 +70,7 @@ buildPythonPackage { meta = with lib; { description = ".NET integration for Python"; homepage = "https://pythonnet.github.io"; + changelog = "https://github.com/pythonnet/pythonnet/releases/tag/v${version}"; license = licenses.mit; # badPlatforms = [ "aarch64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 12d61c0da5..7b1d221106 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -2,49 +2,38 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub -, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook , pythonOlder +, yarl }: buildPythonPackage rec { pname = "pytile"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "pytile"; rev = "refs/tags/${version}"; - hash = "sha256-wPtGofli3ZKBcAwjwjCbeYnLaSZ5lLshlBSz1/WlAcg="; + hash = "sha256-L1Ovpxn7Y+reK8YcVBPwoRjKxcyByrPGz5i/csGzKfE="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/pytile/pull/286 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/pytile/commit/bdb5d96ba9d640bf85a1ae9c3787704dbc2ced23.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + certifi + yarl ]; nativeCheckInputs = [ @@ -72,6 +61,7 @@ buildPythonPackage rec { Bluetooth trackers (including last location and more). ''; homepage = "https://github.com/bachya/pytile"; + changelog = "https://github.com/bachya/pytile/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix index 8c49cc766d..fb0b5399f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix @@ -1,34 +1,24 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build -, pdm-pep517 - -# docs , docutils -, sphinxHook -, sphinx-rtd-theme -, sphinx-autodoc-typehints - -# runtime -, tomli +, fetchFromGitHub , packaging - -# optionals -, pydantic +, pdm-backend , platformdirs -, sphinx -, tabulate - -# tests +, pydantic , pytestCheckHook +, pythonOlder +, sphinx +, sphinx-autodoc-typehints +, sphinx-rtd-theme +, sphinxHook +, tabulate +, tomli }: buildPythonPackage rec { pname = "pytoolconfig"; - version = "1.2.5"; + version = "1.2.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +27,7 @@ buildPythonPackage rec { owner = "bagel897"; repo = "pytoolconfig"; rev = "refs/tags/v${version}"; - hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; + hash = "sha256-KmmaxFJbvdOGG9T9iiHKnJpFzZiLVkPJki+qHPxPTdY="; }; outputs = [ @@ -48,7 +38,7 @@ buildPythonPackage rec { PDM_PEP517_SCM_VERSION = version; nativeBuildInputs = [ - pdm-pep517 + pdm-backend # docs docutils @@ -90,9 +80,9 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { - changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; description = "Python tool configuration"; homepage = "https://github.com/bagel897/pytoolconfig"; + changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index 9e0a7a2018..15804b2c5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.9"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-2HjdqC7JU28nVAJdaEkwmJOTfWBCqHcM1a1sHIfF3ME="; + hash = "sha256-gpY5pfvgciiQF5kDUui5UbxLlZ6X3mSNBNZWfpYD5Sc="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-msssim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-msssim/default.nix new file mode 100644 index 0000000000..371ae7514a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-msssim/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, torch +}: + +buildPythonPackage rec { + pname = "pytorch-msssim"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VainF"; + repo = "pytorch-msssim"; + rev = "refs/tags/v${version}"; + hash = "sha256-bghglwQhgByC7BqbDvImSvt6edKF55NLYEPjqmmSFH8="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + torch + ]; + + pythonImportsCheck = [ "pytorch_msssim" ]; + + # This test doesn't have (automatic) tests + doCheck = false; + + meta = with lib; { + description = "Fast and differentiable MS-SSIM and SSIM for pytorch"; + homepage = "https://github.com/VainF/pytorch-msssim"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 3bd169bc1a..56473cc95a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -8,17 +8,18 @@ , torch , torchvision , typing-extensions +, pythonAtLeast }: buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.4"; + version = "0.7.2"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; + hash = "sha256-juoLw/qfq4YF7opyR7cTYCVzUa9pXVvQnvGntcQhBr4="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; @@ -41,6 +42,7 @@ buildPythonPackage rec { "tests/pytorch_pfn_extras_tests/onnx_tests/test_export.py" "tests/pytorch_pfn_extras_tests/onnx_tests/test_torchvision.py" "tests/pytorch_pfn_extras_tests/onnx_tests/utils.py" + "tests/pytorch_pfn_extras_tests/onnx_tests/test_lax.py" # RuntimeError: No Op registered for Gradient with domain_version of 9 "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py" @@ -53,13 +55,15 @@ buildPythonPackage rec { "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy.py" "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py" "tests/pytorch_pfn_extras_tests/runtime_tests/test_to.py" - "tests/pytorch_pfn_extras_tests/test_handler.py" - "tests/pytorch_pfn_extras_tests/test_logic.py" + "tests/pytorch_pfn_extras_tests/handler_tests/test_handler.py" "tests/pytorch_pfn_extras_tests/test_reporter.py" "tests/pytorch_pfn_extras_tests/training_tests/test_trainer.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_checkpoint.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_comparer.py" "tests/pytorch_pfn_extras_tests/utils_tests/test_new_comparer.py" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Remove this when https://github.com/NixOS/nixpkgs/pull/259068 is merged + "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix index d8365a034e..20b08ebd44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9s4KbYFhQVf+16GT4hbGkmwxQhtMu60SwrLWHbdJXAY="; + hash = "sha256-3p2tKFuzgl+VFRRXV66MRgcL1XS8xxDqMOUZw+Ql/5E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix new file mode 100644 index 0000000000..ef54cf77b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrydan/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, orjson +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +, rich +, syrupy +, tenacity +, typer +}: + +buildPythonPackage rec { + pname = "pytrydan"; + version = "0.4.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "dgomes"; + repo = "pytrydan"; + rev = "refs/tags/v${version}"; + hash = "sha256-9PyRICtZ+0Ezinu28oFgFOSnOyCmD7zZbdc/chN+sCo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=pytrydan --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + orjson + rich + tenacity + typer + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + syrupy + ]; + + pythonImportsCheck = [ + "pytrydan" + ]; + + meta = with lib; { + description = "Library to interface with V2C EVSE Trydan"; + homepage = "https://github.com/dgomes/pytrydan"; + changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix index ad4f76baf6..8d4bcfbb3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytz"; - version = "2023.3"; + version = "2023.3.post1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-HYzinbGJGR+1UzjubQOH2Cq1nz0A6sEDQS1k4OvQxYg="; + hash = "sha256-e0/dvrlKHrpLVX2iTxn9+dtXUZJUQnCpEB2FCfn0PXs="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix index ddfbca300b..f3209e3bdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; - disabled = pythonAtLeast "3.11"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "saghul"; @@ -24,6 +24,11 @@ buildPythonPackage rec { url = "https://github.com/saghul/pyuv/commit/8bddcc27052017b5b9cb89c24dbfdf06737b0dd3.patch"; hash = "sha256-J/3ky64Ff+gYpN3ksFLNuZ5xgPbBkyOl4LTY6fiHAgk="; }) + (fetchpatch { + name = "fix-build-with-python3.11.patch"; + url = "https://github.com/saghul/pyuv/commit/2a3d42d44c6315ebd73899a35118380d2d5979b5.patch"; + hash = "sha256-CQZexd6EjadCB7KyxeZKM24zrD9rXuNv4oA+Tb2nsdw="; + }) ]; setupPyBuildFlags = [ "--use-system-libuv" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix index 40c2fac515..908d9d37f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { aiohttp ]; + doCheck = pythonOlder "3.11"; # asynctest unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio 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 641ce68f90..59f1c4233a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.71"; - format = "pyproject"; + version = "9.2.77"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-AnSd9+r4+Qz3CyIgA3tOXAYJROOvAR3nI/9fSFeYl24="; + hash = "sha256-kVMhzdTYwra8G/4gg1G853vUr7YHxxt/zXus/SXMkXc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix index 71fe7601ce..70272d54ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , pytestCheckHook , glib @@ -13,6 +14,8 @@ buildPythonPackage rec { pname = "pyvips"; version = "2.2.1"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; @@ -26,6 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' @@ -41,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; + changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ccellado anthonyroussel ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix index c469874453..a9fea2dc68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix @@ -6,31 +6,38 @@ , jinja2 , ipython , jsonpickle +, pytestCheckHook , numpy }: buildPythonPackage rec { pname = "pyvis"; - version = "0.2.1"; + version = "0.3.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "WestHealth"; repo = pname; - rev = "v${version}"; - hash = "sha256-cER5XYxnURzRLtrisWBu2kxtOiRqgaRTJYyaCMh2qqE="; + rev = "refs/tags/v${version}"; + hash = "sha256-eo9Mk2c0hrBarCrzwmkXha3Qt4Bl1qR7Lhl9EkUx96E="; }; - patches = [ - # Fix test: https://github.com/WestHealth/pyvis/issues/138 - (fetchpatch { - url = "https://github.com/WestHealth/pyvis/commit/eaa24b882401e2e74353efa78bf4e71a880cfc47.patch"; - hash = "sha256-hyDypavoCM36SiuQda1U4FLUPdAjTIMtaeZ0KqfHKzI="; - }) + propagatedBuildInputs = [ + jinja2 + networkx + ipython + jsonpickle ]; - propagatedBuildInputs = [ networkx jinja2 ipython jsonpickle ]; + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; - nativeCheckInputs = [ numpy ]; + disabledTestPaths = [ + # jupyter integration test with selenium and webdriver_manager + "pyvis/tests/test_html.py" + ]; pythonImportsCheck = [ "pyvis" ]; @@ -38,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/WestHealth/pyvis"; description = "Python package for creating and visualizing interactive network graphs"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix index 8d3ea92339..626d87b796 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix @@ -1,47 +1,57 @@ { lib , fetchFromGitHub , buildPythonPackage +, setuptools , setuptools-scm +, gpib-ctypes , pyserial , pyusb , pyvisa , typing-extensions +, psutil +, zeroconf , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.7.0"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288="; + hash = "sha256-zsa4TGDvvPAogOC0ljXC9uwWC9mteldUYprLmwrXNMQ="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ - pyserial - pyusb pyvisa typing-extensions ]; + passthru.optional-dependencies = { + gpib-ctypes = [ gpib-ctypes ]; + serial = [ pyserial ]; + usb = [ pyusb ]; + psutil = [ psutil ]; + hislip-discovery = [ zeroconf ]; + # vicp = [ pyvicp zeroconf ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; - postConfigure = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { description = "Module that implements the Virtual Instrument Software Architecture"; 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 72801ee306..4498b4f150 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix @@ -14,23 +14,15 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.4"; + version = "1.4.2"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-R2ttLoFd6Ic0KZl49dzN5NtWAqPpXRaeki6X8CRGsCw="; + hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; }; - patches = [ - # Backport Python 3.11 support. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/astropy/pyvo/pull/385.patch"; - sha256 = "IHf3W9fIT8XFvyM41PUiJkt1j+B3RkX3TS4FOnRUMDk="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index 4015715c45..591fb0026c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} pywayland/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} pywayland/ffi_build.py ''; # Tests need this to create sockets diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowudp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowudp/default.nix index 9519831c6d..34674635a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowudp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowudp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyweatherflowudp"; - version = "1.4.4"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyweatherflowudp"; rev = "refs/tags/v${version}"; - hash = "sha256-5WdkT4U/+uO9UUIxumrxCKZnK9MdQcvfaO9UfpmpxJE="; + hash = "sha256-aTwGFYTtd07BsWFaFc7ns+8oh2AxTUfRFSu81Zv5OoA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix index 84e2a3f644..9db835f1d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , bottle , importlib-resources -, proxy_tools +, proxy-tools , pygobject3 , pyqtwebengine , pytest @@ -16,8 +17,8 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.1"; - format = "setuptools"; + version = "4.3.3"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -25,17 +26,18 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-oqyWT0GaZ201OMVRcRpm1dma6NonTMmTx5SKnjzQl3M="; + hash = "sha256-8BkbO7C8cYDIQWWCKaXFjfD45L5KVG1tDZJl+uW5g9g="; }; nativeBuildInputs = [ + setuptools-scm qt5.wrapQtAppsHook ]; propagatedBuildInputs = [ bottle pyqtwebengine - proxy_tools + proxy-tools six ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources @@ -48,6 +50,8 @@ buildPythonPackage rec { xvfb-run ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + checkPhase = '' # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 277de7a831..69b8114a95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+AdNT7ClT8JkYLkwk+IVNWgXGS04WNtENOtqmbjv7nQ="; + hash = "sha256-RZeg6/xAGRumd4aM/mQQnIrIXB/rUrdeQQxk2c1mJNI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index 2350b14da0..248af392f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} wlroots/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} wlroots/ffi_build.py ''; pythonImportsCheck = [ "wlroots" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix index 92ec25186f..176d402e99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix @@ -1,25 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub , pytestCheckHook , pyyaml +, setuptools , setuptools-scm -, setuptools-scm-git-archive -, toml +, wheel }: buildPythonPackage rec { pname = "pyyaml-include"; - version = "1.3"; + version = "1.3.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + src = fetchFromGitHub { + owner = "tanbro"; + repo = "pyyaml-include"; + rev = "refs/tags/v${version}"; + hash = "sha256-xsNMIEBYqMVQp+H8R7XpFCwROXA8I6bFvAuHrRvC+DI="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ - pyyaml + setuptools setuptools-scm - setuptools-scm-git-archive - toml + wheel + ]; + + propagatedBuildInputs = [ + pyyaml ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyardian/default.nix index 63318cbfca..0216d562fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyardian/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyyardian"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "h3l1o5"; repo = "pyyardian"; rev = "refs/tags/${version}"; - hash = "sha256-dnHHRGt3TsWJb6tzx+i1gb9hkLJYPVdCt92UGKuO6Mg="; + hash = "sha256-JBb62pFDuVcXIGRc6UOp5/ciUtbGm4XnKZjt1icF/jQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index 74f5b3afc1..88fbf7d63c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -7,18 +7,19 @@ , pythonOlder , tornado , zeromq +, pytest-asyncio }: buildPythonPackage rec { pname = "pyzmq"; - version = "24.0.1"; + version = "25.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IW9dfbtnFmdZ5ZsEebyoK4rPm+1gFbUmuOsQFD+wjnc="; + hash = "sha256-JZwiSFtxq6zfqL95cgzXvPS50SizDqVU8BrnH9v9qiM="; }; buildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tornado + pytest-asyncio ]; pythonImportsCheck = [ @@ -40,6 +42,9 @@ buildPythonPackage rec { pytestFlagsArray = [ "$out/${python.sitePackages}/zmq/tests/" # Folder with tests + # pytest.ini is missing in pypi's sdist + # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986 + "--asyncio-mode auto" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qasync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qasync/default.nix index bdbede92c5..c3761210a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qasync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qasync/default.nix @@ -3,23 +3,28 @@ , fetchFromGitHub , pyqt5 , pytestCheckHook +, poetry-core }: buildPythonPackage rec { pname = "qasync"; - version = "0.24.1"; + version = "0.26.1"; + + format = "pyproject"; src = fetchFromGitHub { owner = "CabbageDevelopment"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DAzmobw+c29Pt/URGO3bWXHBxgu9bDHhdTUBE9QJDe4="; + hash = "sha256-vtRmThXKxqof+Rz3Dngtc9tuwL1bPYFHDq4DBRCsrIU="; }; postPatch = '' rm qasync/_windows.py # Ignoring it is not taking effect and it will not be used on Linux ''; + buildInputs = [ poetry-core ]; + propagatedBuildInputs = [ pyqt5 ]; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix index a31438335e..16ad74dd24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.9.53"; + version = "2023.10.54"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/q0bL1WxIn6giOp9kLUCLZRpS/2d2Rdr61rRwZXQRP8="; + hash = "sha256-xCHB/pPURc1+vje6IhBHZ6HogUsmYfBE9977Qtwoc2w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index 9ac348304e..59c8f47eea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -2,18 +2,18 @@ , buildPythonPackage , lib , fetchPypi +, poetry-core , networkx , numpy , pint , pydantic -, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "qcelemental"; - version = "0.26.0"; + version = "0.27.1"; pyproject = true; @@ -21,10 +21,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; + hash = "sha256-dlcfIUKAg6yc4S3RXVJ1sKM29E1ZvHY82kjx1CM8/08="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ networkx @@ -44,7 +46,8 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; - homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; + homepage = "https://github.com/MolSSI/QCElemental"; + changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ sheepforce ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix index 5b240104ca..c1464c233a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.28.1"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ebZayF5VGHXjBFO3k2KegCNqAFygB3BXKvdvr8mF/Ss="; + hash = "sha256-cIfX9MpRMXtBfLKHKTzCLkv31fBIyanTQHEs8hHk7aQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix index ee9cb180a3..a20841319b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,52 +1,42 @@ { lib , stdenv -, fetchpatch -, fetchPypi -, pythonOlder , buildPythonPackage -, qcodes +, fetchPypi , h5py +, hickle +, hypothesis +, ipython , lazy-loader , matplotlib , numpy , pandas +, pyqt5 +, pyqtgraph +, pytest-mock +, pytest-xdist +, pytestCheckHook +, pythonOlder +, qcodes , setuptools +, slack-sdk , versioningit , wheel , xarray -, hickle -, ipython -, slack-sdk -, hypothesis -, pytest-xdist -, pytest-mock -, pyqtgraph -, pyqt5 -, pytestCheckHook }: buildPythonPackage rec { pname = "qcodes-loop"; - version = "0.1.1"; - format = "pyproject"; + version = "0.1.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "qcodes_loop"; - hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; + hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8="; }; - patches = [ - # https://github.com/QCoDeS/Qcodes_loop/pull/39 - (fetchpatch { - name = "relax-versioningit-dependency.patch"; - url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch"; - hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg="; - }) - ]; - nativeBuildInputs = [ setuptools versioningit @@ -82,20 +72,23 @@ buildPythonPackage rec { pyqt5 ]; - pythonImportsCheck = [ "qcodes_loop" ]; - - disabledTestPaths = [ - # test broken in 0.1.1, see https://github.com/QCoDeS/Qcodes_loop/pull/25 - "src/qcodes_loop/tests/test_hdf5formatter.py" + pythonImportsCheck = [ + "qcodes_loop" ]; postInstall = '' export HOME="$TMPDIR" ''; + disabledTests = [ + # AssertionError: False is not true + "TestHDF5_Format" + ]; + meta = with lib; { description = "Features previously in QCoDeS"; homepage = "https://github.com/QCoDeS/Qcodes_loop"; + changelog = "https://github.com/QCoDeS/Qcodes_loop/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; # Some tests fail on this platform diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix index fb70d6d1f7..3200540411 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcodes/default.nix @@ -1,73 +1,64 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools -, versioningit -, wheel - - # mandatory , broadbean +, buildPythonPackage +, cf-xarray +, dask +, deepdiff +, fetchPypi , h5netcdf , h5py +, hypothesis , importlib-metadata -, ipywidgets , ipykernel +, ipython +, ipywidgets , jsonschema +, lxml , matplotlib , numpy , opencensus , opencensus-ext-azure +, opentelemetry-api , packaging , pandas -, pyvisa -, ruamel-yaml -, tabulate -, typing-extensions -, tqdm -, uncertainties -, websockets -, wrapt -, xarray -, ipython , pillow -, rsa - - # optional -, qcodes-loop -, slack-sdk - - # test , pip -, pytestCheckHook -, deepdiff -, hypothesis -, lxml , pytest-asyncio , pytest-mock , pytest-rerunfailures , pytest-xdist +, pytestCheckHook +, pythonOlder +, pyvisa , pyvisa-sim +, qcodes-loop +, rsa +, ruamel-yaml +, setuptools , sphinx +, tabulate +, tqdm +, typing-extensions +, uncertainties +, versioningit +, websockets +, wheel +, wrapt +, xarray }: buildPythonPackage rec { pname = "qcodes"; - version = "0.39.1"; + version = "0.41.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2gJ/WeynabiGB1Z66+qaUbf6/1wogf/XjIE2mCAXUZY="; + hash = "sha256-3Ncg51E4KYbvzlEyesVbTmzmz+UPfFkj3tudVbNYqHQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'versioningit ~=' 'versioningit >=' - ''; - nativeBuildInputs = [ setuptools versioningit @@ -76,6 +67,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ broadbean + cf-xarray + dask h5netcdf h5py ipykernel @@ -86,6 +79,7 @@ buildPythonPackage rec { numpy opencensus opencensus-ext-azure + opentelemetry-api packaging pandas pillow @@ -107,13 +101,8 @@ buildPythonPackage rec { loop = [ qcodes-loop ]; - slack = [ - slack-sdk - ]; }; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ deepdiff hypothesis @@ -128,6 +117,8 @@ buildPythonPackage rec { sphinx ]; + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ # Follow upstream with settings "--durations=20" @@ -136,6 +127,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Test depends on qcodes-loop, causing a cyclic dependency "qcodes/tests/dataset/measurement/test_load_legacy_data.py" + # TypeError + "qcodes/tests/dataset/test_dataset_basic.py" ]; disabledTests = [ @@ -160,8 +153,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based data acquisition framework"; - homepage = "https://qcodes.github.io/Qcodes/"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; + downloadPage = "https://github.com/QCoDeS/Qcodes"; + homepage = "https://qcodes.github.io/Qcodes/"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix index 25d28dc4d0..8369bbf2a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post3"; + version = "0.1.7.post0"; src = fetchPypi { inherit pname version; - hash = "sha256-acCS9uH8I/t3moCmLm/N/i66BcklhgJIxNZ1T0c2k48="; + hash = "sha256-80ahFMg0LubU29ZHHu8xQZn7Jo0797lYhco1H94rAj8="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix index b1d46d5fcb..37ca849a76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.5.4"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9aZBUrGCNRQjYRF1QmIwVqeT5Tdgv7CCkyOUsbZbmVM="; + hash = "sha256-UGD8hl0KN6PzLvmE4ZK+GsQbM3Bp8t9Mz4K62N6Zv/s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix similarity index 53% rename from third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix index b172f0e718..d4fb7a5031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qds-sdk/default.nix @@ -1,26 +1,32 @@ -{ lib, - fetchFromGitHub, - buildPythonPackage, - boto, - inflection, - pytest, - mock, - requests, - six, - urllib3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, boto +, inflection +, requests +, six +, urllib3 +, mock +, pytestCheckHook +}: buildPythonPackage rec { - pname = "qds_sdk"; + pname = "qds-sdk"; version = "1.16.1"; + pyproject = true; - # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; - rev = "V${version}"; - sha256 = "05c7g63rcvvi4fgkcfsxh2a6hwlffbs18dhki222s5rpc49wi8zi"; + rev = "refs/tags/V${version}"; + hash = "sha256-8aPIE2E3Fy2EiBM2FPRyjnJolIBdOzafI3Fvlod5hxU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto inflection @@ -29,15 +35,17 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ pytest mock ]; - checkPhase = '' - py.test --disable-pytest-warnings tests - ''; + nativeCheckInputs = [ pytestCheckHook mock ]; + + pythonImportsCheck = [ + "qds_sdk" + ]; meta = with lib; { description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; homepage = "https://github.com/qubole/qds-sdk-py"; license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 ]; + mainProgram = "qds.py"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qgrid/default.nix index 645328f1a7..f5758c3182 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qgrid/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "test_edit_multi_index_df" "test_multi_index" "test_period_object_column" + # probably incompatible with pandas>=2.1 + "test_add_row_button" ]; pythonImportsCheck = [ "qgrid" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index 60d5efc9e3..e774990fb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.11.2"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-ew9ucqOWDztjB+hJTh9WkJiutVBJyVQobtEcWeUwEcw="; + hash = "sha256-K8Avh1j9j5CGdEYIeJJRF+PjUFXvVILkZLqX1QClInE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 8e2de37788..4bf996a265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.20.1"; + version = "0.20.2"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BFiGMPiO9Xcl8EiTZYiwHCpo7z+tRaBkIb8GTo01rBA="; + hash = "sha256-7dIspeJpukLDfICoBPPZZWdzkVumtvh+NRxvtmnvWH0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 28d572afc3..1c23fb3b03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.5.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wK0ZRNnU7WJlTWRJ2ce6LN6WGKlkh5jBrbXMDYcPQJI="; + hash = "sha256-oSLQvZGEq/nBj7ktDEq3BMk7xyYiLGpBDmKxuXtMTfs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix index 629dc04bd3..8fc30687f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.5.2"; + version = "0.6.2"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rUY5fnsWg2UisF0tGORvHot8laCs8eVAvuVKUOG5ibw="; + hash = "sha256-X/4jA/e2nmmaVEiCgd/4KJc/sAdcYDkyKzvyVztovXM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index f6c5010fbf..2c290493b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -58,15 +58,15 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.21.0"; + version = "0.25.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = version; - hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ="; + rev = "refs/tags/${version}"; + hash = "sha256-4/LVKDNxKsRztCtU/mMfKMVHHJqfadZXmxeOlnlz9Tc="; }; nativeBuildInputs = [ setuptools-rust rustc cargo rustPlatform.cargoSetupHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix index 367416c296..f480217aa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "3.4.0"; + version = "4.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; - rev = "v${version}"; - hash = "sha256-GrYAhTWABBvU6rGoHi00jBa7ryjCNgzO/hQBTdSW9cg="; + rev = "refs/tags/v${version}"; + hash = "sha256-s1d8oTrmptS3exUqn9HSSla6P4dIxS/qNalsDTbFmFs="; }; pythonImportsCheck = [ "qpsolvers" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index b963798f65..a49b63eaeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -4,7 +4,7 @@ , ipykernel , jupyter-core , jupyter-client -, ipython_genutils +, ipython-genutils , pygments , pyqt5 , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - ipython_genutils + ipython-genutils jupyter-core jupyter-client pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix index 5be099d986..85a8fdd12b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, factory_boy +, factory-boy , faker , fetchPypi , httpretty @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - factory_boy + factory-boy faker httpretty jsondate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quart-cors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quart-cors/default.nix index 8ffe47b4ed..78f3f0311f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quart-cors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quart-cors/default.nix @@ -12,18 +12,19 @@ # tests , pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "quart-cors"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-cors"; rev = "refs/tags/${version}"; - hash = "sha256-SbnYrpeyEn47JgP9p3Us0zfkjC1sJ7jPPUIHYHAiSgc="; + hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio ]; meta = with lib; { 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 932d972eef..6cf51d6920 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quart/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # remove after 0.18.4 + "tests/test_signals.py" + ]; + meta = with lib; { description = "An async Python micro framework for building web applications"; homepage = "https://github.com/pallets/quart/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix index c355022323..6f9b0488c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "questionary"; - version = "unstable-2022-07-27"; + version = "2.0.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tmbo"; repo = pname; - rev = "848b040c5b7086ffe75bd92c656e15e94d905146"; - hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY="; + rev = "refs/tags/${version}"; + hash = "sha256-JY0kXomgiGtOrsXfRf0756dTPVgud91teh+jW+kFNdk="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to build command line user prompts"; homepage = "https://github.com/tmbo/questionary"; + changelog = "https://github.com/tmbo/questionary/blob/${src.rev}/docs/pages/changelog.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix index ab33203d70..a1b0a43095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk="; + hash = "sha256-zI6oUHO4rY/BbbHhvzSNIKCpTDRm0cK46rIKN/ISgY0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radio-beam/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/radio-beam/default.nix index 1a34973678..41653caaa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radio-beam/default.nix @@ -12,14 +12,13 @@ }: buildPythonPackage rec { - pname = "radio_beam"; - version = "0.3.4"; - format = "pyproject"; + pname = "radio-beam"; + version = "0.3.6"; + pyproject = true; src = fetchPypi { - inherit version; - pname = "radio-beam"; - sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; + inherit pname version; + hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; }; nativeBuildInputs = [ @@ -39,12 +38,16 @@ buildPythonPackage rec { pytest-astropy ]; - meta = { + pythonImportsCheck = [ + "radio_beam" + ]; + + meta = with lib; { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ smaret ]; + changelog = "https://github.com/radio-astro-tools/radio-beam/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix index e5cdbaf92a..f0f9070180 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.16.2"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-ZWAHPZmyPq/BRVT6pHkTRjp2SA36+wD6x6GW9OyfG7k="; + hash = "sha256-9Wt+W7PWUVijzAeZMvcOl/Na60OCCGJJqxh2UaAxAcM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rank-bm25/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/rank-bm25/default.nix index 4019864f27..9b0c508044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rank_bm25/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rank-bm25/default.nix @@ -5,7 +5,7 @@ , numpy }: let - pname = "rank_bm25"; + pname = "rank-bm25"; version = "0.2.2"; in buildPythonPackage { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index f640012d9a..80094a1a35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-C+jQN0QXZzH0IKdC3O5uPNAEd+XSffi3nkwFSv2HqPY="; + hash = "sha256-JgTmhnKVzv9m8//GMQjvCFPNJQM/7dalCD5bk6fWBPc="; }; nativeBuildInputs = [ 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 02cdcbed68..e0f393ff61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -8,7 +8,7 @@ , click-plugins , cligj , certifi -, cython +, cython_3 , fetchFromGitHub , gdal , hypothesis @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.8"; + version = "1.3.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,11 +37,11 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-8kPzUvTZ/jRDXlYMAZkG1xdLAQuzxnvHXBzwWizMOTo="; + hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4="; }; nativeBuildInputs = [ - cython + cython_3 gdal numpy oldest-supported-numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix deleted file mode 100644 index 6c01a9e548..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest-asyncio -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "ratelimiter"; - version = "1.2.0.post0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-XDldyr273i5ReO8/ibVoowZkVKbdwiO3ZHPawi+JtPc="; - }; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonImportsCheck = [ - "ratelimiter" - ]; - - preCheck = '' - # Uses out-dated options - rm tests/conftest.py - ''; - - disabledTests = [ - # TypeError: object Lock can't be used in 'await' expression - "test_alock" - ]; - - meta = with lib; { - description = "Simple python rate limiting object"; - homepage = "https://github.com/RazerM/ratelimiter"; - license = licenses.asl20; - maintainers = with maintainers; [ helkafen ]; - }; -} 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 76d5b34d72..a09e649234 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 @@ { cp39 = { - sha256 = "7708cedbeed8e37e468740b75aa941b2a3c80d2cb8791081e0b0ea159617a912"; + sha256 = "0e0f7dbeb4444940c72b64fdecd6f331593466914b2dffeed03ce97225acec14"; }; cp310 = { - sha256 = "c9b5aabf5f41fe05028e4f3a271dc89ca7cd9c210f48a4ed815b852210ebb5a8"; + sha256 = "b83621f5d2d4079e6ae624c3bf30046a4fefa0ea7ea5e4a4dfe4b50c580b3768"; }; cp311 = { - sha256 = "7b0286cd05d9107a2d978c716a7447c09ffd382971e5b2b388602d56f6b1c662"; + sha256 = "8384b3f30bc1446ef810e9e894afa03238c5ac40d3c40c0740d82f347112015d"; }; } 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 3893ad842f..6edff48479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix @@ -52,7 +52,7 @@ let pname = "ray"; - version = "2.6.1"; + version = "2.7.0"; in buildPythonPackage rec { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix index 2ac13e9a47..060fafa8d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rchitect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk="; + hash = "sha256-igrYMgPemYVGDR+eWiqtxFxFjroCyOfKEU0wj8D7ZS8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix index 34070cc2d3..15fc1c3bfe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix @@ -1,20 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + buildPythonPackage rec { pname = "rcssmin"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ="; + hash = "sha256-vHXrdb1tNFwMUf2A/Eh93W+f1AndeGGz/pje6FAY4ek="; }; # The package does not ship tests, and the setup machinary confuses # tests auto-discovery doCheck = false; + pythonImportsCheck = [ + "rcssmin" + ]; + meta = with lib; { + description = "CSS minifier written in pure python"; homepage = "http://opensource.perlig.de/rcssmin/"; license = licenses.asl20; - description = "CSS minifier written in pure python"; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix index dc5ddf9cdf..471439b28e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix @@ -4,6 +4,9 @@ , fetchFromGitHub , pythonOlder +# builds +, poetry-core + # propagates , isodate , pyparsing @@ -25,18 +28,22 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.2.0"; - format = "setuptools"; + version = "7.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GkqfSyApOFKPIiIYXhgaRZuMawk7PRYmxGDhnRI+Rz0="; + hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate html5lib @@ -76,6 +83,7 @@ buildPythonPackage rec { "testGuessFormatForParse" "test_infix_owl_example1" "test_context" + "test_example" "test_guess_format_for_parse" "rdflib.extras.infixowl" ] ++ lib.optionals stdenv.isDarwin [ 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 783051540c..56cca6c1af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -21,16 +21,16 @@ let external = { avalon = fetchFromGitHub { - owner = "rohdebe1"; + owner = "rdkit"; repo = "ava-formake"; - rev = "AvalonToolkit_2.0.4a"; - hash = "sha256-ZyhrDBBv9XuXe1NY/Djiad86tGIJwCSTrxEMICHgSqk="; + rev = "AvalonToolkit_2.0.5-pre.3"; + hash = "sha256-2MuFZgRIHXnkV7Nc1da4fa7wDx57VHUtwLthrmjk+5o="; }; yaehmop = fetchFromGitHub { owner = "greglandrum"; repo = "yaehmop"; - rev = "v2022.09.1"; - hash = "sha256-QMnc5RyHlY3giw9QmrkGntiA+Srs7OhCIKs9GGo5DfQ="; + rev = "v2023.03.1"; + hash = "sha256-K9//cDN69U4sLETfIZq9NUaBE3RXOReH53qfiCzutqM="; }; freesasa = fetchFromGitHub { owner = "mittinatten"; @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.03.3"; + version = "2023.09.1"; format = "other"; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-5M7nDUWORbepDGaf2G6Cd79Hu0au3DNRc9KuONoCWK0="; + hash = "sha256-qaYD/46oCTnso1FbD08zr2JuatKmSSqNBhOYlfeIiAA="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix new file mode 100644 index 0000000000..b7d61f8c8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, poetry-core +, python-lzo +, tkinter + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "readmdict"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ffreemt"; + repo = "readmdict"; + rev = "v${version}"; + hash = "sha256-1/f+o2bVscT3EA8XQyS2hWjhimLRzfIBM6u2O7UqwcA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + python-lzo + tkinter + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "readmdict" + ]; + + meta = with lib; { + description = "Read mdx/mdd files (repacking of readmdict from mdict-analysis)"; + homepage = "https://github.com/ffreemt/readmdict"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 0451d63cc3..fc2fd65308 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-5e/82CWBYRGjd6t6iXuBkhUTj45eisyG+ZIYMo+VckA="; + hash = "sha256-kiF77xTZE3e88nvffaNj5XSzseQYC2Xu9ufPpV8P0Lg="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix deleted file mode 100644 index dce24cfa7a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/recaptcha_client/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "recaptcha-client"; - version = "1.0.6"; - disabled = pythonAtLeast "3.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f"; - }; - - meta = with lib; { - description = "A CAPTCHA for Python using the reCAPTCHA service"; - homepage = "http://recaptcha.net/"; - license = licenses.mit; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index f2a9f17ab6..c5b7fcb88b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.43.0"; + version = "14.46.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ="; + hash = "sha256-XCcunwqmcvPC5AVxR9mit06BRDTYfu/CeTXg3IH7Dy0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index 4d8ab8e8a8..7b92cfaceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -15,6 +15,7 @@ , scipy , setuptools , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix index ff57846c20..b6c20812d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -6,14 +6,14 @@ , python-dateutil , x-wr-timezone , pytestCheckHook -, restructuredtext_lint +, restructuredtext-lint , pygments , tzdata }: buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM="; + hash = "sha256-HNImooD6+hsMIfJX8LuHw1YyFIQNbY7dAjqdupPbhEE="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - restructuredtext_lint + restructuredtext-lint pygments tzdata ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix index 23e7f0f80b..499ad3c23d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patchPhase = "cat ${./sitecustomize.py} > sitecustomize.py"; - buildPhase = "${python.pythonForBuild}/bin/${python.pythonForBuild.executable} -m compileall ."; + buildPhase = "${python.pythonOnBuildForHost}/bin/${python.pythonOnBuildForHost.executable} -m compileall ."; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix new file mode 100644 index 0000000000..aec5311351 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis-om/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, unasync +, poetry-core +, python +, click +, hiredis +, more-itertools +, pydantic +, python-ulid +, redis +, types-redis +, typing-extensions +, pkgs +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "redis-om"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "redis"; + repo = "redis-om-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-jQS0VTYZeAj3+OVFy+JP4mUFBPo+a5D/kdJKagFraaA="; + }; + + nativeBuildInputs = [ + unasync + poetry-core + ]; + + propagatedBuildInputs = [ + click + hiredis + more-itertools + pydantic + python-ulid + redis + types-redis + typing-extensions + ]; + + preBuild = '' + ${python.pythonOnBuildForHost.interpreter} make_sync.py + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + # probably require redisearch + # https://github.com/redis/redis-om-python/issues/532 + doCheck = false; + + pythonImportsCheck = [ + "aredis_om" + "redis_om" + ]; + + meta = with lib; { + description = "Object mapping, and more, for Redis and Python"; + homepage = "https://github.com/redis/redis-om-python"; + changelog = "https://github.com/redis/redis-om-python/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix index d99b25374a..2616e1da9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.5.4"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + hash = "sha256-XOpsDTNcmnMypGDthynOq7TQxInHKFsKhtu/igF70SA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix index 1c739ebb07..7bf21823e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.911"; + version = "2.0.914"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-D1LpFGYEpGmkYCAJbYJaQStDnol90mH8X4S6iXg6Nfs="; + hash = "sha256-fGOo9FgVMI6ayyB3EMN6RGThwWciShcBZzWTZWtOt8E="; }; # disable test coverage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix index 65006ea823..a2fb336f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix @@ -1,35 +1,40 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub + +# build-system , cython -, nose +, setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "reedsolo"; - version = "1.5.4"; + version = "1.7.0"; + format = "pyproject"; # Pypi does not have the tests src = fetchFromGitHub { owner = "tomerfiliba"; repo = "reedsolomon"; - rev = "v${version}"; - hash = "sha256-GUMdL5HclXxqMYasq9kUE7fCqOkjr1D20wjd/E+xPBk="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzdD1oGXHSeGDD/3PpQQEZYGAwn9ahD2KNYGqpgADh0="; }; - patches = [ - (fetchpatch { - # python3.10 compat; https://github.com/tomerfiliba/reedsolomon/pull/38 - url = "https://github.com/tomerfiliba/reedsolomon/commit/63e5bd9fc3ca503990c212eb2c77c10589e6d6c3.patch"; - hash = "sha256-47g+jUsJEAyqGnlzRA1oSyc2XFPUOfH0EW+vcOJzsxI="; - }) + nativeBuildInputs = [ + cython + setuptools ]; - nativeBuildInputs = [ cython ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests"; + disabledTestPaths = [ + "tests/test_creedsolo.py" # TODO: package creedsolo + ]; meta = with lib; { description = "Pure-python universal errors-and-erasures Reed-Solomon Codec"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix index 37e418f3ea..dc09aa3594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.30.0"; + version = "0.30.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-nJSnZM3gg2+yfFAnOJzzXsmIEQdNf5ypt5R0O60NphA="; + hash = "sha256-C2gKjoaMcUWz/QOsqpv4TkozQyI+zEIQf3GMf5w40aw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/releases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/releases/default.nix index 9c1fc34cae..05c6d5ae75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/releases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/releases/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "releases"; - version = "1.6.3"; + version = "2.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bitprophet"; repo = pname; rev = version; - hash = "sha256-XX2e6bjBNMun31h0sNJ9ieZE01U+PhA5JYYNOuMgD20="; + hash = "sha256-IgEKAUk97R3ZvqvexD/ptT8i0uf48K+DKkk4q3pn3G8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix index 5d2e002538..32916774ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; - rev = "v${version}"; - hash = "sha256-FytVq9p7Yo0lS5rHj0crPIpHFjxolW8esSPkj2wLfaI="; + rev = "refs/tags/v${version}"; + hash = "sha256-2WxMh5P/8NvElymnMU3JzQU0P4DMXFF6j15OxLaS+VA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index dcf663f0f7..832d843847 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.10"; + version = "0.7.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-Yq5lhcBT+r2S89vQmbqAr/3LO0HUDpZ+JaEtSqIgpG4="; + hash = "sha256-BSl7dECYJIjR9QTvcizUF3Lz1jmgm9xi4kPt7PdO/Nk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix index 45105965cb..06143c2922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.64"; + version = "0053"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI="; + hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix index 63cdb2fda2..1c5417c75a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.11.0"; + version = "3.12.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-5fv2DSMeCleDxsW+nua2dOOeWZIZfuP+Qo++w2YEf4Q="; + hash = "sha256-bKv9APbraR2359IzzkzXs4sEXrTvGK3J4LO3wFHOti0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index 608debea56..664d87040c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -3,6 +3,7 @@ , fetchPypi , freetype , pillow +, setuptools , glibcLocales , python , isPyPy @@ -12,26 +13,18 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.13"; + version = "4.0.4"; + format = "pyproject"; + + # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit + disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-b3XTP3o3IM9HNxq2PO0PDr0a622xk4aukviXegm+lhE="; + hash = "sha256-f3CztWr/XxHLQTbFGg9aVv5uTI+7rHuQMHbbmajvMcE="; }; - patches = [ - ./darwin-m1-compat.patch - ]; - - nativeCheckInputs = [ glibcLocales ]; - - buildInputs = [ ft ]; - propagatedBuildInputs = [ pillow ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" - # Remove all the test files that require access to the internet to pass. rm tests/test_lib_utils.py rm tests/test_platypus_general.py @@ -42,16 +35,34 @@ in buildPythonPackage rec { rm tests/test_graphics_charts.py ''; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + ft + ]; + + propagatedBuildInputs = [ + pillow + ]; + + nativeCheckInputs = [ + glibcLocales + ]; + checkPhase = '' - cd tests + runHook preCheck + pushd tests LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py + popd + runHook postCheck ''; - # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit - disabled = isPyPy; - - meta = { + meta = with lib; { description = "An Open Source Python library for generating PDFs and graphics"; homepage = "http://www.reportlab.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix index 00060c08bc..81ab320c77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -3,8 +3,11 @@ , astropy-extension-helpers , astropy-healpix , buildPythonPackage +, cloudpickle , cython +, dask , fetchPypi +, fsspec , numpy , oldest-supported-numpy , pytest-astropy @@ -12,18 +15,19 @@ , pythonOlder , scipy , setuptools-scm +, zarr }: buildPythonPackage rec { pname = "reproject"; - version = "0.10.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; + hash = "sha256-jb4efKT5jMY0ECV+ab5rpUHEk+tT4T2MioCRxs92TbI="; }; postPatch = '' @@ -42,9 +46,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy astropy-healpix + cloudpickle + dask + fsspec numpy scipy - ]; + zarr + ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ pytest-astropy @@ -65,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproject astronomical images"; + downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix index 6375f811af..d48a84025e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , certifi , charset-normalizer +, cvss , deepl , django , fetchFromGitHub @@ -22,13 +23,14 @@ , sqlparse , termcolor , toml +, tomli-w , urllib3 , xmltodict }: buildPythonPackage rec { pname = "reptor"; - version = "0.4"; + version = "0.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-3FRMdiSKWlEUmggtSDea9w386uwAn/VUzXiD1xRNuxQ="; + hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA="; }; nativeBuildInputs = [ @@ -48,6 +50,7 @@ buildPythonPackage rec { asgiref certifi charset-normalizer + cvss django idna markdown-it-py @@ -59,6 +62,7 @@ buildPythonPackage rec { sqlparse termcolor toml + tomli-w urllib3 xmltodict ]; @@ -66,7 +70,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { ghostwriter = [ gql - ]; + ] ++ gql.optional-dependencies.aiohttp; translate = [ deepl ]; @@ -78,6 +82,7 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) + export PATH="$PATH:$out/bin"; ''; pythonImportsCheck = [ @@ -89,6 +94,13 @@ buildPythonPackage rec { "reptor/plugins/importers/GhostWriter/tests/test_ghostwriter.py" ]; + disabledTests = [ + # Tests need network access + "TestDummy" + "TestIntegration" + + ]; + meta = with lib; { description = "Module to do automated pentest reporting with SysReptor"; homepage = "https://github.com/Syslifters/reptor"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index f85d2b2deb..d04f25ae0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -1,23 +1,28 @@ { lib -, appdirs , attrs , buildPythonPackage , bson , boto3 , botocore , cattrs -, exceptiongroup , fetchFromGitHub , itsdangerous +, platformdirs , poetry-core +, psutil , pymongo , pytestCheckHook +, pytest-rerunfailures +, pytest-xdist , pythonOlder , pyyaml , redis , requests , requests-mock +, responses , rich +, tenacity +, time-machine , timeout-decorator , ujson , urllib3 @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.8"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,7 +40,7 @@ buildPythonPackage rec { owner = "requests-cache"; repo = "requests-cache"; rev = "refs/tags/v${version}"; - hash = "sha256-Xbzbwz80xY8IDPDhZEUhmmiCFJZvSQMQ6EmE4EL7QGo="; + hash = "sha256-kJqy7aK67JFtmsrwMtze/wTM9qch9YYj2eUzGJRJreQ="; }; nativeBuildInputs = [ @@ -43,10 +48,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs attrs cattrs - exceptiongroup + platformdirs requests urllib3 url-normalize @@ -78,9 +82,15 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + psutil pytestCheckHook + pytest-rerunfailures + pytest-xdist requests-mock + responses rich + tenacity + time-machine timeout-decorator ] ++ passthru.optional-dependencies.json @@ -98,6 +108,9 @@ buildPythonPackage rec { disabledTests = [ # Tests are flaky in the sandbox "test_remove_expired_responses" + # Tests that broke with urllib 2.0.5 + "test_request_only_if_cached__stale_if_error__expired" + "test_stale_if_error__error_code" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix new file mode 100644 index 0000000000..5cc57d86a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyrate-limiter +, requests +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "requests-ratelimiter"; + version = "0.4.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JWCook"; + repo = "requests-ratelimiter"; + rev = "v${version}"; + hash = "sha256-w4cBQRpk9UTuGA0lPDsqpQ3UEIQdYe38NYXz+V4+Lvc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyrate-limiter + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "requests_ratelimiter" ]; + + meta = with lib; { + description = "Easy rate-limiting for python requests"; + homepage = "https://github.com/JWCook/requests-ratelimiter"; + changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.rev}/HISTORY.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix index d7b6f01d16..0d4bf487d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -29,6 +29,16 @@ buildPythonPackage rec { trustme ]; + disabledTests = [ + # incompatible with urllib3 2.0 + "test_dump_response" + "test_dump_all" + "test_prepared_request_override_base" + "test_prepared_request_with_base" + "test_request_override_base" + "test_request_with_base" + ]; + pythonImportsCheck = [ "requests_toolbelt" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext-lint/default.nix new file mode 100644 index 0000000000..3b7f4dfd57 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext-lint/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, docutils +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "restructuredtext-lint"; + version = "1.4.0"; + pyproject = true; + + src = fetchPypi { + pname = "restructuredtext_lint"; + inherit version; + hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ docutils ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "restructuredtext_lint/test/test.py" + ]; + + pythonImportsCheck = [ + "restructuredtext_lint" + ]; + + meta = { + description = "reStructuredText linter"; + homepage = "https://github.com/twolfson/restructuredtext-lint"; + changelog = "https://github.com/twolfson/restructuredtext-lint/blob/${version}/CHANGELOG.rst"; + license = lib.licenses.unlicense; + mainProgram = "rst-lint"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix deleted file mode 100644 index ebb682a9c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, docutils -, nose -, testtools -}: - -buildPythonPackage rec { - pname = "restructuredtext_lint"; - version = "1.4.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; - }; - - nativeCheckInputs = [ nose testtools ]; - propagatedBuildInputs = [ docutils ]; - - checkPhase = '' - nosetests --nocapture - ''; - - meta = { - description = "reStructuredText linter"; - homepage = "https://github.com/twolfson/restructuredtext-lint"; - license = lib.licenses.unlicense; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix index 0fde443554..7dc2878d39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; - rev = "v${version}"; - hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U="; + rev = "refs/tags/v${version}"; + hash = "sha256-iQ8x8UM0zmb2qYUpSh6RSEaBMrDpwY0ZHaJ9GJqn4Hs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix index 4c4de7f75d..6aad6e5279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix @@ -5,11 +5,12 @@ , pythonOlder , rich , typer +, typing-extensions }: buildPythonPackage rec { pname = "rich-click"; - version = "1.6.1"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,12 +19,13 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk="; + hash = "sha256-rWVJEuJx5nDUg6RvhubHu9U2Glilrkugjg28SpFIZys="; }; propagatedBuildInputs = [ click rich + typing-extensions ]; # Module has no test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 24a25e2756..86c3ac1ffe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.3.5"; + version = "13.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PnyO5u0gxfYKT6xr0k3H0lbLl9wKPl6oxR1mM9A0Hys="; + hash = "sha256-ycDmFJa68OOrNqIy/hGKxbjoaIbiniiO4UAPNSyZvDk="; }; nativeBuildInputs = [ @@ -46,6 +46,20 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # pygments 2.16 compat + # https://github.com/Textualize/rich/issues/3088 + "test_card_render" + "test_markdown_render" + "test_markdown_render" + "test_python_render" + "test_python_render_simple" + "test_python_render_simple_passing_lexer_instance" + "test_python_render_indent_guides" + "test_option_no_wrap" + "test_syntax_highlight_ranges" + ]; + pythonImportsCheck = [ "rich" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index bd37f1c530..f56921a691 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -1,8 +1,12 @@ { lib +, asyncclick , buildPythonPackage , fetchPypi , oauthlib , poetry-core +, pytest-asyncio +, pytest-mock +, pytest-socket , pytestCheckHook , pythonOlder , pytz @@ -13,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.4"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-hto3MwlC6ADjKkcB/4l/uFyw+0CgvLZM0sp3FF62XUA="; + hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM="; }; nativeBuildInputs = [ @@ -29,6 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + asyncclick oauthlib pytz requests @@ -36,6 +41,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytest-socket pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 7ded790ec5..397259d30f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.13.1"; + version = "3.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SnUt6bsTEC7abdQr0nWyNOAJbW64B1K3yy1McfkdxAc="; + hash = "sha256-tMV5mRqOLURkr8HQN1yvq5Cf3yz2NRBY6uaaxNKCy2c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix index ca003ed906..0a8869052d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rkm-codes/default.nix @@ -7,27 +7,27 @@ buildPythonPackage rec { pname = "rkm-codes"; - version = "0.5"; + version = "0.6"; + format = "pyproject"; src = fetchFromGitHub { owner = "KenKundert"; repo = "rkm_codes"; - rev = "v${version}"; - hash = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw="; + rev = "refs/tags/v${version}"; + hash = "sha256-CkLLZuWcNL8sqAupc7lHXu0DXUXrX3qwd1g/ekyHdw4="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ setuptools ]; # this has a circular dependency on quantiphy preBuild = '' - sed -i '/quantiphy/d' ./setup.py - sed -i '/pytest-runner/d' ./setup.py + sed -i '/quantiphy/d' pyproject.toml ''; # this import check will fail as quantiphy is imported by this package diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix index bb7044a89d..6793cf747b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.5"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - hash = "sha256-GRqiGacyHZpVKUqfAteMjRV4EtdHkSgfFRj/H76bBVo="; + hash = "sha256-C3nFOv/zxvAoz6WZ0RAZffzEbxIx/XrGabO4QPxrik8="; }; buildInputs = [ 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 031c44ebb2..0640ce63db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.2"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-Z3vFQB6/z3dWtYikN02QviG+0aDRzt8kk6IOpl/VmF0="; + hash = "sha256-MDD0Vs5XIWqxKHbrAa0vXJRd8uYZDlr//hP1NBf4b7U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 8dfbb32fe0..eea465ee8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.1"; pname = "robotframework-databaselibrary"; src = fetchPypi { inherit pname version; - sha256 = "627d872b3dda6a308a650ac9e676dadedf9c294e4ef70ad207cbb86b78eb8847"; + sha256 = "sha256-C+shwpGbiA+YS8t9ApJEv6mYQVd3fVvY3qWzDF6vYqU="; }; # unit tests are impure diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index fe33d2e3f6..114c24aa1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - version = "6.1.0"; + version = "6.1.2"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iCZU+9xFUPoyucdQ/26dgxAm8jRf92P3JyA2KqV8bYI="; + sha256 = "sha256-QbAwPm1Y76KPIcHkopiyISULQSwUet021erFa/zi8Zw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix index d5d72ac957..122e2ff326 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "6.0.2"; + version = "6.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; + hash = "sha256-vtP0TVkCMrm0CRXlpZvVTBf7yd8+3p+nRArMWyQUn4k="; }; nativeCheckInputs = [ jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix index 4fd25ec806..544beaf120 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; + hash = "sha256-sPmOoR5K+gMfyPk2QMbiDNmWPRcqKrsz6ZPBAKR/3XY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix index 29970e7fd2..65b7c62b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rocket-errbot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { - url = "https://github.com/errbotio/rocket/pull/1.patch"; + # https://github.com/errbotio/rocket/pull/1 + name = "errbotio-rocket-pull-1.patch"; + url = "https://github.com/errbotio/rocket/compare/f1a52fe17164f83bccce5e6a1935fc5071c2265f...d69adcd49de5d78bd80f952a2ee31e6a0bac4e3d.patch"; sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index ac67ff88ac..34a5c17a47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.18.1"; + version = "0.18.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-0ArnP9xITVpbIfDrsNK3ukmeJBdd6SE3tnDwCLWSHMo="; + hash = "sha256-fgnR3TZh+cHvC8qJnvwfrrtxCdEr89Uw8ciACzaQPYE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix index 8743f97093..68346eb7cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - hash = "sha256-TXIKa5DB5+511fQuHAQwPWqw7vQPP+s1X3U7BgEfzzE="; + hash = "sha256-356eSRlO0kIaOm+O4bApraC0amEprBcCSvzl3LQ7k/E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 1c93184a36..8a65e0249e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = version; - hash = "sha256-EozW8J1i/2ym1hwUMciaWVtp7kSWfG+mC5RkWLJdK3g="; + hash = "sha256-dST3eJnOcG2s9tiD/Fb9BvLS6nIpE8RXly92PK/gCC8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix index 8b6eb61e72..6cd3f5dea2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpds-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.9.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-jXDo8UkA8mV8JJ6k3vljvthqKbgfgfW3a1qSFWgN6UU="; + hash = "sha256-/MHrt1YaPiSmWI98be0V2ArsIsZqBwx1dVm1exf/0cs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2LiQ+beFj9+kykObPNtqcg+F+8wBDzvWcauwDLHa7Yo="; + hash = "sha256-iWy6BHVsKsZB0SVrh3CVhryaavk4gAQVvRdu9xBiDRg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpmfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpmfile/default.nix index 1cbf6c9057..6af50237e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpmfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpmfile/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "rpmfile"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZxcHe1QxdG2GBIPMNrnJy6Vd8SRgZ4HOtwsks2be8Cs="; + sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; }; # Tests access the internet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 58e38eb562..837d77b4dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.12"; + version = "3.5.14"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-7q33lP0qpUj4hWjGodJufDgQzUp2Soeyw7MdMZQtbUU="; + hash = "sha256-X0auMdNuEXvjZq1K4CSTwBWsa6WevjtM1yAAdTMvxIE="; }; patches = [ @@ -81,6 +81,10 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + # newlines in environment variables are a problem due to + # https://github.com/rpy2/rpy2/issues/1066 + preCheck = "unset postPatch"; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix index 1d9b8114df..361ba5e7fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rtmixer"; - version = "0.1.1"; + version = "0.1.4"; disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; - rev = version; - sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix index 7d4e141963..0de516ec85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtree/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "rtree"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Rtree"; inherit version; - hash = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk="; + hash = "sha256-b47lBN3l0AWyWwiq9b4LNASvOtX+zm4d3N41kIp5ipU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 7975629b4e..a7a362bcf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchhg +, cython }: buildPythonPackage rec { @@ -19,6 +20,11 @@ buildPythonPackage rec { # circular dependency with ruamel-yaml # pythonImportsCheck = [ "_ruamel_yaml" ]; + nativeBuildInputs = [ cython ]; + + # Fix incompatible function pointer conversion errors with clang 16. + patches = [ ./fix-incompatible-function-pointers.patch ]; + preBuild = "cython _ruamel_yaml.pyx -3 --module-name _ruamel_yaml -I."; meta = with lib; { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch new file mode 100644 index 0000000000..99debf22e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/fix-incompatible-function-pointers.patch @@ -0,0 +1,79 @@ +Based on https://sourceforge.net/p/ruamel-yaml-clib/code/merge-requests/4/ with additions +for `input_handler` and `output_handler`. + +--- a/_ruamel_yaml.pxd ++++ b/_ruamel_yaml.pxd +@@ -2,15 +2,15 @@ + cdef extern from "_ruamel_yaml.h": + + void malloc(int l) +- void memcpy(char *d, char *s, int l) ++ void memcpy(unsigned char *d, char *s, int l) + int strlen(char *s) + int PyString_CheckExact(object o) + int PyUnicode_CheckExact(object o) + char *PyString_AS_STRING(object o) + int PyString_GET_SIZE(object o) +- object PyString_FromStringAndSize(char *v, int l) ++ object PyString_FromStringAndSize(unsigned char *v, size_t l) + object PyUnicode_FromString(char *u) +- object PyUnicode_DecodeUTF8(char *u, int s, char *e) ++ object PyUnicode_DecodeUTF8(unsigned char *u, size_t s, char *e) + object PyUnicode_AsUTF8String(object o) + int PY_MAJOR_VERSION + +@@ -85,11 +85,11 @@ + YAML_MAPPING_START_EVENT + YAML_MAPPING_END_EVENT + +- ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 +- +- ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer, ++ size_t size, size_t *size_read) except 0 ++ ++ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer, ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: + int index +@@ -112,7 +112,7 @@ + char *handle + char *suffix + ctypedef struct _yaml_token_scalar_data_t: +- char *value ++ unsigned char *value + int length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: +@@ -151,7 +151,7 @@ + ctypedef struct _yaml_event_scalar_data_t: + char *anchor + char *tag +- char *value ++ unsigned char *value + int length + int plain_implicit + int quoted_implicit +--- a/_ruamel_yaml.pyx ++++ b/_ruamel_yaml.pyx +@@ -904,7 +904,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1514,7 +1514,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 1594d9296f..bc4ea00f05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.9.2"; + version = "2023.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZMzOrTKoFkIt2a4daTxdY1TZn2SuJsVjiPHY4ceFgyE="; + hash = "sha256-xA8jjMyf7/8/bQnUtXYqvWyRO6QuGjKJdrVNA4kBuDU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index a609bbe99b..748b6abecf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-cL4IOfWLRUJC5zCzmN/qRf0N/IV/MDHF/j2JDX5hlUE="; + hash = "sha256-EvLqRvm9E1Taf+JvbhQbfJqIlbu2a+rB2MX0IO90x98="; }; propagatedBuildInputs = [ botocore ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; + changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sabctools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sabctools/default.nix index ce536c90c3..d20ea73186 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sabctools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sabctools/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "7.0.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + version = "7.1.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AB5/McuOIDkhu7rtb3nFaqOTx3zwm92+3NEnH5HjzBo="; + hash = "sha256-wDgFXuxclmqMlRXyr9qpruJJcOXfOiOWTZXX53uYEB8="; }; pythonImportsCheck = ["sabctools"]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix index 06a2c3966a..976d6b9b3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safetensors/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.3.1"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RoIBD+zBKVzXE8OpI8GR371YPxceR4P8B9T1/AHc9vA="; + hash = "sha256-U+indMoLFN6vMZkJTWFG08lsdXuK5gOfgaHmUVl6DPk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; + hash = "sha256-MhRs9tFCmVZI5O0EVRUbo4ZnUVRQ0EfQTU+E1K+qKZI="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index d32ee63d36..2c7254fdcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.188.0"; + version = "2.197.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-iWNAsqDGTkELQn5K45AYpdzexE3DimI5xYWt3Udd4EI="; + hash = "sha256-d4HbwzgVfuo6n4FD/nl88XeQi/FPRrlq8AIV/eZz9f4="; }; nativeBuildInputs = [ @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; + changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index b27b75e91b..752802df20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -141,6 +141,10 @@ buildPythonPackage rec { "test_default_reload_shutdown_order" # App not found. "test_input_is_dir" + # HTTP 500 with Websocket subprotocols + "test_websocket_route_with_subprotocols" + # Socket closes early + "test_no_exceptions_when_cancel_pending_request" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index 9c82820f84..2affddbb6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.2.6"; + version = "32.0.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VvhgXZpV58DHeY5+7nPbrbTTVuHkawFw5akbm4hPnBY="; + hash = "sha256-suqk7LOnZgSJGlaHq81LDOSCHZWdsJOUbma6MEpHxSM="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix index 1a5f803711..4f2c9cad8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -5,7 +5,7 @@ , withCryptography ? true, cryptography , withVoipSupport ? true, sox , withPlottingSupport ? true, matplotlib -, withGraphicsSupport ? false, pyx, texlive, graphviz, imagemagick +, withGraphicsSupport ? false, pyx, texliveBasic, graphviz, imagemagick , withManufDb ? false, wireshark , libpcap # 2D/3D graphics and graphs TODO: VPython @@ -48,7 +48,7 @@ buildPythonPackage rec { ++ lib.optional withCryptography cryptography ++ lib.optional withVoipSupport sox ++ lib.optional withPlottingSupport matplotlib - ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-basic graphviz imagemagick ]; + ++ lib.optionals withGraphicsSupport [ pyx texliveBasic graphviz imagemagick ]; # Running the tests seems too complicated: doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schemainspect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schemainspect/default.nix new file mode 100644 index 0000000000..e2c375b11b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/schemainspect/default.nix @@ -0,0 +1,118 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +, sqlalchemy +, sqlbag +, setuptools +, poetry-core +, pytestCheckHook +, pytest-xdist +, pytest-sugar +, postgresql +, postgresqlTestHook +, +}: +buildPythonPackage rec { + pname = "schemainspect"; + version = "3.1.1663587362"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + # no tags on github, version patch number is unix time. + rev = "066262d6fb4668f874925305a0b7dbb3ac866882"; + hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk="; + }; + + patches = [ + # https://github.com/djrobstep/schemainspect/pull/87 + (fetchpatch + { + name = "specify_poetry.patch"; + url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch"; + hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + setuptools # needed for 'pkg_resources' + sqlalchemy + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-sugar + + postgresql + postgresqlTestHook + + sqlbag + ]; + + preCheck = '' + export PGUSER="nixbld"; + export postgresqlEnableTCP=1; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # Related issue: https://github.com/djrobstep/schemainspect/issues/88 + "test_can_replace" + "test_collations" + "test_constraints" + "test_dep_order" + "test_enum_deps" + "test_exclusion_constraint" + "test_fk_col_order" + "test_fk_info" + "test_generated_columns" + "test_identity_columns" + "test_indexes" + "test_inherit" + "test_kinds" + "test_lineendings" + "test_long_identifiers" + "test_partitions" + "test_postgres_inspect" + "test_postgres_inspect_excludeschema" + "test_postgres_inspect_sigleschema" + "test_raw_connection" + "test_relationship" + "test_replica_trigger" + "test_rls" + "test_separate_validate" + "test_sequences" + "test_table_dependency_order" + "test_types_and_domains" + "test_view_trigger" + "test_weird_names" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + pythonImportsCheck = [ + "schemainspect" + ]; + + postUnpack = '' + # this dir is used to bump the version number, having it here fails the build + rm -r ./source/deploy + ''; + + meta = with lib; { + description = "Schema inspection for PostgreSQL, and potentially others"; + homepage = "https://github.com/djrobstep/schemainspect"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index 2c4920cf4c..a1b355f1b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "0.5.8"; + version = "0.5.9"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1VqDw+XyyhEydE4UCSM/th2a8MWpXet7KR5uNAcSuGs="; + hash = "sha256-euBE3IvuIxkAJIrcOoZZB352FA1WrJ9CvQH7eYEBSRA="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix index 7cf4f99439..bea510faa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-pCqVAps0tc+JKFU0LZuURcd0y3l/yyTI/EwvtCsY38o="; + hash = "sha256-xtrVpRJ7Kr+qI8uR0jrCEFn9d83fcSKzP9B3kQJNz78="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0cddf6eee2..520c835750 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.31"; + version = "0.4.34"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/CUBRRezm84yAqnEVAC89vKIpALnvSkoSKBCmX84S0w="; + hash = "sha256-kHpJXqFQI3vtDJIcH2ebzbaReHecwItDh73/NcoPk9A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index 2cb24d76b2..a9393cb487 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -1,6 +1,6 @@ { lib -, fetchPypi , buildPythonPackage +, fetchFromGitHub , cython , gfortran , git @@ -14,13 +14,14 @@ buildPythonPackage rec { pname = "scikit-misc"; - version = "0.2.0"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; - src = fetchPypi { - pname = "scikit_misc"; - inherit version; - hash = "sha256-rBTdTpNeRC/DSrHFg7ZhHUYD0G9IgoqFx+A+LCxYK7w="; + src = fetchFromGitHub { + owner = "has2k1"; + repo = "scikit-misc"; + rev = "refs/tags/v${version}"; + hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix index 6940859b9f..a2cf6d82a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-rf/default.nix @@ -27,12 +27,13 @@ , setuptools , pytestCheckHook , pytest-cov +, pytest-mock }: buildPythonPackage rec { pname = "scikit-rf"; - version = "0.28.0"; - format = "pyproject"; + version = "0.29.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cTvWNfIs2bAOYpXDg6ghZA4tRXlaNbUZwcaZMjCi/YY="; + hash = "sha256-sLE6rcBGUKmk5y7oO06rHON3GVIjcvnKlr6Tgddj64Y="; }; buildInputs = [ @@ -88,6 +89,7 @@ buildPythonPackage rec { coverage flake8 pytest-cov + pytest-mock nbval matplotlib pyvisa @@ -99,6 +101,12 @@ buildPythonPackage rec { pytestCheckHook ]; + # test_calibration.py generates a divide by zero error on darwin + # https://github.com/scikit-rf/scikit-rf/issues/972 + disabledTestPaths = + lib.optional (stdenv.isAarch64 && stdenv.isDarwin) + "skrf/calibration/tests/test_calibration.py"; + pythonImportsCheck = [ "skrf" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix index 7e2b8bf8bf..9a766cedec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.20.0"; - format = "setuptools"; + version = "0.22.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-24+8Sociq6u3KnoGSdV5Od5t/OT1uPkv19i3p5ezLjw="; + hash = "sha256-Ft0Hg5iF9Sb9VSOsFMgfAvc4Nsam216kzt5Xv2iykv8="; }; nativeBuildInputs = [ @@ -45,6 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + # treat numpy versions as lower bounds, same as setuptools build + postPatch = '' + sed -i 's/numpy==/numpy>=/' pyproject.toml + ''; + # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 preCheck = '' @@ -63,10 +68,13 @@ buildPythonPackage rec { "test_pandas_inputs" "test_survival_svm" "test_tree" - ]; + ] ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) + # floating point mismatch on aarch64 + # 27079905.88052468 to far from 27079905.880496684 + "test_coxnet" + ; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Survival analysis built on top of scikit-learn"; homepage = "https://github.com/sebp/scikit-survival"; license = licenses.gpl3Only; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 7312e53ed4..2c5ecd4258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -32,8 +32,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.2"; - srcHash = "sha256-7FE740/yKUXtujVX60fQB/xvCZFfV69FRihvSi6+UWo="; + version = "1.11.3"; + srcHash = "sha256-swxRfFjTcKjKQv6GFdWNR6IKhdJQYhZSR7UWLtcnrXw="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -79,8 +79,9 @@ in buildPythonPackage { # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ + --replace 'meson-python>=0.12.1,<0.14.0' 'meson-python' \ --replace 'numpy==' 'numpy>=' \ - --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" \ + --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ --replace 'wheel<0.41.0' 'wheel' ''; @@ -214,6 +215,7 @@ in buildPythonPackage { meta = with lib; { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; + downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh doronbehar ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index 88ffa39d7b..fb650d2d95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.3.1"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/ZELaJrGgNKzAXi1SXAMgxi84R0UvZBD9AUVO7PTEbA="; + hash = "sha256-ZK3M689vv3Kr2OoNdxaCs9Spo6h6xJmhTsPajKHYtkA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix index 5a858e2232..f1f6716c91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scooby"; - version = "0.7.4"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "banesullivan"; repo = "scooby"; rev = "refs/tags/v${version}"; - hash = "sha256-BgQwsgAYtRgxxjo7NHbgNME1maoZQpocGGBW7Vddr+o="; + hash = "sha256-x6GPRo0OuXJtN41urviY0joZKzq0SQjUdRBpIylgcXY="; }; nativeBuildInputs = [ @@ -54,6 +54,8 @@ buildPythonPackage rec { "test_tracking" "test_import_os_error" "test_import_time" + # TypeError: expected str, bytes or os.PathLike object, not list + "test_cli" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 7bfa428efa..88ecd6f2be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -14,6 +14,7 @@ , lxml , packaging , parsel +, pexpect , protego , pydispatcher , pyopenssl @@ -42,6 +43,18 @@ buildPythonPackage rec { hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU="; }; + patches = [ + # Fix compatiblity with Twisted>=23.8. Remove with the next release. + (fetchpatch { + url = "https://github.com/scrapy/scrapy/commit/aa95ada42cdf570f840f55c463375f8a81b303f8.patch"; + hash = "sha256-LuhA5BqtjSUgkotplvUCtvGNYOTrl0MJRCXiSBMDFzY="; + excludes = [ + "tests/CrawlerProcess/sleeping.py" + "tests/test_crawler.py" + ]; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; @@ -69,6 +82,7 @@ buildPythonPackage rec { botocore glibcLocales jmespath + pexpect pytestCheckHook sybil testfixtures @@ -101,6 +115,8 @@ buildPythonPackage rec { "test_persist" "test_timeout_download_from_spider_nodata_rcvd" "test_timeout_download_from_spider_server_hangs" + "test_unbounded_response" + "CookiesMiddlewareTest" # Depends on uvloop "test_asyncio_enabled_reactor_different_loop" "test_asyncio_enabled_reactor_same_loop" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index fef2b05f9e..73564d11e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.9.1"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bBdOaAr9VH7UeY/UdeKS9oOevJwW2HChJiTGCNbbikM="; + hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index 267b6065ed..fef58d973c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchpatch -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , pytest-xdist @@ -11,38 +10,23 @@ , pandas , pythonOlder , scipy +, statsmodels }: buildPythonPackage rec { pname = "seaborn"; - version = "0.12.2"; + version = "0.13.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk="; + src = fetchFromGitHub { + owner = "mwaskom"; + repo = "seaborn"; + rev = "refs/tags/v${version}"; + hash = "sha256-RbtBNKTjUHdCFe1V7IvACgbSNIPhVFMYmtE34GKVIzs="; }; - patches = [ - (fetchpatch { - name = "fix-test-using-matplotlib-3.7.patch"; - url = "https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd.patch"; - hash = "sha256-LbieI0GeC/0NpFVxV/NRQweFjP/lj/TR2D/SLMPYqJg="; - }) - (fetchpatch { - name = "fix-pandas-deprecation.patch"; - url = "https://github.com/mwaskom/seaborn/commit/a48601d6bbf8381f9435be48624f1a77d6fbfced.patch"; - hash = "sha256-LuN8jn6Jo9Fvdl5iGZ2LgINYujSDvvs+hSclnadV1F4="; - }) - (fetchpatch { - name = "fix-tests-using-numpy-1.25.patch"; - url = "https://github.com/mwaskom/seaborn/commit/b6737d5aec9a91bb8840cdda896a7970e1830d56.patch"; - hash = "sha256-Xj82yyB5Vy2xKRl0ideDmJ5Zr4Xc+8cEHU/liVwMSvE="; - }) - ]; - nativeBuildInputs = [ flit-core ]; @@ -51,9 +35,15 @@ buildPythonPackage rec { matplotlib numpy pandas - scipy ]; + passthru.optional-dependencies = { + stats = [ + scipy + statsmodels + ]; + }; + nativeCheckInputs = [ pytest-xdist pytestCheckHook @@ -62,10 +52,6 @@ buildPythonPackage rec { disabledTests = [ # requires internet connection "test_load_dataset_string_error" - - # per https://github.com/mwaskom/seaborn/issues/3431, we can enable this - # once matplotlib releases version > 3.7.2 - "test_share_xy" ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" @@ -82,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Statistical data visualization"; homepage = "https://seaborn.pydata.org/"; + changelog = "https://github.com/mwaskom/seaborn/blob/master/doc/whatsnew/${src.rev}.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seasonal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seasonal/default.nix index 6e527407fc..d38559ff2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seasonal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seasonal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; pyproject = true; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "welch"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix index 12aa23e95d..3e7bb08164 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix @@ -1,6 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# tests , pytestCheckHook , pypng , pyzbar @@ -8,24 +13,32 @@ buildPythonPackage rec { pname = "segno"; - version = "1.5.2"; + version = "1.5.3"; + pyproject = true; src = fetchFromGitHub { owner = "heuer"; repo = "segno"; rev = version; - hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; + hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook pypng pyzbar ]; - pythonImportsCheck = [ "segno" ]; + pythonImportsCheck = [ + "segno" + ]; meta = with lib; { + changelog = "https://github.com/heuer/segno/releases/tag/${version}"; description = "QR Code and Micro QR Code encoder"; homepage = "https://github.com/heuer/segno/"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 053b42d90e..086c531089 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -8,12 +8,15 @@ , trio , trio-websocket , urllib3 +, pytest-trio , nixosTests +, stdenv +, python }: buildPythonPackage rec { pname = "selenium"; - version = "4.8.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +26,30 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-YTi6SNtTWuEPlQ3PTeis9osvtnWmZ7SRQbne9fefdco="; + hash = "sha256-cTMCKfFLUlJDbTUQA3Z/pKCE1RQQRMb4K8hKKn9HqvU="; }; - postPatch = '' - substituteInPlace py/selenium/webdriver/firefox/service.py \ - --replace 'DEFAULT_EXECUTABLE_PATH = "geckodriver"' 'DEFAULT_EXECUTABLE_PATH = "${geckodriver}/bin/geckodriver"' - ''; - preConfigure = '' cd py ''; + postInstall = '' + DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ + DST_REMOTE=$DST_PREFIX/remote/ + DST_FF=$DST_PREFIX/firefox + cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE + cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE + cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $DST_PREFIX/common/macos + cp ../common/manager/macos/selenium-manager $DST_PREFIX/common/macos + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $DST_PREFIX/common/linux/ + cp ../common/manager/linux/selenium-manager $DST_PREFIX/common/linux/ + ''; + propagatedBuildInputs = [ certifi trio @@ -44,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-trio ]; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix index 7316256cd8..7802340ced 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.17.1"; + version = "2.18.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zfgkTBdE8UWwk+G3bLBThVjgU+m2QoPf1fzORyznEgs="; + hash = "sha256-wYYSS4lABCbIhmUU3z3Wh0+4zwpEzXl8Kk9gi6LBrbQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index cfa88e6823..b389da6f1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -24,6 +24,7 @@ , pyramid , pyrsistent , pyspark +, pysocks , pytest-forked , pytest-localserver , pytest-watch @@ -40,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.31.0"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-/TQwkk/NkQulYVuLIs30rV4hsv4LVB/VfPhqMjpq0vE="; + hash = "sha256-wV38DW5YfY+f5Qg/I7JPQ5R8TyqqdjwHKfr5XjT2vFA="; }; propagatedBuildInputs = [ @@ -120,6 +121,7 @@ buildPythonPackage rec { mock pure-eval pyrsistent + pysocks pytest-forked pytest-localserver pytest-watch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix new file mode 100644 index 0000000000..fef62dfbfb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, tomli +, wheel +}: + +buildPythonPackage rec { + pname = "setuptools-changelog-shortener"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fschulze"; + repo = "setuptools-changelog-shortener"; + rev = "refs/tags/${version}"; + hash = "sha256-K8oVcX40K5j2CwQnulK55HykkEXAmOiUg4mZPg5T+YI="; + }; + + nativeBuildInputs = [ + setuptools + tomli + wheel + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "setuptools_changelog_shortener" ]; + + meta = with lib; { + description = "Setuptools-changelog-shortener: add only newest changelog entries to long_description"; + homepage = "https://github.com/fschulze/setuptools-changelog-shortener"; + changelog = "https://github.com/fschulze/setuptools-changelog-shortener/blob/${src.rev}/README.rst#changelog"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-generate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-generate/default.nix new file mode 100644 index 0000000000..e4293bd118 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-generate/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-scm +, click +, help2man +, markdown-it-py +, shtab +, tomli +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "setuptools-generate"; + version = "0.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "setuptools-generate"; + rev = "refs/tags/${version}"; + hash = "sha256-xDjxkWy/n0jStI9eLcM6WduyU9vGjtBOmJ86dpXjceQ="; + }; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + help2man + markdown-it-py + shtab + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "setuptools_generate" ]; + + meta = with lib; { + description = "Generate shell completions and man page when building a python package"; + homepage = "https://github.com/Freed-Wu/setuptools-generate"; + changelog = "https://github.com/Freed-Wu/setuptools-generate/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index e71d8bc78d..e1c04780b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -6,25 +6,40 @@ , semantic-version , setuptools , setuptools-scm +, tomli , typing-extensions }: buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yG5zTerDMFl5mL+8CNpFGH5rJ4N+I72R6tsyBzI5ImI="; + hash = "sha256-xxAJmZSCNaOK5+VV/hmapmwlPcOEsSX12FRzv4Hq46M="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ semantic-version setuptools typing-extensions ]; + propagatedBuildInputs = [ + semantic-version + setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + pythonImportsCheck = [ + "setuptools_rust" + ]; doCheck = false; - pythonImportsCheck = [ "setuptools_rust" ]; passthru.tests.pyo3 = callPackage ./pyo3-test { }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-trial/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/setuptools-trial/default.nix index 9304fee0e4..14f666d311 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-trial/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , twisted }: buildPythonPackage rec { pname = "setuptools-trial"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-FCIPj3YcSLoeJSbwhxlQd89U+tcJizgs4iBCLw/1mxI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index ad7638f3cb..93912d4b4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "68.0.0"; + version = "68.2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-Ew/DpI5XsYMB4kBfkFeeB5wv5cjx4oYTddZCWLgBHBs="; + hash = "sha256-PpZbITlYp/cA+8jmObw8g69TK+oE9YEXD3NNJixExB4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix index 242a1c882c..9f6693603e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sgp4"; - version = "2.22"; + version = "2.23"; src = fetchPypi { inherit pname version; - hash = "sha256-F/Ci6q0tygZbbeJcHOqpQP98+ozGcSDLQRGgDxd7hvk="; + hash = "sha256-2K3cU6L7n4je5r/UAdKGWwFMwLV78s7mm97o2WhdVCk="; }; nativeCheckInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index 20e4d95928..46332d0d52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sh"; - version = "2.0.2"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "amoffat"; repo = "sh"; rev = "refs/tags/${version}"; - hash = "sha256-qMYaGNEvv2z47IHFGqb64TRpN3JHycpEmhYhDjrUi6s="; + hash = "sha256-c4Ms4ydcW7LgmAI1WuYD74nzILuY/Xg+JePJe0q5AQQ="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "tests/test.py" + "tests" ]; # A test needs the HOME directory to be different from $TMPDIR. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index c9fb24e917..cc042fcd4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -31,16 +31,16 @@ buildPythonPackage rec { pname = "shap"; - version = "0.42.1"; - format = "pyproject"; + version = "0.43.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-Ezq6WS6QnoM5uEfo2DgDAEo1HkQ1KjmfgIyVWh3RM94="; + hash = "sha256-ylkpXhaLXsQiu6YMC3pUtlicptQmtjITzW+ydinB4ls="; }; nativeBuildInputs = [ @@ -124,9 +124,11 @@ buildPythonPackage rec { disabledTests = [ # The same reason as above test_summary.py - "test_simple_bar_with_cohorts_dict" - "test_random_summary_violin_with_data2" + "test_random_force_plot_negative_sign" + "test_random_force_plot_positive_sign" "test_random_summary_layered_violin_with_data2" + "test_random_summary_violin_with_data2" + "test_simple_bar_with_cohorts_dict" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index b736c17337..593a7b7d82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -5,7 +5,7 @@ , cmake , qt5 , libxcrypt -, llvmPackages +, llvmPackages_15 }: stdenv.mkDerivation { @@ -21,12 +21,12 @@ stdenv.mkDerivation { cd sources/shiboken2 ''; - CLANG_INSTALL_DIR = llvmPackages.libclang.out; + CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake ]; buildInputs = [ - llvmPackages.libclang + llvmPackages_15.libclang python python.pkgs.setuptools qt5.qtbase @@ -45,7 +45,7 @@ stdenv.mkDerivation { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken2 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken2 cp -r shiboken2.egg-info $out/${python.sitePackages}/ rm $out/bin/shiboken_tool.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix index ca227a625b..134bc4ff2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix @@ -61,7 +61,7 @@ stdenv'.mkDerivation rec { postInstall = '' cd ../../.. - ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken6 + ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6 cp -r shiboken6.egg-info $out/${python.sitePackages}/ ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix index 5dea2f5e23..0c4b1afb93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.30.0"; + version = "1.30.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yWF8ZsR7h9SAHnCAtsdp7Jox2jmN7+CwR6Z5SSdDZFM="; + hash = "sha256-vttujCtEWVksG8F7TUtX2rDLWKRVrVie4mpjBCQs1QU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix index ab075702da..bb535e7c10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpful/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , matplotlib @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-1CU/Iz83CKRx7dsOTGfdJm98TUfc2kxCHKIEUXP36HQ="; }; + # patch dated use of private matplotlib interface + # https://github.com/aresio/simpful/issues/22 + postPatch = '' + substituteInPlace simpful/simpful.py \ + --replace \ + "next(ax._get_lines.prop_cycler)['color']" \ + "ax._get_lines.get_next_color()" + ''; + propagatedBuildInputs = [ numpy scipy @@ -46,6 +56,7 @@ buildPythonPackage rec { ]; meta = with lib; { + broken = stdenv.isDarwin; description = "Library for fuzzy logic"; homepage = "https://github.com/aresio/simpful"; changelog = "https://github.com/aresio/simpful/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index 8598f04918..10d5f64385 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -1,49 +1,52 @@ { lib -, fetchFromGitHub , buildPythonPackage -, authlib -, requests -, nose +, cryptography +, fetchFromGitHub +, more-itertools +, pendulum , pyjwt +, pytestCheckHook , pythonOlder , pytz +, requests , responses +, setuptools , zeep }: buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.4"; - format = "setuptools"; + version = "1.12.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "simple-salesforce"; + repo = "simple-salesforce"; rev = "refs/tags/v${version}"; - hash = "sha256-nYL2kSDS6DSrBzAKbg7Wj6boSZ52+T/yX+NYnYQ9rQo="; + hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - authlib + cryptography + more-itertools + pendulum pyjwt requests zeep ]; nativeCheckInputs = [ - nose + pytestCheckHook pytz responses ]; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - pythonImportsCheck = [ "simple_salesforce" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix index 475478826e..5af426fb5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix @@ -24,9 +24,12 @@ buildPythonPackage rec { wheel ]; + propagatedBuildInputs = [ + wsproto + ]; + nativeCheckInputs = [ pytestCheckHook - wsproto ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix index aa8a970364..e07e6e994d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpleitk/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , cmake , swig4 +, elastix , itk , numpy , simpleitk @@ -20,8 +21,17 @@ buildPythonPackage rec { make ''; - nativeBuildInputs = [ cmake swig4 scikit-build ]; - propagatedBuildInputs = [ itk simpleitk numpy ]; + nativeBuildInputs = [ + cmake + swig4 + scikit-build + ]; + propagatedBuildInputs = [ + elastix + itk + simpleitk + numpy + ]; pythonImportsCheck = [ "SimpleITK" ]; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index f495e46386..b136d9e94d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.1"; + version = "3.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LUD0Eoj7fDGiR0yhIZOto6kn7Ud0TXyDTO1UTbRMJiQ="; + hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index c3264d7366..6863d1f1a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,7 +6,6 @@ , buildPythonPackage , docutils , fetchFromGitHub -, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -20,31 +19,18 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "simplisafe-python"; rev = "refs/tags/${version}"; - hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM="; + hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/simplisafe-python/pull/596 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/simplisafe-python/commit/60f41c690fac7acb614490b542cbbf2fa0052266.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; nativeBuildInputs = [ poetry-core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix index 2be43f157a..e1544a0b89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "simpy"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; + sha256 = "sha256-bYrcAinfawL7fibc0TOHA7T09j8WelrCpyE8uAq6RIQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix index 53989afe94..558126bbbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix @@ -8,25 +8,16 @@ buildPythonPackage rec { pname = "single-version"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = pname; - rev = "v${version}"; - hash = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + rev = "refs/tags/v${version}"; + hash = "sha256-dUmJhNCPuq/7WGzFQXLjb8JrQgQn7qyBqzPWaKzD9hc="; }; - patches = [ - # https://github.com/hongquan/single-version/pull/4 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch"; - hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix index 5d6fde555d..f4870f2fa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix @@ -2,22 +2,24 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , wheel , packaging , ply , toml +, tomli }: buildPythonPackage rec { pname = "sip"; - version = "6.7.7"; + version = "6.7.11"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI="; + hash = "sha256-8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk="; }; nativeBuildInputs = [ @@ -25,7 +27,9 @@ buildPythonPackage rec { wheel ]; - propagatedBuildInputs = [ packaging ply toml ]; + propagatedBuildInputs = [ packaging ply toml ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; # There aren't tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix index a77e737075..dbaab8c6df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "siuba"; - version = "0.4.2"; - disabled = pythonOlder "3.7"; - + version = "0.4.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "machow"; repo = "siuba"; rev = "refs/tags/v${version}"; - hash = "sha256-Q2nkK51bmIO2OcBuWu+u7yB8UmaqiZJXpuxXcytTlUY="; + hash = "sha256-rd/yQH3sbZqQAQ1AN44vChe30GMJuIlZj3Ccfv1m3lU="; }; propagatedBuildInputs = [ @@ -45,8 +45,9 @@ buildPythonPackage rec { hypothesis pytestCheckHook ]; - doCheck = false; + # requires running mysql and postgres instances; see docker-compose.yml + doCheck = false; pythonImportsCheck = [ "siuba" @@ -56,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use dplyr-like syntax with pandas and SQL"; homepage = "https://siuba.org"; + changelog = "https://github.com/machow/siuba/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 0fefc6d41f..d12726ec39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.7.4"; + version = "0.8.0.post1"; src = fetchPypi { pname = "skia-pathops"; inherit version; extension = "zip"; - hash = "sha256-Ci/e6Ht62wGMv6bpXvnkKZ7WOwCAvidnejD/77ypE1A="; + hash = "sha256-oFYkneL2H6VRFrnuVVE8aja4eK7gDJFFDkBNFgZIXLs="; }; postPatch = '' @@ -36,6 +36,14 @@ buildPythonPackage rec { --replace "-mthumb" "" substituteInPlace src/cpp/skia-builder/skia/src/core/SkOpts.cpp \ --replace "defined(SK_CPU_ARM64)" "0" + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) /* old compiler? */ '' + patch -p1 <(SIZE_MAX / sizeof(T), (size_t)INT_MAX)); + EOF ''; nativeBuildInputs = [ cython ninja setuptools-scm ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index 989dfbc8ee..ab64765f30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -4,16 +4,16 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, flit-core , lxml , pyjwt , pythonOlder -, setuptools-scm }: buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.7"; - format = "setuptools"; + version = "1.3.8"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,13 +21,17 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8="; + hash = "sha256-Isnji6hXkTuTmbMpSuim9uG5ECSDX6A8QZ13sTCU9t0="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + # https://github.com/skodaconnect/skodaconnect/pull/103 + substituteInPlace pyproject.toml \ + --replace "Bug Tracker" '"Bug Tracker"' + ''; nativeBuildInputs = [ - setuptools-scm + flit-core ]; propagatedBuildInputs = [ @@ -38,13 +42,6 @@ buildPythonPackage rec { pyjwt ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest>=5,<6'," "" - substituteInPlace requirements.txt \ - --replace "pytest-asyncio" "" - ''; - # Project has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix index 266fb65bf2..417c1c1fe3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder -, pytestCheckHook +, setuptools , gym , gymnasium , torch @@ -11,30 +10,23 @@ , tqdm , wandb , packaging +, pytestCheckHook }: buildPythonPackage rec { pname = "skrl"; - version = "0.10.2"; - format = "setuptools"; - + version = "1.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Toni-SM"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OY5+bUPg+G1eKFMvHlXSHwc2WWHTpyoyCKjY3MvlLyM="; + hash = "sha256-89OoJanmaB74SLF1qMI8WFBdN1czS7Yr7BmojaRdo4M="; }; - patches = [ - # remove after next release: - (fetchpatch { - name = "fix-python_requires-specification"; - url = "https://github.com/Toni-SM/skrl/pull/62/commits/9b554adfe2da6cd97cccbbcd418a349cc8f1de80.patch"; - hash = "sha256-GeASMU1Pgy8U1zaIAVroBDjYaY+n93XP5uFyP4U9lok="; - }) - ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ gym 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 58372e493a..66c1a734c8 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 @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.23.0"; + version = "3.23.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk="; + hash = "sha256-lqB4eljM/JLyvVHeT7LnYgjG3AP3i9le2IxUI31aK6o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index be0e061bdc..f613645b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.6"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-c6H7t+aPPWn1i/30G9DLOmwHhdHHHbcP3FRVVjk1XR4="; + hash = "sha256-lyjHubnYIwGiA6uAt9erKlTr2sCRGHQy/ZkNByFrFgM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix new file mode 100644 index 0000000000..d52ac84dad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "slpp"; + version = "1.2.3"; + pyproject = true; + + src = fetchPypi { + pname = "SLPP"; + inherit version; + hash = "sha256-If3ZMoNICQxxpdMnc+juaKq4rX7MMi9eDMAQEUy1Scg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "slpp" + ]; + + meta = with lib; { + description = "Simple lua-python parser"; + homepage = "https://github.com/SirAnthony/slpp"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index e0d7757d0b..df0cbdc8a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -11,11 +11,12 @@ , moto , paramiko , pytestCheckHook +, responses }: buildPythonPackage rec { pname = "smart-open"; - version = "6.3.0"; + version = "6.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,30 +25,52 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "refs/tags/v${version}"; - hash = "sha256-sVKrCph5M7xsE7gtzsP/eVEbZyFfoucW3p30YYpwVFI="; + hash = "sha256-fciNaVw603FAcgrSrND+LEycJffmnFQij2ZpatYZ/e4="; }; - propagatedBuildInputs = [ - azure-common - azure-core - azure-storage-blob - boto3 - google-cloud-storage - requests + passthru.optional-dependencies = { + s3 = [ + boto3 + ]; + gcs = [ + google-cloud-storage + ]; + azure = [ + azure-storage-blob + azure-common + azure-core + ]; + http = [ + requests + ]; + webhdfs = [ + requests + ]; + ssh = [ + paramiko + ]; + }; + + pythonImportsCheck = [ + "smart_open" ]; nativeCheckInputs = [ moto - paramiko pytestCheckHook - ]; + responses + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "smart_open" ]; - pythonImportsCheck = [ - "smart_open" + disabledTests = [ + # https://github.com/RaRe-Technologies/smart_open/issues/784 + "test_https_seek_forward" + "test_seek_from_current" + "test_seek_from_end" + "test_seek_from_start" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix index 92e14af59f..a991532fa9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-smpplib/python-smpplib"; changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 35d7a877fe..9701824a4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.36.1"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU="; + hash = "sha256-ViNsmTq1iLxNujA71b9JZB5AZ79ZbiqdTyDeBGd4gUA="; }; propagatedBuildInputs = [ 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 741ef59f26..fc3974db13 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 @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z2oNyhbefBIJAKoaX85kQIM7CmD3ZoK3zPFmeWcoLKM="; + hash = "sha256-u2ZyK9ZKvNdqarBqZCPWdLy3Kfm6ORBWl375Lzg6rbg="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 8f1f2cb954..41f7c2e10c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.6"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xkx8QlabOCodqj4tRYxpln0z+HHVwYdqlXkaitzmKx8="; + hash = "sha256-PtD3fQnIqd79NcYFdDMlpNwhCY6PHGL/wDR/QnKdsFo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix index ea35dfed1b..a8fd2503db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub, social-auth-core, django, python }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, social-auth-core +, django +, python +, pythonOlder +}: buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.3.0"; + version = "5.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; rev = "refs/tags/${version}"; - hash = "sha256-YJsE8YfLaUsBjwehheic6YG+6robWeBzKL3T7V0c8E8="; + hash = "sha256-CZF1DA4UUnmGfdmWlBJ0zJIYx1E03a7Z7Y6WJNFU68M="; }; propagatedBuildInputs = [ social-auth-core ]; - pythonImportsCheck = [ "social_django" ]; + pythonImportsCheck = [ + "social_django" + ]; nativeCheckInputs = [ django @@ -26,8 +38,9 @@ buildPythonPackage rec { ''; meta = with lib; { + description = "Module for social authentication/registration mechanism"; homepage = "https://github.com/python-social-auth/social-app-django"; - description = "Python Social Auth - Application - Django"; + changelog = "https://github.com/python-social-auth/social-app-django/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ n0emis ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix index 509505b270..2c163aa7b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/socid-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "socid-extractor"; - version = "0.0.25"; + version = "0.0.26"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "soxoj"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3aqtuaecqtUcKLp+LRUct5aZb9mP0cE9xH91xWqtb1Q="; + hash = "sha256-3ht/wlxB40k4n0DTBGAvAl7yPiUIZqAe+ECbtkyMTzk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix index 767d91b122..28c24f533d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.9"; + version = "6.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-mYezVJSBtZuNT6mG544dJhRFh26M4nN4nE3tUVB3cZQ="; + hash = "sha256-0NLa+kEArKqfqytnxbzXnX/OVhYFBKZO9odXGR0AoSA="; }; postPatch = '' @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; - changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index 98f98741a9..0c953e20c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, setuptools , regex }: buildPythonPackage rec { pname = "somajo"; - version = "2.2.4"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM="; + hash = "sha256-3A2et4pl92LsRtEx2Ki8Soz3n1nZEGQGPc3ZIBDojNM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sorl-thumbnail/default.nix similarity index 50% rename from third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/sorl-thumbnail/default.nix index dedd7864f2..2337d6b940 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sorl-thumbnail/default.nix @@ -1,28 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, setuptools , setuptools-scm +, django }: buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.9.0"; - disabled = isPy27; + version = "12.10.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM="; + hash = "sha256-3pWkkhf9/s7SIvo86qAdMS7i+KrVa6NNbHDy3umoSTg="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + buildInputs = [ + django + ]; + + env.DJANGO_SETTINGS_MODULE = "sorl.thumbnail.conf.defaults"; + # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; + pythonImportsCheck = [ + "sorl.thumbnail" + ]; + meta = with lib; { homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/"; description = "Thumbnails for Django"; + changelog = "https://github.com/jazzband/sorl-thumbnail/blob/${version}/CHANGES.rst"; license = licenses.bsd3; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index e26a04192f..1ae1cb7b8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.4"; + version = "2.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4o26nKbHwAFz405LpXRI8GiLtoG3xei/SXHar8CT1po="; + hash = "sha256-VmPVp7O/ru4LxDcuf8SPnP9JQLPuxUpkUcxSmfEJdpA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix index 20532f4c00..941b6e596a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8="; + hash = "sha256-H2sueQq32o/9EHENANKVoiWlFoSF88P0LZ7DfEh/Esg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix index ff6e0eff1f..9bcb74a242 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix @@ -2,7 +2,6 @@ , stdenv , cargo , fetchPypi -, fetchpatch , buildPythonPackage , isPy3k , rustPlatform @@ -13,19 +12,19 @@ buildPythonPackage rec { pname = "spacy-alignments"; - version = "0.8.4"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s="; + hash = "sha256-jcNYghWR9Xbu97/hAYe8ewa5oMQ4ofNGFwY4cY7/EmM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg="; + hash = "sha256-I5uI+qFyb4/ArpUZi4yS/E/bmwoW7+CalMq02Gnm9S8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix index db50edc66a..475a9c6540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.5"; + version = "1.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+VIQXcffodzR6QEr2ZfvEIBGIxqKwsNZotI+Eh0EOIw="; + hash = "sha256-Q8oV0mw8POFscFcdsYZfTkavNVQyqWdLAdb4lDX4ahM="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "spacy" "transformers" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index a3cf5a63cf..ccbfef1568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -29,6 +29,7 @@ , typer , typing-extensions , wasabi +, weasel , writeScript , nix , git @@ -37,14 +38,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.5.4"; - format = "setuptools"; + version = "3.7.2"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mpwWfp3Ov++sx12sNKjnK+y+NI60W78GpsBSOuBaxCU="; + hash = "sha256-zt9JJ78NP+x3OmzkjV0skb2wL+08fV7Ae9uHPxEm8aA="; }; pythonRelaxDeps = [ @@ -77,11 +78,14 @@ buildPythonPackage rec { tqdm typer wasabi + weasel ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; postPatch = '' + ]; + + postPatch = '' substituteInPlace setup.cfg \ - --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" + --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix index 7d440706ac..70469761ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/lookups-data.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, pythonOlder +, fetchFromGitHub , spacy , pytestCheckHook }: @@ -11,10 +11,13 @@ buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - src = fetchPypi { - pname = "spacy_lookups_data"; - inherit version; - hash = "sha256-b5NcgfFFvcyE/GEV9kh2QoXH/z6P8kYpUEaBTpba1jw="; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "spacy-lookups-data"; + rev = "refs/tags/v${version}"; + hash = "sha256-6sKZ+GgCjLWYnV96nub4xEUFh1qpPQpbnoxyOVrvcD0="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json index 8c6987d95d..7f25c4281c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/models.json @@ -1,458 +1,506 @@ [ { "pname": "ca_core_news_lg", - "version": "3.5.0", - "sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08", + "version": "3.7.0", + "sha256": "1hlrbrgiahj6jkap3hrhki6zk10wg7dpajxcp540darprl7w60vy", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.5.0", - "sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq", + "version": "3.7.0", + "sha256": "0ygygvw8bs510dyz4k9sfmxxlqssmv566aac9k3xiip3k5lfgysi", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.5.0", - "sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k", + "version": "3.7.0", + "sha256": "1cj53w9vzdb2xqjpprkhgrglm70g0vaw0308jxnd7nvgn6vfx09s", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.5.0", - "sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8", + "version": "3.7.0", + "sha256": "1il0ak0wh4dlxxdddwz8a2vr6817cn5fwrflxwgcd25njx7w886g", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.5.0", - "sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh", + "version": "3.7.0", + "sha256": "04bm53v7dpdlnlk39wppfir792jp2qq9kkw0zs9i0ki68sxh8giz", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.5.0", - "sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id", + "version": "3.7.0", + "sha256": "1c35avbhkx16icnqsp571nvilcra143kqjvnszd7j0xnnzn5iqyx", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.5.0", - "sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc", + "version": "3.7.0", + "sha256": "1hlx9zgixv91x4xa489gnwm3qdghffk4fimg7mjncyjw1g9xskif", "license": "cc-by-sa-40" }, { "pname": "da_core_news_trf", - "version": "3.5.0", - "sha256": "0b8mxr1ajyw8ccm0khmcp4n3jcxl4syfrmiy9kzf3cp4hcrnqnxy", + "version": "3.7.0", + "sha256": "02hbg58ql1dcd7zdlgb959106inaqnvxphc2dmxf7myjr4si3w37", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.5.0", - "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", + "version": "3.7.0", + "sha256": "1aag695nygpbxrvvknlcic79hyfzdwcc2d9vjgzq2bc43zdf05a0", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.5.0", - "sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym", + "version": "3.7.0", + "sha256": "1qnq7yy38nw1pg8ysxjqyxd82yc3ncl148p90hil2njxg771g1hk", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.5.0", - "sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp", + "version": "3.7.0", + "sha256": "0r0wgf044r0nl267m5dc3zp4cq5ml4b9i6gpkas1hhn708d5sjb1", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.5.0", - "sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn", + "version": "3.7.0", + "sha256": "05xca8gjpmn7dlj8jb93rv7r0s4wa3nq5h7rkmq6d7h7gy6zpz8f", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.5.0", - "sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj", + "version": "3.7.0", + "sha256": "0n7xk8kbqqis1fivsgvyfmhd6qj853wylrwjl9q352cvbv8zg6dk", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.5.0", - "sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds", + "version": "3.7.0", + "sha256": "042vmymi40zgwxg87sfsvq7b9crigh6g9ai7cyz49spcqmvq2qd3", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.5.0", - "sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d", + "version": "3.7.0", + "sha256": "0apky61l3gh2dvfpqaj6vqql5g6sh4bp9i91y7zfgacqvf7jp67g", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.5.0", - "sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9", + "version": "3.7.0", + "sha256": "192mhp5niixq0crqwwmp70g63wbahgr41dpmmjsdqf9189s7qswr", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.5.0", - "sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg", + "version": "3.7.0", + "sha256": "1wy2kpsninpxwjbqavh963i12041a0av4wmrn8plvb73czp995dg", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.5.0", - "sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3", + "version": "3.7.0", + "sha256": "01hps9i3v73prqfjrch0da0s38vhbvx0d73g3x1bkrmavan26bj7", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.5.0", - "sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c", + "version": "3.7.0", + "sha256": "1pnm63bk5k6g6kc5s8v5pwdahqgbh3rlm5mxq3gxk8my3cfkklpc", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.5.0", - "sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx", + "version": "3.7.0", + "sha256": "1qfadw61yjz1hkp5wldg5ncj50db0b3wvpcfklybij56r4ibz6f2", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.5.0", - "sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3", + "version": "3.7.0", + "sha256": "1z9m6f2c3cbjrljdlywdd4c4qj4lky1rb3n20yav5zb9k7jbj3s4", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.5.0", - "sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a", + "version": "3.7.0", + "sha256": "07fm2bmiwkkia4v491dzkgb3dbp1qfh4j7iba2h4wv8yci6la3n4", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.5.0", - "sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12", + "version": "3.7.0", + "sha256": "1n5sk5jlj6gx4w2ka1ia93bmi4nm2cyfg7fbca2kvmsg6zw8hq27", "license": "gpl3" }, { "pname": "fi_core_news_lg", - "version": "3.5.0", - "sha256": "0j3r01a0yqgj8apfjv1wkblhqg86yp2nzxv51nf99pi2nmh81jzx", + "version": "3.7.0", + "sha256": "08lk2dgwm99nj2a355s682ar4xwg1av4z3r6qpwq72rkm2h8jkmm", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_md", - "version": "3.5.0", - "sha256": "09qfzwyw6wfdmw1bgd1kfg1gdbmzal5z1r240djivxygzn6f1ixs", + "version": "3.7.0", + "sha256": "07hqjw6w8332zf3ki5pbrv7m1kc4y6j3f0czharvv0grr2sfvh84", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_sm", - "version": "3.5.0", - "sha256": "1ly71cacy0gr62acvc3vl8dxh2czd6zkm7ijprisdblw17ik9yln", + "version": "3.7.0", + "sha256": "03bhh3z3r70km19p3x202g66hikfyh309hgb96sycb8lhfr737lk", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_lg", - "version": "3.5.0", - "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", + "version": "3.7.0", + "sha256": "02dv00w67alc1avwq93hara49va7mnsmmm2kww961p5a3k3ldz20", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.5.0", - "sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl", + "version": "3.7.0", + "sha256": "184gxwgf980x3vsn45zycd3cr1mkl3r1vbf3hb5hrhs8xk3y1v34", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.5.0", - "sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm", + "version": "3.7.0", + "sha256": "1ifbazd9hs1fhy22hjqhwkq0bnnsr3km3ff60v8arkyq5vlprhdb", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.5.0", - "sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2", + "version": "3.7.0", + "sha256": "0shhlmyyd79bbvxf6dfr5r99lfhjcywvvrji67k2hxz4604q8bxv", "license": "lgpllr" }, { "pname": "hr_core_news_lg", - "version": "3.5.0", - "sha256": "1fvkzfi539fmp6jy3hjcrwvdxw5k6zc3h351s887xidlw3gs1kr3", + "version": "3.7.0", + "sha256": "1r8cdyawf6fdvx1xn1l470mx31lbx5cjpivlx1pvv9ckp71zp28z", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_md", - "version": "3.5.0", - "sha256": "1mi6k9qjxbigrl2fa60blyyz8b54jda5hc1s96vn9rykg4rni8cr", + "version": "3.7.0", + "sha256": "1dzi6dxwjpbddc0rjqajj4k1c61sacyycwnjvy03h3aclxacqn53", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_sm", - "version": "3.5.0", - "sha256": "1s22mx7y5h135ry5l49az30l7mw7fdrz53s4a9gaxfsp9rzs474g", + "version": "3.7.0", + "sha256": "0dmhv1fa46hi78jgv562v4x3mfl7svchs6kiz35s63ph9ik5r6f2", "license": "cc-by-sa-40" }, + { + "pname": "ja_core_news_lg", + "version": "3.7.0", + "sha256": "1nb77kivzy0wixsw8ijmw78fffkpqa63kykqph04jzmh75ra4wvg", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_md", + "version": "3.7.0", + "sha256": "0p22bwc24q76cl7ndszvhqgllvq3ws3i3vbjsp5xvhxxls6p49x9", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_sm", + "version": "3.7.0", + "sha256": "0bfvkds4dqynjshk2lxfya9yfcnbvwjfhc6n7yh0852ms1ycicaw", + "license": "cc-by-sa-40" + }, + { + "pname": "ja_core_news_trf", + "version": "3.7.0", + "sha256": "0n2lqql4flnilgf671n5mcdp8vi5pdjfz3vymxsapc1gyp29jykk", + "license": "cc-by-sa-30" + }, { "pname": "it_core_news_lg", - "version": "3.5.0", - "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", + "version": "3.7.0", + "sha256": "0gwn6pf0rzbplahs2wnzp6379mmj066dqhijhq4ln4552fz4d1yx", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.5.0", - "sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz", + "version": "3.7.0", + "sha256": "003w99glj5jgb6gfqygb4c5jljhc85ck6yqn49h9m8fa9vmaylhx", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.5.0", - "sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip", + "version": "3.7.0", + "sha256": "0kng2w5xj1irz6c5d6vl4px9my1z41h8zfvf9b01rh9yvjmhfyzc", "license": "cc-by-nc-sa-30" }, { "pname": "ko_core_news_lg", - "version": "3.5.0", - "sha256": "1q314wb114ynkf455cm8jd9jsx3yb6y0rrgf820ww31jlk5jzaa9", + "version": "3.7.0", + "sha256": "0hxwkb1w58vb4g1162ry12a63hnj20q20n66xnlvc0r96ibj4fia", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_md", - "version": "3.5.0", - "sha256": "0dy7kk4bvjl944vv2m4hcvppar7clwq28y2rk40i3022jbqh2nxq", + "version": "3.7.0", + "sha256": "1ai7cyk58c7rj0dy82l01w5r4fkp2cpnhcsarzas1ml0icnk1srm", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_sm", - "version": "3.5.0", - "sha256": "1i5q8dpyfa2sy80hr81r6s9dqpawp36ni8slz035b0wd9sq3i73v", + "version": "3.7.0", + "sha256": "16m1lsikf8ghsazpdprd9fc4n3m8an9qzjbyjwyvwkr0f2p0nmph", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_lg", - "version": "3.5.0", - "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", + "version": "3.7.0", + "sha256": "174p8i2lnwq324qcs85s3c0j7iyav12yk0i896l23khg9gyzkmlg", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.5.0", - "sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j", + "version": "3.7.0", + "sha256": "1117sij5w4s297q5j6h210hafh2amm6pd9m9m7m3608rfwsvm9g8", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.5.0", - "sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0", + "version": "3.7.0", + "sha256": "1j04apdc63c2b2namic4blhm9mk8inmr8ynid09mncljwskg0fjb", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.5.0", - "sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p", + "version": "3.7.0", + "sha256": "0fshypj08hvcbbqjfxkzyfs72p5rm5fw1pfclgln2y0whfap0lqx", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.5.0", - "sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76", + "version": "3.7.0", + "sha256": "1il8pzfk2nd09hd8kmk5znf66ir4bsrp1ax7jaxghi76ggrbpzyx", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.5.0", - "sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3", + "version": "3.7.0", + "sha256": "1805hkkm3hjbzw8pg6q08p61bpjk5h13ldzpik0gb9wqw9f69dbp", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.5.0", - "sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz", + "version": "3.7.0", + "sha256": "1zqwp8a8d26mi94dkib5ahhkr9hawxx4vag4fhibfa6m0prpzh9h", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.5.0", - "sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj", + "version": "3.7.0", + "sha256": "1ilxscc6hnmiby7ip7kgx3aih9msqmg21iqakkwny3z1lnnly466", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.5.0", - "sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz", + "version": "3.7.0", + "sha256": "1wrchw1rhlzrji5j46lpwzydiaxcywaglz0nvm4vk1np45r7l3dm", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.5.0", - "sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys", + "version": "3.7.0", + "sha256": "1777sdmjcc7lnj0j26zf00ab7pr09v1220k47fq724cw9l0knin1", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.5.0", - "sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx", + "version": "3.7.0", + "sha256": "19g6hzljz0zi1fppl7c3w8gdak42af3f7z45cg12qyw7vnjl9988", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.5.0", - "sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482", + "version": "3.7.0", + "sha256": "0gcbb0vs5snif4j5a7z9ha2sj9jby0hnxbp0w5h73yxyg37fk8d4", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.5.0", - "sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd", + "version": "3.7.0", + "sha256": "0glpd8lv7gwq3bryx32q84ny6pdvwrjm7lhxg9h2cdjrair8vx94", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.5.0", - "sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv", + "version": "3.7.0", + "sha256": "04qwfh3dam7advyysdcdak7vna5gvirns001zq09kxhj766bc2k9", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.5.0", - "sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7", + "version": "3.7.0", + "sha256": "00wygnwjpvfgiccb643720691pxhcb4pnk3zjj35hv9gbbx6qb8c", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.5.0", - "sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw", + "version": "3.7.0", + "sha256": "1im0hgr6wd4sfsfb0ddnl2ad9pi1vs0vvr7rq3g14vda3x2f1rxy", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.5.0", - "sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69", + "version": "3.7.0", + "sha256": "0zpgxg3ass084qv4bvk9wz15ya92w6a7d2p9p24g49a530b8gd7y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.5.0", - "sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg", + "version": "3.7.0", + "sha256": "0z64w8599xwjvxdmrdlr08yyk4a5174m4a39m3zivgib0b5jyvdq", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.5.0", - "sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7", + "version": "3.7.0", + "sha256": "1y45xhdjlhf8026vlsdrxvmiwj8p9hzlpdg628kdcdzmcrr23l5j", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.5.0", - "sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b", + "version": "3.7.0", + "sha256": "0jw71lav2fim48ff34mf137dsnn3arac555b9rf4flamiy8xg7y6", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.5.0", - "sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8", + "version": "3.7.0", + "sha256": "0r35hxm6dgk2fnwl79ss25g6lfkgrd1h24zf96ys2p3cppp2i167", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.5.0", - "sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76", + "version": "3.7.0", + "sha256": "02qnl0cfvx0m0icdbpn9zfsv39sp9k6sfdarzazhz7xnxzxib93q", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.5.0", - "sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x", + "version": "3.7.0", + "sha256": "187lkkm04x1ylg3jzyhf9avzpj2jkb48n86i36hqi6iqdv6yhfd5", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.5.0", - "sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn", + "version": "3.7.0", + "sha256": "11mh1rd0q024xfagdqkly1n4nndksrlq650n51jl1x1pmzlsdgzl", "license": "mit" }, + { + "pname": "sl_core_news_lg", + "version": "3.7.0", + "sha256": "128ayhp21szc31ckiq3i8vib42i9xnz4lpi1709gjdc38cpmpnlp", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_md", + "version": "3.7.0", + "sha256": "07gx174gw5q1zgyyg1xhfplihhnr311f9562ri5pdd2hgjyz58yb", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_sm", + "version": "3.7.0", + "sha256": "005xwsnh5y3pf8y64lhvrzcbh8y34yr3in204as6hv7krsfg8bxa", + "license": "cc-by-sa-40" + }, + { + "pname": "sl_core_news_trf", + "version": "3.7.0", + "sha256": "0x97lwm1i2dq4kdg6rvarh9mnlcx45cnwq80qpjwv3b7zmviyq8c", + "license": "cc-by-sa-40" + }, { "pname": "sv_core_news_lg", - "version": "3.5.0", - "sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz", + "version": "3.7.0", + "sha256": "05qaff8r3vs30zaxja1lgpibd12njp9ciq49zs26i6d4dqa18hdp", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.5.0", - "sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw", + "version": "3.7.0", + "sha256": "0c64lqm10zmy863gs5h3ghx7662c8g7iyapn2rjhmz6909d82yyl", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.5.0", - "sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7", + "version": "3.7.0", + "sha256": "1ik8b2nvxdalglwqg0zl4wbqnd2dyhdcy5hvxh40gi77rg2qd6kb", "license": "cc-by-sa-40" }, { "pname": "uk_core_news_lg", - "version": "3.5.0", - "sha256": "0hl9xjnxslckc6wvfgkj30r3py8q95yj7mrxdb6m5gvknlq72kp2", + "version": "3.7.0", + "sha256": "1qbw16y3ha690fqq71w7r46n8mz7d8za2iw1lljpqpf49my408q1", "license": "mit" }, { "pname": "uk_core_news_md", - "version": "3.5.0", - "sha256": "05mg719ra5khm61yr7xhfcsh3apl29s3h2wkq0v87gkyqn13812p", + "version": "3.7.0", + "sha256": "0znfyl8cdvxbxfhypwkjv84hcs6n457wh4j2cl1sfp9pgsd7bmzb", "license": "mit" }, { "pname": "uk_core_news_sm", - "version": "3.5.0", - "sha256": "1dkbmjbyhf6vsr7c4m4njgi969sfhbdnp73skl3k206dign5qgnz", + "version": "3.7.0", + "sha256": "08scx97j87rrhyrg5smj9ydwmdhl81859qaqj2klgqqpykg0xwlc", "license": "mit" }, { "pname": "uk_core_news_trf", - "version": "3.5.0", - "sha256": "02bhvcivalifrxd3vl118799wvg6hgykj31wwfdsgnq68lwc28fb", + "version": "3.7.0", + "sha256": "14s4xwr0qs8x3d2fca2m1nj6ksl82gggj2by7c817gii1bdvn47p", "license": "mit" }, { "pname": "xx_ent_wiki_sm", - "version": "3.5.0", - "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", + "version": "3.7.0", + "sha256": "1k06aa8xsx2qcmd4lz02sfxmgif5nngni8dc4y0w0d4x88icdscn", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.5.0", - "sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z", + "version": "3.7.0", + "sha256": "13fc4dmmmkanxaxabyx0sa2sh53p92jp3mj263pf31yh98kryxpw", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.5.0", - "sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2", + "version": "3.7.0", + "sha256": "1kqdczq5id0sqnyg3sq5g8n7fcknz53srvd72qmz4wrymy5h81qa", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.5.0", - "sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva", + "version": "3.7.0", + "sha256": "03m5gnx47mcyx7sh1g3dgqnarvprdkvkyxibsli6yrnvx3vz434j", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.5.0", - "sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml", + "version": "3.7.0", + "sha256": "1x9y4z2883m21rsvv6sw71l1nva3j8an8csdsabs4y84kb5y2by2", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.5.0", - "sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb", + "version": "3.7.0", + "sha256": "1y4c9z4vjywmpg61yxsyp80cmz5s3aa95car01wq3i42qj09bvm6", "license": "mit" } ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix index 913a458ae0..06faf6ca26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI="; + hash = "sha256-KB+tfuz0ZnoQcMX3H+IZXjcmPZ4x2ecl8ofz1/3r0/8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index abeb5d0f92..98132c9f17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -2,7 +2,6 @@ , stdenv , aplpy , astropy -, astropy-helpers , buildPythonPackage , casa-formats-io , dask @@ -11,20 +10,20 @@ , pytest-astropy , pytestCheckHook , pythonOlder -, radio_beam +, radio-beam , setuptools-scm }: buildPythonPackage rec { pname = "spectral-cube"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc="; + hash = "sha256-7wfvsravSkAGkTtuPE01wPW7wEHKVWT8kYQn93Q2B4M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy casa-formats-io - radio_beam + radio-beam joblib dask ]; @@ -47,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + # Tests must be run in the build directory. + preCheck = '' + cd build/lib + ''; + # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. disabledTestPaths = lib.optionals stdenv.isDarwin [ @@ -63,7 +67,5 @@ buildPythonPackage rec { changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; - # Tests fail to start, according to Hydra - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 6bbff9e28f..95d73246aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -1,25 +1,54 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, scikit-build-core +, cmake +, pathspec +, ninja +, pyproject-metadata + +# dependencies +, numpy + +# tests +, pytestCheckHook +, pyyaml +}: buildPythonPackage rec { pname = "spglib"; - version = "2.0.2"; + version = "2.1.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HQgewi2kq0/DGY6URd2tbewiYcQ5J4MRUdk+OUImEKo="; + hash = "sha256-gUNUX9/8EfvNpNcFpra81Iid6bw1JLeN+GajbdDeCks="; }; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + scikit-build-core + cmake + pathspec + ninja + pyproject-metadata + ]; - nativeCheckInputs = [ pytest pyyaml ]; + dontUseCmakeConfigure = true; - # pytestCheckHook doesn't work - # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' - checkPhase = '' - pytest - ''; + propagatedBuildInputs = [ + numpy + ]; - pythonImportsCheck = [ "spglib" ]; + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + pythonImportsCheck = [ + "spglib" + ]; meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix index d8d98a803b..3d47f22c87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -1,41 +1,50 @@ { lib -, astroid , buildPythonPackage , fetchPypi -, jinja2 -, mock -, pytestCheckHook , pythonOlder + +# build-system +, setuptools + +# dependencies +, astroid +, anyascii +, jinja2 , pyyaml , sphinx -, stdenv -, typing-extensions -, unidecode + +# tests +, beautifulsoup4 +, mock +, pytestCheckHook }: buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.0.1"; - format = "setuptools"; + version = "2.1.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfR5aMIIUvT+sMzv0J5BS7ggr4r4+C+rFaJLCaPRuro="; + hash = "sha256-+625bnkCDWsOxF2IhRe/gW1rWHotNA++HsMRNeMApsg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + anyascii astroid jinja2 pyyaml sphinx - unidecode - ] ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; nativeCheckInputs = [ + beautifulsoup4 mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index aca87f3c89..d99577fd23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.23.0"; + version = "1.24.0"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-XUTimWYzza2kmbbSeklt3528ld0fDwn3s3lAJJ5h9uk="; + hash = "sha256-lORABmlBuyN3BLuIB4Xi0F6K5UBsiGdP7vu5OK0Nxq8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix index 7560b37036..bc74fae549 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage -, cython , fetchFromGitHub , fetchurl +, pythonOlder +, setuptools-scm +, git +, sphinx +, pytestCheckHook +, cython , gcc , graphviz -, pytestCheckHook -, pythonOlder -, sphinx }: buildPythonPackage rec { pname = "sphinx-automodapi"; - version = "0.14.1"; - format = "setuptools"; - + version = "0.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astropy"; repo = pname; rev = "v${version}"; - hash = "sha256-olD9LIyFCNEu287wQIRqoabfrdcdyZpNc69jq/e1304="; + hash = "sha256-ecOwBtJBkGsBShMG5fK22V1EHLe6pCmOdHPrS/k6rno="; + leaveDotGit = true; }; + nativeBuildInputs = [ + setuptools-scm + git + ]; + propagatedBuildInputs = [ sphinx ]; # https://github.com/astropy/sphinx-automodapi/issues/155 @@ -34,11 +41,8 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace "sphinx_automodapi/tests/helpers.py" \ - --replace '[0]), None)' "[0]), (None, '${testInventory}'))" - - substituteInPlace "sphinx_automodapi/tests/test_cases.py" \ - --replace '[0]), None)' "[0]), (None, '${testInventory}'))" + substituteInPlace sphinx_automodapi/tests/{helpers,test_cases}.py \ + --replace ", None)" ", (None, '${testInventory}'))" ''; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix index 69a34dd2c6..a3da400d10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; version = "1.0.0.beta2"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix index fc2e9517ce..2ffed0c091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-comments"; version = "0.0.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix index 0aff8f37ca..921669d4ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "0.3.1"; + version = "1.0.0"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "9c8ea9980ea0e57bf3ce98f6a400f9b69eb1df808f7dd796c9c8cc1873d8b355"; + sha256 = "sha256-990JX/OrD7dKMQ1BCwo2GPwd3G8s5DWJfWWayqSj6yQ="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix index 612717120f..33e346638e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-multitoc-numbering"; version = "0.1.3"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix index edc8e2ce6b..e9f5d9c451 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; - version = "0.8.3"; + version = "1.0.0"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-notfound-page"; rev = version; - hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix index cc5d5f0b2e..776752d74c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -1,21 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, sphinxHook +, poetry-core +, poetry-dynamic-versioning , sphinx }: buildPythonPackage rec { pname = "sphinx-prompt"; - version = "1.5.0"; + version = "1.7.0"; # read before updating past 1.7.0 https://github.com/sbrunner/sphinx-prompt/issues/398 + format = "pyproject"; src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; - rev = version; - hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + rev = "refs/tags/${version}"; + hash = "sha256-/XxUSsW8Bowks7P+d6iTlklyMIfTb2otXva/VtRVAkM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"poetry-plugin-tweak-dependencies-version", ' "" + ''; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + propagatedBuildInputs = [ sphinx ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix index ecb2cbf55e..7bc41418fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.0.3"; + version = "0.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; - rev = "v${version}"; - hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; + rev = "refs/tags/v${version}"; + hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ sphinx @@ -30,13 +31,16 @@ buildPythonPackage rec { pytest ]; - pythonImportsCheck = [ "sphinx_pytest" ]; + pythonImportsCheck = [ + "sphinx_pytest" + ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/v${version}"; description = "Helpful pytest fixtures for Sphinx extensions"; homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 613f199812..fe056b3e70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-oNi9Gi7VLgszjL4ZxLLu88XnoEh2l1PaxqnwWce2Qbg="; + hash = "sha256-WQsDDHq7nPA47AU7leU4C1xw1hWR6wtVIGP758QfCTE="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-sitemap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-sitemap/default.nix new file mode 100644 index 0000000000..b14d669a10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, sphinx +, sphinx-pytest +, pytestCheckHook +}: +let + pname = "sphinx-sitemap"; + version = "2.5.1"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; + + src = fetchFromGitHub { + owner = "jdillard"; + repo = "sphinx-sitemap"; + rev = "refs/tags/v${version}"; + hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + sphinx-pytest + ]; + + meta = with lib; { + changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; + description = "Sitemap generator for Sphinx"; + homepage = "https://github.com/jdillard/sphinx-sitemap"; + maintainers = with maintainers; [ alejandrosame ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix index a2714c2d12..04630f189d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonImportsCheckHook + +# build-system +, setuptools + # documentation build dependencies , sphinxHook # runtime dependencies @@ -15,14 +18,16 @@ buildPythonPackage rec { pname = "sphinx-tabs"; - version = "3.4.1"; + version = "3.4.4"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-tabs"; - rev = "v${version}"; - hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-RcCADGJfwXP/U7Uws/uX+huaJzRDRUabQOnc9gqMUzM="; }; postPatch = '' @@ -30,7 +35,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pythonImportsCheckHook + setuptools sphinxHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix index 1bf8685282..d6d150d6e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi +, hatch-vcs +, hatchling +, pythonOlder , sphinx }: buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.2.1"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "f4c8c1542054f991b73fcb28c4cf21697e42aba2f83f22348c1c851b82766583"; + inherit version; + pname = "sphinx_thebe"; + hash = "sha256-xg2rG1m5LWouq41xGeh8BzBHDaYvPIS/bKdWkEh9BQU="; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; - pythonImportsCheck = [ "sphinx_thebe" ]; + propagatedBuildInputs = [ + sphinx + ]; + + pythonImportsCheck = [ + "sphinx_thebe" + ]; meta = with lib; { description = "Integrate interactive code blocks into your documentation with Thebe and Binder"; homepage = "https://github.com/executablebooks/sphinx-thebe"; + changelog = "https://github.com/executablebooks/sphinx-thebe/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix index 391fb9205c..3b3e146b98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -1,23 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , wheel -, sphinx , docutils +, sphinx }: buildPythonPackage rec { pname = "sphinx-togglebutton"; version = "0.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; }; - propagatedBuildInputs = [ wheel sphinx docutils ]; + nativeBuildInputs = [ + setuptools + wheel + ]; - pythonImportsCheck = [ "sphinx_togglebutton" ]; + propagatedBuildInputs = [ + docutils + sphinx + ]; + + pythonImportsCheck = [ + "sphinx_togglebutton" + ]; meta = with lib; { description = "Toggle page content and collapse admonitions in Sphinx"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix index 52a6a26124..1fb89f3a28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -15,9 +15,11 @@ # Latest tagged release release "1.1.2" (Nov 2018) does not contain # documenation, it was added in commits Aug 10, 2019. Repository does not have # any activity since then. -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; + format = "pyproject"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch deleted file mode 100644 index 805e724d0c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 -From: toonn -Date: Mon, 20 Sep 2021 11:39:46 +0200 -Subject: [PATCH] test-images: Use normalization equivalent character -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -One of the test images used a combining character `ä` that can be -encoded multiple ways. This means the file's name can end up encoded -differently depending on whether/which normal form the filesystem uses. - -For Nix this causes a different hash for a FOD depending on the -filesystem where it is evaluated. This is problematic because hashes -fail to match up when evaluating the FOD across multiple platforms. ---- - tests/roots/test-images/index.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst -index 14a2987..219842e 100644 ---- a/tests/roots/test-images/index.rst -+++ b/tests/roots/test-images/index.rst -@@ -13,7 +13,7 @@ test-image - - The caption of img - --.. image:: testimäge.png -+.. image:: testimæge.png - - .. image:: rimg.png - :target: https://www.sphinx-doc.org/ --- -2.17.2 (Apple Git-113) - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index eb559c4148..6dac59106f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -30,29 +30,29 @@ # check phase , cython +, filelock , html5lib , pytestCheckHook -, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "5.3.0"; + version = "7.2.6"; format = "pyproject"; - - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sphinx-doc"; - repo = pname; + repo = "sphinx"; rev = "refs/tags/v${version}"; - hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' - cd $out - mv tests/roots/test-images/testimäge.png \ - tests/roots/test-images/testimæge.png - patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + # Change ä to æ in file names, since ä can be encoded multiple ways on different + # filesystems, leading to different hashes on different platforms. + cd "$out"; + mv tests/roots/test-images/{testimäge,testimæge}.png + sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; + hash = "sha256-IjpRGeGpGfzrEvwIKtuu2l1S74w8W+AbqDOGnWwtRck="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - babel alabaster + babel docutils imagesize jinja2 @@ -84,66 +84,22 @@ buildPythonPackage rec { importlib-metadata ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ cython + filelock html5lib pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME=$TMPDIR ''; disabledTests = [ # requires network access - "test_anchors_ignored" - "test_defaults" - "test_defaults_json" "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" - - # fails with pygments 2.14 - # TODO remove for sphinx 6 - "test_viewcode" - "test_additional_targets_should_be_translated" - "test_additional_targets_should_not_be_translated" - - # sphinx.errors.VersionRequirementError: The alabaster extension - # used by this project needs at least Sphinx v1.6; it therefore - # cannot be built with this version. - "test_needs_sphinx" - - # Likely due to pygments 2.14 update - # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' - "test_format_date" - ] ++ lib.optionals stdenv.isDarwin [ - # Due to lack of network sandboxing can't guarantee port 7777 isn't bound - "test_inspect_main_url" - "test_auth_header_uses_first_match" - "test_linkcheck_allowed_redirects" - "test_linkcheck_request_headers" - "test_linkcheck_request_headers_no_slash" - "test_follows_redirects_on_HEAD" - "test_get_after_head_raises_connection_error" - "test_invalid_ssl" - "test_connect_to_selfsigned_with_tls_verify_false" - "test_connect_to_selfsigned_with_tls_cacerts" - "test_connect_to_selfsigned_with_requests_env_var" - "test_connect_to_selfsigned_nonexistent_cert_file" - "test_TooManyRedirects_on_HEAD" - "test_too_many_requests_retry_after_int_del" - "test_too_many_requests_retry_after_HTTP_date" - "test_too_many_requests_retry_after_without_header" - "test_too_many_requests_user_timeout" - "test_raises_for_invalid_status" - "test_auth_header_no_match" - "test_follows_redirects_on_GET" - "test_connect_to_selfsigned_fails" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -159,14 +115,39 @@ buildPythonPackage rec { "test_partialfunction" ]; - meta = with lib; { + meta = { description = "Python documentation generator"; longDescription = '' - A tool that makes it easy to create intelligent and beautiful - documentation for Python projects + Sphinx makes it easy to create intelligent and beautiful documentation. + + Here are some of Sphinx’s major features: + - Output formats: HTML (including Windows HTML Help), LaTeX (for printable + PDF versions), ePub, Texinfo, manual pages, plain text + - Extensive cross-references: semantic markup and automatic links for + functions, classes, citations, glossary terms and similar pieces of + information + - Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + - Automatic indices: general index as well as a language-specific module + indices + - Code handling: automatic highlighting using the Pygments highlighter + - Extensions: automatic testing of code snippets, inclusion of docstrings + from Python modules (API docs) via built-in extensions, and much more + functionality via third-party extensions. + - Themes: modify the look and feel of outputs via creating themes, and + re-use many third-party themes. + - Contributed extensions: dozens of extensions contributed by users; most + of them installable from PyPI. + + Sphinx uses the reStructuredText markup language by default, and can read + MyST markdown via third-party extensions. Both of these are powerful and + straightforward to use, and have functionality for complex documentation + and publishing workflows. They both build upon Docutils to parse and write + documents. ''; homepage = "https://www.sphinx-doc.org"; - license = licenses.bsd3; - maintainers = teams.sphinx.members; + changelog = "https://www.sphinx-doc.org/en/master/changes.html"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix deleted file mode 100644 index d2c20e980e..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "Sphinx-PyPI-upload"; - version = "0.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159"; - }; - - meta = with lib; { - description = "Setuptools command for uploading Sphinx documentation to PyPI"; - homepage = "https://bitbucket.org/jezdez/sphinx-pypi-upload/"; - license = licenses.bsd0; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 32470e98b4..bfe5739b2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.actdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx actdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 5308034786..77fe8929b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; }; postPatch = '' @@ -25,6 +25,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension for running sphinx-apidoc on each build"; homepage = "https://github.com/sphinx-contrib/apidoc"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index ef7a50382c..3e8fe11d19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.2"; - disabled = isPy27; + version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; + pname = "sphinxcontrib_applehelp"; + inherit version; + hash = "sha256-Of3I12LTOwGn2PAmo7fXFWPqO3J4fV8ArYRlvZ1t+/o="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix index 2da9c2d92f..597dac22a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { "sphinxcontrib.asyncio" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to add asyncio-specific markups"; homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 8589689ec8..ca968f3f23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sphinxcontrib.bayesnet" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/jluttine/sphinx-bayesnet"; description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 4a0dcda238..2d8dca9912 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.5.0"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cbQuXbDi4oTyQ4dTJr+ZNqqadjKCJ311BIgm/vWwDqo="; + hash = "sha256-BGtJ8HCuUnavNMG43bm8lWLvbeL3pS03qRy45T9UuGM="; }; propagatedBuildInputs = [ @@ -32,6 +32,8 @@ buildPythonPackage rec { "sphinxcontrib.bibtex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8d22c58067..44c4de9570 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 5830ff0caf..dc7798015c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , docutils , sphinx , requests @@ -9,13 +10,19 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.0.0"; + version = "2.3.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-RyShQt/t8tnE5ZHM0WDQ+jrvXem3y24tCpj3s6Thq+g="; + pname = "sphinxcontrib_confluencebuilder"; + inherit version; + hash = "sha256-Zpe2n131afnq4IhQEEZtquvSEkkjv/uznXt2tQhGfZA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ docutils sphinx @@ -30,6 +37,8 @@ buildPythonPackage rec { "sphinxcontrib.confluencebuilder" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Confluence builder for sphinx"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 293f4c856e..b254d4b643 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.2"; + version = "1.0.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; + pname = "sphinxcontrib_devhelp"; + inherit version; + hash = "sha256-Y7QeDTggfKQOu+q89NjlH3bAPnjNYavhGM9ENcc9QhI="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index e48b24c364..d7cea5a641 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # No tests present upstream doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx excel-table extension"; homepage = "https://github.com/hackerain/sphinxcontrib-excel-table"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f13..79a3261500 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # Ensure package importing works pythonImportsCheck = [ "sphinxcontrib.fulltoc" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Include a full table of contents in your Sphinx HTML sidebar"; homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 901132176e..56fae964ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; - disabled = isPy27; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + pname = "sphinxcontrib_htmlhelp"; + inherit version; + hash = "sha256-bCahGKBbdgAHOEKbckoFaNveW3I5GmiFd9oI8RiRCSo="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension which renders HTML help files"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index ae4a571f0b..96dad44be8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 1905659b25..16c57f5886 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pytestCheckHook , sphinx @@ -8,16 +9,29 @@ buildPythonPackage rec { pname = "sphinxcontrib-jquery"; - version = "3.0.0"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "jquery"; rev = "refs/tags/v${version}"; - hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-sphinx7.1.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/ac97ce5202b05ddb6bf4e5b77151a8964b6bf632.patch"; + hash = "sha256-dc9bhr/af3NmrIfoVabM1lNpXbGVsJoj7jq0E1BAtHw="; + }) + (fetchpatch { + name = "fix-tests-with-sphinx7.2.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/03f1595b3793e087a407933fbcb757bdd3f558fc.patch"; + hash = "sha256-4gNG1DL/63N2FwXDy5fMApZpf/AGOGBruwPuVqgnVkc="; + }) + ]; + nativeBuildInputs = [ flit-core ]; @@ -31,6 +45,8 @@ buildPythonPackage rec { sphinx ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Extension to include jQuery on newer Sphinx releases"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index da630c6ee9..2b8c2cd758 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 248030c241..30c94a088f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { "sphinxcontrib.katex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index 867d5acc9b..2dfc743a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { doCheck = false; # no tests + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/davidism/sphinxcontrib-log-cabinet"; description = "Sphinx extension to organize changelogs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix index 0a283dd81a..7350b837a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { "sphinxcontrib.mscgen" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using mscgen to render diagrams"; homepage = "https://github.com/sphinx-contrib/mscgen"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix similarity index 63% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8b..ee9661d954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,23 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonNamespaces = [ "sphinxcontrib" ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; + homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 47573ad609..de4ebf723b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.nwdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx nwdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 1486372b02..6e3279b4de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,17 +9,17 @@ , picobox , pyyaml , sphinx-mdinclude -, sphinxcontrib_httpdomain +, sphinxcontrib-httpdomain }: buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.8.1"; + version = "0.8.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; + hash = "sha256-nGIRdUC1J2AGrHrUrzRpbQKvJ4r6KZcSdAw2gKmp3mw="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -29,13 +29,15 @@ buildPythonPackage rec { picobox pyyaml sphinx-mdinclude - sphinxcontrib_httpdomain + sphinxcontrib-httpdomain ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index cfdfd6de62..d6c588c8d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.26"; + version = "0.27"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rbM5fVywYTYyzT2teJQ4FCK6wkRkw5PLBQQE3WcSsac="; + hash = "sha256-iXV3ju2cFCpC7NxOzYMTLewGkMA1yueIwSN1Dq1SZwM="; }; propagatedBuildInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { # No tests included. doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 17f2d5dcbe..67d7d9b587 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 4364fcb99d..d526f8aad8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.3"; - disabled = isPy27; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; + pname = "sphinxcontrib_qthelp"; + inherit version; + hash = "sha256-YrnRoYarf17jNW2Qb2SMrLemvblNIB7nrfJttVCSmC0="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index cc3a96086e..085cb57305 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.seqdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx seqdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 85ed3cdc59..4604eec5f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.5"; - disabled = isPy27; + version = "1.1.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; + pname = "sphinxcontrib_serializinghtml"; + inherit version; + hash = "sha256-DGT/iYM54frCmr0r9fEQePPsQTz+nARtMSDXymVTC1Q="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2a8085de7c..b7a71f891c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "sphinxcontrib.spelling" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 62e7df21ab..dd83acb3d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -3,7 +3,7 @@ , fetchPypi , sphinx , pdf2svg -, texLive +, texliveSmall }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace sphinxcontrib/tikz.py \ - --replace "config.latex_engine" "'${texLive}/bin/pdflatex'" \ + --replace "config.latex_engine" "'${texliveSmall.withPackages (ps: with ps; [ standalone pgfplots ])}/bin/pdflatex'" \ --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" ''; @@ -28,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.tikz" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix new file mode 100644 index 0000000000..6f35e2b59e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, sphinx +, wavedrom +, xcffib +, cairosvg +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-wavedrom"; + version = "3.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0zTHVBr9kXwMEo4VRTFsxdX2HI31DxdHfLUHCQmw1Ko="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + sphinx + wavedrom + xcffib + cairosvg + ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.wavedrom" ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = with lib; { + description = "A sphinx extension that allows including wavedrom diagrams by using its text-based representation"; + homepage = "https://github.com/bavovanachte/sphinx-wavedrom"; + license = licenses.mit; + maintainers = with maintainers; [ fsagbuya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 45027ba15c..bd9ae779c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,23 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, flit-core +, jinja2 , sphinxcontrib-serializinghtml -, six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.4"; + version = "1.2.6"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; + pname = "sphinxcontrib_websupport"; + inherit version; + hash = "sha256-1ZK+jhEmG7vGRmjyWO/E/ULJOrYXQRFDtSRf4wxjPYw="; }; - propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + jinja2 + sphinxcontrib-serializinghtml + ]; doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = { description = "Sphinx API for Web Apps"; homepage = "http://sphinx-doc.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 795556797b..ab48066dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.2.0"; + version = "1.4.1"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "youtube"; - rev = "v${version}"; - hash = "sha256-SUnnrzYJ6cOktE0IdnRWTvPGcL/eVS9obtHBMpS2s4A="; + rev = "refs/tags/v${version}"; + hash = "sha256-XuOfZ77tg9akmgTuMQN20OhgkFbn/6YzT46vpTsXxC8="; }; propagatedBuildInputs = [ sphinx requests ]; @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Youtube extension for Sphinx"; homepage = "https://github.com/sphinx-contrib/youtube"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix index 726ba8132b..02abae52c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxemoji/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , sphinx , sphinxHook }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "sphinxemoji"; version = "0.2.0"; + format = "pyproject"; outputs = [ "out" "doc" ]; @@ -18,14 +20,15 @@ buildPythonPackage rec { hash = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A="; }; + nativeBuildInputs = [ + setuptools + sphinxHook + ]; + propagatedBuildInputs = [ sphinx ]; - nativeBuildInputs = [ - sphinxHook - ]; - pythonImportsCheck = [ "sphinxemoji" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix index dc66c1c44f..85a736bd88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.8.2"; + version = "0.9.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-SrZTtVzEp4E87fzisWKHl8iRP49PWt5kkJq62CqXrBc="; + hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,15 +29,20 @@ buildPythonPackage rec { setuptools-scm ]; + passthru.optional-dependencies = { + social_cards_generation = [ + matplotlib + ]; + }; + propagatedBuildInputs = [ sphinx - matplotlib ]; nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ]; + ] ++ passthru.optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index e68f9db101..f62c4d7c9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.4"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0="; + hash = "sha256-M2hCbARFfgIRiE6SdPpH61ViUrpMBz3ydeg8Zd97oqE="; }; propagatedBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { description = "Jupyter kernels for Spyder's console"; homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; - changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 9722222905..a70ef94409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.5"; + version = "5.5.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo="; + hash = "sha256-zjQmUmkqwtXNnZKssNpl24p4FQscZKGiiJj5iwYl2UM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqids/default.nix index a53be04df7..dc6befc179 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqids/default.nix @@ -8,22 +8,20 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qAY41kOp0m+mua/4bvVwuDW5p0EpwY675Ux3W1JsqbE="; + hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; }; nativeBuildInputs = [ setuptools-scm ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ecfa57be2e..c71172764a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { patches = [ # See: https://review.openstack.org/#/c/608382/ + # https://github.com/openstack/sqlalchemy-migrate/pull/18 (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ./python3.11-comp.diff diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index d3ad0bf970..84b42ad27f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.40.0"; + version = "0.41.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - hash = "sha256-r4AwiaeSmAP662FzuQ8p0aZ60C8dHnMvQLBUqOs8c3A="; + hash = "sha256-ohgb/wHuuER544Vx0sBxjrUgQvmv2MGU0NAod+hLfXQ="; }; patches = [ @@ -92,6 +92,7 @@ buildPythonPackage rec { "--deselect tests/functions/test_database.py::TestDatabasePostgresCreateDatabaseCloseConnection::test_create_database_twice" "--deselect tests/functions/test_database.py::TestDatabasePostgresPg8000::test_create_and_drop" "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG2CFFI::test_create_and_drop" + "--deselect tests/functions/test_database.py::TestDatabasePostgresPsycoPG3::test_create_and_drop" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 2f5f5d1a8e..95e357cabd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.19"; + version = "2.0.21"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-97q04wQVtlV2b6VJHxvnQ9ep76T5umn1KI3hXh6a8kU="; + hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; }; nativeBuildInputs =[ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix new file mode 100644 index 0000000000..8b21d89ad5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlbag/default.nix @@ -0,0 +1,95 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, psycopg2 +, pymysql +, sqlalchemy +, pathlib +, six +, flask +, pendulum +, packaging +, setuptools +, poetry-core +, pytestCheckHook +, pytest-xdist +, pytest-sugar +, postgresql +, postgresqlTestHook +, +}: +buildPythonPackage rec { + pname = "sqlbag"; + version = "0.1.1617247075"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "djrobstep"; + repo = pname; + # no tags on github, version patch number is unix time. + rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120"; + hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = + [ + sqlalchemy + six + packaging + + psycopg2 + pymysql + + setuptools # needed for 'pkg_resources' + ] + ++ lib.optional isPy27 pathlib; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-sugar + + postgresql + postgresqlTestHook + + flask + pendulum + ]; + + preCheck = '' + export PGUSER="nixbld"; + ''; + disabledTests = [ + # These all fail with "List argument must consist only of tuples or dictionaries": + # Related issue: https://github.com/djrobstep/sqlbag/issues/14 + "test_basic" + "test_createdrop" + "test_errors_and_messages" + "test_flask_integration" + "test_orm_stuff" + "test_pendulum_for_time_types" + "test_transaction_separation" + ]; + + pytestFlagsArray = [ + "-x" + "-svv" + "tests" + ]; + + pythonImportsCheck = [ + "sqlbag" + ]; + + meta = with lib; { + description = "Handy python code for doing database things"; + homepage = "https://github.com/djrobstep/sqlbag"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ soispha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-migrate/default.nix new file mode 100644 index 0000000000..b19d3e590f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-migrate/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +, sqlite-utils +}: + +buildPythonPackage rec { + pname = "sqlite-migrate"; + version = "0.1a2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wztAqe3TW0SQ4JX1XPWeA4KNJci5c3fNih97cmlPwRE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sqlite-utils + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sqlite_migrate" + ]; + + meta = with lib; { + description = "A simple database migration system for SQLite, based on sqlite-utils"; + homepage = "https://github.com/simonw/sqlite-migrate"; + changelog = "https://github.com/simonw/sqlite-migrate/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 281bcdb745..92cc4ea627 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.35.1"; + version = "3.35.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4PA+aXawW9t6XFZFSXGg6YD8Ftv9NRK7073KxPDkNw4="; + hash = "sha256-WQsUrSd5FMs/x9XiVHZIR/rNqqI8e6/YXsk4dPb0IUM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 4dda36262d..936d904c65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.9"; + version = "1.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k07Dpkpa1MO9ICMl4a2YI2ONgcUG0vLOzC+wsoHxI3s="; + hash = "sha256-gjObtmEvvyCnqd+bLdirzW18/AarmvhF6ItvqJ2Qmuo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index 4054cfcacf..e4ac317418 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.10.2"; + version = "3.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLObject"; inherit version; - hash = "sha256-dW9IsIdOSnCG3thWhYwIsz0Oa5runnXD84S5ITPH3ww="; + hash = "sha256-QrGyrM6e1cxCtF4GxoivXU/Gj2H8VnG7EFcgimLfdng="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; - homepage = "http://www.sqlobject.org/"; + homepage = "https://www.sqlobject.org/"; changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst"; license = licenses.lgpl21Only; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix index 39de5e7604..6a06ef247a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A one step database access tool, built on the SQLAlchemy ORM"; homepage = "https://github.com/zzzeek/sqlsoup"; license = licenses.mit; - maintainers = [ maintainers.globin ]; + maintainers = []; broken = true; # incompatible with sqlalchemy>=1.4 and unmaintained since 2016 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix index f1b47d75b8..17378c8611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshfs/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.7.0"; + version = "2023.10.0"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XKBpB3ackquVKsdF8b/45Kaz5Y2ussOl0o0HkD+k9tM="; + hash = "sha256-6MueDHR+jZFDZg4zufEVhBtSwcgDd7KnW9gJp2hDu0A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix index e1649db165..cba83f5df0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix @@ -47,6 +47,10 @@ buildPythonPackage rec { typeguard ]; + # https://github.com/alexmojaki/stack_data/issues/50 + # incompatible with typeguard>=3 + doCheck = false; + disabledTests = [ # AssertionError "test_example" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix index d7c9972f04..51f2152c86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AyO/BC5JpkxaXXjj8pAVa4WGnK/GTw4xrmUvGLbLt3U="; + hash = "sha256-8WH83K/1SbzjlAmjKVh3gT9KVvQ6BMRmg3Z0SSeL1j8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 1c08e61f66..acac9c99f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.27.0"; + version = "0.31.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,18 +31,13 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw="; + hash = "sha256-Tq414cEpXX8MQDR0KYyB+J7lFqorbiwP/sGnUFvs7wA="; }; nativeBuildInputs = [ hatchling ]; - postPatch = '' - # remove coverage arguments to pytest - sed -i '/--cov/d' setup.cfg - ''; - propagatedBuildInputs = [ anyio itsdangerous @@ -79,6 +74,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/encode/starlette/releases/tag/${version}"; + downloadPage = "https://github.com/encode/starlette"; homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/staticmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/staticmap/default.nix new file mode 100644 index 0000000000..bb3eac8655 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/staticmap/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pillow +, requests +}: + +buildPythonPackage rec { + pname = "staticmap"; + version = "0.5.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-x6lrkCumEpLoGMILCBBhnWuBps21C8wauS1QrE2yCn8="; + }; + + propagatedBuildInputs = [ requests pillow ]; + + pythonImportsCheck = [ "staticmap" ]; + + # Tests seem to be broken + doCheck = false; + + meta = with lib; { + description = "A small, python-based library for creating map images with lines and markers"; + homepage = "https://pypi.org/project/staticmap/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/std2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/std2/default.nix index 2b51f9caae..8e117b10e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/std2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/std2/default.nix @@ -6,15 +6,14 @@ buildPythonPackage { pname = "std2"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-10-07"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "std2"; - rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6"; - hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY="; + rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965"; + hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix index 4d3398d326..1b2f80da24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stdlibs/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2022.10.9"; + version = "2023.11.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4="; + hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix index e79b9993b8..adc6db83dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.27"; + version = "2.17.32"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0="; + hash = "sha256-dTpz2/XXu8patDnorg/36652j9VLUjE5uF2fVzbDjfI="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix index dc90700948..8cd6ff3f3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -1,38 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, python, mock, pythonAtLeast }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, cryptography +, mock +, python +}: buildPythonPackage rec { pname = "stem"; version = "1.8.2"; - # As of May 2023, the master branch of stem contains fixes for Python 3.11 - # that the last release (1.8.1) doesn't. The test suite fails on both master - # and the 1.8.1 release, so disabling rather than switching to an unstable - # source. - disabled = pythonAtLeast "3.11"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-g/sZ/9TJ+CIHwAYFFIA4n4CvIhp+R4MACu3sTjhOtYI="; + pyproject = true; + + src = fetchFromGitHub { + owner = "torproject"; + repo = "stem"; + rev = "refs/tags/${version}"; + hash = "sha256-9BXeE/sVa13jr8G060aWjc49zgDVBhjaR6nt4lSxc0g="; }; - postPatch = '' - rm test/unit/installation.py - sed -i "/test.unit.installation/d" test/settings.cfg - # https://github.com/torproject/stem/issues/56 - sed -i '/MOCK_VERSION/d' run_tests.py - ''; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ mock ]; + nativeCheckInputs = [ + cryptography + mock + ]; checkPhase = '' - touch .gitignore - ${python.interpreter} run_tests.py -u + runHook preCheck + + ${python.interpreter} run_tests.py --unit + + runHook postCheck ''; meta = with lib; { + changelog = "https://github.com/torproject/stem/blob/${src.rev}/docs/change_log.rst"; description = "Controller library that allows applications to interact with Tor"; + downloadPage = "https://github.com/torproject/stem"; homepage = "https://stem.torproject.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index b05e147dca..df64dbebab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "stravalib"; - version = "1.2.0"; + version = "1.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; + hash = "sha256-OEdMRg3KjUrXt/CgJgsUqa/sVFAE0JONNZg5MBKtxmY="; }; nativeBuildInputs = [ 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 761a14fbfd..93704c953e 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 @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.205.0"; + version = "0.208.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; + hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix index 959c47d812..f3aa0aa281 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix @@ -1,30 +1,33 @@ { lib, fetchFromGitHub, buildPythonPackage, pythonOlder, -cython, numpy, pytest, requests-toolbelt }: +cython, smart-open, pytestCheckHook, moto, requests-toolbelt }: buildPythonPackage rec { pname = "streaming-form-data"; - version = "1.8.1"; + version = "1.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "siddhantgoel"; repo = "streaming-form-data"; rev = "v${version}"; - sha256 = "1wnak8gwkc42ihgf0g9r7r858hxbqav2xdgqa8azid8v2ff6iq4d"; + hash = "sha256-Ntiad5GZtfRd+2uDPgbDzLBzErGFroffK6ZAmMcsfXA="; }; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ requests-toolbelt ]; + propagatedBuildInputs = [ smart-open ]; - nativeCheckInputs = [ numpy pytest ]; + nativeCheckInputs = [ pytestCheckHook moto requests-toolbelt ]; - checkPhase = '' - make test - ''; + pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "streaming_form_data" ]; + preCheck = '' + # remove in-tree copy to make pytest find the installed one, with the native parts already built + rm -rf streaming_form_data + ''; + meta = with lib; { description = "Streaming parser for multipart/form-data"; homepage = "https://github.com/siddhantgoel/streaming-form-data"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix old mode 100755 new mode 100644 index 58a10bdb14..9b05380d42 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -18,7 +18,7 @@ , pympler , python-dateutil , pythonOlder -, pythonRelaxDepsHook +, setuptools , requests , rich , tenacity @@ -32,21 +32,18 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.26.0"; - format = "setuptools"; + version = "1.28.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version format; - hash = "sha256-JUdfsVo8yfsYSUXz/JNvARmYvYOG4MiS/r4UyWJb9Ho="; + inherit pname version; + hash = "sha256-zKBPbZWxS3vDfwyrrydQS4ava04a+Y1zrMgOzc+8xJI="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRelaxDeps = [ - "pillow" - "pydeck" + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 9f1f11e1c1..88c2ccf459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -3,22 +3,24 @@ , fetchPypi , requests , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "5.5.0"; + version = "7.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKlzKzekYijs8OSWFjo+3ZNZaw5iAAKfvEiRFjhifhk="; + hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw="; }; propagatedBuildInputs = [ requests + typing-extensions ]; # Tests require network connectivity and there's no easy way to disable them diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix index c21785f430..20d1ba2c0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "structlog"; - version = "23.1.0"; + version = "23.2.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-0zHvBMiZB4cGntdYXA7C9V9+FfnDB6sHGuFRYAo/LJw="; + hash = "sha256-KSHKgkv+kObKCdWZDg5o6QYe0AMND9VLdEuseY/GyDY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch b/third_party/nixpkgs/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch new file mode 100644 index 0000000000..ad0ecbb113 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/stytra/0000-workaround-pyqtgraph.patch @@ -0,0 +1,26 @@ +diff --git a/stytra/gui/fishplots.py b/stytra/gui/fishplots.py +index 49ef1fe..fd1cc50 100644 +--- a/stytra/gui/fishplots.py ++++ b/stytra/gui/fishplots.py +@@ -13,7 +13,7 @@ from lightparam.gui import ParameterGui + from scipy.ndimage.filters import gaussian_filter1d + + +-class StreamingPositionPlot(pg.GraphicsWindow): ++class StreamingPosition(pg.GraphicsView): + """Plot that displays the virtual position of the fish""" + + def __init__(self, *args, data_accumulator, n_points=500, **kwargs): +diff --git a/stytra/utilities.py b/stytra/utilities.py +index f79c4db..feaa7ef 100644 +--- a/stytra/utilities.py ++++ b/stytra/utilities.py +@@ -239,7 +239,7 @@ def recursive_update(d, u): + :return: + """ + for k, v in u.items(): +- if isinstance(v, collections.Mapping): ++ if isinstance(v, collections.ChainMap): + d[k] = recursive_update(d.get(k, {}), v) + else: + d[k] = v diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 5bc0a4af75..821aaa4143 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -15,7 +15,7 @@ , nose , numba , numpy -, opencv3 +, opencv4 , pandas , pims , pyqt5 @@ -33,8 +33,7 @@ buildPythonPackage rec { pname = "stytra"; version = "0.8.34"; - format = "setuptools"; - + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { @@ -42,13 +41,13 @@ buildPythonPackage rec { sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a"; }; - # crashes python - preCheck = '' - rm stytra/tests/test_z_experiments.py - ''; + patches = [ + # https://github.com/portugueslab/stytra/issues/87 + ./0000-workaround-pyqtgraph.patch + ]; propagatedBuildInputs = [ - opencv3 + opencv4 pyqt5 pyqtgraph numpy @@ -79,10 +78,16 @@ buildPythonPackage rec { pyserial ]; + disabledTestPaths = [ + # Crashes python + "stytra/tests/test_z_experiments.py" + ]; + meta = with lib; { description = "A modular package to control stimulation and track behaviour"; homepage = "https://github.com/portugueslab/stytra"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tbenst ]; + broken = true; # incompatible with pyqtgraph>0.13.0: https://github.com/portugueslab/stytra/issues/87 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index d08fe36473..603acb7388 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.7"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SrOFKXh/wG2+HKaLvyNP6/Le9R3Ri7+/xsUBAazo7js="; + hash = "sha256-dRhZWV58tHoGpJ2bDWFov1timTHYnqTPILySauutyzg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix new file mode 100644 index 0000000000..3b191bae9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, pandas +, pyyaml +, poetry-core +, pytestCheckHook +, pythonRelaxDepsHook +, pythonOlder +, toml-adapt +}: + +buildPythonPackage rec { + pname = "succulent"; + version = "0.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = "succulent"; + rev = version; + hash = "sha256-fSsb2UQM69AAjJd/Rvzuok7jBeAa6udbB8FbuNP8Ztw="; + }; + + pythonRelaxDeps = [ + "flask" + "pandas" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + flask + pandas + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "succulent" + ]; + + meta = with lib; { + description = "Collect POST requests"; + homepage = "https://github.com/firefly-cpp/succulent"; + changelog = "https://github.com/firefly-cpp/succulent/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index 909abc3949..da7641c9d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.3.6"; + version = "2.3.7"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; rev = "refs/tags/v${version}"; - hash = "sha256-HQIs2G2hdKQkQOBs2lijmx/0cI4o/FFJU866PjtrBAE="; + hash = "sha256-9NHz8SPymD9zANWMeajjavpjw68X4abqhrLl0dn92l0="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; homepage = "https://github.com/SMTG-UCL/sumo"; + changelog = "https://github.com/SMTG-Bham/sumo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index e813657674..a676f28d27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.1.3"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YNShjuLC7gBRn11oAd5Kp5CfCn92vAo/K4QNIXm/Mtc="; + hash = "sha256-7tmyywyfQw1T9qr5UbPH/KR+AmmhSaHunkeUGRKDl+Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix new file mode 100644 index 0000000000..3bd223127a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, substituteAll +, supervise +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "supervise-api"; + version = "0.6.0"; + pyproject = true; + + src = fetchPypi { + pname = "supervise_api"; + inherit version; + hash = "sha256-EjD0IpSRDoNCG307CKlo0n1RCkpwnpZlB+1w212hud4="; + }; + + postPatch = '' + substituteInPlace supervise_api/supervise.py \ + --replace 'which("supervise")' '"${supervise}/bin/supervise"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "supervise_api" + ]; + + meta = { + description = "An API for running processes safely and securely"; + homepage = "https://github.com/catern/supervise"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix deleted file mode 100644 index 7d4c7f4e3f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, substituteAll -, supervise -, isPy3k -, whichcraft -, util-linux -}: - -buildPythonPackage rec { - pname = "supervise_api"; - version = "0.6.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de"; - }; - - patches = [ - (substituteAll { - src = ./supervise-path.patch; - inherit supervise; - }) - ]; - - # In the git repo, supervise_api lives inside a python subdir - patchFlags = [ "-p2" ]; - - propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; - - nativeCheckInputs = [ util-linux ]; - - meta = { - description = "An API for running processes safely and securely"; - homepage = "https://github.com/catern/supervise"; - license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ catern ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/supervise-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/supervise-path.patch deleted file mode 100644 index c5538ddc26..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/supervise-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/python/supervise_api/supervise.py b/python/supervise_api/supervise.py -index 497d3ea..be57e35 100644 ---- a/python/supervise_api/supervise.py -+++ b/python/supervise_api/supervise.py -@@ -41,9 +41,7 @@ try: - except: - from whichcraft import which - --supervise_utility_location = which("supervise") --if not supervise_utility_location: -- raise FileNotFoundError(errno.ENOENT, "Executable not found in PATH", "supervise") -+supervise_utility_location = '@supervise@/bin/supervise' - - - def ignore_sigchld(): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix index a13bfb154f..d11e8e2fe5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook +, pythonOlder , six , tldextract -, pytestCheckHook }: buildPythonPackage rec { pname = "surt"; version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "internetarchive"; repo = "surt"; - rev = "6934c321b3e2f66af9c001d882475949f00570c5"; # Has no git tag + # Has no git tag, https://github.com/internetarchive/surt/issues/26 + rev = "6934c321b3e2f66af9c001d882475949f00570c5"; hash = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4="; }; @@ -26,7 +31,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "surt" ]; + pythonImportsCheck = [ + "surt" + ]; + + disabledTests = [ + # Tests want to download Public Suffix List + "test_getPublicPrefix" + "test_getPublicSuffix" + ]; meta = with lib; { description = "Sort-friendly URI Reordering Transform (SURT) python module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix index 3032761032..660d32a673 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sv-ttk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "sv-ttk"; - version = "2.4.5"; + version = "2.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sv_ttk"; - hash = "sha256-ysRhRxrml+wmluH8F5AE7vZYXrTNUg5ZzI+26jwpOpc="; + hash = "sha256-m7/iq6bMb5/fcNeTMQRlQ8lmb8zMeLrV/2SKmYfjzts="; }; # No tests available diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix index ab6d341b26..568c2dc678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sybil"; - version = "4.0.1"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "simplistix"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NvgmAFRuiBbyPnJykQlYNyQYALx1bFubMrakw671fDY="; + hash = "sha256-FeyamQDm/EqOWrRlxA8iIQniHI5xag+zUVfRGRHmslE="; }; # Circular dependency with testfixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index 60ae595848..599b2e7456 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub , cython , cmake @@ -12,24 +11,16 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.2"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; - rev = "v${version}"; - hash = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; + rev = "refs/tags/v${version}"; + hash = "sha256-03lHip0iExfptrUe5ObA6xXrsfS4QJPrh1Z0v7q2lDI="; }; - patches = [ - (fetchpatch { - # setuptools 61 compat - url = "https://github.com/symengine/symengine.py/commit/987e665e71cf92d1b021d7d573a1b9733408eecf.patch"; - hash = "sha256-2QbNdw/lKYRIRpOU5BiwF2kK+5Lh2j/Q82MKUIvl0+c="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/syncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/syncer/default.nix index cd3bbf699d..48345b94e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/syncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/syncer/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "syncer"; - version = "1.3.0"; + version = "2.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miyakogi"; repo = pname; rev = "v${version}"; - sha256 = "13y8jllix1ipkcg9lxa4nxk8kj24vivxfizf4d02cdrha9dw500v"; + sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso="; }; # Tests require an not maintained package (xfail) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix index 601fdee703..6bcdde6c73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix @@ -1,35 +1,49 @@ { lib , buildPythonPackage -, python , fetchPypi , defusedxml , requests , packaging , requests-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.25"; + version = "0.28"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-01TRYkXEWagFrSB7zvP6Bj4YvIFoaVkgrIm/gSWkILY="; + hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA="; }; - propagatedBuildInputs = [ defusedxml requests packaging ]; + propagatedBuildInputs = [ + defusedxml + requests + packaging + ]; - checkInputs = [ requests-mock ]; + nativeCheckInputs = [ + requests-mock + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + # Tests attempt to create some file artifacts and fails + doCheck = false; - doCheck = false; # it attempts to create some file artifacts and fails + pythonImportsCheck = [ + "tableauserverclient" + ]; - meta = { - description = "A Python module for working with the Tableau Server REST API."; - homepage = "https://pypi.org/project/tableauserverclient/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + meta = with lib; { + description = "Module for working with the Tableau Server REST API"; + homepage = "https://github.com/tableau/server-client-python"; + changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix index 8705f64817..c1726ee97a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -36,6 +36,12 @@ buildPythonPackage rec { url = "https://github.com/PyTables/PyTables/commit/337792561e5924124efd20d6fea6bbbd2428b2aa.patch"; hash = "sha256-pz3A/jTPWXXlzr+Yl5PRUvdSAinebFsoExfek4RUHkc="; }) + (fetchpatch { + name = "numexpr-2.8.5-compatibility.patch"; + url = "https://github.com/PyTables/PyTables/commit/1a235490ebe1a138da1139cfa19829b5f0a2af37.patch"; + includes = [ "tables/tests/test_queries.py" ]; + hash = "sha256-uMS+Z2Zcz68ILMQaBdIDMnCyasozCaCGOiGIyw0+Evc="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix index 585cf7205e..2bacc67690 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix @@ -7,13 +7,14 @@ , pandas , pytestCheckHook , pythonOlder -, setuptools-scm , setuptools +, setuptools-scm +, jpype1 }: buildPythonPackage rec { pname = "tabula-py"; - version = "2.7.0"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,28 +23,30 @@ buildPythonPackage rec { owner = "chezou"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SV4QLvk7dXtU0/husS5A5mBYvbTejLyO9PpiO2oBtjs="; + hash = "sha256-Zrq1i+HYXXNulyZ/fv00AgVd7ODj3rP9orLq5rT3ERU="; }; - patches = [ - ./java-interpreter-path.patch - ]; - postPatch = '' - sed -i 's|@JAVA@|${jre}/bin/java|g' $(find -name '*.py') + substituteInPlace tabula/backend.py \ + --replace '"java"' '"${lib.getExe jre}"' ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; + buildInputs = [ + jre + ]; + propagatedBuildInputs = [ distro numpy pandas - setuptools + jpype1 ]; nativeCheckInputs = [ @@ -60,6 +63,11 @@ buildPythonPackage rec { "test_read_pdf_with_remote_template" "test_read_remote_pdf" "test_read_remote_pdf_with_custom_user_agent" + # not sure what it checks + # probably related to jpype, but we use subprocess instead + # https://github.com/chezou/tabula-py/issues/352#issuecomment-1730791540 + # Failed: DID NOT RAISE + "test_read_pdf_with_silent_true" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch deleted file mode 100644 index fcd0362879..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/java-interpreter-path.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru origsource/tabula/io.py source/tabula/io.py ---- origsource/tabula/io.py 2022-11-23 17:19:35.419837514 +0100 -+++ source/tabula/io.py 2022-11-23 17:22:08.204194807 +0100 -@@ -79,7 +79,7 @@ - ) - ) - -- args = ["java"] + java_options + ["-jar", _jar_path()] + options.build_option_list() -+ args = ["@JAVA@"] + java_options + ["-jar", _jar_path()] + options.build_option_list() - if path: - args.append(path) - -diff -ru origsource/tabula/util.py source/tabula/util.py ---- origsource/tabula/util.py 2022-11-23 17:19:35.422837521 +0100 -+++ source/tabula/util.py 2022-11-23 17:21:41.514132392 +0100 -@@ -26,7 +26,7 @@ - - try: - res = subprocess.check_output( -- ["java", "-version"], stderr=subprocess.STDOUT -+ ["@JAVA@", "-version"], stderr=subprocess.STDOUT - ).decode() - - except FileNotFoundError: -diff -ru origsource/tests/test_read_pdf_table.py source/tests/test_read_pdf_table.py ---- origsource/tests/test_read_pdf_table.py 2022-11-23 17:19:35.422837521 +0100 -+++ source/tests/test_read_pdf_table.py 2022-11-23 17:21:22.008086776 +0100 -@@ -281,7 +281,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8") - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ -@@ -355,7 +355,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=False) - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ -@@ -382,7 +382,7 @@ - - tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=True) - -- target_args = ["java"] -+ target_args = ["@JAVA@"] - if platform.system() == "Darwin": - target_args += ["-Djava.awt.headless=true"] - target_args += [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix index d992b42508..e87c489dae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix @@ -2,18 +2,28 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "tag-expressions"; - version = "1.1.0"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d"; + hash = "sha256-/6Ym72jlgVdpel4V2W2aCKNtISDT9y5qz7+gTllUuPg="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tagexpressions" + ]; meta = with lib; { description = "Package to parse logical tag expressions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix index a4fac1a315..b5bcc619ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tagoio-sdk"; - version = "4.2.0"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tago-io"; repo = "sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ebNiEvQ1U0RLrH3OOt/oRRPElg+9jibj7fsEEd1hdmU="; + hash = "sha256-R7qJIgL8/zejIuT6YMnC3bdm8lKLBTK5eVjVDEjvRKs="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix index 806da0dc3e..c146c7fd9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,22 +14,22 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.3.0"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; rev = "refs/tags/v${version}"; - hash = "sha256-gGDsVGsCBZi/pxD0cyH3+xrvHVBC+wJCcl/NGqsTqiE="; + hash = "sha256-wO6yMMU5fxk8GQ0e4ZCse2atlR4wrzulZOFXkVKAsmU="; }; postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ --replace "--cov" "" ''; @@ -38,7 +39,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro + orjson yarl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix index 2f06b665d3..0441fb2894 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.7.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; + sha256 = "sha256-pt8w8nLAi/i+ZuB3X62GIAXZUKa4RJuU98eIcx1w7Nc="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix new file mode 100644 index 0000000000..b79cd78bf4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/telegram-text/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "telegram-text"; + version = "0.1.2"; + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "SKY-ALIN"; + repo = "telegram-text"; + rev = "v${version}"; + hash = "sha256-p8SVQq7IvkVuOFE8VDugROLY5Wk0L2HmXyacTzFFSP4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python markup module for Telegram messenger"; + downloadPage = "https://github.com/SKY-ALIN/telegram-text"; + homepage = "https://telegram-text.alinsky.tech/"; + changelog = "https://github.com/SKY-ALIN/telegram-text/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} 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 91017b8403..5fe70090fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tenacity"; - version = "8.2.2"; + version = "8.2.3"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Q68DeCK9ACkCWHfzstl8xNe7DCmRAAo9WdcVF8XJaeA="; + hash = "sha256-U5jvDXjmP0AAfB+0wL/5bhkROU0vqNGU93YZwF/2zIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix index d6df4fc0b2..5ff48c7cc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "tensorboard-data-server"; - version = "0.6.1"; + version = "0.7.1"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit version format; dist = "py3"; python = "py3"; - hash = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + hash = "sha256-mTi9OfUEF5ezOSEGb7oOqwOg3RDRiHoF5irliEGtTD8="; }; pythonImportsCheck = [ "tensorboard_data_server" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix index c49fcad075..73c76d7477 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.11.0"; + version = "2.14.0"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-oOWS7oeWLhevPw3Of6rj+70jkDAVnp5iXM6BC341xT0="; + hash = "sha256-Nmf5dF2ZKAg2rWcwIjYshA9g7Y/v1aPjC/Bx9aj9ABc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 677afda4f1..e81e9736c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -27,17 +27,17 @@ }: let - version = "0.19.0"; - pname = "tensorflow_probability"; + version = "0.21.0"; + pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { - name = "${pname}-${version}-py2.py3-none-any.whl"; + name = "tensorflow_probability-${version}-py2.py3-none-any.whl"; src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "v" + version; - hash = "sha256-ZkQ20Qt/RF/leVP6Kc38tGgPz+C6lEuHvoL+s97oksE="; + rev = "refs/tags/v${version}"; + hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU="; }; nativeBuildInputs = [ # needed to create the output wheel in installPhase @@ -54,7 +54,7 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-XChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk="; + sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM="; }; buildAttrs = { @@ -116,6 +116,6 @@ in buildPythonPackage { description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; - maintainers = with maintainers; []; # This package is maintainerless. + maintainers = with maintainers; [ GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch new file mode 100644 index 0000000000..1b130e2266 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch @@ -0,0 +1,11 @@ +diff -Naurd x/third_party/systemlibs/absl_py.absl.flags.BUILD y/third_party/systemlibs/absl_py.absl.flags.BUILD +--- x/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:02:15.079683729 +0000 ++++ y/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:04:58.491897303 +0000 +@@ -5,3 +5,7 @@ + py_library( + name = "flags", + ) ++ ++py_library( ++ name = "argparse_flags", ++) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_to_std.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_to_std.patch new file mode 100644 index 0000000000..b834ec983c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/absl_to_std.patch @@ -0,0 +1,389 @@ +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor.cc y/tensorflow/c/experimental/stream_executor/stream_executor.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "absl/functional/any_invocable.h" + #include "tensorflow/c/c_api_macros.h" +@@ -275,17 +276,17 @@ + stream_executor_->unified_memory_deallocate(&device_, mem); + } + +- absl::optional GetAllocatorStats() override { ++ std::optional GetAllocatorStats() override { + SP_AllocatorStats c_stats{SP_ALLOCATORSTATS_STRUCT_SIZE}; + TF_Bool has_stats = + stream_executor_->get_allocator_stats(&device_, &c_stats); + if (!has_stats) { +- return absl::nullopt; ++ return std::nullopt; + } + tsl::Status status = ValidateSPAllocatorStats(c_stats); + if (!status.ok()) { + LOG(ERROR) << status.message(); +- return absl::nullopt; ++ return std::nullopt; + } + ::stream_executor::AllocatorStats stats; + stats.num_allocs = c_stats.num_allocs; +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/c/experimental/stream_executor/stream_executor.h" + + #include ++#include + + #include "tensorflow/c/experimental/stream_executor/stream_executor_internal.h" + #include "tensorflow/c/experimental/stream_executor/stream_executor_test_util.h" +@@ -239,7 +240,7 @@ + }; + + StreamExecutor* executor = GetExecutor(0); +- absl::optional optional_stats = executor->GetAllocatorStats(); ++ std::optional optional_stats = executor->GetAllocatorStats(); + ASSERT_TRUE(optional_stats.has_value()); + AllocatorStats stats = optional_stats.value(); + ASSERT_EQ(stats.bytes_in_use, 123); +diff -Naurd x/tensorflow/compiler/xla/stream_executor/allocator_stats.h y/tensorflow/compiler/xla/stream_executor/allocator_stats.h +--- x/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:25:55.064649379 +0000 ++++ y/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:29:11.700743574 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_COMPILER_XLA_STREAM_EXECUTOR_ALLOCATOR_STATS_H_ + + #include ++#include + + #include "absl/types/optional.h" + #include "tensorflow/compiler/xla/stream_executor/platform/port.h" +diff -Naurd x/tensorflow/core/common_runtime/mkl_cpu_allocator.h y/tensorflow/core/common_runtime/mkl_cpu_allocator.h +--- x/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:25:58.996651199 +0000 ++++ y/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -22,6 +22,7 @@ + #ifdef INTEL_MKL + + #include ++#include + + #include "tensorflow/core/common_runtime/bfc_allocator.h" + #include "tensorflow/core/common_runtime/pool_allocator.h" +@@ -80,7 +81,7 @@ + port::AlignedFree(ptr); + } + +- absl::optional GetStats() override { ++ std::optional GetStats() override { + mutex_lock l(mutex_); + return stats_; + } +@@ -242,7 +243,7 @@ + large_size_allocator_->DeallocateRaw(ptr); + } + } +- absl::optional GetStats() override { ++ std::optional GetStats() override { + auto s_stats = small_size_allocator_->GetStats(); + auto l_stats = large_size_allocator_->GetStats(); + +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -32,7 +32,7 @@ + return sub_allocator_->Free(ptr, 0); + } + +-absl::optional PluggableDeviceSimpleAllocator::GetStats() { ++std::optional PluggableDeviceSimpleAllocator::GetStats() { + AllocatorStats stats_; + stats_.num_allocs = 0; + stats_.peak_bytes_in_use = 0; +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/common_runtime/device/device_mem_allocator.h" + #include "tensorflow/core/platform/thread_annotations.h" +@@ -37,7 +38,7 @@ + + bool TracksAllocationSizes() const override { return false; } + string Name() override { return "Simple allocator"; } +- absl::optional GetStats() override; ++ std::optional GetStats() override; + + AllocatorMemoryType GetMemoryType() const override { + return sub_allocator_->GetMemoryType(); +diff -Naurd x/tensorflow/core/common_runtime/process_state.h y/tensorflow/core/common_runtime/process_state.h +--- x/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:25:59.076651236 +0000 ++++ y/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:29:11.704743576 +0000 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/framework/allocator_registry.h" +@@ -144,7 +145,7 @@ + size_t AllocatedSize(const void* p) const override { + return a_->AllocatedSize(p); + } +- absl::optional GetStats() override { return a_->GetStats(); } ++ std::optional GetStats() override { return a_->GetStats(); } + bool ClearStats() override { return a_->ClearStats(); } + + AllocatorMemoryType GetMemoryType() const override { +diff -Naurd x/tensorflow/core/common_runtime/step_stats_collector.cc y/tensorflow/core/common_runtime/step_stats_collector.cc +--- x/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:25:59.112651253 +0000 ++++ y/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/core/common_runtime/step_stats_collector.h" + + #include ++#include + + #include "tensorflow/core/common_runtime/costmodel_manager.h" + #include "tensorflow/core/framework/allocation_description.pb.h" +@@ -175,7 +176,7 @@ + memory->set_peak_bytes(std::get<1>(sizes)); + memory->set_live_bytes(std::get<2>(sizes)); + +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + if (stats) { + memory->set_allocator_bytes_in_use(stats->bytes_in_use); + } +diff -Naurd x/tensorflow/core/framework/allocator_test.cc y/tensorflow/core/framework/allocator_test.cc +--- x/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:25:59.524651443 +0000 ++++ y/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + #include "tensorflow/core/framework/typed_allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -33,7 +34,7 @@ + + static void CheckStats(Allocator* a, int64_t num_allocs, int64_t bytes_in_use, + int64_t peak_bytes_in_use, int64_t largest_alloc_size) { +- absl::optional stats = a->GetStats(); ++ std::optional stats = a->GetStats(); + EXPECT_TRUE(stats); + if (!stats) { + return; +@@ -255,7 +256,7 @@ + EXPECT_EQ(e0.Name(), "MemoryAllocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional bytes_allocated, peak_bytes_in_use, ++ std::optional bytes_allocated, peak_bytes_in_use, + requested_bytes, allocation_bytes; + e0.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + LOG(ERROR) << "STAT " << stat.Name() << ": " << stat.ToString(); +@@ -282,7 +283,7 @@ + EXPECT_EQ(e1.Name(), "MemoryDeallocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional bytes_allocated, peak_bytes_in_use, ++ std::optional bytes_allocated, peak_bytes_in_use, + allocation_bytes; + e1.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + if (stat.Name() == "bytes_allocated") { +diff -Naurd x/tensorflow/core/framework/tracking_allocator_test.cc y/tensorflow/core/framework/tracking_allocator_test.cc +--- x/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:25:59.700651525 +0000 ++++ y/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -16,6 +16,7 @@ + #include "tensorflow/core/framework/tracking_allocator.h" + + #include ++#include + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -44,7 +45,7 @@ + EXPECT_NE(size_map_.end(), iter); + return iter->second; + } +- absl::optional GetStats() override { return absl::nullopt; } ++ std::optional GetStats() override { return std::nullopt; } + + private: + std::unordered_map size_map_; +@@ -58,7 +59,7 @@ + } + void DeallocateRaw(void* ptr) override {} + bool TracksAllocationSizes() const override { return true; } +- absl::optional GetStats() override { return absl::nullopt; } ++ std::optional GetStats() override { return std::nullopt; } + }; + + TEST(TrackingAllocatorTest, SimpleNoTracking) { +diff -Naurd x/tensorflow/core/grappler/clusters/single_machine.cc y/tensorflow/core/grappler/clusters/single_machine.cc +--- x/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:25:59.964651648 +0000 ++++ y/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + #include "tensorflow/cc/training/queue_runner.h" + #include "tensorflow/core/common_runtime/device.h" +@@ -230,7 +231,7 @@ + return Status(absl::StatusCode::kInvalidArgument, + "Tracking allocation is not enabled."); + } +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + (*device_peak_memory)[device->name()] = + (stats ? stats->peak_bytes_in_use : 0); + } +diff -Naurd x/tensorflow/core/kernels/stack.cc y/tensorflow/core/kernels/stack.cc +--- x/tensorflow/core/kernels/stack.cc 2023-10-19 14:26:01.668652437 +0000 ++++ y/tensorflow/core/kernels/stack.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #include "tensorflow/core/common_runtime/device.h" + #include "tensorflow/core/framework/device_base.h" +@@ -245,7 +246,7 @@ + DeviceContext* device_ctxt = ctx->op_device_context(); + auto device = static_cast(ctx->device()); + Allocator* allocator = device->GetAllocator(alloc_attrs); +- absl::optional stats = allocator->GetStats(); ++ std::optional stats = allocator->GetStats(); + if (stats && *stats->bytes_limit && + stats->bytes_in_use > (*stats->bytes_limit * kOccupancy)) { + // Asynchronously copy the tensor from GPU to CPU memory. +diff -Naurd x/tensorflow/python/tfe_wrapper.cc y/tensorflow/python/tfe_wrapper.cc +--- x/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:26:10.716656639 +0000 ++++ y/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -14,6 +14,7 @@ + ==============================================================================*/ + + #include ++#include + + #include "Python.h" + #include "absl/strings/match.h" +@@ -691,7 +692,7 @@ + tensorflow::AllocatorAttributes attrs; + tensorflow::Allocator* allocator = matched_device->GetAllocator(attrs); + +- if (absl::optional stats = ++ if (std::optional stats = + allocator->GetStats()) { + return std::map{{"current", stats->bytes_in_use}, + {"peak", stats->peak_bytes_in_use}}; +diff -Naurd x/tensorflow/tsl/framework/allocator.h y/tensorflow/tsl/framework/allocator.h +--- x/tensorflow/tsl/framework/allocator.h 2023-10-19 14:26:15.884659044 +0000 ++++ y/tensorflow/tsl/framework/allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -216,7 +216,7 @@ + } + + // Fills in 'stats' with statistics collected by this allocator. +- virtual absl::optional GetStats() { return absl::nullopt; } ++ virtual std::optional GetStats() { return std::nullopt; } + + // If implemented, clears the internal stats except for the `in_use` fields + // and sets the `peak_bytes_in_use` to be equal to the `bytes_in_use`. Returns +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.cc y/tensorflow/tsl/framework/bfc_allocator.cc +--- x/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -1205,7 +1205,7 @@ + return md; + } + +-absl::optional BFCAllocator::GetStats() { ++std::optional BFCAllocator::GetStats() { + mutex_lock l(lock_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.h y/tensorflow/tsl/framework/bfc_allocator.h +--- x/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include "absl/container/flat_hash_set.h" + #include "tensorflow/tsl/framework/allocator.h" +@@ -93,7 +94,7 @@ + + int64_t AllocationId(const void* ptr) const override; + +- absl::optional GetStats() override; ++ std::optional GetStats() override; + + bool ClearStats() override; + +diff -Naurd x/tensorflow/tsl/framework/cpu_allocator_impl.cc y/tensorflow/tsl/framework/cpu_allocator_impl.cc +--- x/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:26:15.928659065 +0000 ++++ y/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/framework/allocator_registry.h" +@@ -145,8 +146,8 @@ + /*level=*/tsl::profiler::TraceMeLevel::kInfo); + } + +- absl::optional GetStats() override { +- if (!cpu_allocator_collect_stats) return absl::nullopt; ++ std::optional GetStats() override { ++ if (!cpu_allocator_collect_stats) return std::nullopt; + mutex_lock l(mu_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.cc y/tensorflow/tsl/framework/tracking_allocator.cc +--- x/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -152,7 +152,7 @@ + } + } + +-absl::optional TrackingAllocator::GetStats() { ++std::optional TrackingAllocator::GetStats() { + return allocator_->GetStats(); + } + +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.h y/tensorflow/tsl/framework/tracking_allocator.h +--- x/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:29:11.712743580 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_TSL_FRAMEWORK_TRACKING_ALLOCATOR_H_ + + #include ++#include + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/lib/gtl/inlined_vector.h" +@@ -66,7 +67,7 @@ + size_t RequestedSize(const void* ptr) const override; + size_t AllocatedSize(const void* ptr) const override; + int64_t AllocationId(const void* ptr) const override; +- absl::optional GetStats() override; ++ std::optional GetStats() override; + bool ClearStats() override; + + AllocatorMemoryType GetMemoryType() const override { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch new file mode 100644 index 0000000000..ebb2fb129c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch @@ -0,0 +1,166 @@ +diff -Naurd x/third_party/absl/system.absl.base.BUILD y/third_party/absl/system.absl.base.BUILD +--- x/third_party/absl/system.absl.base.BUILD 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/system.absl.base.BUILD 2023-09-17 09:16:01.200082822 +0000 +@@ -22,7 +22,12 @@ + + cc_library( + name = "raw_logging_internal", +- linkopts = ["-labsl_raw_logging_internal"], ++ linkopts = [ ++ "-labsl_raw_logging_internal", ++ "-labsl_log_internal_conditions", ++ "-labsl_log_internal_message", ++ "-labsl_log_internal_nullguard", ++ ], + visibility = [ + "//absl:__subpackages__", + ], +diff -Naurd x/third_party/absl/system.absl.log.BUILD y/third_party/absl/system.absl.log.BUILD +--- x/third_party/absl/system.absl.log.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/absl/system.absl.log.BUILD 2023-09-17 09:12:11.795762177 +0000 +@@ -0,0 +1,134 @@ ++load("@rules_cc//cc:defs.bzl", "cc_library") ++ ++package(default_visibility = ["//visibility:public"]) ++ ++cc_library( ++ name = "absl_check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "absl_log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "die_if_null", ++ deps = [ ++ ":log", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "flags", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/flags:flag", ++ "//absl/flags:marshalling", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "globals", ++ deps = [ ++ "//absl/base:atomic_hook", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/hash", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "initialize", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/time", ++ ], ++) ++ ++cc_library( ++ name = "log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "log_entry", ++ deps = [ ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/time", ++ "//absl/types:span", ++ ], ++) ++ ++cc_library( ++ name = "log_sink", ++ deps = [ ++ ":log_entry", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_sink_registry", ++ deps = [ ++ ":log_sink", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_streamer", ++ deps = [ ++ ":absl_log", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/strings:internal", ++ "//absl/types:optional", ++ "//absl/utility", ++ ], ++) ++ ++cc_library( ++ name = "scoped_mock_log", ++ deps = [ ++ ":log_entry", ++ ":log_sink", ++ ":log_sink_registry", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/base:raw_logging_internal", ++ "//absl/strings", ++ "@com_google_googletest//:gtest", ++ ], ++) ++ ++cc_library( ++ name = "structured", ++ deps = [ ++ "//absl/base:config", ++ "//absl/strings", ++ ], ++) +diff -Naurd x/third_party/absl/workspace.bzl y/third_party/absl/workspace.bzl +--- x/third_party/absl/workspace.bzl 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/workspace.bzl 2023-09-17 09:12:11.795762177 +0000 +@@ -20,6 +20,7 @@ + "flags", + "functional", + "hash", ++ "log", + "memory", + "meta", + "numeric", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 348f5197a9..ff95c847ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -1,18 +1,18 @@ -{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath, fetchpatch +{ stdenv, bazel_5, buildBazelPackage, lib, fetchFromGitHub, symlinkJoin +, addOpenGLRunpath, fetchpatch, fetchzip, linkFarm # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorboard, absl-py -, packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta +, numpy, tensorboard, abseil-cpp, absl-py +, packaging, setuptools, wheel, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps -, git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils +, git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync -, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core +, curl, snappy, flatbuffers-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core # Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See @@ -53,7 +53,18 @@ let if cudaSupport then cudaPackages.backendStdenv else if originalStdenv.isDarwin then llvmPackages_11.stdenv else originalStdenv; - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) + # cudaPackages.cudnn led to this: + # https://github.com/tensorflow/tensorflow/issues/60398 + cudnn = cudaPackages.cudnn_8_6; + gentoo-patches = fetchzip { + url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; + hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; + }; + protobuf-extra = linkFarm "protobuf-extra" [ + { name = "include"; path = protobuf-core.src; } + ]; in assert cudaSupport -> cudatoolkit != null @@ -99,7 +110,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.11.1"; + version = "2.13.0"; variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; @@ -208,14 +219,14 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "refs/tags/v${version}"; - hash = "sha256-q59cUW6613byHk4LGl+sefO5czLSWxOrSyLbJ1pkNEY="; + hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; }; # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - which pythonEnv cython perl protobuf-core + which pythonEnv cython perl protobuf-core protobuf-extra ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -225,6 +236,7 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism + abseil-cpp boringssl curl double-conversion @@ -236,7 +248,6 @@ let jsoncpp libjpeg_turbo libpng - lmdb-core (pybind11.overridePythonAttrs (_: { inherit stdenv; })) snappy sqlite @@ -265,6 +276,7 @@ let "astor_archive" "astunparse_archive" "boringssl" + "com_google_absl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -284,7 +296,6 @@ let "icu" "jsoncpp_git" "libjpeg_turbo" - "lmdb" "nasm" "opt_einsum_archive" "org_sqlite" @@ -328,6 +339,25 @@ let GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc"; + patches = [ + "${gentoo-patches}/0002-systemlib-Latest-absl-LTS-has-split-cord-libs.patch" + "${gentoo-patches}/0005-systemlib-Updates-for-Abseil-20220623-LTS.patch" + "${gentoo-patches}/0007-systemlibs-Add-well_known_types_py_pb2-target.patch" + # https://github.com/conda-forge/tensorflow-feedstock/pull/329/commits/0a63c5a962451b4da99a9948323d8b3ed462f461 + (fetchpatch { + name = "fix-layout-proto-duplicate-loading.patch"; + url = "https://raw.githubusercontent.com/conda-forge/tensorflow-feedstock/0a63c5a962451b4da99a9948323d8b3ed462f461/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch"; + hash = "sha256-/7buV6DinKnrgfqbe7KKSh9rCebeQdXv2Uj+Xg/083w="; + }) + ./com_google_absl_add_log.patch + ./absl_py_argparse_flags.patch + ./protobuf_python.patch + ./pybind11_protobuf_python_runtime_dep.patch + ./pybind11_protobuf_newer_version.patch + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + ./absl_to_std.patch + ]; + postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion @@ -395,18 +425,30 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o=" - else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0="; - aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk="; - x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU="; - aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc="; + then "sha256-5VFMNHeLrUxW5RTr6EhT3pay9nWJ5JkZTGirDds5QkU=" + else "sha256-KzgWV69Btr84FdwQ5JI2nQEsqiPg1/+TWdbw5bmxXOE="; + aarch64-linux = "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; + x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w="; + aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; buildAttrs = { outputs = [ "out" "python" ]; + # need to rebuild schemas since we use a different flatbuffers version preBuild = '' + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c schema.fbs) + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c conversion_metadata.fbs) + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc -o configuration.fbs --proto configuration.proto) + sed -i s,tflite.proto,tflite,g tensorflow/lite/acceleration/configuration/configuration.fbs/configuration.fbs + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc --gen-compare --gen-object-api -c configuration.fbs/configuration.fbs) + cp -r tensorflow/lite/acceleration/configuration/configuration.fbs tensorflow/lite/experimental/acceleration/configuration + (cd tensorflow/lite/experimental/acceleration/configuration;${flatbuffers-core}/bin/flatc -c configuration.fbs/configuration.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -c compiled_program_cache.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c serialization.fbs) + (cd tensorflow/lite/delegates/gpu/common;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c gpu_model.fbs) + (cd tensorflow/lite/delegates/gpu/common/task;${flatbuffers-core}/bin/flatc -c serialization_base.fbs) patchShebangs . ''; @@ -448,10 +490,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - # More vulnerabilities in 2.11.1 really; https://github.com/tensorflow/tensorflow/releases - knownVulnerabilities = [ "CVE-2023-33976" ]; - broken = true || # most likely needs dealing with protobuf/abseil updates - !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; + broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s @@ -460,7 +499,7 @@ let in buildPythonPackage { inherit version pname; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = bazel-build.python; @@ -493,6 +532,7 @@ in buildPythonPackage { # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ absl-py + abseil-cpp astunparse flatbuffers-python gast @@ -529,7 +569,6 @@ in buildPythonPackage { # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py nativeCheckInputs = [ dill - keras portpicker tblib ]; @@ -540,18 +579,15 @@ in buildPythonPackage { hello = tf.constant("Hello, world!") tf.print(hello) - # Fit a simple model to random data - import numpy as np - np.random.seed(0) tf.random.set_seed(0) - model = tf.keras.models.Sequential([ - tf.keras.layers.Dense(1, activation="linear") - ]) - model.compile(optimizer="sgd", loss="mse") - - x = np.random.uniform(size=(1,1)) - y = np.random.uniform(size=(1,)) - model.fit(x, y, epochs=1) + width = 512 + choice = 48 + t_in = tf.Variable(tf.random.uniform(shape=[width])) + with tf.GradientTape() as tape: + t_out = tf.slice(tf.nn.softmax(t_in), [choice], [1]) + diff = tape.gradient(t_out, t_in) + assert(0 < tf.reduce_min(tf.slice(diff, [choice], [1]))) + assert(0 > tf.reduce_max(tf.slice(diff, [1], [choice - 1]))) EOF ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/protobuf_python.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/protobuf_python.patch new file mode 100644 index 0000000000..11de26605b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/protobuf_python.patch @@ -0,0 +1,19 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-16 20:44:02.266422132 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-16 20:50:40.370998305 +0000 +@@ -469,6 +469,7 @@ + system_link_files = { + "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl", + "//third_party/systemlibs:protobuf_deps.bzl": "protobuf_deps.bzl", ++ "//third_party/systemlibs:protobuf.python.BUILD": "python/BUILD", + }, + urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"), + ) +diff -Naurd x/third_party/systemlibs/protobuf.python.BUILD y/third_party/systemlibs/protobuf.python.BUILD +--- x/third_party/systemlibs/protobuf.python.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/systemlibs/protobuf.python.BUILD 2023-09-16 20:49:12.514890584 +0000 +@@ -0,0 +1,4 @@ ++cc_library( ++ name = "proto_api", ++ visibility = ["//visibility:public"] ++) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch new file mode 100644 index 0000000000..460ada1fb5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch @@ -0,0 +1,16 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-21 12:55:06.104407343 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-21 12:55:39.732453203 +0000 +@@ -872,9 +872,9 @@ + + tf_http_archive( + name = "pybind11_protobuf", +- urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), +- sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", +- strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", ++ urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/c8cc30e2495309e3499b7d76033446236d21c837.zip"), ++ sha256 = "0663f73b34c0b4af55003edbb066e62aceff99bfcf12e47ea9a15d6013d81413", ++ strip_prefix = "pybind11_protobuf-c8cc30e2495309e3499b7d76033446236d21c837", + patch_file = [ + "//third_party/pybind11_protobuf:remove_license.patch", + "//third_party/pybind11_protobuf:python_runtime_dep.patch", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch new file mode 100644 index 0000000000..daebaac868 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch @@ -0,0 +1,30 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-17 22:22:22.029075202 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-17 22:25:27.501289587 +0000 +@@ -876,7 +876,10 @@ + urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), + sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", + strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", +- patch_file = ["//third_party/pybind11_protobuf:remove_license.patch"], ++ patch_file = [ ++ "//third_party/pybind11_protobuf:remove_license.patch", ++ "//third_party/pybind11_protobuf:python_runtime_dep.patch", ++ ], + ) + + tf_http_archive( +diff -Naurd x/third_party/pybind11_protobuf/python_runtime_dep.patch y/third_party/pybind11_protobuf/python_runtime_dep.patch +--- x/third_party/pybind11_protobuf/python_runtime_dep.patch 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/pybind11_protobuf/python_runtime_dep.patch 2023-09-17 22:23:07.849128180 +0000 +@@ -0,0 +1,11 @@ ++diff -Naurd x/pybind11_protobuf/BUILD y/pybind11_protobuf/BUILD ++--- x/pybind11_protobuf/BUILD 2023-09-17 22:17:19.932725814 +0000 +++++ y/pybind11_protobuf/BUILD 2023-09-17 22:20:44.056961932 +0000 ++@@ -86,6 +86,7 @@ ++ "//visibility:private", ++ ], ++ deps = [ +++ "@org_tensorflow//third_party/python_runtime:headers", ++ "@com_google_absl//absl/container:flat_hash_map", ++ "@com_google_absl//absl/container:flat_hash_set", ++ "@com_google_absl//absl/meta:type_traits", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix index ba5244f66a..0d40a1b44f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-38isPzUHiPI7KUez5s+lpTtjC2EubNiWWgFad2AguZo="; + hash = "sha256-tbCPaJN/E4/pL2wIm5nx4toK5WxSt4v3B1/ZVCD9mlo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 4883c86f49..fe840bcd4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.5"; + version = "3.9.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sWdcydH83b3Ftp2LJcTlXXbU5IMmFWwcOiCddcyVXY4="; + hash = "sha256-A59b7qr9Y4LuIwP51ci7k1019/T+qNcDYPDNCkmqpi4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix index 268ee99785..4b7a89ea7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pz82cutgQ9ifMS6+40mcBiOsXIqeEquYdBWT+npZNPY="; + sha256 = "sha256-RVJfocGjVvnRVanekbN1nKRECEr9hTVE9aKaqFizA5A="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 4ccc1251a8..64b49efbd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.1.0"; + version = "7.2.0"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-RWzk85MWDyfNaEClNw7PSnDxchc39eZ6KveebIF4BKQ="; + hash = "sha256-jIwg3TDqETVIUHWEodqud5JI26pXEmcseruXCfD7+LI="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix index e0780dd768..c4f74d377d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; + sha256 = "sha256-KLZeFMDy0+y7+19VydzeXk+qgKwWo3qCOQmh/jy8swo="; }; propagatedBuildInputs = [ pbr python-mimeparse extras ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 2986f3428e..4167cfd7d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -3,6 +3,7 @@ , cachetools , cytoolz , fetchPypi +, floret , jellyfish , joblib , matplotlib @@ -21,18 +22,19 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "2c92bdd6b47305447b64e4cb6cc43c11675f021f910a8074bc8149dbf5325e5b"; + sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ cachetools cytoolz + floret jellyfish joblib matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textnets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textnets/default.nix index c2e46990c1..f0dd9ab9a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textnets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textnets/default.nix @@ -59,6 +59,12 @@ buildPythonPackage rec { "textnets" ]; + disabledTests = [ + # Test fails: A warning is triggered because of a deprecation notice by pandas. + # TODO: Try to re-enable it when pandas is updated to 2.1.1 + "test_corpus_czech" + ]; + meta = with lib; { description = "Text analysis with networks"; homepage = "https://textnets.readthedocs.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textparser/default.nix new file mode 100644 index 0000000000..86c436ac21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/textparser/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "textparser"; + version = "0.24.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VvcI51qp0AKtt22CO6bvFm1+zsHj5MpMHKED+BdWgzU="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "textparser" + ]; + + meta = with lib; { + homepage = "https://github.com/eerimoq/textparser"; + description = "A text parser"; + license = licenses.mit; + maintainers = with maintainers; [ gray-heron ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix index 5afe66941c..d1134a2860 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix @@ -1,20 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "texttable"; - version = "1.6.7"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KQNI+2f3dGkxvN/VWsdYTs1OWwhGqxZDM/B5SxIXYPI="; + hash = "sha256-LSBo+1URWAfTrHekymj6SIA+hOuw7iNA+FgQejZSJjg="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "texttable" + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + meta = with lib; { - description = "A module to generate a formatted text table, using ASCII characters"; + description = "Module to generate a formatted text table, using ASCII characters"; homepage = "https://github.com/foutaise/texttable"; - license = licenses.lgpl2; + changelog = "https://github.com/foutaise/texttable/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textual-dev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textual-dev/default.nix new file mode 100644 index 0000000000..16b77ffabc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/textual-dev/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, msgpack +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, textual +, time-machine +, typing-extensions +}: + +buildPythonPackage rec { + pname = "textual-dev"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual-dev"; + # we use rev instead of tag since upstream doesn't use tags + rev = "6afa9013a42cb18e9105e49d6a56874097f7c812"; + hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + msgpack + textual + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ + "textual_dev" + ]; + + meta = with lib; { + description = "Development tools for Textual"; + homepage = "https://github.com/Textualize/textual-dev"; + license = licenses.mit; + maintainers = with maintainers; [ yannip ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 9224f06511..5f14accbac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "textual-universal-directorytree"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "textual-universal-directorytree"; - rev = "v${version}"; - hash = "sha256-a7alxVmHTKJnJiU7X6UlUD2y7MY4O5TMR+02KcyPwEs="; + rev = "refs/tags/v${version}"; + hash = "sha256-FL2bwPGqBmDn33Rhj7+VEpuqB4znEAw+GGAODTs25oo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix index e4be329b0a..3a5486ff86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -1,15 +1,9 @@ { lib -, aiohttp , buildPythonPackage -, click , fetchFromGitHub , importlib-metadata , jinja2 -, linkify-it-py , markdown-it-py -, mdit-py-plugins -, mkdocs-exclude -, msgpack , poetry-core , pytest-aiohttp , pytestCheckHook @@ -17,13 +11,14 @@ , rich , syrupy , time-machine +, tree-sitter , typing-extensions }: buildPythonPackage rec { pname = "textual"; - version = "0.37.1"; - format = "pyproject"; + version = "0.41.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4ehq36j2n2wRMgos5x4LQ0QeELpWAOgpgTxEWjqFLJs="; + hash = "sha256-K3JpAVkw6njUT2AGGLL3ACagPK0K6Ny4PvCsbmuNvTo="; }; nativeBuildInputs = [ @@ -39,18 +34,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiohttp - click importlib-metadata - linkify-it-py markdown-it-py - mdit-py-plugins - mkdocs-exclude - msgpack rich - ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions - ]; + ] ++ markdown-it-py.optional-dependencies.plugins + ++ markdown-it-py.optional-dependencies.linkify; + + passthru.optional-dependencies = { + syntax = [ + tree-sitter + # tree-sitter-languages + ]; + }; nativeCheckInputs = [ jinja2 @@ -58,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook syrupy time-machine - ]; + ] ++ passthru.optional-dependencies.syntax; disabledTestPaths = [ # snapshot tests require syrupy<4 @@ -69,6 +65,9 @@ buildPythonPackage rec { # Assertion issues "test_textual_env_var" "test_softbreak_split_links_rendered_correctly" + + # requires tree-sitter-languages which is not packaged in nixpkgs + "test_register_language" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix index f9541cf23c..e169cbdb9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix @@ -12,7 +12,6 @@ , gprof2dot , html5lib , jinja2 -, memory_profiler , psutil , pytestCheckHook }: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix index af910a1611..488c276e91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix @@ -4,7 +4,7 @@ , gprof2dot , html5lib , jinja2 -, memory_profiler +, memory-profiler , psutil , pytestCheckHook , setuptools @@ -30,7 +30,7 @@ buildPythonPackage { gprof2dot html5lib jinja2 - memory_profiler + memory-profiler psutil pytestCheckHook setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix index b1fe7abfae..f1359e6fda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tf2onnx/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tf2onnx"; - version = "1.14.0"; + version = "1.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "onnx"; repo = "tensorflow-onnx"; - rev = "v${version}"; - hash = "sha256-JpXwf+GLjn0krsb5KnEhVuemWa0V2+wF10neDsdtOfI="; + rev = "refs/tags/v${version}"; + hash = "sha256-HqzcoPPX9+NOj0uFfOSVI2MNCkxq1NmLqXflwdi5RF0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix index 2748381f7d..8d240fe19e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b3Em2y8silQhKwXjp0DkX0KRxJfXXSB1Fyj2Nbt0qj0="; + hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; }; propagatedBuildInputs = [ levenshtein ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index a712f0078b..ccf17cdb11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -21,6 +21,7 @@ , pytestCheckHook , python , pythonOlder +, setuptools , srsly , tqdm , typing-extensions @@ -29,16 +30,25 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.10"; + version = "8.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bEpI19oH4EToSmjLubIvMvhJCZWiurC/xg5BLRSvuZE="; + hash = "sha256-zX/bPYg6FeaQYlTn+wFi9ph46czdH4UZ22/7/ka/b0k="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "preshed>=3.0.2,<3.1.0" "preshed" + ''; + + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ @@ -87,6 +97,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for NLP machine learning"; homepage = "https://github.com/explosion/thinc"; + changelog = "https://github.com/explosion/thinc/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aborsu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index b1102c44e9..1b9582a71c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.7.18"; + version = "2023.8.30"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-WlpiSy96t/N+nsQXSuLfGAW5ZY+JAT+bS1VQZy9l8qE="; + hash = "sha256-aoxTsBKihrddCaFJirMvIC8kzGJwoQW11ZEdxEJvFio="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix index 0d1e44468e..e148fce241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tika-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-yp9Wxc5RUZYhv2RxQwImZGqqoQmtZEkfEmj40ilxhQM="; + hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { description = "A modern Python REST client for Apache Tika server"; homepage = "https://github.com/stumpylog/tika-client"; changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3; + license = licenses.mpl20; maintainers = with maintainers; [ e1mo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/Cargo.lock index 1d99285451..e65fd819d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -40,12 +40,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -58,9 +57,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "fancy-regex" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ "bit-set", "regex", @@ -74,15 +73,15 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -90,24 +89,24 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[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 = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -121,31 +120,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "indoc", @@ -160,9 +159,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -170,9 +169,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -180,67 +179,73 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" 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" - [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -250,21 +255,35 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" @@ -278,14 +297,25 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.6" +name = "syn" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tiktoken" -version = "0.3.3" +version = "0.5.1" dependencies = [ "bstr", "fancy-regex", @@ -296,9 +326,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unindent" @@ -306,20 +336,11 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -332,42 +353,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix index 13eaecc0fb..3cf68063f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiktoken/default.nix @@ -6,7 +6,9 @@ , rustPlatform , cargo , rustc +, setuptools , setuptools-rust +, wheel , libiconv , requests , regex @@ -14,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.3.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - hash = "sha256-l7WLe/2pRXkeyFXlPRZujsIMY3iUK5OFGmyRnd+dBJY="; + hash = "sha256-J+dzVkIyAE9PgQ/R+FI2Zz7DpW7X8SBvye2GcOvtuXo="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -25,18 +27,20 @@ let in buildPythonPackage { inherit pname version src postPatch; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; nativeBuildInput = [ + setuptools setuptools-rust + wheel ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-27xR7xVH/u40Xl4VbJW/yEbURf0UcGPG5QK/04igseA="; + hash = "sha256-Q7XO+auj4tKDAGbqNn9pmJg8EJvooN2ie0lWwZVrld4="; }; nativeBuildInputs = [ @@ -54,6 +58,13 @@ buildPythonPackage { blobfile ]; + # almost all tests require network access + doCheck = false; + + pythonImportsCheck = [ + "tiktoken" + ]; + meta = with lib; { description = "tiktoken is a fast BPE tokeniser for use with OpenAI's models."; homepage = "https://github.com/openai/tiktoken"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index 34597923f3..516a22f44c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.20.0"; + version = "0.23.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-Be83b9JVxGxPYoOfqTfVm7qAjZD7cfH5BG6tbSHXhIQ="; + hash = "sha256-QxqUYu8y+k5SLRFtxpcs57gnAHgXIre0smURlqUzC1s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix index a8749adfb6..799570ada1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-4HwHNowif0/YflznQrn8YRITjuiaBCB2mFIO0iCf6tA="; + hash = "sha256-vBww78/3vC3IA4Nh9Ne+rBo/CO9FggjP+TUUV2/ih9c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index e41158d8c1..04c14fe5f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.9.2"; + version = "23.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pg4lKRsgi4SZrKYnVmMfU5hzJriRqVa3InYW9emFLy8="; + hash = "sha256-PPB/BTZLuHmbKmUIe5gZMAwV+TUDqXBYg6fKsokTotg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix index e67ed91c13..fc944620e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.2"; + version = "0.9.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-gYrc8ds6urZvwDsTnzPjxjSTiAGzUD3RlCf0wogCrDI="; + hash = "sha256-PyrJhyJmuF7BZzlQ4f5fiJY5fYFC1JPRLto5ljPVbY4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix index cbb015909e..9a319d90a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiny-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tiny-proxy"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "tiny-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-emQRiG2QiuZt4/lI8shJOvMpaqXNyJ/PMvtDZPaoyLo="; + hash = "sha256-59T09qcOstl/yfzQmNlTNxGerQethZntwDAHwz/5FFM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 35c8578cab..5e6f441d3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tinycss2"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,10 +17,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; # for tests fetchSubmodules = true; - hash = "sha256-RUF/3cjNgDFofoxl9iKY3u5ZAVVQmXu2Qbb5U4brdcQ="; + hash = "sha256-rJtxMmW30NK+E+Dhh/fu6FPrEojWWdoEWNt0raYEubs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix index 2a44225eca..a8a25bba00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, factory_boy +, factory-boy , faker , fetchPypi , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; checkInputs = [ - factory_boy + factory-boy faker ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index 04a6762c8c..7788bd00fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , filelock , idna , pytest-mock @@ -14,17 +14,21 @@ }: buildPythonPackage rec { - pname = "tldextract"; - version = "3.6.0"; - format = "pyproject"; + pname = "tldextract"; + version = "5.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pdi2WDeR2sominWS6892QVL6SWF5g8SZFu6d6Zs2YiI="; + src = fetchFromGitHub { + owner = "john-kurkowski"; + repo = "tldextract"; + rev = "refs/tags/${version}"; + hash = "sha256-x5SJcbTUrqG7mMUPXIhR1rEu3PZ+VA00dFYeoGnX5l0="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools setuptools-scm @@ -43,11 +47,6 @@ buildPythonPackage rec { responses ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --pylint" "" - ''; - pythonImportsCheck = [ "tldextract" ]; @@ -59,6 +58,7 @@ buildPythonPackage rec { from the registered domain and subdomains of a URL. ''; homepage = "https://github.com/john-kurkowski/tldextract"; + changelog = "https://github.com/john-kurkowski/tldextract/blob/${version}/CHANGELOG.md"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tlds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tlds/default.nix index 1b001cd536..3967781bb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tlds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tlds/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools }: buildPythonPackage rec { pname = "tlds"; - version = "2023080900"; - format = "setuptools"; + version = "2023110300"; + pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-n6SGOBkwGrjnH01yFd9giODUDkPGVMwB1H/fozzwQwU="; + hash = "sha256-rmKqY7Z4bBR4r+w4gH04g0Xm9N7QeMVcuFR3pB/pOQY="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "tlds" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index 403019c07b..c3b08bad24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , click , click-completion -, factory_boy +, factory-boy , faker , fetchPypi , inquirer @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook pytest-mock faker - factory_boy + factory-boy ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock index 841e6b5e09..ced7f15387 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -4,20 +4,59 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.5" +name = "anstream" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "memchr", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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 = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] @@ -46,12 +85,9 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -60,13 +96,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "clap" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "cfg-if", - "crossbeam-utils", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", ] [[package]] @@ -170,9 +255,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" @@ -189,13 +280,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -210,15 +301,18 @@ dependencies = [ [[package]] name = "esaxx-rs" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f748b253ceca9fed5f42f8b5ceb3851e93102199bc25b64b65369f76e5c0a35" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fnv" @@ -237,6 +331,12 @@ dependencies = [ "wasi", ] +[[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.2" @@ -255,12 +355,34 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + [[package]] name = "indoc" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + [[package]] name = "is-terminal" version = "0.4.9" @@ -269,32 +391,23 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.8.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "lazy_static" @@ -310,9 +423,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -326,15 +439,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "macro_rules_attribute" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -342,18 +455,9 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" @@ -367,9 +471,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -404,20 +508,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "ndarray" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09" -dependencies = [ - "matrixmultiply 0.2.4", - "num-complex 0.2.4", - "num-integer", - "num-traits", - "rawpointer", + "syn 2.0.25", ] [[package]] @@ -426,8 +517,8 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "matrixmultiply 0.3.7", - "num-complex 0.4.4", + "matrixmultiply", + "num-complex", "num-integer", "num-traits", "rawpointer", @@ -445,19 +536,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.2.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -474,22 +555,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numpy" @@ -498,8 +575,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", - "ndarray 0.15.6", - "num-complex 0.4.4", + "ndarray", + "num-complex", "num-integer", "num-traits", "pyo3", @@ -554,7 +631,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -569,6 +646,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -577,9 +660,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -646,9 +729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -691,9 +774,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -701,25 +784,23 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1259362c9065e5ea39a789ef40b1e3fd934c94beb7b5ab3ac6629d3b5e7cb7" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" dependencies = [ "either", - "itertools 0.8.2", + "itertools", "rayon", ] [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -733,11 +814,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-automata", "regex-syntax", @@ -745,20 +826,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-hash" @@ -768,54 +849,54 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -859,9 +940,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -870,9 +951,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -884,7 +965,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -898,33 +979,35 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "tokenizers" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", + "clap", "derive_builder", "esaxx-rs", "getrandom", - "itertools 0.9.0", + "indicatif", + "itertools", "lazy_static", "log", "macro_rules_attribute", @@ -947,12 +1030,12 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.14.0" +version = "0.14.1" dependencies = [ "env_logger", - "itertools 0.9.0", + "itertools", "libc", - "ndarray 0.13.1", + "ndarray", "numpy", "onig", "pyo3", @@ -965,9 +1048,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization-alignments" @@ -984,6 +1067,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + [[package]] name = "unicode_categories" version = "0.1.1" @@ -996,6 +1085,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1033,68 +1128,134 @@ 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", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +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.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index 149f86a284..d8a731825f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE="; + hash = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toonapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toonapi/default.nix index 8df8fa89a2..ac51cae1c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toonapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toonapi/default.nix @@ -3,18 +3,22 @@ , backoff , buildPythonPackage , fetchFromGitHub +, pythonOlder , yarl }: buildPythonPackage rec { pname = "toonapi"; - version = "0.2.1"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-toonapi"; - rev = "v${version}"; - sha256 = "10jh6p0ww51cb9f8amd9jq3lmvby6n2k08qwcr2n8ijbbgyp0ibf"; + rev = "refs/tags/v${version}"; + hash = "sha256-RaN9ppqJbTik1/vNX0/YLoBawrqjyQWU6+FLTspIxug="; }; propagatedBuildInputs = [ @@ -25,11 +29,15 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "toonapi" ]; + + pythonImportsCheck = [ + "toonapi" + ]; meta = with lib; { description = "Python client for the Quby ToonAPI"; homepage = "https://github.com/frenck/python-toonapi"; + changelog = "https://github.com/frenck/python-toonapi/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index f9f6e377b1..c9bf7c4576 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -34,25 +34,23 @@ # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, - linuxHeaders_5_19, - # dependencies for torch.utils.tensorboard pillow, six, future, tensorboard, protobuf, pythonOlder, # ROCm dependencies - rocmSupport ? false, - gpuTargets ? [ ], - openmp, rocm-core, hip, rccl, miopen, miopengemm, rocrand, rocblas, - rocfft, rocsparse, hipsparse, rocthrust, rocprim, hipcub, roctracer, - rocsolver, hipfft, hipsolver, hipblas, rocminfo, rocm-thunk, rocm-comgr, - rocm-device-libs, rocm-runtime, rocm-opencl-runtime, hipify + rocmSupport ? config.rocmSupport, + rocmPackages, + gpuTargets ? [ ] }: let inherit (lib) attrsets lists strings trivial; - inherit (cudaPackages) cudaFlags cudnn nccl; + inherit (cudaPackages) cudaFlags cudnn; + + # Some packages are not available on all platforms + nccl = cudaPackages.nccl or null; setBool = v: if v then "1" else "0"; @@ -89,7 +87,7 @@ let else if cudaSupport then gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities else if rocmSupport then - hip.gpuTargets + rocmPackages.clr.gpuTargets else throw "No GPU targets specified" ); @@ -97,19 +95,24 @@ let rocmtoolkit_joined = symlinkJoin { name = "rocm-merged"; - paths = [ - rocm-core hip rccl miopen miopengemm rocrand rocblas - rocfft rocsparse hipsparse rocthrust rocprim hipcub - roctracer rocfft rocsolver hipfft hipsolver hipblas + paths = with rocmPackages; [ + rocm-core clr rccl miopen miopengemm rocrand rocblas + rocsparse hipsparse rocthrust rocprim hipcub roctracer + rocfft rocsolver hipfft hipsolver hipblas rocminfo rocm-thunk rocm-comgr rocm-device-libs - rocm-runtime rocm-opencl-runtime hipify + rocm-runtime clr.icd hipify ]; + + # Fix `setuptools` not being found + postBuild = '' + rm -rf $out/nix-support + ''; }; brokenConditions = attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are not mutually exclusive" = cudaSupport && rocmSupport; "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; - "Unsupported CUDA version" = cudaSupport && (cudaPackages.cudaMajorVersion != "11"); + "Unsupported CUDA version" = cudaSupport && !(builtins.elem cudaPackages.cudaMajorVersion [ "11" "12" ]); "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); "Magma cudaPackages does not match cudaPackages" = cudaSupport && (magma.cudaPackages != cudaPackages); }; @@ -144,10 +147,8 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ] ++ lib.optionals stdenv.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. - (fetchpatch { - url = "https://github.com/pytorch/pytorch/pull/108847/commits/7ae4d7c0e2dec358b4fe81538efe9da5eb580ec9.patch"; - hash = "sha256-skFaDg98xcJqJfzxWk+qhUxPLHDStqvd0mec3PgksIg="; - }) + # https://github.com/pytorch/pytorch/pull/108847 + ./pytorch-pr-108847.patch ]; postPatch = lib.optionalString rocmSupport '' @@ -170,7 +171,7 @@ in buildPythonPackage rec { # Strangely, this is never set in cmake substituteInPlace cmake/public/LoadHIP.cmake \ --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \ - "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." hip.version))})" + "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." rocmPackages.clr.version))})" '' # Detection of NCCL version doesn't work particularly well when using the static binary. + lib.optionalString cudaSupport '' @@ -179,6 +180,13 @@ in buildPythonPackage rec { 'message(FATAL_ERROR "Found NCCL header version and library version' \ 'message(WARNING "Found NCCL header version and library version' '' + # TODO(@connorbaker): Remove this patch after 2.1.0 lands. + + lib.optionalString cudaSupport '' + substituteInPlace torch/utils/cpp_extension.py \ + --replace \ + "'8.6', '8.9'" \ + "'8.6', '8.7', '8.9'" + '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' @@ -229,7 +237,7 @@ in buildPythonPackage rec { preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES - ${python.pythonForBuild.interpreter} setup.py build --cmake-only + ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only ${cmake}/bin/cmake build ''; @@ -254,6 +262,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; + USE_NCCL = setBool (nccl != null); USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL USE_STATIC_NCCL = setBool useSystemNccl; @@ -277,6 +286,29 @@ in buildPythonPackage rec { # ... called on pointer ‘’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12" ) [ "-Wno-error=free-nonheap-object" + ] + # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: + # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ + "-Wno-error=cast-function-type-strict" + # Suppresses the most spammy warnings. + # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. + ] ++ lib.optionals rocmSupport [ + "-Wno-#warnings" + "-Wno-cpp" + "-Wno-unknown-warning-option" + "-Wno-ignored-attributes" + "-Wno-deprecated-declarations" + "-Wno-defaulted-function-deleted" + "-Wno-pass-failed" + ] ++ [ + "-Wno-unused-command-line-argument" + "-Wno-maybe-uninitialized" + "-Wno-uninitialized" + "-Wno-array-bounds" + "-Wno-stringop-overflow" + "-Wno-free-nonheap-object" + "-Wno-unused-result" ])); nativeBuildInputs = [ @@ -292,8 +324,7 @@ in buildPythonPackage rec { ]) ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; - buildInputs = [ blas blas.provider pybind11 ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now + buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # cuda_cudart # cuda_runtime.h and libraries @@ -317,13 +348,15 @@ in buildPythonPackage rec { libcusolver.lib libcusparse.dev libcusparse.lib + ] ++ lists.optionals (nccl != null) [ + # Some platforms do not support NCCL (i.e., Jetson) nccl.dev # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ cuda_nvprof.dev # ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ cuda_profiler_api.dev # ]) - ++ lib.optionals rocmSupport [ openmp ] + ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreServices libobjc ]; @@ -343,17 +376,15 @@ in buildPythonPackage rec { # the following are required for tensorboard support pillow six future tensorboard protobuf + + # ROCm build and `torch.compile` requires openai-triton + openai-triton + + # torch/csrc requires `pybind11` at runtime + pybind11 ] ++ lib.optionals MPISupport [ mpi ] - ++ lib.optionals rocmSupport [ rocmtoolkit_joined ] - # rocm build requires openai-triton; - # openai-triton currently requires cuda_nvcc, - # so not including it in the cpu-only build; - # torch.compile relies on openai-triton, - # so we include it for the cuda build as well - ++ lib.optionals (rocmSupport || cudaSupport) [ - openai-triton - ]; + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; # Tests take a long time and may be flaky, so just sanity-check imports doCheck = false; @@ -436,11 +467,7 @@ in buildPythonPackage rec { blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - } // lib.optionalAttrs cudaSupport { - # NOTE: supportedCudaCapabilities isn't computed unless cudaSupport is true, so we can't use - # it in the passthru set above because a downstream package might try to access it even - # when cudaSupport is false. Better to have it missing than null or an empty list by default. - cudaCapabilities = supportedCudaCapabilities; + cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/pytorch-pr-108847.patch b/third_party/nixpkgs/pkgs/development/python-modules/torch/pytorch-pr-108847.patch new file mode 100644 index 0000000000..9511191ca9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/pytorch-pr-108847.patch @@ -0,0 +1,31 @@ +From bf4050edab9f294a8e0060c47f906cd7a80f25a2 Mon Sep 17 00:00:00 2001 +From: Samuel Ainsworth +Date: Sat, 9 Sep 2023 02:04:09 +0000 +Subject: [PATCH] Dependencies.cmake: support building against CUPTI outside of + CUDA_SOURCE_DIR + +Limitation discovered in https://github.com/NixOS/nixpkgs/pull/249259. +--- + cmake/Dependencies.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index 0602d534dc4c14..5f6a5f79f3e3dc 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1879,6 +1879,7 @@ if(USE_KINETO) + ${CUDA_SOURCE_DIR}/extras/CUPTI/lib64 + ${CUDA_SOURCE_DIR}/lib + ${CUDA_SOURCE_DIR}/lib64 ++ $ENV{CUPTI_LIBRARY_DIR} + NO_DEFAULT_PATH) + + find_path(CUPTI_INCLUDE_DIR cupti.h PATHS +@@ -1886,6 +1887,7 @@ if(USE_KINETO) + ${CUDA_INCLUDE_DIRS} + ${CUDA_SOURCE_DIR} + ${CUDA_SOURCE_DIR}/include ++ $ENV{CUPTI_INCLUDE_DIR} + NO_DEFAULT_PATH) + + if(CUPTI_LIBRARY_PATH AND CUPTI_INCLUDE_DIR) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix index 3bd8003890..0b38925e0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/default.nix @@ -6,7 +6,7 @@ , ninja , pybind11 , torch -, cudaSupport ? false +, cudaSupport ? torch.cudaSupport , cudaPackages }: @@ -27,17 +27,30 @@ buildPythonPackage rec { --replace "_fetch_archives(_parse_sources())" "pass" ''; + env = { + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; + }; + nativeBuildInputs = [ cmake pkg-config ninja ] ++ lib.optionals cudaSupport [ - cudaPackages.cudatoolkit + cudaPackages.cuda_nvcc ]; buildInputs = [ pybind11 ] ++ lib.optionals cudaSupport [ - cudaPackages.cudnn + cudaPackages.libcurand.dev + cudaPackages.libcurand.lib + cudaPackages.cuda_cudart # cuda_runtime.h and libraries + cudaPackages.cuda_cccl.dev # + cudaPackages.cuda_nvtx.dev + cudaPackages.cuda_nvtx.lib # -llibNVToolsExt + cudaPackages.libcublas.dev + cudaPackages.libcublas.lib + cudaPackages.libcufft.dev + cudaPackages.libcufft.lib ]; propagatedBuildInputs = [ torch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix index 420a5fd8df..59b7e99c9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook +, fetchpatch , pythonOlder , torch , torchvision +, pytestCheckHook +, transformers }: buildPythonPackage rec { pname = "torchinfo"; - version = "1.7.2"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TylerYep"; - repo = pname; + repo = "torchinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-O+I7BNQ5moV/ZcbbuP/IFoi0LO0WsGHBbSfgPmFu1Ec="; + hash = "sha256-pPjg498aT8y4b4tqIzNxxKyobZX01u+66ScS/mee51Q="; }; + patches = [ + (fetchpatch { # Add support for Python 3.11 and pytorch 2.1 + url = "https://github.com/TylerYep/torchinfo/commit/c74784c71c84e62bcf56664653b7f28d72a2ee0d.patch"; + hash = "sha256-xSSqs0tuFpdMXUsoVv4sZLCeVnkK6pDDhX/Eobvn5mw="; + includes = [ + "torchinfo/model_statistics.py" + ]; + }) + ]; + propagatedBuildInputs = [ torch torchvision @@ -28,17 +40,25 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + transformers ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # Skip as it downloads pretrained weights (require network access) "test_eval_order_doesnt_matter" + "test_flan_t5_small" # AssertionError in output "test_google" + # "addmm_impl_cpu_" not implemented for 'Half' + "test_input_size_half_precision" ]; disabledTestPaths = [ - # Wants "compressai", which we don't package (2023-03-23) + # Test requires network access "tests/torchinfo_xl_test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix index bab73b0dae..ca8f890c0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchPypi -, fetchpatch , librosa , numpy , torch @@ -10,12 +9,12 @@ buildPythonPackage rec { pname = "torchlibrosa"; - version = "0.0.9"; + version = "0.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+LzejKvLlJIIwWm9rYPCWQDSueIwnG5gbkwNE+wbv0A="; + hash = "sha256-Yqi+7fnJtBQaBiNN8/ECKfe6huZ2eMzuAkiexO8EQCg="; }; propagatedBuildInputs = [ @@ -24,14 +23,6 @@ buildPythonPackage rec { torch ]; - patches = [ - # Fix run against librosa 0.9.0, https://github.com/qiuqiangkong/torchlibrosa/pull/8 - (fetchpatch { - url = "https://github.com/qiuqiangkong/torchlibrosa/commit/eec7e7559a47d0ef0017322aee29a31dad0572d5.patch"; - hash = "sha256-c1x3MA14Plm7+lVuqiuLWgSY6FW615qnKbcWAfbrcas="; - }) - ]; - # Project has no tests. # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index e3d51f7b55..ee66ee817d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -1,6 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, numpy +, lightning-utilities , cloudpickle , scikit-learn , scikit-image @@ -11,23 +14,30 @@ , pytestCheckHook , torchmetrics , pytorch-lightning +, pytest-doctestplus +, pytest-xdist }: let pname = "torchmetrics"; - version = "0.11.4"; + version = "1.2.0"; in buildPythonPackage { inherit pname version; + pyproject = true; src = fetchFromGitHub { - owner = "PyTorchLightning"; - repo = "metrics"; + owner = "Lightning-AI"; + repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-K8QLdDpnS4N8s3zXsifFloRXW/QXEm36mJXXKEBEJBs="; + hash = "sha256-g5JuTbiRd8yWx2nM3UE8ejOhuZ0XpAQdS5AC9AlrSFY="; }; + disabled = pythonOlder "3.8"; + propagatedBuildInputs = [ + numpy + lightning-utilities packaging py-deprecate ]; @@ -44,22 +54,33 @@ buildPythonPackage { cloudpickle psutil pytestCheckHook + pytest-doctestplus + pytest-xdist ]; # A cyclic dependency in: integrations/test_lightning.py doCheck = false; passthru.tests.check = torchmetrics.overridePythonAttrs (_: { + pname = "${pname}-check"; doCheck = true; + # We don't have to install because the only purpose + # of this passthru test is to, well, test. + # This fixes having to set `catchConflicts` to false. + dontInstall = true; }); + disabledTests = [ + # `IndexError: list index out of range` + "test_metric_lightning_log" + ]; + disabledTestPaths = [ # These require too many "leftpad-level" dependencies - "tests/text" - "tests/audio" - "tests/image" + # Also too cross-dependent + "tests/unittests" - # A few non-deterministic things like test_check_compute_groups_is_faster - "tests/bases/test_collections.py" + # A trillion import path mismatch errors + "src/torchmetrics" ]; pythonImportsCheck = [ @@ -68,11 +89,10 @@ buildPythonPackage { meta = with lib; { description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)"; - homepage = "https://torchmetrics.readthedocs.io"; + homepage = "https://lightning.ai/docs/torchmetrics/"; license = licenses.asl20; maintainers = with maintainers; [ SomeoneSerge ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchsde/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchsde/default.nix index 30e5a1235d..ba7b2e9236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchsde/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchsde/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "torchsde"; - version = "0.2.4"; + version = "0.2.6"; format = "pyproject"; src = fetchFromGitHub { owner = "google-research"; repo = "torchsde"; - rev = "v${version}"; - hash = "sha256-qQ7oswm0qTdq1xpQElt5cd3K0zskH+H/lgyEnxbCqsI="; + rev = "refs/tags/v${version}"; + hash = "sha256-D0p2tL/VvkouXrXfRhMuCq8wMtzeoBTppWEG5vM1qCo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix new file mode 100644 index 0000000000..2e94622974 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "torrent-parser"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "7sDream"; + repo = "torrent_parser"; + rev = "v${version}"; + hash = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "torrent_parser" + ]; + + meta = { + description = "A .torrent file parser and creator for both Python 2 and 3"; + homepage = "https://github.com/7sDream/torrent_parser"; + changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torrent_parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torrent_parser/default.nix deleted file mode 100644 index f60300086f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/torrent_parser/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage, lib, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "torrent_parser"; - version = "0.4.1"; - - # No tarballs on Pypi - src = fetchFromGitHub { - owner = "7sDream"; - repo = "torrent_parser"; - rev = "v${version}"; - sha256 = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; - }; - - meta = { - description = "A .torrent file parser and creator for both Python 2 and 3"; - homepage = "https://github.com/7sDream/torrent_parser"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix index 06ec0f00a5..03b9168834 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "22.12.0"; + version = "23.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEnX519kaprqAq6QTAvBY5yP0UoBKS0rEjuNMHVkA00="; + hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix index de97071166..1b0bf1755a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.4.6"; + version = "4.11.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-kWvYN2PA4al2X813Mu4R/n2ZLsZ+MaYCCWNfmYD3nBo="; + hash = "sha256-VLoWRAiQ1TP9S0f8TKwQ0H2Lgemd+dTzSM+TjhioDMk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix index b2be7b6f3e..8dcb2cda2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.5"; + version = "1.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-tCyYaYJIkuJBGgE3xxc/jMir1mc7UDRXZ3i1Ai1/mxs="; + hash = "sha256-8NP+5qBdWiBUPf5DJWMrHJfZwpRNkCewjrjTbvgD3AA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 891771ebc6..640e622120 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,9 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm +, wheel , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -14,15 +16,18 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.64.1"; + version = "4.66.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; + hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; }; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; nativeCheckInputs = [ @@ -38,8 +43,7 @@ buildPythonPackage rec { lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; pytestFlagsArray = [ - # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289 - "--asyncio-mode=strict" + "-W" "ignore::FutureWarning" ]; # Remove performance testing. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix index 43f147a6a9..466d6db8da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.29"; + version = "0.0.31"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; + hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index aa37946026..6df71a041b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.9.0"; + version = "5.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9s3iGpxoz3Vq8CA19y1acjv2B+hi574z7OUFq/Sjutk="; + hash = "sha256-9YTqIJJARm5m6R88gap9AEukz3lJkLDHdZOKFUQhfNE="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix index eeb04ba234..47b5eef29c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traits"; - version = "6.4.2"; + version = "6.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-W+fMX7epnLp+kBR4Y3PjrS9177RF7s7QlGVLuvOw+oI="; + hash = "sha256-qbv9ngwIt94H6G72TmnLlqKcIQWkO/gyzYsWL6HiL0Q="; }; # Circular dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix index de09285088..0c7245225d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitsui/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, setuptools , traits , pyface , pythonOlder @@ -8,16 +9,20 @@ buildPythonPackage rec { pname = "traitsui"; - version = "7.4.3"; - format = "setuptools"; + version = "8.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2zJRfpYioFgMIyCeE/gDLOoA5hxndJNnCf9F52M11bk="; + hash = "sha256-kBudHLxFUT4Apzl2d7CYRBsod0tojzChWbrUgBv0A2Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ traits pyface 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 e342615d6d..efee6e3d1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -51,16 +51,16 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.34.0"; + version = "4.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; - repo = pname; + repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-hDZU/3bQ1k4uL3kDEW3+pB4g8jhC8ospRqE55jIqrP0="; + hash = "sha256-h1RMSEcuali05AWeTm1wyZQJz6XrHamCF1eHrSnFnfM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 24345b5f63..3242748793 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "7.0.1"; + version = "7.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-wBTx4gy6c6TMtc2m+xibEzCgYJJiMMZ16+pq3H06hgs="; + hash = "sha256-HthWeFInolNEs7RNA773DJjhGvl1rfDhvhO8WwRwuuY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix index 1560e1810b..789eb346e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { # Note that there is a version 0.4.0, but it was released in error. At the # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub # and PyPI. - version = "0.0.11"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; - rev = version; - hash = "sha256-zs3F8i+G5OX/A9wOO60xVuvnm2QqrL+dHIrC0qwH37o="; + rev = "refs/tags/${version}"; + hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw="; }; # See https://github.com/cgarciae/treex/issues/68. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 109f48d1f7..23af30faef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.7"; + version = "0.13.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-dodeWIYBfclPUbu0Efkn8QO9nj7L8HVNXkSjU4mBSeA="; + hash = "sha256-Y01O3fNWAyV8MhYY2FSMajWyc4Rle2XjsL261jWlfP8="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index a561bcbdfb..3943d18525 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools +, pytestCheckHook , pythonOlder , numpy , lxml @@ -9,27 +10,28 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.23.5"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vf1mnszEs/r/IyggCklAjNXsrZ8ZtgIsSttVS7s6JiE="; + hash = "sha256-jBVQqYNB8P7E0xkcTH6uYmbBZ/l5P9VLtyyRQxq/fOY="; }; nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ numpy ]; - nativeCheckInputs = [ lxml ]; + nativeCheckInputs = [ lxml pytestCheckHook ]; - checkPhase = '' - # Disable test_load because requires loading models which aren't part of the tarball - substituteInPlace tests/test_minimal.py --replace "test_load" "disable_test_load" - python tests/test_minimal.py - ''; + disabledTests = [ + # requires loading models which aren't part of the Pypi tarball + "test_load" + ]; + + pytestFlagsArray = [ "tests/test_minimal.py" ]; pythonImportsCheck = [ "trimesh" ]; @@ -38,6 +40,6 @@ buildPythonPackage rec { homepage = "https://trimsh.org/"; changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner pbsds ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index fb985e890a..c01db3259a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -6,6 +6,7 @@ , idna , outcome , pytestCheckHook +, pytest-trio , pyopenssl , trustme , sniffio @@ -16,15 +17,24 @@ , coreutils }: +let + # escape infinite recursion with pytest-trio + pytest-trio' = (pytest-trio.override { + trio = null; + }).overrideAttrs { + doCheck = false; + pythonImportsCheck = []; + }; +in buildPythonPackage rec { pname = "trio"; - version = "0.22.0"; + version = "0.22.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zmjxxUAKR7E3xaTecsfJAb1OeiT73r/ptB3oxsBOqs8="; + hash = "sha256-OIfPGMi8yJRDNCAwVGg4jax2ky6WaK+hxJqjgGtqzLM="; }; propagatedBuildInputs = [ @@ -46,13 +56,16 @@ buildPythonPackage rec { jedi pyopenssl pytestCheckHook + pytest-trio' trustme yapf ]; preCheck = '' - substituteInPlace trio/tests/test_subprocess.py \ + substituteInPlace trio/_tests/test_subprocess.py \ --replace "/bin/sleep" "${coreutils}/bin/sleep" + + export HOME=$TMPDIR ''; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. @@ -64,6 +77,8 @@ buildPythonPackage rec { "static_tool_sees_all_symbols" # tests pytest more than python "fallback_when_no_hook_claims_it" + # requires mypy + "test_static_tool_sees_class_members" ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix index 39c71da177..016ed7de73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.4.1"; + version = "4.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU="; + hash = "sha256-LLky4lSSMUmLEf+qHwgPvDu0DZhG4WWZ1aFSXqFm1BA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index 7cd0dd7ca8..e9691044a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -9,14 +9,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.7.6"; + version = "2023.8.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-io4Wi1HSD+1gcEODHTdjK7UJGdHICmTg8Tk3RGkaiyI="; + hash = "sha256-yfKgqF1UXlNi6Wfk8Gn1b939kSFeIv+kjGb7KDUhMZo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index e0b14f2fc4..790a9e4f1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.8.4"; + version = "6.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jZTc9Cc5XC1KScpniVtbBPdfwo3LodVNOo/zQSDBWY4="; + hash = "sha256-o/U8bmCAotgDYY81eX+vXOxJC3f4aQvOF6ohMOHLuLY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix index 7678152a23..36a93a5400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { version = "0.20.1"; pyproject = true; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blue-yonder"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix index bb5139b425..522d4a57ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tskit/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.5.5"; + version = "0.5.6"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-phhBTAHAPlBnmzSiLmPYDMg1Mui85NZacni3WuYAc6c="; + hash = "sha256-3f4hPxywY822mCF3IwooBezX38fM1zAm4Th4q//SzkY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index a264c4b2f9..df06e4bd02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tubeup"; - version = "2023.8.19"; + version = "2023.9.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0atpOUJIfXgw/5fi5w2ciAFDMgWmVH4U8d84zwLCRXk="; + sha256 = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tvdb-api/default.nix similarity index 96% rename from third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/tvdb-api/default.nix index 0e05aa041d..bec0964acc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tvdb-api/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "tvdb_api"; + pname = "tvdb-api"; version = "3.2.0-beta"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix index acbc2f28b0..4b83122575 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix @@ -44,11 +44,34 @@ buildPythonPackage rec { "tweepy" ]; + # The checks with streaming fail due to (seemingly) not decoding (or unexpectedly sending response in) GZIP + # Same issue impacted mastodon-py, see https://github.com/halcy/Mastodon.py/commit/cd86887d88bbc07de462d1e00a8fbc3d956c0151 (who just disabled these) + disabledTestPaths = [ + "tests/test_client.py" + ]; + + disabledTests = [ + "test_indicate_direct_message_typing" + "testcachedifferentqueryparameters" + "testcachedresult" + "testcreatedestroyblock" + "testcreatedestroyfriendship" + "testcreateupdatedestroylist" + "testgetfollowerids" + "testgetfollowers" + "testgetfriendids" + "testgetfriends" + "testgetuser" + "testcursorcursoritems" + "testcursorcursorpages" + "testcursornext" + ]; + meta = with lib; { description = "Twitter library for Python"; homepage = "https://github.com/tweepy/tweepy"; changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix index aa91f01686..e52f70753f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "1.0.0"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; - rev = "v${version}"; - hash = "sha256-MTAVa5gP5e8TIE/i1DjfmwKm1zDVC/WEcYKxZSV/+Ug="; + rev = "refs/tags/v${version}"; + hash = "sha256-r0LZS8TXux1mzzXBTSu+x5sxUZOCzW7poKG3dQ2A6No="; }; postPatch = '' @@ -45,7 +45,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "twentemilieu" ]; + pythonImportsCheck = [ + "twentemilieu" + ]; meta = with lib; { description = "Python client for Twente Milieu"; 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 d342c3d330..dac090b395 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.9.1"; + version = "8.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-F+0nYZIvZVH0QuEkuiV2lwA62r6T/amWFWg7rfBqddU="; + hash = "sha256-bOWyvgqa9h5SaGFPtdsvMS8HxY8Pg3uLgugXH+2opEA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index 6c9014d5bd..801adb77da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -1,34 +1,42 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchPypi , fetchpatch , python -, appdirs + +# build-system +, hatchling +, hatch-fancy-pypi-readme + +# dependencies , attrs , automat -, bcrypt , constantly -, cryptography -, git -, glibcLocales -, h2 , hyperlink -, hypothesis -, idna , incremental +, typing-extensions +, zope_interface + +# optional-dependencies +, appdirs +, bcrypt +, cryptography +, h2 +, idna , priority , pyasn1 -, pyhamcrest -, pynacl , pyopenssl , pyserial , service-identity -, setuptools -, typing-extensions -, zope_interface + +# tests +, cython-test-exception-raiser +, git +, glibcLocales +, pyhamcrest +, hypothesis # for passthru.tests , cassandra-driver @@ -46,16 +54,15 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.10.0"; - format = "setuptools"; + version = "23.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "Twisted"; - inherit version; + inherit pname version; extension = "tar.gz"; - hash = "sha256-Mqy9QKlPX0bntCwQm/riswIlCUVWF4Oot6BZBI8tTTE="; + hash = "sha256-PHM2Ct0XM2piLA2BHCos4phmtuWbESX9ZQmxclIJiiQ="; }; patches = [ @@ -70,42 +77,27 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) - # remove half broken pyasn1 integration that blow up with pyasn 0.5.0 - # https://github.com/twisted/twisted/pull/11843 - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/bdee0eb835a76b2982beaf10c85269ff25ea09fa.patch"; - excludes = [ "pyproject.toml" "tox.ini" ]; - hash = "sha256-oGAHmZMpMWfK+2zEDjHD115sW7exCYqfORVOLw+Wa6M="; - }) - ] ++ lib.optionals (pythonAtLeast "3.11") [ - (fetchpatch { - url = "https://github.com/twisted/twisted/pull/11734.diff"; - excludes = [ ".github/workflows/*" ]; - hash = "sha256-Td08pDxHwl7fPLCA6rUySuXpy8YmZfvXPHGsBpdcmSo="; - }) - (fetchpatch { - url = "https://github.com/twisted/twisted/commit/00bf5be704bee022ba4d9b24eb6c2c768b4a1921.patch"; - hash = "sha256-fnBzczm3OlhbjRcePIQ7dSX6uldlCZ9DJTS+UFO2nAQ="; - }) ]; __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ + hatchling + hatch-fancy-pypi-readme + incremental + ]; + propagatedBuildInputs = [ attrs automat constantly hyperlink incremental - setuptools typing-extensions zope_interface ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"pyasn1 >= 0.4",' "" - echo 'ListingTests.test_localeIndependent.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_newSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py @@ -128,6 +120,13 @@ buildPythonPackage rec { # fails since migrating to libxcrypt echo 'HelperTests.test_refuteCryptedPassword.skip = "OSError: Invalid argument"' >> src/twisted/conch/test/test_checkers.py + # expectation mismatch with `python -m twisted --help` and `python -m twisted.trial --help` usage output + echo 'MainTests.test_twisted.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + echo 'MainTests.test_trial.skip = "Expectation Mismatch"' >> src/twisted/test/test_main.py + + # tests for missing https support in usage + echo 'ServiceTests.test_HTTPSFailureOnMissingSSL.skip = "Expectation Mismatch"' >> src/twisted/web/test/test_tap.py + # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" @@ -154,12 +153,15 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + cython-test-exception-raiser git glibcLocales hypothesis pyhamcrest ] ++ passthru.optional-dependencies.conch + ++ passthru.optional-dependencies.http2 + ++ passthru.optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) passthru.optional-dependencies.tls; @@ -171,9 +173,8 @@ buildPythonPackage rec { ''; passthru = { - optional-dependencies = rec { + optional-dependencies = { conch = [ appdirs bcrypt cryptography pyasn1 ]; - conch_nacl = conch ++ [ pynacl ]; http2 = [ h2 priority ]; serial = [ pyserial ]; tls = [ idna pyopenssl service-identity ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txredisapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txredisapi/default.nix index 9d8b268b30..315e7f8e27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txredisapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txredisapi/default.nix @@ -1,20 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nixosTests, six, twisted }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, six +, twisted +, nixosTests +}: buildPythonPackage rec { pname = "txredisapi"; - version = "1.4.7"; + version = "1.4.9"; + format = "pyproject"; src = fetchFromGitHub { owner = "IlyaSkriblovsky"; repo = "txredisapi"; - rev = "1.4.7"; - sha256 = "1f7j3c5l7jcfphvsk7nqmgyb4jaydbzq081m555kw0f9xxak0pgq"; + rev = "refs/tags/${version}"; + hash = "sha256-6Z2vurTAw9YHxvEiixtdxBH0YHj+Y9aTdsSkafPMZus="; }; - propagatedBuildInputs = [ six twisted ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + twisted + ] + ++ twisted.optional-dependencies.tls; + + pythonImportsCheck = [ + "txredisapi" + ]; doCheck = false; - pythonImportsCheck = [ "txredisapi" ]; passthru.tests.unit-tests = nixosTests.txredisapi; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix index 1d4413a6dc..45e8980da4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "6.0.0"; + version = "6.2.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -99,13 +99,13 @@ buildPythonPackage { inherit version; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-lGRdSUSQGdxe+I4WrUkE4hIyyJ1HcFn3cXO3zd27fsM="; + hash = "sha256-aWuY2z5DIVhZ5bRADhKSadCofIQQdLQAb52HnjPMS/4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix index 7adbd97059..55fe29e972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { version = "0.0.15"; format = "pyproject"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI because the repo does not have tags or release branches src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix index af8b9c5ef3..3511a87127 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "2.0.2"; + version = "23.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; + hash = "sha256-gnwiSCVWU0mpUDiHt9GE2DtfFd2xpOsDL5r/fFctkg4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix index c2a6171e1b..23e3bdc5b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , pythonOlder , lib +, setuptools , setuptools-scm , pytestCheckHook , typing-extensions @@ -13,30 +14,39 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.3"; + version = "4.1.5"; + format = "pyproject"; + disabled = pythonOlder "3.5"; - outputs = [ "out" "doc" ]; src = fetchPypi { inherit pname version; - sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; + hash = "sha256-6goRO7wRG8/8kHieuyFWJcljQR9wlqfpBi1ORjDBVf0="; }; + outputs = [ + "out" + "doc" + ]; + nativeBuildInputs = [ glibcLocales + setuptools setuptools-scm sphinxHook sphinx-autodoc-typehints sphinx-rtd-theme ]; - LC_ALL = "en_US.utf-8"; + propagatedBuildInputs = [ + typing-extensions + ]; - postPatch = '' - substituteInPlace setup.cfg --replace " --cov" "" - ''; + env.LC_ALL = "en_US.utf-8"; - nativeCheckInputs = [ pytestCheckHook typing-extensions ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # mypy tests aren't passing with latest mypy @@ -44,8 +54,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # not compatible with python3.10 - "test_typed_dict" + # AssertionError: 'type of argument "x" must be ' != 'None' + "TestPrecondition::test_precondition_ok_and_typeguard_fails" + # AttributeError: 'C' object has no attribute 'x' + "TestInvariant::test_invariant_ok_and_typeguard_fails" + # AttributeError: 'D' object has no attribute 'x' + "TestInheritance::test_invariant_ok_and_typeguard_fails" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix index c5c393b29c..ae97d857da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "typepy"; - version = "1.3.1"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cgy1+6RZ1DUyH45bAKpGPOOZCwhCUghummw2fnfJGww="; + hash = "sha256-oIDVjJwapHun0Rk04zOZ4IjAh7qZ2k0BXK6zqFmtVds="; }; propagatedBuildInputs = [ 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 638a00c609..81be449f7f 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,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GF3YDuyhnEx0JpOxU/tRAnFu+98p0TF5NCU1CXnR2bE="; + hash = "sha256-JVtG3t6rkZ5nrttMlryqdcU35DSblNe3MfvlqLqHJp0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix index ce82a75f52..3c406d0745 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.2"; + version = "0.19.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-2MN5QgunWx5DaH0SsLdypbsX81KFmivvaqjwq94SP1U="; + hash = "sha256-KbJBIVxl622kZPEeIyiTEEky/DxKShyJGSFYv2YEveY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 00ebb5123e..7906923626 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.6"; + version = "4.12.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + hash = "sha256-WZgAKNKb9V0Ns1nvowW3W6zwy5Lj8/az/UCPJTHfJ0w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-click/default.nix new file mode 100644 index 0000000000..78c99fe428 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-click/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +let + pname = "types-click"; + version = "7.1.8"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tmBJaL5kAdxRYxHKUHCKCii6p6DLhA79dBLw27/04JI="; + }; + + nativeBuildInputs = [ setuptools ]; + + meta = with lib; { + description = "Collection of library stubs for Python, with static types"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index d42e2c0a2c..c67234d5f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.6"; + version = "0.20.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ozSnA6hoiRDQhpRk8fb4vTMNdYQ72rT4k1R7+ylBegE="; + hash = "sha256-SSjnkPQrmdWDOZD5nI3Z+p8Wgl9u0wOAypgYRtNocM0="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix index c3c6359262..45d4c9bedf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.0.0.2"; + version = "10.1.0.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI="; + hash = "sha256-UlwcXuZ7CsFyHEDSvGGCJu8hI8NH5SfhTgW5IHIaE7k="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index e644b71554..1004c671a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.2"; + version = "4.24.0.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WYuyKQubDqZfT2NWmgneqkR17de7DYWJBXo43rCxn08="; + hash = "sha256-V6tCyxcd/bosdLtbUMJQR4U4zDxe2VuLNokprQyfkKU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix index 76691b13b1..b7f751a0cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.2.0.2"; + version = "23.3.0.0"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-agENrJ7NQrWC190sw+nkBIa3mztkuy//uhR0/5avkG0="; + hash = "sha256-X/sHf+cLaZyI1cqrmZroDhkv4ov2zaeYm355seTi3NM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 1b59386174..c2e0e05513 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.7"; + version = "4.6.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KMQVPdtcnU8Q3vRKJFRnPDYdLV/DzYZ887sVIPP1mjg="; + hash = "sha256-qn+190NTRQDydN3xGrHJEKrhAgSBhlo2t5nh1n3iqvM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 0bbee57a78..557dce437d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.7"; + version = "2.31.0.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TZMNyrvCRS49cHKOWBrErIwtE/YlCa2RFGc/VCr4y04="; + hash = "sha256-3FhSp28er2Dq+oGi5Qrvo9HwFcNM8MuhMJMIZrGyKpI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index efa9b6cf24..bac128984b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "67.4.0.3"; + version = "68.2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GelY39vxxaYo5UwqfuhJNQUa+3J40MHNsIrBlHV+47E="; + hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix index 3e475b17cf..140664989f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.8.5"; + version = "0.10.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v4D859LXS+kRSPR7iNmuWt6xAkq+8iqi/bq8A21rizw="; + hash = "sha256-WLB4HGgeZx/wtcAxkwmRBon0q0DookMeIF1wyUu277E="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix index ad4207769a..32671d5846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.8.6"; + version = "1.5.8.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-lUO1hj25e0EqKx1fQHyQgzY2WgutME1k6DKKdp9IwjA="; + hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix index 8790249579..91bbc854a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tzdata"; - version = "2022.7"; + version = "2023.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-/l+Gbt3YuW6fy6l4+OUDyQmxnqfv2hHlLjlJS606e/o="; + hash = "sha256-Ee8eCOVKyw1Plb2xvgXaZZZz3krL0hv5xp6UzF6Qejo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index 5b32b4343a..e9ab0bc6ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "4.3"; # version needs to be compatible with APScheduler + version = "5.0.1"; # version needs to be compatible with APScheduler disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-PyHQnhsqqfLazKEtokDKN947pSN6k63f1tWTr+kHM1U="; + hash = "sha256-RuuZrUvbcfP3K30k9CZ3U+JAlE7PwW8l0nGbqJgnqAM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch new file mode 100644 index 0000000000..ed177797da --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx +index b99647c..479cc9c 100644 +--- a/src/message_receiver.pyx ++++ b/src/message_receiver.pyx +@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase): + + #### Callbacks (context is a MessageReceiver instance) + +-cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): ++cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): + if context != NULL: + context_pyobj = context + if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix index 2ae0d32a56..c306068f7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uamqp/default.nix @@ -16,17 +16,20 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-uamqp-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-q8FxM4PBXLD5q68nrUJ+TGkui1yQJ3HHNF7jn+e+HkA="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch + ] ++ [ + # Fix incompatible function pointer conversion error with clang 16. + ./clang-fix-incompatible-function-pointer-conversion.patch ]; postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix new file mode 100644 index 0000000000..a85be00ddf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ubelt/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, numpy +, python-dateutil +, xxhash +, pytestCheckHook +, requests +, xdoctest +}: + +buildPythonPackage rec { + pname = "ubelt"; + version = "1.3.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "ubelt"; + rev = "refs/tags/v${version}"; + hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + passthru.optional-dependencies = { + optional = [ + numpy + python-dateutil + xxhash + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + requests + xdoctest + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = lib.optionals stdenv.isDarwin [ + # fail due to sandbox environment + "CacheStamp.expired" + "userhome" + ]; + + pythonImportsCheck = [ "ubelt" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A Python utility library with a stdlib like feel and extra batteries. Paths, Progress, Dicts, Downloads, Caching, Hashing: ubelt makes it easy"; + homepage = "https://github.com/Erotemic/ubelt"; + changelog = "https://github.com/Erotemic/ubelt/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix index d83a4cbd54..f6aa059d70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix @@ -3,24 +3,34 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "uc-micro-py"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tsutsu3"; repo = "uc.micro-py"; - rev = "v${version}"; - hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + rev = "refs/tags/v${version}"; + hash = "sha256-PUeWYG/VyxCfhB7onAcDFow1yYqArjmfMT99+058P7U="; }; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "uc_micro" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "uc_micro" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Micro subset of unicode data files for linkify-it-py"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix index f9d1cf6c1d..7d285b0628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.14"; + version = "0.9.16"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; - rev = "v${version}"; - hash = "sha256-lSkURvKRgW+qV1A8OT4WYsMGlxxIqaFnxQ3Rnlixdw0="; + rev = "refs/tags/v${version}"; + hash = "sha256-9ksHA8uvBv370/6Umt5iz/4F8VsDDI9X8kVc5Lv0RVk="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for Cisco UCS"; homepage = "https://github.com/CiscoUcs/ucsmsdk"; + changelog = "https://github.com/CiscoUcs/ucsmsdk/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix index 49b56c5f1e..9eef151249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/udatetime/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch }: buildPythonPackage rec { @@ -13,14 +12,6 @@ buildPythonPackage rec { hash = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; - patches = [ - # fix build with python 3.9 - (fetchpatch { - url = "https://github.com/freach/udatetime/pull/33.patch"; - sha256 = "02wm7ivkv1viqn2wflgd10dgpddfqfrwacmrldigb1mwb79n554j"; - }) - ]; - # tests not included on pypi doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix index 9ed1ec78e1..98087eaae7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.30.0"; + version = "2.33.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ZpO55rNXkVbqMdGxsZn77gJnGBbM8c8GIAaQnTzVnf8="; + hash = "sha256-e6p/H1Vub0Ln0VhQvwsVLuD/p8uNG5oCPhfQPCTl1nY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix index eba49e474a..c2fef2e465 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "ufoLib2"; - version = "0.14.0"; + version = "0.16.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OdUJfNe3nOQyCf3nT9/5y/C8vZXnSAWiLHvZ8GXMViw="; + hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix index b93552c4e0..34bb5fef6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.37.0"; + version = "0.37.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,9 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "harfbuzz"; repo = "uharfbuzz"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-CZp+/5fG5IBawnIZLeO9lXke8rodqRcSf+ofyF584mc="; + hash = "sha256-876gFYyMqeGYoXMdBguV6bi7DJKHJs9HNLw9xRu+Mxk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix index 948f2108d2..774ff6f273 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uhi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "uhi"; - version = "0.3.3"; + version = "0.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be"; + sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 0237602326..9816c88f3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.7.0"; + version = "5.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-54jl1dyuj2EYrJtF0LiRoNVfesSA7dy38HJj8rzzeyM="; + hash = "sha256-eOMY3vSt6JikYbPZKnn5RB5+Dk0q1UGavtQzbXAsdCU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index 77c4b09968..95b765bd3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.8.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-isngr9CZ2YYuq+5s3p4HXrTU20vPqZGZ1r8mBoVkxiI="; + hash = "sha256-r9uxPXpmQSsL1rX4d9TH87olFbZugdGdNG++Ygjie1I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index 04d3bd6fd9..4083810195 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.3"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,40 +25,9 @@ buildPythonPackage rec { owner = "lmcinnes"; repo = "umap"; rev = version; - hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; + hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A="; }; - patches = [ - # Fix tests with sklearn>=1.2.0 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch"; - hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch"; - hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch"; - hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0="; - }) - # Fix tests with numpy>=1.24 - # https://github.com/lmcinnes/umap/pull/952 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch"; - hash = "sha256-B50eyMs3CRuzOAq+jxz56XMJPdiUofUxCL0Vqolaafo="; - }) - # https://github.com/lmcinnes/umap/pull/1010 - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/848396c762c894e666aaf3d0bcfe1e041b529ea6.patch"; - hash = "sha256-ir0Pxfr2c0oSuFGXQqHjkj7nzvlpTXCYbaI9qAiLun0="; - }) - (fetchpatch { - url = "https://github.com/lmcinnes/umap/commit/30e39938f4627f327223245dfe2c908af6b7e304.patch"; - hash = "sha256-7Divrym05wIPa7evgrNYXGm44/EOWG8sIYV8fmtuzJ4="; - }) - ]; - propagatedBuildInputs = [ numba numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix index 4602a30fde..7af5740fe3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.11.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ryBymzmNLzuDklHXReT0DyPLCb1reX4Kb/bu1GynBCI="; + hash = "sha256-TKrZQbYPUeUP3BCYZiNNQHkQrvd/EjOqG2tdFox0J+4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix index 5e09df1f6d..972aa3093a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "unicodedata2"; - version = "15.0.0"; + version = "15.1.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; + hash = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "unicodedata2" + ]; meta = with lib; { description = "Backport and updates for the unicodedata module"; homepage = "https://github.com/mikekap/unicodedata2"; + changelog = "https://github.com/fonttools/unicodedata2/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix index ea450651da..3308be6a9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "univers"; - version = "30.10.0"; + version = "30.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI="; + hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix index 966e9c459d..23667d02c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg="; + hash = "sha256-guXYbRaifg6hrcfYisvLqdAtWkVIgWMXT5bZrCidsuQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix index eb34584736..549c0b6dd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.22"; + version = "0.7.11"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-YMPChP8/KB/UioavIa0pdj0wH9bTkN8frFmkQZ3bUPc="; + hash = "sha256-cUd1umD61xHPehutBh5pUWTLyOdn3vbgerRQmsOpuDM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 2754f192d5..582d0040e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.10.12"; + version = "0.10.30"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-v5hNl93dUEo90Hgm5u2N7tB1W5fnu+Pmnv+iw7QyQKM="; + hash = "sha256-RaVg4XNmh1S5G1CHQiME7t/BmK0MI9M8wI2YTKjpqzM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index a906ce2d76..837d162044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , awkward , hatchling -, importlib-metadata , numpy , packaging , pytestCheckHook @@ -18,16 +16,16 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.0.12"; - format = "pyproject"; + version = "5.1.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-5RJPRrnPRRj1KXeyCqrGwaurXPx0aT6gso1o7gQ1aNs="; + hash = "sha256-TMa+j2jdFagJJhlyCx4rNLaxQhrJyq1HdpnA40xiyME="; }; nativeBuildInputs = [ @@ -38,8 +36,6 @@ buildPythonPackage rec { awkward numpy packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ @@ -61,6 +57,7 @@ buildPythonPackage rec { "test_no_multipart" "test_fallback" "test_pickle_roundtrip_http" + "test_open_fsspec_local" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix index 2912c44fcf..1d7db943ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-owRLc6823jJbEEzdJ3ORCkQfaEvxxs0uwYLzzCa17zI="; + hash = "sha256-tZ5ln3sy6W5RLcwjzLbhobCNLbHXIhXIzrcOVCG+Z+E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index 13ef39be76..7a374f7c0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -1,66 +1,35 @@ { lib +, backports-zoneinfo , brotli , brotlicffi , buildPythonPackage , certifi , cryptography , fetchPypi +, hatchling , idna , isPyPy -, mock , pyopenssl , pysocks -, pytest-freezegun , pytest-timeout , pytestCheckHook -, python-dateutil +, pythonOlder , tornado , trustme }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "urllib3"; - version = "1.26.16"; - format = "setuptools"; + version = "2.0.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jxNfZQJ1a95rKpsomJ31++h8mXDOyqaQQe3M5/BYmxQ="; + hash = "sha256-yX394fe9Q6ccjSpY42npsr9pLRM06p+crlWt19DdD4Q="; }; - # FIXME: remove backwards compatbility hack - propagatedBuildInputs = passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; - - nativeCheckInputs = [ - python-dateutil - mock - pytest-freezegun - pytest-timeout - pytestCheckHook - tornado - trustme - ]; - - # Tests in urllib3 are mostly timeout-based instead of event-based and - # are therefore inherently flaky. On your own machine, the tests will - # typically build fine, but on a loaded cluster such as Hydra random - # timeouts will occur. - # - # The urllib3 test suite has two different timeouts in their test suite - # (see `test/__init__.py`): - # - SHORT_TIMEOUT - # - LONG_TIMEOUT - # When CI is in the env, LONG_TIMEOUT will be significantly increased. - # Still, failures can occur and for that reason tests are disabled. - doCheck = false; - - preCheck = '' - export CI # Increases LONG_TIMEOUT - ''; - - pythonImportsCheck = [ - "urllib3" + nativeBuildInputs = [ + hatchling ]; passthru.optional-dependencies = { @@ -81,11 +50,44 @@ buildPythonPackage rec { ]; }; + nativeCheckInputs = [ + pytest-timeout + pytestCheckHook + tornado + trustme + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + # Tests in urllib3 are mostly timeout-based instead of event-based and + # are therefore inherently flaky. On your own machine, the tests will + # typically build fine, but on a loaded cluster such as Hydra random + # timeouts will occur. + # + # The urllib3 test suite has two different timeouts in their test suite + # (see `test/__init__.py`): + # - SHORT_TIMEOUT + # - LONG_TIMEOUT + # When CI is in the env, LONG_TIMEOUT will be significantly increased. + # Still, failures can occur and for that reason tests are disabled. + doCheck = false; + + passthru.tests.pytest = self.overridePythonAttrs (_: { doCheck = true; }); + + preCheck = '' + export CI # Increases LONG_TIMEOUT + ''; + + pythonImportsCheck = [ + "urllib3" + ]; + meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; + description = "Powerful, user-friendly HTTP client for Python"; + homepage = "https://github.com/urllib3/urllib3"; changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -} +}; +in self 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 014382b215..7f9512be2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -1,43 +1,57 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, isPy3k + +# build-system +, setuptools +, setuptools-scm +, wheel + +# tests , glibcLocales +, pytestCheckHook }: buildPythonPackage rec { pname = "urwid"; - version = "2.1.2"; - format = "setuptools"; + version = "2.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; + hash = "sha256-4zkRqxjyxz/dvpvyFtAh504gstWqm+MEA8WPVRMbuKE="; }; - patches = [ - # https://github.com/urwid/urwid/pull/517 - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; - hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; - }) + postPatch = '' + sed -i '/addopts =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel ]; - # tests need to be able to set locale - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = [ glibcLocales ]; + nativeCheckInputs = [ + glibcLocales + pytestCheckHook + ]; - # tests which assert on strings don't decode results correctly - doCheck = isPy3k; + env.LC_ALL = "en_US.UTF8"; + + disabledTestPaths = [ + # expect call hangs + "urwid/tests/test_vterm.py" + ]; pythonImportsCheck = [ "urwid" ]; meta = with lib; { + changelog = "https://github.com/urwid/urwid/releases/tag/${version}"; description = "A full-featured console (xterm et al.) user interface library"; + downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix index 9baa150afb..bbec8df096 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.23.1"; + version = "0.23.2"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-X/G6K0X4G1EsMIBpvqy62zZ++8paTHNqgYLi+B7YK+0="; + rev = "refs/tags/${version}"; + hash = "sha256-98Ahb6syD/J9StwaOqVj/MCdzbHOgey0sixp7SJnROE="; }; outputs = [ 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 38283c71ac..9ee7fec919 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -3,34 +3,42 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system , cython +, setuptools + +# native dependencies , libuv , CoreServices , ApplicationServices -# Check Inputs +# tests , aiohttp , psutil , pyopenssl -, pytest-forked , pytestCheckHook }: buildPythonPackage rec { pname = "uvloop"; - version = "0.17.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.19.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; + hash = "sha256-Akb0/Rvyv3AuBrDUXukWd+5cMSQvOaq06m/gxRrt0P0="; }; nativeBuildInputs = [ cython + setuptools ]; + env.LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -38,45 +46,25 @@ buildPythonPackage rec { ApplicationServices ]; - dontUseSetuptoolsCheck = true; nativeCheckInputs = [ - pytest-forked + aiohttp + pyopenssl pytestCheckHook psutil - ] ++ lib.optionals (pythonOlder "3.11") [ - aiohttp ]; - LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; - pytestFlagsArray = [ - # from pytest.ini, these are NECESSARY to prevent failures - "--capture=no" - "--assert=plain" - "--strict" - "--tb=native" - # Depend on pyopenssl - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" - # test gets stuck in epoll_pwait on hydras aarch64 builders - # https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" - # Tries to import cythonized file for which the .pyx file is not shipped via PyPi - "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" - # Tries to run "env", but fails to find it + # Tries to run "env", but fails to find it, even with coreutils provided "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" # AssertionError: b'' != b'out\n' "--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 (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Segmentation fault - "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ]; disabledTestPaths = [ @@ -84,23 +72,13 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = '' + # force using installed/compiled uvloop + rm -rf uvloop + '' + lib.optionalString stdenv.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' - # pyopenssl is not well supported by upstream - # https://github.com/NixOS/nixpkgs/issues/175875 - substituteInPlace tests/test_tcp.py \ - --replace "from OpenSSL import SSL as openssl_ssl" "" - # force using installed/compiled uvloop vs source by moving tests to temp dir - export TEST_DIR=$(mktemp -d) - cp -r tests $TEST_DIR - pushd $TEST_DIR - ''; - - postCheck = '' - popd ''; pythonImportsCheck = [ @@ -112,6 +90,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/MagicStack/uvloop/releases/tag/v${version}"; description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index 1c0131c054..8e29effda9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "validators"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,11 +17,11 @@ buildPythonPackage rec { owner = "python-validators"; repo = "validators"; rev = "refs/tags/${version}"; - hash = "sha256-b5K1WP+cEAjPBXu9sAZQf1J5H7PLnn94400Zd/0Y9ew="; + hash = "sha256-Qu6Tu9uIluT1KBJYkFjDFt9AWN2Kez3uCYDQknXqYrU="; }; nativeBuildInputs = [ - poetry-core + setuptools ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix index 6e96ff579d..73eaf56f9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "1.0"; + version = "1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j1WbPVqYbxoshcvRvc/w0T+YknoSABZ9CrzXzCDSErA="; + sha256 = "sha256-CISX8pycEOYUBolyMoJqaKdE0u/8tf7mvbHYm9m148I="; }; nativeBuildInputs = [ flit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix index 043d08a022..fc4283766b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, mock , pytest-httpbin , pytestCheckHook , pythonOlder @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.2.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; + hash = "sha256-u/FTLyYYoE8RvOKpmvOpZHoyyICVcpP/keCl8Ye2s9I="; }; propagatedBuildInputs = [ @@ -41,6 +40,9 @@ buildPythonPackage rec { disabledTests = [ "TestVCRConnection" + # https://github.com/kevin1024/vcrpy/issues/645 + "test_get_vcr_with_matcher" + "test_testcase_playback" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index f1dc4418b2..70446323f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -85,5 +85,6 @@ buildPythonPackage rec { changelog = "https://github.com/pimutils/vdirsyncer/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ loewenheim ]; + mainProgram = "vdirsyncer"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix index 03f38e12a6..1d8168467d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.0.0"; + version = "1.1.1.post1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-T62k/dqlwb1ppbopb/2UjMy1da16vlPRSWD1b+Mt1ME="; + hash = "sha256-elWuVJgW5fyg5S+rjMZtSw5Ls7d1OTPoW0FnZXlANys="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega-datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega-datasets/default.nix new file mode 100644 index 0000000000..e0c9133767 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/vega-datasets/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "vega-datasets"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + pname = "vega_datasets"; + inherit version; + hash = "sha256-nb6YNCCOjsMqtElw3zFd6RAoYeTNoT2OFDqreoDZP8A="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ pandas ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "--doctest-modules" + ]; + + pythonImportsCheck = [ + "vega_datasets" + ]; + + meta = with lib; let + tag = removeSuffix ".0" "v${version}"; + in { + description = "A Python package for offline access to vega datasets"; + homepage = "https://github.com/altair-viz/vega_datasets"; + changelog = "https://github.com/altair-viz/vega_datasets/blob/${tag}/CHANGES.md"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix deleted file mode 100644 index 629f540743..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: - -buildPythonPackage rec { - pname = "vega_datasets"; - version = "0.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0"; - }; - - propagatedBuildInputs = [ pandas ]; - - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - py.test vega_datasets --doctest-modules -k 'not column_names' - ''; - - meta = with lib; { - description = "A Python package for offline access to vega datasets"; - homepage = "https://github.com/altair-viz/vega_datasets"; - license = licenses.mit; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix index e1d4531719..a233b51773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "vehicle"; - version = "1.0.1"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-vehicle"; rev = "refs/tags/v${version}"; - hash = "sha256-nN7efkN59FCCjCk3svYCTGGdvr2RSM5VektuUkHy3Vo="; + hash = "sha256-EbjrAfbqVY336RHBWq81KM+oHixen+38aUTnWZQ+nCs="; }; nativeBuildInputs = [ 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 acce834fa7..6a7fd953c4 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 @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.5.0"; + version = "2023.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Cereal2nd"; repo = pname; - rev = version; - hash = "sha256-8wRgH7t1s2X7mg3oN38KMvJQfWcn/ePw6rNIl2K9nNA="; + rev = "refs/tags/${version}"; + hash = "sha256-qRKVjiRrRg1YwwYCSp6KGvaS7QnYLIW5rum3X7vEANM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix index 3962b608ca..bbd4388702 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versioneer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python-versioneer"; repo = "python-versioneer"; rev = "refs/tags/${version}"; - hash = "sha256-seYT/v691QB0LUzeI4MraegbNILU3tLO//9UbZIfe+A="; + hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 436ab5fa1b..26660fec99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KzvJcBR6Bc+z6IAmJ0KR88aSQMjRx1UilS28oBv9nTE="; + hash = "sha256-LLlaLP9NgzpJyxsEGPd7sdcVX/qXY8mO3ZQNm39gocM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix index 200f4f68eb..47e9c7b7a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vine"; - version = "5.0.0"; + version = "5.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34="; + hash = "sha256-i2LpgdNcQQSSEc9ioKEkLYwe6b0Vuxls44rv1nmeYeA="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python promises"; homepage = "https://github.com/celery/vine"; + changelog = "https://github.com/celery/vine/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 10602bfd4f..18db218039 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.24.0"; + version = "20.24.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4qfO+dqIDWk7kz23ZUNndU8U4gZQ3GDo7nOFVx+Fk6M="; + hash = "sha256-6DYZZ/bab73xQmSDv+n8qCh8JCrAvDBCmQVyHO+/91I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix index 67c34776ff..ae52494d78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3vcn528rZd7YhmSoPaUN2peWOWHBbxOk2FCr3UWTD5Q="; + hash = "sha256-JJpQl5/ACotlEJKDNU3PEs9BXBpdz5gh4RP25ZC5uTw="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix index b6d12a6718..5f27bba823 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vncdo/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "vncdo"; - version = "0.12.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sibson"; repo = "vncdotool"; - rev = "v${version}"; - sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index b568350324..e3fcad870a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.7"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Z/uAoBTtn9tZndRLuWy1QxEDKhBBBvwucG73ptrYgDI="; + hash = "sha256-tqKqYytv1RSIqO6sZQq0pQm7GgMugZQ4F6ii5qY6MLM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix index 550ae76a03..e1592ab862 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix @@ -13,14 +13,17 @@ , pytestCheckHook , pythonOlder }: + buildPythonPackage rec { pname = "w1thermsensor"; - version = "2.0.0"; - format = "pyproject"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EcaEr4B8icbwZu2Ty3z8AAgglf74iZ5BLpLnSOZC2cE="; + hash = "sha256-n7wK4N1mzZtUxtYu17qyuI4UjJh/59UGD0dvkOgcInA="; }; postPatch = '' @@ -32,10 +35,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiofiles click ]; + passthru.optional-dependencies = { + async = [ + aiofiles + ]; + }; + # Don't try to load the kernel module in tests. env.W1THERMSENSOR_NO_KERNEL_MODULE = 1; @@ -45,11 +53,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli - ]; - - # Tests for 2.0.0 currently fail on python3.11 - # https://github.com/timofurrer/w1thermsensor/issues/116 - doCheck = pythonOlder "3.11"; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "w1thermsensor" @@ -63,6 +67,7 @@ buildPythonPackage rec { devices. ''; homepage = "https://github.com/timofurrer/w1thermsensor"; + changelog = "https://github.com/timofurrer/w1thermsensor/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ quentin ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index 08ce68fdd6..66e48a2b7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "w3lib"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ="; + hash = "sha256-7Vt06ZfuoqvjwTIfkW40QUTujpBypvM0Y+6OV/hYpLE="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix index 42efebb8ea..c31993b1e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , callPackage -, factory_boy +, factory-boy , fetchFromGitHub , lib , wagtail @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - factory_boy + factory-boy wagtail ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix index 085eca293d..23b4140403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5.1"; + version = "1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; + hash = "sha256-OrRR5wLTq3icSBq+9m+MxIvkTvJP7yiGR9yzPt53q+k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix index 54c30dabc7..8fe5ba39ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix @@ -24,20 +24,20 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.0.2"; + version = "5.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3r0h34el2zRF1l/94S7xTjBqJPWtSQFQvtVW8Mjq0rs="; + hash = "sha256-RfrHlOTCDH51sBgGnX+XYfJfqjYZ7zDfJAE8okq/mnQ="; }; postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "Pillow>=4.0.0,<10.0.0" "Pillow>=9.1.0,<11.0.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" ''; propagatedBuildInputs = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { requests telepath willow - ]; + ] ++ willow.optional-dependencies.heif; # Tests are in separate derivation because they require a package that depends # on wagtail (wagtail-factories) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix index 4fe26418ef..a53344a76f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wallbox/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.4.14"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HKlq5DPG3HD9i9LLTJdlzEFim+2hBdSfKl43BojhEf8="; + hash = "sha256-EDEB7/CkrfYSNcSh55Itrj6rThsNKeuj8lHLAY+Qml4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix index 3f55ec7f47..8436ee9b8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wand"; - version = "0.6.11"; + version = "0.6.13"; src = fetchPypi { pname = "Wand"; inherit version; - hash = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU="; + hash = "sha256-9QE0hOr3og6yLRghqu/mC1DMMpciNytfhWXUbUqq/Mo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix new file mode 100644 index 0000000000..e1b812b961 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog-gevent/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gevent +, pytestCheckHook +, watchdog +}: + +buildPythonPackage rec { + pname = "watchdog-gevent"; + version = "0.1.1"; + format = "setuptools"; + + # Need to fetch from github because tests are not present in pypi + src = fetchFromGitHub { + owner = "Bogdanp"; + repo = "watchdog_gevent"; + rev = "v${version}"; + hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY="; + }; + + propagatedBuildInputs = [ watchdog gevent ]; + + postPatch = '' + sed -i setup.cfg \ + -e 's:--cov watchdog_gevent::' \ + -e 's:--cov-report html::' + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "watchdog_gevent" ]; + + meta = with lib; { + description = "A gevent-based observer for watchdog"; + homepage = "https://github.com/Bogdanp/watchdog_gevent"; + license = licenses.asl20; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 2d2b9aa649..cb11342000 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -6,20 +6,18 @@ , fetchFromGitHub , rustPlatform , rustc -, setuptools-rust , pythonOlder , dirty-equals , pytest-mock , pytest-timeout , pytestCheckHook -, python , CoreServices , libiconv }: buildPythonPackage rec { pname = "watchfiles"; - version = "0.20.0"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,13 +26,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M="; + hash = "sha256-/qNgkPF5N8jzSV3M0YFWvQngZ4Hf4WM/GBS1LtgFbWM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4XqR6pZqPAftZoJqZf+iZWp0c8xv00MDJDDETiGGEDo="; + hash = "sha256-sqHTW1+E7Fp33KW6IYlNa77AYc2iCfaSoBRXzrhEKr8="; }; buildInputs = lib.optionals stdenv.isDarwin [ @@ -73,6 +71,11 @@ buildPythonPackage rec { rm -rf watchfiles ''; + disabledTests = [ + # BaseExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) + "test_awatch_interrupt_raise" + ]; + pythonImportsCheck = [ "watchfiles" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix index 6cb717679d..29b600624e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "watermark"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-E3UxdGlxTcvkiKa3RoG9as6LybyW+QrCUZvA9VHwxlk="; + rev = "refs/tags/v${version}"; + hash = "sha256-4/1Y7cdh1tF33jgPrqdxCGPcRnnxx+Wf8lyztF54Ck0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix new file mode 100644 index 0000000000..6b1ffcb31f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, black +, cloudpathlib +, confection +, isort +, mypy +, packaging +, pre-commit +, pydantic +, pytest +, requests +, ruff +, smart-open +, srsly +, typer +, types-requests +, types-setuptools +, wasabi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "weasel"; + version = "0.3.3"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "weasel"; + rev = "refs/tags/v${version}"; + hash = "sha256-I8Omrez1wfAbCmr9hivqKN2fNgnFQRGm8OP7lb7YClk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + black + cloudpathlib + confection + isort + mypy + packaging + pre-commit + pydantic + pytest + requests + ruff + smart-open + srsly + typer + types-requests + types-setuptools + wasabi + ]; + + pythonImportsCheck = [ "weasel" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # This test requires internet access + "test_project_assets" + ]; + + meta = with lib; { + description = "Weasel: A small and easy workflow system"; + homepage = "https://github.com/explosion/weasel/"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index 1209df8042..d5fc26be9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "59.0"; + version = "60.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-Ijp2Y2s3ROqkq4oohfUM9Gz467GsuZtSdtAv7M9QdJI="; + hash = "sha256-VrmBIoARg1ew9jse/hgZngg0PUpWozk8HUdauHjOomo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix index 3e56109bcb..d1ba11d15e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.22.1"; + version = "3.25.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r/Yb0/XXTfIKYjKEQ+OqnIYNUzD9+xnE2N3ETLYEAy8="; + hash = "sha256-iU33APwfCpMvo3ACn2RK9AYvhxgCb9pa0HZH01fZUWc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 57c7857ca7..257649a9db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-mZBnTmjlmR9jOOmu6uY114UZpm05ny2ZMEF0NXhVrME="; + hash = "sha256-+pp21rtwavtjj6ahG091xsJpsYOH3zpqU3xH2/YFXqY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix index 5ec245676a..7ee91e7ea2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix @@ -3,20 +3,25 @@ , fetchPypi , pythonOlder , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "webcolors"; - version = "1.12"; - format = "setuptools"; + version = "1.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk="; + hash = "sha256-wiW2dMg/qSO+k9I1MwzgMANz0CiFzvIyOIE7DVZoMEo="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix index 2237f80f3b..22c1ea8a96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix @@ -17,19 +17,24 @@ buildPythonPackage rec { pname = "webdav4"; version = "0.9.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "skshetry"; - repo = pname; + repo = "webdav4"; rev = "refs/tags/v${version}"; hash = "sha256-Le/gABaUxMmSW2SjgucsBKqjxOq1h9UCAWl5YyUsCPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + nativeBuildInputs = [ hatch-vcs hatchling @@ -61,11 +66,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - pythonImportsCheck = [ "webdav4" ]; @@ -80,12 +80,14 @@ buildPythonPackage rec { "test_cp_cli" "test_mv_cli" "test_sync_remote_to_local" + ]; disabledTestPaths = [ # Tests requires network access "tests/test_client.py" "tests/test_fsspec.py" + "tests/test_cli.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix index a2873a26f0..26c27825f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.5.1"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pwnm2CMIklRxMhd/V1pOPnPP3wZSbiDMAqocO0cYTUA="; + hash = "sha256-Oq0l0xKEJmvPz9H9inQ/YygjBaNkuNCUikO9YGrMZS8="; }; propagatedBuildInputs = [ 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 98bc6cc863..ec6e429f59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "10.4"; + version = "11.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aaugustin"; repo = pname; - rev = version; - hash = "sha256-IylvnaS8cHatA+WMc5uY9E+l+52INqOMITU1VJPO2xY="; + rev = "refs/tags/${version}"; + hash = "sha256-RdkbIiZI/UYsWdnnl5gJPsnJ/6adfFtkiXC7MO/HwcI="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index baffe37de0..3f85f80648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.46.0"; + version = "0.48.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-7TR6+woAV8f80t4epCnZj4jYYpTPKDkzwzNNsgofiwg="; + hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index 496e73090c..e9f4877110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.58.3"; + version = "0.59.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-fSrmprt3aiYa8gRXOWKHKXah3zSqhRvD32nVdMrihwA="; + hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; }; propagatedBuildInputs = [ @@ -47,14 +47,12 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace requirements.txt \ - --replace "requests~=2.29.0" "requests" substituteInPlace image_extra_requirements.txt \ --replace "pillow~=" "pillow>=" \ --replace "ascii_magic~=" "ascii_magic>=" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ - --replace "pytest-cov" "" + --replace "required_plugins = pytest-httpserver pytest-cov" "" ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index e5b6a93eae..db045e77c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, flit-core , watchdog , ephemeral-port-reserve , pytest-timeout @@ -15,30 +16,37 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.2.3"; - format = "setuptools"; + version = "2.3.7"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + inherit pname version; + hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ markupsafe - ] ++ lib.optionals (!stdenv.isDarwin) [ - # watchdog requires macos-sdk 10.13+ - watchdog ]; + passthru.optional-dependencies = { + watchdog = lib.optionals (!stdenv.isDarwin) [ + # watchdog requires macos-sdk 10.13[ + watchdog + ]; + }; + nativeCheckInputs = [ ephemeral-port-reserve pytest-timeout pytest-xprocess pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ "test_get_machine_id" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix index 39aa19c8ad..b3cfcaa30b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "west"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-40h/VLa9kEWASJtgPvGm4JnG8uZWAUwrg8SzwhdfpN8="; + hash = "sha256-tB5RrJA5OUT5wB974nAA1LMpYVt+0HT7DvaTtGRoEpc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix index 1304b6c1dd..1bc512398b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix @@ -63,6 +63,11 @@ buildPythonPackage rec { "wfuzz" ]; + postInstall = '' + mkdir -p $out/share/wordlists/wfuzz + cp -R -T "wordlist" "$out/share/wordlists/wfuzz" + ''; + meta = with lib; { description = "Web content fuzzer to facilitate web applications assessments"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix index 9a0ad6756c..bba0f14e15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "whispers"; - version = "2.1.5"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "adeptex"; repo = pname; - rev = version; - hash = "sha256-vY8ruemRYJ05YtJAYX3TFlp+pRwF7Tkp7eft9e+HrgA="; + rev = "refs/tags/${version}"; + hash = "sha256-9vXku8BWJtlf+lmAcQ8a7qTisRNc+xVw0T0Eunc4lt4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix index a322c327b2..c991e5a592 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.10"; + version = "0.1.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5XDTl8NPrYWs7gPTJRDVCiZN3cWQ53/ojhJivBPHUL0="; + hash = "sha256-IX4sxuOxH4rXZlpRiWncXvaB2TkfZl1rKioZ3eqDGHs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whois-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whois-api/default.nix new file mode 100644 index 0000000000..775fb63356 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/whois-api/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "whois-api"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "whois-api-llc"; + repo = "whois-api-py"; + rev = "v${version}"; + hash = "sha256-SeBeJ6k2R53LxHov+8t70geqUosk/yBJQCi6GaVteMM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + # all tests touch internet + doCheck = false; + + pythonImportsCheck = [ "whoisapi" ]; + + meta = with lib; { + description = "Whois API client library for Python"; + homepage = "https://github.com/whois-api-llc/whois-api-py"; + changelog = "https://github.com/whois-api-llc/whois-api-py/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix index a27ebf2ec5..679e19722f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.7"; + version = "4.0.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6mfBenzUrjWPj0bDswTEBpi8BCNzLj8nMyHuFBIyyL4="; + hash = "sha256-PB9eRtwRZt/UCkLWhealE5b9NP+Hh0Kj5HxvDMSio4U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix index b65f18b6c6..b7af5aeeb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.54.0"; + version = "0.55.5"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-AGQfjUNxeleuTS200QMdZS8CSD2t4ah5NMm9TIYjVHk="; + hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys="; }; propagatedBuildInputs = [ 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 f7030f7c87..1787faa389 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -1,34 +1,62 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +# build-system +, flit-core + # dependencies , filetype -, defusedxml, +, defusedxml + +# optional-dependencies +, pillow-heif + +# tests +, numpy +, opencv4 +, pillow +, pytestCheckHook +, wand }: buildPythonPackage rec { pname = "willow"; - version = "1.5.1"; - format = "setuptools"; + version = "1.6.2"; + format = "pyproject"; disabled = pythonOlder "2.7"; - src = fetchPypi { - pname = "Willow"; - inherit version; - hash = "sha256-t6SQkRATP9seIodZLgZzzCVeAobhzVNCfuaN8ckiDEw="; + src = fetchFromGitHub { + owner = "wagtail"; + repo = "Willow"; + rev = "refs/tags/v${version}"; + hash = "sha256-dW2FVN3/mBAhVQ094uBsnXzdyTRKgHUDx0SWLm3g374="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ filetype defusedxml ]; - # Test data is not included - # https://github.com/torchbox/Willow/issues/34 - doCheck = false; + passthru.optional-dependencies = { + heif = [ + pillow-heif + ]; + }; + + nativeCheckInputs = [ + numpy + opencv4 + pytestCheckHook + pillow + wand + ] ++ passthru.optional-dependencies.heif; meta = with lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix index dc378d34d0..ab27147d65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/winacl/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winacl"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ymYsCRRxpsYp12xe7GPYob8a98BUNI8JwSQvM4hQsr0="; + hash = "sha256-RCcaMCVi3lFin2jvFUDUDzom57wBc2RrAaZ3nO2tZEw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/withings-sync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/withings-sync/default.nix new file mode 100644 index 0000000000..60cce387fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/withings-sync/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, garth +, lxml +, pythonOlder +, requests +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "withings-sync"; + version = "4.2.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jaroslawhartman"; + repo = "withings-sync"; + rev = "refs/tags/v${version}"; + hash = "sha256-6igjUmgIA077/1SQMt10tRpnLVKxGFNJN1GeLhQLROg="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + garth + lxml + requests + ]; + + pythonImportsCheck = [ + "withings_sync" + ]; + + meta = with lib; { + description = "Synchronisation of Withings weight"; + homepage = "https://github.com/jaroslawhartman/withings-sync"; + changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index 3e9e35edee..c1a5f51956 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -15,18 +15,25 @@ buildPythonPackage rec { pname = "wled"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-esINtvctvgl8AqNwCDVnGU+3j/UzEHqY8H1Rws1kQfs="; + hash = "sha256-y32zynkVsn5vWw+BZ6ZRf9zemGOWJMN4yfNQZ0bRpos="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -45,13 +52,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "wled" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index 5f77c34f98..2b98674fb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; homepage = "https://github.com/rspeer/wordfreq/"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix index 326a56461a..d4e37b5976 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wtf-peewee/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch +, setuptools , peewee , wtforms , python @@ -9,19 +9,16 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.3"; + version = "3.0.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; + hash = "sha256-cTbYRdvAUTY86MPR33BH+nA6H/epR8sgHDgOBQ/TUkQ="; }; - patches = [ - (fetchpatch { - name = "fix-wtforms3.patch"; - url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch"; - sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig"; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -30,7 +27,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck ${python.interpreter} runtests.py + runHook postCheck ''; meta = with lib; { 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 0ed40b8a91..5cbab30051 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 @@ -102,7 +102,7 @@ buildPythonPackage rec { export PATH="${wxGTK}/bin:$PATH" export SDL_CONFIG="${SDL.dev}/bin/sdl-config" - ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py + ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py runHook postBuild ''; @@ -111,7 +111,7 @@ buildPythonPackage rec { installPhase = '' runHook preInstall - ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out + ${python.pythonOnBuildForHost.interpreter} setup.py install --skip-build --prefix=$out wrapPythonPrograms runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix index 8944078f70..17afeaf5a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -4,13 +4,13 @@ , icalendar , pytz , pytestCheckHook -, restructuredtext_lint +, restructuredtext-lint , pygments }: buildPythonPackage rec { pname = "x-wr-timezone"; - version = "0.0.5"; + version = "0.0.6"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "x-wr-timezone"; rev = "v${version}"; - hash = "sha256-vUhAq6b5I0gYbXmbElxSSL6Mu9BSLs0uT5gb8zXdmpg="; + hash = "sha256-9B1gXabpZsJSHYUHLu6bBGidO3C5m/I0oOc5U/mbX0I="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - restructuredtext_lint + restructuredtext-lint pygments ]; @@ -36,9 +36,13 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + # https://github.com/niccokunzmann/x-wr-timezone/issues/8 + doCheck = false; + pythonImportsCheck = [ "x_wr_timezone" ]; meta = { + changelog = "https://github.com/niccokunzmann/x-wr-timezone/blob/${src.rev}/README.rst#changelog"; description = "Convert calendars using X-WR-TIMEZONE to standard ones"; homepage = "https://github.com/niccokunzmann/x-wr-timezone"; license = lib.licenses.lgpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/x11-hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/x11-hash/default.nix new file mode 100644 index 0000000000..403f1ed3e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/x11-hash/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + version = "1.4"; + pname = "x11-hash"; + pyproject = true; + + src = fetchPypi { + pname = "x11_hash"; + inherit version; + hash = "sha256-QtzqxEzpVGK48/lvOEr8VtPUYexLdXKD3zGv1VOdWpw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # pypi's source doesn't include tests + doCheck = false; + + pythonImportsCheck = [ + "x11_hash" + ]; + + meta = with lib; { + description = "Binding for X11 proof of work hashing"; + homepage = "https://github.com/mazaclub/x11_hash"; + license = licenses.mit; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix deleted file mode 100644 index e9cfe31743..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/x11_hash/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - version = "1.4"; - pname = "x11_hash"; - - src = fetchPypi { - inherit pname version; - sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22"; - }; - - meta = with lib; { - description = "Binding for X11 proof of work hashing"; - homepage = "https://github.com/mazaclub/x11_hash"; - license = licenses.mit; - maintainers = with maintainers; [ np ]; - }; - -} 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 cafc66dab9..2daf404549 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU="; + hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix index 58de4e7124..8b8b795edd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "21"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; - rev = version; + rev = "refs/tags/master.mint${version}"; hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 45e79fdd89..12cefa0332 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.7.0"; + version = "2023.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw="; + hash = "sha256-glxtZCAqcxpOSTIe3R6d+r9L4GgC8bjIo8AKPr/Izt8="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix index 189042082f..c57f5a4da5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; postBuild = '' - ${python.pythonForBuild.interpreter} -m compileall -f xattr + ${python.pythonOnBuildForHost.interpreter} -m compileall -f xattr ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix index d5583200be..f44d2e4435 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "6.0.0"; pname = "xdg"; disabled = isPy27; format = "pyproject"; @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = pname; - rev = version; - hash = "sha256-z/Zvo2WGw9qA+M3Pt9r35DuxtuhL7/I75LlFEdDOJcc="; + rev = "refs/tags/${version}"; + hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix new file mode 100644 index 0000000000..357e605d85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdoctest/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xdoctest"; + version = "1.1.2"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Erotemic"; + repo = "xdoctest"; + rev = "refs/tags/v${version}"; + hash = "sha256-yTu5ldr9TkpYRP8hjgUPpexBVLjaK2gfPvISjMJLY74="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMPDIR + export PATH=$out/bin:$PATH + ''; + + pythonImportsCheck = [ "xdoctest" ]; + + meta = with lib; { + description = "A rewrite of Python's builtin doctest module (with pytest plugin integration) with AST instead of REGEX"; + homepage = "https://github.com/Erotemic/xdoctest"; + changelog = "https://github.com/Erotemic/xdoctest/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "xdoctest"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xformers/default.nix index 1dc11e5f01..0fa17ac685 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xformers/default.nix @@ -27,20 +27,20 @@ #, flash-attn }: let - version = "0.0.21"; + version = "0.03"; in buildPythonPackage { pname = "xformers"; inherit version; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; - rev = "v${version}"; - hash = "sha256-zYziynjLtqjPPHjDbruuuG9209y0Sh+wYUFHUj+QG2Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix index 0b8f8d4ceb..35556fe32d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' - ${python.pythonForBuild.interpreter} xkbcommon/ffi_build.py + ${python.pythonOnBuildForHost.interpreter} xkbcommon/ffi_build.py ''; pythonImportsCheck = [ "xkbcommon" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix index 4610e71876..0d11e9df8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KTXVS0gtGby1Rla9oBy77J7kH/1C0jWlJwX9lcq3D9c="; + hash = "sha256-zEgC3tTQ6kwDovHPHRTvYndWVF79DpnAX454VDZiedE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix index 64ad5a1ebf..56d08ad514 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.3.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-RH5RQHLpfrI9fRg6OfPZ7/BPHQuHCrkJlwW/EJitdPo="; + hash = "sha256-J257Y8Y0mVtlFHiHju5lxPyV0yx3IAYH8ikbmZlI3fY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix index 4cf7842464..f19fe38366 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.0.3"; + version = "3.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-9fIxNkOdM+Bz1F9AWq02H3LLQnefxGSAtp9kM2OtJ9M="; + hash = "sha256-ZOKS9sTZvlopfIYOEhOk/rq4qtcMrNQ4Bwb8lDtKfxs="; }; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 84f8138880..0123cf4c55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,16 +27,16 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.18.1"; + version = "3.18.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-+8L6qkJAMdjT+IDVtZt8/7VsOMdSxi/Jm7ORapJArbI="; + hash = "sha256-IpCC5r9sOf4SFn0Bd6QgWqx3Sx0eRGcii7xyMpN5V/s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix index 9062026f74..10afcbe837 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.3.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - hash = "sha256-Gv1Hr4lVxdtzD2MK1TrnmM9/rgrLZM67PPlNNcR90Ig="; + hash = "sha256-w/njIrHr7r1E49nS2bEk4MVQwe9BvVUq/c3XGVFu5Bo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix index 5a03ed14fc..797242993f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage -, fetchFromGitHub , fetchPypi , mercantile , pytestCheckHook , requests +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "xyzservices"; - version = "2023.2.0"; - format = "setuptools"; + version = "2023.7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-M0K7pBDXlBKQ7tDlii5arbD3uXhj7EKDsoPEBu5yOig="; + hash = "sha256-DskodCIn1vXUNn6ntFf8/tlDQp9N4pSbWwKoLN9VadY="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + disabledTests = [ # requires network connections "test_free_providers" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 39829fc3ac..29ac9d1c68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.3.0"; + version = "2.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QL8S5fDNi6msyaV14E6tgN0C/nvXqV0+Mx+4AY0um4o="; + hash = "sha256-uHkJEtaohuTRs1RXDPbe4dohbjBnYi9MFguP9CTwM5w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix index 05d26bcd48..00cdf026c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.18"; + version = "1.4.19"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VMgx2MTiOoAw8tW8SckheN950JVbdWWSS3PWDNs0dT0="; + hash = "sha256-rYUxv3TEdyr2D3UEmmHcJJtlG6gXJnp1c2pez4H13SU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix index 8c171d9d74..f7b9f696d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.7"; + version = "1.2.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8O4EpHb1fP/O/t6hS1K1ylSXNKBuiipo7wvEnUJODSw="; + hash = "sha256-g9JwFnB4tFuvRvQGEURbIB2gaXQgCQJkL1sNmYMFvck="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix index 9fd5e993ec..c66f85cc15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; + hash = "sha256-qtn1QL0i3FA+W1UGzEeFb6zwgapx/TX3JzcbY+HkAr8="; }; pythonImportsCheck = [ 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 7e9812fbf2..d61a1097ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -9,6 +9,7 @@ , multitasking , numpy , pandas +, peewee , pythonOlder , requests , lxml @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.28"; + version = "0.2.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kTbQnpha4OHu5Xguo6v90uFpcXY1e8JJsJUo4ZbaCfk="; + hash = "sha256-GXnMzIjRx5c3O7J0bPjcdDvEIqTGMe002wYx28FLI6U="; }; propagatedBuildInputs = [ @@ -34,11 +35,12 @@ buildPythonPackage rec { cryptography frozendict html5lib + lxml multitasking numpy pandas + peewee requests - lxml ]; # Tests require internet access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index c730725581..cae85c51f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pytestCheckHook ]; pytestFlagsArray = [ "test/test.py" ]; @@ -51,5 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/kislyuk/yq"; license = licenses.asl20; maintainers = with maintainers; [ womfoo SuperSandro2000 ]; + mainProgram = "yq"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 7f3591468c..2531a6648e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-dJckAQ0sWdP7I10khcyKGKsIcDTXQxZtP7B8JHlIZEo="; + hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix index af5b605338..b878a1198f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-dt0y423Xw/IFi83DFvGdsN1uzJBMbm13pBYtMgMntuU="; + hash = "sha256-snYRYwJc9H6H+dxaQM4beGvu5AuaXv7W8w5xjR6RPyw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 0f27248c68..78610073af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.16.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hONraVvaDs6lKvmGEnGYTLIqXIZGeZB7e5uj95toT34="; + hash = "sha256-QnbPS0plNDEELNU/8igrxNKSpoQkEeiFKZZFBPsHMoY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zcbor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zcbor/default.nix new file mode 100644 index 0000000000..21d6e7e790 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zcbor/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# build dependencies +, setuptools + +# dependencies +, cbor2 +, pyyaml +, regex +}: + +buildPythonPackage rec { + pname = "zcbor"; + version = "0.7.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0mGp7Hnq8ZNEUx/9eQ6UD9/cOuLl6S5Aif1qNh1+jYA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cbor2 + pyyaml + regex + ]; + + pythonImportsCheck = [ "zcbor" ]; + + meta = with lib; { + description = "A low footprint CBOR library in the C language (C++ compatible), tailored for use in microcontrollers"; + homepage = "https://pypi.org/project/zcbor/"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 71e83806ff..7c2cf10e5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.115.1"; + version = "0.119.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-3dKF0DERxybhDZiwPpre1yrumZGILp0EIWur9WIkhhQ="; + hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 7413ddbfed..a8959a9e86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , zigpy @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.104"; + version = "0.0.106"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-oPg+eQ89GhNX5ADTK9JvgXuBhH7HZs3Ktuami2v2a38="; + hash = "sha256-+sL3AbjDg0Kl6eqMwVAN9W85QKJqFR1ANKz1E958KeA="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix index d1e7891eee..4bd3e76922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, heapdict, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pytest-asyncio +, pytest-repeat +, pytest-timeout +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "zict"; - version = "2.2.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; - }; + version = "3.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ heapdict ]; + src = fetchPypi { + inherit pname version; + hash = "sha256-4yHiY7apeq/AeQw8+zwEZWtwZuZzjDf//MqV2APJ+6U="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + pytest-repeat + pytest-timeout + ]; meta = with lib; { description = "Mutable mapping tools."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix index 54c750d94b..505e152f08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { zigpy ]; + doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index fe0eb86075..92e995c1ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.18.3"; + version = "0.19.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-+qtbOC3rsse57kqd4RLl9EKXzru0vdgIIPSl1OQ652U="; + hash = "sha256-KUXXOySuPFNKcW3O08FBYIfm4WwVjOuIF+GefmKnwl0="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index f31c8b006b..cf487cae08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.5"; + version = "0.11.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ti8H9FC8/xYS4je+d7EgRmDvBTmlOdiWUbuX+cbE2hY="; + hash = "sha256-K85AmksP/dXKL4DQKadyvjK7y5x6yEgc6vDJAPfblTw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index dde789fd28..1f6560377e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.2"; + version = "0.58.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-v4H8syWbXqmfvOznRECgSjYi246+socPJTffb79MXK4="; + hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix index 18cfe8b658..fe6e8771c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.6.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "pR0Ps"; repo = "zipstream-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-mY0dbHho/K1nTmhlv8i8KPa4HW7epBhfEksX3E2df2M="; + hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix index 2b65136aaf..522b2817a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-component/default.nix @@ -3,7 +3,7 @@ , fetchPypi , zope_configuration , zope-deferredimport -, zope_deprecation +, zope-deprecation , zope_event , zope-hookable , zope-i18nmessageid @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_configuration zope-deferredimport - zope_deprecation + zope-deprecation zope_event zope-hookable zope-i18nmessageid diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-contenttype/default.nix new file mode 100644 index 0000000000..c9d88d056e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-contenttype/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, zope_testrunner +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-contenttype"; + version = "5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.contenttype"; + inherit version; + hash = "sha256-AAHvG2XKZQUZBW3OUwxY0LOWlXzPBQIyPIoVSdtk0xc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + zope_testrunner + ]; + + pythonImportsCheck = [ + "zope.contenttype" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.contenttype"; + description = "A utility module for content-type (MIME type) handling"; + changelog = "https://github.com/zopefoundation/zope.contenttype/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix index b60a393e42..0c02097403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -1,21 +1,21 @@ { lib , buildPythonPackage , fetchPypi -, zope_proxy +, zope-proxy , zope_testrunner }: buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.4"; + version = "5.0"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; + sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; - propagatedBuildInputs = [ zope_proxy ]; + propagatedBuildInputs = [ zope-proxy ]; nativeCheckInputs = [ zope_testrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-deprecation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-deprecation/default.nix new file mode 100644 index 0000000000..4a0437e2b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-deprecation/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-deprecation"; + version = "5.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.deprecation"; + inherit version; + hash = "sha256-t8MtM5IDayFFxAsxA+cyLbaGYqsJtyZ6/hUyqdk/ZA8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/deprecation/tests.py" + ]; + + pythonImportsCheck = [ + "zope.deprecation" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.deprecation"; + description = "Zope Deprecation Infrastructure"; + changelog = "https://github.com/zopefoundation/zope.deprecation/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ domenkozar ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-dottedname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-dottedname/default.nix new file mode 100644 index 0000000000..895b00231a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-dottedname/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-dottedname"; + version = "6.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.dottedname"; + inherit version; + hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/dottedname/tests.py" + ]; + + pythonImportsCheck = [ + "zope.dottedname" + ]; + + pythonNamespaces = [ + "zope" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.dottedname"; + description = "Resolver for Python dotted names"; + changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-lifecycleevent/default.nix new file mode 100644 index 0000000000..fc6b0005ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, zope_event +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope-lifecycleevent"; + version = "5.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.lifecycleevent"; + inherit version; + hash = "sha256-6tP7SW52FPm1adFtrUt4BSsKwhh1utjWbKNQNS2bb50="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ zope_event zope_interface ]; + + # namespace colides with local directory + doCheck = false; + + pythonImportsCheck = [ + "zope.lifecycleevent" + "zope.interface" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; + description = "Object life-cycle events"; + changelog = "https://github.com/zopefoundation/zope.lifecycleevent/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-proxy/default.nix new file mode 100644 index 0000000000..d6a93b9d3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-proxy/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope-proxy"; + version = "5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.proxy"; + inherit version; + hash = "sha256-d3e9P4986nRSFyYgLhptUVPb9knyBOJQBYrQOvRqQxg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ zope_interface ]; + + # circular deps + doCheck = false; + + pythonImportsCheck = [ + "zope.proxy" + ]; + + meta = with lib; { + homepage = "https://github.com/zopefoundation/zope.proxy"; + description = "Generic Transparent Proxies"; + changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix index 59c6e67693..15b3f74a43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "zope-testbrowser"; - version = "5.6.1"; + version = "6.0"; format = "setuptools"; src = fetchPypi { pname = "zope.testbrowser"; inherit version; - sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7"; + sha256 = "sha256-RLd6XpA3q+3DZHai6j3H6XTWE85Sk913zAL4iO4x+ho="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix deleted file mode 100644 index 6d90dcce72..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_testrunner -}: - -buildPythonPackage rec { - pname = "zope.contenttype"; - version = "4.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; - }; - - nativeCheckInputs = [ zope_testrunner ]; - - meta = with lib; { - homepage = "https://github.com/zopefoundation/zope.contenttype"; - description = "A utility module for content-type (MIME type) handling"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix deleted file mode 100644 index 7eb66f7a9c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_testing -}: - -buildPythonPackage rec { - pname = "zope.deprecation"; - version = "4.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df"; - }; - - buildInputs = [ zope_testing ]; - - meta = with lib; { - homepage = "https://github.com/zopefoundation/zope.deprecation"; - description = "Zope Deprecation Infrastructure"; - license = licenses.zpl20; - maintainers = with maintainers; [ domenkozar ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix deleted file mode 100644 index bb9f527555..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "zope.dottedname"; - version = "5.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; - }; - - meta = with lib; { - homepage = "http://pypi.python.org/pypi/zope.dottedname"; - description = "Resolver for Python dotted names"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix deleted file mode 100644 index 807deb097f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, zope_event -, zope-component -}: - -buildPythonPackage rec { - pname = "zope.lifecycleevent"; - version = "4.4"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; - }; - - propagatedBuildInputs = [ zope_event zope-component ]; - - # namespace colides with local directory - doCheck = false; - - # zope uses pep 420 namespaces for python3, doesn't work with nix + python2 - pythonImportsCheck = lib.optionals isPy3k [ - "zope.lifecycleevent" - "zope.interface" - ]; - - meta = with lib; { - homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; - description = "Object life-cycle events"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix index aaf85eaadb..d0f79775d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_location/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, zope_proxy +, zope-proxy }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-Fx7tyKIOw6isJxOaqQzyd/93dy6gMrVLaicBp5J7OsU="; }; - propagatedBuildInputs = [ zope_proxy ]; + propagatedBuildInputs = [ zope-proxy ]; # ignore circular dependency on zope_schema preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix deleted file mode 100644 index 199a4b97d5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_interface -}: - -buildPythonPackage rec { - pname = "zope.proxy"; - version = "5.0.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-b6RMl6QStNxR4vX9Tcc8W9SZ01KA+IzSvNJviuHkV3s="; - }; - - propagatedBuildInputs = [ zope_interface ]; - - # circular deps - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/zopefoundation/zope.proxy"; - description = "Generic Transparent Proxies"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix index 97625a3e3c..c8ecd77730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.2.2"; + version = "0.2.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"; + sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix old mode 100755 new mode 100644 index 2da5ae524b..2bc20be4d4 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YT2q3XLHGxSIdCyvssOzgcOdDJu4xswVeqLV6kXMLvw="; + hash = "sha256-8I46ENAaJHh35MthqCoxnqdGw1ajeGVYvtJIHmxAVUY="; }; propagatedNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 105dbbbe04..52f2422bab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.52.1"; + version = "0.53.1"; format = "setuptools"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+zGLWti99mYTyPkSxiYgE5RqVvEr2PGt8vFwesjcquo="; + hash = "sha256-WfKZraF/mh1YTgK2YXnP5JHqjj5oWI9PeZAvt75btr8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxing-cpp/default.nix new file mode 100644 index 0000000000..dbdc4c50ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zxing-cpp/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, cmake +, setuptools-scm +, numpy +, pillow +, pybind11 +, libzxing-cpp +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zxing-cpp"; + inherit (libzxing-cpp) src version meta; + pyproject = true; + + sourceRoot = "${src.name}/wrappers/python"; + + # we don't need pybind11 in the root environment + # https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pybind11[global]" "pybind11" + ''; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + numpy + ]; + + buildInputs = [ + pybind11 + ]; + + nativeBuildInputs = [ + cmake + setuptools-scm + ]; + + nativeCheckInputs = [ + pillow + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test.py" + ]; + + pythonImportsCheck = [ + "zxingcpp" + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix deleted file mode 100644 index b876ab05af..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, cmake -, numpy -, pillow -, pybind11 -, zxing-cpp -}: - -buildPythonPackage rec { - pname = "zxing_cpp"; - inherit (zxing-cpp) src version meta; - - sourceRoot = "${src.name}/wrappers/python"; - - dontUseCmakeConfigure = true; - - propagatedBuildInputs = [ - pybind11 - numpy - ]; - - nativeBuildInputs = [ - cmake - ]; - - nativeCheckInputs = [ - pillow - ]; -} diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix index 314bf0048c..846c76b677 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/bootstrapped-pip/default.nix @@ -45,17 +45,17 @@ stdenv.mkDerivation rec { echo "Building setuptools wheel..." pushd setuptools - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building wheel wheel..." pushd wheel - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd echo "Building pip wheel..." pushd pip - ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . + ${python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache . popd ''; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix index eefc69a332..f90031e048 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pycairo/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # This is only used for figuring out what version of Python is in # use, and related stuff like figuring out what the install prefix # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonForBuild.interpreter}" + "-Dpython=${python.pythonOnBuildForHost.interpreter}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix index ca70a10615..faddafc9f9 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools/default.nix @@ -29,8 +29,8 @@ let ]; buildPhase = '' - ${python.pythonForBuild.interpreter} bootstrap.py - ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar + ${python.pythonOnBuildForHost.interpreter} bootstrap.py + ${python.pythonOnBuildForHost.interpreter} setup.py sdist --formats=gztar # Here we untar the sdist and retar it in order to control the timestamps # of all the files included diff --git a/third_party/nixpkgs/pkgs/development/quickemu/default.nix b/third_party/nixpkgs/pkgs/development/quickemu/default.nix index 95043c7be4..a8286ef5df 100644 --- a/third_party/nixpkgs/pkgs/development/quickemu/default.nix +++ b/third_party/nixpkgs/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.8"; + version = "4.9.1"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-QchY9inmBqAwNEhUL+uFCRX1laaM57ICbDJEBW7qTic="; + hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix index 2bd1dfb10f..cc091e1b84 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -7,7 +7,7 @@ let derive2 = derive { biocVersion = "3.17"; }; in with self; { AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.1"; sha256="0svxxhj3mh5gqik45ikcxnlhnma8n1c0rv8pycj2034cb9ms1dbv"; depends=[]; }; - AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.1.8"; sha256="1bn39n8lwb6w533fl4vlszivb4b3x9adkjh04z98sbn333bicgki"; depends=[AnnotationHubData ensembldb]; }; + AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.1.10"; sha256="0mqginwp70rwsmqwdl64awj4jr78n17rbaxmik86sk4n98fgd4xf"; depends=[AnnotationHubData ensembldb]; }; AHLRBaseDbs = derive2 { name="AHLRBaseDbs"; version="1.6.0"; sha256="0vz0chz41w45c1md49grav5jrbhws888ir1si9lp8dw7pj74vy9c"; depends=[AnnotationHub]; }; AHMeSHDbs = derive2 { name="AHMeSHDbs"; version="1.6.0"; sha256="0jd4i76qnr1vqqm3sq0ll8pdkihbkh83hqxzi3cvl3q786rxc1hk"; depends=[AnnotationHub]; }; AHPathbankDbs = derive2 { name="AHPathbankDbs"; version="0.99.5"; sha256="10wcrglm521xcrfbzc39dkbjvg1pkz0zq70vgnh68akiwmdirp89"; depends=[AnnotationHub]; }; @@ -126,6 +126,7 @@ in with self; { BSgenome_Vvinifera_URGI_IGGP12Xv0 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv0"; version="0.1"; sha256="1m8mqkiqs7291hccb8pfyf2yxpky45qr6j3d9wkvp9x3ra3h0yxf"; depends=[BSgenome]; }; BSgenome_Vvinifera_URGI_IGGP12Xv2 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv2"; version="0.1"; sha256="1saavsi75gw33jphhm3qb5psyfrv850ss4cmqr4i7aw1kc0fvs1j"; depends=[BSgenome]; }; BSgenome_Vvinifera_URGI_IGGP8X = derive2 { name="BSgenome.Vvinifera.URGI.IGGP8X"; version="0.1"; sha256="0v0hi2pbbi5ynd92bvbv4bzr7bgv48kvyz62hdv7k9gh7s5pg0id"; depends=[BSgenome]; }; + BioMartGOGeneSets = derive2 { name="BioMartGOGeneSets"; version="0.99.10"; sha256="1lnxh564l4qib7bqjmil3hlnfzg8f8ka22lhc72arw434dv5xxqh"; depends=[GenomicRanges S4Vectors]; }; CTCF = derive2 { name="CTCF"; version="0.99.11"; sha256="06gy1f71p01h6yfj5xmvlgz6n7sg7rpkc3723y51h30ir6xrzbrg"; depends=[]; }; ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="1.0.2"; sha256="0l47ac6lkycmghra2cbcdcxcv47ari8xg6lxpzilvkf4n6ld6064"; depends=[BiocGenerics ChemmineR RSQLite]; }; DO_db = derive2 { name="DO.db"; version="2.9"; sha256="10bqqa124l61ivzy4mdd3z3ar9a6537qbxw23pc4y9w8a6dwnavn"; depends=[AnnotationDbi]; }; @@ -149,7 +150,7 @@ in with self; { FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; }; GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; }; GO_db = derive2 { name="GO.db"; version="3.17.0"; sha256="072062xdhjsadzwlkp4gas7fyxnajg3xjd2vfadc7j0k1034igjx"; depends=[AnnotationDbi]; }; - GeneSummary = derive2 { name="GeneSummary"; version="0.99.4"; sha256="0fliy0z1byh7zlf7k3lklarrd2l2rl3sgliqsxnn4sviskv2rlxz"; depends=[]; }; + GeneSummary = derive2 { name="GeneSummary"; version="0.99.5"; sha256="1k3yi6872s9sdzc8732aqshzgzyz7pqwr8jh6z7dnpr73kv0n1yj"; depends=[]; }; GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.2.10"; sha256="0r7qb1nh680c0d5iplr2r0xb2prirvcc1xam5m8qyghndmaxpibl"; depends=[]; }; GenomicState = derive2 { name="GenomicState"; version="0.99.15"; sha256="1r7z3n6wyrd2cclj5b7sg15wpmjdh9k5b1hjlw7jjx8j384l7l1h"; depends=[AnnotationDbi AnnotationHub bumphunter derfinder GenomeInfoDb GenomicFeatures IRanges org_Hs_eg_db rtracklayer]; }; HDO_db = derive2 { name="HDO.db"; version="0.99.1"; sha256="14ngyxailmxrbxqqi9m7mchqcvchmbg7zm34i8a927b20s6z4z61"; depends=[AnnotationDbi]; }; @@ -270,7 +271,7 @@ in with self; { TxDb_Sscrofa_UCSC_susScr11_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr11.refGene"; version="3.12.0"; sha256="1i3w8avi5ihkynapya1wy70i6f0nq4jyy5nvlwikppqpdjwn7gb4"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.12.0"; sha256="01bl7zdxyhhg4706jhi7271fs09riixkyr3x0bancl1fpzwszc6p"; depends=[AnnotationDbi GenomicFeatures]; }; UCSCRepeatMasker = derive2 { name="UCSCRepeatMasker"; version="3.15.2"; sha256="0hi1h8vvbf27wk13gbfgm0amjqgl7b2qxlgakcbr87qxwbi02zv7"; depends=[AnnotationHub GenomeInfoDb RCurl XML]; }; - UniProtKeywords = derive2 { name="UniProtKeywords"; version="0.99.4"; sha256="0rs3y7kw77nwbvil4kvmjjlvjdsdyd8rdc0qb1ghm3bvisycgnyh"; depends=[]; }; + UniProtKeywords = derive2 { name="UniProtKeywords"; version="0.99.6"; sha256="1p2kzr959k0c713l4cba624i0av6jm0cn26975wrdhr86v7isj7g"; depends=[]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; adme16cod_db = derive2 { name="adme16cod.db"; version="3.4.0"; sha256="1vn9s1lrl6zzs00madb111fdzqjfb45mprpjqap8bvib65942rvq"; depends=[AnnotationDbi org_Rn_eg_db]; }; @@ -340,7 +341,7 @@ in with self; { excluderanges = derive2 { name="excluderanges"; version="0.99.8"; sha256="19pdwlhqlz420yss371bsqhkx8c7wxr0sv4wsycnc0mlplwq4bsf"; depends=[GenomicRanges]; }; fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.7.1"; sha256="19isa4x8js0pdb4k8a11bw3bzmzv6jc4jphzrvav7piqkvrgykzx"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; }; fly_db0 = derive2 { name="fly.db0"; version="3.17.0"; sha256="0xsrzgp7ifi91hhfdq88k7jzamkhpyf8c3mxk0nfn9rqaam9dyr4"; depends=[AnnotationDbi]; }; - geneplast_data = derive2 { name="geneplast.data"; version="0.99.6"; sha256="1vq2l828d25lsmmac6079vip8bbvqhiyr1x58s467cwcl1mgayrk"; depends=[]; }; + geneplast_data = derive2 { name="geneplast.data"; version="0.99.7"; sha256="1br68rvn6rc5fg2lpa5drgdzk809ym58i2gzgdsjgyzb4rl0xf2y"; depends=[ape BiocFileCache dplyr geneplast igraph purrr readr tibble treeio]; }; geneplast_data_string_v91 = derive2 { name="geneplast.data.string.v91"; version="0.99.6"; sha256="0mc26d0sgmpmfmqsqinqv5k6vhg0hlc8hsjkcnvf369yav224nq1"; depends=[]; }; genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; }; genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix index baa38dbbb5..957c3db261 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -44,7 +44,7 @@ in with self; { ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.36.0"; sha256="0wsmlrsajyhkspvjqqkva5b982q07rmayrd13g0byrxljihcabkq"; depends=[]; }; CopyNeutralIMA = derive2 { name="CopyNeutralIMA"; version="1.18.0"; sha256="1ljv0q15mbq60ajb5ajhwi100x9mm87wjs9i87wxvbddqbj1sb2x"; depends=[ExperimentHub Rdpack]; }; CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.32.0"; sha256="1ljzaz87341n3v5xr4p0kljqans64qkpqjnq3cb3z1lq4g7py7l7"; depends=[]; }; - DAPARdata = derive2 { name="DAPARdata"; version="1.30.0"; sha256="04z5a4ybnv5940r1c1xj8mlm5l41fdfrw63dbf31110jjzxgs3lf"; depends=[MSnbase]; }; + DAPARdata = derive2 { name="DAPARdata"; version="1.30.4"; sha256="002smsicwxahxb2yr3vc0lx99sz3pxh61vvmx31lfzqb1gfkagwr"; depends=[BiocStyle graph MSnbase]; }; DExMAdata = derive2 { name="DExMAdata"; version="1.8.0"; sha256="0v3wmfa525agshf76y8rmrwv53zz9ych13y6ggw908w902csbc7w"; depends=[Biobase]; }; DLBCL = derive2 { name="DLBCL"; version="1.40.0"; sha256="0wrjh76q2msbxmp6fwnbhyzrqfmr063pfbhxcw6rv7vc3ysgljbf"; depends=[Biobase]; }; DMRcatedata = derive2 { name="DMRcatedata"; version="2.18.0"; sha256="0zdkhc0vy021yhbb4bqs8k1mfw2gdjngsy2lnhh66jjnv798w1zy"; depends=[ExperimentHub GenomicFeatures Gviz IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 plyr readxl rtracklayer]; }; @@ -198,7 +198,7 @@ in with self; { SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.32.0"; sha256="1y07c6kqslrr7bb0y114hvw0jvgf6pgqh3dly398f41p8xi8wj6z"; depends=[]; }; SimBenchData = derive2 { name="SimBenchData"; version="1.8.0"; sha256="0fq196gvb3i12f1b0q5xfhfg4amxskd7bgzy03x0k62v5bk4w27f"; depends=[ExperimentHub S4Vectors]; }; Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.28.0"; sha256="03apc7nq51lmqnvch0idzviz35d12n1pzhxaa44zxw9jvbfps9a2"; depends=[]; }; - SingleCellMultiModal = derive2 { name="SingleCellMultiModal"; version="1.12.2"; sha256="0ki0qi3dc3zqlcb7w95xrpmr3fshqzg6a26cnc06yyysfsxalsnk"; depends=[AnnotationHub BiocBaseUtils BiocFileCache ExperimentHub HDF5Array Matrix MultiAssayExperiment S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + SingleCellMultiModal = derive2 { name="SingleCellMultiModal"; version="1.12.3"; sha256="01fq5n5djqjlj5gkzj2fsw2gw1glm6sr83ggpl0i8w4r6nl9wabp"; depends=[AnnotationHub BiocBaseUtils BiocFileCache ExperimentHub HDF5Array Matrix MultiAssayExperiment S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; SingleMoleculeFootprintingData = derive2 { name="SingleMoleculeFootprintingData"; version="1.8.0"; sha256="11nkyzjrc7jd88qyx5i3s0l7zzh6ld1w59fxaa9v7bx72b1yjvh4"; depends=[ExperimentHub]; }; SomatiCAData = derive2 { name="SomatiCAData"; version="1.38.0"; sha256="0f82mxh59gsxpfggzjh4qz8pzh7bwif05kn0kpi5ja0nj8mgj0c4"; depends=[]; }; SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.36.0"; sha256="1j1ky7pff22h08jn9is7afwplqq8ypg7cv81i0ymjfnjlqiks1h3"; depends=[GenomicRanges IRanges S4Vectors]; }; @@ -387,7 +387,7 @@ in with self; { rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.38.0"; sha256="0bnrkq6impb61fj6991290bji5dba4j11favykws668lj113wk9p"; depends=[]; }; sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.24.0"; sha256="0rm9q82iiii2rnq9pqy7a0c7pbw2vwwr5132vzvsr5x7q2xfwf8v"; depends=[SummarizedExperiment]; }; scATAC_Explorer = derive2 { name="scATAC.Explorer"; version="1.6.0"; sha256="0y9ykfl20ffww51n45i8ljg3f2jz0lc20qp81q0q3rwy7wjz28iv"; depends=[BiocFileCache data_table Matrix S4Vectors SingleCellExperiment]; }; - scMultiome = derive2 { name="scMultiome"; version="1.0.0"; sha256="0ddfr9m1is9gia9gnfgw4crzna8c1w21pzwcvb5zhlyc5qi59pqb"; depends=[AnnotationHub AzureStor checkmate DelayedArray ExperimentHub GenomicRanges HDF5Array MultiAssayExperiment rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scMultiome = derive2 { name="scMultiome"; version="1.0.1"; sha256="1i2xh1vqz9388fwll639ilcrl47wgi8wfyfs416znn494qiwbbv2"; depends=[AnnotationHub AzureStor checkmate DelayedArray ExperimentHub GenomicRanges HDF5Array MultiAssayExperiment rhdf5 S4Vectors SingleCellExperiment SummarizedExperiment]; }; scRNAseq = derive2 { name="scRNAseq"; version="2.14.0"; sha256="0ch3fg4vzzqnk6l4m1clfgmh6jighqlnqzwh7w66hlkyjknpbbjd"; depends=[AnnotationDbi AnnotationHub BiocGenerics ensembldb ExperimentHub GenomicFeatures GenomicRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; scTHI_data = derive2 { name="scTHI.data"; version="1.12.0"; sha256="1pfglyb12k5qv2xqbkzn87b4gg3v854mkw81k0wchmvqzr5v5m9h"; depends=[]; }; scanMiRData = derive2 { name="scanMiRData"; version="1.6.0"; sha256="13krdxff0xwv179swy2dqfgfzpnp41d2khxm002hj5h4ra48p4gz"; depends=[scanMiR]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix index 6d35afe166..0c40df1601 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/bioc-packages.nix @@ -20,7 +20,7 @@ in with self; { ALDEx2 = derive2 { name="ALDEx2"; version="1.32.0"; sha256="0gdkc8qwx3vpk5i09znlfrag7gk87piz61z90k96v6bm6x8sclb8"; depends=[BiocParallel GenomicRanges IRanges multtest Rfast S4Vectors SummarizedExperiment zCompositions]; }; AMARETTO = derive2 { name="AMARETTO"; version="1.16.0"; sha256="1yp2npw9mdjy0wchbp0y1r1ifyy63hdz2y3y8cia9c76nfv4627f"; depends=[BiocFileCache callr circlize ComplexHeatmap curatedTCGAData doParallel dplyr DT foreach ggplot2 glmnet gridExtra httr impute knitr limma Matrix matrixStats MultiAssayExperiment Rcpp readr reshape2 rmarkdown tibble]; }; AMOUNTAIN = derive2 { name="AMOUNTAIN"; version="1.26.0"; sha256="12ml67882lscv05np4m80fg9d48dwkaa6kx5cga6x19kdx6xs2cj"; depends=[]; }; - ANCOMBC = derive2 { name="ANCOMBC"; version="2.2.1"; sha256="05gngz6cqihxg4zlf7ymw93qj61a1i19hgp4fkc0cxnkq0pambrd"; depends=[CVXR DescTools doParallel doRNG energy foreach gtools Hmisc lme4 lmerTest MASS Matrix mia multcomp nloptr Rdpack S4Vectors SingleCellExperiment SummarizedExperiment TreeSummarizedExperiment]; }; + ANCOMBC = derive2 { name="ANCOMBC"; version="2.2.2"; sha256="0jws3wqgwc0gnp7smc0lsqfw9jbcik36pl7vz9a8ndgwpp9c8653"; depends=[CVXR DescTools doParallel doRNG energy foreach gtools Hmisc lme4 lmerTest MASS Matrix mia multcomp nloptr Rdpack S4Vectors SingleCellExperiment SummarizedExperiment TreeSummarizedExperiment]; }; ANF = derive2 { name="ANF"; version="1.22.0"; sha256="08vkkfccfq8j4hanxsmjx5657kkw4qcp46qfhqvp1sd6wym69wzw"; depends=[Biobase igraph MASS RColorBrewer survival]; }; APAlyzer = derive2 { name="APAlyzer"; version="1.14.0"; sha256="1k1nrrcgx4m37z92mjvz48fx645pbsq5wi6w7h9hg0pfpynmgc26"; depends=[DESeq2 dplyr GenomicAlignments GenomicFeatures GenomicRanges ggplot2 ggrepel HybridMTest repmis Rsamtools Rsubread rtracklayer SummarizedExperiment tidyr VariantAnnotation]; }; APL = derive2 { name="APL"; version="1.4.0"; sha256="1rdc6rnb3igckg74c5297436rr4wn5bhh8mgx4scw9mry5rx5q15"; depends=[ggplot2 ggrepel magrittr org_Hs_eg_db org_Mm_eg_db plotly reticulate rlang Seurat SingleCellExperiment SummarizedExperiment topGO viridisLite]; }; @@ -44,7 +44,7 @@ in with self; { AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.38.0"; sha256="1ms3x3x2gvhgllff3nwawg5jlpmgx6dhwll0dghklnv3lssbx4c7"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; }; AlphaBeta = derive2 { name="AlphaBeta"; version="1.14.0"; sha256="11431d453xszzjyxr10npnblhlrfw8hl5jgabpxla7cj77w02wnr"; depends=[BiocParallel data_table dplyr expm ggplot2 gtools igraph optimx plotly stringr]; }; AlpsNMR = derive2 { name="AlpsNMR"; version="4.2.0"; sha256="0rp82y7163pjbl7n6fyywh4l0sgzn1z8kp83v0kg7xk3810mj9sm"; depends=[baseline BiocParallel cli dplyr fs future generics ggplot2 glue htmltools magrittr matrixStats mixOmics pcaPP purrr readxl reshape2 rlang rmarkdown scales signal speaq stringr tibble tidyr tidyselect vctrs]; }; - AnVIL = derive2 { name="AnVIL"; version="1.12.3"; sha256="0dx10gcch6csk8nw3ffz4yvn5jf0v80ynsp3dg1az0ybkqyrzbih"; depends=[BiocManager dplyr DT futile_logger htmltools httr jsonlite miniUI rapiclient rlang shiny tibble tidyr tidyselect]; }; + AnVIL = derive2 { name="AnVIL"; version="1.12.4"; sha256="05wgrr16vaqb7982j7nyri6rrhx90ljgxc37afhw190wc5dj07n0"; depends=[BiocManager dplyr DT futile_logger htmltools httr jsonlite miniUI rapiclient rlang shiny tibble tidyr tidyselect]; }; AnVILBilling = derive2 { name="AnVILBilling"; version="1.10.0"; sha256="1nxj5yn87qrzb7g8jxbqzjnllshcrfrjf0midn90xfxxj8lsfxpk"; depends=[bigrquery DBI dplyr DT ggplot2 lubridate magrittr plotly shiny shinytoastr]; }; AnVILPublish = derive2 { name="AnVILPublish"; version="1.10.0"; sha256="1b0v6dx667dpfppf69gwahxgk5sf01fzjkl3qsablqi9w7h8cnab"; depends=[AnVIL httr jsonlite readr rmarkdown whisker yaml]; }; AnVILWorkflow = derive2 { name="AnVILWorkflow"; version="1.0.1"; sha256="07s3c1c8asfswxsz9hi0sj6mrvdqa1lynsksqr8km3cssdljjf4g"; depends=[AnVIL httr jsonlite]; }; @@ -103,8 +103,8 @@ in with self; { BioCor = derive2 { name="BioCor"; version="1.24.0"; sha256="1aw8yh9l0jbjvkqgyzyr0wmwjh3ppmb0lwg8hxsfcv52ycsmvk7p"; depends=[BiocParallel GSEABase Matrix]; }; BioMM = derive2 { name="BioMM"; version="1.15.0"; sha256="01lfw0npcclcyqqh2xkhjq9jw0irbk13fsj5y1b3rz1amzzngg6p"; depends=[BiocParallel CMplot e1071 ggplot2 glmnet imager lattice nsprcomp precrec ranger rms topGO vioplot xlsx]; }; BioMVCClass = derive2 { name="BioMVCClass"; version="1.68.0"; sha256="07iay2dpq3margh1ny2snlc75g7fpfs5bf2gmhv88d31b8blg57r"; depends=[Biobase graph MVCClass Rgraphviz]; }; - BioNAR = derive2 { name="BioNAR"; version="1.2.4"; sha256="1c0sw406a95nwagb2phzdwgrhdjz44z5w6kmwb2gyi0bj8wrxbl3"; depends=[AnnotationDbi clusterCons cowplot data_table dplyr fgsea ggplot2 ggrepel GO_db igraph latex2exp minpack_lm org_Hs_eg_db poweRlaw Rdpack RSpectra rSpectral scales stringr synaptome_db viridis WGCNA]; }; - BioNERO = derive2 { name="BioNERO"; version="1.8.5"; sha256="0nrvq6cn55qzp66pqssyfxl2wh5dfqndchcv8qgfqajsnz8i35xm"; depends=[BiocParallel ComplexHeatmap dynamicTreeCut GENIE3 ggdendro ggnetwork ggplot2 ggrepel igraph intergraph matrixStats minet NetRep patchwork RColorBrewer reshape2 rlang SummarizedExperiment sva WGCNA]; }; + BioNAR = derive2 { name="BioNAR"; version="1.2.5"; sha256="0xpk3h7hpmmmcxay2w5i4by5vccxbx8rnlkxpmg2hgx0cf29vpfx"; depends=[AnnotationDbi clusterCons cowplot data_table dplyr fgsea ggplot2 ggrepel GO_db igraph latex2exp minpack_lm org_Hs_eg_db poweRlaw Rdpack RSpectra rSpectral scales stringr synaptome_db viridis WGCNA]; }; + BioNERO = derive2 { name="BioNERO"; version="1.8.7"; sha256="0yvd05yikvblnhimnmn4srcsimab4qml5k582n0c9h4rppffmvy4"; depends=[BiocParallel ComplexHeatmap dynamicTreeCut GENIE3 ggdendro ggnetwork ggplot2 ggrepel igraph intergraph matrixStats minet NetRep patchwork RColorBrewer reshape2 rlang SummarizedExperiment sva WGCNA]; }; BioNet = derive2 { name="BioNet"; version="1.60.0"; sha256="19caj3aj6gndkxkrd9s2x8v59hcdwdyxrx0ji473c3d5qrykskl1"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; BioNetStat = derive2 { name="BioNetStat"; version="1.20.0"; sha256="0bvfgppsdih6s70iizd7zh3zkb0hg4s4h1728xmyjqbvkl8fsdf4"; depends=[BiocParallel DT ggplot2 Hmisc igraph knitr markdown pathview pheatmap plyr psych RColorBrewer RJSONIO rmarkdown shiny shinyBS whisker yaml]; }; BioQC = derive2 { name="BioQC"; version="1.28.0"; sha256="0g6imi03l4xm0chx3i9wd2vdy0ls78lnylp294fq0jldl4n6y0nw"; depends=[Biobase edgeR Rcpp]; }; @@ -116,7 +116,7 @@ in with self; { BiocFHIR = derive2 { name="BiocFHIR"; version="1.2.0"; sha256="1i2yi3430gb5zhfap2yiwhwmgy34011hdk5gycb722342sl99hw4"; depends=[BiocBaseUtils dplyr DT graph jsonlite shiny tidyr visNetwork]; }; BiocFileCache = derive2 { name="BiocFileCache"; version="2.8.0"; sha256="1qk1n50arlk0mfkv9p3zl3lqbapzfkjdbadv51hsp4h9lyaw9sbg"; depends=[curl DBI dbplyr dplyr filelock httr RSQLite]; }; BiocGenerics = derive2 { name="BiocGenerics"; version="0.46.0"; sha256="19kwpis282i8x31xlh8nc3z6vvn23p3wpx7wmrqhclf8ymq61c7z"; depends=[]; }; - BiocHail = derive2 { name="BiocHail"; version="1.0.0"; sha256="0ffqhgmz5x5fy80la72fv3b93kzr52dpancddqw9hdg8ms7bxhdw"; depends=[basilisk BiocFileCache BiocGenerics dplyr reticulate]; }; + BiocHail = derive2 { name="BiocHail"; version="1.0.1"; sha256="1qn7hi7lkq3q17m7f7jb7amkph2xi7mz18yc9xgwc9hw507kr9wg"; depends=[basilisk BiocFileCache BiocGenerics dplyr reticulate]; }; BiocHubsShiny = derive2 { name="BiocHubsShiny"; version="1.0.0"; sha256="0rb73yi26wqayh5p1mf0nygpa9qyydasflc9whrvsafy8g4cfjy7"; depends=[AnnotationHub DT ExperimentHub htmlwidgets S4Vectors shiny shinyAce shinyjs shinythemes shinytoastr]; }; BiocIO = derive2 { name="BiocIO"; version="1.10.0"; sha256="03hslg7k6khchf54gmlbkvwbkfn5ppz0wp7lh75gsnr0licsjkwx"; depends=[BiocGenerics S4Vectors]; }; BiocNeighbors = derive2 { name="BiocNeighbors"; version="1.18.0"; sha256="1i4b37n9darizfq9i4vvbnxgrwhkvvd25a4cpfjv7nqywjfbsfjd"; depends=[BiocParallel Matrix Rcpp RcppHNSW S4Vectors]; }; @@ -126,12 +126,12 @@ in with self; { BiocSet = derive2 { name="BiocSet"; version="1.14.0"; sha256="1q5794gsinpy9hv5n1vx79bkqxi1jxzxjl95jlw9pqjmlnki07i5"; depends=[AnnotationDbi BiocIO dplyr KEGGREST ontologyIndex plyr rlang S4Vectors tibble tidyr]; }; BiocSingular = derive2 { name="BiocSingular"; version="1.16.0"; sha256="1a33zsw353pryq30178sbj9jzsmb4m7spqbx11hsicri8s1c0lb9"; depends=[beachmat BiocGenerics BiocParallel DelayedArray irlba Matrix Rcpp rsvd S4Vectors ScaledMatrix]; }; BiocSklearn = derive2 { name="BiocSklearn"; version="1.22.0"; sha256="0ggzln6ld4a4a3n2swssm11saj0pnqgsfibd0w1aa4k0q2i5m3dy"; depends=[basilisk reticulate SummarizedExperiment]; }; - BiocStyle = derive2 { name="BiocStyle"; version="2.28.0"; sha256="04npnfmz1p1vpwrdsim309k7518i4p1li04xnmw8c9zgdb6yl61a"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; + BiocStyle = derive2 { name="BiocStyle"; version="2.28.1"; sha256="11v3gzy88fai0rhdymvj9k74g7hjc6n9fihfrrnw0qfr447z1d61"; depends=[BiocManager bookdown knitr rmarkdown yaml]; }; BiocVersion = derive2 { name="BiocVersion"; version="3.17.1"; sha256="0n29adnb62agp9li8rmn68z653d2m41iy9zjz75h43a05drlgp33"; depends=[]; }; BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.26.0"; sha256="1zvjj0hpqwdv7yifqwyb14166ppxw91d964gz4xclism5z5lvyln"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown rstudioapi stringr usethis]; }; Biostrings = derive2 { name="Biostrings"; version="2.68.1"; sha256="13cnjbq2iykv83ycb4151d7yys21s3v15fc72v3s02m1i92lqyq4"; depends=[BiocGenerics crayon GenomeInfoDb IRanges S4Vectors XVector]; }; BloodGen3Module = derive2 { name="BloodGen3Module"; version="1.8.0"; sha256="167wpz0s9xlgpp1d3rfy7p76wgmsqlxcj9g7dbz3y0qv7iilngck"; depends=[circlize ComplexHeatmap ExperimentHub ggplot2 gtools limma matrixStats preprocessCore randomcoloR reshape2 SummarizedExperiment testthat V8]; }; - BridgeDbR = derive2 { name="BridgeDbR"; version="2.10.0"; sha256="0372bafv2nxs61wr3dinn6px7qvbswysnacv2xdrp3gm5i1wjzsi"; depends=[curl rJava]; }; + BridgeDbR = derive2 { name="BridgeDbR"; version="2.10.2"; sha256="11rjv5dlkyjsq43b9yi80mf8imxigqmlrzhk7v65j9lq7kdlcd7d"; depends=[curl rJava]; }; BrowserViz = derive2 { name="BrowserViz"; version="2.22.0"; sha256="14ddcfl73bi4ivd6wqp9xfxaf7fx89gh6qzf91psj44vyvzmdar3"; depends=[BiocGenerics httpuv jsonlite]; }; BubbleTree = derive2 { name="BubbleTree"; version="2.30.0"; sha256="17c97x8g34fqsq3cnj4cp4cjignn7d8m31k1msinxy92kndij3sw"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; }; BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.64.0"; sha256="0sjz4ymqdn57l6cr0968w5nbhp5fm386cf2waxph8n7s1w4lraf3"; depends=[]; }; @@ -181,7 +181,7 @@ in with self; { CONSTANd = derive2 { name="CONSTANd"; version="1.8.0"; sha256="083pqvzxd3svy8g9qrv08221dr2rcwj9jknask2h227zi4id1lwi"; depends=[]; }; CORREP = derive2 { name="CORREP"; version="1.66.0"; sha256="1gsjkn72npj78xs2j00ny5vcykfx9j6j41nckk2lnmsq2vynjj95"; depends=[e1071]; }; COSNet = derive2 { name="COSNet"; version="1.34.0"; sha256="1qjayfvb4iy8jpyq547gs2x66p99j56v6zd443rjn0rrwqyrxw9m"; depends=[]; }; - COTAN = derive2 { name="COTAN"; version="2.0.4"; sha256="0f2x7xra32m4pnpr95wprmi4na8vqc0rps5jyhaq4d1p2r9zrlil"; depends=[assertthat circlize ComplexHeatmap dendextend dplyr factoextra ggplot2 ggrepel ggthemes irlba Matrix parallelly plyr RColorBrewer Rfast rlang scales Seurat stringr tibble tidyr umap withr zeallot]; }; + COTAN = derive2 { name="COTAN"; version="2.0.5"; sha256="1blrziycc3xgglk1r2hqvz4qiqjvnyjzvjlvcjwvm3yij11wwl5q"; depends=[assertthat circlize ComplexHeatmap dendextend dplyr factoextra ggplot2 ggrepel ggthemes irlba Matrix parallelly plyr RColorBrewer Rfast rlang scales Seurat stringr tibble tidyr umap withr zeallot]; }; CRISPRseek = derive2 { name="CRISPRseek"; version="1.40.0"; sha256="0gp96c3gip48yd2ffw6n9p30ib7yiz7p4h57i0kc4qv3lnj31dqi"; depends=[BiocGenerics Biostrings BSgenome data_table DelayedArray dplyr GenomeInfoDb GenomicRanges hash IRanges keras mltools reticulate rhdf5 S4Vectors seqinr XVector]; }; CRImage = derive2 { name="CRImage"; version="1.48.0"; sha256="11ikg8mil9slnjxcl45b97i2yng8bh1fdcyf92bwhrwnamp0asfc"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; }; CSAR = derive2 { name="CSAR"; version="1.52.0"; sha256="0p3r2x7gn4gmsdmymwi1spd4dpc8phgbg7zw8hwbif0s28vpz40m"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; @@ -209,7 +209,7 @@ in with self; { ChAMP = derive2 { name="ChAMP"; version="2.30.0"; sha256="1px2pm90lxwh0yn7h1kmmf94flhjs5p4i0iav7ya1xfybyg4w2zc"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel DT GenomicRanges ggplot2 globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva kpmt limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; }; ChIC = derive2 { name="ChIC"; version="1.19.0"; sha256="0zbmhixxn3skn8csz93fyyfamz1n3gzjzb2caw8ybi2cysgzz5ys"; depends=[BiocGenerics caret caTools ChIC_data genomeIntervals GenomicRanges IRanges progress randomForest Rsamtools S4Vectors]; }; ChIPComp = derive2 { name="ChIPComp"; version="1.30.0"; sha256="1v27bqik5cgcvs1kb67s52r56v6fakvmi81iybvvvbxvcn1dmy9r"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; - ChIPQC = derive2 { name="ChIPQC"; version="1.36.0"; sha256="0fpgjiixkb885dbhh70r0g6mib1yz2cyfw3v5wcjxhbzfrn27wqh"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; + ChIPQC = derive2 { name="ChIPQC"; version="1.36.1"; sha256="0jlh74gr4d9n7g91mcgg82yha9hvd5kqkqn8r36knbxs27drbxbc"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; ChIPXpress = derive2 { name="ChIPXpress"; version="1.44.0"; sha256="08qzmjvz3v5ji9lzpxlhxgv3d0smmyvai49yphbbvz9vv57hgjkf"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.22.0"; sha256="1r8d5bvmmgcxw8kxzdgymwnyg0lspjv9sfjd6pfrhjn88sjz22xv"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RColorBrewer RcppRoll ROCR rtracklayer S4Vectors]; }; ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.24.0"; sha256="1iysqs2k0xxiwd48ymahf6rywwj9ingjcfmnhx9d1x6w2h00v7lz"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; }; @@ -224,7 +224,7 @@ in with self; { ChromSCape = derive2 { name="ChromSCape"; version="1.10.0"; sha256="1v5gym0zsbi0jwpgdr442z97zw295f0h335jndzbi23n4nfj6lxv"; depends=[batchelor BiocParallel colorRamps colourpicker ConsensusClusterPlus coop DelayedArray dplyr DT edgeR forcats fs GenomicRanges gggenes ggplot2 ggrepel gridExtra IRanges irlba jsonlite kableExtra Matrix matrixTests msigdbr plotly qs qualV Rcpp rlist Rsamtools rtracklayer Rtsne S4Vectors scater scran shiny shinycssloaders shinydashboard shinydashboardPlus shinyFiles shinyhelper shinyjs shinyWidgets SingleCellExperiment stringdist stringr SummarizedExperiment tibble tidyr umap viridis]; }; CircSeqAlignTk = derive2 { name="CircSeqAlignTk"; version="1.2.0"; sha256="199ynhjl4hmgxwgzpg2wp4k5jrw737c7v40yjg7ds17j62hs4ari"; depends=[BiocGenerics Biostrings dplyr ggplot2 IRanges magrittr Rbowtie2 Rhisat2 rlang Rsamtools S4Vectors ShortRead tidyr]; }; CiteFuse = derive2 { name="CiteFuse"; version="1.12.0"; sha256="1cvg7gnnjxgickqd3hm90dv5zi1vr3xv0l51qll7gfksck75d8fr"; depends=[compositions cowplot dbscan ggplot2 ggraph ggridges gridExtra igraph Matrix mixtools pheatmap randomForest Rcpp reshape2 rhdf5 rlang Rtsne S4Vectors scales scran SingleCellExperiment SummarizedExperiment uwot]; }; - ClassifyR = derive2 { name="ClassifyR"; version="3.4.9"; sha256="00l0xdp4llyf96k8lnzb3s4ani785myvrlqd5zmvazp0vcdaryn1"; depends=[BiocParallel dplyr genefilter generics ggplot2 ggpubr MultiAssayExperiment ranger reshape2 rlang S4Vectors survival tidyr]; }; + ClassifyR = derive2 { name="ClassifyR"; version="3.4.11"; sha256="10mcc62v4fzm8gavs874dmkhnqz8vdl52di3z2qjg76jv6jj7z9q"; depends=[BiocParallel dplyr genefilter generics ggplot2 ggpubr MultiAssayExperiment ranger reshape2 rlang S4Vectors survival tidyr]; }; Clomial = derive2 { name="Clomial"; version="1.36.0"; sha256="1y4jjq9vxgi6m5g94j0j4xvcbpba7pv6y284ig3m4m83pq9xbq5d"; depends=[matrixStats permute]; }; Clonality = derive2 { name="Clonality"; version="1.47.0"; sha256="0yxwwc0sl3impvzr0bmjmdn65z6qx6lf5pwik2p8wxxgaybvff9r"; depends=[DNAcopy]; }; CluMSID = derive2 { name="CluMSID"; version="1.16.0"; sha256="1p210mc7akhsxbq8daqk9lqxnmlykmjgrsyliiq3n7qm6z4md2pl"; depends=[ape Biobase dbscan GGally ggplot2 gplots MSnbase mzR network plotly RColorBrewer S4Vectors sna]; }; @@ -250,7 +250,7 @@ in with self; { CytoML = derive2 { name="CytoML"; version="2.12.0"; sha256="19rlg15nk2205vma4whpqmvlazww5i3ibxhmk9cljsaj4ql560vf"; depends=[BH Biobase cpp11 cytolib data_table dplyr flowCore flowWorkspace ggcyto graph jsonlite openCyto RBGL Rgraphviz Rhdf5lib RProtoBufLib tibble XML yaml]; }; CytoPipeline = derive2 { name="CytoPipeline"; version="1.0.2"; sha256="0xp1fqs87q9k52g3c2181nn7jfrzmahhafzsaw4saaynsdh7hnhl"; depends=[BiocFileCache BiocParallel diagram flowAI flowCore ggcyto ggplot2 jsonlite PeacoQC rlang scales withr]; }; DAMEfinder = derive2 { name="DAMEfinder"; version="1.12.0"; sha256="0m8g1sp55mxa0qswpqkzk73myhhy3s49c21hf97sk0lxis5lagcd"; depends=[BiocGenerics Biostrings bumphunter cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma plyr readr reshape2 Rsamtools S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; - DAPAR = derive2 { name="DAPAR"; version="1.32.2"; sha256="1gbcwjwmqdimics2c7dnlwsf5l2fs48mcrjhhyjh0xnsmvgsp16m"; depends=[Biobase DAPARdata foreach highcharter MSnbase]; }; + DAPAR = derive2 { name="DAPAR"; version="1.32.5"; sha256="0jjllbp9szlvbrfc74lvw8i9q7zibxinvvnmf3xgv654xkv218pv"; depends=[Biobase DAPARdata foreach highcharter MSnbase]; }; DART = derive2 { name="DART"; version="1.48.0"; sha256="0rkabvjkh5iimpxspyizpffz69q7pvj1jq3f9704a2p51q60j74n"; depends=[igraph]; }; DECIPHER = derive2 { name="DECIPHER"; version="2.28.0"; sha256="16z6yk8rr2115z6g1l7fl01binxm29vnxsnsm2wzfvc5vv49927n"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; }; DEFormats = derive2 { name="DEFormats"; version="1.28.0"; sha256="1dqiy0q1w3n9r03bxhx2vnk1z5a476rpkzcwl3cn9ghqns2wvmlz"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; }; @@ -267,7 +267,7 @@ in with self; { DEqMS = derive2 { name="DEqMS"; version="1.18.0"; sha256="0hgra7dvrfqniwz8srnqsx6mhd6pjx4bn9dfy0fyp4sldj8d1d83"; depends=[ggplot2 limma matrixStats]; }; DEsingle = derive2 { name="DEsingle"; version="1.20.0"; sha256="145kpcp3v4wg7fjq4m1a15ikvwdpqc753217rjpr5p5306j489ra"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; }; DEsubs = derive2 { name="DEsubs"; version="1.26.0"; sha256="1mzq5lld6hh1pg6j3z88h3rydr984qb5kh92bzxqqlj8j1lhlmif"; depends=[circlize DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; }; - DExMA = derive2 { name="DExMA"; version="1.8.0"; sha256="0k6il16z49jczk6kgcp849n44jymid2ck17s3cx2x79dgp6c6x5p"; depends=[Biobase bnstruct DExMAdata GEOquery impute limma pheatmap plyr RColorBrewer scales snpStats sva swamp]; }; + DExMA = derive2 { name="DExMA"; version="1.8.1"; sha256="1c5ha2afscqh8yr1hpsl98x291g8awg0jnkb97yv2cmwwg8dbipg"; depends=[Biobase bnstruct DExMAdata GEOquery impute limma pheatmap plyr RColorBrewer scales snpStats sva swamp]; }; DFP = derive2 { name="DFP"; version="1.58.0"; sha256="1z4d7q5aqb3a5ma438v2y7ikjnlrfncm02adaj5krxlyqcsjksci"; depends=[Biobase]; }; DIAlignR = derive2 { name="DIAlignR"; version="2.8.0"; sha256="1fms2yrwhgv1qhdq30zzbgqli9ir99iqmi41hgr624x6jrbpy8fy"; depends=[ape bit64 data_table DBI dplyr ggplot2 magrittr mzR phangorn pracma Rcpp RcppEigen reticulate rlang RMSNumpress RSQLite signal tidyr zoo]; }; DMCFB = derive2 { name="DMCFB"; version="1.14.0"; sha256="1frp3czy4zry1ml2r93aw2h8arr5bfxlszimcnmqpbca0gxd6lx3"; depends=[arm benchmarkme BiocParallel data_table fastDummies GenomicRanges IRanges MASS matrixStats rtracklayer S4Vectors speedglm SummarizedExperiment tibble]; }; @@ -281,7 +281,7 @@ in with self; { DNAcopy = derive2 { name="DNAcopy"; version="1.74.1"; sha256="1bj87ksvch5cm5zxwgfiiql0j94pvzbpn59wp6bacyip65z7w3ax"; depends=[]; }; DNAfusion = derive2 { name="DNAfusion"; version="1.2.0"; sha256="1wakfplnc513r31pqbpdvmdc0qqbrh5naizb764jj3nqvs1h3wfj"; depends=[bamsignals BiocBaseUtils BiocGenerics GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools S4Vectors TxDb_Hsapiens_UCSC_hg38_knownGene]; }; DNAshapeR = derive2 { name="DNAshapeR"; version="1.28.0"; sha256="03sfa8cyfrvww1nihv1dg7d5c5qkf6j2w9d0v5zfww2dp93i504k"; depends=[Biostrings fields GenomicRanges Rcpp]; }; - DOSE = derive2 { name="DOSE"; version="3.26.1"; sha256="1whvgzw8p0nm3kchdndrxj4x3fhmq0vgbz77d54sqq1qri4j35qx"; depends=[AnnotationDbi BiocParallel fgsea ggplot2 GOSemSim HDO_db qvalue reshape2]; }; + DOSE = derive2 { name="DOSE"; version="3.26.2"; sha256="07hhvyv1yiblpx8yvnx919jhafl89s56lfkjiyihv4yzqn16ln3d"; depends=[AnnotationDbi BiocParallel fgsea ggplot2 GOSemSim HDO_db qvalue reshape2]; }; DRIMSeq = derive2 { name="DRIMSeq"; version="1.28.0"; sha256="1i9lcp31g94mllkwcyfablj27qr8v7vqk9j96ywrdfpj8dmcrw98"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; DSS = derive2 { name="DSS"; version="2.48.0"; sha256="1aslbzwqfp609ym98k6cjjf6r1ns9hxcpx4igfjhqf2v0pazz2q8"; depends=[Biobase BiocParallel bsseq]; }; DTA = derive2 { name="DTA"; version="2.46.0"; sha256="1hi0i76sr0naq06py8bx3cm5wb4v3haz9wa2rnznpzw67svhxci9"; depends=[LSD scatterplot3d]; }; @@ -294,12 +294,12 @@ in with self; { DegNorm = derive2 { name="DegNorm"; version="1.10.1"; sha256="01jg6wgz0117kvjjmsnv8whizyd3iayfsvhgd615hjzz0fm82szp"; depends=[data_table doParallel foreach GenomicAlignments GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges plotly plyr Rcpp RcppArmadillo Rsamtools S4Vectors viridis]; }; DelayedArray = derive2 { name="DelayedArray"; version="0.26.7"; sha256="1xsq85nm1gk537mw6ppsyykpw70kczv6wn1nll63b0k8xs4wj0ha"; depends=[BiocGenerics IRanges Matrix MatrixGenerics S4Arrays S4Vectors]; }; DelayedDataFrame = derive2 { name="DelayedDataFrame"; version="1.16.0"; sha256="00668ijn1jd6j503z0ayy0i7i81qazga0bvsa2qlfbbyqyasbmhk"; depends=[BiocGenerics DelayedArray S4Vectors]; }; - DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.22.1"; sha256="13iqlw74zh65y2ckwg0b3xbqc6jgj34xjgsg9axfv7j7znwk9igg"; depends=[DelayedArray IRanges Matrix MatrixGenerics matrixStats S4Vectors sparseMatrixStats]; }; + DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.22.6"; sha256="0jaaqa2fm61dmsphm5y4rlwf2dm1l5rs0vpq0f5r35iyw2m12lh8"; depends=[DelayedArray IRanges Matrix MatrixGenerics matrixStats S4Vectors sparseMatrixStats]; }; DelayedRandomArray = derive2 { name="DelayedRandomArray"; version="1.8.0"; sha256="0dly19l7739icsww053ds6lqg26x2z6lmyaf1hsqgpy3lczfr2hv"; depends=[BH DelayedArray dqrng Rcpp]; }; DelayedTensor = derive2 { name="DelayedTensor"; version="1.6.0"; sha256="18qk3wi15ixjdfkfviy8qaqqs4cvr8dk25bjnr8sq4gnx73iy34p"; depends=[BiocSingular DelayedArray DelayedRandomArray einsum HDF5Array irlba Matrix rTensor]; }; DepInfeR = derive2 { name="DepInfeR"; version="1.4.0"; sha256="1xw8y5bnki8p8khp4161kfrl5jicv4acf6vds0lfvzblgkh676jr"; depends=[BiocParallel glmnet matrixStats]; }; DepecheR = derive2 { name="DepecheR"; version="1.16.0"; sha256="1kn1w1fs19gjvg8nhbvj6hyp32h6k81dnal4ab12xl1jgaa3xj5p"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gmodels gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; }; - DiffBind = derive2 { name="DiffBind"; version="3.10.0"; sha256="1p5fxfpvjz85a2n1jsmj3niqzymnlsja9b53q2yxvj327qq58z8a"; depends=[amap apeglm ashr BiocParallel DESeq2 dplyr GenomicAlignments GenomicRanges ggplot2 ggrepel gplots GreyListChIP IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; }; + DiffBind = derive2 { name="DiffBind"; version="3.10.1"; sha256="12frl2wfvfz4gpq4fjsmglqyqfxdk3zjbhqkc78rzylbw37xx3bf"; depends=[amap apeglm ashr BiocParallel DESeq2 dplyr GenomicAlignments GenomicRanges ggplot2 ggrepel gplots GreyListChIP IRanges lattice limma locfit RColorBrewer Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment systemPipeR]; }; DiffLogo = derive2 { name="DiffLogo"; version="2.24.0"; sha256="0wj9k3nnm5y1j5989i2gngxnhsygm9z5mbm532m174hap0fddpy9"; depends=[cba]; }; DifferentialRegulation = derive2 { name="DifferentialRegulation"; version="1.4.2"; sha256="0dgi4jpianzsqrmkc0mj6cbn4y196mr9fk9h3m10xvgmyvw9gbly"; depends=[BANDITS data_table doParallel doRNG foreach ggplot2 MASS Matrix Rcpp RcppArmadillo SingleCellExperiment SummarizedExperiment tximport]; }; Dino = derive2 { name="Dino"; version="1.6.0"; sha256="12zsj95nd9xvn62bfw45a42bqdqkxhzs4p8r4pww7dslh75hjpzv"; depends=[BiocParallel BiocSingular Matrix matrixStats S4Vectors scran Seurat SingleCellExperiment SummarizedExperiment]; }; @@ -325,7 +325,7 @@ in with self; { EGSEA = derive2 { name="EGSEA"; version="1.28.0"; sha256="008id8nmf5aa2vzh9is7v0fvgljgndz2b37dnnc4w4d16399bm0z"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; }; ELMER = derive2 { name="ELMER"; version="2.24.1"; sha256="1dk0glasd5rrilbbdf7nql7yn8n8gp7cvhbbl51949v71qndxpn9"; depends=[biomaRt circlize ComplexHeatmap DelayedArray doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggpubr ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr progress purrr readr reshape reshape2 rmarkdown rtracklayer rvest S4Vectors scales stringr SummarizedExperiment TCGAbiolinks tibble tidyr xml2]; }; EMDomics = derive2 { name="EMDomics"; version="2.30.0"; sha256="1kmv75qj51jjrbqm8ydwrskp1r11z3jmhiyb2vl7sh40dqv69hn3"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; - ENmix = derive2 { name="ENmix"; version="1.36.03"; sha256="1kj4w0ky99lz5k236zj2s062lrm7dl5mp606ar8vhag8r6a987gx"; depends=[AnnotationHub Biobase doParallel dynamicTreeCut ExperimentHub foreach genefilter geneplotter gplots gtools illuminaio impute IRanges matrixStats minfi quadprog RPMM S4Vectors SummarizedExperiment]; }; + ENmix = derive2 { name="ENmix"; version="1.36.08"; sha256="1pvyz9a2cmdmci7fisk2rhbq2fjvpc953w9rsf6k9drkgs466506"; depends=[AnnotationHub Biobase doParallel dynamicTreeCut ExperimentHub foreach genefilter geneplotter gplots gtools illuminaio impute IRanges irlba matrixStats minfi quadprog RPMM S4Vectors SummarizedExperiment]; }; ERSSA = derive2 { name="ERSSA"; version="1.18.0"; sha256="1gzd2g837g4iqmjc2vd9f0bg5va0prnam7nd1hvr0rdkg3l525fw"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; }; EWCE = derive2 { name="EWCE"; version="1.8.2"; sha256="0di7qbw3yrry44fxcfnksxpf41pdl91xjrxc6cpajlmlyzgarp66"; depends=[BiocParallel data_table DelayedArray dplyr ewceData ggplot2 HGNChelper limma Matrix orthogene reshape2 RNOmni SingleCellExperiment stringr SummarizedExperiment]; }; EasyCellType = derive2 { name="EasyCellType"; version="1.2.0"; sha256="1l68g7hlcfmszf9sg1nagkv00sgd80klgi25jizabj6c1mg0pm13"; depends=[AnnotationDbi clusterProfiler dplyr forcats ggplot2 magrittr org_Hs_eg_db org_Mm_eg_db rlang]; }; @@ -342,7 +342,7 @@ in with self; { ExCluster = derive2 { name="ExCluster"; version="1.18.0"; sha256="0ji516fx1mai38jb685gj538wsyg2ivplsf731nlhqwpg4zzc0cs"; depends=[GenomicRanges IRanges matrixStats Rsubread rtracklayer]; }; ExiMiR = derive2 { name="ExiMiR"; version="2.42.0"; sha256="17vdlgriwm6imkfnksgcjrg0gj8zygwnhlahxlrc1qnllcv78f6c"; depends=[affy affyio Biobase limma preprocessCore]; }; ExperimentHub = derive2 { name="ExperimentHub"; version="2.8.1"; sha256="1md6lan98h95jv776zyvl5im39gz4h6fdxw571vfahgr4b2nxvm4"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocManager rappdirs S4Vectors]; }; - ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.26.0"; sha256="13il34lhb0qzl40995g9pf15r7m0l9hm4di32pig8jlg93qcnqgs"; depends=[AnnotationHubData BiocGenerics BiocManager curl DBI ExperimentHub httr S4Vectors]; }; + ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.26.1"; sha256="0r6p6h5hvz8wqxwnw1ad0ibfvx8qkvx6nbykm9b9dbbk14kl6rn7"; depends=[AnnotationHubData BiocGenerics BiocManager curl DBI ExperimentHub httr S4Vectors]; }; ExperimentSubset = derive2 { name="ExperimentSubset"; version="1.10.0"; sha256="135c67l02m5nj7g72rwwwhdg4jdlqjxjj62rs4nvp1qla779amh7"; depends=[Matrix S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment TreeSummarizedExperiment]; }; ExploreModelMatrix = derive2 { name="ExploreModelMatrix"; version="1.12.0"; sha256="01lkshvlc7f9fd8gyzk9kymq6k3a4h00vpg1blm9b723rbj9jb2d"; depends=[cowplot dplyr DT ggplot2 limma magrittr MASS rintrojs S4Vectors scales shiny shinydashboard shinyjs tibble tidyr]; }; ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.28.0"; sha256="1vr2lc06qqp33nx15kiw9pq1h6rqf09ngwgkmafxqk8lsiw5i44j"; depends=[Biobase BiocStyle httr jsonlite limma RCurl S4Vectors SummarizedExperiment XML xml2]; }; @@ -371,12 +371,12 @@ in with self; { GAprediction = derive2 { name="GAprediction"; version="1.26.0"; sha256="1sr3dj6w6mcvypakcryw0zkdjkp1lzx4wjc9jrwq04cqclq8dyqd"; depends=[glmnet Matrix]; }; GBScleanR = derive2 { name="GBScleanR"; version="1.4.4"; sha256="1z3acpy4cxw9q92bzfd5c8b4mnj6zg2akg575ygr5fzbxb0fk7rc"; depends=[expm gdsfmt ggplot2 Rcpp RcppParallel SeqArray tidyr]; }; GCSscore = derive2 { name="GCSscore"; version="1.14.0"; sha256="0fqr0sgplpbkdpvwgi8fpmwmnqja41622pvkkzsalbzai021hgp3"; depends=[affxparser Biobase BiocManager data_table devtools dplR RSQLite stringr]; }; - GDCRNATools = derive2 { name="GDCRNATools"; version="1.20.0"; sha256="1fspvlj7x80prsvj0q53y5m05b584ajrivrxpr8ijnnqam4fy6nb"; depends=[BiocParallel biomaRt clusterProfiler DESeq2 DOSE DT edgeR GenomicDataCommons ggplot2 gplots jsonlite limma org_Hs_eg_db pathview rjson shiny survival survminer XML]; }; + GDCRNATools = derive2 { name="GDCRNATools"; version="1.20.1"; sha256="1s80vqh5z7zvf0vjfhwvd6rxc9s96fvqv528px9dlxv6fl52g103"; depends=[BiocParallel biomaRt clusterProfiler DESeq2 DOSE DT edgeR GenomicDataCommons ggplot2 gplots jsonlite limma org_Hs_eg_db pathview rjson shiny survival survminer XML]; }; GDSArray = derive2 { name="GDSArray"; version="1.20.0"; sha256="0p2mw6j04cr08yw1rnjsddb4fm24h973m7pr8rznzsjnki3r944w"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; }; GEM = derive2 { name="GEM"; version="1.26.0"; sha256="1dr3d2jsbzk858wnbqgv2gy2qspx9sg49lmqvb8wl4m01jm3zbb4"; depends=[ggplot2]; }; GENESIS = derive2 { name="GENESIS"; version="2.30.0"; sha256="0lbd8fqv3j1wkc17ah30ylfskj29cvb8d61xlja430kfkfky2n97"; depends=[Biobase BiocGenerics BiocParallel data_table gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; }; GENIE3 = derive2 { name="GENIE3"; version="1.22.0"; sha256="1q4wi3k95c8vsyfx6359p2p29ascjg1cxmpp9bf99ixbjs71rd33"; depends=[dplyr reshape2]; }; - GEOexplorer = derive2 { name="GEOexplorer"; version="1.6.0"; sha256="1dh94sh3zypqkvgijmhi6jcsqnh5hha178vcmsk7xfbdrrqjcdva"; depends=[Biobase DT factoextra GEOquery ggplot2 heatmaply htmltools impute limma maptools pheatmap plotly scales shiny shinyBS shinybusy shinyHeatmaply stringr umap]; }; + GEOexplorer = derive2 { name="GEOexplorer"; version="1.6.0"; sha256="1dh94sh3zypqkvgijmhi6jcsqnh5hha178vcmsk7xfbdrrqjcdva"; depends=[Biobase DT factoextra GEOquery ggplot2 heatmaply htmltools impute limma pheatmap plotly scales shiny shinyBS shinybusy shinyHeatmaply stringr umap]; }; GEOfastq = derive2 { name="GEOfastq"; version="1.8.0"; sha256="0nb8a83i0v7pjrximzqjfrcflxdhbv7y2gjz9bcy20yvcgzi6pn8"; depends=[doParallel foreach plyr RCurl rvest stringr xml2]; }; GEOmetadb = derive2 { name="GEOmetadb"; version="1.62.0"; sha256="0xlm1yf2n2wi8sy6b4l7bnkb5dzgd2nfnpp2wrxncp163rrxi40q"; depends=[GEOquery RSQLite]; }; GEOquery = derive2 { name="GEOquery"; version="2.68.0"; sha256="1xyrfj8b7j2wdjlbmwhx1c0hfbvr7l7jxyw2v64fbw8604zprv4s"; depends=[Biobase curl data_table dplyr limma magrittr R_utils readr tidyr xml2]; }; @@ -420,6 +420,7 @@ in with self; { GenVisR = derive2 { name="GenVisR"; version="1.31.1"; sha256="0507hmgv3gl8rl7hnha387yjsmhv9hfysvm4s9whqpqsgm5d4iqp"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; }; GeneBreak = derive2 { name="GeneBreak"; version="1.30.0"; sha256="031i2z57hra21c52k4awdkzn6hg1dr31mb6360vq2br37nc07n04"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.46.0"; sha256="0lhrjzv26dffxmkixj5jn39rrxxvcjiams199qm56l30qsicx8xv"; depends=[Biobase]; }; + GeneGA = derive2 { name="GeneGA"; version="1.50.0"; sha256="1hzhrnl0i9h0ldbqb604wcdj93bnb6f4s7wz6llsa0266hzrkys7"; depends=[hash seqinr]; }; GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.26.0"; sha256="1rpvan7m0lf9q5aix3di65hvdjkrssl3azs9ws5iiszsdmghs0fm"; depends=[data_table FactoMineR GenomicRanges igraph IRanges kernlab mvtnorm Rsamtools snpStats]; }; GeneMeta = derive2 { name="GeneMeta"; version="1.72.0"; sha256="07sj05wk8fbq0kdwvgm7rahp8mwri08cmlz2xcl44n85szv2mpji"; depends=[Biobase genefilter]; }; GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.42.0"; sha256="0v6v6ij4cjbf1w0dvkfkw9qh0nsydd51rqmzaxcl0spry6r5z5zn"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; }; @@ -427,20 +428,20 @@ in with self; { GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.56.0"; sha256="1z5qs7v9s6r72kmbkkv2krw89hnxg6lr0751jgyhkh2kwdh6k7va"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; }; GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.44.1"; sha256="0cx48dqdsry0a099f9s5yx1frbfnqsz9vrvdg2r8ika1inngzs8y"; depends=[Biobase limma MASS]; }; GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.20.0"; sha256="04pln8ix4cmca3bq460b3rk57bj68rm3817mgpyh8l9425v6s0j6"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; }; - GeneTonic = derive2 { name="GeneTonic"; version="2.4.0"; sha256="0vk67mdn66gx5mz1i433aija0zbjqsw5am9xbbzkw3wi670bnc98"; depends=[AnnotationDbi backbone bs4Dash circlize colorspace colourpicker ComplexHeatmap ComplexUpset dendextend DESeq2 dplyr DT dynamicTreeCut expm ggforce ggplot2 ggrepel ggridges GO_db igraph matrixStats plotly RColorBrewer rintrojs rlang rmarkdown S4Vectors scales shiny shinyAce shinycssloaders shinyWidgets SummarizedExperiment tidyr tippy viridis visNetwork]; }; + GeneTonic = derive2 { name="GeneTonic"; version="2.4.2"; sha256="1vblvchpi83va0v0prgg4by9sxrni9jh8faq1b1kahy4bw9aa83x"; depends=[AnnotationDbi backbone bs4Dash circlize colorspace colourpicker ComplexHeatmap ComplexUpset dendextend DESeq2 dplyr DT dynamicTreeCut expm ggforce ggplot2 ggrepel ggridges GO_db igraph matrixStats plotly RColorBrewer rintrojs rlang rmarkdown S4Vectors scales shiny shinyAce shinycssloaders shinyWidgets SummarizedExperiment tidyr tippy viridis visNetwork]; }; GeneticsPed = derive2 { name="GeneticsPed"; version="1.62.1"; sha256="0620gg0hyz06n0843f72xy28a15h7dgx3s4mxj9x647ic82v4cm0"; depends=[gdata genetics MASS]; }; GenomAutomorphism = derive2 { name="GenomAutomorphism"; version="1.2.0"; sha256="0idffiapx9ycdaj5hpf50x5xhpgwb2a5gbfajmfrgw5g467qsqvp"; depends=[BiocGenerics BiocParallel Biostrings data_table doParallel dplyr foreach GenomeInfoDb GenomicRanges IRanges numbers S4Vectors]; }; - GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.36.1"; sha256="1c3fgni846vjw152m4aklb8kwrwjw3rww116a2cbii70nr86p5qg"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.36.4"; sha256="0wwh72sj894m3awk4g2zmkkwqafdjyxzsr49vnd1fiyz909hw02a"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.36.0"; sha256="1irzcz9s97gqbyj9j71wxv2ikdfd8g14296fg33w2ykfdm80nzf0"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; - GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.24.2"; sha256="0dgvhi6nbc1qvrdwww2r39gxd2xmbadvy03lxh5nny9pyhhdlz3l"; depends=[dplyr GenomicRanges httr IRanges jsonlite magrittr rappdirs readr rlang tibble xml2]; }; + GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.24.3"; sha256="1grvria7lx7p0py3w8yi0j41bpfx951lds5db7jdiq0j8l75fh38"; depends=[dplyr GenomicRanges httr IRanges jsonlite magrittr rappdirs readr rlang tibble tidyr xml2]; }; GenomicDistributions = derive2 { name="GenomicDistributions"; version="1.8.0"; sha256="1bxq7mqy8s9dcj1wsjzbrszvi1cfphvjbmxvb1pk1mxxa03zipjs"; depends=[Biostrings broom data_table dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges plyr reshape2 scales]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.52.1"; sha256="166l0pzg00kaagg3adnx1xy5bgmv42lm06a47i30lh14dc0k79wq"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.52.2"; sha256="0givyx77gvx24wgq180jsb2q1b8g4j49rs6bxdmd0l04a87hm9cr"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; GenomicFiles = derive2 { name="GenomicFiles"; version="1.36.0"; sha256="0nxz8lvpmyllgs1ksgbha8qqs4fhppkg5casppnas9x47dj4bxph"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges MatrixGenerics Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; GenomicInteractionNodes = derive2 { name="GenomicInteractionNodes"; version="1.4.0"; sha256="1wjlmydi74rsiqxg1pwz3f9zdc28p4xp4fa1lbjfskkd6b36d5p5"; depends=[AnnotationDbi GenomeInfoDb GenomicFeatures GenomicRanges GO_db graph IRanges RBGL S4Vectors]; }; GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.34.0"; sha256="0qhb2mm5nynnw0cj5da0i6hb1bz7cyns0gp7xy0wscmfyh2wahbv"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; GenomicOZone = derive2 { name="GenomicOZone"; version="1.14.0"; sha256="0k4f22qnpwg227kxp68p93nx7q4gkkxd4d4z3dr104svgfidgq8k"; depends=[biomaRt Ckmeans_1d_dp GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges lsr plyr Rdpack S4Vectors]; }; - GenomicRanges = derive2 { name="GenomicRanges"; version="1.52.0"; sha256="0vbr8nqn4pk0w3wx94q4f44psy6lxgx4b7p8hp0vf46flwggj2lj"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; - GenomicScores = derive2 { name="GenomicScores"; version="2.12.0"; sha256="1z8h9sbr6xqwbsfisr33qdxg0xdrw8r4vvxl1pf4x8vv08zw0vx6"; depends=[AnnotationHub Biobase BiocFileCache BiocGenerics BiocManager Biostrings DelayedArray GenomeInfoDb GenomicRanges HDF5Array httr IRanges rhdf5 S4Vectors XML]; }; + GenomicRanges = derive2 { name="GenomicRanges"; version="1.52.1"; sha256="0n6b4kzyswhvakzvaql2x2j15r5ycx9ggvfmqq630m7xy3qzzrr0"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; + GenomicScores = derive2 { name="GenomicScores"; version="2.12.1"; sha256="1bs13aqb7yaz7bw6nscygpifcdn2dnkzkpqr2spvj2ws38lsahsz"; depends=[AnnotationHub Biobase BiocFileCache BiocGenerics BiocManager Biostrings DelayedArray GenomeInfoDb GenomicRanges HDF5Array httr IRanges rhdf5 S4Vectors XML]; }; GenomicSuperSignature = derive2 { name="GenomicSuperSignature"; version="1.8.0"; sha256="1wajx2r8dcscdgpz2dd1bdhpln258gpqs4bd4plq1ygjhnr2zbw4"; depends=[Biobase BiocFileCache ComplexHeatmap dplyr flextable ggplot2 ggpubr irlba plotly S4Vectors SummarizedExperiment]; }; GenomicTuples = derive2 { name="GenomicTuples"; version="1.34.0"; sha256="0yf64fjd0d8gspbdksv23j3ry4lab52j7kh7nizv944i387p2q13"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; }; GeoDiff = derive2 { name="GeoDiff"; version="1.6.0"; sha256="15d393xqc315wv98l08yfvxv866ciqccvqqx7zj0z8p2v2p5md18"; depends=[Biobase GeomxTools lme4 Matrix NanoStringNCTools plyr Rcpp RcppArmadillo robust roptim testthat withr]; }; @@ -453,15 +454,15 @@ in with self; { GraphAT = derive2 { name="GraphAT"; version="1.72.0"; sha256="0ibrlwf528687s5kk0hq72j9h8p5p18hrdx3823nr1s70vhysb3m"; depends=[graph MCMCpack]; }; GraphAlignment = derive2 { name="GraphAlignment"; version="1.64.0"; sha256="1zvmxrwbg72mjdr337azi2lbyaan7syndxqdz8xwas07jglgpycz"; depends=[]; }; GraphPAC = derive2 { name="GraphPAC"; version="1.42.0"; sha256="0rs71m850qsc9ickxkqlmcrwqsr66z7ji4mqgcg8kii0yjflpkvb"; depends=[igraph iPAC RMallow TSP]; }; - GreyListChIP = derive2 { name="GreyListChIP"; version="1.32.0"; sha256="1sfpf9msnzyrc8b0xzc2406bq2gkcwrrhv7fa9ynqv2ip6xwsc8s"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; + GreyListChIP = derive2 { name="GreyListChIP"; version="1.32.1"; sha256="0z89yikglx077x18qhq6f8f2fa9xni12jz8my9p5sa6zmvnj4dnm"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; Guitar = derive2 { name="Guitar"; version="2.16.0"; sha256="1v1yw90waq0ccj6pxdipipy5bnk0k762m5kadl4h3jgpcrkf2fvc"; depends=[AnnotationDbi dplyr GenomicFeatures GenomicRanges ggplot2 knitr magrittr rtracklayer]; }; - Gviz = derive2 { name="Gviz"; version="1.44.0"; sha256="1lp345hxlddsc91lxrzay073g2dabc8h1cynyh87y85vzffhwplw"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; + Gviz = derive2 { name="Gviz"; version="1.44.2"; sha256="0laismy8kklzkg81r5vf1194fbhp2hw952g6jc3zvn2z5y2d4524"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; HDF5Array = derive2 { name="HDF5Array"; version="1.28.1"; sha256="1riwxxnbi4z0lf42psh3m3ivxlgmmlnqhgsih6911c754r6s39qg"; depends=[BiocGenerics DelayedArray IRanges Matrix rhdf5 rhdf5filters Rhdf5lib S4Arrays S4Vectors]; }; HDTD = derive2 { name="HDTD"; version="1.34.1"; sha256="0gyav2g5c7gphqxbj6mr96g06nr1n5jrn8dkidr8l4ripv5ycx59"; depends=[Rcpp RcppArmadillo]; }; HELP = derive2 { name="HELP"; version="1.58.0"; sha256="1bhyjk2cmyw2s51s474ccykjrja3m3gv6jzdmv7a4zkcfa7fa7wg"; depends=[Biobase]; }; HEM = derive2 { name="HEM"; version="1.72.0"; sha256="0b5pc1ybml1wk406s1b4pbarcayc9nyf0cvqvr28g7rr8q88kgsq"; depends=[Biobase]; }; HGC = derive2 { name="HGC"; version="1.8.0"; sha256="1kjhiw6g3an2yvb709idwkhwq8lw27r7d4g2kb5l5b77b0rr81hz"; depends=[ape dendextend dplyr ggplot2 Matrix mclust patchwork RANN Rcpp RcppEigen]; }; - HIBAG = derive2 { name="HIBAG"; version="1.36.1"; sha256="181xdz6hlfbq765ljj61nxj6nzzmj4675v1zw5qr9nwg58xwjv82"; depends=[RcppParallel]; }; + HIBAG = derive2 { name="HIBAG"; version="1.36.4"; sha256="1cck7d7966b2plbqv1sdp6s32nvigi67s0cwmgb1rnqq0jakhp4a"; depends=[RcppParallel]; }; HIPPO = derive2 { name="HIPPO"; version="1.12.0"; sha256="0lhs56r6wlg586xl18wxzhg8q8mhcm7qd7rjgx4hk50xa9c16cxz"; depends=[dplyr ggplot2 ggrepel gridExtra irlba magrittr Matrix reshape2 rlang Rtsne SingleCellExperiment umap]; }; HIREewas = derive2 { name="HIREewas"; version="1.18.0"; sha256="0p0mcb5n6y4zw0df2a5irzwg3wmdk8vgp2hvrjr9vswbma8jxxfa"; depends=[gplots quadprog]; }; HMMcopy = derive2 { name="HMMcopy"; version="1.42.0"; sha256="0vvg7jy38q43v9nvp18h6lhjkkcqgrgzgnhkb1v1fm03g5kg3fi6"; depends=[data_table]; }; @@ -488,8 +489,8 @@ in with self; { HilbertCurve = derive2 { name="HilbertCurve"; version="1.30.0"; sha256="160n5lrghqhsm69qhgbhi1g018i6f7wqr1rp9mlvy4mqndzygdnp"; depends=[circlize GenomicRanges HilbertVis IRanges png polylabelr]; }; HilbertVis = derive2 { name="HilbertVis"; version="1.58.0"; sha256="12gzfnkkxhw9nyha70ghh8vqp7283grif0aahw3413xzppb2v3bh"; depends=[lattice]; }; HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.58.0"; sha256="166vk1pysxldkqwpi76x5vppw09d75kdqclkizpnx149wf5lxx2f"; depends=[HilbertVis]; }; - HubPub = derive2 { name="HubPub"; version="1.8.0"; sha256="0v2ipm2351z7829rg3icfgci3g8jrjmh94j6d5njfskpl71aihh5"; depends=[available aws_s3 BiocManager biocthis dplyr fs usethis]; }; - HumanTranscriptomeCompendium = derive2 { name="HumanTranscriptomeCompendium"; version="1.16.0"; sha256="11pfnpjga1rxs7mjc2jk72si8z2vgk0yhc0hiy4cvfiw653pwzzg"; depends=[S4Vectors shiny ssrch SummarizedExperiment]; }; + HubPub = derive2 { name="HubPub"; version="1.8.1"; sha256="07dz4a40g5dfvys3vrw9fk0b6knypg0gqgari7bgvqnghx500vvb"; depends=[available aws_s3 BiocManager biocthis dplyr fs usethis]; }; + HumanTranscriptomeCompendium = derive2 { name="HumanTranscriptomeCompendium"; version="1.16.3"; sha256="0fiw4r4dix4683w61292micdgp65i90s4hxfx69zm667zjk0b5r8"; depends=[BiocManager S4Vectors shiny ssrch SummarizedExperiment]; }; HybridMTest = derive2 { name="HybridMTest"; version="1.44.0"; sha256="19pycad35hc7ylnsz75bv029y1r6j9xvrbhzk4i64i7jn8gi7ngh"; depends=[Biobase fdrtool MASS survival]; }; IFAA = derive2 { name="IFAA"; version="1.2.0"; sha256="1bvx78akdyr4wcghjq2j035bzir6aas6wydmmbpv72whpcvpqpdk"; depends=[DescTools doParallel doRNG foreach glmnet HDCI mathjaxr Matrix MatrixExtra parallelly S4Vectors stringr SummarizedExperiment]; }; IHW = derive2 { name="IHW"; version="1.28.0"; sha256="0i4yahgkrg9rnc0xldm026k6bd1bn5nkgkaf6kpyyday41rxzyq8"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; @@ -530,7 +531,7 @@ in with self; { IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="2.0.1"; sha256="1zjwhxlayz2sb77vspw280didhawj282i5gvxnydcdparg165zwf"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI DEXSeq dplyr edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges limma magrittr pfamAnalyzeR plyr RColorBrewer RCurl readr reshape2 rtracklayer S4Vectors satuRn stringr SummarizedExperiment sva tibble tidyr tximeta tximport VennDiagram XVector]; }; KBoost = derive2 { name="KBoost"; version="1.8.0"; sha256="1gisi1s2q1qjr8lfbkpa717s8x8idssdv12nic5h2r82v1pdhmzd"; depends=[]; }; KCsmart = derive2 { name="KCsmart"; version="2.58.0"; sha256="0sv7q7fx7wwin1hcba4izb75vrc2n02ig0rq17zdb8x8z14wbndb"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; - KEGGREST = derive2 { name="KEGGREST"; version="1.40.0"; sha256="1zmsk5w8i3cq0983nx1d24a6awrbq7aj2wrapsnizq9gvrsrhbbb"; depends=[Biostrings httr png]; }; + KEGGREST = derive2 { name="KEGGREST"; version="1.40.1"; sha256="13pbw5nlkjwplliv2pdwazv2idfjklvw0ykx5ja8rchvzs5f1vk4"; depends=[Biostrings httr png]; }; KEGGgraph = derive2 { name="KEGGgraph"; version="1.60.0"; sha256="0bgigkmnz5zvsygcifk2fc7i8rahmqr4brk65qa3104clqqvdfkl"; depends=[graph RCurl Rgraphviz XML]; }; KEGGlincs = derive2 { name="KEGGlincs"; version="1.26.0"; sha256="0s8d2sw54k4m5s1yi7mijbc3hh7wayi5npgh8z7xiqj49mzali01"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; }; KinSwingR = derive2 { name="KinSwingR"; version="1.18.0"; sha256="0ibwcdx2h6y80fhf5ln7rw6b9gfcpkr09vdypcnlfvz4nzr3x9k8"; depends=[BiocParallel data_table sqldf]; }; @@ -607,7 +608,7 @@ in with self; { MSstatsQC = derive2 { name="MSstatsQC"; version="2.18.0"; sha256="1b5hy55wa34lkj5gr1jvirgjy8nk0ym6rpkvkap51b7z59dfsbn8"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.20.0"; sha256="1jj3ji8k66x3fnvz67b2ssr7jvm1j1plnpircwhk6vska0yy5jdc"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.13.0"; sha256="09gmlqxb65pa4wxh5bryb6lhs68zrfaqfl7n3k9shvzi3iw02vp3"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; }; - MSstatsShiny = derive2 { name="MSstatsShiny"; version="1.2.4"; sha256="07hyrjf81qacmmzirijqd1nnw7i8f8p9iglpxinyvcz1qm4hyd27"; depends=[data_table dplyr DT ggplot2 ggrepel gplots Hmisc htmltools marray MSstats MSstatsConvert MSstatsPTM MSstatsTMT readxl shiny shinyBS shinybusy shinyjs tidyr uuid]; }; + MSstatsShiny = derive2 { name="MSstatsShiny"; version="1.2.5"; sha256="067nnbdmip7g4vp8jl29k1wjql3misnqjzs3hxva8wsscdvf6hd0"; depends=[data_table dplyr DT ggplot2 ggrepel gplots Hmisc htmltools marray MSstats MSstatsConvert MSstatsPTM MSstatsTMT readxl shiny shinyBS shinybusy shinyjs tidyr uuid]; }; MSstatsTMT = derive2 { name="MSstatsTMT"; version="2.8.0"; sha256="0n4dc178b1wdb3w0i5hr0zdm6ijcyn7ir8rjaalpz3aq5dkvslc9"; depends=[checkmate data_table ggplot2 limma lme4 lmerTest MSstats MSstatsConvert]; }; MVCClass = derive2 { name="MVCClass"; version="1.74.0"; sha256="1vrn2c5m4w7g13s1zd1am5b02lp026zg6gvpg8dvsras0j56rhr6"; depends=[]; }; MWASTools = derive2 { name="MWASTools"; version="1.24.0"; sha256="0klyclh5hiiwc9lc2ra3d2gcdl58jmda0xd9h499gv94mzhb6d50"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; @@ -632,9 +633,9 @@ in with self; { MetaPhOR = derive2 { name="MetaPhOR"; version="1.2.0"; sha256="1dhldl6vxp12rsbk9sdklb5r8gyi4fybfbfkxs5cb3y1ygq83vcd"; depends=[clusterProfiler ggplot2 ggrepel pheatmap RCy3 RecordLinkage stringr]; }; MetaVolcanoR = derive2 { name="MetaVolcanoR"; version="1.14.0"; sha256="11fxjv0kb65wc2237rh3340j72v3zsd4s019bi07rbpqnl246pnj"; depends=[cowplot data_table dplyr ggplot2 htmlwidgets metafor metap plotly rlang tidyr topconfects]; }; Metab = derive2 { name="Metab"; version="1.33.0"; sha256="0fid4b3yk56z2sm6hxfp0z30nqjsky9sv4x49x912bw61amvrwky"; depends=[pander svDialogs xcms]; }; - MetaboAnnotation = derive2 { name="MetaboAnnotation"; version="1.4.1"; sha256="0kr6457ymbf44m4dwhyq8n6b49rnp986zdl4gpdmvb634s86ghcm"; depends=[BiocGenerics BiocParallel CompoundDb MetaboCoreUtils MsCoreUtils ProtGenerics QFeatures S4Vectors Spectra SummarizedExperiment]; }; + MetaboAnnotation = derive2 { name="MetaboAnnotation"; version="1.4.3"; sha256="1n82zfkjm06brn8hzydx4q2qwxdaygbc436hjg0bqk0q905d8s4j"; depends=[AnnotationHub BiocGenerics BiocParallel CompoundDb MetaboCoreUtils MsCoreUtils ProtGenerics QFeatures S4Vectors Spectra SummarizedExperiment]; }; MetaboCoreUtils = derive2 { name="MetaboCoreUtils"; version="1.8.0"; sha256="1qg66w0fxhxfp6yx6jgplj0vd4gvfwa95hr4516cdjzzwcc1xaqb"; depends=[MsCoreUtils]; }; - MetaboSignal = derive2 { name="MetaboSignal"; version="1.30.2"; sha256="0f7yr2cq4vghzlczmaqhrwfa7idaqjjaxi02s298mmkwn9wkq9m7"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; + MetaboSignal = derive2 { name="MetaboSignal"; version="1.30.3"; sha256="1xm3lkjs1i2cwsl60699nnrq50j1dfhc3799v44rr0sjzzhqr87h"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; MethPed = derive2 { name="MethPed"; version="1.28.0"; sha256="1gp1y9h6rkrvj0xbi915lsq5b6gvgyydq8l012pf6nm1dq8xwgzj"; depends=[Biobase randomForest]; }; MethReg = derive2 { name="MethReg"; version="1.10.2"; sha256="085vd6wymahnvbvj4lj21iq2zpn42jv1w6a46mfa6lhban6s0xx5"; depends=[AnnotationHub DelayedArray dplyr ExperimentHub GenomicRanges ggplot2 ggpubr IRanges MASS Matrix plyr progress pscl readr rlang S4Vectors sesame sesameData sfsmisc stringr SummarizedExperiment tibble tidyr]; }; MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.32.0"; sha256="05yl7z8fx6p2zzr2vkm7dvyxxcvr52w3hxfgs045w1klpsnrvsr3"; depends=[Biostrings gplots seqinr stringr]; }; @@ -646,13 +647,13 @@ in with self; { MiPP = derive2 { name="MiPP"; version="1.72.0"; sha256="1ifh4961092zw89rl45iirhrpmz2629avr54lqrkf748ph5icprv"; depends=[Biobase e1071 MASS]; }; MiRaGE = derive2 { name="MiRaGE"; version="1.42.0"; sha256="0yry5n4gk46f4b7s5zd0nha782h8a72510javbb9law5iahch2ag"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager S4Vectors]; }; MicrobiomeProfiler = derive2 { name="MicrobiomeProfiler"; version="1.6.1"; sha256="1hp9q3nyza6pvdgr79kp2vc91xmr5qnpx3650gxa2y9c8jkcf5ln"; depends=[clusterProfiler config DT enrichplot ggplot2 golem gson htmltools magrittr shiny shinycustomloader shinyWidgets]; }; - MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.12.3"; sha256="1dpw86762waj48qxa9sbn6klz2nj6hlbqn0ra9jay7gkfb8sybp7"; depends=[ape Biostrings cli coin data_table dplyr dtplyr foreach ggfun ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar plyr rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; + MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.12.4"; sha256="1yl9vg8j9x66jnkp2s823rpvpn0qrlzmc01fzw9zj5f2kzsw5238"; depends=[ape Biostrings cli coin data_table dplyr dtplyr foreach ggfun ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar plyr rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; MineICA = derive2 { name="MineICA"; version="1.40.0"; sha256="0vpjf2vjg9hk1j39c5f37m2rvpspwnygs4yax4gp9i3iwvsrsf4a"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; }; MinimumDistance = derive2 { name="MinimumDistance"; version="1.44.0"; sha256="1axlwnws57ldlphifd30a9hzxjhsxbjrg5k0h7lxhmrrby1cf62d"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; MobilityTransformR = derive2 { name="MobilityTransformR"; version="1.4.0"; sha256="0dwshk5azfrvajalyjr2l8l8cfls3070p3jqk1s2j6ni85p7qxbb"; depends=[MetaboCoreUtils MSnbase Spectra xcms]; }; ModCon = derive2 { name="ModCon"; version="1.8.0"; sha256="1vr8v88cgb7c8svghc13b8a4j4gfq77y2p8px7y0bhm3zlx97ay0"; depends=[data_table]; }; Modstrings = derive2 { name="Modstrings"; version="1.16.0"; sha256="1q0qmcnyblnjkxnis1klgmd2zy226jr9iwwqzvrrbqs1wxpd4ap9"; depends=[BiocGenerics Biostrings crayon GenomicRanges IRanges S4Vectors stringi stringr XVector]; }; - MoleculeExperiment = derive2 { name="MoleculeExperiment"; version="1.0.2"; sha256="1n7hvis542a98a5lxj3w2x09cigrnpmg76132dk3b518vhacxl37"; depends=[BiocParallel cli data_table dplyr EBImage ggplot2 magrittr Matrix purrr rhdf5 rjson rlang SpatialExperiment terra]; }; + MoleculeExperiment = derive2 { name="MoleculeExperiment"; version="1.0.3"; sha256="01x2wmkpd23fkx021fz96yhq26hhqr3p4f5bsshxmzmhqxcw89l9"; depends=[BiocParallel cli data_table dplyr EBImage ggplot2 magrittr Matrix purrr rhdf5 rjson rlang S4Vectors SpatialExperiment terra]; }; MoonlightR = derive2 { name="MoonlightR"; version="1.26.1"; sha256="1p9cnq07qmybqz0qqrcka5cvbm9bd68q5k0pn35wkysmk2jakdhq"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; Motif2Site = derive2 { name="Motif2Site"; version="1.4.0"; sha256="1paw91v8f7gf3p18kwjzxjjhqgfsyf3hgw0ppbmmp71ix4jpqirj"; depends=[BiocGenerics Biostrings BSgenome edgeR GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS mixtools S4Vectors]; }; MotifDb = derive2 { name="MotifDb"; version="1.42.0"; sha256="18d0qj9sn4bhfjy2mwsz2nnm41xlsqjslsv69nkhv19w9zd842pw"; depends=[BiocGenerics Biostrings GenomicRanges IRanges rtracklayer S4Vectors splitstackshape]; }; @@ -678,7 +679,7 @@ in with self; { MutationalPatterns = derive2 { name="MutationalPatterns"; version="3.10.0"; sha256="1p9n5afnr4cx690w9d5q1hkwqffsbnsn72wibqcl5rbqgfsvhf8h"; depends=[BiocGenerics Biostrings BSgenome cowplot dplyr GenomeInfoDb GenomicRanges ggalluvial ggdendro ggplot2 IRanges magrittr NMF pracma purrr RColorBrewer S4Vectors stringr tibble tidyr VariantAnnotation]; }; NADfinder = derive2 { name="NADfinder"; version="1.24.0"; sha256="0fc7z12hwjxfcyx9pqfwzjb4s3ijr6gnm4bnz9fsr13nncl9p3rr"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; }; NBAMSeq = derive2 { name="NBAMSeq"; version="1.16.0"; sha256="1l5mk5mdbqypljrnnl7zcz8mgixg44bxaflka8wkfc60757qqkbd"; depends=[BiocParallel DESeq2 genefilter mgcv S4Vectors SummarizedExperiment]; }; - NCIgraph = derive2 { name="NCIgraph"; version="1.48.0"; sha256="0spzrf72y34vi0c9biz37b7id087928bf3qf9sxp9gybfdk6jp7n"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; + NCIgraph = derive2 { name="NCIgraph"; version="1.48.1"; sha256="0q7a4x50fkwi80lqdsfyr4nqa97xzld7n0lihpvr3zi44hcs9a1w"; depends=[graph KEGGgraph R_oo RBGL RCy3]; }; NOISeq = derive2 { name="NOISeq"; version="2.44.0"; sha256="0cxhy4yrww6bh4z603389fikhix8rhfy04ylhm74fdmdng4jblg6"; depends=[Biobase Matrix]; }; NPARC = derive2 { name="NPARC"; version="1.12.0"; sha256="1dx585zs94zazqy9hbrhivpn6p76a68nvlg6vng2r1qqmm2685mc"; depends=[BiocParallel broom dplyr magrittr MASS rlang tidyr]; }; NTW = derive2 { name="NTW"; version="1.50.0"; sha256="1vmqd9jbjpjni5511fzvgkg2q22nxadm3a7xs97n8fc8w9jyghmc"; depends=[mvtnorm]; }; @@ -693,8 +694,9 @@ in with self; { NetPathMiner = derive2 { name="NetPathMiner"; version="1.36.0"; sha256="0fbi4gbjxxxw76b9fph7gc6mqa4lyvsn5vwhfxwy50divl1w1i1r"; depends=[igraph]; }; NetSAM = derive2 { name="NetSAM"; version="1.40.0"; sha256="056fz9zipamxq1rhrvk80yph5rvv2sackyxsbaxjpcafscj8j4gn"; depends=[AnnotationDbi biomaRt DBI doParallel foreach GO_db igraph R2HTML seriation survival WGCNA]; }; NeuCA = derive2 { name="NeuCA"; version="1.6.0"; sha256="01bbmgmj873r3kjvsh8p1v9jzdhfzpn2rlq29bv1xf9hfvljm0ka"; depends=[e1071 keras limma SingleCellExperiment]; }; + NewWave = derive2 { name="NewWave"; version="1.10.0"; sha256="0ndy9d2xv166yxyqjzjs9y2mi214qdqm99pzydpn5xqyg72ljid5"; depends=[BiocSingular DelayedArray irlba Matrix SharedObject SingleCellExperiment SummarizedExperiment]; }; NoRCE = derive2 { name="NoRCE"; version="1.12.0"; sha256="03pb0k638v56sws8ic92r6bq4kmr3rq9n4zhk32bmzbcnxyf4zc2"; depends=[AnnotationDbi biomaRt DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 GO_db igraph IRanges KEGGREST png RCurl reactome_db readr reshape2 RSQLite rtracklayer rWikiPathways S4Vectors stringr SummarizedExperiment tidyr zlibbioc]; }; - NormalyzerDE = derive2 { name="NormalyzerDE"; version="1.18.0"; sha256="1vip8r8588m3zcg7d49jmnacbdhh0nc0inga222v5qs4kpcr3z5k"; depends=[ape Biobase car ggforce ggplot2 limma MASS matrixStats preprocessCore raster RcmdrMisc SummarizedExperiment vsn]; }; + NormalyzerDE = derive2 { name="NormalyzerDE"; version="1.18.1"; sha256="0vdj7fd8nnm0xdjmfd9hrmnwspm0qzxgzsnr7bm4frr989z92xrs"; depends=[ape Biobase car ggforce ggplot2 limma MASS matrixStats preprocessCore raster RcmdrMisc SummarizedExperiment vsn]; }; NormqPCR = derive2 { name="NormqPCR"; version="1.46.0"; sha256="1fq9f7q4nslls46pgf1x82karwk8kf89si5mgdbi6a73k672d0dk"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; }; NuPoP = derive2 { name="NuPoP"; version="2.8.1"; sha256="1nv88nrh1gmambcdm6xvpm8zjn4qg9hq0hbpz13p624zi364qyji"; depends=[]; }; NxtIRFcore = derive2 { name="NxtIRFcore"; version="1.6.0"; sha256="1x3645v6ar8mpmyk6hd5w3m38496g68l2vdh80vh0hhlqlrp17n2"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats fst genefilter GenomeInfoDb GenomicRanges ggplot2 HDF5Array IRanges magrittr NxtIRFdata plotly R_utils Rcpp RcppProgress rhdf5 rtracklayer S4Vectors SummarizedExperiment zlibbioc]; }; @@ -706,7 +708,7 @@ in with self; { OMICsPCA = derive2 { name="OMICsPCA"; version="1.18.0"; sha256="1rkzs0i1650pz9q8v6axwspd3ykvmjd95zcbrgglm2r1gxw1iihn"; depends=[cluster clValid corrplot cowplot data_table factoextra FactoMineR fpc GenomeInfoDb ggplot2 HelloRanges IRanges kableExtra magick MASS MultiAssayExperiment NbClust OMICsPCAdata pdftools PerformanceAnalytics reshape2 rgl rmarkdown rtracklayer tidyr]; }; OPWeight = derive2 { name="OPWeight"; version="1.22.0"; sha256="0fklx2c0p7h23976ywh74xsz3p55j5jq83qvqipynpxkp8b1jv7h"; depends=[MASS qvalue tibble]; }; ORFhunteR = derive2 { name="ORFhunteR"; version="1.8.0"; sha256="03b4lz466hflprn6w3j6p0xrq9prrxd390zmn98v09819w9spl0i"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg38 data_table Peptides randomForest Rcpp rtracklayer stringr xfun]; }; - ORFik = derive2 { name="ORFik"; version="1.20.1"; sha256="0vwi84nyfp3gdrnbgbz8m2896wb7xg7ima6hkcbwddxvwa209wrs"; depends=[AnnotationDbi BiocGenerics BiocParallel biomaRt biomartr Biostrings BSgenome cowplot curl data_table DESeq2 downloader dplyr fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp RCurl readr Rsamtools rtracklayer S4Vectors stringr SummarizedExperiment tibble withr XML xml2]; }; + ORFik = derive2 { name="ORFik"; version="1.20.2"; sha256="1qdgi10za2d6mvqixx05fyr21blm8qmlpamir9mw9hhgjpvky7l9"; depends=[AnnotationDbi BiocGenerics BiocParallel biomaRt biomartr Biostrings BSgenome cowplot curl data_table DESeq2 downloader dplyr fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp RCurl readr Rsamtools rtracklayer S4Vectors stringr SummarizedExperiment tibble withr XML xml2]; }; OSAT = derive2 { name="OSAT"; version="1.48.0"; sha256="095zbj204z705ai1fzj70m316ihg04f93cvjyx64wk5pbqdg5p4d"; depends=[]; }; OTUbase = derive2 { name="OTUbase"; version="1.50.0"; sha256="0n2fghi0b5f012l57lr4qsvj85kjsg80iqpsgfajkdakam860i3w"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; OUTRIDER = derive2 { name="OUTRIDER"; version="1.18.1"; sha256="08xkpsqpgg9xjz9lalsxxvfyqjljby6q5i8awv5m2c8zn5b0mami"; depends=[BBmisc BiocGenerics BiocParallel data_table DESeq2 generics GenomicFeatures GenomicRanges ggplot2 heatmaply IRanges matrixStats pcaMethods pheatmap plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reshape2 S4Vectors scales SummarizedExperiment]; }; @@ -715,7 +717,7 @@ in with self; { OmicCircos = derive2 { name="OmicCircos"; version="1.38.0"; sha256="0zqw0ccngkh00l5wk2kn6fpr249rrkm8sasrzypax943xygnh6i0"; depends=[GenomicRanges]; }; OmicsLonDA = derive2 { name="OmicsLonDA"; version="1.15.0"; sha256="1kn26k0lnk7hgfzk1kh5bh41zkia8a4pzsfr35mbjrflcxmvgk2w"; depends=[BiocGenerics BiocParallel ggplot2 gss plyr pracma SummarizedExperiment zoo]; }; Omixer = derive2 { name="Omixer"; version="1.10.0"; sha256="0piqs23sdsphsynv2wqs7vmpjgsl1kymfjr3xx9nx9jrzjhh5fma"; depends=[dplyr forcats ggplot2 gridExtra magrittr readr stringr tibble tidyselect]; }; - OmnipathR = derive2 { name="OmnipathR"; version="3.8.0"; sha256="0r2nv3nbadnvqby7p5bdpl9fxjb30h0c8kjv1dkqqnhk5rbfl4hf"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang rmarkdown rvest stringr tibble tidyr tidyselect withr xml2 yaml]; }; + OmnipathR = derive2 { name="OmnipathR"; version="3.8.2"; sha256="13ac98jj03vkzrc1ghrs98qrfvr74wz099w26lgc7jw2yxj575as"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang rmarkdown rvest stringr tibble tidyr tidyselect withr xml2 yaml]; }; OncoScore = derive2 { name="OncoScore"; version="1.28.0"; sha256="00wnw7b9sj00h6kdlbh9r8frdcy8x5vdxjc8v2cbk6avll8w2z9a"; depends=[biomaRt]; }; OncoSimulR = derive2 { name="OncoSimulR"; version="4.2.0"; sha256="1s33kjsv72zslygg108m16wrzv4d55xn0pdjfpzy9sdgh2j8yviz"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr stringr]; }; OpenStats = derive2 { name="OpenStats"; version="1.12.0"; sha256="1pw6g4nrnmvfd5qbg3z79qzlzyf0n196vpklx8xwhd7zpr6djbkq"; depends=[AICcmodavg car Hmisc jsonlite knitr MASS nlme rlist summarytools]; }; @@ -761,13 +763,13 @@ in with self; { PhenStat = derive2 { name="PhenStat"; version="2.36.0"; sha256="1q5lpn352acpzfawwch0n4dra3znb7rghg4zl7wnc146s6628pyd"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; PhenoGeneRanker = derive2 { name="PhenoGeneRanker"; version="1.8.0"; sha256="1izqzvasir1jsfas626m82141gd34zk6j0k4ff4n2dk4r51id37n"; depends=[doParallel dplyr foreach igraph Matrix]; }; PhosR = derive2 { name="PhosR"; version="1.10.0"; sha256="0lcri7cfx2bvva1c48bq7rqzk9vag0rqy00myxhy3nqqp5vf16ws"; depends=[BiocGenerics circlize dendextend dplyr e1071 GGally ggdendro ggplot2 ggpubr ggtext igraph limma network pcaMethods pheatmap preprocessCore RColorBrewer reshape2 rlang ruv S4Vectors stringi SummarizedExperiment tidyr]; }; - PhyloProfile = derive2 { name="PhyloProfile"; version="1.14.5"; sha256="1vxlh59h08n3qn3mq3ry82j89il72dbl6j1qbwxzmgick0fn9d5p"; depends=[ape BiocStyle bioDist Biostrings colourpicker data_table DT energy ExperimentHub ggplot2 gridExtra OmaDB pbapply plyr RColorBrewer RCurl shiny shinyBS shinyFiles shinyjs xml2 yaml zoo]; }; + PhyloProfile = derive2 { name="PhyloProfile"; version="1.14.6"; sha256="1kgxani11748n4jglfh58p2v7sj8q42sql4fl07hgnbcpb0amg5x"; depends=[ape BiocStyle bioDist Biostrings colourpicker data_table DT energy ExperimentHub ggplot2 gridExtra OmaDB pbapply plyr RColorBrewer RCurl shiny shinyBS shinyFiles shinyjs xml2 yaml zoo]; }; Pi = derive2 { name="Pi"; version="2.12.0"; sha256="1k6i2byxranyph1034aph1vr1jjkx4d9gsni666p60ssg05bbvbi"; depends=[BiocGenerics caret dnet dplyr GenomeInfoDb GenomicRanges ggnetwork ggplot2 ggrepel glmnet igraph IRanges lattice MASS Matrix osfr plot3D purrr randomForest RCircos readr ROCR scales supraHex tibble tidyr]; }; Pigengene = derive2 { name="Pigengene"; version="1.26.0"; sha256="0b13bkj554w1wh6z393lw6l2ndydkblx4pck7zl0vbh2mwiiamkm"; depends=[BiocStyle bnlearn C50 clusterProfiler DBI DOSE dplyr gdata ggplot2 GO_db graph impute MASS matrixStats openxlsx partykit pheatmap preprocessCore ReactomePA Rgraphviz WGCNA]; }; PloGO2 = derive2 { name="PloGO2"; version="1.12.0"; sha256="1s5ay04ky0bimn4kqzqakygldcd08s7d0kvbn6sdyhf39avb6vv3"; depends=[GO_db GOstats httr lattice openxlsx xtable]; }; PoDCall = derive2 { name="PoDCall"; version="1.8.0"; sha256="1vph2lvs0wcnx56yngzw7ms2si8zq1k4imxrixzhvs0xj67qkbfc"; depends=[diptest DT ggplot2 gridExtra LaplacesDemon mclust purrr readr rlist shiny shinyjs]; }; PrInCE = derive2 { name="PrInCE"; version="1.16.0"; sha256="012dnavlx0abizh7bfms8cn4c4hx3sps3hzivddskap5czi7drxv"; depends=[Biobase dplyr forecast Hmisc LiblineaR magrittr MSnbase naivebayes progress purrr ranger Rdpack robustbase speedglm tester tidyr]; }; - Prostar = derive2 { name="Prostar"; version="1.32.1"; sha256="1gcmxzzzgj1kj3f6mnymh6k2g1q2qwm3vxi87z8iykiqbr3ri4fs"; depends=[DAPAR DAPARdata data_table future ggplot2 gplots highcharter htmlwidgets later promises rhandsontable shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes tibble vioplot webshot]; }; + Prostar = derive2 { name="Prostar"; version="1.32.6"; sha256="0ydrpisl9b15m2fa0ba61glymd3xvq27pds4pk2zm3lazypm69gm"; depends=[Biobase DAPAR DAPARdata data_table future ggplot2 gplots highcharter htmlwidgets later promises rhandsontable shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes tibble vioplot webshot]; }; ProtGenerics = derive2 { name="ProtGenerics"; version="1.32.0"; sha256="0fgsb47qrvrl4y3yr094mas22rai5h5yl9mciadd6zcpamp2p01i"; depends=[]; }; ProteoDisco = derive2 { name="ProteoDisco"; version="1.6.0"; sha256="04m4lqiz43fscqbxjq3ymz8mhg88sihpchdv68pizsag7bz5bzjg"; depends=[BiocGenerics BiocParallel Biostrings checkmate cleaver dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges ParallelLogger plyr rlang S4Vectors tibble tidyr VariantAnnotation XVector]; }; ProteoMM = derive2 { name="ProteoMM"; version="1.18.0"; sha256="1f2m3jdslp139bm0l40gcp5j27vjnp5a2zk8339zpp5j6ihhhvnw"; depends=[biomaRt gdata ggplot2 ggrepel gtools matrixStats]; }; @@ -794,7 +796,7 @@ in with self; { RCM = derive2 { name="RCM"; version="1.16.0"; sha256="0pqxhjqm2sfnifhqz8n6yc53npp32cpfdvhz5xk71f93mf3cdc13"; depends=[alabama DBI edgeR ggplot2 MASS nleqslv phyloseq RColorBrewer reshape2 tensor tseries VGAM]; }; RCSL = derive2 { name="RCSL"; version="1.8.0"; sha256="149bh9bd6h9qg82cnbnl9m8w8d10cw8b0z31qbyb9byfakn0a9hn"; depends=[ggplot2 igraph NbClust pracma RcppAnnoy Rtsne umap]; }; RCX = derive2 { name="RCX"; version="1.4.0"; sha256="1mpwb0j2zgbiqprn7gs9lcz4xpnnfllmgy2j2h9wkmac4241p1p9"; depends=[igraph jsonlite plyr]; }; - RCy3 = derive2 { name="RCy3"; version="2.20.0"; sha256="0n7k0v7inz2k6zap18sqqqa4d22px9lrxvp8anqh2vmgkkd789rc"; depends=[base64enc base64url BiocGenerics fs glue gplots graph httr IRdisplay IRkernel RColorBrewer RCurl RJSONIO uchardet uuid XML]; }; + RCy3 = derive2 { name="RCy3"; version="2.20.2"; sha256="1zy51ky7cqafw7j2z9gn68vacrlg4pa0kzsa1pi2jdiaisfyvmpf"; depends=[base64enc base64url BiocGenerics fs glue gplots graph httr IRdisplay IRkernel RColorBrewer RCurl RJSONIO uchardet uuid XML]; }; RCyjs = derive2 { name="RCyjs"; version="2.22.0"; sha256="0is771gp92m4hcvrajhrd8gi7akxrla9wwfal8pkcdac3gyv8z31"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; }; RDRToolbox = derive2 { name="RDRToolbox"; version="1.50.0"; sha256="1s7ab6mdarhsyhy1lsnf8kc60ba22gp2a4ydykwlwn0hx50zw6p5"; depends=[MASS rgl]; }; REBET = derive2 { name="REBET"; version="1.18.0"; sha256="0hhziwl6mhf8f63d2am2p1kkn15s9dd4vvlg70mzb0bw2mkfx83r"; depends=[ASSET]; }; @@ -844,11 +846,11 @@ in with self; { RUVnormalize = derive2 { name="RUVnormalize"; version="1.34.0"; sha256="0z8paxn57rnfg1mk96dnm9zrxahbd2203rwgwj3kzjnily6b09wp"; depends=[Biobase RUVnormalizeData]; }; RVS = derive2 { name="RVS"; version="1.22.0"; sha256="12219in1hcgrxb73m72cnsrd1723r85hyni2f2fhd595qw1bf3q8"; depends=[GENLIB gRain kinship2 snpStats]; }; RadioGx = derive2 { name="RadioGx"; version="2.4.0"; sha256="18zqfnwjil4mv7fgh4wvnniyybmyqkg0hk2wc57rcn0mlppa3602"; depends=[assertthat Biobase BiocGenerics BiocParallel caTools CoreGx data_table downloader magicaxis matrixStats RColorBrewer reshape2 S4Vectors scales SummarizedExperiment]; }; - RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.24.0"; sha256="1xs7dz5mkh9zs078g2a0izij8vxrwhzh7gyjglp057gicsca0hal"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors SummarizedExperiment]; }; + RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.24.2"; sha256="0aa886mmk1c5h1i3xnk4niq4ylrawpsn2f62hwmfj5dsyl8a36ka"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix MatrixGenerics S4Vectors SummarizedExperiment]; }; RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.20.0"; sha256="0wm50c6677qycv30h1817babaxh97ggvbxhmk24y0dk63xkk4fh3"; depends=[dnet igraph Matrix]; }; RankProd = derive2 { name="RankProd"; version="3.26.0"; sha256="1nhhmwskj8ssapnfnj8hxmdbxknnzgcgbrdw2pzcyyjchqr7n9nf"; depends=[gmp Rmpfr]; }; RareVariantVis = derive2 { name="RareVariantVis"; version="2.28.0"; sha256="1q6bmmdc7jh1dacadww8pvhy1xd4wrk1v097irl34hw6p2pmd15d"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; - Rarr = derive2 { name="Rarr"; version="1.0.1"; sha256="1dn8sy8j5n9qwg7dxi87hrpvl78mslzlc7jxsfik3j20zyfkjcxq"; depends=[httr jsonlite paws_storage R_utils stringr]; }; + Rarr = derive2 { name="Rarr"; version="1.0.3"; sha256="0j8zc330qwzs40k90yg4adhs7prc2kyy2w4hn7rsq2vlcyxkgkam"; depends=[httr jsonlite paws_storage R_utils stringr]; }; RbcBook1 = derive2 { name="RbcBook1"; version="1.68.0"; sha256="0w0iccrwrvyrpr04kcdsqa7shdq4frn2kllx77947zrzszhwb1a4"; depends=[Biobase graph rpart]; }; Rbec = derive2 { name="Rbec"; version="1.8.0"; sha256="1acibbnkp3rv6mr4vi39ksc98fa0brcycxsq1zaz8mvd7vz3b6sq"; depends=[dada2 doParallel foreach ggplot2 Rcpp readr]; }; Rbowtie = derive2 { name="Rbowtie"; version="1.40.0"; sha256="1hfr1zdvikvygzgyy58f5rnz5jkmsrhwa930h331wx5012hhmnv7"; depends=[]; }; @@ -867,7 +869,7 @@ in with self; { ReactomeGraph4R = derive2 { name="ReactomeGraph4R"; version="1.8.0"; sha256="0bf6z1m5pdmaifa45bqkslkdsjvg7hsalj8aiqad831wd7s9x982"; depends=[data_table doParallel foreach getPass jsonlite magrittr neo4r purrr ReactomeContentService4R rlang]; }; ReactomePA = derive2 { name="ReactomePA"; version="1.44.0"; sha256="1hy8qz7d2826kf6pkl3v8cjwx35ap8xr92jw5wv445p3xcd1clzn"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite gson igraph reactome_db]; }; ReadqPCR = derive2 { name="ReadqPCR"; version="1.46.0"; sha256="0i107z33vdhr69bwzmpfb8gqqfcv3aka87ws6dxg50xl2hx6ik3b"; depends=[Biobase]; }; - RedeR = derive2 { name="RedeR"; version="2.4.2"; sha256="02smz2v6py482cnj0rh35s3imqbd47iwjxvaab8sjp67l96df7h9"; depends=[igraph]; }; + RedeR = derive2 { name="RedeR"; version="2.4.3"; sha256="1fsdd4n4012m9ala3v7jpazb4vzlyj3y8ykygxk267n31dlwk1qm"; depends=[igraph]; }; RedisParam = derive2 { name="RedisParam"; version="1.2.0"; sha256="0y5pxh1fsksbhficl24zdi1kcjb88iw6yabj5adbkbx5da9mvymp"; depends=[BiocParallel futile_logger redux withr]; }; RefPlus = derive2 { name="RefPlus"; version="1.70.0"; sha256="0ii4pki0gqsfcjlfwq5hx67yf0id2krrgs8qnss4gijj27m8h86m"; depends=[affy affyPLM Biobase preprocessCore]; }; RegEnrich = derive2 { name="RegEnrich"; version="1.10.0"; sha256="09gkmna3w0x5m0mpq1llrqsrknlx2hncn74f4fksmx4r4mj0gphd"; depends=[BiocParallel BiocSet DESeq2 DOSE dplyr fgsea ggplot2 limma magrittr randomForest reshape2 S4Vectors SummarizedExperiment tibble WGCNA]; }; @@ -878,7 +880,7 @@ in with self; { Rfastp = derive2 { name="Rfastp"; version="1.10.0"; sha256="0c8nx0binn20vnxgsdpbc9lnjbc7j78f91ylgzwjw5ji4jfrzzhs"; depends=[ggplot2 Rcpp reshape2 Rhtslib rjson zlibbioc]; }; RgnTX = derive2 { name="RgnTX"; version="1.2.0"; sha256="150cyydkhp606l6a9h05h5lxir6jqxh40n7r9r4b3yiizlvnkvbp"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges regioneR S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; Rgraphviz = derive2 { name="Rgraphviz"; version="2.44.0"; sha256="1dv1vk73achjz5b5zzw2d517nbjfrlj7gppd48pfhk1w0mvz3q61"; depends=[graph]; }; - Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.22.0"; sha256="1j8i4rmq85n7jys86a9zyj1n4qn7bhc1sqgcq8dyh7zqfdvb9bcw"; depends=[]; }; + Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.22.1"; sha256="1007i2rzz86k04kswa4h53p8zzh52k31m9d8im6iw0n91inqbcj9"; depends=[]; }; Rhisat2 = derive2 { name="Rhisat2"; version="1.16.0"; sha256="1x9phnrk27v2r3ldqa9cd6yp2q3y5p2rm9wmra3wgrmhz9gxq1qy"; depends=[GenomicFeatures GenomicRanges SGSeq]; }; Rhtslib = derive2 { name="Rhtslib"; version="2.2.0"; sha256="1p8imns26knh21r254n7i9xvy8xzz3zizx0kq4si7cdaf2b4xayi"; depends=[zlibbioc]; }; RiboCrypt = derive2 { name="RiboCrypt"; version="1.6.0"; sha256="0dkdb5kmdgcg8l7l1dd1myx06sdvl7bvahqq1b5q7xz69vnslrfc"; depends=[BiocGenerics BiocParallel Biostrings bslib data_table dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 htmlwidgets httr IRanges jsonlite knitr markdown NGLVieweR ORFik plotly RCurl rlang shiny shinycssloaders shinyhelper shinyjqui stringr]; }; @@ -897,8 +899,8 @@ in with self; { Rsubread = derive2 { name="Rsubread"; version="2.14.2"; sha256="1dgbvhsd0rki1skwrb4acd3cfy7c9slsjq1s7r2469zbs3xf12xc"; depends=[Matrix]; }; Rtpca = derive2 { name="Rtpca"; version="1.10.0"; sha256="0wwrnkbzvdwayvw1x89jiknwsg95ijy0hik7lrp5k1qwm49w4dvl"; depends=[Biobase dplyr fdrtool ggplot2 pROC tibble tidyr]; }; Rtreemix = derive2 { name="Rtreemix"; version="1.62.0"; sha256="04glj66rf1jcy4qychjg5j2ssvk8g8zc15493a9l8b63m1ws06g3"; depends=[Biobase graph Hmisc]; }; - S4Arrays = derive2 { name="S4Arrays"; version="1.0.5"; sha256="01xlccybhdgas9pnx88ll9q56qb2xd687xvfrc7bd5r9sf72b81c"; depends=[abind BiocGenerics crayon IRanges Matrix S4Vectors]; }; - S4Vectors = derive2 { name="S4Vectors"; version="0.38.1"; sha256="0qpjx64ilc1niglhf6pn47damgaf5vdzwkvnlhcixqzpl28ndbs9"; depends=[BiocGenerics]; }; + S4Arrays = derive2 { name="S4Arrays"; version="1.0.6"; sha256="011n4lyznlrya5l8d7m30x81k7h81wbp07b12s6a4s5sy9fzd5jb"; depends=[abind BiocGenerics crayon IRanges Matrix S4Vectors]; }; + S4Vectors = derive2 { name="S4Vectors"; version="0.38.2"; sha256="0n1w451647pxii6qrrxbvdi9z6rqdwibczkbs7k7a9j33bv3nqv8"; depends=[BiocGenerics]; }; SAIGEgds = derive2 { name="SAIGEgds"; version="2.0.1"; sha256="0v1zfyvx3852kidh7hiyh1al86gs5v0dkx9laj8182pwsjy4qnys"; depends=[gdsfmt Matrix Rcpp RcppArmadillo RcppParallel SeqArray]; }; SANTA = derive2 { name="SANTA"; version="2.36.0"; sha256="0knc7lxlcjh9j144j7kirsknkk8qszmmjwg59v3050pi79m0czr9"; depends=[igraph Matrix]; }; SBGNview = derive2 { name="SBGNview"; version="1.14.0"; sha256="0krfmwdx2f849nsbhck5p2vgfrvqh0xb1pb4vx4rapdrvc1fpihg"; depends=[AnnotationDbi bookdown httr igraph KEGGREST knitr pathview Rdpack rmarkdown rsvg SBGNview_data SummarizedExperiment xml2]; }; @@ -907,7 +909,7 @@ in with self; { SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.42.0"; sha256="1k9qzh1bk555ax1mm8w0r4rcvwaw5x1gyrzkamhgkh48m9abp6sq"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; SCANVIS = derive2 { name="SCANVIS"; version="1.14.0"; sha256="07i481wk0v16r5bqjvmnys6cbd228hgzb6sp1975q595y5s76gnz"; depends=[IRanges plotrix RCurl rtracklayer]; }; SCATE = derive2 { name="SCATE"; version="1.10.0"; sha256="1fkswn9xlbr4mrnr62yzk51dri7rzbvf28whh7qhdfxgyvavw439"; depends=[GenomicAlignments GenomicRanges mclust preprocessCore Rtsne SCATEData splines2 xgboost]; }; - SCArray = derive2 { name="SCArray"; version="1.8.3"; sha256="0ww8bznlgb1806b7fj8zwhnrsqvyr7gwlsr5kyrvl7c27gjxivj0"; depends=[BiocParallel BiocSingular DelayedArray DelayedMatrixStats gdsfmt Matrix S4Vectors SingleCellExperiment SummarizedExperiment]; }; + SCArray = derive2 { name="SCArray"; version="1.8.4"; sha256="1svvq0ic6hlqi86lch3q5n4d71mxkq102x01nc3fgpf0bcv8rsaf"; depends=[BiocParallel BiocSingular DelayedArray DelayedMatrixStats gdsfmt Matrix S4Vectors SingleCellExperiment SummarizedExperiment]; }; SCArray_sat = derive2 { name="SCArray.sat"; version="1.0.3"; sha256="160x7wps2y4w8i0z97q8bgq0k8dih9axshha7wi6sx8j3qf6ab71"; depends=[BiocGenerics BiocParallel BiocSingular DelayedArray gdsfmt S4Vectors SCArray Seurat SeuratObject SummarizedExperiment]; }; SCBN = derive2 { name="SCBN"; version="1.18.0"; sha256="1b3hhj4lsafkrb86sr937vwjhymarxgx97bj3y51jg7jpqfi6gnr"; depends=[]; }; SCFA = derive2 { name="SCFA"; version="1.10.0"; sha256="1c9z8axz0vkcfq2il4qnqzjg9qklwsf4ijwb29kn711p96anfgw7"; depends=[BiocParallel cluster coro glmnet igraph Matrix matrixStats psych RhpcBLASctl survival torch]; }; @@ -937,7 +939,7 @@ in with self; { SOMNiBUS = derive2 { name="SOMNiBUS"; version="1.7.0"; sha256="19damf0rhq01gb7b1bjsivp28b57jq36zhry960yfahg09d13bqv"; depends=[Matrix mgcv VGAM]; }; SPEM = derive2 { name="SPEM"; version="1.40.0"; sha256="1475dl8dg1xiblvsk82infkhirmk9zjznrkvk1a3brlhs5cf1lq8"; depends=[Biobase Rsolnp]; }; SPIA = derive2 { name="SPIA"; version="2.52.0"; sha256="1f0d12y9al89c669y5c7byjgyml33jnn6s9iq1gcxm73ac6ws067"; depends=[KEGGgraph]; }; - SPIAT = derive2 { name="SPIAT"; version="1.2.2"; sha256="04vr7k8hb6x83w4my3ak6rj4c88nyyj0ma2yd74hs2c0392471cf"; depends=[apcluster dbscan dittoSeq dplyr ggplot2 gridExtra gtools mmand pracma RANN raster reshape2 sp SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tibble vroom]; }; + SPIAT = derive2 { name="SPIAT"; version="1.2.3"; sha256="08qgy0lbh7zz0mcf7qfv9y570wwm4a2118adjmq9nraszc27wch3"; depends=[apcluster dbscan dittoSeq dplyr ggplot2 gridExtra gtools mmand pracma RANN raster reshape2 rlang sp SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tibble vroom]; }; SPLINTER = derive2 { name="SPLINTER"; version="1.26.0"; sha256="1wh0msqbfnbygf1wjkryj8yx5f1c0w1hs5mmk8sky0sn0g32r7l4"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 googleVis Gviz IRanges plyr S4Vectors seqLogo stringr]; }; SPONGE = derive2 { name="SPONGE"; version="1.22.0"; sha256="1ayvigqj5j7s7031gpyhaz3m3z85w9j8j850pggshy9gixvy1mnp"; depends=[Biobase biomaRt caret ComplexHeatmap cvms data_table doRNG dplyr expm foreach ggplot2 ggpubr ggridges glmnet gRbase igraph iterators logging MASS MetBrewer miRBaseConverter ppcor randomForest rlang stringr tidyr tidyverse tnet]; }; SPOTlight = derive2 { name="SPOTlight"; version="1.4.1"; sha256="1z3mprlj6fvz90mra2gfaxgfi2k7mr98w0q11js47hqbymm436wx"; depends=[ggplot2 Matrix matrixStats NMF nnls SingleCellExperiment]; }; @@ -963,9 +965,10 @@ in with self; { SeqGate = derive2 { name="SeqGate"; version="1.10.0"; sha256="1v37dyz96zcgs0h44drkqw832zc90r37clk1yjhsm8m1ri59gdsh"; depends=[BiocManager GenomicRanges S4Vectors SummarizedExperiment]; }; SeqSQC = derive2 { name="SeqSQC"; version="1.22.0"; sha256="1s9qmvz8zhg90bz7dyp0cfk354plqx7kydjafbngg4vksbm1grg7"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; SeqVarTools = derive2 { name="SeqVarTools"; version="1.38.0"; sha256="0qs67mdnw2kl45610nldsq40smy0hg5h8mndjvqvjynwkj9xjk0a"; depends=[Biobase BiocGenerics data_table gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray]; }; + SharedObject = derive2 { name="SharedObject"; version="1.14.1"; sha256="0jlkkb6w237ym5jnn9i5j3swiq8x37fkq3flgf8g1svzxy9icvga"; depends=[BH BiocGenerics Rcpp]; }; ShortRead = derive2 { name="ShortRead"; version="1.58.0"; sha256="0wpr3ksr7j5yk6m1zaa47dwdgznajsz8as4p9vf7schaqvhq1wc4"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rhtslib Rsamtools S4Vectors XVector zlibbioc]; }; - SiPSiC = derive2 { name="SiPSiC"; version="1.0.0"; sha256="11h7yn5sqispclsbxgchdraf5a35sq544sg0brp9nqhhwxjgl86r"; depends=[Matrix SingleCellExperiment]; }; - SigCheck = derive2 { name="SigCheck"; version="2.32.0"; sha256="0g407p7b4q3sp0i7wvhyxyah17jhv4gy9ssipk099y7k6chii1rl"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; + SiPSiC = derive2 { name="SiPSiC"; version="1.0.2"; sha256="1q79vbfj65ndyb9qb0bdk5zzasvg991p4069akvn07z863fhwnrs"; depends=[Matrix SingleCellExperiment]; }; + SigCheck = derive2 { name="SigCheck"; version="2.32.1"; sha256="0lv75kj0h84ri0advwr6sm2mdsgpd7pkql34nsmar11xxks5bwbf"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; }; SigFuge = derive2 { name="SigFuge"; version="1.38.0"; sha256="1nn124y33bvw77ylz9dykrd43089ajghmd74f7wzhn6sfmjisd2f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; }; SigsPack = derive2 { name="SigsPack"; version="1.14.0"; sha256="03sqv0jp9539qmjb81avi8l93r25r5gsqfwzqgfpdg8d5anh7lp3"; depends=[Biobase Biostrings BSgenome GenomeInfoDb GenomicRanges quadprog rtracklayer SummarizedExperiment VariantAnnotation]; }; SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.38.0"; sha256="0z53dyrkbawbj8f01gf58cljz7vsvc9dd3jfhvvc2mfxfm0bfrl1"; depends=[Biobase limma mclust Ringo]; }; @@ -978,15 +981,15 @@ in with self; { SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.36.0"; sha256="075w88x7lv2fkp2ipqgxp4pzh6kbjw3nmp0qra2p4fss4j3g8d6s"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; SpacePAC = derive2 { name="SpacePAC"; version="1.38.0"; sha256="0l6drsrxk2fxhq5dk0186z6mbc7hvyng4116y5fc8j9kxjc0rfna"; depends=[iPAC]; }; Spaniel = derive2 { name="Spaniel"; version="1.14.0"; sha256="17b8gfyalb0hfrpv4islkvjg8d06nff79zkyl261bg51dydv2cfw"; depends=[dplyr DropletUtils ggplot2 igraph jpeg jsonlite magrittr png S4Vectors scater scran Seurat shiny SingleCellExperiment SummarizedExperiment]; }; - SparseArray = derive2 { name="SparseArray"; version="1.0.11"; sha256="1vx7kwv9rw1b9r04wv0bsqjwpb3jg9j9z4smq4a5cr1k2ndh2n35"; depends=[BiocGenerics IRanges Matrix MatrixGenerics matrixStats S4Arrays S4Vectors XVector]; }; + SparseArray = derive2 { name="SparseArray"; version="1.0.12"; sha256="1rgxr087paqxv8q5say8zvhqm4znav6vb6ic5jyskq8bxm7ih10f"; depends=[BiocGenerics IRanges Matrix MatrixGenerics matrixStats S4Arrays S4Vectors XVector]; }; SparseSignatures = derive2 { name="SparseSignatures"; version="2.10.0"; sha256="0bqwhhcsj72a4ci0j6k5bc4rm6q8vlhmhp1h3il73imj7lkdll6z"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls reshape2]; }; SpatialCPie = derive2 { name="SpatialCPie"; version="1.16.0"; sha256="1qli4hcpjxq5q1c6j08sc251d39phzrgc999zq1splzsnkbprq9s"; depends=[colorspace data_table digest dplyr ggforce ggiraph ggplot2 ggrepel igraph lpSolve purrr readr rlang shiny shinycssloaders shinyjs shinyWidgets SummarizedExperiment tibble tidyr tidyselect zeallot]; }; SpatialDecon = derive2 { name="SpatialDecon"; version="1.10.0"; sha256="0x3m60a93l4sg4nggnsdysxqaji8wy6rvncvhq4z67zzax5sj8ia"; depends=[Biobase GeomxTools logNormReg Matrix repmis SeuratObject]; }; SpatialExperiment = derive2 { name="SpatialExperiment"; version="1.10.0"; sha256="18fcfyjvp9nzadlicsnz62wva8ik0z6jqg1b906avm2vk6rbxw70"; depends=[BiocFileCache BiocGenerics DropletUtils magick rjson S4Vectors SingleCellExperiment SummarizedExperiment]; }; - SpatialFeatureExperiment = derive2 { name="SpatialFeatureExperiment"; version="1.2.2"; sha256="1zmsjzxn2k5v5j6m9pxd9665wqk4kkpxvwm029z7khwb7l6xdl0p"; depends=[BiocGenerics BiocNeighbors BiocParallel Matrix rjson rlang S4Vectors sf SingleCellExperiment SpatialExperiment spdep SummarizedExperiment terra]; }; + SpatialFeatureExperiment = derive2 { name="SpatialFeatureExperiment"; version="1.2.3"; sha256="1w8m05iqdw0b2xfsn5sjccj2h4kx14zxv44gw2f1sy77sslzpmy0"; depends=[BiocGenerics BiocNeighbors BiocParallel Matrix rjson rlang S4Vectors sf SingleCellExperiment SpatialExperiment spdep SummarizedExperiment terra]; }; SpatialOmicsOverlay = derive2 { name="SpatialOmicsOverlay"; version="1.0.0"; sha256="10w8caqjiqsrjxzkxa8a3ngzar2kbax73rcyjgb6f2kwjmxxij3i"; depends=[base64enc Biobase BiocFileCache data_table dplyr EBImage GeomxTools ggplot2 ggtext magick pbapply plotrix RBioFormats readxl S4Vectors scattermore stringr XML]; }; SpeCond = derive2 { name="SpeCond"; version="1.54.0"; sha256="164hks3bz5yszhq3dkdaxwggp4pdyg5k1yypkagd6myd5h5hg5nn"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; - Spectra = derive2 { name="Spectra"; version="1.10.2"; sha256="1jrlfm6k6v4vhzl4lg6sa49yw35ds9x3v7iyc2cvbxqmpp5haila"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; + Spectra = derive2 { name="Spectra"; version="1.10.3"; sha256="1fx6xkl29frfk8bzz5jvr1cn0hjyi46ck23izb1cypiag4lsrf8v"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; SpectralTAD = derive2 { name="SpectralTAD"; version="1.16.1"; sha256="0l49fwr038ic2k87fxcjwdlwjd49wyywxjsa2d6ffncwmgaqrpc2"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; }; SpidermiR = derive2 { name="SpidermiR"; version="1.30.0"; sha256="00p98wvj56v70gdc14wbbjgcvmpxn8ckb4zh8lbjdiplsn815g31"; depends=[AnnotationDbi gdata httr igraph miRNAtap miRNAtap_db org_Hs_eg_db]; }; SpliceWiz = derive2 { name="SpliceWiz"; version="1.2.3"; sha256="10sg5hfcfrcgk73ymmqpx0xx2slfcdwaxj70yq4312dijy3gk9x7"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats DT fst genefilter GenomeInfoDb GenomicRanges ggplot2 HDF5Array heatmaply htmltools IRanges magrittr matrixStats NxtIRFdata ompBAM patchwork pheatmap plotly progress R_utils RColorBrewer Rcpp RcppProgress rhandsontable rhdf5 rtracklayer rvest S4Vectors scales shiny shinydashboard shinyFiles shinyWidgets stringi SummarizedExperiment zlibbioc]; }; @@ -994,7 +997,7 @@ in with self; { SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.40.0"; sha256="0lcx7q5anv04flv4fjaqz0rw0xazx5q25xjq4fq2zm0syyxa5p2z"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; }; SpotClean = derive2 { name="SpotClean"; version="1.2.0"; sha256="1q81xmn56b8cvlnn7kzjm3qlys771z9z260mdcininn8sizirmqq"; depends=[dplyr ggplot2 Matrix RColorBrewer readbitmap rhdf5 rjson rlang S4Vectors Seurat SpatialExperiment SummarizedExperiment tibble viridis]; }; StarBioTrek = derive2 { name="StarBioTrek"; version="1.26.0"; sha256="0x1x582favjv8f14milkv8cg8f4m3af0i4mscf7gfgdngy6w9wph"; depends=[AnnotationDbi e1071 ggplot2 graphite igraph MLmetrics reshape2 ROCR SpidermiR]; }; - Statial = derive2 { name="Statial"; version="1.2.2"; sha256="0nhwxd0rsri3lsbk7mziw5z77624rlq0nikkrb1iba4y1cpx3fgz"; depends=[BiocParallel concaveman data_table dplyr ggplot2 limma magrittr plotly purrr ranger S4Vectors SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom stringr SummarizedExperiment tibble tidyr tidyselect]; }; + Statial = derive2 { name="Statial"; version="1.2.4"; sha256="1rpq0yq5lb5ca0v8xgspnkyha8xlpx1sikmj4d3fj0r57fb6zr93"; depends=[BiocParallel concaveman data_table dplyr ggplot2 limma magrittr plotly purrr ranger S4Vectors SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom stringr SummarizedExperiment tibble tidyr tidyselect]; }; Streamer = derive2 { name="Streamer"; version="1.46.0"; sha256="13ww5akkmakmr9r693pv5j36mvqwrbk0vha98sm8laf4qr5my3iq"; depends=[BiocGenerics graph RBGL]; }; Structstrings = derive2 { name="Structstrings"; version="1.16.0"; sha256="0aylyb3063cas3nbr8n5w4sq897mw9i5wfk404f4n6w5zsi0xrj9"; depends=[BiocGenerics Biostrings crayon IRanges S4Vectors stringi stringr XVector]; }; StructuralVariantAnnotation = derive2 { name="StructuralVariantAnnotation"; version="1.16.0"; sha256="0gkps2pls9bpqr8sxm8zwdkn156g8r6mhf4bx17nif5s35qld1rb"; depends=[assertthat BiocGenerics Biostrings dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges rlang rtracklayer S4Vectors stringr SummarizedExperiment VariantAnnotation]; }; @@ -1008,9 +1011,9 @@ in with self; { TADCompare = derive2 { name="TADCompare"; version="1.10.0"; sha256="1sykkvq20490q66lzafbl76167srcjl1zmphd4b0wszwhg2xnxx9"; depends=[cluster cowplot dplyr ggplot2 ggpubr HiCcompare magrittr Matrix PRIMME RColorBrewer reshape2 tidyr]; }; TAPseq = derive2 { name="TAPseq"; version="1.12.0"; sha256="1fgqz21fvfxaqhrvlqynsv0inkxzvjp8kac7pr0gb84p3xwg75y4"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; }; TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.12.0"; sha256="1skakx7dy0jd180yww49swvg95irxxsfh9p58pq521hx7nwlcki2"; depends=[ASSIGN BiocParallel ComplexHeatmap DESeq2 DT edgeR gdata ggplot2 GSVA magrittr RColorBrewer reshape2 rlang ROCit S4Vectors singscore SummarizedExperiment]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.28.3"; sha256="1hh09ya4jg062k1ibp1cpvdrgv6gwr95ch57iycgd3cjc5g0xhii"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment TCGAbiolinksGUI_data tibble tidyr XML xml2]; }; - TCGAutils = derive2 { name="TCGAutils"; version="1.20.2"; sha256="0nnfrd5x3mii9adizvz79jinlxn2lhg4civ9v0wwygmdhk7rrm1n"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; - TCseq = derive2 { name="TCseq"; version="1.23.0"; sha256="0fdz5qcp6axqgai64g6nf1ci27k1g3wlw3sczf5x5ki91jpan5vi"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.28.4"; sha256="1q7d3c37nwyr0hl21v2bzkvnzksq16vkbisnm1p9ldg90qkvdbzk"; depends=[biomaRt data_table downloader dplyr GenomicRanges ggplot2 httr IRanges jsonlite knitr plyr purrr R_utils readr rvest S4Vectors stringr SummarizedExperiment TCGAbiolinksGUI_data tibble tidyr XML xml2]; }; + TCGAutils = derive2 { name="TCGAutils"; version="1.20.4"; sha256="02mkijvh2h58wg7hsi76ycw6gapl0ai190agckaw4l54sqpsx91q"; depends=[AnnotationDbi BiocBaseUtils BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; + TCseq = derive2 { name="TCseq"; version="1.24.3"; sha256="1l8ghap0yq07p8qj7z3d0a4rb2q913xi2my5bsjbl67hm6wpjm87"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; TDbasedUFE = derive2 { name="TDbasedUFE"; version="1.0.0"; sha256="1hsjqcrp9fcn28aqvvrd51x75cyh1awzcqdqaxdxg0x2gn548jmf"; depends=[GenomicRanges MOFAdata readr rTensor shiny tximport tximportData]; }; TDbasedUFEadv = derive2 { name="TDbasedUFEadv"; version="1.0.0"; sha256="1i38wr1imzddsxby43jg5ag3dbprpzkcqa6s7b49a6xn88qrsxrq"; depends=[Biobase DOSE enrichplot enrichR GenomicRanges hash RTCGA rTensor shiny STRINGdb TDbasedUFE]; }; TEKRABber = derive2 { name="TEKRABber"; version="1.4.0"; sha256="01jk7iax89p5m3pqpjmbbiza1ij768wzm5b9vss9j7vyc2hrym3c"; depends=[apeglm biomaRt DESeq2 dplyr magrittr Rcpp SCBN SummarizedExperiment]; }; @@ -1071,7 +1074,7 @@ in with self; { VegaMC = derive2 { name="VegaMC"; version="3.38.0"; sha256="0vz8jj1vaghbs6i2m4ik2lkhjn3vz8qla8i8kgmbc4wj5ny32q9k"; depends=[Biobase biomaRt]; }; VennDetail = derive2 { name="VennDetail"; version="1.16.0"; sha256="126a0zpn6vw5l65zlcd8m53gfs4fdgj1nzw1fv0bqk8jiv44q87b"; depends=[dplyr futile_logger ggplot2 magrittr purrr tibble UpSetR VennDiagram]; }; ViSEAGO = derive2 { name="ViSEAGO"; version="1.14.0"; sha256="1d8473i0hk4d6kncvrv7xrsbayjkwnpln22d7xrll9kmhvkr679b"; depends=[AnnotationDbi AnnotationForge biomaRt data_table dendextend DiagrammeR DT dynamicTreeCut fgsea ggplot2 GO_db GOSemSim heatmaply htmlwidgets igraph plotly processx R_utils RColorBrewer scales topGO UpSetR]; }; - Voyager = derive2 { name="Voyager"; version="1.2.4"; sha256="0prl25qjl1s6qpxqcg99g890s8w233z02phidm24hap6yvcdvsz5"; depends=[BiocParallel bluster ggnewscale ggplot2 lifecycle Matrix patchwork rlang RSpectra S4Vectors scales scico sf SingleCellExperiment sparseMatrixStats SpatialExperiment SpatialFeatureExperiment spdep SummarizedExperiment terra]; }; + Voyager = derive2 { name="Voyager"; version="1.2.7"; sha256="0rvszinn1jvb85qw4mfcz5pw20354azz6bmmcfidrh60likc3p5q"; depends=[BiocParallel bluster ggnewscale ggplot2 lifecycle Matrix matrixStats patchwork rlang RSpectra S4Vectors scales scico sf SingleCellExperiment SpatialExperiment SpatialFeatureExperiment spdep SummarizedExperiment terra]; }; VplotR = derive2 { name="VplotR"; version="1.10.0"; sha256="02b82ajbq2448b9h6jx24jsrxavgm6bfn6kk1v2xf2fcipdx8chs"; depends=[cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr RColorBrewer reshape2 Rsamtools S4Vectors zoo]; }; Wrench = derive2 { name="Wrench"; version="1.18.0"; sha256="18x12395928d0mf8kffmdjqkdxrzgqzzhhvs7sdzldwyas6hfg2h"; depends=[limma locfit matrixStats]; }; XDE = derive2 { name="XDE"; version="2.46.0"; sha256="096pbkj4sw9kx2k25yw78zb2y615w86cvrgjk1xkvyi0w6v8mk6m"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools mvtnorm RColorBrewer siggenes]; }; @@ -1079,7 +1082,7 @@ in with self; { XNAString = derive2 { name="XNAString"; version="1.8.0"; sha256="0xq39n1y807vv14fx57w6iz3kln384c6igmdphi1cli7b228xyh5"; depends=[Biostrings BSgenome data_table formattable future_apply GenomicRanges IRanges Rcpp S4Vectors stringi stringr]; }; XVector = derive2 { name="XVector"; version="0.40.0"; sha256="1v10hfz658gnb6p7pzdl28jbyypv91wx70i0dvi384nfgznhvmj2"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; }; Xeva = derive2 { name="Xeva"; version="1.16.0"; sha256="0q1y9qlfr7qbgdmxfrwizx94qp5ddsmkq295lh87qhjx8vv90fcs"; depends=[BBmisc Biobase ComplexHeatmap doParallel downloader ggplot2 nlme PharmacoGx Rmisc scales]; }; - YAPSA = derive2 { name="YAPSA"; version="1.25.0"; sha256="0xva7vljq2k78rzjnjlp4x3ylwk86jaqn2cgbff4h4sb8rfdya7c"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST limSolve magrittr PMCMRplus pracma reshape2 SomaticSignatures VariantAnnotation]; }; + YAPSA = derive2 { name="YAPSA"; version="1.26.8"; sha256="16rr2bkni3jx5qskr5fz5lvf23d03xgd3m4068mnd3n9r23hpb4p"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap corrplot dendextend doParallel dplyr GenomeInfoDb GenomicRanges GetoptLong ggbeeswarm ggplot2 gridExtra gtrellis KEGGREST limSolve magrittr PMCMRplus pracma reshape2 SomaticSignatures VariantAnnotation]; }; ZygosityPredictor = derive2 { name="ZygosityPredictor"; version="1.0.3"; sha256="0sbb2s851fx52rds4mj8qppd1pv5i333z00snypb8illvlid7mk3"; depends=[DelayedArray dplyr GenomicAlignments GenomicRanges igraph IRanges purrr Rsamtools stringr tibble VariantAnnotation]; }; a4 = derive2 { name="a4"; version="1.48.0"; sha256="0n49scwwmg51gcakbc0bfjcy1lcpdxg974l11yk35kj0bg9ynpgi"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; }; a4Base = derive2 { name="a4Base"; version="1.48.0"; sha256="01c8rps321820b0pchfqv8shglb26rys7hqkwygpzzx3jj310v8x"; depends=[a4Core a4Preproc annaffy Biobase genefilter glmnet gplots limma mpm multtest]; }; @@ -1144,7 +1147,7 @@ in with self; { awst = derive2 { name="awst"; version="1.8.0"; sha256="0nwpfxfrx9rw4vl02vr311ivmmk96ajlwyhwms642hjv74j2yiji"; depends=[SummarizedExperiment]; }; bacon = derive2 { name="bacon"; version="1.28.0"; sha256="1h2yh85c6d4j2abdh5l7m6zcxh9i5xzrwwjkwas4nfs48h74z293"; depends=[BiocParallel ellipse ggplot2]; }; ballgown = derive2 { name="ballgown"; version="2.32.0"; sha256="05lvpvy4gs3vg4ks23prx0mdp730h1m9kpg4al03ah062gyq3ahx"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; - bambu = derive2 { name="bambu"; version="3.2.5"; sha256="1vqxmz2lknnx1g61y7skvznsnxv3clajngz9mnggg1z3p5mr6cnh"; depends=[BiocGenerics BiocParallel BSgenome data_table dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment tidyr xgboost]; }; + bambu = derive2 { name="bambu"; version="3.2.6"; sha256="0h7ps32vbcn4hjpfb343nn8b50zq9my0k61847fi69vc4siwcx5k"; depends=[BiocGenerics BiocParallel BSgenome data_table dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment tidyr xgboost]; }; bamsignals = derive2 { name="bamsignals"; version="1.32.0"; sha256="18058j3fc47qcwvzgpb8mbc7cd1pywzrz3a36iqz93ihzjmymydk"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; bandle = derive2 { name="bandle"; version="1.4.1"; sha256="0zsrj6jbmyrsw0i69f38rr56qywcp4yy9b2zkhmbm1g1byy5rm3b"; depends=[BH Biobase BiocParallel BiocStyle circlize dplyr ggalluvial ggplot2 ggrepel knitr lbfgs MSnbase plyr pRoloc pRolocdata Rcpp RcppArmadillo rlang robustbase S4Vectors tidyr]; }; banocc = derive2 { name="banocc"; version="1.24.0"; sha256="0yi70y87isb34jc1wrnz4gr0d0f2zw44555s50j3qdnj1x8cld9y"; depends=[coda mvtnorm rstan stringr]; }; @@ -1169,12 +1172,12 @@ in with self; { biobroom = derive2 { name="biobroom"; version="1.32.0"; sha256="0kb6ylq94vywfky0mcrva109darcv361sqvwb19qn92p8vh5199l"; depends=[Biobase broom dplyr tidyr]; }; biobtreeR = derive2 { name="biobtreeR"; version="1.12.0"; sha256="0cbhlxh0w736695niyjd59fcvplna2f2x2av9k0sd1r3dy6lrcd4"; depends=[httpuv httr jsonlite stringi]; }; biocGraph = derive2 { name="biocGraph"; version="1.62.0"; sha256="0fnncmi82qb9lkg1zfyps7n3nrw1s3wcqbixh420w53hmdyryryl"; depends=[BiocGenerics geneplotter graph Rgraphviz]; }; - biocViews = derive2 { name="biocViews"; version="1.68.1"; sha256="04rzrwxd9n4l3agmbkx03hhcmy2fx049q5n4glld46mvx3vjvc48"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; }; + biocViews = derive2 { name="biocViews"; version="1.68.2"; sha256="1icnaj1ifndym7nl1yafzd0y0fxyhzjyb4qzqpcnsqhh4yi3pnm5"; depends=[Biobase BiocManager graph RBGL RCurl RUnit XML]; }; biocthis = derive2 { name="biocthis"; version="1.10.3"; sha256="1v0qrypdzl1bg85k8i7qamb6709cgk4ypmisjh6bn5r36nqd5qx4"; depends=[BiocManager fs glue rlang styler usethis]; }; - biodb = derive2 { name="biodb"; version="1.8.0"; sha256="1lcjq1zfarhc7pqqrkqnaycsv2f27n4n8mfvrc3c9ww4lsza555k"; depends=[BiocFileCache chk jsonlite lgr lifecycle openssl plyr progress R6 rappdirs Rcpp RCurl RSQLite stringr testthat withr XML yaml]; }; + biodb = derive2 { name="biodb"; version="1.8.1"; sha256="18j70ma85qb42qqpzz8fw3g4x6cav4j0pc2ab5ym22791dr8izck"; depends=[BiocFileCache chk git2r jsonlite lgr lifecycle openssl plyr progress R6 rappdirs Rcpp RCurl RSQLite stringr testthat withr XML yaml]; }; biodbChebi = derive2 { name="biodbChebi"; version="1.6.0"; sha256="1c4955rj8g03kjdr8x4296vz8spj957b65dmy8dw2f56ph1wc6aj"; depends=[biodb R6]; }; biodbExpasy = derive2 { name="biodbExpasy"; version="1.4.0"; sha256="0gwfs6b3ppas26k555pj9yjs949a7zxznbnkr0hn0x927z2lq60r"; depends=[biodb chk R6 stringr]; }; - biodbHmdb = derive2 { name="biodbHmdb"; version="1.6.0"; sha256="0qh8jvkk8n6hxjxwyp351s6v1dl6q5vxlx2ihg6hkswdavx8cgl8"; depends=[biodb R6 Rcpp testthat]; }; + biodbHmdb = derive2 { name="biodbHmdb"; version="1.6.1"; sha256="173wpnxdq3146ynr913wb0zscg2ga2w3jjv23v044vcjamwhh15p"; depends=[biodb R6 Rcpp testthat zip]; }; biodbKegg = derive2 { name="biodbKegg"; version="1.6.1"; sha256="0dnl26cvqy0v61aj1ddcbkqiz254n8vsrpy1hmkn7d1jrlkqsp4w"; depends=[biodb chk lifecycle R6]; }; biodbLipidmaps = derive2 { name="biodbLipidmaps"; version="1.6.0"; sha256="1j3ywrg1hilgx2d8a81y46s6x2yb03014i3dma5fjf5r9fhans03"; depends=[biodb lifecycle R6]; }; biodbMirbase = derive2 { name="biodbMirbase"; version="1.4.0"; sha256="09w4pckjg26333z6j27f1pw1bkxw4793fyk8q04b8ww1fnd7znr2"; depends=[biodb chk R6 stringr]; }; @@ -1198,11 +1201,11 @@ in with self; { breakpointR = derive2 { name="breakpointR"; version="1.18.0"; sha256="001n99lilymgqxmpi4v89gw60j1mx13rvppv1ff1pbnk1zcmg53n"; depends=[BiocGenerics breakpointRdata cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges Rsamtools S4Vectors]; }; brendaDb = derive2 { name="brendaDb"; version="1.14.0"; sha256="1kvb87cg9f3h7hnvxc2zgr9sxxcn0k09gmhp63g7szkqb41vkjyj"; depends=[BiocFileCache BiocParallel crayon dplyr magrittr purrr rappdirs Rcpp rlang stringr tibble tidyr]; }; bsseq = derive2 { name="bsseq"; version="1.36.0"; sha256="1mvhh99h1l6f5rlz0fzqkjpz9hblj2rbv8nx4j9n93g8riz7wsi3"; depends=[beachmat Biobase BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils Rcpp rhdf5 S4Vectors scales SummarizedExperiment]; }; - bugsigdbr = derive2 { name="bugsigdbr"; version="1.6.4"; sha256="1mw895mspfl05pfm5h4r3fyh8hnzklx30k44v7xg67dc83pdrlk6"; depends=[BiocFileCache vroom]; }; + bugsigdbr = derive2 { name="bugsigdbr"; version="1.6.6"; sha256="14cn1yj44y39v0bq6db282lw0vj1janlmwkz2yxngg8lsz1m9w6n"; depends=[BiocFileCache vroom]; }; bumphunter = derive2 { name="bumphunter"; version="1.42.0"; sha256="1xghz87702fg9r6n1igygf4ybb8mw8ff0i02qkx9jmm6vmmfhv18"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; cBioPortalData = derive2 { name="cBioPortalData"; version="2.12.0"; sha256="0dhxjj63ddyjvh2s327336w6711c1a53kw7xiwwaxxmzqncrqik6"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; cTRAP = derive2 { name="cTRAP"; version="1.18.0"; sha256="0qbzxkjw0l37b0xs2k54va236k56hl652j77yp06d2r451gl3k8h"; depends=[AnnotationDbi AnnotationHub binr cowplot data_table dplyr DT fastmatch fgsea ggplot2 ggrepel highcharter htmltools httr limma pbapply purrr qs R_utils readxl reshape2 rhdf5 rlang scales shiny shinycssloaders tibble]; }; - cageminer = derive2 { name="cageminer"; version="1.6.1"; sha256="0nw21zbh83zz59zcp01s86xzfzynf91hjxzrjncb7jp6hsq6g13c"; depends=[BioNERO GenomeInfoDb GenomicRanges ggbio ggplot2 ggtext IRanges reshape2 rlang]; }; + cageminer = derive2 { name="cageminer"; version="1.6.2"; sha256="1pmmgv8shjrrrddbgyfsjfip6wfr6i06xpwf7j8wp7azmgf8vrh5"; depends=[BioNERO GenomeInfoDb GenomicRanges ggbio ggplot2 ggtext IRanges reshape2 rlang]; }; calm = derive2 { name="calm"; version="1.14.0"; sha256="07wnfspw81my0lsbpdxn8qh9flsm28b9w748cswbs42c7gffgjbp"; depends=[mgcv]; }; canceR = derive2 { name="canceR"; version="1.34.0"; sha256="0agmw839frjz7zf1px7l8b0xk05gj2isgfvl88dwgxkww68vrpbb"; depends=[Biobase circlize Formula geNetClassifier GSEABase httr phenoTest plyr R_methodsS3 R_oo rpart RUnit survival tkrplot]; }; cancerclass = derive2 { name="cancerclass"; version="1.44.0"; sha256="0bwrzqhfk6vma1pybmn7bs4asr8r2n3g8l2mmw93rqjb8p319shd"; depends=[binom Biobase]; }; @@ -1223,7 +1226,7 @@ in with self; { cellity = derive2 { name="cellity"; version="1.28.0"; sha256="1n9i3vkc01fdv5fxwqnw2zd42wmn3n80ryidzzq874i77nid9mgl"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; cellmigRation = derive2 { name="cellmigRation"; version="1.8.0"; sha256="1d1js0pvqlc59wpl9mdj0fjw2gx0bjs2p7v2si6rv6j03zz916ka"; depends=[doParallel FactoMineR FME foreach Hmisc matrixStats reshape2 sp SpatialTools tiff vioplot]; }; cellscape = derive2 { name="cellscape"; version="1.24.0"; sha256="0g7way8s7xmdx8266vv4597znyh4kkmc1cvxg4i0x3wkv2rq4gac"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; - cellxgenedp = derive2 { name="cellxgenedp"; version="1.4.0"; sha256="0frbajznfdvbjxyqb807wb80i0gi1hj112pfp9hyp85y35rzrl2j"; depends=[curl dplyr DT httr jsonlite rjsoncons shiny]; }; + cellxgenedp = derive2 { name="cellxgenedp"; version="1.4.1"; sha256="09dpynmm1xg7hgiq5jvxvrwalaks0p7cim1cfa737wzflspz3pmj"; depends=[curl dplyr DT httr jsonlite rjsoncons shiny]; }; censcyt = derive2 { name="censcyt"; version="1.8.0"; sha256="0ql7k42z96swaizags3nijx92zjc64whi3c8a26hvjykpdhrzxwv"; depends=[BiocParallel broom_mixed diffcyt dirmult dplyr edgeR fitdistrplus lme4 magrittr MASS mice multcomp purrr rlang S4Vectors stringr SummarizedExperiment survival tibble tidyr]; }; cfDNAPro = derive2 { name="cfDNAPro"; version="1.6.0"; sha256="05vbwdcgmffzldfk6g882lbfrygw25nhx6fgrbadphdw72q1ynrn"; depends=[BiocGenerics BSgenome_Hsapiens_NCBI_GRCh38 BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr plyranges quantmod rlang Rsamtools stringr tibble]; }; cfTools = derive2 { name="cfTools"; version="1.0.0"; sha256="1ggvcsnqhf69559a3axpdszm41mvg60138lh2xlnsm0642f648wy"; depends=[basilisk BH GenomicRanges R_utils Rcpp]; }; @@ -1252,7 +1255,7 @@ in with self; { clstutils = derive2 { name="clstutils"; version="1.48.0"; sha256="16sk150yibqvz0nx2n5vivxmd56913myyb2j4jxcf5fg8vxrr1f2"; depends=[ape clst lattice rjson RSQLite]; }; clustComp = derive2 { name="clustComp"; version="1.28.0"; sha256="0i153cf3qavg6pxs5k8g6jrz2mp26fj1qrywrjwrzaf4h575dwk7"; depends=[sm]; }; clusterExperiment = derive2 { name="clusterExperiment"; version="2.20.0"; sha256="0h22zh6jpd2wsh6b9rnrmx8897aqlrsnw82kwphx8lay4r1vv706"; depends=[ape BiocGenerics BiocSingular cluster DelayedArray edgeR HDF5Array howmany kernlab limma locfdr Matrix matrixStats mbkmeans NMF phylobase pracma RColorBrewer Rcpp S4Vectors scales SingleCellExperiment stringr SummarizedExperiment zinbwave]; }; - clusterProfiler = derive2 { name="clusterProfiler"; version="4.8.2"; sha256="0iijby2j9i6sbdc3iwhqqb8xlz25k3dpiyq91p7yybggpr2p1nw4"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim gson magrittr plyr qvalue rlang tidyr yulab_utils]; }; + clusterProfiler = derive2 { name="clusterProfiler"; version="4.8.3"; sha256="1kihrpa8cb2bqk5dck0w6yzgfpl72qxlrxwpidg1ar27q3ivz8w3"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim gson magrittr plyr qvalue rlang tidyr yulab_utils]; }; clusterStab = derive2 { name="clusterStab"; version="1.72.0"; sha256="0imx4jfi2cjriy30cvmskfhkyrjn6s4wj6sw33v9zkqracfxnhzk"; depends=[Biobase]; }; clustifyr = derive2 { name="clustifyr"; version="1.12.0"; sha256="0i6gs7mvxav8wpj4bsslcgdwlaih2p1f5yfwdgbi3n36b6giirv5"; depends=[cowplot dplyr entropy fgsea ggplot2 httr Matrix matrixStats proxy readr rlang S4Vectors scales SingleCellExperiment stringr SummarizedExperiment tibble tidyr]; }; cmapR = derive2 { name="cmapR"; version="1.12.0"; sha256="1pkigc8a0a0cjn0hxirjr50a1zs7ig3crm7rrs2gw0zjvzvkmsgc"; depends=[data_table flowCore matrixStats rhdf5 SummarizedExperiment]; }; @@ -1265,7 +1268,7 @@ in with self; { coRdon = derive2 { name="coRdon"; version="1.18.0"; sha256="1qisxv0i05dcsf9nxgbwhswzxrckrabz5jzh78fnh7x9hh7rsd62"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; codelink = derive2 { name="codelink"; version="1.68.0"; sha256="0gsdkzdgi4l34i9jk4b2h10rniwm0w0h7m5p1i8v20j7dlnihhs4"; depends=[annotate Biobase BiocGenerics limma]; }; cogena = derive2 { name="cogena"; version="1.34.0"; sha256="1gfkbj3b7j1hd0y0s5fp00hq1lllxhpirjaxphhhaj8vhvh5xpy8"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2 stringr tibble tidyr]; }; - cogeqc = derive2 { name="cogeqc"; version="1.4.0"; sha256="1v6vxcwwh6v4xwka1h0pyp7i7z7xs2k06qbx8b3hy1v9v2bkqd50"; depends=[Biostrings ggbeeswarm ggplot2 ggtree igraph jsonlite patchwork reshape2 rlang scales]; }; + cogeqc = derive2 { name="cogeqc"; version="1.4.1"; sha256="02gh0ky3fzkdzg0j09v31l7zcmncx0i7a39filfydnky69i362l2"; depends=[Biostrings ggbeeswarm ggplot2 ggtree igraph jsonlite patchwork reshape2 rlang scales]; }; cola = derive2 { name="cola"; version="2.6.0"; sha256="104l0dnav1z9kk2r1a0hyqcm230cgpkcap4dng9a0r6vsd5bvz8k"; depends=[BiocGenerics brew circlize clue cluster ComplexHeatmap crayon digest doParallel doRNG eulerr foreach GetoptLong GlobalOptions httr impute irlba knitr markdown matrixStats mclust microbenchmark png RColorBrewer Rcpp skmeans xml2]; }; comapr = derive2 { name="comapr"; version="1.4.0"; sha256="0w4jajd088bxf664ajs5cfgq14hn5xfdsydsrsnb97jv8jhjxc19"; depends=[BiocParallel circlize dplyr foreach GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz IRanges Matrix plotly plyr RColorBrewer reshape2 rlang S4Vectors scales SummarizedExperiment tidyr]; }; combi = derive2 { name="combi"; version="1.12.1"; sha256="1ax4vsj0pwm5xzp01mgmm8vx2w6sz8fl0fiwwbkrgnbnmkd2gfjh"; depends=[alabama BB Biobase cobs DBI ggplot2 limma Matrix nleqslv phyloseq reshape2 SummarizedExperiment tensor vegan]; }; @@ -1317,7 +1320,7 @@ in with self; { cytofQC = derive2 { name="cytofQC"; version="1.0.0"; sha256="0isfngah9bziwfbrlqqcg7h57cwpphxwv52xvgjvd970ch9bl598"; depends=[CATALYST e1071 EZtune flowCore gbm ggplot2 hrbrthemes matrixStats randomForest rmarkdown S4Vectors SingleCellExperiment ssc SummarizedExperiment]; }; cytolib = derive2 { name="cytolib"; version="2.12.1"; sha256="0mfv259k92vz0g7zv8zir2av2nlmx6na1f6q9zyj24s18m7mrkqz"; depends=[BH Rhdf5lib RProtoBufLib]; }; cytomapper = derive2 { name="cytomapper"; version="1.12.0"; sha256="1z3ic6w4pkysw546kh0ybwyj13wdd1a7ixa83ws200aydryybjmc"; depends=[BiocParallel DelayedArray EBImage ggbeeswarm ggplot2 HDF5Array matrixStats nnls raster RColorBrewer rhdf5 S4Vectors shiny shinydashboard SingleCellExperiment SpatialExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; - cytoviewer = derive2 { name="cytoviewer"; version="1.0.0"; sha256="0i1rklm9s9vlk8mbnzsvm2837rk44sn9zy1pch983q12cjg63iw6"; depends=[archive colourpicker cytomapper EBImage RColorBrewer S4Vectors shiny shinycssloaders shinydashboard SingleCellExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; + cytoviewer = derive2 { name="cytoviewer"; version="1.0.1"; sha256="1ckgwp0gxiv92dd4g25b4fq9mk3xc27lslap0d165a0p2km6jzfl"; depends=[archive colourpicker cytomapper EBImage RColorBrewer S4Vectors shiny shinycssloaders shinydashboard SingleCellExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; dStruct = derive2 { name="dStruct"; version="1.6.0"; sha256="1bcmv30gj2rfzgwk9ncpbn5z0ra5jxpm94npw9nd6lz8gf6qmm74"; depends=[ggplot2 IRanges purrr reshape2 rlang S4Vectors zoo]; }; daMA = derive2 { name="daMA"; version="1.72.0"; sha256="0z4y57hna312pkhkchair8calm7wl40rx8lcm8i6h1789hba063d"; depends=[MASS]; }; dada2 = derive2 { name="dada2"; version="1.28.0"; sha256="1vxy2106rzygy0dr38wmw84zrqp9gsvaphliikdmhx0n2gv6xhd1"; depends=[BiocGenerics Biostrings ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; }; @@ -1354,17 +1357,17 @@ in with self; { dir_expiry = derive2 { name="dir.expiry"; version="1.8.0"; sha256="1vccq28734s7zk7pc7i9zq4rzbi373xqqvgkzamjpii36phkdmlw"; depends=[filelock]; }; discordant = derive2 { name="discordant"; version="1.24.0"; sha256="1c3qfj6yx6pnpjzm6lgs4ark3dlw21amkxcnrzqi4qxdl2r5jkgn"; depends=[Biobase biwt dplyr gtools MASS Rcpp]; }; distinct = derive2 { name="distinct"; version="1.12.2"; sha256="1yzsnjcwh4l8iy7hx9zhgx2kxdfvszc60dahgd1sx6mmybcg89zv"; depends=[doParallel doRNG foreach ggplot2 limma Matrix Rcpp RcppArmadillo Rfast scater SingleCellExperiment SummarizedExperiment]; }; - dittoSeq = derive2 { name="dittoSeq"; version="1.12.0"; sha256="0g5xxzd2xvh0m1fmyzzriwnrq1ckcmb95h9yl60h5w3c3ph22438"; depends=[colorspace cowplot ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; + dittoSeq = derive2 { name="dittoSeq"; version="1.12.2"; sha256="13z7adkadcf405hk0x2ypjbm05465m5qzsvs1fb46mkr1fd9c822"; depends=[colorspace cowplot ggplot2 ggrepel ggridges gridExtra pheatmap reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; }; divergence = derive2 { name="divergence"; version="1.16.0"; sha256="1h212zjav0m4739mrshnp3ghnq0cr66knv5ihn6fy3grf00i1v9k"; depends=[SummarizedExperiment]; }; dks = derive2 { name="dks"; version="1.46.0"; sha256="1cbqcg7fk27y8y1hbfwz9vj6sgvygnmg855h9swlr2mq5kaka5ig"; depends=[cubature]; }; - dmrseq = derive2 { name="dmrseq"; version="1.20.0"; sha256="1xj23dqvmxi1sn4qn4zwvn9ggv128kr3gxmd7906463s9ap8qjja"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; + dmrseq = derive2 { name="dmrseq"; version="1.20.1"; sha256="1lxrirgy42xnpdj7b2nrabbki33an8ri6j1mgxp3jn4h0a88c280"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; doppelgangR = derive2 { name="doppelgangR"; version="1.28.1"; sha256="0sbwqrn4j364wj8j1s857hvxi2hch0cgm84h71sy6hmg7p5jdnvf"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; }; doseR = derive2 { name="doseR"; version="1.16.0"; sha256="1as6sinbry3ai8wlzrdpr8zfd4c9cyqlbwg0hc4ii4lvnykbm5hz"; depends=[digest edgeR lme4 matrixStats mclust RUnit S4Vectors SummarizedExperiment]; }; doubletrouble = derive2 { name="doubletrouble"; version="1.0.0"; sha256="0w82sgf7c86v3ir771a332x0ab09z517jvp43xx2chsbwahzyk1d"; depends=[Biostrings GenomicRanges ggplot2 mclust MSA2dist syntenet]; }; dpeak = derive2 { name="dpeak"; version="1.12.0"; sha256="1fx2rrcqmjckk5kk3mfa56b1393b2c8sf566q95d8zmlsvkl03w5"; depends=[BSgenome IRanges MASS Rcpp]; }; drawProteins = derive2 { name="drawProteins"; version="1.20.0"; sha256="15vxi4a8bm65s6ba7kyyr64l4k7frwa6l06537423ac245j7nkwl"; depends=[dplyr ggplot2 httr readr tidyr]; }; drugTargetInteractions = derive2 { name="drugTargetInteractions"; version="1.8.0"; sha256="0ll9fdfnvr8rbm54z1jf5w6b3dizm8fhzladnlc6xx5ysldasci3"; depends=[AnnotationFilter BiocFileCache biomaRt dplyr ensembldb rappdirs RSQLite S4Vectors UniProt_ws]; }; - dupRadar = derive2 { name="dupRadar"; version="1.30.0"; sha256="0gda6nx42xsskzpn55yj877703zmn1al5qrpjb0xyiw0ayjdg6d2"; depends=[KernSmooth Rsubread]; }; + dupRadar = derive2 { name="dupRadar"; version="1.30.3"; sha256="05j8ffdsg38rxpqxmrb154qdba1jlnhsfjkxgzs6fpkvcggp06g5"; depends=[KernSmooth Rsubread]; }; dyebias = derive2 { name="dyebias"; version="1.60.0"; sha256="1l4sk2hzghr0b983ki2jzr9myyy62pcz104vblql48jg6pxv28gk"; depends=[Biobase marray]; }; easier = derive2 { name="easier"; version="1.6.3"; sha256="1b8grnh0srla1pxln88bxg0n4z2ri6qjp4qi6f4d14mwdsylkfiy"; depends=[BiocParallel coin decoupleR DESeq2 dorothea dplyr easierData ggplot2 ggpubr ggrepel magrittr matrixStats progeny quantiseqr reshape2 rlang ROCR rstatix tibble tidyr]; }; easyRNASeq = derive2 { name="easyRNASeq"; version="2.36.0"; sha256="1cax4k6rppk0kxwannf0ar17jx1pa7lp52a398skqkhy87s29dbp"; depends=[Biobase BiocFileCache BiocGenerics BiocParallel biomaRt Biostrings edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD rappdirs Rsamtools S4Vectors ShortRead SummarizedExperiment]; }; @@ -1378,14 +1381,14 @@ in with self; { eisaR = derive2 { name="eisaR"; version="1.12.0"; sha256="0g2zg8y0mdn0nn1jw5dlvm2245913fmw7lbgymkwlihf5xm8s345"; depends=[BiocGenerics edgeR GenomicRanges IRanges limma S4Vectors SummarizedExperiment]; }; enhancerHomologSearch = derive2 { name="enhancerHomologSearch"; version="1.6.1"; sha256="081b6d8m4kq4bsrxs8pwg58lwrifd2cc2ymkqcv491xnfabr3ais"; depends=[BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges httr IRanges jsonlite Matrix motifmatchr Rcpp rtracklayer S4Vectors]; }; enrichTF = derive2 { name="enrichTF"; version="1.16.0"; sha256="15k7vy02270ygl354wxy7dsx4w2qx6bidqyhsb1dcamhy2z11403"; depends=[BiocGenerics BSgenome clusterProfiler GenomeInfoDb GenomicRanges ggplot2 ggpubr heatmap3 IRanges JASPAR2018 magrittr motifmatchr pipeFrame R_utils rmarkdown rtracklayer S4Vectors TFBSTools]; }; - enrichplot = derive2 { name="enrichplot"; version="1.20.0"; sha256="10vmlw58hgzcpv2hlxk9ircza889vs9z01z575633qj0ivsczh0z"; depends=[aplot DOSE ggnewscale ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 rlang scatterpie shadowtext yulab_utils]; }; + enrichplot = derive2 { name="enrichplot"; version="1.20.3"; sha256="11hgxs42wvirv6b9ywr2jb51s67k4r0pm21dkvm7xjbsbarlkhmh"; depends=[aplot DOSE ggfun ggnewscale ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 rlang scatterpie shadowtext yulab_utils]; }; ensemblVEP = derive2 { name="ensemblVEP"; version="1.42.0"; sha256="0s743p10cf1vjw8b44qy6cwx77ykkq931sil1cv9km278zpkp3b5"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="2.24.0"; sha256="0rl5ix755055i95y5xfb4zv5gih2gkqwqia1r1b3yx12z5ybvkc6"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; + ensembldb = derive2 { name="ensembldb"; version="2.24.1"; sha256="1x73lln0rlnypl8iia54srl3wrazs94f8rspmjsaqsxwknkym319"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; epiNEM = derive2 { name="epiNEM"; version="1.24.0"; sha256="1c13mrw9if1v3gx8c662p48prx5hy8ndgs35ma4dv93kkgqxg9i2"; depends=[BoolNet e1071 graph gtools igraph latex2exp lattice latticeExtra minet mnem pcalg RColorBrewer]; }; - epialleleR = derive2 { name="epialleleR"; version="1.8.0"; sha256="1addbbxifj5ksrnxn7i3kfc1bywpd9zkxl4ky6hbswpjygv4b9gp"; depends=[BH BiocGenerics data_table GenomeInfoDb GenomicRanges Rcpp Rhtslib stringi SummarizedExperiment VariantAnnotation zlibbioc]; }; + epialleleR = derive2 { name="epialleleR"; version="1.8.1"; sha256="1jjydv6f10zdrk5fx54a7iy9fl5rk6j3wk3i0i7zzd4nsk7m8rpz"; depends=[BH BiocGenerics data_table GenomeInfoDb GenomicRanges Rcpp Rhtslib stringi SummarizedExperiment VariantAnnotation zlibbioc]; }; epidecodeR = derive2 { name="epidecodeR"; version="1.8.0"; sha256="19422k6v9xc1gq3hw2mbqcgp3jdllmkjrcqsac0b02i4ly4yad8h"; depends=[dplyr EnvStats GenomicRanges ggplot2 ggpubr IRanges rstatix rtracklayer]; }; epigenomix = derive2 { name="epigenomix"; version="1.40.0"; sha256="1mgxc3bsgh93ij8qpa4mr4pcc3p0avzhwyk68hzc5k48c7f9n782"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; - epigraHMM = derive2 { name="epigraHMM"; version="1.8.2"; sha256="1gw13i0sjvd1a5krfnk9vgp55mhq6dlinpprpqj7rg1gp5h2d76w"; depends=[bamsignals csaw data_table GenomeInfoDb GenomicRanges ggplot2 ggpubr GreyListChIP IRanges limma magrittr MASS Matrix pheatmap Rcpp RcppArmadillo rhdf5 Rhdf5lib Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; }; + epigraHMM = derive2 { name="epigraHMM"; version="1.8.3"; sha256="1kcr6rkh3bn2j93i249mk0jsykf9cbl8h50ly60jsg1h62xqqswg"; depends=[bamsignals csaw data_table GenomeInfoDb GenomicRanges ggplot2 ggpubr GreyListChIP IRanges limma magrittr MASS Matrix pheatmap Rcpp RcppArmadillo rhdf5 Rhdf5lib Rsamtools rtracklayer S4Vectors scales SummarizedExperiment]; }; epimutacions = derive2 { name="epimutacions"; version="1.4.0"; sha256="079mkdri07zhx41gd78x88kq0isj6lahijbxr6whc8p5g8qk6p3f"; depends=[AnnotationDbi AnnotationHub BiocGenerics BiocParallel biomaRt bumphunter ensembldb epimutacionsData ExperimentHub GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges isotree matrixStats minfi purrr reshape2 robustbase rtracklayer S4Vectors SummarizedExperiment tibble TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; epistack = derive2 { name="epistack"; version="1.6.0"; sha256="1rnc7vnm6n6f88zncag4x3m2z8nn28r8mjh9cdgr2i2p177cipav"; depends=[BiocGenerics GenomicRanges IRanges plotrix S4Vectors SummarizedExperiment]; }; epistasisGA = derive2 { name="epistasisGA"; version="1.2.1"; sha256="1rs3m4jc9lmwzxg20mknbdrlpnrm0z54ldi5xywmpzyf382r8lka"; depends=[batchtools BH bigmemory BiocParallel data_table ggplot2 igraph matrixStats qgraph Rcpp RcppArmadillo survival]; }; @@ -1433,7 +1436,7 @@ in with self; { flowCore = derive2 { name="flowCore"; version="2.12.2"; sha256="1z3xsp1ymvdjhwcj5mkhl1d586rlr5i8vji9y5gs595w3naa4r0h"; depends=[BH Biobase BiocGenerics cpp11 cytolib matrixStats Rcpp RProtoBufLib S4Vectors]; }; flowCut = derive2 { name="flowCut"; version="1.10.0"; sha256="0gfnc45yg6m6i4gkag65bkc3569441rrbyhi0xbxabrkb8m9a3f0"; depends=[Cairo e1071 flowCore flowDensity]; }; flowCyBar = derive2 { name="flowCyBar"; version="1.36.0"; sha256="0rl1xmil6197pkmwkmvcvscsw7b0bp4ljrj3zjrihpjjq5x7fivw"; depends=[gplots vegan]; }; - flowDensity = derive2 { name="flowDensity"; version="1.34.0"; sha256="1g71sng0f53z6i8vsfirb0qpxadd4vcrmhcfndh88avphrp2i1i5"; depends=[car flowCore flowViz flowWorkspace gplots RFOC rgeos sp]; }; + flowDensity = derive2 { name="flowDensity"; version="1.34.0"; sha256="1g71sng0f53z6i8vsfirb0qpxadd4vcrmhcfndh88avphrp2i1i5"; depends=[car flowCore flowViz flowWorkspace gplots RFOC sp]; }; flowFP = derive2 { name="flowFP"; version="1.58.0"; sha256="1c7j84ax36ybxs7qpkcnxggv4ajzh4dip76caaq7qw8fyyd9cdy4"; depends=[Biobase BiocGenerics flowCore flowViz]; }; flowGate = derive2 { name="flowGate"; version="1.0.0"; sha256="0wkmpzrbv8bkh9b7glgh5zzncij4511wx5a59g4i5q2w9c3vw8bc"; depends=[BiocManager dplyr flowCore flowWorkspace ggcyto ggplot2 purrr rlang shiny tibble]; }; flowGraph = derive2 { name="flowGraph"; version="1.8.0"; sha256="1kx01vzh5qrpsdqqmrkdjfkcvb1bilbvbx632dd4qdcsxizmj3bb"; depends=[data_table effsize furrr future ggiraph ggplot2 ggrepel gridExtra htmlwidgets igraph Matrix matrixStats purrr Rdpack stringi stringr visNetwork]; }; @@ -1450,7 +1453,7 @@ in with self; { flowTrans = derive2 { name="flowTrans"; version="1.52.0"; sha256="1mmi75n957wlmp8x34p1h4giq89g20ahyvzrvf582w5662id9k34"; depends=[flowClust flowCore flowViz]; }; flowVS = derive2 { name="flowVS"; version="1.32.0"; sha256="1qm6qs8rs3qc3x9nj3kn7qrnfaqzdw5rj7bzfkhfvvxcsnmgmch8"; depends=[flowCore flowStats flowViz]; }; flowViz = derive2 { name="flowViz"; version="1.64.0"; sha256="0y16hzadpr5c99cwkphc07vh6lypgfk5nacbmn7mmrw01b3gbk67"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; }; - flowWorkspace = derive2 { name="flowWorkspace"; version="4.12.1"; sha256="0mn9j0zxhqmiqbb5zgs87d1jrrm020r5yy2cp7c0ghb2l7c843zb"; depends=[BH Biobase BiocGenerics cpp11 cytolib data_table DelayedArray dplyr flowCore ggplot2 graph matrixStats ncdfFlow RBGL Rgraphviz Rhdf5lib RProtoBufLib S4Vectors scales XML]; }; + flowWorkspace = derive2 { name="flowWorkspace"; version="4.12.2"; sha256="1g1hym2anysgy7v46fnnxyzac3wzi1713vlih2gqzi23k8r2xx26"; depends=[BH Biobase BiocGenerics cpp11 cytolib data_table DelayedArray dplyr flowCore ggplot2 graph matrixStats ncdfFlow RBGL Rgraphviz Rhdf5lib RProtoBufLib S4Vectors scales XML]; }; flowcatchR = derive2 { name="flowcatchR"; version="1.34.0"; sha256="159j5izrgmc8mqn48aq9n4da07mw375yp62g9rdml266wvyvvm9f"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; }; fmcsR = derive2 { name="fmcsR"; version="1.42.0"; sha256="0ci77gbz93i3s2j2gjp7y3ssn6bcdcmqnl23smnjai7qjmln64dp"; depends=[BiocGenerics ChemmineR RUnit]; }; fmrs = derive2 { name="fmrs"; version="1.10.0"; sha256="17bwvymh1vk6xh1631dvkjxkap9b2azyypncjyvg6s5i9y0dabz3"; depends=[survival]; }; @@ -1480,7 +1483,7 @@ in with self; { geneXtendeR = derive2 { name="geneXtendeR"; version="1.26.0"; sha256="0dba80hvvwm3yvr1jg2c168wxq53clr63wjf5cdfaig8i40z378m"; depends=[AnnotationDbi BiocStyle data_table dplyr GO_db networkD3 org_Rn_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; }; genefilter = derive2 { name="genefilter"; version="1.82.1"; sha256="1wpg8banz6s6smycfqf9hqryp4kf2gs069s7npyvpq53wy0kxyny"; depends=[annotate AnnotationDbi Biobase MatrixGenerics survival]; }; genefu = derive2 { name="genefu"; version="2.32.0"; sha256="0jiirmi6wb6zr5spmn8nrqcrk3ks8hhs1nrm6aiwrky26rn1szrv"; depends=[AIMS amap biomaRt iC10 impute limma mclust survcomp]; }; - geneplast = derive2 { name="geneplast"; version="1.26.0"; sha256="11rjyj2qbbqqjw8s1j5rjgx1h6rzypdnv47vx5xml46qd97ks7fm"; depends=[ape data_table igraph snow]; }; + geneplast = derive2 { name="geneplast"; version="1.26.1"; sha256="1q61244dwf68h05q9ml5d9fs2zcxrl5fgi504f3pz83a426w1dk4"; depends=[ape data_table igraph snow]; }; geneplotter = derive2 { name="geneplotter"; version="1.78.0"; sha256="03x90l7rvxk0z03p5immqbyyhiygi3mkik636al1cjdcxl9dr5f8"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; }; genoCN = derive2 { name="genoCN"; version="1.52.0"; sha256="0dlb3bxbmj9pgvb2zs4q3iy1vpnafwd3qnxy951qm2ln08ksidhy"; depends=[]; }; genomation = derive2 { name="genomation"; version="1.32.0"; sha256="0y6a2qxxp5mnkllcq46j00069z22ixnrbkd15s007a35lhkibz21"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer S4Vectors seqPattern]; }; @@ -1497,7 +1500,7 @@ in with self; { ggmsa = derive2 { name="ggmsa"; version="1.6.0"; sha256="077wx2l4mg95zkx5728ajnr9qm70r6rp2d426w2inwsfl99prqdx"; depends=[aplot Biostrings dplyr ggalt ggforce ggplot2 ggtree magrittr R4RNA RColorBrewer seqmagick statebins tidyr]; }; ggspavis = derive2 { name="ggspavis"; version="1.6.0"; sha256="0df7xgp952a6v4qpby4yqxa473i7w732imv9lc1svnin9184ip8m"; depends=[ggplot2 ggside SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; ggtree = derive2 { name="ggtree"; version="3.8.2"; sha256="0l8llnvmg8k5qgag6vfgx1gdv0x46p3ypfz5apv23qhlbx4jfjja"; depends=[ape aplot cli dplyr ggfun ggplot2 magrittr purrr rlang scales tidyr tidytree treeio yulab_utils]; }; - ggtreeDendro = derive2 { name="ggtreeDendro"; version="1.2.0"; sha256="0c82nkp5iv9xib22j3zlh009vg9m94jh89pryx07k4j22r9gjdci"; depends=[ggplot2 ggtree tidytree]; }; + ggtreeDendro = derive2 { name="ggtreeDendro"; version="1.2.1"; sha256="0v54lp1b2d2nga7rspg74x3fmbywcmsx63cjid0n23l0zbyb3vgb"; depends=[ggplot2 ggtree tidytree]; }; ggtreeExtra = derive2 { name="ggtreeExtra"; version="1.10.0"; sha256="19xikly6ksh03kgpz35wj2d2gdbpikhrk71ahj9ghhkmlwdyjbcr"; depends=[cli ggnewscale ggplot2 ggtree magrittr rlang tidytree]; }; girafe = derive2 { name="girafe"; version="1.52.0"; sha256="0cddz4jm063fgjnxzzsdnllaydfc2zxpyp8by2cacy2qzx95s8qy"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; glmGamPoi = derive2 { name="glmGamPoi"; version="1.12.2"; sha256="0d6q8vn8z90k8ffskcn9jmgg5x5pfb3wjv67bqskasy38inn1zg7"; depends=[beachmat BiocGenerics DelayedArray DelayedMatrixStats HDF5Array MatrixGenerics matrixStats Rcpp RcppArmadillo rlang SingleCellExperiment SummarizedExperiment vctrs]; }; @@ -1565,7 +1568,7 @@ in with self; { idr2d = derive2 { name="idr2d"; version="1.14.0"; sha256="0inj3lwcrpx9wyxvbsijsr5l6lzjm5mxf23khsswfl1lc9c0bqhn"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; }; igvR = derive2 { name="igvR"; version="1.20.0"; sha256="0kfsl2w3a9bycp7baha1q5a1n7hfzp6scw1hv1kjsmvc6f5mszzh"; depends=[BiocGenerics BrowserViz GenomicAlignments GenomicRanges httpuv httr RColorBrewer rtracklayer VariantAnnotation]; }; illuminaio = derive2 { name="illuminaio"; version="0.42.0"; sha256="190i3b9qmh26bic1lzi54mw4p1nrg57qijl1pg6b29w3i6srq692"; depends=[base64]; }; - imcRtools = derive2 { name="imcRtools"; version="1.6.3"; sha256="1i57blfbbiklahi4gxa3hs7fqwc1ryl1yw2y46jf59icaf4sx41i"; depends=[abind BiocNeighbors BiocParallel concaveman cytomapper data_table distances dplyr DT EBImage ggplot2 ggraph igraph magrittr MatrixGenerics pheatmap readr RTriangle S4Vectors scuttle sf SingleCellExperiment SpatialExperiment stringr SummarizedExperiment tidygraph tidyselect viridis vroom]; }; + imcRtools = derive2 { name="imcRtools"; version="1.6.5"; sha256="0x2mzz8s1fhjw2kxggjxsaj1m1m0bss7isiqgizfwsslwqsn9k1j"; depends=[abind BiocNeighbors BiocParallel concaveman cytomapper data_table distances dplyr DT EBImage ggplot2 ggraph igraph magrittr MatrixGenerics pheatmap readr RTriangle S4Vectors scuttle sf SingleCellExperiment SpatialExperiment stringr SummarizedExperiment tidygraph tidyselect viridis vroom]; }; immunoClust = derive2 { name="immunoClust"; version="1.32.0"; sha256="1pd26qli5bj05qivwppz5rpvzm28wp7aqymsg381yg7kzyqlqjdx"; depends=[flowCore lattice]; }; immunotation = derive2 { name="immunotation"; version="1.8.0"; sha256="1pdzs1pv8pddcycacbhrswf73kbhamxw8fckapgf81zxav2sb2ml"; depends=[curl ggplot2 maps ontologyIndex readr rlang rvest stringr tidyr xml2]; }; impute = derive2 { name="impute"; version="1.74.1"; sha256="0nz8ggzk2g5w20yyhp6av6hy69kbmg3ncfpq9ppmq6p5a0msx92l"; depends=[]; }; @@ -1589,7 +1592,7 @@ in with self; { kissDE = derive2 { name="kissDE"; version="1.20.0"; sha256="1dijdss2qakvgxshcpd5n95zly5q4b7fpkvxh265g8fj4b3hzf62"; depends=[ade4 aods3 Biobase DESeq2 doParallel DSS DT factoextra foreach ggplot2 gplots matrixStats shiny shinycssloaders]; }; lapmix = derive2 { name="lapmix"; version="1.66.0"; sha256="1kymd9y1fy6wmkmsb3xi16hzacwb8myj012ksqdflpx679g2lya0"; depends=[Biobase]; }; ldblock = derive2 { name="ldblock"; version="1.30.0"; sha256="18gqmwwi1i4gndqljy809n5zzx38agawxxwhlknpas6k2iskd1xq"; depends=[BiocGenerics httr Matrix rlang]; }; - lefser = derive2 { name="lefser"; version="1.10.0"; sha256="0wi70b4k7s0xj7bh46s0x0fckqc5qspzq8k4k913vg6cnhqgw2dd"; depends=[coin ggplot2 MASS SummarizedExperiment]; }; + lefser = derive2 { name="lefser"; version="1.10.1"; sha256="1ifmbbsbyzcyvjni9ww27c9qsqliv7vj2rv9mg9c7gnqgbg6h2c4"; depends=[coin ggplot2 MASS S4Vectors SummarizedExperiment]; }; les = derive2 { name="les"; version="1.50.0"; sha256="034254qz2kh4v1hnvriacnmsfdy2vhpr2xag939nq2v13xn23sic"; depends=[boot fdrtool gplots RColorBrewer]; }; levi = derive2 { name="levi"; version="1.18.0"; sha256="1ff8w4bh2f488b2v9cgsdmc98xy33zfj1ffladdm6bhsmfqkgbsv"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 rmarkdown shiny shinydashboard shinyjs testthat xml2]; }; lfa = derive2 { name="lfa"; version="2.0.11"; sha256="0x169fxwlccsqwj1bpviaky3hfr0zdwsdrlgfvrb4j6j95qfgnns"; depends=[corpcor RSpectra]; }; @@ -1598,7 +1601,7 @@ in with self; { lineagespot = derive2 { name="lineagespot"; version="1.4.0"; sha256="1mmypd4rjdai3iyyp0sx1wk732kripjrimx1dby2xw397z1pszb4"; depends=[data_table httr MatrixGenerics stringr SummarizedExperiment VariantAnnotation]; }; lionessR = derive2 { name="lionessR"; version="1.14.0"; sha256="0yfznjza95z18r62m35ck4f2sxyc12ip912m6p9zwfqviaczb1si"; depends=[S4Vectors SummarizedExperiment]; }; lipidr = derive2 { name="lipidr"; version="2.14.1"; sha256="1yqpidlgdps3657hx6kwz6nv9wf6p4sjl45jqrn8pk9jx1xcbn13"; depends=[data_table dplyr fgsea forcats ggplot2 imputeLCMD limma magrittr rlang ropls S4Vectors SummarizedExperiment tidyr]; }; - lisaClust = derive2 { name="lisaClust"; version="1.8.0"; sha256="18yqn9cjyj86inphsvs3c02hi9vb1x69cb67mmmx556ywyh1a817"; depends=[BiocGenerics BiocParallel class concaveman data_table dplyr ggplot2 pheatmap purrr S4Vectors SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom spicyR SummarizedExperiment tidyr]; }; + lisaClust = derive2 { name="lisaClust"; version="1.8.2"; sha256="0mzf5b3qs4p86ypsyrkpd03vkyii35aivkrp4l5j82ds9jzb5hn1"; depends=[BiocGenerics BiocParallel class concaveman data_table dplyr ggplot2 pheatmap purrr S4Vectors SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom spatstat_random spicyR SummarizedExperiment tidyr]; }; lmdme = derive2 { name="lmdme"; version="1.42.0"; sha256="1awnbfdfvlziik9nwp5xlpbhc7gp17q2z6sgilmrdmjx9cknbb41"; depends=[limma pls stemHypoxia]; }; loci2path = derive2 { name="loci2path"; version="1.20.0"; sha256="1z4qxr8zc0miinh05pnks7h7ysqybsixln51fp0gfrb499jlbkfp"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; }; logicFS = derive2 { name="logicFS"; version="2.20.0"; sha256="17sa4wr1zly8bj3fmqknxip6ss7q68f3bni20ckc9yljacdv24jx"; depends=[LogicReg mcbiopi survival]; }; @@ -1664,7 +1667,7 @@ in with self; { methylPipe = derive2 { name="methylPipe"; version="1.34.1"; sha256="1128i8q95dq1xwwx273pl0pzizarvbx2pgvhakw6sjb2ry5prw6d"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; methylSig = derive2 { name="methylSig"; version="1.12.0"; sha256="1k7nm84k870cqzr4dvi5vfz3sphs091l0a677kdk4gzs5nkg5818"; depends=[bsseq DelayedArray DelayedMatrixStats DSS GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; methylclock = derive2 { name="methylclock"; version="1.6.0"; sha256="1l8a24xpf8a5n49zcnidv2jb22rjza80v1ysxa10689w27lhf8h7"; depends=[Biobase devtools dplyr dynamicTreeCut ExperimentHub ggplot2 ggpmisc ggpubr gridExtra impute methylclockData minfi PerformanceAnalytics planet preprocessCore quadprog Rcpp RPMM tibble tidyr tidyverse]; }; - methylscaper = derive2 { name="methylscaper"; version="1.8.4"; sha256="1n6v35n2x6lpphydll7s2x54q2lz8avwc6jjqpiwb7c3z74jwy7r"; depends=[BiocParallel Biostrings data_table Rfast seqinr seriation shiny shinyFiles shinyjs SummarizedExperiment]; }; + methylscaper = derive2 { name="methylscaper"; version="1.8.6"; sha256="1fs58fqxwlg85iwbn1hzwv93af737cab6wkx1dbm5sd059ks2dzp"; depends=[BiocParallel Biostrings data_table Rfast seqinr seriation shiny shinyFiles shinyjs SummarizedExperiment]; }; methylumi = derive2 { name="methylumi"; version="2.46.0"; sha256="1aa0pwjyp2p9a4mx4n4qw88ndgrj56p669yzdkd7hxhc3x55nzlf"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; }; mfa = derive2 { name="mfa"; version="1.22.0"; sha256="1rc88ilaqhnbachajc0nagmj865g9w8ny1n9n094qiad9j47nfh4"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; }; mgsa = derive2 { name="mgsa"; version="1.48.0"; sha256="08szkzkdqzll4ki75lvkkvpz6kcv54863cicw376z73fd3x4bwgd"; depends=[gplots]; }; @@ -1755,7 +1758,7 @@ in with self; { netresponse = derive2 { name="netresponse"; version="1.60.0"; sha256="192g4rcyazzxpimkqyxh5y1s1g3i2li4qskh5160yaxp4x31vs9n"; depends=[BiocStyle ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz rmarkdown]; }; ngsReports = derive2 { name="ngsReports"; version="2.2.4"; sha256="0d5rd4gzwx266kqmg38fjyknfg4pmp6rp99l36f2f4wjmbyih32l"; depends=[BiocGenerics Biostrings checkmate dplyr DT forcats ggdendro ggplot2 jsonlite lifecycle lubridate pander patchwork plotly readr reshape2 rlang rmarkdown scales stringr tibble tidyr tidyselect zoo]; }; nnNorm = derive2 { name="nnNorm"; version="2.64.0"; sha256="19nywnq17bijxzxcpmmiq8q9jbjskzw2bi0g33zw3g9ksrg3d758"; depends=[marray nnet]; }; - nnSVG = derive2 { name="nnSVG"; version="1.4.1"; sha256="171c246cj610hh4ifr0s4g4k7r3d057lzyh1jvwnr80gs2jfcw3s"; depends=[BiocParallel BRISC Matrix matrixStats SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; + nnSVG = derive2 { name="nnSVG"; version="1.4.2"; sha256="1vrb5mfgda7mpvbi05ya08krixz494x4yxijh61msnrnz2vb4h5s"; depends=[BiocParallel BRISC Matrix matrixStats SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; nondetects = derive2 { name="nondetects"; version="2.30.0"; sha256="0grz6hky7598kk7mm3amgda5n2bhjmwld0f06zsbcdjpbsr0rchc"; depends=[arm Biobase HTqPCR limma mvtnorm]; }; normalize450K = derive2 { name="normalize450K"; version="1.28.0"; sha256="0im1q0cnmmk347ql41d8apsshxqp357ksnaf063ybw8lgal0fzv2"; depends=[Biobase illuminaio quadprog]; }; normr = derive2 { name="normr"; version="1.26.0"; sha256="1l1xj3yz2xbi2rd28zj4gbjjdca0x0z4s4v2gqdg6zn87yz318dm"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; }; @@ -1926,7 +1929,7 @@ in with self; { rgoslin = derive2 { name="rgoslin"; version="1.4.0"; sha256="1bbac7i1k79livslclc2zlrw2dcnscwknjmbn4w9748hv9i27y6q"; depends=[dplyr Rcpp]; }; rgsepd = derive2 { name="rgsepd"; version="1.32.0"; sha256="0bk5l4fa4zmd69fasvwqy4z41y0q49ja95r5baa8w4261w4x5jkx"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots org_Hs_eg_db SummarizedExperiment]; }; rhdf5 = derive2 { name="rhdf5"; version="2.44.0"; sha256="1akbr55lylwp20b2j351h1gcj1sc5y2j2pjjdpz43m6b7mji23a0"; depends=[rhdf5filters Rhdf5lib]; }; - rhdf5client = derive2 { name="rhdf5client"; version="1.22.2"; sha256="1nvkv281vb3k7r80kzvpi86a5rdfnkkshvifa1ls8d6rm511sk04"; depends=[data_table DelayedArray httr rjson]; }; + rhdf5client = derive2 { name="rhdf5client"; version="1.22.3"; sha256="1qhsr4np16fhxn4mzlv1krp41q7y6fwaydf7k0wq34r6gskg2mwz"; depends=[data_table DelayedArray httr rjson]; }; rhdf5filters = derive2 { name="rhdf5filters"; version="1.12.1"; sha256="1v9wxa5q0iwphrmkf9x70jpbq9r9rqz2hm94smqnnpfxszila49m"; depends=[Rhdf5lib]; }; ribor = derive2 { name="ribor"; version="1.12.0"; sha256="0qf6yracvzc1sxa40l24y0wx14dj7rr1s60qxircx5zzq7c3xa5m"; depends=[dplyr ggplot2 hash rhdf5 rlang S4Vectors tidyr yaml]; }; ribosomeProfilingQC = derive2 { name="ribosomeProfilingQC"; version="1.12.0"; sha256="0q1fl1w2ab7hmzgyp8d66nfr0fl7d32gvbh851sr6g2vx7rbnknn"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome cluster EDASeq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfittext ggplot2 ggrepel IRanges motifStack Rsamtools Rsubread rtracklayer RUVSeq S4Vectors scales XVector]; }; @@ -1943,13 +1946,13 @@ in with self; { rpx = derive2 { name="rpx"; version="2.8.0"; sha256="1ay127hn7hq3dhs2sb1ah8d1xvzldnmam8yxbwwhsymxfkhidy9h"; depends=[BiocFileCache curl jsonlite RCurl xml2]; }; rqt = derive2 { name="rqt"; version="1.26.0"; sha256="0by212x06h2k6mcwzam78n4w7f9akl7qbnpdkyiy2dd6jiq89bdv"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; rqubic = derive2 { name="rqubic"; version="1.46.0"; sha256="0hshaxa19nk43x4nscsbzd8f0pa8138yaxz0lwfywrs2mya5y7jg"; depends=[biclust Biobase BiocGenerics]; }; - rrvgo = derive2 { name="rrvgo"; version="1.12.0"; sha256="0h6w1dncbazda98jam69znn009mv7z660rllvffwg32133rcckcf"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap umap wordcloud]; }; + rrvgo = derive2 { name="rrvgo"; version="1.12.2"; sha256="1400y3mpyhbf0yzkfgj6bq03077da80y6g1gxr7rp3154260dql3"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap umap wordcloud]; }; rsbml = derive2 { name="rsbml"; version="2.58.0"; sha256="0mgg1qfvxgyjk6fw4x0cv486vrsgf1kbqr6nqhgxj6lk8w6909fm"; depends=[BiocGenerics graph]; }; rsemmed = derive2 { name="rsemmed"; version="1.10.0"; sha256="06nbbymllyd7aa203mrip10q24xj249xhzhl3h9r8pdb7c4xh1f5"; depends=[dplyr igraph magrittr stringr]; }; - rtracklayer = derive2 { name="rtracklayer"; version="1.60.0"; sha256="0gy8df0ndq6nyly4b5h3kby8k77rc4j9n7zhnliryvirpr6alm9m"; depends=[BiocGenerics BiocIO Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl restfulr Rsamtools S4Vectors XML XVector zlibbioc]; }; + rtracklayer = derive2 { name="rtracklayer"; version="1.60.1"; sha256="06z02sz8zjg2lxp2q4qwhvh6dsi6srirdmhcdvmi3as50nnjmzd8"; depends=[BiocGenerics BiocIO Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl restfulr Rsamtools S4Vectors XML XVector zlibbioc]; }; runibic = derive2 { name="runibic"; version="1.22.0"; sha256="0q67vyny6qsh6slcjpmvmd3i9qh71qf37nx1isb3dc06680708a1"; depends=[biclust Rcpp SummarizedExperiment testthat]; }; sRACIPE = derive2 { name="sRACIPE"; version="1.16.0"; sha256="1318nrm65c5n2n4822nph7l83klrp1iik8jprr7j9qgbbzdlwwjh"; depends=[BiocGenerics ggplot2 gplots gridExtra htmlwidgets MASS RColorBrewer Rcpp reshape2 S4Vectors SummarizedExperiment umap visNetwork]; }; - sSNAPPY = derive2 { name="sSNAPPY"; version="1.4.4"; sha256="0gkps9gr3ql85qz6ijjqa1ls1s8a819s2fhwlji3nfb8c24k0nd1"; depends=[dplyr edgeR ggforce ggplot2 ggraph graphite gtools igraph magrittr org_Hs_eg_db pheatmap reshape2 rlang stringr SummarizedExperiment tibble tidyr]; }; + sSNAPPY = derive2 { name="sSNAPPY"; version="1.4.6"; sha256="1hnm3yhbwc1wl76akcm9r1c1l6k424nicdcp0s9i531lnh7yg5fg"; depends=[dplyr edgeR ggforce ggplot2 ggraph graphite gtools igraph magrittr org_Hs_eg_db pheatmap reshape2 rlang stringr SummarizedExperiment tibble tidyr]; }; sSeq = derive2 { name="sSeq"; version="1.38.0"; sha256="05c0pxw38bgijd39i92jxm3kwm0dihdff83cdh48saj240ynf7sp"; depends=[caTools RColorBrewer]; }; safe = derive2 { name="safe"; version="3.40.1"; sha256="17m49wvqbwxmw0b08vp5s9qsm67x967xm8znb5nj32915cj9diif"; depends=[AnnotationDbi Biobase SparseM]; }; sagenhaft = derive2 { name="sagenhaft"; version="1.70.0"; sha256="02q0y9r098rimqxm6hzbpkdsij0smg55amxy6pyahjh6yn5jcp91"; depends=[SparseM]; }; @@ -2003,7 +2006,7 @@ in with self; { screenCounter = derive2 { name="screenCounter"; version="1.0.1"; sha256="1yl1sypx11f3iz6kfb5z58smwmkpdd1pm9fgkk6dsg7qm4p6j0la"; depends=[BiocParallel Rcpp S4Vectors SummarizedExperiment zlibbioc]; }; scruff = derive2 { name="scruff"; version="1.18.0"; sha256="07mjd3y4kyd8536j9q8m3vxpfb2a92s0hb6wsgcpb2c45fxayg3c"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr Rsamtools Rsubread rtracklayer S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; }; scry = derive2 { name="scry"; version="1.12.0"; sha256="0406slld468m9lxswv1akcdmap6izvzz6zljyrs5av546nfxpmrz"; depends=[BiocSingular DelayedArray glmpca Matrix SingleCellExperiment SummarizedExperiment]; }; - scuttle = derive2 { name="scuttle"; version="1.10.2"; sha256="0225fk3ca540b9z3dd5q2zngxsa524nq7zrv1z5qnmr2knc0yxfb"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats GenomicRanges Matrix Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; + scuttle = derive2 { name="scuttle"; version="1.10.3"; sha256="0nngajyfix3b4p072aqf2vbk346gpxq326vd3dnqmq4hryww3j9y"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats GenomicRanges Matrix Rcpp S4Vectors SingleCellExperiment SummarizedExperiment]; }; scviR = derive2 { name="scviR"; version="1.0.0"; sha256="04yz41qzgy87frxnykvnsyf1kjaw629fr5hrjv9m4k5jdmqrc0bl"; depends=[basilisk BiocFileCache limma pheatmap reticulate S4Vectors scater shiny SingleCellExperiment SummarizedExperiment]; }; sechm = derive2 { name="sechm"; version="1.8.0"; sha256="1wsf3bhxm48wvyl9g6hhcb1mgy6hds27w6yibyjs695gf4ni5p7p"; depends=[circlize ComplexHeatmap matrixStats randomcoloR S4Vectors seriation SummarizedExperiment]; }; segmenter = derive2 { name="segmenter"; version="1.6.0"; sha256="04sfk7r3qg0jx1aqh7vhnmq5zy0ilg96zbzaqvjfg70bir5v6scd"; depends=[bamsignals ChIPseeker chromhmmData ComplexHeatmap GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; @@ -2024,7 +2027,7 @@ in with self; { sesame = derive2 { name="sesame"; version="1.18.4"; sha256="1il33ygys6y72l8p3fhx301q16w9kylfy6w92b64n8gqkn6dmsmn"; depends=[BiocFileCache BiocParallel dplyr GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore readr reshape2 S4Vectors sesameData stringr SummarizedExperiment tibble wheatmap]; }; sevenC = derive2 { name="sevenC"; version="1.20.0"; sha256="0mgngw3cvqm25jjsymxwfhykc7riip28c5bvkfkb6xcbakp6bqj6"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; }; sevenbridges = derive2 { name="sevenbridges"; version="1.30.0"; sha256="1sym0sjyn4ppsixmwxg84g669xf7jahmx76xl7qfk0m2zz9r0100"; depends=[curl data_table docopt httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; - shinyMethyl = derive2 { name="shinyMethyl"; version="1.36.0"; sha256="1rqwwglj0475gr14bxazfmcvsy7rq6nlw2zcswa684751wy15w0r"; depends=[Biobase BiocGenerics htmltools MatrixGenerics minfi RColorBrewer shiny]; }; + shinyMethyl = derive2 { name="shinyMethyl"; version="1.36.1"; sha256="0hq1q66vjd9pwdwm9zx8q45ws65bn6cm87zmjmyc3md8dwvb8cck"; depends=[Biobase BiocGenerics htmltools MatrixGenerics minfi RColorBrewer shiny]; }; shinyepico = derive2 { name="shinyepico"; version="1.8.0"; sha256="0f9zv3ds9l0bisp8lif0g664i0y59ygrlazhbdxkd7v9ypg22qz1"; depends=[data_table doParallel dplyr DT foreach GenomicRanges ggplot2 gplots heatmaply limma minfi plotly reshape2 rlang rmarkdown rtracklayer shiny shinycssloaders shinyjs shinythemes shinyWidgets statmod tidyr zip]; }; sigFeature = derive2 { name="sigFeature"; version="1.18.0"; sha256="00gqfzbymmma6j0a9j6jf2pv4gahjh70a6pyp6kjnzs5zdmsh7z1"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; }; siggenes = derive2 { name="siggenes"; version="1.74.0"; sha256="0h5asj2w4xgfj9xapjawmxldnhq789py39drlr8illyhcczkzkbz"; depends=[Biobase multtest scrime]; }; @@ -2034,7 +2037,7 @@ in with self; { signifinder = derive2 { name="signifinder"; version="1.2.1"; sha256="1xsbnk7igq5avg4lh63iwaqrp36cnqxdqmqqz13z7ls3nlgryq7q"; depends=[AnnotationDbi BiocGenerics ComplexHeatmap consensusOV cowplot DGEobj_utils dplyr ensembldb ggplot2 ggridges GSVA IRanges magrittr matrixStats maxstat openair org_Hs_eg_db patchwork RColorBrewer SummarizedExperiment survival survminer TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene viridis]; }; sigsquared = derive2 { name="sigsquared"; version="1.32.0"; sha256="1xbza4mccyyby4wlv2fdi5afcqf3g069p83czprlvmfz2rym9vil"; depends=[Biobase survival]; }; similaRpeak = derive2 { name="similaRpeak"; version="1.32.0"; sha256="0sjkzal9wixd421znrlgy6rbczkrqrdykcidm5jn1w48197aczh9"; depends=[R6]; }; - simpleSeg = derive2 { name="simpleSeg"; version="1.2.0"; sha256="1fsp5z46y9br0z0pb7ygn1lns3rk0lml45msq2g1r0rq5vhwm5hw"; depends=[BiocParallel cytomapper EBImage S4Vectors spatstat_geom SummarizedExperiment terra]; }; + simpleSeg = derive2 { name="simpleSeg"; version="1.2.5"; sha256="17hg6nscvk5w3j0ii0qbn2v251nipglxdiq4ry6k5wyi3n92b7qn"; depends=[BiocParallel cytomapper EBImage S4Vectors spatstat_geom SummarizedExperiment terra]; }; simplifyEnrichment = derive2 { name="simplifyEnrichment"; version="1.10.0"; sha256="1vs57j361fbwv7vaybs71vc208qn76djmbmakhwwcvxwrx77jp5f"; depends=[AnnotationDbi BiocGenerics circlize clue cluster colorspace ComplexHeatmap digest GetoptLong GlobalOptions GO_db GOSemSim Matrix org_Hs_eg_db proxyC slam tm]; }; sincell = derive2 { name="sincell"; version="1.32.0"; sha256="09h47w87459k4vhmcjfi1vf47sh1q5qrbrasdg9jsg3cykwhj6vj"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; }; single = derive2 { name="single"; version="1.4.0"; sha256="1khfbcyn0jwl5gcsmxzzzgqvd5hp73qmn8hpjs4rb54grv73jqwy"; depends=[BiocGenerics Biostrings dplyr GenomicAlignments IRanges reshape2 rlang Rsamtools stringr tidyr]; }; @@ -2058,11 +2061,11 @@ in with self; { sparseMatrixStats = derive2 { name="sparseMatrixStats"; version="1.12.2"; sha256="00jalzg6yphi8ci4iid7x38jlsrvvdswrq7cqa7jybs26ayjldw1"; depends=[Matrix MatrixGenerics matrixStats Rcpp]; }; sparsenetgls = derive2 { name="sparsenetgls"; version="1.18.0"; sha256="0gd7as4hsb8nfkqlk1kihwlm55rrdv36xl28zpxz7by6x9w92rjk"; depends=[glmnet huge MASS Matrix]; }; spatialDE = derive2 { name="spatialDE"; version="1.6.0"; sha256="18fgyans15wnc63kzmv51yaxxd3vxjv3q9hgyrk9dz6kqx928mng"; depends=[basilisk checkmate ggplot2 ggrepel gridExtra Matrix reticulate scales SpatialExperiment SummarizedExperiment]; }; - spatialHeatmap = derive2 { name="spatialHeatmap"; version="2.6.0"; sha256="03cpwkz7glfkdlp9967ikgplcj42cw5gyby4w0v41mdyw3y353nk"; depends=[data_table dplyr dynamicTreeCut edgeR flashClust genefilter ggdendro ggplot2 ggplotify gplots gridExtra grImport htmlwidgets igraph Matrix plotly reshape2 rsvg S4Vectors scater scran scuttle shiny shinydashboard SingleCellExperiment SummarizedExperiment tibble UpSetR visNetwork WGCNA xml2 yaml]; }; + spatialHeatmap = derive2 { name="spatialHeatmap"; version="2.6.2"; sha256="10gpil8l3q6pm76509z4jl25i72595yxgrcnkz8zd05dx4jjf8pr"; depends=[data_table dplyr edgeR genefilter ggplot2 ggplotify gplots gridExtra grImport igraph Matrix reshape2 rsvg S4Vectors scater scran scuttle shiny shinydashboard SingleCellExperiment spsComps SummarizedExperiment tibble xml2]; }; spatzie = derive2 { name="spatzie"; version="1.6.0"; sha256="0c460pdfm4ncijhqj47j08bdhgiiic9aha5dwz2bpl1fk4p5l8x1"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 IRanges MatrixGenerics matrixStats motifmatchr S4Vectors SummarizedExperiment TFBSTools]; }; specL = derive2 { name="specL"; version="1.34.0"; sha256="00b4iwq43f3jr8a3g1a86wwvka20zm4jb2lwfv140n4qw3fg294k"; depends=[DBI protViz RSQLite seqinr]; }; speckle = derive2 { name="speckle"; version="1.0.0"; sha256="09hf4kb9s6dcv0532q13ikbbknj4x5il0rxgc34d4k3sbf8pph5s"; depends=[edgeR ggplot2 limma Seurat SingleCellExperiment]; }; - spicyR = derive2 { name="spicyR"; version="1.12.0"; sha256="1gnmzynqc1pnpyzb0481313hrq3dw8g6k5ka97shaldr2cv5c553"; depends=[BiocGenerics BiocParallel concaveman data_table dplyr ggforce ggplot2 IRanges lme4 lmerTest mgcv pheatmap rlang S4Vectors scam SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tidyr]; }; + spicyR = derive2 { name="spicyR"; version="1.12.2"; sha256="04x8gpl15j63k9qly9fsv0vlz9gki4kix2ncysz226qsxmzqpc0v"; depends=[BiocGenerics BiocParallel ClassifyR concaveman data_table dplyr ggforce ggplot2 IRanges lme4 lmerTest mgcv pheatmap rlang S4Vectors scam SingleCellExperiment SpatialExperiment spatstat_explore spatstat_geom SummarizedExperiment tidyr]; }; spikeLI = derive2 { name="spikeLI"; version="2.60.0"; sha256="0mh24piab0gjcjk4lc3wji19lfx2mk0hch9p3wbqkahag6d4y785"; depends=[]; }; spiky = derive2 { name="spiky"; version="1.6.0"; sha256="1lhv69z52pamzrp1pb9ccngdn4kkija4rb7g4vahp1wx7d5fbbja"; depends=[bamlss Biostrings BlandAltmanLeh BSgenome GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges Rsamtools S4Vectors scales]; }; spkTools = derive2 { name="spkTools"; version="1.56.0"; sha256="14rqm15ym7vnzzqk2r4sa7fwa4a474y4i1jxzdy66aarf8nck57j"; depends=[Biobase gtools RColorBrewer]; }; @@ -2084,7 +2087,7 @@ in with self; { stepNorm = derive2 { name="stepNorm"; version="1.72.0"; sha256="1j915bnmq1fsjdgn0rrlxmqvmy1cafyp5sc2gal81qrv366qy1ri"; depends=[marray MASS]; }; strandCheckR = derive2 { name="strandCheckR"; version="1.18.0"; sha256="0gsnhx7vfi3p665fwyai8byz984j7ai6k8d7ilbpxi5f3v1qkjrk"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges magrittr reshape2 rmarkdown Rsamtools S4Vectors stringr TxDb_Hsapiens_UCSC_hg38_knownGene]; }; struct = derive2 { name="struct"; version="1.12.0"; sha256="1vf92g3lhq3ciy6sr9vwx4xzqpzf28np1nfc2f63d5dwcq24l8a9"; depends=[knitr ontologyIndex rols S4Vectors SummarizedExperiment]; }; - structToolbox = derive2 { name="structToolbox"; version="1.12.2"; sha256="1knasb5rna4mgwzwsyxa17v85753769l48jpyvfr3jsysfqv2q0h"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; + structToolbox = derive2 { name="structToolbox"; version="1.12.3"; sha256="0g0glzijv4vrpics14fpj2gs5f8la2rg6n5a71jyh0dzyycj87b5"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; subSeq = derive2 { name="subSeq"; version="1.30.0"; sha256="1p035a53129ax84cjyv1xx3gcq4940mr4ppakczqdbc8c3ch4d08"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; supersigs = derive2 { name="supersigs"; version="1.8.0"; sha256="0ifj0558rcf3v6rwpl2i0bidbg1gv3q8calpn49s1jqayn57hiik"; depends=[assertthat Biostrings caret dplyr rlang rsample SummarizedExperiment tidyr]; }; supraHex = derive2 { name="supraHex"; version="1.38.0"; sha256="1z216mrm59sgxf7kspscf26ic3qlrvpwjs013z10vsxrjwypkmw7"; depends=[ape dplyr hexbin igraph magrittr MASS purrr readr stringr tibble tidyr]; }; @@ -2141,7 +2144,7 @@ in with self; { traviz = derive2 { name="traviz"; version="1.6.0"; sha256="1lsczylj86w2cq2hcknswzqdp4b298gcv6ljzdr9c8ir7ks2j55k"; depends=[Biobase ggplot2 mgcv princurve RColorBrewer rgl SingleCellExperiment slingshot SummarizedExperiment viridis]; }; treeio = derive2 { name="treeio"; version="1.24.3"; sha256="0shm0mdqvsk5qipdqbz3251kks6ii1vpx1pph0ms271nzs6fcvif"; depends=[ape cli dplyr jsonlite magrittr rlang tibble tidytree]; }; treekoR = derive2 { name="treekoR"; version="1.8.0"; sha256="1gsvs30n67vf3fqbm0d6zg5dxj2m1bi81gnm8vjg39413cqi63pc"; depends=[ape data_table diffcyt dplyr edgeR ggiraph ggplot2 ggtree hopach lme4 multcomp patchwork SingleCellExperiment tidyr]; }; - trena = derive2 { name="trena"; version="1.21.0"; sha256="04i4vjdcamjbw3mslnqk3ra2fk3432p9rj376chqapkj9anfpm82"; depends=[AnnotationDbi biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 WGCNA xgboost]; }; + trena = derive2 { name="trena"; version="1.22.2"; sha256="1xjhqm2g53kgcnnqhs5l3vn525h7amaz4hvsskjp5zb0gkfpiwh1"; depends=[AnnotationDbi biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RMySQL RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 WGCNA xgboost]; }; tricycle = derive2 { name="tricycle"; version="1.8.0"; sha256="1ags05rhi431jsk0kqs7rmxj853mf5c0ibfqknbwy2wmbz8p1vq6"; depends=[AnnotationDbi circular dplyr GenomicRanges ggnewscale ggplot2 IRanges RColorBrewer S4Vectors scater scattermore SingleCellExperiment SummarizedExperiment]; }; trigger = derive2 { name="trigger"; version="1.46.0"; sha256="0wviwgr1f8549rwg4hd80c1jri79fqwiylgkablx8h7izq5lk1fc"; depends=[corpcor qtl qvalue sva]; }; trio = derive2 { name="trio"; version="3.38.0"; sha256="1jzsdwpc4wqvdqmqai7lc0hyvl7rq32442iihfhx31yhr78gqn1g"; depends=[LogicReg siggenes survival]; }; @@ -2153,7 +2156,7 @@ in with self; { twilight = derive2 { name="twilight"; version="1.76.0"; sha256="0xhwykvb9rgsj13ivfjlal4ffhms9sglh9h61h8448r9g58kgibz"; depends=[Biobase]; }; twoddpcr = derive2 { name="twoddpcr"; version="1.24.0"; sha256="0klikcpvpd7dm6ssyv08vd1iv5hhas5a2b7wjkapn2p2j43b214n"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; }; txcutr = derive2 { name="txcutr"; version="1.6.0"; sha256="1xbpyvcs1r7z5h0khl3avz3rnc8422fsyqvfpiwhy45icqwvlpbq"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors]; }; - tximeta = derive2 { name="tximeta"; version="1.18.1"; sha256="02240v41scaqxabjb62zh6shkkzb9520dhn0lfc2jbimnb26yj7f"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix S4Vectors SummarizedExperiment tibble tximport]; }; + tximeta = derive2 { name="tximeta"; version="1.18.3"; sha256="01s8x8a3rb0a5i599pxc5miz84ssvh10b4vha79nmbhkqccffvml"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings ensembldb GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite Matrix S4Vectors SummarizedExperiment tibble tximport]; }; tximport = derive2 { name="tximport"; version="1.28.0"; sha256="0km1vfn4jcp05jk5srrqanjngq6ghh5im6h1c424b926g9s7w7k1"; depends=[]; }; uSORT = derive2 { name="uSORT"; version="1.26.0"; sha256="0mqf481niq5md6ld0mki4iif4vhpnjk57896vaqvjzwjdhnw8n2b"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; uncoverappLib = derive2 { name="uncoverappLib"; version="1.10.0"; sha256="063iblr2mal7wsci52zhd51hpjmxm5jbz08f3i2yxc6z72qi97nd"; depends=[BiocFileCache condformat DT EnsDb_Hsapiens_v75 EnsDb_Hsapiens_v86 GenomicRanges Gviz Homo_sapiens markdown openxlsx org_Hs_eg_db OrganismDbi processx rappdirs rlist Rsamtools S4Vectors shiny shinyBS shinycssloaders shinyjs shinyWidgets stringr TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; @@ -2217,7 +2220,6 @@ in with self; { GRridge = derive2 { name="GRridge"; version="1.22.0"; sha256="0vmwm50dwk3im3qx40vh9ipmfqywzz5fmmm79b74zjcd3qjrznf3"; depends=[glmnet graph Iso mvtnorm penalized survival]; broken = true; }; GeneAccord = derive2 { name="GeneAccord"; version="1.15.0"; sha256="1dlnqdcrl1fv5yf0zwfgkqfd2x19fv6q84p7c730nmnnaqal6md1"; depends=[biomaRt caTools dplyr ggplot2 ggpubr gtools magrittr maxLik RColorBrewer reshape2 tibble]; broken = true; }; GeneAnswers = derive2 { name="GeneAnswers"; version="2.36.0"; sha256="1f8q3hi913khyy1cc3yp2635gaik47alsqmhi0mi24cy340faplz"; depends=[annotate Biobase downloader Heatplus igraph KEGGREST MASS RBGL RColorBrewer RCurl RSQLite XML]; broken = true; }; - GeneGA = derive2 { name="GeneGA"; version="1.48.0"; sha256="136z3sxjps1k63ivr0cmqg7xkvbzf7j69vwkfbc1n00yfapiprm2"; depends=[hash seqinr]; broken = true; }; GenoGAM = derive2 { name="GenoGAM"; version="2.11.0"; sha256="058qix2h0zm2k9csmbdhci2wqih3lyggjj591cqn0ls2nv7bnyvj"; depends=[BiocParallel Biostrings data_table DelayedArray DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges HDF5Array IRanges Matrix Rcpp RcppArmadillo rhdf5 Rsamtools S4Vectors sparseinv SummarizedExperiment]; broken = true; }; IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.31.0"; sha256="1w7zxsvmcrz8cj8g8xa1vqbzfycdhgsclhcjmkqjw1hwz6fp3xgn"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust RColorBrewer Rcpp relimp tkrplot xlsx]; broken = true; }; LowMACA = derive2 { name="LowMACA"; version="1.28.0"; sha256="0j5233xziszwak65rypd9f8lsp25sdr4j5nm5kanj4d4wd0zsdqv"; depends=[BiocParallel Biostrings cBioPortalData data_table gridBase httr LowMACAAnnotation motifStack plyr RColorBrewer reshape2 stringr]; broken = true; }; @@ -2229,7 +2231,6 @@ in with self; { MSstatsTMTPTM = derive2 { name="MSstatsTMTPTM"; version="1.1.2"; sha256="16qnddwhwhjjfr5akdrmp93gkxq2r41s82hb1blbz47lwbj5kaj5"; depends=[dplyr ggplot2 gridExtra MSstatsTMT Rcpp reshape2 stringr]; broken = true; }; MethCP = derive2 { name="MethCP"; version="1.11.0"; sha256="099jaadjfalvxpwq3k630yrqa1dfbp8rqn2fahz1rsha3y5z9bys"; depends=[BiocParallel bsseq DNAcopy DSS GenomeInfoDb GenomicRanges IRanges methylKit S4Vectors]; broken = true; }; NBSplice = derive2 { name="NBSplice"; version="1.15.0"; sha256="0yn7s7igshall34cflmdwvmknv8h1zdi6vg8svvcyn9fvzlgjdm8"; depends=[BiocParallel car edgeR ggplot2 MASS reshape2]; broken = true; }; - NewWave = derive2 { name="NewWave"; version="1.8.0"; sha256="13zwn5qzh9mjhp6d72yndymwbmi4hb7s8qg6ji0nmqp53gj30lc8"; depends=[BiocSingular DelayedArray irlba Matrix SharedObject SingleCellExperiment SummarizedExperiment]; broken = true; }; PSICQUIC = derive2 { name="PSICQUIC"; version="1.34.0"; sha256="0gkkxxbc2a7cin92qwn1masqfigyz9s4fhyy2daa17r3ckk4ccgx"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; broken = true; }; PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.22.0"; sha256="0rhx2jc5kc9bl00v16frh8b4075n0jqn4s37pkvqp3ypcbqws32d"; depends=[igraph jsonlite pcaMethods shiny]; broken = true; }; PoTRA = derive2 { name="PoTRA"; version="1.13.0"; sha256="1a32d1wndb24pxza3h53yddj9z2clff5srny2k00pbbfq1h99mjf"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; broken = true; }; @@ -2245,7 +2246,6 @@ in with self; { SLGI = derive2 { name="SLGI"; version="1.54.0"; sha256="03jwdq4k44rys3f773c6l985a6v1bacbdghw97p0qpwspmzra8rs"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice]; broken = true; }; STAN = derive2 { name="STAN"; version="2.26.2"; sha256="0dd4hb2iabvnr6v0ys4jslj7611z1hii8hxkdvwrjbz4nn678wkv"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; broken = true; }; ScISI = derive2 { name="ScISI"; version="1.65.0"; sha256="0q3bbfsink5d8xslhp129qwvlq5mdzw8zkv9msd0q8qmkclsbiz1"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; broken = true; }; - SharedObject = derive2 { name="SharedObject"; version="1.12.0"; sha256="11rrnm7kjm6z8j4ga88s4cafcdj83pvhnybp7ns5pn7s2ln8044d"; depends=[BH BiocGenerics Rcpp]; broken = true; }; Sushi = derive2 { name="Sushi"; version="1.34.0"; sha256="0adswrbzd93rhy3q56ypwkrk6155vd4zxapvznswyjlxp8ha813q"; depends=[biomaRt zoo]; broken = true; }; SwimR = derive2 { name="SwimR"; version="1.29.0"; sha256="0n58x3i4k3icvhg8z60zlhpszv8bb9pain07nl9rszyvmpi71vg2"; depends=[gplots R2HTML signal]; broken = true; }; TCC = derive2 { name="TCC"; version="1.38.0"; sha256="17kkn8xfkf7g8y51nnzsrgn8v65qlh8a4jysn03phk7pnfrmj7jl"; depends=[baySeq DESeq2 edgeR ROC]; broken = true; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix index 9a20d30f00..1f4caabe42 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/cran-packages.nix @@ -20,7 +20,7 @@ in with self; { ACA = derive2 { name="ACA"; version="1.1"; sha256="1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.4.2"; sha256="00i33b76gqllyc6ywwwrgyjvxfspqb3jf52b9sjaazlfwgn5xyjf"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; ACE_CoCo = derive2 { name="ACE.CoCo"; version="0.1"; sha256="105rb42cwzpbarvdm9zsbicy3xkr3p659bphzgnvcc4lh66rhiay"; depends=[quantreg]; }; - ACEP = derive2 { name="ACEP"; version="0.0.21"; sha256="1c3krdxfpdmpj8z3bwi6gqq621n1hvna593bhcmrzkyv2jkc0k7a"; depends=[httr]; }; + ACEP = derive2 { name="ACEP"; version="0.0.22"; sha256="0n47vchi2kwm1czjfbdbcg1lg17bysw7fcca7j0q0n46c6w8rf49"; depends=[httr]; }; ACEsearch = derive2 { name="ACEsearch"; version="1.0.0"; sha256="1ssq8avj20dk2mal0j5dvshf7qgk0as90sgl71cn91cq8lbiilpn"; depends=[httr testthat]; }; ACEsimFit = derive2 { name="ACEsimFit"; version="0.0.0.9"; sha256="0ifwgpnql14z1qzw8fmllgzl97bwd35f0558ymmcxz1mhgh6cb2v"; depends=[OpenMx]; }; ACEt = derive2 { name="ACEt"; version="1.9.0"; sha256="1071d75sw5bcfw1acjsg6bn81sapb5hkwrxjfrfxlz5r83w6213f"; depends=[BH MASS Rcpp RcppArmadillo]; }; @@ -35,7 +35,6 @@ in with self; { ADER = derive2 { name="ADER"; version="1.4"; sha256="0ada3b0ykbg1pdqj8i3ir5ldzb2prf3bhwm2mpln14h19hxc6i35"; depends=[]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; ADMM = derive2 { name="ADMM"; version="0.3.3"; sha256="04biinzr0x3jkwss00q6zxfnzk62dafc6386z5vfqs4ch0ifh60n"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; - ADMMnet = derive2 { name="ADMMnet"; version="0.1.1"; sha256="1la92fwg75ylqbz00znqd0rhv5r509kgh9wwznjacppif773wp6i"; depends=[Matrix Rcpp RcppEigen]; }; ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; ADMUR = derive2 { name="ADMUR"; version="1.0.3"; sha256="1wv5frav8vjkvsqwng9zddajmb7rdm4iqrikw9cjpqdpk7njl8ph"; depends=[mathjaxr scales zoo]; }; ADP = derive2 { name="ADP"; version="0.1.6"; sha256="1ljm4bri3b96r544x3n37qrfm6krmij8yjfr8n5acllqp6jnf2d5"; depends=[]; }; @@ -52,10 +51,10 @@ in with self; { AFR = derive2 { name="AFR"; version="0.3.4"; sha256="07s32s5vdpg3gxp7ixr4gx0hx66jadiqm2x4mp1f2b2njan2z31h"; depends=[car cli forecast ggplot2 goftest gridExtra lmtest mFilter nlme nortest olsrr regclass rlang tseries writexl xts zoo]; }; AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; - AGHmatrix = derive2 { name="AGHmatrix"; version="2.1.0"; sha256="1cmx1k6lp05prjb50aqhr3gaxg375llcspn97mfskpa8jmbcz321"; depends=[Matrix zoo]; }; + AGHmatrix = derive2 { name="AGHmatrix"; version="2.1.4"; sha256="1ji022h11ijfjicbvc5hgxpf6rfs7mm07nxrjlk7lrl699gi1xh2"; depends=[Matrix zoo]; }; AGPRIS = derive2 { name="AGPRIS"; version="2.0"; sha256="0c6aqrfl0iqpsdk4njzda60a8hcrm2637zwc5cdkrl9p2ayqj00c"; depends=[Matrix matrixcalc maxLik plyr sp spacetime spdep]; }; AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; - AHMbook = derive2 { name="AHMbook"; version="0.2.6"; sha256="055li8mj863icvcrp23wfsg7gf8zmi8zn0hck2yraygazv2xk97k"; depends=[coda fields mvtnorm plotrix raster sp spdep unmarked]; }; + AHMbook = derive2 { name="AHMbook"; version="0.2.9"; sha256="06qc5fkvrjmalr4sxqn0y75fk0pcy68qx41w2d2sz0xjp4j9v9nd"; depends=[coda fields mvtnorm plotrix raster sp spdep unmarked]; }; AHPGaussian = derive2 { name="AHPGaussian"; version="0.1.1"; sha256="12sfh4nn4aj3jdga47dcwzf0qvhydgh56kv5kqmwg0bxw7g5r9z7"; depends=[reshape2]; }; AHPWR = derive2 { name="AHPWR"; version="0.1.0"; sha256="1g7d1vbjxb232fk6wjah73kjm6pj81acls8wqssphgnfiffgrrq6"; depends=[dplyr formattable ggplot2 igraph magrittr readxl tibble tidyr xlsx]; }; AHPhybrid = derive2 { name="AHPhybrid"; version="0.1.0"; sha256="1hf2ba52nim13jwkq857vnmnnb1yhgdz6kipqg3mmqrgz7kg52v1"; depends=[]; }; @@ -63,7 +62,7 @@ in with self; { AHSurv = derive2 { name="AHSurv"; version="0.1.0"; sha256="051q6iamqhhkrq7bfhq40n9svd4wfqyxscgwfnsflqdmbgm6gghs"; depends=[flexsurv rootSolve]; }; AICcPermanova = derive2 { name="AICcPermanova"; version="0.0.2"; sha256="0sq3lnyrja2vpl5wqq517zw32fi96x99gqxj9lh8q3b0napkb0fd"; depends=[broom car data_table doParallel dplyr foreach furrr future stringr tidyr vegan]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.3-2"; sha256="0lzk6xq6pfb7jxk61vlkcl60k4g9vqrdxdq19lc1ihjq13dmx7l9"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; - AID = derive2 { name="AID"; version="2.8"; sha256="10s2q6lcsh6k0b9n89cjwja3cng4wqzcl9grcbpba8xdz2jncn6s"; depends=[ggplot2 MASS meta nortest psych stringr tseries]; }; + AID = derive2 { name="AID"; version="2.9"; sha256="0s7020vh93rnyhcfsmsn1swffrbg1fx3pqq2bd043m4b90yrlzpc"; depends=[ggplot2 MASS meta nortest psych stringr tseries]; }; AIPW = derive2 { name="AIPW"; version="0.6.3.2"; sha256="1iqq665qigw9dmc62x2dz1nvrk8s65ph0a3k2p7mkznr9frshhi2"; depends=[future_apply ggplot2 progressr R6 Rsolnp SuperLearner]; }; ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; }; ALEPlot = derive2 { name="ALEPlot"; version="1.1"; sha256="0bakl8a7xda7vh9zsc66kkd5w5jmb5j28kfwpfq2ifvk2mrakr3w"; depends=[yaImpute]; }; @@ -78,43 +77,41 @@ in with self; { AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="1.0.0"; sha256="1vgncc61gmqhax2a7072jb36bzkycv80xqihkr5qs8jxnqqkndxd"; depends=[]; }; AMIM = derive2 { name="AMIM"; version="1.0.0"; sha256="1gpfsayic0hw2rwswxw7cwa0v47l1v7l4qhckbrwyq3dcxgl2rnv"; depends=[data_table]; }; AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; - AMPLE = derive2 { name="AMPLE"; version="1.0.1"; sha256="1bi39liky0lmv56rxcrf4m9vc3s4xi1z2wcigfkpvsap4gy67qph"; depends=[ggplot2 markdown R6 RColorBrewer scales shiny shinyjs shinyscreenshot]; }; - AMR = derive2 { name="AMR"; version="2.1.0"; sha256="0iwwgb55saw1irk8ln1zl44cm30dnwvl6y5vqx9kxyr346gacbf4"; depends=[]; }; + AMPLE = derive2 { name="AMPLE"; version="1.0.2"; sha256="019r60rcx3biyicmyc4i1806d31i2hp107ba2l0mgh08fx3lfwhj"; depends=[ggplot2 markdown R6 RColorBrewer scales shiny shinyjs shinyscreenshot]; }; + AMR = derive2 { name="AMR"; version="2.1.1"; sha256="0dgql8s7jzk3cmjnvn09rsymz1zwzk2983rvcccl5z00x9d7yg7k"; depends=[]; }; ANN2 = derive2 { name="ANN2"; version="2.3.4"; sha256="1izljhz3rkzq05dkvg9q3fdyj7q871j8lsky67d5r8ffpzm1lk3z"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVAIREVA = derive2 { name="ANOVAIREVA"; version="0.1.0"; sha256="04z2g79nnh5yhn4aqw0i7ck2b1z5dbasf1zp1sj6rjjrp9aqmaa6"; depends=[car dplyr ggplot2 plotly rmarkdown shiny]; }; ANOVAShiny = derive2 { name="ANOVAShiny"; version="0.1.0"; sha256="1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; }; ANOVAShiny2 = derive2 { name="ANOVAShiny2"; version="0.1.0"; sha256="0bnxfg5c37wi5g53jd0zqq31yx29zvlk2m2jh6jlwki8khpp9y00"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; }; - ANTs = derive2 { name="ANTs"; version="0.0.16"; sha256="1bvbr9m5fbq3x5mfn4xhfm2x7a8zs616cf02gzv65r8k9q2348ll"; depends=[gtools Kendall lme4 Rcpp RcppArmadillo RcppEigen rstudioapi]; }; AOV1R = derive2 { name="AOV1R"; version="0.1.0"; sha256="0dv7k0mifybkarpwqyla5j6cvw9dcch09wvdq09ra9bsf4vyk652"; depends=[cellranger data_table lazyeval purrr]; }; APCI = derive2 { name="APCI"; version="1.0.6"; sha256="0lfbx067vqh2yn15jmiicva8h38k0vgdr3s6m2jgswfbp11a8pjh"; depends=[data_table dplyr gee ggplot2 ggpubr magrittr stringr survey]; }; + APCalign = derive2 { name="APCalign"; version="0.1.2"; sha256="0r1zn629dcaa2fwnh0a26yjgamnz9agsy39frzv1lc3yw5r44m66"; depends=[arrow contentid crayon dplyr forcats gh purrr readr stringi stringr tibble]; }; APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; APCtools = derive2 { name="APCtools"; version="1.0.4"; sha256="0xp90p7q3a33cqsyh6n2gcsfnq9gchm5vcl13s72gqyfx4jjcnv7"; depends=[checkmate colorspace dplyr ggplot2 ggpubr knitr mgcv scales stringr tidyr]; }; APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; }; - APIS = derive2 { name="APIS"; version="2.0.1"; sha256="1p3r8p5d32f8im8b851fs8hr54byw4yaggg4n08vrczpanlb29j7"; depends=[cowplot data_table doParallel dplyr DT foreach ggplot2 gridExtra htmltools plotly rlang shiny shinyBS shinythemes]; }; + APIS = derive2 { name="APIS"; version="2.0.2"; sha256="1rqj15h6cyqhs7p3b4xa16jykxhv6ms37xi0b03wldmg9f02h8la"; depends=[cowplot data_table doParallel dplyr DT foreach ggplot2 gridExtra htmltools plotly rlang shiny shinyBS shinythemes]; }; APML0 = derive2 { name="APML0"; version="0.10"; sha256="1l6mw1mqb7qnsvfv9w6yydqjsrwrsrqx3bpifyp43cf2q71yx5gp"; depends=[Matrix Rcpp RcppEigen]; }; APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; }; - APfun = derive2 { name="APfun"; version="0.1.6"; sha256="0j54pcjzr5f8xhvp41vrl0i1hchphnij6p87j16rawp21apvnxyd"; depends=[maptools raster rgdal sp withr]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; AQEval = derive2 { name="AQEval"; version="0.5.2"; sha256="0iac6bcrbhiaxz05vmfmb99g1060r36z1qh3imbwri7m16v0gx59"; depends=[dplyr ggplot2 ggtext loa lubridate mgcv openair purrr segmented strucchange tidyr]; }; - AQLSchemes = derive2 { name="AQLSchemes"; version="1.7-1"; sha256="10j8qh7m975666ipgdvzrjiraqqb5rn8qj4w76s3ijl83y0v5j3v"; depends=[]; }; + AQLSchemes = derive2 { name="AQLSchemes"; version="1.7-2"; sha256="1lnx2d1lwjzg6wc0kxdkh1lj00057iyvynl6m8nmmg7p8vz4r5jh"; depends=[]; }; AQuadtree = derive2 { name="AQuadtree"; version="1.0.4"; sha256="0i1qp1xr51l3gfvgnyyka06g4khj62hzxxkbsnlkv235i2bwnpzd"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; - ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; + ARCensReg = derive2 { name="ARCensReg"; version="3.0.1"; sha256="0qrzxa93cj1ql4iw93ksk58ycfgmncry7q29axhydwh9hsh3lyms"; depends=[ggplot2 gridExtra matrixcalc msm mvtnorm numDeriv qqplotr Rcpp RcppArmadillo Rdpack tmvtnorm]; }; ARCokrig = derive2 { name="ARCokrig"; version="0.1.2"; sha256="0pk0y0gsw681py0vwizxvh1jqjnapzqfr0mbdpli1sray55xbjr2"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo RcppEigen]; }; - ARDL = derive2 { name="ARDL"; version="0.2.3"; sha256="13w2dqfn2j186n7ycya7vn8vj3pay242m4gbcg7vjv0x8rm78jlk"; depends=[aod dplyr dynlm ggplot2 gridExtra lmtest msm stringr zoo]; }; + ARDL = derive2 { name="ARDL"; version="0.2.4"; sha256="02yimcsbw8fgv0qslxp3f38k6wzaxwmp0f8f0k0nxx5bnlkc9c4c"; depends=[aod dplyr dynlm ggplot2 gridExtra lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIMAANN = derive2 { name="ARIMAANN"; version="0.1.0"; sha256="0n4n9srl56s6pxjib43ksb9rahmsb509sfvpjk4py8m4r01ab2m2"; depends=[forecast tseries]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; AROC = derive2 { name="AROC"; version="1.0-4"; sha256="0wwv63mlh8pl5pzaih57l2qy70fz2wpfyxns1lyp95sxhq7ddwza"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat_geom]; }; - ARPALData = derive2 { name="ARPALData"; version="1.3.1"; sha256="12bb5ghgwxvimh1frcq9cz6id15pj7zxz8mllwbda734c9y95x6g"; depends=[aweek data_table doParallel dplyr eurostat ggplot2 lubridate magrittr moments mondate purrr readr rlang RSocrata sf stringi stringr tibble tidyr tidyselect tm]; }; - ARPobservation = derive2 { name="ARPobservation"; version="1.2.1"; sha256="1gpq5wl3mwp4hi49h1g6nnizzpnfc19pv8chdyhv8y5sraq1k2ag"; depends=[]; }; + ARPALData = derive2 { name="ARPALData"; version="1.5.0"; sha256="0vkrh31dki4ff4yfi5d4ywgs07gpga24dby516ydg6hryxrbzsq7"; depends=[archive aweek curl dplyr eurostat future future_apply ggplot2 lubridate magrittr purrr readr rlang sf stringr tibble tidyr tidyselect tm]; }; + ARPobservation = derive2 { name="ARPobservation"; version="1.2.2"; sha256="13qxw12i7nkbqxbya1ky1bdcq7f59hpgw0kfqkg4rqs6ll4fxp7a"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTofR = derive2 { name="ARTofR"; version="0.4.1"; sha256="1dw9aascnqr5cbk8a862rlma94b39ndgkrhf826qf4k58y92nf5q"; depends=[bannerCommenter clipr rstudioapi shiny]; }; ARTool = derive2 { name="ARTool"; version="0.11.1"; sha256="16awxcncyhry0ygk8gdvlff787837rr8qsyg1pxd11w4v1llrqrf"; depends=[car dplyr emmeans lme4 magrittr plyr]; }; ARpLMEC = derive2 { name="ARpLMEC"; version="2.4.1"; sha256="1d6gvgbnj19dislzjlxn7i0iq7h56zz7hm9x5l865ji790b9smqw"; depends=[expm LaplacesDemon MASS mnormt numDeriv relliptical TruncatedNormal]; }; ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.3.1"; sha256="089c4vm629rni0dfgg3r2a9s9yisdx1qs2dwssg44qw1w4hf1f50"; depends=[sp]; }; - ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; }; ASMap = derive2 { name="ASMap"; version="1.0-6"; sha256="0l48frd7qik70zw4qrs0kw9rz4gqb9lr1sa8kxzhfbsxjkildrxl"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASRgenomics = derive2 { name="ASRgenomics"; version="1.1.3"; sha256="1yl3q1fjfyl0v0wpbgnbh8zj5j8zi1imf19cj66fdvji3i4c4lsi"; depends=[AGHmatrix cowplot crayon data_table ellipse factoextra ggplot2 Matrix scattermore superheat]; }; ASSA = derive2 { name="ASSA"; version="2.0"; sha256="10r5406g6i0959k1zm5h9cbwqmnyf7zy80ahiqsyrapm3g5rphxg"; depends=[]; }; @@ -122,14 +119,13 @@ in with self; { AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; }; ASV = derive2 { name="ASV"; version="1.1.1"; sha256="1cwsfc5mylivg65mb93d0v8kalirq5vwjx78fjyylsdc4w33gzqb"; depends=[freqdom Rcpp RcppArmadillo RcppProgress]; }; ATAforecasting = derive2 { name="ATAforecasting"; version="0.0.60"; sha256="0q21dg4p9xw28r3q0ayf2bvwwyccilw93849x4c7k82xpyfnwvpb"; depends=[forecast Rcpp RcppArmadillo Rdpack seasonal stlplus stR timeSeries TSA tseries xts]; }; - ATNr = derive2 { name="ATNr"; version="1.0.2"; sha256="0p6pya91aklylig80xca68n5xx0ngzn8p0ba8sfrznqj53g8x4r5"; depends=[deSolve Rcpp RcppArmadillo]; }; + ATNr = derive2 { name="ATNr"; version="1.1.0"; sha256="1wlzw5565hprlphjp3jrgyhmgqdbrzwka4m1ac7rhxdgljdfh2j5"; depends=[deSolve R_rsp Rcpp RcppArmadillo]; }; ATR = derive2 { name="ATR"; version="0.1-1"; sha256="0via7zm3byzbdgrfw351fqvx0g5cj2z31bqfwh7kr99nqgjh0dyn"; depends=[partykit]; }; ATbounds = derive2 { name="ATbounds"; version="0.1.0"; sha256="007gc9yjxwlhkb0mibxaa394xdiilfm8z6jbbqdn6wl986p07pg3"; depends=[mgcv]; }; AUC = derive2 { name="AUC"; version="0.3.2"; sha256="07xf47kypqbsg2mixmq6mnh4s89aqan9bgl6kfv6lbx8ajv2asw3"; depends=[]; }; AUtests = derive2 { name="AUtests"; version="0.99"; sha256="0ima350mjlqvij6f9xy6wfcibvlji7nh0prpqngj7apn82ri4m2k"; depends=[logistf]; }; AWR = derive2 { name="AWR"; version="1.11.189-1"; sha256="1imvpmq6br0z7l67w66a5s1ylbv6xvypj0wc09bmjy7sapdmkn4x"; depends=[rJava]; }; - AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; - AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; + AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.6"; sha256="0ak2ry5zj6gb9g6laabv0ym3i1vqdwl56g6k58fkpjb87rlb2hbp"; depends=[AWR jsonlite logger rJava]; }; AZIAD = derive2 { name="AZIAD"; version="0.0.2"; sha256="0w5s367zkf857hzs1lczjgnd8ydnam8k5fwf155drxxdr5c3gm2z"; depends=[corpcor doParallel dplyr EnvStats extraDistr foreach lqmm matrixcalc MixAll QRM rmutil rootSolve]; }; AalenJohansen = derive2 { name="AalenJohansen"; version="1.0"; sha256="0w7fj7l2pyz2y1dywpkdxb9qc4v89d57l4ddnjraxsfppk5ga3i4"; depends=[]; }; Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; }; @@ -142,7 +138,7 @@ in with self; { ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; }; ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.2.0"; sha256="0xnplgwxd197a4d422bsxg753q158i12ils16awd1cw30wafdxkk"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; - ActivePathways = derive2 { name="ActivePathways"; version="1.1.1"; sha256="1crq164vyqhdq5y3q09k3m5zljqrhcd5ak0jrc0xqvzf0pasml2m"; depends=[data_table ggplot2]; }; + ActivePathways = derive2 { name="ActivePathways"; version="2.0.2"; sha256="1h0ih87pf6b5mdhmh65frv3nqx7v5adqv37wn2p3gkpszd6hwc79"; depends=[data_table ggplot2]; }; ActivityIndex = derive2 { name="ActivityIndex"; version="0.3.7"; sha256="1zj2b6x31a1kxl80rarmkrlm7ack4154mrkbqs3fpi48zpmjbgd5"; depends=[data_table matrixStats R_utils]; }; ActuarialM = derive2 { name="ActuarialM"; version="0.1.0"; sha256="1545jmbbisw5fxk07xl86jw7sw4kysa2crjm57mq2qk4qg9hh5rb"; depends=[]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; @@ -161,27 +157,25 @@ in with self; { AeroSampleR = derive2 { name="AeroSampleR"; version="0.2.0"; sha256="0prdw8yjdrcyc8msk2a8ia5cjd4gm88isg8dqp9yj2aqbfz6pin7"; depends=[dplyr flextable ggplot2 ggthemes purrr stringr tidyr tidyselect]; }; AggregateR = derive2 { name="AggregateR"; version="0.1.1"; sha256="1s2q888bqx6ilisv5s4g8ryja97nz6cz4ycm4sw1i63l5wjrwljc"; depends=[data_table NCmisc tibble]; }; AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; }; - AgroR = derive2 { name="AgroR"; version="1.3.4"; sha256="1701n85db3id2li67qjnz4rxhcqpaqdk3098ia1vf3x5jgsfqjn3"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel gridExtra gtools knitr lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; + AgroR = derive2 { name="AgroR"; version="1.3.5"; sha256="05b7jwah898r4g0mvyf0qlwmv5rx48pj87agf257nqz3hwmvkip5"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel gridExtra gtools knitr lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; AgroReg = derive2 { name="AgroReg"; version="1.2.9"; sha256="16w1ayzr95w8frca3c3mnqdwgja2r54a1ywkynw9x29cdv47icnx"; depends=[boot broom dplyr drc egg ggplot2 minpack_lm purrr rcompanion]; }; AgroTech = derive2 { name="AgroTech"; version="1.0.2"; sha256="0pfw0sps9fbzzyy4d803j9fbg6a23nj18rks0bnrj9hms7a3vwfs"; depends=[crayon ggplot2 ggrepel gridExtra lmtest nortest readxl xlsx]; }; AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.2"; sha256="0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq"; depends=[Rcpp]; }; - AirMonitor = derive2 { name="AirMonitor"; version="0.3.11"; sha256="0wvgn5rq0qzzf58jga0y44b90hcp4adp9g3i5k7n15cnmq3llmhf"; depends=[dplyr dygraphs leaflet lubridate magrittr MazamaCoreUtils MazamaRollUtils MazamaTimeSeries readr rlang stringr tidyselect xts]; }; + AirMonitor = derive2 { name="AirMonitor"; version="0.3.12"; sha256="15ai03z3h44llwzynvbs0kxd5ik11hfacxgn2wzj8fbaihy332pr"; depends=[dplyr dygraphs leaflet lubridate magrittr MazamaCoreUtils MazamaRollUtils MazamaTimeSeries readr rlang stringr tidyselect xts]; }; Ake = derive2 { name="Ake"; version="1.0.1"; sha256="0mdpx1dnk57yr0mpf9hqqdjx96j0sqdjdy964qvwmqbycvxxnp3z"; depends=[]; }; AlgDesign = derive2 { name="AlgDesign"; version="1.2.1"; sha256="01cx63wqr6yvgl5ml1lj6gh9p1sn42b6qcnsppcw7mvba9n652ar"; depends=[]; }; AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; }; - AllMetrics = derive2 { name="AllMetrics"; version="0.1.1"; sha256="1cxnw5af2wxghndsmgmpcpsdy7v38fwkidn3aiag9kp3ys99g62z"; depends=[]; }; + AllMetrics = derive2 { name="AllMetrics"; version="0.2.0"; sha256="1sx58yqdmwnnzi9y0jirnxmddxqffglnqz7n276sl0sgps79j7yj"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; - AlleleShift = derive2 { name="AlleleShift"; version="1.1"; sha256="1cmmxwp3qq28hln6k9hfv61b53nwx08iidhcxj8bdwv7msyp9f8k"; depends=[adegenet BiodiversityR vegan]; }; - AllelicSeries = derive2 { name="AllelicSeries"; version="0.0.3.0"; sha256="1wh9nkq67n7ldipf7wl43j1w8w42izlimx3baxh1a3a07mahf2pz"; depends=[Rcpp RcppArmadillo RNOmni SKAT]; }; + AllelicSeries = derive2 { name="AllelicSeries"; version="0.0.4.1"; sha256="1i9p2hzi61mvl5gxcs7rlavcl70pvjscnqjlxms35n4ziq3hzrk0"; depends=[Rcpp RcppArmadillo RNOmni SKAT]; }; Allspice = derive2 { name="Allspice"; version="1.0.7"; sha256="1a5wxs2fbpfk3032h70z86zzrzjjkp00c06dh7g2jmqc5irp6n2a"; depends=[]; }; - AlphaHull3D = derive2 { name="AlphaHull3D"; version="2.0.0"; sha256="1jp4m2yd9z8m4gz5hfa08qm02kalrzy6pbjf3rfcb0xjglk1lngr"; depends=[BH Rcpp RcppCGAL RcppEigen rgl Rvcg]; }; AlphaPart = derive2 { name="AlphaPart"; version="0.9.8"; sha256="1ih76v3kgnladqq3nvlqrz5sqkg1j97m778kchz6k05cjxhj8l4q"; depends=[directlabels dplyr ggplot2 magrittr pedigree Rcpp reshape tibble]; }; AlphaSimR = derive2 { name="AlphaSimR"; version="1.4.2"; sha256="0qbb5wdwprjr21nh1khnzaspvg96hqynh277gjkryrwpc8nak16s"; depends=[BH R6 Rcpp RcppArmadillo Rdpack]; }; AlteredPQR = derive2 { name="AlteredPQR"; version="0.1.0"; sha256="15zszn49c2a3lad2fzfj2yblyafbrhn6j3j1dcjbcz0fxgf6cmhw"; depends=[]; }; Amelia = derive2 { name="Amelia"; version="1.8.1"; sha256="1r27zjlr8ld932lr6dn79cravss17gry6p0mxgdlbj6g58mfc30j"; depends=[foreign Rcpp RcppArmadillo rlang]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; AmesHousing = derive2 { name="AmesHousing"; version="0.0.4"; sha256="080r0fkmqsdrjgwbmdzacnkmd8py611z54i6r7nzj14r295d5qhk"; depends=[dplyr magrittr]; }; - AmigaFFH = derive2 { name="AmigaFFH"; version="0.4.1"; sha256="1iv89nqlqc5lrnz9r56ajgmb54pkk1zafihh1m0528i0hg4l7qxm"; depends=[tuneR vctrs]; }; + AmigaFFH = derive2 { name="AmigaFFH"; version="0.4.3"; sha256="0if2dzmpf9xyqabi7calfkzj1vfv7hafczbhswdz03zbl5zi9zba"; depends=[tuneR vctrs]; }; AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; }; AmoudSurv = derive2 { name="AmoudSurv"; version="0.1.0"; sha256="1i5j34wscvqn37lm86dh9fnyn4j6b34rxyb2q6kpn3csyk53x5r9"; depends=[AHSurv flexsurv pracma]; }; AmpGram = derive2 { name="AmpGram"; version="1.0"; sha256="1j5zx6n8cyzh6dnv96234zmlfj90fs9w4vm32xw8iqgvpcviqyz6"; depends=[biogram devtools pbapply ranger shiny stringi]; }; @@ -228,6 +222,7 @@ in with self; { AsyK = derive2 { name="AsyK"; version="1.5.5"; sha256="0mr09gfxq2xsdrh7h28fkczhs44m367gf7zj09kc5lc5zwd9fs83"; depends=[DELTD]; }; AsymmetricSORDs = derive2 { name="AsymmetricSORDs"; version="1.0.0"; sha256="0a6ika2vlnklbsr7lmihysbhzzc5za2aw77iw6pc19cw6mba6mpy"; depends=[]; }; AsynchLong = derive2 { name="AsynchLong"; version="2.2"; sha256="0b6bx6r8cw0n7r9ynaadh3mdqyjlqizvklsb43af27iqqapl272d"; depends=[]; }; + AteMeVs = derive2 { name="AteMeVs"; version="0.1.0"; sha256="0k0kgaq20nygr8l2fq1wq94cfi8f0kxbnzk264d0q4k43mq688yj"; depends=[MASS ncvreg]; }; AtlasMaker = derive2 { name="AtlasMaker"; version="0.1.0"; sha256="0p7n73yc4044c4hlnjf4wzhg9zvpwlv6wqw1ams0zb2qw9fcc0fy"; depends=[leaflet shiny]; }; AtmChile = derive2 { name="AtmChile"; version="1.0.1"; sha256="0r8js8racs93vxbq62b44qj9m1vsp24dv81bmsg0a3smpk67zd46"; depends=[data_table DT lubridate openair plotly shiny shinycssloaders]; }; AugmenterR = derive2 { name="AugmenterR"; version="0.1.0"; sha256="0hi501p8ksaqzc9dq16dbmkz50kakgw3k0awdkbpci5can2sqvfl"; depends=[]; }; @@ -238,6 +233,7 @@ in with self; { AutoPipe = derive2 { name="AutoPipe"; version="0.1.6"; sha256="0bzllh92fgsmz79lh6m2f10vsx5qng4l7bwbwkp2kzwnncy7cq63"; depends=[annotate cluster clusterProfiler ConsensusClusterPlus fgsea msigdbr org_Hs_eg_db pamr RColorBrewer Rtsne siggenes]; }; AutoScore = derive2 { name="AutoScore"; version="1.0.0"; sha256="14wn566xm308zir12rckwc5fagm2x1mrphy0a7iri0cbrffgnkz4"; depends=[car coxed dplyr ggplot2 Hmisc knitr magrittr ordinal plotly pROC randomForest randomForestSRC rlang survAUC survival survminer tableone tidyr]; }; AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; }; + AutoTransQF = derive2 { name="AutoTransQF"; version="0.1.3"; sha256="1kqdzz719r2bp37b6fn21njgbiyn7rrpms7jcjl8i0znwxkspd82"; depends=[matlab2r moments VGAM]; }; AutoWeatherIndices = derive2 { name="AutoWeatherIndices"; version="0.1.0"; sha256="08f2c026vn5kmsdlf54sxakzjp2f43dkrs6mv9qwnjfrd2hchzzi"; depends=[gtools Hmisc]; }; Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; }; AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; @@ -248,19 +244,19 @@ in with self; { AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.1"; sha256="1mn3qw5g77x24qyhybhn1p3h4s9ymdafrj35i24f32ncr5abnd2f"; depends=[AzureAuth AzureRMR httr jsonlite]; }; AzureContainers = derive2 { name="AzureContainers"; version="1.3.2"; sha256="0lykvf4kk1q7b7ln4l8jlrxgqyvrg1cfnap4ak8zkhxmrgzqpc5f"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; AzureCosmosR = derive2 { name="AzureCosmosR"; version="1.0.0"; sha256="07bpmjxfyzk1aq8r06biiqsn2ibv7ymgqccxfxkbvszpfq79nryj"; depends=[AzureRMR curl httr jsonlite openssl uuid vctrs]; }; - AzureGraph = derive2 { name="AzureGraph"; version="1.3.2"; sha256="19wppl05w98s711jgkxxia5dckc8k6xr5zzs52dcvnh67r4cbjq7"; depends=[AzureAuth curl httr jsonlite openssl R6]; }; + AzureGraph = derive2 { name="AzureGraph"; version="1.3.4"; sha256="0x7ya1yxk0cga9cfbfkd332l2syswdqjamzr2xqvb6ybwc5lpcy2"; depends=[AzureAuth curl httr jsonlite openssl R6]; }; AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.5"; sha256="15x0mkgn7pq2yk05l5vwvd744gxkz28nb5azc1yz502ayr1s6hnm"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; - AzureKusto = derive2 { name="AzureKusto"; version="1.1.2"; sha256="16jfw2zv2a807d91b9vv895p2j4ydqmjvgxih8r9xprnj3w4absh"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyr tidyselect]; }; + AzureKusto = derive2 { name="AzureKusto"; version="1.1.3"; sha256="0n0bkaj9gsg2xcczpbg8nm62ipgh4s6a8lvnaiylh8q3w1z6aqfl"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyr tidyselect]; }; AzureQstor = derive2 { name="AzureQstor"; version="1.0.1"; sha256="1z7j8kakiarpw3q2rii7gl9zc2nsb49nzs1nxg1hgfyvcdhw2fcg"; depends=[AzureRMR AzureStor httr openssl]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.4.3"; sha256="076hgxx2d6jf24fhysxk3mnp22ns8i6cqp3mzd64rafl1clqy3l1"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.4.4"; sha256="09mjc5ibk1g1azskqnrcgfb5bi88aw55g96cyas5vlwgi54xzs70"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; AzureStor = derive2 { name="AzureStor"; version="3.7.0"; sha256="0jrc4m8p0hss07hna157z510rh84lhjmyqsa47wirpr0b5ba6kr3"; depends=[AzureRMR httr mime openssl R6 vctrs xml2]; }; AzureTableStor = derive2 { name="AzureTableStor"; version="1.0.0"; sha256="0xrfpi9psn1h21g4mvcbqsjav56s8cha381vsjkp1swilrxhmk5l"; depends=[AzureRMR AzureStor httr jsonlite openssl uuid vctrs]; }; AzureVM = derive2 { name="AzureVM"; version="2.2.2"; sha256="0766a4y17qgq3vgb398n6zn8sdjrv65gpvrnr9b9g89zdsdy9fc4"; depends=[AzureRMR jsonlite R6]; }; AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.1"; sha256="15ghijzva6qzq2riq8ci4bh6ssknnp15yyy1fql0k4878wkf7vs0"; depends=[httr openssl]; }; AzureVision = derive2 { name="AzureVision"; version="1.0.2"; sha256="0a4lnj60577bxy5vyd7yqji984kgwpwd4zykxz2d060r8l31rf42"; depends=[AzureCognitive AzureRMR httr]; }; - BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; + BACCO = derive2 { name="BACCO"; version="2.1-0"; sha256="1xqhb91pj6gcbr2afbq8jqkilhvy12qqq74zhv9c05i7dxl3b7ak"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; - BACprior = derive2 { name="BACprior"; version="2.1"; sha256="0kdbz4fv5k77q5c05inqaqyxj0lpljh8yiyzh0hjm0wd0wif9rih"; depends=[boot leaps mvtnorm]; }; + BACprior = derive2 { name="BACprior"; version="2.1.1"; sha256="1z5wxkik8ziqsgiq6arxsp772scz9jfsa1kz9wz07gpfvv1pl53z"; depends=[boot leaps mvtnorm]; }; BAGofT = derive2 { name="BAGofT"; version="1.0.0"; sha256="0lvjygnphb2d5cammmswlnyn77vmy3k46r8hh8f3mfr7i68gcdvz"; depends=[dcov randomForest]; }; BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; }; BAMBI = derive2 { name="BAMBI"; version="2.3.5"; sha256="16pb04n30y8sl6m6qgrdxk7sck98233cravpbzw4fzl2j8h0mm3r"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm numDeriv qrng RColorBrewer Rcpp RcppArmadillo scales]; }; @@ -271,10 +267,10 @@ in with self; { BAS = derive2 { name="BAS"; version="1.6.4"; sha256="1w7y3cp6j1pak2wq6wf9wffas0yvsz716qbva2bx9nln72gr05z5"; depends=[]; }; BASS = derive2 { name="BASS"; version="1.3.1"; sha256="00py6s7b9lv8lsycpa79gbwrlbghgsffd2avggb77gxpl0g8vfz0"; depends=[hypergeo truncdist]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.5"; sha256="09g2h38kz1g9kkjc69si5d6z6fkayys9hinjs3p6dn7sx7zn2bx1"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BASiNETEntropy = derive2 { name="BASiNETEntropy"; version="0.99.5"; sha256="06nshxxcj9nqdvdhr9lb55p2hsnbcdcqhnp0r9hs8yp3d1h7cv08"; depends=[Biostrings igraph randomForest]; }; - BAT = derive2 { name="BAT"; version="2.9.3"; sha256="1dhz8n3n79jdvnhyrzzqvnyd0d1lyhy71wjncxv0q2b3l00164xm"; depends=[ape geometry hypervolume MASS nls2 terra vegan]; }; + BASiNETEntropy = derive2 { name="BASiNETEntropy"; version="0.99.6"; sha256="00lid7crjjcrfkfqdnkk7i5zlp17wvnirbgb3xb5s8wlc5cyhxyq"; depends=[Biostrings igraph randomForest]; }; + BAT = derive2 { name="BAT"; version="2.9.4"; sha256="0jrid2bmwplnam70y9vgm7dn32bvi80r81c5zrmpsmq4ywj7yfrf"; depends=[ape geometry hypervolume MASS nls2 phytools terra vegan]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-10"; sha256="1yn79nkwi33d6qsiklay3ngk26dvi44lap59zp545gidvn9fbir6"; depends=[coda mvtnorm]; }; - BAwiR = derive2 { name="BAwiR"; version="1.2.7"; sha256="1vvym7bbfbi1x91962nfcqql0fiyv4svdk5329rq43nnh188i456"; depends=[Anthropometry dplyr ggplot2 ggthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; + BAwiR = derive2 { name="BAwiR"; version="1.3"; sha256="1avqylrvsshhmvf4fd612949ymyx2i7m7k6w29pcnrawai1qw54c"; depends=[Anthropometry dplyr ggplot2 ggthemes httr lubridate magrittr plyr purrr readr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-8"; sha256="0j3ykxsmxima75h40mhqm32l2ffc27pk11rfzjyvv1cm6q2q3gbh"; depends=[aws DEoptim ggplot2 reshape2 shiny]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; @@ -285,16 +281,15 @@ in with self; { BCBCSF = derive2 { name="BCBCSF"; version="1.0-1"; sha256="0hvhnra68i0x78n57nlbxmz0qwl2flng9w47089jw6f9hzkq9r7n"; depends=[abind]; }; BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; }; BCClong = derive2 { name="BCClong"; version="1.0.1"; sha256="1dsiwrz1r0wab0pif33b7ds5d6v89fapb0w9safz45qmxkafs2z6"; depends=[cluster coda ggplot2 label_switching LaplacesDemon lme4 MASS mclust MCMCpack mixAK mvtnorm nnet Rcpp RcppArmadillo Rmpfr truncdist]; }; - BCDAG = derive2 { name="BCDAG"; version="1.0.0"; sha256="1a4ylby1hm2pfdf22qvw1qpgs742y77kpvmymikx8pc1vnhmwjih"; depends=[gRbase lattice mvtnorm]; }; BCDating = derive2 { name="BCDating"; version="0.9.8"; sha256="1px9fimg3fqx8bfkzq6rl34xclc9gcjxqjvj5islpdy4f1ifwph3"; depends=[]; }; BCE = derive2 { name="BCE"; version="2.2.0"; sha256="13banjjk14rrmyd66iayywip9aznfsk8x3yk4pamlw87byf0z3vk"; depends=[FME limSolve Matrix]; }; BCEA = derive2 { name="BCEA"; version="2.4.4"; sha256="0l67gk8myswf476i6r9kf433z7py2mkabmrx94cizi17q2l39wfx"; depends=[cli dplyr ggplot2 gridExtra MASS Matrix MCMCvis purrr Rdpack reshape2 rlang scales]; }; - BCEE = derive2 { name="BCEE"; version="1.3.1"; sha256="0ys7gbxjwk28ajxa4pa7wyfc97dwlmysbvpsza1wrf661hjrdn6z"; depends=[BMA boot leaps Rcpp RcppArmadillo]; }; + BCEE = derive2 { name="BCEE"; version="1.3.2"; sha256="181khl93rsrqjm8cmn14a6bb7s47dp3xc31gm9rk088ixfjadq7h"; depends=[BMA boot leaps Rcpp RcppArmadillo]; }; BCHM = derive2 { name="BCHM"; version="1.00"; sha256="1nyf65grcyf74sixixzl12gylk2rzh7n5id4mbhim4lzdm4j272i"; depends=[cluster coda crayon knitr plyr rjags]; }; BCRA = derive2 { name="BCRA"; version="2.1.2"; sha256="17h0ara1y3fh2xyhjarbw3b549v6kq108bg946ndh7kjykara9dd"; depends=[]; }; BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; BCT = derive2 { name="BCT"; version="1.2"; sha256="0fs6wh59njgj7ybnkf5ki4g8phmzrchvml0f8jyhhxdarkj5vr5d"; depends=[igraph Rcpp stringr]; }; - BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; }; + BCgee = derive2 { name="BCgee"; version="0.1.1"; sha256="09p2523hslfhg0qryfn81cd5mn8nskiv98yw3s0ajfywfnwrb68k"; depends=[]; }; BClustLonG = derive2 { name="BClustLonG"; version="0.1.3"; sha256="1p6fm60vhs9l3b120h2l7nz4rf4ckhka7124kzwjd7znax2a336g"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; BDEsize = derive2 { name="BDEsize"; version="1.6"; sha256="0dyjd5f1cqmzqnrbxz06pbxrk6gjrmsh2x6p7qllczvlmm7jdm5i"; depends=[fpow ggplot2]; }; BDP2 = derive2 { name="BDP2"; version="0.1.3"; sha256="14m85sigx6hk0qzhfgih43m2lxp9xczmp9g3z4pping6msbnbdrz"; depends=[rmarkdown shiny shinyBS]; }; @@ -307,20 +302,19 @@ in with self; { BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.3"; sha256="1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm"; depends=[crochet]; }; BEKKs = derive2 { name="BEKKs"; version="1.4.3"; sha256="039may5c788sdhjgbbcljwn71wpya8d9mcj8zqg3yqm8mxjcgzk0"; depends=[forecast future future_apply GAS ggfortify ggplot2 gridExtra ks lubridate mathjaxr moments numDeriv pbapply Rcpp RcppArmadillo reshape2 xts]; }; BENMMI = derive2 { name="BENMMI"; version="4.3-7"; sha256="1v96g4l1zkpvvx8jdifnafyaz4ml8v1bxbl97r1n5n6mgw88gk77"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; - BEST = derive2 { name="BEST"; version="0.5.4"; sha256="109zl99bz1bndan1pm3hm0f1da86a18lcyzl0741z14l0m0d91a9"; depends=[coda HDInterval rjags]; }; BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; }; BET = derive2 { name="BET"; version="0.5.2"; sha256="0zsbj8agw8x04n2adbdb8k85m51hkyl7hcc8gnlw6gxpng3i2gnm"; depends=[Rcpp]; }; BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; BFF = derive2 { name="BFF"; version="1.0.0"; sha256="1kbji9fh7d0ww5klwvlxgljflidkh2rywgb8xwj5j1j0y21lipfx"; depends=[BSDA]; }; - BFS = derive2 { name="BFS"; version="0.5.1"; sha256="1bms6wj0nwmdgpvi6yhka9405ch67dwkhvvywb1b4h8mq1snw124"; depends=[dplyr httr2 janitor magrittr purrr pxweb rstac rvest tibble tidyRSS xml2]; }; - BFpack = derive2 { name="BFpack"; version="1.0.0"; sha256="1z5j6gd8zv39advb4xmpcbixbg8n516h0gpqkblb8dnb4mbh6d1s"; depends=[bain extraDistr lme4 MASS Matrix mvtnorm pracma]; }; + BFS = derive2 { name="BFS"; version="0.5.5"; sha256="0q4w1r9zf7ki3y4pxxmf40f1rpx9gx55bdysgdq42axbjbij944l"; depends=[curl dplyr fs httr2 janitor magrittr purrr pxweb rstac rvest sf tibble tidyRSS xml2 zip]; }; + BFpack = derive2 { name="BFpack"; version="1.2.3"; sha256="1bji697998qkb56gid8jd6bp9gqwxkls73d8vk55z838r60irlla"; depends=[bain Bergm ergm extraDistr lme4 MASS mvtnorm pracma QRM sandwich]; }; BGData = derive2 { name="BGData"; version="2.4.1"; sha256="1bx63spfmsn9hz3qxhkvipfvyqcdy4afqzcada3bgly265kdg10h"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; }; BGFD = derive2 { name="BGFD"; version="0.1"; sha256="0983v66bjp9v3jp7zbjyffda1gaf20nakqr94c32lvh9wmk0y1s9"; depends=[AdequacyModel]; }; BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; }; - BGGM = derive2 { name="BGGM"; version="2.0.4"; sha256="0676viahmid0n89jhs93ci8l7rxpam7rn75mdbshgx7f1q3wqiih"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; }; BGLR = derive2 { name="BGLR"; version="1.1.0"; sha256="19qy8llmagrsm28nb80d029wkvqpv6r12f390zlhid0y8s5bpicp"; depends=[MASS truncnorm]; }; + BGPhazard = derive2 { name="BGPhazard"; version="2.1.1"; sha256="0i2fsvb9pvvhl4xpp87cacg9934hsi060c6d1z3j5hylwyq2k5h9"; depends=[Brobdingnag dplyr ggplot2 ggthemes gridExtra magrittr progress purrr readr rlang stringr survival tibble tidyr]; }; BGVAR = derive2 { name="BGVAR"; version="2.5.2"; sha256="0nqlzhdg5z8p5c9qiccldi8fy97w9pnna0nrlvl6n9kxm2si2pp0"; depends=[abind bayesm coda GIGrvg knitr MASS Matrix Rcpp RcppArmadillo RcppParallel RcppProgress readxl stochvol xts zoo]; }; - BGmisc = derive2 { name="BGmisc"; version="0.1"; sha256="15xgm3n3hn5zkrvyfcylyz5q3zah0155914a0rck0ipihb45sbbl"; depends=[Matrix]; }; + BGmisc = derive2 { name="BGmisc"; version="1.0.1"; sha256="0r44n75n19x2dwi7ysisl49309pwimq3nz66a0041ibhclf1rzvr"; depends=[igraph kinship2 Matrix]; }; BH = derive2 { name="BH"; version="1.81.0-1"; sha256="0r7zjxpbm2paliplprwf9769a57clqaiskiiadiy10gissnqn77m"; depends=[]; }; BHAI = derive2 { name="BHAI"; version="0.99.2"; sha256="1hawa55mk590is8ziav7fdszsa3a42bqb0znzqsazz5lkg4daaa7"; depends=[MCMCpack plotrix prevtoinc]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; @@ -335,8 +329,10 @@ in with self; { BIGL = derive2 { name="BIGL"; version="1.8.0"; sha256="1wyzancryb8aab18qjb0c1pl780chk0kgk7asa430gnphz7fm8sj"; depends=[data_table ggplot2 MASS minpack_lm nleqslv numDeriv plotly progress robustbase scales]; }; BINCOR = derive2 { name="BINCOR"; version="0.2.0"; sha256="0x2s82jql429shk70bhjdy9kamz8dz5ymsxj6kp8ga1711bpwyq6"; depends=[pracma]; }; BINtools = derive2 { name="BINtools"; version="0.2.0"; sha256="0x97h0b2krdgrd0x266fidj77an3dq8mf9lnbas9112p4mhkmk58"; depends=[BH combinat dplyr mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringi tibble]; }; + BIOMASS = derive2 { name="BIOMASS"; version="2.1.11"; sha256="1qbx7hxzzwnwp00rdvdwqxawm54chn1pcql3009cwdydc249v0dh"; depends=[data_table jsonlite minpack_lm proj4 rappdirs sf terra]; }; BIOdry = derive2 { name="BIOdry"; version="0.9"; sha256="1j6fbrvhiaz04fpybdldjk2prg3n5ayzvxqbx0g0vbna54kd1vz6"; depends=[ecodist nlme]; }; - BISdata = derive2 { name="BISdata"; version="0.2-1"; sha256="0xmm40d9ag2g5j0lsy46ig3plzcqrw2p3iaciimw2y0v4fa8n3gh"; depends=[]; }; + BISdata = derive2 { name="BISdata"; version="0.2-2"; sha256="0w7vn0x275iqsyc1l8p6c8r7v4brm8wnj7lnfb25dc9sfkz6jxx0"; depends=[]; }; + BKTR = derive2 { name="BKTR"; version="0.1.1"; sha256="07qq6jxrwyvid6j54vzvf7a28ryk478kscn3z7dk9ic2y9c5ljj0"; depends=[data_table ggmap ggplot2 R6 R6P torch]; }; BLCOP = derive2 { name="BLCOP"; version="0.3.3"; sha256="08y9vmx3cknjvk6ngfwxlfnc03cqpj97i1ijrs1cw5sahjc0vmhc"; depends=[fBasics fMultivar fPortfolio knitr MASS quadprog rmarkdown RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLOQ = derive2 { name="BLOQ"; version="0.1-1"; sha256="0qs4pnzpfwkii6wpd8my34zw9k003b3is0y0aj1lhcm0qnn1p8h4"; depends=[maxLik mvtnorm]; }; @@ -350,7 +346,6 @@ in with self; { BMAmevt = derive2 { name="BMAmevt"; version="1.0.5"; sha256="19mmrz54n8ai9sfjpb3815p4r2pzy0v18hk020vqkjxakh9zgpab"; depends=[coda]; }; BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; }; BMRMM = derive2 { name="BMRMM"; version="1.0.0"; sha256="1h3cxj996f85pgicwl68da12fmw1knfs42dmbsrv8lr4alc2lnn0"; depends=[fields logOfGamma MCMCpack multicool pracma]; }; - BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.5"; sha256="0mivdvazhmvfg4in56hlw41amf470a20qczdi4if9r1f9kdcji19"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; BMTAR = derive2 { name="BMTAR"; version="0.1.1"; sha256="0c70vkgv2sdci33yrk2n297k105wnlxj1qchskdparkiipf47xsh"; depends=[Brobdingnag doParallel expm ggplot2 ks MASS MCMCpack mvtnorm]; }; @@ -376,8 +371,7 @@ in with self; { BRL = derive2 { name="BRL"; version="0.1.0"; sha256="13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi"; depends=[]; }; BRVM = derive2 { name="BRVM"; version="5.0.0"; sha256="14bbl0b383ilj8zw8qw40gfyi6lpr0vqsb7hajzjycy5l0xnimjb"; depends=[dplyr fBasics formattable goftest gsheet highcharter httr httr2 lubridate magrittr nortest rlang rvest stringr tibble tidyr timeDate tseries xml2 xts]; }; BRugs = derive2 { name="BRugs"; version="0.9-2"; sha256="19gyh6lambhwi7bx7hqa9nqp2xzjryi84npvd9m9mr3bzbv8mgz2"; depends=[coda]; }; - BSBT = derive2 { name="BSBT"; version="1.2.1"; sha256="0ibqg3jr7l25aikz09s8v5w1z541dsw8pr30ixf6d1bly5bw5ahy"; depends=[expm igraph MASS]; }; - BSDA = derive2 { name="BSDA"; version="1.2.1"; sha256="0vcf3h1rkgs0mr6rri2zjkb3c62dmndm281zh4ddz2vyw27wpwg2"; depends=[e1071 lattice]; }; + BSDA = derive2 { name="BSDA"; version="1.2.2"; sha256="0i7jqx2a5nrabzzg27i3ag9w1dmasz2kxdbg5b469jcnnnk7kglb"; depends=[e1071 lattice]; }; BSGW = derive2 { name="BSGW"; version="0.9.4"; sha256="05gr0p9fmj5560s083iss8j4gyh5rk0kdi3qhq5dzr9mfzy0n12q"; depends=[doParallel foreach MfUSampler survival]; }; BSL = derive2 { name="BSL"; version="3.2.5"; sha256="12fksih33a4r6dd8flv7s1hidazhfqcbyvvnppp25rn6jb7p6344"; depends=[coda copula doRNG foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo Rdpack stringr whitening]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.1.0"; sha256="190zmjvw5q5gg47g21n2imclz1qg585cvjxl501mm910gx50rldb"; depends=[coda mvtnorm pbapply pscl spdep]; }; @@ -388,11 +382,11 @@ in with self; { BSSprep = derive2 { name="BSSprep"; version="0.1"; sha256="0dkhx8vx9kg902i6nzkzbighf2szq12l0p8iwinlpb2qdf526lk6"; depends=[Rcpp RcppArmadillo]; }; BSW = derive2 { name="BSW"; version="0.1.1"; sha256="0l6sw8lyk9mxfdw4s72hz6a0b30gi2a2vlcndkgahjlym6i5bz83"; depends=[Matrix matrixStats quadprog]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; - BT = derive2 { name="BT"; version="0.3"; sha256="1fzryjxczc7cny0msjmv4hf52wjgncn6278drrdv2z31a9j4asa0"; depends=[rpart statmod]; }; + BT = derive2 { name="BT"; version="0.4"; sha256="1ifanv79rrbc9m6rxhnhhr5kss9idykpn672w3zxqi8fic9f0hsx"; depends=[rpart statmod]; }; BTLLasso = derive2 { name="BTLLasso"; version="0.1-11"; sha256="1nz90jg74xzcwjxi9ppp7a78bg4976h2cmvlz140ss5403pnfbsk"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; BTM = derive2 { name="BTM"; version="0.3.7"; sha256="0lal2fr2lpaky03hrc1gb15kky3s5sr9rbkmrp3v9g2iksd7b5yb"; depends=[Rcpp]; }; BTSPAS = derive2 { name="BTSPAS"; version="2021.11.2"; sha256="1as1r050qabbm9k19lbcdkyjsblc7f6hd3x7dy38rc6rxzp2iilj"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2 scales]; }; - BTSR = derive2 { name="BTSR"; version="0.1.4"; sha256="05adkp73d02nv1agafsfag1dsd0c82pwxl0zqc7zyx0dhrxc9dlh"; depends=[]; }; + BTSR = derive2 { name="BTSR"; version="0.1.5"; sha256="0kqgy61ijalpclrm20xwjbvbb5pkhkbgsbdbsz0mrb4v30a05dh4"; depends=[]; }; BTYD = derive2 { name="BTYD"; version="2.4.3"; sha256="1szkpcmagpig32vbs7klx71avjlmbd0cn123ljpc3i02b55lma7z"; depends=[dplyr hypergeo Matrix optimx]; }; BTYDplus = derive2 { name="BTYDplus"; version="1.2.0"; sha256="1shai7kij20g3isd6l29i696pkzymr0qq2i9gzfsxmvdb4g4pcm2"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; }; @@ -401,7 +395,7 @@ in with self; { BVARverse = derive2 { name="BVARverse"; version="0.0.1"; sha256="00nghvd5bavmn5hw89pcz20x5kbpxr707r5yvvsakn77rdis37ig"; depends=[BVAR generics ggplot2 rlang tidyr]; }; BVSNLP = derive2 { name="BVSNLP"; version="1.1.9"; sha256="1k2sr9wq0q7lq2hmgp75hzxy6v688lw5npwvpma88975yqi6ghiw"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWGS = derive2 { name="BWGS"; version="0.2.1"; sha256="1473lvkmpf2dsgnccwl5a8wp9yvddciqdql4naba4lwghimxy39w"; depends=[BGLR brnn e1071 glmnet randomForest rrBLUP stringi]; }; - BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; + BWStest = derive2 { name="BWStest"; version="0.2.3"; sha256="1chlszmshda84000jj4q5j2swflj512vfj3h97361aphzhkwri2b"; depends=[memoise Rcpp]; }; BaM = derive2 { name="BaM"; version="1.0.3"; sha256="1mfbz8hp6cd170d5y6iva2dbd31rlg6z2dgnfvjp9myqa4cjy40y"; depends=[MASS mice]; }; BaSkePro = derive2 { name="BaSkePro"; version="0.1.0"; sha256="06wnl128anr0isq07qn2xr426c8iybmrbixz93hxx1pshcm64f37"; depends=[MASS]; }; BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; @@ -412,8 +406,7 @@ in with self; { BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; BartMixVs = derive2 { name="BartMixVs"; version="1.0.0"; sha256="0i7h6srzlmbjwyqgfwkq1azxai5hxicfkdxyxs9nzng3zi2ls6i2"; depends=[loo mvtnorm nlme nnet Rcpp]; }; - Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; - BaseSet = derive2 { name="BaseSet"; version="0.0.17"; sha256="1v5f8ixcnqngrhsfrydl7y48gmvmb5srs4xygydv4g4vpmd8gh0c"; depends=[dplyr magrittr rlang]; }; + BaseSet = derive2 { name="BaseSet"; version="0.9.0"; sha256="0dn4qxmba4pwf5ig7wivqijr35krm2h1cxgr99z44678k9hd3ip5"; depends=[dplyr magrittr rlang]; }; BaseTempSeed = derive2 { name="BaseTempSeed"; version="0.1.0"; sha256="07b1611k639whrc32xcjdlqyxjsdyd9gmpgx3f7b8hcchnhx98ay"; depends=[NlcOptim]; }; BasketballAnalyzeR = derive2 { name="BasketballAnalyzeR"; version="0.5.0"; sha256="1bad287llg89smqg43lgz2hdkjg3l39mh4k82avgb52xwqp5gjxc"; depends=[circlize corrplot dendextend directlabels dplyr GGally ggnetwork ggplot2 ggplotify ggrepel gridExtra hexbin magrittr MASS network operators PBSmapping plyr readr rlang scales sna sp statnet_common stringr tidyr]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.3"; sha256="0g3vr2g4v968rwzja1nngji58960p2r494km8wia7x5w3y69p063"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; @@ -432,13 +425,13 @@ in with self; { BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; }; BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; }; BayesDIP = derive2 { name="BayesDIP"; version="0.1.1"; sha256="05kz0qik76gk1v6ldhlbzmylpsv5zmbqbjgf9sc8c5zkyjdawgj8"; depends=[]; }; - BayesDLMfMRI = derive2 { name="BayesDLMfMRI"; version="0.0.2"; sha256="1aj2sy09ikamma8sgi51kzb4gpyr0a4mhm7rwzbqmhld8qbnh3f7"; depends=[abind mathjaxr neurobase oro_nifti pbapply Rcpp RcppArmadillo RcppDist Rdpack]; }; + BayesDLMfMRI = derive2 { name="BayesDLMfMRI"; version="0.0.3"; sha256="06806wckw629gl6p8jbxpg8lh6wsy8nhs2017qcfc3wwxb6dd3jc"; depends=[abind mathjaxr neurobase oro_nifti pbapply Rcpp RcppArmadillo RcppDist Rdpack]; }; BayesDesign = derive2 { name="BayesDesign"; version="0.1.1"; sha256="1h69a18wp2z96a002x154d2vd1imzap3zm7yfssm5dh7igha18zc"; depends=[]; }; BayesDissolution = derive2 { name="BayesDissolution"; version="0.1.0"; sha256="1h3npy56k3npn1ddh766hrx7haq2xvqmryw58mpmi9a50cf8vs2f"; depends=[geoR MCMCpack mnormt pscl]; }; BayesESS = derive2 { name="BayesESS"; version="0.1.19"; sha256="023r5pxqa2ll3vyfmchdlcg6ay0qixphz24078g1immqp43mlrxm"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; }; BayesFM = derive2 { name="BayesFM"; version="0.1.5"; sha256="1x6paj5fr036mry6yr32vrxx2kfz89c8dz39ky1nc6jg1q7x5a8i"; depends=[checkmate coda ggplot2 gridExtra plyr]; }; - BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.4"; sha256="02bhlamnkxp9wqi2cp1i0dxmqdf3y3l872ad9z39xwripbi4kc7a"; depends=[coda hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; - BayesFluxR = derive2 { name="BayesFluxR"; version="0.1.1"; sha256="1yak79py211070kmlxsq0c48accpg64nqzkhnpx2yz1c8dsj4kcg"; depends=[JuliaCall]; }; + BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.5"; sha256="10bclqzczawpssjwa3b177xpab4mdhczfj1qj23xn2yvrrw1z9mh"; depends=[coda hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; + BayesFluxR = derive2 { name="BayesFluxR"; version="0.1.2"; sha256="1wl1wbncw6klf95zcarwy55dssl5a48v4m7j2k1cpp1f4dx2pb4r"; depends=[JuliaCall]; }; BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; BayesGPfit = derive2 { name="BayesGPfit"; version="1.1.0"; sha256="08ayk6cxhqwymmr559rrmg35s2i2kbvrxd408vy6xrsyvidjppi5"; depends=[lattice]; }; BayesGWQS = derive2 { name="BayesGWQS"; version="0.1.1"; sha256="1vxln01194ipfhzid48x95hrpzkwylhr3nx1dh38rkfsg9fpl2af"; depends=[coda plyr rjags stringr]; }; @@ -446,11 +439,10 @@ in with self; { BayesLN = derive2 { name="BayesLN"; version="0.2.8"; sha256="1rgf2j8al7gm8j77b5kjmjpygdv70s994yvdnhxpgg2b1sz8glvw"; depends=[coda data_table GeneralizedHyperbolic gsl lme4 MASS Matrix optimx Rcpp RcppEigen]; }; BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; }; - BayesMRA = derive2 { name="BayesMRA"; version="1.0.0"; sha256="005pygpa8bmr153naxnag7kn876lqwq34d8pzbj954nivlxl4zaw"; depends=[fields igraph Matrix mvnfast Rcpp RcppArmadillo spam]; }; - BayesMallows = derive2 { name="BayesMallows"; version="1.3.0"; sha256="1mv1n2v9yvb8vzgld2dahv5v91843n81af5gbalhpg86yblizzfq"; depends=[cowplot ggplot2 HDInterval igraph Rcpp RcppArmadillo Rdpack relations rlang sets testthat]; }; + BayesMallows = derive2 { name="BayesMallows"; version="1.4.0"; sha256="1irplamvggsds8jdb0pcz2wh8chdhkrgk22n2hgwl4yb1ysdqi3z"; depends=[cowplot ggplot2 HDInterval igraph Rcpp RcppArmadillo Rdpack relations rlang sets testthat]; }; BayesMassBal = derive2 { name="BayesMassBal"; version="1.1.0"; sha256="1cgcx8kvn0bmn8kmq8ri3k98yx085d2qndislbwhn833ws6vkl88"; depends=[coda HDInterval LaplacesDemon Matrix pracma Rdpack tmvtnorm]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; - BayesMortalityPlus = derive2 { name="BayesMortalityPlus"; version="0.1.0"; sha256="0kk6lmvp162jxx22r87hxl2i089ghkksy1fw923fcd3iyi52x2r0"; depends=[dplyr ggplot2 magrittr MASS progress scales tidyr]; }; + BayesMortalityPlus = derive2 { name="BayesMortalityPlus"; version="0.1.1"; sha256="1ynsjk82ppdqh1qq9xk0rs3m5d0aj375zaj9w54v80r2sq6k5pzm"; depends=[dplyr ggplot2 magrittr MASS progress scales tidyr]; }; BayesMultMeta = derive2 { name="BayesMultMeta"; version="0.1.1"; sha256="09x41r5lhr2dq56b05f0aj8v4s7084d4z90qjqwdkv8zgk664ki0"; depends=[assertthat Rdpack]; }; BayesMultiMode = derive2 { name="BayesMultiMode"; version="0.6.0"; sha256="1sa843sypgqrlcc9f3clzab52i0hvmdjiqai6g408np80n78al56"; depends=[assertthat bayesplot dplyr ggplot2 ggpubr gtools magrittr MCMCglmm mvtnorm posterior Rdpack scales sn stringr tidyr]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.2"; sha256="0va4gvyfwfdk3yvhdyxc49qlmzxfblwlmwqh79b93zkv8239kkk1"; depends=[FNN Matrix nimble StatMatch]; }; @@ -458,7 +450,6 @@ in with self; { BayesOrdDesign = derive2 { name="BayesOrdDesign"; version="0.1.2"; sha256="1417zd1n5sip999n6q6bgs85c0000ksl73a4p94y0lmdn27i8pmj"; depends=[coda ggplot2 gsDesign madness ordinal R2jags rjags rjmcmc schoolmath superdiag]; }; BayesPPD = derive2 { name="BayesPPD"; version="1.1.1"; sha256="1rkbcz5kx8pxsm1q6rryyyc4j1dn049hysdj3piwk71jpl43b0jj"; depends=[Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; - BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; BayesPostEst = derive2 { name="BayesPostEst"; version="0.3.2"; sha256="0r05by4w80j6hb22v3ibj686ixxbj7lkxq499fciz5lqs4lxzf3h"; depends=[brms carData caTools coda dplyr ggplot2 ggridges HDInterval MCMCpack R2jags R2WinBUGS reshape2 rjags rlang ROCR rstanarm runjags texreg tidyr]; }; BayesProject = derive2 { name="BayesProject"; version="1.0"; sha256="0b1xqw7f9kfbmr8m6fl9d2fpwr364s4a5vdw57l6i5rm6lszyfh5"; depends=[Rcpp RcppEigen Rdpack]; }; BayesRGMM = derive2 { name="BayesRGMM"; version="2.2"; sha256="0yvjl5kzmh2c7c00jk38cs5g6g0yhrc86p5jn8zf10349md3dpcv"; depends=[abind batchmeans MASS msm mvtnorm plyr Rcpp RcppArmadillo RcppDist Rdpack reshape]; }; @@ -467,8 +458,7 @@ in with self; { BayesRepDesign = derive2 { name="BayesRepDesign"; version="0.42"; sha256="0xm3ap8lwg52760kyfp71i52mpkkh32753fprb4dfy1ry7g2qmyv"; depends=[lamW]; }; BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.5"; sha256="08zx8paaqg8zkf4d2rfparbi54p1i9wr05iqp7nqy7xv3isq1zfp"; depends=[Rcpp RcppArmadillo]; }; BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; - BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; - BayesSUR = derive2 { name="BayesSUR"; version="2.1-3"; sha256="02w317dy1pcqr6y2sgmir7yk6c2w96hkkagczlwav8jb2x1ngfqi"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSUR = derive2 { name="BayesSUR"; version="2.1-4"; sha256="193dgx3ih81sg2m8qfpxvx0d2q2bjvf6x2yvf5k8psb04s374g33"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; BayesSampling = derive2 { name="BayesSampling"; version="1.1.0"; sha256="1nwwf195b7hly7kjfikizyvgc975g74z6hsm89c1ibfgxlj51bcw"; depends=[MASS Matrix matrixcalc]; }; BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.5"; sha256="16949bcakx4a77md1rm6364mzsjxr7gpmz2rxnslhz2szx4cnnaj"; depends=[BH dplyr ggplot2 lme4 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; @@ -478,14 +468,14 @@ in with self; { BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; }; BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; }; BayesVarSel = derive2 { name="BayesVarSel"; version="2.2.5"; sha256="1hp8cy9dbna32r57pjpsi9kx9vm18s0xr3gk1ndj0rbzn4193jdn"; depends=[MASS mvtnorm]; }; - BayesX = derive2 { name="BayesX"; version="0.3-2"; sha256="0yjk9jpp9mnmlwm3xywzhyzb36vgf6yi897mr8cw31zin3wcprb4"; depends=[coda colorspace interp sf shapefiles sp]; }; + BayesX = derive2 { name="BayesX"; version="0.3-3"; sha256="1yxj13nyzhwl2ak9y4y7cdcrrrfb78wdynggs6v76n94pghc9dgp"; depends=[coda colorspace interp sf shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-4"; sha256="0km6w8wzyvwisjzyqyigkl7mz1ixmsch4c98bzzc0a2z34bi4jmg"; depends=[]; }; BayesfMRI = derive2 { name="BayesfMRI"; version="0.3.5"; sha256="1fcfg84i72m3hyccm4nws022jk3rjqzjjcr8b429gn2f46x793nm"; depends=[ciftiTools excursions fMRItools foreach MASS Matrix matrixStats Rcpp RcppEigen sp]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; - BayesianLaterality = derive2 { name="BayesianLaterality"; version="0.1.1"; sha256="1b8ndwnwsj2wzbjp3rivdsx5nsfg2rgv6mnlyp7jxaksxvf4ray7"; depends=[dplyr purrr Rdpack rlang tidyr tmvtnorm]; }; + BayesianLaterality = derive2 { name="BayesianLaterality"; version="0.1.2"; sha256="1dy00xgz9cc65aj39nf76crhfxfyackpcniwadrh38mk8zpbka42"; depends=[dplyr purrr Rdpack rlang tidyr tmvtnorm]; }; BayesianMediationA = derive2 { name="BayesianMediationA"; version="1.0.1"; sha256="1ygc0xhk7mk7pkqn0v9n23j1m75rr1r2ar30r386c1av3jh7krnw"; depends=[car gplots lattice R2jags survival]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.3"; sha256="0nyv2maqssayd79fs0zhpblscd7nsvw7k4fmqzpfz2xgivnx2i5p"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinyWidgets]; }; - BayesianPlatformDesignTimeTrend = derive2 { name="BayesianPlatformDesignTimeTrend"; version="1.1.2"; sha256="0dmbx9fvh9mfyh3ambsnkxc8w7qifhdbwqh5bcr4ihprc59c8md2"; depends=[BH BiocManager boot doParallel foreach ggplot2 iterators laGP lhs matrixStats Rcpp RcppEigen RcppParallel reshape rstan rstantools StanHeaders stringr]; }; + BayesianPlatformDesignTimeTrend = derive2 { name="BayesianPlatformDesignTimeTrend"; version="1.2.1"; sha256="1yvgav1fc4mr74jgbcyqigh1y70vs1fwvcfcw03kip8rs5dfjxb5"; depends=[BH BiocManager boot doParallel foreach ggplot2 ggpubr iterators laGP lhs matrixStats RColorBrewer Rcpp RcppEigen RcppParallel reshape rstan rstantools StanHeaders stringr]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.2.3"; sha256="00rn3wmqrhk2pssbq5j2prl8m6cgfarr49672pnksp2dcbi47p20"; depends=[]; }; BayesianReasoning = derive2 { name="BayesianReasoning"; version="0.4.1"; sha256="0j8fzn6xza3vg7qbfxwhjncll9yx985660dr75y9qhhz84jis3dv"; depends=[dplyr ggforce ggplot2 magrittr reshape2 tibble tidyr]; }; BayesianTools = derive2 { name="BayesianTools"; version="0.1.8"; sha256="1ldx75g4ws2yrnq4xyj3j83xjhakhgbhn174lwqzviqynvbbshzm"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; @@ -496,15 +486,16 @@ in with self; { Bchron = derive2 { name="Bchron"; version="4.7.6"; sha256="1s8bx9a5rpcrw0msnjf565crz3d2fykvy5fj1chbqxzjh7qm865w"; depends=[checkmate coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; BeSS = derive2 { name="BeSS"; version="2.0.3"; sha256="09zxpzcaj13fn38cwd0xk0254aphb3jn1wdwn9hiq9vapfsgn0dx"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; BeastJar = derive2 { name="BeastJar"; version="1.10.6"; sha256="0581q9m7lb681d12vld231vn6wqv5s2sqkvav4fd0xllvjighlx7"; depends=[rJava]; }; - BeeGUTS = derive2 { name="BeeGUTS"; version="1.1.2"; sha256="059xa5rpnd92kmy8hd26ryx3gkls9vlwbwwbwl4my1z7vll5s59m"; depends=[BH cowplot data_table dplyr ggplot2 gridExtra magrittr odeGUTS Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; + BeeBDC = derive2 { name="BeeBDC"; version="1.0.1"; sha256="1zkf53smlqd1rzf9l7ibf45yws6n379bv3kqs6f2szai3npip5bw"; depends=[circlize CoordinateCleaner cowplot dplyr forcats ggplot2 ggspatial here igraph lubridate mgsub openxlsx paletteer readr rnaturalearth sf stringr tidyselect]; }; + BeeGUTS = derive2 { name="BeeGUTS"; version="1.1.3"; sha256="1880bsgwal06i7q3la1f8alrhj43mnsim6n8inrnaqcbqgi69v3n"; depends=[BH cowplot data_table dplyr ggplot2 gridExtra magrittr odeGUTS Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.31"; sha256="0gg4yay098ga08ns5ybn7s467prwbq0a94a0nfah30jy36ggdfs2"; depends=[lpSolveAPI quadprog Rcpp ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; - Bergm = derive2 { name="Bergm"; version="5.0.5"; sha256="0plidwnyh38hrkbd3ild476f54bz6i70r0h3chxh3wp35rl04ikl"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network Rglpk statnet_common]; }; + Bergm = derive2 { name="Bergm"; version="5.0.6"; sha256="0ibbskkanff7hxk2bcp6p8v0zk5wsb53zw12znmw855xas26spsy"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network Rglpk statnet_common]; }; Bernadette = derive2 { name="Bernadette"; version="1.1.4"; sha256="11p0mn6m1h0h203wxsdgpnzjxh5r3ak5xfvy4s4axm2g449wnmia"; depends=[BH ggplot2 gridExtra magrittr Rcpp RcppEigen RcppParallel rstan rstantools scales StanHeaders]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; Bestie = derive2 { name="Bestie"; version="0.1.5"; sha256="1j3xnwq9faim8cjb6cz54mix7ly8dzxa5qsdglcgl2gfbvzbb9s1"; depends=[BiDAG mvtnorm Rcpp]; }; - BetaBit = derive2 { name="BetaBit"; version="2.1"; sha256="1c7hrv21pllcv766hlyc47ivsip0vhi2ld6mj8r42icssgw3jsgn"; depends=[digest]; }; - BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; + BetaBit = derive2 { name="BetaBit"; version="2.2"; sha256="185bsjc1azvblg0hm39bq3r1c6c4vla9k5cz39p6kjzd1gn1zhr2"; depends=[digest]; }; + BetaPASS = derive2 { name="BetaPASS"; version="1.1-2"; sha256="1vx2wn2bj3xl430aw4zlv2j3m39nkmg7mfkm1pmilvpqszfx078g"; depends=[betareg ggplot2 pbapply]; }; BetterReg = derive2 { name="BetterReg"; version="0.2.0"; sha256="08qafm8j0bbh6qywyq6dr1j204n9cxrpyy2fh74mbgm3xknazxsc"; depends=[car dplyr]; }; BeviMed = derive2 { name="BeviMed"; version="5.8"; sha256="12ngw3b05mqsf95svvkk5s8w0fs1yfbpbfk8x9a9v2yva5n65y7a"; depends=[Matrix Rcpp]; }; BeyondBenford = derive2 { name="BeyondBenford"; version="1.4"; sha256="04jdx35955g44v2is6zxfw1gip7zh3li8divc7iy5hl0jrshfhv3"; depends=[ggplot2]; }; @@ -515,8 +506,9 @@ in with self; { BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.1"; sha256="00zcvk5v8rn3dp02sivs5z7cch9y8csp5cjhhs4ragdgcry0c3i5"; depends=[Formula]; }; BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; + BiTrinA = derive2 { name="BiTrinA"; version="1.3.1"; sha256="09x3w3njdm7pgjjcqc1g3lp8nj31qkq3hmn21dqgvq7acyblan08"; depends=[diptest]; }; BiasCorrector = derive2 { name="BiasCorrector"; version="0.2.2"; sha256="0a6iiy4iw8w8s4kbjf6r0gji6izf1zdb99r8vfbvgzzwg2pxx4h4"; depends=[data_table DT magrittr rBiasCorrection shiny shinydashboard shinyjs]; }; - BiasedUrn = derive2 { name="BiasedUrn"; version="2.0.10"; sha256="0jv0zvz1zs34h12zdgn3lqmn7hfkk2z6fkwbd9mlyddf34rkvfqv"; depends=[]; }; + BiasedUrn = derive2 { name="BiasedUrn"; version="2.0.11"; sha256="0dvmkrdmhfh4swilyxf10y856kx0zf9sj1gc0g62bm6r5jhz35b2"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.8"; sha256="0zvbyh8spr0ywj64b2rc8jcq4fgn87858km4mkkh17g30ympg767"; depends=[]; }; BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.2.2"; sha256="1vnwksw0j4lc2knlcmm5748pf4d7r44sn34s1mrv9p50hlnkk85p"; depends=[lavaan mirt mnormt MplusAutomation tidyr]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-13"; sha256="14mz9ry72zc4c0fhc59dima66qnksr1masvhzm1j8z8r11w7qjhd"; depends=[Matrix Rcpp scalreg]; }; @@ -531,10 +523,10 @@ in with self; { Binarize = derive2 { name="Binarize"; version="1.3.1"; sha256="08xg3s30mk5q0hfvigysnfp8lsnq42j267ylpnhphw5vzlg5xivx"; depends=[diptest]; }; BinaryDosage = derive2 { name="BinaryDosage"; version="1.0.0"; sha256="10nf11c57j0ls4znm137w831s7zmihg7bybrfg666hx7c9amspjw"; depends=[digest prodlim Rcpp]; }; BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; - BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.3"; sha256="0fydh3pp7y0glk2rhihcslzx10hgn5la922jbnqzg2nplvzv7ybj"; depends=[expm Formula lmtest numDeriv]; }; BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; BioCircos = derive2 { name="BioCircos"; version="0.3.4"; sha256="1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; BioInsight = derive2 { name="BioInsight"; version="0.3.1"; sha256="129w9643l01y316hm0qcsmxzh5lsdmq6xmiz4rhmdh0dcnw2s93n"; depends=[edgeR knitr limma RColorBrewer wordcloud]; }; + BioM2 = derive2 { name="BioM2"; version="1.0.1"; sha256="06fcn3pizw0jp4m195ac9gf3d1jr8sp3r2fiq68lwmv7vi6ngcxs"; depends=[caret CMplot dplyr ggplot2 ggpubr ggthemes htmlwidgets jiebaR mlr3 mlr3verse RColorBrewer ROCR tm uwot webshot WGCNA wordcloud2]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; }; @@ -545,7 +537,7 @@ in with self; { BiocManager = derive2 { name="BiocManager"; version="1.30.22"; sha256="0dg86nbh9h77ypaarsd79df24j0vnlm2df4zcmbhfasnsv0ck2ak"; depends=[]; }; Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.5"; sha256="1phnq6zq96i6z7jj196png3spjpbbx5p2s8iya0vvbfik12ivzkc"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.15-2"; sha256="1hhv7amdf3lx5jymkn1pvgrdm1bzvvn270wk8pjpj3rdmfjszj4g"; depends=[ggplot2 Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.15-4"; sha256="0k8wx07rskc3m9zvksh45df4nsy545wfp32chfvpr1sjgpc98hcb"; depends=[ggplot2 Rcmdr vegan]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Bios2cor = derive2 { name="Bios2cor"; version="2.2.1"; sha256="0xj7ab9a463p4a67y0hlv6mfd08xf8didkn2mwrfa7gxjqqvix4z"; depends=[bigmemory bio3d circular igraph]; }; Biostatistics = derive2 { name="Biostatistics"; version="1.0.4"; sha256="1fcrj53rqg7mdhrrsl95l0n6hycb0863isch2f6zzsqdqbxhq7dh"; depends=[learnr]; }; @@ -563,8 +555,9 @@ in with self; { BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; BlanketStatsments = derive2 { name="BlanketStatsments"; version="0.1.2"; sha256="00zh3ivqrzlz6wz0nalmdqp8pfki3kkxm9idh2ri6sfxsb6kfdp6"; depends=[assertive_types basecamb DescTools Hmisc survAUC survival]; }; Blaunet = derive2 { name="Blaunet"; version="2.2.1"; sha256="070vqkd24ydzs277acpwcqay8nrp3ip1wf2zkdkg1qc2crip86hs"; depends=[digest ergm foreign gWidgets2 gWidgets2tcltk haven network plot3D plot3Drgl rgl sna statnet_common]; }; - Blendstat = derive2 { name="Blendstat"; version="1.0.3"; sha256="0d5zzqiav7b5prh8332kwqy6ga96lkbkdjis8qwifa11j5qa087a"; depends=[lattice MASS]; }; + Blendstat = derive2 { name="Blendstat"; version="1.0.4"; sha256="0nh5nq8g009vbb4mmjcrhg46yi77dk1gza4si21m58b26qf5riy5"; depends=[lattice MASS]; }; BlockCov = derive2 { name="BlockCov"; version="0.1.1"; sha256="1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l"; depends=[BBmisc dplyr magrittr Matrix Rdpack rlang tibble]; }; + BlockMissingData = derive2 { name="BlockMissingData"; version="0.1.0"; sha256="12jgf58k3dgbyb7x4skcdc10m8pvyx8kzqq6fi4wn5x1g5595nxy"; depends=[doParallel foreach glmnet glmnetcr MASS Matrix pryr]; }; BlockmodelingGUI = derive2 { name="BlockmodelingGUI"; version="1.8.4"; sha256="09sbxwzvnnzjv5gy0zyd1lvm1z44ywqvanj99i15l0lp66l54572"; depends=[blockmodeling DT htmlwidgets igraph intergraph network shiny shinybusy shinyjs shinythemes visNetwork]; }; BlythStillCasellaCI = derive2 { name="BlythStillCasellaCI"; version="1.0.0"; sha256="0xgrrh6rf732c2dh1z1qyvkqw8ga1yl6i802r399bb7k55g6z6d0"; depends=[]; }; BoSSA = derive2 { name="BoSSA"; version="3.7"; sha256="0qhcar3grp6l6islbjc27jqvgh37kkdi0nql6plsqwilldv3kis6"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; @@ -577,24 +570,24 @@ in with self; { BondValuation = derive2 { name="BondValuation"; version="0.1.1"; sha256="00fdqsy7znlwszwjm7mzd5yb3bbx463iy4fbkrzc5nn08rfa395g"; depends=[Rcpp timeDate]; }; BoneProfileR = derive2 { name="BoneProfileR"; version="2.4"; sha256="0mm2vjg43p9abfydaw7qw0q9cwpvzxic914rpdk2dshyva6dxyx5"; depends=[HelpersMG imager knitr rmarkdown shiny]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; - BoolNet = derive2 { name="BoolNet"; version="2.1.8"; sha256="1njp9x7x6agdr8i2ilj8f98mw2b7hjqln00w95xinsv5zb6x0182"; depends=[igraph XML]; }; + BoolNet = derive2 { name="BoolNet"; version="2.1.9"; sha256="19xnmz5dq8lvk1va8zi931xkawkwfcfjf4vh0dsg5n8zhy4p321f"; depends=[igraph XML]; }; Boom = derive2 { name="Boom"; version="0.9.11"; sha256="17kp3vla2z9kgcqgwcslcp0wl7k1k2rbc8nr3b785hv23gww11bi"; depends=[MASS]; }; BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.5"; sha256="1y1bn9490g3qvvjvxk8sc0312hmzwj0n5rg9fsa7k4av0yasv25w"; depends=[Boom]; }; BoostMLR = derive2 { name="BoostMLR"; version="1.0.3"; sha256="0gk8jf04qda1qsc6987d8nfa453v9cqkjsvvrrg68yx3fd96m8aj"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; - BootPR = derive2 { name="BootPR"; version="0.70"; sha256="1bhdmbg3i7r9v563v84sh4kcl7r036h6aqrwjwr9r3r56l3834bb"; depends=[]; }; + BootPR = derive2 { name="BootPR"; version="1.0"; sha256="11cpg3klm5qk7447wnwhfv1kg0r3kqr0m4vvwkv1jll5v9zkq7h7"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2.1"; sha256="1s6qvc2nvkqfxl8d4cy7ckvn6l0svq85g274pvjjxg8f883hax0j"; depends=[tseries wavethresh]; }; BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.5"; sha256="04lyr9x6lz4q5y70p92ffdil2i9f1fsykw5wh6wsv0qcqypdmawy"; depends=[data_table foreach MatrixEQTL]; }; Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; }; Boruta = derive2 { name="Boruta"; version="8.0.0"; sha256="1irx7qg1sw69ggsk4jgxfd3pp741kd944fipnda1qbcbphg5prrq"; depends=[ranger]; }; - BosonSampling = derive2 { name="BosonSampling"; version="0.1.3"; sha256="0dxvjdvzv2b3763x4wrkw02q57l42286w9bg2xhcngmcpdhnkg51"; depends=[Rcpp RcppArmadillo]; }; + BosonSampling = derive2 { name="BosonSampling"; version="0.1.5"; sha256="059g4sl7c2cns729sssv1syj0zx8rs8wbjfsc761fxl435ca7hqk"; depends=[Rcpp RcppArmadillo]; }; BoundEdgeworth = derive2 { name="BoundEdgeworth"; version="0.1.2.1"; sha256="03gqm9afqv7z176f9yv5vxf0r4v0bq1zs8rfwfld38mk66sfb2m1"; depends=[expint mathjaxr]; }; - BoundaryStats = derive2 { name="BoundaryStats"; version="2.0.1"; sha256="0vfcd8d1il134mxk1pb3r7ahir4zyzjv7nmfqbnhskdzh7ahd8hh"; depends=[fields ggplot2 igraph magrittr pdqr rgeoda scales sf terra tibble]; }; + BoundaryStats = derive2 { name="BoundaryStats"; version="2.1.1"; sha256="06kz1d5fwiilqidiz2iry0fg7c5265fc40yrdgddd0aia75cf9jv"; depends=[fields ggplot2 igraph magrittr pdqr rgeoda scales sf terra tibble]; }; BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="7.0.8"; sha256="1za211paw4k586z6s92rwh2z7vjn3aqgja43b2zd5z6swg3ibhsv"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-2"; sha256="0vss3ib74cz2zn1afmrvllawghj9z2ay4x1ysvk4rqvjmiia4a2i"; depends=[brglm gtools lme4 qvcalc]; }; BrailleR = derive2 { name="BrailleR"; version="1.0.2"; sha256="1gh4n9zl7yczmhy85xmsx1mh9qmc99xvhmm5cdnjcb644i2n214k"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr mathjaxr moments quarto Rdpack rmarkdown roloc rolocISCCNBS tidyr whisker XML xtable]; }; BrainCon = derive2 { name="BrainCon"; version="0.3.0"; sha256="137pagkjb4xzk3skmsf5vlp8q0k79zl9xjz8wwda1mdrknkdnbj6"; depends=[glmnet MASS]; }; - BranchGLM = derive2 { name="BranchGLM"; version="2.1.1"; sha256="15hszk2izi1lif2p7siw4v8vj0l3k4787bf2qwdz4zpl433jzvvm"; depends=[BH Rcpp RcppArmadillo]; }; + BranchGLM = derive2 { name="BranchGLM"; version="2.1.2"; sha256="1rg5pylkqbmsq6kwjw710rgydw8xg8l2c3bqhpn5j53lcprclaqs"; depends=[BH Rcpp RcppArmadillo]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; BrazilMet = derive2 { name="BrazilMet"; version="0.2.0"; sha256="0pcr665j4balmcm4sq6l19nmhpbs7ayw5dljsdxr91bn6srb33b3"; depends=[dplyr readxl stringr]; }; BreakPoints = derive2 { name="BreakPoints"; version="1.2"; sha256="125fvzkmfnriyd4y4nywj5ihm766xlsyi7dpnq57fa9d38ffbyf2"; depends=[MASS zoo]; }; @@ -602,8 +595,7 @@ in with self; { BrokenAdaptiveRidge = derive2 { name="BrokenAdaptiveRidge"; version="1.0.0"; sha256="0f46wwyfcqslk25cbm63pbnp8bwamqhr4g4wdlrqn666yiwn1sc2"; depends=[bit64 Cyclops futile_logger]; }; BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="3.0"; sha256="1gppp959i9kr8pdvn336v28gg9h0jl8qg6pqvzvp5wf257z8m4l8"; depends=[]; }; - Brundle = derive2 { name="Brundle"; version="1.0.9"; sha256="0z17wgmi272738n8pn6r60v5gbg8cbmwhc94s8f3vipa44h690bc"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; - BsMD = derive2 { name="BsMD"; version="2023.707"; sha256="01jx3qpj93qgrpqbw8041ybisk26x00s3xqwvsml32x6n9rg81gq"; depends=[]; }; + BsMD = derive2 { name="BsMD"; version="2023.920"; sha256="13gwdgsq4c2g5y70adbz4hfgwygxna7k1q33q3sf0snz53y66gi9"; depends=[]; }; Buddle = derive2 { name="Buddle"; version="2.0.1"; sha256="0hi516cbl93z00jpdgyp3j5hz0xf594vn65p6ahpffwzh1l8s1cf"; depends=[plyr Rcpp RcppArmadillo]; }; BuildSys = derive2 { name="BuildSys"; version="1.1.2"; sha256="1mqwnr8x883nhd7mpqzc351njdvdqps8w8b106l2b4l2620c546f"; depends=[digest]; }; BurStFin = derive2 { name="BurStFin"; version="1.3"; sha256="082kbs4blc6ldgp18k34fxqilqmwgynrjj1mbji198v7pn4y8s0h"; depends=[]; }; @@ -623,6 +615,7 @@ in with self; { CALANGO = derive2 { name="CALANGO"; version="1.0.16"; sha256="1rs992i6xmisx180yyc6z7qlig9a4kj7r3vr5ysf6kcgycj72nj1"; depends=[ape assertthat BiocManager dendextend DT ggplot2 heatmaply htmltools htmlwidgets knitr nlme pbmcapply pkgdown plotly rmarkdown taxize]; }; CALF = derive2 { name="CALF"; version="1.0.17"; sha256="021x1gp0493g6qnfih755c0xcddz77i3p22bgjlx1lpzgqmrgrki"; depends=[data_table ggplot2]; }; CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-7"; sha256="1fspn6wgr0kc7j4ixx24c706kzrgjhi1b1w28izpfxm4r89zk08s"; depends=[mice mvtnorm randomForest]; }; + CAMAN = derive2 { name="CAMAN"; version="0.78"; sha256="10llppi2k3jq36mpig2djaf5kdx3ils2i1zvcypdry8xpkz80h9l"; depends=[mvtnorm sp]; }; CAMML = derive2 { name="CAMML"; version="0.2.3"; sha256="0qzp5hmsrq89jvizsvjrp1q01f9nc3fbn7ka964xp75f6pvckph6"; depends=[AnnotationDbi BiocManager edgeR MASS Matrix org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db Seurat SeuratObject VAM]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; }; CARBayes = derive2 { name="CARBayes"; version="6.0"; sha256="17y97czha0vnn21cwbmci6cfp4r0k453hg7jdhg1n4c1nl5x6r0y"; depends=[CARBayesdata coda dplyr GGally mapview MASS MCMCpack RColorBrewer Rcpp sf spam spdep truncnorm]; }; @@ -630,50 +623,48 @@ in with self; { CARBayesdata = derive2 { name="CARBayesdata"; version="3.0"; sha256="03m0r6n10ssljhliipvslwxgcpv0whvlj27d7awa7sp37j3aafx5"; depends=[sf]; }; CARM = derive2 { name="CARM"; version="1.1.0"; sha256="068rpz7bjc767yw4vcrf63ckyvdk2f1kskmfcc7955qf9ki5c49c"; depends=[arrangements dplyr MASS]; }; CARME = derive2 { name="CARME"; version="0.1.1"; sha256="0nam14g052swb44sw07as4agk0z47f7mc1kqlj0z9m1ywsbisnpl"; depends=[BH expm MASS Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - CARRoT = derive2 { name="CARRoT"; version="3.0.0"; sha256="0ijp8dc2c3jp8sk443jfgyy4q7yxlcd0jk6hrzm57jbnpwbmjxpv"; depends=[doParallel foreach nnet Rdpack]; }; + CARRoT = derive2 { name="CARRoT"; version="3.0.2"; sha256="1himmzsshhr2f5hljr60p7w3wq5ybdsb0f9kiga56hpppg352l3f"; depends=[doParallel foreach nnet Rdpack]; }; CARlasso = derive2 { name="CARlasso"; version="0.1.2"; sha256="05r5n5bh0fpwfigr6czh9pg29zyrw73idfvs9qm8vr3dvcmvc42r"; depends=[coda ggplot2 ggraph igraph MASS Matrix Rcpp RcppArmadillo RcppProgress]; }; CASCORE = derive2 { name="CASCORE"; version="0.1.2"; sha256="1ns20gxm7a4n2h6zdysz4p7pij5mivhdj2ssccdy36g1lihgjz8q"; depends=[pracma]; }; CASMAP = derive2 { name="CASMAP"; version="0.6.1"; sha256="1447d4gflan2093fb68inb2ysx5svb9vhnjc7lnkgpjsiam4p8yy"; depends=[Rcpp]; }; - CASMI = derive2 { name="CASMI"; version="1.0.0"; sha256="0nhjkvaa27l8j390sl220ckkjbgqj3dm8pnvw58fnprjhi9203sc"; depends=[entropy EntropyEstimation]; }; + CASMI = derive2 { name="CASMI"; version="1.1.1"; sha256="14kg6fs7s3bqmz1a7mmk6dvpfl4nsk7373b4596yi0p7zfgp6lmj"; depends=[entropy EntropyEstimation]; }; CAST = derive2 { name="CAST"; version="0.8.1"; sha256="1c38zq5h4f123kr4dx3nq3zcvys7jq6srpksm49jzv9yf2bnhf3k"; depends=[caret data_table FNN ggplot2 lattice plyr zoo]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.1"; sha256="07ciln6cfvqya7dwwn6mhd9lk2833hypm4badizgfi2k749d1p00"; depends=[]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.1.0"; sha256="07rvi91ysqyfwagmip0cnqjahv1n8slicd5hznqf5v3l841xh7p7"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; - CAvariants = derive2 { name="CAvariants"; version="5.9"; sha256="1vjwc9484mcgx9syac93cz5mmq2d9zx5m81f9qmaghb4qdlcvdvv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; + CAvariants = derive2 { name="CAvariants"; version="6.0"; sha256="02m2kq0ggj7g0c2x8pdvasc881prbbyrs92rfy61qmbm8kxiy8js"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; CB2 = derive2 { name="CB2"; version="1.3.4"; sha256="0431bd956hmkrhs9x845vjwbzzwzd7n9nfx9y95mv6qv84zd4wv2"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.8.2"; sha256="0z34vcdq5lp1l15l3a67lpvfla0g0qsb5ijbc9h575h7fpf28jqf"; depends=[nortest]; }; CBPS = derive2 { name="CBPS"; version="0.23"; sha256="0bdkx7phi58200jgijqmv5d7v2kiksj07sxx2sjmkd1dcjdy13zd"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; CBSr = derive2 { name="CBSr"; version="1.0.5"; sha256="175xx7igxpx2s9jl9ncjabqr6n05v5ipwm7shpqm19qfqxb4ygrz"; depends=[NlcOptim rJava]; }; CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; }; - CCA = derive2 { name="CCA"; version="1.2.1"; sha256="1l4vp8yd42rpsm40szjfzhvbb5c7kl7yf4346i0940s6gk7bzzi8"; depends=[fda fields]; }; - CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="4.0.4"; sha256="1in7prc7w0bxybkwwccnmjv118xnf7wvfyk8g9hrk3296aglsf46"; depends=[dplyr geosphere magrittr raster sf sp stars terra]; }; + CCA = derive2 { name="CCA"; version="1.2.2"; sha256="0r1f7m64608hq6bpw36wsw6fr4s8bj26x4062brqgn5dbpqlgczk"; depends=[fda fields]; }; + CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="4.0.6"; sha256="1gbrrsxyfykzpng02sxk07j9afs1w550xawvaw7qrzx9yhr660qc"; depends=[bezier dplyr lwgeom magrittr sf stars terra]; }; CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCMMR = derive2 { name="CCMMR"; version="0.1"; sha256="0d8fbgnjvy4bh1msbvm125q2v9j3h7zdnijdhi222hcpkvax5z8b"; depends=[r2r RANN Rcpp RcppEigen]; }; CCP = derive2 { name="CCP"; version="1.2"; sha256="067nf1gag3ya7v9vzcpvallga5dr243q0q07fd370k0zynmhcfby"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; CCWeights = derive2 { name="CCWeights"; version="0.1.6"; sha256="0in3pl1n48jal6f7kiyw60by11vbga8vr45x0wywghd7dz60ppfv"; depends=[bs4Dash dplyr DT fresh magrittr plotly readr readxl rmarkdown shiny]; }; CDFt = derive2 { name="CDFt"; version="1.2"; sha256="19axaf3bh9gasnsfamd5ych1jn751scaplgwpmsf3liazcqqpa61"; depends=[]; }; - CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; CDM = derive2 { name="CDM"; version="8.2-6"; sha256="1lcq3i5rlyqkc12c26kj0x4fm2gh1jsisp6kbf59y3hjdkiqajhl"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; - CDMConnector = derive2 { name="CDMConnector"; version="1.0.0"; sha256="03sya42lxias466yd787jadcnpiv0h6vw7zg17z8qj4xmca99yq7"; depends=[checkmate cli DBI dbplyr dplyr fs generics glue jsonlite lifecycle magrittr pillar purrr readr rlang stringr tidyr tidyselect waldo withr]; }; + CDMConnector = derive2 { name="CDMConnector"; version="1.1.4"; sha256="1xsajmg4k526dr4nkrrhvgi9shd8j8b1s0fkbn4lc797ljyv6gka"; depends=[checkmate cli DBI dbplyr dplyr fs generics glue jsonlite lifecycle pool purrr readr rlang stringi stringr tidyr tidyselect waldo withr]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; - CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; - CDSS = derive2 { name="CDSS"; version="0.1-0"; sha256="1y0pjnxa8m5l9r3apzdagz41a6r8dc5yycv1avy30zfhjjy9m5a7"; depends=[openxlsx readODS]; }; + CDSS = derive2 { name="CDSS"; version="0.2-0"; sha256="13p5vg07lv1vbwpsd33x4mc8pvwf6s6yqikrbyakrfsjlznzw5gj"; depends=[openxlsx readODS]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; - CDatanet = derive2 { name="CDatanet"; version="2.1.1"; sha256="1rai76jgyd86fabdzhzpl2nr47zgnihnr8hscdkyp5dpazsc1swn"; depends=[ddpcr Formula formula_tools Matrix Rcpp RcppArmadillo RcppDist RcppEigen RcppNumerical RcppProgress]; }; + CDatanet = derive2 { name="CDatanet"; version="2.1.2"; sha256="0lg6sfzi17xlfm2l7mgcw3p0ii3acc4vl38kadvzmb5720jvvj5r"; depends=[ddpcr Formula formula_tools Matrix Rcpp RcppArmadillo RcppDist RcppEigen RcppNumerical RcppProgress]; }; CEC = derive2 { name="CEC"; version="0.11.0"; sha256="0qa46iq3m510sjb3ap4m5lkaajk15vi3xjwqgnpdw0jh0m0vkabf"; depends=[]; }; CEDA = derive2 { name="CEDA"; version="1.1.0"; sha256="1m03l552zql3cqra1r1zdjcw6abpfdhvn3dkbhdhmnmg59fb6bfb"; depends=[dplyr ggplot2 ggprism ggridges ggsci limma mixtools]; }; - CEDARS = derive2 { name="CEDARS"; version="1.90"; sha256="1fngyc08kvilfd2d75gjg0s6c5zvjywym35sk568yzxnsz89b7yy"; depends=[fastmatch jsonlite mongolite readr shiny udpipe]; }; CEEMDANML = derive2 { name="CEEMDANML"; version="0.1.0"; sha256="0hc5sx1zvxj3j5psgcgzhw6l9zrvbbsnpw6qr7ww82bjjr3wbi3c"; depends=[aTSA caret e1071 earth fGarch FinTS forecast LSTS neuralnet pso Rlibeemd tseries]; }; CEGO = derive2 { name="CEGO"; version="2.4.2"; sha256="00nc6c1b6ylqlh6hm8lh8nasz7q12pqckdqbf1yq21khki9ldbll"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; CEOdata = derive2 { name="CEOdata"; version="1.3.1.1"; sha256="0cf8d3qw2x2lww6hxw96b1b6dl6pq2n0w1ffl2d7870vcvzl3lwr"; depends=[dplyr haven jsonlite stringr urltools]; }; CERFIT = derive2 { name="CERFIT"; version="0.1.0"; sha256="1mhyn5iyvnqqx881jfvacyxaldvn5q9h1jpsfy14sgkdjf75274s"; depends=[CBPS glmnet partykit randomForest Rcpp RcppArmadillo twang]; }; - CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; + CEoptim = derive2 { name="CEoptim"; version="1.3"; sha256="0b39q2imxgqwa836gzq6l93g0fsf8kdj2wjl4if8a8lw5inx7zgw"; depends=[MASS msm sna]; }; CFAcoop = derive2 { name="CFAcoop"; version="1.0.0"; sha256="1qnqbqh3p8grp6mxhqrwfm1nf1sxhqa6pjxkpf7vk9nx40g815gn"; depends=[Hmisc]; }; CFC = derive2 { name="CFC"; version="1.2.0"; sha256="16abn3ydixb819qyyrs351d8v6qaaaz1gif0yfd8gdh7xnr2qzpy"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; }; CFilt = derive2 { name="CFilt"; version="0.2.1"; sha256="1iah41s0pd8s4vmg7r6npsgmfr6mvyp5wfnyimx51fqr2f3narwf"; depends=[]; }; + CFtime = derive2 { name="CFtime"; version="1.1.0"; sha256="1lrzx3rxipfyjbfjic9c80pmbgfldbgyhz823v04761h6jplpp9i"; depends=[]; }; CGE = derive2 { name="CGE"; version="0.3.3"; sha256="0q1fv62159cx9z25488fxf6a6fi1m59hdh60ldypsjwil77q0s3i"; depends=[]; }; CGGP = derive2 { name="CGGP"; version="1.0.3"; sha256="1g70hjpc33dnr6yw42kjhy9ngba05qzk5mr7md6pqhmbx0ykhr6g"; depends=[Rcpp RcppArmadillo]; }; CGManalyzer = derive2 { name="CGManalyzer"; version="1.3.1"; sha256="1hg8svdqq0xgdxvry5agwvz2jlx6d0vazny9kdxwxlg4wnydai2f"; depends=[]; }; @@ -686,10 +677,10 @@ in with self; { CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.1.0"; sha256="1w8abj1rxkpql696dr6w19xsgxjmkm0jwnln7lp48fnxdsa424x8"; depends=[dplyr magrittr]; }; CHNOSZ = derive2 { name="CHNOSZ"; version="2.0.0"; sha256="02srw868nvi4cs147gz2vm02gghibh1d2r31x7ljj6fcc66z4g9y"; depends=[]; }; CHOIRBM = derive2 { name="CHOIRBM"; version="0.0.2"; sha256="1ak9swfnc0i23pv6mg5bav09pb7v0afdr7h08s1pyd77wyzf95df"; depends=[ggplot2 rlang stringr]; }; - CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIARA = derive2 { name="CIARA"; version="0.1.0"; sha256="0nr7wks9231326x0lhpbh824c6vcb5hr5jn89s9bmg9mci907bsf"; depends=[Biobase ggplot2 ggraph magrittr]; }; CICA = derive2 { name="CICA"; version="1.0.1"; sha256="0b1q1np2sqjq7ijnm196nj86vz35ngbifpzy0qws2yxbsjf8xzf0"; depends=[htmltools ica magrittr mclust multiway neurobase oro_nifti plotly RNifti servr]; }; + CICI = derive2 { name="CICI"; version="0.9.1"; sha256="0dd152f3ffasmwrhjgkd4i480cp2jkp2qy7w22xbzjm3c22mpbvz"; depends=[doParallel doRNG foreach ggplot2 glmnet mgcv rngtools]; }; CIDER = derive2 { name="CIDER"; version="0.99.1"; sha256="0ag2gyrjjyq4r4xssmz05cg1sh8mmq54d5mynhwm5k53zcpk8i8r"; depends=[dbscan doParallel edgeR foreach ggplot2 igraph kernlab limma pheatmap Seurat viridis]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; CIM = derive2 { name="CIM"; version="1.0.0"; sha256="02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7"; depends=[]; }; @@ -701,7 +692,7 @@ in with self; { CIPerm = derive2 { name="CIPerm"; version="0.2.3"; sha256="1arb9jswnjmw8fgabwn3ap5wi57rwgh6dnq9c19v1qbcx8lhzs7c"; depends=[matrixStats]; }; CIS_DGLM = derive2 { name="CIS.DGLM"; version="0.1.0"; sha256="0c7jxfb8gaklf6p83152wb2nszm2p806p3n523xajf4ha368d3kq"; depends=[dglm dplyr ggplot2 RColorBrewer]; }; CITAN = derive2 { name="CITAN"; version="2022.1.1"; sha256="09m9f6s9y7ygbixcymg93vsrqz5jsjp968cjhxnj1v73hzalk168"; depends=[agop DBI RSQLite stringi]; }; - CIfinder = derive2 { name="CIfinder"; version="1.0.0"; sha256="07xicjpcs7pqp2p5lr3d363cvwv960mgf73n49h10d4j3wx75gdh"; depends=[kableExtra ratesci Rdpack]; }; + CIfinder = derive2 { name="CIfinder"; version="1.0.1"; sha256="0h3f78rfrsqwgcfhpn1sbwjawnna55i05gdfbrgawxhzp8gxv4fm"; depends=[kableExtra ratesci Rdpack]; }; CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; }; CJAMP = derive2 { name="CJAMP"; version="0.1.1"; sha256="0caznbqy5hsp7h0gkdbv966vfpq8z1khvbizi4vpc9mxck1nqc99"; depends=[optimx]; }; CJIVE = derive2 { name="CJIVE"; version="0.1.0"; sha256="1937q125w39rsl2i5imqlk25r7mr1hvpmjy2br0xq98vdkxazqsq"; depends=[fields ggplot2 gplots psych reshape2 rootSolve]; }; @@ -713,7 +704,7 @@ in with self; { CLME = derive2 { name="CLME"; version="2.0-12"; sha256="161maq22r8wbd6c2dc8b47mh6991vc4iqmjr8g6yqb5gcwca8zhg"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; }; CLONETv2 = derive2 { name="CLONETv2"; version="2.2.1"; sha256="1axkkagydpxdrz7ypw3x7bavaxk34lzj9bsdn1nah9nfr3cdia6h"; depends=[arules dbscan ggplot2 ggrepel sets]; }; CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; }; - CLVTools = derive2 { name="CLVTools"; version="0.9.0"; sha256="11vifpsq3acdkrkjpssd29w69rwxccv7848rd71375dc26x22sw1"; depends=[data_table ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; }; + CLVTools = derive2 { name="CLVTools"; version="0.10.0"; sha256="0l6jp6h2c0gcav3mnw9rz1wba7va2261pjjw5r3hqjjg8jrhfp0r"; depends=[data_table Formula ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL testthat]; }; CMAPSS = derive2 { name="CMAPSS"; version="0.1.1"; sha256="1rig2v1cl9ybnbikqfwbp4ji1jcxm6383xbdf8wz2f3lxk7iis8z"; depends=[Rdpack]; }; CMF = derive2 { name="CMF"; version="1.0.3"; sha256="08fy6iz535z3v92dra184fyiaqikdv7m5z8hd394mji1qpwicbaa"; depends=[cpp11]; }; CMFsurrogate = derive2 { name="CMFsurrogate"; version="1.0"; sha256="1n0kf6mby71zccymdl75yw8rafkl9y7kn9j2pipqf15zvbqdl33j"; depends=[MASS]; }; @@ -722,8 +713,9 @@ in with self; { CMMs = derive2 { name="CMMs"; version="1.0.0"; sha256="0wdzyg7kwad8z6kdijbpj8dmhyv17rg027rspv8hxlg8r3l8bd47"; depends=[dplyr fastDummies forcats ggplot2 robCompositions survey]; }; CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; }; CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; }; - CMplot = derive2 { name="CMplot"; version="4.3.1"; sha256="15dvim5sngzgx7hgy280gdimbqy9508vh2ic8izkhj529n0mnanz"; depends=[]; }; + CMplot = derive2 { name="CMplot"; version="4.4.3"; sha256="0mkjpmwpd0izczp8jgfcfxw9i4qv82aj1xyhzsxgdxnjdd7ark66"; depends=[]; }; CNAIM = derive2 { name="CNAIM"; version="2.1.4"; sha256="1bwjglhsv8bd58clzlsa34ag0djyim85p0ilfclx4all1ycrz1k2"; depends=[dplyr ggplot2 jsonlite magrittr plyr r2d3 stringr tibble]; }; + CNID = derive2 { name="CNID"; version="1.3"; sha256="1apqfaym4kd38k1dadn94hb7gchqxycdl12k1v4k4pcgw7jdqrpb"; depends=[]; }; CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNPS = derive2 { name="CNPS"; version="1.0.0"; sha256="046jd4nh54qaqm85m74nvgj6x83mf8sd76y4dxydy4ydrk4cvz6p"; depends=[]; }; @@ -731,7 +723,7 @@ in with self; { CNVScope = derive2 { name="CNVScope"; version="3.7.2"; sha256="03jkivg9jr2dpkf739cba3dsjf56gwvcpq3nqhp42kmmgn50rpiq"; depends=[biomaRt data_table doParallel dplyr foreach GenomicInteractions ggplot2 Hmisc jointseg magrittr Matrix matrixStats OpenImageR plyr RCurl reshape2 rtracklayer shiny stringr tidyr]; }; CNprep = derive2 { name="CNprep"; version="2.2"; sha256="1vfy86b5cczw0va2fkbjv9c99q1gz3sx76yra76x8sz94nhxxq4m"; depends=[mclust rlecuyer]; }; COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; }; - COINr = derive2 { name="COINr"; version="1.1.2"; sha256="162936aqypgxr59nnyk4nsmd0nbkdxddkwvwdw7ag7wp8zdkphx6"; depends=[ggplot2 openxlsx readxl rlang]; }; + COINr = derive2 { name="COINr"; version="1.1.7"; sha256="0yvaqm2f4ny0afqyis0fna2h3cngwpb7xaw9kpr9nsbfdigj3d47"; depends=[ggplot2 openxlsx readxl rlang]; }; COLP = derive2 { name="COLP"; version="1.0.0"; sha256="0259s058rn7fyprma5frx7sdjv4qk9hxijpi9xh7qyz5jzzsi660"; depends=[combinat MASS]; }; COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; }; COMBO = derive2 { name="COMBO"; version="1.0.0"; sha256="12k5lchxdxql3q7si05404f8dc26xjxqf95mq5jykgp9chgl6i5w"; depends=[dplyr Matrix rjags SAMBA tidyr turboEM]; }; @@ -763,28 +755,27 @@ in with self; { CREDS = derive2 { name="CREDS"; version="0.1.0"; sha256="1llgxsmpk13gq75y2r3qiwwjcl87bknkryaw5dq0ndf17rj31mw8"; depends=[MASS]; }; CRF = derive2 { name="CRF"; version="0.4-3"; sha256="0jlcc1ffd2z7sz1szbi4vrp5rihmcp18bsw27x02ivi6l21nyivf"; depends=[Matrix]; }; CRM = derive2 { name="CRM"; version="1.2.4"; sha256="0jv2z1y3zyj1m86p4pmqww58hj8pvid1ss6ym67y46n9srzxsmj5"; depends=[]; }; - CRMetrics = derive2 { name="CRMetrics"; version="0.2.3"; sha256="02kkrzbqna9wg1hkrahax60awj6dzm0w22mz2mc4y9jsswzdlb5p"; depends=[cowplot dplyr ggbeeswarm ggplot2 ggpmisc ggpubr ggrepel magrittr Matrix R6 scales sccore sparseMatrixStats tibble tidyr]; }; + CRMetrics = derive2 { name="CRMetrics"; version="0.3.0"; sha256="1abrbkhhn5s3h4dam2pgmvqpqw0bpqzhj0521p7v48gsyfg224bw"; depends=[cowplot dplyr ggbeeswarm ggplot2 ggpmisc ggpubr ggrepel magrittr Matrix R6 scales sccore sparseMatrixStats tibble tidyr]; }; CRTConjoint = derive2 { name="CRTConjoint"; version="0.1.0"; sha256="1lp3rxjd8pilin6kvl49vm11bjd6dzhalmwf99j3jsiiavxc6baq"; depends=[doSNOW foreach Rcpp snow]; }; CRTSize = derive2 { name="CRTSize"; version="1.2"; sha256="00shm1d32gwssf230rxjnn41rvxpli6jnx0axp69bjvfm8zqynqj"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0.1"; sha256="0sqsgs8qbc6gvzr3l2r8y83nbhz12q3jf2cjlb2xgif15r7sbnxx"; depends=[ggplot2 MASS Matrix]; }; + CRTspat = derive2 { name="CRTspat"; version="1.0.0"; sha256="02am3jr538dbgky00d2sli7w4yl8ij59ijcs0akb9gqn0nffq251"; depends=[dplyr geepack ggplot2 jagsUI lme4 magrittr MASS Matrix OOR sf spatstat_geom spatstat_random tidyr TSP]; }; CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; }; CRediTas = derive2 { name="CRediTas"; version="0.2.0"; sha256="163m37bz99g6qvfbnbvvdv02x6984x5prsbj1d7mq08bnlmj9zr0"; depends=[]; }; CSCDRNA = derive2 { name="CSCDRNA"; version="1.0.3"; sha256="0ym6bzk8n9kf0pvd3h4dv2hhxmmrr54hvs7vccmxrhxikr8ix5iy"; depends=[Biobase BisqueRNA limSolve MAST nlshrink plyr Seurat]; }; CSCNet = derive2 { name="CSCNet"; version="0.1.2"; sha256="0amsrjzpfga66mh6x589whz70xpl0sg10f80x87apxz312rb4r8m"; depends=[caret dplyr furrr future glmnet magrittr prodlim purrr recipes riskRegression stringr survival tibble tidyverse]; }; CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; }; - CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; }; CSGo = derive2 { name="CSGo"; version="0.6.7"; sha256="19awbblkx0g58gvd43xs1dmcsn588k185njw3fri8xxbn26xp5jy"; depends=[dplyr extrafont furrr future fuzzyjoin ggplot2 httr jsonlite magrittr purrr stringr]; }; CSHShydRology = derive2 { name="CSHShydRology"; version="1.4.0"; sha256="06hdqdzvfpfn4r6x1d2m24lz2w5sj20fr7d791zqzd16mp767qcc"; depends=[circular dplyr fields ggplot2 ggspatial httr Kendall lubridate magrittr OpenStreetMap plotrix raster rnaturalearth sf stringr tidyhydat timeDate whitebox]; }; CSIndicators = derive2 { name="CSIndicators"; version="1.0.1"; sha256="01x5lyxw5ca8xqndfxdjzj2jak7kwndqwqb9shz53hj6p5z0wld2"; depends=[multiApply]; }; CSMES = derive2 { name="CSMES"; version="1.0.1"; sha256="1p8wsl9h1f44a7kkj660h1k1v26pp6q1h13rw9l6pikniwdks84c"; depends=[caTools data_table mco ROCR rpart zoo]; }; CSTE = derive2 { name="CSTE"; version="2.0.0"; sha256="0r38pvd83aw9zrq43malw50vlbnknh3b53x3ydj0wxrk95wsmy46"; depends=[dfoptim fda locpol Rcpp survival]; }; - CSTools = derive2 { name="CSTools"; version="5.0.1"; sha256="1c9lwa9mkkkw23yzcg0b74y4y3153z9n0bpzzgp772whxw0l0vx8"; depends=[abind ClimProjDiags data_table easyVerification ggplot2 lubridate maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv scales verification]; }; + CSTools = derive2 { name="CSTools"; version="5.1.1"; sha256="0mh50wz0c7x00mi5a5h474v5l5pimgpijdywkh1rsix7a0gj8fzj"; depends=[abind ClimProjDiags data_table easyVerification ggplot2 lubridate maps multiApply ncdf4 plyr qmap rainfarmr RColorBrewer reshape2 s2dv scales startR verification]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; }; CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; }; CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; }; CTNote = derive2 { name="CTNote"; version="0.1.0"; sha256="078h48y42skjdknamyznnl2g7jl3vicdggmx7w7rd3wc1lnm7l8f"; depends=[stringi stringr]; }; - CTP = derive2 { name="CTP"; version="3.0.1"; sha256="02f423y7yx0hchzghfdbrrljsfq3af1wcbvk8z1q5wyzq99xcag5"; depends=[clinfun diagram dplyr emmeans Gmisc magrittr MASS shape survival]; }; CTShiny = derive2 { name="CTShiny"; version="0.1.0"; sha256="0lmzf02w8j4rgz1kh7jwvl0sb6y38r56gwmsf7pkc00w1dskb722"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; CTShiny2 = derive2 { name="CTShiny2"; version="0.1.0"; sha256="13klj1h0m80hlf5hbbzm2xriy37ky772pk1fm4b6k3xma7ss2a6q"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; }; @@ -801,26 +792,26 @@ in with self; { CVThresh = derive2 { name="CVThresh"; version="1.1.2"; sha256="14fgm5kzp1sscklv2pra800p12ga2hlqmm8s6zs5hdhlyvf0kj6v"; depends=[EbayesThresh wavethresh]; }; CVXR = derive2 { name="CVXR"; version="1.0-11"; sha256="0alp1g4bszxqcrjbn54bz1zswg8y10372fwwlbi0jjazycw9cap9"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; - CVrisk = derive2 { name="CVrisk"; version="1.1.0"; sha256="0xnpnjncdal2akdnkb52s7r82p2di0rc48h6nswbclkl5xf3snd6"; depends=[]; }; + CVrisk = derive2 { name="CVrisk"; version="1.1.1"; sha256="1krqg3w2yqbpisivyym98p6yvhw1dw6qga8xm1sqxdd75g982fhq"; depends=[]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.2.0"; sha256="0s4mqlas41ll656hj1imzqydgwgw002d469z01fjdcs4d6daljw6"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; - Cairo = derive2 { name="Cairo"; version="1.6-0"; sha256="1lxpmzy6k8y9b6g7x68x0giy8bblxmbc4q136hkzajmailfsqqn7"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.6-1"; sha256="051pqbhfsr3dki2wiycbwvka850y4h4gyhvnjjf907q8sz2cykg6"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.5.2"; sha256="1ij3xaizq1lpq5vg25i8pz4khm7ab81kzfayp6a914n0jgxvprj7"; depends=[ExactMultinom spatstat spatstat_geom]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.3.0"; sha256="0qwqvyrpprxc5v0ng6qjp9gmdf0n0iiv46z14d8h303xpi84g42x"; depends=[survey]; }; - CalibrationCurves = derive2 { name="CalibrationCurves"; version="1.0.0"; sha256="0bhgwbpykj374nbsz62sjhzx2xahm7a5z8cfmg2pkpf713f6qaxb"; depends=[ggplot2 Hmisc rms survival]; }; + CalibrationCurves = derive2 { name="CalibrationCurves"; version="2.0.0"; sha256="0h6mnsl5zak7x2gcjja0rbdq87bjr6qqjbaal509f7gzy6jg3ql0"; depends=[bookdown ggplot2 Hmisc rms survival]; }; CamelUp = derive2 { name="CamelUp"; version="2.0.3"; sha256="1d3ywb4bxnn149api6lqry8q9lasng79hzka9ndr5cv38pkbvva9"; depends=[data_table dplyr ggplot2 magrittr Rcpp shiny]; }; CancerEvolutionVisualization = derive2 { name="CancerEvolutionVisualization"; version="1.0.1"; sha256="1ldhrqnx5xmshhbjrfbzwbp9p9lgawfnjsmw6vj8jxww9yg2pl7l"; depends=[gridExtra gtable plyr stringr]; }; CancerGram = derive2 { name="CancerGram"; version="1.0.0"; sha256="1p612dbn6dxn3nz8m0pzlsbczg3f8gwqk9q0fnxbcdlbll0vf2k0"; depends=[biogram devtools dplyr pbapply ranger shiny stringi]; }; - Canek = derive2 { name="Canek"; version="0.2.2"; sha256="1hjgn6f5dxh7yw2l0fmpxdypfb9hrlh7lbgkq8g7nw2vgxspgr55"; depends=[bluster FNN fpc igraph irlba matrixStats numbers]; }; + Canek = derive2 { name="Canek"; version="0.2.3"; sha256="1x6lyzmcgfwl9469j3f6csv7d1zaq5yn0nvxs5xvrplp02j8614b"; depends=[bluster FNN fpc igraph irlba matrixStats numbers]; }; Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; - CarletonStats = derive2 { name="CarletonStats"; version="2.1"; sha256="05ljr9z8qfjrcwjk1rp19ra208dm910qc03hci0swkd0g2x3pyph"; depends=[]; }; + CarletonStats = derive2 { name="CarletonStats"; version="2.2"; sha256="1d9g773l1ra5cr2q3azlkpkqy2035zq065cpfyavf57js0ks5ciq"; depends=[ggplot2 patchwork scales]; }; Carlson = derive2 { name="Carlson"; version="2.1.0"; sha256="1b1jrkyjj2ygvdphzayrmnirdzmyddrjp6sgiqf6404kly50ff0w"; depends=[Rcpp]; }; Cascade = derive2 { name="Cascade"; version="2.1"; sha256="1hfbv9129rnrjqspjd8wnhw0qrp1m142bixlwddzr6j2sg7r8s20"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; CascadeData = derive2 { name="CascadeData"; version="1.4"; sha256="0cbnp8mqv3alsz7b5fa8djg1yd46zkn1f3b0pqww2yn8zavd4fih"; depends=[]; }; CaseBasedReasoning = derive2 { name="CaseBasedReasoning"; version="0.3"; sha256="0ayckjq53lmdm429bvb4fjsbyy7cp3jgds30swmzq9qf75bnaa55"; depends=[cowplot dplyr ggplot2 pryr purrr R6 ranger Rcpp RcppArmadillo RcppParallel rms survival tidyr]; }; - CaseCohortCoxSurvival = derive2 { name="CaseCohortCoxSurvival"; version="0.0.31"; sha256="1r1ki47i7dp3q9wpw2vbaglnq33b109wlc6s51kfvfnlm8vi4nkp"; depends=[nnet survival]; }; + CaseCohortCoxSurvival = derive2 { name="CaseCohortCoxSurvival"; version="0.0.32"; sha256="1r8c0d776vhxckcsf7jyiigxm1i8rlklxwnfkqvg73jqz1qhw2nw"; depends=[nnet survival]; }; CatDataAnalysis = derive2 { name="CatDataAnalysis"; version="0.1-5"; sha256="19bbilvz9h2bswpm5992c48cm4slc73kf0ny2mp78vhcfadri9cb"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; }; CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; @@ -830,11 +821,11 @@ in with self; { CauchyCP = derive2 { name="CauchyCP"; version="0.1.1"; sha256="0sv1gfvgwqvm7zb3rhlhmfgfwm2i49wzzkg473gdmamvvpvzih43"; depends=[survival]; }; CausCor = derive2 { name="CausCor"; version="0.1.2"; sha256="1m41i4knqh4hddz3s3p62qhx2dmdypm8gfdwlczlja89llx9737b"; depends=[cowplot dplyr ggplot2 magrittr WriteXLS]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; - CausalGPS = derive2 { name="CausalGPS"; version="0.4.0"; sha256="0bibrdqgnzbsai18v7x89vmjnrlgd27fzdrn219fiz41jyra40jn"; depends=[data_table Ecume gam ggplot2 gnm KernSmooth locpol logger MASS polycor Rcpp rlang SuperLearner wCorr xgboost]; }; + CausalGPS = derive2 { name="CausalGPS"; version="0.4.1"; sha256="0qawlwd5a6xryw0688wx04s55gahchxb3xxs0jpiqqrm9rp3y687"; depends=[cowplot data_table Ecume gam ggplot2 gnm KernSmooth locpol logger MASS polycor Rcpp rlang SuperLearner wCorr xgboost]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.3.0"; sha256="0h3sh35962vdph72svfdvk6b1gl7wnj2kfkkpcjldbiszlfxp7wx"; depends=[assertthat Boom bsts ggplot2 zoo]; }; CausalMBSTS = derive2 { name="CausalMBSTS"; version="0.1.1"; sha256="1mjw2zyddkci6vkbyz3d94l5z1aj3rc2w6lag5igbfv4q0n5qcrp"; depends=[CholWishart forecast KFAS MASS Matrix MixMatrix]; }; CausalModels = derive2 { name="CausalModels"; version="0.2.0"; sha256="19m1qfzssrwmsxiiyqiqby102qmxxcmbyxhggd9bb44z2iicf8cl"; depends=[boot causaldata geepack multcomp]; }; - CausalQueries = derive2 { name="CausalQueries"; version="0.1.0"; sha256="1m7i5v4im85lzn9agf9nlf458y76k21h59avg4924bm4hn709lls"; depends=[BH dagitty dirmult dplyr ggdag ggplot2 latex2exp lifecycle Rcpp RcppEigen repr rlang rstan rstantools StanHeaders stringr]; }; + CausalQueries = derive2 { name="CausalQueries"; version="1.0.1"; sha256="120247m3dfgwv71gg7hkrfw4yhdkk88c2qqvl2ri8hbp4w8k5gzg"; depends=[BH dagitty dirmult dplyr ggdag ggplot2 latex2exp lifecycle Rcpp RcppArmadillo RcppEigen rlang rstan rstantools StanHeaders stringr]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.8.0"; sha256="1wjm6nyjaz3z0g2dxk1k82va86qxx2xsgx02y9ipyzf1ldxclm1s"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.3"; sha256="0l36bz73xy9miikqdigbnyr0bk83dx6wsaqlsc14b0r64jca4ak6"; depends=[gtools igraph survival]; }; @@ -864,17 +855,18 @@ in with self; { ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.3.0"; sha256="1i8025av3k24zv1ll98l1526v2pdkzda23gjy6c30vknvyrcxkc0"; depends=[]; }; CholWishart = derive2 { name="CholWishart"; version="1.1.2"; sha256="0lms6bnd0czb25ir4ls0lxv4d2ygqiq8ampnv9j7l6hj28xmqyjj"; depends=[]; }; CircMLE = derive2 { name="CircMLE"; version="0.3.0"; sha256="1nr6qicy5y247j970jw74pkbyhx4zjgajf2ygkxmdw6gfx5byn64"; depends=[circular energy]; }; - CircNNTSR = derive2 { name="CircNNTSR"; version="2.2-1"; sha256="0mpm6vrkl3ap67khky8dndwvl9yzycm0rlv0vzznlygvlsg8sc38"; depends=[]; }; + CircNNTSR = derive2 { name="CircNNTSR"; version="2.3"; sha256="0in6rwsqlmyza7gjh0q9vvbbiir0px90wnmnhlmzmm85iaxarmq6"; depends=[]; }; + CircNNTSRmult = derive2 { name="CircNNTSRmult"; version="0.1.0"; sha256="1x5q8v33k67km0lclfs6dy408grq8yfvld7zx9y8zxm5qq3a576b"; depends=[CircNNTSR psychTools]; }; CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircSpaceTime = derive2 { name="CircSpaceTime"; version="0.9.0"; sha256="0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8"; depends=[circular coda ggplot2 Rcpp RcppArmadillo RInside]; }; CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; }; CirclesIntersections = derive2 { name="CirclesIntersections"; version="1.1"; sha256="0q7w3fl8qz5gknri217qq68wij355dljnpv538yqhf03h405xc3f"; depends=[]; }; CircularDDM = derive2 { name="CircularDDM"; version="0.1.0"; sha256="1wxdjj7dndvhvl00cykcrwmw9f7halsg3a0db56kp2mhf54rj37z"; depends=[Rcpp RcppArmadillo]; }; CircularSilhouette = derive2 { name="CircularSilhouette"; version="0.0.1"; sha256="03214kqpnfjr9swafy1yjwr2jjj3iafb6ikn2sd45k2cx4xvprr3"; depends=[OptCirClust Rcpp Rdpack]; }; - Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.4"; sha256="1lr9pang73hzmwlak9hc9sgsnqkw06ipfarfdbxz5ycibasvb4a6"; depends=[Rcpp Rdpack]; }; + Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.5"; sha256="0ga0pjva0samik36mapllqr34w8fqrr3f6drnch7ziy1igdrj1d3"; depends=[Rcpp Rdpack]; }; Claddis = derive2 { name="Claddis"; version="0.6.3"; sha256="0wq34n6vj5sdc22yf9p4g9iy8ssgr4kkrsr2ak4sqahadwgngl8i"; depends=[ape clipr geoscale phytools strap]; }; ClaimsProblems = derive2 { name="ClaimsProblems"; version="0.2.1"; sha256="10ylcikss9ld393cb40ddkkz7as1d5bnrna0sqwdrn1cb3p9p4w2"; depends=[geometry pracma rgl]; }; - ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; + ClamR = derive2 { name="ClamR"; version="2.1-3"; sha256="1qf0xflzww2vdv3sl2s8lncmv4k7aa4wbgpqm9v8slsa615a6n09"; depends=[]; }; ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; }; ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.4.0"; sha256="06l7jvpcdynij05hb0ka33zpg7xdyqyzfzx24s0bnlspp83yc62s"; depends=[Biobase cluster mclust oompaBase oompaData]; }; CleanBSequences = derive2 { name="CleanBSequences"; version="1.4.0"; sha256="194590508s0j5z6srm2vmv6aa4d2fia4apbd3zmd8ria27ppcrfg"; depends=[Biostrings]; }; @@ -892,15 +884,14 @@ in with self; { CliquePercolation = derive2 { name="CliquePercolation"; version="0.4.0"; sha256="17m8pj8wg2ngzip1ag3jm5fqi083ilrsi0rvpcg5jmqflwlka8h3"; depends=[colorspace igraph lessR magrittr Matrix ohenery pbapply Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.11"; sha256="19aj4c2q3wp4vp08j72700wwyqmkqxwml2fwmz0wsxdam8vp1ydi"; depends=[combinat mc2d quantmod]; }; CluMP = derive2 { name="CluMP"; version="0.8.1"; sha256="1vpxl2rcknqx32b94b48iirkh7r7cdri9mcljrw29gsbvhrfc46k"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; - ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; - ClusBoot = derive2 { name="ClusBoot"; version="1.0.1"; sha256="0x7r287gz3ls3cr1g9bnvyj7i3m2fksay2h1idvq5x5kvjr1x0pk"; depends=[]; }; + ClusBoot = derive2 { name="ClusBoot"; version="1.2.1"; sha256="03xch4s8xlvl17vbpm3jk0a6faa57hq0amyg91d9kjr4d6bb4km1"; depends=[]; }; ClusPred = derive2 { name="ClusPred"; version="1.1.0"; sha256="12pm5vkfxpaincv9ajid0p07l0mjc2kfqqfg0ls2pcxmmkh8wwb4"; depends=[ald ALDqr quantreg Rcpp RcppArmadillo VGAM]; }; ClusROC = derive2 { name="ClusROC"; version="1.0.2"; sha256="055ppcnzwkapnyf9xvld4bvkccwf494gqcb2qq0vnsa8n6bz5k46"; depends=[doParallel ellipse foreach ggplot2 ggpubr iterators nlme numDeriv Rcpp RcppArmadillo rgl]; }; ClusTorus = derive2 { name="ClusTorus"; version="0.2.2"; sha256="052jq96xr9qrc203ib11qsni50j0jzdpfwmbnd5rypfvff6w5kxc"; depends=[BAMBI cowplot ggplot2 igraph purrr rlang]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; ClustAssess = derive2 { name="ClustAssess"; version="0.3.0"; sha256="0b8p5dpb843rv8q1hsc74zhxyn9wjgdxwpwrbq2yx4jmy8v65gzq"; depends=[doParallel dplyr fastcluster foreach ggplot2 igraph irlba magrittr Matrix progress Rcpp reshape2 rlang stringr uwot]; }; - ClustBlock = derive2 { name="ClustBlock"; version="3.1.1"; sha256="1rdymkb653wlfr355irvfk3mbs0sc8cm63id9vynbww8pk7alyqz"; depends=[FactoMineR]; }; + ClustBlock = derive2 { name="ClustBlock"; version="3.2.0"; sha256="10nd53lzrdd3x1hhr88wr509qnbgpf707xr1qhc8r1jcjlipqpxn"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.1"; sha256="03f7appg9n90ahzjhh5si9iv1vm06im9qmhgfc72fvqrmvqy2alh"; depends=[sp spdep]; }; ClustImpute = derive2 { name="ClustImpute"; version="0.2.4"; sha256="0ss7zsnamh8ir2wpgy6swxck93yr4dd7g7hvyzc1cv6g3k28fb49"; depends=[ClusterR copula dplyr ggplot2 knitr magrittr rlang tidyr]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; @@ -916,15 +907,19 @@ in with self; { CoDiNA = derive2 { name="CoDiNA"; version="1.1.2"; sha256="1zjj86z8ica9j0x2nfyq9y6nyp54w07dwskcsg7z6kqibrkfvaq9"; depends=[data_table igraph magrittr plyr reshape2 visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; }; + CoMiRe = derive2 { name="CoMiRe"; version="0.8"; sha256="0wq1li1snn4c01vw1zqv6s9sqjrmiw04pkkmx2zdy5wg6bzfz363"; depends=[ggplot2 gtools KernSmooth mvtnorm Rcpp RcppArmadillo rlang splines2 truncnorm]; }; CoNI = derive2 { name="CoNI"; version="0.1.0"; sha256="19nyn4gh4bnrvbbh2df8459015fkb2bgwwmq17vqq7r2j4gkgxzh"; depends=[cocor data_table doParallel dplyr forcats foreach genefilter ggplot2 ggrepel gplots gridExtra Hmisc igraph plyr ppcor rlang tibble tidyr tidyselect]; }; CoOL = derive2 { name="CoOL"; version="1.1.2"; sha256="18z7s8bvnym4xj0hh5m6bwm86ddmsgivqv4g5zbd9m87l7khl9pn"; depends=[ClustGeo data_table ggplot2 mltools plyr pROC Rcpp RcppArmadillo wesanderson]; }; CoRpower = derive2 { name="CoRpower"; version="1.0.4"; sha256="08chsbbl74rskinp68pwzpvnxx5lkfqf71j7ryp1cwy7199h3jyw"; depends=[osDesign survival]; }; CoSMoS = derive2 { name="CoSMoS"; version="2.1.0"; sha256="149mybfxaqssawp8fqhjiv3xljzflc02y4pfvavz7rklfplidqkb"; depends=[animation cowplot data_table directlabels ggplot2 ggquiver mAr Matrix matrixcalc MBA mvtnorm nloptr plot3D pracma]; }; CoTiMA = derive2 { name="CoTiMA"; version="0.6.2"; sha256="0394a6m1hg9klcgpk4s51rql8k2084cbs6bzpgrsbk3gnvcxy8s3"; depends=[abind crayon ctsem doParallel foreach lavaan MASS MBESS OpenMx openxlsx psych rootSolve RPushbullet scholar stringi zcurve]; }; + CoastlineFD = derive2 { name="CoastlineFD"; version="1.0.0"; sha256="006bl6gpjlmfayfl9116mx3qmvxgv1p811gbnk0rglpy0185lxlq"; depends=[fields ggplot2 progress readxl sf sfheaders tidyr writexl]; }; CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; }; CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; }; - CodelistGenerator = derive2 { name="CodelistGenerator"; version="1.6.0"; sha256="09xq83qgc2y8bpxa0xmlj794cwhn5szqw4hgicqssb12qx3vnivs"; depends=[CDMConnector checkmate cli DBI dplyr glue lubridate magrittr PatientProfiles purrr RJSONIO rlang stringr tidyr tidyselect]; }; + CodelistGenerator = derive2 { name="CodelistGenerator"; version="2.0.0"; sha256="1pb56361jj9mwyx5b22ibygpql7ycyvhijv96727l6fg2mjg0s8g"; depends=[CDMConnector checkmate cli DBI dplyr glue lubridate magrittr PatientProfiles purrr RJSONIO rlang stringr tidyr tidyselect]; }; CohensdpLibrary = derive2 { name="CohensdpLibrary"; version="0.5.10"; sha256="1d3nk3wr23skmzskglw7n8vpj9ja6ak4q9db9xlmf1j3plsx5g98"; depends=[Rdpack]; }; + CohortAlgebra = derive2 { name="CohortAlgebra"; version="0.0.4"; sha256="0zmz6f1ysp4gy6lg15x1x93q7v5zli0znfsk522bki4qbh2h1qq8"; depends=[checkmate DatabaseConnector dplyr lifecycle rlang SqlRender]; }; + CohortExplorer = derive2 { name="CohortExplorer"; version="0.1.0"; sha256="1jskxg72g7n5n3zg2kmkhykcrbf30q0h919273n6lm6nw0pzn44d"; depends=[checkmate DatabaseConnector dplyr lifecycle ParallelLogger rlang]; }; CohortPlat = derive2 { name="CohortPlat"; version="1.0.5"; sha256="01jvi7k3lvx684c4cwn3xrpwjsksk7gjvs3db64ji7chc4lkajv4"; depends=[doParallel dplyr epitools forcats foreach ggplot2 openxlsx plotly purrr tidyr zoo]; }; Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; }; CollapseLevels = derive2 { name="CollapseLevels"; version="0.3.0"; sha256="1d2grxh95893j260igh4yh2z3rm3zymlpadqyp6w3na91birazb4"; depends=[dplyr ggplot2 lazyeval magrittr]; }; @@ -934,7 +929,6 @@ in with self; { ComRiskModel = derive2 { name="ComRiskModel"; version="0.2.0"; sha256="0jpsmcpi7s0y4dff3k10daimb4gfq7r5sf1w8n51q21zfgf3mn4d"; depends=[AdequacyModel]; }; CombinS = derive2 { name="CombinS"; version="1.1-1"; sha256="06g41zbjl54cbhhs8q7l4bbvszclvbxn3m2dqg800d6ghs9vgl6v"; depends=[]; }; CombinePortfolio = derive2 { name="CombinePortfolio"; version="0.4"; sha256="0kj96i2ahq7ax1nx66jac8bbdiiyviwnzr4cr4gn0b8y580rdcwi"; depends=[]; }; - CommEcol = derive2 { name="CommEcol"; version="1.7.1"; sha256="1s6x4mhcx64qdzmp83x3mzmwyj1biawmdj2y752xpm8gpxfjnbc0"; depends=[adespatial ape betapart gmp picante vegan]; }; CommKern = derive2 { name="CommKern"; version="1.0.1"; sha256="1nr1mfc8nigwp8y6f4hiw7irbmyicdk5vjvlcndcywd1lzmlwi4b"; depends=[ggnewscale ggplot2 gridExtra Matrix RColorBrewer reshape2]; }; CommonJavaJars = derive2 { name="CommonJavaJars"; version="1.0-6"; sha256="0l1zqygklv1s3xr6pjjrji3wmyqg7258qvgwf9c2qjim8p8y8lsr"; depends=[]; }; CommonMean_Copula = derive2 { name="CommonMean.Copula"; version="1.0.4"; sha256="0c4la7sn3aynmj9qcz5d9gn9k3y5b38bjff0mfa5qccdb8rdkdhp"; depends=[mvtnorm pracma]; }; @@ -942,6 +936,7 @@ in with self; { CompAREdesign = derive2 { name="CompAREdesign"; version="2.2"; sha256="1dgwwamxw1407lfmla151a5lb0w5ijrwqpflvaakqsf1yd050d2c"; depends=[copula ggplot2 ggpubr numDeriv rootSolve]; }; CompDist = derive2 { name="CompDist"; version="1.0"; sha256="02c18ksk6clv674yh79bzg3mh9hymzhal51j6g0rnvqd5ra8g66c"; depends=[actuar fExtremes numDeriv PearsonDS rmutil VGAM]; }; CompModels = derive2 { name="CompModels"; version="0.3.0"; sha256="1373m324zq7f3wffb25ypjidvsxki0p64iv4qy8i887g4f8inq6q"; depends=[]; }; + CompPareto = derive2 { name="CompPareto"; version="0.1.0"; sha256="1g2cas8pld75wjsvs73knpxyjlaggq5vrzb63hcv3bi29wcwjlzz"; depends=[actuar]; }; CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; Compack = derive2 { name="Compack"; version="0.1.0"; sha256="1bl1drbkak7r7scfiij6sf8fjzq01y3p05mjlkknhi9k1l6jq0mi"; depends=[fda MASS orthogonalsplinebasis plyr Rcpp RcppArmadillo]; }; @@ -949,18 +944,17 @@ in with self; { CompareMultipleModels = derive2 { name="CompareMultipleModels"; version="0.1.0"; sha256="0qzybbxx5kqlrb260c0wh2vhp3ci5wk6853mm01wfyivhvf7sz0h"; depends=[CEEMDANML]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.1.1"; sha256="0lidakxb1ab6bpb7sf2arjl1xpym1lzxbh63g0x4c2dm7h0kzkwi"; depends=[muhaz survival survRM2 TSHRC]; }; - Compind = derive2 { name="Compind"; version="2.7.1"; sha256="1429dw025h5fp1wvmyqc5b25wczwf2c44fgp47blzmd3b4qvj6sz"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; + Compind = derive2 { name="Compind"; version="2.8"; sha256="0h5kklflxdaf3i3iksblhfhyfsa44hrj9aniz83pyf62730lzjxx"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; ComplexUpset = derive2 { name="ComplexUpset"; version="1.3.3"; sha256="1sk4v5kc2wkgfaws0hjlp30mngm907r5gz1iglf68j46lfs9jbsv"; depends=[colorspace ggplot2 patchwork scales]; }; - CompositeReliability = derive2 { name="CompositeReliability"; version="1.0.2"; sha256="0m1zx5c0jy45y5blj14ghwqq9cb99nh4bxw92qv9avpih5xl1l1d"; depends=[dplyr ggplot2 lme4 magrittr plyr psych reshape2 tidyr]; }; - Compositional = derive2 { name="Compositional"; version="6.3"; sha256="09xkfrxapbvaqv2p2gp5dpmqzjvdm3dxs499g7ym6dyd6i971yfs"; depends=[codalm Directional doParallel emplik energy FlexDir foreach glmnet MASS mda mixture NlcOptim nnet pchc RANN Rfast Rfast2 sn]; }; + CompositeReliability = derive2 { name="CompositeReliability"; version="1.0.3"; sha256="04qpwqrz1x1hdjfin77fb4kywv9sspzdq7kn4f7jxaaz3ykhrhkc"; depends=[dplyr ggplot2 lme4 magrittr plyr psych reshape2 Rsolnp tidyr]; }; + Compositional = derive2 { name="Compositional"; version="6.5"; sha256="0m92v0b9lnyyjj0wac6m0qbn5sxzrswwm48vs7cfv60lakwgkgxy"; depends=[codalm Directional doParallel emplik energy FlexDir foreach glmnet MASS mda mixture nnet pchc RANN Rfast Rfast2 sn]; }; CompoundEvents = derive2 { name="CompoundEvents"; version="0.2.0"; sha256="0dlkkr26f07g0q3kcg0byvvlnf2hd5i8h9p1mkba333wh6af21ic"; depends=[]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6.1"; sha256="1ziy646lbx297kia797xjxa8hyl826x1hiighyjslvnlvrhapx08"; depends=[Rcpp]; }; ConNEcT = derive2 { name="ConNEcT"; version="0.7.27"; sha256="1j66qmvgm9yrgnrcg600s25haq9imcshmy6fv9vd84mhy21md85h"; depends=[qgraph]; }; - ConR = derive2 { name="ConR"; version="1.3.0"; sha256="1q93x2b7a2jgkybazk24x8gvwvjjvkhi1gy5zx1sc2f4arm73myq"; depends=[doSNOW fields foreach geosphere raster rgdal rgeos rnaturalearth sf snow sp tibble writexl]; }; ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; }; Conake = derive2 { name="Conake"; version="1.0.1"; sha256="00c07wlsrzf6cwpaxmd7c78cxiwc3jfslxm6sxpbpr6b8270hz5m"; depends=[]; }; ConcordanceTest = derive2 { name="ConcordanceTest"; version="1.0.2"; sha256="1dmvfm3ng9hwalhhwc5qw215zcjd37vmxlf1gc88fhi0cmj2k9hg"; depends=[Rglpk]; }; - CondCopulas = derive2 { name="CondCopulas"; version="0.1.2"; sha256="07drchcihzqql10fy5adzxbp28ik2xaljx7rv7vr5g9mv07g9klx"; depends=[data_tree glmnet nnet ordinalNet pbapply statmod tree VineCopula wdm]; }; + CondCopulas = derive2 { name="CondCopulas"; version="0.1.3"; sha256="0yfph755iwdmkf453jkcf71i25z1v604swh7ggbbdv2awsb4isd9"; depends=[data_tree glmnet nnet ordinalNet pbapply statmod tree VineCopula wdm]; }; CondIndTests = derive2 { name="CondIndTests"; version="0.1.5"; sha256="0km4z8wnj5msg1pmphk2fccbw1cidsxv174817lwcyii9nf5iwsm"; depends=[caTools kernlab lawstat MASS mgcv mize pracma quantregForest randomForest RPtests]; }; CondMVT = derive2 { name="CondMVT"; version="0.1.0"; sha256="010zfd2pdmajbicslz0wamv20gc0im5iwcfpjd14awi2v9pg9vg8"; depends=[mvtnorm]; }; CondiS = derive2 { name="CondiS"; version="0.1.2"; sha256="19l26ajzbi58cnim1kgxb5wrilqpvz6znv01zd42s3w6899km28b"; depends=[caret kernlab purrr survival survminer tidyverse]; }; @@ -983,18 +977,18 @@ in with self; { ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.3"; sha256="1y4kh00z63a9j8bsjgnf6lmwkivsf5zk8yw6i9d72a8jr2bhb78w"; depends=[lattice tkrplot]; }; ConvertPar = derive2 { name="ConvertPar"; version="0.1"; sha256="1czw97ya73dinad0n664045s9918a21kv97bpkal40kg029vnw59"; depends=[mirt neuralnet RWeka]; }; Convolutioner = derive2 { name="Convolutioner"; version="0.1.0"; sha256="1ria4ii7zdqgrzgdx4c82dj4lg791iwy2y66fv1qyibws0ag3bhq"; depends=[]; }; - CooRTweet = derive2 { name="CooRTweet"; version="1.3"; sha256="1svi2a18z6vgd30kx47pdfk4q08isgxa1pchlhmcff8qx969048h"; depends=[data_table igraph lubridate Matrix RcppSimdJson stringi tidytable]; }; + CooRTweet = derive2 { name="CooRTweet"; version="1.5.0"; sha256="0ws2fjvqnfx86776pbx23j8mbi02dvgm6fc4j7036h9qj6hqfbld"; depends=[data_table igraph lubridate Matrix RcppSimdJson stringi textreuse tidytable]; }; CooccurrenceAffinity = derive2 { name="CooccurrenceAffinity"; version="1.0"; sha256="0wn8jkvm5x30vj1vy196l691kbs5aa3j09s5dsa2r54cr34d16mn"; depends=[BiasedUrn cowplot ggplot2 plyr reshape]; }; CoopGame = derive2 { name="CoopGame"; version="0.2.2"; sha256="0i4yw2nznmcps9s9f592nbs8dvncb0w2bynvsfkp21lzd4pfsp4n"; depends=[geometry gtools rcdd]; }; - CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-20"; sha256="1n1k97imcg3n8nvl9759nqbzirxs011micx4qj2sf1d0bvnlrzs1"; depends=[dplyr geosphere ggplot2 raster rgbif rgdal rgeos rnaturalearth sp tidyselect]; }; + CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="3.0"; sha256="1jxcg1afmczrs88aj5lv5igypr8nlz9flf3b65lxqzk5p0wfgxfq"; depends=[dplyr geosphere ggplot2 rgbif rnaturalearth terra tidyselect]; }; CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; }; CopSens = derive2 { name="CopSens"; version="0.1.0"; sha256="0ljp2c25zmyiv88mdari08z9845y9niyg90a8vlq75im5w825w8a"; depends=[CVXR dplyr ggplot2 MASS pcaMethods tidyr tidyverse]; }; CopernicusDEM = derive2 { name="CopernicusDEM"; version="1.0.2"; sha256="1jgvq1c86xgdyp17z1pmz01lfw5nsfc2x71pcn399vcgij5j1jrf"; depends=[doParallel foreach glue sf]; }; - CopernicusMarine = derive2 { name="CopernicusMarine"; version="0.0.6"; sha256="002rkgjphnpjll901dmmhi1ahhfl6c5k7bw740r6h7v18dkcx36j"; depends=[crayon dplyr httr jsonlite leaflet purrr readr rvest sf stringr xml2]; }; + CopernicusMarine = derive2 { name="CopernicusMarine"; version="0.0.9"; sha256="01nzjm8fyv1kd7y8c4qj4al80kq96a16w4k0df9kss0m0cz86mls"; depends=[crayon dplyr httr jsonlite leaflet purrr readr rvest sf stringr xml2]; }; Copula_Markov = derive2 { name="Copula.Markov"; version="2.9"; sha256="18krq0q5i3j211g88sl153f1fa5crdcgclvl5lqawm7zykyzblh2"; depends=[]; }; Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="1.0.0"; sha256="1sxg0ir39f4hj4m6imija0c88j513j6fflcp7xc0599iglwsrbvs"; depends=[survival]; }; Copula_surv = derive2 { name="Copula.surv"; version="1.2"; sha256="1sashpxwbw0a5q8qvs8pwgxk0h5d3njw7j4gqrc8fh7bx71bqq7l"; depends=[]; }; - CopulaCenR = derive2 { name="CopulaCenR"; version="1.2.2"; sha256="1fk91adsahim1a6idpp4kpd2i607gh88j0xfgjnsdk94vlgx6wbs"; depends=[boot caret copBasic copula corpcor flexsurv icenReg magrittr plotly pracma survival VineCopula]; }; + CopulaCenR = derive2 { name="CopulaCenR"; version="1.2.3"; sha256="1z1a9hrb5v784j46yc2dsbizbis8pb5zdbc4cky8yws7swiax5m1"; depends=[boot caret copBasic copula corpcor flexsurv foreach icenReg magrittr plotly pracma survival VineCopula]; }; CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.1"; sha256="1a9v398yn7gflpnsrgzap8gy1b676ri1m3fwiv1jpc5l1cw154pm"; depends=[ggplot2 plyr reshape2 rstan]; }; CopulaGAMM = derive2 { name="CopulaGAMM"; version="0.3.0"; sha256="02bimr8j8zmpdllr5w7p40cy0y3bxfnr24ns5sg8074jw08dfbrh"; depends=[matrixStats statmod]; }; CopulaInference = derive2 { name="CopulaInference"; version="0.5.0"; sha256="10r2ni62fh6zl0im1n7apjf6kx2fprifn71rnaf7dh7xypdkqyw1"; depends=[doParallel foreach Matrix rvinecopulib]; }; @@ -1004,23 +998,22 @@ in with self; { Corbi = derive2 { name="Corbi"; version="0.6-2"; sha256="13lbh6fcfrpgz459mjdnfkd8kys2350s8j0vv9ps18092264gh42"; depends=[CRF igraph MASS Matrix]; }; CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.2"; sha256="04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; }; CoronaNetR = derive2 { name="CoronaNetR"; version="0.3.0"; sha256="1qqlkcbwmr9g8rnsgb7dd1npd09sva11y6fy1g7l4wdvmpw07ymh"; depends=[httr R_utils readr]; }; - CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; + CorrBin = derive2 { name="CorrBin"; version="1.6.1"; sha256="07nxara80zjpvaqjfjpwi2aw909wp1jj0v42dd0s06w00v502438"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="1.1"; sha256="0y91j59x19syzar17zj22i445qgig8s273f7pbw99dpxx05bbifm"; depends=[nlme psych]; }; CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.4"; sha256="1bff6vfyrgrij78l7n6dpk5g434iyr1h3qxdj7r0gvfzhw188h7p"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; - CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.17"; sha256="1g7irjbhwnbhk74y3qxcjlrsn2yz8q6wn7ih16wq669nswryxhxk"; depends=[bitops digest XML]; }; + CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.3.3"; sha256="00zb5wxygb95dmmn31wk6lmsljxpjypmpvwa047shysbyr4y5a4h"; depends=[]; }; CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.1"; sha256="1p0gp7m7v6nly0kr4pkjwxaa941z80nfc8ji5w0y73i79d024c2s"; depends=[]; }; Correlplot = derive2 { name="Correlplot"; version="1.0.8"; sha256="1hvnhb1qk4zqic8ngdk34hwp573s3al418gsq5ia3aklfd834f7d"; depends=[calibrate corrplot lsei MASS xtable]; }; - CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; Counterfactual = derive2 { name="Counterfactual"; version="1.2"; sha256="1spryxvnkdz728rl4nb7zlqhynnh0b4m7lnhq4i1n13gfsz1m5j4"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; - Counternull = derive2 { name="Counternull"; version="0.1.0"; sha256="1vnjhqif8ydnp6fb225hml1d2sincscs4q1vacbzxah628ac9yhp"; depends=[effsize]; }; + Counternull = derive2 { name="Counternull"; version="0.2.0"; sha256="137vnq4lk2z54x6dbbps8vpa6p5cx21wjriaq9sp5b2s39m6hi0m"; depends=[dplyr effsize ggplot2 randomizr tidyr]; }; Countr = derive2 { name="Countr"; version="3.5.6"; sha256="0zmg0hy9h2rjj3a6h05q8xxg0q2q65agmpm0gxk0qjl97wrh1fcy"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; - CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; }; CovCombR = derive2 { name="CovCombR"; version="1.0"; sha256="07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx"; depends=[CholWishart Matrix nlme]; }; - CovRegRF = derive2 { name="CovRegRF"; version="1.0.3"; sha256="15v5myjjmkclsldnhnbwgc18y0758npw9qdij5zx9g1bj83l3fy7"; depends=[data_table data_tree DiagrammeR]; }; + CovRegRF = derive2 { name="CovRegRF"; version="1.0.4"; sha256="0azwxcy9cbk3h5wln24l5dz42w259y5hzz3nfdga0zi915k8m3dg"; depends=[data_table data_tree DiagrammeR]; }; CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; }; CovTools = derive2 { name="CovTools"; version="0.5.4"; sha256="1bkqg3kzy2ahjqldcf6x55wkrmb4s6y72y9cj0jwb1fph0a1p3sm"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; }; + Covid19Wastewater = derive2 { name="Covid19Wastewater"; version="1.0.1"; sha256="1cqr9phfn5b2lsy2bm4kcgqb1zq1f961w9063synbwk4jzz36ql7"; depends=[data_table dplyr forecast ggplot2 gridExtra partykit patchwork plotly plyr randomForest RcppRoll reshape2 rlang rsample scales signal tidyr tidyselect zoo]; }; CovidMutations = derive2 { name="CovidMutations"; version="0.1.3"; sha256="03bl9frjfj8i7ydgi245113yzyg8rkgqxasicmqcjdd68zbz00kn"; depends=[cowplot dplyr ggplot2 ggpubr seqinr stringr VennDiagram]; }; - CoxAIPW = derive2 { name="CoxAIPW"; version="0.0.2"; sha256="1m7af9x0wjrmfaxz1v3aalkgyg13mvijjp0bns7npvpk07drd6hr"; depends=[gbm polspline pracma randomForestSRC ranger survival tidyr]; }; + CoxAIPW = derive2 { name="CoxAIPW"; version="0.0.3"; sha256="1cdky1xx79dda48wkpwavyzn0ibqydr005cplbmam3dnsvd1byka"; depends=[gbm polspline pracma randomForestSRC ranger survival tidyr]; }; CoxBcv = derive2 { name="CoxBcv"; version="0.0.1.0"; sha256="14lrvkv983hq5fvy1p7n8y435w6yfp1iq7g50l8qy4ppaaixgwq0"; depends=[pracma survival]; }; CoxICPen = derive2 { name="CoxICPen"; version="1.1.0"; sha256="0m6g4gi33y5vmpf790x38y8g8vpxvr5935lcz9vjw5kkmsjkln0g"; depends=[foreach]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; @@ -1041,6 +1034,7 @@ in with self; { CsChange = derive2 { name="CsChange"; version="0.1.7"; sha256="1qggfi7g34iw0737azn4l9cn0chsiq4wa18v8i5znlaimzmifylr"; depends=[boot Hmisc rms survival]; }; Cubist = derive2 { name="Cubist"; version="0.4.2.1"; sha256="0mwis0qjjj7wz4lxb8a0168l4az4523ybhxc0jygx8qrj3azwyph"; depends=[lattice reshape2]; }; CureDepCens = derive2 { name="CureDepCens"; version="0.1.0"; sha256="1i11yvh19zvv220d3jhnidjxq494wc3jg5054zq1pr09sxh2jnqn"; depends=[dlm Formula matrixStats rootSolve survival]; }; + CustomDerivative = derive2 { name="CustomDerivative"; version="0.1.1"; sha256="05jfv968mnbamzspvdd51pbwz5xpn3jhj3pwq2piwk18br824rn2"; depends=[R6]; }; CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; CustosAscensor = derive2 { name="CustosAscensor"; version="0.1.0"; sha256="1axyhwf9rc9dvrrcrpmx69kp49nwb0an7csn9qbjmx9jwwav11l5"; depends=[]; }; CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; }; @@ -1050,27 +1044,28 @@ in with self; { D2MCS = derive2 { name="D2MCS"; version="1.0.1"; sha256="0rjfjnh8gcbm83cwqk1yjrjv6jsrarr53c629bkg9zw7s5sm35nz"; depends=[caret devtools dplyr FSelector ggplot2 ggrepel gridExtra infotheo mccr mltools ModelMetrics questionr R6 recipes tictoc varhandle]; }; D3mirt = derive2 { name="D3mirt"; version="1.1.0"; sha256="1a7c2q1rm8yhdsszh4lg6nca8sfyyvba3v4gchdjll7660grpyr7"; depends=[mirt rgl]; }; D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; }; - D4TAlink_light = derive2 { name="D4TAlink.light"; version="2.1.11"; sha256="0app56g8kws30q9a91ipcxmgnfihcx1q6678s4hfxc1w3dq2pq82"; depends=[jsonlite openssl rmarkdown]; }; + D4TAlink_light = derive2 { name="D4TAlink.light"; version="2.1.14"; sha256="1cpvi5jzlyvwygyzv4smi3qcr3gx85s7bfjspsfkz9011aqb1aci"; depends=[jsonlite openssl rmarkdown]; }; DA = derive2 { name="DA"; version="1.2.0"; sha256="0bcx6lh93yl1cawrbrkqx7dypypvfnf27nlxf9vkz16n1hy50xnl"; depends=[adegenet kernlab klaR lfda MASS plotly rARPACK]; }; DAAG = derive2 { name="DAAG"; version="1.25.4"; sha256="1gia0xpdy55f23s6b3w4nfdmavgj9xzk9zc3p64lj4arycpnq4mn"; depends=[lattice latticeExtra Rdpack]; }; - DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; + DAAGbio = derive2 { name="DAAGbio"; version="0.63-4"; sha256="03lkq84x3skhvcrbs7235jlrhcnszk0pgziik4z93gy1qngrshn2"; depends=[limma]; }; DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; }; DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; }; - DAISIE = derive2 { name="DAISIE"; version="4.4.0"; sha256="0f9b361l591b5454lmzbhihv1wmk9rwbb90csax4xwrg9yq26i3v"; depends=[BH DDD deSolve doParallel foreach magrittr Matrix pracma Rcpp RcppEigen subplex tensor testit]; }; + DAISIE = derive2 { name="DAISIE"; version="4.4.1"; sha256="0f1ym3k49m2wdilsg7vwsb7m4ccdg87pnaksmbqv9smcxn5v8rn2"; depends=[BH DDD deSolve doParallel foreach magrittr Matrix pracma Rcpp RcppEigen subplex tensor testit]; }; DAISIEprep = derive2 { name="DAISIEprep"; version="0.3.2"; sha256="1072j28rwkzki8slz4h8db0wkzbcprbrmm7c33jy19s3qk5h644a"; depends=[ape castor DAISIE ggplot2 ggtree phylobase rlang scales tibble]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; DALEX = derive2 { name="DALEX"; version="2.4.3"; sha256="08cd5nhgd6vaazcqq985kwivg99v6ily4idhgkpz8l9ffl3lavm0"; depends=[ggplot2 iBreakDown ingredients]; }; DALEXtra = derive2 { name="DALEXtra"; version="2.3.0"; sha256="1yxsk6cmqrhc7aw62vx5pr2g18lh32j5x73jbfxv4k0ia66mmwqf"; depends=[DALEX ggplot2]; }; + DALSM = derive2 { name="DALSM"; version="0.9.1"; sha256="00v3h9np8nfhiyiz6r4bs5gzqqw3qfx275ab1byvjsr42zx11qpr"; depends=[cubicBsplines MASS plyr]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.3"; sha256="0pk9gq82qa18fl7zp74d47bgy8lhj9rkvfq23w8844nz9kn58s1f"; depends=[ape caper DDD deSolve expm Hmisc Matrix matrixStats picante]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; DATAstudio = derive2 { name="DATAstudio"; version="1.1"; sha256="1gwm53pgab5qn0p46bxs0790n7bbfl7b66i84xsa6bb4zdw5jdzb"; depends=[data_table ggplot2 scales]; }; DArand = derive2 { name="DArand"; version="0.0.1.2"; sha256="1pwd5srrjy8mhs40k6g6x5j3vk9cr5hylk8sdyiiqalpq490nzqy"; depends=[]; }; - DBERlibR = derive2 { name="DBERlibR"; version="0.1.3"; sha256="19hqp0q7j6b7h9bamn3v2d1kdwzi0mlqvx7b618fkixpibqndzn7"; depends=[car dplyr emmeans ggplot2 ggpubr ggrepel psych readr reshape rstatix tibble]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBHC = derive2 { name="DBHC"; version="0.0.3"; sha256="0r9c2vjnrahi3kbg7gz3z9k1i8vdqc44rc6nq7xk1j2xs1s6wsxp"; depends=[ggplot2 reshape2 seqHMM TraMineR]; }; DBI = derive2 { name="DBI"; version="1.1.3"; sha256="13a2656w5j9shpcwa7gj2szy7nk9sajjhlisi5wdpgd57msk7frq"; depends=[]; }; DBItest = derive2 { name="DBItest"; version="1.7.3"; sha256="0749mg3yadbxyixpsicnyi10dmwdjr1f590gfdzfrnpyg1ih5drh"; depends=[blob callr DBI desc hms lubridate palmerpenguins R6 rlang testthat vctrs withr]; }; + DBModelSelect = derive2 { name="DBModelSelect"; version="0.2.0"; sha256="1cbnypvcglbvlxdpr95yd65qfd56fhfx14gd0mr71jkkqhgmj0pk"; depends=[]; }; DBNMFrank = derive2 { name="DBNMFrank"; version="0.1.0"; sha256="1snnyc9dvlkxydx3n6mims1avbibkkmaf5z440s28ibf9a9l91wj"; depends=[NMF pmledecon]; }; DBR = derive2 { name="DBR"; version="1.4.1"; sha256="1gs9d1qmv4mcmryzzvmwbz6ycinhnxnkiv56l31mbqy50qjn9bi4"; depends=[coda MfUSampler]; }; DBfit = derive2 { name="DBfit"; version="2.0"; sha256="1b5fy4xya5k31937ccjsq1gj9y39lh1vb48jfc0sr56isrx0c496"; depends=[Rfit]; }; @@ -1081,17 +1076,17 @@ in with self; { DCEtool = derive2 { name="DCEtool"; version="1.1.0"; sha256="18x0fk71is77cc5ldm890asqrm1dz45m14z2ic9df89fm0wpwrvg"; depends=[adjustedcranlogs dfidx DT ggplot2 htmltools idefix knitr magrittr MASS mlogit mvtnorm readxl remotes rlist shiny shinyBS shinycssloaders shinyWidgets survival tidyr writexl]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; DCL = derive2 { name="DCL"; version="0.1.2"; sha256="0r9zigbxaa9w8501mishydyp47rpzfrx717m0ysly6nkxfm6g6d6"; depends=[lattice latticeExtra]; }; - DCLEAR = derive2 { name="DCLEAR"; version="1.0.12"; sha256="03a2i5hjp49sp0s0vp4fs8ax9569yzk2zsp3h6lp0frjvp75m7c9"; depends=[ape BiocGenerics BiocParallel dplyr igraph Matrix matrixStats phangorn purrr rBayesianOptimization Rcpp RcppArmadillo rlang stringr tensorflow tidyr]; }; + DCLEAR = derive2 { name="DCLEAR"; version="1.0.13"; sha256="0f8q0avzl3jpjly1jsg02lz8h38208j25nfdf1v79qcp4ia7m3pp"; depends=[ape BiocGenerics BiocParallel dplyr igraph Matrix matrixStats phangorn purrr rBayesianOptimization Rcpp RcppArmadillo rlang stringr tensorflow tidyr]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; DCPO = derive2 { name="DCPO"; version="0.5.3"; sha256="1h14xnii6kv6sc7pfxalif3bj0mifnxg46x4lwbixx9vzxxz96sq"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; DCSmooth = derive2 { name="DCSmooth"; version="1.1.2"; sha256="19pkj8z9wm4g8kxz1j3jw2n0bwldsyakipxvqpwnmlg2g5j8f5b1"; depends=[doParallel foreach fracdiff plotly Rcpp RcppArmadillo]; }; DCchoice = derive2 { name="DCchoice"; version="0.2.0"; sha256="0mkssdybfychg0jpx7542sdbhxv275lz82qhnag5r8qn0zsj7mx9"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-7"; sha256="1xnsc8p8nn72m081hsfnjzsd060y79ah6b7axxsslb2a4zdyhh2g"; depends=[nnet pracma sandwich xts zoo]; }; - DCluster = derive2 { name="DCluster"; version="0.2-8"; sha256="1ixn81jn0vmfi3hyqs1lq3dhpw2f5xkvq8r34pj8x3n664z2h8q4"; depends=[boot MASS spdep]; }; + DCluster = derive2 { name="DCluster"; version="0.2-9"; sha256="1qy5dd3v7f05s0qisj2qmxla4d7b7wqxslagfzs2rzj1b9szrhmc"; depends=[boot MASS spdep]; }; DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; }; DDD = derive2 { name="DDD"; version="5.2.2"; sha256="178b4j67vvn3g22s45gx9aqch24fij34yywbpvign2dkhzahnqkn"; depends=[ape BH DEoptim deSolve expm Matrix phytools Rcpp RcppEigen SparseM subplex]; }; DDHFm = derive2 { name="DDHFm"; version="1.1.3"; sha256="1xkjbhqipz6kqd6kw9682q5sbrvbpq4jn8nms3cv63b8x9nl1k55"; depends=[lokern wavethresh]; }; - DDIwR = derive2 { name="DDIwR"; version="0.15"; sha256="0vwzbr70nn8ij96434hpp3qvqj306pwiklwimyib67y2cx7ghvs0"; depends=[admisc declared haven readxl writexl xml2]; }; + DDIwR = derive2 { name="DDIwR"; version="0.16"; sha256="1d88sj0hz5wvfa1kx9sd320nmd9j6g0g7x4wl0883k5i19p3azy7"; depends=[admisc declared haven readxl writexl xml2]; }; DDL = derive2 { name="DDL"; version="1.0.2"; sha256="1scgg90njn8ahxdzbz1dyhr508hlipgaawk2pll0hk093abnqrlc"; depends=[glmnet Matrix]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; DDPM = derive2 { name="DDPM"; version="0.1.0"; sha256="04fkbaw297i76gj6n0avqchjxh32q4vlrxad8sn9wfzpq86j8ln2"; depends=[]; }; @@ -1100,23 +1095,25 @@ in with self; { DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; }; DEBBI = derive2 { name="DEBBI"; version="0.1.0"; sha256="09bsq5m33yj3ik3irj2ifjkylg259imrz499qp5j4ggcqgvk6v88"; depends=[doParallel numDeriv randtoolbox]; }; DECIDE = derive2 { name="DECIDE"; version="1.3"; sha256="04hqr3r2ys6xni3a2mr2j45415wm3iix38xfxccrnx2wjk5w3b5b"; depends=[]; }; - DEET = derive2 { name="DEET"; version="1.0.10"; sha256="06i8grq4zkh8qcw6q4vvnxnlvm4ya6rclyaaw5xn1h833p5218xs"; depends=[ActivePathways downloader dplyr ggplot2 ggrepel glmnet pbapply]; }; + DEET = derive2 { name="DEET"; version="1.0.11"; sha256="1jb7mp84h6s26abn3ra0pjqra5ha1m4j4yvfvdi074wvd2zzkns5"; depends=[ActivePathways downloader dplyr ggplot2 ggrepel glmnet pbapply]; }; DEEVD = derive2 { name="DEEVD"; version="1.2.3"; sha256="1wa3h0z5sk8zrwblzb8w7hgj9yqw56vqi3vsnpva53qynf42r2n7"; depends=[evd]; }; DEGRE = derive2 { name="DEGRE"; version="0.2.0"; sha256="040hfpvqwl8r0iazwpnq7fmkydsxqc7mck7wbjqf6c19cw3zziz7"; depends=[car dplyr foreach ggplot2 ggpubr ggrepel glmmTMB parglm tibble]; }; DELTD = derive2 { name="DELTD"; version="2.6.8"; sha256="0s5qiy2cb6fcm9fnbzmqs2x39im5r1vb45avh9isc71f7xl3my36"; depends=[]; }; DEM = derive2 { name="DEM"; version="0.0.0.2"; sha256="17ibq5cavzkl2vfrmrkz77m28l4xpj97skad5pfvk1nhzyrg2k1l"; depends=[mvtnorm]; }; DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; - DEPONS2R = derive2 { name="DEPONS2R"; version="1.2.1"; sha256="09rd7bd855s7bs4fasdzc15fxi6191gfpjifqqyia0j857nr5n14"; depends=[jsonlite raster sf sp terra xml2]; }; + DEPONS2R = derive2 { name="DEPONS2R"; version="1.2.2"; sha256="0izcmi194pd96gafma5hnnqgavwm51q7l9wnmbpl9siyxb7xfij6"; depends=[jsonlite raster sf sp terra xml2]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-8"; sha256="0k7mvf7j8y1sqv8zpiwkw4xcmgki37drkxjijrsmmhkfybfan7k3"; depends=[]; }; - DEoptimR = derive2 { name="DEoptimR"; version="1.1-1"; sha256="1appp5xgayafda6f5pcdsxaskqs831rb21znx44r8nyb9gvg0f6z"; depends=[]; }; + DEoptimR = derive2 { name="DEoptimR"; version="1.1-3"; sha256="1526g3fzii8kcy29gy6gjvaw4k9cxxidq8bh7m4j485h0wdsdn4d"; depends=[]; }; DFA = derive2 { name="DFA"; version="0.9.0"; sha256="0nk8k6xxqbbk1zhq3xsm59azvkj9499vp92pjl9xygasarim90rl"; depends=[]; }; DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.2.8"; sha256="1i0bf9w4f0djwqsmwjiyfxnvsj220bmk4vfvz3l4l0wmdxil9cda"; depends=[BayesFactor MVN]; }; + DFD = derive2 { name="DFD"; version="0.1.0"; sha256="1msyfzcxrqz9wq675ml00sigsyg94wl36yw4759fkr1q99iggxcc"; depends=[gprofiler2 signatureSearch signatureSearchData stringr]; }; DFIT = derive2 { name="DFIT"; version="1.1"; sha256="1220ax93b9xwmq1crgl1fnf63gk72jqbra5b5q25wn6ynv1kilkx"; depends=[ggplot2 mirt msm mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.3"; sha256="15n6nlnb20xzn4swcclyarfq7pq7rwmm2n0rv7m2q9jkxr9vp4w0"; depends=[matrixStats WGCNA]; }; + DGEAR = derive2 { name="DGEAR"; version="0.1.3"; sha256="0pnfaamrqban478vxcr4cjklxqxh9kmxzd724jwq8a1xfgscs8pw"; depends=[DescTools]; }; DGEobj = derive2 { name="DGEobj"; version="1.1.2"; sha256="00ndl6ckbr3f6pg9mgcygv1pq7j8gc7g8f54lirm624hiswsppn3"; depends=[assertthat magrittr stringr]; }; DGEobj_utils = derive2 { name="DGEobj.utils"; version="1.0.6"; sha256="01pbyz62vayism9bk6scx97yxwfmsss2af39grq46rilrcgrck3k"; depends=[assertthat DGEobj dplyr stringr]; }; - DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.2.2"; sha256="1mzkzpbnzzxrzxcdc5bi0vcjnrkgnbknngs6syk3qsch08l6pif2"; depends=[COMPoissonReg nloptr]; }; + DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.2.3"; sha256="0bbf7cyrnn1ghvhbnv54pv6325l8v8fy1bayl4b6qgs84xd959p4"; depends=[COMPoissonReg nloptr]; }; DGM = derive2 { name="DGM"; version="1.7.4"; sha256="1f59spd4bwx4d1gbjaizjxccaslw1fvf8pxa9nrxi07j6kq9mg0h"; depends=[coin data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DHARMa = derive2 { name="DHARMa"; version="0.4.6"; sha256="0wsb59w6z8mwag2wfiqs8237sk5rf2w7z7araxa6pzslsdf3vz9j"; depends=[ape gap lme4 lmtest Matrix qgam]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; @@ -1129,14 +1126,14 @@ in with self; { DIFtree = derive2 { name="DIFtree"; version="3.1.6"; sha256="1ps3nb1a5dgxs187bcjsys4fpi0z4z6d84qlxg8rf1rvcfgg21r5"; depends=[gridBase penalized plotrix VGAM]; }; DIGSS = derive2 { name="DIGSS"; version="1.0.2"; sha256="1bbwkq40gdan1zwq3cwn96k0k045x67l11rhm3q4dppw50736fpk"; depends=[ggplot2 viridis]; }; DIME = derive2 { name="DIME"; version="1.3.0"; sha256="1kbs5s3pgjlqiikcd54v9ym9yw40q6x1bgl7k0570l7i3mvcfvsj"; depends=[]; }; - DIMORA = derive2 { name="DIMORA"; version="0.3.5"; sha256="0x289f8yppvl90c8j8w96m5bgb8khxnc8agxn77wkfisx4cczy1k"; depends=[deSolve forecast minpack_lm numDeriv reshape2]; }; - DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; + DIMORA = derive2 { name="DIMORA"; version="0.3.6"; sha256="1qdi3nvr4p31kdfqs43xlfcryni182imp67bf03dma3pfnqxgwqj"; depends=[deSolve forecast minpack_lm numDeriv reshape2]; }; + DIRECT = derive2 { name="DIRECT"; version="1.1.0"; sha256="0868918aa0nxhgmczpbpf9i06x9ik18vff51cdb4i9q405mal6sj"; depends=[]; }; DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; }; - DIZtools = derive2 { name="DIZtools"; version="0.0.8"; sha256="0cjfyq83vqc9b0q0w2iifdqvcpjgapicj5bc4b0pj8nh8fwgwrga"; depends=[cleaR config data_table logger magrittr parsedate R_utils]; }; + DIZtools = derive2 { name="DIZtools"; version="1.0.1"; sha256="0i42k7h82x9g0mha8ppk17h3srgfjgwb9ysnib80pkjnp59kmpa5"; depends=[cleaR config data_table logger magrittr parsedate R_utils]; }; DIZutils = derive2 { name="DIZutils"; version="0.1.2"; sha256="1kra2b1qbbs6yf5aqlianszqbybni4iqzks0gxg5hdmdzphzb0hb"; depends=[data_table DBI DIZtools Hmisc psych RJDBC RJSONIO RPostgres xml2]; }; DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; DImodels = derive2 { name="DImodels"; version="1.2.1"; sha256="0w5kjmfiz3idvxrpsfazq4zqzh3sdrz928g2a5r754dk5bx0nai8"; depends=[hnp multcomp rootSolve]; }; - DIscBIO = derive2 { name="DIscBIO"; version="1.2.0"; sha256="1m1c9ivblk3sir6lfq0msx2vlrx37dd5v7y6003k6fmsgrfpi9fs"; depends=[AnnotationDbi boot cluster fpc ggplot2 httr igraph impute mclust NetIndices org_Hs_eg_db philentropy png RColorBrewer rpart rpart_plot RWeka SingleCellExperiment statmod TSCAN tsne]; }; + DIscBIO = derive2 { name="DIscBIO"; version="1.2.1"; sha256="152sh5g3vgcsyr93xmh3046fmpvy0vma45v4dplircpazxl33pji"; depends=[AnnotationDbi cluster fpc ggplot2 httr igraph impute mclust NetIndices org_Hs_eg_db philentropy png RColorBrewer rpart rpart_plot RWeka SingleCellExperiment statmod TSCAN tsne withr]; }; DJL = derive2 { name="DJL"; version="3.9"; sha256="0q82b35ln0ligxgnk726bn5cynh6sd529hk6v3prrzbvdnsrqxcg"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; DLL = derive2 { name="DLL"; version="1.0.0"; sha256="00xj6r1i4qhv0lq9ky88pw26nkc3ywhl23j9rsh2z5jn4dqpwpcg"; depends=[glmnet locpol MASS SAM]; }; @@ -1169,11 +1166,11 @@ in with self; { DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; }; - DPQ = derive2 { name="DPQ"; version="0.5-5"; sha256="1sb4k35z4qf5vds39xic8sxpj0h09z6j0vkrjsig4qdqjlpil5qh"; depends=[sfsmisc]; }; + DPQ = derive2 { name="DPQ"; version="0.5-6"; sha256="0vvxsca8w7mzscqqfaq5sfxqyfh8c9ja3499i6gf4q46aa1w215j"; depends=[sfsmisc]; }; DPQmpfr = derive2 { name="DPQmpfr"; version="0.3-1"; sha256="0f3l6dhiqnlix5vdz65pnxic43hcd4xiz64sh3cp8xs8cbmlnqcw"; depends=[DPQ gmp Rmpfr]; }; DPpack = derive2 { name="DPpack"; version="0.1.0"; sha256="1kip6n4pxpk5byjdn5m6l8s5l49dvkh78wn6n85dri0c2snkvs17"; depends=[dplyr e1071 ggplot2 MASS nloptr R6 Rdpack rmutil]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; - DQAgui = derive2 { name="DQAgui"; version="0.2.2"; sha256="1zscs93ax7s25f3vpqr75q28v06h449pydkqwgfygn3sn02n82nh"; depends=[data_table daterangepicker DIZtools DIZutils DQAstats DT jsonlite knitr lubridate magrittr parsedate shiny shinyalert shinydashboard shinyFiles shinyjs shinyWidgets waiter]; }; + DQAgui = derive2 { name="DQAgui"; version="0.2.3"; sha256="1wizx8wdqkl5vzk0bmmgzcbih0flp8bvdgy252ybfi5m8x3xczvr"; depends=[data_table daterangepicker DIZtools DIZutils DQAstats DT jsonlite knitr lubridate magrittr parsedate shiny shinyalert shinydashboard shinyFiles shinyjs shinyWidgets waiter]; }; DQAstats = derive2 { name="DQAstats"; version="0.3.3"; sha256="0k7npkzi5zcf8a2lz0hhdxahmblcqplbzqxh2i92gqssxz06x0x5"; depends=[data_table DIZtools DIZutils future future_apply jsonlite kableExtra knitr magrittr parsedate rmarkdown tinytex]; }; DR_SC = derive2 { name="DR.SC"; version="3.3"; sha256="1457r1mc5cccr2frbnh0ply72wpjglin9qna9xaxgn5q0gmqf57v"; depends=[CompQuadForm cowplot ggplot2 GiRaF irlba MASS Matrix mclust purrr RColorBrewer Rcpp RcppArmadillo S4Vectors Seurat spatstat_geom]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; @@ -1181,13 +1178,16 @@ in with self; { DRDRtest = derive2 { name="DRDRtest"; version="0.1"; sha256="1vrvwr441w526a80s0r2fwqlllvn05ir8v2152jz2wxrwhnpq1s0"; depends=[KernSmooth SuperLearner]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="2.3"; sha256="0r7lbzmk05k65kgasz3ka1ic4hqdv65yryf2vz5c4x1yrqvsh9sg"; depends=[PBSmapping raster sp spatstat spatstat_geom spatstat_linnet spdep]; }; - DRIP = derive2 { name="DRIP"; version="1.7"; sha256="1926qmxxmmhbr6hwn4jkm553h5lj84g37rgvjy36kb4b8vpnlkd5"; depends=[]; }; + DRIP = derive2 { name="DRIP"; version="1.8"; sha256="11kmklkgsngf8viqmh4i6pdfv2mnk8anssgmnwglrd6sqqdhvblw"; depends=[]; }; DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.3"; sha256="1pschc911zrcgy6vmh9aylz79qfifxvxrm5gxwah7xv50plpar78"; depends=[Matrix ROCR]; }; DRomics = derive2 { name="DRomics"; version="2.5-0"; sha256="1vzjynl8wyivvbh87r7jms2v5ah09z9b5h55sqviyrm7cpd201z3"; depends=[DESeq2 ggfortify ggplot2 limma SummarizedExperiment]; }; - DRviaSPCN = derive2 { name="DRviaSPCN"; version="0.1.2"; sha256="1j6iss2aavrckkr3m50kcw7yrc1wqbpgmd60rw9bgk8vycd1m2iw"; depends=[ChemmineR clusterProfiler GSVA igraph pheatmap rvest xml2]; }; - DSAIDE = derive2 { name="DSAIDE"; version="0.9.3"; sha256="11sz57a0mmhk3lj621wnccmcbbrxp0ipg99phfk3wb927985p0zv"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny XML]; }; - DSAIRM = derive2 { name="DSAIRM"; version="0.9.5"; sha256="1axzpgly8s5l35q834xznsycfxcy55ym5i846gsv8v5xdysr8kw1"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny XML]; }; + DRquality = derive2 { name="DRquality"; version="0.2.1"; sha256="1rr9341y6nf8qdaabfwzbjgwmsb7z1i514cz4x2z5hj9qxyjiy4c"; depends=[DatabionicSwarm]; }; + DRviaSPCN = derive2 { name="DRviaSPCN"; version="0.1.3"; sha256="1nid3psahz0r8jq0y2bg0p3kdpcf6flm6d0bfw08zjiz8gcpllj3"; depends=[clusterProfiler GSVA igraph pheatmap]; }; + DSAIDE = derive2 { name="DSAIDE"; version="0.9.6"; sha256="01yljprcwkq0n7w9yr1xlkajyzyd0n8kmxkj80wcldp5mvqjmyxd"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny XML]; }; + DSAIRM = derive2 { name="DSAIRM"; version="0.9.6"; sha256="0zp5dcfdzrywp252d1dcyvaxn8lygqs7hzxk0v9yzgahrbxnlvw9"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny XML]; }; + DSAM = derive2 { name="DSAM"; version="1.0.1"; sha256="1zyhbfigpgn86d3vyl6hib1h4bqnafysj0374nhrz91ln5qg4gzs"; depends=[caret kohonen Matrix pROC xgboost]; }; + DSBayes = derive2 { name="DSBayes"; version="2023.1.0"; sha256="0sk5xfs13jxy4n3qgifh75bry1b53mm9gk1x14mpy2vw359cbqx4"; depends=[BB]; }; DSI = derive2 { name="DSI"; version="1.5.0"; sha256="1q89abff6fypafs7w0jrcyh9prcv3ibwr0bym9zlav0lfdbqwhcq"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; DSLite = derive2 { name="DSLite"; version="1.4.0"; sha256="1xc9igwsxwiirg40br1qckai0lzhijfnpdrxg94r38hngb7r5cy2"; depends=[DSI R6 rly]; }; @@ -1198,26 +1198,24 @@ in with self; { DSWE = derive2 { name="DSWE"; version="1.6.3"; sha256="1ch5svipjbwly1l29kp1jd1g4y6jkxl25095f038pzs0gcjxjb1h"; depends=[BayesTree dplyr e1071 FNN gss KernSmooth matrixStats mixtools Rcpp RcppArmadillo]; }; DSjobtracker = derive2 { name="DSjobtracker"; version="0.1.1"; sha256="1vi07n7ygsdjj4830rnx7kvacmnizl146c6bfw2fnby47apg38f9"; depends=[]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; - DT = derive2 { name="DT"; version="0.28"; sha256="0khdl21kvgi9k7dlpfshk1xz9bkly5lq6p41plfh4g2jv1yxaxfr"; depends=[crosstalk htmltools htmlwidgets jquerylib jsonlite magrittr promises]; }; + DT = derive2 { name="DT"; version="0.30"; sha256="13k9zyapx6rqfsrl5afpgaqyni57qq88hxa1j3y3wjcv5bim66ig"; depends=[crosstalk htmltools htmlwidgets httpuv jquerylib jsonlite magrittr promises]; }; DTAT = derive2 { name="DTAT"; version="0.3-6"; sha256="0ll11763c03xll02727jwm637vbq438vivr88f45nbwrpsk9nb34"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; }; DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; }; DTAplots = derive2 { name="DTAplots"; version="1.0.2.5"; sha256="1jwfh8j8ahaj2z19g2f70r652j77q4f0b7j91mggsb0dgk449342"; depends=[]; }; - DTComPair = derive2 { name="DTComPair"; version="1.2.0"; sha256="0wlbxqkm9jqqfr6h2a42zjixvlpq2fyij972372z4qk9qr06li2g"; depends=[ellipse gee PropCIs]; }; + DTComPair = derive2 { name="DTComPair"; version="1.2.2"; sha256="068ilw98lj4f11gi5fxc8lv6ymi86mahrkhfiagjdrmgcgpcai5w"; depends=[ellipse gee PropCIs]; }; DTDA = derive2 { name="DTDA"; version="3.0.1"; sha256="1x65ahrci7n8v5d6nfz2p3p1x0zjam3a2mvw9m1rpdmfgbalpim7"; depends=[doParallel foreach]; }; DTDA_cif = derive2 { name="DTDA.cif"; version="1.0.2"; sha256="12vkhqxdhir06s35kr76dwns9m02wyicz3mv4r56fqglsfyw77xr"; depends=[doParallel foreach Rcpp]; }; DTDA_ni = derive2 { name="DTDA.ni"; version="1.0.1"; sha256="0lv8k37n271zcmp5mxxc6z03bx283lnc4iz3zz1k2mnfzq2wrahz"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-3"; sha256="1a07hpl1fagigxkd3yjjkwjpmjwbfyg9a7m8fcj1602xl525h2ki"; depends=[]; }; - DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRKernSmooth = derive2 { name="DTRKernSmooth"; version="1.0.0"; sha256="0faya9crhzw3z8r5va08g7nir9ga2g308lrxf4zbj6c84fkyfiwx"; depends=[Rcpp RcppArmadillo RcppEigen]; }; DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.7"; sha256="0fr2c8fg1acs2kk0r67zml5fp71mvxw116ixqf7yq34n9ljd5yph"; depends=[dplyr MASS]; }; DTSEA = derive2 { name="DTSEA"; version="0.0.3"; sha256="1f1di9ypq6f0929pq15xncf7zw16wlqap4rchbia27n39cv15dni"; depends=[BiocParallel dplyr fgsea igraph magrittr stringr tibble tidyr]; }; - DTSg = derive2 { name="DTSg"; version="1.1.1"; sha256="1pg3xqkwv75pla3x3vdffmvzsjcaq5b91svykrr8q25p3ikfj6b6"; depends=[checkmate data_table R6]; }; + DTSg = derive2 { name="DTSg"; version="1.1.3"; sha256="0gln3zliljhs7rmqbyi7nbrzknc4g7psk9rwnd5xh020fa2k2cm1"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; DTwrappers = derive2 { name="DTwrappers"; version="0.0.2"; sha256="028n1211h9gmv050xfiw347x59gykb6ndvd371fdf53bbkqirqa4"; depends=[data_table]; }; DVHmetrics = derive2 { name="DVHmetrics"; version="0.4.2"; sha256="0dxbjqiqhzjrv867qhxmqavzklq0j3qjv4qwdacyrq8faz82vhv7"; depends=[DT ggplot2 KernSmooth reshape2 shiny]; }; - DWBmodelUN = derive2 { name="DWBmodelUN"; version="1.0.0"; sha256="1m71fx9l2rq27d2q5hiqxiyljvf5wjcfkcblqw19rpiixrinv4va"; depends=[dygraphs htmltools ncdf4 raster rgdal]; }; DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; DWLS = derive2 { name="DWLS"; version="0.1.0"; sha256="02fd5q91shwjzc6bxqv4m8al7q1vl0mah6niymij37p69wlixy42"; depends=[dplyr e1071 MAST quadprog reshape ROCR Seurat SummarizedExperiment varhandle]; }; DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; }; @@ -1226,7 +1224,7 @@ in with self; { DYNATE = derive2 { name="DYNATE"; version="0.1"; sha256="172lm5k0hz774a0d2s1hs86q7q50s6n4i4ba8jddy3l5a1gqkpd4"; depends=[data_table dplyr Matrix reshape2 tibble tidyverse]; }; DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; }; DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; }; - DanielBiostatistics10th = derive2 { name="DanielBiostatistics10th"; version="0.1.8"; sha256="1wg8x074q6j5j2l5xw4l68inh5in36zxy1ix94dp1755kskgzjmf"; depends=[e1071 ggplot2 ggrepel latex2exp pracma scales]; }; + DanielBiostatistics10th = derive2 { name="DanielBiostatistics10th"; version="0.1.9"; sha256="1jf7k79q5a0nqy5abbnn9bdj7fnly4kfwm84n5mxng6s7lxfqzb3"; depends=[e1071 ggplot2 ggrepel latex2exp pracma scales]; }; Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; }; DarkDiv = derive2 { name="DarkDiv"; version="0.3.0"; sha256="0cjf5rpn4myd21rh04bk2gjk65rjx77mn8mxy4ym704fiycrsj87"; depends=[vegan]; }; Dasst = derive2 { name="Dasst"; version="0.3.4"; sha256="1q18wss5bla3hvhnvmwxpd8lbs6fpdkqf5bfiqva050hsdfq1fk7"; depends=[]; }; @@ -1240,23 +1238,24 @@ in with self; { DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; DataSetsUni = derive2 { name="DataSetsUni"; version="0.1"; sha256="0dbi0jgzh2qxwsid9yp4mdwhrm7mcksx8jvpa91qfnfc26ipdw6n"; depends=[]; }; DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.6"; sha256="1asrslqmk4sjj99x8pb01yfrw57p64zc6klrk2ghz4g44fr9d0pq"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; - DataVisualizations = derive2 { name="DataVisualizations"; version="1.3.1"; sha256="1cxgb43pcmz49q4ysqrajwg3b0p951gc2akxyngchcc9fwz8b27l"; depends=[ggplot2 pracma Rcpp RcppArmadillo reshape2 sp]; }; + DataVisualizations = derive2 { name="DataVisualizations"; version="1.3.2"; sha256="0y8mwgnh3cjapb97a0i4f16nrdhmkd80f6j7z0ivykgfka7jlbqr"; depends=[ggplot2 pracma Rcpp RcppArmadillo reshape2 sp]; }; DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; }; - DatabaseConnector = derive2 { name="DatabaseConnector"; version="6.2.3"; sha256="05hylzsm93yx7nx6jk5gv6vwwwxnrpq0qijd30xx4lvwg4acxc46"; depends=[bit64 checkmate DBI dbplyr digest readr rJava rlang SqlRender stringr urltools]; }; + DatabaseConnector = derive2 { name="DatabaseConnector"; version="6.2.4"; sha256="1y37rrq8h7w7g9dxx26d21bf8c5y5qhcpvhlr31h5ja3vm624aaa"; depends=[bit64 checkmate DBI dbplyr digest readr rJava rlang SqlRender stringr urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; - DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.2.0"; sha256="1x9i25wlp0gy1r4ilbkfj3f6c8hd67y8d8xj4alxmsin36nkm585"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo RcppParallel]; }; + DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.2.1"; sha256="1qdm4na1s4wc8s7j9vp8g8l9lmhqlpzyafkjmm9jzl7wqlgz5ibr"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo RcppParallel]; }; DatastreamDSWS2R = derive2 { name="DatastreamDSWS2R"; version="1.8.2"; sha256="018733gm5z90qhbci6khxx27pn074si176mwnlq53bd6r722jiwm"; depends=[dplyr foreach httr jsonlite stringi stringr xts zoo]; }; - DateTimeRangePicker = derive2 { name="DateTimeRangePicker"; version="1.0.0"; sha256="0bbx3801i7iisyvsfssnvph01s20ynfm65kyi2kp7ga7xafwbafc"; depends=[htmltools lubridate reactR shiny]; }; + DateTimeRangePicker = derive2 { name="DateTimeRangePicker"; version="1.1.0"; sha256="1g5gjbwb1h1407bwg5yzrpal2syk5439l73svsjjzs6y55dpixsg"; depends=[htmltools lubridate reactR shiny]; }; Davies = derive2 { name="Davies"; version="1.2-0"; sha256="0n2pqipv0b1w2zjvycms0kyk7h8ps49f5jlzgyxhy9dlyr0ivaml"; depends=[mathjaxr]; }; DeCAFS = derive2 { name="DeCAFS"; version="3.3.3"; sha256="0dj32rck6ssyv82d8b75qgsqw319q02iqd3xxazy6251wcjn321i"; depends=[ggplot2 Rcpp robustbase]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; + DebiasInfer = derive2 { name="DebiasInfer"; version="0.2"; sha256="02r1pc5s1vwnvz6cxb2gkc3x4x9vw8nb2zw1z8hyyxp5n8n8d2mf"; depends=[caret CVXR]; }; DeclareDesign = derive2 { name="DeclareDesign"; version="1.0.4"; sha256="1pk9xin8fqjrwknpvd1b3ff5slahs1003l985pd6ynz5cpzbfi4d"; depends=[estimatr fabricatr generics randomizr rlang]; }; DecomposeR = derive2 { name="DecomposeR"; version="1.0.6"; sha256="0f5bagmn0s15qhw0c7fiv96r2ih365fak1rz3pxfnaqmm20l2j8i"; depends=[colorRamps dplyr hexbin StratigrapheR tictoc usethis]; }; DecorateR = derive2 { name="DecorateR"; version="0.1.2"; sha256="1za2qvdq96f75rmnm421xmq8s01ny4666ghv14i72iy3s4ml2hq9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeductiveR = derive2 { name="DeductiveR"; version="1.0.0"; sha256="0bx1ad2gw0pf03z0im31mzaa26jxwws6fkbcj319kd8b4s4wp92y"; depends=[dplyr ggplot2 moments reshape2]; }; - Delaporte = derive2 { name="Delaporte"; version="8.2.0"; sha256="0lp2k3j3dw73rnpx42cdwvqylib2lj5ijhqfpfgxjwnvq3138clr"; depends=[]; }; - DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="1.1.2"; sha256="1qx82r04d0bnr8k961fgp4rmy62rw0xfzzdamyfc8f5r92lk18yr"; depends=[]; }; + Delaporte = derive2 { name="Delaporte"; version="8.3.0"; sha256="1g499xrb3hhd9xrzbxm1d911hm06mfn119xxmcr6f47vsz15ksvy"; depends=[]; }; + DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="1.1.3"; sha256="0iplpnhxzipvyk89dn13hi0pw1yqfbi8dm4dp2xmvn3avk76pjgs"; depends=[]; }; Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; depends=[]; }; DeltaMAN = derive2 { name="DeltaMAN"; version="0.5.0"; sha256="08barq4s7m3migjs80207n6l10pr3v2hb1dy72fi59j9x9xgnn4v"; depends=[knitr shiny shinyBS shinyMatrix xtable]; }; DemoDecomp = derive2 { name="DemoDecomp"; version="1.0.1"; sha256="0m24ld8s3ph8qcbkqma5y5k5nv0d0vgb7wz8q20gxnfbj2kbcvjv"; depends=[Rdpack]; }; @@ -1270,11 +1269,12 @@ in with self; { DepLogo = derive2 { name="DepLogo"; version="1.2"; sha256="13y3akmrj5x1mn1sgha1jryzswg4kqxwswbm3m5z92mcm2zw4r9l"; depends=[]; }; DepthProc = derive2 { name="DepthProc"; version="2.1.5"; sha256="0i7fks5hglf3xj8cj3sghjf0xcldhiqwf0jlpyk2a3mj9gaszc76"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="4.1.3"; sha256="130g3mv0z9sqs6y23a0a94512iiw05yr6fp378vhdxxbignzbnyv"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.49"; sha256="0s2zh8xz06c45rbwcypgsa8shby66nm6sj90cb9d1bwb60mws8j5"; depends=[BH boot data_table Exact expm gld httr MASS mvtnorm Rcpp readxl rstudioapi withr]; }; + DescTools = derive2 { name="DescTools"; version="0.99.50"; sha256="1awfhbv7klvkwxki4lvxj086yiwqyys95jnss8q5qqn7wyfz170v"; depends=[BH boot data_table Exact expm gld httr MASS mvtnorm Rcpp readxl rstudioapi withr]; }; DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.10"; sha256="0wgcfrxf2vygr7rylkbfzlgldg6llg4k4bzwrq8c73miwac158js"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; DescrTab2 = derive2 { name="DescrTab2"; version="2.1.16"; sha256="07921k8h50wycj0sijy8428p3c8ach90swgzz0s06b6z1yl2mnyg"; depends=[cli DescTools dplyr exact2x2 flextable forcats haven Hmisc kableExtra knitr magrittr nlme officer rlang rmarkdown scales stringr tibble]; }; DescribeDF = derive2 { name="DescribeDF"; version="0.2.1"; sha256="1nah46s4psi272idpkpzkx7zqy6vr6wdz5zfxyz17cld9q2lld47"; depends=[dplyr e1071 fNonlinear psych tseries]; }; - DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.9"; sha256="14iz7n00ll4gqm9xfwn79s7nhqhcs116hgpdfj2m9m9brpabpa6i"; depends=[GGally ggplot2 plyr reshape2 scales]; }; + DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.11"; sha256="19fwg93p2vdl2sbg8llwijklsvim5vrgcvv2048akbdahvfj9rxb"; depends=[GGally ggplot2 plyr reshape2 scales]; }; + DescriptiveRepresentationCalculator = derive2 { name="DescriptiveRepresentationCalculator"; version="1.0.0"; sha256="0p0n5zjaxhr0rba93ikaw30lrf8zgx35yfjimwlg2375ns0zpmr6"; depends=[]; }; DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.3.2"; sha256="0f2inlfkwl2q9ll5lh0ynpsbf6zci149s5nj0s0x0g98z72z8mly"; depends=[dplyr jsonlite magrittr RCurl reshape]; }; DescriptiveWH = derive2 { name="DescriptiveWH"; version="1.0.3"; sha256="17baga9vs8959bzm7qs11zj35a6glh1ig5qz8kwq7m69h51l2gar"; depends=[]; }; Design_parameters = derive2 { name="Design.parameters"; version="0.1.0"; sha256="0wyzz1rncb2260i7p09vziszg2ycmxwgs0zm8qycfamyfii32k7y"; depends=[]; }; @@ -1303,14 +1303,14 @@ in with self; { Dict = derive2 { name="Dict"; version="0.1.0"; sha256="1v8yp03gajg9i82qyfww14jx93l4jbfq8mh6jqyf6calgrsj06jc"; depends=[dplyr magrittr purrr R6 rlang]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; - DiffCorr = derive2 { name="DiffCorr"; version="0.4.2"; sha256="0q7slvyqajbr1pa4k3dc7jfn6qi6i2fnvh7hl49qi3a60yr55mir"; depends=[fdrtool igraph multtest pcaMethods]; }; + DiffCorr = derive2 { name="DiffCorr"; version="0.4.3"; sha256="1wzk5lfkrz12xxmyapmq6midb6ld6p624i8qzf299dlfsz5i3n5h"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffXTables = derive2 { name="DiffXTables"; version="0.1.3"; sha256="0a0q1fz80jlcrk4rw70yjb8djxgsm5axih45vi4dqpg6n8xlrzw2"; depends=[pander Rdpack]; }; - DirStats = derive2 { name="DirStats"; version="0.1.8"; sha256="0drk6b7nncsydvikxy2jh7kmsjvkwx32csh0r8ygn9hdqliw4pfk"; depends=[movMF rotasym]; }; + DirStats = derive2 { name="DirStats"; version="0.1.9"; sha256="0cj3ba2dzy7nvvs98mzj0c37hdn4lhxhrir27bhqfrjnmz13z08w"; depends=[movMF rotasym]; }; Dire = derive2 { name="Dire"; version="2.1.1"; sha256="1ccy1g600196qc4chnjcd6gffbhj6mzhc5kszpyb0w4szxmdag55"; depends=[foreach haven iterators MASS Matrix Rcpp RcppArmadillo]; }; DirectEffects = derive2 { name="DirectEffects"; version="0.2.1"; sha256="0cjqp4gam1psd11d6h99pi3ramnaybp6bij86wbgqji2icqlvghg"; depends=[Formula glue sandwich]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.3"; sha256="1qlfvzlig3a2v78fiq6sbbpxklmjczikxdw57m6mqngzrl9vdl2g"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="6.1"; sha256="07msgyvq1zx63xbfcy5jydb6m4zf5bgpsd5nhpks58v1qj9lpylb"; depends=[bigstatsr doParallel foreach ggplot2 magrittr RANN Rfast Rfast2 rgl rnaturalearth sf]; }; + Directional = derive2 { name="Directional"; version="6.3"; sha256="0h9iqynmrifymv7jkd94nzxivp1s5yh55fysxd7i74i6lcwpx4rm"; depends=[bigstatsr doParallel foreach ggplot2 magrittr RANN Rfast Rfast2 rgl rnaturalearth sf]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.7-1"; sha256="1ql5mwb7zb06y9j6inrlngq7c15as4j17wd8kc71fxs0a2jdj7xi"; depends=[Formula maxLik]; }; DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; }; DisImpact = derive2 { name="DisImpact"; version="0.0.21"; sha256="1vc2kwcb3cvcdbdg0s5qnjdzn8qa7lv6f86milhxdf609k2zwdkx"; depends=[collapse data_table DBI dplyr duckdb fst glue purrr rlang sets stringr tidyr tidyselect]; }; @@ -1327,17 +1327,17 @@ in with self; { DistatisR = derive2 { name="DistatisR"; version="1.1.1"; sha256="0r8gp84kbl8kbsw3kbp8sk0xc2gav074qc9qlkq06bp0sxycwhyw"; depends=[car dplyr prettyGraphs readxl tidytext]; }; DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; }; DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; }; - DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; }; - DivE = derive2 { name="DivE"; version="1.2"; sha256="1czj89ljvpgl03471cknki2lc64swdqdpf5wsgicad35kgmlrwlh"; depends=[deSolve FME rgeos sp]; }; + DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-1"; sha256="1mv3p7hm02q3mhrw5165gc2d77ighnykyfn6ibxvkc3ii2m9xrri"; depends=[]; }; + DivE = derive2 { name="DivE"; version="1.3"; sha256="1nab00wkq2986sxi8z5hmhadxyzhy181akhzj8vc6bfznrcrnbig"; depends=[deSolve FME sp]; }; DiversificationR = derive2 { name="DiversificationR"; version="0.1.0"; sha256="1gybzpv5bl17lp1nxhqzsvj585j3lylfd388vp401lmri3k8r4cs"; depends=[]; }; DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; - DoE_MIParray = derive2 { name="DoE.MIParray"; version="1.0"; sha256="09czqhd07hjx35w2a48sgpn9j5y6k1sy92gwhsbbik9s99n7q9gy"; depends=[combinat DoE_base]; }; - DoE_base = derive2 { name="DoE.base"; version="1.2-2"; sha256="105i16pdhrbhc79czcpnfsx6cwvznscnrgl8i28c6gx2br5j37v9"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; - DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; + DoE_MIParray = derive2 { name="DoE.MIParray"; version="1.0-1"; sha256="0ginm4wqax2azcns4c17rgdfpclbmn058nq0lmpx90s4q7jfppax"; depends=[combinat DoE_base]; }; + DoE_base = derive2 { name="DoE.base"; version="1.2-3"; sha256="1m1vizrsmwcb6vwhbnrp9zm881pc1qqkkpb8k47nvj3f0j8pbf1m"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; + DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.12"; sha256="0n6z27gf7xcbyzjdq0kjm7ghddg5gygxyp3r9a7s5h40s0pfxbdm"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; - DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; }; DockerParallel = derive2 { name="DockerParallel"; version="1.0.4"; sha256="1fgs2f5czb05fiqxqp00qggni041ml4s3x05h9n4mmka9mwxi34b"; depends=[jsonlite]; }; Dodge = derive2 { name="Dodge"; version="0.9-2"; sha256="0767n6hyspqrv5cgx3ghhai0qffj6haga7s86pv7mq8zvjcxjlzv"; depends=[]; }; + DominoDataR = derive2 { name="DominoDataR"; version="0.2.3"; sha256="1awiy32sm0n2v1z48v4agqm89jnkgqazbjh9zixmj7yd0db78a9v"; depends=[arrow ConfigParser httr reticulate]; }; DoseFinding = derive2 { name="DoseFinding"; version="1.0-5"; sha256="0sccgwk4h9s5l1pw8yp8p55ad1w9q4n4mmqmkc8kgkjy39k2mrrc"; depends=[ggplot2 lattice mvtnorm]; }; DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; }; DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; }; @@ -1350,10 +1350,9 @@ in with self; { DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.2"; sha256="0nsnwais0r592c50nphfzkr1bbygl67mriwsx7dxbvmpdsswlvl1"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0.1"; sha256="1pmsbv1rl79s520nxj536m8gf7xyfjskj8r88rxmxscbgp8c1xz2"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; - DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; - DrugExposureDiagnostics = derive2 { name="DrugExposureDiagnostics"; version="0.4.4"; sha256="1593f5jjy1fyz95qp7n26jpgj7p6lckhkf47k2zkq5x8dm1sldcg"; depends=[CDMConnector checkmate dplyr glue magrittr rlang tidyr tidyselect]; }; + DrugExposureDiagnostics = derive2 { name="DrugExposureDiagnostics"; version="0.4.7"; sha256="0s2wbf5i4awnw3ncs5pp6gwsgpqqdfl3a209vvgad7xnfhp9m0gh"; depends=[CDMConnector checkmate dplyr glue lifecycle magrittr rlang tidyr tidyselect]; }; DrugSim2DR = derive2 { name="DrugSim2DR"; version="0.1.1"; sha256="1sphg3imdyr71amwqzmzzp6h1ai2m6rm87l08mv70i6jlznwf9kr"; depends=[ChemmineR fastmatch igraph pheatmap reshape2 rvest sp tidyr]; }; - DrugUtilisation = derive2 { name="DrugUtilisation"; version="0.3.1"; sha256="16czxyqx815ri9132qz684h93v4kl7sl6033gdk40n4viy22rw8n"; depends=[CDMConnector checkmate cli DBI dbplyr dplyr glue lubridate magrittr PatientProfiles purrr RJSONIO rlang tidyr]; }; + DrugUtilisation = derive2 { name="DrugUtilisation"; version="0.4.0"; sha256="107wisld0ps4q3acx3x09lr7kc10b6sryqlj2vp9di5wyiwq3gdf"; depends=[CDMConnector checkmate cli DBI dbplyr dplyr glue lubridate magrittr PatientProfiles purrr RJSONIO rlang tidyr]; }; DstarM = derive2 { name="DstarM"; version="0.4.0"; sha256="0wm5kr2pkgbvh9svjq8zq46zn50hwf58rs3y1ybnwcfjc2q75h1s"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; }; Durga = derive2 { name="Durga"; version="1.1.0"; sha256="06mgkm749x1dvh6wqdrjb9x4sbywawyqnr3cpml04l5qgqmlcxjy"; depends=[boot RColorBrewer vipor]; }; @@ -1362,10 +1361,10 @@ in with self; { DynClust = derive2 { name="DynClust"; version="3.24"; sha256="0nbbzx0ixblpcbjxx0gp7082nz6nh5vc2l5nzdfq1mqzlq9jy2xn"; depends=[]; }; DynForest = derive2 { name="DynForest"; version="1.1.1"; sha256="08rqwhw08aqm1zqjcvma36z8nbp73jjmas1yn23zqv1hb76airsj"; depends=[cmprsk DescTools doParallel foreach ggplot2 lcmm pbapply pec prodlim stringr survival zoo]; }; DynNom = derive2 { name="DynNom"; version="5.0.2"; sha256="1zs8chdw83qjsi5k1m9cvk48swqz3gadycmhk4prxmjzwcl5z4i1"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="4.12"; sha256="07q6z2j73b3vcspkq4jkw4z7l618qgq9683dd0yljjq1l71fvl4i"; depends=[dfoptim kernlab modelObj rgenoud]; }; + DynTxRegime = derive2 { name="DynTxRegime"; version="4.14"; sha256="1mgpy3y2dcv27ph8a870fpcsav72asvh136m8k3d37b5whg4ag1c"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicGP = derive2 { name="DynamicGP"; version="1.1-9"; sha256="00hf3r39b9xid129kzgdnwdfrwrspxkz7dydgna3c5lrl7670paz"; depends=[lhs]; }; - DynareR = derive2 { name="DynareR"; version="0.1.3"; sha256="06n0gsbn8gphsirj3l1izd84dnjnik6n5l4vkp8flkzynccx3rps"; depends=[kableExtra knitr magrittr]; }; + DynareR = derive2 { name="DynareR"; version="0.1.4"; sha256="0ph57kwinv9nqla82glg0bj1iaqrnw2y8a8invq1qy9yabldl798"; depends=[knitr magrittr]; }; DysPIA = derive2 { name="DysPIA"; version="1.3"; sha256="0ih8sl89h6xbmmjjsbxcvgp6wqk7f1wqzwkc43k3i5w7fgb0hlpc"; depends=[BiocParallel data_table DysPIAData fastmatch parmigene Rcpp]; }; DysPIAData = derive2 { name="DysPIAData"; version="0.1.2"; sha256="1i4z9xhnzih7jnj3l1d6wpgfsayb452sh4q99w2npg1iipsjb1vl"; depends=[]; }; E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; @@ -1380,7 +1379,8 @@ in with self; { ECGofTestDx = derive2 { name="ECGofTestDx"; version="0.4"; sha256="0y8bw1k9spwxyzc7vsi2iblnmjsidxbybjrzzh2j6frjmv3rk4g1"; depends=[bootstrap orthopolynom]; }; ECLRMC = derive2 { name="ECLRMC"; version="1.0"; sha256="01z2hmbpb754s2rsvx3i5wf7kkkr2mvs2g89ih2bqrif7w5rmgyg"; depends=[softImpute]; }; ECOSolveR = derive2 { name="ECOSolveR"; version="0.5.5"; sha256="1izc8dwj438wpkmdmhwnnhkijz5skig4gwxgr6f1bzmj08bfv515"; depends=[]; }; - ECOTOXr = derive2 { name="ECOTOXr"; version="1.0.2"; sha256="08gkcq08i4sdsx4a12llwvy4hwg7cag355v3xachsxdnzbsc35ai"; depends=[crayon dbplyr dplyr httr jsonlite lifecycle purrr rappdirs readr readxl rlang RSQLite rvest stringr tibble tidyr tidyselect]; }; + ECOTOXr = derive2 { name="ECOTOXr"; version="1.0.5"; sha256="0xah3kw58sm6j8vnpfsmw0lmrqqwbri2yqm6hph92qzq0a6rfsxg"; depends=[crayon dbplyr dplyr httr jsonlite lifecycle purrr rappdirs readr readxl rlang RSQLite rvest stringr tibble tidyr tidyselect]; }; + ECTSVR = derive2 { name="ECTSVR"; version="0.1.0"; sha256="1l4j1a25cssf2pindkqpzgr7a67brg5qxqk9ysy96vvbc74n8i6l"; depends=[urca vars WeightSVM]; }; ECTTDNN = derive2 { name="ECTTDNN"; version="0.1.0"; sha256="1ddwf040yp4c7nxvivml0xhad5qdc6jlf17c1lh4mssm5c0pp14w"; depends=[forecast urca vars]; }; ECctmc = derive2 { name="ECctmc"; version="0.2.5"; sha256="0prryvc17bm1xrhzlqk2w9nj181bg99j1dph3d36h0n1vfq1d7if"; depends=[Rcpp RcppArmadillo]; }; ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; }; @@ -1388,30 +1388,28 @@ in with self; { EDA = derive2 { name="EDA"; version="1.3"; sha256="08zqykvga7w07iy00c94q03mrxmjv649ggk7lmksjzy5j3wgyb6d"; depends=[ggplot2]; }; EDFtest = derive2 { name="EDFtest"; version="0.1.0"; sha256="1z6ayi0513ibyk0gjfxcd1rybp5374xhbf9zkkm669wdmfggx26h"; depends=[CompQuadForm rmutil]; }; EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; - EDIutils = derive2 { name="EDIutils"; version="1.0.2"; sha256="1yfn26js5sdr7k07s45mqxla6apzb4ykwa5pa634zgivqs6g9jry"; depends=[curl httr jsonlite xml2]; }; + EDIutils = derive2 { name="EDIutils"; version="1.0.3"; sha256="1rgk2bpfb98nd0zv4kabskm0zk9dz52swwf95h46vc2yb0kwapkw"; depends=[curl httr jsonlite xml2]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDNE_EQ = derive2 { name="EDNE.EQ"; version="1.0"; sha256="13aflnpznpzjrrdrn0r7v2mch6hjd77s6c3l7mnc2p59vq7mzmpg"; depends=[MASS]; }; EDOIF = derive2 { name="EDOIF"; version="0.1.3"; sha256="1lq4j5axybhv34mdsz0rn5nz9x3rzjf6bczzfzrf75k6pwqxim1w"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; EDOtrans = derive2 { name="EDOtrans"; version="0.2.2"; sha256="0n397z0nwz1my8d27dl5x61lzl5q1773lgqmxxj0a5a83i8srbx0"; depends=[ABCanalysis opGMMassessment]; }; - EEAaq = derive2 { name="EEAaq"; version="0.0.2"; sha256="0lqvgfhrm2gmmc262hn9flm3hb0bvk7ny21nkh2f7q6vghxhvwga"; depends=[aweek dplyr ggplot2 ggpubr ggspatial gifski gstat htmlwidgets leaflet lubridate mondate raster readr sf stringr tibble tictoc tidyr]; }; + EEAaq = derive2 { name="EEAaq"; version="0.0.3"; sha256="0qs6sqiqwl33bjz9k8hlfsqaawq3cc0ygm73pc8h200c5jwdk94n"; depends=[aweek curl dplyr ggplot2 ggpubr gifski gstat htmlwidgets leaflet lubridate mondate raster readr sf stringr tibble tictoc tidyr]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; EEMDSVR = derive2 { name="EEMDSVR"; version="0.1.0"; sha256="0m28rrw7lg3sx2aviqphsid2rsp7zksd3fcvk7pxfw16z90y7ifd"; depends=[e1071 Rlibeemd]; }; EEMDelm = derive2 { name="EEMDelm"; version="0.1.1"; sha256="0riz6s53daqbhy3xif0z8brb0n4swfjxxvvdnx2wwaiwl098rmwa"; depends=[forecast nnfor Rlibeemd]; }; EEMDlstm = derive2 { name="EEMDlstm"; version="0.1.0"; sha256="0cilmbk100gym5kaa7fq8bx0cdqa07xk82kxgxjf4k6gyzs39nlh"; depends=[BiocGenerics keras magrittr reticulate Rlibeemd tensorflow TSdeeplearning tsutils]; }; EESPCA = derive2 { name="EESPCA"; version="0.7.0"; sha256="0bj1wi1almj7rb7sad4i47mnfh4y83mbdd1x5clda6nd738adl2b"; depends=[MASS PMA rifle]; }; EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.1.2"; sha256="0p1zkfwjch9y39r7hjccjk7vfbnfwpdak6jfjs1sdpqkjqiw3r86"; depends=[ggplot2 PCovR psych reshape2 scales]; }; - EFA_dimensions = derive2 { name="EFA.dimensions"; version="0.1.7.7"; sha256="08mfillvxf2gvaisxrx9r842ky4kippqbpiklgjyxanssabk3jdg"; depends=[EFAtools mirt polycor psych]; }; + EFA_dimensions = derive2 { name="EFA.dimensions"; version="0.1.7.9"; sha256="0smcgd6g61fb3fshxfh7q055h6h11rh3q37mrc8yzfyg72y3461i"; depends=[EFAtools GPArotation mirt polycor psych]; }; EFAtools = derive2 { name="EFAtools"; version="0.4.4"; sha256="1fzkmvadkcd88d81420lw9mhpmxbjymp4jada2c79bxq1h6b3mw2"; depends=[checkmate cli crayon dplyr future future_apply ggplot2 GPArotation lavaan magrittr progress progressr psych Rcpp RcppArmadillo rlang stringr tibble tidyr viridisLite]; }; EFAutilities = derive2 { name="EFAutilities"; version="2.1.3"; sha256="09835x3nk8nnr3ibiddc5hx2l0jylz15fwsy2wjmv6jdrs0j9vsy"; depends=[GPArotation MASS mvtnorm plyr]; }; - EFDR = derive2 { name="EFDR"; version="1.2"; sha256="1k6y2qxfw5py1brh25apmzqm00y3a458x0wrrmdg604g1m9zlkg5"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; + EFDR = derive2 { name="EFDR"; version="1.3"; sha256="0mjf2r1aa5iyf4b9f50mb50h1rmhwdi3qyh235mihy3pj68195yn"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; - EGAnet = derive2 { name="EGAnet"; version="1.2.3"; sha256="10vfv8fkk8kfcspp4p8avz16ipj58231q43rzrmwmcfx362q3g48"; depends=[GGally ggdendro ggplot2 ggpubr glasso igraph lavaan Matrix matrixcalc network OpenMx pbapply qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.9"; sha256="1if22yq5wyfd0sx5b38xw3fbj8qlmbnkikjq77ihxd3pzfjpdl14"; depends=[dataRetrieval fields foreach MASS survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.4"; sha256="1g01a03smn5yp261cyk3x310m1mcv4bqyh8y123wam9gpa7dxrp6"; depends=[binom EGRET]; }; EGRNi = derive2 { name="EGRNi"; version="0.1.6"; sha256="0wgdhlmnch6gpypqlwd5z56ia03lbbimr4ci9gcfs8f881dh92dy"; depends=[fdrtool gdata MASS readr]; }; EHR = derive2 { name="EHR"; version="0.4-11"; sha256="0iz69bk5l164c7qpmnwlbrpxn99d8jm0x6hck2bj8jd52q4kvfvi"; depends=[data_table lubridate pkdata]; }; - EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.4"; sha256="02izrgl526znn4xs10c5l3gv0b5chmgr376i26nli988cypmf32h"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; }; - EIAapi = derive2 { name="EIAapi"; version="0.1.1"; sha256="021mbyxx9swr2wn85mifqg8pwdvrx0hnds6l209zl8f79ndyhlz4"; depends=[data_table jsonlite]; }; + EIAapi = derive2 { name="EIAapi"; version="0.1.2"; sha256="1vyl7zm8vwqcs57b8sw9vkwc1p123kcz2d2xldg6p2vfkgi91jw1"; depends=[data_table dplyr jsonlite lubridate]; }; EIX = derive2 { name="EIX"; version="1.2.0"; sha256="02ry0aqqnd0zh6zbvx1dbq3sdahyqcgabhkvbbw4ig0qk70w62aj"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS purrr scales tidyr xgboost]; }; EKMCMC = derive2 { name="EKMCMC"; version="1.1.2"; sha256="0filw1xikbv55h7xswlqifd30d43b9y3h2m6i0zv8v54y8mmszfg"; depends=[numDeriv]; }; EL = derive2 { name="EL"; version="1.2"; sha256="1ygvb8m33szf2xl6fcvyqhgpj7ppn4kc9wd1fcaq4ppbvv6c17ka"; depends=[]; }; @@ -1420,15 +1418,15 @@ in with self; { ELISAtools = derive2 { name="ELISAtools"; version="0.1.5"; sha256="18f2adhw85f0hsz5gb6xhi0w2phcq364xy9y1jri6ckzs8g0pny7"; depends=[minpack_lm R2HTML stringi]; }; ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; }; ELMSO = derive2 { name="ELMSO"; version="1.0.1"; sha256="14wnrqrbbfb37f3wp91qib28bcanflw3asv1y0v748n36x1xbv3m"; depends=[]; }; - ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; }; + ELT = derive2 { name="ELT"; version="1.7"; sha256="1ngpcrnzkx9svwglfd6pzz46frjvvckcfbm5g5myxi63raljfc8c"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-5"; sha256="1j2vwcs443x3pf4zypyvbkn8fb5if9b9hf1s821jjjpgach573sc"; depends=[survival]; }; EM_Fuzzy = derive2 { name="EM.Fuzzy"; version="1.0"; sha256="0sz4zkjn6rdzdqmkq6j24bd4sj91y5lan31bldxdfskgz0jpzhbr"; depends=[DISTRIB FuzzyNumbers]; }; EMAS = derive2 { name="EMAS"; version="0.2.2"; sha256="07y15nbym69iwdy9c5gcdalign7g8qw8hkcy1v29z6j2di6qzn84"; depends=[ggplot2 IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b4_hg19 lavaan mediation minfi multilevel qqman]; }; EMAtools = derive2 { name="EMAtools"; version="0.1.4"; sha256="0gx55ddw7dz1lm599i0gj15dlc3m58a8rf223hiykszb5c8bi372"; depends=[anytime DataCombine ggplot2 lmerTest plyr sjstats]; }; - EMCluster = derive2 { name="EMCluster"; version="0.2-14"; sha256="12ahgvnpqms930zzc1blpfmj97m679rns8h4nh1l0yr0y1w6lfcn"; depends=[MASS Matrix]; }; + EMCluster = derive2 { name="EMCluster"; version="0.2-15"; sha256="1p8zfavx9waz3n4nkz8f6cd5hlcjb53r4wiwnrll5dx8zpfjj8g2"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.9"; sha256="0lga27nl7c3h02xrbb2hcwlb9dyli340v0hb3vwwzqrhmr0fl806"; depends=[fields locfit]; }; - EMDANNhybrid = derive2 { name="EMDANNhybrid"; version="0.1.0"; sha256="0mm5zfkrja9pz58psp7b6r1lpixaa9y685xxv9srv9l9cl8d892j"; depends=[EMD forecast nnfor]; }; - EMDSVRhybrid = derive2 { name="EMDSVRhybrid"; version="0.1.0"; sha256="0wis8dh4xd5xldrrfzfr625pix2fvp139q6kj9ff2m6p5wafiabw"; depends=[e1071 EMD]; }; + EMDANNhybrid = derive2 { name="EMDANNhybrid"; version="0.2.0"; sha256="17zkag633kh1xkcasvyimvd9w1dmy1hlnrfffb96v7qh35rc8q3n"; depends=[EMD forecast]; }; + EMDSVRhybrid = derive2 { name="EMDSVRhybrid"; version="0.2.0"; sha256="1vjr7aslvykbyz8aw2z5aqlqx1v3nv63hym6knygflkkpr9zsr30"; depends=[e1071 EMD]; }; EML = derive2 { name="EML"; version="2.0.6.1"; sha256="1k2chfz6qixa6jsikqgilqp8j49mcshn725ck1h77bacfxfhf7za"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; EMLI = derive2 { name="EMLI"; version="0.2.0"; sha256="0zwbbxsmkyrgmva5h8l78f181nz5asc7dpdcmajvj2y3yl1rb278"; depends=[]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; @@ -1443,9 +1441,8 @@ in with self; { EMSS = derive2 { name="EMSS"; version="1.1.1"; sha256="0zkr2xfvwlqxcfj59801vm54l38agipbkd9qgq6jkmqkdbkfv3yr"; depends=[mvtnorm sampleSelection]; }; EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.3"; sha256="0zmcakph88qg9f1p7icn4llw92nh1jfijxsx3rhl7g9d4rihprq5"; depends=[]; }; - EMbC = derive2 { name="EMbC"; version="2.0.3"; sha256="0ns6jmshblf00n4harhls03q9c6h1wvgvjzn8jvr3kf4gm2iz2jd"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; }; + EMbC = derive2 { name="EMbC"; version="2.0.4"; sha256="03vsyzq4zgv64yzazplj1sm3kgw0pdildcvi8w88b3d0rkjnhn5m"; depends=[mnormt RColorBrewer Rcpp RcppArmadillo sp suntools]; }; EMpeaksR = derive2 { name="EMpeaksR"; version="0.3.1"; sha256="0hzw4hnisqa13h75faq4hdsmg3y6dlmfknbkql4mbdx4s3qb19fv"; depends=[]; }; - ENMTools = derive2 { name="ENMTools"; version="1.1.1"; sha256="04dvrdw7xnxxa9s1iyxjaf090mmm5kqn5minpz0znjfc9k92cfzs"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster sp spatstat_geom spatstat_random terra]; }; ENMeval = derive2 { name="ENMeval"; version="2.0.4"; sha256="1lb4bgnvig1sb88nfgylzps6kkw0jb5lz46yrqqk3ax71x33r7vd"; depends=[dismo doParallel doSNOW dplyr foreach ggplot2 glmnet magrittr maxnet rangeModelMetadata raster rlang tidyr]; }; EPGMr = derive2 { name="EPGMr"; version="1.0.0"; sha256="1ii4lccv4hyydy3sd5l7c22pgx27x3mdml20sfbdj85pmpyab6q9"; depends=[]; }; EPLSIM = derive2 { name="EPLSIM"; version="0.1.0"; sha256="0x495638nh0n0k3i80vs7bcbdrgvw5fkib8dvwwgzgdgb419hakm"; depends=[ciTools ggplot2 MASS]; }; @@ -1456,8 +1453,8 @@ in with self; { ER = derive2 { name="ER"; version="1.1.1"; sha256="1hsp5sqhnsz175nc2cq2w4g6dgld1429ib7w58piw6982b7m6zn6"; depends=[ggplot2 glmnet gridExtra pls plsVarSel scales]; }; ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; depends=[corpcor fdrtool irlba mnormt pacman]; }; ERPeq = derive2 { name="ERPeq"; version="0.1.0"; sha256="1619j6fgsg594fdbv9qk64rw2yqsy7wyj8qnwmpnmv66gxc5mqaq"; depends=[invgamma pracma rmutil VGAM]; }; - ERSA = derive2 { name="ERSA"; version="0.1.3"; sha256="0djh633vmc89vl4bp7p4bazlb0pshpd2yckfj0yjk6vc9lrbql69"; depends=[broom car combinat dplyr ggplot2 leaps miniUI purrr RColorBrewer shiny tidyr]; }; - ESG = derive2 { name="ESG"; version="1.2"; sha256="17kw82dikcibqsdb1fvbx2x2f3shzbqggygabprcvwki8bg9hgni"; depends=[]; }; + ERSA = derive2 { name="ERSA"; version="0.1.4"; sha256="1ri2v6qxdi9if10vxxhgj0jwk4whfi45aqqdqri918djg0dk75p1"; depends=[broom car combinat dplyr ggplot2 leaps miniUI purrr RColorBrewer rlang shiny tidyr]; }; + ESG = derive2 { name="ESG"; version="1.3"; sha256="1r454bn7wwc8nv9f1z0dfgn6kj9ac35b3i19xx385jhlqsm1akgw"; depends=[]; }; ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; EScvtmle = derive2 { name="EScvtmle"; version="0.0.2"; sha256="0bp5ykqczj6zyb9g5rg9zwwdyvd3l530km927wwxdi862sh5ri5g"; depends=[dplyr ggplot2 gridExtra MASS origami stringr SuperLearner tidyselect]; }; ETAS = derive2 { name="ETAS"; version="0.5.1"; sha256="03721z7fsbkqv5wiybm01nxbl99x8wf2214y3w139k0zr42xk94s"; depends=[fields goftest lattice maps Rcpp spatstat_explore spatstat_geom spatstat_random]; }; @@ -1469,7 +1466,6 @@ in with self; { EValue = derive2 { name="EValue"; version="4.1.3"; sha256="0ip4cyipbs6g0znrdh5zs4xizmqgdznq8riggkgyv06wipgx9a2j"; depends=[boot dplyr ggplot2 metadat metafor MetaUtility]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; }; EWS = derive2 { name="EWS"; version="0.2.0"; sha256="0rkxnc5pwrjgm2j201rg0z4nqb75rpkqh3hff4lvw1zmnr9flm6r"; depends=[numDeriv]; }; - EWSmethods = derive2 { name="EWSmethods"; version="1.1.2"; sha256="14hqvxsv88n6sqvwh3sqy6k0s7c121b52bm3krnqsxy872hjl346"; depends=[dplyr egg foreach forecast ggplot2 gtools infotheo moments rEDM reticulate scales seasonal tidyr zoo]; }; EXPARMA = derive2 { name="EXPARMA"; version="0.1.0"; sha256="120w491g925vzxriinfsgxs4kgx58dy4awb2knichsa4p1w5gvly"; depends=[forecast]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="3.1.1"; sha256="0scslbgbbwma7sr0w9awg58ly5jwn877xsk6q1gq0ss3rd17pmfk"; depends=[ada BiocStyle e1071 GA gbm glmnet optimx ROCR rpart]; }; @@ -1482,9 +1478,9 @@ in with self; { Ecdat = derive2 { name="Ecdat"; version="0.4-2"; sha256="1vyc4ynkd65mng2x8wvzn47crsvaqfz97n89jxn12xv13bpsbs7c"; depends=[Ecfun]; }; Ecfun = derive2 { name="Ecfun"; version="0.3-2"; sha256="1q0mx70hy18rabpabxghaixkb3r1432cxln844cac4dqxhvzcqgy"; depends=[BMA fda jpeg MASS mvtnorm rvest stringi TeachingDemos tis xml2]; }; EcoDiet = derive2 { name="EcoDiet"; version="2.0.0"; sha256="1lgjymm2anb7f11gvg0875wyjjfzbh0y1vwinbidpn2kmgm9b05h"; depends=[coda ggmcmc ggplot2 jagsUI]; }; - EcoEnsemble = derive2 { name="EcoEnsemble"; version="1.0.4"; sha256="0rprg2qcxf6kq0hp2c64l8vl9wcd0apjb1xvb79nbaa7pf28h57m"; depends=[BH cowplot dplyr ggplot2 matrixcalc Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; }; - EcoIndR = derive2 { name="EcoIndR"; version="1.8"; sha256="008wgp9zc8a8knz9ighgavrdm0yf37m5jahnq5kndjhld0359z6h"; depends=[rgeos]; }; - EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.3"; sha256="05j8m9vzkwlsw1h69s5myhbg85vyhqdxcl9r5mdwsrk9f58wajmz"; depends=[ggplot2 igraph]; }; + EcoEnsemble = derive2 { name="EcoEnsemble"; version="1.0.5"; sha256="0d5kha5i49p7fd8g4f1i999sag4jz8if6yashshr9hp6jr6mibpc"; depends=[BH cowplot dplyr ggplot2 matrixcalc Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.9"; sha256="09d7gka9h700fyryvkrb6jlk7ci341mwvvyd3hfy0nzx21jcpckb"; depends=[FD picante Rarity splancs vegan]; }; + EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.4"; sha256="0ljihc60b3k25hn3z09arql2y0byhxx4mljm2w4m8f3micqfwzfw"; depends=[ggplot2 igraph]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6.1"; sha256="0nrq6n7amz8l6rk0wfyrih7rkic96yc02rpk4szis81v7yvm7346"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; @@ -1504,9 +1500,8 @@ in with self; { Elja = derive2 { name="Elja"; version="1.0.0"; sha256="0znq40ccr828j9xwa3xixdp0i2fyj0x02lh5vxb61bf96y9njsvy"; depends=[devtools dplyr ggplot2 MASS]; }; ElliptCopulas = derive2 { name="ElliptCopulas"; version="0.1.3"; sha256="1hnkhd9hw2550kzjyycl1hzm9pk9j11n96hka59z8x74vrz980qp"; depends=[Matrix pbapply Rmpfr Runuran wdm]; }; EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; }; - EloOptimized = derive2 { name="EloOptimized"; version="0.3.1"; sha256="09bg1gm8jhjj0r7yzdgi2zlyavrizgiljwh26mpb6ng6p5mkliid"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang]; }; EloRating = derive2 { name="EloRating"; version="0.46.11"; sha256="09nh3ia4s3c9yjhw0f0haqb26fryfc4lf9rgfcbqqzzwgdr1invj"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; - EloSteepness = derive2 { name="EloSteepness"; version="0.4.7"; sha256="11kfq8w6ywnzprhkv77aqyvak0h85kv51zfnmahpa8jw3amhkkl1"; depends=[aniDom BH EloRating Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + EloSteepness = derive2 { name="EloSteepness"; version="0.5.0"; sha256="1fqqvwbvhlr5h30mav5nch4gqjr61yvpydmbd1zq4a19hwb8rivd"; depends=[aniDom BH EloRating Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.2"; sha256="0k4hja5y7qd0n3gfaxzxrz4wpxc1w9d4d4xbb63rq2nfk3lj7a42"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiR = derive2 { name="EmiR"; version="1.0.4"; sha256="1xhsf9n5af6z7v62vpnqjlp20s6fp7jf1wmgxgv77hxm4g5cm0q7"; depends=[data_table dplyr gganimate ggplot2 mathjaxr plot3D Rcpp RcppProgress Rdpack tibble tictoc tidyr]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.3.0"; sha256="1cwzzkynhnpjd1slnifdmkrshfpv99ryilxj27f98kwgbnb6i81a"; depends=[doParallel foreach lattice xts zoo]; }; @@ -1525,10 +1520,9 @@ in with self; { EntropyEstimation = derive2 { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; }; EntropyMCMC = derive2 { name="EntropyMCMC"; version="1.0.4"; sha256="065djml9dmn5ahbgaljnshvhziwg61xciq6fzh76449x3wy6bg65"; depends=[mixtools RANN]; }; EnvCpt = derive2 { name="EnvCpt"; version="1.1.3"; sha256="1zv2x3svlqrfchr9j4bk2w2sx75zl4886pqk1c1sx5glqrkdbfki"; depends=[changepoint MASS zoo]; }; - EnvExpInd = derive2 { name="EnvExpInd"; version="0.1.0"; sha256="063f3c10a7k9j3f85xilj1s6dd9ky5sw8sbvhzkhg5hg92c9dpns"; depends=[dplyr gstat maptools RCurl sp stringi zoo]; }; EnvNJ = derive2 { name="EnvNJ"; version="0.1.3"; sha256="1wxb4zhhn7iahgsi7rg1vmfaa3vypifqx7kkcvmmgk0263z4sj5v"; depends=[ape bio3d phangorn philentropy seqinr stringr]; }; - EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; }; - EnvStats = derive2 { name="EnvStats"; version="2.8.0"; sha256="17fgwa5rdjpsxk95p1j48bkpbmm01vy25vzbgggj31a1k2i4i85p"; depends=[ggplot2 MASS nortest]; }; + EnvNicheR = derive2 { name="EnvNicheR"; version="1.5"; sha256="1zg59w5ynhrl74z0y8f656rfqsicwc0sp6awgg655yr68c6xa0jp"; depends=[IDPmisc]; }; + EnvStats = derive2 { name="EnvStats"; version="2.8.1"; sha256="19nnab201yalxbgpvpp5lkgqs0m17b5plsswmaxbvdv4mag2p58j"; depends=[ggplot2 MASS nortest]; }; EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; Epi = derive2 { name="Epi"; version="2.47.1"; sha256="1a4h6hfpwcy3lb49y949h86vr4sdnjfbqqnr4jgc45mc64fhafp1"; depends=[cmprsk data_table dplyr etm magrittr MASS Matrix mgcv numDeriv plyr survival zoo]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.17.0"; sha256="0s3mfv1djrq1kp75f94z4fhrx3jha4vvil30daxkw5b0iy3mvf5q"; depends=[]; }; @@ -1539,24 +1533,25 @@ in with self; { EpiILM = derive2 { name="EpiILM"; version="1.5.2"; sha256="0drs4qywx9axs7k5qk7sp5r3g8pykn4lqqbm0hxyl24r6b5l3d6b"; depends=[adaptMCMC coda LaplacesDemon]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.7"; sha256="1yjcjxf5m1qbb6p09g34wkr4q13g65ly11kxh95r22cdl85jmlq3"; depends=[coda igraph]; }; EpiInvert = derive2 { name="EpiInvert"; version="0.3.1"; sha256="0afmgzx7ryvwb8ajkm0v077lrnahac8g3jqkk86imx4101dfg70q"; depends=[Rcpp]; }; - EpiLPS = derive2 { name="EpiLPS"; version="1.1.0"; sha256="1axamip6f0dvl6zawqg6a35r4cbg0q4p70fpjl04p35c0gs3jgg2"; depends=[coda EpiEstim ggplot2 gridExtra Rcpp RcppArmadillo]; }; + EpiLPS = derive2 { name="EpiLPS"; version="1.2.0"; sha256="098kmc88x1dhxgbg24vhcqg5302gbbsv8y2g3vcz2yxa9qgl5yl6"; depends=[coda EpiEstim ggplot2 gridExtra Rcpp RcppArmadillo]; }; EpiModel = derive2 { name="EpiModel"; version="2.4.0"; sha256="0bwi7rkiv2cg1srmzbyly89w6p9xppk90vjmbw6h5k9481gn097h"; depends=[ape coda deSolve doParallel dplyr egor ergm ergm_ego foreach ggplot2 lazyeval network networkDynamic networkLite RColorBrewer Rcpp rlang statnet_common tergm tibble]; }; - EpiNow2 = derive2 { name="EpiNow2"; version="1.3.5"; sha256="02sp6bzpg2bf8ziyxrmrjjcw6pklcfyjxck0i7g81kawgq9nfnfj"; depends=[BH data_table futile_logger future future_apply ggplot2 lifecycle lubridate patchwork progressr purrr R_utils Rcpp RcppEigen RcppParallel rlang rstan rstantools runner scales StanHeaders truncnorm]; }; + EpiNow2 = derive2 { name="EpiNow2"; version="1.4.0"; sha256="0dadwmzfb0cqpa9ngqndy7q3zpi3wh1al6fy7i6gdhvnfm1gkahs"; depends=[BH data_table futile_logger future future_apply ggplot2 lifecycle lubridate patchwork progressr purrr R_utils Rcpp RcppEigen RcppParallel rlang rstan rstantools runner scales StanHeaders truncnorm]; }; EpiReport = derive2 { name="EpiReport"; version="1.0.2"; sha256="1dh9rjdjgmwzvfslzgnmd37ipj7ydbn4pnngz4sw7nknqy7r4dpx"; depends=[dplyr flextable ggplot2 officer png tidyr tidyselect zoo]; }; EpiSemble = derive2 { name="EpiSemble"; version="0.1.1"; sha256="021cp01wc3m3mhallzszlwd07pjdylgp980978qm35ylasl7z3b5"; depends=[Biostrings caret devtools doParallel e1071 entropy foreach ftrCOOL gbm iterators party randomForest seqinr splitstackshape stringr tibble tidyverse]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.2"; sha256="17mawnx3c87kgfa7aj42a7db9c1ciyxdfgka9sgx6lc0yw5249as"; depends=[dplyr ISOweek rmarkdown shiny surveillance]; }; + EpiStats = derive2 { name="EpiStats"; version="1.6-1"; sha256="02pp2b78hznm5n2ngk4bvgc7amwi32406fxvn52mbbvlpb8pjm0d"; depends=[dplyr epiR]; }; EpiTest = derive2 { name="EpiTest"; version="1.0.0"; sha256="0fr6lkn1782x9q91y12idbzsh40xz5vzqfag259g6p8m3gyjiq25"; depends=[dplyr ggplot2 ggrepel magrittr MM4LMM purrr stringr]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; EquiSurv = derive2 { name="EquiSurv"; version="0.1.0"; sha256="1yml5s3rswayxlxqsqknpwa2i55pj9q1p233kj9xsm8f1zmzk1mf"; depends=[eha survival]; }; EstCRM = derive2 { name="EstCRM"; version="1.6"; sha256="110imzvcbkql3dk1pb8ys1rqykkghd73k3v0l2sppny70fw8b24q"; depends=[Hmisc lattice]; }; - EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; EstMix = derive2 { name="EstMix"; version="1.0.1"; sha256="13zwhxm0qm83c8k5k4slvq2snkmbq1zz3i5cqvxxwhvkb4b8aja4"; depends=[PSCBS Rcpp RcppArmadillo]; }; EstimDiagnostics = derive2 { name="EstimDiagnostics"; version="0.0.3"; sha256="036kz4zdrgqab2mbzxmbknr9314ap5b2dp75syqhg2mmzw3zf3li"; depends=[foreach ggplot2 goftest reshape2 rlang testthat]; }; EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.3.1"; sha256="06ihyiq9dw7yg8qpq3yckpd0jk4gjajgvavbj302sj0qssrxgyzh"; depends=[dplyr ggplot2 igraph qgraph]; }; EstimationTools = derive2 { name="EstimationTools"; version="4.0.0"; sha256="1hwlrsxl42n4i25f1izhccj755aydl2r98w1jn12z9a62wk9nnzy"; depends=[autoimage BBmisc boot DEoptim GA gaussquad numDeriv Rdpack stringr survival]; }; EthSEQ = derive2 { name="EthSEQ"; version="3.0.2"; sha256="0wrqdvcfag83qidrfg2b6q86xmb3f03mda4kwx0f4a53wl5fjdrx"; depends=[data_table gdsfmt geometry MASS plot3D Rcpp SNPRelate]; }; EuclideanSD = derive2 { name="EuclideanSD"; version="0.1.0"; sha256="1w5s1zkb81v150nvaygvyla2x0vh4c99vd5jw53jcq68sv9hby3i"; depends=[shiny]; }; + Euclimatch = derive2 { name="Euclimatch"; version="1.0.1"; sha256="09nydlqdxpfcvfaznpjchw3zlz05a03n7picn419ivvjmf6hrx8x"; depends=[doParallel foreach RColorBrewer Rcpp RcppParallel terra]; }; EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; }; EvCombR = derive2 { name="EvCombR"; version="0.1-4"; sha256="038crxa3a7h8zxjmcy98pq1zlc6gnlqjy39srh8mai9ksalx672x"; depends=[]; }; Evacluster = derive2 { name="Evacluster"; version="0.1.0"; sha256="01nxclrp90qhlnxl0yf2srppglic6m3f7pl35h62r6kxic0lrzhs"; depends=[]; }; @@ -1574,21 +1569,22 @@ in with self; { EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.2"; sha256="0aaqd4q8imm2wgkgdpwwdl6nxgr3apgb3l24f2lwxgv2y045309d"; depends=[deSolve geometry ggplot2 interp MASS reshape2]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; EwR = derive2 { name="EwR"; version="1.4"; sha256="1i0cwyylr1lqilykn1q2y1ad2gawfqkw9c51g04yn061c623pkam"; depends=[]; }; + ExGaussEstim = derive2 { name="ExGaussEstim"; version="0.1.2"; sha256="070q94c9qblmcarpmpabhawc2y1lz98s6vv2x8wj8fhgah6pdhvf"; depends=[dlm fitdistrplus gamlss_dist invgamma nloptr pracma]; }; ExNRuleEnsemble = derive2 { name="ExNRuleEnsemble"; version="0.1.1"; sha256="0sfrfnhba5940kyc1y5g8zp2wdrr44i498fbwrpbnjxfby4cdx4r"; depends=[FNN]; }; ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.3"; sha256="1y4ccyvlvdx9lcgpyns6k2npc0rzwk8db4bmbi3pq9xmv7ycgmcz"; depends=[corrplot dplyr DT ggplot2 kableExtra lmtest multiwayvcov openssl plm rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="3.2"; sha256="0a33gbhzd580i31xxsjxigg0nl8ag1x4xz3jqmq5jqappc6f5d2k"; depends=[rootSolve]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="2.1"; sha256="1rhwdhgj3d6m4x75v5m03y6l2sf7ndgb15qc8k7kx7vr6c03zl8v"; depends=[]; }; - ExactMed = derive2 { name="ExactMed"; version="0.2.0"; sha256="1hq01z1xa7vdsypmc1cfrx9agn65c6d78c25v0fchbp2ik05998d"; depends=[brglm2 lmtest pkgcond sandwich]; }; + ExactMed = derive2 { name="ExactMed"; version="0.3.0"; sha256="0cjpnym71n2w0yk9xh5b65x35g4ycy20d9ydk43xw0nl1cpksd56"; depends=[brglm2 dfidx lmtest mlogit nnet pkgcond sandwich]; }; ExactMultinom = derive2 { name="ExactMultinom"; version="0.1.2"; sha256="1ygsiwcsmda0pbp7lzr03sb461mr9fff7hxp1lil40y9z0xgdmmb"; depends=[Rcpp]; }; ExamPAData = derive2 { name="ExamPAData"; version="0.5.0"; sha256="1wjzg5b3xcl5njk95h2c8xz4k727d62182nbf49qrvd3nbd3bscj"; depends=[]; }; - ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.3.4"; sha256="1vcyla5rgz8ivqzq4qq4bnw4qghkqww6zziwp0374ik86r2f6krb"; depends=[matrixStats SpatialTools splancs]; }; + ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.3.6"; sha256="1yp4dl2sb7j41nbqhx0dsag9b3qg3l82snvjxnb57z4p63zsb2r5"; depends=[matrixStats SpatialTools splancs]; }; ExcelFunctionsR = derive2 { name="ExcelFunctionsR"; version="0.1.4"; sha256="1j3vfvfk8lp46zb6fwvq9lafk7r2qrnx4vxyhaih71c0a8g6dz9n"; depends=[lubridate plyr roperators stringr tidyr]; }; ExcessMass = derive2 { name="ExcessMass"; version="1.0.1"; sha256="1ycvv3bm9qq11imc09jhwhb1vb2cbngckmb3ibj4hfl697gaby5v"; depends=[]; }; - ExclusionTable = derive2 { name="ExclusionTable"; version="1.0.0"; sha256="1adanj3rnk9vhz89rgl25w10ghm2xn1rl99ilnmpkq5jdblcifkx"; depends=[dplyr magrittr]; }; + ExclusionTable = derive2 { name="ExclusionTable"; version="1.1.0"; sha256="01f4gklvrzglwg2ck0qr1d9l467bb4rsklv5bz4afrdk9snxgwz7"; depends=[cli dplyr magrittr]; }; ExhaustiveSearch = derive2 { name="ExhaustiveSearch"; version="1.0.1"; sha256="1wb3bf1ilml5cilm740rh8ngiybxhxg6h6nzh1rlqd6wgfp17mzh"; depends=[Rcpp RcppArmadillo]; }; ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.16"; sha256="1r7b9h5i562fa67ghisyw6ciwawfyjwrpn95kdws4dd4gqgbb9kv"; depends=[aod Biostrings dplyr GenomicAlignments GenomicRanges IRanges magrittr Rsamtools VGAM]; }; - ExpAnalysis3d = derive2 { name="ExpAnalysis3d"; version="0.1.1"; sha256="0gch9q19l3lqb35vfq1kcrga9jzqvrxr7d6x9lk7nzb78y735wa2"; depends=[crayon fields magrittr plotly]; }; + ExpAnalysis3d = derive2 { name="ExpAnalysis3d"; version="0.1.2"; sha256="1hzl5dzayrqj1my187300bsm59w5vq2hi63z8hj768dsbdha2vpr"; depends=[crayon fields magrittr plotly]; }; ExpDE = derive2 { name="ExpDE"; version="0.1.4"; sha256="0yjsap92dd1sb23fhw69i0ddk3lyj5f4kwp9rvz4k0vxry10hx7g"; depends=[assertthat]; }; ExpDes = derive2 { name="ExpDes"; version="1.2.2"; sha256="145x7zzhgs7rqbamsfwcxlhppxmy9l6v4a1wximac8qgp7i0wdpi"; depends=[stargazer]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.2"; sha256="05s7j3afs97x0k4w9rsjic1519ilzri250x5rl6l6smqivjaplci"; depends=[stargazer]; }; @@ -1599,10 +1595,10 @@ in with self; { ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; ExplodeLayout = derive2 { name="ExplodeLayout"; version="0.1.2"; sha256="0yxf12hv4ypbyxnj1x4wrmj0l52nrx9ss79szl7j4bk9nc98qmli"; depends=[ggplot2]; }; ExposR = derive2 { name="ExposR"; version="1.1"; sha256="0vsjq1l1kjzhqmixdqsv960riqglc0sg5lp7y27j0k54frnkbxik"; depends=[terra]; }; - ExtDist = derive2 { name="ExtDist"; version="0.7-1"; sha256="0a3ixd9z9ddig9nvd60a6gbmv2bf1irm6rjl39xivq01dmw7j07q"; depends=[numDeriv optimx]; }; + ExtDist = derive2 { name="ExtDist"; version="0.7-2"; sha256="0wramjs7s2nxgjb2k30jgbbpf7pj4a1gzzqx8p1qh4pskh15msfm"; depends=[numDeriv optimx]; }; ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; }; ExtractTrainData = derive2 { name="ExtractTrainData"; version="9.1.6"; sha256="146jvjmdf4kw3d3dp2v6fb421kh8jggyg0lh4xg1ggjb4rphpjzd"; depends=[raster]; }; - ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.4-0"; sha256="12mhzbd3rp8ny00azqhk1cdhsz25ybn0wcffzp7qfm5wfnknapfi"; depends=[copula doParallel evd fda foreach gtools mvtnorm nloptr numDeriv quadprog sn sp]; }; + ExtremalDep = derive2 { name="ExtremalDep"; version="0.0.4-1"; sha256="141pf0yvcfds2a0lzcmw99rzb1v75bsgapxppjcdnr66fb0bsqh1"; depends=[copula doParallel evd fda foreach gtools mvtnorm nloptr numDeriv quadprog sn]; }; ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.7"; sha256="02s714rg1s7wj9ic2kblc72ww7zpgy1brcqxa4rl96ip2rblzdbv"; depends=[Formula]; }; ExtremeRisks = derive2 { name="ExtremeRisks"; version="0.0.4"; sha256="1mvkrwyj9kwg35dzm9jzx311qqd4v3nnbrr6d64x476ni4pnrbl8"; depends=[copula evd mvtnorm plot3D pracma tmvtnorm]; }; EzGP = derive2 { name="EzGP"; version="0.1.0"; sha256="0ln7xa9gys19xyn4wkfxaxfpyvaxvcag04s3j9sc19ff8xdxzf3z"; depends=[nloptr]; }; @@ -1628,21 +1624,22 @@ in with self; { FBN = derive2 { name="FBN"; version="1.5.2"; sha256="15pib81p2jnxg5sasn4c3s6b1jab16fxr3l4xmlxrk5nk7spmwav"; depends=[]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; FCO = derive2 { name="FCO"; version="0.8.0"; sha256="1zysqchq59v9ykp012sp870wgmckbq8gq3pqhl0jyh903hxw59qv"; depends=[checkmate data_table lavaan semTools]; }; - FCPS = derive2 { name="FCPS"; version="1.3.3"; sha256="1zawlzyznmp5fk2c0p86ivgj8b3pfc97i0vrzm6zalgdin0lcvgr"; depends=[DataVisualizations ggplot2 mclust]; }; + FCPS = derive2 { name="FCPS"; version="1.3.4"; sha256="15xsqwnn5liqjbwg8qpj7prqdiykfxczdw9fyllya7x801ky1rfi"; depends=[DataVisualizations ggplot2 mclust]; }; FCSlib = derive2 { name="FCSlib"; version="1.3.0"; sha256="1191ba6dwpakcdnbcq61zm5xq24isxjnn98nmvk67fpf1ycw70w9"; depends=[bitops fields stringr tiff]; }; FCVAR = derive2 { name="FCVAR"; version="0.1.4"; sha256="0762pkjh0yk96jlpqw4jv0andr0s0ylx14rh1igv9d0nagd237ba"; depends=[fracdist pracma]; }; FD = derive2 { name="FD"; version="1.0-12.1"; sha256="18i0wcmi2nslifi395ajkkfy3j6dsdbrj4nl5ni6ndnmxifg7d0f"; depends=[ade4 ape geometry vegan]; }; FDRestimation = derive2 { name="FDRestimation"; version="1.0.1"; sha256="083w50g8n03l0wigywm90xyp8xjxbsbbicv0a5g2wmbdd70m4nay"; depends=[Rdpack]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; FDX = derive2 { name="FDX"; version="1.0.6"; sha256="16d2gwdiqv3i37ad33mvad8hsni0i7zf3y85z9sgxvabhs5igva1"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; - FDboost = derive2 { name="FDboost"; version="1.1-1"; sha256="1hrz6ms5qvhn8sa8y39d8r7vz0q07pcsg72fh07gph6m6mrpx4yh"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; + FDboost = derive2 { name="FDboost"; version="1.1-2"; sha256="0fmcwjrcj4axdajavlyg7d200yb6wkxkd7fidmcsxpvpnbbb7wgj"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FEA = derive2 { name="FEA"; version="0.0.2"; sha256="1p2lsfhxih25i6rdwh64p4i5z72ds4a3x8a5p8db1jmx1qi07kq5"; depends=[geometry geosphere MASS ptinpoly sp]; }; - FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; }; + FENmlm = derive2 { name="FENmlm"; version="2.4.4"; sha256="0s1i7kklh5vzfv6xi1j9dxp21cncs5gsxf7rn25rsg8b5srllsxl"; depends=[Formula MASS numDeriv Rcpp]; }; FER = derive2 { name="FER"; version="0.94"; sha256="0319dz0qvk8s9cfngqas3j212bw0f4rzw3gqcd7r7sl0249dla7p"; depends=[statmod]; }; FESta = derive2 { name="FESta"; version="1.0.0"; sha256="1kf5iqw8x8079gjaxicrgax5l798l8hxcc5y83l5pqh0ync5bxm6"; depends=[]; }; FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; FFD = derive2 { name="FFD"; version="1.0-9"; sha256="1478sxfz4cv43nmvhg0d0w82kmyr4rfhhrrlrq4aanbxnriggkxr"; depends=[R2HTML]; }; FFTrees = derive2 { name="FFTrees"; version="2.0.0"; sha256="14nd5bh2vzsv9cmmfdm6yzv6mxc8gkj9x8r2799w72sijs35ij5l"; depends=[caret cli dplyr e1071 knitr magrittr randomForest rpart scales stringr testthat tibble tidyselect]; }; + FFdownload = derive2 { name="FFdownload"; version="1.1.1"; sha256="1xhjp2zk5w7gryfhr7qlzhdgfnfy3c7ivslayy0fhy7r7jdxr847"; depends=[plyr rvest timetk xml2 xts zoo]; }; FGLMtrunc = derive2 { name="FGLMtrunc"; version="0.1.0"; sha256="15pj2dmgbjbx4xi585rqggnp05xzpg9pn2iy76ibgkdvjqknkwii"; depends=[foreach glmnet Rcpp RcppArmadillo splines2]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; FHDI = derive2 { name="FHDI"; version="1.4.1"; sha256="1n1rbrqdphp0prmkili6rnpxwdb7fgwsgncllr6yxlrkr5rb76pm"; depends=[]; }; @@ -1658,10 +1655,11 @@ in with self; { FKSUM = derive2 { name="FKSUM"; version="1.0.1"; sha256="0ag8mzbjf2paslqspb18dk0ndqbp5rhmlmz9p2q2gxljfrdkzqkd"; depends=[MASS Matrix rARPACK Rcpp RcppArmadillo]; }; FLAME = derive2 { name="FLAME"; version="2.1.1"; sha256="013kxp6zjw8qzdq3750x109rhbmjn10q32wgxsh7ajiflwhj3f1i"; depends=[glmnet gmp]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; + FLOPART = derive2 { name="FLOPART"; version="2023.8.31"; sha256="1adidd9fsgibiia6wgdnv3xf5gwvk7awk28ahdlr053nzdwr767r"; depends=[data_table Rcpp]; }; FLORAL = derive2 { name="FLORAL"; version="0.2.0"; sha256="1a1jnvbfk2fyqs5jw3y04wxln4hxsahv4yiwrhdgdbk4az3yxp9p"; depends=[caret doParallel doRNG dplyr foreach ggplot2 glmnet mvtnorm Rcpp RcppArmadillo RcppProgress reshape survcomp survival]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="9.1.1"; sha256="0k7lglmwrhzmdfkn6inx362y7knmgxlzfbli2n5ssznbblix7kwa"; depends=[Rcpp RcppParallel]; }; - FLightR = derive2 { name="FLightR"; version="0.5.2"; sha256="0scbz1c3pm40v8h4h5qxckrpg2zixx29g9wwxiq06wlc7vajlh77"; depends=[bit CircStats circular fields ggmap ggplot2 ggsn maptools mgcv nlme RcppArmadillo rgdal rgeos sp truncnorm]; }; + FMAT = derive2 { name="FMAT"; version="2023.8"; sha256="04076118yvl7mrsjjpffwzrqk2vlq2c0s7v2chyz7fpf3qhgkqby"; depends=[cli data_table dplyr forcats glue plyr psych PsychWordVec purrr reticulate stringr text tidyr]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.2"; sha256="09lv6zk36qrrrjs0wkda5rr4pjm7q317gc5dr197w7ggsqibp4b6"; depends=[actuar EnvStats extraDistr fitdistrplus MASS quadprog]; }; FMC = derive2 { name="FMC"; version="1.0.1"; sha256="03g3v1nmidgjcb3nxs7gfk9s20c8vnk0hgijsnydvxi5bypw8s8p"; depends=[minimalRSD]; }; FMCCSD = derive2 { name="FMCCSD"; version="1.0"; sha256="0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; @@ -1673,23 +1671,23 @@ in with self; { FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; }; FNN = derive2 { name="FNN"; version="1.1.3.2"; sha256="11qfzqfnf38yrqxr5wyi69cfmnplzj1wrx3il03vp7lphwsa20fp"; depends=[]; }; FOCI = derive2 { name="FOCI"; version="0.1.3"; sha256="0iax5569a0v18j2l52mw26yimx11fqqbxj5q7jgba9jf7ylp410w"; depends=[data_table gmp proxy RANN]; }; - FORTLS = derive2 { name="FORTLS"; version="1.2.0"; sha256="0jrc4myifx9syddi03hrp9vfa7vl0lm68r11f043frd3nrnxi3fl"; depends=[data_table dbscan Distance htmlwidgets lidR moments plotly progress raster Rcpp RcppEigen RCSF rgeos scales sf sp tidyr VoxR vroom]; }; - FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; }; + FORTLS = derive2 { name="FORTLS"; version="1.3.0"; sha256="00qjp916zqjj9w42bmlb7s72dcyrimg16545p9f0rsmlyiy8qs6n"; depends=[circular data_table dbscan Distance htmlwidgets lidR moments plotly progress raster Rcpp RcppEigen RCSF scales sf tidyr VoxR vroom]; }; FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; }; FPDclustering = derive2 { name="FPDclustering"; version="2.2"; sha256="0h9yfiyf8xhvdyzjwgh9s8immnfx6yidz4irn8nyp14ifhq1ad61"; depends=[cluster ExPosition GGally ggplot2 klaR MASS mvtnorm rootSolve ThreeWay]; }; FPLdata = derive2 { name="FPLdata"; version="0.1.0"; sha256="0f5j6h4v0a9jk798m02mdq57v8rlkhrpgcrnj1rna34lrz83m51q"; depends=[dplyr readr]; }; FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; }; - FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; + FRACTION = derive2 { name="FRACTION"; version="1.1.1"; sha256="0j7mczw3jlmyls3lcsazybvhq87pp1c3imn4ks0bl08h1crdsdl6"; depends=[]; }; FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; }; FRCC = derive2 { name="FRCC"; version="1.1.0"; sha256="18i2lrx2qkwj8j1c3q2vx901hx1f68bnjyrzyhkfmnswyy358368"; depends=[calibrate CCP corpcor MASS]; }; FREEtree = derive2 { name="FREEtree"; version="0.1.0"; sha256="1i2liqbcg993snj5vq341mmafzhn1yrwljvx4f3kyzy0pa59k6rn"; depends=[glmertree MASS pre WGCNA]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; - FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.4.4"; sha256="0fr98nfzsdb38saancmibkqayfv4gzks2by78dvqxsadw481zf33"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; + FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.4.6"; sha256="17bx8r6a2d74y83zya347hag035ypdmphz710xwq2islgzlvlv9l"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FRESHD = derive2 { name="FRESHD"; version="1.0"; sha256="0lpggf59dd3kwp2y9p4acvhdmc6i47bwa5lk6d6cp8q0g7sr44rm"; depends=[glamlasso Rcpp RcppArmadillo RcppEigen]; }; FRI = derive2 { name="FRI"; version="1.0"; sha256="17ddbr0hndpr5627n67467787rq8hidi1jn1c3xf7f7qz800jjf5"; depends=[forcats ggplot2 neuralnet RSNNS]; }; - FRK = derive2 { name="FRK"; version="2.1.5"; sha256="1ykl3qkl8hf9pn4a3fb2axci62x90civcy1skxf1g4b0nzzcsnkn"; depends=[digest dplyr ggplot2 ggpubr Hmisc Matrix plyr Rcpp RcppEigen reshape2 scales sp spacetime sparseinv statmod TMB]; }; - FSA = derive2 { name="FSA"; version="0.9.4"; sha256="0m63pik6bcqsbzizq8zjzilr2pxjl8b64ivdqzdnz09gmck73r5h"; depends=[car dunn_test lmtest plotrix withr]; }; - FSAdata = derive2 { name="FSAdata"; version="0.4.0"; sha256="0wqviw5achsl9q7v8z8zzbnhq9gryfj793hi61js2z30m5dgjvm7"; depends=[]; }; + FRK = derive2 { name="FRK"; version="2.2.0"; sha256="1jwsmrc4hqask0bls4rd8bssgddpy17l615w6p19iiayd3xlir55"; depends=[digest dplyr ggplot2 ggpubr Hmisc Matrix plyr Rcpp RcppEigen reshape2 scales sp spacetime sparseinv statmod TMB]; }; + FSA = derive2 { name="FSA"; version="0.9.5"; sha256="0b9gf1sh7igd6i14cgl6j8ns2zqvpph3830n7b4q9vw4dfcb53g0"; depends=[car dunn_test lmtest plotrix withr]; }; + FSAdata = derive2 { name="FSAdata"; version="0.4.1"; sha256="0zh0gkylziysqjc9gn3kjz7070x2rvmi1c64kxl6q2479929hysi"; depends=[]; }; + FSAtools = derive2 { name="FSAtools"; version="2.0.5"; sha256="0i4grcr155vbsnw823jiwngyayzymka9k7zhsbw1f208q6xyrx4d"; depends=[]; }; FSDAM = derive2 { name="FSDAM"; version="2020.11-18"; sha256="09l7zvmbvmbcr5pxizdhs5fn79r6cl4ic0hsz2bazdymsqv3s3nm"; depends=[kyotil reticulate]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSK2R = derive2 { name="FSK2R"; version="0.1.3"; sha256="0hsrg49q42by4i3dywi59wwy5h56fnfdr10s6rk1y9dyliksmj43"; depends=[dplyr purrr R_utils readtext readxl rjson rlang shiny tibble tidyr XML xml2 zip]; }; @@ -1697,18 +1695,17 @@ in with self; { FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; FSSF = derive2 { name="FSSF"; version="0.1.1"; sha256="024g2rv64yqxmbbwrbkpkrzdfshl0n6jll6axsgsp4q4ia4r9401"; depends=[Rcpp RcppArmadillo]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; - FSelector = derive2 { name="FSelector"; version="0.33"; sha256="1lfra416pzpbipv9rm0qf7mq1zqr11hmas29q7qiwmzs5ihflmrx"; depends=[digest entropy randomForest RWeka]; }; + FSelector = derive2 { name="FSelector"; version="0.34"; sha256="07nvfykr6zls7ip5nz9j3062nlna2va3dyldck292v96rd56xl99"; depends=[digest entropy randomForest RWeka]; }; FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.11"; sha256="008zc270injmjhr2zqs0jw21f7vrmmclzjnin9xsx8drfk8bhdvn"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; FSinR = derive2 { name="FSinR"; version="2.0.5"; sha256="11ss38qpasbyym9hcfqmv254jvr8lzsw6r85dlm7xlnhfnxil59l"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; FWRGB = derive2 { name="FWRGB"; version="0.1.0"; sha256="0wi1vkb8mmw9f8hzgp8cm6hy9nbglz0x8mllngdamhlvm35gr57d"; depends=[e1071 imager neuralnet]; }; - FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; + FactoClass = derive2 { name="FactoClass"; version="1.2.8"; sha256="0w20nrhaky2lj9z2if59fppim5063962xv2yl76g28xqgc6rmymq"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.8"; sha256="1m2005yywdh9ir61sdh10ssp1y26d9xgx9rivvilbk9grc9qyjzg"; depends=[FactoMineR ggplot2 rmarkdown]; }; - FactoMineR = derive2 { name="FactoMineR"; version="2.8"; sha256="0lgqbw7534wadkdv7zh1y5nanl72jys070qydznmaj2cmvvqd460"; depends=[car cluster DT ellipse emmeans flashClust ggplot2 ggrepel lattice leaps MASS multcompView scatterplot3d]; }; + FactoMineR = derive2 { name="FactoMineR"; version="2.9"; sha256="0c2j3xid85qffsdjwndqiwihclzw6k1nkbpzcc7whhd6k79rh9l8"; depends=[car cluster DT ellipse emmeans flashClust ggplot2 ggrepel lattice leaps MASS multcompView scatterplot3d]; }; FactorAssumptions = derive2 { name="FactorAssumptions"; version="2.0.1"; sha256="0d7dh67r8s0v952palhx9h6bhhlxw9xcjbj7dxsp2hdhwap72s2y"; depends=[MASS psych]; }; FactorCopula = derive2 { name="FactorCopula"; version="0.9.3"; sha256="1lvqa62v9rvz7pmrx06riqndh4jyw60an04hpg6if523jsxpa5nz"; depends=[abind igraph matlab polycor statmod VineCopula]; }; - FactorsR = derive2 { name="FactorsR"; version="1.5"; sha256="1rla44g75hrqalrblr1yaawmyixmivlacn50marqgd9fjh8blgcd"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="2.4"; sha256="0szdpdghaqrfjdx3c9klgww8i09dh69500sls2lyjz6c8gi80vcx"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FairMclus = derive2 { name="FairMclus"; version="2.2.1"; sha256="0mhccn6yyf35qb856psh3dpiwdf24l3w2lqr643lkn38lhbmyvn8"; depends=[cluster data_table doParallel dplyr foreach irr magrittr rlist tidyr]; }; @@ -1721,29 +1718,30 @@ in with self; { FastCUB = derive2 { name="FastCUB"; version="0.0.2"; sha256="04bphkfkkjp7gfnsgar5gcxzmkr437mz6y8mbf015m7f4cvdhzjz"; depends=[CUB Formula]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastGaSP = derive2 { name="FastGaSP"; version="0.5.2"; sha256="1i54gxnc27fjgdbcrf2n1s5p6jgadcz2v4g0hq4xay0kfr593a7g"; depends=[Rcpp RcppEigen RobustGaSP]; }; - FastImputation = derive2 { name="FastImputation"; version="2.1"; sha256="1h6nvrb7d0l5vdqzxi20cgh6yw90mmjrzbnn1lrkwr3n9fzfqw0l"; depends=[Matrix]; }; - FastJM = derive2 { name="FastJM"; version="1.3.1"; sha256="1cg79j3lg34gwl6j3bjdnf9x5a17dg95zh80ff8zjc0s4pq3r3vz"; depends=[caret dplyr MASS nlme Rcpp RcppEigen statmod survival]; }; + FastImputation = derive2 { name="FastImputation"; version="2.2.1"; sha256="0jnhspgxas7kswpgw4hihc1y1286w5n8bikwzls7vsik5lj5yac4"; depends=[Matrix]; }; + FastJM = derive2 { name="FastJM"; version="1.4.0"; sha256="0k53hlwz00qp4242dy8wrk0xhq89dlrzh5a340aw2j134qrh42lk"; depends=[caret dplyr MASS nlme Rcpp RcppEigen statmod survival timeROC]; }; FastKM = derive2 { name="FastKM"; version="1.1"; sha256="0kkrfb98h843yh4n8mvz3y2sp9qkykpabg9w927jb8i230aiy1sq"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; FastPCS = derive2 { name="FastPCS"; version="0.1.3"; sha256="152fy5hq675n1mjdsi31a77rmi3vylvvbfgywrh62chy5xa1bf34"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive2 { name="FastRCS"; version="0.0.8"; sha256="11kqd8aii9sy65m5inxiqggyajb41iy6w92zp5wggx7pbg9m6lmy"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive2 { name="FastRWeb"; version="1.2-0"; sha256="13w09ic38vzdyyhcdd18as443nbhgbw4baydrlbl7nai0llsk9w9"; depends=[base64enc Cairo]; }; FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; }; + FastStepGraph = derive2 { name="FastStepGraph"; version="0.1.1"; sha256="0f05cyhdz1530vhwv6r76lpcj7lqq5xrvhmpjfv716v0c4j2i72s"; depends=[doParallel foreach MASS]; }; FatTailsR = derive2 { name="FatTailsR"; version="1.8-0"; sha256="10js4vbg9f4ql2panzwb5vxzzb8qb2hl6xyx7nhindhwncga8q33"; depends=[minpack_lm timeSeries]; }; FateID = derive2 { name="FateID"; version="0.2.2"; sha256="0sgvaqhqkmmkcsl53bm1jlfpzrvzfb5cz8k513nizfsi638vydlm"; depends=[locfit matrixStats pheatmap princurve randomForest RColorBrewer Rtsne som umap]; }; - FaultTree = derive2 { name="FaultTree"; version="1.0"; sha256="1xkpalsxc9flb7ksr5asg8sxmm52k6a1r7rsk8rbyphybgjlnh48"; depends=[Rcpp RcppArmadillo]; }; + FaultTree = derive2 { name="FaultTree"; version="1.0.1"; sha256="0abv34y7ms31inrkbc8ss8vnjxki9k49pa722n48irwqczxb328l"; depends=[Rcpp RcppArmadillo]; }; FeaLect = derive2 { name="FeaLect"; version="1.20"; sha256="1dfi0v313x4a4ck98zlk6yr3nfjrdwr5649x9dx3i7yfkypk2k5c"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.5"; sha256="1hfa2p78a7hhn5p0xhsha6pl2aisvkjd791j61s73w99vbysmmpl"; depends=[BH digest magrittr Matrix Rcpp]; }; FeatureImpCluster = derive2 { name="FeatureImpCluster"; version="0.1.5"; sha256="1ifxw6rd870g258fkyyy3mhghxm7486nvgnp3lh5ih2i1v34dgig"; depends=[data_table ggplot2]; }; FeatureTerminatoR = derive2 { name="FeatureTerminatoR"; version="1.0.0"; sha256="036ip8jm4d5ybyqmvrnjqp4hl8gsmd346737ghipnmmyaml9xfs5"; depends=[caret dplyr e1071 ggplot2 lattice randomForest tibble]; }; - FedData = derive2 { name="FedData"; version="3.0.4"; sha256="0qwfayp99nngwjl043y1snfsljnvm1vgdl6vd04hinr0gsrc330m"; depends=[curl data_table dplyr httr igraph jsonlite lifecycle lubridate magrittr progress purrr raster readr sf sp stringr terra tibble tidyr xml2]; }; + FedData = derive2 { name="FedData"; version="4.0.0"; sha256="15cvrph6020m6xinyvnyjmsppz59q911rk9rhlwy107fs54mdlnx"; depends=[curl dplyr httr igraph lifecycle lubridate magrittr progress purrr readr sf stringr terra tibble tidyr xml2]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.5"; sha256="120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2"; depends=[automap gstat mapdata maps proj4 sp]; }; FertBoot = derive2 { name="FertBoot"; version="0.5.0"; sha256="168xfxpb43brfnp6c6b4chhpzb9z0aiqa6fawc8m09an5ggh05jp"; depends=[nls_multstart simpleboot]; }; FertNet = derive2 { name="FertNet"; version="0.1.1"; sha256="1hhhsiva6nqqyjimmla2s4iv2lm3j20m55d7bwm8zr79lnj72nj9"; depends=[haven]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.9.5"; sha256="05n8lvx3cs1ckliaj7ni2rbfcrdl7d0pzf9bkwlyd1779h684cxz"; depends=[data_table devEMF ggplot2 gridExtra plyr png sqldf stringr]; }; FiRE = derive2 { name="FiRE"; version="1.0.1"; sha256="08xs4w7d3w4zrymq0sjpz34hmsd4lsd5989r660qdpg3ybpqx8lj"; depends=[BH Rcpp]; }; FiSh = derive2 { name="FiSh"; version="1.1"; sha256="1fcs2y3diszypv7sr4vl75wizcxv0na0pqflmlrizs2w7kyw51p6"; depends=[fda_usc KernSmooth]; }; - FielDHub = derive2 { name="FielDHub"; version="1.3.1"; sha256="1kmzrf73a72sc96y5pv51n02lj98qgxv31yfsj09ls2z4fsh536v"; depends=[blocksdesign config desplot dplyr DT ggplot2 golem htmltools magrittr numbers plotly shiny shinyalert shinycssloaders shinyjqui shinyjs shinythemes turner viridis]; }; + FielDHub = derive2 { name="FielDHub"; version="1.3.4"; sha256="08s9snwcvnhrhcqm4csl2pnsp3vxa5vmckmkjhhs4ima51d13f0y"; depends=[blocksdesign config desplot dplyr DT ggplot2 golem htmltools magrittr numbers plotly shiny shinyalert shinycssloaders shinyjqui shinyjs shinythemes turner viridis]; }; FieldSimR = derive2 { name="FieldSimR"; version="1.1.0"; sha256="10cnyig18gs97mmnl0bj1i5j2fdazynfr25c5cia9prcl01a9q0f"; depends=[ggplot2 interp lattice matrixcalc mbend]; }; FinAna = derive2 { name="FinAna"; version="0.1.2"; sha256="09svg5z52vv90ih85awgh6ns3pqi789qjm2wi1gb9hbg9v5g7pdv"; depends=[]; }; FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; @@ -1753,7 +1751,6 @@ in with self; { FinTS = derive2 { name="FinTS"; version="0.4-6"; sha256="1lj1lzyglfphgas17j9isd7ama05m3qr0mkfisyh2w1srgqxi32r"; depends=[zoo]; }; FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.3.1"; sha256="0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w"; depends=[quantmod TTR xts zoo]; }; FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; }; - FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; FindIt = derive2 { name="FindIt"; version="1.2.0"; sha256="0zrvkvj907fw86jnzzlwk4d90hi42nq45jprp16xryxb7xxii6i8"; depends=[arm glinternet glmnet igraph lars limSolve lmtest Matrix quadprog sandwich]; }; FinePop = derive2 { name="FinePop"; version="1.5.1"; sha256="184707yvh2mydx42vxrdgv0n4v2dad4an7c4yvlyb9d7z6h0sw2x"; depends=[]; }; FinePop2 = derive2 { name="FinePop2"; version="0.4"; sha256="1rzsbxbxynn0pl6dlkmsjxiph403ffwlb2brsi8cm4r22jjhcx4i"; depends=[]; }; @@ -1769,7 +1766,7 @@ in with self; { FlexDotPlot = derive2 { name="FlexDotPlot"; version="0.2.2"; sha256="0526cnbq4a34k96b99x8i1pcdn1a70fvc9lagq7yd7bsq6fv2gvs"; depends=[bsplus colourpicker dendextend DT FactoMineR ggdendro ggforce ggplot2 gridExtra grImport2 htmltools magrittr reshape2 scales shiny shinydashboard shinyWidgets sisal]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.2"; sha256="04xbglg9vli18fd24k1qyvbl7svp70k67ig3jiss96fgkgbi6w7c"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; }; - FlexReg = derive2 { name="FlexReg"; version="1.2"; sha256="17cpaap1h05ccksrp41bqarg6hmq50634v89dnsbxk24h7da2vik"; depends=[bayesplot BH faraway Formula ggplot2 loo Rcpp RcppEigen rstan rstantools StanHeaders]; }; + FlexReg = derive2 { name="FlexReg"; version="1.3.0"; sha256="15vl2wfvplydjgdgcb4gla02n6hx9lljnw20r5rvhw4ll6ahr110"; depends=[bayesplot BH Formula ggplot2 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; FlexScan = derive2 { name="FlexScan"; version="0.2.2"; sha256="1887r2nxpv89rizzj0j1p5shfmbyhchjzaszbxd7mlswqkqazb53"; depends=[smerc sp spatialreg spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.1"; sha256="17am293wrrigpdl891nmrqwvxjvb38whmls45syk6sm1msm1ph7l"; depends=[httr2 janitor magrittr rlang]; }; FloodFreqPlot = derive2 { name="FloodFreqPlot"; version="0.1.0"; sha256="19jg0i4fd7x401gwfkirp8mi3i4kzqxk0nla6wvfcsbmy5qsf15q"; depends=[]; }; @@ -1778,25 +1775,26 @@ in with self; { FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; }; FlyingR = derive2 { name="FlyingR"; version="0.2.2"; sha256="08jyp4hfb9pydicx4i6vgi94p6pykyi545w8svhar2fwmn1ik955"; depends=[kableExtra knitr Rcpp rmarkdown]; }; FoReco = derive2 { name="FoReco"; version="0.2.6"; sha256="07ivfjs836g3k13kfv188lxv300n43vczmkcapxnwiii643y1kw8"; depends=[cli corpcor mathjaxr Matrix osqp]; }; - ForIT = derive2 { name="ForIT"; version="2.0.1"; sha256="0rpnx1wa98gjdyb21k21i3p73xxb5wlsxd5rig0qygf4wnrwk828"; depends=[dplyr ggplot2 magrittr metR purrr RColorBrewer rlang tibble tidyr]; }; + ForIT = derive2 { name="ForIT"; version="2.4.0"; sha256="0kc15b05dp3cybjln49d0ly962s4gayidi0qpb6mcy0qdxvb17lv"; depends=[dplyr ggplot2 magrittr metR purrr RColorBrewer rlang tibble tidyr]; }; ForagingOrg = derive2 { name="ForagingOrg"; version="0.1.0"; sha256="0jsji653xwnmsa1j1h6da99f48kla9yk58z05za7bwk1qw9rbi70"; depends=[PairViz TSP]; }; ForeCA = derive2 { name="ForeCA"; version="0.2.7"; sha256="1falhz9v0z76h60gz66rh9wvk3jsjv8fvbkhkx9jmzbrkla397cd"; depends=[astsa MASS reshape2]; }; + ForeComp = derive2 { name="ForeComp"; version="0.9.0"; sha256="1d7hs563q0h6zx3ky3lj0acb25b2wi4g4c5vacrppf0lv8m16rqw"; depends=[astsa forecast ggplot2 rlang]; }; ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; }; ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; }; ForestFit = derive2 { name="ForestFit"; version="2.2.3"; sha256="0r8hr1hl5js7bc0wggxr7j0psydizlysfgqd5l55i8s79jx9bqhp"; depends=[ars pracma]; }; ForestGapR = derive2 { name="ForestGapR"; version="0.1.7"; sha256="0pj1rq2gqhigrv5v734hj0gmjb6qnipy9crd14qdvzbjhprg4i4z"; depends=[igraph poweRlaw raster sp spatstat_explore spatstat_geom VGAM viridis]; }; - ForestTools = derive2 { name="ForestTools"; version="1.0.0"; sha256="1az5rw91xakn4ja1lljizgdkfkbdps4zh2l00jp4i09gl9bkx50s"; depends=[imager Matrix plyr Rcpp sf terra]; }; + ForestTools = derive2 { name="ForestTools"; version="1.0.1"; sha256="0ghj411sg8054zxipjbbkhsbx7q98ji98p9wk0xzx8mzrdsi04qy"; depends=[imager Matrix plyr Rcpp sf terra]; }; FormShare = derive2 { name="FormShare"; version="1.0.1"; sha256="17wdqjymc33r7r17h3fwi0ixlbpl77k1fm9a6r3gjwxixz8kicx3"; depends=[httr jsonlite R6]; }; Formula = derive2 { name="Formula"; version="1.2-5"; sha256="0p1m9pqcn8ns0sn67js53677q8gwxgbl4bymcn5y2r0dc1s4c9c6"; depends=[]; }; - FossilSim = derive2 { name="FossilSim"; version="2.3.1"; sha256="110r1797cbzym2d96h8gchk47kaqf4h6xyma9v1g9jyxnq8zxyiw"; depends=[ape TreeSim]; }; + FossilSim = derive2 { name="FossilSim"; version="2.3.2"; sha256="0wirvjs6gvmgwxwixf1fld7xzq5hyyzfh3fhpglpah8hm744b6hf"; depends=[ape]; }; FossilSimShiny = derive2 { name="FossilSimShiny"; version="1.0.0"; sha256="0dvf0rszlj1bs0qyi2fy80709wq7qhk50fcgr79265p5w8sq4kfs"; depends=[FossilSim shiny]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; FourWayHMM = derive2 { name="FourWayHMM"; version="1.0.0"; sha256="0zi42d214dq70ypgj8g57fwjbqfih4z0956njpj2739aqsnjq5v4"; depends=[data_table doSNOW foreach LaplacesDemon mclust snow tensor tidyr withr]; }; FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; - FrF2 = derive2 { name="FrF2"; version="2.3-1"; sha256="1ny1vkx5ylkrd4sqmflbcxk0vzikqqppfv86as2y099xhsvjdsds"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; - FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-2"; sha256="0r5v3922gsrsyrdin5dwdygnj9i23gwa67p7kll6ac6xxp8gig4w"; depends=[FrF2]; }; + FrF2 = derive2 { name="FrF2"; version="2.3-3"; sha256="11ljgqxan5afsczihvwd14p4ygk8z7hif753ka5wxpla8wp92xxx"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; + FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-3"; sha256="0jlp3qfikzc01qzlqnwnp96iylhzk0a1fazk6lankplkvxnv0zpc"; depends=[FrF2]; }; FracKrigingR = derive2 { name="FracKrigingR"; version="1.0.0"; sha256="08ai69wnpa4l1gpmgrs9c9ad9h56h0x55v3gnbci30yxkivbnvxw"; depends=[clusterGeneration psych]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; @@ -1806,7 +1804,7 @@ in with self; { Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; }; FunCC = derive2 { name="FunCC"; version="1.0"; sha256="0n8fnrq3grsxxcz1841d3d643nyrwc7y15na1205zxq6rmdjx7wa"; depends=[biclust ggplot2 narray RColorBrewer reshape]; }; FunChisq = derive2 { name="FunChisq"; version="2.5.3"; sha256="091arn9d42zsa7ky21k77ak0qirz0x7nai72s54mi70nyjn173dk"; depends=[BH dqrng Rcpp Rdpack]; }; - FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.1"; sha256="16w5hna0dm89alkch9wf7n8mqqz75scwg0g84qf57bl6sihnp750"; depends=[gmp Rmpfr]; }; + FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.1.1"; sha256="1342n3gsrlk70njj45vxpk5sl467pxmsixkmvi4s9aim6d9my7pn"; depends=[gmp Rmpfr]; }; FuncDiv = derive2 { name="FuncDiv"; version="1.0.0"; sha256="19jfxy9mhhsfr2mf3l9d125swy20qcyxfqd2fk9m6cly9ajzggza"; depends=[ape collapse data_table parallelDist Rcpp RcppArmadillo RcppParallel RcppXPtrUtils]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; FuncNN = derive2 { name="FuncNN"; version="1.0"; sha256="0kcr7c54igzi0imp8w9a0mnrqaa2qcls9777scsjz5sbcxdy3if3"; depends=[caret doParallel fda fda_usc flux foreach ggplot2 ggpubr keras Matrix pbapply reshape2 tensorflow]; }; @@ -1815,16 +1813,16 @@ in with self; { FusionLearn = derive2 { name="FusionLearn"; version="0.2.1"; sha256="070prpxz1y5lzi4hjxbv4h3p4hskrm51d7p3yhhg71p8rw1mcla1"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; }; - FuzzyClass = derive2 { name="FuzzyClass"; version="0.1.4"; sha256="02lk84z8x1qkbpbggb13sxmy0dvv9qx5sxqr44bcgd78yf0yg0h8"; depends=[caTools doParallel dplyr e1071 EnvStats foreach MASS purrr Rdpack rootSolve]; }; + FuzzyClass = derive2 { name="FuzzyClass"; version="0.1.5"; sha256="02jnvzjp6aid6vznb4z2xlh6yn8qk1y9igsbvxyy09q7rvjq18db"; depends=[caTools doParallel e1071 EnvStats foreach MASS mvtnorm purrr Rdpack rootSolve]; }; FuzzyDBScan = derive2 { name="FuzzyDBScan"; version="0.0.3"; sha256="1a974s5j03caifcypk1c7la96754gh6n20xak7qaf9hrbm5i7vr9"; depends=[checkmate data_table dbscan ggplot2 R6]; }; - FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-6"; sha256="0k1cqyswhzp31dq91xigirkqhw3imkx68n4vasyvrgq6fm97dl1n"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; + FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-7"; sha256="1x584h5a82npxk1jhz0mnn8zkyfd8qvvvhkrv3bfi81w2l893hi7"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; FuzzyM = derive2 { name="FuzzyM"; version="0.1.0"; sha256="12arx4flgykdkynnj341pgpd85k7xh6491bv9v9da63w6rp0kdm6"; depends=[]; }; - FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; }; FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-7"; sha256="12xficdsln31rzfziycw6z0912cgrq6mkvz3f1nbli9lzqrypxzl"; depends=[]; }; FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="3.2"; sha256="0gldq0bg1p1vmrn35prha44d7lyymz0jzshdyp2c5rx433mny7h5"; depends=[FuzzyNumbers]; }; + FuzzyPovertyR = derive2 { name="FuzzyPovertyR"; version="1.0.0"; sha256="1fhgvjy83806l74bn2i8d1lslgbb38phhjfql65s98jbbckh98qp"; depends=[dplyr ecp reshape2]; }; FuzzyQ = derive2 { name="FuzzyQ"; version="0.1.0"; sha256="1camdw7rnzf02nqjlmkr7mqpc38dafq9nw8x7pzwi1lh5xwv5dia"; depends=[cluster]; }; FuzzyR = derive2 { name="FuzzyR"; version="2.3.2"; sha256="0d0zf8diw7m10zfx0r5zg5arhf4a90sva77h6rvfywixldwrnk7s"; depends=[plyr shiny]; }; - FuzzyResampling = derive2 { name="FuzzyResampling"; version="0.6.1"; sha256="1jsbnyd3449ms3vzqmd82xaznyzvvmxj5k665ph6sb8k05dcbr6c"; depends=[]; }; + FuzzyResampling = derive2 { name="FuzzyResampling"; version="0.6.2"; sha256="0kx3axm46i0jgv2x09qpggaayy5027yya16g8x1jfgrn9ya62357"; depends=[]; }; FuzzySTs = derive2 { name="FuzzySTs"; version="0.2"; sha256="0zs1pyn9apysspxa0glqc96h6npmvvhiqvqpcm0brslz0b6xnilp"; depends=[FuzzyNumbers polynom]; }; FuzzySimRes = derive2 { name="FuzzySimRes"; version="0.3.0"; sha256="0cwx5zfbbji5jy2hrrj5k6m0p8nr8ljficj5fjrzhjd9cj2smqwy"; depends=[FuzzyNumbers palasso]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.4"; sha256="1jpqb8xczi1d4g306vrwpi02f9h59aki1pgnckvfmiclr306prpb"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; @@ -1832,11 +1830,12 @@ in with self; { FuzzyStatTraEOO = derive2 { name="FuzzyStatTraEOO"; version="1.0"; sha256="0jxjnmsznab0nf6nrjvdcy2gjmzn7fa0va993f7ylasr2pjawgsd"; depends=[R6]; }; G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; }; GA = derive2 { name="GA"; version="3.2.3"; sha256="0q0br75zklnp0g3j98x6lll5fhyayxqzaqs3hc2z39s2imwi2fpb"; depends=[cli crayon foreach iterators Rcpp RcppArmadillo]; }; - GABB = derive2 { name="GABB"; version="0.3.2"; sha256="1451wpq1xhghwrnycr8fwq4r8vp9dj5gqwmmcjn2r7k6iakw1qr4"; depends=[dplyr egg ggforce ggplot2 ggplotify ggpubr ggrepel Hotelling pheatmap RVAideMemoire tidyr vegan]; }; + GABB = derive2 { name="GABB"; version="0.3.3"; sha256="18mxfkm2g76r3gp6l2mb6nlkzlr779ql5s14n0iid93226xvwhxp"; depends=[dplyr egg ggforce ggplot2 ggplotify ggpubr ggrepel Hotelling pheatmap RVAideMemoire tidyr vegan]; }; GACFF = derive2 { name="GACFF"; version="1.0"; sha256="0lhjzb6cj8838dh4423929z7bwpa6cv3dn84rccwi3382vsq9g2c"; depends=[]; }; GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; GAGAs = derive2 { name="GAGAs"; version="0.6.1"; sha256="15sc075p0087k6jpai7ll6h7vh9z3ak35a55aq109vliwlwhzynj"; depends=[Rcpp RcppEigen survival]; }; + GAGBLUP = derive2 { name="GAGBLUP"; version="1.0"; sha256="192r4fr3idl78g9vllb7hdvlrfkghh1airblb94c1mjyrjkj2hxa"; depends=[doParallel foreach GA]; }; GAIPE = derive2 { name="GAIPE"; version="1.1"; sha256="035x5x8ig85q51bf4qgj5n5qq6clwjp4xk5bf35gswn7qxd13yls"; depends=[]; }; GALLO = derive2 { name="GALLO"; version="1.3"; sha256="0nfzm5cm93m3x0vqmjvhxznj5i913ssn9awpfvk932j829kz6zbc"; depends=[circlize data_table doParallel dplyr DT foreach ggplot2 lattice RColorBrewer rtracklayer stringr unbalhaar webshot]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; @@ -1852,19 +1851,21 @@ in with self; { GB2group = derive2 { name="GB2group"; version="0.3.0"; sha256="1dbyc7izyggfrsq2gj7rwff5qjyy6bx6ip09xvbj73xqczv8fkcd"; depends=[GB2 ineq minpack_lm numDeriv]; }; GB5mcPred = derive2 { name="GB5mcPred"; version="0.1.0"; sha256="009ijrc0f04n74bxyrqnw553rf299m2gxbqrpkf3hrd78yfd3idy"; depends=[Biostrings caret devtools doParallel e1071 entropy foreach ftrCOOL gbm iterators party randomForest seqinr splitstackshape stringr tibble tidyverse]; }; GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; }; + GCCfactor = derive2 { name="GCCfactor"; version="1.0"; sha256="0ymqzkh1iaiib2lqqx54rckzia56kxphnb1bzbdim5d3m2hhi80y"; depends=[sandwich stringr]; }; GCD = derive2 { name="GCD"; version="4.0.7"; sha256="1259z76hajapzzq75fas2sq19r0wapn1ybghdaqdc6dksifdz6fv"; depends=[raster]; }; GCPBayes = derive2 { name="GCPBayes"; version="4.0.0"; sha256="1ab0vp948dyj9b6yh5gixlqim2xklhy6gsbgi641knzc30paiwj4"; depends=[gdata invgamma MASS mvtnorm postpack truncnorm wiqid]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCSM = derive2 { name="GCSM"; version="0.1.1"; sha256="0apz1wh6nfpg2gyx12xnbdb3hjyrrpwlcrh5khn6cxhxm06q9l95"; depends=[Rcpp RcppArmadillo]; }; GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; }; GCalignR = derive2 { name="GCalignR"; version="1.0.5"; sha256="1p1x61fwn7xpwirhrdj9zpyh2jpcsmwdgk3pp1qdl1j9p77nqd1a"; depends=[ggplot2 pbapply readr reshape2 stringr tibble]; }; - GD = derive2 { name="GD"; version="1.10"; sha256="1sy77yxnwh2n48zahh498v30nl3hivrsmyp0jf3gyyzhxm8z1n5l"; depends=[badger]; }; + GD = derive2 { name="GD"; version="10.3"; sha256="1qgkwqszc90b5aygqh28gfasqbsxy08inj9vm9b2id9z1rg69p8m"; depends=[BAMMtools]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; - GDAtools = derive2 { name="GDAtools"; version="2.0"; sha256="0d7gvfgcips4m37j29djjv05zcw75smgiy4dpy8nlvajq6lk24s0"; depends=[descriptio FactoMineR ggplot2 ggrepel rlang]; }; + GDAtools = derive2 { name="GDAtools"; version="2.0.1"; sha256="0xl7i9ajl77kg0v427h1bba0h4vmincvkg4g05jlv9s18zr1ksni"; depends=[descriptio FactoMineR ggplot2 ggrepel rlang]; }; + GDELTtools = derive2 { name="GDELTtools"; version="1.7"; sha256="0v368chcgqnrfy2isy8z7gl0xizafhxlcd29gr89iblhrzwmssid"; depends=[datetimeutils dplyr plyr stringr]; }; GDINA = derive2 { name="GDINA"; version="2.9.4"; sha256="10bbwr4q6cp36dnwhddviqg7f00h92gdmvblw0lxn72v4869vhn1"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; GDPuc = derive2 { name="GDPuc"; version="0.11.1"; sha256="1y91iivbfwrnjy9wg6dm9v0hd23fgqmry60sw2a2f5n0hflbgafc"; depends=[cli crayon dplyr glue lifecycle magrittr rlang tibble tidyr tidyselect withr]; }; GDSARM = derive2 { name="GDSARM"; version="0.1.1"; sha256="0id3z450prnrd6rdcv4xaizmjkdhjv8vdbpbnpniaml66kqsadvh"; depends=[lpSolve]; }; - GE = derive2 { name="GE"; version="0.3.8"; sha256="0lix8sf2lzgi3lzcgb22xb2ycnc480r494niq9a5am79q3gr0g3s"; depends=[CGE data_tree DiagrammeR]; }; + GE = derive2 { name="GE"; version="0.3.9"; sha256="1wq7za5wi39qsd5x1986myasf4pz3a5mh0fkzbpbklmcsahadrm5"; depends=[CGE data_tree DiagrammeR]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.4"; sha256="1x0r2qcyd9hrhkws5zi0pjdc40w8wal3jpvvajj3cr8c1r8dpfzz"; depends=[gee]; }; GEInfo = derive2 { name="GEInfo"; version="1.0"; sha256="08ha9w3c64x9ib2fbh4djbhg7y6lykibx93mbm7i3gdvpajqk0jx"; depends=[dplyr glmnet MASS pheatmap rvest]; }; @@ -1874,36 +1875,36 @@ in with self; { GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; GENLIB = derive2 { name="GENLIB"; version="1.1.9"; sha256="16xh46150gy6kcyr5v5i3hhghdm0dqjl4hql708yiyra6qj37l7f"; depends=[BH bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.2.0"; sha256="11wlcnj919jws62ngf29gr2p0shdlm917hkz5iwfss1m8gcbfjnl"; depends=[magic MASS Matrix pracma]; }; - GEOmap = derive2 { name="GEOmap"; version="2.5-0"; sha256="14qhvgh7jcrfknhihsnsvz6b7dz796v659ksqqmn6c3kva761rc2"; depends=[fields MBA RPMG splancs]; }; + GEOmap = derive2 { name="GEOmap"; version="2.5-5"; sha256="0gs8zd8rcdxgz0pm3nlynf4qy8axfsv7syagb22zi8yd4s4sf5wa"; depends=[fields MBA RPMG sf]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; - GET = derive2 { name="GET"; version="0.4"; sha256="0fvssxwwcdaqa6hir7z4cp4yabrc1afzyc3ib4nqdv6mpkhmzdxq"; depends=[cluster ggplot2 gridExtra viridisLite]; }; + GET = derive2 { name="GET"; version="0.5"; sha256="0x9cwn0qi79l1z4mk555gjds4f29i5w2garpah39y06dlvqcidfq"; depends=[cluster ggplot2 gridExtra viridisLite]; }; GETdesigns = derive2 { name="GETdesigns"; version="1.1.0"; sha256="1rc8vcpfv240qmg3xgqx1rlygw7l3hjkh1napj3pc9j6ffpyyk2a"; depends=[]; }; GEVACO = derive2 { name="GEVACO"; version="1.0.1"; sha256="0zkan4w96g3qc1hgla90mh32b55bk58gax095p4nxrfi46f8w3rf"; depends=[nlme RLRsim]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; - GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; + GFA = derive2 { name="GFA"; version="1.0.5"; sha256="1ldpa12awb5d8mn25wn34nclqc4fyq690siq0wdq4c8fzgpv2xad"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.3.3"; sha256="1d40fwk367ww544z25jwlx2kdm1gv7y6ijl8vnpi198n7k1hdgpl"; depends=[magic MASS Matrix plotrix plyr shiny shinyjs shinythemes shinyWidgets tippy]; }; GFDmcv = derive2 { name="GFDmcv"; version="0.1.0"; sha256="094b41sx3czz9sjqhvxggkmrdcwfwv8ww9k4286vzd055jbvk5hh"; depends=[doParallel foreach HSAUR MASS Matrix mvtnorm Rcpp RcppArmadillo stringr]; }; GFDsurv = derive2 { name="GFDsurv"; version="0.1.1"; sha256="0qq66f8ddw92m9k9raid89rggla9691xi2sn1w3r7lmwqf6ajsl4"; depends=[gridExtra magic MASS plyr shiny shinyjs shinythemes survival survminer tippy]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; - GFM = derive2 { name="GFM"; version="1.2.0"; sha256="1h0fvpmrvarw7k252n8i2cnd5fl0d8gwm4x25pa6103q766yzyyy"; depends=[doSNOW irlba MASS Rcpp RcppArmadillo]; }; + GFM = derive2 { name="GFM"; version="1.2.1"; sha256="13v8gsn1zsxcji52n3mv1bik5xjqzg8n01rak1bvffm9qwakg571"; depends=[doSNOW irlba MASS Rcpp RcppArmadillo]; }; GFisher = derive2 { name="GFisher"; version="0.2.0"; sha256="0ilvl8y118iicq5anzcsm94yz3bq890mb627dxi6z61cqazjbbai"; depends=[Matrix mvtnorm]; }; GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.3"; sha256="0h7irlmq283bx1hlqyv8bi228kd6xkc7sdw6nq18v3s7b0a9bhcm"; depends=[ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="2.9-0"; sha256="0bsxwcj7y4nlpw24qh85i8y4m4d7xdyl7qpks4lwz0zbdhv6pwfg"; depends=[data_table doParallel foreach ineq signal tuneR unisensR zoo]; }; - GGIRread = derive2 { name="GGIRread"; version="0.3.0"; sha256="07r8syc3m117jcxbn4iw5lzwzq9svld8gdph9kr255vh96q4bvi0"; depends=[bitops matlab Rcpp tuneR]; }; + GGIR = derive2 { name="GGIR"; version="3.0-0"; sha256="1c9qkl6sppans204xl4kxr01qzm95kg229h88xa8mwixxicy8wkw"; depends=[data_table doParallel foreach ineq signal unisensR zoo]; }; + GGIRread = derive2 { name="GGIRread"; version="0.3.1"; sha256="1basg24y3p08q6crk67q43pzpsbjmg627knn1sma0y1g17ksn4ga"; depends=[bitops matlab Rcpp]; }; GGMncv = derive2 { name="GGMncv"; version="2.1.1"; sha256="0lih9dyb5aqrawhiy2vhv63b132hhzq6zq0x6rbrhy8kbkldhigr"; depends=[GGally ggplot2 glassoFast MASS mathjaxr network numDeriv pbapply Rcpp RcppArmadillo Rdpack reshape sna]; }; GGMnonreg = derive2 { name="GGMnonreg"; version="1.0.0"; sha256="1bhqk172ddc7xq1hqj1i6q8np6jvmf2xypvd8kp3w1bcsafsbms8"; depends=[bestglm corpcor doParallel foreach GGally GGMncv ggplot2 MASS Matrix network poibin psych Rdpack sna]; }; - GGMridge = derive2 { name="GGMridge"; version="1.2"; sha256="1bv6k9krkb6mx6p4kx24cgyix1jnpk0257a59i59h7chij9y7nf7"; depends=[MASS mvtnorm]; }; - GGMselect = derive2 { name="GGMselect"; version="0.1-12.6"; sha256="1xdkpiwl80aq51f2010qq14h72p42agjklbiwrad8s43769yw34n"; depends=[gtools lars mvtnorm]; }; - GGRidge = derive2 { name="GGRidge"; version="0.1.0"; sha256="1q5lgnzbhczfylkj2p07r2a088i0d2xgmggilwlg6b0gc9qg7xf8"; depends=[CVglasso graph gRbase MASS]; }; - GGUM = derive2 { name="GGUM"; version="0.4-3"; sha256="1r4ijkc5xrlp2sq4jnhcrzzmkzilc4lbz3q5zc0kgcz348hf1a7w"; depends=[abind psych Rdpack viridis xlsx]; }; + GGMridge = derive2 { name="GGMridge"; version="1.3"; sha256="0aaah07n4nq2acvwikgwdqymchf7b1l9nkifwl7wxnr88pazcb4y"; depends=[MASS mvtnorm]; }; + GGMselect = derive2 { name="GGMselect"; version="0.1-12.7"; sha256="1l90viinjfbjwl7229aqbzv72d0jgjbcidv0ll770qsd1hc1p70r"; depends=[gtools lars mvtnorm]; }; + GGRidge = derive2 { name="GGRidge"; version="1.1.0"; sha256="08gj61ahk7ilvsz93xcdv7yknkmfz2spbym6c2c62gq8cva9zg86"; depends=[CVglasso gRbase MASS]; }; + GGUM = derive2 { name="GGUM"; version="0.5"; sha256="1xbbapam5whnsa0f2fpvj2v56c7g5wm4jcs0xwzrcjlp9g293vqj"; depends=[abind psych Rdpack viridis xlsx]; }; GGally = derive2 { name="GGally"; version="2.1.2"; sha256="1r98zgh2grn8330cf26r1c20gl131zm778szvn5wj6q6pwv2yd9h"; depends=[dplyr forcats ggplot2 gtable lifecycle plyr progress RColorBrewer reshape rlang scales tidyr]; }; - GGoutlieR = derive2 { name="GGoutlieR"; version="1.0.0"; sha256="19n0mn8lz5xzz4dg2cqhxq59wk9691hz7ar0n9mbbqxjzfws3hv6"; depends=[dichromat doParallel FastKNN foreach geosphere iterators mapplots plotrix RColorBrewer rworldmap rworldxtra scales sp]; }; + GGoutlieR = derive2 { name="GGoutlieR"; version="1.0.2"; sha256="18ass4fxdsvcn9j103dixar0grrh5w3nh6icydh1w5myrd455z9l"; depends=[cowplot doParallel FastKNN foreach ggforce ggplot2 RColorBrewer rlang rnaturalearth scales sf tidyr]; }; GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; }; GHap = derive2 { name="GHap"; version="3.0.0"; sha256="1fyxgnn6b474rx8cqg9lgdybq5j4nriq2axwgmhx7m8f7mysrqny"; depends=[class data_table e1071 Matrix pedigreemm sparseinv stringi]; }; GIC = derive2 { name="GIC"; version="1.0.0"; sha256="0wjrv5rpzcyng0vvpr59l148lxzqnqq4c045fw2x9ynffyb71h99"; depends=[cluster ggplot2 randomForest]; }; - GIFT = derive2 { name="GIFT"; version="1.1.0"; sha256="14wyls1npj34nbba048whmxmad4zxqd106p5pkv07cd4iwzdwc9g"; depends=[ape curl dplyr httr2 jsonlite phytools purrr sf tidyr]; }; + GIFT = derive2 { name="GIFT"; version="1.2.0"; sha256="1279pqfkxsmaqhsfkm0hmi5f408iapmckaa47616x28h58pc6rbh"; depends=[ape curl dplyr httr2 jsonlite phytools purrr sf tidyr]; }; GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.8"; sha256="09n0nhsv3v61asfzghzxa9sr3ryl25mlvj73gk9ql9wlrynd3wrl"; depends=[]; }; GISSB = derive2 { name="GISSB"; version="1.1"; sha256="0clhch4xvklrmk7h6b7vz83zzlj5r1lzrszy73agmpdbs5cax5sy"; depends=[cppRouting dplyr here httr igraph leaflet magrittr nabor purrr RCurl reshape2 rlang sf stringr tibble tidygraph tidyselect]; }; @@ -1912,12 +1913,12 @@ in with self; { GJRM = derive2 { name="GJRM"; version="0.2-6.4"; sha256="0mzcisxw6487ckpw0ac538dcs6dhjw74n8aki6w6zp699jn4jnin"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust VGAM VineCopula]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; GLCMTextures = derive2 { name="GLCMTextures"; version="0.3.8"; sha256="1qh0djskfc6407527kdxzi0yfrnqn4kjf8723gp92kq1kaqjishj"; depends=[raster Rcpp RcppArmadillo terra]; }; - GLDEX = derive2 { name="GLDEX"; version="2.0.0.9.2"; sha256="0pikq5aywky77sbbkga7s0ww3ywlarx336rgpyiigr72fmjvb289"; depends=[cluster spacefillr]; }; + GLDEX = derive2 { name="GLDEX"; version="2.0.0.9.3"; sha256="0xv9w4kmivmmcnn19a6s6d1ilhi1misdgrp07ks7rbd177zjy5vs"; depends=[cluster spacefillr]; }; GLDreg = derive2 { name="GLDreg"; version="1.1.0"; sha256="1ls9jfk3vp5r1d90vzkni0fcxlkn70i2pszw1pxnscxxhz112dq0"; depends=[ddst GLDEX]; }; GLIDE = derive2 { name="GLIDE"; version="1.0.5"; sha256="01164gh0j4g0hambiq92bxrd3j3z2psg19faj32mvhmn4c3k2m8i"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.5.0"; sha256="072zwi1rs6d84iszn09v5g19bkpla19nfqk4pq40ad8368zkbhcm"; depends=[lattice lme4 RColorBrewer]; }; - GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.9-0"; sha256="0hsh4zn0q55vqp9s5hr9rwkil7x22x4vmy3fiaddxgxngrahqfr3"; depends=[MASS matrixStats nlme]; }; - GLMMselect = derive2 { name="GLMMselect"; version="1.0.0"; sha256="0ad5swpmh05v8mnj942m4wz32gj5k0vrd43shhxm90mlh0ff2zyl"; depends=[]; }; + GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.9-1"; sha256="1gzm61a7qy4mvw1zaa4n01a5si7vawq2w0ppwk6pfsd06ffh5g2r"; depends=[MASS matrixStats nlme]; }; + GLMMselect = derive2 { name="GLMMselect"; version="1.2.0"; sha256="19yvfnmiw98fyixw8nms158y4bwhzzf0bfsi0dcxg651rv4vrvla"; depends=[]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; GLMcat = derive2 { name="GLMcat"; version="0.2.5"; sha256="1ycz0k25ninsvl5c4ql8s1y2jp8x1jdl58kph49rzisdzz4ma725"; depends=[BH ordinal Rcpp RcppEigen stringr]; }; GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; }; @@ -1929,8 +1930,8 @@ in with self; { GMDH2 = derive2 { name="GMDH2"; version="1.8"; sha256="1cqpwnncxir9gc6vwzclm0av9hzd2a74xvl3w73dpzafvzkg4x67"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; GMDHreg = derive2 { name="GMDHreg"; version="0.2.2"; sha256="1q583l0nsd4x1zm4fhh1q3kw3rh1v1vlaczkc59kzfs1h0l83hp2"; depends=[]; }; GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.1.5"; sha256="1c7zb83p4r46h42xsjaj3c8zrnhrrhvggz4nqmasp52fh6gdarz6"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - GMMAT = derive2 { name="GMMAT"; version="1.4.0"; sha256="0gb6h5qkx708l3dnmvnsl6nbdqi6szimr5227yhi7ysahy71fv1r"; depends=[CompQuadForm data_table foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; - GMMBoost = derive2 { name="GMMBoost"; version="1.1.3"; sha256="0p9jnwjc8g83qsxkjz9lhaip1hkpdg6n4fdpz34b96vb7qhzrrqc"; depends=[magic minqa]; }; + GMMAT = derive2 { name="GMMAT"; version="1.4.1"; sha256="0zyxnch7k4c5vm1wk769lxaqa2sdgj4lrsimzwi94bpmdrvpda44"; depends=[CompQuadForm data_table foreach Matrix Rcpp RcppArmadillo]; }; + GMMBoost = derive2 { name="GMMBoost"; version="1.1.5"; sha256="0ysy5av49fmswhn66b67lvbvzb5k6x6i9y0h9yrkkllssrghd7dr"; depends=[magic minqa]; }; GMPro = derive2 { name="GMPro"; version="0.1.0"; sha256="0xhja221wz89cm76qbq01nqz73jx7d2zx9i2ky5vd31zkspmlqkm"; depends=[combinat igraph transport]; }; GMSE = derive2 { name="GMSE"; version="1.0.0.2"; sha256="08564m2j6xlrh658syczxcl0149g54wkqc6irgsafqxvl3fdjs52"; depends=[shiny shinycssloaders shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; @@ -1944,21 +1945,21 @@ in with self; { GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; GOxploreR = derive2 { name="GOxploreR"; version="1.2.6"; sha256="1s2f0ns09vvk6q7fd9fgdw7mcr7qib8mvia1xp9dw4rnq0i6ca1k"; depends=[annotate biomaRt dplyr ggplot2 ggraph GO_db gontr igraph network]; }; GPArotateDF = derive2 { name="GPArotateDF"; version="2022.12-1"; sha256="0j1hi761grjsv6bgvgjigbysk565f3kf8ynf93q7wsx1m38wv4pk"; depends=[GPArotation]; }; - GPArotation = derive2 { name="GPArotation"; version="2023.3-1"; sha256="09iar73z0jnrikmscj2xanx0jnppipjziw41k9y6na257mn0hj47"; depends=[]; }; + GPArotation = derive2 { name="GPArotation"; version="2023.8-1"; sha256="1syg3snv95dv3pas5y5kqsm2hrmg1pdzgmy1m8nx9qkpwiwx8ig4"; depends=[]; }; GPBayes = derive2 { name="GPBayes"; version="0.1.0-5.1"; sha256="1yi1xc27kdylw23nc84phnmyzhlxca20pcjvlwxykpmkag81qygw"; depends=[Rcpp RcppEigen RcppProgress]; }; GPCERF = derive2 { name="GPCERF"; version="0.2.1"; sha256="1hf07jgw9nhv0i2dwi05h8bman3kgzyhpaq2k7dans65vxspc64h"; depends=[cowplot ggplot2 logger MASS Rcpp RcppArmadillo Rfast rlang spatstat_geom SuperLearner wCorr xgboost]; }; GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-6"; sha256="1vhlpsv86z4vz441n3jaincqizhvslc1c9zd3gah4swmqphlpdqz"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; }; - GPFDA = derive2 { name="GPFDA"; version="3.1.2"; sha256="18dcban1j554d1034rgrsb2m26a7lw09sb3yhym4a9wb5nr80jp0"; depends=[fda fda_usc fields interp mgcv Rcpp RcppArmadillo]; }; + GPFDA = derive2 { name="GPFDA"; version="3.1.3"; sha256="0s5jq2vmz02yr1wd79s6h5c8rvpbkdlnhdy5yfckk5nxddabcymb"; depends=[fda fda_usc fields interp mgcv Rcpp RcppArmadillo]; }; GPGame = derive2 { name="GPGame"; version="1.2.0"; sha256="1xxilr1ify9ip3vs000jawxplcbf1vqli40frhnwwjqf01kj8jq5"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS matrixStats mnormt mvtnorm Rcpp]; }; GPIC = derive2 { name="GPIC"; version="0.1.0"; sha256="1v44hkzf3wh09j5pcfmsc8h5jzmqa501bwkmdwwjb7pz64976r23"; depends=[]; }; GPL2025 = derive2 { name="GPL2025"; version="1.0.1"; sha256="0af42g3v91fbcmla2yq98v8rd4ifaznb1xvw7ny41r3843d8appc"; depends=[dplyr]; }; - GPLTR = derive2 { name="GPLTR"; version="1.3"; sha256="0kih4iqmcsw26y442rvpydqiyvhsgfqb7l1nlllk8hbfv6lwsbzp"; depends=[rpart]; }; + GPLTR = derive2 { name="GPLTR"; version="1.4"; sha256="0g8h94fc9c8w86z302f5ld6j3rzh6is7z5rjxr1v4arblpibxzr3"; depends=[rpart]; }; GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; GPP = derive2 { name="GPP"; version="0.1"; sha256="1qryza8mamwzwqiy31drf176w192ksw34kpsa0wc8gsp3ylkm2f9"; depends=[rstan]; }; GPRMortality = derive2 { name="GPRMortality"; version="0.1.0"; sha256="0k5pfyl7r5vsac927aqx19lz93vyk5l3ydqkazn2hwwaw1lh2wav"; depends=[rstan]; }; GPSCDF = derive2 { name="GPSCDF"; version="0.1.1"; sha256="1l50a6p81lykiqlqiwb6kix5s6wzwdi8vddqhl418dlwlsh83ybf"; depends=[dplyr MASS nbpMatching nnet survival]; }; - GPSeqClus = derive2 { name="GPSeqClus"; version="1.3.0"; sha256="0nkhpa3wldyimhzzsfhqrwkj62rr5xfb88zcjhg1dvg5fbvinigd"; depends=[geosphere htmlwidgets leaflet leaflet_extras plotKML plyr purrr rgdal sp spacetime suncalc]; }; - GPUmatrix = derive2 { name="GPUmatrix"; version="0.1.0"; sha256="1zl8rbb50dlsnyym11p6k2l2ybq9lz6kbzb5b0bjsbcvigcvckwp"; depends=[]; }; + GPSeqClus = derive2 { name="GPSeqClus"; version="1.4.0"; sha256="0bs6swzj2zh2dgyiwxirimz5gdk7vfssb7ga0cqmr9s5ckvgh8ir"; depends=[geosphere htmlwidgets leaflet leaflet_extras plyr purrr sf sp suncalc]; }; + GPUmatrix = derive2 { name="GPUmatrix"; version="0.1.1"; sha256="1yhz6gsqjgzy7gcshpb8mx8fxjn4pfwph08bkks7k7aw77byf01m"; depends=[]; }; GPareto = derive2 { name="GPareto"; version="1.1.7"; sha256="05hb6x3hh7h3dy9750gryk3f169b2shhl93gkb370g7h9y87vmi1"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; GPfit = derive2 { name="GPfit"; version="1.0-8"; sha256="05mpiyi2vxv0wqp422n1mnxa8msc4daq40cwpnpngbcwqhlgqkby"; depends=[lattice lhs]; }; GPoM = derive2 { name="GPoM"; version="1.4"; sha256="01j9v4a8ahfddd2mibqs44wjv5q7vm1rsa3nbswfm8x0vg7qv70c"; depends=[deSolve float rgl]; }; @@ -1967,7 +1968,7 @@ in with self; { GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; GRCRegression = derive2 { name="GRCRegression"; version="1.0"; sha256="05ll1ncxqnkyp5231xlpkmzd07m2rnmcdzcc68mq1gqfcahakdl1"; depends=[MASS pracma]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; - GREENeR = derive2 { name="GREENeR"; version="0.1.2"; sha256="1clrpzic95hyyf1xknyhpf9ls92zd9sf5ykylhbq7lmjc709kk61"; depends=[classInt data_table dplyr FME ggplot2 gridExtra hydroGOF magrittr networkD3 parallelly reshape2 sf tidyselect tmap]; }; + GREENeR = derive2 { name="GREENeR"; version="0.1.2"; sha256="1clrpzic95hyyf1xknyhpf9ls92zd9sf5ykylhbq7lmjc709kk61"; depends=[classInt data_table dplyr FME ggplot2 gridExtra magrittr networkD3 parallelly reshape2 sf tidyselect tmap]; }; GREMLINS = derive2 { name="GREMLINS"; version="0.2.1"; sha256="16l2mzd6xm2yk1hs5333w9lfz7iymkwmi3k80yxal9dxqh5hajkb"; depends=[aricode blockmodels igraph pbmcapply R6]; }; GRIDCOPULA = derive2 { name="GRIDCOPULA"; version="1.0.0"; sha256="02xyklc8648z3c3pfd3xshlfn5wpkyglc84dqh8sbpba7017gcvr"; depends=[fields ggplot2 limSolve pracma reshape2 Rsolnp]; }; GRNNs = derive2 { name="GRNNs"; version="0.1.0"; sha256="1c36km6g4fcsvpirlh88fl3zq9pdpdyfilahfx949salj0gnqsn6"; depends=[cvTools rdist scales vegan]; }; @@ -1983,37 +1984,38 @@ in with self; { GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; }; GSDA = derive2 { name="GSDA"; version="1.0"; sha256="1knzibpazyl0mp3c34hak634q4fb5cp250skkwgba92hj7hfhwvq"; depends=[msigdbr]; }; GSE = derive2 { name="GSE"; version="4.2-1"; sha256="0hxz2m8fn7zkxchvpn0kdw77mxgczff9mk1k0xy2ml50b9vzssm2"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; - GSED = derive2 { name="GSED"; version="2.5"; sha256="0hz7rn0j62gy7bv67dxqpfdq86zv3yqhl9pwafcism94636h8vrj"; depends=[memoise R_utils rootSolve survival]; }; + GSED = derive2 { name="GSED"; version="2.6"; sha256="1k8axyzk55d8idn65qj3gxqjsk27n2r0q78v7524mg8n3fhxs0wj"; depends=[memoise R_utils rootSolve survival]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="3.1.8"; sha256="13bw3v0s14p90c10vkpv4ghjaz7sfhyfhaw3dc4341p39fqnhdpl"; depends=[countrycode curl data_table httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="3.1.9"; sha256="0pjiblwjsy13cv6sivqhgjbrh9an3rm84mbm8c4v7z560q4y50ij"; depends=[countrycode curl data_table R_utils]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSSTDA = derive2 { name="GSSTDA"; version="0.1.3"; sha256="17mrdp5gy21mzb1k9czzzpn7ybymwn0m8c2srwv7d124mp8i3qpz"; depends=[circlize cluster ComplexHeatmap devtools survival visNetwork]; }; GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; GTDL = derive2 { name="GTDL"; version="1.0.0"; sha256="1dryw7d9qnsa3wibk9kgkldwb660arzdw024p62a123v7i932jz0"; depends=[survival]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; }; - GUILDS = derive2 { name="GUILDS"; version="1.4.5"; sha256="0pxajjrvihvk4yjr9h7yx85daxsbkapzf9dw6xxhxb1idnyihirm"; depends=[nloptr pracma Rcpp]; }; + GUILDS = derive2 { name="GUILDS"; version="1.4.6"; sha256="0rjlx13shzmamxzqng0qjl5kwzg111lq245y9z6axb3al3ly59ij"; depends=[nloptr pracma Rcpp]; }; GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; }; - GUTS = derive2 { name="GUTS"; version="1.2.3"; sha256="1hmd8i21v81k798la5gdmfah1jqb3v891vxm22s41vvxcz0iw1j0"; depends=[Rcpp]; }; - GUniFrac = derive2 { name="GUniFrac"; version="1.7"; sha256="13qb5fw9km6p5x8li9x3liqbh833wf2v73npj8jl3msplzfk82vp"; depends=[ape dirmult foreach ggplot2 ggrepel MASS Matrix matrixStats modeest Rcpp rmutil statmod vegan]; }; + GUTS = derive2 { name="GUTS"; version="1.2.5"; sha256="1dx760bvc5nkdfhknj8ilqqrxwllzqg03rvg0ghd61xadmb3m64x"; depends=[Rcpp]; }; + GUniFrac = derive2 { name="GUniFrac"; version="1.8"; sha256="1yw0d8hb7s662xy0dny9ygvx9gwh7yj8dxw4897zy7zyjhzim95f"; depends=[ape dirmult foreach ggplot2 ggrepel inline MASS Matrix matrixStats modeest Rcpp rmutil statmod vegan]; }; GVARX = derive2 { name="GVARX"; version="1.4"; sha256="0hafmq8m2pszmmj9yldrbab8670pfrm62x79g8lzac9rmhlz76w2"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; }; GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="2.2"; sha256="1q5gaam554r2wxwsdgxjx6hngs2q850hbrkz8y5248i46pz16pcc"; depends=[fastglm horseshoe mombf Rcpp RcppArmadillo survival]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.6.4"; sha256="0nxh20gpgv5b2nkrczrcjknl9f531flw8fr9qiqd6ig5gxlcgs67"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr openxlsx R_utils rmarkdown RSQLite]; }; - GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.6.5"; sha256="0856bspcpywb07v1g1lwhlp2cfxla9m264g1dyhl61i9yxr10c9d"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr openxlsx R_utils rmarkdown RSQLite]; }; GWI = derive2 { name="GWI"; version="1.0.2"; sha256="0gwbidvdzk7b1w880baa338h7cikvlzvqmbmdxca4r83jzzwxlj1"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWPR_light = derive2 { name="GWPR.light"; version="0.2.1"; sha256="0ilgmdsfdrbam86vvlzm1avd337rqq1al0cvrl6i5cjpwaffncih"; depends=[data_table doParallel dplyr foreach GWmodel iterators lmtest plm sp]; }; + GWRLASSO = derive2 { name="GWRLASSO"; version="0.1.0"; sha256="172gjp4f3i2na53l04ddsz588qmhfs4fwdnbnvpjvkrc8xsp9yf2"; depends=[glmnet Matrix numbers qpdf]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.4"; sha256="13g91bx7b0cf1rnyc6azkvjilvc3kjynb8nclmbh8n3ccm6b0v2r"; depends=[doParallel foreach]; }; GWSDAT = derive2 { name="GWSDAT"; version="3.1.1"; sha256="0z35ywf33lpbsv0fkdqq5d17nfq1cp0za8pq4lb1ckbkv3w974ls"; depends=[deldir digest geometry Kendall lattice lubridate MASS Matrix officer raster readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; + GWalkR = derive2 { name="GWalkR"; version="0.1.3"; sha256="0njga2h721vmz900z69sabf5vlzpws3fjawqrasj7y2w5hbcc4zk"; depends=[htmlwidgets jsonlite openssl shiny]; }; GWmodel = derive2 { name="GWmodel"; version="2.3-1"; sha256="13f09dlgzji3412lgzc6fg0zfhzfqj3d2g2hlda4caidppc4x4zq"; depends=[FNN Rcpp RcppArmadillo robustbase sf sp spacetime spatialreg spdep]; }; GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.4"; sha256="1yinzlp22z9z5fk9f1nm14i408yfm5kfgkn3pqnh4bkghs569ivg"; depends=[geodist nsprcomp pracma sf sp spData]; }; GWpcor = derive2 { name="GWpcor"; version="0.1.7"; sha256="0q43673pmm2c6kss688fpz10b39y3jn1kblv13p8ky0bk82hmcvi"; depends=[corpcor doParallel dplyr foreach geodist pracma sf sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaSP = derive2 { name="GaSP"; version="1.0.4"; sha256="14wjg5zgas6zj98qlwjdmr32byrn6bazg1dxpjh02n6md5dfysbp"; depends=[]; }; - GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; + GameTheory = derive2 { name="GameTheory"; version="2.7.1"; sha256="1mq8406zgh4yww2jb7xvvmizyis9cb2hwdliacr4hxpjg38c3jdn"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; }; Gammareg = derive2 { name="Gammareg"; version="3.0"; sha256="1wh5k3nazycki0h094m4d0nnign8yksgnrrnrm3yka1s7mqzv781"; depends=[]; }; GauPro = derive2 { name="GauPro"; version="0.2.11"; sha256="011dw5fcpws0w05iyz5m1zfj1mj3ha1jnnky3pbi0d0n5jmx1h1h"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; @@ -2021,13 +2023,13 @@ in with self; { GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.1.1"; sha256="0c9khbg44yf04wp80bizd7j86gif1apqqafxyvi8692rrhf1r3ax"; depends=[doParallel foreach]; }; GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; GeNetIt = derive2 { name="GeNetIt"; version="0.1-6"; sha256="1ay40ym6khs016bs7ljcn7krqn9bmj2csd7p4nhzapbhp4g45wsc"; depends=[dplyr exactextractr igraph nlme sf sfnetworks spdep terra tidygraph]; }; - GeSciLiVis = derive2 { name="GeSciLiVis"; version="1.1.0"; sha256="1kx258kx77vl67hxvj9zml7capm75yncjs0478ckwjr6g69x1ka7"; depends=[biomaRt biomartr rentrez]; }; + GeSciLiVis = derive2 { name="GeSciLiVis"; version="1.1.1"; sha256="052aws057h8j36c8k6ls9b3qd1kn69x84lvcxx45dfbb7z4jgfnr"; depends=[biomartr rentrez]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.2.0"; sha256="1pihqxif2v62hwf5761fshyhigcjmlgbvp2j7immxlsysjfw5xgq"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.2"; sha256="03pgzrj5d3cjhadv4f6an4vm90fj0wxcsi9lx7znrlrjp8qvyjvh"; depends=[]; }; GenEst = derive2 { name="GenEst"; version="1.4.9"; sha256="0ifqzpqrc9bgg6sp8zx30lvcz9kcbzivw5sf8f3axnwzfia9x376"; depends=[DT gsl gtools hellno htmltools lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; GenMarkov = derive2 { name="GenMarkov"; version="0.1.0"; sha256="06bq43ry25g75qxlnrz02s393sv4r5v7m8gw0d96gpmldc76aax1"; depends=[alabama fastDummies Hmisc matrixcalc maxLik nnet]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; - GenSA = derive2 { name="GenSA"; version="1.1.9"; sha256="10qm0467r2rbcck1w7dijng5j676314vsyxsr0p8l843xz7s66rq"; depends=[]; }; + GenSA = derive2 { name="GenSA"; version="1.1.10.1"; sha256="16wla8k6ibxy58hhn7qd02k96lc7j6skaj6g5ap6lqmm854ki4wh"; depends=[]; }; GenTag = derive2 { name="GenTag"; version="1.0"; sha256="0yirl7n7p7w1dfbbr48v1151qyqm7p9m00vc6jq0s2d6bjdspin9"; depends=[]; }; GenWin = derive2 { name="GenWin"; version="1.0"; sha256="0fy5ws481xxk16x6wj7z8mwdzy044lqkqkw36xf1yxq18yxcg9xj"; depends=[pspline]; }; GenderInfer = derive2 { name="GenderInfer"; version="0.1.0"; sha256="1bdihxxwmp8ffb5blc8hkxnxh2z72vkq1sjak25njq8b1kwnazvn"; depends=[binom ggplot2]; }; @@ -2043,18 +2045,16 @@ in with self; { GenericML = derive2 { name="GenericML"; version="0.2.2"; sha256="1r2jl3say11by21ja7m6m55yzmgrdmp4nlanvh8h4cm8v37bzql7"; depends=[abind ggplot2 lmtest mlr3 mlr3learners sandwich splitstackshape]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; }; - GenoTriplo = derive2 { name="GenoTriplo"; version="1.0.1"; sha256="1z8l95zn9nwzyagxv8b5q4zhvrq0gajpkdphcj35l1b8szl315gs"; depends=[cowplot doParallel dplyr DT foreach ggplot2 htmltools processx rlang Rmixmod shiny shinyBS shinythemes tidyr]; }; + GenoTriplo = derive2 { name="GenoTriplo"; version="1.0.3"; sha256="11cycy2ans4l6jilr8ga9z6a1r2j0spsmdb5xrxrnwbbwl85czyk"; depends=[cowplot doParallel dplyr DT foreach ggplot2 htmltools processx rlang Rmixmod shiny shinyBS shinythemes tidyr]; }; GenomeAdapt = derive2 { name="GenomeAdapt"; version="1.0.0"; sha256="0jsxqhx62vbsr0hcqk9wrfsg3l3wbnx64pzxx18ps366vg7fxmii"; depends=[gdsfmt qvalue robust SNPRelate]; }; GenomeAdmixR = derive2 { name="GenomeAdmixR"; version="2.1.7"; sha256="14qnabg1pj8sg2bvd3k4m467bh1q2zfjr0ljxn1ny031sqwis4cy"; depends=[ggplot2 ggridges hierfstat Rcpp RcppArmadillo RcppParallel rlang stringr tibble vcfR]; }; GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.5.9"; sha256="09l87wf78bj49cdh7r3x81hn15c4pihxih8l59xxrpgdhp69268c"; depends=[data_table snpStats]; }; - GeoAdjust = derive2 { name="GeoAdjust"; version="1.0.1"; sha256="074zp2rbahy72gh7hymdqrll2fb5rzm1xsbzhxjhd7032nlvs8g3"; depends=[fields geosphere ggplot2 Matrix raster RcppEigen rgeos sp SUMMER TMB]; }; - GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; }; - GeoModels = derive2 { name="GeoModels"; version="1.0.9"; sha256="1pd0varrdryid8dyfzv3m1qqrngr6zy6bbcdl5453p2963wkhvwd"; depends=[codetools data_table dfoptim dotCall64 fields GpGp GPvecchia hypergeo lamW mapproj nabor numDeriv optimParallel pbivnorm plotrix pracma scatterplot3d shape sn spam VGAM zipfR]; }; + GeoAdjust = derive2 { name="GeoAdjust"; version="2.0.0"; sha256="0251672j2vl9jck31zfcqzsyw8pphzs934j8ljjmnw9qqd3gzd2p"; depends=[fields fmesher ggplot2 Matrix RcppEigen sf SUMMER terra TMB]; }; + GeoModels = derive2 { name="GeoModels"; version="1.1.4"; sha256="063ggs9i946q836yk3m4jpf20kpa0l3p7r658vv8i9zzibcfkcgq"; depends=[codetools data_table dfoptim dotCall64 fields GpGp GPvecchia hypergeo lamW mapproj nabor numDeriv optimParallel pbivnorm plotrix pracma scatterplot3d shape sn spam VGAM zipfR]; }; GeoMongo = derive2 { name="GeoMongo"; version="1.0.3"; sha256="0m5nz5q81jz2v2bl2dbgdbdprrkckxr2c67qn0cg9vms0pi3fawr"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; GeoWeightedModel = derive2 { name="GeoWeightedModel"; version="1.0.2"; sha256="0nff8whj5306mbi668y3i31sfbdslyd7cdm6rxafxhii643bm93a"; depends=[beepr cartography dplyr DT GWmodel raster readxl shiny shinyalert shinyBS shinybusy shinydashboard shinyjs shinyWidgets sp spdep]; }; GeodRegr = derive2 { name="GeodRegr"; version="0.2.0"; sha256="029yclgi4np000yh42j68v32m32lq2hmkh94q33hh1qkx8rilfa7"; depends=[MASS zipfR]; }; - GeodesiCL = derive2 { name="GeodesiCL"; version="1.0.0"; sha256="1i3i6vlh3nnb7z6qzh2cd6cqka78bfdly952x5ryl7cb2590a4pc"; depends=[dplyr htmltools leaflet leafpop magrittr mapview profvis readr rgdal sp tibble]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; GerminaR = derive2 { name="GerminaR"; version="2.1.4"; sha256="0f2dbq1adbd5p30kf9bi8qqk2s8da0p65i9a0igm16ckwpam7lkk"; depends=[agricolae dplyr DT ggplot2 purrr shiny tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.7.0"; sha256="0bc1ar1cx7vxvlld2dishi46a9bxs075vgby1xs8kbxlllknvcsi"; depends=[curl dplyr furrr future jsonlite memoise purrr stringr]; }; @@ -2073,6 +2073,7 @@ in with self; { Gifi = derive2 { name="Gifi"; version="0.4-0"; sha256="0a8xxr0qn72x2kkzlk9pm9nqp1pr74qh6p2g6l63km6c1imhc4i7"; depends=[colorspace]; }; GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.2"; sha256="1hk7fnv3gdfvx9q4ssw0jgph59l7h2dgl7lv8pivkm678i53n8zl"; depends=[]; }; GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.3.0"; sha256="0wjz0fh9cwvaw6n7hs2lkh818jzbjl11ps5gxnjqizz8gfp9fr10"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; }; + GimmeMyPlot = derive2 { name="GimmeMyPlot"; version="0.1.0"; sha256="18k3z6ynzpmdg029sspl8as0bkifqf8ff6hf9l2yblls7sb64id0"; depends=[dplyr ggforce ggplot2 ggpubr magrittr RColorBrewer rstatix scales stringr tidyr]; }; Gini = derive2 { name="Gini"; version="0.1.0"; sha256="0858mlh8pwylnnb13y40wscq08gcx1cgwjn88wv5vkim5jn4bigi"; depends=[]; }; GiniDistance = derive2 { name="GiniDistance"; version="0.1.1"; sha256="1x9a59x60a2jdnql3wn4za510rv9qp84j6b9m6la81j3mmy92vzz"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; }; GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; }; @@ -2080,13 +2081,13 @@ in with self; { GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2.5"; sha256="114mhhpv7phvrzvzar4s1a9032iyhcvixjx4h7b5vd1p23m9sayz"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS statmod stringr tweedie]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.2"; sha256="0gkm77w6db9ajyncy1xdcivplap06a51zi99m009kylccschd2a7"; depends=[]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.7"; sha256="0m9fp54y4m1xxjqphpnxhw2hspzdca9qc9l60znpnynyj5m6cy2k"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; - Gmisc = derive2 { name="Gmisc"; version="3.0.2"; sha256="1l3ica4nszqwb24kfswgg6s67ywwncggin0d4b7iv9rvdrngg9hj"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rlang rmarkdown stringr XML yaml]; }; + Gmisc = derive2 { name="Gmisc"; version="3.0.3"; sha256="1s8gkqg54622xhsmhl7n5pff2b6xfij111m7h3i4inzfjfmziq43"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rlang rmarkdown stringr XML yaml]; }; GmptzCurve = derive2 { name="GmptzCurve"; version="0.1.0"; sha256="00n28difj8qs3i539fsd2x07qakyjxf77l8rq5fy07h4f4cpyd0x"; depends=[]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; GofCens = derive2 { name="GofCens"; version="0.92"; sha256="09qy8rsgywdlq04kn6dzdzahhminnx39ih9i84399kn2pnr9vlzi"; depends=[actuar fitdistrplus ggplot2 gridExtra survival survsim]; }; GofKmt = derive2 { name="GofKmt"; version="2.2.0"; sha256="1v9n1hfracincgaip7pym2l9h54azajw4fmsld0ff2rsd5np362z"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; }; GomoGomonoMi = derive2 { name="GomoGomonoMi"; version="0.1.0"; sha256="16kvf355yzpv0z2rndc5f50pxjnav6ld48j40vyip4h353wpwaks"; depends=[glue htmltools]; }; - GoodFibes = derive2 { name="GoodFibes"; version="0.1.8"; sha256="0p9kjy66gz7vyz82xllj9v44pyik11k1rwl9y2iqvndwyaq3jsba"; depends=[concaveman imager prodlim rgl]; }; + GoodFibes = derive2 { name="GoodFibes"; version="0.1.10"; sha256="0pcjb1266zhwwxqhyn9jlq2mpqwxg77aka5k29zc84izyz6ba3nk"; depends=[concaveman imager prodlim rgl splines2]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; }; GoogleImage2Array = derive2 { name="GoogleImage2Array"; version="0.99.2"; sha256="0ycv7lr1p2rsfln5829yk6nk9h1yk24rirjr1fk27999n42iy1pk"; depends=[EBImage magrittr rvest xml2]; }; GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; @@ -2094,8 +2095,7 @@ in with self; { Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; GramQuad = derive2 { name="GramQuad"; version="0.1.1"; sha256="02bpxs7yyd9805h8whvzfaxg43z4n5zxdj57hx36r3cx03hh26zd"; depends=[pracma]; }; GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; }; - GrapheR = derive2 { name="GrapheR"; version="1.9-86-3"; sha256="0wpq7w4lclkzj9ffmqwk2qp5r6kwggh7by47lvhmai4j8g2ha56c"; depends=[]; }; - GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0.1"; sha256="1gdjx9dazrff2nj16044b7vr7jwddf5cj0iwnlhan46fnibsfwjf"; depends=[Matrix]; }; + GrapheR = derive2 { name="GrapheR"; version="1.9-86-4"; sha256="0bmwzgc9nzqp1vkybhhc7mxdzsa3l96i42iahvwkzv10ac3nfd5l"; depends=[]; }; GreedyEPL = derive2 { name="GreedyEPL"; version="1.2"; sha256="19bgrgzb7jdqpljcbhr3d98y331k1b8fbwgcipak6zkhk2vr6vqz"; depends=[Rcpp RcppArmadillo]; }; GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.5.6.1"; sha256="057wpfg5kfgcvfgry12agn7arg917jwgvxhjz6q1na13y8pmqnrv"; depends=[checkmate kernlab nbpMatching Rcpp rJava rlist stringi stringr survey]; }; GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; @@ -2108,11 +2108,12 @@ in with self; { GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; }; GroupSeq = derive2 { name="GroupSeq"; version="1.4.2"; sha256="01207wc0z9z7m38lnmaf4hml6nva5bcld52clpr2dy9pfcd1x1pd"; depends=[mvtnorm tcltk2]; }; GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; }; + Grouphmap = derive2 { name="Grouphmap"; version="1.0.0"; sha256="0wmzgd76adwq2gm8p1cxgy1kj1vl83bfsx4d9afk7wh3dxgq4c7l"; depends=[clusterProfiler dplyr limma org_Mm_eg_db pheatmap stringr]; }; GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; }; GseaVis = derive2 { name="GseaVis"; version="0.0.5"; sha256="01c5rl05lf9abmasw9w8rxlgl55jr3faiwi1ndx993r3j8xvbcqj"; depends=[aplot DOSE dplyr ggplot2 ggpp ggrepel ggsci magrittr purrr RColorBrewer reshape2 stringr tibble]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; - Guerry = derive2 { name="Guerry"; version="1.8.1"; sha256="1pci00b69sk9qlgpkbmvcijlbh48xdmshh57xgi84m85j16i4rlw"; depends=[sp]; }; GxEScanR = derive2 { name="GxEScanR"; version="2.0.2"; sha256="0k3avad4b2x4sqv8iilx5a8gkybjlipx50mj0la4kl9xv0azshkd"; depends=[prodlim Rcpp RcppArmadillo]; }; + GxEprs = derive2 { name="GxEprs"; version="1.1"; sha256="1ylggdh0rzjz5ms107lg4jzayl0rsnqqzzmmg94j483yij7bm89f"; depends=[]; }; H2x2Factorial = derive2 { name="H2x2Factorial"; version="2.0.0"; sha256="01if0ps43xhcw6q5khdbvjd0yvvhkcj4gvdx538g2kaxzi3lrj1z"; depends=[mvtnorm]; }; HAC = derive2 { name="HAC"; version="1.1-0"; sha256="1k19qrirhzl8qaa4svf7qa90r7gphbbvm9m0977z9gd704n8b62a"; depends=[copula]; }; HACSim = derive2 { name="HACSim"; version="1.0.6-1"; sha256="0hdczpn1x6zcxya8qlp82fzzpli3z2kfvynk5sqk97h1d55d27i4"; depends=[ape data_table matrixStats pegas Rcpp RcppArmadillo shiny]; }; @@ -2123,7 +2124,6 @@ in with self; { HCT = derive2 { name="HCT"; version="0.1.3"; sha256="18k6p9y3vl39mxbvdjanyj3w74jqy2rym6rdbfrx5crvqm9k8hcp"; depends=[rstan]; }; HCTDesign = derive2 { name="HCTDesign"; version="0.7.2"; sha256="1nncyyw1dlbdl9f1pncwa9xdqrd7w2aw4ghnf01vwyq0m7pj90l1"; depends=[crayon diversitree flexsurv mvtnorm Rdpack survival]; }; HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; - HCV = derive2 { name="HCV"; version="1.2.0"; sha256="00ry36w2v4h3vkf2jq3djcma23xflr7fx7icy2vzwk9ffnmzvpxd"; depends=[BLSM cluster geometry M3C MASS Matrix rgeos sp]; }; HCmodelSets = derive2 { name="HCmodelSets"; version="1.1.3"; sha256="0jchr8ncjpl2ljwf09cmpv679vdla11r1vkylhqaacdp1zdb93w6"; depends=[ggplot2 mvtnorm survival]; }; HDBRR = derive2 { name="HDBRR"; version="1.1.4"; sha256="03jl1m099z6gj2ipi7rnjnrd2rmk4zs54332rwlqyf40dv7ndbz1"; depends=[bigstatsr MASS numDeriv]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; @@ -2131,16 +2131,18 @@ in with self; { HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; HDInterval = derive2 { name="HDInterval"; version="0.2.4"; sha256="1xlljhzd30mi7pic7q55h7hv0bccxfc2g32piv8jx830svnz01xv"; depends=[]; }; + HDJM = derive2 { name="HDJM"; version="0.1.0"; sha256="1vv1q7hdq12wh5nbr8zh1f8fzx5caaq4b39wqy99mxpx8cnsb87n"; depends=[Rcpp RcppArmadillo RcppEnsmallen statmod survival]; }; HDLSSkST = derive2 { name="HDLSSkST"; version="2.1.0"; sha256="19snvpgiq8kxzqv6yimzn7nfxkch2xkm0sk41m7g4xwr412dn49j"; depends=[Rcpp]; }; HDMFA = derive2 { name="HDMFA"; version="0.1.0"; sha256="01gsz862m038y0b4y5aqq08n5514cjz9lxvqh0ybv2rd4gjmvnxs"; depends=[MASS RSpectra]; }; HDMT = derive2 { name="HDMT"; version="1.0.5"; sha256="11wr7n6gj75k3a339h9hm167pni3vdbbnwwblc2b0wfljxsif6hf"; depends=[fdrtool qvalue]; }; HDOMDesign = derive2 { name="HDOMDesign"; version="1.0-1"; sha256="1wfq4w73dkkmfwn3n9rwpjlpvm1ak76dv9ymh6zqfls5whdmp59g"; depends=[HadamardR]; }; - HDRFA = derive2 { name="HDRFA"; version="0.1.1"; sha256="07snry1s0c5r4dns50yh6i8gybnvfgc5p8awlggvk316868f2dd3"; depends=[MASS pracma quantreg]; }; + HDRFA = derive2 { name="HDRFA"; version="0.1.3"; sha256="0jm0lv4kgg908h34zx875f468ignl6dxmjn4mxjck5fg1w17rjvi"; depends=[pracma quantreg]; }; HDShOP = derive2 { name="HDShOP"; version="0.1.3"; sha256="18i17vv71wc0rqfl2i9bcfl1ry3bd61x9nd6g57x37ggjp7i6j5k"; depends=[Rdpack]; }; + HDSinRdata = derive2 { name="HDSinRdata"; version="0.1.0"; sha256="071ywrxw2qhiqb7djd71y20zw5mja6c7abkkrk04nsdsl9m98793"; depends=[]; }; HDSpatialScan = derive2 { name="HDSpatialScan"; version="1.0.4"; sha256="1hwqdwr4jl887sgnjwq3gmxjhk6zz45nasvy3x7i7rmrqylxig60"; depends=[DT fmsb matrixStats pbapply plotrix purrr raster Rcpp RcppArmadillo sf sp SpatialNP swfscMisc TeachingDemos]; }; HDStIM = derive2 { name="HDStIM"; version="0.1.0"; sha256="0v43lwszxmka5li6mp10i2c6zq4si5hm2qsb27lib5gq5cxm23r7"; depends=[Boruta broom dplyr ggplot2 ggridges scales tibble tidyr tidyselect uwot]; }; HDTSA = derive2 { name="HDTSA"; version="1.0.2"; sha256="1a2bc86047mla0dr89sf1xrin47v0mmdz6j5sil258hjxrl434hy"; depends=[clime Rcpp RcppEigen sandwich]; }; - HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; }; + HDclassif = derive2 { name="HDclassif"; version="2.2.1"; sha256="0npdnp86m71bsp4096j3yfcvr702ghhvdvxpd2m7lbnc8g3v0sdp"; depends=[MASS rARPACK]; }; HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; }; HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; }; HDiR = derive2 { name="HDiR"; version="1.1.3"; sha256="1qwd3y9645m8v2gdrb4xjpq86ixs9rgrw7iv3m5lm7nnf87qm350"; depends=[circular Directional movMF NPCirc rgl]; }; @@ -2156,7 +2158,7 @@ in with self; { HGraph = derive2 { name="HGraph"; version="0.1.0"; sha256="1y35lzym3mbr1v7j7v55i9mxb1vn65xzgp5542va1bngvrm25hjf"; depends=[knitr]; }; HH = derive2 { name="HH"; version="3.1-49"; sha256="0yxqh0699x0vfk18p9850wziyglif0lywnljdl14biq71b5z1khj"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.3.4"; sha256="1ghw1rpf7n0dfclvxm3p02ym247p3rsncj9f9f97892lk9yin29c"; depends=[Rcpp rmarkdown]; }; - HIMA = derive2 { name="HIMA"; version="2.2.0"; sha256="1wv3lp9bzzj0hdbaql1c9k82icfs6jr5dlicfw4d8dmv1h5n610a"; depends=[doParallel foreach glmnet HDMT hommel iterators MASS ncvreg survival]; }; + HIMA = derive2 { name="HIMA"; version="2.2.1"; sha256="0r9dr3dvav8m8sxk84fm6m8y7fvsbd6dfblma17vizvslxpi5vwm"; depends=[conquer doParallel foreach glmnet hdi HDMT hommel iterators MASS ncvreg quantreg survival]; }; HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; HKRbook = derive2 { name="HKRbook"; version="0.1.3"; sha256="1bhyhv72c8afyzwx7h6p33mgfvhgqfh5c5f85gj803p6ai60h544"; depends=[DT formatR highlight MASS scatterplot3d shiny shinydashboard shinydashboardPlus shinyWidgets]; }; HKprocess = derive2 { name="HKprocess"; version="0.1-1"; sha256="0kn84ccaypknxymynp6lnr8asd85rlzbk073z7511rriyz96hyj7"; depends=[gtools MCMCpack]; }; @@ -2175,13 +2177,14 @@ in with self; { HMR = derive2 { name="HMR"; version="1.0.2"; sha256="1zxfz88sr9m0706r76qizlwcy4il2v49x1lx77nqx40626p4zp7n"; depends=[]; }; HMTL = derive2 { name="HMTL"; version="0.1.0"; sha256="0pn192bikij1yqms6vnv1n313g4q21966314zvg1krrwisklny9r"; depends=[Matrix pROC]; }; HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; + HOasso = derive2 { name="HOasso"; version="1.0.1"; sha256="07xihcjj3gfxl1fd5x1dvfmfg8m19rfjzq110ay3vrj38sxxvkiw"; depends=[igraph Rdpack]; }; HPLB = derive2 { name="HPLB"; version="1.0.0"; sha256="1xxckjz90sdmng0sm9dlhwpzj79pxa3vd1cidxc44wjk4h25rq7q"; depends=[data_table]; }; HQM = derive2 { name="HQM"; version="0.1.0"; sha256="1q959qdakwzf07zbyxkvrslyc4kgd47g4wij2fgm7l4w3xm34lwz"; depends=[]; }; HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; HRW = derive2 { name="HRW"; version="1.0-5"; sha256="08fh9504cck1ffrwim27nkrm9y1in6jl1s7zs8h8x3ik54p9jb0k"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-10"; sha256="1z4drab395bnyfbd19rn9hr1gz78ny773g1anh54w18iszakkvib"; depends=[]; }; - HSAUR2 = derive2 { name="HSAUR2"; version="1.1-19"; sha256="0jmljx1pppq81h637kxgs35bfclzfs2pkms72b8immd6xf58kg4h"; depends=[]; }; + HSAUR2 = derive2 { name="HSAUR2"; version="1.1-20"; sha256="0660z2fxj5l0dzlb1xzgd446zzxqwc1kmv52k4aa7p45apxy9hn4"; depends=[]; }; HSAUR3 = derive2 { name="HSAUR3"; version="1.0-14"; sha256="1fsil4n4s71ff8np9w65h8n8b1b2rh017ja8vjd4wq07xi3prbwp"; depends=[]; }; HSDiC = derive2 { name="HSDiC"; version="0.1"; sha256="0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp"; depends=[glmnet Matrix ncvreg quadprog]; }; HSEtest = derive2 { name="HSEtest"; version="0.1.0"; sha256="0dzc44icmb1kkjr46siqigy0zpi66189qpwijgmlqwhzrj4yql9c"; depends=[]; }; @@ -2189,13 +2192,13 @@ in with self; { HTLR = derive2 { name="HTLR"; version="0.4-4"; sha256="0mi03r9izipvmla5pm0s42vm85ishr3bb8pjdw906s4q7lkxjivz"; depends=[BCBCSF glmnet magrittr Rcpp RcppArmadillo]; }; HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.8"; sha256="1jfhcyibvxqc96sig81a2fj2gplmwxm5h000xlihkbjk7k9fdsrz"; depends=[R2HTML]; }; HTRX = derive2 { name="HTRX"; version="1.2.2"; sha256="1zr0j1j8qqr5jm6r6s8z86wfzf1gwhy10zjlhvcd00lhlz5l5lm4"; depends=[caret fastglm glmnet recipes tune]; }; - HTSCluster = derive2 { name="HTSCluster"; version="2.0.10"; sha256="0scn4fsfmlkzxibfhsh6krm2cl9c8hsmyjgn48k9dyjf0ylyxg9n"; depends=[capushe edgeR plotrix]; }; + HTSCluster = derive2 { name="HTSCluster"; version="2.0.11"; sha256="0x9shhyla9bldkkh367gfdmf0k72l1ppixb8gzsa6nf8jx8qdpbp"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; HTT = derive2 { name="HTT"; version="0.1.2"; sha256="0345ydb3rjdkj4zm6xr5y4kf6plvxfgbpwkjs81pls99mr208qwz"; depends=[ggplot2 ggraph igraph Rcpp]; }; HUM = derive2 { name="HUM"; version="2.0"; sha256="06jx3f2zb52gjp05bq3zmgjkyiaa2j9v0biq23gg88gplpign6jw"; depends=[gtools Rcpp rgl]; }; - HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; + HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.3"; sha256="0ijrczm0mm37a3v4v0hd7zb662rcyzqf58z4nbhrix1nf6vzj47m"; depends=[]; }; HYDROCAL = derive2 { name="HYDROCAL"; version="1.0.0"; sha256="0xq53nysn9kv6p1clgdjxsvj7qjlcmg02frfpw9fnzim53pzzrp4"; depends=[]; }; - HYPEtools = derive2 { name="HYPEtools"; version="1.4.1"; sha256="0mzacc39av9zjm5amvkjflpykjd4bjgw2kp2xdx5n1y5dan8kihj"; depends=[clipr data_table dplyr ggplot2 ggpubr ggrepel ggspatial hydroGOF ncdf4 patchwork pbapply purrr rlang scales stringr tidyr tidyselect]; }; + HYPEtools = derive2 { name="HYPEtools"; version="1.6.0"; sha256="0iyai28gqx6d92h59g314rsr5l6y9l7zywyxdlqpzf0plnh0w6hi"; depends=[clipr data_table dplyr ggplot2 ggpubr ggrepel lubridate ncdf4 patchwork pbapply purrr rlang scales stringr tidyr tidyselect zoo]; }; HaDeX = derive2 { name="HaDeX"; version="1.2.2"; sha256="1qj6n03pd5kd5ff5h4v8wmnqxxylsxx1p6i88nahqkah2mzg9jdr"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; }; HanStat = derive2 { name="HanStat"; version="0.90.0"; sha256="0ycppc7cq8jpg2xldl692mxg73agra3sq6zjzlpz7vvr9kqf64g6"; depends=[boot car crayon devtools ggplot2 ggpubr lmtest olsrr]; }; @@ -2209,12 +2212,13 @@ in with self; { Hassani_SACF = derive2 { name="Hassani.SACF"; version="2.0"; sha256="16sk1vn47gd5qaq31p8hnqa5p29nd230v4vbg2lsn2bhy9m32km3"; depends=[]; }; Hassani_Silva = derive2 { name="Hassani.Silva"; version="1.0"; sha256="0rhi3mrlyxksgd34xxha73m0x6aqdf2xk8bshdnmm463rkzyy31l"; depends=[]; }; HazardDiff = derive2 { name="HazardDiff"; version="0.1.0"; sha256="048lvhb4545a487kyknf5b5v8q3a9nsipbh0ii2k3pcc5vfql1h4"; depends=[ahaz Rdpack rootSolve survival]; }; + HealthCal = derive2 { name="HealthCal"; version="0.1.1"; sha256="03q966d2kyi6x1ka4nmma94y75yj0vz4bk26psgnysvfz0nldfa3"; depends=[]; }; HeckmanEM = derive2 { name="HeckmanEM"; version="0.2-0"; sha256="0fq9hg9if7li9nfhsw5nw7j1z4wy7j9b5wcvcmvgddmfvimb7760"; depends=[ggplot2 MomTrunc mvtnorm PerformanceAnalytics sampleSelection]; }; HellCor = derive2 { name="HellCor"; version="1.3"; sha256="1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza"; depends=[energy FNN orthopolynom]; }; - HelpersMG = derive2 { name="HelpersMG"; version="6.0"; sha256="08rnjklka04d30gs4qms9i3wl8a8qkgvd8x6dsbad8zcr7q4ncbp"; depends=[coda ggplot2 MASS Matrix rlang]; }; + HelpersMG = derive2 { name="HelpersMG"; version="6.0.3"; sha256="1k8b4zlhipc91a0g81q0l5fjg45yvl51vhcv331yjcrjr9blb74m"; depends=[coda ggplot2 MASS Matrix rlang]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.2"; sha256="0jzf3pq43lllxvvmf0rqzxz9fx6931mgb0ipminlw1iakz8wa6w3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HeterFunctionalData = derive2 { name="HeterFunctionalData"; version="0.1.0"; sha256="0qrfmxwrxn0rd2ncy3afhraf7m0010nf9739jkj19h1j5vksi9n1"; depends=[]; }; - HeteroGGM = derive2 { name="HeteroGGM"; version="0.1.0"; sha256="0cfzqhbnsy2254m1n6vbpcxlmiqw7cs26v81f5wyawlyyvdydmxi"; depends=[igraph MASS Matrix]; }; + HeteroGGM = derive2 { name="HeteroGGM"; version="1.0.1"; sha256="1yz4rwlfhq0lk9zpc1p7yc35d1n1gr0pfdfhlm57kcsi5a8pzlk1"; depends=[huge igraph MASS Matrix]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; HhP = derive2 { name="HhP"; version="1.0.0"; sha256="0rmvw52a7a75gcwsyv30wvxrb9ykhg4ji3pj2jhgbzjqdc4s9xzw"; depends=[fmrs MASS Matrix]; }; HiClimR = derive2 { name="HiClimR"; version="2.2.1"; sha256="11aip68cjyy70xr0la1apk6gbkabg8vnc3s5cbydyz7yl4v80nn8"; depends=[ncdf4]; }; @@ -2229,14 +2233,14 @@ in with self; { HistData = derive2 { name="HistData"; version="0.9-1"; sha256="1c005rmzbxcc4m7rxnbxna4dlg3vrn5fhkj4vrkak3xrxbcfkafw"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.63"; sha256="1vi24k23a017czfy9kihmq4s1dywzm274dyhyp1imx94afsnmhc3"; depends=[jpeg plyr png RColorBrewer rgl]; }; - Hmisc = derive2 { name="Hmisc"; version="5.1-0"; sha256="0y10hnglid78gnaapmdy3ihjih4i2kvaycn2c60r2wr43nv7wl0q"; depends=[base64enc cluster colorspace data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools knitr nnet rmarkdown rpart viridis]; }; + Hmisc = derive2 { name="Hmisc"; version="5.1-1"; sha256="0laan26ja6m9k3spkk1ymalwb181ramzjq6ii3b0404xv2kfywa9"; depends=[base64enc cluster colorspace data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools knitr nnet rmarkdown rpart viridis]; }; Hmsc = derive2 { name="Hmsc"; version="3.0-13"; sha256="13gqwjniwxc5lgsj044qjq6ic0ibwvj3mviw4hq31s89m834gvyb"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix matrixStats MCMCpack nnet pracma pROC rlang sp statmod truncnorm]; }; HoRM = derive2 { name="HoRM"; version="0.1.3"; sha256="09dkpzlwkkdn0z8g9fbb7hzxbrrq70x9v1zx254svck2jyk0hx58"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; HodgesTools = derive2 { name="HodgesTools"; version="1.0.0"; sha256="02i87pd5ah3mmf03878354p8nqh3bgn9cnrl1pnnrb3qw7afj19q"; depends=[data_table dplyr ggplot2 ini magrittr qqman RColorBrewer readr RecordLinkage]; }; + Holomics = derive2 { name="Holomics"; version="1.0.0"; sha256="13b45kbp8s0zcqldn8bg964cqkc5b6jqh764szl8v27cxg0chvcf"; depends=[BiocParallel bs4Dash config dplyr DT ggplot2 golem igraph mixOmics openxlsx readxl shiny shinyalert shinybusy shinyjs shinyvalidate shinyWidgets stringr tippy visNetwork]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; HomomorphicEncryption = derive2 { name="HomomorphicEncryption"; version="0.1.0"; sha256="1agw7s9ccj4hi74scqqs8v65gsavxb5c3217rw0kk9cibq7bma2v"; depends=[polynom]; }; HospitalNetwork = derive2 { name="HospitalNetwork"; version="0.9.3"; sha256="183nb9h9b1z1ifpnzcxa8wh3xm2id6fnq9vqd4vkbxzw7wlyd86b"; depends=[checkmate data_table ggplot2 ggraph igraph lubridate R6]; }; - HostSwitch = derive2 { name="HostSwitch"; version="0.1.3"; sha256="1937rjjz3lzriym1brjfpp1b02zd40ry4205yrkrs3vxp1lp4234"; depends=[checkmate ggplot2 shiny tippy]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-8"; sha256="04x2x3anwf4d71dm7x6y08ysk7ygysshc0avisyshbl52x39l8si"; depends=[corpcor]; }; HotellingEllipse = derive2 { name="HotellingEllipse"; version="1.1.0"; sha256="1xvm54iqgdnqjpkmgi4ssgpdz2pap60y9z9whrv2ky3q16mjqycz"; depends=[dplyr FactoMineR ggforce ggplot2 lifecycle magrittr purrr tibble]; }; HuraultMisc = derive2 { name="HuraultMisc"; version="1.1.1"; sha256="0bi1y7icrg0f4n9ah9dsrijnfr39bqg3799rz4hccd1b061f0rvj"; depends=[cowplot dplyr ggplot2 HDInterval Hmisc magrittr reshape2 rstan tidyr]; }; @@ -2251,19 +2255,18 @@ in with self; { HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-4"; sha256="0xsgy995z79qdamwdgs335r8zr2bk5cyw4wijqyvgwx3pqmwvvmr"; depends=[]; }; HypergeoMat = derive2 { name="HypergeoMat"; version="4.0.2"; sha256="06ljg2v0dbqi9mf2l236p616x62cbx4q05qymbsj8inmajwv0piz"; depends=[EigenR gsl JuliaConnectoR Rcpp RcppEigen]; }; IADT = derive2 { name="IADT"; version="1.0.0"; sha256="1hyshs7dlpbsvpkn56fi7cfn54qkwmwyf9bhh1yks9nnhdxpbsgd"; depends=[mgcv mvnfast Rdpack Rmpfr]; }; - IAPWS95 = derive2 { name="IAPWS95"; version="1.2.2"; sha256="1nrdqjv7w99pxw519jbg57h56jwbmnal5155196jyzms782wyms3"; depends=[ggplot2 pander Rcpp]; }; - IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; }; + IAPWS95 = derive2 { name="IAPWS95"; version="1.2.4"; sha256="0jccq1pj0b8xpa7zs20ikkwlyj0f2q5qzdz8kllm0qiwlrrj7jsn"; depends=[ggplot2 pander Rcpp]; }; + IASD = derive2 { name="IASD"; version="1.1.1"; sha256="0bw36kghfrz3kh8rafshv16q2ac0ynsjcks021g27knvvbapnic9"; depends=[]; }; IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; }; IATScore = derive2 { name="IATScore"; version="0.1.1"; sha256="0sg4apj1sp0xc311cbkvflhv9kw1jxvjhdr0xjw79s662mnhkhgz"; depends=[]; }; IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; }; IATscores = derive2 { name="IATscores"; version="0.2.7"; sha256="1dmcwkylq6zazjycjsmbxnzvkav19w13j69gnm1f558wsdxpvhx1"; depends=[dplyr qgraph reshape2 stringr]; }; IAcsSPCR = derive2 { name="IAcsSPCR"; version="1.2.1"; sha256="0x0h1vicw0jlm9p10cw7g75g2x0d73rjpdwh1j7lxq6cnbpkbxf9"; depends=[abind FrF2 lattice stringi]; }; IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.6-0"; sha256="1nlfsfdw8lfr3n2717i6kn1hafwr6hmqzfpg249amlrfjn0pghji"; depends=[dplyr lsa tidyr]; }; - IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; IBDsim = derive2 { name="IBDsim"; version="0.9-8"; sha256="1a0xz1khl6cz6ajcn903fcmsv8g7hfdh7684zhk0g6awsgwqdf5q"; depends=[paramlink]; }; IBFS = derive2 { name="IBFS"; version="1.0.0"; sha256="04n021h781h5v1nlljdzam12agsw8hyhy50b0ld8d4vh6iy37ijp"; depends=[]; }; IBMPopSim = derive2 { name="IBMPopSim"; version="0.4.3"; sha256="03q65ysg2najjqqrjd9jnm7069q8gxhkyqwb7r7l6171wipwdi3y"; depends=[checkmate dplyr ggplot2 Rcpp readr rlang]; }; - IBRtools = derive2 { name="IBRtools"; version="0.1.2"; sha256="19i0dh8gnw8fkd4khaggljfmr6rn1r82vz5i9zvjxarqh0pfcqv7"; depends=[binhf data_table dplyr fmsb gtools tibble tidyr tidyselect]; }; + IBRtools = derive2 { name="IBRtools"; version="0.1.3"; sha256="0ah4fg93ihr4m8af19r2gnfibmalvmrc3pmac1afkw6jc0bnir4p"; depends=[binhf data_table dplyr fmsb gtools tibble tidyr tidyselect]; }; IBrokers = derive2 { name="IBrokers"; version="0.10-2"; sha256="06pp2fgzbwpk95r0pvaskx44q33mlady8bq5i13c4qc60vkafyag"; depends=[xts zoo]; }; ICAMS = derive2 { name="ICAMS"; version="2.3.10"; sha256="0kkxn45addgl7mg8w4ybna7xaj11dgrwax06l0ml3bnk8h0nrgi5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; ICAOD = derive2 { name="ICAOD"; version="1.0.1"; sha256="07fxh60vsndlvjijjsh1a9l2qkp78sb9nkg5x5mslh209lpjjhw1"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; @@ -2280,10 +2283,11 @@ in with self; { ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; }; ICODS = derive2 { name="ICODS"; version="1.1"; sha256="0ch463yxnhb3kcpwqmbshm1jljnnrw8lgisym6yvsr8h2gpi15zm"; depends=[MASS]; }; ICRanks = derive2 { name="ICRanks"; version="3.1"; sha256="1vwzqkjg7i5hm96s8frp72n6xqadlsawzr1wby1fhsxl2m5f1797"; depends=[gmp multcomp Rcpp]; }; - ICS = derive2 { name="ICS"; version="1.3-2"; sha256="00k453h6bdlic0ldbbrdsaax9959r5dr5a39r9ma5hyyli3i2bik"; depends=[mvtnorm survey]; }; + ICS = derive2 { name="ICS"; version="1.4-1"; sha256="0xbah28g7k7c37r4qsq3ki67r8jn4psincpkjxg1mmfar5521z29"; depends=[mvtnorm survey]; }; + ICSClust = derive2 { name="ICSClust"; version="0.1.0"; sha256="0sw8ck9384xc0rfj7q7yd0fjacilp64fx8b0l0cw5k920rnzskbj"; depends=[cluster fpc GGally ggplot2 heplots ICS mclust moments mvtnorm otrimle Rcpp RcppArmadillo RcppRoll rrcov scales tclust]; }; ICSKAT = derive2 { name="ICSKAT"; version="0.2.0"; sha256="13cx2480kyzcwxp9b57p3rq4fs6x1fd4wpwm7iwiqjh17v4vb54l"; depends=[CompQuadForm dplyr magrittr Rcpp RcppEigen rje survival zoo]; }; - ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; }; - ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; }; + ICSNP = derive2 { name="ICSNP"; version="1.1-2"; sha256="1hyndbnfpvkdxgjihh3m8wd1hpdb0n346bl03z9ry2blppci2jvs"; depends=[ICS mvtnorm]; }; + ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-1"; sha256="00hp24rxqhlm3lxqjqxn2vg5x10ihgz5yvd454rhjg3f2nrbqvm7"; depends=[ICS moments mvtnorm]; }; ICSS = derive2 { name="ICSS"; version="1.1"; sha256="0kmsw8347ka5n0qncx7hqgs153ihkmxbl0wc5kqlb2l42sl6rp8x"; depends=[rstack]; }; ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; ICSsmoothing = derive2 { name="ICSsmoothing"; version="1.2.7"; sha256="141ly37ccj1ky9lr37baa3vkbbkr73z8nxfkyavjrzhzw8d5r2rr"; depends=[ggplot2 polynom]; }; @@ -2297,7 +2301,7 @@ in with self; { IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; }; IDE = derive2 { name="IDE"; version="0.3.1"; sha256="1pbfxhcbnmn0mh7a96ff58p4dpkb0di7l0v40nqyjk4jbkpd8rfl"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; }; IDEAFilter = derive2 { name="IDEAFilter"; version="0.1.2"; sha256="1nwsq5jy374f2sdnrxw79kq3wklydrygm4qsd6v6npdqw55jli2l"; depends=[crayon ggplot2 pillar purrr RColorBrewer shiny shinyTime]; }; - IDEATools = derive2 { name="IDEATools"; version="3.5.0"; sha256="12z3rhjgi68gs5qgm7133qn5mqk8d47rsx4gj6zcpri8mvzw3ci1"; depends=[data_table ggimage ggplot2 ggpubr ggtext jsonlite openxlsx pdftools readxl rlang rmarkdown shiny stringi tibble]; }; + IDEATools = derive2 { name="IDEATools"; version="3.5.1"; sha256="05amichli11yny5idmvl0k28v910nscf89qgghl5cjpqzcwq9jr4"; depends=[data_table ggimage ggplot2 ggpubr ggtext jsonlite openxlsx pdftools readxl rlang rmarkdown shiny stringi tibble]; }; IDF = derive2 { name="IDF"; version="2.1.2"; sha256="19mg7a83badb3wqnrmx5ric0nlfdb33wcxfmq9457s8019ghvpvv"; depends=[evd fastmatch ismev pbapply RcppRoll]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.20"; sha256="0zy6mxqa8arq0vvhsdcifzm3085c23rnwa1n36fhircph1xwvfdw"; depends=[lattice]; }; @@ -2314,7 +2318,7 @@ in with self; { IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; }; IDmining = derive2 { name="IDmining"; version="1.0.7"; sha256="1yv8lclkb1ws2n4yd3l561lqhp25vlw0f6d073yg04pidr2dpg2a"; depends=[data_table doParallel foreach]; }; IETD = derive2 { name="IETD"; version="1.0.0"; sha256="0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l"; depends=[doParallel dplyr foreach ggplot2 lubridate Rdpack]; }; - IFC = derive2 { name="IFC"; version="0.2.0"; sha256="0j4lfppcf8ybs5y2a6bxdxfl1wx9nph7zdxpkr65kma0kdzrc7ih"; depends=[DT gridExtra gridGraphics jpeg KernSmooth lattice latticeExtra png Rcpp tiff visNetwork xml2]; }; + IFC = derive2 { name="IFC"; version="0.2.1"; sha256="0b0kda1wh9li6x2avjw3ayj882r69v06sjmwc31dkf59b8r67l9k"; depends=[DT gridExtra gridGraphics KernSmooth lattice latticeExtra Rcpp visNetwork xml2]; }; IFMCDM = derive2 { name="IFMCDM"; version="0.1.17"; sha256="04qiq5i2nw3l64yz0xwh7c8dcfh69xinb8l0zq0a8gi67vd1yka7"; depends=[dplyr]; }; IFP = derive2 { name="IFP"; version="0.2.4"; sha256="066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6"; depends=[coda haplo_stats]; }; IGCities = derive2 { name="IGCities"; version="0.2.0"; sha256="1564bzvi6vgg9q8s97mxjwklr83vkcv8f526savkhnjxdzi1zmy0"; depends=[]; }; @@ -2336,35 +2340,36 @@ in with self; { IMmailgun = derive2 { name="IMmailgun"; version="0.1.2"; sha256="09acmi6xj186fb8nhj8q0nxmkp2p32a1l95glzvz84gax4xakhz8"; depends=[httr]; }; INCATome = derive2 { name="INCATome"; version="1.0"; sha256="1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs"; depends=[genefilter limma multtest RankProd siggenes]; }; INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; }; - INLAspacetime = derive2 { name="INLAspacetime"; version="0.1.6"; sha256="11kkmmz4lm0qdqmbnx1j719kdwmq3zrvmd5kh099x3gmrmi90ivd"; depends=[Matrix sf sp]; }; + INLAspacetime = derive2 { name="INLAspacetime"; version="0.1.7"; sha256="0b3ahvgqkgb32zpr5cbyz1k0sszzm6pim1dxyhka6mv73732qzgw"; depends=[fmesher Matrix sf sp]; }; INQC = derive2 { name="INQC"; version="2.0.5"; sha256="1gz7gyq5n2bmh18yrg29nz8kmdc0b35chwqxr6y2sggdm8j28akd"; depends=[evd gdata suncalc]; }; INSPECTumours = derive2 { name="INSPECTumours"; version="0.1.0"; sha256="1jh6p3bgnrjixqzvjl0z3nv6lh01fx3x925h3na2pi3scqx5gx0s"; depends=[brms dplyr DT ggeffects ggplot2 knitr lme4 modelr pander plotly purrr readxl rlang rmarkdown shiny shinyalert shinyFeedback shinyjs shinytoastr shinyvalidate tidybayes tidyr tippy vroom waiter]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; INTRIGUE = derive2 { name="INTRIGUE"; version="0.1.0"; sha256="1l1vfl0m4iqniwp4bp1bfjpqhwahg341fpyxhryr0j8lypqaw7si"; depends=[dplyr rlist SQUAREM]; }; - IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.6.3"; sha256="1y8qvjm9mrdfxzgxyn5w8798gay0mf4l5lw7s845bcglpyr91q6p"; depends=[colorRamps colorspace data_table dplyr ggplot2 httr knitr magrittr plotly RColorBrewer Rcpp reshape2 shiny stringi]; }; + IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.8.2"; sha256="0814ycb0fchg9m5244i0wqj3y8dik9szmjcnjjv2w930sn2ccqcw"; depends=[colorRamps colorspace data_table dplyr eaf ggplot2 httr knitr magrittr plotly RColorBrewer Rcpp reshape2 rjson shiny stringi viridis]; }; IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.4"; sha256="0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk"; depends=[assertthat BH magrittr Rcpp]; }; IOLS = derive2 { name="IOLS"; version="0.1.4"; sha256="0s7yrkps61czsf1avvmb1xcq53v92pfikq949a4i46lsyidl69ib"; depends=[boot matlib randomcoloR sandwich stringr]; }; + IP = derive2 { name="IP"; version="0.1.1"; sha256="1xvlv8mlahyhzvl0zbj0352iiqk2smqfy3vlawz8ldlcmwvwim7k"; depends=[stringi]; }; IPCAPS = derive2 { name="IPCAPS"; version="1.1.8"; sha256="17ifkgjjnvvcc8dp065ng4ad9lr85lcdcb401vi84yy8m2llbypw"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; }; IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.7.5"; sha256="1y0qq6q98lq1srsp1mlb7mr9zn2v4j7gpzim9fgh3xarw6a89i0h"; depends=[dplyr eeptools effsize gmodels gtsummary hash kableExtra lmtest lubridate stringr testthat tidyselect tidyverse zoo]; }; IPDfromKM = derive2 { name="IPDfromKM"; version="0.1.10"; sha256="1pqi6cshiha4gnra25fgpggyi42mn2hg25s9m9mh091rn5km44q0"; depends=[dplyr ggplot2 gridExtra readbitmap survival]; }; - IPEC = derive2 { name="IPEC"; version="1.0.3"; sha256="1f5draxw3q26d03h6mcyc8zrd1gmizmc0v01sppdnx8a21878rqz"; depends=[MASS numDeriv]; }; + IPEC = derive2 { name="IPEC"; version="1.0.4"; sha256="1ij9g8w5550nxbf65yd3gs8cc15d3yk2x94fmmzk7i8rfjvfzzjq"; depends=[MASS numDeriv]; }; IPEDS = derive2 { name="IPEDS"; version="0.1.0"; sha256="122v4m3lf5ix10a1ihw1qi8w975iamscaqg2vc5f5k6z8dy9s6ph"; depends=[dplyr readr rlang tidyr]; }; - IPEDSuploadables = derive2 { name="IPEDSuploadables"; version="2.7.5"; sha256="0rj1d87im7jxw9kyb82irxsanrqmn9fa29347yjn51lj8wqdgkwm"; depends=[dplyr lubridate magrittr purrr rlang stringr svDialogs tidyr]; }; + IPEDSuploadables = derive2 { name="IPEDSuploadables"; version="2.8.5"; sha256="0za69wfhqpmr6hl64kvpmw2sjhys74bnfab21zlwbxq8palhpmxh"; depends=[dplyr lubridate magrittr purrr rlang stringr svDialogs tidyr]; }; IPLGP = derive2 { name="IPLGP"; version="2.0.4"; sha256="0sv4zl6kn72ajnp32k9xg011y0bjxsq3a0vcj3s0w4wwkcr1h2w5"; depends=[ggplot2 sommer]; }; - IPMbook = derive2 { name="IPMbook"; version="0.1.4"; sha256="152y6d949jjfdfmcjfi0g4p2d02pmqgamxmx5bi3wb352jbjxl08"; depends=[abind]; }; + IPMbook = derive2 { name="IPMbook"; version="0.1.5"; sha256="1fad52j0cb187sbj7x1i7irlvyd2jhjgr84kf7m8v3ngwsn14wp3"; depends=[abind]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; IPV = derive2 { name="IPV"; version="1.0.0"; sha256="0h1x2scmwgzl7i0kk4pf7kfq55yiqn065s5r944rrfk09y9g2vgy"; depends=[ggforce ggplot2 lavaan Matrix reshape2 stringr]; }; - IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.1"; sha256="07qvdflwmyy0406xkkgja31cggfv4pak2hhnhh8fwggj2zkj9z8n"; depends=[isotone]; }; + IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.2"; sha256="0l6z64whpb50pxipv4mw0s1hki9kh1nnrcl2kzf83g9x9lbmwxk0"; depends=[isotone]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRCcheck = derive2 { name="IRCcheck"; version="1.0.0"; sha256="035sx36qf5hdnc51h8251qwxfm30r8h2v2qs2x161ip4cqghw019"; depends=[corpcor GGMncv glmnet MASS Rdpack]; }; - IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.5"; sha256="1gcz9s7vxpvfxljkjn4f54m5cmiji4j3v2f7vk6wdc7hm904afzp"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; + IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.6"; sha256="08p1xg4mqi36647nzmlmmmvdgzc9xgz4sf4lh2lrlma99f7y8kzd"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; IRISSeismic = derive2 { name="IRISSeismic"; version="1.6.6"; sha256="0da4bh5kvlp3dchsz0dyddwpwdvss7aij2xsi2kkppi3hrfwja7j"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.8"; sha256="0n48wi1lha7rbi9b8q71y9wvxkjsglwnyhzd1yhdbfms6768slmv"; depends=[]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; - IRTest = derive2 { name="IRTest"; version="1.0.0"; sha256="1w9d5pfzrp6xvfr5453kk0b6lif93virdc26wqlh8fhvrlyjwp1p"; depends=[betafunctions dcurver ggplot2]; }; + IRTest = derive2 { name="IRTest"; version="1.12.0"; sha256="1hljw4b73hq1998h9b008nxyai3py9da8j82c8paiq90sp6ahs26"; depends=[betafunctions dcurver ggplot2 usethis]; }; IRdisplay = derive2 { name="IRdisplay"; version="1.1"; sha256="0awdiv4rr93y8jb1d64sm1iy37ywyniqm7w98yv6qm0zz47h7sw3"; depends=[repr]; }; - IRexamples = derive2 { name="IRexamples"; version="0.0.3"; sha256="0g9ncq280nsdkgpisy7gk2fd0daqjzrrqyx7dgdknanxzyyvb4xn"; depends=[DisImpact dplyr forcats geodist ggplot2 ggthemes maps RSelenium rstanarm rvest sf survey tidycensus tidygeocoder tigris twang]; }; + IRexamples = derive2 { name="IRexamples"; version="0.0.4"; sha256="0x44gq6ik73r8zy5cjsdjr3k9xdf47lyrwldbgnfllja7kzxclfm"; depends=[DisImpact dplyr forcats geodist ggplot2 ggthemes maps RSelenium rstanarm rvest sf survey tidycensus tidygeocoder tigris twang]; }; IRkernel = derive2 { name="IRkernel"; version="1.3.2"; sha256="19i4wj5cb62n6j83nxgv500dcdzrf6rzwdy5v6fh7r93vjyxiip1"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; IRon = derive2 { name="IRon"; version="0.1.4"; sha256="1yl9i6gxzwy5f4qva3a14flzlk1xk7v2m02n0mg8ddchc5n6j3bc"; depends=[ggplot2 ggpubr gridExtra Rcpp robustbase scam]; }; ISAR = derive2 { name="ISAR"; version="0.1.12"; sha256="0c6ahpkpbmy8zg7ac0j3v01jw59g3h8n6s8c6lkrmk1my42yzr1c"; depends=[]; }; @@ -2379,26 +2384,29 @@ in with self; { ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR = derive2 { name="ISR"; version="2022.4.22"; sha256="0j31qicbpjgl0igmk37qg10zng31xk6w4dd1izz5pzjwb3w9qkli"; depends=[MASS]; }; - ISRaD = derive2 { name="ISRaD"; version="2.5.4"; sha256="0qp0rbqvbfhj4jhc0335wy5370a66c7mxd4sp7bczkk9cvykv6x3"; depends=[dplyr ggplot2 httr maps RCurl readxl rio rnaturalearth sf terra tidyr writexl]; }; + ISRaD = derive2 { name="ISRaD"; version="2.5.5"; sha256="02h64lqqkc7a9n4f0hkz29bvyzjzwc024qr22iqg4m429i41kc3r"; depends=[dplyr ggplot2 httr maps RCurl readxl rio rnaturalearth sf terra tidyr writexl]; }; ISS = derive2 { name="ISS"; version="1.0.0"; sha256="1ab830k0j4s88p31n7da46q2r2jzldpr7pnx168f88xfighj9k4y"; depends=[Rdpack]; }; ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; }; ITNr = derive2 { name="ITNr"; version="0.7.0"; sha256="0zpyrg4vcn17k75x1i1dp2hw8n2fp34qf4skywx3wrchjpxmsra8"; depends=[blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI xergm_common]; }; - ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; }; - ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; }; IVYplot = derive2 { name="IVYplot"; version="0.1.0"; sha256="1v739xlim3mcw09cyp4z3cbb25ipkpwm9h378fwy2ycp8lmq32gy"; depends=[plyr]; }; IceSat2R = derive2 { name="IceSat2R"; version="1.0.4"; sha256="1jwy1fwnc2rq3c643maa2h7hrwzq0sm6iv35kil95n3pw7pkgdy3"; depends=[data_table doParallel foreach glue httr leafgl leaflet leaflet_extras leafsync lubridate lwgeom magrittr miniUI rnaturalearth rvest sf shiny units]; }; IgAScores = derive2 { name="IgAScores"; version="0.1.2"; sha256="0ckqjbn0xc894dc23gbaqzr6z6rl5h0k8gc5gjhbhwvrc2zlyfsp"; depends=[]; }; + ImFoR = derive2 { name="ImFoR"; version="0.1.0"; sha256="10wm0wkcz85g94m4824fm6xy1mqk9syqr3rj5fx6bbs2mkh4wxca"; depends=[caret ggplot2 ggpubr Metrics minpack_lm nlme tidyverse]; }; + ImHD = derive2 { name="ImHD"; version="0.1.0"; sha256="0aawa3slyf2i05q73v8qicwkf80ry527c87z72anapy8nfzkija6"; depends=[e1071 ggplot2 randomForest reshape2 rpart xgboost]; }; + ImML = derive2 { name="ImML"; version="0.1.5"; sha256="1q4pwn47v0623qamzpsnldq4g5fhqd0bgkc5357h3588r9ahcdq3"; depends=[caret dplyr e1071 ggplot2 randomForest rlang rpart]; }; + ImNN = derive2 { name="ImNN"; version="0.1.0"; sha256="1xs5pfq4wfd26d8vdhl0zjynrjkzjmnyqx3gprn7dxk1i41r3bg1"; depends=[ggplot2 MLmetrics neuralnet]; }; Immigrate = derive2 { name="Immigrate"; version="0.2.1"; sha256="0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn"; depends=[pROC Rcpp]; }; ImpShrinkage = derive2 { name="ImpShrinkage"; version="1.0.0"; sha256="18ik1sl2628hcz37rkdq2fdbx1c6hs7svalsfc90w3ww0aijy91y"; depends=[]; }; ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.2"; sha256="06dywikscwvigcw50h9yd3fjf3h25ymkxphwy8r6n3v2nl9iba3m"; depends=[caTools matrixStats parallelDist Rcpp]; }; ImportExport = derive2 { name="ImportExport"; version="1.3"; sha256="07i7p9xha1f23r07lw87ak13hd4wavdvwh8vb8sg2gyvnpa5njwp"; depends=[chron gdata haven Hmisc readxl RODBC writexl]; }; ImportanceIndice = derive2 { name="ImportanceIndice"; version="0.0.2"; sha256="1rxjb4nmpwpf018k0rwf2gs993dz3dq120x0b78y4r8jkkccyphq"; depends=[crayon]; }; + ImputeLongiCovs = derive2 { name="ImputeLongiCovs"; version="0.1.0"; sha256="16paj3fq06dsh4hq4mv0wvrprzhw6mv3ysnf3iakgjb93bfbhr6p"; depends=[nnet]; }; ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InDisc = derive2 { name="InDisc"; version="1.1.0"; sha256="0halx4m503b9d4vk5y0qmx6qyvc6lwjr4ys4xdcj6bnzv8wi8ymw"; depends=[matrixStats psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; InSilicoVA = derive2 { name="InSilicoVA"; version="1.4.0"; sha256="15x6d928rk9in2swbaal6hcw2nikj153fgqyd7nhdkcbs1agrsl1"; depends=[coda ggplot2 InterVA5 rJava]; }; IncDTW = derive2 { name="IncDTW"; version="1.1.4.4"; sha256="0q8ssv86gbp3v6gznzm5vkc8qhny6ycbh85jg5z4izldpx8a4fq6"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; - IncidencePrevalence = derive2 { name="IncidencePrevalence"; version="0.4.1"; sha256="1h94ihbc1xz9zpbimc3kdljbh1man79qajqxf2bfww8n1scikiad"; depends=[CDMConnector checkmate cli DBI dbplyr dplyr ggplot2 glue lubridate magrittr purrr rlang scales stringr tidyr tidyselect zip]; }; + IncidencePrevalence = derive2 { name="IncidencePrevalence"; version="0.5.1"; sha256="0idzkhfy53p7b8c8j08m3qyg9s9ci3w21yxy9cm0dxli0kb4bmr0"; depends=[CDMConnector checkmate cli DBI dbplyr dplyr ggplot2 glue lubridate magrittr purrr rlang scales stringr tidyr tidyselect zip]; }; IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; IndGenErrors = derive2 { name="IndGenErrors"; version="0.1.4"; sha256="1iwq53vahcaa0cqmk8g0484drdlphips7p95z4rh6miv2bxjh8fa"; depends=[ggplot2]; }; IndTestPP = derive2 { name="IndTestPP"; version="3.0"; sha256="1z48pr8znbk1gdvjfdvszxlzhj7v88p3y7zhi1f0xw75dkfpnwwy"; depends=[]; }; @@ -2407,7 +2415,6 @@ in with self; { IndexNumR = derive2 { name="IndexNumR"; version="0.5.0"; sha256="15rjhzwygs4an51lxn66jlfww4j361b1jw4a6q3dz31bmlc9i5pg"; depends=[]; }; IndexNumber = derive2 { name="IndexNumber"; version="1.3.2"; sha256="0ff6fnkgbfwn3sasglr1aygvm9bawrvcj432xgka1vk28qnns0if"; depends=[]; }; IndexWizard = derive2 { name="IndexWizard"; version="0.2.1.0"; sha256="09qrnq8yzz4r8i7m696a1jzw91iiccwgj73176dabkh3pdrhrs3r"; depends=[]; }; - IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0.1"; sha256="1dxq1dsmrx9kx8vqxlbg22a91iv4skck4jhmmfk3kxi5znl121zc"; depends=[survival]; }; InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; }; Inflation = derive2 { name="Inflation"; version="0.1.0"; sha256="0ikhsslbg32kr9vcaxq8qwaa7ahiwvq91xwv53550wci2vyzmybp"; depends=[seasonal]; }; @@ -2435,47 +2442,46 @@ in with self; { InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.3.8"; sha256="0rw2zlqa3r0f4s0nji1k7lw23a9kg3ghb9gcifyh5q6k2308g6dc"; depends=[enviPat plyr]; }; IntervalQuestionStat = derive2 { name="IntervalQuestionStat"; version="0.2.0"; sha256="0pvz5l0pvw8akmvv51c48fx1ppms9iq6s4bwscja8jk56akx2wlq"; depends=[]; }; IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.2"; sha256="02l2r83mz4x9x40p8gxwyrqa25qk0cy22k39lv93plvcpadcs8a5"; depends=[Rcpp]; }; - InvStablePrior = derive2 { name="InvStablePrior"; version="0.1.0"; sha256="1nkbly897prbffdrcrxdvr16f6ipm3if1dg3rm35jcl2ksya6snd"; depends=[fdrtool nimble]; }; + InvStablePrior = derive2 { name="InvStablePrior"; version="0.1.1"; sha256="1wkb7rl6hqz0a45p7nlniaj9skc7gxhpbm0b7f377q6icm3xn3ld"; depends=[fdrtool nimble]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.8"; sha256="01ckyvjl9lxdpkr0v1da4n4lw3b5z1bxlmf0v6ibqly1mhfwybjl"; depends=[glmnet mboost]; }; InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; }; - Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; }; + Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0.1"; sha256="0x36pkr2f038cwdfqi03pljhg6xwhp7v97ymyqddb5lw5a0isw87"; depends=[e1071 GameTheoryAllocation]; }; Irescale = derive2 { name="Irescale"; version="2.3.0"; sha256="037bzli0zwlfbf5xmllqg2pi0shs33ggrnw69kzyw2sf780y3hs2"; depends=[e1071 fBasics ggplot2 imager Rdpack reshape2 sp]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="1.4"; sha256="1mwjrmqga7f0p5w2m4f0i6mb68jimx6791pz03r8iqj3yx0vzkh0"; depends=[Rcpp RcppArmadillo]; }; IrregLong = derive2 { name="IrregLong"; version="0.3.4"; sha256="0gavbvmn9m1kamlyg9sb5zxpwq9gc32xcz14m6aqqrdps2xyv3kn"; depends=[data_table geepack survival]; }; Iscores = derive2 { name="Iscores"; version="1.1.0"; sha256="01xv3003yni984dyn0iwnn3kkl05ij8j21cxbmj9jl9zbw44pzi1"; depends=[kernlab ranger]; }; - IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; - IsingSampler = derive2 { name="IsingSampler"; version="0.2.1"; sha256="1cs4vk53b5fy6kywvycfjf62571yx92nvgp5i8hlvms1362ir7gv"; depends=[dplyr magrittr nnet plyr Rcpp]; }; + IsingFit = derive2 { name="IsingFit"; version="0.4"; sha256="1pxpa3ji447csg1dp17x1y1071djjydl21c3zz2d3j3g6s6nmaqq"; depends=[glmnet Matrix qgraph]; }; + IsingSampler = derive2 { name="IsingSampler"; version="0.2.3"; sha256="195xl9ivdhpqbl291x3cji343lgg8wsy20yz71iv7cg6g5ni8vvx"; depends=[dplyr magrittr nnet plyr Rcpp]; }; Isinglandr = derive2 { name="Isinglandr"; version="0.1.1"; sha256="157l54xhvi2cqmw143243hl7371dgynp2phi6r969clsswg800sx"; depends=[dplyr gganimate ggplot2 glue magrittr plotly purrr rlang shiny shinycssloaders shinythemes simlandr tibble tidyr]; }; - Iso = derive2 { name="Iso"; version="0.0-18.1"; sha256="0vy6jdyvp751430sf2f690yhasjr70cpk3p3lnaaxjq3fs5gg99g"; depends=[]; }; + Iso = derive2 { name="Iso"; version="0.0-21"; sha256="19lgwbfbca30mh3hhnarzab5cvnrwnr0pxam6fvfnadnqzhjm15n"; depends=[]; }; IsoCheck = derive2 { name="IsoCheck"; version="0.1.0"; sha256="06g0srp14yiha95mbmifaqf5yr5ppjnc20nyr237ah3l776mhsif"; depends=[dplyr gtools plyr]; }; IsoCor = derive2 { name="IsoCor"; version="0.1.40"; sha256="191y51mg6kii4x99c7437888kkacml0ch53qh1gbwv10gl2c4w8z"; depends=[bsplus DT golem htmltools MALDIquant markdown plyr rmarkdown shiny shinyalert shinyjs]; }; - IsoCorr = derive2 { name="IsoCorr"; version="1.0"; sha256="0rhbclbpfd9d0dawbwwprlzx2j9k59gsmrb11yabiv5305b7vpx8"; depends=[]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="2.1.3"; sha256="0cy9y3lh20xxj9sah8s2zrwnbzk39s5xmscj4mskvn897bmlksh6"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="5.3"; sha256="034i7d01zqam1nyaqvvgg4gsllclw88fpia0il3m0sf3rh5s45km"; depends=[MASS]; }; - IsoplotRgui = derive2 { name="IsoplotRgui"; version="5.3"; sha256="00g8k06bd5l6nifks60bp23l9af2wrrvx93cs4kj0dkqqzd0y9hs"; depends=[IsoplotR shinylight]; }; - IsoriX = derive2 { name="IsoriX"; version="0.9.0"; sha256="0pm51jxw16264nf5wdpjhyydrb16ydyw76h45madw5nf6bibhgsp"; depends=[elevatr lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; + IsoplotR = derive2 { name="IsoplotR"; version="5.5"; sha256="04s8yfpp5mvfpx9crgg6yadvw8jrcnkjpl4v9ac01psmkzc4yk4p"; depends=[MASS]; }; + IsoplotRgui = derive2 { name="IsoplotRgui"; version="5.5"; sha256="13kavzp938kpa6n8nz1wkrbav0hxm87zcl2hlzqppmb4pcxklqd5"; depends=[IsoplotR shinylight]; }; + IsoriX = derive2 { name="IsoriX"; version="0.9.1"; sha256="0l7d66wjq30mldqy79pwqfp607qhkc2y7hzl6kjxxvqsial6zgwq"; depends=[lattice latticeExtra numDeriv rasterVis spaMM terra viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; IterativeHardThresholding = derive2 { name="IterativeHardThresholding"; version="1.0.2"; sha256="0vv8v61pzlykdyjivl19q8nr9p22c845y902yljgrvc9ayidczqm"; depends=[Cyclops ParallelLogger]; }; - IxPopDyMod = derive2 { name="IxPopDyMod"; version="0.2.0"; sha256="0qnxf9a0d9lmvna5rzmddp5gsq9scpk9aw0kamhbmrxbxaxm4q9l"; depends=[dplyr ggplot2 igraph magrittr readr rlang stringr tibble tidyr yaml]; }; - JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; - JATSdecoder = derive2 { name="JATSdecoder"; version="1.1.2"; sha256="0422liy1qyih0nrwmd1vmzlsk94axmvnraxgwyp4j87ip7qvxaak"; depends=[NLP openNLP]; }; + IxPopDyMod = derive2 { name="IxPopDyMod"; version="0.3.0"; sha256="1wg6m1sf8h157xi7nzml10k014dvnhcf0qyprqvasghiad7c2dc9"; depends=[checkmate magrittr]; }; + JADE = derive2 { name="JADE"; version="2.0-4"; sha256="0m90rnhr5vkdv1xswr5c0j06ngzvmg73nd0kmg9m9r6a6ddddcyl"; depends=[clue]; }; + JATSdecoder = derive2 { name="JATSdecoder"; version="1.2.0"; sha256="01nqj3w690gn4iqy35v215451agfx1dfgc5vbmmc5wp5r2rk2p09"; depends=[NLP openNLP]; }; JBrowseR = derive2 { name="JBrowseR"; version="0.10.0"; sha256="0siqg09lcjdkvqlywsp9fggn574f6yn207nda3q65n0p2xprl8ry"; depends=[cli dplyr htmltools htmlwidgets httpuv ids jsonlite magrittr mime reactR readr stringr]; }; JCRImpactFactor = derive2 { name="JCRImpactFactor"; version="1.0.0"; sha256="1i7853i8k03nq7ax9rypm9qcl5qgyddblgbfjp3yxi1s3a6bkwk1"; depends=[stringr]; }; - JFE = derive2 { name="JFE"; version="2.5.4"; sha256="0shbjggsnpn433k2yz40sq16hycxh6kj9y945vzxnf513jcmzwwl"; depends=[fPortfolio tcltk2]; }; + JFE = derive2 { name="JFE"; version="2.5.5"; sha256="11aybw7jmvg9fnihxl7l9w9294b4841x1nqq7csw3x1pbj40a4pj"; depends=[fPortfolio tcltk2]; }; JFM = derive2 { name="JFM"; version="1.0"; sha256="08655vgfb2ll8hwjsj5lsw4849rahn3blisdqn8bwfhclrwd24xn"; depends=[MASS randomcoloR Rcpp RcppArmadillo rgl RockFab Rvcg]; }; - JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; }; JGR = derive2 { name="JGR"; version="1.9-2"; sha256="1rcmbgxwzwhzh5fa0lghjdllcfkpirdavdghvxx5fjysn7a38mjv"; depends=[JavaGD rJava]; }; JICO = derive2 { name="JICO"; version="0.0"; sha256="08ah7bjwkxm8fdk1s0vj3lpc7dvgz9llyhh4z9xsgpf4w98rwsvb"; depends=[MASS Matrix nleqslv rlist]; }; - JLPM = derive2 { name="JLPM"; version="1.0.1"; sha256="0k63vi44vfb0k9nkqyhh3iymrca7p47xf2h4x2c4fi50v6bs3v2l"; depends=[marqLevAlg randtoolbox stringr survival]; }; + JLPM = derive2 { name="JLPM"; version="1.0.2"; sha256="0xagw84mgbqrdyz9h8d9fw2yibx7k9cp5y1pd8v835n4s10m8wx2"; depends=[lcmm marqLevAlg randtoolbox stringr survival]; }; JM = derive2 { name="JM"; version="1.5-2"; sha256="133s565gp18ddnbawhzix978p4yj11lp4vlaqs0dq52ww46f3byj"; depends=[MASS nlme survival]; }; JMH = derive2 { name="JMH"; version="1.0.2"; sha256="0085ka230hz9qxl7r907mwny9m5hdd15wnw7vy9j3z9c2lv2nhpb"; depends=[caret dplyr MASS nlme Rcpp RcppEigen statmod survival]; }; JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; JMbayes2 = derive2 { name="JMbayes2"; version="0.4-5"; sha256="0qdfp3r7wfy955f956jhryvxbnnw2zrnkqq931191z2v0xmird97"; depends=[coda ggplot2 GLMMadaptive gridExtra matrixStats nlme parallelly Rcpp RcppArmadillo survival]; }; - JMdesign = derive2 { name="JMdesign"; version="1.3"; sha256="0pa0j4hw5r3j94p2hhlb0qnsh1mvr1fdllqpkr50gci607ckv0g3"; depends=[]; }; - JOPS = derive2 { name="JOPS"; version="0.1.15"; sha256="01yaw657826vfsfdscv3aqgswb5s2054s755agfxqm7g6sswpa13"; depends=[boot colorspace fds fields ggplot2 MASS rpart SemiPar spam SpATS]; }; + JMdesign = derive2 { name="JMdesign"; version="1.4"; sha256="04nlxym4b339l70m0fd0r04m9lb6c7l8ajswhmy7dmix0sk99d3c"; depends=[]; }; + JNplots = derive2 { name="JNplots"; version="0.1.0"; sha256="0k46y9gi02m9z58qny1r0fa76nriw0llz9dc62x9vvy1x3qayw2j"; depends=[ape nlme scales]; }; + JOPS = derive2 { name="JOPS"; version="0.1.19"; sha256="0qnycf7yd1sas0v6jclmc1y0jq9bslqlf66mqyirpxcs2lsk0327"; depends=[boot colorspace fds fields ggplot2 MASS rpart SemiPar spam SpATS]; }; JOUSBoost = derive2 { name="JOUSBoost"; version="2.1.0"; sha256="0f3rr7aw20nvmlpqrq3wzgmr55lqdqhk3wphpqq7msgvaf1zrcl7"; depends=[doParallel foreach Rcpp rpart]; }; JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; @@ -2485,7 +2491,7 @@ in with self; { JSmediation = derive2 { name="JSmediation"; version="0.2.1"; sha256="1y6s8fwdyaixvqa1p8nn1jf75k2dgv4p9kv59rwjrckq70s026x2"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; JSparO = derive2 { name="JSparO"; version="1.5.0"; sha256="0n13arzf063x0sw0kmm86bny440jpijan4lh1ikxayrz2skg8zbz"; depends=[pracma]; }; JUMP = derive2 { name="JUMP"; version="1.0.1"; sha256="0i84vpzgs9bj0idxxjl885x818hq23drxy0h2pl6zbyz2z1v331m"; depends=[Rcpp RcppArmadillo]; }; - JWileymisc = derive2 { name="JWileymisc"; version="1.4.0"; sha256="1bgkhfda7p5alh8h2y804x5wvhksigg06hym9safxx15kmv1yxcn"; depends=[data_table digest emmeans extraoperators fst ggplot2 ggpubr ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; + JWileymisc = derive2 { name="JWileymisc"; version="1.4.1"; sha256="0anchmlgp4nwgr59k5ryi05fcq63d5b2aqs3nmnvr3p3rma16xq7"; depends=[data_table digest emmeans extraoperators fst ggplot2 ggpubr ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rlang rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-4"; sha256="1jm63w2jn89pk725x3d9myq010mb0g5ir8vhv29mkiwgrqig6iw1"; depends=[Rcpp]; }; JamendoR = derive2 { name="JamendoR"; version="0.1.1"; sha256="0rrfbci413mqq53p5fyj8rjangdx21iyin6hzqkxyrxrv3n5mfbx"; depends=[dplyr httr jsonlite]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-5"; sha256="1wl31k02x3j9hpf8c8gsmi3k3b3vz9a3y38pz6wa9r41r791rnr1"; depends=[rJava]; }; @@ -2495,24 +2501,24 @@ in with self; { JoF = derive2 { name="JoF"; version="0.1.0"; sha256="1my6fc4awrc822ibsvx3hiz4l49vp8dx0j05v56r7d27xizy8j0j"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; }; JointAI = derive2 { name="JointAI"; version="1.0.5"; sha256="1f1dmdrm8i7la2ydlcpnl0gk1yxdgf9x7s802mgp6hjplcrgzf3q"; depends=[coda future MASS mathjaxr mcmcse rjags rlang survival]; }; - JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; - Julia = derive2 { name="Julia"; version="1.3.4"; sha256="0fv2qdxn0nqr6i7y3q8kjqnyb66k63k4jcdrs0xq2h2rw5gxpfir"; depends=[]; }; + JointFPM = derive2 { name="JointFPM"; version="1.0.1"; sha256="01am0vsc1lqd9p81zlyliadghxlwjkpa11i2ksa7ymv20iyrcyja"; depends=[data_table lifecycle rlang rmutil rstpm2 survival]; }; + Julia = derive2 { name="Julia"; version="1.3.5"; sha256="0ynzxflz92y38z7bl9g8nhrgvz2ay716izpya398b29h4qfb1w4r"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.5"; sha256="036rxp2lygvpxpykpxx2lqyyzidzzi95lv6g30n70hzy0agjym4j"; depends=[knitr Rcpp rjson]; }; JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="1.1.1"; sha256="0chbax02l1p3qr0skvnxw1b8g7kf6s7sk2f3gj0ddl5kj6ls1p5n"; depends=[]; }; JustifyAlpha = derive2 { name="JustifyAlpha"; version="0.1.1"; sha256="0bd7sn4sn95kal5q2x1q78fsk1mhakr5fax3z6ny2yda2h266af9"; depends=[BayesFactor ggplot2 pwr qpdf shiny shinydashboard stringr Superpower]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; }; - KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; - KFAS = derive2 { name="KFAS"; version="1.5.0"; sha256="18lmfr2prb38l1ifgf9df4xc8glihlg08g3k682pas484kb411lh"; depends=[]; }; + KFAS = derive2 { name="KFAS"; version="1.5.1"; sha256="1kswy3ahd7ng8jhd1nl1x454ywqnlsgpxnzz0q2rll7hsl3xr4hj"; depends=[]; }; KFPCA = derive2 { name="KFPCA"; version="2.0"; sha256="1dzywxnp3ywg3zbvmacj3a1i7w5cg1g93a9ncl7ddwb7wqpzg6x1"; depends=[fda fdapace kader pracma]; }; KFPLS = derive2 { name="KFPLS"; version="1.0"; sha256="1bdba738mhsa6yw515fyaw96pycvflw596fh9dkhhns498lg7356"; depends=[fda]; }; KGode = derive2 { name="KGode"; version="1.0.4"; sha256="0q39x34rwya3pqhvly1g0n2ykzvwrwdpdnp3y3ya9cyai63l2sgn"; depends=[mvtnorm pracma pspline R6]; }; KHQ = derive2 { name="KHQ"; version="0.2.0"; sha256="1vg0p3igbw81fbp2gli9msqbvymbn0qf3g3y0nb3q51d7wfax0qd"; depends=[magrittr openxlsx]; }; + KLINK = derive2 { name="KLINK"; version="0.6.1"; sha256="0l0l9rncj0lqwmf0w7aisilqvj721gwx0lb5wh1ailxlznd6kp06"; depends=[forrel gt openxlsx pedmut pedprobr pedtools pkgload shiny shinydashboard verbalisr]; }; KLexp = derive2 { name="KLexp"; version="1.0.0"; sha256="1knnqzzywh6zcj60133a5bfzqqxmf86gn4m1kggm7gzv1k9mx90b"; depends=[glmnet]; }; KMD = derive2 { name="KMD"; version="0.1.0"; sha256="0sgcfh5b4dl1gy3dxsdsqgmyfrd6kqrzvxv9g4slskwyrjsirsp5"; depends=[boot data_table igraph mlpack proxy RANN]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; - KMunicate = derive2 { name="KMunicate"; version="0.2.3"; sha256="0qy3qh4jfmyznwy4lhia9xzvi5xh0id9xx12lsmd1blklaia4593"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; }; + KMunicate = derive2 { name="KMunicate"; version="0.2.4"; sha256="13pkhyzv47zp1zz43fs0frbjgbjylyandhrfnzzwryxpchrghpqh"; depends=[checkmate cowplot ggplot2 pammtools survival tidyr]; }; KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; }; KODAMA = derive2 { name="KODAMA"; version="2.4"; sha256="1rw5xjv5sblhj5mr31hgv472gial5bl4f288db07ysgkjqsymwkq"; depends=[minerva Rcpp RcppArmadillo Rtsne umap]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; @@ -2543,12 +2549,14 @@ in with self; { Keyboard = derive2 { name="Keyboard"; version="0.1.3"; sha256="1yfcn1r0zngc1nlj5axqps8an66p1q1qmxwagxq2q15d9qipb5wh"; depends=[ggplot2 Iso Rcpp]; }; KinMixLite = derive2 { name="KinMixLite"; version="2.1.0"; sha256="17kjb12r35b42ghkv6mp0jk115gn2dlwc8cdf92cm9jjn4k9am9a"; depends=[DNAmixturesLite gRaven gRbase Matrix numDeriv pedtools ribd Rsolnp statnet_common]; }; KingCountyHouses = derive2 { name="KingCountyHouses"; version="0.1.0"; sha256="17l415v290lm99rsifpk6324mm1sk79ns4cvjkyh9ibj8n7l44c1"; depends=[]; }; + Kira = derive2 { name="Kira"; version="1.0.1"; sha256="1hs782is31j4d19737lwdqaxdvprws9lv0x4v3wn07pcsais5wki"; depends=[MASS]; }; Kmedians = derive2 { name="Kmedians"; version="1.2.0"; sha256="10akh0jbnk7hrgqp414p66ddlhs6rdgd1ifjx18wpnfn4c81xcnj"; depends=[capushe doParallel foreach genieclust ggplot2 Gmedian mvtnorm reshape2]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; KneeArrower = derive2 { name="KneeArrower"; version="1.0.0"; sha256="1blmim4l7375psa9c3wbpksywj5nfbawly4001n6311wcv4dybl5"; depends=[signal]; }; + KnockoffHybrid = derive2 { name="KnockoffHybrid"; version="1.0.0"; sha256="0fzymcyb40v3bgd39a6nfxf4wrs171k655rx779q3vxb75nlnlnb"; depends=[glmnet SPAtest]; }; KnockoffScreen = derive2 { name="KnockoffScreen"; version="0.3.0"; sha256="01r04d9ha9l5pkz3lwdcb5x5qqwk8vil9avnbnfn76wg63mdfhbk"; depends=[bigmemory CompQuadForm data_table irlba Matrix seqminer SPAtest]; }; KnockoffTrio = derive2 { name="KnockoffTrio"; version="1.0.1"; sha256="1xm7hx6c8w305wk4qc6w3awc6pykn7b5v5lakpv9rkikn4c7rkrf"; depends=[]; }; - KnowBR = derive2 { name="KnowBR"; version="2.1"; sha256="0r4df95axsrsr72ksy3sdc37sjjd6fvcpj5si7jag7q7ffs8kzmw"; depends=[fossil mgcv plotrix sp vegan]; }; + KnowBR = derive2 { name="KnowBR"; version="2.2"; sha256="1w78rmrh4vgvgv3xf0s7w0zcw3y33l1h1gz6sma87xj8awpsp2l2"; depends=[fossil mgcv plotrix sp vegan]; }; KoboconnectR = derive2 { name="KoboconnectR"; version="1.2.1"; sha256="0mb539y80apxzzvfpgq4yj8vcjqnamkszn37p8bibr1yvfzdzy1j"; depends=[curl dplyr httr jsonlite mime openssl purrr R6 readxl rlang]; }; KoulMde = derive2 { name="KoulMde"; version="3.2.1"; sha256="0yx04my2vwjpi4l35h1i5xwqckca8b72divww39y1frcvia33g08"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; @@ -2563,6 +2571,7 @@ in with self; { LA = derive2 { name="LA"; version="2.2"; sha256="12fhkrjcj5304pdpgmf8iilxgy5vnixqj3zb87csa4m22ibpkah4"; depends=[Rcpp RcppArmadillo]; }; LAD = derive2 { name="LAD"; version="0.1.0"; sha256="0qms5w9fx0hqjiq2wirckay6x9v0h99h6dhahfkba4vcfa8vxnkx"; depends=[cowplot dplyr ggplot2 magrittr purrr rlang tidyr tidyselect]; }; LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.3"; sha256="03x2ghcpl1ibpic4msb1n3n8fqbxjnv357phlb2a7y5lmy4fb1ny"; depends=[curl dplyr httr lazyeval magrittr memoise progress purrr qs rappdirs rlang sf stringr tibble tidyr]; }; + LAIr = derive2 { name="LAIr"; version="0.1.0"; sha256="166j095mmqsbcxpyljp18khbrcqnjml1m2sdcjdxycih0s6wycry"; depends=[dplyr purrr stringr terra]; }; LAM = derive2 { name="LAM"; version="0.6-19"; sha256="1bns8m48rlkv1d87wvhlvkplr8kpm2rda5wb9xcvjqr7bf65nk8b"; depends=[CDM Rcpp RcppArmadillo sirt]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LARisk = derive2 { name="LARisk"; version="1.0.0"; sha256="13d008v8aypqlx35bf16y7rcfcv5qnbsi8q0zpfcl03rzxmqpb8b"; depends=[dplyr Rcpp]; }; @@ -2579,16 +2588,18 @@ in with self; { LCMSQA = derive2 { name="LCMSQA"; version="1.0.1"; sha256="12h9gnw64q5y0b6a9n3184dj5rdmqv2qsskpazgj9pgb5v3kagsp"; depends=[bslib bsplus data_table DT ggplot2 plotly shiny shinycssloaders shinyjs shinyWidgets]; }; LDABiplots = derive2 { name="LDABiplots"; version="0.1.2"; sha256="0vcc2s0qyib9l7sdflxbfanraxw5hqjlp24v8yg3z9i65y5gzbaw"; depends=[chinese_misc dplyr DT factoextra ggplot2 ggrepel glasso highcharter htmlwidgets ldatuning Matrix qgraph quanteda rvest shiny shinyalert shinyBS shinybusy shinycssloaders shinydashboard shinyjs shinyWidgets SnowballC stringr textmineR textplot tidyr topicmodels]; }; LDAShiny = derive2 { name="LDAShiny"; version="0.9.3"; sha256="0iql2fcg7fkyggdwmb6mhn54vhki6v206mkc5km41fjiqss2b4ni"; depends=[beepr broom chinese_misc dplyr DT highcharter htmlwidgets ldatuning plotly purrr quanteda shiny shinyalert shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets SnowballC stringr textmineR tidyr tidytext tm topicmodels]; }; - LDATS = derive2 { name="LDATS"; version="0.2.7"; sha256="0im5lvhfbxvrkz9yvfg5xibzdlss869rdz5mixr4ric9lj0ixx0g"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; }; + LDATS = derive2 { name="LDATS"; version="0.3.0"; sha256="0qgn20a7n56y6n8bray39jxz79rkq1j1gqhb99ggnad7jfh2l41q"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; }; + LDATree = derive2 { name="LDATree"; version="0.1.2"; sha256="1cn1b6wbfmgg1agjl2jwwshfdg1nmg8y46z00ascnp5myxylcga1"; depends=[ggplot2 lifecycle magrittr scales visNetwork]; }; LDAandLDAS = derive2 { name="LDAandLDAS"; version="1.1.1"; sha256="0p4q4n6hhsy9jmxg91cpxw8qhf4644rbflghfgwhdhhxnxzdhg9l"; depends=[Rcpp]; }; + LDAcoop = derive2 { name="LDAcoop"; version="0.1.1"; sha256="1a2935kqd7pxdpgc1v6inx9z963dd33scc9viwdfbd0s6vlj8lq8"; depends=[Hmisc]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; LDLcalc = derive2 { name="LDLcalc"; version="2.0"; sha256="1x3g95fi7lhcqb9jbvr6v0xhfy44migf81avfnnvf3asz1gqnajr"; depends=[caret caretEnsemble corrplot data_table ggplot2 janitor lares lattice moments philentropy RColorBrewer resample sets]; }; + LDM = derive2 { name="LDM"; version="6.0.1"; sha256="1943kw0aznjv82wps952wcab8jh7wh3hkav59q6xgk9zmf4day1d"; depends=[BiocParallel castor GUniFrac matrixStats modeest permute phangorn vegan]; }; LDNN = derive2 { name="LDNN"; version="1.10"; sha256="092mnjdmc0l471vd8nym09r9sfx1scp4x6nh22mj6413vaicagq0"; depends=[devtools keras reticulate tensorflow]; }; - LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; + LDRTools = derive2 { name="LDRTools"; version="0.2-2"; sha256="0ll6przymxa98drwp0lq4mlar4blj6cig91mf2avifmp2aqfmk6c"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.3"; sha256="0wr8i9q9p48vpcia8v3rd8bb2pfijr9r6kg9x26k4wncpg7n83cp"; depends=[]; }; LDlinkR = derive2 { name="LDlinkR"; version="1.3.0"; sha256="0al36cdq7g14fqvxb1c26ih269704f8m0kyky526ravbgf0ydnw1"; depends=[httr]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; - LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; LEGIT = derive2 { name="LEGIT"; version="1.4.0"; sha256="1ynzm630c3wl8y9j058qgdkss5ngmmylhdw13032v53pss0vwlx3"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators lme4 pROC RColorBrewer snow]; }; LFApp = derive2 { name="LFApp"; version="1.3.1"; sha256="1vvlf3bwxkyl9gyzswc4wd201pav1q2hfbhwmiic4j4d8azsd2r8"; depends=[DT EBImage fs ggplot2 mgcv shiny shinyFiles shinyjs shinyMobile shinythemes]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; }; @@ -2600,7 +2611,7 @@ in with self; { LHD = derive2 { name="LHD"; version="1.3.3"; sha256="0wqjf0wl0l3kq7i030qjzdavsn75jmghjvzk76b9d22fhk356yh8"; depends=[numbers]; }; LIC = derive2 { name="LIC"; version="0.0.2"; sha256="01wqx3mqq0rz4m0zp07ln6d396fz7xcwm37kn8js26ravyhiipdq"; depends=[]; }; LIM = derive2 { name="LIM"; version="1.4.7"; sha256="0d9bgyd0mnag8wds993dsvlbpkhyakydlzwc3nghxzv2n8504hjj"; depends=[diagram limSolve]; }; - LINselect = derive2 { name="LINselect"; version="1.1.3"; sha256="1qxqwph5ja2kf1s4ggsv8w6hjgf9mr53a0gahhjix2v78309z42g"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; + LINselect = derive2 { name="LINselect"; version="1.1.4"; sha256="0av5bcg8n92abxfxyc694g5zx4i9j83bvg8p63i155rhid5k9bsp"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; LKT = derive2 { name="LKT"; version="1.5.0"; sha256="1hpvg10kj4c8cixpvgyp9wzy7h6fv02y9zf6rbply537lyni2igb"; depends=[cluster crayon data_table glmnet glmnetUtils HDInterval LiblineaR lme4 Matrix pROC SparseM]; }; LLM = derive2 { name="LLM"; version="1.1.0"; sha256="0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx"; depends=[partykit reghelper RWeka scales stringr survey]; }; @@ -2611,7 +2622,7 @@ in with self; { LMMsolver = derive2 { name="LMMsolver"; version="1.0.5"; sha256="14ppnj23l7rh71pkw97qcb31las10ra8ydlbpm6s8q18c21lpvm5"; depends=[agridat ggplot2 maps Matrix Rcpp sp spam]; }; LMMstar = derive2 { name="LMMstar"; version="0.9.0"; sha256="137lvwy2sm7ldi62jmhnlxa788636q35g7i68qnn9v6gnjd7q9v3"; depends=[copula emmeans ggplot2 lava Matrix multcomp nlme numDeriv pbapply rlang sandwich]; }; LMN = derive2 { name="LMN"; version="1.1.3"; sha256="0qnc74m2g4fl1cb39xmanvv1hwcnk0169xn4h4phlhxgr0313m63"; depends=[Rcpp RcppEigen SuperGauss]; }; - LMest = derive2 { name="LMest"; version="3.1.1"; sha256="08s99l1460gmw6477p44ad9q7gsll9x3srnlhrf0j0pplf0x2s0k"; depends=[diagram Formula MASS mclust mix MultiLCIRT mvtnorm scatterplot3d]; }; + LMest = derive2 { name="LMest"; version="3.1.2"; sha256="0a9lch9bylhy5r4v865lwzzz9qqi98na8bfnr5ga8kzy7akbnza0"; depends=[diagram Formula MASS mclust mix MultiLCIRT mvtnorm scatterplot3d]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.3.1"; sha256="1ncx8kqnh43zxffy7rba1xjb3ar3qi1rzmnwpl6vldijajmnjrv8"; depends=[MASS]; }; LMoFit = derive2 { name="LMoFit"; version="0.1.6"; sha256="10xiaa5h8c0sq9z70yjs29z8jnjyqgybdv33d6s2100h3n46jd31"; depends=[ggplot2 lmom pracma sf]; }; LNIRT = derive2 { name="LNIRT"; version="0.5.1"; sha256="0w32qvz5mhzg6f8050p57v26amn6d2il2icjfiypf7yi3gsx7w09"; depends=[MASS]; }; @@ -2624,7 +2635,7 @@ in with self; { LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; LPCM = derive2 { name="LPCM"; version="0.47-3"; sha256="19ak8n52drjip0p9343g0vqgg2cv3yz2lc82basr84r3p3v6r3x3"; depends=[]; }; - LPDynR = derive2 { name="LPDynR"; version="1.0.2"; sha256="0vlrx4dbv62b89xbmsp24iyn4wiq3695szbli18baf2qj2nbmnym"; depends=[data_table dplyr magrittr raster rgdal virtualspecies]; }; + LPDynR = derive2 { name="LPDynR"; version="1.0.4"; sha256="1ghiy5cc3s4bc2vrl2kxhpa9hvcp37hbdx56mligggk504w6mphy"; depends=[data_table dplyr magrittr terra virtualspecies]; }; LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; LPKsample = derive2 { name="LPKsample"; version="2.1"; sha256="0ifhx8w9f6sacmnck2g7i7r742i8bwwzf0rgajw3klw2wni9ikqx"; depends=[apcluster igraph LPGraph mclust]; }; LPM = derive2 { name="LPM"; version="2.9"; sha256="0gmymzq6khcnhzv1qnysrd1rdacynys1v95rq7970w6ai87z9w80"; depends=[fracdiff MASS powdist]; }; @@ -2637,11 +2648,10 @@ in with self; { LREP = derive2 { name="LREP"; version="0.1.1"; sha256="1dh6f12zvm8ff7vkl118bygyly68rdw6bqf2isjd01ji7d4w70cj"; depends=[]; }; LRMF3 = derive2 { name="LRMF3"; version="0.1.0"; sha256="0j9hnin3yic118766if6gysq0g4mkqw40b0873g4ggjkgxndxrqn"; depends=[glue Matrix]; }; LRQMM = derive2 { name="LRQMM"; version="1.2.3"; sha256="149z6wggyz9p39vanw5m2iw5v69spxdj8ciarrswj5ddvkli7940"; depends=[GeneticsPed kinship2 Matrix MCMCglmm quantreg R_matlab rsvd SparseM sparsesvd]; }; - LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; - LRTesteR = derive2 { name="LRTesteR"; version="1.1.0"; sha256="0wq4kjldrvc5m035qfmgpvfqlk50iji7ckgilnxqqiws8mmxjyic"; depends=[rlang statmod]; }; + LRTesteR = derive2 { name="LRTesteR"; version="1.1.1"; sha256="00p9mnlnj2md14c7vhhfs6bq0f2dwhb7r4dxjv6d1b62vfr2v4iv"; depends=[rlang statmod]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; LS2W = derive2 { name="LS2W"; version="1.3.6"; sha256="0qsrf9x45z0waiv10fh0a8rw0zyr5raj6l832yhq76vd9gjfpn9i"; depends=[MASS wavethresh]; }; - LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-4"; sha256="1y5q5sqzx3iwxdmxf6yz5c3hbw7sihxgr8sibr0v8s9dc6r4a2sf"; depends=[LS2W matrixStats spdep]; }; + LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-5"; sha256="194mqp5v0hm1h97f6d5zdj5526329r55pjf9a4azrv5cmcnmwgjv"; depends=[LS2W matrixStats spdep]; }; LSAfun = derive2 { name="LSAfun"; version="0.6.3"; sha256="1jsn3la2qfnvb5z2abx567zp8wrz5122ifgfzibw6fag6s3kl9ym"; depends=[lsa rgl]; }; LSAmitR = derive2 { name="LSAmitR"; version="1.0-3"; sha256="1c2i9wy72v9923ngkipwmc49nc6r3znibadgffzkhci583ib55ym"; depends=[Hmisc lme4]; }; LSD = derive2 { name="LSD"; version="4.1-0"; sha256="17pbdlcbhzf3v7l42mjikln1ga5xjp5r78gjg6a88iahk0lwwlvm"; depends=[]; }; @@ -2657,22 +2667,24 @@ in with self; { LSVAR = derive2 { name="LSVAR"; version="1.2"; sha256="0lhx9a5l3s2c5isd3fhvxxfdazdxddpkg07hk4rckvhmxln7j1dj"; depends=[igraph mvtnorm pracma]; }; LSWPlib = derive2 { name="LSWPlib"; version="0.1.0"; sha256="1z4lcpmbm3wdzbi04flvspkimk4jfhjqi5pd0ab4pbb0ii1z26hs"; depends=[waveslim wavethresh]; }; LSX = derive2 { name="LSX"; version="1.3.1"; sha256="043w10fm0dbafckjbb08h9zp30fm2q45ifz0b4w7jzzv6a6ngxmp"; depends=[digest ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; + LTAR = derive2 { name="LTAR"; version="0.1.0"; sha256="0jn0fym0v6j9c7pam1samafph9fiqrdr141n3mqj9xks0vaqrqqh"; depends=[gsignal rTensor rTensor2 vars]; }; LTASR = derive2 { name="LTASR"; version="0.1.2"; sha256="1cq00w9pg4mmgsg7ydm9azr0f9hgxa7vskpfrmh90j6xixqmpn4c"; depends=[dplyr knitr lubridate magrittr purrr readr rlang stringr tidyr XML zoo]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2.1"; sha256="0sdsdx71mpian7gfw7brkzyjjr7bai7dsdifwnib3jpq9p7w7n84"; depends=[]; }; + LTRCforests = derive2 { name="LTRCforests"; version="0.6.5"; sha256="0mrl70pgkihxa62g5fldszy6hwqc4vkg3mwxqhh4cin9h0930zxd"; depends=[ipred partykit prodlim survival]; }; LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.1"; sha256="1k16m2fpwn8m4dvm1b82srf3bgkvkwf6kcjpwjgkdappifc7p5m8"; depends=[icenReg Icens interval inum partykit rpart survival]; }; LUCIDus = derive2 { name="LUCIDus"; version="2.2.1"; sha256="00qzx94hwkhm5yszkx1wkj592img5n504ybld272x0wps2bk6snp"; depends=[boot glasso glmnet jsonlite mclust mix networkD3 nnet progress]; }; LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; - LWFBrook90R = derive2 { name="LWFBrook90R"; version="0.5.2"; sha256="1n6jmp3dfx97gzr0kl29ljdcv3s4d9j4i2azqqhvfja2azgv2w86"; depends=[data_table doFuture foreach future iterators parallelly progressr vegperiod]; }; + LWFBrook90R = derive2 { name="LWFBrook90R"; version="0.5.3"; sha256="10fr3p6lgym5dlz92867yq1drv2ygx4nq8zkap5756khv0drf8za"; depends=[data_table doFuture foreach future iterators parallelly progressr vegperiod]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; LaF = derive2 { name="LaF"; version="0.8.4"; sha256="1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p"; depends=[Rcpp]; }; LabApplStat = derive2 { name="LabApplStat"; version="1.4.4"; sha256="0wiyfrk5dfd2djgg461qxhk7zrpwhiagkjcr36w7fbrgibbnmm54"; depends=[emmeans ggplot2 ggraph vctrs]; }; LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.3.1"; sha256="1wdfcqjzjc0vwgzv85dfny2r3gsi26wmk85s75bz6hbnwp836sav"; depends=[data_table maptools rgdal rgeos sp spdep tmap]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.4"; sha256="0cifbfijrb80q8xsj7jc6klv78k7sf820d2g5ag2i1lk1vxahwc4"; depends=[data_table sf sp spdep tmap]; }; LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; }; Lahman = derive2 { name="Lahman"; version="11.0-0"; sha256="0jzxk9ykjm4mxwf2adqdy6gbv80569ynkqsrppfn8ag9d5a3k8bv"; depends=[dplyr]; }; LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.5"; sha256="09j4k5r441jpbxv9x6j9j5mlcl7yh2ydhfy55wx614wdlv862jn9"; depends=[plyr rLakeAnalyzer]; }; - LambertW = derive2 { name="LambertW"; version="0.6.7-1"; sha256="0cdrq2nrvji8l5blswkffymm7cbjk5jzzx16js2a516cm3gjwxk4"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; + LambertW = derive2 { name="LambertW"; version="0.6.8"; sha256="10lqsz44ndm8pl8z75j35fzd1s313q09rs9bs3lkym8d43k50pha"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; Landmarking = derive2 { name="Landmarking"; version="1.0.0"; sha256="1gkfv1xcjkbh417kv9dkflfg6agvgrd893v8ams25c2pazfmrmnz"; depends=[dplyr ggplot2 mstate nlme pec prodlim riskRegression survival]; }; Langevin = derive2 { name="Langevin"; version="1.3.1"; sha256="0sg3way9hlk875dfwbby59qm5dxwq7d763a0xjgjwaygpwqc83kz"; depends=[Rcpp RcppArmadillo]; }; LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; @@ -2693,7 +2705,8 @@ in with self; { LearnClust = derive2 { name="LearnClust"; version="1.1"; sha256="0r2ns1bnsygc6jhr83v1ylfp8fkn3j76233zk5cwsxrq0grx5iqs"; depends=[magick]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.5"; sha256="1pnxiwjkdj78p4hkl1lqagmd937q63yncb45fcra28sa9v9psrcs"; depends=[]; }; LearnPCA = derive2 { name="LearnPCA"; version="0.2.0"; sha256="0b7g12mcmbxrh2zywgk5n4w7ix0pwf074r3ch5ak0h8cwd26zmqz"; depends=[markdown shiny]; }; - LearningRlab = derive2 { name="LearningRlab"; version="2.3"; sha256="1103ym1lz315f092m0sm4zdpd5ydnwc8d1n69w9m2lilrz0a47yn"; depends=[crayon magick]; }; + LearnSL = derive2 { name="LearnSL"; version="1.0.0"; sha256="0iqw9hj5066yj4ij7v1dfdvn0q3y4wjwwznhilgsyvlbr0lj642b"; depends=[cli]; }; + LearningRlab = derive2 { name="LearningRlab"; version="2.4"; sha256="0wjmdmj9c96fz83nnh9np3xlpbgdq7z0bjp020gidyw0cmfjqddf"; depends=[crayon magick]; }; LearningStats = derive2 { name="LearningStats"; version="0.1.0"; sha256="0xrrb6jws4zj2nwnn30g338bib49b7j26v52ym7p2variwllz068"; depends=[data_table haven readODS readxl]; }; LexFindR = derive2 { name="LexFindR"; version="1.0.2"; sha256="16ikw3s034zqgfcp2hiyhv1nq5kp65wpq1d8fclrlqiabilyk7x4"; depends=[]; }; LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.7"; sha256="1cap4q1afv8mbbjn1n5n6np7s9rjmw1647n8v5k0knwn4a4hchi1"; depends=[data_table pbapply quanteda quanteda_textstats stringdist stringi tibble]; }; @@ -2704,6 +2717,7 @@ in with self; { LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; }; LifeInsuranceContracts = derive2 { name="LifeInsuranceContracts"; version="0.0.4"; sha256="02mk8n9rpnbbcgsq7j4b7arm28q1cnwwsswbf7cicahqi1gm3m4z"; depends=[abind dplyr kableExtra lubridate MortalityTables objectProperties openxlsx pander R6 rlang rmarkdown scales stringr tidyr]; }; LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; }; + LifemapR = derive2 { name="LifemapR"; version="1.0.4"; sha256="0mf6xgzvk5gc7n7w26drxf41h235ygkpylrf20gwifi2rz3lbs8k"; depends=[dplyr htmltools jsonlite leaflet leaflet_minicharts purrr rlang shiny]; }; LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; LikertMakeR = derive2 { name="LikertMakeR"; version="0.1.5"; sha256="1ia8nffc0802wi5x1a557gidx745jzj8742jq8ny26bahbbn941x"; depends=[DEoptim]; }; LilRhino = derive2 { name="LilRhino"; version="1.2.2"; sha256="1b3wbnzqakjxh3c3s4cxf14nnb1vrbvslqcyn9bh0zbw1arf5ixl"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi tm]; }; @@ -2726,7 +2740,6 @@ in with self; { LobsterCatch = derive2 { name="LobsterCatch"; version="0.1.0"; sha256="186h2727ii7y2x8wmvx7favrhg4pwv4ijf7zvjg6vh7lnj365cfb"; depends=[]; }; LocKer = derive2 { name="LocKer"; version="1.1"; sha256="034r6215aigb5hdm2a7cs8qw3nikjdjqnqpn1g27p3lxwfp0n3pr"; depends=[fda Matrix psych]; }; LocalControl = derive2 { name="LocalControl"; version="1.1.3"; sha256="0pi5z3i5hmb8nrqg6nyqrd4hx80xjgc5m3ra1z5r8rvjhw4mz0ik"; depends=[cluster gss lattice Rcpp]; }; - LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.4"; sha256="1slkhgac7izkmp5g203lhzvh991mnqf2qz1m0nd1k89084wvkv7b"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="3.0.0"; sha256="1407vkcdphy5pb4sgy2ms36vjffiwg2l2753gbszm9wv2m0wrnv4"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-8"; sha256="1d20shva9sqdcmij0da61f9vzaz6nnw4dylribc9lsnjm3qf2079"; depends=[MASS mclust mvtnorm]; }; @@ -2750,21 +2763,22 @@ in with self; { Luminescence = derive2 { name="Luminescence"; version="0.9.22"; sha256="1j7wj6mm38dfdjrqsha9qrar2jclcxa6d7mrs7kx495g1pkbgn1y"; depends=[bbmle data_table DEoptim httr lamW matrixStats mclust minpack_lm plotrix Rcpp RcppArmadillo readxl shape XML zoo]; }; M2SMF = derive2 { name="M2SMF"; version="2.0"; sha256="160qjrb3mxybvr4z6zra6rzf6scyrb9mplw36gqlfxj418ndnmm1"; depends=[dplyr MASS]; }; M2SMJF = derive2 { name="M2SMJF"; version="1.0"; sha256="0v4sg5h3h2pjp996jspv206c8cymjpn1fg38ivaw12s7bmx8j409"; depends=[dplyr MASS]; }; + M3JF = derive2 { name="M3JF"; version="0.1.0"; sha256="0sz02cis8xh11fyng44j6al2fkz6ybcabdgg25bbwb3vidf1y197"; depends=[dplyr InterSIM MASS SNFtool]; }; MAAPER = derive2 { name="MAAPER"; version="1.1.1"; sha256="05jjfnp1hwg8pk06np6fbdfxi6zn60wzhrkzlh8jkqgwxjhgnvai"; depends=[GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges MASS Rsamtools]; }; MABOUST = derive2 { name="MABOUST"; version="1.0.1"; sha256="044k29nibl5zc32zz2696kbhrz5dafgaikgmjqznsq25p48si453"; depends=[Rcpp RcppArmadillo]; }; MACER = derive2 { name="MACER"; version="0.2.1"; sha256="02qqcaccw671773lp1zva340fd6wqbsx9v0yxy62cbjnyh3k260r"; depends=[ape ggplot2 httr pbapply png rentrez]; }; MACP = derive2 { name="MACP"; version="0.1.0"; sha256="097qqqv0xmkm8cc5a2zr96lnnrkw92nzr3cj4sfnfa6whlpi72fn"; depends=[caret dplyr fmsb ggplot2 Hmisc igraph lsa pROC PRROC stringr tibble tidyr WGCNA zoo]; }; - MADPop = derive2 { name="MADPop"; version="1.1.5"; sha256="0r2yicpzcahx1bw93j0z601hzkcyknvf3657qm76lxsw0lb4lj1r"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - MAGEE = derive2 { name="MAGEE"; version="1.3.0"; sha256="0zgzns4vjr70p1wczar28dmkx8yms74z7vq1c4k30prjfsi1335r"; depends=[CompQuadForm data_table foreach GMMAT MASS Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; + MADPop = derive2 { name="MADPop"; version="1.1.6"; sha256="136x5shddix3qzr841hx5q5qc1cnm63j4d35h3km5ydw3qki9cyd"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + MAGEE = derive2 { name="MAGEE"; version="1.3.1"; sha256="0b7shd8yx1zzv7ry3qd71zazkzpdqjgc5q3n8ql96k64avp4628f"; depends=[CompQuadForm data_table foreach GMMAT MASS Matrix Rcpp RcppArmadillo]; }; MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.4"; sha256="1asr18byrgy6bkpxpmnkczgr3dam6ymf30lw6izq112krc891bg4"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; MAINT_Data = derive2 { name="MAINT.Data"; version="2.7.1"; sha256="0hjrz25jg4a6kcap01rjjgfvvmg1padd57wgjxihaxpsm7pb0fq9"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn withr]; }; MAKL = derive2 { name="MAKL"; version="1.0.1"; sha256="0xljmnwl8v3y68xmfm5vbycsa5y5yi0p0n207hg7zjvfaf6gbfhj"; depends=[AUC grplasso]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.22.1"; sha256="0721j8lzv6ywv0hf8rjw446dmvl18gm5ymf5a35fg9vnprfsalha"; depends=[]; }; - MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.13"; sha256="0xxdvfg9h6vl2g2wlxfmrskn8576rd958mn5jblryyqg9xbanlhr"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; + MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.14"; sha256="1lf9kl97grql3hyrcx2qa5ms9r3hb4y8mymja66nizm8dg12vp68"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MALDIrppa = derive2 { name="MALDIrppa"; version="1.1.0-1"; sha256="1gm5w614r66av6bvfiad5964hsr6hb0c03c90ck9lb251bns98wm"; depends=[lattice MALDIquant robustbase signal waveslim]; }; MAMS = derive2 { name="MAMS"; version="2.0.1"; sha256="1mrdn9klqjpf74wvb5brm79jy260qb1n12rpqmqd38i5hrkpcqsx"; depends=[future future_apply mvtnorm]; }; MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; - MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.5.3"; sha256="0gdyd7avdc7jh1hp03wlbqi5krijxrgargkivq97qyk83zf387dx"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; }; + MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.5.4"; sha256="03y6qzbh696h282pq8as2zy16y7j95d04qvn3labivd5qygfwfhp"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; }; MAP = derive2 { name="MAP"; version="0.1.3"; sha256="19d0m30jh50ibbdgvcvq1vsz5i1vf8qvl0d0nbqklvnndch61jhk"; depends=[flexmix Matrix]; }; MAPA = derive2 { name="MAPA"; version="2.0.5"; sha256="09szm5ilxfg893smh72yhbv306lwr3cy1jq7pghg0mipha6wgdxp"; depends=[forecast RColorBrewer smooth]; }; MAPITR = derive2 { name="MAPITR"; version="1.1.2"; sha256="0vmsdspja4qfs2z14p835g78zggk8h54v25cn268z1hg2p6zxish"; depends=[CompQuadForm doParallel Rcpp RcppArmadillo]; }; @@ -2788,15 +2802,15 @@ in with self; { MBC = derive2 { name="MBC"; version="0.10-6"; sha256="1680lnzga21qk5yddrciiaifxkkb9kk744m9fbj0hg5xw6v9dxic"; depends=[energy FNN Matrix]; }; MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; }; MBESS = derive2 { name="MBESS"; version="4.9.2"; sha256="0cq4z7nx361rcw42jflrrdjbqs2q5973dlvhcr7i2wbkj3gzkwla"; depends=[boot lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="2.2.2"; sha256="1z5jg4gb9jkc7cjy0413zj3lszqb28zx39bfmk59lls9d016iaak"; depends=[class geometry mgcv mvtnorm randtoolbox raster]; }; - MBMethPred = derive2 { name="MBMethPred"; version="0.1.4"; sha256="0wpnihv3sc6g0yj3f4iwaabi7sj3nrq14sicgy5gnpfvn8yjj4wy"; depends=[caret caTools class dplyr e1071 ggplot2 keras MASS pROC randomForest readr reshape2 reticulate rgl Rtsne SNFtool stringr tensorflow xgboost]; }; + MBHdesign = derive2 { name="MBHdesign"; version="2.3.15"; sha256="03v6809drwjwr9xk19pr4n5wnqy5kh3vizfk0mlml3sn40fg3kxj"; depends=[class geometry mgcv mvtnorm randtoolbox terra]; }; + MBMethPred = derive2 { name="MBMethPred"; version="0.1.4.2"; sha256="0qpflcydkf2k8a7kqklvp7mskppviqkffkr98rfsklk8iqf8x9c9"; depends=[caret caTools class dplyr e1071 ggplot2 keras MASS pROC randomForest readr reshape2 reticulate rgl Rtsne SNFtool stringr tensorflow xgboost]; }; MBNMAdose = derive2 { name="MBNMAdose"; version="0.4.2"; sha256="1iar3xqj8458nh0lb2nc566zsdglvrvbxb6xz7yd1nny5aqdxdm3"; depends=[checkmate dplyr igraph magrittr R2jags Rdpack reshape2 rjags scales]; }; - MBNMAtime = derive2 { name="MBNMAtime"; version="0.2.3"; sha256="0i4bgfzdxy4xap3yalphkbsq5pz0yl407nvkns6q3f0y90maq29r"; depends=[checkmate dplyr gridExtra knitr magrittr R2jags Rdpack reshape2 rjags]; }; + MBNMAtime = derive2 { name="MBNMAtime"; version="0.2.4"; sha256="1ny438dy62zrafyf7nng2hq5v311l1zc5xd39452fgq6ij0rnrni"; depends=[checkmate dplyr gridExtra knitr magrittr R2jags Rdpack reshape2 rjags]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBSP = derive2 { name="MBSP"; version="4.0"; sha256="1rfjykm2363m67ycm9vsxnddcsmlqxg5gx8sfg9ma8alwnh0s3fb"; depends=[GIGrvg MCMCpack mvtnorm]; }; MBmca = derive2 { name="MBmca"; version="1.0.1-3"; sha256="08ls1rc440jjmbwm6nx09xyr8nb8q6wwid0dyvb97fv4l85qwn19"; depends=[chipPCR robustbase]; }; MCARtest = derive2 { name="MCARtest"; version="1.1"; sha256="15by2cs73fpsfcd5jh39yiwbxppydjph04xmm51fd50hmcwb67mr"; depends=[Epi gtools highs lpSolve Matrix rcdd Rcpp Rdpack]; }; - MCAvariants = derive2 { name="MCAvariants"; version="2.6"; sha256="19wnkk7bknj5yd0s63ssybyzbs7x022wyr444hlinw8b181x57f3"; depends=[ggplot2 ggrepel gridExtra plotly]; }; + MCAvariants = derive2 { name="MCAvariants"; version="2.6.1"; sha256="0hsm60z1xkjda74f1ab3m5d2l9rv5r88ms7fi0bndrys6dd9fzgl"; depends=[ggplot2 ggrepel gridExtra plotly]; }; MCBackscattering = derive2 { name="MCBackscattering"; version="0.1.1"; sha256="0vvcqjrh8psl480s4q2830rzm2bwy9mmvk9kipp72lzln51qnha6"; depends=[]; }; MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; MCID = derive2 { name="MCID"; version="0.1.0"; sha256="034r4qxbqnl9hhkpv9r79p26lzj5qh0379ya43ynyvbbi8b8z3rl"; depends=[]; }; @@ -2809,7 +2823,7 @@ in with self; { MCMCpack = derive2 { name="MCMCpack"; version="1.6-3"; sha256="1cwdjn43b9hxpxf9mnas583myhk6r2258mh57f0zsc8bd4hbl56b"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; }; - MCMCvis = derive2 { name="MCMCvis"; version="0.16.0"; sha256="0sp6fpbsh485yybhxpaffvjbx4yybxkd7lj6haq8q02h2sjdy02c"; depends=[coda colorspace overlapping rstan]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.16.3"; sha256="06a4dp5b33sqmrm6x64qaz6v7hn5lhqqygrx62gzpqj6v3yvcbhf"; depends=[coda colorspace overlapping rstan]; }; MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-10.1"; sha256="0j15dpxy62vwbd6pcsvkbpi1nklh0yjzwf53kcmv4jhj0v6xmpp9"; depends=[lattice mvtnorm]; }; MCPModBC = derive2 { name="MCPModBC"; version="1.1"; sha256="0gzcxn3pf86k32ccvbsh4g5awcxcnsr5c48lkyrpqgwr0k3g0sjs"; depends=[doParallel doRNG DoseFinding dplyr foreach nleqslv rlang survival]; }; @@ -2832,16 +2846,14 @@ in with self; { MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; }; MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; }; - MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; }; MEDseq = derive2 { name="MEDseq"; version="1.4.0"; sha256="0wx56q99h15s4qqpp355vck03gbk9xcwshcal90w64msrr646bfn"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; }; MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; }; MERO = derive2 { name="MERO"; version="0.1.2"; sha256="10wz6qrmi612y6whrn3dka606llijp5d1fffh00b1pprx2rcfl8w"; depends=[doParallel foreach ggpubr missForest progress]; }; - MESS = derive2 { name="MESS"; version="0.5.9"; sha256="0bfpz61x2p8d0859xh69k21z2v3nif7jxzl79ni3020k7aagyzdm"; depends=[geeM geepack ggformula ggplot2 glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; + MESS = derive2 { name="MESS"; version="0.5.12"; sha256="1xyw04glhpgdcc3p96yvm346l62lsq37ml6lv59ap2ksws9pkq21"; depends=[clipr geeM geepack ggformula ggplot2 glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; MEclustnet = derive2 { name="MEclustnet"; version="1.2.2"; sha256="0rs58dafxngk2lkq14cy14ayjwgnz1gmi12jmi4z74sdj0b3h0gw"; depends=[e1071 ellipse latentnet MASS mvtnorm nnet vegan]; }; - MEtest = derive2 { name="MEtest"; version="1.1"; sha256="0dxm3fs0lqnas70a1ckikvjp2ib9rqsknwcs9n9jfsmm1fqhxdpf"; depends=[statmod]; }; - MFAg = derive2 { name="MFAg"; version="1.8"; sha256="1kkcx6290ffk8g3amakaa5z5hz07z9iiqp2jxvma4pk85w6qay83"; depends=[]; }; + MFAg = derive2 { name="MFAg"; version="1.9"; sha256="008krza4lhbv641sn0wlf9gl66n8x6c9d8404m76dsgdsr118c1a"; depends=[]; }; MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; }; MFO = derive2 { name="MFO"; version="0.1.0"; sha256="0i8zkdwmngdq21f1rmn1fmgsr525xfzyjd7nxwy8p7fns6hsq31r"; depends=[dplyr ggplot2 magrittr minpack_lm openxlsx readxl stringr tibble tidyr]; }; MFPCA = derive2 { name="MFPCA"; version="1.3-10"; sha256="0qpmy9cxskz4ii3qa5kvrdka4gbvlnch2blis6jjr4vic86a5mgi"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; @@ -2853,9 +2865,10 @@ in with self; { MGDrivE2 = derive2 { name="MGDrivE2"; version="2.1.0"; sha256="1n7kmn65v6fb372jyqcsqnn01xvwyascqn881avd2iclrajr6h7p"; depends=[deSolve Matrix statmod]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.1"; sha256="0fkdknr954cglvj4pgwphr1d5apx45v0l8m2blghz8vagzk01ndf"; depends=[]; }; - MGMM = derive2 { name="MGMM"; version="1.0.1"; sha256="0xi9a10pfdr43f1qc0mvlgh3gpq3w23ax3s06w5cz25cj6kbv8xs"; depends=[cluster mvnfast plyr Rcpp RcppArmadillo]; }; + MGMM = derive2 { name="MGMM"; version="1.0.1.1"; sha256="090qzgy8fdi3asri8kyin52whf3w02yi9713gawbrl8gdiqp4l0b"; depends=[cluster mvnfast plyr Rcpp RcppArmadillo]; }; MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; }; - MGSDA = derive2 { name="MGSDA"; version="1.6"; sha256="03n7ngfbh87hhgpkjkc1a0zjslr0k9zip1prvbwhyqkfq21zajbr"; depends=[MASS]; }; + MGPSDK = derive2 { name="MGPSDK"; version="1.0.0"; sha256="07c92bmx572j0bda25d5rmygnq1mmp9pb8hyp387bqfm8yg7v9zi"; depends=[R6 reticulate]; }; + MGSDA = derive2 { name="MGSDA"; version="1.6.1"; sha256="03pr294fddh2dyn2q4fvai12rmpf0wfanjd3m0wimfvmr8idbw9a"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.5.3"; sha256="0y41m6727ls56sqvqir9n3lja6vmxk9bwnsy45jpjfav286fqlgd"; depends=[mgcv openxlsx]; }; MHD = derive2 { name="MHD"; version="0.1.1"; sha256="0gm80ags0916j0iynr2zbn539bafrx4ni0407v222g04c323vs7c"; depends=[distory manifold nloptr plyr Rcpp]; }; MHDA = derive2 { name="MHDA"; version="1.2"; sha256="1m8lz8jxf2bs8np4pwjh70yn955qa8g9xi1blwbwp8s72yjs78ll"; depends=[]; }; @@ -2867,14 +2880,15 @@ in with self; { MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; MIIPW = derive2 { name="MIIPW"; version="0.1.1"; sha256="043zdadny5rb1vlg1lnjaxjdjqmb755lgxha4zcdzyv9sl83ca8y"; depends=[MASS Matrix mice]; }; + MIIVefa = derive2 { name="MIIVefa"; version="0.1.1"; sha256="1p1zh5zf1rwnncay0dj3fklbkl0nqak7wh0y4c4qylqd0453kd48"; depends=[MIIVsem]; }; MIIVsem = derive2 { name="MIIVsem"; version="0.5.8"; sha256="1qb1xrxhgj6b0l24spbp80f0rm8v41bqsdachqjhsacq2lgga259"; depends=[boot car lavaan Matrix numDeriv]; }; MIMSunit = derive2 { name="MIMSunit"; version="0.11.2"; sha256="1i0sadm4gh8yynnihhyp0lm37dq7qm7dmkl28jzdb5knls8nhcpz"; depends=[caTools dplyr dygraphs ggplot2 lubridate magrittr plyr R_utils RColorBrewer readr shiny signal stringr tibble xts]; }; MINTplates = derive2 { name="MINTplates"; version="1.0.1"; sha256="1jj51314p2ni3f3ncpd8gp7pgshhsp97ic123d732sc9xr0h5rnr"; depends=[]; }; MIRES = derive2 { name="MIRES"; version="0.1.0"; sha256="17k6f73qx85klhhn247nr6h7sinpabq9crlc5ag7qm6z7k6mr370"; depends=[BH cubature dirichletprocess Formula HDInterval logspline mvtnorm nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.1"; sha256="1xx25b7hfyzynfh3vsqrkriqnqnn173gn8j1vwqmc434c1vy4nx2"; depends=[ggplot2 mvtnorm rstan]; }; - MKLE = derive2 { name="MKLE"; version="1.0.0"; sha256="0pnz99z2ms8j0acnpim0z7n7m0x6rkvzi5dhq8jhx0dnry4mznn0"; depends=[]; }; + MKLE = derive2 { name="MKLE"; version="1.0.1"; sha256="0149l4ycn8f1v2ndfvl167xj7zb4zyi4wzaz12d9d5q5igavyx5x"; depends=[]; }; MKMeans = derive2 { name="MKMeans"; version="2.1"; sha256="1zhas96xvjyphmrs48k3nza1ayv9nfj0c760ifb57p8yk28m0bfy"; depends=[]; }; - MKclass = derive2 { name="MKclass"; version="0.3"; sha256="0sw0h99k24418iqvvq247kg5558y9mgashr5amay7gbf2va79v6j"; depends=[]; }; + MKclass = derive2 { name="MKclass"; version="0.5"; sha256="1f6k00552vs3fql35mxrpqq52a8jw5g253k5a81shc11j9qapg9x"; depends=[]; }; MKdescr = derive2 { name="MKdescr"; version="0.8"; sha256="0y4mg3lg94nvyvj8rns5lffd6qjw1yn6yw8kn03n94rig857amwp"; depends=[ggplot2 scales]; }; MKinfer = derive2 { name="MKinfer"; version="1.1"; sha256="0wlvlh31qwxsk00zszbzrdhk7gx226i7cyhv35h9wnawmyrxkb5g"; depends=[arrangements boot exactRankTests ggplot2 miceadds MKdescr nlme]; }; MKmisc = derive2 { name="MKmisc"; version="1.9"; sha256="09kdwsfx5w3q88jbnxbaxzbzyx9fhhphqqaxn5qghhh1z2vpmy93"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; @@ -2884,16 +2898,15 @@ in with self; { ML2Pvae = derive2 { name="ML2Pvae"; version="1.0.0.1"; sha256="089cl5mcf06zxs26grk0aqmd0xy9x6svfkfa7dw0m8zqc0s0mkix"; depends=[keras reticulate tensorflow tfprobability]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.3"; sha256="1sz5c3wxvnyxd3bf53i8x2jw591phx2np6c6bj4cqppb98ab83f3"; depends=[]; }; - MLDS = derive2 { name="MLDS"; version="0.4.901"; sha256="0zswlng1vksnx1m6ycna2hbqmzzcfpqz1wgy519fr0j87bqxks69"; depends=[MASS]; }; + MLDS = derive2 { name="MLDS"; version="0.5.1"; sha256="0c8bmdjn6980lqihzc0rgg864hs1a51n2lrwi1vrxdp4xylvnqdd"; depends=[MASS]; }; MLDataR = derive2 { name="MLDataR"; version="1.0.1"; sha256="0sbm79hpgxiqnqjyr5n88rhs29lkp17czz9jmhd2d5x97ncpqw9f"; depends=[caret ConfusionTableR dplyr ggplot2 OddsPlotty parsnip ranger recipes rsample varhandle workflows]; }; - MLEce = derive2 { name="MLEce"; version="1.0.1"; sha256="0m5fa2167dyprcc3agmdvfjgd0qvnnqn5y6xqm2w3rmgvilhp24r"; depends=[ggplot2 LaplacesDemon mvtnorm nleqslv reshape sirt]; }; + MLEce = derive2 { name="MLEce"; version="2.1.0"; sha256="190i2if8hgwqlznhls780vpkwprfmnsr9jm6zdsa8av0gh6kldzh"; depends=[ggplot2 LaplacesDemon mvtnorm nleqslv reshape sirt]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-7"; sha256="1kdnm5ilfn5fclry3f1d518761hykrqgjhv69kc881r2fpcfa1lv"; depends=[]; }; MLFS = derive2 { name="MLFS"; version="0.4.2"; sha256="0xrc266hz69vpfi2h59lma0wbyi1wfcw4wb3dbjbnqqwsq1hc0dz"; depends=[brnn dplyr magrittr naivebayes pscl ranger reshape2 tidyr tidyselect]; }; MLGL = derive2 { name="MLGL"; version="1.0.0"; sha256="1vn9r867mj6g407ca2ncd1f2c3x83jcdllyxfalm3962xgwrg08m"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; }; MLGdata = derive2 { name="MLGdata"; version="0.1.0"; sha256="0ysvrnx8m903h99wr40zgg1c6d26m9vsh62zjxh8mvndh69ikzid"; depends=[]; }; MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; }; - MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; }; MLModelSelection = derive2 { name="MLModelSelection"; version="1.0"; sha256="1qfy2rfx2nvkwisl9wwllqsq2qhqzsdmrh90z5zn5qs07d0305wn"; depends=[MASS Rcpp RcppArmadillo RcppDist]; }; MLMusingR = derive2 { name="MLMusingR"; version="0.3.0"; sha256="0d05amwsc4zg474676qma20bba8ihq8dmh1md9r3wdqwilhsb4bh"; depends=[broom dplyr generics lme4 magrittr Matrix nlme performance tibble]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; @@ -2902,7 +2915,7 @@ in with self; { MLeval = derive2 { name="MLeval"; version="0.3"; sha256="1g2w5lrr7199n4zyaalbp9xdgl858hdg1pqr3rpd7v5fmamawc69"; depends=[ggplot2]; }; MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; }; MLpreemption = derive2 { name="MLpreemption"; version="1.0.1"; sha256="0fvrl7ahaiv93sq637yhf18j8bf3w28f0l4b8sjs2ssc5pbg1448"; depends=[]; }; - MM = derive2 { name="MM"; version="1.6-6"; sha256="115sfl0n645g3wd8bnlmadzk9s9z1p83wjswclf6s5nqwx5qvas7"; depends=[abind emulator magic mathjaxr Oarray partitions]; }; + MM = derive2 { name="MM"; version="1.6-7"; sha256="137v9728h5kxhvyrpvfawv25l9jzy7qi74pr4k91v286l0x7ksi6"; depends=[abind emulator magic mathjaxr Oarray partitions]; }; MM2S = derive2 { name="MM2S"; version="1.0.6"; sha256="1knr15vjc81cp7j67nc2gwkgds6ar3ribi1h0ihg0ch6rfz5c5zs"; depends=[GSVA kknn lattice pheatmap]; }; MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.3"; sha256="0hlm6jp8jq38vkszwdgpf30w11l1fhpblg26zv05j50a6whpmhqd"; depends=[Biobase]; }; MM4LMM = derive2 { name="MM4LMM"; version="3.0.2"; sha256="02a553pncv7q0zczy6rvj4avjpryv01n2mhr9cr0ir7607k1jllx"; depends=[corpcor dplyr MASS Matrix purrr Rcpp RcppEigen]; }; @@ -2928,8 +2941,8 @@ in with self; { MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; }; MOCHA = derive2 { name="MOCHA"; version="1.0.0"; sha256="0rwdb4a58craah2rcnaz16v4m9a3d0vlkc3vn5bjjkqppgdafcc7"; depends=[AnnotationDbi assertthat BiocGenerics biovizBase BSgenome data_table dplyr ensembldb GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 ggrepel ggridges IRanges magrittr matrixStats MultiAssayExperiment OrganismDbi pbapply plyranges purrr qvalue RaggedExperiment rlang S4Vectors scales stringr SummarizedExperiment tidyr tidyselect wCorr]; }; - MODISTools = derive2 { name="MODISTools"; version="1.1.4"; sha256="174fj3r2hvr4sqiis2baqbia3b270frcrrqar6cahn1jczcqnypx"; depends=[httr jsonlite memoise sf sp terra]; }; - MODIStsp = derive2 { name="MODIStsp"; version="2.0.10"; sha256="1s5jkih6jv4i702awdswj9hwajmk2kw1kd0nxbz386ia20y7k805"; depends=[assertthat bitops data_table gdalUtilities geojsonio httr jsonlite raster sf stringr xml2 xts]; }; + MODISTools = derive2 { name="MODISTools"; version="1.1.5"; sha256="1qxkipbrxqfs6wmg8q9ycwzwmp5qg3g2iv55w6cy492lhri3fsqa"; depends=[httr jsonlite memoise sf sp terra]; }; + MODIStsp = derive2 { name="MODIStsp"; version="2.1.0"; sha256="1nlzfshxzbk848xj4cprb6pm4j4jqxmaa2zmb5qsxx7s68mby5ll"; depends=[assertthat bitops data_table gdalUtilities geojsonio httr jsonlite raster sf stringr xml2 xts]; }; MOEADr = derive2 { name="MOEADr"; version="1.1.3"; sha256="19x7km2bpq0srm2lyafg3jcc4khwv077kjsqhhbgkv7r4c7xl6id"; depends=[assertthat FNN]; }; MOFAT = derive2 { name="MOFAT"; version="1.0"; sha256="00b9ss777zr5ysh98yllyicqwgnzccmjf20g7w20zvn2blhs2np0"; depends=[SLHD]; }; MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; }; @@ -2939,7 +2952,7 @@ in with self; { MOTE = derive2 { name="MOTE"; version="1.0.2"; sha256="17y2l2rmw7fhvknyh5z09i7hd8nhamx12g00rcymp75gqkz9lzc7"; depends=[ez MBESS reshape]; }; MPBoost = derive2 { name="MPBoost"; version="0.1-5"; sha256="13ijn48dg20kz0zwr0f0vp4162dv9hqnmnzzbdp30nhh0bqdbk4k"; depends=[BH Rcpp]; }; MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; }; - MPDiR = derive2 { name="MPDiR"; version="0.1-20"; sha256="1mm4mv042jr0n7z5cdaij39zrg2475p83gd3dxq6krz9yq8ii1q3"; depends=[]; }; + MPDiR = derive2 { name="MPDiR"; version="0.2"; sha256="0n7zrcxqfvd0y4qiqsx0qf5rgqdrci5026wkdpffngamxlm80f86"; depends=[]; }; MPGE = derive2 { name="MPGE"; version="1.0.0"; sha256="10lzkk8fhpxd1z4yp051q3k36fsvddrwssv7nn03r2bkp6q8rpzb"; depends=[car purrr]; }; MPI = derive2 { name="MPI"; version="0.1.0"; sha256="081yhbk3qz5935yz5n1391x3hpj8m0cbj1p81snhb9n8h0agwgv0"; depends=[doParallel dplyr foreach purrr tidyr]; }; MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; }; @@ -2948,14 +2961,15 @@ in with self; { MPSEM = derive2 { name="MPSEM"; version="0.4-1"; sha256="0cq7vyyif7gxywrj420msscjf1aq427g88x8yvxf3a5a6mqapkr8"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.14.1"; sha256="0jywv5kim3vdfq0dfaxjksq8l2i6ny45rn5ibmb7ximwfjm3syp0"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.4-2"; sha256="0fjfj8jk0dk1s3jc9rl9kza6gm5pm6dgsqyk0aq7pir2hrsr3qwy"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; - MPV = derive2 { name="MPV"; version="1.62"; sha256="0qn2wdxj4fbk6c5bvx9yxq5yp8nkzk6chxkp1pnxxbr0ghkyy6jz"; depends=[KernSmooth lattice randomForest]; }; + MPV = derive2 { name="MPV"; version="1.63"; sha256="0nylp38fxk3nabg8apcnb1f45q1z8667vswdzds6nzm2v8a94p5j"; depends=[KernSmooth lattice randomForest]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-8"; sha256="19gp2pjy8bllk4pbx139vcydnw04nldfqq9q7291vr5krylfjcqv"; depends=[]; }; - MQMF = derive2 { name="MQMF"; version="0.1.1"; sha256="0cbcmrgd3jvr2b95awklzsr694dqxgc5kk840r293qvhpsbxf27y"; depends=[MASS mvtnorm]; }; + MQMF = derive2 { name="MQMF"; version="0.1.5"; sha256="1qw5dswq9p4k5rj8dxzr8f1j3mw232jgn18idbhb4inigha3sa5c"; depends=[MASS mvtnorm]; }; MRCE = derive2 { name="MRCE"; version="2.4"; sha256="0j5dhzmn1bpplc5jird966gcg0zjwlajv93r2p0kh48msi5kbaqc"; depends=[glasso]; }; MRFA = derive2 { name="MRFA"; version="0.4"; sha256="1ivzyp3q2nb6h5mhykina75ak7ajfw62rh23yr4pljma7gmr1hhm"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; MRFcov = derive2 { name="MRFcov"; version="1.0.39"; sha256="0vgmm9lwkpfahzlhcyaixh2x9d85rrpxipzsc0wy66j43vgn4jhp"; depends=[caret dplyr ggplot2 glmnet gridExtra igraph magrittr MASS Matrix mgcv pbapply plyr purrr reshape2 sfsmisc]; }; MRHawkes = derive2 { name="MRHawkes"; version="1.0"; sha256="0qhwm708jijv1w6iml18bg7fc2igdcmydwpb9dzpa4gwwads8b78"; depends=[IHSEP]; }; MRMCaov = derive2 { name="MRMCaov"; version="0.3.0"; sha256="0nq4i1ymv3ifp39liz99l51605q2iiin75a02wp9pyaxf6k7b5hd"; depends=[ggplot2 mvtnorm progress tibble trust]; }; + MRMCsamplesize = derive2 { name="MRMCsamplesize"; version="1.0.0"; sha256="1wpgc0gfp5sv18l3kkw9kw1vrijnjjz163vsk8q02g64zcm7k78q"; depends=[fpow]; }; MRPC = derive2 { name="MRPC"; version="3.1.0"; sha256="1hsrcqp4yygz2psxj9m2n1z7pivdf82b3rnqc34ripyql5apmikn"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg plyr psych Rgraphviz sna WGCNA]; }; MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; }; MRReg = derive2 { name="MRReg"; version="0.1.5"; sha256="0705hc85hhk7nd4ygvkswz7drdgia86v6svk85vqa5p899bsam14"; depends=[caret igraph]; }; @@ -2963,6 +2977,7 @@ in with self; { MRTAnalysis = derive2 { name="MRTAnalysis"; version="0.1.2"; sha256="19s30k2crlnracwld0c1dhkvnwfyb32bhr06w7mbxm748lwhkwdh"; depends=[geepack rootSolve sandwich]; }; MRTSampleSize = derive2 { name="MRTSampleSize"; version="0.3.0"; sha256="03c6jkanff241rcv1yixvmlnya3sd8hqpawf9dx9mpsri4pp6mdk"; depends=[]; }; MRTSampleSizeBinary = derive2 { name="MRTSampleSizeBinary"; version="0.1.1"; sha256="01kg6frglrhi55px2hsadjn9dbfz61hwj1q2m6jrm59b4cws0gcb"; depends=[dplyr ggplot2 Matrix]; }; + MRZero = derive2 { name="MRZero"; version="0.1.0"; sha256="1ksmhpycslkilm1ixhdi0asa5la5mrql48ycbf1camk556mcl3wa"; depends=[ggplot2 glmnet knitr plotly quantreg rmarkdown robustbase]; }; MRmediation = derive2 { name="MRmediation"; version="1.0.1"; sha256="0v0kn6x4fwj35imj1fb2f2024ifb7081z4cwlhjmdxhabcy6xbx7"; depends=[fda MASS]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.7"; sha256="1h9g6n7wjh8zx7y1lj7inkn9hz5jbf8q5lhf13m2r9qlw122rlri"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSCquartets = derive2 { name="MSCquartets"; version="1.3.1"; sha256="1nma7x0qz2i2xkp2ggya6hqpdg967hcdpk6s8cjlgm5nmjz7ndcs"; depends=[ape doParallel foreach phangorn Rcpp Rdpack zipfR]; }; @@ -2977,16 +2992,15 @@ in with self; { MSRDT = derive2 { name="MSRDT"; version="0.1.0"; sha256="1i35zsip6p177k9pnbmvkjdc1hpr6nclhbx2sfah95ls5v6xnzz8"; depends=[dplyr gtools reshape2]; }; MSSQL = derive2 { name="MSSQL"; version="1.0.0"; sha256="15glgn2dr1yygxps0mx68435zqc2hi4hvgr4rvgrwyxdnlm5g35y"; depends=[RODBC]; }; MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; - MSTest = derive2 { name="MSTest"; version="0.1.1"; sha256="0icrpzvgbr84scx44lkg0r3f0x6hppqqikcnr0hpsbg6125ihq5f"; depends=[foreach GA GenSA lmf nloptr numDeriv pso Rcpp RcppArmadillo rlang]; }; MSbox = derive2 { name="MSbox"; version="1.4.8"; sha256="1cppzy3kri2zmhyk34scffix28v1bjb0fhk51kb33amg6vz5mnj3"; depends=[crayon stringr xml2]; }; MSclassifR = derive2 { name="MSclassifR"; version="0.3.3"; sha256="1qn79awr6yiywiz9k1wx6bqml1ssjijg1k2rm4blvlbd26yk5lbr"; depends=[car caret cp4p dplyr e1071 fuzzyjoin ggplot2 glmnet limma MALDIquant MALDIquantForeign MALDIrppa mclust metap mixOmics mltools nnet performanceEstimation randomForest reshape2 statmod UBL vita VSURF xgboost]; }; MSclust = derive2 { name="MSclust"; version="1.0.3"; sha256="0kb649sg0q7j4my7xx860pxmh6hd1f8h6sxyh49bwv9glvzq4p75"; depends=[cluster GGally ggplot2 gtools Matrix mclust mnormt mvtnorm psych]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSiP = derive2 { name="MSiP"; version="1.3.7"; sha256="1n8yl5icd3qkpmx2knxsp4g6jvkbg6hl82jxg9apxkx4nmsvkawz"; depends=[caret dplyr e1071 magrittr mice plyr pROC PRROC ranger tibble tidyr]; }; MSigSeg = derive2 { name="MSigSeg"; version="0.1.3"; sha256="1wxjhby18sj6ixh0y4cd5v0yrbypd3jlzl069c4bzpazqq03s1jz"; depends=[MASS]; }; - MSinference = derive2 { name="MSinference"; version="0.1.0"; sha256="1016i5khs5sh90ywffwkl1jjj3j08iw9hs1zhw08xz9p6sj6qz9n"; depends=[doParallel foreach Rcpp Rdpack]; }; + MSoutcomes = derive2 { name="MSoutcomes"; version="0.1.0"; sha256="1xdfk55rvnyi0w52m3yzl05w9isil2xxln8w15009m8l6w3imgas"; depends=[dplyr]; }; MSwM = derive2 { name="MSwM"; version="1.5"; sha256="0ny5apvww1537qhiwb3f8x173rh7mypvgpw0i46dkvn897i0dq36"; depends=[nlme]; }; - MTA = derive2 { name="MTA"; version="0.4.1"; sha256="1dy24rqyw16bqh83sxi4m6djndr61hrgkyrh8s41qg5aycv0hzn1"; depends=[igraph sf]; }; + MTA = derive2 { name="MTA"; version="0.5.0"; sha256="13h50frxgp0cznw27z797ri8sfv2xxirsw167g51gx3v7np1vc4i"; depends=[igraph sf]; }; MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTE = derive2 { name="MTE"; version="1.2"; sha256="0xh9q302gklx0djkjvmp79n7y8d0sc06mm7lvmva5i6s69jq243f"; depends=[glmnet quantreg rqPen]; }; @@ -2994,7 +3008,7 @@ in with self; { MTPS = derive2 { name="MTPS"; version="1.0.2"; sha256="0bv81vwswhrs0p3mvsiv5njyq1j5p16y14m3sysnyg8rr98gqy38"; depends=[class e1071 glmnet MASS rpart]; }; MTS = derive2 { name="MTS"; version="1.2.1"; sha256="0nc1g5dbg42j0h5xg9psg5kqldp5w87in8ggzliixpsz3cilvry3"; depends=[fBasics fGarch mvtnorm Rcpp RcppEigen]; }; MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; - MTest = derive2 { name="MTest"; version="1.0.0"; sha256="16h5jg9c3c06fsx0j788vk26cc46ps0ydycrc76bnw8f419bh9dd"; depends=[car]; }; + MTest = derive2 { name="MTest"; version="1.0.2"; sha256="19sz6s5hbrvm4jv54hv8g3d2ixf9pk72ch5j9418skal4dawh1yn"; depends=[car ggplot2 plotly]; }; MUACz = derive2 { name="MUACz"; version="2.1.0"; sha256="1d771vb2aimr87kyqj7zkmwarmxcxzbh7mvr396pf2zr3h8wi30c"; depends=[dplyr epiDisplay ggplot2]; }; MUS = derive2 { name="MUS"; version="0.1.6"; sha256="0xid624rz0mvd03iy7ydvmx7gkscvsg4kdbaf2nji54ahai3pmn3"; depends=[]; }; MVA = derive2 { name="MVA"; version="1.0-8"; sha256="1xd75qah05jrljl72gr8xzhfj43mnf821jnjv38gflavkvyn89mv"; depends=[HSAUR2]; }; @@ -3007,21 +3021,18 @@ in with self; { MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3-8"; sha256="0j3xjxrjy72dcdphlwdzfpnmxx0vs3f0jnk3w4vkp7rx01c1wbd3"; depends=[fastmatrix]; }; MVTests = derive2 { name="MVTests"; version="2.1.1"; sha256="10zybrcwyq37z8pk0ck4bravbrryx705vd7v4mb4c2vavnshxfq3"; depends=[mvtnorm robustbase rrcov]; }; - MVar = derive2 { name="MVar"; version="2.2.0"; sha256="17v9gmc67532q14csdgr3xgy66gaj8xn68pfffd1x83aan7ai3h6"; depends=[MASS]; }; - MVar_pt = derive2 { name="MVar.pt"; version="2.2.0"; sha256="19nmx615275pmpaxv6aq4cvw7y23vh8finxxbmj1lzk1chj53k29"; depends=[MASS]; }; + MVar = derive2 { name="MVar"; version="2.2.1"; sha256="0jmbgiw1mvdlkc41mxxk4cjknwh161ahai4gdavdcx66x87l754y"; depends=[MASS]; }; + MVar_pt = derive2 { name="MVar.pt"; version="2.2.1"; sha256="00p6n91d28bibf24j3rkql1hp85dy9qag9spi98m6a2v5isp10p3"; depends=[MASS]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; }; - MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; - MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; }; MXM = derive2 { name="MXM"; version="1.5.5"; sha256="15r4jnf1l2nrf67xkpvzg2h7yxxhjlkr454n691ssss9z0zpsgcl"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; MaOEA = derive2 { name="MaOEA"; version="0.6.2"; sha256="0s8jvp7821mb6xff8xwnh78mhz4qfrbk4g7sp4dfnm2ii7ah9c6b"; depends=[e1071 gtools lhs MASS nnet nsga2R pracma randtoolbox reticulate stringr]; }; - MachineShop = derive2 { name="MachineShop"; version="3.6.2"; sha256="08gl9pgp9a7ljf70babdkw2l5byd6j9284qzd2098yr6zbyns1bz"; depends=[abind cli dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress recipes rlang rsample Rsolnp survival tibble]; }; + MachineShop = derive2 { name="MachineShop"; version="3.7.0"; sha256="073v778c7zkpxhhdvqc4hiqlgj5ws9490cqpz22bk659f8f63bav"; depends=[abind cli dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress recipes rlang rsample Rsolnp survival tibble]; }; MacroZooBenthosWaterA = derive2 { name="MacroZooBenthosWaterA"; version="0.1.0"; sha256="15b90g7nw82dmpfarx5qm159jmrpp915qz26vv3ya6ky4g2kl6ic"; depends=[]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MagmaClustR = derive2 { name="MagmaClustR"; version="1.1.2"; sha256="0nmf3whngm1kz27aazq4pkgw76sw24w33n51ril0dsvsfirfk7dd"; depends=[broom dplyr ggplot2 magrittr mvtnorm plyr purrr Rcpp rlang tibble tidyr tidyselect]; }; MainExistingDatasets = derive2 { name="MainExistingDatasets"; version="1.0.2"; sha256="16g741hzckla6amhwa54bhg3l3700sp43p6mijbb5065qnviw5y9"; depends=[config dplyr DT glue golem htmltools htmlwidgets magrittr openxlsx pkgload processx rlang sf shiny spData tidyr tmap tmaptools]; }; MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; - MakeYourPalette = derive2 { name="MakeYourPalette"; version="0.1.3"; sha256="0snawchc2rkxglmcg093gik3gwasn4pxqsvz6rm2r1gkbwbazmh4"; depends=[prismatic raster rgdal]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; ManagedCloudProvider = derive2 { name="ManagedCloudProvider"; version="1.0.0"; sha256="0glhx9ylpx2s8mi711gblapw6qnv80nd4wahph65g6ddngvmgv73"; depends=[adagio DockerParallel jsonlite]; }; MandalaR = derive2 { name="MandalaR"; version="0.1.0"; sha256="13shj6r416cz11qlwrha468gx1y76vx28xyhap3k0c0b2jxn699b"; depends=[ggplot2]; }; @@ -3039,19 +3050,19 @@ in with self; { MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.2"; sha256="0a19ww8i04z8a4a6hia4myssfam57fdx59mc4n9dzrbyy293ckx2"; depends=[boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; }; MarketMatching = derive2 { name="MarketMatching"; version="1.2.0"; sha256="075maishssvjrx0jfmxcfiv2rlhnm0c4dnp6ija3bn5z80i6z91m"; depends=[Boom bsts CausalImpact doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales tidyr utf8 zoo]; }; Markovchart = derive2 { name="Markovchart"; version="2.1.5"; sha256="0rvpj7zpcq2jv2sajnlhv36g76r3c3dlr0p1yyi96qi1q653yvjj"; depends=[doParallel foreach ggplot2 metR optimParallel]; }; - MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; }; - MassWateR = derive2 { name="MassWateR"; version="2.1.1"; sha256="06q2fgg7d7jya4sgzwh2hkp0844cbqasig4cn833fqvbiq6d71jz"; depends=[curl dplyr flextable ggmap ggplot2 ggrepel ggspatial httr lubridate RColorBrewer readxl rmarkdown sf tibble tidyr units writexl]; }; + MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.3"; sha256="18bs6hbj8bhs1var72vd3gkzjjx80f5cyq0a6fm99fmsggw1lmqa"; depends=[gtools matrixcalc]; }; + MassWateR = derive2 { name="MassWateR"; version="2.1.2"; sha256="0r5ngshvsj2bhhpsrzrlarm3fwv2f6zlxbrx83crciqspvkird68"; depends=[curl dplyr flextable ggmap ggplot2 ggrepel ggspatial httr lubridate RColorBrewer readxl rmarkdown sf tibble tidyr units writexl]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; MatTransMix = derive2 { name="MatTransMix"; version="0.1.16"; sha256="1jvxwbs2914hqd5vr9kfwazh9d0vqpw7dhbpjdh3q4rgqk80gwpd"; depends=[mvtnorm]; }; - MatchIt = derive2 { name="MatchIt"; version="4.5.4"; sha256="17hszkxpdfajb6k5lc96jfi2mfcflav60sjk2jm1b08i898977cv"; depends=[backports chk Rcpp RcppProgress rlang]; }; + MatchIt = derive2 { name="MatchIt"; version="4.5.5"; sha256="17l5b6i4bmg3gjjhzagy451zcv2i5xj4j6zzxgiqf955sgywlfdf"; depends=[backports chk Rcpp RcppProgress rlang]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.8.1"; sha256="1spkjpm4pviqv52nknhww1vcjc61sgsfsvp0ilpp4srh0ykc8ihh"; depends=[Hmisc Matching]; }; MatchThem = derive2 { name="MatchThem"; version="1.1.0"; sha256="0qbizfvwx5kagkmgj337lrf9s0nz2rdyb5dwag7yqdfza06mnlvi"; depends=[MatchIt mice rlang survey WeightIt]; }; - Matching = derive2 { name="Matching"; version="4.10-8"; sha256="16m4mmlvyslnn77idragbjf2ygmd7r6kwrgwkwcfnphzvlnjwhal"; depends=[MASS]; }; - Matrix = derive2 { name="Matrix"; version="1.6-0"; sha256="17dpfqyr68dldlj4v26rjrwv6pv87czj9szqqp64fwczyy0fdszb"; depends=[lattice]; }; + Matching = derive2 { name="Matching"; version="4.10-14"; sha256="1c56yqr6zlbgjjw61c10fwbxxh4i5ng2krny9p6cz7d2bmm2id5z"; depends=[MASS]; }; + Matrix = derive2 { name="Matrix"; version="1.6-1.1"; sha256="1hlcxr38p4ybb67n25cc1ssh2q2r8cj0flc59lid8hclzvqv27ik"; depends=[lattice]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.10.0"; sha256="1na3y1crlj57c1xq9ja3v94cx2dr0myrlx9bxvhhwss3q3r1lgby"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; }; - MatrixExtra = derive2 { name="MatrixExtra"; version="0.1.13"; sha256="1s8y8zp9k7rsnyi1d8ghi4brjbbdwxijc9chhla24qm3fi6np33a"; depends=[float Matrix Rcpp RhpcBLASctl]; }; + MatrixExtra = derive2 { name="MatrixExtra"; version="0.1.14"; sha256="09c6f467sbqa65ny9si9acwkwy4kfvhy532vikr4cd16r89xxr01"; depends=[float Matrix Rcpp RhpcBLASctl]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.2"; sha256="0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy"; depends=[glasso plyr Rcpp RcppArmadillo]; }; MatrixMixtures = derive2 { name="MatrixMixtures"; version="1.0.0"; sha256="0l9f7sicigp88rqi2bn4bmlrb130qvyikn4mlfphcpa16rvk37dq"; depends=[doSNOW foreach snow withr]; }; MatrixModels = derive2 { name="MatrixModels"; version="0.5-2"; sha256="0ap3mfzb2psjwlksfjzs2ycl5598bllwzx5hfmf9db4yjsydn1hw"; depends=[Matrix]; }; @@ -3060,19 +3071,19 @@ in with self; { MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; MaximinInfer = derive2 { name="MaximinInfer"; version="2.0.0"; sha256="0l4sglb3f7f1na6dbb4rd73sb4kqzlz78sj09f84rbqghjrzbxl0"; depends=[CVXR glmnet intervals MASS SIHR]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.15"; sha256="1d1387cad90ah6pk9vpnyc5839smh4mm6a2lxn44yk9sl5fs15dw"; depends=[devtools digest dplyr futile_logger geohashTools lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; - MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.3.8"; sha256="1vjbbbdq3nlgp7fdzrsb568v37s3iszcm6c93yz2ckgqxy7m4sli"; depends=[dplyr geodist httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr rlang stringr tidygeocoder]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.16"; sha256="021wrll07xrx9vk4vv0h7rmh5bll10gyywa5qyvd7sdpnvnrw3l3"; depends=[devtools digest dplyr futile_logger geohashTools lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; + MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.3.11"; sha256="0xd8c53avwz4dxd2p8lncn20dnq910y3ry9y74i253dl2bwpk347"; depends=[dplyr geodist httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr rlang stringr tidygeocoder]; }; MazamaRollUtils = derive2 { name="MazamaRollUtils"; version="0.1.3"; sha256="1433xy64n3wpxg9d0jlwdfp8hlvmq0ndg3fv6kfxq3pasm600jgc"; depends=[Rcpp]; }; MazamaSpatialPlots = derive2 { name="MazamaSpatialPlots"; version="0.2.0"; sha256="1i8gqywl2w7zjl1m5qw8vmy7wn44cp8fkiw4m2iwvf4s9q43xjnc"; depends=[dplyr magrittr MazamaCoreUtils MazamaSpatialUtils rlang sf tmap]; }; - MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.8.5"; sha256="1pg9caf13jscqc56lz5bsayy68mzi603nv8b927kijsls4sp54i9"; depends=[countrycode dplyr magrittr MazamaCoreUtils rlang rmapshaper sf stringr]; }; - MazamaTimeSeries = derive2 { name="MazamaTimeSeries"; version="0.2.13"; sha256="11az445km9fiwsq1c40z98grwplcfcbgd38cavqyi79yb58c94j6"; depends=[dplyr geodist lubridate magrittr MazamaCoreUtils MazamaRollUtils rlang stringr]; }; + MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.8.6"; sha256="18dpnal2rkj2lkrlnr6wn4rc4n2xb7w6g6kywppc9d1qd29b0njk"; depends=[countrycode dplyr magrittr MazamaCoreUtils rlang rmapshaper sf stringr]; }; + MazamaTimeSeries = derive2 { name="MazamaTimeSeries"; version="0.2.15"; sha256="04dqwky6cyvas2ygmnc3r6rb302dc2flrgljl9k9vc71xs0d2w57"; depends=[dplyr geodist lubridate magrittr MazamaCoreUtils MazamaRollUtils rlang stringr]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.1"; sha256="0zn63qljsw3bnxpj823lrkcl3rnxksjsaxzn6dbddw41j80mmfa4"; depends=[lubridate]; }; MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; }; MedLEA = derive2 { name="MedLEA"; version="1.0.2"; sha256="1jnrav6hhb97v5ncrspkq7ph2xqzc7sn14awlsnmbfzpv3543m4y"; depends=[]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; - MedianaDesigner = derive2 { name="MedianaDesigner"; version="0.12"; sha256="028s66n7908fccpjc500sim50w1xayvqb9cg2jrzqj42mmmfbnj4"; depends=[devEMF doParallel flextable foreach lme4 lmerTest MASS mvtnorm officer pbkrtest Rcpp RcppEigen RcppNumerical rootSolve shiny shinydashboard shinyMatrix]; }; + MedianaDesigner = derive2 { name="MedianaDesigner"; version="0.13"; sha256="07vzfm583gqk0ars4gamyn21lpcsdxx86nkp227i9yk7lyj0r6kp"; depends=[devEMF doParallel flextable foreach lme4 lmerTest MASS mvtnorm officer pbkrtest Rcpp RcppEigen RcppNumerical rootSolve shiny shinydashboard shinyMatrix]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.9"; sha256="1wpn03csv88958ppg4idwidcdvr1gf3bps4c0sf5z3ri78awb28f"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.9.0"; sha256="103pmql4klhvqm7sydbqwqzx2ngbr8dxky8cg495ggpzbpjj131n"; depends=[ggplot2 glmnet iterpc knitr Matrix numDeriv plotly quantreg Rcpp RcppArmadillo rjson rmarkdown robustbase]; }; Mercator = derive2 { name="Mercator"; version="1.1.2"; sha256="1iixn75vp66gbhllppm8xaxxqg8qbp4m5db8qznnysm8gn5wcl7f"; depends=[ClassDiscovery cluster dendextend flexmix igraph KernSmooth kohonen Polychrome Rtsne Thresher umap]; }; @@ -3097,9 +3108,9 @@ in with self; { MetaboQC = derive2 { name="MetaboQC"; version="1.1"; sha256="1rrhssm882xkp6ydgy3qba9c7ww3p6vxy04z4v7v6v7ilc5bvrgi"; depends=[plyr]; }; MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3.1"; sha256="070qws759nczjrfdlh7jpbyjz4z3zm1hzb7vcvfgfks82wwb2ny0"; depends=[ellipse gplots gtools mclust mvtnorm]; }; MetabolicSurv = derive2 { name="MetabolicSurv"; version="1.1.2"; sha256="1c8i3a3gnbvlkjh0vqmz1igzaf8q87cb55l3kijwi0z23ywrbqch"; depends=[dplyr ggplot2 glmnet matrixStats pls Rdpack rms superpc survival survminer tidyr]; }; + MetabolicSyndrome = derive2 { name="MetabolicSyndrome"; version="0.1.3"; sha256="0hacywgkpsa3j96k4z24j6r3srm22i8vs53010nyakdsczzlizvn"; depends=[dplyr]; }; MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.4"; sha256="0d4hfmr6m5dnw4f2374ih5q6av0f0z6vq28cd66zpmyrdvhxp9w0"; depends=[C50 caret e1071 InterpretMSSpectrum mixOmics pcaMethods plyr Rdisop rlang rpart webchem]; }; MetaculR = derive2 { name="MetaculR"; version="0.4.1"; sha256="130ic9q221lmnr5wzmw7bbskqzi5gmw8ark5zpw3y8wy9zbv2m98"; depends=[assertthat clipr cowplot dplyr ggplot2 ggrepel httr jsonlite magrittr progress spatstat_geom tidyr verification]; }; - MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; }; MethComp = derive2 { name="MethComp"; version="1.30.0"; sha256="1vmwb4zw4gm2x0j2nzm2vjfj7x19ws8njr6dcglzjpbbha7nxjp6"; depends=[coda nlme rjags]; }; MethodCompare = derive2 { name="MethodCompare"; version="0.1.2"; sha256="1nxr2fgmfixjkdparavi156qqqchjwaxpjk9i2xgc1yhp1p01pll"; depends=[nlme]; }; MetricGraph = derive2 { name="MetricGraph"; version="1.1.2"; sha256="05pzhvj3av8lrq77q2c34k0iz0amjzggcf2vzc7apjg5slvg02bf"; depends=[ggplot2 igraph Matrix R6 Rcpp RcppEigen rSPDE sf sp viridis]; }; @@ -3119,6 +3130,7 @@ in with self; { MicroMoB = derive2 { name="MicroMoB"; version="0.1.2"; sha256="0ghab143lr333v7qih30jc9n78pwcgam4nzaz7j1g4cnis5wfkbx"; depends=[abind jsonlite]; }; MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; }; MicrobiomeStat = derive2 { name="MicrobiomeStat"; version="1.1"; sha256="1j5sar85a1gksc83pc4ypxwb0c7whxglx069zarphrgqfazcr1m4"; depends=[foreach ggplot2 ggrepel lmerTest MASS Matrix matrixStats modeest phyloseq statmod]; }; + MicrobiomeSurv = derive2 { name="MicrobiomeSurv"; version="0.1.0"; sha256="00wx8vdbkxcn6cp243vbxyzx52hpcxpvxx8hq44gykc7238qcvhv"; depends=[dplyr ggplot2 glmnet gplots lmtest microbiome pls superpc survival survminer tidyr]; }; Microsoft365R = derive2 { name="Microsoft365R"; version="2.4.0"; sha256="0vcp8nhphl9yp4rp53nvkm82zqmn1jsc9m6agxmmsqby8795p7h1"; depends=[AzureAuth AzureGraph curl httr jsonlite mime R6 vctrs]; }; MinEDfind = derive2 { name="MinEDfind"; version="0.1.3"; sha256="1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa"; depends=[ggplot2 gridExtra Iso]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; @@ -3138,23 +3150,22 @@ in with self; { MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; MixSAL = derive2 { name="MixSAL"; version="1.0"; sha256="15dymyzfs3bwskaf6xndj291g6nhw7k1q93y1cba55a6fdjh5qz9"; depends=[MASS]; }; MixSIAR = derive2 { name="MixSIAR"; version="3.1.12"; sha256="07wiv7x2c9mhqk37zndxvdb76m9shizc48qz2bp2f4g5z9hciid7"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 splancs]; }; - MixSemiRob = derive2 { name="MixSemiRob"; version="1.0.0"; sha256="07dj2j1cxyzr8dpxwzh2mqnsyz1l4zw4z51yfvsv4zy7x2k25164"; depends=[GoFKernel MASS mixtools mvtnorm pracma quadprog Rlab robustbase ucminf]; }; - MixSim = derive2 { name="MixSim"; version="1.1-6"; sha256="003nc8i57dh1i7h6sfj51053wi7qd04cmdxyr7lm99qcfc577drf"; depends=[MASS]; }; + MixSemiRob = derive2 { name="MixSemiRob"; version="1.1.0"; sha256="0rvpwb4skd5s0f7qnm2mjrhfz4ppa6inqyfz970mpycihig3vilc"; depends=[GoFKernel MASS mixtools mvtnorm pracma quadprog Rlab robustbase ucminf]; }; + MixSim = derive2 { name="MixSim"; version="1.1-7"; sha256="1n6c3q78hbnjmwqxwr7i4lsv10mqkcwzf1jnlp6l9fxayhfz7jg7"; depends=[MASS]; }; MixTwice = derive2 { name="MixTwice"; version="2.0"; sha256="11j591z1pnql84sfczvry7mg4hs0jghgp170y5j5wwhs7l5kc7r7"; depends=[alabama ashr fdrtool Iso]; }; MixedIndTests = derive2 { name="MixedIndTests"; version="1.1.0"; sha256="0fh4hh8481wcjkcfvy0r84m3s0kkpx1psg4vc2gdx089724hzjk0"; depends=[copula doParallel foreach ggplot2 survey]; }; MixedLevelRSDs = derive2 { name="MixedLevelRSDs"; version="1.0.0"; sha256="1k2angaggzhiwp7idjdl41ws4j5kp15az74p4ajy6ia878bj0sf4"; depends=[]; }; MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; }; MixedPsy = derive2 { name="MixedPsy"; version="1.1.0"; sha256="1iz3cl19xlznzbqxvichbjhyhams4v9611p9094r6q5fpmf71p88"; depends=[beepr boot brglm ggplot2 lme4 Matrix mnormt]; }; MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; }; - MixfMRI = derive2 { name="MixfMRI"; version="0.1-2"; sha256="1ngqn2chjii94f7413ydbzmws083mp0hc5ys3lwi2mgqqmpi3pah"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; }; - MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; }; + MixfMRI = derive2 { name="MixfMRI"; version="0.1-3"; sha256="1cpkqvjkhr3l4y522xgjx2mwsvpzivf2h9wxslhgsqwds52ij0ad"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; }; MixtureMissing = derive2 { name="MixtureMissing"; version="2.0.0"; sha256="0c01i64n53q15n97j7rfayj9h0wj4r64fvs50fid38kkk16wii2i"; depends=[Bessel cluster MASS mnormt mvtnorm numDeriv]; }; MixviR = derive2 { name="MixviR"; version="3.5.0"; sha256="0npwwpb96id4zkrp4qzpiv5sgw6y4aqhhwx7v8vbg54029p6jj6w"; depends=[Biostrings dplyr DT ggplot2 glue httr lubridate magrittr plotly readr shiny stringr tidyr vcfR]; }; Mmcsd = derive2 { name="Mmcsd"; version="1.0.0"; sha256="1vj9qissby967a4z21772vj49hxhjppsn4w6l6s998pll8500np5"; depends=[dplyr knitr magrittr purrr rlist tibble tidyr]; }; MoBPS = derive2 { name="MoBPS"; version="1.6.64"; sha256="12czwx362pn0crj047rqb9ambl1fw73k474i7vcxhz53kbw21wj0"; depends=[]; }; MoEClust = derive2 { name="MoEClust"; version="1.5.1"; sha256="0kfylrq6079bp1l2pc6qlzqnm6a42xbywj0gi5zi57lh9wx7bslb"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; - MoMPCA = derive2 { name="MoMPCA"; version="1.0.1"; sha256="1snixlq35xbzf005d877i493sf1wm48jqlq9515yl1s6lxmav1n7"; depends=[doParallel dplyr foreach magrittr Matrix slam tm topicmodels]; }; + MoNAn = derive2 { name="MoNAn"; version="0.1.2"; sha256="1dl3c0x3cmraav05b9mi4h8d0mlsiykshdrf54n83p3b3glc78bc"; depends=[snowfall]; }; MoTBFs = derive2 { name="MoTBFs"; version="1.4.1"; sha256="03c1k5vvswlhbsivw6yznw1v0cdl8avs514iaa2v2994j2yk40j6"; depends=[bnlearn ggm lpSolve Matrix quadprog]; }; MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; }; ModEstM = derive2 { name="ModEstM"; version="0.0.1"; sha256="136g7rdphprx5b2xmb4jnixaam23g78m3fyfwz3mfx1w23ajf4r1"; depends=[dplyr rlang]; }; @@ -3169,7 +3180,6 @@ in with self; { MolgenisArmadillo = derive2 { name="MolgenisArmadillo"; version="2.0.0"; sha256="12pzdppkxv3x8xjizhkm8iii64jxyi3zblyghvxv7gkmgxlzsf7h"; depends=[arrow base64enc httr MolgenisAuth urltools]; }; MolgenisAuth = derive2 { name="MolgenisAuth"; version="0.0.25"; sha256="1ggij166zy0z05hmpwzdx2s1j38s9zr2ldayxljmcl348ds7rk7n"; depends=[httr urltools]; }; MomTrunc = derive2 { name="MomTrunc"; version="6.0"; sha256="0nfvq6ry1c5g1xjvf2qyr5pzpnsy420m6xgj0n3aj00wi0ifdyiz"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; - Momocs = derive2 { name="Momocs"; version="1.4.0"; sha256="08p2kjgfq7h7pwn4lqsfcy4d7rml6n0s1fb90l0iy1a88brbd3br"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp tibble vegan]; }; Mondrian = derive2 { name="Mondrian"; version="1.1.0"; sha256="1x40cdry6dwixwqx10kv42xr4254kj1f17va186haw9m949xn5gd"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="2.0.0"; sha256="0b5flc9l4nshy2fmwxbzcsn7pdivwy3x6kic94ppyyiqzz41h0b1"; depends=[codetools DBI digest testthat]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; @@ -3184,7 +3194,7 @@ in with self; { MortCast = derive2 { name="MortCast"; version="2.7-0"; sha256="1hw20wb0sl8q09vv68hid90ma2ml866kglsjf38kqky1whmihfbc"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; MortalityLaws = derive2 { name="MortalityLaws"; version="2.0.3"; sha256="1vd9jsrh35jk851j9ap2cm3r14isw1xp2vxq2j1h7px8v0gavw40"; depends=[httr minpack_lm pbapply RCurl rvest tidyr]; }; - MortalityTables = derive2 { name="MortalityTables"; version="2.0.3"; sha256="0ldj8gq5xpbxkjcvdysrcq7a0xv7caz1rc8v6bpn5hkr866lqnmw"; depends=[ggplot2 pracma scales]; }; + MortalityTables = derive2 { name="MortalityTables"; version="2.0.4"; sha256="0bf5z8bynadccf0gn61zj2rcqmskf6vhjznxnxk11303p6a11phc"; depends=[ggplot2 pracma scales]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="1.1.0"; sha256="011sd6v0zd5yr842k69fc8fn12lf7vw3v0rqmjwp6b2c8drw1b51"; depends=[boot checkmate coda data_table digest fastDummies ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; MplusTrees = derive2 { name="MplusTrees"; version="0.2.2"; sha256="0jbh3ixamj2ra1jfrzdfrxg7q3w2h82ymwxbsl8ac59bh06hzk46"; depends=[MplusAutomation nlme rpart rpart_plot]; }; Mqrcm = derive2 { name="Mqrcm"; version="1.2"; sha256="1alfv76b90frimihjcq8whzqkwvhnnw2fd92nrfpnfj5dw0b56f5"; depends=[Hmisc pch]; }; @@ -3197,10 +3207,10 @@ in with self; { MultBiplotR = derive2 { name="MultBiplotR"; version="1.3.30"; sha256="0cnn8m4yd2w0izbsvrlqgxif41554nq3hj7m169lxwxrb0csybcf"; depends=[car dae deldir dunn_test geometry GPArotation gplots Hmisc lattice MASS mirt mvtnorm optimr polycor rgl scales xtable]; }; MultEq = derive2 { name="MultEq"; version="2.4"; sha256="0x0mfmrfcjdv7v5nlakmjh2ilmgn15xgzc4qgm6djkif6565v46i"; depends=[]; }; MultIS = derive2 { name="MultIS"; version="0.6.2"; sha256="02ca1r8qfsl1b8rfawdn4xrlwhg5yab260rrsx8ckyv3v75knk8f"; depends=[cluster clv clValid dplyr foreach ggplot2 igraph ltm plyr poweRlaw RColorBrewer reshape2 rlang rmutil]; }; - MultNonParam = derive2 { name="MultNonParam"; version="1.3.8"; sha256="0j6ma63yq4nj22vqlpbid24cdva8pj2d03ym9irwx5mp70f5zk55"; depends=[ICSNP]; }; + MultNonParam = derive2 { name="MultNonParam"; version="1.3.9"; sha256="0p66pqairn0k3ciz31ykb2kk0mr4jyzvarkf1knlh3dkvagh7pvj"; depends=[ICSNP]; }; MultOrdRS = derive2 { name="MultOrdRS"; version="0.1-2"; sha256="0bra4z37njkcgah3a1k6mxcnmxq85188jywhgx3fdb1wnv5ic549"; depends=[Rcpp RcppArmadillo statmod]; }; MultSurvTests = derive2 { name="MultSurvTests"; version="0.2"; sha256="04crh4hbfhl8cr0faawv71lyabyilhxpg6i8sr9ki80982mbzcnd"; depends=[Rcpp RcppArmadillo Rdpack]; }; - MultiATSM = derive2 { name="MultiATSM"; version="0.3.2"; sha256="1ysi5h325rbxxpw4s4r8gc03zznjfk1ccg2xcjmg7mswn2b9r9gi"; depends=[ggplot2 hablar pracma wrapr zoo]; }; + MultiATSM = derive2 { name="MultiATSM"; version="0.3.4"; sha256="0cni4926xn0kfny1w0kkjhgwrb0bjqxa8cl4bx04xlch1n5f9692"; depends=[ggplot2 hablar pracma wrapr zoo]; }; MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; }; MultiClassROC = derive2 { name="MultiClassROC"; version="0.1.0"; sha256="06ns1yl16yxaksiv1mjwzkixc03mzz4rlidkzan0nxi9fqfp7nvc"; depends=[ggplot2 pROC]; }; MultiFit = derive2 { name="MultiFit"; version="1.1.1"; sha256="086bnqp61mfanrhi7dqaq5j2ddg3rfiyms0f5wj34svcjal9wjvc"; depends=[data_table Rcpp RcppArmadillo]; }; @@ -3210,7 +3220,7 @@ in with self; { MultiJoin = derive2 { name="MultiJoin"; version="0.1.1"; sha256="0cfk6yc5jagj9y8xybw6yg0yph4zah2vzaxv0384ad6r0r3x3nm8"; depends=[]; }; MultiKink = derive2 { name="MultiKink"; version="0.1.0"; sha256="0vi629mjmyrh03g3kx4vl47s52bggdxbq2wrdcf892g7xasbmv2b"; depends=[MASS quantreg]; }; MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; }; - MultiObjMatch = derive2 { name="MultiObjMatch"; version="0.1.0"; sha256="1zdzfy1dnjfr7hvjxnis3wd61494iljq3vmb0rzclr4sqivhn6lb"; depends=[cobalt dplyr fields gtools MASS matchMulti optmatch plyr rcbalance RCurl rlemon]; }; + MultiObjMatch = derive2 { name="MultiObjMatch"; version="0.1.2"; sha256="0bqr1yv4bmxlb8qha0saxkra0x1qch9g0kzp25qia8yz2fs41bpa"; depends=[cobalt dplyr fields gtools MASS matchMulti optmatch plyr rcbalance RCurl rlemon]; }; MultiOrd = derive2 { name="MultiOrd"; version="2.4.3"; sha256="1fmp8979ibxrx43vhi6dncljpbc1388y915d4g0gnl6a7z8g1dnh"; depends=[corpcor Matrix mvtnorm psych]; }; MultiPhen = derive2 { name="MultiPhen"; version="2.0.3"; sha256="0razswg4wqsz4q0dvpxp3swmxk82ig8gkyi4vcmxh11nlhb258w3"; depends=[abind epitools HardyWeinberg MASS meta RColorBrewer]; }; MultiRNG = derive2 { name="MultiRNG"; version="1.2.4"; sha256="189b2n5fy4sl63xifhlk88kahkn0qkh9szrkmzlq40vrwsbfximn"; depends=[]; }; @@ -3226,7 +3236,7 @@ in with self; { MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.2.0"; sha256="047a1pql3jf500gwlap6ws5z7mx0sqmdq6jbql24nl5iypi9jqpf"; depends=[foreach MASS]; }; MultipleRegression = derive2 { name="MultipleRegression"; version="0.1.0"; sha256="1l9rn6zc60ih7lyydrsy1ih94ksim14yd7kiapiga58mr7abi45h"; depends=[crayon]; }; MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.19"; sha256="0ns74496grklacpij2cvbv116kc77wa8kv3jdy9fjzxk8yd6kv4d"; depends=[dplyr lpSolveAPI ompr ompr_roi ROI ROI_plugin_glpk]; }; - MultiscaleDTM = derive2 { name="MultiscaleDTM"; version="0.8.1"; sha256="0p9gym2db7y126glj0r2shcqpirfvykrvc5nma715vsiv9ymx9sh"; depends=[dplyr raster Rcpp RcppArmadillo rgl shiny terra]; }; + MultiscaleDTM = derive2 { name="MultiscaleDTM"; version="0.8.2"; sha256="1xk13q3if8ln7jiyqg8wci5j0c7qxd4znlpnahp6pzxrnq1iaa38"; depends=[dplyr raster Rcpp RcppArmadillo rgl shiny terra]; }; MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.4"; sha256="0kkw6zxw29qmgd9nlgqjlyh99icxzkkqnpzzanxx8pn7m2ww0wkf"; depends=[ggplot2 lme4 MASS psych statmod]; }; MultivariateAnalysis = derive2 { name="MultivariateAnalysis"; version="0.4.4"; sha256="0vpk7iplmb0cyrqal90m1y4ym8wng2b8k9ydh26xaga4r974qd2p"; depends=[ape biotools candisc corrplot crayon PCAmixdata]; }; MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.5"; sha256="0mww4x1hqraiyvmw2f9s6h180kplmj36hb7zfg7xlkmgdf4apk8d"; depends=[bootstrap Rcpp]; }; @@ -3239,10 +3249,11 @@ in with self; { N2R = derive2 { name="N2R"; version="1.0.1"; sha256="12bv7xx6j6222qgpv6g61i68017fz0x6fjg9a9k5yhgw3zk05hpk"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; }; NACHO = derive2 { name="NACHO"; version="2.0.5"; sha256="1w32gnpi9hna2icrv5ig1qkpdrz6n3x79hkjz5fqschicg7fx4z4"; depends=[data_table ggforce ggplot2 ggrepel knitr rmarkdown shiny shinyWidgets]; }; NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; - NADA2 = derive2 { name="NADA2"; version="1.1.3"; sha256="1lmyppzcvg80jcp37viy7xi84mg94l33wchpwln9rm487ywnib56"; depends=[cenGAM coin EnvStats fitdistrplus Kendall mgcv multcomp NADA perm survival survminer vegan]; }; + NADA2 = derive2 { name="NADA2"; version="1.1.5"; sha256="15jv7pr36l5n3anf772vz5w5aj0lxx6fswsyj59rh54ap8a77jxb"; depends=[cenGAM coin EnvStats fitdistrplus Kendall mgcv multcomp NADA perm survival survminer vegan]; }; NADIA = derive2 { name="NADIA"; version="0.4.2"; sha256="19545sc75a82smjvvyd353wjlh3wwzhwapcrk9fkg3ffjv9p4a3n"; depends=[Amelia data_table doParallel foreach glmnet mice missForest missMDA missRanger mlr3 mlr3learners mlr3pipelines paradox rpart softImpute testthat VIM]; }; NAEPirtparams = derive2 { name="NAEPirtparams"; version="1.0.0"; sha256="0qhfmkhi38z27ky3xbkvra5r6lw3kj9p3xrblm9j2657rj9kxc9j"; depends=[]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; + NAIR = derive2 { name="NAIR"; version="1.0.2"; sha256="0zcjv7siimxjc87qzq5948kifzkz6f1idmdr7625aa126k2kgk1s"; depends=[dplyr ggplot2 ggraph igraph lifecycle Matrix Rcpp RcppArmadillo rlang]; }; NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; }; NAP = derive2 { name="NAP"; version="1.1"; sha256="19j1ngl92vqjqsk893zfsgk6fard2aswcm1553kh9fzv2idvr36s"; depends=[doParallel foreach]; }; NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; }; @@ -3258,14 +3269,14 @@ in with self; { NBShiny2 = derive2 { name="NBShiny2"; version="0.1.0"; sha256="0w4f19av8zl220zq3flmlqn86ivikclnsnkd7bc1wafhr12hmygp"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NBShiny3 = derive2 { name="NBShiny3"; version="0.1.0"; sha256="1p0n4jpzdaqwpidxairwpgc8qrdvr1r7cammpgnzc6a9ar2hcw1g"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NBtsVarSel = derive2 { name="NBtsVarSel"; version="1.0"; sha256="0dwmi69ahyrq54nx1xi591i3g87r4aiv9l5k81lhqwa2aniv6snh"; depends=[ggplot2 glmnet MASS Matrix mpath]; }; - NCA = derive2 { name="NCA"; version="3.3.2"; sha256="028lmwg8b7glgh2kkjjgkhabl6g672d8fkm1gvj73b7mq6f606yl"; depends=[doParallel foreach ggplot2 gplots iterators KernSmooth lpSolve plotly quantreg]; }; + NCA = derive2 { name="NCA"; version="3.3.3"; sha256="0a464k1gqn5546wfsjfg6la3g0q54pn4v5ngf9qbafxishjlavhx"; depends=[doParallel foreach ggplot2 gplots iterators KernSmooth lpSolve plotly quantreg]; }; NCC = derive2 { name="NCC"; version="1.0"; sha256="0zp854m5ig8w5xag4a1s56b33kfjds3wqydjxacvj5fkpr1y586d"; depends=[doParallel foreach ggplot2 iterators lmerTest magick mgcv parallelly RBesT rjags rlang spaMM]; }; NCSCopula = derive2 { name="NCSCopula"; version="1.0.1"; sha256="0amxp9daqp9bhz61hrq1dk88ai5xfd5sp3538rf3xwgs6walycr4"; depends=[copula]; }; NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; }; NCmisc = derive2 { name="NCmisc"; version="1.2.0"; sha256="10wzznqa26fxyj6bl979qmq29p3dkr8yap4s70l3mwhhk33zpz16"; depends=[]; }; NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; }; NDP = derive2 { name="NDP"; version="0.1.0"; sha256="0wmld7g4w3d7d8lyj4132h3jpr8ng8kpy4ssqjp8r0lqwif2i86b"; depends=[rmarkdown shiny]; }; - NEONiso = derive2 { name="NEONiso"; version="0.6.2"; sha256="1kl8y5z7cm7y04cqvwdkzf27mrrmvmwyix79d6wm03cmav2p6q54"; depends=[caret data_table dplyr ggplot2 gridExtra httr lifecycle lubridate magrittr neonUtilities R_utils rhdf5 rlang tidyselect zoo]; }; + NEONiso = derive2 { name="NEONiso"; version="0.6.4"; sha256="0fwz6clfl9l38pmks1qq3sys8jnb7mib81nfq1k1hdwhjknr76hz"; depends=[caret data_table dplyr ggplot2 gridExtra httr lifecycle lubridate magrittr neonUtilities R_utils rhdf5 rlang tidyselect zoo]; }; NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; }; NFCP = derive2 { name="NFCP"; version="1.2.1"; sha256="16dvk8jiyzd94lfif0nkwc0ix05is8bhyykaaa6p1irwgzk8cia4"; depends=[curl FKF_SP LSMRealOptions MASS mathjaxr numDeriv Rdpack rgenoud]; }; NFLSimulatoR = derive2 { name="NFLSimulatoR"; version="0.4.0"; sha256="1s11jr684dvc25rapdi1mslk4z8ajrcf20ibnz6rr22ga3pylxyn"; depends=[data_table nflfastR progress]; }; @@ -3288,20 +3299,22 @@ in with self; { NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-5.1"; sha256="1ca7cqfjzrhn0idgw8viqlr2w4lkzng64bqk8hvd08qm7bgg5vjl"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; - NMA = derive2 { name="NMA"; version="1.3-1"; sha256="0vydwa3sh7si90gsmfxjaiqphqfj7dwjldmbj797b1c3ai6y2zfi"; depends=[forestplot ggplot2 MASS metafor stringr]; }; + NMA = derive2 { name="NMA"; version="1.3-2"; sha256="037a6m7lg1k4pjcrad4p4vcjx82v1r1j5yh1kncx95wgf441jmr4"; depends=[forestplot ggplot2 MASS metafor stringr]; }; NMADiagT = derive2 { name="NMADiagT"; version="0.1.2"; sha256="0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp"; depends=[coda ggplot2 imguR ks MASS MCMCpack plotrix Rdpack reshape2 rjags]; }; NMAoutlier = derive2 { name="NMAoutlier"; version="0.1.18"; sha256="0h0pxjg6ppz9zv7wcv1dka5g0f9wxk3bnwicfpsv1advcam4vmmn"; depends=[ggplot2 gridExtra MASS meta netmeta reshape2]; }; NMF = derive2 { name="NMF"; version="0.26"; sha256="1h1fpjnj6vjvi9ygxpfxs8k5bhly0aflr54zj88khgzkylp5ci4d"; depends=[Biobase BiocManager cluster codetools colorspace digest doParallel foreach ggplot2 gridBase RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0.1"; sha256="1fdrw69zz2ri6wi1kd7v960kykacjxyr37iv8q5h7kwiidl0ha76"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; NMMIPW = derive2 { name="NMMIPW"; version="0.1.0"; sha256="13mv6dpmlldqxkxq6kiydsfwyys5w7i8ws80a5l3377i5chdqi2c"; depends=[lava nloptr numDeriv]; }; - NMOF = derive2 { name="NMOF"; version="2.7-1"; sha256="08sfckjglrii0hn9ka5pdbx3k5y6s4f1w5wa1jcb0gsvyffk0gmh"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="2.8-0"; sha256="12n2dsgng39q9jn8m6q7bx2va389ham869yb5ydkwrqywjdkmibd"; depends=[]; }; + NMRphasing = derive2 { name="NMRphasing"; version="1.0.1"; sha256="007xxgpq9nw646x1vim0j2ci7r077iww7z6n1g7gm3p5928x9l99"; depends=[baseline MassSpecWavelet]; }; NMTox = derive2 { name="NMTox"; version="0.1.0"; sha256="1slz6bq57l3f2wqd2nhm3b7dag6vg7wy9zi5rpl7ld1yyqfb0wfp"; depends=[dplyr forcats ggplot2 gridExtra Iso tidyr]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; NMcalc = derive2 { name="NMcalc"; version="0.0.1"; sha256="15jf38yvyiasq6bvnv23znp64njag432f1jb9zayghsny63m3dcl"; depends=[data_table]; }; - NMdata = derive2 { name="NMdata"; version="0.1.0"; sha256="18c82b04mav30490nswbqqpc7vvdk1bcjdx5ndl0xskxpihx4cs7"; depends=[data_table fst]; }; + NMdata = derive2 { name="NMdata"; version="0.1.2"; sha256="0r9rzq4qi2i49b03ap8s2cqx5vbbrdsh3xmqancq62r8fiydvzbd"; depends=[data_table fst]; }; + NMsim = derive2 { name="NMsim"; version="0.0.4"; sha256="1k6ifkkjl2dzravj2l0nfhf4aycy4hwk2gpvhl4jxfapbcr083vb"; depends=[data_table MASS NMdata R_utils]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="10.0"; sha256="1995fjsnxjcvzi0k2zdayvchzd8l5vpv3vfkdzca6m5z4saxxzmi"; depends=[caret data_table doParallel foreach meboot quantmod Rcpp RcppParallel Rfast rgl stringr xts zoo]; }; + NNS = derive2 { name="NNS"; version="10.2"; sha256="0q6zgs15nm4jlg5mwd3a0g0rqh8665gqd33farxx00zzq0d8gv6c"; depends=[caret data_table doParallel foreach meboot quantmod Rcpp RcppParallel Rfast rgl stringr xts zoo]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NNbenchmark = derive2 { name="NNbenchmark"; version="3.2.0"; sha256="086smk3xy6p6ianw41h3gx806q7h28v1dg9d3khsrwyyf9gn8xyp"; depends=[pkgload R6]; }; NO_PING_PONG = derive2 { name="NO.PING.PONG"; version="0.1.6"; sha256="1i8pwk4p43yqmk8irkmvza080sngmng0wv1yr847253a0frjg9mr"; depends=[MASS MCMCglmm metafor]; }; @@ -3314,26 +3327,28 @@ in with self; { NPHazardRate = derive2 { name="NPHazardRate"; version="0.1"; sha256="0na4iphva1dadz457ii8kxrhnki2asaxpbwr824rljyrldj9rcgg"; depends=[survival]; }; NPIstats = derive2 { name="NPIstats"; version="0.1.0"; sha256="0hbx2mzz1z2158c943dqfn0pq1aybj1xxy55mmvld4djr5zrlz9w"; depends=[dplyr]; }; NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; }; - NPP = derive2 { name="NPP"; version="0.4.0"; sha256="1891s5j39i728vqs6xz1bywnvgalsbiknn3yqsg71zlhj3h8ikll"; depends=[]; }; + NPP = derive2 { name="NPP"; version="0.5.0"; sha256="1c45gkqx27685am2qfiyq7rnlz809lmyi3jhffgf3jhqcyg9mwm7"; depends=[]; }; NPRED = derive2 { name="NPRED"; version="1.0.7"; sha256="0nkfgc9zy3gszmnay77yj7i0p8w1q8j1m9wb05hkrmhiacp4mbn4"; depends=[]; }; NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NRejections = derive2 { name="NRejections"; version="1.2.0"; sha256="0lzj7kyn4s8l306a6xwkgkv1z4dlfsr61i902lvdxv4ln4m6a5kq"; depends=[doParallel foreach matrixcalc mvtnorm StepwiseTest]; }; NSAE = derive2 { name="NSAE"; version="0.4.0"; sha256="1pig0b2g6z1pc6is3nw7m88zwvwpg3pwvifvyc6p38kbin57m1pb"; depends=[cluster lattice MASS Matrix nlme numDeriv rlist SemiPar spgwr]; }; - NSM3 = derive2 { name="NSM3"; version="1.17"; sha256="0cghd9facz3hczw9g69swpv704sv8xfmr38snwq307h45kgdk27h"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.18"; sha256="0m0ijafjlw9pili0hxfrv5blj9ysxhhwj6c4hpnp5ry97a4gkib9"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.4.0"; sha256="1wxp7rp43gl3xgwln8d1s7b7a5zhz4dlshf9dzgb2ippvjxjqbmc"; depends=[httr jsonlite]; }; NST = derive2 { name="NST"; version="3.1.10"; sha256="1ycpccg7hcg84ygjzksbi0fcrkisvis5165bbnj64h52gjifgxh7"; depends=[ape bigmemory DirichletReg iCAMP permute vegan]; }; NScluster = derive2 { name="NScluster"; version="1.3.6-1"; sha256="0qaf36pf5gd91ivy4ns5gppmrzxcha7ghyih4hcbnxs2291jck0x"; depends=[]; }; + NTS = derive2 { name="NTS"; version="1.1.3"; sha256="0scj05h2r3sg34n0lmarbrgavz6q2n23gvs2v4w5q249q2cx6iis"; depends=[dlm MASS MSwM Rdpack tensor]; }; NTSS = derive2 { name="NTSS"; version="0.1.2"; sha256="1i3y3psr17p8p7s799sdki3pndb82pydl2g3dcz18snynjpmd31j"; depends=[geoR GET ks spatstat spatstat_explore spatstat_geom spatstat_model spatstat_random]; }; + NU_Learning = derive2 { name="NU.Learning"; version="1.5"; sha256="03g6hy9x9r9ydld14qpglxh09amm65hinq8i4wbnqhvg4b3wqbjx"; depends=[cluster lattice]; }; NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; }; - NVCSSL = derive2 { name="NVCSSL"; version="1.0"; sha256="00dpi0b0zm5cfkyb2z8wfkw6xcax2kkplm9rzkvfjz7fchlmkx5r"; depends=[grpreg Matrix plyr]; }; - NameNeedle = derive2 { name="NameNeedle"; version="1.2.6"; sha256="0cs65hs6fbkxv8pc2m4394c68nqbahjcryjnhhrhg50wam3y03lq"; depends=[]; }; + NVCSSL = derive2 { name="NVCSSL"; version="2.0"; sha256="1nsdhmay2blfa07ri1kfb204di8s5i7zk7qwwlbkhdjjl0qa3vd7"; depends=[dae GIGrvg grpreg MASS Matrix MCMCpack mvtnorm plyr]; }; + NameNeedle = derive2 { name="NameNeedle"; version="1.2.7"; sha256="14w8amhaar6wksnpkssdgjlmyqb4n7qxda29vy6rps2dxfvi6klc"; depends=[]; }; NasdaqDataLink = derive2 { name="NasdaqDataLink"; version="1.0.0"; sha256="1dxsp8dq0r7zvl5rlx8x068lx30v06zzyapzq2zv207shhwgd9lq"; depends=[httr jsonlite xts zoo]; }; NatParksPalettes = derive2 { name="NatParksPalettes"; version="0.2.0"; sha256="1arh6w08c0y6dzixza912rkhanid9c8rxlcqrmv6h98mqmsip9cf"; depends=[ggplot2]; }; NatureSounds = derive2 { name="NatureSounds"; version="1.0.4"; sha256="1l8c0zn0bbrcdf098pcbr8fvrl614cl6iq820q0sd7sr36n3k1jr"; depends=[knitr tuneR]; }; NbClust = derive2 { name="NbClust"; version="3.0.1"; sha256="0k5hr4zgx4gp1n62xchgz2zvyl35ba2cnczhhvj8rfbg2n4hx6qs"; depends=[]; }; Necklaces = derive2 { name="Necklaces"; version="1.0"; sha256="0caq7l3xqhxssag42qi122j2ixmzng8hi4qjb0f114d9r88x64l7"; depends=[kStatistics]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; - NegativeControlOutcomeAdjustment = derive2 { name="NegativeControlOutcomeAdjustment"; version="0.0.5"; sha256="0nwz0xk59imsfjn9p3b0qkxi2h62b5ck16w1cvfy8a4r1dk22lil"; depends=[]; }; + NegativeControlOutcomeAdjustment = derive2 { name="NegativeControlOutcomeAdjustment"; version="0.0.6"; sha256="02p19pc0pkw0dfac0hp1jdcm3g18sriizhqj73jp2yj66xlx1z52"; depends=[]; }; Neighboot = derive2 { name="Neighboot"; version="1.0.1"; sha256="18r6cww9g4fchf6hlwkw1lajh0lg4ch6msvx54zqgkrnhpixchnc"; depends=[dplyr igraph RDS RDStreeboot]; }; NestMRMC = derive2 { name="NestMRMC"; version="1.0"; sha256="08zk9g3mkwyli94ry1s762ddniwzjlf89plh86sgxfrcrhx1m908"; depends=[dplyr iMRMC magrittr mvtnorm Rcpp]; }; NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.2.1"; sha256="15j54whvhqy26v1iikpk8ys75d7m5b188ggdzrlgzhjg0f9j45fl"; depends=[coda dplyr Rcpp RcppParallel]; }; @@ -3346,15 +3361,16 @@ in with self; { NetIndices = derive2 { name="NetIndices"; version="1.4.4.1"; sha256="0zi3b9i2apfdcm85k7ah6r6ad0v6rji5gysb410vc3bgrixa03lk"; depends=[MASS]; }; NetInt = derive2 { name="NetInt"; version="1.0.0"; sha256="08vmqjai1lakbb4zs895fn0hn3gw2q7zsdkx6yxidfff5qn4mq6b"; depends=[mathjaxr]; }; NetMix = derive2 { name="NetMix"; version="0.2.0.1"; sha256="0363z06y7ildk7bifhj2lmva0hf591nyp10x9ccd6csj387n968p"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo]; }; - NetOrigin = derive2 { name="NetOrigin"; version="1.1-5"; sha256="0rskc33pvsajpy0f1baagwmaks49xmydxinjspbkny7p3kaihrkf"; depends=[colorspace corpcor dplyr Hmisc igraph mvtnorm plyr tibble]; }; + NetOrigin = derive2 { name="NetOrigin"; version="1.1-6"; sha256="0brjg6w79r6bkga9dpqph9l7k6wq5hvsjfhrwx7dnyr437f7z4hk"; depends=[colorspace corpcor dplyr Hmisc igraph mvtnorm plyr tibble]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.2"; sha256="07drrgvgl3msbcxi113hinqss30lkzrv9hqkzwa41bpssfq8x68c"; depends=[graph]; }; - NetRep = derive2 { name="NetRep"; version="1.2.6"; sha256="0hyj91fr4y9csj2dy4z9cpr92hh8gk3xnjr6zpk9n0wk37sx44h6"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; + NetRep = derive2 { name="NetRep"; version="1.2.7"; sha256="02ss45giv30pi31b5rysa36bn5c4fs5x58g4vb0arz9cnicznv97"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; NetSci = derive2 { name="NetSci"; version="1.0.0"; sha256="1fliilk5z7lldkry5kijwab0k6ysqy87fcfrnwyywxkpxxrv1578"; depends=[binr cubature dplyr igraph magrittr Rfast wTO]; }; - NetSimR = derive2 { name="NetSimR"; version="0.1.2"; sha256="018672x5x5f8pjap5y9qkjskwybrvmvfpn1736c5b7pf1hw5xzx6"; depends=[future future_apply rmarkdown scales shiny shinybusy]; }; + NetSimR = derive2 { name="NetSimR"; version="0.1.3"; sha256="10rplfz94kj0lhlzv7nl0lsiwgimfjgcwz03rwhdixxwnlyj03gp"; depends=[DBI future future_apply plotly rmarkdown RMySQL RODBC RPostgreSQL RSQLite scales shiny shinybusy shinyjs]; }; NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; }; NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; }; NetworkChange = derive2 { name="NetworkChange"; version="0.8"; sha256="03rzyfiwbqpr4jj3wdg3s1gnfizz39j07yk0q2fkq3a8pfx4w306"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr tidyr]; }; - NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.2.1"; sha256="0a4v69p1xykzb4s9sqj2bqm333a6sx2j8f8jdnp3l7dlkwg9clqp"; depends=[IsingFit IsingSampler Matrix qgraph reshape2]; }; + NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.2.2"; sha256="08v29q7shygbbdbfrw6vpdhbs2qb4x8hycg0vhlfsm0w0fwivxhi"; depends=[IsingFit Matrix networktools qgraph reshape2]; }; + NetworkComparr = derive2 { name="NetworkComparr"; version="0.0.0.9"; sha256="11vzcm80dvrk0cadiwg1zy7iml6q43777rzq2phg7dc3s0p1fian"; depends=[dplyr gdata igraph networktools qgraph reshape2]; }; NetworkDistance = derive2 { name="NetworkDistance"; version="0.3.4"; sha256="0z3q15aq5jqwbyxr4464nq74ib7644f185h8wfzvfi491xkrl4cr"; depends=[doParallel foreach graphon igraph Matrix network pracma Rcpp RcppArmadillo Rdpack RSpectra]; }; NetworkExtinction = derive2 { name="NetworkExtinction"; version="1.0.3"; sha256="1y2f715y077bwj8ymamrskwhbc7adg7q9ijkks2yr2gwj8i47xy4"; depends=[broom doParallel doSNOW dplyr foreach ggplot2 igraph magrittr MASS network patchwork purrr rlang scales sna tidyr]; }; NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; @@ -3365,21 +3381,23 @@ in with self; { NeuroDecodeR = derive2 { name="NeuroDecodeR"; version="0.1.0"; sha256="0awz4kf8pdrb4jfh4x1cpawhijnvkkz58b0nshbvi6cx5r4122z3"; depends=[doSNOW dplyr e1071 forcats foreach ggplot2 gridExtra magrittr purrr R_matlab scales stringr tibble tictoc tidyr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.10"; sha256="16lhs1wq4593yj5q1kw0rq085i4dja6x3pw5crnj4l4zib8gpdb1"; depends=[oompaBase]; }; - NiLeDAM = derive2 { name="NiLeDAM"; version="0.2"; sha256="036hbzpfx9awq15fdnbfzmc5f84zq97kpzw0wds0m0ksxj8qhd73"; depends=[dplyr ggplot2 magrittr nleqslv rlang scales shiny shinyjs shinythemes thematic tidyr]; }; + NiLeDAM = derive2 { name="NiLeDAM"; version="0.3"; sha256="1xqj33182fz6x633vs9iy3rxr7m13bqn1773fphs1sb8mvxwdvzq"; depends=[dplyr ggplot2 magrittr nleqslv rlang scales shiny shinyjs shinythemes thematic tidyr]; }; NicheBarcoding = derive2 { name="NicheBarcoding"; version="1.0"; sha256="16jkznc4624ww7vwid6f3m90wm2ds2c7zf1j1sw16dyrqmlyk9w3"; depends=[ape dismo e1071 maps pROC randomForest raster rJava spider vegan]; }; NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; }; NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; }; NlcOptim = derive2 { name="NlcOptim"; version="0.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; }; NlinTS = derive2 { name="NlinTS"; version="1.4.5"; sha256="045gqsy9q64mh10swm9a1bh8jvr41rjks3024cc195lad6jhj441"; depends=[Rcpp Rdpack timeSeries]; }; + NlsyLinks = derive2 { name="NlsyLinks"; version="2.2.1"; sha256="19w7jgvdz77lmwks0a4icrkarjfnwx6bcjkj4ss90zjs7nsfyafb"; depends=[lavaan]; }; Nmisc = derive2 { name="Nmisc"; version="0.3.7"; sha256="1k43cp63h96xv3f28fpvw7p2yh3lv1jbhq9bdp3yk6cg0870vya7"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; }; - Nmix = derive2 { name="Nmix"; version="2.0.4"; sha256="0ikmmc5y2211i9mh4f99f2cfnx8z9flgd8x43hin9pqy821vjyaf"; depends=[]; }; + Nmix = derive2 { name="Nmix"; version="2.0.5"; sha256="03zc2g9jlxp4nn78c7l7z9jf83l8xsw57aiz9p62dw7vxjj318xd"; depends=[]; }; NonCompart = derive2 { name="NonCompart"; version="0.6.0"; sha256="0cda8rd45irx8q33zs9hcfhsanq09hnx3fpkpa9173pn0j6iw0zv"; depends=[]; }; NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.2"; sha256="11xqdrx03q3anavyxpzb0hz6mcbdy252rzzjlpa2byfdlrfvn178"; depends=[cubature]; }; NonParRolCor = derive2 { name="NonParRolCor"; version="0.8.0"; sha256="1rh345vydbg31pbkagyb2xmsy8riam9zj7sc86m6dqvl19lglvg5"; depends=[colorspace doParallel foreach gtools pracma scales]; }; NonProbEst = derive2 { name="NonProbEst"; version="0.2.4"; sha256="1w2ihnwwdnxlnphyd26261lsxaknpi51c15rmn9m183djz9gsvdv"; depends=[caret e1071 glmnet Matrix sampling]; }; NonlinearTSA = derive2 { name="NonlinearTSA"; version="0.5.0"; sha256="1z3fqw19kksadc31f1idrj37gzajrx91pprd07xdar7j6hddf4sn"; depends=[car minpack_lm tsDyn]; }; Nonpareil = derive2 { name="Nonpareil"; version="3.4.0"; sha256="130aags0pgry0d34mj1n4lavc8q43hls7c3jhmkr8k6vyg3ij372"; depends=[]; }; + NormData = derive2 { name="NormData"; version="0.1"; sha256="122l1v4kmgbamix2gdbz2zdv4ng7zba05rxh1j4z0ffficmax4nq"; depends=[car doBy dplyr lmtest MASS openxlsx sandwich]; }; NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; }; NormPsy = derive2 { name="NormPsy"; version="1.0.8"; sha256="13w4xjdjjg9mzmfaflc0gp306kazyvxshpj4vnl6gym3vpi9qax8"; depends=[lcmm]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; @@ -3391,13 +3409,12 @@ in with self; { NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="1.3.0"; sha256="0s7ax1aqvlph92y0pfs5ji2b4fjig2ig2zcl5vlffcilwm4ccrpp"; depends=[ggplot2 shiny]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-4"; sha256="0b5v275w0c7y073fgwiy966djrw6p1zggzqlywa2fsdn2p0aq56w"; depends=[curl xml2]; }; OBASpatial = derive2 { name="OBASpatial"; version="1.9"; sha256="13jx5f5piii9cys7xyhfwilyg87zsi632fscy8902mlhbgg7abkp"; depends=[cubature HDInterval invgamma LaplacesDemon modeest mvtnorm truncdist]; }; - OBIC = derive2 { name="OBIC"; version="2.0.1"; sha256="0yrgnrhxn5nv0gbhzj2psskr12yaygv7bns64al1cgk18dlrsgb0"; depends=[checkmate data_table]; }; + OBIC = derive2 { name="OBIC"; version="3.0.0"; sha256="12153khmqp88kxrbdkhbwwxhcp3nmi64xa1rmq6b702qp4c5m534"; depends=[checkmate data_table]; }; OBL = derive2 { name="OBL"; version="0.2.1"; sha256="06icw1dnmavgaf51fs2nfi6582cpjrnlii1j9s62nwnwfnqw00v3"; depends=[dplyr forcats foreach forecast ggplot2 tibble]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBRE = derive2 { name="OBRE"; version="0.2-0"; sha256="1x1s46yffjr140mwx8amnh02k6g8x2gz5hz7lypiwxh0v7a8bm8w"; depends=[pracma]; }; - OBsMD = derive2 { name="OBsMD"; version="6.1"; sha256="0jvvcx2lc39rdnlbhykam6cf94lbci9zc1vshwfhvygblnmjgrzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.5"; sha256="19bayggqkzzpvn7ax8m8xgvz27a03iyybsxjz2vphf03dwsr8c5h"; depends=[mathjaxr]; }; - OCNet = derive2 { name="OCNet"; version="1.1.0"; sha256="0cgvgl1hzdb55gc733bli78jr8jfc5z9aaxpcqrg97n5ivln9yyh"; depends=[adespatial fields igraph Rcpp rgdal rgl sp spam SSN]; }; + OCNet = derive2 { name="OCNet"; version="1.2.0"; sha256="1rkvx62aigms959fx1iw0kshqlzpix20r0r3pn5csjipwjbjj7ym"; depends=[adespatial fields igraph Rcpp rgl spam spdep]; }; OCSdata = derive2 { name="OCSdata"; version="1.0.2"; sha256="0119c2i9k63mbz40lbbf7x59nf4yyhrmaynn0m0sh1h3jjbsiazc"; depends=[httr purrr usethis]; }; ODB = derive2 { name="ODB"; version="1.2.1"; sha256="0frkbl99ilpmppm4fm97lbkqhmjgcwlz9j5vh5nzzcsxrh8qwicn"; depends=[DBI RJDBC]; }; ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.2"; sha256="0wicp0xxqq3jl0kjhc26iqpk8rwa9nv2aiwf18pkgnqxbyw6lgnp"; depends=[checkmate deSolve]; }; @@ -3414,14 +3431,13 @@ in with self; { OLCPM = derive2 { name="OLCPM"; version="0.1.0"; sha256="0bylr62ma4wbbkjnp67whlndch1vwilm083wlkrfdnmhwqigzjz0"; depends=[LaplacesDemon RSpectra]; }; OLStrajr = derive2 { name="OLStrajr"; version="0.1.0"; sha256="1ln2as15aay4hzdm82yc024dlv7wdip9l5dryrdhkmmhjy026gia"; depends=[boot broom ggplot2 purrr tidyr tidyselect]; }; ONEST = derive2 { name="ONEST"; version="0.1.0"; sha256="07mfykpkcgcqafw1w3qr9x83zpy2p0q7v1zkgwpd69g79j0r3yap"; depends=[]; }; - ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; }; OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; }; OOI = derive2 { name="OOI"; version="0.1.0"; sha256="0ivxgq539v68kak3zzakywppba0grzh7qn1h404s4ag30cxv0g8p"; depends=[modi]; }; - OOR = derive2 { name="OOR"; version="0.1.3"; sha256="13v04rx2q6pbiq7dyd29wvimkr4sbq2f5rnn3a0lcbwr3x35r7h9"; depends=[]; }; + OOR = derive2 { name="OOR"; version="0.1.4"; sha256="0p5bi4z6q2kz1hkn12hy7qsn1sdb336y8phmznd8cayyfil7hjvh"; depends=[]; }; OOS = derive2 { name="OOS"; version="1.0.0"; sha256="0jnj5y26rv0i2561mywcxb7aavmpq16ippq6rblb8jiqjd05nhib"; depends=[caret dplyr forecast furrr future ggplot2 glmnet imputeTS lmtest lubridate magrittr purrr sandwich tidyr vars xts zoo]; }; OPC = derive2 { name="OPC"; version="0.0.2"; sha256="01ljrczj9ds18x40fas4rsca4phqsjaz8w8nvbr7xprf4fp8zpcj"; depends=[MASS]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; - OPI = derive2 { name="OPI"; version="2.10.1"; sha256="0yzl3s0bkygwh1mg2fshf370k7hr0iw091k1jpwf92fvym1a68ia"; depends=[]; }; + OPI = derive2 { name="OPI"; version="2.11.0"; sha256="1y0z6kcvc8v1rk6fbi3j6sknd6wkfddlby49vapkp112xqjcmjkw"; depends=[abind Rfast]; }; OPTS = derive2 { name="OPTS"; version="0.1"; sha256="0h382gcjq2f4qm63xnqvhjvxyn9w01dzx8964fk6cm2izhw04bk2"; depends=[changepoint cvTools MASS]; }; OPTtesting = derive2 { name="OPTtesting"; version="1.0.0"; sha256="1d5pkvrzz5hvr764kyliyba5mgix9y340gdcvc0d0si41rz12r91"; depends=[quantreg rootSolve RSpectra]; }; ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; }; @@ -3434,19 +3450,20 @@ in with self; { OSDR = derive2 { name="OSDR"; version="1.1.4"; sha256="0yf9l0fkqf9adanl8182nyislj2s2xvsnf2xp5y7pdj3af2k4m7w"; depends=[]; }; OSFD = derive2 { name="OSFD"; version="1.0"; sha256="1xw76hi34vgq1r6r22z4bqp114nzg4h85mvz6pya724vyf110vhg"; depends=[dplyr lhs Rcpp RcppArmadillo twinning]; }; OSLdecomposition = derive2 { name="OSLdecomposition"; version="1.0.0"; sha256="0xz27p4wd1a5y8x24sqgpyvgdwi2dzk4qh2s50xrdr82prb2znkv"; depends=[DEoptim ggplot2 ggpubr gridExtra Luminescence minpack_lm rmarkdown scales]; }; - OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; + OSMscale = derive2 { name="OSMscale"; version="0.5.20"; sha256="14n5574j083xllj0xs87cl8szc0favb8wp3v10bbdljbk35qvmbm"; depends=[berryFunctions OpenStreetMap pbapply sf]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; OSTE = derive2 { name="OSTE"; version="1.0"; sha256="0l8whr883g3jp5ckgxr4zf9vj055jrjb7pfraacd15smnrbl0v5d"; depends=[pec prodlim ranger survival]; }; OSsurvival = derive2 { name="OSsurvival"; version="1.0"; sha256="1fbxddbhppqlh49wgh2fldixar5mk7rywjbfvbpdb6fvpgn1sc4g"; depends=[]; }; OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.1"; sha256="007wnad6ka3d5hx9l537m6cvk9qlf0lirrz54yy665szyprpqy27"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; + OTclust = derive2 { name="OTclust"; version="1.0.6"; sha256="00609z2fp3ijqid7yjgh045xz038h5jl7i1k2kww3kfpcf40mhzs"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; OTrecod = derive2 { name="OTrecod"; version="0.1.2"; sha256="1w3w6vsp5v2sccpn0zzjiwcnwmgcindh7wnsnf90qprvjwlys7mw"; depends=[dplyr FactoMineR mice missMDA ompr ompr_roi party plyr proxy rdist ROI ROI_plugin_glpk StatMatch vcd]; }; OUwie = derive2 { name="OUwie"; version="2.10"; sha256="19bh0vb7azxpzrjw2829gcjcq91fnzb5ybhkp3fsvg9xccmjq9dg"; depends=[ape corpcor geiger igraph interp lhs nloptr numDeriv paleotree phangorn phylolm phytools RColorBrewer]; }; OVtool = derive2 { name="OVtool"; version="1.0.3"; sha256="1ghfbvnfl092g0kikgjghgf0l1y7ihqykssfvvfi6q6pgzl8kz4y"; depends=[Amelia devtools dplyr EnvStats ggplot2 ggrepel glue magrittr metR progress purrr rlang survey tibble tidyselect twang varhandle]; }; OWEA = derive2 { name="OWEA"; version="0.1.2"; sha256="05h3aj074manlwnlzqp023zkql6gmsm9p1nfs6zki7ifdd83wj7m"; depends=[gtools MASS shiny]; }; Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; }; - OasisR = derive2 { name="OasisR"; version="3.0.2"; sha256="1388ld2nws3ppnkavg8s59q3inqf365c5cf9qvzbj6icmwqs9rdd"; depends=[measurements outliers rgdal rgeos seg spdep]; }; + OasisR = derive2 { name="OasisR"; version="3.1.0"; sha256="0jni6l3fbrd3pz34lis6zf6pqm3r29z32mxvkdfp4x9ncg68dlrs"; depends=[lwgeom measurements outliers seg sf spdep]; }; Observation = derive2 { name="Observation"; version="0.3.0"; sha256="1z9ldp050f7jy76s8yk509nwjx1ymvk5k9d19i67brd7xcawxnr3"; depends=[svDialogs]; }; OceanView = derive2 { name="OceanView"; version="1.0.6"; sha256="1ww6xhpvs3y0zx7pgj8083a8v4l4cm0b0b497b4gsjbcbnbnal9c"; depends=[plot3D plot3Drgl rgl shape]; }; OddsPlotty = derive2 { name="OddsPlotty"; version="1.0.2"; sha256="0adgbrni7yrarybh0djmq68hifwqzn2rn9mfqgwqma1d7mg3ai93"; depends=[caret e1071 ggplot2 ggthemes magrittr mlbench rmarkdown tibble tidymodels]; }; @@ -3457,16 +3474,16 @@ in with self; { OlympicRshiny = derive2 { name="OlympicRshiny"; version="1.0.0"; sha256="17caq517hqd89qvlsmirrcb7l9ny55rqyfrwhx037s30005mxq9f"; depends=[config dplyr forcats ggplot2 golem shiny shinybusy shinythemes summarytools]; }; OmegaG = derive2 { name="OmegaG"; version="1.0.1"; sha256="1aihcrgml67rvnx9vpnq2nnbc79kicw4ks1fradsa36ykkdz6b1g"; depends=[]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; - OmicNavigator = derive2 { name="OmicNavigator"; version="1.13.6"; sha256="18612sicjjx47h45azg8kkqf73shy8xq37b3ra3wgbryp82amqw0"; depends=[data_table jsonlite]; }; - OmicSense = derive2 { name="OmicSense"; version="0.1.1"; sha256="0rxq3siil4gbwrjp04mg970mgsy3vx2kyqldl40039gs0km7zb7n"; depends=[ggplot2 kernlab]; }; + OmicNavigator = derive2 { name="OmicNavigator"; version="1.13.13"; sha256="0dfc3v5n7sms0fjgm8g0f1r810q139378ha0i86hv1s88psxy08x"; depends=[data_table jsonlite]; }; + OmicSense = derive2 { name="OmicSense"; version="0.2.0"; sha256="0nac0ahciyajsicrs4rkn54xiwgvdm4m2kbg6icbsygwzzp2w14z"; depends=[ggplot2 kernlab]; }; OmicsPLS = derive2 { name="OmicsPLS"; version="2.0.2"; sha256="08vx4925j5ln366h7nzhf1ra5ciplrqw911258chi9di7gpm8g50"; depends=[dplyr ggplot2 magrittr softImpute tibble]; }; Omisc = derive2 { name="Omisc"; version="0.1.5"; sha256="0p0iraascyx16y05rpc2c9k25s4crc0wrxy58dpj7jd47g2360ar"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; OnboardClient = derive2 { name="OnboardClient"; version="1.0.0"; sha256="15ymf163a80s4yvi5z884irvkb1ivnxpr505z96s23hs8ibhk2bh"; depends=[data_table dplyr httr jsonlite lubridate plyr rrapply rstudioapi stringr tibble tidyr tidyselect]; }; OncoBayes2 = derive2 { name="OncoBayes2"; version="0.8-9"; sha256="06k0lbriyx6b1nlvpyjhf5g8dp8wa37wi1pmlpfqq7ryivp39v38"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 matrixStats posterior Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tibble tidyr tidyselect]; }; - Oncotree = derive2 { name="Oncotree"; version="0.3.4"; sha256="11pn50zshv1rl2mvars5iwzqfzlm9i8rd1rlz3pn1nn94051d8ab"; depends=[boot]; }; - OneArm2stage = derive2 { name="OneArm2stage"; version="1.1.5"; sha256="14vrf3x625c0xad18pajbgb4d4l57f1gqhy4y2l3wg1m1i2kiyns"; depends=[flexsurv IPDfromKM survival]; }; + Oncotree = derive2 { name="Oncotree"; version="0.3.5"; sha256="1c40xggz3ldgma73ik0m10asamd9kns4i30w3zgw4hvpyzalbvm4"; depends=[boot]; }; + OneArm2stage = derive2 { name="OneArm2stage"; version="1.2.1"; sha256="040yv2bl6s7b1bgma7z1hgrsj8iynzayjc77ncp401nd1ng5wmw5"; depends=[flexsurv IPDfromKM survival]; }; OneArmTTE = derive2 { name="OneArmTTE"; version="1.0"; sha256="186386pjjvlfq38950n1sdx0wq31q8ggjlqlrn07v68bcqjl70y6"; depends=[dplyr survival tibble tidyr]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneSampleMR = derive2 { name="OneSampleMR"; version="0.1.3"; sha256="18d467bhym9mp41n65rp0wg75f40szc7w5804p3hh9xqw7c3q2qq"; depends=[Formula gmm ivreg lmtest msm]; }; @@ -3480,13 +3497,12 @@ in with self; { OpenMx = derive2 { name="OpenMx"; version="2.21.8"; sha256="1vvlb9q3w6i6g7kf0r5jnrlmdxskh3rbfss90icand046rl37qdz"; depends=[BH digest lifecycle MASS Matrix Rcpp RcppEigen RcppParallel rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.14"; sha256="1gy06cyjb50673jb9548c9v37im4hsm245r7rwhx280q9fsn17ws"; depends=[abind colorspace crayon dplyr igraph openxlsx plyr psych pvclust rgl scales stringr tidyr XML]; }; OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.6.1"; sha256="1h6n44szm5fa04fsnq0yvqp3m8djxsh5v3y409hzjgvb90vjzmyz"; depends=[dplyr DT formattable igraph magrittr openxlsx RColorBrewer reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr tidyr tidyverse withr]; }; - OpenSpecy = derive2 { name="OpenSpecy"; version="0.9.5"; sha256="1m163jyzad6i70d7h98rwdziq9swilj4kwr1mhis2nk8k30ksk4v"; depends=[digest dplyr hexView hyperSpec osfr rlang shiny signal]; }; - OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; }; + OpenSpecy = derive2 { name="OpenSpecy"; version="1.0.4"; sha256="0hzfzmy8251im31h3l5lvd9hc5qqqx38rlg82w51nxk4z7yar043"; depends=[caTools data_table digest glmnet hyperSpec imager jsonlite osfr plotly shiny signal yaml]; }; + OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.4.0"; sha256="0iq3y3331rjppc8nfx9krrrfybyn1spwfp15hf3vz8mnmcg86dkf"; depends=[ggplot2 raster rJava sp]; }; OpenTreeChronograms = derive2 { name="OpenTreeChronograms"; version="2022.1.28"; sha256="0si5aaami2x705fmzp9357h1nwhdm3sb829cbvf7zfyicqyaihkg"; depends=[ape geiger knitcitations paleotree plyr rotl stringr taxize treebase usethis]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; Opt5PL = derive2 { name="Opt5PL"; version="0.1.1"; sha256="0v3ibfzmkfnkhxylhaqcd3yqygsk7027ga12vb6gj4h4zcccf17f"; depends=[matrixcalc Rcpp]; }; OptCirClust = derive2 { name="OptCirClust"; version="0.0.4"; sha256="0g34kn2gmvy9r4ph0vbssc9gl8bcpw6d72b8zpf38iml4zh52b0n"; depends=[Ckmeans_1d_dp plotrix Rcpp Rdpack reshape2]; }; - OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; }; OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptHoldoutSize = derive2 { name="OptHoldoutSize"; version="0.1.0.0"; sha256="0ab0vvbg1nmpbbhq5a5nkwv7ap0fq4542l5da7g8qlwc23h6sfs5"; depends=[matrixStats mle_tools mnormt mvtnorm ranger]; }; OptM = derive2 { name="OptM"; version="0.1.6"; sha256="1x3df5qmbs920rgxpc32grwran49nxpnw9swrba9877c0ixg2dww"; depends=[boot SiZer]; }; @@ -3495,12 +3511,12 @@ in with self; { OptimaRegion = derive2 { name="OptimaRegion"; version="1.2"; sha256="01nbisv45amv5pfnl0hmbc751qjkjvw8xsva50q8ypm02p2jw07f"; depends=[boot DepthProc fields magrittr nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-5"; sha256="07lgh3maxvz8vmw3zd02bfy7yp4jn0krflnqpp5bax3zhy6kmmbi"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; }; - OptimalGoldstandardDesigns = derive2 { name="OptimalGoldstandardDesigns"; version="1.0.0"; sha256="19nc1ljj63bivbmfvkm7z89v8b1fp59ya0j8kip3b6sa1yrj6j6p"; depends=[cli dplyr mvtnorm nloptr Rdpack scales tibble]; }; + OptimalGoldstandardDesigns = derive2 { name="OptimalGoldstandardDesigns"; version="1.0.1"; sha256="1rw3syj5wb1v8ryqc9vkchi62pf02460f5i5zapq2azgfg99l66y"; depends=[cli dplyr mvtnorm nloptr Rdpack tibble]; }; OptimalRerandExpDesigns = derive2 { name="OptimalRerandExpDesigns"; version="1.1"; sha256="033qwzglpzjk302dr19yak34j2k19k6vihd3vlj9c8xsiikmrfmj"; depends=[ggplot2 GreedyExperimentalDesign momentchi2]; }; OptimalSurrogate = derive2 { name="OptimalSurrogate"; version="1.0"; sha256="1kw87h6im3s1xzj0va22w0av67s0qz59vmf36lkh2mi5x1mi7gws"; depends=[MASS]; }; OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; - OptionPricing = derive2 { name="OptionPricing"; version="0.1.1"; sha256="1x90v95mm1cylq0gnswniaf9imrjd7diid9hcv0vmffz4xa9ixks"; depends=[]; }; - OralOpioids = derive2 { name="OralOpioids"; version="1.1.0"; sha256="1i422my28dn9i2yxf7z856v9rw8g7xwabc9lw79y7ncb4f4qk0vz"; depends=[dplyr forcats ggplot2 magrittr openxlsx plyr purrr readr readxl reshape2 rlang rvest stringr tidyr xml2]; }; + OptionPricing = derive2 { name="OptionPricing"; version="0.1.2"; sha256="0c4pq9qzbnqsfgdqq29vnkxjcb5six4xfj2djv05zw8qnyvhaljg"; depends=[]; }; + OralOpioids = derive2 { name="OralOpioids"; version="1.2.0"; sha256="1hy7wllsv72lf4jlbijq6yazp75nzml3aanby4rfp1gfmmx19sv6"; depends=[dplyr forcats ggplot2 magrittr openxlsx plyr purrr readr readxl reshape2 rlang rvest stringr tidyr xml2]; }; Orcs = derive2 { name="Orcs"; version="1.2.3"; sha256="0b2h0vyvp6hnp9i03c8yxfhrlbdq0akdlw2ik0k5c09wfiq7amq6"; depends=[bookdown knitr lattice latticeExtra plotrix Rcpp remotes sf sp terra]; }; OrdCD = derive2 { name="OrdCD"; version="1.1.2"; sha256="1wg4sxirzp8r91qzzvrx4yashg1f574ayaxbviy8hdca3iydfl1j"; depends=[bnlearn gRbase igraph MASS Matrix]; }; OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; }; @@ -3513,7 +3529,6 @@ in with self; { OssaNMA = derive2 { name="OssaNMA"; version="0.1.2"; sha256="04y36yi1qvxazf0s563d41g91x2190r1c5phkgkfqdcml94dmnln"; depends=[DEoptimR NlcOptim]; }; Ostats = derive2 { name="Ostats"; version="0.2.0"; sha256="0d2qk76issb2k5f2ghfvpq0k8ra7d7nj9hp4ja1s0817zwr0g3zz"; depends=[circular ggplot2 gridExtra hypervolume MASS matrixStats sfsmisc viridis]; }; OutliersO3 = derive2 { name="OutliersO3"; version="0.6.3"; sha256="165v572w9bnvay9f0xyxzbhgj1i86ndia4rzqy98i48dfdbdb990"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; - OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.7"; sha256="0az36s6vrnfa93w12549v9zf6q9xg0a4kvrq5hnkaqxl314zaz1y"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; PAC = derive2 { name="PAC"; version="1.1.4"; sha256="0h7381mr3jgzl7fi6v7amgmkf5agpkgy068c6ysgh3adlwsh6gs6"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; @@ -3522,11 +3537,12 @@ in with self; { PAFit = derive2 { name="PAFit"; version="1.2.5"; sha256="07n27g2yy2lskna7qa4j6am3prdcwfnx98ppvcarsxgzvywz0scv"; depends=[ggplot2 igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PAMhm = derive2 { name="PAMhm"; version="0.1.2"; sha256="0k0n3ni0ypcizri39v76x1vv7hlxlmbpfi7w81yxy9inz7zz4zfw"; depends=[cluster heatmapFlex plyr R_utils RColorBrewer readmoRe readxl robustHD]; }; - PAMmisc = derive2 { name="PAMmisc"; version="1.11.4"; sha256="19qnipkis231fd3ys00hp98lja5l06fnqxyj6vj5pxzhqbrw2ql4"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries purrr RcppRoll rerddap rjson RSQLite scales seewave suncalc tuneR xml2]; }; - PAMpal = derive2 { name="PAMpal"; version="0.19.1"; sha256="19dbyvlmp22n5qzbr229810r00ff4ikfpr7b094nzsm4km77iz3x"; depends=[data_table dplyr gam geosphere ggplot2 knitr lubridate manipulate PamBinaries PAMmisc purrr reticulate rlang RSQLite seewave signal stringr tidyr tuneR xml2]; }; - PANACEA = derive2 { name="PANACEA"; version="1.0.0"; sha256="19d03bdynjnpfx1hgn4fjq8nqzwgykmkrv227p8jps4y45z8zzb3"; depends=[DBI igraph org_Hs_eg_db reshape2]; }; + PAMmisc = derive2 { name="PAMmisc"; version="1.11.6"; sha256="0x0pirzcxjkx5p3mqf3xn3a7ng5dah3z9pcrlkaj7d44y08kygj3"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries purrr RcppRoll rerddap rjson RSQLite scales seewave suncalc tuneR xml2]; }; + PAMpal = derive2 { name="PAMpal"; version="1.0.0"; sha256="0mr4c7ckw05mh5lmr0qhpas98122yn257gip6w2hwrcyziy5sc4v"; depends=[data_table dplyr gam geosphere ggplot2 knitr lubridate manipulate PamBinaries PAMmisc purrr reticulate rlang RSQLite seewave signal stringr tidyr tuneR xml2]; }; + PAMscapes = derive2 { name="PAMscapes"; version="0.5.3"; sha256="1r3p352mb0zqgqs6xp717j7in8s883l6rq82cyc8mi63a6cp99dp"; depends=[data_table dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PAMmisc purrr readr rlang scales sf tdigest tidyr]; }; + PANACEA = derive2 { name="PANACEA"; version="1.0.1"; sha256="0pq5kq0i87yrdfs6id2lc6gg4dqsa07fsas13yc8jw6bd9lcf6rh"; depends=[DBI igraph org_Hs_eg_db reshape2]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; - PASSED = derive2 { name="PASSED"; version="1.2-1"; sha256="1qzxc2xwqw1vc4ld8iask1aijmsl0jhw17rgph08hwl8cqmnm4nd"; depends=[betareg rootSolve]; }; + PASSED = derive2 { name="PASSED"; version="1.2-2"; sha256="000ha6q6cl79741rcri8pxirlps43vym1qwhkxwwpqz0b1dnbaws"; depends=[betareg rootSolve]; }; PASWR = derive2 { name="PASWR"; version="1.3"; sha256="1p4896r4k6c0aaag4mwds2azp41amf726c4v62zca92cpsay4nml"; depends=[e1071 lattice MASS]; }; PASWR2 = derive2 { name="PASWR2"; version="1.0.5"; sha256="124ybvqdz2ikwqagq6bw74487psrscwxkj0gqwz43p8kinkvx3ks"; depends=[e1071 ggplot2 lattice]; }; PASenseWear = derive2 { name="PASenseWear"; version="1.0"; sha256="0x84j1vdds4g08birmjxb0c2g1ahwv83bk11532jkmg32dnhmj58"; depends=[ggplot2]; }; @@ -3548,7 +3564,7 @@ in with self; { PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.13"; sha256="0mpf7m4daqaip18yfsyanrmbjq4ib9fw1b65ajdazicm400bw6gb"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; - PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; }; + PCGSE = derive2 { name="PCGSE"; version="0.5.0"; sha256="1j990gjd34dqfaqmnsmmpyxn6xbzrq0ncci85s87s7k15r8b22b4"; depends=[MASS RMTstat]; }; PCICt = derive2 { name="PCICt"; version="0.5-4.4"; sha256="1akfvlxmklwzlzdg1q1828dkf8rqy3pyypywhd06g1f0g87xk5x7"; depends=[]; }; PCL = derive2 { name="PCL"; version="1.0"; sha256="0sqlwg0aiw9f1z4x5nixv4x3rq5rnm5i1hijdqygnh9dvckfrgs0"; depends=[]; }; PCLassoReg = derive2 { name="PCLassoReg"; version="1.0.0"; sha256="1m79aiij4dglfz5qhm5h76hxpgszrpzfw37nvx2y6gcq6dya8krl"; depends=[grpreg survival]; }; @@ -3557,24 +3573,26 @@ in with self; { PCMRS = derive2 { name="PCMRS"; version="0.1-4"; sha256="0bf85zv3nl13gsdi96cd2qg7mfppsccs0ci7l204hws8nmbvri83"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCObw = derive2 { name="PCObw"; version="0.0.1"; sha256="07nfy733vfg19xdkqz1fjxhr6xn4cawbch7bqn93habb477mha1k"; depends=[Rcpp RcppEigen]; }; PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; }; - PCRA = derive2 { name="PCRA"; version="1.1"; sha256="0326dcshyjvy4yjmr5vd5aqy2rjhzc2slagd7fzz0rdg9l4qy8rp"; depends=[boot corpcor data_table lattice PerformanceAnalytics PortfolioAnalytics quadprog R_cache RobStatTM robustbase xts zoo]; }; + PCRA = derive2 { name="PCRA"; version="1.2"; sha256="0nc7pfvy43drjhfgql7bxf93xlkaqg083hc5cvirya1blrx2m48j"; depends=[boot corpcor data_table lattice PerformanceAnalytics PortfolioAnalytics quadprog R_cache RobStatTM robustbase xts zoo]; }; PCRedux = derive2 { name="PCRedux"; version="1.1-2"; sha256="1x3a4pdv54ppar9fjshk0avgpxvqsar4x7fgy9w0i76fgndr7qs5"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase segmented shiny zoo]; }; PCS = derive2 { name="PCS"; version="1.3"; sha256="0v9vczc9hml6mzxglh106a9f5gy3x5m471lkzaw3ps8z76sgrpyr"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; PCovR = derive2 { name="PCovR"; version="2.7.1"; sha256="1lvj3kf4pnvbr7lk3kzvh72akga49zx25b3w7nq24925s129sqx1"; depends=[GPArotation MASS Matrix ThreeWay]; }; PDE = derive2 { name="PDE"; version="1.4.3"; sha256="1xii4kc5lskgg58grp6qls01xgf5gib5yvxacm1pz6w3lp4hadwd"; depends=[tcltk2]; }; + PDFEstimator = derive2 { name="PDFEstimator"; version="4.5"; sha256="1h64scfy7db8p8gyczrzhscfssk1cbzhr41z8jvs0n1d1xa2f982"; depends=[MultiRNG plot3D]; }; PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; }; PDMIF = derive2 { name="PDMIF"; version="0.1.0"; sha256="0mlc31f4z0k5xk1fil0hx5dcbm7afia74kxb7xmnx4jcblidxnd2"; depends=[diagonals ncvreg quantreg]; }; PDN = derive2 { name="PDN"; version="0.1.0"; sha256="082ydvwcjc2rs7hlakrkgbbm9c419m408a14a9dgfdwm16yif3jd"; depends=[ggplot2 glmnet network survival]; }; PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; }; PDSCE = derive2 { name="PDSCE"; version="1.2.1"; sha256="1amy4rnvlcfvpma8pqd6wli1j0pjjk49i1qywa43lzgdwgd5dl9v"; depends=[]; }; PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; }; - PDtoolkit = derive2 { name="PDtoolkit"; version="1.1.0"; sha256="1k0xj8sq3jh96cp3rlgvhfba0nyl6ssiin04jdk7fhbsnq7437qx"; depends=[dplyr monobin rpart]; }; + PDtoolkit = derive2 { name="PDtoolkit"; version="1.2.0"; sha256="0g4s5fw0m128kq9dhaa4j76b2islhbbj9a6dqbmcmvlqla0bqm3k"; depends=[dplyr monobin rpart]; }; PEACH = derive2 { name="PEACH"; version="0.1.1"; sha256="0ciq2cci35rv39pgpp7i30jxlmr85726kh07ww22ryq3bm04ylg8"; depends=[MASS metap mnormt]; }; PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; }; PEIMAN2 = derive2 { name="PEIMAN2"; version="0.1.0"; sha256="01jsyp9yk576v3bc0a33y0f8w9v4b47g5hc0zahf3zl4bkp8i4wv"; depends=[dplyr forcats ggplot2 glue lifecycle magrittr purrr rlang stringr tidyverse]; }; - PEIP = derive2 { name="PEIP"; version="2.2-3"; sha256="1ljalgffgrn9l3q914jjxrn1j740jqk4j8q1vzn3si4np9mz92vp"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; + PEIP = derive2 { name="PEIP"; version="2.2-5"; sha256="1xvwpsnyxnf3qi1hq5r7dx4bi4s03v53r0m979hyyzcc7w9fr5r5"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; PELVIS = derive2 { name="PELVIS"; version="2.0.4"; sha256="0bn8zxw0lrc5bxm7iq216jnw35vr7zj2ajw0wn2rv7nx3zyd0r6z"; depends=[DT htmlwidgets MASS shiny]; }; + PEPBVS = derive2 { name="PEPBVS"; version="1.0"; sha256="1v0pl5jj2bh5iq45xgs35wzfz5hdklsnb72j4rnipy3qbm7zzliy"; depends=[Matrix Rcpp RcppArmadillo RcppGSL]; }; PERK = derive2 { name="PERK"; version="0.0.9.2"; sha256="0x62cmfl71s0mlhd22wifhfvhdvnz4ab6hzwinj549rvvrl8sw3j"; depends=[bs4Dash colourpicker config dplyr DT forcats ggplot2 golem magrittr plotly readr shiny shinyjs shinyWidgets tibble tidyr viridis zoo]; }; PERMANOVA = derive2 { name="PERMANOVA"; version="0.2.0"; sha256="1lmnp1g1i1kqa30cvakkl8g2m2h5jl73qx8dy37kv62mv0knlg5m"; depends=[deldir MASS Matrix scales xtable]; }; PEkit = derive2 { name="PEkit"; version="1.0.0.1000"; sha256="023k4swypw8l4hglqxysd53c5f4fq9v3ibha9jm5kvyg3piw3a4p"; depends=[]; }; @@ -3582,7 +3600,7 @@ in with self; { PFIM = derive2 { name="PFIM"; version="5.0"; sha256="0qamdsavbz27zs3m98bpn6680wq8528r5hi1w6f4b49nfl1sbmdx"; depends=[Deriv deSolve filesstrings ggbreak ggplot2 gtable kableExtra knitr markdown Matrix pracma Rcpp rmarkdown scales]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; - PGRdup = derive2 { name="PGRdup"; version="0.2.3.8"; sha256="1vz5kjc87cr2f5h0p3079xda27f45wkz7yy50zdvjgs6fhg1jdqq"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; + PGRdup = derive2 { name="PGRdup"; version="0.2.3.9"; sha256="0z2nnjlaazrmfnjmwhsmhp8h3ifgykmsy6znqvcl77v9565libz9"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PH1XBAR = derive2 { name="PH1XBAR"; version="0.10.1"; sha256="0b9g2mz0vcaqmbpm0cisr6c9l2bk5y3bn0s9096dl5fq9hyma7na"; depends=[forecast mvtnorm pracma]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="2.0.1"; sha256="0ypvzg7y7wh167pzblvjjah911kj29w2fr8ycqk03wf8ch9fay1c"; depends=[broom dplyr purrr rlang tibble tidyr tidyselect]; }; @@ -3592,11 +3610,10 @@ in with self; { PHclust = derive2 { name="PHclust"; version="0.1.0"; sha256="18jby44hnk132l0wviqb0wi6nxkg1xisqjh8cxpss2rhwah3l4h1"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; PICBayes = derive2 { name="PICBayes"; version="1.0"; sha256="1js6zrnyc8v345cds3pypb2g9dd3vvj3bjq159qc113m9ll2xk0b"; depends=[coda MCMCpack survival]; }; - PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; PINMA = derive2 { name="PINMA"; version="1.1-2"; sha256="18sm4j2srwkf1yp487d0hbmmy8max5h9966mq43pf9f2fwa0j4mc"; depends=[MASS metafor]; }; PINSPlus = derive2 { name="PINSPlus"; version="2.0.6"; sha256="0mws1064kwfm3csdzpfn4g2pwjasdmx9nz5x28znxv8hwrlgm2zw"; depends=[cluster doParallel entropy FNN foreach impute irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PINstimation = derive2 { name="PINstimation"; version="0.1.2"; sha256="0vys27ws0nk0bqf6pxgr689q3rnyx14ar560004g6pi0ii59mbyk"; depends=[coda dplyr furrr future knitr nloptr Rdpack rmarkdown skellam]; }; - PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; + PK = derive2 { name="PK"; version="1.3-6"; sha256="0mynn21bmqn2jnaprlfvz0bf3mfjirdrc88n8d28hv74bk1a59vp"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-12"; sha256="0nidg6l9nrmpyimi502fydy22r247w9i4ngb2xdbxjvfhr17m0xd"; depends=[base64enc]; }; PKLMtest = derive2 { name="PKLMtest"; version="1.0.1"; sha256="0i1kxczlhn95jw1w7vw87svqhpq9j6xi4fhy974yjx9xhax171hq"; depends=[ranger]; }; PKNCA = derive2 { name="PKNCA"; version="0.10.2"; sha256="1imaj6a8y53hllhfxvmci4qh04pviw0zpwmxm12sqi1nl2kdb5y4"; depends=[checkmate digest dplyr nlme purrr rlang tibble tidyr]; }; @@ -3607,26 +3624,26 @@ in with self; { PLFD = derive2 { name="PLFD"; version="0.2.0"; sha256="0w6d3sy4cnn7sj5d2fbn510gc3y6hipd006jnyvkariaqwlh3fa0"; depends=[mathjaxr Rcpp RcppArmadillo]; }; PLIS = derive2 { name="PLIS"; version="1.2"; sha256="08l16s3vncgk2vvcy3zswprcmx46qljbw9wlw2dhr3rinl62ci8x"; depends=[]; }; PLMIX = derive2 { name="PLMIX"; version="2.1.1"; sha256="05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; }; - PLNmodels = derive2 { name="PLNmodels"; version="1.0.3"; sha256="13ri1q3q9yl9rf96n98q1wsggmnmk29cz277sx85jmfr2q36nsdn"; depends=[corrplot dplyr future future_apply ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr purrr R6 Rcpp RcppArmadillo rlang tidyr torch]; }; + PLNmodels = derive2 { name="PLNmodels"; version="1.0.4"; sha256="0ipx01zs3vh318hdqrvm4y59q0jdzkysr39amxmydv5ld8lx5cky"; depends=[corrplot dplyr future future_apply ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr purrr R6 Rcpp RcppArmadillo rlang tidyr torch]; }; PLORN = derive2 { name="PLORN"; version="0.1.1"; sha256="0x6rvg63mqc451rw0hpz1pjafdyxwraqhnj8cgbwjknhm5k4m1bl"; depends=[ggplot2 kernlab]; }; - PLRModels = derive2 { name="PLRModels"; version="1.3"; sha256="18l285w2c22f8gcxqpbbxykkxdfhdjpg5af7njrsq0mxr1p2a8wb"; depends=[]; }; + PLRModels = derive2 { name="PLRModels"; version="1.4"; sha256="1jpnxsjj3gj72my1q4mswqxpil7vbqfv5gwd51fvx1z8vbdvkwa8"; depends=[]; }; PLSiMCpp = derive2 { name="PLSiMCpp"; version="1.0.4"; sha256="05pldxlszz4kcdqmzli31jgjd9v6sb3r89yaijc1i83c36ximarx"; depends=[crayon purrr Rcpp RcppArmadillo]; }; - PLmixed = derive2 { name="PLmixed"; version="0.1.6"; sha256="12flwwd1q1w0zprl9gfxdkd8aispv4y8yfckbdkawv70xrw4jnpz"; depends=[lme4 Matrix numDeriv optimx]; }; + PLmixed = derive2 { name="PLmixed"; version="0.1.7"; sha256="1kn9w8xr9y1lnxa5hv95q3hipr7shs8pnhr6nr88v4rskgvvhffm"; depends=[lme4 Matrix numDeriv optimx]; }; PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; }; PLreg = derive2 { name="PLreg"; version="0.4.1"; sha256="1fa8h0igxqgdfapiz0z80ll2m3nqvxw4qjcrw4knrg7ladjdicwl"; depends=[BBmisc EnvStats Formula gamlss_dist GeneralizedHyperbolic nleqslv VGAM zipfR]; }; PMA = derive2 { name="PMA"; version="1.2-2"; sha256="1fdx6prsh9a4abqbzns9fwkpqs262736fqrcxb7r75swdcis9wil"; depends=[]; }; PMAPscore = derive2 { name="PMAPscore"; version="0.1.1"; sha256="174ll5gr2csy4r5iz92zq6jqq7yfcpiyyigzklgmzpah5v0k5854"; depends=[clusterProfiler glmnet maftools org_Hs_eg_db pROC survival survminer]; }; PMCMR = derive2 { name="PMCMR"; version="4.4"; sha256="05n13pp5yff6pzk4ry07crddfaj3jlglrd1vkcnacyd8jpaxkd77"; depends=[]; }; - PMCMRplus = derive2 { name="PMCMRplus"; version="1.9.7"; sha256="06i5vsf8hpzv0c8v156072xbqpxk1wf2iami7mnsjfp9xjjjzbhx"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; - PMwR = derive2 { name="PMwR"; version="0.19-1"; sha256="0a50khv6pv596vg4x1zpc3c564wf3zhnmn1131r24s6das2645lc"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; + PMCMRplus = derive2 { name="PMCMRplus"; version="1.9.8"; sha256="1wqx5nikhpjsqnn7lgb2zy949sxmq7n3phlaix70as0zky534scg"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; + PMwR = derive2 { name="PMwR"; version="0.19-3"; sha256="11pmhhyk39wc9qcgy16gavyqrrh5wkzvnk85jb9mnr9g673ljgfi"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.7.3"; sha256="0w166p38s1sx7d0dm83iksm7vc56lgxkqcvgg65h43nx3zdgrvvp"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; - PNAR = derive2 { name="PNAR"; version="1.4"; sha256="1fcmn901d18rc89qv3bx66k3y0nccgxnmy372v9wj9gxxa65dsx1"; depends=[doParallel foreach igraph nloptr Rfast Rfast2]; }; + PNAR = derive2 { name="PNAR"; version="1.6"; sha256="18nq5g2vsc8xy4l1km710l2v8frw3wwpn4yx23s3xczqd8hj9wfw"; depends=[doParallel foreach igraph nloptr Rfast Rfast2]; }; PNSIBGE = derive2 { name="PNSIBGE"; version="0.1.9"; sha256="0lh5nkcyn46pgmabm22i44rhcc1b618d50b6qdawyswhcvi41hg0"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; PNWColors = derive2 { name="PNWColors"; version="0.1.0"; sha256="1phplnclkficfv8s6wsyrckk4ixzbayiy5iix6dddg40485l9nyj"; depends=[]; }; POCRE = derive2 { name="POCRE"; version="0.6.0"; sha256="0kni15dr7qhldn68w51mzg6pyk95dx717qy0f9230hpbg97791hz"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="1.2.0"; sha256="1xg2xzfmzg2qrwd02xy4fwsfmccigw6lm5266z6w1kxzb7p7bbw0"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; - POINT = derive2 { name="POINT"; version="1.2"; sha256="0b97ish2xxvp7xy0qqbg68hy0nvdvhi8zpgd4wvczn5r8586qk6g"; depends=[CompQuadForm Matrix rARPACK]; }; + POINT = derive2 { name="POINT"; version="1.3"; sha256="11xxmz3ncgnbs8yn7d53y1bc0g9rrlgz0d1ixjrxh4wh9qlyfzq6"; depends=[CompQuadForm Matrix rARPACK]; }; POMADE = derive2 { name="POMADE"; version="0.1.0"; sha256="1f9r7bmmc1lblvmb834ss38x2ki4c19mkx9h8i8ygkcdsb931xdv"; depends=[dplyr furrr future ggplot2 magrittr purrr stringr tibble tidyr]; }; POMS = derive2 { name="POMS"; version="1.0.1"; sha256="1ndry1csq7zsccdwd8nq9x4b9zq5j2ffykmhm38ari8n0zxxyrwy"; depends=[ape data_table MASS phangorn phylolm XNomial]; }; POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; @@ -3637,11 +3654,10 @@ in with self; { POUMM = derive2 { name="POUMM"; version="2.1.7"; sha256="0pwa97sffb571nfqnbc35dj9lr8z07wjsjnwibj9dhj2dr5b2cfp"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; POV = derive2 { name="POV"; version="0.1.4"; sha256="0mqhi410rwpgr6x5h57wqg0f5k01vva0c280zlfpmf8php121x7j"; depends=[broom formula_tools]; }; PP = derive2 { name="PP"; version="0.6.3-11"; sha256="1z7v5jiljm534lhr92vz9z3cafwcp6hdxyrr1nhli2arxc1nin76"; depends=[Rcpp]; }; - PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; }; PPLasso = derive2 { name="PPLasso"; version="2.0"; sha256="11xqpq7s8j1vrsf0x31pvk861wz4d3yg7a4gcwv43s3w5dxbljls"; depends=[cvCovEst genlasso ggplot2 glmnet MASS]; }; PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; }; - PPMiss = derive2 { name="PPMiss"; version="0.1.0"; sha256="0gbihilyhf1zd7s2k1n2axmywjbs0r23hn4gsbn6wvb9zqr4djf2"; depends=[copula pracma zoo]; }; + PPMiss = derive2 { name="PPMiss"; version="0.1.1"; sha256="06vj4r6s2lnz74l49762chxkixxs63v88w5wknkmhdzv6795c4f4"; depends=[copula pracma zoo]; }; PPQplan = derive2 { name="PPQplan"; version="1.1.0"; sha256="072r7myqsnpyla37q6bj9glwvbygb9g8xkl60q055yzxmfh4rsbr"; depends=[ggplot2 plotly]; }; PPRL = derive2 { name="PPRL"; version="0.3.8"; sha256="1m49n7kl9675hrlh6vqq69sp7bdiv4fwlncqpp58kz67jk1ypnf0"; depends=[Rcpp settings]; }; PPSFS = derive2 { name="PPSFS"; version="0.1.0"; sha256="180brwqcs2qjh01a1qwdy2a8g19scn4mxzc3s6pw8gyl2r3fzxi7"; depends=[brglm2 Rcpp RcppArmadillo]; }; @@ -3650,12 +3666,12 @@ in with self; { PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; PPtreeregViz = derive2 { name="PPtreeregViz"; version="2.0.5"; sha256="0yg67fg4rjvpwp1xvznsbv635wmf6jvhp38irffccx915qvj7r51"; depends=[DALEX data_table dplyr ggplot2 magrittr PPtreeViz Rcpp RcppArmadillo reshape2 shapr tibble tidyr]; }; PQLseq = derive2 { name="PQLseq"; version="1.2.1"; sha256="0lyynzvv7n1igzfrw52021bnxprqcm2hjxmlrsxkx4898ca46g60"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; - PRANA = derive2 { name="PRANA"; version="1.0.3"; sha256="0v1s57gxkn7by2p07bpw8bm6yzi74qn17vf71b6px3ynvqdn87g3"; depends=[dnapath dplyr minet robustbase]; }; + PRANA = derive2 { name="PRANA"; version="1.0.4"; sha256="1i9gwz4dlsz9w0z3d995w6s6f10gwvwhyb77agbmmwym1fd2k2wh"; depends=[dnapath dplyr minet robustbase]; }; PRDA = derive2 { name="PRDA"; version="1.0.0"; sha256="1lklwfakd54ylm5gizq36ng6498c2izapsz9yz2a95cjf860rr23"; depends=[MASS pbapply Rcpp RcppArmadillo]; }; PRECAST = derive2 { name="PRECAST"; version="1.6.2"; sha256="1v8qajxfk6ry40d3hq2k3xgxbibpcq1nxagjdhr7k8znpim5m5c2"; depends=[colorspace cowplot dplyr DR_SC ggplot2 ggpubr ggthemes GiRaF gtools MASS Matrix mclust patchwork pbapply purrr Rcpp RcppArmadillo scales scater Seurat]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; }; - PRIMME = derive2 { name="PRIMME"; version="3.2-4"; sha256="18xb9sznbahw13zy2x8qzl7qalk5md5vpjyfnq6y8a93pb9arzfv"; depends=[Matrix Rcpp]; }; + PRIMME = derive2 { name="PRIMME"; version="3.2-5"; sha256="01wdj270a6j9j2mvmvxd8rc9m70qfjmvf2w9sm7fqmiyvz555r0w"; depends=[Matrix Rcpp]; }; PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.1"; sha256="07kq6fprbj8zccs6cx1aiy5mrcg77b0fh42zvg2pimbvr8cqhy31"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMA2020 = derive2 { name="PRISMA2020"; version="1.1.1"; sha256="0jhf1kgcc29b8gsb42b3d5hyfzsa13lz9qgs104ynrzld94kqqwf"; depends=[DiagrammeR DiagrammeRsvg DT htmltools htmlwidgets rio rsvg scales shiny shinyjs stringr webp xml2 zip]; }; @@ -3665,20 +3681,24 @@ in with self; { PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; PROSPER = derive2 { name="PROSPER"; version="0.3.3"; sha256="1wdrdqii7d4yfky6706n9xjmabnz99jjja1c80nbj3fp8idsbli5"; depends=[data_table]; }; PROreg = derive2 { name="PROreg"; version="1.2"; sha256="1kxadlgiknk4715rd6vfmcw03ll2n6n9c91g4y0lhynijryr04mb"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; - PROscorer = derive2 { name="PROscorer"; version="0.0.3"; sha256="1wmv3yg1njgjc7vr3nkmq4643xfyxinrgjsfkkpahp5xbyyqb222"; depends=[PROscorerTools]; }; - PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.2"; sha256="0fd50c54afa7w687nzw6gpnpn63pjv8brsivrgsv93b1iz8762k4"; depends=[]; }; + PROscorer = derive2 { name="PROscorer"; version="0.0.4"; sha256="0l88hsyg5rmw8vyyqa959aa7zgw4brc4gxyx13qqdkxisxy18aqz"; depends=[PROscorerTools]; }; + PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.4"; sha256="0d4igzviz7j62cmnpv6xk01zw2f4yqj532y8i0h22ibdx950qj60"; depends=[]; }; PROsetta = derive2 { name="PROsetta"; version="0.4.1"; sha256="1b013cwng8k17yfm4zrwjg7vc4papr2wmqq3a5kawl7bfy4ibaqw"; depends=[equate lavaan mirt mvnfast plink psych Rcpp RcppArmadillo TestDesign]; }; PRP = derive2 { name="PRP"; version="0.1.1"; sha256="1q4idlk2crxsd841b203hkcyp9glqhsg83liddqlxixxih7rkzp1"; depends=[mvtnorm]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; PRSPGx = derive2 { name="PRSPGx"; version="0.3.0"; sha256="1vvclrp6h63l471qvgwkdhs52lrkapz0v90gwld89zwim6pnh7av"; depends=[bdsmatrix bigparallelr bigsnpr bigsparser bigstatsr gglasso GIGrvg glmnet lmtest Matrix matrixcalc MCMCpack mvtnorm propagate Rfast SGL]; }; - PReMiuM = derive2 { name="PReMiuM"; version="3.2.9"; sha256="1d1as5hsicb1zdlb81pg092mvqlh3p0sibn2ga0zw7lrkr57wysj"; depends=[BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen sf spdep]; }; + PRSim = derive2 { name="PRSim"; version="1.4-4"; sha256="17aqydzv220q15mhn1sir5ly5wzmv7sx1ckmk9fwr97lnf0pdh09"; depends=[goftest lmomco mev splus2R wavScalogram]; }; + PReMiuM = derive2 { name="PReMiuM"; version="3.2.10"; sha256="000v6fqmh0v9747yvd8vfbfmic6jhpd5k9pj7yc0a8b0yw89xydp"; depends=[BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen sf spdep]; }; PResiduals = derive2 { name="PResiduals"; version="1.0-1"; sha256="0mq16cs07hw5c9jj08vpgbb15xvjvz9h0npsbqphiibsb6ca5fwb"; depends=[Formula MASS rms SparseM]; }; PSAWR = derive2 { name="PSAWR"; version="0.1.0"; sha256="0qaaw6bxb4p9h1y6fykgn5g7bllr1x1zdp3p1idm3sk30zfpvp94"; depends=[dplyr httr tibble]; }; - PSAboot = derive2 { name="PSAboot"; version="1.3.6"; sha256="06ga93vv4w84cd0s5565z4crrqd1ghqk31cmlpiaq5dwx5g0p45g"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; + PSAboot = derive2 { name="PSAboot"; version="1.3.8"; sha256="1y0d5gglmzcnd0yvq33k1canjzhl62df9abgw1w08azm94arfh1q"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.2"; sha256="0y67yf77ywm57zrvclgz3ndqrwxbiy0pdqfjq0qgvw5qziqkya4i"; depends=[rpart]; }; PSCBS = derive2 { name="PSCBS"; version="0.66.0"; sha256="14rs2wywipbkia3dbzfhpnkmfgdvm2bf586lggsx63sywlv5d02q"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; + PSDistr = derive2 { name="PSDistr"; version="0.0.1"; sha256="1djhpc9p5q9lqnx7pn2jcskmq28iriq42yyid70sc5r917c357x8"; depends=[pracma]; }; PSF = derive2 { name="PSF"; version="0.5"; sha256="00zwbw9bn5bs181m831nb08wwrmp2jpmqmriy8j52njq289hnc32"; depends=[cluster data_table]; }; PSGD = derive2 { name="PSGD"; version="1.0.3"; sha256="00013hw99kwk6jlypyb38fly0smyyk6gzxvcfd33n2cbv14jx4gk"; depends=[Rcpp RcppArmadillo]; }; + PSGoft = derive2 { name="PSGoft"; version="0.0.1"; sha256="177znpqd6wix76bk59w452ki8qa6rmvwiwddflgqi6chybbn6cpr"; depends=[moments]; }; + PSIndependenceTest = derive2 { name="PSIndependenceTest"; version="0.0.1"; sha256="0nsg9c08j8ag66nlx2sjcddrpv2zkv1fm624afr50qyyyvr04g7z"; depends=[]; }; PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; PSPManalysis = derive2 { name="PSPManalysis"; version="0.3.9"; sha256="0wc4rkkwqwjhx54n05bjc2q370bb3ca1c7annxg89bmr9msf8zd1"; depends=[pkgbuild rstudioapi]; }; PSS_Health = derive2 { name="PSS.Health"; version="1.0.2"; sha256="0vkg727rhh267vvcf8zkf5k6wm0k54vqysrsm4zc3sin3w1chnaf"; depends=[dplyr DT easypower EnvStats epiR ggplot2 ICC_Sample_Size kappaSize longpower plotly powerMediation powerSurvEpi presize pROC pwr pwr2 shiny shinycssloaders shinyFeedback shinyhelper writexl]; }; @@ -3688,7 +3708,7 @@ in with self; { PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; PScr = derive2 { name="PScr"; version="1.1"; sha256="0cbmb1z4iwxw82m3f3y5iyr2hd1mgqsrvn7ip4rmsqy3zakyh06s"; depends=[pracma survival VGAM]; }; PSinference = derive2 { name="PSinference"; version="0.1.0"; sha256="19y3pbb75rkgx9dlykrq6aa0pbn968d83bsl1d3qlnb06b6gncx6"; depends=[MASS]; }; - PStrata = derive2 { name="PStrata"; version="0.0.2"; sha256="108iwc5hm6gjbwqvjlqfz1xm8il31bl3ck3bykv97144pwq2vfym"; depends=[abind dplyr ggplot2 lme4 patchwork purrr rlang rstan stringr]; }; + PStrata = derive2 { name="PStrata"; version="0.0.3"; sha256="05f63nqjn2140dhycq05d5hrw7d1c065lpg6js6plsx235jwmga8"; depends=[abind dplyr ggplot2 lme4 purrr rstan stringr]; }; PSweight = derive2 { name="PSweight"; version="1.1.8"; sha256="0vawkkgm72s17cjfww9175dyr100lxdv4gf35p2lz8wcnbsklnv5"; depends=[gbm ggplot2 lme4 MASS nnet numDeriv SuperLearner]; }; PTAk = derive2 { name="PTAk"; version="2.0.0"; sha256="1xnjils6i36mpzzg7lpi1bpq90mm4gwp4szk6fcg9i4dvkrznfki"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; }; @@ -3704,17 +3724,16 @@ in with self; { PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; }; PVplr = derive2 { name="PVplr"; version="0.1.2"; sha256="1hrd2r3m2qy8r4wjacbhpqsmlchdjqk6iyydiy5k1ccrmv8da74a"; depends=[broom cluster dplyr forecast ggplot2 magrittr minpack_lm purrr rlang scales segmented stlplus tidyr zoo]; }; - PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PWEALL = derive2 { name="PWEALL"; version="1.3.0.1"; sha256="1p6wq7khpzs6cw2chswp17bq383ppm6q2ia9p6y1gggrazsymdvg"; depends=[survival]; }; - PWEXP = derive2 { name="PWEXP"; version="0.3.0"; sha256="1aak0s12b33dy93cqp2z4z525ymhp1z0l7gjh6j3m1brv1nyk9f0"; depends=[fastmatch segmented survival]; }; - PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.117"; sha256="0140j2bg6mqxsg86ndq3c0ls1kdvd33r2qrwih2cjgmnfq31adkj"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; }; - PWIR = derive2 { name="PWIR"; version="0.0.1"; sha256="1sxfbddpfcybi9hjwbgibqd5wn7hryda0w8yi6k0n9jf04lgnqiw"; depends=[bibliometrix igraph]; }; - PaRe = derive2 { name="PaRe"; version="0.1.11"; sha256="0k3yib76isshl0lwsymka4b3n2h3cfz7gqkzwfi9inp9gfhr5ng0"; depends=[checkmate cli cyclocomp desc DiagrammeR DiagrammeRsvg dplyr git2r glue igraph lintr magrittr pak R6 rmarkdown rsvg stringr]; }; - PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; - Pade = derive2 { name="Pade"; version="1.0.5"; sha256="1m22zr64vgb57rfhg2nsrsmi3mv68hlmf7hq6phhnnzpz3my58zm"; depends=[]; }; + PWEXP = derive2 { name="PWEXP"; version="0.4.1"; sha256="1dw3g8f105hjs2b975c4aijr7spphl3f1f9jfbfvjzh0a0hgph6f"; depends=[doSNOW fastmatch foreach segmented survival]; }; + PWIR = derive2 { name="PWIR"; version="0.0.3"; sha256="05f4mj8id8ikfz63c8c1lkbxl7s1b2q5xri8iicn1xv2m3w89p2v"; depends=[bibliometrix igraph progressr]; }; + PaLMr = derive2 { name="PaLMr"; version="0.1.4"; sha256="0aj8c2w27plcp3vj70ci742slqlkr0rirfz4hp2fb5bldwhhdcw1"; depends=[httr jsonlite]; }; + PaRe = derive2 { name="PaRe"; version="0.1.12"; sha256="1axxmqnhw0aw1g3985ld5ahf6qk954g7xv1ddrdavvyh8601l7lv"; depends=[checkmate cli cyclocomp desc DiagrammeR DiagrammeRsvg dplyr git2r glue igraph lintr magrittr pak R6 rmarkdown rsvg stringr]; }; + Pade = derive2 { name="Pade"; version="1.0.6"; sha256="0bjkr3yh1kxymyrfzi9amjznxgqc2xx69zhs2immn4sk1w3xzvzp"; depends=[]; }; PairViz = derive2 { name="PairViz"; version="1.3.6"; sha256="12rg1ml401c9zz1q6qy2ghs18x9vdb8smrkb2bcp34afbg5dvdd3"; depends=[graph gtools TSP]; }; PairedData = derive2 { name="PairedData"; version="1.1.1"; sha256="07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q"; depends=[ggplot2 gld lattice MASS mvtnorm]; }; PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; }; + PakPC2023 = derive2 { name="PakPC2023"; version="0.1.0"; sha256="1vih3bkz6sy7bkw18c1d7a85xj112zagg65i7sfhy8dgwx7m78f1"; depends=[DT htmltools]; }; PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; }; PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; }; PakPMICS2014HL = derive2 { name="PakPMICS2014HL"; version="0.1.1"; sha256="0famy09rh8grcyymh1nlrxk35cdkxcwipqbvf4jcixkfvzw8fhjk"; depends=[data_table]; }; @@ -3728,29 +3747,29 @@ in with self; { PamBinaries = derive2 { name="PamBinaries"; version="1.8.0"; sha256="1l89vk9jhlfghk89945815ygwwdjmv5mkibb2cz7307vy6jl60ka"; depends=[dplyr ggplot2]; }; PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; }; PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; - PanelCount = derive2 { name="PanelCount"; version="2.0.0"; sha256="0lh90j0d7qwi14c6qq6idiyq0lpz4h8q6f0di9v182svi4s56waz"; depends=[MASS Rcpp RcppArmadillo statmod]; }; + PanelCount = derive2 { name="PanelCount"; version="2.0.1"; sha256="07dn8a86q51gvy4xkqz2mfmqkc59cf4zcwcqrw366b791y5g182y"; depends=[MASS Rcpp RcppArmadillo statmod]; }; PanelMatch = derive2 { name="PanelMatch"; version="2.0.1"; sha256="07c2zghrb1ykq08qjkpc86j64b4w04kk0hxfdxr60bzsvgnb0kg3"; depends=[CBPS data_table ggplot2 igraph MASS Matrix Rcpp RcppArmadillo RcppEigen]; }; PantaRhei = derive2 { name="PantaRhei"; version="0.1.2"; sha256="0lv04aa70yd5gr0zfh2gmah4d4h3kw0lym6284akcvll8mhdi8dd"; depends=[]; }; ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.2.6"; sha256="0g5i4908fl2j1a4jfsg1xs4q92mc29zp8dyf52a370ki2512w6h1"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelDSM = derive2 { name="ParallelDSM"; version="0.3.7"; sha256="10yqq7hki08qvymlw6f1w6rrg6381bzhyqa1v2ryxszx3prxxcps"; depends=[caret gstat pryr quantregForest randomForest raster rgdal snowfall sp stringr]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="3.2.0"; sha256="0wiw5f664gjzx7fqyfxczlibyvd2di1bmpl9gl3hl3psp3niayc0"; depends=[jsonlite snow xml2]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="3.3.0"; sha256="0arfmjxc68yfznggfv5mmafxn9xvagwxslynhqapw4yf7vlqjjam"; depends=[jsonlite snow xml2]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14.1"; sha256="088sl3az4ysq8cyw82brdn9xm5yy7rqskxih462d1m5hi62gyl04"; depends=[backports BBmisc checkmate fastmatch]; }; Pareto = derive2 { name="Pareto"; version="2.4.5"; sha256="19mawxs743i7lb9inh51xdfpx0s72cvcw4iylr250r17r6qp4y8g"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; }; + PartialNetwork = derive2 { name="PartialNetwork"; version="1.0.2"; sha256="1pn308cqwil0k674zc9bqxgxh052avjm2akhm1wm644labmi1vl3"; depends=[abind doParallel doRNG foreach Formula formula_tools Matrix Rcpp RcppArmadillo RcppEigen RcppNumerical RcppProgress]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; }; - PatientProfiles = derive2 { name="PatientProfiles"; version="0.3.0"; sha256="0gkivibiafqjamlabgn6xga7mapcnpbgray6b7hdd86kicjvfbwb"; depends=[CDMConnector checkmate cli DBI dplyr lubridate magrittr pillar rlang stringr tidyr]; }; + PatientProfiles = derive2 { name="PatientProfiles"; version="0.4.0"; sha256="0ya7zk9a6v1hkai5vjdbf0jc86wxvxz8aqpzp2i1h5i0i89k6y2n"; depends=[CDMConnector checkmate cli DBI dplyr gt lubridate magrittr pillar rlang stringr tidyr]; }; Patterns = derive2 { name="Patterns"; version="1.4"; sha256="12ci26i0ks23ff11g3pmsns5f3crnrac2hnlqc2pglhrv180m37r"; depends=[abind gplots igraph jetset lars lattice limma Mfuzz movMF nnls plotrix repmis SelectBoost tnet VGAM WGCNA]; }; PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; }; Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; - PeakError = derive2 { name="PeakError"; version="2021.7.1"; sha256="0rsh81p0w11zp8rgxx9cm8537gxhf9hx6xizpbflfx60xhr96is5"; depends=[]; }; + PeakError = derive2 { name="PeakError"; version="2023.9.4"; sha256="07hidwjf0pgahdw12jlvv2cygfvizv1zjir49nmra01zm1yr5k62"; depends=[]; }; PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; }; - PeakSegDisk = derive2 { name="PeakSegDisk"; version="2022.2.1"; sha256="1wvsg87frdyi7q58b438n331irlgm7wnfd3rf3ca5m636xz6cnr9"; depends=[data_table]; }; + PeakSegDisk = derive2 { name="PeakSegDisk"; version="2023.9.4"; sha256="164s72pmb3h3niwzbfgiyssly46p00mmjg4nv7182a476xgcznj2"; depends=[data_table]; }; PeakSegJoint = derive2 { name="PeakSegJoint"; version="2023.4.24"; sha256="0yak9dyy3a6jncgdh4p6q4xxc2pddb0zifs68ivmpq4gf38lksj3"; depends=[PeakError penaltyLearning]; }; PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; }; - PearsonDS = derive2 { name="PearsonDS"; version="1.2.4"; sha256="1mgdglga0igg7ynvna68nri8z74rlpiq10r4571d5jqsyfi2fcx7"; depends=[]; }; + PearsonDS = derive2 { name="PearsonDS"; version="1.3.0"; sha256="1dap7f096ayp27pf6p9chc30sphd1hdivqn3yv7mgm0ar8w1qzyk"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-5"; sha256="04xi911wzkgsh1ajqamgwgv7wnpgyc20brjcr4jh6gfkfhacjprv"; depends=[]; }; PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.5"; sha256="0cdv7ndbjxzaayxkrxh99jsyivlipbnipv21d4rmf8j8ssfq74r5"; depends=[lmtest sandwich]; }; PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; @@ -3777,14 +3796,13 @@ in with self; { PhaseTypeR = derive2 { name="PhaseTypeR"; version="1.0.4"; sha256="063hl41jnzya189g8pm0kjvh7w4h31hfb4zhvrnh6nk4kr5xa70m"; depends=[expm igraph]; }; PheCAP = derive2 { name="PheCAP"; version="1.2.1"; sha256="00dfy0iby21kqfxz2npz4dn1klxcdlll8xrk2hsmc56fjfidbdhz"; depends=[glmnet RMySQL]; }; PheNorm = derive2 { name="PheNorm"; version="0.1.0"; sha256="10223yfaajzq1ip5qj3kk6iyjzrbb619jkrsxawb0dpkrj56d8v7"; depends=[]; }; - PheVis = derive2 { name="PheVis"; version="1.0.2"; sha256="0pb6lxyz0ikgl64872dqjk1zj7pa793ggrp53hrg2y5m76wn8drr"; depends=[dplyr ggplot2 glmnet knitr lme4 purrr randomForest Rcpp tidyr viridis zoo]; }; + PheVis = derive2 { name="PheVis"; version="1.0.4"; sha256="1anj079vdpfbkilbvk0b2b78qk87gc7lmivzl8syq6lb3dxkja2l"; depends=[dplyr ggplot2 glmnet knitr lme4 purrr randomForest Rcpp tidyr viridis zoo]; }; Phenotype = derive2 { name="Phenotype"; version="0.1.0"; sha256="0bfg2vk35hrfzmpjpnv3yhnsfr17505c49msbppqrrbpw5wgawy5"; depends=[lme4 tidyr]; }; PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.3.4"; sha256="19c79kls6i1qpsk41lp8whva5in47m2wlr0v3ggw5bblp4fkd43m"; depends=[cowplot data_table dplyr ggplot2 Hmisc mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; }; Phi2rho = derive2 { name="Phi2rho"; version="1.0"; sha256="0lphg0hyzsr7mcchrv53rx8vvi0bd7hdbxk78qndjmb1mpy2f8b5"; depends=[Rmpfr]; }; PhilipsHue = derive2 { name="PhilipsHue"; version="1.0.0"; sha256="03ghwi14jsz1ff70dl30p6w0d9v29kc70kip2bcinxm6v4l2q383"; depends=[httr pkgload purrr yaml]; }; PhitestR = derive2 { name="PhitestR"; version="0.2.0"; sha256="113f176q9kaghmqivqcg9l6zczx7dmawhybb8hwb2xpb0mhcgh4l"; depends=[fitdistrplus]; }; PhotosynQ = derive2 { name="PhotosynQ"; version="0.2.3"; sha256="10n06sfbwv5w96m3yv5ws7yddfv2n8pp1rc730870wiavl6cbn63"; depends=[getPass httr]; }; - Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; }; PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.6.0"; sha256="0a02m128hg55q50y6x11lw6yrmll2mzc2aa5byc8j2m492f769n5"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.1"; sha256="0ww9gcni9f0mwya1d3v45wazrss7lq8b75xcp4fb4kxwbh9s35kw"; depends=[chron lubridate stringr]; }; @@ -3795,7 +3813,7 @@ in with self; { PlackettLuce = derive2 { name="PlackettLuce"; version="0.4.3"; sha256="04pid91wsf3m3mg45zis17xa251491011ihbmfsdy7m914l9wcyd"; depends=[CVXR igraph Matrix matrixStats partykit psychotools psychotree qvcalc R6 RSpectra sandwich]; }; PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.6.0"; sha256="0v4484kh8aqni0n6nfd9c1wiw62fj439647xb583pbmxi5ja58hq"; depends=[Carlson CVXR fitConic R6 rcdd sdpt3r stringr uniformly]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; - PlanetNICFI = derive2 { name="PlanetNICFI"; version="1.0.4"; sha256="0xjvdz1vk8wkq8b58l9rm2x4nci76k09kx3vdjhqjgcq0a4kyvql"; depends=[data_table glue httr sf terra]; }; + PlanetNICFI = derive2 { name="PlanetNICFI"; version="1.0.5"; sha256="02xras3bhgrnhijda3nbmcpwzi90db85amqxi2v0p00z9i4p99i6"; depends=[data_table glue httr sf terra]; }; PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; PlasmaMutationDetector2 = derive2 { name="PlasmaMutationDetector2"; version="1.1.11"; sha256="1dcmw6i488gxqqn52r0n9aclnz41ba2gc99vf6ac1wx5flcfm3l9"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; }; @@ -3804,15 +3822,15 @@ in with self; { PlotBivInvGaus = derive2 { name="PlotBivInvGaus"; version="0.1.0"; sha256="1qgrg43ry9carhn49zbm24gy77k1z7xnvgmr78xwg6b6j1v6xd8d"; depends=[plotly]; }; PlotContour = derive2 { name="PlotContour"; version="0.1.0"; sha256="0jjzrxmx1k1s8fyfs9m5a864pmvjh2bdklbhrc3nbhb0c7wd3h9z"; depends=[KernSmooth MASS]; }; PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; - PlotTools = derive2 { name="PlotTools"; version="0.2.0"; sha256="00m98knn8swr430a1r4lnn9cby4w977vk80wfxsdm4pv5gsrl9z0"; depends=[]; }; + PlotTools = derive2 { name="PlotTools"; version="0.2.1"; sha256="0gmi5bx2cgikk8plccpzh5miyc719afkriiqncdcbxf7aqrlvw4c"; depends=[]; }; PoA = derive2 { name="PoA"; version="1.2.1"; sha256="0y8aqz1ainxdglxlfp9iqhvkmirpmc7dvwrcxz2l8lln86yrfqx6"; depends=[dplyr nloptr pracma tibble]; }; PoDBAY = derive2 { name="PoDBAY"; version="1.4.3"; sha256="1c1dmggcc8k4h56063r97gjavd44llc51j54qs1wck9zir414i8w"; depends=[dplyr ggplot2 Rcpp]; }; PoPdesign = derive2 { name="PoPdesign"; version="1.0.3"; sha256="1xh58196p4ldgkzbs04rd2y4pv2qakik6kqsyddyy844ii2jxy69"; depends=[Iso knitr magick]; }; PoSI = derive2 { name="PoSI"; version="1.1"; sha256="1xwlj8dibaik37z6vj9q9vawavi7d49906wvxdd4drjzxzapq4ng"; depends=[]; }; - PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.7"; sha256="1fld65ksw47hvp0k1mjll0pxcpf0cjdqj5qhjx88mrbsr2f1y7x4"; depends=[dplyr SmarterPoland]; }; + PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.7.1"; sha256="0601n76nybvahd5xsghwbydc7gfcvj1qbpqhw06d4mzy97am7yl0"; depends=[dplyr SmarterPoland]; }; PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2.1"; sha256="1q89b0nypz2iivmgwg1nb1l7p285wy00s40j3qp8zc78ra1rjhyx"; depends=[]; }; PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; }; - PointedSDMs = derive2 { name="PointedSDMs"; version="1.3"; sha256="1h36hxhx0alqd9q56949fxmi0qgnxjj5wfrsp3zg0qn7xh3h3pwv"; depends=[blockCV ggplot2 inlabru R_devices R6 raster sf sp terra]; }; + PointedSDMs = derive2 { name="PointedSDMs"; version="1.3.1"; sha256="110il94xy36wiylfq7d3bh24508ca90j88c66k2a50x26y4n31y5"; depends=[blockCV ggplot2 inlabru R_devices R6 raster sf sp terra]; }; PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.3.3"; sha256="0m8ajizij9kvp057rqmd10zadmvr4a1ka664jc9rdjh2xqgd5s2i"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.4.3"; sha256="0s6v0minnwqx025nfn3kkkhbh8pzx6wgxars92kh6x9gdzf9i6ka"; depends=[corpcor GenOrd Matrix mvtnorm]; }; PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.3"; sha256="16c0z3974lvvr7xvrv8frzn9m5sg2jicjan52xgg7dxlm3rsij1s"; depends=[BB corpcor GenOrd MASS Matrix]; }; @@ -3836,7 +3854,8 @@ in with self; { PooledCohort = derive2 { name="PooledCohort"; version="0.0.1"; sha256="1zf8waqiw4282iyr30byd7czrdnf9rvp3mra6b7slqqs1z53lhr2"; depends=[glue]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.6.0"; sha256="0s8lr17s6w8isjig4z8jzgpnpsb1kg98d32y7kslbwzl08cbnza0"; depends=[boot codetools dplyr ggplot2 gtools magrittr MASS mvtnorm purrr stringr tibble]; }; - PopGenReport = derive2 { name="PopGenReport"; version="3.0.7"; sha256="0drf3yaxrcypl3b6qdl4kkn8zw31hrnkp49lxpisfjsaybj5lk40"; depends=[ade4 adegenet calibrate dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; + PopGenHelpR = derive2 { name="PopGenHelpR"; version="1.2.1"; sha256="09j5ih4ggxzpfhr7ch2d2rpfkpwrgppqrm164yj68daa94cq8ga9"; depends=[adegenet dartR dplyr ggplot2 gstat hierfstat magrittr poppr raster reshape2 rlang scatterpie sp spData spdep StAMPP vcfR]; }; + PopGenReport = derive2 { name="PopGenReport"; version="3.1"; sha256="19df1178kznrrzfkhaaf0lkmfk6kasl0x39k3zv3b5w6k7697igs"; depends=[ade4 adegenet calibrate dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape2 RgoogleMaps sp vegan xtable]; }; PopVar = derive2 { name="PopVar"; version="1.3.0"; sha256="1yc2qz7g5jv752yrhjq1ymfdjbqwdcp0hv7pm93qsn51k8fc8i9i"; depends=[BGLR qtl rrBLUP]; }; PopulationGrowthR = derive2 { name="PopulationGrowthR"; version="0.1.1"; sha256="0cq7vnmslb4y9d9a4jk7z5xajw4vr2q1qqhkak9m9gidyr4dp5zl"; depends=[dplyr]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; @@ -3856,6 +3875,7 @@ in with self; { PracticalEquiDesign = derive2 { name="PracticalEquiDesign"; version="0.0.3"; sha256="0jms5j9vg5g1llwkzjglj6k26wgj16jxdigllra4gjzk0azbgn9q"; depends=[dplyr ggplot2 numDeriv Temporal tidyr]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; }; + PreProcessRecordLinkage = derive2 { name="PreProcessRecordLinkage"; version="1.0.1"; sha256="05j3nbilkw8iqhdazkjz58sgnnwan2nh28b2sqi0gphzdbwks7mi"; depends=[data_table RecordLinkage stringr syn tm]; }; PreProcessing = derive2 { name="PreProcessing"; version="0.1.0"; sha256="08wrdg3q7r8h7lqn3yppl3qqlhnaak81vd9ymqlkzw92981rxxzx"; depends=[ggplot2]; }; PreciseSums = derive2 { name="PreciseSums"; version="0.6"; sha256="16ycz7rcslhfc9g4z04klq9hb9fpzmrn4rysyl4zky85mlhs60gk"; depends=[]; }; PredCRG = derive2 { name="PredCRG"; version="1.0.2"; sha256="0z84p8l2q66rapb9lhx8m8iadz3q989q5qkvcp8ylv80cz6qkibx"; depends=[Biostrings e1071 kernlab Peptides protr]; }; @@ -3873,11 +3893,11 @@ in with self; { ProDenICA = derive2 { name="ProDenICA"; version="1.1"; sha256="0g1ldrb6gsrgm09xjl0dynqaargkj1in8k39rnpanf4zzyrj5181"; depends=[gam]; }; ProFAST = derive2 { name="ProFAST"; version="1.2"; sha256="02a94qlxwa7499vx71vds8qlndnq6s52bmf9ac0ychdi86a0adfm"; depends=[AnnotationDbi biomaRt DR_SC gtools harmony irlba Matrix mclust nnet org_Hs_eg_db org_Mm_eg_db pbapply performance PRECAST Rcpp RcppArmadillo Seurat]; }; ProFound = derive2 { name="ProFound"; version="1.14.1"; sha256="1p2mdy0z5p7as1x6vc572wjcl6f0acwgpvb39rmk2273kb1ldwz5"; depends=[celestial data_table FITSio foreach magicaxis RColorBrewer Rcpp]; }; - ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.2"; sha256="1yc3pvwnxz5s08s0cvn26ai1lb37asdlllwys5nzpvp4q1ddcsz2"; depends=[config dplyr httr lubridate stringr]; }; + ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.4"; sha256="0rgfblkzx7rgv6q6k1vq47fxxdaa46hq5wv6vxal2bjj1v2qflav"; depends=[config dplyr httr lubridate stringr]; }; ProSGPV = derive2 { name="ProSGPV"; version="1.0.0"; sha256="1837p4vg1g4225rv55gaphma429j6pnfh078cxpv5ha2n0h1sfz3"; depends=[brglm2 glmnet MASS survival]; }; - ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; + ProTrackR = derive2 { name="ProTrackR"; version="0.3.8"; sha256="02r8ax3wajk4fim15r6xkdzn4flw9a76a0gkd7sd7g2ym68rpcp2"; depends=[audio lattice signal tuneR XML]; }; ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; - ProbBreed = derive2 { name="ProbBreed"; version="1.0.2"; sha256="0n26gm6z0zwr00rpg8r5h9zzz9xkrqjvgnzjjddnz82kqpb39dq1"; depends=[ggplot2 lifecycle rlang rstan]; }; + ProbBreed = derive2 { name="ProbBreed"; version="1.0.3"; sha256="1m8zlqnrszzjv2c8dpzvihjaw7wrw04xgbqg6a0nr6lzqn8wdjs0"; depends=[ggplot2 lifecycle rlang rstan]; }; ProbMarg = derive2 { name="ProbMarg"; version="1.0.1"; sha256="02qc6c08vfg3inh14d3dzq28zgsgk9p7kb2ni9d14pcx5w9q6sji"; depends=[]; }; ProbSamplingI = derive2 { name="ProbSamplingI"; version="0.1.0"; sha256="1s72jvzayrscn5k43gwip28lax4k24b6piy1wmwvkmpf2xx57wiv"; depends=[]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0.1"; sha256="1arxk01c3aff7hfqjy1a398548jmz15hs70shh4a40qw2f9f995m"; depends=[rootSolve]; }; @@ -3885,36 +3905,37 @@ in with self; { ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.1"; sha256="1wa020hb02zjf4shzb345nyjkxm38wf67knvnl9iyh6n2sc34975"; depends=[Matrix numDeriv RANN Rcpp RcppEigen]; }; ProcData = derive2 { name="ProcData"; version="0.3.2"; sha256="1a0rbj57rbxf5axfyd1j9j1mh7ara3rlq31lysaprwaymig94mml"; depends=[keras Rcpp]; }; ProcMod = derive2 { name="ProcMod"; version="1.0.8"; sha256="0rxh135gs9gq9sag1cmvywdgnax7n989gmffbxil71fy49kxpwdg"; depends=[foreach MASS Matrix permute Rdpack]; }; - ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; }; - ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.2"; sha256="18m4gk7rhfi0wd9hwmqhfa20gr260plvj41iimlqb5y9m2ld1b08"; depends=[MASS nlme]; }; + ProfessR = derive2 { name="ProfessR"; version="2.4-3"; sha256="0df7ll7zv3kh5ygdcq9klzjy4g1knd9z0zv3whw5x3a19kkaaili"; depends=[RPMG]; }; + ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.3"; sha256="0yxcrxw3jb8bnwqh5f5d8bmm5jlkyxfld12zfyw3b1031zj1vh6i"; depends=[MASS nlme]; }; ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; - ProjectManagement = derive2 { name="ProjectManagement"; version="1.4.7"; sha256="1q5ssr9ixgjlpbnndcq1p1d3ichw873f42s283zx1swgav14yw54"; depends=[GameTheory igraph kappalab lpSolveAPI plotly triangle]; }; + ProjectManagement = derive2 { name="ProjectManagement"; version="1.5.2"; sha256="04i1rz5dwgkgy6da12v3vhq3skqmnqlb3dry99hycjrfql0v4wsr"; depends=[igraph kappalab lpSolveAPI plotly triangle]; }; ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.10.3"; sha256="0h2szi0sp71s2gh104z2yknfs88b2c7z85q0zliy2qv6b5vj26mn"; depends=[digest tibble]; }; - ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.2.0"; sha256="1la2rmmywpmqk63ncw25w5wnwz6fa78pvwwaacqanar2pj31ddvg"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; + ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.2.1"; sha256="1l8j3n7d9vc7d5lb2fizq0aw8xh3ikh4ka4r3wwswk9a0mspjily"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; + PrometheeTools = derive2 { name="PrometheeTools"; version="0.1.0"; sha256="09hrpybagl58vm22bhvpwb07s542hi4j15mqwwwyhi3dw0sn9xfy"; depends=[ggplot2]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; - PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; }; + PropClust = derive2 { name="PropClust"; version="1.4-7"; sha256="1xwm8a6m5j5rdry4gqjl2c6dx2kkzjz29nzmg4bjnk3y9xpcn8xn"; depends=[dynamicTreeCut fastcluster]; }; PropScrRand = derive2 { name="PropScrRand"; version="1.1.1"; sha256="0p83pw1msngaiglwyv385s91r66whx6al9gkxs5bnmsn2a7bkrbl"; depends=[]; }; ProteoBayes = derive2 { name="ProteoBayes"; version="1.0.0"; sha256="0cxfzr1wrz0n3v2avwq285kp39jgznmylfdinmx5rj69454r630h"; depends=[dplyr extraDistr ggplot2 magrittr mvtnorm rlang tibble tidyr]; }; Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; }; Pstat = derive2 { name="Pstat"; version="1.2"; sha256="17bqkaf9590jhiaamaafmvkqmy2aqkcfqhk8m4w35g58j48yk4yx"; depends=[]; }; PsyControl = derive2 { name="PsyControl"; version="1.0.0.0"; sha256="1c5ml6s3c8kzf7p0mig84bmq40b0491ah713bm6jpy2s3nwnmafs"; depends=[irtoys ltm]; }; - PsychWordVec = derive2 { name="PsychWordVec"; version="2023.8"; sha256="0df6ppi6l4a0gs2bkzsv6wkikp0frd6x64zgbv3y98a33l7mdw46"; depends=[bruceR cli corrplot data_table dplyr fastTextR ggplot2 ggrepel psych purrr qgraph reticulate rgl rsparse Rtsne stringr text text2vec vroom word2vec]; }; + PsychWordVec = derive2 { name="PsychWordVec"; version="2023.9"; sha256="04dp4k0x2nmcfiqbyzirhr595lgishxh0qbymy210g96sghbrpf3"; depends=[bruceR cli corrplot data_table dplyr fastTextR ggplot2 ggrepel psych purrr qgraph reticulate rgl rsparse Rtsne stringr text text2vec vroom word2vec]; }; PtProcess = derive2 { name="PtProcess"; version="3.3-16"; sha256="1d5i847jy9i1llbfsdkqcjmiids3kjxnqscinrwqyv7mwb9ijk2z"; depends=[]; }; PubMedMining = derive2 { name="PubMedMining"; version="1.0.0"; sha256="03lhml5jk69racmhlh6xa8j2rv8xb87vg6hr1caiqpd4kqg16n1q"; depends=[easyPubMed stringr]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; - PublicationBias = derive2 { name="PublicationBias"; version="2.3.0"; sha256="1v4nh916ika9asil1jxsqf9c49y7kwz6sbrhqkbkc1ywa4rq6i2q"; depends=[dplyr ggplot2 glue lifecycle metabias metafor Rdpack rlang robumeta]; }; + PublicationBias = derive2 { name="PublicationBias"; version="2.4.0"; sha256="1nwkp5czv31v57qzaahj18lkw557a48qcnwrz6lmz9hw74b52qm6"; depends=[dplyr ggplot2 glue lifecycle metabias metafor Rdpack rlang robumeta]; }; Publish = derive2 { name="Publish"; version="2023.01.17"; sha256="0lsr27014zm389xzyddklkql05zh4x9d7jcjz3yv78fwbjzw4v23"; depends=[data_table lava multcomp prodlim survival]; }; PupilPre = derive2 { name="PupilPre"; version="0.6.2"; sha256="123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; - PupillometryR = derive2 { name="PupillometryR"; version="0.0.4"; sha256="0yk30sgl2qqa6pva649swq523vh446ifmydildycfvfmlm1h4qza"; depends=[data_table dplyr fda ggplot2 itsadug lazyeval mgcv rlang signal tidyr zoo]; }; - Pursuit = derive2 { name="Pursuit"; version="1.0.3"; sha256="08hy55k9wmn9si6pa3gdhvnas6clfknqkp3d8qdfpch1z5vg594c"; depends=[MASS]; }; + PupillometryR = derive2 { name="PupillometryR"; version="0.0.5"; sha256="0jqpx5g0fjdxxp7wlgv4jm5vrhchm6r21qd7i825fi5552c46awv"; depends=[dplyr fda ggplot2 itsadug mgcv rlang signal stringr tidyr zoo]; }; + Pursuit = derive2 { name="Pursuit"; version="1.0.4"; sha256="0pgx2vfvfgf0gndgnawk91hd13q39f0855hj1ivq30id91ym421r"; depends=[MASS]; }; PwrGSD = derive2 { name="PwrGSD"; version="2.3.6"; sha256="1sxm4g4hrnn7rqxgx4pi98jlh15a8hm8jnrnmcyi2yj86x5l35r0"; depends=[survival]; }; PxWebApiData = derive2 { name="PxWebApiData"; version="0.8.0"; sha256="1zp66rl61wcylbs2piqc3gj8n1d0z1z5hpc4gfm6rxqgav9ii9kb"; depends=[httr jsonlite pxweb rjstat]; }; Q2q = derive2 { name="Q2q"; version="0.1.0"; sha256="1n97axhcq64fg92cbndqw70c8awknjap91bh2h6i5cvd0c80pb85"; depends=[]; }; Q7 = derive2 { name="Q7"; version="0.1.0"; sha256="09jhqraajvlm7iiri4f7xlllkcx8q5h3sg472ishj47wg5qf2rym"; depends=[magrittr]; }; QAIG = derive2 { name="QAIG"; version="0.1.7"; sha256="04ygizvplvrzhf1p0vwj75x7k8sl0ym5zbrsvn63y983awih2p6i"; depends=[Formula stringr]; }; QBMS = derive2 { name="QBMS"; version="0.9.1"; sha256="0b8q8z1jgzy2jd1rm7hfqf2j2rdq9las4sjqfy9cn8d5aahzvqm7"; depends=[httr jsonlite RNetCDF]; }; - QCA = derive2 { name="QCA"; version="3.20"; sha256="1817sss1zxs57d7xnk625aic8swdzkw1h2q79zdnz2axmhf17bmg"; depends=[admisc shiny venn]; }; + QCA = derive2 { name="QCA"; version="3.21"; sha256="1z5jpgnpxkbpac85k1hz6vxc1ycl0z6z171i7k0p8jaj15rh616x"; depends=[admisc lpSolve shiny venn]; }; QCAcluster = derive2 { name="QCAcluster"; version="0.1.0"; sha256="094p11c9arry793zibr8x3xhpbrym9bfky95nds53g3yliprdd63"; depends=[data_table magrittr plyr purrr QCA rlist stringi testit UpSetR]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; @@ -3933,7 +3954,6 @@ in with self; { QHScrnomo = derive2 { name="QHScrnomo"; version="3.0.0"; sha256="1lr5x0cz1lkvcglhyvxy2pbg4bvvn46ii6vr5zwlm3zg05jhzx1v"; depends=[cmprsk Hmisc rms]; }; QI = derive2 { name="QI"; version="0.1.0"; sha256="1r65xq892mga54dfbh5va5zji5d1dx8k0fy611kbdviwqf0dfhx5"; depends=[ggplot2]; }; QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; }; - QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; QR = derive2 { name="QR"; version="0.1.3"; sha256="1xar0mj8s2nb8sks8dzf4wn1axc4rhmhx1qsjn2blsi4i8gfncka"; depends=[tinytest]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.3.0"; sha256="06ka6n9sh7h8ka6mklbvk8f7sqmz50mk74fjaj1r4l774wribxaq"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny shinyWidgets sp]; }; QRISK3 = derive2 { name="QRISK3"; version="0.6.0"; sha256="1qyipdmw7ygxlclnyf726bjkirskkkf4cygyv0y421c9x7dgznij"; depends=[]; }; @@ -3944,32 +3964,32 @@ in with self; { QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.4"; sha256="17f2xmgklbi8kicv7v951zm3bf1q4bdx9lcfbxpac3i7xm985fgr"; depends=[data_table doParallel foreach glmnet lars MASS openxlsx qtl Rcpp readxl stringr]; }; QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.1.1"; sha256="0a155vl869i3li2i67b89p056x50ycqp9yk0ll5g3fp3xcdl80zs"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl QTL_gCIMapping Rcpp shiny stringr]; }; - QTLEMM = derive2 { name="QTLEMM"; version="1.3.0"; sha256="18hfpb7wydaqfwk7kah65294xck62a3kal3fjlzgmmis0ylr6q71"; depends=[mvtnorm]; }; + QTLEMM = derive2 { name="QTLEMM"; version="1.4.1"; sha256="1d95zdqsdman9qb24p48safhdj9np9x6fzispgkv1igldb7302jc"; depends=[gtools mvtnorm]; }; QTLRel = derive2 { name="QTLRel"; version="1.14"; sha256="1brxlvqlcax0f5l0bnc9cirn2v6xwhb851cvzkwrgsxi4m7xn839"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; - QUALYPSO = derive2 { name="QUALYPSO"; version="2.1"; sha256="0d75r2835x9926rfk7wjkj2rixdq0apakz50vmg2lbmfgcfhgks1"; depends=[doParallel expm foreach MASS Rfast]; }; + QUALYPSO = derive2 { name="QUALYPSO"; version="2.2"; sha256="1836gl90021m47vs7ckb5s9sg1xzrdnwbrha8acrnwjsp17iyydv"; depends=[expm MASS Rfast]; }; QWDAP = derive2 { name="QWDAP"; version="1.1.17"; sha256="1yq2xm5a1im8g65j89d6xqfbknlrpfh9lpm1ggmn5fw8wq4519ni"; depends=[CORElearn pls Rcpp RcppEigen]; }; - QZ = derive2 { name="QZ"; version="0.2-2"; sha256="13s9yp9dz95iar2s8mhyi1sfba4wsdddpjard01665s34cvf1xw9"; depends=[Matrix]; }; + QZ = derive2 { name="QZ"; version="0.2-3"; sha256="14szpp8yv315wjn4d35l858bzkv2pd4s720ib921wsvpgn3xfx5d"; depends=[Matrix]; }; Qapprox = derive2 { name="Qapprox"; version="0.2.0"; sha256="0mv3xfy847lqh95mpccjiw5jjbml7dwrna7i16532sdqcxaq4m02"; depends=[]; }; Qardl = derive2 { name="Qardl"; version="0.1.1"; sha256="1sb6xp8hm4rh30dfnw9n5x10hr3sd9p0cv98fr31kdaiqji0vglw"; depends=[dplyr MASS Matrix pbapply quantreg]; }; Qest = derive2 { name="Qest"; version="1.0.0"; sha256="02q0j4vynk3hhfg1xfgdvp3piicc4cc1s1i1q710d06r8mmfz1cj"; depends=[matrixStats pch survival]; }; - Qindex = derive2 { name="Qindex"; version="0.1.3"; sha256="15xwnyimylixhv5p0y386ll2lj8b5l9pawfpnjahcf2j2mbkhmbn"; depends=[boot matrixStats mgcv pracma rpart survival]; }; + Qindex = derive2 { name="Qindex"; version="0.1.5"; sha256="1186k9yapq6ax2y6pyk3pjhsdsnzifwv94mawgzw8fcsz7wq83q7"; depends=[matrixStats mgcv pracma rpart survival]; }; QoLMiss = derive2 { name="QoLMiss"; version="0.1.0"; sha256="00g1ykwlmc4w0bmzj0jg9ckr2bvkl8qcxd67wdc12alccqqd584v"; depends=[dplyr missMethods survival]; }; QregBB = derive2 { name="QregBB"; version="1.0.0"; sha256="0rihfd2542wpfv43115pkxh233ma1qwkwxivawqs9f4faypyi5mh"; depends=[quantreg]; }; - Qtools = derive2 { name="Qtools"; version="1.5.6"; sha256="1dgvx4c2nvyy7d5yw8fs241k68621ynbx4r8bjlnrdq1c5wd2iww"; depends=[boot glmx gtools MASS Matrix np numDeriv quantreg Rcpp RcppArmadillo]; }; + Qtools = derive2 { name="Qtools"; version="1.5.8"; sha256="0h5812q5w71840lrsidr5hpx11ypzwq2jq684xyr7y8g63kwzvrr"; depends=[boot conquer glmx gtools MASS Matrix np numDeriv quantdr quantreg Rcpp RcppArmadillo]; }; QuClu = derive2 { name="QuClu"; version="1.0.1"; sha256="09fakiyj9kz9ac05jmis0zp9jmizvdyc8cid0js5xzm308dxnlsd"; depends=[]; }; QuESTr = derive2 { name="QuESTr"; version="0.1.1"; sha256="1vvvraqgy570dj86km4qpiax4a0zhfym94am0fn6ld43p3iixg02"; depends=[ggplot2 kernlab]; }; - QuadRoot = derive2 { name="QuadRoot"; version="0.2.0"; sha256="0p6d8s3qrynaky3xv7srh7qrpm6b0xrlq70m8gqsfddlgrvxl668"; depends=[]; }; + QuadRoot = derive2 { name="QuadRoot"; version="0.2.1"; sha256="1ixh4ikp8pqa7py4di9fgmi5rhjgsvh57j2f59g6xdcyl068c3g6"; depends=[]; }; Quandl = derive2 { name="Quandl"; version="2.11.0"; sha256="1bsba6blbcq0my8wm0qcy0qabbgx344gjljnjwaqfrqkjcphf5xs"; depends=[httr jsonlite xts zoo]; }; QuantBondCurves = derive2 { name="QuantBondCurves"; version="0.1.0"; sha256="035dd5q1jg3m2208khkg92k6ypskh85j04g9v4b83qff8lq91fg0"; depends=[lubridate quantdates Rsolnp]; }; QuantNorm = derive2 { name="QuantNorm"; version="1.0.5"; sha256="1hds9ybwsgnmcpa22vlmgdq02ilhn0c6a7z1qjiq4i5iqjd4gwf6"; depends=[]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.6"; sha256="1dbj830p5837fiwa800nzsaf19lf95vc3n7jmds2q9v06mrz6syq"; depends=[boot dplyr MASS purrr]; }; - QuantileGH = derive2 { name="QuantileGH"; version="0.1.3"; sha256="0nb30qg7znld8sqwywb7phwnb7h2dwamilq0bjn96bw0yviywjqa"; depends=[ggplot2 goftest latex2exp mixtools rstpm2 scales sn tclust VGAM]; }; + QuantileGH = derive2 { name="QuantileGH"; version="0.1.5"; sha256="18qdrrlqhjlqnxvinf9kwizbpd06pvgniy5wjq74x1l63d7n2k6z"; depends=[ggplot2 goftest latex2exp mixtools rstpm2 scales sn tclust VGAM]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; }; QuantumOps = derive2 { name="QuantumOps"; version="3.0.1"; sha256="0gl1myf7q444imyvsjvxiaxaahf0n0bsggwbd0z3az73l6yf1gjh"; depends=[]; }; Quartet = derive2 { name="Quartet"; version="1.2.5"; sha256="1chbn80y04hhcii1b58s7l1vak85ihdpl5q833mszrqili5zrmb1"; depends=[ape Rcpp Rdpack Ternary TreeTools viridisLite]; }; - QuickJSR = derive2 { name="QuickJSR"; version="1.0.4"; sha256="11fj3in9bzljj1jzz0y49yib1dcpbl8qr01sbqwa3wh4pq4c7mc0"; depends=[jsonlite R6 Rcpp]; }; + QuickJSR = derive2 { name="QuickJSR"; version="1.0.7"; sha256="14wq7qymzrdbg3mhm4gk3vx1dr4yx8di8i2b10as4knnzr1w4q9i"; depends=[jsonlite R6 Rcpp]; }; QurvE = derive2 { name="QurvE"; version="1.1"; sha256="1i1cmwndi8vkl2hs06mlad53l1q19fmrg32vciyllvv3s9r45mgz"; depends=[doParallel dplyr drc DT foreach ggh4x ggnewscale ggplot2 ggpubr kableExtra knitr labeling magrittr minpack_lm plyr RColorBrewer readxl rmarkdown scales shiny stringr tidyr]; }; R_cache = derive2 { name="R.cache"; version="0.16.0"; sha256="14cja0d78mzipb94cwgdl00k5r7awjclzxl30c77j6jpc68l0lvq"; depends=[digest R_methodsS3 R_oo R_utils]; }; R_devices = derive2 { name="R.devices"; version="2.17.1"; sha256="02cwdhb9m97gxi4pki4kasc5j3a12r7yzsychzzk9h0ijc1mfziv"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; @@ -3981,11 +4001,11 @@ in with self; { R_rsp = derive2 { name="R.rsp"; version="0.45.0"; sha256="192x8cvna1j0sx37xh3ha8bjjyx39pn5wnxzn5gs3z5j93a4d055"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_temis = derive2 { name="R.temis"; version="0.1.3"; sha256="1qa381fv1hxd1fv9d22772aibiia6m2ycm69znjy3ah2w986hjfh"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; }; R_utils = derive2 { name="R.utils"; version="2.12.2"; sha256="0dl8rc7s7vg4g2pkmrwwqx7dkm02096jk439x4s0cm21hsmg2g7y"; depends=[R_methodsS3 R_oo]; }; - R0 = derive2 { name="R0"; version="1.2-10"; sha256="10ynx3qrw2nr5zd5zws9sbr5qabx6f9i7y7isi915hrqpfddf1pb"; depends=[MASS]; }; - R1magic = derive2 { name="R1magic"; version="0.3.3"; sha256="0klfaab1abfq662p5c93h6y222nqphhq6m65hdjms04gl44bk3ww"; depends=[]; }; + R0 = derive2 { name="R0"; version="1.3-1"; sha256="1bf6f3hijhpwqfpaqdbh9hzy85yjmwxfjssj1bpihl3dql1kv3ad"; depends=[MASS]; }; + R1magic = derive2 { name="R1magic"; version="0.3.4"; sha256="03sx0lr3yaycvs1cklwamhdy4fbxnp3wizwvmd4szg9irlyj536p"; depends=[]; }; R2Addhaz = derive2 { name="R2Addhaz"; version="0.1.0"; sha256="1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi"; depends=[ahaz caTools pracma Rdpack survival zoo]; }; R2BEAT = derive2 { name="R2BEAT"; version="1.0.5"; sha256="02vxch3pszh3lv4z01da5g6d9zjnjv5cyxciiw4ina767lsk0rgk"; depends=[doParallel foreach glue sampling]; }; - R2BayesX = derive2 { name="R2BayesX"; version="1.1-4"; sha256="0mq71r4w1y7mxrrzm51k00am788ln49hsjcv3ywlkvjw63yiql9a"; depends=[BayesXsrc colorspace mgcv]; }; + R2BayesX = derive2 { name="R2BayesX"; version="1.1-5"; sha256="1x3hv0dfkh4ywi47qkmk6wvfz07rp5riwnxcnn32jflwcdzscqva"; depends=[BayesXsrc colorspace mgcv]; }; R2DT = derive2 { name="R2DT"; version="0.2"; sha256="0hyisq6mij80v14sjspn9idd1h38sd1knbpd0dn2wy9k2w1fl0pk"; depends=[data_table devFunc plyr]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.3"; sha256="12qg9rp1j26h2f48dfg5k9jds26ycacv3f3ymk686ks43hd1hzja"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-8"; sha256="0gik3n95469c4cdqam3a37smcf77arxac0d8ryd2xf9nq1zw6nlk"; depends=[broom coda digest doParallel foreach foreign lattice Matrix memisc R2WinBUGS texreg tibble]; }; @@ -3997,7 +4017,7 @@ in with self; { R2jags = derive2 { name="R2jags"; version="0.7-1"; sha256="0si2f0lmnpjcsmy54k51kwj1fkx24dshiidv46h8j2xjq1hp429v"; depends=[abind coda R2WinBUGS rjags]; }; R2sample = derive2 { name="R2sample"; version="1.1.0"; sha256="18v7i0h4jbnyd08c24sr8fydk209fp76hc2k7yivva616m5c4s2d"; depends=[ggplot2 microbenchmark Rcpp shiny]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.2"; sha256="0940c9zw3fifs7m4hrx9aqv4d56q3263bl12lzk2mx2sfjp9rzlw"; depends=[RMark stringr]; }; - R3port = derive2 { name="R3port"; version="0.2.4"; sha256="0h1n5v1hkdqbars8xsid208wkr8jw9gwx5j2gprfl58fh0d2rc94"; depends=[plyr reshape2 tinytex whisker]; }; + R3port = derive2 { name="R3port"; version="0.2.5"; sha256="0vcn0qay1fxwvaa81jin0s5ly22sjriqavgy8x981xjzdxl5s5ww"; depends=[plyr reshape2 tinytex whisker]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; R6 = derive2 { name="R6"; version="2.5.1"; sha256="0j5z0b0myzjyyykk310xsa9n2mcm9bz8yqbq4xgz2yzdq8lvv4ld"; depends=[]; }; R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; }; @@ -4006,14 +4026,13 @@ in with self; { R6causal = derive2 { name="R6causal"; version="0.8.0"; sha256="0p6mhni9cy0ap9a701aqzdwl6bmqv646c9c2qc1n0zydnj0lg78h"; depends=[causaleffect data_table dosearch igraph MASS R6]; }; RABR = derive2 { name="RABR"; version="0.1.1"; sha256="1ckh0cw5xaqbzx8f7i6lsbspblfm0mmmadaifmln2rz3vr0hf1f4"; depends=[asd cubature data_table doParallel foreach ggplot2 multcomp multxpert survival]; }; RAC = derive2 { name="RAC"; version="1.5.5"; sha256="0ar2vbckfr26slbibbbcx409c8mw338x4apmxs7by6prnlwr6fpx"; depends=[matrixStats plotrix raster rstudioapi sp]; }; - RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; }; RADstackshelpR = derive2 { name="RADstackshelpR"; version="0.1.0"; sha256="0j2vazbji8xqb8xkd9jrpi10iqj30rvkdjfs4snavl9nsbra99yf"; depends=[ggplot2 ggridges gridExtra vcfR]; }; RAFS = derive2 { name="RAFS"; version="0.2.3"; sha256="00s7k5liqklri0di2yawzilxcp047x0mq9l7grqr1dshhzyv2rms"; depends=[fastcluster MDFS splitTools]; }; - RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.32"; sha256="1x87an97405l7mlwzby8fhxxc7f6bnc9xyzjpn23nrbyvkpmyis8"; depends=[ape cluster expm gaston here htmlwidgets MASS Matrix MM4LMM optimx pbmcapply pegas R_utils Rcpp RcppEigen Rfast rrBLUP stringr]; }; + RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.33"; sha256="1rzi0hys891qwfdfbckpk12ahg7cv9jx9p9n8hdgkwk2jva4qynq"; depends=[ape cluster expm gaston here htmlwidgets MASS Matrix MM4LMM optimx pbmcapply pegas R_utils Rcpp RcppEigen Rfast rrBLUP stringr]; }; RALSA = derive2 { name="RALSA"; version="1.3.5"; sha256="16zq764qks8qbj5adzfdp0agg8p33q7znyn4png0qb3ighn751yg"; depends=[data_table DT foreign ggplot2 Hmisc openxlsx r_import rclipboard readr rstudioapi shiny shinydashboard shinyFiles shinyjs stringi stringr]; }; - RAMClustR = derive2 { name="RAMClustR"; version="1.3.0"; sha256="10l0gidlzalj1zx2wiiwg114hshqsx2639w29sks9g7w6dh20019"; depends=[dynamicTreeCut e1071 fastcluster ff ggplot2 gplots httr jsonlite pcaMethods preprocessCore stringr webchem]; }; + RAMClustR = derive2 { name="RAMClustR"; version="1.3.1"; sha256="0mlizk0rga6mprp4n2ff12yamvfsfk9v46d94ra6ld0i2jxm84fd"; depends=[dynamicTreeCut e1071 fastcluster ggplot2 gplots httr jsonlite pcaMethods stringr webchem]; }; RAMP = derive2 { name="RAMP"; version="2.0.2"; sha256="0836fiycrsxiwdw7srz1rvsf639iqh2rk89gavx4kvn0i0sc8d2x"; depends=[]; }; - RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; }; + RAMpath = derive2 { name="RAMpath"; version="0.5.1"; sha256="0dp5illypz3qdj2qmn47wy208mcjhkkwvw8yq2spzcsn55l8f0nx"; depends=[ellipse lavaan MASS]; }; RANKS = derive2 { name="RANKS"; version="1.1"; sha256="1c7khw2rxf88cycy81kqxyg7rzb9f8ns8n5x24zzjdvsws77fshq"; depends=[graph limma NetPreProc PerfMeas RBGL]; }; RANN = derive2 { name="RANN"; version="2.6.1"; sha256="10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj"; depends=[]; }; RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; }; @@ -4027,11 +4046,11 @@ in with self; { RAppArmor = derive2 { name="RAppArmor"; version="3.2.3"; sha256="04hxqwi75npayd3ghghswxc51k2xb525drixxk1fvp6hrhdkap5h"; depends=[unix]; }; RAthena = derive2 { name="RAthena"; version="2.6.1"; sha256="1zncmkx93c28z0xf4n5rdc7fzlrdqw3x9ab2ci07f00gjf9gwkf1"; depends=[data_table DBI reticulate uuid]; }; RBE3 = derive2 { name="RBE3"; version="1.0"; sha256="1vkd06qzfbz3z3mq7sma05k81pz5xg2pw6s6z706b0g2jhqqnkh3"; depends=[gtools pracma]; }; - RBF = derive2 { name="RBF"; version="2.1.0"; sha256="0062ckvrjfkkl5lfrshrr2cynrxsrp4zpdpl8nij06hm00i3gfs5"; depends=[]; }; + RBF = derive2 { name="RBF"; version="2.1.1"; sha256="0hwf9hca2vlgkjjldmkn6xj85b9gy7ydfd3smqnkby1shdaz4dfm"; depends=[]; }; RBNZ = derive2 { name="RBNZ"; version="1.1.0"; sha256="11fdnc2pmw5nq3lswid078l307ln6853a3b9d383msvrkz6yms26"; depends=[httr lubridate readxl rvest xml2]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBaseX = derive2 { name="RBaseX"; version="1.1.2"; sha256="1f7lgfsxwqjplv8kk81sw3zmwqi9kxc8g328ylb2c2hiyq4fg49k"; depends=[data_table dplyr httr magrittr openssl pingr R6 RCurl rex stringr tibble]; }; - RBesT = derive2 { name="RBesT"; version="1.7-1"; sha256="0785a5q2m5371arwvybdc72nly87az5qqbp5sgvfdy9rz9xgldnl"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 matrixStats mvtnorm Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; + RBesT = derive2 { name="RBesT"; version="1.7-2"; sha256="16ws9bg9a646mh6lhyfzvhgczbi5fi5a3cw4vlxh5w68by5h1s5x"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 matrixStats mvtnorm Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; RCAL = derive2 { name="RCAL"; version="2.0"; sha256="1k58im8dclyaqqcqm6v9618rlh8jkp74j7ly2lvqfb9jm0wgkx8h"; depends=[trust]; }; @@ -4055,10 +4074,11 @@ in with self; { RChest = derive2 { name="RChest"; version="1.0.3"; sha256="112y6g1lyk3wky825g77sy49wgqs8vqdi90lrp0qza6cqjg381mq"; depends=[Rdpack reticulate]; }; RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; }; RCircos = derive2 { name="RCircos"; version="1.2.2"; sha256="1z0aam60p1b6q7csn50rrwdilm07myr05bw54s9ah8idzyxc7gav"; depends=[]; }; - RClickhouse = derive2 { name="RClickhouse"; version="0.6.7"; sha256="0pnavhsxza379c6j6bzpqg0m9dhfaivf3zcvxw6hsc64mgb7wjpd"; depends=[bit64 cli DBI dbplyr dplyr Rcpp]; }; + RClickhouse = derive2 { name="RClickhouse"; version="0.6.8"; sha256="1n3h9q0xx64pq4k584hqpk802kjs6k68dhyd7bgy9w9m1ifcx8fg"; depends=[bit64 cli DBI dbplyr dplyr Rcpp]; }; RClimacell = derive2 { name="RClimacell"; version="0.1.4"; sha256="03w2psiix74d2cbaz06bk77pclc6lfjhfdi057rdmw4nv3xv1fqi"; depends=[assertthat dplyr httr lubridate magrittr rlang stringr tibble tidyr tidyselect]; }; RColetum = derive2 { name="RColetum"; version="0.2.2"; sha256="04gf2689fm9fm1nwsi4yn46rdsxpqznxspxcmjjhg0j1lxdkda39"; depends=[dplyr httr jsonlite]; }; RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-3"; sha256="1h0s0f4vvlk40cagp3qwhd0layzkjcnqkiwjyhwqns257i1gahjg"; depends=[]; }; + RColorConesa = derive2 { name="RColorConesa"; version="1.0.0"; sha256="0b42bvhpkqdaxay9yv4wjlb5dk2j2svsrmg0l557dd7w30xarwa6"; depends=[ggplot2]; }; RConics = derive2 { name="RConics"; version="1.1.1"; sha256="0r5sn5kx6r3pjnvrgz7yxpyznb1js2i58vnbsqyzpl7jhcdhpz5x"; depends=[]; }; RCreliability = derive2 { name="RCreliability"; version="0.1.0"; sha256="083n6ix9yjnv4aafp11qac891gdhk62mhxmwkx9z3i0sxddwdb6r"; depends=[mgcv sandwich]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; @@ -4068,8 +4088,8 @@ in with self; { RDM = derive2 { name="RDM"; version="0.1.1"; sha256="0aqjs7dh40d24l8fhhkyf1vnpwbxm47blfi4lwwld2hyi854m80q"; depends=[Rcpp Rfast]; }; RDML = derive2 { name="RDML"; version="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; RDP = derive2 { name="RDP"; version="0.3.0"; sha256="18bdd290xy167qclv4l35bfy6iicbn6v9k3sq0xihsc83ln1h7lk"; depends=[Rcpp]; }; - RDS = derive2 { name="RDS"; version="0.9-6"; sha256="1pm9xy8jklb5l21g464z6310iin4v6hkkl42msl5xpicfvv0axd2"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales statnet_common]; }; - RDSsamplesize = derive2 { name="RDSsamplesize"; version="0.4.0"; sha256="15jm2gkgbnvay415w5nsh9ahfk23hyc8q12y0fgrh1airx3bdij1"; depends=[Rcpp]; }; + RDS = derive2 { name="RDS"; version="0.9-7"; sha256="0xq190as7vza2fim7b4qhk7x3kckqpca7pp8klh14vkjhix9yias"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales statnet_common]; }; + RDSsamplesize = derive2 { name="RDSsamplesize"; version="0.5.0"; sha256="1k6yjxjv6s9c44lpm5yimca61jp3h4hbji75vfsji7dy7q908csl"; depends=[Rcpp]; }; RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; }; RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; }; RDieHarder = derive2 { name="RDieHarder"; version="0.2.5"; sha256="1djgy6al9f92i295bzc65lny7lz8gpk5js6hmfbflwfwcl9wg05b"; depends=[]; }; @@ -4077,40 +4097,41 @@ in with self; { RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; REAT = derive2 { name="REAT"; version="3.0.3"; sha256="1bnmk74xdxckni6alp5kslsb3w7jlnfwc27mi5y3lry7zrvxi6lk"; depends=[]; }; - REBayes = derive2 { name="REBayes"; version="2.51"; sha256="0vsi7bwzg7aarjmywi1xhk7ckiyvp2kyyh97jh9i1a8045sg3p18"; depends=[lattice Matrix]; }; + REBayes = derive2 { name="REBayes"; version="2.54"; sha256="1kg105jnc7hjxihvrjcfklz6i29kznz9aqh6303v9v6hfmy6a094"; depends=[lattice Matrix]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; REDCapCAST = derive2 { name="REDCapCAST"; version="23.6.2"; sha256="0gn1fyk1808qcd8cvzkxp86vyy3cq709c2lkjwaxl48zfafv1sim"; depends=[dplyr REDCapR tidyr tidyselect]; }; - REDCapDM = derive2 { name="REDCapDM"; version="0.7.0"; sha256="0p04k6wpkvx06h80gbf87qv83npglka5m1iiggcx19gc6fxlvh3d"; depends=[dplyr janitor labelled magrittr openxlsx purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; + REDCapDM = derive2 { name="REDCapDM"; version="0.8.0"; sha256="1i1p40yklhmv53nn59znf3v51p6xbdrlnk5kc8b540i5q7c1i2hc"; depends=[dplyr janitor labelled magrittr openxlsx purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.2"; sha256="0w7c1y58vnkbd11ndkcn5s5c54pmvyqhflwgg2q6dc3n671yp9wx"; depends=[curl data_table keyring lubridate]; }; REDCapR = derive2 { name="REDCapR"; version="1.1.0"; sha256="02d41mbplc7fb0yf6sf62fzfzai95vjqxhz2hkz7135w17s31j8r"; depends=[checkmate dplyr httr jsonlite magrittr readr rlang tibble tidyr]; }; - REDCapTidieR = derive2 { name="REDCapTidieR"; version="0.4.0"; sha256="0ssbx2snqjlkx17l6rb1n19ww3rqvahc85clmsrrisql01w10vx1"; depends=[checkmate cli dplyr formattable lobstr lubridate purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; + REDCapTidieR = derive2 { name="REDCapTidieR"; version="0.4.1"; sha256="0c2b8ihjjzwl1g6jnrbp3c5blyqjrxpn0dkfnkk1v4vg8swrwh75"; depends=[checkmate cli dplyr formattable lobstr lubridate purrr REDCapR rlang stringi stringr tibble tidyr tidyselect]; }; REDI = derive2 { name="REDI"; version="1.0.0"; sha256="0i7gfsqyjhkwh6wxzzznai2qyfk3njim992njp0djd6lpbj96mdw"; depends=[dplyr ggplot2 lubridate magrittr rlang tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.4"; sha256="11m9k6xli3gqw2f9vwa9abpwsnxawi675zmi916yq2shws49m8xn"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; }; - REPPlabShiny = derive2 { name="REPPlabShiny"; version="0.4.1"; sha256="0wim27jm01xbi316jfz5j30sid7z1wsznhrpmxrbd97d4312449w"; depends=[DT REPPlab shiny]; }; + REPPlabShiny = derive2 { name="REPPlabShiny"; version="0.4.2"; sha256="0mm815pf90xqp1fgz955cdgc9k72kpq8zlpfa18pb478c02kvwg3"; depends=[DT REPPlab shiny]; }; REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; }; REQS = derive2 { name="REQS"; version="0.8-13"; sha256="1yzd37kqkg477p501l6s8iah9pkjsnsbxmk32w0rji7jpj7r2rs5"; depends=[gtools]; }; - RESET = derive2 { name="RESET"; version="0.2.0"; sha256="16p48xhcvqv2f1zqbca7p1hnqrngk7pchj6xaw7265pixaybvlbp"; depends=[Matrix]; }; + RESET = derive2 { name="RESET"; version="0.2.1"; sha256="19rlmyljhiwiwh66xnqrz3m605jiy7kdaigivwmln7cvypzblzvk"; depends=[Matrix]; }; RESI = derive2 { name="RESI"; version="1.2.0"; sha256="1c578fxn8mpssckwxys3dssmiag69b0y51hd8y59spx2q0sc96cg"; depends=[aod boot car clubSandwich ggplot2 lmtest nlme regtools sandwich]; }; RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; + RESTK = derive2 { name="RESTK"; version="1.0.0"; sha256="0pz3gafzvaaxd4qm731ayk7kbjj4w8ylq7z696avcs01r66prrk7"; depends=[purrr]; }; REdaS = derive2 { name="REdaS"; version="0.9.4"; sha256="1bi04zaqg4plp1byspn97lrlny47l521y1jhiixy093g6p6lqj11"; depends=[]; }; REddyProc = derive2 { name="REddyProc"; version="1.3.2"; sha256="1irclh991wp1ns2wb9dd88kqd5vg1kd8vk83a7w0kjpf20yqnkvp"; depends=[bigleaf dplyr magrittr purrr Rcpp readr rlang solartime tibble]; }; REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; }; - REndo = derive2 { name="REndo"; version="2.4.8"; sha256="080yh29y6vhv83md46dmxz4y06bndi44xi34zkjmi4yp198knr1f"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; }; - RFCCA = derive2 { name="RFCCA"; version="1.0.10"; sha256="135kdvyljaw7lh9ki3mla3bc6h1gk4kh9kq6h6jcv87x93gfan37"; depends=[CCA PMA]; }; + REndo = derive2 { name="REndo"; version="2.4.9"; sha256="08am92h1j2zx7pannnd6z9h4xr14awdp4rzv4sdmgf3x7sfjcp5g"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; }; + RFCCA = derive2 { name="RFCCA"; version="1.0.11"; sha256="1l0igj4wxajq2712ia5rc4l11xqpdg32nx31h1d9dpnab31914wc"; depends=[CCA PMA]; }; RFLPtools = derive2 { name="RFLPtools"; version="2.0"; sha256="07hw0hyyxqy31qakkb410gb3i0g5jvpmigv5cqhxqss2cwzpch0d"; depends=[RColorBrewer]; }; - RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; + RFOC = derive2 { name="RFOC"; version="3.4-10"; sha256="0011irdbvflqz9r1l6c8d801y6jx0xmwhcv2a6xjwj0bjsw1s8di"; depends=[fields GEOmap MASS RPMG RSEIS]; }; RFPM = derive2 { name="RFPM"; version="1.0"; sha256="1rhi1nn1xxc5qvxk2vwd96325pqwz45b2bvaq994glvlxniki3c1"; depends=[dplyr lawstat reshape2]; }; RFclust = derive2 { name="RFclust"; version="0.1.2"; sha256="04cynwsfs07j6kbpnpk4kx7p2a33y5qylpvydv29975z7p871vsm"; depends=[ConsensusClusterPlus randomForest]; }; - RFishBC = derive2 { name="RFishBC"; version="0.2.4"; sha256="1wh1j5lciff1vgjwrmc2hhr0yfq289l6k917pzhpl5bk6r4ml0fs"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; + RFishBC = derive2 { name="RFishBC"; version="0.2.6"; sha256="1nrfznkh2k7r8kzxr4k5ncp4rk3y21snbf0fjsm8ag9bhqzhcl3f"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; }; RFpredInterval = derive2 { name="RFpredInterval"; version="1.0.7"; sha256="1r26pd6dxvkbx2aqcgb4rn9bdwnac3smw4wb1qr4pzzp9nw1ji4h"; depends=[data_table data_tree DiagrammeR hdrcde ranger]; }; RGAN = derive2 { name="RGAN"; version="0.1.1"; sha256="0820fvmiw853hfls7mydca9lhwxrrkj49vshp151by9mavwkx413"; depends=[cli torch viridis]; }; RGAP = derive2 { name="RGAP"; version="0.1.0"; sha256="0mc0cwwl6nlrjsgsqpbzzry8rx00fdj26a3g3wa9cw0n8nvh0p54"; depends=[dlm ggplot2 gridExtra KFAS openxlsx zoo]; }; RGBM = derive2 { name="RGBM"; version="1.0-11"; sha256="12pi503n767c707f4nqfn7zzvxb25kb6pks0257bcixwm37a6r54"; depends=[doParallel foreach plyr]; }; - RGCCA = derive2 { name="RGCCA"; version="3.0.1"; sha256="1idvy50zjz5kn657klqbfq9a3jwfvp0f8p8dpyjyykfmp1rb99vd"; depends=[caret Deriv ggplot2 ggrepel gridExtra MASS matrixStats pbapply rlang]; }; + RGCCA = derive2 { name="RGCCA"; version="3.0.2"; sha256="10rzjnisjhryj6z8qp2wzjvmf3wg7xflskii83llr5gh0v8yjrf9"; depends=[caret Deriv ggplot2 ggrepel gridExtra MASS matrixStats pbapply rlang]; }; RGCxGC = derive2 { name="RGCxGC"; version="1.2.0"; sha256="1hz363pqlx0l3wi4di69fmrv4awl37lz8fzl4g070zchwzbffcpc"; depends=[colorRamps ptw Rdpack RNetCDF]; }; RGE = derive2 { name="RGE"; version="1.0"; sha256="1ild1if10xicfapfcmydz1cgvn5fyydrik8qclb90i95bl9bs4ia"; depends=[coda Matrix MatrixModels]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.7"; sha256="0w6hqrf2lr6qz79skml2vjpfwfv5vxj94rghxxa3rp9dqzhi7rc0"; depends=[magrittr RMAWGEN]; }; @@ -4118,7 +4139,7 @@ in with self; { RGF = derive2 { name="RGF"; version="1.1.1"; sha256="0dld7icq02mc5gdy8lpjwdfpk9l5cwmqc6f8zf083sjvp0b2rgb9"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGMM = derive2 { name="RGMM"; version="1.1.0"; sha256="0x5v16pzg79ria0jah8rkpyqjixkdm4n4xklniy38663d6vqj2sx"; depends=[doParallel foreach genieclust ggplot2 LaplacesDemon mclust mvtnorm Rcpp RcppArmadillo reshape2 RSpectra]; }; - RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; }; + RGN = derive2 { name="RGN"; version="1.0.0"; sha256="1gpn595ywc1yrmr0vgwk5fa2j062pap85rz62dnyz2cncr0kvr48"; depends=[]; }; RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; @@ -4126,7 +4147,7 @@ in with self; { RGoogleFit = derive2 { name="RGoogleFit"; version="0.4.0"; sha256="0k1vvl4l6pq37llpbq996rbghdfld7mz7bhzbpw393fmrkd45vyi"; depends=[bit64 httr jsonlite RCurl]; }; RGraphics = derive2 { name="RGraphics"; version="3.0-2"; sha256="02gp2lqc5qzid81d28cqb7x88zr0ivxppy55a9q649whcd027071"; depends=[ggplot2 gridBase gridGraphics gridSVG grImport grImport2 lattice]; }; RGreenplum = derive2 { name="RGreenplum"; version="0.1.2"; sha256="1mc0zmmnb9306j2cjn1j71bp35ri8p35rw6rlmrqyxgpvlw09r3d"; depends=[DBI RPostgres]; }; - RGremlinsConjoint = derive2 { name="RGremlinsConjoint"; version="0.9.0"; sha256="1ppyvb3l13xz0fihskckmm53ppgfb577n0359kc1bip4bpgky3li"; depends=[bayesm]; }; + RGremlinsConjoint = derive2 { name="RGremlinsConjoint"; version="0.9.1"; sha256="0x51bh0l0q320xcyxxfrf5wa2nq1nspq1c61pap2gc45rzv5w4pz"; depends=[bayesm]; }; RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; RHMS = derive2 { name="RHMS"; version="1.7"; sha256="1fld5y39a4xq40wh23944ngcrkqk2pw8w9raxir9wn2z2nysr7zg"; depends=[GGally ggplot2 Hmisc network pso]; }; RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; }; @@ -4134,9 +4155,8 @@ in with self; { RHRV = derive2 { name="RHRV"; version="4.2.7"; sha256="0w4r2sk1h9wxmhs5l2dk9gzr85wrss3m4qi67mj37cjd4qmmn1wi"; depends=[lomb nonlinearTseries waveslim]; }; RHSDB = derive2 { name="RHSDB"; version="0.2.0"; sha256="0k23vdb9p2c2hnac8rk2dnls47fw5qc66ifhx47q8myi1479vvll"; depends=[]; }; RHawkes = derive2 { name="RHawkes"; version="1.0"; sha256="1ishfdbyk9g6lh5q6apbaw7vh9cfwyykag27imrfpx3c40sbwmd4"; depends=[IHSEP]; }; - RHclust = derive2 { name="RHclust"; version="1.1.0"; sha256="1i28bxkgdxlc216vsgambzc027wjnw0iaibry6m1vz9as2yy1fry"; depends=[Runuran]; }; + RHclust = derive2 { name="RHclust"; version="2.0.0"; sha256="0hfi1p1y3kfi7kmmwvpzf7j2rlkamfl2s6sb26h2qz07fp5ha3p5"; depends=[Runuran]; }; RHybridFinder = derive2 { name="RHybridFinder"; version="0.2.0"; sha256="0g8kvzir8kfgg3ifww164lbqhsi2yw3dp80r68g36vxfzy11y230"; depends=[doParallel foreach seqinr]; }; - RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; RIA = derive2 { name="RIA"; version="1.7.1"; sha256="0q36xaikj4c208hk48zdlpgx0hfvc5dpwckr0ksk217n0h5hfk1x"; depends=[oro_dicom oro_nifti]; }; RIFS = derive2 { name="RIFS"; version="0.1.6"; sha256="0cbz2vg8adqjkbn9r8cikqxlzhk01ba3nlnh8rqbwdcpiz90l1ip"; depends=[]; }; RISCA = derive2 { name="RISCA"; version="1.0.4"; sha256="1mhydhr6a0wywr0pml7jw0sra2iavzbkxm3gs0w9p53ssdipnw49"; depends=[caret cubature date doParallel flexsurv foreach glmnet glmnetUtils hdnom kernlab MASS mosaic mosaicCalc mvtnorm nlme nnet prodlim randomForestSRC relsurv reticulate rpart statmod SuperLearner survival survivalmodels timeROC tune]; }; @@ -4150,7 +4170,7 @@ in with self; { RInside = derive2 { name="RInside"; version="0.2.18"; sha256="0dmpdi39dv5a0i7v507cbm2vr2d0cl310n9w1qz66r53y3q18l40"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.3-3"; sha256="1m9isda5alzycill707r2ayz9mcdsyhxnpy6i6nmzgrsxb9f421a"; depends=[abind dplyr ggplot2 SparseM survival svd tibble tidyr xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-10"; sha256="06b2gw76jwmm3lw3knmn6slc6824d4gzry94n96d97ii4fm4gwrp"; depends=[DBI rJava]; }; - RJDemetra = derive2 { name="RJDemetra"; version="0.2.3"; sha256="0hh4ry2xmbawyqz148s1gsi06j28xz28qjbi5g452h94a0c8klcv"; depends=[rJava]; }; + RJDemetra = derive2 { name="RJDemetra"; version="0.2.4"; sha256="168if9s8zwmfcaj3mw7r2ksk0ri12cxqxfljs5ficcnxrm65vfn6"; depends=[rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="3.0-6"; sha256="036ixsa2vymlmq3wb9yaclwkql30jgrycmfq8k0n6gxl309x5z2y"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.8"; sha256="1xak6n15ck7rj9swxk99vpjly1naxgz9gj6zjmib2lkq7inmgw7n"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.7"; sha256="02q5isc137nx7qil2p3903xfsjwk54507rs72dfaiy6a8scys5j9"; depends=[]; }; @@ -4158,9 +4178,8 @@ in with self; { RJcluster = derive2 { name="RJcluster"; version="3.2.4"; sha256="157dmi5gksq7s16ip4n9j5bj9s9bawl078rh13s1xxyr6f51yp09"; depends=[foreach infotheo matrixStats mclust profvis Rcpp RcppArmadillo rlang]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; }; - RKEEL = derive2 { name="RKEEL"; version="1.3.3"; sha256="1m9jxi7nwkjaq172rx28fk73i144bny2h4aliqkvg2ffsdjyi685"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; + RKEEL = derive2 { name="RKEEL"; version="1.3.4"; sha256="05fwzpa4dixc7lp89x122w07gzblxyyaf5l74gds0zgib9ik5cab"; depends=[arules doParallel downloader foreach gdata Matrix openssl pmml R6 rJava RKEELdata XML]; }; RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; }; - RKEELjars = derive2 { name="RKEELjars"; version="1.0.20"; sha256="1wsxn9l7xdmm9q3z9lbbkdcnwsfmcrayg08m4mkbwynii5z9x548"; depends=[downloader]; }; RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; }; RKUM = derive2 { name="RKUM"; version="0.1.1.1"; sha256="0w26ybl8jp5b90lfxj4710bkhb6qchnsg6smvwrry2225x3kfk7v"; depends=[]; }; RKelly = derive2 { name="RKelly"; version="1.0"; sha256="0mkpc95j67rg2gcj2fc4w8kv4v31cpiyvh660y8kc2fjr5q4aj3l"; depends=[]; }; @@ -4186,22 +4205,22 @@ in with self; { RMOPI = derive2 { name="RMOPI"; version="1.1"; sha256="0jjli73b1xinrkq0fndfaan1mgf6yb29skqvva4lib0zgd8p1v21"; depends=[fPortfolio ggplot2 lubridate MASS PerformanceAnalytics rugarch tibble timeDate timeSeries TTR xts]; }; RMPSH = derive2 { name="RMPSH"; version="1.1.1"; sha256="0jffp8942ydwain23kvy7q6avpxxsb77jj1mg4bq43fwgfc9nqjy"; depends=[Rcpp]; }; RMSNumpress = derive2 { name="RMSNumpress"; version="1.0.1"; sha256="1y86dpa8kpq2bkvl90qwghxrnll5h3y9ycyvmamm4kd7ivy59sxi"; depends=[Rcpp]; }; - RMSS = derive2 { name="RMSS"; version="1.0.0"; sha256="19ggr1s2mpaha3r7sd2dp1mnw94g9nwqwzsxzy11q8cpfyb3c02w"; depends=[cellWise Rcpp RcppArmadillo robStepSplitReg]; }; + RMSS = derive2 { name="RMSS"; version="1.1.1"; sha256="18hm626yr3xrsi9spzr42y9pf547xdx7byqq15bvh9f04qaalck3"; depends=[cellWise Rcpp RcppArmadillo robStepSplitReg robustbase srlars]; }; RMT4DS = derive2 { name="RMT4DS"; version="0.0.1"; sha256="05fwhd36lvi21gr5nz8mgxk5qzw4vxkrgw499p11aa9qhcn8xq4g"; depends=[lpSolve MASS mpoly nleqslv pracma quadprog rARPACK RMTstat rootSolve]; }; RMTL = derive2 { name="RMTL"; version="0.9.9"; sha256="1wyv9l1xgdm4s8ibjw3kwfsr77hxkxj80cgvkfv4mdir0bxm84b4"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3.1"; sha256="1r1a2sdqv64m9cpm2pz6r8abf7l810126ayd8iq3gx86c7bjfj5v"; depends=[]; }; RMVL = derive2 { name="RMVL"; version="0.0.4.4"; sha256="01w649iw62kpyp4a3lyrqcfb8iqcd0v8zwz6aq1cnxhw04hz0c1w"; depends=[]; }; - RMaCzek = derive2 { name="RMaCzek"; version="1.5.0"; sha256="01r52z8h4cp0hkwqxlnn64mjrb3id7wlqsiwbx3m86j4d1km01q6"; depends=[e1071 ecp GA RColorBrewer seriation]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.5.1"; sha256="1zbpwhfa9mb55yglf4kgvch3hg7pvsfga4kpq45lz1cbs9454mzw"; depends=[e1071 ecp GA RColorBrewer seriation]; }; RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; - RMariaDB = derive2 { name="RMariaDB"; version="1.2.2"; sha256="13j6bx3h2fjng4lym65w2anyq3kfamkg7qyk56csvyc4wnn62z69"; depends=[bit64 blob DBI hms lubridate plogr Rcpp rlang]; }; + RMariaDB = derive2 { name="RMariaDB"; version="1.3.0"; sha256="080pxl29q9fm5a3n8jp5dmwlwcc2snrz40zjdqyfkfb0m81zprih"; depends=[bit64 blob cpp11 DBI hms lubridate plogr rlang]; }; RMark = derive2 { name="RMark"; version="3.0.0"; sha256="0nrh55rmfkrncpc58hranjww37dp8qrngkcazs5nmznw8r10z8h8"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.2.2"; sha256="16zw8ic8h2q1qg627ddaxmr9dvj7ckdljbzfgwq557nxc2fgk1v2"; depends=[doParallel e1071 foreach iterators lavaan MASS modelr OpenMx stringr]; }; RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; }; RMixtComp = derive2 { name="RMixtComp"; version="4.1.4"; sha256="1jybw5yhcahvixpyb551mzifi6kw914g80g1g4pdbgpkg4f9sfk4"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; - RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.10"; sha256="1hrhysdz6j487masw116yibg86gcvwfb5rdzfhi6cq4xqj9svngm"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; - RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.5"; sha256="00xsmgkizavp490dxwnm7pkwqxsgr5h1l25ivhygcmcrlz6sv2md"; depends=[ggplot2 plotly scales]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.25"; sha256="1527ba5vqg4ss6rqxrkxa1a66r1m9h4zmdnv9xdzva8fv2dhy4zd"; depends=[DBI]; }; + RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.11"; sha256="1y2m5fb8a2xc0ydrjl2l1a6vfabndvrighwz5yi288wqgih70gqz"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; + RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.6"; sha256="0a9aasfd87azvf0ig7h9szf10v73696z194a21dqg7njdrx4p97b"; depends=[ggplot2 plotly scales]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.26"; sha256="0yk3xyj6fwyms4ii80m304xn0zbhayfmrhd1b0x7s7wblch5pfs5"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.4"; sha256="16ab0p0378j4vvcazynffsgx1rq32llf1sz4h4pp5lrx820j6qvx"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; RNAseqQC = derive2 { name="RNAseqQC"; version="0.1.4"; sha256="0f9k3ba2w75sjywngmvp7g10837wx65v112inpag3rplk9ljahvp"; depends=[AnnotationFilter AnnotationHub circlize ComplexHeatmap cowplot DESeq2 dplyr ensembldb gghighlight ggplot2 ggpointdensity ggrepel ggsci magrittr matrixStats patchwork purrr RColorBrewer stringr SummarizedExperiment tibble tidyr tidyselect vsn]; }; RNAsmc = derive2 { name="RNAsmc"; version="0.8.0"; sha256="0lssw4qwcsdwcd3chkb1kslqh7yn25prl1npp1464nvmvz9yqdwm"; depends=[circlize RRNA]; }; @@ -4210,11 +4229,11 @@ in with self; { RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; RNGforGPD = derive2 { name="RNGforGPD"; version="1.1.0"; sha256="0zriv0pd86ciwrms95bbb9wh40xvxv20vla2hxbmaynfy1s1vd4j"; depends=[corpcor Matrix mvtnorm]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; - RNOmni = derive2 { name="RNOmni"; version="1.0.1"; sha256="0mc74fp8i9dadsa2ifz3pjklhvjck5nb3iwz656z7fairq529ml6"; depends=[plyr Rcpp RcppArmadillo]; }; + RNOmni = derive2 { name="RNOmni"; version="1.0.1.2"; sha256="1ap6rf59sr9v28s1a484bfz1c7jizrivlf1r4xvnp8dvb1hj1k9n"; depends=[plyr Rcpp RcppArmadillo]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; RNeXML = derive2 { name="RNeXML"; version="2.4.11"; sha256="0ipxdhfzccpqmnfrqdy8bizm80k2chhdlzg3p0dl05p8n35i6s94"; depends=[ape dplyr httr plyr reshape2 rlang stringi stringr tidyr uuid XML xml2]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.3"; sha256="1kflx1i01ddq803i0vj79zfjs9y0sl8dzra9j5x84m6wcjbn71kl"; depends=[]; }; - RNetCDF = derive2 { name="RNetCDF"; version="2.6-2"; sha256="0bh2xikck4jgrakxpz4ibi7nma1ib4nwayqq4cgh5wy5ixwlbpml"; depends=[]; }; + RNetCDF = derive2 { name="RNetCDF"; version="2.8-1"; sha256="0gjilz2nzwzb8izzcfl6sq5i2nf9gvsn9np4bla5ja17gv5lh0b6"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; RNewsflow = derive2 { name="RNewsflow"; version="1.2.7"; sha256="08jyj57y20a156dhpwn83v27lgc57yv189qrlsy5qn48jzfdb77h"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi wordcloud]; }; RNifti = derive2 { name="RNifti"; version="1.5.0"; sha256="01g9ylmjirmblgcl1f8kzwfzbpyf4vy2rci1407jx4s3av9xzr1j"; depends=[Rcpp]; }; @@ -4222,21 +4241,20 @@ in with self; { ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROCFTP_MMS = derive2 { name="ROCFTP.MMS"; version="1.0.0"; sha256="022cz5vh79c50r31rxn5fjghl65wn1ns8xdgq3b05hjf9psjvg4x"; depends=[vctrs]; }; ROCR = derive2 { name="ROCR"; version="1.0-11"; sha256="0amvvrkiflmr3qygrsgrsja4gaf2v6r6h6i2bgpsm8r069vmlf2p"; depends=[gplots]; }; - ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCSI = derive2 { name="ROCSI"; version="0.1.0"; sha256="0bj1f62j2b39whm0grl1xvzkwi3jlrzpgzm77vskgyhaqrk17j9z"; depends=[glmnet MASS]; }; ROCaggregator = derive2 { name="ROCaggregator"; version="1.0.1"; sha256="1l53z1xz5ww0bdd3pcmscmm4ypg0fdl4a03vv8ya2jk0zzlndlnq"; depends=[magrittr]; }; ROCit = derive2 { name="ROCit"; version="2.1.1"; sha256="0sd6ckh7k8aqwhzzp3qff6g7d03klbr0mbp403pib3823c8pqa55"; depends=[]; }; ROCket = derive2 { name="ROCket"; version="1.0.1"; sha256="1p5b1408fdq8z64b7ihwcdxprg5rfiq4z5annxzvmizzr6qwn8qa"; depends=[data_table]; }; ROCnReg = derive2 { name="ROCnReg"; version="1.0-8"; sha256="08dklrd4ym60h3s5s88g9bv1adi8d6fxnnw2ap9870a1h0a7dk7g"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat spatstat_geom]; }; ROCpsych = derive2 { name="ROCpsych"; version="1.3"; sha256="0fcrhhxmvrrchbswb94liahbgz5pfhs86fbj0vby7vnakrhngh7v"; depends=[pROC reportROC]; }; - RODBC = derive2 { name="RODBC"; version="1.3-20"; sha256="1mpv2315jbbg085wbrgzvlk11apkn32slq3j4jjbw0i5rb8pn5bz"; depends=[]; }; + RODBC = derive2 { name="RODBC"; version="1.3-21"; sha256="16jddw6slr75a3li0rpbfw269syplarhax71fkn32p1w0fql2w56"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; ROI = derive2 { name="ROI"; version="1.0-1"; sha256="05hnj9fskfm2klz7zv97lb0r60akjq4a1cay8p62whpi0hri9zyl"; depends=[checkmate registry slam]; }; ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1-1"; sha256="1zj636cmjhhqbn6hh6760bi5y8lf6y7qqkz72yijq7dj2y1za2ph"; depends=[globalOptTests ROI]; }; ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="1.0-0"; sha256="12yxra45s9f14dn12wibxrz598g3s39lm3af4dxmw9jnlfb8z84b"; depends=[R_utils Rglpk ROI]; }; ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1-2"; sha256="1ip6xb9nvqs3dj2rnylhjwmql1wwdhhnvnp1gi86d22qjixnn8h3"; depends=[ROI]; }; ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="1.0-2"; sha256="0if6994xcc0w9dy3ph8g9lhnx0lpndgf0yzcgn558i00d21csqz7"; depends=[alabama ROI]; }; - ROI_plugin_clarabel = derive2 { name="ROI.plugin.clarabel"; version="0.2"; sha256="07vvc1lhz92sr64vmkadk4mwmhvwzg6yqabx19lfpl7yzc2qyhih"; depends=[clarabel ROI slam]; }; + ROI_plugin_clarabel = derive2 { name="ROI.plugin.clarabel"; version="0.3"; sha256="0icaqbgh435drd00104rpy0xwvkdadh697nfp22kjnlz9mcwzfp1"; depends=[clarabel ROI slam]; }; ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.3-0"; sha256="1ipwvclrxws7nvirvns58gpakg23ldiphyl6g0akxk5hczr0lazf"; depends=[Rcplex ROI slam]; }; ROI_plugin_deoptim = derive2 { name="ROI.plugin.deoptim"; version="1.0-2"; sha256="14fgdsdc9zzqy6f63cywdv2a3229vhabf1z6bz1f1l75jgmr0cgy"; depends=[DEoptim DEoptimR ROI]; }; ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="1.0-2"; sha256="01jkc5nrsjh1g73wqs9hbm0ryl1sjadnl9z78y8m478vrr15hmvs"; depends=[ECOSolveR Matrix ROI slam]; }; @@ -4254,7 +4272,7 @@ in with self; { ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="1.1-2"; sha256="1nfb8gdavg1658apm05s9ps3a9h7vd6fxd88sy9rwmdyq5syhxd6"; depends=[ROI scs slam]; }; ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="1.0-0"; sha256="0wai3yfglx81f97v139bffxf4cziqlqki4vnq76bw4p22g7hdzl8"; depends=[ROI Rsymphony slam]; }; ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; }; - ROOPSD = derive2 { name="ROOPSD"; version="0.3.8"; sha256="0bndjhnshifbx02scw7d48wszar51vyv735a2r0chzq7qjj7drc3"; depends=[Lmoments numDeriv R6]; }; + ROOPSD = derive2 { name="ROOPSD"; version="0.3.9"; sha256="0xc7fgg376wld4g61k7pfi1fwkxzzl69njn6p4v8ia4mnvp1p892"; depends=[Lmoments numDeriv R6]; }; ROSE = derive2 { name="ROSE"; version="0.0-4"; sha256="0y3v9zkgaxpv4f4zn22ra1gkkqg5hdz8js47ppciqahfydjbfl3p"; depends=[]; }; ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; }; ROpenCVLite = derive2 { name="ROpenCVLite"; version="4.80.0"; sha256="0dvvn3yh9629xih7f5ywgrrxzg3am4i79z6z76ndnh14pvwlk1kg"; depends=[pkgbuild]; }; @@ -4268,19 +4286,20 @@ in with self; { ROptimus = derive2 { name="ROptimus"; version="3.0.0"; sha256="1sc65dzpgd12wjqbbhzkhj9p09ynd4gj9icminz0yrr9igzw2z2j"; depends=[doParallel foreach iterators]; }; ROracle = derive2 { name="ROracle"; version="1.3-1.1"; sha256="1k5w6fi1f83mhlc8hx6y305llcwxl22h6lpkib1yvm4557k1c7zz"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="2.2"; sha256="1nh5b5xgldnnimgrx7kgd02hnrvk16ccsdpprdhcimwyy64s7ljn"; depends=[ape bipartite cluster coda deSolve fields fpc glassoFast GUniFrac igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust R_utils raster Rmpfr TESS vegan]; }; + RPDTest = derive2 { name="RPDTest"; version="0.0.1"; sha256="1irj2ldd4if4l2wkz5slwl7441mav3igy1pmg62cxkpxk1sggbfs"; depends=[doParallel foreach]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.1.2"; sha256="0rbwxdh252vfx6qnplqqgmawpfk3naksi4wx11g1h7aj68cv8xjw"; depends=[Rcpp RcppEigen RPEIF]; }; RPEIF = derive2 { name="RPEIF"; version="1.2.4"; sha256="002f8753gfqx1ddcb60hz7xy6l19zvp3d3arackkqjh26zcw1paj"; depends=[RobStatTM xts zoo]; }; RPESE = derive2 { name="RPESE"; version="1.2.5"; sha256="157xvfa6m4vii92fac8xbhnah7np3jvd1y1y7ryw5c80yfbdhf0y"; depends=[boot RobStatTM RPEGLMEN RPEIF xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.2"; sha256="1dwblpfm0s4axiggwh4lbz5k1dz7i0d1nqzl70kxj5gnajm7gn1k"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.5"; sha256="013dka8f8x9z84j3956l4h6c3afqs0ml14pzpzlsgh5ikby3jhbx"; depends=[class MASS]; }; - RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; }; + RPMG = derive2 { name="RPMG"; version="2.2-7"; sha256="04czp6f51mc7n03hxzjpgiisj17l4xyqhj5967z7ghvb28ydw4y4"; depends=[]; }; RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; }; - RPPASPACE = derive2 { name="RPPASPACE"; version="1.0.8"; sha256="12hmbkq80hlz0726gw19z0lkh7inypkdi18g2q6amx687c61711a"; depends=[bmp cobs doParallel foreach imager iterators jpeg MASS mgcv nlme png quantreg robustbase SparseM tiff timeDate]; }; + RPPASPACE = derive2 { name="RPPASPACE"; version="1.0.10"; sha256="0k9z02qpzxqqcdq5kqrrlc9k9bqcrl69ik6l30fa0rd7ywaqwsbc"; depends=[bmp cobs doParallel foreach imager iterators jpeg mgcv nlme png quantreg robustbase SparseM tiff timeDate]; }; RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; - RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.7"; sha256="16xppv7pzqk6kriqd5ym313z1r61l13dzpxp2q2zi0ai23hjgg92"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; - RPhosFate = derive2 { name="RPhosFate"; version="1.0.3"; sha256="1lm6ksla6szm4p6vrsjlr6m4ldq44m5s5sbbl2wsj3jsvrrg7cyq"; depends=[checkmate hydroGOF raster Rcpp RcppArmadillo spatstat_geom yaml]; }; + RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.8"; sha256="08p1cc5vxhyp71zn3pjc2l5xwc8qcq3ghvn33rskwb7wqizn6a1j"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; + RPhosFate = derive2 { name="RPhosFate"; version="1.0.4"; sha256="1gmnnvihxg6j83w4qgrrx61fz4p9r145qxs2qcscrs1q8bzlvw9k"; depends=[checkmate raster Rcpp RcppArmadillo spatstat_geom yaml]; }; RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.7-5"; sha256="18czy93l9dg321pbvrfmlwrjahpbkiw0sll4pkkqm55xapp02m3b"; depends=[DBI]; }; - RPostgres = derive2 { name="RPostgres"; version="1.4.5"; sha256="15y732ylnq1h1hw16nh1ichnygh3l76h23m2893avpaipa689zvh"; depends=[bit64 blob DBI hms lubridate plogr Rcpp withr]; }; + RPostgres = derive2 { name="RPostgres"; version="1.4.6"; sha256="1ld03r9rzfxx6gzy3yn8jhzp9sp2qd9wydpxz955ggjxwdklpvnr"; depends=[bit64 blob cpp11 DBI hms lubridate plogr withr]; }; RPresto = derive2 { name="RPresto"; version="1.4.5"; sha256="1yf5kbmc73ff2kl9s6jmdrpkc7i4118n0wnpdfpz1p4qkm8s4pas"; depends=[bit64 DBI dbplyr dplyr httr jsonlite lifecycle lubridate openssl progress purrr rlang stringi tibble]; }; RProbSup = derive2 { name="RProbSup"; version="3.0"; sha256="1z53zgx26fwfhb1vxad0l51v34y2lsplhwbjaf4r44rngdaw9h5n"; depends=[]; }; RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.20"; sha256="1q5wd586334472584r93whnwxy4yyycn9l891g6m6wh7v0884q76"; depends=[Rcpp]; }; @@ -4296,7 +4315,7 @@ in with self; { RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; RRMLRfMC = derive2 { name="RRMLRfMC"; version="0.4.0"; sha256="0y8gs9rirrcjb89jqxr7rrp89pjal7lzcscnh4kmabhih3f2d729"; depends=[nnet]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; - RRPP = derive2 { name="RRPP"; version="1.3.1"; sha256="1mdwxhphpqr8r8fmia6xv6q3bjvb2knmabqc8jq8hh5q1yrd9ish"; depends=[ape ggplot2 Matrix]; }; + RRPP = derive2 { name="RRPP"; version="1.4.0"; sha256="1h305zmks2403g76y5r5g31mgck6vmjcm0ziz7k958qbmck0jqg6"; depends=[ape ggplot2 Matrix]; }; RRRR = derive2 { name="RRRR"; version="1.1.1"; sha256="14xj0x68nisnxwg27srga8va7dpm1k1mh8xd4bljdb7jykczpn0h"; depends=[expm ggplot2 magrittr matrixcalc mvtnorm]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.4"; sha256="16v6f5yvfq9l1b4h5mr4y0i2k404vdv354yz4k780w79qib7g39p"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; @@ -4306,26 +4325,25 @@ in with self; { RSA = derive2 { name="RSA"; version="0.10.6"; sha256="137izjrvicf02bnc6q00wn187754f25dh22swpb46vid18cf1q9h"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; RSAGA = derive2 { name="RSAGA"; version="1.4.0"; sha256="0mdirx7d3z4l0k54wa6rb1c5gma470ypifd3flj2287m8y2wjqq5"; depends=[gstat magrittr plyr shapefiles stringr]; }; - RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; + RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 lubridate mblm plyr]; }; RSBJson = derive2 { name="RSBJson"; version="1.1.2"; sha256="1bzy0pgj6kg447xnnjj643hk8gyzzaaliiw0z98r19959bqbvgq3"; depends=[jsonlite]; }; RSC = derive2 { name="RSC"; version="2.0.4"; sha256="106pvrg10f8w0aqbnahqjdii49ijp2659l7kkj5y46pbr90lbpzs"; depends=[doParallel foreach Matrix]; }; RSCAT = derive2 { name="RSCAT"; version="1.1.3"; sha256="08p4gywh1g13mwcmvp046ybz410jyrzi505rdqr8yirjpk59bw1p"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; }; RSDA = derive2 { name="RSDA"; version="3.1.0"; sha256="0xps9ivqgh64z26gbnsqr6cqr8q5ddc2dkfgl3bk6yrrlwp5fl0n"; depends=[dplyr e1071 FactoMineR forcats gbm ggplot2 ggpolypath glmnet kknn magrittr neuralnet nloptr princurve purrr randomcoloR randomForest reshape RJSONIO rlang rpart scales sqldf stringr tibble tidyselect umap vctrs XML]; }; RSDK = derive2 { name="RSDK"; version="1.0.1"; sha256="1qsidmcb432aliwvcn3y14w538nnac1xp50z7a4vh68kqidwhrxp"; depends=[keys shiny shinyWidgets testthat]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; - RSEIS = derive2 { name="RSEIS"; version="4.1-4"; sha256="0xpzvcw2blh3zzp7lacrq3zh7hx44d06ksi71nl1z1yk1krwmmbn"; depends=[RPMG Rwave]; }; + RSEIS = derive2 { name="RSEIS"; version="4.1-6"; sha256="1vbsx09snyxsbaizqjb3m2xkk67pky3pwn8565m6fda9zdbkwjka"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; - RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; }; RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; }; RSNNS = derive2 { name="RSNNS"; version="0.4-16"; sha256="1n1jl99n59m5zg6qbd8c679qkw3nzxnyda917kmr97m30kdmy88s"; depends=[Rcpp]; }; - RSP = derive2 { name="RSP"; version="0.1"; sha256="10qldl1sjf812aqakwa5y7i9kd9vahck69fc37m37i408ncyw933"; depends=[catR DT foreign GPArotation gt hornpa igraph lavaan Metrics mirt MVN plyr polycor psych rJava rstudioapi semPlot shiny shinyBS shinycustomloader ShinyItemAnalysis shinyjs shinythemes xlsx]; }; - RSQL = derive2 { name="RSQL"; version="0.2.1"; sha256="10s71kgsa37m937lr7kai8c73iw5fwb9rnhkf65wz0w2qha01zaz"; depends=[DBI lgr R6]; }; + RSP = derive2 { name="RSP"; version="0.4"; sha256="126lag0i2k4fwlr7gnc9jfn63pyi6d6gzzmypyr6jk666pwsk5f6"; depends=[catR DT foreign ggplot2 GPArotation gt hornpa igraph lavaan ltm Metrics mirt MVN plyr polycor psych rJava rstudioapi scales semPlot shiny shinyBS shinycustomloader ShinyItemAnalysis shinyjs shinythemes shinyWidgets xlsx]; }; + RSQL = derive2 { name="RSQL"; version="0.2.2"; sha256="1k0s32lcfr2ari7jrkspmzf9ygpz4h737yigz3lkwj5k2r9ls2ax"; depends=[DBI lgr R6]; }; RSQLite = derive2 { name="RSQLite"; version="2.3.1"; sha256="1jil3wgfh1asfb9c4cr9qyr74wb9f87r7sa03kj187201hb3xlly"; depends=[bit64 blob cpp11 DBI memoise pkgconfig plogr]; }; RSSL = derive2 { name="RSSL"; version="0.9.6"; sha256="11i6z2kmy0ddl7s8709w5q8aix8wgba4p4lmqlswnwznwaaj26mq"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; RSStest = derive2 { name="RSStest"; version="1.0"; sha256="1pywk326hycq9qm6hslircn8xb8irj3ava2aga20fp0n1jxnr8vi"; depends=[huxtable]; }; - RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; }; + RSSthemes = derive2 { name="RSSthemes"; version="1.0.0"; sha256="091ch7fb3ndhjyk31igaafcsip207ycb7xkl4x114s06da0p521d"; depends=[ggplot2 purrr showtext sysfonts]; }; RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; }; RScelestial = derive2 { name="RScelestial"; version="1.0.3"; sha256="1bxp3xl90s9fblm6d2mmsnws4iv9f3kxj8cs55kmbakz5dq4nqxc"; depends=[Rcpp]; }; RSclient = derive2 { name="RSclient"; version="0.7-9"; sha256="04xppfz2gxf21jmcz9phxpaxys06kqnw77v1sy9qqd3n0yywzihv"; depends=[]; }; @@ -4336,23 +4354,22 @@ in with self; { RSizeBiased = derive2 { name="RSizeBiased"; version="0.1.0"; sha256="0qh1f9998c62cph590mszbwh12mpbvcnvffmxw4mib6wd4dgl723"; depends=[pracma]; }; RSmallTelescopes = derive2 { name="RSmallTelescopes"; version="1.0.4"; sha256="16c0pfq9qp0c9b7aljp753iilk3dys14h77anwps8xg7j2lizvbh"; depends=[]; }; RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; }; - RSocrata = derive2 { name="RSocrata"; version="1.7.12-4"; sha256="07m8jp6av12z0csl4xln1y22s3nq0jwx7bk1brs3v0v38m86j86w"; depends=[httr jsonlite mime plyr]; }; + RSocrata = derive2 { name="RSocrata"; version="1.7.15-1"; sha256="0afsmliwcsza7r46b1d6126s0gkpkk2mlj6bw83ix8cswlfg8xzk"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.16-1"; sha256="16ij84wgpsmqmnxqiii8dgihy3bfxazry9znmckhwzba7m0d79fb"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RSqlParser = derive2 { name="RSqlParser"; version="1.5"; sha256="0q5wa7bq7m94xx8hcf9p29v5vvkrqzygs3v6yy5xl6jgvshvscvi"; depends=[stringi stringr]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; RStorm = derive2 { name="RStorm"; version="1.0"; sha256="1n2kiy9b8w6rnv2zmzbl22grwibf619hadf2cjq1ch7rmbr7qb65"; depends=[plyr]; }; - RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; }; RSurveillance = derive2 { name="RSurveillance"; version="0.2.1"; sha256="02jbm9xl2jg9cgq53i1cvj1rivhprgd07k1rxsayzrskvbmvyjpd"; depends=[epiR epitools mc2d]; }; RTCC = derive2 { name="RTCC"; version="0.1.1"; sha256="0bnm0qwikbbpq3i5q5fwmsgi8fn7w0xk993ngpiqbrf5my3h93kc"; depends=[matrixStats Rcpp testthat vegan]; }; RTD = derive2 { name="RTD"; version="0.4.1"; sha256="0zsv62hx1y9q5a6rd8ri91ff64671b84jr3f88h0q4yni2mribhr"; depends=[dplyr httr jsonlite purrr RcppMsgPack readr urltools uuid]; }; RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; }; RTFA = derive2 { name="RTFA"; version="0.1.0"; sha256="09vpyxqmzvkmznwgrm5d1y1rk7j5a2hnjmkczzg0bzij1c8bqkhn"; depends=[rTensor tensor]; }; RTIGER = derive2 { name="RTIGER"; version="2.1.0"; sha256="08gs26wv6jnd4rzdhb87as26aslgqs128x1ip8h9nmr3l9mwg5fq"; depends=[e1071 extraDistr GenomeInfoDb GenomicRanges ggplot2 IRanges JuliaCall qpdf reshape2 TailRank]; }; - RTL = derive2 { name="RTL"; version="1.3.3"; sha256="123xl52n8vm22qnf4h0dsyjhq1pwvjvf17vx2qk1x1mi1csbihcz"; depends=[dplyr ggplot2 glue httr jsonlite lifecycle lubridate magrittr PerformanceAnalytics plotly purrr Rcpp RCurl readr rlang stringr tibble tidyr tidyselect timetk tsibble TTR xts zoo]; }; - RTMB = derive2 { name="RTMB"; version="1.2"; sha256="10j5v7ydgl4c1kpysrwszajrjnj0wk86dbdmh8bf54ga2qvxl80r"; depends=[MASS Matrix Rcpp RcppEigen TMB]; }; - RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; - RTSA = derive2 { name="RTSA"; version="0.1.0"; sha256="1dzfqhv9w7digh7fz93xknn70mjg235dwqh93pxn4n4sxxx2740y"; depends=[ggplot2 metafor Rcpp scales]; }; + RTL = derive2 { name="RTL"; version="1.3.4"; sha256="08wk1zd4nrp9zvmqbf9dw5s8mv2ggz4gbxz24blpaphwr045annj"; depends=[dplyr ggplot2 glue httr jsonlite lifecycle lubridate magrittr PerformanceAnalytics plotly purrr Rcpp readr rlang stringr tibble tidyr tidyselect timetk tsibble TTR xts zoo]; }; + RTLknitr = derive2 { name="RTLknitr"; version="1.0.0"; sha256="125sx7gy8gnyhz15cjrmqwrh32w3nd49d8qwg0grj3q12v03i8ca"; depends=[bookdown gt knitr magrittr]; }; + RTMB = derive2 { name="RTMB"; version="1.3"; sha256="0w1pxqzp7793xm1qd1wg3q56sg13qq17njyy9lc4xcz4grm0cba4"; depends=[MASS Matrix Rcpp RcppEigen TMB]; }; + RTSA = derive2 { name="RTSA"; version="0.2.1"; sha256="19w521mww2byciw7gq9f1knyqmzwm93pmpwa1vf3hnsr65zgixw3"; depends=[ggplot2 metafor Rcpp scales]; }; RTTWebClient = derive2 { name="RTTWebClient"; version="0.1.3"; sha256="1d4dmw7z90nih9bzajlyqgqvpfmpkxwyhw0w56q396kvw8k644cp"; depends=[base64enc data_table digest httr jsonlite withr]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="3.2.1"; sha256="0f87r45lnygxxlwjq04q08ams7llnjlrfyavx81fbl2g26yp988l"; depends=[]; }; RTextTools = derive2 { name="RTextTools"; version="1.4.3"; sha256="0fxjviqc36k06rn8xzbi8ylzzj9zgf3zsp6xv0kssakss1a45lzz"; depends=[caTools e1071 glmnet ipred nnet randomForest SparseM tau tm tree]; }; @@ -4361,38 +4378,38 @@ in with self; { RUVIIIC = derive2 { name="RUVIIIC"; version="1.0.19"; sha256="1px87p4nmdgkxwarsqyc91kmwr13dy16c1qqqc86qlwm2w46smf6"; depends=[progress Rcpp RcppEigen RcppProgress RSpectra]; }; RUnit = derive2 { name="RUnit"; version="0.4.32"; sha256="1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3"; depends=[]; }; RVA = derive2 { name="RVA"; version="0.0.5"; sha256="1a0av2vhqnkc4w76q5dhds0p12icmkkxyr1d04rsd83srwkwh4fb"; depends=[circlize clusterProfiler ComplexHeatmap data_table dplyr edgeR ggplot2 ggpubr gridExtra GSEABase GSVAdata haven msigdbr org_Hs_eg_db plotly purrr rlang rWikiPathways stringr tibble tidyr XML]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-83"; sha256="0h6vfm0yskh6irc078xy6ds7kl2w1jwszv6snhskp4xr1y0ls1sv"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; - RVCompare = derive2 { name="RVCompare"; version="0.1.7"; sha256="17xidcn2p27ms4ssl9312i1pbv4dc4873096a7rv5b8ygkgnarrm"; depends=[ggplot2 pracma Rcpp]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-83-3"; sha256="1jmfj2gql95l6ln55gbgm62z1x4g7jlfyysq0dyab1jjqsz5izip"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVCompare = derive2 { name="RVCompare"; version="0.1.8"; sha256="0dqz0c3idy9nzb9mlmlnyq05zql0nca1na7qxbgk136g4spbr1n3"; depends=[ggplot2 pracma Rcpp]; }; RVIpkg = derive2 { name="RVIpkg"; version="0.3.2"; sha256="0s3fjagbd24cgymsfsjd0940kzyvla2cybsr0387q7l93lfr3rmd"; depends=[]; }; RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; }; RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; }; RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.8"; sha256="0lh23g8zyd50p6hnl4dfmzrsg48y74g2h7dism9j2n1pfd9p9k5d"; depends=[]; }; - RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.18"; sha256="13c6d8n0v44xcvd46id48qgih9bw3hpnp6k4byvln9qjd9ji3pgy"; depends=[Rcpp]; }; RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWeka = derive2 { name="RWeka"; version="0.4-46"; sha256="0rsbz7ck7z4bjk9qrwrr4nq30b1iv3kwkkwx9jcrph832xw5a1b6"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; + RWgraph = derive2 { name="RWgraph"; version="1.0.0"; sha256="0hjwfpx90ixmxxhyd19bdkaljhrjrm4vv6fq40sddr4hwpsmlyky"; depends=[igraph]; }; RWiener = derive2 { name="RWiener"; version="1.3-3"; sha256="0afrgflyfjv4jqm04had74zz4cs934zwvyxaan1r4qpg383kibpq"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; RWmisc = derive2 { name="RWmisc"; version="0.1.2"; sha256="0wf593g8aif081v8vyqcffrzaffh1ifbba7mwmj4mnwcksballvw"; depends=[raster sf sp units]; }; RWsearch = derive2 { name="RWsearch"; version="5.0.5"; sha256="161fnkl0dzk11wvzj7vz4807pjq33gvnhniw8ms2ipz0vmd0pk7c"; depends=[brew latexpdf networkD3 sig sos XML]; }; RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; - RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="2.3"; sha256="0w4x850a8pklb3ih22h0cfkajxjpd3drvjmjk37k51vfgpdfyqvd"; depends=[ellipse lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; }; - RZooRoH = derive2 { name="RZooRoH"; version="0.3.1"; sha256="090mcy6czipvidprj87vyfb2wdipy08xjn130qzs5qdq9bnb6a14"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; + RZooRoH = derive2 { name="RZooRoH"; version="0.3.2"; sha256="047j86kvhd9mama3lgyqyij6b7y4v23pycx63xnfh590drr8mnym"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaJIVE = derive2 { name="RaJIVE"; version="1.0"; sha256="1r3csf3xpk6rx494bqamb9b8dhj1169cng6gdi52h62m8vchnak5"; depends=[doParallel foreach ggplot2]; }; RaMS = derive2 { name="RaMS"; version="1.3.1"; sha256="1njlgzrsxaawic60v7yk80qrhq73cia8miiafsvfxf9gcldr5alp"; depends=[base64enc data_table xml2]; }; RaSEn = derive2 { name="RaSEn"; version="3.0.0"; sha256="1a7jvyvvhzn4aifnhjldn5jr6sxh16b67x335p8wh8g24yvvglvw"; depends=[caret class doParallel e1071 FNN foreach formatR ggplot2 glmnet gridExtra KernelKnn MASS ModelMetrics nnet randomForest ranger rpart]; }; - RaceID = derive2 { name="RaceID"; version="0.3.1"; sha256="1ql48sy64j0x0y4yjfrciwnj24h0h933k4n3l5nljjz5ldz2izpy"; depends=[cluster coop FateID FNN fpc ggplot2 harmony ica igraph irlba leiden locfit MASS Matrix matrixStats pheatmap princurve quadprog randomForest RColorBrewer Rcpp Rtsne runner umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.3.3"; sha256="0fxganfx4zw1hb5qy3hy7d55i11s9xi5nsa8c7mzmwacdsdhr0yv"; depends=[cluster coop FateID FNN fpc ggplot2 harmony ica igraph irlba leiden locfit MASS Matrix matrixStats pheatmap princurve quadprog randomForest RColorBrewer Rcpp Rtsne runner umap vegan]; }; + Racmacs = derive2 { name="Racmacs"; version="1.2.7"; sha256="01grlw91s9pbi6b65y134b5qsv55y7j6m8fgj0gqpigxjqi7ryq5"; depends=[brotli dplyr ellipsis ggplot2 htmltools htmlwidgets igraph jsonlite ks magrittr MASS rapidjsonr Rcpp RcppArmadillo RcppEnsmallen RcppProgress rlang rmarchingcubes shape shiny shinyFiles shinyjs vctrs]; }; RadData = derive2 { name="RadData"; version="1.0.1"; sha256="053i6r0j58dws1qisl2701n0fwzrfn5brdx3dcab8xmpzg6s0036"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.8"; sha256="0nc8f2f2yvfvx81xm87zr08asisyar9zdx3fwqz0lvz5xgrwkp3x"; depends=[oro_dicom ptinpoly]; }; RadialVisGadgets = derive2 { name="RadialVisGadgets"; version="0.2.0"; sha256="18a2c89jpdaln9cl5y4w161121fld08wm57m40qacsj1vlnkh6j9"; depends=[caret dplyr ggplot2 miniUI r_import rlang shiny shinyjs shinyscreenshot tidyr]; }; RadioSonde = derive2 { name="RadioSonde"; version="4.2"; sha256="02ncpyvjxvk192bdaqqmqpr9bfwwli0qp58fxghaf3x0qimd3d1c"; depends=[fields]; }; Radviz = derive2 { name="Radviz"; version="0.9.3"; sha256="0ayrkax1g7x9jvkl8lni08ydm1lhcwpcbvy1xj9zk3bpd5zpll86"; depends=[dplyr ggplot2 hexbin igraph pracma Rcpp RcppArmadillo rlang]; }; RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; }; - Rage = derive2 { name="Rage"; version="1.4.0"; sha256="0p9k0iddblqn6fz73lkvic93yavsbbsb1jldwfam0dbac8sgq6w5"; depends=[DiagrammeR MASS popdemo]; }; + Rage = derive2 { name="Rage"; version="1.6.0"; sha256="0scpig0glh1ajc5fp7xrdb0b5f11x1f5ls43wb6b9kjif4fi25cl"; depends=[DiagrammeR expm MASS popdemo]; }; RainfallErosivityFactor = derive2 { name="RainfallErosivityFactor"; version="0.1.0"; sha256="16yrr2bl62m1nr81nzvmdq7s78f7fg50dah5dg5q4j4j7z8qfsqz"; depends=[]; }; RamanMP = derive2 { name="RamanMP"; version="1.0"; sha256="0rdj8vvs9l86yscx2mvy6nazzws8gd1x5bxvszlssinb20pns69z"; depends=[dplyr ggplot2 ggrepel imputeTS]; }; Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; }; @@ -4409,13 +4426,12 @@ in with self; { Rankcluster = derive2 { name="Rankcluster"; version="0.98.0"; sha256="0lipl57xx6ik66579vmhammy86iwjlnc7qmkjn9xcj3prkqy5p2i"; depends=[Rcpp RcppEigen]; }; RankingProject = derive2 { name="RankingProject"; version="0.4.0"; sha256="11i47arl3r32iky29wjawb26g0hiji0ddl70gcrcy8v9j0h01vap"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; }; - RapidoPGS = derive2 { name="RapidoPGS"; version="2.2.0"; sha256="0p19jc7cn2s8nnc0nblbl7k42srgm1risxggzb2rd1ngr93z757p"; depends=[bigreadr bigsnpr coloc curl data_table dplyr GenomicRanges IRanges RCurl]; }; + RapidoPGS = derive2 { name="RapidoPGS"; version="2.3.0"; sha256="0jks5v9822gk4gip7027m2l26gccrm81iazn1006n1a0871caf98"; depends=[bigreadr bigsnpr coloc curl data_table dplyr GenomicRanges IRanges magrittr RCurl]; }; Rapp = derive2 { name="Rapp"; version="0.1.0"; sha256="06rixyz2r4w82dbpr0d3z74hv0kxgd677d9c690jjnm9hrskwfbn"; depends=[yaml]; }; Raquifer = derive2 { name="Raquifer"; version="0.1.0"; sha256="148inkn6yiyvicw0b4kw99n172xsvhrrdx1khghqs966smjw54wy"; depends=[dplyr gsl magrittr pracma Rdpack]; }; RareComb = derive2 { name="RareComb"; version="1.1"; sha256="0q22a61zd51ffnq30gmhba6paaaagmhrr6vx1mfw37fb9n5fpyn6"; depends=[arules dplyr magrittr pwr reshape2 sqldf stringr tidyr]; }; - Rarefy = derive2 { name="Rarefy"; version="1.1.1"; sha256="16ivdcpkdgjqy3ymnm296phyjwblzbypzrh4zjanffqd1qn7jb4s"; depends=[ade4 adiv ape dplyr geiger vegan]; }; - Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; }; - RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; + Rarity = derive2 { name="Rarity"; version="1.3-8"; sha256="1x4jwlk8d4nx6xq5kimsr63d7fnhdn3w5zgjrzgbz9yc3kjxgsm6"; depends=[]; }; + RaschSampler = derive2 { name="RaschSampler"; version="0.8-10"; sha256="1zzly5ya5gvr155pxplk08kc5fcj78p1mqmbszds3z4riwhdzsb1"; depends=[]; }; Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.4"; sha256="1d37l4xgg1iba2rbhp4c5i7igrcy0zgbdvzk3yc0wj2x1mm5dayk"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; @@ -4432,21 +4448,21 @@ in with self; { Rcapture = derive2 { name="Rcapture"; version="1.4-4"; sha256="0yihjgpmq9agws1b0s3n9s1pdvw1wjfpcyvr8536v4ypfgkmjbcr"; depends=[]; }; Rcatch22 = derive2 { name="Rcatch22"; version="0.2.1"; sha256="1ggraxn88fl8m63d7aaffifgj34g6nrzjjd696lkj8ysi6x77qdl"; depends=[Rcpp rlang]; }; RcausalEGM = derive2 { name="RcausalEGM"; version="0.3.3"; sha256="089mgi96p4dv7ja629mz5d0ij488y6fi84x73fdq67xars6abqla"; depends=[reticulate]; }; - RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1.1"; sha256="16gak1kgsnla89b6nbhfb5w9xfjhdpxza8sfc2isbhfggvl1h79j"; depends=[]; }; RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2022-4.30"; sha256="04dr5w8ss004fk0w814x4hb78i7l3h1q5r00pjps43cpzgkvi116"; depends=[optextras]; }; - RchivalTag = derive2 { name="RchivalTag"; version="0.1.2"; sha256="0285n5mxs643546qhyqkccaq1fkn1hxagrhj2abahskfl53i9rsw"; depends=[dygraphs mapdata maps maptools ncdf4 oceanmap PBSmapping plyr pracma raster readr rgeos sp xts]; }; + RchivalTag = derive2 { name="RchivalTag"; version="0.1.8"; sha256="14pv7a2qsqxp28sb59dh9s554yy55x7i9129mrgk0fxv5c64lq8m"; depends=[cleangeo dygraphs ggedit ggplot2 htmlwidgets leaflet leaflet_extras2 lubridate mapdata maps ncdf4 oceanmap plotly plyr pracma raster readr sf shiny sp stringr suntools xts]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-6"; sha256="0f9pdxymbj6fnq7368sl48pg5a2ikjkn10qm5djrqwwyhir64wf3"; depends=[Formula maxLik memisc miscTools msm numDeriv plm plotrix sandwich]; }; RclusTool = derive2 { name="RclusTool"; version="0.91.5"; sha256="1ni3ykd7klmw1cs49n22x4p6k2ghqqs7fd1hq5xjlwdwdnh9ssxm"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg knitr MASS mclust mda mmand nnet png randomForest reshape rlang SearchTrees sp stringi stringr tcltk2 tkrplot]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.8-0"; sha256="1d3vpa433bdi3hc4c89sra82mw7hhgzmn1wp2n95w23pq4a8cgnz"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; - RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-2"; sha256="0r5vrnpd6zs2a2cnab15k6143kdwizaivb3dznjb59kv2aawg3w3"; depends=[abind car colorspace e1071 foreign haven Hmisc lattice MASS nortest readstata13 readxl sandwich]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.9-1"; sha256="03b7jg75sq9sv0yi5ish0pp028av9v7pnjxb8m11swacw635m0yh"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; + RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.9-1"; sha256="0khp8dw1b3v5jqbhnqxjcyyjz9hj9pb98niacn17cf9iln9rr7mc"; depends=[abind car colorspace e1071 foreign haven Hmisc lattice MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-5"; sha256="1rwfmkpalyhmdfhwszk9q21l362qwq305b3jqh0nrwmmnr09v34w"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; }; RcmdrPlugin_BWS2 = derive2 { name="RcmdrPlugin.BWS2"; version="0.1-0"; sha256="0px17h5i7pgm3pvrsf5rd8cpylsis65fndk1s7341dxxy4b4z7kj"; depends=[DoE_base Rcmdr support_BWS2 support_CEs survival]; }; + RcmdrPlugin_BWS3 = derive2 { name="RcmdrPlugin.BWS3"; version="0.1-0"; sha256="0qysk8800pslkc3lf7nkxc6xwsbc0516h3rkqgdb9x7l0557vbpx"; depends=[Rcmdr support_BWS3 support_CEs survival]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.3.1"; sha256="1wb1pbwghq1xxpwlihfixx42yf1f1py3hdwh8sfpqklh63ymwifk"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr s4vd superbiclust viridis]; }; RcmdrPlugin_DCCV = derive2 { name="RcmdrPlugin.DCCV"; version="0.1-2"; sha256="1gqjprdz842yzp3n3a4c4zrv6bk7kdqcspmljn234nrzyz08ji6a"; depends=[DCchoice Rcmdr]; }; RcmdrPlugin_DCE = derive2 { name="RcmdrPlugin.DCE"; version="0.1-3"; sha256="0mlm3avhfvdzaxfiiy67r2p3h5409qqy1wm05263i4kmvxvbxazy"; depends=[Rcmdr support_CEs survival]; }; - RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-4"; sha256="0iwl2g1xjr30xdgpy7wiw5c6j0amag57ia5qvcpgxwj3pnyxa2lx"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc]; }; + RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-5"; sha256="0nsaj3wis8fn73spyv90j0magcl3lq4pznfxzdr62rg8w7likqx7"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-3"; sha256="0v7pw0m8cxpnkdm47b8jb3z94p1igi98s4r8i0gm7x7ad4fzccww"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.61"; sha256="1d97lans5w14scfn4z0nxpgfdlmspbzq2c6vl02pf5z3rrqfnbrq"; depends=[Rcmdr readstata13]; }; @@ -4458,13 +4474,13 @@ in with self; { RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-6"; sha256="0xh0lfgmr5sc15f3v5avwy1zl0gk1krlw3jb1prjyk9prp8albz9"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; }; RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; }; RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; }; - RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.13"; sha256="0y58bh8c5c1msmxvw9kl5ia7p19jrb4bf77hb8dwk7kqs97g7wy8"; depends=[car MASS mixlm phia pls Rcmdr xtable]; }; + RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.14"; sha256="0bsz98za8hb0gxxawi5sfg0s8i5nrk72f4h91glklw29w9dvnpf4"; depends=[car MASS mixlm phia pls Rcmdr xtable]; }; RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; }; RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; }; RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-19"; sha256="1m5k8y2xy78bpyvi2cdnvmicr5dkjxb8v65blcmgrhf7i0zhhj5p"; depends=[pROC Rcmdr ResourceSelection]; }; RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="3.0"; sha256="1l065hqcd84vl0147yyysyyh7k45rypzlrfrn16c9486ynjkbc45"; depends=[data_table demography dplyr forecast ftsa ggplot2 Rcmdr scales zoo]; }; RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.2.0"; sha256="1yg2b5vcnf956w04phxg15a4my9hvkbc27nzyn30b2wn47ysxghj"; depends=[Rcmdr SCMA SCRT SCVA]; }; - RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.1.1"; sha256="1bl024sh7sg4v77ivx195bx0j2zw7gxd2a9qzc35898xxgfgas8q"; depends=[distr distrEx Hmisc IndexNumR lme4 Rcmdr tcltk2 tseries]; }; + RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.1.2"; sha256="04b933icpf6lzzbd1z0p0qzy0w2d4p9rv6zs16gx5l89vagvg4wh"; depends=[distr distrEx Hmisc IndexNumR lme4 Rcmdr tcltk2 tseries]; }; RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.2-0"; sha256="14zsqjni2w2smq99cv1pjdw90zw83g4nn7h7cn07fms9j0g12yd6"; depends=[Rcmdr TeachingDemos]; }; RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="5.1-1"; sha256="15z2pyi92vznkbfqycc33b39dl2wx0kf2l5w1wv8pr85i5449dzq"; depends=[IQCC qcc qicharts2 randtests Rcmdr rmarkdown TeachingDemos tseries]; }; RcmdrPlugin_WorldFlora = derive2 { name="RcmdrPlugin.WorldFlora"; version="1.3"; sha256="1rcmn5drv3q09v9hz383010g8377lfiazhjq1vd0f90gf0nl5jfy"; depends=[Rcmdr WorldFlora]; }; @@ -4474,56 +4490,54 @@ in with self; { RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.4"; sha256="16y60yymx97nh587939lahsh0mk53yy25zy6i90l9vad0r7ih23v"; depends=[depthTools Rcmdr]; }; RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.8.2"; sha256="0nkszrbcprd08p0i9r6k2syg44kyqpdakmwmjf480pwydq3sz69n"; depends=[orloca orloca_es Rcmdr]; }; RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; - RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.3-0"; sha256="00baj2afa39n0r7hpinigdrx3jmr7akffsj0hy1wjdx673kzp242"; depends=[car date Rcmdr survival]; }; + RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.3-2"; sha256="1kyqrpqi1gbc7vbdy524a7ifpnsx42rkz34p72cdi7qjyq8x7vs7"; depends=[car date Rcmdr survival]; }; RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; - Rcompadre = derive2 { name="Rcompadre"; version="1.2.1"; sha256="11nm8dmclvr4p5w7r53pmi12b9b5w2jvfah70vln5pgmfpzhbmz4"; depends=[popdemo tibble]; }; + Rcompadre = derive2 { name="Rcompadre"; version="1.3.0"; sha256="0ca82svcycz2qwk1hx808pm4d86z7i61hc427fkvknjj73vaiz5a"; depends=[popdemo tibble]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-6"; sha256="01254ygn661zp0h6xf04vw77vppm54y3g8fcmcxfj4m36nk7jc01"; depends=[slam]; }; Rcpp = derive2 { name="Rcpp"; version="1.0.11"; sha256="0pzssba79z90rax2v02r5m1a6ysljfnvq03r6q2nr72rd0q7qxfz"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0.1"; sha256="0vw41plcl7hbi0af3la0sb4x8zqnhxjpjslx8r8cllfamy9dixki"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.9"; sha256="03q2i1b9lrb0sn0vq4jyqjiy2zwi2ydhzlnw1b8nj9xdfxx804mx"; depends=[Rcpp]; }; - RcppAlgos = derive2 { name="RcppAlgos"; version="2.8.0"; sha256="1f9wxwqzv03bgr22s3hnj7mg9qlbap1dsg6vj1blgjl6xpfvz5bn"; depends=[cpp11 gmp]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="2.8.2"; sha256="1h9kgr8776q7dvc0a2cylixhvk0xw3fq6lpyf15xajbbypxy9bzz"; depends=[cpp11 gmp]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.21"; sha256="1xzhax5hmn79h6kmz7inrlaya5mdpzqj6j7n5ridyzc4vcrs412q"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.12.6.1.0"; sha256="0saga8anaahyrvvynggg168756rv8d9gyq8sryjgnx5pp4jbz6ck"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.12.6.4.0"; sha256="1k7xq2yl4pkc7krz1bcdnx5kfj6n4zjmnm40nly2da2ji87agv49"; depends=[Rcpp]; }; RcppArray = derive2 { name="RcppArray"; version="0.2.0"; sha256="1a8gjvzad38d234vp5a4ca5hb1cdyijlwb0l6hgwpr04h9bm539v"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.6"; sha256="11l70rlayg2xzmg34sg3896adzpfpvplciyicjpk963bddjb2ys8"; depends=[BH Rcpp]; }; - RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.0.1"; sha256="157a14kqcf0q3z01mn4w1194k2l39dd4qmqs0i115p8bvkjc6ncd"; depends=[gmp Rcpp RcppThread]; }; + RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.1.0"; sha256="0b83c5s6zpvf545yvpa3fa0nhgvrryg7n11l9200azi897zmlwv3"; depends=[cpp11 gmp]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.12"; sha256="1jr4hi3zbm935q6ykkvnywlma36d3jl7fxmqhxs62jxbnyyqf81a"; depends=[Rcpp]; }; - RcppCGAL = derive2 { name="RcppCGAL"; version="5.5.3"; sha256="0l6kr113y97j3ap6rrkvm6yqz8czyvjax4pswbcv78xf77zyq69c"; depends=[curl gh Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.11"; sha256="0m9g37hrx33mmxhhzi6qakgiqh6w0c2s624fkgbny9vcabr3dfsx"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.6.2"; sha256="0038vpziiyydbymdi9krs49bwr7h574srdrvsbwvxr8cackzrmiv"; depends=[fs Rcpp]; }; RcppCensSpatial = derive2 { name="RcppCensSpatial"; version="0.3.0"; sha256="0ghywbg2zrhd72y3hf99niqlw04gvfzfa02pa581lvvd67z19gjp"; depends=[ggplot2 gridExtra MomTrunc mvtnorm Rcpp RcppArmadillo RcppProgress Rdpack relliptical roptim StempCens]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.13"; sha256="18kn9r7h5qqf6a6f28rjynrvp0yg0v82hxyv9z6cg254qnzd3bvj"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; RcppClock = derive2 { name="RcppClock"; version="1.1"; sha256="0h59s6f9ib6d2n1fi94bcbqw0gcpbd5zvnc3pk4kb9lm7ih4dw7b"; depends=[ggplot2 Rcpp]; }; - RcppColors = derive2 { name="RcppColors"; version="0.3.0"; sha256="06c1ikw9x4asicha2xz3mc5v0j45qa1r7w4j64kvqxnfpcwh174p"; depends=[Rcpp]; }; + RcppColors = derive2 { name="RcppColors"; version="0.6.0"; sha256="0aacr00sjilh5smh3hxlmgjdf1w6vjm788kr6r1gigm7nj3w2sjy"; depends=[Rcpp]; }; RcppDE = derive2 { name="RcppDE"; version="0.1.7"; sha256="1846pl9gxikycdvwfgy1gw41z0fx4ycjp5p4295v8k2pgvlqw8sa"; depends=[Rcpp RcppArmadillo]; }; - RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppDate = derive2 { name="RcppDate"; version="0.0.3"; sha256="1nwb4fdjxwn0c1ckj1fpsxl2hxk5z3sk3y5giwgdag6nfv7yfplw"; depends=[]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; - RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.0"; sha256="10nc0sx3n83kg8rddbajifr9q8iyjmm59z5xcpqfmmfi345i26al"; depends=[Rcpp RcppArmadillo wrapr]; }; + RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.1"; sha256="0zwm06riw0sc1qywmk8mfgay7lvzx8cmb7cijrr821j2sd0y2pyh"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.3"; sha256="0xhwgn77166ir7qnzl25mj0byskkqr0b36hihrpr2zaqsrzs8wsq"; depends=[Matrix Rcpp]; }; - RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.19.0.1"; sha256="0cc67nx8iddi70m8s2b683k4zcfakqw90rxm8wmaa2g3vpjbvadl"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.20.0.1"; sha256="0vraa320ymja472fijvxybgj8s1r4blfd1z06ffiw7drn5ch9zbk"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; - RcppFarmHash = derive2 { name="RcppFarmHash"; version="0.0.2"; sha256="0nkismq7hmp1ahwv4z438zrcj7mqsfmas2yd6av6k2cmkgklqkbk"; depends=[Rcpp]; }; + RcppFarmHash = derive2 { name="RcppFarmHash"; version="0.0.3"; sha256="1gl9mnmcai8d0qclk1660z1mnzqcydxv88836vnpz9q008a1y8fk"; depends=[Rcpp RcppInt64]; }; RcppFastAD = derive2 { name="RcppFastAD"; version="0.0.2"; sha256="020hw5p3vjsi00fmrbwnkdjc4lajpfjp1j0f5wiyk2d61yypfz2i"; depends=[Rcpp RcppEigen]; }; RcppFastFloat = derive2 { name="RcppFastFloat"; version="0.0.4"; sha256="09g4nk9nyg7fqrsgfmh10dmxbrb9fpcl3jayrjhv38h58hbvvxfm"; depends=[Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.13"; sha256="1rwkin79ppkdz1y9pghxx29vlyvs84bylvqblkhj8r4w26y76ppy"; depends=[Rcpp]; }; RcppGetconf = derive2 { name="RcppGetconf"; version="0.0.3"; sha256="1qcnn482h9b8aw798frnkza4bzzpihp0pf4s1mj6zmn2ar01hsl0"; depends=[Rcpp]; }; RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; }; RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; - RcppHNSW = derive2 { name="RcppHNSW"; version="0.4.1"; sha256="0x3w14cz6hkrl8hi6217j0dl65l3yphbzka1dmsvgp3p9waq402g"; depends=[Rcpp]; }; - RcppHungarian = derive2 { name="RcppHungarian"; version="0.2"; sha256="0x8jnlc49yng555sl7nvs19x3ydx1bhz0d7ym2igam4xx89hsh9k"; depends=[Rcpp]; }; + RcppHNSW = derive2 { name="RcppHNSW"; version="0.5.0"; sha256="0sb9g41lk2f7fj0hpg9qvyp6gbvwlcjpi9gxs3lh3xxfzrnap5w9"; depends=[Rcpp]; }; + RcppHungarian = derive2 { name="RcppHungarian"; version="0.3"; sha256="00wxi77ajnhwds1pnmhbxaykdaiyh6ayblif58sx9r5rvv055c1a"; depends=[Rcpp]; }; + RcppInt64 = derive2 { name="RcppInt64"; version="0.0.3"; sha256="0drfnsgjaac91g44cjvyrmw1fm75kdz7na8sikglx3k5vq0l1gb9"; depends=[Rcpp]; }; RcppJagger = derive2 { name="RcppJagger"; version="0.0.2"; sha256="1zzc7vkwylwwgrbak2z32629gbl5jq2gdfc9qq0a8fk7c7rvk988"; depends=[cli purrr Rcpp rlang]; }; RcppML = derive2 { name="RcppML"; version="0.3.7"; sha256="1ih8i7i6m221iw227mnl3rvnaw2l53h8fpnc4f8yn9sm10anap1j"; depends=[Matrix Rcpp RcppEigen]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; }; - RcppNumerical = derive2 { name="RcppNumerical"; version="0.5-0"; sha256="15hb08vwdvjrhzq1pyalv3qv946jnlk0w77nn654zcmmsns2fqar"; depends=[Rcpp RcppEigen]; }; + RcppNumerical = derive2 { name="RcppNumerical"; version="0.6-0"; sha256="11nph9fz1bzb0pcvh6xx4cb94090ahwpj21zmbi06m4pibb1a1rg"; depends=[Rcpp RcppEigen]; }; RcppParallel = derive2 { name="RcppParallel"; version="5.1.7"; sha256="175j0plh9gzy45sxsck0wdqfkjwdsbb17m9511czrgqsrswhxhzr"; depends=[]; }; RcppProgress = derive2 { name="RcppProgress"; version="0.4.2"; sha256="0j2b37gwjpgmrnr00srdzm751hzlpsjb54ph63xxmcdfnwhlnqmi"; depends=[]; }; RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.1.1"; sha256="06ahzp0rvk3wrrj46dmszkmpnybaa5hrpbs2cs5h3jn633k67zj6"; depends=[BH Rcpp]; }; - RcppRedis = derive2 { name="RcppRedis"; version="0.2.3"; sha256="0rnhb6c8z97h79jyifgnbckb04h48gqrdrsndhk85x4r7n6fv72v"; depends=[RApiSerialize Rcpp]; }; + RcppRedis = derive2 { name="RcppRedis"; version="0.2.4"; sha256="1n705sqxxzd4p3zi1xplc6y15pnvqh998y4k9hr032g44lk9q7y9"; depends=[RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; }; RcppSMC = derive2 { name="RcppSMC"; version="0.2.7"; sha256="0rp5s8j72al39rihn0q0j0ws6l1bxl1hlbx31mjllzhiq03pn2mq"; depends=[FKF Rcpp RcppArmadillo]; }; RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.10"; sha256="1wfhn4lm1538053hr4nk8mqbx3r9lq4p98fk6vw6b9xv84sxsicl"; depends=[Rcpp]; }; @@ -4531,7 +4545,7 @@ in with self; { RcppStreams = derive2 { name="RcppStreams"; version="0.1.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; RcppTOML = derive2 { name="RcppTOML"; version="0.2.2"; sha256="1ak3dwzdrmq9kd30i12fy582rsn5xfljw214liv1w8l2rbwr24rp"; depends=[Rcpp]; }; - RcppThread = derive2 { name="RcppThread"; version="2.1.5"; sha256="0rra7qqbq2y4bj54x76559p5ghpj3r03c4vlpg96phwafwnc2y8m"; depends=[]; }; + RcppThread = derive2 { name="RcppThread"; version="2.1.6"; sha256="1997ka0dd36d79fb4crqq0ar3bgzdv4mw5hd6v2pmq7555g0qiz9"; depends=[]; }; RcppUUID = derive2 { name="RcppUUID"; version="1.1.1"; sha256="0sxdj5ay90i1bs3wizij31n21ym8l0q0c79959arp1gd303sd8b8"; depends=[BH Rcpp]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.2"; sha256="0hm57nf4dzgsmg4hjj6wikwjx93fgfwkmybw6ly4b58wi6qwml1l"; depends=[Rcpp]; }; RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.6"; sha256="1iwiz4964dw015cbxcanks8xkjan39hfzf8x6bhvf6dqqwkc4bh7"; depends=[Rcpp]; }; @@ -4548,8 +4562,7 @@ in with self; { Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; Rdimtools = derive2 { name="Rdimtools"; version="1.1.2"; sha256="0bl8ffyy9jb6xp1jb350fj5pw3zvc1dnrdhl4vi25kl84pp30xl6"; depends=[ADMM CVXR maotai MASS mclustcomp RANN Rcpp RcppArmadillo RcppDE RcppDist Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="3.0.0"; sha256="07814154yss9660js65ib5jjgyhvyawxx6af1zl1im14ynrmz0np"; depends=[crayon units]; }; - Rdpack = derive2 { name="Rdpack"; version="2.4"; sha256="109mylzmlncq5a09ayy4g2g0frj1k843lj8j78gvmz1h5g8sslkn"; depends=[rbibutils]; }; - Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; + Rdpack = derive2 { name="Rdpack"; version="2.5"; sha256="0xy8w3law1dn53f1gv4jd637pwssr928pvgchpbrpsqz8ghv4kad"; depends=[rbibutils]; }; Rdrw = derive2 { name="Rdrw"; version="1.0.2"; sha256="1487r8z6h1y0v6fxkp7qfbh7j96hw8gqbb0fc90m4cxwz0hrqrn2"; depends=[mvtnorm]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.5.2.1"; sha256="0lm5c1cv6jyxkmr09khfnsab4bzjbfcg8j04zc4zqimy1541i6yn"; depends=[]; }; Rdta = derive2 { name="Rdta"; version="1.0.0"; sha256="1zmyh61wrzqwyfjbfcxg41cri7hy9r0jfwnixcvd086y0vxq7fdn"; depends=[MCMCpack mvtnorm Rdpack]; }; @@ -4558,7 +4571,7 @@ in with self; { ReAD = derive2 { name="ReAD"; version="1.0.1"; sha256="0wn8ka8mjx216py26h1fcswgv061wrcdfzdj55sryvykfxaggiir"; depends=[qvalue Rcpp RcppArmadillo]; }; ReDaMoR = derive2 { name="ReDaMoR"; version="0.7.2"; sha256="1p63kmf7442i0iw4f6hj6h6vs4kqgz6v9wj88vp63nb1w9r8l9av"; depends=[colourpicker crayon dplyr DT jsonlite magrittr markdown Matrix readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; ReDirection = derive2 { name="ReDirection"; version="1.0.1"; sha256="0hcl09drgr93yjssw2mpdpvr084ifzylsi6140hafjpm9f9pmvkm"; depends=[gtools MASS pracma]; }; - ReIns = derive2 { name="ReIns"; version="1.0.12"; sha256="06b3iibd50vy367jnia1a5y3s0jbmdwk3hkaylw296576rscib60"; depends=[doParallel foreach Rcpp survival]; }; + ReIns = derive2 { name="ReIns"; version="1.0.13"; sha256="1fdz80wbvmhh1vs796cz69wza0cpj5xv08hn5prygnl5vgp7d737"; depends=[doParallel foreach Rcpp survival]; }; ReMFPCA = derive2 { name="ReMFPCA"; version="1.0.0"; sha256="0q7jzya5is4ik8cjirnhixcpgda5s9a450pyksyzc05fmn7rw3rc"; depends=[expm fda Matrix R6]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; ReadDIM = derive2 { name="ReadDIM"; version="0.2.11"; sha256="1dyf1hrqcjqramb957kj7ngd65439p7ywa0r2rdlyn4bg89myi7c"; depends=[raster stringr]; }; @@ -4574,9 +4587,9 @@ in with self; { RedisBaseContainer = derive2 { name="RedisBaseContainer"; version="1.0.1"; sha256="0pnjj3rbp2as7h92907g338bd173ygl1zfnlfw6c9wpzfvw909rr"; depends=[DockerParallel]; }; Rediscover = derive2 { name="Rediscover"; version="0.3.2"; sha256="0g36j5xdc86422jc1njlab4kvlsq3z6bxigxgzsl31bf1k7kc1ra"; depends=[data_table maftools Matrix matrixStats PoissonBinomial RColorBrewer ShiftConvolvePoibin]; }; Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; }; - RefBasedMI = derive2 { name="RefBasedMI"; version="0.1.0"; sha256="1b28mm7wfrffwhr7zbhfgp5svbnvnahiwkh514977w1azbqsfcjd"; depends=[assertthat data_table Hmisc mice norm2 pastecs]; }; RefManageR = derive2 { name="RefManageR"; version="1.4.0"; sha256="1kjd66gp2z9fzrnyr1bqfd9p58q0bin3a187z9b56hiqmdjhyc78"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; - RegCombin = derive2 { name="RegCombin"; version="0.2.1"; sha256="1p6zn0mf3x7f8544xpdgxlf59mzc3b39w2dxwr63hh49nk4pa4q5"; depends=[dplyr geometry Hmisc kableExtra pracma RationalExp snowfall]; }; + RegAssure = derive2 { name="RegAssure"; version="1.0.0"; sha256="1i16rs3ypdlxyzg0nwna5qvdy4znkvhr7l1pv4463bz0wrvr5vn3"; depends=[brant car lmtest pROC]; }; + RegCombin = derive2 { name="RegCombin"; version="0.4.1"; sha256="14vb46d8m5w5vik7kfhsj97yil3sc6qnmyp3c6myadlsw9k3x4lj"; depends=[dplyr geometry Hmisc kableExtra pracma RationalExp snowfall]; }; RegKink = derive2 { name="RegKink"; version="0.1.0"; sha256="1q7jpsh3al18i2dv67lmv5d6jgiy2px8jaxwkgg62njisk8c5qng"; depends=[MASS]; }; RegSDC = derive2 { name="RegSDC"; version="0.7.0"; sha256="19fr0xyaw8zyqy039mdcqs09ar500vwqmsmwn0id6llhxy3wpiiy"; depends=[MASS Matrix SSBtools]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.4"; sha256="0mhyjqp8x66zwnbxpwq3a8180z48rrm7hp50028grb2x19lp8qkd"; depends=[]; }; @@ -4585,9 +4598,9 @@ in with self; { Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Relectoral = derive2 { name="Relectoral"; version="0.1.0"; sha256="0kpdafdvpcs6iicpc10i634nlk7dqk2nymdnnlkpp5frdxlbycvx"; depends=[dplyr ggforce ggplot2 readxl rmarkdown sf xlsx]; }; RelimpPCR = derive2 { name="RelimpPCR"; version="0.3.0"; sha256="04ab20clx9hdk1mi3rvkkaqaxypyb27w5d90y3qpnxhgy1bjqs6r"; depends=[caret ggplot2 logger relaimpo reshape2 Rmisc]; }; - Renext = derive2 { name="Renext"; version="3.1-3"; sha256="0m5br76n0vd6q1kkjp6w7qxhvrplc63dxm5zcw6cy9f302x76jdk"; depends=[evd numDeriv]; }; + Renext = derive2 { name="Renext"; version="3.1-4"; sha256="17vg9mjijy80qs9asjbsjfp5nhk056nlqj3w7mld6lbprlbyhkkh"; depends=[evd numDeriv]; }; RenvModule = derive2 { name="RenvModule"; version="1.1"; sha256="1wmz6k0f9lpa8d7qxqm308l7h11k0cj07q3qisfjic5sp308c3d2"; depends=[]; }; - Renvlp = derive2 { name="Renvlp"; version="3.4"; sha256="1lnjx33yhqjdbq9lx0b1ag45xyhg0j1gjfaplv14kn9jicx6ddnm"; depends=[Matrix matrixcalc orthogonalsplinebasis pls Rsolnp]; }; + Renvlp = derive2 { name="Renvlp"; version="3.4.5"; sha256="1af1hjv66kxjljrx1ryr4c8w969jjvdd284nxsh1b7rms80iw16r"; depends=[Matrix matrixcalc orthogonalsplinebasis pls Rsolnp]; }; RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.2.0"; sha256="1lx4y2f4qc1vg4iydr1ydv986fi2k4vnd8y3fr54kgkhvy0ni645"; depends=[ddalpha geometry MASS mvtnorm nlme rgl]; }; RepertoiR = derive2 { name="RepertoiR"; version="0.0.1"; sha256="1m7n7p40n3djy91z8z3gqqwscqgij63rjrj2bqbl3baqz16nf4hc"; depends=[circlize igraph reshape2 stringdist stringi stringr]; }; @@ -4607,24 +4620,23 @@ in with self; { RestoreNet = derive2 { name="RestoreNet"; version="1.0"; sha256="015j8kw0msixjxljhpj4hnj67k9z89zcsyga0jva4ig5ri24rj34"; depends=[ggplot2 Matrix RColorBrewer scales scatterpie stringr xtable]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; RevGadgets = derive2 { name="RevGadgets"; version="1.1.1"; sha256="0vs6wcapckyy2i2g1699sha963gwfy68swvd2xxphxnlsa8hfr3f"; depends=[ape deeptime dplyr ggimage gginnards ggplot2 ggplotify ggpp ggthemes ggtree phytools png reshape scales tibble tidyr tidytree treeio]; }; - ReviewR = derive2 { name="ReviewR"; version="2.3.8"; sha256="19cj92v7356n3910dx2z8xzi78fynd32kb9132ll2xw295mfk61i"; depends=[bigrquery config dashboardthemes DBI dbplyr dplyr DT gargle glue golem httr jsonlite magrittr purrr redcapAPI REDCapR rlang RPostgres RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyjs shinyWidgets snakecase stringr tibble tidyr]; }; + ReviewR = derive2 { name="ReviewR"; version="2.3.10"; sha256="1h5vgqxvx5cjcwgrj7ayc7b1xzkgyndif46pjfmaz4pw1sz8990h"; depends=[bigrquery config DBI dbplyr dplyr DT gargle glue golem httr jsonlite magrittr purrr redcapAPI REDCapR rlang RPostgres RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyjs shinyWidgets snakecase stringr tibble tidyr]; }; Revticulate = derive2 { name="Revticulate"; version="1.0.0"; sha256="00pz8nnbl7dcbbqw8kdbdai1i3jc941l42nppaa1kxk6i3dci7gs"; depends=[ape comprehenr jsonlite knitr rstudioapi stringr usethis]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; RfEmpImp = derive2 { name="RfEmpImp"; version="2.1.8"; sha256="1azcjwf9l4c3ssp565qkvpqx3n28vfdwgcy53z61psgc1nlxnk19"; depends=[mice ranger]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; Rfast = derive2 { name="Rfast"; version="2.0.8"; sha256="1c64j8hg6id4ri3m32aa1r0qyn09kl3dvl865dzf43qdb3qcichv"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfast2 = derive2 { name="Rfast2"; version="0.1.5.1"; sha256="1cj0ggb49l2srycl8k832kvfx5y43yvhknn0glkkgcac838y2417"; depends=[RANN Rcpp RcppArmadillo RcppParallel Rfast]; }; - Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; - Rfmtool = derive2 { name="Rfmtool"; version="4.1.10"; sha256="150y9xbnwhmazfd7az283pkyb02sfzv6y7f6fjwixx4cqv4bjzqf"; depends=[]; }; + Rfit = derive2 { name="Rfit"; version="0.24.6"; sha256="0b4gdy54zbbc8zr0krv34ggxnqncgj2hxzqjfg6j21apn7qsv8r2"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; Rforestry = derive2 { name="Rforestry"; version="0.10.0"; sha256="1h5bnaakpig7b2041s43kfljywdbdq6kkvv3agld2953nn8kcbw3"; depends=[glmnet onehot pROC Rcpp RcppArmadillo RcppThread visNetwork]; }; - Rfractran = derive2 { name="Rfractran"; version="1.0"; sha256="0cwc069f7rhkxkr5kn0n43mdy8m47gh0q6d5ijwzkhncrijb10cy"; depends=[gmp]; }; - Rfssa = derive2 { name="Rfssa"; version="2.1.0"; sha256="0ww4s5vhqhdw9rr8maqgzwx6kvj196z339maxd3xx29qxgp6j1ml"; depends=[dplyr fda ggplot2 httr lattice markdown plotly Rcpp RcppArmadillo RcppEigen RSpectra Rssa shiny tibble]; }; - Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; + Rfractran = derive2 { name="Rfractran"; version="1.0.1"; sha256="1z1wba2xyas2sa9ny0ii8yd5v5ip8ajxf5szgf3r92cfv3r1s0nj"; depends=[gmp]; }; + Rfssa = derive2 { name="Rfssa"; version="3.0.1"; sha256="0nxn0lq28vl0bnr1cmbr3pgivmxs0a23wh2bg4z2knvzw00lg2nn"; depends=[dplyr fda ftsa ggplot2 lattice markdown plotly rainbow Rcpp RcppArmadillo RcppEigen RSpectra Rssa shiny tibble]; }; + Rgb = derive2 { name="Rgb"; version="1.7.5"; sha256="1hj7hxvj785qg4j52bvwgczv21fhz2fjncvxn2fahsb4hdkrvfrm"; depends=[]; }; Rgbp = derive2 { name="Rgbp"; version="1.1.4"; sha256="1y51sms321sbrl3rgzp5hq4y5mqkrjxsyrq75gkcbwfvlakjcfrg"; depends=[mnormt sn]; }; Rgff = derive2 { name="Rgff"; version="0.1.6"; sha256="1prcjnr4zvp8ksrnzrvz7zmwbsximhg3aifa1wsz6h9aa3pcl2gl"; depends=[data_tree dplyr magrittr RJSONIO rlang stringi tibble tidyr withr]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-5"; sha256="18bwnpb8645vf233andr411shzp1sm3i7bn848sgxswgb80grvxa"; depends=[slam]; }; - Rgof = derive2 { name="Rgof"; version="1.1.0"; sha256="11lmi0zkrdgbp38py84bnxi7yb75abad8rw20pip48nnvrdjzrs4"; depends=[ggplot2 Rcpp]; }; + Rgof = derive2 { name="Rgof"; version="1.2.1"; sha256="0n2ddwhx0qibczx8im39gjdmh8alng5w6f7hbvvx3p7sm6xxp0q7"; depends=[ggplot2 Rcpp]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.3"; sha256="02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi"; depends=[png sp]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.23-42"; sha256="05b6jhmxdr1rdpbvf5gwi9dqb57m8z2860qzkw5hcr72d5drv22w"; depends=[]; }; Ricrt = derive2 { name="Ricrt"; version="0.1.0"; sha256="12fj6q5disl5vmpcwfvf64zqxjw2srrvbvpy10gy81k5lidzznqc"; depends=[dplyr glmnet randomForest Rdpack rlang SuperLearner tidyverse]; }; @@ -4643,9 +4655,10 @@ in with self; { Rivivc = derive2 { name="Rivivc"; version="0.9.1"; sha256="0vbnkid5cp9af0m2kk3cblb3fr69llzmk6ckjy1brgyvrrmw5hz3"; depends=[signal]; }; RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rlab = derive2 { name="Rlab"; version="4.0"; sha256="019rmciqza5rd5z9hvh8xk20c2rjhzyzp1k5731qm1d3jz5lwx5k"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.11.0"; sha256="090fpd8wn3k1xf5l0cy8q420hmp562kzb1vviq6plalnby667mhq"; depends=[httr jsonlite Rcpp]; }; - Rlgt = derive2 { name="Rlgt"; version="0.1-4"; sha256="11nhgzdf37345m5k153pfrdsqbg6gpp4g8xig19pcf4sbmqq2k5l"; depends=[BH forecast Rcpp RcppEigen RcppParallel rstan rstantools sn StanHeaders]; }; - Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.2"; sha256="0hzsnrz30429pavf7qghknykah9ks4msb96zwa1xgvqb4zd512dg"; depends=[Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.12.0"; sha256="0rzm81q22brxzvqdany7xjs4782my2pbmdlp7bayn4ls2frwvv46"; depends=[httr jsonlite Rcpp]; }; + Rlgt = derive2 { name="Rlgt"; version="0.2-1"; sha256="0hrqishf056d8nivm2rya2xxpdzmn69ajnxdp9w39fhdfjhzv90p"; depends=[BH forecast Rcpp RcppEigen RcppParallel rstan rstantools sn StanHeaders truncnorm]; }; + Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.3"; sha256="1r3yqs9pc1mllwvw8asppr59kxvmw8dd15wbvn57ngij7kq6aj1l"; depends=[Rcpp]; }; + Rlibkdv = derive2 { name="Rlibkdv"; version="1.1"; sha256="1lcmnc50bfnrnw03bs3lsxdsj2n3qylfw51w6kvnz9x1qmr9p54p"; depends=[leaflet magrittr raster Rcpp sf]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; }; Rlinsolve = derive2 { name="Rlinsolve"; version="0.3.2"; sha256="1xv500n1480qyakw0isanw1s5ywykhc207hqja4804s5s2m8zfjw"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; Rlof = derive2 { name="Rlof"; version="1.1.3"; sha256="068898i310ylddpndh0dsiaiimmdk8pc1rbvh4a8ikihwbc9hk55"; depends=[doParallel foreach]; }; @@ -4654,7 +4667,8 @@ in with self; { RmdConcord = derive2 { name="RmdConcord"; version="0.2.0"; sha256="08yd6g2yawxr4k5awgrvnm720w5jsq9g5q9xqlvdr9pvmv8xnv4c"; depends=[knitr rmarkdown]; }; RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; }; Rmisc = derive2 { name="Rmisc"; version="1.5.1"; sha256="1h6jb0xwkyhm9lwm7nj9bhrb5dhrsifvkpqkrd594j1lz74dar8x"; depends=[lattice plyr]; }; - Rmixmod = derive2 { name="Rmixmod"; version="2.1.8"; sha256="0dbx06idj1hnmkx4shmqllaw2klgbmq4acb1c3zi83fp4fx5vfay"; depends=[Rcpp RcppEigen]; }; + Rmixmod = derive2 { name="Rmixmod"; version="2.1.9"; sha256="0lwll21gkp90m0a06ldwgwr9v0df3k8v78s12510xkhiwqfynznq"; depends=[Rcpp RcppEigen]; }; + Rmodule = derive2 { name="Rmodule"; version="1.0"; sha256="0vbxazms3qmkhc40fb3hbyk84vrv31pmxl756wnm40z3p7l43kzk"; depends=[Matrix Rcpp RcppArmadillo]; }; Rmolt = derive2 { name="Rmolt"; version="1.0.0"; sha256="0fmis81h4c16wpwx6g60szf9d1gyvi60md2gn2mqln9gcf7w0icy"; depends=[]; }; Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; }; Rmpfr = derive2 { name="Rmpfr"; version="0.9-3"; sha256="0hgn1ib581s0q5slscakhy858yrqlx8w5gnrn2zgga98iv4vv3c2"; depends=[gmp]; }; @@ -4667,7 +4681,7 @@ in with self; { Rnvd3 = derive2 { name="Rnvd3"; version="1.0.0"; sha256="13l5vcbcm88jfsc11ijkvr1s8qk8fflclazs4kl1k2wzpnlr6z6a"; depends=[data_table htmltools htmlwidgets jsonlite lazyeval lubridate viridisLite]; }; RoBMA = derive2 { name="RoBMA"; version="3.1.0"; sha256="0cq1hjm49sj4lnzvninf6wlpm0p0rbw3mk6sa36167b6snr6rra2"; depends=[BayesTools ggplot2 mvtnorm Rdpack rjags rlang runjags scales]; }; RoBSA = derive2 { name="RoBSA"; version="1.0.2"; sha256="1hk4pdkgqjqhn7wxzzgw1f1rz4kk3gri7wispzz0m3nxk7bksw6b"; depends=[BayesTools coda Rdpack rjags rlang runjags scales survival]; }; - RoBTT = derive2 { name="RoBTT"; version="1.2.0"; sha256="0459sz6wnzf6jz07ib4bkyj4dzvzcp67bxfs8blsanrfvzgp5nvr"; depends=[BayesTools BH bridgesampling ggplot2 Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; + RoBTT = derive2 { name="RoBTT"; version="1.2.1"; sha256="1c97cvbqrf5q5axycxsywqg7x198nxrs4xrqy9lh2isips3das6g"; depends=[BayesTools BH bridgesampling ggplot2 Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.3"; sha256="02gapmpwkqy0n65nfaa9rvpx6693j9h93hfhn6s41q7833gvcx3z"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; @@ -4680,11 +4694,11 @@ in with self; { RobRex = derive2 { name="RobRex"; version="1.2.0"; sha256="1npgbdvdzb0p0w77fsngrwg968y621p3lx8qw69ns8qgxjkismqp"; depends=[distr RandVar RobAStBase ROptRegTS]; }; RobStatTM = derive2 { name="RobStatTM"; version="1.0.7"; sha256="07kman12jc5qvxsamrfy46b5qq80r7jf6c5anw8nvji41viqwlm1"; depends=[pyinit robustbase rrcov]; }; RobinHood = derive2 { name="RobinHood"; version="1.7.0"; sha256="0h8mws0wpyxvnjffrili53daz9bvvgm6lbgwqyzc0kd12radj2d0"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; - RobustAFT = derive2 { name="RobustAFT"; version="1.4-6"; sha256="180a662ibl265593d1cplrkmydk4630r1jgfis1mq267l672ajdi"; depends=[DEoptimR robustbase survival]; }; + RobustAFT = derive2 { name="RobustAFT"; version="1.4-7"; sha256="1i000j6d4s0yb99dxyq610a1znkiai9xc9l16wdb7lmnrhixz5qp"; depends=[DEoptimR robustbase survival]; }; RobustANOVA = derive2 { name="RobustANOVA"; version="0.3.0"; sha256="1kpvahxipcmsqk6mv2zagcvw0glmsj0xkpf6f3gjnckin6mxnjyv"; depends=[optimbase PEIP]; }; RobustBF = derive2 { name="RobustBF"; version="0.2.0"; sha256="137lsk72sx29lhkc1s698k015vvbmdzb23i8pnlk5204bjfqzch8"; depends=[]; }; RobustBayesianCopas = derive2 { name="RobustBayesianCopas"; version="2.0"; sha256="0cbibfp4y45cc1disp2r37v0jln0cd9gy3d77z3k9ybj1gg8wa88"; depends=[rjags statip]; }; - RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.3"; sha256="1fz0lhgj70zfh5mlcfswxz168hpir68pdz7lszz21ixr73hjdhxb"; depends=[nloptr Rcpp RcppEigen RobustGaSP]; }; + RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.4"; sha256="0qa2krbi1av4dxfw9sb2gl9sif3smllk1yvsrh58ncag729vnv5y"; depends=[nloptr Rcpp RcppEigen RobustGaSP]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.5"; sha256="16nw0z3xbvqi4zyb0lsaw1mnyizmw945xvz86h6syfpx388rglhf"; depends=[nloptr Rcpp RcppEigen]; }; RobustIV = derive2 { name="RobustIV"; version="0.2.5"; sha256="1iz5g0ynkx38vdsf7rm8haai7a8igw3rdqrgxllahnbykwhm4d51"; depends=[CVXR glmnet igraph intervals MASS Matrix]; }; RobustLinearReg = derive2 { name="RobustLinearReg"; version="1.2.0"; sha256="06137f516gyj64qdmwby7m1xnvj4hxzpqj454jn0xcinvl89380w"; depends=[]; }; @@ -4702,7 +4716,8 @@ in with self; { RoughSets = derive2 { name="RoughSets"; version="1.3-7"; sha256="0g6nx0cak6619hxv1fq3b30xv0bdwxb776qkdj6ihig6nhkm2hkj"; depends=[Rcpp]; }; RoundAndRound = derive2 { name="RoundAndRound"; version="0.0.1"; sha256="1q3xb6y9ip8csivd0qijifxsm3h7zkwz8lxfi4ffdcgrvbl03v8q"; depends=[geometry rgl]; }; Routliers = derive2 { name="Routliers"; version="0.0.0.3"; sha256="1yrzl3gqh7xkclqdqjwy4yn7qawixpb9mzw31a6wxnrr09hzv989"; depends=[ggplot2 MASS]; }; - Rpadrino = derive2 { name="Rpadrino"; version="0.0.4"; sha256="09lg0xvibg9x4nc6pwywkcfay78dg68hva7cbwm7f9s5x46v9v13"; depends=[ggplot2 ipmr magrittr mvtnorm purrr rlang rmarkdown truncdist]; }; + Rpadrino = derive2 { name="Rpadrino"; version="0.0.5"; sha256="01jdvqh947xa1x13hch2s8419xmb2pc5xyi6xay8ic7yr8syv8wd"; depends=[curl ggplot2 ipmr magrittr mvtnorm purrr rlang rmarkdown truncdist]; }; + Rpdb = derive2 { name="Rpdb"; version="2.3.4"; sha256="0nnjbyd3s57669kxy19wmih473s1lgxcznsk3d2ym3cpy7v7k385"; depends=[rgl]; }; RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.3.9"; sha256="05dzkpr5d7n5c3nng5flrgh0hgg16s19mx1940ilh3n4jgvz0rxq"; depends=[ape doBy MASS Matrix numDeriv phylolm phytools Rcpp RcppArmadillo]; }; Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; @@ -4710,20 +4725,20 @@ in with self; { Rpoppler = derive2 { name="Rpoppler"; version="0.1-2"; sha256="11m3vw1an91567nf72vz2cbm520vbh6h4dmfzbrxbw24qy3y58x3"; depends=[]; }; RprobitB = derive2 { name="RprobitB"; version="1.1.2"; sha256="1acxgxv4v7id7smrg9f8dfxx9y17pvqwsbfg0n8zdd99q724bpx5"; depends=[cli crayon doSNOW foreach ggplot2 gridExtra MASS mixtools mvtnorm plotROC progress Rcpp RcppArmadillo rlang viridis]; }; Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; - Rquake = derive2 { name="Rquake"; version="2.4-4"; sha256="1929qxqbb6s316zb9x2q1kwz2pvwpvqr1w6iw8vm5vijyf1nvv30"; depends=[GEOmap MBA minpack_lm RPMG RSEIS]; }; Rquefts = derive2 { name="Rquefts"; version="1.2-1"; sha256="1v548wys8fd6xqz4hfvqkckl6szjf6zr383n1x0kc6f2pfrc6jnf"; depends=[meteor Rcpp]; }; Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; }; Rraven = derive2 { name="Rraven"; version="1.0.13"; sha256="0nlqr1hzbzbz4rb3hjy01iw8czhaqvwmy9hh728fgl5vajwqwn8g"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdap = derive2 { name="Rrdap"; version="1.0.6"; sha256="0lwp80622xnjgfljds0fs64l3c30ijmz495v48j564za4ss4yx9q"; depends=[curl rjson stringr]; }; + Rrepest = derive2 { name="Rrepest"; version="1.0.0.8"; sha256="0w7nhdcdzrih55jlz7066fm03rp17w5dig804l75dpflan9wspin"; depends=[data_table doParallel dplyr flextable foreach labelled magrittr officer purrr stringr tibble tidyr]; }; RsSimulx = derive2 { name="RsSimulx"; version="2023.1"; sha256="0j48d94r68lzjpkak67q455q09ivp9fnkcsbqh8qziikzglf2ac5"; depends=[ggplot2 gridExtra]; }; - Rsagacmd = derive2 { name="Rsagacmd"; version="0.4.1"; sha256="0625wrxd5x226gag7d9v7clr2890bmdcvknivlxc9ahm1jcfagr5"; depends=[foreign generics processx rlang rvest sf stars stringr terra tibble]; }; + Rsagacmd = derive2 { name="Rsagacmd"; version="0.4.2"; sha256="08xj6dinqnr9ir0ljz0ybyh3wqsbw5hdp27xfvcmc8vi48gf4rlj"; depends=[foreign generics processx rlang rvest sf stars stringr terra tibble]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; }; Rserve = derive2 { name="Rserve"; version="1.8-11"; sha256="118vmylh14avsq4ckx0933hk8j200jkbz88j5rfyx31z95l1vywx"; depends=[]; }; Rsfar = derive2 { name="Rsfar"; version="0.0.1"; sha256="1xskvvvavkdyjhb99qlii9qc0q1m36mxx6g0ybgwbq26lq4ypq7l"; depends=[fda]; }; Rsgf = derive2 { name="Rsgf"; version="1.0.0"; sha256="1d2bk20ixnfkzbimvsj56arf7brgkwlyrs80snfn5cnvmwic0h8i"; depends=[ggplot2 png stringi stringr]; }; RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; }; - Rsmlx = derive2 { name="Rsmlx"; version="2023.1.1"; sha256="07dhqapbsp2ijgyshqa6csj6ma76xfj655cdy9ns4z5fj0jniqfm"; depends=[dplyr ggplot2 gridExtra MASS tidyr]; }; + Rsmlx = derive2 { name="Rsmlx"; version="2023.1.5"; sha256="1fb4dqnrbdvqbsfk2hnkfwdaiprpyj39kwxz49ywj7h9k4g9lgcw"; depends=[dplyr ggplot2 gridExtra MASS tidyr]; }; Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; }; Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.6"; sha256="1jbi4nib0a749k7vkqzhdb5l2jipxq9k8vi5x7i06qns8sb3ajil"; depends=[kohonen Rcpp]; }; Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; }; @@ -4732,7 +4747,6 @@ in with self; { Rstg = derive2 { name="Rstg"; version="0.0.1"; sha256="1rghac9sjld03rw1sbq2r7rs2fzf3a2xikjb47cfdnk1r73ziysf"; depends=[reticulate]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="3.1"; sha256="1l80xl7q6w97m80wj2639rhbqvxyl87r9lisk8cjf2bvcmf0spmb"; depends=[Matrix survival]; }; Rsymphony = derive2 { name="Rsymphony"; version="0.1-33"; sha256="1y2jcpzi8zn6rxwmp3gxyyk8nq204ri8vv6p4552hb55nnvqvc8s"; depends=[]; }; - RtD3 = derive2 { name="RtD3"; version="0.0.1"; sha256="0zbm9pf1z8xl99aj64xy8q3hly98c2rzy34fzkbjyndysvxf9032"; depends=[data_table geojsonsf htmlwidgets jsonlite purrr]; }; Rtapas = derive2 { name="Rtapas"; version="1.1"; sha256="16mlmml7d381zxfqjfcnk77l5ic6dp890a74jb8va4yi32cb88yw"; depends=[ape distory GiniWegNeg paco parallelly phytools stringr vegan]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; Rthingsboard = derive2 { name="Rthingsboard"; version="0.2.7"; sha256="165yx215vmsx3r5zqzh0awf5jzznxsapq49c3q5qrhcircbnjfcg"; depends=[dplyr httr logger]; }; @@ -4745,7 +4759,7 @@ in with self; { Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Runuran = derive2 { name="Runuran"; version="0.38"; sha256="1fjr9pbjih6ahbsd557p3d5j8klj11wnnn7jkhjcry1spwlzdkhr"; depends=[]; }; Rvcg = derive2 { name="Rvcg"; version="0.22.1"; sha256="16rr2kqw7lqb7m01pwn496zf2nr25gm6wcncz44kszjzzmv2xanv"; depends=[Rcpp RcppArmadillo RcppEigen]; }; - Rveg = derive2 { name="Rveg"; version="0.1.1"; sha256="02bybiam93yafzwmxl4v34wv2bb60fwl9n053f9h7q1s4bs7y54m"; depends=[dplyr]; }; + Rveg = derive2 { name="Rveg"; version="0.1.3"; sha256="0r4q5iyfi9f95kzmhjgy1jdiv85wr16m5yhgq9zz36sjs4miif2m"; depends=[dplyr]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17.1"; sha256="0kl1h4mlvb1bngb40r3dhrjkpnh3lsqddis65hbjzm2pzz20l02m"; depends=[optextras]; }; Rwave = derive2 { name="Rwave"; version="2.6-5"; sha256="1r72kcc5f9k38ks39nh9x1y7k1kxrbyv7lywqpsy7wknnddzg7kc"; depends=[]; }; Rwclust = derive2 { name="Rwclust"; version="0.1.0"; sha256="0c7q2i9n22sqj3wq9m0j49y5h14848myjbixrdkic8lvv91dm438"; depends=[checkmate Matrix]; }; @@ -4756,14 +4770,14 @@ in with self; { RxnSim = derive2 { name="RxnSim"; version="1.0.4"; sha256="1cpbrqr5gx84ny0kk7y5h5awynf5mvwsavyfmg5gg539xh55pnkk"; depends=[data_table fingerprint rcdk rJava]; }; Ryacas = derive2 { name="Ryacas"; version="1.1.5"; sha256="1g43rm492is2rkhjn7dv40qdmx70321sp2z7cigqfh6ffwcgbz9y"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.4"; sha256="0xjpsn3n3x0v37qqypb86vr45fc9cd5dc8n7szzcf87nxa8k5imb"; depends=[Rcpp settings xml2]; }; + S7 = derive2 { name="S7"; version="0.1.1"; sha256="0r3v586xbcrww63jifdbfh2fgdkr5f2mgp72f2zljg4x70zn3sfw"; depends=[]; }; SACCR = derive2 { name="SACCR"; version="3.2"; sha256="1sp8hjpwzyczj85saps6a6yw30yh5098ig2xmlf79jvzv86nqgn1"; depends=[data_tree jsonlite Trading]; }; - SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; SADISA = derive2 { name="SADISA"; version="1.2"; sha256="0yn7f360wl5ykys5zln159xh2h8bx7zb5ddwhv1migjlqry506hp"; depends=[DDD pracma]; }; - SAEforest = derive2 { name="SAEforest"; version="1.0.0"; sha256="135rjszhmyjadcysyc4inymap1n6irh7bydizc5aadd89805b0il"; depends=[caret dplyr ggplot2 haven ineq lme4 maptools pbapply pdp ranger reshape2 vip]; }; SAEval = derive2 { name="SAEval"; version="1.0.0"; sha256="11427b9n3dc1jkzjqbri2h7cvfms1z130p10bbj39jjx8zjm1fyq"; depends=[car ggplot2 ggspatial lmtest]; }; SAFARI = derive2 { name="SAFARI"; version="0.1.0"; sha256="10fmav9dbq5kbgy8gjsp3561vi46bjvkh2wqjs39vx5z8x1ml7i3"; depends=[caTools EBImage lattice png]; }; SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; }; + SAGM = derive2 { name="SAGM"; version="0.1.0"; sha256="0a46b9k1zgvyr9j8dl7m5r25xdh0yxnz3bhqavcn5s6rd3bbzsbr"; depends=[fastmatrix GIGrvg mvtnorm]; }; SAGMM = derive2 { name="SAGMM"; version="0.2.4"; sha256="18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs"; depends=[lowmemtkmeans mclust MixSim Rcpp RcppArmadillo]; }; SALES = derive2 { name="SALES"; version="1.0.2"; sha256="0a708nzj8qc2dig79a74rknj42vawm7ix40nbjq1bhakfxviam0v"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; @@ -4774,19 +4788,23 @@ in with self; { SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; SAMTx = derive2 { name="SAMTx"; version="0.3.0"; sha256="18r03w74fcra3c0xa76jnkkms9pjirdmgb2k1dnz7symqf9cvc5l"; depends=[BART]; }; SAMUR = derive2 { name="SAMUR"; version="1.1"; sha256="1ihxr455hxpk3mz113j7ai36lw9i4v60yd4x50j7npzcpq5r0mwk"; depends=[Matching]; }; - SAMtool = derive2 { name="SAMtool"; version="1.6.0"; sha256="0zw3z982sqdm45gxpgfwd611kfr5vfgsimhh9fg5xdw1w1g5wsyq"; depends=[abind dplyr gplots MSEtool pbapply RcppEigen rmarkdown snowfall TMB vars]; }; + SAMprior = derive2 { name="SAMprior"; version="1.1.1"; sha256="1xp3wvgjp9252l8w42fsr61bh6ggs3b21df182rw3irh2ijn1mc0"; depends=[assertthat checkmate ggplot2 Metrics RBesT]; }; + SAMtool = derive2 { name="SAMtool"; version="1.6.1"; sha256="1higcy821apya9a1c73dqc7661knjp14cax9wm3023dz8n92z0dg"; depends=[abind dplyr gplots MSEtool pbapply RcppEigen rmarkdown snowfall TMB vars]; }; + SANple = derive2 { name="SANple"; version="0.1.0"; sha256="1ss9p8pw5k1rp8xap98bd587xfhr006xwbf85c1az3rc1p4rji77"; depends=[RColorBrewer Rcpp RcppArmadillo RcppProgress salso scales]; }; + SANvi = derive2 { name="SANvi"; version="0.1.0"; sha256="1rcg5j8gvcz1wi2qzhsblb7ml8l6hiimyzpk2bkl6hicrgjrzi66"; depends=[matrixStats RColorBrewer Rcpp RcppArmadillo scales]; }; SAP = derive2 { name="SAP"; version="1.0"; sha256="129szqkh4snlqn5q09yaqf6sd04nvai3a0ifk0b36yrqj92v6fd1"; depends=[BSDA]; }; SAPP = derive2 { name="SAPP"; version="1.0.9-1"; sha256="1ngyxgmb13rcgzblpa7v6v390pyymglvvb4j8x7z4038v24s7qj6"; depends=[]; }; SAR = derive2 { name="SAR"; version="1.0.3"; sha256="1cnf0hsq82lzssvz5xs2abvnrjxda0g6mjx70a1j223zdwjqmw64"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; SARP_compo = derive2 { name="SARP.compo"; version="0.1.5"; sha256="17pvgc7alv59lxnrz1rj5gdl2lg90jxfwkyn8j802n22r3bmzcsm"; depends=[car igraph]; }; SARP_moodle = derive2 { name="SARP.moodle"; version="1.0.4"; sha256="1zpvw5sdzrh5ci89lqra73yvvpj340wc1rl5825krj1f73lmga3s"; depends=[base64enc]; }; - SAScii = derive2 { name="SAScii"; version="1.0.1"; sha256="04cns0mvff7crbsv8vld3qwjrj280jzbx25m9d03l9wa4ba2djny"; depends=[]; }; + SAScii = derive2 { name="SAScii"; version="1.0.2"; sha256="1ib09dmvbn9d6dlw5mh4g36d503mn05y3m5453aaclqnmgarf12m"; depends=[]; }; SASdates = derive2 { name="SASdates"; version="0.1.0"; sha256="1413x0biid7972zz2qqv22h26a738mp7n97gpxxs9rykxkw3bfr5"; depends=[]; }; SASmarkdown = derive2 { name="SASmarkdown"; version="0.8.2"; sha256="0xrrmb2zmm0mdg4akm5rnzbxxx690w9mv90mp830kbs42i0haqqg"; depends=[knitr xfun]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; }; SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; }; SBAGM = derive2 { name="SBAGM"; version="0.1.0"; sha256="0vb1679016b0bhz2xlka9wgr2fxwa0447ymfncm1n5fks60rrnnf"; depends=[forecast MSGARCH rugarch]; }; + SBCK = derive2 { name="SBCK"; version="1.0.0"; sha256="1z5svxa639245jmv3bsikmbch8j4j51d7rjwhj62zcaxhb3ykhcs"; depends=[R6 Rcpp RcppEigen ROOPSD transport]; }; SBICgraph = derive2 { name="SBICgraph"; version="1.0.0"; sha256="04c9xb9fdxz62qdsfkdkckvfpccrc7n5j3j5v1lgjywxq6l78wsm"; depends=[glmnet MASS network]; }; SBMSplitMerge = derive2 { name="SBMSplitMerge"; version="1.1.1"; sha256="1h44qwz9gkwwgkac25h4vn0kq3mjvjsyq99yfd8v8g6g8fkkclaq"; depends=[ggplot2 reshape2 scales]; }; SBN = derive2 { name="SBN"; version="1.0.0"; sha256="1k4x8hzjrzvaxnq9z9rykc65lfp4x75nhjrfpk6llq9hqjms2n06"; depends=[igraph]; }; @@ -4799,6 +4817,7 @@ in with self; { SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; }; SCCI = derive2 { name="SCCI"; version="1.2"; sha256="08ibazxiqmkm3n9g8bfp0cfq26zmg6x2fxb064g3z05nczsf72db"; depends=[Rcpp]; }; SCCS = derive2 { name="SCCS"; version="1.6"; sha256="03737abfpg4bpbmgxryls9vfhhmx3kw02kw36y3rd3pnn2mcfd4v"; depends=[corpcor fda gnm R_methodsS3 survival]; }; + SCDB = derive2 { name="SCDB"; version="0.2"; sha256="0c9pfs08np4igwl0p8z8v6m0yibvylj7mrzpgp34iaibfd5lqgnr"; depends=[checkmate DBI dbplyr dplyr glue lubridate openssl purrr R6 rlang RSQLite stringr tidyr tidyselect tidyverse]; }; SCEM = derive2 { name="SCEM"; version="1.1.0"; sha256="1fxxkv965gb0wq06rclv05xxlzk8p9l8hzbnqcf0nbbymyn73fqr"; depends=[devtools mathjaxr]; }; SCEPtER = derive2 { name="SCEPtER"; version="0.2-4"; sha256="1098pvq3a7k9czxapszkakc8lr9sfvj7a643iivil5fcqfk0j50r"; depends=[MASS]; }; SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; @@ -4815,17 +4834,16 @@ in with self; { SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.9"; sha256="0i464i6fbxxcrvc48ajmz7i75sqfwizjypbbmc0mmj0dgmnxgby9"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer reshape2 tidyr TSP]; }; SCOUTer = derive2 { name="SCOUTer"; version="1.0.0"; sha256="1s0mmzfz0zhr5v4wagcjwdba8a5f57xr26vwml92dnw6lai37pj4"; depends=[ggplot2 ggpubr]; }; SCRIP = derive2 { name="SCRIP"; version="1.0.0"; sha256="1cv8443y2s67q3krsyj7r2d1vqv01w8xr0iz8dz4kijmhksyg7ng"; depends=[BiocGenerics BiocManager checkmate crayon edgeR fitdistrplus knitr mgcv S4Vectors Seurat SingleCellExperiment splatter SummarizedExperiment]; }; - SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; - SCpubr = derive2 { name="SCpubr"; version="2.0.0"; sha256="04nc644vh3wf4cg7dr8hpq6vmrr06f5y09n54x37hhbqrhgyrjmq"; depends=[]; }; + SCpubr = derive2 { name="SCpubr"; version="2.0.2"; sha256="121q8f823rcmn56sz17d2khismvf9hnr3d7dwmjavxwy25bhb76b"; depends=[]; }; SDAR = derive2 { name="SDAR"; version="0.9-55"; sha256="1a1dy4wpzhfaqxv4x8knazh4kjx042rnkmvxf62r6wkgbfvq4r6b"; depends=[grImport2 linbin readxl]; }; SDAResources = derive2 { name="SDAResources"; version="0.1.1"; sha256="13zb8sx7913wpj1jhi5sb0ps8fgzxfvjx75p218n166w54rxjqjs"; depends=[]; }; SDCNway = derive2 { name="SDCNway"; version="1.0.1"; sha256="0zmjc3xh4qvwyrq4ma2k6q08f4ny4iqnl5a640pj17jk8awzwbg0"; depends=[dplyr ggplot2 MASS plyr Rdpack]; }; SDEFSR = derive2 { name="SDEFSR"; version="0.7.22"; sha256="10rxq2y7a9rbzgl5s5fdh93jm4w5kqbyyflw5xfsdwymjj9p4b7m"; depends=[foreign ggplot2 shiny]; }; SDGdetector = derive2 { name="SDGdetector"; version="2.7.3"; sha256="0gm23f0xqw2cgig44d17qw2mfp685bz0dr8wrly4r90w44l121z9"; depends=[dplyr ggplot2 magick magrittr rnaturalearth scales stringr tidyr]; }; - SDLfilter = derive2 { name="SDLfilter"; version="2.3.2"; sha256="197y4kvjn07c3jnx3ayr496h70r87r7f4c7r0swcdkj9ir93dz4g"; depends=[data_table dplyr emmeans geosphere ggmap ggplot2 ggsn gridExtra lubridate maps plotKML pracma sf stars]; }; + SDLfilter = derive2 { name="SDLfilter"; version="2.3.2"; sha256="197y4kvjn07c3jnx3ayr496h70r87r7f4c7r0swcdkj9ir93dz4g"; depends=[data_table dplyr emmeans geosphere ggmap ggplot2 gridExtra lubridate maps pracma sf stars]; }; SDMPlay = derive2 { name="SDMPlay"; version="2.0"; sha256="1qdvpa57p4p3949rjmvvvz41a3hm3jb34dnn8s2pi04rzrjkys0f"; depends=[dismo raster]; }; SDMtune = derive2 { name="SDMtune"; version="1.3.1"; sha256="0zzra0vig3gyz3b0h66fdlkpl2ii939d7k6p7ym5mzhz1vqdaljz"; depends=[cli dismo gbm ggplot2 jsonlite maxnet nnet randomForest Rcpp rlang rstudioapi stringr terra whisker]; }; SDPDmod = derive2 { name="SDPDmod"; version="0.0.3"; sha256="1xasqx6alza9290a97an2dqnsab7x5av8nhv2zczi670443k2pcp"; depends=[Matrix plm RSpectra sf sp spdep]; }; @@ -4854,16 +4872,16 @@ in with self; { SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; }; SGB = derive2 { name="SGB"; version="1.0.1"; sha256="0j48fx9bf2k8k3ykp629jfi1jbs23673nz6rg54rvcrrsl6hb9v3"; depends=[alabama Formula MASS numDeriv]; }; SGL = derive2 { name="SGL"; version="1.3"; sha256="055mx876ydg4kzvcm6rxfkxqz849zgzkzsskvrfgwj9fs1k6ja2v"; depends=[]; }; - SGP = derive2 { name="SGP"; version="2.0-0.0"; sha256="0hkpn5pab9yfvly80fa8dlsz8xk32xrn3f2k1d29l2zfx3hdl9sg"; depends=[Cairo callr colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames rngtools RSQLite sn toOrdinal]; }; - SGPdata = derive2 { name="SGPdata"; version="26.0-0.0"; sha256="1l0d9l25nzmiwmwh0b3cm7c854h56ir0qmb70mi8jawnirmilpp2"; depends=[crayon data_table]; }; + SGP = derive2 { name="SGP"; version="2.1-0.0"; sha256="1msz3ccgmmwwla70gwwichgzjhzym942wa6hw0imr5cgkm4hk0kq"; depends=[Cairo callr colorspace crayon data_table digest doParallel equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames rngtools RSQLite sn svglite toOrdinal]; }; + SGPdata = derive2 { name="SGPdata"; version="27.0-0.0"; sha256="0d6lwxqp9ajzinfg258gaqr2k537v32f1gfn7565vsdrlp9miki3"; depends=[crayon data_table]; }; SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.1.3"; sha256="0b3h6py80a0dmb8f8j4h7a7d0k6ld8l0qr24r8pxxy7dbqbyxh5x"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; SHELF = derive2 { name="SHELF"; version="1.9.0"; sha256="1hqrkikvhsbzfbsy7ng4mal76fv4sr2xjzxf3gf2l7a4cwrf7nj1"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc rmarkdown scales shiny shinyMatrix tidyr]; }; SHT = derive2 { name="SHT"; version="0.1.8"; sha256="03mzjm0hx1i8jz7gam19zyr5w6whwk7a3gfid68h5hj8x60p04wx"; depends=[flare pracma Rcpp RcppArmadillo Rdpack]; }; SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; }; SIAmodules = derive2 { name="SIAmodules"; version="0.1.0"; sha256="1jd72pvkqsciql76crikn3r6nrxgwz8yxlsnla51i1hx5qb8ix73"; depends=[cli difNLR dplyr DT forcats ggplot2 glue lme4 magrittr mirt mirtCAT plotly purrr rlang scales shiny ShinyItemAnalysis shinyjs stringr tibble tidyr yaml]; }; - SIBER = derive2 { name="SIBER"; version="2.1.7"; sha256="1csk9xrs945ylzjy6c32sg1aswjbld30yn8flislvh7hbxj498wp"; depends=[dplyr ggplot2 hdrcde magrittr mnormt purrr rjags spatstat spatstat_geom spatstat_utils tidyr]; }; + SIBER = derive2 { name="SIBER"; version="2.1.9"; sha256="00sr2h0fry102z2jdzsf20jav04gfskdcznzfpkjr4y5h4vv62cb"; depends=[dplyr ggplot2 hdrcde magrittr mnormt purrr rjags spatstat_geom spatstat_utils tidyr]; }; SIBERG = derive2 { name="SIBERG"; version="2.0.3"; sha256="1d8kx5m86qil50d8fhwn7lwaigdnppzk0cwyh4hv54lwffpclnki"; depends=[mclust]; }; - SIDES = derive2 { name="SIDES"; version="1.16"; sha256="0hp0dkdmc5srqjbpvcq2ynwzrfdx06xn4s4a7a3wlssmn4indj69"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; + SIDES = derive2 { name="SIDES"; version="1.18"; sha256="12a87kdbdhqqjjs0k99c1fv0mxi0gjhvq71rm9wvx3wkf0s5p5sv"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; SIGN = derive2 { name="SIGN"; version="0.1.0"; sha256="1ak4zv5a50iknrxpfw1iffn8gv8mc0rz2gk96nzky9zx6li5drhk"; depends=[GSVA survcomp survival]; }; SIHR = derive2 { name="SIHR"; version="2.0.1"; sha256="1pn59ydm4rr8jkqkrfrrip92pic8710qaazc3ccw6pvhvw20n46a"; depends=[CVXR glmnet]; }; SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; }; @@ -4872,6 +4890,7 @@ in with self; { SIMICO = derive2 { name="SIMICO"; version="0.2.0"; sha256="0inyiv2ccz6amdwy94liln0lfs9f12nwq6l0wcqvj42idyjas4ky"; depends=[bindata CompQuadForm fastGHQuad ICSKAT]; }; SIMMS = derive2 { name="SIMMS"; version="1.3.2"; sha256="1pdbgqndnhgyfcwgr5ijnnmn64cwlalwbanb2grkm7h80bpql3lw"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; }; SIMPLE_REGRESSION = derive2 { name="SIMPLE.REGRESSION"; version="0.1.6"; sha256="06kqmvj8pbfgnlib0d6dzg1bh41l6jgwx6b02lgvc6z3nqnpm08w"; depends=[nlme]; }; + SIMle = derive2 { name="SIMle"; version="0.1.0"; sha256="1lwi9dxv93f6fnc3j0lkl7kvf806z5f5s8flxzm2km3j5fl0bp2j"; depends=[ggplot2 Matrix plotly RCurl Sie2nts stringr]; }; SIMplyBee = derive2 { name="SIMplyBee"; version="0.3.0"; sha256="0013sdgyq29w9yah1yafkd0vj9sgw5lkhi5g5fcb59w386nlfhm5"; depends=[AlphaSimR extraDistr R6]; }; SIPDIBGE = derive2 { name="SIPDIBGE"; version="0.1.9"; sha256="0ns4id5nb64m2i32nfhrwwckrr16896xhwkjr73i5d091wgyl0f3"; depends=[cli COVIDIBGE PNADcIBGE png PNSIBGE purrr rstudioapi tibble]; }; SIPETool = derive2 { name="SIPETool"; version="0.1.0"; sha256="1w5sidiajrckps358xr526jfb4d0845p595qhr5i9b9q506n0klk"; depends=[Convolutioner]; }; @@ -4888,7 +4907,7 @@ in with self; { SKAT = derive2 { name="SKAT"; version="2.2.5"; sha256="1x2iyvzc66lmzwjdr8hy5gf3nxc7ik5vhbs40w00d2m7nr3glh8l"; depends=[Matrix RSpectra SPAtest]; }; SKNN = derive2 { name="SKNN"; version="3.1"; sha256="1qqf2l4gvwnfdi0z5bk211nax8pcc09xbc4nw09lq7fy0icd2585"; depends=[]; }; SLBDD = derive2 { name="SLBDD"; version="0.0.4"; sha256="06v2id6rqdn9gcjmnpixdfxgh7wvqx9xpna6lnciqz974k8lblsb"; depends=[cluster corpcor fGarch forecast glmnet gsarima imputeTS MASS Matrix matrixcalc MTS rnn TSclust tsoutliers]; }; - SLCARE = derive2 { name="SLCARE"; version="1.0.0"; sha256="1bbniprjvylc6s7zfc8h8z8bz123k1rs8889q4n31mmy400g8rq3"; depends=[dplyr ggplot2 nnet reReg tidyr]; }; + SLCARE = derive2 { name="SLCARE"; version="1.0.1"; sha256="0gvvfhdf1ihgwgwx4pqqpm8nb2b914qphf3mr26lk741r5rm4ylc"; depends=[dplyr ggplot2 nnet reReg tidyr]; }; SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; }; SLEMI = derive2 { name="SLEMI"; version="1.0.1"; sha256="07bsy0v8grx1l5837jr8mdab08521kxivhwr59q3s0v6f08683yd"; depends=[caret corrplot doParallel e1071 foreach ggplot2 ggthemes gridExtra Hmisc nnet reshape2 stringr]; }; SLFPCA = derive2 { name="SLFPCA"; version="3.0"; sha256="1zib01240ds8q0cafp0dpz70jvjy322hnxg26f16h1lpmn55l0aj"; depends=[fda fdapace psych]; }; @@ -4898,11 +4917,10 @@ in with self; { SLOPE = derive2 { name="SLOPE"; version="0.5.0"; sha256="0v176w2zj32j8988xf0d7myfcr0ahh49gckfav4v73z6ilfmbchy"; depends=[checkmate foreach ggplot2 glmnet Matrix mice Rcpp RcppArmadillo]; }; SLPresElection = derive2 { name="SLPresElection"; version="1.0.0"; sha256="1i813q0m9h964nd61kwnvakci3n1bn06pvq9zvxb2clcch05qyfj"; depends=[]; }; SLTCA = derive2 { name="SLTCA"; version="0.1.0"; sha256="0pq87fbi79srgjblv40yyj3w1dzf115kfidp8gi564l8xf0qilqg"; depends=[geepack Matrix mvtnorm VGAM]; }; - SMARTAR = derive2 { name="SMARTAR"; version="1.1.0"; sha256="0ymhka4pjlqlnpv47abmc76ggijfw83i3jp9mrspnzcnb4d378xm"; depends=[MASS]; }; SMARTbayesR = derive2 { name="SMARTbayesR"; version="2.0.0"; sha256="15s6vzxgbskjvgd91q0vb9qxmmsj391bjbw7s51j879cfqd16xg2"; depends=[LaplacesDemon]; }; SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; }; SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; - SMDIC = derive2 { name="SMDIC"; version="0.1.3"; sha256="050lbrgbvyj5pzjswb85dn94fzzhcq1pb212qap64f20l0nzlway"; depends=[backports e1071 GSVA maftools MASS pheatmap pracma preprocessCore quadprog RColorBrewer samr survival survminer]; }; + SMDIC = derive2 { name="SMDIC"; version="0.1.4"; sha256="1hjc9gxlhx2lhdn4hj6sgff827g34r17nl3i7mg9862s5l9xw516"; depends=[backports e1071 GSVA maftools MASS pheatmap pracma preprocessCore RColorBrewer samr survival survminer]; }; SMFilter = derive2 { name="SMFilter"; version="1.0.3"; sha256="1islyqg9w08mvs2kf0ddmdlp885arzp0jy7mqvixjm4ayi5zfrri"; depends=[]; }; SMITIDstruct = derive2 { name="SMITIDstruct"; version="0.0.5"; sha256="12ffxj96w3pi18l0scz5sd3dl37vd4vg2wcfykaxdhf8z142ha3k"; depends=[Biostrings ggplot2 sf]; }; SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.9"; sha256="143zz49rx7106v0a46dn1jssqxp60djf5rycfy38167zz7f9wx3y"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; }; @@ -4915,7 +4933,7 @@ in with self; { SMNCensReg = derive2 { name="SMNCensReg"; version="3.1"; sha256="10nik348b6vcmwhj5scjvkjwi86fih3bqkgpv7qxxa8jx45ds52n"; depends=[Matrix PerformanceAnalytics]; }; SMOTEWB = derive2 { name="SMOTEWB"; version="1.0.1"; sha256="0pgn4v08nf74v9p79901268sj97gl5ml0723hs948m9ajkdf1d2x"; depends=[FNN RANN Rfast rpart]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; }; - SMR = derive2 { name="SMR"; version="2.0.2"; sha256="1lds6sp9szlrzkfxp3q24g4y4hd75qp4439hrn2k4hzsz84s7g3y"; depends=[]; }; + SMR = derive2 { name="SMR"; version="2.1.0"; sha256="0gg3al3qpcvw3k5zm4j36kbd2ar7pqgxxx0jngcg76j1sjhz9g9m"; depends=[Rcpp]; }; SMUT = derive2 { name="SMUT"; version="1.1"; sha256="029ishj3jfq957bbkb2xw4jj0qpm4dasb8vpdik43pvd670mgq5s"; depends=[MASS Rcpp RcppEigen SKAT]; }; SMVar = derive2 { name="SMVar"; version="1.3.4"; sha256="1mh15iggzbd7ip15pkwzmiy8p712cvvns5pgdyw1pvkcvbvkxsma"; depends=[]; }; SNFtool = derive2 { name="SNFtool"; version="2.3.1"; sha256="05hz230aq5wbzhknxzr4iqv3nqjhbpf66n6bp1rc5h2jgz2yfbwq"; depends=[alluvial ExPosition]; }; @@ -4923,17 +4941,18 @@ in with self; { SNPassoc = derive2 { name="SNPassoc"; version="2.1-0"; sha256="0ffsxlvdpd77sav5jjzv6vx5vwhh5gmw55ndzvf4299nnx5l2xka"; depends=[ggplot2 haplo_stats mvtnorm plyr poisbinom survival tidyr]; }; SNPfiltR = derive2 { name="SNPfiltR"; version="1.0.1"; sha256="01bm848v0jvf8v568ls8iglz7cjcikriaa7vpavz1smkkm1bs71d"; depends=[adegenet cluster ggplot2 ggridges gridExtra Rtsne vcfR]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; + SNSFdatasets = derive2 { name="SNSFdatasets"; version="0.1.0"; sha256="0wqx2xxgz97z9vlxkqla1zsmxxdcpc9byzbd0wjgfkvq0mr0vfaf"; depends=[]; }; SNSchart = derive2 { name="SNSchart"; version="1.4.0"; sha256="18rpg2zkqa6bxnbq3s0hlsg4wizz6iw3vckf5z66q3awxqycabg9"; depends=[MASS]; }; SNSeg = derive2 { name="SNSeg"; version="1.0.0"; sha256="00mdr1qzgy8ggdccwll1jgqh74k1ljg7r488a44yzy5069478cd3"; depends=[evd mvtnorm Rcpp truncnorm]; }; SNSequate = derive2 { name="SNSequate"; version="1.3-4"; sha256="122x0l6lkih99n9ay3mj76ssk5h2cqh477xpizqvp3b6nkj8wkf3"; depends=[emdbook knitr magic plyr progress statmod]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; - SOAs = derive2 { name="SOAs"; version="1.3"; sha256="056dapz5l0f8la1zlbqwxi7ck4x2majyfif88fixjj6zh86a2185"; depends=[combinat conf_design DoE_base FrF2 igraph iterators itertools lhs]; }; + SOAs = derive2 { name="SOAs"; version="1.4"; sha256="1a3gwqyhw9fzb06xmyapxw0xyff1arb4sfsg3id7blkgxsmahd75"; depends=[combinat conf_design DoE_base FrF2 igraph lhs partitions sfsmisc]; }; SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; }; - SOHPIE = derive2 { name="SOHPIE"; version="1.0.5"; sha256="0grwzl4nn5rcir2q13qdd30q4l670f6gz3lqj8qh41pjx9lfchvi"; depends=[dplyr fdrtool gtools robustbase]; }; + SOHPIE = derive2 { name="SOHPIE"; version="1.0.6"; sha256="034q69zc6wfcxbaj8l095xcwjlh1iq0rgvsvd2czahxzls2nqsn7"; depends=[dplyr fdrtool gtools robustbase]; }; SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; }; SOMEnv = derive2 { name="SOMEnv"; version="1.1.2"; sha256="03g1c9ip0bmc5zhnzami3f525m9ic6v5gdhaxc8s7f1nxjf2fcdy"; depends=[colourpicker dplyr kohonen openair plyr rlist shiny shinycssloaders shinycustomloader]; }; SOMbrero = derive2 { name="SOMbrero"; version="1.4-1"; sha256="0b9w8xr067hz2lzvxn7xz3llzhyqynskh08rsx7d73gnm56kdcp2"; depends=[ggplot2 ggwordcloud igraph interp markdown metR scatterplot3d shiny]; }; - SOP = derive2 { name="SOP"; version="1.0"; sha256="1c9haq0ds90rwhvmdicaxhzf7vz2m343491sw9qw7w7fbs4fn9fp"; depends=[MASS]; }; + SOP = derive2 { name="SOP"; version="1.0-1"; sha256="1c2mgdsd0ah0xcxzd8pncwvvh4ilp04dfblsjvw51vnm7lc2akxq"; depends=[MASS]; }; SOPC = derive2 { name="SOPC"; version="0.1.0"; sha256="01gsszas6prl3gr2x36p3yqdjph5d0wzzbbxwq52gif8jkfmhzmr"; depends=[elasticnet magrittr]; }; SOPIE = derive2 { name="SOPIE"; version="1.6"; sha256="1q6991l1wldywv685dv1pkd8ma8jlx4inqr6p1fw1xr7ymm8b1q2"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; }; @@ -4949,11 +4968,11 @@ in with self; { SPCAvRP = derive2 { name="SPCAvRP"; version="0.4"; sha256="10bvr4lqnim40fihq495a4fy4f33pvfd7gsaqjj9bh6gy0z8y4mi"; depends=[MASS]; }; SPCDAnalyze = derive2 { name="SPCDAnalyze"; version="0.1.0"; sha256="0zaxlc4dw678s0v22ghv7mc4vqsgkcnmbxh7065w6qj9vm7pg5kz"; depends=[lme4 nlme plyr]; }; SPCompute = derive2 { name="SPCompute"; version="1.0.3"; sha256="15jjx5ryxv6cjiz144gsi69pgba5dvxavdv8glqykwfz6ch42lq0"; depends=[Matrix]; }; - SPECIES = derive2 { name="SPECIES"; version="1.1.3"; sha256="0qh8vi522lyix61p0z1h3fja9x0lylrvg41bsv89228hia0vz3lq"; depends=[]; }; + SPECIES = derive2 { name="SPECIES"; version="1.1.4"; sha256="18x779wh9g4fskggkiz6ggvgis4wipf1nf6bygc1v5n2yvni4fsw"; depends=[]; }; SPECK = derive2 { name="SPECK"; version="0.1.1"; sha256="0vpnm3gkw77wh2d2znwnyz1fz1lmj0n0zyb8jyzbpjm6rxwhlhh8"; depends=[Ckmeans_1d_dp magrittr rsvd Seurat]; }; - SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.9"; sha256="0z27h9yl5lyayqa1wqj700kxrgyi1h13bqm3bbq8zml91dyq209c"; depends=[]; }; + SPEDInstabR = derive2 { name="SPEDInstabR"; version="2.0"; sha256="1mzl55ji2w3l33mwdzhmlkfj4dlpqxfzad1pyqd1c5q2xxw0hhbf"; depends=[]; }; SPEI = derive2 { name="SPEI"; version="1.8.1"; sha256="1xn7hdj5h68mvkb81pmwha665c6k57pa7k59bb84zhvxgdnczksn"; depends=[checkmate ggplot2 lmom lmomco lubridate reshape TLMoments zoo]; }; - SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; }; + SPEV = derive2 { name="SPEV"; version="1.0.0"; sha256="0gvbxmc0y8x2wf2lfgncwjhqy8gp8lk3mwmbcbhj8by0krglwipb"; depends=[]; }; SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; }; SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; }; SPLICE = derive2 { name="SPLICE"; version="1.1.1"; sha256="0nsh89qjp9gl0pgsvvink9bf3lgrkdvwyyyplb45lh47gh8f53rj"; depends=[lifecycle SynthETIC zoo]; }; @@ -4962,10 +4981,9 @@ in with self; { SPOTMisc = derive2 { name="SPOTMisc"; version="1.19.52"; sha256="0l3css9hw75r76g2iykf2iih8lqnpzqqv2l734zix3agjr5cmmlh"; depends=[callr dplyr GGally ggplot2 keras magrittr Metrics mlr plotly RColorBrewer reticulate rlang rpart_plot rsample sensitivity smoof SPOT tensorflow tfdatasets]; }; SPOUSE = derive2 { name="SPOUSE"; version="0.1.0"; sha256="10p3x3862dss779jfxw1kxhs3g94zpjpvnlww1gsw1c5hxzvmqb5"; depends=[]; }; SPPcomb = derive2 { name="SPPcomb"; version="0.1"; sha256="1kn3pi3c7g7waill1grm382ixbvnc7z8pbgzqd94hxqzgkivhid7"; depends=[nleqslv]; }; - SPQR = derive2 { name="SPQR"; version="0.1.0"; sha256="1hsz9pbn428vbiwq5chs9j9hpsrsk1aqzjhgqwc5dybqi4x4qb8v"; depends=[coro ggplot2 interp loo progress progressr RColorBrewer Rcpp RcppArmadillo splines2 torch yaImpute]; }; SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; }; SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; - SPSP = derive2 { name="SPSP"; version="0.1.1"; sha256="0bzlgjijwp5y6lk9hjqc2p8b1i6mp8jd7j7gsl47whc3lavr1nn8"; depends=[glmnet lars Rcpp]; }; + SPSP = derive2 { name="SPSP"; version="0.2.0"; sha256="0gf5cw2fnssl198ccpvnma4bcqi33whl6ihc1s9i2lw6xg4qvb33"; depends=[glmnet lars Matrix ncvreg Rcpp]; }; SPUTNIK = derive2 { name="SPUTNIK"; version="1.4.1"; sha256="0446qh43q09l7kvcgsp4gkp7p9v9448xx0xwngxgghnnmwh8fa4p"; depends=[doSNOW e1071 edgeR foreach ggplot2 imager infotheo irlba reshape spatstat_explore spatstat_geom viridis]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPlit = derive2 { name="SPlit"; version="1.2"; sha256="0n9458sj5sw4k9qd11gvmqmjf9hy1hh0bwx1jzm6r901l1wbp7xi"; depends=[Rcpp RcppArmadillo]; }; @@ -4974,7 +4992,7 @@ in with self; { SQI = derive2 { name="SQI"; version="0.1.0"; sha256="1mb1vzc8r52zr1rp4dakmsdayv47pqsbissljskl9c0nkhlah1kq"; depends=[dplyr FactoMineR matrixStats olsrr readxl]; }; SQL = derive2 { name="SQL"; version="0.1.1"; sha256="1l949crb4fz13yxbr9gag7lfqs9ak3ab3i25g20mjrz6iix99hrd"; depends=[arrow DBI duckdb stringr]; }; SQLove = derive2 { name="SQLove"; version="0.0.2"; sha256="0r0jl56a75n6mqfaplihjrr5v4rfnc2z548phli3y2vhvzd74yb7"; depends=[DBI readr RJDBC]; }; - SQMtools = derive2 { name="SQMtools"; version="1.6.2"; sha256="1qlbgc9mqx111p4dqld1zlvczi54nhl1yghlrchy9kr984a697x8"; depends=[data_table ggplot2 pathview reshape2]; }; + SQMtools = derive2 { name="SQMtools"; version="1.6.3"; sha256="0c725f0ksafxhgwhdb44h72gcs352afxi0gb843snnqwn5jmmsgh"; depends=[data_table ggplot2 pathview reshape2]; }; SQN = derive2 { name="SQN"; version="1.0.6"; sha256="1p7h4id8xz6dh5nn2935pj5b82mcmpmm8mj32l5i4wgwnh1amphp"; depends=[mclust nor1mix]; }; SQRL = derive2 { name="SQRL"; version="1.0.1"; sha256="0xn4dywgaxszjinb9ypllmj7s04rx1l7rrir30vd25kj510mramm"; depends=[RODBC]; }; SQUAREM = derive2 { name="SQUAREM"; version="2021.1"; sha256="0n1s32l9p4vdm3h5q6g43s0qbpzry08difsh0yay80wrla6f3rb6"; depends=[]; }; @@ -4984,14 +5002,14 @@ in with self; { SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; SSBtools = derive2 { name="SSBtools"; version="1.4.8"; sha256="166799mvgpjzkfcjk205p6xaxh71lngby164n4dhzggsx4gzv3wi"; depends=[MASS Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.29"; sha256="02ia7p28pi9x3qmmyhidjh04rmnk99w2xvxzm23l19cwgk35s4ip"; depends=[Kendall MAd MASS metafor psych SingleCaseES TTR]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.31"; sha256="1l66n5x7m90jw1r9cspb7i9k3wbc1xad4wc027bss40k9jwgqypw"; depends=[Kendall MAd MASS metafor psych SingleCaseES TTR]; }; SSGL = derive2 { name="SSGL"; version="1.0"; sha256="1f65sc713bzi6nq7ay9jnz92bxh7lrzj6aj77dczkafac2vgmba2"; depends=[grpreg MASS pracma]; }; SSHAARP = derive2 { name="SSHAARP"; version="1.1.0"; sha256="0x8dinhhfk4q1cck7ms78f4k23430c4wyvlh2qclq0c83acjj4y9"; depends=[BIGDAWG data_table DescTools dplyr filesstrings gmt gtools stringr]; }; + SSIMmap = derive2 { name="SSIMmap"; version="0.1.1"; sha256="1ydwwxisb8wwxb2n5xvz6474n4rwl57xpi4fa0b6jggkzxx113ig"; depends=[dplyr ggplot2 knitr scales sf terra]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; SSLR = derive2 { name="SSLR"; version="0.9.3.3"; sha256="0fv1jqri3gpzcfs429pgx4hjqmjrglb4g7nfqdihd2hjmq9k4sql"; depends=[conclust dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; - SSN = derive2 { name="SSN"; version="1.1.17"; sha256="10jkpsccp8bm9ksyi6zbzp4p93g88kx68qjky9bkk3bvszfs55ni"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; - SSNbayes = derive2 { name="SSNbayes"; version="0.0.2"; sha256="0y5n9c9a6kd53ijai18arpsm09jp3v3f31zgg22y0pz6i3y24hm3"; depends=[dplyr plyr rstan SSN]; }; + SSNbayes = derive2 { name="SSNbayes"; version="0.0.2"; sha256="0y5n9c9a6kd53ijai18arpsm09jp3v3f31zgg22y0pz6i3y24hm3"; depends=[dplyr plyr rstan]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; SSP = derive2 { name="SSP"; version="1.0.1"; sha256="0ccg81rsjki1fcqvj6lgmmmy5yw1gxy8khajl1i80qyi4v7ny9hk"; depends=[ggplot2 sampling vegan]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; @@ -5002,7 +5020,7 @@ in with self; { SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; }; SSsimple = derive2 { name="SSsimple"; version="0.6.6"; sha256="1nhwr9kvlx899wsgzp47ykq3awp7p54zcvsdmjjh9ch4qcm9q2sm"; depends=[mvtnorm]; }; STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; }; - STAREG = derive2 { name="STAREG"; version="1.0.2"; sha256="11dqvj94fczpzdy4wv9nhfz7ix02jx8bf5bfpdda2jq65klsd092"; depends=[qvalue Rcpp RcppArmadillo]; }; + STAREG = derive2 { name="STAREG"; version="1.0.3"; sha256="1skxwk817p4r7svnfrgv8bmkaz06ndqfxnypp9wdmndrgivrmg54"; depends=[qvalue Rcpp RcppArmadillo]; }; STARTS = derive2 { name="STARTS"; version="1.3-8"; sha256="17zyi8hdaxaifk9nan5fcl76b0r8gwgxam6ksnc246kw8lay16a2"; depends=[CDM LAM Rcpp RcppArmadillo sirt]; }; STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; }; STAT = derive2 { name="STAT"; version="0.1.0"; sha256="0x0qpnlcb52k3x8jwiljsamx81hdcjagfpapv63z054bvig0jvgv"; depends=[corrgram dplyr Hmisc psych psycho rmarkdown rpivotTable shiny]; }; @@ -5011,9 +5029,6 @@ in with self; { STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; STFTS = derive2 { name="STFTS"; version="0.1.0"; sha256="1cv2gc9334fbsmmwhqskfssaql6kr9i680p2zkwhm5735dr1h49h"; depends=[e1071]; }; STGS = derive2 { name="STGS"; version="0.1.0"; sha256="0xfwd0jsg3glbr3c5l5yyri4is5kg77ivgr6qlzaxp6p8q7yfzqf"; depends=[brnn glmnet kernlab randomForest rrBLUP]; }; - STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; - STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; }; - STMotif = derive2 { name="STMotif"; version="2.0.1"; sha256="07725wdm65lxmmivdipxd07yqi3syy7dl10shn4x60ahs0il91nw"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; }; STMr = derive2 { name="STMr"; version="0.1.5"; sha256="1wz88y1fr2z7jwmni063j4rk1smbpbmgz6aw9cgfivz7gsps879n"; depends=[dplyr ggfittext ggplot2 magrittr nlme quantreg tidyr]; }; STOPES = derive2 { name="STOPES"; version="0.2"; sha256="0dlr9hasily74wlwb44qadql9qdii326xhdnam1anszsvijzs4dk"; depends=[changepoint cvTools glmnet MASS]; }; STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; }; @@ -5025,30 +5040,28 @@ in with self; { SUNGEO = derive2 { name="SUNGEO"; version="1.1.1"; sha256="1sy9kw3nr69jf33034kcnv418lqyz6sfrd01646i7dfsm64aydp2"; depends=[automap cartogram data_table dplyr httr jsonlite measurements packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep stringr terra]; }; SUSY = derive2 { name="SUSY"; version="0.1.0"; sha256="0l0mxvas80d9n3vv9bqxw2dk8q1ikwg616hraprcs70aabh7717w"; depends=[]; }; SVDNF = derive2 { name="SVDNF"; version="0.1.8"; sha256="1dps1qjr3a9wwzmi6vdr515lhvqligjhm7qdh7frii1y9lc4hzc2"; depends=[Rcpp]; }; - SVMMaj = derive2 { name="SVMMaj"; version="0.2.9.1"; sha256="08f9sndcjgmmxl3zlbq86d8z0dbciv0ab1v9zx80svka7ckfv9z3"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; SWIM = derive2 { name="SWIM"; version="1.0.0"; sha256="1pfrwxn4rha7a68b82lq18x6acyhjy9d8nn2hdwd9hhf576vkvhg"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; SWMPr = derive2 { name="SWMPr"; version="2.5.0"; sha256="1p7gzyzdm3fiam76dwl2sb3drphifakx2mj5jz1v3gp57xyhihiz"; depends=[data_table dplyr ggplot2 gridExtra httr lattice oce openair RColorBrewer reshape2 suncalc tictoc tidyr XML zoo]; }; SWMPrExtension = derive2 { name="SWMPrExtension"; version="2.2.4.2"; sha256="0vvmpghwrd66y92d9mb93i38siyd0jx6vlafbir1inkmpcpa62a0"; depends=[broom dplyr EnvStats flextable ggimage ggplot2 ggthemes lubridate magrittr officer purrr RColorBrewer rlang scales sf SWMPr tidyr tidyselect]; }; - SWTools = derive2 { name="SWTools"; version="1.0"; sha256="0mdkbzph4q989wi66xawkxca0zvpnnisk5wxbb91ylb05r84qpzf"; depends=[dplyr forcats ggmap ggplot2 httr hydroTSM jsonlite lubridate magrittr readr reshape2 rlang rmarkdown segmented sf sp stringr tibble tidyr zoo]; }; + SWTools = derive2 { name="SWTools"; version="1.0"; sha256="0mdkbzph4q989wi66xawkxca0zvpnnisk5wxbb91ylb05r84qpzf"; depends=[dplyr forcats ggmap ggplot2 httr jsonlite lubridate magrittr readr reshape2 rlang rmarkdown segmented sf sp stringr tibble tidyr zoo]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; SafeVote = derive2 { name="SafeVote"; version="1.0.0"; sha256="1shv5l0grx3bsb0md5ann5dyh18w9i4q2nsar0qmd6cgl87ml4qn"; depends=[data_table dplyr fields forcats formattable ggplot2 knitr stringr]; }; SailoR = derive2 { name="SailoR"; version="1.2"; sha256="04qrnps40845ypapf37jg1c1g05nii6iwk4fv1x5xyca963hl5ii"; depends=[]; }; - Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.3"; sha256="0s8svsgwh79rcwnskz0my2xqasyp370hn7aixqm9m6zqlvf42zc2"; depends=[]; }; - SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.2"; sha256="1djn143kq0qv3qasmrh6mwvaq0f6pqmz3yl5dbp19xfabl4829lf"; depends=[]; }; - SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.1"; sha256="0v0da7lgl9l73ji164qpm8dmysjhj8fx4ywnrm08nb46xgvd77pp"; depends=[]; }; + SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.2.3"; sha256="1j5j5w78jp4rc7mdxr0w5qvzgcpxzj2yn4gmbnviy656sj1gj6by"; depends=[]; }; + SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.1.3"; sha256="1gjmzh0saba1akv2yg47y034j7cwr0g8h9w38cqcxmcclxvnvg27"; depends=[]; }; SamplingBigData = derive2 { name="SamplingBigData"; version="1.0.0"; sha256="0khrh7vfqqzpfp16x0ic5ml854wr2fj28cx95s6c0pz91hzlxkns"; depends=[]; }; SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-4"; sha256="093x9rfilxhgf75p0rfsvglz0sg3imhdm15azxnjiblamyxbhfjm"; depends=[doParallel glue memoise pbapply SamplingBigData]; }; SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; }; SangerTools = derive2 { name="SangerTools"; version="1.0.2"; sha256="0ijxfa1h3mx86jk1s27qp7l4sz2d7i7llkwjvgnih9zjk0ybrdzw"; depends=[DBI dplyr ggplot2 ggtext ggthemes janitor magrittr odbc readr readxl rlang scales tibble]; }; ScaleSpikeSlab = derive2 { name="ScaleSpikeSlab"; version="1.0"; sha256="11n3pi15x77by0ikiawhnvlky6hp6qzwmsmp4l2hjng1469y7gg6"; depends=[Rcpp RcppEigen TruncatedNormal]; }; Scalelink = derive2 { name="Scalelink"; version="1.0"; sha256="0likfjw5999zd0kv1ykby78bl0x3xgh0v1yjssk7fnw1ghkxgdib"; depends=[Rcpp RcppParallel]; }; - ScatterDensity = derive2 { name="ScatterDensity"; version="0.0.3"; sha256="022l266nx2y8lwlaq0kjj2khy1kqy764xll2c3v8qrf9cc0pwpzl"; depends=[pracma Rcpp RcppArmadillo]; }; + ScatterDensity = derive2 { name="ScatterDensity"; version="0.0.4"; sha256="126jvjgfja6vyjadl3a7ahpb8z99hazijai4ymvnr1g1wcnx1z19"; depends=[pracma Rcpp RcppArmadillo]; }; SciViews = derive2 { name="SciViews"; version="0.9-13.1"; sha256="0wm4vnjh65jxyg82m8l08kanl414qiaz0cc6srshb8sdx2sixkfi"; depends=[ellipse]; }; ScoreEB = derive2 { name="ScoreEB"; version="0.1.1"; sha256="0lvdywkw2g0xdgf7zj39h1903rd0jg2lzgqq7cfni11pniv6265n"; depends=[data_table]; }; ScorePlus = derive2 { name="ScorePlus"; version="0.1"; sha256="07hmrx1k256i4cs605j5bpg6brzypryxlcnjkzqak8cw4f26k24q"; depends=[combinat igraph igraphdata limSolve RSpectra]; }; - ScottKnott = derive2 { name="ScottKnott"; version="1.3-1"; sha256="1rribh8j84kgnljqr9jidiv5qdk0pqdks6drbicv1j94dz4mkldw"; depends=[doBy xtable]; }; + ScottKnott = derive2 { name="ScottKnott"; version="1.3-2"; sha256="01cgzqwfabn31s3y1dk6d8z1s5qbsjim191d2yv3zq3vdc4drpma"; depends=[doBy xtable]; }; ScottKnottESD = derive2 { name="ScottKnottESD"; version="2.0.3"; sha256="0gjpjd8ljnp3v4fc72vhwjgscfw9vfivx710yg683pp30z0sv9nf"; depends=[car effsize forecast reshape2]; }; ScreeNOT = derive2 { name="ScreeNOT"; version="0.1.0"; sha256="1vgrfwsl096w2az3dwq7pvfsjdvsmzrrkkkzsnfxld018raf4fvg"; depends=[]; }; ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; @@ -5056,23 +5069,15 @@ in with self; { SeBR = derive2 { name="SeBR"; version="1.0.0"; sha256="0xk002y4nim5f3mcfbl3zk484cf2s5mvg1paj2jg4f5v60vr4pwp"; depends=[fields GpGp MASS quantreg spikeSlabGAM statmod]; }; SearchTrees = derive2 { name="SearchTrees"; version="0.5.5"; sha256="1n0y91y1l657g61klbcjz82ddj2csdpnralc3rbk1hbwr4nxk069"; depends=[]; }; SecDim = derive2 { name="SecDim"; version="3.2"; sha256="04l4qpw409dj5i494vmf7vmksis6910599gh259nbyv0pdfw5svr"; depends=[geosphere RcppArmadillo]; }; - SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; }; SeedCalc = derive2 { name="SeedCalc"; version="1.0.0"; sha256="1p8ncf3l2zhpbbblpjagg8cg9gf7f2izdcgc48n1aq4f7bmjbqgk"; depends=[]; }; - SeedMatchR = derive2 { name="SeedMatchR"; version="1.0.1"; sha256="0azrlma0p1g342yqyxb1wj9shc0sy2p0ml555h554apasxf020v6"; depends=[AnnotationHub Biostrings cowplot DESeq2 dplyr GenomeInfoDb GenomicFeatures ggmsa ggplot2 lifecycle msa stringr testit twosamples]; }; - SeerMapper = derive2 { name="SeerMapper"; version="1.2.5"; sha256="1sjg0a5mvyvgzwpmbr3avm76cb9a45qdwvic665v4hhhsmf2x8xk"; depends=[maptools RColorBrewer rgdal SeerMapper2010East SeerMapper2010Regs SeerMapper2010West SeerMapperEast SeerMapperRegs SeerMapperWest sp stringr]; }; - SeerMapper2010East = derive2 { name="SeerMapper2010East"; version="1.2.5"; sha256="0v3cslshg5qjmjnxw4xprdnqwdwnyamyljdyi9nwixjc2nm9inbx"; depends=[sp]; }; - SeerMapper2010Regs = derive2 { name="SeerMapper2010Regs"; version="1.2.5"; sha256="1v8vnvkmh3wqinanm5aap3vw36zriqh8xw2im2ncw0rdhf9ccbl5"; depends=[sp]; }; - SeerMapper2010West = derive2 { name="SeerMapper2010West"; version="1.2.5"; sha256="1vc1j9hh9yr69dz9fnqfh17xrad3f16kcb63sybdkg02ss5y5ppr"; depends=[sp]; }; - SeerMapperEast = derive2 { name="SeerMapperEast"; version="1.2.5"; sha256="1jfllxnqiwrnp416xmn7rzmizwj26skadpj9jvxkv70x053ijmjn"; depends=[sp]; }; - SeerMapperRegs = derive2 { name="SeerMapperRegs"; version="1.2.5"; sha256="1di7l6804gi2rsdbwb9naymqzidb8bqf62a6w32jfkl67175cg0c"; depends=[sp]; }; - SeerMapperWest = derive2 { name="SeerMapperWest"; version="1.2.5"; sha256="1v5ql5z1sv13lgmla03nzpdxzbxqw73zc3az6xf75vqb042c4wxq"; depends=[sp]; }; SegCorr = derive2 { name="SegCorr"; version="1.2"; sha256="1g4bwfs539jf7ckzjyindi3v1av7vd38yz16m7cb20qqa0a33kbj"; depends=[jointseg]; }; - SegEnvIneq = derive2 { name="SegEnvIneq"; version="1.0"; sha256="1xl9q47n4vvmr9nr5yairdq9r8mgms44wh6b4l9sbar2kx9ybwj3"; depends=[OasisR outliers rgdal rgeos spdep]; }; + SegEnvIneq = derive2 { name="SegEnvIneq"; version="1.1"; sha256="0vkjkg2x9fziymhv3j3m0n23vm3g7jq4w12jgg5c37k6gyp1sqqj"; depends=[OasisR outliers sf spdep]; }; Sejong = derive2 { name="Sejong"; version="0.01"; sha256="0j10szvdn32b7xnvhcbj89xma64bq62936b3r18n1limjpismfws"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="1.0.2"; sha256="03q5pdgxdfx944zwpl2w7gzf23va4flbd8in3g03980smq0ai2c1"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; SelectBoost = derive2 { name="SelectBoost"; version="2.2.2"; sha256="189hdr50sikg6pr9x9amjmgg9z0c95j65bddmifsy7zvjhllzjiy"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; SelectionBias = derive2 { name="SelectionBias"; version="1.0.0"; sha256="1lqpa5yyxipnx31r0gmja59dk85gmpg9j1rzpc9vh0lq3l87878b"; depends=[arm]; }; + SemNeT = derive2 { name="SemNeT"; version="1.4.4"; sha256="0240r7vsr39s53756gmg3s70cv0qaipxaw6b2bgr8fipf11dw15m"; depends=[broom car dplyr effects ggplot2 igraph magrittr pbapply philentropy plyr qgraph scales]; }; SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.3.4"; sha256="1fll6i4bz2z07h23z5m3x8hqw5rkianh0w6v8gnnkjqlrnacpfp9"; depends=[easycsv editData foreign miniUI R_matlab readxl rstudioapi searcher SemNetDictionaries shiny stringdist stringi]; }; SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.2.0"; sha256="1yhhva79hhj1imzw0n8wkyrb6pmxcqs7kq9czs392xzc6lqk9xr2"; depends=[easycsv knitr]; }; Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; }; @@ -5087,7 +5092,7 @@ in with self; { SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.2"; sha256="04gakb7pc88lygdixxxjwj0p6ylwq5jsy6zidyh5w37ch83m3hj6"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.26"; sha256="0wa6wq8jnk0h5hmx03f8h8pa1g4dw0f3lxrsi93mgz740xd559yf"; depends=[AlgDesign cluster FactoMineR ggplot2 ggrepel gtools KernSmooth reshape2]; }; SensusR = derive2 { name="SensusR"; version="2.3.1"; sha256="1x1a8vnpn6h7905wa4lvf7vibkl2dsa4yyg2sg4bbi719lcki2q0"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; }; - SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-4"; sha256="04ibqyh18rzj1rgrpw3i1zzr35rvl7z7dzbp8w1lzg9s40yf3ij1"; depends=[ggplot2 glmnet moments ngramrr qdapDictionaries spikeslab stringdist tm]; }; + SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-5"; sha256="184nzmi17s86lvxa87ddq7vkmq6cmr7kss8bzz1ncp1nfcm2cczw"; depends=[ggplot2 glmnet moments ngramrr qdapDictionaries spikeslab stringdist tm]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; SeqDetect = derive2 { name="SeqDetect"; version="1.0.7"; sha256="054b5v0jzk9pj9hrxk31kvcdm789lx8gzh70ivskixz57kajmiss"; depends=[dplyr eventdataR igraph Rcpp]; }; SeqExpMatch = derive2 { name="SeqExpMatch"; version="0.1.0"; sha256="0i4hsmkapsavhqx99zk9d2qajaqh8kchdf8qy3rbdwgchiiwzybv"; depends=[checkmate doParallel R6]; }; @@ -5095,18 +5100,17 @@ in with self; { SeqKat = derive2 { name="SeqKat"; version="0.0.8"; sha256="09b5zrp41241ha5q8bxll9n12sn11hsbv46g2ld1lqsy2razivr4"; depends=[doParallel foreach Rcpp]; }; SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SeqNet = derive2 { name="SeqNet"; version="1.1.3"; sha256="1ix3c249q758si6670hqa56g1snqqwqdrwshfwajvynl7k2zqzmv"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr Rcpp Rdpack rlang tibble]; }; - SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="1.0.0"; sha256="1aa89qnx43ia6lkaaz26jcrx8i9yxjsx5dpz8rpa0hv1h12g5ani"; depends=[Rcpp RcppProgress selectiveInference]; }; + SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="1.0.1"; sha256="0kxcz2xqf8hiz7j0hb20ikl2mwjpplbmsis5906f7lqvzg85v97x"; depends=[Rcpp RcppProgress selectiveInference]; }; Sequential = derive2 { name="Sequential"; version="4.3"; sha256="00901m3c5jnf58p394ndbkjiagqfzcnn25k4279df7wyahfc46gl"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; SetMethods = derive2 { name="SetMethods"; version="4.0"; sha256="0pzxcqbc7jnsxhv902qw2q9rcqskib11z36d5nav9wny6bj2z658"; depends=[admisc betareg fmsb ggplot2 ggrepel QCA scatterplot3d stargazer]; }; - SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="4.3.0.1"; sha256="04lbwk8mcv7gsi70sij264mz80frx1pr60ihv9dqg63sgr234ax4"; depends=[cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix matrixStats miniUI patchwork pbapply plotly png progressr RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR Rtsne scales scattermore sctransform SeuratObject shiny spatstat_explore spatstat_geom tibble uwot]; }; - SeuratObject = derive2 { name="SeuratObject"; version="4.1.3"; sha256="1lw6v5mwq0sngjr33j99r5h42kaxlbq271a51xzkcnhnyra2fpaq"; depends=[future future_apply Matrix progressr Rcpp RcppEigen rlang sp]; }; - ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; - ShapePattern = derive2 { name="ShapePattern"; version="3.0.0"; sha256="1j0ialpnqdaj5r0qrf1nwrmk78cscfs1ba961sl60fb9sd38115c"; depends=[igraph landscapemetrics raster sp terra]; }; + Seurat = derive2 { name="Seurat"; version="4.4.0"; sha256="1pdlvjh5xs1fyj2zic98sfz9zazbb45qywfqnhfzqb34jyaxy5qg"; depends=[cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba jsonlite KernSmooth leiden lmtest MASS Matrix matrixStats miniUI patchwork pbapply plotly png progressr purrr RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR Rtsne scales scattermore sctransform SeuratObject shiny spatstat_explore spatstat_geom tibble uwot]; }; + SeuratObject = derive2 { name="SeuratObject"; version="4.1.4"; sha256="1vqhad76hnr0l47klg56fniah4cvpzbkkl0j1cn9cp3rv6d69rvl"; depends=[future future_apply Matrix progressr Rcpp RcppEigen rlang sp]; }; + ShapeChange = derive2 { name="ShapeChange"; version="1.5"; sha256="0m9v5ykw8gfvyr9v149bs8sqjf9712yhvlg2rin6b5f1ww3mzl37"; depends=[coneproj quadprog]; }; + ShapePattern = derive2 { name="ShapePattern"; version="3.0.1"; sha256="1vlzvfns6grxc2g0d4slsckg6lzzr0k38brncf2akb41jkczbyak"; depends=[igraph landscapemetrics raster sp terra]; }; ShapeRotator = derive2 { name="ShapeRotator"; version="0.1.0"; sha256="1pg2m1wh7fbchm8gp3mngfnf5g2rbhvzim1bpzqyvxqpx6ynicsa"; depends=[plot3D]; }; - ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.6"; sha256="1nifrypbg4g393dgz20jy3c53ppjvmx75c4m1bqvi3m0z4zzgmv3"; depends=[coneproj raster]; }; + ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.7"; sha256="096v3i0g4877zp883vi5n9cijbjdqga3dbinjlm5ws4j2zlghvb1"; depends=[coneproj raster]; }; ShapleyOutlier = derive2 { name="ShapleyOutlier"; version="0.1.1"; sha256="1qdb872cppq1dh33l75pxw4l7isp8nlsinbipygm989f1sf24xkh"; depends=[dplyr egg forcats ggplot2 gridExtra magrittr RColorBrewer Rdpack robustbase tibble tidyr]; }; ShapleyValue = derive2 { name="ShapleyValue"; version="0.2.0"; sha256="05ziyvvd81l0lx572in9snndnjdq8y4wkd8bxqs0y979l49yr6fd"; depends=[kableExtra MASS tidyverse]; }; SharpeR = derive2 { name="SharpeR"; version="1.3.0"; sha256="1xq2m53n2gc706lyd16gccllx2wgwdrqkfpf79jwwdmipqfqnxjx"; depends=[matrixcalc]; }; @@ -5122,15 +5126,15 @@ in with self; { ShortForm = derive2 { name="ShortForm"; version="0.5.2"; sha256="0qqcmdn3y1bfjrb5n9b19gi5c78avavisb1jm6wbz7y7rf9q0dbh"; depends=[doSNOW foreach ggplot2 ggrepel lavaan stringr tidyr]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; - SiMRiv = derive2 { name="SiMRiv"; version="1.0.5"; sha256="02b8y6fqlz8yrndkhjypmz2bg5abw435hzq668icrvf9s1a0r5fy"; depends=[mco raster rgdal sp]; }; + SiMRiv = derive2 { name="SiMRiv"; version="1.0.6"; sha256="1xwbfwhmlmgsbrg0cfgn1yp8f29vzsga8sw7fyclsf76dx9sbmc6"; depends=[mco raster]; }; SiPhyNetwork = derive2 { name="SiPhyNetwork"; version="1.1.0"; sha256="11p50ysznrrjjsiba1ivsbfpqg3zd5dqmkvj9p574acwhqj3dflp"; depends=[ape lifecycle Rcpp rstackdeque]; }; SiZer = derive2 { name="SiZer"; version="0.1-8"; sha256="0hfhl2ihyxbg61knzij8i7ih1siap6dxfvbkwffxlaqpwrd8hgdn"; depends=[boot dplyr ggplot2 rlang tidyr]; }; Sie2nts = derive2 { name="Sie2nts"; version="0.1.0"; sha256="14s13v5y33kjgd779wrdzy985sp9qg0a0rh5qx66qs9gmff6r663"; depends=[ggplot2 Matrix plotly RCurl stringr]; }; - Sieve = derive2 { name="Sieve"; version="1.0"; sha256="1sk2d7wsw394xv2agwc4rlsb0ajppap5iaj8z8vm5339cxmkz72x"; depends=[combinat glmnet Rcpp RcppArmadillo]; }; + Sieve = derive2 { name="Sieve"; version="2.1"; sha256="1smsr073zl91jxdrawy12rn2ygs2zhj79npb20c98zs7npp5yrj6"; depends=[combinat glmnet MASS Rcpp RcppArmadillo]; }; SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; - SightabilityModel = derive2 { name="SightabilityModel"; version="1.5.3"; sha256="0haxw2za05f7q06fcipqlkbfscmbqvyn1g30fpbdcx96rgbdlj67"; depends=[formula_tools Matrix msm mvtnorm plyr survey]; }; - Signac = derive2 { name="Signac"; version="1.10.0"; sha256="1509i2kigfm1b0bf7szj72p3ykghrfd5xn7xmmw183wvqkgp9hkm"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggplot2 IRanges irlba Matrix patchwork pbapply Rcpp RcppRoll rlang Rsamtools S4Vectors scales SeuratObject stringi tidyr tidyselect vctrs]; }; + SightabilityModel = derive2 { name="SightabilityModel"; version="1.5.5"; sha256="1fj871q0mav3dffm3sjg4zsci0lm8z74nfgbbrv6jzab155vfrmc"; depends=[formula_tools Matrix msm mvtnorm plyr survey]; }; + Signac = derive2 { name="Signac"; version="1.11.0"; sha256="1igi690dn3lngns3z7b8w2isqkzdzxvnxh4zfx67yvfalhwwbahd"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggplot2 IRanges irlba Matrix patchwork pbapply Rcpp RcppRoll rlang Rsamtools S4Vectors scales SeuratObject stringi tidyr tidyselect vctrs]; }; SignacX = derive2 { name="SignacX"; version="2.2.5"; sha256="0b38k3lxca985mqwvbbdczkjnn2x79kga05yw995gb6d20cjh96v"; depends=[igraph jsonlite lme4 Matrix neuralnet pbmcapply RColorBrewer RJSONIO Seurat]; }; SignifReg = derive2 { name="SignifReg"; version="4.3"; sha256="1f57zbc7746jr2hfgri29whw5nb7w8h9nwk2p2n851b1rf7q0mgp"; depends=[car]; }; Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.8"; sha256="16pzcs1g5ihza9a2glnkgd5pxi77l6w34vkn0vxcb78gc6syhbrd"; depends=[Deriv MASS]; }; @@ -5140,7 +5144,7 @@ in with self; { SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.9.0"; sha256="061gnxvhii0hhnxd00hx9cpjmamcdvh10mcwjp43s09f5j4d564y"; depends=[evd]; }; SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; }; - SimDesign = derive2 { name="SimDesign"; version="2.12"; sha256="0dhbh76vkzlpicvn7hsqkwalqk88j14jxhw7jqnlxfnm835fx1qf"; depends=[beepr dplyr foreach future future_apply pbapply progressr RPushbullet sessioninfo]; }; + SimDesign = derive2 { name="SimDesign"; version="2.13"; sha256="1wg6npbg1avgf948n2sw4q2q3022528rqfqzbjn67bayn7l8dfk6"; depends=[beepr dplyr foreach future future_apply pbapply progressr RPushbullet sessioninfo]; }; SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; }; SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.3"; sha256="1n0dvhwqyirb6myc30ydvskb1k7hlx4nkqy15gpx87zl01vpn8fz"; depends=[plot3D]; }; SimEngine = derive2 { name="SimEngine"; version="1.2.0"; sha256="1jga2iqdn0n9pym93addwhn3swn61dm1gh282isw2ssbqchh7arl"; depends=[data_table dplyr magrittr pbapply rlang]; }; @@ -5151,53 +5155,48 @@ in with self; { SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.4.4"; sha256="0z7wwwl814bwaijkmg9wcdj5xisiamc9yqypmk0hzj950569aj8p"; depends=[dplyr kinship2]; }; SimReg = derive2 { name="SimReg"; version="3.3"; sha256="1liwwbi3zqrcbqx5przdlzhnq7jvyjd6yhaxalhwggzf9zv7w8ci"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; - SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSST = derive2 { name="SimSST"; version="0.0.5.2"; sha256="1c3bkcvq4767yabw7ifv3akhlavscgxwx5rp18c23icjd3pk9avx"; depends=[dplyr gamlss_dist MASS]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.3"; sha256="0ngr6cbhg3ccsm0v5mf3871pzxzmdprdap3kljfi8w6rrah830fx"; depends=[Rcpp RcppArmadillo]; }; - SimSurvey = derive2 { name="SimSurvey"; version="0.1.5"; sha256="1i417kp7lcd7a19bna2y29sirgv30bb3xs8i4a2l6zmbq0kqsgf8"; depends=[data_table doParallel foreach magrittr plotly progress raster rlang sp]; }; + SimSurvey = derive2 { name="SimSurvey"; version="0.1.6"; sha256="0as8cifaymnd9rccynyhs4pfs27z0rhz18pbl0am0xvp3y7avbs0"; depends=[data_table doParallel foreach lifecycle magrittr plotly progress rlang sf stars]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; - SimVitD = derive2 { name="SimVitD"; version="1.0.2"; sha256="1ddzp43bnna6n96h6qkqfis1l7mihf20wcy98cn37ri96zacwly4"; depends=[simpleboot]; }; + SimVitD = derive2 { name="SimVitD"; version="1.0.3"; sha256="1wz3b73pnccqsbg8wssah4gmwv7ajmhhca313r07sppgqskmm68r"; depends=[simpleboot]; }; SimilaR = derive2 { name="SimilaR"; version="1.0.8"; sha256="1wlxscl94r3gxwsc9yw0y4z5nj28nxilijp0pbzv4z2n4aqc7vy6"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.3"; sha256="06dpbawn650lzybd5j4xkygbg5s2nqfz6b4g0skm4z7lsb2d9dhb"; depends=[]; }; SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.4"; sha256="08775g6fdx09y8pkfq4k8zxbxpwah7yqq5cg30lmxl7zrpmza5hv"; depends=[assertthat broom dplyr moments tibble]; }; SimplyAgree = derive2 { name="SimplyAgree"; version="0.1.2"; sha256="0lcy2hjhni46z5m1zip77jlxl8jscq2rczfajdh1xwbpin484f9v"; depends=[boot dplyr emmeans ggplot2 insight jmvcore lme4 magrittr nlme patchwork purrr quantreg stringr tidyr tidyselect]; }; - SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; - SingleCaseES = derive2 { name="SingleCaseES"; version="0.7.1"; sha256="0nafdl75svl0m07608jrsizn9gnnpvpvz74qs7qfsqlrpdnjmw9c"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; - SiteAdapt = derive2 { name="SiteAdapt"; version="1.1.0"; sha256="1k79j29d92a8m578xj61iavljikksdmjr2vlzwmdvxpa6rp1i2ff"; depends=[ggplot2 ggpubr glmulti hydroGOF hyfo RColorBrewer solaR]; }; + SingleCaseES = derive2 { name="SingleCaseES"; version="0.7.2"; sha256="0yp7h13g9lq9ym8jzxlzc0m2vmp63kvnmf7ysyxinjardigng6k7"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; + SiteAdapt = derive2 { name="SiteAdapt"; version="1.1.0"; sha256="1k79j29d92a8m578xj61iavljikksdmjr2vlzwmdvxpa6rp1i2ff"; depends=[ggplot2 ggpubr glmulti hyfo RColorBrewer solaR]; }; SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; }; - SixSigma = derive2 { name="SixSigma"; version="0.11.0"; sha256="17y039k8q1nh1j2v8z8wy5z2l984d27vwh1szydc6w5wzv1b7cg4"; depends=[e1071 ggplot2 lattice nortest reshape2 scales testthat xtable]; }; + SixSigma = derive2 { name="SixSigma"; version="0.11.1"; sha256="1gb6giq9rsgsrwrk0m8r2ay4hi1kqb009rsak33wvmvqsavka8lf"; depends=[e1071 ggplot2 lattice nortest reshape2 scales testthat xtable]; }; SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; }; SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.4-0"; sha256="1blxibjrgb738q2ybavp4q3d6yn7hayhg851ysghp118wpl32nwr"; depends=[DistributionUtils GeneralizedHyperbolic]; }; SkeweDF = derive2 { name="SkeweDF"; version="0.1.0"; sha256="11i6zbjhkcrr6g848sms21l1ixk401vd50cia74j78d4nvl8d8zc"; depends=[dplyr matrixStats optimr purrr Rcpp stringr zipfR]; }; Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; }; - Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; }; SlaPMEG = derive2 { name="SlaPMEG"; version="1.0.1"; sha256="0ikhx14czcavfxppsaf0b6506l4gwhwk4p3wilr9zykw17s8ghzm"; depends=[ggplot2 globaltest lcmm lme4 magic mvtnorm reshape2]; }; SleepCycles = derive2 { name="SleepCycles"; version="1.1.4"; sha256="130r6wrsj4g725065zyxj0wzx1j10bh97288l4ckl4ka2kpawz8v"; depends=[ggplot2 plyr reshape2 stringr viridis]; }; Sleuth2 = derive2 { name="Sleuth2"; version="2.0-5"; sha256="18rp23dr55p2zqxqj5i86gi8j25b0y7hc2p88rxqszgmbyn5ynhi"; depends=[]; }; Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; SlidingWindows = derive2 { name="SlidingWindows"; version="0.2.0"; sha256="0hvxg4hrk3rb1wxhi71rgamxd8wcwys569137znfs0y8j6yvf0jj"; depends=[DCCA nonlinearTseries PerformanceAnalytics TSEntropies]; }; - SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; + SmCCNet = derive2 { name="SmCCNet"; version="2.0.1"; sha256="0xwmhkipibc5pd1ipjnpjy5p9ijkvxrnz9mzi588d1s0vy6bgrc5"; depends=[EnvStats furrr future igraph magrittr Matrix pbapply PMA pracma pROC purrr rlist spls]; }; SmallCountRounding = derive2 { name="SmallCountRounding"; version="1.0.3"; sha256="1jnhfzjd2x54h35si1wrr91dkzdzc502m07mvvb894y5pq5q823a"; depends=[Matrix SSBtools]; }; SmartEDA = derive2 { name="SmartEDA"; version="0.3.9"; sha256="0fmqi3kl20xdrnpbbsk22rrhj2xqckb777mcwdjgwxvc77r88bjf"; depends=[data_table GGally ggplot2 gridExtra ISLR qpdf rmarkdown sampling scales]; }; SmartMeterAnalytics = derive2 { name="SmartMeterAnalytics"; version="1.0.3"; sha256="0i8my7ngzdbay3cld8axhvbri0nh0dd1dmv2lbsgyx4adr5hb30f"; depends=[FNN futile_logger plyr stinepack zoo]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; - SmarterPoland = derive2 { name="SmarterPoland"; version="1.8"; sha256="19pxr1zch2bm5jw676dp0p2crvmdmvzyxz07vhx926axpb4i0xbp"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; - SmoothHazard = derive2 { name="SmoothHazard"; version="2023.06.27"; sha256="1jigxihw7mw0ivbarjic5qjx4ky450ys8db4j0i5i4z6sv9nfqix"; depends=[lava mvtnorm prodlim]; }; + SmarterPoland = derive2 { name="SmarterPoland"; version="1.8.1"; sha256="07nag50mzj7a4f5lprvvs6k7mppyzcwvkc3dj8b1il2k06q5ffh5"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; SmoothTensor = derive2 { name="SmoothTensor"; version="0.1.1"; sha256="19mbxsbp656i4qdkr2wplil542pxxb3xfznh3vv2nxi23phr01gy"; depends=[Matrix rTensor]; }; SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; }; Snake = derive2 { name="Snake"; version="1.0"; sha256="10i1bqsva70lzavfqvc56ga70ddjfwf0hqpspj8fqwa0jw86jmbh"; depends=[]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; SnowballC = derive2 { name="SnowballC"; version="0.7.1"; sha256="0d60h5qpk0vahcxm1y6ryqj00s4yrsdz671vq1i1cx8668zz2g3m"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; - SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; }; SoftBart = derive2 { name="SoftBart"; version="1.0.1"; sha256="0s7d2gxh6qnpwzagfrwhacgd7w3hxx3xkxrhk6kqjykpckdwy091"; depends=[caret glmnet MASS progress Rcpp RcppArmadillo scales truncnorm]; }; - SoftClustering = derive2 { name="SoftClustering"; version="1.1902.2"; sha256="1r709r96ra9knkprjw6c227r7w6wygfpwc9pwwsjyw166305pxfs"; depends=[]; }; + SoftClustering = derive2 { name="SoftClustering"; version="2.1.3"; sha256="0wnl3a0jnrhafkjj3yk0rij1ya0y4nxzix29mr5wpwgkhfyky8zy"; depends=[]; }; SoilHyP = derive2 { name="SoilHyP"; version="0.1.7"; sha256="0f4djzmbyz6x5av0d4ii972dw6295c4l3c7gbwp0yinpy3rgvh0q"; depends=[data_table lubridate]; }; - SoilR = derive2 { name="SoilR"; version="1.2.105"; sha256="0liygb46900i6x4y6vhav7w7g4jw5chi4372jwdhn1kxp2g8zgfa"; depends=[assertthat deSolve expm igraph purrr sets]; }; + SoilR = derive2 { name="SoilR"; version="1.2.107"; sha256="1j2p5rr8a62fsf77akksk8533ilcx8a7319wq4gjz680va8glp5h"; depends=[assertthat deSolve expm igraph purrr sets]; }; SoilTaxonomy = derive2 { name="SoilTaxonomy"; version="0.2.3"; sha256="0gp9h32fikavxy6ds0vlc0fkb3gdrwvr1z5flpdmjqijjyr0frcc"; depends=[data_table stringr]; }; SoilTesting = derive2 { name="SoilTesting"; version="0.1.0"; sha256="0l808ic9irz7m8i3rcr65mqq5x4a3mk481c7f1ihca2rca43pm2j"; depends=[]; }; Sojourn_Data = derive2 { name="Sojourn.Data"; version="0.3.0"; sha256="1flxiga9szhifndrhmf4blgms477gnnf4gd6wkxqgv3vgisc4q4i"; depends=[]; }; @@ -5206,19 +5205,17 @@ in with self; { SongEvo = derive2 { name="SongEvo"; version="1.0.0"; sha256="0mc5wlf5axbflys6g8b7xg0di3wwkli7q0a9fby6598fq9hbaqpd"; depends=[boot geosphere lattice sp]; }; SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; }; SortedEffects = derive2 { name="SortedEffects"; version="1.7.0"; sha256="188qlgg3m8f07hbjim65yw3qy6200y0b54imkdqm8mq0f14nmi0f"; depends=[boot Hmisc pbapply quantreg SparseM]; }; - SoundShape = derive2 { name="SoundShape"; version="1.2.1"; sha256="1fkwvvb5pw2qf950hb1d1y6bkazs09hgxd6nn933lhn8ci2v9bzc"; depends=[abind geomorph plot3D reshape2 seewave tuneR]; }; + SoundShape = derive2 { name="SoundShape"; version="1.3.0"; sha256="1inp1255mdhbr0sfqwdmb6g0ab625c98q3avfk6w36gb0c77b5ry"; depends=[abind geomorph plot3D reshape2 seewave stringr tuneR]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; SoupX = derive2 { name="SoupX"; version="1.6.2"; sha256="19g3gqgiqllpafc9ihlm083d47zqiygh4p2dhy54k486gk6jcqlv"; depends=[ggplot2 Matrix Seurat]; }; - SourceSet = derive2 { name="SourceSet"; version="0.1.5"; sha256="17dbxdqm9jkhyip6xdwrxsqqyncs5skclbi9drjbdcw745p7c6lh"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.6.2"; sha256="1ajsk51bd9aajlyv9q6yjmdm9xs9jf07j5m189m00mhl21xpzn0b"; depends=[lme4 NAM Rcpp RcppEigen reshape2]; }; SoyURT = derive2 { name="SoyURT"; version="1.0.0"; sha256="0l710ijqmqvpcsxaqia1g1bm5317qp1cc2nsf5ccz1vmgqxrxn1g"; depends=[]; }; SpATS = derive2 { name="SpATS"; version="1.0-18"; sha256="1p7ibi4593a6f5ww02l74afxaxgk2nh8h67l43vm2p7zfmdxx2b3"; depends=[data_table fields spam]; }; SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; }; SpPOP = derive2 { name="SpPOP"; version="0.1.0"; sha256="10s11sd8afridrkdg6q6wxqin0c214dl692sjz5f4ypv3irmwy04"; depends=[numbers qpdf]; }; - SpTe2M = derive2 { name="SpTe2M"; version="1.0.1"; sha256="1qcjxr25v5m0nab3xq4bgzilmx2vgibgxnax5bhybfdaskgflhz5"; depends=[glmnet MASS]; }; - SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; + SpTe2M = derive2 { name="SpTe2M"; version="1.0.3"; sha256="1xykmbgwwnvl7c9mf0aam3s55xmq2pxdy5wkkz9nzj1c74m0bxqf"; depends=[ggplot2 glmnet knitr mapproj maps MASS rmarkdown]; }; SpaDES_core = derive2 { name="SpaDES.core"; version="2.0.2"; sha256="11symn8awz23fgzg2fnxkrznwq4arbd0zwjws0bdxbni58d8g2b7"; depends=[crayon data_table igraph lobstr qs quickPlot reproducible Require terra whisker]; }; - SpaDES_tools = derive2 { name="SpaDES.tools"; version="2.0.0"; sha256="08x45bqxfsxp2q52r9jwqxyy3pfaz485q4mcb9zwjnqx4qyqcfp9"; depends=[backports checkmate data_table fpCompare Rcpp reproducible terra]; }; + SpaDES_tools = derive2 { name="SpaDES.tools"; version="2.0.4"; sha256="03n6asn0f0s63aynwlwibpqnpl650l1blvcb8sfgl1ypp7gyxz3r"; depends=[backports checkmate data_table fpCompare Rcpp reproducible terra]; }; SpaceTimeBSS = derive2 { name="SpaceTimeBSS"; version="0.3-0"; sha256="1mxaf1w4476j14dh9rd8z83y0vfysrzhvscmg93311dqv8iw22qw"; depends=[JADE Matrix Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; SparseBiplots = derive2 { name="SparseBiplots"; version="4.0.1"; sha256="0jiyafhsddqa3llrp62lf8bgcvs3wp2pxc8ppaxx4zphkifw2yhr"; depends=[ggplot2 ggrepel gtable rlang sparsepca testthat]; }; @@ -5233,21 +5230,21 @@ in with self; { SparseMSE = derive2 { name="SparseMSE"; version="2.0.1"; sha256="1alpvj0ya3r64wwfdzz2aaxgaf6512glzl65p97606c2fwrm6db7"; depends=[lpSolve Rcapture]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="4.0"; sha256="01lfb3j907244hgapb85kba7zdmgzhw452gri208qgrjzfv2x9yh"; depends=[abind glasso huge longitudinal MASS mvtnorm network]; }; SparseVFC = derive2 { name="SparseVFC"; version="0.1.1"; sha256="1g5i3r447f1zcrlcamfci1f96silqmm43dabm5yhhwzsj8ak6jpv"; depends=[pdist purrr]; }; - SpatEntropy = derive2 { name="SpatEntropy"; version="2.2-0"; sha256="0vp4mns6izycz9sznzqmww4h34gbk5nwfnnx10yba4l7y78zjjkg"; depends=[spatstat spatstat_geom spatstat_random]; }; + SpatEntropy = derive2 { name="SpatEntropy"; version="2.2-3"; sha256="03v322jkz41r0navlqxgdfp9v9c79cqb5rx743xa5xvlyw9wb8rv"; depends=[spatstat spatstat_geom spatstat_random]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; }; SpatialBSS = derive2 { name="SpatialBSS"; version="0.14-0"; sha256="0z8k4wd5rlx3bmp4zmfvblkf4nrkkqqfcpv5wzncyhi2ffgnybvm"; depends=[distances JADE Rcpp RcppArmadillo robustbase sp SpatialNP]; }; SpatialDDLS = derive2 { name="SpatialDDLS"; version="0.1.0"; sha256="00aan8pkgyay5bcqw2w2nx0jl7z7aqpja285lw34ff2gqy0bbwrh"; depends=[dplyr ggplot2 ggpubr grr gtools keras Matrix pbapply RColorBrewer reshape2 reticulate rlang S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment tensorflow tidyr zinbwave]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.8"; sha256="0q14scafm31xansk5zkhk6hb5jqcmi519jsd4drwkfvvdk8hf93d"; depends=[MASS Rcpp RcppArmadillo sp spdep]; }; SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.1-0"; sha256="0z1swxp1syz8hdskarjxx4sdd7wx835kcnb783bwqm235yh991j3"; depends=[fields maps]; }; SpatialGEV = derive2 { name="SpatialGEV"; version="1.0.0"; sha256="0g4v84a4c14a2vf7y055j9jgcki7q4182lmmmphrahiqwnjxhm1b"; depends=[evd mvtnorm TMB]; }; - SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; + SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-4"; sha256="1875vi3dm6jm7bfmc9ydn4aaygls0c0k5pk540qq2f3ywbfq10zd"; depends=[igraph pracma sf shape sp splancs]; }; SpatialKDE = derive2 { name="SpatialKDE"; version="0.8.2"; sha256="15s72mjz3pqny5i2c6xg5k4dzwb6d00zg8gihik91f8j06fy9w6r"; depends=[cpp11 dplyr glue magrittr progress raster rlang sf vctrs]; }; SpatialKWD = derive2 { name="SpatialKWD"; version="0.4.1"; sha256="0b5vfsmpl3zxcwsg7bj85kfbyv8a2bgfq72b3rk4r6ms7ngc5i16"; depends=[Rcpp]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.5"; sha256="13didlxl9fn5h48fyz29f2vh3vi8g2fisbnaraqlgwn5fbsg3ihd"; depends=[caret ranger]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-5"; sha256="0cxh1f4182mfihq6m82zh2lgafrsiqvgrfxbk66zkjrrbfn8gkcl"; depends=[]; }; SpatialPOP = derive2 { name="SpatialPOP"; version="0.1.0"; sha256="0pgd4injkimjp6pid42arhfbavx2i8crkdvqr35bjvf26p7hbvv3"; depends=[MASS numbers qpdf]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.4"; sha256="138q209gyggpfa1ha1yc6czpv0lxp6acggvp4yc4nbcnkxnvqzwb"; depends=[fastmatrix]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="2.1.1"; sha256="0p2ii6pwxqrywp7m3hql2js9211vx6jk8lz76cbkzaz1i1g1q90k"; depends=[isoband raster sf sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="2.1.2"; sha256="12xglqrw4mqdfshd325gicrd3gnrkiaj1i2p5mlpklhdciahv1pi"; depends=[isoband raster sf sp]; }; SpatialRDD = derive2 { name="SpatialRDD"; version="0.1.0"; sha256="169166gyrxv7lcah7v9v0r9pllsnsjf81j2yqz9jqfn027rc0lhx"; depends=[broom cowplot dplyr ggplot2 lmtest magrittr rdrobust rlang sandwich sf]; }; SpatialRegimes = derive2 { name="SpatialRegimes"; version="1.1"; sha256="1sp9fs8kwv5gm8bx9z5blkwj3c4lmcqw5126myr09rzz5xjmzzrx"; depends=[GWmodel plm quantreg spatialreg spdep]; }; SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; @@ -5260,12 +5257,11 @@ in with self; { SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; }; SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-3"; sha256="1v76lilyj65f04881yw19v0qi7n08ysdnr7sc4hf5d8wnmvdh3v3"; depends=[Rcpp RcppArmadillo]; }; - SpectralClMixed = derive2 { name="SpectralClMixed"; version="1.0"; sha256="1wq5nr2nv62mx0w22an84xm48md29wzcpfj85dy9yfrxq7msiv5s"; depends=[cluster GGally ggplot2 RSpectra]; }; + SpectralClMixed = derive2 { name="SpectralClMixed"; version="1.0.1"; sha256="10nx03kr35irvvink8kfx6gbv90wnlsx514r7921hrjvcjiqn82s"; depends=[cluster GGally ggplot2 RSpectra]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; Spectrum = derive2 { name="Spectrum"; version="1.1"; sha256="0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw"; depends=[ClusterR diptest ggplot2 Rfast]; }; SphereOptimize = derive2 { name="SphereOptimize"; version="0.1.1"; sha256="1b01jpj0sagi3hwfvgd346wvrcypv5b3hh0xfdd8qqnwjgkq8ixi"; depends=[]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.5"; sha256="03j9f9v3zrykrd4lc74i19s3xyc0z3l2kg3056qg591sxw64h7vh"; depends=[abind cubature mvmesh SimplicialCubature]; }; - SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SpiceFP = derive2 { name="SpiceFP"; version="0.1.2"; sha256="1vhsi9g925jc95589wp3cjlj8psvggkf1cws2awy94zi0z6lkiri"; depends=[doParallel foreach genlasso Matrix purrr stringr tidyr]; }; Spillover = derive2 { name="Spillover"; version="0.1.0.3"; sha256="10d29d9jg4jl7m99z6rw6w8m5li38ga976d83mm8waaz0agdwb81"; depends=[dplyr fastSOM ggplot2 tidyr vars zoo]; }; Splinets = derive2 { name="Splinets"; version="1.5.0"; sha256="11wg4ddr2nscjnqlfvpphskbhmyglnq110v5lngvp8sszw84dwkc"; depends=[]; }; @@ -5275,19 +5271,20 @@ in with self; { SplitSoftening = derive2 { name="SplitSoftening"; version="2.1-0"; sha256="1fgcqax81zpknw642fm9dx1f6dpdgbcf3va0m1bhj6kl98yq7dqd"; depends=[]; }; SportsTour = derive2 { name="SportsTour"; version="0.1.0"; sha256="06d66yv0b7c3mg1bcnrlg576njxgri107ni0vnl27hzf46fyidwa"; depends=[]; }; SpotSampling = derive2 { name="SpotSampling"; version="0.1.0"; sha256="0s47dvigzkcl9ynrdiwrjzwap18dpkb29jngi8ddvf9m4xywj4al"; depends=[BalancedSampling MASS pracma sampling WaveSampling]; }; - SqlRender = derive2 { name="SqlRender"; version="1.15.1"; sha256="078w7z16s8n1vbg5wgjwkxh0q4npybpafmwyxhxhzj2c2vspyk5c"; depends=[checkmate rJava rlang]; }; + SqlRender = derive2 { name="SqlRender"; version="1.16.1"; sha256="0p98m6622zhdz0v66248icbq48icpy7p0acfr8hvx4ip99dxmfkv"; depends=[checkmate rJava rlang]; }; SqueakR = derive2 { name="SqueakR"; version="1.3.0"; sha256="09l6dj1xq2zxxy6jnh1dl4rlcbx06fvf0jp2nypv3497dn97jsrh"; depends=[dplyr ggcorrplot ggeasy gghighlight ggplot2 ggpubr googlesheets4 MASS plotly RColorBrewer readxl report rlist rstatix shiny shinydashboard]; }; Sshaped = derive2 { name="Sshaped"; version="1.1"; sha256="0jy926ykyw7a2q0wabbvm2sm2g4d5y8wl6na4xjmf0ybr6rma458"; depends=[Rcpp RcppArmadillo]; }; Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; }; StAMPP = derive2 { name="StAMPP"; version="1.6.3"; sha256="0yqvy4yw9ccsbpjm6z1b9lh3435minfl7acnc1ha0zgiw8bvs2n2"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.1.1"; sha256="1y4lnbpgdza6r6w3q161nlmg8775g3zv323amcwxcj41r4v41p96"; depends=[Rcpp RcppParallel]; }; + StReg = derive2 { name="StReg"; version="1.1"; sha256="0cwrizyk4l82alfwijpljwhcjhgcimrf1vv8wsz7azwwiqzb0cns"; depends=[ADGofTest matlab MCMCpack numDeriv tseries]; }; StabilizedRegression = derive2 { name="StabilizedRegression"; version="1.1"; sha256="02snfdx34k086craacfss1rnhldd81pdql4rf02w96jb1xadrq87"; depends=[corpcor ggplot2 ggrepel glmnet MASS R6]; }; StableEstim = derive2 { name="StableEstim"; version="2.2"; sha256="0z8ia3zqkidnpg2zl055msc0dmhbsq73h8c43y0vfmhdzqszcx9d"; depends=[fBasics MASS Matrix numDeriv Rdpack stabledist testthat xtable]; }; StackImpute = derive2 { name="StackImpute"; version="0.1.0"; sha256="07b83bql9ch3arxzv94mllb61d4sv20lvpixlpzi7k8cjdddqizd"; depends=[boot dplyr magrittr MASS mice sandwich zoo]; }; StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.26.27"; sha256="1cf9hc7z3d8b70jck37j3lc2ml040di91dylfb18yi6wx936bq3h"; depends=[RcppEigen RcppParallel]; }; - StanMoMo = derive2 { name="StanMoMo"; version="1.1.0"; sha256="1qf5pvz5bwn1ax0rj9w0q22w6icd3fv7xxpxjnf268pl65fxhmv8"; depends=[BH bridgesampling dplyr ggfan ggplot2 httr latex2exp loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble tidyr tidyselect tidyverse]; }; + StanHeaders = derive2 { name="StanHeaders"; version="2.26.28"; sha256="1s1xgvn5c1vjikm1dx9g0qm2k8m24clylgp7zssmfhx6sfb8v2lk"; depends=[RcppEigen RcppParallel]; }; + StanMoMo = derive2 { name="StanMoMo"; version="1.2.0"; sha256="0hdh5c5zigmqs3v3ryk1h91w1a2mlqqjwbq51528w159frnd9mrl"; depends=[BH bridgesampling dplyr ggplot2 httr latex2exp loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble tidyr tidyselect tidyverse]; }; Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; }; StatDA = derive2 { name="StatDA"; version="1.7.11"; sha256="0jp0qd96z2z2w7lqkyy0csz45fk0774wjf57idqbla3n21jbn4q9"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-27"; sha256="168bydradzprvvyfchzq4g3nc6f8kpgd5165i02nhj1irwxa6jh8"; depends=[XML]; }; @@ -5305,7 +5302,7 @@ in with self; { StepGWR = derive2 { name="StepGWR"; version="0.1.0"; sha256="0sqgixmxla1sv3jkjhby0gggzs3iyg1cwq267y9hymzx2gsafry5"; depends=[MASS numbers qpdf]; }; StepReg = derive2 { name="StepReg"; version="1.4.4"; sha256="1lqwaxf6alk4y5mfrmhsnrchijpzv67n8lmhmpyx1qr4hv0lcfjp"; depends=[dplyr purrr stringr survival]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; }; - SteppedPower = derive2 { name="SteppedPower"; version="0.3.2"; sha256="1yjc4w98l3657vsmrwm27sw5p1wibl1py59x01kq4h1g24fpw65r"; depends=[Matrix plotly Rfast]; }; + SteppedPower = derive2 { name="SteppedPower"; version="0.3.4"; sha256="0y31685vs3h5irz5f3gmqayz9bwkra2w2vgj8774q93jicza1vmf"; depends=[Matrix plotly Rfast]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; StereoMorph = derive2 { name="StereoMorph"; version="1.6.7"; sha256="0qrbl86ba83j4r6j2phap5n6ryi729gbypn95h0vbgrv752nayqp"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; }; SticsRFiles = derive2 { name="SticsRFiles"; version="1.1.3"; sha256="09wkchdi5dicmf3idlmciqm3ah9007kmqhqpx7hcgqcdcnp74ls4"; depends=[cli crayon curl data_table dplyr lifecycle lubridate rlang rstudioapi stringr tibble tidyr XML xml2 xslt]; }; @@ -5321,7 +5318,7 @@ in with self; { StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StratifiedSampling = derive2 { name="StratifiedSampling"; version="0.4.1"; sha256="15gg1qc2znyba2y6kq8qq6wz69lq3kkpps0a3j9jdq8n67x65zkp"; depends=[MASS Matrix proxy Rcpp RcppArmadillo Rglpk sampling transport]; }; StratigrapheR = derive2 { name="StratigrapheR"; version="1.3.1"; sha256="10cyv9cddi6lsy1ah3dhvf93gd5mal4frcdwy2zqq50apmmrx5l9"; depends=[diagram dplyr reshape shiny stringr XML]; }; - StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; + StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.3"; sha256="13f5z4d04pq5jb8gpk8rh79i2f5b6bqma1p3a3zqcw74wxdhk8hg"; depends=[chron suntools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; }; @@ -5330,14 +5327,13 @@ in with self; { StructuralDecompose = derive2 { name="StructuralDecompose"; version="0.1.1"; sha256="1iw4knii94wajignrq0c91d66b6bc2qm019ny86jyyj5nd9nxkwz"; depends=[changepoint segmented strucchange]; }; StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; }; SuRF_vs = derive2 { name="SuRF.vs"; version="1.1.0.1"; sha256="0yhd6wsifmlr39fxs46b93y0bpqrv5c0zc4sjs2jpdrzivwfq1j5"; depends=[dplyr glmnet survival]; }; - SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubTS = derive2 { name="SubTS"; version="1.0"; sha256="0vd3pb7y341rki0yjnvmzdlq49sk481g79k82pvryavfk7485hid"; depends=[copula gsl tweedie]; }; SubTite = derive2 { name="SubTite"; version="4.0.5"; sha256="13fh24w7nvx5xqb0yvn8cackj576dspnrszdqv1gd0i3irzlyqya"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.3"; sha256="1bi5zndkpgvyk563i0jdfrw73kkpa6zi3yx922dv90w6bdb9kvl2"; depends=[alluvial circlize colorspace diagram dplyr ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; SubtypeDrug = derive2 { name="SubtypeDrug"; version="0.1.5"; sha256="1f1kx5lw2f1pch3805p58r89mkckcwna6vihagjrdcdc9xln48vb"; depends=[BiocGenerics ChemmineR GSVA igraph pheatmap rvest xml2]; }; - SuessR = derive2 { name="SuessR"; version="0.1.4"; sha256="068s4w8ihi30ang04r58zf1h07q3da4ix53ppq30al8zahgjyway"; depends=[]; }; + SuessR = derive2 { name="SuessR"; version="0.1.5"; sha256="1rh792x7dyfnhnw6g0f6hb5wqw58j6j11k9xib11ba256qrnvwgc"; depends=[]; }; SummaryLasso = derive2 { name="SummaryLasso"; version="1.2.1"; sha256="1gb1g1xgda5psq93vy50yfr0cbhvymliblpkxz7ck1nwpp65n9py"; depends=[gtools]; }; Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; }; SunsVoc = derive2 { name="SunsVoc"; version="0.1.2"; sha256="08qmkssxa75q2c8vl4i0560bazqjw1v00h6yl5zjwrxklws2m57p"; depends=[data_table ddiv dplyr magrittr purrr rlang stringr]; }; @@ -5345,24 +5341,26 @@ in with self; { SuperExactTest = derive2 { name="SuperExactTest"; version="1.1.0"; sha256="0i3pk2c2ipnc7mq5w4d4nl2l9pj1ijynm72n4jnlmhrs16ka88i1"; depends=[]; }; SuperGauss = derive2 { name="SuperGauss"; version="2.0.3"; sha256="174gicpk2jwbzg39m44sxp7506cja9cnn95r287sq7049lrj302a"; depends=[fftw R6 Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-28.1"; sha256="19kb4shfhj5aigjm1ljmlvr0jmgcbd6yl4gl3wfddy0nk2wi2bvm"; depends=[cvAUC gam nnls]; }; - SuperRanker = derive2 { name="SuperRanker"; version="1.2.0"; sha256="01wilk3cy33z50yhg4i4gci298fj8s4xbrkb7k3i9gn8q13vviin"; depends=[prodlim Rcpp]; }; + SuperRanker = derive2 { name="SuperRanker"; version="1.2.1"; sha256="02yvx1lg2drhb111jcq90hq0vnycwp3mssclvazgcfyw9z7rnzwg"; depends=[prodlim Rcpp]; }; SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.5"; sha256="01j8p1vfnswy41b7nzmwml4aq8s00xwdk3zjcc1b6n9bqv0cgnaz"; depends=[ClusterR lattice OpenImageR R6 Rcpp RcppArmadillo]; }; Superpower = derive2 { name="Superpower"; version="0.2.0"; sha256="0bv2jx3hadp5d9c3q790in3m728c8jc1nkp9wqvzcdip1d29hyin"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2 tidyr tidyselect]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.7"; sha256="025b9nlxz62wk84295csyzbncpn80i3iby3sxdigf3swcgi2fmbb"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="2.0.1"; sha256="0l1r495qnqfr3izngv7dmnb13dcp5736khgwmkm7hkxw8fjpzc6j"; depends=[gstat sf terra]; }; - Surrogate = derive2 { name="Surrogate"; version="3.0"; sha256="09031abywrsns7v4m6n5n2nn00fmbnhilpb24dj44352banqr562"; depends=[copula dplyr extraDistr flexsurv kdecopula ks lattice latticeExtra lme4 logistf MASS msm mvtnorm nlme pbapply rms rvinecopulib survival]; }; + Surrogate = derive2 { name="Surrogate"; version="3.2.1"; sha256="1p5q2im2fy3wnp5fjyqc0ala6jr8hg1r2vwwgp0j27haqg1p1s8h"; depends=[copula cubature dplyr extraDistr fitdistrplus flexsurv kdecopula ks lattice latticeExtra lme4 logistf MASS maxLik msm mvtnorm nlme pbapply purrr rms rvinecopulib stringr survival withr]; }; SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.1"; sha256="1wiqn9gfvj225dvmp49fyybp77np507s04f28a9wa9jiyvqf7m97"; depends=[survival]; }; - SurrogateRegression = derive2 { name="SurrogateRegression"; version="0.6.0"; sha256="0815zskr4g960wm6jcjn0ykmc0db8fg6vzfw97lfgm5m9bjd4h5c"; depends=[Rcpp RcppArmadillo]; }; + SurrogateRegression = derive2 { name="SurrogateRegression"; version="0.6.0.1"; sha256="0cjw780wzvxp6q4q8m57d3qzv7ivk884h6s6n9walnd8rvrfj414"; depends=[Rcpp RcppArmadillo]; }; SurrogateRsq = derive2 { name="SurrogateRsq"; version="0.2.1"; sha256="1g77cwp5cdldhqlp3k7f7pzxjww2pxgr842qd3fr2k0gzg2s246a"; depends=[MASS PAsso progress scales]; }; SurrogateTest = derive2 { name="SurrogateTest"; version="1.3"; sha256="0vs1ii3l6i6cmswyv6xjbya5filfixppyzmnw099g9s4x8kn0kq7"; depends=[survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.1"; sha256="0pccjc9zdvbb869wfywm23l63h1bpi5px4q5x7fq54pm0iyi1k73"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; SurvHiDim = derive2 { name="SurvHiDim"; version="0.1.1"; sha256="1kix00zfrbx11pwx2dfag8vz5nvf8siw2kbxi8g4fb7xib9wh2na"; depends=[factoextra glmnet igraph Rdpack readr survival tidyverse useful]; }; - SurvLong = derive2 { name="SurvLong"; version="1.2"; sha256="15a92lj29ggxwyn52iiq1ns7jp8l8grk17wapffv109fypwhdnh1"; depends=[]; }; + SurvLong = derive2 { name="SurvLong"; version="1.3"; sha256="07qxiym9vkv7wgmjs44jc6662yipb8ry6n9b90n4lwj5vasmn0x6"; depends=[]; }; SurvMI = derive2 { name="SurvMI"; version="0.1.0"; sha256="0qgsgz11vz73v83bkxrrjwk7i26rllkxk97if3nw2rgl9jnmiih0"; depends=[survival zoo]; }; SurvMetrics = derive2 { name="SurvMetrics"; version="0.5.0"; sha256="14hpvqg0k3ww5qla4s08nrqwcy27y76kfp7b0g1hzs3vv046fb7i"; depends=[MASS pec randomForestSRC survival survminer]; }; - SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.5"; sha256="0p39xqrnx2x0fgdfdr9ffv2x9zcgi53kqya821gpbnn3ccjzxx58"; depends=[numDeriv survival]; }; + SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.7"; sha256="02bg0iaqh98gwbzl24dy4piyxfqb3fmn2yc0pkd7y5ygchpfm4ak"; depends=[numDeriv survival]; }; SurvTrunc = derive2 { name="SurvTrunc"; version="0.2.0"; sha256="0zkjlndmg0rc7ycqy2v42nyzs4sd9z1y9y9kwfdci9qrc88nnfmn"; depends=[survival]; }; + SurveyCC = derive2 { name="SurveyCC"; version="0.1.0"; sha256="0k6ac7c1x4ppwrsv9icx5fw8y0vaw264f0h9ni4m5i4dix90ss79"; depends=[candisc survey]; }; + SurvivalClusteringTree = derive2 { name="SurvivalClusteringTree"; version="1.0"; sha256="1h5iwwlw1gh82laargp7pwpspc7jljzizpyv251gsgdjrms72p79"; depends=[dplyr formula_tools gridtext Rcpp RcppArmadillo survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.2"; sha256="0s9gn10v6a8n6898g0gmdrw51z7y98klji59sn06dfbsxlswlv11"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-7"; sha256="03q9sv51lvf64gdzmcb8sskghqib3afy5hx9nwxba1sk2cziinpb"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; SwimmeR = derive2 { name="SwimmeR"; version="0.14.2"; sha256="17ri50k88absi7ijj1w478aahl9hx1ajq16gk9807m9q83pq25yg"; depends=[dplyr magrittr pdftools purrr readr rvest stringr xml2]; }; @@ -5375,12 +5373,12 @@ in with self; { SyncRNG = derive2 { name="SyncRNG"; version="1.3.2"; sha256="11v383acl2b9fjmi59rmckwjgl2f69wr5fgcym2zjvizpfp97h1z"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.2"; sha256="1y53235523z0nf4pmskdiz3xq4p8hdzvf5jy4ml4isj6nqzy6b88"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-8"; sha256="0vn4ww719q849fgq86g4xi6lb4fy081svz17b0ivqn7f7aqwnb0r"; depends=[kernlab optimx rgenoud]; }; - SynthETIC = derive2 { name="SynthETIC"; version="1.0.4"; sha256="00aw9s8fxqld0iv3wwlbf3y9gydbawbg611ijq8chldpxkcra5vv"; depends=[ggplot2 magrittr rlang]; }; + SynthETIC = derive2 { name="SynthETIC"; version="1.0.5"; sha256="0rdq3ry932bg272j3rdz5ykbydr5yqglxkfl9d5cxanczf1fvfsv"; depends=[dplyr ggplot2 magrittr rlang]; }; SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; }; Sysrecon = derive2 { name="Sysrecon"; version="0.1.3"; sha256="01vbkv707m31bf69j3vxfiwgvaz56v2yr6da0j0796rcmca1d4b8"; depends=[ape dplyr ggplot2 ggtree magrittr patchwork plyr RColorBrewer rlang SnowballC stringr tm]; }; SystemicR = derive2 { name="SystemicR"; version="0.1.0"; sha256="1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr"; depends=[igraph Matrix quantreg xts]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - T2Qv = derive2 { name="T2Qv"; version="0.1.0"; sha256="1zx7r0axa7b83pynilp0rmw6apilzsqjacn426q4i4jlsvr1ba3k"; depends=[ca dplyr highcharter htmltools purrr shiny shinycssloaders shinydashboard shinydashboardPlus stringr tables tidyr]; }; + T2Qv = derive2 { name="T2Qv"; version="0.2.0"; sha256="1dvr8k2wifl2jl4rpc1gbi5d5shmrhnhfmj9kfqlwsbsrrnh493p"; depends=[ca dplyr highcharter htmltools purrr shiny shinycssloaders shinydashboard shinydashboardPlus stringr tables tidyr]; }; T4cluster = derive2 { name="T4cluster"; version="0.1.2"; sha256="0wai4qgpkwc1p5wwpvi0z6zrcj9ha1wiy27qjpcfvfa2bhaid2w5"; depends=[ADMM fda ggplot2 lpSolve maotai MASS mclustcomp Rcpp RcppArmadillo Rdimtools Rdpack rstiefel scatterplot3d]; }; T4transport = derive2 { name="T4transport"; version="0.1.2"; sha256="091mq0f2cawkfmaql9gqgv2sbs5fwyv4i2sdw14p1r01wznfrqzf"; depends=[CVXR lpSolve Rcpp RcppArmadillo Rdpack]; }; TAF = derive2 { name="TAF"; version="4.2.0"; sha256="0k64mq4y03nlfcfcyh37srlnc3wssdlsfqgln1slmqlbcpfwz68b"; depends=[lattice]; }; @@ -5396,6 +5394,7 @@ in with self; { TCA = derive2 { name="TCA"; version="1.2.1"; sha256="1gyps0m7r44vcbzpbrs3xy2kyb2xsvmfzk1c0aq04s4ndcksplwb"; depends=[config data_table futile_logger gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.7"; sha256="1ajwv12chhz8s7m6m072jr6vg0kavdvhnmq6zhrkdv8di28w6p3a"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; + TCIU = derive2 { name="TCIU"; version="1.2.4"; sha256="0is0y0123pvwvkwzghd58chbiy1862qy8q3377j1nj1k81whj0cn"; depends=[cubature doParallel dplyr DT extraDistr fancycut fmri foreach forecast geometry ggplot2 ggpubr gridExtra ICSNP MultiwayRegression plotly pracma RColorBrewer reshape2 rrcov scales spatstat_explore spatstat_geom tidyr zoo]; }; TDA = derive2 { name="TDA"; version="1.9"; sha256="0gk058mbbywdpmjif3zl0g4a4sn3jr5bxksmqwhk3h881rsjic6h"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAkit = derive2 { name="TDAkit"; version="0.1.2"; sha256="1gvcv3016kjk98qm07i972fi66bcljj1avmagyc8qxs29cq3ngg3"; depends=[energy ggplot2 maotai Rcpp RcppArmadillo Rdpack T4cluster TDAstats]; }; TDApplied = derive2 { name="TDApplied"; version="2.0.4"; sha256="0bq06pzw7w4qp8cqvkxqqhx2qyn03vz7zxsk3f1ykjv846qxf6bb"; depends=[clue doParallel foreach iterators kernlab parallelly rdist]; }; @@ -5408,11 +5407,12 @@ in with self; { TDboost = derive2 { name="TDboost"; version="1.4"; sha256="0kbmn1bddsnmh20rnkw6gizpb23srb4id3dsqqrjgj15j4zkavas"; depends=[lattice]; }; TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; }; TEAM = derive2 { name="TEAM"; version="0.1.0"; sha256="1yj7fw935rr7fh7h2p4ra8d3ynz5c6b30fqzm1djgav1k84wcin2"; depends=[ggplot2 ks plyr]; }; - TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; }; + TELP = derive2 { name="TELP"; version="1.0.2"; sha256="0abdbhp898lgv7jmgg82vzdx6ibyi053xw8b3p3kx49yfbiyynny"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; }; TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; }; TESS = derive2 { name="TESS"; version="2.1.2"; sha256="0qhzxppgk4ihkg00d08abb7xjl82n87mm3319iv0g7n6rky2qxy8"; depends=[ape coda deSolve Rcpp]; }; TExPosition = derive2 { name="TExPosition"; version="2.6.10.1"; sha256="0psdm35g7h7d8cr3xlyq8akr0qrbl44d5pnsaf535cs5pmqdp87b"; depends=[ExPosition prettyGraphs]; }; TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.9"; sha256="1rsxqvq1nkyhwmhm7mf7rd02rvh7xinnhqbqic6q9vicbvkmdnxr"; depends=[Rcpp]; }; + TFactSR = derive2 { name="TFactSR"; version="0.99.0"; sha256="05fijv096dxgacg6sh3m2ppy1wjj5g35qgz2khg1qcy384ys2bfr"; depends=[qvalue]; }; TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; }; TFunHDDC = derive2 { name="TFunHDDC"; version="1.0.1"; sha256="13j0bb2j2qrgbc8l3v1pg4c8frbi8cjfv09n2682z3zn90dz6z6d"; depends=[fda fda_usc MASS stringr tclust]; }; TGS = derive2 { name="TGS"; version="1.0.1"; sha256="01mwdlgfjlxy0q5lxcmzk6lsb806987va7yag0zpjjd2bzmdh70k"; depends=[bnstruct doParallel foreach ggm minet rjson]; }; @@ -5424,9 +5424,9 @@ in with self; { TITEgBOIN = derive2 { name="TITEgBOIN"; version="0.2.1"; sha256="0n47lfpnbqirny0lbs3hl3sgd2l6i4wn2xfx1r8nlbnv6s140fzv"; depends=[]; }; TKCat = derive2 { name="TKCat"; version="1.0.7"; sha256="0j3m10adfc3k7znaissl1w6pqg5mf2qhl4r2i89qjdmw0i1h27pa"; depends=[base64enc ClickHouseHTTP DBI dplyr DT future getPass htmltools jsonlite jsonvalidate magrittr markdown Matrix promises readr ReDaMoR rlang shiny shinydashboard tidyselect uuid visNetwork xml2]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.5.3"; sha256="096sr0j4vhlfsaxc565zgw0mjk4sxkl03i7ip3hzcfph1c05yj6h"; depends=[ggplot2 hypergeo lmomco Rcpp]; }; - TMB = derive2 { name="TMB"; version="1.9.5"; sha256="0mw3r0dkb6li14zdwhzghjzzlkjnakcf83vr3bm9c81zp1a5by2f"; depends=[Matrix RcppEigen]; }; + TMB = derive2 { name="TMB"; version="1.9.6"; sha256="1sh3arsj42gimgpva76p4dd969iwqw3n5wkzn487kl7vk5phdnh0"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.1"; sha256="062n9mi2f9g2xxpnymja57xnpl855d8mwyfwci7a8cq4c7w7avj7"; depends=[httr jsonlite stringi]; }; - TML = derive2 { name="TML"; version="0.1.0"; sha256="1c9b95av10qgn2p9zq6mcsqqhgs4708365w0jiyw626zsiqw1656"; depends=[ape cluster combinat gtools lpSolve lpSolveAPI magick maps MASS Matrix miscTools phangorn phytools rcdd RcppAlgos Rfast rgl]; }; + TML = derive2 { name="TML"; version="1.1.0"; sha256="0yaqf000dgki3vb3gyr5zzmvnshspliawv8wap21y4iarrv15pl6"; depends=[ape cluster combinat gtools lpSolve lpSolveAPI magick maps MASS Matrix miscTools phangorn phytools rcdd RcppAlgos Rfast rgl ROCR stringr]; }; TMTI = derive2 { name="TMTI"; version="1.0.1"; sha256="080k4lmwspxi6salv4zq9lipwcah3zr6vfc0lrll1z8gynk8arq9"; depends=[Rcpp]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TNRS = derive2 { name="TNRS"; version="0.3.4"; sha256="16w1jga1f6fb8fpwrgrvsghwp4fzb0n81vwnsr6x0nrm185a918a"; depends=[httr jsonlite]; }; @@ -5434,10 +5434,10 @@ in with self; { TOHM = derive2 { name="TOHM"; version="1.4"; sha256="15i9hrvxlnwbs9vrsyrfhnm4xwmi97hss2da0xqs1xj5nmzwymqh"; depends=[EQL igraph Matrix nloptr Rmpfr]; }; TORDs = derive2 { name="TORDs"; version="1.0.0"; sha256="0135xy5gfjnnnchr59i3k0hlxybh5dg3fwqg2z6jv9a3hmkbx21g"; depends=[]; }; TOSI = derive2 { name="TOSI"; version="0.3.0"; sha256="00v0cjyz22akar7jrpg5alnnbh2nhxjh5cmq053i65xl0wlbzdpg"; depends=[glmnet hdi MASS scalreg]; }; - TOSTER = derive2 { name="TOSTER"; version="0.7.1"; sha256="0081vdl6wpm62x992z6bx3c46qxkiy3f6k8kvwpwvkslh76pbf0z"; depends=[cowplot distributional ggdist ggplot2 jmvcore R6 tidyr]; }; + TOSTER = derive2 { name="TOSTER"; version="0.8.0"; sha256="1y2aqf3ml0hhw3hcxnmchj0j7x6snd7x02cv91d7177j5bmv9g6n"; depends=[cowplot distributional ggdist ggplot2 jmvcore lifecycle R6 tidyr]; }; TOU = derive2 { name="TOU"; version="0.1.0"; sha256="0wia39yj7abnicx4xhaq1g69qx5fmzh6gywyl5yqfmw03azmyl55"; depends=[DEoptim ggplot2 Rdpack]; }; - TOmicsVis = derive2 { name="TOmicsVis"; version="1.2.3"; sha256="0in6xc6mjsvp3bkrj8ik1mwd3pnq5sdxqc987ygw8yb80fzrfycs"; depends=[Biobase circlize clusterProfiler ComplexHeatmap cowplot dplyr e1071 EnhancedVolcano enrichplot factoextra GGally ggcorrplot ggforce ggnewscale ggplot2 ggplotify ggpolypath ggpubr ggrepel ggsci igraph Mfuzz pheatmap plotrix randomcoloR RColorBrewer reshape2 Rtsne stringr survival survminer tidyr vegan venn WGCNA]; }; - TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; }; + TOmicsVis = derive2 { name="TOmicsVis"; version="2.0.0"; sha256="0s46i8wnvvs15xwb0g62rpn864b27hbx0lrjpcv2wb1s27iz1wv3"; depends=[Biobase circlize clusterProfiler ComplexHeatmap cowplot dplyr e1071 EnhancedVolcano enrichplot factoextra GGally ggcorrplot ggforce ggnewscale ggplot2 ggplotify ggpolypath ggpubr ggrepel ggsci igraph Mfuzz pheatmap plotrix randomcoloR RColorBrewer reshape2 Rtsne shiny stringr survival survminer tidyr umap UpSetR vegan venn WGCNA]; }; + TP_idm = derive2 { name="TP.idm"; version="1.5.1"; sha256="0w8sgzm5bmv9m16dryxpw51q000mfmbipxqnhb26bkzr6y46bd79"; depends=[]; }; TPCselect = derive2 { name="TPCselect"; version="0.8.3"; sha256="1x3db852zp3c12aihwbaak4i0dwjyl4sfv5snn7ap3gj3lydlznp"; depends=[corpcor KernSmooth MASS psych]; }; TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; @@ -5453,7 +5453,7 @@ in with self; { TRexSelector = derive2 { name="TRexSelector"; version="0.0.1"; sha256="1iwyy6jmg4nxkdsybjwsc8h5f74yq6kf708pslr9ss82b2xmd0q1"; depends=[doParallel doRNG foreach glmnet MASS tlars]; }; TSA = derive2 { name="TSA"; version="1.3.1"; sha256="14g58s2w7wma1fgcg3b51267b3676zrv0w8v4hpypxygz023d9bx"; depends=[leaps locfit mgcv tseries]; }; TSANN = derive2 { name="TSANN"; version="0.1.0"; sha256="1sk9jq6k5qf8k03yhrb2jmazdh8gi2a17pc5m0agcvxiv4lmp5sp"; depends=[forecast gtools]; }; - TSCI = derive2 { name="TSCI"; version="3.0.0"; sha256="12601z7w6rcv4hl7dj4h23r0hf6q3dgsqbb6msqnvh3i2i9zidgb"; depends=[fastDummies ranger Rfast xgboost]; }; + TSCI = derive2 { name="TSCI"; version="3.0.4"; sha256="01r09q1bvy8q28xmk28rmd3cx2y1kv9wgvrdmn3l08arjs83qv9g"; depends=[fastDummies ranger Rfast xgboost]; }; TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; }; TSDFGS = derive2 { name="TSDFGS"; version="2.0"; sha256="02p4caby7w1hgvizhm4cy0jr9mwwnh7gcq1snvz0cbd4mzpjcqgc"; depends=[dplyr ggplot2 latex2exp lifecycle Rcpp RcppEigen]; }; TSDT = derive2 { name="TSDT"; version="1.0.7"; sha256="0h2nwlzq6p11735nhkkqz6r7lpmw98bwy9dpdmvj4wqb7c64p90p"; depends=[hash mlbench modeltools party rpart survival survRM2]; }; @@ -5472,10 +5472,10 @@ in with self; { TSP = derive2 { name="TSP"; version="1.2-4"; sha256="1263ay3dar2mzm89nf31gl7n8d983qjiy4qwz7sgv8vwkbz0pg9h"; depends=[foreach]; }; TSPred = derive2 { name="TSPred"; version="5.1"; sha256="14dzpm5i5iml9kb49rnw7kq1ga03l4c6m485b1p8p3ya0n6mivkl"; depends=[dplyr e1071 elmNNRcpp EMD forecast keras KFAS magrittr ModelMetrics MuMIn nnet plyr randomForest Rlibeemd RSNNS tfdatasets vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.3.1"; sha256="1la1ff9ajcabdsz5f2761647304fpwp779gv0gjds4mg25rf6n2f"; depends=[bfast broom ggplot2 mblm RcppRoll strucchange]; }; - TSSS = derive2 { name="TSSS"; version="1.3.4-4"; sha256="08j3hzyd4wzp8a3190anyn410ffcp1dq09whir25kb2vvv3vw4fx"; depends=[]; }; + TSSS = derive2 { name="TSSS"; version="1.3.4-5"; sha256="13d58fkjll08hznpawl1ln93vz5sy65k8j92kxz4kkpw2jdg690h"; depends=[]; }; TSSVM = derive2 { name="TSSVM"; version="0.1.0"; sha256="07jf5s557j2xr5918fa0rkzz0ivb01acyzw2cbky92wjd21qa97s"; depends=[e1071 forecast]; }; - TSTutorial = derive2 { name="TSTutorial"; version="1.2.6"; sha256="1yvymr2z1853zmgj1nf8p86pbyzx666rcfyyzqvrscb7ab0bdfld"; depends=[MASS]; }; - TSVC = derive2 { name="TSVC"; version="1.2.2"; sha256="0c2dwsb17al6vfgk38xlbzww08xa1i2lji1bhzc3zlp7nb4mkxy8"; depends=[mgcv plotrix]; }; + TSTutorial = derive2 { name="TSTutorial"; version="1.2.7"; sha256="0cjhf103h1s2g7q3p9z8n8b3pkydfxn2sbnhv9rjwiibhdk7ql2h"; depends=[MASS]; }; + TSVC = derive2 { name="TSVC"; version="1.5.3"; sha256="1cfl6rzxkqjilhl44izd1746yilammbsrpm92bp2gs4a2kka8i9y"; depends=[mgcv plotrix]; }; TSclust = derive2 { name="TSclust"; version="1.3.1"; sha256="1pj984sf7z0bakr55jqcrxr4mh4gihdv197m2k05phpp5hsplsjh"; depends=[cluster dtw forecast KernSmooth locpol longitudinalData pdc]; }; TSdeeplearning = derive2 { name="TSdeeplearning"; version="0.1.0"; sha256="0phf0nksraf1w7hkg4b9kk890743cbmgra8blqblyd8n6gfy1r9p"; depends=[BiocGenerics keras magrittr reticulate tensorflow tsutils]; }; TSdisaggregation = derive2 { name="TSdisaggregation"; version="2.0.0"; sha256="1c1xsjhmm76hxin0hzr5bl94k5y3vwaprdrarpfil142cm8qnvnj"; depends=[lars Matrix Rdpack withr zoo]; }; @@ -5500,10 +5500,9 @@ in with self; { TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.2"; sha256="034vca0il7006zdkh5vdfjddyq9lg5mkl8hjria2rpks6wx0jhrd"; depends=[]; }; TailClassifier = derive2 { name="TailClassifier"; version="0.1.0"; sha256="1m9a2x837v6s7gsv8g5ll6s2h1lk0jjfig2qvkqzg97xp7v9b8in"; depends=[readr]; }; TailRank = derive2 { name="TailRank"; version="3.2.2"; sha256="02cxfdrc2pncw7pivg00414rzy27jp57pbg2ibq5a4fj8zm9bv91"; depends=[Biobase oompaBase oompaData]; }; - TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; }; TangPoemR = derive2 { name="TangPoemR"; version="0.1.0"; sha256="06w5gg36mx0vdagkhy7rskgjv2d3irr0d3nkjw26vxp25x1py4sf"; depends=[jiebaR]; }; TangledFeatures = derive2 { name="TangledFeatures"; version="0.1.1"; sha256="1jkhnl6y9jwxcj8njx2m8lax2z15ma6rk0bci871n4y6bp4bk4zn"; depends=[correlation data_table dplyr fastDummies ggplot2 igraph janitor Matrix purrr ranger]; }; - TapeR = derive2 { name="TapeR"; version="0.5.2"; sha256="00j3d77qziazkk6xwx4zygxa7ak33wpgr3x52ki6d64s8w8713ag"; depends=[nlme pracma]; }; + TapeR = derive2 { name="TapeR"; version="0.5.3"; sha256="0sllhxcfa2zcbgmcl7wmz62grdmjz3ynbhnqmq4bb6y5ssq6bf9j"; depends=[nlme pracma]; }; TapeS = derive2 { name="TapeS"; version="0.12.1"; sha256="1f6g8hz4bj7192kh5s7a1vc6kh4niw4pw3d259mwfklmkbc26m4f"; depends=[Rcpp RcppArmadillo TapeR]; }; Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; }; TauStar = derive2 { name="TauStar"; version="1.1.4"; sha256="06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1"; depends=[Rcpp RcppArmadillo]; }; @@ -5519,7 +5518,7 @@ in with self; { Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; }; TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; }; TempStable = derive2 { name="TempStable"; version="0.2.0"; sha256="1mvxl82q104899vaw44jdy5q7g76xb961zhcwvps1j9x3h27fyss"; depends=[copula doParallel foreach gsl hypergeo moments numDeriv rootSolve stabledist StableEstim VGAM]; }; - Temporal = derive2 { name="Temporal"; version="0.3.0"; sha256="1f1gp7zqaa2phv9rik6nmlj4dcqlm7z9s6y5iify3v6vai9sky72"; depends=[dplyr expint numDeriv tidyr]; }; + Temporal = derive2 { name="Temporal"; version="0.3.0.1"; sha256="0xsvnm4fvbyih731h6by7zva5pm11r8k0paky8kl7zdr72rpkym4"; depends=[dplyr expint numDeriv tidyr]; }; TemporalGSSA = derive2 { name="TemporalGSSA"; version="1.0.1"; sha256="0fbpgng4i46wkd38i0j5461nrmcasqpnyn58f7llpk0r6p2fizx2"; depends=[]; }; Tendril = derive2 { name="Tendril"; version="2.0.4"; sha256="1wvczfklsccs8jd081vb6d6h7i35lhf6na925fm7wq8ars0b23wd"; depends=[dplyr ggplot2 magrittr plotly plyr reshape2 scales]; }; TensorClustering = derive2 { name="TensorClustering"; version="1.0.2"; sha256="094pk4v78d97sanrkirk0dyhy6w2i43imcw21q2r76w11d62w7k7"; depends=[abind combinat MASS mvtnorm pracma Rcpp rTensor tensr TRES]; }; @@ -5528,12 +5527,13 @@ in with self; { TensorTest2D = derive2 { name="TensorTest2D"; version="1.1.1"; sha256="1yx1ggsbximbsrwimyg7jblbqr0f75z278f38hg61qjxzf9m4ndk"; depends=[]; }; Ternary = derive2 { name="Ternary"; version="2.2.1"; sha256="0cjivmnyp0dpsi9qnbr59mvc0g9ljp6liiwvx856ac86cihndf8y"; depends=[PlotTools RcppHungarian shiny sp viridisLite]; }; TesiproV = derive2 { name="TesiproV"; version="0.9.2"; sha256="00igkm0y9v363djhig4ydn3bfadqf6rrrdhkai2pl1w876xk2ydw"; depends=[edfun ggplot2 gridExtra nloptr pracma]; }; + TestAnaAPP = derive2 { name="TestAnaAPP"; version="0.1.2"; sha256="0d3mas93lrqppl6padvfrssw0z36lpfnr82s33jl0d1dh66jbj5q"; depends=[bruceR cowplot dplyr DT EstCRM flextable ggplot2 golem mirt officedown officer openxlsx plotrix rmarkdown shiny shinycssloaders shinydashboard stringr tidyr tidySEM]; }; TestCor = derive2 { name="TestCor"; version="0.0.2.2"; sha256="01ndiqi0z672ymm2bid0r0cqz8fqd9268xgmmq74z3agj81l5c5j"; depends=[MASS Rcpp RcppArmadillo]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="2.3"; sha256="11acpw9vjar6g8n9cifpfs4208j1hqqp15j59mr9pnfwq747hw2z"; depends=[Amelia mice]; }; TestDesign = derive2 { name="TestDesign"; version="1.5.1"; sha256="1r59zx97g1z49x6lkiqw2kclb88jksgwj589jymwcng3h5ja68ah"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; }; TestDimorph = derive2 { name="TestDimorph"; version="0.5.7"; sha256="0sim4ph2rkm450gipggdswaw2aykjgfp18i72vyjkbyqh366n125"; depends=[corrplot dplyr ggplot2 Morpho multcompView tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; - TestGardener = derive2 { name="TestGardener"; version="3.2.3"; sha256="1vppjbpdbbf09m5bm57mq03g6xhk900yic3l774lj0h2gd7dq092"; depends=[dplyr fda ggplot2 ggpubr knitr plotly pracma rgl rmarkdown stringr tidyr utf8]; }; + TestGardener = derive2 { name="TestGardener"; version="3.2.6"; sha256="1i8xrxzadgxkmxv2wcy7hw90kawm18qv9mfxm9czf08jl1bx1ydx"; depends=[dplyr fda ggplot2 ggpubr knitr plotly pracma rgl rmarkdown stringr tidyr utf8]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; Tex4exams = derive2 { name="Tex4exams"; version="0.1.2"; sha256="0058xn98vy40d0lfxral56avmqck7n6x2gb7j2ngnnj356di5d8m"; depends=[fractional numbers polynom pracma]; }; @@ -5552,24 +5552,23 @@ in with self; { ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; - ThresholdROC = derive2 { name="ThresholdROC"; version="2.9.1"; sha256="1hainm0n5v9dc4q130r7jiica61p0pmnjnwh3v6i03djkvc2257l"; depends=[ks MASS numDeriv pROC]; }; + ThresholdROC = derive2 { name="ThresholdROC"; version="2.9.2"; sha256="0r1ahhfgqq1zk9rp80i25fcxmsxsmys3xi3mf4d9fbyqlvd6dw53"; depends=[ks MASS numDeriv pROC]; }; ThresholdROCsurvival = derive2 { name="ThresholdROCsurvival"; version="1.1.1"; sha256="10bgjs0ybd4h4hhgh7mj0sk4xwwf49dp48gvqwhvdrm11k3b52vs"; depends=[boot InformativeCensoring pROC psych survival ThresholdROC]; }; + ThurMod = derive2 { name="ThurMod"; version="1.1.11"; sha256="01ay1w3h300day5aljha93xyk0n8a98c7g5binvchgsa019mg9dd"; depends=[lavaan MASS matrixStats mvtnorm]; }; TiPS = derive2 { name="TiPS"; version="1.2.3"; sha256="061lyai1kjm5glm69wxpnqvgp1xzj8j893pa73x5fl228dqm526f"; depends=[gtools inline Rcpp stringr]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.5"; sha256="1cnfnmwmlicsi243058zq3302niwk2l1agrrjy4k7rf1v7gfy6xx"; depends=[chron data_table fields]; }; TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; }; TideTables = derive2 { name="TideTables"; version="0.0.3"; sha256="0xfwikz9f58pw1j5vp45wp44lbr8b8ijlac474nzahq46d411afp"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="2.1"; sha256="0da3z010ali83qf8mf1znicqv8vvsa5r93mc40ax60ln2w33nlrm"; depends=[]; }; - TidyConsultant = derive2 { name="TidyConsultant"; version="0.1.0"; sha256="1ipv0nx0xmba62c7qjgadpjsr850d9dl0z5zjkh1rj6kfxdgiis2"; depends=[autostats badger framecleaner pacman presenter tidybins validata]; }; TidyDensity = derive2 { name="TidyDensity"; version="1.2.5"; sha256="1r55yjclnf0n88scscivhixymibiz6d5mki9si04nn50bjv9qp2n"; depends=[actuar broom data_table dplyr ggplot2 magrittr nloptr patchwork plotly purrr rlang survival tidyr tidyselect]; }; TidyMultiqc = derive2 { name="TidyMultiqc"; version="1.0.3"; sha256="1gnkq2ssc9lvkz1j52c2l4v1frxfcnw3j186kf3xbx8qx1aikyqr"; depends=[assertthat dplyr jsonlite magrittr purrr rlang stringr tibble]; }; - TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.4"; sha256="0ihigrbdkfbqqjxqfx3y5q8ii8n60301s7190jr50a88l1xzgmh8"; depends=[forecast jsonlite locfit trend tseries]; }; TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; }; TimeVarConcurrentModel = derive2 { name="TimeVarConcurrentModel"; version="1.0"; sha256="0fq05yni8hasivwmv5dk5ivwkprh4fkaa7h1bv8b60savvh0zs23"; depends=[Bolstad2 fda]; }; Tinflex = derive2 { name="Tinflex"; version="2.4"; sha256="1rrxlbv6xsnqr2zcadcr9g2p64zgkih89997inx0azl7v788sm9i"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.2"; sha256="1svjl2va3vpa1m13wmyy3bpx76xxivalwprzbaavwxf8lgk34wgr"; depends=[expm huge igraph rTensor]; }; TmCalculator = derive2 { name="TmCalculator"; version="1.0.3"; sha256="1zrsndpdl9bcl1w6szz8rdzadk7jsbd14fajnndliz9fra1ra7xg"; depends=[]; }; - Tmisc = derive2 { name="Tmisc"; version="1.0.0"; sha256="1zs7zxawl13pils9hff0i5aplxy32ccp27jcmjdh39lgf083s3v3"; depends=[dplyr magrittr rstudioapi tibble]; }; + Tmisc = derive2 { name="Tmisc"; version="1.0.1"; sha256="0j2cr51mrbxpmk70dz99d7h2y2y649zaql6262v7nzvqyc6m1h47"; depends=[dplyr magrittr rstudioapi tibble]; }; TooManyCellsR = derive2 { name="TooManyCellsR"; version="0.1.1.0"; sha256="0cypjf4a9q2kw4gwxlr59nbwn25wrrhrcmpksxi2yhd3qhk71q8n"; depends=[cowplot ggplot2 imager jsonlite Matrix]; }; ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.6"; sha256="1c37xv8h4jycnn9cnxlvby3p8hl3gfp4bdsbxm06bb323qj774pd"; depends=[calibrate HardyWeinberg MASS]; }; TopDom = derive2 { name="TopDom"; version="0.10.1"; sha256="1rryfnwvdlpdrjgs6sciy91cxfp4jykll0swclasydjvj4n642i6"; depends=[ggplot2 matrixStats reshape2 tibble]; }; @@ -5577,42 +5576,42 @@ in with self; { TopSisWM = derive2 { name="TopSisWM"; version="1.0.2"; sha256="1rhvygr07qf65qib83l061vg8j262rbgd96r1z1sm97r2b7l85z0"; depends=[]; }; TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="2.0.1"; sha256="0i21g7zzad973802kfp8s638d3g70c4vkrm59i9frb71apvkljk2"; depends=[TreeTools]; }; - TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; ToxCrit = derive2 { name="ToxCrit"; version="1.0"; sha256="1jxi10b733k3djfykyqnpcp2fapsmaszsd7lkwcwmwq62v73rhax"; depends=[]; }; Tplyr = derive2 { name="Tplyr"; version="1.1.0"; sha256="077xhbhn00g265x6aciay75cziw2jhx2pkwgx64slhaksgyd3idm"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - TraMineR = derive2 { name="TraMineR"; version="2.2-7"; sha256="0kc3mfvrd7zkxm5a89kgjfaqm99kikfdkvccy4fh5xzz8jg7wv41"; depends=[boot cluster colorspace RColorBrewer vegan]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-8"; sha256="0qp7q8hbbr57ym9q2kcypi2b6ya5z7604kwaxmqzvcbz0rf90aq5"; depends=[boot cluster colorspace RColorBrewer vegan]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.6"; sha256="172kp9pww79fjg1z5k3cfwknk0a0729nr43lb18l6cqzwmhy9bs4"; depends=[cluster colorspace doParallel foreach RColorBrewer survival TraMineR]; }; TraceAssist = derive2 { name="TraceAssist"; version="0.1.0"; sha256="03x071nsfgz1z2qp1zn1y3hfx8ydpj0z4rcfk2i588ad53z86w4c"; depends=[glmnet keras Matrix quadprog]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.3"; sha256="0x2wydp9qj2r2rsv0kmwlq4y7mr391ya13rpnj3mdgl0pjdp445s"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="2.5"; sha256="0k048pn06qc1kvz0bj3bgfvaf3nqw6flqn4kvxj6vxhzlz3km9qs"; depends=[data_table PerformanceAnalytics reticulate]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.2"; sha256="1xjvh0y1fw6j3psjm61wmggaf61qx13mirjyrli4cf7z1k7r0fzw"; depends=[caret data_table DescriptiveStats_OBeu dplyr lubridate RCurl zoo]; }; - TraitStats = derive2 { name="TraitStats"; version="1.0.2"; sha256="07jiipxkidr0hnb3lbbb8yj007m5qzcbq9p5py276sckalamzri0"; depends=[gridExtra lattice qpdf rlist]; }; - TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; + TransGraph = derive2 { name="TransGraph"; version="1.0.1"; sha256="0fr038zd4gg3cjlsjl6jz6a73bp0rfbxmgphnbv0ambbm62i9w3h"; depends=[clime dcov doParallel EvaluationMeasures expm glasso HeteroGGM huge MASS rTensor Tlasso]; }; TransModel = derive2 { name="TransModel"; version="2.3"; sha256="1wyg3cn7wp1jird16n88ygikf7qpqv3xhnyj3sv4l7gmwvjp5v5a"; depends=[MASS survival]; }; TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; TransPhylo = derive2 { name="TransPhylo"; version="1.4.5"; sha256="0g92kwi1nlmpc8m4pc9kv9xhczryr2kn9icfr3js7da7vy8g50xy"; depends=[ape Rcpp]; }; TransTGGM = derive2 { name="TransTGGM"; version="1.0.0"; sha256="0c815qp0nb4c8ymq9gm9yr37vkzlb6fja9j0czl6ww7rvr8fplrn"; depends=[doParallel expm glasso MASS Matrix rTensor Tlasso]; }; Transform = derive2 { name="Transform"; version="1.0"; sha256="0dynxrmpyji2dn42l4s87waz7m77ci0h7rnsc3zm6a3ya9gxgdfv"; depends=[]; }; Tratamentos_ad = derive2 { name="Tratamentos.ad"; version="0.2.4"; sha256="15xba5g5b9rxpndgmhlnnq35xjic9v7ymgpyaaj6fn0kziphip84"; depends=[crayon]; }; + TreatmentPatterns = derive2 { name="TreatmentPatterns"; version="2.5.2"; sha256="12nm3acb0ksky59mpns5hrrcqc9hcwz12k9s1wkc8xp6w1xfkhg2"; depends=[Andromeda checkmate data_table DatabaseConnector dplyr fs glue googleVis R6 rjson SqlRender stringi stringr tidyr]; }; TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; TreeBUGS = derive2 { name="TreeBUGS"; version="1.5.0"; sha256="0nxv2hh7flmyfm2pap97hwjyz29hfzybfv3b1v0ygqffgmh1j7mb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; }; TreeDiagram = derive2 { name="TreeDiagram"; version="0.1.1"; sha256="03kn9h37wgx300szzxmg21zc5iz3a9v8f2ydzv6dv6rhpa7yn0v5"; depends=[ape cowplot ggplot2 stringr tree]; }; TreeDimensionTest = derive2 { name="TreeDimensionTest"; version="0.0.2"; sha256="1bwvspjvc1cragbsrc05vhwk0zmfj36r9piqbj0vgahpjb4cswn9"; depends=[fitdistrplus igraph mlpack nFactors RColorBrewer Rcpp Rdpack]; }; - TreeDist = derive2 { name="TreeDist"; version="2.6.2"; sha256="1cmzf4z9f5xp6fl972clkw6kfn1ljx68xsivhb3y4ihhm3zrqgdb"; depends=[ape cli colorspace memoise phangorn Rcpp Rdpack shiny shinyjs TreeTools]; }; - TreeSearch = derive2 { name="TreeSearch"; version="1.3.2"; sha256="00khyb7myppcmw4y1wxzlp3x6835p8rfi9vmyfzg86bs5wlqg5g1"; depends=[ape cli cluster fastmatch future PlotTools promises protoclust Rcpp Rdpack Rogue shiny shinyjs TreeDist TreeTools]; }; + TreeDist = derive2 { name="TreeDist"; version="2.6.3"; sha256="165535fzmrafps9lvzdnlgxz510x34rr6aqy56hv0qhaq0h13j9j"; depends=[ape cli colorspace memoise phangorn Rcpp Rdpack shiny shinyjs TreeTools]; }; + TreeSearch = derive2 { name="TreeSearch"; version="1.4.0"; sha256="1nhy1bq4pkbj0c09750hzjnzgqv5k1042fjra9dw4yk24rk1dyi7"; depends=[ape cli cluster fastmatch fs future PlotTools promises protoclust Rcpp Rdpack Rogue shiny shinyjs TreeDist TreeTools]; }; TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="2.5"; sha256="125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx"; depends=[ape TreeSim]; }; - TreeTools = derive2 { name="TreeTools"; version="1.9.2"; sha256="1lbwgbhqnyq0iy49vnqfclfdsn1f47wpa42l2mgyi741pwfgqg4a"; depends=[ape bit64 colorspace fastmatch lifecycle PlotTools R_cache Rcpp Rdpack]; }; - TrenchR = derive2 { name="TrenchR"; version="0.1.1"; sha256="03w010s3zxbrn7nh439d5mg1670k2hylci28i74q39b9235xn8vz"; depends=[deSolve msm Rdpack zoo]; }; + TreeTools = derive2 { name="TreeTools"; version="1.10.0"; sha256="1ghp8dsr3y1xsbg53fw94xmwyxylcqd5jxijfi5hxis9mskc985j"; depends=[ape bit64 colorspace fastmatch lifecycle PlotTools R_cache Rcpp RCurl Rdpack]; }; + TrenchR = derive2 { name="TrenchR"; version="1.1.1"; sha256="0724dgm9yl906lk2vxffd465gy9kv7fdb0yymbnbq9flwxr4nfig"; depends=[deSolve msm Rdpack zoo]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; }; TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; }; TrendTM = derive2 { name="TrendTM"; version="2.0.14"; sha256="1sm2mcjwh1y3bw5gp67mlqayzy6sin6azlmycff58k6pwy88fqzf"; depends=[capushe fda softImpute]; }; Trendtwosub = derive2 { name="Trendtwosub"; version="0.0.2"; sha256="12ibxxq58h9w7hlrsxwdirh02casj495rxbfknaggwfx3w30nm56"; depends=[magrittr usethis]; }; Tri_Hierarchical_IBDs = derive2 { name="Tri.Hierarchical.IBDs"; version="1.0.0"; sha256="1wmpls4kwkgrra1pss6ddp2295ngk1ri026zf408kmfmd17vmwmj"; depends=[]; }; - TriDimRegression = derive2 { name="TriDimRegression"; version="1.0.1"; sha256="19r7639xw0jqq1wayaanvsk9pa1z92p9ph3zcjy0ifq3z92b1al4"; depends=[bayesplot BH dplyr Formula future glue loo purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; + TriDimRegression = derive2 { name="TriDimRegression"; version="1.0.2"; sha256="1p6dncx53bk7vca193c46idsw6hvn0z5px3p3zh0qky1jan2rycl"; depends=[bayesplot BH dplyr Formula future glue loo purrr Rcpp RcppEigen RcppParallel rstan StanHeaders tidyr]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; }; TriadSim = derive2 { name="TriadSim"; version="0.3.0"; sha256="0r9p50vw2gcbm02vl24q4g1vj46ll0v1vvxi2ip1k73hymv6pz3g"; depends=[doParallel foreach snpStats]; }; + TrialEmulation = derive2 { name="TrialEmulation"; version="0.0.3.2"; sha256="0w6cj85da9dmpymmjr2p0962p3gd8nkbdbnpynnqcjslzxwwjdm1"; depends=[broom checkmate data_table formula_tools mvtnorm parglm Rcpp sandwich]; }; TrialSize = derive2 { name="TrialSize"; version="1.4"; sha256="0k162n3jr2ixdl3pp90izdr83z14hj70jb9mrfw3iqz0pczp2cpj"; depends=[]; }; TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.5.4"; sha256="1al8cihrjz931gjn3bf94h0nd7a9hc1cmf50bkikj35vwy5kaxij"; depends=[ggplot2 plyr reshape2]; }; @@ -5621,12 +5620,11 @@ in with self; { TrtCombo_FactorialExp_SR = derive2 { name="TrtCombo.FactorialExp.SR"; version="4.0.4"; sha256="1kc5nqivsia801hdll5zcl4w6ayx7pabx7xz70l75h1f966ahnr7"; depends=[]; }; TrueSkillThroughTime = derive2 { name="TrueSkillThroughTime"; version="0.1.1"; sha256="0d5zq3aniqm06qq9pzns5q8223gp33gp0f5273z01xd43mn6ggjn"; depends=[hash]; }; TrumpetPlots = derive2 { name="TrumpetPlots"; version="0.0.1.1"; sha256="0wr4yz8qwndi7r8dw5wn1myiidvlij9sp25id7avb562hyq504pq"; depends=[data_table ggplot2 magrittr purrr]; }; - TruncExpFam = derive2 { name="TruncExpFam"; version="1.0.0"; sha256="0059afyfvzliwpw4l1846yxcpqqdy9c2kk0xa0fl5nxh89c2hr7v"; depends=[invgamma rmutil]; }; + TruncExpFam = derive2 { name="TruncExpFam"; version="1.0.1"; sha256="11i28jqxy2isfqalf1b32x39d3g443kw86ci3nsb1nlzyrw6lis5"; depends=[invgamma rmutil]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.2.2"; sha256="05cfn7mdq0hgw97bbb227in9ccjz727sp67xpnpx2r1ajvl6gxdf"; depends=[alabama nleqslv randtoolbox Rcpp RcppArmadillo]; }; - TrustVDJ = derive2 { name="TrustVDJ"; version="0.1.0"; sha256="154fawx32v2gdvfdyssj04h1y0q2zc2wn4ww4nzaf0nlwbvc2z6v"; depends=[Biostrings data_table rvest]; }; - TukeyC = derive2 { name="TukeyC"; version="1.3-41"; sha256="1q41wvyzl3xyiqshnq0cpczrb8pr0y8m362wcnlbyc4awwfylasm"; depends=[doBy xtable]; }; + TukeyC = derive2 { name="TukeyC"; version="1.3-42"; sha256="1mzygb3yna1qnk0n8rvwnm32kfrjd2fqwpc4kdwadw1sl6xvp44b"; depends=[doBy xtable]; }; TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.6.3"; sha256="02w84bha6niyval71a06ibk42crvv2259302ckdzmb61ik9sg44d"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; }; - TunePareto = derive2 { name="TunePareto"; version="2.5.2"; sha256="1zv467ddy8fsyj4473jyj5cwm7gx3n30py2y7wlqgwbxpfsgxn09"; depends=[]; }; + TunePareto = derive2 { name="TunePareto"; version="2.5.3"; sha256="097rawf1mjam6gbh7ng0x8hcjv18zp9h0hvm62r6nfzyfzlakf7g"; depends=[]; }; TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; Tushare = derive2 { name="Tushare"; version="0.1.4"; sha256="0am3bq62ar5p5nv8gapbvh4ix150pskdrhda48lmcg0ii3l0qh9g"; depends=[data_table forecast httr tidyverse]; }; Twitmo = derive2 { name="Twitmo"; version="0.1.2"; sha256="0hr2gndrcsd4r4jxyzg1jbjbn1zslv8z5ny3xh42hda93866909d"; depends=[dplyr jsonlite ldatuning LDAvis leaflet magrittr maps plyr quanteda quanteda_textstats readr rlang rtweet stm stopwords stringi stringr tidyr tm topicmodels]; }; @@ -5636,26 +5634,25 @@ in with self; { TwoSampleTest_HD = derive2 { name="TwoSampleTest.HD"; version="1.2"; sha256="1mvrlvcdllk7mxfsmahgb3iq7ndlnc4xg1536c1mxphxlh5qxwp0"; depends=[]; }; TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; }; UBCRM = derive2 { name="UBCRM"; version="1.0.2"; sha256="0cfdgarlks0hkx4fnlm0i2fwpl057vxq58n3xfv718w3cs2nx9wc"; depends=[]; }; - UBL = derive2 { name="UBL"; version="0.0.7"; sha256="1zppc8mgmj4ymxfdvhqiirlf80wh65y58wqm92fgjdn7s06v5skf"; depends=[automap gstat MBA randomForest sp]; }; + UBL = derive2 { name="UBL"; version="0.0.9"; sha256="1jpm41la5210a9shak01fsgq2yw8l1cz5zbb5zlas2nc2jg7hslh"; depends=[automap gstat MBA randomForest sp]; }; UBayFS = derive2 { name="UBayFS"; version="1.0"; sha256="1aj627f8w30wfnf313adza85jffnp1yq34ri8cfaz5v0jzs1bfib"; depends=[DirichletReg GA ggplot2 gridExtra hyper2 matrixStats mRMRe Rdimtools shiny]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="1.1.10"; sha256="1jnmi3d1h31fx50lrsb1nl49p50jrx0vxmjsg6q6wdhwjnfxizd9"; depends=[dplyr ezcox forcats ggplot2 ggpubr magrittr ppcor psych purrr shiny stringr tibble tidyr UCSCXenaTools]; }; UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.4.8"; sha256="0w0rps6jsiw67k6h8j1g0nqzwwhl1kb2by90xd4w61i71vk0fda7"; depends=[digest dplyr httr jsonlite magrittr readr rlang]; }; UComp = derive2 { name="UComp"; version="4.0.2"; sha256="0k89palrdifgrz45ar3dcnrwpxwb01nqsg9k1qkwrilhyj9c254k"; depends=[ggforce ggplot2 gridExtra Rcpp RcppArmadillo tsibble tsoutliers]; }; UKB_COVID19 = derive2 { name="UKB.COVID19"; version="0.1.3"; sha256="053hsdaa7xnzk95bdp0i1jr6pzq50zvfn1m5sm0znsrk59m5xhgm"; depends=[data_table dplyr here magrittr questionr tidyverse]; }; - UKFE = derive2 { name="UKFE"; version="0.2.9"; sha256="1qw82lsmaam0zw9vk96jzhw9c2jl7ja7zck902l5xgc5izj3viy2"; depends=[xml2]; }; + UKFE = derive2 { name="UKFE"; version="0.3.0"; sha256="1yrjg99sywixriq7ibdfbz33ikwc6k2nb802prkjmiwlxhqcw10n"; depends=[xml2]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.3"; sha256="1x44iry2j5qbvd8ac9rv9dmg60hbhry2v4jj9hmm49bx10iwl9h2"; depends=[data_table dplyr lubridate magrittr tsibble xts zoo]; }; - UMR = derive2 { name="UMR"; version="1.1.0"; sha256="05g2gk7bmhzyill6fgq396yk0yi7qz4mdcy3cfzzx5nyr11rc8a7"; depends=[decon distr trust]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; - UNCOVER = derive2 { name="UNCOVER"; version="1.0.0"; sha256="010y2vj55bfyhsn0lkmafi3cbq183m85vqk1pya82hp10qxpp6q2"; depends=[cachem crayon GGally ggnewscale ggplot2 ggpubr igraph memoise mvnfast scales]; }; + UNCOVER = derive2 { name="UNCOVER"; version="1.1.0"; sha256="0x5ggwnzca6wz3ikpsa3aq8b715w8drkpchqp3jsg0g9imiw5y3m"; depends=[cachem crayon GGally ggnewscale ggplot2 ggpubr igraph memoise mvnfast scales]; }; UNPaC = derive2 { name="UNPaC"; version="1.1.1"; sha256="1dqli7fanh0gk2bfbcykrrswyjrl9g4rbplxjxgjri7kkmf03cd0"; depends=[huge PDSCE]; }; UPCM = derive2 { name="UPCM"; version="0.0-3"; sha256="1apah04qdgvxxf6q6xr53716pcrmds86sn8f7ykxj93ggg8k0bvl"; depends=[cubature ltm mvtnorm numDeriv Rcpp RcppArmadillo statmod]; }; UPG = derive2 { name="UPG"; version="0.3.3"; sha256="0j27135akpkn9qsllfr871fcz7hynmxzjac35b8zm65pr6ygjcap"; depends=[coda ggplot2 knitr matrixStats mnormt pgdraw reshape2 truncnorm]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; - UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.3"; sha256="14wjcr06gd1fphl6cdqkb5i1rfwamfbz4x4qn5zxklir88a6h1h4"; depends=[]; }; + UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.4"; sha256="14hj8yv366qix30x7hq1sfzrcrsx4ckfa010azi1ihzp307hfkbz"; depends=[]; }; + URooTab = derive2 { name="URooTab"; version="0.1.0"; sha256="0455ssqi0byi6absaxh5xvvyw9isn2fw3rjvyhmd7h9r5w3a1yd6"; depends=[EviewsR knitr magrittr xts zoo]; }; USA_state_boundaries = derive2 { name="USA.state.boundaries"; version="1.0.1"; sha256="0pdqnfpijs9n1vxkngs3mm5q9dwqfmlkm60jq8isxcd9fiadsig6"; depends=[]; }; USP = derive2 { name="USP"; version="0.1.2"; sha256="1fngs82r1xbym8qa1lj9jv1i57r3nx9rr093nfpjl82f7r0kr3sn"; depends=[Rdpack]; }; - UScensus2010 = derive2 { name="UScensus2010"; version="0.20.0"; sha256="0dby532dmmhaz7gisihg4dn70jyx5llfvm2zl2h0pxyqrxvm69d2"; depends=[foreign maptools sp]; }; USgas = derive2 { name="USgas"; version="0.1.2"; sha256="13aqwwigscvnvp55pmbx2z2ypqgw2ph35c4r6chwcqzsgz32zihq"; depends=[]; }; USgrid = derive2 { name="USgrid"; version="0.1.2"; sha256="0babwjnbdyfa2cf65gn08nzy1bs92i56lnhpx558yn0dyk75cz5s"; depends=[tsibble]; }; USpopcenters = derive2 { name="USpopcenters"; version="0.2.0"; sha256="0x3908g399zp03l78d53490rmciq66k8v85hyqircf4z0hfbaxja"; depends=[]; }; @@ -5667,31 +5664,33 @@ in with self; { Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; Umpire = derive2 { name="Umpire"; version="2.0.10"; sha256="1bhz1yfvpszqz4nal2wwjgllbq0hj6y0jf2bja3nfb7amj2m10gg"; depends=[BimodalIndex mc2d]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; + UniExactFunTest = derive2 { name="UniExactFunTest"; version="1.0.0"; sha256="03gnn36m735kycac526qrz5rkjhqcw9dp77x71z6qryy7i718qwv"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="15.0.0-1"; sha256="071cnap6kpwhvvz1rzhh771dlm8ndqk03ca94wnxfiwrwx4da4ky"; depends=[]; }; UnifiedDoseFinding = derive2 { name="UnifiedDoseFinding"; version="0.1.10"; sha256="07yppm6zazqgvsv6h8kwknrbi5dfa1fivh3kb22mc2y156k7kjjz"; depends=[]; }; - UniprotR = derive2 { name="UniprotR"; version="2.2.2"; sha256="0xljps2ms559m0x0fsabpgi1cms4jvx5sy6d73v3fw1cp5wydgav"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr ggsci gprofiler2 gridExtra htmlwidgets httr magick magrittr networkD3 plyr progress qdapRegex scales stringr tidyverse]; }; + UniprotR = derive2 { name="UniprotR"; version="2.3.0"; sha256="0zrhfcc58vizk4rb3acibcrn2xxp6mlbyxs0pk66crfiz0qn9pd8"; depends=[alakazam curl data_tree dplyr ggplot2 ggpubr ggsci gprofiler2 gridExtra htmlwidgets httr magick magrittr networkD3 plyr progress qdapRegex scales stringr tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; UnitStat = derive2 { name="UnitStat"; version="1.1.0"; sha256="185ivm4kg6hzqx3srk1shvpd5vlc0akn1sbg3wqcdsk2i2x6vhhm"; depends=[lmtest]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.2.3"; sha256="14z2yqv14sv16ycf7jf2kkp8pqn12d9lq4l568vmdm10qrl5x39d"; depends=[]; }; + UniversalCVI = derive2 { name="UniversalCVI"; version="1.0.1"; sha256="0havwnjbkby2v9slrwrjqxs30i5xfp9h77cdpbajrp7zmgbn15f0"; depends=[e1071 mclust]; }; UpDown = derive2 { name="UpDown"; version="1.2.1"; sha256="0c1mi43mkadhpalrd3wlp94ri1sp9ii5wcn44pgz35ki7nngrnaj"; depends=[dplyr ggplot2 mclust mixtools reshape2 shiny]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UpSetVP = derive2 { name="UpSetVP"; version="1.0.0"; sha256="1v6djfwaix978vzfjnj0vd3r0m3svfqkn9aqnf9qz2xsjk43m9zr"; depends=[ggplot2 patchwork rdacca_hp]; }; UsingR = derive2 { name="UsingR"; version="2.0-7"; sha256="17ljllslhfmi80yj1336lx9pmzy2i8zdb6byky5yay1lry7s1g30"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="4.3.3"; sha256="04x2dph917dwq6ja69yiizw808zwmm17v78j17mlksdnl6wcmm0c"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="4.4.0"; sha256="0ilg9ihx1mp9zj8023rh3lj875vqy253v9gbn1bw61h2p47w4nv3"; depends=[curl jsonlite Rcpp]; }; VAJointSurv = derive2 { name="VAJointSurv"; version="0.1.0"; sha256="19ib4b1kf1zg4l571f2asxkwbab44pzs954agj0wx1p6kb2v608q"; depends=[lme4 Matrix psqn Rcpp RcppArmadillo RcppEigen SimSurvNMarker survival testthat]; }; VALERIE = derive2 { name="VALERIE"; version="1.1.0"; sha256="15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; VALIDICLUST = derive2 { name="VALIDICLUST"; version="0.1.0"; sha256="1glcvzrbc7glxmbmas3zzb114a5cfl7gsf7xlxaifrrgvcahrvnx"; depends=[diptest dplyr]; }; VAM = derive2 { name="VAM"; version="1.0.0"; sha256="04lq8i4zwdc9a4n4hvabdyv4a4cmmqbf534cdnnck7jc0dk5rphr"; depends=[MASS Matrix]; }; - VAR_etp = derive2 { name="VAR.etp"; version="1.0"; sha256="0pm2m1wwsyrfwvqibf4mn6wbnslynvb1964i79iqhy5qp4nflajp"; depends=[]; }; + VAR_etp = derive2 { name="VAR.etp"; version="1.1"; sha256="03zybsn28r6jz8rshmifgqavx4kmfvj92wbqjf5fvfj4fypis8kx"; depends=[]; }; VARDetect = derive2 { name="VARDetect"; version="0.1.6"; sha256="1yrlyg4b53bdmfjcqi07l0gr3f01h8jwj6g6av3plyk96cvl4svb"; depends=[igraph lattice MTS mvtnorm pracma Rcpp RcppArmadillo sparsevar]; }; VARSELECTEXPOSURE = derive2 { name="VARSELECTEXPOSURE"; version="1.0.3"; sha256="0hfcy00zynrg2vfqym17zfs3ggm4wvsvjf2qib4pbd53qfhzabwa"; depends=[Rcpp RcppArmadillo]; }; VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; }; + VBJM = derive2 { name="VBJM"; version="0.1.0"; sha256="0g7mmjba8pyfz92p7fgp9shpm9pclymacm45y3h6hlmsbpc7sh3p"; depends=[Matrix pracma Rcpp RcppArmadillo RcppEnsmallen statmod survival]; }; VBLPCM = derive2 { name="VBLPCM"; version="2.4.9"; sha256="13qwqpnhdxd5lriz5p4w1dcng7msxbm4z2lfj93w7wcwidl93jw9"; depends=[ergm mclust network sna]; }; VBV = derive2 { name="VBV"; version="0.6.2"; sha256="1nrdcvkdv38xl67qi9igcp3l5j4hckiyg3klg7z0rfj6zzpszm71"; depends=[]; }; VBsparsePCA = derive2 { name="VBsparsePCA"; version="0.1.0"; sha256="0h1kzz7rjh4wn4nbq1v3r4f6nrmlh0lscww2vwfz886x1w2c9sys"; depends=[MASS pracma]; }; - VC2copula = derive2 { name="VC2copula"; version="0.1.2"; sha256="1kbzscdblb3n7mkkhvd75h8hyd6xbfb0lcjgysvyip4v7zc7whvc"; depends=[copula VineCopula]; }; VCA = derive2 { name="VCA"; version="1.4.5"; sha256="07r2vdmg94knz2mjvrw1jisajjsv1nsyx80y20wwc8msxkp8lijh"; depends=[lme4 Matrix numDeriv]; }; VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; }; VDJgermlines = derive2 { name="VDJgermlines"; version="0.1"; sha256="1aqjhkcj3bd5hk7iz0f2cy5nfp23gvhqsmg6nzlxd9klwc6xpq2h"; depends=[ape stringdist]; }; @@ -5701,12 +5700,11 @@ in with self; { VEwaningVariant = derive2 { name="VEwaningVariant"; version="1.3"; sha256="1w0d7z86gg16vjg3bd9flr53q02wjz5hzs0460hx167ixi13m5jv"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; VFP = derive2 { name="VFP"; version="1.4.1"; sha256="14idww1vy695mp9v2h0nxqi6flmm41cr30i0yd2nwjsnriwqgzak"; depends=[gnm MASS VCA]; }; VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; }; - VGAM = derive2 { name="VGAM"; version="1.1-8"; sha256="1k6i18ywfh0xlc7ipgvz1g9gdgkyz5phf1cwyfv8mn2nwgag3h6l"; depends=[]; }; - VGAMdata = derive2 { name="VGAMdata"; version="1.1-8"; sha256="1smxhydcg6qa3lpgfg2cl0qpkysfi7i5vnhnri4r8w7axms2vrj8"; depends=[VGAM]; }; + VGAM = derive2 { name="VGAM"; version="1.1-9"; sha256="1l5gn6495k8vqp2b4hj4g5ani7j4cli2p7n8fwkw7bmc42q13m6l"; depends=[]; }; + VGAMdata = derive2 { name="VGAMdata"; version="1.1-9"; sha256="1bk4c22rwpcm5aa1kdg0dh8c87pb54639xhlh4dkxwx2idn6s9b5"; depends=[VGAM]; }; VGAMextra = derive2 { name="VGAMextra"; version="0.0-5"; sha256="11s7s2dm2yf5s9qbwbyavz01l9fk86grp4mlhrh8hd6lfmxxxcxm"; depends=[VGAM]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIC5 = derive2 { name="VIC5"; version="0.2.6"; sha256="1zkvzkras94gyc43b9j4bq4mpyg9l1idx2pdd8a728gmq1daky0k"; depends=[foreach lubridate Rcpp RcppArmadillo]; }; - VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; }; VIGoR = derive2 { name="VIGoR"; version="1.1.2"; sha256="0ikyfla1c4x6plm05pihaas6qz43dip20i75c4cwk1lq7fqayq92"; depends=[]; }; VIM = derive2 { name="VIM"; version="6.2.2"; sha256="1r0myxcx8y1a3fkf9ssk882f09snn2j6zilsygpld32hahn4k9xg"; depends=[car colorspace data_table e1071 laeken magrittr MASS nnet ranger Rcpp robustbase sp vcd]; }; VIMean = derive2 { name="VIMean"; version="0.1.0"; sha256="0kxrcigp94h2j1vx5pj24sp73iqxldc1ygm5bak4jrld66r0nb5b"; depends=[]; }; @@ -5714,7 +5712,7 @@ in with self; { VLF = derive2 { name="VLF"; version="1.1"; sha256="096a7nx60qm4b7fil4s3r4mlp8fq60v0lq893jh3ij6gm63mfcim"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; }; VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.4"; sha256="09fpjskdc3bz1qjqvcivk873jyl0mcjm4zds2xa6bd82ka8rb4b8"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; - VMDML = derive2 { name="VMDML"; version="0.1.0"; sha256="0syqikndvpbpms2b116iyzkm191x6q60azbmznr7mwc8xa9469ss"; depends=[e1071 forecast randomForest VMDecomp]; }; + VMDML = derive2 { name="VMDML"; version="0.1.1"; sha256="12n32wx3hcvw55rrcwkv501cjl4zrpgh4d7y4m1irgrpjfqk77x2"; depends=[e1071 forecast nnfor randomForest VMDecomp]; }; VMDecomp = derive2 { name="VMDecomp"; version="1.0.1"; sha256="0iq2lj7n77qmryf95cjl2y869bhy6i0mx44qls7xc07g0qplwqx3"; depends=[data_table glue Rcpp RcppArmadillo]; }; VOSONDash = derive2 { name="VOSONDash"; version="0.5.7"; sha256="1qivx5ddl9jsn6q6ic2w8jrczxlx23z087k5arfz2rixgj7rndyg"; depends=[data_table httpuv httr igraph lattice magrittr RColorBrewer shiny SnowballC systemfonts syuzhet textutils tm vosonSML wordcloud]; }; VPdtw = derive2 { name="VPdtw"; version="2.1-14"; sha256="1pr8jrd7ymgf46h2gbvanqjrvpc4xs39sk86vvxhawzf3w31g257"; depends=[]; }; @@ -5733,10 +5731,9 @@ in with self; { VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.10"; sha256="09j8y6n0bwsj3n620nbni6b7f4pmb91q41770sfpc5v3l5i3jc7c"; depends=[curl RISmed stringi stringr XML XML2R]; }; VariableScreening = derive2 { name="VariableScreening"; version="0.2.1"; sha256="0djfpv46fhc3x4jvmjr93lyh4fxfzzvyrs3wjncx3h0z0s9n6w45"; depends=[energy expm gee MASS]; }; VarianceGamma = derive2 { name="VarianceGamma"; version="0.4-0"; sha256="0n3vmyxfn0sid6zax4n8508li7gnfdd4gghpf3i296dm3w8wn8ip"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - Vdgraph = derive2 { name="Vdgraph"; version="2.2-6"; sha256="042p7r179i1q0369zf8kqwrr54laxlc7m3d4s5ngg3h755bhhgcd"; depends=[]; }; - VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; }; - VectorCodeR = derive2 { name="VectorCodeR"; version="0.1.0"; sha256="0qakd219a1955iqmp28vbhi3h7wpvayfcgv2dmxi5qsslw1ws21b"; depends=[dplyr ggplot2 readxl tidyr tidyverse]; }; - VedicDateTime = derive2 { name="VedicDateTime"; version="0.1.7"; sha256="0rk8z2siawphdzs17hbjd0yxiav6lw01wxg5m3rwyal9wpca95l1"; depends=[swephR]; }; + Vdgraph = derive2 { name="Vdgraph"; version="2.2-7"; sha256="0kqcwlw8dsxb1jlp412m9a372kz26sampv56saxalf8rcyd3s2jp"; depends=[]; }; + VectorCodeR = derive2 { name="VectorCodeR"; version="0.2.0"; sha256="005nd55syn2f2a54ilbw3mi8r51gn5qfw4rdnkygpbgfngza01f8"; depends=[dplyr ggplot2 readxl tidyr tidyverse]; }; + VedicDateTime = derive2 { name="VedicDateTime"; version="0.1.9"; sha256="08kkwb5k0n4hjy9rw7bdgpls14a8xdnw3v0g56hhhxnwxf6whmly"; depends=[swephR]; }; VennDiagram = derive2 { name="VennDiagram"; version="1.7.3"; sha256="0ilcxcp8qskmb5cp7fyb7i0qizg42lrx0ny8ws3if90kfrglghp7"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; @@ -5748,19 +5745,21 @@ in with self; { ViewPipeSteps = derive2 { name="ViewPipeSteps"; version="0.1.0"; sha256="0lcm7zzflbbjpb1mdy6pppdmg9gvlcn7hg42a4fgm0kxhniwnmyg"; depends=[dplyr rstudioapi tibble]; }; VineCopula = derive2 { name="VineCopula"; version="2.5.0"; sha256="0s2v27i5cljvxzh3awpf3bcfbbghch0lphhghqnc7x51w1prxfai"; depends=[ADGofTest lattice MASS mvtnorm]; }; VirtualPop = derive2 { name="VirtualPop"; version="1.0.2"; sha256="0g3yzv9fqmxydqq6b56l6abz03slk7425aahixs3q26gwp587rz4"; depends=[HMDHFDplus msm]; }; + VisCollin = derive2 { name="VisCollin"; version="0.1.2"; sha256="1pcd7b14a2qnq1jlk63fascdb8hkys8cg4jw4rx6xk9xmvpvyhlb"; depends=[]; }; VisitorCounts = derive2 { name="VisitorCounts"; version="1.0.2"; sha256="0qm5qccikwdkdc9pm0gck5id3rjicb07jbds4fbvn3db071bzrdy"; depends=[Rssa]; }; VisualDom = derive2 { name="VisualDom"; version="0.8.0"; sha256="14qg44sivfhnvjac5yq4n5llhwq669m3j7a2z84rlz0737x7x5xd"; depends=[plot3D wavemulcor waveslim]; }; Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0.3"; sha256="1jfj0qp4a6jxw423d6ik18r7gy6zzcxlp71mfhpam256xay0sq8f"; depends=[cranlogs htmlwidgets plotly]; }; - VisualizeSimon2Stage = derive2 { name="VisualizeSimon2Stage"; version="0.1.1"; sha256="1xb001jdhf0z96zg51pkg9jng4nb4f7asqip7s5kx46fmzd1343s"; depends=[ggplot2]; }; + VisualizeSimon2Stage = derive2 { name="VisualizeSimon2Stage"; version="0.1.2"; sha256="12sanfik9ijq4gld2ry0gligixkixkqqm504zqc96r0yfmkq9hv9"; depends=[ggplot2]; }; VorteksExport = derive2 { name="VorteksExport"; version="0.1.8"; sha256="0r9wmd9bdarjkqmpwp85xz27nbyhjkcpxm8qb8bqjmxq4nds6nxx"; depends=[]; }; Voss = derive2 { name="Voss"; version="0.1.5"; sha256="00f3ljm85z8gr1qyc6nj9g35ywzm78khy8r82wb5ys8fx68n0vwl"; depends=[fields]; }; VoxR = derive2 { name="VoxR"; version="1.0.0"; sha256="16r9ggc5x889g8rjqvp1q2kgf5asjzhykd1ldjy3ny9m48p501ad"; depends=[circular data_table dplyr fastcluster FNN geometry raster Rfast rgl]; }; VulnToolkit = derive2 { name="VulnToolkit"; version="1.1.4"; sha256="01m8spmd4na7mxgnplnnq3n4pab9349z2dk44b455vcadll0fsdi"; depends=[plyr XML]; }; W2CWM2C = derive2 { name="W2CWM2C"; version="2.2"; sha256="0544wnyyv8glv4ljldmaqgynpshd5bvsqwsz9q1071dfshhxki1v"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-7"; sha256="1ns504i3567z90bz1p02mnfmnsgkk7wy2a772v2imiwjgzp0qia5"; depends=[curl xml2]; }; - W4MRUtils = derive2 { name="W4MRUtils"; version="0.0.1"; sha256="12yqy4066qj5k6imnqd6brkklhrx8a827fn8lhqcr6hfycm5p2ym"; depends=[]; }; + W4MRUtils = derive2 { name="W4MRUtils"; version="1.0.0"; sha256="1hzr2p3kp9k2y154a2p9qc9shyqpkh0m5ylk2f9ivm4m0f3ifqdp"; depends=[rlang]; }; WA = derive2 { name="WA"; version="1.0"; sha256="0i6hkajfalwpvxmmzfl7nhk4x6hhrf0xqpgny8b1gk1hw05yv03m"; depends=[]; }; WACS = derive2 { name="WACS"; version="1.1.0"; sha256="09fmdlpb99q9dw17lwp0bwpklgvgiqq7bfs9ryx5r54m0niklr9d"; depends=[mclust mnormt mvtnorm tmvtnorm]; }; + WALS = derive2 { name="WALS"; version="0.2.3"; sha256="1sz55yw8cmnssyjvvr3xvjks3i2gn3cgalra7hkx24v18lp47ksc"; depends=[Formula MASS Rdpack]; }; WARN = derive2 { name="WARN"; version="1.2-4"; sha256="18gfk9vqcqarj7j5i240wqv2dclg3csng4mih5izj40xaaxaf6q5"; depends=[MASS]; }; WASP = derive2 { name="WASP"; version="1.4.3"; sha256="1w822wl8zp94a60y9jsryc1r1m025pl2100fx5i8np46mm3pmn58"; depends=[ggplot2 rlang sp tidyr waveslim]; }; WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; }; @@ -5770,25 +5769,24 @@ in with self; { WEGE = derive2 { name="WEGE"; version="0.1.0"; sha256="17g4cgx0ajgj7lgxzi467cjbmbc47skyarcm88vqjc3i1j55dw12"; depends=[raster sf sp]; }; WGCNA = derive2 { name="WGCNA"; version="1.72-1"; sha256="1p3zsl5r6l5r6ylnrxmbxjpim5qgmncgdjcgn5j69rzk3rv85gqx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp survival]; }; WGScan = derive2 { name="WGScan"; version="0.1"; sha256="0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3"; depends=[data_table MASS Matrix seqminer SKAT]; }; + WH = derive2 { name="WH"; version="1.1.0"; sha256="0zz7936s6yd30q1yxxwbkaczin3r2l189b27nqsfyazbav27hfsb"; depends=[]; }; WINS = derive2 { name="WINS"; version="1.3.3"; sha256="0chw2v3ba766p8bjh1vzgrx6s7gm586ylvdsal1kmfxv4lkjc8rh"; depends=[copula ggplot2 ggpubr reshape2 stringr survival viridis]; }; WLogit = derive2 { name="WLogit"; version="2.1"; sha256="06mhc6n9mszqrj9hi61z5yfyny5aqsvv11a5n7l0wwhpirgi3i8m"; depends=[corpcor cvCovEst genlasso ggplot2 glmnet MASS Matrix tibble]; }; WLreg = derive2 { name="WLreg"; version="1.0.0.1"; sha256="1j9ffilg61a4pxk26rwmpwrigm63lnnd4h0k8ivqk6flxal41jqb"; depends=[inline survival]; }; WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; }; WOTPLY = derive2 { name="WOTPLY"; version="0.1.0"; sha256="1m0k21ywy6lgchddlaywl6rhqimjbd4npsnmx3l1w4jgnlgj9z76"; depends=[GGally network sna]; }; - WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WR = derive2 { name="WR"; version="1.0"; sha256="10813dzq3pn354g5x7hczi6aq61kmfrl8y4wc005bsxj0ipz0a06"; depends=[cubature gumbel survival]; }; WRI = derive2 { name="WRI"; version="0.2.0"; sha256="1hm23p0b4k03dxrbia9kq6r3n2c57glllraglxrj2vgnvwn6sl2c"; depends=[CVXR expm fdadensity fdapace ggplot2 gridExtra locfit locpol modeest mvtnorm polynom Rcpp RcppArmadillo Rfast rlang]; }; WRS2 = derive2 { name="WRS2"; version="1.1-4"; sha256="1838wy59cqd65s0bw6c24xcvx7zflypqcbgs35l9s2fj87vw2hdc"; depends=[MASS mc2d plyr reshape]; }; WRSS = derive2 { name="WRSS"; version="3.1"; sha256="0fhmdnkk94m1bqm1i69szv3ycbkzr08xy30mwpqvbij9nh2sqj0w"; depends=[GGally ggplot2 Hmisc network nloptr]; }; - WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; + WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.4"; sha256="1clv6gd0qlkykllki5jkmhd1znrccyg1mv6w69wz8fj65b2466zd"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; WSGeometry = derive2 { name="WSGeometry"; version="1.2.1"; sha256="073cvvbhzx5nllrwfyz6bxvskmkm88i7wq93m2d0q60pzwzsxwzl"; depends=[expm imager lpSolve Matrix plot3D Rcpp RcppArmadillo RSpectra transport]; }; - WVPlots = derive2 { name="WVPlots"; version="1.3.5"; sha256="05fai10xb2ph3brfwy38mbp3qm41ci7vg5hv99yqahzi2z18r9mm"; depends=[cdata ggplot2 gridExtra mgcv rlang rqdatatable rquery sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="1.3.7"; sha256="0zaqy1gii5ry2djqlyjqhiy4pqwng7r7lrpf1bw8g47v9vjjlq33"; depends=[cdata ggplot2 gridExtra mgcv rlang rqdatatable rquery sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.2"; sha256="05dzgb2b1md981882sp85dvmrsak5v7gwkww1shqfm34zmk9dbkn"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; }; WallomicsData = derive2 { name="WallomicsData"; version="1.0"; sha256="1bv2v0gjb6v5p7rmm8nc00xnkdw60552siyfhz4y60wm1cygclbq"; depends=[]; }; - Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; Wats = derive2 { name="Wats"; version="1.0.1"; sha256="0xld5163srlyqd9rbmi618drkrimys7ifgzrq05ky22ns2qa4qfv"; depends=[colorspace dplyr ggplot2 lubridate RColorBrewer rlang testit tibble zoo]; }; WaveSampling = derive2 { name="WaveSampling"; version="0.1.3"; sha256="1r8fzvihpmpaak0pkcf9s1nkj6dlvj2maw30yflpifa6422y15va"; depends=[Matrix Rcpp RcppArmadillo]; }; WaveletANN = derive2 { name="WaveletANN"; version="0.1.2"; sha256="1j16jsnz9j735348a5ybgrl7p6bg45gwwp863y4pg85h4mwg37c9"; depends=[forecast fracdiff Metrics wavelets]; }; @@ -5804,18 +5802,18 @@ in with self; { WaveletRF = derive2 { name="WaveletRF"; version="0.1.0"; sha256="08czmifw1dz2arz9f4jk76vlwwnf24ha9pm3dfihqkxjcc16dkgz"; depends=[forecast fracdiff randomForest tsutils wavelets]; }; WaveletSVR = derive2 { name="WaveletSVR"; version="0.1.0"; sha256="05sqvqklbz7barf1jfrhd7n4mj60z57sqpikl3lykigl3m9ravhm"; depends=[e1071 forecast fracdiff tsutils wavelets]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; - WaverideR = derive2 { name="WaverideR"; version="0.3.1"; sha256="1gx7crfcr2pak8y8xidkrhlmdb63mcni2mcahq2fpi5496pnbnrj"; depends=[astrochron biwavelet colorednoise colorRamps DecomposeR DescTools doSNOW fANCOVA foreach Hmisc Matrix matrixStats RColorBrewer reshape2 truncnorm viridis WaveletComp]; }; + WaverideR = derive2 { name="WaverideR"; version="0.3.2"; sha256="1lm7xq443vninrph21xq6dikpd42xl9ilwfb22lfba2b7j7j5z6g"; depends=[astrochron biwavelet colorednoise colorRamps DecomposeR DescTools doSNOW fANCOVA foreach Hmisc magick Matrix matrixStats RColorBrewer reshape2 rlist truncnorm viridis WaveletComp]; }; Wcompo = derive2 { name="Wcompo"; version="1.0"; sha256="1rd7y86q8qi7w9878ng0zdk3zpxnjyzpmrm2mj5lm60hkd72xyrw"; depends=[survival]; }; WeMix = derive2 { name="WeMix"; version="4.0.0"; sha256="19f655crg6zqbrlrcj7skp1qrxkn6fjahirvniy1b3xxikg84wvg"; depends=[lme4 Matrix matrixStats minqa NPflow numDeriv Rmpfr statmod]; }; - WebAnalytics = derive2 { name="WebAnalytics"; version="0.9.8"; sha256="0vdd4zc9aj7573fjsz4mclydj3h7p0av9kpgd1flppzsiscc94m4"; depends=[brew data_table digest fs ggplot2 reshape2 scales tinytex uaparserjs xtable]; }; + WebAnalytics = derive2 { name="WebAnalytics"; version="0.9.12"; sha256="031gyndk605841ns33pifhfwlasa39jhrmvigw84iqc2dgxqqpgl"; depends=[brew data_table digest fs ggplot2 reshape2 scales tinytex uaparserjs xtable]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.6"; sha256="1xwadw9maj3n9yxm4bv63hx4x1lh6krqhfcnwn2ay6jgwh7y6zxw"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; }; - WebPower = derive2 { name="WebPower"; version="0.9.3"; sha256="1530jz99dvp79bk57mfyyd0iam7wf0pjz8d5msyy852zcqym5hrp"; depends=[dplyr lavaan lme4 MASS PearsonDS]; }; + WebPower = derive2 { name="WebPower"; version="0.9.4"; sha256="0idfm9mr4sffyzyihggy5kmsklx178g8c5ikp34kxz74jkz0rzn5"; depends=[dplyr lavaan lme4 MASS PearsonDS]; }; WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.2.1"; sha256="1i83dhd6202myfgsjwc3h68dflfvd74zjskvchbzd2407a30m8n7"; depends=[Rcpp RcppArmadillo]; }; WeibullR_ALT = derive2 { name="WeibullR.ALT"; version="0.7.2"; sha256="153zxw20gwv5rx5cxmygl97nv1c2pxb3yczmqvjxq7vwwxl04gr9"; depends=[WeibullR]; }; WeibullR_learnr = derive2 { name="WeibullR.learnr"; version="0.1.1"; sha256="0m3dajyxr6m2w8s1qlwfr1iq2x2s5khs9x1qj4r4fr6zqhp53pbx"; depends=[learnr WeibullR]; }; - WeibullR_plotly = derive2 { name="WeibullR.plotly"; version="0.1.5"; sha256="1g16jkigzd8kmsdfzbz57sz5n8f9s1r3mhl059w76fsyvrc23cin"; depends=[plotly WeibullR]; }; - WeibullR_shiny = derive2 { name="WeibullR.shiny"; version="0.1.2"; sha256="0vmz005qpra66frb9ljrn58ag5rczi8prb3v3y09ikfb0zbz6jn4"; depends=[rhandsontable shiny shinydashboard WeibullR WeibullR_plotly]; }; + WeibullR_plotly = derive2 { name="WeibullR.plotly"; version="0.2.0"; sha256="1ymggxqhn2bc6r25vzp4vlr18pcw9vnn24ylwspk8vq8j00pn197"; depends=[plotly WeibullR]; }; + WeibullR_shiny = derive2 { name="WeibullR.shiny"; version="0.2.0"; sha256="0qzwn967p54j03h9nmzljx547iqgnyq3xzfri5k0i5lpvxsdp7hs"; depends=[shiny shinydashboard WeibullR WeibullR_plotly]; }; WeightIt = derive2 { name="WeightIt"; version="0.14.2"; sha256="13gjmywqdrbyfrjx0lmizhsg8wbrb3frwks2hw7k387yjllzbvsb"; depends=[backports chk cobalt crayon ggplot2 rlang]; }; WeightSVM = derive2 { name="WeightSVM"; version="1.7-11"; sha256="0sbf81j579k46bg11wv987ax7ncfmp6sy61w6ydk1dr9hcfjv3s9"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; @@ -5831,7 +5829,6 @@ in with self; { WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="1.0.0"; sha256="1bl1nbhbmss8cj9ni7plsjs996n4rwqv6h8bh1zj4whs8z4fw50f"; depends=[dplyr httr jsonlite purrr ratelimitr readr rex WikipediR]; }; WikidataR = derive2 { name="WikidataR"; version="2.3.3"; sha256="120833b7zyq1rhmn9c8iv0j6br60af7gbn5lc4dil55qhh2lp9rx"; depends=[crayon dplyr Hmisc httr jsonlite pbapply progress readr stringr tibble WikidataQueryServiceR WikipediR]; }; WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; }; - WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WinRatio = derive2 { name="WinRatio"; version="1.0"; sha256="0d064qq9zad9bdacldhicj3xhyrvp0fcqrxfj594yzra2qwgkx90"; depends=[dplyr magrittr Rcpp tidyselect tidyverse]; }; WindCurves = derive2 { name="WindCurves"; version="0.2"; sha256="1vvcp1g5a677g9zqssdkh3zdy646zdkzy75nqhy497bpcgw43q1b"; depends=[readbitmap]; }; WoodSimulatR = derive2 { name="WoodSimulatR"; version="0.6.0"; sha256="1hd696wc9r65cfsfklh6gv502gx8qp75i8j26291rgc94hb11wlr"; depends=[dplyr purrr rlang tibble tidyr tidyselect]; }; @@ -5858,7 +5855,7 @@ in with self; { XRJulia = derive2 { name="XRJulia"; version="0.9.0"; sha256="0s3g6fkam6hj03mxvw75nzsq3zvz84b71jhrw3v64mdngazdv7zm"; depends=[XR]; }; XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; }; XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; - XiMpLe = derive2 { name="XiMpLe"; version="0.11-1"; sha256="1i75c4jp8yklbqhc2wkhpxnv97kz2sdndzdcyrhjvr87wgr7dffh"; depends=[]; }; + XiMpLe = derive2 { name="XiMpLe"; version="0.11-2"; sha256="0pa06jm9g308pbh8bal7mjaiwbsjbdsxiyvm0f01405j3wkf64m3"; depends=[]; }; Xplortext = derive2 { name="Xplortext"; version="1.5.2"; sha256="149frkkmpxhpcbjdqkjvdlqd6k95hjdydnvgfq4bhi4d8gz2sgzi"; depends=[FactoMineR flashClust flexclust ggdendro ggforce ggplot2 ggrepel gridExtra MASS plotly slam stringi stringr tm vegan]; }; YPBP = derive2 { name="YPBP"; version="0.0.1"; sha256="1slc7glr4hb0my5zkssprngb6si98npjj33nsbsm0nbm61hnb9n8"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; }; @@ -5866,10 +5863,13 @@ in with self; { YPmodel = derive2 { name="YPmodel"; version="1.4"; sha256="177rzbd8k0356b8z2sbvl3x5cg2w9kr8ryf36laqijyayhcik093"; depends=[]; }; YPmodelPhreg = derive2 { name="YPmodelPhreg"; version="1.0.0"; sha256="1bgzibrqdwsy93zscffmbjgxnnl3axip9l4amfp0g5517p7i78hp"; depends=[survival]; }; YRmisc = derive2 { name="YRmisc"; version="0.1.6"; sha256="1crms7dqmhj7br1a5p5j0j7p6sdfimnip31207i6g24f9jkkysv1"; depends=[ggplot2 gridExtra]; }; + YTAnalytics = derive2 { name="YTAnalytics"; version="0.1.0"; sha256="1kvw5p0fy3vqvlqwg2dnvpkq21rmf3c3xl46b2a9lifnr9fpncgk"; depends=[dplyr httr jsonlite]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.3"; sha256="07rqi8j9gzrr4jj9h8mdnh5i251q8rwfdj4lbcmszp64pi09rkck"; depends=[foreach iterators]; }; YatesAlgo_FactorialExp_SR = derive2 { name="YatesAlgo.FactorialExp.SR"; version="4.0.4"; sha256="0jr2q2dla7dpf0ail0l8ar44cnaxrkvqc7cvsrsdgj97hr970lp9"; depends=[lubridate]; }; YieldCurve = derive2 { name="YieldCurve"; version="5.1"; sha256="0dckpls1g8787ysb3q11i531223d48zdimnmhvbyynmm2a8gi0xv"; depends=[xts]; }; + Ymisc = derive2 { name="Ymisc"; version="0.1.0"; sha256="0mw430a0qdi9lddxlzc8vdk2yhm57c2mblj0yyy3g6icf5m7pppn"; depends=[]; }; Z10 = derive2 { name="Z10"; version="0.1.0"; sha256="02kxlzplmss68zj1z97fvpcjyhhpic9hlx8f5j3gqn3m1mqm1dja"; depends=[dplyr lubridate magrittr rjson stringr]; }; + ZIBR = derive2 { name="ZIBR"; version="1.0.2"; sha256="0c24g3s946nmm8m22wvmhdgh2ph9f9hmslfyx1s3cq139793grrz"; depends=[statmod]; }; ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; }; ZINAR1 = derive2 { name="ZINAR1"; version="0.1.0"; sha256="1didfjb4215k9q82n1vaqln6f7fszsycsflydak2zl7xwficwhy6"; depends=[gamlss_dist gtools MASS scales statmod VGAM]; }; @@ -5891,9 +5891,8 @@ in with self; { aPCoA = derive2 { name="aPCoA"; version="1.3"; sha256="0ybp7jd1q0md4wbal5cmcl6hg3c1wkdz5mi1w5qddgi472vv1z83"; depends=[ape car cluster randomcoloR vegan]; }; aPEAR = derive2 { name="aPEAR"; version="1.0.0"; sha256="08rlfcwwrdy8zz102p67zk4zazjjs7wb08y3kyljn2ps82hmwi19"; depends=[arules bayesbio data_table dplyr ggforce ggplot2 ggrepel igraph lsa MCL reshape2 tibble]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; - aRtsy = derive2 { name="aRtsy"; version="0.2.3"; sha256="1h5l7774mg03gjvyl4296hqbcwckr5cq469fmibgh16lh812jakq"; depends=[ambient e1071 ggplot2 kknn randomForest Rcpp RcppArmadillo scales]; }; + aRtsy = derive2 { name="aRtsy"; version="0.2.4"; sha256="08982646gd7m0f7zcj31jq7wmjh0lrl2gys5ma6v6ikqq06piy0c"; depends=[ambient e1071 ggplot2 kknn randomForest Rcpp RcppArmadillo scales]; }; aRxiv = derive2 { name="aRxiv"; version="0.6"; sha256="1smv7aiqdk60aq9lna33a7hdykjdgfakaycpqkjj711b3pixcd34"; depends=[httr XML]; }; - aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; aSPU = derive2 { name="aSPU"; version="1.50"; sha256="0rh21dj5913nxhdndqfhxvm6mvwnacraf7l3bac09awm7cfhk511"; depends=[fields gee MASS matrixStats mvtnorm]; }; aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; }; aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.1"; sha256="1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki"; depends=[party randomForest rpart]; }; @@ -5905,19 +5904,20 @@ in with self; { abclass = derive2 { name="abclass"; version="0.4.0"; sha256="1cg8xfzxya585wzk6y2kf4flgjxlspzqqqksbig8nlxmwxxj413p"; depends=[Rcpp RcppArmadillo]; }; abcrf = derive2 { name="abcrf"; version="1.9"; sha256="08mh1a6gxp0mfx6qnp1qzcrfx7xp64qj9kad4ziyswfx22ykdsxi"; depends=[doParallel foreach MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; abcrlda = derive2 { name="abcrlda"; version="1.0.3"; sha256="04pcdnk2szfpc2ylcw5ds7y895ivy03bycal03kxw7cwylzxasks"; depends=[]; }; - abctools = derive2 { name="abctools"; version="1.1.6"; sha256="0yxmj28ym8919l27m04yjyc7mya1iy5ap4p980grsh7m4cgpx3bh"; depends=[abc abind Hmisc plyr]; }; + abctools = derive2 { name="abctools"; version="1.1.7"; sha256="16gn5hk25glbjml7bclxqkybi90gqjijz6hl6ak8aig5wm08pgx2"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abdiv = derive2 { name="abdiv"; version="0.2.0"; sha256="053l94br8sdy30078ssncq5i5zvdxa3m72ymbwbh0cm3zmsljj29"; depends=[ape]; }; abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; }; - abess = derive2 { name="abess"; version="0.4.7"; sha256="0qx68hb83kl72w9j9rq3q0ig0x38sjd5hw0kw02sfqk2rx91ygyx"; depends=[MASS Matrix Rcpp RcppEigen]; }; + abess = derive2 { name="abess"; version="0.4.8"; sha256="02261lda38931n3rgfm67ml85618wcysvl3hvr4yg9rc5y26gbfs"; depends=[MASS Matrix Rcpp RcppEigen]; }; abglasso = derive2 { name="abglasso"; version="0.1.1"; sha256="0h8p912l0202wyr5vjsbzw5mr70m56ab39wv833g6c4c3187479y"; depends=[MASS pracma statmod]; }; abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; abjData = derive2 { name="abjData"; version="1.1.2"; sha256="0q7l9lxm41pjkdv98axx87wcxjxfyccfwi2k1b29g07pfjszs0hv"; depends=[]; }; abjutils = derive2 { name="abjutils"; version="0.3.2"; sha256="0lmf4va8qnzwg698i2h4fcwvd6dhsgdkqsfh41aa3wg1flimhsr7"; depends=[dplyr magrittr purrr rlang rstudioapi stringi stringr tidyr]; }; - abmR = derive2 { name="abmR"; version="1.0.9"; sha256="0675981yq7zdxpky851nx0lz4vdxi1jaagagb6g6szg3kjmg59yd"; depends=[geosphere ggplot2 googledrive gstat gtsummary kableExtra purrr raster rnaturalearth sf sp swfscMisc table1 tmap]; }; - abn = derive2 { name="abn"; version="2.7-5"; sha256="0ibznjhy7vmh2myarvmxy06rvddbpbarbp201px62mig2pb9aq4y"; depends=[doParallel foreach graph lme4 nnet Rcpp RcppArmadillo Rgraphviz rjags]; }; + abmR = derive2 { name="abmR"; version="1.0.10"; sha256="0klfrclmwxsqm3aazs9jlw8mh5rzcsvm2wjk2r1ycx76kvkx8wii"; depends=[geosphere ggplot2 googledrive gstat gtsummary kableExtra maps purrr raster rnaturalearth sf sp swfscMisc table1 tmap]; }; + abn = derive2 { name="abn"; version="3.0.1"; sha256="03g02450l3mckjzwd0w717dbmxhrngkwlfhm5c9q5zv4g10df7nj"; depends=[doParallel foreach graph lme4 mclogit nnet Rcpp RcppArmadillo Rgraphviz rjags stringi]; }; abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; + abseil = derive2 { name="abseil"; version="2023.8.2.1"; sha256="1a65zwkrxqidbcfpin9k119zip8vb0vnl87akimjn3xnynb3i5br"; depends=[]; }; abstr = derive2 { name="abstr"; version="0.4.1"; sha256="0ykds1l7bi0h06fjp0d6xshl8ar05n7ccmjbl7hz02l2v7ncfa6v"; depends=[jsonlite lwgeom magrittr od sf tibble tidyr]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; abtest = derive2 { name="abtest"; version="1.0.1"; sha256="0jz2ry5364p8h8xlk5a5sycn8xlpxd1iasfg99bcr4jqzd92jfqg"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; @@ -5929,46 +5929,47 @@ in with self; { accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; }; accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; }; accept = derive2 { name="accept"; version="1.0.0"; sha256="0yjihmgi94yfwhnvgw4v235yyr8n6w1ass2qbmvk0ia1hmjis8zq"; depends=[dplyr reldist]; }; - accessibility = derive2 { name="accessibility"; version="1.1.0"; sha256="1hnmxzzzfpkg76a1r927bf865bl49z4sfq3gbcxifc9nkf4rffym"; depends=[checkmate data_table Hmisc Rdpack]; }; + accessibility = derive2 { name="accessibility"; version="1.3.0"; sha256="1jbfzw2p6a9wqd4qs06nnnkfzpwlkhsaay3nyx8a0xqjrncwv12l"; depends=[checkmate data_table Hmisc Rdpack]; }; accessrmd = derive2 { name="accessrmd"; version="1.0.0"; sha256="1jdbbsi8nzvr8hnrpw5sr8zf55irnwwrnkwx4vd0zx84bxvw3bqy"; depends=[ggplot2 htmltools knitr RCurl rlist stringr]; }; - accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrualPlot = derive2 { name="accrualPlot"; version="1.0.7"; sha256="1xd855yzr405kl6qqm68zgcj3j112xmpkx0f1z8gd9z7s3sr74h0"; depends=[dplyr ggplot2 lubridate magrittr purrr rlang]; }; - accucor = derive2 { name="accucor"; version="0.3.0"; sha256="1byhfh9lskgpi8sx6kb7prh88a2jglrjpq206rmh98hqd3r23n5j"; depends=[CHNOSZ dplyr nnls readr readxl rlang stringr tibble writexl]; }; - accumulate = derive2 { name="accumulate"; version="0.9.0"; sha256="14gy2l9ayhwym3dz1n70y76skpyzhl7dv4m2rf1kmj6qf1dznqb0"; depends=[]; }; + accucor = derive2 { name="accucor"; version="0.3.1"; sha256="1yq64hh7w328ks02fh9q2hnl73grwd31rrm6c0jqyb0f0lclkxir"; depends=[CHNOSZ dplyr nnls readr readxl rlang stringr tibble writexl]; }; + accumulate = derive2 { name="accumulate"; version="0.9.3"; sha256="0c2iiliqpyblfdz189d06ljbbp0hyadhgr7hrzm0wfcm8245njah"; depends=[]; }; acdcR = derive2 { name="acdcR"; version="1.0.0"; sha256="0mf4fhqym4l8m71wgha1587r7sxnmakq3bds24yr425433biiy25"; depends=[data_table raster]; }; + acdcquery = derive2 { name="acdcquery"; version="1.0.1"; sha256="03ip3fvc1qcq0vmcidv1rbih85v3dxhx08047vjlf21kfcr9cizk"; depends=[DBI RSQLite]; }; ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; }; aceEditor = derive2 { name="aceEditor"; version="1.0.1"; sha256="1qdxs20si1smjn24dlgq46x6qwjdwsa0f5lzh1vrbgv4kk9j1rfb"; depends=[htmltools htmlwidgets reactR rstudioapi]; }; acebayes = derive2 { name="acebayes"; version="1.10"; sha256="11bffz430gdfdaxjx3simig66vhynmx6l1ylac4q2shcmj52nx73"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; - acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; + acepack = derive2 { name="acepack"; version="1.4.2"; sha256="14dccqpww3bv59236r0vr6bibhsafhbm7qshdjxp5ww3nw9cvzsv"; depends=[]; }; acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; }; acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; acled_api = derive2 { name="acled.api"; version="1.1.6"; sha256="0mri64ir386rn625i0x0kzlqng102dn338slh5cw6lcaa3hjywdq"; depends=[httr jsonlite]; }; acnr = derive2 { name="acnr"; version="1.0.0"; sha256="087hq4i7jp67ba2finzsqjfnqbiprl33na6ryjv9zqzsdawj9cym"; depends=[]; }; - acopula = derive2 { name="acopula"; version="0.9.3"; sha256="0vvbbw8pfs9jwfz5c57lw48pr0qj661r0ys007q6zf9jmlrhx1ln"; depends=[]; }; + acopula = derive2 { name="acopula"; version="0.9.4"; sha256="0asxfcjrsr9d7ab59pdajs0zvdjgwfswk9rdlpfdr51535wpjrfy"; depends=[]; }; acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; }; acroname = derive2 { name="acroname"; version="0.1.0"; sha256="0fff7z3i8h30v7bsyq240h8ws5ld04n6c5r2iizd2icp8dk9xs9x"; depends=[dplyr hunspell magrittr purrr R_utils readr stringr]; }; - acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; }; acs = derive2 { name="acs"; version="2.1.4"; sha256="0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5"; depends=[httr plyr stringr XML]; }; acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; act = derive2 { name="act"; version="1.3.1"; sha256="0c5515mxw2ghdwmnqz1www84v3dn7wlvij47wankb4ak285ak30i"; depends=[openxlsx progress stringi stringr textutils XML xml2]; }; - actel = derive2 { name="actel"; version="1.2.1"; sha256="10gv6vc921ma6ckck9807j3j7z0m8kalwv5aj8xg6i2yqnia2zgs"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; }; + actel = derive2 { name="actel"; version="1.3.0"; sha256="0hd1mkshywszswnllcx1lvlghnfk92438r57v6r7w8p5i9m04z9x"; depends=[circular data_table DiagrammeR DiagrammeRsvg fasttime ggplot2 knitr readr reshape2 rmarkdown rsvg scales stringi stringr svglite]; }; actilifecounts = derive2 { name="actilifecounts"; version="1.1.1"; sha256="0p65j7l8d8503nil34faz7jashv5rw327xlpphwhwa4x5wga5z01"; depends=[GGIRread gsignal pracma]; }; activAnalyzer = derive2 { name="activAnalyzer"; version="2.0.1"; sha256="0dz6r3z8zcsiiqirr1gd97m53afswf1qg6gya6km605my33xn56b"; depends=[dbplyr dplyr flextable forcats ggplot2 golem hms lubridate magrittr modelr patchwork PhysicalActivity plyr reactable rmarkdown RSQLite shiny shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs stringr tidyr zoo]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; - activatr = derive2 { name="activatr"; version="0.1.1"; sha256="0sk2wwfzms2cf6d4z91mi22vss2jiz8ins4pb9djpgi1mln57iqy"; depends=[dplyr geosphere ggmap glue httr lubridate magrittr rlang slider tibble xml2]; }; + activatr = derive2 { name="activatr"; version="0.2.0"; sha256="0d3r9xp7nrva84az3p211f3g995g8p0lz49f6fjlmzd9pc3jzxg9"; depends=[dplyr geosphere ggmap glue httr lubridate rlang slider tibble xml2]; }; activegp = derive2 { name="activegp"; version="1.1.0"; sha256="1yfib5q649kag45ryyqsbq9lq9yd74rrjjk65a6c9rkfa4f6w8xv"; depends=[hetGP lhs MASS numDeriv Rcpp RcppArmadillo RcppProgress]; }; - activity = derive2 { name="activity"; version="1.3.3"; sha256="056dnhwc781ykgsmm2jaqxd15bckdxhbvxws6gjcrkvn4yimwgmh"; depends=[pbapply]; }; + activity = derive2 { name="activity"; version="1.3.4"; sha256="10gp2yvqxz5ysmh5z8qvrpli8kc2kn2z3nd2llfabpyh21476in2"; depends=[pbapply]; }; activityGCMM = derive2 { name="activityGCMM"; version="1.1.1"; sha256="0r11z61h8fs5dcm3yfr2njbrbh4pv7xlbqx5zngmrknhv407498z"; depends=[circular mclust overlap runjags]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuaRE = derive2 { name="actuaRE"; version="0.1.5"; sha256="02f90vdbfz6shsw4ndhqbqjsrwiwmi1jp66bsl897cb8fnywnzs4"; depends=[cplm data_table ggplot2 knitr lme4 magrittr nlme statmod]; }; actuar = derive2 { name="actuar"; version="3.3-2"; sha256="0ys7kqqbx9g2mhsn243z9vj7qkdd69d3jy1vin9v8bknwimgdxvb"; depends=[expint]; }; actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; - actxps = derive2 { name="actxps"; version="1.2.0"; sha256="1yy1yhpvk8ycyasdngwy9sg189cwli3n6k60iwvb1acpqy0rhhdd"; depends=[dplyr generics ggplot2 glue gt lubridate paletteer purrr readr recipes rlang scales tibble tidyr vctrs]; }; + actxps = derive2 { name="actxps"; version="1.3.0"; sha256="1cia0xk2xb09y583za6w97ch3pvx4kcdw5vbx8slvnv2r4qkb1pw"; depends=[dplyr generics ggplot2 glue gt lubridate paletteer purrr readr recipes rlang scales tibble tidyr vctrs]; }; acumos = derive2 { name="acumos"; version="0.4-4"; sha256="15i4xbcdk5vxjrgac32zh4439v0vmabnw3jvsmxiipap5frp7rpi"; depends=[httr jsonlite RestRserve RProtoBuf Rserve yaml]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adaHuber = derive2 { name="adaHuber"; version="1.1"; sha256="0giypz04m9anssa2r3hlf95lnj74i3ir48p5j898i2z1gmf8m14w"; depends=[Rcpp RcppArmadillo]; }; + adaR = derive2 { name="adaR"; version="0.3.0"; sha256="1jfr1di0infrqlfjnr8429889pw5pqggpv30g4r910614fk1fzr0"; depends=[Rcpp triebeard]; }; adabag = derive2 { name="adabag"; version="5.0"; sha256="03nnqgia61pavic9l6av0hh81wilxlkrx3g244ypar1fv9ppan7c"; depends=[caret ConsRank doParallel dplyr foreach rpart tidyr]; }; + adace = derive2 { name="adace"; version="1.0.2"; sha256="06hfizzaff6fsr8j8bag7avc1inqx2xs52gidacpyahxh6wvj3pz"; depends=[pracma reshape2]; }; adagio = derive2 { name="adagio"; version="0.8.5"; sha256="0icwr3cark67jyg9zzqwyv9q4fs0j0xgb5i7nkwv9s7y5dlldl0b"; depends=[lpSolve]; }; adamethods = derive2 { name="adamethods"; version="1.2.1"; sha256="150awbd3skb1mqca18bqjykhyycqw8crviw66s6qrcnmcsbk77pj"; depends=[Anthropometry archetypes FNN foreach nnls tolerance univOutl]; }; adana = derive2 { name="adana"; version="1.1.0"; sha256="0zi3a17rapc1z074k3yzgjv2b6ba6c9d54b1hm0ivvgfd335981f"; depends=[optimx ROI ROI_plugin_optimx]; }; @@ -5977,13 +5978,14 @@ in with self; { adaptIVPT = derive2 { name="adaptIVPT"; version="1.0.0"; sha256="1zjz61zk0q9d1ih3ghzmiz1sxjpdypbx1vl72iw51sqz0nl89n95"; depends=[Rcpp RcppArmadillo RcppProgress rgl]; }; adaptMCMC = derive2 { name="adaptMCMC"; version="1.4"; sha256="0yydliqhkz1y8lm4sb2biikbk8wmcyfqmamhm059843yk46nr6an"; depends=[coda Matrix ramcmc]; }; adaptMT = derive2 { name="adaptMT"; version="1.0.0"; sha256="1yllz1zd4cryf5bj8b2lcrj6zl79yjkllyh9p02ikryy5qmg419b"; depends=[]; }; - adaptTest = derive2 { name="adaptTest"; version="1.1"; sha256="1qfhb3c64a5pl23vk7z6a3h46yb69cvzp1bpxnpybhxs42s80l5q"; depends=[lattice]; }; + adaptTest = derive2 { name="adaptTest"; version="1.2"; sha256="0wb21mac5h683qgjdic29kpncr22ri93iwq8w4b7hywaxkv0zj2p"; depends=[lattice]; }; adaptalint = derive2 { name="adaptalint"; version="0.2.4"; sha256="15qdcvnnbgcps8j5k79354wsc9alswijv8lcafg2i3lghaw536yf"; depends=[dplyr lintr purrr]; }; adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.3"; sha256="1766b3d9ysa9axfxqwy6gzj0z8hsl34pic6l63nbidqas55vnjqa"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-3"; sha256="1jficl4yidix35q8yqs3pcv813wq3pg4hpw4ah4dprvg95bl7wwx"; depends=[]; }; - adaptr = derive2 { name="adaptr"; version="1.3.1"; sha256="0aka1rdzggm1yxia4zq9ipb74lah94l16idqscsakxbakk1hxk65"; depends=[]; }; + adaptr = derive2 { name="adaptr"; version="1.3.2"; sha256="1kqxlqxbcvx8fy0cdihcl9sxj5y52dkjpymjbdzbrzx3dyq6kmlw"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.2"; sha256="00npcl2js9vj5r3l66cp5d2l807klia581pig1gsyjjq4rvmfa7v"; depends=[coda Matrix MCMCpack mvtnorm spatstat spatstat_geom]; }; - adbcdrivermanager = derive2 { name="adbcdrivermanager"; version="0.5.0.1"; sha256="0x7qxq09s7llk4ahw6grfsbycrg8rf320rnwj0f96wb9h3m7v06f"; depends=[nanoarrow]; }; + adbcdrivermanager = derive2 { name="adbcdrivermanager"; version="0.7.0.1"; sha256="0qg6jjxn4jp4629xsxd47f5y6n9x5wj6jypdapl9g9dn2ackydqd"; depends=[nanoarrow]; }; + adbcsqlite = derive2 { name="adbcsqlite"; version="0.7.0.1"; sha256="0pzpx1fajp8h6pmg6bzsg4gpdmqwqh03ngf3kvq3g293z9ck7xm1"; depends=[adbcdrivermanager]; }; adc = derive2 { name="adc"; version="1.0.0"; sha256="152j863rfrmjpaambxy6hc57zcpp0wlyd6kl7miryk3z0yvngcw9"; depends=[runner]; }; add2ggplot = derive2 { name="add2ggplot"; version="0.3.0"; sha256="0c94i1cfp2pvplvxmfvvz2fyj026r1jnax05mrzrc7ppnqzy25y0"; depends=[ggplot2 magick magrittr RColorBrewer zeallot]; }; addScales = derive2 { name="addScales"; version="1.0-1"; sha256="1bw4ljyyswdhqyir9i6lj0mg9lm6ry4zpqp2h6w2bpk37rvs1w38"; depends=[lattice]; }; @@ -6000,20 +6002,21 @@ in with self; { ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-1"; sha256="1y0f62n8iv002ayd1nyl3bmszw558niwnfzjpvk0a7cbvfdyvwcg"; depends=[ade4 adegraphics lattice]; }; adea = derive2 { name="adea"; version="1.3.1"; sha256="0jvxgqwfga4gsn5jcdklfq2qci3xyvmkdfjappjwf72swb2rkv0n"; depends=[Benchmarking combinat knitr lpSolveAPI rmarkdown]; }; adegenet = derive2 { name="adegenet"; version="2.1.10"; sha256="0qxig2jyj1q0a8pwpv5f5v5b4x4af8s9p1p0yc0msmyxq457hqmb"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny vegan]; }; - adegraphics = derive2 { name="adegraphics"; version="1.0-18"; sha256="0g2n9n72k8wj4qibd0v68ispgq5kzpkfhbnyk3h1g69yyz07zq4g"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; + adegraphics = derive2 { name="adegraphics"; version="1.0-21"; sha256="1a7bz9j06sc09kvynzss71dxffp40vsl35azj0gzs81jl2rr4ap0"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.21"; sha256="0ji4a27z5qsi8xpzlx9z8m9hg9k81bb6mkbwzpsinsn1x1dipg0n"; depends=[ade4 adehabitatLT adehabitatMA sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.17"; sha256="040qbhfrsxjnl75lmc3fmyrvqblfcp0mmagk8sj225069c64k62n"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.27"; sha256="0siaj9h9gyar6pmnv9bp4k7lcpfcvhykl3jj80pzdb6yyybgj2zx"; depends=[ade4 adehabitatMA CircStats sp]; }; adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.16"; sha256="1jmmi6rh3rnv5b3qy1xhy0rs4dnkysf4rxjfs0im1i5n4rd437h8"; depends=[sp]; }; - adephylo = derive2 { name="adephylo"; version="1.1-13"; sha256="0vd7khqsfnik7j00hac97khv8b1kmi0az5hakg04m8fhx7z3589a"; depends=[ade4 adegenet ape phylobase]; }; + adephylo = derive2 { name="adephylo"; version="1.1-16"; sha256="0n6f2v287gkbdrfxq50b1lbya4znqg50lrah0v540vmydgi5vkmm"; depends=[ade4 adegenet ape phylobase]; }; adepro = derive2 { name="adepro"; version="3.2.0"; sha256="0sw42yld4bjgfiqm957ply605zsj66mmwvkzi73hsbkk31w1k5fb"; depends=[audio Cairo dplyr gclus haven jsonlite MASS readr rlang seriation shape shiny shinyBS shinyjs shinyWidgets TeachingDemos tidyr V8]; }; adept = derive2 { name="adept"; version="1.2"; sha256="1dpfmfnqzci6p7wqwpp8y0cisx11r8kdsqjm85skb512n35m0i3a"; depends=[dplyr dvmisc magrittr pracma]; }; adeptdata = derive2 { name="adeptdata"; version="1.1"; sha256="0wzavbwc1slyr3wh5jkapghpa748rc86pbw5b4gcxki73r08r7j2"; depends=[]; }; - adespatial = derive2 { name="adespatial"; version="0.3-21"; sha256="17x73rvyqsp5z2a5y7w9vh59hkyjvdvjparlgp9s54jqq2dmzxjg"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; + adespatial = derive2 { name="adespatial"; version="0.3-23"; sha256="0cszq382vpd8alc98hnrzqj1wyp8bcfbvqpi1d2rqbr12f5qgq3h"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; + adestr = derive2 { name="adestr"; version="0.5.0"; sha256="0gwkmj0fg732ci02cgyr95s245vfakjzqacsa7g5k258w8wyxwip"; depends=[cubature forcats future_apply ggplot2 ggpubr latex2exp pracma progressr Rdpack scales]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.6"; sha256="06sk68580i7jg9lk4jj64ns04y4q6amzsh0k7nxhfdib107yajnp"; depends=[]; }; adformR = derive2 { name="adformR"; version="0.1.0"; sha256="02krkpqsj53j4mprbw25bycbb2xlhcgnglcp0dl24zw44mfxy9n7"; depends=[jsonlite]; }; adheRenceRX = derive2 { name="adheRenceRX"; version="1.0.0"; sha256="19kimj88dmcc8mq3s4l7pph9jz8p57gbjyn0pn5zkrcjdrwncslm"; depends=[anytime dplyr lubridate purrr Rcpp rlang tidyr]; }; - adimpro = derive2 { name="adimpro"; version="0.9.5"; sha256="1w3zcazbxkn1vq37vm4zz4mcmmk1bhxy22gkmv1v9bkv63b46kzm"; depends=[awsMethods]; }; + adimpro = derive2 { name="adimpro"; version="0.9.6"; sha256="0d5viz9ayywpp1pas1yzmhllzn9rjrl8a3k7bj7h46f95l5x1586"; depends=[awsMethods]; }; adiv = derive2 { name="adiv"; version="2.2"; sha256="0qmykswwirhas4rrwb4jaqicjkqsmq6k11718hzk65h3xdnpg6kr"; depends=[ade4 adegraphics ape cluster lpSolve phylobase phytools rgl]; }; adjROC = derive2 { name="adjROC"; version="0.3"; sha256="0bf7vvhllpl8irqw1ahfhbhqq67v6jxblapv91ddkgpk2dl0sp03"; depends=[boot ggplot2 ROCit yardstick]; }; adjSURVCI = derive2 { name="adjSURVCI"; version="1.0"; sha256="0nv6m7ds57d0h44d745s0424ssrgn39ihd294dgrzrpmh8gxhq95"; depends=[Rcpp RcppArmadillo survival]; }; @@ -6022,11 +6025,11 @@ in with self; { adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-5"; sha256="0kf1akx5c4c7mdy9ysfdik2xi810jcysw9ynmvxlgw2zykqxvqdk"; depends=[EbayesThresh]; }; - admiral = derive2 { name="admiral"; version="0.11.1"; sha256="1wl164falaw87rcahh1ip4zjp4kf87jiig6h8gqkja8p35x44h94"; depends=[admiraldev dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; - admiral_test = derive2 { name="admiral.test"; version="0.6.0"; sha256="15c8njk81w8rp22n5knvh3jxkh8qk2pmqs1snjmyd4vjrxh1vqf7"; depends=[]; }; - admiraldev = derive2 { name="admiraldev"; version="0.4.0"; sha256="02xjwqjlk5nwfjs5y1glq4wdn5r9l88wvnx7pl0z9416rjjq2lqk"; depends=[dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; - admiralonco = derive2 { name="admiralonco"; version="0.4.0"; sha256="0ywrin1hp45j4r467bjijlpdcbqzqkqv3wwdwspjwfanqhyn4qcl"; depends=[admiral admiraldev dplyr lifecycle lubridate magrittr rlang tidyselect]; }; - admiralophtha = derive2 { name="admiralophtha"; version="0.2.0"; sha256="1jhdnd8cpc5zjfnsrl5mkghyv3zswmxfbncb08cym0rg0hlqv5n9"; depends=[admiral admiraldev dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiral = derive2 { name="admiral"; version="0.12.3"; sha256="0b4sgk4h9gnrvcml264aibhkwsd9wzki6r302fi7lm9zxk6gf4q4"; depends=[admiraldev dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiral_test = derive2 { name="admiral.test"; version="0.7.0"; sha256="1bmzj9r6nbyk4wd63ps6qwrj35lpj4s4jj4dvlg0p7yyssig68pb"; depends=[]; }; + admiraldev = derive2 { name="admiraldev"; version="0.5.0"; sha256="0h4qd7w5icmiw3dgcwmf8mp0lvbc06wcszc8859kv6l6zsihgnfd"; depends=[dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiralonco = derive2 { name="admiralonco"; version="0.5.0"; sha256="1gi9dirx004iy0vs7mms9y1vrs9zjiai7jh76nv0xm3cwgdf5l15"; depends=[admiral admiraldev dplyr lifecycle lubridate magrittr rlang tidyselect]; }; + admiralophtha = derive2 { name="admiralophtha"; version="0.3.0"; sha256="09hjnhfafsnh4dpyhzk09d8v1pliy6h3bdvk7bkaf5jizrna8dix"; depends=[admiral admiraldev dplyr hms lifecycle lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; admiralvaccine = derive2 { name="admiralvaccine"; version="0.1.0"; sha256="0iwgglk0bz760898gpmw6wn745j5rk8b6zz4psdycik0vsamijp3"; depends=[admiral admiraldev assertthat dplyr hms lifecycle lubridate magrittr metatools purrr rlang stringr tidyr tidyselect]; }; admisc = derive2 { name="admisc"; version="0.33"; sha256="1anvh581jh1mw3yhpbm2dyihs9npi9gd0isgkphw5gr64fivw49r"; depends=[]; }; admix = derive2 { name="admix"; version="2.1-2"; sha256="1g6s2ll31g8klxmg6zg7scy5l84bqzc3ncjsbw8zxrbrjzyd2yzx"; depends=[cubature fdrtool Iso MASS orthopolynom pracma Rcpp]; }; @@ -6034,7 +6037,6 @@ in with self; { admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.1.2"; sha256="0nkciv5sfj3bws6kpgrnaq4ziasibaz44w64mb86zmr8420nyc1q"; depends=[ellipse ggplot2 R2admb rlang rstan snowfall]; }; adobeanalyticsr = derive2 { name="adobeanalyticsr"; version="0.3.3"; sha256="1x1mkprp42xyfgiyffkj9lwzfv79dfwdg9alxfcpmgcvcrnbxcwi"; depends=[assertthat dplyr ggplot2 glue httr jose jsonlite lifecycle lubridate memoise openssl progress purrr R6 rlang scales stringr tibble tidyr vctrs]; }; - adoptr = derive2 { name="adoptr"; version="1.0.0"; sha256="08d2fsqh5vczfr9cc8l554p6f0x85g58i5zg5j2m0chlmcispfk2"; depends=[glue nloptr]; }; adpss = derive2 { name="adpss"; version="0.1.2"; sha256="1nk12yn1n483scnphf8pab8w633dk64c8n17zlq851zywbncs0gk"; depends=[Rcpp]; }; ads = derive2 { name="ads"; version="1.5-9"; sha256="1zipffv20d83aqrxn9fwavn2hf6qix20ffy8l8mgmg2sckfgfb34"; depends=[ade4 spatstat_geom]; }; adsDataHubR = derive2 { name="adsDataHubR"; version="0.1.1"; sha256="19csivbg3f0g2r11l7jrciqq2lhg50km7qv29xfs6ba5cf678hb9"; depends=[httr jsonlite lubridate]; }; @@ -6043,6 +6045,7 @@ in with self; { adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; }; adwordsR = derive2 { name="adwordsR"; version="0.3.1"; sha256="1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn"; depends=[RCurl rjson]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; + afcolours = derive2 { name="afcolours"; version="1.0.0"; sha256="04hmkcn4zmcp34mwav0wngld45a3pyrdb4cmnwg5ba7i0jk4z91y"; depends=[dplyr]; }; afdx = derive2 { name="afdx"; version="1.1.1"; sha256="1654vxakdd11b5zhwy1vcv127xk5rifan6fs1k6w1qsk74j4drqv"; depends=[dplyr magrittr maxLik tidyr]; }; afex = derive2 { name="afex"; version="1.3-0"; sha256="0cqr3vv4aapg8ckhrkwqhs5qvzl8zla147fvhd5wb2020yhpdqpq"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; affinity = derive2 { name="affinity"; version="0.2.5"; sha256="0nfh3g8nifv5773pihgzxh62wa837i2dk1kgf15z28cb5xfj2y8h"; depends=[raster reproj]; }; @@ -6051,25 +6054,27 @@ in with self; { afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; afpt = derive2 { name="afpt"; version="1.1.0.3"; sha256="18izncbr3ljckil97xx2w1y0y7qjykp06wm0ap8ismahqvia3xz3"; depends=[]; }; africamonitor = derive2 { name="africamonitor"; version="0.2.3"; sha256="13pwrbz0ap13a4di3zc1z5j4jk4q9vcpn4g8n41nyminbsg1vl5j"; depends=[collapse data_table DBI RMySQL]; }; - aftgee = derive2 { name="aftgee"; version="1.1.6"; sha256="1sq6d6zkr4whg61phz22gb5zh7wxg2il39w2g5s812i4hiipqj4r"; depends=[BB geepack MASS survival]; }; + aftR2 = derive2 { name="aftR2"; version="0.1.0"; sha256="1ff8khq9b8hjflkhfc1shx5k7sadcl0ahnsbx9c557b6sm0kqfr6"; depends=[survival]; }; + aftgee = derive2 { name="aftgee"; version="1.2.0"; sha256="01mjgahs6wfd47imnw0zni57ilcy76gh5lpsihxyd3grwd9jkki7"; depends=[BB geepack MASS Rcpp RcppArmadillo survival]; }; afthd = derive2 { name="afthd"; version="1.1.0"; sha256="0gg2cp3sj28f3pi5rqh737hna3imwarwas01jacm0m2h27587k7y"; depends=[glmnet photobiology R2jags rstpm2 survival]; }; afttest = derive2 { name="afttest"; version="4.3.1.1"; sha256="0w08xhhjnsf4xdg52nfz1ks4n7mbajrnbix9q5mkd3nvsnlank0s"; depends=[aftgee ggplot2 gridExtra Rcpp RcppArmadillo survival]; }; - ag5Tools = derive2 { name="ag5Tools"; version="0.0.1"; sha256="1390acslndzvvhdc6pk9cfvhval1wqgiic353f03qv0rvhxbyzad"; depends=[fs reticulate terra]; }; + ag5Tools = derive2 { name="ag5Tools"; version="0.0.2"; sha256="0kqya0iaxcz7m1i69ckcm0z3g3q31x2jasxlip7jpp7czdi9rr07"; depends=[doParallel foreach fs reticulate terra]; }; agRee = derive2 { name="agRee"; version="0.5-3"; sha256="1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x"; depends=[coda lme4 miscF R2jags]; }; ageg = derive2 { name="ageg"; version="1.0.0"; sha256="0dcmwgznxf1jjsifpm3nn3jk25mm27l6f6f6jfi2n3crxgqfizyv"; depends=[]; }; - agena_ai = derive2 { name="agena.ai"; version="1.1.0"; sha256="1j7n04h2vdc4snlm32cgx1nbpfygqvk1za13y1shf82sn1ix30v4"; depends=[httr openxlsx Rgraphviz rjson]; }; + agena_ai = derive2 { name="agena.ai"; version="1.1.1"; sha256="1nn2634r93gg3nwqnlg8c44zajl5jadx0cszah8nq502qby5y36j"; depends=[httr openxlsx Rgraphviz rjson]; }; ageutils = derive2 { name="ageutils"; version="0.0.1"; sha256="1li9vd1qq2pf1prxxlqb3a8ff2rjr7796j3bhqj3s2qp6g09395a"; depends=[]; }; agfh = derive2 { name="agfh"; version="0.2.1"; sha256="0wkagdhbf4hgl1vrb6bxyan5ryp42xd8w7kbyspahqx8agzbn8zg"; depends=[ggplot2 goftest ks mvtnorm]; }; - aggTrees = derive2 { name="aggTrees"; version="2.0.1"; sha256="02yk1w8j12s5v4zb6js9n45p1vfanm3ham6f8b3h4qcj7rvf94h5"; depends=[boot broom car caret estimatr grf rpart rpart_plot stringr]; }; + aggTrees = derive2 { name="aggTrees"; version="2.0.2"; sha256="15dz96g8vyyijbv7nm9wwzwwsm0kzv8mwhrirnm14219cx4z2r76"; depends=[boot broom car caret estimatr grf rpart rpart_plot stringr]; }; agghoo = derive2 { name="agghoo"; version="0.1-0"; sha256="0vaqmydww494ql6xbhhjkpap3lqkhf8hkbcrr1pk81qpszs0pndm"; depends=[class FNN R6 rpart]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; + aggutils = derive2 { name="aggutils"; version="1.0.2"; sha256="0q4ly4wra1nj6zn733a0kvikcbjijailrbiyljyiz61ax4w0v5g6"; depends=[docstring]; }; aghq = derive2 { name="aghq"; version="0.4.1"; sha256="0hrgxxqzx38r2cfn3rflh8gddva9i6i89vk3jg4g27ywg5v7s41v"; depends=[Matrix mvQuad numDeriv polynom rlang]; }; aglm = derive2 { name="aglm"; version="0.4.0"; sha256="0rcyrzfi3l1k53c9qs1gfrcflnhdnri9sq6py8s6fw4wcn55kf67"; depends=[assertthat glmnet mathjaxr]; }; agop = derive2 { name="agop"; version="0.2-3"; sha256="1z90a07wzn5z4cbafwpfh3l3v1bgq9g89qbdjm51f78zynnb27dk"; depends=[]; }; agriTutorial = derive2 { name="agriTutorial"; version="0.1.5"; sha256="0c0p0bqcrnx34q5brnvgq10wkzahvgyybaz2xfmcghbdvzahd2dx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; - agricolae = derive2 { name="agricolae"; version="1.3-6"; sha256="0jnv4mii2r01prj08q75hbxss2y8v2acmkfc5dr3vl5bdmpinvy5"; depends=[AlgDesign cluster klaR MASS nlme]; }; + agricolae = derive2 { name="agricolae"; version="1.3-7"; sha256="0zaanfhvlx7c0s9y550hqn9bsffbykchcd7940fxx69jw87fkbf5"; depends=[AlgDesign cluster MASS nlme]; }; agricolaeplotr = derive2 { name="agricolaeplotr"; version="0.3.1"; sha256="1z1p6f4xwky9mglm5bdpvzp3na4wkal6kvf2xscyrcm9slasxvay"; depends=[agricolae FielDHub ggplot2 raster sp]; }; - agridat = derive2 { name="agridat"; version="1.21"; sha256="1ihsv56j5nn01mqff8sj2m0cd2s3qynyy1nz742fln8krxq916i9"; depends=[]; }; + agridat = derive2 { name="agridat"; version="1.22"; sha256="1pa738c86f36vnjl2k8il2igvvhv5r6vchywmmcdbc98ay1kzazn"; depends=[]; }; agrifeature = derive2 { name="agrifeature"; version="1.0.3"; sha256="0zbjmgwajwihgvs1c3swddx09m6954sihnpjdrqlgl5jhh7q2bgs"; depends=[]; }; agriutilities = derive2 { name="agriutilities"; version="1.1.0"; sha256="1ynd3cy9ak6ns8vzknz790q4pz63gbj4v9992p3igihw56vx9znn"; depends=[data_table dplyr emmeans ggplot2 ggpubr ggrepel lme4 lmerTest magrittr Matrix psych rlang SpATS statgenSTA tibble tidyr]; }; agriwater = derive2 { name="agriwater"; version="1.0.2"; sha256="14zwpbr9wivnafdrfihvdmbv66cxprz41xgqyifc1nsmgrbr67cz"; depends=[terra]; }; @@ -6087,13 +6092,13 @@ in with self; { ahw = derive2 { name="ahw"; version="0.1.0"; sha256="1dq40qf5r5h011d9fk2c4qjj6dbh0kxl2xfjaflr69r2dlsslgds"; depends=[data_table plyr timereg]; }; aiRly = derive2 { name="aiRly"; version="0.1.0"; sha256="0d3w5dwk0b3pd49zw2005rili4p3l1i3x4hzp8cf6rljr86x01cy"; depends=[httr jsonlite reshape2 tibble]; }; aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; }; - aibd = derive2 { name="aibd"; version="0.1.9"; sha256="1ispw8y0k665fdpw1c0swmhzl596jr89lnwyq741ak6ic92s3pzz"; depends=[commonsMath rscala]; }; aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; }; - aides = derive2 { name="aides"; version="1.0.0"; sha256="1b9pggvkpsid7wb4a4c8iwis1wvp13h833npbmfpz9267w7qrla4"; depends=[meta]; }; + aides = derive2 { name="aides"; version="1.1.0"; sha256="0yqn15ddwq3mvssfkl0sac2scj3j9ghr47r1q3afvmas00p095qg"; depends=[boot meta]; }; + aifeducation = derive2 { name="aifeducation"; version="0.3.0"; sha256="0lxnpq6ais28gmps01q41b8nhkz7kmv3wxzm3llf51490798hv83"; depends=[abind doParallel foreach iotarelr irr irrCAC Rcpp RcppArmadillo reshape2 reticulate smotefamily stringr]; }; aihuman = derive2 { name="aihuman"; version="0.1.0"; sha256="0isd6j3qfhl9dfcknzsfyipvvni7bw6cpdkk4v5azpi3mcixbq4n"; depends=[abind coda doParallel dplyr foreach ggplot2 lme4 magrittr MASS metR purrr Rcpp RcppArmadillo RcppEigen tidyr]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; aimsir17 = derive2 { name="aimsir17"; version="0.0.2"; sha256="0v804maqaygqhw3y9wqap3h9vvjniqnnbsv1psjj500r2yscicxs"; depends=[tibble]; }; - aion = derive2 { name="aion"; version="1.0.0"; sha256="0vnj87r17qsbh9vyp82qsb67lib8ch3j6wban36i9xc1lfljzmri"; depends=[arkhe]; }; + aion = derive2 { name="aion"; version="1.0.1"; sha256="0m6l67nhip8ln875cxsbjghk27p890yb9xs5v18mrg5gjnjgmas7"; depends=[arkhe]; }; airGR = derive2 { name="airGR"; version="1.7.4"; sha256="1klf064lm6iyvlmy89amf097yvcyqsz9m2h6mjxqv6n737bvlzfa"; depends=[]; }; airGRdatasets = derive2 { name="airGRdatasets"; version="0.2.1"; sha256="05059ylizjlb90yqllkw7c0gm8nx1a42mw0334zkm9xpgzsis8cb"; depends=[]; }; airGRdatassim = derive2 { name="airGRdatassim"; version="0.1.3"; sha256="05c108rcj4rlzrbabai95abxhyjsrrrsgvds4zamvyzpjl64f9ps"; depends=[airGR]; }; @@ -6104,7 +6109,7 @@ in with self; { airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; airports = derive2 { name="airports"; version="0.1.0"; sha256="1ahfqqfcvr731hj0h7d00jd87h1adiryh42sv4mh318lk5rglm6f"; depends=[]; }; airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; }; - airr = derive2 { name="airr"; version="1.4.1"; sha256="1zr8nzhy75v82sk1lxp8xk34hxz84zjk9nrgx10kzrycpyrbfjw0"; depends=[jsonlite readr stringi yaml]; }; + airr = derive2 { name="airr"; version="1.5.0"; sha256="0k3a9yg30brpysp62fvvl7pisgb7441ggbl03jx8mh5bjdckr210"; depends=[jsonlite readr stringi yaml]; }; airt = derive2 { name="airt"; version="0.2.2"; sha256="1x2p172k7lffcn3cfs7pgdi3iq2fpys8rsrx1spq7gy14xcq9w63"; depends=[dplyr EstCRM ggplot2 magrittr mirt pracma RColorBrewer rlang tibble tidyr]; }; aisoph = derive2 { name="aisoph"; version="0.4"; sha256="033dawiysl5vn1k3fjabmzc8liywk8sbahm41ga3wzhyyz6mqldm"; depends=[Iso survival]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; @@ -6112,12 +6117,13 @@ in with self; { akiFlagger = derive2 { name="akiFlagger"; version="0.3.0"; sha256="08z5jvigzvl3af17dd8l6zil0s694i22x0a7xvb3n4fvg6fargz4"; depends=[data_table dplyr shiny zoo]; }; akima = derive2 { name="akima"; version="0.6-3.4"; sha256="0gmdh5kvq455k82pvdsqbkk69bi7g0960jq5rcl3cbhxm297arcm"; depends=[sp]; }; akmbiclust = derive2 { name="akmbiclust"; version="0.1.0"; sha256="19dj12vlry6f3agzrnshx2c4rpa2h7dlx2138r49jjy9sm48pyfw"; depends=[]; }; - alabama = derive2 { name="alabama"; version="2022.4-1"; sha256="0v6kl6ndm8wvp9xzya3x4gj5kh03qgx13x5vyzn410wsndcjiim8"; depends=[numDeriv]; }; - alakazam = derive2 { name="alakazam"; version="1.2.1"; sha256="1m4482haxw5cxkh5c39cr4smh9ldmv2anygnfswa4zc58slqf70n"; depends=[airr ape Biostrings dplyr GenomicAlignments ggplot2 igraph IRanges Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; }; + alabama = derive2 { name="alabama"; version="2023.1.0"; sha256="075zqyarb970d4zpxsivaxhnmdg916ypfxrp0mqngnww5p3nfpwj"; depends=[numDeriv]; }; + alakazam = derive2 { name="alakazam"; version="1.3.0"; sha256="01alngdynigvycmpqa71ccndw6v91hmrs3c2ah0r148rxdgbw58v"; depends=[airr ape Biostrings dplyr GenomicAlignments ggplot2 igraph IRanges Matrix progress Rcpp readr rlang scales seqinr stringi tibble tidyr]; }; albatross = derive2 { name="albatross"; version="0.3-6"; sha256="0n4ndaa3a57k698xjrvgq091l6pvpgcmqan52g30la2qsrr109d5"; depends=[CMLS lattice Matrix multiway pracma]; }; albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; }; ald = derive2 { name="ald"; version="1.3.1"; sha256="12nf9vakayw24clrg56fh9x85kg277iricbs8ymahkjqjnc1p3cz"; depends=[]; }; aldvmm = derive2 { name="aldvmm"; version="0.8.7"; sha256="1v3qbk4pm8lk37bjkzcfn8rlcszxix690mjrf5k5w8kk7r6i8zpc"; depends=[checkmate Formula lmtest numDeriv optimr sandwich]; }; + ale = derive2 { name="ale"; version="0.2.0"; sha256="0h06vr023qv4s55yvn4ffgg4g3f6d8y4yv3391lpi6y5j1cnlfmi"; depends=[assertthat broom dplyr ellipsis ggplot2 labeling purrr stringr tidyr yaImpute]; }; alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; }; alfred = derive2 { name="alfred"; version="0.2.1"; sha256="0xgqzn750c4f13w2h8j2xj53sx0dij56164svw01nbvns4n0yvv8"; depends=[dplyr httr jsonlite lubridate magrittr rlang tibble tidyr tidyselect]; }; algaeClassify = derive2 { name="algaeClassify"; version="1.3.2"; sha256="1ggxyj79ddc3c0q3fn1dbx5rmvq5jqrza9dzswwb9sfpfb8acdfh"; depends=[lubridate]; }; @@ -6127,14 +6133,15 @@ in with self; { align = derive2 { name="align"; version="0.1.0"; sha256="1r411yvsgzfywamsjz3j5pim0qjfa7rmhdkhd3sj8lp1xh98jhy9"; depends=[matlab]; }; alkahest = derive2 { name="alkahest"; version="1.1.1"; sha256="1wbdhvak4984rdglsx2h7wwazxkvz2wv93lnizw7b4dm8aqrnapg"; depends=[]; }; allMT = derive2 { name="allMT"; version="0.1.0"; sha256="0d34w0gl369mq512x3h2nsrvd13ahy36p5hdyvz5gnpdlaql64c6"; depends=[dplyr ggplot2 htmlTable plyr readxl reshape2 rio scales stringr survival survminer tibble]; }; - allcontributors = derive2 { name="allcontributors"; version="0.1.0"; sha256="1lvm6r4k4z4v2pl1nb6v2ql1cakyi48b3vp4zdf0p5rvmv7sndz6"; depends=[cli clipr curl ghql git2r gitcreds httr jsonlite magrittr]; }; + allcontributors = derive2 { name="allcontributors"; version="0.1.1"; sha256="0s8az7wz8rx74i6rlinl8l0l90hzql10hxqlxm281irsczhjm7ga"; depends=[cli clipr curl gert gh gitcreds httr2 magrittr]; }; alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; - allelematch = derive2 { name="allelematch"; version="2.5.2"; sha256="15dkafz3gzrnwi3kmd4abyx4i29bm4lhy99lix2n2rjy123wc8fb"; depends=[dynamicTreeCut]; }; + allelematch = derive2 { name="allelematch"; version="2.5.3"; sha256="1gr0s2zfc4i61bxz1prq9p2lyq17h10vzp0mkq2z6c2rfzqfhazc"; depends=[dynamicTreeCut]; }; allestimates = derive2 { name="allestimates"; version="0.2.3"; sha256="1gjkry5v1mrb11zd3r9z9cj6aasrhj29yihpizqphbb463qima3a"; depends=[broom dplyr ggplot2 stringr survival tidyr]; }; + allometric = derive2 { name="allometric"; version="1.4.1"; sha256="04d1k0vnkc13i0d4b3id15nnxflvmfp0fdmrf16lcf0przx4nwz7"; depends=[curl dplyr gh ISOcodes magrittr openssl progress purrr RefManageR rlang stringr tibble tidyr units vctrs]; }; allomr = derive2 { name="allomr"; version="0.2.0"; sha256="1w0b32ks8mi2n1md91bikz1qca1cck5rjc5j2yf22s69dd9rnhqv"; depends=[]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; almanac = derive2 { name="almanac"; version="1.0.0"; sha256="03954ylzqj34kkkz74ffa3i1kbby2vy0gxmbqd4gcw6qa646fq79"; depends=[cli glue lifecycle lubridate magrittr R6 rlang V8 vctrs]; }; - alone = derive2 { name="alone"; version="0.2"; sha256="1qc3dbpyyc37x5ad2rrn3v5a39f00a0kmkm7xphc0w742zsl5p9y"; depends=[]; }; + alone = derive2 { name="alone"; version="0.3"; sha256="15ivqnnpn96x2pg83mswagqb0qaymafphc7awzik14vbg7k9pk9j"; depends=[]; }; alookr = derive2 { name="alookr"; version="0.3.7"; sha256="0sdwphzxjh8y4gi3pnsdddra0x085h30m520j8im25z1bhxp0sq7"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 glmnet MASS MLmetrics parallelly party purrr randomForest ranger rlang ROCR rpart tibble tidyr tidyselect xgboost]; }; alpaca = derive2 { name="alpaca"; version="0.3.4"; sha256="1fqw8fcahpgdkj25pd6pq4isd0yrdpiypl3q9ir79a56pvjcn8a4"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; alpha_correction_bh = derive2 { name="alpha.correction.bh"; version="0.0.1"; sha256="1rwz90hlbiday3s9c90v13s7mprxmmibgk08jkvxfc5axgy8qgqs"; depends=[knitr]; }; @@ -6150,7 +6157,7 @@ in with self; { alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; }; altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; altadata = derive2 { name="altadata"; version="0.1.1"; sha256="0wv8a0423k0gw5i0qgz5d3wqw22a9pk7r80fp33pn0mxq9b54zdv"; depends=[httr jsonlite]; }; - altair = derive2 { name="altair"; version="4.2.2"; sha256="0ckdfgrng3868qm9cspggd5xjbpmkq01q7ylnsiah6v72kzcn1fc"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; + altair = derive2 { name="altair"; version="4.2.3"; sha256="1hbwhyplvqdc06va0lahpqzg89aihjhryic48422h8mks956y0ff"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; altdoc = derive2 { name="altdoc"; version="0.2.1"; sha256="0icvzxkmjnssiz4cpphm69drz3mla15i54j4gqfav4jxmz7166z0"; depends=[cli desc fs here htmltools rmarkdown rstudioapi servr tinkr usethis xml2 yaml]; }; altfuelr = derive2 { name="altfuelr"; version="0.1.0"; sha256="0k3f4wr9gbn5aig40xg817hrnz2lx8g4adyy18s59fs8dw03v87h"; depends=[dplyr httr jsonlite lubridate magrittr purrr stringr]; }; altmeta = derive2 { name="altmeta"; version="4.1"; sha256="01v308389wqzp35icrp9ssb4y4gxwjzl600qw47c6rmm6s2mxzjh"; depends=[coda lme4 Matrix metafor rjags]; }; @@ -6162,7 +6169,6 @@ in with self; { amazonadsR = derive2 { name="amazonadsR"; version="0.1.0"; sha256="1z4c58swpm6y5h4vlxil5ic9larhnn7xkzd9sgggni4878yk0rng"; depends=[jsonlite]; }; amazons3R = derive2 { name="amazons3R"; version="0.1.0"; sha256="1h39cm0vyrr299wfpq9p1dpbgrjhkr28wm2q23lq8627i4b8bn5m"; depends=[jsonlite]; }; amazonspR = derive2 { name="amazonspR"; version="0.1.0"; sha256="0il66gb43zm6shr870yqlfn6l1srl37pdxpq3pdkil8g20nf92rn"; depends=[jsonlite]; }; - ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="1.0.2"; sha256="18cmn075yhcbqlrf4gsgqflqzk2d0kc3ah23k9pn47q2dvr6fqn2"; depends=[cpp11 rlang]; }; ambit = derive2 { name="ambit"; version="0.1.2"; sha256="1zjsbza5gzr0sfprfxrxrxy3f75r64bi5szk519n2wf5vr4qr7si"; depends=[fBasics Rcpp]; }; amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; @@ -6176,23 +6182,22 @@ in with self; { ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="1.1.0"; sha256="0nnsxrnq3m1frrjp3i8bhm67x6xnl0scyb67wxgm5x7b187svhfj"; depends=[caret kernlab Peptides Rcpp]; }; amt = derive2 { name="amt"; version="0.2.1.0"; sha256="0dw29gpgcqm5v8scwhnvdk1vkq9wqjd9klrxlgigqisnlqg0pgia"; depends=[checkmate circular ctmm data_table dplyr fitdistrplus FNN KernSmooth lubridate MASS purrr Rdpack rlang sf sfheaders survival terra tibble tidyr]; }; - anMC = derive2 { name="anMC"; version="0.2.4"; sha256="03yzyhqfc7g4aqn19iv3pc9413iz4jlh460p17dlbqwzzmici45p"; depends=[mvtnorm Rcpp RcppArmadillo]; }; + anMC = derive2 { name="anMC"; version="0.2.5"; sha256="0xrby8qyfd3dgi64kllspvalz9yrxjdj5qd1fqjdl6qwb3h6rkga"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anabel = derive2 { name="anabel"; version="3.0.1"; sha256="0m6jkbl3mf3kpaq9yj0qrbwcvgd1qrdakc14xcnd8awgvbqh6z01"; depends=[cli dplyr ggplot2 kableExtra minpack_lm openxlsx progress purrr qpdf reshape2 rlang tidyr]; }; anacor = derive2 { name="anacor"; version="1.1-4"; sha256="0wf9kb8389gc9jy32dr8ap78lychgjnd19jix7wzln4yx78ypqnq"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="1.0.7.2"; sha256="146n6z06nr3jyni8mg8gjb7r4w06mrpkfmpg8l8z6rw9aw1gh73p"; depends=[httr jsonlite magrittr yaml]; }; analogue = derive2 { name="analogue"; version="0.17-6"; sha256="0c5h8nnbflydv35ja1pfhyx7ifwlriwgcnrmxj5il5lvcr70y1vi"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analyzer = derive2 { name="analyzer"; version="1.0.1"; sha256="1729dnghdca7dr4l5cxazg68ipkm63mvk2danwm3bva62sza29p6"; depends=[dplyr ggplot2 gridExtra]; }; anapuce = derive2 { name="anapuce"; version="2.3"; sha256="05k3ypy4dc8q4jv0by37k66pdwb1wmsd24i6nciris5knfdy9csg"; depends=[]; }; - and = derive2 { name="and"; version="0.1.4"; sha256="072hhh8f6pnchryv6aclspd20i05fx63qxfgdvghpycvwbsn8fyg"; depends=[glue rlang]; }; - andrews = derive2 { name="andrews"; version="1.1.1"; sha256="0ziww4gxnp3sprjsgvv7hi2sfysapbgdsim5jgmrw8g2fn82jwkg"; depends=[primes]; }; + and = derive2 { name="and"; version="0.1.5"; sha256="1i95ap4yba5c5ygwsvwmqb3am4r5agv7yhls7ji7pnly8nkrknyn"; depends=[glue rlang]; }; + andrews = derive2 { name="andrews"; version="1.1.2"; sha256="18z8g1g5kx3cmgx4rc4rd35d557yl30xxmr2g2nkdd714w2asqra"; depends=[gmp]; }; andurinha = derive2 { name="andurinha"; version="0.0.2"; sha256="1cpz16zv3al6lmsqsb7dl5v6kml2a0hg084rbmwa4wsyk5ygl8bm"; depends=[cowplot ggplot2 plyr rlang signal tidyr]; }; anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; }; angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; aniDom = derive2 { name="aniDom"; version="0.1.5"; sha256="04gqq6ibmr7zq8p9cbpxj98afq7yz82gp7prwbq2ymbxnkywwpgq"; depends=[rptR]; }; aniSNA = derive2 { name="aniSNA"; version="1.0"; sha256="1i5my4afh407a990crin11m9nbwjpry0ldpcb0r2bpk8sr13gcnb"; depends=[dplyr ggplot2 igraph lubridate magrittr Rcpp reshape rlang stringr]; }; anim_plots = derive2 { name="anim.plots"; version="0.2.2"; sha256="0j786k5kkc1d33q52ki6fp3hnddjv7fv3ss6zjm9hqqgkq34vwqh"; depends=[animation]; }; - animalEKF = derive2 { name="animalEKF"; version="1.1"; sha256="0bq2d2iza0c971731b915cd1k2f7gq2x1k7xv4z91sy73v0jngl5"; depends=[bezier colorspace deldir ellipse ggplot2 HDInterval maptools MASS Matrix MCMCpack mvtnorm plyr png rgdal rgeos shiny sp]; }; - animaltracker = derive2 { name="animaltracker"; version="0.2.0"; sha256="1zv2nj4wfskz1lxfgw8l4gyrlv418drk8zl4cw55i5na6a39shcv"; depends=[dplyr forcats geosphere ggplot2 httr leaflet leaflet_extras lubridate maptools raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr zoo]; }; + animalEKF = derive2 { name="animalEKF"; version="1.2"; sha256="1qhmgwmg9nw8hcsd8gkvk0h8rmk82zkqjyd94a1d79cwmryxls9b"; depends=[bezier colorspace deldir ellipse ggplot2 HDInterval MASS Matrix MCMCpack mvtnorm plyr png rlang sf shiny sp]; }; animate = derive2 { name="animate"; version="0.3.9.4"; sha256="1pzgxz3xdp7c1swd5sxzlpyvvqv3shw8dxnbjwv1cr5g406p8970"; depends=[base64enc glue httpuv jsonlite R_utils R6]; }; animation = derive2 { name="animation"; version="2.7"; sha256="0sg4sz5lkn85yzpcg22xkr7921cbnh7g74nlp9imjy7c0hdqyhc8"; depends=[magick]; }; animint2 = derive2 { name="animint2"; version="2023.6.11"; sha256="0kx0nycxzxgl0ybd5faw7ycdajj202ibpdlgxwnh4j3z1zklpynf"; depends=[data_table digest gtable knitr MASS plyr reshape2 RJSONIO scales]; }; @@ -6202,85 +6207,85 @@ in with self; { anndata = derive2 { name="anndata"; version="0.7.5.6"; sha256="1q1ii43wfj68qdlzhqj9msxqsfzpidhhlfrisax4p943v7yh75mi"; depends=[assertthat Matrix R6 reticulate]; }; annmatrix = derive2 { name="annmatrix"; version="0.1.2"; sha256="0ljlxiyprvaa84skw5g2qfjf55fkdcsygvb09i5jws9dm0i8h80w"; depends=[]; }; annotater = derive2 { name="annotater"; version="0.2.2"; sha256="1yzsamy4zrr7v0kjnc3x034a7ffw1zj7cc5dx11pcwyhk88yba7z"; depends=[dplyr purrr readr rlang rstudioapi stringi stringr tibble tidyr]; }; - annotator = derive2 { name="annotator"; version="0.0.3"; sha256="0d0lkizdafinyqjg7xzgn375b6m8gfkhsdf6c73hm9r8h2kik2sq"; depends=[htmlwidgets shiny xfun]; }; + annotator = derive2 { name="annotator"; version="0.0.3.1"; sha256="17jbr414wamxczsnxldz3la4n15d0b4lbhlhk8na9hniidin4f9b"; depends=[htmlwidgets shiny xfun]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; + anomalize = derive2 { name="anomalize"; version="0.2.4"; sha256="0i5vlhh9m00rqgk3wvy39fpzw9jxp38h3sxjqa74i54jy8maqdm6"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; }; anomaly = derive2 { name="anomaly"; version="4.3.0"; sha256="1dlq82nxrvg6ydcgk74axssg71zhfilb54h244abwrzj782286cf"; depends=[assertive BH dplyr ggplot2 Rcpp Rdpack tidyr xts zoo]; }; anovir = derive2 { name="anovir"; version="0.1.0"; sha256="1x7lvj7xchbv6siyc9miivmf0rlxrjflal4icyvbxgdr285s2s9w"; depends=[bbmle]; }; anscombiser = derive2 { name="anscombiser"; version="1.1.0"; sha256="1hakvxgc50zshi5kplg90r0499mihhwvhhz7bshndjxxci1ashkl"; depends=[]; }; - antaresEditObject = derive2 { name="antaresEditObject"; version="0.5.1"; sha256="05zawrma7li2pqlsvs1y866a3l7qrpkb2mb0n9l883lfb4gw9q8q"; depends=[antaresRead assertthat cli data_table doFuture doParallel future httr jsonlite memuse pbapply plyr progressr whisker yaml]; }; + antaresEditObject = derive2 { name="antaresEditObject"; version="0.6.0"; sha256="1bj49sgnygkriqw7i6fqkf6d3piplxa58bgllrbzk29ngp2z1zdz"; depends=[antaresRead assertthat cli data_table doFuture doParallel future httr jsonlite memuse pbapply plyr progressr whisker yaml]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.1"; sha256="1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz"; depends=[antaresRead data_table]; }; - antaresRead = derive2 { name="antaresRead"; version="2.5.1"; sha256="16chh3n62m0dw0w25wrn68l1gn03vhhsz7k2vgwgjcyzbbllg2x2"; depends=[bit64 data_table doParallel httr jsonlite lubridate memuse pbapply plyr purrr shiny stringi stringr]; }; - antaresViz = derive2 { name="antaresViz"; version="0.17.1"; sha256="072nh0x0qrbi9va27r20vjzjsbjriqbzbpwc7vl40pimjd0hd2x4"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; }; - anthro = derive2 { name="anthro"; version="1.0.0"; sha256="169h2vhdd2kxh4228lx1ab3fipixvka4686ngx6h8g15li9828s9"; depends=[survey]; }; + antaresRead = derive2 { name="antaresRead"; version="2.6.0"; sha256="1rlgkq8nna6zs7i5czj1wbcyzng5bj9w7mijz5yy80mf5qd6x2v3"; depends=[bit64 data_table doParallel httr jsonlite lubridate memuse pbapply plyr purrr shiny stringi stringr]; }; + antaresViz = derive2 { name="antaresViz"; version="0.18.0"; sha256="1lffsxv8fy3yq6rx6520rizp9f74d8bd78by5n209yr9yhw1629r"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts sf shiny sp spMaps webshot]; }; + anthro = derive2 { name="anthro"; version="1.0.1"; sha256="0vp55q0f9d4gljwzfzr07f80q5ip59imvklfw8gg1rjw83yaqpxr"; depends=[survey]; }; anthroplus = derive2 { name="anthroplus"; version="0.9.0"; sha256="1wnj2idgdnh2gdw34x40adijf2sxp3k72j45pqqxg4aqc1wrvvv1"; depends=[anthro]; }; - anticlust = derive2 { name="anticlust"; version="0.7.0"; sha256="00py6va36imp5l7v7w46brb0v9ycv41460j8ydjbn123wajvxm5m"; depends=[Matrix RANN]; }; + anticlust = derive2 { name="anticlust"; version="0.8.0"; sha256="0mns6d11i3p8vbm7cfxgqvln043ii5h1lxzwvdnpz9rqy90dj85r"; depends=[Matrix RANN]; }; antitrust = derive2 { name="antitrust"; version="0.99.26"; sha256="172y87vnifxbs4n06v3qvwlxnl3fxhfp9cp1qzm4agcvqh1j7rxz"; depends=[BB numDeriv]; }; antiword = derive2 { name="antiword"; version="1.3.1"; sha256="123v8zlczwh6fr1v3x7dl3885xlmddq1bqlcxih8zh07w0hlk1k2"; depends=[sys]; }; anyLib = derive2 { name="anyLib"; version="1.0.5"; sha256="1x9x58hhkkwdskmgdjv94ynh811n9w0752hh4214adl1qpn576vm"; depends=[BiocManager curl devtools httr withr]; }; anybadger = derive2 { name="anybadger"; version="0.1.0"; sha256="1aa09v5k5nlvhlir8saa5gnrq7cb1djbdc8y85cjgb3skay94hzv"; depends=[config glue magrittr purrr R6]; }; - anyflights = derive2 { name="anyflights"; version="0.3.3"; sha256="1iwiil15zc4zq6y7ns8r6w27w75v72fm3syn46bxrspw0iy0lj3v"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; }; + anyflights = derive2 { name="anyflights"; version="0.3.4"; sha256="1dycpzc36n31zd21f7iniij6l70cdmgcc3sgar7m8msvhimkafkj"; depends=[curl dplyr glue httr lubridate progress purrr readr roxygen2 stringr usethis vroom]; }; anytime = derive2 { name="anytime"; version="0.3.9"; sha256="0jjpqynai5nd7mfy1smb44356f3d5bmpxhs1i9x9jw5c959c35hh"; depends=[BH Rcpp]; }; - ao = derive2 { name="ao"; version="0.2.6"; sha256="02il04c8c5pykwzm1dfrn1vj2w38sg5lqg7v92vg209mxd11azry"; depends=[ggplot2 optimizeR rlang]; }; + ao = derive2 { name="ao"; version="0.2.7"; sha256="1lmvq1np3b9pg3n2xnlscrnnjnqj4aada2mkgmv3z32sbfak77lk"; depends=[checkmate optimizeR]; }; aod = derive2 { name="aod"; version="1.3.2"; sha256="0p2i536s0aa54rah1l465g77k2ldn6jm6s25y9vc06mk29xvx1cv"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.2"; sha256="0rd4xr7nwac49m8h4pr8hv79giyv2rrlnz78r7mxa6lpgkmgqp4d"; depends=[]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; - aopdata = derive2 { name="aopdata"; version="1.0.2"; sha256="0vjx3zzfr4si09g6f3vk6yl5p4nr5x147ng2578mpa2kwf47yad8"; depends=[checkmate curl data_table httr sf]; }; + aopdata = derive2 { name="aopdata"; version="1.0.3"; sha256="13i8fjvqx42jslgyl271cbnpmsxqxmkrs5hiaxr5i8srrq55d60m"; depends=[checkmate curl data_table httr sf]; }; aoristic = derive2 { name="aoristic"; version="1.1.1"; sha256="1zanf21qmnjmwzzccpdm1bwnyhv9zqjirrylfwmbpkzlmvp0a4pb"; depends=[dplyr ggplot2 lubridate openxlsx plyr scales tidyr]; }; - aorsf = derive2 { name="aorsf"; version="0.0.7"; sha256="1shx7i6qf0w9w2ir5p7mdjh1kva2xqxm6qm9blqwp7s418ykvk6b"; depends=[collapse data_table Rcpp RcppArmadillo]; }; + aorsf = derive2 { name="aorsf"; version="0.1.0"; sha256="0rwxqxs2jhi8a6przsxnrx1a6zax7i25qli8a83jxxibswhx0j05"; depends=[collapse data_table Rcpp RcppArmadillo]; }; aos = derive2 { name="aos"; version="0.1.0"; sha256="0nkl7dkqjfp4ahwmn3vs0akx6x2brf0m5gzzzx6pf54j1qwypbhf"; depends=[htmltools jsonlite]; }; - apTreeshape = derive2 { name="apTreeshape"; version="1.5-0.1"; sha256="1wxhfp21ir9yv4wnbh7ay2x05k822nsyd5smlxmk67wm5w4vr1v1"; depends=[ape coda cubature pbapply quantreg]; }; - apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; + apa = derive2 { name="apa"; version="0.3.4"; sha256="0w4cqb9fviz6k4b9cj31sgizqmrkxjr9hjdb8ap32ylzr9dw6gy0"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.8"; sha256="0jy6x0z9ivqqkjihqhyg3fxyghqa9gs6q2bpxzjdnbcb3kq151vd"; depends=[boot broom car dplyr MBESS tibble]; }; apaText = derive2 { name="apaText"; version="0.1.7"; sha256="1y3kwm6kldryqw9jb2dikvijmqxwxpkp4pw64c9pqshxjjnwfqiq"; depends=[cocor dplyr]; }; - apache_sedona = derive2 { name="apache.sedona"; version="1.4.1"; sha256="1pfkkxilc8ggw9q44rk27ic97i8zqprf5gfnvr9dwk7q5icf3dnw"; depends=[cli dbplyr lifecycle rlang sparklyr]; }; + apache_sedona = derive2 { name="apache.sedona"; version="1.5.0"; sha256="1jhxag774s2gyv6w9111xg1l1ackzxnl6g906d520g7yxdl5wgm2"; depends=[cli dbplyr lifecycle rlang sparklyr]; }; apc = derive2 { name="apc"; version="2.0.0"; sha256="0vh6iyxm46k8sfa1xgz0y6m619snnm8s072kml5qgiiw5s7bqnpq"; depends=[AER car ChainLadder ggplot2 ISLR lattice lmtest plm plyr reshape survey]; }; apcf = derive2 { name="apcf"; version="0.3.0"; sha256="194w409gz052a8gcsdn3v68sqjcwrhb1ck712nljd0iy1mgdz6cs"; depends=[Rcpp wk]; }; - apcluster = derive2 { name="apcluster"; version="1.4.10"; sha256="1820j1xjlbmw6j2fwwv2g806dqpk5qrbbaqsrbrn6igql8pzf552"; depends=[Matrix Rcpp]; }; + apcluster = derive2 { name="apcluster"; version="1.4.11"; sha256="0crk7skivcmlvr0njsbd8dksj5wa6qlvdp99ay5b2b40cs3xm5s4"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.7-1"; sha256="0yh5wl7nydhwwc82h6yr8wcacc2f791pp05w8fg65anq309cf2cb"; depends=[digest lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; - apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; }; apexcharter = derive2 { name="apexcharter"; version="0.4.1"; sha256="0wic3190agd9z1jb2dsq4a6s1glgnfn2137vmfjkbbf242div0gi"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.5"; sha256="1pwr1i3wxh0l24cqp59q6n59p21v81fmgxkb4jmf50a3ggb1lcdj"; depends=[kmer openssl Rcpp]; }; - aphylo = derive2 { name="aphylo"; version="0.3-2"; sha256="0w1bg3vb347gimz5v316d44jv30amjxc8lhjz8bl8cxyh5b1rhyl"; depends=[ape coda fmcmc MASS Matrix Rcpp xml2]; }; + aphylo = derive2 { name="aphylo"; version="0.3-3"; sha256="1blvj2mz1pdsypxak78pmck097ryzaz24y4flzs5k5djqxgpjwnm"; depends=[ape coda fmcmc MASS Matrix Rcpp xml2]; }; api2lm = derive2 { name="api2lm"; version="0.2"; sha256="05g0lc2cz596hh0876600lfj9d69jqcc3r3f163knn7gqlbbxs6h"; depends=[]; }; - apisensr = derive2 { name="apisensr"; version="0.3.0"; sha256="1mis266s4m0hp34m7b7p008dvw7780r8rypgbpk7h5hgd1w5d7m0"; depends=[config episensr ggplot2 ggraph glue golem htmltools igraph rhandsontable rmarkdown shiny shinyjs shinymaterial]; }; + apisensr = derive2 { name="apisensr"; version="1.0.0"; sha256="00mfmqck521wgx26az57ynmbj8j3c1vxykpqpwg17591s1jw5796"; depends=[attempt config episensr ggplot2 ggraph glue golem htmltools igraph rhandsontable rmarkdown shiny shinyjs shinymaterial]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplot = derive2 { name="aplot"; version="0.2.0"; sha256="1431c6hx812bz013zqbgj5zg4ilpakfpi691wlcwybri75sxxdv0"; depends=[ggfun ggplot2 ggplotify magrittr patchwork]; }; + aplot = derive2 { name="aplot"; version="0.2.2"; sha256="094bzrcjybs2dk2plmxf80mbx9dz1hi5m7gp8bbs5qqh03xn7wf7"; depends=[ggfun ggplot2 ggplotify magrittr patchwork]; }; + aplotExtra = derive2 { name="aplotExtra"; version="0.0.2"; sha256="0sh3c78p37kn00hkps5ai3aqz391wwpbck2rar4rdvwclg4818my"; depends=[aplot dplyr forcats ggfun ggplot2 ggstar maftools purrr rlang tibble tidyr yulab_utils]; }; aplpack = derive2 { name="aplpack"; version="1.3.5"; sha256="0kv6sbw8832hlfc6164bfvg1ga4hkfw4c7i11dlz7mbhrw2vqm24"; depends=[]; }; apng = derive2 { name="apng"; version="1.1"; sha256="0g1rs8wdcbqhyjis2r1a4d96jf0486ncnap97yjv08nk574d42wp"; depends=[bitops]; }; - apollo = derive2 { name="apollo"; version="0.3.0"; sha256="0k561m2ypywiw0lzk5yy1z48d8x0rs99grz20hh28lp5b7zzip9a"; depends=[bgw cli coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB Rsolnp stringr tibble]; }; - appRiori = derive2 { name="appRiori"; version="0.0.2"; sha256="0qi840a3nlacbkiw3q6ikf2nddw5b1cq1v1llyhpbkmvd807bh8p"; depends=[dplyr DT hypr markdown MASS pracma rhandsontable shiny shinythemes sortable stringr]; }; - appeears = derive2 { name="appeears"; version="1.0"; sha256="1q01wzqhg9qzacdwh13bgr2v8z0mv673gh7sx5xa9a9z6g6spvwm"; depends=[geojsonio getPass httr jsonlite keyring memoise R6 rstudioapi sf]; }; + apollo = derive2 { name="apollo"; version="0.3.1"; sha256="0in0d0af3pr61zfd9fvych4vakmsz66clw4zywvy4pqj8v8q3axa"; depends=[bgw cli coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB Rsolnp stringr tibble]; }; + appRiori = derive2 { name="appRiori"; version="0.0.3"; sha256="18hvrn5zdcp7q64pcbg3jgssiyi4m4cy7bkm4al1f8m4p46j7qbq"; depends=[dplyr DT hypr markdown MASS pracma rhandsontable shiny shinythemes sortable stringr]; }; + appeears = derive2 { name="appeears"; version="1.1"; sha256="1igrbp6mgflgxn9f63d738zzhgsdsvlgwbgidlbqy82v4i4q326p"; depends=[geojsonio getPass httr jsonlite keyring memoise R6 rstudioapi sf]; }; appleadsR = derive2 { name="appleadsR"; version="0.1.0"; sha256="19xkzykk6zdbswdkfix9nqnfgab4r9c21rqwpma1r6fjapsp81jf"; depends=[jsonlite]; }; appler = derive2 { name="appler"; version="0.2.1"; sha256="0y0nj8ac6cm1qvbzy2w93j638s0f4mj2b1b9g2rw046rrf7maiz4"; depends=[httr jsonlite rvest]; }; applicable = derive2 { name="applicable"; version="0.1.0"; sha256="1n81aa5by0fd47wjksdl0zpzf0w4vgrns6iqv5i9lqs7g64zggs0"; depends=[dplyr ggplot2 glue hardhat Matrix proxyC purrr rlang tibble tidyr tidyselect]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; apportion = derive2 { name="apportion"; version="0.0.1"; sha256="0z8b9qsxsnwy6kmkns6cgri55mvnhsfkwwmljhlp26l93m3llabc"; depends=[]; }; - approxOT = derive2 { name="approxOT"; version="1.0.2"; sha256="1j17dcs4nxss81q1d3mf6h7nkzrq202n7pqb7phza085xmjvpksx"; depends=[BH Rcpp RcppCGAL RcppEigen]; }; - approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; }; + approximator = derive2 { name="approximator"; version="1.2-8"; sha256="1ya1alx6dzcj8srzrdlcx3fxkb1bzja9l68y66km2mbc4qc03xwb"; depends=[emulator mvtnorm]; }; approxmatch = derive2 { name="approxmatch"; version="2.0"; sha256="1n6v1h4zf1nf8j1a5d0h95v6q8dff39v9061i7zzi9ci3lw04748"; depends=[]; }; appsflyeR = derive2 { name="appsflyeR"; version="0.1.0"; sha256="1ch0cjxl7jzrdch3mz1cayc88mbf2dgp0l775c3li44204pxp8wl"; depends=[jsonlite]; }; + appsheet = derive2 { name="appsheet"; version="0.1.0"; sha256="1csf5p9vmm0bn2kycs6ad7jzcw6c2ck6yimr7lb9nb58820s4g2f"; depends=[cli httr2 magrittr purrr rlang tibble]; }; aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; }; apsimx = derive2 { name="apsimx"; version="2.3.1"; sha256="1d1ipzf9ahdb3540zjcyzj4dwx5v8b73av790ahhbmc128vdmspj"; depends=[DBI jsonlite knitr RSQLite xml2]; }; apt = derive2 { name="apt"; version="3.0"; sha256="14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm"; depends=[car erer urca]; }; apyramid = derive2 { name="apyramid"; version="0.1.3"; sha256="0i1wkqnf1n5x7y7i116gr7y215aibklcnhb7rm76g8wm7241y3vk"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; - aqp = derive2 { name="aqp"; version="1.42"; sha256="06mgrxq2kq5qkg5sqxvvllk1iwd28p2j82m9fr4cjv2icklll3fl"; depends=[cluster data_table lattice plyr sp stringr]; }; + aqp = derive2 { name="aqp"; version="2.0.1"; sha256="1dmwrml1qsaj9x0h8a9d2znpw4rscvlcapbj19chrxszncsr2lwi"; depends=[cluster data_table farver lattice sp stringr]; }; aquodom = derive2 { name="aquodom"; version="0.1.1"; sha256="11w3qf1fwa5gqbiwfq23hrw8k009xbn8rwdb5fgckykyc49lhqbk"; depends=[cachem dplyr glue httr lubridate magrittr memoise openxlsx readr rlang stringr tibble]; }; ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; }; arabic2kansuji = derive2 { name="arabic2kansuji"; version="0.1.3"; sha256="1f8ca7hwbn3vl44xrvpfb5n11rv4sbhv2ksg88kx7rk7hik5rbdi"; depends=[purrr stringr]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.3"; sha256="1ak57zci3ckfmpdmgw8hadnfg81hxp69h21s6a3ad3yldvcqg010"; depends=[]; }; arakno = derive2 { name="arakno"; version="1.3.0"; sha256="1mbbb4bzcck78wma9nrmpava81cii92rzjq0yl3p38zvnym2i2m9"; depends=[ape httr jsonlite phytools rgbif rworldmap rworldxtra]; }; - arc = derive2 { name="arc"; version="1.3"; sha256="0isfa7d26jpj004lf4f06krbfa68zyzrh5431xa63k2dykvg8c5j"; depends=[arules discretization Matrix R_utils]; }; + arc = derive2 { name="arc"; version="1.4"; sha256="0wlp6c2mbsa5fygc4iy0ixgqz49zzcz2mr66sapy1nm0wri1dvdr"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2-1"; sha256="1dahfl9xdnqiwzdrff98x23k1dl19sfdqnv7jlg1xzgvhj1fhk0d"; depends=[]; }; - archeoViz = derive2 { name="archeoViz"; version="1.2.0"; sha256="1q3z8hi44aw6xrydylxj6w8ifr02cfinl5zwkc70fzzc3s1yqmhh"; depends=[cxhull ggplot2 htmlwidgets knitr mgcv plotly reshape2 shiny shinythemes svglite]; }; + archeoViz = derive2 { name="archeoViz"; version="1.3.2"; sha256="0nvaj7p1nd3h620r8cf2pm3vjlyqq2d66jy4didvb5ackc93yfqx"; depends=[cxhull ggplot2 htmlwidgets knitr mgcv plotly reshape2 shiny shinythemes svglite]; }; archeofrag = derive2 { name="archeofrag"; version="0.8.2"; sha256="1xnfb4midmjlhq2x8mv6r0mrjbm529xnfm8y0q9wll73igg696yl"; depends=[igraph]; }; archetypal = derive2 { name="archetypal"; version="1.3.0"; sha256="0xih81gwfwr1x9671gpzw49v95hmnl497hahxsyvdla87n1bfpc3"; depends=[doParallel entropy geometry inflection lpSolve Matrix plot3D]; }; archetyper = derive2 { name="archetyper"; version="0.1.0"; sha256="1d4vz7kj7n5j81fwfxvr47if8c7fdycci6n33wf8paac0v2paqli"; depends=[bannerCommenter config feather here knitr log4r ps readr rmarkdown skimr snakecase stringr testthat tidyverse]; }; archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; }; archiDART = derive2 { name="archiDART"; version="3.4"; sha256="1wvjlg2rwy39czf3qqh9igk9rmk9i7pxa9yl5x9yqmsagwd1av3n"; depends=[geometry gtools sp XML]; }; - archive = derive2 { name="archive"; version="1.1.5"; sha256="0zq61bvma82fxvczy3bhfy3x8k5s36avmblvfl1vsa2f0rp63nmk"; depends=[cli cpp11 glue rlang tibble]; }; + archive = derive2 { name="archive"; version="1.1.6"; sha256="0jshrkz2bvz9sq8iyij39ih6h3js3sqajzsa9ly5pqqhmmkk7q7c"; depends=[cli cpp11 glue rlang tibble]; }; archiveRetriever = derive2 { name="archiveRetriever"; version="0.3.1"; sha256="0y01am255i682iaj55aiza6arlb0whqhamd09nqjrnwy4hmkbidq"; depends=[anytime dplyr ggplot2 gridExtra httr jsonlite lubridate rvest stringr tibble tidyr xml2]; }; archivist = derive2 { name="archivist"; version="2.3.6"; sha256="0q1qysack30xzxdbvvi56rk7r85hsj4ghls9r70ki7bl3rqwr4c9"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; }; @@ -6298,17 +6303,18 @@ in with self; { arf = derive2 { name="arf"; version="0.1.3"; sha256="0x5r8b76lzd6a7dzrnr63z7zjfhg75vwjzlzafw652wh2pc37fqk"; depends=[data_table foreach matrixStats ranger truncnorm]; }; arfima = derive2 { name="arfima"; version="1.8-1"; sha256="1msbd52989yqxqxgapgjvzfzzpkr2w9dp7ig8racqpzwqnjhpswb"; depends=[ltsa]; }; argo = derive2 { name="argo"; version="3.0.2"; sha256="17ys6v2n84fp38zkc43whfgbc8qq1qx41q14899qgglz7xv4axzn"; depends=[boot glmnet Matrix XML xtable xts zoo]; }; - argoFloats = derive2 { name="argoFloats"; version="1.0.6"; sha256="1ldnqg5zwczv3sfdy3s06gyri1a05l6qfgwab68ns0d24b69yrlk"; depends=[oce]; }; + argoFloats = derive2 { name="argoFloats"; version="1.0.7"; sha256="10pqxd8yflfhsf03235xgvy9w64ybsmfm61cl428zkh43z7lyjf8"; depends=[oce]; }; argonDash = derive2 { name="argonDash"; version="0.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; }; argosfilter = derive2 { name="argosfilter"; version="0.70"; sha256="1cqhpq5z807azpc45d00031bhw5q69111jsblyqdp5bg6qinrj9c"; depends=[]; }; argparse = derive2 { name="argparse"; version="2.2.2"; sha256="0vc59854fxnznjcrzy5kdmnbyk602ml92jk15rxgndfawvsrnb5n"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.7.1"; sha256="0xcl0ivsbc4iw8s7027q4cx68j6s5lihbby0xa9pmlv4wjmcvdr6"; depends=[]; }; - argus = derive2 { name="argus"; version="0.1"; sha256="0k016fpz03gzsy165cqk1gbszrk7xr330hxcnjl1d5r2hnfxgvxl"; depends=[Runuran]; }; + argus = derive2 { name="argus"; version="0.1.1"; sha256="1qg1nphy7jn92zqx1lqg68l5dhpwa4b5407mkwwrsdy5x2r0x7s2"; depends=[Runuran]; }; ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; - aricode = derive2 { name="aricode"; version="1.0.2"; sha256="1w5jnql49f0wd5h4b89l69s7qldp7qm90p4jm0j4kz9w0vvm2kjz"; depends=[Matrix Rcpp]; }; + aricode = derive2 { name="aricode"; version="1.0.3"; sha256="02nrw66jfpzf6dy0zy21sbdjxjc8c11iv9fkjqj5akzb7wskk9qh"; depends=[Matrix Rcpp]; }; + arima2 = derive2 { name="arima2"; version="3.0.1"; sha256="1q3b11dgky67c4la19hcd07w05dswz67yydgfdm09lgs54f52iwy"; depends=[ggplot2]; }; arkdb = derive2 { name="arkdb"; version="0.0.16"; sha256="1xzp0j20z8vbzaalmxxqdcipd5fr6syw2k96fv2i6cf54xdaa1p3"; depends=[DBI]; }; - arkhe = derive2 { name="arkhe"; version="1.2.0"; sha256="0bvlypa692pdfns9kjx45m3qvckppa47mx5m7z783pxcxxw01fak"; depends=[]; }; + arkhe = derive2 { name="arkhe"; version="1.3.0"; sha256="1mya1c8dzpwkag0r0wrj45x0wwi296m4mmhgbhyk7cyaqyl7wka8"; depends=[]; }; arm = derive2 { name="arm"; version="1.13-1"; sha256="0dz9dnsky77da2mc198dr3600kz9vk75z1iihjarnsdrq68a4bf0"; depends=[abind coda lme4 MASS Matrix nlme]; }; armada = derive2 { name="armada"; version="0.1.0"; sha256="191iwf5y1za3wssawkyi9jcingfqqxcvv88hglpw6j7y3x5f47hf"; depends=[anapuce circlize ClustOfVar ComplexHeatmap doParallel FAMT glmnet impute mvtnorm qvalue VSURF]; }; armspp = derive2 { name="armspp"; version="0.0.2"; sha256="098c59hdzr4ly8sx72xkcbjmiz5y65id1slsscwjji1yssb23lqq"; depends=[Rcpp]; }; @@ -6321,19 +6327,20 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.2"; sha256="0bp30622md9zzdgv9g1kqp5k450cd5yzpqji51wwcjp8l347fb6y"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.9"; sha256="0nrlyxgn6667l2rb1q5rvps1anld9aq88qqr3ch2i6zchnqxrdg9"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="12.0.1.1"; sha256="18c864ingckbi3v2xhigaiv72sc2c4x3zps60z0v22slkpz5ba0s"; depends=[assertthat bit64 cpp11 glue purrr R6 rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="13.0.0.1"; sha256="1h08zx7hvmsib7mi8yn0pk0y2bqqn5scr804ln0g30jwvcjx7w56"; depends=[assertthat bit64 cpp11 glue purrr R6 rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.6.3"; sha256="0qvs3ld28djnjnggdhqjwq8sbv8zz322qahlvf7dnx35yqf6xkms"; depends=[knitr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; arthistory = derive2 { name="arthistory"; version="0.1.0"; sha256="01jw0r3pmwwrs5cb31pjyf5cygnfqzyim2dw45lqd0yywkmc5y3h"; depends=[]; }; + artpack = derive2 { name="artpack"; version="0.1.0"; sha256="124lybfsxy62qdwr14w8w88kn4fylfff6qd2xy07x2g3lncf6497"; depends=[cli dplyr knitr purrr rlang stringr tibble]; }; arules = derive2 { name="arules"; version="1.7-6"; sha256="0syrbh85vzhp9plm95dhq6pfanzbxqm4wcahw3y2d26gvi2nmzwm"; depends=[generics Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.2.5"; sha256="13p876k3wg84khvzf6kkjpna0l9yjxyq43nh9dnpma7sidq5ldi0"; depends=[arules discretization glmnet Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-8"; sha256="0kqvi7dzq3mrn6cq22gwxh4p54mgfn9s1sd2cfnbw1f9zp078lsn"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-30"; sha256="1bnsgjjwrp1n5szhlyg3lhrhcz0sgdxsfdilbi5id9jbdkq9632a"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.5-2"; sha256="0nvaqqc1k1zxzdqmrln1lhiqmrm98kg9rfsga9qf80cpcvxm79x5"; depends=[arules dplyr DT ggplot2 ggraph igraph plotly scatterplot3d seriation tibble tidyr vcd visNetwork]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.9-2"; sha256="0xj71hx6y64qycgq0xg6z6avqxm34n523arsqkfjy3l1a4pqq1b4"; depends=[deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + asbio = derive2 { name="asbio"; version="1.9-6"; sha256="1q21khpamhjz136ns76ixglvhlmjxmy5jrx3njsbc88k4hcp4995"; depends=[deSolve gWidgets2 gWidgets2tcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascentTraining = derive2 { name="ascentTraining"; version="1.0.0"; sha256="1dwmr33jc2fp9x51kzlqa4vib7xmzvz9a7qlfgvhxhld2bxlrrgi"; depends=[]; }; ascii = derive2 { name="ascii"; version="2.4"; sha256="0k675an7sl00bslx4yb6vvvgnp1kl244cfjljv632asqdm3rkmrv"; depends=[codetools digest survival]; }; asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.5.1"; sha256="1g21yycql1ik02gp37d0m5fxsn9d7sibxn5vm1ngmynx2a8a8jq7"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; @@ -6344,17 +6351,18 @@ in with self; { asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; - ashr = derive2 { name="ashr"; version="2.2-54"; sha256="177xs3apnc6yy6737qqv4z8snf0hkpbghab63hrplbyb9wfssfga"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; - asht = derive2 { name="asht"; version="1.0.0"; sha256="1vv88qrbdjav025ccw0nvxlhmxnyjb5frn4wb7sbxxzaaqflcmhc"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; - askgpt = derive2 { name="askgpt"; version="0.1.2"; sha256="0g4g8yw2akjbafmk26wfy92g0pifq752mvzp2cnvxdh4cn4qa16z"; depends=[callr cli dplyr glue httr2 jsonlite rappdirs rlang]; }; - askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; + ashr = derive2 { name="ashr"; version="2.2-63"; sha256="1japskxfdsg91jwgf5knlwy9iaq4ziqvyvlvjch1y3ygsdz9b8bz"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; + asht = derive2 { name="asht"; version="1.0.1"; sha256="08wrqhrlna2vg5icgqcaxciv51gq7rfmd458qy7dqmh7ydxcrxk6"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; + askgpt = derive2 { name="askgpt"; version="0.1.3"; sha256="1mi42jvnxrm9xhnrps540hmgi3nd3g9g7pjrkcgzmyj58ip98r66"; depends=[callr cli dplyr glue httr2 jsonlite rappdirs rlang]; }; + askpass = derive2 { name="askpass"; version="1.2.0"; sha256="1vrcb69gf5hc8rggc9m7wv19crz5mkl7f08cipy0ykckh6bkc8mr"; depends=[sys]; }; aslib = derive2 { name="aslib"; version="0.1.2"; sha256="1hy0ncanc3mb20yrby8s9hd8v2fg3x41vkj0jwl2b8znzl5n5b2n"; depends=[batchtools BBmisc checkmate corrplot data_table ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asmbPLS = derive2 { name="asmbPLS"; version="1.0.0"; sha256="08f4128abvy9pdkbdgiqnhm2v7f79lqbzp1132h52zq2n9wzxzmy"; depends=[ggplot2 ggpubr Rcpp RcppArmadillo]; }; - asnipe = derive2 { name="asnipe"; version="1.1.16"; sha256="0ky4v85gry8r265z8p7mi9kzq6j3s032jg4wddkzjjqgxzyzjl5y"; depends=[MASS Matrix]; }; + asnipe = derive2 { name="asnipe"; version="1.1.17"; sha256="01wv5pi44s2qzn33qcm4404ijqrwmqfrgchd88s7bwmdl47h3d77"; depends=[MASS Matrix]; }; + aspace = derive2 { name="aspace"; version="4.1.0"; sha256="1k6s7wfjxzp3chd33r4449bzpnlb1yizlqmwvmpfbydjw6zcv3lq"; depends=[Hmisc splancs]; }; aspect = derive2 { name="aspect"; version="1.0-6"; sha256="13pb1pslyka706v13b7hdrzzn5bxmj2l5irpd9f1pm1n8a1ivrrl"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; aspline = derive2 { name="aspline"; version="0.2.0"; sha256="1a68x6jvsaxviy2w361f19iqzsdsaf9kcqw5cknf4yz9fvkqhjny"; depends=[dplyr ggplot2 magrittr mgcv Rcpp rlang splines2 tidyr]; }; - asremlPlus = derive2 { name="asremlPlus"; version="4.4.12"; sha256="1fglfj0zzmygi9zi8dyd4glr1v2kdrq6h7jpijy9kmci080ld4gm"; depends=[dae devtools doParallel dplyr foreach ggplot2 qqplotr RColorBrewer reshape2 rlang sticky stringr]; }; + asremlPlus = derive2 { name="asremlPlus"; version="4.4.15"; sha256="0yvfazsf5jh21kiippsbxfq3wv9j84wnq2659y6zhsn1svn0bs6i"; depends=[dae devtools doParallel dplyr foreach ggplot2 qqplotr RColorBrewer reshape2 rlang sticky stringr]; }; r_assert = derive2 { name="assert"; version="1.0.1"; sha256="0n5l48yb0djl6rdj50p1dslpw3c5kbi15yz6z6rdgic575gjwzdc"; depends=[]; }; assertable = derive2 { name="assertable"; version="0.2.8"; sha256="1cciil1nzxd8gbj49w99jiv077lbpb59vx7bmb4p218aj2h5hqq4"; depends=[data_table]; }; assertions = derive2 { name="assertions"; version="0.1.0"; sha256="18926pk2g0hc4dyzm1ghp69sgj7mdx8vzi1vykyxbk0046sg53wp"; depends=[cli glue rlang]; }; @@ -6377,8 +6385,8 @@ in with self; { assertr = derive2 { name="assertr"; version="3.0.0"; sha256="1wi3mz968clvwqg6mbm32zhj4vyfskklk72b4028cjsfdry6bpfp"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; assignPOP = derive2 { name="assignPOP"; version="1.2.4"; sha256="1zzapgzf09l39bckwykzr8im2wxmndpmzykll2wi7njwlklpjry3"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; - assignR = derive2 { name="assignR"; version="2.3.0"; sha256="1857diz9hb2cq5c8dch49mk64fvna4s1vrz95np8dd4vfwwsabf6"; depends=[geosphere mvnfast rlang terra]; }; - assist = derive2 { name="assist"; version="3.1.8"; sha256="1ayr3mvv31dm3ff1jfwfshhrfhpyvqnshw3azp0pz96d1f9f31hj"; depends=[lattice nlme]; }; + assignR = derive2 { name="assignR"; version="2.4.0"; sha256="01lsmzqqy56i9b5yyiyd8njs8nl4qznn6h4rkyizcjalch6sy4rl"; depends=[geosphere mvnfast rlang terra]; }; + assist = derive2 { name="assist"; version="3.1.9"; sha256="0n2348hld38jg1z8axaqs000qczbwbpq5yq5sshfn9k08p5b1szk"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.20"; sha256="15qah885jjiwxrf1bhmbjpsamgylmy8cwjbd3w0di7n8j4zv6gwr"; depends=[]; }; ast2ast = derive2 { name="ast2ast"; version="0.3.1"; sha256="1418kvg4jvfn7c4vny87431a8lqkky9a51grkw8qc8sszcp7mlyf"; depends=[dfdr purrr R6 Rcpp RcppArmadillo rlang]; }; @@ -6386,10 +6394,11 @@ in with self; { aster = derive2 { name="aster"; version="1.1-2"; sha256="0vf1ffkn4a3bz2lgz1gn2hjgp8c2v9ch05d5r1gh2q77zijvry1m"; depends=[trust]; }; aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; }; astroFns = derive2 { name="astroFns"; version="4.2-1"; sha256="0c81q9xddd9m2lhbv7r2aq1w262vjamcv8qg4mgrndww8n6vf8zn"; depends=[]; }; - astrochron = derive2 { name="astrochron"; version="1.1"; sha256="0gvdilsacgbdcwz8598psxan3q5im5iw6xrn9zbdbg7sswrvc5ff"; depends=[doParallel fields foreach IDPmisc iterators multitaper viridisLite]; }; + astrochron = derive2 { name="astrochron"; version="1.2"; sha256="1wkc8314iyhkdg1y9gr1wzqj9h67n3kqq8wiiq9n2xmgly9b40sz"; depends=[doParallel fields foreach IDPmisc iterators multitaper palinsol viridisLite]; }; astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astsa = derive2 { name="astsa"; version="2.0"; sha256="0rv4fnz5bbd6f8b6fwa2ljdjq5yx0qi7hcbhrgvrbibl2pzfm7w7"; depends=[]; }; - asylum = derive2 { name="asylum"; version="1.1.0"; sha256="1jgh9b76z9d81n9bgny3x5pbgmplq1mi55ag4wb0zzgykrfvaa1s"; depends=[]; }; + asus = derive2 { name="asus"; version="1.5.0"; sha256="05rsbakby0w3xf5zaq5flp4if31x8fnm1l0n1r51ympw4wzzqjh5"; depends=[wavethresh]; }; + asylum = derive2 { name="asylum"; version="1.1.1"; sha256="1cjmrvlhk34swrl44xxjqnka1xi2sf0ciszx1szrg7wz4c9kb6mp"; depends=[]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; asymmetry = derive2 { name="asymmetry"; version="2.0.4"; sha256="1zppf4gb0rz9c4ixd6fym2qyjs8ddzq09is1rlf000mcnarfl22b"; depends=[gplots smacof]; }; asymmetry_measures = derive2 { name="asymmetry.measures"; version="0.2"; sha256="039afqmdir200aijln9q0g3rkahkxqahw6yz5mnw62jsslr9xskb"; depends=[gamlss_dist skewt sn]; }; @@ -6398,8 +6407,8 @@ in with self; { async = derive2 { name="async"; version="0.3.2"; sha256="0xf3c6gr04drv7xxzpshycd13h5lm7r529f5q4ajrsl0m3hp9xpv"; depends=[iterors later nseval promises stringr testthat]; }; atRisk = derive2 { name="atRisk"; version="0.1.0"; sha256="17rs5jjk4av4b6qv14yl5qcnrjxms0va6alhdjxyln4hwrrd97km"; depends=[dfoptim ggplot2 ggridges quantreg sn]; }; ata = derive2 { name="ata"; version="1.1.1"; sha256="08wcnfkbcq2al5ivdjkrjr8alaz0026992ra3ihyw6sd74mcracx"; depends=[lpSolve]; }; - atable = derive2 { name="atable"; version="0.1.12"; sha256="1xzr51p0034znhylj51vq9jslkwkn1gjabaal5w9qrvy6cv1h828"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; - atakrig = derive2 { name="atakrig"; version="0.9.8"; sha256="14li2lpb2bksrfdhvnhs4k22jw4r4x9rm6lq9kn9hzif7gsibwr9"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; }; + atable = derive2 { name="atable"; version="0.1.14"; sha256="1dyg7zc19518dp3yxgyhcfklkmard9iwjkbnsl6sx5wkyk3s0vin"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + atakrig = derive2 { name="atakrig"; version="0.9.8.1"; sha256="0dzqghs2358hqyklvfblil5ww9d5nmx406invlx5fgqy4k0zcyzf"; depends=[doSNOW FNN foreach gstat MASS Rcpp sf snow terra]; }; atime = derive2 { name="atime"; version="2023.3.31"; sha256="15kx7pxa4yb5ivlfxkwqlr1d6fw0yd506grmz27bj27wkjaw75j3"; depends=[bench data_table git2r lattice]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; @@ -6413,14 +6422,14 @@ in with self; { auRoc = derive2 { name="auRoc"; version="0.2-1"; sha256="152jdvzigcplii5amj0mnral3g2jyy3rfsc745mx36sspw1396yx"; depends=[coda MBESS ProbYX rjags]; }; auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; }; auctionr = derive2 { name="auctionr"; version="0.1.0"; sha256="0kfx81irqr9mfp4n86z7q5nclcci8vlpvq9zid7miyw3rci7dfvi"; depends=[numDeriv]; }; - audio = derive2 { name="audio"; version="0.1-10"; sha256="1pf4mwqar15v7y6sq8wkfqnr6rgpq9ywwsahzr76n6klijl33iw2"; depends=[]; }; + audio = derive2 { name="audio"; version="0.1-11"; sha256="0z719jxmfzmh6c885m1yixjzdsl1wy17s1sw2hp4ppz4bcrzclhh"; depends=[]; }; audiometry = derive2 { name="audiometry"; version="0.3.0"; sha256="0v6lhkm298xgdny0fhpldfwj8s4ljr21w6y6sv3vvyl87qjgwx8i"; depends=[ggplot2]; }; audit = derive2 { name="audit"; version="0.1-2"; sha256="0c8b94a5am196sbvmjxya7cg4aq6fcxr8c958fxx3jmy9r4hn6s2"; depends=[]; }; auditor = derive2 { name="auditor"; version="1.3.3"; sha256="1y6qpbc78yv2w1y9p0mczv69s661i9n2y0x09c5p3hdka7km662w"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; audrex = derive2 { name="audrex"; version="2.0.1"; sha256="1ifijkbqvdjp1si14p80mbqhq7sby8qgzr181agm3da1nkmic3vp"; depends=[fANCOVA ggplot2 imputeTS lubridate Metrics modeest moments narray purrr rBayesianOptimization readr scales stringr tictoc xgboost]; }; audubon = derive2 { name="audubon"; version="0.5.1"; sha256="17x4pk2anmj5gyf6wdg9n5zyqzbmp9hvj04ngv17jxv5b047pjc9"; depends=[dplyr magrittr Matrix memoise purrr readr rlang stringi V8]; }; augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; }; - augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.6"; sha256="0ng292zgq18zqqhwkq6600hrg3akb76b7i4lzh6hd7vcbifl3f6m"; depends=[cli dplyr emmeans flextable ggplot2 mathjaxr moments multcomp multcompView numform officer openxlsx Rdpack reshape2 stringi]; }; + augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.7"; sha256="1gnl6i81m5w7hxi147ycr963sm661xscw0xb6wm9vcr043ddvx3p"; depends=[cli dplyr emmeans flextable ggplot2 mathjaxr moments multcomp multcompView numform officer openxlsx Rdpack reshape2 stringi]; }; auk = derive2 { name="auk"; version="0.6.0"; sha256="1l37izfjsypq2pbbifajilhi00fpbjdkpp6ahy3nxfsc7v22ldwr"; depends=[assertthat countrycode dplyr httr magrittr readr rlang stringi stringr tidyr]; }; aum = derive2 { name="aum"; version="2023.6.14"; sha256="1y6wn8ycl4vvmzyjkyprxah7q5afa56bpj8xvgmvi6dahnfp52cq"; depends=[data_table Rcpp]; }; ausplotsR = derive2 { name="ausplotsR"; version="2.0.3"; sha256="15bf6bxz1193q7wf729v2wg6vy3w2ml8zfznw9kgpmjqmcyhyhvk"; depends=[betapart curl ggplot2 gtools httr jose jsonlite mapdata plyr R_utils r2r stringr vegan]; }; @@ -6433,13 +6442,13 @@ in with self; { autoFRK = derive2 { name="autoFRK"; version="1.4.3"; sha256="1k3h2gsck06dnvrifg9rhxi6b3fwfjrkvg0q2wzb9kdnnzgiwcln"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; autoGO = derive2 { name="autoGO"; version="0.9.1"; sha256="19gy5gk214vqnil2wky2fpia1dlhcc4vwnws4fl2f0xq9as2nrq9"; depends=[ape ComplexHeatmap DESeq2 dichromat dplyr enrichR ggplot2 ggrepel GSVA imguR openxlsx purrr RColorBrewer readr reshape2 stringr SummarizedExperiment textshape tidyr tidyselect]; }; autoMFA = derive2 { name="autoMFA"; version="1.0.0"; sha256="1sbcl38cq7y7hln1qffk5s71xgg9hs7dlwyvynqf96z2z2421pw4"; depends=[abind expm MASS Matrix pracma Rdpack Rfast usethis]; }; + autoMrP = derive2 { name="autoMrP"; version="1.0.3"; sha256="0fb2qsz4ibx2m21hsak87jmgrngal23y1yr4phs66vkn037pvkim"; depends=[doParallel doRNG dplyr e1071 EBMAforecast forcats foreach gbm ggplot2 glmmLasso knitr lme4 purrr rlang tibble tidyr]; }; autoRasch = derive2 { name="autoRasch"; version="0.2.2"; sha256="15vgmpvcw7hi1i5kaqj9q126qmfa54h8ay9w6wa7yxjbginp9v7c"; depends=[doParallel foreach lavaan Rcpp RcppArmadillo]; }; autoReg = derive2 { name="autoReg"; version="0.3.2"; sha256="1isj04xphzf3r35bgzr9x1f2ra17jjw08dyjxgy8dfdmqhz2l2kh"; depends=[boot broom crayon dplyr flextable ggplot2 maxstat mice moonBook nortest officer pammtools patchwork purrr rlang scales stringr survival tidycmprsk tidyr]; }; autoScorecard = derive2 { name="autoScorecard"; version="0.3.0"; sha256="03zq23x7gha02zvmb5vwmv1pz54ghcfr0sk75krh59cgprx5ysl5"; depends=[corrplot discretization ggplot2 infotheo ROCR rpart]; }; autoTS = derive2 { name="autoTS"; version="0.9.11"; sha256="1mwpazynp5hdc2ccnhvddkajfcd4qam23pvjl9accq1rnxzxkiyv"; depends=[dplyr forecast ggplot2 lubridate magrittr plotly prophet RcppRoll rlang shiny shinycssloaders tidyr]; }; autocart = derive2 { name="autocart"; version="1.4.5"; sha256="1zgcmrm4dkdnr130hwwka2nwdczgvc3jc9hxrb6nfs8ijb24gl36"; depends=[fields mgcv Rcpp RcppArmadillo RcppParallel]; }; autocogs = derive2 { name="autocogs"; version="0.1.4"; sha256="0v27l9a0ysj7x9wjka1jl1bq9rmxmzldclcp1w59a6807wjlszhx"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; - autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; autoharp = derive2 { name="autoharp"; version="0.0.10"; sha256="0jn7nya4lb1pvdy7yyimxga4gn042jqwl3w82m6c244kqydm5fi0"; depends=[dplyr igraph knitr lintr magrittr pryr rlang rmarkdown shiny stringr tibble tidyr]; }; autohrf = derive2 { name="autohrf"; version="1.1.2"; sha256="0gbnhgz311hsyjs4dgi03w4370vkdpshb78ay0gl75wj39mnpz7r"; depends=[cowplot doParallel dplyr foreach ggplot2 gtools lubridate magrittr RColorBrewer]; }; autoimage = derive2 { name="autoimage"; version="2.2.3"; sha256="1jhkd7mbig6wpyc69iynfrj5i62lrwcwqbgjkmq8b9p5raglm1g2"; depends=[colorspace fields ggplot2 mapproj maps MBA]; }; @@ -6450,14 +6459,14 @@ in with self; { autonewsmd = derive2 { name="autonewsmd"; version="0.0.6"; sha256="08y9cslk506bc2nmrzmzln7927yhdzghsfkkldgx94cm4ly6jagy"; depends=[data_table git2r magrittr R6 rmarkdown]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.4"; sha256="1z577jvadgiz028z7x0786d3qhlkrvv9i34xmllizvg94kxv3bl1"; depends=[ggfortify ggplot2 plotly]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.3"; sha256="0hwrsc08lq6zyx869qmiyd0fc83wqfyzx65a3s2j2xnzf4wwzgbq"; depends=[shiny]; }; - autostats = derive2 { name="autostats"; version="0.4.0"; sha256="0xyfv2akv308g3r0wq2dcg7l24p6bf3524x1ikj1lfmw07hca6k6"; depends=[broom data_table dials dplyr framecleaner ggeasy ggplot2 ggthemes gtools janitor jtools magrittr nnet parsnip party patchwork presenter purrr recipes recosystem rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost yardstick]; }; - autostsm = derive2 { name="autostsm"; version="3.1.0"; sha256="1qds3mw94jmkfqp7qxff8mixbk1dwslmwk5hz42wcid3vwpgq6g3"; depends=[data_table doSNOW foreach forecast ggplot2 ggrepel gridExtra kalmanfilter lmtest lubridate maxLik progress sandwich strucchange]; }; + autostsm = derive2 { name="autostsm"; version="3.1.2"; sha256="05nsvxcybckpv4y289ddh6rkzfmbjhf49db4nkwj9il2429c9v6c"; depends=[data_table doSNOW foreach forecast ggplot2 ggrepel gridExtra kalmanfilter lmtest lubridate maxLik progress sandwich strucchange]; }; autothresholdr = derive2 { name="autothresholdr"; version="1.4.1"; sha256="1n2rag3aqd716nxp3vnc91rfimi24bg1imsa1aarynfh7mxi5a7a"; depends=[checkmate ijtiff magrittr purrr Rcpp rlang strex stringr]; }; - av = derive2 { name="av"; version="0.8.4"; sha256="050hs0ifaaghbr0ys1jisjjbp5dfas1ghi928yk2vjv1c2lgs3lz"; depends=[]; }; + av = derive2 { name="av"; version="0.8.6"; sha256="071ahvb2z4in16b98aj2gl0qrsfnqprn67zf5ilj7bj4c1b6pmrx"; depends=[]; }; available = derive2 { name="available"; version="1.1.0"; sha256="1j6z0zwd7xjk6j6wk74fjq3nhx9gk7ys09i543gakcskmdm59dw4"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext yesno]; }; - avar = derive2 { name="avar"; version="0.1.2"; sha256="14wiqg4f6paac6n5cwmdpy6z03w3fll6js4yhr80zhj1k2qdh1fa"; depends=[Rcpp RcppArmadillo simts]; }; + avar = derive2 { name="avar"; version="0.1.3"; sha256="0zpdgkshadzi01llqcsddzzhpywycsy5411rcvsgmm8wsi0n4khs"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; - avidaR = derive2 { name="avidaR"; version="1.1.3"; sha256="1ahva473dhhbwlxlm9qz2x0ssmqg1hw1imnab39dijvmspaqvk5v"; depends=[base64enc circlize dplyr httr R6 RColorBrewer readr tibble tidyr xml2]; }; + avesperu = derive2 { name="avesperu"; version="0.0.1"; sha256="0m0gl81k96lh7l1k2nrznlsaiz9dal7kl7w12bcjn2376db0rw5v"; depends=[]; }; + avidaR = derive2 { name="avidaR"; version="1.2.0"; sha256="12z2cs5cayj72c6nx5y086m823grcmhq5m24aaqx4qn36lb6cdbb"; depends=[base64enc circlize curl dplyr httr R6 RColorBrewer readr tibble tidyr xml2]; }; avocado = derive2 { name="avocado"; version="0.1.0"; sha256="0qy9ripwydm3f70rpxwk0asc7r25hg8jcbrr4rz8bxs93q1lsz8x"; depends=[]; }; aweSOM = derive2 { name="aweSOM"; version="1.3"; sha256="0nfbn7rgazvc5nljf8i7bwpxy5j0w404bnrvi02k97jvmrra1dyb"; depends=[bslib cluster data_table DT e1071 fields foreign ggplot2 haven htmltools htmlwidgets kernlab kohonen rclipboard RColorBrewer readODS readxl rmarkdown shiny viridis]; }; aweek = derive2 { name="aweek"; version="1.0.3"; sha256="14n1xmargr89mf4n0bdzdwn7qh314a1xg1bid5px762vk0qf4fws"; depends=[]; }; @@ -6476,20 +6485,18 @@ in with self; { aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; }; - aziztest = derive2 { name="aziztest"; version="0.2.1"; sha256="0rpnyrb7zi42l1fc8ni0r5d0y6a4dr56917z8i54mv1jrk4hijjd"; depends=[]; }; - azlogr = derive2 { name="azlogr"; version="0.0.4"; sha256="1bpvqwhvw2a2g0np1z485jds21a69h1hqc9xa0360rbinbygnqyk"; depends=[caTools digest httr jsonlite logger]; }; + azlogr = derive2 { name="azlogr"; version="0.0.5"; sha256="0lkzxx8qhaqj7g55xfqvm3ydhlfwqbzy9fsjfq6b8v1m2h1zgdlw"; depends=[caTools digest httr jsonlite logger]; }; azuremlsdk = derive2 { name="azuremlsdk"; version="1.10.0"; sha256="0s64kjrmcdnjdwh5mdm5vxgvrl9ghvfv6bair7qfzz32jlab99m0"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; - bRacatus = derive2 { name="bRacatus"; version="1.0.11"; sha256="0mj9bqgvmss9jdaphc4rgmxp4909lnwgi3c86pr6yfsd9zcjgd74"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgdal rgeos rworldmap sp]; }; bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; }; bSims = derive2 { name="bSims"; version="0.3-0"; sha256="055hqa5w4gaqz9mms9yj85wg0pgl6xa568nbjxm4qc75rsy91qg5"; depends=[deldir intrval MASS mefa4 pbapply]; }; - bWGR = derive2 { name="bWGR"; version="2.2"; sha256="1932mnpcg3b3zhm7f95gnfjv5j7gr4r3j0rk682csq0jwby43dlg"; depends=[Matrix Rcpp RcppEigen]; }; + bWGR = derive2 { name="bWGR"; version="2.2.3"; sha256="0cwl7vaal3mmgcwly353lpyl82avjggxrlf18sv3imfva5w63l3s"; depends=[Matrix Rcpp RcppEigen]; }; baRcodeR = derive2 { name="baRcodeR"; version="0.1.7"; sha256="199cdbwphpz6ds19841s32bm2rjd7b6v484bvaskw94z0d8bcn6w"; depends=[DT miniUI qrcode rstudioapi shiny]; }; baRulho = derive2 { name="baRulho"; version="1.0.6"; sha256="17g3xs0lxdpbbi52x27r00vfdgxdhjblyy939scm3c5z01fhxxnb"; depends=[fftw pbapply seewave tuneR warbleR]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babelgene = derive2 { name="babelgene"; version="22.9"; sha256="1ql5r1chl5ajzy9ppcnk755ia3m2a8n08m837dnm2ll3nzf02rnf"; depends=[dplyr rlang]; }; babelmixr2 = derive2 { name="babelmixr2"; version="0.1.1"; sha256="1iwi4z4xsa0sv334yjf5cvh88408icgpsw19rj1mp31wa2pdj36h"; depends=[checkmate cli digest lotri nlmixr2 nlmixr2est nonmem2rx qs Rcpp RcppArmadillo RcppEigen rex rxode2 rxode2parse]; }; babelwhale = derive2 { name="babelwhale"; version="1.2.0"; sha256="0m5q83ykz5w1fsjsk2vyrnv21cg4n075kbvfvw4k22c61p78shdl"; depends=[crayon digest dplyr dynutils fs glue processx purrr]; }; - babette = derive2 { name="babette"; version="2.3.2"; sha256="0y45pnip8zxjjvvdixyi3s6qanv7czx7wmbvpy8vj20nfffjzsdv"; depends=[beastier beautier mauricer phangorn remotes stringr tracerer xml2]; }; + babette = derive2 { name="babette"; version="2.3.3"; sha256="0c9v6dm3n9bnr5x4nln9a51dff557vrhxdfji9xikwnz0vv8656v"; depends=[beastier beautier mauricer phangorn remotes stringr tracerer xml2]; }; babsim_hospital = derive2 { name="babsim.hospital"; version="11.8.8"; sha256="03kd9kvqq0jy1f7qjbbmm5zn8w0nqwwdpan64ymyzmsxb59407cj"; depends=[checkmate curl data_table dplyr ggplot2 golem igraph lubridate markovchain padr plyr rvest scales simmer slider SPOT testthat xml2]; }; babynames = derive2 { name="babynames"; version="1.0.1"; sha256="1gcpd6lncqwjz05z98ra6hcc8q966l2594ylkg50avndild89n3h"; depends=[tibble]; }; babynamesIL = derive2 { name="babynamesIL"; version="0.0.1"; sha256="0drrxpyyvqs7n3j97idz0l13cw8mxpf7p9nv3bggwxdnffrdvn04"; depends=[tibble]; }; @@ -6503,18 +6510,17 @@ in with self; { bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgen = derive2 { name="badgen"; version="1.0.0"; sha256="0gbafiah9bsxjq2av25003d752w5s9bh7syphl58rsr34l57qkja"; depends=[jsonlite V8]; }; badger = derive2 { name="badger"; version="0.2.3"; sha256="0j7x6r5bv4ccyxwxc4zmq86q7js694smip9vslnwfkfg9mjxiiwa"; depends=[desc dlstats rvcheck usethis]; }; - baffle = derive2 { name="baffle"; version="0.2.1"; sha256="09yfxxq252sbfx0yh6m0zkjvwdwgsj6ycr4n8llkqpf8qjspk22a"; depends=[]; }; + baffle = derive2 { name="baffle"; version="0.2.2"; sha256="17307jn92sr4gindd9fvaqvk990v40mr77zp2xs0079h85vh8954"; depends=[]; }; bagged_outliertrees = derive2 { name="bagged.outliertrees"; version="1.0.0"; sha256="0fcd54j6vci2yvlb609dck4pwbn54irkdk472cjc965rcw6dz9z7"; depends=[data_table doSNOW dplyr foreach outliertree rlist]; }; baggr = derive2 { name="baggr"; version="0.7.6"; sha256="1mc6awkfjbkv8wqx0y6h1wn7l8wj6gxrkpzgwyslyy8rfi9n1hxy"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders testthat]; }; baguette = derive2 { name="baguette"; version="1.0.1"; sha256="0y298la45hgw7f58ydq198ycga8bzxh0czv9l3xdrprd1bhmdn1x"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; bahc = derive2 { name="bahc"; version="0.3.0"; sha256="0yz0v33fhm38ivhr7bvajk9v7wdmhg9qg7ac8r2qr00rns82m6y3"; depends=[fastcluster matrixStats]; }; - bain = derive2 { name="bain"; version="0.2.8"; sha256="101rlxf1m6nrmzwxxv2w0m2a9s26l39a5nfjnad8gza5rvj7q076"; depends=[lavaan]; }; - baizer = derive2 { name="baizer"; version="0.7.0"; sha256="0rwhhkbgmcwj6lnsw5jd0nqydw0a1kbh31hyw6gmzadqcr0m55vn"; depends=[curl diffobj dplyr magrittr openxlsx purrr rematch2 rlang seriation stringr tibble tidyr vctrs]; }; + bain = derive2 { name="bain"; version="0.2.10"; sha256="1knkz4ndgdvyn47r6r4gj0sqs9s70h4a5d3hjd4l057216drwmah"; depends=[lavaan]; }; + baizer = derive2 { name="baizer"; version="0.8.0"; sha256="06f7g71pzc4y2vnc3fj33s1xl6plxrkd2y73xi24pk81lm5wgf9a"; depends=[curl diffobj dplyr magrittr openxlsx purrr readr readxl rematch2 rlang rmarkdown seriation stringr tibble tidyr vctrs]; }; bakR = derive2 { name="bakR"; version="1.0.0"; sha256="19c791aa7i13iha33aa0wg1q180q4isb6bnp2mhb0y6206pmvd0g"; depends=[BH data_table dplyr ggplot2 Hmisc magrittr purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; bakeoff = derive2 { name="bakeoff"; version="0.2.0"; sha256="0i40vnwgy4db8flfcx23zh5a7mmp4dhckhzayj34smqfmfm5xzkl"; depends=[]; }; - baldur = derive2 { name="baldur"; version="0.0.1"; sha256="00b3z984c20i589arcylx3pgln0sqz1fg8mf69mnlxqrpr9yh88b"; depends=[BH dplyr ggplot2 lifecycle magrittr multidplyr purrr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr viridisLite]; }; + baldur = derive2 { name="baldur"; version="0.0.3"; sha256="13nl5apdmb1pm32d58qq04vc2xngc35n6cv4sivf2s34yk4k0n4c"; depends=[BH dplyr ggplot2 lifecycle magrittr multidplyr purrr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr viridisLite]; }; bama = derive2 { name="bama"; version="1.3.0"; sha256="1ydm9p6msmgi74rhrji2j14qy7cg7fqgg4ffm9rz293k27n5ghnn"; depends=[BH Rcpp RcppArmadillo RcppDist]; }; - bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; }; bambooHR = derive2 { name="bambooHR"; version="0.1.0"; sha256="1m9kzr698lgcilmr5w5zs6q9rgpcdvqiavrhh6c4ar6ii07n274s"; depends=[cli curl dplyr fs glue httr janitor jsonlite lubridate magrittr purrr rlang stringr testthat tibble tidyr withr]; }; bamdit = derive2 { name="bamdit"; version="3.4.0"; sha256="0x7dl2f8qg8df07g4k692501rqn3q5zf12npx9zbbbvv7zb23rlf"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; bamlss = derive2 { name="bamlss"; version="1.2-1"; sha256="1iip433vbiynw3fiys0134r9z184krc5i5y2mhb0zvz17y3zln9p"; depends=[coda colorspace distributions3 Formula Matrix MBA mgcv mvtnorm sp survival]; }; @@ -6523,7 +6529,7 @@ in with self; { bandit = derive2 { name="bandit"; version="0.5.1"; sha256="0zj98x4kwv8fr6j78vg0hzlsjd4w5l4nbazkpxqkn5yyd6g0v9h4"; depends=[boot gam]; }; banditpam = derive2 { name="banditpam"; version="1.0-1"; sha256="05ym5x178rgfvpvqgiv46ly6xnk44d0j74ykdxkzshil7aig1xfk"; depends=[R6 Rcpp RcppArmadillo]; }; bandsfdp = derive2 { name="bandsfdp"; version="1.1.0"; sha256="07w381i8cls1hf1mdl4qy3vxp7xx0czng3fl3bzrbk80mysjf47n"; depends=[]; }; - bang = derive2 { name="bang"; version="1.0.1"; sha256="0m7p9gzspkyp40ir842ff4b1827w9rh7x49kpp3y4dpi83krqy5a"; depends=[bayesplot rust]; }; + bang = derive2 { name="bang"; version="1.0.2"; sha256="1dyvv3hk6p9an2jpg76i2b7mxmdmf01mwdmkhhrk3m4yrp66dqph"; depends=[bayesplot rust]; }; bangladesh = derive2 { name="bangladesh"; version="1.0.0"; sha256="1vjrashph4n8njm6yk8slywmfwxqrvdmb2ybgp23vdxjhk3rlrzl"; depends=[sf tmap]; }; bannerCommenter = derive2 { name="bannerCommenter"; version="1.0.0"; sha256="1i0b3v4n0xylcbrg9i3a28z037m27vjfg61xz2hl99wavn0bsl1j"; depends=[]; }; banter = derive2 { name="banter"; version="0.9.6"; sha256="07gzl06l7iw4czdx3il3p8kl83yw32fxa8cjx1j018z3468m1qyj"; depends=[dplyr ggplot2 gridExtra magrittr randomForest rfPermute rlang swfscMisc tibble tidyr]; }; @@ -6543,7 +6549,6 @@ in with self; { base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; }; baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; - baseballr = derive2 { name="baseballr"; version="1.5.0"; sha256="0n6ajc846cddi7617pgkm2ywkl7147m2gnhwx8wm4jyj7g3snsw3"; depends=[cli data_table dplyr ggplot2 glue httr janitor jsonlite lubridate magrittr purrr Rcpp RcppParallel rlang rvest stringr tibble tidyr]; }; basecamb = derive2 { name="basecamb"; version="1.1.2"; sha256="01zigv4wp19vmp645dzvbr26nrvhv4jxpqssvfc480v0dj3mavva"; depends=[assertive_types assertthat dplyr Hmisc mice purrr survival]; }; basedosdados = derive2 { name="basedosdados"; version="0.2.2"; sha256="18gfk7hivp68mgbgx60qbpcy28ysj4llzwdji5a57rrczwffr6p0"; depends=[bigrquery cli DBI dbplyr dotenv dplyr fs glue httr magrittr purrr readr rlang scales stringr tibble typed writexl]; }; basefun = derive2 { name="basefun"; version="1.1-4"; sha256="1m258ycxc9m2xdpvqzjk0hz3fg3bwbj3z2yx6raf315ws4s2h47f"; depends=[Matrix orthopolynom polynom variables]; }; @@ -6559,7 +6564,6 @@ in with self; { basifoR = derive2 { name="basifoR"; version="0.4"; sha256="1clnmb57g7aclgw8ibj92pfixaism0af85w4kn0208nbm75c1kvf"; depends=[curl foreign Hmisc httr measurements RODBC]; }; basket = derive2 { name="basket"; version="0.10.11"; sha256="1kmz53v8k1wyjg33dsf05p57ym2zq3d0f373wp85bnrwx00nfr10"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; }; baskexact = derive2 { name="baskexact"; version="0.1.0"; sha256="0raa7nvd18szf63a5nj5r2hcaq3l54k79vs5wng8jhc41f5bndip"; depends=[arrangements Rcpp RcppArmadillo]; }; - bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batata = derive2 { name="batata"; version="0.2.1"; sha256="0z3pj37jydidw3lq1yvp1yv1vqbm28nhj0v4kb3n30dl00kd0hmy"; depends=[fs glue jsonlite lubridate purrr remotes]; }; batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-4"; sha256="0b2npqxrv08zxj59sahj5s87inhl6dyl10bj01v0l1yr14q5g546"; depends=[]; }; @@ -6575,7 +6579,7 @@ in with self; { bayclumpr = derive2 { name="bayclumpr"; version="0.1.0"; sha256="17yppw6m27d1smdbwrl9mja84y3p56s4sjw4c6hklxadcf4na8im"; depends=[deming IsoplotR loo rstan]; }; baycn = derive2 { name="baycn"; version="1.2.0"; sha256="1ykz1brs3mz94n86d5qaq25vf24j5adyzpddxqmn7qklbxxr6fh5"; depends=[egg ggplot2 gtools igraph MASS]; }; bayefdr = derive2 { name="bayefdr"; version="0.2.1"; sha256="178s559p1mgzp2b23plq3dcl5p0mg1d5cy6477knbaq711awzz3j"; depends=[assertthat cowplot ggExtra ggplot2 reshape2]; }; - bayes4psy = derive2 { name="bayes4psy"; version="1.2.11"; sha256="1qbsqbskl5qkw97mrbygrdz0r9nkk0zfg0f2gjw2lja6zyy0fz11"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen RcppParallel reshape rstan rstantools StanHeaders]; }; + bayes4psy = derive2 { name="bayes4psy"; version="1.2.12"; sha256="1i6yc871bbygj6sw2v2l0diiz03n3n4mw46n905fsjkpdrx8rfhj"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen RcppParallel reshape rstan rstantools StanHeaders]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.3"; sha256="1mwwbkd8mqm22mkbgrp5mq7i52qqjr9if09fnhb3ybdpqq3sdg73"; depends=[ggplot2 Rcpp rlang]; }; bayesCT = derive2 { name="bayesCT"; version="0.99.3"; sha256="0ragig1x34syhsnbnd58l2s7g23j7fb0cl9wkasvxq8cicw5hqgn"; depends=[bayesDP dplyr magrittr purrr survival]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.6"; sha256="0li063187icw96shrbawfa00vkb42m5y38a4j2aahryajjlsva57"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; @@ -6583,15 +6587,17 @@ in with self; { bayesGAM = derive2 { name="bayesGAM"; version="0.0.2"; sha256="13zs68d26c66hkm8mfhcygk8rw6sdg4rf4a4az254lf2xvypbh5d"; depends=[bayesplot BH boot cluster corrplot geometry ggplot2 gridExtra loo MASS mlbench Rcpp RcppEigen RcppParallel rstan rstantools SemiPar StanHeaders]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.10"; sha256="1jb7jfyxp210pc8myv9lnwb55hy19d39m10kkhs5lyjwc2lv0401"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-1"; sha256="0hz6ynvrhsxp097zswdlascza5n27cq4hfaqdc3r8b7crmh7lrim"; depends=[Rcpp RcppArmadillo]; }; - bayesLife = derive2 { name="bayesLife"; version="5.1-1"; sha256="12i2a07v0kc5mbvj52vc4l9fi0xi68jdj0z91wdbiav4fqrjm4m5"; depends=[bayesTFR car coda data_table hett wpp2019]; }; + bayesLife = derive2 { name="bayesLife"; version="5.2-0"; sha256="116wa3sqxkp8ywc0s83clg1pp81bf1rhddpvjbcw9pyim57h4kxm"; depends=[bayesTFR car coda data_table hett wpp2019]; }; bayesMRM = derive2 { name="bayesMRM"; version="2.4.0"; sha256="1qdc4y0l6v4axp47pnxcnq96hl7kbi9r4jiknd5i934smcr2bsza"; depends=[coda ggplot2 gridExtra rgl rjags shiny shinythemes]; }; - bayesPO = derive2 { name="bayesPO"; version="0.3.1"; sha256="1n9m89lhdj0ng3570x23kcjyjv85bky0hqrs1sl7qxjdzxacsisl"; depends=[coda Rcpp RcppEigen RcppProgress]; }; + bayesMig = derive2 { name="bayesMig"; version="0.4-6"; sha256="1b4pxg22fx898s529gigdfcdsmzlrpqhpnq96lghvsvmv5802z4n"; depends=[bayesTFR coda truncnorm wpp2019]; }; + bayesPO = derive2 { name="bayesPO"; version="0.4.1"; sha256="0i2wmxagzfic6vpac58dzc7acpjslnk551am549527nzrs4lnmkd"; depends=[coda Rcpp RcppEigen RcppProgress]; }; bayesPop = derive2 { name="bayesPop"; version="10.0-1"; sha256="0jzxsqnrzvhz85wravjxbjwf6panwmylqgz99b0zknvgbf0vx6zh"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; - bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; + bayesQR = derive2 { name="bayesQR"; version="2.4"; sha256="1ci81pishhf9iv08gsnyfmx9kq9d4bswfvnwx3whykrkrlgifzmi"; depends=[]; }; bayesROE = derive2 { name="bayesROE"; version="0.1"; sha256="05darwx45bv6p9qscnw169jza4yd3m2d5bgpr35yil7p68dl0w2b"; depends=[colourpicker config ggplot2 golem scales shiny shinyBS]; }; - bayesRecon = derive2 { name="bayesRecon"; version="0.1.1"; sha256="1mvhhsndjqggjdic3ah29mgz2xmvhzf916srlq8j2g2drd3qggn2"; depends=[lpSolve]; }; - bayesTFR = derive2 { name="bayesTFR"; version="7.3-2"; sha256="1pxjbis26ck0fd2f19f0i0mn54wzis89niqhm3b6vz9zvv3angzh"; depends=[coda data_table lifecycle MASS mvtnorm wpp2019]; }; - bayesZIB = derive2 { name="bayesZIB"; version="0.0.4"; sha256="02n76vw38xd1p6j2r505mkbfvnwij7i5lx8x6w9hrsnh9q0dy6dw"; depends=[BH ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; + bayesRecon = derive2 { name="bayesRecon"; version="0.1.2"; sha256="04grkz5b6vwp5brgd6vazfinl1ikrvj8kimns0b7rw0blb3z9fm3"; depends=[lpSolve]; }; + bayesTFR = derive2 { name="bayesTFR"; version="7.4-2"; sha256="09fbyc4656dil6mqfzx7nlxxp0b95fmc73ibci60jbbzggafb51s"; depends=[coda data_table lifecycle MASS mvtnorm wpp2019]; }; + bayesWatch = derive2 { name="bayesWatch"; version="0.1.0"; sha256="1hivlzsrm5kxv11xfz5hni4dvs3104bz65syypksa7zss9qb1sqk"; depends=[BDgraph CholWishart ess ggplot2 gridExtra Hotelling MASS Matrix Rcpp RcppArmadillo RcppEigen]; }; + bayesZIB = derive2 { name="bayesZIB"; version="0.0.5"; sha256="1265vnwmxxgahdccw81sirjb782z5pl3finf5gvmky3zgvj2p8kc"; depends=[BH ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; }; bayesanova = derive2 { name="bayesanova"; version="1.5"; sha256="1h2z5r1ikrdi1j0cpzy3qdw28m1i6ddz6006amdnz2r3b0wivffm"; depends=[MCMCpack]; }; bayesassurance = derive2 { name="bayesassurance"; version="0.1.0"; sha256="0y62q0340j3781f0l9azxdn6k4isj1zds6y50fg38a73pi7mbfbm"; depends=[dplyr ggplot2 MASS mathjaxr pbapply plot3D plotly rlang]; }; @@ -6600,7 +6606,7 @@ in with self; { bayesbr = derive2 { name="bayesbr"; version="0.0.1.0"; sha256="0zx123xqw2qglwxsnq0jy56kwk6zczslagapij9aj9n5bsifbcmx"; depends=[BH coda dplyr fdrtool Formula ggplot2 loo magrittr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tidyr]; }; bayescopulareg = derive2 { name="bayescopulareg"; version="0.1.3"; sha256="0jzj1iwd8g1kpypg6dl3anhay7kjvznfkyzri3sdf538s6vr88m5"; depends=[mvtnorm Rcpp RcppArmadillo RcppDist]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-8"; sha256="1aqj8n0jzayyym1akm2w70fw96i9j1nw4yn47jz75ckwrndjg33k"; depends=[coda rjags runjags]; }; - bayesdfa = derive2 { name="bayesdfa"; version="1.2.0"; sha256="0bj9x21bmpbag2y5lh2l8j9cbsir0133sg7a5lsp3q9vpzvx28hk"; depends=[BH dplyr ggplot2 loo mgcv Rcpp RcppEigen RcppParallel reshape2 rlang rstan rstantools StanHeaders viridisLite]; }; + bayesdfa = derive2 { name="bayesdfa"; version="1.3.1"; sha256="1qdgq74ia0bs5jhv0fq4p3ihkjs74cp1hm6l4v4j59xy0jy1d0n8"; depends=[BH dplyr ggplot2 loo mgcv Rcpp RcppEigen RcppParallel reshape2 rlang rstan rstantools StanHeaders viridisLite]; }; bayesdistreg = derive2 { name="bayesdistreg"; version="0.1.0"; sha256="04slvxzbqdi2ak3dlw4lfx55rhw28js8yjmvjpy8vvgq39vcx3dq"; depends=[MASS sandwich]; }; bayesforecast = derive2 { name="bayesforecast"; version="1.0.1"; sha256="0wnz6qblm3ib7lpj860s4lhrs4gvmyrmk779r38rybfvxw4xssii"; depends=[astsa bayesplot BH bridgesampling forecast ggplot2 gridExtra loo lubridate MASS prophet Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders zoo]; }; bayesian = derive2 { name="bayesian"; version="0.0.9"; sha256="0s9mrzmmarjzy6943lkfnf0cjdgxkvk375kmdnxx43wbllx6k0xg"; depends=[brms dplyr parsnip purrr rlang tibble]; }; @@ -6608,14 +6614,14 @@ in with self; { bayeslincom = derive2 { name="bayeslincom"; version="1.3.0"; sha256="0gk2ybp0m717kv986j91n5amfc282gdpcrjkq46gwzn0zhyxg8b8"; depends=[ggplot2]; }; bayeslm = derive2 { name="bayeslm"; version="1.0.1"; sha256="0mnzxzdz456qxfszl8vhnvb1875hxn8b57wi6dhr9g668da2zdin"; depends=[coda Rcpp RcppArmadillo RcppParallel]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; - bayesm = derive2 { name="bayesm"; version="3.1-5"; sha256="18j7h32nq4hx1qnxfgfgz3q39q35lmvsq3im90xjkphyli60f8zj"; depends=[Rcpp RcppArmadillo]; }; + bayesm = derive2 { name="bayesm"; version="3.1-6"; sha256="1d9wp7yr5hadyv48f51xqa5yzfnhh01n813sivwla209vjf2pmqp"; depends=[Rcpp RcppArmadillo]; }; bayesmeta = derive2 { name="bayesmeta"; version="3.3"; sha256="004m85gsxs0hzwyn3p24r917pp9451wmfk8ggnnc4kv5bls30dm6"; depends=[forestplot metafor mvtnorm numDeriv]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-6"; sha256="0gzzzgjbz4aw2zrd5grvd1r0zlycxkgyq4hj1mcbwkfs2dd00msk"; depends=[coda rjags]; }; bayesmove = derive2 { name="bayesmove"; version="0.2.1"; sha256="1l6i8qh7l53x0133gjc5jvri4vnnfviq9y3mcr1kfa5j84gfnmsf"; depends=[dplyr dygraphs furrr future ggplot2 leaflet lubridate magrittr MCMCpack progress progressr purrr Rcpp RcppArmadillo rlang sf shiny tictoc tidyr]; }; - bayesnec = derive2 { name="bayesnec"; version="2.1.0.3"; sha256="1fvsr8qs9f3nnpb6jm33cqsc6i851r1fclv0qzlvxgx6z428fha5"; depends=[brms chk dplyr evaluate extraDistr formula_tools ggplot2 loo purrr rlang tidyr tidyselect]; }; + bayesnec = derive2 { name="bayesnec"; version="2.1.1.0"; sha256="02ahcaj72r0md6a2pj8ffz42xpv37hsvfixay57rc5sbdbics9gc"; depends=[brms chk dplyr evaluate formula_tools ggplot2 loo purrr rlang tibble tidyr tidyselect]; }; bayesplay = derive2 { name="bayesplay"; version="0.9.3"; sha256="1gc5gfyd03rir3yrjsqj6448wvbw49n6c789hzfqwignk3vjc555"; depends=[gginnards]; }; bayesplot = derive2 { name="bayesplot"; version="1.10.0"; sha256="1zqka7lg7a6ccli1yzhk1n13vbrlp8m0kjxmykjqmkz438mvjk5v"; depends=[dplyr ggplot2 ggridges glue posterior reshape2 rlang tibble tidyselect]; }; - bayespm = derive2 { name="bayespm"; version="0.1.0"; sha256="1b258zar7cbm16dcfdii095bcm2j6imd5wir1sa9mc797lg05jz2"; depends=[extraDistr ggplot2 gridExtra invgamma rmutil]; }; + bayespm = derive2 { name="bayespm"; version="0.2.0"; sha256="0w965fn7qvxq93bb1iiwzzkz6vc5k7gz87xfnwnywsqcm0bj2khb"; depends=[extraDistr ggplot2 gridExtra invgamma rmutil]; }; bayesreg = derive2 { name="bayesreg"; version="1.2"; sha256="0yrx7y39xxmm0z4myj6ma24dkkhgcily5baxr6yf9balgvhd5wf4"; depends=[pgdraw]; }; bayesrules = derive2 { name="bayesrules"; version="0.0.2"; sha256="0a1a1aq91ary985xd0qqc1sgjlyfcrjh7ngzcy4f7j09a7ch3j4b"; depends=[dplyr e1071 ggplot2 groupdata2 janitor magrittr purrr rstanarm]; }; bayess = derive2 { name="bayess"; version="1.5"; sha256="1dhkyz3dz04rghl5fpjdz1n5d6v053km25hkq0ssdcvrbsms62c8"; depends=[combinat gplots mnormt]; }; @@ -6638,14 +6644,14 @@ in with self; { bbsBayes = derive2 { name="bbsBayes"; version="2.5.3"; sha256="0vh7idcj89l5nlgg0kf41pvs1d1lpn5r1p254afcycn0sr06ky6f"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI mgcv progress rappdirs sbtools sf stringr]; }; bbw = derive2 { name="bbw"; version="0.2.0"; sha256="0gycjqn36msa6cl4zdrjv2bpv14xm8m6nsc3rfjm8mw9zjjzrw6g"; depends=[car withr]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; - bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-5"; sha256="1jj7iag9azmxccc8a45vaxi6lw4jbfzj68wm0zdsggplgvzljn1f"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; + bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-6"; sha256="0g0z4z3dw4mjp4dpa0d6bz46700jibixhlh2jj62z2l7qz5140cy"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcaboot = derive2 { name="bcaboot"; version="0.2-3"; sha256="0b1m4lwi9hwd4xswabzyy2svc91ppiym8bi9f1wj79w5sg2hxpn7"; depends=[]; }; bccp = derive2 { name="bccp"; version="0.5.0"; sha256="0g9yzqzf977rx97c77krdhl7c499r58xcbzx0nihk73143ynf17w"; depends=[pracma]; }; bcdata = derive2 { name="bcdata"; version="0.4.1"; sha256="05izx4bpk60icwnsy4698cm4dyxmmffss59dca8zrrh4i4pql72f"; depends=[cli crul DBI dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; }; bcfrailph = derive2 { name="bcfrailph"; version="0.1.1"; sha256="0qq885wfd7sr8cjxygw33l321q7jk4b6996p0j6inzlwycs8d6bc"; depends=[survival]; }; bcfrailphdv = derive2 { name="bcfrailphdv"; version="0.1.1"; sha256="1amfpyb9y7ngfq1npnjwzgbs6g3dmpp979q7ajf0khjgj55fkirw"; depends=[bcfrailph survival]; }; bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; - bcmaps = derive2 { name="bcmaps"; version="1.2.0"; sha256="1n23imq7ksini97fy47070bds87yb0gsplzca0qyknr97igfflx7"; depends=[bcdata httr jsonlite lifecycle progress rappdirs rlang sf xml2]; }; + bcmaps = derive2 { name="bcmaps"; version="2.1.0"; sha256="017d9bip8vv8n385h4pxd2bnl8yg8dymzkfav94gzdamrlnmcfn6"; depends=[bcdata httr jsonlite lifecycle progress rappdirs sf xml2]; }; bcmixed = derive2 { name="bcmixed"; version="0.1.4"; sha256="0am6amk1axfxkxgp9nmfys4fp4snplfncwkzh02im7a6zr3v1m63"; depends=[MASS nlme]; }; bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.3.2"; sha256="09n4grdz3vvm3744bggxv9qvnjbifh1hj31sc6s7a3189d1zhl4v"; depends=[plyr Rcpp]; }; @@ -6654,7 +6660,7 @@ in with self; { bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; bcv = derive2 { name="bcv"; version="1.0.2"; sha256="1fs7pj8lsn96cr1r5bagp9mq869q3pj9k71r7j1xi0i5l06pz90y"; depends=[]; }; bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; }; - bda = derive2 { name="bda"; version="16.1.3"; sha256="0qa4xdsri44flldvfz6gjl7d0sgbzcwghbihl0gnqm7jgvfzha33"; depends=[boot]; }; + bda = derive2 { name="bda"; version="17.1.2"; sha256="1rs7ipmwkhvbryga11nqvjf0cygvmcqzis5jvgdbxyi0v0japbl2"; depends=[boot]; }; bdc = derive2 { name="bdc"; version="1.1.4"; sha256="1z79bsg0jz5ffl47sjgxj2bigyhbn76m0kz9sqbzkph7srcc6vpr"; depends=[CoordinateCleaner dplyr DT foreach fs ggplot2 here magrittr purrr qs readr rgnparser rnaturalearth sf stringdist stringi stringr taxadb tibble tidyselect]; }; bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; }; bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; }; @@ -6669,7 +6675,6 @@ in with self; { bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; }; bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-6"; sha256="1g300x11rv56f826mbv7mbb67a5xz3dv74hpjc18jh3q8gap3j7r"; depends=[]; }; - bdvis = derive2 { name="bdvis"; version="0.2.33"; sha256="0gcc41pbvx245pcdrm9wxn3clg0iczpqvgrhzmy8c0dz2jfbzc9j"; depends=[chron ggplot2 lattice maps plotrix plyr rgdal sqldf taxize treemap]; }; bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; }; beadplexr = derive2 { name="beadplexr"; version="0.5.0"; sha256="0n07lxwmcqn6hx7bvrqvcy5y98c4x7wbcpjlwyq66imphj711blp"; depends=[cluster dplyr drc fpc ggplot2 mclust purrr rlang tibble tidyr yaml]; }; beakr = derive2 { name="beakr"; version="0.4.3"; sha256="0l6475l5d58g5ahz4b3vrdlvl656p2rasni17gz4y1l2rd0pvvh4"; depends=[base64enc httpuv jsonlite magrittr mime R6 stringr webutils]; }; @@ -6679,42 +6684,42 @@ in with self; { beanz = derive2 { name="beanz"; version="3.1"; sha256="1rv4pil8hfykp35impw980riijwgrqxv9v528w1mmq1gyy25wjhl"; depends=[BH loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders survival]; }; bearishTrader = derive2 { name="bearishTrader"; version="1.0.2"; sha256="1w9q66v46ppbic684dp3wv22cykd8fvjznd53w0xp3h0fnzhb5v0"; depends=[]; }; beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; }; - beastier = derive2 { name="beastier"; version="2.4.11"; sha256="0y9fl731gkxznrm3slffmz0haa9cpmly13zbs9jydbhndf2npirn"; depends=[ape assertive beautier devtools phangorn rappdirs readr rJava stringr tibble xml2]; }; - beautier = derive2 { name="beautier"; version="2.6.5"; sha256="15nbgn2ndb2qgwqpalm0mkwwxw15ncq0rihkhbczzw4i6bcyhmyb"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; + beastier = derive2 { name="beastier"; version="2.4.12"; sha256="14pph5cqnpb450wl5i8nbnh2gs67y4g3snzfwm8d8s0vgcqj4k98"; depends=[ape assertive beautier devtools phangorn rappdirs readr rJava stringr tibble xml2]; }; + beautier = derive2 { name="beautier"; version="2.6.9"; sha256="1z6awfw5sz30fdgjl1g0fq2amwjw0xnb5kamhfrf4xyl6hj2h60y"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; bedr = derive2 { name="bedr"; version="1.0.7"; sha256="0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.4.0"; sha256="016mqcbdksialkmap56rprzna9b6cd6896ml9gl2n2h8yjdk7x2i"; depends=[]; }; - beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; }; + beezdemand = derive2 { name="beezdemand"; version="0.1.2"; sha256="0rzs0mhl8dyflfz69c98ibk5bnsaf651k72wpx4ihl1im2scapfw"; depends=[ggplot2 nls2 nlsr nlstools optimx reshape2]; }; befproj = derive2 { name="befproj"; version="0.1.1"; sha256="194kicmfxamy061zx0ljmvrlh8gm56fcmhj1j2qfrihklpab4xhx"; depends=[dplyr]; }; - beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; }; behaviorchange = derive2 { name="behaviorchange"; version="0.5.5"; sha256="1nvmrl5nif10kw1risfsmvdlc4q6bkcfxpw26vwanm6ks3lamdc3"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets4 gridExtra gtable knitr rmdpartials ufs viridis yum]; }; behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; belg = derive2 { name="belg"; version="1.5.3"; sha256="12yfqzz98c4377xjqw9biq83mp8gb009xy4fnnsgxrqb8d4r6i2i"; depends=[Rcpp RcppArmadillo]; }; bellreg = derive2 { name="bellreg"; version="0.0.1"; sha256="17a0ac5ab9yblkl3cwv9vf1l6s027r34n4lqw9fs8bfs1inxbn9p"; depends=[BH extraDistr Formula magic MASS numbers Rcpp RcppEigen Rdpack rstan rstantools StanHeaders]; }; bench = derive2 { name="bench"; version="1.1.3"; sha256="05zky7l6103gabv9y0g3qlx8sgkq1sn9yl9jd3x8834cmlh67bmz"; depends=[glue pillar profmem rlang tibble]; }; + benchden = derive2 { name="benchden"; version="1.0.8"; sha256="01fhqdkkdm6ph965vj3m274f3zrbrjs5abcwpsp78nm5qz9kxbn8"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.8"; sha256="0qaz8wy3n08k9lr8qljk5i8z8db18scbdc8m734aymd307h00w8x"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix stringr tibble]; }; benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.4"; sha256="1n4vjkagqlm6kw2hilf4gjfcdjad0bcg652j9nl2ygbq3kdnh1vf"; depends=[dplyr tibble]; }; benchr = derive2 { name="benchr"; version="0.2.5"; sha256="1xh1n41ll50zz3v26i8lg5f92i90rc78ywnl0rczryh621whx80n"; depends=[Rcpp RcppProgress]; }; bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; }; benford = derive2 { name="benford"; version="1.0.1"; sha256="0phy3bk89bn4p69mym9lrb04cfavdb1rl47yy44qp4g2w1028dqw"; depends=[]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; - bennu = derive2 { name="bennu"; version="0.2.1"; sha256="0gyw032rk65h3x0a55f6h2yndy7s8pa69wrch3yq0dhw4axdspiz"; depends=[BH dplyr ggplot2 magrittr Rcpp RcppEigen RcppParallel rstan rstantools scales StanHeaders tidybayes tidyr]; }; + bennu = derive2 { name="bennu"; version="0.3.0"; sha256="04vgpk549fr5wwg11f5979iqd40yqamdch46vwxb57wxhraphcxy"; depends=[BH dplyr ggplot2 glue lifecycle magrittr Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidybayes tidyr]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.1"; sha256="1d65xaqz0v2wjm6nxl0lyzjynrgizdvzpj2cqa0nhlczcg6xi62r"; depends=[]; }; benthos = derive2 { name="benthos"; version="1.3-8"; sha256="0pznxnf4wl47wc926diaf4h6x12grc9vxbzd8d4d5j18dp3wvr5z"; depends=[dplyr lazyeval readr]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.22.0"; sha256="166lx47z4m5spi4yapsda18mwg30z2gx9cdhvshzgr788vbpi1cd"; depends=[abind]; }; - bestNormalize = derive2 { name="bestNormalize"; version="1.9.0"; sha256="0kz03bawq45ff3vibhnfq1fq2xs7snx9qw2jaw7a7ma57svbr3gd"; depends=[butcher doParallel doRNG dplyr foreach generics LambertW nortest purrr recipes tibble]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.9.1"; sha256="1lryl23jvf51n7ka58ncwhjglk0zzm18wik962h403j4mph1jjly"; depends=[butcher doParallel doRNG dplyr foreach generics LambertW nortest purrr recipes tibble]; }; bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; }; bestglm = derive2 { name="bestglm"; version="0.37.3"; sha256="1zncy958hlwyyxrp6yvq1inq6mpyrbr6cdkf8maijfirr5j8f0ya"; depends=[glmnet grpreg lattice leaps pls]; }; besthr = derive2 { name="besthr"; version="0.3.2"; sha256="0mg1nm014p82n9v5f929rcrpqclqs5kh8hga8gd7h29jqykgirc0"; depends=[dplyr ggplot2 ggridges magrittr patchwork rlang stringr tibble]; }; bestridge = derive2 { name="bestridge"; version="1.0.7"; sha256="10nlk1vrzmgxfia9b3skmg5594ab5s3d64k2awyxybkz2pzz7gb1"; depends=[MASS Matrix pheatmap Rcpp RcppEigen survival]; }; betaBayes = derive2 { name="betaBayes"; version="1.0.1"; sha256="1a7ng6ym47scgj47frrhs76r6ipq6mhgf3ivbg2npqpg7hjcz2ci"; depends=[betareg Rcpp RcppArmadillo]; }; - betaDelta = derive2 { name="betaDelta"; version="1.0.2"; sha256="0zsaw5c9x9dw3vhsp0jmk07m4i5d58z3mpk1fkd6wjd78qjmz5ac"; depends=[]; }; - betaMC = derive2 { name="betaMC"; version="1.2.0"; sha256="0b3pbblv9gz7577kd4027bgnw74scmn7i42p9fivv0kzw475s82a"; depends=[]; }; - betaNB = derive2 { name="betaNB"; version="1.0.2"; sha256="1bdprp0g12dm53023k49wdh4r28c02h2b4zdxa977jsn22753fvh"; depends=[]; }; - betaSandwich = derive2 { name="betaSandwich"; version="1.0.5"; sha256="0abxm1wr77517n7yza0mnhjyksc2f3xng8gr4xfgcvyd2ckmckkv"; depends=[]; }; + betaDelta = derive2 { name="betaDelta"; version="1.0.3"; sha256="05sraiyfr9pncmxgm1qirxsg3qwbmcqj4z838rii274nmqsrsx58"; depends=[]; }; + betaMC = derive2 { name="betaMC"; version="1.3.1"; sha256="0wiccdiaqmza4fgcnyf9z833rnqzrm7shb0xvajcfa8d3vpp92z0"; depends=[]; }; + betaNB = derive2 { name="betaNB"; version="1.0.3"; sha256="0smjygh6z91r798b9sx7mxj1ksm66wf356jw0pfkgwmr7nxk66a7"; depends=[]; }; + betaSandwich = derive2 { name="betaSandwich"; version="1.0.6"; sha256="06jjcl4ajhd1g0n9w2p3wn6pvdwxkv4rwrzbllhr8zggdbnh2j5r"; depends=[]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; - betaclust = derive2 { name="betaclust"; version="1.0.0"; sha256="1h3fcvs22spxhphcfg7zl75cpa5yycyl2yy0bgyy0hwkwh8cwpza"; depends=[doParallel foreach ggplot2 plotly scales]; }; + betaclust = derive2 { name="betaclust"; version="1.0.3"; sha256="1w76c7yxgnc98p6lwh5mxrrgv1kk5dgjgp12g0vs25l4fb7advqp"; depends=[doParallel foreach ggplot2 plotly pROC scales]; }; betafunctions = derive2 { name="betafunctions"; version="1.8.1"; sha256="0xvg5d04icsb0v9f7gnvpw345sik8xla5p55cdpbm8c3wwfk1d1m"; depends=[]; }; betapart = derive2 { name="betapart"; version="1.6"; sha256="1ap1z9pvih66la7qh1bfihq0s5csnacgnx3i31gnj5ylaf72z9ds"; depends=[ape doSNOW fastmatch foreach geometry itertools minpack_lm picante rcdd snow]; }; betaper = derive2 { name="betaper"; version="1.1-2"; sha256="0gh5xjimg0wgv626g3y34mvgrji2aylnm89iwadg7d6g4s457ynp"; depends=[vegan]; }; @@ -6734,7 +6739,7 @@ in with self; { bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; }; bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.5"; sha256="1qng8zlpm5pp2ilny99gxyppmp5dnrada4kmvpyg2ap06i69a9gs"; depends=[car combinat lattice mvtnorm]; }; - bgms = derive2 { name="bgms"; version="0.1.0"; sha256="0z3lj0phlx3agsr797fdnr6g4flrcln2b5rqv6m1w7gdghlffzpb"; depends=[Rcpp RcppProgress Rdpack]; }; + bgms = derive2 { name="bgms"; version="0.1.2"; sha256="1zycs2zp27kcf2q34s6am8i4hxqkj7vdb13blla7qr64l0085y8v"; depends=[Rcpp RcppProgress Rdpack]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; bgumbel = derive2 { name="bgumbel"; version="0.0.3"; sha256="18k8dy44x49hr4s37hjrq60c3cbw0slc9gjmd8gwcbz4slix2ydk"; depends=[coda MASS MCMCpack quantreg SparseM]; }; bgw = derive2 { name="bgw"; version="0.1.2"; sha256="0az4n3jh02p0smzfx57mpg8q2yrk63fdpb6qcsbpphkicjmvh8bn"; depends=[]; }; @@ -6754,9 +6759,9 @@ in with self; { bidask = derive2 { name="bidask"; version="1.0.0"; sha256="1f5i95bbwb2svx2gcj559x9vydwbaqba2slzsx1w4l9sfm2j79wr"; depends=[xts zoo]; }; bife = derive2 { name="bife"; version="0.7.2"; sha256="0xikxniwzcv6jc64rgx39hddqchxk6c43h45algssbz2vaxvc4zg"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bifurcatingr = derive2 { name="bifurcatingr"; version="2.0.0"; sha256="1755976gx723gqy94myvh5ng7bn1qisb3488mgix27af3cmrmjfi"; depends=[fMultivar]; }; - bigBits = derive2 { name="bigBits"; version="1.0"; sha256="10cdcjz4abbyg3fmr7mmf3v9g61l5wswaz9ra6bc7v7s1vmzbim9"; depends=[gmp Rmpfr]; }; + bigBits = derive2 { name="bigBits"; version="1.1"; sha256="0vakcy5ymd4b5mhz5vjbkhp82bikdajh6wag4cgzbl3vdvx85xhf"; depends=[gmp Rmpfr]; }; bigD = derive2 { name="bigD"; version="0.2.0"; sha256="0pzzqqazn1nv2b613vzdyhxvr454lyqq8235jydia6r3k86fpadw"; depends=[]; }; - bigDM = derive2 { name="bigDM"; version="0.5.2"; sha256="1792g2w33xs6iaky12jr0s11mbfx9bbag0llslpxiac80x54pg72"; depends=[crayon doParallel fastDummies foreach future future_apply MASS Matrix RColorBrewer Rdpack rlist sf spatialreg spdep]; }; + bigDM = derive2 { name="bigDM"; version="0.5.3"; sha256="1hav79f5lw1yh4651j7ag6x9kag1dzpb6damz0xfmqrbpgdbq63a"; depends=[crayon doParallel fastDummies foreach future future_apply geos MASS Matrix RColorBrewer Rdpack rlist sf spatialreg spdep]; }; bigGP = derive2 { name="bigGP"; version="0.1.8"; sha256="0awsskpdky56llqc7flgwzs6646cvvn8q50x8gj0hkknfm8fs1rz"; depends=[Rmpi]; }; bigMap = derive2 { name="bigMap"; version="2.3.1"; sha256="08c9s5sk672j70d6pnva7z52i4s3knkby06lva9al9n8a3jiwsvz"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; bigQF = derive2 { name="bigQF"; version="1.6"; sha256="01qr1cw5v330kkddmgwk4fdlm6msnqcbx1kfzw390yfwq5pr84sy"; depends=[CompQuadForm coxme Matrix svd]; }; @@ -6789,13 +6794,13 @@ in with self; { bigstep = derive2 { name="bigstep"; version="1.1.1"; sha256="1bppvib57p6m91c2v9w9lgb1k3jg8mk3w2kkbjvwgsdwy4m8fhap"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.9"; sha256="0ws73fasmwsjbv5l63iln164ai7n3dy6wwpm8vqkpys7wl1i3xxy"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; - bigtime = derive2 { name="bigtime"; version="0.2.2"; sha256="14hybc3cjl5cj7m6nsac9yhxiw1rpnc9mc8mc74yircbl3y6jv7n"; depends=[corrplot dplyr ggplot2 magrittr Rcpp RcppArmadillo RcppEigen tidyr]; }; + bigtime = derive2 { name="bigtime"; version="0.2.3"; sha256="1lnq8zjhvnm5q90y2aak11l8a726p1w4wgjwdvdn9pzlwgm8xia5"; depends=[corrplot dplyr ggplot2 magrittr Rcpp RcppArmadillo RcppEigen tidyr]; }; bigutilsr = derive2 { name="bigutilsr"; version="0.3.4"; sha256="096h0v277n39bvipfbfd730lz3qkplfnv58zmzsyy3al9f7lajxl"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.4"; sha256="1ca8w4yfw0bfqls0g1qqh8gkyk23d0mi22kavawv9wwhydxrxxjc"; depends=[]; }; bikm1 = derive2 { name="bikm1"; version="1.1.0"; sha256="1ffw7vfl7cpj6n6c3hrnn4pjnwmw623xdj469fh61q6c2ig5sq87"; depends=[ade4 ggplot2 gtools lpSolve pracma reshape2]; }; bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; - billboarder = derive2 { name="billboarder"; version="0.4.0"; sha256="1llac7fyyfax6q8n9b8lccyl9c8vxqvkfp341sz59mrw8yhwb2hr"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang scales shiny]; }; + billboarder = derive2 { name="billboarder"; version="0.4.1"; sha256="0byj1ilwnmq9n9gswsnj17r8pzhm4fp6567nbz1xfmlvl3402qkn"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang scales shiny]; }; bimets = derive2 { name="bimets"; version="3.0.1"; sha256="03g0vkmg1lcpc6v3a4apj13920iv4lrbag3q0xih0b5d5479yr57"; depends=[xts zoo]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; binGroup2 = derive2 { name="binGroup2"; version="1.2.4"; sha256="1qq04i8fji8mp763afxrqlradfdxlzd3ph5d18dabfj813yxx6kz"; depends=[ggplot2 partitions rBeta2009 Rcpp RcppArmadillo Rdpack scales]; }; @@ -6816,13 +6821,13 @@ in with self; { binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; }; binman = derive2 { name="binman"; version="0.1.3"; sha256="1xz9ky3axidm0fp518rj80ma6q14ybyvashil79hhkk3iqmx0lhw"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; }; binom = derive2 { name="binom"; version="1.1-1.1"; sha256="1yxyhsd0savwirlmgnq6973slfakqyfvjm0zz60cmc9v490my8gf"; depends=[]; }; - binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; + binomCI = derive2 { name="binomCI"; version="1.1"; sha256="078qghb8svz7jfnmdc5j2npg2lvb00j4lal3ghszysarmw21nia1"; depends=[]; }; binomialRF = derive2 { name="binomialRF"; version="0.1.0"; sha256="1liqhnp4j3fxy552fi4yz5vmfzh5blpmxx6fa3g62dgnhcm9sy18"; depends=[data_table randomForest rlist]; }; binomialtrend = derive2 { name="binomialtrend"; version="0.0.0.3"; sha256="1rrs8sg1dfzgb6005pm5nj3fwp5fy89pjx0af59clybj6lyqp25d"; depends=[pheatmap]; }; binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; }; binr = derive2 { name="binr"; version="1.1.1"; sha256="1h1zkawhzp23diav6q4i2sysf4lh3pxc0gsmh4q3vgany1wj57wy"; depends=[]; }; - binsegRcpp = derive2 { name="binsegRcpp"; version="2022.7.21"; sha256="15qiqzwy64xz6pbwy8mvw6xnmz52bjqbc0p6l5gsfkh6g489xjb0"; depends=[data_table Rcpp]; }; - binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; + binsegRcpp = derive2 { name="binsegRcpp"; version="2023.8.31"; sha256="1rx8rxgzjf4bjbx6gpf70pnma05g51lg6l1z0kdswj8m3pmqnk93"; depends=[data_table Rcpp]; }; + binseqtest = derive2 { name="binseqtest"; version="1.0.4"; sha256="14na719dsz9bnvcyhlclzbaxvm4sc8g3v41jmhdzgr8bfbqahgk4"; depends=[clinfun]; }; binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; binspp = derive2 { name="binspp"; version="0.1.26"; sha256="0ah002lvimniwmwgn2syw9saxgzpdhs5vins0f3kb98p5k3gdxqk"; depends=[cluster mvtnorm Rcpp RcppArmadillo RcppEigen spatstat spatstat_geom spatstat_model spatstat_random VGAM]; }; binsreg = derive2 { name="binsreg"; version="1.0"; sha256="1lsfh45psa85vxr8ll2297syjszfasgay946n7pzfw1nizfc29b9"; depends=[ggplot2 matrixStats quantreg sandwich]; }; @@ -6832,7 +6837,7 @@ in with self; { bioC_logs = derive2 { name="bioC.logs"; version="1.2.1"; sha256="092hdrfkdij3s8871z4c1lb0rf5pp07ggliaz76iyfxrbvy9hcxj"; depends=[]; }; bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; - bioRad = derive2 { name="bioRad"; version="0.7.1"; sha256="129ml078cr26nhnqvn44qgxqr0s018aj11z92387ap67flcx2b7l"; depends=[assertthat curl dplyr fields frictionless ggplot2 glue jsonlite lubridate lutz raster readr rhdf5 rlang sp suntools tidyr viridis viridisLite]; }; + bioRad = derive2 { name="bioRad"; version="0.7.3"; sha256="0gschmraqc76yiqdn48cg1qnd0p7b6x7h2gr54a84pb4ivbn6vyy"; depends=[assertthat curl dplyr fields frictionless ggplot2 glue jsonlite lubridate lutz raster readr rhdf5 rlang sp suntools tidyr viridis viridisLite]; }; bioSNR = derive2 { name="bioSNR"; version="1.0"; sha256="19blfbw9d0did76llgffs8dyld8yr6wf4rmxmr2fb4vp1s8m2izc"; depends=[dplyr ggplot2 pracma scales]; }; bioacoustics = derive2 { name="bioacoustics"; version="0.2.8"; sha256="08qhxx7xgswjamrgg82pkg1f7w50dx9ln67d50n1p3rvrxab4061"; depends=[htmltools moments Rcpp stringr tuneR]; }; bioassays = derive2 { name="bioassays"; version="1.0.1"; sha256="1y32wxkv14l7r0f35y4hxxxh3zpw2gd4hsjmkajhmzmnvg5jdw78"; depends=[dplyr ggplot2 magrittr nplr reshape2 rlang]; }; @@ -6840,19 +6845,19 @@ in with self; { biocompute = derive2 { name="biocompute"; version="1.1.1"; sha256="102n8y83z8568lwil2fb28wrjkymwmw9rzvk0a4zgsx5a3l7wl01"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; biodosetools = derive2 { name="biodosetools"; version="3.6.1"; sha256="013nqdqrv5h3swzqss2kazsp06wrs57zri3aaidy92wrd6v24bsh"; depends=[bsplus cli config dplyr ggplot2 golem magrittr MASS maxLik mixtools msm rhandsontable rlang rmarkdown shiny shinydashboard shinyWidgets tidyr]; }; biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; }; - biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; - biogeom = derive2 { name="biogeom"; version="1.3.6"; sha256="1biwv0nnph8xrxx46g08gdgdi99k79nq7bf2iqidji826spz0xbv"; depends=[spatstat_geom]; }; + biogeom = derive2 { name="biogeom"; version="1.3.7"; sha256="1gg1ca7iwpyb2i5vyv725ai49ycgai1hr5960295xmx571pzh6mp"; depends=[spatstat_geom]; }; biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; - biogrowth = derive2 { name="biogrowth"; version="1.0.2"; sha256="04k89fnfc85wiq09b5cff4k4yvhi8h87nzscig1lcznxxwljyi3j"; depends=[cowplot deSolve dplyr FME formula_tools ggplot2 lamW lifecycle MASS purrr rlang tibble tidyr]; }; + biogrowth = derive2 { name="biogrowth"; version="1.0.3"; sha256="0x4x9awqpda76g9hy8d9mw48c07ki2iwlbq5qaa7mw2pp8hg8kh5"; depends=[cowplot deSolve dplyr FME formula_tools ggplot2 lamW lifecycle MASS purrr rlang tibble tidyr]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.8"; sha256="1b7nxjis0p1hiv3w0cr3cyc2xz6sn9qbpssvlp2d7c5gm8x2gnj7"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; - biolink = derive2 { name="biolink"; version="0.1.7"; sha256="1i9aisvb3lvljird89fy9fx7h3s1wi6dpilycbynqyhz8xqnnszj"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; - biomartr = derive2 { name="biomartr"; version="1.0.4"; sha256="0hv4z6ycmn58ha7j7zfmyhvs2i37cm48gcalg19dli2kaw1c4210"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble withr XML]; }; + biolink = derive2 { name="biolink"; version="0.1.8"; sha256="03jsvzy6fqbx3w6gs7v1mnznkqwsad3ywdb4wxp0mbaq4vrsandm"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; + biomartr = derive2 { name="biomartr"; version="1.0.5"; sha256="14nw44dkyrfw43dc4zwsnvkrmdhsl131m9w1wa80j3qkbhyaypfl"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble withr XML]; }; biometryassist = derive2 { name="biometryassist"; version="1.1.3"; sha256="03r14hbc3hllxz5hjraq0ry38899vml6cq71ls8kdn98gi5c6gan"; depends=[agricolae cowplot curl emmeans farver ggplot2 lattice multcompView pracma rlang scales stringi]; }; biomod2 = derive2 { name="biomod2"; version="4.2-4"; sha256="0ky6wy0gj3vy0bzdvxqzc7gfgb0bshjgzs9r37y902prbl3n70f2"; depends=[abind dplyr earth foreach gbm ggplot2 MASS maxnet mda nnet PresenceAbsence pROC randomForest reshape reshape2 rpart sp terra xgboost]; }; bionetdata = derive2 { name="bionetdata"; version="1.1"; sha256="14ll1m85pcr0xycczk1y9jxiqxfy5daiigfhqn4f6sfk2afy07yr"; depends=[]; }; bioregion = derive2 { name="bioregion"; version="1.0.0"; sha256="0miajh5m6hmk5jwpaad8z2psib0x0bk94dyyhxyipzn9hf1hijqb"; depends=[ape bipartite cluster data_table dbscan dynamicTreeCut fastcluster ggplot2 igraph mathjaxr Matrix Rcpp Rdpack rlang rmarkdown segmented sf tidyr]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; + biosampleR = derive2 { name="biosampleR"; version="1.0.4"; sha256="1cx6as9nvivx5laz029wrbd7jrhl3fhqj0lm1sb65ckx3arm8dwj"; depends=[ggplot2]; }; biosensors_usc = derive2 { name="biosensors.usc"; version="1.0"; sha256="076isyk7dfjpi5db7ghk0hmz2kkdgmrnj3g9ffdnim5gxq3zsf1h"; depends=[energy fda_usc osqp parallelDist Rcpp RcppArmadillo truncnorm]; }; bioseq = derive2 { name="bioseq"; version="0.1.4"; sha256="0m93s7vrpd392w2mcv3sdf5kcmpn1671ksplx1fiz7wdakck9fxq"; depends=[ape crayon dplyr pillar readr rlang stringdist stringi stringr tibble vctrs]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; @@ -6863,25 +6868,25 @@ in with self; { bipartite = derive2 { name="bipartite"; version="2.18"; sha256="1n15vs9zpq1arays1xjicfbam0k7v71afcq64skjnh9qmycyzh4v"; depends=[fields igraph MASS permute sna vegan]; }; bipartiteD3 = derive2 { name="bipartiteD3"; version="0.3.0"; sha256="1b4nw1hqw645j8blf2b1hhnar7ffc4bw0zb07ycfjqd2prnif8pd"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; bipd = derive2 { name="bipd"; version="0.3"; sha256="1d8mcanmkjki3md047widfgf2hi905w24hibqsg1r7nr8d0g03yg"; depends=[coda dplyr mvtnorm rjags]; }; + biplotEZ = derive2 { name="biplotEZ"; version="1.0"; sha256="1qnidnr4aydb18dz5igqrybbmdsih1pc750l8kwn5nqi65vpbhp3"; depends=[withr]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; }; birankr = derive2 { name="birankr"; version="1.0.1"; sha256="1azgrzgw5bnfac8p287ir5zl6kxc6jij20p6cfc3lbbl03f8sa1k"; depends=[data_table Matrix]; }; - birdring = derive2 { name="birdring"; version="1.4"; sha256="0rskrf0r5nrzfcac0zvc60vabvs9dws2zx1rxssvw6xmwyiiy1z6"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; - birdscanR = derive2 { name="birdscanR"; version="0.1.2"; sha256="0118i48mp5wvz8w74awwqr2460r8jmhiqpfpi1m190gy0nhj1573"; depends=[DBI dplyr ggplot2 magrittr maptools modi reshape2 RODBC RPostgreSQL rstudioapi sp tibble tidyr]; }; + birdring = derive2 { name="birdring"; version="1.6"; sha256="17f6hlvz6k4ya82nai7j474k55w3is8if4vckbwqq1c4lj9zfm6r"; depends=[geosphere ks lazyData raster]; }; + birdscanR = derive2 { name="birdscanR"; version="0.2.0"; sha256="0vbvf9512214sgah3jsn7cdy8abkyr9pvaqaivqjrhyfpv9fvbr1"; depends=[DBI dplyr ggplot2 magrittr modi reshape2 RODBC RPostgreSQL rstudioapi sp suntools tibble tidyr]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; biscale = derive2 { name="biscale"; version="1.0.0"; sha256="1bjlw2vlgb9c50iah1w38b1g8bgdys86vr7bnbv0fapzp584d36g"; depends=[classInt ggplot2]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; - bisg = derive2 { name="bisg"; version="0.1.0"; sha256="08imhy6vsx5axwxz93cbzxs8wf28vdp8avny47v5mw4ihm0kbprn"; depends=[dplyr rlang stringr tidycensus tigris wru]; }; bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; - bistablehistory = derive2 { name="bistablehistory"; version="1.1.1"; sha256="0lk4kbxrnkr66cnyalzl2m18wwzf4y23r016nl1n52209vviql95"; depends=[BH boot dplyr future glue loo magrittr purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr]; }; + bistablehistory = derive2 { name="bistablehistory"; version="1.1.2"; sha256="114m7banr0h4l7lzq2bsjz9l3qb7xgg297ix9aj62rmz02p7x5hf"; depends=[BH boot dplyr future glue loo purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr]; }; bit = derive2 { name="bit"; version="4.0.5"; sha256="1g5zakrzkhrqh3d7p1zka6zzzw11rdlbrvxsh05s7dkli1m57wph"; depends=[]; }; bit64 = derive2 { name="bit64"; version="4.0.5"; sha256="0y0m7q1rwam1g88cjx7zyi07mj5dipxd9jkl90f294syx8k6ipr5"; depends=[bit]; }; bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitmexr = derive2 { name="bitmexr"; version="0.3.3"; sha256="0zxym4cyxk2p9cgm8lmqfxmgb01jcyww0mm3zmhqprgpk5r0faks"; depends=[attempt curl digest dplyr httr jsonlite lubridate magrittr progress purrr rlang stringr]; }; bitops = derive2 { name="bitops"; version="1.0-7"; sha256="1i0phmq5yynla5x0frqll1gbf5ww59p3sgz1s06a354zqf9grdg9"; depends=[]; }; bittermelon = derive2 { name="bittermelon"; version="1.1.1"; sha256="15m56fxw0sj5jfl3fn0yvqw518j8iyc9ry63x9ycfs253mc5gam8"; depends=[findpython png rappdirs Unicode]; }; - bivariatemaps = derive2 { name="bivariatemaps"; version="1.0"; sha256="0ciyqf3swr86l98yfjwcnr507k5xjapk1v6iq9vnpkgrc9w3j5m9"; depends=[classInt raster rgeos sp]; }; bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; }; + bivpois = derive2 { name="bivpois"; version="1.0"; sha256="1pajy04wy11nxzy9dvpg6zpp99fb6splfv0nn8hg76kk8j3zn844"; depends=[Rfast]; }; bivrp = derive2 { name="bivrp"; version="1.2-2"; sha256="0b38nh38vgqjllb1z9627dm86yp0s06ky1g829g8kkz7rffdp2za"; depends=[MASS]; }; biwavelet = derive2 { name="biwavelet"; version="0.20.21"; sha256="0v7arwmng2i22svj836i57q8by9x5pghjv7d35g7r35wakrm8jyx"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0.1"; sha256="0gg381jhwdc0kc8v0yn7wcgjkpn8dfnnn20m5ycjv66jlk2jhdcw"; depends=[MASS robustbase]; }; @@ -6890,17 +6895,16 @@ in with self; { bkmr = derive2 { name="bkmr"; version="0.2.2"; sha256="1bzr39a53p1xkq2fi2fphv2rpsml2z25xb1ycs63p3y7qis9zlky"; depends=[dplyr fields magrittr MASS nlme tibble tidyr tmvtnorm truncnorm]; }; bkmrhat = derive2 { name="bkmrhat"; version="1.1.3"; sha256="0l575dav5wyia37vm5j1dyljgk0k6l1hwfwsqr2gq3sb0iim4my4"; depends=[bkmr coda data_table future rstan]; }; blackbox = derive2 { name="blackbox"; version="1.1.43"; sha256="0q543vz4alg8i1ckh3w029gj9x8dminnq9l92d165w73r8adnalq"; depends=[foreach geometry lattice MASS matrixStats nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; - blaise = derive2 { name="blaise"; version="1.3.9"; sha256="0jz49iblkmn7cl81r8q53kqq994l03hrccpqichbsp1cvlwrn5jd"; depends=[dplyr readr stringr tibble]; }; + blaise = derive2 { name="blaise"; version="1.3.10"; sha256="1ki2na7a7qdzv2l62r4zkcj0wz73ks63piwcisl4xsw1mcc38rhl"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blapsr = derive2 { name="blapsr"; version="0.6.1"; sha256="1vycwglrpb0d041xj3dza25am16ac80r93si8x45b5ry0aq38c46"; depends=[coda MASS Matrix RSpectra sn survival]; }; - blaster = derive2 { name="blaster"; version="1.0.6"; sha256="0a8481swn0c72q5vqb3zzki7xxd1bns2b606flcc5brvqh1jaqq4"; depends=[Rcpp]; }; - blastula = derive2 { name="blastula"; version="0.3.3"; sha256="0n7cfz6m9wi7jdw8r093vmhld3q669drm9v59740dsan9s1kqq5i"; depends=[base64enc commonmark curl digest dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; + blaster = derive2 { name="blaster"; version="1.0.7"; sha256="1p0d76dzn3kkdk6r4lp3kjh06iy3r2l4zhqwr3p888gxibzfwyb0"; depends=[Rcpp]; }; + blastula = derive2 { name="blastula"; version="0.3.4"; sha256="0adflcar5vly97al072pjgb187f1kw64ddna6mm5p4rihq7ckryl"; depends=[base64enc commonmark curl digest dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; blatent = derive2 { name="blatent"; version="0.1.1"; sha256="1jnf3i7s3mn99ff8yzygxys0w8qf6vrfk16iqgxh7jbivbrczysk"; depends=[coda Matrix mnormt R6 Rcpp RcppArmadillo truncnorm]; }; - blavaan = derive2 { name="blavaan"; version="0.4-8"; sha256="0kh4q6gx4gqb2kv9f1r6b8gc8qqfm1akb5n0awds21hwj3sm4aw7"; depends=[bayesplot BH coda future_apply lavaan loo Matrix mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tmvnsim]; }; - blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; + blavaan = derive2 { name="blavaan"; version="0.5-2"; sha256="0n07qjn76fac2fn5cqvn8shqnyd7jwrxqbf3353m5nx0haq3llpk"; depends=[bayesplot BH coda future_apply lavaan loo Matrix mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tmvnsim]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; - blindrecalc = derive2 { name="blindrecalc"; version="1.0.0"; sha256="0ymcmakk8wwg72rcwj1nankw3bbdp29mr5vymaw04padwsrmbf20"; depends=[Rcpp]; }; - blindreview = derive2 { name="blindreview"; version="1.1.0"; sha256="05bqvp4yby5cij2j6ddpv98abn4gqijqza8r6yl56xl99n9aqvb1"; depends=[forsearch Hmisc]; }; + blindrecalc = derive2 { name="blindrecalc"; version="1.0.1"; sha256="126mh5p1js4mm9sq3w6hs2vlx4baa6gzm9b9jybllfi751jsgjw5"; depends=[Rcpp]; }; + blindreview = derive2 { name="blindreview"; version="1.3.0"; sha256="0cjnl16limzxvs7rg17c4kx011yxvyxqqkjzglck8r1ii0dajhnv"; depends=[Cairo forsearch ggplot2 Hmisc tibble]; }; blink = derive2 { name="blink"; version="1.1.0"; sha256="053nw592sglzh6fgz7hj8ra6q7lqs83hhv14kcgs67b56q8a3crb"; depends=[plyr stringdist]; }; bliss = derive2 { name="bliss"; version="1.0.4"; sha256="02kln40z10wngydn7y4x5shd2dff74gb340nhagf49k8ql9p78xw"; depends=[MASS Rcpp RcppArmadillo]; }; blm = derive2 { name="blm"; version="2022.0.0.1"; sha256="0pmh3fw5iv9xhr08gji1q5vcaaai5s2qq40wisqdrqn5xhk9rh2h"; depends=[]; }; @@ -6913,7 +6917,7 @@ in with self; { blockcluster = derive2 { name="blockcluster"; version="4.5.3"; sha256="09f3b8q0vz2184njsisr0h5j6l96cm0kcrvn9xw077xg5y4vif0i"; depends=[Rcpp rtkore]; }; blocklength = derive2 { name="blocklength"; version="0.1.5"; sha256="06d62hgkf2pphr6h3nba1b5r0izr45bvmrymrzq0lyc7xiwrh6na"; depends=[tseries]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; - blockmodeling = derive2 { name="blockmodeling"; version="1.1.4"; sha256="1f6jx8pwp3pnhs4wwxdrd1ska3h4w2423dpd11illxfajvnigkk9"; depends=[Matrix]; }; + blockmodeling = derive2 { name="blockmodeling"; version="1.1.5"; sha256="00qmpf0jdc8vl76rzfg12z2mdr215q8qd9p3a4b816y2g0092vrv"; depends=[Matrix]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.5"; sha256="1h2g13yp8xhkw9icl5bi1nkc0qfqkqhlhdqbcsp0246g9amssci9"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.5"; sha256="0bic3b8l7mp2hpwd8k1diwy6a4lj92i7s5k20i2wy8kw0c74jwfh"; depends=[]; }; blocksdesign = derive2 { name="blocksdesign"; version="4.9"; sha256="1kr3fxs8vgc96clhx5ml11jkwll1rg9gf16xg93q14jpg4hg0j9h"; depends=[plyr PolynomF]; }; @@ -6921,31 +6925,30 @@ in with self; { blogdown = derive2 { name="blogdown"; version="1.18"; sha256="189sc0rvxlbsslsjywnwwdpnl427r1zyj0h85xdz5v7y988naxfy"; depends=[bookdown htmltools httpuv jsonlite knitr later rmarkdown servr xfun yaml]; }; blorr = derive2 { name="blorr"; version="0.3.0"; sha256="1ynvg6ar7c7p01225q9czy4gxks0p1vw3sx207l7vzqxw20wb1bn"; depends=[car data_table ggplot2 gridExtra lest Rcpp]; }; blrm = derive2 { name="blrm"; version="1.0-2"; sha256="1lk7s7myxflr9as88944kvg8vn7m2ansg2caizr6h4d3690vr4m7"; depends=[boot mvtnorm openxlsx reshape2 rjags shiny]; }; + blsBandit = derive2 { name="blsBandit"; version="0.1"; sha256="08dppd0qym4lac5glifwaraddics8np522sfw4x8xg00vm335r25"; depends=[DBI jsonlite plotly RSQLite shiny zoo]; }; blsR = derive2 { name="blsR"; version="0.5.0"; sha256="0par5yqfn9f63di1dqjncfvvn7q3ikvc1g91gbk7svi074v9l6wx"; depends=[dplyr httr purrr readr rlang stringr]; }; bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bluebike = derive2 { name="bluebike"; version="0.0.3"; sha256="1nlxgq145igvf22ar7fpi1a7caw64jhi44fjvqsimpcqxpjycy38"; depends=[dplyr janitor leaflet lubridate magrittr readr sf stringr tidyselect]; }; bmabasket = derive2 { name="bmabasket"; version="0.1.2"; sha256="0w8y992ylyg0cyz1lfqll96fivng13lvxp0mhyb48flfnkg8rcdd"; depends=[partitions Rcpp RcppArmadillo]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; - bmem = derive2 { name="bmem"; version="2.0"; sha256="1sfxjy8bh4120a321b7qbds182ccd0pddivg8qywnab6wccknp86"; depends=[Amelia lavaan MASS sem snowfall]; }; + bmem = derive2 { name="bmem"; version="2.1"; sha256="0acw1xwswf5yi1a0j8pv996qcma3br0xw7a9w9mh7bx5xavlivvl"; depends=[Amelia lavaan MASS sem snowfall]; }; bmemLavaan = derive2 { name="bmemLavaan"; version="0.5"; sha256="0axwc7y7ncvmpnmdlxjdaw2kfhqklxd0zb7n22m6aw67hkqqqcg5"; depends=[Amelia lavaan MASS rsem sem snowfall]; }; - bmgarch = derive2 { name="bmgarch"; version="1.1.0"; sha256="1r7hlc5d8jmk7sy7wv9yrilhla57vi9ar21dhmvfakms2z7gyg9d"; depends=[BH forecast ggplot2 loo MASS Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; + bmgarch = derive2 { name="bmgarch"; version="2.0.0"; sha256="0a0svnb7wxm9v8mzk0ld28scp51sp4rsgspxccqpkbmj31njc4d0"; depends=[BH forecast ggplot2 loo MASS Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; bmggum = derive2 { name="bmggum"; version="0.1.0"; sha256="1r0j5gklmknyan68nc3vfn96ck414v75547486ic70v2pdr3xnpf"; depends=[BH edstan ggplot2 GGUM loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; bmixture = derive2 { name="bmixture"; version="1.7"; sha256="09ahs2dwrbqhk4aki9291v5lr5fa9mvi087zrqjmv2057ypyv2n5"; depends=[BDgraph]; }; - bmlm = derive2 { name="bmlm"; version="1.3.12"; sha256="0lzayz56knc1bj9r985kz91bfcjacs3zzz64b9dgbj0y2l7gd0xa"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + bmlm = derive2 { name="bmlm"; version="1.3.15"; sha256="1iig406z8whdjpbvajks2vzp1s1ay1f99r1n6qhs9xyi1z6yff2l"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmscstan = derive2 { name="bmscstan"; version="1.2.1.0"; sha256="05w6pz0mwqighhdl36f2ya1b4dw0xdhpfcbq6saw73ag5hvl57i9"; depends=[bayesplot ggplot2 LaplacesDemon logspline loo rstan]; }; bmstdr = derive2 { name="bmstdr"; version="0.4.1"; sha256="16d60sk56cfychhxfkpl0m38kl1s7lhljmvfd5j1k88k8z85pabk"; depends=[BH CARBayes CARBayesST ggplot2 ggpubr inlabru MCMCpack mnormt Rcpp RcppEigen RcppParallel Rdpack rstan rstantools spBayes spTDyn spTimer StanHeaders]; }; bnClustOmics = derive2 { name="bnClustOmics"; version="1.1.1"; sha256="1pmg0q5jay8wkn24yv3j7xrdd8k6y8yjq6crjxg22yzfbbb0ws8g"; depends=[BiDAG clue graph gRbase mclust plotrix RBGL RColorBrewer]; }; - bnclassify = derive2 { name="bnclassify"; version="0.4.7"; sha256="010447r21i5r2nk843v8dmfncqgmp4yf71ahcrppqv8vxfywcg6i"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bndesr = derive2 { name="bndesr"; version="1.0.3"; sha256="0yx5grnaginmdxdi9philz24qvncr6gva01zrasl098p49dx0zpv"; depends=[curl dplyr janitor lubridate RCurl readr readxl stringr]; }; bndovb = derive2 { name="bndovb"; version="1.1"; sha256="16mvkvwnx61jrvraagvxf56pvmf5klm8lnkqq4s5y2z92kd0clgp"; depends=[dplyr factormodel MASS nnet np pracma]; }; - bnlearn = derive2 { name="bnlearn"; version="4.8.3"; sha256="19yd6g3n7mbf03zpadwz4xcsq3d1n7fn3pgfgr1i1hjxhg2vg2n6"; depends=[]; }; - bnma = derive2 { name="bnma"; version="1.5.0"; sha256="0h7nk28ny4capnji1j5m2kzsc7l8a1z7icx0iak87pk4abzqlzmm"; depends=[coda ggplot2 igraph rjags]; }; + bnlearn = derive2 { name="bnlearn"; version="4.9"; sha256="09wj8ha7ph12s1bvc2a1ld2f9qfqabflna160y1wx1a79c7annai"; depends=[]; }; + bnma = derive2 { name="bnma"; version="1.5.1"; sha256="178gnbpcram9b4fsim6qgvypvzp5wsg9jzvg8nf004jkm4abb37l"; depends=[coda ggplot2 igraph rjags]; }; bnmonitor = derive2 { name="bnmonitor"; version="0.1.4"; sha256="0sbpfgm7yibh84m1zmn7b1ixzc2x1m2nlms7zpxp4c6fkv2c225r"; depends=[bnlearn dplyr ggplot2 gRain gRbase purrr qgraph RColorBrewer reshape2 rlang tidyr]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; bnpsd = derive2 { name="bnpsd"; version="1.3.13"; sha256="0wnbsz5c52pglycykzkd5lsnxfkjqva0xhwnb4kz7x1zd8vbd1sl"; depends=[ape nnls]; }; - bnspatial = derive2 { name="bnspatial"; version="1.1.1"; sha256="1drm9ia4lr80wahbbn9xrw658ppmgxm4iadwv77jz1x786dda2n1"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; }; bnstruct = derive2 { name="bnstruct"; version="1.0.14"; sha256="1igdr538d2nfx3ap13y6p6wb6jfvb3hcg80fapjvnzc2304sk95p"; depends=[bitops igraph]; }; bnviewer = derive2 { name="bnviewer"; version="0.1.6"; sha256="036jmypxg2ciiz388f90vm73l9djhpi6gzp1ibn9l0x3d072r7zz"; depends=[assertthat bnlearn caret e1071 igraph shiny visNetwork]; }; boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; }; @@ -6954,20 +6957,19 @@ in with self; { bodycomp = derive2 { name="bodycomp"; version="1.0.0"; sha256="1hi3x2chs87ba5nh7ka6xjrl5yvwqqcdyj1dg87rpaiipyl8396n"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3.2"; sha256="1dws84ghc5r6zpnr23qd4l9bkazds8ar723wkrkikjni58vshjf1"; depends=[rJava]; }; boinet = derive2 { name="boinet"; version="1.0.0"; sha256="1i023h1kzf5xk92dp9iyllw2b1lprs0xz2hp23lqq9vx36cpird3"; depends=[copula Iso mfp]; }; + boiwsa = derive2 { name="boiwsa"; version="1.0.0"; sha256="1lcswyy9cm4bwmsfinkrxqzb0ca704y3k8g5acm9b6b1sjkkz5r6"; depends=[dplyr Hmisc lubridate MuMIn rlang tidyr]; }; bolasso = derive2 { name="bolasso"; version="0.2.0"; sha256="1fbd39jyxq0zfbybrzzwnyql2w8hf2b9133jj0nl99d1326wr7dh"; depends=[future_apply gamlr ggplot2 glmnet Matrix progressr Rdpack tibble]; }; bold = derive2 { name="bold"; version="1.3.0"; sha256="0pwglcykyl5dnhqs8jg4hzih286v17w5dafkg3ahqk3c73a13b8f"; depends=[crul data_table jsonlite stringi xml2]; }; - bolsec = derive2 { name="bolsec"; version="0.1.0"; sha256="0wrfw8h7s59ln2b0m9g0jgvwqvr4icv2wjxqjx6rcj366a0nx3sk"; depends=[dplyr formattable rvest]; }; bondAnalyst = derive2 { name="bondAnalyst"; version="1.0.1"; sha256="0bygaldjgxbjqjnlgs64vdayr7kp6sjl6qffdywxpi7v0yfi072a"; depends=[Rdpack]; }; bonn = derive2 { name="bonn"; version="1.0.2"; sha256="1z22cdizz8sgw4fry98adcjvn23ag3qvvcinbg3kmafksdk1ivmb"; depends=[httr jsonlite]; }; bonsai = derive2 { name="bonsai"; version="0.2.1"; sha256="048nfgnzsi0zz0nsxl30nsjg63nszy44881s49g9hgs3vng2vmp2"; depends=[cli dials dplyr glue parsnip purrr rlang tibble]; }; boodist = derive2 { name="boodist"; version="1.0.0"; sha256="1haplr64f5kai1y6kdxhxiayidy1mivh85dx140fya5r6fdk0shm"; depends=[BH R6 Rcpp RcppEigen RcppNumerical]; }; - bookdown = derive2 { name="bookdown"; version="0.35"; sha256="1fzzppwp2ri4jhl1j2122rhiniay34cccvxr559bypv5b38yjywd"; depends=[htmltools jquerylib knitr rmarkdown tinytex xfun yaml]; }; - bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; + bookdown = derive2 { name="bookdown"; version="0.36"; sha256="0c4pj5sg4cnz2b2kpxgr0wk1n1pf7wkn1npm76aghy4yxj29cj4y"; depends=[htmltools jquerylib knitr rmarkdown tinytex xfun yaml]; }; boostingDEA = derive2 { name="boostingDEA"; version="0.1.0"; sha256="0df19q44fsv0hvda4dwq302wsh6vlalwszyh0ir66r5ryrrmhas4"; depends=[dplyr lpSolveAPI MLmetrics Rglpk]; }; boostmtree = derive2 { name="boostmtree"; version="1.5.1"; sha256="17na38k052lzjrssvxssllm9fwpnzhr29g9wwcfkbja6rv2pw9p1"; depends=[nlme randomForestSRC]; }; boot = derive2 { name="boot"; version="1.3-28.1"; sha256="0lzz08fpn80qzm197s4806hr6skanr3r3rlx6bx7zk4cripygkfl"; depends=[]; }; boot_heterogeneity = derive2 { name="boot.heterogeneity"; version="1.1.5"; sha256="0g4zkvx8krqh54xvjh1a0ybwl3v5bg3l670ycgnps8kkw32w5p1f"; depends=[HSAUR3 knitr metafor pbmcapply rmarkdown]; }; - boot_pval = derive2 { name="boot.pval"; version="0.4.1"; sha256="0igrxp5ii7wxpx7i8z8dws41yjhiysdhvl19ppcicfx54z62c09d"; depends=[boot car lme4 Rdpack survival]; }; + boot_pval = derive2 { name="boot.pval"; version="0.5"; sha256="0572n82402i609q0jl6p2ar1gq5jlqqssv28xs3rxsr3nza49dxv"; depends=[boot car flextable gt lme4 Rdpack rms survival]; }; bootCT = derive2 { name="bootCT"; version="1.1.1"; sha256="172a4a2plvhwqvippwbrshbn2n237qnadl4pwx7f5bfs25ichqn0"; depends=[aod ARDL dplyr dynamac gtools pracma Rcpp RcppArmadillo stringr usethis vars]; }; bootComb = derive2 { name="bootComb"; version="1.1.2"; sha256="0gg07ck2nf0ddqc5nflk5ms16m3c6dlf1a77m58q581mkavj6gyb"; depends=[MASS]; }; bootES = derive2 { name="bootES"; version="1.3.0"; sha256="05brahlh7jk9n1wv4l429vf048x51v1ivvchlxfcqvky06zjwk1z"; depends=[boot]; }; @@ -6980,16 +6982,17 @@ in with self; { bootUR = derive2 { name="bootUR"; version="1.0.2"; sha256="0wqirnj01jfn0q9sa36qixmzf8n8m1x5rrp348brzfbasm0gl9j6"; depends=[parallelly Rcpp RcppArmadillo RcppParallel RcppThread urca]; }; bootcluster = derive2 { name="bootcluster"; version="0.3.2"; sha256="0wkc9li0hqgns7pz72fby187q81yzrgl62qs8w5llayghf8lhaml"; depends=[cluster doParallel dplyr flexclust foreach fpc GGally ggplot2 gridExtra igraph intergraph mclust network plyr sna]; }; bootf2 = derive2 { name="bootf2"; version="0.4.1"; sha256="17wrl678x9mb5pny2vwrr6sdl2hsqr1nbjzsizp2q6l3w5m6s152"; depends=[ggplot2 MASS minpack_lm readxl]; }; - bootnet = derive2 { name="bootnet"; version="1.5.3"; sha256="0fd938xi5gyq616ag0n205b1a1m0r0dq6z1zqxbn83dg0p7qbaas"; depends=[abind corpcor dplyr ggplot2 gtools igraph IsingFit IsingSampler Matrix mgm mvtnorm NetworkToolbox networktools pbapply qgraph rlang snow tibble tidyr tidyselect]; }; + bootnet = derive2 { name="bootnet"; version="1.5.6"; sha256="1lkk237ps4sgljsy3m17119ggyglai1kb1sz2shjwg7a38zb2278"; depends=[abind corpcor dplyr ggplot2 gtools igraph IsingFit IsingSampler Matrix mgm mvtnorm NetworkToolbox networktools pbapply qgraph rlang snow tibble tidyr tidyselect]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; bootstrap = derive2 { name="bootstrap"; version="2019.6"; sha256="1546jqhhw5h177ii8jkdikyd26rv6gwkav816np1zks4p7zgsljj"; depends=[]; }; - bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.4"; sha256="1j9ag18s2n7cihs5hbjhibx8gikxf8fs5hx2ljfzcn0gv492qm02"; depends=[sampling]; }; + bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.5"; sha256="1pjrz125919bk4901byf2s3yfb62yg9qldf85aad6s3ws9wwidhr"; depends=[sampling]; }; + bootwar = derive2 { name="bootwar"; version="0.2.1"; sha256="0cvwdi8qvm737qsnyr87wpsfmyzcdr7sga4zbkal8y5bj73h9y63"; depends=[ggplot2 mmcards npboottprm shiny shinyjs shinythemes]; }; bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; }; boral = derive2 { name="boral"; version="2.0"; sha256="1i8lcibmd580xv92ci2xwj0jn290zlh7dv6h5n8cqaky4gqb8iz2"; depends=[abind coda corpcor fishMod lifecycle MASS mvtnorm R2jags reshape2]; }; borrowr = derive2 { name="borrowr"; version="0.2.0"; sha256="0hq9rplb22dm8nikapxnvzq10y4xzi1y7k61ghw9x1fq4fdfyy2f"; depends=[BART mvtnorm Rcpp]; }; botor = derive2 { name="botor"; version="0.4.0"; sha256="0avw7h0m2dm9nn5ya1y6kcgdh438v63y42w3y2dag24iyligx0wq"; depends=[checkmate jsonlite logger reticulate]; }; boundingbox = derive2 { name="boundingbox"; version="1.0.1"; sha256="0kgpsvnq8f0qyw55rldwqapys36y6lb4w2bw2azfl4nmrrnayxbc"; depends=[gplots imager]; }; - boussinesq = derive2 { name="boussinesq"; version="1.0.4"; sha256="1gl3hapb31qgdh6jr15czlvdmr58vz2vmlv7p89zpqnyl9lc7vgm"; depends=[]; }; + boussinesq = derive2 { name="boussinesq"; version="1.0.6"; sha256="11dwc0j88zqxqwnrinc4f990vjbyv4bs16z6id6xw7yp7i2n5nla"; depends=[]; }; boutliers = derive2 { name="boutliers"; version="1.1-2"; sha256="0j2y6ndj03shssa7pgvg9cwbm5mv7ahy9kypj9z1ahskdi4xg1m1"; depends=[MASS metafor]; }; box = derive2 { name="box"; version="1.1.3"; sha256="0nqvgbs47xlkq5gq1jdx3ikvwzvq71q44ddyz8pbh0bibayhkz52"; depends=[]; }; boxfilter = derive2 { name="boxfilter"; version="0.2"; sha256="03qx2bsqg7kkpf2q6xrj7ap0aczgascdrnkj5bcl3aq278fahnxi"; depends=[ggplot2 gridExtra]; }; @@ -7002,16 +7005,15 @@ in with self; { bpDir = derive2 { name="bpDir"; version="0.1.2"; sha256="1wkj25srsbidpcvgm6c74584ahybjy39r86dxir1vd13kbi8l120"; depends=[circular MASS plotrix]; }; bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; }; bpbounds = derive2 { name="bpbounds"; version="0.1.5"; sha256="0qzvy6a41p4nrsw91xh0bv03v8ksfv4fag365pzlwisa1ng88sqj"; depends=[]; }; - bpca = derive2 { name="bpca"; version="1.3-4"; sha256="1b0qigynj35sr5nf9y6hvcr52ydskqwx5wxwb27zawps3iykyjwf"; depends=[rgl scatterplot3d xtable]; }; bpcp = derive2 { name="bpcp"; version="1.4.2"; sha256="1xgspmknjs7cqh0iw3qgikbxpbl2qscjx9n07ib5s3z8hi282wrn"; depends=[ggplot2 survival]; }; bpgmm = derive2 { name="bpgmm"; version="1.0.9"; sha256="0wrdh4c8yws7z5zd1yl23wbja88x57x651kqbnqj70k9a1195rwc"; depends=[fabMix gtools label_switching MASS mclust mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; bpmnR = derive2 { name="bpmnR"; version="0.1.0"; sha256="1nrdy8szpinzv1whp627sf8khmnr911d878rn0kmp515iixnl6zr"; depends=[assertive DiagrammeR DiagrammeRsvg dplyr DT glue htmltools htmlwidgets huxtable knitr purrr readr rlang rvest stringr tidyr uuid xml2]; }; - bpmnVisualizationR = derive2 { name="bpmnVisualizationR"; version="0.3.2"; sha256="14gal7wbkmj4m1l4qlx228b6j9kfma706z8dvf9a637ny9609bap"; depends=[htmlwidgets rlang xml2]; }; + bpmnVisualizationR = derive2 { name="bpmnVisualizationR"; version="0.5.0"; sha256="135afhq1x2aqdmn609vfk0248wsqbp66lkw7wqqzsb6czpap1q90"; depends=[htmlwidgets rlang xml2]; }; bpnreg = derive2 { name="bpnreg"; version="2.0.2"; sha256="1acf7smlcg8b29ga47wpb23zpfb90iz19fjc5v0zppc8q20lgggl"; depends=[BH haven Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.4"; sha256="07vz00y9m71n3a847jpviwyy0zb59402yyklsfmyxmggjivpjshi"; depends=[mvtnorm]; }; bpr = derive2 { name="bpr"; version="1.0.6"; sha256="1j8b6d8k2czsi02gyy1kgf4jdi4s9wr881c3j4xg359hrrx7fnz8"; depends=[BH coda MASS Rcpp RcppArmadillo]; }; bqror = derive2 { name="bqror"; version="1.6.1"; sha256="0mg82bcc3cw2zhqz2j9539kw7cs159lzw363a2abcm7ys66dp6bd"; depends=[GIGrvg invgamma MASS NPflow pracma progress truncnorm]; }; - bqtl = derive2 { name="bqtl"; version="1.0-34"; sha256="1xlkgyhlgrwqfzph4sbhh49pjzfnw5zdr3y4786rsnr3faksnxns"; depends=[]; }; + bqtl = derive2 { name="bqtl"; version="1.0-35"; sha256="107yq7mk4gdr1wm20i751682jlj172bzbdjgqwviwgjxzbd0c2xa"; depends=[]; }; braQCA = derive2 { name="braQCA"; version="1.2.1.29"; sha256="0w1mg8lzl64mp5clinq3zai733iz3628zp4pw6vr51z24s56jg6i"; depends=[bootstrap dplyr QCA]; }; bracer = derive2 { name="bracer"; version="1.2.2"; sha256="0kbx30icv966sjv93as4yq88vkavbw68a7v2fnrvblzx2dgcis1n"; depends=[stringr]; }; brada = derive2 { name="brada"; version="1.0"; sha256="07m5xj4wjf3w85fhhh8qw8pl2gb94i50099ql8anmrm1ax5pj8sr"; depends=[cli doParallel doSNOW extraDistr fbst foreach progress]; }; @@ -7024,7 +7026,7 @@ in with self; { brandwatchR = derive2 { name="brandwatchR"; version="0.3.0"; sha256="10bccsaswsq06wdrxqg71amzx5rabmgfi4n074y651r2c1pyy98w"; depends=[data_table httr jsonlite]; }; brant = derive2 { name="brant"; version="0.3-0"; sha256="0rcp0am4wjlkinvmv0n5bky84v31ds28v163p5mlp343cgma2b62"; depends=[MASS Matrix]; }; brassica = derive2 { name="brassica"; version="1.0.2"; sha256="1av52p39jsv54q02v8xa7xilwmz5vzj6zy68y9m5lgl6s86r509y"; depends=[]; }; - bravo = derive2 { name="bravo"; version="2.2.1"; sha256="1lyfwsk1r6nfqaybwd6was9af4flbqhbqsjsnfjmc7hya2kcq26f"; depends=[Matrix Rcpp]; }; + bravo = derive2 { name="bravo"; version="2.3.1"; sha256="04hgjkxcjshj5n7d6pi58p5qkm8ni9zx7vnjwjh15bh1274yqqxr"; depends=[Matrix Rcpp]; }; brclimr = derive2 { name="brclimr"; version="0.1.2"; sha256="0l2gk9zqa3lh9a4343h2n8ffm2x1arp84k44ah37krpsbxsvam6j"; depends=[arrow checkmate dplyr lobstr magrittr rlang]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; bread = derive2 { name="bread"; version="0.4.1"; sha256="0vsxmqpgi2yjcpdpgdz6gzqkpjsq5ax4qkpys60bwmxyp1ahv90r"; depends=[data_table]; }; @@ -7036,7 +7038,7 @@ in with self; { breathteststan = derive2 { name="breathteststan"; version="0.8.4"; sha256="1j6dqjdd1079pyvgclayl1la0qa88irr9wx31viisjjri93n7wm9"; depends=[BH dplyr purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr tidyr]; }; brew = derive2 { name="brew"; version="1.0-8"; sha256="09kq14nbaw0mmpb2vbfklz786q6lyizzkyg5bg64bmj2f1d2sr8i"; depends=[]; }; brglm = derive2 { name="brglm"; version="0.7.2"; sha256="08shcz0j1npdn7xkhsvlzs3z4rdwq3g4rk6a4xx8wirqw8n8s2an"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.9"; sha256="1c8j0lbz8k2j5ksdar6sjlpiw09lhncny911rn8jynz9iisbs3r6"; depends=[enrichwith MASS Matrix nnet numDeriv]; }; + brglm2 = derive2 { name="brglm2"; version="0.9.2"; sha256="0islmx4kdy22qn2cq7lpzqq6lc6mci5qly645nfdhad9001jmhsa"; depends=[enrichwith MASS Matrix nnet numDeriv]; }; briKmeans = derive2 { name="briKmeans"; version="1.0"; sha256="158q2yb4dj4vhw8warv005s3rr8svr2vpkp2insgqv8mbvz7kzwq"; depends=[boot cluster depthTools splines2]; }; brickset = derive2 { name="brickset"; version="2022.0.0"; sha256="1ga79h40b8ckhm16894vyc7jixdm1g1hfhf7pribz59041ylj6rz"; depends=[dplyr httr jsonlite]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.2"; sha256="1bsvwh2c1i9z37d363gk5nzrbg9bcjfkarr0a2l8xrv4r1zwj43j"; depends=[]; }; @@ -7048,10 +7050,10 @@ in with self; { brio = derive2 { name="brio"; version="1.1.3"; sha256="1inwzvlf6zj6gi47gd0byzqv02qajb3l475z8pjvx2b1hm0r1a7a"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; brisk = derive2 { name="brisk"; version="0.1.0"; sha256="1l6m47rj25klrjil0275bnv0m149d2kjh23r8cv7zw2vhmlza7z1"; depends=[dplyr ellipsis ggplot2 hitandrun purrr rlang tidyr]; }; - briskaR = derive2 { name="briskaR"; version="1.0.4"; sha256="016gpgbf5zc9jkagj439n2ylfbmsikg0n6v76wf4lchv4wvrsby4"; depends=[deldir deSolve fasterize fftwtools MASS mvtnorm raster Rcpp RcppArmadillo rgdal rgeos sf sp testthat]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.1.1"; sha256="0kyr8mxz5g3w41kp08d47f29cff8fqrfbm1ri7hgfg2lgr1151xy"; depends=[]; }; - brms = derive2 { name="brms"; version="2.19.0"; sha256="1hg59zckin7pjqbcw9xfy8xznyajpgm3dx9x4ywcdz5cqx16h50f"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme posterior Rcpp rlang rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.20.4"; sha256="0bq76birbaqi2387d4qv2m8vvjcki9nkc2jychz6nkhcd7mg79h0"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme posterior Rcpp rlang rstan rstantools shinystan]; }; + brms_mmrm = derive2 { name="brms.mmrm"; version="0.0.2"; sha256="1l8sy9ckcq56j9wshgs55mdpr266scz43r5zqylcgr231v5zg3z2"; depends=[brms coda dplyr emmeans ggplot2 ggridges MASS posterior purrr rlang tibble tidyr tidyselect trialr zoo]; }; brmsmargins = derive2 { name="brmsmargins"; version="0.2.0"; sha256="1qdfig1cy5cf3csky995m0jybb2hyp7yq7ka67wircrln919c1nm"; depends=[bayestestR brms data_table extraoperators posterior Rcpp RcppArmadillo]; }; brnn = derive2 { name="brnn"; version="0.9.2"; sha256="17vsvncilisjp3sjblwg0knn8l4984p4ndql6rbq3wg8n677sy9x"; depends=[Formula truncnorm]; }; brokenstick = derive2 { name="brokenstick"; version="2.5.0"; sha256="0bq470kvv9084qaaaz5yicmxpljp23gb3dqijrmdwk1agqxn09mc"; depends=[coda dplyr lme4 matrixsampling rlang tidyr]; }; @@ -7063,7 +7065,7 @@ in with self; { brpop = derive2 { name="brpop"; version="0.1.5"; sha256="12ngmyqbrqv1hwyh9y8wf9dyr816fxan8vqw0r2jgymsir9c5k6s"; depends=[dplyr future magrittr multidplyr rlang]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brsim = derive2 { name="brsim"; version="0.2"; sha256="1r6rgfh8wcsmz0ba2bz46wpkq12aiqjbmpqy6qj6m53liyad80pk"; depends=[cluster corrplot RcmdrMisc]; }; - bruceR = derive2 { name="bruceR"; version="2023.8"; sha256="1p5wky0b6ak119nq1k2b87adypqcpv8pcrhfwai4c5daxyyxph95"; depends=[afex data_table dplyr effectsize emmeans ggplot2 interactions jtools lavaan lmerTest mediation MuMIn performance plyr psych rio rstudioapi stringr texreg tidyr]; }; + bruceR = derive2 { name="bruceR"; version="2023.9"; sha256="09i9ss1fhb4l4mypbk1jww1nscpy6g11a9miz33hykgywjkk40r4"; depends=[afex data_table dplyr effectsize emmeans ggplot2 interactions jtools lavaan lmerTest mediation MuMIn performance plyr psych rio rstudioapi stringr texreg tidyr]; }; brulee = derive2 { name="brulee"; version="0.2.0"; sha256="136dzg00and00h94w75yc5hr4xxci59ydns203ilys08hlnmjqvh"; depends=[cli coro dplyr generics ggplot2 glue hardhat rlang tibble torch]; }; brunnermunzel = derive2 { name="brunnermunzel"; version="2.0"; sha256="1sz1nx9lgl7pwgx9a5m59svajsk4qv0ajzzkw9123vrh0wydy6j3"; depends=[]; }; brxx = derive2 { name="brxx"; version="0.1.2"; sha256="08qlfnf84k3yjcvr1wm6gd96mk26xf2gz59ychb3m981228hbbs6"; depends=[blavaan blme GPArotation MASS MCMCpack rstan TeachingDemos]; }; @@ -7073,15 +7075,16 @@ in with self; { bsam = derive2 { name="bsam"; version="1.1.3"; sha256="1yiplh4wcc711w59ir5hxlp3mmgsnfz01d6203vfgclzsi7ix5m9"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; bsamGP = derive2 { name="bsamGP"; version="1.2.4"; sha256="1zga3h747fh61n9m88gazc2p2i905cwvwdkql3rh65h26cphvvs6"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; + bsgof = derive2 { name="bsgof"; version="0.23.8"; sha256="0vgf61fglzlbgdk64z826nzb9rv37kw39rlk6m8rl84m3cjsw80a"; depends=[]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; - bsicons = derive2 { name="bsicons"; version="0.1"; sha256="1506p4sskwgszam1vk5slw9nznki6gdf1s95s8cpfa3dih3lbjby"; depends=[htmltools]; }; - bslib = derive2 { name="bslib"; version="0.5.0"; sha256="05fi1cbb33hvrxx3vibbai7bzlx60jxd3iaqpc86x0224b3gpim2"; depends=[base64enc cachem htmltools jquerylib jsonlite memoise mime rlang sass]; }; + bsicons = derive2 { name="bsicons"; version="0.1.1"; sha256="138rwpklmkfgzhnj42wrjai6mykg5ncxzwk5jwvgwvpwhg4cfy19"; depends=[cli htmltools rlang]; }; + bslib = derive2 { name="bslib"; version="0.5.1"; sha256="03phbr6zax3898yvdfqmrs0sjiik4pfn34ksysf95fp348in2xdi"; depends=[base64enc cachem htmltools jquerylib jsonlite memoise mime rlang sass]; }; bsnsing = derive2 { name="bsnsing"; version="1.0.1"; sha256="1a1vxh1fc5vz7wk73m093bvpz9qb52cfrxcj5yiqm56v309jckzk"; depends=[Rcpp]; }; bspec = derive2 { name="bspec"; version="1.6"; sha256="19l1sagx6kn6i8mcs3i0h6rh7rwsyhphncv55jywpv4g6616kqcv"; depends=[]; }; bspline = derive2 { name="bspline"; version="2.2"; sha256="0v7kbg7h0d0s2ywvjpahk2y2ncbv8kmacdznaixxakccqbl8piip"; depends=[arrApply nlsic Rcpp RcppArmadillo]; }; bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; }; bsplus = derive2 { name="bsplus"; version="0.1.4"; sha256="0bf8qvj7pk3xn7g4p89as1xzx56c75n842g27rj6lcgsf9rdmv9g"; depends=[glue htmltools jsonlite lubridate magrittr purrr rmarkdown stringr]; }; - bspm = derive2 { name="bspm"; version="0.5.3"; sha256="1y87g8lvr9l4k1ga9q4zq29v6jlgzdl5fzh4fzbxg3j77n7fd5dq"; depends=[]; }; + bspm = derive2 { name="bspm"; version="0.5.5"; sha256="07d68b8l3vxihd8wxy50rywldhdg3lwww5vab6cgdahc7vn937fl"; depends=[]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; bsreg = derive2 { name="bsreg"; version="0.0.2"; sha256="13701llj5k7vssmgb4fvxswcf9bsc4pxjvh67znbsvrv5cmjh5x3"; depends=[Matrix R6]; }; bssm = derive2 { name="bssm"; version="2.0.1"; sha256="19ii7hs4plgq31yiyr0258y22xckd5dv7k5dp2cwkzrr3h544ylz"; depends=[checkmate coda diagis dplyr magrittr posterior ramcmc Rcpp RcppArmadillo rlang sitmo tidyr]; }; @@ -7092,14 +7095,15 @@ in with self; { bsub = derive2 { name="bsub"; version="1.1.0"; sha256="112hlvg15jlzg3drfzkslaly42vnvsycn9vif0w3iaw5fzsaa954"; depends=[clisymbols crayon digest GetoptLong GlobalOptions]; }; bsvars = derive2 { name="bsvars"; version="1.0.0"; sha256="0d5c8fjnigm4zsfzhki1vsdgc310dba716sdiag8vqq7m1r3g2yc"; depends=[GIGrvg R6 Rcpp RcppArmadillo RcppProgress RcppTN]; }; btb = derive2 { name="btb"; version="0.2.0"; sha256="1gm03md6ky134nzmnnp054mi2w8kl4bgcgg4k65zf2cyniz4arxq"; depends=[BH dplyr magrittr mapsf Rcpp RcppArmadillo RcppParallel sf]; }; - btergm = derive2 { name="btergm"; version="1.10.10"; sha256="1vh0jivl521mdjz3cb6fnazgqm9pc6wr515n7sbwvvyvn96ps6ax"; depends=[boot coda ergm igraph Matrix network ROCR sna statnet_common]; }; + btergm = derive2 { name="btergm"; version="1.10.11"; sha256="1xyjy5ig5hf45h8axp2ykyh3n56ls47h1bjsa85k992rk0lsc4dg"; depends=[boot coda ergm igraph Matrix network ROCR sna statnet_common]; }; bubbleHeatmap = derive2 { name="bubbleHeatmap"; version="0.1.1"; sha256="0b12bhk0c65m5izp5ayy6fl4iv0jhk7hhwbnavyggawrpz23ikxr"; depends=[reshape]; }; bubblyr = derive2 { name="bubblyr"; version="0.1.2"; sha256="04agfwk6rmbhlfblfw1irqnv3yrp00zfn4qwy2169b7ypg8r55v2"; depends=[glue htmltools]; }; bucky = derive2 { name="bucky"; version="1.0.7"; sha256="1ymlpmhgvhp7n7y9dbvi6zh73y8jvr09axq4skcliam8ks2xx1pm"; depends=[lmtest sandwich]; }; - buildmer = derive2 { name="buildmer"; version="2.9"; sha256="1jcn7isgg2dh84rhyz8xnh3xwxbcli70hf70dbjm4sq6a854kkk3"; depends=[lme4 mgcv nlme]; }; + buildmer = derive2 { name="buildmer"; version="2.10.1"; sha256="1wil9gg6n6d6lwr8q0r4z18w73s7l557c2c94mm4lxk75yz7wnbk"; depends=[lme4 mgcv nlme]; }; buildr = derive2 { name="buildr"; version="0.1.1"; sha256="117j4z6c22d9c5aghsmqsvyjc94kr0vpandgbikl5cc4zphl7w03"; depends=[glue magrittr readr rstudioapi stringr tibble usethis]; }; bujar = derive2 { name="bujar"; version="0.2-11"; sha256="11g25sa2adlrzvs10k907c1a4anyigqd7lkd337vf8dcwrajqxa9"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; bulkAnalyseR = derive2 { name="bulkAnalyseR"; version="1.1.0"; sha256="008vnkcaa26d8620i1l49mbcr7px5x16s5x2wlq1vm0jkxya4c3z"; depends=[circlize ComplexHeatmap DESeq2 dplyr DT edgeR GENIE3 ggforce ggnewscale ggplot2 ggrastr ggrepel ggVennDiagram glue gprofiler2 magrittr matrixStats noisyr preprocessCore RColorBrewer rlang scales shiny shinyjqui shinyjs shinyLP shinyWidgets stringr tibble tidyr UpSetR visNetwork]; }; + bulkreadr = derive2 { name="bulkreadr"; version="1.0.0"; sha256="0qbh3wsyafdixvwcbff0qajmy2ss6swq5m9kjzcsjai4cxahwbci"; depends=[curl dplyr fs googlesheets4 haven inspectdf lubridate magrittr openxlsx purrr readr readxl sjlabelled stringr tibble]; }; bulletcp = derive2 { name="bulletcp"; version="1.0.0"; sha256="1k7lw8gflih47ncz8hgsj0sxbajnkhz1k7yb7rwbdnzcki3n3jln"; depends=[assertthat dplyr mvtnorm Rdpack]; }; bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; bullishTrader = derive2 { name="bullishTrader"; version="1.0.1"; sha256="0mh6skgkayjsqww4q6rpzhj0n5l3lb9wwh29gy9y08cqd91i02rs"; depends=[]; }; @@ -7108,20 +7112,21 @@ in with self; { bumblebee = derive2 { name="bumblebee"; version="0.1.0"; sha256="055plkcswq7qsy3flkjjq5kqampj9s8dbc3ahzinps6s0jkcv2ad"; depends=[dplyr gtools Hmisc magrittr rmarkdown]; }; bunching = derive2 { name="bunching"; version="0.8.6"; sha256="08rsm2dgqgqr94sw7qijvsqcba4hqp43ci53plzifsa5rr2gwvfl"; depends=[BB dplyr ggplot2 tidyr]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; - bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; }; + bundesbank = derive2 { name="bundesbank"; version="0.1-11"; sha256="1kgc8868vmsmg03yzg3lqpfync4q6xglr2x7ksj5ywddk74axxx0"; depends=[]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bundle = derive2 { name="bundle"; version="0.1.0"; sha256="12ird5bmdcm3hwpzk7gjyldfizj4a9pd37v5ajwy14v4d0jxpn8g"; depends=[glue purrr rlang withr]; }; + bundle = derive2 { name="bundle"; version="0.1.1"; sha256="1b3l14khp6fblb47sy9p5wh78izsbj1xjjj2r55hp2hcx2f1isjz"; depends=[glue purrr rlang withr]; }; bupaR = derive2 { name="bupaR"; version="0.5.3"; sha256="05iaqaa836apv8qb9pfzgih3cf8z78f40wdl759v1gg6pd32h082"; depends=[cli data_table dplyr eventdataR forcats ggplot2 glue lifecycle lubridate magrittr miniUI pillar purrr rlang shiny stringi stringr tibble tidyr]; }; bupaverse = derive2 { name="bupaverse"; version="0.1.0"; sha256="1h79flc3ks23n1ih8vf741akvii3y25hqdl8k479hkhk423pfma2"; depends=[bupaR cli edeaR eventdataR glue magrittr processcheckR processmapR purrr rlang]; }; burnr = derive2 { name="burnr"; version="0.6.1"; sha256="0pgki4inyql8h10i78yzqm73jy2h7rdp9ywsk65virxaadpngy9c"; depends=[forcats ggplot2 MASS plyr reshape2 rlang stringr tidyr]; }; + bursa = derive2 { name="bursa"; version="0.1.0"; sha256="14pjl5l0rh7aap8d2zmsd2spg6521vkkpiigh0jh5ly2cc56zyvr"; depends=[dplyr jsonlite openxlsx readr rvest stringr]; }; bursts = derive2 { name="bursts"; version="1.0-2"; sha256="0cbksnxavkssp3mz80rz0sdvbg21m5yzjn009wclinz12mm1p9rq"; depends=[]; }; busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; - butcher = derive2 { name="butcher"; version="0.3.2"; sha256="07zpacncr2jdirl2s8dp0y1gwr16r00zm843bg5cnn7m52yzqlz6"; depends=[cli lobstr purrr rlang tibble vctrs]; }; + businessPlanR = derive2 { name="businessPlanR"; version="0.1-0"; sha256="19fbyycydivkldj845jsg5xidysiddnxqd4by14v2yyripy8d44j"; depends=[kableExtra knitr]; }; + butcher = derive2 { name="butcher"; version="0.3.3"; sha256="14zf732rcy0f1n0l7km9jx74i0dwqdf864v2510lwpkfblgnw4s7"; depends=[cli lobstr purrr rlang tibble vctrs]; }; butterflyOptions = derive2 { name="butterflyOptions"; version="1.0.1"; sha256="0kmzrk8gqyqrpp4wfsl04cff13m6aiag7d6fbq7kbb6ln8fa6as9"; depends=[dplyr ggplot2 magrittr tibble]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; - bvartools = derive2 { name="bvartools"; version="0.2.2"; sha256="0xbz0z21cz0gazk3jcb67f0bjw2av7y78d3pj6gd2y28vlnrnijw"; depends=[coda Rcpp RcppArmadillo]; }; + bvartools = derive2 { name="bvartools"; version="0.2.3"; sha256="1i3jmp2pgpjwc92bkb4awfmhzrp5173nv9nkw1yn9n8n5p305w6i"; depends=[coda Rcpp RcppArmadillo]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; - bvpSolve = derive2 { name="bvpSolve"; version="1.4.4"; sha256="00ipc4hwbywligz0ds99icjhcwwj45d4wlkiq48f32qjyz0igpfg"; depends=[deSolve rootSolve]; }; bvpa = derive2 { name="bvpa"; version="1.0.0"; sha256="01ymikjbk29vfqh31pd6b0rnh12l26b1mia1l34kh7v81z1b04ai"; depends=[numDeriv]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; }; @@ -7138,7 +7143,7 @@ in with self; { c3net = derive2 { name="c3net"; version="1.1.1.1"; sha256="0xhl6spii8kwyqdc86wbp6zn1727xq7xnscx4ld0a6hgbra348pf"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="1.0"; sha256="1qg73g0g029wkzpmp0fgvyfz8p1k3x38yqx0404cpb3dxj4n4hcg"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; }; cIRT = derive2 { name="cIRT"; version="1.3.2"; sha256="1iwgxc1jl118j9yjhjix9f7dm75sj82iz7ic58g5625fxzdgnw25"; depends=[Rcpp RcppArmadillo]; }; - cNORM = derive2 { name="cNORM"; version="3.0.3"; sha256="0bdhddg7gfa3lxyyi8a970rg3msa90p2kpspmw3kksbiq26i4h3w"; depends=[lattice latticeExtra leaps]; }; + cNORM = derive2 { name="cNORM"; version="3.0.4"; sha256="1qhp59hz9k2yq7rb60v9zv0bfnrfz99dk74v5fbip1wadzcbyrnp"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="1.1.1"; sha256="1h3bp97lqd1jvgnablhxdncmvbf5qwphqbs7xy3r31vpamslz77i"; depends=[]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; cPseudoMaRg = derive2 { name="cPseudoMaRg"; version="1.0.1"; sha256="1mf78pilhx4mqv8n0xrdzn9wkvhnb3bs7rill7n588f18bnjp9mh"; depends=[]; }; @@ -7147,7 +7152,6 @@ in with self; { caROC = derive2 { name="caROC"; version="0.1.5"; sha256="0cklvzfg95yyr37hdfmrna2z6lnhf9f6rrqcjsba1wjmqs8abgsh"; depends=[quantreg RColorBrewer]; }; caRamel = derive2 { name="caRamel"; version="1.3"; sha256="0l83z74q1as4w33vqsbybyz2vkdqgw7y56jkw0s6f36mph8fdpf9"; depends=[geometry]; }; caRecall = derive2 { name="caRecall"; version="0.1.0"; sha256="1ml8cfsi4h8q5f0y3m6s5v8sdldj302ndl75m6f7lagsiiiwhd77"; depends=[httr jsonlite tibble]; }; - caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.18.2"; sha256="14q2ry8gaszjl0m97qg62dxv5bpj6k02qwyi7q2lnxgcmwai3mkm"; depends=[bitops]; }; cabinets = derive2 { name="cabinets"; version="0.6.0"; sha256="1pypn29v91zqncv5kxinfz0f633qmic7n87rf4amjrq83iiid6md"; depends=[cli crayon fs git2r glue R6 renv rstudioapi stringr]; }; cabootcrs = derive2 { name="cabootcrs"; version="2.1.0"; sha256="0aqp8ip0s9raz4minhaw7vcn253xld4dgr957wsl2sp2nd8z66rq"; depends=[colorspace lpSolve]; }; @@ -7159,9 +7163,8 @@ in with self; { caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; calcUnique = derive2 { name="calcUnique"; version="0.1.2"; sha256="012mjayj90m5gsd8mhm2ic00pa0bnrjiidq9mv4vxj8slwp641rz"; depends=[]; }; - calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; }; calculus = derive2 { name="calculus"; version="1.0.1"; sha256="1p80bgg6896z798cx7nwqbwd0rxdv27kamaw1gw0hv4lpqsr7q10"; depends=[Rcpp]; }; - calendR = derive2 { name="calendR"; version="1.1"; sha256="1gji7ns35swdgg7bzq3vrzi4hnb98c5iw6r1j0k7nn2fdx7kbffp"; depends=[dplyr forcats gggibbous ggimage ggplot2 suncalc]; }; + calendR = derive2 { name="calendR"; version="1.2"; sha256="1fkzsibjawshb4i5q941bjjn4yxkj8wcblw5ckmig3s31sjrb1yc"; depends=[dplyr forcats gggibbous ggimage ggplot2 suncalc]; }; calendRio = derive2 { name="calendRio"; version="0.2.0"; sha256="152fb5yaazb2hh99ag1aq675gc5f8xw990w55nkhxqhg6w5p0ln9"; depends=[dplyr forcats gggibbous ggimage ggplot2 suncalc]; }; calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; }; calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; }; @@ -7169,7 +7172,7 @@ in with self; { calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrationband = derive2 { name="calibrationband"; version="0.2.1"; sha256="1m3dp7h9dy1ipji3vinknqyhbw1gbv48473rbhpykps8hzrqg206"; depends=[dplyr ggplot2 magrittr Rcpp rlang sp tibble tidyr tidyselect]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - calidad = derive2 { name="calidad"; version="0.4.0"; sha256="1b64wqfr4zb1r5bjbw5jbhs2yi1w91nv66s57h0fnija839zr9kw"; depends=[dplyr haven kableExtra purrr rlang stringr survey tidyr]; }; + calidad = derive2 { name="calidad"; version="0.5.0"; sha256="170ijr5kxaqwbvv8p1vs3jsld61kflicyycnjy640d28byj4lpmc"; depends=[dplyr haven kableExtra purrr rlang stringr survey tidyr]; }; callr = derive2 { name="callr"; version="3.7.3"; sha256="0knh5yxhxwjz96kbjrq524w4j8cac10k6mghhmblq79s0zgzwysn"; depends=[processx R6]; }; callsync = derive2 { name="callsync"; version="0.0.6"; sha256="1igmmjhgg59lyvb19w3lmdj7l1ji215bi1bn1w4m8rhyb6dw4h1z"; depends=[dplyr oce scales seewave signal stringr tuneR]; }; calmate = derive2 { name="calmate"; version="0.13.0"; sha256="17gfk3am8frj9pqx31pmjswm5nvca9nqbanl0qj4ypsr8wymix7w"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; @@ -7177,47 +7180,46 @@ in with self; { camcorder = derive2 { name="camcorder"; version="0.1.0"; sha256="10w93897708rcbab4l8942h3grlsw822mqkj7hcp1p8fakgnrxkd"; depends=[ggplot2 gifski jsonlite magick rlang rsvg svglite]; }; camerondata = derive2 { name="camerondata"; version="1.0.0"; sha256="0nj9dxwklhqyqrqfq88vpi4mdd6gvd3mzi80h8fi7hjzv5pmgqad"; depends=[]; }; campaignmanageR = derive2 { name="campaignmanageR"; version="0.1.0"; sha256="1x240l0jlyg4ldb4j9pa2v2nryxnyg8y14ywcdcpfnw4056ms3f5"; depends=[jsonlite]; }; - campfin = derive2 { name="campfin"; version="1.0.10"; sha256="0abz6lc83hkpb9y54wyw8rj0qc84lbf9zqrna58ip37lkkm890r7"; depends=[dplyr fs ggplot2 glue httr lubridate magrittr purrr readr rlang scales stringdist stringr tibble]; }; - campsis = derive2 { name="campsis"; version="1.4.1"; sha256="1bazp26czp1xpbydcj8slkx819655wg8yhvppmmzsl04vhibkk9n"; depends=[assertthat campsismod digest dplyr furrr future ggplot2 MASS plyr progressr purrr rlang tibble tidyr]; }; - campsismod = derive2 { name="campsismod"; version="1.0.0"; sha256="0xjy9hri319flbz5c8rsy34c12g5nn3v8casqjl22z1bi3f4r0fz"; depends=[assertthat dplyr magrittr plyr purrr readr tibble]; }; + campfin = derive2 { name="campfin"; version="1.0.11"; sha256="10mry0zn9h6dx79vqxpifn5bnxc9h500x7m3yh1vx4jshbvmgvnk"; depends=[dplyr fs ggplot2 glue httr lubridate magrittr purrr readr rlang scales stringdist stringr tibble]; }; + campsis = derive2 { name="campsis"; version="1.5.0"; sha256="1ipdlp1034qlz3iyiw0fshjfqcg0rxc5vjbqxln3w8pyg862s2mf"; depends=[assertthat campsismod digest dplyr furrr future ggplot2 MASS plyr progressr purrr rlang tibble tidyr]; }; + campsismod = derive2 { name="campsismod"; version="1.1.0"; sha256="0f3pw5v9mjqgf7l9hnwas3w5mh8cx6f8ayiyxwyffh833a7j43dp"; depends=[assertthat dplyr magrittr plyr purrr readr tibble]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; camtrapR = derive2 { name="camtrapR"; version="2.2.0"; sha256="12lhw8r1r3xlazm1w3x73fq3krwpvbv6w3rsmlmksaai4nxp2fn8"; depends=[data_table generics ggplot2 lubridate overlap secr sf sp]; }; canadamaps = derive2 { name="canadamaps"; version="0.1"; sha256="1i3yjhr5p06k6id3gws5dzdhf4jy143brbfhi2z4srq67xlz5agl"; depends=[dplyr magrittr rlang rmapshaper sf]; }; canadianmaps = derive2 { name="canadianmaps"; version="1.3.0"; sha256="1sk2jf0brlz1bq3xjniif51zlhglgw83ffznkvnqnbcvcbh5ha96"; depends=[dplyr ggplot2 ggrepel RColorBrewer sf sp]; }; canaper = derive2 { name="canaper"; version="1.0.1"; sha256="12is3x3srmdf39csf8q09n2377h9my2qwy0knwc3kfjdg6f9yzs7"; depends=[ape assertr assertthat dplyr future_apply phyloregion progressr purrr tibble vegan]; }; - cancensus = derive2 { name="cancensus"; version="0.5.5"; sha256="1cvb7v2v4hsy97m67369xxscb5a9igszsvif9b4d60ngh4j51a0z"; depends=[digest dplyr httr jsonlite rlang]; }; - cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; + cancensus = derive2 { name="cancensus"; version="0.5.6"; sha256="0alvwl6jy86rqqw77j0wq0xvw9c52k7w6lxa7f79l5zc87ql6709"; depends=[digest dplyr httr jsonlite rlang]; }; + cancerGI = derive2 { name="cancerGI"; version="1.0.1"; sha256="1cbpxw6l09sdnf6nyw0hvhrc97awnidi72a2jsjf3v8ml012xd5f"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.8-6"; sha256="17bhh3jgaq5hrlwaapwpsgk7f8a3sg2cmrjd1hgfxxx0z30a6icn"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="1.1.2"; sha256="1lwlgzy0gxp7jrak838awmqz3w0x7qd51bkyhydb1s61073w77x8"; depends=[CHNOSZ MASS rmarkdown xtable]; }; - cansim = derive2 { name="cansim"; version="0.3.14"; sha256="070mgphg2hvfccqqnkimfgf2j81b3vd6cn2ymanfm4n8gd6bwjjs"; depends=[DBI digest dplyr httr jsonlite purrr readr rlang RSQLite rvest stringr tibble xml2]; }; + cansim = derive2 { name="cansim"; version="0.3.15"; sha256="1311yikp636r1681vkcn0phmpx3a773i9d7yp748z8845r4jdcy3"; depends=[DBI digest dplyr httr jsonlite purrr readr rlang RSQLite rvest stringr tibble xml2]; }; canvasXpress = derive2 { name="canvasXpress"; version="1.45.4"; sha256="1a67zz85c9k8ypyjlbzaz4p36lrb20c6vav453pka676p7ff7s5p"; depends=[htmltools htmlwidgets httr jsonlite]; }; canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.34.2"; sha256="10fdlb1yp5x9533jdammncfrrlxzpcz9as8i0209pwzjywvxby3s"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; cape = derive2 { name="cape"; version="3.1.1"; sha256="0srgajj77a66pxj4kghjv4hjswv8arfmxbq25mpccc0fzalz1zlp"; depends=[abind caTools corpcor doParallel evd foreach here igraph Matrix pheatmap pracma propagate qtl qtl2 qtl2convert R6 RColorBrewer regress shape yaml]; }; - caper = derive2 { name="caper"; version="1.0.2"; sha256="1cf2z9npwi6rc18w63x66as7zdlzjxpny5pvd9jssb1yk24bggmw"; depends=[ape MASS mvtnorm]; }; + caper = derive2 { name="caper"; version="1.0.3"; sha256="1f1mw54gv1r40wrrsznhgffdj8ggrwihiwdd8wyqccyvqm49fxjg"; depends=[ape MASS mvtnorm]; }; capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; }; capl = derive2 { name="capl"; version="1.42"; sha256="0w0w8m4pcclmmk56cad3f2zdfxd5vh312aja8g0c59s9n1hkdw56"; depends=[dplyr ggplot2 lubridate magrittr readxl stringr writexl]; }; caplot = derive2 { name="caplot"; version="0.2"; sha256="1dj62x7ibigrmrrnq3hxpc1rfq30zmng4qcki0k6ylil5gr3k0ii"; depends=[ca ggplot2 ggrepel]; }; capm = derive2 { name="capm"; version="0.14.0"; sha256="0c3rnc1qd9c4v0jj8ihg6bdhpqvfnpafkqyqkar6fwnlvgw48z83"; depends=[circlize deSolve dplyr FME ggplot2 magrittr sf survey tidyr]; }; capn = derive2 { name="capn"; version="1.0.0"; sha256="14vfk00xyx0az3whmxjpcv1785lf0gx81w7qc54i3wcfp3i22kcr"; depends=[]; }; - captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; }; captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; car = derive2 { name="car"; version="3.1-2"; sha256="1j3l8r3j05769gdfrqz0n38xviq6pww1cjrgdd0fkj3sjy8k89l9"; depends=[abind carData lme4 MASS mgcv nlme nnet pbkrtest quantreg scales]; }; carData = derive2 { name="carData"; version="3.0-5"; sha256="06j52rpbqi6fj7chfjwjbwbr6slrbb7i3aygv66gnfiyndcp3rq2"; depends=[]; }; carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; - caracas = derive2 { name="caracas"; version="2.0.0"; sha256="15ab0j5hvxlc9msb2xf9nxxdc2crrdsbwi5x3hvqfxs5yydj6wcj"; depends=[doBy magrittr Matrix reticulate]; }; - carat = derive2 { name="carat"; version="2.2.0"; sha256="1hdh96plf0cyhsijzfm7ydc24yf497wadcn91p7b2s1s42makzkn"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; + caracas = derive2 { name="caracas"; version="2.1.0"; sha256="07dka3j34k0sdvfnga0vv2cb1qvrp5j6d48ngy6cdbnxlmh34k48"; depends=[doBy magrittr Matrix reticulate]; }; + carat = derive2 { name="carat"; version="2.2.1"; sha256="0h7l448b9vxmfdvi3zq3xgzprh0nrwvm1c2bg9d4yfbz92y2ndfc"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; carbonate = derive2 { name="carbonate"; version="0.1.4"; sha256="01k8c49v8ybgcwdr9ipw319lxw4p14w9bzl54j1ljbajdzgzcgwk"; depends=[clipr details httpuv httr jsonlite magick R6 RSelenium rtweet wdman yaml]; }; - carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; + carcass = derive2 { name="carcass"; version="1.7"; sha256="09l9yk7knfjhrcpwfwmgla9ghnpg1b10aljmdl70j5kxdiafkfn7"; depends=[arm expm lme4 MASS survival]; }; card = derive2 { name="card"; version="0.1.0"; sha256="1api0j06fp5av5a48vnnm1wvwdcskynf0xsj9pb41njxdh9v8daf"; depends=[broom data_table dplyr generics ggplot2 ggrepel hardhat Hmisc lubridate lutz magrittr purrr readr recipes rlang sf stringr survival tibble tidyr]; }; - cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; }; + cardidates = derive2 { name="cardidates"; version="0.4.9"; sha256="0b52cmg870s6icq53c6v6zjgz6w1pv02p83r8k4q0sksq5fy0ik4"; depends=[boot lattice pastecs]; }; care = derive2 { name="care"; version="1.1.11"; sha256="0897v6acxf1myncd507by8zp7aga77pschyix1m4fzgpc6z35vlm"; depends=[corpcor]; }; - careless = derive2 { name="careless"; version="1.2.1"; sha256="1zlkzrc9fw926knj6w7flv4q0w29k4aichawvprk94rk1bnrvdz5"; depends=[psych]; }; + careless = derive2 { name="careless"; version="1.2.2"; sha256="1ncfcz5zznchcj4ndfhk9lb72l766yzsiicq5ry0m4djn74d9lva"; depends=[psych]; }; caresid = derive2 { name="caresid"; version="0.1"; sha256="1mrnvg6dl1344j880ngw9hxfg5rc82ljv25ahc1pqgs0ji8v5di2"; depends=[ca ggplot2 ggrepel]; }; caret = derive2 { name="caret"; version="6.0-94"; sha256="1a191n9qswvf8ri6id8picqgdqx15l6mp996v6f77fv0l8yfh597"; depends=[e1071 foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; - caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.2"; sha256="0kagw1ilfz1yy1q0ysmkp3f13k08hiq84xk7d0xp5p7d5dsg7z6q"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; + caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.3"; sha256="14d318czpqpalf18ggd9mx6f4nz3r4zilljvgxzy2a8v450y96ch"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; caretForecast = derive2 { name="caretForecast"; version="0.1.1"; sha256="0z8r64cb3w0m5a7khysvfmnf1ywa7svi5lvxiwx1a6j6868zbxlr"; depends=[caret dplyr forecast generics magrittr]; }; carfima = derive2 { name="carfima"; version="2.0.2"; sha256="1n68jqn42m54xn7jq8qywrpnvggrcsgvgnlqg6nw0pgiplbkynih"; depends=[DEoptim invgamma mvtnorm pracma truncnorm]; }; cargo = derive2 { name="cargo"; version="0.4.9"; sha256="0r1c9cklnagan37kinblwvm3icq7krmyqwx9x6iss1br0a4580ch"; depends=[]; }; @@ -7225,11 +7227,11 @@ in with self; { caroline = derive2 { name="caroline"; version="0.9.0"; sha256="1j1s4jli3pjl815fhmhz063y8aimz1qr14gacf9rvs7hyandlcbj"; depends=[]; }; carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; }; carrier = derive2 { name="carrier"; version="0.1.1"; sha256="155zna5bv6ybb6hr3lsv8dn67lkbbvn3dbihfw2s6ajkzvms9x13"; depends=[lobstr rlang]; }; - cartograflow = derive2 { name="cartograflow"; version="1.0.3"; sha256="09n3pgm70frrx9li1djrwkf4lzcq9c1xjs037vmsb1as0xvd19a1"; depends=[dplyr ggplot2 igraph maptools plotly reshape2 rgeos rlang sf sp]; }; + cartograflow = derive2 { name="cartograflow"; version="1.0.5"; sha256="0bfw04wjd7bghw08ynnfc43yh80vhg9vpmd8qsx328860f1q5vw6"; depends=[dplyr ggplot2 igraph plotly reshape2 rlang sf]; }; cartogram = derive2 { name="cartogram"; version="0.3.0"; sha256="1vkcp8k9ajrnm14p2fqrcb4vk67503zd0w51h8amcljg3p21wzkl"; depends=[packcircles sf]; }; cartogramR = derive2 { name="cartogramR"; version="1.0-9"; sha256="0j8xa11g3m9sp2vcx0z6lk6cpdd8f83r2qx1ibcz28h5s6nmvn69"; depends=[data_table sf]; }; cartographer = derive2 { name="cartographer"; version="0.2.0"; sha256="0il0wc5mlz9qrb0lsbvcn4ha11wmm7hy40gbhvv86rfmh2jpp5nk"; depends=[cli dplyr rlang sf]; }; - cartography = derive2 { name="cartography"; version="3.1.3"; sha256="1b0qj3sj6aycrxjh54and8r3nqdpcc1vi1m4ljhv8dy0f266kjn6"; depends=[classInt curl png raster Rcpp sf sp]; }; + cartography = derive2 { name="cartography"; version="3.1.4"; sha256="1sww3n7glkzrpf1ki31z8309qr5496m1rm5gj3cprwif8fxfyjx5"; depends=[classInt curl png raster Rcpp sf sp]; }; casabourse = derive2 { name="casabourse"; version="2.0.0"; sha256="1s7zp44cmfnq4l9rzydqpnv9s2z4v7bvng8diz3bhzkg2zhpglnq"; depends=[gsheet R_utils RJSONIO rvest]; }; cascadeSelect = derive2 { name="cascadeSelect"; version="1.1.0"; sha256="1hb8h0v7c76jbhqp713wkmx278q9calpg1rwgdhbrdbq6caldhq7"; depends=[fontawesome htmltools reactR shiny]; }; caschrono = derive2 { name="caschrono"; version="2.3"; sha256="06q327cqa0hb0q60zyyj6r7ydcw9big597nwmmhb8px9j9d4pxdr"; depends=[Hmisc zoo]; }; @@ -7240,13 +7242,13 @@ in with self; { casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; cassowaryr = derive2 { name="cassowaryr"; version="2.0.0"; sha256="1gk54haciy3vj7xj6cji1v90xh7g8790zq1rykyispx09jr2dpx3"; depends=[alphahull dplyr energy ggplot2 igraph interp magrittr progress splancs tibble tidyselect]; }; - castor = derive2 { name="castor"; version="1.7.10"; sha256="0mmbky96jffqp2hfa50v28g7qc0mhsylasc2cbf2b5rb454blckq"; depends=[Matrix naturalsort Rcpp RSpectra]; }; - cat = derive2 { name="cat"; version="0.0-7"; sha256="1a5csycaddg7cmfn51sw520b9bbpp07a08hsi2f6lpzqiszhczj1"; depends=[]; }; + castor = derive2 { name="castor"; version="1.7.11"; sha256="1cxjgwbsacjcc10qdch6pndjxqnk20hhamxqg0lckszvkyb67yn3"; depends=[Matrix naturalsort Rcpp RSpectra]; }; + cat = derive2 { name="cat"; version="0.0-9"; sha256="1wz6mbjzx03267yrszjimcd8yi82z2nfwyvz6l1ry2l300hv2qfs"; depends=[]; }; cat2cat = derive2 { name="cat2cat"; version="0.4.6"; sha256="1hc656848fhkgdyi7jrnahyqfzlmkrbpinv89k169i46gvs6011x"; depends=[MASS]; }; catIrt = derive2 { name="catIrt"; version="0.5.1"; sha256="1wagk9f9mvf3b5yvwpas9yqjzpcp786d37wn71jj1af0khry8k62"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.17"; sha256="178pq6cy3kjpd7mpaky2y8f18561gsf727y0y6rmgm2bn71p2i76"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.5.0"; sha256="0jw7jlam7d44g9sbwmxckm4mywhky2a6h1w5w849g47p7mvi32dc"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; - cata = derive2 { name="cata"; version="0.0.10.9"; sha256="1226la2gm0r5wayharpmgm6lm7nr681xnzc0rpk8p39wwdyixmmr"; depends=[]; }; + cata = derive2 { name="cata"; version="0.0.10.12"; sha256="09sir9j942arrv9vhf8fd22h9sdf6hn6n26nj4wnx5xdm1b51yy2"; depends=[]; }; catalog = derive2 { name="catalog"; version="0.1.1"; sha256="1j43c34qdklv8pskaidq5fxrygv9lngamdcrkij9c844qj7iff14"; depends=[dplyr sparklyr]; }; catch = derive2 { name="catch"; version="1.0.1"; sha256="1a63d1a6pzzirdzswngjj036jmg41hbiadwriws7k05qp95jdh6a"; depends=[MASS Matrix tensr]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; @@ -7262,12 +7264,12 @@ in with self; { cats = derive2 { name="cats"; version="1.0.2"; sha256="0snc5vrf8qm53yd42gskhnpp6lfgfkldgpjj3jbcry0wpbfc0dv0"; depends=[doParallel dplyr epitools forcats foreach ggplot2 mvtnorm openxlsx plotly purrr tidyr zoo]; }; catseyes = derive2 { name="catseyes"; version="0.2.5"; sha256="11n2kxkqv4hqymkj6lkpcvhq6325q8f5w384xf8zb71jl8vx616l"; depends=[]; }; catsim = derive2 { name="catsim"; version="0.2.3"; sha256="1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g"; depends=[Rcpp testthat]; }; - cauchypca = derive2 { name="cauchypca"; version="1.0"; sha256="1325cr6799ky3hxvhkb30xjq9pvk1wsm3rj0y11slwhs33hvl621"; depends=[doParallel foreach Rfast]; }; - causact = derive2 { name="causact"; version="0.4.2"; sha256="059s70q7pdhbym2aj8ww35j6iv9n3am4nh7ywqg41ahyhc7mm9k0"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph lifecycle magrittr purrr rlang rstudioapi stringr tidyr]; }; + cauchypca = derive2 { name="cauchypca"; version="1.2"; sha256="0zrxrbzdfkdjqa02ba7d3mjlfbq84464k8c5ja15xqgmgpvsd1x3"; depends=[doParallel foreach Rfast]; }; + cauphy = derive2 { name="cauphy"; version="1.0.1"; sha256="1bip2waavlk32waiz5q0f13wnzddhjj6ijhnkbk49nxvzi9m3a87"; depends=[ape doParallel foreach HDInterval nloptr phylolm pracma robustbase]; }; + causact = derive2 { name="causact"; version="0.5.3"; sha256="1ax5nhrdkfcflqsif8r4dbyj0n68kd7yz7bfq8yk8z52vpkbh4is"; depends=[cowplot DiagrammeR dplyr forcats ggplot2 igraph lifecycle magrittr purrr reticulate rlang rstudioapi stringr tidyr]; }; causal_decomp = derive2 { name="causal.decomp"; version="0.1.0"; sha256="12iy64dnb91l47vai9qawlwvg17x5amqg0kdj8npk1mgzm2zfz4j"; depends=[CBPS MASS nnet PSweight spelling SuppDists]; }; causalCmprsk = derive2 { name="causalCmprsk"; version="2.0.0"; sha256="079wr4w30153hxvk2q9ki19h54p8vyvc1y6ka8j5vk6rcf8gmg5l"; depends=[data_table doParallel foreach inline purrr survival]; }; causalDisco = derive2 { name="causalDisco"; version="0.9.1"; sha256="1lni0y76prhvw60m0awwgmfadwlv1ciywlr85sr8ig2vaxf1smh9"; depends=[clipr gtools igraph pcalg RColorBrewer scales]; }; - causalOT = derive2 { name="causalOT"; version="0.1.2"; sha256="04j546sg4b1alq71xaxkh5hqckvqzcyz3nihgdnnxw60gmd4yal6"; depends=[approxOT BH lbfgsb3c loo Matrix matrixStats osqp pbapply R6 Rcpp RcppEigen reticulate RSpectra sandwich]; }; causalPAF = derive2 { name="causalPAF"; version="1.2.5"; sha256="1hgixasanddxs9y1l45qmx5chhq0ri6npvzqwazjkk61byl2wj6c"; depends=[checkmate dagitty dplyr forestplot ggdag ggplot2 gridExtra magrittr MASS reshape2 rlist]; }; causaldata = derive2 { name="causaldata"; version="0.1.3"; sha256="1v5apihm9005j1kf3p1d28v6jaqx87ryc43kjhwd5mvvm10rmflc"; depends=[tibble]; }; causaldrf = derive2 { name="causaldrf"; version="0.4.2"; sha256="1dvgvzg7cyjzb8x3gxa7n6bnh34q7rps6f1xks1s0b3gjf53hvbp"; depends=[mgcv survey]; }; @@ -7281,7 +7283,7 @@ in with self; { cbass = derive2 { name="cbass"; version="0.1"; sha256="1x7k9srf2jgjhlha9fjm7rfcd9msk05nxa3p7657ns8y2v12s0nq"; depends=[]; }; cbcTools = derive2 { name="cbcTools"; version="0.5.0"; sha256="07has80n7n23y2y3shalps1hkw1r8f4fld1r48g42fdrwkhhf6jw"; depends=[AlgDesign DoE_base fastDummies ggplot2 idefix logitr MASS randtoolbox rlang]; }; cbinom = derive2 { name="cbinom"; version="1.6"; sha256="1vi2kjlss4fmra1h8r6xgk4y66gzpdp61hcyzby2rqji93sib195"; depends=[Rcpp]; }; - cbioportalR = derive2 { name="cbioportalR"; version="1.0.1"; sha256="01gfzghfww4dfc6sliy4vfxjghncchlyn1f37prbjbvfx921v7xp"; depends=[cli dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr]; }; + cbioportalR = derive2 { name="cbioportalR"; version="1.1.0"; sha256="0vr8sjp2fkz24zcws6i46kmswf30yj147y3108i6sk7ncc2mavr5"; depends=[cli dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr]; }; cbl = derive2 { name="cbl"; version="0.1.3"; sha256="1wgc9nsc875s2h583gigh9hyr9d15dp35rnmb1znwqy11jrswbw3"; depends=[data_table foreach glmnet lightgbm]; }; cbq = derive2 { name="cbq"; version="0.2.0.3"; sha256="12ix60mvs4rlh3376m6qcq5zslng1925hrsz5byddfdjx5wilyv7"; depends=[BH Formula Rcpp RcppEigen rstan rstantools StanHeaders]; }; cbsodataR = derive2 { name="cbsodataR"; version="0.5.1"; sha256="02dalankaa4lfv9r7bc9cphmwb0mq6an7bs44rihipj8dsjd0v9y"; depends=[jsonlite whisker]; }; @@ -7299,6 +7301,7 @@ in with self; { cclust = derive2 { name="cclust"; version="0.6-26"; sha256="0mwqna3751lff5n6bb0k09r7qwh0mpwdxgq68wd4wkl6l5akrv4j"; depends=[]; }; ccmEstimator = derive2 { name="ccmEstimator"; version="1.0.0"; sha256="1z53i7d2x1g93zskcyj93hxjyrvc9sjqmq887zaflwf22ikxvm6p"; depends=[]; }; ccmReportR = derive2 { name="ccmReportR"; version="0.1.0"; sha256="0jxxz26f0azp9xafqilvbbfhzn4ys8q4pf4c8bbnmwwbckmjajxm"; depends=[dplyr httr jsonlite keyring lubridate purrr rlang tibble]; }; + ccml = derive2 { name="ccml"; version="1.4.0"; sha256="1njd8fi5n7zi0a7cadxqqlc7cpmqjqqp42ig6q13n8d7a542dacl"; depends=[ConsensusClusterPlus diceR ggplot2 plyr SNFtool tidyr]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccoptimalmatch = derive2 { name="ccoptimalmatch"; version="0.1.0"; sha256="0a5a036iahzag5rwcrjnf7xvvyfgjcx4xdsy1xzrxxndvkjifwqw"; depends=[dplyr rlang]; }; ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; }; @@ -7308,12 +7311,12 @@ in with self; { ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; }; cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; cd = derive2 { name="cd"; version="0.1.0"; sha256="1zzhkrsidny5h6jvbip2a4i4klqdgw7s1w8h8hkc3mpbxjfr615r"; depends=[]; }; - cdata = derive2 { name="cdata"; version="1.2.0"; sha256="0n1abljjvbmbgi9i8k7vbma92r21w50rz6jys39gq62hy3qr6vzl"; depends=[rqdatatable rquery wrapr]; }; + cdata = derive2 { name="cdata"; version="1.2.1"; sha256="1qsxaxj21p2avbnqcgzn9pkrg6i413vcx4mwhkw39jb91sgml9l2"; depends=[rqdatatable rquery wrapr]; }; cdcatR = derive2 { name="cdcatR"; version="1.0.6"; sha256="168gs1v1a6pcz63q3hb1dc4mlllr38j91m91phb75np8hxfz2k2v"; depends=[cdmTools cowplot doSNOW foreach GDINA ggplot2 NPCD]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.9.4"; sha256="1b8x66vf34hh8r1fdk16kwcmrzw34z64fvaax7ypiihc9xf1askp"; depends=[dplyr httr jsonlite MMWRweek progress purrr readr sf tibble units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; }; cder = derive2 { name="cder"; version="0.3-1"; sha256="0h44yifiy0fqrmfpri0had1ps5d1jj1dgwllha5ng04rjwlvxpzz"; depends=[curl dplyr glue lubridate readr stringr]; }; - cdfquantreg = derive2 { name="cdfquantreg"; version="1.3.1-1"; sha256="1qznl0csyh8l7kjr9i58lk0ifrfwkbp6zhrivb5kpg8mwsds9nv5"; depends=[Formula MASS pracma]; }; + cdfquantreg = derive2 { name="cdfquantreg"; version="1.3.1-2"; sha256="1abbr14fqn56c4yqrz1qbzq03xl5qi6px29wljd3yzysypvh9his"; depends=[Formula MASS pracma]; }; cdgd = derive2 { name="cdgd"; version="0.3.2"; sha256="04sx3yn4irmsadqripb4qdph6i2p4zy3gjjgvpmwny852li9h6cd"; depends=[caret]; }; cdlTools = derive2 { name="cdlTools"; version="0.15"; sha256="1p5d48v6nwlrgqqi0sg98zfhiycjcha6g12a7515xrvp6f5p28jn"; depends=[httr raster]; }; cdlei = derive2 { name="cdlei"; version="1.0"; sha256="1zsgryrwr1nqhcyizrh67lm953b87ih9l4rvc6i59s4vg2ph1ph1"; depends=[]; }; @@ -7341,11 +7344,11 @@ in with self; { censReg = derive2 { name="censReg"; version="0.5-36"; sha256="0r8pyscsw3m8lf6mx70sjk70k7i1jfjkk2qzq19m85q3byx447n6"; depends=[glmmML maxLik miscTools plm sandwich]; }; censable = derive2 { name="censable"; version="0.0.5"; sha256="15p4ggnkcddm2lglf798bcjghppx0pqzc8nyljyiw0hwsw14c7yg"; depends=[censusapi dplyr magrittr memoise purrr rlang sf stringr tibble tinytiger]; }; censo2017 = derive2 { name="censo2017"; version="0.6.2"; sha256="0rj3a9i6faqsrx641p1nacdprfnzp8q45khpdrakmfnc7l40xh87"; depends=[cli crayon DBI duckdb httr purrr rstudioapi tibble]; }; + censobr = derive2 { name="censobr"; version="0.2.0"; sha256="0xfgp1shw4c42mhan3q4kcbkr84vry7ks612qih2p1vjnsyc22zi"; depends=[arrow checkmate dplyr httr]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; censored = derive2 { name="censored"; version="0.2.0"; sha256="1ps5f32047b1yyagk6v8b8p7wq7pi3nsygz2mmirbi0ps31d43l6"; depends=[dials dplyr generics glue hardhat lifecycle mboost parsnip prettyunits purrr rlang survival tibble tidyr]; }; censusapi = derive2 { name="censusapi"; version="0.8.0"; sha256="1wswd6kmb0fbyc3zs3q3dhhaa1la1z5alz4vg485ac9wacnab60r"; depends=[httr jsonlite]; }; censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; }; - censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; centrifugeR = derive2 { name="centrifugeR"; version="0.1.7"; sha256="078rm1i1qqx15qj75yajc11zfsnp6mcb391v5vc0dl03xjzsiz7q"; depends=[pracma shiny shinythemes]; }; @@ -7362,9 +7365,8 @@ in with self; { ceterisParibus = derive2 { name="ceterisParibus"; version="0.4.2"; sha256="0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif"; depends=[DALEX ggplot2 gower knitr]; }; cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; cfbfastR = derive2 { name="cfbfastR"; version="1.9.0"; sha256="0b5zagk5nwmq5gn3m3sva8ns7pbp5iqhkyfcwv3xf95qbshvpz6b"; depends=[cli data_table dplyr glue httr janitor jsonlite magrittr mgcv nnet progressr purrr Rcpp RcppParallel rlang stringr tibble tidyr]; }; - cfda = derive2 { name="cfda"; version="0.10.1"; sha256="0v81wgqkp48gf11nxpg1dfj93qk55n8d7mfc1cyymkkhxzzdar44"; depends=[diagram fda ggplot2 mgcv msm pbapply]; }; + cfda = derive2 { name="cfda"; version="0.11.0"; sha256="03w2vfgjf29qn40slqfpd54dmvzql53lc9j7n51ggg7bjchrg2x0"; depends=[diagram fda ggplot2 mgcv msm pbapply]; }; cfdecomp = derive2 { name="cfdecomp"; version="0.4.0"; sha256="0g61gpihk5kbbrqzn15fqjv3bawsq1vq3sdssbzs5j96afmf2aq8"; depends=[]; }; - cffdrs = derive2 { name="cffdrs"; version="1.8.20"; sha256="0x2gzqcif79hkrchx50j5yvxwwpgv8g8bxisfsa1xd7sja609hw7"; depends=[data_table doParallel foreach geosphere raster rgdal]; }; cffr = derive2 { name="cffr"; version="0.5.0"; sha256="0cx1fzhy190fbk4sk1a9c3rh2dli0b9r2q6h5wqm4dmv6ks4banx"; depends=[cli desc jsonlite jsonvalidate yaml]; }; cfid = derive2 { name="cfid"; version="0.1.4"; sha256="1jd66vy71b5y4ng4k5ln08cm0pa1xrzd9in1l4d1qq4cnw5qa724"; depends=[]; }; cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; }; @@ -7375,21 +7377,18 @@ in with self; { cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; cgaim = derive2 { name="cgaim"; version="1.0.0"; sha256="0bi8rmykgynkkbpkvm3n9ihl8x41n4msgz17ilwpa1xw9lf3pcj6"; depends=[cgam coneproj doParallel foreach gratia limSolve MASS Matrix mgcv osqp quadprog scam scar TruncatedNormal]; }; cgal4h = derive2 { name="cgal4h"; version="0.1.0"; sha256="0ghcwjfqlhqysnl8mgz6zp7dyqh8pvnpvphwjwk6zqi24n3nhac2"; depends=[]; }; - cgalMeshes = derive2 { name="cgalMeshes"; version="2.2.0"; sha256="09iq6v5xizf0y3qzr7lkbwck8yh8rhbvr8c3m5gw95rs056njmj8"; depends=[BH data_table onion R6 Rcpp RcppCGAL RcppColors RcppEigen rgl]; }; - cgalPolygons = derive2 { name="cgalPolygons"; version="0.1.1"; sha256="13gj0wkpcs51zpvas8rai8wk0wpvmkz91x9r99qfaz4fwzq692aj"; depends=[BH R6 Rcpp RcppCGAL RcppEigen]; }; - cgam = derive2 { name="cgam"; version="1.20"; sha256="0mrd574zyajs46wgdyyly3vxpbpnvp5p8m4n1hsqyrjn6ba3lws4"; depends=[coneproj lme4 Matrix statmod svDialogs]; }; + cgam = derive2 { name="cgam"; version="1.21"; sha256="0dsiwam9fgvri14hznnplxcjj0f8ibi8vf64wryq3pcvi41di082"; depends=[coneproj lme4 Matrix statmod svDialogs]; }; cglasso = derive2 { name="cglasso"; version="2.0.6"; sha256="1pfrrm7pkg31c0y7rnxy3h1brqksbqif8xkd2qx2kjnz5vh279ai"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; - cgmanalysis = derive2 { name="cgmanalysis"; version="2.7.6"; sha256="0vs7n77p4midyfm8ng0sjanalvb9b7qgzhn6gazh51wjzczg759n"; depends=[ggplot2 lubridate parsedate pastecs pracma readr readxl XML zoo]; }; + cgmanalysis = derive2 { name="cgmanalysis"; version="2.7.7"; sha256="19kvxbg4vs7bfs3y1bfvhklwr22kba46aiwsns58g7h9b88m4kw7"; depends=[ggplot2 lubridate parsedate pastecs pracma readr readxl XML zoo]; }; cgmquantify = derive2 { name="cgmquantify"; version="0.1.0"; sha256="11pw1layzx9a8qy7n06nyc59mi5r07krhxw6hhybbqkdglzp511w"; depends=[dplyr ggplot2 hms magrittr tidyverse]; }; cgrcusum = derive2 { name="cgrcusum"; version="0.1.0"; sha256="1pmni0bw7yp8alqyd88ysl858jkp926my2c5g6z31izzyih29s0z"; depends=[ggplot2 survival]; }; - cgwtools = derive2 { name="cgwtools"; version="3.3"; sha256="1dl9ghwfzjrl5pd6izy4c5qyfq2s8ywnqh97y1bhwmcw2qwb4ci6"; depends=[gmp]; }; + cgwtools = derive2 { name="cgwtools"; version="4.1"; sha256="0nw9zmbx3d7jqvw0yjqnqxnk16fay5pg4hws6qk341ipixwfmcbf"; depends=[gmp]; }; ch = derive2 { name="ch"; version="0.1.0.2"; sha256="1ryh2xr1ix4qznq1svi4gdr4qy6v6rg597z2zl6zw32s2xq6ssx6"; depends=[clipr crayon ggplot2 magrittr MASS polynom pracma Ryacas]; }; chameleon = derive2 { name="chameleon"; version="0.2-3"; sha256="0a3azp0zaakpqqx0pp94hkj3vgb2apnf8gb5ga0as4i8lrn9dz8i"; depends=[clue ggplot2 umap]; }; - chandwich = derive2 { name="chandwich"; version="1.1.5"; sha256="1i3gg3ib4j33i5f3a6x9k2g8d5ccbdmv2pb2bdhiwwsjy8bfmsvq"; depends=[numDeriv]; }; - changeRangeR = derive2 { name="changeRangeR"; version="1.0.2"; sha256="06i4r6ylwq551lm2l7mg2av1l04ijwrj2d8y0avdf1c83spir7dy"; depends=[dplyr phylobase rangeModelMetadata raster rgeos sf sp]; }; + chandwich = derive2 { name="chandwich"; version="1.1.6"; sha256="03qcqw9xx8mw7hymjl3ym6l1adgw5ssv0pmcmdv2hk230mx2fsld"; depends=[numDeriv]; }; changepoint = derive2 { name="changepoint"; version="2.2.4"; sha256="16v4p2c9zi2w3anwf5y9snl5dy1g5aidiqz1vn2p64qhfvg6yqxc"; depends=[zoo]; }; - changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; + changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.2"; sha256="0zwj4wwwh99diz0vn5f06ygs93afahnn5glvab2k7wgk2qyf5jgq"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; changepoint_influence = derive2 { name="changepoint.influence"; version="1.0.1"; sha256="03m7vyqy0qdvkrr0cgxc2g019rjkmsc0fwnzkp2gxbbhvwhs4qzd"; depends=[changepoint data_table ggplot2 gridExtra reshape]; }; changepoint_np = derive2 { name="changepoint.np"; version="1.0.5"; sha256="1kyj1z0mmbk1i71d5xxw8h3468afvwlqma659yjck3y5dszb1vn9"; depends=[changepoint Rdpack zoo]; }; changepointTests = derive2 { name="changepointTests"; version="0.1.1"; sha256="0sbs9sl4p4l3h9ih007p166slayfj66ppqw01xxkxcdqciqw0ra0"; depends=[doParallel foreach]; }; @@ -7397,31 +7396,34 @@ in with self; { changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; }; changer = derive2 { name="changer"; version="0.0.5"; sha256="02pn96gx98h00kl08zfza9mdxq1ra6f9l5mgfnrvyrjhz3a5d2kh"; depends=[available devtools git2r]; }; chantrics = derive2 { name="chantrics"; version="1.0.0"; sha256="0123mbdr4bkkp8w9w15bg9qxkbpd6nyp602fw690zsy1dyimm78k"; depends=[AER chandwich lmtest progress purrr rlang sandwich]; }; - charlatan = derive2 { name="charlatan"; version="0.5.0"; sha256="1acig89x3lzq5q0x8dvwpjgcy9ix6f2s5y0qq4y2mrwzk6bk40jh"; depends=[R6 tibble whisker]; }; + charlatan = derive2 { name="charlatan"; version="0.5.1"; sha256="1f83yrvc0qnxlvcpl41718vv3c26x131q285c1mgys1xwk3s97s7"; depends=[R6 tibble whisker]; }; chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; }; + chatAI4R = derive2 { name="chatAI4R"; version="0.2.10"; sha256="0iil1bl6l89lckxh4bdxjnjnww2h8q4gd83b29rbw4xfa1mlb8rb"; depends=[assertthat clipr crayon deepRstudio future httr igraph jsonlite pdftools rstudioapi rvest xml2]; }; chatgpt = derive2 { name="chatgpt"; version="0.2.3"; sha256="1a71rzim5x40lnb7pc5n0b9j56kg96cjw7x4liqkbn84n61db6ff"; depends=[clipr httr jsonlite miniUI rstudioapi shiny]; }; cheatsheet = derive2 { name="cheatsheet"; version="0.1.2"; sha256="0nhyz354hxnqbs3iwvaisssr4ciq6vary3ldkm8yanpdyw0p1k27"; depends=[cli crayon fs git2r magrittr purrr rstudioapi]; }; checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkdown = derive2 { name="checkdown"; version="0.0.7"; sha256="1bjij565vss2x8xbgq5qxx1d1snfw9wnphj0jhbm6vxxh2hg6g46"; depends=[knitr markdown]; }; + checkdown = derive2 { name="checkdown"; version="0.0.11"; sha256="1yg3718za5qzbya3yycwmz59w4g6a88nkhdxf7s60shh5isks8w9"; depends=[glue htmltools markdown]; }; checker = derive2 { name="checker"; version="0.1.3"; sha256="1n9gwgbkr2h6gna7nj18nv8bj2f9i2zyp407f4c4vj6f1pzj00ik"; depends=[cli rstudioapi yaml]; }; checkglobals = derive2 { name="checkglobals"; version="0.1.0"; sha256="1jcpga1bx8cx6fdf1ddjkfk7ap5dvm03g5xkni7as5bisggsp4jv"; depends=[]; }; checkhelper = derive2 { name="checkhelper"; version="0.1.0"; sha256="01sgw7cmdbjab7k501akh1ab5mr757mn2lbckc74yhrng1rxh6n1"; depends=[cli desc devtools dplyr glue lifecycle magrittr pkgbuild purrr rcmdcheck roxygen2 stringr whisker withr]; }; checkmate = derive2 { name="checkmate"; version="2.2.0"; sha256="064i6l0n4w4jncpnk5wnj6sxak0jirdz757iirglcxg8ayq19v4n"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="1.0.2"; sha256="1987vn13b5j914vkzwbn7q1138b0xsjs55x5b2090kjk6kc900x8"; depends=[jsonlite pkgdepends withr yaml]; }; - checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; + checkthat = derive2 { name="checkthat"; version="0.1.0"; sha256="1l88cn4q0475fizblypxjhrdrkqmc4a7ln3agz0cmsmp8z6j4gjd"; depends=[cli glue lifecycle purrr rlang]; }; cheddar = derive2 { name="cheddar"; version="0.1-638"; sha256="0y1kmm14f7fkxxyjvxiavzcy2bfflwp98yx7z98ib0v7dnn86vmx"; depends=[]; }; cheem = derive2 { name="cheem"; version="0.3.0"; sha256="0l3arxxkg6rzkilklcmn61rl1j33yxcgbikj6mk5laqhhii3rqqp"; depends=[conflicted DT ggplot2 magrittr plotly shiny shinycssloaders shinythemes spinifex]; }; cheese = derive2 { name="cheese"; version="0.1.2"; sha256="0g935mlf2hkbhd8cif8nmvg477if8sv7ga50ddb0cvghdaqjd183"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + chem_databases = derive2 { name="chem.databases"; version="1.0.0"; sha256="1xficpzs0v85irkp9hsfbng4jdvlmmynpjkqj93r1hw702vg325x"; depends=[]; }; chem16S = derive2 { name="chem16S"; version="1.0.0"; sha256="0a4r1sca2fsadaz3bmkrkylbdabwjw2ja6p9s9hgkgg4k6h3vslr"; depends=[ggplot2 phyloseq plyr reshape2 rlang]; }; chemCal = derive2 { name="chemCal"; version="0.2.3"; sha256="0f0d0ljym745scnfdx0n0jp86g4r51gylcab3h7ykpaizgpah24r"; depends=[]; }; chemdeg = derive2 { name="chemdeg"; version="0.1.2"; sha256="0ipj7988bwrcz489wa5mx789aw9dij6003rbdndbl3m2r3hi9pnv"; depends=[MASS]; }; chemmodlab = derive2 { name="chemmodlab"; version="2.0.0"; sha256="01af0j24vymxiqahwhcf4kp0x603yllvlgcxnybsi2wnzm71swk7"; depends=[caret class e1071 elasticnet KernSmooth lars MASS MSQC nnet pls pROC randomForest rpart tree]; }; - chemodiv = derive2 { name="chemodiv"; version="0.2.0"; sha256="1i9ypq045bmh8sw5sz92hlyv9gbdrwdg1rv4nhg8myvx9nrv1zwx"; depends=[ape ChemmineR curl fmcsR ggdendro ggplot2 ggraph gridExtra GUniFrac hillR httr igraph jsonlite rlang tidygraph tidyr vegan webchem]; }; - chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; + chemodiv = derive2 { name="chemodiv"; version="0.3.0"; sha256="07y8wvi5vh5apvg57pd2q5rqvpxm0h3v899n12r76gwvj8z1a28s"; depends=[ape ChemmineR curl fmcsR ggdendro ggplot2 ggraph gridExtra GUniFrac hillR httr igraph jsonlite rlang tidygraph tidyr vegan webchem]; }; + chemometrics = derive2 { name="chemometrics"; version="1.4.4"; sha256="10d8g8sgck6v2cgkv988yiawv9vrziyqsrhagmkzf7rjpqgdn3px"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; cherry = derive2 { name="cherry"; version="0.6-14"; sha256="03ipvd2ldzk7xsalkgcx0cyp9cp9b8qqjvz8nl0am412j3z9i5wg"; depends=[bitops hommel lpSolve]; }; cherryblossom = derive2 { name="cherryblossom"; version="0.1.0"; sha256="1fn0xi65y0w1gmyrjlh8lb2is34r2dc5bym0ynrgjv8h595nzhwp"; depends=[]; }; chess = derive2 { name="chess"; version="1.0.1"; sha256="0b0lz8r48bvksjnh385p1ni22hw1yvs6255pjbpj49ga9dwziin0"; depends=[cli magrittr purrr reticulate rsvg]; }; + chessboard = derive2 { name="chessboard"; version="0.1"; sha256="0w58zbiz9gw18ixcp3j23ys52xx5i4wrjhixiy4brc5b5h1i8mdi"; depends=[dplyr ggplot2 magrittr rlang sf tidyr]; }; chest = derive2 { name="chest"; version="0.3.7"; sha256="0905xl1vqn8icvf44vydhd00wvz5cdnl2igr7m0jmrsv564zdj5a"; depends=[broom dplyr forestplot ggplot2 MASS survival tibble]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chicane = derive2 { name="chicane"; version="0.1.8"; sha256="0963r5jzyjihidh18ny9nqkim00bys3psdgrxhbah43bbl0kx43r"; depends=[bedr data_table doParallel foreach gamlss gamlss_tr iterators knitr MASS rmarkdown]; }; @@ -7429,13 +7431,13 @@ in with self; { childesr = derive2 { name="childesr"; version="0.2.3"; sha256="1a58s0zph4mfmh9sdfbv7yaa20lx5gi0mca0ikzarfwxjl5knp39"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childsds = derive2 { name="childsds"; version="0.8.0"; sha256="1vv02kbw17b8zva2yc1qgi750z9yhyfv5xbig29dhyzvj8k00yvb"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; chilemapas = derive2 { name="chilemapas"; version="0.3.0"; sha256="00v99y02fnxzn2ysbc2fbkdfirfl1276q8d7csi18kbym3vwqmq9"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; - chillR = derive2 { name="chillR"; version="0.72.8"; sha256="1h9m7n3myqxgq0d0filx6y0vnn1sp06shlrhyy2s4xr28xwpd571"; depends=[assertthat dplyr fields GenSA ggplot2 httr jsonlite Kendall metR patchwork pls plyr R_utils raster Rcpp RCurl readxl reshape2 rlang RMAWGEN scales sp stringr tidyr XML]; }; + chillR = derive2 { name="chillR"; version="0.73.1"; sha256="1cbz13m4fa58amkkbfnysraz39fml3srhshiwbmhnnmv21nal86n"; depends=[assertthat dplyr fields GenSA ggplot2 httr jsonlite Kendall metR patchwork pls plyr progress R_utils raster Rcpp RCurl readxl reshape2 rlang RMAWGEN scales sp stringr tidyr XML]; }; chinese_misc = derive2 { name="chinese.misc"; version="0.2.3"; sha256="0hlna52g00nh3908wgpb9ldgghff3gfjx24vmk5gikkazdqk9zrh"; depends=[jiebaR Matrix NLP purrr slam stringi tm]; }; chipPCR = derive2 { name="chipPCR"; version="1.0-2"; sha256="0q30ncnvbipvqbpxrx2yb68i2ybdfl1fbzj3f12dd2wmjjl72q1x"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chirps = derive2 { name="chirps"; version="0.1.4"; sha256="1yj91rvcsfsr2nmvk7qnxwfkbiblm4bdazs2p83g8ax4fwkrp39c"; depends=[httr jsonlite sf terra]; }; chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; }; - chisquare = derive2 { name="chisquare"; version="0.5"; sha256="01kcfynfnj9mmmyzarabmifz84lnfprwmhlldwjlr3i7r6lasda0"; depends=[gt]; }; - chk = derive2 { name="chk"; version="0.9.0"; sha256="1fj9rqvxv0s2j5sikmkn18280w4194kx5hlkah9z0hr4vnzgkrh7"; depends=[lifecycle rlang]; }; + chisquare = derive2 { name="chisquare"; version="0.6"; sha256="0jzn0xxmgswpfmyk25gx4cyf2xa4i68k78say1ni1qxm673rfl37"; depends=[gt]; }; + chk = derive2 { name="chk"; version="0.9.1"; sha256="19q5ylkgrkdmnzg2df1lnrp2arbfzwfz4rbrr16j9ih2237kvd7r"; depends=[lifecycle rlang]; }; chkptstanr = derive2 { name="chkptstanr"; version="0.1.1"; sha256="0p0pzpzyg3sw4gnvzdx34f96yxidpykq49v5xlhnrsnpjzajjfs3"; depends=[abind brms Rdpack rstan]; }; chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.2.0"; sha256="0w7v6xk3vyf9dyf9bh5v9516v78yhcdvy7h1140pg2yw8xmfyr0r"; depends=[]; }; chngpt = derive2 { name="chngpt"; version="2023.1-30"; sha256="15n82vgqqbvxpdiq42zja352nlj39avwfzv4l0v98jnl8pjwbkzw"; depends=[boot kyotil lme4 MASS RhpcBLASctl survival]; }; @@ -7449,26 +7451,26 @@ in with self; { choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; christmas = derive2 { name="christmas"; version="1.2.0"; sha256="0ir9fn1hdv6if263dlwam8m3gyiw59q7p26hdxav2dil8q8r4f2g"; depends=[animation]; }; chromConverter = derive2 { name="chromConverter"; version="0.2.1"; sha256="0mpakgcqmpw0s7vcndqfmd2n2imn35nh5nkps07aj0vgd7z9ib8w"; depends=[magrittr purrr readr readxl reticulate stringr tidyr xml2]; }; - chromer = derive2 { name="chromer"; version="0.4"; sha256="075nbj254v2nl585r3hd1yh4dxy1mwfbrpvzfrg69rs9pdq6z6yq"; depends=[dplyr httr tibble]; }; + chromer = derive2 { name="chromer"; version="0.6"; sha256="1jn5dwl8i1di8hns3kjww6sqyba768j1302w3f43v9965vfr1xnp"; depends=[dplyr httr tibble]; }; chromoMap = derive2 { name="chromoMap"; version="4.1.1"; sha256="1067h5d6jdbm811n7ayikhqfbcqmxbz5jgp05vf1sbln7qgn9l43"; depends=[htmltools htmlwidgets]; }; - chromote = derive2 { name="chromote"; version="0.1.1"; sha256="0aa9lsnvcq25xd7hk2n33vlrvihad7943x9fda891adjvsnjg57q"; depends=[curl fastmap jsonlite later magrittr processx promises R6 rlang websocket]; }; + chromote = derive2 { name="chromote"; version="0.1.2"; sha256="1fnqhq47gr3qgdw484zg1s1lmbb2hsmi36fhrxglmbfvp04py4f0"; depends=[curl fastmap jsonlite later magrittr processx promises R6 rlang websocket]; }; chromseq = derive2 { name="chromseq"; version="0.1.3"; sha256="0m9dnm50iw176ffn6syd3538hxmjhkrxfzaf13210q100wk0lgz2"; depends=[]; }; chron = derive2 { name="chron"; version="2.3-61"; sha256="16rvqkb7c969795d1z1ypb2cfly70zp24qs8ndsq0hx04mv9b5m0"; depends=[]; }; chronicle = derive2 { name="chronicle"; version="0.3"; sha256="0yfrxr93fbxgpxjs1gb56pdx1kk4nn9xvy2csgl1rhzrgbl343m3"; depends=[data_table dplyr DT dygraphs ggplot2 glue knitr magrittr plotly prettydoc purrr readr rlang rmarkdown rmdformats scales skimr viridis zoo]; }; chronicler = derive2 { name="chronicler"; version="0.2.1"; sha256="1ds9gi0wgdsi4rw3zpn14pnisallj6vvzlzhsl4hzlvj3k96v5df"; depends=[clipr diffobj dplyr maybe rlang stringr tibble]; }; chronochrt = derive2 { name="chronochrt"; version="0.1.2"; sha256="0r8aqx74c4rxacqf47hinpf5fy3lypxd5a1g7iqb1rbk1z4mkfj6"; depends=[dplyr ggplot2 magick magrittr readr rlang tibble tidyr tidyselect]; }; - chronosphere = derive2 { name="chronosphere"; version="0.5.0"; sha256="1qh2yx5r27vkpwh24i3fmjvjjwaaiskx3fy11d36xq4p5wszcp9c"; depends=[]; }; + chronosphere = derive2 { name="chronosphere"; version="0.6.1"; sha256="1simv75zr3x448sbyig5nyg40q9p3gibxjzi1d1gdyiaqncp1n6w"; depends=[]; }; chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; chunked = derive2 { name="chunked"; version="0.6.0"; sha256="1j16am4nzwy2ckisksl5mk8h05ala6lpdd5qrb1gwyrhli4lx45a"; depends=[DBI dplyr LaF progress rlang]; }; chunkhooks = derive2 { name="chunkhooks"; version="0.0.1"; sha256="1kps7widb9ql01njy8xl03lplrybl2ci5fvx5vzzwnwps6s4y3fm"; depends=[knitr measurements prettyunits]; }; chyper = derive2 { name="chyper"; version="0.3.1"; sha256="0ps66gqngi38lz8sq4zsvdbmj0qn4pz8aax9dgmngmwb8hdd503r"; depends=[]; }; ciCalibrate = derive2 { name="ciCalibrate"; version="0.42.2"; sha256="1pgfc63w50isqmzdpzbind8qdj9h2q3njiwchxb0a95zgycgyydi"; depends=[lamW]; }; ciTools = derive2 { name="ciTools"; version="0.6.1"; sha256="0d6aq4wcxi1q59g4kfx49x1li41rfwx2z2v4xzz2xkldn6h1794z"; depends=[arm boot dplyr lme4 MASS survival]; }; - ciccr = derive2 { name="ciccr"; version="0.2.0"; sha256="0xmjqwlw2xq332pyagrn8ay6ipyvmxw1q7zf4cza4ly2mz9mf1ws"; depends=[]; }; + ciccr = derive2 { name="ciccr"; version="0.3.0"; sha256="0zhhb6dq9js2wx18hq41pdqawc4pccg7wpxii1447c5sj0lmgahf"; depends=[glmnet]; }; cicerone = derive2 { name="cicerone"; version="1.0.4"; sha256="1z3i720970kmczg01wxwbyqwd9zby69lchw3pgqwpn2bjr66jimh"; depends=[assertthat R6 shiny]; }; cif = derive2 { name="cif"; version="0.1.1"; sha256="0z0dpq5vyv8s4cn4y8ph8y4b8nb63bkqsjmlixa1kr29l132gj1l"; depends=[lubridate]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; - ciftiTools = derive2 { name="ciftiTools"; version="0.11.0"; sha256="054w4kza7nzv5gb5l75r96g11a3nj2r8vzryjbil4bzn8v9l0dq1"; depends=[fields gifti oro_nifti RColorBrewer rgl RNifti viridisLite xml2]; }; + ciftiTools = derive2 { name="ciftiTools"; version="0.12.2"; sha256="0cmfw9wzv85xzdr1pa4y1n3hyp90dfyiwprksi2vvxmkrf0yjhw3"; depends=[fields gifti oro_nifti RColorBrewer rgl RNifti viridisLite xml2]; }; cimir = derive2 { name="cimir"; version="0.4-1"; sha256="0r8fmvqcihxsj0w1g2xm02wwqcgrwadbl5n1dzksw8zpcjfw7fkn"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; }; cinaR = derive2 { name="cinaR"; version="0.2.3"; sha256="0kdf3xbhg7yhpr67fqbbwqm16fvv3dj9f7bvfqliy3xhpxpg23qi"; depends=[ChIPseeker DESeq2 dplyr edgeR fgsea GenomicRanges ggplot2 ggrepel limma pheatmap preprocessCore RColorBrewer sva TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene writexl]; }; cinaRgenesets = derive2 { name="cinaRgenesets"; version="0.1.1"; sha256="0pz3iw559d8rsxmnwd1cqcpv8qnnh9bfvc9ydzwznx8jczbldls8"; depends=[]; }; @@ -7479,38 +7481,37 @@ in with self; { circle = derive2 { name="circle"; version="0.7.2"; sha256="0nn14ky8df8ra03sh9ds7lkcksf9lysc1981dh19pca7iqbdydkx"; depends=[cli httr jsonlite]; }; circletyper = derive2 { name="circletyper"; version="1.0.2"; sha256="0j2c369icz864fjgd393wbvv1shmrwgvcqfzwps778lzv59f869h"; depends=[shiny]; }; circlize = derive2 { name="circlize"; version="0.4.15"; sha256="1iswb7dy08as3pbzxvhx5qlsbnwvp79nwg8m158nfz7y2d9xa0nn"; depends=[colorspace GlobalOptions shape]; }; - circular = derive2 { name="circular"; version="0.4-95"; sha256="1qmwj1pf37lc2s5r83y7nqckscznqhbsv66bdfgfbby7x4qkwga8"; depends=[boot mvtnorm]; }; + circular = derive2 { name="circular"; version="0.5-0"; sha256="14kvkbmvdfzh8j4hgw93qkjkg86xlpw69sp7g8d5smcyw9fxmx2b"; depends=[boot mvtnorm]; }; circularEV = derive2 { name="circularEV"; version="0.1.1"; sha256="0g499mn8knkfspk3wdgn8r9v4hpr6gy8wjwf0zrgf0j05xap6g7a"; depends=[circular doParallel foreach ggplot2 mgcv NPCirc]; }; - circumplex = derive2 { name="circumplex"; version="0.3.9"; sha256="0rj6mzk77422ql020yra9gik7110r0qjnvmv2h5nc2prn5xd20kw"; depends=[assertthat boot dplyr ggforce ggplot2 htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; + circumplex = derive2 { name="circumplex"; version="0.3.10"; sha256="1g0r004c7y51mcv7iiymgzhdy9v8y9bk814bzaam4d8fxp7qzqlr"; depends=[assertthat boot dplyr ggforce ggplot2 htmlTable magrittr purrr Rcpp RcppArmadillo rlang scales tibble tidyr]; }; cit = derive2 { name="cit"; version="2.3.1"; sha256="1i1179d0rjnmrlwh031dxmvwp2w6k1c9fj5g3cfmzjk4xxb2bjha"; depends=[]; }; citation = derive2 { name="citation"; version="0.8.2"; sha256="0s6hsxfa72apslp4prfl2b9n1ybvsynlh69772rh9x0niysgm43g"; depends=[desc jsonlite withr yaml]; }; citationchaser = derive2 { name="citationchaser"; version="0.0.4"; sha256="11ilh8fpqvljzriwwkzmw5idxff82spyv4b36lsl1s0lfbgjis69"; depends=[data_table dplyr httr jsonlite maditr MESS networkD3 scales tibble]; }; citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; cities = derive2 { name="cities"; version="0.1.3"; sha256="1047y1n8mldbnq8g7p43bcvsxz2hbcidbwvafcj1h01rsfgbfkd1"; depends=[dplyr ggplot2 ggthemes plotly tidyr]; }; - cito = derive2 { name="cito"; version="1.0.1"; sha256="0j1h8l50kkhrpnpynxw0hhm41k0rhd4f4i9aiv7bbhbkfh71xk7n"; depends=[checkmate coro gridExtra torch]; }; + cito = derive2 { name="cito"; version="1.0.2"; sha256="0va645fzccyzalmlglxdfn3a6crpgly4j59js2gk5fmxz7kmkfh6"; depends=[abind checkmate cli coro gridExtra parabar progress torch]; }; citrus = derive2 { name="citrus"; version="1.0.2"; sha256="1pzzyppqfh3qvc1xi2947lnshv7z2c21r8fribhc1avj76j26q5y"; depends=[clustMixType dplyr GGally ggplot2 RColorBrewer rlang rpart rpart_plot stringr tibble treeClust]; }; ciu = derive2 { name="ciu"; version="0.6.0"; sha256="0pqs8ivbybbrjar978bl05awgaks33nqfm7l9z68iv2sj4a9hv21"; depends=[crayon ggplot2 Rcpp]; }; ciuupi2 = derive2 { name="ciuupi2"; version="1.0.1"; sha256="04x02qmqqyrc4h4z4mpl4zn5vr9y28k6j6n30fbr9q238zd543db"; depends=[functional nloptr pracma PreciseSums statmod]; }; civis = derive2 { name="civis"; version="3.1.2"; sha256="0ahrav9gd0dy05vxapg5x0csadwcnm4nfcwwk752j9nksd1hl3wg"; depends=[future httr jsonlite memoise]; }; cjar = derive2 { name="cjar"; version="0.1.2"; sha256="0rq9ryhp2h3p927227chzwbjn7x22h9ckkha2kclhx0jh7swf5y7"; depends=[assertthat dplyr glue httr jose jsonlite lubridate magrittr memoise openssl progress purrr R6 rlang stringr tibble tidyr vctrs]; }; - cjbart = derive2 { name="cjbart"; version="0.3.1"; sha256="1pifwnq85cwc2q621nk12cqc0iv2khhj0g3csbbp3jlf705qr763"; depends=[BART ggplot2 randomForestSRC Rdpack rlang tidyr]; }; - cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; }; + cjbart = derive2 { name="cjbart"; version="0.3.2"; sha256="1d6jg6m86i2vx1yq66flj22x061s2x8rxsasqnn688kaaqrya657"; depends=[BART ggplot2 randomForestSRC Rdpack rlang tidyr]; }; + cjoint = derive2 { name="cjoint"; version="2.1.1"; sha256="1byahl2x3mdz66cicyjbi5qrcbq9xqcyyny5rzxkg5m5nfgxprqk"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyjs survey]; }; ckanr = derive2 { name="ckanr"; version="0.7.0"; sha256="10bxlvx70wik3rih5ms8jb9nb111qca4ydz8rj2raywm8bd3rpcj"; depends=[crul DBI dbplyr dplyr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.7"; sha256="18aiyjhnh5mfdxbzns4cy0r8bymfikhwkybpn4g04qhli5ls8z83"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; }; clam = derive2 { name="clam"; version="2.5.0"; sha256="16yq457a2c8d47szimad7rx0q31h0g7iirmb75xxjicvkxqprmaz"; depends=[rintcal]; }; clarabel = derive2 { name="clarabel"; version="0.5.1"; sha256="12kds0pwvs2wrv23pjs6bbh49gymak7as46qjz65is4ssd12fbs8"; depends=[]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; - clarify = derive2 { name="clarify"; version="0.1.3"; sha256="09mspawbv5nnbh95nkl0val3kd5fd2vgyxkm1an9n45xjpbq3x55"; depends=[chk ggplot2 insight marginaleffects mvnfast pbapply rlang]; }; - clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; + clarify = derive2 { name="clarify"; version="0.2.0"; sha256="1iyjs0wai41x6w0kv7szr7x5gfs05k2kya7bw4n37g0i8s829isq"; depends=[chk ggplot2 insight marginaleffects mvnfast pbapply rlang]; }; class = derive2 { name="class"; version="7.3-22"; sha256="0p6i10jk8mb85bkx4lvixw85lsmgnk4cizcdw33zqhrqx5j436dn"; depends=[MASS]; }; - classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; - classInt = derive2 { name="classInt"; version="0.4-9"; sha256="1hz1436apcnqvfyhmlv5f4127jviwfw6hz7f8xxkqygq11ysy4av"; depends=[class e1071 KernSmooth]; }; + classGraph = derive2 { name="classGraph"; version="0.7-6"; sha256="10nyrs5xh70ajhi1q6pvx4s5lkl2r46ddxanhiyn9vv9swr2hzsw"; depends=[graph Rgraphviz]; }; + classInt = derive2 { name="classInt"; version="0.4-10"; sha256="12rbwh7g0a6abvy423xjiv53gx1f9lg4y78r80lc0fj9pjpiwmn3"; depends=[class e1071 KernSmooth]; }; classifierplots = derive2 { name="classifierplots"; version="1.4.0"; sha256="0agxm3vrbs8lqhk1xvfc3wzf0q0hxhgyp23j5qi5mi1drgnw1jj1"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4.1"; sha256="195pa9g8764m8ddkz7wwzszh2zqqnx2fm7cdsm9q73k6qgf61xj8"; depends=[class plyr]; }; classmap = derive2 { name="classmap"; version="1.2.3"; sha256="125895ym1jhdd4gm7ywlhfzn66kra1a8bbkq3502vg38zvdsm3ci"; depends=[cellWise cluster e1071 ggplot2 gridExtra kernlab randomForest robustbase rpart]; }; cld2 = derive2 { name="cld2"; version="1.2.4"; sha256="0nv17v1sjdx4xballagm5cfafswj4bqc0h550q29hal16vl4vq3r"; depends=[Rcpp]; }; - cld3 = derive2 { name="cld3"; version="1.5.0"; sha256="075v7jw9x4pbg8p2kfjdw3rr7bw21lci97l44xmngka3lr6c25vj"; depends=[Rcpp]; }; + cld3 = derive2 { name="cld3"; version="1.6.0"; sha256="0vgqg0sslj5dni9cpdfq7vbjy7wg48hdk8xa2bg7sd558apnns3c"; depends=[Rcpp]; }; clda = derive2 { name="clda"; version="0.1"; sha256="03zfanvpz1h42h2z38a63fck1p5hqig4w2svknzpw7mryji5q9b1"; depends=[MASS]; }; cleaR = derive2 { name="cleaR"; version="0.0.4"; sha256="1vvmaaqqrd65l9hm3yjf88ajmlaf1sl7iy816ypjy9ww9x7dcyf4"; depends=[]; }; clean = derive2 { name="clean"; version="2.0.0"; sha256="0zvk3a5yz54g2mn7y1d91z6ljglbyq1hkh4iip1dfyi15chrqv7y"; depends=[cleaner]; }; @@ -7519,52 +7520,54 @@ in with self; { cleancall = derive2 { name="cleancall"; version="0.1.3"; sha256="079l5knm3lrvnfbwcvg2g62sqbg7iira5x0gxd4fk1pysnm5hwmf"; depends=[]; }; cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; }; cleaner = derive2 { name="cleaner"; version="1.5.4"; sha256="1rkyrp8pa5sznjszxfwgkiymmdwrm87k56ghgk39yp8f919ifkpl"; depends=[backports crayon knitr pillar rlang vctrs]; }; - cleangeo = derive2 { name="cleangeo"; version="0.3"; sha256="0fxn5lq4dwj8hd9vir0b86bj95ism8xv19rlj2c6i9yfy9gvd8dl"; depends=[sf sp]; }; + cleangeo = derive2 { name="cleangeo"; version="0.3-1"; sha256="0ijxa9d871zb3j7ks7va0lqrv5cywb8kiciy1c42faif1xk8wlxp"; depends=[sf sp]; }; cleanr = derive2 { name="cleanr"; version="1.4.0"; sha256="04rjl8q6hlmw4xc4p4khda6090d39dwig331fzjqiad3bs2xavdy"; depends=[checkmate fritools pkgload rprojroot]; }; cleanrmd = derive2 { name="cleanrmd"; version="0.1.1"; sha256="120jg8kp6m6pka5nvgvwjyl4ljybv193sqvyjr8p19w3q7665nm6"; depends=[htmltools jsonlite rmarkdown]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; - clevr = derive2 { name="clevr"; version="0.1.1"; sha256="077qhqfzcy1ciar70df7q98ms003b9mnqgji1nxkx5ncw9hdkzd4"; depends=[BH Matrix Rcpp]; }; + clevr = derive2 { name="clevr"; version="0.1.2"; sha256="0r47mq0k55v3jvkzv1nlajqmcj03gq0igrxlcwhfrhbam9vwvapx"; depends=[BH Matrix Rcpp]; }; clhs = derive2 { name="clhs"; version="0.9.0"; sha256="04hd0p51j15294fv1a9qx61p5yfmh8hcx784v3x1s0kx7km34saz"; depends=[cluster ggplot2 plyr raster Rcpp RcppArmadillo reshape2 sf sp]; }; cli = derive2 { name="cli"; version="3.6.1"; sha256="0djyl08k7nhlbzgnfx7gq8w00s7c9f66bd11bvi9lzz6qz70cc5y"; depends=[]; }; cliapp = derive2 { name="cliapp"; version="0.1.1"; sha256="0v62lbcsja0xmlpqcps370n5c7bk4j2n8pwh9xyif5s4wpf82qz1"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; clickR = derive2 { name="clickR"; version="0.9.39"; sha256="0kqv3kwj1dbq6d7010gdy003v11ww0bx2zr7yv93ag060viv956d"; depends=[beeswarm future future_apply stringdist]; }; clickb = derive2 { name="clickb"; version="0.1"; sha256="0cbhwvxb7xa34wf10saq65wiwlmw1cgnbiqgv6mfyd8dcdv25rwg"; depends=[DiscreteWeibull mclust MCMCpack]; }; - clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; + clickstream = derive2 { name="clickstream"; version="1.3.3"; sha256="1pbw74kd1ig6xc9llv8idizx0rya2454kpd9z62ybwvy68vyargs"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; clidamonger = derive2 { name="clidamonger"; version="1.0.0"; sha256="1vxhibvdb92hhj40k8vg5vr0a8wy73jj8kyczs4rrn0zk1sj61dq"; depends=[]; }; clidatajp = derive2 { name="clidatajp"; version="0.5.2"; sha256="1wpj9wydjaq0jnnacwbrggqpncy9z8q792l0qv297a9vxqhd9pqz"; depends=[curl dplyr httr magrittr rlang rvest stringi stringr tibble tidyr]; }; cliff = derive2 { name="cliff"; version="0.1.2"; sha256="0d7aswvsqlyai3rxxbfy08cs4qbi9fjjls62y1p95bmnhq1b3bwf"; depends=[ellipsis processx rlang]; }; clifford = derive2 { name="clifford"; version="1.0-8"; sha256="0gi4jajng1v0a45dl5qv8v279bm4lzfbkdsqp0bd1vil2ns1934j"; depends=[BH disordR magrittr mathjaxr partitions Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-5"; sha256="1p2xy5r9axkj8yk6ywaq0w5i00bdfm15drjz227nx8p4vd3q6si8"; depends=[ggplot2 httr lubridate magrittr RColorBrewer reshape2 rvest scales stringr xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; - climaemet = derive2 { name="climaemet"; version="1.1.1"; sha256="17g55shqsgpv9vpm41r5lc7ihqhfqj0phbsgv9ghpql9z1nxjy19"; depends=[dplyr ggplot2 httr jsonlite rappdirs readr rlang tibble tidyr]; }; + climaemet = derive2 { name="climaemet"; version="1.2.0"; sha256="1276pxs3w610v6m8j5h206xxgwvm2wwma73jpvn7s3rcxycs32m5"; depends=[dplyr ggplot2 httr jsonlite rappdirs readr rlang tibble tidyr]; }; climateStability = derive2 { name="climateStability"; version="0.1.4"; sha256="0cnp67dskwlw60lzknh3nfx2raj90zk6z1bng8l1blsgmap565dd"; depends=[terra]; }; climatol = derive2 { name="climatol"; version="4.0.0"; sha256="0hz5j9wg3c2bd2v4q0mv01v7wwd6v650fbcvrl4zqxd9w55kmggs"; depends=[]; }; climatrends = derive2 { name="climatrends"; version="0.5"; sha256="0b2afsff0yl2rcvff5mi6zz5xls9k9hzpay041mv11wc7ii8bw27"; depends=[nasapower]; }; clime = derive2 { name="clime"; version="0.5.0"; sha256="15xc4cvllf6qpwa8a0lvsbivx4cricbgn0v3wc70xy69ngfa7zaj"; depends=[lpSolve]; }; - climetrics = derive2 { name="climetrics"; version="1.0-11"; sha256="1a6ypx15h806aq1h3py40lrzrwcsg61jvgbdrfqyl347yw3sl327"; depends=[raster rts sp terra xts yaImpute zoo]; }; + climetrics = derive2 { name="climetrics"; version="1.0-12"; sha256="0mvs1k0fld1rrqnvjjdnhz9m1dgp8j636ij8wwnb12pz8fp6gvg1"; depends=[raster rts terra xts yaImpute zoo]; }; climextRemes = derive2 { name="climextRemes"; version="0.3.0"; sha256="0c3zh64pipdq5266g8p6c6h0qdwfmigfh6s63ljqvr1ysv32k57g"; depends=[boot extRemes]; }; climwin = derive2 { name="climwin"; version="1.2.3"; sha256="1r2x5941k8l9z3517389y120sfhrskdpchc0pkibznza8aa95r85"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.4.1"; sha256="06q8ajfa0gj8ddr6vb456vra4id7la50aidx3j2bnyaysbavd108"; depends=[doParallel DoseFinding dplyr foreach ggplot2 glue mvtnorm purrr rstan shiny tibble tidyr waiter]; }; clinDataReview = derive2 { name="clinDataReview"; version="1.4.0"; sha256="0b74ygvwv3ss76y15l9lqg8lwq8vxkdari34i0b6fl12a26ndlh6"; depends=[bookdown clinUtils crosstalk data_table ggplot2 haven htmltools htmlwidgets jsonlite jsonvalidate knitr plotly plyr rmarkdown stringr xfun xml2 yaml]; }; clinPK = derive2 { name="clinPK"; version="0.11.1"; sha256="1mzws5pgczdghxl2h0zgrp44in80kplnhy3gc7g4g8wssjwywbb3"; depends=[]; }; clinUtils = derive2 { name="clinUtils"; version="0.1.4"; sha256="0iiw7786i9a878rx0ld9q7rk9szx46hdl9rg2p3032l8ksvryqm2"; depends=[crosstalk data_table DT haven htmlwidgets knitr plyr viridisLite]; }; - clinfun = derive2 { name="clinfun"; version="1.1.3"; sha256="1ysvvyqshicx31inga8dbyd6qcdlvycqqimq3217y634xgh650dm"; depends=[mvtnorm]; }; + clinfun = derive2 { name="clinfun"; version="1.1.5"; sha256="0dsbgj29s7c9pv6p2j3nvksnckym0gyb8hwqvks53mvy2pg9j1ni"; depends=[mvtnorm]; }; clinicalsignificance = derive2 { name="clinicalsignificance"; version="1.2.0"; sha256="017myylm3hh256zqis80f3y7y44p706wzkf8klw4d0frai7mrfwv"; depends=[checkmate crayon dplyr ggplot2 insight lme4 magrittr purrr rlang tibble tidyr]; }; clinmon = derive2 { name="clinmon"; version="0.6.0"; sha256="0cd5mrirfll0zbm9k8glwdqnh4qy4dlfnsypr3xhyf6ppgm35hlv"; depends=[signal]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; clinspacy = derive2 { name="clinspacy"; version="1.0.2"; sha256="134nvkircy1a1rmsg2nszk2r8bcdmikmrx6plchdz8gxyjd6jmya"; depends=[assertthat data_table magrittr rappdirs reticulate]; }; - clintools = derive2 { name="clintools"; version="0.9.8"; sha256="0w53frbvlx3970kkcd91v73szg48r1cb4y97q77r9rb5llq1nrds"; depends=[ggplot2 irr lme4 nlme pROC signal stringr xml2]; }; + clintools = derive2 { name="clintools"; version="0.9.9"; sha256="0yay9s8490zmn2fjv3gqh58qmk8cci50phvz0cgab52kslhf0rvq"; depends=[ggplot2 irr lme4 nlme parameters pROC scales signal stringi xml2]; }; clipp = derive2 { name="clipp"; version="1.1.1"; sha256="1yddihmjg90j9id825lyanqpfm4i67mdgvdm53pz20p8fcq4mlzw"; depends=[]; }; clipr = derive2 { name="clipr"; version="0.8.0"; sha256="1s9vvv3cxnz8w11gsi8z9ddv9jzib5qf5qqxnwqrrv7vj8cr7hij"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clmplus = derive2 { name="clmplus"; version="0.1.0"; sha256="0flnrfs5ymz0ki85zcwmdg605xyfpdc73c71xk35q0ak7l7mbz44"; depends=[ChainLadder forecast ggplot2 gridExtra reshape2 StMoMo]; }; clock = derive2 { name="clock"; version="0.7.0"; sha256="0x58xhngpd2rj7da9gr1x1zwz4rliza7aakfadkqsc4c7wxpmral"; depends=[cli cpp11 lifecycle rlang tzdb vctrs]; }; - clockify = derive2 { name="clockify"; version="0.1.2"; sha256="039kwx468f9hx1w3nxxay8kvai3n2x63r9w10q20mklz5wx4xi3q"; depends=[anytime dplyr httr janitor logger lubridate purrr rlist tibble tidyr]; }; + clockify = derive2 { name="clockify"; version="0.1.4"; sha256="1x0d2np48lgkvsh4bw6szkahnmmy5rcipxnf2wnyhczvgplncw2f"; depends=[anytime dplyr httr janitor logger lubridate purrr rlist stringi tibble tidyr]; }; clogitL1 = derive2 { name="clogitL1"; version="1.5"; sha256="0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was"; depends=[Rcpp]; }; clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; }; clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; + cloneRate = derive2 { name="cloneRate"; version="0.2.3"; sha256="0ii1jbwk60dvqqrxr4z06xnajyf73ywhb06i42szcs6mjm1jxwsa"; depends=[ape BH Rcpp RcppEigen RcppParallel Rmpfr rstan rstantools StanHeaders]; }; clordr = derive2 { name="clordr"; version="1.7.0"; sha256="0lrws22aijsfdr595g2dfxsvnvbq6bs18glbdc07qkb27kcpvv1p"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; + cloudfs = derive2 { name="cloudfs"; version="0.1.2"; sha256="1zl7l7q35hzayf2lc0nh5zcb377q9cvhvxzz53ydv7xza6qy9g7s"; depends=[aws_s3 cli desc dplyr glue googledrive httr rlang]; }; cloudml = derive2 { name="cloudml"; version="0.6.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; cloudos = derive2 { name="cloudos"; version="0.4.0"; sha256="0d6lg7y58w62ikwm83xvc8wky396y4xs5cx3cfn1wxnsnrs462d1"; depends=[dplyr ggplot2 httr jsonlite rappdirs tibble tidyr]; }; cloudstoR = derive2 { name="cloudstoR"; version="0.2.0"; sha256="0x9pl9x5sjs5vwcz5i1r5ymyv3rlv9adjc5y9kvxljdxgvnv6i08"; depends=[cli curl getPass httr keyring rio XML]; }; @@ -7573,8 +7576,9 @@ in with self; { clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; clubSandwich = derive2 { name="clubSandwich"; version="0.5.10"; sha256="0qx4qq0k01q06hrs348n417pf338dyfbcy2vsi0y3ap6y1rb7w6s"; depends=[sandwich]; }; - clue = derive2 { name="clue"; version="0.3-64"; sha256="1br8vsjcfrklspk24cx2zpk05l0na18ajbkwkwmwmpc79jlbfp7l"; depends=[cluster]; }; - clugenr = derive2 { name="clugenr"; version="1.0.0"; sha256="1qxdl2c7flknwb2h0z25xxpkf90cphhdgrar3hbfjgmlzwkld9q0"; depends=[mathjaxr]; }; + clubpro = derive2 { name="clubpro"; version="0.5.5"; sha256="1iady5hvjkiiwbjpyyv0m8pc5jbyb0ra7vsywfbl4vhvw4v4sxvz"; depends=[lattice Rcpp RcppArmadillo]; }; + clue = derive2 { name="clue"; version="0.3-65"; sha256="1y1ycb5yw034ccxz15x41ah699hgjffsfvbn15fwdcdjbz9zvy5x"; depends=[cluster]; }; + clugenr = derive2 { name="clugenr"; version="1.0.1"; sha256="0bm6wblfcgw9c17g47pz5lhm456kss3dcr43qhwkvradyw7hfs7r"; depends=[mathjaxr]; }; clusTransition = derive2 { name="clusTransition"; version="1.0"; sha256="0q5cxkb5mrygyp2zg177rwn5cgpnyqln7yjvjflb48ll3jr98342"; depends=[flexclust]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; clusrank = derive2 { name="clusrank"; version="1.0-3"; sha256="0m5yggbmp3kjh98nkmwy4k8lnd2jxp4c5gyysgvpp5zypakjc1cc"; depends=[MASS Rcpp]; }; @@ -7584,12 +7588,12 @@ in with self; { clustEff = derive2 { name="clustEff"; version="0.3.0"; sha256="1j8v0qm6mqbh08kq8jahpgg6ygab6ac22lzzpcc2h72zm7r7cacr"; depends=[cluster fda ggplot2 ggpubr qrcm]; }; clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; clustMixType = derive2 { name="clustMixType"; version="0.3-9"; sha256="0ijinldyb55chs2llklzk8c7pxxhhfy5cc6ar4fd1gbaasgkadx2"; depends=[RColorBrewer tibble]; }; + clustNet = derive2 { name="clustNet"; version="1.1.0"; sha256="1pr2wmlwhgdw4dvgbcx977aaagpp1j5lw5v49dxq4nv2k5vw2f1p"; depends=[BiDAG clue graph igraph pcalg RBGL]; }; cluster = derive2 { name="cluster"; version="2.1.4"; sha256="1dpmss4mdpw6la5kjf135h2jj5j5zmqvykpj6fl6n5wslbn0rwf6"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCons = derive2 { name="clusterCons"; version="1.2"; sha256="1k1y6cqpb5fyi2mbx2i4jbiwz0fni44lnq0xnv3pl0x3dpscwh6q"; depends=[apcluster cluster lattice RColorBrewer]; }; - clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.7"; sha256="0p1dwl08bf20h7pnspnsycrp3v48nm2miwcnlklyc4gdyzc2jksk"; depends=[MASS]; }; + clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.8"; sha256="0w1sywv9cgl78wrsamh1zrig67r3grnyl27f036ipd1ab1b2510g"; depends=[MASS]; }; clusterHD = derive2 { name="clusterHD"; version="1.0.2"; sha256="16mk0bgvahxpjfawxkpjlfh9j1n5dldl6lhi7d1ssf5zaha35jkm"; depends=[Ckmeans_1d_dp cluster mclust Rcpp RcppArmadillo]; }; - clusterPower = derive2 { name="clusterPower"; version="0.7.0"; sha256="1ha7iz1afmgccxhxsl3y1fd9rbf35nrzp6bsz4c4zl0931xbazfb"; depends=[car dplyr foreach lme4 lmerTest mathjaxr nlme progress R_utils shiny tidyr]; }; clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; }; clusterSEs = derive2 { name="clusterSEs"; version="2.6.5"; sha256="0d8b79mg0wxfpmx3xq22p9apa2cs2ylbml7lf37w386s6kdgz7ns"; depends=[AER dfidx Formula lmtest mlogit plm sandwich]; }; clusterSim = derive2 { name="clusterSim"; version="0.51-3"; sha256="0wlsr9700f3j9wcjzpiaqwj09i5v8n9bvwxvj4vmq1sqvz97v681"; depends=[ade4 cluster e1071 MASS R2HTML]; }; @@ -7598,15 +7602,16 @@ in with self; { clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.1"; sha256="0l5grxvjxzc89qn0nvd79ljzjp89vgxinms291hxzvgbid6yn5sc"; depends=[]; }; clustermole = derive2 { name="clustermole"; version="1.1.0"; sha256="15v3fspp82z7vh5f1ym89mrmajl8b7qymwr1fqa6kfi982dzhrar"; depends=[dplyr GSEABase GSVA magrittr rlang singscore tibble tidyr]; }; - clustermq = derive2 { name="clustermq"; version="0.8.95.5"; sha256="1hxfis2r1za7npb89lp3l1i01spmp78lqwry27wp572y98skm7pv"; depends=[narray progress purrr R6 Rcpp]; }; + clustermq = derive2 { name="clustermq"; version="0.9.0"; sha256="0xajyycwc3029yrg5yrvff9lp8rhw3sgjf6rv1alp6wv8gd8gqy1"; depends=[narray progress R6 Rcpp]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; - clustertend = derive2 { name="clustertend"; version="1.6"; sha256="1gkd414rxi9wq2c88j4dby9z38jk1r3w9s1rg3bs772c3hwkyn24"; depends=[]; }; - clustra = derive2 { name="clustra"; version="0.1.6"; sha256="06cv9fwrkykmdyw4qx85kww7hwa3nk5hpjrsrhzyj9ws623ind3a"; depends=[data_table mgcv MixSim]; }; + clustertend = derive2 { name="clustertend"; version="1.7"; sha256="0zhpx8lg7cxywin9j5kglj2had20wy3mwwgjygv2gjibj7a6i3cl"; depends=[]; }; + clustlearn = derive2 { name="clustlearn"; version="1.0.0"; sha256="11f82p777n5qwiqig2anyi6dxpb75kkgslkq7ii3v9h111jk303m"; depends=[cli proxy]; }; + clustra = derive2 { name="clustra"; version="0.2.0"; sha256="1lgqy791l9bx7bx9jydpfsjych7yyw2sblw1qnspgmw0qs1pw5js"; depends=[data_table mgcv MixSim]; }; clustrd = derive2 { name="clustrd"; version="1.4.0"; sha256="1pgl5yb37nsm0b1iniy7hadcxcbhlp5xwg77av74f568qp1pgx2c"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; clustree = derive2 { name="clustree"; version="0.5.0"; sha256="1haam13aifak8fladyxwa0gz56anj1zfczfjgs07gbw90kf6azx8"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; }; clustvarsel = derive2 { name="clustvarsel"; version="2.3.4"; sha256="0hzvfcjs1k13j695jx6m0fgmcxy284gp4d59b7zmnvqib153x89x"; depends=[BMA foreach iterators Matrix mclust]; }; - clv = derive2 { name="clv"; version="0.3-2.3"; sha256="0awjzy3mmd275rxp1h0rvl4l6401kyc90ndys6xnrb7ym46mb9bl"; depends=[class cluster]; }; + clv = derive2 { name="clv"; version="0.3-2.4"; sha256="1zbi4i6z0sphkkjifr2h0pms9ysifh62iwcpmh9kmv2wl5m51vms"; depends=[class cluster]; }; cmR = derive2 { name="cmR"; version="1.1"; sha256="1wism1czh94wfjgb1p4y0bvkb2ljkmkr4qkandbdjlgn013kjgv0"; depends=[fields Matrix plotrix]; }; cmaRs = derive2 { name="cmaRs"; version="0.1.3"; sha256="028z0x6a6aq3n0kplqg4pwqa7xilpi4s919xrqvd2lqnabhbjy8l"; depends=[AUC earth Matrix MPV Rmosek ROCR Ryacas0 stringr]; }; cmaes = derive2 { name="cmaes"; version="1.0-12"; sha256="0wk8zkf585ipnxajmibip85cyz7wc5br0cph3cvnacbh7yf2zvay"; depends=[]; }; @@ -7617,7 +7622,7 @@ in with self; { cmdfun = derive2 { name="cmdfun"; version="1.0.2"; sha256="1pbcq7hi2lcmqnghmy3q2fsk0c9fy5m0637acyzmc096fxbx723j"; depends=[magrittr purrr R_utils rlang testthat usethis]; }; cmenet = derive2 { name="cmenet"; version="0.1.2"; sha256="0v3fassl21wdyx7s4shsib936fr41qr9hxjgcjc2f8az0ljd1p70"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; }; cmfrec = derive2 { name="cmfrec"; version="3.5.1-1"; sha256="0k3axbc0p5c0rxggp00vv1h5ylnfp57xbb5j3ndgqz0wig2l424z"; depends=[]; }; - cmhc = derive2 { name="cmhc"; version="0.2.5"; sha256="0igspwg6lkgqg69mvzwlxbq30gd1h3gkz8bq7awqfn0v735hay7z"; depends=[aws_s3 digest dplyr httr readr rlang stringr tibble]; }; + cmhc = derive2 { name="cmhc"; version="0.2.6"; sha256="0cm2p3hvingygpxh67q8xjg2c2iy8ddz3hkb3jc4yyijjhxhkima"; depends=[aws_s3 digest dplyr httr readr rlang stringr tibble]; }; cml = derive2 { name="cml"; version="0.2.2"; sha256="1k1fj3j6kxpnxzykqbrcv09q8xhp749apfir0hzkp1f2apyjxymi"; depends=[vegan]; }; cmm = derive2 { name="cmm"; version="1.0"; sha256="1aardzrryg6hs5x01absvnj62qys7qjmnzrbsjh1dqvr4jgvs8ka"; depends=[]; }; cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; @@ -7629,13 +7634,13 @@ in with self; { cmpsR = derive2 { name="cmpsR"; version="0.1.2"; sha256="1qkdv86v0pk9knl97lfz28w8vgn71j7fv9aw8afq8qflfgvda284"; depends=[assertthat dplyr ggplot2 rlang]; }; cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; }; cms = derive2 { name="cms"; version="0.1.0"; sha256="0m3cxvw40nyr1jpdkhg5nbms16hkzj0mrx5nl39x1l42cx2hcjrl"; depends=[assertthat dplyr magrittr readr rlang rvest xml2]; }; - cmsaf = derive2 { name="cmsaf"; version="3.4.4"; sha256="1idrw097bznx8pznycz9q01y2wpsc9rcrs0ip9ilzqphcdj3g6w0"; depends=[cmsafops cmsafvis colorspace colourpicker data_table fields FNN mapproj maps maptools ncdf4 R_utils raster rworldxtra SearchTrees shiny shinyFiles shinyjs shinythemes shinyWidgets sp xml2]; }; - cmsafops = derive2 { name="cmsafops"; version="1.2.6"; sha256="0glxw15hq1bh052wsavc1af93m67l3vz8y9bh42l8n8n06p89alw"; depends=[assertthat fields FNN ncdf4 progress rainfarmr raster SearchTrees sp trend]; }; - cmsafvis = derive2 { name="cmsafvis"; version="1.1.12"; sha256="013agd114x5rhxmz8rw0ygjn3qvsmpjjxqw527gc7n1yzwsjlhbm"; depends=[animation assertthat cmsafops colorspace countrycode fields gridExtra mapproj maps ncdf4 png progress raster rasterVis RColorBrewer SearchTrees sp yaml]; }; - cmstatr = derive2 { name="cmstatr"; version="0.9.1"; sha256="18kcrnbi3r8n8d7s8cl55r2n41cv4q4h6g8lf4pdkv06axg3l7ad"; depends=[dplyr generics ggplot2 kSamples MASS purrr rlang tibble]; }; + cmsaf = derive2 { name="cmsaf"; version="3.5.0"; sha256="0a7ld5651ad3073hp2pyisbygxnd5lak11rinzgqrb5szlzih89q"; depends=[cmsafops cmsafvis colorspace colourpicker data_table FNN maps ncdf4 R_utils raster SearchTrees shiny shinyFiles shinyjs shinythemes shinyWidgets xml2]; }; + cmsafops = derive2 { name="cmsafops"; version="1.3.0"; sha256="0lyjyd78d0qprx8vjxpny2jl14cgy2xy47ydsv5awgg7bb4w34pg"; depends=[assertthat fields FNN ncdf4 progress rainfarmr raster SearchTrees trend]; }; + cmsafvis = derive2 { name="cmsafvis"; version="1.2.0"; sha256="1rx8g8ssprlspfkbb5x3hrahkl90mi58camqgicd39gy12dk0d7i"; depends=[assertthat cmsafops colorspace countrycode fields gridExtra mapproj maps ncdf4 png progress raster rasterVis RColorBrewer sf terra]; }; + cmstatr = derive2 { name="cmstatr"; version="0.9.2"; sha256="08bpyr8zc3mn8rwzd3g6wl16dh4pyxnsjichcd1vd6yvail7ykii"; depends=[dplyr generics ggplot2 kSamples MASS purrr rlang tibble]; }; cmtest = derive2 { name="cmtest"; version="0.1-2"; sha256="1qff6vx0c9sw4xm7fwhck165snrahlmi91na64f7axad14qmp34d"; depends=[Rdpack]; }; cmvnorm = derive2 { name="cmvnorm"; version="1.0-7"; sha256="0zi4adh3gd8nbcnsn9fqiiqi5pc2jx782vw394gi988vyngqr7cq"; depends=[elliptic emulator]; }; - cna = derive2 { name="cna"; version="3.5.1"; sha256="0yvzapgyggv8ksr9pm9rwmaymbhs7m60d1nip8q03dbn6xkjw2pp"; depends=[car Matrix matrixStats Rcpp]; }; + cna = derive2 { name="cna"; version="3.5.4"; sha256="1hx1jwdhhmx4f18vkhsjzzxkzqz5anyn6pq774q3yn2ca0vzshb5"; depends=[car Matrix matrixStats Rcpp]; }; cnaOpt = derive2 { name="cnaOpt"; version="0.5.2"; sha256="1ciqh0d88270hizlsks7d05kggaszzl6add2n143z7cswkgfvkyr"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; }; cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.1"; sha256="0wmapwfag2grshmdrpmlinzikrsprcc8a1afq4dfkwr54rb3m6ky"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; @@ -7651,7 +7656,7 @@ in with self; { cobs = derive2 { name="cobs"; version="1.3-5"; sha256="04f6a6gp11p93j2k35mbrfqgjx5qsgi3dj1085a5v5s0z6l7vbkz"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.1.0"; sha256="1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer sparcl]; }; cocktailApp = derive2 { name="cocktailApp"; version="0.2.3"; sha256="134y64z297r6fqiakqa42f15i5sxlaczc9adxrkicq9275kjf2fn"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; }; - coconots = derive2 { name="coconots"; version="1.1.1"; sha256="0qwhkbw442qk3vxpvjssp15qkwlarfvajppwyaj2ckngja3yaaqh"; depends=[forecast ggplot2 HMMpa JuliaConnectoR matrixStats numDeriv Rcpp RcppParallel StanHeaders]; }; + coconots = derive2 { name="coconots"; version="1.1.3"; sha256="1mymq7rsmawnh6m3m7c39kg8mp829f7kyjnj3hll4jsw6q1sz2fi"; depends=[forecast ggplot2 HMMpa JuliaConnectoR matrixStats numDeriv Rcpp RcppParallel StanHeaders]; }; cocor = derive2 { name="cocor"; version="1.1-4"; sha256="05hl8nlxzimas36cm5b0k7fbjz69ijif7li8kgnpaxk4zmgvzy18"; depends=[]; }; cocorresp = derive2 { name="cocorresp"; version="0.4-3"; sha256="0lqab8f0l24hdvgnfrvvzpi969f35g5i95mq3vj7kxx0xhhz1z08"; depends=[vegan]; }; cocosoR = derive2 { name="cocosoR"; version="0.1.0"; sha256="0aywv3r1kcqiy3bnmvl6djhngzhyvg1f62fldwpz9plxmhphiwdp"; depends=[]; }; @@ -7666,6 +7671,7 @@ in with self; { codebook = derive2 { name="codebook"; version="0.9.2"; sha256="0hxyzwpjbvfzad8h2428q94m961mmwvv28nagw2d36qxd10awh16"; depends=[dplyr forcats ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert purrr rlang rmdpartials skimr stringr tibble tidyr tidyselect vctrs]; }; codebookr = derive2 { name="codebookr"; version="0.1.6"; sha256="0yrm9kv3ar1lw90ly83y2pzc9233jxyabyrni8fddijg3c3gi802"; depends=[dplyr flextable haven officer purrr rlang stringr tibble tidyr]; }; codebreaker = derive2 { name="codebreaker"; version="1.0.1"; sha256="1k2l2gpcnlg77sb05zyg64w1nzvwn3j7jv5wwsyyjrlkr60kpval"; depends=[beepr cli]; }; + codecountR = derive2 { name="codecountR"; version="0.0.3.1"; sha256="1m4909dzlsm4jz6fncwlhc6qygrszxh81qzpr9yfk9m310va965q"; depends=[]; }; codemeta = derive2 { name="codemeta"; version="0.1.1"; sha256="0pcip5ycgkva5pg20fcc3vsb09dv4j57yqvbf5x8bdsxa5vpg11a"; depends=[desc jsonlite]; }; codemetar = derive2 { name="codemetar"; version="0.3.5"; sha256="0py4qn9148xlc1ldlifpm7vd7l9dih4f7yiadvmz57b3y2vr0b02"; depends=[cli codemeta commonmark crul desc gert gh jsonlite magrittr memoise pingr purrr remotes sessioninfo urltools xml2]; }; codename = derive2 { name="codename"; version="0.5.0"; sha256="1466zby3yiggvqiwynyvirifi30y9lwms0a4mx73c8x9wfy36px0"; depends=[]; }; @@ -7678,37 +7684,36 @@ in with self; { codingMatrices = derive2 { name="codingMatrices"; version="0.4.0"; sha256="0554jbwy2hzdqy4vf4y26jniw8pp8j7a7ybq9s7120zfkxihccag"; depends=[fractional Matrix]; }; codyn = derive2 { name="codyn"; version="2.0.5"; sha256="1iqlh3ydnqi7s2b3fa2zgb05j763qgxriys4piawwmgrdrvd3d9q"; depends=[assertthat permute vegan]; }; coefa = derive2 { name="coefa"; version="1.0.3"; sha256="0ra9w4mpxwvi5byys45sw1yydf28hvhgp81928ipdra277flhcp9"; depends=[openxlsx psych purrr]; }; - coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; + coefficientalpha = derive2 { name="coefficientalpha"; version="0.7.2"; sha256="0br0drapx4bw96zphnmcdwj8mw7gp0c9xm39gjmnqrvc3ycz5gh1"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.8"; sha256="0qxa57sm5hncmd4mxab1c7hk34n2s5fsn51ck6ik2ciynhgcqxvn"; depends=[dplyr dygraphs ggplot2 magrittr plotly plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-3"; sha256="07hik9y84nj1l83spcp1hq9lj960zsg3v0i8rk0xfv25grrakp85"; depends=[]; }; coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; cofad = derive2 { name="cofad"; version="0.1.1"; sha256="0c27wfdk98mq0531avlgfxf2wmxcjyg39pgl9i37im7ri2s7kpnr"; depends=[]; }; cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coffee = derive2 { name="coffee"; version="0.2.0"; sha256="12xf3v2h33pqcahz74sv3hppvzqjlg6gh75sx4qjkqdq29j8s7k4"; depends=[data_table rintcal]; }; - coga = derive2 { name="coga"; version="1.1.1"; sha256="0128x4qmln1ks7cqd5n22aw41f097lw785lw4ca80nyn2bz5jmqk"; depends=[cubature Rcpp RcppGSL]; }; + coga = derive2 { name="coga"; version="1.2.0"; sha256="1hrq31w00a2ix30w1xncmxrkxbwbdizsq05axn2kwcvq5miq10yk"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.3"; sha256="0aqlk6248m3pad0fwarvxvxfn4qfazhdbdplg8haw3aj165szq43"; depends=[dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cognitoR = derive2 { name="cognitoR"; version="1.0.2"; sha256="1pz4wk7vdc1nhm76kz912hyyc9c408qsldfr9dygqvran4xvqm9g"; depends=[base64enc config dplyr httr jsonlite paws shiny shinyjs yaml]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.4"; sha256="0yxhmr5969ahbhlckvf2xwpi9fmmjahpzr9r9fjw3za91d43i9gz"; depends=[base64enc config dplyr httr jsonlite paws shiny shinyjs]; }; cohortBuilder = derive2 { name="cohortBuilder"; version="0.2.0"; sha256="117gdqga61h24xa1h534837pz34ym5hnfz6731rrm3lnlzd171w6"; depends=[dplyr formatR ggplot2 glue jsonlite magrittr purrr R6 rlang tibble tidyr]; }; cohorts = derive2 { name="cohorts"; version="1.0.1"; sha256="0g3xllmk5n4s2w10a2460v735bsc2xnkxgcr9zkvl8sz8rczrs2n"; depends=[data_table dplyr dtplyr magrittr tibble tidyr zoo]; }; cohorttools = derive2 { name="cohorttools"; version="0.1.6"; sha256="17gz4887vhkk0qr5mcv0vcfaxiws1pk1fdd4y8wqbl57ikn5i9vs"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 mgcv rsvg survival]; }; - coil = derive2 { name="coil"; version="1.2.3"; sha256="023sn4waf8wb99ryxf0biag8rfg3j3sslf8fw7d00llzci8px5zj"; depends=[ape aphid seqinr]; }; - coin = derive2 { name="coin"; version="1.4-2"; sha256="1cpv7jx840inzg98bkhrb5yscx0gpag6br237r5qpnc2gbrd2ikm"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; + coin = derive2 { name="coin"; version="1.4-3"; sha256="0x5rh002w4xgczbvnh7qfv3qv4iv7p6vdrwwyvchqmzgygdh4qwa"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.4"; sha256="1h95fm32w03gxjka71n41lxkinfwpal4dl6hmhfdph8wywn7y50j"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; cold = derive2 { name="cold"; version="2.0-3"; sha256="1y2l1v7s1v3m4nhlnl72n075h53vm93vxmfn4b6269n690wl9s6d"; depends=[cubature MASS]; }; colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; - collapse = derive2 { name="collapse"; version="1.9.6"; sha256="07mmmynkx0pz476vf16if5nwwjp1zp3nhzjlw0hmvkiiwdr590rg"; depends=[Rcpp]; }; + collapse = derive2 { name="collapse"; version="2.0.3"; sha256="16y4qxqr4k04690xn8s6c9fr3igpk34pgxygxkc41gc1na0ym37v"; depends=[Rcpp]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; collateral = derive2 { name="collateral"; version="0.5.2"; sha256="1wnzgpayjsqnqry0cdmkijyjkkjhbc8hxwlkx7aj9qwaiz7wiibr"; depends=[crayon pillar purrr]; }; collatz = derive2 { name="collatz"; version="1.0.0"; sha256="02dvivahpq3zyiyhx7w36bs3dw1p2r3g167sjf3k173q7rr77p0m"; depends=[gmp]; }; collections = derive2 { name="collections"; version="0.3.7"; sha256="003zlp5s2ilq3pq0imlp7p46jkfihwzg1hkkgk7378ikcbwnz17z"; depends=[]; }; collidr = derive2 { name="collidr"; version="0.1.3"; sha256="18ki8mwf5ihbgfbhdbbk9ljs44js3rqgl1g6g3ch6dynz61sr6hn"; depends=[dplyr jsonlite stringr]; }; - collin = derive2 { name="collin"; version="0.0.2"; sha256="12gxndq5xqfvc9m10y6pjf99npr65dp1fhpy5lg9wnq7r4zv2610"; depends=[dlnm MASS mgcv nlme VGAM]; }; + collin = derive2 { name="collin"; version="0.0.4"; sha256="0dh3k9rh1ykrd5nvp5nh4q7zvv835hx8ydpyml88d90ksy8za90p"; depends=[dlnm MASS mgcv nlme VGAM]; }; collpcm = derive2 { name="collpcm"; version="1.2"; sha256="0v7a6mjchkahmxyf68ii051s1hvarb6knkmnhq5lfw8n4bdxh39x"; depends=[gtools latentnet network]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; - coloc = derive2 { name="coloc"; version="5.2.2"; sha256="0358y5ifpyldylqcqkipmdsysg98l9f12ss5pklz3zia3ja4wc2a"; depends=[data_table ggplot2 susieR viridis]; }; + coloc = derive2 { name="coloc"; version="5.2.3"; sha256="0l318ad8sn151fjibgfvy082ar29f8c6x3qlmmhal2fq2fbbv795"; depends=[data_table ggplot2 susieR viridis]; }; colocalization = derive2 { name="colocalization"; version="1.0.2"; sha256="0jrrh9nxjl3261rp1fnjfnydpxwpi7v0d20kzd0xc6awf52gydbb"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; colocr = derive2 { name="colocr"; version="0.1.1"; sha256="0ijykza6fdmwbr5zbyfjf382anrxh0lb9hlallyawfi6z076fv7j"; depends=[imager magick magrittr scales shiny]; }; @@ -7719,10 +7724,10 @@ in with self; { colorSpec = derive2 { name="colorSpec"; version="1.4-0"; sha256="02k2264kc9104jayjf4j7kniwxialw7f1f3l3fvzz3nmwv71bhw3"; depends=[]; }; colorblindcheck = derive2 { name="colorblindcheck"; version="1.0.2"; sha256="1vy4ls5fmzy1bx2garhkvy2f4wqwjy2ph9b3jlzdl5f2lpx2mwq2"; depends=[colorspace spacesXYZ]; }; colordistance = derive2 { name="colordistance"; version="1.1.2"; sha256="14j63anmf4j1lmcd7nyr9k7alhycdkrr5yiar262j8wha68f245n"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png qpdf scales scatterplot3d spatstat_geom]; }; - colorednoise = derive2 { name="colorednoise"; version="1.1.0"; sha256="0x6l9civgqr6lbvdxnhzm30ykx9i6k1q3n6skhnq9b6b52zwrcx4"; depends=[data_table purrr Rcpp RcppArmadillo]; }; + colorednoise = derive2 { name="colorednoise"; version="1.1.1"; sha256="1q6khnnv2m50fddq6hmr0kiwf46gabd91d4r8f491r76536im37i"; depends=[data_table purrr Rcpp RcppArmadillo]; }; colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; }; - colorhex = derive2 { name="colorhex"; version="0.1.2"; sha256="01y68pimasvmbpmmmws4j2pmjizmglcnanwfbyqdz107mv3rhf7s"; depends=[ggplot2 rvest xml2]; }; + colorhex = derive2 { name="colorhex"; version="0.1.4"; sha256="0k045p28ll0kb0zcwifxn9ami89izrsn1swmd1ayf8kqgjab6qh9"; depends=[cli curl ggplot2 httr2 rvest]; }; colorist = derive2 { name="colorist"; version="0.1.2"; sha256="0vakfv8rq0l55qzb8cj78zbyvcrh9j7ixjap95d144g3b617h6x3"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; }; colorizer = derive2 { name="colorizer"; version="0.1.0"; sha256="1c0rgjxzjwkaxdnkmcgn9f0mmcxna724cq60q79hzjindbl4r6bk"; depends=[dplyr httr magick magrittr purrr stringr tibble]; }; colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; }; @@ -7731,9 +7736,9 @@ in with self; { colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; }; colorscience = derive2 { name="colorscience"; version="1.0.8"; sha256="11fy8545g93b8dn2imihsb031lnf5g5z17km8q07q4y6g96xdbdv"; depends=[Hmisc pracma sp]; }; colorspace = derive2 { name="colorspace"; version="2.1-0"; sha256="0k31hazd2rq5lyg3y89y2v5jqadz2qlxd1bhvj89q4aldfxql1q4"; depends=[]; }; - colouR = derive2 { name="colouR"; version="0.1.0"; sha256="050g78k8qkqcpipc1l425k1p2cwgqj7d9yc2bryizy6j4avdmiy2"; depends=[dplyr ggplot2 httr jpeg pixmap png]; }; + colouR = derive2 { name="colouR"; version="0.1.1"; sha256="0dchwa6nqikdm7chzavimc5cayhrbrl0hzr8xg8y15nvb8b2vqj6"; depends=[dplyr ggplot2 httr jpeg pixmap png]; }; colourlovers = derive2 { name="colourlovers"; version="0.3.6"; sha256="13fqn6hbqjk3d8krpqb3hmsq06qrbks8a9ia5441hd6m7m8wjjkc"; depends=[httr jsonlite png XML]; }; - colourpicker = derive2 { name="colourpicker"; version="1.2.0"; sha256="12k3m2s49pc1p2hzd4zqqzzdf94q7hhqz7zgp8w908a6w3p80b5w"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; + colourpicker = derive2 { name="colourpicker"; version="1.3.0"; sha256="0415238r7a8xrp3kvq8lczzxz534irj2q1zfbb0pl7xfs6663wn7"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; colourvalues = derive2 { name="colourvalues"; version="0.3.9"; sha256="0prrvkj3xi09fbjz9sd12nvqmsm47fkpw9v9kxsrx3wgm1vi49in"; depends=[BH Rcpp]; }; colourvision = derive2 { name="colourvision"; version="2.0.4"; sha256="1abrp6x9wdl5bdbysgziznzmiaik8v4n76b4bgnlk13mwbhfn47h"; depends=[Matrix]; }; cols4all = derive2 { name="cols4all"; version="0.6"; sha256="1vgwb9rpnbwadpbjw9cyvf34w69wp8ml55skdnj59bqmn94a6fq4"; depends=[abind colorspace png stringdist]; }; @@ -7741,6 +7746,7 @@ in with self; { comFuncs = derive2 { name="comFuncs"; version="0.0.6"; sha256="0li89pgvvlzv9gkzkvnpwxl04fx5djsg0w80bk2mj45h5ark5s37"; depends=[shiny]; }; comat = derive2 { name="comat"; version="0.9.4"; sha256="0wj1j61phc6nxg25pqqf2xapvnxpk5qyigmwk6xi92wnvv5nrd00"; depends=[Rcpp RcppArmadillo]; }; comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; + combat_enigma = derive2 { name="combat.enigma"; version="1.0"; sha256="1hz1fbjfsmz5m6mzhq7pyvx2pdm0v6f3afpzjnz0xnz30ckfgshr"; depends=[]; }; combinIT = derive2 { name="combinIT"; version="2.0.0"; sha256="1l2ypnrm2qi1z10c2qyyaqqcjgk3mgsh80b3j9zrjwq9zdakrhi5"; depends=[mvtnorm Rcpp RcppArmadillo]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; combinationpvalues = derive2 { name="combinationpvalues"; version="0.1.4"; sha256="0n5dhgss8mrxshfixpc10g1p7l06hcn3fbk7l9sp92ap64kalz6c"; depends=[chi dplyr spatstat_utils]; }; @@ -7750,13 +7756,12 @@ in with self; { combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; - cometr = derive2 { name="cometr"; version="0.2.0"; sha256="0fbg1lfw0q4lfk4svflfwjfmwxbrdvmrvxry90xp39i7g8zd2ahd"; depends=[callr httr jsonlite R_utils R6 yaml]; }; + cometr = derive2 { name="cometr"; version="0.4.0"; sha256="022fz7b94xl56ss1773n3g9zwfjm8mqfqds68ngvfq5498npd9z5"; depends=[callr digest httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.11"; sha256="17hby9qah3bd4p3rfhd1lf3yaz5qxxd4p5aaq1ql7jdixb9p51q0"; depends=[plyr reshape]; }; commafree = derive2 { name="commafree"; version="0.1.0"; sha256="0dn6ps6nvinwaxc8js5bq2kg78nzrf7ijbi77c7jan8z50d19m0p"; depends=[]; }; - commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; - common = derive2 { name="common"; version="1.0.8"; sha256="0l2gdgiz6hwvfsgln0mdsv14f15q8g1rd8si68kcdx5fg1x3p9q3"; depends=[]; }; + common = derive2 { name="common"; version="1.0.9"; sha256="1qizisg38kmmszm0g8vj7ipkjadg6s95n56wlf63gq3plnkjnibv"; depends=[]; }; commonmark = derive2 { name="commonmark"; version="1.9.0"; sha256="13slfv9xpd5fhccw6xgm274d338gmpvc4sdzd943dm684rd1ml3d"; depends=[]; }; - commonsMath = derive2 { name="commonsMath"; version="1.2.7"; sha256="02i6pn568z6h2lnnalv7z3dd6xvh79ki8wy4h42qq05766x3xq2r"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.2.8"; sha256="0qbb7c5xqffq17i636qf9ppanxlmph9wym9bz6n4dhscfniw14q8"; depends=[]; }; communication = derive2 { name="communication"; version="0.1"; sha256="08fkllwwcw2llpg5ivxhqghc88qfg1vdy0ciif3xazhhymb8wavb"; depends=[abind diagram GGally ggplot2 gtable gtools igraph magrittr plyr purrr RColorBrewer Rcpp RcppArmadillo reshape2 scales signal tuneR useful wrassp]; }; comorbidity = derive2 { name="comorbidity"; version="1.0.7"; sha256="189z23a66mz10rzqzgljkygyrgishm4mzzrqhqs1ba335dzvzm3d"; depends=[checkmate data_table stringi]; }; comorosmaps = derive2 { name="comorosmaps"; version="1.0.0"; sha256="1rjsgvln5wa7bbh4iqpfvmdqvmx4cgl8mxxkar76rkam9r54hwhv"; depends=[dplyr magrittr sf]; }; @@ -7765,15 +7770,14 @@ in with self; { compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.2"; sha256="0r3d03yj5fjzfc6awc16x9420366dcy3nhvibjlrn0m10il714pc"; depends=[]; }; compareDF = derive2 { name="compareDF"; version="2.3.5"; sha256="1sq30ndlidpmyvpqkzhq5shy52i22p80lcfar3p8dqymndg1bgyl"; depends=[data_table dplyr htmlTable openxlsx rlang stringr tibble tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="4.7.0"; sha256="02g68vyx8z79jqmg3bvkqf0bsr2000ard26c4xp1g03ybn8xws06"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; }; + compareGroups = derive2 { name="compareGroups"; version="4.7.2"; sha256="16vpfa3h01k5mcdz6ymprc8sdvpvy6lvrjv7x3w28g78v163wgx8"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown survival writexl]; }; compareMCMCs = derive2 { name="compareMCMCs"; version="0.5.0"; sha256="0g3fzazfs6f8ni251ilzk0q65hvgfhglly7v4rmkl4jwhzvsz1yr"; depends=[coda ggplot2 nimble R6 reshape2 xtable]; }; comparer = derive2 { name="comparer"; version="0.2.3"; sha256="1025r91cag4d1bpnpx5h7ja0a57k4rs9z1s3a90pq3h91rdcsr1c"; depends=[R6]; }; - comparison = derive2 { name="comparison"; version="1.0-5"; sha256="0vg8s9j2xjzv7bidd59givxgcqzhdd29q84dj4ww2a6vkmq269r7"; depends=[isotone]; }; + comparison = derive2 { name="comparison"; version="1.0.8"; sha256="0q5x1ank48w9zsfxswahjl7v6f46qxj70lvyn2pj7sz78nfpqjj6"; depends=[CVglasso isotone]; }; compas = derive2 { name="compas"; version="0.1.1"; sha256="0hhqg2xsifnh1v931mmfij6s5idy9s984hdnrkp9n3f3azgwvcz4"; depends=[bio3d Rcpp RcppEigen]; }; comperank = derive2 { name="comperank"; version="0.1.1"; sha256="0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m"; depends=[comperes dplyr Rcpp rlang tibble]; }; comperes = derive2 { name="comperes"; version="0.2.7"; sha256="1qcrm0mw90gkx0dcka2bsszrmcbl46lrbgp5i58xbws9s5i54lff"; depends=[dplyr magrittr rlang tibble tidyr]; }; competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.7.1"; sha256="0s8n62hssx0qkznf0x6gw9yzlngiqgjw34k9wyhlh5iiwq4fyc3x"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; - compicc = derive2 { name="compicc"; version="0.1.0"; sha256="1j2yy4dw3g96vpm3dq81dixhfzm3nqqawphmmg9hcsqir5f6xg9a"; depends=[irr]; }; compindPCA = derive2 { name="compindPCA"; version="0.1.0"; sha256="1v7fppbb1pswd1d1bw0szmmjc51smnmal5psd98ms5cfm7yv597g"; depends=[factoextra]; }; compindexR = derive2 { name="compindexR"; version="0.1.1"; sha256="065a5f406zbxqjy7v6r3bqnybxsnvdlds8rdm3kq62smkch7cf4x"; depends=[car dplyr NlcOptim pracma]; }; completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; }; @@ -7801,28 +7805,29 @@ in with self; { concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; }; concordancer = derive2 { name="concordancer"; version="1.0.2"; sha256="1hkm0ybzaiyd2qsic11gjkq2iw7j9rw85rfgrss0qmnak506kim7"; depends=[Rcpp]; }; concreg = derive2 { name="concreg"; version="0.7"; sha256="0g4my3ra9p797vcky5hsgcicsdbmczgd8fklxrkw2jrgwc0xrkaf"; depends=[survival]; }; + concrete = derive2 { name="concrete"; version="1.0.5"; sha256="05hl3ikdh8776hgw0wqz6acir8brkszgg01169q2v1dhgcsnfyjb"; depends=[data_table MASS nleqslv origami Rcpp RcppArmadillo SuperLearner survival zoo]; }; concstats = derive2 { name="concstats"; version="0.1.6"; sha256="1gcv6lsrfdb12alaksmw40fv8p909hifjwrrgy9r12nb4ci3fg0x"; depends=[]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.2.0"; sha256="09vbwpn4i37cn8gs9pr62mvzzbqrfm756370zas97kjbnmx8glbj"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.4"; sha256="11ji8q8qhmpyc1zcdckjsq40bg2gbhbp0222fsrdkfglq3h4dg5x"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; condTruncMVN = derive2 { name="condTruncMVN"; version="0.0.2"; sha256="1dicfa82yg8k83lnb5c17jnqwgkazpb8404kfzdf6ikmndwjn0zg"; depends=[condMVNorm matrixNormal tmvmixnorm tmvtnorm truncnorm]; }; - condformat = derive2 { name="condformat"; version="0.10.0"; sha256="1iyvghcz5x9kg4jbh4fl97rcwcvi8rcp6rngvgqiyzdg8sbfxkr6"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; }; - condir = derive2 { name="condir"; version="0.1.3"; sha256="09b0nfdi39mq0531bjzmk8wnmzkyvcd2q5fyk8lnam3n6fz3dg2y"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; + condensr = derive2 { name="condensr"; version="1.0.0"; sha256="0gx8yd7ldm6wzfqxy6axcrpqf3gcvcx0il6rd4jmyx3k43s52y09"; depends=[assertthat fs glue whisker]; }; + condformat = derive2 { name="condformat"; version="0.10.1"; sha256="0nyl2wa9vfi65g0v54a4zpppw5yz7rlh2x6l2v9dgvwg533hkf72"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr magrittr openxlsx rlang rmarkdown scales tibble tidyselect]; }; + condir = derive2 { name="condir"; version="0.1.4"; sha256="0aknc1qj95wf99kqzcsfqhjpvbgazv7jqpwla1g146b6fkig532h"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; }; - condmixt = derive2 { name="condmixt"; version="1.1"; sha256="1x6n3ylaa9ywvz7v63i2pvd2lxm95wq19xy741g9hy73ld7hd7zn"; depends=[evd]; }; - condor = derive2 { name="condor"; version="2.0.0"; sha256="13x5cg55kmmk9645kydlgsj672fv6fispn8czdxilfkavpmpgndm"; depends=[ssh]; }; + condor = derive2 { name="condor"; version="2.1.0"; sha256="0v8crlg5pjqa2d37pb6744srn60cqzcih2100y3xh2a7wjml2d4w"; depends=[ssh]; }; condorOptions = derive2 { name="condorOptions"; version="1.0.1"; sha256="05bc0l62v2js1wd7ll006gjh3iqz99kjw28c7811kgqw3rkdda76"; depends=[dplyr ggplot2 magrittr tibble]; }; conductor = derive2 { name="conductor"; version="0.1.1"; sha256="1kjnjpaiya5ym20y1vry53dshna14dvcjfzgbfizg4g1izsg1czy"; depends=[htmltools R6 shiny]; }; condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; }; condvis2 = derive2 { name="condvis2"; version="0.1.2"; sha256="0zxr0m50gyg5b1ghdx5ysq8f389gg00zx719zqb47ign83xlbn63"; depends=[cluster colorspace DendSer ggplot2 gower plyr RColorBrewer scales shiny]; }; - coneproj = derive2 { name="coneproj"; version="1.16"; sha256="06injsc860hcgn5wh81i9lw4nmrc1bmv3dksk5pnp62x1yykhnnh"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.8.2"; sha256="1hz8ljs11myb9jfl9i68an4nlylkmcy7qhpgr51mcyyxg2m3fyix"; depends=[fitdistrplus pracma rootSolve statmod]; }; + coneproj = derive2 { name="coneproj"; version="1.17"; sha256="1lxxap6zd6h35w0kkxdnnbi8a4j5c78wcfslm5823dx9apg28q0s"; depends=[Rcpp RcppArmadillo]; }; + conf = derive2 { name="conf"; version="1.8.3"; sha256="1gl9y4ci3x86xmggwr2jc9skzcqrk5nky3b0dvflw1lhscgr9998"; depends=[fitdistrplus pracma rootSolve statmod]; }; conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; }; confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; }; - config = derive2 { name="config"; version="0.3.1"; sha256="0l2zp7v6qaz72dclcbjrlis633zlwp8rsi5azr7iw127iyz7i26l"; depends=[yaml]; }; + config = derive2 { name="config"; version="0.3.2"; sha256="0r8hjg7jrhr9lncb82xmq2slygv3slacd2w8ds6shnvdp3122p3v"; depends=[yaml]; }; configr = derive2 { name="configr"; version="0.3.5"; sha256="1qlfza9fwqdhw37gxhgxgp4x2dg1qlvdw0rf9fn6a8hgjaj9z8a3"; depends=[glue ini jsonlite RcppTOML stringr yaml]; }; configural = derive2 { name="configural"; version="0.1.4"; sha256="1vi6xczqlrzhrfv418wlvqiv69kap4awlxkjpgi7b1ix5ayc8mq8"; depends=[]; }; confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; }; @@ -7833,6 +7838,7 @@ in with self; { conformalInference_fd = derive2 { name="conformalInference.fd"; version="1.1.1"; sha256="08r669apkiyjydz9yy9pdiy9rl2wyg50bypvsm9w5i1aryzgmadr"; depends=[fda future future_apply ggnewscale ggplot2 ggpubr scales]; }; conformalInference_multi = derive2 { name="conformalInference.multi"; version="1.1.1"; sha256="1xc879ygv9avamy29a6rdfb6pknaz82f3k6392c8a90sgfn3bx3d"; depends=[future future_apply ggplot2 glmnet gridExtra hrbrthemes]; }; conformalbayes = derive2 { name="conformalbayes"; version="0.1.2"; sha256="0pl1ajix5v3zckny5angk1rqnalln4agf65yrdva210zl6wp7fzm"; depends=[cli loo matrixStats rstantools]; }; + conformalpvalue = derive2 { name="conformalpvalue"; version="0.1.0"; sha256="1hhx305jl75alp3fp2h7nwp4y80jyg8npbfmns774bnxgp2gwab8"; depends=[e1071]; }; confreq = derive2 { name="confreq"; version="1.6.1-1"; sha256="05bwsj4xa3k7gngnf3ni8j0qw7yd7iycqkarpxm60dy8ayy68bs8"; depends=[gmp vcd]; }; congress = derive2 { name="congress"; version="0.0.1"; sha256="0fkdffapylsqd1xwxrq6jxcas2amaz9xhap6lbyy6grw0ww7phr7"; depends=[cli dplyr glue httr2 purrr rlang stringr tibble tidyr]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; @@ -7841,7 +7847,7 @@ in with self; { conleyreg = derive2 { name="conleyreg"; version="0.1.7"; sha256="1mvbzqd83vd54ig4kbi1v3h4v0j6pyj8a5ja1f3w2n7k8aszy748"; depends=[data_table doParallel fixest foreach lmtest lwgeom Matrix Rcpp RcppArmadillo Rdpack s2 sf]; }; conmet = derive2 { name="conmet"; version="0.1.0"; sha256="0iwr8mmh9lk0psqxkgnd7ldhg57ivbkv0b3a18gli06983mhzjdc"; depends=[dplyr DT foreign Hmisc lavaan openxlsx purrr semTools shiny shinydashboard shinyWidgets stringr summarytools waiter]; }; connectapi = derive2 { name="connectapi"; version="0.1.3.1"; sha256="00fxy94a0nyw608b1cklh603zql027wqaarxmxwy5f1l7arnwd4s"; depends=[bit64 config dplyr fs glue httr jsonlite lifecycle magrittr progress purrr R6 rlang tibble uuid vctrs yaml]; }; - connectwidgets = derive2 { name="connectwidgets"; version="0.2.0"; sha256="1p2sl6689ylx6d6vf0xch8754hnwi53xhjy7ai3wnr72m6ld3a3d"; depends=[bslib crosstalk digest dplyr glue htmltools htmlwidgets httr jsonlite magrittr purrr R6 reactable reactR rlang sass tibble]; }; + connectwidgets = derive2 { name="connectwidgets"; version="0.2.1"; sha256="0lgr36699hnjwkjx56akwwnzkl5qm587yhqamxr6a53nh1j3h11y"; depends=[bslib crosstalk digest dplyr glue htmltools htmlwidgets httr jsonlite magrittr purrr R6 reactable reactR rlang sass tibble]; }; conogive = derive2 { name="conogive"; version="1.0.0"; sha256="0a8v7v0fds0psfnbx9x45way8z1f1xn2ncgbrn5rb6fjq0a1zs4x"; depends=[assertthat checkmate mvtnorm psych]; }; conos = derive2 { name="conos"; version="1.5.0"; sha256="1wdhb3jxh4id6xaghawzip8s264g9jxp4i5xy7jfhi67yfxszx6w"; depends=[abind ComplexHeatmap cowplot dendextend dplyr ggplot2 ggrepel gridExtra igraph irlba leidenAlg magrittr Matrix N2R R6 Rcpp RcppArmadillo RcppEigen RcppProgress reshape2 rlang Rtsne sccore]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; @@ -7850,19 +7856,19 @@ in with self; { conrad = derive2 { name="conrad"; version="1.0.0"; sha256="0n0snn7ppmr1l5y0978sl6bj614p0b5vvh4hw55pjbj9qn1fshaj"; depends=[httr2 jsonlite magrittr]; }; conserveR = derive2 { name="conserveR"; version="1.0.4"; sha256="05b1pqgbd9sh4lyg9zqjfg4019dqp8xj3k1w31qqdld8m3g5lrd6"; depends=[cowplot GGally ggplot2 ggrepel magrittr network rlang scales sna]; }; consolechoice = derive2 { name="consolechoice"; version="1.1.1"; sha256="06xlwrjc9bj8r2ii160mclg56mw9fw2wzms3q68rcb8ril0hqvd3"; depends=[]; }; - consort = derive2 { name="consort"; version="1.2.0"; sha256="1jshk53121w58i4if593qzxm6lcrrggz8parwhqvv6hnbx51rhck"; depends=[]; }; + consort = derive2 { name="consort"; version="1.2.1"; sha256="03xkypy4r84mdif6m331c27haxnyi1s87vvj2f83xxw0m0s5im5j"; depends=[]; }; consortr = derive2 { name="consortr"; version="0.9.1"; sha256="1c71wvr7sckrv4k65l71l160z6d9amzyydbi6mf2b79zh9zv8g1g"; depends=[data_table DiagrammeR dplyr magrittr purrr rlang shiny shinydashboard tibble]; }; constants = derive2 { name="constants"; version="1.0.1"; sha256="11nliijwphqphik95b3xpawpjg7w4s089wdhjci5bw4va4bgd1xm"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constructive = derive2 { name="constructive"; version="0.1.0"; sha256="0rvj9c8vzw0c8yqm5v2j8bnnbwzlz43ga2gd3617q2bw455s4hx9"; depends=[cli diffobj ellipsis rlang roxygen2 styler waldo]; }; - contFracR = derive2 { name="contFracR"; version="1.2"; sha256="1pb1xbmgdpg1svxvhq3jx5dmxszivwzmhd18hmg4rlhym454sh1b"; depends=[gmp go2bigq Rmpfr]; }; + contFracR = derive2 { name="contFracR"; version="1.2.1"; sha256="0yigrrs36q9wl8bla65ks1ykf233j33jwcqbhdhygryfhxp5cxab"; depends=[gmp go2bigq Rmpfr]; }; contTimeCausal = derive2 { name="contTimeCausal"; version="1.1"; sha256="0r2mg0b65xk020v0im2nzfq9644nx0ns2vddiybwz3x5c7z1bpvg"; depends=[dplyr survival zoo]; }; contactdata = derive2 { name="contactdata"; version="1.0.0"; sha256="0lh3m5aln47clyc5pmz75sggqnzgkg68wyrla11zbg9isyh581nw"; depends=[]; }; container = derive2 { name="container"; version="1.0.4"; sha256="0vpha9s5d8mxqdzmbfy92qz78b6gfibwgp1ijq70c5vqs2clkzb1"; depends=[data_table R6]; }; - contentid = derive2 { name="contentid"; version="0.0.17"; sha256="1vnw5hw9vkdqfps8qmj5v523jkil9r9530ap6j4dwx40c6d7nyhb"; depends=[curl fs httr openssl]; }; + contentid = derive2 { name="contentid"; version="0.0.18"; sha256="1lcg7bhvkb3q0c41wlf5hmkx1nhp7h3qv5lc7jcqhsyi80aq8p2s"; depends=[curl fs httr openssl]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; contingency = derive2 { name="contingency"; version="0.0.10"; sha256="155pzw1ifm1c4pjd5wxj9lb89a6wc9l5g1v2rhq8rfswzds89gjv"; depends=[rje]; }; - contingencytables = derive2 { name="contingencytables"; version="2.0.0"; sha256="0dswmxdw4dg0915f2bjm80awhn1pphkz8b62kvr71rpvwlvnf99y"; depends=[boot MASS]; }; + contingencytables = derive2 { name="contingencytables"; version="2.2.0"; sha256="0001pmkdhccymk8i8igmxi09zxiy556qvwgw5b0x5fk7jg5bjlg4"; depends=[boot MASS]; }; contourPlot = derive2 { name="contourPlot"; version="0.2.0"; sha256="0bjwq3p57d6hadln8vwjkh7c9sbb466h3zcq9kpx7kd31z6x8gnz"; depends=[interp RColorBrewer]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.24.2"; sha256="1k7gdjmzgsw3rm90k9gpzlg4b8ma7vxamdj106b6r40q1ypaqha5"; depends=[nlme rms sandwich]; }; @@ -7870,26 +7876,26 @@ in with self; { control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; controlfunctionIV = derive2 { name="controlfunctionIV"; version="0.1.1"; sha256="0g0nakc1mss7837xhs8bymy4cncljjkj7k0n4dvw44gxbc2l8j15"; depends=[AER dr Formula orthoDr]; }; - contsurvplot = derive2 { name="contsurvplot"; version="0.2.0"; sha256="194j1jvxbagwy6in7dym9r9zc6inx65mpwd7xqs9avngy9sh5p6g"; depends=[dplyr foreach ggplot2 riskRegression rlang]; }; + contsurvplot = derive2 { name="contsurvplot"; version="0.2.1"; sha256="0z0s1ym9np9l8pmgbja46w25zr415laa1w68mjz04hq9wrzjjaca"; depends=[dplyr foreach ggplot2 riskRegression rlang]; }; convdistr = derive2 { name="convdistr"; version="1.5.3"; sha256="1cp2qpyl0jxp0lwznlc94mcigfgysyq9xmi1z7ihd7jxd9mk8aw9"; depends=[dplyr extraDistr ggplot2 MASS pryr RColorBrewer SHELF shiny tidyr]; }; convergEU = derive2 { name="convergEU"; version="0.5.4"; sha256="0sml8ill3jbf5rf8vi8m74w8q67wsdj1askfn0vmfwr4mvadxsim"; depends=[broom caTools dplyr eurostat ggplot2 ggpubr purrr rlang rmarkdown stringr tibble tidyr tidyselect]; }; - convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertbonds = derive2 { name="convertbonds"; version="0.1.0"; sha256="0xb6b5xqcgapmvrq3ivcknsbg9m4zkwff7i7l7j78nqafdm45jni"; depends=[]; }; - convertid = derive2 { name="convertid"; version="0.1.3"; sha256="00mi1jwb5b07j182zf68fqasb9ggkbk4c8dd1i0wlad7az2rz494"; depends=[AnnotationDbi biomaRt org_Hs_eg_db org_Mm_eg_db plyr stringr xml2]; }; + convertid = derive2 { name="convertid"; version="0.1.6"; sha256="1ys3yi2g3m69zwc5qca8szhawgvk1wxny4sv2z6cly0cb119fpz5"; depends=[AnnotationDbi assertthat biomaRt org_Hs_eg_db org_Mm_eg_db plyr rappdirs stringr xml2]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="2.0.1"; sha256="12i8hgyf2d8fgzblcnrqdpz8wlb8fvczp8aqz23pndp6l7isvgyj"; depends=[ape cluster geiger MASS phytools]; }; - convexjlr = derive2 { name="convexjlr"; version="0.8.1"; sha256="1x2ra1xcyd7bvc7wq49wpihh0g9ygh1bq5214vvrhfrjfjifvlaw"; depends=[JuliaCall magrittr]; }; convey = derive2 { name="convey"; version="0.2.5"; sha256="0vji97sip7p2xpbd3mhx2a6aw46zjky561rypa3hb8xpag16fna5"; depends=[survey]; }; convoSPAT = derive2 { name="convoSPAT"; version="1.2.7"; sha256="1pmiirigjdkrb3pzqcw6qlh6418z384mvaxqw5mrcm1gxzrqp649"; depends=[ellipse fields MASS plotrix StatMatch]; }; cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; }; - cookies = derive2 { name="cookies"; version="0.2.2"; sha256="024xccsx463hhmy4j56n4bxysp2yinfy78rvnvlvx2dzq70xamyv"; depends=[cli clock glue htmltools httpuv jsonlite purrr rlang shiny vctrs]; }; + cookiecutter = derive2 { name="cookiecutter"; version="0.1.0"; sha256="0kpyn20xk2sfb5zh18yxl5qjf628max186v1knq4f2mik1n4lwbd"; depends=[fs jsonlite mime purrr readr rlang stringr whisker]; }; + cookies = derive2 { name="cookies"; version="0.2.3"; sha256="1dpil57grnqn34b682fakzsrh2xghc566nhqdgnrjd7ly59v0z3x"; depends=[cli clock glue htmltools httpuv jsonlite purrr rlang shiny vctrs]; }; cooltools = derive2 { name="cooltools"; version="2.1.27"; sha256="1f22qpwf9ynqf9n4hl0kz6cy8bsz47dcmvz0wawq2isw5wn3jcs5"; depends=[bit64 celestial cubature data_table FNN jpeg MASS plotrix png pracma randtoolbox raster Rcpp sp]; }; coop = derive2 { name="coop"; version="0.6-3"; sha256="0ww99ssgawsgn6rqy838wbx6iirzdrzyxirvz084ih8j50blx420"; depends=[]; }; coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; }; - copBasic = derive2 { name="copBasic"; version="2.2.0"; sha256="1n1y35rciapnxc8d20mqp1gk0m463farp06dah075kw6yprcx4p6"; depends=[lmomco randtoolbox]; }; + copBasic = derive2 { name="copBasic"; version="2.2.2"; sha256="0klqvgnrhi9lxiq57ingbp3w3mv8gvhrmlbxnydkya2vmz9rcqk0"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-4"; sha256="1wvp7khp0f0x6skiq1d6npndb09ak6d6ijmx907gfrd6b0ydaklb"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; + copcor = derive2 { name="copcor"; version="2023.8-27"; sha256="0fs6zaxjv7ww2f35hwbdgb810cb4mcqxg260fxk3pfcfq3rwdw9a"; depends=[kyotil]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; - copent = derive2 { name="copent"; version="0.3"; sha256="0w82z4m14q95pmdj6wgfrhs09vniqwdphsc0xgzir4i14harm9g6"; depends=[]; }; + copent = derive2 { name="copent"; version="0.4"; sha256="1v9kv6aw9q43y7mzsmklq0m76sykfs162hwy204k2xcpmnazgdkm"; depends=[]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; copre = derive2 { name="copre"; version="0.2.0"; sha256="0xb1xa134r145qaycl0ldldx521gvjlwd9c64nnwmllh01iv7ihb"; depends=[abind BH dirichletprocess pracma Rcpp RcppArmadillo]; }; cops = derive2 { name="cops"; version="1.3-1"; sha256="17lq7ag0bwg3i7jvzca4qyzg8ixhdikrcgpgskkm26i83886zid2"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud Rsolnp scatterplot3d smacof subplex]; }; @@ -7905,25 +7911,25 @@ in with self; { corTest = derive2 { name="corTest"; version="1.0.7"; sha256="1gip8rxvbhrckwmjwmxbmycndg4jrl75x8qda9l35znfv9r7p0nq"; depends=[Biobase clusterGeneration ggplot2 igraph MASS Matrix]; }; cora = derive2 { name="cora"; version="0.1.0"; sha256="0mx7dn05js8hqr3xgrbp2kv25y6qjlm86y6asy17hwbbvbsmama9"; depends=[]; }; corazon = derive2 { name="corazon"; version="0.1.0"; sha256="1advzmbmnpq18ym2k8rcxhsdzfscl68jss8wbqcir68951x2aqi3"; depends=[htmltools]; }; - corclass = derive2 { name="corclass"; version="0.2"; sha256="0hsbbzzadj8yc4zmb88ncx90sfxpyfd9xmdwhb08m1z1jw96zhxp"; depends=[igraph]; }; + corclass = derive2 { name="corclass"; version="0.2.1"; sha256="09g8pvxw7pb1bxz3pviqgarfa41cqfc5k0ablli7sy5iq7jn8alh"; depends=[igraph]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; cordillera = derive2 { name="cordillera"; version="1.0-0"; sha256="047sl2pvfh800ggc8v62p06nfbdz8rwn4alviplf5kbvi0k3s85n"; depends=[dbscan]; }; coreCT = derive2 { name="coreCT"; version="1.3.3"; sha256="18id8vf3saj71lxr0i85s9sfhfxmk5x9bihg4m6fz3i9y1akbvq6"; depends=[igraph oro_dicom plyr raster]; }; coreCollection = derive2 { name="coreCollection"; version="0.9.5"; sha256="1r5x5j91k0zfa2krcd0v2hsifv8a3f7czv6yb7zi7qx5wqak5kk9"; depends=[R6 Rcpp]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-3"; sha256="0i08hrkp5slwhwnz34ndl9y37km2zmmysmm9swvvzmisihjrmb2d"; depends=[rJava XML]; }; coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; - corehunter = derive2 { name="corehunter"; version="3.2.2"; sha256="04rqmhs7h0kk42la4r42pihz12z2rs36avb2wbpdnmdjiyz5xs6p"; depends=[naturalsort rJava]; }; + corehunter = derive2 { name="corehunter"; version="3.2.3"; sha256="1dx8k273jrr8pn2s1czg69si740zin8zcka0m62fip22b0dw4srp"; depends=[naturalsort rJava]; }; corels = derive2 { name="corels"; version="0.0.4"; sha256="1ygbvhnz304y4y708ygr4x6kbwv7bfpjd5hhcrcc6lma59h7arfn"; depends=[Rcpp]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; - corncob = derive2 { name="corncob"; version="0.3.1"; sha256="0y1iw8kdd8smw2j590s4ndnzihh3g9hlq49dcw38zcf7jqydjw28"; depends=[detectseparation dplyr ggplot2 magrittr numDeriv optimr phyloseq scales trust VGAM]; }; - cornet = derive2 { name="cornet"; version="0.0.8"; sha256="0vq4n4rd56wrr03448n11g7f7bqrlqq018w3caxmyy6sf7dzpjnx"; depends=[glmnet palasso]; }; + corncob = derive2 { name="corncob"; version="0.3.2"; sha256="0ipcs9crwlvi1gxqj87318dxx2hv4xrvcinci262z2zq8br1s3ps"; depends=[detectseparation dplyr ggplot2 magrittr numDeriv optimr phyloseq scales trust VGAM]; }; + cornet = derive2 { name="cornet"; version="0.0.9"; sha256="1gd0sbf3kqzd8zwkbwbj9d8cyz52iglh1czv5ydf7nw1z8hx33r4"; depends=[glmnet palasso]; }; coro = derive2 { name="coro"; version="1.0.3"; sha256="0wvxdpdh3xrskz5s5wfkva856x849knx1jigbf0ff6s6n6qjjxsf"; depends=[rlang]; }; coroICA = derive2 { name="coroICA"; version="1.0.2"; sha256="0pcz2256liczrn2gik8b5331rgzlxjrm7rzn1ialhifkiinifnva"; depends=[MASS]; }; corona = derive2 { name="corona"; version="0.3.0"; sha256="1hggsmvmbim7f6bybmdhxznmqib0k2plm370mjs7dp85i564sjkm"; depends=[gganimate ggplot2 gridExtra plyr qicharts2 reshape2]; }; coronavirus = derive2 { name="coronavirus"; version="0.4.1"; sha256="038133msw161684bzxkwc9z4jkjnsmh13wf4nydphn0hsm961bi5"; depends=[devtools]; }; corpcor = derive2 { name="corpcor"; version="1.6.10"; sha256="028fw61n61i79fhnaqx7gmdifdpbvp3yiaq9vvfrbv4k7i84r83i"; depends=[]; }; - corpora = derive2 { name="corpora"; version="0.5-1"; sha256="1bkmarwxqfb4jf7aa1x82lhykmy25z1pknfmq1g1g789g074090k"; depends=[]; }; + corpora = derive2 { name="corpora"; version="0.6"; sha256="1l1dnnm9zvgxr7jrqrz0a9m5dwz7mra0mr3i9qxjvgrzc6n6cxw8"; depends=[]; }; corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.6"; sha256="1d3a1dfch9fsgq0d3am3j4ygab9k1n7px3crwwr33f8n9r3vdwmp"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer re2 rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; corpustools = derive2 { name="corpustools"; version="0.5.1"; sha256="154n9gxzg9cx10sxbb05df9wsr378k2qhkprqr9cyh1q5ll1pki7"; depends=[data_table digest igraph Matrix pbapply quanteda R6 Rcpp RcppProgress RNewsflow rsyntax stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.3"; sha256="11a05rg08fb64zk3wjlid9fl32r14x0n8p030w05q82bxnynprvg"; depends=[colorspace doParallel fields foreach mmand]; }; @@ -7931,7 +7937,7 @@ in with self; { corrViz = derive2 { name="corrViz"; version="0.1.0"; sha256="1blwngvvh316ndfrz2gmi6gq2w08sdckqvdsn4xpzhd4q4nbff5q"; depends=[circlize DendSer GGally gganimate ggplot2 ggraph igraph plotly purrr shiny visNetwork]; }; corrarray = derive2 { name="corrarray"; version="1.2.0"; sha256="1hsk425xjz9p3wwvia7h78dg24qsr5r977xm2ap5z40ah1bw7bzi"; depends=[Hmisc]; }; corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; - correctR = derive2 { name="correctR"; version="0.1.2"; sha256="0mjknma3ffhkmqxfq6lslc6ywc4pmm973s6nn4xsjwai9n4nc1qi"; depends=[]; }; + correctR = derive2 { name="correctR"; version="0.1.3"; sha256="01rmz47mn30zdjc22mrgdj4b9p82gj83ycpk01hcmmwwxflm6m1d"; depends=[]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; correlation = derive2 { name="correlation"; version="0.8.4"; sha256="07fz7wmvrcd6b023jhj3bsrvg4w6i7f1v99jslm0gj84vzmnqzbs"; depends=[bayestestR datawizard insight parameters]; }; @@ -7950,14 +7956,13 @@ in with self; { cosa = derive2 { name="cosa"; version="2.1.0"; sha256="15ygpaqd48xqx0h08v0nf73yzif63r2nzcznlmk0ck2ydx4n85fp"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.2.3"; sha256="0nyvzmqk0rhx10fki29hcrz014bv3r40adqd5d6rbcz66kc4sjy3"; depends=[ggplot2 shiny]; }; cosinor2 = derive2 { name="cosinor2"; version="0.2.1"; sha256="1pp0z86fflqkkllfrzx3vj98kzxjwnawr4a2d8z5q6zhq6v5qrvf"; depends=[cosinor cowplot ggplot2 Hmisc magrittr matrixStats purrr scales stringr]; }; - cosmicsig = derive2 { name="cosmicsig"; version="1.0.7"; sha256="1xixcbnqrsh5mbs9inpddcghlz5r6i3sp94rh6z53bwzggn3dzxl"; depends=[]; }; + cosmicsig = derive2 { name="cosmicsig"; version="1.1.1"; sha256="1xwbfinh73rfdww58zpqmk17ixpzq5rr6cdf4zlnj25xwvj5458l"; depends=[]; }; cosmoFns = derive2 { name="cosmoFns"; version="1.1-1"; sha256="0py0wmdpxk8ldq1wbwg4x1hxkjblar83x3ya30n4377d4lbc3xb7"; depends=[]; }; cosso = derive2 { name="cosso"; version="2.1-2"; sha256="0r0gil5fk4zp33syww40va8h964zn38v0ismw0k4xsh7c8nrr8lm"; depends=[glmnet quadprog Rglpk]; }; - costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; + costat = derive2 { name="costat"; version="2.4.1"; sha256="1h1gm1an5axgi7bf0f7dmxyxzss1859d4lv89z0q4dkk1nq29qd2"; depends=[wavethresh]; }; costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; }; cotram = derive2 { name="cotram"; version="0.4-4"; sha256="152jxkfwcqs1k7xcr1dlqbf0jpc9423g48dxwgjy3bvqnwgi6k21"; depends=[alabama basefun Matrix mlt survival tram variables]; }; cotrend = derive2 { name="cotrend"; version="1.0.2"; sha256="17h67vnpnlv11bf3ka5mlnah9bizxjhvicsvbygy91dqbhjhj9wb"; depends=[xts]; }; - couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countDM = derive2 { name="countDM"; version="0.1.0"; sha256="14mm2pmzfca7z4l8a4pfv7xjcyljrs2k0vbsakxnngn7pwvq2y9v"; depends=[lamW maxLik miscTools numbers]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; countSTAR = derive2 { name="countSTAR"; version="1.0.2"; sha256="054y59r7g4g33ix020m90v8g0c09db59bd9vb7461j0il3amcs99"; depends=[coda dbarts FastGP gbm KFAS Matrix randomForest Rcpp RcppArmadillo spikeSlabGAM splines2 TruncatedNormal truncdist]; }; @@ -7970,7 +7975,11 @@ in with self; { countfitteR = derive2 { name="countfitteR"; version="1.4"; sha256="1aq7v2fy24pf3r6fkmcwvs18r2xc2l1bqablp53xfc7b6kxq3vqn"; depends=[ggplot2 MASS pscl shiny]; }; countgmifs = derive2 { name="countgmifs"; version="0.0.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; countland = derive2 { name="countland"; version="0.1.1"; sha256="0rphpsxfssvrrh8y2kfqzy6im9ga8isl86j0kg7418b6v260l3sh"; depends=[ggplot2 Matrix rlang]; }; + countprop = derive2 { name="countprop"; version="1.0.1"; sha256="0yzrh8zr95b912p3lv0fw7vv5faylwyda0cwfvyg48j98c8hx3yf"; depends=[compositions glasso zCompositions]; }; + countries = derive2 { name="countries"; version="1.0.5"; sha256="18dbax73xq379v63vmnn64qxiil83wvzkm05kqv18jq8q2wgwm69"; depends=[dplyr fastmatch ggplot2 httr jsonlite knitr lubridate stringdist stringr tidyr viridis]; }; countrycode = derive2 { name="countrycode"; version="1.5.0"; sha256="035c8dm1ppkdvjhc78dfmhbyc2n048gkx4q6y5s0ffn3bpymsxzw"; depends=[]; }; + countsplit = derive2 { name="countsplit"; version="4.0.0"; sha256="0b406mpf5gqspjj828qbqx6mc5ab97mh5w4pip8hb8j74q8szpcc"; depends=[Matrix Rcpp]; }; + coursekata = derive2 { name="coursekata"; version="0.14.0"; sha256="17ad24xipyx6dcqflrv1gbia38dsk62w8a3hjydz7aw426spqkx5"; depends=[cli dslabs ggformula ggplot2 glue Lock5withR lsr Metrics mosaic pak palmerpenguins purrr rlang supernova vctrs viridisLite yesno]; }; covBM = derive2 { name="covBM"; version="0.1.0"; sha256="0ky1lhr8m4hy2ss1nr2xymf6cmj1rr8px8zsxna6bsisf5bq4j4w"; depends=[nlme]; }; covKCD = derive2 { name="covKCD"; version="0.1"; sha256="0rbrhdrrb47gkm8nk8mmlgrr1fsk53fycl9zspgr9085xax2bf2r"; depends=[]; }; covRobust = derive2 { name="covRobust"; version="1.1-3"; sha256="0zcfala4l0j4w0sx5hlw40vxiypans3d7pgkxy25nj0d2m1jkvba"; depends=[]; }; @@ -7978,12 +7987,13 @@ in with self; { covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; }; covatest = derive2 { name="covatest"; version="1.2.3"; sha256="04pycgxiq3h2j70vzqac5li0iqsyg005zpqfjr9iw17y0p51jv0a"; depends=[gstat lubridate mathjaxr sp spacetime V8 zoo]; }; covdepGE = derive2 { name="covdepGE"; version="1.0.1"; sha256="0xlz01h6lnp7g9vi9s84l8cmgqvr4pql1fs0c1n51gsx4pkaz5l1"; depends=[doParallel foreach ggplot2 glmnet latex2exp MASS Rcpp RcppArmadillo reshape2]; }; - coveffectsplot = derive2 { name="coveffectsplot"; version="1.0.2"; sha256="1407zwxg5235qfy4zkjax28qasjwx81pzjgaix6wbvlwanspsw0g"; depends=[colourpicker data_table egg ggplot2 shiny]; }; + coveR2 = derive2 { name="coveR2"; version="1.0.0"; sha256="00jldj11f7chnvf4mv4wshr9g1yxpy24g31z4r9h4mhvhn9i304i"; depends=[autothresholdr dplyr jpeg lubridate mgc terra tidyr]; }; + coveffectsplot = derive2 { name="coveffectsplot"; version="1.0.4"; sha256="172spmc5x5ln38rrybafa4143mhddlv6602r9njc6lbzswhlpcml"; depends=[colourpicker data_table egg ggplot2 shiny]; }; covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; covglasso = derive2 { name="covglasso"; version="1.0.3"; sha256="1201z49w7lacf479gp7q2v5lv8vmprppj656zzi5a4yynm7x2sll"; depends=[Rcpp RcppArmadillo]; }; - covid19_analytics = derive2 { name="covid19.analytics"; version="2.1.3.1"; sha256="120ska2iyiihqb1mml5s28sav4d6cbs3lad5rfj6zi8lblli8ini"; depends=[ape collapsibleTree deSolve dplyr DT gplots htmlwidgets pheatmap plotly readxl rentrez shiny shinycssloaders shinydashboard]; }; - covid19br = derive2 { name="covid19br"; version="0.1.6"; sha256="1p8zq4hppcw209vwb54s8cdxbvkdw0jhs6wj8zig4kjb4vfmirir"; depends=[curl data_table dplyr httr rlang sf tidyr]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="2.1.3.3"; sha256="009cqf1xnhkw11vi1z0c0zm8ld3ifgricn0rlik5gycvz8ygwprn"; depends=[ape collapsibleTree curl deSolve dplyr DT gplots htmlwidgets pheatmap plotly readxl rentrez shiny shinycssloaders shinydashboard]; }; + covid19br = derive2 { name="covid19br"; version="0.1.8"; sha256="1jcxwyxc2rdarniy7bqkx7m300i1i0lvqdvzvkr9synvhpgcv4b0"; depends=[curl data_table dplyr httr rlang sf tidyr]; }; covid19brazil = derive2 { name="covid19brazil"; version="0.1.0"; sha256="014i0wnr7nn6knyz28hv9dymkr5yy2qwd2jqybzjdlfikf42baba"; depends=[devtools dplyr]; }; covid19dbcand = derive2 { name="covid19dbcand"; version="0.1.1"; sha256="0864xixdxzaj697al0c2gq3nk05q1pn0pc9lc2dyki71g5r67i7h"; depends=[]; }; covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; }; @@ -7998,7 +8008,7 @@ in with self; { covidnor = derive2 { name="covidnor"; version="2023.05.18"; sha256="1aidi1bwsp1a8iym5b6chmv95cxrafhjgzn1zaajbijlgrjdqixc"; depends=[data_table]; }; covidprobability = derive2 { name="covidprobability"; version="0.1.0"; sha256="00kiwxhkbq70650azgd6ylh7w7w4h5l8l7rmr2bijlm05xn3g154"; depends=[]; }; covidsymptom = derive2 { name="covidsymptom"; version="0.9.3"; sha256="0svfc911n6cl056vn7l9khg4c6rc54qhxsgjg3jpxqvikyqmmrx7"; depends=[]; }; - covr = derive2 { name="covr"; version="3.6.2"; sha256="0ns8xbq1l21mg8p2aiqv5h306a3vpn64j6jrgzbv8iv1a7kqrrmc"; depends=[crayon digest httr jsonlite rex withr yaml]; }; + covr = derive2 { name="covr"; version="3.6.3"; sha256="17m2zzgfghr7gzcdgim21vsl12nd4714867dcp9xfb6ili31ikn0"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; covsim = derive2 { name="covsim"; version="1.0.0"; sha256="0kzlqdhx67hfm0f53yb438qfi4vlcf2j3cpyj2r49zgpwwgfk21p"; depends=[gsl lavaan MASS Matrix nleqslv PearsonDS Rcpp rvinecopulib tmvtnorm]; }; cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; @@ -8010,18 +8020,16 @@ in with self; { coxmeg = derive2 { name="coxmeg"; version="1.1.4"; sha256="10g4l33iwv09lm9j32kh1i003b3351v9ss3wrd6a497xgz20krhr"; depends=[MASS Matrix microbenchmark nloptr rARPACK Rcpp RcppEigen SeqArray SNPRelate]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; - coxphf = derive2 { name="coxphf"; version="1.13.3"; sha256="0jw581l02hd9b7aqgkyap4kfwwbdn43fv976y9ss8c5x74hd2hdb"; depends=[generics survival tibble]; }; + coxphf = derive2 { name="coxphf"; version="1.13.4"; sha256="1miljwgkrzm4xpy5vbs519pzi1aycgr1n6gdd3m5w9x0fm2i7syw"; depends=[generics survival tibble]; }; coxphw = derive2 { name="coxphw"; version="4.0.2"; sha256="08bfl21608i5jkk993qjpnh36xbfsm2xx22rpff0v6ipalj9vmj2"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0.1"; sha256="1g8z82y12b2lkw4ifxiidmwy3nrvgp2y2cwcahhdg616shwc27sb"; depends=[Rcpp RcppArmadillo survival]; }; coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; coxsei = derive2 { name="coxsei"; version="0.3"; sha256="1k3xsjwv1ji8n2qry2j93svr8a114mxkdl5y2zwz7mp82dmv0ld6"; depends=[]; }; cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; }; cpa = derive2 { name="cpa"; version="1.0.1"; sha256="10g2pvjz396m3mis1bp8bggx9gvbhdd5yqf3sgwkimn9wgccymbq"; depends=[]; }; - cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; - cpd = derive2 { name="cpd"; version="0.3.1"; sha256="1xi6sbxzh1iws1x633nj8001p0napg3cjrfdqmdkx8jxpq4r4qwl"; depends=[dgof hypergeo Rdpack]; }; - cpfa = derive2 { name="cpfa"; version="1.0-5"; sha256="1vdlc0flgzgg361y0fy8hdpvl206hd1vzmaf0qj1lvdf9wwvhm60"; depends=[doParallel e1071 foreach glmnet multiway nnet randomForest]; }; + cpd = derive2 { name="cpd"; version="0.3.2"; sha256="049df4ip3x7v9zviw7b4m1hp2w4gpfi6cq066mqal41frgvfmwdb"; depends=[dgof hypergeo Rdpack]; }; + cpfa = derive2 { name="cpfa"; version="1.0-8"; sha256="1rpdgy7h6kg52d8j2x99ihs44ahgdk5qd2951cizrl0h6lx1ba6s"; depends=[doParallel e1071 foreach glmnet multiway nnet randomForest rda]; }; cpi = derive2 { name="cpi"; version="0.1.4"; sha256="1gz92jcl8wg2vp8qhnkn37l2xs8wjdbjvnga22v9n943k9zsk2kh"; depends=[foreach knockoff lgr mlr3]; }; - cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplm = derive2 { name="cplm"; version="0.7-11"; sha256="0pcq5ska1v6kvp8ipw9clczk4w0p10lbxw2xnkhps0wqdrspsqwm"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; cplots = derive2 { name="cplots"; version="0.5-0"; sha256="12nac8hywhsfh2fcv30w36la46hvvp5mwc2rrq34smraig0dq8f3"; depends=[circular]; }; cpm = derive2 { name="cpm"; version="2.3"; sha256="07zbvc5jkwv76lkzby6r073fxjsqgnrdl2w9lcph577knnip89jx"; depends=[]; }; @@ -8033,9 +8041,9 @@ in with self; { cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; cprobit = derive2 { name="cprobit"; version="1.0.2"; sha256="16fnndpkd226paahmadsddakj4yhybw7lp3csr73fwv78zfl2fj9"; depends=[car ggplot2 gridExtra nortest]; }; cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; }; - cpsR = derive2 { name="cpsR"; version="0.7.0"; sha256="178x58jklbiqa28r19dni8pdswbcc9qa9ys21l8w29r7g3g91gsc"; depends=[httr jsonlite tibble]; }; + cpsR = derive2 { name="cpsR"; version="1.0.0"; sha256="06sdsqc17cnkn9zgy62dv56am7f1jvxiw205l7hbqlab4gbdp92a"; depends=[httr jsonlite tibble]; }; cpss = derive2 { name="cpss"; version="0.0.3"; sha256="1j8hyhfkjwyq6nmfynlzl8q7n5irlzrqdqh83v7pfpizzjdhhfxq"; depends=[dplyr ggplot2 gridExtra magrittr mvtnorm Rcpp RcppArmadillo Rfast rlang tibble tidyr]; }; - cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.1"; sha256="1wsb5hrds0ym49r0lyb3l37q1qpqy4qjhqcyd7awavdx2pk94pgi"; depends=[Hmisc knitr plyr]; }; + cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.2"; sha256="1didw3zglzinb22r1r7shg9796mwb3cwfb53i86q7sl0ljbja11i"; depends=[Hmisc knitr plyr]; }; cpsvote = derive2 { name="cpsvote"; version="0.1.0"; sha256="0nmg79isqwvxyg7zkfbshndfjb2fnc2ffg32hxvjvsy714lpljf6"; depends=[dplyr forcats magrittr readr rlang stringr]; }; cpt = derive2 { name="cpt"; version="1.0.2"; sha256="0j9ns8qhcvwxnzl9rc59vmh5jdahnni5dxpmi38gxvvj5k9hd8p7"; depends=[glmnet MASS nnet randomForest]; }; cptcity = derive2 { name="cptcity"; version="1.0.6"; sha256="03g10pjpz7gb6daalinki7smfjhbadrsmnxf6qgygqdaxm3ah400"; depends=[]; }; @@ -8043,7 +8051,7 @@ in with self; { cquad = derive2 { name="cquad"; version="2.3"; sha256="0m8hakw0k58v3gb24vvcs7q7l98m2nmyqv712wdn9g16krq49hnr"; depends=[Formula MASS plm]; }; cragg = derive2 { name="cragg"; version="0.0.1"; sha256="1iznv72g47r2yd26p1i06a72p8n0albgb4j4l3lndi39wrkrpbwd"; depends=[expm]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; - crandep = derive2 { name="crandep"; version="0.3.1"; sha256="1jrvijvpczkcc48mdxx8w82zfn3bv77y4d2ijw00b8s0l3c0ma38"; depends=[dplyr igraph Rcpp RcppArmadillo RcppGSL rvest stringr xml2]; }; + crandep = derive2 { name="crandep"; version="0.3.2"; sha256="16h42s875h90mra346y0cxwqwnahdrcskhb35j8dl3s8389sfai0"; depends=[dplyr igraph Rcpp RcppArmadillo rvest stringr xml2]; }; crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.1"; sha256="02d9qrqyjj33naq3g7ykaw9dzzl1dq8qf13id6h7kfx1fvx9b7zd"; depends=[httr jsonlite]; }; @@ -8054,19 +8062,19 @@ in with self; { crayons = derive2 { name="crayons"; version="0.0.2"; sha256="0mww2s57pkc6i0hg9xmm4j35gn1r6wyr7k4dksg4mhifbi1vwc43"; depends=[ggplot2]; }; crc32c = derive2 { name="crc32c"; version="0.0.2"; sha256="149bwwpgw69j4msqplrv7yym2fjs7c9v7sq8418lzz9szyj87dzg"; depends=[tidyCpp]; }; crch = derive2 { name="crch"; version="1.1-2"; sha256="1iwamq8iq51sbwbis2fc783y7a0k4a7v103f4mx7mp6wrcpsg9rq"; depends=[Formula ordinal sandwich scoringRules]; }; - crctStepdown = derive2 { name="crctStepdown"; version="0.2.1"; sha256="1v6r0w9wrwa7hwyyhzdybv1mshdw3wxa098mbn48101dhhy75945"; depends=[fastglm ggplot2 ggpubr lme4 Rcpp RcppArmadillo rlang stringr]; }; + crctStepdown = derive2 { name="crctStepdown"; version="0.5.1"; sha256="0kac3mj3zyhz2dpvdv4x4c5y4p4iavkawifjnnbapbf65jm2wi9b"; depends=[fastglm ggplot2 ggpubr lme4 Rcpp RcppEigen RcppParallel reshape2 stringr]; }; createLogicalPCM = derive2 { name="createLogicalPCM"; version="0.1.0"; sha256="1vm4pwyzpddzsfnji0qfvv9pmz6rvmss9g58q4laqi4q3r643v14"; depends=[]; }; - credentials = derive2 { name="credentials"; version="1.3.2"; sha256="1f18j3zrq8c9kah57xwahmmljsjg5qphlgamvx507ynvpq8pryig"; depends=[askpass curl jsonlite openssl sys]; }; + credentials = derive2 { name="credentials"; version="2.0.1"; sha256="12rm7hjrbl3vfcbvdqc1hx3a6b91gf83xm455cn9myjapm2zqz1c"; depends=[askpass curl jsonlite openssl sys]; }; creditmodel = derive2 { name="creditmodel"; version="1.3.1"; sha256="1nmp5h1cji7g2wh099zlgcqjxi30kcb0lv7b84w3dx9aplsja57l"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; credsubs = derive2 { name="credsubs"; version="1.1.1"; sha256="19l3vsjxd9lvaf67l61x9l0j4y124p93dfqzw7rl1ya5sxbdzs7a"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.4"; sha256="0kwjjkavch21grx845kdcansaj0g407v7z3wmhy4whra9ic12y76"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.4.0"; sha256="1a34jhdk4r9ywsrc5dc8wq5am3059cli60f6n2n8j04ls13fvlkd"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; - crew = derive2 { name="crew"; version="0.4.0"; sha256="0f8qr9nidj68817q5ldp7hhnsaxfk5kcwwqdk0fvjbfgm81d79x8"; depends=[data_table getip mirai nanonext processx ps R6 rlang tibble tidyselect]; }; - crew_cluster = derive2 { name="crew.cluster"; version="0.1.1"; sha256="14fwcx6jgyq6a66zv1m2xc8izlwww8xwdpqhpk4piy938i5dam8r"; depends=[crew lifecycle R6 rlang]; }; - crfsuite = derive2 { name="crfsuite"; version="0.4.1"; sha256="0vm4gpyb9qxlj0xixnmjs8hv3xi3ydzd8dbymk7f78nafdvqwkxy"; depends=[data_table Rcpp]; }; - cricketdata = derive2 { name="cricketdata"; version="0.2.2"; sha256="1q7c8ljc6qhggk854mwg8hxdy1b5rih9qxn5j5fk8cj4qs89rgw8"; depends=[dplyr janitor lubridate magrittr progress readr rvest stringr tibble tidyr xml2]; }; + crew = derive2 { name="crew"; version="0.6.0"; sha256="0b19z7y1n3l968npn9ggdxh1vfzw854wbpkrw2sk0h3fj7r49hsf"; depends=[data_table getip mirai nanonext processx ps R6 rlang tibble tidyselect]; }; + crew_cluster = derive2 { name="crew.cluster"; version="0.1.3"; sha256="04v7fajfanap564lvw8izg5srhq9mf415z05rim41k1038f93pav"; depends=[crew lifecycle R6 rlang]; }; + crfsuite = derive2 { name="crfsuite"; version="0.4.2"; sha256="15ldbx8g9xa6sql6is2gcqryzqb9dad1hiarvrgmizdp5fd3gxnm"; depends=[data_table Rcpp]; }; + cricketdata = derive2 { name="cricketdata"; version="0.2.3"; sha256="07sj53c2ryvcichsa9b0ywmrslisbr4hkrnrf1crw7x1ym55hsan"; depends=[cli dplyr janitor lubridate readr rvest stringr tibble tidyr xml2]; }; cricketr = derive2 { name="cricketr"; version="0.0.26"; sha256="1y1zf9f59v95knggq5nna5rp7fqpv1swwvkajwqbpicc12g2azq4"; depends=[dplyr forecast ggplot2 httr lubridate plotrix scatterplot3d XML]; }; - crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; + crimCV = derive2 { name="crimCV"; version="1.0.0"; sha256="0jj1m0f65pp7w6ml4dwj73y2n9q02nizp5jqi9ph7klk8x069hzk"; depends=[]; }; crimedata = derive2 { name="crimedata"; version="0.3.1"; sha256="16xccfh64qza617d7k9swahchij57skh8wwnj7gxlpasknx11wwf"; depends=[digest dplyr httr purrr rlang sf stringr]; }; crimeutils = derive2 { name="crimeutils"; version="0.5.1"; sha256="0jsh2b1kv8r9x8sx1s2x6dpc8jyfnjsinycqb5wck5jcsswswgd6"; depends=[dplyr ggplot2 gridExtra gt magrittr readr rlang scales stringr tidyr]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; @@ -8083,8 +8091,8 @@ in with self; { crone = derive2 { name="crone"; version="0.1.1"; sha256="03qznxml940rl3kfxy4jkg9nsx9ss0gf2ck0ry000xglw6rm2s42"; depends=[]; }; cronologia = derive2 { name="cronologia"; version="0.2.0"; sha256="143wc9i9d99cybnjzg4dj7jn7sv3cc4bq3hh6mp50j9hwxnr1xhh"; depends=[glue htmltools]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; - cropDemand = derive2 { name="cropDemand"; version="1.0.2"; sha256="0fffrwwk91gzhb2gn8m0nlnv3gmhdv2srzjblysgkh4bnqmrjvq2"; depends=[dplyr ggplot2 ncdf4 raster rgdal tidyr]; }; - cropZoning = derive2 { name="cropZoning"; version="1.0.2"; sha256="134spdw7qfp0f7xsjyz35xfmabqdbx37z8isf5mfg6q8rqnjhc9y"; depends=[ggplot2 ncdf4 raster rgdal tidyr]; }; + cropDemand = derive2 { name="cropDemand"; version="1.0.3"; sha256="14frz3pdb3z8w513r64k0w8p6fs0gv04dazpwvjw6ky384wcd3w6"; depends=[dplyr ggplot2 ncdf4 sf terra tidyr]; }; + cropZoning = derive2 { name="cropZoning"; version="1.0.3"; sha256="0i9pglcfcrhw8i1731hhrc2v130dq7kr8w57yg9fmwdr46arnk24"; depends=[ggplot2 ncdf4 sf terra tidyr]; }; cropcircles = derive2 { name="cropcircles"; version="0.2.3"; sha256="1ggiw0qxwv3j36dhiq7fvw4zj0lqqsfcp9756hsr0cb83srfczwb"; depends=[glue magick purrr]; }; cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; }; cropgrowdays = derive2 { name="cropgrowdays"; version="0.2.0"; sha256="1vvyknbgnz0d5f4rjl3vw4a9adzgwqkzxb2wnf2x6yqfhniw6s2p"; depends=[dplyr httr lubridate purrr purrrlyr tibble]; }; @@ -8092,22 +8100,22 @@ in with self; { crossdes = derive2 { name="crossdes"; version="1.1-2"; sha256="0nc9jd83mm03qpd3r3hfmrf615yvvmib9kk9dh1hgz12pxhffray"; depends=[AlgDesign gtools]; }; crosshap = derive2 { name="crosshap"; version="1.2.2"; sha256="18r4m5fplpiabgwir78qfacj0781ykqxbyfkf5zxnzs7yr0d1gl2"; depends=[cli clustree data_table dbscan dplyr ggdist ggplot2 ggpp gridExtra gtable magrittr patchwork rlang scales tibble tidyr]; }; crossmap = derive2 { name="crossmap"; version="0.4.0"; sha256="079ibxhm6877nfdqf88fhg9fjdn3vbs44jprrbhxmmbbd30nma4v"; depends=[backports cli dplyr generics lifecycle purrr rlang vctrs]; }; - crossnma = derive2 { name="crossnma"; version="1.1.0"; sha256="0s23lz9v8crpksb78rk9rzin9hzva8y490460jjw6rfd0cdc0ilc"; depends=[coda dplyr ggplot2 magrittr meta netmeta plyr rjags rlang tidyr]; }; + crossnma = derive2 { name="crossnma"; version="1.2.0"; sha256="0ma07lvf56z1ya587lb4zv8rbhzi8crnsgvh3xsz80livx9cdvp5"; depends=[coda dplyr ggplot2 magrittr meta netmeta plyr rjags rlang tidyr]; }; crossrun = derive2 { name="crossrun"; version="0.1.1"; sha256="1v2khjb77g63ls6s15z9hy81z4hyf89g58jxjl94jrkznq1c4fa4"; depends=[Rmpfr]; }; crosstable = derive2 { name="crosstable"; version="0.6.2"; sha256="1i8ij5vzzjrxvbnbfxkdm37yl53y154l6csfi4d7i285x8k4bp9b"; depends=[checkmate cli dplyr flextable forcats glue lifecycle officer purrr rlang stringr tibble tidyr]; }; crosstalk = derive2 { name="crosstalk"; version="1.2.0"; sha256="180y7mhpj17axpadwhh7s0qvrpdnag7g977vk256l96d6nmvlds2"; depends=[htmltools jsonlite lazyeval R6]; }; - crosstalkr = derive2 { name="crosstalkr"; version="1.0.3"; sha256="1flmgzn4zw6nch6wx17nx37g51x6xy1qd90zmrsd4n0k7g55jgpg"; depends=[doParallel dplyr ensembldb foreach ggplot2 igraph iterators magrittr Matrix Rcpp readr rlang STRINGdb stringr tibble tidyr withr]; }; + crosstalkr = derive2 { name="crosstalkr"; version="1.0.4"; sha256="0vb0p455s2gp0nm1hxm9iikxr4mal52mbkq6nv6zxr78wwsxcwa1"; depends=[doParallel dplyr ensembldb foreach ggplot2 igraph iterators magrittr Matrix Rcpp readr rlang STRINGdb stringr tibble tidyr withr]; }; crossurr = derive2 { name="crossurr"; version="1.0.6"; sha256="16fq6hdfc6nsdijj63fji3bn3hp40m350qjxhf8a3xs5j86vf43j"; depends=[dplyr gbm glmnet glue pbapply purrr ranger RCAL rlang SIS SuperLearner tibble tidyr]; }; crossval = derive2 { name="crossval"; version="1.0.5"; sha256="0rvfglnd75aa2ib8v6ibv8ywyh8v4m98ybhgc9h7a2qhk825a2w9"; depends=[]; }; crossvalidationCP = derive2 { name="crossvalidationCP"; version="1.1"; sha256="0cmny8sjz4ampvi1jc2h4dh3x930vnwv8png6xygs2vb6p19f2ph"; depends=[changepoint fpopw wbs]; }; crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; }; crossword_r = derive2 { name="crossword.r"; version="0.3.6"; sha256="1s31613s4qxxspka9bhgq3rq8xraf48mwfv6phvz6v06gijh64lr"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; }; - crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; }; + crov = derive2 { name="crov"; version="0.3.0"; sha256="1vnhnw6rw8qyhahy6d67cq5m9sxr6yic21qi16vic1q5115fwx01"; depends=[gtools VGAM]; }; crplyr = derive2 { name="crplyr"; version="0.4.0"; sha256="0l0vp2h4j2i5jb9wgdaqaixi9xvhb5n35zn8mdc7hyw13hjr8wa5"; depends=[crunch dplyr ggplot2 httptest lazyeval lifecycle purrr rlang scales stringr tibble tidyselect viridisLite]; }; - crqa = derive2 { name="crqa"; version="2.0.3"; sha256="02cz52gmq4x9xhzsv26babp4z1z6dcy7j8az7xbr6m0d8f09kq9s"; depends=[FSA gplots Matrix plot3D pracma rdist tseriesChaos]; }; + crqa = derive2 { name="crqa"; version="2.0.4"; sha256="1sr185afy81c8nb8bmn56ddv9xncrjpis49xp24395i508ay740x"; depends=[gplots Matrix plot3D pracma rdist tseriesChaos]; }; crrSC = derive2 { name="crrSC"; version="1.1.2"; sha256="0n63k1v35wvbf565msr3fczi9hjd20bqh8b4iyvzp310d8z8b3g8"; depends=[survival]; }; crrcbcv = derive2 { name="crrcbcv"; version="1.0"; sha256="1rbmhnr7n99i0277d47i62ww6896z1g20v6vr558zmx3gvrs0b6k"; depends=[abind crrSC pracma survival]; }; - crrstep = derive2 { name="crrstep"; version="2023.1.0"; sha256="10wcvsai6mqsw8whrjkgcw27fmc7qpzv0sawl22hamkl9g2i1bpl"; depends=[cmprsk]; }; + crrstep = derive2 { name="crrstep"; version="2023.1.1"; sha256="0x4fvsvcxb529c7vp5fh6vp7l0sj1wszpqzbrk1da7kmf5454ki6"; depends=[cmprsk]; }; crs = derive2 { name="crs"; version="0.15-37"; sha256="12zj49mkz769gbdacnzrn64faiqdx53yz5zyhhq7g7bpxyac7fl1"; depends=[boot np quantreg]; }; crseEventStudy = derive2 { name="crseEventStudy"; version="1.2.2"; sha256="0zqqd1d1k200kah03qvpfiyshs18s5h4j8y9mwr0fbhkfj7xags7"; depends=[sandwich]; }; crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; }; @@ -8115,11 +8123,11 @@ in with self; { crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; }; crsuggest = derive2 { name="crsuggest"; version="0.4"; sha256="044llamxlrva5va39yzpvsmdjqn56ij7jjll73mmjg7ka0rqc5dj"; depends=[dplyr mapview purrr sf units]; }; - crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; crul = derive2 { name="crul"; version="1.4.0"; sha256="18n9ga0ah628k83qin75ys0wipc9dgc25xnafcj400jp85g42l4f"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.30.2"; sha256="177gbgvwlgqv2l43hgg2w9zxf92wwksv0j0fk1yvfiw1qxnsf170"; depends=[abind crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.30.3"; sha256="03x9scapg0anf8fm058609w70giql960px05xmwrlv5rld7qcijb"; depends=[abind crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.3.3"; sha256="15w72kmizsxkj1wx3nqny6329m2041mxyzi4nxh8l3hfmaisb4qm"; depends=[crunch httpcache miniUI rstudioapi shiny]; }; cruts = derive2 { name="cruts"; version="1.1"; sha256="1ih6h9qk4yflzars00d61smjqj7s4bfvc2ikp6vlki9f6k012xcx"; depends=[lubridate ncdf4 raster sp stringr]; }; + crwbmetareg = derive2 { name="crwbmetareg"; version="1.0"; sha256="0faksz2hp1ya4j9hlpc091b1mgwz6396fc15f4f20fixcidv1jg8"; depends=[lmtest Rfast2 sandwich]; }; cry = derive2 { name="cry"; version="0.5.1"; sha256="0n1yyjkqj0kqs53g27chl7lhk07f7aj81jwyvaxfmfkp03xzjj0d"; depends=[ggplot2 zoo]; }; crypto2 = derive2 { name="crypto2"; version="1.4.5"; sha256="0j4n13c9qcm1f6fwbvr72pqdvfvxrhnakk19dpn2hlxfdmmsk79g"; depends=[cli dplyr jsonlite lubridate plyr progress purrr tibble tidyr]; }; cryptography = derive2 { name="cryptography"; version="1.0.0"; sha256="0dwnm37p95i1rmrc9qq7ryz1rk96n01ik3xif1f94vz5dlm4kxd7"; depends=[DescTools]; }; @@ -8133,16 +8141,16 @@ in with self; { cshapes = derive2 { name="cshapes"; version="2.0"; sha256="0c3q85whvp28zlm4k1570kwc5qvl2fmaszx9dpmfcdqv6m19f9ks"; depends=[rmapshaper sf sp]; }; csmaps = derive2 { name="csmaps"; version="2023.5.22"; sha256="02w3g6qc928fbic462nn22s6fcqxr4v9hhhrv632azcc2x83k100"; depends=[data_table]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; - csodata = derive2 { name="csodata"; version="1.4.1"; sha256="1x5fvh79s1bivkw5gszx951mc7vw09xplz5yr7r7453gb32pfr7c"; depends=[dplyr httr jsonlite lifecycle lubridate R_cache reshape2 rjstat sf tidyr]; }; + csodata = derive2 { name="csodata"; version="1.4.2"; sha256="02yi96a3zhradw5kncfngav1ma3pkjn7y638wc4z7818ykxx62m6"; depends=[dplyr httr jsonlite lifecycle lubridate R_cache reshape2 rjstat sf tidyr]; }; cspec = derive2 { name="cspec"; version="0.1.2"; sha256="049vynbffxyd5zwxwyz1jv05zgq7zrx1ypzv5j62ph64gl42m13p"; depends=[]; }; cspp = derive2 { name="cspp"; version="0.3.3"; sha256="1x3swcgqffqcpw4w6dwafqh9cikd6c714lbbnzwirvqvfswnmmgw"; depends=[csppData dplyr ggcorrplot ggplot2 haven mapproj purrr readr rlang stringr tidyselect]; }; csppData = derive2 { name="csppData"; version="0.2.61"; sha256="1q9a11v512dc96lrrd03w06s8x6c1a0j4z5x8qvq48f4q7k30l1r"; depends=[]; }; - csranks = derive2 { name="csranks"; version="1.0.1"; sha256="00idr16p9pxih88z7c22n9zwax996qm1fwslkp7x5b2p8fcxihp4"; depends=[cli ggplot2 MASS scales]; }; + csranks = derive2 { name="csranks"; version="1.2.0"; sha256="1h6g3rn1jv5gdjcbwq7kh2l41b4rdvkb1rf84ikz6ii5r35r30w6"; depends=[cli ggplot2 MASS scales]; }; cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; }; cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; }; cstidy = derive2 { name="cstidy"; version="2023.5.24"; sha256="01i5b1x6xfg8fbkhaam22ap64x6bqman5b5y57f07wiy413m65j2"; depends=[crayon csdata cstime data_table digest ggplot2 magrittr stringr]; }; cstime = derive2 { name="cstime"; version="2023.5.3"; sha256="0x6nilc1971fjb5s7im6jp3az13r7rd5z3pc0y7kglggp33aqw6i"; depends=[data_table magrittr]; }; - csurvey = derive2 { name="csurvey"; version="1.6"; sha256="0krlmj4am1naagk0w8fm9qnp98c81chk0z19xskh2c4r6ymswylk"; depends=[cgam coneproj igraph MASS Matrix purrr survey]; }; + csurvey = derive2 { name="csurvey"; version="1.9"; sha256="0g41mh332imf03xwxpa3ghmi8dmdpva8wb1z794as3gp5hjddsh5"; depends=[cgam coneproj igraph MASS Matrix purrr survey]; }; csutil = derive2 { name="csutil"; version="2023.4.25"; sha256="0yh72ddymkqi46xqjvmgqkvn2a5bl3qyrrr37w0mvdx89zr95yxn"; depends=[data_table ggplot2 magrittr]; }; csv = derive2 { name="csv"; version="0.6.2"; sha256="1mynaia16jm28qi597xg7kf4w85vsxg5p83xbcbbr9di49vxqlr8"; depends=[data_table stringi]; }; csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; }; @@ -8159,15 +8167,15 @@ in with self; { ctmcd = derive2 { name="ctmcd"; version="1.4.3"; sha256="1xlhy816qcidkhpybkfmi2a59x5aajhh2407ninnnimlxk45kilh"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; }; ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; }; - ctmm = derive2 { name="ctmm"; version="1.1.0"; sha256="1npx017c4w8689ig36r54fbl40h0hd0crh3n64ypbid2xxb2j0ck"; depends=[Bessel data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp statmod]; }; + ctmm = derive2 { name="ctmm"; version="1.2.0"; sha256="0fmihi6ihk4jgg0abyhlfhg4wx91sq06xr11dc0vbhcyaq2090r4"; depends=[Bessel data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv parsedate pbivnorm pracma raster sf shape sp statmod terra]; }; ctmva = derive2 { name="ctmva"; version="1.3.0"; sha256="197r3rjiqchpfxip0706q8rp7dbgfni7gh19g2k54bf7k3lc7y0p"; depends=[fda polynom]; }; ctpm = derive2 { name="ctpm"; version="1.0.1"; sha256="1bycdh3mbimmfvv3yb50c8rwcmkbjj0jwnfiynsp2h56y3dmzc1r"; depends=[ape ClusterR ctmm slouch]; }; ctqr = derive2 { name="ctqr"; version="2.0"; sha256="0srrlgqxpp4a46wqr83zpb3xr49pf70b0n8bv9qp8ffak20d2hpj"; depends=[pch survival]; }; - ctrdata = derive2 { name="ctrdata"; version="1.14.0"; sha256="0x5dpph62s7dwfs0y4gd73zzbil9cr1y5q8mpn9m7z2gdr67wk1c"; depends=[clipr curl dplyr httr jqr jsonlite lubridate nodbi stringi tibble xml2]; }; + ctrdata = derive2 { name="ctrdata"; version="1.15.2"; sha256="0rqsz9wq4w0w2q0vha3dh7rwr3mnhp2gc1xb8hi30qk85zghjzml"; depends=[clipr curl dplyr httr jqr jsonlite lubridate nodbi stringi tibble xml2]; }; ctrialsgov = derive2 { name="ctrialsgov"; version="0.2.5"; sha256="0hdh1fdfaja8amf7fkvk1c6yif703132bvacq0j9pk5jr97czgpw"; depends=[DBI dplyr ggplot2 htmlwidgets lubridate Matrix plotly purrr rlang stringi tibble]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.7.6"; sha256="1nhrxyq9kv3kzyskjmskh79z9mhzz6ap9bq0df1f7h4v73425mjc"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm plyr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble]; }; - ctsemOMX = derive2 { name="ctsemOMX"; version="1.0.4"; sha256="1sjsm573alsg3dvj58rwknqapcydx77zbs0b8hcf59qbbhfa3djv"; depends=[ctsem Matrix OpenMx plyr]; }; + ctsem = derive2 { name="ctsem"; version="3.9.0"; sha256="1622b1mgf0dxp53n1957y00hdbwic3mvixb213270sh59k21bzfl"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm plyr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tibble]; }; + ctsemOMX = derive2 { name="ctsemOMX"; version="1.0.5"; sha256="0fshc00q0fyybl6kybpf57wn898c8v1d7k0x3n8avsyrkg6addhx"; depends=[ctsem Matrix OpenMx plyr]; }; ctsfeatures = derive2 { name="ctsfeatures"; version="1.0.0"; sha256="0jplrnbgvrc1650qasp8r5r319fdwrl24p2607yl0k45xjn82rq6"; depends=[astsa Bolstad2 ggplot2 latex2exp Rdpack]; }; ctv = derive2 { name="ctv"; version="0.9-5"; sha256="1mr37p7mdv2p8rswz9clwj25ipm16pc4a7flwg3a4bgyj1n5mz55"; depends=[]; }; cuRe = derive2 { name="cuRe"; version="1.1.1"; sha256="0h8vblhfydrama01yzfghcv5yw5ifs719rvq17sixkgj5iyaj910"; depends=[date numDeriv relsurv reshape2 rstpm2 statmod survival]; }; @@ -8187,7 +8195,8 @@ in with self; { cumulocityr = derive2 { name="cumulocityr"; version="0.1.0"; sha256="0ybvh5args3s1f3nra58bnfwgrlrdpw40by68az84s90v88bbz2q"; depends=[httr jsonlite]; }; cuperdec = derive2 { name="cuperdec"; version="1.1.0"; sha256="1vvkbkb3dp38xzxxdm20n6vr8yifppn1clzzcvb2rhqk9d17cdiw"; depends=[dplyr ggplot2 magrittr readr rlang tidyr]; }; curephEM = derive2 { name="curephEM"; version="0.2.5"; sha256="1s0wrjzkp8wn8k0p5k9m7ljh104ay50izsyyvgb9qlb9yaggv1iz"; depends=[Matrix survival]; }; - curl = derive2 { name="curl"; version="5.0.1"; sha256="19lkvy5hngdsh59slvvlrzf0iz432fv88daq0nan93zsqyf8y1dp"; depends=[]; }; + cureplots = derive2 { name="cureplots"; version="1.0.0"; sha256="0qm0b508ywv65c52jwh7w6v57dv2pc3r2gh4ycwmmw73zkfglndp"; depends=[dplyr ggplot2 glue]; }; + curl = derive2 { name="curl"; version="5.1.0"; sha256="15xsxirb5k4pqc8v5kg0i3v1pnhy4wzcljxagp703gc59fl8s8ap"; depends=[]; }; currencyapi = derive2 { name="currencyapi"; version="0.1.0"; sha256="1d21nsmnzd89j86rlhicplj6ryp9mvs2jky8p55jc33zn48sywb6"; depends=[httr jsonlite]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.1"; sha256="01rlm4n3qfa71wkd6pbkdhcgll0y13zrcbjqxy0gssvrgnwwcfsx"; depends=[cmprsk survival]; }; currr = derive2 { name="currr"; version="0.1.2"; sha256="0dfcgnv71cwzsglg725qsf3vg54yar3ps4f9njwa9183k1gypvqp"; depends=[broom clisymbols crayon dplyr job pacman purrr readr rstudioapi scales stringr tibble tidyr]; }; @@ -8211,7 +8220,7 @@ in with self; { cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvap = derive2 { name="cvap"; version="0.1.4"; sha256="18fkp04dcpisml30d8dghk4nhkiaxk18lw134xid27r64rdz7nxy"; depends=[censable cli dplyr fs magrittr readr rlang stringr tidyr]; }; cvar = derive2 { name="cvar"; version="0.5"; sha256="066vn8flw9j0idmpi9wzvybgihdhwg3fjslx2isbrb11ldl1lwky"; depends=[gbutils Rdpack]; }; - cvcrand = derive2 { name="cvcrand"; version="0.1.0"; sha256="0zdf41sjqyi7mybxhypfx1vpc15w7qj9jg9bav64qbk0q5nk7jyc"; depends=[tableone]; }; + cvcrand = derive2 { name="cvcrand"; version="0.1.1"; sha256="02pdhaq0mm1vijdc0hwh4vpcvk5fhwq73lhkrrg2zr6bwq8q2syz"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmaPLFAM = derive2 { name="cvmaPLFAM"; version="0.1.0"; sha256="1qmd4zbh70z1vgc6mxfr9scvqw923y9qdxjf80i826bdh7sc4wq3"; depends=[fda MASS mgcv quadprog]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; @@ -8219,15 +8228,14 @@ in with self; { cvms = derive2 { name="cvms"; version="1.6.0"; sha256="02cxhvhf5bfxj3nmpl8911dzxrvfbbli5ix1qz31lx0h8spg83a4"; depends=[checkmate data_table dplyr ggplot2 groupdata2 lifecycle lme4 MuMIn parameters plyr pROC purrr rearrr recipes rlang stringr tibble tidyr]; }; cvsem = derive2 { name="cvsem"; version="1.0.0"; sha256="148v8axwxfr328l709b6q1fmqnzmiw9g7589zgwha4d6lrx4ak4i"; depends=[lavaan Rdpack]; }; cvwrapr = derive2 { name="cvwrapr"; version="1.0"; sha256="17h017p76y7sjcwik48ravygmyivj6kvkhqy5s9ch0nwzzcrzvj3"; depends=[foreach survival]; }; - cwbtools = derive2 { name="cwbtools"; version="0.3.8"; sha256="1v7pan3d00km7yq03ym3xdvlqhwrlxg5w8y2dl34dlsm67xysxh1"; depends=[cli curl data_table fs httr jsonlite lifecycle pbapply R6 RcppCWB rstudioapi stringi xml2 zen4R]; }; cwot = derive2 { name="cwot"; version="0.1.0"; sha256="1qg9aizkz40sfm65b8sxcmj1232zb3ds8gds45lv0prf8alc7az3"; depends=[mvtnorm SPAtest]; }; cxhull = derive2 { name="cxhull"; version="0.7.3"; sha256="0k68da3sa3bn17aj525m0axk9yqzi6i966z6h95d727phg865rld"; depends=[data_table Morpho rgl Rvcg]; }; cxr = derive2 { name="cxr"; version="1.0.0"; sha256="12rx7hna3h84a2xb2ir43xgb3zfmh0fhn5wcdjklk2g94dmwid28"; depends=[mvtnorm optimx]; }; - cxxfunplus = derive2 { name="cxxfunplus"; version="1.0.1"; sha256="19953p12yjmhqhjjiw6ymnvn7krnbndqc8b91rc12ymmfp9x2crr"; depends=[inline]; }; + cxxfunplus = derive2 { name="cxxfunplus"; version="1.0.2"; sha256="125lzra4mr4cw5j18nck1faa6jf4fiw4m5pc9mp1h39268c9va6v"; depends=[inline]; }; cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; }; - cyclestreets = derive2 { name="cyclestreets"; version="0.6.0"; sha256="1w8am89xcjd6wklzcarh1kvayyma764jy7jkalf26r71qf3wpz2a"; depends=[checkmate curl dplyr geodist geojsonsf httr jsonlite magrittr progressr purrr R_utils RcppSimdJson sf stringr]; }; - cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; }; - cycloids = derive2 { name="cycloids"; version="1.0.1"; sha256="0bb1izvcn33l4y0sk5p0rirm0zdkbzn48bh3zirncnhl1vby4mpz"; depends=[]; }; + cyclestreets = derive2 { name="cyclestreets"; version="1.0.1"; sha256="0xrgwhlq670m109j27ln93zzq0wm8cfbkivd45v2rldxgvd50348"; depends=[checkmate curl data_table dplyr geojsonsf httr jsonlite magrittr progressr RcppSimdJson readr sf stringi stringr]; }; + cyclocomp = derive2 { name="cyclocomp"; version="1.1.1"; sha256="0kdinnn6cgkfc94japyyp5qr7imjxddajds3qqxf4q5higahdzws"; depends=[callr crayon desc remotes withr]; }; + cycloids = derive2 { name="cycloids"; version="1.0.2"; sha256="1smmqww84w94891p9q77f27zxkzy7a72h7y6imi9n9p84v0pakzz"; depends=[]; }; cyclomort = derive2 { name="cyclomort"; version="1.0.2"; sha256="0qmfwhrp7bq7av0yc95xnz2sd1jxfaiys9smrk1kpclnynnra9rr"; depends=[flexsurv lubridate magrittr mvtnorm plyr scales survival]; }; cyclotomic = derive2 { name="cyclotomic"; version="1.2.0"; sha256="0n4xgfyjbnxqpy4w8x2gw8m3fg11klywlxn4v05lrhf7r4paggk0"; depends=[gmp intmap maybe memoise primes VeryLargeIntegers]; }; cyjShiny = derive2 { name="cyjShiny"; version="1.0.42"; sha256="1p3ifmaxbw5g57pp4v8hnvq3fsy7frpny9jgp0q1b3klg3dhsjwj"; depends=[base64enc graph htmlwidgets jsonlite shiny]; }; @@ -8238,43 +8246,45 @@ in with self; { cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; cytominer = derive2 { name="cytominer"; version="0.2.2"; sha256="1n9yimjhdziv1vzjyni6ssi38nxcnfr5jpmzgxcn6vysffh5s9pz"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; - czechrates = derive2 { name="czechrates"; version="0.2.2"; sha256="162r9inbjkgfm3y73jb3d9pxmgid94jjy5kxjp7058jsiv2ibn05"; depends=[curl dplyr httr magrittr readr tibble tidyr]; }; + czechrates = derive2 { name="czechrates"; version="0.2.4"; sha256="0mv9adynqyn8x3ppwf4dkl8ii9jy4l7qk7v6bz7bxl5qsd6a5imn"; depends=[curl dplyr httr magrittr readr tibble tidyr]; }; czso = derive2 { name="czso"; version="0.3.10"; sha256="0vkckjnv8nkv794dq9kz1lg8qj614gma3blasz4288xxbg9cq6p5"; depends=[cli curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi tibble]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.2"; sha256="142bc6gdmhzaikdfyxb1pq9nlybgkrgi2kjgk40w4wbxzx5mwkbh"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; d3po = derive2 { name="d3po"; version="0.5.5"; sha256="1fyk0152x9zsbf7qm02wixrk9fldl0jlrg33fnbx06jjg1s431r7"; depends=[assertthat dplyr htmlwidgets magrittr purrr rlang]; }; - d3r = derive2 { name="d3r"; version="1.0.1"; sha256="07n92x047l6savy8s5r3rj15nmjgswl1shl1dyzrzhgpa5jrpxf3"; depends=[dplyr htmltools rlang tidyr]; }; + d3r = derive2 { name="d3r"; version="1.1.0"; sha256="1dcm53y3jpyswr6y368xhdnn1nkchixf4wkxnsb2mk9lzccb44y4"; depends=[dplyr htmltools tidyr]; }; d4storagehub4R = derive2 { name="d4storagehub4R"; version="0.4-3"; sha256="1a6clkld20vmvacdwr4rir34mj4fm5fdh687b2whds6y0rj7wgb3"; depends=[httr jsonlite keyring R6 XML xml2]; }; - dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; }; - dCUR = derive2 { name="dCUR"; version="1.0.0"; sha256="12i2qcjq9i1ycs6z6g3yr1imv7v4g19kdhf1vg9xkvh43pagb6h7"; depends=[dplyr ggplot2 magrittr MASS mclust ppcor Rdpack stackoverflow]; }; + dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.3"; sha256="18y6pkp273q15nkgqywzknsq1mnbiaw8jlzsaa76zadxf7xhsxls"; depends=[]; }; + dCUR = derive2 { name="dCUR"; version="1.0.1"; sha256="1blrxgf911b1y2pcp3hsv6cigpnclscjadlf5656kldblzj5w5m1"; depends=[dplyr ggplot2 magrittr MASS mclust ppcor Rdpack]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; - dCovTS = derive2 { name="dCovTS"; version="1.3"; sha256="07qkjmyxpkm6aabksina0jjj0mcfynjw6kyz7043y6g3ngqi4bq0"; depends=[dcov doParallel foreach Rfast Rfast2]; }; + dCovTS = derive2 { name="dCovTS"; version="1.4"; sha256="0rwbs1z9pf8f6hpp3df584c0k5g4frbzcwr288inh1cg51maphq4"; depends=[dcov doParallel foreach Rfast Rfast2]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="1.1.12"; sha256="0j0jllwhbx4kjb10y3lxxf37108alnydndxf54hqlwp67q9vy5pm"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll sandwich strucchange wavethresh]; }; + dLagM = derive2 { name="dLagM"; version="1.1.13"; sha256="0wn09qdmnahn0imi17yq4flcnr69cms832si1z03l9xwcjkfjxfm"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll sandwich strucchange wavethresh]; }; dMod = derive2 { name="dMod"; version="1.0.2"; sha256="1fnv3f5xlng8f3df5hvxncfnnadzwcsdiklrb2g67llf3m06bq74"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; - dPCP = derive2 { name="dPCP"; version="2.0.0"; sha256="120m0b3r8bfw4whv2maw8a086rmgwspx0mvdzkk14nkffr8acng5"; depends=[cluster dbscan e1071 exactci ggplot2 ggpubr raster rlist scales shiny shinyjs stringr]; }; + dPCP = derive2 { name="dPCP"; version="2.0.1"; sha256="023m9qzn64m7f992f12y4vf67jpj4zpajvwqyw4qlf4grsr9qfv5"; depends=[cluster dbscan e1071 exactci ggplot2 ggpubr raster rlist scales shiny shinyjs stringr]; }; dQTG_seq = derive2 { name="dQTG.seq"; version="1.0.2"; sha256="0by13x0583mxsb1sxl0p4qhzrwzcri7jrc80pgyr7nmpk0cvmsnj"; depends=[BB data_table doParallel foreach openxlsx qtl stringr vroom writexl]; }; dSTEM = derive2 { name="dSTEM"; version="2.0-1"; sha256="0llp5az6sdbq9kk9dbk0app7lx3jbns2amb8pd9nbvrgz133jg5m"; depends=[MASS]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; dTBM = derive2 { name="dTBM"; version="3.0"; sha256="0asqz2r55awp5xh7gqawkh8lgal64216qi9ncg2jvfg5ny5ryv4i"; depends=[EnvStats WeightedCluster]; }; daarem = derive2 { name="daarem"; version="0.7"; sha256="1pm8nj4ffc18njpr87hb988j551zp0s6ysr37nk784ibk4awxf7x"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.3.0"; sha256="0gzyg38n1sra8xa0kxn0b0yq7p111vsra3lwqijqwd6xwn7h2011"; depends=[boot cowplot dplyr effsize ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; + dabestr = derive2 { name="dabestr"; version="2023.9.12"; sha256="0fm6gk1q86nkls2y3zcklszqb570jcll9hfn2mpd4b4qj2vl2d4x"; depends=[boot brunnermunzel cli cowplot dplyr effsize ggbeeswarm ggplot2 ggsci magrittr rlang scales stringr tibble tidyr]; }; dabr = derive2 { name="dabr"; version="0.0.4"; sha256="14q8frsg8qk46yldawh58cjm4v10im4ar5r5f4yfdxf6jdaadfih"; depends=[knitr magrittr RMariaDB tibble]; }; - dad = derive2 { name="dad"; version="4.0.0"; sha256="154afqf3xwbdjp9qr3rlz06ln2cnwzafk3p9h73k0h2g5n8yp5b9"; depends=[DescTools e1071 ggplot2]; }; + dacc = derive2 { name="dacc"; version="0.0-2"; sha256="0yybgmpi171xym36c94qlxv2m9gc0ywgcbq0l6qv7w2na7axfq6b"; depends=[Iso janitor magrittr MASS pracma]; }; + dad = derive2 { name="dad"; version="4.1.2"; sha256="12jwfa1849mfjwplc57qw3lhn5zrqjrlxhisg9hykvhcpj6i0nfl"; depends=[DescTools e1071 ggplot2]; }; dadjoke = derive2 { name="dadjoke"; version="1.0"; sha256="118pacwc2qb3c5zbhr71zf4zj1ab2g4rs5h6bvrscjyd7a71jc3f"; depends=[]; }; dadjokeapi = derive2 { name="dadjokeapi"; version="1.0.2"; sha256="143xs3nkf6ynr83z5gggz318nvpnsbfmskl1ipavlzrqk785dlac"; depends=[beepr curl dplyr httr png]; }; dados = derive2 { name="dados"; version="0.1.0"; sha256="1jdna8s10qz50zrsrm36y1jx489sznd86akx2lwdmriiiz3abn65"; depends=[AmesHousing babynames dplyr forcats fueleconomy gapminder ggplot2 Lahman nasaweather nycflights13 palmerpenguins pixarfilms rlang tibble tidyr yaml]; }; dae = derive2 { name="dae"; version="3.2.19"; sha256="18cvxj2qjfqdp7gxpl93185f9c7q0fcxnc63h9car1y9dgwqsild"; depends=[ggplot2 ggpubr plyr]; }; - daewr = derive2 { name="daewr"; version="1.2-10"; sha256="0hckqjn12lkyjkbbql8l0pay5c430vhf0hp7hycp3v59i1aaz8bf"; depends=[lattice stringi]; }; + daewr = derive2 { name="daewr"; version="1.2-11"; sha256="0hh7z0sdynrw4746hqvyra4dsqa9p1j8bip7b8asyvdpirxhvh23"; depends=[lattice stringi]; }; + daff = derive2 { name="daff"; version="1.0.1"; sha256="0lii8ijahfjxyqq1vqyz3axl6sca27dn05q2l2303klz6l9gss57"; depends=[jsonlite V8]; }; dafishr = derive2 { name="dafishr"; version="1.0.0"; sha256="1n6b1r1awwxvdhn4znwp1p4jp3gvrjz017darjagx4cix0iisw1p"; depends=[dplyr fst ggplot2 lubridate magrittr mixtools readr readxl rlang sf stringr tibble tidyr tidyselect vroom]; }; dafs = derive2 { name="dafs"; version="1.0-38"; sha256="0ljhpw2f4hbkqh6c6gwqwwdsa4kp5qvyphig5zcn6qrb9ryf3wh1"; depends=[s20x]; }; - dagHMM = derive2 { name="dagHMM"; version="0.1.0"; sha256="1dw4clv2x71km1sqz1mydscwyj6y9yqx06v3rkmdz13qqcacfmhi"; depends=[bnclassify bnlearn future gtools matrixStats PRROC]; }; dagR = derive2 { name="dagR"; version="1.2.1"; sha256="16dx7gpbq61xwnk3769mf6nsynqb3zgjl6l0zcvh8j0cp1s35m82"; depends=[]; }; dagirlite = derive2 { name="dagirlite"; version="0.1.0"; sha256="12j5mfxcv32qgx1yklcq8yl2kx4lkxap4biywjrj0sjx6zj60f8l"; depends=[knitr Rdpack]; }; dagitty = derive2 { name="dagitty"; version="0.3-1"; sha256="1a78g2nr8i7mzzxyb6mfsqqgjyf3s4hwngvyd9vyygzcb79bai3x"; depends=[boot jsonlite MASS V8]; }; dagwood = derive2 { name="dagwood"; version="0.1.4"; sha256="1lp6swfmfzv28cfybmvj7czkfljd0sldv2qqi83q0fwcb7kxgdfz"; depends=[dagitty]; }; + daiR = derive2 { name="daiR"; version="0.9.9"; sha256="19rl58ns28wc3bwv8fs68zdcl59css9rwrfpfdjw4vay4dczfb6h"; depends=[base64enc beepr data_table fs gargle glue googleCloudStorageR httr jsonlite magick pdftools purrr readtext stringr xml2]; }; dail = derive2 { name="dail"; version="1.5.2"; sha256="0a82ch0l7ci9vjrwyy38qhw8zrp9d4h2bmk963llm9aqf4j7lkhf"; depends=[deflateBR dplyr janitor lubridate magrittr RCurl readr stopwords stringr tidytext]; }; daiquiri = derive2 { name="daiquiri"; version="1.1.1"; sha256="05057i8xvkzyd8h1ppw7qip1d4yjgzimmb5chbdw72mwwgbrwrfy"; depends=[cowplot data_table ggplot2 reactable readr rmarkdown scales xfun]; }; daltoolbox = derive2 { name="daltoolbox"; version="1.0.717"; sha256="1fxkbd821pp7qriqj0c0q5njn3xyibf3b3npx8gsiv186ss17dms"; depends=[caret class cluster dbscan dplyr e1071 elmNNRcpp FNN forecast ggplot2 MLmetrics nnet randomForest reshape reticulate tree]; }; @@ -8284,17 +8294,16 @@ in with self; { dams = derive2 { name="dams"; version="0.3.0"; sha256="1jlx1b4cir1vwq75jnmk0pc6j95syfpi0hlnkx82g7pwfxwrdrib"; depends=[crul fauxpas janitor readxl]; }; dang = derive2 { name="dang"; version="0.0.15"; sha256="0zy72rlviisjb3syvj2fq9zliwk02m33kjd7h9q7n3xq3876bi4w"; depends=[tidyCpp]; }; dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; }; - dann = derive2 { name="dann"; version="0.2.6"; sha256="1kmhif5vpj221pmpv5l3a8dspcgqg4ygbvi4s51yyi9pxnlf3mvw"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; + dann = derive2 { name="dann"; version="1.0.0"; sha256="0hmmkzv3cq0yl8kgcj08557zx086ablh6ngmyxhb1chig7kmmb4x"; depends=[ellipsis fpc ggplot2 hardhat MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; danstat = derive2 { name="danstat"; version="0.2.0"; sha256="16b0dl41g56s6iyxndpl403wgqqj1l3g9k78y3ciq5djq3a25m97"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; daqapo = derive2 { name="daqapo"; version="0.3.2"; sha256="1c00ppsqzjmrw16zdifkcigi4ll2nd2hlhj17lydmin0djg5cpby"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tibble tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="2.9.7"; sha256="1wwm2gq743l90jsa1hsgxknqxqp0ga8vf3xv652m3ifpyrkp93vx"; depends=[adegenet ape crayon dartR_data data_table dplyr fields foreach ggplot2 gridExtra MASS patchwork plyr PopGenReport raster reshape2 shiny SNPRelate sp StAMPP stringr tidyr vegan]; }; + dartR_base = derive2 { name="dartR.base"; version="0.49"; sha256="1jyfwxrr4vcpac277wii11md7rpv5nxcz7g1g6ardj29a690r2vh"; depends=[adegenet ape crayon dartR_data data_table dplyr foreach ggplot2 gridExtra patchwork plyr reshape2 SNPRelate StAMPP stringr tidyr]; }; dartR_data = derive2 { name="dartR.data"; version="1.0.2"; sha256="0gi6hgvfvh1hp60fvmij2r4fgv1qigs2biw2hw05rbl55xv93ni5"; depends=[adegenet]; }; - dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; }; - dashHtmlComponents = derive2 { name="dashHtmlComponents"; version="1.0.3"; sha256="01zrwjlhwwajk2lnv7is1r6nril83l65pynx856y9mvnm05xkb7m"; depends=[]; }; - dashPivottable = derive2 { name="dashPivottable"; version="0.0.2-1"; sha256="1fv5pnvimf7w1k1lsijh9y2zk4z1z00m6m640jxvqla5i1rqy8cq"; depends=[]; }; - dashTable = derive2 { name="dashTable"; version="4.7.0"; sha256="0iy07dxa90vsp3rfk8ij78j9ajz1mpxywmclxzkfj7axjyydxh5w"; depends=[]; }; + dartR_spatial = derive2 { name="dartR.spatial"; version="0.76"; sha256="0m65y04h9lljpv4g5y0vnzd70pqmzdw538qb7kwksv41lkxlqnvf"; depends=[adegenet crayon dartR_base dartR_data data_table ggplot2 MASS raster sp StAMPP tidyr vegan]; }; + dartRverse = derive2 { name="dartRverse"; version="0.49"; sha256="0s0apsz8zjrjz9lgb2xwn5zhh38iha6lif109hzwpmsddbckp3y0"; depends=[cli dartR_base dartR_data rlang]; }; dashboardthemes = derive2 { name="dashboardthemes"; version="1.1.6"; sha256="0yki4gmklrkhs6ldznabdr04smw3a112ask313z1h93dnvabr06c"; depends=[htmltools]; }; dat = derive2 { name="dat"; version="0.5.0"; sha256="1d3q4bang6pm06rfzh6h947xy3wwqn3l6ri0h4hzklg5pzwpsajd"; depends=[aoos data_table Formula magrittr progress]; }; data_table = derive2 { name="data.table"; version="1.14.8"; sha256="1z9rf5anjvg3bmbbajb12nf65jsxdw35ad9piysrp76zcx9wxchl"; depends=[]; }; @@ -8307,7 +8316,7 @@ in with self; { dataMojo = derive2 { name="dataMojo"; version="1.0.0"; sha256="0cp4zj85jczm42vm046n0rqmlrllj2r0jv1003h10isamffp59ig"; depends=[data_table]; }; dataPreparation = derive2 { name="dataPreparation"; version="1.1.1"; sha256="0ck3g9hymj6i1a9nr58srm8jxbaghh5w5jg9cqbx5zp18fc0w81v"; depends=[data_table lubridate Matrix progress stringr]; }; dataReporter = derive2 { name="dataReporter"; version="1.0.2"; sha256="1rjm6j1s229j1j9yb5y1sdi03x22qzrkmhc09k4xdmwmwmpi3s58"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.13"; sha256="0w6n3qa50js2qlaif6njs7qw4xf7vl6a270wb67v6bxhwixficix"; depends=[curl httr jsonlite lubridate readr xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.14"; sha256="0wk939w72ndfb9v1bkcc229hdk2l6q4yxjzxii5zdkvmwgm1rmfc"; depends=[curl httr jsonlite lubridate readr xml2]; }; dataSDA = derive2 { name="dataSDA"; version="0.1.0"; sha256="0nf7ssk8srpmq0b2bqzm6kilj3m3dhdk7fz35vhzzkj4d2wn9czr"; depends=[magrittr tidyr]; }; dataclass = derive2 { name="dataclass"; version="0.3.0"; sha256="1byjxwk3jlm3jaa8q2ppr5i0y98hriky7rrff9gb8nk6yvv9jgmq"; depends=[cli dplyr glue magrittr purrr rlang tibble]; }; datacleanr = derive2 { name="datacleanr"; version="1.0.3"; sha256="0mrfqm3lgb6sl2j35sfd00gb5121j9wmlff8k0vczr3sgmqz4dg8"; depends=[bslib clipr dplyr DT formatR fs glue htmltools htmlwidgets lubridate magrittr plotly purrr RColorBrewer rlang rstudioapi shiny shinyFiles shinyWidgets summarytools]; }; @@ -8318,7 +8327,7 @@ in with self; { dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.4"; sha256="0klhkbwpaqxk2mnxha8b03mpgfxk107ff9d2nx6cky59il3c1825"; depends=[caret GA Rcpp]; }; datagovsgR = derive2 { name="datagovsgR"; version="1.0.0"; sha256="1vi3pql1k563ggvqr0d673z2aspvqi1w384lslinnsq85cwcfcly"; depends=[data_table dplyr httr purrr stringr]; }; - datamods = derive2 { name="datamods"; version="1.4.1"; sha256="1jih91sa9438k0a2fzqg7h9s3mqg1yhfqxpjfi1ibbc34dpnxpvl"; depends=[data_table htmltools htmlwidgets phosphoricons reactable readxl rio rlang shiny shinybusy shinyWidgets tibble writexl]; }; + datamods = derive2 { name="datamods"; version="1.4.2"; sha256="1qzzzv1hgyj1kgpjxfpblbw4yb3d3sxicmgrijnl90k6jdakg887"; depends=[data_table htmltools htmlwidgets phosphoricons reactable readxl rio rlang shiny shinybusy shinyWidgets tibble writexl]; }; datana = derive2 { name="datana"; version="1.0.3"; sha256="0vci2nhavqrpah4n5gr0rhihlp9qa41mfgg8w2k7fdak65hdz3hq"; depends=[ggplot2 lattice]; }; datanugget = derive2 { name="datanugget"; version="1.2.1"; sha256="1zvhbkpc1akzdfaz7jzgfmb287s88b8a5icgqkaq5zvlik6drw0q"; depends=[doSNOW foreach]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.4.0"; sha256="0bp1ynarz70c2clsz60dqfd4vmgm3251jv6821db5n7fffdrr7qa"; depends=[httr2 readr tibble vetr]; }; @@ -8327,7 +8336,7 @@ in with self; { datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; dataprep = derive2 { name="dataprep"; version="0.1.5"; sha256="1v48ry6xk0qg73j6js6m6fqd1bdhjv500bndb60zzl2qifrjfk2a"; depends=[data_table doParallel dplyr foreach ggplot2 reshape2 scales zoo]; }; dataquieR = derive2 { name="dataquieR"; version="2.0.1"; sha256="0paxrc9fi4p93mp4rr0ip0kn9gsm0hmplsl8icwxx980dmhxxyz9"; depends=[dplyr emmeans ggplot2 lme4 lubridate MASS MultinomialCI parallelMap patchwork qmrparser R_devices reshape rio rlang robustbase scales]; }; - datardis = derive2 { name="datardis"; version="0.0.3"; sha256="1z6rjgj7hri09nb7dldhgry4dlyx9v8zf1lqlrs7r1fwsl6znibw"; depends=[dplyr magrittr]; }; + datardis = derive2 { name="datardis"; version="0.0.4"; sha256="0zcgl4jyz0xphliwjg8x5hqg9avflk0s5mgxd7gl52pxrki4mak3"; depends=[dplyr]; }; dataresqc = derive2 { name="dataresqc"; version="1.1.1"; sha256="1a4izp25bxvgq3l4m7njy13d3fl6xn8y7v2v18raqk5g8kl8ca2y"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; datarobot = derive2 { name="datarobot"; version="2.18.4"; sha256="015hb7srndwgl0wxw5601hjqyy2hy9dm5nzlwx2hdbpc4cmcgvrm"; depends=[httr jsonlite yaml]; }; @@ -8335,34 +8344,34 @@ in with self; { datasauRus = derive2 { name="datasauRus"; version="0.1.6"; sha256="0vgylf3bab0xcfg08xwvfq9yhxy6w0fxi7wp4kkxfyjb0pw15qxk"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; dataset = derive2 { name="dataset"; version="0.2.1"; sha256="1p7f27q3z810kfgcpcz934s3x8g2dl9dhg0y3sbr4z31kdmcaf8q"; depends=[assertthat ISOcodes]; }; + datasetjson = derive2 { name="datasetjson"; version="0.1.0"; sha256="0srxp0layarikjz4nwc2hvgrjj9k019p1iaidarmrfgc9q96lxaa"; depends=[jsonlite jsonvalidate]; }; datasets_load = derive2 { name="datasets.load"; version="2.2.0"; sha256="187a1z0ljws5fvk91ap94cxm0yw6l47v0f4nhbq71jrk285zm1qr"; depends=[DT miniUI shiny]; }; datasetsICR = derive2 { name="datasetsICR"; version="1.0"; sha256="1iw8am7y6r6j21rp6r6iw1ri4c2yrgza7aw3ams4xbx6mcz3746y"; depends=[]; }; dataspice = derive2 { name="dataspice"; version="1.1.0"; sha256="1pnmb7kdx9wdvi2873rw1a7hc7spsvx4lfvfhfcqwgll46j0f1wm"; depends=[dplyr EML fs ggplot2 jsonlite magrittr purrr readr rhandsontable shiny stringr tibble tidyr whisker]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; dataverifyr = derive2 { name="dataverifyr"; version="0.1.5"; sha256="14jp4pzgj022b888df1s0p44v90ghr19bsdsa9hx3dx0i7ls8lzs"; depends=[yaml]; }; dataverse = derive2 { name="dataverse"; version="0.3.13"; sha256="1fzbllznvq5mls3hm1pirlkgjlsiwvdkkcqci2jymh376l2gx35g"; depends=[checkmate httr jsonlite readr xml2]; }; - dataversionr = derive2 { name="dataversionr"; version="0.9.0"; sha256="013c45fbak32bcda9zj8dk0jw57xpbriymks4n38d9nliflqr6z5"; depends=[arrow diffdfs dplyr lubridate magrittr purrr rlang tidyr]; }; - datawizard = derive2 { name="datawizard"; version="0.8.0"; sha256="18i27mmf3z8a3wa49k8jjcs17nd0h4gmmjybbnaihyqm6r7yv8qk"; depends=[insight]; }; + datawizard = derive2 { name="datawizard"; version="0.9.0"; sha256="1w1d18ssd6nbwg2r9gs0779wf33vpl8xivlc79ci5mi4db2m7zsd"; depends=[insight]; }; datazoom_amazonia = derive2 { name="datazoom.amazonia"; version="1.0.0"; sha256="07b7wg71lvilb0hcimr4shaskl1rixn75nvc3mfxi85hbdkk56xn"; depends=[data_table dplyr Hmisc janitor lubridate magrittr purrr Rcpp readr readxl sf sidrar stringi stringr tibble tidyr XML]; }; date = derive2 { name="date"; version="1.2-42"; sha256="0x6b9dk7llvmcf2bzgdk8g1a28as0l1xxx2xn2fwyw801ab3z4as"; depends=[]; }; - datefixR = derive2 { name="datefixR"; version="1.5.0"; sha256="1y2ylgzf899d6j4ckl4b6w39s6l7ks709yj7gny42b3f09smqf4v"; depends=[lifecycle Rcpp rlang stringr]; }; + dateback = derive2 { name="dateback"; version="1.0.3"; sha256="0ja453w7nlb051sdl9rm2kdk40lz34zrixy3bmmmhjvcmcls9kxs"; depends=[]; }; + datefixR = derive2 { name="datefixR"; version="1.6.0"; sha256="0kl04yz0dc13vl4717qrmv1183gf3f1nq36h1pqpa73dqa4gpzg7"; depends=[lifecycle Rcpp rlang stringr]; }; datelife = derive2 { name="datelife"; version="0.6.8"; sha256="154nmpvslnizd03jaxbhkc7vjzjx7j18zlwmrpx2qidqk424k1i9"; depends=[abind ape BiocManager bold cluster compare curl data_table geiger httr ips knitcitations paleotree phangorn phylobase phylocomr phytools plyr rotl stringr taxize treebase]; }; daterangepicker = derive2 { name="daterangepicker"; version="0.2.0"; sha256="03y8r1n31ipapfbbg12myrnqd961ra3fb6r4mjxqfkppxcj9c6mi"; depends=[htmltools jsonify shiny]; }; datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; }; datetimeoffset = derive2 { name="datetimeoffset"; version="0.3.1"; sha256="11xxxfv3g8jf16cwpxjycrymx9baf8gkpd98x69djhbnrn3si0vn"; depends=[clock purrr vctrs]; }; - datetimeutils = derive2 { name="datetimeutils"; version="0.6-1"; sha256="0phk1d9vs5whkf0azwz5mn1q4j1crz0yq1fpln9si66bxzn0dzi6"; depends=[]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.6-2"; sha256="0cw6aii5lr3k4af75ijklvfwgb5h3x0xk5n2kxzpvmdmmg3x97cd"; depends=[]; }; datetoiso = derive2 { name="datetoiso"; version="0.1.0"; sha256="1pxk229gfl2zj1arlgyyll6h4bq8d90d2a2a09r216f5vdxafj0j"; depends=[lubridate stringr]; }; dateutils = derive2 { name="dateutils"; version="0.1.5"; sha256="03xch5wcvv15fy9x70smrki6374lddhf0sfp0inymdsq4g8wp4bc"; depends=[data_table Rcpp RcppArmadillo seasonal]; }; datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; datos = derive2 { name="datos"; version="0.5.1"; sha256="0358fshhxyws5i1bblhnhf7k42mrjn76ppy2qrvhj27kkc6i5npn"; depends=[babynames dplyr forcats fueleconomy gapminder ggplot2 Lahman modeldata nasaweather nycflights13 palmerpenguins rlang tibble tidyr yaml]; }; - datplot = derive2 { name="datplot"; version="1.0.0"; sha256="1y9pls1g2flz8n3jbh4jcp1fn78qwfbgsrzyf3jms9f6w8fs0f1d"; depends=[]; }; datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; }; dauphin = derive2 { name="dauphin"; version="0.3.0"; sha256="04r48wld84by8lwqi9pwdypval814wfshjblmm30v5igwl1xcgzc"; depends=[]; }; dawai = derive2 { name="dawai"; version="1.2.5"; sha256="0g52bm66jnvga4sf5n5m18k5jx56vqpn886jk0k6lydj78nkq88q"; depends=[boot ibdreg mvtnorm]; }; daySupply = derive2 { name="daySupply"; version="0.1.0"; sha256="1317g60cmqlw1wy7n7x5ifh544lzsysif6192s2k16jmgzj6cz2s"; depends=[dplyr lme4 magrittr rlang]; }; - daymetr = derive2 { name="daymetr"; version="1.7"; sha256="0rambqnvw3wv8nb5ldzx8wbsjv6vwqhp144lw052i7y9i9jdyn93"; depends=[httr ncdf4 sf terra tibble tidyr]; }; - dbGaPCheckup = derive2 { name="dbGaPCheckup"; version="1.0.2"; sha256="1zij7p7am7xk9as0nln803j69xnfsqjghqkns6i85mq1dxdvqgnl"; depends=[dplyr formatR ggplot2 labelled magrittr pander purrr questionr readxl rlang rmarkdown tibble tidyr]; }; + daymetr = derive2 { name="daymetr"; version="1.7.1"; sha256="069s7wxy2yis6x7q4faac0fcr305dxmvan7wc3fzgbix0hianvng"; depends=[httr ncdf4 sf terra tibble tidyr]; }; + dbGaPCheckup = derive2 { name="dbGaPCheckup"; version="1.1.0"; sha256="1q1gx73fl016kpk6p9cfwx580kwnq9fvhpi96iyrr40rf27m39dv"; depends=[dplyr formatR ggplot2 labelled magrittr naniar pander purrr questionr readxl rlang rmarkdown tibble tidyr]; }; dbMC = derive2 { name="dbMC"; version="1.0.0"; sha256="0gcgn3m10sx0naim206jkw7szl0mr7vbnkn25avvv9f8iy3y9vcv"; depends=[softImpute]; }; dbWebForms = derive2 { name="dbWebForms"; version="0.1.0"; sha256="0diz5mh4fhwrwqa7jr70vzj2jks7h2n91v2hr1mvvlbc7rzd9yki"; depends=[data_table DBI html5 stringi]; }; dbacf = derive2 { name="dbacf"; version="0.2.8"; sha256="03nrd7x2sxkyah8lpi5zawap7yhg6h2gdy0jws1jysw937l1kc50"; depends=[Matrix]; }; @@ -8379,21 +8388,21 @@ in with self; { dbnlearn = derive2 { name="dbnlearn"; version="0.1.0"; sha256="0kmyiad7v96mnfi24d2pn3dqmk3g82sx348m1vhhqwijfnj53brb"; depends=[bnlearn bnviewer ggplot2]; }; dbparser = derive2 { name="dbparser"; version="2.0.1"; sha256="0n8hbra1mjrlbzpxlpalx5w84w6xq38v3v3x5rsgkkyzmnk4r5jf"; depends=[dplyr progress purrr tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; - dbplyr = derive2 { name="dbplyr"; version="2.3.3"; sha256="1d3m7bhd8n5l0x1phfwzgrw2kwfyahb9yd61bbcnryd6m8c8kr3w"; depends=[blob cli DBI dplyr glue lifecycle magrittr pillar purrr R6 rlang tibble tidyr tidyselect vctrs withr]; }; + dbplyr = derive2 { name="dbplyr"; version="2.3.4"; sha256="1b6y1jhf5ix4vry165vwid5nqm0d99q61vxak6aw3vfkj379vgk9"; depends=[blob cli DBI dplyr glue lifecycle magrittr pillar purrr R6 rlang tibble tidyr tidyselect vctrs withr]; }; dbscan = derive2 { name="dbscan"; version="1.1-11"; sha256="0bz66lvvg7290c5260ph92k4r7adgisbx3vml9096qhjwrkqwjgh"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="2.0.1"; sha256="1sa33ir8hj0z0d2ry4w7bhilx94alhdvjc4bzaj09alv6w39gpcn"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.8"; sha256="0pdf0l9h44666bmfsa43nrmi77ffzygb5mzjfrv7pk99qi7ryw46"; depends=[DBI]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; - dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; dcTensor = derive2 { name="dcTensor"; version="1.2.0"; sha256="0y2imnbgvbvbmqb1vmzyykjfzkh0ckiv5q7fp4zvi2ci0w9hf90n"; depends=[fields MASS nnTensor rTensor]; }; dccmidas = derive2 { name="dccmidas"; version="0.1.0"; sha256="0ng46i9rv4aw26af03ryhmcrb8xhhd8d72zbqiwrzhhkh18azbgx"; depends=[lubridate maxLik Rcpp RcppArmadillo Rdpack roll rugarch rumidas tseries xts zoo]; }; - dccpp = derive2 { name="dccpp"; version="0.0.2"; sha256="06mykc25398bpp7dk903ykb3q5jx8m3nl7hxzsl7m2sa7iaikpnx"; depends=[Rcpp RcppArmadillo]; }; + dccpp = derive2 { name="dccpp"; version="0.1.0"; sha256="1j17rv9wklmxbxa6ri9vhl370jzhi00h7h8hz1ajzqf6v3b2lkvc"; depends=[Rcpp RcppArmadillo]; }; dcifer = derive2 { name="dcifer"; version="1.2.0"; sha256="0h7wir2xd2lr6h9hh8wr335lxr5w7grf7gjhqpg3a36ycd8mibbv"; depends=[]; }; dclone = derive2 { name="dclone"; version="2.3-2"; sha256="1x0fx24fxb7zp9g9lrdb1hbljgmi9szrsh751jidm52fin863qz0"; depends=[coda Matrix R2OpenBUGS rjags rstan]; }; dclust = derive2 { name="dclust"; version="0.1.0"; sha256="1icfx52v3g7kkkc11pw0xlrc8dlx5q3n2zbrd3fccmw17jzxqbg7"; depends=[openssl phylogram]; }; dcm2 = derive2 { name="dcm2"; version="1.0.2"; sha256="1dxymql66sy0nfxqfh106cvz5r93ajpjr1w8amn03w0ciz4v5nqs"; depends=[dplyr glue magrittr modelr purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; }; dcmle = derive2 { name="dcmle"; version="0.4-1"; sha256="1zh243ya02232z56i0y05l891685my6g9v6wal6z5c92s179g85p"; depends=[coda dclone lattice]; }; dcmodify = derive2 { name="dcmodify"; version="0.8.0"; sha256="1r4mfkf766hsr3qd60mmxy3841r8jc4d6wlb12cak4aanqisq7aj"; depends=[lumberjack settings validate yaml]; }; + dcorVS = derive2 { name="dcorVS"; version="1.0"; sha256="1gawk22mv5ppbiqqm4k2pjjknsp7zxnnr0lk24l6phrvnszfaxlw"; depends=[dcov Rfast]; }; dcortools = derive2 { name="dcortools"; version="0.1.6"; sha256="1qcblwcv2rwrl502hiv0l0r137sa4k0kx892k2w1chm40y5vri3b"; depends=[ggplot2 Hmisc pheatmap Rcpp RcppArmadillo RcppEigen Rdpack Rfast]; }; dcov = derive2 { name="dcov"; version="0.1.1"; sha256="0c3a5dzpizsxlsh723pcd0d7n0mgfc9y35vrfhmskp3c1x639mh3"; depends=[Rcpp RcppArmadillo]; }; dcurver = derive2 { name="dcurver"; version="0.9.2"; sha256="1v4h480lff1cyjjwb80dksiffh0y4b3s07lq2l2r21rn1l4mav6c"; depends=[Rcpp RcppArmadillo]; }; @@ -8403,30 +8412,30 @@ in with self; { dde = derive2 { name="dde"; version="1.0.4"; sha256="1qwa9vmsjq9d4z08ja687058bpx7zg16k0pwk2knkjya3clz774k"; depends=[ring]; }; ddi = derive2 { name="ddi"; version="0.1.0"; sha256="0pnkylz7l6brx6i73wys637w811psxhnr39lcmkag41s6jcgabd5"; depends=[]; }; ddiv = derive2 { name="ddiv"; version="0.1.1"; sha256="0xsn74z78znrm3rnnvdphp89sb0lik564ha3wv6n3ldrfh1van8y"; depends=[MASS qpdf segmented]; }; + ddml = derive2 { name="ddml"; version="0.1.0"; sha256="1vqlqhkns0ghn1vz5xdln263f6jlpkv4sw3bdy2r0abbbjmg63w5"; depends=[AER glmnet MASS Matrix nnls quadprog ranger xgboost]; }; ddp = derive2 { name="ddp"; version="0.0.3"; sha256="03gszqzh73zq04hqa2zgxn4fkiyr1fbhx3byxsdfzmmji46f8qip"; depends=[]; }; ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; }; - ddpcr = derive2 { name="ddpcr"; version="1.15.1"; sha256="1i6nl2c5k7bg9izz4a4cdgm46a88h08y0dpzbxr82bwqfc7l3kcx"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinydisconnect shinyjs tibble]; }; + ddpcr = derive2 { name="ddpcr"; version="1.15.2"; sha256="1as25yc23n6jj87nccp7g2jrpvz6yxa7f6ba65g6ynvkzk57531b"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinydisconnect shinyjs tibble]; }; ddplot = derive2 { name="ddplot"; version="0.0.1"; sha256="03zcnc6is4qdpz3krhhz820j0an6dr7562bnmzj787xf5parwq6r"; depends=[r2d3]; }; ddsPLS = derive2 { name="ddsPLS"; version="1.2.0"; sha256="0b35znfd56lcswygq4h5k5zlsdazpva3pq4anvr96wljf4gwnffn"; depends=[doParallel foreach Rcpp RcppEigen shiny]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; + ddtlcm = derive2 { name="ddtlcm"; version="0.1.1"; sha256="0ml423182xgxsdfzvl5xnyxp9ijmx5bkwvwdaqmfwk86x3994cbs"; depends=[ape BayesLogit data_table extraDistr ggplot2 ggpubr ggtext ggtree label_switching Matrix matrixStats phylobase poLCA R_utils Rdpack truncnorm]; }; deBInfer = derive2 { name="deBInfer"; version="0.4.4"; sha256="1l4wim82n5q51c1f7193d3i22qrn9kfcsddyrn8izhlwsjb9q3kp"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deBif = derive2 { name="deBif"; version="0.1.7"; sha256="1jz5kxhjbsfd2mvy6dhs7h3zx7gp6j2bg2sf9q08wx61q3b6ksq6"; depends=[deSolve rootSolve rstudioapi shiny shinydashboard shinydashboardPlus shinyjs]; }; deFit = derive2 { name="deFit"; version="0.2.1"; sha256="0z4lc9s3wb7gab7cg1xr9gkggd2dxy8qbqqvbz1yxvnm86n2ai79"; depends=[deSolve ggplot2 R6]; }; - deSolve = derive2 { name="deSolve"; version="1.36"; sha256="1ygijjvmi7igk3xmm2mzfnbw05kynjdqbwddifg798awk7mfffjw"; depends=[]; }; + deSolve = derive2 { name="deSolve"; version="1.38"; sha256="0sc933g0jx25b7fm5bl6is95mn4fn1sf8cgb6qzhlmmf8rfgxd50"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; - deTestSet = derive2 { name="deTestSet"; version="1.1.7.4"; sha256="0cknv6d37vxfpvnckhgyrg5bw7i18gj85pyrrdyl5fxsqkqwk6ni"; depends=[deSolve]; }; deaR = derive2 { name="deaR"; version="1.4.1"; sha256="0rc12pr4br8kca90xcy5f8w1fyjzn6s7kyc3q3m3caxq8dlidn5v"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-42"; sha256="0d516gvhqw6nfv9ijda9j04nlcjgdnnlgcf5774n8fgwjhm4azx1"; depends=[]; }; - debar = derive2 { name="debar"; version="0.1.0"; sha256="03xlhnbvmkg93f6zl3x22rfwvs17fscvl8irmnm19pifk4bvbpyd"; depends=[ape aphid seqinr]; }; debkeepr = derive2 { name="debkeepr"; version="0.1.1"; sha256="1w38qz0qs26ba1c89z1c40n4rwif989gh7was7wwazr2s61wjaha"; depends=[cli dplyr magrittr rlang tibble vctrs zeallot]; }; debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; }; debugr = derive2 { name="debugr"; version="0.0.1"; sha256="0lfq0s0hibd00558vl3dmvrkzxjc7q62xr8sqzai0pv9a9lhixcn"; depends=[rprojroot rstudioapi]; }; decido = derive2 { name="decido"; version="0.3.0"; sha256="14y3z5ys5y3kffgm0dk92rx4vd1mi9jvxn7pqvwi4jhyx7wx06pw"; depends=[Rcpp]; }; decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; }; - decisionSupport = derive2 { name="decisionSupport"; version="1.111"; sha256="0san25jhn025lbmjnvqpdkid9rpsr94p8511k4c1iia7ljczbgmp"; depends=[assertthat chillR dplyr fANCOVA ggplot2 ggstance magrittr msm mvtnorm nleqslv patchwork rriskDistributions stringr tidyr tidyselect]; }; + decisionSupport = derive2 { name="decisionSupport"; version="1.113"; sha256="0gxhxjpn9nzn1s7xm9cy9g82b68g8dg6654dbj4qr4aj3cfk14w8"; depends=[assertthat chillR class dplyr fANCOVA ggplot2 ggstance magrittr msm mvtnorm nleqslv patchwork rriskDistributions stringr tidyr tidyselect]; }; deckgl = derive2 { name="deckgl"; version="0.3.0"; sha256="0cjvmdiqknrq8mlqxmhkhcib40asdyl2bpllx8v1jz3h1d62zs04"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; - declared = derive2 { name="declared"; version="0.22"; sha256="0r0mcxr4yb2widig1xhsx72rdamd02lkl66qcgsfjxw9bba5zwh9"; depends=[]; }; + declared = derive2 { name="declared"; version="0.23"; sha256="0y01xa9vw6v8dw1sm2ijvxhwfx54iwggy0qicamp9ljs5bcgvz6h"; depends=[]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; decoder = derive2 { name="decoder"; version="1.2.2"; sha256="1jxgd32bn36ldal26wivhdxgjy247l7r4ickacr1p8rrwxvhpk18"; depends=[]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.2"; sha256="12sb4zzvc29hvhlay97g84pn4saqyp16wckjrdgg4qqpc0rzrfz5"; depends=[forecast PSF Rlibeemd tseries]; }; @@ -8441,7 +8450,8 @@ in with self; { dedupewider = derive2 { name="dedupewider"; version="0.1.0"; sha256="18s8m0nzmx8ai4gcv5rv3rvmngw1q0pxj013v433xj76z2drqdaz"; depends=[data_table]; }; deep = derive2 { name="deep"; version="0.1.0"; sha256="1764cnsax8jwp2pb6rnmlb0f5m99jss84yi9rp017hdm20izvzrq"; depends=[]; }; deepMOU = derive2 { name="deepMOU"; version="0.1.1"; sha256="1r05wg01nighmhs2r8z91w091fz2r1ryb1j0mi96knqqdjgcbh4i"; depends=[dplyr entropy extraDistr ggplot2 MASS Rfast skmeans]; }; - deepNN = derive2 { name="deepNN"; version="1.1"; sha256="0iqvr8cl7ks5qvwsp1sx10r4jpbchf4mlsq0s3icr2cs3x3ryxvi"; depends=[Matrix]; }; + deepNN = derive2 { name="deepNN"; version="1.2"; sha256="1wlj70md5vgzad5q2n6qhh076q01zd0k8fsqafmswl4545hmmz69"; depends=[Matrix]; }; + deepRstudio = derive2 { name="deepRstudio"; version="0.0.9"; sha256="0fqzxc8wnfvg7fjpmd02pbf7wnqa32n3pm42iwj6i9hbdx558rin"; depends=[assertthat clipr crayon httr jsonlite rstudioapi]; }; deepdep = derive2 { name="deepdep"; version="0.4.2"; sha256="0qcvspclzfw5w18k67j19410000ndma47x3b86s5jxa7cgzjarvk"; depends=[cranlogs httr jsonlite]; }; deepdive = derive2 { name="deepdive"; version="1.0.4"; sha256="0q4jjq11bd52bx0vqjxsh0fz1b72pfy4gpj5p19z7p4czf4a46c6"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; deepgmm = derive2 { name="deepgmm"; version="0.2.1"; sha256="0vwh8wgbva2a47b2yiiqjwq5qww2ckb4l66265sbp1lbis0g96li"; depends=[corpcor mclust mvtnorm]; }; @@ -8456,23 +8466,22 @@ in with self; { defineR = derive2 { name="defineR"; version="0.0.4"; sha256="1wm6ynicwk2dlx8m0k45kc1pa8i3z8w78xk3v40szy2ys5j80m7v"; depends=[common glue libr openxlsx readxl reporter xml2 xslt]; }; deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; }; deflist = derive2 { name="deflist"; version="0.2.0"; sha256="0m19yz3x4gn8zad7lgf343r41bqjvd5a279ykll8cw04y74c43lm"; depends=[assertthat memoise purrr rlang]; }; - defm = derive2 { name="defm"; version="0.1-0"; sha256="09556clb6xj724ls223pnkxbiz94bi5gdscgksp0k6qyay5qcy18"; depends=[Rcpp]; }; + defm = derive2 { name="defm"; version="0.1-1"; sha256="1pq89pma7gmahjhd6l5cjxd1768v7xjnv206ghls8w495xnl6qjs"; depends=[Rcpp]; }; deforestable = derive2 { name="deforestable"; version="3.1.1"; sha256="0p8psbsjxmc456flypdw2kh8kjsy2hw13nfcdilg527iy1dpif6i"; depends=[jpeg plyr Rcpp RcppArmadillo StableEstim terra]; }; + deform = derive2 { name="deform"; version="1.0.0"; sha256="0crnwp5z3wy2zx273a7lchvyv5k5fyclhqrb9q0qhhv56drgvm0y"; depends=[MASS Rcpp RcppArmadillo]; }; deformula = derive2 { name="deformula"; version="0.1.2"; sha256="18jrznpw2vqb658wv88yq4x7z44ilkjg0xb5v2lww87wxbv4m0gj"; depends=[cpp11 Rcpp]; }; degday = derive2 { name="degday"; version="0.4.0"; sha256="07a5zl56hh5vl94alsd9kvjdj5vy0vgx8dpyvr0qdiwj9m8a830y"; depends=[crayon magrittr zoo]; }; degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; degross = derive2 { name="degross"; version="0.9.0"; sha256="17n389a0k4jswgs908bcdhi410wpd1ljxh5izv35cldfq7dhjb3k"; depends=[cubicBsplines]; }; dejaVu = derive2 { name="dejaVu"; version="0.3.0"; sha256="0l30m707zrp05d7hywlx443n02mflxqsampmcblj3fvcbyywc1fd"; depends=[MASS]; }; - delaunay = derive2 { name="delaunay"; version="2.0.0"; sha256="0rnbi17fsgh1k7sr2blnf7sgppxv1fqm0l85z16bryx5z7ab602p"; depends=[BH gplots randomcoloR Rcpp RcppCGAL RcppEigen rgl Rvcg scales sets]; }; delayed = derive2 { name="delayed"; version="0.4.0"; sha256="0a00jwd4c69ba31xddl0gxjza6ydywlrgx21rm3bn8p247q5i37f"; depends=[BBmisc data_table future igraph progress R_oo R_utils R6 rlang rstackdeque uuid visNetwork]; }; deldir = derive2 { name="deldir"; version="1.0-9"; sha256="11q6cz410q8sv0w81fk1px3vx7xmyda5cbsv3m21xr577bn28yhj"; depends=[]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltaccd = derive2 { name="deltaccd"; version="1.0.2"; sha256="1iqyycjfmclr9y8gfj61naxwafjgmfwahyrc110qxzb239b501rw"; depends=[data_table doRNG foreach ggplot2 rlang scales statmod]; }; dematel = derive2 { name="dematel"; version="0.1.0"; sha256="1m84sd46cg7188wnjx09g88xvxdp7i0mdxnynwlqkgcmnwx4bdjw"; depends=[ggplot2 knitr]; }; - demcon = derive2 { name="demcon"; version="0.4.0"; sha256="1lwsvw40gmrcc38f2j231f7k7q9536pwgnfz1045dhs0cw1amlhx"; depends=[countrycode data_table httr rlang stringr]; }; deming = derive2 { name="deming"; version="1.4"; sha256="1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421"; depends=[boot]; }; demoGraphic = derive2 { name="demoGraphic"; version="0.1.0"; sha256="0b2fqa0z875wwd7qdqh2qfvkzh2cpbmck4smf9c0p31wv5yin0sq"; depends=[magrittr MASS officer]; }; - demoKde = derive2 { name="demoKde"; version="1.0.0"; sha256="11im065srsjcy6df39b3gd2p6av2i8q716j3wl1dg8l9sh8z4yi0"; depends=[]; }; + demoKde = derive2 { name="demoKde"; version="1.0.1"; sha256="1yhk77dgl45gs1j8ganr1y8prkczpyh8zrxf93mbrx1y9h54n34x"; depends=[]; }; demoShiny = derive2 { name="demoShiny"; version="0.1"; sha256="15zfm8dxsjwqj1xlwz7r61cvnsajw4n6viqkakxrgsfpv1x62qaf"; depends=[shiny]; }; demodelr = derive2 { name="demodelr"; version="1.0.1"; sha256="1jldvlw8xl5hbyw4m443r41nw9ck7dmkd4rmag4wqw4scra7qj46"; depends=[dplyr formula_tools GGally ggplot2 purrr rlang tibble tidyr]; }; demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; }; @@ -8492,6 +8501,7 @@ in with self; { denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; densitr = derive2 { name="densitr"; version="0.2"; sha256="04k98id4y5b6bdzayzignzyha8l693wk3dsla4abfpdf4wpqs17a"; depends=[changepoint]; }; densityClust = derive2 { name="densityClust"; version="0.3.2"; sha256="05x2fi1zdnkrg2nimf8k904j3lpyw0f7nmk6ax5p7x7a98wb2iqs"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; + densityarea = derive2 { name="densityarea"; version="0.1.0"; sha256="0blcpclwa6507vna9j8ysj0rs57r15f9vhp78d8fnl1436zlm217"; depends=[cli dplyr ggdensity isoband purrr rlang sf sfheaders tibble vctrs]; }; densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; denvax = derive2 { name="denvax"; version="0.1.2"; sha256="0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx"; depends=[]; }; @@ -8510,18 +8520,19 @@ in with self; { descr = derive2 { name="descr"; version="1.1.7"; sha256="1wg508l2r14kp4vajidp2i1xg23fmlmicdgf6q4p6wagzgwpapqs"; depends=[xtable]; }; describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptio = derive2 { name="descriptio"; version="1.1"; sha256="14dwvahafcx1j2zx3ikva94qj5h92lbd678qmmysfmjkkwq0ia6j"; depends=[ggplot2 MASS rlang]; }; + descriptio = derive2 { name="descriptio"; version="1.2"; sha256="140zaj10q1cbwjc4d0vmh0vbqh8617b61ys9hdsndhafkc0d02ia"; depends=[ggplot2 MASS rlang]; }; descriptr = derive2 { name="descriptr"; version="0.5.2"; sha256="1shqcykp8ahgarsam56zv4gcbj0mmfm7jy1i9fgbmy5ddksnific"; depends=[dplyr ggplot2 magrittr rlang scales tibble tidyr]; }; descstat = derive2 { name="descstat"; version="0.1-2"; sha256="0q463p0bq80c9lhwfv4imbhgx6f1w2jqm3022p5zvycfa9w39rin"; depends=[cli dplyr forcats magrittr purrr rlang tibble tidyr tidyselect]; }; descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; desctable = derive2 { name="desctable"; version="0.3.0"; sha256="1i0124lnmzdbx468lyqmzbd6disxjifqjy8ss10fl8cin4f868lb"; depends=[dplyr DT htmltools pander rlang tidyr]; }; desiR = derive2 { name="desiR"; version="1.2.2"; sha256="149wgg5mbq95wizpc24mwb8qfxjdia4qkz66bnzjgiiyfh6r46wp"; depends=[]; }; - designer = derive2 { name="designer"; version="0.2.0"; sha256="0k14x0gn217lvd6vr4aszy2ngm3w7b45bas3g6vmik2q7h0klvqx"; depends=[bs4Dash bslib cicerone config fontawesome golem htmltools jsonlite shinipsum shiny shinyscreenshot]; }; - designmatch = derive2 { name="designmatch"; version="0.5.3"; sha256="1lzxkfa61iry34y2pqrclhcq83pa7h34nja381d1zzk7qwz0psp0"; depends=[highs lattice MASS slam]; }; + designer = derive2 { name="designer"; version="0.3.0"; sha256="0fsvlrciym2g9mp96kwb04md1jnqxwj39zd8q5dihijj0p1ib5mi"; depends=[bs4Dash bslib cicerone config fontawesome golem htmltools jsonlite rappdirs shinipsum shiny shinyscreenshot]; }; + designmatch = derive2 { name="designmatch"; version="0.5.4"; sha256="1x3pcwml6pa56ij2bc9jymfp066v7fd2avjl6awgpy3503qr56q1"; depends=[highs lattice MASS slam]; }; designr = derive2 { name="designr"; version="0.1.13"; sha256="13rj2xxxxj35zl7q570c3i4p2wjpxf79dza0sg9bhbq3yal6j6r2"; depends=[crossdes dplyr lme4 MASS tibble]; }; designsize = derive2 { name="designsize"; version="0.1.0"; sha256="1c9b320vssw3s1ybyialg5s85k1vfllbw40qfgmvnsr3imc2inb2"; depends=[]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; desirability2 = derive2 { name="desirability2"; version="0.0.1"; sha256="0x5v6mak68h6a03hccf8gksj3wmgcd3l84bplx1s4jr755wdm5ih"; depends=[glue purrr rlang tibble]; }; + desk = derive2 { name="desk"; version="1.1.0"; sha256="0n4csns2bd6larj2pxlp0hqxidlk8nxxdz9b33a61m0prly5d2z5"; depends=[cli rstudioapi]; }; desla = derive2 { name="desla"; version="0.3.0"; sha256="18q1rw8p69p5jcqxb4hryyn2bak6pjmx91g203xrilx7k1za4p23"; depends=[parallelly Rcpp RcppArmadillo RcppProgress Rdpack sitmo]; }; desplot = derive2 { name="desplot"; version="1.10"; sha256="1994fqd9d1g314bj0qx7gcb6qmv38gl2brc2gwms3zy4r4b86f57"; depends=[ggplot2 lattice reshape2 rlang]; }; details = derive2 { name="details"; version="0.3.0"; sha256="0mygkmfmfp3a2hgql514zyh4rw3v8i4g4cls6rss0fplg4pskwc7"; depends=[clipr desc htmltools httr knitr magrittr png withr xml2]; }; @@ -8537,7 +8548,7 @@ in with self; { detzrcr = derive2 { name="detzrcr"; version="0.3.1"; sha256="0afi1ir8il5xmzkpmbc2m5mvmgzlqw8qdn04gbnwl74a03yaxxmj"; depends=[DT ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="4.4-1"; sha256="0jsi27ncxmgi1ijp21vxvc5fvqkc19dzjjp9w10vd5dqxj53mpxm"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; - devRate = derive2 { name="devRate"; version="0.2.3"; sha256="05jmxlbxqx8czaxy9lhanvcz6qjwp8r33a22njr52xhfk0d4yivk"; depends=[]; }; + devRate = derive2 { name="devRate"; version="0.2.4"; sha256="06060wxji3mfwq6c58gmb07mz9sk9d5ls9d152vywjnz20ndpscd"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.2"; sha256="1hdqww5al3wv3jncfj8zqwypv487hc4pdb1d4f1c3w68fp0b1zni"; depends=[]; }; devtools = derive2 { name="devtools"; version="2.4.5"; sha256="0jwh14clyj5flygpmifk01avs7mbnj2s1686pxzfrkcshfyhw5iq"; depends=[cli desc ellipsis fs lifecycle memoise miniUI pkgbuild pkgdown pkgload profvis rcmdcheck remotes rlang roxygen2 rversions sessioninfo testthat urlchecker usethis withr]; }; dexter = derive2 { name="dexter"; version="1.2.2"; sha256="1bvrxbg564y5wwndl92xhz628c7qpjz7vh44a0r0rc7lrc8h0hsx"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; @@ -8545,16 +8556,17 @@ in with self; { dextergui = derive2 { name="dextergui"; version="0.2.6"; sha256="10v3djwani0zd27cjlf7lch7rfipnmb2p5wa7n2y5qxjqxli9z3x"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; df2yaml = derive2 { name="df2yaml"; version="0.3.1"; sha256="1ni61pf7sjwvgbfvwy91n6fbs6aa5vviq0xy6jsgddbwrk9diigj"; depends=[dplyr magrittr rlang rrapply tibble yaml]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; - dfadjust = derive2 { name="dfadjust"; version="1.0.4"; sha256="1a8xvk26rrhgi44f12yfbnjs7vp0llgdvmw2crwb696469df8gb6"; depends=[]; }; + dfadjust = derive2 { name="dfadjust"; version="1.0.5"; sha256="0x44alfb0ryd7m0y2gqq7sqhyf6yzk4pcwb129d2qazhwya6p2y5"; depends=[]; }; dfcomb = derive2 { name="dfcomb"; version="3.1-1"; sha256="04ply2jfbkrf5zylii24qfzhrnyksdxfj6647mkxq26a9j9r65x1"; depends=[BH Rcpp RcppProgress]; }; dfcrm = derive2 { name="dfcrm"; version="0.2-2.1"; sha256="01rn3zvi9xljmx48lkclckhnixian1vwq1frr8n784dsclp86spg"; depends=[]; }; dfdr = derive2 { name="dfdr"; version="0.2.0"; sha256="1s7i11sl6m80hryggxby4c0knzk6nxqnlwfpzgg4a2bnqnwygfya"; depends=[pryr purrr R6 rlang]; }; + dfexpand = derive2 { name="dfexpand"; version="0.0.2"; sha256="0rskd4bs9y56g5fh8dym11kj764pvlnx5lll5idybi67pjgv7b79"; depends=[stringr]; }; dfidx = derive2 { name="dfidx"; version="0.0-5"; sha256="02ka119nxn9258hz51m603s0gwmdi8a98z0j9lx7fqjxnd01jlip"; depends=[dplyr Formula]; }; dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; }; dfms = derive2 { name="dfms"; version="0.2.1"; sha256="10vxjcwznxlrl73jdpmnw9ihjxlg7az96s11qadxyxh3v7gs85q2"; depends=[collapse Rcpp RcppArmadillo]; }; dfmta = derive2 { name="dfmta"; version="1.7-3"; sha256="0n9056vd75vqxddagj4k23znvwv58db306xm4vv9sq044jc7kkg6"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; dfoliatR = derive2 { name="dfoliatR"; version="0.3.0"; sha256="0gl1acd5z67c2wkb806myr0ccm87waxdrnnjdq2wi8zndbc30j74"; depends=[dplR dplyr forcats ggplot2 ggpubr glue magrittr purrr rlang tibble tidyr]; }; - dfoptim = derive2 { name="dfoptim"; version="2020.10-1"; sha256="0gy3wnvwvi9sydcbix226jds88n43r5nchvzrhqdag0j1bwpr9gy"; depends=[]; }; + dfoptim = derive2 { name="dfoptim"; version="2023.1.0"; sha256="0c2ws249n8ib7fx8vp32l2hswicjxsds7xm1f4gcfky9cvcacdn4"; depends=[]; }; dformula = derive2 { name="dformula"; version="0.1"; sha256="0028qm3wsfpjbkpza5nb87pcm8cg0075jclcy6s4wfflizgfs6n4"; depends=[formula_tools]; }; dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.2.0"; sha256="0a9cxdc81rib84sgg5mpf28nhcv1g83kvnr7rin3djyv60ccrq8x"; depends=[lattice Rcpp robustbase]; }; @@ -8562,29 +8574,31 @@ in with self; { dfvad = derive2 { name="dfvad"; version="0.3.6"; sha256="1g232y0zmgpgx6phfsx67548dvqiwa4bc8q9cvpgmkdfaskczcfx"; depends=[]; }; dga = derive2 { name="dga"; version="2.0.1"; sha256="1q860hzxrbkpmnphdysx4wk1b46wjll8sw7xjsy1lxcaz9hwcnjk"; depends=[chron Rcpp RcppArmadillo]; }; dggridR = derive2 { name="dggridR"; version="3.0.0"; sha256="1915lc81yw6ns02fi37xjqd2zbdzhdsvqqb6c9w4b6i0665yb9ja"; depends=[dplyr Rcpp rlang sf sp]; }; - dglars = derive2 { name="dglars"; version="2.1.6"; sha256="13bnvinqgpmkisjri0sjsyzsh9nqplpry3n3galkv8dqhgpncq4w"; depends=[Matrix]; }; + dglars = derive2 { name="dglars"; version="2.1.7"; sha256="0nr18ry5jzjm77xc3z85szx6sij7a4faa1c47bkswsjiijpljjx2"; depends=[Matrix]; }; dglm = derive2 { name="dglm"; version="1.8.5"; sha256="087pvd3r9w4920xml3hrlwa95lknhmffyn8lqbw627y2d1zwsx1c"; depends=[statmod]; }; dgof = derive2 { name="dgof"; version="1.4"; sha256="0pbggby27av3nqbkp1b7xyn3zkjglanvl2d3wwmwwzdridjnaqfm"; depends=[]; }; - dgpsi = derive2 { name="dgpsi"; version="2.2.0"; sha256="0mdwf0rnr2h7wzl2bhlw0x2959x4k5m3lz2z8pp2wz9ysb507psg"; depends=[benchmarkme bitops ggforce ggplot2 lhs patchwork reshape2 reticulate]; }; + dgpsi = derive2 { name="dgpsi"; version="2.3.0"; sha256="1zp7my510ag3i0clqwqa5hr4ara9amq55cfyqbrnm837g9lwbnkv"; depends=[benchmarkme bitops clhs ggforce ggplot2 lhs patchwork reshape2 reticulate]; }; dgumbel = derive2 { name="dgumbel"; version="1.0.1"; sha256="1qlc81rh6fcrai9ls27j83bjac26qhpfnchf9pdjz86dyclfjx43"; depends=[Rcpp RcppEigen]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="2.0"; sha256="1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92"; depends=[boot car MASS Matrix sandwich]; }; dhh = derive2 { name="dhh"; version="0.0.1"; sha256="00kg2x1was85aq2vr15bak8y5p4mymbs8pbriijlbw64401djmb0"; depends=[]; }; dhis2r = derive2 { name="dhis2r"; version="0.1.1"; sha256="019qrkcssxmvmhla3vfjq9m0vwv9j9h7njr2sjpmk4cqcdxvcbjn"; depends=[attempt curl dplyr httr2 R6]; }; dhlabR = derive2 { name="dhlabR"; version="1.0.2"; sha256="1hqs31ddh82mx8zw8lyzcdl3x5dgpx88shjk8frzib6i4cgq48s8"; depends=[dplyr httr jsonlite purrr tibble zoo]; }; + dhsage = derive2 { name="dhsage"; version="0.1.0"; sha256="1p239fsay49rvakxgkgnghra7p4nzyvfird8mc4i4lz4w133x1jd"; depends=[]; }; di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; }; - diagis = derive2 { name="diagis"; version="0.2.2"; sha256="0bnyia73dcnygk6q4n4sxprhxj2pfmzcwmivk5kaxzagqi2zli8g"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; + diagL1 = derive2 { name="diagL1"; version="0.0.6"; sha256="0488zb7hy6681psfx0ypksyh738cyhw9flxn34ikfz4r54g1b5qv"; depends=[conquer greekLetters lawstat Matrix MatrixModels quantreg]; }; + diagis = derive2 { name="diagis"; version="0.2.3"; sha256="1gl720d1rrmqingsskkc86kl3n10c7cwvmx19yyxiprwzfkrjh95"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; diagmeta = derive2 { name="diagmeta"; version="0.5-1"; sha256="1wilkpwb8vzjx8zpgq0zmvfcd35dij4jxk5gn0x1xyhlfvj9nxrj"; depends=[lme4 meta]; }; diagonals = derive2 { name="diagonals"; version="6.4.0"; sha256="1c5pf23bcq47m9n2s5m5bkcksnifz9g06xc9149163i8mqhzia7l"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.5"; sha256="1r3lyl0h7mk9cfg8smr3jydfkjdawaphnxibkxfjqa7029vkxh79"; depends=[shape]; }; - dialr = derive2 { name="dialr"; version="0.4.1"; sha256="01vry39wc9ssmzkpp07szzbkigazj3l23bgrva3qmpbn5jjdi2ba"; depends=[dialrjars rJava]; }; + dialr = derive2 { name="dialr"; version="0.4.2"; sha256="16lpb93shwr0gw7pk3q629kgsvh9csgxyy344m9za7qx9m2vjnnb"; depends=[dialrjars rJava]; }; dialrjars = derive2 { name="dialrjars"; version="8.13.2"; sha256="1h9b2mvjbsxyclklc8lx8mymkbq8c5p06j5dxnxgk4mkpiazgr7i"; depends=[rJava]; }; dials = derive2 { name="dials"; version="1.2.0"; sha256="1zj8f47jzgaydp3cff96w0kx1gm208vyq3f77p3g59nc01r0wri4"; depends=[cli DiceDesign dplyr glue hardhat lifecycle pillar purrr rlang scales tibble vctrs withr]; }; diaplt = derive2 { name="diaplt"; version="1.4.0"; sha256="103hq13ql8xs1zb90is2r1lanj5vpvz9rk315zvbd8am00fshc9n"; depends=[]; }; diathor = derive2 { name="diathor"; version="0.1.0"; sha256="0nbqjaxb2fzcg9w67nbrszwv9swr1kjmg4dximfc8qdya1kmv8z9"; depends=[data_table ggplot2 purrr stringdist stringr tibble tidyr vegan]; }; dibble = derive2 { name="dibble"; version="0.2.2"; sha256="02sf7d50a8w14xjwzdc5fq2xprlzl03yc4xs8qr4p8ycwvmlwwb1"; depends=[dplyr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; - diceR = derive2 { name="diceR"; version="2.0.0"; sha256="127iikb4zk11ckzkkxcvv3ipjsm6wqi1qc10hk9rzwiply0y0hxd"; depends=[abind assertthat class clue clusterSim clv clValid dplyr ggplot2 infotheo klaR magrittr mclust NMF purrr RankAggreg Rcpp stringr tidyr yardstick]; }; + diceR = derive2 { name="diceR"; version="2.1.0"; sha256="0cilag911w2awypr7wj21n4cppm273458wrivvclr9zdkh8hf7m9"; depends=[abind assertthat class clue clusterSim clv clValid dplyr ggplot2 infotheo klaR magrittr mclust NMF purrr RankAggreg Rcpp stringr tidyr yardstick]; }; dichromat = derive2 { name="dichromat"; version="2.0-0.1"; sha256="10b0avdar3d1y8x2ya3x5kqxqg0z0mq872hdzvc1nn4amplph1d1"; depends=[]; }; dictionaRy = derive2 { name="dictionaRy"; version="0.1.1"; sha256="0j25wn2ghy59y1v02493d4knab06wxrzz8m9g6zxlkqzw1dqgc4f"; depends=[jsonlite tibble]; }; dictionar6 = derive2 { name="dictionar6"; version="0.1.3"; sha256="1rg958py4pqghkid3830hla7vibvwsjhk75x55lxry5d8dp04m9f"; depends=[ooplah R6]; }; @@ -8592,7 +8606,6 @@ in with self; { did2s = derive2 { name="did2s"; version="1.0.2"; sha256="0iyz6z4w2im22rvbpabql2w1cncv0pnrh0hp7agf0pazcpzk2jh6"; depends=[boot broom data_table did didimputation fixest ggplot2 Matrix MatrixExtra rlang SparseM staggered]; }; didimputation = derive2 { name="didimputation"; version="0.3.0"; sha256="122z473jkf5jb66s2g7vdqi0q56v8chz2dpl61qkcgqhv4hbh1q3"; depends=[broom data_table dplyr fixest glue magrittr Matrix purrr Rcpp RcppArmadillo stringr tidyr]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; - dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; }; diemr = derive2 { name="diemr"; version="1.2.2"; sha256="1an07y6sbwjhz0xkq2qdxzyb57nw4dgcgj8rv8qhxfsd6rw11shp"; depends=[vcfR zoo]; }; dietr = derive2 { name="dietr"; version="1.1.4"; sha256="0l0pf55xhfzk7il7cvcasf6gi8nvcckygvryhfqldyq7zmr1pgyh"; depends=[rfishbase]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; @@ -8601,14 +8614,13 @@ in with self; { difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEnrich = derive2 { name="diffEnrich"; version="0.1.2"; sha256="0fa0v24ir8an82mx38489zavqfya3130q9z52dmm62lnf7pvkvzl"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; }; diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; }; - diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; - diffcor = derive2 { name="diffcor"; version="0.7.2"; sha256="1kynrxrk9w5yf7p9pdydj098ps5vr07q0x530n0wad438kw0d14s"; depends=[]; }; + diffcor = derive2 { name="diffcor"; version="0.8.0"; sha256="1dwr6ygh70rvmbs0pg6sqwxvzr3cvkp1rj69x7dnq753b7v2s3j6"; depends=[MASS]; }; diffdf = derive2 { name="diffdf"; version="1.0.4"; sha256="03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj"; depends=[tibble]; }; diffdfs = derive2 { name="diffdfs"; version="0.9.0"; sha256="1b61wx9fy7a4rb6jh1cvayf1w1far74pgcliqyk9pzn06nlqylfj"; depends=[arrow dplyr janitor rlang]; }; - diffeR = derive2 { name="diffeR"; version="0.0-7"; sha256="0yi0wkjr3cp7ncycn8ynh31r12ahhrdl681g5308axwrn2wiscl0"; depends=[ggplot2 raster rlang terra tidyr tidyselect]; }; + diffeR = derive2 { name="diffeR"; version="0.0-8"; sha256="0l2pm4kh6yq3h3v27a5r28c0724g89pglaxd14f14cdxk51hznqx"; depends=[ggplot2 raster rlang terra tidyr tidyselect]; }; diffeRenTES = derive2 { name="diffeRenTES"; version="0.3.2"; sha256="1904zg9ynf873cqkww2ii4k60cr1bi9km67dxvgsc2bd8dxkm9ks"; depends=[BoolNet DOT igraph]; }; diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; }; - diffeqr = derive2 { name="diffeqr"; version="1.1.3"; sha256="0b8aq1chpvfzxmlfhgr9fav1wmhw03k5msnzbk9aq46064q9ybdl"; depends=[JuliaCall]; }; + diffeqr = derive2 { name="diffeqr"; version="2.0.0"; sha256="1362wrpxcg9wc92qadah0fc0shbz9sds98jdfw6nnxjg2pvjxha4"; depends=[JuliaCall]; }; diffmatchpatch = derive2 { name="diffmatchpatch"; version="0.1.0"; sha256="064p2xzv0x890pw24lm9fmafp0x93f3yv77ms2zabzlclfylzzb7"; depends=[cli Rcpp]; }; diffobj = derive2 { name="diffobj"; version="0.3.5"; sha256="0q6gwd9pqh41f6j5p9jl92aji4p8kx9inffpha93d7jc3ndsfq6q"; depends=[crayon]; }; diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; }; @@ -8626,8 +8638,7 @@ in with self; { digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dimRed = derive2 { name="dimRed"; version="0.2.6"; sha256="05zlkf6hjdqqr1sgw7ww9f17vjnsiqfaj9kvdvi146phh53v2zls"; depends=[DRR magrittr]; }; - dimensio = derive2 { name="dimensio"; version="0.3.1"; sha256="1nxb73xmvmkw0x0vg3sw8dgq1g58bwqpscknc21i3b4w61h5n02y"; depends=[ggplot2 rlang]; }; - dimensionalAnalysis = derive2 { name="dimensionalAnalysis"; version="0.1.0"; sha256="0pzncdrphnldgpvkm847wr6yrk30p1ayfwjlrg44kxackpl1w1y8"; depends=[caracas hash reticulate]; }; + dimensio = derive2 { name="dimensio"; version="0.4.1"; sha256="1bq4c8903pwzk3ibz4fkyf7m6advihwjnzzxmgpw64183w7qwnh2"; depends=[]; }; dimensionsR = derive2 { name="dimensionsR"; version="0.0.3"; sha256="1bic5ynqapz4mh3bcv58r00ip5s04mc8n58yhlkbrnbcqyqaca4f"; depends=[httr jsonlite]; }; dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; @@ -8640,15 +8651,14 @@ in with self; { diptest = derive2 { name="diptest"; version="0.76-0"; sha256="10629vwn6r2949jjrmj5slbb5v0vnm3w0v8mrl7ws68m2sxmx2jh"; depends=[]; }; dipw = derive2 { name="dipw"; version="0.1.0"; sha256="0nxjwiffi1ivafzha3c35kjk36ai7na0nbfl6x3gpsi2km7b84nd"; depends=[glmnet Matrix Rmosek]; }; directPA = derive2 { name="directPA"; version="1.5"; sha256="0k66x64fi26zlm82v59ya7x6l7ba3hpa5v9dq2ykb20a8zl6spla"; depends=[calibrate plotly]; }; - directlabels = derive2 { name="directlabels"; version="2021.1.13"; sha256="0415kh9k2qzdwi8zb32fh2icl5wf5335kyj11cyfdmfxji39zv2w"; depends=[quadprog]; }; + directlabels = derive2 { name="directlabels"; version="2023.8.25"; sha256="0p7as0yvvywbdqjpng70sdiy0xyczac4qbv534cwqxiqyx81vp8j"; depends=[quadprog]; }; directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; }; - dirichletprocess = derive2 { name="dirichletprocess"; version="0.4.1"; sha256="0y6kc1ksazcj9j7lcf26cvpmnywl0wq8b6icycvwv3j85fs4yl8s"; depends=[ggplot2 gtools mvtnorm]; }; + dirichletprocess = derive2 { name="dirichletprocess"; version="0.4.2"; sha256="1b500cm5ljpvpa0axqnylcvk8x3vmva1jy179k97ggps58lmspcj"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-5"; sha256="05whzhl81nyag7321hw98xa63r440s9bgj1764346yvm9bvzjqi4"; depends=[]; }; dirttee = derive2 { name="dirttee"; version="1.0.1"; sha256="1cdl0jazj0inr1lca0ymqpr5m5ads154scnqfh1lbiaajamqr4xj"; depends=[expectreg formula_tools MASS Matrix mgcv nloptr provenance rlang survival]; }; - disaggR = derive2 { name="disaggR"; version="1.0.5"; sha256="0j8p53hy23fpk4wdm5lbg0963dmpc6g1hsymfawxmssfdzdvv24y"; depends=[RColorBrewer]; }; - disaggregation = derive2 { name="disaggregation"; version="0.2.0"; sha256="0n873a8bxqcgab0qkmxkr4xqg4mafm5qn2lmfclvibv2dhydpkjx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; - disbayes = derive2 { name="disbayes"; version="1.0.0"; sha256="1fx3la8x4h3bazvfnvlq5cnnz528wkfm9k12ic7id303qaxx3ia7"; depends=[BH dplyr generics ggplot2 loo magrittr matrixStats mgcv Rcpp RcppEigen RcppParallel rstan SHELF StanHeaders tibble tidyr]; }; + disaggR = derive2 { name="disaggR"; version="1.0.5.1"; sha256="1ac25lp7kp5hf4h57g1w84byw8b3bk6x965w5iny09qkri3li859"; depends=[RColorBrewer]; }; + disbayes = derive2 { name="disbayes"; version="1.1.0"; sha256="0dzgs048pwpl59fpnvqdra001xkwllxpkaxanwdbmzc8l1xmrwb2"; depends=[BH dplyr generics ggplot2 loo magrittr matrixStats mgcv Rcpp RcppEigen RcppParallel rstan SHELF StanHeaders tibble tidyr]; }; discAUC = derive2 { name="discAUC"; version="1.0.0"; sha256="1lw4ikrgb0w88k7gjyjv3qq0xy4h588rq7sgqk1w6zhv3qr8k34z"; depends=[dplyr glue rlang tibble]; }; discSurv = derive2 { name="discSurv"; version="2.0.0"; sha256="0k585cyz02vqk4w7w20rhn6g9rspmmlbdpv7k837021iyhwwb838"; depends=[data_table functional geepack mgcv mvnfast mvtnorm ranger Rdpack rpart treeClust VGAM]; }; discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; @@ -8670,7 +8680,7 @@ in with self; { discrtr = derive2 { name="discrtr"; version="0.0.1"; sha256="03xafiy7fjxsincbwbz1y0xv372yd7cs8sbmqvv2s3glx6jdxk07"; depends=[magrittr rmdformats]; }; discursive = derive2 { name="discursive"; version="0.1.1"; sha256="14wn01p6vx1y1aprhz4r8y9dmvfxslif37nx854xnx6ncnihag57"; depends=[SnowballC stm stringr tm]; }; disdat = derive2 { name="disdat"; version="1.0-1"; sha256="1m22pichm603gn9h94vx0kmds28krlp9ax1yrsfwx12rqchcdhk7"; depends=[]; }; - diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; + disk_frame = derive2 { name="disk.frame"; version="0.8.3"; sha256="0mkzvxbjr9iw2bmnw4s5s7glly1nnf4j83y6yzw5vg1gwqghynky"; depends=[arrow benchmarkme bigreadr bit64 crayon data_table dplyr fs fst future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; dismo = derive2 { name="dismo"; version="1.3-14"; sha256="1msc75xnc9lbnn8pivd5j4jvb1b9p3xgybfm2ak2mpb2aplz5837"; depends=[raster Rcpp sp terra]; }; disordR = derive2 { name="disordR"; version="0.9-8.1"; sha256="1m7cc2wa5g1v0dnf3crm8djnj3c3mz289ngc7nh8c7cf7mj7819z"; depends=[digest Matrix]; }; dispRity = derive2 { name="dispRity"; version="1.7.0"; sha256="0qrmhlmbkg0jr9dhfmx46y8vh7nmydmm0sscnj4zrz7wf7myavrm"; depends=[ade4 ape castor Claddis ellipse geometry MASS mnormt phangorn phyclust scales vegan]; }; @@ -8684,7 +8694,6 @@ in with self; { dissCqN = derive2 { name="dissCqN"; version="0.1.0"; sha256="142f4ggzwdhf2vm9kisayna9a5j17mmy2jckhjrvxh4k5dc3ssf6"; depends=[]; }; dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; distTails = derive2 { name="distTails"; version="0.1.2"; sha256="10p7rfqfkhcwq10lhz3cq9i4k1jdccks4y3791lajljsxz5jrca4"; depends=[ercv gsl MASS]; }; - distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; distances = derive2 { name="distances"; version="0.1.9"; sha256="1gbwi8x2490wliks7q3gm0bz11mgjpkc7q8al77brllg70r3lmaq"; depends=[]; }; distanceto = derive2 { name="distanceto"; version="0.0.3"; sha256="0xsqvmakys75rz11w7mkhs7674lzgz2ml9bwbkydq3lkrg14hyww"; depends=[geodist nabor sf]; }; distantia = derive2 { name="distantia"; version="1.0.2"; sha256="12d6xzhcxs3xxyj82ih6chrr638siy45gna1s22vhnqvjd5jixc6"; depends=[arrangements data_table doParallel fields foreach iterators plyr RColorBrewer viridis]; }; @@ -8692,9 +8701,10 @@ in with self; { distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; }; distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; }; - distill = derive2 { name="distill"; version="1.5"; sha256="1hfl4pki06fwpybfx4mp4bxq693alm9vs7z1jv4v5bdxq90zd2sl"; depends=[base64enc bookdown digest downlit htmltools jsonlite knitr lubridate mime openssl png rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; + distill = derive2 { name="distill"; version="1.6"; sha256="15lx82dyxxlp2w6lnfs3kvd9pq6pjhjhpv0v1y218lg9y5k6h3s6"; depends=[base64enc bookdown digest downlit htmltools jsonlite knitr lubridate mime openssl png rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; distillML = derive2 { name="distillML"; version="0.1.0.13"; sha256="05pk6g3bjaw0ghb673yxfvnijqkvjy4bfxk2vpiwccm7hjszl62s"; depends=[checkmate data_table dplyr ggplot2 glmnet gridExtra mltools purrr R6 Rforestry tidyr]; }; distillery = derive2 { name="distillery"; version="1.2-1"; sha256="1ymmxyamkq0zbz2m4gllln1ihks2hcib6gs0mls92as79srz122b"; depends=[]; }; + distinctiveness = derive2 { name="distinctiveness"; version="1.0.1"; sha256="0ckwxj1xsyfrpbj87gw2b3x1qnzf7a7i31zmg5ccfhi4z7vx13mz"; depends=[igraph]; }; disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; }; distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.9.2"; sha256="0c1fkb9jqj5mhs766hrwys9zd1xbf9j98bwy03xxwxbbsrz82amm"; depends=[MASS sfsmisc startupmsg]; }; @@ -8714,18 +8724,18 @@ in with self; { distrom = derive2 { name="distrom"; version="1.0.1"; sha256="1j8k8cgh5r8av8jf8miq858j66hmkkcdjqhia77iivx97fg9pcjk"; depends=[gamlr Matrix]; }; distrr = derive2 { name="distrr"; version="0.0.6"; sha256="04lhrc92y6dqnfpqlmynjvn2dndzkknnvwsr5pf73dfpgv7n3s1f"; depends=[dplyr magrittr rlang tidyr]; }; disttools = derive2 { name="disttools"; version="0.1.8"; sha256="1jm3nqyywdzpbfvk2mffmhp75al1hcvd5l4r21fbd3iz2anll0ma"; depends=[]; }; - dittodb = derive2 { name="dittodb"; version="0.1.6"; sha256="0v2pn7cv1myqc2kx300fmknpkljfvkv6306x1nq5cyg4xwjpgm38"; depends=[DBI digest glue lifecycle rlang]; }; + dittodb = derive2 { name="dittodb"; version="0.1.7"; sha256="1z7xw1cl1drjwq58iz6c6xqz6dpr38g0mdck2yimyjagwpjb43kq"; depends=[DBI digest glue lifecycle rlang]; }; div = derive2 { name="div"; version="0.3.1"; sha256="1k4c34wpwfj7yqnk1x9sjzn3dc2vdzhpy8g4c00aqs3nbgcknyn8"; depends=[dplyr ggplot2 gridExtra kableExtra magrittr plotly pryr rlang rpart stringr tibble tidyr tidyverse]; }; divDyn = derive2 { name="divDyn"; version="0.8.2"; sha256="1rqk7ih0j6d3ykx7d0r0c33bcbksw4paman5f92ragw2a96d04cf"; depends=[Rcpp]; }; diveMove = derive2 { name="diveMove"; version="1.6.1"; sha256="1jq24qys802s9cab3r9fag9jq994wjg6vni6sxd2psng846hixic"; depends=[geosphere KernSmooth plotly quantreg uniReg]; }; diveR = derive2 { name="diveR"; version="0.1.2"; sha256="0n0ldc3k0ryr20794kvqxpnk8m3qc13lkl6rxw043pkwbjqj7291"; depends=[cli crayon ggmulti loon loon_data loon_ggplot loon_shiny loon_tourr rstudioapi zenplots]; }; diverge = derive2 { name="diverge"; version="2.0.6"; sha256="0rgmzcy2kk1bc6v27qcj4ckyvidzvldqx3cz1prccq5bhw2m8cdz"; depends=[truncnorm]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; - diversitree = derive2 { name="diversitree"; version="0.9-18"; sha256="045c67ka24ksaff7q3dzhsb5r38zysfrs1qxn9zhcvrardjka283"; depends=[ape deSolve Rcpp subplex]; }; + diversitree = derive2 { name="diversitree"; version="0.9-20"; sha256="0lm098ysk6np4dy1cifbhd85jd1f1iz4bqhgzlcx7x8qnhh3zc1c"; depends=[ape deSolve Rcpp subplex]; }; diversityForest = derive2 { name="diversityForest"; version="0.4.0"; sha256="1yp9lwr5sj8mv1sxrrjsx00m2aq02xcs3q06v51h29g686rdij0f"; depends=[gam ggplot2 ggpubr MapGAM Matrix nnet RColorBrewer Rcpp RcppEigen rlang rms scales sgeostat survival]; }; divest = derive2 { name="divest"; version="0.10.3"; sha256="1blg70i3v7269jlgrzdqdvi3f64ly8zhzmsl2fl3jzf3nigxbkhp"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; }; - divraster = derive2 { name="divraster"; version="1.0.2"; sha256="0cj5j12ca5vq9mnm4vr8jv7m7sikb0d4cnwavjpv9694di7y3bj3"; depends=[BAT SESraster terra]; }; + divraster = derive2 { name="divraster"; version="1.0.4"; sha256="0w603c5czvzqj0ydbmmxy9xn8p0r25c6i5m90219p6jv4nb1afrz"; depends=[BAT SESraster terra]; }; divseg = derive2 { name="divseg"; version="0.0.5"; sha256="0fbh5qpjszpmkrvb2p7f9rbbc4zj1dchhwk28zclnbxazlg116fs"; depends=[dplyr magrittr rlang sf tibble tidyselect units]; }; dixon = derive2 { name="dixon"; version="0.0-8"; sha256="1mflg9mpcidjq1ljgzqdwp6x0g930v9y5jgma1qxi5c5l3irkvg3"; depends=[spatstat spatstat_geom splancs]; }; dixonTest = derive2 { name="dixonTest"; version="1.0.4"; sha256="0gz39s1z987bg56vwrpcs14wzyf7p07s7l7z9napz0i38564wsdq"; depends=[]; }; @@ -8757,7 +8767,7 @@ in with self; { dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.5"; sha256="16s06jvwmvhxgvrmfav1xfszjrn7j2cm4jw5xyx6w5lb5434kzcq"; depends=[arm ergm glmnet igraph network sna]; }; do = derive2 { name="do"; version="2.0.0.0"; sha256="16c6ksdas678k1285vk526ga3qkfb658nq4j5z9safjkyl1d5lrp"; depends=[crayon data_table desc httr openxlsx plyr reshape2 rstudioapi rvest stringr tidyr tidyselect tmcn usethis xml2]; }; - doBy = derive2 { name="doBy"; version="4.6.18"; sha256="19g60s7d8a444mg24b50bs56fvwbwjv44fylvib2q1c6rjx3wxrz"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; + doBy = derive2 { name="doBy"; version="4.6.19"; sha256="14hvbhf9zamqkjhr9jd8zjpm9xlc8hwqj04gy6ln32n2hzqqqr6v"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; doFuture = derive2 { name="doFuture"; version="1.0.0"; sha256="1pxwpfmxswbsd1f2ifj9kdq9hi9q0x2wwv2kv0xq178ymmywi2sz"; depends=[foreach future future_apply globals iterators]; }; doMC = derive2 { name="doMC"; version="1.3.8"; sha256="18qrcvqwm4cclvk8spvyi281y8prwzivj52xmzk1l9a82j2ny65j"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; @@ -8786,10 +8796,10 @@ in with self; { dodgr = derive2 { name="dodgr"; version="0.2.21"; sha256="0nfnpa47fism4wwc7vfy0b8qyd4carkxa43x460crmk0d5x3n3kv"; depends=[callr digest fs magrittr osmdata Rcpp RcppParallel RcppThread]; }; doebioresearch = derive2 { name="doebioresearch"; version="0.1.0"; sha256="1rmvb6pa71frvjszpsjaw3ahm70kyykrq6zfjqk8smgcg397k9pi"; depends=[agricolae]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; - dogesr = derive2 { name="dogesr"; version="0.4.0"; sha256="0rs9g9r77wsk51alb69rc6afkd3v6vh4krmd8vkxhl40ksm32hmn"; depends=[dplyr ggplot2 igraph knitr qpdf Rdpack rmarkdown]; }; + dogesr = derive2 { name="dogesr"; version="0.5.0"; sha256="0w5qps781c406br5rba6mv127yrlgq7rzchk55j7mndrm7hwia63"; depends=[dplyr ggplot2 ggthemes igraph knitr qpdf Rdpack rmarkdown]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; - domir = derive2 { name="domir"; version="1.0.1"; sha256="01dhc0s0223ydkbfnpvv0jp8pmpkmcnr2wksv16jm1ndy1bwwjsp"; depends=[]; }; - donut = derive2 { name="donut"; version="1.0.2"; sha256="0idynkhcdn9va32m1n1rxjyb7ghbkhyy1959wks2bn1a7k4yg87i"; depends=[]; }; + domir = derive2 { name="domir"; version="1.1.1"; sha256="01qn62xnykgbk6857i6d5xv7zcxd63g1hakry5qxgdczivkpy4m6"; depends=[]; }; + donut = derive2 { name="donut"; version="1.0.3"; sha256="1vrarv850dja286s5l8y0fng7idai9rqr156z67zrwx347bdr4n2"; depends=[]; }; doolkit = derive2 { name="doolkit"; version="1.42.2"; sha256="0hyqbpnhzjsx7ml0z6n9z60yhp5c0dyicm3jfc841aykvb1ifqbp"; depends=[concaveman ggplot2 igraph MASS Morpho rgl Rvcg sp tis usethis]; }; doremi = derive2 { name="doremi"; version="1.0.0"; sha256="005kp6f4jh8y1ykhri3mjnvc9w66b1a51bji574rkbxd1ans6mal"; depends=[data_table deSolve futile_logger ggplot2 gridExtra lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.8"; sha256="1jymk03snrfmr9da7h7l9823mzlcn6y4z6ay6nzi82n08d9xmp06"; depends=[Rcpp]; }; @@ -8797,7 +8807,7 @@ in with self; { doseminer = derive2 { name="doseminer"; version="0.1.2"; sha256="0y03k14adyqf0cyzqrr4rk47dabwgzzjkxbf11a5b8xlyy19mjr1"; depends=[magrittr stringr]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.3"; sha256="0nq5965rlpvad8wyz3yr98wxy4w7jb4v4xfbbfa6c2vnc6w7w884"; depends=[]; }; - dotCall64 = derive2 { name="dotCall64"; version="1.0-2"; sha256="1b546z9r26q4xpr17gy2wzfych52q17sxvzydpqfp9dyxf575iz0"; depends=[]; }; + dotCall64 = derive2 { name="dotCall64"; version="1.1-0"; sha256="1ibh2f2vcv30k1c919diw6qdmhxmvkl83k3396vy3xigbcny711l"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.3"; sha256="0dclwqg2hxdly8z3cckcskcll3dfax6g14h1xzjzdfwahhrbr5wb"; depends=[]; }; dotgen = derive2 { name="dotgen"; version="0.1.0"; sha256="12dvn52ggmkj2q6whi8s2hh9fpg7jcg20bgx32jxzh4cb1zxnksz"; depends=[mvtnorm]; }; dotprofile = derive2 { name="dotprofile"; version="0.0.1"; sha256="10vm8s1sk4i2930zzswgwy1y873x8byfr7xfb8xq6cdk9ci7l741"; depends=[cli R6]; }; @@ -8811,21 +8821,19 @@ in with self; { downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; downloadthis = derive2 { name="downloadthis"; version="0.3.2"; sha256="121rhn6806i2067wi6indny74r11dwgv7vvm6cfpcg6bklrfx2v7"; depends=[base64enc bsplus fs ggplot2 htmltools magrittr mime readr writexl zip]; }; downscale = derive2 { name="downscale"; version="5.0.0"; sha256="1rcmn5f30l004rp8a7pmn0w5izsy31n9lwsk3sgj01fjzk0333wc"; depends=[cubature minpack_lm Rmpfr sf terra]; }; - downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.3"; sha256="0yx62nx5ga835ng9gwrkwivxjhjrkygdldnd1hswc6wnvfs1qz8s"; depends=[magrittr R_utils]; }; - dowser = derive2 { name="dowser"; version="1.2.0"; sha256="17y46asi8zqzc8kn1safglbpi0sd9azgdh6q54lrbsnpmkfg5ki3"; depends=[alakazam ape Biostrings dplyr ggplot2 ggtree gridExtra markdown phangorn phylotate RColorBrewer rlang shazam stringr tidyr tidyselect]; }; + dowser = derive2 { name="dowser"; version="2.0.0"; sha256="1phgpfjiy10v9qd2r5qssiaqa1g4km7ii7dzpzq3rrgd1c2nac59"; depends=[alakazam ape Biostrings dplyr ggplot2 ggtree gridExtra markdown phangorn phylotate RColorBrewer rlang shazam stringr tidyr tidyselect]; }; dparser = derive2 { name="dparser"; version="1.3.1-10"; sha256="039yjgfw7hqw56cn799fqyf60if72y9q2pmpjh126a3s47mygifx"; depends=[digest]; }; dpcc = derive2 { name="dpcc"; version="1.0.0"; sha256="1f4c68bvkwg82k1zanjhqqika2bfjv83mbr2khl5lhvfjwvpi1m0"; depends=[Rcpp]; }; - dplR = derive2 { name="dplR"; version="1.7.4"; sha256="1gnihbgbw5dimnzf23fhlkwairfdaixs7ss6rkhk45y551hbwf65"; depends=[boot digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; - dplbnDE = derive2 { name="dplbnDE"; version="0.1.2"; sha256="0vklb07h4izgpdi7w92gv87d1gl2fbdgpcq3b1ig9d55m37ssbsx"; depends=[bnclassify]; }; - dplyr = derive2 { name="dplyr"; version="1.1.2"; sha256="1qwn00ai7k6km0z9kl6aa1qjkfz8j3prlgdfxr1pr5s47a5c6862"; depends=[cli generics glue lifecycle magrittr pillar R6 rlang tibble tidyselect vctrs]; }; + dplR = derive2 { name="dplR"; version="1.7.5"; sha256="0w0ljanw4ayzmm1whga6p50iikyg7ijc02j70m9s7263vybj1n2r"; depends=[boot digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; + dplyr = derive2 { name="dplyr"; version="1.1.3"; sha256="0hhpzv66rqz7z8vdryzjdkp4flmjvzxrx1pwpxnbmjqgvd3s4hv8"; depends=[cli generics glue lifecycle magrittr pillar R6 rlang tibble tidyselect vctrs]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dppmix = derive2 { name="dppmix"; version="0.1.1"; sha256="1gq51kix0jln25gr6bffzdy24fhn6cd3gmyl3jlmvqvni4vwswy7"; depends=[mvtnorm]; }; dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; }; dprop = derive2 { name="dprop"; version="0.1.0"; sha256="0fvghjblm6giq72qqn20qwlw4ki9lrxagsy0jjbiinf51rdrhc8y"; depends=[extraDistr VaRES]; }; dpseg = derive2 { name="dpseg"; version="0.1.1"; sha256="19k7w6ln72qriwxdjx9a9cxpxbkqqja69r17zpwxz6qkw60ly4z9"; depends=[Rcpp]; }; - dqrng = derive2 { name="dqrng"; version="0.3.0"; sha256="1fwsldqcri2lccna4icbmmlqic3w4xyjm7rn0xmikrsw4kzapvjb"; depends=[BH Rcpp sitmo]; }; + dqrng = derive2 { name="dqrng"; version="0.3.1"; sha256="0vmrbnix05a9h1bc4b7d999qkzkk63i1arzyblyhmvydv4m8cc72"; depends=[BH Rcpp sitmo]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; dr4pl = derive2 { name="dr4pl"; version="2.0.0"; sha256="1nmy8mxxrmwzw826wvnn4rrm64xal9jr160yqiqj41zmb241q4b6"; depends=[generics ggplot2 glue Matrix Rdpack rlang tensor]; }; dracor = derive2 { name="dracor"; version="0.2.6"; sha256="1zs7xfjdx3anrvslfkx483k0swac7rq8y7n7gaws6ap94qy4xrk8"; depends=[Rcpp]; }; @@ -8833,8 +8841,9 @@ in with self; { dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; dragracer = derive2 { name="dragracer"; version="0.1.7"; sha256="0ka3p72c3brrla7dawm4anyr073kgiy39ip5bdig9888gwiwjccq"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; - drake = derive2 { name="drake"; version="7.13.5"; sha256="0sb46bnf4svs8gp0m846nij6ki8cfaiypjxy3y32lq3xnzgw622k"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; }; - drat = derive2 { name="drat"; version="0.2.3"; sha256="191yxlj9jccakmz27g7n9izfcy19kj3fgnw4w6zl9iq66787qpm6"; depends=[]; }; + drake = derive2 { name="drake"; version="7.13.6"; sha256="1qn6h22l0giz6w6bsi77d5skxp0y5dgmhb7xl8a5nyjajlxm7hd2"; depends=[base64url digest igraph rlang storr tidyselect txtq vctrs]; }; + drape = derive2 { name="drape"; version="0.0.1"; sha256="0y4y6vvskizghqf78d1vr0skac0ks3yb83m9fgn8i3wmgqrhws19"; depends=[]; }; + drat = derive2 { name="drat"; version="0.2.4"; sha256="13v7dj2688ix6j9nzhvf8q9ynfihwzkppfdjkis6q1r5m4nikya3"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; drawer = derive2 { name="drawer"; version="0.2.0.1"; sha256="165w0lk6kp0hw85y1q3wj50jn5jbi4rn00vgz8q0wy68qw2ymhh5"; depends=[bsplus glue htmltools magrittr shiny stringr]; }; drawsample = derive2 { name="drawsample"; version="1.0.1"; sha256="018v4amapfwxx6k4s9drcv2vwil7cplnkwlrhy9djc0a02jxx2l5"; depends=[dplyr lattice moments psych readxl shiny shinycssloaders shinydashboard tibble xlsx]; }; @@ -8844,24 +8853,25 @@ in with self; { drcte = derive2 { name="drcte"; version="1.0.30"; sha256="0gpzpmk5v1lr03gl710kp4d4ldfskjr5s66wcl00abg3kz8jpixn"; depends=[dplyr drc lmtest MASS mclust multcomp nor1mix plyr sandwich survival tidyr]; }; drda = derive2 { name="drda"; version="2.0.3"; sha256="1s3d0hpxl47rirsig5gbs0q3i6dj2hjzza3655381fla5n0yx9ap"; depends=[]; }; dreamer = derive2 { name="dreamer"; version="3.1.0"; sha256="10yvdg5nkw4nawy9hdqyrsgh01xga8l3hn3qi1sbjzniv7903v7d"; depends=[coda dplyr ellipsis ggplot2 purrr rjags rlang rootSolve tidyr tidyselect]; }; - dreamerr = derive2 { name="dreamerr"; version="1.2.3"; sha256="0g3gl4nzfw02alhyjw9flylfr2awyijjim50j1jdnp677zqlxkmf"; depends=[Formula]; }; + dreamerr = derive2 { name="dreamerr"; version="1.3.0"; sha256="1wpfc87vl8x2z1x1wr3lab0v9d0ddxhhjh8fk10baid77ypxq0gf"; depends=[Formula]; }; drf = derive2 { name="drf"; version="1.1.0"; sha256="13b31rynknzirnvgygs1ar5968xdh8dhg60ibn0g359gnzadn7ad"; depends=[fastDummies Matrix Rcpp RcppEigen transport]; }; - drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; drhur = derive2 { name="drhur"; version="1.1.0"; sha256="06zy2acgmhfc1criid35ci1802zl77qcif2vrhn0w8syixsbjiq8"; depends=[learnr]; }; drifter = derive2 { name="drifter"; version="0.2.1"; sha256="1xsp8cm02wd8zink0jqrdaii7s2dh0rw96rs6k8zr2g0341wmfba"; depends=[DALEX dplyr ingredients tidyr]; }; drimmR = derive2 { name="drimmR"; version="1.0.1"; sha256="0fi0ifb9y2jfb347684fd9pjfgn4b693yb5sqbcfpf2z7jvknsi1"; depends=[doParallel dplyr foreach future ggplot2 Rdpack reshape2 seqinr tidyverse]; }; - driveR = derive2 { name="driveR"; version="0.4.0"; sha256="1zjpp8fff89hd7nbianm6ff88ws7j3z656awyz1ffb96rnhk1c6x"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + driveR = derive2 { name="driveR"; version="0.4.1"; sha256="00cwzy097wbl1k3sw3nfn0kzb6af7hyzwaznvlckf77g7kw86bmi"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; droll = derive2 { name="droll"; version="0.1.0"; sha256="0gd1vnvkjdsw7gz4czi4g9zq5080awfr4dy2srgksh4ah4ki4vm3"; depends=[Ryacas]; }; + dropout = derive2 { name="dropout"; version="2.1.0"; sha256="0gnicnswgj5afbg3h7ghiy8rv7zfs3vvs9xsqglgril4ibysf6pw"; depends=[dplyr Rcpp tibble]; }; droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; }; drord = derive2 { name="drord"; version="1.0.1"; sha256="0xi85s6y78d54qv3cw7q72dz5kcs8cc8nyjyaxr5h6pfpzi2l8i9"; depends=[ggplot2 MASS ordinal VGAM]; }; drought = derive2 { name="drought"; version="1.1"; sha256="1i064bg7b29agnj2cq5gl61z12xx1a3lkzfg31sly3alzpvciwr9"; depends=[copula corrplot]; }; drpop = derive2 { name="drpop"; version="0.0.3"; sha256="1gh0w1a59070g9mmck4fp9591vfw23c5nlj3jrkxwarp4vfy1dqp"; depends=[dplyr gam ggplot2 janitor nnet nnls ranger reshape2 stringr SuperLearner tidyr]; }; drtmle = derive2 { name="drtmle"; version="1.1.2"; sha256="0qvdxzvpi7a66gx61v6fj31zy4y5cid18g4qgv5lir7qc74rbbx0"; depends=[future_apply np SuperLearner]; }; + drugDemand = derive2 { name="drugDemand"; version="0.1.0"; sha256="0gipkxa07l569vw3h90k571ckabw1q5c2yyj621jr1svlzv1dr09"; depends=[doParallel doRNG dplyr erify eventPred foreach icenReg mvtnorm nlme plotly pscl purrr Rcpp rlang survival tictoc]; }; drugprepr = derive2 { name="drugprepr"; version="0.0.4"; sha256="07401dqw4krqh3rv7y13526n0xjdlaw14gcxwranksjchmqjd3ij"; depends=[DescTools doseminer dplyr purrr rlang sqldf stringr tidyr]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; - ds4psy = derive2 { name="ds4psy"; version="0.9.0"; sha256="1w2234bnvniivivaa9k09fblw3l7dy2fiwk611x1iwp58xjmpr7c"; depends=[ggplot2 unikn]; }; + ds4psy = derive2 { name="ds4psy"; version="1.0.0"; sha256="1l5qqcpzad2nnhzzcb43slgmdg08v830l5np8mc7qh4wlig1x95l"; depends=[ggplot2 unikn]; }; dsa = derive2 { name="dsa"; version="1.0.12"; sha256="16lqqm0lcgpkzkj7d0akamzap85aj4dyj5rs5fkb5b9bjqa5r4c5"; depends=[dygraphs forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava seastests timeDate tsoutliers xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.3.4"; sha256="1f34gp5qic70fnv2ds3v9jk08ginbk9ivxddcvdaadr249lvln12"; depends=[MASS mnormt]; }; dsb = derive2 { name="dsb"; version="1.0.3"; sha256="1xzhd4q04c1vql49r6m4zskpx7f5hkl5hmdgr3gsbxb73xfs51v2"; depends=[limma magrittr mclust]; }; @@ -8873,7 +8883,7 @@ in with self; { dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.3.3"; sha256="159hlllbp4qy5dxmxgsjcl2ksflq7z7v1ra5d7piyanm9c632q8a"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsmisc = derive2 { name="dsmisc"; version="0.3.3"; sha256="19760hcb5154rayhj72r48r7glh2qyaf178zkxplywmsw338kws4"; depends=[Rcpp stringr]; }; - dsmmR = derive2 { name="dsmmR"; version="1.0.1"; sha256="1s2fgz110y5w0b7dgrg9s087ld0b919463rlxn8j3rlwnra6p9cd"; depends=[DiscreteWeibull]; }; + dsmmR = derive2 { name="dsmmR"; version="1.0.2"; sha256="05hbwdycbz58mn01xl6958w03z4adjb00bgl1f9sqbhgy4x23397"; depends=[DiscreteWeibull]; }; dsos = derive2 { name="dsos"; version="0.1.2"; sha256="1qv44wj1dvng1m4lkscn9yylhxsr8ck46wv54vjy9px4g7rmjaq5"; depends=[data_table future_apply ggplot2 scales simctest]; }; dsrTest = derive2 { name="dsrTest"; version="1.0.0"; sha256="1nfwcab6p7swki8d2j2dywj93xidkjqcq84majvq90yabx353jd3"; depends=[asht exactci loglognorm]; }; dst = derive2 { name="dst"; version="1.5.1"; sha256="08cw09hf5jx1qfmrqmhm4713gzq21p0ss3nx7qrs92mpsvprq3yc"; depends=[]; }; @@ -8882,41 +8892,41 @@ in with self; { dstat2x2xk = derive2 { name="dstat2x2xk"; version="0.2.0"; sha256="16qbczzjzhmsby8d2sf1xnijiczlk29xazbgl98jbfpmpfzn4q6j"; depends=[BiasedUrn]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; dtgiw = derive2 { name="dtgiw"; version="1.0.0"; sha256="1902rhfrnmp3550c6sqfrzs7xrrjpym0zpqhfnlffdnn42cp910r"; depends=[]; }; - dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; + dti = derive2 { name="dti"; version="1.5.4"; sha256="065cmp4fcwb94ajg7p971jiw705kvmmygxzwscxgyqfhw2ad8hrj"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; }; dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; }; dtplyr = derive2 { name="dtplyr"; version="1.3.1"; sha256="1rfnr1f3dzzivzmw9jjaclckkany6c625bqr8lkx32qbcjd6iad5"; depends=[cli data_table dplyr glue lifecycle rlang tibble tidyselect vctrs]; }; dtrSurv = derive2 { name="dtrSurv"; version="1.4"; sha256="1xc39rigaylrq6d6zm6szgkiwdh4xjkvcima9lkhs1qnbrj3gb5l"; depends=[survival]; }; - dtrackr = derive2 { name="dtrackr"; version="0.4.0"; sha256="1pwkdv0hc4y0184882s1xd5fxvh5mw9737mn1z89nxgk78ld25gc"; depends=[base64enc dplyr fs glue htmltools magrittr pdftools png purrr rlang rsvg stringr tibble tidyr V8]; }; + dtrackr = derive2 { name="dtrackr"; version="0.4.4"; sha256="0biwciv8f8rd6psydiriyylklw7q954dsr3rrax5a2fc3gn9adbz"; depends=[base64enc dplyr fs glue htmltools magrittr pdftools png purrr rlang rsvg stringr tibble tidyr V8]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dttr2 = derive2 { name="dttr2"; version="0.4.2"; sha256="1fjddr7rqvslhy9ni53jbgvsg8ffp09mna5vazbw9l3126lp55ks"; depends=[chk hms lifecycle]; }; dtts = derive2 { name="dtts"; version="0.1.1"; sha256="0h1jb37zsvqz8ij4y70d5if02hpxn6r3d5dvkq3pvxhqz2l2swij"; depends=[bit64 data_table nanotime Rcpp RcppCCTZ RcppDate]; }; dtw = derive2 { name="dtw"; version="1.23-1"; sha256="0vc2is1hf1g0sw92kzl8mddck264qwiqgm5q2wkcwwz65fss7mkf"; depends=[proxy]; }; - dtwSat = derive2 { name="dtwSat"; version="0.2.8"; sha256="1k4xdnx2ca2sr4pba59q86860bzwxsg94mzr56gjdyfp1rmasqv3"; depends=[caret data_table dtw foreach ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales sp xtable zoo]; }; + dtwSat = derive2 { name="dtwSat"; version="1.0.0"; sha256="04bmic5qxz8ka6gn7npixcgky1vyf4jaq48i6h4cc34n9wwhzi4a"; depends=[ggplot2 mgcv proxy sf stars tidyr twdtw]; }; dtwclust = derive2 { name="dtwclust"; version="5.5.12"; sha256="19dmy9jalwp2vcfkzm58g5wf4nmp3290rrsa51prw8xrjj0hk1g3"; depends=[clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; - dual = derive2 { name="dual"; version="0.0.4"; sha256="0ssdq9gjys9iskwpkllp0m2ig2s7j6jmyq1b5j5lkns5f5aqa7j6"; depends=[]; }; + dual = derive2 { name="dual"; version="0.0.5"; sha256="08r2qz5rvsc3pjrc8rsks6r39w52n621mfg77yfnk4lc1vqn4y8d"; depends=[]; }; dual_spls = derive2 { name="dual.spls"; version="0.1.4"; sha256="1ap4wngcakfr7q5jji63zlmbz3xw02chbqj4kwg9v9g0bq90y7k4"; depends=[pdist]; }; - dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; depends=[]; }; + dualtrees = derive2 { name="dualtrees"; version="0.1.5"; sha256="02zwfvz4vb8ppyjggkn5483p7b12l3ah1swpgc7g3p94ii5hr0vy"; depends=[]; }; duawranglr = derive2 { name="duawranglr"; version="0.6.7"; sha256="0hxmvyl81xlp3vv1w7462cjfa9hdz5lki0p5pn0ik7dv5aap3wbq"; depends=[digest dplyr haven readr readxl]; }; dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; }; - duckdb = derive2 { name="duckdb"; version="0.8.1-1"; sha256="02ymygj2y2g4szcmwcjqr5qffq76p9dpiinlwy4hv70cxrk8rs72"; depends=[DBI]; }; - duckdbfs = derive2 { name="duckdbfs"; version="0.0.1"; sha256="0c31yr18j2dqbxhy10qh47a5ynjjb1hjdy5p0r7pfklc3xg5c6n1"; depends=[DBI dbplyr dplyr duckdb]; }; + duckdb = derive2 { name="duckdb"; version="0.9.1"; sha256="1a5x31xnspcxw66l35d0fyvj8bmvjc2sw3kbz4dmm00cwq3lz9zr"; depends=[DBI]; }; + duckdbfs = derive2 { name="duckdbfs"; version="0.0.3"; sha256="1fvcq4a1r5las5xip28f7wcqnijd6r79s4bbp5c5yxd2xgccwvsa"; depends=[DBI dbplyr dplyr duckdb]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; - duckplyr = derive2 { name="duckplyr"; version="0.1.0"; sha256="1yz39cdhq17hym0mvn7xn27yg2497xdyq59i68ym99xgi6jnlpw6"; depends=[]; }; + duckplyr = derive2 { name="duckplyr"; version="0.2.2"; sha256="1yzqflpijnrg7dn87iz9b4z3z8ssl55jhva1n4vn3g6d85ls4ipv"; depends=[cli collections DBI dplyr duckdb glue lifecycle purrr rlang tibble tidyselect vctrs]; }; duke = derive2 { name="duke"; version="0.0.1"; sha256="1frnf4kxjjrxbwhc06pcjzmr5zdcdx2ssw5avc2jq54r8d7h3j23"; depends=[ggplot2 scales]; }; dumbbell = derive2 { name="dumbbell"; version="0.1"; sha256="0v0b4wbfskvcnzx10z9v4rf3mq8ccswz63pd6i1z7mggnwv38ps5"; depends=[data_table dplyr ggplot2 rlang rstatix tidyr tidyverse]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; dundermifflin = derive2 { name="dundermifflin"; version="0.1.1"; sha256="0rp8p4ln92kfxkczl7vi9r2jhxb1ky203s02940cjjkczsphpcc1"; depends=[crayon stringi]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupree = derive2 { name="dupree"; version="0.3.0"; sha256="0q8c0z1yhym20rhfjrc8n03gk458z0n8axx013rcwk1vc2zwk670"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; - dvir = derive2 { name="dvir"; version="3.0.1"; sha256="0r6dg1kdcy8ryy6rk8vfpbav9k8wgjbbqgr3zmjk14rbmwmp8xd9"; depends=[forrel pedprobr pedtools]; }; + dvir = derive2 { name="dvir"; version="3.2.1"; sha256="09fcqhzy53bfkzlff2jpq76d9sygj6vcs85k70n06p633ldvayap"; depends=[forrel pedprobr pedtools ribd]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; }; dvqcc = derive2 { name="dvqcc"; version="0.1.0"; sha256="011mwdwh046wninfjdy00wxn312ykzn90nz9fz3l7c5cw9gzzfkg"; depends=[ggplot2 tsDyn]; }; - dwdradar = derive2 { name="dwdradar"; version="0.2.7"; sha256="0y75gd9d7y2myp6filg2liv1r8rxwnffa9y9b2dq283m8kcwwai0"; depends=[]; }; + dwdradar = derive2 { name="dwdradar"; version="0.2.10"; sha256="0dwnyzzha8bz6pzacak909hp65jmf1l3wby9vg62gp7rwlr1gbaj"; depends=[]; }; dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; }; dwp = derive2 { name="dwp"; version="1.1"; sha256="1a70lxw4ck3pbklyibn8x6qpgj16zvawi76qqc9rnc26q2n5zp6j"; depends=[boot expint GenEst gtools invgamma magrittr MASS matrixStats mvtnorm numDeriv plotrix pracma sf statmod VGAM]; }; dyads = derive2 { name="dyads"; version="1.2.1"; sha256="0nx4gx51p0qz1565yn7xg0ijrkqvn9ql9hrmp5lwl4lxvsjnwki1"; depends=[CholWishart MASS mvtnorm RcppZiggurat Rfast]; }; - dycdtools = derive2 { name="dycdtools"; version="0.4.3"; sha256="06hm00mfkkg5yxpf30xb4i21bna0hpa0g86vx9qz9vf7f7cvdwjx"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; }; + dycdtools = derive2 { name="dycdtools"; version="0.4.3"; sha256="06hm00mfkkg5yxpf30xb4i21bna0hpa0g86vx9qz9vf7f7cvdwjx"; depends=[dplyr ggplot2 lubridate ncdf4 R_utils RColorBrewer tidyr]; }; dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; }; dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; }; dymo = derive2 { name="dymo"; version="1.1.0"; sha256="0s1gpi5qiafkf91awyx52qw15qs7m18bql51jibgh1lqnqgv1757"; depends=[fANCOVA ggplot2 greybox imputeTS lubridate MASS matlib modeest moments narray purrr readr scales tictoc]; }; @@ -8927,14 +8937,13 @@ in with self; { dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; }; dynRB = derive2 { name="dynRB"; version="0.18"; sha256="0sz0a1g6z48f0s7ch86y9mvazwk4gdswjj179a13d0yjhy9rgpk0"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; dynaSpec = derive2 { name="dynaSpec"; version="1.0.1"; sha256="0wzfy50602wlsh4sbfjadsr01f3az2lvk5c4px3qmcvv5gybd6w0"; depends=[ari av gganimate ggplot2 magrittr NatureSounds pbapply png scales seewave tuneR viridis]; }; - dynaTree = derive2 { name="dynaTree"; version="1.2-15"; sha256="0bgzf8lci9cmzv9b68q4nvmrbk84cvpgmff4wd6s0jfaqsww6vb6"; depends=[]; }; + dynaTree = derive2 { name="dynaTree"; version="1.2-16"; sha256="14yxs9f03bdmrf3lis7hzk04smz0dddammbd0na4gw7bq14341bm"; depends=[]; }; dynamAedes = derive2 { name="dynamAedes"; version="2.1.2"; sha256="04d161lvd1hbr9y9cawwj50psaql8gmnskggaxbq9c0wwdgxr311"; depends=[doParallel dplyr drc fields foreach geosphere raster slam sp]; }; dynamac = derive2 { name="dynamac"; version="0.1.12"; sha256="0gggzhidn5z4g7pzqx1bg56prnh9krph65k3yj677qrff12abbx9"; depends=[lmtest MASS]; }; dynamic = derive2 { name="dynamic"; version="1.1.0"; sha256="15jxly44rj2x79jvps2ln0hrm1384p56yll9jk96w1vhaf3gbsxm"; depends=[dplyr ggplot2 lavaan magrittr patchwork purrr simstandard stringr tibble tidyr]; }; - dynamicSDM = derive2 { name="dynamicSDM"; version="1.3.2"; sha256="1wvvzfhzg72mlhky93zapns1rn6r3w88nxwfm4xvjnc0ss9il9iy"; depends=[dplyr googledrive lubridate magrittr readr reticulate rgee sf terra tidyr]; }; + dynamicSDM = derive2 { name="dynamicSDM"; version="1.3.3"; sha256="08kv5bp8yqlrxxlr4fz4zzzcgh3sc6y9dg934gh97p5vxmwjravq"; depends=[dplyr googledrive lubridate magrittr readr reticulate rgee sf terra tidyr]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; - dynamichazard = derive2 { name="dynamichazard"; version="1.0.2"; sha256="1khfy2fhvzgp165arj1yqvqi5p6lg94sxikwp5s5dxnsgzny00xm"; depends=[boot Rcpp RcppArmadillo survival]; }; - dynamite = derive2 { name="dynamite"; version="1.4.3"; sha256="1kbdw94qprgqc0m8j10glxkmf4x54vl86nsybwx27vj1zk1cbj5h"; depends=[checkmate cli data_table ggplot2 glue loo patchwork posterior rlang rstan tibble]; }; + dynamite = derive2 { name="dynamite"; version="1.4.5"; sha256="0zvhcws7sgxmiamf09rm4la20b1q1grmxbz2qbgb15ycncwn9a8h"; depends=[checkmate cli data_table ggplot2 glue loo patchwork posterior rlang rstan tibble]; }; dynatop = derive2 { name="dynatop"; version="0.2.3"; sha256="06wp8ld22k3r76imsj8wkrpplmbdlgbl71p94ddglwp8yfq1igsp"; depends=[R6 Rcpp xts zoo]; }; dynatopGIS = derive2 { name="dynatopGIS"; version="0.2.5"; sha256="1sv519dc7fs6zrwnyggkzrcy866a6pgag0shk6rr6cd3xa1blwpv"; depends=[jsonlite R6 terra]; }; dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; }; @@ -8948,9 +8957,9 @@ in with self; { dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; dynprog = derive2 { name="dynprog"; version="0.1.1"; sha256="11zsx2c4hv7k22pw85aa01zk4r0qpzwnf73ynylkfxfbi87rda9s"; depends=[rlang]; }; dynr = derive2 { name="dynr"; version="0.1.16-91"; sha256="0h2mgnqhcq420f0qqbgnkjk1wbgr9x2fk8hrk22j01mzhc4lmsm5"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; - dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp riverplot]; }; + dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp]; }; dynsim = derive2 { name="dynsim"; version="1.2.3"; sha256="1fk23cp2hvkn7msxrdc9cnm4pmcmhcdf3q6rwm507bniigrswnx4"; depends=[ggplot2 gridExtra MASS]; }; - dynsurv = derive2 { name="dynsurv"; version="0.4-4"; sha256="0dpc0a7ijzi8my3ifipgyvq1p7kibbs7r89wsddpvlr290ls61vw"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; }; + dynsurv = derive2 { name="dynsurv"; version="0.4-5"; sha256="1cflp9q3364qhz06hy9h42q7q455ylk8k3zldppnhz5cq0n56z2n"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; }; dyntaper = derive2 { name="dyntaper"; version="1.1"; sha256="0i8snv70hzsywijivkxphm7xcp64r7kh8v6hiy0hh4hh624i120i"; depends=[]; }; dynutils = derive2 { name="dynutils"; version="1.0.11"; sha256="06an2bm1d131v28m240vii2wisbz3zs32wbamm2w7r8rl3yrxkh9"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; dynwrap = derive2 { name="dynwrap"; version="1.2.4"; sha256="1jls01flvr91vyipilaqv2n3irniq678bm6f1jlxr2apr7w0rlyx"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils glue igraph magrittr Matrix processx purrr readr reshape2 stringr tibble tidyr yaml]; }; @@ -8959,17 +8968,17 @@ in with self; { eBsc = derive2 { name="eBsc"; version="4.17"; sha256="18k622687qvp6q8m2ycn9ppwvv2jh76dj92vfkl0b99jng2hv1zl"; depends=[Brobdingnag MASS Matrix mvtnorm nlme Rcpp RcppArmadillo]; }; eCAR = derive2 { name="eCAR"; version="0.1.2"; sha256="1ps98abmdv8xf8xsnif95yg8z8564nlysv8vncp3cl5wc03pknhl"; depends=[Matrix]; }; eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; }; + eDITH = derive2 { name="eDITH"; version="0.1.1"; sha256="04xq7s46qf4gmrj0gza021ra5yqdx9mjncp8p0qrbnalwj6xqm3y"; depends=[BayesianTools DHARMa fields LaplacesDemon OCNet Rcpp rivnet terra]; }; eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; }; eFRED = derive2 { name="eFRED"; version="0.1.0"; sha256="1sqhcwxbi2gxgznz0z3iyvllalq9qwm18bc60dr6y2wvcilagsiy"; depends=[httr jsonlite]; }; eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; }; eHDPrep = derive2 { name="eHDPrep"; version="1.3.3"; sha256="0zwh30mz3a1dar8kbc8g43d54adc83rrqqa89gwfpjgah0akaaw8"; depends=[dplyr forcats ggplot2 igraph kableExtra knitr magrittr pheatmap purrr quanteda readr readxl rlang scales stringr tibble tidygraph tidyr tm]; }; eHOF = derive2 { name="eHOF"; version="1.12"; sha256="1797bf4wh8qy2qqhfmgi22a89zr39rsfmvbnvrfdvvpaf1zlrp2n"; depends=[lattice mgcv]; }; eList = derive2 { name="eList"; version="0.2.0"; sha256="1znmdksi2wzzjz0n6lrggs4ckvqq3qirdfvicxlfbm05zgnjq277"; depends=[]; }; - eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; eNchange = derive2 { name="eNchange"; version="1.0"; sha256="07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5"; depends=[ACDm doParallel foreach hawkes iterators Rcpp]; }; ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.7.0"; sha256="1d559p1z73zqd5ym0bs7lpp1w1di7sxpryq41hvkj7azrlijy0ry"; depends=[CircStats ggplot2 pbapply plotly raster rasterVis tiff]; }; - eRm = derive2 { name="eRm"; version="1.0-2"; sha256="0smym010kswc5vx90qr3x1vl16xj1x1i54rvrj006dc4agc1vmlk"; depends=[colorspace lattice MASS Matrix psych]; }; + eRm = derive2 { name="eRm"; version="1.0-4"; sha256="0rp2lxkwkh09zmv101rzk7x1v1pmscp71qpf8f4chxp3idg6rpid"; depends=[colorspace lattice MASS Matrix psych]; }; eSDM = derive2 { name="eSDM"; version="0.3.7"; sha256="0rv5hhjsdkq0837822d52xfvfbj9qx1kjmqj8wyny335gv631205"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; eSIR = derive2 { name="eSIR"; version="0.4.2"; sha256="05gpskdzjdm3kp7skqvy7dmj8sgh4jhpkm6akmxlfxn8b627zvg1"; depends=[chron coda data_table ggplot2 gtools reshape2 rjags scales]; }; eadrm = derive2 { name="eadrm"; version="0.1.4"; sha256="0s9rk5iym5crlq4pr3gbgqhswjn3a7a4nclbvzhmzrxwfszqfy70"; depends=[]; }; @@ -8978,8 +8987,8 @@ in with self; { earlygating = derive2 { name="earlygating"; version="1.1"; sha256="0wwkn30kjdg0qni05l3acbgai9j3h2mqjli49afmpd2453fpyxig"; depends=[betareg doParallel foreach]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.1.29"; sha256="1xa9rijqqxa5l253dg8dn1jjhdakf8krl5rflq5v9gybfyrq1885"; depends=[fields ggplot2 Kendall KernSmooth knitr lmtest moments nortest quadprog som spam tgp tseries]; }; earth = derive2 { name="earth"; version="5.3.2"; sha256="1shbmh730fkn6zh5glzyygvarndahx1fs1dv26lhc9wsvxgdfi68"; depends=[Formula plotmo TeachingDemos]; }; - earthtide = derive2 { name="earthtide"; version="0.1.0"; sha256="06js9czzp5l83cdxmpjc7kkcvyadm9ic3zwd68kic21gcmcfaw0k"; depends=[BH R6 Rcpp RcppEigen RcppThread]; }; earthtones = derive2 { name="earthtones"; version="0.1.1"; sha256="17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l"; depends=[ggmap]; }; + easy_utils = derive2 { name="easy.utils"; version="0.0.3"; sha256="14igypzhqd9fc47jhsyv86a5rgpfvikkig4vb07k00rw00h3ijbg"; depends=[dplyr fastmatch Polychrome rlang scales]; }; easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; easyCODA = derive2 { name="easyCODA"; version="0.34.3"; sha256="1s1zjjvswl3444m84n6c5sznva4y19kcm171xkcy1zdx3wqmd2m3"; depends=[ca ellipse vegan]; }; easyDes = derive2 { name="easyDes"; version="6.0"; sha256="12p7ls0q9srrz5h0f0996mmw33shrfbya481s0d5d509vbw8ik6d"; depends=[multcomp PMCMRplus]; }; @@ -8989,9 +8998,8 @@ in with self; { easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; }; easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; easySdcTable = derive2 { name="easySdcTable"; version="1.0.7"; sha256="0wvnyhjq94cqjx9dw2nc5v66a11qbi972g0shvzz7q4llkgm21if"; depends=[Matrix sdcTable shiny SSBtools]; }; - easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; - easyalluvial = derive2 { name="easyalluvial"; version="0.3.1"; sha256="10nd1jay913jpipy0q2zl7f7pihqynpxmmccbg657jzcgnzva1rv"; depends=[dplyr forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress progressr purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; - easyanova = derive2 { name="easyanova"; version="8.0"; sha256="0ih21r4hg5mq1z4hy1w1r4zb96vizlc16fpv6f727iia2k3dwmyf"; depends=[nlme]; }; + easyVerification = derive2 { name="easyVerification"; version="0.4.5"; sha256="1k62dfhnc0g07jf82gm1m3747z8zchmj4mi5qap4dgc7pxdp2ikc"; depends=[pbapply Rcpp SpecsVerification]; }; + easyanova = derive2 { name="easyanova"; version="10.0"; sha256="0r8qyfhbipyj4j13g1h3p3gag3i3mmpxq2zzq0cighamqbcbmvaf"; depends=[nlme]; }; easycensus = derive2 { name="easycensus"; version="1.1.1"; sha256="0k8cc02f7qf9g5fi9i8lsz02mkb0kcvqkh5zh7bajsfkmmksrr17"; depends=[censusapi cli dplyr pillar rlang stringr tidyr vctrs]; }; easyclimate = derive2 { name="easyclimate"; version="0.2.1"; sha256="19gfajf4bhlz0mpq70xjy87xc3qi9kqs3869zm2jy4x0i3cingk6"; depends=[R_utils RCurl terra]; }; easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; }; @@ -9006,7 +9014,7 @@ in with self; { eat = derive2 { name="eat"; version="0.1.4"; sha256="1s286b6wx0d59n2v3hf6s1zy1f15mwf6ssrpwciard3giccnf556"; depends=[conflicted dplyr ggparty ggplot2 ggrepel lpSolveAPI partykit Rdpack reshape2]; }; eatATA = derive2 { name="eatATA"; version="1.1.1"; sha256="1pm66hvjqcgjbdkvfwxn3myzb6a458hkwg7cd6lhkp1mmj7anigs"; depends=[lpSolve mathjaxr Matrix Rglpk]; }; eatDB = derive2 { name="eatDB"; version="0.5.0"; sha256="0lym1g411ykb2vzi5yr570lmyh30br667wkm5dvnvfs7bsmk05il"; depends=[DBI RSQLite]; }; - eatGADS = derive2 { name="eatGADS"; version="1.0.0"; sha256="0dgnh7lbb5wi8zg0g8lbg9k4w89sl7z9xjgr4x1pyx6wmjfmfran"; depends=[data_table eatDB eatTools haven hms plyr stringi tibble]; }; + eatGADS = derive2 { name="eatGADS"; version="1.1.0"; sha256="10d9np84zb5jrak03iq72imj02c55jag121hf4g0yfpplaqnc85q"; depends=[data_table eatDB eatTools haven hms plyr stringi tibble]; }; eatRep = derive2 { name="eatRep"; version="0.14.7"; sha256="11yz0g83ngzab8gqi2mq4s28j7yvl06jf4clwb8vfjqa7lwpfcgq"; depends=[BIFIEsurvey boot car combinat eatGADS eatTools EffectLiteR estimatr fmsb Hmisc janitor lavaan lme4 mice miceadds msm plyr progress reshape2 survey tidyr]; }; eatTools = derive2 { name="eatTools"; version="0.7.4"; sha256="0qmbwwvqfkyd4z41hihza0996dvsvqshs3pqblfzdlbzyn7glh5b"; depends=[data_table]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; @@ -9014,20 +9022,22 @@ in with self; { eba = derive2 { name="eba"; version="1.10-0"; sha256="03jr54xq109x9bf8kcs8mi7am17l9ya3xdkdppd8imwd2paqrssk"; depends=[nlme psychotools]; }; ebal = derive2 { name="ebal"; version="0.1-8"; sha256="06hkk0fargzhzqn841c406r72y7jd53mjxgi4hzb2ahnpaiq2q1l"; depends=[]; }; ebci = derive2 { name="ebci"; version="1.0.0"; sha256="00fa2y4ha9nlbjd01qckrrn721s63ja61n5jr4wm7ac6y7xivb2i"; depends=[]; }; - ebdbNet = derive2 { name="ebdbNet"; version="1.2.7"; sha256="1n3ak1bzd3p6izpw2r4ckd32wpdw5m2s4qsf6fg9gpwk9l4vn603"; depends=[igraph]; }; + ebdbNet = derive2 { name="ebdbNet"; version="1.2.8"; sha256="0far2hvfvj6r4qzr47q72innxxnj0g8vxx6arn7wkcv30jmx34x7"; depends=[igraph]; }; ebirdst = derive2 { name="ebirdst"; version="2.2021.3"; sha256="1brd9awy43cl45jv7ndkvv21zrrd0fx1llwwxy1mqncdbwbnn65j"; depends=[DBI dplyr ggplot2 gridExtra jsonlite magrittr rlang RSQLite sf stringr terra tidyr viridisLite]; }; ebmc = derive2 { name="ebmc"; version="1.0.1"; sha256="1z6s1blc2b6b13pk2sd6lcczdcldgjh65cnycjcw7d2g2hnxcifh"; depends=[C50 e1071 pROC randomForest rpart smotefamily]; }; - ebnm = derive2 { name="ebnm"; version="1.0-9"; sha256="0izzfylcmq6zajngjyw85kbr8jys49qcgsadqkj85v2k1hg2jw7q"; depends=[ashr deconvolveR dplyr ggplot2 horseshoe magrittr mixsqp rlang truncnorm trust]; }; + ebnm = derive2 { name="ebnm"; version="1.1-2"; sha256="14ql990pgwwb8aakg4ikj7p3ijbfaqjrsvrrjwlma3halqs3cy19"; depends=[ashr deconvolveR dplyr ggplot2 horseshoe magrittr mixsqp rlang truncnorm trust]; }; ebreg = derive2 { name="ebreg"; version="0.1.3"; sha256="1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz"; depends=[lars Rdpack]; }; + ebvcube = derive2 { name="ebvcube"; version="0.1.6"; sha256="0fllc0z671g56pnym8vr60bk1fk3f60p8apwdrzplkg7mk9680bj"; depends=[checkmate curl DelayedArray ggplot2 HDF5Array jsonlite memuse ncdf4 ncmeta reshape2 rhdf5 stringr terra tidyterra withr]; }; ec50estimator = derive2 { name="ec50estimator"; version="0.1.0"; sha256="1zg4p1734q2jzifzfi2lf9wz3687s3cdn0yzkiwbc6w49mgdw877"; depends=[dplyr drc magrittr tibble tidyr]; }; ecan = derive2 { name="ecan"; version="0.2.1"; sha256="12bkgmbm6mbqcjhmanlg7zk0nlgqf8m1b4m7f2wcxsl8nbks8ymd"; depends=[cluster dendextend dplyr ggplot2 jsonlite labdsv magrittr MASS purrr rlang stringr tibble tidyr vegan]; }; ecb = derive2 { name="ecb"; version="0.4.2"; sha256="19ir0ywbzwyx90mgxqk9byb63afic2fvhrhy174di0pmj522vnr4"; depends=[curl httr rsdmx xml2]; }; + ecce = derive2 { name="ecce"; version="2.0.6"; sha256="185b6vdf5fqfm6xfg1h90gglicy3p73pk6mqfpp8n4sbywydqd31"; depends=[curl digest httr jsonlite uuid]; }; ecd = derive2 { name="ecd"; version="0.9.2.4"; sha256="0cdfdbkjjxs78bvvy5zrax0qgcc5fzhlxl3wqapfxigf5xlxlavh"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom Rmpfr RSQLite stabledist xtable xts yaml zoo]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; ecespa = derive2 { name="ecespa"; version="1.1-17"; sha256="1n96nxb8spyi914m21yybb2yajawz22fmjldbr9j76dl7s36ygcd"; depends=[spatstat spatstat_explore spatstat_geom spatstat_model spatstat_random]; }; ech = derive2 { name="ech"; version="0.1.3"; sha256="092djklyw9j5cjbkndb1jby2mn896y93yrysrg704dfcjd04yv2g"; depends=[assertthat curl dplyr fs geouy glue haven janitor labelled laeken rlang srvyr statar stringr survey tidyr]; }; echarts4r = derive2 { name="echarts4r"; version="0.4.5"; sha256="1j7ad6p0xrfwri13px1av5whd7pkfvblnms0v5a879ikzdwff66q"; depends=[broom corrplot countrycode dplyr htmltools htmlwidgets jsonlite purrr rstudioapi scales shiny]; }; - echarty = derive2 { name="echarty"; version="1.5.4"; sha256="0zhcy5l0zhh92pg47w1vfw5fvscdaschz5qsz7spmdxhpax0min9"; depends=[data_tree dplyr htmlwidgets]; }; + echarty = derive2 { name="echarty"; version="1.6.2"; sha256="1q217d2h4a6s9vw9q4y9sd69ffh40wzad7cx7gb10ny4cg080n6x"; depends=[data_tree dplyr htmlwidgets]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; echo = derive2 { name="echo"; version="0.1.0"; sha256="1m3dzdgkl6v9z0wv3ws1yn58zi6bxgdy3p6a5jmq2rwhb8wz1lr8"; depends=[]; }; echo_find = derive2 { name="echo.find"; version="4.0.1"; sha256="1nadqqpxgx2ck16nzjp5ajm6714452qzllg5cq1jpisv1yb31db2"; depends=[boot minpack_lm]; }; @@ -9037,9 +9047,10 @@ in with self; { ecic = derive2 { name="ecic"; version="0.0.3"; sha256="1b8jwxmbqs3hzjf1iy1f74way8ymi1lac38jd8zvc2np39szq2i8"; depends=[furrr future ggplot2 patchwork progress progressr]; }; ecipex = derive2 { name="ecipex"; version="1.1"; sha256="16iyi6n0pnyfmy47b0ranjbh3spvq8cgkmcamzhgjfj7qn0ix184"; depends=[CHNOSZ]; }; eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; - ecm = derive2 { name="ecm"; version="6.3.0"; sha256="1g8y8wks7asjyybdh4nf19w5v8kvl56n69dl0sd0mlir98i4jmr3"; depends=[car earth lmtest sandwich urca]; }; + ecm = derive2 { name="ecm"; version="7.0.0"; sha256="1l254xhvfx7f83lm0jh2sfdy6ffxqmdm7mij37f36bgvagyssclp"; depends=[car earth]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.5.0"; sha256="0bicldir8cmfd25wzmqhcawv94q2xmqwbzsqbk08w9y8x6yhxhic"; depends=[curl getPass httr keyring memoise R6 uuid]; }; ecoCopula = derive2 { name="ecoCopula"; version="1.0.2"; sha256="1j3n9h7rm66r8vmzzhy5mjh36gs1qnsh7rq33ymjpkkfy698gbpm"; depends=[betareg doParallel foreach glasso glm2 igraph MASS mgcv mvabund ordinal plyr sna tweedie]; }; + ecocbo = derive2 { name="ecocbo"; version="0.10.2"; sha256="003fdvlzalga0s968mznaa7i32v5v4ppw9n0dknqw0xh53fcg5zf"; depends=[doParallel foreach ggplot2 ggpubr sampling vegan]; }; ecochange = derive2 { name="ecochange"; version="2.9.3.1"; sha256="1dr7a0qi6rf6vrqr4pbrkif5hvdjp5gyz5mk996mbqb939hpxbsg"; depends=[geodata getPass ggplot2 httr landscapemetrics lattice raster rasterDT rasterVis rlang sf sp tibble]; }; ecocomDP = derive2 { name="ecocomDP"; version="1.2.2"; sha256="01yml6l8fpq4vznfvmfa84pwq976q2c4346lrsxcnaqif4if3hlm"; depends=[data_table dplyr EML emld geosphere ggplot2 httr lubridate magrittr neonUtilities RColorBrewer rlang rmarkdown stringr tidyr uuid xml2]; }; ecodist = derive2 { name="ecodist"; version="2.0.9"; sha256="1m78bgbr7xjlc01q4n921y3aq2nkdbdkv9qpppfarw0d77pqpsdf"; depends=[]; }; @@ -9051,15 +9062,16 @@ in with self; { econetwork = derive2 { name="econetwork"; version="0.7.0"; sha256="1pn7bx3rch09ddllq9sfzm5ynz6a1mgbsy3rq0qyg19xan9xgmi6"; depends=[bipartite blockmodels igraph Rcpp RcppEigen RcppGSL rdiversity]; }; economiccomplexity = derive2 { name="economiccomplexity"; version="1.5.0"; sha256="1xx4fpf2rjizwhicb6sfrgl5xjfin9b9zi0q4kq47gjp8kzahkg3"; depends=[igraph Matrix Rdpack]; }; econullnetr = derive2 { name="econullnetr"; version="0.2.1"; sha256="0kdzkk8mlnc71a6n80hgrclwns66zyhr183ad4ifz8b146xh5cl9"; depends=[bipartite gtools reshape2]; }; - ecopower = derive2 { name="ecopower"; version="0.1.0"; sha256="0x9rvwiypc3as44w67fn7dfsw1rrdhfpirz069hmzbw35gw0g1qh"; depends=[ecoCopula mvabund]; }; + ecopower = derive2 { name="ecopower"; version="0.2.0"; sha256="0vlvdlpxvbjrgwffqjyvfxns0sscrpbvkjcd5v67ngfpnl1bjw5a"; depends=[ecoCopula mvabund]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; + ecoregime = derive2 { name="ecoregime"; version="0.1.3"; sha256="1y44zsqhk5va1pcj5865bjk5wi20r2xk0gd49lf13i7sjav7fss4"; depends=[ape data_table ecotraj GDAtools shape smacof stringr]; }; ecorest = derive2 { name="ecorest"; version="1.0.0"; sha256="13x95z99yqld1fvfgzbm6ahrnvfvcqwlb23yjr187yg83iynh79v"; depends=[viridis]; }; ecos = derive2 { name="ecos"; version="0.1.5"; sha256="1vnlbylbi70rw3rxrbld35z3g9mfdqrdgsil35ghimx6d2y1ch3c"; depends=[httr jsonlite stringr XML]; }; - ecosim = derive2 { name="ecosim"; version="1.3-3"; sha256="190xf0xy1cw40qx8x6y4m9avspxh0y11ffl3s18d5d2zr7rj3ag2"; depends=[deSolve stoichcalc]; }; + ecosim = derive2 { name="ecosim"; version="1.3-4"; sha256="0v17iqrlm62vckglxkn3a617q4300pb40wdnyn4vpkxgiav9s86f"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.4.2"; sha256="0vfaf27bv687ypxg5apzv63rl495rxyflqw33j17i4h0s7cjkgrm"; depends=[FD]; }; - ecospat = derive2 { name="ecospat"; version="3.5.1"; sha256="15vqwpglhg94f29la7aw29755nn1qbdspk7a1i3clbdncf25r1qb"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo ecodist foreach gbm gtools Hmisc ks maptools matrixStats nabor poibin PresenceAbsence randomForest raster sp terra vegan]; }; + ecospat = derive2 { name="ecospat"; version="4.0.0"; sha256="0m3rdyx70q5am654islrz0m3sniwfvlss99bj1yjhx49i54pdh38"; depends=[ade4 adehabitatHR adehabitatMA biomod2 classInt dismo ecodist foreach gbm gtools Hmisc ks matrixStats nabor poibin PresenceAbsence terra vegan]; }; ecostats = derive2 { name="ecostats"; version="1.1.11"; sha256="11h5s196aap64jch1123srbwy3907cvc4vgh0lvn5wkxbszrzypc"; depends=[ecoCopula GET MASS mgcv mvabund mvtnorm]; }; - ecostatscale = derive2 { name="ecostatscale"; version="1.0"; sha256="14i5wg5qxqn3qzycgqda6blb0imkckq23gl3c3whfa72a3a8y30q"; depends=[deSolve mvtnorm]; }; + ecostatscale = derive2 { name="ecostatscale"; version="1.1"; sha256="040y610c1v7l5phy8lmimafjh466s1zdhk81cfcarwhf0l1hzzpr"; depends=[deSolve mvtnorm]; }; ecotox = derive2 { name="ecotox"; version="1.4.4"; sha256="01sc2lf2kca7wqqyd3gk48va39gb7ijzgs2smgb2k4xbzjqndg08"; depends=[tibble]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; ecotraj = derive2 { name="ecotraj"; version="0.0.3"; sha256="0mfvyh25xjhfd8k8b84d3vi9nf69g2lg82x6j3nsyhxy1kax9py8"; depends=[Kendall MASS Rcpp]; }; @@ -9079,16 +9091,17 @@ in with self; { edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; - edgar = derive2 { name="edgar"; version="2.0.6"; sha256="0b4lqbm2i6756qcz63pjk6l3n7bs8554fdwap0hcp0lrm6832n45"; depends=[httr qdapRegex R_utils stringi stringr tm XML]; }; + edgar = derive2 { name="edgar"; version="2.0.7"; sha256="1lzcs78cncz4ira1nnzyip1ap1iva75kfx8ynqqv79pmj8g4nms3"; depends=[httr qdapRegex R_utils stringi stringr tm XML]; }; edgarWebR = derive2 { name="edgarWebR"; version="1.1.0"; sha256="1v9rdj2qdcvzz7g78pa9j6l8d6zjz1q06h09c4547r67bzfz1nxy"; depends=[httr jsonlite xml2]; }; edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgebundle = derive2 { name="edgebundle"; version="0.4.1"; sha256="196np22ibvj31f5f45gl5ni5byj1z2h4vyxxcqarny2zfk00qg9j"; depends=[igraph interp Rcpp reticulate]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; edgedata = derive2 { name="edgedata"; version="0.2.0"; sha256="11sc7x0m00yhn2c4601dpjv3brmf57i8barsl3p7bawcvka8z5lr"; depends=[]; }; - edibble = derive2 { name="edibble"; version="0.1.3"; sha256="173ch27169183ds9bm3f4dzniiiyhv69j33chqmxizrmrpq1mz0f"; depends=[AlgDesign cli dae magrittr nestr pillar R6 rlang tibble tidyselect vctrs]; }; + edibble = derive2 { name="edibble"; version="1.0.0"; sha256="11ybx488vmglnwz82lddfndafd664akwq5vg2mqmbdhb530fxj89"; depends=[AlgDesign cli dae magrittr nestr pillar R6 rlang tibble tidyselect vctrs]; }; ediblecity = derive2 { name="ediblecity"; version="0.2.1"; sha256="0ps6ing20bkaj1rjf63d1k5cc3mrymf5hf0mkdp3qq1ghn05s6la"; depends=[dplyr magrittr rlang sf stars]; }; edina = derive2 { name="edina"; version="0.1.1"; sha256="1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3"; depends=[ggplot2 jjb Rcpp RcppArmadillo reshape2 rgen]; }; editData = derive2 { name="editData"; version="0.1.8"; sha256="170i8p264zj716h58bb6pvgh2lnz1w5vplnrcv8vizppi0n1js6l"; depends=[dplyr DT magrittr miniUI openxlsx rio rstudioapi shiny shinyWidgets tibble]; }; + editbl = derive2 { name="editbl"; version="1.0.1"; sha256="0lzq7whmyw0kk8bhka2rg0sg7m21sr5yzh3508cd3r3xyvzil0j0"; depends=[dplyr DT fontawesome shiny shinyjs tibble uuid]; }; editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; }; edl = derive2 { name="edl"; version="1.1"; sha256="19p0qr9lm0kdinh4qnqx7bzxkbvcfpp6mbddwh0hgsgqkbw916cp"; depends=[data_table plotfunctions]; }; edlibR = derive2 { name="edlibR"; version="1.0.1"; sha256="0ibl8zcaf2p2xb3498zbin7g4ipanyxc9m9zkcj43h2r0304xgsk"; depends=[Rcpp stringr]; }; @@ -9098,22 +9111,20 @@ in with self; { educationdata = derive2 { name="educationdata"; version="0.1.3"; sha256="1z86v9d3qdjzk3kvxid5k0gnj3sbdr4gd4z00f55ddknfgyfarqi"; depends=[glue httr jsonlite readr]; }; educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; edwards97 = derive2 { name="edwards97"; version="0.1.1"; sha256="05g90mjxjvw9yqsp9gk50ywi7hdfwn3bgsyxpfkwkrjx9sdq5l0z"; depends=[broom cli glue rlang tibble withr]; }; - eechidna = derive2 { name="eechidna"; version="1.4.1"; sha256="1p8vj371i7zglw7898akzj4hd5j7zk35is91jylxalldjab88v9c"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; }; eefAnalytics = derive2 { name="eefAnalytics"; version="1.1.1"; sha256="1mgbdsmbv5s87b2334rf057di4l36qmr1kw12qvmb8yz1pqrsx4w"; depends=[ggplot2 lme4 mvtnorm rstanarm]; }; eegkit = derive2 { name="eegkit"; version="1.0-4"; sha256="1r1lack4ps9hwqq56rq37431rcxf3x79zgvda6vrmh4s0ziy6v4x"; depends=[bigsplines eegkitdata ica rgl signal]; }; eegkitdata = derive2 { name="eegkitdata"; version="1.1"; sha256="1pyxcpgkqqbzr9wbsqcxjnx6y4sxc69q7gvh3092jnnhs82kbqrc"; depends=[]; }; - eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; }; eemdARIMA = derive2 { name="eemdARIMA"; version="0.1.0"; sha256="0ma9h9vi19qy9a70vpdpik64r3q9hxqqcfiswczxwajncw5nvmv0"; depends=[forecast Rlibeemd]; }; eemdTDNN = derive2 { name="eemdTDNN"; version="0.1.0"; sha256="1i2xyc26644pgr45s78g44mzln3km9r5cw22niz3cd6q8ik2iva0"; depends=[forecast Rlibeemd]; }; eeptools = derive2 { name="eeptools"; version="1.2.5"; sha256="1l8cjwkqgh9ywm8yc39kw684jhkw9afb0cxzpkjlap78jgb72xxf"; depends=[arm data_table ggplot2 vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; ef = derive2 { name="ef"; version="1.2.0"; sha256="1ic26mwjv221yyjj16v9xcdxsg3pl6wsp82iaprihdcndswccvzi"; depends=[dplyr Matrix mgcv RcppEigen TMB]; }; - efdm = derive2 { name="efdm"; version="0.2.0"; sha256="1b1ay4gssyhmgzklklx0zg424sp5jb3nmn0ry4fix8z3jaf412il"; depends=[data_table]; }; + efdm = derive2 { name="efdm"; version="0.2.1"; sha256="0wv8vfp2903rvkdnjaawblvd9wi6xyy3n34h1iw2dbcmab84irmw"; depends=[data_table]; }; eff2 = derive2 { name="eff2"; version="1.0.1"; sha256="0872xms2i8k128h3cn2n9dwa4apdyvxhb1h759cmyw63fw4wm8kx"; depends=[igraph pcalg RBGL]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.2-2"; sha256="0nlj79am9a1yg737dhfa8dj1kj2hly9pfknmphsbcvlgxqn35vig"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.8.5"; sha256="01iv9rc1ssa69ziy4z7kldwab5754vamgymf2zannss9g65dl7ri"; depends=[bayestestR datawizard insight parameters performance]; }; + effectsize = derive2 { name="effectsize"; version="0.8.6"; sha256="0gdk6f2713k2vhv7qa6dgxl6kgc6r6yb12hb27k4bbibj5njvvni"; depends=[bayestestR datawizard insight parameters performance]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; effsize = derive2 { name="effsize"; version="0.8.1"; sha256="1m5ch2g77f4ldbxhzp2ls1pga8hq7ggkz1xs8a90h0s09rj0gd7w"; depends=[]; }; @@ -9121,14 +9132,15 @@ in with self; { ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; egcm = derive2 { name="egcm"; version="1.0.13"; sha256="16mzhf7x19v9z600n29q4481dmsjfcn55365zbb9d0wrclc3053l"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; }; egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; - eggCounts = derive2 { name="eggCounts"; version="2.3-2"; sha256="1hb7a78db97xz5hm311d60n2kg1wdlrf57vg4ixamqihyrcs5r4v"; depends=[BH boot coda lattice numbers Rcpp RcppEigen RcppParallel rootSolve rstan rstantools StanHeaders]; }; + eggCounts = derive2 { name="eggCounts"; version="2.4"; sha256="089psh98w8kcy52h8vv3z8n0sigp46far0a0w4wfsyv2ijzc2l2p"; depends=[BH boot coda lattice numbers Rcpp RcppEigen RcppParallel rootSolve rstan rstantools StanHeaders]; }; + eglhmm = derive2 { name="eglhmm"; version="0.0-23"; sha256="1id1x11fwrv658f555a7jzqvq12v7jxmwpl8avi99gn17lwmwq1g"; depends=[dbd nnet]; }; egor = derive2 { name="egor"; version="1.23.3"; sha256="05y412qlrsrbr0r6bkac72pvvxkhsgapj9l46sr2485azvbyzl7n"; depends=[dplyr pillar purrr rlang srvyr tibble tidygraph tidyr]; }; - eha = derive2 { name="eha"; version="2.10.3"; sha256="05bnqxpkn5i0q750l1brm2bi7xv25dijwrxnb6nnm8f8plvbx6gw"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.11.1"; sha256="1fhs31qk5sh4f6nrxrbrv1f29rkzawjj6v8kid894ji5ifd7qv3l"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.1"; sha256="15hpzj3ridl6w3pd5z86d88cc88jw09qpqhsdwkar4dby8lgxhi0"; depends=[]; }; ehelp = derive2 { name="ehelp"; version="1.2.1"; sha256="1kqd6mzzcf2b0hslpm2zvxyi3i4vhzxsmvdmfqgrs6703n1dx62g"; depends=[]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; ei_Datasets = derive2 { name="ei.Datasets"; version="0.0.1-3"; sha256="1ii9dnjxbjvzp0ihg499fvwqzgdwdcp2xxnqfqz319d805hajcpr"; depends=[tibble]; }; - eiCompare = derive2 { name="eiCompare"; version="3.0.2"; sha256="1kasz12g9jm0qc7bsxk3azpmkdcywykj2zak4i09q3mdkk79hq5q"; depends=[bayestestR coda data_table doSNOW dplyr ei eiPack foreach ggplot2 magrittr mcmcse overlapping purrr rlang sf stringr tidyr tidyselect wru]; }; + eiCompare = derive2 { name="eiCompare"; version="3.0.4"; sha256="15s75hy6dp7pqsp5rhh9lqyy8z8cd7gq4hxl08ah4jki82cf877d"; depends=[bayestestR coda data_table doSNOW dplyr ei eiPack foreach ggplot2 magrittr mcmcse overlapping purrr rlang sf stringr tidyr tidyselect wru]; }; eiExpand = derive2 { name="eiExpand"; version="1.0.5"; sha256="1x30np4liy33mkb31040b2mk3yqajp4v0b2n32akm07f8sn3zrxh"; depends=[dplyr ggmap ggplot2 magrittr rlang sf stringr tidyr tidyselect viridis]; }; eiPack = derive2 { name="eiPack"; version="0.2-2"; sha256="1jb7nxk71cyvrmapzwz4fgjv7ca5m17i22acyhx27krl168ss0r2"; depends=[coda MASS msm]; }; eia = derive2 { name="eia"; version="0.3.7"; sha256="1af9m5qrchxcrhyasx0hkrzjr6z4vixxmq4q9q33bkscy263q9fg"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr readxl tibble]; }; @@ -9137,41 +9149,40 @@ in with self; { eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; eimpute = derive2 { name="eimpute"; version="0.2.2"; sha256="11bjvzmf252m3440z5wlsx92ybay5g76j2af0xbcybhqz7wpkk0l"; depends=[Rcpp RcppEigen]; }; einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; }; - einsum = derive2 { name="einsum"; version="0.1.0"; sha256="01930c38hkbqhn8d5g7jfhr0mrdi077rg0kkbp5kagxcqx6jrg7w"; depends=[glue mathjaxr Rcpp]; }; + einsum = derive2 { name="einsum"; version="0.1.2"; sha256="06q9kmzgxkpvm3krn1w1nfy8h2xrbmxc9cd5b4mm7yx829r2jf09"; depends=[glue mathjaxr Rcpp]; }; eiopaR = derive2 { name="eiopaR"; version="0.1.1"; sha256="1f8fm6ia5invskc7a7hcjvf52afdkw38y1vx7jlpqxvawswmwpv2"; depends=[curl httr jsonlite]; }; eirm = derive2 { name="eirm"; version="0.5"; sha256="0zs45n6xkyi9agrgv36bz2prdcplln66713xjr6sxyip52z9ksbk"; depends=[blme ggeffects ggplot2 lme4 magrittr optimx readxl reshape2 shiny shinycssloaders shinydashboard]; }; - eive = derive2 { name="eive"; version="3.1.1"; sha256="0bwq95xfpy6m0zav9315vb3npay8irjlni0jc9aciz4jyz08if5f"; depends=[Rcpp]; }; + eive = derive2 { name="eive"; version="3.1.3"; sha256="1ziijc43axgsm9j61saab7q4kqysqwx3gvl710lv7m57vll6k4zl"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; - eixport = derive2 { name="eixport"; version="0.5.4"; sha256="0q6djpp6x0hzzk2sh36rfgzch3n6v4af9knvwv0fnlh72n2cj0b8"; depends=[cptcity data_table ncdf4 raster rgdal sf sp]; }; + eixport = derive2 { name="eixport"; version="0.6.0"; sha256="18jybscxh051h5y31gb7ywr9n5a471l6krcl95wznfvc2ba1k8pc"; depends=[cptcity data_table ncdf4 raster sf]; }; eks = derive2 { name="eks"; version="1.0.4"; sha256="14nyd2ipjy5kvcp3001ld7dv2k46paxg20w7dnq17sg8wy8iy4rd"; depends=[dplyr ggplot2 isoband ks mapsf sf]; }; elaborator = derive2 { name="elaborator"; version="1.1"; sha256="1kq3qqqywpzrk1ichsljvfijhsybmj7s0scmswmwi2crqi67gzp8"; depends=[bsplus dendextend dplyr forcats haven purrr RColorBrewer reshape2 rlang seriation shape shiny shinydashboard shinyWidgets tidyr]; }; elasdics = derive2 { name="elasdics"; version="1.1.1"; sha256="1zpwkch4h463d1ad681iid668909w74xb0wyfjqshdvznb4pxp5i"; depends=[numDeriv]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; - elastes = derive2 { name="elastes"; version="0.1.6"; sha256="1j28vqiflc6ij2yp9cniqs3vcjm597mrzdjvfg3235r9m6gf5yij"; depends=[elasdics mgcv orthogonalsplinebasis sparseFLMM]; }; + elastes = derive2 { name="elastes"; version="0.1.7"; sha256="0sa95g6wcl3m8aygpg9ip1p3q8hwcin8mglzbl3mc9bvdfwkplsa"; depends=[elasdics mgcv orthogonalsplinebasis sparseFLMM]; }; elastic = derive2 { name="elastic"; version="1.2.0"; sha256="0k98ziacyxl1pyhyynmswcncqwl0a05sawypncdpdd9xr77nvgi6"; depends=[crul curl jsonlite R6]; }; elasticnet = derive2 { name="elasticnet"; version="1.3"; sha256="0nxcw06d0cp2mbqzg2fm9yys5xm6xx7bfcfvr0avcs8afkvz29j8"; depends=[lars]; }; elec = derive2 { name="elec"; version="0.1.2.2"; sha256="1qc2hzbkmxvk4zrmdr935klhxvvdc7rmximqybb5aammd351qh2a"; depends=[]; }; elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; }; elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; }; - elections_dtree = derive2 { name="elections.dtree"; version="1.1.2"; sha256="0niqvr4c1kgkwb5s95m6z16vg2yc1h5vcdd578z4rnhkyys9ajhz"; depends=[R6 Rcpp RcppThread Rdpack testthat]; }; + elections_dtree = derive2 { name="elections.dtree"; version="2.0.0"; sha256="199ms891xgr8jgb5w0lrp8z1aj8faqrfsx60bcgv152v7y12mjx0"; depends=[prefio R6 Rcpp RcppThread Rdpack testthat]; }; electionsBR = derive2 { name="electionsBR"; version="0.3.2"; sha256="05wxzfgh0f3n6w8ah32q2v4f67g6w4qri4dv1linmlax77clv9fn"; depends=[data_table dplyr haven magrittr readr]; }; electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; }; electoral = derive2 { name="electoral"; version="0.1.3"; sha256="0r15ghnblp5f2g9hpw187clfpj1cgplqyn9mhyvlcmz5ql60glsj"; depends=[dplyr ineq tibble]; }; - elementR = derive2 { name="elementR"; version="1.3.7"; sha256="01xbqargzc0bp1l5rcvxikr95ghj9w7w5byhrjbgwbia6y7zhxa2"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; - elevatr = derive2 { name="elevatr"; version="0.4.5"; sha256="0sadw65ml6ck2kx3cr95pf5h45z3ynjyrqv3h5i5c0bgcgajcqrw"; depends=[curl furrr future httr jsonlite progressr purrr raster sf slippymath sp units]; }; + elevatr = derive2 { name="elevatr"; version="0.99.0"; sha256="1l18b72bvb7cfprxi99ylffbvs072g29ly3bcw6s1yv5asp50iw6"; depends=[curl furrr future httr jsonlite progressr purrr raster sf slippymath terra units]; }; elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; elfDistr = derive2 { name="elfDistr"; version="1.0.0"; sha256="11h91mwiw2pr0c8zvyzqql275falpiajv784n2rd5xs9azprqdd0"; depends=[Rcpp]; }; elfgen = derive2 { name="elfgen"; version="2.3.3"; sha256="0j6m3qvgknmgc93p4629hyvxmdn6v9f54x9bbp5g2f7pfp44bkf0"; depends=[curl ggplot2 nhdplusTools quantreg sbtools scales sqldf stringr testit]; }; elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; }; elisr = derive2 { name="elisr"; version="0.1.1"; sha256="1kz07fyffaqgda9rqidxzxz0bxzhyb8pyxpzqsvjsn1i9w98cb5k"; depends=[]; }; - elitism = derive2 { name="elitism"; version="1.0.4"; sha256="0n5g1nd1dd5wc76qa2va1lyxahg9p062l8wdqzq43ah6943pjzgr"; depends=[MASS]; }; + elitism = derive2 { name="elitism"; version="1.1.1"; sha256="1apqzcj3nnir8f448ainmkrw8qj6pfi7d163wy0pkgzsh0gjv8r0"; depends=[MASS]; }; elliplot = derive2 { name="elliplot"; version="1.3.0"; sha256="13r16lx8hx46d3r9awki4j6lvy5p2q5d3k268h3bhd0mcsbxrml0"; depends=[]; }; ellipse = derive2 { name="ellipse"; version="0.5.0"; sha256="1wy25kw3055zxzidzzkif6c8bmch73qkv2ri4i1w0b6ffcwmbs6d"; depends=[]; }; ellipsis = derive2 { name="ellipsis"; version="0.3.2"; sha256="0n0mm9jngklv7j9wa64jdji035z0smmnsp2dfwcz9isrxgjnc0m9"; depends=[rlang]; }; elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; }; ellipticalsymmetry = derive2 { name="ellipticalsymmetry"; version="0.1.2"; sha256="035q6zjf0lnx704q5g51bhv1xp7y0yn31ph57zydk92gfpgn468l"; depends=[doParallel doRNG foreach ICSNP]; }; elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.4"; sha256="1vn3c67p4kd7bs4fsyhkl350aydcqpfda4j6svkc0g4cxd5i33zj"; depends=[KernelKnn Rcpp RcppArmadillo]; }; - elo = derive2 { name="elo"; version="3.0.1"; sha256="0cw3gcp0i4jvpmqv4595arqq3r5407gh6cy0l8jl7s9bi9mnvd9b"; depends=[pROC Rcpp]; }; + elo = derive2 { name="elo"; version="3.0.2"; sha256="1phyg8by1pz3kvrb0x3w1a9f46ccadgzzznr6r8azfbqv46xyknf"; depends=[pROC Rcpp]; }; elrm = derive2 { name="elrm"; version="1.2.5"; sha256="1kqwr0nfmnb729h01p14a24kd9scsw7j7qj133kpg0ppcfsnygld"; depends=[coda]; }; elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; eltr = derive2 { name="eltr"; version="0.1.0"; sha256="0f4sy2hhsbghasl5xcnqlgxqhb503pl73c5vdkgpcm73smrqbpbv"; depends=[data_table]; }; @@ -9180,35 +9191,35 @@ in with self; { emIRT = derive2 { name="emIRT"; version="0.0.13"; sha256="1z6yd9m6vggbp42qms2sg0rbxjpg15x9m8gkdz1p3q4aqrc2ncj0"; depends=[pscl Rcpp RcppArmadillo]; }; emailjsr = derive2 { name="emailjsr"; version="0.0.2"; sha256="1pxqw0r95pgpnvhmyw46py6bnchswb9wcyl42lsg5ccz74dynmh0"; depends=[httr shiny shiny_i18n shinybrowser]; }; emailvalidation = derive2 { name="emailvalidation"; version="0.1.0"; sha256="1k2i2rnlqzgi7kn2knll86bax4pms68jddrycaqv6pkql8fja93a"; depends=[httr jsonlite]; }; - emayili = derive2 { name="emayili"; version="0.7.15"; sha256="0c8vs2rh1c4rdvs8w42mk7yhngyc6dfrl12zi56wn5sq9320258l"; depends=[base64enc commonmark curl digest dplyr glue htmltools httr logger magrittr mime purrr rmarkdown rvest stringi stringr tidyr urltools xfun xml2]; }; - embed = derive2 { name="embed"; version="1.1.1"; sha256="09a8a1p96dpcx5s5d9xhbcipys77zmfq3nnn7j200avjpfdzgjfv"; depends=[dplyr generics glue keras lifecycle purrr recipes rlang rsample tensorflow tibble tidyr uwot vctrs withr]; }; + emayili = derive2 { name="emayili"; version="0.7.18"; sha256="0q38lkvp2298jkwlfr6b90ikvkzf31d2v56pdfxz2xf1qmf5p7b2"; depends=[base64enc commonmark curl digest dplyr glue htmltools httr logger magrittr mime purrr rmarkdown rvest stringi stringr tidyr urltools xfun xml2]; }; + embed = derive2 { name="embed"; version="1.1.2"; sha256="093fd33fpnjqai4gicjrf2snqgayzfcgkak3a5fs6qxzgvvfp12s"; depends=[dplyr generics glue keras lifecycle purrr recipes rlang rsample tensorflow tibble tidyr uwot vctrs withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="8.7"; sha256="1fayl1wxpw9903psrjichrbf6rx38d7shnsjpxdwljw67g6pr5g7"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.13"; sha256="069w10i1590bcyzv4kfsg7wsr1yl9nlsyj6yvys088xll5z4n116"; depends=[bbmle coda lattice MASS plyr]; }; emdi = derive2 { name="emdi"; version="2.2.0"; sha256="10ivwjs0fgf706fscn5z0ip19py25pzcw81j16hlyahc5ajcgjyr"; depends=[boot formula_tools ggplot2 gridExtra HLMdiag MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 saeRobust spdep stringr]; }; - emdist = derive2 { name="emdist"; version="0.3-2"; sha256="05mv6xhm15b0mq9kzyiblkb14bdqmjrwl64ghdk66il0w8i7p6nh"; depends=[]; }; + emdist = derive2 { name="emdist"; version="0.3-3"; sha256="0jmnz612pjad3p1zk0qiljcbf0zbxfi4zcw2jqwg8ncjsifhr3mp"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.9"; sha256="04sm05xnjns7wcvpk35ywkxy6g0mm84r060mkmzh64wq58c2q06l"; depends=[moments]; }; emhawkes = derive2 { name="emhawkes"; version="0.9.7"; sha256="0zhy1y80m548y9nbbjb2h795qky2637mxlqb548bakn7ps847qps"; depends=[maxLik]; }; emld = derive2 { name="emld"; version="0.5.1"; sha256="0cvnfvzskvpcqzs6fwrpjcqrc6yrfciliy9jj0c9h4iyag0g0b9b"; depends=[jsonld jsonlite xml2 yaml]; }; - emmeans = derive2 { name="emmeans"; version="1.8.7"; sha256="0gpqgbybxpcpxc2n3pisd4yr1s9dq2m4z8j29f5mq0c5w5axgm68"; depends=[estimability mvtnorm numDeriv]; }; + emmeans = derive2 { name="emmeans"; version="1.8.9"; sha256="1ipzs88inyif52rbifqwrfv8vwxw8fwq2hb489vgws8xznhz034a"; depends=[estimability mvtnorm numDeriv]; }; emoa = derive2 { name="emoa"; version="0.5-0.2"; sha256="0fr4ia3hkv8c7wkl64a51s6ynldppc812ynwldvbwy25dhlbvs6r"; depends=[]; }; emoji = derive2 { name="emoji"; version="15.0"; sha256="1xscypzz17a7nrajnl7isy2nrm9cyr97l0mi9vp0daqvzgyfajba"; depends=[glue stringr tibble]; }; emojifont = derive2 { name="emojifont"; version="0.5.5"; sha256="1hhrwilv36hd9gs1kcl2zsi6519md0h9aixjrm6lfclxvz8r6k1i"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; empichar = derive2 { name="empichar"; version="1.0.0"; sha256="1hcl6wbf4saxxp54j2w67csv6nzfgc3f3wdd9lk9grmkxsaab4rx"; depends=[Rcpp RcppArmadillo]; }; - emplik = derive2 { name="emplik"; version="1.3"; sha256="14jgwwxvsglkbq7kwjl34lyax45qn4hkra4qmmv4ybnvvcmbcag1"; depends=[quantreg]; }; + emplik = derive2 { name="emplik"; version="1.3-1"; sha256="1f6v0bg9sl8kn4y8bpgjyc1b18xkmfbs86gbbmbh198v335lgcrb"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.32"; sha256="0d4fzyxa7kynxgx8187vqxnb25kv1m1pkawxdpng6nfaiy76w67m"; depends=[]; }; emplikAUC = derive2 { name="emplikAUC"; version="0.3"; sha256="0ifh661xknqin0k9vs92p00c4n6npkwn5cxyj970cj8l689yndrr"; depends=[emplik2 rootSolve]; }; ems = derive2 { name="ems"; version="1.3.11"; sha256="0xg4c6yhrnq5pfz94i1ys1bdqfz12h0wcs86fz4nm4pqfdbh41cc"; depends=[boot rms survival]; }; emstreeR = derive2 { name="emstreeR"; version="3.0.0"; sha256="1rfgw9inkxg81ky31r51a8fc5nvwalrjp2nkx4p24l5k622fwmjb"; depends=[BBmisc ggplot2 mlpack scatterplot3d]; }; - emuR = derive2 { name="emuR"; version="2.4.0"; sha256="1vwfzs02ga07z1risj4kc0iqqcwkx3wym996lp8kdipfclr4dr8i"; depends=[base64enc cli DBI dplyr httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid V8 wrassp]; }; + emuR = derive2 { name="emuR"; version="2.4.1"; sha256="1qfdfgxfvdp9i9hyl2f461pw1bcbsz5znd6q4kqfi42m2dpz2dpv"; depends=[base64enc cli DBI dplyr httpuv httr jsonlite mime purrr readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid V8 wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-21"; sha256="0iikf6yinkqcgdnxx6v5kzfllhq3ppl75ym48vlcbnvkwv0v4l4v"; depends=[mvtnorm]; }; enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; }; encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; }; encryptedRmd = derive2 { name="encryptedRmd"; version="0.2.1"; sha256="0agd5lqrmdi50r9fl25njwsvg91nqsvj4h6c639vfhxx7p9y9nfk"; depends=[readr rmarkdown sodium]; }; encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; }; endoSwitch = derive2 { name="endoSwitch"; version="1.0.0"; sha256="1cj4skk317ppnayk1ph63vll49vs74fljc25cn1iviwgjq64ly0k"; depends=[data_table maxLik msm]; }; - endogeneity = derive2 { name="endogeneity"; version="2.1.2"; sha256="1dmb3gnkb6nxvcyzh7vhh0ra8164b337ir7higc5d3dmmssn81yy"; depends=[data_table MASS maxLik pbivnorm Rcpp RcppArmadillo statmod]; }; + endogeneity = derive2 { name="endogeneity"; version="2.1.3"; sha256="19hhs46sz7m7qsnwrz81740iq6g8n0z3rnw2shv6sakc5z0z7jga"; depends=[data_table MASS maxLik pbivnorm Rcpp RcppArmadillo statmod]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.2"; sha256="16cbqg3z71c36j2zzw3xr09p6kpjwim7610sss1ayjh3xs0isa2l"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="2.29"; sha256="0dqzh2blb2h8ngchvfvnzx0gmilvx9ydvzqwfy4d9f58ixybn4d9"; depends=[ggplot2 pastecs]; }; @@ -9217,9 +9228,8 @@ in with self; { enerscape = derive2 { name="enerscape"; version="1.0.0"; sha256="103zikp56kbr64y6198xic401dc1nal34walfzwry73y0g7gmz69"; depends=[Rcpp terra]; }; enetLTS = derive2 { name="enetLTS"; version="1.1.0"; sha256="1lah9ai9skshz0rq3r1smvy69j443m22h1dihl42gy2568998q4v"; depends=[cvTools ggplot2 glmnet reshape robustbase robustHD]; }; english = derive2 { name="english"; version="1.2-6"; sha256="1g3nmy5p8wj3ix1vp1qmkmy3dyqisrw0md8cjrx4klqkp0wqlms9"; depends=[]; }; - engression = derive2 { name="engression"; version="0.1.1"; sha256="1zcp2krpxchq2gc78040fsjx9bmnm7hk1a7gyxrsdp1s45jr0lrq"; depends=[torch]; }; - engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; - enmSdmX = derive2 { name="enmSdmX"; version="1.0.6"; sha256="0s63x1i7l2c14a8wd7g0jffdr2d39jfkfm9mg1a3xflh88h596js"; depends=[boot dismo doParallel DT foreach gbm ks maxnet mgcv MuMIn omnibus randomForest rJava scales sf shiny terra]; }; + engression = derive2 { name="engression"; version="0.1.3"; sha256="0x2mfyqpbr1bd73llm69yspw0bp1hfv7gjlwmpslnzym1ry8if1b"; depends=[torch]; }; + enmSdmX = derive2 { name="enmSdmX"; version="1.1.2"; sha256="15pdsva011dpa72ms7c6fdhadzcm603wzglfy9hg63krirvmfwkh"; depends=[boot data_table dismo doParallel DT foreach gbm ks maxnet mgcv MuMIn omnibus ranger rJava scales sf shiny statisfactory terra]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="3.2"; sha256="1g97q6vqwvb2l02y61343sblarqi433gjl3qmlyxjxq2lnjrnak1"; depends=[curl ggplot2 httr rjson WriteXLS]; }; enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; }; @@ -9231,17 +9241,17 @@ in with self; { ensemblepp = derive2 { name="ensemblepp"; version="1.0-0"; sha256="08k7v61p2sgr07dklabl0g7apsn9da60sfb14gfrwipwi8bsd4pv"; depends=[]; }; ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; - entropart = derive2 { name="entropart"; version="1.6-12"; sha256="151b3p36x051gqxfxvsfi6f9lcvl8rwhrp430pk65ibyd7ivklaj"; depends=[ape EntropyEstimation ggplot2 ggpubr reshape2 rlang tibble vegan]; }; + entropart = derive2 { name="entropart"; version="1.6-13"; sha256="1y2gdfnqz52w03g9zij07fkjhh3yf3qflk75j0bvfk7n727rz2jp"; depends=[ape EntropyEstimation ggplot2 ggpubr reshape2 rlang tibble vegan]; }; entropy = derive2 { name="entropy"; version="1.3.1"; sha256="1f0j8jsn6pzf4gi5g0akixx6x5vc69ci5f4m2vnwp40frvsqjnkg"; depends=[]; }; entrymodels = derive2 { name="entrymodels"; version="0.2.1"; sha256="0fz7jzax12pzw47iry4amgg9z4z3z94kig6r5dhcqa84kq02294v"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; - envalysis = derive2 { name="envalysis"; version="0.5.5"; sha256="0r3pzdk6sm7g937g37xmvc6a37yv2sfh71l5cvwli1kglqdd5ph8"; depends=[drc ggplot2 lmtest]; }; + envalysis = derive2 { name="envalysis"; version="0.6.0"; sha256="1a51lfmgj50yxif9bfnlqhxlg1nyss6vb78jhkvkmx7c0qjdl0g2"; depends=[drc ggplot2 lmtest]; }; enveomics_R = derive2 { name="enveomics.R"; version="1.9.0"; sha256="16c6w3nhv53yp72w8hss3s1lhhlbaiylcvkc93a83zzcpx37i23b"; depends=[fitdistrplus investr sn]; }; envi = derive2 { name="envi"; version="0.1.17"; sha256="1fsw4rq2ri60w4hgzfxqva4b3b8xsvnkzraj288xacphhm3hamjx"; depends=[concaveman cvAUC doFuture doRNG fields foreach future iterators pls ROCR sf sparr spatstat_geom terra]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.7.1"; sha256="1rk7y24lld16zk7f3aak3zf9i3xd27l8mffcvlxwqi7cpl1pqa9b"; depends=[animation BiocParallel data_table igraph mixtools RColorBrewer Rdisop]; }; enviPat = derive2 { name="enviPat"; version="2.6"; sha256="17qrly8fb6d7gk1xcg3273mykpwc9i7ghnvipp63fwx4cp25crzw"; depends=[]; }; envir = derive2 { name="envir"; version="0.2.2"; sha256="090s0idsdvg09gd8mjkbbfw6fvxj0mmfy3135wp5n7cjdf2qgp7n"; depends=[]; }; - envirem = derive2 { name="envirem"; version="2.3"; sha256="0gffdj7jz61dlkznlk5a4w8fh72phfj3s9gnssb1z73jx82j34cw"; depends=[knitr palinsol raster RSAGA sf]; }; + envirem = derive2 { name="envirem"; version="3.0"; sha256="06mxzm5kg0vm34z8sx5mbxxcdicjicjjdnhx0pi61dqnrwj47jml"; depends=[knitr palinsol terra]; }; envnames = derive2 { name="envnames"; version="0.4.1"; sha256="1fkbid2x60m63dnrxrdq7im49spn8m70g1gd8nqjq3xlv642ianm"; depends=[]; }; envoutliers = derive2 { name="envoutliers"; version="1.1.0"; sha256="1wgrrkkpkmf300qb56mq6nxigwnpq551sjxlk05lk3ckawx66srf"; depends=[car changepoint ecp ismev lokern MASS robustbase]; }; envstat = derive2 { name="envstat"; version="0.0.3"; sha256="07y4bprb9mi37d8pg6xr1x4rkgjza2iq5hpr8a1iv584sgbjl4ah"; depends=[cli httr2 rstudioapi yaml]; }; @@ -9253,45 +9263,46 @@ in with self; { epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.7.0"; sha256="0fcr3awbbsp4ihzw0b9z27glsp0h659g4ihmcxp5qgi1xkh4cc8r"; depends=[]; }; epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; }; epca = derive2 { name="epca"; version="1.1.0"; sha256="0ikncmrvcdixa209lrjb84rdsl78isi815a461i7lfmmln9myqk2"; depends=[clue GPArotation irlba Matrix]; }; - epcc = derive2 { name="epcc"; version="1.4.7"; sha256="0j4cb17gvwsaacmhvm8qp5chr384kl7gj6089gjrc2hqi6kjr0rx"; depends=[cowplot deSolve formattable ggplot2 httr nls2 proto raster readxl rgdal rlang sp]; }; epe4md = derive2 { name="epe4md"; version="0.1.4"; sha256="12arly1kcpcg0ym3rq8am7l4nchwl97vy3yp6vamc4sbv01w18a5"; depends=[assertthat dplyr fabletools feasts forcats furrr future ggplot2 janitor jrvFinance lubridate magrittr purrr readr readxl scales stringr tibble tidyr tsibble zoo]; }; - eph = derive2 { name="eph"; version="0.6.1"; sha256="1qj2xf8rp7rdlcwl677ad49ynzblia2kkdc5bky8y2hygkhb9c0g"; depends=[assertthat attempt cli curl dplyr expss glue htmltools httr janitor leaflet magrittr purrr readxl rlang stringr tibble tidyr zoo]; }; + eph = derive2 { name="eph"; version="1.0.0"; sha256="1gr0j5xxdmi10d4n742r9764134fsh0xxqdfz5jk5df1z16wh7g2"; depends=[attempt cli curl dplyr expss htmltools httr leaflet purrr readxl rlang stringr tibble tidyr tidyselect zoo]; }; + epiCleanr = derive2 { name="epiCleanr"; version="0.2.0"; sha256="1m5qz7qkly9waj1w8x0hrz28cc4vzn6psqs4q39x1fhxlgip0rih"; depends=[countrycode crayon dplyr ggplot2 glue janitor purrr rio rlang stringr tibble tidyr tidyselect withr]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.2"; sha256="0430mwnaa0qamdyvmwkh37ic0kp4hq8mr5nxkc97mhhl7djw0y92"; depends=[foreign MASS nnet survival]; }; - epiR = derive2 { name="epiR"; version="2.0.62"; sha256="0j5c7y7fhlni9zzm87fgwcgbgs94v7xwsdimxvw37achf5jbcgp9"; depends=[BiasedUrn flextable lubridate officer pander sf survival zoo]; }; + epiR = derive2 { name="epiR"; version="2.0.65"; sha256="15kfy9wyadwd0njslb7fhkmf5dmvwbqn7a2v620cl2c87kk0hja5"; depends=[BiasedUrn flextable lubridate officer pander sf survival zoo]; }; epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; }; epicasting = derive2 { name="epicasting"; version="0.1.0"; sha256="191kxjrr8h44i7a7dpxziqhbcnbmhgcc5b7ddn9cnvvjqmbwmvl2"; depends=[forecast Metrics wavelets]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.3"; sha256="0y97l288ncj0svk1gnxjr4q58rvhbn6wblm7jbhff4n4544yd4f7"; depends=[colorspace dplyr igraph threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.4.0"; sha256="0v3s1vrf2iqh03rkkwrlz6mhpbsbjxkayrqdx04vrnja4i9ljshk"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr tinytest xml2]; }; + epidatr = derive2 { name="epidatr"; version="1.0.0"; sha256="0vyzgansl9gkydadddhi5jayyakr11d0cjxjplfnx5jrwxds92l1"; depends=[cachem checkmate cli glue httr jsonlite magrittr MMWRweek openssl purrr readr tibble xml2]; }; epidm = derive2 { name="epidm"; version="1.0.4"; sha256="0ncjfhq45gs1w0kpkpdwfs43iccl6pq8yrc2999g3r5dsiw06lyq"; depends=[data_table DBI odbc phonics purrr readr stringi stringr]; }; epifitter = derive2 { name="epifitter"; version="0.3.0"; sha256="104hl3b3951psi023hv95486ygcv9ilmqkzw96yygym7rhkaww9m"; depends=[DescTools deSolve dplyr ggplot2 knitr magrittr minpack_lm tibble tidyr]; }; epiflows = derive2 { name="epiflows"; version="0.2.1"; sha256="1d7j2w9jjscny0ax33k1wy0hcr2pn6ck491vfm327lx4jpld8pfd"; depends=[epicontacts geosphere ggmap ggplot2 htmltools leaflet sp tibble visNetwork]; }; epigraphdb = derive2 { name="epigraphdb"; version="0.2.3"; sha256="11ja2r024a4sfk6xjhwn2mj4fz2msf6jx85w3cxr2hvp9sl3zgc9"; depends=[glue httr jsonlite magrittr purrr tibble]; }; epikit = derive2 { name="epikit"; version="0.1.5"; sha256="06hzs5bzv53qyiqa197qk5gykg1llxb1dh9f8xiald8wk5xxq0z6"; depends=[binom dplyr forcats ggplot2 glue rlang scales sf tibble tidyr tidyselect]; }; + epilogi = derive2 { name="epilogi"; version="1.0"; sha256="0p5aidj9xmlw6lyb4bscb7xkjkfs4jmc4ax844bhsgl6v2y91n6b"; depends=[Rfast]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epimdr2 = derive2 { name="epimdr2"; version="1.0-9"; sha256="1lx1zibp2ziwdyj180jf9y5xczfs2xfkb5bw7q4f7i9p70jlqcrz"; depends=[deSolve ggplot2 phaseR plotly polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epinetr = derive2 { name="epinetr"; version="0.96"; sha256="0jg8pwbxlgrk7mqawsrifk724pi5qn0amh6x2fq54a0hmqdpdjns"; depends=[GA ggplot2 igraph Rcpp RcppAlgos reshape2 vcfR]; }; epiomics = derive2 { name="epiomics"; version="1.0.0"; sha256="06rk2ccnzanxjy0y1lrjya8w2mrnkki12s2mcp4pqn42a664clkx"; depends=[data_table ggplot2 ggrepel lme4 lmerTest qgcomp survival]; }; episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; }; - episensr = derive2 { name="episensr"; version="1.2.0"; sha256="0nnl4sz7gmi09ik5g4qrh8ipv6rlskvn4sqdqj8nn47wxli52wdi"; depends=[actuar boot dagitty ggdag ggplot2 magrittr trapezoid triangle]; }; - epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; + episensr = derive2 { name="episensr"; version="1.3.0"; sha256="0jah8lwmgc7nfacw3nzlnfmrmh1hfnwpjdsvy928pvgh0rsamxvc"; depends=[actuar boot dagitty ggdag ggplot2 magrittr trapezoid triangle]; }; epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; }; epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.4.0"; sha256="08cz2p9xxa966a2v8kay00l3pmgfgmwzlh5pnx04s19rmar13z02"; depends=[distcrete dplyr purrr rlang sodium stringi tidyr]; }; - epitweetr = derive2 { name="epitweetr"; version="2.2.13"; sha256="0vv4y1c8nfcdv2hmv6vvi5jh6ykrbvna2p2gwpcl9q4j7b4wp9jc"; depends=[bit64 crul curl dplyr DT emayili future ggplot2 htmltools httpuv httr janitor jsonlite keyring knitr lifecycle magrittr openxlsx plotly plyr processx readxl rgdal rlang rmarkdown rnaturalearthdata rtweet shiny sp stringr tibble tidytext tidyverse tokenizers xml2 xtable]; }; - epiworldR = derive2 { name="epiworldR"; version="0.0-2"; sha256="0dg452gpyn104fb4x55l39kmb2mnd8dmr16l7fa7h0c1xi16j5zb"; depends=[cpp11]; }; - eplusr = derive2 { name="eplusr"; version="0.16.1"; sha256="0g2nawdskwz6q8imvrnjmsh76da6l434bmbpy058f4krllrs4hmf"; depends=[callr checkmate cli data_table lubridate processx R6 RSQLite stringi units]; }; + epiworldR = derive2 { name="epiworldR"; version="0.0-3"; sha256="0x148iw1kf4jl75dm4ywdh5x8sy20pf2nm80fw5ha36vw14948a3"; depends=[cpp11]; }; + eplusr = derive2 { name="eplusr"; version="0.16.2"; sha256="1b9kqrma6ayzsj146fdb2w2pwzmz1r6yy9g0abhx745gll8g9gqr"; depends=[callr checkmate cli data_table lubridate processx R6 RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epm = derive2 { name="epm"; version="1.1.1"; sha256="1n4q0gnwq4jrsy8gir1x5m0ijlk2nwinlavf05g947l1yx1kq06b"; depends=[ape pbapply Rcpp RcppProgress sf terra viridisLite]; }; epmrob = derive2 { name="epmrob"; version="0.1"; sha256="01xi5zss4pvljk92p7gjnd11i730jhwrhibqk9p0ya1kpgd9bm31"; depends=[MASS robustbase]; }; + epo = derive2 { name="epo"; version="0.1.0"; sha256="1vmqgpr5f87n7qxvblp4m58z0l18sm8cc3i66cwk36rvcfxd8ik2"; depends=[assertthat dplyr rlang xts]; }; epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; }; epocakir = derive2 { name="epocakir"; version="0.9.9"; sha256="19dlwr7dm8dgpd4pkzz9z979ijq0rkampjw5mxjrbq8xgliz0mfr"; depends=[dplyr ellipsis lubridate magrittr rlang tibble tidyr units]; }; eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; epos = derive2 { name="epos"; version="1.0"; sha256="0z3r0128ql1jd8nkadia9w97g4nr3w4azvhpj7bjcaf3smh733d8"; depends=[cowplot ggplot2 gridExtra hash mongolite stringr testthat TopKLists VennDiagram xtable]; }; - epoxy = derive2 { name="epoxy"; version="0.1.1"; sha256="04qlyn1bxa6w784in1wja0378lj2d6bcm9rmzaa55xyh4abl8yna"; depends=[and glue htmltools knitr lifecycle purrr rlang rmarkdown scales whisker]; }; + epoxy = derive2 { name="epoxy"; version="1.0.0"; sha256="0z725l7m5pymnrvww2anqg2bsvd887jdk0ggs0s2bf2jjd7wy84n"; depends=[and glue htmltools knitr lifecycle purrr rlang rmarkdown scales whisker]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; - epubr = derive2 { name="epubr"; version="0.6.3"; sha256="1cpsxx02qcj3brr3ddy8dbnaf6wxf42s9y3kx8fq5ki3pmlwry7g"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; + epubr = derive2 { name="epubr"; version="0.6.4"; sha256="0cv1zkv27ab4h2lq8s4lgizvdrw0238lr042aw8rns27zbqz7is1"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epwshiftr = derive2 { name="epwshiftr"; version="0.1.3"; sha256="11vfs2r2fzbdd3r0s8ikafgq9ins06ym73wqxyijz60h75py4ic7"; depends=[checkmate data_table eplusr fst future_apply jsonlite progressr psychrolib rappdirs RNetCDF units]; }; epxToR = derive2 { name="epxToR"; version="0.4-1"; sha256="00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg"; depends=[httr XML]; }; eq5d = derive2 { name="eq5d"; version="0.15.0"; sha256="0v68vvka68mdq8y4mjkkpiarrkdvzgs1zli1l4nyca5h0r322x2r"; depends=[]; }; @@ -9324,7 +9335,7 @@ in with self; { err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorist = derive2 { name="errorist"; version="0.1.1"; sha256="0rsiyqpr7nw4mz2bccymp83lbqwyigyy7pqgxc1wkmshzdqhvjgh"; depends=[searcher]; }; - errorlocate = derive2 { name="errorlocate"; version="1.1"; sha256="1p9a5nc0ckbdapahf5nkxnsgwvqh2llv3kc2wzwawn131rdaj1qi"; depends=[lpSolveAPI validate]; }; + errorlocate = derive2 { name="errorlocate"; version="1.1.1"; sha256="1qml2qd63iqswb0zvnx9m3ia0zq7q20ycllhds3bwa4fwg25pfsp"; depends=[lpSolveAPI validate]; }; errors = derive2 { name="errors"; version="0.4.0"; sha256="15hmsyfcsjy33601a7v2r7sfk2kxbm4a8xwkgjppmf84vhpqplbx"; depends=[]; }; errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; }; es_dif = derive2 { name="es.dif"; version="1.0.2"; sha256="1swxg8mdp9jj9f0x0cawhhbx8gmmpsgqlbifx2v04a2vkgdkigqf"; depends=[]; }; @@ -9332,17 +9343,17 @@ in with self; { esaBcv = derive2 { name="esaBcv"; version="1.2.1.1"; sha256="0d2z03jab1c59v9x0qfwbipf0zbdz7zqj96ndbs0wnpjpgrvcp1d"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.7"; sha256="1r79qcirlx7g9w523nz81f5f22paid5dhag2lqj7jf33w0ggaknn"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esaps = derive2 { name="esaps"; version="0.2.2"; sha256="0yys40ki5dy62fds4kfwji6qzq5mbmvqps85maqgsimal7p7gx3n"; depends=[dplyr plyr readODS readxl tidyr]; }; - esback = derive2 { name="esback"; version="0.3.0"; sha256="09k895028hqa62m8fhbg5b33ry0in6kbrw0lnphn0rgjhlifxp4z"; depends=[esreg]; }; + esback = derive2 { name="esback"; version="0.3.1"; sha256="0l2v4y2sgfyc0a6ap2ww93y44jxijnxjma16p0bsh3clrvzbvcrr"; depends=[esreg]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; escalation = derive2 { name="escalation"; version="0.1.5"; sha256="0667zmyvgr5lmshgxf1j5yny0kkij6z8d7gj0jcsdl0cq8g8pjm4"; depends=[binom BOIN dfcrm DiagrammeR dplyr gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect trialr viridis]; }; eseis = derive2 { name="eseis"; version="0.7.3"; sha256="0fn55mb6yklwjh0ihczjchxrxvnblzbifq59158zfmz407rrfk5g"; depends=[caTools colorspace extraDistr fftw IRISSeismic matrixStats minpack_lm Rcpp reticulate rmarkdown shiny signal terra XML]; }; eselect = derive2 { name="eselect"; version="1.1"; sha256="04918ping7rxb0n5fkllkcv332gwhqq2f1fqi5nrbx65k7lrjmfy"; depends=[CompAREdesign]; }; esem = derive2 { name="esem"; version="2.0.0"; sha256="035f864na44lqdya6zbivyg1advan9mrfz5c61hxkvlv63b3v8ay"; depends=[dplyr GPArotation lavaan magrittr psych rlang tibble tidyr]; }; - esemifar = derive2 { name="esemifar"; version="1.0.1"; sha256="1fj6hdz4kvign9whxclgriafqc8m1yibvwqprvyn861v31kmlc55"; depends=[fracdiff smoots]; }; + esemifar = derive2 { name="esemifar"; version="1.0.2"; sha256="1v6iw5r54ny08xfi0ynacl8l3jain0adplcrwma5gg5p0k799aaw"; depends=[fracdiff smoots]; }; eshrink = derive2 { name="eshrink"; version="0.1.2"; sha256="0min4j1dyd08i0fyn9a4iasjlhq08bn74bjz8vj1gq9l114v795k"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; }; - espadon = derive2 { name="espadon"; version="1.3.2"; sha256="1zvl6lwwgndqavsf0sdkaavsyhl490iybbi1w3cwcpkc3g461v3c"; depends=[colorspace DT igraph js mathjaxr Matrix misc3d openxlsx progress qs Rcpp Rdpack rgl Rvcg shiny shinyWidgets sp]; }; + espadon = derive2 { name="espadon"; version="1.4.1"; sha256="0r46wr3i8q66j4vyz9qsxkg7fimc6hdac1ja48wyd2rpmgimsvhv"; depends=[colorspace DT igraph js mathjaxr Matrix misc3d openxlsx progress qs Rcpp Rdpack rgl Rvcg shiny shinyWidgets]; }; esquisse = derive2 { name="esquisse"; version="1.1.2"; sha256="180kdcqf93rkfzmjlysi53646ypkqi1r383n8p9jmj6xh9aag8rl"; depends=[datamods ggplot2 htmltools jsonlite phosphoricons rlang rstudioapi scales shiny shinyWidgets]; }; esreg = derive2 { name="esreg"; version="0.6.2"; sha256="1djyx8cc1pfza5n5ipg990jwwc1fjlsiz817iifwv9iw8g9vkda4"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; ess = derive2 { name="ess"; version="1.1.2"; sha256="1cmw20nn39ssyqiyn50w0ws28mq4cd26yhzr7mv97haaqjjjkv5h"; depends=[igraph Rcpp]; }; @@ -9360,10 +9371,9 @@ in with self; { esvis = derive2 { name="esvis"; version="0.3.1"; sha256="0bb91khnrn8v3d6hbbin72032w7w8p0jchbr0bzwyfq5f6l4hwka"; depends=[dplyr ggplot2 Hmisc magrittr purrr rlang sfsmisc tibble tidyr]; }; et_nwfva = derive2 { name="et.nwfva"; version="0.1.1"; sha256="01jhy5043axgmv51ri2k3gl1shvsh569h9xy4y1ya1qjpdlbv0ky"; depends=[]; }; etable = derive2 { name="etable"; version="1.3.1"; sha256="17dga1hz29jjdclhhwn1hrvlkdfbcbqmk233vc00s59pbmgsav06"; depends=[Hmisc]; }; - etasFLP = derive2 { name="etasFLP"; version="2.2.1"; sha256="1njz2dx14vm6hgqcjricr27fapsywnf0zyf220si4fnmglh1vyzi"; depends=[fields mapdata maps]; }; - ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; + etasFLP = derive2 { name="etasFLP"; version="2.2.2"; sha256="14g1v66z27qx84vzjh7fhnpw3a2yki42ylrg7fn6iwyys5cxqj5c"; depends=[fields mapdata maps]; }; ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.9"; sha256="1bdylx3in2hj3989kbp5xgpas5y84m3nrl9jpqr05rv19l6i4350"; depends=[circlize cowplot dplyr ggalluvial ggplot2 ggridges magrittr reshape2]; }; - etl = derive2 { name="etl"; version="0.4.0"; sha256="0ccixl881kxljnz47c78r96wrj2l7mdxs2rxqf0psbkfwybd1pb4"; depends=[DBI downloader dplyr fs janitor lubridate readr rlang rvest tibble usethis xml2]; }; + etl = derive2 { name="etl"; version="0.4.1"; sha256="1msc5mpnw4wd5f798q8rjdxyky6b2bqn6vncgq40jscab83hk9hi"; depends=[DBI dbplyr downloader dplyr fs janitor lubridate readr rlang rvest tibble usethis xml2]; }; etm = derive2 { name="etm"; version="1.1.1"; sha256="1hvrplmdpjjpjji663rw0vjbbrzj2nvr04d1nkc8bf46p4ixyxgy"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; etrader = derive2 { name="etrader"; version="0.1.5"; sha256="1yy7l9030pkwfashybkrpyzpip8camxsy503s1si2myrpjf93chj"; depends=[dplyr httr jsonlite magrittr purrr rvest urltools]; }; @@ -9372,29 +9382,30 @@ in with self; { etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; etwfe = derive2 { name="etwfe"; version="0.3.4"; sha256="0a3q4q27k1rlfbcinxv9kgprxndvrb6sxfz6fc44gm983v926ych"; depends=[data_table fixest Formula marginaleffects]; }; eudract = derive2 { name="eudract"; version="0.10.2"; sha256="1y5n22wbqpq1wrdhlf35mjlxcqq4nwrmivps81d6p0nnca84fhyc"; depends=[dplyr ggplot2 gridExtra httr magrittr scales tidyr xml2 xslt]; }; + eufmdis_adapt = derive2 { name="eufmdis.adapt"; version="0.1.0"; sha256="0n8qj5dhc32ckbjiwvcfc904j9jilyb87x325a2vbgb35gfhf7sn"; depends=[dplyr DT ggplot2 htmltools magrittr rlang shiny shinydashboard shinyWidgets tibble tidyselect]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; eulerr = derive2 { name="eulerr"; version="7.0.0"; sha256="16a84a2xgv1iqsir0hzn6qclljni4f3prpycb7qpp06vrd0yn8lw"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; - eummd = derive2 { name="eummd"; version="0.0.7"; sha256="0rl5l356v3j8jp22b3wgn8xbskqphzsxfd9hiwm1ji1fg5dvq6i1"; depends=[Rcpp]; }; + eummd = derive2 { name="eummd"; version="0.1.4"; sha256="1g0h9b7d89kj7yh45flygmnc76dgjgwr8x8h1kvqq4bvgbwg51ry"; depends=[Rcpp]; }; eunis_habitats = derive2 { name="eunis.habitats"; version="0.1.0"; sha256="1w1382bmlgj9xirrarvmsh8kymgbbfybfmbcpnh02y4lyrdav78d"; depends=[tibble]; }; - eurlex = derive2 { name="eurlex"; version="0.4.4"; sha256="0ncbzixrr0fxjgyhwjwa2y8aqpq7c9m9v3g733n2zg88jpkqqr0q"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; - eurocordexr = derive2 { name="eurocordexr"; version="0.2.3"; sha256="0b31xdcf5z09nvxb7l34l37ysc0y5gdk3jyjsi1qf4kkzcpfbyng"; depends=[data_table fs lubridate magrittr ncdf4 ncdf4_helpers PCICt]; }; + eurlex = derive2 { name="eurlex"; version="0.4.6"; sha256="0sd9bhsb5b2w5h7rqsqc6xqmr3aiwwc3a6rhanwimm4ipxiddn9v"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; + eurocordexr = derive2 { name="eurocordexr"; version="0.2.4"; sha256="1srn0n1imp975b3sfaz27yz1fxm8gs7h34wa6mf5xw551gm6kwwv"; depends=[data_table fs lubridate magrittr ncdf4 ncdf4_helpers PCICt]; }; eurodata = derive2 { name="eurodata"; version="1.7.0"; sha256="0xw6b178jpg4dlgx6af1bh6z2m6apd12lbz03yzp7ay93ghf7zsi"; depends=[data_table magrittr memoise R_utils Rcpp stringr xml2 xtable]; }; europeanaR = derive2 { name="europeanaR"; version="0.1.0"; sha256="11cr8n64yv50zwib9wkvk1j43p9a1cmxmzznxykczv43l193kjg7"; depends=[data_table httr jsonlite magrittr Rdpack]; }; - europepmc = derive2 { name="europepmc"; version="0.4.1"; sha256="16japbndid34shqg8n0bmjrxn84xmhrylvz832zclcllm6i93fn1"; depends=[dplyr httr jsonlite plyr progress purrr rlang tibble tidyr urltools xml2]; }; + europepmc = derive2 { name="europepmc"; version="0.4.3"; sha256="160rvp4yl5myccasyzaq8qhgxwv858y1wdwyrmnrmn3va8s5b515"; depends=[dplyr httr jsonlite plyr progress purrr rlang tibble tidyr urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; eurostat = derive2 { name="eurostat"; version="3.8.2"; sha256="1djrika4mlwqqlcj9cwkpyc24k1i8vmnm1qh5ipqwp54nbwin964"; depends=[broom classInt countrycode curl dplyr httr ISOweek jsonlite lubridate rappdirs readr RefManageR regions stringi stringr tibble tidyr]; }; eva = derive2 { name="eva"; version="0.2.6"; sha256="1b5hrwgdbw19c63ywhkvxlz3843c0mgvsxlmab6zv6r2lrrdkf62"; depends=[EnvStats Matrix]; }; evabic = derive2 { name="evabic"; version="0.1.1"; sha256="0f34shsacf9lyb2hlp2f0nhqy2ihy1zqg52npx8ap2li0s4y0x24"; depends=[]; }; - evalITR = derive2 { name="evalITR"; version="0.3.0"; sha256="16xx6blq51hck04zxvya4iyv9d6i1zkrqyfg10vc0kc3626vnlrn"; depends=[dplyr MASS Matrix quadprog]; }; + evalITR = derive2 { name="evalITR"; version="1.0.0"; sha256="0szrqcvi9x0wqxlyi1qyzpkj4y93qym8295nddip9ncl67kh2w09"; depends=[bartCause caret cli dplyr e1071 forcats gbm ggdist ggplot2 ggthemes glmnet grf haven MASS Matrix purrr quadprog rlang rpart rqPen scales SuperLearner]; }; evalR = derive2 { name="evalR"; version="0.0.1"; sha256="0gb9bi9kfpqv0asbrcz2kdf1grxbjipdq97jmlgbzr5rn9jski01"; depends=[Rcpp]; }; - evaluate = derive2 { name="evaluate"; version="0.21"; sha256="1f92kjlds2nckmsjxx07xm2pikpc9x6hcvc0538xf5w9xsfcjy1i"; depends=[]; }; - evclass = derive2 { name="evclass"; version="2.0.0"; sha256="1pa1vb5lzglq0sdiwy2xgy5b76h43vfdajs346jbmrzm7xvximpj"; depends=[FNN ibelief R_utils]; }; + evaluate = derive2 { name="evaluate"; version="0.22"; sha256="0sz4zimz4brbd9sawdazfgipkmfzzdmdq01b5m8pnrql5xrxhiwh"; depends=[]; }; + evclass = derive2 { name="evclass"; version="2.0.1"; sha256="1v5qnv5nah633s4ibpsigqbd6ydxpr6l8mqwprwjr7khrnckrli4"; depends=[FNN ibelief R_utils]; }; evclust = derive2 { name="evclust"; version="2.0.2"; sha256="107x61vmkfmy3bmcaywz96qj35bmz4nydd0zn9amm2xnbb37lg31"; depends=[FNN limSolve Matrix mclust plyr quadprog R_utils]; }; evd = derive2 { name="evd"; version="2.3-6.1"; sha256="0wc95hfj0gwkyghipdrhwd3s6q2agh9x2wy6y7dr6mjw7wnmjb36"; depends=[]; }; evdbayes = derive2 { name="evdbayes"; version="1.1-3"; sha256="1adlwyr1csjmwcpc7jsywzggpvr3fk500hyahzy774jmgj3j09vh"; depends=[]; }; event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; - eventPred = derive2 { name="eventPred"; version="0.1.5"; sha256="1b3iwp3xs7s786vxhl7zldpxj4y8wl9c2wbq6mgygdzbcl76ydsr"; depends=[dplyr erify flexsurv Matrix mvtnorm numDeriv plotly rlang rstpm2 survival tmvtnsim]; }; + eventPred = derive2 { name="eventPred"; version="0.2.1"; sha256="0za034b2ypf9ll11j1ykhpn64il3nzi2a276qd2ay44vr98jkhgi"; depends=[dplyr erify flexsurv Matrix mvtnorm numDeriv plotly rlang rstpm2 survival tmvtnsim]; }; eventTrack = derive2 { name="eventTrack"; version="1.0.3"; sha256="095xmsb0q32bk52q2130766irbcggbrvcliklaar3qg8v7p3dl4g"; depends=[muhaz survival]; }; eventdataR = derive2 { name="eventdataR"; version="0.3.1"; sha256="04hji0s5vglq60mv4kf368ny749rfr3hqlm78ch1dqh0f0nknk8q"; depends=[]; }; eventglm = derive2 { name="eventglm"; version="1.2.2"; sha256="0f9vmm47g6cfvspil44zki2isd49zy6hx4cvl3vqksj57pbw8g0p"; depends=[geepack sandwich survival]; }; @@ -9406,6 +9417,7 @@ in with self; { evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; evident = derive2 { name="evident"; version="1.0.4"; sha256="1nffcfkny79d3f776p8j4g71cc3n991v56jwjyrg3vkgs05w13cn"; depends=[DOS2 MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; }; evilDice = derive2 { name="evilDice"; version="1.0"; sha256="0lx0h4iav8yazxp50a4cn3g0si3w76r9zdb6n3xbwrjrdnaf3lc6"; depends=[]; }; + evinf = derive2 { name="evinf"; version="0.8.7"; sha256="0y57rraprwf7yzhj6fal9c4x0bp34j5xlgbdqa84fajjd29jjvac"; depends=[doParallel doRNG dplyr foreach generics magrittr MASS mistr MLmetrics pscl purrr Rcpp RcppArmadillo Rdpack rlang stringi stringr tibble tidyr]; }; evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; }; evoTS = derive2 { name="evoTS"; version="1.0.2"; sha256="104lb598rkm17n1as1g32va5aa285b86j4ac3wg4dxp8ckzl738d"; depends=[MASS mvtnorm paleoTS plotly pracma]; }; @@ -9425,8 +9437,9 @@ in with self; { exact2x2 = derive2 { name="exact2x2"; version="1.6.8"; sha256="1wcqgfh859acw5gpcgvvkh40qrjgk07qc4d6w51b51mabcx965wp"; depends=[exactci ssanv]; }; exactLTRE = derive2 { name="exactLTRE"; version="0.1.0"; sha256="0fhzymvsmp1hcq32nwka745jhbf51iyb9hp6ix9rm88kyclcwhrl"; depends=[matrixcalc popdemo]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-35"; sha256="1qv9i57chhz8xiv0j8r47rbigyqs72fa7ssz99inyc0s8gzskd3y"; depends=[]; }; - exactci = derive2 { name="exactci"; version="1.4-2"; sha256="08phqmpj7f6mjbwfnykqmfmg7g9h6ksj3hyryn79d7kwxyh994i7"; depends=[ssanv testthat]; }; - exactextractr = derive2 { name="exactextractr"; version="0.9.1"; sha256="18glacc1v0kj65g6fbqnhvgg83sr334chdfll7nhjnx44my3dkzh"; depends=[raster Rcpp sf]; }; + exactamente = derive2 { name="exactamente"; version="0.1.1"; sha256="0z6r8asbimqr4wvcns5gn9z3bzzy6wqdfibxjyd0avdfx8qw15cl"; depends=[ggplot2 shiny shinythemes]; }; + exactci = derive2 { name="exactci"; version="1.4-4"; sha256="011y7sjsspn02z914c7x2w3h4fg38hlbqwg6s43rnsmrk398q76h"; depends=[ssanv testthat]; }; + exactextractr = derive2 { name="exactextractr"; version="0.10.0"; sha256="1pj3145c20r4hnyyrynzmps96a4fpgn408lrl6b9bs79y33c6zwv"; depends=[raster Rcpp sf]; }; exampletestr = derive2 { name="exampletestr"; version="1.7.1"; sha256="06vyrb6zhzmiwbiwgzjfgzzf04fznjqv5fpfgf06ir1p0wjgrnk6"; depends=[checkmate fs magrittr purrr readr rlang roxygen2 rstudioapi strex stringr styler usethis withr]; }; exams = derive2 { name="exams"; version="2.4-0"; sha256="0g2m51i7lf62hy4v9ns3l7bv3jh367fwi6hgz94iw7n8pjhkh47v"; depends=[base64enc knitr rmarkdown]; }; exams_mylearn = derive2 { name="exams.mylearn"; version="1.4"; sha256="0cswbynd1acrvdwhgg3vlgl80v0qk22kg2hacbc6y08s4367srly"; depends=[exams glue pkgbuild stringi stringr xml2]; }; @@ -9435,15 +9448,14 @@ in with self; { exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; exceldata = derive2 { name="exceldata"; version="0.1.1.2"; sha256="00vc4bc9nxkfzrzafh3fjvkmwglvbcbzbnj5inf5y1zzan4ppf8q"; depends=[dplyr ggplot2 lubridate readxl scales]; }; - excelstrippr = derive2 { name="excelstrippr"; version="0.1.2"; sha256="1ly76qja9b5l3xwfhigm1apd114y2iq5wdl27sd2h1y80n8xxf2v"; depends=[dplyr readxl tidyr]; }; excessmort = derive2 { name="excessmort"; version="0.6.1"; sha256="0qkj30csq96qg7r8vdl79n31dhz69vh49qz4gpb3r2fr32pn497k"; depends=[dplyr ggplot2 lubridate rlang scales tidyr]; }; excluder = derive2 { name="excluder"; version="0.5.0"; sha256="1in27qb5zv5cqscdca8nsdnz7jxglvnfi7is8ilc1791w5ld80m7"; depends=[cli curl dplyr ipaddress janitor lubridate magrittr maps rlang stringr tidyr tidyselect]; }; - excursions = derive2 { name="excursions"; version="2.5.5"; sha256="1ylkjj9hg6rgg6q5k46mrp90g3g8snxkrddlz5czj857lqwdir8j"; depends=[Matrix sp withr]; }; - exdex = derive2 { name="exdex"; version="1.2.1"; sha256="1j3ljbqv1cvxf95yva0ml7dwr8yy98ch697adbvwl8w8l3sjnv3l"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; + excursions = derive2 { name="excursions"; version="2.5.7"; sha256="02pd02c962wzj2lks33yyq4k9knxg3p41sa7chyqj0j6nrr306xp"; depends=[fmesher Matrix sp withr]; }; + exdex = derive2 { name="exdex"; version="1.2.2"; sha256="1b5w9r2nhvl0i6ja5psx64gj7495mnl1gh4z2dz6309xznlk69nn"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; exdqlm = derive2 { name="exdqlm"; version="0.1.3"; sha256="1mflapsbi67jabimqbysr0rcgi8bvn05sgmf5ykr9hmvhs16pf0x"; depends=[brms coda crch dlm FNN GeneralizedHyperbolic HyperbolicDist LaplacesDemon magic tictoc truncnorm]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.2"; sha256="0iqm513h7951q3hg8maf2hbprqmsm93cb3mbg3g91qawpx77494c"; depends=[curl jsonlite plyr rappdirs tibble]; }; - exiftoolr = derive2 { name="exiftoolr"; version="0.2.2"; sha256="108zma98zz47gjdm88l0nisgqsizrksd8s0grpxk5m8754rnpmsn"; depends=[backports curl data_table jsonlite zip]; }; + exiftoolr = derive2 { name="exiftoolr"; version="0.2.3"; sha256="085lgv8nfmlg180ym36r1zyfaka61zzsjs9y60yl4y6a14k81wfs"; depends=[backports curl data_table jsonlite zip]; }; expDB = derive2 { name="expDB"; version="0.1.0"; sha256="0h7f9127vrd45lg7k0bkgq3cghxwv2z11p4pak20pakk13g82hj4"; depends=[DBI dplyr lubridate magrittr png readxl reshape2 rlang RSQLite stringr tibble tidyr tidyverse weaana]; }; expSBM = derive2 { name="expSBM"; version="1.3.5"; sha256="0k8nkwqrcmmhv0x8a2np1rm5cyc9glyvndwdbnp03v0wrg8121sw"; depends=[blockmodels gtools mclust Rcpp RcppArmadillo]; }; expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; }; @@ -9452,12 +9464,12 @@ in with self; { experiences = derive2 { name="experiences"; version="0.1.1"; sha256="1fqcq9jaw79nafm4qqbwm9qg2xlscjcyx3rmk7677xxrz7kywn94"; depends=[cli dplyr huxtable magrittr scales stringr tibble]; }; experiment = derive2 { name="experiment"; version="1.2.1"; sha256="0lzxwpcz7m4wngfw0wyazkhh4icn9zjd8jmgf6ym2zzk3xc4dji1"; depends=[boot MASS]; }; experimentr = derive2 { name="experimentr"; version="0.1.0"; sha256="0ji2031r108rzna00zhsh70kfcnhcscz0an0jv0vvj00hrakl0yr"; depends=[]; }; - expertsurv = derive2 { name="expertsurv"; version="1.1.0"; sha256="0y0j55vrkhp6d46cr4fsh5gqzxhqr6sq8dgn6nagvd8l8c30246c"; depends=[abind BH dplyr flexsurv ggplot2 loo magrittr Rcpp RcppEigen RcppParallel Rdpack rms rstan rstantools scales SHELF StanHeaders stringr survival tibble tidyselect]; }; + expertsurv = derive2 { name="expertsurv"; version="1.3.0"; sha256="0m8p902528z3ih0mzgds0jg8iv885279mmdpv0zhf2wc3hd99ri7"; depends=[abind BH dplyr flexsurv ggplot2 loo magrittr Rcpp RcppEigen RcppParallel Rdpack rlang rms rstan rstantools scales SHELF StanHeaders stringr survival tibble tidyselect]; }; expint = derive2 { name="expint"; version="0.1-8"; sha256="1cn6c84pqf8bgk109qm4znn186h6s6cpll3d11cw144h0vh4yr8j"; depends=[]; }; expirest = derive2 { name="expirest"; version="0.1.5"; sha256="08gwy1fikj7kg7h6fc7w15621jc0prdqdhzx14ad6dvdi5rd33gv"; depends=[ggplot2 rlang]; }; explor = derive2 { name="explor"; version="0.3.10"; sha256="102rjnllk5xxsik42dd8m1rryz5y2h2dwmidy2jy3zlylgc4dhdr"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; }; - exploratory = derive2 { name="exploratory"; version="0.3.13"; sha256="164ykw514gfj185ckg3p8jfn7y5al12iab34fqyrkrqpj84gf1qd"; depends=[data_table DT ggplot2 ggridges lemon lm_beta mediation remotes shiny shinydashboard weights]; }; - explore = derive2 { name="explore"; version="1.0.2"; sha256="11h3a6npnimaidfr8dx1yq872131hd9nyc4igcb49ibrxnhcnc8f"; depends=[assertthat broom dplyr DT forcats ggplot2 gridExtra magrittr MASS rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; }; + exploratory = derive2 { name="exploratory"; version="0.3.31"; sha256="0m8visp57v2bgfbi3n6ywz2z7djd6bnd19hcz0jl2fjw9w5sw3hy"; depends=[data_table DT ggplot2 ggridges lemon lm_beta mediation remotes shiny shinydashboard weights]; }; + explore = derive2 { name="explore"; version="1.1.0"; sha256="02ki798jzcnb7vg99m6fzw2wwmvy2gmsk62cdhh6gr0n2gxw4khy"; depends=[dplyr DT forcats ggplot2 gridExtra magrittr palmerpenguins rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-7"; sha256="1wd03dcqxyi7kyznfq7107ix1bsp7rwzqqv6w7p37pdq2jwlkwi8"; depends=[Matrix]; }; export = derive2 { name="export"; version="0.3.0"; sha256="1b238d6aa1m2pcg7vdjbrvjj748j3fim5zvhng7lgkag2rzjqa56"; depends=[broom devEMF flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; @@ -9470,18 +9482,18 @@ in with self; { extRC = derive2 { name="extRC"; version="1.2"; sha256="0mkvic9nr0asd0g04nlfiy81d7am9a3i65ibxyvbdwsxnf92p8ya"; depends=[MASS]; }; extRatum = derive2 { name="extRatum"; version="1.0.4"; sha256="1w4xfr7ps565xczmn6pr7g4551rj28df1j0y9vckvxdbb4dk1p11"; depends=[dplyr sf tidyr]; }; extRemes = derive2 { name="extRemes"; version="2.1-3"; sha256="0h1w177vz3z58vbqrfbiqapf9z2qsd7gcbv8fnbyn0i5akfz1k71"; depends=[distillery Lmoments]; }; - extendedFamily = derive2 { name="extendedFamily"; version="0.2.2"; sha256="194kn26y40al3w3s2m9iv3r5dp7ylvzsds3ngb9kq02y8hxv8rrn"; depends=[assertthat]; }; + extendedFamily = derive2 { name="extendedFamily"; version="0.2.3"; sha256="1scv5y60xr7sc77yxlsqqgxccc28bmsac23850x75bw3q2hx1cfy"; depends=[assertthat]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; extlasso = derive2 { name="extlasso"; version="0.3"; sha256="01vmnajxc52gk7kj20x8b80lh8qi932g8213mkvvixzsz3ipf689"; depends=[]; }; extraDistr = derive2 { name="extraDistr"; version="1.9.1"; sha256="1gypnbvdzczl0mvznvy8r7hzsvc5gvdvi2mmzj21cqdw9n63944r"; depends=[Rcpp]; }; extrafont = derive2 { name="extrafont"; version="0.19"; sha256="13dbrlf54nbyfz3z2snz7x4m6rfnnhk2l8kkwpgcagzi5lar13sf"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; - extrafrail = derive2 { name="extrafrail"; version="1.7"; sha256="0ddismyamy4lkf42l6m088h6pvzq6619ybv4938ri5vk72p009sp"; depends=[expint msm pracma survival]; }; + extrafrail = derive2 { name="extrafrail"; version="1.8"; sha256="19rj2gykrxcbp1cv07xpfsz29mxsnfc38vrzf3ckqnbyqdp18v39"; depends=[expint msm pracma survival]; }; extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; }; extras = derive2 { name="extras"; version="0.6.1"; sha256="1m807qay8zj4wbghajvmph87rwsjfhra5090adf8i42bif29phwb"; depends=[chk lifecycle]; }; extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; }; extremeIndex = derive2 { name="extremeIndex"; version="0.0.3"; sha256="19zkqabk7n5v4nnwlkxbrym4rf1ljbpblggiqd9s9f6ylir417pv"; depends=[boot evd evir gmm]; }; - extremeStat = derive2 { name="extremeStat"; version="1.5.5"; sha256="0jjarsb45xzdkdca76k7g06c25xq2r3q1ldcxyb0jf26j4lkhi37"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; + extremeStat = derive2 { name="extremeStat"; version="1.5.8"; sha256="1vnjirjiadc116if11caglgvkfkwgrqry8a16as6fzhmfh56wg5h"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.3"; sha256="0ijha5zzmv3qr0czm4qxk28kg3ql5jh3nk9fr0flzl8d9n3z0jx6"; depends=[gWidgets2 gWidgets2tcltk]; }; extremis = derive2 { name="extremis"; version="1.2.1"; sha256="11y3cb5z6vsrpdffdr44afz3is0ikxvpb81a8pwc7p8q63rxq4a2"; depends=[emplik evd MASS]; }; @@ -9492,49 +9504,50 @@ in with self; { eyeRead = derive2 { name="eyeRead"; version="0.0.4"; sha256="0f6knzr4fdipbrvcsk0q9yjvkjjyc4wc252lq2s41gdvj3hv575d"; depends=[data_table tibble tidyr]; }; eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.1"; sha256="14m7l8v0ry1ami1jl0xjp743m1ycklgfwi06vk5amppdp5w3w3qr"; depends=[data_table plyr stringr]; }; eyedata = derive2 { name="eyedata"; version="0.1.0"; sha256="1xnll3x1sm0rv6hq2w22wa9n5qm8r827m7sr3dj54xb1i8j75gj3"; depends=[dplyr]; }; - eyelinkReader = derive2 { name="eyelinkReader"; version="1.0.0"; sha256="0nx2sc3r3mhz13f2xd00h6kd98nv2dyywslxi6l20riss5k6k671"; depends=[dplyr fs ggplot2 Rcpp RcppProgress rlang stringr tidyr]; }; + eyelinkReader = derive2 { name="eyelinkReader"; version="1.0.1"; sha256="0gbppd017dc93g3z3b9l885rr1r470jh7gvi89hd7nn5asba5zgz"; depends=[dplyr fs ggplot2 Rcpp RcppProgress rlang stringr tidyr]; }; eyelinker = derive2 { name="eyelinker"; version="0.2.1"; sha256="0wijd45p6j2qal6wnj7zywks8p9v3m9cmyp7axmk44mrjdjx2i71"; depends=[intervals readr stringi stringr tibble]; }; - eyetrackingR = derive2 { name="eyetrackingR"; version="0.2.0"; sha256="1hpiy84zzsvqqlrw8c7wrcmdggncwf3jq7q6m961lp62d2hhs576"; depends=[broom broom_mixed dplyr ggplot2 lazyeval purrr rlang tidyr zoo]; }; + eyetrackingR = derive2 { name="eyetrackingR"; version="0.2.1"; sha256="0y0aj9p4yhjmf04pi1bmbr4ygx4n2myc1n42fh3nzmy2chcaj959"; depends=[broom broom_mixed dplyr ggplot2 lazyeval purrr rlang tidyr zoo]; }; ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; }; ez_combat = derive2 { name="ez.combat"; version="1.0.0"; sha256="1vpycf6gambwg8218wwjc9h3rhsin7qrhh0mpd3r6n9fp03y634f"; depends=[]; }; ezCutoffs = derive2 { name="ezCutoffs"; version="1.0.1"; sha256="04ah9dbfwl89xi0di0dslaf8a39nynxymm8lbacgd88al5dg7y1n"; depends=[doSNOW foreach ggplot2 lavaan moments progress]; }; ezEDA = derive2 { name="ezEDA"; version="0.1.1"; sha256="1qcgvcjksdajn2rhv52bgqz3n0lnxynjdx4gwhkgsy29ffa0sq2c"; depends=[dplyr GGally ggplot2 magrittr purrr rlang scales tidyr]; }; ezcox = derive2 { name="ezcox"; version="1.0.4"; sha256="0k29c566mysmry8xn2b7chnmacnav0inbiadv1sb0gfmg5yv8zdm"; depends=[dplyr forestmodel ggplot2 magrittr purrr rlang scales survival tibble utf8]; }; ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; }; - ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; }; - ezknitr = derive2 { name="ezknitr"; version="0.6.2"; sha256="15ibkndqx8fbsrckkcj75mflqsryjpmn7qqygp5z1abzgpj05j6n"; depends=[knitr markdown R_utils]; }; + ezknitr = derive2 { name="ezknitr"; version="0.6.3"; sha256="07cznigqndqly24lh3jdk3zq1r4xflivgdfhrh7mmhr83lqy1cha"; depends=[knitr markdown R_utils]; }; ezmmek = derive2 { name="ezmmek"; version="0.2.4"; sha256="0x62nzs1kayv95a6ldav732v79gahrri2khy1w678rxbzfx5wkqy"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr rlang tidyr]; }; - ezplot = derive2 { name="ezplot"; version="0.7.8"; sha256="0vrypps0i9cwg8759scjx0ywv8cbm1hmfm9ldg5if1378dpxzpgg"; depends=[dplyr forcats ggplot2 lubridate rlang]; }; + ezplot = derive2 { name="ezplot"; version="0.7.10"; sha256="1qq47pbwzgyfldiwaz5avxfiplzqjia7vc99m5g5h9y96qm4vxc7"; depends=[dplyr forcats ggplot2 lubridate rlang]; }; ezr = derive2 { name="ezr"; version="0.1.5"; sha256="0r4zq0864xpnmczg1zpaasi348j1fllrn0rqfa5fmjh245chcpd4"; depends=[data_table DT ggplot2 ggridges moments shiny shinydashboard weights]; }; + f1dataR = derive2 { name="f1dataR"; version="1.4.0"; sha256="1azh0ij9a8szgkbsz00nyg5gijk1q1bpd9lphyv3kkg65sap7r8i"; depends=[cachem cli dplyr glue httr2 janitor jsonlite lifecycle magrittr memoise rappdirs reticulate rlang tibble tidyr withr]; }; fANCOVA = derive2 { name="fANCOVA"; version="0.6-1"; sha256="04mw0blgpwdk6wdg8llrig43psgc0vb42cbimvzbnym8v503dsn3"; depends=[]; }; fAssets = derive2 { name="fAssets"; version="4023.85"; sha256="1yrs3mfq8ym5pdmf6236xwnc8176z7j36f2bzrrwdfp7kz2gq0id"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; - fBasics = derive2 { name="fBasics"; version="4022.94"; sha256="1mka9avcdkq4sj40xa15hrjm1f8ppzbvw3yzxbhkbaw9c130qfy8"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; + fBasics = derive2 { name="fBasics"; version="4031.95"; sha256="1d1pbyidng68fcc6vrm98ybklz6yzrinqc2dhg8q6f1pg3kkx6bj"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; }; fCopulae = derive2 { name="fCopulae"; version="4022.85"; sha256="18gjlh254wm2yjyxrhrlbhjp6qvan3yway2m3fb0dqskd6dwmgq2"; depends=[fBasics fMultivar timeDate timeSeries]; }; fDMA = derive2 { name="fDMA"; version="2.2.7"; sha256="02710ynd3y13pkbypmqh7lid9g3xn282kxf59yr5p3d76384z0gg"; depends=[doParallel foreach forecast gplots iterators itertools png psych Rcpp RcppArmadillo tseries xts zoo]; }; fExtremes = derive2 { name="fExtremes"; version="4021.83"; sha256="0i0sabk5clk50r9qk69d0rqzkx95x3x9fnwqr8kx40d7v55s1blb"; depends=[fBasics fGarch timeDate timeSeries]; }; - fGarch = derive2 { name="fGarch"; version="4022.89"; sha256="1v60k30lsdhpilpqwl9yl6mifr6aanwd8bq9byhl9wfmv5xp5a5l"; depends=[cvar fastICA fBasics Matrix timeDate timeSeries]; }; - fHMM = derive2 { name="fHMM"; version="1.1.0"; sha256="0facq4hp670ydkgfli8r0k9k987gc41rvzxyyjpjy9xphcy4yilk"; depends=[cli foreach MASS progress Rcpp RcppArmadillo]; }; + fGarch = derive2 { name="fGarch"; version="4031.90"; sha256="06ilj6nkmc7d4dhbh3zd9f5nyiq4x9win9qkyvcgm5yc8qslnw5z"; depends=[cvar fastICA fBasics Matrix timeDate timeSeries]; }; + fHMM = derive2 { name="fHMM"; version="1.1.1"; sha256="141fvg32fqfn4c6d0sq90pcrynjpfpsdyvd5a1nj870dzqq3369v"; depends=[cli foreach MASS progress Rcpp RcppArmadillo]; }; fICA = derive2 { name="fICA"; version="1.1-2"; sha256="0dqw3qybnpdnvhfh5inkc4011bzhsxvhpv8zzmkm3q5m6hkc6rlg"; depends=[JADE Rcpp RcppArmadillo]; }; fImport = derive2 { name="fImport"; version="4021.86"; sha256="011hrbwxf6v4abxsk4zw26awnh1nxmn3vgsx58awbx2jg6gcc9cj"; depends=[timeDate timeSeries]; }; - fMRIscrub = derive2 { name="fMRIscrub"; version="0.13.0"; sha256="1vmnk9i7wk66q28zp0sxn13vz7n40vm1p3h0pdi7vi1amzaksac9"; depends=[cellWise e1071 expm fMRItools gamlss MASS pesel robustbase]; }; - fMRItools = derive2 { name="fMRItools"; version="0.3.1"; sha256="1gh0p1d7nwv71i18aigfg59hvgicjg9csxd5l0bfckjq0r27kb5p"; depends=[]; }; + fMRIscrub = derive2 { name="fMRIscrub"; version="0.14.4"; sha256="039aiwigsp1gxyrqnpqxf9qhmlq4vzh40ca55hc1dpjas541w4wi"; depends=[cellWise e1071 expm fMRItools gamlss MASS pesel robustbase]; }; + fMRItools = derive2 { name="fMRItools"; version="0.3.3"; sha256="0hbl01hzp503qr2bh1hrgnc3akf0a9lw8ny56vlagb055jsprpdx"; depends=[matrixStats]; }; fMultivar = derive2 { name="fMultivar"; version="4031.84"; sha256="1f54cvl7m064cxkjr0rz84xprrbr76cw12mjmi8wld4ac5a16igc"; depends=[cubature fBasics mvtnorm sn]; }; fNonlinear = derive2 { name="fNonlinear"; version="4021.81"; sha256="1dpzg880wnja357qy3r4v5qbqhx7pkknd0rph75xvvn38p4rc0ca"; depends=[fBasics timeDate timeSeries]; }; fPASS = derive2 { name="fPASS"; version="1.0.0"; sha256="0xrvkcgbzd0xkrxc5p18bhfb5hlf5kxrqyjpy4482bjhr3rr714f"; depends=[dplyr expm face gamm4 gss lifecycle magrittr MASS Matrix mgcv nlme purrr rlang stringr testthat]; }; fPortfolio = derive2 { name="fPortfolio"; version="4023.84"; sha256="0vk9j8yk2nkz28gb2nh1jrfrqk6n77jm0qfa3j1y65l2rbya0rvg"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; + fRLR = derive2 { name="fRLR"; version="1.3.0"; sha256="0kmv3qi3lvbxlqhbmagqqbi4bvd5lf9023hck51vjw265s7yz9m8"; depends=[Rcpp]; }; fRegression = derive2 { name="fRegression"; version="4021.83"; sha256="12xwq90rch8s8jk3m4ckk6bxjf5phwx8hjwxjdsk2r07afvfc2zi"; depends=[fBasics lmtest MASS mgcv nnet polspline timeDate timeSeries]; }; fSRM = derive2 { name="fSRM"; version="0.6.5"; sha256="0qp2pcq01vfgaczd57j4wmzvn4srzlwh7ya3sdp7vwzyb8dbjajn"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="4021.80"; sha256="1ycsa5mw43mdrp4xb39j8n0c393qmmnyc7ncbkcjgyms2xk8fhjh"; depends=[fBasics timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.2"; sha256="1vga322xpqzsh40n74v8vqiq8zbzrabvg58mp50bcx2ml0dikgnm"; depends=[MASS]; }; fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fabR = derive2 { name="fabR"; version="1.1.1"; sha256="0nhxb9qbfy5almbyc6x1cfw3mfncqbx9wsc66780awnppph3bmcv"; depends=[digest dplyr DT fs ggplot2 janitor lubridate purrr readr readxl rlang stringr tidyr tidytext writexl]; }; + fabR = derive2 { name="fabR"; version="2.0.0"; sha256="0m0hj5mpyhy5kqnx9vkr8gf1p5l1aji286yasg8vvczpfyw3hlvp"; depends=[bookdown digest dplyr fs haven janitor lifecycle lubridate purrr readr readxl rlang stringr tidyr usethis writexl xfun]; }; fabisearch = derive2 { name="fabisearch"; version="0.0.4.5"; sha256="0yxmw7d7j3llcfs4d0dn2vv4ajalwz0qxrg7bqgql8dvwrb9jgkh"; depends=[doParallel doRNG foreach NMF reshape2 rgl]; }; fable = derive2 { name="fable"; version="0.3.3"; sha256="0rld2lnhi2wn5skcmx9mwrb2rj1yhphy6xq0m3im252y1zc4bm7v"; depends=[distributional dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; fable_ata = derive2 { name="fable.ata"; version="0.0.6"; sha256="1i596w593xzqlfq4mxw6cafqs9a551mj58ai4l0q7xav44hm9zlq"; depends=[ATAforecasting distributional dplyr fabletools lubridate rlang tibble tsbox tsibble]; }; fable_prophet = derive2 { name="fable.prophet"; version="0.1.0"; sha256="12y2k05plg6d6lgqk6617q6z5m6xz33zdsjh56k86h230qqw68rp"; depends=[distributional dplyr fabletools lubridate prophet Rcpp rlang tsibble]; }; - fabletools = derive2 { name="fabletools"; version="0.3.3"; sha256="1ami14vhm6g1dgcdka6y8qfx5hi0bb6h46sm50lyr6ypzz1yg8zk"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; + fabletools = derive2 { name="fabletools"; version="0.3.4"; sha256="01pjwkxn9v9jgxi3vw5fgl5j74yp2gh5vj7a6vg31ivlgd014jy5"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="1.0.0"; sha256="1y5mzgqvv3hqsbggqiy5f4wj8k3820g2ckc2r60bphmwj70yik7v"; depends=[rlang]; }; fabricerin = derive2 { name="fabricerin"; version="0.1.2"; sha256="0ynvnxzxx1iybyy5pvwfsj5y9jjixyrpji9vcl5fq5mjnpg8mpqk"; depends=[glue htmltools]; }; face = derive2 { name="face"; version="0.1-7"; sha256="08ri7mrp3az82x3yyydg7vrla8cdl8bxpcnxfv4cfdhxslks9qb7"; depends=[Matrix matrixcalc mgcv]; }; @@ -9550,22 +9563,21 @@ in with self; { factor_switching = derive2 { name="factor.switching"; version="1.3"; sha256="1hd2m9yyk9vbpknm7gyhgr6ywv84a1q5w46cspxp92nal784b5x3"; depends=[coda HDInterval lpSolve MCMCpack]; }; factorial2x2 = derive2 { name="factorial2x2"; version="0.2.0"; sha256="045887hwknwm92wlrp0jlvxj5aal50vpnc7ddbh7c8smawmrdwfd"; depends=[mvtnorm survival]; }; factormodel = derive2 { name="factormodel"; version="1.0"; sha256="0yvp8mk42hi1vhrw29djabndc8pbbpjbr6bwss95wsmk7zvvf6i2"; depends=[dplyr gtools nnet pracma]; }; - factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; - factorstochvol = derive2 { name="factorstochvol"; version="1.0.1"; sha256="0wf3rng4fsi22z7qbqqvn74wwymr1ga2qimjlly63yg78lv676ca"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; + factorstochvol = derive2 { name="factorstochvol"; version="1.0.6"; sha256="1f22qxskk4hgsx9ic7v89rvjv1pdsijpakw0j4x2wya10dfrj9rp"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; }; factset_analyticsapi_engines = derive2 { name="factset.analyticsapi.engines"; version="3.0.1"; sha256="0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms"; depends=[caTools httr jsonlite R6 rlang]; }; factset_protobuf_stach_v2 = derive2 { name="factset.protobuf.stach.v2"; version="1.0.6"; sha256="1w6fsamkz8g9mkjd2my5wdv52fav8ikp3jlfil8amfbclmhdbx22"; depends=[R6 RProtoBuf]; }; - factset_protobuf_stachextensions = derive2 { name="factset.protobuf.stachextensions"; version="1.0.3"; sha256="1v1sizb95x2h6zcxzi0ib5nbbfiki8qsj4lp41ap6xp6qr6fwn0f"; depends=[jsonlite R6 stringr]; }; + factset_protobuf_stachextensions = derive2 { name="factset.protobuf.stachextensions"; version="1.0.4"; sha256="1bs39wylva1zpa8m3b0sdrdszqqxszl1rlwyli400a9zcm7xpwvq"; depends=[jsonlite R6 stringr]; }; fad = derive2 { name="fad"; version="0.9-1"; sha256="19j8n13r50sc1srpi4vj58h15yp89im2x7ga5323rmwklx1yj6zg"; depends=[Matrix Rcpp RcppEigen RSpectra]; }; faersquarterlydata = derive2 { name="faersquarterlydata"; version="1.1.0"; sha256="0qld9d56qwcs6xh1248b7ssarwfqk8rvipiflzhpcy5fb4gzh43i"; depends=[data_table dplyr stringr tableone tibble tidyr xml2]; }; fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; - fairadapt = derive2 { name="fairadapt"; version="0.2.5"; sha256="0pxv7xz8r8kls5mm6dcxzqg5z2y3jhs8pnzbw34h1lyj16zb20b2"; depends=[assertthat cowplot ggplot2 igraph qrnn quantreg ranger scales]; }; + fairadapt = derive2 { name="fairadapt"; version="0.2.7"; sha256="19jagj8kva94kfvg9c5aqr0vm5swjq79j3ny307wacgb9g8hkhvm"; depends=[assertthat cowplot ggplot2 igraph qrnn quantreg ranger scales]; }; fairml = derive2 { name="fairml"; version="0.8"; sha256="17rzg2256nb4xnrzkc8c3fiwbwqf8fr69rk5k08wrbrnjr2c05dg"; depends=[glmnet]; }; fairmodels = derive2 { name="fairmodels"; version="1.2.1"; sha256="0wxk2z5xh2dc9m9z6dz8cq911n4fd4a5zl03bg32nh05zq09xhwp"; depends=[DALEX ggplot2 patchwork scales]; }; fairness = derive2 { name="fairness"; version="1.2.2"; sha256="12jf2p8gmj5d6r9h9cwy208qwyqi606b54v0d99vpr171yijqvqk"; depends=[caret devtools e1071 ggplot2 pROC]; }; fairsubset = derive2 { name="fairsubset"; version="1.0"; sha256="0iw16fs2mb9p14vr34izw3sirbndyy8w07df3scy7gkkcx2nz2bz"; depends=[matrixStats]; }; fake = derive2 { name="fake"; version="1.4.0"; sha256="1w852a5ywybsdyvlll2dvrj17isjmiwjwhi43vml7j1k0lv9m86v"; depends=[huge igraph MASS Rdpack withr]; }; - fakemake = derive2 { name="fakemake"; version="1.11.0"; sha256="1y8njj26qmr4v4gw63dsh5dzlc703pa1xxby8h6ivbwvg1nmcbnv"; depends=[fritools igraph MakefileR]; }; + fakemake = derive2 { name="fakemake"; version="1.11.1"; sha256="1ykav6z3pm54zrp7afkxlfidx9bgdjslzsnjzbx6vl7r479z6ql7"; depends=[fritools igraph MakefileR]; }; fakir = derive2 { name="fakir"; version="1.0.0"; sha256="1xya74qf68k3jcb7fk868j6c92axmm5vd5mgf9vzk4w4lm065q7l"; depends=[attempt charlatan dplyr glue lubridate magrittr purrr tibble tidyr withr]; }; fakmct = derive2 { name="fakmct"; version="0.1.0"; sha256="172g7gx6019bimfg4lm253sp9c7rcmm56c5wmxv1g575fr393n8k"; depends=[]; }; falcon = derive2 { name="falcon"; version="0.2"; sha256="09hlvwwj3k3nhcsxijjvv8x74a9m200ayjjplrp4baxvczwyq341"; depends=[]; }; @@ -9579,7 +9591,7 @@ in with self; { fangs = derive2 { name="fangs"; version="0.2.13"; sha256="11jcj9mk20lmqdwl5cczki5kzx4fdrci8xjg6g401ca1m00hhb1v"; depends=[]; }; fanovaGraph = derive2 { name="fanovaGraph"; version="1.5"; sha256="1hffda52yk24slbgsfdgkpg3vsryfnhlw09r39cbyz483i7xd8d0"; depends=[DiceKriging igraph sensitivity]; }; fanplot = derive2 { name="fanplot"; version="4.0.0"; sha256="08zd2af26ah1rdkzxi1sv4c4l06jpxd6m38q3xy657k2jm90rkkc"; depends=[]; }; - fansi = derive2 { name="fansi"; version="1.0.4"; sha256="17y4m4yy8d6j6rlql2bpigcyn6yfv2g2aaaj96xjp4j0di722qri"; depends=[]; }; + fansi = derive2 { name="fansi"; version="1.0.5"; sha256="1xi35schbz42kjwjzhjqj12nd053962mgnk6qd9k5m5zgwsww5n6"; depends=[]; }; faoutlier = derive2 { name="faoutlier"; version="0.7.6"; sha256="0dd8k5s0yv047p10jisqz13nflby4y0dg97r0nbjygzcq1ryx2bs"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; }; faq = derive2 { name="faq"; version="0.1.1"; sha256="0knajqm9ydsjhn6xymfrcyf2b1kgfbiai8ai2zlm7p4mgfry504h"; depends=[htmlwidgets jsonlite]; }; far = derive2 { name="far"; version="0.6-6"; sha256="0p0731vg1y57z8dmbrsa5gbnpf754q8yi5mm5h9480x1f8nk38bi"; depends=[nlme]; }; @@ -9605,7 +9617,7 @@ in with self; { fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.2.1"; sha256="04hv4jdhan1vbsixzbifa7hpmc531gv7c2dd1fx5700c2wlkja1n"; depends=[Matrix]; }; fastOnlineCpt = derive2 { name="fastOnlineCpt"; version="1.0"; sha256="0grkgj8kwqblikgw5pg4vdp41qd9s4cd7dzih3ima31fdw8ssi3c"; depends=[Rdpack]; }; fastR2 = derive2 { name="fastR2"; version="1.2.2"; sha256="0s0nff8j0lxby3v8wr388dgry3kais58p8dbygfy15zppcnixkh6"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; }; - fastRG = derive2 { name="fastRG"; version="0.3.1"; sha256="0dh8f8771p6xardflsxbnlrzgn783mrbgrfyxb4z404xdyy5abhg"; depends=[ellipsis glue igraph Matrix RSpectra tibble tidygraph]; }; + fastRG = derive2 { name="fastRG"; version="0.3.2"; sha256="1ig6z8azl2vsl79nfs3s4f9v1f6f27vzc0kxb9zmvkpx3hfnlm7k"; depends=[dplyr ellipsis ggplot2 glue igraph Matrix RSpectra tibble tidygraph tidyr]; }; fastRhockey = derive2 { name="fastRhockey"; version="0.4.0"; sha256="1xw4ylrsf9wylym79svazrmw2c9fmqk8n0sz1vypsm29dsic879k"; depends=[cli data_table dplyr glue httr janitor jsonlite lubridate magrittr progressr purrr Rcpp RcppParallel rlang rvest stringr tibble tidyr]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; }; fastText = derive2 { name="fastText"; version="1.0.3"; sha256="1kb0ig17rq4iyqqlppf39ixgfqgm22wmv27xji2rknsq9df3c4kr"; depends=[data_table ggplot2 glue Rcpp]; }; @@ -9615,9 +9627,11 @@ in with self; { fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; }; fastadi = derive2 { name="fastadi"; version="0.1.1"; sha256="1hvi430ws1yzw10fp4z177wc1bnj11pxmvjsbmx0p54bcbb3a32a"; depends=[ellipsis glue logger LRMF3 Matrix Rcpp RcppArmadillo RSpectra]; }; fastai = derive2 { name="fastai"; version="2.2.1"; sha256="1glq64hhwrwp29scf851nb6nl83hpvvy8cj37z2r36r89i5inp4b"; depends=[generics ggplot2 ggpubr glue png reticulate]; }; + fastbeta = derive2 { name="fastbeta"; version="0.1.0"; sha256="0jbvbdq3hdmp01wz9y1nidfzm80m3d0gdz6p8wi0wm32zxxh4c3q"; depends=[adaptivetau deSolve]; }; fastcluster = derive2 { name="fastcluster"; version="1.2.3"; sha256="009amz7i5yndqw2008fgd3p11n4fsb291k2ypg3pip6dw4lr28hz"; depends=[]; }; fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; }; fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; }; + fastcpd = derive2 { name="fastcpd"; version="0.9.0"; sha256="0i68411h1cdh4jpz8a7fg0ns1zvwdn7zpbarciy0swldq8v43xi1"; depends=[DescTools fastglm glmnet Matrix Rcpp RcppArmadillo testthat]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; }; fasterize = derive2 { name="fasterize"; version="1.0.4"; sha256="1ckxi2iyxdahhgbliblcrkzziblfagzr54srjk27yp1lcgivvvs4"; depends=[raster Rcpp RcppArmadillo sp]; }; @@ -9625,28 +9639,26 @@ in with self; { fastkmedoids = derive2 { name="fastkmedoids"; version="1.2"; sha256="1z98ndxhq2ag870g0xqkw04b4k722994vh0pq46bw8bqc9v7bpkk"; depends=[Rcpp]; }; fastlogitME = derive2 { name="fastlogitME"; version="0.1.0"; sha256="1wpbcjb3ncxl904492alikslnqg53zgx6psxx7qllspd43s8ymv7"; depends=[]; }; fastlogranktest = derive2 { name="fastlogranktest"; version="0.2.1"; sha256="1j5mgvi3nwnlarj31cknx2cikypql370qds2h0877vmm80942z25"; depends=[BH Rcpp]; }; - fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; fastmap = derive2 { name="fastmap"; version="1.1.1"; sha256="0wvibiy16i30nzg5k80md68lpz7g6iwbl02j4fyqmbhns2fq08rn"; depends=[]; }; - fastmatch = derive2 { name="fastmatch"; version="1.1-3"; sha256="0qcq1gwl9pijgp34giyq5y9rk0ly3d7xza2b7r68xx63ifqa1vqx"; depends=[]; }; - fastmatrix = derive2 { name="fastmatrix"; version="0.5"; sha256="04izdin7qv04mc1ssjj7n5am4wi6abwyvdxvvgln2la2k0d2apzv"; depends=[]; }; + fastmatch = derive2 { name="fastmatch"; version="1.1-4"; sha256="0symkcmyrqvz6hkawr40ga808rb3w4hy9ssfsi5ri8hykjn4r4cs"; depends=[]; }; + fastmatrix = derive2 { name="fastmatrix"; version="0.5-7"; sha256="1c60fzk3wz4nigbws9gwzvnlip9vkg14lmazh043xbp6rjpn3dnw"; depends=[]; }; fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; }; fastnet = derive2 { name="fastnet"; version="1.0.0"; sha256="1c07msypxj8ilpa1il9jjbgylwpdxv8j8gak362xdmbm4b1bwlm6"; depends=[doParallel foreach igraph tidygraph]; }; fastpos = derive2 { name="fastpos"; version="0.5.1"; sha256="0a55fydlcn2h27vizv4w3gma26v2a32li81x09hvk519yfy8ph1k"; depends=[lifecycle MASS pbmcapply plyr Rcpp RcppArmadillo RcppProgress tibble]; }; - fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.3"; sha256="15pzjvg1dqkclg28hxyw6xacwk36xkrimbbhcxh5s2hws0jrwqk5"; depends=[dplyr ggplot2 gridExtra magrittr readr rlang rmarkdown rvest scales tibble tidyr xml2]; }; fastqq = derive2 { name="fastqq"; version="0.1.3"; sha256="0009s32zgvm7nnd0zx7rqcvsdfjh27xhlnnrsafbxcxslc3wy496"; depends=[Rcpp]; }; fastrep = derive2 { name="fastrep"; version="0.7"; sha256="08hzrh812033ds9chw6i0n4jdnr2nm4rjx3drrgjv9i2blirbmnp"; depends=[dplyr ggplot2 janitor kableExtra lifecycle magrittr purrr tidyr]; }; fastrmodels = derive2 { name="fastrmodels"; version="1.0.2"; sha256="1333546nk429l6s4icbmx8hmh29wsc252wbmmhsmgb116l4ra9zi"; depends=[xgboost]; }; fastshap = derive2 { name="fastshap"; version="0.1.0"; sha256="112hc585aryzc5pgvr3qaa7arlx2h2sj9jlq9xha3nncyzqkh7c6"; depends=[foreach Rcpp RcppArmadillo]; }; fasttime = derive2 { name="fasttime"; version="1.1-0"; sha256="00290sxfa6nihahm3s9bslpsmyfm0cpziajmr9mg7grxrzx53ia6"; depends=[]; }; - fastverse = derive2 { name="fastverse"; version="0.3.1"; sha256="1i2gvvzcbgvg0xpakbyamkrf0f9kanrgzyna2nwy3wn4js8c5jhh"; depends=[collapse data_table kit magrittr]; }; + fastverse = derive2 { name="fastverse"; version="0.3.2"; sha256="10k749zff9nhrwgyvc1fvpp34mncc7958z35y2v5sb08my2x26r0"; depends=[collapse data_table kit magrittr]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.5"; sha256="08bbd17aqmfcacvk283bpf9cp1isf5pgfdciwxn0f7ahdzd81g4s"; depends=[kinship2 multgee]; }; faux = derive2 { name="faux"; version="1.2.1"; sha256="143yc71cfsxnczi719ygrsynxry60nh8263gg8vwp3qrc80j80lh"; depends=[dplyr ggplot2 jsonlite lme4 rlang truncnorm]; }; fauxnaif = derive2 { name="fauxnaif"; version="0.7.1"; sha256="1d2sfcknlaa4m3sq3cg65iq17x3ax0zgkgxkcyin3d8r3sw9k3p6"; depends=[cli rlang]; }; fauxpas = derive2 { name="fauxpas"; version="0.5.2"; sha256="1xhyws6nr9ayir4sykvhyaf1aprx9rjm2xyb3p5ikd26l5hp7l44"; depends=[httpcode R6 whisker]; }; - faviconPlease = derive2 { name="faviconPlease"; version="0.1.2"; sha256="0vc2c7mj8igq4nbs9ass8s33rjc4bkly0y9c2x7vh82hajbzrvwn"; depends=[xml2]; }; + faviconPlease = derive2 { name="faviconPlease"; version="0.1.3"; sha256="1q9519y4c5jj0w98yxv51dc7zskxnyjc4fmmi6l47j724cp67gmq"; depends=[xml2]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; - fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; + fbRads = derive2 { name="fbRads"; version="17.0.0"; sha256="0kfbd0dc0k72qj5vd1bm11lqi6p61z7fmr8507fsc6ggcr97vw76"; depends=[bit64 data_table digest jsonlite logger plyr RCurl]; }; fbar = derive2 { name="fbar"; version="0.6.0"; sha256="005725xiz6k868hrj12ryq3xlyin2r94n0yychimjzhfsppx2zba"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; }; fbati = derive2 { name="fbati"; version="1.0-7"; sha256="1w1yvv93yzvkqhq9w1c05bwqy3kr08b4bxzzvy0x03zdild10bly"; depends=[fgui pbatR rootSolve]; }; fbnet = derive2 { name="fbnet"; version="1.0.3"; sha256="0jz3jbd2qna4mnas0mjs32wvlk6vzlw61qb9fql65al40401b23x"; depends=[assertthat igraph paramlink Rsolnp]; }; @@ -9658,6 +9670,7 @@ in with self; { fcci = derive2 { name="fcci"; version="1.0.1"; sha256="02q6q0q7fqdbp20fdf33jbkh0aj9nzl6dwysr0nn146ciz3vqgin"; depends=[assertthat Rcpp rlang]; }; fcfdr = derive2 { name="fcfdr"; version="1.0.0"; sha256="16mnpr64x00qwbgq9pw69k941yb0i7mx7ncsilahicprxqyfpfww"; depends=[bigsplines cowplot data_table dplyr fields ggplot2 hexbin Hmisc locfdr MASS polyCub spatstat_geom]; }; fcirt = derive2 { name="fcirt"; version="0.1.0"; sha256="1wiyiz51mkm5kd95xmpvlwng51awpp4y133dd5q88mnafrxyij1h"; depends=[BH numDeriv Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + fcl = derive2 { name="fcl"; version="0.1.0"; sha256="0rskl9q7z5k5q17m3c5w4pdc96m6fdag7nkkjmyyh43wbm4bjb0a"; depends=[xts ymd]; }; fclust = derive2 { name="fclust"; version="2.1.1.1"; sha256="1d5qa30jlx6qn6npvccl97fcmh5a4wf3nw0d7jvn3y7mcb5yqlqk"; depends=[MASS Rcpp RcppArmadillo]; }; fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; }; fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; }; @@ -9668,16 +9681,18 @@ in with self; { fda = derive2 { name="fda"; version="6.1.4"; sha256="0595887hv80blx9aq63qnmc9vr022p21zqhgp2wmdjvq1g68x0g2"; depends=[deSolve fds]; }; fda_usc = derive2 { name="fda.usc"; version="2.1.0"; sha256="1s13zssm7x3hg1k928r5jkjz35bflb1nzz4c7b4xr0x1j8qg3d60"; depends=[doParallel fda foreach iterators kSamples MASS mgcv nlme]; }; fdaACF = derive2 { name="fdaACF"; version="1.0.0"; sha256="0qrsj25p6h2xg25v0ayk8x31d4whyy0mpf2xdpw3hcwhb71mbfhn"; depends=[CompQuadForm fda pracma vars]; }; - fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; + fdaMixed = derive2 { name="fdaMixed"; version="0.6.1"; sha256="1fv5jdz7ri9cf5wj0p0gdc60r75biifijqr1g3lz095cxsn7f9j0"; depends=[Formula Rcpp RcppArmadillo]; }; fdaMocca = derive2 { name="fdaMocca"; version="0.1-1"; sha256="0y54d8a38d5hjnh8iw2r4zl2d2xz72hjddhxbar91jk6zf3kzpsy"; depends=[doParallel fda foreach Matrix mvtnorm]; }; fdaPDE = derive2 { name="fdaPDE"; version="1.1-16"; sha256="0z5plkig2df8scvx07wmd4f0w0pp1ddfafg70shcic6lahg2xk27"; depends=[Matrix plot3D Rcpp RcppEigen rgl]; }; fdaPOIFD = derive2 { name="fdaPOIFD"; version="1.0.3"; sha256="0c773hidrg69gs9lzdcwf4hzzmid3kwf73pw6c807y1b4lgiai20"; depends=[FastGP fdapace ggplot2 magrittr MASS patchwork reshape2 tibble]; }; + fdaSP = derive2 { name="fdaSP"; version="1.1.1"; sha256="1vhnrw2shxnpd2vnqkjq8lqx344p3z488x8wzpkb8hxnxzmfp08w"; depends=[doParallel foreach ks pracma Rcpp RcppArmadillo Rdpack]; }; fdacluster = derive2 { name="fdacluster"; version="0.3.0"; sha256="0mpnhd6qp4hif1sbxv52dyg3yfff8icn8xz7sximcjn00g81p343"; depends=[cli cluster dbscan dplyr fdasrvf forcats furrr ggplot2 lpSolve nloptr progressr purrr Rcpp RcppArmadillo rlang tibble tidyr withr]; }; - fdaconcur = derive2 { name="fdaconcur"; version="0.1.0"; sha256="1xlhn9di70z49y79l2pwffqykmz8j5p09hihhf6rsbsrjy42nwbv"; depends=[fdapace]; }; + fdaconcur = derive2 { name="fdaconcur"; version="0.1.1"; sha256="0i0wvaplcfl021hjh6f6qlimx0hrsxq18l8v4j2bvrnsr3allj60"; depends=[fdapace]; }; fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; }; + fdaoutlier = derive2 { name="fdaoutlier"; version="0.2.1"; sha256="0jxq46ch0sddl08n2i71zwx2d6qdxayb012qkrc8pki2rvkcqy77"; depends=[MASS]; }; fdapace = derive2 { name="fdapace"; version="0.5.9"; sha256="16j731d7y290xk5qvld59pb78mrch5i61szcf3j79kkirmz6hh8f"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; fdapaceShiny = derive2 { name="fdapaceShiny"; version="1.0.5"; sha256="1cy1rcmsyr78q3wqkaw3lvqzlr07n7djrqqpwm3y8xz60fybs8p6"; depends=[bs4Dash config dplyr DT fdapace ggplot2 golem htmltools magrittr plotly purrr reshape2 shiny shinyjs shinyWidgets stringr tidyr]; }; - fdasrvf = derive2 { name="fdasrvf"; version="2.0.2"; sha256="1q7zk9cic1lbpsgv52gpz0y8ifb4ac0654n7imfv2nj4d2vnz0lb"; depends=[cli coda doParallel fields foreach lpSolve Matrix mvtnorm Rcpp RcppArmadillo rlang tolerance viridisLite]; }; + fdasrvf = derive2 { name="fdasrvf"; version="2.0.3"; sha256="1m9wn9lbpg7ib3clqydcnrclrjw4yany0cmhmvvkar1dk8r0qar9"; depends=[cli coda doParallel fields foreach lpSolve Matrix mvtnorm Rcpp RcppArmadillo rlang tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1.1"; sha256="13sd85ypx2z07qxsqhsbc5w0yasf01yw06qx91ymh0yr8538x3x3"; depends=[fda]; }; fddm = derive2 { name="fddm"; version="0.5-2"; sha256="0sh3qnsakl02wpzwhxyqdikn7xx5crh401w3d149ww2jxvagjmsf"; depends=[Rcpp]; }; fdicdata = derive2 { name="fdicdata"; version="0.1.0"; sha256="1zz8wd124bbjn2fjllq8hc00r475w96bcaphcgxbqr9hfzzjpg2f"; depends=[dplyr httr yaml]; }; @@ -9712,12 +9727,12 @@ in with self; { fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; ferrn = derive2 { name="ferrn"; version="0.0.2"; sha256="0yxw18yzj5j2fpj4rf9flmmng4s2ldgx4yaywa2hrclbnl43c578"; depends=[dplyr geozoo gganimate ggforce ggplot2 ggrepel magrittr purrr rlang scales stringr tibble tidyr tourr]; }; fertilmodel = derive2 { name="fertilmodel"; version="1.1"; sha256="0q0mf8n3fc53bqjsv5c4mcfm4vjhyy2hw8rh1bsjsj71xmih50a4"; depends=[quadprog]; }; - fetch = derive2 { name="fetch"; version="0.1.2"; sha256="06jwa4rkjkiylqfnkvvvk2g72m8889hm8w2rk36ggji0vy2cdywz"; depends=[crayon foreign haven readr readxl tibble]; }; + fetch = derive2 { name="fetch"; version="0.1.3"; sha256="1q1rwfk4j8fvgxjhjpzdg6d0klcd39g55lcwhaznsj66ixwib84i"; depends=[crayon foreign haven readr readxl tibble]; }; fetchGoogleAnalyticsR = derive2 { name="fetchGoogleAnalyticsR"; version="0.1.0"; sha256="12s18jicx9rd5dhc8l7hm09lr71nhz6k72j3w4c1j5ds9h522krg"; depends=[jsonlite]; }; fetchSalesforceR = derive2 { name="fetchSalesforceR"; version="0.1.0"; sha256="1826i031wndasgcxxa0bh88vp1r49flzphyfk79pixvlrfjn6gi8"; depends=[jsonlite]; }; ff = derive2 { name="ff"; version="4.0.9"; sha256="0krwxq4985x3n5mzx8i9smwpkd5sifbfgy9z7ikwk84734km683j"; depends=[bit]; }; - fflr = derive2 { name="fflr"; version="2.1.0"; sha256="0982h1r2hjn54xvnkxn999r4hlgxm6c1xw98hvnpa4zhk7959wsw"; depends=[httr jsonlite tibble]; }; - ffmanova = derive2 { name="ffmanova"; version="1.1.1"; sha256="19kdlcslqnwcsdjxx0n86is5cjz21sn8vpylyq8s4i7q7nrlyxwp"; depends=[]; }; + fflr = derive2 { name="fflr"; version="2.2.0"; sha256="0bwifa7xmc9hnkjc3ddxq1hz4w46v7ii4c7vagzkdslp2k0877g9"; depends=[httr jsonlite tibble]; }; + ffmanova = derive2 { name="ffmanova"; version="1.1.2"; sha256="08paiz94vhyiqaihpg3y9z3cbk9k5mlwwv8f1fs9mis3rv8wabvc"; depends=[]; }; ffp = derive2 { name="ffp"; version="0.2.2"; sha256="05mzhg2hj51x8588nvwqamvrgd24haxw4mq7qn62zaznvxnwsr3m"; depends=[assertthat crayon dplyr forcats ggdist ggplot2 lubridate magrittr mvtnorm NlcOptim nloptr purrr rlang scales stringr tibble tidyr vctrs]; }; ffscrapr = derive2 { name="ffscrapr"; version="1.4.8"; sha256="0dxr7w64wjw1i1bspdj641m1dmgz85bgdapf2k2wba077zkmhhv4"; depends=[cachem checkmate cli dplyr glue httr jsonlite lifecycle magrittr memoise nflreadr purrr rappdirs ratelimitr rlang stringr tibble tidyr]; }; ffsimulator = derive2 { name="ffsimulator"; version="1.2.3"; sha256="0vl8sr32l5l4v6jb59ch98fg850d6w8zqqy2v8zay7v04qwbwqiz"; depends=[checkmate cli data_table ffscrapr glue magrittr nflreadr Rglpk rlang tidytable]; }; @@ -9739,16 +9754,16 @@ in with self; { fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; fidelius = derive2 { name="fidelius"; version="0.0.2"; sha256="18dsw069j3jzl0splgjjdsybny1hq0dmiyygri8nlfwshijkw15h"; depends=[askpass fs htmltools readr rlang rmarkdown rstudioapi sodium whisker]; }; fido = derive2 { name="fido"; version="1.0.4"; sha256="0drzxg6aj9rpszlg8cg1rjwk7nnz9np56zkddbd2pxkznsq8j8ni"; depends=[BH dplyr ggplot2 purrr Rcpp RcppEigen RcppNumerical RcppZiggurat rlang tidybayes tidyr]; }; - fields = derive2 { name="fields"; version="14.1"; sha256="0d2lm4s9p3rv676z291fynpx3vdmi6cikcqlj23fxlj34icwbi2p"; depends=[maps spam viridis]; }; + fields = derive2 { name="fields"; version="15.2"; sha256="0gdddigzbzlhrbp6h2ma5b05m68pmggrkcd80hzgjbjj64ihy9qz"; depends=[maps spam viridisLite]; }; fiery = derive2 { name="fiery"; version="1.2.0"; sha256="12mw8rha0mmv6r2s42k4gddafsnff29ijwsxyhcn0nc48qqniszd"; depends=[cli crayon future glue httpuv later parallelly R6 reqres rlang stringi uuid]; }; fig = derive2 { name="fig"; version="1.0.0"; sha256="1mzvng4r4xmkmbl55pspjk9bcvkri96vkmjaqkjn8nqxv39sy1pr"; depends=[R6]; }; - figir = derive2 { name="figir"; version="0.1.6.8"; sha256="0jbl6bxms4g6m3qamcgl5z0k57f2r3444577hi78gpsbwwx0n022"; depends=[]; }; + figir = derive2 { name="figir"; version="0.1.7.0"; sha256="1vkx9q889lcm62101qsbq1yb542y1b3b7gc23xf57vwp2h1wfb84"; depends=[]; }; figma = derive2 { name="figma"; version="0.2.0"; sha256="0031sz7nbnlhv9iqaandq9sscxsy29p82s3c63z89jin4dkfjq4x"; depends=[dplyr httr purrr rlang tibble tidyr]; }; figpatch = derive2 { name="figpatch"; version="0.2"; sha256="0sy63131al6z0hlhpb11aphlxdigb0pqk9bq9mxc9nbc59036jjq"; depends=[ggplot2 magick magrittr patchwork]; }; figuRes2 = derive2 { name="figuRes2"; version="1.0.0"; sha256="1s1bvhgzczkpxfmi1cyz4cfvpxvq28fm5867a4w5q0wpjcbhlma4"; depends=[ggplot2 gridExtra gtable plyr reshape2 scales stringr survival]; }; file2meco = derive2 { name="file2meco"; version="0.6.0"; sha256="02kbpyfzr98ra55mbw7l9d1haz8p97fwbn5knglz7875b5knqx4b"; depends=[ape dplyr magrittr Matrix microeco rhdf5 tidyr yaml]; }; filearray = derive2 { name="filearray"; version="0.1.6"; sha256="1xf48fgf70s9h5gjls8625m553lkdbinnz89nxn05l9wakhf5qgv"; depends=[BH digest fastmap Rcpp uuid]; }; - filebin = derive2 { name="filebin"; version="0.0.5"; sha256="1k13vwppk3f3acnyz32wrjmr80x0lbdzv0sx74xr87n1kbrrv5fn"; depends=[dplyr httr janitor logger purrr stringi tibble tidyr]; }; + filebin = derive2 { name="filebin"; version="0.0.6"; sha256="006fj66y9sb9i58na85bpv1ilwka9vcwmqkwpc3ax95vigy36n5j"; depends=[dplyr httr janitor logger purrr stringi tibble tidyr]; }; filehash = derive2 { name="filehash"; version="2.4-5"; sha256="0b52bnsqp65s3r4aw9mvfwfnjmsrqq8ndcadwig547nn9mwy47iv"; depends=[digest]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-6"; sha256="1758wpzq2h7biwpdlrqhi84k35fbpfpxnji6j79zisr825fqjkpq"; depends=[DBI filehash RSQLite]; }; filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; }; @@ -9762,13 +9777,14 @@ in with self; { filterNHP = derive2 { name="filterNHP"; version="0.1.2"; sha256="0kk6548nr5786ywa83v8by4c1n7ljh9sy4fshpfqizp49fv9zv22"; depends=[data_tree rclipboard shiny shinyBS shinyjs shinyWidgets]; }; finalfit = derive2 { name="finalfit"; version="1.0.6"; sha256="16jbmzs5hx328vvggk5g3q5rmyaf82dmxgifjv28w2lb80ryjay1"; depends=[bdsmatrix boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr tidyselect]; }; finalsize = derive2 { name="finalsize"; version="0.2.0"; sha256="18nyyl8c121kfr22vanvgbma627w98v39d4n34kr8hd8iw8jx5lx"; depends=[checkmate Rcpp RcppEigen]; }; - finbif = derive2 { name="finbif"; version="0.9.1"; sha256="1iqhriahhmdil6xmns3a7srkyx8sxwhl7p58kbym46sdlwwvp705"; depends=[digest httr lubridate lutz]; }; + finbif = derive2 { name="finbif"; version="0.9.3"; sha256="122jhz1xvf75y61nwjlvclcrkqb1ya8yfzb3qimi0ylz8c3xfw78"; depends=[digest httr lubridate lutz]; }; finbipartite = derive2 { name="finbipartite"; version="0.1.0"; sha256="0sws39nya8y7v78v4nlaz5g2nj4sgq5n5iwhfkyyq6h87slw2h8c"; depends=[CVXR MASS mvtnorm progress quadprog spectralGraphTopology]; }; finch = derive2 { name="finch"; version="0.4.0"; sha256="0q7riaxms460c6z2gb8i0q4pb348bnvry46bjd7pb9mh8fnl1i8b"; depends=[data_table digest EML hoardr xml2]; }; findInFiles = derive2 { name="findInFiles"; version="0.4.0"; sha256="1saxi8l4006wwxrw18g7wx0pj7l427a2rnb723k0irlhvq0icgwq"; depends=[crayon htmlwidgets shiny stringi stringr tibble vctrs]; }; findInGit = derive2 { name="findInGit"; version="0.1.1"; sha256="1j5mvp34nsczmvp5jx7c9gp20q7aqaxrqm2zvj8aq31rc8mfaxk9"; depends=[crayon htmlwidgets stringr]; }; findPackage = derive2 { name="findPackage"; version="0.2.0"; sha256="0g6i512ls79hg0ck0frhadpxvvayzbdcj48rbpawhc5bphjsbcfx"; depends=[]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; + findSVI = derive2 { name="findSVI"; version="0.1.2"; sha256="1m40v46gl34dhndf8gl3x4l1zwjkz7bfwhbzkf7qscrvfz4lbh7g"; depends=[cli dplyr magrittr purrr rlang stringr tidycensus tidyr tidyselect]; }; findpython = derive2 { name="findpython"; version="1.0.8"; sha256="1dydchid5mc79253v5b86bnbg3rm78w0hs586c1rr56lmz5r12hg"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; finetune = derive2 { name="finetune"; version="1.1.0"; sha256="1axcfjkdhpfx60rf14ywizmzxsl8ac5amqx8s2lv8hb2ahqs13yi"; depends=[cli dials dplyr ggplot2 parsnip purrr rlang tibble tidyr tidyselect tune vctrs workflows]; }; @@ -9793,7 +9809,7 @@ in with self; { fishtree = derive2 { name="fishtree"; version="0.3.4"; sha256="00g8p885z5xcqp2chncb177s0l6lab2f069szj861z9dyf93xx4z"; depends=[ape jsonlite memoise rlang]; }; fishualize = derive2 { name="fishualize"; version="0.2.3"; sha256="0iygh6mlxlsk6yq26i5rry9gh6qkrn5sbgsa2wpdxmm1ip1nzml0"; depends=[curl downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; fit_models = derive2 { name="fit.models"; version="0.64"; sha256="1nk4x2q8cv79zcls61saf627ac0fci6jcrd6lmzk61asm2zhc27p"; depends=[lattice]; }; - fitConic = derive2 { name="fitConic"; version="1.2"; sha256="0mwnbq32mpj8d4127jwb283mn3gs4hm0klwk9prsrfkdnhqai41i"; depends=[pracma]; }; + fitConic = derive2 { name="fitConic"; version="1.2.1"; sha256="0hslw8mdjr0yjy7mx2b7di9d2yr89ga97zbgzh97qb3i8vasgwmq"; depends=[pracma]; }; fitHeavyTail = derive2 { name="fitHeavyTail"; version="0.2.0"; sha256="18iqqn33sznw4c77rl6ryk57grary350ygr58vg062jg1hyxybrg"; depends=[ghyp ICSNP mvtnorm numDeriv]; }; fitODBOD = derive2 { name="fitODBOD"; version="1.5.0"; sha256="0nr2ljnk2glrayainm4dnpyw2bp8vfyjws2p7nry6x4f8vvw9y0v"; depends=[bbmle hypergeo]; }; fitPS = derive2 { name="fitPS"; version="0.2-6"; sha256="1ga4c7hd9chspk6m0rd3vc6nlzdc36dq3dlmp86b0zn4dzzvikyy"; depends=[doParallel dplyr foreach Hmisc iterators knitr ks pbapply Rdpack readxl VGAM]; }; @@ -9828,15 +9844,16 @@ in with self; { flare = derive2 { name="flare"; version="1.7.0.1"; sha256="1xvrbvq2y7zfp98ijal3z8y1w2xbzfcdykzw4pqc3mnh0qrhq2d5"; depends=[igraph lattice MASS Matrix]; }; flashCard = derive2 { name="flashCard"; version="0.1.0"; sha256="1l1g3hy0gchsmdj04d065rl71hkvxydyqsmav5qwxyz2mdkknkhi"; depends=[htmlwidgets jsonlite]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; + flashier = derive2 { name="flashier"; version="1.0.7"; sha256="08m5nmfzxg8ikswqz3w4fmiw0qixjy5hdwkxkm8nxflf4nkfgx06"; depends=[dplyr ebnm ggplot2 irlba magrittr Matrix softImpute stringr tibble tidyr]; }; flashlight = derive2 { name="flashlight"; version="0.9.0"; sha256="0nyxx7zrqw8fgy1n81n30m80z7xwkydnhmxj6c22mq83md08rd8c"; depends=[cowplot dplyr ggplot2 MetricsWeighted rlang rpart rpart_plot tibble tidyr tidyselect withr]; }; flashr = derive2 { name="flashr"; version="0.1.1"; sha256="0cvpjyjylcz61jmmar2aynvcqh7m41ljkdqmgwmiwiy26qi6clqn"; depends=[cli curl gh httr memoise revealjs rmarkdown testthat]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; - flattabler = derive2 { name="flattabler"; version="2.0.0"; sha256="0yqxm1d4n2g98101xa79qg1i8mfkrc5d81wlv80mpxwdq4xsqfkz"; depends=[dplyr readxl stringr tibble]; }; + flattabler = derive2 { name="flattabler"; version="2.1.0"; sha256="10jii2xl100fjawhz9qlwnj2b3fa9pfipc8jli4qa03f1w3n7xmp"; depends=[dplyr readxl stringr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.1.1"; sha256="1qsiqi8aszk9djlhysf6lcm41dq4pcw5jv6mdvb1mgxni7g3sgfv"; depends=[crayon httr RCurl xml2]; }; fledge = derive2 { name="fledge"; version="0.1.1"; sha256="1nq0180vjq7jmawd42r8w3hgrccs9k013yni0wkldkc73p6526gd"; depends=[cli desc enc gert purrr rematch2 rlang tibble usethis whoami withr]; }; flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexclust = derive2 { name="flexclust"; version="1.4-1"; sha256="13akk3w6a76jpws5v9108c3hdmb8i6gm0sc06lr2hqly0pgpfyfn"; depends=[class lattice modeltools]; }; - flexdashboard = derive2 { name="flexdashboard"; version="0.6.1"; sha256="1lxlai4s3qdg2w36xx61idn67zidz9n5mmbz72i0zvcpxr25v5xl"; depends=[bslib htmltools htmlwidgets jsonlite knitr rmarkdown sass scales shiny]; }; + flexdashboard = derive2 { name="flexdashboard"; version="0.6.2"; sha256="0zxyrfp1inv19palaba81pxlq0nz655hcliynvh995a58cvg6c5n"; depends=[bslib htmltools htmlwidgets jsonlite knitr rmarkdown sass scales shiny]; }; flexiblas = derive2 { name="flexiblas"; version="3.3.0"; sha256="1gcj4679hy2pa76s3sx6q3x2zmf9xkb5hgk2y9nk3v6yf9l10w6h"; depends=[]; }; flexmet = derive2 { name="flexmet"; version="1.1"; sha256="1xcs4gs5aanvfsf6bgj28jsjdxrx0dz475xsw8hd6y44qdgw1sqb"; depends=[]; }; flexmix = derive2 { name="flexmix"; version="2.3-19"; sha256="1s8jpii6ws6hra8w11fn3x84wrdrrlycnrhn5ijy6ibdpc6a9xdd"; depends=[lattice modeltools nnet]; }; @@ -9847,7 +9864,7 @@ in with self; { flexsiteboard = derive2 { name="flexsiteboard"; version="0.0.7"; sha256="0msbz3x7lsi6xcw8dcqzwnylaj76f8mgj6cf3hqscrfjzhs86rym"; depends=[flexdashboard htmltools htmlwidgets jsonlite knitr rmarkdown yaml]; }; flexsurv = derive2 { name="flexsurv"; version="2.2.2"; sha256="1qshsii5fqpx4l113vr4lx9ijxhcr8494lx3ixjdbzy58077adb6"; depends=[assertthat deSolve dplyr generics ggplot2 magrittr Matrix mstate muhaz mvtnorm numDeriv purrr quadprog Rcpp rlang rstpm2 statmod survival tibble tidyr tidyselect]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="1.3.1"; sha256="0mhpzcrqxsi7f2m565qy648vg26rsvy7d249ia7y7kd5wcildw8b"; depends=[boot flexsurv survival]; }; - flextable = derive2 { name="flextable"; version="0.9.2"; sha256="0gcjkw35dlhf71djkvmlz0rp62sy3zd45vm8qhk1v3z5ka8m7kdw"; depends=[data_table gdtools htmltools knitr officer ragg rlang rmarkdown uuid xml2]; }; + flextable = derive2 { name="flextable"; version="0.9.4"; sha256="1dlsag1y3s7d5lp1dh2kxf1qax4r9xvxycpmxl64gkr50dk13bam"; depends=[data_table gdtools htmltools knitr officer ragg rlang rmarkdown uuid xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; flightplot = derive2 { name="flightplot"; version="0.1.0"; sha256="1276lsahr9kdsvp1ismm3b5syvhfr7ifizzd79f8w1h2rjblva8x"; depends=[dplyr geosphere ggplot2 ggrepel magrittr rlang sf tibble]; }; flightsbr = derive2 { name="flightsbr"; version="0.3.0"; sha256="18csal1jd0998njvf6bwqjhapm5lzgb77zqh44p7cs6pgw4h7xpw"; depends=[data_table httr parzer pbapply rvest]; }; @@ -9858,7 +9875,7 @@ in with self; { flipdownWidgets = derive2 { name="flipdownWidgets"; version="0.1.0"; sha256="1qlpav9s51w9nkszfkad87cfbc7jq4n0kmgis8hrin093w0whp7a"; depends=[htmlwidgets]; }; flipdownr = derive2 { name="flipdownr"; version="0.1.1"; sha256="18z6y9anwg264gwqpxvm8mmv7xvc4m323mkg9db424vd1ji560f3"; depends=[checkmate glue htmltools jsonlite]; }; flippant = derive2 { name="flippant"; version="1.5.3"; sha256="1d1rrmnhbbixkwscw2gqk6pm8jvvgikyrd4hzrpif4qd5xj833dj"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr pracma stringi withr]; }; - flipr = derive2 { name="flipr"; version="0.3.2"; sha256="1a88nxgh6jca7jy1dnzq2d8lnydm107m24crxh9f418mv8wsrwnl"; depends=[cli dials ggplot2 magrittr optimParallel pbapply purrr R6 Rcpp rgenoud rlang tibble usethis viridisLite withr]; }; + flipr = derive2 { name="flipr"; version="0.3.3"; sha256="188kdgk390rh8wpfsvqbwpwa3dmwzlzv8sdgvfxl9f0ddbxasghb"; depends=[cli dials ggplot2 magrittr optimParallel pbapply purrr R6 Rcpp rgenoud rlang tibble usethis viridisLite withr]; }; flipscores = derive2 { name="flipscores"; version="1.2.0"; sha256="17dmx7r29ngwz690x7p447pczh903swzpwmk5abvzjsqvfgikbi8"; depends=[MASS]; }; float = derive2 { name="float"; version="0.3-1"; sha256="0fzb9warfnb7h1krrf2hrxjp3lmpff7sln0r2718iqlhwam9v1zm"; depends=[]; }; flobr = derive2 { name="flobr"; version="0.2.3"; sha256="0if7g3zz669digy0z0n8kjkz9rq9dnyq2kz9n2zvddssl5q4nnc9"; depends=[blob chk lifecycle]; }; @@ -9867,6 +9884,7 @@ in with self; { flora = derive2 { name="flora"; version="0.3.4"; sha256="17drlfvvrndal4cf5nw20xb9viybagvb4vll1kxdrhvsvfz5yap6"; depends=[dplyr httr jsonlite stringdist]; }; flow = derive2 { name="flow"; version="0.2.0"; sha256="171csdpp445lxhh7ph59h7xxqxdpjlkf35nrjy74282m9xmqdlz9"; depends=[here htmlwidgets lifecycle nomnoml rstudioapi styler webshot]; }; flowTraceR = derive2 { name="flowTraceR"; version="0.1.0"; sha256="1nl7yfzsh3bhqdildb77wmnapich4xn6y2j8rlmrb4w7mq9jnhba"; depends=[comprehenr dplyr ggplot2 magrittr stringr tibble tidyr]; }; + flowml = derive2 { name="flowml"; version="0.1.2"; sha256="1fssgx06fz4bvprghl9kf8x80jg3g8w04hhdgvml86w4vhi1vz0v"; depends=[ABCanalysis caret data_table dplyr fastshap furrr future magrittr optparse purrr R6 readr rjson rlang rsample stringr tibble tidyr vip]; }; flowr = derive2 { name="flowr"; version="0.9.11"; sha256="1cbbfrvgzqclvbhy20vjwgxbvnn3ljh0k1k54jf2si10bfw3zzi5"; depends=[diagram params readr whisker]; }; flps = derive2 { name="flps"; version="0.1.0"; sha256="0kcxc425xg4y44j2rd1h6w5wf7dq11j9vvlf0jcs3irbr49q7y3g"; depends=[ggplot2 MASS mirt mvtnorm Rcpp rstan]; }; flsa = derive2 { name="flsa"; version="1.5.3"; sha256="0m0zx0nizg4mrs2gg2sbxjlixx1rcmrj7xg869ia3gg36x1a28d9"; depends=[]; }; @@ -9877,63 +9895,64 @@ in with self; { flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.5"; sha256="0y6garv70jn3mfrhpgbzsv6xyc7rnjqvl7whdmlfswvf5d6yl3a0"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.5-1"; sha256="1w8qchyh3ry5nphv76pdbryp6hq8bccfhwzmsnghgzfd8hirrg27"; depends=[coda MASS Matrix]; }; + fmcmc = derive2 { name="fmcmc"; version="0.5-2"; sha256="0swlghwsir1gjw5n2c8kfi5zh6bbqjhk7nnjds2b6656s8xdpr9a"; depends=[coda MASS Matrix]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; - fmeffects = derive2 { name="fmeffects"; version="0.1.0"; sha256="1di2qannd78xkh5jmh55y86aqqx998m5cqdr3k5hj5iinb6vbqkr"; depends=[checkmate cowplot data_table ggparty ggplot2 partykit R6 testthat]; }; + fmeffects = derive2 { name="fmeffects"; version="0.1.1"; sha256="1jqjlrqc9an8f9ij51xmi7fb6mljwsgchihnb3d63bzwc9a0iphh"; depends=[checkmate cowplot data_table ggparty ggplot2 partykit R6 testthat]; }; fmerPack = derive2 { name="fmerPack"; version="0.0-1"; sha256="0p9jfgkzs97r6ya1x8ax7bza17b03grqxa22ja13s12vj0cdkv78"; depends=[abind flexmix glmnet MASS Rcpp RcppArmadillo]; }; + fmesher = derive2 { name="fmesher"; version="0.1.3"; sha256="0kmsahgjqbsshw27mgcjx4crli8d67kkagzyc7xap95ivlcdqpgd"; depends=[dplyr lifecycle Matrix Rcpp rlang sf sp tibble withr]; }; fmf = derive2 { name="fmf"; version="1.1.1"; sha256="0b26040a39jys1z3h9mq9k7rjr0iyiialq442ir8vgzvmrh383cs"; depends=[C50 caret dplyr e1071 factoextra FactoMineR ggplot2 kernlab Rcpp RcppArmadillo solitude]; }; fmpcloudr = derive2 { name="fmpcloudr"; version="0.1.5"; sha256="07fvmrprv0pka1wgp5ygcvv86jvn3h30xxkx44ssin15hfmank69"; depends=[dplyr httr jsonlite lubridate magrittr tidyr]; }; - fmri = derive2 { name="fmri"; version="1.9.11"; sha256="07lk24jandnlxn6b8q8acnc4v6r2x2vsl734cpzhwxfjky119sz5"; depends=[aws metafor nlme oro_nifti]; }; + fmri = derive2 { name="fmri"; version="1.9.12"; sha256="1cv5mxcdpyf05n5pcjdawl59j7f4k40386r4m38qf15vcy45zdfq"; depends=[aws metafor nlme oro_nifti]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmsb = derive2 { name="fmsb"; version="0.7.5"; sha256="082qj08kzyzwvjacwq0sl3xxdx6iz5hgx6q24jv1mnvx7z5xn5ry"; depends=[]; }; fmt = derive2 { name="fmt"; version="2.0"; sha256="04df84979a8vaacfhxsb58zci1mmh113ir7qnkniv5qnyvdabacm"; depends=[limma]; }; - fmtr = derive2 { name="fmtr"; version="1.5.9"; sha256="0n62jrbxpb82d6rnbf6qxi8971cn0ywfl43r1d47j6dmjbl0dhq8"; depends=[common crayon Rcpp tibble]; }; + fmtr = derive2 { name="fmtr"; version="1.6.0"; sha256="1294qzarkj5v4kcjw4px763c34gywgm1q4v7py8sh7ik2c2sg86g"; depends=[common crayon Rcpp tibble]; }; fnets = derive2 { name="fnets"; version="0.1.5"; sha256="0fybpicc95ql89j09s48bnfsbh3spw26vh1m2xd2y5qv4mj1ff8q"; depends=[doParallel fields foreach igraph lpSolve MASS RColorBrewer]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; foghorn = derive2 { name="foghorn"; version="1.5.1"; sha256="0fbr38hxl2qwr1pbvbwwnkr9dk8saq13w0ld6waky70g7k7va8m4"; depends=[clisymbols crayon curl httr2 rlang rvest tibble xml2]; }; - folderfun = derive2 { name="folderfun"; version="0.1.4"; sha256="0rns8590r1897lj0gyrlj0zbaxjw2gjaxwnwdxiiw2kvyq7mjkis"; depends=[]; }; folders = derive2 { name="folders"; version="0.0.8"; sha256="16m0lqfacpqhz5h44v2k8q7gc3p8xa15r153g25fsfkcnw72gwvf"; depends=[config here yaml]; }; folio = derive2 { name="folio"; version="1.3.0"; sha256="1jkix4hjb6whv1bz8gjrclwlsc415vccvldvi5l998r0bsnbm04c"; depends=[]; }; fomantic_plus = derive2 { name="fomantic.plus"; version="0.1.0"; sha256="0zj50v036zal51b7744bp62c1bzjwdvzw1qwy0lyhgjxly6kb2hy"; depends=[htmltools jsonlite shiny shiny_semantic]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; }; - fontawesome = derive2 { name="fontawesome"; version="0.5.1"; sha256="0v2ngvg4nm000ccgfjvcx809igb8wv7ra85p881jqbldxvibpszl"; depends=[htmltools rlang]; }; + fontawesome = derive2 { name="fontawesome"; version="0.5.2"; sha256="1jaw3jz9jz8v7msqv76f234vhrkcy21xgva81m0d313hf6ly4gfs"; depends=[htmltools rlang]; }; fontcm = derive2 { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; }; fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; }; foodingraph = derive2 { name="foodingraph"; version="0.1.0"; sha256="0v40yk7lx0zxvpd3vz48h5gzx8ds8v3l12i2r7v9safgfvip6fvn"; depends=[cowplot dplyr ggplot2 ggraph igraph labeling magrittr minerva rlang stringr tibble tidyr viridis]; }; + foodquotient = derive2 { name="foodquotient"; version="0.1.1"; sha256="11api7fh3v7ym4k22xf1clbgl0wxqmklr9irjw4y3bn57vmsy3i6"; depends=[]; }; foodwebWrapper = derive2 { name="foodwebWrapper"; version="1.0"; sha256="1dwlzvxk80vl97b24i3gjcxsbir2kxvblbhsihf2wysxyfmw1abh"; depends=[dplyr magrittr mvbutils R2HTML textshaping tibble tidyverse]; }; foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; }; - footBayes = derive2 { name="footBayes"; version="0.1.0"; sha256="1q2xcrrw4x2jdvxr5q3l9lh0sfg3wjw06s9qzil11pb93h5l2ik6"; depends=[arm bayesplot dplyr extraDistr ggplot2 magrittr matrixStats metRology numDeriv reshape2 rstan tidyverse]; }; + footBayes = derive2 { name="footBayes"; version="0.2.0"; sha256="0gp784ad34ygnn06r4p1y3nqdx372ypgcgm94fcm1lqslsn7akj0"; depends=[arm bayesplot dplyr extraDistr ggplot2 magrittr matrixStats metRology numDeriv reshape2 rstan tidyverse]; }; footballpenaltiesBL = derive2 { name="footballpenaltiesBL"; version="1.0.0"; sha256="1my67157frp4pxl84sb6dnb7rzp99g59mp9iwwv1s6wc391zfbsp"; depends=[]; }; footprint = derive2 { name="footprint"; version="0.1"; sha256="00m3jaxiacf9wxa0wg0qxhp6c0prbf2l5c2cid6anz8rc5b6angv"; depends=[airportr dplyr magrittr rlang]; }; - foqat = derive2 { name="foqat"; version="2.0.7.1"; sha256="0ngk7qad57aklj0i4nzgxz8ndrwjyab7vzy7syf277ykhkxsiapd"; depends=[dplyr ggnewscale ggplot2 ggplotify gridExtra lmodel2 lubridate magrittr patchwork plyr reshape2 rvest scales stringr xml2]; }; + foqat = derive2 { name="foqat"; version="2.0.8.2"; sha256="0401100lx03p6pa7n6z3lfn9gxs7m7d43ycn788wpn3iykv9b3x4"; depends=[dplyr ggnewscale ggplot2 ggplotify gridExtra lmodel2 lubridate magrittr patchwork plyr reshape2 rvest scales stringr xml2]; }; forImage = derive2 { name="forImage"; version="0.1.0"; sha256="1p8zfndvm7x7pnryphz944hgxcchvc6mwnr6ap15m0i6kwsh0nb4"; depends=[dplyr magrittr reticulate tibble]; }; - forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; + forams = derive2 { name="forams"; version="2.0-6"; sha256="1y8r64ckx7swx4rlmdsjp4k8ic5jmivwk4vbadx4gpp4brd2zk12"; depends=[vegan]; }; forcats = derive2 { name="forcats"; version="1.0.0"; sha256="0ki5c84n7xm4iw4aj629l51hm84f6p5wa3bw88d1wbnr15wibfy5"; depends=[cli glue lifecycle magrittr rlang tibble]; }; forceR = derive2 { name="forceR"; version="1.0.20"; sha256="1fq1zp0h4044yx5p6yj03cyzwvsrijchcnjz8z91cnfagkb5b8s0"; depends=[dplyr filesstrings magrittr purrr readr roll stringr]; }; - foreSIGHT = derive2 { name="foreSIGHT"; version="1.1.0"; sha256="0a018hc8pavb8sqizc5922gmiwsdlq3hgwkx29pzpajjlhrybgpj"; depends=[cowplot directlabels doParallel fields GA ggplot2 jsonlite lattice moments mvtnorm progress RColorBrewer rcorpora Rcpp rlang scales viridisLite]; }; + foreSIGHT = derive2 { name="foreSIGHT"; version="1.2.0"; sha256="1nw93xs10qfj489i9xlamjrk8rf73b7511gdsg49vvbgjp4945mr"; depends=[cmaes cowplot dfoptim directlabels fields GA ggplot2 jsonlite lattice Matrix moments mvtnorm progress rcorpora Rcpp RGN rlang scales SoilHyP viridisLite]; }; foreach = derive2 { name="foreach"; version="1.5.2"; sha256="1r5gdf9fp3rprvrhf0gzl9qmmqhgdn5gscpm5hk8zxpraf3qscsn"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.6.2"; sha256="0xw5xl6famx0wy68a32f8vgqk02lkymvxq082yp16giidvzvqjwd"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.21"; sha256="1hn60p88jq9qprgwgh4ymb53fri71imad6kasycv6gwxb9wk3lgx"; depends=[colorspace fracdiff generics ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecast = derive2 { name="forecast"; version="8.21.1"; sha256="09w1vh96cf9wz071why5f4265cvvwqi2b3wb0khrjvkzgkiaq7l1"; depends=[colorspace fracdiff generics ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.19"; sha256="1pg3wbmlagr01j3nikfh4dvh5lvbdfp7069wx9h9xsl7d4481ly1"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastLSW = derive2 { name="forecastLSW"; version="1.0"; sha256="0gwc0kfcl2qxfxnzxw65ij83njw8x6bxxb63sfajcm71kfbnsipa"; depends=[forecast locits lpacf wavethresh]; }; forecastML = derive2 { name="forecastML"; version="0.9.0"; sha256="01lqbmdmd6sk5xka19i9d466bzihxgp652v0kr13r82b591f67vq"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; forecasteR = derive2 { name="forecasteR"; version="2.0.2"; sha256="0pwgkkzyfzjjp9qrx4xx3b68617a18i3an3gcpprkg4mwpsvcj0x"; depends=[colourpicker config DT echarts4r forecast golem htmltools htmlwidgets keras lubridate rlang shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs stringr zoo]; }; - foreign = derive2 { name="foreign"; version="0.8-84"; sha256="0jc5r5wiqqbkni2xjdd24hic1xvfi151m9lnqhni52jnqw1g7v8p"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-85"; sha256="1azca97fhwb1pzgrjw2xscfh2k7bfryp6wjsdcx2y4h7305d4ych"; depends=[]; }; forensIT = derive2 { name="forensIT"; version="1.0.0"; sha256="0zbkkdm3wzzqsg7m6854lisskql0v5k9sg1ly1z479w5iqknh7bl"; depends=[doParallel dplyr fbnet foreach forrel ggplot2 gtools hrbrthemes iterators magrittr mispitools paramlink pedprobr pedtools reshape2 tidyr]; }; forestControl = derive2 { name="forestControl"; version="0.2.2"; sha256="0g81ml12xhq2a868vlpsybpsqz7p4hn9jnxh3dvq6g4k1hc1292x"; depends=[dplyr magrittr purrr Rcpp tibble]; }; forestError = derive2 { name="forestError"; version="1.1.0"; sha256="1dk19sgx760ph464cya4gxb1i3rpnydnhrbqyb25jja0dryjapcm"; depends=[data_table purrr]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; - forestat = derive2 { name="forestat"; version="1.0.2"; sha256="0vi6z74ikv5dkx5g6g673b7gwk26gib25j0j38qvj4gdplkpvs3v"; depends=[dplyr ggplot2 nlme]; }; + forestat = derive2 { name="forestat"; version="1.1.0"; sha256="0bw6kkdq65d1jwhim80iwq6lcdfyawf8xfg1kc86qdhvrg2zf4wm"; depends=[dplyr ggplot2 nlme rlang]; }; forestecology = derive2 { name="forestecology"; version="0.2.0"; sha256="0pvh50sdiscgkshlmyngz7pkmpaz03c8x3gfjp5ir52f8710ngb7"; depends=[blockCV dplyr forcats ggplot2 ggridges glue magrittr mvnfast patchwork purrr rlang sf sfheaders snakecase stringr tibble tidyr yardstick]; }; forestinventory = derive2 { name="forestinventory"; version="1.0.0"; sha256="1v5gyx8i64zn1cinwvm86syq26vhfzw2maaiymy32fphzybwxivf"; depends=[ggplot2 plyr tidyr]; }; forestly = derive2 { name="forestly"; version="0.1.0"; sha256="1pbq60agq62aiqgg48r92zpk89y74x80hwidqivjrmjkpjx92sgj"; depends=[brew crosstalk glue htmltools metalite metalite_ae reactable reactR rlang]; }; forestmangr = derive2 { name="forestmangr"; version="0.9.5"; sha256="1diywnrvzyvpi7ygqmb26gii6ac741c2v3zc7pk6i0y09j89pgrq"; depends=[broom car dplyr FinCal ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr miniUI minpack_lm plyr purrr rlang scales shiny systemfit tibble tidyr]; }; forestmodel = derive2 { name="forestmodel"; version="0.6.2"; sha256="0pl9r8j2qd00b9kl585b4k54kic5fvzc56i8cn3hm5yp2hrrwyws"; depends=[broom dplyr ggplot2 rlang tibble]; }; - forestplot = derive2 { name="forestplot"; version="3.1.1"; sha256="0jf7sl7z963r92l5r2irvnakmbmx554vbprg51smj6qns5a6dfcj"; depends=[abind checkmate]; }; - forestploter = derive2 { name="forestploter"; version="1.1.0"; sha256="0mp0w2dmza5vj2wr36z59cvdhcb688din3aq1id4ha61ci0sbidv"; depends=[gridExtra gtable]; }; + forestplot = derive2 { name="forestplot"; version="3.1.3"; sha256="0jbmhgbf167xi0lxqinf6m4gmh10r582bify1i731k9ywcc7psqk"; depends=[abind checkmate]; }; + forestploter = derive2 { name="forestploter"; version="1.1.1"; sha256="0l19pw5an8d2zn32r64b8a3b95krq9r083ziry5973wdm0nya2pw"; depends=[gridExtra gtable]; }; forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; }; forestry = derive2 { name="forestry"; version="0.1.0"; sha256="0q7m0mrig8z2b2z2fng58qlqa6g58xlhfzchil2dvjh6xf3qvsh8"; depends=[data_tree]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; @@ -9942,20 +9961,21 @@ in with self; { formatR = derive2 { name="formatR"; version="1.14"; sha256="0k271w4bhlj7r9igkiyfw7d7bg30s2mn4sr4alb8f9w57wnapfjf"; depends=[]; }; formatdown = derive2 { name="formatdown"; version="0.1.2"; sha256="1k293djggyrdbd20r1avmqxsfimfglzcadq1lg56a79bj8mad636"; depends=[checkmate data_table units wrapr]; }; formattable = derive2 { name="formattable"; version="0.2.1"; sha256="1vdxi0xmg019qyzjrp8bkjxciz245jcxsrkhfzd44ynqcwi4s3ag"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; - formatters = derive2 { name="formatters"; version="0.5.0"; sha256="12bmfm2lm2x9bc1v4jr5kv96vlhnm72wbyjfzzx6j0d6cfssnl8n"; depends=[checkmate htmltools]; }; + formatters = derive2 { name="formatters"; version="0.5.2"; sha256="1r6idapw5jz3g81pz4ffl7ifij94mgm0wl3ijg1gwxk8h2fs0w6b"; depends=[checkmate htmltools]; }; + formods = derive2 { name="formods"; version="0.1.1"; sha256="0xkb54ww6zksgyfd9cbjws8fg0vsg2pvlnmqp4qk2inkjqi9myv8"; depends=[cli digest dplyr ggforce ggplot2 onbrand readr readxl rhandsontable rlang shiny shinyAce shinyWidgets stringr writexl yaml zip]; }; formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; formulaic = derive2 { name="formulaic"; version="0.0.8"; sha256="1nx6a73vw2hjbnqaw8x17ghhljd6z2avxv4arz3c3785pyayhg9k"; depends=[data_table]; }; formulops = derive2 { name="formulops"; version="0.5.0"; sha256="1mkpv5xjykrhgknq0gh4yg2a3j4xb8q2d6dh0wv8zd9h59hvrzda"; depends=[]; }; forplo = derive2 { name="forplo"; version="0.2.5"; sha256="066hpd5jfs8nfd5fbxh049apd93pz8ibzr2kqlssx4c9fziwbg40"; depends=[]; }; forrel = derive2 { name="forrel"; version="1.6.0"; sha256="0spak2r0i1vk29ppnq991ibck04kl4pygdpwma7yf894hmp07xks"; depends=[glue pedmut pedprobr pedtools ribd]; }; - forsearch = derive2 { name="forsearch"; version="4.0.0"; sha256="1wng22h9zifcri0488kx859b0z7mmd44zlq6d9w0a01ysl7iz6i2"; depends=[Cairo formula_tools ggplot2 Hmisc nlme survival tibble]; }; + forsearch = derive2 { name="forsearch"; version="4.1.0"; sha256="10r48all8db7s5v4q5xmcmhwz46q00hbvp2lgf9g6jsfqnplq5rb"; depends=[Cairo formula_tools ggplot2 Hmisc nlme survival tibble]; }; forstringr = derive2 { name="forstringr"; version="1.0.0"; sha256="0x3nrvazzapvx8nfjyp7a0d1n2qs3mpbnfqj07rv4kxyw47p93iy"; depends=[dplyr glue rlang stringr tidyselect]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.6"; sha256="12yk2l9cjmlr9089a8qw8arpdq997c9d9nx5xsy2x76ik65r6i3l"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; fossil = derive2 { name="fossil"; version="0.4.0"; sha256="1hbls9m8yapnfzpv9s850ixakmnan8min1ynk7dqkbpb2px85h1p"; depends=[maps shapefiles sp]; }; fossilbrush = derive2 { name="fossilbrush"; version="1.0.3"; sha256="0h5grarpk6ml07gxb3bmb93fys55f6pp4qr60fqq97zx1lg9hns4"; depends=[curl data_table igraph Matrix pbapply stringdist stringr]; }; - foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; + foto = derive2 { name="foto"; version="1.1"; sha256="0z1r903i4hc2m7kkph8l1ncjvx20dv800n7j6zcg8vdsi3qycw13"; depends=[terra]; }; foundry = derive2 { name="foundry"; version="0.13.0"; sha256="06mmqiaakha1xw2l5zib5nmwijjv4rjbpsx52ck7xihm6w192lss"; depends=[arrow httr jsonlite R6 yaml]; }; fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; }; fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; }; @@ -9965,8 +9985,8 @@ in with self; { fpcb = derive2 { name="fpcb"; version="0.1.0"; sha256="086060z6r79m527bb9ah6yk2z15xq8x27gyvbz23xbm6mhrxsa1y"; depends=[FNN]; }; fpeek = derive2 { name="fpeek"; version="0.1.2"; sha256="0kv46g21ndxchg3q8ynq7hjjkh6i2zlc21axn5y1jjzigrw047ii"; depends=[Rcpp]; }; fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; }; - fplot = derive2 { name="fplot"; version="1.0.0"; sha256="0c8rgw23dvmwk2ssy8mbn29am72k6vji0xymz9rn5lrlmjk1lbpb"; depends=[data_table dreamerr Formula Rcpp]; }; - fplyr = derive2 { name="fplyr"; version="1.2.1"; sha256="0k53rc7p0khv3mssghplz3ggzni2vl168mbwg72dgsn9b8nm98sy"; depends=[data_table iotools]; }; + fplot = derive2 { name="fplot"; version="1.1.0"; sha256="0rjdjv67yh6nbxi3l8ds0dr26s9cxsrfqc47rkfwh82g1iga2fqi"; depends=[data_table dreamerr Formula Rcpp]; }; + fplyr = derive2 { name="fplyr"; version="1.3.0"; sha256="0xslmd7kkm3fz8kl0y95d3y7grb8gir0l55n91rmcw1zlp8m9aj6"; depends=[data_table iotools]; }; fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; }; fpopw = derive2 { name="fpopw"; version="1.1"; sha256="19ysgy2rh73vppjmw2ynsj80gyy23xyr0py592mlcq9bk5igl4k7"; depends=[]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; @@ -9974,15 +9994,15 @@ in with self; { fpp2 = derive2 { name="fpp2"; version="2.5"; sha256="1ml4jf7r1q555k7qnr3fky5axl0x66h3g1m61nmdrckgf6idkn0f"; depends=[cli crayon expsmooth fma forecast ggplot2 magrittr purrr rstudioapi]; }; fpp3 = derive2 { name="fpp3"; version="0.5"; sha256="1yg2wv1mdqrmpxbz9kdsxw84q5hg12rsmz1k3i4dq1nymqbkkfq2"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; }; fptdApprox = derive2 { name="fptdApprox"; version="2.4"; sha256="0ql52rx5wc7h5vxl567i065lmj4ygai3xpjwp7qrndl16x1j4k9l"; depends=[]; }; - fqacalc = derive2 { name="fqacalc"; version="1.0.0"; sha256="0mip89m2caxky9g4znlsfxai4r7h9kccm9k59m9y3ksrihnz5wz6"; depends=[dplyr fqadata magrittr rlang]; }; - fqadata = derive2 { name="fqadata"; version="1.0.0"; sha256="03ar7azb342qwf6rqz99wvip496clm8w6d95rf0m6c53yqjgniz2"; depends=[]; }; - fqar = derive2 { name="fqar"; version="0.3.0"; sha256="178blb0qn6cs2ykpr17i0qyqc8jxa1hmy6pqxh6vcrw5y6b9qip5"; depends=[dplyr ggplot2 httr jsonlite memoise rlang tidyr tidyselect]; }; - frab = derive2 { name="frab"; version="0.0-1"; sha256="1cfssnjbr07s19m8ib5nvaip53g2gdnlrj6w54ga9wn3r23z8bpk"; depends=[disordR mathjaxr Rcpp]; }; + fqacalc = derive2 { name="fqacalc"; version="1.1.0"; sha256="1n4vlz75d2jsl3chsarmgf5cg7zj06gxgn1mj79d85z86pn4jip3"; depends=[dplyr fqadata magrittr rlang]; }; + fqadata = derive2 { name="fqadata"; version="1.1.0"; sha256="1nxqq33j396wa12n3qwfrsh9l2g2pn2f9d25vfzihh3xnsbk0cv5"; depends=[]; }; + fqar = derive2 { name="fqar"; version="0.4.3"; sha256="18llpbdjwscnbx9n94nc5x42mr3vsbf35s3br7w30s8mf48c3s3y"; depends=[dplyr ggplot2 httr jsonlite memoise rlang tidyr tidyselect]; }; + frab = derive2 { name="frab"; version="0.0-3"; sha256="08nlhshg3bz8b830vl877xyyjgngxk7sf5vp5d0np3bfhrylh0wv"; depends=[disordR mathjaxr Rcpp]; }; fracdiff = derive2 { name="fracdiff"; version="1.5-2"; sha256="0dzl011c92skf7hmx1zvdwsrashmfkxy9p2wig35nzr8609qhpxc"; depends=[]; }; fracdist = derive2 { name="fracdist"; version="0.1.1"; sha256="0ssg8h1mvkzpwq4dn9fdxjg1vzhcv6606wsy0xrm1wz9p6s5rx74"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractD = derive2 { name="fractD"; version="0.1.0"; sha256="1cnp8qrc6jpdj0grwkvn5jkdymjfhg5ybbhqvknxirc4g981q8bj"; depends=[imager plyr]; }; - fractalRegression = derive2 { name="fractalRegression"; version="1.1"; sha256="00vmb9l1whwlcbskzpy2ql004l47ll3phvdsdmxg8728vinjbacf"; depends=[colorRamps Rcpp RcppArmadillo RcppEigen]; }; + fractalRegression = derive2 { name="fractalRegression"; version="1.2"; sha256="1d79bv3lpg1p6zvjsnf8qwm5ajpsklm8gpqm241jv1cgjyfsi64x"; depends=[colorRamps Rcpp RcppArmadillo RcppEigen]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-5"; sha256="1hi5xzya528947wfb50brl00m6n6krv4sn5nzga285nncf6xprhh"; depends=[abind]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; fracture = derive2 { name="fracture"; version="0.2.1"; sha256="1pibw364dp567nf0pbj3adydapgf01cga441v3gj93frh9a412c1"; depends=[Rcpp]; }; @@ -9990,7 +10010,7 @@ in with self; { frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; }; frailtyMMpen = derive2 { name="frailtyMMpen"; version="1.2.1"; sha256="03d3mlbwvpqjgxgw4cqy2502lx4gh8fvf7sbcq06w8yjljffn0a0"; depends=[mgcv numDeriv Rcpp RcppGSL survival]; }; - frailtypack = derive2 { name="frailtypack"; version="3.5.0"; sha256="0yw08x6ss1af19zrm29i509gkjwmphg1hidxdfwkfgvrvcl4fnxz"; depends=[boot doBy MASS nlme rootSolve shiny statmod survC1 survival]; }; + frailtySurv = derive2 { name="frailtySurv"; version="1.3.8"; sha256="1k1pxn47gglkcjzix3h1vn9z631ms6icgv5df6pb90008qmilck7"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; framecleaner = derive2 { name="framecleaner"; version="0.2.0"; sha256="1lclxjds59i1mhc8mzmgy5f7yhqwv72ylidpfvzjgslf45sjk5lp"; depends=[bit64 dplyr fastDummies forcats fs janitor lubridate magrittr purrr readr rio rlang rlist rstudioapi stringr tibble tidyselect vroom]; }; franc = derive2 { name="franc"; version="1.1.4"; sha256="0l41m53li2pvcac7m5y5gkvmw0qy5k3v0m2ljda9gdaasg5029xr"; depends=[jsonlite]; }; @@ -10023,10 +10043,8 @@ in with self; { freshr = derive2 { name="freshr"; version="1.0.2"; sha256="1vzwdy5cssk9r3fvw0w1pxkn203whzycmvz9fdm08lkd538zwdnj"; depends=[]; }; frictionless = derive2 { name="frictionless"; version="1.0.2"; sha256="0821j53jnkak4nfzqyqrm07qz79laxvwsx78bbn4y1765awyxvaw"; depends=[assertthat dplyr glue httr jsonlite purrr readr yaml]; }; friends = derive2 { name="friends"; version="0.1.0"; sha256="164p9g07vq3xs2lgg250yvzca4b0mp81pqbnjfdkzcqh5hmahsan"; depends=[tibble]; }; - fritools = derive2 { name="fritools"; version="4.1.0"; sha256="0yany14z2m6r1fxfbhkn3bcxgklbi15x2klfipihk9cg9dy0523b"; depends=[]; }; + fritools = derive2 { name="fritools"; version="4.1.1"; sha256="1cbh3m0v8vganmsdi2q6ggrfs3rw4wpi4zzsn1vhjkq1dcrb7bsz"; depends=[]; }; fritools2 = derive2 { name="fritools2"; version="4.1.0"; sha256="1gbji1nq1jgw2h6ll4qzxv6hwvlp3zbw1n9ljnjw4zmz031c3zjd"; depends=[]; }; - frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; }; - frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; fromo = derive2 { name="fromo"; version="0.2.1"; sha256="0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm"; depends=[Rcpp]; }; frontier = derive2 { name="frontier"; version="1.1-8"; sha256="1qhasynm23yihmhb4d7w72msq2z1xf4xnzrkah3z8jv11yxhg1i2"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.3"; sha256="0m4hw4bybahwmpj14ypc5f078j6zpxi5c04ys9qnhks6x4g2a646"; depends=[colorspace rgl]; }; @@ -10051,16 +10069,16 @@ in with self; { fstcore = derive2 { name="fstcore"; version="0.9.14"; sha256="0mhk4l86iypg86l0jjs7szxllcy10h4rh5qy2gsmpmiv003gm3nh"; depends=[Rcpp]; }; fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; }; ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; - ftExtra = derive2 { name="ftExtra"; version="0.6.0"; sha256="1g1w62lkwdhc99ij8q39m61ya8dscc0bilabp5x3bypd9xd02hwv"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tibble tidyr tidyselect vctrs xfun yaml]; }; + ftExtra = derive2 { name="ftExtra"; version="0.6.1"; sha256="102afklfr6lz4vby9ify8ix19y6q4hqbl36ksal6cgx10jasn6pg"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tibble tidyr tidyselect vctrs xfun yaml]; }; ftaproxim = derive2 { name="ftaproxim"; version="0.0.1"; sha256="0955zj99vkq82hc08wl17mk2ij1l30nqbcdikf87cx78a13zxy4w"; depends=[ggplot2 plyr]; }; ftrCOOL = derive2 { name="ftrCOOL"; version="2.0.0"; sha256="0jy0dhkf7hlrriz32abp0h52fw92i5k8x25bjqlzd0khyv2vhj0i"; depends=[]; }; - ftsa = derive2 { name="ftsa"; version="6.2"; sha256="1m8rjivhc5mqsbxjv2v9ly8yb70x0iqcsapbl6kgi3gwvgk4c5pn"; depends=[boot colorspace e1071 ecp evgam fda fdapace fGarch forecast glue KernSmooth LaplacesDemon MASS pcaPP pdfCluster psych rainbow ROOPSD sde strucchange vars]; }; + ftsa = derive2 { name="ftsa"; version="6.3"; sha256="00cb82cd692ni2ys55v6kkzz924gc3lsibgr2zaqw1f9iywkbnic"; depends=[boot colorspace e1071 ecp evgam fda fdapace fGarch forecast glue KernSmooth LaplacesDemon MASS pcaPP pdfCluster psych rainbow ROOPSD sde strucchange vars]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; - fude = derive2 { name="fude"; version="0.3.1"; sha256="0ag0yrr9nw21dm587bfl2w04k0al11l28l6dfnjxb1k6jm6qxlfz"; depends=[dplyr glue magrittr sf]; }; + fude = derive2 { name="fude"; version="0.3.5"; sha256="11gzmgq7rknrhcskfs751f4snh4qcv3hfkqn6b95iv9zkcpar4gm"; depends=[dplyr forcats glue magrittr purrr rlang sf stringi tidyr]; }; fuel = derive2 { name="fuel"; version="1.2.0"; sha256="0pzb77g6l8cz5p7y6czck23kp7hs5zp78k87b5yh0avjlr7ads74"; depends=[]; }; fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; }; - fuj = derive2 { name="fuj"; version="0.1.3"; sha256="14bmk915xv50h51rmyq5y9gixaw4a1nzc08264c95jl0lvbnx28q"; depends=[]; }; + fuj = derive2 { name="fuj"; version="0.1.4"; sha256="1mw4cl6w2nl8f5sfxbvzhbzz2di6msfrdiz8vylqq12z4gzr6l11"; depends=[]; }; fullROC = derive2 { name="fullROC"; version="0.1.0"; sha256="0pn4lh59snfcyyi28350lm4n9xh6y25hpjr38dc33bic4cfbqiyr"; depends=[]; }; fullfact = derive2 { name="fullfact"; version="1.5"; sha256="1p2f4rf54hd0icy49fkq6p973rqisjjmmr1brwcv0fg22nv2kidg"; depends=[afex lme4]; }; fun = derive2 { name="fun"; version="0.3"; sha256="09601ma4irmpkgjspq6zmr383m1pbgyfdkf7gw8w8gp0q7ab89aq"; depends=[]; }; @@ -10070,7 +10088,7 @@ in with self; { funLBM = derive2 { name="funLBM"; version="2.3"; sha256="0aa9h6nbxbvd6iq4q00rndhvb6sq79lpdgr3zwz0lcgjx6p56s5g"; depends=[abind fda funFEM ggplot2]; }; funStatTest = derive2 { name="funStatTest"; version="1.0.2"; sha256="1dqp4yh01w8xdbjhjzxrx33w0hgxcm5a43r27q17m34hqiv33y34"; depends=[checkmate distr dplyr ggplot2 magrittr Matrix pbapply stringr tibble tidyr tidyselect]; }; func2vis = derive2 { name="func2vis"; version="1.0-3"; sha256="16lp9sz63s3g3f1j1dmx881k6wy177cmi4vl6xwg4bzg88bkf8rq"; depends=[devtools ggplot2 ggrepel igraph randomcoloR]; }; - funcharts = derive2 { name="funcharts"; version="1.3.1"; sha256="0bmlcqpx6yzgs0r0jsfyf8k0iw2xs59njjqby8zwkvd6adxc2rzs"; depends=[dplyr fda ggplot2 matrixStats patchwork rlang roahd RSpectra stringr tidyr]; }; + funcharts = derive2 { name="funcharts"; version="1.3.2"; sha256="1ag07wzphsqgaha0h4ya9n68rc79j4y9hhqnppwqphbyj8i029kn"; depends=[dplyr fda ggplot2 matrixStats patchwork rlang roahd RSpectra stringr tidyr]; }; funchir = derive2 { name="funchir"; version="0.2.2"; sha256="1a5nwqnnv0bn2wrw4lbnwbxkb9xr273sq8m8lnv8wy7wzfyfjaxz"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functiondepends = derive2 { name="functiondepends"; version="0.2.3"; sha256="0p831i8l81dbrncmr69024gm5g14p0xiv7li0ljdlqnrbc0fj64n"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; }; @@ -10078,7 +10096,7 @@ in with self; { fungible = derive2 { name="fungible"; version="2.3"; sha256="05yc3g53mpi3ifxqy0r0zaphsb7k16yxhjbrzg6n6wc5mkh2aywp"; depends=[clue CVXR DEoptim GPArotation lattice MASS mvtnorm nleqslv pbmcapply Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; funkycells = derive2 { name="funkycells"; version="1.1.1"; sha256="1pk0m25z4d9h7qqxj87scflbcs2sw4xngj7c0dvxd0y11zb4hs7h"; depends=[fda ggplot2 rpart spatstat_explore spatstat_geom stringr tidyr]; }; - funkyheatmap = derive2 { name="funkyheatmap"; version="0.3.0"; sha256="1fvrkdc82dx8vzg6cgkga37nnk94635n9jp1ndgj2nr6q3k6zli9"; depends=[assertthat cli cowplot dplyr ggforce ggplot2 jsonlite purrr RColorBrewer Rdpack stringr tibble tidyr]; }; + funkyheatmap = derive2 { name="funkyheatmap"; version="0.5.0"; sha256="1rgb49pzhz91qlw75zp0bi231nc9frf1wrp1xd22hpydccklvq6r"; depends=[assertthat cli cowplot dplyr ggforce ggplot2 jsonlite patchwork purrr RColorBrewer Rdpack stringr tibble tidyr]; }; funmediation = derive2 { name="funmediation"; version="1.0.1"; sha256="1h4jic73f7ywk2g1mkg188q0bq6x8sn9sm7jhr8gvrnmh167ajw7"; depends=[boot refund tvem]; }; funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funneljoin = derive2 { name="funneljoin"; version="0.2.0"; sha256="03r03ja0081cn9yd1ib5crj7rsyrccnlqqazgy6jmi6qvwlikrhw"; depends=[broom dplyr forcats glue magrittr purrr rlang tidyr]; }; @@ -10089,10 +10107,10 @@ in with self; { funreg = derive2 { name="funreg"; version="1.2.2"; sha256="0dagzz5pl16l2jkkj11z41y68s75jxmyl46csda6vzlgjc7n4ji8"; depends=[MASS mgcv mvtnorm]; }; funspace = derive2 { name="funspace"; version="0.1.1"; sha256="10yvjx5iydpkn3pjh7f874sjcxg5fzadan7j0rdczm2l64iy6a5m"; depends=[ade4 ape ks MASS mgcv missForest paran phytools viridis]; }; funtimes = derive2 { name="funtimes"; version="9.1"; sha256="0gz26djl534d42wxspg9hl0ndhzzhkr9d4vp87afqqg9401qcgcz"; depends=[dbscan Kendall lmtest mlVAR Rdpack sandwich vars]; }; - furniture = derive2 { name="furniture"; version="1.9.12"; sha256="0akydlxq7my4xfrh6mjgm2i91h215lhbwmxxbjf0fr537yqxjrmd"; depends=[dplyr knitr]; }; + furniture = derive2 { name="furniture"; version="1.9.14"; sha256="07ds1vk1bvv6027g2z93161g3pkdp9vj3prbkjbwkj392sc9rg04"; depends=[dplyr knitr]; }; furrr = derive2 { name="furrr"; version="0.3.1"; sha256="12z4q0fn7asxis17hisi82bvfabl5if1338lmfqmkrwv5rg7748d"; depends=[future globals lifecycle purrr rlang vctrs]; }; fusedMGM = derive2 { name="fusedMGM"; version="0.1.0.1"; sha256="126h8jvmx1y1n49p4s2h3qn7qfzf6q98k7b7rwjn6rn9hjvwd45j"; depends=[bigmemory fastDummies gplots]; }; - fusen = derive2 { name="fusen"; version="0.5.1"; sha256="0fk6yynlncqpj3s8nf402zvjbqzyhv126yxwgfj5ny4hf9s96bka"; depends=[attachment cli desc devtools glue here magrittr parsermd roxygen2 stringi tibble tidyr usethis yaml]; }; + fusen = derive2 { name="fusen"; version="0.5.2"; sha256="05i89hf2ac32cprgvlwazxj441jihx0lfghs59s2wgbjjw55wixr"; depends=[attachment cli desc devtools glue here magrittr parsermd roxygen2 stringi tibble tidyr usethis yaml]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionchartsR = derive2 { name="fusionchartsR"; version="0.0.3"; sha256="09l5kckgkp2l0zvfnqhbzy65bi23aavas9m74nddhjh6di8xndh8"; depends=[htmlwidgets jsonlite magrittr shiny]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; @@ -10107,55 +10125,55 @@ in with self; { futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.4"; sha256="04841fh4nf7qriqk0b2ny943bji60bj42j8czg056d2dza4q4039"; depends=[]; }; - fuzzySim = derive2 { name="fuzzySim"; version="4.9.9"; sha256="1lh60myr49lp25kkd6snpm8sy5vjcfh537mjh4wmyhx1hq0py7qs"; depends=[modEvA]; }; + fuzzySim = derive2 { name="fuzzySim"; version="4.10.5"; sha256="1mqsy5mhq61yzpwbqawxgx58rv2ypi1acl56sn7xqkasrlcywgkq"; depends=[modEvA]; }; fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.8"; sha256="0sb7qia01a5h6p12riq6vdq9likmqb6i949axsxszy5sf1zk50v5"; depends=[doParallel foreach ggplot2 mvtnorm randomForest]; }; fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.6"; sha256="0s5rhqz8vih4za3a8k1k7i3gq8hj0w7bqnakw40k6mg87jvyzsj7"; depends=[dplyr geosphere purrr stringdist stringr tibble tidyr]; }; fuzzyreg = derive2 { name="fuzzyreg"; version="0.6.2"; sha256="056ryj4w26fb4fpy43fgvqs8ijcpm6v503pnzw73d8gxahwkvwl2"; depends=[limSolve quadprog]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.5"; sha256="1g73xivxyh5fvppccgnxhgar6jsl6zsr2djkg0bhh10i633l56ia"; depends=[R6 reticulate]; }; - fwb = derive2 { name="fwb"; version="0.1.1"; sha256="0hgbzmlbj1hhckpxv9zhchk8x8lq0ahcpvhcyibybkwxydii3dd4"; depends=[chk pbapply rlang]; }; + fwb = derive2 { name="fwb"; version="0.1.2"; sha256="1h6ydh9rzs44xr89995bj4z91n4vc2xa1gjkh3nfhzjk6cgnja02"; depends=[chk pbapply rlang]; }; fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; fwildclusterboot = derive2 { name="fwildclusterboot"; version="0.13.0"; sha256="0slm28pgvfsrsdvz2i1h231gkf4iq6gdlspyzppn8nwhngvic5hd"; depends=[collapse dqrng dreamerr Formula generics gtools JuliaConnectoR MASS Matrix Rcpp RcppArmadillo RcppEigen rlang summclust]; }; + fwlplot = derive2 { name="fwlplot"; version="0.2.0"; sha256="1fi2ijfkpxfbwxfcyc5mk2c7mpj6z7lrwm8wlilk2g04y6jmw84l"; depends=[data_table fixest ggplot2]; }; fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; }; fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.1.2"; sha256="1bxrwkf65qw3k6mqvp27lqw6i2r7bdbilnl9406k1nva353gcxxm"; depends=[doFuture foreach future geosphere ggplot2 JOPS MASS progressr]; }; fxl = derive2 { name="fxl"; version="1.6.3"; sha256="1c1cw1j1vz7my868ryg0r7zw655xbhk0za75pvd3mgfy0bs6600x"; depends=[grImport rlang]; }; fxregime = derive2 { name="fxregime"; version="1.0-4"; sha256="0ml1q0xp90jfng6a60pfkp6j7wajk6pz4p4wm08rfqikgsdvp0m4"; depends=[car sandwich strucchange zoo]; }; - fy = derive2 { name="fy"; version="0.3.0"; sha256="13803ld4b59ly5h3zlianag9901jyw6p70bsyz5dj7k62hg7ha3s"; depends=[data_table fastmatch hutils]; }; + fy = derive2 { name="fy"; version="0.4.2"; sha256="1gbv2hvh3y9qdld660i250snwxn4irp41qrr3pc1nakbf5b9aqnz"; depends=[data_table fastmatch hutils]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; g3viz = derive2 { name="g3viz"; version="1.1.5"; sha256="0pjn1rgqbrkbdrcnf01j9lm3257fnp7b0p5p3hyhg8srd990wp61"; depends=[cBioPortalData htmlwidgets jsonlite stringr]; }; gCat = derive2 { name="gCat"; version="0.2"; sha256="0n1x039a0pm4sz2rwsgq82n423zgp4xni69129dh3nvxfrc0hzc5"; depends=[]; }; - gDefrag = derive2 { name="gDefrag"; version="0.3"; sha256="016vpj03drygxsa06jin225rfgjvjm938x65990ms15xcwrgv8nb"; depends=[igraph maptools rgdal rgeos sp]; }; gFormulaMI = derive2 { name="gFormulaMI"; version="1.0.0"; sha256="1zp8gn83h7bnfygi46qqhda4z5n2axbvcmqvhz60ba0daknw0jx0"; depends=[mice]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; gJLS2 = derive2 { name="gJLS2"; version="0.2.0"; sha256="112fyy76ry6g0xinhy09s5vdcd11jw7sivadlx05ali89lm5nigg"; depends=[ggplot2 MASS MCMCpack moments nlme plyr quantreg]; }; gKRLS = derive2 { name="gKRLS"; version="1.0.2"; sha256="0kkk463mgrypc5vihv9hvj7dsdwv6yvmhxp6iy6ip1k7nqi8xdvf"; depends=[Matrix mgcv mlr3 R6 Rcpp RcppEigen sandwich]; }; gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; - gMCPLite = derive2 { name="gMCPLite"; version="0.1.2"; sha256="1vaqwbj64m7xvr9vhpy0vb3l88sp1cbnpnxvw20ma62qvrayk2yn"; depends=[ggplot2 MASS mvtnorm]; }; + gMCPLite = derive2 { name="gMCPLite"; version="0.1.3"; sha256="1v5nzzyxwjlrrn6qqi0jgd5z4zzyq5abjhd38cvr6rhyjjj9hlxi"; depends=[ggplot2 MASS mvtnorm]; }; gMOIP = derive2 { name="gMOIP"; version="1.5.0"; sha256="1ihbwzc2vmbzs1rvmqv386n0snmsljdv1jqbpyx21c8xkx81wc4v"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr png purrr Rfast rgl rlang sp tibble tidyr tidyselect]; }; gMWT = derive2 { name="gMWT"; version="1.4"; sha256="1iv7dav6l9gx6vhghcyasdizjsz2f8yzcgkj2i50kpgw74ljg5ia"; depends=[clinfun Rcpp RcppArmadillo]; }; gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; }; - gRain = derive2 { name="gRain"; version="1.3.13"; sha256="1mbxny2ykm32wbh04n8f049f0ww4kj5j18m8bqr78ggcmmrwl19q"; depends=[broom graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRain = derive2 { name="gRain"; version="1.3.14"; sha256="1w6fmbq6ik0c0aj7xv53nrg96gw1kfk8vhqp57rhmq42m8i4k0i8"; depends=[broom gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; }; gRaven = derive2 { name="gRaven"; version="1.1.8"; sha256="0nmnmn5ni4ml5r7ah7kl8n51r5bcd9r6ncg7yz4qypbdqdamqx87"; depends=[gRain gRbase rlang]; }; - gRbase = derive2 { name="gRbase"; version="1.8.9"; sha256="0zix34w60l94qsfh6gxw9qf4l564fmml9s4nc4y5kr4nv11b9jns"; depends=[BiocManager graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRbase = derive2 { name="gRbase"; version="2.0.0"; sha256="0hnrdza3614mgb76br0cfx49kpjg1s0563shljl6jcqhbxhw944v"; depends=[igraph magrittr Matrix Rcpp RcppArmadillo RcppEigen]; }; gRc = derive2 { name="gRc"; version="0.4.5"; sha256="051xypj0mcrmb4xyrbpicz08dj74klrfbzi463hvbgcvxyh75m3c"; depends=[gRbase magrittr MASS Rcpp RcppArmadillo]; }; - gRim = derive2 { name="gRim"; version="0.2.10"; sha256="1h5fds5paqg0bxdpbk6cz2wclw9sbwaw08zrp7dxims0n5fcc8zp"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; - gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; + gRim = derive2 { name="gRim"; version="0.3.0"; sha256="1iimjfqy2sdxxy2lvsaywxap8zik2qikjy2ib06mqjxrv711fx2a"; depends=[gRain gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; }; gSeg = derive2 { name="gSeg"; version="1.0"; sha256="0lixlirisnxk29zlrragi3l8j1abb5cl7zh6vhx7l5hjdvh8ldq9"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; - gTestsMulti = derive2 { name="gTestsMulti"; version="0.1.0"; sha256="06lra9jknwrs9w5d23nyxjpy8k4v2dk4zib5n4mx14zgd3bmf7ca"; depends=[MASS Matrix]; }; + gTestsMulti = derive2 { name="gTestsMulti"; version="0.1.1"; sha256="126731bb0f454x0pr378x6ri71i8nl6i6zcqx9jdv68wj8f4g0zy"; depends=[MASS Matrix]; }; gWQS = derive2 { name="gWQS"; version="3.0.4"; sha256="1yhbcmznii3n2sbw0z2rw1sdn0zlk5v2z7ww3nl7rn005g4q04hi"; depends=[broom cowplot dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS Matrix nnet plotROC pscl reshape2 rlist]; }; gWidgets2 = derive2 { name="gWidgets2"; version="1.0-9"; sha256="1ifljpdazzmwf3mgkg9g76365n2cmw8dd3da161fpvw84xxyznfl"; depends=[digest]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-8"; sha256="02ic4avpa33dnqsnm1mzg7ci1psngk1p169pqf259szf6v39qf8h"; depends=[digest gWidgets2 memoise]; }; gadget2 = derive2 { name="gadget2"; version="2.3.11"; sha256="0ka5mbr9nppgsr95l33k510h278z49j6chbbqvbba0gan9842kwg"; depends=[]; }; - gadget3 = derive2 { name="gadget3"; version="0.9-0"; sha256="1h1xyhqzjks7dcnmf76xxx5kc659r3kafjc6bl07z66cv2zadmgi"; depends=[digest Matrix rlang TMB]; }; + gadget3 = derive2 { name="gadget3"; version="0.10-1"; sha256="1ky9mv23smrgkr32klcbiviw71g6rj5vsalc8s95wgly9gd515qk"; depends=[digest rlang TMB]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.5"; sha256="1s2chr3zjgvmmic178c1fixbvf501q7jvxdg8204jalh9iii14vb"; depends=[dplyr geosphere magrittr raster rlang sp]; }; gainML = derive2 { name="gainML"; version="0.1.0"; sha256="1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n"; depends=[fields FNN]; }; gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; - galah = derive2 { name="galah"; version="1.5.3"; sha256="108qwi7ambnzvw47q3inpvik2qbaz0fpcic9dnc5vnk6dflc76n8"; depends=[assertthat crayon crul data_tree digest dplyr glue httr jsonlite lifecycle readr rlang sf stringr tibble tidyselect]; }; + galah = derive2 { name="galah"; version="1.5.4"; sha256="0x1xds6m6zn2mjw83na4dpjazsdpmlc4py3jnf04l9jk1sav6prd"; depends=[assertthat crayon crul data_tree digest dplyr glue httr jsonlite lifecycle readr rlang sf stringr tibble tidyselect]; }; + galamm = derive2 { name="galamm"; version="0.1.1"; sha256="0iyszijnlg9bsh8234qm1vdrvcbnas18ylks9v4jg32mxnai6vpq"; depends=[lme4 Matrix memoise mgcv nlme Rcpp RcppEigen Rdpack]; }; galigor = derive2 { name="galigor"; version="0.2.5"; sha256="1lfw1kikf90nv9g0xrb656fbilmxdk64zrzi43wrz7y2y55sd5xv"; depends=[cli crayon dplyr gargle getProxy magrittr purrr rappsflyer rfacebookstat rgoogleads rmytarget rstudioapi rvkstat ryandexdirect rym tibble tidyr]; }; - galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; + galts = derive2 { name="galts"; version="1.3.2"; sha256="0a7yhdxja4jq2rn6p8imfg7ih3i4njqsz8zmkgwckj4q2x042lj5"; depends=[DEoptim genalg]; }; galvanizer = derive2 { name="galvanizer"; version="0.5.3"; sha256="1b9431mmgpqyd49b8nlsrlxjq9j9fyj73226bi9jic1p867533kk"; depends=[dplyr httr jsonlite lubridate magrittr rlang tibble tidyjson tidyr tidyselect]; }; gam = derive2 { name="gam"; version="1.22-2"; sha256="1yh2rahcbi2fbsi1yps1l51xxljc7lcs7h729y5vjj4l492pywzy"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-7"; sha256="0zi9g2vxkn1hxc2qyyr1x8p1f9w7fc1j5dmm2mmm333gixkkz9nb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; @@ -10165,23 +10183,22 @@ in with self; { gamblers_ruin_gameplay = derive2 { name="gamblers.ruin.gameplay"; version="4.0.5"; sha256="0h5sfjs2lzs3cfx7q0agq68x4hhqmkiqga04c1gvnzwn8k7i8svc"; depends=[gganimate ggplot2 hrbrthemes viridis]; }; gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-7"; sha256="1mx2aixdswmb8dgg1iawqzak2w7a1w4x6igk8wdwi05gifrgrs3i"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.88"; sha256="16khm2fpsb3ivfszrilxbrzc8a281vmd1q36dcn50xbkvn19syxg"; depends=[mboost]; }; - gamclass = derive2 { name="gamclass"; version="0.62.3"; sha256="0i2nynl4b46rdl8f2zashcg0dvlhcq9paq8hx5y40xpxm8iljqab"; depends=[lattice latticeExtra randomForest rpart]; }; + gamclass = derive2 { name="gamclass"; version="0.62.5"; sha256="0y34970qwgssdnwnhb1hnkyav8j7pq3hkdskw63qs8cin4cknq7j"; depends=[lattice latticeExtra randomForest rpart]; }; gameR = derive2 { name="gameR"; version="0.0.5"; sha256="0k4gsnlb4jc9nbvxjjqyllvn70a707pl1icc3dhc62gqychkaxyn"; depends=[]; }; gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-8"; sha256="1psvxx7ymkgr4acis85842xgafc5azdl7v1cmgvgbhsdwksm95q7"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.4-12"; sha256="1w5630hzir49nacpvmx28hqc8hcc9acmba9dd8zwzhz5ywwi0ycz"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.4-20"; sha256="0wv812xby0i8zn07zw30ic4mmr418gk1ch1lvyh0kybkw4h1w356"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; gamlss_add = derive2 { name="gamlss.add"; version="5.1-6"; sha256="0g80bn0nszs2nmka6dypyvqnsgxp7mzhf5nd82n5x4jm3ca3dbdj"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; - gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; }; + gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-7"; sha256="1l2g0gn794jyyjxvphfk1l8h4qwf6sk1akcf0c08xqx3kgillnjl"; depends=[gamlss gamlss_dist survival]; }; gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; }; gamlss_data = derive2 { name="gamlss.data"; version="6.0-2"; sha256="07mpdl4h9rwmnpl9jmsn6ig8ji11an6pyjfsvg62h2alapwbdcyv"; depends=[]; }; gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; - gamlss_dist = derive2 { name="gamlss.dist"; version="6.0-5"; sha256="03m275qvrmpzmc10hs48277kxp503riz8sz6xk9pkpj8n7gsz20g"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="6.1-1"; sha256="0sch2bh1mchl7kfdy4wcmwzzgx7cldswn65a2br2x73rb1v3mnyj"; depends=[MASS]; }; gamlss_foreach = derive2 { name="gamlss.foreach"; version="1.1-6"; sha256="1bld98lfbgj1v6l4vq3yysg1lnvpgj2r9vykkfy0q1yipv2xbnqb"; depends=[doParallel foreach gamlss gamlss_data gamlss_dist glmnet]; }; - gamlss_ggplots = derive2 { name="gamlss.ggplots"; version="2.0-1"; sha256="1nzjfki007zky79xwi1mld7pxl6yg8snxdyh3zd9prndnbj6c85s"; depends=[ellipse gamlss gamlss_dist gamlss_foreach gamlss_inf ggplot2 ggridges]; }; gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-1"; sha256="0m091zxjm5wvhm6mzbpzkr275n3qnlb3v4099k0a1jymahk4w7vr"; depends=[gamlss gamlss_dist]; }; gamlss_lasso = derive2 { name="gamlss.lasso"; version="1.0-1"; sha256="03c8k6hl23ag98dihznfz1h0qc3pwxbnpv58pvmx3xbb3lipfjfb"; depends=[gamlss glmnet lars Matrix]; }; gamlss_mx = derive2 { name="gamlss.mx"; version="6.0-0"; sha256="0b06nb6nq36ay0p5z57j5d4hrly5917wcsal7986mp1270iwnpip"; depends=[gamlss gamlss_dist nnet]; }; - gamlss_spatial = derive2 { name="gamlss.spatial"; version="2.0.0"; sha256="1pgmlc6i7p5mjb1pc7b861yjl2gwr37bbzj3j2dl0qzybrs742mx"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; }; + gamlss_spatial = derive2 { name="gamlss.spatial"; version="3.0-2"; sha256="1v1mwi0k38b1b6bwf9gw46fkx83gzfxfqcyykx6kzpc7shkvy8f8"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; }; gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-7"; sha256="0drimqfy22v3lbb6wclia9dkij2r1r4syz9i74fhn07qxay7b6cg"; depends=[gamlss gamlss_dist]; }; gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; }; gamm4 = derive2 { name="gamm4"; version="0.2-6"; sha256="128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap"; depends=[lme4 Matrix mgcv]; }; @@ -10189,11 +10206,11 @@ in with self; { gamma = derive2 { name="gamma"; version="1.0.4"; sha256="02qdv1kzz1pw07zksxl97ra4wd15xgdzfaq9qfwfcci67xmx88ap"; depends=[ggplot2 IsoplotR rlang rxylib]; }; gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.8-2"; sha256="1w1z2g0njsfv1ah6w3zw4lcgnaxask5mgykb204jzp6hpnc1a6cb"; depends=[foreach mda]; }; - gamselBayes = derive2 { name="gamselBayes"; version="1.0-3"; sha256="0w5jpnmihz8ggqz060849m1xy2r1bv46s89ar4mff95pf5bykfah"; depends=[Rcpp RcppArmadillo]; }; + gamselBayes = derive2 { name="gamselBayes"; version="2.0-1"; sha256="1947lpxhiyf2kf22miliikx8plzhb1l97w440fb626vvgwfa340j"; depends=[Rcpp RcppArmadillo]; }; ganDataModel = derive2 { name="ganDataModel"; version="1.1.4"; sha256="1vpw5ijl0mr1vgzqavsmich0f0vhi94df6d92a7adi915inqvdaz"; depends=[Rcpp tensorflow]; }; ganGenerativeData = derive2 { name="ganGenerativeData"; version="1.4.3"; sha256="0fsdzjhawkdc997f3w73da81h00a4ar8aljmfypy311nsg8nda7c"; depends=[Rcpp tensorflow]; }; - gap = derive2 { name="gap"; version="1.5-1"; sha256="1p0kwdsay8n29sg8jpfjbyqj3848irzn3l6a238fn4jpbw23fk8d"; depends=[dplyr gap_datasets ggplot2 plotly]; }; - gap_datasets = derive2 { name="gap.datasets"; version="0.0.5"; sha256="170w271vs24car0xf73h8yv1hrpl83j6mik6mw7cw8p3zqpbb692"; depends=[]; }; + gap = derive2 { name="gap"; version="1.5-3"; sha256="1kjjnh0s9aicwkd7wsisi4c75y701irigsbzp7y6f2264bcgj6bf"; depends=[dplyr gap_datasets ggplot2 plotly Rdpack]; }; + gap_datasets = derive2 { name="gap.datasets"; version="0.0.6"; sha256="1jwpsb66sgj2zzgrpgwxc22df66gbhi278ywbmaicc10mipv050y"; depends=[]; }; gapclosing = derive2 { name="gapclosing"; version="1.0.2"; sha256="1nq7wbl3236rg27hpfrl1f20gg0yrjmddcghmnh0yv5nzl52l798"; depends=[doParallel dplyr forcats foreach ggplot2 glmnet magrittr mgcv ranger tidyr tidyselect]; }; gapfill = derive2 { name="gapfill"; version="0.9.6-1"; sha256="15mrn44v5l4sgxwlyp1rik5mdg7m2s6xxcdigc3sjd1yhxalgw12"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapmap = derive2 { name="gapmap"; version="0.1.0"; sha256="04dz7ns7xsa0q0v7sllaqlhk4mis8gvqzr2a1y4fiiqrk7337gmm"; depends=[ggplot2 reshape2]; }; @@ -10201,32 +10218,30 @@ in with self; { garchx = derive2 { name="garchx"; version="1.5"; sha256="0znb5drsbd6vfr6yp020r3w3k3jmk6p3xcnkx3n2sc7fm2qg765b"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="1.5.2"; sha256="00ch0ddysva3dbs6wsybgy76j3f2ib6iypdg9f5ic2mmdq2fnnsa"; depends=[cli fs glue httr jsonlite lifecycle openssl rappdirs rlang withr]; }; gargoyle = derive2 { name="gargoyle"; version="0.0.1"; sha256="0lsjplfrc047lb3zjfsc8wl47kll7d85v824k7zlr0n34xbbypq7"; depends=[attempt shiny]; }; - garma = derive2 { name="garma"; version="0.9.11"; sha256="05jhac1cm82xjpz1dnwp7xcs58b3lxbzh4wmr4z7hkn5jdh3gsv5"; depends=[BB crayon dfoptim FKF forecast GA ggplot2 lubridate nloptr pracma pso Rsolnp signal tswge zoo]; }; + garma = derive2 { name="garma"; version="0.9.13"; sha256="0h61f29x2261vky4cwmcfwlix7x1yg8qkhgkhiw1aryqmzvwf0lc"; depends=[BB crayon dfoptim FKF forecast GA ggplot2 hypergeo ltsa lubridate nloptr pracma pso Rsolnp signal tswge zoo]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.21"; sha256="0grn08w7cy8vsn8cys7j1sp3qy4h90z20f886nva22zmkn1ha9wd"; depends=[Rcpp RcppArmadillo]; }; - gasfluxes = derive2 { name="gasfluxes"; version="0.5"; sha256="0y17lpry9q6lkkmnpj9sn0yql1g5q1z32zcc7hxxip6sd46qxjqn"; depends=[data_table MASS sfsmisc]; }; - gasmodel = derive2 { name="gasmodel"; version="0.4.0"; sha256="0xd59z9yhjx4f76zkpn551rd96qqwryvps69lkzvardah4hgyd60"; depends=[abind arrangements CircStats Matrix mvnfast nloptr numDeriv pracma]; }; - gasper = derive2 { name="gasper"; version="1.1.3"; sha256="0ff110nc5p7x8q7cljvzyjqdyf4lwz1dkq2i0pqasiifdij6m71a"; depends=[curl ggplot2 httr Matrix Rcpp RcppArmadillo RSpectra]; }; + gasfluxes = derive2 { name="gasfluxes"; version="0.6-1"; sha256="08lngyxr39iycp1fnyvl27qks421rx6l8x1akysnixhxy9f53apx"; depends=[data_table MASS sfsmisc]; }; + gasmodel = derive2 { name="gasmodel"; version="0.5.1"; sha256="1q98hyn45k0r2zv8dd7f952jhl8xynpv9wkvijdync2hhi8hy6qi"; depends=[abind arrangements CircStats dplyr ggplot2 Matrix mvnfast nloptr numDeriv pracma tidyr]; }; + gasper = derive2 { name="gasper"; version="1.1.4"; sha256="1r0hhn7rk2a1pdq02y3ih8f77b2zna2001pb5lyrp59klmda1d09"; depends=[curl ggplot2 httr Matrix Rcpp RcppArmadillo RSpectra]; }; gastempt = derive2 { name="gastempt"; version="0.5.5"; sha256="0pz580nhr9hnpzdi59l00jv34jmy5iyh5skbwslq6gzjdw3jgsf4"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen RcppParallel rstan shiny StanHeaders stringr tibble utf8]; }; gaston = derive2 { name="gaston"; version="1.5.9"; sha256="1f4pr5s4p4rw1smvsh2gwjxp7hh43j1fpadl286ma9i62kirpyq7"; depends=[Rcpp RcppEigen RcppParallel]; }; gateR = derive2 { name="gateR"; version="0.1.13"; sha256="0arnjb5jzsc8xfqj08h352h7j0adijaj1fra08nx0jc41hfs3ljg"; depends=[fields lifecycle rlang sparr SpatialPack spatstat_geom terra tibble]; }; - gatepoints = derive2 { name="gatepoints"; version="0.1.4"; sha256="0gwyrkxn4xd79cl60xa312k6nz17mdjdiym65dq7s2384fa80wbm"; depends=[]; }; - gatoRs = derive2 { name="gatoRs"; version="1.0.0"; sha256="1637mx80fr89w205qzp47fjgh6ms5r173c6schjh30vyf9xdljm6"; depends=[CoordinateCleaner dplyr leaflet magrittr parsedate raster rgbif ridigbio spatstat_geom spThin stringr]; }; - gauseR = derive2 { name="gauseR"; version="1.1"; sha256="0jlbaylglyza6hlf62g3z0n349zlzlhx6g4jwdzg8b2sh4c3c9yn"; depends=[deSolve]; }; + gatepoints = derive2 { name="gatepoints"; version="0.1.5"; sha256="0f9n32s1ssp4nmjarls4llmi91jxh4w4qwxf7awxaalqz4lrzbg2"; depends=[]; }; + gauseR = derive2 { name="gauseR"; version="1.2"; sha256="1rvw7dbrsxqqch2dgslabc47llb64ljakc60m47gql5n9br7akbd"; depends=[deSolve]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; - gausscov = derive2 { name="gausscov"; version="1.0.2"; sha256="16nyq7379cnpr6hkzkmrgw2r3rl0fy6sfpc5gszf4l115f7ig4cc"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="1.0.3"; sha256="0j9cnj2bpmv5vma7c2ihc5fa1ly5n7ll13fi1bqlvivjm981zss0"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; gaussplotR = derive2 { name="gaussplotR"; version="0.2.5"; sha256="0amkgzgh6764ri30210nhbi3wcll3248fmkpclx010dxc3hllfdx"; depends=[ggplot2 metR rgl viridisLite]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-3"; sha256="04689l076agncsxqcbkx76z89cvjigs8p8v58p5kad655gjpqcx3"; depends=[orthopolynom polynom]; }; gawdis = derive2 { name="gawdis"; version="0.1.5"; sha256="13f7fx5j9r5wky2zriyqlr7vjda1y9c7n3iz0ajw6fxfr1c670dx"; depends=[FD GA]; }; - gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; }; gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; gbeta = derive2 { name="gbeta"; version="0.1.0"; sha256="0611rynyybmiq6pj5jvwijdgx3hnr6mscv20lrqzlfplbmvmz0bj"; depends=[gsl Rcpp RcppEigen RcppNumerical Runuran]; }; gbfs = derive2 { name="gbfs"; version="1.3.8"; sha256="0ric1qr9byc3l75s3jf63mhhsmywxj95rm2sk68q7ff8c63xp5vz"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; - gbifdb = derive2 { name="gbifdb"; version="0.1.2"; sha256="1im2lsd7gnxbpf2s0i5kx9g34ryvnxdz51lq0ww7dd2wjqcngqfn"; depends=[arrow DBI dplyr duckdb]; }; + gbifdb = derive2 { name="gbifdb"; version="1.0.0"; sha256="0lcwi7bx2giwcgr0dw6y1isj9bszs9d5yv4lby6gn0z4cmv6qzcb"; depends=[arrow dplyr duckdbfs]; }; gbm = derive2 { name="gbm"; version="2.1.8.1"; sha256="02z85d7zp3i5x8r8q005hyw2rx1ck7lw81q7a3lqwraj8l95c94d"; depends=[lattice survival]; }; - gbm_auto = derive2 { name="gbm.auto"; version="2023.06.13"; sha256="1hrgcbkwlyw1j31ykn5f5krcii6bh1679dx44l4bjw5ylqry804q"; depends=[beepr dismo dplyr gbm mapplots Metrics sf shapefiles stringi]; }; + gbm_auto = derive2 { name="gbm.auto"; version="2023.08.31"; sha256="14gahb13p9wpsf8a8mb6a7ikas9jcd4hwh4jn4rg1mray4pgj7in"; depends=[beepr dismo dplyr gbm ggmap ggplot2 ggspatial lifecycle lubridate mapplots Metrics readr sf stars starsExtra stringi tidyselect viridis]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; gbmt = derive2 { name="gbmt"; version="0.1.3"; sha256="10dyghrxjd9ddgk7gp2af8a46skzb2m9vazr9s216r20257ijd13"; depends=[Matrix]; }; gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; }; @@ -10244,24 +10259,26 @@ in with self; { gcmr = derive2 { name="gcmr"; version="1.0.3"; sha256="0m4px1w41226clczzmnzal3hs0qwrvlhhdnkcxj1i7qp358ksxvm"; depends=[betareg car Formula lmtest nlme sandwich sp]; }; gconsensus = derive2 { name="gconsensus"; version="0.3.2"; sha256="065i587611nh3fiaxlp88qzd12cjxpbdvxn8pvd99fmk88d809zs"; depends=[coda MASS rjags]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; - gcplyr = derive2 { name="gcplyr"; version="1.5.2"; sha256="0wbvnx9hk20caj0ap4nw97b59zyy4q4kbp83am61gblrn257wahj"; depends=[dplyr tidyr]; }; - gdalUtilities = derive2 { name="gdalUtilities"; version="1.2.4"; sha256="1ixqkm03w207bf5sdrlfxdqjrclkrm0gfhmwm3h2lzwp4himiljn"; depends=[sf]; }; + gcplyr = derive2 { name="gcplyr"; version="1.6.0"; sha256="01qhk9f8rjabs4vi5rfd9crmb2dwv7xflj3ci5abn04b9wykbmjf"; depends=[dplyr tidyr]; }; + gdalUtilities = derive2 { name="gdalUtilities"; version="1.2.5"; sha256="19vi6mr5jwlb00r33hkz7d0n9dar95hwdvbqbhh2dmha128fjwia"; depends=[sf]; }; gdalcubes = derive2 { name="gdalcubes"; version="0.6.4"; sha256="1zvx6adc7i1811ri2i5c5w4rkh5wi1rmxi2xm8amf6cwqym8rnzd"; depends=[BH jsonlite ncdf4 Rcpp]; }; - gdalraster = derive2 { name="gdalraster"; version="1.3.0"; sha256="0klykay7qjlq1zaahcvh4376jakilh8bq8yak34807adjwa624pw"; depends=[Rcpp]; }; - gdata = derive2 { name="gdata"; version="2.19.0"; sha256="1lv3cz990f7m2bfcf62fjm6wz6zd2ycrci06b7mfd0xmcn3bwifi"; depends=[gtools]; }; + gdalraster = derive2 { name="gdalraster"; version="1.5.0"; sha256="14zxvc2w0n2qbjkjikny5dpcsf0anql0fq4rqq7l9739yrazm7q7"; depends=[Rcpp]; }; + gdata = derive2 { name="gdata"; version="3.0.0"; sha256="0zxi0634dkgczw7gicj8r6mhb83cpkxhsy2iivz0b9v52y9bjmm4"; depends=[gtools]; }; gde = derive2 { name="gde"; version="0.2.1"; sha256="05paf15dn2l7mfzhy3p3k7a2831fj9fwvwgljhcv7wpdj7djdccs"; depends=[data_table dplyr DT ggplot2 httr jsonlite leaflet progress R_utils readr RSQLite shiny shinycssloaders shinyWidgets stringr XML]; }; - gdi = derive2 { name="gdi"; version="1.4.1"; sha256="1bn0hrgc8fqpbn4zp9ycgr7i3kl8c6z4z5fqq14801fp94fa6w6w"; depends=[jpeg png]; }; + gdi = derive2 { name="gdi"; version="1.5.4"; sha256="1lsflav0wday5f6fclwwvnzj0b59hh4raw216karqshcs80c8ldf"; depends=[jpeg png]; }; gdiff = derive2 { name="gdiff"; version="0.2-5"; sha256="1j3xmvpqs5vb9iq460dishi8bsb0kwfz6742bpvnhpk8z3mhf9af"; depends=[magick pdftools]; }; + gdim = derive2 { name="gdim"; version="0.1.0"; sha256="02q5ynd22yisl3as9hyrg18p9j74lw6p1z3szm1k2ax0r3k04r27"; depends=[dplyr ggplot2 irlba magrittr Matrix progress rlang tibble]; }; gdistance = derive2 { name="gdistance"; version="1.6.4"; sha256="0awrv10adi31inrgxbb83p73fq05i2xifj2xf16z6mp2lwzgvxba"; depends=[igraph Matrix raster sp terra]; }; + gdldata = derive2 { name="gdldata"; version="0.1"; sha256="19zvchn55d70miqgxnbz3y1svj6gn6236l897qc0cbqmv48mjxh4"; depends=[httr2]; }; gdm = derive2 { name="gdm"; version="1.5.0-9.1"; sha256="10c4fk6pbd946is8h8cr8qblrq6cch5zhlhrxqd8ix5wknm8cqn8"; depends=[doParallel foreach pbapply raster Rcpp reshape2 vegan]; }; gdpc = derive2 { name="gdpc"; version="1.1.3"; sha256="1ba7ma1y4pxvx7byg19fzgpp1zswcihdaifyhb7zdadizxjzyj43"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.1"; sha256="0gwq0k80rnbg4ibz6dz8sk6hqaklrdbv4vzv8zyk74am3aqipn20"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.3.3"; sha256="10rlx1ciyvh0ayic03kckv360idl9s1zyc2ar5lisns786c1hnns"; depends=[curl fontquiver gfonts htmltools Rcpp systemfonts]; }; + gdtools = derive2 { name="gdtools"; version="0.3.4"; sha256="00mak9js1s05j5bmkda24nl2z023jsyg8zc60nm4h2xs7w1l7mxa"; depends=[curl fontquiver gfonts htmltools Rcpp systemfonts]; }; gdxdt = derive2 { name="gdxdt"; version="0.1.0"; sha256="1yrjixq4srmaiy5iaprix4096yhf3ldyklgjag4kxd3l5acwap4h"; depends=[data_table]; }; gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; }; - gecko = derive2 { name="gecko"; version="0.1.1"; sha256="15a4ar47705kh4zcgqdyhcnwrbcadifaxq3jma6k40jg62axbyid"; depends=[geosphere raster sp]; }; + gecko = derive2 { name="gecko"; version="0.1.2"; sha256="11zvay16kjs0i60vlfglcvd2ym3yk9wwfa76qql2j5i7y3wmjbjk"; depends=[geosphere sp terra]; }; gee = derive2 { name="gee"; version="4.13-25"; sha256="128f810h88jxz1wdcmqjj3drb69b0rwx38l682i97rzb5wg8hh71"; depends=[]; }; - geeCRT = derive2 { name="geeCRT"; version="1.1.0"; sha256="0dki86p1qah07h3xxq2x5abrnc75z82mxr07wx4cqjvan8431ivl"; depends=[MASS mvtnorm rootSolve]; }; + geeCRT = derive2 { name="geeCRT"; version="1.1.2"; sha256="0gqwyf6r3cyzfr6rcl5id5x937asllyc61vrs6416j1awb6d2yn3"; depends=[MASS mvtnorm rootSolve]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; geeasy = derive2 { name="geeasy"; version="0.1.1"; sha256="1b874hacl0hhd16yfaag3kpqrc0336mmkzja0pa3gf7zj8d6n777"; depends=[geeM geepack ggplot2 lme4 Matrix MESS]; }; geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; }; @@ -10271,7 +10288,7 @@ in with self; { geex = derive2 { name="geex"; version="1.1.1"; sha256="0hs17vmwgpvv85za32rmnlylp0fbbirb1irxxqkgx3dsffgvpbm1"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.11"; sha256="0s9zvqgn30spwggwpr02gzdjg3h4kgqamq37i03i14a3i2ls1ifw"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit phytools Rcpp subplex]; }; - gellipsoid = derive2 { name="gellipsoid"; version="0.7.2"; sha256="00xgh2416k4khhkn3v2grz5l1mlc7rj92bq224hg0sjr9yyd8yij"; depends=[rgl]; }; + gellipsoid = derive2 { name="gellipsoid"; version="0.7.3"; sha256="16dh4gs44vnc9v1hj9xjmsq88ygk9vyfp0asqgql1ar61wgmlsav"; depends=[rgl]; }; gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gemlog = derive2 { name="gemlog"; version="0.41"; sha256="16pdhpx21avxjrawj7i47dxzz2wfhabzz5x3nln2pwaz5b147syz"; depends=[signal]; }; gemma2 = derive2 { name="gemma2"; version="0.1.3"; sha256="1l5axji33abrkm2b32ziilhfqssbq4ypv7kimd16fak6xjz50m0k"; depends=[Matrix]; }; @@ -10290,26 +10307,28 @@ in with self; { gendata = derive2 { name="gendata"; version="1.2.0"; sha256="1jcyv7qsmms73s4n4833djr20wxaf8n6y0hlx86yjys7nmx2xiqn"; depends=[]; }; gender = derive2 { name="gender"; version="0.6.0"; sha256="18xiaif6iiwjvnjk611sfz7qi5r7mbi73dcrgrkzkjly8zygp42k"; depends=[dplyr httr jsonlite remotes]; }; genderBR = derive2 { name="genderBR"; version="1.1.2"; sha256="19n3d6ps0wswq1bxgfqifq26svqf8q696im14wfglrl731mr0qbm"; depends=[dplyr httr jsonlite magrittr purrr tibble]; }; + genderstat = derive2 { name="genderstat"; version="0.1.3"; sha256="02g9hhy17m3fdvg6hkl8l2njzys6z3xssdwb094q31kffl987bqx"; depends=[dplyr ggplot2 reshape2]; }; gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; }; geneExpressionFromGEO = derive2 { name="geneExpressionFromGEO"; version="0.9"; sha256="15dvx2f4nsmw1mgjfpcdcfnx8335fd043xb4hdnqcbjzf9h228bp"; depends=[annotate Biobase BiocManager GEOquery markdown R_utils xml2]; }; geneHapR = derive2 { name="geneHapR"; version="1.1.9"; sha256="1fkf41llhmf2rlb1aj5y8qcrq6wn4860bsfp9y6xz1xinjpgi8w7"; depends=[ape Biostrings genetics GenomicRanges ggplot2 ggpubr IRanges lolliplot maps pegas reshape2 rlang rtracklayer shiny shinyjs stringdist stringr tibble tidyr vcfR]; }; geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; }; - genekitr = derive2 { name="genekitr"; version="1.2.2"; sha256="0g22w1bqmcli0vvidcw2ywmc76l3x7zhk3a4fw3vrhwm7vjwnp7k"; depends=[clusterProfiler dplyr europepmc fst geneset ggplot2 ggraph ggvenn igraph magrittr openxlsx rlang stringi stringr tidyr]; }; + geneSLOPE = derive2 { name="geneSLOPE"; version="0.38.2"; sha256="08fbrssj03ak6xqm9fmb9v6ir7229qds891088wznvg58k81yslv"; depends=[bigmemory ggplot2 SLOPE]; }; + genekitr = derive2 { name="genekitr"; version="1.2.5"; sha256="0czmmi9xnmdqd5g9ivys1srmww0x93v2dc1f245kfk26s9xi7177"; depends=[clusterProfiler dplyr europepmc fst geneset ggplot2 ggraph ggvenn igraph magrittr openxlsx rlang stringi stringr tidyr]; }; genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; - genepi = derive2 { name="genepi"; version="1.0.2"; sha256="0cms31s52r6027zc47fgd9nbr1li5vc39cajpg2fpdky4091rizz"; depends=[]; }; + genepi = derive2 { name="genepi"; version="1.0.3"; sha256="0ff5cv8sxda55xjj1pdnaljsg840vmvaz51mgajczv9c0wgj70yj"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.2.2"; sha256="13h3azszr42bzm5af8rkxw1lnd1x5c9lpawfcg3m5xgwvwzlzl3l"; depends=[Rcpp RcppProgress stringr]; }; - generalCorr = derive2 { name="generalCorr"; version="1.2.3"; sha256="13p1z9bshbim4gm3ckmf5vf9alvbi97zwc5zb95c8gzyc52nf1n7"; depends=[lattice meboot np psych xtable]; }; + generalCorr = derive2 { name="generalCorr"; version="1.2.6"; sha256="19yqhzz3xpgb7aixpj214mfkviz0iwap8hh758xyx25jqf4w4h5a"; depends=[lattice meboot np psych xtable]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.1.3"; sha256="0lyhhwik0w7m5h3fbwl2f52gc1v2g6g6h6sc47sa9f58pxin213m"; depends=[]; }; genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; geneset = derive2 { name="geneset"; version="0.2.7"; sha256="1fiyrlsy5zqmxdj71w5m0h70ln5b84y7mlhv2j8lad623gpng3l6"; depends=[dplyr fst RCurl stringi stringr]; }; - genesysr = derive2 { name="genesysr"; version="2.0.0"; sha256="1ravpagqj64s8zhdb32l0dl434vsyc2m0lk36i0k9h0dqi53z7dn"; depends=[dplyr httpuv httr jsonlite later readr]; }; + genesysr = derive2 { name="genesysr"; version="2.1.0"; sha256="0x09cyf4cgd6m79gn63brq0km3y4ki0z0raly4psi8f1zgv21g1s"; depends=[dplyr httr2 jsonlite magrittr readr tidyselect]; }; geneticae = derive2 { name="geneticae"; version="0.4.0"; sha256="0ka0m4dq8a9bzdk3gi7gj6dnc2a7c4chrzixw2g4qd7md31z33vx"; depends=[calibrate dplyr GGEBiplots ggforce ggplot2 MASS matrixStats missMDA pcaMethods prettydoc reshape2 rlang rrcov scales tidyr]; }; genetics = derive2 { name="genetics"; version="1.3.8.1.3"; sha256="0lljxvz7nc6y2z303icphar2niir0i407w5cyhy2pwspd9gwkwpy"; depends=[combinat gdata gtools MASS mvtnorm]; }; genie = derive2 { name="genie"; version="1.0.5"; sha256="07w6rf4a3d34j7dwz9zcxshg2sk1cd5v59xs3jxph17c9gga0nlq"; depends=[genieclust Rcpp]; }; genieBPC = derive2 { name="genieBPC"; version="1.1.0"; sha256="0wc9avjwy4i6zikhqi3mcyws8a6kbgk6qzrrmrm2hlxf5gzlfr47"; depends=[cli dplyr dtplyr httr jsonlite purrr rlang stringr sunburstR tibble tidyr]; }; - genieclust = derive2 { name="genieclust"; version="1.1.3"; sha256="0vhx1hfa778p3n3d8fgf9jl62raygyv84dnnhmvhkwdbqg1a7dpy"; depends=[Rcpp]; }; + genieclust = derive2 { name="genieclust"; version="1.1.5-2"; sha256="0n8r3wvync041ppf72gd3yx1yj9b4fdbcb4gw3lhvsxx1gxwym0k"; depends=[Rcpp]; }; genio = derive2 { name="genio"; version="1.1.2"; sha256="0izx8yv8mvnfxdqnqpnp2ldw1hzs6ggxi7jgmjlgxkgmm4vngbgl"; depends=[dplyr Rcpp readr tibble]; }; geniusr = derive2 { name="geniusr"; version="1.2.1"; sha256="14flyjrnw3l4j02dnr8495r5xdsr83firz0irpqbxw0jrajbj5dq"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.6.1"; sha256="0bhpsz4qcvnmf09l1j6r94ljrdfxidjrsmggb3q4xvyf2xxnnbfx"; depends=[igraph Matrix]; }; @@ -10318,7 +10337,6 @@ in with self; { genoPlotR = derive2 { name="genoPlotR"; version="0.8.11"; sha256="01qn81nsdk3s150gqwisb7xnm4hq5sfzd2zrzpn9kj0rigzgf9zi"; depends=[ade4]; }; genodds = derive2 { name="genodds"; version="1.1.2"; sha256="1dn39h5yxm3mjvm1xciyz127zrd79kw7fi2dlmxwmqk17ssmhrwq"; depends=[Rcpp]; }; genogeographer = derive2 { name="genogeographer"; version="0.1.19"; sha256="0q56ysv5333i27iv1gmd9ilbgn3rw8sb9yq7z76gmn1fak5aqci8"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr maps purrr readr rio rlang rmarkdown shiny shinycssloaders shinyjs shinyWidgets tibble tidyr]; }; - genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; }; genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; }; genomicper = derive2 { name="genomicper"; version="1.7"; sha256="1sran9gjjkrq9yxv4630cyhjhm9w9cggyx3amhcncmyiknz6pa76"; depends=[AnnotationDbi DBI reactome_db]; }; genpathmox = derive2 { name="genpathmox"; version="1.0"; sha256="0yxxaylcqscymhydrjcxd8gi11ih2p100j6qsdxdcifwc4sr1qi0"; depends=[cSEM diagram matrixcalc]; }; @@ -10330,70 +10348,72 @@ in with self; { genstab = derive2 { name="genstab"; version="1.0.0"; sha256="09kg70v8qj8rbqwk0zm3xg54pmrr26l8n1s9x26s8qrsns0dgz0x"; depends=[]; }; gensvm = derive2 { name="gensvm"; version="0.1.7"; sha256="0r1n5icxs313aipl63hdbvki37h2hv1r8ii7m8pyf9h36jxk4lfg"; depends=[]; }; geoAr = derive2 { name="geoAr"; version="0.0.1.4.2"; sha256="1wzhlccscpdzlyx6w9hh7srgrqc3dw56wd99pcrhlqsx0w6b48n0"; depends=[assertthat attempt curl dplyr glue httr leaflet magrittr sf stringr tidyr]; }; - geoBayes = derive2 { name="geoBayes"; version="0.7.2"; sha256="039j7jj1r3ygizpwx6ixih5lny0l8rza95bvinjbmmfpval40vmi"; depends=[coda optimx sp]; }; + geoBayes = derive2 { name="geoBayes"; version="0.7.3"; sha256="14h3iwc0i8y205wvh81zmgz7x4qd605g7w2d3s4s4whnsmi7wf0q"; depends=[coda optimx sp]; }; geoFKF = derive2 { name="geoFKF"; version="0.1.1"; sha256="1fwzc32dq3ip0crxlmnqfxqky1jbadvdyfaprsbcxpmyrcs4f3qj"; depends=[numDeriv Rcpp RcppArmadillo]; }; geoFourierFDA = derive2 { name="geoFourierFDA"; version="0.1.0"; sha256="1a5ggjyfj5ic9h7fqvy3r7s0i6bmbwk95bf7y3vrmmmj0sxdm1mf"; depends=[magrittr orthopolynom Rcpp RcppArmadillo]; }; geoR = derive2 { name="geoR"; version="1.9-2"; sha256="1ndrah1aj996s3pdkixai5438xsfcfxcl21an9qxxa9kd8jzbqvw"; depends=[MASS sp splancs]; }; geoSAE = derive2 { name="geoSAE"; version="0.1.0"; sha256="16fkai95cqwxkylpk1gddyzja80036ghfb4ps3rz1vbbqzhg01x8"; depends=[MASS nlme]; }; geoTS = derive2 { name="geoTS"; version="0.1.8"; sha256="0hjhc68pl1gq9wcgvvagn903vlhwsayf7kka88rdcb6y7rgdlp5v"; depends=[doParallel ff foreach raster robustbase sp]; }; - geobr = derive2 { name="geobr"; version="1.7.0"; sha256="0yx9mk5l2wh34xqg2v7p3p9hwdg2lpzd8bpgq4sm2qs0xk69sdw3"; depends=[curl data_table httr sf]; }; + geobr = derive2 { name="geobr"; version="1.8.1"; sha256="16iw1p0qx57xylb7mp2qgx9fh7667hzfpw8dzakdzp8jpxmwgjwx"; depends=[curl data_table httr sf]; }; geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; }; - geocmeans = derive2 { name="geocmeans"; version="0.3.3"; sha256="11ki3maklaj3c4fx9cs6l8virzhzxdrkrlr231rg0bvs3hlpwagj"; depends=[dplyr fclust fmsb future_apply ggplot2 leaflet matrixStats plotly progressr Rcpp RcppArmadillo Rdpack reldist reshape2 sf shiny spdep terra tmap]; }; + geocausal = derive2 { name="geocausal"; version="0.2.0"; sha256="00i4prrgi02xv0h4r5xfmnl6h9b6arqnvd3vhzrgcmdqv4nl76xk"; depends=[data_table dplyr furrr ggplot2 ggpubr latex2exp mclust progressr purrr raster sf sp spatstat_explore spatstat_geom spatstat_model terra tidyr tidyselect]; }; + geocmeans = derive2 { name="geocmeans"; version="0.3.4"; sha256="02h171flg295ixpgl2glav2ij0wbvy7kclazdlldw40461aar5nk"; depends=[dplyr fclust fmsb future_apply ggplot2 leaflet matrixStats plotly progressr Rcpp RcppArmadillo Rdpack reldist reshape2 sf shiny spdep terra tmap]; }; geodaData = derive2 { name="geodaData"; version="0.1.0"; sha256="003m5wff0q4fdlg64qispmhj2aw83isxg3ijxwkwhvi33bpwpq4z"; depends=[]; }; - geodata = derive2 { name="geodata"; version="0.5-8"; sha256="1d6kaqfnk9dh4r69002bnq3hdg7mnjsi12b35lk38fq2hpd868dx"; depends=[terra]; }; - geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; }; - geodimension = derive2 { name="geodimension"; version="1.0.0"; sha256="0mh16cdac7vi8zv98g3s06109fpadan441zd80x9yfsypx75sdz0"; depends=[dplyr generics magrittr pander readr rlang sf tibble tidyr tidyselect]; }; + geodata = derive2 { name="geodata"; version="0.5-9"; sha256="052gwxl3b0xb93s2b8755cmyxsyk0gy8c25v0hj81cwypnfykbhs"; depends=[terra]; }; + geodimension = derive2 { name="geodimension"; version="1.0.1"; sha256="0gg6xwkbfmmlaqc08ismg9d0yhif9167x6y2zbhsim9pdp01b4q9"; depends=[dplyr generics rlang sf snakecase tibble tidyselect]; }; geodist = derive2 { name="geodist"; version="0.0.8"; sha256="09758v53r057rjsn844g2dc455ccndw1qlndl1xsm2gcp6ch2hr3"; depends=[]; }; - geodiv = derive2 { name="geodiv"; version="1.0.5"; sha256="15aq2pr7j7bbzqlkk13j4xph4r47xq2lcv0rb64b02qnivb77s1m"; depends=[dplyr e1071 landscapemetrics phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf snow sp spatial tibble zoo]; }; + geodiv = derive2 { name="geodiv"; version="1.1.0"; sha256="0580q71m71xd0kn9z8l536ypl31gx4fyw6cn1nc03sazrdilkz8r"; depends=[dplyr e1071 pracma Rcpp RcppArmadillo rlang sf spatial terra zoo]; }; geodrawr = derive2 { name="geodrawr"; version="2.0.0"; sha256="05irfyfpk5lgsh0wax8dqdyfw4prynxz1bhs9k1nrz8yn2dd0imn"; depends=[leaflet sf shiny shinydashboard]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.2.2"; sha256="1zxikh4jj750grpnaazqm51q7yp5df5a77kljvmim4nazzrsyrpg"; depends=[fields lattice rgl]; }; - geofabrik = derive2 { name="geofabrik"; version="0.1.0"; sha256="0k92gmivccw3kbgkb9bjw7pxc4zc3zdj35x0cbzmjq0k3qxq8ad0"; depends=[]; }; geofacet = derive2 { name="geofacet"; version="0.2.0"; sha256="1aylx2hwqk75y73az1zf0s5mjww77d7i9kafbkzw383f0i5qx42w"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sf sp]; }; geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; }; geofi = derive2 { name="geofi"; version="1.0.9"; sha256="0z5cisrfq18arsq8n4p8xiqc8z2wn8riz8l9s5lzihc50s87kh9p"; depends=[curl dplyr httpcache httr purrr rlang sf xml2 yaml]; }; - geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; - geohashTools = derive2 { name="geohashTools"; version="0.3.2"; sha256="04xn0512b36rn473a8j025x5dqwi8kc45rr3iap5ai4wdcrb712z"; depends=[]; }; + geogenr = derive2 { name="geogenr"; version="1.0.1"; sha256="1ji542incj05602iic9wzmrw8v122zxnpvvkvm1vax2j5ryj644j"; depends=[data_table dplyr geomultistar httr sf snakecase starschemar stringr tibble tidyr tidyselect tm]; }; + geogrid = derive2 { name="geogrid"; version="0.1.2"; sha256="0jqqv5agnw071ysrmwz5r2z76f80rzm5bfl5g23gq1mbw85x8z8m"; depends=[Rcpp RcppArmadillo sf sp]; }; + geohabnet = derive2 { name="geohabnet"; version="1.0.0"; sha256="1qd40043x64505slv6w6lcl955awi62gkg2csld0ckyzrr5ykbc4"; depends=[beepr config easycsv geodata geosphere igraph memoise rlang rnaturalearth stringr terra viridisLite yaml]; }; + geohashTools = derive2 { name="geohashTools"; version="0.3.3"; sha256="04hvlxq5fm4mcrlbx09j079522qhlyg4jg6dymwkmqxrwdibcnqq"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.5"; sha256="0aj00zy603w03y36r2x8gvnya9c2xl73pnvi3wy5xky9kmbwh9g4"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.1.1"; sha256="0l4zwyf3f827jpwbsv097d0h8i7pjwpkvdr89hc6vv9pzavfymhp"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.11.1"; sha256="13nbgaz06gqgzn9yam0psikkpglgk6w66gqdh1cj4320jid09n3s"; depends=[crul geojson geojsonsf jqr jsonlite lifecycle magrittr readr sf sp V8]; }; - geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; + geojsonio = derive2 { name="geojsonio"; version="0.11.3"; sha256="0as0lcypj05j1vxkf3f13z4x6crjvgwmy06xrgq7j124f4syns3i"; depends=[crul geojson geojsonsf jqr jsonlite magrittr readr sf sp V8]; }; geojsonsf = derive2 { name="geojsonsf"; version="2.0.3"; sha256="1la6zfzv14ascwds0bp67d7x3am0v14mylc4b2lyd0nrf93a2p17"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.11"; sha256="0396ms1yrmih1s5rppiifq6j50lmmzdyjvlbhk48xkw4ahzq5cmm"; depends=[curl httr progress sf whisker xml2]; }; geomander = derive2 { name="geomander"; version="2.2.1"; sha256="1nbh40ijm27ycm147ldjrv3yccbl9wb41r3k3czy014v32vgdh07"; depends=[censable cli dataverse dplyr geos ggplot2 magrittr Rcpp readr rlang sf stringr tibble tidyr tinytiger]; }; - geomapdata = derive2 { name="geomapdata"; version="2.0-0"; sha256="0mq7hxyyi1ikwdmh7ns9rnkvp2q5s48441i8msx8621scxdv6ga4"; depends=[]; }; + geomapdata = derive2 { name="geomapdata"; version="2.0-2"; sha256="1fp0qwsk4h7inp6jhz1b0zsdhv6frlxbbk8crv4xjzxzc72zhzdx"; depends=[]; }; geomaroc = derive2 { name="geomaroc"; version="0.1.1"; sha256="09j48ms1j7sqakznd2bj6sks1b6ckhch7ydhbdky4jk2acvl7lqw"; depends=[jsonlite sf]; }; - geomerge = derive2 { name="geomerge"; version="0.3.3"; sha256="043dg8q9jjfql4wlya17zqz33wg6c6crvxbsq3srlp7mppvapylh"; depends=[geosphere ggplot2 gridExtra lubridate raster scales sp spdep]; }; + geomerge = derive2 { name="geomerge"; version="0.3.4"; sha256="1isap50gbkcrbpg0wmzvxxa45vaa9szsxf9k9z3j2jjmv2gbg5mk"; depends=[geosphere ggplot2 gridExtra lubridate raster scales sf sp spdep terra]; }; geometa = derive2 { name="geometa"; version="0.7-1"; sha256="18gr82k665y00h8mrq97mrr9l7p4m9m8b49dbgsh22hbz7j7c542"; depends=[crayon httr jsonlite keyring R6 readr XML]; }; geometries = derive2 { name="geometries"; version="0.2.3"; sha256="0xwyiaqxbf35myw0m017sfd8b4wzwnvmx35k2rv1kqwbp6sxfbv4"; depends=[Rcpp]; }; geometry = derive2 { name="geometry"; version="0.4.7"; sha256="0fq1sbjlc02idfsnvily7hgi6zgjvrjh7c57wz166k8vyl2l484n"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; geomod = derive2 { name="geomod"; version="0.1.0"; sha256="06a211cyhcicy5arpjxiglami56plkm6ybxbzbmjd0z6yn9yyd38"; depends=[arm caret Cubist e1071 kernlab nnet qrnn quantregForest randomForest ranger raster rasterVis rpart sp]; }; - geomorph = derive2 { name="geomorph"; version="4.0.5"; sha256="0fricj9cahf807nk0l5hb5x8442cx462jzvrcdkh42v1bbwl23ch"; depends=[ape ggplot2 jpeg Matrix rgl RRPP]; }; + geomorph = derive2 { name="geomorph"; version="4.0.6"; sha256="198ah0xin7xwkjcag74rrjlmaqsz253lm1n07010ffbn01f2cg58"; depends=[ape ggplot2 jpeg Matrix rgl RRPP]; }; geomtextpath = derive2 { name="geomtextpath"; version="0.1.1"; sha256="0i5m1v8mn23krp7ha502v3kv5wpwdy8na4x3nqlg3zld293dybz4"; depends=[ggplot2 rlang scales systemfonts textshaping]; }; + geomultistar = derive2 { name="geomultistar"; version="1.1.1"; sha256="1zxh7iv4qrkyj6wqd3fd709fvycsa3bjmpyy8kqvd44blm78bx2n"; depends=[dplyr rlang RSQLite sf starschemar tibble tidyr tidyselect]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.7"; sha256="0d9l5xv3in016g93apql7dgxndrcygj9r7c6hmx2wqqi53rdkngd"; depends=[geometa httr keyring openssl R6 XML]; }; geonetwork = derive2 { name="geonetwork"; version="0.5.0"; sha256="0yg6pp2ya62qws6jdjxmhqjh5gdn4cfm6zbljazc35xf7d97jjnx"; depends=[geosphere igraph sf]; }; - geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; geos = derive2 { name="geos"; version="0.2.3"; sha256="1c4g3gxri1ql3ycfvk70v7zp0hzv9yrd5qdwzb3v0vsc4hcxppq1"; depends=[libgeos wk]; }; - geosapi = derive2 { name="geosapi"; version="0.6-5"; sha256="0gwzr1ya5a32smwi7841abh3j8zipyg3y430qbdgnchm1f349x20"; depends=[httr keyring openssl R6 readr XML]; }; + geosapi = derive2 { name="geosapi"; version="0.6-7"; sha256="1cxjg9zg4ayli18rx0wdr709fi67xvqg56z41r3j13235qbnrqjb"; depends=[httr keyring openssl R6 readr XML]; }; geoscale = derive2 { name="geoscale"; version="2.0.1"; sha256="1ykzxbwjdy0xi5hj5r201j3wrgahcxvxrgp40mqlw7zj80wgdgif"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; geosimilarity = derive2 { name="geosimilarity"; version="2.2"; sha256="1mkab3377r04zybqsswakcgqwgby9iwb8bhxkr8s27blxha44jcp"; depends=[DescTools dplyr ggplot2 ggrepel SecDim]; }; geospark = derive2 { name="geospark"; version="0.3.1"; sha256="004axa0k9xg1hra8jihwgnc379k8pib1h0zkr82j0m9sii4wrk6r"; depends=[dbplyr dplyr sparklyr]; }; geosphere = derive2 { name="geosphere"; version="1.5-18"; sha256="1h6sqvxwxv22js6hz4s8sjk50ygw0y34icbbbdb2v36ca3q6zzwr"; depends=[Rcpp sp]; }; - geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; + geospt = derive2 { name="geospt"; version="1.0-3"; sha256="1ap7fcxh95si8mifcykxfk2q2bnpdr397w9gj0inm2zqzv616rib"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="1.0-1"; sha256="1n1jvigavcxlbc5wki74lnhax3060i44m1cvkcr664wsjqhx3kl2"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostan = derive2 { name="geostan"; version="0.5.1"; sha256="14ys4bgcjgyh1zgnwdvw74ksciwy5j0qq1xxma0larbk6pm52h25"; depends=[BH ggplot2 gridExtra MASS Matrix Rcpp RcppEigen RcppParallel rstan rstantools sf signs spdep StanHeaders truncnorm]; }; + geostan = derive2 { name="geostan"; version="0.5.2"; sha256="12jw7v4c5amrh8f6vb7c3vv1zvr591krvz7bz55kwa7p1972zbnz"; depends=[BH ggplot2 gridExtra MASS Matrix Rcpp RcppEigen RcppParallel rstan rstantools sf signs spdep StanHeaders truncnorm]; }; geostats = derive2 { name="geostats"; version="1.6"; sha256="0fmp6883a3xqay3wcc3bz7czhyik1mki3zn5z195iag11yvc5wr6"; depends=[]; }; + geostatsp = derive2 { name="geostatsp"; version="2.0.1"; sha256="0sd24fc5896xi5wijj3zhmkzq8rspnv9xcf6yc268f4cfzdwpzkc"; depends=[abind Matrix numDeriv terra]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotopbricks = derive2 { name="geotopbricks"; version="1.5.6.0"; sha256="0s0rdbnhj3vr4n7bp4vy87pvr1xghw62ymr5nmaypk4wv3jgxlcv"; depends=[raster sf stringr terra zoo]; }; - geouy = derive2 { name="geouy"; version="0.2.7"; sha256="0wwz54jyq0qr3nw8zsnz4s0jl5j96xjarqxwzrkv1y1ni9g38gjw"; depends=[assertthat curl dplyr fs ggplot2 ggspatial ggthemes glue magrittr raster rjson rlang sf sp stringr tidyselect viridis]; }; + geouy = derive2 { name="geouy"; version="0.2.8"; sha256="02x52fid3pmaaj22b729zvrh8giwb2a4az66xxwp0lw03pf188zi"; depends=[assertthat curl dplyr fs ggplot2 ggspatial ggthemes glue magrittr raster rjson rlang sf sp stringr tidyselect viridis]; }; geovol = derive2 { name="geovol"; version="1.0"; sha256="13ll9jyh1fadm2rpfvja0fnqnpr6haivz1vmmpi6yc95rpl4234b"; depends=[zoo]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; }; gerbil = derive2 { name="gerbil"; version="0.1.9"; sha256="1ra1piza922sigxk61v55dbpkmzha716drmb6m1qxn892vykmm8w"; depends=[DescTools lattice MASS mvtnorm openxlsx pbapply truncnorm]; }; - germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.7"; sha256="03573110wrmr9m2zvcmqqhrlm8k24x1z1vslyry75bcs2jm8fk4z"; depends=[broom data_table ggplot2 ggrepel mathjaxr minpack_lm plyr Rdpack]; }; - gert = derive2 { name="gert"; version="1.9.3"; sha256="09v8dv1yazgc7g1yi3h5x5hrljix9kaiadbhsd1cvannp5pj7332"; depends=[askpass credentials openssl rstudioapi sys zip]; }; + germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.8"; sha256="1lssjs9rp09l9draylrkslb74apizbanacgp00yyxhgxa39dk2g6"; depends=[broom data_table ggplot2 ggrepel gslnls mathjaxr plyr Rdpack]; }; + gert = derive2 { name="gert"; version="2.0.0"; sha256="14b3bppid65jpzxrc7ddvvyr2qafv08z75v19rvfiv7780vpq53w"; depends=[askpass credentials openssl rstudioapi sys zip]; }; gesisdata = derive2 { name="gesisdata"; version="0.1.2"; sha256="1cabgmprwlwn09hd1jd9hvj50bqaarxyajz251l0vv2qb3d5l11a"; depends=[dplyr foreign magrittr netstat rio RSelenium stringr]; }; + geslaR = derive2 { name="geslaR"; version="1.0-1"; sha256="05dswf8c10vwhswsgdpzkqlhbazrw8bd62ndk768lw31fj1n0cab"; depends=[arrow cli dplyr]; }; gesso = derive2 { name="gesso"; version="1.0.2"; sha256="0i7a927mbll8mlisxb0ic62fvq1wp5v0m69n7zkhcjabkxr7gbn3"; depends=[BH bigmemory dplyr Matrix Rcpp RcppEigen RcppThread]; }; gestalt = derive2 { name="gestalt"; version="0.2.0"; sha256="0p8xrlmc81irh9s2c57sxgmvdjmmgmya0h31904c4cwi9aa32f4z"; depends=[rlang]; }; gestate = derive2 { name="gestate"; version="1.6.0"; sha256="1b6zyrph3h7cgnl8rxj3yv14mgnvxvgk26m84k5v8cbnly9ky2k2"; depends=[doParallel foreach shiny shinythemes survival]; }; @@ -10405,16 +10425,16 @@ in with self; { getable = derive2 { name="getable"; version="1.0.3"; sha256="0v45nqpx55vbj68gj4wxr0bdlrl897ayac78rxjd2lkkjx49hlyh"; depends=[knitr]; }; getip = derive2 { name="getip"; version="0.1-3"; sha256="096cycq9w197didbq0zxmsagrlbl1vgb7rv13n32sgyw15rngh8f"; depends=[]; }; getmstatistic = derive2 { name="getmstatistic"; version="0.2.2"; sha256="100m5cbwx9anlh1hzjv7d1h1viqsxb0bx0ksc1dsjx3gqrf77q1n"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; - getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; + getopt = derive2 { name="getopt"; version="1.20.4"; sha256="12qy48adnibfi9rpv5qd8k3hipbc4q85514dsz0xnhdsdnz6rlw7"; depends=[]; }; gets = derive2 { name="gets"; version="0.37"; sha256="1h7hn8n08sqnygbzyiq9zg11b5i9g6islc72c0qypx4j4wba5z55"; depends=[zoo]; }; - getspanel = derive2 { name="getspanel"; version="0.1.4"; sha256="18lgcaz8vqzp2pjld9cc2gkq42nk8216rgqsda8wdynsxc697wr2"; depends=[fastDummies gets ggplot2 Matrix mvtnorm]; }; + getspanel = derive2 { name="getspanel"; version="0.1.5"; sha256="0g02iapl0p14s9s7zan47j0g4kays43r01f65i2zgkidfwnvhlbr"; depends=[fastDummies gets ggplot2 Matrix mvtnorm]; }; getspres = derive2 { name="getspres"; version="0.2.0"; sha256="190y4qrm1wawp0787zhw3g8h9s2smacvvxbs70pxbhysq4bkzcdd"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; gettz = derive2 { name="gettz"; version="0.0.5"; sha256="0dgzw5mji5983588vj6q2kyjv9dngmrd0ilrkhfc3b4ngvfq61mf"; depends=[]; }; getwiki = derive2 { name="getwiki"; version="0.9.0"; sha256="1dj91hc65l84yhzdl7i05s7nw0ybgijjs2g2dxgfmsvxnj10fgby"; depends=[jsonlite]; }; gexp = derive2 { name="gexp"; version="1.0-21"; sha256="1x2lpz4mqk5khqjyfval59m6cc6bw0c9a8dgr29yn4l8r8vsm9ky"; depends=[jpeg mvtnorm png]; }; geysertimes = derive2 { name="geysertimes"; version="0.1.9"; sha256="08d04znd1h4s5vdp5981bzz4rb48lnx2nwwnvcqk84rl6zmc0l97"; depends=[jsonlite lubridate readr]; }; gfboost = derive2 { name="gfboost"; version="0.1.1"; sha256="1flvvqm9rk156nqnd0qwpagjl7kp2r4mkxpmp1i4zdnnyp2cydwk"; depends=[mboost mvtnorm pcaPP]; }; - gfcanalysis = derive2 { name="gfcanalysis"; version="1.6.0"; sha256="0w0r4w570dp7n5ixm7qv3x1pw478dghqbyfvfxfi99f5453jdma1"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; + gfcanalysis = derive2 { name="gfcanalysis"; version="1.8.0"; sha256="0j13y90nyd3qczrkzxwi1wpf5xlh7c0nlsyn8p7z1b4y93v63byc"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl sf stringr terra]; }; gfer = derive2 { name="gfer"; version="0.1.12"; sha256="19iarppqaz05352f3ng01yi7na9p612nxwwwagm2nxy1gxrjz5rh"; depends=[circlize data_table ggplot2 ggrepel googlesheets4 gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; gfiExtremes = derive2 { name="gfiExtremes"; version="1.0.0"; sha256="1ys7vrd5kpyqj42m384r2b91w53rlx6hcznpb0a0mnniqj4wc61r"; depends=[BH coda doParallel foreach Rcpp RcppArmadillo]; }; gfiUltra = derive2 { name="gfiUltra"; version="1.0.0"; sha256="1n6sp7h0ys92mqixznrs2j8kmban3mx8swrwdpxgxc6vxycky8d8"; depends=[lazyeval mvtnorm SIS]; }; @@ -10427,20 +10447,21 @@ in with self; { ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.3.0"; sha256="0dkr3vl4a3css19j53x1c1gxxgjg57d444ahxrrrxsyva49lnq1y"; depends=[ggplot2 scales]; }; ggDoE = derive2 { name="ggDoE"; version="0.7.9"; sha256="0vbmrgd7ak7ksw1ah681a1hhvlm646a0pgblmvm4s23gy3499rz7"; depends=[ggplot2 insight]; }; - ggDoubleHeat = derive2 { name="ggDoubleHeat"; version="0.1.1"; sha256="0s9dpjkphmavvhcrsdjr7i4nq39cp55k43y6jhkx2glc198a73fq"; depends=[ggnewscale ggplot2 rlang]; }; + ggDoubleHeat = derive2 { name="ggDoubleHeat"; version="0.1.2"; sha256="05wlyiqjivw0am20vn0s6rm20xj1r3q75immlvf063li0pxqfp93"; depends=[ggnewscale ggplot2 rlang]; }; ggESDA = derive2 { name="ggESDA"; version="0.2.0"; sha256="0abjjs1syk9w5fqs778njkz3f92kil1617239hzdcjy67hbbf3c0"; depends=[dplyr ggforce ggplot2 ggpubr ggthemes gridExtra gtools magrittr prodlim R6 rlang RSDA stringr tibble tidyr tidyverse vctrs]; }; - ggExtra = derive2 { name="ggExtra"; version="0.10.0"; sha256="1rd3qv6ah3zphr1jicjhgxms73vi496mjnxnsrcgl7z8nyxmas6w"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; + ggExtra = derive2 { name="ggExtra"; version="0.10.1"; sha256="0b78bnkhjlfa2h3f5iib0hqas8r289vqglfbk71a419rivzfsyb8"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; ggFishPlots = derive2 { name="ggFishPlots"; version="0.2.2"; sha256="1zp4g29p15ac0g8cywhsagsxkagvah4xwfhv8j9djkbi7ijdx8fq"; depends=[broom dplyr fishmethods ggplot2 ggrepel ggridges magrittr rlang tibble tidyr tidyselect]; }; ggHoriPlot = derive2 { name="ggHoriPlot"; version="1.0.1"; sha256="1sb567qrqawks9z4zhlfgyx6pcgsvhki3rafppj969xzjh59w6b7"; depends=[dplyr ggplot2 glue magrittr stringr tidyr]; }; - ggOceanMaps = derive2 { name="ggOceanMaps"; version="2.0.0"; sha256="0b7iwad55w8cdpr6qps99lrq0lrzpf3k5mw3jd2072gvdy8dckck"; depends=[ggplot2 sf smoothr stars units]; }; + ggOceanMaps = derive2 { name="ggOceanMaps"; version="2.1.1"; sha256="1sshlsb91x6j4iyhbvdpps8lp4p9kxfdb79v0incnh4l8p48hqzk"; depends=[ggplot2 sf smoothr stars units]; }; ggPMX = derive2 { name="ggPMX"; version="1.2.10"; sha256="1wlix6dr1d631qdckalzk8h6m6c8rbji0dvvr7aghq814mahw1p2"; depends=[assertthat checkmate data_table dplyr GGally ggforce ggplot2 gtable knitr magrittr purrr R6 readr rlang rmarkdown scales stringr tidyr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggRandomForests = derive2 { name="ggRandomForests"; version="2.2.1"; sha256="05w1rs0mg2nj5j1rd32s1mcj294p4zm24p2d87535rmslqmya9c7"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; }; ggResidpanel = derive2 { name="ggResidpanel"; version="0.3.0"; sha256="1vsjw229pd36100ix1sgfmk5lb9b0fx3l6pxg1irsfhm2ypbg1ig"; depends=[cowplot ggplot2 MASS plotly qqplotr stringr]; }; + ggRtsy = derive2 { name="ggRtsy"; version="0.1.0"; sha256="04q9674z0wgpd5igjhggih348jd6lv6nbwz4na597pn5d3pirhvl"; depends=[dplyr ggplot2 magrittr purrr stringr tibble]; }; ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; }; ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.2"; sha256="0sd39svwi3ai81szahd49a8qvsydi1922z4q6r2r70fpbfwi4qrq"; depends=[data_table ggplot2]; }; - ggVennDiagram = derive2 { name="ggVennDiagram"; version="1.2.2"; sha256="1l4cincm7c2q9x3djiv1lm9bvivaqk7kincx19b8f760wz9hp74k"; depends=[dplyr ggplot2 magrittr plotly purrr RVenn sf tibble yulab_utils]; }; + ggVennDiagram = derive2 { name="ggVennDiagram"; version="1.2.3"; sha256="083qr0qd3333qmr42v9k0r0sq5842cca83p87h5gikk8v1vljv7j"; depends=[dplyr ggplot2 magrittr plotly purrr RVenn sf tibble yulab_utils]; }; ggaligner = derive2 { name="ggaligner"; version="0.1"; sha256="1b2fk8bxj4y8an7higv6251fvba748j8x6j7cqqdznmk9az86g01"; depends=[ggmsa ggplot2 reshape2]; }; ggalignment = derive2 { name="ggalignment"; version="1.0.1"; sha256="1rqndv1xqz350v6a23pfrl4zkwjyh4zg633kwcxnv57v0g01mmif"; depends=[dplyr ggimage ggplot2 magrittr rlang]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; @@ -10449,10 +10470,9 @@ in with self; { ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; gganimate = derive2 { name="gganimate"; version="1.0.8"; sha256="1jabs9qr0319w508kdsk5nmzfhl6nzykpp1by7l639yfvrfqcbd1"; depends=[ggplot2 glue progress rlang scales stringi tweenr]; }; ggarchery = derive2 { name="ggarchery"; version="0.4.2"; sha256="1vbknccfr18gawia353appvj3fc3ic8wrkgg0rd2aiz48av496yz"; depends=[dplyr ggplot2 glue magrittr purrr rlang tidyr]; }; - ggasym = derive2 { name="ggasym"; version="0.1.6"; sha256="1vgsqq2m4w5clmf27mmj6jqn2s8m1izz3gj2bxqpmdcvzf5vxkgr"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggautomap = derive2 { name="ggautomap"; version="0.3.2"; sha256="0fy1saym15l3d76ix26kz9il3nzsypchh028vigcvan7g0yg7168"; depends=[cartographer cli dplyr ggmapinset ggplot2 packcircles rlang sf tidyr vctrs]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.7.2"; sha256="1rcw54isai05np4fj19vcxx2vcxq7y2nm3az9m8xwbc9pdjs4z7x"; depends=[beeswarm cli ggplot2 lifecycle vipor]; }; - ggblanket = derive2 { name="ggblanket"; version="4.0.0"; sha256="1mn5735s5azp44118m3q91nfhq4af2hqyh8mmaw3pf6cfg1pwga7"; depends=[dplyr forcats ggplot2 hms lubridate magrittr purrr rlang scales snakecase stringr tidyr tidyselect viridis]; }; + ggblanket = derive2 { name="ggblanket"; version="5.1.0"; sha256="1dj9gri6h0fy5izr8g128ghx4lsbknflfflmpv3z1a4y6g962yb1"; depends=[dplyr forcats ggplot2 hms lubridate magrittr purrr rlang scales snakecase stringr tidyr tidyselect viridis]; }; ggblend = derive2 { name="ggblend"; version="0.1.0"; sha256="0wzy9lnvqxjl3511vk1y6nxpvhk9hvk1xq18bbwsv6886npls56z"; depends=[ggplot2 rlang]; }; ggborderline = derive2 { name="ggborderline"; version="0.2.0"; sha256="1acb3z2dwasmn4ngc7wqk3y4n34ah3fhdxsbdl3dmbc75nmdsn5a"; depends=[cli ggplot2 rlang vctrs]; }; ggbrain = derive2 { name="ggbrain"; version="0.8.1"; sha256="1nicqirp69k0ish7j3mr7zz82w2lj5jcvmn7cbx764r62s5pscvd"; depends=[checkmate data_table dplyr ggnewscale ggplot2 ggrepel glue imager Matrix patchwork Rcpp RcppArmadillo rlang RNifti tibble tidyr tidyselect]; }; @@ -10462,40 +10482,40 @@ in with self; { ggchangepoint = derive2 { name="ggchangepoint"; version="0.1.0"; sha256="0brd9z8wj563j2kcx12bz4kyg2ynppxx5cz8k23xli1qijlib98p"; depends=[changepoint changepoint_np dplyr ecp ggplot2 Rdpack tibble]; }; ggcharts = derive2 { name="ggcharts"; version="0.2.1"; sha256="1c0gdn8skkm82f3qxv9551l36zwqcga9b9sbc48q8hp71ay4ac6b"; depends=[colorspace dplyr ggplot2 lifecycle magrittr patchwork rlang]; }; ggcleveland = derive2 { name="ggcleveland"; version="0.1.0"; sha256="1pl9qhj7p5kflx0ni59hq1k9afqchghg5wig9v1ml5pqrjz70pxa"; depends=[dplyr egg ggplot2 lattice magrittr readr rlang stringr tibble tidyr vctrs]; }; - ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.4"; sha256="186a0mpdpipp24fjbd52l1gdgpqm6vl83ff8069d8nngyqbrx0jr"; depends=[ggplot2 reshape2]; }; + ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.4.1"; sha256="0yd865lfs4144jqh9ilznqa69rj0183ashnhvmjmis87zw69a45q"; depends=[ggplot2 reshape2]; }; ggcorset = derive2 { name="ggcorset"; version="0.4.5"; sha256="18i7xj3h0v556y2m7b1cnlqhzfp9jv5gpchhz5rmm8d6y3k4czii"; depends=[dplyr gghalves ggplot2 ggstance]; }; ggcoverage = derive2 { name="ggcoverage"; version="0.7.1"; sha256="088gyc6054d8xx3k3pg5i40cnvyryyq4k6rn214li0yslj3fphyi"; depends=[Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggbio ggh4x ggplot2 ggrepel IRanges magrittr patchwork RColorBrewer reshape2 rlang Rsamtools rtracklayer S4Vectors scales seqinr]; }; ggdag = derive2 { name="ggdag"; version="0.2.10"; sha256="1vn93yys6lnv0nrhxhnfjb6p12wzhkc9dx8fxn7jci1zyqkb5kb6"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr rlang stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; - ggdemetra = derive2 { name="ggdemetra"; version="0.2.5"; sha256="1ww22lx1viy7r0nldjzzaskbh3wzzp90nyi2dxigzinb0cm7000v"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; + ggdemetra = derive2 { name="ggdemetra"; version="0.2.6"; sha256="0faxbb05wl3075n21nr3b6jqjyh332fy05r4vk3jy0w9qs15ih0p"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; ggdendro = derive2 { name="ggdendro"; version="0.1.23"; sha256="1f4fz9llmbpb8gh90aid7dvriadx16xdhsl7832yw4pyqj4fjcrs"; depends=[ggplot2 MASS]; }; ggdensity = derive2 { name="ggdensity"; version="1.0.0"; sha256="01ym1af6w39zg6xh5mls8kwl4mg0lpjd94j0hm2xrgl39llpwx6r"; depends=[ggplot2 isoband MASS scales tibble vctrs]; }; ggdist = derive2 { name="ggdist"; version="3.3.0"; sha256="0b15b972wrllsvqqn0nc2c81fd9jl618fvqsfi50hjxwwpdach8l"; depends=[cli distributional dplyr ggplot2 glue numDeriv quadprog rlang scales tibble tidyselect vctrs withr]; }; ggdmc = derive2 { name="ggdmc"; version="0.2.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; }; - gge = derive2 { name="gge"; version="1.7"; sha256="1lis0w4n0fns1fsl95p1pbvbqkb3vlwzb5pk5hqlzadjrnrs6gzw"; depends=[nipals reshape2]; }; + gge = derive2 { name="gge"; version="1.8"; sha256="1c8f8g4nw245cjxpx3fjw03cgwc1q13k9ly9jx1jcc6k6hsdkx9k"; depends=[nipals reshape2]; }; ggeasy = derive2 { name="ggeasy"; version="0.1.4"; sha256="1dppcffkyr6ybpz17zkq97g0p2hs1f8iwg6vwrw124pbgr065dr0"; depends=[ggplot2 rlang]; }; ggedit = derive2 { name="ggedit"; version="0.3.1"; sha256="10fbjqq6l7wfibi65mq423w7v8gymr541if749qhsnd9b2jyhaj5"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="1.2.3"; sha256="13m9di2q1npsc3mxrzkcznpq25y1brbwjixayy5ag8d9skvfx9hk"; depends=[insight]; }; + ggeffects = derive2 { name="ggeffects"; version="1.3.2"; sha256="1wp9q2zqygxg2ibmrwdh614sdxqhj80rx0ixbz8kxld99b37ixl7"; depends=[insight]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.7"; sha256="0bdqx3x42jp22bs297nhdgzvywhq4cy0lwmwprl7vmjjh8lwvkxk"; depends=[behavr cli data_table ggplot2 labeling rlang scales stringr]; }; - ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; - ggfittext = derive2 { name="ggfittext"; version="0.10.0"; sha256="06xfv552nhw13wc8dixyqhhmw5zh8hphrabw090nzb33cpfwzin8"; depends=[ggplot2 gridtext shades stringi]; }; + ggfittext = derive2 { name="ggfittext"; version="0.10.1"; sha256="1z06q55igv6nibc72hll93cpp80mfg3yqfqbi967832nfj7wll7a"; depends=[ggplot2 gridtext shades stringi]; }; ggflowchart = derive2 { name="ggflowchart"; version="1.0.0"; sha256="0n93ydnj4q95a67ch2i3yjg7f05vi2xdb4jss620ccaj33chwqzv"; depends=[dplyr ggplot2 igraph rlang tibble tidyr]; }; ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.4.1"; sha256="0wqq8l7lq96k4w0vq12jcg7clvgia8s35jjbqq1s0py4cgxijhml"; depends=[cli ggplot2 gtable lifecycle MASS polyclip Rcpp RcppEigen rlang scales systemfonts tidyselect tweenr vctrs withr]; }; ggformula = derive2 { name="ggformula"; version="0.10.4"; sha256="07d9sq0dqi0g5x9h58icfk1f4hgg1xz4mhbp2z2rxg9qgs74fvdj"; depends=[ggforce ggplot2 ggridges ggstance labelled magrittr mosaicCore rlang scales stringr tibble]; }; ggfortify = derive2 { name="ggfortify"; version="0.4.16"; sha256="05h3a4ycain0y621anjpjphsjlhpayb2nnd6n70rlymrbilfw6xv"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; - ggfun = derive2 { name="ggfun"; version="0.1.2"; sha256="1dzrcm03hy4lyll9jh2r4bn19yvkdim6ip0dmwzc4vqbs5hcvd6b"; depends=[ggplot2 rlang]; }; + ggfun = derive2 { name="ggfun"; version="0.1.3"; sha256="1jk94qridy587dnw3j97k73wa02vs3vcfrjgrri35kvv7fkjw8w9"; depends=[cli ggplot2 rlang]; }; ggfx = derive2 { name="ggfx"; version="1.0.1"; sha256="1lys5lzlilzvd6dm7rkxv7nvnp80fajl5yzhpwcbb5az5832ik27"; depends=[ggplot2 gtable magick ragg rlang]; }; gggap = derive2 { name="gggap"; version="1.0.1"; sha256="1iidxm7qcrg0isw2q27cmjbfb3pkfj5jcg1nj8lgy6xmydw3vrw3"; depends=[cowplot ggplot2]; }; - gggenes = derive2 { name="gggenes"; version="0.5.0"; sha256="06yyagxhh3l8ww5qvmscax11jc48f5r3cw5nhknd8yqsl65azlq9"; depends=[ggfittext ggplot2 rlang]; }; + gggenes = derive2 { name="gggenes"; version="0.5.1"; sha256="08s0fhk2kz3ks64nfmdbd8p3swkn62cbw7dpbqgk9ydpmh5gpjbj"; depends=[ggfittext ggplot2 rlang]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; gggibbous = derive2 { name="gggibbous"; version="0.1.1"; sha256="1sy9d9hl04b13yz4563bzsdznjdh3xmikdrsqg8kdv8wn481lqbd"; depends=[ggplot2 scales]; }; gggrid = derive2 { name="gggrid"; version="0.2-0"; sha256="0g8msi5qpnr2npcgjvdjncrq6p61ddpzasy5g0fxqbybbpfxsyi8"; depends=[ggplot2]; }; - ggh4x = derive2 { name="ggh4x"; version="0.2.5"; sha256="0xj4nlxrpmwzdlj4q3vnhwy7gd1634ff7yjsnaf609ap0q23mxb1"; depends=[cli ggplot2 gtable lifecycle rlang scales vctrs]; }; + ggh4x = derive2 { name="ggh4x"; version="0.2.6"; sha256="0frbkdylyz630y7rjyif0whf74r89ca5bmhk9djcwz8nqfs2jygb"; depends=[cli ggplot2 gtable lifecycle rlang scales vctrs]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; gghalves = derive2 { name="gghalves"; version="0.1.4"; sha256="1qsxq2zbz4zcpqc7949apznn9f2c959jwwx010bl4gf2p6vchfx7"; depends=[ggplot2 gtable]; }; gghdr = derive2 { name="gghdr"; version="0.2.0"; sha256="1id0ky2mf656xqsmg76f627zw8iff4q1wzgih32nryk0hfvm2gfi"; depends=[digest farver ggplot2 hdrcde scales tibble]; }; + gghdx = derive2 { name="gghdx"; version="0.1.1"; sha256="0f59yl8qcm5aframjjg57ikpn7ywr0pyfkzpcqa1b5yaf0831gp9"; depends=[dplyr ggplot2 ggthemes magrittr purrr rlang showtext sysfonts tibble]; }; ggheatmap = derive2 { name="ggheatmap"; version="2.2"; sha256="13cf3xk5drb6dfr3gcbgfi0hk6akk9b3g9f3c2jy6hz8rz5xnyn6"; depends=[aplot factoextra ggplot2 ggpubr patchwork tibble tidyr]; }; gghighlight = derive2 { name="gghighlight"; version="0.4.0"; sha256="0vfcn3gg6j7g20n2z1iwr94jnpqn0zl5j9jfc8bnbsrmz49dzqpd"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; gghilbertstrings = derive2 { name="gghilbertstrings"; version="0.3.3"; sha256="0b3xp1w6fkkmjh7gihhfkp4npx553a75bvsal3w4j57xa34l8rap"; depends=[dplyr ggplot2 lifecycle magrittr Rcpp rlang tibble]; }; @@ -10530,6 +10550,7 @@ in with self; { ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; }; ggnuplot = derive2 { name="ggnuplot"; version="0.1.0"; sha256="0i09ybmxdjyr15z1a651k3bkbqskri4ipcyjap93020zbfv05r9c"; depends=[ggplot2]; }; ggokabeito = derive2 { name="ggokabeito"; version="0.1.0"; sha256="07lbzq87zl2yswidp0f90l8szl7y4wwn8psgacyl90wn2gd9mdcp"; depends=[ggplot2]; }; + ggordiplots = derive2 { name="ggordiplots"; version="0.4.2"; sha256="0nnb1cfjyjhdrd9ahymfv64a6f5kr5ahg0x8l20gyxs0qmychng6"; depends=[ggplot2 glue vegan]; }; ggpackets = derive2 { name="ggpackets"; version="0.2.1"; sha256="1fdyr0m5rf1wy2pydvk12g7lw338iw026rxz98mv8kryrs32q7kh"; depends=[ggplot2 rlang]; }; ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; @@ -10539,24 +10560,24 @@ in with self; { ggpattern = derive2 { name="ggpattern"; version="1.0.1"; sha256="1b9bfxlg64gr39bz58fp6jmg4nziwk8rk94rzpjsqhfhpwi2lrgr"; depends=[ggplot2 glue gridpattern rlang scales]; }; ggpcp = derive2 { name="ggpcp"; version="0.2.0"; sha256="1xkxsxnxcyy8rrazzbl38g405cxjjjz6a720cdm4bsk03q2q4rar"; depends=[assertthat dplyr ggplot2 rlang tibble tidyr tidyselect]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.3"; sha256="03gsbdqqxi0j4slp61bzrn4m2sjhh9fvcy1a1h5vcg4ax233j270"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; - ggpicrust2 = derive2 { name="ggpicrust2"; version="1.7.1"; sha256="0a4ykfybwx1qhgn7ic29dzigiazj248iihdr1597jxj505q21gay"; depends=[ALDEx2 aplot circlize DESeq2 dplyr edgeR GGally ggh4x ggplot2 ggprism lefser limma Maaslin2 metagenomeSeq MicrobiomeStat patchwork readr SummarizedExperiment tibble tidyr]; }; + ggpicrust2 = derive2 { name="ggpicrust2"; version="1.7.2"; sha256="0yk62cc0vmv6dyfiwvvbgpsqlvp1cw61db60153xvzmcdvd077cl"; depends=[ALDEx2 aplot circlize DESeq2 dplyr edgeR GGally ggh4x ggplot2 ggprism lefser limma Maaslin2 metagenomeSeq MicrobiomeStat patchwork readr SummarizedExperiment tibble tidyr]; }; ggpie = derive2 { name="ggpie"; version="0.2.5"; sha256="11c431ggrhyxiql1v9qajp568jri6hlp1kgl334j4f7sgyh73ng5"; depends=[dplyr ggnewscale ggplot2 ggrepel magrittr RColorBrewer rlang scales stringr tibble]; }; ggplate = derive2 { name="ggplate"; version="0.0.1"; sha256="0jn23hmh68hfz1i2h4vz80avzdrn05w6c9ifxfj8jhgh7dj974hf"; depends=[dplyr farver forcats ggplot2 purrr rlang scales stringr tidyr]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; - ggplot2 = derive2 { name="ggplot2"; version="3.4.2"; sha256="1jl3a9z668zjb2p2c01rxpgmjs5gc9gkxn8xqi7q8vrc1akhl8vh"; depends=[cli glue gtable isoband lifecycle MASS mgcv rlang scales tibble vctrs withr]; }; + ggplot2 = derive2 { name="ggplot2"; version="3.4.4"; sha256="0iiywrzv8j0npasvzgkxwhw0zqisf4xmpx06jl0lsq1ybl3fqxid"; depends=[cli glue gtable isoband lifecycle MASS mgcv rlang scales tibble vctrs withr]; }; ggplot2_utils = derive2 { name="ggplot2.utils"; version="0.3.0"; sha256="1bs2pmnq7b57cs05rqvpaqjpn9k7m3zaz7nw3s2n7d9cq60w06gn"; depends=[checkmate EnvStats GGally ggplot2 ggpp survival]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; ggplotify = derive2 { name="ggplotify"; version="0.1.2"; sha256="11qfk4pj0bb013m9964q2fsrj4x39c4kwh84vfyi3qhlkrsybfh1"; depends=[ggplot2 gridGraphics yulab_utils]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.5.3"; sha256="1j504pvhxvl9cfagsjcsw7rbc94q5ysh1f8qhb7hzpx04fpnm65a"; depends=[confintr dplyr generics ggplot2 ggpp lmodel2 lubridate MASS plyr polynom quantreg rlang scales splus2R tibble]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.5.4-1"; sha256="0f6n48vnqnqqd7xhb4mdcwy4h9wz0icnynjigcbzagrrxmi2r64x"; depends=[confintr dplyr generics ggplot2 ggpp lmodel2 lubridate MASS multcomp multcompView plyr polynom quantreg rlang scales splus2R tibble]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; ggpointless = derive2 { name="ggpointless"; version="0.0.3"; sha256="1gladyzmfipmjqzpcz0xjc5fjc8sw9nrmnzw0dcz516a1wy8wys9"; depends=[ggplot2]; }; ggpol = derive2 { name="ggpol"; version="0.0.7"; sha256="11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolar = derive2 { name="ggpolar"; version="0.2.2"; sha256="18m0nd74cz30gr961404wnib5v2wddpf1iv453s5dri0vxlmdl6w"; depends=[ggplot2 rlang]; }; - ggpolypath = derive2 { name="ggpolypath"; version="0.2.0"; sha256="1ii9a0f0aniwf989n72dy9bh9f708qxhdy5xgml23ln6n4wf9wr0"; depends=[ggplot2]; }; - ggpp = derive2 { name="ggpp"; version="0.5.3"; sha256="1shcjplw2w8jbfbp0flpxhb7jfy7v79vhjv1qlh6lmam2fziydcc"; depends=[dplyr ggplot2 glue gridExtra lubridate magrittr MASS polynom rlang scales stringr tibble xts zoo]; }; + ggpolypath = derive2 { name="ggpolypath"; version="0.3.0"; sha256="0ipn1lhmpcdxim3235kxsw6vkj7cf7smqdm534jfa75ski4q9xpy"; depends=[ggplot2]; }; + ggpp = derive2 { name="ggpp"; version="0.5.4"; sha256="05w74003jp7kprxxbni0plr7ydzyc5hzw8g39kn0qd4p7dksjpwr"; depends=[dplyr ggplot2 glue gridExtra lubridate magrittr MASS polynom rlang scales stringr tibble xts zoo]; }; ggprism = derive2 { name="ggprism"; version="1.0.4"; sha256="0ycklp7764cw65hqh9r61im8vqfd7sjayyw1gvprxzg7k217gnl3"; depends=[digest ggplot2 glue gtable rlang scales tibble]; }; ggpubr = derive2 { name="ggpubr"; version="0.6.0"; sha256="0x7p3lbh0xv5qk0shsrj1fjx382zak7mj8l3z1zd348r2pccavif"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang rstatix scales tibble tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.5"; sha256="09wjfkmsh165xiw1dab6c8qb9wrnzm1q1sbfnbzyg99wsk480bgy"; depends=[data_table ggplot2]; }; @@ -10570,7 +10591,7 @@ in with self; { ggrastr = derive2 { name="ggrastr"; version="1.0.2"; sha256="1l90mlb6bqq98ifmlbs5481vch9inmzdnvnz192adklrr9nl09yb"; depends=[Cairo ggbeeswarm ggplot2 png ragg]; }; ggrcs = derive2 { name="ggrcs"; version="0.3.0"; sha256="1j4pqcsacsnca6aj20kppparzff4wrbfs55vq66igmhcd43ry3rd"; depends=[ggplot2 rms scales]; }; ggredist = derive2 { name="ggredist"; version="0.0.2"; sha256="1p5bzqi4g5ri0m0nlwra6vps4sil7qc56cd8nzp0xh7k1gl598ig"; depends=[ggplot2 scales]; }; - ggrepel = derive2 { name="ggrepel"; version="0.9.3"; sha256="0p00kb1x3q0krk5g8mmwqknnjlsznqs4i7mlfq1dp17fxpia1sxr"; depends=[ggplot2 Rcpp rlang scales withr]; }; + ggrepel = derive2 { name="ggrepel"; version="0.9.4"; sha256="0gngsx87rcqijdr684bgpnazdlz3vj4brzw0fic0jdsrf1rb9aw1"; depends=[ggplot2 Rcpp rlang scales withr]; }; ggridges = derive2 { name="ggridges"; version="0.5.4"; sha256="0lfqx21g09s3fp74mld47qfx1nnav18xqj37griyqk406hh1rxrb"; depends=[ggplot2 scales withr]; }; ggrisk = derive2 { name="ggrisk"; version="1.3"; sha256="02df3gcviax747d33v30m97jsazj7zdpjnhypfy38cg70yxidwg9"; depends=[cutoff do egg ggplot2 nomogramFormula reshape2 rms set survival]; }; ggrounded = derive2 { name="ggrounded"; version="0.0.3"; sha256="124khfv4fl3xgylq4s1pc3wzld0n68iclyl0pm19jcw97bmf1cxl"; depends=[ggplot2 gridGeometry]; }; @@ -10581,24 +10602,23 @@ in with self; { ggseg = derive2 { name="ggseg"; version="1.6.5"; sha256="0495g3l71lagrmz3s3lxy4rkfr7gin8vn1m59fvcv7hmycn39i0k"; depends=[dplyr ggplot2 sf tidyr vctrs]; }; ggseg3d = derive2 { name="ggseg3d"; version="1.6.3"; sha256="1rpq2wgyyladz5nkngkvbf3cy4pw212dj1vfh7ksh0bxi7v1k6mh"; depends=[dplyr magrittr plotly scales tidyr]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; - ggseqplot = derive2 { name="ggseqplot"; version="0.8.2"; sha256="169jj1ki8yfxa1jryfbpy63jr8bjmx0jzkykd3bnzxy8vnxs6mss"; depends=[colorspace dplyr forcats ggh4x ggplot2 ggrepel ggtext glue patchwork purrr Rdpack rlang tidyr TraMineR usethis]; }; + ggseqplot = derive2 { name="ggseqplot"; version="0.8.3"; sha256="1ml71lxkr1bnf0l0ljpnlj7rlfmgmk6zmydm899pwvgngph1rjq6"; depends=[colorspace dplyr forcats ggh4x ggplot2 ggrepel ggtext glue patchwork purrr Rdpack rlang tidyr TraMineR usethis]; }; ggshadow = derive2 { name="ggshadow"; version="0.0.5"; sha256="0cakz31hp97kdvdcyrp9p03nz81kypsn9sn6nxl7kb0n3rrrlav0"; depends=[cli ggplot2 glue rlang scales vctrs]; }; ggside = derive2 { name="ggside"; version="0.2.2"; sha256="1z50z4xpxfpqdz26hja6xw3q403p00cr5qawjxl0qg4jixl7j65p"; depends=[ggplot2 glue gtable rlang scales tibble vctrs]; }; ggsignif = derive2 { name="ggsignif"; version="0.6.4"; sha256="02mjailzyqkdnzky60dgampw2sq6mnn7s66fk0lhy32s8apm280i"; depends=[ggplot2]; }; - ggsn = derive2 { name="ggsn"; version="0.5.0"; sha256="04vnap83w06hbqqi5kgxmrdb3a13n5mcdk5lllymv6nrzvl84f2x"; depends=[ggmap ggplot2 maptools png sf]; }; ggsoccer = derive2 { name="ggsoccer"; version="0.1.7"; sha256="13icxd9w3dfwpjl4yaw0gp09mviwf7xrrfs30z66nga459h6gf1d"; depends=[ggplot2 rlang]; }; ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.2"; sha256="0jzj4iglgzwp6pfs5zr7mirdiqrrmbwdvl245b1fwf42rnxbqrq6"; depends=[dplyr ggplot2 magrittr tidyr]; }; ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; }; - ggspatial = derive2 { name="ggspatial"; version="1.1.8"; sha256="0nx5g4n9iqi8pqxq30ydmcyvmgwynn6zciffydg1p879035832vz"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; }; - ggspectra = derive2 { name="ggspectra"; version="0.3.11"; sha256="19mmjcifafb6xfn33q2i1aghqy6axc35g6942759j49izd7wm8lz"; depends=[ggplot2 ggrepel lubridate photobiology photobiologyWavebands rlang scales tibble]; }; + ggspatial = derive2 { name="ggspatial"; version="1.1.9"; sha256="14q3fc33cjy8vc85mb9a6h8fgciypnlcxjihbgc6jbzjksd0l38p"; depends=[abind ggplot2 glue rlang rosm scales sf tibble tidyr]; }; + ggspectra = derive2 { name="ggspectra"; version="0.3.12"; sha256="0kq029w14w3z7qscrasxv289iizcxc7lvkbn5ysiz4jgrvgyc55g"; depends=[ggplot2 ggrepel lubridate photobiology photobiologyWavebands rlang scales tibble]; }; ggstance = derive2 { name="ggstance"; version="0.3.6"; sha256="0wk3gbi5365sndi02gwd4c33vcrj5p8cfwakwjg010y5hgxx96nd"; depends=[cli ggplot2 plyr rlang withr]; }; ggstar = derive2 { name="ggstar"; version="1.0.4"; sha256="0m2knp1jf1x62nqd8ln4haw90jv69l7vjrhn4pdrywgmwhdrp8gd"; depends=[cli ggplot2 gridExtra scales]; }; - ggstats = derive2 { name="ggstats"; version="0.3.0"; sha256="0kcsiq1l570j7wwkdrd7zxswlkcxdjwnscj8b6crjzdy40f3v4xk"; depends=[broom_helpers cli dplyr forcats ggplot2 lifecycle magrittr rlang scales tidyr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.12.0"; sha256="17jxvzr4dlvsakrsvblxngg60jxh0c1a0i8phqqg63nbf79ng2lk"; depends=[correlation datawizard dplyr ggcorrplot ggplot2 ggrepel ggside ggsignif glue insight paletteer parameters patchwork performance purrr rlang statsExpressions tidyr]; }; + ggstats = derive2 { name="ggstats"; version="0.5.0"; sha256="1a3pbz07cbngcix450xqwfvr94r16m451d668szjsmrijqbbd1k6"; depends=[broom_helpers cli dplyr forcats ggplot2 lifecycle magrittr patchwork purrr rlang scales stringr tidyr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.12.1"; sha256="0w24dbz2zc60zpxp2bylj6yk8rwdrkbppkykmip1wrhsbi8663xi"; depends=[correlation datawizard dplyr ggcorrplot ggplot2 ggrepel ggside ggsignif glue insight paletteer parameters patchwork performance purrr rlang statsExpressions tidyr]; }; ggstream = derive2 { name="ggstream"; version="0.1.0"; sha256="0d6g5916mfrg2srcqjhlpm4acp4g16vq9ks4x37yzkpr34vi5x7j"; depends=[dplyr forcats ggplot2 magrittr purrr tidyr]; }; ggstudent = derive2 { name="ggstudent"; version="0.1.1-1"; sha256="0qs27b4lksaaaspavkycbzf8cfjxjli7xrfjby71sl0lca3fwm1g"; depends=[dplyr ggplot2]; }; ggsurvey = derive2 { name="ggsurvey"; version="1.0.0"; sha256="1a50ac2546pxa35k59j4ih0csiyfjdgqfqwm3fb5ny7jx1mk0hmi"; depends=[dplyr ggplot2 hexbin survey]; }; - ggsurvfit = derive2 { name="ggsurvfit"; version="0.3.0"; sha256="009fi4viiyscxsv26sy169qlmwp4nh2c21alw9nnkmlnwngs770w"; depends=[broom cli dplyr ggplot2 glue gtable patchwork rlang survival tidyr]; }; + ggsurvfit = derive2 { name="ggsurvfit"; version="0.3.1"; sha256="1krkkmbl54227i2gwl8nwg8r3aghxb6cqvxvi0z791n1vr0zn7xy"; depends=[broom cli dplyr ggplot2 glue gtable patchwork rlang survival tidyr]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtea = derive2 { name="ggtea"; version="0.1.1"; sha256="04g8g17ziw13rxjzkvgy5yd0z15ypxk0b8fq2y1vk8acsqr2dv11"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="3.4.2"; sha256="1xmh0gi81xrzkgjlbxb3jl9mrj407q7ykm4wpdbmd4gdswv20y61"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; @@ -10612,29 +10632,28 @@ in with self; { ggvenn = derive2 { name="ggvenn"; version="0.1.10"; sha256="0gl7z8hrn2wmmb59fvfv2hsw40p629aj086dv0kwlv162zqidqfd"; depends=[dplyr ggplot2]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; ggvis = derive2 { name="ggvis"; version="0.4.8"; sha256="0sm28s2zlr3rbp7qzpgin7d9axixn4kgi1apb5mw4mvsp6h80m1x"; depends=[assertthat dplyr htmltools jsonlite magrittr rlang shiny]; }; - ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.5"; sha256="0q02r0nql64am6ixjq59fjn2kzsj2is22ys1j1rzscwkh9f6f17m"; depends=[deldir ggplot2 raster rgeos sp]; }; - ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; + ggwordcloud = derive2 { name="ggwordcloud"; version="0.6.0"; sha256="1plrlp4f4qdsn7512syv34ql9vb0i80dhq5zm10y9a19bhkml2yz"; depends=[colorspace ggplot2 gridtext png Rcpp scales]; }; ggx = derive2 { name="ggx"; version="0.1.1"; sha256="13yvckny2b7b7rhgi28xm8379paskin78wm5095s1ily9a2dxgkg"; depends=[ggplot2 sets]; }; gh = derive2 { name="gh"; version="1.4.0"; sha256="0wcbnnws472v1i6q012pbdxjpsd4clj6a2cscf73g6s2336rzik8"; depends=[cli gitcreds httr2 ini jsonlite rlang]; }; ghapps = derive2 { name="ghapps"; version="1.0.0"; sha256="12z234lc7iy8svnm37ybj9ym0zd3jq5q9fng9h7dxdw2p9id7y30"; depends=[gh jose openssl]; }; ghclass = derive2 { name="ghclass"; version="0.2.1"; sha256="0jpfc2mjwi6i3bcrfjjl6k4im4m110pq2n00mij2n9czz6v2chla"; depends=[base64enc cli dplyr fs gh glue httr lubridate purrr rlang tibble whisker withr]; }; - ghcm = derive2 { name="ghcm"; version="3.0.0"; sha256="0byzi0q3amz7q6if0y54mk3wac0pycci9ypagr65p8rlhx04gqv3"; depends=[CompQuadForm MASS Rcpp refund]; }; ghibli = derive2 { name="ghibli"; version="0.3.3"; sha256="0kl98vxlk86jsqqklzcqr5a65lhqyday3vax374ai6pc24pjymcg"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; - ghyp = derive2 { name="ghyp"; version="1.6.3"; sha256="0jc4rrw0ny0x15im2r9kyrlg9qdnljnbpg5pq4avy997nfdgyhav"; depends=[MASS numDeriv]; }; + ghyp = derive2 { name="ghyp"; version="1.6.4"; sha256="0964gr8hmqrbg7rwm4hplxfqz2iccpir1dchmnqidkjqj8p9yy1d"; depends=[MASS numDeriv]; }; ghypernet = derive2 { name="ghypernet"; version="1.1.0"; sha256="0k4w37vnhpanpa80la8rscgimnnzzid5v59109xfbbz1xxx1bb49"; depends=[dplyr extraDistr numbers pbmcapply plyr purrr reshape2 rlang rootSolve texreg]; }; + giacR = derive2 { name="giacR"; version="1.0.0"; sha256="12a6cj93id0x1xz39bcg52v7g1d9yd7k2nz2wiiljw2xgbirjjqz"; depends=[chromote jsonlite pingr processx R6]; }; gibasa = derive2 { name="gibasa"; version="0.9.5"; sha256="06vr2jb4z31shmz95pbjslbp600ib638s9llyz6mhc73lbiv7rdj"; depends=[dplyr Matrix purrr Rcpp RcppParallel readr rlang stringi]; }; gibble = derive2 { name="gibble"; version="0.4.0"; sha256="19il4si7ch5jr7plr8qwv7jrc5kfkxmh5jrcdvbn688gxcnv7bs0"; depends=[dplyr rlang tibble]; }; - giedata = derive2 { name="giedata"; version="0.1.1"; sha256="19sr8phsay7bpqrbh776ms0aw9xgiv0x9knmn88ydzpkcdcd1z9j"; depends=[curl dplyr httr lubridate magrittr purrr]; }; gif = derive2 { name="gif"; version="0.1.0"; sha256="119d7q9xs6xpncv1r2w008kld9z07ckyj1kja9b8n2lnlb8532pk"; depends=[MASS Matrix Rcpp RcppEigen]; }; - gifski = derive2 { name="gifski"; version="1.12.0-1"; sha256="1xgrw5r5p4q4ic31g7kmk7lk59hiwib7qixcizxbpl90cvbr1wn2"; depends=[]; }; + gifski = derive2 { name="gifski"; version="1.12.0-2"; sha256="0ybv0fm4p23zfxnyjj97bym09r4brg9z26298ibxzl58j6r624r8"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.8.0"; sha256="1gb3x4rln9vayjd9fgzb434mm3dwcqgrvlv6rmh4b39mjfm73sly"; depends=[base64enc R_utils xml2]; }; gigg = derive2 { name="gigg"; version="0.2.1"; sha256="0qb8w455a8wxc5ljmydq4xag2kbj5yk06an0pd9hd4k48wssg8la"; depends=[BH Rcpp RcppArmadillo]; }; gim = derive2 { name="gim"; version="0.33.1"; sha256="1km8pyr1qfzffm33ihhlgvc0qxgxxfi161vkrz77d1b7jkpdyxjj"; depends=[numDeriv]; }; - gimme = derive2 { name="gimme"; version="0.7-14"; sha256="01qn789cmjx4ba7p3n8s9bp678hbpsdzhw011ndwfh17qlvibn4s"; depends=[aTSA data_tree igraph imputeTS lavaan MASS MIIVsem nloptr qgraph]; }; + gimme = derive2 { name="gimme"; version="0.7-15"; sha256="0qg6zkik72pqgkkbqd7c2zn4l6k7fs91cnawk7m2hsw1naiksjjn"; depends=[aTSA data_tree igraph imputeTS lavaan MASS MIIVsem nloptr qgraph]; }; gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; gimms = derive2 { name="gimms"; version="1.2.2"; sha256="0dhvi05mpwyx6cpcyk2nzvgd6c8byd7cmrd9crx83lvfa03smpng"; depends=[curl Kendall ncdf4 raster zyp]; }; - gips = derive2 { name="gips"; version="1.2.0"; sha256="0q4lhd9c6lpw0xmawby5nsb9nis2vsjzdypnyvgv83rrjvsnqm4l"; depends=[numbers permutations rlang]; }; + ginormal = derive2 { name="ginormal"; version="0.0.2"; sha256="0b37np2h03m82dhww9slnchm3dk4qwfmj6v7q13li788cw7whid1"; depends=[BAS]; }; + gips = derive2 { name="gips"; version="1.2.1"; sha256="0mvjgzqy3sqa5p1263v042k20j6hmlgli9llgq89y17d47njmfw4"; depends=[numbers permutations rlang]; }; giscoR = derive2 { name="giscoR"; version="0.3.5"; sha256="1sbdpljrznzgqakqmdrn3lxr4ipp8b70zddh0ffwql8knl9lxvdm"; depends=[countrycode geojsonsf rappdirs sf]; }; gistr = derive2 { name="gistr"; version="0.9.0"; sha256="0ac9ikrdg6i8xvlma0gizvsdva46408lk7hvsgkqirhy2ljy02hp"; depends=[assertthat crul dplyr httr jsonlite knitr magrittr rmarkdown]; }; git2r = derive2 { name="git2r"; version="0.32.0"; sha256="0wa6k1g7y0sx6s7map7mn579c1h07n185m163msmcjk81i62ap8v"; depends=[]; }; @@ -10644,7 +10663,9 @@ in with self; { gitcreds = derive2 { name="gitcreds"; version="0.1.2"; sha256="0pf70g4a2kxjcid5rc4ppmgcl3kpjhkszdgz4fqn4l33lp6apij1"; depends=[]; }; gitdown = derive2 { name="gitdown"; version="0.1.6"; sha256="16g4kngal0w0vjrympxmnq16rpxks4wbj35aasvr3p2srgqn86by"; depends=[attempt bookdown dplyr git2r knitr magrittr purrr rmarkdown stringi tidyr]; }; gitear = derive2 { name="gitear"; version="1.0.0"; sha256="139h19yyi7bpkps2vskdnga43ggpgb9fg8jdr7n8vgadxjamv98p"; depends=[dplyr httr jsonlite magrittr mockery Rcpp stringr tibble tidyr]; }; + gitgadget = derive2 { name="gitgadget"; version="0.8.1"; sha256="1kcky3yxj4f9rgp2dliwavajwy2784ynplnmvcyizwj83l07zjql"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; + githubr = derive2 { name="githubr"; version="0.9.1"; sha256="1h3yaz2snrlibl707rnv2l5y5r879dsprcr0a0vc8aliwdsmydvi"; depends=[dplyr gh gitcreds httr magrittr]; }; gitignore = derive2 { name="gitignore"; version="0.1.5"; sha256="1jph54ah4ajb5xakbpnbmp44ddqz5np7c60441vhfn7nxa5b9cpx"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; gitlabr = derive2 { name="gitlabr"; version="2.0.1"; sha256="0h3md21ir0nw9n17y6sg8y7l4z2lk5f5bvz4q6v3cs7jn734imwb"; depends=[arpr base64enc dplyr httr magrittr purrr shiny stringr tibble]; }; gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; @@ -10652,54 +10673,54 @@ in with self; { gittargets = derive2 { name="gittargets"; version="0.0.6"; sha256="1fk32z83qglkmnsziqn9gzv20br0lyv4gll4y4rr4bwl66x81af5"; depends=[callr cli data_table gert processx targets tibble uuid]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; gjam = derive2 { name="gjam"; version="2.6.2"; sha256="1jzgh5hp112gjgqyyhpd4fv1yizb56596wl3izb066rzhhyc4wim"; depends=[MASS RANN Rcpp RcppArmadillo]; }; - gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; + gk = derive2 { name="gk"; version="0.6.0"; sha256="1dwv6389w9cgavwkzznbdzf92d3y0s07s74a5ccwiy1zf48jwwar"; depends=[Ecdat lubridate progress]; }; gkgraphR = derive2 { name="gkgraphR"; version="1.0.2"; sha256="1sb52hhpwm3bq7rn2xdq5vly6z1c5yab9a26xzgj3c5s47vk02pa"; depends=[httr ISOcodes jsonlite]; }; - gkmSVM = derive2 { name="gkmSVM"; version="0.82.0"; sha256="1m2cq4b0srghaj04p5ffbc21zv1rg7avi8pn765bybjhvrn567bm"; depends=[kernlab Rcpp ROCR seqinr]; }; + gkmSVM = derive2 { name="gkmSVM"; version="0.83.0"; sha256="1bg9jw4ra76j132lkr0p5m2xlr952fdij1hn6f1v7g687l55m0k5"; depends=[kernlab Rcpp ROCR seqinr]; }; glamlasso = derive2 { name="glamlasso"; version="3.0.1"; sha256="0vzkszam7nz40v8pxq06jn3fgwa1nd3s485hgfkcv7r8pg2rp56q"; depends=[Rcpp RcppArmadillo]; }; glancedata = derive2 { name="glancedata"; version="1.0.1"; sha256="01j7syjn33pc7hq032nmyak38wn35yv3n7is9g2ggs14kj3xqb0c"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; }; glarma = derive2 { name="glarma"; version="1.6-0"; sha256="0n0mv4xvh5q3y383cs224x6r608ciw4822pkanvmcjsc9zl0z1ar"; depends=[MASS]; }; glassdoor = derive2 { name="glassdoor"; version="0.8.1"; sha256="0r85k1fyk8979ahfmd4vmzkhyvrlnpkgjwg1yi7092kpx8877lj0"; depends=[httr]; }; glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; }; - glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; + glassoFast = derive2 { name="glassoFast"; version="1.0.1"; sha256="0nyvmmrw6cr5j1mkf1qv6hn3q24kyn6gn48q6r7az4vn1m141hzz"; depends=[]; }; glba = derive2 { name="glba"; version="0.2.1"; sha256="0dilf144xfn454xfsndbddhc28gzf36fiknc2qwcx3bp7z5caqjn"; depends=[]; }; glca = derive2 { name="glca"; version="1.4.0"; sha256="13dzv5d7i3nq3866wcx4gccxacbqsshb2nriqsnsgbdrgpwk88h9"; depends=[MASS Rcpp]; }; glcm = derive2 { name="glcm"; version="1.6.5"; sha256="13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm"; depends=[raster Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.6.6"; sha256="1i7xpyxd7r1fkjy9zkzd3rfsnb35v5c5fkafs1zd9d8729wfj8za"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.12"; sha256="0aphdscj0s6kqxlkgqkw2d6snrylz6hiis6307pl8ldh7q5cvm33"; depends=[]; }; - glinvci = derive2 { name="glinvci"; version="1.1.21"; sha256="114fxkn271askxqjnzk0pd3s11n0r9qw1nfxpnqq332hv3skl2h8"; depends=[ape BB lbfgsb3c numDeriv plyr Rcgmin rlang]; }; + glinvci = derive2 { name="glinvci"; version="1.2.1"; sha256="18ps1cv2fyzsyplv15qaqg5k8a1hwri8sqqfm9fncifpjlgmssvk"; depends=[ape BB generics lbfgsb3c numDeriv optimx plyr rlang]; }; gllm = derive2 { name="gllm"; version="0.38"; sha256="06sq7yk11rbqj8i900ss987fg9b232cirjxhdm1yl9xqz4inxvlg"; depends=[]; }; - gllvm = derive2 { name="gllvm"; version="1.4.1"; sha256="1l91ngxmb7bn4g654faphmlp6spwnq6rihmq1n7h13pkwfbhdx9n"; depends=[alabama fishMod MASS Matrix mgcv mvabund nloptr RcppEigen statmod TMB]; }; + gllvm = derive2 { name="gllvm"; version="1.4.3"; sha256="1k3yw1flqzj151kqx8wyh54a7crh62ya700x5n4989ngx5071dv3"; depends=[alabama fishMod MASS Matrix mgcv mvabund nloptr RcppEigen statmod TMB]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; glm_predict = derive2 { name="glm.predict"; version="4.2-0"; sha256="1696zjn6mqxvvzvbg282p2rxy2r81v46gx1vv0hxkphcrarv4dxs"; depends=[AER dfidx lme4 MASS mlogit nnet survey survival]; }; glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; }; glmbb = derive2 { name="glmbb"; version="0.5-1"; sha256="1jy77z5fr781rm5mx6kszwi2zlvnpfwi24fn9vw1kza4jzcw9pjw"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; glme = derive2 { name="glme"; version="0.1.0"; sha256="1ysg1yx0pdyxlbkn36023230yky8wj3rvi3skrdqdjbnnyzhn49b"; depends=[dplyr nlme reshape]; }; - glmertree = derive2 { name="glmertree"; version="0.2-3"; sha256="1pirwsssn05gfgl1frixc05nk37vingsjfddljmv3p5h6jr9c3ay"; depends=[Formula lme4 partykit]; }; + glmertree = derive2 { name="glmertree"; version="0.2-4"; sha256="0d7wjn9bqja05d0g8rqy1d5c53h00dcyr08589cwflkbx3yxxg6s"; depends=[Formula lme4 partykit]; }; glmglrt = derive2 { name="glmglrt"; version="0.2.2"; sha256="1954ywshnqzr7h77wshf63y3zx3ra8mrfabg5dqjhkgv4rsk3h1y"; depends=[MASS parameters]; }; glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; }; glmm = derive2 { name="glmm"; version="1.4.4"; sha256="0v8iill3503piyx3wjxd602hs6hgz9818ipqlvg34963hh4b4ixi"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; glmm_hp = derive2 { name="glmm.hp"; version="0.1-0"; sha256="1zs2aibvb4pykm80pi0rxbdf5qm05l8xhdz20rmx52101837lzjj"; depends=[ggplot2 lme4 MuMIn vegan]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; - glmmLasso = derive2 { name="glmmLasso"; version="1.6.2"; sha256="13vh35ks4r1gpg8b7l29wj27drf2bwm8nmrnxqqad2n6sparhbdq"; depends=[GMMBoost Matrix minqa Rcpp RcppEigen]; }; - glmmML = derive2 { name="glmmML"; version="1.1.4"; sha256="0xs6vn245y32pshlslblrj6517dwwmk0ffp2rzji8d8h0lsxidxx"; depends=[]; }; + glmmLasso = derive2 { name="glmmLasso"; version="1.6.3"; sha256="1b2wkmsmnhmkql0kin56faf64abc6hijrs6dlz8qvwcbqpgbpcig"; depends=[Matrix minqa Rcpp RcppEigen]; }; + glmmML = derive2 { name="glmmML"; version="1.1.5"; sha256="1sfxg6nv5wz40dq0j3fhn8hcrlnqrsjkwif2g93s6fzaxa83vl8p"; depends=[]; }; glmmPen = derive2 { name="glmmPen"; version="1.5.3.4"; sha256="1frb5127wsvqx4z8dlh6bvykyknjwakiqjgm8xyhli3zjbgc07gy"; depends=[BH bigmemory coxme ggplot2 lme4 MASS Matrix mvtnorm ncvreg Rcpp RcppArmadillo RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders stringr survival]; }; glmmSeq = derive2 { name="glmmSeq"; version="0.5.5"; sha256="182pgwqqbgpkcvapkps7ahxa4ppic44j10081q0v9lp2cjdiv4qy"; depends=[car ggplot2 ggpubr glmmTMB lme4 lmerTest MASS pbapply pbmcapply plotly qvalue]; }; - glmmTMB = derive2 { name="glmmTMB"; version="1.1.7"; sha256="1wf1fn2gf500y2r4d84p5gj3b1fj2cmyw2lp366r4nm6p3iyd2x3"; depends=[lme4 Matrix nlme numDeriv RcppEigen TMB]; }; - glmmfields = derive2 { name="glmmfields"; version="0.1.7"; sha256="1pplks32zww2cqxiraxwlbi7772d0l53w5hrz7s9fkm8yl9nbn29"; depends=[assertthat BH broom broom_mixed cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; }; - glmmrBase = derive2 { name="glmmrBase"; version="0.4.4"; sha256="1531lzdqh4ryf6k845ygw134m9jsldm89y7v13042lm7my6n3had"; depends=[BH digest Matrix R6 Rcpp RcppEigen RcppParallel rminqa SparseChol]; }; - glmmrOptim = derive2 { name="glmmrOptim"; version="0.2.5"; sha256="06q9z481vcpcavymmjzg3dbdrag1bclv0klq19psrpndip0j8rm7"; depends=[digest glmmrBase Matrix Rcpp RcppEigen]; }; - glmnet = derive2 { name="glmnet"; version="4.1-7"; sha256="1a7af2658z9fmx0rcdx401lj86q73qkvsvlfnrp2bw4xv43bd85k"; depends=[foreach Matrix Rcpp RcppEigen shape survival]; }; + glmmTMB = derive2 { name="glmmTMB"; version="1.1.8"; sha256="055xi424cd1glhbv8a8v9cm79zq9skb7230nq0xm90iggb1zcj22"; depends=[lme4 Matrix mgcv nlme numDeriv RcppEigen TMB]; }; + glmmfields = derive2 { name="glmmfields"; version="0.1.8"; sha256="0nn328dn7fbh3h0wnl4kahwrbq9ddr3hyqq7930raa0abimg8ykq"; depends=[assertthat BH broom broom_mixed cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders tibble]; }; + glmmrBase = derive2 { name="glmmrBase"; version="0.4.6"; sha256="1bpi2z8gf7v4g5w3vwcxbpnx47gmr56sb17m42qp2zy4acjh27c1"; depends=[BH digest Matrix R6 Rcpp RcppEigen RcppParallel rminqa SparseChol]; }; + glmmrOptim = derive2 { name="glmmrOptim"; version="0.3.2"; sha256="0rs43vv31fdch83fs7ibx1zwwpcsdyqr7ggljfa9c168sgmhxa37"; depends=[BH digest glmmrBase Matrix Rcpp RcppEigen RcppProgress rminqa SparseChol]; }; + glmnet = derive2 { name="glmnet"; version="4.1-8"; sha256="1znw1p1mi7nv39l7albcg6sfxj7a1jyjw85hb3ginv870z7fbnqx"; depends=[foreach Matrix Rcpp RcppEigen shape survival]; }; glmnetSE = derive2 { name="glmnetSE"; version="0.0.1"; sha256="0qj3c8qrx3vl0dr9prravfjwzqv1yfi771xfss9d44wlvjz5f4gp"; depends=[boot glmnet]; }; - glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.8"; sha256="1k8ivzjgpkm2a948qxx3wmkhlppbk31qc76spv2pscmp24x0lxyn"; depends=[glmnet Matrix]; }; + glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.9"; sha256="0rh07i9j6bxiqcl84d8jnn7dzqdwfdzak7w8bf4j4521r24mwm01"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.6"; sha256="0cs0yj2js0920iggcw2vci5y9hnsm3hd7wpd7mwnx8mszwrklawg"; depends=[glmnet]; }; glmnetr = derive2 { name="glmnetr"; version="0.3-1"; sha256="1wf40g55qmj7n6za29kysrr642kr1yriara381ws5v5pnik8dd6q"; depends=[glmnet Matrix mlrMBO ParamHelpers rpart smoof survival torch xgboost]; }; glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.9"; sha256="0b796jvcvq0bbm2j8ldbn8n6am2746b62wdwv296b8032vf8zzgx"; depends=[glmpath]; }; glmpca = derive2 { name="glmpca"; version="0.2.0"; sha256="02xjf0gg52925hw9nw2j0znfmzfzfwbv0fxjl9d2fy9j63drr2h4"; depends=[MASS]; }; glmtlp = derive2 { name="glmtlp"; version="2.0.1"; sha256="0ax3jhbib75gzp5a2y4nj80qss4qmn65rra8bsnkmwgcn4qg8xja"; depends=[doParallel foreach ggplot2]; }; - glmtoolbox = derive2 { name="glmtoolbox"; version="0.1.7"; sha256="130mb2ylm8jy3212jbli4w87mx141jq2x223mysavrarjmmibxk1"; depends=[Formula MASS numDeriv Rfast statmod]; }; + glmtoolbox = derive2 { name="glmtoolbox"; version="0.1.9"; sha256="115ygmhcfzkks7dlph5c2w7ijpmvd6avvz9955jfqwfapwy1r358"; depends=[Formula MASS numDeriv Rfast statmod]; }; glmtrans = derive2 { name="glmtrans"; version="2.0.0"; sha256="10d9z1rrjnxkw3nmim01ql5yfn1w62sncgclmprznr5kbna49yj3"; depends=[assertthat caret doParallel foreach formatR ggplot2 glmnet]; }; glmtree = derive2 { name="glmtree"; version="0.2"; sha256="07b7ma38r5cjv6c33q1n2f8xvzn3lj004i8v947pqdhg3fi9wlc6"; depends=[caret dplyr magrittr partykit]; }; glmulti = derive2 { name="glmulti"; version="1.0.8"; sha256="0zviahj99645s1xs2f9z7rnv95x4rdz7mfwzy3qjfw46yqpfj5cn"; depends=[leaps rJava]; }; @@ -10729,37 +10750,37 @@ in with self; { gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="2.0.0"; sha256="0bn4605mjirhw1kmdnaa14rqqzrvxckfgi1ys597zwrclw601x59"; depends=[base64enc cli crayon gargle glue httr jsonlite lifecycle mime rappdirs rematch2 rlang]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="4.0.4"; sha256="0gvpmannzhzxrgihi7fvj2kww637hq3zjvl52f8zp4psjpyd752s"; depends=[RCurl XML]; }; - gmat = derive2 { name="gmat"; version="0.2.2"; sha256="0iq2b3s60fyam45ykk67xyi2yhr8ma1s2vw4059357j1948525p2"; depends=[gRbase igraph]; }; - gmeta = derive2 { name="gmeta"; version="2.3-1"; sha256="02w3a8c189wdvcxsnclbgzb6bc9fq88rcw2danxa6i9g7q4kq2sp"; depends=[BiasedUrn binom]; }; gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; }; gmgm = derive2 { name="gmgm"; version="1.1.2"; sha256="18q119v8wi4l5i8r6qdsdwih3jj71iidwgbjjvqp2bh37wp58wq3"; depends=[dplyr ggplot2 purrr rlang stringr tidyr visNetwork]; }; gmm = derive2 { name="gmm"; version="1.8"; sha256="1n45dls7632b11bg6pipamp2zmp8j1hp4nlrj91r4schd9fgr6bh"; depends=[sandwich]; }; - gmmsslm = derive2 { name="gmmsslm"; version="1.1.4"; sha256="1zhrcfs68r58qn0xkvvb3bnwavycy957v32pw0mh87pi5yw9n3iy"; depends=[mvtnorm]; }; + gmmsslm = derive2 { name="gmmsslm"; version="1.1.5"; sha256="1cbpgl5w4zkgci77lbx2ji73z3hvzj6kyr6bi79a8l65d303fblk"; depends=[mvtnorm]; }; gmnl = derive2 { name="gmnl"; version="1.1-3.2"; sha256="01pviab3gyvjdlv5jy7wzp33909znhpn47kar55bwkm6gm3bdlg8"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.18.1.1"; sha256="158y7yh4maawn9vki8cq4sil48xib2bbpl6qgj5gvlkw3c14hzfs"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.7-2"; sha256="12rd0j3sawzipfz4xr3ikrxrjabpjp4s3y4ikvk16z8rhjs2i5bw"; depends=[]; }; gmpoly = derive2 { name="gmpoly"; version="1.1.0"; sha256="0rlmwlxyg9b8gqyrc7mbqv7x86v9pqj51pd847raq7x1smjnz1kg"; depends=[english gmp mvp purrr]; }; gms = derive2 { name="gms"; version="0.4.0"; sha256="1m7bhy4vsz6l09pal9ibjlskmbyjmc29hqwjim1x8yansd5bxpzv"; depends=[dplyr rlang stringr yaml]; }; gmt = derive2 { name="gmt"; version="2.0.3"; sha256="1clnhwxn1z1iyzx9ps9rkfv2xqdyqc73mcc77ysmlg5cncvm1hac"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="2.0.8"; sha256="1v74v3ax2xlcpv6a9q03phq74avfp2m30vvg1ymhv72ydmckp4bx"; depends=[Brobdingnag gsl mvnfast pbapply]; }; + gmvarkit = derive2 { name="gmvarkit"; version="2.0.10"; sha256="095f35p7vvw4c3v332mjd8yzg6qrz8hx3zdq70xvv389yv7z4lsd"; depends=[Brobdingnag gsl mvnfast pbapply]; }; gmvjoint = derive2 { name="gmvjoint"; version="0.3.0"; sha256="0f2h59k16x6ajjmdq8m43zfjj93l5h0a992wqrb6z15705f252ww"; depends=[glmmTMB MASS mvtnorm pracma Rcpp RcppArmadillo statmod survival xtable]; }; gmwmx = derive2 { name="gmwmx"; version="1.0.3"; sha256="1jp3jjg0znvqmir83ygvi1nnws6xs29cfccd79vbk8702k4i9y61"; depends=[fs longmemo ltsa Matrix Rcpp RcppArmadillo rjson stringi wv]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; - gnm = derive2 { name="gnm"; version="1.1-2"; sha256="1yzhfvn1fpskh8gwg65sffmgzwhjv7jhc83xazh1riddx8ikj5ra"; depends=[MASS Matrix nnet qvcalc relimp]; }; + gnm = derive2 { name="gnm"; version="1.1-5"; sha256="0igqzm6sdmk1wqc3rdy6pc3ba9n7bs76j5nql5qa1y2wg3rlxna4"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnn = derive2 { name="gnn"; version="0.0-3"; sha256="0hk05g8kbsl03wy929y9wnhyfimmkz4yy5qkza2y1v7mcggpjjhx"; depends=[copula keras qrng R6 tensorflow]; }; gnomonicM = derive2 { name="gnomonicM"; version="1.0.1"; sha256="1yv5ry21rv69hfd4wmhnwhvarnp49hn200aws428ahs5wvx3md1v"; depends=[kableExtra minqa triangle]; }; + gnonadd = derive2 { name="gnonadd"; version="1.0.2"; sha256="1yhh6s5hzvpdy6qrvnjx84basrbvi1r7dcgapwf7g8677c8f5fdb"; depends=[ggplot2]; }; gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; gnrprod = derive2 { name="gnrprod"; version="1.1.2"; sha256="1bk0cqpz0ng8pn2iss2fbbrprfm099fmy0nafa2flqwi7m04swp7"; depends=[data_table]; }; - gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; - go2bigq = derive2 { name="go2bigq"; version="1.0"; sha256="007sk6i10phxfmrgn03pa43ixfp1v27nxyvgmhzwrj5l9b532f0d"; depends=[gmp Rmpfr]; }; + gnumeric = derive2 { name="gnumeric"; version="0.7-10"; sha256="0x8w35wj81yx7ri2jvkafkmg8d68il6m5fl6gh97g9rg5w0xkz7n"; depends=[XML]; }; + go2bigq = derive2 { name="go2bigq"; version="2.0.1"; sha256="0xz6im5gc214m11w70m83mnas09sql9i0lvbgyfy0qvizn6zhyl3"; depends=[gmp Rmpfr]; }; goalp = derive2 { name="goalp"; version="0.3.1"; sha256="1xr9bgizzsjr4nn41q1zi049wg9cw6qril60bri96x0xgc00qdpz"; depends=[lpSolve]; }; goeveg = derive2 { name="goeveg"; version="0.6.5"; sha256="1q4p1169lz5diwzmrpab2yglvr5c08mssivfbs5h13agbwrxyj8f"; depends=[fields Hmisc mgcv vegan]; }; gofCopula = derive2 { name="gofCopula"; version="0.4-1"; sha256="17bdrn8xsqjz64caa5wdigkv798i18gc2f9jiin1bz840bqn1abg"; depends=[copula crayon doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; gofar = derive2 { name="gofar"; version="0.1"; sha256="10c1qgmkdhzxk9m2sd0xxww453y9lf5vjsrbmrbzbln91i6svy8j"; depends=[glmnet magrittr MASS Rcpp RcppArmadillo rrpack]; }; gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; }; gofcat = derive2 { name="gofcat"; version="0.1.2"; sha256="0jkkavws3p336i3gzlkd24q467zd1clfndcpimwc6scy8zh67q9l"; depends=[crayon epiR Matrix reshape stringr VGAM]; }; - goffda = derive2 { name="goffda"; version="0.1.1"; sha256="07mmvmmcqg5wx6xj9frridflakbsdfkrhyrnmp239w8ppw6vdy29"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; }; + gofedf = derive2 { name="gofedf"; version="0.1.0"; sha256="12y6lhrpldj46adn3a7jz4snx79y9xdrzbgr5qa4gjl00w3nx6cn"; depends=[CompQuadForm glm2 MASS statmod]; }; + goffda = derive2 { name="goffda"; version="0.1.2"; sha256="0d4w2rz7024j4vky1nynqfanfgp8rvgivl2p6b8l2ws98brlhy24"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; }; gofgamma = derive2 { name="gofgamma"; version="1.0"; sha256="00wda3fandrd1kkm20fb615g5fd0wykk3s0xn0xh9da28q08yh2m"; depends=[]; }; goft = derive2 { name="goft"; version="1.3.6"; sha256="0ag1bks44hm787sgbab70ab9q0dzbfsx70ldprafjx92gg1cqv5s"; depends=[fitdistrplus sn]; }; goftest = derive2 { name="goftest"; version="1.2-3"; sha256="06bz6k7smr4jbvzmb73qc5fkf4my59w5gbl18wlmpkkymsv78prs"; depends=[]; }; @@ -10780,7 +10801,7 @@ in with self; { googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; googleErrorReportingR = derive2 { name="googleErrorReportingR"; version="0.0.4"; sha256="0x8pzj43apkk7qkx3fv2a8531lp94ir5l83vj3ksmvzrvqjars3l"; depends=[httr jsonlite magrittr]; }; googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; - googlePolylines = derive2 { name="googlePolylines"; version="0.8.3"; sha256="1r6mwh1wz0966bdbhvy6j0ibz1sa6xgq9k1cn8xpsmrlnr4y4ydv"; depends=[BH Rcpp]; }; + googlePolylines = derive2 { name="googlePolylines"; version="0.8.4"; sha256="1qrigccfnv6g2jii2kfdhnxnvx0mjpxq78pg8g8nza33w9lrmrrq"; depends=[BH Rcpp]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; googlePubsubR = derive2 { name="googlePubsubR"; version="0.0.4"; sha256="1f9nd93x2z82jwjw2nha2czcnix7r97h1g3llgfx1b970gsm3pk1"; depends=[cli googleAuthR magrittr]; }; googleTagManageR = derive2 { name="googleTagManageR"; version="0.2.0"; sha256="0ia3ndz5vf3bc5kckyxwn71nngml6p67v8r3n6h79s12xn9jzylg"; depends=[assertthat dplyr future googleAuthR httr jsonlite purrr]; }; @@ -10791,21 +10812,20 @@ in with self; { googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; }; googlesheets4 = derive2 { name="googlesheets4"; version="1.1.1"; sha256="1kzwhs9zrx1i4kqhdqrkzyhnwx25j8j2pcg7ja2dxfalihs67k65"; depends=[cellranger cli curl gargle glue googledrive httr ids lifecycle magrittr purrr rematch2 rlang tibble vctrs withr]; }; googletraffic = derive2 { name="googletraffic"; version="0.1.4"; sha256="15zl8rnxd6vvpj4vkgaxdfhysngqakyn5gmxcs7sv895agbfwarz"; depends=[ColorNameR dplyr googleway htmlwidgets plotwidgets png raster schemr sf sp stringr webshot2]; }; - googleway = derive2 { name="googleway"; version="2.7.7"; sha256="0pcc5ypd5nn5m6xf3p9vdfj2a8f2dxrrqzfq5qm18mlfl9pnvn7x"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; + googleway = derive2 { name="googleway"; version="2.7.8"; sha256="17mihhyavl07aiyhm5pcsihmwznbdca5yfcaq4qk8kiyh81nnml0"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; gor = derive2 { name="gor"; version="1.0"; sha256="05wjmp8r58jv0ppq54vjw8xbwdlmksh5zch8cjm3ss20fsvqxdsj"; depends=[igraph]; }; goric = derive2 { name="goric"; version="1.1-2"; sha256="004nx29wz191rp0naa73r762bf6lap931lwrxifhz7izl47jzfj0"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; - gorica = derive2 { name="gorica"; version="0.1.2"; sha256="0id0xqdw4rwqviym8l0a5gnl5a68ci5f4gn4bhywmzb6fh1nxj33"; depends=[bain lavaan limSolve lme4 MASS mvtnorm quadprog]; }; - gorpiper = derive2 { name="gorpiper"; version="1.0.1"; sha256="0d5406zh75rxnq9mkkvyvsfj2h42rqyjb64q2qfl8x772vx2pdb0"; depends=[cli crayon data_table fs magrittr processx purrr stringr tibble]; }; + gorica = derive2 { name="gorica"; version="0.1.4"; sha256="1r8dg9wcqxd53zm27mf0554x2zlsclbfmqqwjbkywa3np6gi358y"; depends=[bain lavaan limSolve lme4 MASS mvtnorm quadprog]; }; gosset = derive2 { name="gosset"; version="1.0"; sha256="1as3p5mpkhg205ssxzf26xn84b8abgzp413dw2fganidh7i9dmff"; depends=[BradleyTerry2 DescTools ggparty ggplot2 ggrepel partykit patchwork PlackettLuce psychotools qvcalc tidyr]; }; gotop = derive2 { name="gotop"; version="0.1.2"; sha256="1dvcgz7ha637ixjqmgcwhvl3f9kpx4fdq8im40iz8xwnxqwmrlgx"; depends=[htmltools jsonlite]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; govdown = derive2 { name="govdown"; version="0.10.1"; sha256="00ndpp3v6z2497xlhhc92pa7w93qk9x8m6ibswj9dfh978d07028"; depends=[rmarkdown]; }; gower = derive2 { name="gower"; version="1.0.1"; sha256="1z0mhfp8xp7rk9i820pkvspm6mwih24g6b5rqs63m37sbs79ssi9"; depends=[]; }; goxygen = derive2 { name="goxygen"; version="1.0.3"; sha256="0825zl16ap0k3jqhrjw4hfsw97ils77jmf4yqq347k3bb8i3dm79"; depends=[citation gms pander stringi yaml]; }; - gp = derive2 { name="gp"; version="1.0"; sha256="1av0kk6z6mvbwi3arqx3r1nj8kvdjshgzbn2msbcaw7kqii8kzrf"; depends=[Rfast RNGforGPD]; }; + gp = derive2 { name="gp"; version="1.1"; sha256="0w5wcjzgjajfx29whqkn3xv3v9bn4q0almmmsb7qw79dnbv5c16s"; depends=[Rfast RNGforGPD]; }; gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; - gpbStat = derive2 { name="gpbStat"; version="0.4.0"; sha256="00s9zys6awwimdzqql7prbbpg45nyrsccjjb59pzwsr234bqpmwl"; depends=[]; }; - gpboost = derive2 { name="gpboost"; version="1.2.3"; sha256="0fn3qlsxf31zqndnr2058hijy64m5bfn7iyh4qfm2z2vnxmkhn83"; depends=[data_table Matrix R6 RJSONIO]; }; + gpbStat = derive2 { name="gpbStat"; version="0.4.1"; sha256="02sb9npwd1x8fnjl7999q4vlap23pn4692bhzp0vqwy1kbr0j7da"; depends=[dplyr magrittr purrr tibble tidyr]; }; + gpboost = derive2 { name="gpboost"; version="1.2.5"; sha256="025vx2ws8zw4mndq7sz1wgsk9yh39gk5d3nn9a9v3bb1qjzi5m9q"; depends=[data_table Matrix R6 RJSONIO]; }; gpg = derive2 { name="gpg"; version="1.2.9"; sha256="0k2f00l400dcxa8akhy48a34w7nhbdmpq3nz6lbwp0cqa7aj678z"; depends=[askpass curl]; }; gpindex = derive2 { name="gpindex"; version="0.5.0"; sha256="1y8n9zn9ngbbdc0na5zrigmdvv1y4facjqnx6wlv0x0bs7nj47xr"; depends=[]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; @@ -10823,14 +10843,14 @@ in with self; { gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; gquad = derive2 { name="gquad"; version="2.1-2"; sha256="09hcs2lgqnim29gpd805b5ndxi22z2xwsf25rb1zckxf9c7bn7sj"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-7"; sha256="196h7i4y1gzkwlybml9iz78p5xsx7y22nk5pmzibryn5amdbdy05"; depends=[XML]; }; - grImport2 = derive2 { name="grImport2"; version="0.2-0"; sha256="19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1"; depends=[base64enc jpeg png XML]; }; + grImport2 = derive2 { name="grImport2"; version="0.3-0"; sha256="04k71x2wm1wsgv5fnk8xip2q5brl9cnjp3fv2rs0kdq9jkhs6yhz"; depends=[base64enc jpeg png XML]; }; grPipe = derive2 { name="grPipe"; version="0.1.0"; sha256="0m9zxnmg8gfzridzk4lhhp1gw3nrygarn90ppwyi67bqdpp5hkfh"; depends=[DiagrammeR DiagrammeRsvg dplyr magrittr png rsvg]; }; graDiEnt = derive2 { name="graDiEnt"; version="1.0.1"; sha256="102nf21a410rsfxqs7dv88kxxr6ya76kyyj95bkjjkn4bz8dykyc"; depends=[doParallel]; }; grabsampling = derive2 { name="grabsampling"; version="1.0.0"; sha256="031a4ak84k2mbhrmjbai3q8qnf2z3d9rp0xra67x74a99av9lzs9"; depends=[extraDistr ggplot2 ggthemes plyr reshape2]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gradeR = derive2 { name="gradeR"; version="1.0.10"; sha256="1ngfrminhsk3155da0vjmvrk66nbnak8p1ns20cw32qayq6wyrr2"; depends=[callr jsonlite testthat]; }; gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; }; - grafify = derive2 { name="grafify"; version="3.2.0"; sha256="184ci2myn2x80l3zaan9bsyrq34ag0gqs14awh83khacxlkk7my8"; depends=[car emmeans ggplot2 Hmisc lme4 lmerTest magrittr mgcv patchwork purrr tidyr]; }; + grafify = derive2 { name="grafify"; version="4.0"; sha256="00sgaqdglwnqb18i4bqfrj5km0wxy4a47mjk34s3a61ac8bbllmd"; depends=[car emmeans ggplot2 Hmisc lme4 lmerTest magrittr mgcv patchwork purrr tidyr]; }; grafzahl = derive2 { name="grafzahl"; version="0.0.8"; sha256="1pccxzraz9sri69774svj3sb1fxq00lq8261z0fcm0j17mqmysyq"; depends=[jsonlite lime quanteda reticulate]; }; grainscape = derive2 { name="grainscape"; version="0.4.4"; sha256="0c9ms97xnz7z5r2hhwbw0qpcmknp2wk327z95x751yjvgbps3lkg"; depends=[ggplot2 igraph raster Rcpp sf sp]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-4"; sha256="1am5nlnyawi4lybi10ag4fdhddvbwsdzrmr6f66bzspdpl4s26g9"; depends=[]; }; @@ -10838,7 +10858,6 @@ in with self; { grandR = derive2 { name="grandR"; version="0.2.2"; sha256="1jxw2isjdgxyr9lf71zpn1bzpy1qs7v0918m846s0a71k6dlqr6f"; depends=[cowplot ggplot2 labeling lfc MASS Matrix minpack_lm numDeriv patchwork plyr RCurl reshape2 rlang scales]; }; grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; }; granova = derive2 { name="granova"; version="2.2"; sha256="0fs8r0q5gvdyppsiil5p3dmfqyn2xygkqarnbmyhr0znbcxzkwxp"; depends=[car]; }; - granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grantham = derive2 { name="grantham"; version="0.1.1"; sha256="0c7kw7yh5n6mgbplnbdcviwc3r2b321v7s334b0cljz6i3c3cr76"; depends=[dplyr magrittr rlang stringr tibble tidyr vctrs]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; grapesAgri1 = derive2 { name="grapesAgri1"; version="1.1.0"; sha256="0bsnxk7fqick6y76z6s1kwrg1y8spvg0awmdg5hk37g0f3wxgyas"; depends=[agricolae corrplot desplot dplyr ggplot2 ggpubr gridGraphics gtools Hmisc kableExtra knitr magrittr PairedData pastecs RColorBrewer Rdpack reshape2 rmarkdown shiny shinyWidgets summarytools]; }; @@ -10851,42 +10870,44 @@ in with self; { graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; graphhopper = derive2 { name="graphhopper"; version="0.1.2"; sha256="1zrnwh86jv37z07b6l1i94dgjn8k3b3a3f76gfjsyyxvlc64i76x"; depends=[dplyr googlePolylines httr jsonlite magrittr tibble]; }; graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.2.0"; sha256="00nfm6dkmx9cv9j6462vvkd72x72r4yyibg5hh9jifnss9p7smjh"; depends=[corpcor edmcr glassoFast glmnet igraph mvtnorm osqp Rdpack]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.3.1"; sha256="1196h506lgp3ydm589j2r7356p6qidaffxc5qfhlkn7lnry0iil2"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo rlang]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.3.3"; sha256="1wpw92bbjf37rps9qdkd7nklr74639493kdqb2nw335k132hrs6a"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo rlang]; }; graphkernels = derive2 { name="graphkernels"; version="1.6.1"; sha256="1fwl5a13mdmia374zas0vvd4dlfnp4in9gj42c0iq01icy1wq0la"; depends=[igraph Rcpp RcppEigen]; }; - graphlayouts = derive2 { name="graphlayouts"; version="1.0.0"; sha256="1favwyk5jak95jhfyadcdgr53mq8g92z3vdp2662ivaj7lg48mc9"; depends=[igraph Rcpp RcppArmadillo]; }; + graphlayouts = derive2 { name="graphlayouts"; version="1.0.1"; sha256="0x777ixw2vvj1z3dams0zmyk25v7cdm4sx8v6knlb2mfkkg2gcyk"; depends=[igraph Rcpp RcppArmadillo]; }; graphon = derive2 { name="graphon"; version="0.3.5"; sha256="1x61pdsb3s1vi1iiy9pjq0iz0m5j5b6q3rqhwvx9kvmg4r8yifpv"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5.1"; sha256="10zpibqh1vsin60pl5dnk4z2kzrfc3aqrhijcn36zq7f97629wv8"; depends=[jsonlite Rcpp]; }; - graphseg = derive2 { name="graphseg"; version="0.1.0"; sha256="108i6yrwg505ndgm7j48shxs8wd2ciwm486a2nq267wpk4jrkdrz"; depends=[flsa igraph magrittr Matrix sf]; }; + graphseg = derive2 { name="graphseg"; version="0.1.1"; sha256="0rgr9k0imif79prw5kkcnkpw3hx8ndzh1bvd0wxgqga8f9vr1cgk"; depends=[flsa igraph magrittr Matrix sf]; }; graphsim = derive2 { name="graphsim"; version="1.0.3"; sha256="16djk5zm2pnvfyb2783rdyi6a0gspm23br7xxgb2c8wfd9gf430n"; depends=[gplots igraph Matrix matrixcalc mvtnorm]; }; graphx = derive2 { name="graphx"; version="1.0"; sha256="1k7vq0j58yskmaqknpkhccrc5n1hh8p2fsw7419r7k6a2c3syj8a"; depends=[cubature docore jpeg magicaxis MASS plotrix png pracma raster sp]; }; - grateful = derive2 { name="grateful"; version="0.2.0"; sha256="02wwidgf3i26lkn0b4vw33zibqcv1gd93fjlkm4igcb76nlbq1cp"; depends=[knitr remotes renv rmarkdown rstudioapi]; }; + graposas = derive2 { name="graposas"; version="1.0.0"; sha256="0wyrzhmkswx7s2a78lzphqm3jz9akxc462gy0icpvxn2hff9wvki"; depends=[GA mvtnorm]; }; + grateful = derive2 { name="grateful"; version="0.2.4"; sha256="0g1xn8chm4if31xfd012w6zj6gl7s19yifp1pyp6v0frpslcks4b"; depends=[knitr remotes renv rmarkdown rstudioapi]; }; grates = derive2 { name="grates"; version="1.1.0"; sha256="1b9njc07wxrfbk4l286dflj44lf154vcgymrgmh7zy6691bigbjv"; depends=[]; }; gratia = derive2 { name="gratia"; version="0.8.1"; sha256="0k4mkkkj3kbmfj8z1nsw80xh9jmrc59sxc1n7sp3ca2cfyfszgc1"; depends=[cli dplyr ggplot2 lifecycle mgcv mvnfast nlme patchwork pillar purrr rlang stringr tibble tidyr tidyselect vctrs]; }; - graticule = derive2 { name="graticule"; version="0.3.0"; sha256="1j30fipgxp698w549r4lp4kqi9g25ri8par3jglljm89jhggq6q8"; depends=[geosphere raster reproj sp]; }; - gratis = derive2 { name="gratis"; version="1.0.3"; sha256="1hbmqb093lxnv8gkn9vd0fsgs5a85yfdqxj5p8jmkq9078yr1vga"; depends=[doRNG dplyr foreach forecast GA generics magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; - grattanInflators = derive2 { name="grattanInflators"; version="0.3.1"; sha256="1nqfl6hdw0ilz912rs2j39j5xmbmkx6ggdldnck8203h9s1dq3ga"; depends=[data_table fy hutils]; }; + graticule = derive2 { name="graticule"; version="0.4.0"; sha256="0i2nhsrhixbwisgx8354aqsnik5sax9m63fzagmj4k3fcnpry7b0"; depends=[geosphere raster reproj sp]; }; + gratis = derive2 { name="gratis"; version="1.0.5"; sha256="05ac9rxzps2mal20xqwa937ybdgl73nngswvjxwya20pbwhz6l73"; depends=[doRNG dplyr foreach forecast GA generics magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; + grattan = derive2 { name="grattan"; version="2023.1.1"; sha256="148j0mf26rv2ads18543lvcf9izh61zr5if2djxn11zm3px3l8v5"; depends=[assertthat checkmate data_table fastmatch forecast fy grattanInflators hutils hutilscpp ineq magrittr]; }; + grattanInflators = derive2 { name="grattanInflators"; version="0.4.2"; sha256="0r3c81ld08l9fz2331jhqwrivsm78n97if76grhwn1ic2himvlh5"; depends=[data_table fy hutils]; }; gravitas = derive2 { name="gravitas"; version="0.1.3"; sha256="11n85bdmigqasbq8c1amj1k7manfvs3gnax2ihsf2vp56s9c463p"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; gravity = derive2 { name="gravity"; version="1.1"; sha256="05kkprv63x9m715yv9kx2k70bqnkacc72zr0aljcj0ry10nl40c6"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; gravmagsubs = derive2 { name="gravmagsubs"; version="1.0.1"; sha256="1kc3dm2wmbwbad6sdhzs6bnpmri66142rc552cd75pijzbnymqvf"; depends=[Rcpp]; }; greatR = derive2 { name="greatR"; version="1.0.0"; sha256="03xzdx8ajngz6svjv47g0hslibm2xr1741gnqxnzs4lm1iwbhamv"; depends=[cli data_table ggplot2 neldermead optimization scales]; }; grec = derive2 { name="grec"; version="1.5.0"; sha256="0k40j32l551qsnw7hry0slk0y89fiff7mgfwsk9fyz70kns64yk5"; depends=[abind imagine raster terra]; }; greed = derive2 { name="greed"; version="0.6.1"; sha256="05p24991s97h0hmvv88s3hca9b50384hm6qm771dqznqs5m4ggrq"; depends=[cba cli future ggplot2 gridExtra gtable listenv Matrix Rcpp RcppArmadillo RSpectra]; }; - greekLetters = derive2 { name="greekLetters"; version="0.0.7"; sha256="0r6c4y6dnd3mm5i7y5cy7xz3w2j7qkfkkvxg9ig138has6115gjj"; depends=[assertthat stringr]; }; - greeks = derive2 { name="greeks"; version="1.1.0"; sha256="1maq2vklfaf8nd8iqrsh0kib5r7p8bkgm5kk7n061lv8azggmbrq"; depends=[dqrng ggplot2 magrittr plotly Rcpp shiny tibble tidyr]; }; - greenclust = derive2 { name="greenclust"; version="1.1.0"; sha256="198ix55x8cl5wx09p6ahzy3bvig86mvqf2qywjfilp6b4hnjgk7l"; depends=[]; }; - greencrab_toolkit = derive2 { name="greencrab.toolkit"; version="0.1"; sha256="14sin19fqmsb0a4nhdk27bcz8n4qmsz8j7q16n1v25s3r9f4x6rd"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + greekLetters = derive2 { name="greekLetters"; version="1.0.2"; sha256="0c52lfpm0awd3hc6ggnjqz5ymcbbm74qlj9iznkd5gln85q29vqc"; depends=[assertthat stringr]; }; + greeks = derive2 { name="greeks"; version="1.3"; sha256="0danj3nllcxzv9gf9b5sjcjn8qafmaas3nx54r0b447d3sqdl95f"; depends=[dqrng ggplot2 magrittr plotly Rcpp shiny tibble tidyr]; }; + greenclust = derive2 { name="greenclust"; version="1.1.1"; sha256="1wdz2lrrchwsxm68mvjcx3nlnr93n0jj8d5gr0j55idn7wn73gdq"; depends=[]; }; + greencrab_toolkit = derive2 { name="greencrab.toolkit"; version="0.2"; sha256="11lrbjm91m2lbgr0wdy84mal4qxs9x0bmniaijxpw9fdwrkqq0aw"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; gregRy = derive2 { name="gregRy"; version="0.1.0"; sha256="1b8c8wwp8r2v51ayy7rbav24wfz75z1pylg0p4vsasaw9p06dlbz"; depends=[dplyr magrittr purrr tidyr]; }; gremlin = derive2 { name="gremlin"; version="1.0.1"; sha256="1pi1bksxmjmzclppgbqqg93swf4d72d2mr8bsxv7ndcdjr69xd5r"; depends=[Matrix nlme]; }; gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; }; - greport = derive2 { name="greport"; version="0.7-3"; sha256="189jjnh3yya0v79mdy3mx0859larqh1n1kkzzrcapbqah8b3vr4h"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; + greport = derive2 { name="greport"; version="0.7-4"; sha256="1zyvw3npqz20mlfvmlrz742xxsigs21srn2df9yyjap93g7wqzy1"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.4.3"; sha256="17s90053sjr9w8rylwwf1knvsp9scv5hf7vvx2kpsgzpy45myn1v"; depends=[abind callr cli coda future glue parallelly progress R6 reticulate tensorflow yesno]; }; greta_dynamics = derive2 { name="greta.dynamics"; version="0.2.0"; sha256="143ixhi2hxxgb10lp9c8b2xdp63rpbhqbxzbbbzhigf9aflpmh62"; depends=[cli glue greta tensorflow]; }; greta_gp = derive2 { name="greta.gp"; version="0.2.0"; sha256="0fwl4cxq3gsr1y84plc1v48l5achmd5czqza4n4qxlcgf72rd6kb"; depends=[cli glue greta tensorflow]; }; gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; }; gretlR = derive2 { name="gretlR"; version="0.1.4"; sha256="094a4hy67j8bk6b0yfvzq5g0ydi69z0m9bqmvdgwv87b3llvpl1q"; depends=[kableExtra knitr magrittr rmarkdown]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="1.0.8"; sha256="1lb0k9lq39k5cykq46agiq2ykwfcrdc1pncxnry750r6wqyi5sp8"; depends=[generics nloptr pracma Rcpp statmod texreg xtable zoo]; }; - grf = derive2 { name="grf"; version="2.3.0"; sha256="0k9g53rhjv69bklvq4b7g54hl80dvfqpd075y34j7xmal4x5rbf4"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; + greybox = derive2 { name="greybox"; version="2.0.0"; sha256="14624pgp02ajlhicq29683j34z2ap6xcjy71f3qbm5nq96w975f8"; depends=[generics nloptr pracma Rcpp statmod texreg xtable zoo]; }; + grf = derive2 { name="grf"; version="2.3.1"; sha256="0z0wbfy69zddm75z9imc9dycdrlly5s94a9473z1dmcr99r7h60m"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridBezier = derive2 { name="gridBezier"; version="1.1-1"; sha256="1n5d6svxblcxpzf79px0qjxsydpwjpnfcagnwk35ljinyd0wv68z"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-1"; sha256="1x1bbyfbyyn13sw5pvnzns6mq57fyq2fywj8hx5k9rhqclzjqxyr"; depends=[graph gridGraphviz gridSVG]; }; @@ -10896,31 +10917,29 @@ in with self; { gridGraphviz = derive2 { name="gridGraphviz"; version="0.3-1"; sha256="0yzy7w4bk3rn9yjqy06gzkcs0dla3n49z3v1z0mjikg8cd97d5ni"; depends=[graph Rgraphviz]; }; gridOT = derive2 { name="gridOT"; version="1.0.1"; sha256="106h1lk2fyfl68iwmbqbm9h8ip75ibanr1dsi6nrmd54pz475ry8"; depends=[Rcpp RcppArmadillo]; }; gridSVG = derive2 { name="gridSVG"; version="1.7-5"; sha256="1p8qnx9q96bni39x44l40rgcdi9r440zbipdfvkbs2paysx6mkr5"; depends=[jsonlite XML]; }; - gridpattern = derive2 { name="gridpattern"; version="1.0.2"; sha256="13yypjsbpr61yn15y4cyz6s8jvcgg3mmr8rncskinpk8lsa8h2h4"; depends=[glue memoise png rlang sf]; }; + gridpattern = derive2 { name="gridpattern"; version="1.1.0"; sha256="19g8mnc5y68w9pybckmcvr56qkwbs5z9z6zhj0bxmlprwanq4f8x"; depends=[glue memoise png rlang sf]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; gridstackeR = derive2 { name="gridstackeR"; version="0.1.0"; sha256="01yazynwprzjygkh0dwrlvbjsmxvfy1pxr0nldnbngmq10wvpp2n"; depends=[checkmate htmltools shiny shinyjs]; }; gridtext = derive2 { name="gridtext"; version="0.1.5"; sha256="0f7i2qb8fawi8agy2iz2c173kfwj7cbb5ikjix64nmzqc5j7363d"; depends=[curl jpeg markdown png Rcpp rlang stringr xml2]; }; gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; }; - grizbayr = derive2 { name="grizbayr"; version="1.3.3"; sha256="1gimywjhgpc5xsxq0s0l4bfval4rqki36c3pa1kw5yq6xazy3iwx"; depends=[dplyr magrittr purrr rlang tibble tidyr]; }; + grizbayr = derive2 { name="grizbayr"; version="1.3.5"; sha256="04gka7q0wy1w4qg3wm4vnzc1q0g4zgvrvra1la2w1sggc5asdh32"; depends=[dplyr magrittr purrr rlang tibble tidyr]; }; grmsem = derive2 { name="grmsem"; version="1.1.0"; sha256="0byyl1121acs90xbhgi4g4hnf4n259k7cg5grm6dyaxqkha3lyw7"; depends=[msm numDeriv optimParallel]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; grobblR = derive2 { name="grobblR"; version="0.2.1"; sha256="1l1msh900kmbbszn1f9vfdix4a6180lvs3gfidp9pgkvi2gv2g01"; depends=[dplyr ggplot2 glue gridExtra magrittr png purrr RCurl stringr tibble]; }; groc = derive2 { name="groc"; version="1.0.8"; sha256="0zxwq3ha3sa58v8fhb2s41nqqpsgr3q9j7arlww1zz295mrlrs5i"; depends=[MASS mgcv pls robustbase rrcov]; }; gromovlab = derive2 { name="gromovlab"; version="0.8-3"; sha256="0mm303iiaqfdvr94x765dbd1018cvvl0q4z2zppwk1aif0kb53x8"; depends=[ape cluster glpkAPI igraph quadprog]; }; - groundhog = derive2 { name="groundhog"; version="3.1.0"; sha256="12x0wm0acksgkg6ap6rzl76a9szfrpjvksyq768n6jqr5aixchv9"; depends=[]; }; + groundhog = derive2 { name="groundhog"; version="3.1.2"; sha256="17zav0fdblmwp3zq4hd1dkgidmm25gjs39z106r7cvm80h5hd9iy"; depends=[]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; - groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; - groupTesting = derive2 { name="groupTesting"; version="1.0.0"; sha256="00jy1gw6whslmfcqic99hmbxh2z75rj14cjzrm5mnpcajn37s66j"; depends=[pracma]; }; groupWQS = derive2 { name="groupWQS"; version="0.0.3"; sha256="1c5yrsfgkhbg1fcjbrilfmf0phjry5z34536yfizc8wbc7mmmj0c"; depends=[glm2 MASS rjags Rsolnp]; }; groupdata2 = derive2 { name="groupdata2"; version="2.0.3"; sha256="0r126mq7cyc19nizyh8xk5a0pfi1sic8lxfvnlmhhhbpn97lqyqz"; depends=[checkmate dplyr lifecycle numbers plyr purrr rearrr rlang tibble tidyr]; }; - groupedSurv = derive2 { name="groupedSurv"; version="1.0.5"; sha256="10h6x1rgsrapgsx5j82nfajkq8f9jr1l3nzzv2llnrzbd7gghgcn"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; + groupedSurv = derive2 { name="groupedSurv"; version="1.0.5.1"; sha256="16qyvd8k7wdg0iafs5gxljx464nd79kwdl7g7g6hvhrhr621mgyq"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; groupr = derive2 { name="groupr"; version="0.1.2"; sha256="1v4k8is6dkf7cl97z14i3j791a9xfcb1icm2ll5ss6h0d5ad3hym"; depends=[dplyr pillar purrr rlang tibble tidyr vctrs]; }; - groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; groupwalk = derive2 { name="groupwalk"; version="0.1.2"; sha256="1nhz9lyh863krxqqi189zpng12y658615w372km98scn1lwl6fi9"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; + growR = derive2 { name="growR"; version="1.0.0"; sha256="0xk0wwfvvj7gw2pfzrila6zadmzax2gsdc3skj9r00wxcj6dsanf"; depends=[R6 Rdpack rlang]; }; growfunctions = derive2 { name="growfunctions"; version="0.15"; sha256="0rj0kypjvqj7wlswzq4kxqizhlw56zgaydf37cbfjm5090h43fzi"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; }; - growthPheno = derive2 { name="growthPheno"; version="2.1.19"; sha256="1cs544s2xvqv8zgy9mccz4y4qs5nncrzmi2slmwnjh94nk1481aw"; depends=[dae GGally ggplot2 Hmisc JOPS RColorBrewer readxl reshape stringi]; }; + growthPheno = derive2 { name="growthPheno"; version="2.1.21"; sha256="01xsmkl9hywxz1ykghys7i6451iwq78n6pjbjsh505lqnzg5prv5"; depends=[dae GGally ggplot2 Hmisc JOPS RColorBrewer readxl reshape stringi]; }; growthcleanr = derive2 { name="growthcleanr"; version="2.1.1"; sha256="18aj6wvr26srs3cfrj7rkf2d3vxqy4kn82dmfc8mazlf4f2plrra"; depends=[data_table doParallel dplyr foreach labelled magrittr plyr R_utils tidyr]; }; growthcurver = derive2 { name="growthcurver"; version="0.3.1"; sha256="1l3dqcl395nh406s7d5554r5ynk1a7v5ba5kmnv9r7lj7h9nfdjj"; depends=[minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.3.1"; sha256="1lryxdjq5ns08sqfcrsi9q2h399xr6lhxgh7kasx6pajly35vg1r"; depends=[]; }; @@ -10930,7 +10949,7 @@ in with self; { grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.3"; sha256="05417f0pnp21svi30vcbkkw16zyg1kxynfigh5w2jdjmd12cb899"; depends=[Rcpp]; }; grplasso = derive2 { name="grplasso"; version="0.4-7"; sha256="0jf48ahc6d6biwx235dlvbk1papxkqbcnvxsr93p5047pjm02y3a"; depends=[]; }; grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; - grpnet = derive2 { name="grpnet"; version="0.1"; sha256="0h6j1pflncb7cc1r6a439jw4g4izh7r98rm6ygk9wbfip3apvx65"; depends=[]; }; + grpnet = derive2 { name="grpnet"; version="0.2"; sha256="1fwh7h4cfpyc2dia0bxddw171pn1y3qhvy1zyhj4rphhmlc02456"; depends=[]; }; grpreg = derive2 { name="grpreg"; version="3.4.0"; sha256="1bfnahkb249996m3qmf96g4ldgnw7xfcm2wr45ccrlk3mw5x4mzx"; depends=[Matrix]; }; grpsel = derive2 { name="grpsel"; version="1.3.1"; sha256="0b901si4xm6306mzfk3nmwg2h8pk9rhvv2m08v3qnbnxaw06my2h"; depends=[ggplot2 Rcpp RcppArmadillo]; }; grpseq = derive2 { name="grpseq"; version="1.0"; sha256="187c3y3rsls1a66phb6kvndfh0rz7h8kl6w10gi9k6r8q6isvl9i"; depends=[mvtnorm]; }; @@ -10938,7 +10957,7 @@ in with self; { grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; }; grwat = derive2 { name="grwat"; version="0.0.2"; sha256="1aaiv6q9aiw7j4fdmcgwbwv7wb6hw396h1k5ch0kl8arg6bn2s26"; depends=[crayon dplyr ggplot2 kableExtra knitr lubridate magrittr mblm progress Rcpp rlang rmarkdown stringr tidyr trend zoo]; }; gsDesign = derive2 { name="gsDesign"; version="3.5.0"; sha256="06m4l1p7pwhs9lxnzjivg5xaygb3lfp0zdfvwzw7m6ngx12saglg"; depends=[dplyr ggplot2 gt magrittr rlang tibble tidyr xtable]; }; - gsDesign2 = derive2 { name="gsDesign2"; version="1.0.9"; sha256="09rz2qxlip9jfkallgsz7cxih1hfqapfdawz56lw8225y8k6p30f"; depends=[corpcor dplyr gsDesign gt mvtnorm npsurvSS purrr Rcpp rlang tibble tidyr]; }; + gsDesign2 = derive2 { name="gsDesign2"; version="1.1.0"; sha256="04n0nlkw1zab3m802a8jrwgic4g8likv7x3zba92qipppfvjzqph"; depends=[corpcor dplyr gsDesign gt mvtnorm npsurvSS Rcpp rlang tibble tidyr]; }; gsEasy = derive2 { name="gsEasy"; version="1.4"; sha256="1m3vrwcbkswr0b6rzyydxaibda6lv1m9kmxm9yh2sphk4mdwqxxj"; depends=[ontologyIndex Rcpp]; }; gsMAMS = derive2 { name="gsMAMS"; version="0.7.1"; sha256="00h6b0zxhiqpgngmwazx2lpzvy3x85mbishmmqn51v4k3568dw52"; depends=[mvtnorm survival]; }; gsalib = derive2 { name="gsalib"; version="2.2.1"; sha256="145zyc2sqa0acn9crilpw5njms7w7ca3jgl499lhsahlb6ws98rx"; depends=[]; }; @@ -10958,23 +10977,23 @@ in with self; { gson = derive2 { name="gson"; version="0.1.0"; sha256="10d3v543bvsyrwg3dm04xpzxjvmba1d1fhcf2zfb3l36pvjvxp8l"; depends=[jsonlite rlang tidyr]; }; gsrs = derive2 { name="gsrs"; version="0.1.1"; sha256="0x5fll59l000dqszy0gmhsfqgpaljc57j1grqg5c7y1p3vji38in"; depends=[doParallel foreach MASS]; }; gsrsb = derive2 { name="gsrsb"; version="1.2.1"; sha256="0b2dzacd5axd4pfhv0q1gd7hk0fbfj738zdlabzs8dc9737bykiq"; depends=[ldbounds mvtnorm xtable]; }; - gss = derive2 { name="gss"; version="2.2-6"; sha256="1kh2l7i346lbily3sq1lyc2fzflcfki2h8n3mfbq59ri6mm4czic"; depends=[]; }; + gss = derive2 { name="gss"; version="2.2-7"; sha256="0siz9xmfiirkg8sb0amzyp7k1mjbgz8jmsmlc8schw65093i84rv"; depends=[]; }; gstar = derive2 { name="gstar"; version="0.1.0"; sha256="1582f7jcphb32j3wdc345qa5sgm2xyimlc6r5r5jay7ca5ll8c98"; depends=[dplyr ggplot2 reshape2 xts zoo]; }; gstat = derive2 { name="gstat"; version="2.1-1"; sha256="09ax28di93r4r334qwdp84i95809lkr6587w4xlgpvsma7k0bcj8"; depends=[FNN lattice sf sftime sp spacetime stars zoo]; }; gstsm = derive2 { name="gstsm"; version="1.0.0"; sha256="1qkq9ghg49p09wx60k68nh871l1xz0qpzsls8lg4b038kngr9q6l"; depends=[digest]; }; gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.1-1"; sha256="10nxyi1kqq9ypincpr347iqixfz17nd69g7ikhyid1djqfy1v8nj"; depends=[]; }; gsynth = derive2 { name="gsynth"; version="1.2.1"; sha256="1a4s8ghxc5zw295ys8hp22nx93gc1vyakn7r1dcq3ghikh02nzaa"; depends=[abind doParallel doRNG foreach future GGally ggplot2 lfe MASS mvtnorm Rcpp RcppArmadillo]; }; - gt = derive2 { name="gt"; version="0.9.0"; sha256="0l60f38r7wnd2dh4c5il9axabxzqd0zdzlhkp1cibdp14zi7xr9y"; depends=[base64enc bigD bitops cli commonmark dplyr fs glue htmltools htmlwidgets juicyjuice magrittr markdown reactable rlang sass scales tibble tidyselect xml2]; }; + gt = derive2 { name="gt"; version="0.10.0"; sha256="0gkfqy7n0pv1cz4vrshl2w07c0ykipi5rvp46nyvlcd17qq5z2kh"; depends=[base64enc bigD bitops cli commonmark dplyr fs glue htmltools htmlwidgets juicyjuice magrittr markdown reactable rlang sass scales tibble tidyselect xml2]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; - gtExtras = derive2 { name="gtExtras"; version="0.4.5"; sha256="04vl7i9qllfn5977y47kc4355rpk9m63rii2c0v27i9lbvr3z4fr"; depends=[commonmark dplyr fontawesome ggplot2 glue gt htmltools paletteer rlang scales]; }; + gtExtras = derive2 { name="gtExtras"; version="0.5.0"; sha256="000vwq4k0vrn75vzy6iflqydxl81rgn06a8kqca99gwywcqr3gvv"; depends=[cli commonmark dplyr fontawesome ggplot2 glue gt htmltools knitr paletteer rlang scales]; }; gtWAS = derive2 { name="gtWAS"; version="1.1.0"; sha256="1kbkz0iwc3gfj982m93m2wdr1xm5rhy70k6bdc7kms9ivh5fh6sh"; depends=[]; }; - gtable = derive2 { name="gtable"; version="0.3.3"; sha256="0fkv19h64cyxsadplvyzbpjliy9wlfg56hc8znvqg972g3cmi6ig"; depends=[cli glue lifecycle rlang]; }; + gtable = derive2 { name="gtable"; version="0.3.4"; sha256="0xvrkhcv1896mf3n43mva2mrmk0d8np7sjrykpg1pv54f69h6ckh"; depends=[cli glue lifecycle rlang]; }; gte = derive2 { name="gte"; version="1.2-3"; sha256="0fnrpgfji5f1n8nra0d8xghqgsjil7r2j6xnbmfm7mjafcav4wwk"; depends=[survival]; }; gtfs2emis = derive2 { name="gtfs2emis"; version="0.1.0"; sha256="1nh3m57xhh12sm18d5lvf0i9z4ayn6kgbmp036lw89wz10s42w6z"; depends=[checkmate data_table furrr future gtfs2gps sf sfheaders terra units]; }; gtfs2gps = derive2 { name="gtfs2gps"; version="2.1-1"; sha256="0k65iy7armdn13bs31wr6gq7hdxpz5nqqzpdxpm5g1mkxwc9fi1g"; depends=[checkmate data_table furrr future gtfstools lwgeom progressr Rcpp sf sfheaders terra units]; }; - gtfsio = derive2 { name="gtfsio"; version="1.1.0"; sha256="08s9p6r18axf9rh91qqqh4bkn4l39vs7hhws1502zlxkjaqbypdz"; depends=[data_table zip]; }; - gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.5"; sha256="0yxgc4pi0g2wqswvwba0ij263i8b8p6wgsy6hbvklq0gim616shi"; depends=[cli data_table geodist Rcpp]; }; + gtfsio = derive2 { name="gtfsio"; version="1.1.1"; sha256="06kw2r00y277a822qqgjifmrz0l6gfq1dx8znrc2yhrk0ynadsjz"; depends=[data_table zip]; }; + gtfsrouter = derive2 { name="gtfsrouter"; version="0.1.2"; sha256="1v8b3yr7c7yaavy3ivj7ik2hmbdyjasmkxkbrs3f943m9fbkngwi"; depends=[cli data_table geodist Rcpp]; }; gtfstools = derive2 { name="gtfstools"; version="1.2.0"; sha256="03gc784dvskvg8m0fcqc966ka0slnh10in5gk7bba8h7lnfb893w"; depends=[checkmate cpp11 curl data_table gtfsio processx sf sfheaders units zip]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; gto = derive2 { name="gto"; version="0.1.1"; sha256="111jla0acxpb749ncr77lnbxk7hmsv8syin1p2cs1d1fr2jxkzs1"; depends=[gt magrittr officer rlang xml2]; }; @@ -10989,14 +11008,13 @@ in with self; { guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; guidedPLS = derive2 { name="guidedPLS"; version="1.0.0"; sha256="1gmprd6a5nyglm36sdyk9dqbgqavf3a7gzjbm5jzb5ybhj9r2w61"; depends=[irlba]; }; guildai = derive2 { name="guildai"; version="0.0.1"; sha256="1y3m1756450dzcz1m8fdj53p2bw9zhisnp67fr2fhmv6kga37995"; depends=[config dplyr jsonlite processx rappdirs readr rlang rstudioapi tibble yaml]; }; - guiplot = derive2 { name="guiplot"; version="0.4.1"; sha256="06phbwcz9yjr1vi822izjc2c6n3cr0wvwlfb61b186xfsc10mnqr"; depends=[DT excelR ggplot2 magrittr R6 rlang shiny svglite]; }; + guiplot = derive2 { name="guiplot"; version="0.5.0"; sha256="0w0airy3z9hskpsqsk136ipmj8wn9v9j5n6sicybwm0qvj83fzhj"; depends=[DT excelR ggplot2 jsonlite magrittr R6 rlang shiny svglite]; }; guix_install = derive2 { name="guix.install"; version="1.0.0"; sha256="0s3wb5781yc43c9zwrn7i87zcbrlx7xr0ms0v9hvgs7qsv02id9j"; depends=[RUnit]; }; gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; }; - gumboot = derive2 { name="gumboot"; version="1.0.0"; sha256="0c31rxkq08wzycwiwii7q166pzwfbdg35259rymwy0g38pnjnjp6"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 reshape2 stringr]; }; + gumboot = derive2 { name="gumboot"; version="1.0.1"; sha256="12lbnhgcc6l76g6s3bcj46p1s4ddqazwspmkn97ybwcydma44x7m"; depends=[dplyr ggplot2 lubridate ncdf4 reshape2 stringr]; }; gunit = derive2 { name="gunit"; version="1.0.2"; sha256="10n1mjhb3k0npcp3cmw3pm2035vda3341i0gfxni27xdhggpm0rk"; depends=[magrittr stringr tibble units]; }; gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; gustave = derive2 { name="gustave"; version="0.4.4"; sha256="1zr9iy4977b80pn4yfdr890ka258af8khid14xjp6mjj3wczlmvp"; depends=[Matrix]; }; - gutenbergr = derive2 { name="gutenbergr"; version="0.2.3"; sha256="1jffisx1sycxw3f09n13jnzn7h47zj34g82n6vww6gwliznfsvvz"; depends=[cli dplyr glue lazyeval magrittr purrr readr stringr urltools]; }; gvc = derive2 { name="gvc"; version="6.4.0"; sha256="1wwsl0vz801324558qwzy241ws6qics8nrd6yyzkwrfz2kyfmya0"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; @@ -11005,41 +11023,40 @@ in with self; { gwasrapidd = derive2 { name="gwasrapidd"; version="0.99.14"; sha256="07i71z44gkvwcx2dcbccz0sf68161drrhhd86jvq30nv20wxhmhx"; depends=[assertthat concatenate dplyr glue httr jsonlite lubridate magrittr pingr plyr progress purrr rlang stringr testthat tibble tidyr urltools]; }; gwavr = derive2 { name="gwavr"; version="0.2.0"; sha256="0wlbyl3r4sxcjyfbymcrynkcaqmqivl4qhh14nxjrg8lji47lad6"; depends=[dplyr elevatr httr jsonlite leaflet leaflet_extras magrittr miniUI nhdplusTools promises purrr scales sf shiny shinyWidgets terra tidyr units whitebox]; }; gwbr = derive2 { name="gwbr"; version="1.0.5"; sha256="08yhg56i1xrkmfcyr87gz0w6mzsm0isg3fjm6kmmgsq522cj3jjb"; depends=[]; }; - gwer = derive2 { name="gwer"; version="3.0"; sha256="0jiq5v37mbn6y7vl5gs8qahb796jrfqj0m54sd38vim8yhhjwfy8"; depends=[assertthat glogis GWmodel maptools Matrix sp spData spdep spgwr]; }; - gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; }; gwpcormapper = derive2 { name="gwpcormapper"; version="0.1.3"; sha256="0d8skx6rxas5qvhg7ykhymrzd6dawj45421vr66r4wi4hbdfjbzx"; depends=[attempt config corpcor crosstalk dplyr DT geodist glue golem htmltools leaflet pkgload plotly processx Rcpp sf shiny shinydashboard shinyjs viridis]; }; gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; }; gwrr = derive2 { name="gwrr"; version="0.2-2"; sha256="1pn84056fdrrjq8m13671hn4gvz40z0jsi6r5kv5b82fwzj4g57y"; depends=[fields lars]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; gyro = derive2 { name="gyro"; version="1.3.0"; sha256="01ddkr5f7xqccl2vqwqyv4d91y0008vyzbw211zii2x2c48l4r24"; depends=[clipr cxhull Morpho plotrix purrr randomcoloR RCDT Rcpp rgl rstudioapi Rvcg]; }; - h0 = derive2 { name="h0"; version="1.0.0"; sha256="0wdf9grp6dnipcd6751wflkq5h4wgl9dmcx4hqly21lw162jq3yn"; depends=[]; }; + h0 = derive2 { name="h0"; version="1.0.1"; sha256="0nw671dgf50zqmw6j8znig6ksqf68hbshc8v87dcig70j1sqab4k"; depends=[]; }; h2o = derive2 { name="h2o"; version="3.42.0.2"; sha256="16wjcaskwkjw5bn4mj73qsywd9qcp8q906p3sfsr1vdk9qgm7bls"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.3.3"; sha256="004sskj3a1mzjfh86m0rq02z1f3kd6650bzv1d3j8pj0xdmqb86c"; depends=[magrittr reticulate]; }; h2otools = derive2 { name="h2otools"; version="0.3"; sha256="105zc76yi03ib5l6366an472hnf3m0pk1mwghwn8pwi91pfybzzr"; depends=[boot curl h2o]; }; h3jsr = derive2 { name="h3jsr"; version="1.3.1"; sha256="04h905p3xpaswpx728kp7z6bgqlncgzikfv6njvgvzbhmpfn9fs8"; depends=[geojsonsf sf tidyr V8]; }; + h3lib = derive2 { name="h3lib"; version="0.1.2"; sha256="1lm89ngdhcgi9i2fx17fk38acpyv343m2djk38fzs7aipn95qyli"; depends=[]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.2.1"; sha256="1vy1kaffviidhil39n7k2fr5rjgzkhkaj1r2nhmp908snq8nhf2m"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; hJAM = derive2 { name="hJAM"; version="1.0.0"; sha256="1pnjcn54zi4d7h9zc9wr1gv51dzb0vasfcrw4c1kqymhxsq2yfh3"; depends=[dplyr ggplot2 ggpubr reshape2]; }; hNMF = derive2 { name="hNMF"; version="1.0"; sha256="08xn9i24dcykvbcsqzmk33li5fm1alkvcmq2fp0a2ysw4lvwfwqs"; depends=[MASS NMF nnls oro_nifti rasterImage]; }; hR = derive2 { name="hR"; version="0.2.50"; sha256="1zslalsb2zi6b91fb2k1m0vsbsdazls2gnnl7gv2xqvn6kdh4nf6"; depends=[data_table knitr rhandsontable shiny]; }; - hSDM = derive2 { name="hSDM"; version="1.4.2"; sha256="11c1q7sxaisrpi0d9zskys71n2j36r0f66yay1w3bvkacpxnkwfd"; depends=[coda]; }; - haarfisz = derive2 { name="haarfisz"; version="4.5.3"; sha256="1qrp4hwxrj7nf7lrxvhwgi9vky0wbyfd165b8idavj0b2n29s98n"; depends=[wavethresh]; }; + hSDM = derive2 { name="hSDM"; version="1.4.4"; sha256="1r2hbwf9795bxrd09c8hmmj7cm044x4w42606m3i3d3i065bpw4m"; depends=[coda]; }; + haarfisz = derive2 { name="haarfisz"; version="4.5.4"; sha256="1c00zpswnbfd44j7fb6pib6fwri2qs8kasd3fxifmaj0i6zpq8jf"; depends=[wavethresh]; }; habCluster = derive2 { name="habCluster"; version="1.0.5"; sha256="1cjmhq8krkv4g1vy70kc3j667djzmq38xlqn568f437f6jaglvkp"; depends=[igraph raster Rcpp sf stars]; }; hablar = derive2 { name="hablar"; version="0.3.2"; sha256="0mzk4nwsamf07cbscn8zjiqdf6ik0dc9c4v8cafrlsv1wxpbs09i"; depends=[dplyr lubridate purrr]; }; hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; }; hacksaw = derive2 { name="hacksaw"; version="0.0.2"; sha256="1ls4l53bsaxyd6lwka9z9sb6ypa2ymbxpfxhsj9k966031jv2vk3"; depends=[dplyr magrittr purrr rlang tibble tidyselect zeallot]; }; hacksig = derive2 { name="hacksig"; version="0.1.2"; sha256="0sc35vyi00r2b3hgn1xw2zffd704adschjwhx0niv5a1l33dxbkp"; depends=[dplyr future_apply rlang tibble tidyr]; }; - hagis = derive2 { name="hagis"; version="3.1.6"; sha256="1caa9yndj19in5vzcm4dhwhwkwy48017771as7yc7rsp899vm5mg"; depends=[data_table ggplot2 pander]; }; + hagis = derive2 { name="hagis"; version="3.1.11"; sha256="1s4n08zy7agqs8a1jzzyyba93j1nnd0d3bz63j5xd3yvw36brzjf"; depends=[data_table ggplot2 pander]; }; hakaiApi = derive2 { name="hakaiApi"; version="1.0.2"; sha256="0lxqk4cp1s1sm3nbsp74q1bpklmph620c2f1kii97h6yimnq9bi0"; depends=[dplyr httr R6 readr tibble]; }; hal9001 = derive2 { name="hal9001"; version="0.4.3"; sha256="132qnrk6rm2qc5gw17iw61plx1ghnyzi7km8bp36vnqn19x9wj7j"; depends=[assertthat data_table glmnet Matrix origami Rcpp RcppEigen stringr]; }; haldensify = derive2 { name="haldensify"; version="0.2.3"; sha256="071lgx6j92n40bjlrp3khmnavvkla371rkm1ssx20ig5pkay23pw"; depends=[assertthat data_table dplyr future_apply ggplot2 hal9001 matrixStats origami Rdpack rlang rsample scales tibble]; }; halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; }; halfmoon = derive2 { name="halfmoon"; version="0.1.0"; sha256="19pclcrcbmmf1b1q2dhwh17a67xif992y3w6685si5bn0ripsj6h"; depends=[cli ggplot2 tidyselect tidysmd]; }; - halk = derive2 { name="halk"; version="0.0.3"; sha256="0v484xbnbyhnafybl5idylsmzrwhk9smymnjlfq9ld2bg23w9i71"; depends=[dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + halk = derive2 { name="halk"; version="0.0.4"; sha256="1v6b8i1m0sdqk6gfjzfz35b8y1klb97m29m11wgpnshwzqxnfij2"; depends=[dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; }; - handcodeR = derive2 { name="handcodeR"; version="0.1.0"; sha256="01cc088i9dw4xy7iqy551mmprrm3s0pvkzr4xr78406pkbbzijfa"; depends=[shiny shinyWidgets]; }; + handcodeR = derive2 { name="handcodeR"; version="0.1.1"; sha256="1q9pdlkjsl2p15c3k2hhnksbc45sh4clm4zvfjs7yca6d37q1vjh"; depends=[shiny shinyWidgets]; }; handlr = derive2 { name="handlr"; version="0.3.0"; sha256="0l0jwlslz2pyg7q447k56acfhgmx5njsriqdrwd02zzbsc3g6wm5"; depends=[crul jsonlite mime urltools xml2 yaml]; }; - handwriter = derive2 { name="handwriter"; version="1.0.1"; sha256="1jq65dzvjpjrvhw76asmh8qghdzfgisvdn43hc0hmkj90nj6aaap"; depends=[ggplot2 igraph magick png randomForest Rcpp RcppArmadillo reshape2 rjson shiny stringr]; }; + handwriter = derive2 { name="handwriter"; version="2.0.2"; sha256="0l3vg76kwqwxzhn62y4sbl8nap219yppk9rak36w04hryxdahdf1"; depends=[doParallel dplyr foreach futile_logger ggplot2 igraph lpSolve magick mc2d png purrr Rcpp RcppArmadillo reshape2 Rfast rjags stringr tidyr]; }; handyFunctions = derive2 { name="handyFunctions"; version="0.1.0"; sha256="0y476acqdm73y19k8s9c9vy8xryyjg16pay3vikslwccv7kgsigz"; depends=[ggplot2 rlang stringr]; }; handyplots = derive2 { name="handyplots"; version="1.1.3"; sha256="0pcl0iichdw2lkv8y00mv6n6c0rvrnsk75ka5lwm2g7b64pphsvk"; depends=[]; }; hans = derive2 { name="hans"; version="0.1"; sha256="0hh2nlzxs2kj93yb7yfm873m6nymjw5qmkin3qqn3acza6dr0k6q"; depends=[Rcpp]; }; @@ -11047,6 +11064,7 @@ in with self; { hapassoc = derive2 { name="hapassoc"; version="1.2-9"; sha256="09ijc4sbw743z74fzklmvig11ndkycg6j86k4214wfsj1yj6j9x6"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.2"; sha256="103i1fxk990drlsdhjrh9p6rp05g7gqzmlqfcdx9a1di1qrhw5qh"; depends=[haplo_stats survival]; }; haplo_stats = derive2 { name="haplo.stats"; version="1.9.3"; sha256="1nwxmx3v0085bdr14sr1n4wpipyp1bdq9qhx2gxmx9h3l02glkis"; depends=[arsenal rms]; }; + haploR = derive2 { name="haploR"; version="4.0.7"; sha256="1s8f556d9x5h76gyl4wggcx01f4qrx0fp5mz46yk2x9qmwiir89v"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; haplotypes = derive2 { name="haplotypes"; version="1.1.3.1"; sha256="0w61ww76fq4iqzi6w9q2649925m5agnjaqhij40dwxyzsyqv9zjd"; depends=[ape network phangorn plotrix sna]; }; happign = derive2 { name="happign"; version="0.2.0"; sha256="1incrlf6frhrb2sb6w0x6fcgdy4vvr9qkcsq3r40pgpkkczdidl4"; depends=[archive dplyr httr2 jsonlite sf terra xml2]; }; @@ -11056,10 +11074,11 @@ in with self; { hardhat = derive2 { name="hardhat"; version="1.3.0"; sha256="0bp83yw7j34iwir2f73ainic11cdz0q18m5v1kbx8vdsw84z17zy"; depends=[cli glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; harmonizer = derive2 { name="harmonizer"; version="0.3.2"; sha256="05iiph9zx4wllviiwr92bhiq24bmi62iq9wjn8j91dvascd6xh5i"; depends=[]; }; - harmony = derive2 { name="harmony"; version="0.1.1"; sha256="0pcvfy2gpkgwws09cnd6qkr62w53rdhiiz98jr9w19m15gc8skvm"; depends=[cowplot dplyr ggplot2 irlba Matrix Rcpp RcppArmadillo RcppProgress rlang tibble tidyr]; }; + harmony = derive2 { name="harmony"; version="1.1.0"; sha256="0ry1d40l3f75by58ylm3f118inyb2r9kxahimbh93rwrgv5xbkbv"; depends=[cowplot dplyr ggplot2 Matrix Rcpp RcppArmadillo RcppProgress RhpcBLASctl rlang tibble]; }; + harmonydata = derive2 { name="harmonydata"; version="0.1.1"; sha256="1n90zm31himxwaaan92fbar0nqvxgn41i38vshv42wa77641lr1m"; depends=[base64enc httr jsonlite uuid]; }; harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; }; harrypotter = derive2 { name="harrypotter"; version="2.1.1"; sha256="1j3sv0rpp4lcrf09j4a3an4lkwi2x1z18iv62fk6c2kpp9b14b8r"; depends=[ggplot2 gridExtra]; }; - hash = derive2 { name="hash"; version="2.2.6.2"; sha256="17scs675a86c34hjbxmwi8kny4yyv97x3515s449zafj2i0ad8vm"; depends=[]; }; + hash = derive2 { name="hash"; version="2.2.6.3"; sha256="044ifii4gpinzi9vbv5aw0da956ccslxg34xmx24njf6x5dhn0wa"; depends=[]; }; hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; }; hashr = derive2 { name="hashr"; version="0.1.4"; sha256="10rvq4rvg7fds2ylh21lri4wlvj870bncqq7kma7rf89rg5x1jz6"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.2.0"; sha256="1ni4wzj8g6qmpgz1xj62vawkcpm3jr4jqqr1xaxlh5nzbj9fn57h"; depends=[graph Rgraphviz]; }; @@ -11068,26 +11087,26 @@ in with self; { hawkesbow = derive2 { name="hawkesbow"; version="1.0.2"; sha256="0abbarpwlbasgmp0cr8144x2aqkmqf2i99pqd9g9sp9bxbg66056"; depends=[BH nloptr Rcpp RcppArmadillo]; }; hazer = derive2 { name="hazer"; version="1.1.1"; sha256="1d1qj6mamgxlvxq2hjik69zfzackjz5819iss98jf5gdbdngw41x"; depends=[]; }; hbal = derive2 { name="hbal"; version="1.2.8"; sha256="15id1r3h3h5pv0yahkcgzav8qhacha4wn688p7hmxpsq84d63xky"; depends=[estimatr ggplot2 glmnet gridExtra gtable nloptr Rcpp RcppEigen stringr]; }; - hbamr = derive2 { name="hbamr"; version="1.1.6"; sha256="1wv5iaidklw5kp3z1rv86qa4adgjgqz7agk7zzffl2v38nnvcvpd"; depends=[BH dplyr ggplot2 loo matrixStats pbmcapply plyr RColorBrewer Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tidyr]; }; + hbamr = derive2 { name="hbamr"; version="1.2.0"; sha256="0c70gizc5q4dg6by6smsh21v0am3hmskcx6lmb8mscid3q1gmbm5"; depends=[BH dplyr ggplot2 loo matrixStats pbmcapply plyr RColorBrewer Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tidyr]; }; hbbr = derive2 { name="hbbr"; version="1.1.2"; sha256="09sph4vliyb63pd0abq02ix5wz373r70kgldw44fm279zq4z772h"; depends=[R2jags]; }; - hbim = derive2 { name="hbim"; version="1.1"; sha256="1i4fx132xnkb1jp4ikhfibcxp47klsv08vbrj63mqfqr872b29mh"; depends=[mvtnorm]; }; - hbmem = derive2 { name="hbmem"; version="0.3-3"; sha256="1rajd5h9gp0rrpc0q0m0fx37mv2n70da3gnfvvnjc5a77mzfyqkp"; depends=[]; }; + hbim = derive2 { name="hbim"; version="1.1.2"; sha256="1wgzxmbdzigh9q6q2s4vfh58p8whmyp0jckfga1li5cibqbvpaf0"; depends=[mvtnorm]; }; + hbmem = derive2 { name="hbmem"; version="0.3-4"; sha256="0qhxc784zhilxhijlsykl10cqlxk9ll8m2cz9s1cmz76hlvrn0y9"; depends=[]; }; hbsae = derive2 { name="hbsae"; version="1.2"; sha256="0fg782gxivkkwhqvxf09j1q20f2dqm7bd1y9bp99fy7mg88zp0gn"; depends=[Matrix]; }; hcandersenr = derive2 { name="hcandersenr"; version="0.2.0"; sha256="0r8z8kb9hwvgcsxbd7arbmqclhwlbcjpnf3p9mp5vgyxm84iz515"; depends=[]; }; - hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; - hce = derive2 { name="hce"; version="0.5.0"; sha256="0fw2g4014g69mmy7zqhll41d9s5brklmjx1c2hzkdili86xzhfky"; depends=[]; }; + hce = derive2 { name="hce"; version="0.5.8"; sha256="15a7hbra5ian5bs60x675qsf2qgvaxl04nn5m6np11iswkb31dm1"; depends=[]; }; hchinamap = derive2 { name="hchinamap"; version="0.1.0"; sha256="1pia593g50zf3286f9g51slkvrpj1iy7lws9d7a3nqgb2v3yji1y"; depends=[htmlwidgets]; }; hcidata = derive2 { name="hcidata"; version="0.1.0"; sha256="16qzll0rhfc6szi9y5hxycq5462jm78kla70fnv1sqw7n34pvpg5"; depends=[Rdpack]; }; hclust1d = derive2 { name="hclust1d"; version="0.1.1"; sha256="1cari4ms1j5x2i5m9yd50j7alf18k7z053yhqbck0hs2mck9jx86"; depends=[Rcpp]; }; hctrial = derive2 { name="hctrial"; version="0.1.0"; sha256="19li8i8hx0r3b63q80cnj6pr72rdbmykxq0kcfbn4azq3sdd046y"; depends=[clinfun GenBinomApps]; }; hdImpute = derive2 { name="hdImpute"; version="0.2.1"; sha256="1gs3205z3v7zvr2xqi4jv8xpmngpw41nk0kbz7wx3g4a5152hagq"; depends=[cli dplyr magrittr missRanger plyr purrr tibble tidyr tidyselect]; }; hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; }; - hdbinseg = derive2 { name="hdbinseg"; version="1.0.1"; sha256="0fy9cqrygsnxkb3nxg56md19svrvkbijpxkqfk9p18cj5ibwrq94"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; + hdbinseg = derive2 { name="hdbinseg"; version="1.0.2"; sha256="0q5lfczymrd4ln04lbdysncx6ylcsgrk69mhvm7jjk7pybrpm9wq"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; hdbm = derive2 { name="hdbm"; version="0.9.0"; sha256="0lvaica195chl6bb10wvvr7fbmh8b954fpxcm9r0gyp0d0i2a2w4"; depends=[Rcpp RcppArmadillo]; }; hdcate = derive2 { name="hdcate"; version="0.1.0"; sha256="1jv6y38lzvm75s44n1pjvkkf5xcvrvclil318gvx54b16hvgggcg"; depends=[caret hdm KernSmooth locpol R6]; }; - hdd = derive2 { name="hdd"; version="0.1.0"; sha256="0hnqjfp78s8fiabibf0dl57sj170ri1ysf7pyrk45z4qsnizbyn2"; depends=[data_table fst readr]; }; - hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; }; + hdd = derive2 { name="hdd"; version="0.1.1"; sha256="1xl5p56qrnvli2ga1p8xyvgsp17jyjm0xng5prigyngnpj327qpk"; depends=[data_table dreamerr fst readr]; }; + hddplot = derive2 { name="hddplot"; version="0.59-2"; sha256="1q7mz7yxb4qvprj431kxv46cf9myckkycfbi6nzbkqw8mpwg02qy"; depends=[MASS multtest]; }; hdf5r = derive2 { name="hdf5r"; version="1.3.8"; sha256="0arhs9z3rhqkb3pkhdgf1kgyhzrgvrrfjj4phijpji2przi82cmm"; depends=[bit64 R6]; }; + hdf5r_Extra = derive2 { name="hdf5r.Extra"; version="0.0.2"; sha256="0fpkgq845k2z63i0yl160hvnv7x857k81likdgasbw1x85rlihaf"; depends=[checkmate dplyr easy_utils hdf5r Matrix MatrixExtra rlang]; }; hdflex = derive2 { name="hdflex"; version="0.1.0"; sha256="0423grfw56pwjh3km4ib55vgrzl5kk23j3g8f9d96jyjzkkxnbmi"; depends=[checkmate dplyr Rcpp RcppArmadillo roll stringr]; }; hdfqlr = derive2 { name="hdfqlr"; version="0.6-2"; sha256="07lfr0vblahh3xhckwmzbmlja0janb73qkl4663mqgp6xk21jmi1"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-9"; sha256="0k35zqz58lcx5p7ijhks4j7kqp553zggvrx4lh6k4s85lp601x22"; depends=[glmnet linprog MASS scalreg]; }; @@ -11096,7 +11115,7 @@ in with self; { hdme = derive2 { name="hdme"; version="0.6.0"; sha256="04s9r29yjirkzki6drcyglh2hd712habzdgpw0fnf3cy9960wv4v"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk rlang]; }; hdmed = derive2 { name="hdmed"; version="1.0.0"; sha256="19n1m8wrzwf4lvmfw1bgyhymxv79irs341yfnhlc8znq4nm35yfh"; depends=[bama foreach freebird gcdnet genlasso hdi iterators MASS mediation ncvreg]; }; hdnom = derive2 { name="hdnom"; version="6.0.2"; sha256="0i6wzffi5jww4wjp3f7vgnb8b9zfpsam2wyz9p7376r297j3hv66"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized survival]; }; - hdpGLM = derive2 { name="hdpGLM"; version="1.0.2"; sha256="1kan4nm4kd40xqagkly4pvahra0xsdlr5wyxgm567c22fzwp7khg"; depends=[coda data_table dplyr formula_tools ggjoy ggplot2 ggpubr ggridges Hmisc isotone LaplacesDemon magrittr MASS MCMCpack mvtnorm purrr questionr Rcpp RcppArmadillo rprojroot stringr tibble tidyr tidyverse]; }; + hdpGLM = derive2 { name="hdpGLM"; version="1.0.3"; sha256="1hh0d0dmnqxzsfar86bd0cqjj5jljyhw073zi59bmjyg4m0rjyyn"; depends=[coda data_table dplyr formula_tools ggjoy ggplot2 ggpubr ggridges Hmisc isotone LaplacesDemon magrittr MASS MCMCpack mvtnorm png purrr questionr Rcpp RcppArmadillo rprojroot stringr tibble tidyr tidyverse]; }; hdpca = derive2 { name="hdpca"; version="1.1.5"; sha256="0xcakpnp363lz98y3h87p1yhj0gs3f94gx2i8kz4mcizn1ll5xbd"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.4"; sha256="16qlk44cjvn2s0vzaf915df65ksdx20dbxhy7fpdqins46hccha3"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; @@ -11106,14 +11125,14 @@ in with self; { healthyR = derive2 { name="healthyR"; version="0.2.1"; sha256="0wlw6sd187sw5ar58c4a5yz9fw0bc044cik1xsq54ipp4xprlnxp"; depends=[cowplot dplyr ggplot2 lubridate magrittr plotly purrr rlang scales sqldf stringr tibble timetk writexl]; }; healthyR_ai = derive2 { name="healthyR.ai"; version="0.0.13"; sha256="0qck4118f0kg9rfnmjc14qh7kdzvxh28rdlydhz8i5j91a6731a4"; depends=[broom dials dplyr forcats ggplot2 ggrepel h2o magrittr modeltime parsnip purrr recipes rlang tibble tidyr tune workflows yardstick]; }; healthyR_data = derive2 { name="healthyR.data"; version="1.0.3"; sha256="1bbxy7x7q1jn5l48li3pfiqisxrfw87nql20v5c2f06m67mn2mq8"; depends=[dplyr janitor rlang]; }; - healthyR_ts = derive2 { name="healthyR.ts"; version="0.2.9"; sha256="0bprpd36xjwb7ygimqin9qxybplpj28jp62s5ql9l0dwbfpprj2f"; depends=[cowplot dplyr forcats ggplot2 hardhat lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyr timetk workflowsets]; }; + healthyR_ts = derive2 { name="healthyR.ts"; version="0.2.11"; sha256="1pyrrx6hy9kgiaqcy4sb7gr89zcyd586h1b12j7h32f2faaggi03"; depends=[cowplot dplyr forcats ggplot2 hardhat lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyr timetk workflowsets]; }; healthyverse = derive2 { name="healthyverse"; version="1.0.4"; sha256="1h3d8wq6if1nkqc1d3n6y0g7i7xsvx9ci09z3jvhqx62f464ybgm"; depends=[cli crayon dplyr healthyR healthyR_ai healthyR_data healthyR_ts magrittr purrr rlang rstudioapi tibble tidyAML TidyDensity]; }; heapsofpapers = derive2 { name="heapsofpapers"; version="0.1.0"; sha256="1b88ff4j6rh0qif43iyb12wipkkjmp5qx33qfzgffr5m54df4kfy"; depends=[aws_s3 curl dplyr fs magrittr rlang scales]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap3 = derive2 { name="heatmap3"; version="1.1.9"; sha256="0sfvizmmwfk1bjhn6zfx5a4qqfgj1ldg8x90b65crqibgfa36k2r"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; heatmapFlex = derive2 { name="heatmapFlex"; version="0.1.2"; sha256="0va8ac2wf1mzm6zamhfpid3xkm7310c6b695c5wbc705nwijnd9q"; depends=[Biobase Heatplus RColorBrewer]; }; - heatmaply = derive2 { name="heatmaply"; version="1.4.2"; sha256="0zgaqmbc1nha38c8kx5xdjdjbwmykrf2acq8ydki8dqixv6b34la"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; + heatmaply = derive2 { name="heatmaply"; version="1.5.0"; sha256="1crdm7avxv3zx59byz2fqbcw95728crwf9cckjb9gal1065xv95c"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; heatwaveR = derive2 { name="heatwaveR"; version="0.4.6"; sha256="172qg8dgyn5lbwmyq8dxdccxr4aqaq6iixn5dqb4fy99ahgdbhyv"; depends=[data_table dplyr ggplot2 lubridate plyr Rcpp RcppArmadillo RcppRoll tibble]; }; heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; @@ -11122,26 +11141,27 @@ in with self; { helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; - hellorust = derive2 { name="hellorust"; version="1.1.0"; sha256="10n6rgd57iip284ksh57pgd6r9w2f97gnw697p65n4yw7fikrv9x"; depends=[]; }; + hellorust = derive2 { name="hellorust"; version="1.2.0"; sha256="0x2lnbrii9z4kyd810rphcip9wpx7ibqx9b4fs5c5msrqa03amk3"; depends=[]; }; helminthR = derive2 { name="helminthR"; version="1.0.10"; sha256="0ssw0smxc5zx3d189fq8c6kdg6d7db1sd5iblhz54pg41j9fvqhq"; depends=[httr magrittr plyr rvest taxize xml2]; }; helsinki = derive2 { name="helsinki"; version="1.0.6"; sha256="1hsmxnfzbi8xvqz97rmq225w9prhxc558slmfxg03y5wpjqdpq4a"; depends=[curl dplyr httr jsonlite purrr sf xml2]; }; hemispheR = derive2 { name="hemispheR"; version="0.2.0"; sha256="1cmh166jzq6vflirvwf4mvy76x3j8x9q6r1h1p6jbkm0b2hck7ci"; depends=[autothresholdr dplyr jpeg magrittr plotrix raster rlang scales sp tidyr]; }; - heplots = derive2 { name="heplots"; version="1.4-2"; sha256="1knk7w23x3ycxr79vfp9399xfcrrj46bkzxbav3m9z9r36bx6j2x"; depends=[broom car magrittr MASS purrr tibble]; }; + heplots = derive2 { name="heplots"; version="1.6.0"; sha256="01c4f2b7ja1q5cdzndgchf0ibrysd3m4d793diz680a8w47w11dh"; depends=[broom car magrittr MASS purrr rgl tibble]; }; here = derive2 { name="here"; version="1.0.1"; sha256="0srlr8h8qmr0wrmp7gs4g2ry5dni2hx8n947bik3s3a26f091v88"; depends=[rprojroot]; }; - hereR = derive2 { name="hereR"; version="0.9.1"; sha256="1csy6lh0hbfdrm0pmcmmwp8gm8ykr4sx78sgjrp18xm4axx3a5j7"; depends=[crul curl data_table flexpolyline jsonlite sf stringr]; }; + hereR = derive2 { name="hereR"; version="1.0.0"; sha256="0la67qdsq72x8k19v27g73fh6w04fdgfj1cxbd3a6w1sfvjvvy6z"; depends=[crul curl data_table flexpolyline jsonlite sf stringr]; }; hergm = derive2 { name="hergm"; version="4.1-10"; sha256="04vr5mmsr39rpjnans8xwp1z304rd3hi5za7qhjv7dn5s8c8pw9h"; depends=[ergm igraph intergraph latentnet Matrix mlergm network Rcpp sna stringr]; }; - heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; + heritability = derive2 { name="heritability"; version="1.4"; sha256="053fqjc8772gqhxnm2gn7yz747432kizn5q5060g5bd77v15jlhp"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hermiter = derive2 { name="hermiter"; version="2.3.0"; sha256="190arngwpiankyxyd47i9kagq4gbzj023y8qybd81bm4r9jn3ax6"; depends=[BH Rcpp RcppParallel]; }; hero = derive2 { name="hero"; version="0.6"; sha256="0az2gva4rdbgsfd31512h8a23bvvbx812ws05rg2qs6r5qhwbj8r"; depends=[fields Matrix optimx pbapply sf sp]; }; hesim = derive2 { name="hesim"; version="0.5.3"; sha256="115c6f0i0j7i4k2rf5m6f4a9v8mz99mfvv560v0v12g9gjj9lncb"; depends=[data_table flexsurv ggplot2 MASS msm R6 Rcpp RcppArmadillo survival]; }; - hetGP = derive2 { name="hetGP"; version="1.1.5"; sha256="0cdhqv9jy28hdbx3rd10zl1a0awv8y8wkhfbh4nfrz26y1329qc4"; depends=[DiceDesign MASS Rcpp]; }; + hetGP = derive2 { name="hetGP"; version="1.1.6"; sha256="1rw8ss67d2zglnc0vl2kvmkgglks1666d1ps0bpqgn1f8mdwv2kr"; depends=[DiceDesign MASS Rcpp]; }; + heterogen = derive2 { name="heterogen"; version="1.2.33"; sha256="17287n38km02ldwddldw9zh8f8w18f9vi7dcg52a17r9r7v0mshv"; depends=[future Rcpp RcppArmadillo RcppEigen rio scales terra]; }; heteromixgm = derive2 { name="heteromixgm"; version="1.0.0"; sha256="0jhvjalpx7licjjvj8ld4als1jkm22mkbxmz893h91qzacznx8zk"; depends=[BDgraph glasso igraph MASS Matrix tmvtnorm]; }; hetsurr = derive2 { name="hetsurr"; version="1.0"; sha256="1086lqxg6s5a0qxmd29bp3ninr4jzfdp3m6fsn9sfl7bagvrs5wy"; depends=[Rsurrogate]; }; hett = derive2 { name="hett"; version="0.3-3"; sha256="0i7q28nc67m62vi1ipfg035yqjh691fb1mp33dp1b68g5wjysphh"; depends=[lattice MASS]; }; hettest = derive2 { name="hettest"; version="1.0"; sha256="0qmgm9q42xrgfgsk15a6h2mdnq0aiyccpzyp79hi271w54dkmbj0"; depends=[]; }; hettreatreg = derive2 { name="hettreatreg"; version="0.1.0"; sha256="092xd2yndg5n5shxmcyn2gh6a6w1i1497cvj009ih3ax8hk3crf0"; depends=[]; }; - hettx = derive2 { name="hettx"; version="0.1.2"; sha256="17hfbzxfh4cinqizm33bi4wnax11w9ab7akcrl99bb59nw9xhpxr"; depends=[doParallel dplyr foreach formula_tools ggplot2 MASS moments mvtnorm plyr purrr quantreg tidyr]; }; + hettx = derive2 { name="hettx"; version="0.1.3"; sha256="15i9n2fcfbkv11qlgh4gsjvfnzzziwbcn8izzxw2d0kbdhhk7h8c"; depends=[doParallel dplyr foreach formula_tools ggplot2 MASS moments mvtnorm plyr purrr quantreg tidyr]; }; hetu = derive2 { name="hetu"; version="1.0.7"; sha256="1ml3jzfc71j0d7a7yn97sbfzlpdpg46jpjcn6xbnh17xrqc1mv2a"; depends=[checkmate lubridate]; }; heuristica = derive2 { name="heuristica"; version="1.0.3"; sha256="1j88sviy6yabh5prab0f1snnicbg843kbwyawakj3xx3p43v23lb"; depends=[Hmisc]; }; heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.3.0"; sha256="0w4f7xpz2342k38b5a7fs6fq50045hh2836390zg36nqdapg8vlv"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales stringr tidyr]; }; @@ -11151,21 +11171,21 @@ in with self; { hexbin = derive2 { name="hexbin"; version="1.28.3"; sha256="0pyy97bh9xf9hijg3iw1z4ri01571r1fx7xqm3fjkzx4q48kbcqf"; depends=[lattice]; }; hexfont = derive2 { name="hexfont"; version="0.3.1"; sha256="05p279ygpwdlmx4c9vdjs25k7yrgb4xp9cc05drjwncwh97qgj6v"; depends=[bittermelon]; }; hextri = derive2 { name="hextri"; version="0.9.17"; sha256="04kk1a029i1rz617s9i3jvpnxillc3k3b7g3nrbsbi37ik6qk5r4"; depends=[FNN hexbin]; }; - hfhub = derive2 { name="hfhub"; version="0.1.0"; sha256="0g0km18jgvnm70rh0azf05j8fdms22shnshmi4qaap8ck8lgljjr"; depends=[cli curl filelock fs glue httr rlang urltools withr]; }; + hfhub = derive2 { name="hfhub"; version="0.1.1"; sha256="0s2fm8lx680ymn8srln6dyay0lp03mxhyv7p71aw892hdq1d2sm1"; depends=[cli curl filelock fs glue httr rlang urltools withr]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; hfr = derive2 { name="hfr"; version="0.6.1"; sha256="1l0iy0gc4j3gqqz0h7cjzg0nmf45vklsfy4x04a7y8zvidn01glr"; depends=[corpcor dendextend quadprog RColorBrewer]; }; hglasso = derive2 { name="hglasso"; version="1.3"; sha256="15sq5fk7iicglpyxdkh44mg112zij05ic4x3snhqyc2lx1hvp7cy"; depends=[fields glasso igraph mvtnorm]; }; hglm = derive2 { name="hglm"; version="2.2-1"; sha256="1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc"; depends=[hglm_data MASS Matrix]; }; hglm_data = derive2 { name="hglm.data"; version="1.0-1"; sha256="0mw1s0kahsh9jmwkxysfy5f7vbld7mpzmdnnww6im5h21jhnczx2"; depends=[MASS Matrix sp]; }; hgm = derive2 { name="hgm"; version="1.23"; sha256="15prmsbs5zq12r6nrg2ibq2y8qfyrp9vq1g4jm258m0alrxnjx8w"; depends=[deSolve]; }; - hgnc = derive2 { name="hgnc"; version="0.1.3"; sha256="0ql47734xlgfnwkdqk556cif2wga4q201d5byf283hsz670g3f64"; depends=[dplyr hms httr jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble]; }; + hgnc = derive2 { name="hgnc"; version="0.1.4"; sha256="180092gpcs3j94904ry42crs62knzrv926bp25dapigqqfj7jjqi"; depends=[dplyr hms httr jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble]; }; hgutils = derive2 { name="hgutils"; version="0.2.11"; sha256="0l288fqymh2i4dngy909gi8b4c9hdis02gqwyyvy6r8xzisk4m44"; depends=[crayon dplyr limSolve lubridate magrittr stringr usethis]; }; hgwrr = derive2 { name="hgwrr"; version="0.3-0"; sha256="0m3h5zwdnj4l7i6nh0mrjj4wprajgazninzffxpy14g7fy907ifn"; depends=[Rcpp RcppArmadillo]; }; - hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.1"; sha256="1cqwn09iqgh6131cm4b5j0kx7k5vil0ak42v064g4maayj0yqy7p"; depends=[surveillance]; }; + hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.2"; sha256="171ghvnjfm1bvz75ggxpl7w1ai8nsrdi7sy2szmc8wpzc8a1wb48"; depends=[surveillance]; }; hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; }; hhsmm = derive2 { name="hhsmm"; version="0.3.6"; sha256="0b7bjvhyva3858dv01s6r891jkk14gm01hjqsab32m9w1b4r477p"; depends=[CMAPSS magic MASS mice mvtnorm progress Rcpp Rdpack splines2]; }; hht = derive2 { name="hht"; version="2.1.6"; sha256="13q30difb84byy62rrkxq2hjjl1526pn8j4qvhm5g3cgivvby5ci"; depends=[EMD fields]; }; - hibayes = derive2 { name="hibayes"; version="2.0.0"; sha256="15kk6jpm9brrl6257dh57z57dd3zndqxz0qwj1nxfc06zrs3bppi"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo RcppProgress stringr]; }; + hibayes = derive2 { name="hibayes"; version="3.0.0"; sha256="1vbad1x0scqq50w3lflgssqnyrhblk2hf6jczjxs4cbb0mny959n"; depends=[BH bigmemory CMplot Matrix Rcpp RcppArmadillo RcppProgress stringr]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; hidecan = derive2 { name="hidecan"; version="1.1.0"; sha256="08yhjgmcmrnrm6rm0vlzvizadvywcs1p6mchw1synxvclfaxyi28"; depends=[dplyr ggnewscale ggplot2 ggrepel purrr shiny tibble tidyr viridis vroom]; }; hierBipartite = derive2 { name="hierBipartite"; version="0.0.2"; sha256="1f6agxrv363wksi33b29v42hys90351ninb4li9m52n0kzv25m1f"; depends=[irlba magrittr]; }; @@ -11179,12 +11199,13 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.4"; sha256="1nd4jayfhz89kpk4i7s3n3wlza1ik4w3gspplnjmfz951f8i3wlg"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.3"; sha256="0w7114qnywpd3wcnxhpkmv0j7hqip25p6wdigg505k0gywanr7fp"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.9.4"; sha256="02yyzfhzgkrp8hgdp2gyqrrvxzh9wqn3c90lyd9nlavn4qn4789z"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rjson rlang rlist stringr tibble tidyr xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="1.0.0"; sha256="1qx121y90g3cgvxpvjx54lg06arjc79m8hcl7k1m9hr10lhhyi1a"; depends=[data_table numDeriv quantmod Rcpp RcppArmadillo RcppRoll robustbase Rsolnp sandwich xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="1.0.1"; sha256="0jxkmgd3sfipz1z37w9flwy8i94q6vxwlxyaflfbprwlskmlnakd"; depends=[data_table numDeriv quantmod Rcpp RcppArmadillo RcppRoll robustbase Rsolnp sandwich xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.1"; sha256="06sirfmkdl355rfr5bb475829v7zx1spkz82vi31vl55jzijq54m"; depends=[]; }; highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; + highlighter = derive2 { name="highlighter"; version="0.1"; sha256="1ksgqx2ryg5lfka93yns5cphnf4xc4v55ncmpisydjbcpzd2105c"; depends=[cli glue htmltools htmlwidgets rlang]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.10"; sha256="0yrlpjs8qzq1d7iy4gypnf4x1gvxq6vaghkdh1kfv433yqgvqmgc"; depends=[xfun]; }; - highriskzone = derive2 { name="highriskzone"; version="1.4.8"; sha256="167xj46v3m85pbwxw8cm0jcb1b8srqggsnk6wbjv2b0vgxm65rzg"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat spatstat_explore spatstat_geom spatstat_random]; }; + highriskzone = derive2 { name="highriskzone"; version="1.4.9"; sha256="0sg3a99pb2559chalxh66zv9mvwbgfx64vp1209vbhbx3sya48r2"; depends=[deldir fields ks maps Matrix mvtnorm polyclip spatstat spatstat_explore spatstat_geom spatstat_random splancs]; }; highs = derive2 { name="highs"; version="0.1-10"; sha256="1vjmzbfydlm434fa1mkwwfcdhmn6sq4ppib26nxfa9zakr7h7q2c"; depends=[checkmate Rcpp]; }; hightR = derive2 { name="hightR"; version="0.3.0"; sha256="0d4p9qcj7z0ayk4nb3pxnfwww29d7ks0jzavxsbz6m82g7x1pmyh"; depends=[]; }; higlasso = derive2 { name="higlasso"; version="0.9.0"; sha256="09d500jsxlrv658i90xnb2wj1ad89v1iwb6y7vascyvg3cff104h"; depends=[gcdnet gglasso purrr Rcpp RcppArmadillo]; }; @@ -11192,10 +11213,10 @@ in with self; { hilbert = derive2 { name="hilbert"; version="0.2.1"; sha256="1vw1rn5adnqi99v5w47jmqx35rqv0slas3ldw7g34il1krz9xhms"; depends=[cpp11]; }; hilbertSimilarity = derive2 { name="hilbertSimilarity"; version="0.4.3"; sha256="1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp"; depends=[entropy Rcpp]; }; hildareadR = derive2 { name="hildareadR"; version="0.2.0"; sha256="0hay1r6lxnyzjp97456d9wra7myrmifyx8cywzc85wclm355yc9b"; depends=[dplyr haven]; }; - hillR = derive2 { name="hillR"; version="0.5.1"; sha256="0yz2f3zz28k36f6afya5cg7k6kvyz6nzafr53pw6liy086nfrb9n"; depends=[ade4 ape FD geiger plyr tibble]; }; + hillR = derive2 { name="hillR"; version="0.5.2"; sha256="0gc4yirbn2bp38sjdgin7167yvm0kd6nk4yaj66jp0b5qbpc85gc"; depends=[ade4 ape FD geiger plyr tibble]; }; hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; }; hillshader = derive2 { name="hillshader"; version="0.1.0"; sha256="12phdpkjc4gyk9ri33x86dzxb03llhpqf43vin9ssfr23sbblnqh"; depends=[raster rayshader scales]; }; - himach = derive2 { name="himach"; version="0.3.1"; sha256="11p6g1w77yx8cxrvhy53dllyjk4z3jiq9mhz3bjr2kbzi954mysf"; depends=[cppRouting data_table dplyr geosphere ggplot2 lwgeom purrr s2 sf tidyr]; }; + himach = derive2 { name="himach"; version="0.3.2"; sha256="0j262rkhfadd6n1ypzwv8pj543zinayihnvfsb5i8i6fx2lag88q"; depends=[cppRouting data_table dplyr geosphere ggplot2 lwgeom purrr s2 sf tidyr]; }; hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-3"; sha256="00ppz8009cp0wbkmrxdg8x9jjqqb803bl6ki13hsqz07aya0j4iy"; depends=[]; }; @@ -11206,40 +11227,38 @@ in with self; { histmdl = derive2 { name="histmdl"; version="0.7-1"; sha256="0k6l3pfjzlgpxv55vy8dg4sl8zhh0460xcfszwp2k9sbzanwaamp"; depends=[]; }; histogram = derive2 { name="histogram"; version="0.0-25"; sha256="0yymc7fw4qkbigr8jiw2nzjyrw0ikkipz62pdn3bpz1f7nb7mi93"; depends=[]; }; historicalborrow = derive2 { name="historicalborrow"; version="1.0.4"; sha256="0g7fs6qn957s3zw4ibbqszn2zpncpf6m41r68dw8g6x942mr0fhv"; depends=[dplyr ggplot2 Matrix posterior rjags rlang tibble tidyr tidyselect]; }; - historicalborrowlong = derive2 { name="historicalborrowlong"; version="0.0.6"; sha256="087057dzjhsa8k0z8lzppn0xglms070bfz20mgb0ginwyypkf912"; depends=[BH clustermq dplyr ggplot2 MASS Matrix posterior Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr tidyselect trialr withr zoo]; }; + historicalborrowlong = derive2 { name="historicalborrowlong"; version="0.0.7"; sha256="0ynf6sb850i01fwxj1pnha8q8n1qmmf7r0jkmz4azm5pblf12fg0"; depends=[BH clustermq dplyr ggplot2 MASS Matrix posterior Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr tidyselect trialr withr zoo]; }; historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; }; histoslider = derive2 { name="histoslider"; version="0.1"; sha256="1458bh7by00izx4q9idl479f08i3gk2g59mmzfvh945vbf399km0"; depends=[htmltools reactR rlang shiny]; }; histry = derive2 { name="histry"; version="0.2.4"; sha256="01rdpzkfq7nyiq1gh0cm89dn3466cmhgfj9x19lhl2yvh8xsdz8x"; depends=[CodeDepends evaluate fastdigest roprov]; }; hitandrun = derive2 { name="hitandrun"; version="0.5-6"; sha256="0r0iymcmhiv3q1n7mrn3zsz2libfq3cdsq517k7kdk9m35piqrcg"; depends=[rcdd]; }; + hivdata = derive2 { name="hivdata"; version="0.1.0"; sha256="1rscr91hgrbpgip0knv5wp7nv3bvzr4rrfg8fpch364g99sbbqrq"; depends=[]; }; hive = derive2 { name="hive"; version="0.2-2"; sha256="0ihghpfsk73lndrfrk5907kdsih9s0a7xq23zcyfaa05nk98510n"; depends=[rJava XML]; }; - hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; }; hkdatasets = derive2 { name="hkdatasets"; version="1.0.0"; sha256="1a594fgwc5bvimwp5m2zpb6pjy4iavcylxdmsq3hrnh9ll5g5582"; depends=[fst]; }; hkevp = derive2 { name="hkevp"; version="1.1.5"; sha256="1a3wqafgv9rn10zkg27bgill33zhv76infpp4j84hsqmgiix0gfl"; depends=[Rcpp RcppArmadillo]; }; - hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; hlaR = derive2 { name="hlaR"; version="1.0.0"; sha256="0l0vch3sliyhm9pcz3x488bsq513c1iv2p55fg71141cr5k71pal"; depends=[devtools dplyr janitor purrr readr reshape2 schoolmath stringr tibble tidyr tidyselect tidyverse]; }; hlidacr = derive2 { name="hlidacr"; version="0.2.0"; sha256="02l86bvb4w8wdq9mk9zh5wkf5i5y5jlgld0ciz851p5ra70c395p"; depends=[curl glue httr jsonlite purrr stringr urltools usethis]; }; hlt = derive2 { name="hlt"; version="1.3.1"; sha256="0wzxymjb70lcgk1hj6ky6ypk9i6s0a5rm7yqlpbs1fddl6mkcln9"; depends=[doParallel foreach ggplot2 Rcpp RcppDist RcppProgress tidyr truncnorm]; }; hmcdm = derive2 { name="hmcdm"; version="2.1.1"; sha256="0w3ldx8bwcqbc0mv1f8yiby08w4s37jc7gp3p53pmldqk65s7qfb"; depends=[bayesplot progress Rcpp RcppArmadillo rstantools]; }; hmclearn = derive2 { name="hmclearn"; version="0.0.5"; sha256="0zalvgnibd1kygryqcah5d008y6a0nxpy61yyiqsriw89r01jyjk"; depends=[bayesplot MASS mvtnorm]; }; hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; }; - hmer = derive2 { name="hmer"; version="1.5.0"; sha256="0q2sgkf1xwnnjgn6g4h87wamkjj0fyxwb12yvx559rhjy3sp3h8j"; depends=[cluster dplyr GGally ggbeeswarm ggplot2 isoband lhs MASS mvtnorm pdist purrr R6 rlang stringr tidyr viridis]; }; + hmer = derive2 { name="hmer"; version="1.5.6"; sha256="1rnav6vd67daf4v8x7038zvakx0hh7fgcmldsipknbkilm49vdh7"; depends=[cluster dplyr GGally ggbeeswarm ggplot2 isoband lhs MASS mvtnorm pdist purrr R6 rlang stringr tidyr viridis]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-9"; sha256="1cwsgjf258hwyf12sn54iqiliikmadbknlvhclhmqrr2vvj7561f"; depends=[nnet]; }; hmmTMB = derive2 { name="hmmTMB"; version="1.0.1"; sha256="0iy0n4hy33a4lj62xz953a80lg1pkghw32x0mk5bx8fb7z8hq4n8"; depends=[CircStats ggplot2 MASS Matrix mgcv optimx R6 RcppEigen stringr TMB tmbstan]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hmmr = derive2 { name="hmmr"; version="1.0-0"; sha256="1m0jmw0i66hm5z5rycvpdmasq8zhgsz91km491n0n923mm480hmh"; depends=[depmixS4]; }; hms = derive2 { name="hms"; version="1.1.3"; sha256="10h2k5j97fggq3hc0qzxv1q9821y21m326v3x99zsvpl1b3g89p6"; depends=[lifecycle pkgconfig rlang vctrs]; }; + hmsr = derive2 { name="hmsr"; version="1.0.0"; sha256="171zfs27v0kznj28cbizq72i1fan5gz1s5r42kv90jylhxdv8mbc"; depends=[GA msm uuid]; }; hmstimer = derive2 { name="hmstimer"; version="0.2.1"; sha256="178jnxhbpa5y2k2cw3w7czyapb23n6yygmymijvn3pzcgx607y3v"; depends=[hms]; }; hnp = derive2 { name="hnp"; version="1.2-6"; sha256="12cbc353ipr2rcc93skf1766g38j1pvpdkqk3cswv0cxsjl2x7pl"; depends=[MASS]; }; - hoa = derive2 { name="hoa"; version="2.1.4.1"; sha256="152vz6cddphmxvm7vi6f3b7jjpib0nsb6qv2k1wrmfrpvv3hgsxx"; depends=[statmod survival]; }; hoardeR = derive2 { name="hoardeR"; version="0.9.4-2"; sha256="1jdxfalmi4p7gwb7jndxbzbklv1fk0c57shnl4jz27s81lndg437"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools_fileHandler httr IRanges KernSmooth knitr MASS R_utils RCurl rmarkdown Rsamtools S4Vectors seqinr stringr XML]; }; hoardr = derive2 { name="hoardr"; version="0.5.3"; sha256="0z34hgiwlgaljrfg0clmzx3fws1pdqq2hlg54awpvphz1qsx3r5r"; depends=[digest R6 rappdirs]; }; - hockeystick = derive2 { name="hockeystick"; version="0.7.3"; sha256="0yzkrhz2nl3jdrj3dy5clhhm0pjxdqil59dwpq49cl46yq8b6lrb"; depends=[dplyr ggplot2 lubridate patchwork RColorBrewer readr rvest scales tibble tidyr treemapify]; }; + hockeystick = derive2 { name="hockeystick"; version="0.8.2"; sha256="0h332wcrkxgz0c0brxqj0yz9r9k8qgk52i4vq9x5w858sdkwm19b"; depends=[dplyr ggplot2 jsonlite lubridate patchwork RColorBrewer readr rvest scales tibble tidyr treemapify]; }; holdem = derive2 { name="holdem"; version="1.2"; sha256="0mcb4civ4p7apm7kfl88apvb4yznsmn4hggfggmjhs046g6bi2p7"; depends=[]; }; holiglm = derive2 { name="holiglm"; version="0.2.6"; sha256="0002md0kmai9nbsgab47bcfdf1cmr8kgp7qyqbqcny76l3zzjwhx"; depends=[checkmate MASS ROI ROI_plugin_ecos slam SuppDists]; }; holland = derive2 { name="holland"; version="0.1.2-1"; sha256="0f5nr17rmx1m3g4aw6c1f82xdj2ll5nr8slm8ha80cg2i6a90v10"; depends=[MplusAutomation mvtnorm]; }; - holodeck = derive2 { name="holodeck"; version="0.2.1"; sha256="1iazi5is41ap58vq56jgz88id0i6ppz55y9gx77a5navrrn0db4l"; depends=[assertthat dplyr MASS purrr rlang tibble]; }; + holodeck = derive2 { name="holodeck"; version="0.2.2"; sha256="1phaj4yw01301rgcdv4w44q6y5vxwggmks0xdbvg9i2ak3kjcyfp"; depends=[assertthat dplyr MASS purrr rlang tibble]; }; homals = derive2 { name="homals"; version="1.0-10"; sha256="0kjcy3nv28jrir6a4pf8y82908p5snx8wha8h9lip4y436n1f4iw"; depends=[ape scatterplot3d]; }; - homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; }; hommel = derive2 { name="hommel"; version="1.6"; sha256="1lvlazvvgmaqbawalgry1a59qmqxv2qy9g0ijhpcawwv2cfxmdja"; depends=[Rcpp]; }; homnormal = derive2 { name="homnormal"; version="0.1"; sha256="1xw8j5b0w3ngqwzd458zcsmj6874dgxhrik1z3w7l188j5gr5vxa"; depends=[huxtable]; }; homologene = derive2 { name="homologene"; version="1.4.68.19.3.27"; sha256="0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh"; depends=[dplyr magrittr purrr R_utils readr]; }; @@ -11247,7 +11266,7 @@ in with self; { hoopR = derive2 { name="hoopR"; version="1.8.0"; sha256="0rfz3gbsk7kq480bjanznxwqsgk228sj9apmwpb4cp49c4fgjhin"; depends=[cli data_table dplyr furrr future glue httr janitor jsonlite magrittr progressr purrr Rcpp RcppParallel rlang rvest stringr tidyr usethis]; }; hopbyhop = derive2 { name="hopbyhop"; version="3.41"; sha256="1dh502mjrk9dlqikn0ak4gh2dw9nrnp3zrz8j1xwa9cjn37al2wh"; depends=[ggplot2 pastecs]; }; hopit = derive2 { name="hopit"; version="0.11.5"; sha256="0cvka7r66c8divszvjxd0p1r7xyn9r3qgsrvc3vmzj2f43wdjlhv"; depends=[MASS questionr Rcpp RcppEigen Rdpack survey]; }; - hopkins = derive2 { name="hopkins"; version="1.0"; sha256="06fdks0jxv47d9xsyxzx2fdrbjw40dqj26qfkv5wdlcyv3lcfc4y"; depends=[donut pdist RANN]; }; + hopkins = derive2 { name="hopkins"; version="1.1"; sha256="0wy4d5mmzd9qka5wpkglqy0m2pswypj64wp4hqpk94c6gj46ghwl"; depends=[donut pdist RANN]; }; hornpa = derive2 { name="hornpa"; version="1.1.0"; sha256="0b4dxzibngdiqj00ma2nzimbknfkscpq1ncalm9dc6pjwrmq43q1"; depends=[]; }; horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; horseshoenlm = derive2 { name="horseshoenlm"; version="0.0.6"; sha256="1m3n12wgmb1wnxc40bzpna261das8hy47l7hmvhfbzhmp7v803v5"; depends=[msm survival]; }; @@ -11282,20 +11301,19 @@ in with self; { hspm = derive2 { name="hspm"; version="1.1"; sha256="0ycdaji080xav2k87pcln7c26iy31bfjxzzccpyl57w3agcfwrcc"; depends=[Formula Matrix spdep sphet]; }; hsrecombi = derive2 { name="hsrecombi"; version="1.0.1"; sha256="1f5ks1wvpc0dn5lwyhs479zhkcbcfg2c5gxxlwr9pliv5ncgcmla"; depends=[curl data_table dplyr hsphase Matrix quadprog Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.8.1"; sha256="0k7sqwx73zid68ji9l2hfihqdlk3rdpid81pp8g3fmi8dpvrzkms"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - hstats = derive2 { name="hstats"; version="0.1.0"; sha256="0dy1pd5pmb39qan6cim62xkbsrhzdv57q1grnwp5xwfhq5xc9yis"; depends=[ggplot2]; }; + hstats = derive2 { name="hstats"; version="1.0.0"; sha256="1izl6jab013849rm4276p04vy4b2lngs1a5lg4q3vvdhf8wmkscv"; depends=[ggplot2]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; htestClust = derive2 { name="htestClust"; version="0.2.2"; sha256="081kxhc7sn070ys94pfzjf3gi2kkqwrqx2sclbgz4ihahqkbnhhr"; depends=[bootstrap MASS]; }; - htetree = derive2 { name="htetree"; version="0.1.16"; sha256="1q9fkmnr9nn68jdg87ls67rfncn12m46ck6svq0q17krf0ins9bc"; depends=[data_tree dplyr grf jsonlite Matching partykit Rcpp rpart rpart_plot shiny stringr]; }; + htetree = derive2 { name="htetree"; version="0.1.17"; sha256="0z7gbpzvj4w5vz8b3zs4mvr70qf8sz295cbypm5x6np0ac2gcdzm"; depends=[data_tree dplyr grf jsonlite Matching partykit Rcpp rpart rpart_plot shiny stringr]; }; htm2txt = derive2 { name="htm2txt"; version="2.2.2"; sha256="0f03vckq4wzd2nbzjfqgjf2pnjfdq875lhpim10k80smq32w8xx0"; depends=[]; }; - htmcglm = derive2 { name="htmcglm"; version="0.0.1"; sha256="04fcjrr2pgzhcrp9jx70a99fsgvqf0724vj3p43kp8dlk95839h4"; depends=[doBy Matrix mcglm sjmisc stringr]; }; html2R = derive2 { name="html2R"; version="0.1.0"; sha256="1zdnwbqlpjh8r2xcl83da9pzh9cb8h908krnrs61vqhka7zb82ng"; depends=[glue shiny shinyAce shinyjqui shinythemes]; }; html5 = derive2 { name="html5"; version="1.0.2"; sha256="1icji4y2x7bn4nrsf99n8b6g5v053bb9hpwvmp8bf5wh63d1ns8l"; depends=[]; }; htmlTable = derive2 { name="htmlTable"; version="2.4.1"; sha256="14qg65nw0bpikqs1hb1x7apzdzrnnl3ykjnks67kkp46v1skwzrs"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; htmldf = derive2 { name="htmldf"; version="0.6.0"; sha256="19brwxqnsxzvgsqq3gsjkcyag9ag3xa3mrl5c4s7x48xx2knfh9q"; depends=[cld3 dplyr httr lubridate magrittr processx progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; }; - htmltools = derive2 { name="htmltools"; version="0.5.5"; sha256="0nb6y99ffgj482clgnqbkhraxigr1ynpqv3d1znwd2ashnmkzcn8"; depends=[base64enc digest ellipsis fastmap rlang]; }; + htmltools = derive2 { name="htmltools"; version="0.5.6.1"; sha256="0km08kvg0j2h1d0v6wpxf09yjadhp2srjjnmqwcahfyh37w4xf09"; depends=[base64enc digest ellipsis fastmap rlang]; }; htmlwidgets = derive2 { name="htmlwidgets"; version="1.6.2"; sha256="1g0h5dqzr22jyxr6fkxyf8njq3f4wxp7nrwhqw1w5yy0lir1dnkz"; depends=[htmltools jsonlite knitr rmarkdown yaml]; }; hts = derive2 { name="hts"; version="6.0.2"; sha256="06mmxdm7a2fb1r4mb2x12b00rnkaxlrmlkv5yizr3yixmn4is9wb"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; }; - htsr = derive2 { name="htsr"; version="2.0.1"; sha256="1klpdnjam4vkavdil3cby8kfgnl1krf558nnl8fps97plpwmbydx"; depends=[DBI directlabels dplyr editData ggplot2 lubridate openair purrr Rcpp readr readxl RODBC RSQLite shiny stringr terra tibble WriteXLS zoo]; }; + htsr = derive2 { name="htsr"; version="2.1.2"; sha256="1pd9s54rxmgihxrrhbdz99rkpqq8hbswc96wy6kdzk400bmxrl36"; depends=[DBI dplyr fs ggplot2 lubridate purrr Rcpp readr readxl RSQLite shiny shinyFiles stringr tibble waiter WriteXLS]; }; httk = derive2 { name="httk"; version="2.2.2"; sha256="1ziwlb4nigf0hk3ngmk309m0gmaylvmd00m553sh0qrm9k2dls9q"; depends=[data_table deSolve magrittr msm mvtnorm purrr Rdpack survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.11"; sha256="0qsi01fcrkps0h6r7l3l5ph3zlq9gscmq19b9ah2q2qlcv3hk4cf"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.2.0"; sha256="026sl19301al3sid9hlwq8jz5b0zvh9a4n3cl4niqvc2b57h133r"; depends=[digest httr]; }; @@ -11305,8 +11323,8 @@ in with self; { httpproblems = derive2 { name="httpproblems"; version="1.0.1"; sha256="0zd683xd9f9hz6dxm4bmic54jqjcabr23kwl6afsmdjwnrwwsn06"; depends=[]; }; httptest = derive2 { name="httptest"; version="4.2.1"; sha256="1d97n6h15vad7z96w37b9dl0q7n4j9yksn32vxnx26iik8q2jic3"; depends=[curl digest httr jsonlite testthat]; }; httptest2 = derive2 { name="httptest2"; version="0.1.0"; sha256="18i4lzqkmhd500rjfkh24drcqvw8ric3disddcl7bm3rddwn4bvh"; depends=[digest httr2 jsonlite rlang testthat]; }; - httpuv = derive2 { name="httpuv"; version="1.6.11"; sha256="1xgf7q8ah9sbgbbjm9nwvry154g8i0gwfrn55npls9sihc59x9wb"; depends=[later promises R6 Rcpp]; }; - httr = derive2 { name="httr"; version="1.4.6"; sha256="1cipxhsss77n2psik755y1s7dkyqhrs0yjch8cmqswr3xz5qcvcd"; depends=[curl jsonlite mime openssl R6]; }; + httpuv = derive2 { name="httpuv"; version="1.6.12"; sha256="0x2y5yjj1ha99dv5c8j6pxm8fqhdcx010jl4rcw2qw20qaqp5ndi"; depends=[later promises R6 Rcpp]; }; + httr = derive2 { name="httr"; version="1.4.7"; sha256="0fisvq3zydmqagn7lj6x98zxkcl7l95gfydl27zkigb7zg1fcm8m"; depends=[curl jsonlite mime openssl R6]; }; httr2 = derive2 { name="httr2"; version="0.2.3"; sha256="0gabjyv2699p7fb4225jsr2kkbarx1w01kha8ipqzwhjjl13481m"; depends=[cli curl glue magrittr openssl R6 rappdirs rlang withr]; }; hubeau = derive2 { name="hubeau"; version="0.4.1"; sha256="0qvvd1a4plmhm6784xda75pn6751hjabr2x6i2h5y8hh85zidldy"; depends=[dplyr httr magrittr purrr tibble urltools]; }; hudr = derive2 { name="hudr"; version="1.2.0"; sha256="1kvqbgyhyr4lvzqvfsa1597px8ydqpacphnm902hchqv5qvbxgm4"; depends=[data_table httr janitor magrittr]; }; @@ -11318,63 +11336,57 @@ in with self; { humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; humanleague = derive2 { name="humanleague"; version="2.2.0"; sha256="07zss9mkrpvbbh08a7wjd7k06w6mp34kwfcgsdfhzvzacpnmxyn3"; depends=[Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.5"; sha256="143pn8jjinlda76b94qh5zw2sfajw0ifcx774x6adr2il5a5wm99"; depends=[]; }; - hunspell = derive2 { name="hunspell"; version="3.0.2"; sha256="0kij39rhsx7s4lfddy6745f1zjyi003srj14ckjpbhkcyxamk8jy"; depends=[digest Rcpp]; }; + hunspell = derive2 { name="hunspell"; version="3.0.3"; sha256="1ws2hhrn3iw89vs17q9claf0cip5hy6rbgdr4dcjmzrdlrri9apx"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; hutils = derive2 { name="hutils"; version="1.8.1"; sha256="0pdya5gdyab5pwpgiw9yfa95m5ynqk154sydsfg56dxq1ihzfr74"; depends=[data_table fastmatch magrittr]; }; - hutilscpp = derive2 { name="hutilscpp"; version="0.9.3"; sha256="0sh7s1y8wxwrbhdf8kz3x7myzk5jxv0h1yz1lrh345bvw1jdqb9i"; depends=[data_table hutils magrittr]; }; + hutilscpp = derive2 { name="hutilscpp"; version="0.10.2"; sha256="1hh42cady784ld6d7m9axvh4lwlpb6ffpyvc8shfa7dkfhz703ra"; depends=[data_table hutils magrittr]; }; huxtable = derive2 { name="huxtable"; version="5.5.2"; sha256="1rpyqkdck6cmh2a7f5j71ypk2v9gzl3jf2b0z9jjlfrv1d1b8x7l"; depends=[assertthat commonmark fansi generics glue htmltools memoise R6 rlang stringi stringr tidyselect xml2]; }; - hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; + hwde = derive2 { name="hwde"; version="0.67-3"; sha256="0kj3vf4pmcvxy95hx1d0q6c626y8d0ljj3r76y5hd90a6v75b5xa"; depends=[]; }; hwep = derive2 { name="hwep"; version="2.0.2"; sha256="0cvy9s9kwc1jp4klgbjahidpk8gkvfa43vry8i0y77nvfys7x9v9"; depends=[BH bridgesampling doFuture doRNG foreach future iterators pracma Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tensr updog]; }; hwig = derive2 { name="hwig"; version="0.0.2"; sha256="06a42a38qsjwijbbr2c8dsd7hjm751g1s4sgcmzvvfi6xy7svl3k"; depends=[asnipe data_table spatsoc]; }; hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; }; hwriter = derive2 { name="hwriter"; version="1.3.2.1"; sha256="1wxnv8h9cs65m3z01dpnnkgn2cpwfsck70g1jz9nbkr7mdaa4bzd"; depends=[]; }; - hwsdr = derive2 { name="hwsdr"; version="1.0"; sha256="0r9chbjkdvr6614kpps5250pdg5w2gxyf2a0rvxf3hgs5krgcm32"; depends=[httr raster sf]; }; - hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; }; + hwsdr = derive2 { name="hwsdr"; version="1.1"; sha256="1dfrqcd0nccrsv01hsvp2xic9nfhsqmvl7cqvv28amayqyv3lizk"; depends=[dplyr httr sf terra]; }; + hwwntest = derive2 { name="hwwntest"; version="1.3.2"; sha256="1j6lpbrf3jp3nrz9m0s74inkr2ww4g8ajz30qjhlfwmacww0hdsg"; depends=[polynom wavethresh]; }; hySpc_testthat = derive2 { name="hySpc.testthat"; version="0.2.1"; sha256="12za828sw2al3aa236ksmnwxpy2sqw8gl8b3p3vvrjk1l31l1qcm"; depends=[testthat]; }; hybridModels = derive2 { name="hybridModels"; version="0.3.7"; sha256="0fj3dvv7s1hlicvlb077pkhbj894brzgdxhp67jck9zpy2qymzxq"; depends=[doParallel doRNG foreach ggplot2 GillespieSSA reshape2 stringr]; }; hybridogram = derive2 { name="hybridogram"; version="0.3.2"; sha256="14p2gwmgcaf84aycdc2a51frw2pccrffsjk8n83gvj2ans8phrr9"; depends=[pheatmap]; }; hybridts = derive2 { name="hybridts"; version="0.1.0"; sha256="1x96g0cjgn3vklczksxdgpd5ayl3rl63k0ig0h8vacm2nxn4c6js"; depends=[forecast Metrics nnfor WaveletArima]; }; - hyd1d = derive2 { name="hyd1d"; version="0.4.5"; sha256="16ja4av74bissxabhq1d1j7kg56c4hbxrziqgnl8h0qzbkkinwfm"; depends=[plotrix Rdpack RJSONIO]; }; - hydflood = derive2 { name="hydflood"; version="0.5.4"; sha256="0fa7spcnwh1kqi1qsyp7gid6ks7qgkkh4ifdqzr3rnyqrg3l8lfz"; depends=[hyd1d raster Rdpack sf terra]; }; + hydflood = derive2 { name="hydflood"; version="0.5.6"; sha256="1g74gxarn3f8q0pnwwz802jrryry0w72py7agckaqwzwybfsklsc"; depends=[raster Rdpack sf terra]; }; hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; hydraulics = derive2 { name="hydraulics"; version="0.6.1"; sha256="1yk1s9fnphzmkpx9pfawm72i07kdj099q6i6cry9p08bzvac80xk"; depends=[ggplot2 gtools purrr reshape2 tibble units]; }; hydroEvents = derive2 { name="hydroEvents"; version="0.11"; sha256="1w433lmzk6lr2lnqn1qcq13c980kpi0r881cdzm56n53s89zdh36"; depends=[]; }; - hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; - hydroMOPSO = derive2 { name="hydroMOPSO"; version="0.1-3"; sha256="14yvsxzlzpisn5hqyqcq1fmqsbj96pqcgyhnj414mj366x6w5qxp"; depends=[hydroTSM lhs randtoolbox xts zoo]; }; - hydroPSO = derive2 { name="hydroPSO"; version="0.5-1"; sha256="16gdv19yqla80s9fjmvahfn21jv62zivirzs5ch4zm9db54g6bry"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; - hydroTSM = derive2 { name="hydroTSM"; version="0.6-0"; sha256="1msavd2k05apsky88zkk1l3c6y3v95fwhmr6xmwsap70bj25krsv"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydroToolkit = derive2 { name="hydroToolkit"; version="0.1.0"; sha256="0bij4365hczvq17wj9hp0570v35m8ili11mp9dzfj3mvhhqrc9p4"; depends=[ggplot2 lubridate plotly readxl reshape2]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; + hydroloom = derive2 { name="hydroloom"; version="1.0.0"; sha256="0yl1npcb52i64kihxl8nwsapkr80ix7wsxn1c66bbzmd3hwb2n34"; depends=[data_table dplyr fastmap pbapply RANN rlang sf tidyr units]; }; hydropeak = derive2 { name="hydropeak"; version="0.1.2"; sha256="06x1qahavvhaqwdsjg65ixgc6migbm188v3w3vjng5xl2g2ybhqc"; depends=[]; }; hydroroute = derive2 { name="hydroroute"; version="0.1.2"; sha256="1pvdvfmjrxplcycszaig2xbwlk1acs6smci1cwmmhdh2xpaffami"; depends=[dplyr ggplot2 ggpmisc gridExtra hydropeak lubridate reshape2 scales]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.9"; sha256="11ipfp5dnl336wbsw0nrrcd68hccp8igvlrr93rc3hrvif3slkim"; depends=[]; }; hydrotoolbox = derive2 { name="hydrotoolbox"; version="1.1.2"; sha256="0m5crm8n8i3fv43am649cdyrbfcfbais8fwrg6c7zy81dbhmy9m9"; depends=[ggplot2 lubridate magrittr plotly Rcpp readxl reshape2 tibble zoo]; }; - hyfo = derive2 { name="hyfo"; version="1.4.3"; sha256="012akh96qwafhgjba1gjwy0r14a6shcsk5b7n1hvw230s07zxd8r"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; + hyfo = derive2 { name="hyfo"; version="1.4.6"; sha256="03z36ddq6vpld1v876adp5xrz0hjy46vhs5sn8sgaa57fhmya6cm"; depends=[data_table ggplot2 lmom maps MASS moments ncdf4 plyr reshape2 sf sp zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="3.0-0"; sha256="09nq5vxih9f7731nrd5avpk6gw4wbh9rpq4bmq7373ikgc3qy3mf"; depends=[alabama calibrator cubature disordR magrittr mathjaxr partitions Rcpp Rdpack]; }; hyperSpec = derive2 { name="hyperSpec"; version="0.100.0"; sha256="0m0ws6lm5q1555n0qhixj4fqq4bbcf7i7d73pg85z74a3058gk5s"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; }; - hyperbrick = derive2 { name="hyperbrick"; version="1.0"; sha256="1a6l6dlylqm1dxz573rz5zqxn1nk85hcbfdxk0qwkr7z3yzl13c8"; depends=[caTools dfoptim OpenImageR pbapply raster rgdal]; }; hypercube = derive2 { name="hypercube"; version="0.2.1"; sha256="0m0n64rl5fnhvhfdknrza8a0h5lw8vbgakaqbyfx77ixhwqhjn1l"; depends=[dplyr plotly stringr]; }; - hypergate = derive2 { name="hypergate"; version="0.8.3"; sha256="0h36wi4bdxinv7p9alyb7jv1902vdanxx7yvyaw2dcqkdjlzzj49"; depends=[]; }; + hypergate = derive2 { name="hypergate"; version="0.8.4"; sha256="1ldymcb7b1bdhsacmvyqdxni2462kn1ssbab4rgh7lsqflfs0csb"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; }; hyperoverlap = derive2 { name="hyperoverlap"; version="1.1.1"; sha256="10kcphn5zl1pl70xg9bn947i9mbnjxk03p6y7xhdlv152cihffw0"; depends=[e1071 ggplot2 MASS matlib misc3d rgl]; }; hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; }; - hypervolume = derive2 { name="hypervolume"; version="3.1.1"; sha256="0zkax7mawbd8sjdlvcg5nad5ayzxmhkv0r1mq76na4yv0k98iqqx"; depends=[caret data_table doParallel dplyr e1071 fastcluster foreach geometry ggplot2 hitandrun ks maps MASS mvtnorm palmerpenguins pbapply pdist progress purrr raster Rcpp RcppArmadillo sp terra]; }; + hypervolume = derive2 { name="hypervolume"; version="3.1.3"; sha256="03x5zf1w44m5xb255lg4mwg98sr2cl4wvy7wb13lpk098w71q2id"; depends=[caret data_table doParallel dplyr e1071 fastcluster foreach geometry ggplot2 hitandrun ks maps MASS mvtnorm palmerpenguins pbapply pdist progress purrr raster Rcpp RcppArmadillo sp terra]; }; hypoRF = derive2 { name="hypoRF"; version="1.0.0"; sha256="1yyq1pjxm9p395wq4zfimvcagspl8vlk0kzpa92pr084q5f7jcyr"; depends=[ranger]; }; hypothesis = derive2 { name="hypothesis"; version="1.1.0"; sha256="0mllh8lamls0rrbr9d12xa7a56pa2zahvr243kbfmhad81nalpl7"; depends=[glue htmltools htmlwidgets httr jsonlite magrittr purrr rlang]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; - hypr = derive2 { name="hypr"; version="0.2.3"; sha256="08aga0cpmlq550f0k9gzfxgnwg9k5n8d7jcmvzz4k8bq2i3cnysk"; depends=[cli magrittr MASS Matrix pracma]; }; + hypr = derive2 { name="hypr"; version="0.2.7"; sha256="1fqy8qcl1sq770a1m7aw5s46bvf41gm46iwm8cg01yc3lf9849hm"; depends=[cli magrittr MASS Matrix pracma]; }; hypsoLoop = derive2 { name="hypsoLoop"; version="0.2.0"; sha256="0kwxzw2r406li2pmby92a3jik4k3z1vdgs54m4q45a8r8vz3y1nn"; depends=[dplyr ggplot2 PolynomF sf sjPlot stars terra]; }; hystReet = derive2 { name="hystReet"; version="0.0.3"; sha256="1vrby9lgy0nm5wa5r1y3k3l2s9fc8vdf4szy8isvnzayr464xvwi"; depends=[httr jsonlite lubridate]; }; hystar = derive2 { name="hystar"; version="1.0.0"; sha256="1gyk78nfhhglry2dwy21h9s2hqlqisd7cffwg2864spmwml4brcf"; depends=[Rcpp]; }; hysteresis = derive2 { name="hysteresis"; version="2.7"; sha256="1nnfr50nafhimj2j5xpxly3i8xvkwwddz864gklwm9jzdpmv02yh"; depends=[car MASS msm]; }; i18n = derive2 { name="i18n"; version="0.2.0"; sha256="1ksvrrpymflfbr7acnv3sh4xa0xqjp44ngdpkp500p50mwpww1wr"; depends=[magrittr]; }; - i2dash = derive2 { name="i2dash"; version="0.2.3"; sha256="0pj4s47nbs67jnnk0dsna59lrn983zzkybbf6hf4s77sikshmwf0"; depends=[assertive_sets assertive_types flexdashboard glue htmltools knitr magrittr rmarkdown stringi stringr xfun ymlthis]; }; + i2dash = derive2 { name="i2dash"; version="0.2.4"; sha256="0silwp4pasry7z1yjhzyw06xpa8021v9bkhinc73i7dzr720ld5v"; depends=[assertive_sets assertive_types flexdashboard glue htmltools knitr magrittr rmarkdown stringi stringr xfun ymlthis]; }; i2extras = derive2 { name="i2extras"; version="0.2.1"; sha256="14k9s5ppq3c7ldh6gqi82awmkk34ac0br0qr42gqba9lrssf4bsr"; depends=[ciTools data_table dplyr ggplot2 incidence2 MASS rlang tibble tidyr tidyselect vctrs]; }; iAR = derive2 { name="iAR"; version="1.2.0"; sha256="0svxn81a0yq3m51594zrpy99i8p9zcfjzbxsi19yyfcm6iymzv24"; depends=[ggplot2 Rcpp RcppArmadillo Rdpack]; }; iAdapt = derive2 { name="iAdapt"; version="2.0.1"; sha256="050kzacvf19m8s89layqqf0l85db1k4cd3akb16jrv9wjfi9k61v"; depends=[Matrix shiny shinydashboard]; }; - iBATCGH = derive2 { name="iBATCGH"; version="1.3.1"; sha256="0xq4q4kc2f0whrxz1vmi2gca9pxqix2qm4sfkwbch85if2k8l8fj"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.2"; sha256="0z7v679s5w270dfls61hh4fab9pzzj4lsqwsx06r59s0hlsrv5nw"; depends=[Rcpp rpart survival]; }; iBreakDown = derive2 { name="iBreakDown"; version="2.0.1"; sha256="00jzrndb3ahsv6ihp2pvs732n9cc944m83vdinrl9v1pxd82prkh"; depends=[ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; @@ -11384,7 +11396,6 @@ in with self; { iCellR = derive2 { name="iCellR"; version="1.6.5"; sha256="0jdm61mbjl0m4d9p6yc4b1pvbdzlk5qgably1y5ck8r9sk426vdn"; depends=[ape data_table ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph jsonlite knitr Matrix NbClust pheatmap plotly plyr png progress RANN RColorBrewer Rcpp reshape Rtsne scatterplot3d shiny uwot]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iDINGO = derive2 { name="iDINGO"; version="1.0.4"; sha256="00x9q73y2a1bxnbqv18sjp7nrbj1bk56rzhmllpnllwy8k9dw31j"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; - iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDOVE = derive2 { name="iDOVE"; version="1.4"; sha256="1ks83ha183mmda9pqhvaa9636gwjlkyr6hrdnhfjv75fks54476f"; depends=[Rcpp RcppArmadillo]; }; iForecast = derive2 { name="iForecast"; version="1.0.7"; sha256="03g15xps3bymx2jj6j02pr1llk3lcb5lc3s5r0i2c86qc92lprch"; depends=[caret magrittr]; }; iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; }; @@ -11395,21 +11406,19 @@ in with self; { iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; iNEXT = derive2 { name="iNEXT"; version="3.0.0"; sha256="1yfvadvdwgby047svj9sjwkm7hhrni2ifn6d2g5bv9djcvi22msh"; depends=[ggplot2 Rcpp reshape2]; }; iNZightMR = derive2 { name="iNZightMR"; version="2.2.7"; sha256="0c37bdpypl4kv3s4hxc7xzxiwa6fsbqxwhyi98hh3mfdj329p1m8"; depends=[]; }; - iNZightPlots = derive2 { name="iNZightPlots"; version="2.15.1"; sha256="0h4s7wgia8knkksjvidjkkyzvwmr4w7qhc36f6ppjhlyzik0dmkp"; depends=[boot chron colorspace dichromat emmeans expss hexbin hms iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales stringr survey units]; }; + iNZightPlots = derive2 { name="iNZightPlots"; version="2.15.3"; sha256="0pc1z7ikh3c2l5s1dljdzaqk83m6i5p64p771waz5frkyyf3bg4r"; depends=[boot chron colorspace dichromat emmeans expss hexbin hms iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales stringr survey units]; }; iNZightRegression = derive2 { name="iNZightRegression"; version="1.3.3"; sha256="1qlakpx509cfj9r6g0pw28s5wwjg9i0srvhjhzarq4myxzqd78yq"; depends=[car dplyr GGally ggplot2 ggrepel ggtext iNZightPlots multcomp patchwork]; }; iNZightTS = derive2 { name="iNZightTS"; version="1.5.9"; sha256="0mzyyl5a6ii7s84bzm7wqm0amdxpjc421vka28bd7884f5f5v791"; depends=[colorspace dplyr forcats ggplot2 ggtext glue gridExtra magrittr patchwork rlang tidyr]; }; - iNZightTools = derive2 { name="iNZightTools"; version="1.13.0"; sha256="1cla8s690wf219q33qw8s5zzlpjgq7k27i9am4wxl59ycgn4p7n3"; depends=[DBI dbplyr dplyr forcats glue lubridate magrittr purrr readr rlang srvyr stringr survey tibble tidyr units zoo]; }; + iNZightTools = derive2 { name="iNZightTools"; version="2.0.1"; sha256="0qmpj8hwg4gmbyhp4r1li3rrq2f5743kg04r7s7ii0j9gwsw3y0s"; depends=[DBI dplyr forcats glue magrittr purrr readr rlang srvyr stringr survey tibble tidyr units]; }; iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; }; iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.2"; sha256="0752bxa4gb875236cjifr6zgkxv18304781qrjl1sf7r7rzmb1cl"; depends=[]; }; iRoCoDe = derive2 { name="iRoCoDe"; version="1.0.1"; sha256="1m2cin8yxpirdnkw6v1lb4w04939dy9qwkaw5w2k8rqjsflr17ay"; depends=[]; }; - iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; }; iSFun = derive2 { name="iSFun"; version="1.1.0"; sha256="14m9wzvs4knq80kvrdqck9f0pyk7hricdclz0f8z9nq85djl4vim"; depends=[caret irlba]; }; - iSTATS = derive2 { name="iSTATS"; version="1.5"; sha256="14pd3k8w8hh7gl2iskax2pck6z96hdfrws5l69zdw02867bny404"; depends=[Cairo data_table ggplot2 gtools plotly rstudioapi shiny shinyBS shinyWidgets]; }; + iSTATS = derive2 { name="iSTATS"; version="1.6"; sha256="0fdicyycwh1d1yzrf9241d3cf03vzqyhchwsy191hiwa5fa6bm7w"; depends=[Cairo data_table ggplot2 gtools plotly readr rstudioapi shiny shinyBS shinyWidgets]; }; iSubGen = derive2 { name="iSubGen"; version="1.0.1"; sha256="0kfrgh4399x71mwa5j36nfszd65ybp61fwpc7qj3j9ypmgidwbaj"; depends=[cluster ConsensusClusterPlus keras philentropy tensorflow]; }; iTOP = derive2 { name="iTOP"; version="1.0.2"; sha256="1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47"; depends=[corpcor Matrix]; }; iTensor = derive2 { name="iTensor"; version="1.0.2"; sha256="09js2kiw1prrkn03srz4xas37mwbx85zkawfb93wgl292r31j2x9"; depends=[einsum geigen groupICA jointDiag MASS mgcv mixOmics rTensor]; }; - iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.1"; sha256="077ymd271biyjhq2sbbbnla73anv8z8f953jh06m9abnx7rai9i6"; depends=[MASS trust]; }; iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; iadf = derive2 { name="iadf"; version="0.1.2"; sha256="18r9qyhicbfrkpqnxnn5i854s0afq4pnbaw2ckw1qrhy3pzys6zp"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; @@ -11422,29 +11431,29 @@ in with self; { ibb = derive2 { name="ibb"; version="0.0.2"; sha256="11rfrf0ap97rsq0yy23sjahp1bin3j31zdd61p8b5mbp0s0k7ci4"; depends=[dplyr httr jsonlite magrittr rlang tibble tidyselect]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.3.8"; sha256="0c4svyfd7xjx9k6pl40l7y9rc67zschs0nz1l386xi1m7arsp44n"; depends=[]; }; - ibdsim2 = derive2 { name="ibdsim2"; version="1.5.0"; sha256="1qbgk77cszf7hzsvxv2yqz07rzdh4vksxglx3wrzn5v18fm01c2q"; depends=[ggplot2 glue pedtools Rcpp ribd]; }; + ibdsim2 = derive2 { name="ibdsim2"; version="2.0.0"; sha256="0s0mnyhd0xcrr75qhqwgyipn22hlbgjf9nfi7gxbmwns16g3crb8"; depends=[ggplot2 glue pedtools Rcpp ribd]; }; ibelief = derive2 { name="ibelief"; version="1.3.1"; sha256="0fl2vvyl2qygppcycbnjkmlvq6rmxq18y1hk512d6szgi0czvpls"; depends=[]; }; ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; }; ibmAcousticR = derive2 { name="ibmAcousticR"; version="0.2.1"; sha256="1hrd2273n9fgi3hgjissjn4syw914mxm4wr98ij819yahsi9aj42"; depends=[httr jsonlite XML]; }; ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; }; ibmdbR = derive2 { name="ibmdbR"; version="1.50.0"; sha256="151gg05gcy5wpyvyflr4mc0jq1npxzq9pc4spjc81x2igd14c370"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; }; ibmsunburst = derive2 { name="ibmsunburst"; version="0.1.2"; sha256="165fgz5fhfzn2cyr2y6caf980a5r50g2p6qrj0ssxyzlqspipjhn"; depends=[htmlwidgets jsonlite]; }; - ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; }; + ibr = derive2 { name="ibr"; version="2.0-4"; sha256="1vac4484n9jsn6m5pbdpw6zjjjgnas24176hs6mr51y2bjgywdkp"; depends=[mgcv]; }; ibs = derive2 { name="ibs"; version="1.4"; sha256="06zyg6c083437nhilqfhcf6yzlvazkpxhi3dh5d3dqv2zhxixlz4"; depends=[Rcpp]; }; - ic_infer = derive2 { name="ic.infer"; version="1.1-6"; sha256="14vcwx5592br4zky9mq82akwk8pfiz7p1rx2jvyb48prrs2mm9gy"; depends=[boot kappalab mvtnorm quadprog]; }; + ic_infer = derive2 { name="ic.infer"; version="1.1-7"; sha256="0gr17nsv0kbw5278p4wccyvaiyj5dwndx3m5919apfdkivk2jlq5"; depends=[boot kappalab mvtnorm quadprog]; }; icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-3"; sha256="0rdqd3kz2cv3xvf6yz55bwhsg3k7j90d450i3azs2xkbn4q3aka7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; icardaFIGSr = derive2 { name="icardaFIGSr"; version="1.0.2"; sha256="1yysqkyr36388i8za8jhz0m1vdn3jv8kpb24pnhbxlwsq8r5x0jr"; depends=[caret doParallel dplyr foreach ggplot2 httr leaflet magrittr plotROC plyr raster reshape2 sp]; }; icarus = derive2 { name="icarus"; version="0.3.2"; sha256="0nk4z1xw8ca7nkxvkbrblpp42b1pim3dskj9sczpdva0s8ksnq43"; depends=[]; }; iccCounts = derive2 { name="iccCounts"; version="1.1.1"; sha256="0h1bjnyl24i2y8z1pys4k89q2dy5cfd808bc7w54j1vyyap0k899"; depends=[Deriv dplyr ggplot2 glmmTMB gridExtra VGAM]; }; - iccTraj = derive2 { name="iccTraj"; version="1.0.2"; sha256="02fzqgg459y6d4f96fgvj0c5qvfpnp60d3gz7ddhf6zkk2rzhd0q"; depends=[doParallel dplyr foreach magic purrr sp spacetime trajectories]; }; + iccTraj = derive2 { name="iccTraj"; version="1.0.3"; sha256="0c6ia3h7a16d8qsrkgrs2sy8xslc4qib6gq636ckbjxlja3pzln7"; depends=[doParallel dplyr foreach magic purrr sp spacetime trajectories]; }; iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; }; iccde = derive2 { name="iccde"; version="0.3.5"; sha256="1z7ra8s0sddjmbfb8flgp4kmz1ckgwshz8h2nnpbd3liav84b5xv"; depends=[]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icdpicr = derive2 { name="icdpicr"; version="1.0.1"; sha256="099ipcpz1cff7cr572lww34az4wwym8phpbk2ph0545k2fk0c56d"; depends=[stringr]; }; - icecream = derive2 { name="icecream"; version="0.2.0"; sha256="0gqad5sf78ggvdjhiis6x0y69ksrk1wgs4b8nxq51xna5wy5yqgl"; depends=[cli glue pillar purrr rlang]; }; + icecream = derive2 { name="icecream"; version="0.2.1"; sha256="0pd78w28x1q1faxarsb0wm9jcqvjfpahm62d4wdywv8vh57crh5w"; depends=[cli glue pillar purrr rlang]; }; icenReg = derive2 { name="icenReg"; version="2.0.15"; sha256="1cjlvj4i5bir5769a22w8bb9477h04d8rpxk9ks72jp6zjjkq5qa"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensmis = derive2 { name="icensmis"; version="1.5.0"; sha256="1afpn07a25j2jh89r78bvarg2kr0sk3ap8gdmvk75lc6g3dhvri9"; depends=[Rcpp]; }; icertool = derive2 { name="icertool"; version="0.0.3"; sha256="0wwkqcvjmv2z8a8j597c2fjjcka1jz932i94rmqxcy31brvbi2nl"; depends=[digest DT ggplot2 ggrepel purrr readxl shiny shinyhelper shinythemes tidyverse]; }; @@ -11458,9 +11467,8 @@ in with self; { icesTAF = derive2 { name="icesTAF"; version="4.2.0"; sha256="0xifza8s24gy09fibqdpkh0zc723jkx09ycx44gqffrx0ch8syds"; depends=[data_tree purrr roxygen2 TAF]; }; icesVMS = derive2 { name="icesVMS"; version="1.1.4"; sha256="0ppml34s4zz3vav08fjaj71bml8amaslw22zmib0scvw8k70jlir"; depends=[glue httr icesConnect icesVocab]; }; icesVocab = derive2 { name="icesVocab"; version="1.2.0"; sha256="0cd2w0w2m176mpfd3lzvxl88bcli1qrkjrli539i764nlyh0ipl0"; depends=[xml2]; }; - ichimoku = derive2 { name="ichimoku"; version="1.4.7"; sha256="0rlxr121ysmc7h81xlgrifmp91mcj5n9avr29db663l6r701zwsy"; depends=[ggplot2 nanonext RcppSimdJson shiny xts zoo]; }; + ichimoku = derive2 { name="ichimoku"; version="1.4.9"; sha256="1fp8rwh6qgx4g10ia4aykc8jqnhm2agy727ad1hw0qi50armcam6"; depends=[ggplot2 nanonext RcppSimdJson shiny xts zoo]; }; icmm = derive2 { name="icmm"; version="1.2"; sha256="179q8w60g4yrv6wqgfmg47by1zc1mbhsdjgl7jq4wirqvwnxvgym"; depends=[EbayesThresh]; }; - iconr = derive2 { name="iconr"; version="0.1.0"; sha256="17q7zj92yrj49slmrpwkxkjd0imrl9ildms9zj8qx7yc7dcv4c1s"; depends=[igraph magick rgdal]; }; icosa = derive2 { name="icosa"; version="0.11.0"; sha256="1z1xajdg7q5n3ijjy45klrh4q3i855afl9088f42dwidyban3w3h"; depends=[igraph Rcpp sf sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.6.1"; sha256="0mc96yj0nld63s4bhagha9dp8c2a2c7qdnk3lfh7yk0vq9ghjfin"; depends=[httr purrr rvest]; }; icr = derive2 { name="icr"; version="0.6.3"; sha256="1g1gx0bbx6s8pqd5y0ckdi0r2kbg3lmr8djbaa7nj15jnf519zcx"; depends=[Rcpp]; }; @@ -11475,28 +11483,29 @@ in with self; { idem = derive2 { name="idem"; version="5.2"; sha256="0vgxrw7rdhnxrrsg46x6nd2zx938j1z41fr4gp9pjmh2q6rnnaxl"; depends=[BH mice Rcpp RcppEigen RcppParallel rstan rstantools sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; ider = derive2 { name="ider"; version="0.1.1"; sha256="0cy1q9nmgxlrpysw6j04i0dzd14zwla8zv8dvxs0zxyrlqxwv2yh"; depends=[FNN glm2]; }; - idiogramFISH = derive2 { name="idiogramFISH"; version="2.0.12"; sha256="0vf1398fkj564rwnbw8vpyrqn996vww7w582374fsslnnp3hjkbm"; depends=[crayon dplyr plyr rlang scales tidyr]; }; + idiogramFISH = derive2 { name="idiogramFISH"; version="2.0.13"; sha256="0d4jf219x1l5978yx1k2ynkcx1b5xwbbba2lcd67s80y6s1q1jhv"; depends=[crayon dplyr plyr rlang scales tidyr]; }; idm = derive2 { name="idm"; version="1.8.3"; sha256="04ac2yq983vk9v3iyd1p2sqxy8ppdr4p7bcvfbg2d9fanj4b1fa7"; depends=[animation ca corpcor ggplot2 ggrepel]; }; idmact = derive2 { name="idmact"; version="1.0.1"; sha256="1rkrmkmmwrqgj6d1ykjp4xrlb2823ks1pfibqg3pvvly2223wzcn"; depends=[rlang]; }; + idmc = derive2 { name="idmc"; version="0.3.0"; sha256="1z5v3r2ckcw7bwpbysd1pw3x7b9fw3clyhrw8p70g29kpnxwpy3k"; depends=[dplyr httr jsonlite lifecycle magrittr stringr tidyr]; }; idmodelr = derive2 { name="idmodelr"; version="0.4.0"; sha256="11h7l1iv21jxmjwmg0klwiadvwpn1bj055y4a7fqfgsbbqraxlsj"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; idopNetwork = derive2 { name="idopNetwork"; version="0.1.2"; sha256="0gp9d5p7nqnsfy2n3lxhinmldriwyzq55ilmi5gq3vavf1h0iw24"; depends=[deSolve ggplot2 glmnet igraph mvtnorm orthopolynom patchwork reshape2 scales]; }; idr = derive2 { name="idr"; version="1.3"; sha256="1r6icxf0c0y9wvihwmkk5xqscr1qhacqk3w2076kjm2993f10fbb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; - ie2misc = derive2 { name="ie2misc"; version="0.9.0"; sha256="0cawlkhyfrwwcnqcp1lc1wc4a42ax4r9g9nzbl88sfjxy3fyirkx"; depends=[assertthat checkmate data_table gWidgets2 lubridate mgsub openxlsx reader readxl stringi]; }; - ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.3"; sha256="19jjpgnrbrnwzh5g3whpimbv7m2fgkvx7p3z6vqa1kfxqy0bn8yh"; depends=[]; }; + ie2misc = derive2 { name="ie2misc"; version="0.9.1"; sha256="09f40nn56s6j70zz1fhkf7yyzdrypjd7khar82ffj1gsr1k0rnzi"; depends=[assertthat checkmate data_table gWidgets2 lubridate mgsub openxlsx reader readxl stringi]; }; + ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.4"; sha256="18hvkip57gvrmz3m3p66mlw45h60091jxbd2b65dimmc0k6wi7q4"; depends=[]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; - iemisc = derive2 { name="iemisc"; version="1.0.3"; sha256="1x7jnw6rrnq2wpv2xbk72fgkwwpxx7gzn113swnc6d6fhh16i32x"; depends=[anytime assertthat berryFunctions checkmate CHNOSZ data_table foreach fpCompare geosphere ggplot2 ggpubr gsubfn iemiscdata lubridate matlab matlab2r measurements mgsub pracma qdapRegex ramify rivr roperators round sf signal sjmisc stringi units USA_state_boundaries zoo]; }; - iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; + iemisc = derive2 { name="iemisc"; version="1.0.4"; sha256="1yrppxylsrlh1l549qn1x0qnyd32zj3a2xji1a3qiv1sd1h7js41"; depends=[anytime assertthat berryFunctions checkmate chem_databases data_table foreach fpCompare geosphere ggplot2 ggpubr gsubfn iemiscdata lubridate matlab matlab2r measurements mgsub pracma qdapRegex ramify rivr roperators round sf signal sjmisc stringi units USA_state_boundaries zoo]; }; + iemiscdata = derive2 { name="iemiscdata"; version="1.0.0"; sha256="0kg9h91di5k2cdh2fwa5k7wbi28ian41zr5ksr8dnc3pb1lwv5n4"; depends=[]; }; iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; }; ifCNVR = derive2 { name="ifCNVR"; version="0.1.0"; sha256="0qcmgd3vi413n4ipa6ybkr7a1kwxyr2al8cw4gfr8fp2av1sk4vc"; depends=[data_table isotree rmarkdown]; }; ifaTools = derive2 { name="ifaTools"; version="0.23"; sha256="16xf3165gkmh3f9843m0n4wqdwwdfs6rjh64qcpz8srsm2z5y3l2"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; - ifctools = derive2 { name="ifctools"; version="0.3.5"; sha256="0w7yx4yhszamaf7k3ixsarxr7n5shrhim8ih7bkrf1fhfqlsn1g0"; depends=[]; }; + ifctools = derive2 { name="ifctools"; version="0.3.6"; sha256="1qw50vc3icdfchas1l4d3i3i1r0i0w0kj91xm4wkyj4fsl19qqam"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.10"; sha256="0w27z3fjv007717dsn72bm9hbpgzd6pfib6maf9ihnsjllb6k0v5"; depends=[]; }; ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; }; igcop = derive2 { name="igcop"; version="1.0.1"; sha256="0jl107mdwbldi319qflqjzy8vk02sr4nihky8jl5kcgr6x55qh6z"; depends=[Rcpp rlang vctrs]; }; - iglu = derive2 { name="iglu"; version="3.4.2"; sha256="0ilfkmwmh3xshd67y45v9kvyd69xgf8wmxcw3hxi9zpsb0r4vmsb"; depends=[caTools dplyr ggplot2 ggpubr gridExtra gtable hms lubridate magrittr patchwork scales shiny tibble tidyr zoo]; }; + iglu = derive2 { name="iglu"; version="3.5.0"; sha256="0nxdr09c3sb3fr970nakdh0vygn0g96w3wvgd1c064zr0ylprahz"; depends=[caTools dplyr DT ggplot2 ggpubr gridExtra gtable hms lubridate magrittr patchwork pheatmap plotly scales shiny tibble tidyr zoo]; }; igoR = derive2 { name="igoR"; version="0.1.5"; sha256="1sqkxf6mp77hf15jg992krgpkw36mx9c2fqg4xzz88s47wwwg5wy"; depends=[]; }; igraph = derive2 { name="igraph"; version="1.5.1"; sha256="0jmii8kzs7hpf3xmlbfb8d21q79z7ramc18zcjamsjmdfwg0mndd"; depends=[cli cpp11 lifecycle magrittr Matrix pkgconfig rlang]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; @@ -11504,9 +11513,10 @@ in with self; { igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; igrf = derive2 { name="igrf"; version="1.0"; sha256="1287mx1fpbq9y8jbyb43hlignkqg313rn3kc52pm6b2n77ipkrc6"; depends=[]; }; ihclust = derive2 { name="ihclust"; version="0.1.0"; sha256="049jlx8bspl1md06zyh3m7fr666cymmcwarsjrkr8pdd7vlg918j"; depends=[doParallel factoextra foreach ggplot2]; }; + iheatmapr = derive2 { name="iheatmapr"; version="0.7.0"; sha256="0ym796kf6d8cwd7nmgzy3ga7r8fyywddl3rr2hbn4cfmwhggv02l"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; }; iheiddown = derive2 { name="iheiddown"; version="0.9.7"; sha256="1h7cb52wk0z5na543v78vjj2xh77kj3nwgl5vgqnf5186mrknh5v"; depends=[bib2df bookdown crayon dplyr fs gender ggplot2 pagedown pdftools readr rlang rmarkdown rstudioapi servr stringr tibble tidytext usethis xaringan]; }; ihpdr = derive2 { name="ihpdr"; version="1.2.1"; sha256="1qa9ndb5aqbmlqbl0ivh10ddah2rbhsc6928dml20fjgz7lggdww"; depends=[curl dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; }; - ijtiff = derive2 { name="ijtiff"; version="2.3.2"; sha256="0isqrxpb2xb60h5nm2aycj5kccy77h3b8xx4c11nhhisagpr42z7"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; }; + ijtiff = derive2 { name="ijtiff"; version="2.3.3"; sha256="0iv04g2ciz38ndrx1x5n5yy94zgk7h7qn35f9drynw19w1pxd95y"; depends=[checkmate cli dplyr fs magrittr purrr readr rlang strex stringr withr zeallot]; }; imabc = derive2 { name="imabc"; version="1.0.0"; sha256="1p420jlvqqcqdjqp7y4mcjkzimw3qiygph5yrvmm75znax3fkg4z"; depends=[data_table foreach lhs MASS truncnorm]; }; image_CannyEdges = derive2 { name="image.CannyEdges"; version="0.1.0"; sha256="0c8pvk91xyys6d2i03yy88kylb3jli5jkpq2s069n7p0yl3z7rr1"; depends=[Rcpp]; }; image_ContourDetector = derive2 { name="image.ContourDetector"; version="0.1.1"; sha256="0h9nq6k99rfmldw1c00k2anlpbjbpm26pp1d7jg2wz334dvlvlij"; depends=[Rcpp sp]; }; @@ -11519,7 +11529,7 @@ in with self; { image_libfacedetection = derive2 { name="image.libfacedetection"; version="0.1"; sha256="0mr7zrqd73mhvs918615lwsf2bgg63x3wh16wdpwhb2zd7ybm87a"; depends=[Rcpp]; }; image_textlinedetector = derive2 { name="image.textlinedetector"; version="0.2.2"; sha256="0zbixw0j241il357n9mljcw4lvq6f1ddadx2a0ahykdf1w0vplyx"; depends=[magick Rcpp]; }; image2data = derive2 { name="image2data"; version="1.0.1"; sha256="03fvl7fj7kc6i6xgyrixwk0ahgmlg26ihvwvkxh6yxzhjj48syfq"; depends=[readbitmap]; }; - imageData = derive2 { name="imageData"; version="0.1-61"; sha256="0bavyd8njfjd0l8dcsm6gklgc81kykl275w2gpvb5cxrhb9yp32n"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; + imageData = derive2 { name="imageData"; version="0.1-62"; sha256="1q5s6zda1vvinp23afxjys3zl17xaidb11a7iibxpz6rla75183d"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; imagefluency = derive2 { name="imagefluency"; version="0.2.4"; sha256="1kssg6lj29f7c2isnzw98crygpj761q0qp38i7zs8008cwbch4cy"; depends=[magick OpenImageR pracma R_utils readbitmap]; }; imagefx = derive2 { name="imagefx"; version="0.4.1"; sha256="1mxd33y8zbq8kig6m6xihb5w8wrjppgmpyjspvaxjwk7si9a09k1"; depends=[moments signal]; }; imager = derive2 { name="imager"; version="0.45.2"; sha256="0mmzp55j1svlaa0lfmmaz8hijlkbk0wkv2craxhc6gyx0g5qp129"; depends=[downloader igraph jpeg magrittr png purrr Rcpp readbitmap stringr]; }; @@ -11533,7 +11543,7 @@ in with self; { imbibe = derive2 { name="imbibe"; version="0.1.1"; sha256="03vaz5vippnmbgs2l4gxpmsnrkxjw7d156ng13r07zicq43g9gwp"; depends=[magrittr Rcpp RNifti]; }; imcExperiment = derive2 { name="imcExperiment"; version="0.99.0"; sha256="0fagasb94q7gxx49c7n4p2cb9j3n5qnfx86s7nvz4naicy96qbyr"; depends=[S4Vectors SingleCellExperiment spatstat_geom SummarizedExperiment]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; - imgpalr = derive2 { name="imgpalr"; version="0.3.1"; sha256="0v9npy63mv9r9wnd8pcdw4rkr0bybhhmkj36sza7dah92i06il17"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; + imgpalr = derive2 { name="imgpalr"; version="0.3.2"; sha256="0wdddswyakcgwvp75ydp8q3wmxdgrms8r2lh9jm024f8im3j5ccw"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; imgrec = derive2 { name="imgrec"; version="0.1.3"; sha256="0va04b264v2ywvqdgmvigygsd5f6vdy5cj2ip2nsyi1fzh68hadx"; depends=[base64enc dplyr httr jsonlite knitr rlang]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; iml = derive2 { name="iml"; version="0.11.1"; sha256="0fi37lv9czaxcc123f6r57607shqhs83ks96n2n0b93dl1qs0j52"; depends=[checkmate data_table Formula future future_apply ggplot2 Metrics prediction R6]; }; @@ -11550,9 +11560,9 @@ in with self; { implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.1"; sha256="177d69fbyzrg28ddxqlqbf7hm25mj5rpmpslh0mad2xqzyvdylvn"; depends=[ggplot2 stringr tidyr xtable]; }; implied = derive2 { name="implied"; version="0.5"; sha256="01wnqi380w810z4f743mfr2jbv7y22v6xa4p2rpwwcx4vbpvqnnm"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.4.0"; sha256="0rblsmx1z2n4g3fims5wa3wyf5znr0gkwd2yfz3130bcm6346da0"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; - r_import = derive2 { name="import"; version="1.3.0"; sha256="19g4jnfg9pkvvsncw62yc15xlb97hfbdqxivpjd9jqi36i6mdjrg"; depends=[]; }; + r_import = derive2 { name="import"; version="1.3.1"; sha256="1h7km8751flxf70112r31wp10vhk4v1jr4avyb969ln317pf8yjq"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; - importinegi = derive2 { name="importinegi"; version="1.2.0"; sha256="1m9415ymjvymr73z8cjb1kdycf93pykl4yngqp2h06wppwn7506a"; depends=[data_table dplyr foreign haven rgdal rio]; }; + importinegi = derive2 { name="importinegi"; version="1.2.1"; sha256="0l5a3lcpjphgl6w8mh4g2j7wkrlkzbbc1lpv42k6p87dbhp3mavx"; depends=[data_table dplyr foreign haven rio sf]; }; imprecise101 = derive2 { name="imprecise101"; version="0.2.2.4"; sha256="1558fxg8i5ifbvnww3wlfq79d9lgy7kg5z98i73q7q64rc2pxs82"; depends=[pscl tolerance]; }; impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; imprinting = derive2 { name="imprinting"; version="0.1.1"; sha256="0s2qrby2sx7ikalfagvqaz0cx953m44x0fms3pcmjdgyvfzhdyvz"; depends=[cowplot dplyr ggplot2 tidyr tidyselect]; }; @@ -11560,7 +11570,6 @@ in with self; { imputeFin = derive2 { name="imputeFin"; version="0.1.2"; sha256="11qd43zs8gd3fg3f47lrb6b4r0w7kxczain61bxc67ppzflrafmd"; depends=[magrittr MASS mvtnorm zoo]; }; imputeGeneric = derive2 { name="imputeGeneric"; version="0.1.0"; sha256="16680bkx1p5w0l5jh6g8f0qbcv0alw9xr2gkbhfs0rpbv5canl7f"; depends=[gower parsnip]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.1"; sha256="0w6wn9b74phiz9f58b6p95fymgrrlh94avhas046ngzaax6ay71n"; depends=[impute norm pcaMethods tmvtnorm]; }; - imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; }; imputeMulti = derive2 { name="imputeMulti"; version="0.8.4"; sha256="0192wzmz5114aq0nxlysjjkcylfkgpz3f214wqry5lpz0219lr79"; depends=[data_table gtools Rcpp]; }; imputeR = derive2 { name="imputeR"; version="2.2"; sha256="0jfyl6k285x4lc58q13fhi004l4yaqas0d4g08rx78ml7p6l1r48"; depends=[reshape2]; }; imputeREE = derive2 { name="imputeREE"; version="0.0.5"; sha256="0sc4ha10grjxvszcc7s4z39yqjd80mwa859mpq1mll910qxwfs6h"; depends=[broom dplyr magrittr purrr rlang stringr tibble tidyr]; }; @@ -11569,22 +11578,21 @@ in with self; { imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; imsig = derive2 { name="imsig"; version="1.1.3"; sha256="175is0b39grc609dskv9274czv4iwnmlg81dl4nr01xdp6f7g487"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; - inTextSummaryTable = derive2 { name="inTextSummaryTable"; version="3.3.0"; sha256="0dlb6icamw1arhh92hmgj5wj7a6lv1c8j95gdrqzxgqgkawrl582"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; + inTextSummaryTable = derive2 { name="inTextSummaryTable"; version="3.3.1"; sha256="0b5qn3hczdvdhqw6lcf23cyy39lcvraizrr01nxgp27mdarppgqh"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; inTrees = derive2 { name="inTrees"; version="1.3"; sha256="1afyjh2winb591am1cawchkysyslzv01nwyihvjb7n844pqr5s2j"; depends=[arules data_table gbm RRF xgboost xtable]; }; inaparc = derive2 { name="inaparc"; version="1.2.0"; sha256="0y3m2g5y12wj4af1wiqyi7nlb11avissd59g202rha0wqwzd8q3f"; depends=[kpeaks lhs]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.3"; sha256="0g7h4jgmnbpm4c6pb6fkmpzdg4adkc0k72444jpxbvyddq3hqh24"; depends=[data_table]; }; incR = derive2 { name="incR"; version="2.1.0"; sha256="0mis4hwd9mw7ji322yqidiz8d9qsb4jkpndfdskxrrmpfpha9r91"; depends=[ggplot2 lubridate suncalc]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; - incase = derive2 { name="incase"; version="0.3.1"; sha256="01x1alrk3pp4zi7r4nxnn9y16129ggmiqjys5sfhlybs505yq5vw"; depends=[backports magrittr plu rlang]; }; + incase = derive2 { name="incase"; version="0.3.2"; sha256="06qzzvxxwi0dp7ln864qszvk9xqbb4rgx5mbnkcvji7in6k2yj0n"; depends=[backports cli magrittr plu rlang]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; incidence = derive2 { name="incidence"; version="1.7.3"; sha256="1wdxh2p7scm419fqki0i7vsz45rd7557h5n3zf9fshb8x1fdf2z7"; depends=[aweek ggplot2]; }; incidence2 = derive2 { name="incidence2"; version="2.2.1"; sha256="1wd13m46siin6fcjhsk5r836ncplpq22by5f1b1fdpp5my6381ps"; depends=[data_table grates pillar]; }; incidental = derive2 { name="incidental"; version="0.1"; sha256="012pdwrkzlbnrrkvy67l6nvs1lrjgrzhfh3v4rqzk2ypdvfm3wmx"; depends=[dlnm ggplot2 MASS matrixStats numDeriv]; }; incidentally = derive2 { name="incidentally"; version="1.0.2"; sha256="063m672ym9w5zmzvdhr17smqy1mffkl3vls7nhpsxc4bjswqls2g"; depends=[igraph Matrix xml2]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; - incubate = derive2 { name="incubate"; version="1.2.0"; sha256="1l1ahcw8nad6jmhxzl5vlswl2kvyfv3lwchhckbhwbahplkna5vs"; depends=[future future_apply glue MASS purrr rlang survival tibble]; }; - indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; - independence = derive2 { name="independence"; version="1.0.1"; sha256="0yln5wd8m5fgh4h7k80vq22byf06k4d6574zxyqcig63hls7v568"; depends=[Rcpp]; }; + incubate = derive2 { name="incubate"; version="1.2.1"; sha256="1ip5vbk5d3a4sci09azmbqd1s2cm83l65yaq6fxjswizw3kvmscp"; depends=[future future_apply glue MASS purrr rlang survival tibble]; }; + indelmiss = derive2 { name="indelmiss"; version="1.0.10"; sha256="1dqdk6glzm40y4zxc9bfjg5qsvd2i4xm55w8f7671gyjkzjzavv5"; depends=[ape numDeriv phangorn Rcpp]; }; independenceWeights = derive2 { name="independenceWeights"; version="0.0.1"; sha256="07650hc93dxfx0sl2mdjzg2r84117q7ylbb9yfm3lh7dlb014lxp"; depends=[locfit osqp]; }; index0 = derive2 { name="index0"; version="0.0.1"; sha256="1kdjc86312a9x800h0i7z0z7bwbxyrqds8wnrm15aljkvk83xwxl"; depends=[]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.14"; sha256="15cfmjwblq3fcd2mymvh9p09jfgcifs2sngwnlfz3290glfb6zzm"; depends=[permute]; }; @@ -11592,12 +11600,13 @@ in with self; { indirect = derive2 { name="indirect"; version="0.2.1"; sha256="1iaks18xcxqr2afzbzgxj4jr77p6gw2zmgb1398cgqkgdwb1yj13"; depends=[gplots MASS]; }; industRial = derive2 { name="industRial"; version="0.1.0"; sha256="0zgnykbr71pi3nii178ijmzd8ijwf3g8y8yz6g3jy4c0by7w676s"; depends=[dplyr ggplot2 lattice magrittr rlang SixSigma tidyr]; }; inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; }; - ineptR = derive2 { name="ineptR"; version="0.1.0"; sha256="03v460gqw7x3biyxa7dyckrj9jd0zradfr58p1lfnv3mkvawp58v"; depends=[dplyr httr httr2 jsonlite lifecycle magrittr purrr readr rlang stringr tibble tidyr]; }; + ineptR = derive2 { name="ineptR"; version="0.2.1"; sha256="1rdw5idqaq9h2bys67lmks0dkrvr1a0272nr52ylf0cpglafs3n4"; depends=[dplyr httr httr2 lifecycle magrittr progressr purrr readr stringr tibble tidyr]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; ineq_2d = derive2 { name="ineq.2d"; version="0.1.0"; sha256="1l1d29krk1v66v4x66py8s6p30x6xw6d969ixcqnfsdyvbz3pwly"; depends=[]; }; ineqJD = derive2 { name="ineqJD"; version="1.0"; sha256="0anv384jwzn5gkc0jqsl81bkmrjd21br99c5q30xd6ncxavj4s57"; depends=[]; }; inet = derive2 { name="inet"; version="0.1.0"; sha256="1kjy2kgi5v29yk6pv776gwdqzkscjh96p3iv1j906vh47zp8wrag"; depends=[glmnet hdi MASS]; }; - infer = derive2 { name="infer"; version="1.0.4"; sha256="1s4q0nslykl0pb2w1i6ni6hkpp7awvp0wks79br3gk5wa1qkvs19"; depends=[broom dplyr generics ggplot2 glue magrittr patchwork purrr rlang tibble tidyr]; }; + infer = derive2 { name="infer"; version="1.0.5"; sha256="1zs1c22zc255m23in99cqp2chpdkski002rywmkdzwf6nd96mly7"; depends=[broom dplyr generics ggplot2 glue magrittr patchwork purrr rlang tibble tidyr vctrs]; }; + inferCSN = derive2 { name="inferCSN"; version="0.99.0"; sha256="0ij283mkqi6l1q8hdqsdbn3q3q0mzahvswq93cn3sx7ndwqcpfv5"; depends=[ComplexHeatmap data_table doParallel dplyr foreach ggnetwork ggplot2 ggraph Matrix patchwork progress purrr Rcpp RcppArmadillo]; }; inferference = derive2 { name="inferference"; version="1.0.2"; sha256="171h9zhvaza7fklcg07wk9sm8k2fy39k3cdjkzb3vk8p8acd051v"; depends=[Formula lme4 numDeriv]; }; inferr = derive2 { name="inferr"; version="0.3.1"; sha256="1ma90f31jcd65l5v3wqbx4x61gw3iay1a2hwjsd5aln1ivbgmzsv"; depends=[data_table magrittr Rcpp]; }; infinitefactor = derive2 { name="infinitefactor"; version="1.0"; sha256="0j6f9q8z81znwakyx4h0l8ypz0y4yv11d7l3rwljmn4rgspyjl5c"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; @@ -11617,34 +11626,35 @@ in with self; { ingredients = derive2 { name="ingredients"; version="2.3.0"; sha256="0jvxkdhbc28a096hi0y6519cj4im4mnl1vz9s563dvb5g4vb7r7b"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; - injurytools = derive2 { name="injurytools"; version="1.0.1"; sha256="01fachbqa4m56anas1j0my0ifl3n675lzzf8lv6q4im4axn072b4"; depends=[checkmate dplyr forcats ggplot2 lubridate magrittr metR purrr rlang stringr tidyr tidyselect withr]; }; - inlabru = derive2 { name="inlabru"; version="2.8.0"; sha256="1fhlf61nfpg3va6ih5g820758h182h45sv5nblljqgw3lxkim8nw"; depends=[dplyr lifecycle magrittr Matrix MatrixModels plyr rlang sf sp terra tibble withr]; }; + injurytools = derive2 { name="injurytools"; version="1.0.2"; sha256="1n8nr7mvmsrpzyirli3kmhn48z4mf4j2nj8k5nsl62jz5qsk7dlc"; depends=[checkmate dplyr forcats ggplot2 lubridate metR purrr rlang stringr tidyr tidyselect withr]; }; + inlabru = derive2 { name="inlabru"; version="2.9.0"; sha256="198amkx9s9lsdd3kwglmr62kvs8qlf3kw606dpmw83kip2v6gxwp"; depends=[dplyr fmesher lifecycle magrittr Matrix MatrixModels plyr rlang sf sp terra tibble withr]; }; inlcolor = derive2 { name="inlcolor"; version="1.0.5"; sha256="0998smgzkspij2fa5si1sk5dfpas3645crk5hqkdg9ip228cqn16"; depends=[checkmate rlang scales]; }; inline = derive2 { name="inline"; version="0.3.19"; sha256="1mcr9hgq6kkq03n7pkcccxa7vg8jma0q7lfxc5vvkc6snydk1s8f"; depends=[]; }; - inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; }; + inlinedocs = derive2 { name="inlinedocs"; version="2023.9.4"; sha256="115mng6fmjacb2mqa85mdqz79yfpgn08rshigsqcb2h234k0wnk3"; depends=[]; }; inlpubs = derive2 { name="inlpubs"; version="1.0.6"; sha256="0al6a4lidc9hk7l2r233kyq7fcwsd7cbfcm813jqy89nn187cmis"; depends=[checkmate tm]; }; innsight = derive2 { name="innsight"; version="0.2.0"; sha256="0ckhxicgvvrwzsm1x396xp2fj6g7v2m2ga4gzvqrw4my10w4y3di"; depends=[checkmate cli ggplot2 R6 torch]; }; - ino = derive2 { name="ino"; version="1.0.1"; sha256="1h47hlfxhxs14ms7wq7js4ygmq76d5i8f88ghhh5g2l6fdszfi90"; depends=[cli crayon doSNOW dplyr forcats foreach ggplot2 glue mvtnorm optimizeR reshape2 rlang scales]; }; + ino = derive2 { name="ino"; version="1.0.2"; sha256="18pl1scg8lxz0x1r2ksvrlpr7qvwp88bxvwiz4j4w3if5w0i0qhk"; depends=[cli crayon doSNOW dplyr forcats foreach ggplot2 glue mvtnorm optimizeR reshape2 rlang scales]; }; inops = derive2 { name="inops"; version="0.0.1"; sha256="1y402a9r542hpwd1nfdc07mbgnf9alpnykl9di1v8fy0qly8s0an"; depends=[]; }; - inpdfr = derive2 { name="inpdfr"; version="0.1.11"; sha256="1wnz73ggc7xcgynvdlvgz26qkfjmxxy0xg8gkf1far5346g4qd9y"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; }; + inpdfr = derive2 { name="inpdfr"; version="0.1.12"; sha256="1pargjl2v1kxxbdzf2jjcw3yxyqmxkq30rz3y5xywigq1ab2lpsw"; depends=[cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; }; inplace = derive2 { name="inplace"; version="0.1.2"; sha256="06jb8xzjqywdww8j2i59c8663dfbrhnvj0lh3xm73j39sig6vh7l"; depends=[Rcpp]; }; insane = derive2 { name="insane"; version="1.0.2"; sha256="1i8lijxa78i76dicdvcpp5c12il0341dsfjccn8m8axnsq7qg81h"; depends=[broom dplyr DT ggplot2 ggpubr ggthemes glue patchwork purrr readxl shiny tidyr]; }; insect = derive2 { name="insect"; version="1.4.2"; sha256="0pbac9il1jrhii0hxvvqjc3phyr2iamxwzanxx5mrkyjh2wsl3jh"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insectDisease = derive2 { name="insectDisease"; version="1.2.2"; sha256="1ncj5fgmx19caf8m2p3ij5iamk941m9y725gs0nqpa9m6zfnzgf8"; depends=[plyr taxize]; }; insee = derive2 { name="insee"; version="1.1.5"; sha256="1f6y19dysm0mh3fkrwnqcgi5j1lzy08m3ij3wrx26q2vgwv5lkfg"; depends=[crayon dplyr httr openssl purrr rappdirs rlang stringr tibble tidyselect xml2]; }; - insight = derive2 { name="insight"; version="0.19.3"; sha256="0zl8in5mvqjq58kprn1slrgc5wfh8vv7wprfc3qp3xl4bsqkj7zz"; depends=[]; }; + insight = derive2 { name="insight"; version="0.19.6"; sha256="1gnxhszwccmvjarq47p7s09jrkhvd8zkz632ysxz6dgxfpqn9zqh"; depends=[]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.12"; sha256="1k9dszjfpvpc10qr9nbw5r55mdwslgblhlrgnqjnwx9i89j03mlk"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp rlang tibble tidyr]; }; inspector = derive2 { name="inspector"; version="1.0.3"; sha256="16gc98af6wmwf32fz8zml5v17g5lkiybzyzsqgphx0k19hrbc6kr"; depends=[Rdpack]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; instagramadsR = derive2 { name="instagramadsR"; version="0.1.0"; sha256="1g2gikps3qraa12x8vfxsyanxg2mkcix57pcsh5myi1lcp5r2y5z"; depends=[jsonlite]; }; - install_load = derive2 { name="install.load"; version="1.2.4"; sha256="0ylis31bxyqhjpwb1fwadgb8wwrcjq4p8mrznqckrx6a0f6sai0m"; depends=[assertthat checkmate fastmatch]; }; + install_load = derive2 { name="install.load"; version="1.2.5"; sha256="1r1z6r1s65wpb5vxfwgmrip37pzr4ccz16b379mcqw8yq4fnzlcb"; depends=[assertthat checkmate fastmatch]; }; installr = derive2 { name="installr"; version="0.23.4"; sha256="1qlwcww3bgbdfqk2qi1vvis11bnvkkwa6h2l195knhx0i0ha8pfj"; depends=[stringr]; }; + instantiate = derive2 { name="instantiate"; version="0.0.2"; sha256="1qnf2sjmkqrc8hcsmvf7c2yds7mixb4ypcqhilawv03iljy26qqz"; depends=[fs pkglite rlang]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; insurancerating = derive2 { name="insurancerating"; version="0.7.2"; sha256="0yllp7r1jmv09py3v8blir7nc3vpd8y5a8b3r8k5ncyx7k56nbwh"; depends=[ciTools classInt colorspace data_table DHARMa dplyr evtree fitdistrplus ggplot2 insight lubridate magrittr mgcv patchwork scales stringr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRinsic = derive2 { name="intRinsic"; version="1.0.1"; sha256="0kx40w1228ppvvi3g54pw7552637azix809rpijqcfnps7p7kj1p"; depends=[dplyr FNN ggplot2 knitr latex2exp MCMCpack Rcpp RcppArmadillo reshape2 rlang salso]; }; intRvals = derive2 { name="intRvals"; version="1.0.1"; sha256="013n0qp12dqnnk931rvs6lql2r13z5j4jf27s4aqfyd80mnl5w7k"; depends=[lme4 plyr]; }; - intSDM = derive2 { name="intSDM"; version="1.0.5"; sha256="098cq4sav84kckgdl8i9szkygnmiqbch4qfs90686wjkva5nk6my"; depends=[dplyr geodata ggplot2 inlabru maps PointedSDMs raster sp spocc terra]; }; + intSDM = derive2 { name="intSDM"; version="2.0.2"; sha256="01gsq853vxkch69pmgypd4h5yfq1fnawa7qlamxglcxy6zmn3269"; depends=[blockCV geodata ggplot2 giscoR inlabru PointedSDMs R6 rgbif sf terra tidyterra]; }; intamap = derive2 { name="intamap"; version="1.5-6"; sha256="1d269rg1wf431v6p9blxspnnps8lyzcc8wid5qgy6hj3wrya0a37"; depends=[automap doParallel evd foreach gstat MASS MBA mvtnorm sf sp]; }; intccr = derive2 { name="intccr"; version="3.0.4"; sha256="1bpzsik6yypkxskp7ar8a1j0wmndsx41xn4kaffz0fni988l23hc"; depends=[alabama doParallel foreach MASS splines2]; }; intcensROC = derive2 { name="intcensROC"; version="0.1.3"; sha256="1raqjc3g9fgyd01iax7hrmkk3nzzfi34a1ywhjrkwv1n9gsc58ns"; depends=[pracma Rcpp RcppEigen]; }; @@ -11652,46 +11662,43 @@ in with self; { integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; intendo = derive2 { name="intendo"; version="0.1"; sha256="1qkgb0yrlq2k9cg934v5pj8bb6kla911v3z7sadd1p7m8a10kdyw"; depends=[]; }; intensegRid = derive2 { name="intensegRid"; version="0.1.2"; sha256="1dhk14rxy7c2pawcg89bhbnx30nzi5hppywmf41aa7f40x2m7wxs"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr]; }; - intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; intensitynet = derive2 { name="intensitynet"; version="1.4.0"; sha256="0rgm8rj95r269ww7snwv6czqdxabhzwxyaf3587scprhhn7pncy3"; depends=[ggplot2 igraph intergraph Matrix sna spatstat_geom spdep viridis]; }; interactionR = derive2 { name="interactionR"; version="0.1.6"; sha256="1k6fn0y69s8dq14yqqai4qm97cdyp7sfn8ni19xs2h8hwgmxdhf9"; depends=[car flextable msm officer]; }; interactionRCS = derive2 { name="interactionRCS"; version="0.1.0"; sha256="07yhcgp9jc0fd29drsvdcpg8hw3zafr3njkx4qa5qhp3jsn0m3pm"; depends=[boot mlbench msm pryr pspline rms survival]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; interactions = derive2 { name="interactions"; version="1.1.5"; sha256="16lrlj0rc9bkxgmackpvcx8wx9pbsnr55vak6zx022ss820h3ljj"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; interca = derive2 { name="interca"; version="0.1.2"; sha256="1ddv1rphdpvxbqbmrj3bgsdpksq84yjxdgygms5pw8jdz8yjyirs"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggrepel magrittr openxlsx readr readxl rmarkdown shiny shinyFeedback shinyWidgets waiter]; }; - interep = derive2 { name="interep"; version="0.3.2"; sha256="1a4ws8wsrlkiq8dxrx85cq758dim3ym0sirag1k7hhv6pl825cxs"; depends=[MASS Rcpp RcppArmadillo]; }; + interep = derive2 { name="interep"; version="0.4.0"; sha256="1c2s018h2r9xf5d1bywg4ml1kxszlc6fnrzddfc17wc20l31sw5b"; depends=[MASS Rcpp RcppArmadillo]; }; interflex = derive2 { name="interflex"; version="1.2.6"; sha256="0crijwb076b3hprjnji52l8qnd5pp3w7pxy214sfqrg2g3y4gcfl"; depends=[AER doParallel foreach future ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest MASS mgcv ModelMetrics mvtnorm pcse pROC RColorBrewer Rcpp RcppArmadillo sandwich]; }; interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; }; - intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="18a7xgb2rp0w9jl2rkh8nzyjprrs5w7h2iidvc8c38bzx3qpggkc"; depends=[igraph network]; }; + intergraph = derive2 { name="intergraph"; version="2.0-3"; sha256="1s578six6chn98ifgc8kdi2kxgim0mgw5di9sbk8c4aamjl40iim"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; }; interimApp = derive2 { name="interimApp"; version="0.0.1"; sha256="1g2f1plsgzqf277jy2afhchjlcamr9znm02rj4rvky7nnp63gph0"; depends=[interim shiny shinyBS]; }; interleave = derive2 { name="interleave"; version="0.1.1"; sha256="0316nzcms9hawjvslvbkpb5rg3jbmzsy1dzvmy1hi80zlyrm891v"; depends=[geometries Rcpp]; }; interlineaR = derive2 { name="interlineaR"; version="1.0"; sha256="0y1ym6iwly8sv94pdzwv2qy1g7z4hpqlrbcrpb1ds5a62a6axqj5"; depends=[reshape2 xml2]; }; interp = derive2 { name="interp"; version="1.1-4"; sha256="01jdwcv25khnma7i0zcynkr5sw0dzb2agqimhrpdg91jh4w5sysg"; depends=[deldir Rcpp RcppEigen]; }; interplot = derive2 { name="interplot"; version="0.2.3"; sha256="1qs0ni16rbjilkahn15yn9sil3ba4n935bxpdbpwlsjina504jqj"; depends=[abind arm dplyr ggplot2 interactionTest purrr]; }; - interpolation = derive2 { name="interpolation"; version="0.1.0"; sha256="12rxbpyi6hn2lijlxl3yaqp0fvxw3ipyk6x1hyl7dp3r8i5q4qy5"; depends=[BH Rcpp RcppCGAL]; }; interpret = derive2 { name="interpret"; version="0.1.33"; sha256="17619lyfbvkssls5l3ymlvq72b2162w0n9r7xa5n8wjnnx8mlipz"; depends=[]; }; interpretCI = derive2 { name="interpretCI"; version="0.1.1"; sha256="1jg2dpfrhb1kij2z0gq4sw1lrb4v2sky13dpfmdnaz2k5xqnih2s"; depends=[aplot dplyr english flextable ggbeeswarm ggplot2 moonBook officer patchwork purrr RColorBrewer rlang rmarkdown rstudioapi scales tidyr]; }; - interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; + interpretR = derive2 { name="interpretR"; version="0.2.5"; sha256="08vcjh0cxa070c7swg6mm4ygj58r5h8jzpz1h2wl72kxn2ka93yx"; depends=[AUC randomForest]; }; inters = derive2 { name="inters"; version="0.2.0"; sha256="1is65lid6v5ip6858i7mxjqaj0hgcr1xgk92zsh3qxpr8gn07cij"; depends=[fixest glmnet]; }; - interval = derive2 { name="interval"; version="1.1-0.8"; sha256="0g0k9nri19p3y3s70ic1w3i3sxq8fbsxaikd7c4d6afqzr8hk2nl"; depends=[Icens MLEcens perm survival]; }; + interval = derive2 { name="interval"; version="1.1-1.0"; sha256="0kmz7wpgc4kspr11l0nls4rq0qk2lbsg3s4bpl0zs4r4pjcrwvrx"; depends=[Icens MLEcens perm survival]; }; intervalaverage = derive2 { name="intervalaverage"; version="0.8.0"; sha256="07p9r358q3jxm8n7nypxmvpfnh61njivcwaplgzzxrlcbway6fq9"; depends=[data_table Rcpp]; }; intervals = derive2 { name="intervals"; version="0.15.4"; sha256="13wzwg5yc1wr8ww8bhv9x5ha78yajsfmb9phq4nbgrxkmbiy3h2h"; depends=[]; }; intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; - inti = derive2 { name="inti"; version="0.6.1"; sha256="0ikzm7lvniazn1iqd1m6qqf90fc6ajk1xvf0g7bc4xxzbz96q548"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringi stringr tibble tidyr]; }; + inti = derive2 { name="inti"; version="0.6.2"; sha256="1lmm0v76c4ksvp9zrh163cb55c52d112wfvslyxm1vapvpcdmvk7"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringi stringr tibble tidyr]; }; intkrige = derive2 { name="intkrige"; version="1.0.1"; sha256="1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; intmap = derive2 { name="intmap"; version="1.0.0"; sha256="1fxq0jkahangv4pwsvnrr4iq2y6qp61l81b28yzwl74b0lmx6hbf"; depends=[BH maybe R6 Rcpp]; }; intmed = derive2 { name="intmed"; version="0.1.2"; sha256="0amcqzinj35yvb9nfy808bz098dqmnds13z335lgqm6sykriyjpl"; depends=[doParallel dplyr foreach MASS mice stringr tibble]; }; intradayModel = derive2 { name="intradayModel"; version="0.0.1"; sha256="1rpcm6bix06lwkj7wndy3zarbxwm24x15vwwb2gfqj0527pvk0gl"; depends=[ggplot2 magrittr patchwork reshape2 scales xts zoo]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; - intrinsicFRP = derive2 { name="intrinsicFRP"; version="0.1.0"; sha256="1pjf3xkbqph40xxj51ddln1fq53dvndbp9hk6hyy6kkikdw22gi5"; depends=[Rcpp RcppArmadillo]; }; + intrinsicFRP = derive2 { name="intrinsicFRP"; version="1.0.0"; sha256="01hg53fb0xgkmgz3vnv6mf7cqwhlxw7w9pk2i92gsdij5x3cf4xx"; depends=[Rcpp RcppArmadillo]; }; intrinsicKappa = derive2 { name="intrinsicKappa"; version="0.1"; sha256="13m0k1r6l2havl6qi8m6403zkdbma47i29yb6xr9xnyqij2392qz"; depends=[]; }; intrval = derive2 { name="intrval"; version="0.1-2"; sha256="1fbgl2r359aml6cfz8x7h0381kxfx1dy0hr0c7012vr66f6c2lhi"; depends=[]; }; intsurv = derive2 { name="intsurv"; version="0.2.2"; sha256="02ds4gikrgg19knylg68ziani702dyhqc37fhf9j7awa1qxy2r9l"; depends=[Rcpp RcppArmadillo]; }; - intsvy = derive2 { name="intsvy"; version="2.7"; sha256="1q9phc6051r3vhv55wac1xkl9xzw9c7sw4xidsf6k1lymmhdn064"; depends=[dplyr foreign ggplot2 Hmisc memisc plyr reshape]; }; + intsvy = derive2 { name="intsvy"; version="2.8"; sha256="1b1mwh9bc0gdqlffscr93amghaxclphzm2c453jjqy3pnrrivfg3"; depends=[dplyr foreign ggplot2 Hmisc memisc plyr reshape]; }; inum = derive2 { name="inum"; version="1.0-5"; sha256="1gbbsffbzxjrgi8yw21fl35fsbx7ns8hdrhja50byfqvnghbg5p6"; depends=[libcoin]; }; invGauss = derive2 { name="invGauss"; version="1.2"; sha256="0zpyn5cb0mv4095flvgsy5p34f03xkm13r4yqfy0gfqy92xm26fz"; depends=[optimx survival]; }; - invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; }; invacost = derive2 { name="invacost"; version="1.1-5"; sha256="0qh1illwkcr2hi9hcns08xw8xpqd9d9134mdznw91a5qisnl9wkk"; depends=[dplyr earth ggplot2 lmtest mgcv quantreg robustbase sandwich scales]; }; invctr = derive2 { name="invctr"; version="0.2.0"; sha256="1sywjw078rc6nqiz1j77sd7c15nbjjpwqqni3363zzw5c3hgrpx5"; depends=[plyr rlang]; }; inventorize = derive2 { name="inventorize"; version="1.1.1"; sha256="0pbm9iw4v6wqr4qs5g2nfkgiaq75qdfcdicazy94fwwfvx5xbgbv"; depends=[dplyr ggplot2 magrittr plotly plyr tidyr]; }; @@ -11699,7 +11706,7 @@ in with self; { invertiforms = derive2 { name="invertiforms"; version="0.1.1"; sha256="0n3ksfdryk0g6f60acxh4i9f5z6gi9bsbal95z9pcd1vgvyhr1xw"; depends=[glue Matrix sparseLRMatrix]; }; investr = derive2 { name="investr"; version="1.4.2"; sha256="12hrvi3gi3hwianjnzfir4771kbrfbcy35xmfksp0lxrfxvm61ra"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; - invgamstochvol = derive2 { name="invgamstochvol"; version="0.1.0"; sha256="17zz744smp42s6jmh6001dpc7hnmk3pza3l2xhpshikgcdczcmia"; depends=[Rcpp RcppArmadillo]; }; + invgamstochvol = derive2 { name="invgamstochvol"; version="1.0.0"; sha256="01m5kz3qscrzwbyx5n0l45c92srv84dxp65j3pcmw8348p9m0sp1"; depends=[Rcpp RcppArmadillo]; }; io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; ioanalysis = derive2 { name="ioanalysis"; version="0.3.4"; sha256="0nprfqhwy5j11f5xgzaz8iw991cvgdcdmfca8sdvw8mci0cwkh5m"; depends=[ggplot2 lpSolve plot3D]; }; ioncopy = derive2 { name="ioncopy"; version="2.2.2"; sha256="133ay7xvdigs4q9yx5bcwdgsgrgzk2n6xn412dkq3bg95pp1angr"; depends=[shiny zip]; }; @@ -11723,7 +11730,7 @@ in with self; { ipfp = derive2 { name="ipfp"; version="1.0.2"; sha256="00588swwr7gz7gjx0clz55fgi4rm2h715fdmhsgm171bdmakh20r"; depends=[]; }; ipfr = derive2 { name="ipfr"; version="1.0.2"; sha256="0q44zw5g76qfqrqv6w2a8p905n4ljxab9jmyqk6fv9vs8j2kyivg"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; - ipkg = derive2 { name="ipkg"; version="1.0.5"; sha256="0y1gqc61fqjai3vfsn0rdjd0r8g46ls2jvb97h6gfhdafgfxrq7f"; depends=[remotes]; }; + ipkg = derive2 { name="ipkg"; version="1.0.9"; sha256="0n2p63mi6qfp0mr723cdkfsnbgykjrwzn1kyinqcydw5znwblz4x"; depends=[httr remotes]; }; iplookupapi = derive2 { name="iplookupapi"; version="0.1.0"; sha256="1lkla7jz4jhpxb9bd1nzgr4ks5r6i0ng2dxidyv3072fxlpvih5p"; depends=[httr jsonlite]; }; iplots = derive2 { name="iplots"; version="1.1-8"; sha256="01s8a43s2spxgmp6px5dpd96p8f4sfp98nxmxk763hg2868rksx3"; depends=[png rJava]; }; ipmr = derive2 { name="ipmr"; version="0.0.7"; sha256="0zpw73bqv9gblyxaprkhb8f9dva0ivv47bjriyb3265vlzyd088c"; depends=[magrittr purrr Rcpp rlang]; }; @@ -11735,7 +11742,7 @@ in with self; { ipsRdbs = derive2 { name="ipsRdbs"; version="0.2.6"; sha256="16qyq2jzv5nhwsnsg20213vhg62aqjk2fx9mr2343dlx5j3cjvb3"; depends=[extraDistr ggplot2 Rdpack]; }; ipsecr = derive2 { name="ipsecr"; version="1.4.0"; sha256="103qifpm0bgqqkx9r67h8bgd2i8nd05k90lflvxzcb8n6vfrzicv"; depends=[BH MASS nlme Rcpp RcppArmadillo secr stringr]; }; ipsfs = derive2 { name="ipsfs"; version="1.0.0"; sha256="1cpa0m19nddpp852vyiqw0azx8idyaqv225akfyrych9y8kw9n4d"; depends=[]; }; - ipumsr = derive2 { name="ipumsr"; version="0.6.0"; sha256="0hvaqqma1mdylhsa6h3h5k1xdy6rhgwgvmy90i8kwyqjsvmplfa9"; depends=[dplyr haven hipread httr jsonlite lifecycle purrr R6 readr rlang tibble tidyselect xml2 zeallot]; }; + ipumsr = derive2 { name="ipumsr"; version="0.7.0"; sha256="1sdy0gvwpa4gwaj7yzn9hbk47sai8nifrhdfdaq6rrpansjgjjv3"; depends=[dplyr haven hipread httr jsonlite lifecycle purrr R6 readr rlang tibble tidyselect xml2 zeallot]; }; ipw = derive2 { name="ipw"; version="1.2"; sha256="12acf71pc0xxpr5h1vhx8kxjlr5kymyhld97pp4bkikw5jykfl2a"; depends=[geepack MASS nnet survival]; }; ipwCoxCSV = derive2 { name="ipwCoxCSV"; version="1.0"; sha256="0avnvf4pnpxnik3iwwglpwkc8h0vsx9v6fxldkbvq7l9bphdbba1"; depends=[survival]; }; ipwErrorY = derive2 { name="ipwErrorY"; version="2.1"; sha256="14p22mwc120kdlf6r1hfx4kp7nqrz2nl2vpvy45j8rbrc571b6ka"; depends=[nleqslv]; }; @@ -11757,13 +11764,13 @@ in with self; { irtQ = derive2 { name="irtQ"; version="0.2.0"; sha256="1728699zrzpazjs7csvlzlcz7mncxspsq3lykd3i0rrpw6cixwsn"; depends=[dplyr ggplot2 gridExtra janitor Matrix mirt purrr reshape2 Rfast rlang statmod tibble]; }; irtawsi = derive2 { name="irtawsi"; version="0.3.4"; sha256="1fxz0k9pyf1h0mv64lj8p1n5yhgmrzs5q0vq8l77sg3zd8gv66pf"; depends=[bs4Dash diagram DT gt mirt psych readxl rmarkdown shiny shinycssloaders shinyWidgets]; }; irtoys = derive2 { name="irtoys"; version="0.2.2"; sha256="1qshz6czykgf53mq6xiswzv5xsjwrkrinpfkf1yavql4v08hs82b"; depends=[ltm sm]; }; - irtpwr = derive2 { name="irtpwr"; version="1.0.0"; sha256="009m14v1frwwqxi0vlvxk740ky34xj4k7pn4csl69yk429r8l9a2"; depends=[Deriv digest ggplot2 mirt spatstat_random]; }; + irtpwr = derive2 { name="irtpwr"; version="1.0.2"; sha256="1h4p0w29q9ksbyjsl7wqyc5id09nicv3x3dq2li20lkqvmwlmzsh"; depends=[Deriv digest ggplot2 mirt spatstat_random]; }; irtrees = derive2 { name="irtrees"; version="1.0.0"; sha256="003gmnv2d0xsqd54chadkbd8c8kf8fwr4lza86k6qkfs7d3ifkjm"; depends=[DiagrammeR tidyr]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.6"; sha256="0rjwnvmqmzwnch8j2zdh2b0drr76bq3c4f18h2glj44svn2dlmk2"; depends=[lattice]; }; isatabr = derive2 { name="isatabr"; version="1.0.1"; sha256="1qlc6007pbjgzmzii0bwifr0npdhlwnipk0c9yhxc2d85qid5a9m"; depends=[]; }; iscoCrosswalks = derive2 { name="iscoCrosswalks"; version="1.0.0"; sha256="00pzz0fy0k7zvi5pf389w4g5z96rbc4gzjvhghcmbq71z319wwcn"; depends=[data_table labourR Rdpack]; }; - isdals = derive2 { name="isdals"; version="3.0.0"; sha256="04s2w482qpz3ww7hws4plhz9h60py75asm1f40bpqmbffwka57ms"; depends=[]; }; + isdals = derive2 { name="isdals"; version="3.0.1"; sha256="01khfxymh708r4d9ddla6mnc4qcy76xi7l7l2y4za7lblfsmr41r"; depends=[]; }; isdparser = derive2 { name="isdparser"; version="0.4.0"; sha256="05xkffmiiyhas5hzdjdylbrvh6fjc2fjh7s00iwjxkp4ba7rwq3g"; depends=[data_table lubridate tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; island = derive2 { name="island"; version="0.2.9"; sha256="0s76f1i22cnc5c1dzswflq43qgcpssdkb32xc2j0ajy4r8xak7kz"; depends=[]; }; @@ -11772,24 +11779,24 @@ in with self; { ismtchile = derive2 { name="ismtchile"; version="2.1.5"; sha256="0b2y5r8r0vfin10qqnym80dz7vzk49hx6ic7gsnq3kn53wqrqhgk"; depends=[dplyr stringr]; }; isni = derive2 { name="isni"; version="1.3"; sha256="02a4vbhk26w796kxsyzqfp3bqxn64byfd5x5qma09lmdaxzmm71m"; depends=[Formula lme4 matrixcalc mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; - isoSurv = derive2 { name="isoSurv"; version="0.2.0"; sha256="1y6wdmxzzdl1dkvab72s2smm3brqfl0y3b9al8fnj3h2b8lw502j"; depends=[Iso survival]; }; - isoWater = derive2 { name="isoWater"; version="1.1.1"; sha256="07ggvx6myiqfr8lqvgwgaiyq1rrgyi5y1v8pbcpf5j34i8y02v4y"; depends=[abind doParallel foreach httr jsonlite R2jags R2WinBUGS]; }; + isoSurv = derive2 { name="isoSurv"; version="0.3.0"; sha256="19lhv8xhgqdy3k0x8iz4w83yxfplglwqv3xjzj0njg505lkyslvz"; depends=[Iso survival]; }; + isoWater = derive2 { name="isoWater"; version="1.1.2"; sha256="10rsivlcza28r386a5rs3lv75vb4aancldyswhqql3cxmd12hzqb"; depends=[abind doParallel foreach httr jsonlite R2jags R2WinBUGS]; }; isoband = derive2 { name="isoband"; version="0.2.7"; sha256="0qfzkkvh4a97qlifhdqjgdnzmnph93qqyqsv5gg8cnxl8crj54vn"; depends=[]; }; isoboost = derive2 { name="isoboost"; version="1.0.1"; sha256="1c239l9rfjr8scpfq5c9rl55jabk64jchcdndjsb9s5qyx2x0qdr"; depends=[Iso isotone rpart]; }; - isobxr = derive2 { name="isobxr"; version="1.0.1"; sha256="18kjymp7lkdnmzsl9cdgqk6x1njqwgp9rsf7z3gi683yfjli7p3g"; depends=[data_table deSolve dplyr DT fs ggplot2 ggrepel metR qgraph R_utils readxl rlang shiny shinyFiles shinyjs shinythemes stringr writexl]; }; + isobxr = derive2 { name="isobxr"; version="2.0.0"; sha256="1k6zky6v3hjw952jg4l0hnicw11iiqmxh7hcdjcb2nk2f4r4qn4g"; depends=[data_table deSolve dplyr fs ggplot2 ggrepel gridExtra magrittr purrr qgraph R_utils readxl reshape2 rlang stringr tictoc tidyr writexl]; }; isocalcR = derive2 { name="isocalcR"; version="0.1.1"; sha256="1nn7pd0xj2j3xi5bvd6fvm062h1j0g1nxmp374r313fi2b0qcp0c"; depends=[]; }; isocat = derive2 { name="isocat"; version="0.2.6"; sha256="1d6pi2l1lfi4226890lsfa02v0df1mc8gi214icsbk4fid4jygsx"; depends=[foreach magrittr plyr raster sp]; }; - isocir = derive2 { name="isocir"; version="2.0-7"; sha256="09cy79zxxj96a3q0izm83yrsmfxkpnqg7w1mcibfglgjg83a8lz3"; depends=[circular combinat TSP]; }; + isocir = derive2 { name="isocir"; version="2.0-7.1"; sha256="0jgm0a26frq4fs5d578c44bpn15nshvzmrqfzcbwydf58x7w6sj2"; depends=[circular combinat TSP]; }; isodistrreg = derive2 { name="isodistrreg"; version="0.1.0"; sha256="0na7jipwzr16afvz2l6wxh62mv0mrq1ma1qwxnys83zhr0dca099"; depends=[Matrix osqp Rcpp]; }; isogeochem = derive2 { name="isogeochem"; version="1.1.1"; sha256="112pcgbafjkgbfdkqvgz5i5iscfkjasq88k58az50cf47bqsqg0g"; depends=[]; }; isokernel = derive2 { name="isokernel"; version="0.1.0"; sha256="04mrbq2822yhcq4q82xwm61a38zsk6w55jgjkp0xnardpv8a39pb"; depends=[Matrix RANN]; }; isoorbi = derive2 { name="isoorbi"; version="1.1.0"; sha256="0f098y43iiwyf6gv1gaq9r22gwk9lbki86vj0pqrvgcdyk4w6azj"; depends=[dplyr lifecycle readr rlang tidyr tidyselect]; }; - isopam = derive2 { name="isopam"; version="1.1.0"; sha256="0cj8gn5m7r1fs4riiw1d3cmpg7zy3dyfpcr40dy18zmp4kg6ff7m"; depends=[cluster future future_apply progressr proxy vegan]; }; + isopam = derive2 { name="isopam"; version="1.2.0"; sha256="1ygvpdpn1vjkpfl32sp41kss512r051c839yki288xidqg4j3z0a"; depends=[cluster future future_apply progressr proxy vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; isopleuros = derive2 { name="isopleuros"; version="1.0.0"; sha256="19hn9ydby2wi6aim6vb7wjj93f95md0g8sy41djlhr94m5v9xw3d"; depends=[]; }; isotone = derive2 { name="isotone"; version="1.1-1"; sha256="0kpzcfxac3yrvw4rszzc99r1mw78pq6bsgg0h332jamwvffhasgn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; - isotracer = derive2 { name="isotracer"; version="1.1.4"; sha256="0wyvzfz0layh525fdn769x6nnm5d2447vjldnli49gasqb7g49nr"; depends=[BH coda data_table dplyr latex2exp magrittr pillar purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr tidyselect]; }; + isotracer = derive2 { name="isotracer"; version="1.1.5"; sha256="0qxdri6dq920d39ip1f37h1nzw90fr51bq4xc1m5bjv7vkqrqbks"; depends=[BH coda data_table dplyr latex2exp magrittr pillar purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr tidyselect]; }; isotree = derive2 { name="isotree"; version="0.5.22"; sha256="1y274hjhxf0jhhmycjd0p4vwlxsqbwnminqdh3qb61jxlz0r74vr"; depends=[Rcpp]; }; ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; }; ispdata = derive2 { name="ispdata"; version="1.1.2"; sha256="16vzfwn4q1q0k1m01ibknwm37j2d4x63a3zrrqj25mq8nrg134bs"; depends=[curl dplyr janitor openxlsx readr sf]; }; @@ -11797,10 +11804,10 @@ in with self; { isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; }; italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; }; itan = derive2 { name="itan"; version="3.1.1"; sha256="14aabrwvmqiyn8mypiaz80m24a0bczz2fl00f4dk9ham6hww4v1q"; depends=[ggplot2 reshape]; }; - itcSegment = derive2 { name="itcSegment"; version="0.8"; sha256="032wj34313m3wigdfalq356srdzg0cvnvxnaxwxws6bc44r78izf"; depends=[maptools raster rgeos sp]; }; + itcSegment = derive2 { name="itcSegment"; version="1.0"; sha256="11av3kfd8x29jq4x5axlqfzgwq3ngqkkv72j2yfs9snw2bfzg718"; depends=[terra]; }; itdr = derive2 { name="itdr"; version="2.0.0"; sha256="1aaqpyl6j1zxmy60a1zgkcnmnrp9i44kiiy976baq5l2n10md6x4"; depends=[energy geigen magic MASS tidyr]; }; itemanalysis = derive2 { name="itemanalysis"; version="1.1"; sha256="0spnf28ighcvg2haicxf8y88c6myxj3xdrpbiiyajpgivm8pzqqp"; depends=[car ggplot2 polycor]; }; - iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; + iterLap = derive2 { name="iterLap"; version="1.1-4"; sha256="1kjydl6wgcdjj4c0y2vpv57mpisk5c58vn96ik91m7rhfr2im1b0"; depends=[quadprog randtoolbox]; }; iteratoR = derive2 { name="iteratoR"; version="0.1.1"; sha256="0d0hc2669dsv1v4g5hz7n9rd4y502r4vw9795mi19jfgk662p2ml"; depends=[]; }; iterators = derive2 { name="iterators"; version="1.0.14"; sha256="0yv7rh6ghlfx727xy2aq64a7skyxp9msakaffs641q9h15d0gwyf"; depends=[]; }; iterors = derive2 { name="iterors"; version="1.0"; sha256="0cvd1c9zmc43ks5sjbii9xvnlrdmyqw3qpf5bkn8c9i0dyrv6ap1"; depends=[rlang]; }; @@ -11812,9 +11819,10 @@ in with self; { itraxR = derive2 { name="itraxR"; version="1.12.1"; sha256="0s3arm3ln2p92by8lfj5fl1rh7cspj9v2q30rb4r99vncxp85alk"; depends=[broom compositions dplyr ggcorrplot ggplot2 janitor munsellinterpol readr rlang stringr tibble tidyr tiff]; }; its_analysis = derive2 { name="its.analysis"; version="1.6.0"; sha256="1ig7yq59y5xl1z182bbvgx8vsqs9sb1xscf6zxqn1qmy9f0ggf7v"; depends=[boot car forecast ggplot2 plyr]; }; itsadug = derive2 { name="itsadug"; version="2.4.1"; sha256="1sdqs279qxr3993hw08xg7b54yq03jw1597cqn6cf24sh9vpw9m1"; depends=[mgcv plotfunctions]; }; + itscalledsoccer = derive2 { name="itscalledsoccer"; version="0.2.4"; sha256="1xyfs9y60mrmmrpx5rhm2xg3ysgc75wfb62vb63rr7nlv6sfisgl"; depends=[clisymbols crayon data_table dplyr glue httpcache httr jsonlite magrittr R6 rlang stringi tidyr]; }; itsdm = derive2 { name="itsdm"; version="0.2.1"; sha256="1rd55arrha2xy5d68nymz3awycpk0797d9q55ia42rq9n1gi9w9k"; depends=[checkmate dplyr fastshap ggplot2 isotree mgcv ncdf4 outliertree patchwork raster rlang ROCit sf stars stringr tidyselect]; }; itsmr = derive2 { name="itsmr"; version="1.10"; sha256="1dr8n95rjbsfvw82v2r8rsahxa26f75icp9fn3hfr0d6g0xpkb69"; depends=[]; }; - ivDiag = derive2 { name="ivDiag"; version="1.0.4"; sha256="1kr6svbi4r3dfgx448q523c3ymfiwpg5k729n2bh19say4z6wk88"; depends=[doParallel fixest foreach future ggfortify ggplot2 glue haven lfe patchwork testthat wCorr]; }; + ivDiag = derive2 { name="ivDiag"; version="1.0.6"; sha256="17rwdn6svbb93winnjsfx815mhg3sw21csi3khsn66kjgnxisqi7"; depends=[doParallel fixest foreach future ggfortify ggplot2 glue haven lfe patchwork testthat wCorr]; }; ivaBSS = derive2 { name="ivaBSS"; version="1.0.0"; sha256="1pcls9lgj6i7qad5y28bvj2nra8kpnjslcdkjvl1q1aq8ig1yb98"; depends=[BSSprep]; }; ivdesc = derive2 { name="ivdesc"; version="1.1.1"; sha256="0b28xghncvq182kl19m8k1frnr2cqj7nvnhcd831kfd84bk2sz13"; depends=[knitr purrr rsample]; }; ivdesign = derive2 { name="ivdesign"; version="0.1.0"; sha256="02v2cnljz3gk7mb8q3p1i54rj6l02r4pirznnrshy092zvrvr26m"; depends=[]; }; @@ -11835,15 +11843,15 @@ in with self; { jSDM = derive2 { name="jSDM"; version="0.2.6"; sha256="1rqy6xh6qhvmfgjnjlbkq71dr6c0fdwddvs7cbvv1p5qvf12zhx9"; depends=[coda corrplot doParallel foreach MASS Rcpp RcppArmadillo RcppGSL stringi]; }; jScore = derive2 { name="jScore"; version="0.1.0"; sha256="0hb63l10cwvpvix155d16v35lp1v88lp69f6q1s09njc6qdsg212"; depends=[]; }; jaatha = derive2 { name="jaatha"; version="3.2.4"; sha256="13vmmrbvr073mmhgh84dp2wwx3r71bnli90nycfliqfnmzwr8ynl"; depends=[assertthat R6]; }; - jab_adverse_reactions = derive2 { name="jab.adverse.reactions"; version="1.0.1"; sha256="0z7i6ni1bhih5yxwng1xxf8cgg3bb1il3p32rp5vfz2hfdm68vag"; depends=[]; }; + jab_adverse_reactions = derive2 { name="jab.adverse.reactions"; version="1.0.3"; sha256="18rfaiv2w7lvd5psj6qkyfdc363y3xfrrg5fhmcv4s4n0cj8kbsv"; depends=[]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; jack = derive2 { name="jack"; version="5.3.0"; sha256="0qxshhyrplq5bfgb1spjfh7iwazbjna5hv2rkn6fwbrpgvbc9jrg"; depends=[BH DescTools gmp multicool mvp partitions qspray Rcpp spray]; }; - jackalope = derive2 { name="jackalope"; version="1.1.3"; sha256="1cslrl2cvcpi2kisb2plkz8c3wfxkbkf816nnyb06k4mv3gy4r5d"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; + jackalope = derive2 { name="jackalope"; version="1.1.4"; sha256="0bdv3hj7zaa3jxg1rshzgg7y93802kr1nfhh0hg1zgawn1hrpyki"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackknifeR = derive2 { name="jackknifeR"; version="1.2.0"; sha256="0s2kf0r102gwcrjd2ggimyxw99nwcdd0pfwgyw922f2kzwf0rxq6"; depends=[doParallel foreach]; }; jackstrap = derive2 { name="jackstrap"; version="0.1.0"; sha256="09y9pgb920lnbzlgm6j188q8lw1air83kx383a2f89zz7hhgg7jr"; depends=[Benchmarking doParallel dplyr fBasics foreach ggplot2 plyr reshape rlang scales tidyr]; }; jackstraw = derive2 { name="jackstraw"; version="1.3.8"; sha256="04d0ribg8nbxazv92hmzzks2krsx024glfc90cm9dxz7if44cwc9"; depends=[cluster ClusterR corpcor irlba qvalue rsvd]; }; - jacobi = derive2 { name="jacobi"; version="2.3.1"; sha256="1l2cmnd2z5a5308d5ri1bviyh8w41x2sg1gi8f79xghxwvf7djbp"; depends=[Carlson Rcpp rgl Rvcg]; }; + jacobi = derive2 { name="jacobi"; version="3.0.0"; sha256="13a7jnfmjk1ssdawipk2gcvmr5bj8bl30miab456nhg89r52nqj5"; depends=[Carlson Rcpp rgl Rvcg]; }; jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; }; jadeLizardOptions = derive2 { name="jadeLizardOptions"; version="1.0.1"; sha256="1919qm9b5nb6bjwbqhsnimgn5lhcrrhd90ndnsc9kj3z3khw9mkd"; depends=[dplyr ggplot2 magrittr tibble]; }; jaggR = derive2 { name="jaggR"; version="0.1.1"; sha256="0qd4kwcc8zcvg2p1njcv7z4y5ssg77zsylph5bcaqdjxq996q7rv"; depends=[formatR glue]; }; @@ -11865,27 +11873,28 @@ in with self; { jetpack = derive2 { name="jetpack"; version="0.5.5"; sha256="0c2vvayci7jm1p97ccgb5nccrgvdyid4fgh12cab18xwrwx1hzxx"; depends=[desc docopt remotes renv]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jewel = derive2 { name="jewel"; version="2.0.1"; sha256="0lj97bgqd2q3s2dcksn1nv4wwiw4ik9aimwa7kamfl0lmrlcz165"; depends=[igraph MASS Matrix matrixcalc purrr SMUT]; }; - jfa = derive2 { name="jfa"; version="0.6.7"; sha256="0ayir29lxj4kvqs7p78cma2ll46irkgf0x2j03iijv60pga2h0rb"; depends=[bde BH extraDistr ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders truncdist]; }; + jfa = derive2 { name="jfa"; version="0.7.0"; sha256="156pg721prpy8rvahpczrfwihx1wj1qihqzhgal8kj91259ccj57"; depends=[bde BH extraDistr ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders truncdist]; }; jgcricolors = derive2 { name="jgcricolors"; version="1.0.0"; sha256="1lg6yzqly5y2cf396b6rvfqplnfyz9v9ay2g4q9m110mng5ln96l"; depends=[ggplot2 knitr markdown RColorBrewer stringr]; }; jgsbook = derive2 { name="jgsbook"; version="1.0.2"; sha256="0q2k2fff6qzn9mgf629arpc055xjhych0bj412kq9yp68kgmzr46"; depends=[curl httr jsonlite statip]; }; jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; jinjar = derive2 { name="jinjar"; version="0.3.0"; sha256="10lilj98ppy3cpimn5pzsfkvm5chz4bw1rx3a3frgy56nmapnmsv"; depends=[cli cpp11 fs jsonlite rlang]; }; - jipApprox = derive2 { name="jipApprox"; version="0.1.4"; sha256="18ga798iafkqvjmra1xw3fpqzhd7c9qjcvklsifs2s6p8czy06v7"; depends=[sampling]; }; + jipApprox = derive2 { name="jipApprox"; version="0.1.5"; sha256="0pi85gl0knyi5r32bdmy2x0w805kczs41nx3r45bq0zs66g14fix"; depends=[sampling]; }; jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; }; jlctree = derive2 { name="jlctree"; version="0.0.2"; sha256="0l8piz0m9iv9lbw35yx1ww0db0pv0qhbvkz4l36fwjsgnjlh8f6a"; depends=[lme4 rpart survival]; }; - jlmerclusterperm = derive2 { name="jlmerclusterperm"; version="1.0.3"; sha256="1l27513896mzz6l88pzqffvj71sivxvswqgdrcpgrk1h8w84h658"; depends=[cli generics JuliaConnectoR lme4]; }; + jlmerclusterperm = derive2 { name="jlmerclusterperm"; version="1.1.0"; sha256="0qymlx8b1038znadwam9jhcp8h94g7gyqfzmarz49hps8ssfgiqp"; depends=[backports cli generics JuliaConnectoR lme4]; }; jmBIG = derive2 { name="jmBIG"; version="0.1.0"; sha256="129b39ax1flw9d4aar0v6640axm934myipag524vh5dfzc2dsrdr"; depends=[dplyr FastJM JMbayes2 joineRML nlme rstanarm survival]; }; - jmatrix = derive2 { name="jmatrix"; version="1.4"; sha256="0ydy93bfgci11dam45lqpskj4pdlwjk4qq57g1f4352558nh9hkp"; depends=[memuse Rcpp]; }; + jmastats = derive2 { name="jmastats"; version="0.2.0"; sha256="1x9x9wpmjjaxq4rk9m6mlkydpmsxc9y68cqnp4viajghhjmabvqz"; depends=[cli crayon dplyr forcats ggplot2 lifecycle lubridate purrr rappdirs readr rlang rvest sf stringr tibble tidyr tidyselect units xml2]; }; + jmatrix = derive2 { name="jmatrix"; version="1.5"; sha256="1kcz2zvi044aqp9v057x686jbmirc3p2s995vrb0cym1jvw53crh"; depends=[memuse Rcpp]; }; jmcm = derive2 { name="jmcm"; version="0.2.4"; sha256="1dpm94k2s2vx3dvd5rk7xrsq786phl0hq7xi9fjjxbr8qfmxhsck"; depends=[Formula Rcpp RcppArmadillo roptim]; }; jmdem = derive2 { name="jmdem"; version="1.0.1"; sha256="15zrxgd5fgi4wzp4s963pnwj3vkgxs4ygqrcpncy9b6j2cxrivdc"; depends=[statmod VGAM]; }; jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.1.1"; sha256="0b2qllpfgs6q5fwfhxl5b4xdyzbvnja7ld766akf0xxznxvglkrg"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; }; - jmv = derive2 { name="jmv"; version="2.3.4"; sha256="0mhai7kvc6fpsybpgj6adnbqsg3nlx16zfjdg6lxkhzjdv0s4gpm"; depends=[afex BayesFactor car dplyr emmeans GGally ggplot2 ggrepel ggridges GPArotation jmvcore lavaan magrittr MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; - jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.3.8"; sha256="0s12llrw2c8xij9spd5xkg51x55h9663g1nw5kn4s16pfbgzccjw"; depends=[jsonlite zip]; }; + jmv = derive2 { name="jmv"; version="2.4.11"; sha256="02iaasl3crg924y3dipv7pjq67nj9lf2i2j53pa4ccwz22nrpsbw"; depends=[afex BayesFactor car dplyr emmeans GGally ggplot2 ggrepel ggridges GPArotation jmvcore lavaan magrittr MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; + jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.4.1"; sha256="1s7ps4xam6xp161ds6l1dq37kbxha2wvydfzh7d34hrhk0zfwigd"; depends=[jsonlite zip]; }; jmvconnect = derive2 { name="jmvconnect"; version="2.3.13"; sha256="0b5klfn4986haw3hhy3aarf88g08s1d46b8xrpxxqnwqw8yd7l88"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; - jmvcore = derive2 { name="jmvcore"; version="2.3.19"; sha256="0cwchz7n50sxin65nc1k5bygci2yxp68yypmvq2a0fyf56r53gdg"; depends=[base64enc jsonlite R6 rlang stringi]; }; + jmvcore = derive2 { name="jmvcore"; version="2.4.7"; sha256="1pzcv5rkkhff73cf9kfp56d5frk5vjjj6ls1cd4bskyrm0754p3a"; depends=[base64enc jsonlite R6 rlang stringi]; }; job = derive2 { name="job"; version="0.3.0"; sha256="0d7pw3q5lqlgmav1vx63y8l6gdav96656bg378wj001rx5gx052h"; depends=[digest rstudioapi]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; @@ -11893,6 +11902,7 @@ in with self; { joineRML = derive2 { name="joineRML"; version="0.4.6"; sha256="07drhpyvsmmsbv4knx4ma91f773f48jf14lnpn8cdl5sslc6f4pp"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; joinet = derive2 { name="joinet"; version="0.0.10"; sha256="1jjx1rvg2x9zdfdqsjk04hcn7qsf8g7pq8q0x9q83kd8sb1ikjk5"; depends=[cornet glmnet palasso]; }; joint_Cox = derive2 { name="joint.Cox"; version="3.16"; sha256="0i2lf4q5w3893wppcig85r3ljr84j0d2m2id9kw9g194c8qgaqmm"; depends=[survival]; }; + jointCalib = derive2 { name="jointCalib"; version="0.1.0"; sha256="0md4rmb7f3k6zy1y8s43p14wwrx2bv3j5j03sn7qh9mhpyssl8hn"; depends=[ebal laeken MASS mathjaxr sampling survey]; }; jointDiag = derive2 { name="jointDiag"; version="0.4"; sha256="18x6rxaxhz9hcp6rfmjlanbfsc5q61p6xcxixnc8ayyxbdq7q6rf"; depends=[]; }; jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; }; jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; @@ -11911,19 +11921,20 @@ in with self; { jpgrid = derive2 { name="jpgrid"; version="0.3.1"; sha256="0pp5nwvv0sglr089m78q4kaq7pkj7w2qdylpaahyjqb4iqk06grh"; depends=[cli dplyr geosphere lifecycle pillar purrr rlang sf stars stringr tibble tidyr tidyselect units vctrs]; }; jpmesh = derive2 { name="jpmesh"; version="2.1.0"; sha256="0q8adf582h92qwdwgh4dk53s8rixrrh96r8vzy6bwxvizqf0i3y8"; depends=[leaflet magrittr memoise miniUI purrr rlang sf shiny tibble units vctrs]; }; jpstat = derive2 { name="jpstat"; version="0.4.0"; sha256="1vzqipxk019f9chm9nxcsifiv3i2cmqvwgyx45zrh2cxsrn8bhvk"; depends=[dplyr httr lifecycle navigatr pillar purrr rlang stickyr stringr tibble tidyr vctrs]; }; - jqr = derive2 { name="jqr"; version="1.2.3"; sha256="1a91zcjxdilhqdyr2lipnwc35f90h0wyqlbg0vw9ay7sq6llxgs9"; depends=[lazyeval magrittr]; }; + jqbr = derive2 { name="jqbr"; version="1.0.3"; sha256="1afraa18zwv3lbgxpqj4zkvlhzmv5ziajww1iccpkr7ca1rn4zk3"; depends=[htmltools jsonlite shiny]; }; + jqr = derive2 { name="jqr"; version="1.3.1"; sha256="0dlz9wwkgz06mnnmwaq4pr68x7zywp2iczfw0bjpzrgpbzkn2972"; depends=[lazyeval magrittr]; }; jquerylib = derive2 { name="jquerylib"; version="0.1.4"; sha256="04a40v4znpj98j7y6009d74a6g9dchj5rr3p08cgz9p3rlfw3g7h"; depends=[htmltools]; }; jrSiCKLSNMF = derive2 { name="jrSiCKLSNMF"; version="1.2.1"; sha256="1ai3maxl1gmgr9bvc813xnfz5lk9kgzm6a46p8iidjpnv5p42c4v"; depends=[cluster clValid data_table factoextra foreach ggplot2 igraph irlba kknn MASS Matrix pbapply Rcpp RcppArmadillo RcppProgress Rdpack rlang scran umap]; }; - jrc = derive2 { name="jrc"; version="0.5.1"; sha256="0lg647nfijj6grlmwkasd6di5h6286dxmw1373k6n5gwym1g1l36"; depends=[httpuv jsonlite mime R_utils R6 stringi stringr]; }; + jrc = derive2 { name="jrc"; version="0.6.0"; sha256="0zqif6csh4r5vbcw1dl12x2psb27r5lv0k5z0vv8bk3xk5r6vwlq"; depends=[httpuv jsonlite mime R_utils R6 stringi stringr]; }; jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrt = derive2 { name="jrt"; version="1.1.2"; sha256="03k5dgqqzhhd6n4pdpcyq0zy4dj35yj41c6wnz4pa2i0i16jgfdq"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; }; jrvFinance = derive2 { name="jrvFinance"; version="1.4.3"; sha256="0g3w65avys5chni0zlahzwqgv09z9na08yhay385ax33ddwrcrjv"; depends=[]; }; js = derive2 { name="js"; version="1.2"; sha256="0s5rj845255a4fzv4h76gcnnqyl5cg3c03r2ay3f00jxnxvvigcg"; depends=[V8]; }; jsTree = derive2 { name="jsTree"; version="1.2"; sha256="06mmz55brm6w19vnlk1w8qaz0n3czlyl4fs62nzgdlsdjn8pad1h"; depends=[data_table htmltools htmlwidgets jsonlite]; }; - jsTreeR = derive2 { name="jsTreeR"; version="2.3.2"; sha256="0kxjh95habvfn0y4dv003wlvng3r8ljmic7q5iz8110rlf0m83l0"; depends=[base64enc fontawesome htmltools htmlwidgets jquerylib miniUI R_utils rstudioapi shiny shinyAce]; }; + jsTreeR = derive2 { name="jsTreeR"; version="2.3.3"; sha256="1xlvd3npdcg63pisrgbg65di01w1h8hksbqndj0crn3jbhy7qjyd"; depends=[base64enc fontawesome htmltools htmlwidgets jquerylib miniUI R_utils rstudioapi shiny shinyAce]; }; jshintr = derive2 { name="jshintr"; version="0.1.0"; sha256="08j28c2ab9fh6g7qp2vl8j5hz5kkikvl2id979kv92ach9vranyd"; depends=[htmltools htmlwidgets rstudioapi]; }; jskm = derive2 { name="jskm"; version="0.5.2"; sha256="059hyagi20saqwdwhpaz8ra8yf5y4ihz974285sr15skgr7y1kv2"; depends=[ggplot2 ggpubr scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="1.4.2"; sha256="13hc2ppmbn0l9iyj9si639j8f6ayrjkvr2dymiy0i8ys3510h8jx"; depends=[data_table DT epiDisplay geepack GGally ggplot2 ggpubr haven Hmisc jskm jstable labelled MatchIt maxstat officer pROC purrr RColorBrewer readr readxl rstudioapi rvg see shiny shinycustomloader shinyWidgets survey survIDINRI survival timeROC]; }; + jsmodule = derive2 { name="jsmodule"; version="1.4.3"; sha256="1wjs01dg0k47jnb5f03w2ryns9b57v73pzh4bx576qpl2fgzvzbb"; depends=[data_table DT epiDisplay geepack GGally ggplot2 ggpubr haven Hmisc jskm jstable labelled MatchIt maxstat officer pROC purrr RColorBrewer readr readxl rstudioapi rvg see shiny shinycustomloader shinyWidgets survey survIDINRI survival timeROC]; }; json2aRgs = derive2 { name="json2aRgs"; version="0.3.0"; sha256="0n1kj1kll6x7ar00y32pf8z38z7z1bnj29nlv9dx068n4kmy89v7"; depends=[jsonlite yaml]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; jsonNormalize = derive2 { name="jsonNormalize"; version="1.0.0"; sha256="1szvi8c0r75jv7y2y1jsampb783svvx04x4rvyw8v9qkiw0qpfis"; depends=[rstudioapi V8]; }; @@ -11933,12 +11944,13 @@ in with self; { jsonlite = derive2 { name="jsonlite"; version="1.8.7"; sha256="07301wdpf014m8pfr7x3zwaj07pmin0rfax0irljimvj9dwbfhkx"; depends=[]; }; jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.3.2"; sha256="0myvm93azl6mj60l8fp91qa3ln3nnwj4p48xli8k215sm6zhhv1b"; depends=[V8]; }; - jstable = derive2 { name="jstable"; version="1.1.1"; sha256="10lggan0rf9r0p8cf8blpz7plqq4dzwkvfm2dqrha5hparl6gka4"; depends=[coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; - jstor = derive2 { name="jstor"; version="0.3.10"; sha256="0k2y3h01yra8yns97j4yyxa1jmclrd6z5xxiv4m8da5q5cgkc970"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; - jtdm = derive2 { name="jtdm"; version="0.1-0"; sha256="0bbnrayny9hafck5nksmgabnnrpl9iq17zs0qb1a35kmrmbjcskk"; depends=[ggforce ggplot2 gridExtra mniw mvtnorm reshape2]; }; + jstable = derive2 { name="jstable"; version="1.1.2"; sha256="1ar9zp9adag6d806l79y5pnf44hqdd4wrrcx7nvglxdyn7ma9xp9"; depends=[coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstor = derive2 { name="jstor"; version="0.3.11"; sha256="1n5l6wz93bjhhhpikmvmjd5famxbrsk3d6z61bb7sp6xvslychlj"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; + jtdm = derive2 { name="jtdm"; version="0.1-1"; sha256="11x4zm5npgcbmvrir2maf7zr54mvg0ppckb145cckmqns94nk25j"; depends=[ggforce ggplot2 gridExtra mniw mvtnorm reshape2]; }; jti = derive2 { name="jti"; version="0.8.4"; sha256="0jxqv3xa9yyzizx1rhxjv65c8b253shridy57skrd5kya701n460"; depends=[igraph Rcpp RcppArmadillo sparta]; }; jtools = derive2 { name="jtools"; version="2.2.2"; sha256="1fcpsh9kdr83ngxab6y9b00ridsz764qj3rdlc3dcmqbgas6m8vr"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; + juicedown = derive2 { name="juicedown"; version="0.1.1"; sha256="1fvplx2p8510ayl32l04db728fajyp06jcfzivm47v8px434f2pf"; depends=[clipr dplyr glue juicyjuice knitr markdown rlang rvest sass stringr xfun xml2]; }; juicr = derive2 { name="juicr"; version="0.1"; sha256="0vkbgbagcgaxj6k62b033ik85jnkzvshg8dm9cz7vq4yjqj3icip"; depends=[RCurl XML]; }; juicyjuice = derive2 { name="juicyjuice"; version="0.1.0"; sha256="0ap1nsyihlagc1yqvwr2x9s16kzb3c8azfi50mzv95275a5l3xb4"; depends=[V8]; }; junctions = derive2 { name="junctions"; version="2.0.3"; sha256="0lm3n8n9dfi9nsdazj74pd57kxm2kzrd1gxdzd0izzwgkjnsrsqc"; depends=[nloptr Rcpp RcppParallel tibble]; }; @@ -11948,27 +11960,27 @@ in with self; { jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; k5 = derive2 { name="k5"; version="0.0.5"; sha256="163ls1fmb2kkcly7cv1ia4k5fdjpr0xbr8nz7xw2zhmk2hfx47vq"; depends=[aws_s3 clipr dplyr fs ggplot2 glue lubridate magrittr pacman readr stringr tibble usethis]; }; kNNvs = derive2 { name="kNNvs"; version="0.1.0"; sha256="1zbfk8fanwmzn0ryhyxmq7npl1pysgnhs4chpfi1kxlnlbgfxfl1"; depends=[]; }; - kSamples = derive2 { name="kSamples"; version="1.2-9"; sha256="1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms"; depends=[SuppDists]; }; + kSamples = derive2 { name="kSamples"; version="1.2-10"; sha256="13ap5ggid3w3s3k5mzz1ir31j96hjg6msa2s1hcy66zv242wqrid"; depends=[SuppDists]; }; kStatistics = derive2 { name="kStatistics"; version="2.1.1"; sha256="149aly73m7ls4pvyhg861j6yi2yyyr4hdwzh53hfyrakr73rq7y4"; depends=[]; }; kableExtra = derive2 { name="kableExtra"; version="1.3.4"; sha256="1c5vzy95cbz36jwyssr927qicrayifinv861rvnmg4nghb1gl7q9"; depends=[digest glue htmltools knitr magrittr rmarkdown rstudioapi rvest scales stringr svglite viridisLite webshot xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; kaigiroku = derive2 { name="kaigiroku"; version="0.5"; sha256="11f9lxk4kx3d65i2xnbpw1ixcc9qgahqdirl42aiyph4hzah1fhh"; depends=[dplyr jsonlite R_utils tidyr]; }; - kairos = derive2 { name="kairos"; version="1.2.0"; sha256="1fivyh61wqkq77aicqc90pihrn2kwir4mpbcp5jl9sklcdmh3l3w"; depends=[arkhe dimensio extraDistr ggplot2 Hmisc rlang]; }; - kalmanfilter = derive2 { name="kalmanfilter"; version="2.0.1"; sha256="1041hhxdk0z9anca7ipbs5j0j1wyd4pq2j7qrg3jkxp3qp856dxg"; depends=[Rcpp RcppArmadillo]; }; + kairos = derive2 { name="kairos"; version="2.0.1"; sha256="1qb5vrvn1sf4ah2krsnhw1885w90zr2xwvgzb785mhg2mhq9sncs"; depends=[aion arkhe dimensio extraDistr]; }; + kalmanfilter = derive2 { name="kalmanfilter"; version="2.0.2"; sha256="0kxc9lwjdan5q1xikagfmwbbxxjqvqjcs1hq6514j8av0lrn6hpq"; depends=[Rcpp RcppArmadillo]; }; kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.4.1"; sha256="0c3wrzk7k322xj0yzladxdhh2j91qm7m0dyqqqfsshfkh8d22m48"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kanjistat = derive2 { name="kanjistat"; version="0.9.1"; sha256="0yp5x1zvf8k4gaz2fpi6qa1mpfkmsvdv7y0b7scbf168yjqq8m7a"; depends=[crayon dendextend gsubfn lifecycle png purrr rlang ROI showtext stringi stringr sysfonts transport xml2]; }; - kantorovich = derive2 { name="kantorovich"; version="3.0.1"; sha256="140fmbwaxn968n75my9336svgk7jw5zdq2ah1lcnl2m7qhxkvdxk"; depends=[CVXR gmp lpSolve rcdd Rglpk slam]; }; + kantorovich = derive2 { name="kantorovich"; version="3.1.0"; sha256="0hhqglqasc76pcybz7jc18dsq3bhgmbw11d2zc3xy8vg8i0ykz63"; depends=[CVXR gmp lpSolve ompr ompr_roi rcdd Rglpk ROI_plugin_glpk slam]; }; kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; kappalab = derive2 { name="kappalab"; version="0.4-10"; sha256="14yxfkagjmvg1z0vsdx64lngcr02sqpbbgpqy2ww02wvwnn9hpg9"; depends=[kernlab lpSolve quadprog]; }; karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; karel = derive2 { name="karel"; version="0.1.1"; sha256="0nvzvd8aq0sipcvn8agjjd2k1wykpgc99nrrk2cxrlvsjbpd2w52"; depends=[dplyr gganimate ggplot2 gifski magrittr purrr tidyr]; }; + karyotapR = derive2 { name="karyotapR"; version="1.0.1"; sha256="01mxsv4ky6d16xjkvi6lc2cfvrdll6whyizxf500m8ds9bdlmqha"; depends=[circlize cli ComplexHeatmap dbscan dplyr fitdistrplus GenomicRanges ggplot2 gtools IRanges magrittr purrr rhdf5 rlang S4Vectors SingleCellExperiment SummarizedExperiment tibble tidyr umap viridisLite]; }; katex = derive2 { name="katex"; version="1.4.1"; sha256="18cziglz8qy1v9gfcjiixq2d3l3na5p51zrxpy3x8asjiddq13d3"; depends=[V8]; }; kayadata = derive2 { name="kayadata"; version="1.3.0"; sha256="1fq8yaiis38avmnklq2g17sz1aphplraqgw40q5zfs1kdvhr39gp"; depends=[dplyr forcats ggplot2 magrittr purrr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; - kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; kcpRS = derive2 { name="kcpRS"; version="1.1.0"; sha256="0ijhzzzqk3yxpdm4vb1h7igrpb3wli17kxbidx4kzjga54pbik41"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; kde1d = derive2 { name="kde1d"; version="1.0.5"; sha256="0s14dw0l6869a7zasda7hkdwqky6kbrxzbqhxvg1jy2a75mbgymm"; depends=[BH randtoolbox Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; @@ -11982,16 +11994,16 @@ in with self; { kelvin = derive2 { name="kelvin"; version="2.0-2"; sha256="0hjycqga3yjrzpgc911nk64nsjrpim4v7219f7iwi1snx0ydhqzf"; depends=[Bessel]; }; kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; }; kequate = derive2 { name="kequate"; version="1.6.4"; sha256="0zlc1n69908011zz5aydcl41apg6l0l3dvmsm3fgpnr1vm76g9y1"; depends=[equateIRT ltm mirt]; }; - kerSeg = derive2 { name="kerSeg"; version="1.0"; sha256="0f0v2yz93wm85kqgcxkb492n60n9j7xjnxkqpkrbgkdv5rh3b33k"; depends=[Rcpp]; }; - kerTests = derive2 { name="kerTests"; version="0.1.3"; sha256="0981q4n4wrv62x4b8jccj5hx58n975rls3sn3s0mz7ajhh1xxbi9"; depends=[]; }; - keras = derive2 { name="keras"; version="2.11.1"; sha256="0h3p8hscb8l440x2zg0lakk3zrcdq4lqy49vni2p6q5fpvaqfm8r"; depends=[generics glue magrittr R6 reticulate rlang tensorflow tfruns zeallot]; }; - kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.5"; sha256="0mnigff937mcy5saamx7r6rp8mghnghnlzv0hancnmccv7rhfnnj"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; + kerDAA = derive2 { name="kerDAA"; version="0.1.1"; sha256="0z27qkfasjian0wwn0q4400153ni5h0c6297j4b0qqjl3ylaqakb"; depends=[mvtnorm]; }; + kerSeg = derive2 { name="kerSeg"; version="1.1"; sha256="15j3l9zlyg0hax5ynj9pvf0h60yr1y7wcx5v5zvk64ssmdyw0cdc"; depends=[Rcpp]; }; + kerTests = derive2 { name="kerTests"; version="0.1.4"; sha256="135v5lcnvmlcabgqnlcba9q0wc51ajcklz04bknz3psaqv71bp71"; depends=[]; }; + keras = derive2 { name="keras"; version="2.13.0"; sha256="1xjmkrz06rh8767pfqi81fgkljkyb4i7bzllahw7b62b9s2wp38l"; depends=[generics glue magrittr R6 reticulate rlang tensorflow tfruns zeallot]; }; + kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.6"; sha256="0n72m527slplgxxp7i5i91cpzbzgrlwmfc8gj2hs3wv41jrr1xl6"; depends=[crayon data_table dplyr echarts4r magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; kergp = derive2 { name="kergp"; version="0.5.5"; sha256="0qkjjrjgny8jvklgbddx0n1fq2bwr434shdn7xzdp0krxxnh7h64"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; kerndwd = derive2 { name="kerndwd"; version="2.0.3"; sha256="0lvm007wzhyagyafmq47819hn66riwdcpymn56clc1sgch9i933m"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; - kernelPhil = derive2 { name="kernelPhil"; version="0.1"; sha256="0pzsknb0ibm3v0ibfaklb4g2mx7zrva4m29356cirwd29nmd8bqw"; depends=[benchmarkme directlabels dplyr ggplot2 gridExtra Hmisc pbapply reshape2 rgdal wordspace]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.10"; sha256="1fv00hbm4l5dxcw8hq2wlfxng49bc8k608ny70g3fy0grkh7r8vy"; depends=[future future_apply parallelly Rcpp]; }; - kernelshap = derive2 { name="kernelshap"; version="0.3.7"; sha256="123ngjs26062ips80iyg8kiwzdf7664im97a86mfmvndnkc0dvc7"; depends=[foreach]; }; + kernelshap = derive2 { name="kernelshap"; version="0.3.8"; sha256="0sbvgikq01275pab9zv13d65vf6fmnyssdrjvrdnbhp1xg2rscxf"; depends=[foreach]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-32"; sha256="1p3gbn9qgc6yqx9irkl8c23khvkx77jl96hk9hn4vsrx6i7g6kk5"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; @@ -12001,7 +12013,7 @@ in with self; { keyATM = derive2 { name="keyATM"; version="0.5.0"; sha256="1xrwdpv5jsak0ss45qlyifksg3bja6dcm00xdvg4rq55gax4885v"; depends=[cli dplyr fastmap fs future_apply ggplot2 ggrepel magrittr MASS Matrix matrixNormal pgdraw purrr quanteda Rcpp RcppEigen rlang stringr tibble tidyr tidyselect]; }; keyToEnglish = derive2 { name="keyToEnglish"; version="0.2.1"; sha256="1wzn93gp1v6y8qh9kypydqadnf6fc7xzjili77b7j402hvb0a8zg"; depends=[jsonlite openssl stringr]; }; keyholder = derive2 { name="keyholder"; version="0.1.7"; sha256="19xbzpanwyfxywzki3m5jvams40ppxkplm7p1jqm6d5rviidiq1j"; depends=[dplyr rlang tibble]; }; - keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; + keyperm = derive2 { name="keyperm"; version="0.1.1"; sha256="11jwh704iq134imv9p7brnjpvzbqyvd5bdw7id0ggnf7kp2w5rbj"; depends=[Rcpp slam tm]; }; keypress = derive2 { name="keypress"; version="1.3.0"; sha256="0y9zz4q2kmya85j1dr0a3874k65r57wcwqgsbsa0l0az6lyc4v0i"; depends=[]; }; keyring = derive2 { name="keyring"; version="1.3.1"; sha256="113rjhihqfhxdihnf6nwqbsknlnm8pqyhvnyxx624gyajl9mn3a7"; depends=[askpass assertthat filelock openssl R6 rappdirs sodium yaml]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; @@ -12013,14 +12025,14 @@ in with self; { kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgen = derive2 { name="kgen"; version="0.2.1"; sha256="02i3qki6qshq5sppn6mchfwyc6dbgchizylgkqj95jv63grja0wc"; depends=[checkmate data_table pbapply rappdirs reticulate rjson]; }; kgp = derive2 { name="kgp"; version="1.1.1"; sha256="021113hqs7ack852mksssaac1lj0k4mpf94yiws67qiygmsa693k"; depends=[]; }; - kgrams = derive2 { name="kgrams"; version="0.1.5"; sha256="01ig95sr6nnv52cbj0z8qjq49z0ywyhs9b5214hwgnqs81w1pcb9"; depends=[Rcpp RcppProgress Rdpack rlang]; }; + kgrams = derive2 { name="kgrams"; version="0.2.0"; sha256="09py3p85ffa03m3xjvwscz4w61k1yxkxqy96im06509bx51qha0q"; depends=[Rcpp RcppProgress Rdpack rlang]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; - khroma = derive2 { name="khroma"; version="1.10.0"; sha256="0kf9r21q7f21nwiw9mc6k2x5hnwayg0fiwydi4w8zjvzkwlskrj7"; depends=[]; }; + khroma = derive2 { name="khroma"; version="1.11.0"; sha256="1d957wdf8z7vki3q3ciicls121p422ywpsayki82r2b79zl8swkp"; depends=[]; }; kibior = derive2 { name="kibior"; version="0.1.1"; sha256="1acrdlqbklhhd69i1gija8r3nsdgcnfvk5ngz7b2ndy2f58w5ynf"; depends=[Biostrings data_table dplyr elastic jsonlite magrittr purrr R6 rio Rsamtools rtracklayer stringr tibble tidyr]; }; kidney_epi = derive2 { name="kidney.epi"; version="1.2.0"; sha256="1hd6w7kxim5slmmqalf5sfjg8jcvhyzn5g4gf6h0lmaprsfszhja"; depends=[]; }; kidsides = derive2 { name="kidsides"; version="0.5.0"; sha256="0iw6mr5yqgj4sn3bvirzcdzzxdxpkyr2ci4flzyjb60p0gfwlr7b"; depends=[DBI R_utils RSQLite]; }; - kim = derive2 { name="kim"; version="0.5.260"; sha256="0kx03mfksnn9jv65318f6ahnq5jwz2rsr3pjwm9fcxlvwvhq9vrn"; depends=[data_table remotes]; }; - kimfilter = derive2 { name="kimfilter"; version="1.0.1"; sha256="142nlf91gh6l81c0qgwjfya2mj5ral478hp2zy3i0j01flyj2l08"; depends=[Rcpp RcppArmadillo]; }; + kim = derive2 { name="kim"; version="0.5.421"; sha256="0liw4x3fv2cs2x6s2ydpmv7x9bbbcly08my376kidhf56510yr4v"; depends=[data_table remotes]; }; + kimfilter = derive2 { name="kimfilter"; version="1.0.2"; sha256="1c3m2qhld2mdlnzrvgdyfd126bzb25ya2z82y4w754qy3s5jkgdd"; depends=[Rcpp RcppArmadillo]; }; kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kindisperse = derive2 { name="kindisperse"; version="0.10.2"; sha256="0f2i2j1mwk6bwsc42xkkf18nyffp1983bbarwvscjj7saibhfpyj"; depends=[dplyr fitdistrplus ggplot2 ggrepel here LaplacesDemon magrittr plotly readr rlang shiny shinythemes stringr tibble tidyselect]; }; @@ -12030,7 +12042,7 @@ in with self; { kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; }; kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; }; kissmig = derive2 { name="kissmig"; version="1.0-4"; sha256="0qm9psbi42xv69y2095j6nk51w15x6gl71qjhmfk9jq0r9llfbax"; depends=[raster Rcpp]; }; - kit = derive2 { name="kit"; version="0.0.13"; sha256="0xrd2l3fxr2ipbi7l6vwxcxjbp898xqd9s4i2ndg0jawkw1ypnb5"; depends=[]; }; + kit = derive2 { name="kit"; version="0.0.15"; sha256="1gzsxf836awsqv1hqikxi5yyk2m1x87c354j28514mvi0wbywzjm"; depends=[]; }; kitagawa = derive2 { name="kitagawa"; version="3.1.0"; sha256="190xi88zc3vybpyawayh8m78sgcn951n3axmc2fc67sic458r02s"; depends=[Bessel kelvin psd]; }; kiwisR = derive2 { name="kiwisR"; version="0.2.0"; sha256="14fzf72swy221jcbiplss9dh7g03idrpbbyvbxp4bcqpxwr6hbsa"; depends=[dplyr httr jsonlite lubridate purrr tibble]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; @@ -12044,6 +12056,7 @@ in with self; { klsh = derive2 { name="klsh"; version="0.1.0"; sha256="1r354fd5da6mp7v3048ii09hnghhfwdg6pvmx2ib0cr88ql431sy"; depends=[blink plyr Rcpp SnowballC stringi]; }; klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; }; km_ci = derive2 { name="km.ci"; version="0.5-6"; sha256="18sc9vhbdgks8lhk2nfxkkayh8j4j227hl63fm5p04f7z4wm6wc1"; depends=[survival]; }; + kmBlock = derive2 { name="kmBlock"; version="0.1.2"; sha256="07y1gadn5givrx4ww9vzgcqdkchgd1ndjq65v6ssrbcxsx1lbgxl"; depends=[blockmodeling doParallel doRNG foreach Rcpp RcppArmadillo]; }; kmc = derive2 { name="kmc"; version="0.4-2"; sha256="0rnrwqsmxcmf4sjd9p2xz7w12lv58wmy2p349s0x4b34b5arf75d"; depends=[emplik Rcpp rootSolve]; }; kmed = derive2 { name="kmed"; version="0.4.2"; sha256="1pamwl28g6gc84x7sw9czqj8dpraq5pd3hdrf5m3yziwzkfxawnc"; depends=[ggplot2]; }; kmer = derive2 { name="kmer"; version="1.1.2"; sha256="0jimn9r0abglwxdl1zqz0lxa99cmj6haydkxjzqfbpx9by80wnww"; depends=[openssl phylogram Rcpp]; }; @@ -12053,7 +12066,7 @@ in with self; { kmodR = derive2 { name="kmodR"; version="0.2.0"; sha256="1khp383k5rr7nnn1fih7wfw6k202igxcj3ddwawyp895qa9w12cj"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.12"; sha256="1c7pl8jh61pv0brqanmyfy6s0ipxn312b2hjypcsjaph6b8mhj2q"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.43"; sha256="0g6m9s53qyf34ba4db97k31sxg2ikndfp747229sm6ilikmbla9x"; depends=[evaluate highr xfun yaml]; }; + knitr = derive2 { name="knitr"; version="1.44"; sha256="015ylljvx0q2himch4k813021nvh0l7p5x3aqdkj3w0ax8x8k3ki"; depends=[evaluate highr xfun yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; }; knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; knitrdata = derive2 { name="knitrdata"; version="0.6.1"; sha256="1am79r4rkrw7vjmyzc0cq4p52l2ypdw99rfhrvdsaq11yllx08mx"; depends=[knitr xfun]; }; @@ -12072,6 +12085,7 @@ in with self; { kokudosuuchi = derive2 { name="kokudosuuchi"; version="1.0.0"; sha256="0h4r7bd9989pahx34lc2i5h1f8nipir941l7sahhgz28lskfkc3h"; depends=[glue rlang sf stringr tibble]; }; komaletter = derive2 { name="komaletter"; version="0.5.0"; sha256="1wk1bhn699295pjj0ap6qkh11khdbx0nfxih74w1in53k4d3dajg"; depends=[rmarkdown]; }; konfound = derive2 { name="konfound"; version="0.4.0"; sha256="14d8a1ngrf24gbxfg8c8h4svjvsjc3gflcnzxza17xv2rcgzygnr"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tibble tidyr]; }; + konya = derive2 { name="konya"; version="0.1.0"; sha256="03r3m5jld0ykfys3hglh5rk1nnm7g4rwc4ai6r6qa342z36p4hrj"; depends=[dplyr jsonlite openxlsx readr rvest stringr]; }; kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; kosis = derive2 { name="kosis"; version="0.0.1"; sha256="0nxrv1a48smgp36zcny38yfcz5dkx1dic4zicqkpvm93vf7jqn5i"; depends=[data_table httr jsonlite tibble]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; @@ -12084,7 +12098,7 @@ in with self; { krippendorffsalpha = derive2 { name="krippendorffsalpha"; version="2.0"; sha256="0zzhpdmmaiaqrg1xi9jg6lzrhzpav8wyrc8z38rf8x6kxmr2bx3m"; depends=[]; }; krm = derive2 { name="krm"; version="2022.10-17"; sha256="142scj7cgg7sv0g17mivpgzk3h8jczf40h1padixfgx3204fj4xa"; depends=[kyotil]; }; kronos = derive2 { name="kronos"; version="1.0.0"; sha256="0iyq3n0mnzjxgfn0g4l8d7jpnl7lvand4j602prc1jljsylyxlpj"; depends=[ggplot2]; }; - ks = derive2 { name="ks"; version="1.14.0"; sha256="14a3pcxxcsfkqz5j6n2wlxkp0gsdp5mzdq7ipcjb65q2gdmwbf9d"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm plot3D pracma]; }; + ks = derive2 { name="ks"; version="1.14.1"; sha256="0vf7vqaq6bhi4rrggmd56wzxx40j846g66yxvvbnihqjyhxgahs5"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm plot3D pracma]; }; ksNN = derive2 { name="ksNN"; version="0.1.2"; sha256="06x471hck95xqy7rbh53ibhzh6kfjra7y9ipqdj2rqdkmfdj72q8"; depends=[Rcpp]; }; kselection = derive2 { name="kselection"; version="0.2.1"; sha256="03ax8b63fkq4sfsb9zvh2hk4g9nmd8wh5lla26wb7lan4s197dz6"; depends=[]; }; ksharp = derive2 { name="ksharp"; version="0.1.0.1"; sha256="1dnkj838y8c1b53mlljhjqs3nd864i9xcqsv9n4fw28b4br9m570"; depends=[]; }; @@ -12092,14 +12106,14 @@ in with self; { kssa = derive2 { name="kssa"; version="0.0.1"; sha256="1vrd7zlwigg7ipfq2pjnndp5mwkc0yglvrdiirv3kqm5lq0f14qa"; depends=[dplyr forecast ggplot2 imputeTS magrittr Metrics missMethods rlang zoo]; }; kst = derive2 { name="kst"; version="0.5-4"; sha256="0drh5zjin73jfa5vksprv43ak4s8jr4y4py6sbcc4835rkl9qzph"; depends=[proxy relations sets]; }; kstIO = derive2 { name="kstIO"; version="0.4-0"; sha256="1qv4mg9hi62imk6xsldqprm6aca33qkh13jjihmvddaam7xxcm1z"; depends=[kstMatrix MASS pks relations sets stringr]; }; - kstMatrix = derive2 { name="kstMatrix"; version="0.1-5"; sha256="0h4r46y56ql260dj8bkc81v23ngcjdhpqi7pnr4f6p46a1n1fdxn"; depends=[igraph]; }; + kstMatrix = derive2 { name="kstMatrix"; version="0.2-0"; sha256="1fwjvwnyb2ldpxrsv2bsgv4b8jqq04h58nxmxlkjcn9f7ih3q6db"; depends=[igraph pks sets]; }; ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; - ktsolve = derive2 { name="ktsolve"; version="1.3"; sha256="0brxqb60m1lyqhsmds1c3c6cmbcxlzk2nwvi0fhkc8ziwzlfmd09"; depends=[BB nleqslv]; }; - ktweedie = derive2 { name="ktweedie"; version="1.0.2"; sha256="1jvcm34bszdqzpbskazabd560ah218yr2yzbzcpbvdbdsvyy4gw5"; depends=[]; }; + ktsolve = derive2 { name="ktsolve"; version="1.3.1"; sha256="11ps4y7i8llb2v5d91zh9kmsnh6rxb4g6lwyzdalyixnzsy343m1"; depends=[BB nleqslv]; }; + ktweedie = derive2 { name="ktweedie"; version="1.0.3"; sha256="02agl1wc37wvsfn4lm59jn2jbc09ixh2g178x3s3li98z78ykv5z"; depends=[]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; - kutils = derive2 { name="kutils"; version="1.72"; sha256="0mnrh1bfpwssw9j5lspvwfawqx9s4fxy2gh3n60knjzbzrzqckp4"; depends=[foreign openxlsx plyr RUnit xtable]; }; + kutils = derive2 { name="kutils"; version="1.73"; sha256="0xqg1s48afpn2w0mlqfwz3sj1gdjf05cpxq4z9r01k1476lvh6c9"; depends=[foreign openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.4.2"; sha256="0lx7p2rgvcjgg99chcan0qb9hafx226sqvdb1g1xpkdwvzbyxci8"; depends=[Rcpp]; }; - kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; }; + kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[lattice]; }; kyotil = derive2 { name="kyotil"; version="2023.2-2"; sha256="0sx8nw67pwy4flb01d5bhbzvxpc63h2b49ss2qz2abg46f2nnd74"; depends=[]; }; kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; }; kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; @@ -12113,7 +12127,7 @@ in with self; { labdsv = derive2 { name="labdsv"; version="2.1-0"; sha256="1lawc8fm766p7z6kk0c3lda71i8lywg30znzyfkrx94sbr8r5nlr"; depends=[cluster MASS mgcv Rtsne]; }; label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; labelVector = derive2 { name="labelVector"; version="0.1.2"; sha256="06pqkgn852min2mqhjkia6qqdwkp8cz32lbxzp3a2b8bcggbijn4"; depends=[]; }; - labeling = derive2 { name="labeling"; version="0.4.2"; sha256="0rfikd9gy70b8qz87q9axcwv8nmn9mbxfdwypxi0sghpfs9df8p0"; depends=[]; }; + labeling = derive2 { name="labeling"; version="0.4.3"; sha256="1wk4wa1s8f17b5lf8vs5hxsmyadp2ccmyg4hamq7sdvlrk14yby6"; depends=[]; }; labelled = derive2 { name="labelled"; version="2.12.0"; sha256="1f6jh1mrbwb3v1kc49pb65sf5ffqs0h9vizpig4r5rhhv4n3q17y"; depends=[dplyr haven lifecycle rlang stringr tidyr vctrs]; }; labelmachine = derive2 { name="labelmachine"; version="1.0.0"; sha256="18l7argmf7d60cv34w7acjg4bk08nhi2cc5p61sx2zmq28v8nndr"; depends=[yaml]; }; lablaster = derive2 { name="lablaster"; version="1.0.1"; sha256="082gyfqaakl08d016p7sk1qapdkpry82sbxcsj46z50ls7sza3ab"; depends=[ggplot2 magrittr rlang scales smooth]; }; @@ -12129,26 +12143,27 @@ in with self; { laeken = derive2 { name="laeken"; version="0.5.2"; sha256="1p3ccbaydlr52p8qmgmm2l6kryvq6jjjx7mqn2vv0gpjaxqhyy92"; depends=[boot MASS]; }; lagged = derive2 { name="lagged"; version="0.3.2"; sha256="1ss69jdmfz2al131mvhflaa4hcg71a0balpnc8vkf0f9svhkcs52"; depends=[]; }; lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-1"; sha256="1v3a580scxb1v5na3ab3ax9qlzbnay7nhm3ln5l8f9zgsqrg5lyh"; depends=[Formula partykit spatialreg]; }; - lakemorpho = derive2 { name="lakemorpho"; version="1.2.0"; sha256="0fcmrl6yi1dd0i1r4kyp8bf4yw1nwdk6862sdakfwr2jd1rxhi9q"; depends=[cluster geosphere raster rgdal rgeos sp]; }; + lakemorpho = derive2 { name="lakemorpho"; version="1.3.2"; sha256="11bvrr4h9bxa01sf6qilgglhljmfpfil5yz1xrwlyaiv091gvlfp"; depends=[cluster geosphere raster sf sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; - lamW = derive2 { name="lamW"; version="2.2.0"; sha256="0xa05375swa49n579ljwscsgqfi7ivcfzc4smwfw8k1anym0pmg9"; depends=[Rcpp RcppParallel]; }; + lamW = derive2 { name="lamW"; version="2.2.1"; sha256="1lz8iv6r07lrc9bghdmq5y8bfmlr1hdk1j02ghvmz3d7s3d9p0hz"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; lambdaTS = derive2 { name="lambdaTS"; version="1.1"; sha256="0fb44q5997588y6cv10kq3jv3qvwhg99q15i4cka4hsww08i9ib2"; depends=[abind bizdays car fANCOVA ggplot2 imputeTS lubridate modeest narray purrr readr scales stringr tictoc torch]; }; - lambdr = derive2 { name="lambdr"; version="1.2.2"; sha256="0b1w84k24sy6lw454adc67r5q0sndkfqabsp1f0v8j7axvbzym3m"; depends=[httr jsonlite logger]; }; + lambdr = derive2 { name="lambdr"; version="1.2.4"; sha256="0fqprf5n5gc61zyj56lypgbh5hggxnldgkim1zj1h681fhkgimy5"; depends=[httr jsonlite logger]; }; + lamle = derive2 { name="lamle"; version="0.3.1"; sha256="08fsylhqpk8hqm9kbqc4vlhmpaddr9cpgjjxvlfc9xqhnyhg7p3d"; depends=[fastGHQuad mvtnorm numDeriv Rcpp RcppArmadillo]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; - landest = derive2 { name="landest"; version="1.1"; sha256="1gcjxn9g3zq37glb92xgv2r9w5yq6hwsmgfmv2ijr66lla0qxsf4"; depends=[survival]; }; + landest = derive2 { name="landest"; version="1.2"; sha256="1cr1qiz42j64yxpbpyll1l3lxazh1qq0ia4mh0qdyjk14kyyf9q0"; depends=[survival]; }; + landform = derive2 { name="landform"; version="0.2"; sha256="0i99glylj0nz3r5i0p22ng9aygmjkh7q2ynw02z7jm3bfpw0wmv0"; depends=[terra]; }; landmix = derive2 { name="landmix"; version="1.0"; sha256="0qa5l82102r8y7sj7v5vcpqg93j2bpszp7fhlbxrzjxpisdh9vgx"; depends=[]; }; - landpred = derive2 { name="landpred"; version="1.1"; sha256="074zzlwj1pml7v7y47z67j5sp3xvsngsf0asan613q1bpvc4yq49"; depends=[survival]; }; - landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; }; - landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; + landpred = derive2 { name="landpred"; version="1.2"; sha256="0xbmr896fyl2gvh6vy7fy7aixa5n2ycvwm509z6ys5wh0r8p296k"; depends=[survival]; }; + landsat = derive2 { name="landsat"; version="1.1.2"; sha256="13xjpw9hd1hhcs6d7xw9dc36808zjyqw3isn0ayafpww0wvv073n"; depends=[lmodel2 mgcv sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; - landscapemetrics = derive2 { name="landscapemetrics"; version="1.5.7"; sha256="1f9qp36dhkmz3cpymw18x31glcsdmjlz5dwrw8drb8ismxyhmzj7"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="2.0.0"; sha256="0c7h6s9xsqf9jgwlkh4bpzmdg2hrzs16jrdpzn45n849bsv86g7n"; depends=[cli ggplot2 Rcpp RcppArmadillo terra tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; landsepi = derive2 { name="landsepi"; version="1.3.0"; sha256="0amfpdfnsl81f7sdfazajnvym8dgvcnrjiizq9ckqf0f7gyfgbfs"; depends=[DBI deSolve doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; langevitour = derive2 { name="langevitour"; version="0.5"; sha256="0p7k159njgrfvw8adkzm6zma8b6ja2j9wwicrlywcqlbkwhbinbi"; depends=[assertthat htmlwidgets RANN]; }; languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; }; - languageserver = derive2 { name="languageserver"; version="0.3.15"; sha256="0061z1wcl0xn70lg56531x9ablwrf8076ik8786vprdfzcdbrvll"; depends=[callr collections fs jsonlite lintr R6 roxygen2 stringi styler xml2 xmlparsedata]; }; + languageserver = derive2 { name="languageserver"; version="0.3.16"; sha256="1rbjnw30fc58rk2qrhff3wx7in7spllr4kj8mfsfwvl43id54yb0"; depends=[callr collections fs jsonlite lintr R6 roxygen2 stringi styler xml2 xmlparsedata]; }; languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; }; lans2r = derive2 { name="lans2r"; version="1.2.0"; sha256="0hk7rklkic4frp5w6k9kn5xi8hf3s87bgbjm58ca79sh3iyl0cnv"; depends=[dplyr ggplot2 R_matlab reshape2 rlang tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; @@ -12157,9 +12172,9 @@ in with self; { lars = derive2 { name="lars"; version="1.3"; sha256="17al1g0pvfz9frs2kxicqr8dyp7ciz3x87yx2l4lqd53ls6nm7n6"; depends=[]; }; lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1.1"; sha256="1hc05irjwcw54hdrdbwsxfr5b0qq7dysvybzm04jyixqs5b2m8wx"; depends=[]; }; + latcontrol = derive2 { name="latcontrol"; version="0.1.0"; sha256="0y5amp5w8faw69lsi55akqfzgr8bwacvyi0whkxz2ik9dlxcwv3b"; depends=[lavaan]; }; latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; }; latenetwork = derive2 { name="latenetwork"; version="1.0.1"; sha256="0isqjsivywv51h1lf4fwvscib8sfgnpvvdq6gj9zzz7nrjpgf7k1"; depends=[igraph statip]; }; - latentFactoR = derive2 { name="latentFactoR"; version="0.0.4"; sha256="0kgzgympcfp6l4jysccrlxrbmqasz1v95wkmfsw8qgi7dzfsgywc"; depends=[BBmisc EGAnet fspe googledrive ineq Matrix mlr mvtnorm psych qgraph rstudioapi xgboost]; }; latentcor = derive2 { name="latentcor"; version="2.0.1"; sha256="0c8ygjdqxb9zs6b42ncqh5va80vxamdphja18x8dazygynmcgjr0"; depends=[doFuture doRNG fMultivar foreach future geometry ggplot2 heatmaply MASS Matrix microbenchmark mnormt pcaPP plotly]; }; latentgraph = derive2 { name="latentgraph"; version="1.1"; sha256="11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr"; depends=[glmnet MASS pracma Rcpp RcppArmadillo]; }; latentnet = derive2 { name="latentnet"; version="2.10.6"; sha256="0zkh75cvsiprxfbrzyqi72wvsljxzsifcd71kyrr2m761v3sqm16"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; @@ -12169,21 +12184,20 @@ in with self; { latexpdf = derive2 { name="latexpdf"; version="0.1.7"; sha256="0n0hzr9jkg13kn56jcghcg4a6y8x0c3jffcvxv621azd9ldljgfl"; depends=[]; }; latrend = derive2 { name="latrend"; version="1.5.1"; sha256="1a6dkxkrslbl99nyhwivh0wmr8axr8iqgy7cax952bzv38s30038"; depends=[assertthat data_table foreach magrittr matrixStats R_utils Rdpack rlang rmarkdown]; }; latte = derive2 { name="latte"; version="0.2.1"; sha256="1dcwxxj3yran5a3a8vvdfmx4ap69ql2jncxvmci4p4vcw4ki9j9g"; depends=[dplyr ggplot2 glue magrittr memoise mpoly stringr usethis]; }; - lattice = derive2 { name="lattice"; version="0.21-8"; sha256="0af3c0mk0s3gnpmg7xmd4hjjynwv4ym3iv4grjvcmrk28abxdlwa"; depends=[]; }; + lattice = derive2 { name="lattice"; version="0.22-4"; sha256="1w5jgxpx9bkmj7s669aiwf8a1lc5vjqxkhb54a3yxxy1gnda7fjh"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.2.6"; sha256="0l9ypdpy09nnmanj2gvaxzj79s8d9iqwy6rv0rig5fwbqv1y6135"; depends=[sf sp spam spatialreg spatstat spatstat_geom spdep splancs]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-30"; sha256="1vcy4xr6c53nbvnxikjnlf5kd3n5hf4d8dzj5d41hj322dlsfl65"; depends=[interp jpeg lattice MASS png RColorBrewer]; }; lava = derive2 { name="lava"; version="1.7.2.1"; sha256="0bpg75w0ri1mkf7cw9gbw1fjpy4mh9h48k019y772xjfgrf1yayl"; depends=[future_apply numDeriv progressr SQUAREM survival]; }; lavaSearch2 = derive2 { name="lavaSearch2"; version="2.0.1"; sha256="04rd1r4qy1jiqmmda3h1gbihsyva88djq1apfil89v4lqr0za0b8"; depends=[abind doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.6-16"; sha256="150asz3k42ql6k2faldbbzvhnlq5zy94syznc451ns52jdrr5vqx"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; - lavaanExtra = derive2 { name="lavaanExtra"; version="0.1.7"; sha256="1fd2l3zgvnzym1lwb9y744cv1iib7f2rzq62gsr7q8zziih5pk8s"; depends=[insight lavaan]; }; + lavaanExtra = derive2 { name="lavaanExtra"; version="0.2.0"; sha256="0q443wx983vy2i4bn39psw2nwaqzjncdpm7lpwsj7bifjnsic5sb"; depends=[insight lavaan]; }; lavaanPlot = derive2 { name="lavaanPlot"; version="0.6.2"; sha256="03icyydr6sv4jkdfdjchsdrscr9lz9q74x5q17cx2iw3383j6lz5"; depends=[DiagrammeR lavaan magrittr stringr]; }; - lavacreg = derive2 { name="lavacreg"; version="0.1-2"; sha256="15108y1bxlimcc57c4655wgll23s9dk8zj3j2sqg7rnn3i9kbjc6"; depends=[fastGHQuad pracma Rcpp SparseGrid]; }; + lavacreg = derive2 { name="lavacreg"; version="0.2-0"; sha256="0wxf1kyga1xx9f3cys3gl9h50fivwjp44jdr4n93wmpnm9rcaljf"; depends=[fastGHQuad pracma Rcpp RcppArmadillo SparseGrid]; }; lawstat = derive2 { name="lawstat"; version="3.6"; sha256="1bmv3aw4z07ypsb1z65kwdybg6c268vdy46q9nri8xsmrby3fw8b"; depends=[Kendall mvtnorm Rdpack]; }; - lax = derive2 { name="lax"; version="1.2.0"; sha256="0v05088a3hfmb2m6mzc6m7nibiq4qs5j052pnigyqkadf8mcyvjq"; depends=[chandwich numDeriv revdbayes sandwich]; }; + lax = derive2 { name="lax"; version="1.2.1"; sha256="1wlmxkgckc2sqcxxknsmpzb0d3fgc5zb97b2vksyjinz5y2vjc3a"; depends=[chandwich exdex numDeriv revdbayes sandwich]; }; lazy = derive2 { name="lazy"; version="1.2-18"; sha256="02phj1l92dh5qmcl9i8scxgj4v21knbfrwwixq74bgyzwb51ni4r"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; - lazyNumbers = derive2 { name="lazyNumbers"; version="1.2.1"; sha256="0dc0j79cv7j3y04mpb2pp3qrjwhiv74rypl9yplwyr36z6fgl00l"; depends=[BH Rcpp RcppCGAL RcppEigen]; }; lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; }; lazyarray = derive2 { name="lazyarray"; version="1.1.0"; sha256="1bj1a8ab2479cl3d15h9f1fr1hh5d1p3sxpq8y84yzw0rrsxcldd"; depends=[fstcore R6 Rcpp yaml]; }; lazybar = derive2 { name="lazybar"; version="0.1.0"; sha256="1hv9ciznbxv7xnaijfjqisq3lx8nd4vkdkj9clxpdsspi3inlf53"; depends=[R6]; }; @@ -12191,17 +12205,17 @@ in with self; { lazysf = derive2 { name="lazysf"; version="0.1.0"; sha256="19g0qzm0dxsa8m4dj4zmz8r674dw43pqs5gg6n3xfgm5dl9772jb"; depends=[DBI dbplyr dplyr magrittr sf tibble]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; lazytrade = derive2 { name="lazytrade"; version="0.5.3"; sha256="055wyaf36f5g27wly24i0sbf2k0rriga8xcgn241gszlzagrnh55"; depends=[cluster dplyr ggplot2 h2o lifecycle lubridate openssl readr ReinforcementLearning stringr tibble]; }; - lba = derive2 { name="lba"; version="2.4.51"; sha256="1ln3la75rafr1a8l9dfhl05v3yvrvj1y92lzcqs5b55cb5hqbi71"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; + lba = derive2 { name="lba"; version="2.4.52"; sha256="04w275da78naxz1imbw78kpd0rns4ipmjgfs4f23h1q8zp5711fw"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1.2"; sha256="04fx9v1dn8rn09h98zxp71zcxidjmhmcv190h7mvbj3pqf3dh2bv"; depends=[Rcpp]; }; lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbm = derive2 { name="lbm"; version="0.9.0.2"; sha256="0mn0k5liwrnbsl5lf4k5b8j2y79bkk689v8wrvcmj3l7q2abaxhf"; depends=[]; }; lboxcox = derive2 { name="lboxcox"; version="1.1"; sha256="1b12zm085mshfqg2pwj0w9k6ngasdjbbw8wkhc3vyw9d2gmn5qp1"; depends=[doParallel foreach MASS maxLik survey]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; - lcars = derive2 { name="lcars"; version="0.3.7"; sha256="1hjlcl57aazcm5hgjiwmi116rk13z2gr65mpgcvyc0p9xih8bvdf"; depends=[ggplot2 shiny trekcolors]; }; + lcars = derive2 { name="lcars"; version="0.3.8"; sha256="0c68f9l69brdjpiabpjwpfjll7hmgfn3mi6zrjpgzc8jvvlfxi44"; depends=[ggplot2 shiny trekcolors]; }; lcc = derive2 { name="lcc"; version="1.1.4"; sha256="16iaja9dgnm6rjsaliz574mds1rgz07rk0r5dgwp2mc7kx0lhvgz"; depends=[doRNG doSNOW foreach ggplot2 hnp nlme]; }; lcda = derive2 { name="lcda"; version="0.3.1"; sha256="0zd0692qspya0ynh5722pbn9mpyf48474pm10dzg4qhl3k4rmmsh"; depends=[poLCA]; }; lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; }; - lcmm = derive2 { name="lcmm"; version="2.0.2"; sha256="0jyg8i3df6nj9nkim3va8marg4224zjx55lj3iw7ypbs4hgp8v09"; depends=[marqLevAlg mvtnorm nlme randtoolbox survival]; }; + lcmm = derive2 { name="lcmm"; version="2.1.0"; sha256="159hdi4800b7r25fqx2b4rlr4n7837f75hpmfp1qx85wyl5198nd"; depends=[doParallel marqLevAlg mvtnorm nlme numDeriv randtoolbox survival]; }; lconnect = derive2 { name="lconnect"; version="0.1.1"; sha256="1lx0z72aiy2hbh0wxn3ni3dyr3s2v8xirkvszlxvgfzkfmjx05j5"; depends=[igraph sf]; }; lcopula = derive2 { name="lcopula"; version="1.0.6"; sha256="03qf9skls0h2z88ykm863m0w394n24rkxgg0qdjzxyizhv2arf3l"; depends=[copula Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.1"; sha256="0pqmizli5rhyaxvxrjycf8d5kqrm23i3vdz00r8zmijjpiz2p9s2"; depends=[Matrix numDeriv plyr]; }; @@ -12212,7 +12226,6 @@ in with self; { lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; ldaPrototype = derive2 { name="ldaPrototype"; version="0.3.1"; sha256="1gnwss71488837ry9zhri7yv68hhnrckrn8qb1b8sszvsch5apan"; depends=[batchtools checkmate colorspace data_table dendextend fs future lda parallelMap progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.2"; sha256="1nzl9pf223z2nwpaw5721qw8p1va70avpjwj1myv9q054zaspmgb"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples RUnit]; }; - ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="2.0.1"; sha256="07da04z2xsbx8m3j14n8vpfvxps7val8slx3z3m1izwyc5mda8qs"; depends=[]; }; @@ -12220,23 +12233,21 @@ in with self; { ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; ldsep = derive2 { name="ldsep"; version="2.1.5"; sha256="1abjb4ybxqipq5383r82ngy19p84331sfpi817wv7jsv6q99igrb"; depends=[abind ashr corrplot doParallel foreach lpSolve matrixStats modeest Rcpp RcppArmadillo]; }; ldsr = derive2 { name="ldsr"; version="0.0.2"; sha256="0wmxpglad1mk2c1gi9kxmh149r8ad0l8i2xlfs1hdjb6a4wxsklr"; depends=[data_table foreach MASS Rcpp RcppArmadillo]; }; - ldt = derive2 { name="ldt"; version="0.3.2.1"; sha256="1mp68m72r3158nx4x39h9d2zszv5jkq0kgdzr5gnwmpwqm3jvd0d"; depends=[BH Rcpp tdata]; }; + ldt = derive2 { name="ldt"; version="0.4.2"; sha256="00zm1i73d9ivpgf1h7mr45dpbn3ks5lrixa3h07k94767iaini6c"; depends=[BH MASS Rcpp Rdpack tdata]; }; leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.5"; sha256="1alm7ar71l0ylasy0f14mdnla5vfcm604nhmk227pwcgivl588mf"; depends=[]; }; leafR = derive2 { name="leafR"; version="0.3.5"; sha256="02kimgffynf7nx164g1vw30wcv2plr7a5gf27q4x87c9c8b0cb1b"; depends=[data_table lidR raster sp]; }; leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; }; leafdown = derive2 { name="leafdown"; version="1.2.0"; sha256="0gpb37yjsjirglndld84bky83yyhy16qfk1wawkfpjv8j9pdfnqf"; depends=[checkmate leaflet magrittr R6 shiny shinyjs]; }; - leafem = derive2 { name="leafem"; version="0.2.0"; sha256="13dsgnq90n80y3fz5xgy8sm3jbgzv3zkxxy4y902j0gnxarpiswp"; depends=[base64enc geojsonsf htmltools htmlwidgets leaflet png raster sf]; }; + leafem = derive2 { name="leafem"; version="0.2.3"; sha256="1qvmygxm5957k7mnbi05vs3sjcwng9f18hbxx6143nl38fm5pzfy"; depends=[base64enc geojsonsf htmltools htmlwidgets leaflet png raster sf]; }; leafgl = derive2 { name="leafgl"; version="0.1.1"; sha256="042jps6zh4xr0xj19a7fbgrcb6q6gsw2q5f191lyskr8iajdrz1h"; depends=[geojsonsf htmltools jsonify leaflet sf]; }; - leaflegend = derive2 { name="leaflegend"; version="1.1.0"; sha256="0jiv3cdkcil1krfzmyp0xa8j4c8vnwrd7vnrzsaqg9mkhcijvll7"; depends=[base64enc htmltools htmlwidgets leaflet]; }; - leaflet = derive2 { name="leaflet"; version="2.1.2"; sha256="0fa0f9fcrxbqhmcm45l0byws56d8gg0bi3vx4m65mn4rihg6gn16"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; + leaflegend = derive2 { name="leaflegend"; version="1.1.1"; sha256="1bh1b9gfh3fhnj648wqbs3a9k967fynznpqb65qgpjsjjjc67x5c"; depends=[base64enc htmltools htmlwidgets leaflet]; }; + leaflet = derive2 { name="leaflet"; version="2.2.0"; sha256="0k0zplbhmvld6q1id17s827z1230kvnz16c4hlvp6jn9g26yy0dq"; depends=[crosstalk htmltools htmlwidgets jquerylib leaflet_providers magrittr png raster RColorBrewer scales sp viridis xfun]; }; leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; }; leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; }; - leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.2.1"; sha256="1jh2vpygx4fnj7s0p5hn1wgpddwffvrsfhv7l5lg4cvaf8xzwvn3"; depends=[htmltools leaflet magrittr]; }; + leaflet_extras2 = derive2 { name="leaflet.extras2"; version="1.2.2"; sha256="0r17wj2qg85y6wcszmbq6nf49k5ddsfprqdscqg2bwdszxrvw2c9"; depends=[htmltools leaflet magrittr]; }; leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.6.2"; sha256="0pmgr9c3z5zdm13kb17ldjdl3i792mv20gbxzn1asfyf7csp7jxi"; depends=[htmltools leaflet]; }; - leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; }; - leaflet_providers = derive2 { name="leaflet.providers"; version="1.9.0"; sha256="0yynrwv4xd5cdh49cwvfxm4ranarah9iiry2cd3b4fiihdfcg3wy"; depends=[]; }; - leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; }; + leaflet_providers = derive2 { name="leaflet.providers"; version="2.0.0"; sha256="0rl69bfx2l10x80rl8cppqch3fnd05sk9w29h8589jc8h3ffmkn5"; depends=[htmltools]; }; leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; }; leafpop = derive2 { name="leafpop"; version="0.1.0"; sha256="1ccxglglfxbm9rlz1lx0jrp6h38w6gld3rld0cxdjjnvw636hm3f"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; }; leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; }; @@ -12248,19 +12259,17 @@ in with self; { learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; }; learningtower = derive2 { name="learningtower"; version="1.0.1"; sha256="041hx9a1jq5aw6gbgb1xj8pl9dhc3kb85cx670nkc3ngaj4j2g17"; depends=[dplyr tibble]; }; - learnr = derive2 { name="learnr"; version="0.11.4"; sha256="1m2m2sm8yx2b64y7xqlzx7v1bf8x8sci0miaka6frpd6rn4bsr7f"; depends=[checkmate digest ellipsis evaluate htmltools htmlwidgets jsonlite knitr lifecycle markdown promises rappdirs renv rlang rmarkdown rprojroot shiny withr]; }; + learnr = derive2 { name="learnr"; version="0.11.5"; sha256="01xig6ijsjnkwdjh03zdp86mqm5pjlqp9br34pn644rf98qg8k2y"; depends=[checkmate digest ellipsis evaluate htmltools htmlwidgets jsonlite knitr lifecycle markdown promises rappdirs renv rlang rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="1.0.2-1"; sha256="1m642zwbn10p355s8rhdrh61q9n85mh8xj4jhvramii2f09bzyhn"; depends=[]; }; - leastcostpath = derive2 { name="leastcostpath"; version="1.8.7"; sha256="0ivj15g3npwm0wpz6xaa8dj1am9diyvhyhnki8a3qfwsa7qv2n53"; depends=[gdistance gstat Matrix pbapply raster rgdal rgeos sp]; }; + leastcostpath = derive2 { name="leastcostpath"; version="2.0.12"; sha256="0nkahghj9vvhcsq8h39y8kvcpgglwhnb0wcdhvkqzwnsparl58kd"; depends=[doParallel foreach gstat igraph Matrix sf terra]; }; ledger = derive2 { name="ledger"; version="2.0.9"; sha256="0ynr1g7vfkabl78zjnshyxixk45g28bi9h1p4zjfl83009yhqjwx"; depends=[dplyr rlang stringr tibble tidyr tidyselect]; }; leem = derive2 { name="leem"; version="0.1.0"; sha256="1sm9v3m95fbg3apvv3jjf47qxn8v6ipdsm1103dqk4zngmsz4xia"; depends=[tkrplot]; }; - leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; - lefko3 = derive2 { name="lefko3"; version="6.1.0"; sha256="1skcdx9px79nsbgsicfmqp0jabwadvq99binxc7sd43abblsbjjb"; depends=[BH glmmTMB lme4 MASS Matrix MuMIn pscl Rcpp RcppArmadillo VGAM]; }; + lefko3 = derive2 { name="lefko3"; version="6.1.1"; sha256="1mjrhs1nr6r7ribnzlpw4klk4zvx7x4dml07mkndw4vs9ybx5jn1"; depends=[BH glmmTMB lme4 MASS Matrix MuMIn pscl Rcpp RcppArmadillo VGAM]; }; legion = derive2 { name="legion"; version="0.1.2"; sha256="0463a743n6k21v6nyacmp2li9dngaaww9lh83150621s7pdycw3s"; depends=[generics greybox nloptr Rcpp RcppArmadillo smooth zoo]; }; legislatoR = derive2 { name="legislatoR"; version="1.1.0"; sha256="12ij2xqasc4j7gx79wzbdg3wvg8dn9azj0qj61s4c6ficyr0x0bv"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.3.1"; sha256="0ds9c2x0x590yk7mrjm4hh7k72p51slssg7jlprd71mw6hry91ma"; depends=[]; }; - lehdr = derive2 { name="lehdr"; version="1.1.1"; sha256="0sal2qh2rcl4mkdh9a9zy6ixxb99gax04ldawrp091kzwscng9yz"; depends=[dplyr glue httr rappdirs readr rlang stringr]; }; leiden = derive2 { name="leiden"; version="0.4.3"; sha256="0f09k3mhb0di2cz1q95y6qd3rqh7xdybn0dpnd4ifqhfhr5lnika"; depends=[igraph Matrix reticulate]; }; - leidenAlg = derive2 { name="leidenAlg"; version="1.1.0"; sha256="1hn5fps5m5am4s82wvhr4fgfw49h0jar4i687czbkab3l9x1dr68"; depends=[igraph Matrix Rcpp RcppArmadillo RcppEigen sccore]; }; + leidenAlg = derive2 { name="leidenAlg"; version="1.1.2"; sha256="0wqay0rf28pgaf88bsvmrwgggzbma93rv9nqbydhjf1lc96ay1lz"; depends=[igraph Matrix Rcpp RcppArmadillo RcppEigen sccore]; }; leidenbase = derive2 { name="leidenbase"; version="0.1.25"; sha256="1lym6rq6kkd693x77j7a364s1q8p9b2dw8qpxjq2cagvjwsv7bly"; depends=[igraph]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemna = derive2 { name="lemna"; version="1.0.1"; sha256="13ldgkzd1ggmqzipic9lw14zxq57zdzh1s83ih2mfib1n8f0pwg2"; depends=[deSolve ggplot2 gridExtra]; }; @@ -12269,7 +12278,7 @@ in with self; { lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; leontief = derive2 { name="leontief"; version="0.2"; sha256="1gy23047c6gci9m83yrb662d5685x1kky6m94w68swms59gdc6yp"; depends=[Rcpp RcppArmadillo]; }; leprechaun = derive2 { name="leprechaun"; version="1.0.0"; sha256="1y30s519502bqabzsf1njf3zzqlbmr4sbmsm57ci1r6dv4miijkh"; depends=[cli fs jsonlite roxygen2 usethis]; }; - leptokurticMixture = derive2 { name="leptokurticMixture"; version="1.0"; sha256="12b6k91ksm0ilfdgglmcag7hqqlg01my43s4p7nkaz34pc2s5lrf"; depends=[]; }; + leptokurticMixture = derive2 { name="leptokurticMixture"; version="1.1"; sha256="0k107im942mi6kkd8sx7qj6h8hfa3gv3bnjz5jl34a98kj91hk49"; depends=[]; }; leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; less = derive2 { name="less"; version="0.1.0"; sha256="1pgixa04rjngfg0yhxyg4qhd6g0pj8zyb3q8mfa3fjxzpywdy70a"; depends=[caret e1071 FNN MLmetrics pracma R6 randomForest RANN rpart wordspace]; }; @@ -12277,7 +12286,8 @@ in with self; { lessSEM = derive2 { name="lessSEM"; version="1.5.2"; sha256="0hnhr87pb8iia144br84sslbp2jp97iad9702wpv7430qfx740l0"; depends=[ggplot2 lavaan mvtnorm numDeriv Rcpp RcppArmadillo RcppParallel rlang stringr tidyr]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; - levitate = derive2 { name="levitate"; version="0.1.0"; sha256="1v55fdsf4ss5wb2zr7wppbr7dab6k5z7igpd8i5nk9fk1haq3aa1"; depends=[cli glue rlang stringdist stringr]; }; + lettervalue = derive2 { name="lettervalue"; version="0.2.1"; sha256="1jqzh718xzhjb88nzxzjx2y501g1srs26xqah1byksz2aj4sn3g5"; depends=[glue purrr tibble]; }; + levitate = derive2 { name="levitate"; version="0.2.0"; sha256="1mrpgq5505qs31vw2wif1cz4iqbqnj6mvfk60i5sg6p9nnn328wr"; depends=[rlang stringdist]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; }; lexicon = derive2 { name="lexicon"; version="1.2.1"; sha256="0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c"; depends=[data_table syuzhet]; }; lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; }; @@ -12290,9 +12300,9 @@ in with self; { lfstat = derive2 { name="lfstat"; version="0.9.12"; sha256="0hl5b78llydcphbrg04fi5b4v7p6xxwlcwpl70m2537gra52wvdr"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr scales xts zoo]; }; lg = derive2 { name="lg"; version="0.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; - lgcp = derive2 { name="lgcp"; version="1.8-2"; sha256="0q7w95gpvdzlli60dgpixl0rn05f4707xwyw215dsrc1z8znyk73"; depends=[fields iterators maptools Matrix ncdf4 raster rgeos rpanel sp spatstat_explore spatstat_geom spatstat_utils]; }; + lgcp = derive2 { name="lgcp"; version="2.0"; sha256="0f7s53sypj5l6ry437albypf1j2g3vxh137vfjfx3n84r0bmp5mw"; depends=[fields iterators Matrix ncdf4 raster rpanel sf sp spatstat_explore spatstat_geom spatstat_utils]; }; lglasso = derive2 { name="lglasso"; version="0.1.0"; sha256="0qkmlr7gfbw9m403676p4ip4hn2v2ll1jcwj5vhshcyb5whsr866"; depends=[glasso]; }; - lgpr = derive2 { name="lgpr"; version="1.2.3"; sha256="1wzjkc4k3ly6j9jfsr71qm2j0frf0n67ndlaibf3f6yfwv535qmq"; depends=[bayesplot BH ggplot2 gridExtra MASS Rcpp RcppEigen RcppParallel RCurl rstan rstantools StanHeaders]; }; + lgpr = derive2 { name="lgpr"; version="1.2.4"; sha256="1xhkkykig3d2adh7nhvsjg75fxk8h9jdqdsadc9fwbdda354xvg7"; depends=[bayesplot BH ggplot2 gridExtra MASS Rcpp RcppEigen RcppParallel RCurl rstan rstantools StanHeaders]; }; lgr = derive2 { name="lgr"; version="0.4.4"; sha256="09x1vw6cnc1c0p0ylcz1q1vcxyaf1kljhh7ni3gl5jm19zii2h4c"; depends=[R6]; }; lgrExtra = derive2 { name="lgrExtra"; version="0.0.8"; sha256="19qg67mjq0n5zbrcfhjhxfwl1jlq11iblhczl3m22n2nplpi70q8"; depends=[data_table lgr R6]; }; lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; @@ -12301,34 +12311,34 @@ in with self; { lhs = derive2 { name="lhs"; version="1.1.6"; sha256="0gyjdic714pqvq2jv1v0vh7hl9s83sg2zxx2gdkp38z6xx2cwzz3"; depends=[Rcpp]; }; liayson = derive2 { name="liayson"; version="1.0.5"; sha256="1h3xyy40zvmllqlskgnmm755m0xds66hgpgk48zc9i2i3qj6165j"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; libbib = derive2 { name="libbib"; version="1.6.4"; sha256="1jcdsvg5xgc7yzdc00k2brsiviyzflsdgiyk77icw08bwlbxh9mk"; depends=[curl data_table pbapply stringr xml2]; }; - libcoin = derive2 { name="libcoin"; version="1.0-9"; sha256="1syrcdj5qg5m3zd3dlxgpfklswbalfg42w058dr09hnzqsvx0z9d"; depends=[mvtnorm]; }; + libcoin = derive2 { name="libcoin"; version="1.0-10"; sha256="1bvysrq2s3951vr5ab1jzbz4hyx5j04yzh04vxdpd287bm4y08rh"; depends=[mvtnorm]; }; libgeos = derive2 { name="libgeos"; version="3.11.1-1"; sha256="07zwnwmz5cvg858ykx6pwxd044ivmsvb5g8rrbi1y3qpmkrby0qp"; depends=[]; }; libr = derive2 { name="libr"; version="1.2.8"; sha256="0kqjr327hck9p763wzzvh5skimn4larblfyhfqqyc2323z2g5d11"; depends=[common crayon data_table dplyr haven openxlsx Rcpp readr readxl tibble]; }; librarian = derive2 { name="librarian"; version="1.8.1"; sha256="0bbgx9pdwcv64p6zdrw3m0893ar4bw6z90vhbgplp53l65cch548"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; - lidR = derive2 { name="lidR"; version="4.0.3"; sha256="13b7bf4dnhmq9p2ba6c5wfz27ac37sa4nzzmqc30v8z95a1kwfvr"; depends=[BH classInt data_table glue lazyeval raster Rcpp RcppArmadillo rgl rlas sf sp stars terra]; }; + libstable4u = derive2 { name="libstable4u"; version="1.0.3"; sha256="1qhq255s20h30wrbfwdda35gjiijs9vri49jq2cnhl2kwmcgg71b"; depends=[Rcpp RcppGSL]; }; + lidR = derive2 { name="lidR"; version="4.0.4"; sha256="0zd5ygnv6ikgkvipyg1s7g0qf79fx58hwr7gs9lz6c7g71awm04k"; depends=[BH classInt data_table glue lazyeval raster Rcpp RcppArmadillo rgl rlas sf sp stars terra]; }; lidaRtRee = derive2 { name="lidaRtRee"; version="4.0.5"; sha256="1a3c0lmmg3my5rwaq30gcg3jhrd1dndlsa49dgav3gv9l214ri3w"; depends=[car gvlma imager leaps lidR reldist sf terra]; }; lifeR = derive2 { name="lifeR"; version="0.9.7"; sha256="1jhywwb8h2s0wbn14p6516p2bg3b8pbjw30vqz63dmbr51y6wriz"; depends=[curl dplyr ggmap ggplot2 jsonlite knitr readr rmarkdown stringr]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.11"; sha256="1wz0v7abl3g3kgbp613rx5rw2ryxahk1h8bk8d3p5v7wyfwqignh"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifecycle = derive2 { name="lifecycle"; version="1.0.3"; sha256="1hk9mblhap429fk77qpgc4hv0j91q5wpahi0y76w118m471zsnb4"; depends=[cli glue rlang]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; - lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; - liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; }; + liftLRD = derive2 { name="liftLRD"; version="1.0-9"; sha256="11xrh4pjvlqb0297a2wzngpa1m3b09axvcfd16hg393rifrisgh4"; depends=[adlift nlt]; }; liftr = derive2 { name="liftr"; version="0.9.2"; sha256="0azi831c4f0vcq27a3q86vj90zvwrzcy4plhj9hqkk4qz8xw113x"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; lifx = derive2 { name="lifx"; version="0.2.0"; sha256="0p9ljd3s3lc1rkhzpp801izy9y52f0yc1dsrsxwx5gi89cnib596"; depends=[assertthat crayon curl httr jsonlite]; }; liger = derive2 { name="liger"; version="2.0.1"; sha256="121ipwznm40x2xhhlxd20385va4nmvgni5dg24lbhyfn5sb3dsy1"; depends=[matrixStats Rcpp RcppArmadillo]; }; lightgbm = derive2 { name="lightgbm"; version="3.3.5"; sha256="1bnzggia48jkd1ffdzhznmbk76dw3mab65i7rmg967zcflapv7rh"; depends=[data_table jsonlite Matrix R6]; }; lightr = derive2 { name="lightr"; version="1.7.0"; sha256="0jqkd5nwnlbifl65i08fflla522y5vp8s39sqx9kl2pidn6z9rp6"; depends=[future_apply progressr xml2]; }; - lightsout = derive2 { name="lightsout"; version="0.3.1"; sha256="1rb5qrd8piq079yfmn07np36zgawhw7s4wyy7q00yz4m4wp74lip"; depends=[magrittr shiny shinyjs]; }; + lightsout = derive2 { name="lightsout"; version="0.3.2"; sha256="0wkpg4yvn2br0r1vb23vl4ayhg4m8zph57p67wf3a4c0xqga3kvr"; depends=[magrittr shiny shinyjs]; }; likelihood = derive2 { name="likelihood"; version="1.9"; sha256="0w9p2vzrcln6a35b8pmlli01vq67vdbp4cnc9hb256syldsj7pp4"; depends=[nlme]; }; likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.51"; sha256="0qxwdf6npyj926zd2pbfscgz1z01hwgm6099h882d2l1sim2j9g7"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; - likelihoodR = derive2 { name="likelihoodR"; version="1.1.1"; sha256="0m85jks9ymaly79nk453fc2bs85c6ihn9bbwkmi0q6k9s9p6j4kh"; depends=[lme4]; }; + likelihoodR = derive2 { name="likelihoodR"; version="1.1.4"; sha256="0ixgqan4606bfsgvnsg2h0kvq112518gjw784w0mif2z5xxkj7x5"; depends=[lme4]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; lilikoi = derive2 { name="lilikoi"; version="2.1.1"; sha256="14bz7a1wcgr5fsf6mpsibxa7ks302a1lwnjdjzwh72z490fz8gaw"; depends=[car caret dplyr gbm ggplot2 glmnet h2o impute infotheo limma M3C Metrics MLmetrics pathview plyr preprocessCore princurve pROC RCy3 reshape reticulate RWeka scales stringr survival survminer]; }; lillies = derive2 { name="lillies"; version="0.2.12"; sha256="1ys1fzi9azj0nxvf8byy30zbcf7p90p18842kwy98m6my8iwqqj2"; depends=[dplyr knitr pracma progress rlang survival tidyr]; }; - limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; + limSolve = derive2 { name="limSolve"; version="1.5.7"; sha256="1waqkkipks8h4h5lpn0xw0077hwpz963q42h7xv6f70p07zncxq4"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.3"; sha256="157ph4a1h3025nx5v8lw63bbrzk4skw2rnnw1g7h4d3qggcmlhf9"; depends=[assertthat ggplot2 glmnet gower Matrix Rcpp RcppEigen stringi]; }; liminal = derive2 { name="liminal"; version="0.1.2"; sha256="1ka16fm0gzhpydlk5pjf1vjcb7ygx1d3iv4z8cs6ywzrq4bb5r61"; depends=[dplyr jsonlite matrixStats miniUI rlang shiny tourr vegawidget]; }; limonaid = derive2 { name="limonaid"; version="0.1.5"; sha256="04w9g0gv1cihljvmh1y40ygckhhv4jrg970913npvk5nc3id3bqd"; depends=[httr jsonlite R6]; }; @@ -12339,18 +12349,19 @@ in with self; { linbin = derive2 { name="linbin"; version="0.1.3"; sha256="04x97ah45qljpa4kg1iqz85w0q7936n4sq7vbzk2mx5m87p83czh"; depends=[]; }; lincom = derive2 { name="lincom"; version="1.1"; sha256="1krvpk8m2bnkxm3z10sgbx4fcj54kb1sc9n63zjq33ygl4bhnm6d"; depends=[Matrix Rmosek SparseM]; }; linconGaussR = derive2 { name="linconGaussR"; version="0.1"; sha256="10l7qajqa8f8yq3zbjmjxf0va2krq1rab42ihfhz2jyv3mn24xsi"; depends=[MASS Rcpp RcppArmadillo]; }; - lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; }; + lindia = derive2 { name="lindia"; version="0.10"; sha256="0i4mi19pcbpiqbwzj5ga9jhzi0z1qsf779kndyz9sdd9wgxdz8zg"; depends=[ggplot2 gridExtra MASS]; }; linea = derive2 { name="linea"; version="0.1.1"; sha256="1p3wd3m239x37hd4g4gp4nbgf4jlwk9lx0a00781jx7h2gcg32s7"; depends=[car dplyr ggplot2 gtrendsR lubridate magrittr openxlsx plotly purrr RColorBrewer readr readxl reshape2 sjmisc stringr tibble tidyr tidyverse tis zoo]; }; linearModel = derive2 { name="linearModel"; version="1.0.2"; sha256="032liplyjw7n0ylvpqv038pf8sbfbcz58zka5rr76cvh2xzf87vg"; depends=[]; }; lineartestr = derive2 { name="lineartestr"; version="1.0.0"; sha256="0bzsywk97j2mmsi7pj9267za1q2601crynh9kszwj6xjbg08nvsm"; depends=[dplyr forecast ggplot2 Matrix readr sandwich tidyr viridis]; }; - linelist = derive2 { name="linelist"; version="0.0.1"; sha256="182dsc5sm4ac0wpbcs29sfdvjqz0mpfk34j2qapbi5cn194x7rj9"; depends=[checkmate]; }; + linelist = derive2 { name="linelist"; version="1.0.0"; sha256="0bq2j5gw2arv6v83k1mhidp52rq3wk00lx6fxn42zy09ji2fdiv9"; depends=[checkmate dplyr lifecycle tidyselect]; }; linemap = derive2 { name="linemap"; version="0.2.0"; sha256="04nb0hmmikksp7ak4vdam9r2dpv7w3r5wkxxbjr7yk9pfq5gjncp"; depends=[sf]; }; lineup = derive2 { name="lineup"; version="0.42"; sha256="1k6l3vl9g6cz3jl1fz6r1dm3lfpmis6yylra69c3s8l8l4fz0gzy"; depends=[class qtl]; }; lineup2 = derive2 { name="lineup2"; version="0.6"; sha256="0qkxwn30g0bjm9aq9a59pb3xq844qr43ribnk607zlf8lwbibsk2"; depends=[Rcpp]; }; lineupjs = derive2 { name="lineupjs"; version="4.6.0"; sha256="198a87hhn1f77ix3mrv8mi04qxlv392aw1cg852h8s6sr2ayxqgl"; depends=[htmlwidgets]; }; - lingglosses = derive2 { name="lingglosses"; version="0.0.6"; sha256="1sgf0rag150cc1qsvinbjags9pxj8pxxvq1qfhxm3wb93bqc86l3"; depends=[htmltools kableExtra knitr rmarkdown]; }; - lingmatch = derive2 { name="lingmatch"; version="1.0.5"; sha256="1jcbqlla0qdlx2gv1cc2ma8lg7rl30djyqp6mfmd93dfhqr9mr0g"; depends=[Matrix Rcpp RcppParallel]; }; - lingtypology = derive2 { name="lingtypology"; version="1.1.14"; sha256="0vkl5mi7vmc44njbvlzv53b13x4lyf2y1xv4xy211q8l6c215i6a"; depends=[jsonlite leaflet leaflet_minicharts stringdist]; }; + lingdist = derive2 { name="lingdist"; version="1.0"; sha256="17mcr487bb7brmjzbiq71snxxaxnfg33ml3dqdfldv13i8nv3shi"; depends=[Rcpp RcppThread]; }; + lingglosses = derive2 { name="lingglosses"; version="0.0.7"; sha256="0qa42bjx9mszdfnzgmi7i23czrqnz8vbdaj0vq5sx8rn547dhymx"; depends=[htmltools kableExtra knitr rmarkdown]; }; + lingmatch = derive2 { name="lingmatch"; version="1.0.6"; sha256="01cp6sdns2bgfclcz21fhb69q39sr1zqxx2h582kp5s86ikkxbr3"; depends=[BH Matrix Rcpp RcppParallel]; }; + lingtypology = derive2 { name="lingtypology"; version="1.1.15"; sha256="1bb2igk5d8sq7fw942i99xiz7vvgxd1f9d9s520jla5k5br2fgjp"; depends=[jsonlite leaflet leaflet_minicharts stringdist]; }; linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; }; link2GI = derive2 { name="link2GI"; version="0.5-2"; sha256="0a05ahkrg7587l9kpfky7hjvwry1xiiw9dmzqmhg31bc6js6hg61"; depends=[devtools R_utils roxygen2 sf stringr terra xml2]; }; linkcomm = derive2 { name="linkcomm"; version="1.0-14"; sha256="15xm4c7sqpid1vjra250dnvdx98qgzbzmvaycf3zqqnqcmy5bw9n"; depends=[dynamicTreeCut igraph RColorBrewer]; }; @@ -12378,17 +12389,17 @@ in with self; { listdown = derive2 { name="listdown"; version="0.5.7"; sha256="0dw41ylja9ibznsqfr0621sqsmwb4kzlrwaycjl2hc4wmbabbliv"; depends=[checkmate fs rmarkdown tibble yaml]; }; listenv = derive2 { name="listenv"; version="0.9.0"; sha256="11s8cy259al6x98xcz93jw6p87si01gcgzccnxhx69879zh42a1m"; depends=[]; }; listr = derive2 { name="listr"; version="0.1.0"; sha256="1k8djk2nvqyyl9ffmfr4djciryha9x22icq972k38990nx2w0al2"; depends=[rlang tidyselect]; }; - listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; }; + listviewer = derive2 { name="listviewer"; version="4.0.0"; sha256="0hffp82mdk4rp34l3l50ph540mv0pdq6x9racmlcvis5lfpjicby"; depends=[htmltools htmlwidgets shiny]; }; + lit = derive2 { name="lit"; version="1.0.0"; sha256="1n5avz33d041bl8b9khqbiyprjdrd5nj1n19134sfpqs7h0wcjzp"; depends=[CompQuadForm genio Rcpp RcppArmadillo RcppEigen]; }; litRiddle = derive2 { name="litRiddle"; version="1.0.0"; sha256="18vy64wfxg6jfwi5rd5l5164wvg3rab6zcxsn6xhz0nj7byn5fgn"; depends=[dplyr ggplot2]; }; lite = derive2 { name="lite"; version="1.1.0"; sha256="0gfbffh4511c7hwy6js0bip69j340f7qmrjaslnjgyx1nvmi7dxd"; depends=[chandwich exdex revdbayes rust sandwich]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; literanger = derive2 { name="literanger"; version="0.0.2"; sha256="0n39kr8gnps5vyifbafq736s05h939p7ys31s58zz3rg64k6l1bp"; depends=[cpp11]; }; litteR = derive2 { name="litteR"; version="1.0.0"; sha256="0lb8vl13w60dci4ygxqi2ap4ay1b2ywn8zmyigkn251sz9j2f4q9"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr tidyselect yaml]; }; - litterfitter = derive2 { name="litterfitter"; version="0.1.2"; sha256="15v4ykvqri8gww8y6ra3979dm4f1vkcw0fdb5l8jilym3n0ndkg0"; depends=[plyr]; }; + litterfitter = derive2 { name="litterfitter"; version="0.1.3"; sha256="095jdrf0bfc465kabxnkdii1idqfnk4q7130kby0z499a88k1zpp"; depends=[plyr]; }; littler = derive2 { name="littler"; version="0.3.18"; sha256="1lp6a62g3yhzr4pv9kynibv7k9pd546w6hifs1aficyxbyg4dgqq"; depends=[]; }; liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; }; live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; - livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; liver = derive2 { name="liver"; version="1.14"; sha256="1rbj8cjd1ir7qzs4981g3z648a9kaaq8bz0wggrmd38gpbvc2f8p"; depends=[class ggplot2]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.10.1"; sha256="1rw4lbz172hwb24r424qq86bw7m3xxl66k474wx1scpcrsix2nzw"; depends=[BBmisc checkmate data_table ggplot2 mlr parallelMap plyr rJava]; }; @@ -12413,13 +12424,14 @@ in with self; { lmf = derive2 { name="lmf"; version="1.2.1"; sha256="1vrwshzaxq1vxin5f2hsp1vngn891y5nvvmhag26xbczc526gmac"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.6"; sha256="0zhahfzphyywdnwkj8c94pxm86v296bvvszzcxp37xi4gayaknm6"; depends=[magic MASS Matrix nlme spatstat spatstat_geom]; }; lmls = derive2 { name="lmls"; version="0.1.0"; sha256="0gv7mawdpcqvvf3f61aa1l0yi32z9bs41i36ggn1nwga837g33k3"; depends=[generics]; }; - lmm = derive2 { name="lmm"; version="1.3"; sha256="13b5rvdbzljir1fn4zxv2lshbga64vwzn6884izif9v5dkd5b29j"; depends=[]; }; + lmm = derive2 { name="lmm"; version="1.4"; sha256="0ic3l311y7sq6q8kb5il3k115w1gpzy9kxx8fbjnx1zl2qsg10wf"; depends=[]; }; lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; }; lmmpar = derive2 { name="lmmpar"; version="0.1.0"; sha256="1l3zjmlfjfn2wv4yayqzv6qrwaxk2sgx3hjx371b5fs54zspdj20"; depends=[bigmemory doParallel MASS matrixcalc mnormt plyr]; }; lmodel2 = derive2 { name="lmodel2"; version="1.7-3"; sha256="1fiin2nkffbihz1s8ixmw9lgf8mn3j9krr8iiflizk10mdv54hnb"; depends=[]; }; - lmom = derive2 { name="lmom"; version="2.9"; sha256="145va4dhl767mywk36xcmqilm21sfkqhcqi0s07qgq3k39sn4gin"; depends=[]; }; - lmomRFA = derive2 { name="lmomRFA"; version="3.5"; sha256="1cgwal38r139h18sqrrmvylvasn4v8q82fgp7kg8vk6m1dp5q0vf"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.4.9"; sha256="0y14zwwg5nnskjpjm9b1d12694c33x6micmshxwwdyl3d1pysqvh"; depends=[goftest Lmoments MASS]; }; + lmom = derive2 { name="lmom"; version="3.0"; sha256="1482kbb4cm65m2d1xlxml93yjd3d43iiap6nvzg5vd33i9iyh2jb"; depends=[]; }; + lmomPi = derive2 { name="lmomPi"; version="0.6.6"; sha256="0a9ddfaa3micj3q7wcpkcsxhbd6dv3gn19rdy7ll3f76g63pknf1"; depends=[lmom stringr]; }; + lmomRFA = derive2 { name="lmomRFA"; version="3.6"; sha256="1av113gxif93v26g2x4c4l4fbax42w5bv3560p5sgdxbnb7sdmqp"; depends=[lmom]; }; + lmomco = derive2 { name="lmomco"; version="2.4.11"; sha256="07ysvls3ydiman3f1a0c6f32xxk3fapa0wd0qq4pplx7bnl92al4"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; }; lmridge = derive2 { name="lmridge"; version="1.2.2"; sha256="1lngzhxgjdg4j2bxi680zdsj0ambrpn23v2ib0mbilscbv3p8701"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-40"; sha256="15yr2kx08wy085bnziqmj1p6hf9mg3qp2a8465jk2df6di6hsh34"; depends=[zoo]; }; @@ -12429,10 +12441,9 @@ in with self; { lmw = derive2 { name="lmw"; version="0.0.1"; sha256="0v5p7886q6gy0m3cqq01r3cwbjpwypg3m0hqxjbrpsbfgzvi7phv"; depends=[backports sandwich]; }; lncDIFF = derive2 { name="lncDIFF"; version="1.0.0"; sha256="012dwrcp0pny59hvzj7mnyyc3nijcjgxc0dyx7ab2fknp9bhs5w8"; depends=[]; }; lnmCluster = derive2 { name="lnmCluster"; version="0.3.1"; sha256="1y5zf2m4kgysm15xnbd1zc21svif2mxpm1zla4nhg68hljl41j8s"; depends=[foreach gtools MASS mclust pgmm Rcpp stringr]; }; - loa = derive2 { name="loa"; version="0.2.48.1"; sha256="0685xhswhmn05jxn5q11g1h767vv7l0f9wmlqqrk6wvnagf3nbdn"; depends=[lattice MASS mgcv OpenStreetMap plyr png RColorBrewer rgdal RgoogleMaps sp]; }; + loa = derive2 { name="loa"; version="0.2.48.3"; sha256="1fa1yxpsydx2kjbnj00vn9zv4dw9awng4lxrcllcgzkir9bikgq0"; depends=[lattice MASS mgcv OpenStreetMap plyr png RColorBrewer RgoogleMaps sp]; }; loadeR = derive2 { name="loadeR"; version="1.1.6"; sha256="0zkwq704q8n8rrrgf961axgv1jjnwl34aiz7axw0rdm98c9hrpvh"; depends=[caret colourpicker config data_table DT echarts4r golem htmltools htmlwidgets readxl rlang shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs writexl]; }; - loadings = derive2 { name="loadings"; version="0.3.1"; sha256="1b6i7dvzwpkqw1ak5slbgb6n27algl4x66y6ifr611bid090vd91"; depends=[geigen]; }; - loadr = derive2 { name="loadr"; version="0.1.3"; sha256="01nsjsv7c8grsizfisczqwjrz5saff0pgn7716ig4i8nzargvz7a"; depends=[]; }; + loadings = derive2 { name="loadings"; version="0.4.1"; sha256="1ig9wz27mc5jdkah4z9ngdpanl5xcay2d27vdbfhannsw5i0lcdy"; depends=[geigen]; }; loadshaper = derive2 { name="loadshaper"; version="1.1.1"; sha256="10fypkybqi6kpvxcrwsvzczqc11mihyj5f1d3jhd22s8llm8k0gc"; depends=[]; }; lobstr = derive2 { name="lobstr"; version="1.1.2"; sha256="060p7b7i2qx09d7nf0kdl85r9j886fivrkrsl2bn10cggvnk7icv"; depends=[cpp11 crayon prettyunits rlang]; }; locStra = derive2 { name="locStra"; version="1.9"; sha256="0vblsxdlngpa0mzyay9w23nx85riq0dwjc04z20vyha0vdsnkfk6"; depends=[bigsnpr Matrix Rcpp RcppEigen Rdpack RSpectra]; }; @@ -12449,7 +12460,7 @@ in with self; { locationgamer = derive2 { name="locationgamer"; version="0.1.0"; sha256="0y99m003s177x57m4ynxd8jd2xzl5zb4bj7jnbc04h22ffdl6m6f"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; locfit = derive2 { name="locfit"; version="1.5-9.8"; sha256="1qqxw69p42l4szr2fl73bdydpcbxn68iyxyyjy7qy3p56bxrn2hd"; depends=[lattice]; }; - locits = derive2 { name="locits"; version="1.7.6"; sha256="15jalcaqz5yymrhlzlsr3xmy34dspnv08lmychqjps8vv0irpr3j"; depends=[igraph wavethresh]; }; + locits = derive2 { name="locits"; version="1.7.7"; sha256="13y313z0wmhrqfzgr3dbcmkdg6507p0wdvyxrnz1vm0rjwqv4911"; depends=[igraph wavethresh]; }; locpol = derive2 { name="locpol"; version="0.8.0"; sha256="1bip9x45kdnwc14rvk3ckzfbs32yc2wiid1ypmbbin4mk7364zxk"; depends=[]; }; locpolExpectile = derive2 { name="locpolExpectile"; version="0.1.1"; sha256="1phwcnbk1vmdk3qmfx2nd6crplly2lb8gb57yl67ky3c4sryh358"; depends=[expectreg lestat locpol matrixcalc quantreg]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; @@ -12465,8 +12476,8 @@ in with self; { logNormReg = derive2 { name="logNormReg"; version="0.5-0"; sha256="0lv5m6yz1v8pi1svw9qh3gkq3r0lp13qhx3p6g6yvzqwd0px0pip"; depends=[]; }; logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; }; logbin = derive2 { name="logbin"; version="2.0.5"; sha256="1v8bzhh8bm8704sv68k7dmbs0m7f656s91jhc0p7a6w7vqlmv803"; depends=[glm2 iterators itertools2 Matrix turboEM]; }; - logconcens = derive2 { name="logconcens"; version="0.17-2"; sha256="142zqpql4h874vmm5nim8rn4z96wjn9fazqgrl5j40xzfxv4h9s0"; depends=[]; }; - logcondens = derive2 { name="logcondens"; version="2.1.7"; sha256="1y6b7acgxg7v6hc0lkx1mlzs2bzvv0pb6nbccxk3ybgy39bqgn0s"; depends=[ks]; }; + logconcens = derive2 { name="logconcens"; version="0.17-3"; sha256="1a9p4pr8pva2bpqbq4wzrcisfffjvaigbvk6ixm2klys0nkwlbhp"; depends=[]; }; + logcondens = derive2 { name="logcondens"; version="2.1.8"; sha256="001a2qr2bsdcw784s9mr5j4srqkw3l64aj4jngy7y1yi8xp20fgi"; depends=[ks]; }; logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logger = derive2 { name="logger"; version="0.2.2"; sha256="08kym5i5fvbf5xhh9qdszp4jdgyc7j7zpnwzy68wabqz73aff6sg"; depends=[]; }; logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; }; @@ -12475,18 +12486,18 @@ in with self; { logib = derive2 { name="logib"; version="0.1.2"; sha256="09c528wrgyk0cg1flx2fsl53q4v9442rr44g9kh5jznqs788608b"; depends=[lubridate readxl]; }; logicDT = derive2 { name="logicDT"; version="1.0.3"; sha256="0bgbllrvjlrhr2cb65z741m07vpk02y7vwmxi2whivwfdnxqw0dc"; depends=[glmnet]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; - logistf = derive2 { name="logistf"; version="1.25.0"; sha256="0w78jsynw5jh3l9r3ssjs8rza6givgrxzwnb5jwazcm8637d6gix"; depends=[formula_tools Matrix mgcv mice]; }; - logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; + logistf = derive2 { name="logistf"; version="1.26.0"; sha256="02qrh07c13khlpz3z3f6qq827h37j91i88n7jn3c8ky6r1lfa5pr"; depends=[formula_tools Matrix mgcv mice]; }; + logistic4p = derive2 { name="logistic4p"; version="1.6"; sha256="1gyg6wmv15l9kn30icrbh3zny0h419la6722nynv80ls0r2b495g"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; logisticRR = derive2 { name="logisticRR"; version="0.3.0"; sha256="0i9x7rynxcybdnjqbjsny8jsl96mivzdazdgmcg72qrv8qfwpszl"; depends=[nnet]; }; logitFD = derive2 { name="logitFD"; version="1.0"; sha256="0jl9x7ssh0lbb7r68l7nkyvbmmrsxfvpfjg9q6wa225xvz1i6yzh"; depends=[expm fda fda_usc pROC]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.38"; sha256="01svs20dr0f1h66j5vn3ychjlgwzak96f8p9lmzd29anjlkm9x9q"; depends=[]; }; - logitr = derive2 { name="logitr"; version="1.1.0"; sha256="0sk93j5mbpmll2vgl7s86siy1960wp9dj945dgc90ndbwmq2gj62"; depends=[generics MASS nloptr randtoolbox tibble]; }; + logitr = derive2 { name="logitr"; version="1.1.1"; sha256="0w12rpvyxvmqdlbp8j7394x4c0m0yhv0li7rr4jliygzp4xnh8lz"; depends=[generics MASS nloptr randtoolbox tibble]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.2"; sha256="0ha1b7hl86486v38ap9rm71wwvg95szqx5rb5q097vm6dl091qcr"; depends=[]; }; logmult = derive2 { name="logmult"; version="0.7.4"; sha256="1k9izgna3bfi8gvnpks85gj3zv3lp35991ml58q7pcqqr78giii2"; depends=[gnm qvcalc]; }; lognorm = derive2 { name="lognorm"; version="0.1.10"; sha256="021g3g7hyxcrj2lzqfjxj2ypcn8c6qminr0l6sdydynvjdjjv0pc"; depends=[Matrix]; }; logr = derive2 { name="logr"; version="1.3.4"; sha256="041byyak5glk4wmbajfqckq5mrhjny4b2vflhlq3w6jhfp5j4lls"; depends=[common withr]; }; - logrx = derive2 { name="logrx"; version="0.2.2"; sha256="1bdqnvwjg2c5q3dpa1pb4kipg4hmb9ahm7r6910hgkz7my7vvgqk"; depends=[digest dplyr lintr magrittr miniUI purrr rlang rstudioapi sessioninfo shiny stringi stringr tibble tidyr waiter]; }; + logrx = derive2 { name="logrx"; version="0.3.0"; sha256="1qqy4hm0l6fijkzlxrzj1i65bdi3lf1p3mwd7jwm66yi9ynwkkbz"; depends=[digest dplyr lifecycle magrittr miniUI purrr rlang rstudioapi sessioninfo shiny stringi stringr tibble tidyr waiter]; }; logspline = derive2 { name="logspline"; version="2.1.20"; sha256="1nsrgz9sh9qg2fj0x7k48lqhpgzq1z78jfz89ckzp5xm4r8lpgcb"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-10"; sha256="14prvpzq4qzbbac1vqklkrm60bswwjvm90i14dylsz1pdhy85g00"; depends=[sfsmisc]; }; lolR = derive2 { name="lolR"; version="2.1"; sha256="0lrmn9lzyyfr1y0i7qp6xfpdxyisbkajwg0jkrqkiw687psnh2rc"; depends=[abind ggplot2 irlba MASS pls robust robustbase]; }; @@ -12497,8 +12508,10 @@ in with self; { longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; }; longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; }; longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; }; + longclust = derive2 { name="longclust"; version="1.3"; sha256="0j7imbdz9wir3rb7lkjnqhfsq8zlr8li31p865dmb4l6kfrl4qg4"; depends=[]; }; longit = derive2 { name="longit"; version="0.1.0"; sha256="08d7pfwd2anx6cdgpyzrn5na3s75z6plbxb11774zcxyzg81rz69"; depends=[AICcmodavg missForest R2jags rjags]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.13"; sha256="046w3xbr535c5jyd68adv42a7limxp1mv57b5w6w673w707lmw2p"; depends=[corpcor]; }; + longitudinalANAL = derive2 { name="longitudinalANAL"; version="0.2"; sha256="1mvagvjmycnmk3bp02194k7qpwgj94lxzvv30dm0c8jmrhznyh4c"; depends=[dlm dplyr MASS tibble]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.5"; sha256="16jfmzdi6zw2s17iiw7yw3y9h9xz3kz4z9v2qfj0drs57m9dxgp4"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.6"; sha256="0ifslwmn71v6725xw3fa44qb01391dq8nsa95281x0crb5zrki8d"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; longke = derive2 { name="longke"; version="0.1.0"; sha256="1fc34wrc7dn6j2nlwqgil5jqyvrp5nbwsbvppmkj78w7awla1f18"; depends=[bvls dplyr fdapace mvtnorm purrr tidyr]; }; @@ -12525,11 +12538,11 @@ in with self; { lotri = derive2 { name="lotri"; version="0.4.3"; sha256="1r24ldi8asa2n1w4czrwl5kp6b7xq27prrsxf23f436zfc4hhjvl"; depends=[crayon]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lowpassFilter = derive2 { name="lowpassFilter"; version="1.0-2"; sha256="1ic4xissqm7cq951yw7cf74a520mnm34yr6mlw1byhn5w4nzbk2x"; depends=[Rcpp]; }; - lpSolve = derive2 { name="lpSolve"; version="5.6.18"; sha256="04p71mcpksighyvl74ffvgxzc7iiv7nafphddhmqa6yqzhk1j7km"; depends=[]; }; - lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.9"; sha256="04bqa719za6hbbip695190zcq6nkwqmm0qjfw8gpfkqpy7ryqlkv"; depends=[]; }; + lpSolve = derive2 { name="lpSolve"; version="5.6.19"; sha256="06sqjj69gp2ja2hgzfxii00js6pjbmhyp07a9jya5sy6cjgb9ma9"; depends=[]; }; + lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.10"; sha256="1f8hv89iw8vfnc3f5a73575aqmqcmj5qbmamjklsq79cscjyzdsc"; depends=[]; }; lpacf = derive2 { name="lpacf"; version="1.0.1"; sha256="0lg1r7pjg9f5msvjqaq93v43mssvq7jqgv2canhp3wybnmcw0p8v"; depends=[locits wavethresh]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; - lpcde = derive2 { name="lpcde"; version="0.1.0"; sha256="0lr7g01ld9cq6xr5w1svlrrylba0kas0b2rzdmdnwf6jsf8296cz"; depends=[combinat ggplot2 MASS Matrix mvtnorm purrr Rcpp RcppArmadillo]; }; + lpcde = derive2 { name="lpcde"; version="0.1.1"; sha256="0jnwh677icjx781c330qmm8bz95470rvzggi5rygf0kvw9zr1biv"; depends=[combinat ggplot2 MASS Matrix mvtnorm purrr Rcpp RcppArmadillo]; }; lpda = derive2 { name="lpda"; version="1.0.1"; sha256="0q54jid3vj5js0bhf4v4w5v3pmh4rr8dv0igcb2525fl731jsqfk"; depends=[Rglpk]; }; lpdensity = derive2 { name="lpdensity"; version="2.4"; sha256="1vbbvg2wb2jggqls185bwpm8c8ky6693kai3lr5xz4r8f6ivdm29"; depends=[ggplot2 MASS]; }; lphom = derive2 { name="lphom"; version="0.3.1-1"; sha256="18scyg2rd30haawmnlxrkxvg6d8w9qqs7vj9cxvkg9flalsd8isg"; depends=[lpSolve]; }; @@ -12545,9 +12558,9 @@ in with self; { lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; }; lrgs = derive2 { name="lrgs"; version="0.5.4"; sha256="0mf6wqlv21z68w81hvpmhgngvdsklf3x2678d9c9lxfmqmpv4a7y"; depends=[mvtnorm]; }; lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; }; - lrstat = derive2 { name="lrstat"; version="0.1.14"; sha256="068g0nn7z0jdfm2qjk212fsmx2lsrpv6l06kx63cq143zk7g5iaz"; depends=[Rcpp]; }; + lrstat = derive2 { name="lrstat"; version="0.2.0"; sha256="1pfg053w8y0ljld0c2cjjr1xrhbq1wx4khabfqjb07vayhqr3m32"; depends=[mvtnorm Rcpp]; }; lsa = derive2 { name="lsa"; version="0.73.3"; sha256="16k1g0kh3yaw7azg76aqf3hn3b6jgqg92xx0syai8l0my9ci2zzh"; depends=[SnowballC]; }; - lsasim = derive2 { name="lsasim"; version="2.1.3"; sha256="1iphx4p38z3kfmmm8slqdzi85sy0lhx4p6sp5y1446f8hpcsbxcz"; depends=[cli mvtnorm polycor]; }; + lsasim = derive2 { name="lsasim"; version="2.1.4"; sha256="197grlgxvilw43lyjprmik0pjgns979xksi4pv422h9x9fwwyqpn"; depends=[cli mvtnorm polycor]; }; lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; }; lsbs = derive2 { name="lsbs"; version="0.1"; sha256="14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n"; depends=[ks Matrix numDeriv]; }; lsdbc = derive2 { name="lsdbc"; version="0.1.0"; sha256="1dk07zlvwwfhlll21ql264gx94v3jvgidy3yvxidwmhnyc1vx80x"; depends=[]; }; @@ -12561,19 +12574,19 @@ in with self; { lspartition = derive2 { name="lspartition"; version="0.4"; sha256="1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; lspls = derive2 { name="lspls"; version="0.2-2"; sha256="1cmffkyc881659l9m1miwhr3jfpwb0xb9n5chg317vcm8l9r4wcn"; depends=[pls]; }; - lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; }; lsr = derive2 { name="lsr"; version="0.5.2"; sha256="00mbnla74k7xcs8640chkcjydi945dahs2d6h1lv89nsrm8hpzx9"; depends=[]; }; lss2 = derive2 { name="lss2"; version="1.1"; sha256="1rkv26zq36zyh891xkkllxphwplljmzpy15g619x1w4qvsajyyg8"; depends=[quantreg]; }; - ltable = derive2 { name="ltable"; version="2.0.2"; sha256="05sjyzq3s1bldndpwbknl9md3vzf664wvpkckwxnrswl9i9av6fn"; depends=[clipr]; }; + ltable = derive2 { name="ltable"; version="2.0.3"; sha256="09njp8xmfm1ci94ma8vm89994kkz7p7ka6z3gjc9va8jgpl0r5r3"; depends=[clipr]; }; + lterdatasampler = derive2 { name="lterdatasampler"; version="0.1.1"; sha256="1bfhsd5crhmpxbxwb5lg2gak2myxb2y8lywg8dmyyzlrlnjw93y3"; depends=[]; }; lterpalettefinder = derive2 { name="lterpalettefinder"; version="1.1.0"; sha256="0wpqh5im43753mcb792gfvs48rm1sd1qb342kig2svbp0xaa1cnv"; depends=[dplyr ggplot2 jpeg magick magrittr png tidyr tiff]; }; ltm = derive2 { name="ltm"; version="1.2-0"; sha256="0vhgbk6j0z3limsrbjkjkpfn2whiaij5j4jf1gg66mjs9dlylap1"; depends=[MASS msm polycor]; }; ltmix = derive2 { name="ltmix"; version="0.2.1"; sha256="03i0gr79xiqnny57g0y9w5dfpw51gqhrkff2rh8rggsni20pzm1h"; depends=[gtools pracma]; }; ltmle = derive2 { name="ltmle"; version="1.3-0"; sha256="1bcahkykwwn67zvi5b0aw5awd48yq8ab8y9j3yw8f5mqdbfx0cgv"; depends=[Matrix matrixStats]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; - ltsk = derive2 { name="ltsk"; version="1.0.9"; sha256="1zrcfhsm4599dj8dywzgpqabcc4sbfm7d99lxxmhqagqiqwamqyc"; depends=[]; }; + ltsk = derive2 { name="ltsk"; version="1.1.0"; sha256="1gz048yg9hm40xyxganpza48dpmi43dxm5j5myysyxzi07p58l8n"; depends=[]; }; ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.3"; sha256="0f2ycgjdw9z9m730wh3k362aq71mwmxhnsxhcjxhj8c4lknr50br"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.9.2"; sha256="19s4cm6a73b9q519mmgf2qxjmd2bsjff19ds3hk8ksgz98d46xl9"; depends=[generics timechange]; }; + lubridate = derive2 { name="lubridate"; version="1.9.3"; sha256="1zvzycng2hsks9d7552nb93abzjrs43c975rc16s3c1is8318vib"; depends=[generics timechange]; }; luca = derive2 { name="luca"; version="1.0-6"; sha256="0zrxrwpk7iblpysd4fbh50s5bmvd5l1bzbd8rdyk06wby6bcs1rk"; depends=[genetics survival]; }; lucas = derive2 { name="lucas"; version="1.0"; sha256="1ws35f2pq2y7nnik40nj4qpz1d499gfc5isr1409pwy6r5knb78q"; depends=[DBI plyr rpostgis RPostgreSQL]; }; lucid = derive2 { name="lucid"; version="1.8"; sha256="1dhbyr0l7cp5r0r7xdgqqxlix5hhk0v4v0zghd904dvfyaz2zdwi"; depends=[nlme]; }; @@ -12582,10 +12595,9 @@ in with self; { lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; }; lumberjack = derive2 { name="lumberjack"; version="1.3.1"; sha256="15yp64vrl4wzxb3zmakiaqnz1mp0xqjfj7wbn56rm33slxwqrrkw"; depends=[R6]; }; lunar = derive2 { name="lunar"; version="0.2-1"; sha256="0mmy68wawrh7rxk0mqq6f3vhmcwbx27xsp7g63v1djz7rx2w69yv"; depends=[]; }; - lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; }; + lutz = derive2 { name="lutz"; version="0.3.2"; sha256="19p41pz2q5abqi6ba4l6fzww90g11lscjz2223ml0gkcryxn3447"; depends=[lubridate Rcpp]; }; luz = derive2 { name="luz"; version="0.4.0"; sha256="02p1h6rhjvdkw10az1zzz0fd4l8nhn04bwkr71l73a94fbwm6dpz"; depends=[cli coro ellipsis fs generics glue magrittr prettyunits progress purrr R6 rlang torch zeallot]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; - lvec = derive2 { name="lvec"; version="0.2.5"; sha256="12q486xvnfyga15yx8av56sflahcni2wm09rx8abj8yzkjgfdiva"; depends=[BH Rcpp]; }; lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvmisc = derive2 { name="lvmisc"; version="0.1.1"; sha256="06ry1azfpqdh1hblhnc47n9265dkzhm96rajl8y7xnvqmv6ad8jj"; depends=[cowplot dplyr ggplot2 glue purrr rlang rsample tibble tidyselect vctrs]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; @@ -12600,40 +12612,41 @@ in with self; { mBvs = derive2 { name="mBvs"; version="1.6"; sha256="14ds64mm0nrrpfr01kmx5fsvl0kqzhiq8qgmzgmyzs7c4hcs3050"; depends=[]; }; mDAG = derive2 { name="mDAG"; version="1.2.2"; sha256="0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; - mFD = derive2 { name="mFD"; version="1.0.4"; sha256="04rx17wxygfg333vxrrhqi6zwr2v5b3mgwz5wvgyikliahj9cj9g"; depends=[ade4 ape betapart cluster dendextend FactoMineR gawdis geometry ggplot2 ggrepel Hmisc patchwork reshape2 rstatix vegan]; }; + mFD = derive2 { name="mFD"; version="1.0.5"; sha256="12m40ggz47bmccvpch21swrq2lddi4zvb199waw2csjlhixr60md"; depends=[ade4 ape betapart cluster dendextend FactoMineR gawdis geometry ggplot2 ggrepel Hmisc patchwork reshape2 rstatix vegan]; }; mFDP = derive2 { name="mFDP"; version="0.1.0"; sha256="0mvqg3qpv1zcj5lsk36dw4qs75i66cmv4qazpmsilhfh0v46p2dx"; depends=[]; }; mFLICA = derive2 { name="mFLICA"; version="0.1.5"; sha256="0znjp95ifwqpqwrnlcb77r1cdwpvbpql6ggnck018xddc8x40hzv"; depends=[dtw ggplot2]; }; mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; }; mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; }; - mHMMbayes = derive2 { name="mHMMbayes"; version="0.2.0"; sha256="1yn7xxah1pwvfdvn49kkk0jyl3iph8fis87b9g6by5kavnylrwvy"; depends=[MCMCpack mvtnorm Rcpp Rdpack]; }; - mMARCH_AC = derive2 { name="mMARCH.AC"; version="2.4.0.1"; sha256="124wh0vd9jh84l4pn6snv595sxqi9acrndpnhkgxabw5p11jk6gr"; depends=[abind accelerometry ActCR ActFrag cosinor cosinor2 denseFLMM dplyr GGIR ineq kableExtra minpack_lm refund survival tidyr xlsx zoo]; }; + mHMMbayes = derive2 { name="mHMMbayes"; version="1.0.0"; sha256="19zqqq0dz3fscch5vxy1lfyq4hfmdbvzfqqm123l5snbdk52l4li"; depends=[MCMCpack mvtnorm Rcpp Rdpack]; }; + mMARCH_AC = derive2 { name="mMARCH.AC"; version="2.9.2.0"; sha256="0lp32m6cfplbm72g0j1cm1c7rcpmy5jrsd3p577p9a4bwqf5ynxc"; depends=[abind accelerometry ActCR ActFrag cosinor cosinor2 denseFLMM dplyr GGIR ineq kableExtra minpack_lm refund survival tidyr xlsx zoo]; }; mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; }; mRMRe = derive2 { name="mRMRe"; version="2.1.2.1"; sha256="1nbz2rq6fzzy01vhizpszw47c8yha1rvks6hf5dh0dx4h8p3jg6m"; depends=[igraph survival]; }; + mRc = derive2 { name="mRc"; version="0.1.0"; sha256="0v8kyvgliss8lxbzcikd3vhmmq2ysl1fp87r37r5f8w9xsx5ba9z"; depends=[]; }; mRpostman = derive2 { name="mRpostman"; version="1.1.0"; sha256="18q75hymx13q0vkvfanrqz88j1w482j343sncvhqfljhlyff0m0b"; depends=[assertthat base64enc curl magrittr R6 rvest stringi stringr xml2]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSigTools = derive2 { name="mSigTools"; version="1.0.7"; sha256="11xjrfgifh491bzrzh1vw7sawdrlj1yb1yfvj09gjggszn9wn40r"; depends=[clue philentropy quadprog sets]; }; - mSimCC = derive2 { name="mSimCC"; version="0.0.2"; sha256="1ka2p5ymzaqyasan9j5lsxpxfiz5rp71lv4rdd8g4gh48chqvgaa"; depends=[doParallel foreach]; }; + mSimCC = derive2 { name="mSimCC"; version="0.0.3"; sha256="1dnyrc4hxdimqkk8rm57z74ihmlzmg8plx30ch7rf1z86i33hnjy"; depends=[doParallel foreach]; }; mStats = derive2 { name="mStats"; version="3.4.0"; sha256="196fjnld26dmirga4mghlvsrj4fgnw08wdg77masxm15kpvm1x1d"; depends=[]; }; maGUI = derive2 { name="maGUI"; version="4.0"; sha256="0r54r9p1j8mnqsm0r0c3glz9p9vz7mcdyqlc6lpi7rdy9n61b7r5"; depends=[Biobase]; }; maSAE = derive2 { name="maSAE"; version="2.0.3"; sha256="0453rvfhi4zvjhbkjammy81gxi6ax75gs8iqpnphbrv60agz0bjc"; depends=[]; }; maat = derive2 { name="maat"; version="1.1.0"; sha256="0slyigq90bn2dn09s2ipc13glsywwzs7y5d80zyazwwr51i23xsq"; depends=[diagram MASS readxl TestDesign]; }; - mable = derive2 { name="mable"; version="3.1.1"; sha256="0nqhs7d99mf3bpk3m75nmpfql9pzas5lqaz83mrdhiwxd1f8shci"; depends=[doParallel foreach icenReg iterators survival]; }; + mable = derive2 { name="mable"; version="3.1.3"; sha256="1ilhs04hiqdqwc13sp9szl5rgnc4vv6jczzq92dc7d70a5vr7m40"; depends=[doParallel foreach icenReg iterators survival]; }; macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; macleish = derive2 { name="macleish"; version="0.3.9"; sha256="06r97fsasjj7qdm4p8yhvi2hfs1qy35xs0ay9i3bv5k09z5zfia7"; depends=[dplyr etl lubridate phenocamr readr rvest sf stringr xml2]; }; maclogp = derive2 { name="maclogp"; version="0.1.1"; sha256="1fbwv4j4mb7zkyc5vspq7k17pwr49dbvqkssda54ggcf1nbqykmb"; depends=[BMA plot_matrix rlist]; }; macrocol = derive2 { name="macrocol"; version="0.1.0"; sha256="1qz5hsxg4ga4blbrakn4bia2l4lh6h5kh4ix7vnm7rl2f7yk4r5a"; depends=[httr lubridate openxlsx R_utils readxl]; }; macrosyntR = derive2 { name="macrosyntR"; version="0.2.19"; sha256="1lydhr7rnh8kyj0pz9bfpjczsnxpy0z8gzphi7qc0s639nw1z8ay"; depends=[dplyr ggplot2 ggthemes igraph reshape2 stringr tidyr]; }; mactivate = derive2 { name="mactivate"; version="0.6.6"; sha256="0qqhniq0wdhazhfiiw7g2b0v8jkc8jl2m117k1c6gnajg8gs1ymn"; depends=[]; }; - maczic = derive2 { name="maczic"; version="0.2.0"; sha256="0r60q34ff38cdxf20b1f07wc4rbac1ch0chri36x221k2cnpxnhh"; depends=[BB emplik MASS mathjaxr mediation pscl sandwich survival]; }; + maczic = derive2 { name="maczic"; version="1.0.0"; sha256="02papbs1pw470cxzwcgvn8px5hvvg1p8zpmcrk5zqmlpzgjsdx2l"; depends=[BB emplik MASS mathjaxr mediation pscl sandwich survival]; }; mada = derive2 { name="mada"; version="0.5.11"; sha256="1cqjkk8rr8in12hms6qvm2yrgmnr9xwg0z6cc0gnzazz0rijj8n1"; depends=[ellipse metafor mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.2"; sha256="0v6s28kzghpxrj6sw94c3ys7k4z1h89kdx8ns1991m8q2v51bx1f"; depends=[]; }; madgrad = derive2 { name="madgrad"; version="0.1.0"; sha256="0cxf1b57cl7qwax60wv4jvcac762ara2i18nb1fcjp954mwgwnlb"; depends=[rlang torch]; }; maditr = derive2 { name="maditr"; version="0.8.3"; sha256="108y240b92z5nrjp9rq5baaxncfv1g114garfv87vnwnz7bsd8c7"; depends=[data_table magrittr]; }; - madness = derive2 { name="madness"; version="0.2.7"; sha256="0vcpydqnpmg9rvvzyjyqvd3qgs42n8cr9cafai51989v2w2bcf85"; depends=[expm Matrix matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.8"; sha256="1a0jcvy7xq654hcjv0nsjfhwh9fgxzhk7grjy209mgzmkivdinpq"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; - madrat = derive2 { name="madrat"; version="3.3.6"; sha256="02pvb48sh9xm4vprnzq7rhqihqbqiwndmxwxknai19hm9iyjhz91"; depends=[callr digest igraph magclass Matrix pkgload renv stringi withr yaml]; }; + madrat = derive2 { name="madrat"; version="3.6.4"; sha256="03wkzpr0nx50li0g69fn2fznfh6nbg4sdpymsilx3387v50vc9vs"; depends=[callr digest igraph magclass Matrix pkgload renv stringi withr yaml]; }; mads = derive2 { name="mads"; version="0.1.6"; sha256="0nz1fg3gyj72k6dpkjnwqjvps0inv1qgk5vlc8ycj3k720qcsd81"; depends=[mrds]; }; - madshapR = derive2 { name="madshapR"; version="1.0.0"; sha256="189hwvfzddib6d8p2mjp4idb973i5bc6shkvlmzmkxsj026bckw6"; depends=[bookdown crayon dplyr DT fabR forcats fs ggplot2 janitor knitr lubridate readr rlang stringr tidyr tidytext xfun]; }; + madshapR = derive2 { name="madshapR"; version="1.0.2"; sha256="04nigwlvx56fd22l6rs1jhyh270flj173w6wrspsq3gmnl9k468s"; depends=[bookdown crayon dplyr DT fabR forcats fs ggplot2 haven janitor knitr lifecycle lubridate readr rlang stringr tidyr tidytext]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; magclass = derive2 { name="magclass"; version="6.10.0"; sha256="050nbnwv9m8ya2sbccygj8k05ry8758rxnj1r988chjycc3c21wb"; depends=[abind data_table]; }; magi = derive2 { name="magi"; version="1.2.2"; sha256="0pj45j5qy3gqcl1v95cv2bmxsiimyz87wprf6g1v5sgb90fg2yjp"; depends=[BH deSolve gridBase gridExtra Rcpp RcppArmadillo roptim]; }; @@ -12641,20 +12654,19 @@ in with self; { magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.2.14"; sha256="1gqnivn6qjmf7axdi0pff6a40clklbipcr6qvm6ivzqbqhpbcb7v"; depends=[celestial mapproj MASS plotrix RANN sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="2.7.5"; sha256="18lxzszpd4x2l150wm762xh24zblrin3w734dkhis7mp74niddk9"; depends=[curl magrittr Rcpp]; }; - magickGUI = derive2 { name="magickGUI"; version="1.3.0"; sha256="114l5mga9x3vn9qqydyq1v75gqldh4p6m4i8ak0xw3v7p6wsf8gn"; depends=[magick]; }; + magick = derive2 { name="magick"; version="2.8.1"; sha256="13j55dwvcqbyqgx0c6vj9knqrz25pc2xz19f22b2gm0p307d3z6q"; depends=[curl magrittr Rcpp]; }; + magickGUI = derive2 { name="magickGUI"; version="1.3.1"; sha256="14jgf4bkpk8lsv3v5843mnkd241f5gpqyg5cqw7xls30d2vs2r8p"; depends=[magick]; }; magmaR = derive2 { name="magmaR"; version="1.0.2"; sha256="19jnzggjqnlv3gnc3zjfmphkwjy1y5xp6bgc2nnr6mwfs4rfxscn"; depends=[crul jsonlite]; }; magree = derive2 { name="magree"; version="1.1"; sha256="0q0v1mx4k1hry0l21611z9jx967l89xpjddvw2v1v9c3kl11kfi6"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="2.0.3"; sha256="1ljmrrm36y31db5z4cl863ap8k3jcaxk0qzy3f0cn6iag4zzigx2"; depends=[]; }; maic = derive2 { name="maic"; version="0.1.4"; sha256="0ba0kg5kgnn2g33mmhj9x8ichckyybbpn5xxc56qxvk2w2xv2wpj"; depends=[Hmisc matrixStats weights]; }; maicChecks = derive2 { name="maicChecks"; version="0.1.2"; sha256="1c2n8avrhx0lvw9hi5slymm49lzf37hbkqzkqy230aikgmpv0cpa"; depends=[data_table ggplot2 lpSolve quadprog tidyr]; }; - mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; mailR = derive2 { name="mailR"; version="0.8"; sha256="0p6vxzpyms1pxdb0j07izzxinw8xfmmbsj35nkypxyjv92qi802k"; depends=[assertthat R_utils rJava stringr]; }; mailchimpR = derive2 { name="mailchimpR"; version="0.1.0"; sha256="1f7zjclgcky1qb88638lqhr71gi5myk3d3vxkjl1xnikhcr5l9mp"; depends=[jsonlite]; }; mailmerge = derive2 { name="mailmerge"; version="0.2.5"; sha256="0i11kaxv57imyms96j8dbry8nkll3smb19ba8agcl4zxp5xxqj7a"; depends=[commonmark fs glue gmailr googledrive lifecycle magrittr miniUI purrr rmarkdown rstudioapi shiny]; }; mailtoR = derive2 { name="mailtoR"; version="0.1.0"; sha256="0mnzblhy2vbxkf0k49bw1g08jw84s59zxbjrva2j2q347wzf4rgk"; depends=[glue htmltools]; }; makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; - makePalette = derive2 { name="makePalette"; version="0.1.1"; sha256="0m5jyw6xdks8di0kx85fqnffwi7vf4zl2pj0ppah90dypy1x8924"; depends=[cluster prismatic raster rgdal]; }; + makePalette = derive2 { name="makePalette"; version="0.1.2"; sha256="0ma8dm7x07wwm94ginsah778lkwqb3nlqpydmn7g22zvbariail7"; depends=[cluster prismatic terra]; }; makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; makeit = derive2 { name="makeit"; version="1.0.0"; sha256="11v8dd1c3gw2vrnqwxr2q90vdws46bsja9fh89pn5a3qh6p09vz7"; depends=[]; }; @@ -12664,12 +12676,13 @@ in with self; { makeunique = derive2 { name="makeunique"; version="1.0.0"; sha256="0pf8cl6p3q9fzj20s4gm8amw29291xf6711v0pmp0rcnwva1zav0"; depends=[]; }; malan = derive2 { name="malan"; version="1.0.2"; sha256="0qwf0r2gwpb93gzvyp8vaw7j6rhghr6nbrfp8xw876n5j5b9jhj3"; depends=[dplyr igraph magrittr Rcpp RcppArmadillo RcppProgress tibble tidygraph]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; - malariaAtlas = derive2 { name="malariaAtlas"; version="1.0.1"; sha256="0k0406pn65ars4d6zlirfdd7z3rl2z82vsx5p97gmxnjjp6gjdpa"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; + malariaAtlas = derive2 { name="malariaAtlas"; version="1.5.0"; sha256="07dwmnfzx2883yxy3klwyv9gyglgjf976w34bb8x2qna2aw9hhz4"; depends=[dplyr future_apply ggplot2 gridExtra httr jsonlite lifecycle lubridate ows4R rlang sf stringr terra tidyr tidyterra xml2]; }; malaytextr = derive2 { name="malaytextr"; version="0.1.3"; sha256="0z5q0hl07yh528xgvzc820rdaaihgilm6ql934jh0ciswil022sm"; depends=[dplyr magrittr rlang stringr]; }; + maldipickr = derive2 { name="maldipickr"; version="1.1.1"; sha256="16ra6li4b725cpnqmm5bgmr8r38x0jnjrsc836v83h5lr8yjz3l3"; depends=[dplyr magrittr MALDIquant readBrukerFlexData rlang tibble tidyr tidyselect]; }; mallet = derive2 { name="mallet"; version="1.3.0"; sha256="1g54nq01qgmi25lgdpsw044nyschcj7wnaaqhj72hax8yl4s8vqi"; depends=[checkmate rJava]; }; malvinas = derive2 { name="malvinas"; version="0.1.0"; sha256="1afgyrn7cslrd4qxd9k5l3kyhdi99vx06360yhb9n005xfmd65kf"; depends=[]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; - mand = derive2 { name="mand"; version="1.1"; sha256="1yk9p2jiwyw7ssbfhqpl9llh7vlxsbf3drd0cc2i6fz9ycc55id4"; depends=[caret imager msma oro_dicom oro_nifti]; }; + mand = derive2 { name="mand"; version="2.0"; sha256="0058jghm1gby68cbf57lg5qrfzypamp1z2wjdygl2p06v2ihlgp0"; depends=[caret imager msma oro_dicom oro_nifti]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; manet = derive2 { name="manet"; version="2.0"; sha256="1dnacgkdjmn7yiqk71qx5jgfipbpvqfdnrdd8wm0b9p8kgw4x7n4"; depends=[combinat igraph mclust MCMCpack]; }; mangoTraining = derive2 { name="mangoTraining"; version="1.1.1"; sha256="15m9n5258yjffzhnrgp395g3iiv1f0qlv0cdsdgspmb83m5p3lbb"; depends=[tibble]; }; @@ -12679,16 +12692,16 @@ in with self; { manifold = derive2 { name="manifold"; version="0.1.1"; sha256="1amvx0f0q4s2qgn7q23gp967bcm0djbnb8bmf1bf3fm3iyn432hv"; depends=[Matrix Rcpp RcppArmadillo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.11.1"; sha256="1dpgzmiv08afm57yxr017b014lfn9h3pa4w65prk5k3dgn6p4wsv"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny shinyjs webshot]; }; + manta = derive2 { name="manta"; version="1.0.1"; sha256="1qlmpg4afplhi4m3maws0njx11am28f7hry9rb3k9mxlvss6cr66"; depends=[]; }; manydata = derive2 { name="manydata"; version="0.8.3"; sha256="11rmdj6wqjcq1lll8s38qya4ahjfx88jybkif1791fhw3l0nmkx3"; depends=[dplyr ggplot2 httr janitor jsonlite messydates plyr purrr remotes rlang stringr tibble tidyr usethis zoo]; }; manymodelr = derive2 { name="manymodelr"; version="0.3.7"; sha256="0kc4y9i21qkcg0pkwlas2mm06s54s70w5ybw4215qjwiy6xax268"; depends=[caret dplyr e1071 ggplot2 lme4 Metrics]; }; - manymome = derive2 { name="manymome"; version="0.1.10"; sha256="0k8q78y30kljp6kfb7jxrlx8gj7k5ns471sirkd511ai7mnqnldf"; depends=[boot ggplot2 igraph lavaan MASS pbapply]; }; - manynet = derive2 { name="manynet"; version="0.1.1"; sha256="1k34jd6vr6m9v2zz7lca8vhq37rrb5rdxnzdk9qjr97233acd93j"; depends=[dplyr ggplot2 ggraph igraph network tidygraph]; }; + manymome = derive2 { name="manymome"; version="0.1.13"; sha256="1izyi7hx266f7zj4rlpm9ijwj3yajlqrvdnc9899nvzl6g2whgqc"; depends=[boot ggplot2 igraph lavaan MASS pbapply]; }; + manynet = derive2 { name="manynet"; version="0.2.3"; sha256="0kc567jc0mc4v71c0ymny5zhraja6xnrcviqgm75pvzyhs13q605"; depends=[dplyr ggplot2 ggraph igraph network tidygraph]; }; maotai = derive2 { name="maotai"; version="0.2.5"; sha256="1axr16xs366011vkx3j8mljq98923kscz8wrl9m1zprw3pqif6jr"; depends=[cluster dbscan fastcluster labdsv Matrix pracma RANN Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; - mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapSpain = derive2 { name="mapSpain"; version="0.8.0"; sha256="0nfik6a7qmwb62xq4l6z9jj12qiihk4mfqn545nw2pvkmszcyhjz"; depends=[countrycode giscoR rappdirs sf]; }; mapaccuracy = derive2 { name="mapaccuracy"; version="0.1.1"; sha256="0bw69w2875z8s6ywifyx5yphzfrcv2nfbqbz1hy90x93iw6v5y0n"; depends=[assertthat]; }; mapbayr = derive2 { name="mapbayr"; version="0.10.0"; sha256="07bl6vp86c7ydwln130d2ccvizwjvd7zq1l4ifl1nspbh6p0i359"; depends=[dplyr ggplot2 magrittr mrgsolve progress purrr rlang stringr tidyr]; }; - mapboxapi = derive2 { name="mapboxapi"; version="0.5"; sha256="051g0wwsgj1pfsknbyfr5dsc0793rb5m9y0l4qzzg9ii84xz7yly"; depends=[aws_s3 curl dplyr geojsonsf httr jpeg jsonlite leaflet magick png protolite purrr raster rlang sf slippymath stringi tidyr units]; }; + mapboxapi = derive2 { name="mapboxapi"; version="0.5.3"; sha256="0xb75j7k2pl0c726wamv15ask5xqajmwxf0b0ssy6y1xjb46frar"; depends=[aws_s3 curl dplyr geojsonsf httr jpeg jsonlite leaflet magick png protolite purrr raster rlang sf slippymath stringi tidyr units]; }; mapboxer = derive2 { name="mapboxer"; version="0.4.0"; sha256="0f873js87dgk8nqnhpxh88svvsbnk81vkm7gycb62mkr4xqsgqs7"; depends=[geojsonsf htmltools htmlwidgets magrittr purrr yaml]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; mapchina = derive2 { name="mapchina"; version="0.1.0"; sha256="0f6ayq4izqxcj0hi2vfg0pc239hxgg7abb5476v5mfjjyi156mni"; depends=[sf]; }; @@ -12698,58 +12711,58 @@ in with self; { mapfit = derive2 { name="mapfit"; version="1.0.0"; sha256="0xdkc325y75mcx082b6ncp1n2mfq0yq67j2mkfdcpavnz6s8jdqg"; depends=[deformula Matrix R6 Rcpp]; }; mapi = derive2 { name="mapi"; version="1.0.5"; sha256="1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw"; depends=[data_table pbapply Rcpp sf]; }; mapiso = derive2 { name="mapiso"; version="0.3.0"; sha256="11mrvk45znna6irsd8mmkk8h63dm6wjlpsy0h8p3bldvk5mc8fi9"; depends=[isoband sf]; }; - mapme_biodiversity = derive2 { name="mapme.biodiversity"; version="0.3.0"; sha256="18psh68lapkh1wq0p5hv85cqixffd8yvzhgzyyv7wxxgqbxkdd59"; depends=[curl dplyr httr magrittr pbapply purrr rvest sf stringr terra tibble tidyr tidyselect]; }; - mapping = derive2 { name="mapping"; version="1.3"; sha256="1in4fjdiass73fdh3y937c600bdbv8gwjzxb5wj07wkc76jxb5ba"; depends=[cartography curl dplyr geojsonio ggplot2 htmltools httr jsonlite leaflet leafpop leafsync mapview rgdal s2 sf stringi stringr tmap tmaptools viridisLite]; }; + maplegend = derive2 { name="maplegend"; version="0.1.0"; sha256="1jngbampps5gn3xdy292466qq4nhx0k7c08mams84xmmb9jbq0h0"; depends=[]; }; + mapme_biodiversity = derive2 { name="mapme.biodiversity"; version="0.4.0"; sha256="026q3sjsm1yzw3iixjx3cga00f239spbss33wlxhdc4dapd434hm"; depends=[curl dplyr furrr httr magrittr progressr purrr R_utils rvest sf stringr terra tibble tidyr tidyselect]; }; + mapmisc = derive2 { name="mapmisc"; version="2.0.1"; sha256="0rj972xsl5jv7pa5q3nnqply0ivrdk7myfdxsw3hhqfsvjc8nk43"; depends=[geosphere terra]; }; + mapping = derive2 { name="mapping"; version="1.4"; sha256="1d8w6gzibbw3sqwgqcj7ww6bw95mlivpncz60fhn130qlmg1d0p4"; depends=[cartography curl dplyr geojsonio ggplot2 htmltools httr jsonlite leaflet leafpop leafsync mapview s2 sf stringi stringr tmap tmaptools viridisLite]; }; mappings = derive2 { name="mappings"; version="0.1"; sha256="1f7m6nbdzdcxsk4m8rh8fzrck8pzxl2lgfz5c6wramwmp8rxczzb"; depends=[]; }; - mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; }; + mapplots = derive2 { name="mapplots"; version="1.5.2"; sha256="064a3jc7p4wh5x8rxmjap6kqkg19zfkq8ac820d9sm35d0fia3pd"; depends=[]; }; mappoly = derive2 { name="mappoly"; version="0.3.3"; sha256="0rfp4b5flc4ip2c6z6wq4yyqj99jnl1vrwv6277vhlfpv91fxjr1"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plot3D plotly princurve Rcpp RcppParallel RCurl reshape2 rstudioapi smacof vcfR zoo]; }; mappp = derive2 { name="mappp"; version="1.0.0"; sha256="19c8575w9r1w32hqwdmmggh21lqahy73vw8g5qbxxna6r77zg5c7"; depends=[memoise parallelly pbmcapply progress purrr rlang]; }; mapproj = derive2 { name="mapproj"; version="1.2.11"; sha256="0z9lhv006pw4mwqlghvgvv66ga958bs6n1k6fmqjdpirr4f20bfv"; depends=[maps]; }; maps = derive2 { name="maps"; version="3.4.1"; sha256="0034114pdakxcx480b45qy9j4vq1v5ss961ssy92w4nqiqhsb4z6"; depends=[]; }; mapsFinland = derive2 { name="mapsFinland"; version="0.2.2"; sha256="13kq22z0dpsq9dk6ni2rkgbkcxccr6dby3mnc3m5sj58am48zyky"; depends=[]; }; - mapsPERU = derive2 { name="mapsPERU"; version="1.0.2"; sha256="0ld6dyqrppmc1pna2h8szvr61d3bhljx9pv616wsp5j74na3ynbg"; depends=[tibble]; }; + mapsPERU = derive2 { name="mapsPERU"; version="2.0.0"; sha256="09z9hjpms039m8sjpb91q1f5knnncbyzciw7g5mhw11f9xsijj4k"; depends=[tibble]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="2.0.1"; sha256="0v2ijx54nyfgnxh77d47lsflvqfcbdzza3finfx3z1dwl6sdd056"; depends=[gstat terra]; }; mapsapi = derive2 { name="mapsapi"; version="0.5.4"; sha256="0gk5k0zf3yzq7rzw17j7ph3fzpf6q6j777ri242wmi75xzkamrsc"; depends=[bitops httr RgoogleMaps sf stars xml2]; }; mapscanner = derive2 { name="mapscanner"; version="0.0.6"; sha256="017m33v2523rjmspfbzq1xnb3clzmbn4p1qqzp480j71wy5c1dry"; depends=[cli curl fs glue magick magrittr memoise pdftools png purrr raster Rcpp reproj RNiftyReg sf slippymath tibble]; }; - mapsf = derive2 { name="mapsf"; version="0.7.0"; sha256="0182kjgnp4s3bvrr5fgqngsi5sl1gfmv13zx6n9paqf4f1gmfan5"; depends=[classInt Rcpp sf]; }; - maptiles = derive2 { name="maptiles"; version="0.5.0"; sha256="14kscdgj6yvajqq52axq465d844azg9w5xplfr51b00jbfxmwn23"; depends=[curl png sf slippymath terra]; }; - maptools = derive2 { name="maptools"; version="1.1-8"; sha256="1xz0cqg629vz7mawwxx650mgmvh3wzn25rnxy4sij5jrypipk1ay"; depends=[foreign lattice sp]; }; + mapsf = derive2 { name="mapsf"; version="0.7.1"; sha256="0lkzn1nm7rwzag0shik4hqcxvsdsj1xqkfy68l2qgdr1qxgvldc6"; depends=[classInt Rcpp sf]; }; + maptiles = derive2 { name="maptiles"; version="0.6.1"; sha256="1pwmwibqazzwgn0lbljlsg29ib0zvhcf7yd8080a84gh08qwb8a3"; depends=[curl png sf slippymath terra]; }; maptpx = derive2 { name="maptpx"; version="1.9-7"; sha256="0f85i3vwr5rvz261z6j7x15gsahxrq4qqddfb0qyhypgihvwh857"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-8"; sha256="1x35nk4fi2b62krcvcv187n5sbqrgvw4pbm7r19ps3jlanpi5ksm"; depends=[cluster rpart]; }; - mapview = derive2 { name="mapview"; version="2.11.0"; sha256="02nkyh3m2l3jblii25c7p2yjjx7lka5l6hx7h882060959bczy47"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales servr sf sp webshot]; }; - maq = derive2 { name="maq"; version="0.1.0"; sha256="1s3a93305jy8h2pw93574b9gkc7a7agzb9w6030ibkzbg4a7d91h"; depends=[Matrix Rcpp]; }; + mapview = derive2 { name="mapview"; version="2.11.2"; sha256="1c18fc8r5anc9wn541dzhchys2pmxc7pp797bq065brs5drpyka1"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales servr sf sp]; }; + maq = derive2 { name="maq"; version="0.3.1"; sha256="1b835hw79kkmvmpln7mszczdhhqh5q371f2jviqabjl58b6wcsyd"; depends=[Rcpp]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; - maraca = derive2 { name="maraca"; version="0.5.0"; sha256="09fvzyvi0szyw4xlkc8pslw0zznprvpvn5zjnw9yv9c899y9gj90"; depends=[checkmate dplyr ggplot2 hce tidyr]; }; + maraca = derive2 { name="maraca"; version="0.5.1"; sha256="0ibbv36nhm37w5l1jvghkkcc662w9wfpfvz6nydlwrkdqiwk4g54"; depends=[checkmate dplyr ggplot2 hce tidyr]; }; marble = derive2 { name="marble"; version="0.0.2"; sha256="15m65ikk52khjrwgy2xl8pj671rf3yfqjghx2zdcs43afsyfisa0"; depends=[Rcpp RcppArmadillo]; }; march = derive2 { name="march"; version="3.3.2"; sha256="1qdjajb5mkq2r7p224kbxhf01s75hry5c5hx1cnsb48dfzd2s5xg"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; - marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; }; + marelac = derive2 { name="marelac"; version="2.1.11"; sha256="0wl1z4sq61qq8d3szcd772rw35mlcrf7d9g8q9dr0znwvfj9gqdh"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; margaret = derive2 { name="margaret"; version="0.1.4"; sha256="1hyflwfw9pphcbxnx9wf0alqi17s5k3j7wvh95ka2h9fvyrpj11r"; depends=[devtools dplyr httr igraph lubridate purrr readr rlang rvest scholar stringi stringr tibble tidyr tidytext tidyverse treemapify usethis widyr writexl]; }; - marginaleffects = derive2 { name="marginaleffects"; version="0.13.0"; sha256="0cz7vjmqgkd5cmaw6zp669gzpngc31dbcn5larnyhf0bisk5c0mf"; depends=[checkmate data_table generics insight Rcpp RcppEigen rlang]; }; + marginaleffects = derive2 { name="marginaleffects"; version="0.16.0"; sha256="0w83n68fr3igjilqp35w96pf0srcz17q5j6ii7r34y7zjgrn46md"; depends=[checkmate data_table generics insight Rcpp RcppEigen rlang]; }; marginalizedRisk = derive2 { name="marginalizedRisk"; version="2021.2-4"; sha256="0kagl9xghq9nsh9qvx165j1a5plh08zxhb6nm8j402mnl8pq7a4z"; depends=[]; }; margins = derive2 { name="margins"; version="0.3.26"; sha256="0sx5xjbzz1rjz8bklfna3171s53xsh123x4bh0kmwp006v8rv309"; depends=[data_table MASS prediction]; }; marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; }; - mark = derive2 { name="mark"; version="0.6.0"; sha256="05hh5jzf8yr2x4kjd26n1g2bq9faypn08bqxc3p4s9awy6lac6h2"; depends=[fuj magrittr]; }; - markdown = derive2 { name="markdown"; version="1.7"; sha256="1cfgrlmbn54nsn0k568xdcg08dxb8flhsysmnfrhci0pa93rlayb"; depends=[commonmark xfun]; }; + mark = derive2 { name="mark"; version="0.7.0"; sha256="0zbzp4y7gh6bq20ymfpmfihxn0z8gl0xn5fcshikh59ikqrm0mff"; depends=[cli fs fuj magrittr rlang]; }; + markdown = derive2 { name="markdown"; version="1.11"; sha256="052zrb6bnr6k3p9pmm3vfh3g7z20g6pjvphjdiqyjb4mb9sn3z27"; depends=[commonmark xfun]; }; markdownInput = derive2 { name="markdownInput"; version="0.1.2"; sha256="1qxil2liikbbn6w8niyc03fwqvwvdv6wiy98ip8j77729i7g2hln"; depends=[markdown shiny shinyAce]; }; - marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; + marked = derive2 { name="marked"; version="1.2.8"; sha256="1i5vay60g6ddqnnqdj89yhsqxdcw9yzqpwq9gv7qc1psb8f77052"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; markerpen = derive2 { name="markerpen"; version="0.1.1"; sha256="0i9md9vbqkxibjkn37givxzq8mq0232cvv2fyz6g8cj6flxm6vzr"; depends=[Rcpp RcppEigen RSpectra]; }; marketr = derive2 { name="marketr"; version="0.0.2"; sha256="12nhlz40n80i6zg7y5w9zknq9qpk9qwd3wbvvya1ff8gq195147w"; depends=[dplyr magrittr tibble tidyr]; }; markets = derive2 { name="markets"; version="1.1.4"; sha256="1s2c991m11c28xff7h5dg09qzs28f6gizn1frsxqfdddp03x70cg"; depends=[dplyr Formula MASS Rcpp RcppGSL RcppParallel rlang]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.6"; sha256="1w96jmb6iiw4ghmc73l721fdrq5k197fv21fz7spiapaa5xzbkrb"; depends=[checkmate codetools httr rlang testthat yaml]; }; - markophylo = derive2 { name="markophylo"; version="1.0.8"; sha256="05hfykjzx4wf2p1d6dvyx5lizfxmq3zprvnfg74r7l1izp7wpl38"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; + markophylo = derive2 { name="markophylo"; version="1.0.9"; sha256="0w6csdvlybfx8azjsrz40mykafgqkl0w23bf2mm2ff5jh6cym66a"; depends=[ape geiger numDeriv phangorn Rcpp RcppArmadillo]; }; markovMSM = derive2 { name="markovMSM"; version="0.1.3"; sha256="1ip96xl8xzh2mhrmd1kmjih7rm2lxf9k4ndf6wcq86r3jzqp4zf0"; depends=[mstate survival]; }; - markovchain = derive2 { name="markovchain"; version="0.9.3"; sha256="1p8vjz8yfrbn0i4qz249lsrjvgayzcj97n51xwmi7bp7zvk2lx0r"; depends=[expm igraph Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.9.5"; sha256="0z67i4j676gwvxyf1gw73x7jib7jm5jgyzqvami47mfvc3b2dygf"; depends=[expm igraph Matrix Rcpp RcppArmadillo RcppParallel]; }; markovmix = derive2 { name="markovmix"; version="0.1.2"; sha256="1paqdghzpaxvqashr4lcrgnp7k1821cmwbwszyml8h78bf9ldj9z"; depends=[dplyr forcats pillar purrr Rcpp rlang tibble tidyr]; }; marmap = derive2 { name="marmap"; version="1.0.10"; sha256="0zmik6hpc44syknn7k9pbmy01jpnlp4sc9n3rhslrpnks39l0hvq"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marp = derive2 { name="marp"; version="0.1.0"; sha256="0vywqsvmhghldrpnh2dpkgz41r7q463whfhgrn38pg8jnyhliiwi"; depends=[gtools statmod VGAM]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.8"; sha256="172zr3jg48wr631l61811vd04llm3chirdhbp2mc8zryn3bbcd6n"; depends=[doParallel foreach]; }; - mas = derive2 { name="mas"; version="0.1"; sha256="07z0a6yis23zib16msjgx22mrag5xjbjpczj4kanvn8m3xikxrz3"; depends=[Rcpp RcppEigen truncdist]; }; - mase = derive2 { name="mase"; version="0.1.3"; sha256="10wyrvh3p344inx5qbzkwh4rr3lmpnh1ikhrghmlqr5607kiy3fm"; depends=[boot dplyr glmnet magrittr Rdpack rpms survey]; }; - mashr = derive2 { name="mashr"; version="0.2.69"; sha256="1m52bdyfni193fh8xhq6z372zj0cqc8x6wb8cwyls4qjwx3x263c"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; + mas = derive2 { name="mas"; version="0.2"; sha256="0iksx2339nwbcg7c8vfkhr3yaxm6z98w61wwv9zwmgrr18ifg4n5"; depends=[Rcpp RcppEigen truncdist]; }; + mase = derive2 { name="mase"; version="0.1.4"; sha256="0qfffkq4dvp7hrfgvbdzmk732iac4qf56ccyialyhnhjg581v5xi"; depends=[boot dplyr glmnet Rdpack rpms survey tidyr]; }; + mashr = derive2 { name="mashr"; version="0.2.79"; sha256="11pqhnzp1svhs565hm0v15ip1pgnl609ssm4d0qzl8vm4xq3d2qm"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; maskRangeR = derive2 { name="maskRangeR"; version="1.1"; sha256="1pdj0jdxrqss6hp20163fh1ywdd6wmwjl4s8gnpd3m9d1j955gr3"; depends=[dplyr e1071 lubridate magrittr raster sp]; }; - mason = derive2 { name="mason"; version="0.3.0"; sha256="1x5wiagb1sy5gkp0xkbr1jzhrjg1c2bqdh4hy6igwcnws2cbhxyr"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; masscor = derive2 { name="masscor"; version="0.0.7.1"; sha256="1153gx648csmzc2znf7l84f134qzp238hqj2s60r9najk1pczgf6"; depends=[metRology]; }; massiveGST = derive2 { name="massiveGST"; version="1.2.3"; sha256="13qhn15gr4fvri1p843zz7y1q6701qmkxq5lysydfmdaxp5hsaxd"; depends=[formattable igraph msigdbr visNetwork WriteXLS]; }; mastif = derive2 { name="mastif"; version="2.0"; sha256="1jfb46f28pkf14xj16n37hbnxg57vjlz7gjhr01bb82dhd293mxw"; depends=[corrplot RANN Rcpp RcppArmadillo repmis robustbase stringi stringr xtable]; }; @@ -12757,7 +12770,6 @@ in with self; { match2C = derive2 { name="match2C"; version="1.2.4"; sha256="05g0g471dfxrfxq9a5l5zgj16m4kh39wfihjj8fdd9b7qxji7ps8"; depends=[ggplot2 mvnfast rcbalance Rcpp]; }; matchFeat = derive2 { name="matchFeat"; version="1.0"; sha256="0jh484rr71b7887igfslbg7xbr661l9c34d650xd7ajx4gfpn540"; depends=[clue foreach]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.12"; sha256="1mkp4pkqhfrv3a0js8yc25gd2ifk8wwyrsskwggyxpqv6pnmpapw"; depends=[coin dplyr magrittr MASS mvtnorm plyr rcbsubset rlang sandwich weights]; }; - matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-4"; sha256="0rrwzbzb8nmqriw0kvk07ypmvbxg429xfv79a60s79qqffc1vryd"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.3.3"; sha256="1wr1faaixn5scx2c8g2jfvfm489k0ah9isza67gz0db8knja9nig"; depends=[Rcpp RcppArmadillo]; }; matchmaker = derive2 { name="matchmaker"; version="0.1.1"; sha256="1sa2cah8gjvg0159rv1sfw9p0aljg66xmij31mz2vfk5683r4b00"; depends=[cli forcats rlang]; }; @@ -12781,22 +12793,22 @@ in with self; { matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; matrixStats = derive2 { name="matrixStats"; version="1.0.0"; sha256="0vxd7g1fm4x0f72bs1xfik1d4yklvpjdyg1hpx86pl8fwr86i1wl"; depends=[]; }; matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; - matrixTests = derive2 { name="matrixTests"; version="0.2.2"; sha256="0xgmgcs1awzh1h3j8sfb44gazgfrh9m2ngz3ziq43m84lv7vxn5r"; depends=[matrixStats]; }; + matrixTests = derive2 { name="matrixTests"; version="0.2.3"; sha256="0d7i00cxzszfdnjm8q5b72ildic8nig6fbw7rba6acdnllpp7sza"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-6"; sha256="09pk0ym6qzribxc6v18cpb6478i4r4kzxpkljjbb3n323zqx5iqb"; depends=[]; }; matrixcut = derive2 { name="matrixcut"; version="0.0.1"; sha256="1q1m6yd42cwxdnysjgcnp7mg8f9cryphd59k0wzsrirqnj8c1jz4"; depends=[igraph inflection]; }; matrixdist = derive2 { name="matrixdist"; version="1.1.9"; sha256="1lf4ar7fl3agcydcv01q0zqlnwdd501fk132nlbwb03ng6dmd2im"; depends=[nnet Rcpp RcppArmadillo reshape2]; }; matrixprofiler = derive2 { name="matrixprofiler"; version="0.1.9"; sha256="1kqpxg0mvyc494nr2whrcwjaa51jm5n2mxjwhdcr87jqp5y3hma6"; depends=[checkmate Rcpp RcppParallel RcppProgress RcppThread]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; matrixset = derive2 { name="matrixset"; version="0.2.0"; sha256="06fnm8l9cqciximnj1q20841c8133zkjxap2gkid5mj4mnlnwv2r"; depends=[cli crayon dplyr Matrix pillar purrr R6 Rcpp rlang stringr tibble tidyr tidyselect vctrs]; }; - matsbyname = derive2 { name="matsbyname"; version="0.6.3"; sha256="1ncqjmcfbypysqqkrprb4xwqvzkrajbd7sp189ji8a9s982sv284"; depends=[assertthat dplyr lifecycle magrittr Matrix matrixcalc purrr RCLabels rlang tibble]; }; - matsindf = derive2 { name="matsindf"; version="0.4.3"; sha256="0zcfsvry7nna95lgyim8lb6yh0ikkn3plar04inwp8nfwlyanflx"; depends=[assertthat dplyr lifecycle magrittr matsbyname purrr rlang tibble tidyr]; }; + matsbyname = derive2 { name="matsbyname"; version="0.6.6"; sha256="1vz5i82mif1b1640l86ly4k91k756dj30bkhxlgxvycapl9b0lg9"; depends=[assertthat dplyr lifecycle magrittr Matrix matrixcalc purrr RCLabels rlang tibble]; }; + matsindf = derive2 { name="matsindf"; version="0.4.4"; sha256="1rqhzk271y19i8mrcwcfb1ckdxx9adzs6in9xwlqic4n0yscmji9"; depends=[assertthat dplyr lifecycle magrittr matsbyname purrr rlang tibble tidyr]; }; matuR = derive2 { name="matuR"; version="0.0.1.0"; sha256="01nxs4czzs1kcxk63nwr2gnvffmlnx3yfllrhi8khdkj498s6sx1"; depends=[dplyr ggplot2 ggrepel lubridate magrittr tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; mauricer = derive2 { name="mauricer"; version="2.5.2"; sha256="1zd68dzbbcck0y7bk6dw3yp6v9rh824cp3f0vza6y7lav40q1p2v"; depends=[beastier stringr]; }; maxLik = derive2 { name="maxLik"; version="1.5-2"; sha256="0pdigfpyiqacj2ydhpn5w1h89dz1ydk0syzs25lsgdi40sz0bvkw"; depends=[generics miscTools sandwich]; }; maxcombo = derive2 { name="maxcombo"; version="1.0"; sha256="1hwv38a07ry5fv53r2vizifj83xf98znix8nx4zshqyk38vblgp5"; depends=[dplyr magrittr MCMCpack mstate mvtnorm purrr rlang survival]; }; maximin = derive2 { name="maximin"; version="1.0-4"; sha256="0pkf84313x5r7qmhfbd70rjmxffrfk6kzirw1wzrqqygbmcw8k4s"; depends=[plgp]; }; - maxlike = derive2 { name="maxlike"; version="0.1-9"; sha256="0pv55ydmjj7kdmfac7a0y6rc32ym5vza8fs7qyavnx8ss9fv2bv3"; depends=[raster]; }; + maxlike = derive2 { name="maxlike"; version="0.1-10"; sha256="0csixdzvs5kynd37c6zl985pazxqw8zh204pddxh7rj0872g82hc"; depends=[raster]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; maxnet = derive2 { name="maxnet"; version="0.1.4"; sha256="05l24dksdgb43dpi4py4qkh8j9ynrnsglydy3gph1b61ygnfa8gx"; depends=[glmnet]; }; maxnodf = derive2 { name="maxnodf"; version="1.0.0"; sha256="1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3"; depends=[Rcpp]; }; @@ -12807,14 +12819,13 @@ in with self; { mazeinda = derive2 { name="mazeinda"; version="0.0.2"; sha256="0c32vh75d4wjpyxrqwyf16fw6jbmig037py3c1417hx3621782kh"; depends=[foreach]; }; mazing = derive2 { name="mazing"; version="1.0.5"; sha256="1nabv5hxb58d56r4z8v4glhwiz5lf8j9gdlwncxazm6j2fcjh26s"; depends=[]; }; mbRes = derive2 { name="mbRes"; version="0.1.7"; sha256="19my8lwyn7i0fcsffz0w334apxrffs6sph1svh5mwa9syyvspxaz"; depends=[cowplot data_table dplyr forcats ggplot2 magrittr purrr scales tibble tidyr]; }; - mbbefd = derive2 { name="mbbefd"; version="0.8.10"; sha256="0963lwwb629dwgv1jk4y3438rfj0lm9g6q930xbgxdsc34hn3ppb"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; - mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; + mbbefd = derive2 { name="mbbefd"; version="0.8.11"; sha256="0yhrbyydbxibxxffk5y35yv7k0i8aq8qdkkzgpvzfmyipl1lgbnv"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbend = derive2 { name="mbend"; version="1.3.1"; sha256="0g7hqjdhaj99rd2jqfb6x7k7gsfcvhdibai3093qcvhv6grb3v7m"; depends=[]; }; mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; }; mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; }; mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; mbmixture = derive2 { name="mbmixture"; version="0.4"; sha256="0g74jzhdf8grrp7pipj1m6hvyv4akycabm0ingy505a5a546ddzg"; depends=[numDeriv]; }; - mboost = derive2 { name="mboost"; version="2.9-7"; sha256="01ln0vxbbx1fq77q17sx61si82lhfibbchsnf2yw9032cn8wnhh2"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; + mboost = derive2 { name="mboost"; version="2.9-8"; sha256="1jyigxi5lzcaa6psc8lyvw2b6ylldqlnps3jlvjrl9zr6336nk6n"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; mbr = derive2 { name="mbr"; version="0.0.1"; sha256="08534d0ssj5zli7880a2wzl46ydf87gn5xlv6xp0iph71wlpc52y"; depends=[data_table dplR MASS Matrix Rfast]; }; mbrdr = derive2 { name="mbrdr"; version="1.1.1"; sha256="1ck0l2zp10xlg2d99glb76fxhc1r21aknk8x8452v25gpaqvir4c"; depends=[]; }; mbreaks = derive2 { name="mbreaks"; version="1.0.0"; sha256="1vnrn7f19j52jn707ps9mjz5p0rgcm7mmwbq585hf4c4mbyglrbz"; depends=[ggplot2]; }; @@ -12822,12 +12833,11 @@ in with self; { mbsts = derive2 { name="mbsts"; version="3.0"; sha256="0qgb74ah1jq6rla2qkid1i75xjp2l9qxkpbbqilhzqg64rkcn9ha"; depends=[BBmisc ggplot2 KFAS MASS Matrix matrixStats MCMCpack pscl reshape2]; }; mc_heterogeneity = derive2 { name="mc.heterogeneity"; version="0.1.2"; sha256="1nsqbc4cqyg6g3s6ish3fbhqygy1kay68smbv0rhivp0x0dv7can"; depends=[boot_heterogeneity metafor]; }; mc2d = derive2 { name="mc2d"; version="0.2.0"; sha256="07h2gvmdfqjydikxksbqhikihg46fv6xyn8vk5kyni6x75gp9abk"; depends=[ggplot2 ggpubr mvtnorm]; }; - mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; }; mcMST = derive2 { name="mcMST"; version="1.1.1"; sha256="058da7hhcizh902pj99wmf5mhfd6fhpjvf6cprbsl0fx19x9l14w"; depends=[BBmisc checkmate ecr ggplot2 grapherator gtools igraph qgraph vegan viridis]; }; mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; mcauchyd = derive2 { name="mcauchyd"; version="1.0.2"; sha256="0qlfmxcpaq8l5ix4b0mnbzgjrq47wchxvzjq6iqkbsjzz2h48bjm"; depends=[MASS rgl]; }; mcb = derive2 { name="mcb"; version="0.1.15"; sha256="0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj"; depends=[ggplot2 glmnet lars leaps MASS ncvreg reshape2 smoothmest]; }; - mcbette = derive2 { name="mcbette"; version="1.15.1"; sha256="0lrdbbd1abzg4fgp8lfybqkkkv4ax6yijqq2bzb05n5yzslak1kx"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; }; + mcbette = derive2 { name="mcbette"; version="1.15.2"; sha256="1ckbz9i3zmm8r4y7cx0n9d2jqzx8lmf497ywqmx8bq3mprqxnb5p"; depends=[babette beastier beautier curl devtools mauricer Rmpfr testit txtplot]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; mcboost = derive2 { name="mcboost"; version="0.4.2"; sha256="0748av1dy6fag33slhi24km17qpi7y6cydl1vmdhxz96902lcr5r"; depends=[backports checkmate data_table glmnet mlr3 mlr3misc mlr3pipelines R6 rmarkdown rpart]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; @@ -12838,9 +12848,8 @@ in with self; { mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; }; mcemGLM = derive2 { name="mcemGLM"; version="1.1.3"; sha256="0159zak179ziax5n1mmncidg50cjiqzfyc8j96585csah1dzx01d"; depends=[Rcpp RcppArmadillo trust]; }; mcen = derive2 { name="mcen"; version="1.2.1"; sha256="16f7860h6hbpnv1drk793mz3vwm9q4ar6xkag05z0p22p69mm4qy"; depends=[faraway flexclust glmnet Matrix]; }; - mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; }; - mcglm = derive2 { name="mcglm"; version="0.8.0"; sha256="04zl3y5zvms5n0s1mzsb8dm9g57l84zk16516kwni3gxmdkaq4sw"; depends=[assertthat Matrix Rcpp RcppArmadillo]; }; - mclcar = derive2 { name="mclcar"; version="0.2-0"; sha256="0zgf7ha22586nh1yzdnhz1rzrqkn6yzr12qva9ag297ry4z4bn5y"; depends=[fields maxLik nleqslv rsm spam spatialreg spdep]; }; + mcga = derive2 { name="mcga"; version="3.0.6"; sha256="1zj1bspw950zl2bh0dhn872f637iabk4gyrs8igrjyhm5calaj07"; depends=[GA Rcpp]; }; + mcgibbsit = derive2 { name="mcgibbsit"; version="1.2.2"; sha256="1ykg2g57zxaw2z9f7sgyd6kc6wx1lmad13asiy7q79ydzw8x8smw"; depends=[coda]; }; mclm = derive2 { name="mclm"; version="0.2.7"; sha256="1vpg6xsa8im60ld5mlm6yhf2prs6kmwn0sn12b9g8v27dgw3h0iq"; depends=[ca crayon dplyr Rcpp readr stringi stringr tibble tm xml2 yaml]; }; mclogit = derive2 { name="mclogit"; version="0.9.6"; sha256="0sbglgak6jhhpx65jnj59hbpvzs8qjsdjc4w02z0m5j9hrnmzp4s"; depends=[Matrix memisc]; }; mclust = derive2 { name="mclust"; version="6.0.0"; sha256="0ahj5161lmid0gxyw6vidd4ig50l1374iisn9970zvx1rdp30z6y"; depends=[]; }; @@ -12848,21 +12857,22 @@ in with self; { mclustcomp = derive2 { name="mclustcomp"; version="0.3.3"; sha256="1kxrms77m7n9lv32771zvwg82xqh5kx8al6f0bknsj8idq8aqbh3"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; mcmcOutput = derive2 { name="mcmcOutput"; version="0.1.3"; sha256="1jw4wyppzlnxaa3iahbwx4gxs3zvppy980rc92dvy18y2sr5138v"; depends=[coda HDInterval MASS]; }; - mcmcabn = derive2 { name="mcmcabn"; version="0.5"; sha256="0mr6zqsqbd9pasdz5sz7capirvfz0gws2v0i914h6pxx3blws7m5"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; + mcmcabn = derive2 { name="mcmcabn"; version="0.6"; sha256="0vk5km8bk00pxi8qlcq9z3imhj1c9qys6wj8v6iimb1mkxy9ds7c"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; mcmcderive = derive2 { name="mcmcderive"; version="0.1.2"; sha256="0v89nyvr2d57zvjy9qq6drqb48s4n88hb65pima1gx4aqb479yfh"; depends=[abind chk extras mcmcr nlist purrr universals]; }; mcmcensemble = derive2 { name="mcmcensemble"; version="3.0.0"; sha256="1yf8mm0nmw0x89pj3is5rv3arcfbxvkfh8bip1sprcqzsrixa0s8"; depends=[future_apply progressr]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcr = derive2 { name="mcmcr"; version="0.6.1"; sha256="0ag8awdibrcylm7gshb60lxyv167k62zldffi7axni3z8w4s9cy5"; depends=[abind chk coda extras generics lifecycle nlist purrr term universals]; }; - mcmcsae = derive2 { name="mcmcsae"; version="0.7.4"; sha256="0r4p93s4pan4zzhan84igxnswfczz4gn4dqjiza2cq7bba67fi2f"; depends=[GIGrvg loo Matrix matrixStats Rcpp RcppEigen]; }; + mcmcsae = derive2 { name="mcmcsae"; version="0.7.5"; sha256="0zivassh708hysq43dhj1v78hglvvz308hyg7r0rm1pydzb4f0zi"; depends=[GIGrvg loo Matrix matrixStats Rcpp RcppEigen]; }; mcmcse = derive2 { name="mcmcse"; version="1.5-0"; sha256="0qvlkv7j35h2lxdzhbsbsrf1cgsbgf4in7lxgwmx7vs85k10v0ja"; depends=[ellipse fftwtools Rcpp RcppArmadillo testthat]; }; - mcmsupply = derive2 { name="mcmsupply"; version="0.1.1"; sha256="07hjync6virrrc622kcqq154rm8q9d88qivjv6kqlzfyyyfjc617"; depends=[abind dplyr foreach ggplot2 magrittr plyr R2jags readxl rlang runjags stringr tibble tidybayes tidyr tidyverse]; }; + mcmsupply = derive2 { name="mcmsupply"; version="0.2.2"; sha256="0mzph8grgcz62rz2z4y4dgmp9xapf2b29lck960lhqp7h2m9awg4"; depends=[abind dplyr foreach ggplot2 magrittr plyr R2jags readxl rlang runjags stringr tibble tidybayes tidyr tidyverse]; }; mco = derive2 { name="mco"; version="1.15.6"; sha256="10h5d2lw6ybyva44nn5wml6v3ljpnv9m1b2lh36vg2cwrdwy5sqp"; depends=[]; }; - mcompanion = derive2 { name="mcompanion"; version="0.5.7"; sha256="18yz16k8kq2g00k7kr9yj543ybf1l7gyji1g6584ahsmxy3qlwfv"; depends=[gbutils MASS Matrix Rdpack]; }; + mcompanion = derive2 { name="mcompanion"; version="0.5.8"; sha256="14bv7ljz45x1n2gihbhlwh3zz68bpj7mqz0702k4j9139gra3zk0"; depends=[gbutils MASS Matrix Rdpack]; }; mcount = derive2 { name="mcount"; version="1.0.0"; sha256="1l42d4xd2xyvgzvc8sj59qsnpfn2k8x57dqv4bx9yschm25hspdd"; depends=[bbmle]; }; mcp = derive2 { name="mcp"; version="0.3.3"; sha256="1c19y2611crvxcpz1wl2l5lf7ln9dkc56d14ri30hj44wz2liwdf"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork rjags rlang stringr tibble tidybayes tidyr tidyselect]; }; mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; }; mcprofile = derive2 { name="mcprofile"; version="1.0-1"; sha256="118n3pxzjm4j9y09d1n2hw7pm0b8b0m8mnm5v9kq76vignklh75l"; depends=[ggplot2 mvtnorm quadprog]; }; - mcr = derive2 { name="mcr"; version="1.3.2"; sha256="0lcl8g6s5sq74hpdj4wj9xh3p7nr03h9wnlnib1pmdcs1avlp3za"; depends=[robslopes]; }; + mcr = derive2 { name="mcr"; version="1.3.3"; sha256="1blaswdd1754fg6xdznkqq1igj6i6x8r3r9vdn3jpfq41qba5d40"; depends=[robslopes]; }; + mcradds = derive2 { name="mcradds"; version="1.0.1"; sha256="1cq6z8ia2dr43cgxgzpag2aydcsl8shj91sw53ysg865wncirmh6"; depends=[boot checkmate DescTools ggplot2 lifecycle magrittr pROC purrr VCA]; }; mcreplicate = derive2 { name="mcreplicate"; version="0.1.2"; sha256="12pmfp75sc00cdrkx4xniq74qqx3y67qxwdrrbp2mf562pdn2gmn"; depends=[]; }; mctest = derive2 { name="mctest"; version="1.3.1"; sha256="1d248r9ifwl1xhvka6z69l943rvbq7s7ag6vqp9lljkcybvg75f2"; depends=[]; }; mctq = derive2 { name="mctq"; version="0.3.2"; sha256="1qp9jmpi6pbzn8jqg0i35zznc1sawi1jnky5cdf26hlyi2bjxy48"; depends=[checkmate cli dplyr ggplot2 hms lifecycle lubridate]; }; @@ -12872,11 +12882,11 @@ in with self; { md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; md_log = derive2 { name="md.log"; version="0.2.0"; sha256="1k0l3imx1jdlf6fks7x8q8lg2l4090fq069h5x4i0nwq71sfslj0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.5-4"; sha256="0nd7p3yz7qdzka7jizymv5vhbhzb4v8bjpmmn5wa83vxh0l7ypzj"; depends=[class]; }; - mdatools = derive2 { name="mdatools"; version="0.14.0"; sha256="1n2sa12r13bw8006cb1srgxmh3hq1xxn7jnksnfapn3qdr2ahqr2"; depends=[Matrix]; }; + mdatools = derive2 { name="mdatools"; version="0.14.1"; sha256="1fbjrg0xwa9bgm8gkvd2xk17xax3yzf3zjzkh7c9627v8r6gnp8j"; depends=[Matrix]; }; mdbr = derive2 { name="mdbr"; version="0.1.2"; sha256="1c33v2dqz1jjh730p486bi07h9m9clpcfrbvhbvwb8fslqxg76qd"; depends=[readr]; }; mde = derive2 { name="mde"; version="0.3.2"; sha256="121bzypndsx4abls1f7rjrvg98rqkb155vd5aiql8vi1lwgzy9jl"; depends=[dplyr tidyr]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; - mdendro = derive2 { name="mdendro"; version="2.1.0"; sha256="1hpm7aqfg340nrrn8m962kwaw67myvcrkv9yihdrxh5gmcjdbhxf"; depends=[Rcpp]; }; + mdendro = derive2 { name="mdendro"; version="2.2.0"; sha256="19da8q31s8d8452bb3qcmrn81z663fy2wf4apbywq0dal9s63rrv"; depends=[Rcpp]; }; mdftracks = derive2 { name="mdftracks"; version="0.2.1"; sha256="0j1j3dbl5g8zv59ppyvnxp39vpd24ygxbdhnavjwnw1v1fpippbf"; depends=[]; }; mdgc = derive2 { name="mdgc"; version="0.1.7"; sha256="0p2dfvngyv9rwbcjfw7s3diim9k2gbjn7qsmh7ybxhd529y4w0yl"; depends=[BH psqn Rcpp RcppArmadillo testthat]; }; mdhglm = derive2 { name="mdhglm"; version="1.8"; sha256="1myky8d2ilwdliqrzd2i5qvja82iz7w6qbigl7h4znpk8pdgrjb3"; depends=[boot Matrix mvtnorm]; }; @@ -12886,7 +12896,6 @@ in with self; { mds = derive2 { name="mds"; version="0.3.2"; sha256="1r4cz49h1sp1kl1sjqapadhd49lpdnr48w9xbwgpfh2ghwxfcval"; depends=[lubridate parsedate]; }; mdsOpt = derive2 { name="mdsOpt"; version="0.7-1"; sha256="1vsi3whh898djaa0an6r37va1nbdmjsmhnm17m28sgfld9s5nbzk"; depends=[animation clusterSim plotrix smacof spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; - mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.2.7"; sha256="0b1z1ng6zzqwrn0a5i17jcqwh5yyv7nqyghp8w9r6ik1q46hmvz1"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 htmlwidgets kableExtra RMariaDB skimr stringr tibble webshot2]; }; mdthemes = derive2 { name="mdthemes"; version="0.1.0"; sha256="1k0fylg8jz0xdfwq85wap6lgrb9zi219vhmry4lysqssx2szkngk"; depends=[cowplot ggplot2 ggtext ggthemes hrbrthemes tvthemes]; }; mdw = derive2 { name="mdw"; version="2020.6-17"; sha256="0jjajgb1w3vx7vqn2z90xq39hvbcrrd2ky8p31g5absqwwm7lwpa"; depends=[kyotil MASS Matrix]; }; @@ -12898,14 +12907,14 @@ in with self; { measurementProtocol = derive2 { name="measurementProtocol"; version="0.1.1"; sha256="02k60psb6299p82bk7yv7isy41jq26yk4r8kmsjpfnx9dwm1kgk8"; depends=[assertthat cli httr jsonlite rappdirs]; }; measurements = derive2 { name="measurements"; version="1.5.1"; sha256="061xjwsacsk8vblva4s09xdrvd7kfgxydnpgr7imigyny01c5bh9"; depends=[]; }; measures = derive2 { name="measures"; version="0.3"; sha256="0325hhncg9fhq28cfl1hk6rhcmzzcngsmnkmbn9ri3b4hwqlafal"; depends=[]; }; - meboot = derive2 { name="meboot"; version="1.4-9.3"; sha256="1d8h1l9kpmsndgpmwkxpn05bx22m51lkb2w40p03lwajc9847j3d"; depends=[dynlm hdrcde nlme tdigest]; }; + meboot = derive2 { name="meboot"; version="1.4-9.4"; sha256="0akap3dl6nsfvh2f6d96ij6dvbblyrdnbqqh23ay8ah0r51zx9fs"; depends=[dynlm hdrcde nlme tdigest]; }; meconetcomp = derive2 { name="meconetcomp"; version="0.3.0"; sha256="14gnlpskkaav9lqas6diaphssccdpaf7qmi4bd46637fmz1iy2iw"; depends=[dplyr ggpubr igraph magrittr microeco R6 reshape2]; }; mecor = derive2 { name="mecor"; version="1.0.0"; sha256="0jcqf6d7x16hs0mrnkawlkl9idd2g5zb6l6mqdavkdx43fhk38j4"; depends=[lme4 lmerTest numDeriv]; }; - mecoturn = derive2 { name="mecoturn"; version="0.2.0"; sha256="1075yh0b0vqdcvqzcc86ic4h9llxdcab2xiqk13q2mrpggzsy9jk"; depends=[ggplot2 ggpubr magrittr microeco R6]; }; + mecoturn = derive2 { name="mecoturn"; version="0.3.0"; sha256="1qr7p50wplg3nwvaz595nxfrf5b1dc8l4y13jx65r8kvksqrl07g"; depends=[betareg ggplot2 ggpubr glmmTMB GUniFrac lmerTest magrittr microeco R6]; }; medExtractR = derive2 { name="medExtractR"; version="0.4.1"; sha256="0dn85yj61mz62bdxxvaxads6j9qf209sypmdvb9jx83c2sc7f4g6"; depends=[stringi stringr]; }; medScan = derive2 { name="medScan"; version="1.0.1"; sha256="19zvl50xbnf76d0ck30zrfd8cv6j250jl9y00vj1cbl6sspwz6ss"; depends=[fdrtool HDMT locfdr qqman qvalue]; }; - mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; - medfate = derive2 { name="medfate"; version="2.9.3"; sha256="0vsklvj6m0c2yyx29dsfwc22i9vnrgr34gifmd5c7sjddrpzagdq"; depends=[ggplot2 meteoland Rcpp shiny]; }; + mederrRank = derive2 { name="mederrRank"; version="0.1.0"; sha256="01dv7dabp2mvn99szaf8l44gbsy7zrllcm55zy6rbd0g9989ilnl"; depends=[BB numDeriv]; }; + medfate = derive2 { name="medfate"; version="3.1.4"; sha256="1j37b0yyr6710ib6xk1i3mvn3alwwf2959ppbqbak1njzza2fvn9"; depends=[ggplot2 meteoland Rcpp shiny]; }; medflex = derive2 { name="medflex"; version="0.6-10"; sha256="0cybshbk2qvh38n9sc6qf9jwjhzs4zz31awx3bbyqfwzjgzai2dx"; depends=[boot car Matrix multcomp sandwich]; }; mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; }; mediateP = derive2 { name="mediateP"; version="0.2.0"; sha256="0qmams2hdvhq7abfidblgdz44nh5ja3byn233q3k61hvz7asxmc7"; depends=[boot]; }; @@ -12928,14 +12937,14 @@ in with self; { mem = derive2 { name="mem"; version="2.18"; sha256="1jz2zadwm9gvlgfr1dvi8m6p3zm3bjz4n4apkbpj8g594ghcbrpx"; depends=[boot dplyr EnvStats ggplot2 mclust purrr RColorBrewer RcppRoll sm tidyr]; }; memapp = derive2 { name="memapp"; version="2.16"; sha256="0gjphzq2lr2qn7adjm6vvm50wqg6fhv0p28mcw2yjwiq8yrr0f3b"; depends=[dplyr DT formattable ggplot2 mem plotly RColorBrewer shiny shinyBS shinydashboard shinyjs shinyWidgets stringi stringr tidyr]; }; meme = derive2 { name="meme"; version="0.2.3"; sha256="009gkl9zmj2s6wmd7rl0khf04m05zcbbjjds2w7krnbr8h0dqpqm"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; }; - memery = derive2 { name="memery"; version="0.5.6"; sha256="0rlq0pjl13wsc025z3ycd5m48lnlagw61fbn51x9npysrmii4rvh"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; + memery = derive2 { name="memery"; version="0.5.7"; sha256="1c0gv5853klzq90w4s2bxdribak8jpczmsxvi5ij4kkqq911siz1"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0.2"; sha256="1f1v651vab4b3bfxn8wp5p848h6vy7ylr52zirwhnhxj37fzhkq6"; depends=[ade4 gdistance raster sp vegan]; }; memify = derive2 { name="memify"; version="0.1.1"; sha256="1dnbaz57v50mg2kxn5y7cdfrsv1h046cwqh48mpabgh6vf018w4y"; depends=[]; }; memisc = derive2 { name="memisc"; version="0.99.31.6"; sha256="0vnrq6lkqzba76222fsw9hp0sasq65r43iyc23nw6q3fzi7nncsj"; depends=[data_table jsonlite lattice MASS yaml]; }; memo = derive2 { name="memo"; version="1.1"; sha256="15wqadjwjrkj3vlq19x1j50nddfrm1lvipahxvmiv94lmy71pdlj"; depends=[digest]; }; memochange = derive2 { name="memochange"; version="1.1.1"; sha256="144134kpchb7ps8b2g7pyga5add0iqphzcwygf11aybmbzmp90x7"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; }; memofunc = derive2 { name="memofunc"; version="1.0.2"; sha256="02y32mnwafqnsvs3vy4g8v0jmdvnx935dqavy3q1f2n8c76p0bk9"; depends=[digest magrittr uuid]; }; - memoiR = derive2 { name="memoiR"; version="1.2-2"; sha256="0fmil19skdpp8g070bvkx8mf7vnin0x3xik832007y9hgg6lwh2m"; depends=[bookdown distill rmarkdown rmdformats usethis]; }; + memoiR = derive2 { name="memoiR"; version="1.2-4"; sha256="1c4vld3g14gcw1z5h9j3hdxibv4mccjyhq76w0dkvwy9rzpijwfr"; depends=[bookdown distill rmarkdown rmdformats usethis]; }; memoise = derive2 { name="memoise"; version="2.0.1"; sha256="1srdzv2bp0splislrabmf1sfbqfi3hn189nq7kxhgjn8k3p38l7q"; depends=[cachem rlang]; }; memor = derive2 { name="memor"; version="0.2.3"; sha256="1b3rjh121in7gi6khbhh2d1r0998a24ifcg6hpv8cdksl6lhm330"; depends=[knitr rmarkdown yaml]; }; memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; }; @@ -12943,8 +12952,9 @@ in with self; { merDeriv = derive2 { name="merDeriv"; version="0.2-4"; sha256="1piswi4l7ri3251shmanhygipmsw8zg701jqd0am1s76kj16l9cc"; depends=[lavaan lme4 Matrix nonnest2 numDeriv sandwich]; }; merTools = derive2 { name="merTools"; version="0.6.1"; sha256="09mr4gzrfxxq3ll76d90nywzp4f47rd8awaq826mc3hnjphh33md"; depends=[abind arm blme broom_mixed dplyr foreach ggplot2 lme4 Matrix mvtnorm shiny]; }; mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; + mergingTools = derive2 { name="mergingTools"; version="1.0.1"; sha256="04ryamfb19js6dq4iv2j0p2dlgrayl3zis2r1kic1wfvh4a46ihg"; depends=[dplyr MASS purrr rlang stringr tidyr]; }; merlin = derive2 { name="merlin"; version="0.1.0"; sha256="11in84pxgz76l2cfpd7m03fai1gwdhp2rzrn3pbwrpywgq210pmj"; depends=[MASS randtoolbox statmod survival]; }; - merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; + merror = derive2 { name="merror"; version="3.0"; sha256="14mwkwz6ih4442b4vbxqr60694ka6v0salg0qa0fgw1vfxgknz44"; depends=[OpenMx]; }; meshed = derive2 { name="meshed"; version="0.2.3"; sha256="061q6b8603jbvlqkl6ddcmw1rgy53sqbxbsxhv218f7px392b1vf"; depends=[dplyr FNN glue magrittr Rcpp RcppArmadillo rlang]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; messi = derive2 { name="messi"; version="0.1.1"; sha256="1z3fjxfmvxc9zr98zmkd84rj27iabjmw71hwqgnbjwcw5mnw2b5h"; depends=[ggplot2 MASS patchwork progress]; }; @@ -12953,14 +12963,14 @@ in with self; { metR = derive2 { name="metR"; version="0.14.0"; sha256="09xyg4xx6fkq39dlkkm6g91nc8lc5p463rxpa30lrlhzybgr01vy"; depends=[checkmate data_table digest Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr scales sf stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; meta = derive2 { name="meta"; version="6.5-0"; sha256="1pvs4anzmpcyrzqm77pfqhwh7zkzafcqqvy8hsiv0lkn9hrn8za2"; depends=[CompQuadForm lme4 metafor xml2]; }; - meta_shrinkage = derive2 { name="meta.shrinkage"; version="0.1.3"; sha256="143j47c96dgwqgcam5wdc9h8vynqlr621wphiljl7fa2kh3z0hh6"; depends=[]; }; + meta_shrinkage = derive2 { name="meta.shrinkage"; version="0.1.4"; sha256="15svx5d6bfy947kkc2na6yapxwliiwh757w8xahsdkgrxhzm8qc8"; depends=[]; }; meta4diag = derive2 { name="meta4diag"; version="2.1.1"; sha256="155xc313hvxy7n45rn9kmhhnkilfrazq5fgs2jbzhpgz3ddxfqkc"; depends=[caTools shiny shinyBS sp]; }; metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; }; - metaBMA = derive2 { name="metaBMA"; version="0.6.7"; sha256="1nk76cw3wb8gwknn5xq75400pfbqx72rf499nylc6yr9nascq2rk"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + metaBMA = derive2 { name="metaBMA"; version="0.6.9"; sha256="1y05c8mgim7v2991r1hr3ahx0mjji6gmp9mz25f0csl69kf3zr61"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; metaCluster = derive2 { name="metaCluster"; version="0.1.0"; sha256="1n69vlxzfx937p587jb3q2hn6b59wzx20p09hsbbjwb4nj83hda7"; depends=[Biostrings cluster dbscan dplyr factoextra seqinr]; }; metaDigitise = derive2 { name="metaDigitise"; version="1.0.1"; sha256="1cwvb6b4a1pfixbknbjjylsmpkccgi163h0kbf7zfjaqjg2y9mzh"; depends=[magick purrr]; }; metaEnsembleR = derive2 { name="metaEnsembleR"; version="0.1.0"; sha256="1vxrzdm4j3h91h0fvps36a8xhs1b8cylw2cw2mhvg20lpcjjdsdv"; depends=[caret e1071 gbm ggplot2 gridExtra randomForest]; }; - metaGE = derive2 { name="metaGE"; version="1.0.0"; sha256="10kg9jnxg6bkv5wfbgpw1mc0kh7l9bsd57kkxrjffh7ssgapniyr"; depends=[circlize ComplexHeatmap corrplot data_table dplyr emdbook future ggplot2 ggrepel ks purrr qqman Rfast stringr tibble tidyr viridis]; }; + metaGE = derive2 { name="metaGE"; version="1.0.3"; sha256="0w639hxildzcd2kwjs9r3iykccd8qhxpiarj95zpd89fzkkqzknx"; depends=[corrplot data_table dplyr emdbook future ggplot2 ggrepel gplots ks purrr qqman Rfast stringr tibble tidyr viridis]; }; metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.3"; sha256="13imp5d1ggw4qc7win4d2nvwvl92s9visb6bjm09h69lp18h631s"; depends=[limma SMVar]; }; metaRMST = derive2 { name="metaRMST"; version="1.0.0"; sha256="1mq9j7iczjh7d3cps9g1bh0f8k388bdn8d5lkjs2s8y9fq1kxzmx"; depends=[meta mvmeta rstpm2 survival survRM2]; }; @@ -12968,10 +12978,9 @@ in with self; { metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.2"; sha256="00lwfx083a449yppnh3zai2hyzc0g53v8nr8r4ippdv088612iq6"; depends=[Matrix maxLik ordinal truncnorm]; }; metaSEM = derive2 { name="metaSEM"; version="1.3.1"; sha256="0m3nc5kazi6pa7aih56g2022kklf56yk4f7lv0hlmjszhc6rhpww"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; metaSurvival = derive2 { name="metaSurvival"; version="0.1.0"; sha256="05f103fi287y64gys73a55snw54bnph69q8dykfii10dykd44g0y"; depends=[mvtnorm survival]; }; - metabias = derive2 { name="metabias"; version="0.1.0"; sha256="0hamzkc6abk5i10hnbnnra3wga2sgxdqvgldfh0rpq31am2hcwl1"; depends=[Rdpack]; }; + metabias = derive2 { name="metabias"; version="0.1.1"; sha256="0xgckbyxjb6s43b3z48cxb2jbyd7jaw17x0w3wiafqjbz9ahzdmk"; depends=[Rdpack]; }; metaboData = derive2 { name="metaboData"; version="0.6.3"; sha256="0a8jz7q0a5dri5p2qyw0ah0j4w0xjyfj6gkh2gcsazac1d5fl02i"; depends=[dplyr fs magrittr piggyback purrr readr rlang stringr tibble yaml]; }; - metabolic = derive2 { name="metabolic"; version="0.1.1"; sha256="0rq4yi2r0l0ghn22pj2gmmhwqjykaxznbd185fjr5r1gzvlh45rv"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; }; - metabolomicsR = derive2 { name="metabolomicsR"; version="1.0.0"; sha256="0b12nddczh8i6hnv679pa521yps26n98j2cnai8s67xiw5ir0y5v"; depends=[data_table ggplot2 plotROC]; }; + metabolic = derive2 { name="metabolic"; version="0.1.2"; sha256="01jzv35zf2zk5gdjd2f2ql187krxh4m7fg87dy9iv6z0h0vxnxgn"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; }; metabup = derive2 { name="metabup"; version="0.1.3"; sha256="1lwndn46bayw6jzxxpd8hywnzxydiz0nlm33nxr855035rmv231k"; depends=[ggplot2 partitions]; }; metacart = derive2 { name="metacart"; version="2.0-3"; sha256="1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n"; depends=[ggplot2 gridExtra Rcpp rpart]; }; metacoder = derive2 { name="metacoder"; version="0.3.6"; sha256="15pqqnyxv82dg00skq100j2p2zkpl7kw8x3s0bvlp3xhw5srdax2"; depends=[ape cowplot crayon dplyr GA ggfittext ggplot2 igraph lazyeval magrittr R6 Rcpp RCurl readr rlang seqinr stringr taxize tibble vegan]; }; @@ -12982,8 +12991,8 @@ in with self; { metadat = derive2 { name="metadat"; version="1.2-0"; sha256="1f7mb3pw5d0akr09jjva06ay223izhpzbr21bapnw99x1kiybk7h"; depends=[mathjaxr]; }; metadynminer = derive2 { name="metadynminer"; version="0.1.7"; sha256="0ch86qqs3872d28c8wrs24ryg2xahqsmndmzjc3z6qznkrq1adzh"; depends=[Rcpp]; }; metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.2"; sha256="1y1csfp57qrv394hj96yr5v3brxw7v0a07k2pg7ypw08gshvgqjm"; depends=[metadynminer misc3d Rcpp rgl]; }; - metafolio = derive2 { name="metafolio"; version="0.1.1"; sha256="1bnlmh1pwwg5hjmsqnswn4d4phjdpsiyg7pwl8nbxyx0g2hw3p5v"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; - metafor = derive2 { name="metafor"; version="4.2-0"; sha256="0rm7w1mmjhry4xkrv6nkhg5ln1cb61lg66y2nbwim32n9wxl5fzi"; depends=[mathjaxr Matrix metadat nlme numDeriv pbapply]; }; + metafolio = derive2 { name="metafolio"; version="0.1.2"; sha256="11y2igvwwkr4dj7v8ip66w1psi9wzb8q3sy018lhaxb42s1lspbh"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; + metafor = derive2 { name="metafor"; version="4.4-0"; sha256="1m4762fn4zbjpnx9vxyy9gvzyzn3avxnqpzmbj45w8241g3s1b32"; depends=[mathjaxr Matrix metadat nlme numDeriv pbapply]; }; metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; metagam = derive2 { name="metagam"; version="0.4.0"; sha256="1kpxf2jxbx13if3ir9iqsqbdg6gg0l9pa3qnxmff4w5dd59by5kd"; depends=[ggplot2 metafor mgcv rlang]; }; @@ -12991,16 +13000,16 @@ in with self; { metaggR = derive2 { name="metaggR"; version="0.3.0"; sha256="11kqic87xrm9d046kgc0l0wfip2gimnvsbm559dbyjbrv2f27bpb"; depends=[MASS]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; metajam = derive2 { name="metajam"; version="0.2.3"; sha256="0ryzsnwfhapsyz40ckjj6gn2chf37m62z3l7xv703878bghpdqwc"; depends=[dataone dplyr EML emld lubridate purrr readr rlang stringr tibble tidyr]; }; - metalite = derive2 { name="metalite"; version="0.1.2"; sha256="10rgk6qp6mpa7ag3w62n3kkz8yxf5h7k7bcj2xsi4cdqfc3xp357"; depends=[glue rlang]; }; + metalite = derive2 { name="metalite"; version="0.1.3"; sha256="1pai4a5mnba80cyvhpdxhk0hwzhmw2xa23px1x7154ddl6rnykvg"; depends=[glue rlang]; }; metalite_ae = derive2 { name="metalite.ae"; version="0.1.1"; sha256="0z33yj8v67mkjg47zd627mnp0p1b2gnlvj7gf0d7np1j38572j1s"; depends=[dplyr glue metalite r2rtf tidyr]; }; - metamedian = derive2 { name="metamedian"; version="1.0.0"; sha256="15qq3yig2j3nh06jz75fdfn5akq038wdhrkkczl06x16qlp37wfb"; depends=[estmeansd Hmisc metaBLUE metafor]; }; + metamedian = derive2 { name="metamedian"; version="1.1.0"; sha256="0zr0k1dkgqpzg7pc3g8ischh2mg2gy3vdrc7fiaa9m4hc62iqgzj"; depends=[estmeansd Hmisc metaBLUE metafor]; }; metamer = derive2 { name="metamer"; version="0.3.0"; sha256="0b427cbasy1irks9jy5kjg3ay5xa01dcalhl8g14smhkdv5054wz"; depends=[FNN progress]; }; metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.2"; sha256="0fgdjy2s47pqmb9x79a4sf0kn4hbc49rd41jnzw0d3ll1l9kwy7f"; depends=[compositions dplyr gamlss gdata ggplot2 gridExtra lme4 lmerTest matrixStats meta plyr tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.4.0"; sha256="12ydvkpni7a7v0x8lfknsy4c6hmgjqri3l33m4fwsai3rhnq6hsa"; depends=[dplyr ggplot2 lme4 metafor mvtnorm plyr pROC]; }; metan = derive2 { name="metan"; version="1.18.0"; sha256="0m7czvd7djv80c6kly8ckgs9m5ld0rqnd92y76n181d2xk9l6ypc"; depends=[dplyr GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr mathjaxr patchwork purrr rlang tibble tidyr tidyselect]; }; metanetwork = derive2 { name="metanetwork"; version="0.7.0"; sha256="0rlnalmfmiih154zq6rk4sq12y7nr8fn1ws8mrlryy04gznz6igw"; depends=[dplyr GGally ggimage ggplot2 igraph intergraph magrittr Matrix network RColorBrewer rlang sna visNetwork]; }; metansue = derive2 { name="metansue"; version="2.5"; sha256="098f3jfqxraf86p6ciqpryqs1vwbhsmy3wngqj50d5ndf302qxmc"; depends=[]; }; - metap = derive2 { name="metap"; version="1.8"; sha256="0asmypxfxly4xmcjf3yzid5zqlzg88z0brij2splfk4avsl035gf"; depends=[lattice mathjaxr mutoss qqconf Rdpack TFisher]; }; + metap = derive2 { name="metap"; version="1.9"; sha256="1w4mv7vb94d4pkllvabz9az8sbrbfhigxw4is3j0jzi1pnlyc8kg"; depends=[lattice mathjaxr mutoss qqconf Rdpack TFisher]; }; metapack = derive2 { name="metapack"; version="0.2.0"; sha256="0npyjj93kk8zc2xcsyfm3v09my89zw9f1smrnl4kpcpwyk3g1q6a"; depends=[BH Formula ggplot2 gridExtra Rcpp RcppArmadillo RcppProgress]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; metaplus = derive2 { name="metaplus"; version="1.0-4"; sha256="1lrlw5h3fgcrp0cdawxala36m8mpljbmp20fhf4sc0qj51h2ccs4"; depends=[bbmle boot doParallel doRNG fastGHQuad foreach lme4 MASS metafor numDeriv Rfast]; }; @@ -13013,18 +13022,18 @@ in with self; { metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; metathis = derive2 { name="metathis"; version="1.1.4"; sha256="1hlmz9yh6nxyi24plg1z4ln003vb1ja5flgyql8wfl1pzsc1sf28"; depends=[htmltools knitr magrittr purrr]; }; metatools = derive2 { name="metatools"; version="0.1.5"; sha256="0lcpq0k73kcr7fr8i7dyi785mapvyd6slz93r4spd7z8bg71nm25"; depends=[dplyr magrittr metacore purrr rlang stringr tibble tidyr]; }; - metaumbrella = derive2 { name="metaumbrella"; version="1.0.6"; sha256="08mk1i6bx45gy385llraxf3dr3rwfwn5bsm3yly6yfn83wf7qjjy"; depends=[meta powerSurvEpi pwr readxl withr writexl xtable]; }; + metaumbrella = derive2 { name="metaumbrella"; version="1.0.8"; sha256="01iq2p1g3m4jlraaix7d3fkxsr558m7xzgl517ijgdsa5bvmqypa"; depends=[meta powerSurvEpi pwr readxl withr writexl xtable]; }; metavcov = derive2 { name="metavcov"; version="2.1.5"; sha256="1md0ib23qzx9gk1xdz0382b1lcm40izkyxyb207787lnwmyivy1r"; depends=[ggplot2]; }; metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; - meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; + meteo = derive2 { name="meteo"; version="2.0-2"; sha256="18aiy133527cxa3qj2mjwik6d7w6kgs7qmb5zywsbvb2bc3hmn5v"; depends=[caret CAST data_table DescTools doParallel dplyr foreach gstat nabor plyr ranger raster sf sftime snowfall sp spacetime terra units]; }; meteoEVT = derive2 { name="meteoEVT"; version="0.1.0"; sha256="1i3zi1cgzv6lymmd7m92rmhmnxmdvi5nl367hnfbgxzy44van8l8"; depends=[ncdf4 purrr]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.56"; sha256="0nbjl4x06ni6jk8ji6n3cgd07iszw87lwg52rp8avvsz3kh19p5c"; depends=[ncdf4 raster sp XML zoo]; }; - meteoland = derive2 { name="meteoland"; version="2.0.1"; sha256="1kms1932nk1a10sm6lgl898h9f72mhypi86s2bd8qi1w1lnr04df"; depends=[assertthat cli cubelyr dplyr lifecycle lubridate ncdfgeom ncmeta purrr Rcpp rlang sf stars tidyr units]; }; + meteoland = derive2 { name="meteoland"; version="2.1.0"; sha256="0480g35nl0hs10z9mjq063b130fdqi67bzmclq8b1y4jdlqfzgpr"; depends=[assertthat cli cubelyr dplyr lifecycle lubridate ncdfgeom ncmeta purrr Rcpp rlang sf stars tidyr units]; }; meteor = derive2 { name="meteor"; version="0.4-5"; sha256="1kcgfi4r3gd0n64hb0pa3bkabh16572r9ff5vdmbgmj3hkv8v8wi"; depends=[Rcpp]; }; meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; }; - meteospain = derive2 { name="meteospain"; version="0.1.2"; sha256="1yz5v6zrkz09ia0cwq23fshhxl5j1fmn63cj8m8n5ishb2pcg23l"; depends=[assertthat cachem cli curl dplyr glue httr jsonlite lubridate memoise purrr rlang sf stringr tidyr units vctrs xml2]; }; + meteospain = derive2 { name="meteospain"; version="0.1.3"; sha256="0zfrbrij7mq44pj87frwfj0zi6bicr73nnrizyjqqbwf542lzvx4"; depends=[assertthat cachem cli curl dplyr glue httr jsonlite lubridate memoise purrr rlang sf stringr tidyr units vctrs xml2]; }; metevalue = derive2 { name="metevalue"; version="0.2.4"; sha256="1iazpldafzq1rzg1hbp9yyqwngq00mbxmfahidlj3ybl1y459lah"; depends=[dplyr psych sqldf]; }; methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; }; metools = derive2 { name="metools"; version="1.0.0"; sha256="05l49ifx2nnlbdxh2qhdb0islf95fc67720rm5in7mrlida4khnq"; depends=[ggplot2 lubridate scales stringr tibble tidyr]; }; @@ -13043,24 +13052,24 @@ in with self; { mfaces = derive2 { name="mfaces"; version="0.1-4"; sha256="0svvnpka2y1p21gvdyc7csw6m0g3kziszw2ll9bq5gpcnl69qk4n"; depends=[face Matrix matrixcalc mgcv]; }; mfdb = derive2 { name="mfdb"; version="7.3-1"; sha256="1l7bvacmvh53rq91jqdb6zqjn3974sy838zfvgfb6nam54r080y4"; depends=[DBI duckdb getPass logging rlang RPostgres RSQLite]; }; mfp = derive2 { name="mfp"; version="1.5.4"; sha256="0a4gfip5y42hn0pk8y8zmvlj65nr5a2ni77z14m1xj1azb9222by"; depends=[numDeriv survival]; }; - mfpp = derive2 { name="mfpp"; version="0.0.4"; sha256="0n752nm102cxscbi76hy1bh8kqd1svwknkj6l63jq5zd1z63a2yg"; depends=[genalg ggplot2 igraph nsga2R pracma reshape2 Rfast]; }; + mfpp = derive2 { name="mfpp"; version="0.0.5"; sha256="0i8yp3rmhqy8w6xvdlkg6k8vm3hdihsqrrc94sbx1c1nsd5p2m95"; depends=[genalg ggplot2 igraph nsga2R pracma reshape2 Rfast]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.5"; sha256="0i5f8xghdch9d1cvfgiq2pscpq53ms7ik7jk16gss8i0cx2d3m94"; depends=[mvtnorm tseries]; }; mgc = derive2 { name="mgc"; version="2.0.2"; sha256="1l9qs4nz1rn56qp569nh26yz3c7i4zh3r43c209zh7kvizpagx0i"; depends=[abind boot energy MASS raster]; }; - mgcViz = derive2 { name="mgcViz"; version="0.1.9"; sha256="09n18ypjdwcca38i2v636ijgnzwalv7wh55z82a0pfrbzabiynn1"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam shiny viridis]; }; + mgcViz = derive2 { name="mgcViz"; version="0.1.11"; sha256="14n9l10rcr9nar71lyw1qmk9xar2zixcx4s9rdnz5dr4jr7330y3"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.9-0"; sha256="0w1v0hdswb332xz3br1fcgacib7ddr4hb96cmlycxcpqq5w01cdj"; depends=[Matrix nlme]; }; mgee2 = derive2 { name="mgee2"; version="0.4"; sha256="03id3g6zbw06xracwjkwfcll62nx7psppjsd3gj05hzjvalqgwks"; depends=[ggplot2 MASS]; }; mggd = derive2 { name="mggd"; version="1.1.0"; sha256="1pr53bnijs5f8d8nj3lvr271qcp1cnw2q9682m3xr5sm0j5g3nlq"; depends=[lifecycle MASS rgl]; }; mglasso = derive2 { name="mglasso"; version="0.1.2"; sha256="1896fg1gdgah8vmikz2br6v0rslhhh2frffkjiy6fnw4qxa5zsv9"; depends=[corpcor ggplot2 ggrepel gridExtra Matrix R_utils reticulate rstudioapi]; }; mglmn = derive2 { name="mglmn"; version="0.1.0"; sha256="1g642hhs28q6x34xgrfrmmsb2jsn9zy4jxad0x5ai3px48zzdb4r"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.2-13"; sha256="0lbryfibcph7sryx1wb9p08k90g3a63cf0aarr2m9fr9cw8q2mbc"; depends=[glmnet gtools Hmisc qgraph stringr]; }; - mgpStreamingSDK = derive2 { name="mgpStreamingSDK"; version="0.1.0"; sha256="0mj0lljc5rbjsbq93y74m2jhh7shc03avv02xd5jgxxssxmxjrv0"; depends=[R6 reticulate]; }; + mgm = derive2 { name="mgm"; version="1.2-14"; sha256="1j5hvf168vzanhc5ck5rxz5arjq3b0gs552kf3l1f8kqdmd8kpzw"; depends=[glmnet gtools Hmisc qgraph stringr]; }; + mgpStreamingSDK = derive2 { name="mgpStreamingSDK"; version="0.2.0"; sha256="1fgcca0jca0jw6gpcqjb5wrcl9x3r2hfhf1xwiwv2w1m7bhc3mkp"; depends=[R6 reticulate]; }; mgss = derive2 { name="mgss"; version="1.2"; sha256="0czzr5hc9sr8yc362q9xag3vphwk1gfahczpya2mh1l6fsa74fbn"; depends=[combinat Matrix Rcpp statmod]; }; mgsub = derive2 { name="mgsub"; version="1.7.3"; sha256="1mci6x65h94qiz9cwikx2inbrwkykv43zbs8abfbx416zrh2bbn9"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="1.0.4"; sha256="19rsw5qjcq3bjqajz83dbkjdgh1dazpw7wvkbn4gdcksgmaxm5l2"; depends=[caret doParallel dplyr foreach ggplot2 gridExtra htmltools knitr leaflet mapview Matrix mboost mgcv microbenchmark nabor qlcMatrix Rcpp RcppEigen rlang sf sp spgwr]; }; - mhazard = derive2 { name="mhazard"; version="0.2.2"; sha256="1jwks56njjkc4ck41yqmry60d49zkvj4ya2gkazg4h50149q2d5m"; depends=[boot plot3D Rcpp RcppArmadillo rootSolve survival]; }; + mhazard = derive2 { name="mhazard"; version="0.2.3"; sha256="030r0l11qplmypwfk45mj31gba96xda7nxzgiyjsgrb20jmcsja5"; depends=[boot plot3D Rcpp RcppArmadillo rootSolve survival]; }; mhcnuggetsr = derive2 { name="mhcnuggetsr"; version="1.1"; sha256="0fq0niigf4lb6jqcy0w4mkfy65pxrw4brf3pg2nvmgnv3c91lgsb"; depends=[rappdirs reticulate stringr tibble]; }; - mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; }; + mhsmm = derive2 { name="mhsmm"; version="0.4.21"; sha256="1fibgpl65bl3rwlf9dhlams3gxbjqgwcd26gb0flp4wln6pl8d99"; depends=[mvtnorm]; }; mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; }; mhurdle = derive2 { name="mhurdle"; version="1.3-0"; sha256="1in07zk29z5fhrg75wl1fwbrsny4ihjnrqyh2kz1bd448p10f295"; depends=[Formula generics margins maxLik numDeriv prediction Rdpack survival truncreg]; }; mi = derive2 { name="mi"; version="1.1"; sha256="11f75ivnax6p48mp2pasprws488cm2daym87sw2mcrywvf89fyjd"; depends=[arm Matrix]; }; @@ -13088,23 +13097,25 @@ in with self; { micemd = derive2 { name="micemd"; version="1.9.0"; sha256="00biwwdqwj5szf969x2gf7ydba8g5d3z410avxcgi2blxdh0rza1"; depends=[abind digest ggplot2 GJRM jomo lme4 MASS Matrix mgcv mice mixmeta mvmeta mvtnorm nlme pbivnorm]; }; michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; }; miclust = derive2 { name="miclust"; version="1.2.8"; sha256="0qxbbybak0illkn99bsmmqlh923g0gw6znjh05wdmgqdsjh3fx1v"; depends=[combinat doBy flexclust irr matrixStats]; }; - micompr = derive2 { name="micompr"; version="1.1.3"; sha256="0k9yngi75p0pcszlg8vmzxrsppm53z2z1c6rzk15gpl53f6cq88p"; depends=[]; }; + micompr = derive2 { name="micompr"; version="1.1.4"; sha256="1i50zvhdfxz0zbx5vmiz9s055j6f0j0gf6a2vxhm7cw597rfp3s5"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.6"; sha256="0if218csmnp5vcbcgr9zjk8d7y17al04rpfhjvp76v03xvwjizp5"; depends=[deSolve testthat visNetwork]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4.10"; sha256="10dlp4295jb5l7lhz80f4mkz3jccv02v277z666wx3bhfaz43k04"; depends=[]; }; microbial = derive2 { name="microbial"; version="0.0.20"; sha256="1y5vhh4sq22c4wxb3c9rzj53niacn97vfg0484d9wkcjb179lc79"; depends=[broom DESeq2 dplyr edgeR ggplot2 ggpubr magrittr phangorn phyloseq plyr randomForest rlang rstatix S4Vectors SummarizedExperiment testthat tidyr vegan]; }; microclass = derive2 { name="microclass"; version="1.2"; sha256="0q6mn1hbi6nk29x2x5a1wcdqp06mjggbrpglk5i8pp4gkqlzhl8q"; depends=[dplyr microcontax microseq Rcpp RcppEigen RcppParallel rlang stringr tibble]; }; microcontax = derive2 { name="microcontax"; version="1.2"; sha256="004g979hyg0asbah7hxr445fidil4ibw1b8pqpjdbgmpm1qgvw7y"; depends=[microseq]; }; - microeco = derive2 { name="microeco"; version="0.20.0"; sha256="1v85x0jglcw2jq083nqcxnf24fg31zwl6nbr6xw4vs8vv0qj3qr4"; depends=[ape data_table dplyr ggplot2 igraph magrittr R6 RColorBrewer reshape2 rlang scales tibble vegan]; }; + microeco = derive2 { name="microeco"; version="1.1.0"; sha256="12igd4kij7pwd0s40kyvx67bjn94gflnqn3dndn49gna4rhdjpq4"; depends=[ape data_table dplyr ggplot2 igraph magrittr R6 RColorBrewer reshape2 rlang scales tibble vegan]; }; microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; }; micromap = derive2 { name="micromap"; version="1.9.7"; sha256="1lkzh7bwmvabvn2qavxmfd2lcn1xv85vq0g6qpbfls4jfy9qxd7g"; depends=[ggplot2 RColorBrewer sf sp]; }; micromapST = derive2 { name="micromapST"; version="3.0.0"; sha256="1gkjkqhribj9c512f2marv511lqn9vfwv8nziyrjmhfs1alijzzw"; depends=[labeling RColorBrewer readxl rmapshaper sf spdep stringr writexl]; }; + micromodal = derive2 { name="micromodal"; version="1.0.0"; sha256="0qf5ckfcnkviilb2la8la9sjfcir7c79v4981jrpsxfy9n6y39vm"; depends=[htmltools]; }; micropan = derive2 { name="micropan"; version="2.1"; sha256="16zs6sqi2c5lwzhd5gbyddp8q4gx5r5sg0pbpk7924i8x4hh081h"; depends=[dplyr igraph microseq rlang stringr tibble]; }; microplot = derive2 { name="microplot"; version="1.0-45"; sha256="0qprvn5zv9ai30lhd8qykffc5f8va886kc5qka34940lin63v389"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.8"; sha256="0swaqvzqbmlk9j2gr8z7x7xrkr38xndprg9k66whzcigxfh8nhiz"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; - microseq = derive2 { name="microseq"; version="2.1.5"; sha256="1asdy0njy5xcykd88jxa8s5hkrh6kab566h3nf9i93yw1i6kmwip"; depends=[data_table dplyr Rcpp rlang stringr tibble]; }; + microseq = derive2 { name="microseq"; version="2.1.6"; sha256="1xa8r908jic06kv1qjmdidh3zzslbimjyhsy6v27xqzrh45svq4c"; depends=[data_table dplyr Rcpp rlang stringr tibble]; }; microsimulation = derive2 { name="microsimulation"; version="1.4.3"; sha256="0vn7lx6qa0dqd7h208s36jwcxswmnhdp4kazkavagd61sqr2gah2"; depends=[ascii Rcpp RcppArmadillo survival]; }; microsynth = derive2 { name="microsynth"; version="2.0.44"; sha256="1a8xh4aqv0177p9vp05i6c881k4pkyyha7izbq3j3ssyb9id7yy6"; depends=[kernlab pracma survey]; }; + micss = derive2 { name="micss"; version="0.1.5"; sha256="1npamxj7jc6qkkswwm7gb0x7naii93m53dnwqlnv6a8v3q4whm6n"; depends=[dplyr]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midas2 = derive2 { name="midas2"; version="1.1.0"; sha256="0in4z1ijj9ymr27c9l5a9jripzb9k0nxk231bmk3sk3b3s7755vb"; depends=[coda MCMCpack R2jags]; }; midasml = derive2 { name="midasml"; version="0.1.10"; sha256="0jhrifvqcis2lj59vybgkzgmdmxwfqmsbxijwcz8hsprshr69xl9"; depends=[doParallel doRNG foreach lubridate Matrix randtoolbox snow]; }; @@ -13115,12 +13126,12 @@ in with self; { miesmuschel = derive2 { name="miesmuschel"; version="0.0.3"; sha256="0gqdq1qsai0rql8l1s7qqdijxhjc48bkkx16c1k36c3skf2lam52"; depends=[bbotk checkmate data_table lgr matrixStats mlr3misc paradox R6]; }; mifa = derive2 { name="mifa"; version="0.2.0"; sha256="1rj3ba746f8759gird0vpvyb4fl0z2ihccpiv3qkr3sc64wgplln"; depends=[checkmate dplyr mice]; }; migest = derive2 { name="migest"; version="2.0.3"; sha256="0v59yai9xs2yj17lvm7nmw7jzfgglilixwmwy9czi3z4bhb7gknl"; depends=[circlize dplyr forcats magrittr matrixStats migration_indices mipfp purrr stringr tibble tidyr]; }; - migraph = derive2 { name="migraph"; version="1.0.1"; sha256="0v19b70xg46s30sfsg2x8l2wn07cgarqaqzp7mnwhp4xix4gfw49"; depends=[dplyr furrr future generics ggplot2 igraph manynet network pillar purrr rlang sna tidygraph tidyr]; }; + migraph = derive2 { name="migraph"; version="1.1.0"; sha256="09ldp1xk9yfm9l8x7dkr3nh845102whmqmgjib5wksgby19v8alw"; depends=[dplyr furrr future generics ggplot2 igraph manynet network pillar purrr rlang sna tidygraph tidyr]; }; migrate = derive2 { name="migrate"; version="0.4.0"; sha256="0yf0c7gcn2q8sx0havhqaxk6z69bagfd58drpbqkkpsp62bnq875"; depends=[dplyr magrittr rlang tibble tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.1"; sha256="198lxv6s1wc6j10ygbc4l2irmmv5448f9av9zsybnpijballx349"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.3"; sha256="1y012la9vmchnlcigcciq878w9hlw8zgzp76b3h9b6fwhaa872pm"; depends=[arm gWidgets2 mi]; }; miic = derive2 { name="miic"; version="1.5.3"; sha256="1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg"; depends=[ppcor Rcpp scales]; }; - mikropml = derive2 { name="mikropml"; version="1.6.0"; sha256="1m91blwkkcgby2pgpn5w1sbgk4vwxvhhbpsjrkcwpcifkkgys17n"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; }; + mikropml = derive2 { name="mikropml"; version="1.6.1"; sha256="13dlzrwyl4sqklypva35qq5194yc95fcpsyclvisdrky040xgxsy"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; }; mildsvm = derive2 { name="mildsvm"; version="0.4.0"; sha256="02n93ck8458xliqwp226v5b7691a9jx5i7b1q9n0nqc74xkm8h1i"; depends=[dplyr e1071 kernlab magrittr mvtnorm pillar pROC purrr rlang tibble tidyr]; }; milorGWAS = derive2 { name="milorGWAS"; version="0.3"; sha256="1z44sbs3lmrx32wagk5rr3rc2k8iqq860fz0bi983llmgmhaqdxn"; depends=[gaston Rcpp RcppEigen]; }; milr = derive2 { name="milr"; version="0.3.1"; sha256="03hihr1w5j0mlvi5vm9m5vb9i6nyb6lsji3xmv0chpczabd85mzy"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; @@ -13129,46 +13140,48 @@ in with self; { mimsy = derive2 { name="mimsy"; version="0.6.2"; sha256="01dy1fryrgq07jdfnxcnks97h0gq632dvqk7hnfs0f5fnx0k0vvf"; depends=[dplyr lubridate magrittr openxlsx]; }; minMSE = derive2 { name="minMSE"; version="0.5.1"; sha256="1fj6njqdc6zn73n2q60x01znwn6xlprjldwy5c13d8rd1n5shccm"; depends=[MASS Rcpp]; }; minSNPs = derive2 { name="minSNPs"; version="0.1.0"; sha256="1wflv7n4rzsdcimwj8carmf8lwspp36ghcb3cw9fyp75dx14pa50"; depends=[BiocParallel data_table]; }; + minb = derive2 { name="minb"; version="0.1.0"; sha256="1ay1l58b0jhk27sajrvj4p7kkx4hs2va0am9c76pwbng6vg264mh"; depends=[MASS pscl]; }; mind = derive2 { name="mind"; version="1.1.0"; sha256="01ncwc1kkfa0gfmrnvl93lvzlcjl6r30a3fs65lq15b132rncgwq"; depends=[data_table dplyr JWileymisc MASS Matrix tm]; }; - mindr = derive2 { name="mindr"; version="1.3.2"; sha256="0nv3wripimpbi8zf1h8fkj80ibrzava36kcai9f1gl8frincafr9"; depends=[htmlwidgets knitr]; }; mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; + mineSweepR = derive2 { name="mineSweepR"; version="0.1.0"; sha256="0cvq8cwmyszyyckf2p9p5balvkzqrmrl7br1xlf1jaa35icpchdj"; depends=[ComplexHeatmap dplyr gsignal hms InteractiveComplexHeatmap mgc mmand pals rlang]; }; mined = derive2 { name="mined"; version="1.0-3"; sha256="1ilfwm42r2mkcdxphqkz7b4szfr4m9gpfi9qid3625sq3rjk622r"; depends=[Rcpp RcppEigen]; }; minerva = derive2 { name="minerva"; version="1.5.10"; sha256="03srkii3rmx40lyr050bnrxil6w0hfv5pr64k339m66ciwyka9ig"; depends=[Rcpp RcppArmadillo]; }; miniCRAN = derive2 { name="miniCRAN"; version="0.2.16"; sha256="1rr5wrh27055ikkvpsf19q9bkfhckafgmrn174iwzjh9s42w3nbq"; depends=[assertthat httr igraph]; }; miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; }; miniMeta = derive2 { name="miniMeta"; version="0.2"; sha256="03r6xwcgchw42irqr8jy5hsbv8brk6f77h4zi9qhhz3zmkryjbw2"; depends=[colourpicker jsonlite markdown meta metafor readxl rhandsontable shiny shinyjs shinyWidgets WriteXLS]; }; + miniPCH = derive2 { name="miniPCH"; version="0.2.0"; sha256="1nji8w5wifdhjnvlpxirj83lgh10z6xvsmb9lfk7yjadw55bcqg3"; depends=[checkmate Rcpp]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; minidown = derive2 { name="minidown"; version="0.4.0"; sha256="0h4szlw0dgxbdsw8grnzv50bq0qzzk3lm8zr1zp2pybisfvqaqkr"; depends=[htmltools katex knitr mime rmarkdown sass xfun]; }; minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; - minimax = derive2 { name="minimax"; version="1.1"; sha256="0108gwdaaag219f2azzmd365d866bvlxvg247xin58f7sfdy038w"; depends=[]; }; - minimaxApprox = derive2 { name="minimaxApprox"; version="0.1.0"; sha256="0f51v2cpijb8cbwyxa2jnf6r1p57xrkn1h6nl191zxw5rhsd45hy"; depends=[]; }; + minimax = derive2 { name="minimax"; version="1.1.1"; sha256="1jx90xbxflsi1q2wm3dl4vhz246yxbvhc8zybiv5f7fafam28h6p"; depends=[]; }; + minimaxApprox = derive2 { name="minimaxApprox"; version="0.2.2"; sha256="11yky5v76x690cbpi4fxpfazymi9v0h4ix18d4vcccg3pgzvjrn3"; depends=[]; }; minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.5"; sha256="0mraklk79w2r4rx450pkajgh5s9pk7wa3gcbd98xkd03ns11s9v8"; depends=[conf_design DiceDesign DoE_base doParallel doSNOW foreach FrF2 geometry gmp gtools jpeg MaxPro nloptr pdist randtoolbox Rcpp RcppArmadillo]; }; - minpack_lm = derive2 { name="minpack.lm"; version="1.2-3"; sha256="1w7f9zhqjzayppbd5r6wmlkzlv72nvg74cdjajd2qfq2kxkh59xz"; depends=[]; }; - minqa = derive2 { name="minqa"; version="1.2.5"; sha256="1gpli7f3piz3jqjj63a6bk9v1jlygjdaqqqvqsr083crj0imd0wv"; depends=[Rcpp]; }; + minioclient = derive2 { name="minioclient"; version="0.0.5"; sha256="02bax8ld39z3nqsqzx0nlqydxyg5mp9r22s5dlcdh5041fgbhl5r"; depends=[fs glue jsonlite processx]; }; + minpack_lm = derive2 { name="minpack.lm"; version="1.2-4"; sha256="0cg7arnmb7x6v5x487gkc2k4i5gchgdwblrrd0k0vw1w6pza83z3"; depends=[]; }; + minqa = derive2 { name="minqa"; version="1.2.6"; sha256="0421b4ysslaqmdgwlz080abis8m4xkcvjq7lx1wywbsz1s2vi9si"; depends=[Rcpp]; }; minque = derive2 { name="minque"; version="2.0.0"; sha256="0pczdg22i3if048i64chzcpnv3ay8p0anmhwjmzm29577z0jgms8"; depends=[]; }; minsample1 = derive2 { name="minsample1"; version="0.1.0"; sha256="13kmqxa3pbllv16fzn0v7msffsaar79y8xnvnbrcfhwa76031f8f"; depends=[]; }; minsample2 = derive2 { name="minsample2"; version="0.1.0"; sha256="0q1rp6mdyhcp806a0m0sr4ldm5rj78wk2fljzylxfjs4c734lpbk"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipplot = derive2 { name="mipplot"; version="0.3.1"; sha256="126arvxq6gmaiwk3n3p0slnb1mhs3qf993m4lx95nlmnv612ag66"; depends=[data_table dplyr ggplot2 readr readxl reshape reshape2 rlang shiny shiny_i18n shinyalert shinyWidgets showtext showtextdb stringr tidyr]; }; - mirai = derive2 { name="mirai"; version="0.9.1"; sha256="17plr5g1fm0j5ss3md0a4kmrk6lw475ry8s7kk4l58hlyai3323m"; depends=[nanonext]; }; - mirai_promises = derive2 { name="mirai.promises"; version="0.1.2"; sha256="0hq440a79czm2c9p9fpsnimsl21w4628d53y0610jm1f0d2xpy01"; depends=[later mirai promises]; }; - mirt = derive2 { name="mirt"; version="1.39"; sha256="0ww16acxwa2qyg69n1ilh25bg871azbhck6m6ga9bhm82ydf5lkr"; depends=[dcurver Deriv GPArotation gridExtra lattice Matrix mgcv pbapply Rcpp RcppArmadillo vegan]; }; - mirtCAT = derive2 { name="mirtCAT"; version="1.12.2"; sha256="0xxbja9d1n9r633isa7jzz1b46ins97q18hvlq2p1dal1hzxxh16"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; + mirai = derive2 { name="mirai"; version="0.11.0"; sha256="0d19pazgh16zcyssfha23csb98yhn9sz8xd7cbyqdf547n6yb0xn"; depends=[nanonext]; }; + mirai_promises = derive2 { name="mirai.promises"; version="0.3.1"; sha256="17jdri470qvxp88h97zgblvbrb0pj1msym96sxlg93gmq2xd0ap8"; depends=[later mirai promises]; }; + mirt = derive2 { name="mirt"; version="1.41"; sha256="0qx8qr4zd5jliamsmpr0c321g3k9ks1ki4fvy5lia3xgihp2s6yh"; depends=[dcurver Deriv GPArotation gridExtra lattice Matrix mgcv pbapply Rcpp RcppArmadillo vegan]; }; + mirtCAT = derive2 { name="mirtCAT"; version="1.13"; sha256="1vlv93wjwj3ajf0mqjz38bi9fdk1sl0wqyqr7kjhhdj4znhrprbs"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; mirtjml = derive2 { name="mirtjml"; version="1.4.0"; sha256="1zvm8acywpzi87lz0hpxmr8c9kyqkbx0490q3vlwxd90ffcdp9ml"; depends=[GPArotation Rcpp RcppArmadillo]; }; mirtsvd = derive2 { name="mirtsvd"; version="1.0"; sha256="0c06dpg0jr15hmk03s96fyp2rb6z4svihjzfs316nkl3dd03ami1"; depends=[GPArotation mirtjml]; }; misPRIME = derive2 { name="misPRIME"; version="0.1.0"; sha256="1975hnf5sizccrl08mlk47jgqp6xswvkhwg5lpdnzz17w0c62ws1"; depends=[MASS quadprog]; }; misaem = derive2 { name="misaem"; version="1.0.1"; sha256="05m7k8mgbpkv5szislvf3q45pk5f8z54ibddhi8pkhwa9w00xkjk"; depends=[MASS mvtnorm norm]; }; misc3d = derive2 { name="misc3d"; version="0.9-1"; sha256="0r9x57s63kx9f6dgam2nhbziq8nrs9wd8pk7g76hds2kw46vnyx0"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; }; - miscFuncs = derive2 { name="miscFuncs"; version="1.5-4"; sha256="12y7j4w0kakikwfc5j60qcp0z9661smjfdqhxqyh8whqm1zbbami"; depends=[mvtnorm roxygen2]; }; + miscFuncs = derive2 { name="miscFuncs"; version="1.5-6"; sha256="0v0ipq2fshjrpkl3mfy8wyf3vq7wmcxf1kppdbm500q9jan7r85i"; depends=[mvtnorm roxygen2]; }; miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; }; miscTools = derive2 { name="miscTools"; version="0.6-28"; sha256="089vb57ynqzqa9ppalqfgn0n5wazfjng2kc7z4wgb2ll40hjyk5x"; depends=[digest]; }; misclassGLM = derive2 { name="misclassGLM"; version="0.3.2"; sha256="1b344dy5fm45jkjrqcx16905n9x0iwihr73mq2m0qfq7ay87nsrh"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; }; - mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; }; miselect = derive2 { name="miselect"; version="0.9.0"; sha256="0dfqni7r5zwdvwmrmvqhycmxhazivz6vnz2ccjy0hyfad29g0v7s"; depends=[]; }; - mispitools = derive2 { name="mispitools"; version="0.4.0"; sha256="0kd6sj0qgi6gf9cykxh8myc09hm5zkzjys1nsdkbdm3ymgar5xy2"; depends=[DirichletReg dplyr forrel ggplot2 highcharter patchwork pedtools plotly purrr reshape2 shiny tidyr tidyverse]; }; + mispitools = derive2 { name="mispitools"; version="1.0.0"; sha256="1s54dm6c48ahib2p5firx3l0fxqxrcvfpk02smisbxna85vbfwd5"; depends=[DirichletReg dplyr forrel ggplot2 highcharter patchwork pedtools plotly purrr reshape2 shiny tidyr tidyverse]; }; mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; missCforest = derive2 { name="missCforest"; version="0.0.8"; sha256="1xdff1iddvagsw5b27wl0hbv21baj8cnkg17imfg9fkh1fik2s00"; depends=[partykit]; }; @@ -13178,27 +13191,28 @@ in with self; { missForest = derive2 { name="missForest"; version="1.5"; sha256="13c38hpl60ca1kwyv61cxsla6ccmsj4qzp0vrxcq7b827fh5aw21"; depends=[doRNG foreach iterators itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.18"; sha256="1s7ph89y0mrksdi73nnjnxl2354401ny8ziijzf036rcsiyvl8m5"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; }; missMethods = derive2 { name="missMethods"; version="0.4.0"; sha256="1vsgc315px3x44rqlsj6r6lyh9flqjibgpvbx0crd8b644ab6qh2"; depends=[mvtnorm]; }; - missRanger = derive2 { name="missRanger"; version="2.2.1"; sha256="05k74gkllsaqvf9prixg5dsjfvjjz1m60ing8iaznnka1nx7qqrg"; depends=[FNN ranger]; }; + missRanger = derive2 { name="missRanger"; version="2.3.0"; sha256="0vnr0l019xmilv297kydpkn4f19amqc2hlrkcbaxg4wh69svmcyf"; depends=[FNN ranger]; }; missSBM = derive2 { name="missSBM"; version="1.0.3"; sha256="16krbmi085zxrwliwz9r6x5hmkaf9w9ds384y50dnapi91232diw"; depends=[future_apply ggplot2 igraph magrittr Matrix nloptr R6 Rcpp RcppArmadillo rlang RSpectra sbm]; }; missSOM = derive2 { name="missSOM"; version="1.0.1"; sha256="15cqqz6f2npsz78yhj3ialzmlx7a8jsf27gfmmj4h68r01czyhs1"; depends=[kpodclustr Rcpp]; }; missingHE = derive2 { name="missingHE"; version="1.5.0"; sha256="0my6a768w7lixh6cw453bl2nrb5aqdiri309p5kp4psp17pzllak"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggpubr ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; missoNet = derive2 { name="missoNet"; version="1.2.0"; sha256="1k7959wjxxpzgrnwil7n51zf76zyri8c2m4m5h2w9az5pil2qmf0"; depends=[circlize ComplexHeatmap glasso mvtnorm pbapply Rcpp RcppArmadillo scatterplot3d]; }; + misspi = derive2 { name="misspi"; version="0.1.0"; sha256="0rbkwfq3b7gvq3qwn3acbrdv4npvm5ixz6y7877alraqd0qjg1c8"; depends=[doParallel doSNOW foreach ggplot2 glmnet lightgbm plotly SIS]; }; mistat = derive2 { name="mistat"; version="2.0.4"; sha256="1hr1gps0w3mfphnc221c6k7h7rwk1f7g6nxkxkb9g8sdacr7ijhh"; depends=[]; }; mistr = derive2 { name="mistr"; version="0.0.6"; sha256="103gvzcyrxscpsd8kv6zj8zx3r9mlbdjwd56msy0ngzcgrb4sb9d"; depends=[bbmle]; }; mistral = derive2 { name="mistral"; version="2.2.1"; sha256="19iq9a3k7xyxafvm73ib8mj1k7ys69aznplqhidl5z8vdl92dmb7"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog Rcpp]; }; - misty = derive2 { name="misty"; version="0.5.0"; sha256="15za8p85i982sp4vw1c5bkvd9dk5yq8yhpi1dym8hfbj18l8rf0c"; depends=[ggplot2 haven lavaan lme4 nlme norm readxl rstudioapi writexl]; }; + misty = derive2 { name="misty"; version="0.5.3"; sha256="05rb9pvklcxqypy35iba5rdkwsh7n0892ln3ycf4qx00hm79akcx"; depends=[ggplot2 haven lavaan lme4 nlme norm readxl rstudioapi writexl]; }; mitml = derive2 { name="mitml"; version="0.4-5"; sha256="1szfw993ma4qn377bab08bkvm4s0sxs5x2hdcj9kgk47661fqsh5"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; }; mitre = derive2 { name="mitre"; version="1.0.0"; sha256="0r5phzxiibwwhx3qh623grfy070c3vzm4q07rzhsp5q5ycb5jhn5"; depends=[dplyr igraph jsonlite plyr RJSONIO rlang stringr tidyr]; }; mix = derive2 { name="mix"; version="1.0-11"; sha256="1q565ymc1lh24lv0v70qwqb0p0nagg2jcz2nf7dz964bsnp20wjf"; depends=[]; }; - mixAK = derive2 { name="mixAK"; version="5.5"; sha256="0g60hynazs6ix2dp0svwql04rk6bxri2llc6pn6h5faqns9cpl4a"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; + mixAK = derive2 { name="mixAK"; version="5.6"; sha256="183bhlp2h3x5rfxfx21gg2wrz3ns458w9ygna9v51iagi5zzc1k5"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; mixAR = derive2 { name="mixAR"; version="0.22.7"; sha256="1r8fbmwk75h41336vfc94qf5k1wy9hkyd2vjzasv8vxqdb66cwng"; depends=[BB combinat e1071 fGarch gbutils MCMCpack mvtnorm permute Rdpack timeDate]; }; mixIndependR = derive2 { name="mixIndependR"; version="1.0.0"; sha256="0wjzs56axdjas2a9ynw3gd78h0fgcfjpx3bk7nm895lmadyzih6y"; depends=[data_table]; }; - mixKernel = derive2 { name="mixKernel"; version="0.8"; sha256="0slw5fvmzkfpx7nq5fbfldjrgh92v4g7j86jhbhghbkpwzzsjnyi"; depends=[corrplot ggplot2 LDRTools markdown Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; + mixKernel = derive2 { name="mixKernel"; version="0.9"; sha256="1sinbq30f57ihqy57vf69hq0c6f54j7w4dbx46vz39b7kx5319nz"; depends=[corrplot ggplot2 LDRTools markdown Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; }; mixR = derive2 { name="mixR"; version="0.2.0"; sha256="1iarsys7jyi3zck01y7415xwyd1knnh1fkc8z4ipfd63nnlm2pqc"; depends=[ggplot2 Rcpp]; }; mixRaschTools = derive2 { name="mixRaschTools"; version="1.1.1"; sha256="1giq6d97sg6f66sh0gw6x1f2ax4ys91kfnrlpdv37m7qakk5npyj"; depends=[]; }; - mixSPE = derive2 { name="mixSPE"; version="0.9.1"; sha256="18lxivrjhh7h0l9hj0x7r8qxv1dwsad2bkswg73n0a95zf6lgn87"; depends=[mvtnorm]; }; + mixSPE = derive2 { name="mixSPE"; version="0.9.2"; sha256="1fcafsvnv9hgh0cnjqwfj09y4fw3scm888fnnax3pjialklzmxh7"; depends=[mvtnorm]; }; mixSSG = derive2 { name="mixSSG"; version="2.1.1"; sha256="0aqzyfpq568vgk2rjh7i93azfa990mvapddcdjwh3xyyb3flsas4"; depends=[ars MASS rootSolve]; }; mixbox = derive2 { name="mixbox"; version="1.2.2"; sha256="1g7pph2p4vxvsysc6lfi5sh7khcbsjhaljfrd1qp6msrbkn34bmp"; depends=[GIGrvg stabledist]; }; mixcat = derive2 { name="mixcat"; version="1.0-4"; sha256="19v6y981js18xz9q49slclkhcf6w53iar55ynjs0lvhn1y1b2517"; depends=[statmod]; }; @@ -13226,12 +13240,12 @@ in with self; { mixtools = derive2 { name="mixtools"; version="2.0.0"; sha256="03by64xi7yka0hzc1qyz1jdqzah6isvr3cdsc7g5v6hb4f178kl5"; depends=[kernlab MASS plotly scales segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.4.0"; sha256="1lca26s80f92c18wkpp5gs2ifylnyqyg933w7r5ir3xvsfbk0lfh"; depends=[minpack_lm]; }; mixtur = derive2 { name="mixtur"; version="1.2.1"; sha256="02hybyc647jhl3jcyv26kcg1ijq4qlami18m6xyckygw8m2fb85l"; depends=[dplyr ggplot2 rlang tidyr]; }; - mixture = derive2 { name="mixture"; version="2.0.5"; sha256="16ydhsgssd5jbhf03llxy2gjhv3h3bqi01s45jcb9dwc3mbd306b"; depends=[BH lattice Rcpp RcppArmadillo RcppGSL]; }; + mixture = derive2 { name="mixture"; version="2.0.6"; sha256="08p1nziyflkz992i74br4mpc0j1npp947jwvy9hvmxir0mnzchi8"; depends=[BH lattice Rcpp RcppArmadillo RcppGSL]; }; mixvlmc = derive2 { name="mixvlmc"; version="0.1.1"; sha256="04g56kqzbm0gjdn0jnxh6cpjpvz764ir6333szymwz3z7dlk0h6x"; depends=[assertthat butcher nnet pROC Rcpp rlang stringr VGAM withr]; }; mize = derive2 { name="mize"; version="0.2.4"; sha256="1dfhldxsm1il9avfxvaiir9r878dp7swyc9c8ilm6llx208sd5d5"; depends=[]; }; mizer = derive2 { name="mizer"; version="2.4.1"; sha256="1y708615jp8cm48yg6rbqjr58kppca09h2pyzqpd6j3hlz8fm9nj"; depends=[assertthat deSolve dplyr ggplot2 ggrepel lifecycle lubridate plotly plyr progress Rcpp reshape2 rlang]; }; mkde = derive2 { name="mkde"; version="0.2"; sha256="0ihf3ahlppriba9j29zs7gfjxl49nsrrinnjzcxgca1yc5fikqcf"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="1.2.5"; sha256="0jvv1vagq902rm2pc8hm85lbzjclqzpl622arcqdaaagz49sl2in"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild R6 rlang saemix vctrs]; }; + mkin = derive2 { name="mkin"; version="1.2.6"; sha256="1k90z1kqk57rib0f7rm23qmcvk942b0rggbjfyc7jzrba3v65qpb"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild R6 rlang saemix vctrs]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.2"; sha256="1vgg5azr4qydqb6xbdbff9256bwz7gl3k3hpn7998rm9jhdmynnd"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.5.1"; sha256="0q902qcynkbwg9bnv0w24vzyqwky0skqck728id943lrvqi92667"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph rlang]; }; @@ -13241,30 +13255,28 @@ in with self; { mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; }; mldr = derive2 { name="mldr"; version="0.4.3"; sha256="07lbxpydz78fya11bl3l1ckhbps3nx43ddh3z09ygg70jjbdhxwq"; depends=[circlize shiny XML]; }; mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.2"; sha256="0zyfv8xy5yik0k3j0kf9r43xrvj528qzdb1v74sfi24vim6k6503"; depends=[]; }; - mldr_resampling = derive2 { name="mldr.resampling"; version="0.2.2"; sha256="10vms4jiws5d8jk0hpld2r4qb2rbgh10fpkbvswqfb6mjv77016n"; depends=[data_table e1071 mldr pbapply vecsets]; }; + mldr_resampling = derive2 { name="mldr.resampling"; version="0.2.3"; sha256="0knxv6ndni50g17b86gb6xshks6h776y5aa82hmz9q7n2mq1861v"; depends=[data_table e1071 mldr pbapply vecsets]; }; mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; }; - mlearning = derive2 { name="mlearning"; version="1.1.1"; sha256="1zjnh4gcw068li1bks60gazn3205xhmqz67hbkb1san33lmlxya3"; depends=[class e1071 ipred MASS nnet randomForest]; }; + mlearning = derive2 { name="mlearning"; version="1.2.1"; sha256="0fh28i36smpybhzd2kni435m7wf20i3yib6h7jy173r1v5adzkba"; depends=[class e1071 ipred MASS nnet randomForest rpart]; }; mlegp = derive2 { name="mlegp"; version="3.1.9"; sha256="1cs0l04axp6f6f6m4h4kw8z4pasxgp5la3xib04wxzb2l4bnsab3"; depends=[]; }; mlergm = derive2 { name="mlergm"; version="0.8"; sha256="0bpdljmbn4lfm263jcsp0hrknixn49m7hqsx0jjk3pfwhgjlajh8"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mlexperiments = derive2 { name="mlexperiments"; version="0.0.2"; sha256="0bf515jgwm248l0cryacsr3xlh18zy3wx91v0kwwqackg74xa12q"; depends=[data_table kdry progress R6 splitTools]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; mlfit = derive2 { name="mlfit"; version="0.5.3"; sha256="0nyk5vmy2gkpz022djacy80gibskv96z0rsmjz2rw14zhc5kizsh"; depends=[BB dplyr forcats hms kimisc lifecycle Matrix plyr rlang tibble wrswoR]; }; - mlflow = derive2 { name="mlflow"; version="2.5.0"; sha256="1zjm66wx25y41kpr8wmjk52d51ghkq35myicxna2yld3xvx2h7ig"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr rlang swagger tibble withr yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="2.7.1"; sha256="1ydf452xhmapshxxza5phsgn44adxivhwmv2wh6a3d30mzm9zk9f"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr rlang swagger tibble withr yaml zeallot]; }; mlim = derive2 { name="mlim"; version="0.3.0"; sha256="16p3nprnxc0cghfbwcs3hf57aasqpvd4qv3wajhzrajqhmclzn0q"; depends=[curl h2o md_log memuse mice missRanger]; }; mllrnrs = derive2 { name="mllrnrs"; version="0.0.2"; sha256="14l3s3zzy152rqliqsxgk4qx0ldrp67phq9k1wkf9p1kdc6i3yfk"; depends=[data_table kdry mlexperiments R6]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; - mlma = derive2 { name="mlma"; version="6.2-1"; sha256="1jvra77xhf0a6qb2kb953inpg2lzv0y88kb6zzcw35bb8gipzm78"; depends=[abind car coxme gplots lme4 survival]; }; - mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; + mlma = derive2 { name="mlma"; version="6.3-1"; sha256="16v3rwdc7kzn2k84ghkss14p1kqx86md9k1xv2k2x187f5lncamh"; depends=[abind car coxme gplots lme4 survival]; }; mlmhelpr = derive2 { name="mlmhelpr"; version="0.1.0"; sha256="1liqawmdz3a8jxnlbhxx9iz5nlybkyz7jr719y0xkqz4h741bj5s"; depends=[lme4 mathjaxr Rdpack]; }; mlmi = derive2 { name="mlmi"; version="1.1.2"; sha256="1nkg7h0r716yv9y6xnx8qcpvrqr6cxlhqrcyiihkwgwbmkgkp5sz"; depends=[cat gsl MASS Matrix mix nlme norm]; }; mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; }; - mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; mlmpower = derive2 { name="mlmpower"; version="1.0.2"; sha256="1773cbkby7ll0dpv9ymqg63sq7b2ladxlh0wlswj7ks7rrn07z05"; depends=[cli lme4 lmerTest varTestnlme]; }; mlmtools = derive2 { name="mlmtools"; version="1.0.2"; sha256="1fwa0cwrrhzxr5zkvmf0q1w2wlrhj58lwmrvqxfn00v0v9d6bi0g"; depends=[ggplot2 lme4]; }; mlmts = derive2 { name="mlmts"; version="1.1.1"; sha256="10xy4qzdik1rjs11ql798ig7y5cm3hjc61n5dhxfzpi1w0wk3smi"; depends=[AID caret ClusterR complexplus DescTools dtw e1071 fda_usc forecast freqdom geigen ggplot2 igraph MASS Matrix MTS multiwave pracma pspline psych quantspec randomForest ranger Rdpack Rfast TSA TSclust TSdist tseries tseriesChaos tsfeatures waveslim]; }; mlogit = derive2 { name="mlogit"; version="1.1-1"; sha256="0hyi6gi03n895iydrfr1ba2ifbsd6lyjyhkq62d95ghhniysjgkg"; depends=[dfidx Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-7"; sha256="0q8c5897z8f519nf6p55ksc610a9dbpnah2rr4srij4gs9a4clx1"; depends=[abind BMA maxLik]; }; - mlpack = derive2 { name="mlpack"; version="4.2.0"; sha256="044bgls55rk669bqqxlxrhvyjfnqg4y5ws70xz7qllkz8yc1ljlj"; depends=[Rcpp RcppArmadillo RcppEnsmallen]; }; + mlpack = derive2 { name="mlpack"; version="4.2.1"; sha256="0d2b6mldv3cnc4pk27d5vcb9bcm835kydxn0n0adalm54c8my74a"; depends=[Rcpp RcppArmadillo RcppEnsmallen]; }; mlpwr = derive2 { name="mlpwr"; version="1.1.0"; sha256="18w0vklxy61v0r33xi57j3s76iwsb2cs2cjhg1gjyxzl07byj89j"; depends=[DiceKriging digest ggplot2 randtoolbox rgenoud rlist WeightSVM]; }; mlquantify = derive2 { name="mlquantify"; version="0.2.0"; sha256="1fpwvix0f4bmqb1y1b6wryndqp6j24dwsspbfx1zrnhzwj1v4i9i"; depends=[caret FNN randomForest]; }; mlr = derive2 { name="mlr"; version="2.19.1"; sha256="00jjhvaqifj6glqsyzixlp56bvlch5smck8kk3klcmwx9pasyllx"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; @@ -13273,7 +13285,7 @@ in with self; { mlr3benchmark = derive2 { name="mlr3benchmark"; version="0.1.6"; sha256="1bhn0lm0k9dm9mbji6cwgqkwsa1qg928fbjs8chra9s3d3bzcb0x"; depends=[checkmate data_table ggplot2 mlr3misc R6]; }; mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.8"; sha256="0qxh80qfb06wdivja6cy9qwpma27ic66xis0iz7lfd09dvfmrb8w"; depends=[backports checkmate clue cluster data_table fpc mlr3 mlr3misc paradox R6]; }; mlr3data = derive2 { name="mlr3data"; version="0.7.0"; sha256="04hwmj8cdszwgd845va26pgzdw0k4cm025zjrmp3fr7ypp73mirg"; depends=[]; }; - mlr3db = derive2 { name="mlr3db"; version="0.5.0"; sha256="0gvmn85sqn3klziy8nd726nim28cvfgdaddp4ilbq3v0jr745giz"; depends=[backports checkmate data_table mlr3 mlr3misc R6]; }; + mlr3db = derive2 { name="mlr3db"; version="0.5.1"; sha256="00zg5skc7l5i84djmq3v5f1ln0959jx24gfazx49vpyxbcs0p5dg"; depends=[backports checkmate data_table mlr3 mlr3misc R6]; }; mlr3fairness = derive2 { name="mlr3fairness"; version="0.3.2"; sha256="0rm6l50prwjjy55p14zs9mkdrczbyl7f63fqsmh7r5xjahcsnfi7"; depends=[checkmate data_table ggplot2 mlr3 mlr3learners mlr3measures mlr3misc mlr3pipelines paradox R6 rlang]; }; mlr3filters = derive2 { name="mlr3filters"; version="0.7.1"; sha256="07qgk26ls8wgf9k82xlnsjwi7mpnpgi7i2yplfb5hsqn8nfj6hcc"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; mlr3fselect = derive2 { name="mlr3fselect"; version="0.11.0"; sha256="0z47gygf1s4967gj9n5dsjymy9bcr7j8c7s3z7k4qmbnh71nn9w6"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; @@ -13281,10 +13293,10 @@ in with self; { mlr3learners = derive2 { name="mlr3learners"; version="0.5.6"; sha256="1m0psjqcl2pfy73wmc29vyz122v0kqmws6d0dgl7wsy1csfjsjm2"; depends=[checkmate data_table mlr3 mlr3misc paradox R6]; }; mlr3mbo = derive2 { name="mlr3mbo"; version="0.2.1"; sha256="10z3595114kl3yc0kyxk9ca0ahsxmml4di7pvh4z20iv8n57xgc6"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6 spacefillr]; }; mlr3measures = derive2 { name="mlr3measures"; version="0.5.0"; sha256="0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57"; depends=[checkmate PRROC]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.12.0"; sha256="028cqh7fvy1s16qr46znk3ijmsl7ifsxbrkbrz37w2mri0mxv3jw"; depends=[backports checkmate data_table digest R6]; }; - mlr3oml = derive2 { name="mlr3oml"; version="0.8.0"; sha256="0v6v4cwsl2za9fi5cya67i6gkfih8ibrs0lqaj35barm9kg7p23c"; depends=[backports bit64 checkmate curl data_table jsonlite lgr mlr3 mlr3misc paradox R6 stringi uuid withr]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.13.0"; sha256="0b565hy86bcgjv8k9qipkcgsag6jiiv1jx5lgi1iddcf8rg6bind"; depends=[backports checkmate data_table digest R6]; }; + mlr3oml = derive2 { name="mlr3oml"; version="0.9.0"; sha256="08px4k8qrwwsay0f9h1nkpf7w30z0n4w189q2ijhb3kbrd0jhf1j"; depends=[backports bit64 checkmate curl data_table jsonlite lgr mlr3 mlr3misc paradox R6 stringi uuid withr]; }; mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.5.0-1"; sha256="1pn6zi1qy4ql7zkkzmx52b5l9agppr1rlv3pdnm1dy8y0yc7imhd"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; }; - mlr3shiny = derive2 { name="mlr3shiny"; version="0.2.0"; sha256="0s581aqi3a3kg35db0gnsmmg62zwl5bij4vbszjhc63i3xg0ayiz"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; + mlr3shiny = derive2 { name="mlr3shiny"; version="0.3.0"; sha256="0rv5ybg6l1n7j6gq8wmvl1gd1mdmqd52vl91hkpv9k1l1w8m8mph"; depends=[data_table dplyr DT Metrics mlr3 mlr3learners mlr3measures mlr3pipelines patchwork plyr purrr shiny shinyalert shinydashboard shinyjs shinyWidgets stringr]; }; mlr3spatial = derive2 { name="mlr3spatial"; version="0.4.1"; sha256="0nwl97zirdnmhd322wxnwrscwwv5vym6nagmhj5wr80d4jwdmy45"; depends=[checkmate data_table lgr mlr3 mlr3misc R6 sf terra]; }; mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="2.1.0"; sha256="1dk8n0jw5461ngnv3iazm3dhnlsj53ymn19lnh346mwyk7g5vr06"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6]; }; mlr3tuning = derive2 { name="mlr3tuning"; version="0.19.0"; sha256="1iz7izmkx11jma95305wq8aapi4dmqg20flgxxvdvrfy6hf98k33"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; @@ -13297,25 +13309,29 @@ in with self; { mlrpro = derive2 { name="mlrpro"; version="0.1.2"; sha256="1j8w8ji1n6cahcbyi1q4zq8gmhpcl15pb97f7bl1km29f4x4f272"; depends=[car dplyr MASS]; }; mlsbm = derive2 { name="mlsbm"; version="0.99.2"; sha256="1p6fflhjbbyzx51hb77aak1kdabjrmzd7b47vdcanhb0vd263aby"; depends=[Rcpp RcppArmadillo]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.2"; sha256="1icsssgi5xf420ajagr9nw0wgbxpfm7dsd5b7s77vyh5hsfzm1z3"; depends=[]; }; - mlt = derive2 { name="mlt"; version="1.4-8"; sha256="11qnbrwl2vahbs1fqmagsahffxxhwg441z683194c3bvpfddl5cd"; depends=[alabama basefun BB coneproj Matrix nloptr numDeriv sandwich survival variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="1.1-6"; sha256="1ijfv3lwizk540g546pyi5i4sxcxwa3b2ylk0gsk68q5w704xpk6"; depends=[eha flexsurv lattice mlt multcomp numDeriv survival truncreg]; }; + mlstrOpalr = derive2 { name="mlstrOpalr"; version="1.0.2"; sha256="0lifas5irjhyrys6ykbm1pji7rnhr4mg1f0asi26i8pk3048ri25"; depends=[dplyr fabR madshapR opalr rlang stringr tidyr]; }; + mlsurvlrnrs = derive2 { name="mlsurvlrnrs"; version="0.0.2"; sha256="0xhwcx7xzzdvm6g51pr0r4ggphxarvzjj6gvndhylbf89wc9vxwk"; depends=[data_table kdry mlexperiments mllrnrs R6]; }; + mlt = derive2 { name="mlt"; version="1.4-9"; sha256="0a5nhm8pkadl26gz285klpj8m6jla2zq230g5r51hkyvm2vxcz74"; depends=[alabama basefun BB coneproj Matrix nloptr numDeriv sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.1-7"; sha256="05vrgddg4j2yc6b07dqypid9gvvpilv9ky2bgwml0az629666111"; depends=[eha flexsurv lattice mlt multcomp numDeriv survival truncreg]; }; mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; }; mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; }; mlxR = derive2 { name="mlxR"; version="4.2.0"; sha256="0pr564376q7pn0wbbw5q9mjfzdc0bpq1g4xj0bcdmb64binqllvb"; depends=[ggplot2]; }; - mma = derive2 { name="mma"; version="10.6-1"; sha256="0m45c40rd61p4dhgc2x18ziw14m4almssbg8q2xma8n9b0mifc8i"; depends=[car gbm gplots lattice survival]; }; - mmabig = derive2 { name="mmabig"; version="3.1-0"; sha256="12drgrbq8pn8c6psf4cn7shr6rd9r9pjrdr4h7i1abvs20m4xxhf"; depends=[car glmnet gplots mma survival]; }; + mma = derive2 { name="mma"; version="10.7-1"; sha256="0zqkqzi27qg4q6mirhw5gzjbsd9i06rxzr61zmmsw33wg5a6lgd3"; depends=[car gbm gplots lattice survival]; }; + mmabig = derive2 { name="mmabig"; version="3.2-0"; sha256="1ji832vs9gfzpl1ij85dgmkpqr3qy4p7r6kvrk0y3q3agjxw1gky"; depends=[car glmnet gplots mma survival]; }; mmand = derive2 { name="mmand"; version="1.6.3"; sha256="18bl3s0x0rm3yg7zjamhl6rn2bknxg75ilqgi28ikzbrp2k5sdzw"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-21"; sha256="0q1hmr9431fl00xqr8008jpna9rlv303dvibz2pr9ifg9vkcw7ab"; depends=[]; }; mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; }; mmaqshiny = derive2 { name="mmaqshiny"; version="1.0.0"; sha256="0v44hd7h9d8hdd2avwwwwc0a8rzm5ij3yhryxkrw7bwvr12zsp17"; depends=[Cairo caTools data_table dplyr DT ggplot2 htmltools leaflet lubridate plotly shiny shinyjs stringr XML xts zoo]; }; mmb = derive2 { name="mmb"; version="0.13.3"; sha256="07nni04fb0gprma368axzz303db12hp22fz1a0xwh3bbh6n7zb9g"; depends=[doParallel foreach Rdpack]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; + mmcards = derive2 { name="mmcards"; version="0.1.1"; sha256="17icmsk37lfr850ilcx7q97bjzimv2zj0c27m9gpmb00bnkrkv21"; depends=[]; }; mmcif = derive2 { name="mmcif"; version="0.1.1"; sha256="14kp0n24nxcfnfq8drxfhsvd4apg4f7iwdamzw005rlhi5srmw3r"; depends=[alabama psqn Rcpp RcppArmadillo testthat]; }; mmcm = derive2 { name="mmcm"; version="1.2-8"; sha256="09xcvgzgg5x890jibmmbcd3rr8q8vmwxwk6s8zgn9a8hfdwqny9a"; depends=[mvtnorm]; }; mmconvert = derive2 { name="mmconvert"; version="0.10"; sha256="1bmvcvkisqmfnpwwwb8fvnqq5fbdd6ppsi6iw9parbmzrnir8zmj"; depends=[Rcpp]; }; mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; }; - mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; }; + mmeln = derive2 { name="mmeln"; version="1.5"; sha256="06knagiyhm24rk4m2p7yz61sscxplwpwbwf1356jazxp7y0v61xp"; depends=[]; }; mmeta = derive2 { name="mmeta"; version="3.0.0"; sha256="088mynadrcwrw7g31f6p0g3ykq2q44mwsbpp056v8s19hq5pxjn1"; depends=[aod ggplot2]; }; + mmirestriktor = derive2 { name="mmirestriktor"; version="0.1.0"; sha256="0l5ncw2g5b9yzw8zdk1x07f38xxxvf5ngqz427zhnrkcc20zhy2z"; depends=[MASS mmcards restriktor shiny shinythemes]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; mmodely = derive2 { name="mmodely"; version="0.2.5"; sha256="0fw2ncva8y5jxybi51bbqygkag5zaswni8bfg4gf78yjvjw3iyj5"; depends=[ape caper caroline]; }; @@ -13325,7 +13341,7 @@ in with self; { mmr = derive2 { name="mmr"; version="0.1.0"; sha256="0by2v47b4kpjhfxzzl6kc1shw7g46nwnww4rq333r2cywvrbkk4w"; depends=[]; }; mmrm = derive2 { name="mmrm"; version="0.2.2"; sha256="1kfrzgl942fcfc0yhjjca2pqc28w37fy1313brfwcg1b9qi60grl"; depends=[checkmate lifecycle nlme numDeriv Rcpp RcppEigen Rdpack stringr testthat TMB]; }; mmsample = derive2 { name="mmsample"; version="0.1"; sha256="0mdd2zryadd31a5pls5fvlxx52mr54jsi1i6mwrs4y7rl3i9v95z"; depends=[MASS Rcpp RcppArmadillo]; }; - mmstat4 = derive2 { name="mmstat4"; version="0.1.5"; sha256="0frs18r0ycp8z1cszpim9bvbmz0gsgjw8ypfbbfcx0j3w8hp9rcg"; depends=[digest rappdirs rio rstudioapi shiny]; }; + mmstat4 = derive2 { name="mmstat4"; version="0.1.6"; sha256="0glbf5s0d0l52by6iygnmr9yz6gw1mycgypfkfciixys4zii9ylj"; depends=[digest httr rappdirs rio rstudioapi shiny]; }; mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; }; mnda = derive2 { name="mnda"; version="1.0.9"; sha256="1lmkxdfym1jfq05vpjky1b6nz1xwzsdh9mz3017v23qyg7dmbzyi"; depends=[aggregation assertthat ggplot2 ggraph igraph keras magrittr MASS Matrix reticulate tensorflow usethis]; }; mnet = derive2 { name="mnet"; version="0.1.2"; sha256="02chp8g5303nbcbvfmm10lh63170290fyg9kbfxgr2krg08gbr1v"; depends=[doParallel foreach mlVAR]; }; @@ -13334,15 +13350,14 @@ in with self; { mnlfa = derive2 { name="mnlfa"; version="0.2-4"; sha256="0m3phcskg8pwxg1p8ph2g43rbd6p3v8rysys60q5kv4457hgwqpx"; depends=[CDM Rcpp RcppArmadillo]; }; mnmer = derive2 { name="mnmer"; version="0.99.1"; sha256="0smy7n016nax4wng8pikmgwmbkrhykc2hzvh60hwfbqlbfda66yj"; depends=[Biostrings cpp11]; }; mnonr = derive2 { name="mnonr"; version="1.0.0"; sha256="143qkn3bx37a6r7kgmspqh55l2r8k9f93jgxr6qpg51w411k5ilb"; depends=[]; }; - mnorm = derive2 { name="mnorm"; version="1.2.0"; sha256="1iq8sgjg7y6779vvh1q11libcgsjkli4bngj1xm883zqwbwrwihg"; depends=[hpa Rcpp RcppArmadillo]; }; + mnorm = derive2 { name="mnorm"; version="1.2.1"; sha256="1g7174hbknriwmj044zb4psc4f2np3qy308xsq2ik3n9fvxz0vyh"; depends=[hpa Rcpp RcppArmadillo]; }; mnormt = derive2 { name="mnormt"; version="2.1.1"; sha256="020ka48jsxm9l109ksvy2l17xcpm51avm0l971dgs2mgg01sgz4m"; depends=[]; }; - mnreadR = derive2 { name="mnreadR"; version="2.1.6"; sha256="0h0l05l8cgrdrk8sk60p2284kp2xz35cygzyhlk0h2x29zhw7bb7"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; mnt = derive2 { name="mnt"; version="1.3"; sha256="1wf2mq4zdhznv589j7snw0gpnfrlvq6lhfihi2n20qlwm3lb9naa"; depends=[MASS pracma]; }; mob = derive2 { name="mob"; version="0.4.2"; sha256="1mv0bsik3bdkmnggy2fv0482fqv2yck1ycw49wd45p2dyfzzwcsd"; depends=[gbm Rborist]; }; mobilityIndexR = derive2 { name="mobilityIndexR"; version="0.2.1"; sha256="0bs2wvbjcrfh82b483vz4lr16y2vaajz2fb1p5bw05qb78jqj9bd"; depends=[]; }; mobirep = derive2 { name="mobirep"; version="0.2.3"; sha256="06f7vn3ndkadwp60qvvh3yikdx97r6fkqldn67l1506vdr60pxfm"; depends=[copBasic copula ggplot2 ks lattice SpatialExtremes texmex viridis zoo]; }; mobr = derive2 { name="mobr"; version="2.0.2"; sha256="0dvsarxkjcjn3f40qkx5pdjpvq7hr6l5nvdz6adxlr1sdbadfcws"; depends=[dplyr egg geosphere ggplot2 pbapply plotrix purrr rlang scales tibble tidyr vctrs]; }; - mockery = derive2 { name="mockery"; version="0.4.3"; sha256="0sj77m9vgn4bzb8c8nq93xb9lm8ih8rcb7sfccripraibibg3jcz"; depends=[testthat]; }; + mockery = derive2 { name="mockery"; version="0.4.4"; sha256="1hs550i2nqnn1yyx2sd7babamkq3sm7cxiwzcj8wlps5yah208h7"; depends=[testthat]; }; mockr = derive2 { name="mockr"; version="0.2.1"; sha256="0n3syab3dq1am562vnjpkgmx3v06liafyy0fcyvj0spdxr0mkvr3"; depends=[rlang withr]; }; mockthat = derive2 { name="mockthat"; version="0.2.8"; sha256="02j74gpppspf8ll3mvz879mnjm9wsj8dq5y3i0r8kzdizc6rxk3k"; depends=[rlang]; }; mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; }; @@ -13353,34 +13368,33 @@ in with self; { modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; }; modQR = derive2 { name="modQR"; version="0.1.3"; sha256="15ks5i7s19r4s9faxn36qlcf4y150b6xji970kxgilcgxvfqkgd8"; depends=[geometry lpSolve]; }; modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; }; - modchart = derive2 { name="modchart"; version="0.5"; sha256="1mn8zywqhxhvy0k6mn0jsn90g9yb6sxyv34syzzxrxs2kdzx5szg"; depends=[collapsibleTree dplyr DT dygraphs highcharter htmlwidgets jsonlite lazyeval leaflet magrittr networkD3 plotly RColorBrewer rgdal shiny shinyBS shinydashboard shinydashboardPlus sp sparkline sunburstR treemap]; }; modeLLtest = derive2 { name="modeLLtest"; version="1.0.4"; sha256="0m9djx3d2k0y38h0wyscwvzj0pvlfjqz2ar7j1rb29mhm7y8np70"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; }; modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; model4you = derive2 { name="model4you"; version="0.9-7"; sha256="0pni9v3nradvy8sp2m07903vc7z610xrh426lf19dxss12kgrfi8"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.2"; sha256="0qj8ri7aw9lc7cc7rcs618bcbarcs29zgbz8l74s55qajvwpssg0"; depends=[]; }; - modelSSE = derive2 { name="modelSSE"; version="0.1-1"; sha256="1zz6jnk8cjwh9vnp313sv9xqmnybaz2ydwymfvbnkqzybbvm117v"; depends=[Delaporte]; }; + modelSSE = derive2 { name="modelSSE"; version="0.1-3"; sha256="0fqxwdsvfpzd182pwwib2ci6q76hzlw5ykkwzk20l5hglhdf057q"; depends=[Delaporte]; }; modelStudio = derive2 { name="modelStudio"; version="3.1.2"; sha256="10d1z0l5wfbyl2dm4n705bmj8wa5a99jnp4w6z66bx7cqamxapa3"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; }; modelbased = derive2 { name="modelbased"; version="0.8.6"; sha256="0l8jhmainrc30n30aq5pcpwk6n13qwiy5a4xb0ndgfj401y37c78"; depends=[bayestestR datawizard effectsize insight parameters performance]; }; + modelbpp = derive2 { name="modelbpp"; version="0.1.2"; sha256="17hfy7g6ydj28fqs4s523px8cvnnp8pc80b4z9qlilg9jxq3r9xf"; depends=[igraph lavaan pbapply]; }; modelc = derive2 { name="modelc"; version="1.0.0.0"; sha256="0xz1zgv5yyvq0yfnhm1kvb4wvlyn4ccd0lkwji55vq8hndvjvk98"; depends=[]; }; modeldata = derive2 { name="modeldata"; version="1.2.0"; sha256="15d29497bbarb3qyib4g584hscfviv0cg62195s26qg1q6l022ac"; depends=[dplyr MASS purrr rlang tibble]; }; - modeldatatoo = derive2 { name="modeldatatoo"; version="0.1.0"; sha256="0aa6920a0izaggs1a0dsnkn24vnx48xry2x4906scaifd7vgk7fv"; depends=[pins]; }; + modeldatatoo = derive2 { name="modeldatatoo"; version="0.2.1"; sha256="0qric17sxfy4w4pgp8cvmm30vq9lddk58hzqrm5f7s63ydjb4n2i"; depends=[pins]; }; modeldb = derive2 { name="modeldb"; version="0.2.3"; sha256="1drmcs46l77ihi4j4qr7j09bnf9n1488zy5954gqahq7ab80ag3g"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; modelenv = derive2 { name="modelenv"; version="0.1.1"; sha256="1pnc3bs2fzanqzjv2y8a7yy6s8hmwwsccjc8pvifff5kp557a6di"; depends=[glue rlang tibble vctrs]; }; modelfree = derive2 { name="modelfree"; version="1.2"; sha256="08kqc5a5ray0wgnd8c6d1frqzg9q990j1p78j7j7c5xll402c8ns"; depends=[PolynomF SparseM]; }; modelimpact = derive2 { name="modelimpact"; version="1.0.0"; sha256="16sy7r6bw5nzx77rd27ihgvp7bs39xchgid94ssklj6syc3kn2vq"; depends=[dplyr magrittr]; }; - modelplotr = derive2 { name="modelplotr"; version="1.1.0"; sha256="0i1ssfcyl97zaxc9khdngrmsq9ydrmgv2nd7c6kc6i9z93jbkk4k"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; modelr = derive2 { name="modelr"; version="0.1.11"; sha256="1lvv6gac3g4x1d58chbvlxlkd77qz21a3rlb64jvzwycx43dbswl"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; - modelsummary = derive2 { name="modelsummary"; version="1.4.1"; sha256="0iaamyl5gvw4dp5by1jg59xnm5mpyx5dql2ik0bwybsj1d2bf7bc"; depends=[checkmate data_table generics glue insight parameters performance tables]; }; + modelsummary = derive2 { name="modelsummary"; version="1.4.3"; sha256="0sm4d7rgq1dl04gi0qsws7lyh4mczm05d04cd5yd8nva24z5lbla"; depends=[checkmate data_table generics glue insight kableExtra parameters performance tables]; }; modeltests = derive2 { name="modeltests"; version="0.1.4"; sha256="0ii5sh8yz5yvf0gq41ia55dvbg8x9042x82j52ck6haxa0w8zpfy"; depends=[dplyr generics purrr testthat tibble]; }; - modeltime = derive2 { name="modeltime"; version="1.2.7"; sha256="1ap5ghhz7c98vn19yvabs5qz2giww7i9qdapv41b1sj1c9fnakwx"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parallelly parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidymodels tidyr tidyverse timetk workflows xgboost yardstick]; }; + modeltime = derive2 { name="modeltime"; version="1.2.8"; sha256="1wvmz4wr972msfrld26ygahn1sky3p10x18975kbaksrw8qgz4ag"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parallelly parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidymodels tidyr tidyverse timetk workflows xgboost yardstick]; }; modeltime_ensemble = derive2 { name="modeltime.ensemble"; version="1.0.3"; sha256="17mnz2x7i540gzwpqca106saafvsns9ar1q09pnnzkx2m4xv322i"; depends=[cli doParallel dplyr foreach generics glue magrittr modeltime modeltime_resample parsnip purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; }; modeltime_resample = derive2 { name="modeltime.resample"; version="0.2.3"; sha256="0prc4q5s6iwhknxlbaq43cyhmzwnmi52akpaf1zizw4c6flgny3v"; depends=[cli crayon dials dplyr forcats ggplot2 glue hardhat magrittr modeltime parsnip plotly progressr purrr recipes rlang rsample stringr tibble tictoc tidyr timetk tune workflows yardstick]; }; modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; moder = derive2 { name="moder"; version="0.2.1"; sha256="19lz6jl9lhzwafmxx8yp7sx5lkz2xixk2yl5ys5l82am402d1wwb"; depends=[]; }; - moderate_mediation = derive2 { name="moderate.mediation"; version="0.0.5"; sha256="0daxbg26cm10rzx43jc4n76jjli6br962zcd0fhdjc68g9rza1m0"; depends=[cowplot distr doSNOW earth foreach ggplot2 mvtnorm reshape2 scales]; }; + moderate_mediation = derive2 { name="moderate.mediation"; version="0.0.6"; sha256="1nlv2v31h7h6isyv7nv5b7mb2v8c645rhrwabjykjamhh1d9llgj"; depends=[cowplot distr doSNOW earth foreach ggplot2 mvtnorm reshape2 scales]; }; modernVA = derive2 { name="modernVA"; version="0.1.2"; sha256="0kbk1jm39s6q2dyk5s3kn9mcjssqpkm5czr7vc2va92sg19174r9"; depends=[]; }; moderndive = derive2 { name="moderndive"; version="0.5.5"; sha256="0bgq6wsyyi6nsxqqh2k3zsmk64pfvb57z8pzk8ych3xih491hzlm"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; @@ -13392,8 +13406,7 @@ in with self; { modnets = derive2 { name="modnets"; version="0.9.0"; sha256="01mh7sbgq3796h6ciih5xww8hm0xn8975jv0784yw15hxhzfchci"; depends=[abind corpcor ggplot2 glinternet glmnet gridExtra gtools igraph interactionTest leaps lme4 lmerTest Matrix mvtnorm pbapply plyr psych qgraph reshape2 systemfit]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; moduleColor = derive2 { name="moduleColor"; version="1.8-4"; sha256="0p45cc21vxjgjn91n0s09l20mf4a8vrkh1d9i27ndn5msrpwn15k"; depends=[dynamicTreeCut impute]; }; - modules = derive2 { name="modules"; version="0.11.0"; sha256="1y2ch9kfcp2qk2rz2dhy63ng1vrlcr69ml0nphyzbml19a7c3hvp"; depends=[]; }; - modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; + modules = derive2 { name="modules"; version="0.12.0"; sha256="1sm4knfli0brqzqd1hhky7rxylalghz0lk991csx5wd8sy10m9lb"; depends=[]; }; moexer = derive2 { name="moexer"; version="0.2.0"; sha256="039mww0rkk9s6452zl5skgnhlbnwf19nnf1xa75rsr6ikznvnppd"; depends=[assertthat cli dplyr ggplot2 glue httr jsonlite lubridate purrr readr rlang stringr tibble]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; mojson = derive2 { name="mojson"; version="0.1"; sha256="077c92jhizpvg5gdwq1zb0d74m743l5qylj6df8hhgyvahswnhnq"; depends=[compareDF iterators magrittr RJSONIO stringr tidyr]; }; @@ -13401,12 +13414,11 @@ in with self; { moko = derive2 { name="moko"; version="1.0.3"; sha256="1igrz0k9gfs4lmwh20bvmx8176d22g8gha7iv36mrpqgcynfdzh0"; depends=[DiceKriging emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="5.3"; sha256="01l68a4jsp0dlylnp9ij1db0q4510l38jlql787bi6ah07xwf8zq"; depends=[alphahull pracma rgl Rvcg]; }; molnet = derive2 { name="molnet"; version="0.1.0"; sha256="1ha1jyh3mmbv2zgr2zrrjmslwd1gyy04hvqjk4d3ap2kna35wlgk"; depends=[dplyr igraph magrittr readr Rfast rlang stringr tibble tidyr WGCNA]; }; - mombf = derive2 { name="mombf"; version="3.4.1"; sha256="1y5v24ffv30mshr88pjawc0igw2kn8w568zhky5gnglvl35ipn98"; depends=[dplyr glmnet intervals mclust mgcv mvtnorm ncvreg pracma Rcpp RcppArmadillo sgd survival]; }; + mombf = derive2 { name="mombf"; version="3.4.2"; sha256="12rzr2rppzp0l6sq7iixhpqjjzkhch9h1inx2w4ym1ja6blkx8v2"; depends=[dplyr glmnet intervals mclust mgcv mvtnorm ncvreg pracma Rcpp RcppArmadillo sgd survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; momentfit = derive2 { name="momentfit"; version="0.5"; sha256="0867yx1w8fxi7z4qqx6awihm726i0wgs4jd1dc6pj8zi8l2yjs2z"; depends=[sandwich]; }; moments = derive2 { name="moments"; version="0.14.1"; sha256="0r6qf3i1rzh2822bx1p0h8mh91gsbgg6asl2rzh2l4ys094bilif"; depends=[]; }; momentuHMM = derive2 { name="momentuHMM"; version="1.5.5"; sha256="0isd18b0fdf75gk6lbm34hgrhwj1fnl7airpv56xffsdvhvj6xjq"; depends=[Brobdingnag CircStats crawl doParallel doRNG foreach MASS mvtnorm numDeriv raster Rcpp RcppArmadillo rlang sp]; }; - momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; monaco = derive2 { name="monaco"; version="0.2.2"; sha256="109m9rvy39bp7j3jj8y6qdr4dran0qqvcx267mvil9c8ipxr89ms"; depends=[htmltools htmlwidgets rstudioapi shiny]; }; monashtipr = derive2 { name="monashtipr"; version="0.1.0"; sha256="050xa9ghhf5xy76vndry7rhqn3hn0lhz6wjwz9vxk6mcfy5j2wq5"; depends=[glue httr lifecycle magrittr purrr rlang rvest xml2]; }; mondate = derive2 { name="mondate"; version="0.10.02"; sha256="18nsqldj1vvv882nh2dyilqvz1jbhqkz3q69cpjq1xfcj0z88qxz"; depends=[]; }; @@ -13417,29 +13429,29 @@ in with self; { monoClust = derive2 { name="monoClust"; version="1.2.1"; sha256="18zb4wfb09rpzzr9bc0nr71994nhgsk74s512dxlss50isvfqjqd"; depends=[cluster doParallel dplyr foreach ggplot2 permute purrr rlang stringr tibble tidyr]; }; monobin = derive2 { name="monobin"; version="0.2.4"; sha256="1060c7g2dz4cnvlfp2dnrl5fblvifmcskrgykqbfswpyfna1lw4a"; depends=[dplyr Hmisc]; }; monobinShiny = derive2 { name="monobinShiny"; version="0.1.0"; sha256="1ix376j39fby5571irf8i5bmz8i7nnvfzbvs5cv0k42dcgq93m0g"; depends=[dplyr DT monobin shiny shinydashboard shinyjs]; }; - monochromeR = derive2 { name="monochromeR"; version="0.1.4"; sha256="02szpvr828d338h437siqyl9p1ncp9x3xahskrqpvibn0rwd90av"; depends=[ggplot2 magrittr]; }; - monographaR = derive2 { name="monographaR"; version="1.2.1"; sha256="09fkcw13h7dx7j5vyp48fk6yzv9n64568zf2zvmm2c008jw3gkbm"; depends=[circular maptools png raster rmarkdown sp]; }; - monomvn = derive2 { name="monomvn"; version="1.9-17"; sha256="0hzwcmdg0j2jrp5a19mixih4ng4xa8p315g77adardp6k6z2wcjk"; depends=[lars MASS mvtnorm pls quadprog]; }; + monochromeR = derive2 { name="monochromeR"; version="0.2.0"; sha256="013mmssczx6ii810vmb0x4k7miwzh4a5yzlr4skb5yzppxdy629s"; depends=[ggplot2 magrittr]; }; + monomvn = derive2 { name="monomvn"; version="1.9-18"; sha256="16wv8ip6s720d5ksd1y0r25gd2210jwhlfvca5vyzizm768bkrha"; depends=[lars MASS mvtnorm pls quadprog]; }; monoreg = derive2 { name="monoreg"; version="2.1"; sha256="1ra6mnn9m3989h6pcrpfhv5bl4q5i6856w4wp6lmaxipr6swlnk2"; depends=[]; }; monotone = derive2 { name="monotone"; version="0.1.2"; sha256="0izj9p51f5g291n7zvgh9ncjjm88aacz6imy08kpwb0d9bgxl1mf"; depends=[]; }; monotonicity = derive2 { name="monotonicity"; version="1.3.1"; sha256="0bb6sl8yykry25a86qfggi36ggr1xrxcqsnzp6rb6na228hbwa2z"; depends=[lmtest MASS sandwich]; }; monreg = derive2 { name="monreg"; version="0.1.4"; sha256="15qgfhbd8ny05rjd1nn33ynh4i7m7wcy8az53jraghlk760bymwg"; depends=[]; }; moodleR = derive2 { name="moodleR"; version="1.0.1"; sha256="0wbrnbs03i6xzyhq82d75yjryfqfl11k55sj9h0j9f7z46dq7glp"; depends=[anytime cli config DBI dplyr ggplot2 ggwordcloud glue lifecycle rlang RMariaDB RPostgres RSQLite scales stringr tidytext usethis]; }; + moodlequizR = derive2 { name="moodlequizR"; version="1.0.3"; sha256="06z90ycisq9basn48gwrgrbsvmj4vcjvjkps328czzcy8xz61g06"; depends=[base64 mvtnorm shiny]; }; moonBook = derive2 { name="moonBook"; version="0.3.1"; sha256="1ml4vvm0mvrprpyi0l50aw38brx18bk2qny4gybmkvlbakalz9bx"; depends=[crayon magrittr nortest sjmisc stringr survival]; }; moose = derive2 { name="moose"; version="0.0.1"; sha256="06zjg3dbb4ascnbi3k2cpzswi2mybdbm55d3d5zj17bpa6j0j4cz"; depends=[]; }; mop = derive2 { name="mop"; version="0.1.1"; sha256="0vi9ff1mmpz1ihkmvddfwxh3x5zrdxbc3m2drnpsifil3sg2d9x8"; depends=[doSNOW foreach Rcpp snow terra]; }; mopac = derive2 { name="mopac"; version="0.1.0"; sha256="07ljy6rwicyrv20l7zyxq2lb7qqfpl5mpv834m2n5c4air7sy23m"; depends=[]; }; moranajp = derive2 { name="moranajp"; version="0.9.6"; sha256="1w28fzwxgrmf12l40f4wl2h8qflbsii7g3wiqxxxg0v6njp49ws1"; depends=[dplyr ggplot2 ggraph igraph magrittr purrr rlang rvest stringi stringr tibble tidyr]; }; - moreparty = derive2 { name="moreparty"; version="0.3.2"; sha256="05vf4536kf5q3h1mmhrphyqckag0v4jg11hfb1h30gvimk19va89"; depends=[datamods DT foreach ggplot2 iml MASS measures party partykit pdp phosphoricons plyr rclipboard rlang shiny shinyWidgets varImp vip]; }; + moreparty = derive2 { name="moreparty"; version="0.3.3"; sha256="1kjj4qaj4yfqqdwqiwaac2cj7l09ksxgk8lhmi3rcv62b47cc57y"; depends=[datamods DT foreach ggplot2 iml MASS measures party partykit pdp phosphoricons plyr rclipboard rlang shiny shinyWidgets varImp vip]; }; morestopwords = derive2 { name="morestopwords"; version="0.2.0"; sha256="0j7icm2kim2dr9wpddg2gkc4b0pp0amg5why9rxyg74c3wj6np5g"; depends=[]; }; morph = derive2 { name="morph"; version="1.1.0"; sha256="0qx3wdcrilcp1hlsgaxbb4afcnkyx0nxwampm59ssc3zps2wh2cq"; depends=[igraph reshape2 rgl stringr]; }; morphemepiece = derive2 { name="morphemepiece"; version="1.2.3"; sha256="1xilq8sz0q35xs4wzig5x29h5lqfin2x6pvkygn5pacl6wcdp80n"; depends=[dlr fastmatch magrittr memoise morphemepiece_data piecemaker purrr readr rlang stringr]; }; morphemepiece_data = derive2 { name="morphemepiece.data"; version="1.2.0"; sha256="1fs1g5vv5qwrab0cj5wff4r9skiaa5mwfawa2j32skga6niaqydz"; depends=[]; }; morpheus = derive2 { name="morpheus"; version="1.0-4"; sha256="0y9immrs87yghp0j1h0vp1fhiah5wddfj6pj2hgcqch1imxprhy7"; depends=[jointDiag MASS pracma]; }; - morphomap = derive2 { name="morphomap"; version="1.4"; sha256="16lc3iydnsmc4jq2x2mqxhmaknjfvxgv94wxd6znf34hn4486iyl"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce raster rgdal rgl Rvcg sp]; }; + morphomap = derive2 { name="morphomap"; version="1.5"; sha256="0kin6jvg3vlsbga0zr34nnq1zixicw7vsphiw45aifyfbnwiw0av"; depends=[Arothron colorRamps DescTools geometry lattice mgcv Morpho oce rgl Rvcg sp]; }; morse = derive2 { name="morse"; version="3.3.2"; sha256="0534k96fhfdkfr3dh6q85fmsqqld7xv1zxvikwcb6z6by3nr9cpp"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; - mortAAR = derive2 { name="mortAAR"; version="1.1.4"; sha256="17b9kq1hr0xqw7jfvm90blpw5qbxjnycmgqzxb53yjhr65zbf1c8"; depends=[magrittr Rdpack reshape2 tibble]; }; - mortyr = derive2 { name="mortyr"; version="0.0.2"; sha256="0flihmkzw8dypp2ijq22cd3rka6h8cd1qdyr4zrs9cv5335nddmk"; depends=[httr jsonlite tibble]; }; + mort = derive2 { name="mort"; version="0.0.1"; sha256="09z5j2kknm8jk9153hxkyw5wk08bl2733jjdgy3g0iwna6fl5wrr"; depends=[lubridate rlang]; }; + mortAAR = derive2 { name="mortAAR"; version="1.1.5"; sha256="13zx5ldlnc4zhvw7r9ria419dwlf0wbaa8107zvwpcynfb1z4fg7"; depends=[magrittr Rdpack reshape2 rlang tibble]; }; mosaic = derive2 { name="mosaic"; version="1.8.4.2"; sha256="12kpkb7vm54na9hjjkvzw6gm5plx0m6i0l9kihz2r30zanfx5jca"; depends=[dplyr ggformula ggplot2 lattice MASS Matrix mosaicCore mosaicData purrr rlang tidyr]; }; mosaicCalc = derive2 { name="mosaicCalc"; version="0.6.0"; sha256="15i1gw0pyywm28k5cf8q2lwp4g0brxyc3xrwn3fz2w7gxhmmmjyy"; depends=[cubature Deriv dplyr ggformula ggplot2 glue MASS Matrix metR mosaic mosaicCore orthopolynom plotly rlang Ryacas sp tibble]; }; mosaicCore = derive2 { name="mosaicCore"; version="0.9.2.1"; sha256="1yns15yxr6215xf9qsxfvl24a9zvh1chw49n31dql7fy1zr1dkmp"; depends=[dplyr MASS rlang tidyr]; }; @@ -13454,7 +13466,8 @@ in with self; { motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; }; moult = derive2 { name="moult"; version="2.3.1"; sha256="0w6gavrybcmav3skglc787d4i7ddfhsbm52lbqcybgqkc9r7361z"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.4"; sha256="11fz2p6hpamk38n41z97af4az55j69rlais6ff61j9imdkq6f1pr"; depends=[lattice]; }; - mousetrap = derive2 { name="mousetrap"; version="3.2.1"; sha256="12vlb5fhq9m2f3c073xzdqk98gdq7jk2rwj6kcckxx6x7wg20fyd"; depends=[cstab diptest dplyr fastcluster fields ggplot2 lifecycle magrittr pracma psych RColorBrewer Rcpp rlang scales tidyr]; }; + mousetRajectory = derive2 { name="mousetRajectory"; version="0.2.1"; sha256="1l4ivaklplpwqr78i190agfijrjx87b1r7i798j5mh3lcxx88r4x"; depends=[lifecycle signal]; }; + mousetrap = derive2 { name="mousetrap"; version="3.2.2"; sha256="13qggxq650blx21bbdy3ljmsbmv32039zhims8nh3lk3pzxckf5p"; depends=[cstab diptest dplyr fastcluster fields ggplot2 lifecycle magrittr pracma psych RColorBrewer Rcpp rlang scales tidyr]; }; movMF = derive2 { name="movMF"; version="0.2-7"; sha256="1n2s03h9ksn0sv7k8w93ddy5q1m35nw4jywa98yk0yiq3s4dvsnx"; depends=[clue skmeans slam]; }; move = derive2 { name="move"; version="4.2.4"; sha256="1i6qyx4i8vb2g7i8c2hwjia81m2wd3pyvp6hf6f64j4lcrnafqz7"; depends=[geosphere httr memoise raster Rcpp sp terra xml2]; }; move2 = derive2 { name="move2"; version="0.2.2"; sha256="1girhkf2d4rjcsd6rp14vcfv9c2kxwnrbjcmzhjj965yzai9gffb"; depends=[assertthat bit64 cli dplyr rlang sf tibble tidyselect units vctrs vroom]; }; @@ -13465,11 +13478,13 @@ in with self; { mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; mpath = derive2 { name="mpath"; version="0.4-2.23"; sha256="16gd2z40551cn4fg0ljd09q64a4darsh72f8nw6dwvc2sxfj220n"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; }; mpathsenser = derive2 { name="mpathsenser"; version="1.1.3"; sha256="0hjq8ka85yxlzjlln7ravwcrrw85gw0a671v3rjzww9nx1h5gp8h"; depends=[DBI dbplyr dplyr furrr jsonlite lifecycle lubridate magrittr purrr rlang RSQLite tibble tidyr]; }; + mpindex = derive2 { name="mpindex"; version="0.2.0"; sha256="1xcv6rdj9r1yj1jh0672fq9w1q1bq580h0zkam31m871b44dvnsh"; depends=[]; }; mplot = derive2 { name="mplot"; version="1.0.6"; sha256="15cmwk4lphxy5p3azy9lwhij76127h9g4g1j1sv59mbqvrqid0sk"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps magrittr plyr reshape2 scales shiny shinydashboard tidyr]; }; + mplusParallel_automation = derive2 { name="mplusParallel.automation"; version="0.0.1.1"; sha256="012zbd09vqln1xb8lj6akiv1nyhiayiwiwbk8q70yv1mfpj5jgpm"; depends=[dplyr furrr future MplusAutomation]; }; mpm = derive2 { name="mpm"; version="1.0-23"; sha256="1jpv2ddmw7aarqbbyfys1yb840arw33319wnny3v2hk84hldmayj"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; mpmi = derive2 { name="mpmi"; version="0.43.2.1"; sha256="12chkhaqy14ql9gn33dwvq8fjd1rrbhlcpn0w0dgxscij3h3la5n"; depends=[KernSmooth]; }; - mpmsim = derive2 { name="mpmsim"; version="1.0.0"; sha256="0mwrq794qcsrm0r2p8c2vahm1jlh9q35jjzf7r963xrd70kplmvp"; depends=[dplyr ggplot2 MCMCpack popbio popdemo reshape]; }; + mpmsim = derive2 { name="mpmsim"; version="1.1.0"; sha256="1ya15dx58nnid2p56w6fk5syjg5v7hgnkjq50hazgi153iwzdr6c"; depends=[dplyr ggplot2 MCMCpack popbio popdemo Rcompadre reshape]; }; mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; mpower = derive2 { name="mpower"; version="0.1.0"; sha256="0bg2q6dgnh17v5rwa50qj6yivn902p34nmpkbvqhn7qsf45vadmf"; depends=[abind boot doSNOW dplyr foreach ggplot2 magrittr MASS purrr reshape2 rlang sbgcop snow tibble tidyr tidyselect]; }; mppR = derive2 { name="mppR"; version="1.4.0"; sha256="1w2jldamfb2vl0v2f5wz7gj1zgr3a0cxrmj27x9rkhpqjfrik4ly"; depends=[dplyr ggplot2 igraph Matrix nlme qtl]; }; @@ -13486,27 +13501,27 @@ in with self; { mrbayes = derive2 { name="mrbayes"; version="0.5.1"; sha256="11n3d18di01vmwqs5a0i1h8839aammzbcavi1jk58bmrwb3l771j"; depends=[BH plyr Rcpp RcppEigen rstan rstantools StanHeaders]; }; mrbin = derive2 { name="mrbin"; version="1.7.4"; sha256="11k7k88ax9jpad32nbv52hkdrsh1px1aid3j54gbmvhf3kbqasmd"; depends=[]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; + mrct = derive2 { name="mrct"; version="0.0.1.0"; sha256="0sgdkkg7x3zly7s35gz7mz79wrwlvnrp8mm7rabqs2lw7lc93lza"; depends=[fda fdapace ggplot2 Rdpack reshape2 robustbase]; }; mrds = derive2 { name="mrds"; version="2.2.9"; sha256="003hcsg079acyc2jkp1s5q2ckyr1xhpfl8gv3na3vkl7s2yzdprg"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.2.0"; sha256="1gz19d4l0q3xd1w72ip6mhv20w8fgaaczkkdv40bflwabpxdy420"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.8"; sha256="16z610j01nf9k1hamsxydk2j6qdqpbyj29b5hm9r3fi8fm3smhd6"; depends=[data_table geojson geojsonio geojsonsf httr jsonlite rappdirs sf sp tibble xml2]; }; mrf = derive2 { name="mrf"; version="0.1.6"; sha256="0jqpx0ng0l8f7y941awpi82yqbv8ir0sixiw6zdkqpj82d9a7j9m"; depends=[DEoptim forecast limSolve monmlp nnfor]; }; mrf2d = derive2 { name="mrf2d"; version="1.0"; sha256="0fmxn178bkw77iz51bnjxala9xmhs44km57m8msvlw0k69sddyif"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack tidyr]; }; - mrfDepth = derive2 { name="mrfDepth"; version="1.0.14"; sha256="1jh6n12rgjg9gr1d81sjfnn6fx49pzr75ipngy3v6ngf7iaixcl7"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.15"; sha256="08dc5xq3spv1zb5yfqmwldiw7sflq1nfpkn0cqapw4i4csx31qsl"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; mrfse = derive2 { name="mrfse"; version="0.4.1"; sha256="1kk6j7x4z4vaiwnd2mv2brzd1z7g4kyxxylxf31971i6klnsn4zb"; depends=[gtools Rcpp Rfast]; }; mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.2.1"; sha256="074c47fkwy5n9x89dswi3ybnck1f0rlbyad6by32jyslw8bz76ln"; depends=[callr dplyr fst future future_apply mrgsolve]; }; mrgsim_sa = derive2 { name="mrgsim.sa"; version="0.1.0"; sha256="199m6ygwnw6fbld5fqsw1j5jz9x6l1ayrpsc0r51q4fr7nmmpfj2"; depends=[assertthat dplyr ggplot2 mrgsolve patchwork purrr rlang tibble tidyr tidyselect withr]; }; - mrgsolve = derive2 { name="mrgsolve"; version="1.0.9"; sha256="0qfgwcbn89310rdlh1yraxs6npnavla090pnbf22rx3r3bb2df60"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrgsolve = derive2 { name="mrgsolve"; version="1.1.1"; sha256="1dhvrhvprra2q583ibiz3akicb5dz2f7l2aarr9z9m82261pfcz3"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; }; mritc = derive2 { name="mritc"; version="0.5-3"; sha256="1bpnm2qzq67dgjxsa4wxn51f4a4cxal5r6abgs3m7p5a9a16jmjp"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; mrregression = derive2 { name="mrregression"; version="1.0.0"; sha256="1yy2sjs0b67bqyggzypp2g7x4fdmi86jx2nbcp2n7hcf9cdacysi"; depends=[data_table Rcpp]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; - msBP = derive2 { name="msBP"; version="1.4"; sha256="17hsnfipb6mgwhbc9rxzx5azc57ravz7zfnbc8r73sn1b270ydpb"; depends=[]; }; + msBP = derive2 { name="msBP"; version="1.4-1"; sha256="1n833ghqh9n5m2qx8njsq5njbcap67y1v71a0vm1p2igh0f8b54i"; depends=[]; }; msSPChelpR = derive2 { name="msSPChelpR"; version="0.9.0"; sha256="1ak1zh57z4j97ih79w739a4h9pkz641gna7lk2gpmjkcpva5rrxs"; depends=[dplyr lubridate magrittr progress purrr rlang sjlabelled stringr tidyr tidyselect tidytable]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.6.0"; sha256="12d6vql85d1mzcy889z7pbmldcwwmzijimcr9frm12ahmka81byx"; depends=[ape htmlwidgets]; }; msae = derive2 { name="msae"; version="0.1.5"; sha256="0ra4qj0yvyi4nl492hqj7l6cpyxwm1hq7mm15sip4rk2fm7h0kjf"; depends=[magic]; }; - msaeDB = derive2 { name="msaeDB"; version="0.2.1"; sha256="0ccvg41d28qjbknhsamw95nq8fdibmz03pwblddkqywfl5yarii3"; depends=[magic MASS]; }; msaeHB = derive2 { name="msaeHB"; version="0.1.0"; sha256="1grmkr146csyim1lpgingjnp4km3sqlpzihln9cpkqaqhvl8rycj"; depends=[coda rjags]; }; msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msamp = derive2 { name="msamp"; version="1.0.0"; sha256="0r5m50x8l5dijy7nzcbxl3ipfnkgvaa9r580b6b71ny3madsc8rh"; depends=[]; }; @@ -13519,6 +13534,7 @@ in with self; { msd = derive2 { name="msd"; version="0.3.1"; sha256="0n3zg2mwbmazbkk41jv94v28glj38d7f08d3w3xrlnlr9gsqh4sd"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.3"; sha256="0lq6mqhksd35qpwl6ira72mwdzlpaxiv1wzms441r2fh1j0957dp"; depends=[MASS Matrix]; }; msde = derive2 { name="msde"; version="1.0.5"; sha256="0q2jy5f8r5gfj2w8r0kmbgal3wjk37h62ahhjzbphrd8ghdf7za8"; depends=[Rcpp RcppProgress whisker]; }; + mseapca = derive2 { name="mseapca"; version="2.0.1"; sha256="1izbai3d9199a5dpyg882hnc1d7fz0x9gjd5if79i50hhc3lwqyr"; depends=[loadings XML]; }; msentropy = derive2 { name="msentropy"; version="0.1.4"; sha256="1wn71xqpzs06rnp27ci0lw86blyb25k9xkpkqwdv6656shf21iqp"; depends=[Rcpp]; }; msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; @@ -13531,7 +13547,7 @@ in with self; { mskcc_oncotree = derive2 { name="mskcc.oncotree"; version="0.1.1"; sha256="1n79k3rp84r8j6paqshvingykszsw995fm7yxf1wl1jfp4hiyl4n"; depends=[dplyr glue httr2 magrittr memoise purrr readr rlang tibble tidyjson tidyr]; }; msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; }; msm = derive2 { name="msm"; version="1.7"; sha256="1c0dvmrjxx551n207fq4yjr56rdchaf1zzldxx4rx4b6g7jgi2bz"; depends=[expm mvtnorm survival]; }; - msma = derive2 { name="msma"; version="2.2"; sha256="1p6lm07wlwyymhj2bpwn9kvxf6q2c6rf9554swnm8gkm1z82324f"; depends=[]; }; + msma = derive2 { name="msma"; version="3.0"; sha256="03aal2l3qxzg25bwav11fmlyps7fbkvr7wzgbqnixjjbmp0c70nk"; depends=[]; }; msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="2.0.1"; sha256="09an9bpr0gnqbglb8kj4x8bb7f5dm2lc3d01wx6dh7j1d99vrrdk"; depends=[data_table ggplot2 msm patchwork scales survival]; }; msos = derive2 { name="msos"; version="1.2.0"; sha256="1fg9q6269cckn4g6isv22k22mzglxhjxjg5npqsikmisribmr9kb"; depends=[mclust tree]; }; @@ -13549,17 +13565,17 @@ in with self; { mtdesign = derive2 { name="mtdesign"; version="0.1.0"; sha256="0fnyw6zcls12b6mmr9pxj3b9vs8pv1ik3h671kmxfgv1k6dwn6b9"; depends=[BH dplyr ggplot2 logger magrittr Rcpp rlang tibble tidyr]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; mtlgmm = derive2 { name="mtlgmm"; version="0.1.0"; sha256="0q2nl9sk03w0x8khsgwycp1c66nbgrf88hdp6gys7fmvgmaz3yj9"; depends=[caret doParallel foreach mclust]; }; + mtscr = derive2 { name="mtscr"; version="1.0.0"; sha256="17iy815kbz3d9mgscalijc4y0nlywqg5wdq62i3amci1jyirddkm"; depends=[broom_mixed cli dplyr glmmTMB glue lifecycle purrr readr rlang stringr tibble]; }; mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; - muHVT = derive2 { name="muHVT"; version="3.0.0"; sha256="0a963dhzzirv03pq9hlzyq5alcj224ci55jyn7bsmn06lpl13gk3"; depends=[cluster conf_design deldir dplyr ggplot2 Hmisc magrittr MASS plyr polyclip purrr reshape2 rgeos scales sp splancs tidyr]; }; - muRL = derive2 { name="muRL"; version="0.1-12"; sha256="1nzi0nyspva5ach0q0rvlljlfgmac8vxxggkwdzz1pr1cxhkprwd"; depends=[maps stringr]; }; + mtsta = derive2 { name="mtsta"; version="0.0.0.1"; sha256="1k6q2lwvz39lvznqr48x03c7rdcqyxskkikv4wbvm1aiannmmqlj"; depends=[]; }; + muRL = derive2 { name="muRL"; version="0.1-13"; sha256="1fx9v5z5n83q4hiwsh359ffrcr0n07hym6cz4rjb4f51h96x893v"; depends=[maps stringr]; }; muRty = derive2 { name="muRty"; version="0.3.1"; sha256="0v7wfb6347h4inf9jcbp6n4xfsqjzgj0i5sdfgqmbw0d5pcpnvhz"; depends=[clue lpSolve]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; - mudata2 = derive2 { name="mudata2"; version="1.1.3"; sha256="0gqdqdp370gbvmqr5gxgc6xnwb6lsm4wzd2xrq3x9s46nx3zaha3"; depends=[dplyr fs glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; mudfold = derive2 { name="mudfold"; version="1.1.21"; sha256="0bz0k490pda2a6lx9mmnpvnp6vrlyjd89bn05dsvqgbdfnyfs272"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; }; mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6.4"; sha256="1ddy8ayr4rdhzcipdvxdwd7z5g9hfp0ppacl7xf6f2612cn1185g"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; - mulgar = derive2 { name="mulgar"; version="1.0.1"; sha256="0qlm68cxs3srp9zrljgllik76iskx3h28ma1ahivxw5zmv6dsb8l"; depends=[dplyr geozoo ggplot2 purrr tibble tidyr]; }; + mulgar = derive2 { name="mulgar"; version="1.0.2"; sha256="00yaxi14x7g0pzdj65hgs2xm9m7w1w6xjhparbhcjz1jd34ga30y"; depends=[dplyr geozoo ggplot2 purrr tibble tidyr]; }; mully = derive2 { name="mully"; version="2.1.38"; sha256="1lvyj1kyi9ad2byhc1amrjasc2brv7g4d2i08rf7149vp35cwrsg"; depends=[igraph randomcoloR rgl]; }; mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; multDM = derive2 { name="multDM"; version="1.1.4"; sha256="132kqbrg1ism2byhal50j0hr0qqlnd30db9z6vvjc977d03hf41l"; depends=[MTS]; }; @@ -13568,7 +13584,7 @@ in with self; { multcomp = derive2 { name="multcomp"; version="1.4-25"; sha256="10njzzxdi3jw5f419s7chcynxkzyqmmvzf7jk7ybdrwrlqhpiylx"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-9"; sha256="15vki166n2k4ng72hy62c2mzz18s10h6l6w839qplg0zsplr6f8z"; depends=[]; }; multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; - multgee = derive2 { name="multgee"; version="1.8.0"; sha256="1cp3762901af93m0i3m61ngnxbwjirjg46mkdcj0ycmk7phh7bcc"; depends=[gnm Rcpp RcppArmadillo VGAM]; }; + multgee = derive2 { name="multgee"; version="1.9.0"; sha256="0hjlnmnn18cf2blcr23y8vc2l6zaqfi8223nfwm2bx3arslj41xn"; depends=[gnm Rcpp RcppArmadillo VGAM]; }; multiActionButton = derive2 { name="multiActionButton"; version="1.0.0"; sha256="1yc111l0ah6ldh5fh1nd3fy9qxyzzszj02w26nqm49c3q0058f15"; depends=[htmltools shiny]; }; multiApply = derive2 { name="multiApply"; version="2.1.4"; sha256="0yc63phci4xxb3ja3mi03ckdw9za3dwq2llc681wism1yfm26wlh"; depends=[doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-2"; sha256="0ci17bjl7k2id7grlynisvjfmmgrmq5f5lf8kh5xbq70gmvxh7v9"; depends=[Matrix]; }; @@ -13580,6 +13596,8 @@ in with self; { multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; }; multiUS = derive2 { name="multiUS"; version="1.2.3"; sha256="0wdvrkl6xvk8xpkm9n0hd5pjks3350ms09jrfqnnxyf3dsbs68dc"; depends=[gplots MASS]; }; + multibias = derive2 { name="multibias"; version="1.2.1"; sha256="0cd9hyz1jgnylklgnwppmy7kla73mmn8qi0gxh67lr0l1pjnpnlk"; depends=[dplyr magrittr rlang]; }; + multibiasmeta = derive2 { name="multibiasmeta"; version="0.2.2"; sha256="04qnb3l2y86xy8f1j754g8fy6hc1a26rwdznaka789k3dkkckk93"; depends=[dplyr EValue metabias metafor purrr Rdpack rlang robumeta]; }; multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.1"; sha256="08vmdhrn6qqq57q818cqnmsw7qaa4gnw3m5myzp4dc85njgzzi02"; depends=[cluster dendroextras MASS Matrix plotrix rgl shapes tcltk2 tkrplot]; }; multiblock = derive2 { name="multiblock"; version="0.8.6"; sha256="1xi9xh6ypf194fdq90hcrir4m1gi4cqlz3mmyxd7prgy7ypg0wr2"; depends=[ade4 car lme4 MASS mixlm plotrix pls plsVarSel pracma progress Rcpp RcppEigen RSpectra SSBtools]; }; multibreakeR = derive2 { name="multibreakeR"; version="0.1.0"; sha256="1rg5k2ldaf5ygnrjpfk28gqqs7d8cfjq9cm5zli47yavqm43mq78"; depends=[dplyr ggplot2 reshape2 rlang scales]; }; @@ -13592,7 +13610,7 @@ in with self; { multid = derive2 { name="multid"; version="0.8.0"; sha256="0kwbgnazg89542rjf764mn2bc50fnvcsx00pvighmdsanq5r4w5i"; depends=[dplyr emmeans glmnet lavaan lme4 pROC quantreg]; }; multidplyr = derive2 { name="multidplyr"; version="0.1.3"; sha256="18yl24s1g8wf3xi6f0k7jhs99ka4dslxf5p9ax9m5l1rbva5xdwj"; depends=[callr cli crayon dplyr magrittr qs R6 rlang tibble tidyselect vctrs]; }; multifamm = derive2 { name="multifamm"; version="0.1.1"; sha256="09s6hnyi5x48yp97499zai7b959ylkk17zbbc6d8a71ynvfas8ir"; depends=[data_table funData MFPCA mgcv sparseFLMM zoo]; }; - multifear = derive2 { name="multifear"; version="0.1.2"; sha256="15nxyb17qzwld3ngw5k60nsr5nnam09jc1ky87rvsvslj6f3v696"; depends=[BayesFactor bayestestR bootstrap broom dplyr effectsize effsize esc ez forestplot ggplot2 nlme purrr reshape2 stringr tibble]; }; + multifear = derive2 { name="multifear"; version="0.1.3"; sha256="0240dk3cqdm9x9y139p5i0gj374f58qxnqw32cii1abhv852ijfm"; depends=[BayesFactor bayestestR bootstrap broom dplyr effectsize effsize esc ez forestplot ggplot2 nlme purrr reshape2 stringr tibble]; }; multifunc = derive2 { name="multifunc"; version="0.9.4"; sha256="0gxgxfh8vmczc7dc4awfmmmwds98kk9d5c9rk1lz1himp19mqsj4"; depends=[broom dplyr magrittr MASS purrr]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; multigraph = derive2 { name="multigraph"; version="0.99"; sha256="0hya5r8ak7vk0sda7flhj69cc87b56sxqwz09x2vfg0z05gxi3il"; depends=[multiplex]; }; @@ -13600,11 +13618,11 @@ in with self; { multigroup = derive2 { name="multigroup"; version="0.4.5"; sha256="1d3m2c3md9iiv1gfqfyik1xj3fsas85bmf2vbkaks8ljxa42f55k"; depends=[MASS]; }; multilateral = derive2 { name="multilateral"; version="1.0.0"; sha256="13zp2357vqaj09m6af8gzjgf74983icikbnn11z18r8c3wb5kngy"; depends=[assertive data_table fastmatch MatrixModels yaml]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; - multilevLCA = derive2 { name="multilevLCA"; version="1.2"; sha256="1rb2prdgxyh4zxxffpgl96n508425r74hjl603pzqigwdyk2i40m"; depends=[dplyr foreach klaR magrittr MASS Rcpp RcppArmadillo tidyr]; }; + multilevLCA = derive2 { name="multilevLCA"; version="1.3"; sha256="0isq02h0q5ggmsyv0fdrg2732s1f8vd2i8rhh6sbhqdwsin52bxm"; depends=[dplyr foreach klaR magrittr MASS Rcpp RcppArmadillo tidyr]; }; multilevel = derive2 { name="multilevel"; version="2.7"; sha256="0ds7q3q2ncldb4iik24xisyxyyv1yv8l1yz7zd7cy036bna1yp5i"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; multilevelTools = derive2 { name="multilevelTools"; version="0.1.1"; sha256="01fzx7j0mkb4fr7axv34184w6w5nfsdcr51nscci1mi5b2805x1s"; depends=[cowplot data_table extraoperators ggplot2 JWileymisc lavaan lme4 lmerTest nlme zoo]; }; - multilevelcoda = derive2 { name="multilevelcoda"; version="1.1.0"; sha256="0mfasw50a0an3cnsq3vpqmb8zcwcjkvrw1bs4ff97q9rngiil69f"; depends=[bayestestR brms compositions data_table emmeans extraoperators foreach ggplot2 insight]; }; + multilevelcoda = derive2 { name="multilevelcoda"; version="1.2.1"; sha256="1ifrsd1s9fralxd2yjf13c2fhr7y1l2rf5xf9h6033sps6fkqxij"; depends=[abind bayestestR brms compositions data_table doFuture emmeans extraoperators foreach ggplot2 insight]; }; multilevelmod = derive2 { name="multilevelmod"; version="1.0.0"; sha256="0sq16w2a0wvxbvca5wknc77lzkdfvr8j71bc0d569hdfm59nrp2k"; depends=[dplyr lme4 parsnip purrr rlang tibble withr]; }; multilinguer = derive2 { name="multilinguer"; version="0.2.4"; sha256="16r8ishisrh5xxjvdqaczqd16fva9fhw7h1sk076if452wwwk3zl"; depends=[askpass rappdirs sys usethis]; }; multilink = derive2 { name="multilink"; version="0.1.1"; sha256="0bjsmr8ca8c3vhq8p8sadn5l4xns5isssmsvi47i3l96j51g7das"; depends=[geosphere igraph mcclust Rcpp RcppArmadillo RecordLinkage stringr]; }; @@ -13623,18 +13641,18 @@ in with self; { multipleNCC = derive2 { name="multipleNCC"; version="1.2-3"; sha256="1fzg4cc2zmysq8a3jnqspw3w2v8b7h7s884razqva4yn8rlhl36m"; depends=[mgcv survival]; }; multiplestressR = derive2 { name="multiplestressR"; version="0.1.1"; sha256="167ch16bdlk4syjbgn1149q1np90w6299ph35p9npdh1zcynm95f"; depends=[ggplot2 patchwork viridis]; }; multiplex = derive2 { name="multiplex"; version="3.1.0"; sha256="0nr6pfb80y1jyr7mbb0jwkpl66xrmahwma2wv45bp4nqrax3gscl"; depends=[]; }; - multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; }; + multipol = derive2 { name="multipol"; version="1.0-9"; sha256="0cn6l0f1mn3n2rzsfr6ncc37aqc7ij9a8pkxbxq74j11bib0bhsf"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.3"; sha256="1vv4jhhq46wp6znfv9c47q9z4smn1c560wnbp77qfhiix098wzfj"; depends=[]; }; multiridge = derive2 { name="multiridge"; version="1.11"; sha256="0nxs00bglkr234nxsxn0djvi8cxavzc2nl2nl3zmnqa9aw2aikza"; depends=[mgcv pROC snowfall survival]; }; multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; }; multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisite_accuracy = derive2 { name="multisite.accuracy"; version="1.2"; sha256="1hj1gjc8833np9cahpw1f1p2yg95xx32rbzj6l9sc65dv5ncq5jf"; depends=[AROC coxme lme4 lmerTest logistf metafor pROC survival]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; - multispatialCCM = derive2 { name="multispatialCCM"; version="1.2"; sha256="168shygdy2x7ww365hdb0f5pkq0b5w3gwcwpgnlzncj4jxd6pf4c"; depends=[]; }; + multispatialCCM = derive2 { name="multispatialCCM"; version="1.3"; sha256="044spqh37yz4b40bx6h2dz8lzjz4jf505mgagxxg1bn1spxk9bi2"; depends=[]; }; multitaper = derive2 { name="multitaper"; version="1.0-17"; sha256="1wqa2whcjxwjqg9z46i48dvrga17fdj63r05kg993r1fpriclc1l"; depends=[]; }; multivar = derive2 { name="multivar"; version="1.1.0"; sha256="1jyz921m16g24gjmscsz2mi78ng3c5hzhbcankdq9x1i7kdcqawi"; depends=[ggplot2 glmnet MASS Matrix Rcpp RcppArmadillo reshape2 vars]; }; multivariance = derive2 { name="multivariance"; version="2.4.1"; sha256="1jbv1rhdy6jgvyhwz25hry3xmnxfsl8pwf0j4rj9r8rg6ik8rv1w"; depends=[igraph microbenchmark Rcpp]; }; - multivator = derive2 { name="multivator"; version="1.1-10"; sha256="1a469mhskkk2gx0j14f38fn0wdbfygl3psb0mnp7ckznhmh4w2lg"; depends=[emulator mathjaxr mvtnorm]; }; + multivator = derive2 { name="multivator"; version="1.1-11"; sha256="1r9v15bg0kyhq5xqzkpj6ilz745q6k3j46zh1n68pf17zmi0k0ww"; depends=[emulator mathjaxr mvtnorm]; }; multiverse = derive2 { name="multiverse"; version="0.6.1"; sha256="0l3h4pg450brw27n0jhc3k5fsl57kczxsmzzs3ffj9lwrpnvvn7z"; depends=[berryFunctions collections dplyr evaluate formatR future_apply knitr magrittr purrr R6 rlang rstudioapi tibble tidyr tidyselect]; }; multiview = derive2 { name="multiview"; version="0.8"; sha256="1kf16w4wbj84383hvqxhrqlvghyra22p7k9vs03axqxqkhl8krhz"; depends=[glmnet Matrix RColorBrewer Rcpp RcppEigen survival]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; @@ -13657,12 +13675,13 @@ in with self; { mvGPS = derive2 { name="mvGPS"; version="1.2.2"; sha256="1aanrv84c012ijyqql0pw2qlckrpv3wmfv16yhr465xb3rkzz4vj"; depends=[CBPS cobalt gbm geometry MASS matrixNormal Rdpack sp WeightIt]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.5"; sha256="0qg6bn0din22fns0cb4m0dfzgg0slrkfimpx7fslnvncfmx36h66"; depends=[fields wavethresh xts zoo]; }; mvLSWimpute = derive2 { name="mvLSWimpute"; version="0.1.1"; sha256="1caf843cf139f3fiy3nsq6g83xfz70c20zlfwk4pg5jv4rh0jiyg"; depends=[binhf imputeTS mvLSW wavethresh xts zoo]; }; - mvMAPIT = derive2 { name="mvMAPIT"; version="2.0.1"; sha256="0whjgyf8asvbbd0ic0x4yqisasmxywl91klxpnbg3kd5i8p831rw"; depends=[checkmate CompQuadForm dplyr foreach harmonicmeanp logging mvtnorm Rcpp RcppArmadillo RcppParallel RcppSpdlog testthat tidyr]; }; + mvMAPIT = derive2 { name="mvMAPIT"; version="2.0.3"; sha256="1ab4snxbw9p80cs7d6fnxl7cv20l1h2b243q2nj50yh6xirx2a0h"; depends=[checkmate CompQuadForm dplyr foreach harmonicmeanp logging mvtnorm Rcpp RcppArmadillo RcppParallel RcppProgress RcppSpdlog testthat tidyr]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; mvMORPH = derive2 { name="mvMORPH"; version="1.1.7"; sha256="0bjy8pyy47lqbixjs4qrk4mgvznnviahlkmyf3k07x381z6bl8qx"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.2.2"; sha256="1b9xr5g4jw56d1pm5k6pfh84zzmwwhlwnri9l2b3fw1kkblykv36"; depends=[dplyr lazyeval plyr rlang robustbase xts zoo]; }; + mvPot = derive2 { name="mvPot"; version="0.1.6"; sha256="18cx02wg6nkgmh2ba2gp37z838xr70w354wbkfgl5jnyirl5g9xz"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-10"; sha256="1iy249mc5fi72l0lcvjrn40fn6q1m8hj8njcl0li2z6lzydifkd4"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; - mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; + mvQuad = derive2 { name="mvQuad"; version="1.0-8"; sha256="053qrqmd946y1qi1zn6kag41gxn9wdlp0zffw5ya5yyllxfzgszx"; depends=[data_table statmod]; }; mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.7.5"; sha256="0zvdacgcb42djay6g6ffmpy2ci0x8wzzmxnhnj4xzp5im7za5m2x"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; mvabund = derive2 { name="mvabund"; version="4.2.1"; sha256="01kss9dx4an1ir5zs46jypvhj8sdc8wcs00i1223ai09av4lcsgd"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; @@ -13670,15 +13689,17 @@ in with self; { mvctm = derive2 { name="mvctm"; version="1.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvdalab = derive2 { name="mvdalab"; version="1.7"; sha256="0iblpg5yi9ig4hi6ff84m9pfgyrpkyfc9m9m98dpngpbhxfqnvhq"; depends=[car ggplot2 MASS moments penalized plyr reshape2 sn]; }; mverse = derive2 { name="mverse"; version="0.1.0"; sha256="1qj77s98j05j8d1k1w3h56c7z2i1j973mflhklxhb3xxc7plyk3y"; depends=[broom cowplot dplyr ggplot2 ggraph igraph magrittr multiverse rlang stringr tidyr tidyselect]; }; - mvgb = derive2 { name="mvgb"; version="0.0.3"; sha256="1inh9hs5942k37jcl84ljx7fsvma73apmmjjq6jlsdvsh4xn4cag"; depends=[]; }; + mvgb = derive2 { name="mvgb"; version="0.0.4"; sha256="1928mfbhlhwh03xiwlf5mvn6yp0i95rlknqb132b5hdsd3y5xin3"; depends=[]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-4"; sha256="09mkjx3xrpnv681d07z91g60fq7bna6142b2hh9xvh5nxcqixdnf"; depends=[MASS Matrix numDeriv]; }; + mvhist = derive2 { name="mvhist"; version="1.1"; sha256="057yhkivcfjm9yazx0x8rn2xysgyc6y7nlcxpjl00yfi7wcjpmlh"; depends=[mvmesh rcdd rgl SimplicialCubature]; }; + mvhtests = derive2 { name="mvhtests"; version="1.0"; sha256="1820d8gd2rmszqp3kd5d01c5v2znxm1l6dm7cjr4mn51v1rxzhhk"; depends=[doParallel emplik foreach Rfast Rfast2]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.9.0"; sha256="0yzp8sybmmr2nfa0g0v14kb2fqa5ayi0awlrb05vbyxvr5pg4f8h"; depends=[car heplots]; }; mvmesh = derive2 { name="mvmesh"; version="1.6"; sha256="1y6p7xp9fv0xswjdc6py1xqlx1ys1iyr559s9wkyja4hzcpya2my"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; mvnfast = derive2 { name="mvnfast"; version="0.2.8"; sha256="1869xqq2wd7yw23q4ma5qawcnbdp7myafk6rdxazqymqak7f0wc8"; depends=[BH Rcpp RcppArmadillo]; }; - mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="1cjy8rbcj7j82ii4wzh2gkxja89jl1fxzcxky5p95p1ky9hv0sz4"; depends=[]; }; + mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.6"; sha256="17pzrppbl3ijkqmzlca321q3ngnjrkn0kn647gdfxmd84qkbcq8s"; depends=[]; }; mvnimpute = derive2 { name="mvnimpute"; version="1.0.1"; sha256="0131dm8ma7qrzqsfdkdcp1vh0jcz3am3mry6x96m8fm3npi4dldz"; depends=[ggplot2 LaplacesDemon MASS Rcpp RcppArmadillo RcppDist reshape2 rlang truncnorm]; }; mvnmle = derive2 { name="mvnmle"; version="0.1-11.2"; sha256="06ysl7ff0gy5iiggaicrk1x3sav86iz45zks6ybd3k9516qjjn39"; depends=[]; }; mvnormalTest = derive2 { name="mvnormalTest"; version="1.0.0"; sha256="1hbapcmj1rzrdzlbkay94f3r2388sk60zizh48vbbkc83qlm7xbr"; depends=[copula moments nortest]; }; @@ -13687,9 +13708,11 @@ in with self; { mvord = derive2 { name="mvord"; version="1.1.1"; sha256="0flqdsjigv8c6ygiih17kp22yrbs2wqydadqi5ij145a6r8bpkml"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.1.1"; sha256="1ll6zsy8svcsb3h60p0z2zpbgn919j9w0mamsdvvzi87dyy4hars"; depends=[robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-14"; sha256="0dzf5h5ng0vx6nw8j8q9ydksicyxy940p363n367gbs56c8x47dk"; depends=[digest disordR magic magrittr mpoly numbers partitions Rcpp]; }; + mvpd = derive2 { name="mvpd"; version="0.0.4"; sha256="10k82g2izv72k99j99mjljg2hxb66pzhgfqal2j5z3cj3gmkjabg"; depends=[cubature libstable4u Matrix matrixStats mvtnorm stabledist]; }; mvrsquared = derive2 { name="mvrsquared"; version="0.1.5"; sha256="00i86rdhmia7c8h8n9ck8yn4wr65ra4z245bsqanchj5bsza6p0i"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; }; + mvs = derive2 { name="mvs"; version="1.0.2"; sha256="1p0782c940chysr4sk746gl9gjxzx7rx8xyxbkdp3y6z0904ib5w"; depends=[foreach glmnet]; }; mvtmeta = derive2 { name="mvtmeta"; version="1.1"; sha256="0s0s5922c5rs8cqk100nci3akqnhbvibm2n2gn8049v3qcyfajyb"; depends=[gtools]; }; - mvtnorm = derive2 { name="mvtnorm"; version="1.2-2"; sha256="047y4sv1ydvszmzrssywhqfhx2mcrlbkypczgbh380wk7yrncmbg"; depends=[]; }; + mvtnorm = derive2 { name="mvtnorm"; version="1.2-3"; sha256="1iy65fc2y0af6ma9f6lvzd5zh7zm60cqihdhr58ksc75ymfxrnia"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-4"; sha256="1391m4r58hbaqbq46isi15jx6vhx7frdspbs1ippbpw7rsanch9w"; depends=[RColorBrewer]; }; mwTensor = derive2 { name="mwTensor"; version="1.1.0"; sha256="113asdl3hm1kk31x29x89bz3zxccrhbh64xl2fcgds1mkw0gr3mn"; depends=[ccTensor igraph iTensor MASS nnTensor rTensor]; }; mwa = derive2 { name="mwa"; version="0.4.4"; sha256="0f994xpylqhhwwr3rv0y5y68989ssy7q4pb3hawq0ww0l3wj9lmd"; depends=[cem MASS rJava]; }; @@ -13698,7 +13721,7 @@ in with self; { mxkssd = derive2 { name="mxkssd"; version="1.2"; sha256="19zz5y5gz84a7qicaj3v2j6l558vr6w8lcy67b3kmkq64mnnirda"; depends=[]; }; mxmmod = derive2 { name="mxmmod"; version="1.1.0"; sha256="0x4m6y4ngb3vm9xpvwvn1zcbch2fhz8pb267hg2sb3kk5m504xxq"; depends=[OpenMx]; }; mxnorm = derive2 { name="mxnorm"; version="1.0.3"; sha256="01845m5h4rd38n0fll2k2d9hw6j9dbjgs7kmwy30g9lkffvv73s8"; depends=[caret data_table dplyr e1071 fda fossil ggplot2 glue KernSmooth kSamples lme4 magrittr psych reticulate rlang stringr tidyr uwot]; }; - mxsem = derive2 { name="mxsem"; version="0.0.4"; sha256="1qq4j7sklbvygwiwmw31z8cxpblynsx785qr7p3hkfz8500vzggb"; depends=[OpenMx Rcpp]; }; + mxsem = derive2 { name="mxsem"; version="0.0.8"; sha256="1a1fg5463vrcqgjz2yr5r26s937jdg1i3pq27kp0zwsa9fa3i5na"; depends=[dplyr OpenMx Rcpp]; }; myCRAN = derive2 { name="myCRAN"; version="1.0"; sha256="0lx0l5z3z20xfil6f3c94by334girhca7ixyix88k5jn46a2s373"; depends=[cranlogs]; }; myClim = derive2 { name="myClim"; version="1.0.1"; sha256="0qr312ixvhp7bspwh3i9sqabcdsgjqajr07r66bpq02xs9qpv1lc"; depends=[dplyr ggforce ggplot2 lubridate plotly purrr runner stringr tibble tidyr viridis zoo]; }; myTAI = derive2 { name="myTAI"; version="0.9.3"; sha256="0fd6srvwzqir8zif56cnyi02c952fgc67xzc17wn7xvmvljfvh4x"; depends=[cpp11 doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; }; @@ -13706,11 +13729,11 @@ in with self; { mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; mzipmed = derive2 { name="mzipmed"; version="1.4.0"; sha256="18k7ffq9mkslkxz4j0xj3xh0050gkysp2cls6w7825warflgclwz"; depends=[MASS matrixStats sandwich]; }; n1qn1 = derive2 { name="n1qn1"; version="6.0.1-11"; sha256="17p48wm0wcw46lk9382yd9xpzx4rygdjyrbfdi6xnph1k5phjxpj"; depends=[Rcpp RcppArmadillo]; }; - nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; }; nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; }; nFactors = derive2 { name="nFactors"; version="2.4.1.1"; sha256="08gydk231zijw3inp6d3hnc5mz0zywi4vzlvqb4jmibhv0hncdxv"; depends=[lattice MASS psych]; }; nJira = derive2 { name="nJira"; version="0.1.1"; sha256="0vh167kxljp68f0dx307wl6fp8nlp34vgrkr815z30mhx03p8j9r"; depends=[httr plyr rjson]; }; - nLTT = derive2 { name="nLTT"; version="1.4.8"; sha256="10njdpz0dl3ckj4ph6hl4ppj1dyj8chrlmq6cl286ayqqqzj8qap"; depends=[ape coda testit]; }; + nLTT = derive2 { name="nLTT"; version="1.4.9"; sha256="1h87iwzy988jx1i70nxv24c3gjirrga5c3fw5al86m7qr1nz4sps"; depends=[ape coda testit]; }; + nRegression = derive2 { name="nRegression"; version="0.5.1"; sha256="0d02zgb25g67vgbilwvx7qqqaznzbhqfnllp41fn4rr5ysrc01l0"; depends=[covr data_table simitation]; }; na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; }; naaccr = derive2 { name="naaccr"; version="2.0.2"; sha256="1j30fb7qvxzpx0y7hq8sbqvszwjfnc4r2g0j8885fmn2wxvcgzdx"; depends=[data_table stringi XML]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; @@ -13725,27 +13748,28 @@ in with self; { namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; }; namedropR = derive2 { name="namedropR"; version="2.4.1"; sha256="06lg381imi8xnm6jlsxfffjyhzban6z29zwkw8bamglnk0frvzza"; depends=[bib2df dplyr htmltools lubridate qrcode R_utils readr stringr webshot]; }; namer = derive2 { name="namer"; version="0.1.6"; sha256="1h3nfxdhvjjiki1rqjpmiih9vj1hz9j8m5wkazskz8asza23898i"; depends=[cli dplyr fs glue magrittr purrr rstudioapi tibble]; }; - nametagger = derive2 { name="nametagger"; version="0.1.2"; sha256="1s3rsplia53cxqpxxkb7l7p56bkgvl5jcjcxgf1a8qaxxf5qngi5"; depends=[Rcpp]; }; + nametagger = derive2 { name="nametagger"; version="0.1.3"; sha256="1m6g8fx9fvd8zzvv4c9dh1dw63dkvl9i5mz8rqgvwqgqdvvvw1vi"; depends=[Rcpp]; }; nandb = derive2 { name="nandb"; version="2.1.0"; sha256="1rbn4nibjzvwpccpmqn84w9a167f1avyl18kjlapy5dhafvixgbz"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; naniar = derive2 { name="naniar"; version="1.0.0"; sha256="1x4ljc6yji7312g6cg1shc85jqv5kaf2zlf5q7sdmqh3wryskvf2"; depends=[cli dplyr forcats ggplot2 glue magrittr norm purrr rlang tibble tidyr UpSetR vctrs viridis visdat]; }; - nanoarrow = derive2 { name="nanoarrow"; version="0.2.0.1"; sha256="000v5b205n10hmssmigfmni2wwfhbm9ih8pmqzwqmrnl815n1mjx"; depends=[]; }; - nanonext = derive2 { name="nanonext"; version="0.9.2"; sha256="1hdbksdskyfiw5y5rk81jbsqiavv6c5lswv2a8v4ksa2p33sc3sq"; depends=[]; }; - nanostringr = derive2 { name="nanostringr"; version="0.4.0"; sha256="0df46pq93696xgdjky5qf5lk8caz48mb3a3fbrlda8z1rpv2i8bb"; depends=[assertthat ccaPP dplyr epiR forcats magrittr purrr rlang tibble tidyr]; }; + nanoarrow = derive2 { name="nanoarrow"; version="0.3.0"; sha256="07cq9qhpg9fdsdaj6as1cyvwaf9x4r9c2zs4p0i2whfcvs1lxkjv"; depends=[]; }; + nanonext = derive2 { name="nanonext"; version="0.10.2"; sha256="1fcgxbin1sx9cahc6575x3b883fslqckgsli0r1dlc3bk7sx2fxk"; depends=[]; }; + nanostringr = derive2 { name="nanostringr"; version="0.4.1"; sha256="1sivaycgg1j3q9iapy2nq7mp8cak316rgn475sv7pa57ig6g9b7b"; depends=[assertthat ccaPP dplyr purrr rlang tidyr]; }; nanotime = derive2 { name="nanotime"; version="0.3.7"; sha256="05fbdhbax6k1glidmgl0zjc7y7v1ppbpz4422q3jmxmfack7hwd7"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; naptanr = derive2 { name="naptanr"; version="1.0.1"; sha256="074pxm1c8k24b3gbn3ibbwpsixbmjq3wx9agxg3ljflny2s6hhqp"; depends=[data_table httr]; }; naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; }; nardl = derive2 { name="nardl"; version="0.1.6"; sha256="1vf8im4zs4j0v3k617aaskq9n2fg8sn3j5bllcbz2ircrpijr21m"; depends=[car Formula gtools MASS strucchange tseries]; }; narray = derive2 { name="narray"; version="0.5.1"; sha256="0vpx1fl24ba1c5x3bw0n8bx5yp77gsqybaxgbq6mj6by29ggq73l"; depends=[progress Rcpp stringr]; }; + naryn = derive2 { name="naryn"; version="2.6.23"; sha256="0b0dgpamm86llk7vxazgzfdby2y7ks95msq3046b2kp524nihmqb"; depends=[dplyr glue lifecycle magrittr purrr stringr tidyr yaml]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; - nasapower = derive2 { name="nasapower"; version="4.0.10"; sha256="0nwpfm32w674vjz3dqxa6fqf3syjww6siarlr8sjirlgqm06xm76"; depends=[crul jsonlite lubridate readr tibble]; }; + nasapower = derive2 { name="nasapower"; version="4.0.11"; sha256="0md4y2fpjvx56j2a9v00n86x5gwvka07j4a53h80a6rdfyf21cnb"; depends=[crul jsonlite lubridate readr tibble]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; naspaclust = derive2 { name="naspaclust"; version="0.2.1"; sha256="1p4ilv2z5140h4kdix2w1v32vz1n8v33wq0fhc8n8mi7baknhd1i"; depends=[beepr rdist Rdpack stabledist]; }; - nat = derive2 { name="nat"; version="1.8.22"; sha256="054an7p1qg03rzzxwdkj7iaa8rvaq15n1d8h9r8lc89ybrdqdga2"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.23"; sha256="0wcn2dz44vfn475frir9fgj7hb45jvpkf2sxz7pd2m9a9p9idraf"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; nat_nblast = derive2 { name="nat.nblast"; version="1.6.7"; sha256="0m3x69m366ir5r2cf0msbwkrz32ds1cjyychw5l9z9cmdd8gmlsw"; depends=[dendroextras nabor nat plyr rgl spam]; }; nat_templatebrains = derive2 { name="nat.templatebrains"; version="1.1"; sha256="13fwh9lqd7yz3j8ndhx650a6mf5hn2f0w3lqfha24vb2zrv0crsg"; depends=[digest igraph memoise Morpho nat rappdirs rgl]; }; nat_utils = derive2 { name="nat.utils"; version="0.6.1"; sha256="0d1d1525izy8jmk9jkp9x9zw4ln04bbg56gvfddm1jaxwa5aciqc"; depends=[checkmate]; }; natcpp = derive2 { name="natcpp"; version="0.1.0"; sha256="0fy27dq6w9i9rir2v22zimzxibsaj9n4gbsl70ca4q57mgprl1hn"; depends=[Rcpp]; }; - natmanager = derive2 { name="natmanager"; version="0.4.9"; sha256="193rgf2m6pxcxhawgw0xcfc9jqqf3l11zrhjy35fmxansqxmw4im"; depends=[curl gh remotes usethis withr]; }; + natmanager = derive2 { name="natmanager"; version="0.5.1"; sha256="1lfz73zg95bv2wfk5pk0jb1r9n0w8ikfsza1cldfgffa93ii9ivd"; depends=[curl gh pak remotes usethis withr]; }; natserv = derive2 { name="natserv"; version="1.0.0"; sha256="1j6m0fddrhq36qfjmj99zs77vxk5waqkshxi37pr2ccnis9hzy9h"; depends=[crul jsonlite tibble]; }; natstrat = derive2 { name="natstrat"; version="2.0.0"; sha256="1i3qjd787clbafpkjd0mkp6i540061q9xl9kxlgh9f517ksg8zpz"; depends=[caret ggplot2 plyr pps ramify Rglpk rlang sampling slam]; }; naturaList = derive2 { name="naturaList"; version="0.5.1"; sha256="0692bd7sdf3rlcp7sgjkvm7w5gyd3qv4390f7bz286krimsxaqzq"; depends=[dplyr fasterize htmltools leaflet leaflet_extras magrittr raster rlang sf shiny shinydashboard shinyWidgets sp stringi stringr tidytext tm vegan]; }; @@ -13763,8 +13787,8 @@ in with self; { nbfar = derive2 { name="nbfar"; version="0.1"; sha256="1gr9q83ff950x2lcyv9apsnjah4kpi8805mci9m0s3gvr7llpjq4"; depends=[glmnet magrittr MASS mpath Rcpp RcppArmadillo RcppParallel rrpack]; }; nblR = derive2 { name="nblR"; version="0.0.4"; sha256="1p1m1jml7grpjfp5qibffm3dx8zz37h216bpcwybm293naprmbfr"; depends=[cli magrittr]; }; nbody = derive2 { name="nbody"; version="1.33"; sha256="1ky07bi830z3c2fvxq0fmicsllm736b510q4zphff4rwljx1awf2"; depends=[magicaxis Rcpp]; }; - nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; - nc = derive2 { name="nc"; version="2023.5.1"; sha256="1qkdm0yblvzlal24vcgwz2cl85m9fsbf3q12kj32zhyq8698h59q"; depends=[data_table]; }; + nbpMatching = derive2 { name="nbpMatching"; version="1.5.4"; sha256="0f7avg06lr5a1yixrl6mhcs98ywa91qbfkc7qlz2pxzpc1v13ffb"; depends=[Hmisc MASS]; }; + nc = derive2 { name="nc"; version="2023.8.24"; sha256="158vn3ivypx6gpbx1mpz1kw7lv9ifk76k1hcz4zv84jss2a1q135"; depends=[data_table]; }; ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; }; ncar = derive2 { name="ncar"; version="0.4.5"; sha256="1ymxb3av7vd7vljr8h3ga6v01z6nf5j9mc095z0hi31d1khwrd02"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29.1"; sha256="01352byijhwhcb7jji7bf5cm6v2yfz925f8wbivrx12x0c65fzw4"; depends=[]; }; @@ -13777,7 +13801,7 @@ in with self; { ncodeR = derive2 { name="ncodeR"; version="0.2.0.1"; sha256="1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8"; depends=[cli R6 rhoR]; }; ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; }; ncvreg = derive2 { name="ncvreg"; version="3.14.1"; sha256="1q6klmyf7gbzkinjhv83k8gn95jgn3vkc927wsmffqjqc3d71rd7"; depends=[]; }; - nda = derive2 { name="nda"; version="0.1.11"; sha256="1mzkhjgdpcfbv2za51kdgrszj5567wyzfirfh3gznxi17sgl4d8l"; depends=[energy igraph MASS Matrix ppcor psych visNetwork]; }; + nda = derive2 { name="nda"; version="0.1.13"; sha256="1v3nfjq0v0vjv3871qsx7sxl5b6p74187cvacj3jfjyxbzghb8pc"; depends=[energy igraph MASS Matrix ppcor psych visNetwork]; }; ndi = derive2 { name="ndi"; version="0.1.4"; sha256="1ydj6lvycm6awvrddmq9a9s24rd4xw86mzk8hfhrqx8plz8pj4k4"; depends=[car dplyr MASS Matrix psych sf stringr tidycensus tidyr]; }; ndjson = derive2 { name="ndjson"; version="0.9.0"; sha256="18j5bibranvbv84hvbsg6glmvhfancdsf2w6j99n3nw53bcgb12d"; depends=[data_table Rcpp tibble]; }; ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; @@ -13792,7 +13816,7 @@ in with self; { needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-12"; sha256="0b82822vl86gni0pv5f6pjfzmks35i7q2rqkhgyb9z9c677g991q"; depends=[]; }; negligible = derive2 { name="negligible"; version="0.1.3"; sha256="131bgvac2dk8alnmjymdx6l7cgmz2cncsyg62zgc6asfrh90nrqc"; depends=[DescTools dplyr fungible ggplot2 lavaan MBESS nptest rockchalk tidyr WRS2]; }; - neighbours = derive2 { name="neighbours"; version="0.1-2"; sha256="0sz8xmghv71ry884nyxma9y7wiqx0n82f3v5iw13dlgzr6z66qcz"; depends=[]; }; + neighbours = derive2 { name="neighbours"; version="0.1-3"; sha256="0q0d8504kjvsgik7pdhsgh9n1xszxa7p4mzpxajki2ym0x7hqx9k"; depends=[]; }; neighbr = derive2 { name="neighbr"; version="1.0.3"; sha256="1rmglfjmx6bfd4w1cpx4rvp7hy2vqvcamy854h5dq0l3kwk4pjcm"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-12"; sha256="0ws2knrq3b3icv6fzimypzwvzvqf0sayi2ndhacn6lk4snms5pm3"; depends=[optimbase optimsimplex]; }; nemBM = derive2 { name="nemBM"; version="1.00.01"; sha256="0zr2bxrla436yj5qba0jnrxw94alq9cp7zfkrvjwiyil4byj0a6c"; depends=[blockmodeling ergm]; }; @@ -13802,23 +13826,23 @@ in with self; { neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; }; neojags = derive2 { name="neojags"; version="0.1.4"; sha256="10z5x78a3mjy5jbxlzfzsixp6w8y0v0mkxnwf5bq3rk5dgnga0g0"; depends=[coda rjags runjags]; }; neonOS = derive2 { name="neonOS"; version="1.0.0"; sha256="11jgsf8c7rjfdbn9qljirzwvpnn4wckid4p4syx6py3dqjb4r19f"; depends=[curl data_table httr jsonlite]; }; - neonUtilities = derive2 { name="neonUtilities"; version="2.3.0"; sha256="1zd1kkavi69z5snhblxlm2algmdhrkwygabh9r6hldy6018kfa3y"; depends=[curl data_table downloader httr jsonlite pbapply R_utils stringr tidyr]; }; + neonUtilities = derive2 { name="neonUtilities"; version="2.4.0"; sha256="00f7zqr0jh4g31v1c8zv5n3pwfxqrx9m93rl59fwi276ivgcx60h"; depends=[curl data_table downloader httr jsonlite pbapply R_utils stringr tidyr]; }; neonstore = derive2 { name="neonstore"; version="0.4.4"; sha256="0fhjm6513kd4y3lry8dwcwk13ns92yk5h3san7ww2ahhdhy4hx9c"; depends=[DBI duckdb httr progress R_utils thor vroom zip]; }; neotoma2 = derive2 { name="neotoma2"; version="1.0.2"; sha256="120alfpd3k53pc0rwqz0d5z4mgsqzcfvg0z550p3sy3iagz9c02v"; depends=[assertthat dplyr geojsonsf gtools httr jsonlite leaflet lubridate magrittr mapview progress purrr rlang sf stringr tidyr uuid wk]; }; - nephro = derive2 { name="nephro"; version="1.3"; sha256="08gryzr53cd5gc8ks7v9jicgk4lxcwcr7zd8vzsqvy04sh3scw9i"; depends=[]; }; + nephro = derive2 { name="nephro"; version="1.4"; sha256="12rrc46dniw09a6402ns868h9c6f0grpsk3wv29z4l92338waiwb"; depends=[]; }; neptune = derive2 { name="neptune"; version="0.2.3"; sha256="04d5rdcvnik9rj58npvs5z1r6ngs9hzc24wzix64czcynkkvkad0"; depends=[ggplot2 htmlwidgets plotly reticulate rstudioapi this_path]; }; nesRdata = derive2 { name="nesRdata"; version="0.3.1"; sha256="1lxvg11g8nizfn8sghirq2749fs9i4w1wiaz3v1djqbkzqcqfrcj"; depends=[dataone dplyr purrr rappdirs readr]; }; nestcolor = derive2 { name="nestcolor"; version="0.1.2"; sha256="1d5fajwh59raw1nxaw6ibh92qrazsgrn7kjph3sv87zq8aqy3snn"; depends=[checkmate ggplot2 lifecycle]; }; nestedLogit = derive2 { name="nestedLogit"; version="0.3.2"; sha256="0lyqqxvh85zpvbcq4qp3cywr70312lw4xgas47hzybcrzqz9r63r"; depends=[broom car dplyr effects stringr tibble]; }; - nestedcv = derive2 { name="nestedcv"; version="0.6.7"; sha256="0aymjx29jlsxkv6nl4ivmi7rv8bvl5k6l499b3vs68g7rhd4pc1k"; depends=[caret data_table doParallel foreach ggplot2 glmnet matrixStats matrixTests pROC Rfast rlang]; }; - nestedmodels = derive2 { name="nestedmodels"; version="1.0.4"; sha256="02181m0q9z5xqcinmi1vzids1mm6g0zc58vv2ngz09f3md62im3l"; depends=[cli dplyr generics glue lifecycle magrittr parsnip purrr recipes rlang rsample stringr tibble tidyr vctrs]; }; + nestedcv = derive2 { name="nestedcv"; version="0.6.9"; sha256="02lm4naf3gkgj8l1ffqprq49jmxqj0y0i8f0riywcsmkrcllhlkp"; depends=[caret data_table doParallel foreach ggplot2 glmnet matrixStats matrixTests pROC Rfast rlang]; }; + nestedmodels = derive2 { name="nestedmodels"; version="1.1.0"; sha256="09qdfzcm3xv3ilh7awsi5anyra7cwb4xyxs4z30yxc28ll6dh9mf"; depends=[cli dplyr foreach generics ggplot2 lifecycle magrittr parsnip purrr recipes rlang rsample stringr tibble tidyr vctrs]; }; nestedpp = derive2 { name="nestedpp"; version="0.2.0"; sha256="0maw7ik209vdmm1fdnbi7chqy8wb1j1ql8jnry1y3af1g80lpa78"; depends=[ggplot2 reshape2 xtable]; }; nestfs = derive2 { name="nestfs"; version="1.0.3"; sha256="0qaxkg8m64admpw3zpwrd6z5lxdn0i5kl7dlixrp5r7c1j40aw3l"; depends=[dgof pROC]; }; nestr = derive2 { name="nestr"; version="0.1.2"; sha256="0qgd1sl6x5y70r3l4vf0qqynlrkdyq7mmpb8mwjn7f1hjnym1gaj"; depends=[magrittr rlang tidyselect vctrs]; }; net4pg = derive2 { name="net4pg"; version="0.1.1"; sha256="1a00bqskgl053wcwgmg7xsccybrq76bqaipdnf5zbm1dslir0jdv"; depends=[data_table graph magrittr Matrix]; }; netClust = derive2 { name="netClust"; version="1.0.1"; sha256="1h58ispdx8ddsnqrrmcxn2rbqb0hb89gpjg4p14mr7vhxw5c9zva"; depends=[Rcpp RcppArmadillo]; }; netCoin = derive2 { name="netCoin"; version="2.0.48"; sha256="03rmi75rjjy03jy0cv6qzz46q06027zvbwy4vp13748vq49aql1s"; depends=[GPArotation haven igraph MASS Matrix rD3plot]; }; - netSEM = derive2 { name="netSEM"; version="0.6.1"; sha256="01yhqlax9vyhipw5cjg2mg9cbxj44g7mxlrsfa4mfsw22bd6dc6i"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; + netSEM = derive2 { name="netSEM"; version="0.6.2"; sha256="1znb3r8jc1ms4ajzb3ryr89wjx6f3rw1f410msh46d5h08wsjn9n"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netShiny = derive2 { name="netShiny"; version="1.0"; sha256="1k6dmhkjf29ww31c15jms0yxwyiqq1z7a9115zwbg620cjd3m6fm"; depends=[colourpicker DT future future_callr ggplot2 ggVennDiagram igraph ipc magrittr Matrix netgwas plotly promises readxl shiny shinyBS shinycssloaders shinydashboard shinyjs shinyscreenshot shinyWidgets visNetwork]; }; netUtils = derive2 { name="netUtils"; version="0.8.2"; sha256="0laha093wxkvs06wh2hsmyxypn89n7vlh183zw6k26d67vl15a6j"; depends=[igraph Rcpp RcppArmadillo]; }; netassoc = derive2 { name="netassoc"; version="0.7.0"; sha256="0hbyg31r9sjp0dyxlbsbw7r1kb1dwr0apilsw8saf1vlqwsiasga"; depends=[corpcor huge igraph infotheo vegan]; }; @@ -13827,7 +13851,7 @@ in with self; { netcom = derive2 { name="netcom"; version="2.1.6"; sha256="1i9d7w497qqjkwqvskbm1k5jj03pf84am8jifhhmxmmvd9sk6ldw"; depends=[clue doParallel dplyr expm foreach GenSA ggfortify ggplot2 ggraph igraph magrittr Matrix optimx pdist pracma reshape2 rlang tibble vegan]; }; netcontrol = derive2 { name="netcontrol"; version="0.1"; sha256="1gskb728ycnhz9a9g9ghm0dz3ajf3dzgyv23bsk9i01wj9hrxhc0"; depends=[expm MASS Matrix pracma Rcpp RcppArmadillo Rdpack]; }; netcox = derive2 { name="netcox"; version="1.0.1"; sha256="04biaynmvqrilp0kdxw55b990j7iqnvn8gr07dhzm9f7r9sr7xk6"; depends=[glmnet Rcpp survival]; }; - netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.5"; sha256="1brcqkxvc7h015hgmxff4449zvgzl7rx6lm52x0hchc6zjb0fi16"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; + netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.6"; sha256="0f4d0x03970iqxkbr0r9jm8gf28r79rimfnfr1djcajzihxaj7l6"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="4.0.4"; sha256="02127r3vskcksrd893qrs1wqwkbw3b8p33ybgvbwd9j4lxgifmr2"; depends=[AnnotationDbi corpcor data_table dplyr genefilter glassoFast glmnet graph graphite httr igraph jsonlite magrittr Matrix msigdbr org_Hs_eg_db quadprog Rcpp RcppEigen RCy3 reshape2 rlang]; }; netgwas = derive2 { name="netgwas"; version="1.14.2"; sha256="0xa3nc7by7v360n6s8fym65fpaz0am4yym3m653nkcr545s0rc5n"; depends=[glasso huge igraph MASS Matrix qtl tmvtnorm]; }; @@ -13836,8 +13860,8 @@ in with self; { netmediate = derive2 { name="netmediate"; version="0.1.2"; sha256="13yrc0sfq5vl6md3jwmzyrzqnkr68f6hksvlj834md1gx29rwj2q"; depends=[btergm ergm ergMargins gam intergraph lme4 MASS network plm plyr RSiena sna VGAM]; }; netmeta = derive2 { name="netmeta"; version="2.8-2"; sha256="132qkvpkami568w276qc269844z0d1l3yjbj71if4r2w8ra3p5wy"; depends=[ggplot2 magic MASS meta metafor]; }; netmhc2pan = derive2 { name="netmhc2pan"; version="1.3.1"; sha256="0q98rar7iglwxmf1274wrjcr7kp544ayrjhd286x68jmf51cqyrg"; depends=[assertive devtools dplyr rappdirs readr seqinr stringr testit tibble]; }; - netplot = derive2 { name="netplot"; version="0.1-1"; sha256="11s6gcxcwbnd5x3sb4ryi4ks1bsbf7ylgc0yrygv58ipisxb2780"; depends=[igraph network sna]; }; - netrankr = derive2 { name="netrankr"; version="1.2.0"; sha256="1b6wcvwqyqjfi1v8k8bf0ydsiyizpcgy47jf4z6v50sj22lwvxpn"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + netplot = derive2 { name="netplot"; version="0.2-0"; sha256="0l4sy8wn2fd04fpkrh853r923dajpqldc78ws4kmh6ixn1l43c21"; depends=[igraph network sna]; }; + netrankr = derive2 { name="netrankr"; version="1.2.1"; sha256="14r5xy4j7d2vkbfrlylipx17n66kk7fl1n0hipx5hn6na5slxkfi"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; netropy = derive2 { name="netropy"; version="0.1.0"; sha256="1c7gmv4lm2i2bmvhan5v0w3s3qvaxq0l7f4q76jhcc9mlz0plbh1"; depends=[ggplot2 ggraph igraph]; }; nets = derive2 { name="nets"; version="0.9.1"; sha256="00adkyd2hm8aynpnk4avzss8fxkbaai74n5cf03vpwyc306jq0d7"; depends=[igraph]; }; @@ -13854,33 +13878,35 @@ in with self; { networkLite = derive2 { name="networkLite"; version="1.0.5"; sha256="12vifn3vnhk0nk357759zp154v3l8hyapjqygkz31czhz3a5baxa"; depends=[dplyr network statnet_common tibble]; }; networkR = derive2 { name="networkR"; version="0.1.2"; sha256="07dq3syk0hr1kc2mqd70g0ih09hamd7rxxms60dyvnpm8978c1wz"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; }; networkscaleup = derive2 { name="networkscaleup"; version="0.1-1"; sha256="02ywmmj95xlgdavs81m0gbzyfwf9ac2wrbfwq2kcxgc0la4aimvc"; depends=[BH LaplacesDemon Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - networktools = derive2 { name="networktools"; version="1.5.0"; sha256="0hqkq544jgk49gl0yaqh2bs3dmyrlhc8z9n201dj5id41w6qcl8s"; depends=[cocor eigenmodel ggplot2 gridExtra igraph psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; + networktools = derive2 { name="networktools"; version="1.5.1"; sha256="0y5sfqn0ijgclm191kxfkqs6l8vnmdjsnjjsawq3nl4ziw7zlpfy"; depends=[cocor eigenmodel ggplot2 gridExtra igraph psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; networktree = derive2 { name="networktree"; version="1.0.1"; sha256="0hkrqpx7b6sxalw1qyrncck70mx6p5gr57mf558l5mlqi52v7hg0"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; - neuRosim = derive2 { name="neuRosim"; version="0.2-13"; sha256="0jxpkrb7rqmcmcl1gdmg9jjk09nl8czafc2ggdwmnc5hb805xx5n"; depends=[deSolve]; }; + neuRosim = derive2 { name="neuRosim"; version="0.2-14"; sha256="1ndgpx748q7flqbb0bbjzdnynd5vp85k6wi4karxgvgihsxn9hkz"; depends=[deSolve]; }; + neuralGAM = derive2 { name="neuralGAM"; version="1.1.0"; sha256="10v47gqr2y7md9j4807zsnckavlv4p9lggj5ywkizhwgmdfn4bxx"; depends=[formula_tools ggplot2 gridExtra keras magrittr reticulate tensorflow]; }; neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; }; neurobase = derive2 { name="neurobase"; version="1.32.3"; sha256="0jg4fspqmdbrisxxwbpql5kv9am3d02m5j2dp8305p8dl0wz5vyj"; depends=[abind matrixStats oro_nifti R_utils RNifti]; }; - neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; + neuroblastoma = derive2 { name="neuroblastoma"; version="2023.9.3"; sha256="18n2ysrxb47wn5xpf906i5hn84f45r3ijla7sravyrsh8lbx6xih"; depends=[]; }; neurocInstall = derive2 { name="neurocInstall"; version="0.12.0"; sha256="1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf"; depends=[devtools]; }; neurohcp = derive2 { name="neurohcp"; version="0.9.0"; sha256="02z0lhmw2mr2fk8d8wp7nfcrfl8izds68zskm5j0xfabfb4dwkbx"; depends=[aws_s3 base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuromplex = derive2 { name="neuromplex"; version="1.0-1"; sha256="1zj7x528qv4bp24fx546jj9kf0q0n26jyi65v6h2bl3c61rrb6bz"; depends=[BayesLogit dplyr ggplot2 gridExtra magrittr tidyr]; }; neuronorm = derive2 { name="neuronorm"; version="1.0.2"; sha256="1bypspygib963n255q6j5pmm14sw67ipmkq54faz8w2i3mdb845v"; depends=[fslr knitr oro_nifti]; }; neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.3"; sha256="1660v7nng6dj9gwn04ynirms0g10wpsz33i26va229zdviqm5cyy"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; }; + nevada = derive2 { name="nevada"; version="0.2.0"; sha256="0ba5wbjsgd77f20flp9zqiasmypbxsmqg2yfw0qqwzjrkp3rvfqi"; depends=[cli dplyr flipr forcats furrr ggplot2 igraph magrittr purrr Rcpp RcppArmadillo rgeomstats rlang tibble tidyr tsne umap withr]; }; neverhpfilter = derive2 { name="neverhpfilter"; version="0.4-0"; sha256="097nfz30pf4bd95l943ccsvndni0n8c6gpcdk5dv02802mcg0h81"; depends=[xts zoo]; }; newFocus = derive2 { name="newFocus"; version="1.1"; sha256="0j7wl4yf4dnz4vbbnhsk39w9zqbnad2lhxwqbns1plhdd02hzsfr"; depends=[ctgt]; }; newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; }; - newscatcheR = derive2 { name="newscatcheR"; version="0.1.1"; sha256="026ggv81a7g426ir4p4yzzwlp8d5szhw0xsdbnmiqzyfvs2js0d0"; depends=[tidyRSS]; }; - newsmap = derive2 { name="newsmap"; version="0.8.2"; sha256="1kvf2q0wdn5ilw10cyd9pbigh26fm9qr4sghbaln28x5f96f1fva"; depends=[Matrix quanteda quanteda_textstats stringi]; }; + newscatcheR = derive2 { name="newscatcheR"; version="0.1.2"; sha256="18r9lmg9q6fj0ggnpqggqywsbycblsdc42mdcpc2abzp98dsvww9"; depends=[tidyRSS]; }; + newsmap = derive2 { name="newsmap"; version="0.8.3"; sha256="08gdjszasfc62yz7q4s6a5971v0c0ddncryyfq1blpi6qqikjyhj"; depends=[Matrix quanteda quanteda_textstats stringi]; }; newsmd = derive2 { name="newsmd"; version="0.5.1"; sha256="06iq628ysfbaawhx5yxkxh8a9d3nmzq87n80l88kj84k1lg1s5ph"; depends=[R6]; }; nextGenShinyApps = derive2 { name="nextGenShinyApps"; version="1.6"; sha256="0yvjchdxd8zxilq05x5ihjh10wzn9cz8cp6sr6jrnxgkiyrgh46q"; depends=[htmltools shiny]; }; nfer = derive2 { name="nfer"; version="1.1.3"; sha256="0s19ks4ildxqdbm4nv40f6c0rs1a6h9vx46654k8n0q18bgia448"; depends=[]; }; - nfl4th = derive2 { name="nfl4th"; version="1.0.2"; sha256="0dx5ipnfnsii0imnxsi3vyfvihfdg0sim5vhpchi0ggcnjpqm3k4"; depends=[dplyr glue httr janitor jsonlite magrittr mgcv nflfastR nflreadr purrr stringr tibble tidyr tidyselect xgboost]; }; - nflfastR = derive2 { name="nflfastR"; version="4.5.1"; sha256="0416bc4b40ydc842yg3y9safbrwgqlc431qxdzrh8zp4vcmg3lac"; depends=[cli curl data_table dplyr fastrmodels furrr future glue janitor mgcv nflreadr progressr rlang stringr tibble tidyr tidyselect xgboost]; }; - nflplotR = derive2 { name="nflplotR"; version="1.1.0"; sha256="13ibhri9x5k4waay230s2xhc9i8qm51glq0bgdc1ily8grgrxhgs"; depends=[cachem cli data_table ggplot2 magick magrittr memoise nflreadr rappdirs rlang scales]; }; - nflreadr = derive2 { name="nflreadr"; version="1.3.2"; sha256="063cdp5x5f0jx5x0ydb9cbg3x6zlbk3rxsjmpshlwx89szslszjd"; depends=[cachem cli curl data_table glue memoise rappdirs rlang]; }; + nfl4th = derive2 { name="nfl4th"; version="1.0.4"; sha256="1ilvchs7g26ks6wgb8s8av0pm10s161fqiahcwbsm5xfy9bh8q78"; depends=[backports curl dplyr glue httr janitor jsonlite magrittr mgcv nflfastR nflreadr purrr rlang stringr tibble tidyr tidyselect xgboost]; }; + nflfastR = derive2 { name="nflfastR"; version="4.6.0"; sha256="1zbl8khwhf9g4bw5fbcr73wa17g8jia6w23ziqq5pvsc1ygabyga"; depends=[cli curl data_table dplyr fastrmodels furrr future glue janitor mgcv nflreadr progressr rlang stringr tibble tidyr tidyselect xgboost]; }; + nflplotR = derive2 { name="nflplotR"; version="1.2.0"; sha256="0rnzhfp1msmiqci6g37l9half8bc410g5vmbkzqk8v35vxml6r49"; depends=[cachem cli data_table ggpath ggplot2 magick magrittr memoise nflreadr rappdirs rlang scales]; }; + nflreadr = derive2 { name="nflreadr"; version="1.4.0"; sha256="1437nzvqj0w5p3wxb0zfwjkn34ssd4q9zbsw0lmrbs0afifaf6dd"; depends=[cachem cli curl data_table glue memoise rappdirs rlang]; }; nflseedR = derive2 { name="nflseedR"; version="1.2.0"; sha256="0nk6264alv0d8d1wj7xqk4m57rl1w185jj5qj58d9hwiy2wmzvqz"; depends=[cli data_table dplyr furrr future gsubfn magrittr nflreadr progressr purrr rlang tibble tidyr]; }; - nflverse = derive2 { name="nflverse"; version="1.0.2"; sha256="00mjclyf0ph2wi3jbbxyhgckj9kppm8xhy10z5n6kskyw4wnvab0"; depends=[cli crayon magrittr nfl4th nflfastR nflplotR nflreadr nflseedR rlang rstudioapi]; }; + nflverse = derive2 { name="nflverse"; version="1.0.3"; sha256="1pamkg80b83gb5ab3zshh36xsr31ihv6qbh1aa42m6k4g1wk5g3r"; depends=[cli crayon magrittr nfl4th nflfastR nflplotR nflreadr nflseedR rlang rstudioapi]; }; nftbart = derive2 { name="nftbart"; version="1.6"; sha256="193507ii4f78g81937dixk7mja23sdicb0fvi0g3ryi0xjh913q0"; depends=[nnet Rcpp survival]; }; ngboostForecast = derive2 { name="ngboostForecast"; version="0.1.1"; sha256="019l9w7m6lkbf0m9mlsd24agjasbzi7dmy72faq1s4xg49a5xa9a"; depends=[dplyr forecast magrittr R6 reticulate]; }; ngram = derive2 { name="ngram"; version="3.2.2"; sha256="04cafc0i3605vlxmiwfyf91572ppg3wmm0hi50y9x7ai12bznchc"; depends=[]; }; @@ -13888,8 +13914,8 @@ in with self; { ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-2"; sha256="09hdvmbna4m62zv18k5kj9718wzw7p43wnal2j6aa0m5sd2rx9rz"; depends=[batchmeans Rcpp RcppArmadillo]; }; nhanesA = derive2 { name="nhanesA"; version="0.7.4"; sha256="0f0qjjndd4nl9rzmapn98hlzv5fzvvg88ls97rim7vnr6l4c7mqq"; depends=[foreign magrittr plyr rvest stringr xml2]; }; - nhdR = derive2 { name="nhdR"; version="0.6.0"; sha256="1rfvmla727l0x4vjqp2sjnbx9wy3996n6x7z8lrcz82lcq9hdbzl"; depends=[curl digest dplyr foreign ggplot2 httr maps memoise purrr rappdirs rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.6.2"; sha256="0w41jbh9g1178mnjnyiwxafm6z5ssnadh23ap6lsldysma633nwc"; depends=[dataRetrieval dplyr fst httr jsonlite magrittr pbapply prettymapr R_utils RANN rlang rosm sf tidyr units xml2 zip]; }; + nhdR = derive2 { name="nhdR"; version="0.6.1"; sha256="1cf3lfkflwbvswdqnp74zrb7ndc2vbm9jj8dny1gqq3x9ciiy8gw"; depends=[curl digest dplyr foreign ggplot2 httr maps memoise purrr rappdirs rlang rvest sf stringr units xml2]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="1.0.0"; sha256="109gipkpmszipljm19c1f9mrjpf647vk9kyz7dwcpwlra7x21ay3"; depends=[arrow dataRetrieval dplyr fst httr hydroloom jsonlite magrittr mapsf maptiles pbapply R_utils sf tidyr units xml2 zip]; }; nhlapi = derive2 { name="nhlapi"; version="0.1.4"; sha256="1c5s7fd9agzk20xi8v38dk8ih6lmn8c90mxncyr996bhipgr7vl3"; depends=[jsonlite]; }; nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; @@ -13899,21 +13925,20 @@ in with self; { niaidMI = derive2 { name="niaidMI"; version="1.1.0"; sha256="0cg349qdlbixdyfzs5ahaf218a8gcpb2rvm0xaabsq9ray9gmq1a"; depends=[Rcpp]; }; nic = derive2 { name="nic"; version="0.0.2"; sha256="1bsmwdnkxmpp1wr7w4qmpm1x8vgllif0yqbn4n0k477bzlm9p7m4"; depends=[]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; - nicheROVER = derive2 { name="nicheROVER"; version="1.1.0"; sha256="0chg2bnz929mq17qylf3f57g6bg4ih6w20019yh7vkz7mwjnvi3p"; depends=[]; }; + nicheROVER = derive2 { name="nicheROVER"; version="1.1.2"; sha256="03xal1bm4wfvq6943v1n3d0782yxcmlqjwxj4i0dgr3yi72759x2"; depends=[]; }; nichevol = derive2 { name="nichevol"; version="0.1.20"; sha256="18c3l9mm4dh0pxpliv2sx7nyijdhmzgcd36xkzclhhh067lxifrs"; depends=[ape castor geiger stringr terra]; }; - nieve = derive2 { name="nieve"; version="0.1.2"; sha256="019ql8qzmp4qi7ayx26jgcnbsjmq6sigmv07x30macnsq7s7n2gi"; depends=[]; }; + nieve = derive2 { name="nieve"; version="0.1.3"; sha256="0r1acnb771wvxnpjzgrvxfs8fc6xibgggxk4smhq62nnyjlp0big"; depends=[]; }; nifti_io = derive2 { name="nifti.io"; version="1.0.0"; sha256="03p0gn6id5bkn0qxf7v3splykpi9wpbasrhf2937gp25bsynrpjm"; depends=[]; }; - nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; }; nilde = derive2 { name="nilde"; version="1.1-7"; sha256="014scmwhq9i66i2mhvrb71y6ccv0xzjqfgm2sqff9lzjv9smy2im"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; nimble = derive2 { name="nimble"; version="1.0.1"; sha256="0f2jshyvs40284bhv837aziw7k3f6yfh7kkrcyh8vyabmy6yfzqh"; depends=[coda igraph numDeriv pracma R6]; }; nimbleAPT = derive2 { name="nimbleAPT"; version="1.0.4"; sha256="0615fm6sa6nf607ay98r81m0pp8yvydpwzn3972imf87irps2k3l"; depends=[nimble]; }; - nimbleCarbon = derive2 { name="nimbleCarbon"; version="0.2.1"; sha256="1dzkc0ay617a1l6m919sqxfcnx0z9kwfykn11f9hz6ddf4wgkysm"; depends=[coda doSNOW foreach nimble rcarbon snow]; }; + nimbleCarbon = derive2 { name="nimbleCarbon"; version="0.2.5"; sha256="0gqzdiid3x5k8286j3wy31pha76diniyj7si0mzrmq13kw77lsls"; depends=[coda doSNOW foreach nimble rcarbon snow]; }; nimbleEcology = derive2 { name="nimbleEcology"; version="0.4.1"; sha256="1z4byxsana1fa2y7qhmiqbb8ana6zbas0cmbgcc703mqh1642jb2"; depends=[nimble]; }; - nimbleHMC = derive2 { name="nimbleHMC"; version="0.1.1"; sha256="0w416k8ln79iyir7z7fhj9s0yhjap3r8fyj71lc1csikgk878izd"; depends=[nimble]; }; + nimbleHMC = derive2 { name="nimbleHMC"; version="0.2.0"; sha256="09cnfnrm7f8zdih5f7d8zsxlr8bxhymk5cji812s658m2g8w9n6n"; depends=[nimble]; }; nimbleNoBounds = derive2 { name="nimbleNoBounds"; version="1.0.2"; sha256="1sbaj1ayvqn86av045h5n7rrlw5r3zyk1i6v5v9sjm3f9pxyffgw"; depends=[nimble]; }; nimbleSCR = derive2 { name="nimbleSCR"; version="0.2.1"; sha256="1gyc93isivvq0b8fv4pb2g3mpr1n7jfpj9bs86a417iwbf34x4a4"; depends=[nimble]; }; - nimbleSMC = derive2 { name="nimbleSMC"; version="0.10.1"; sha256="1bxm729v40zd9gflllp8plj7gk325mc4gdlmsvkrgp31rslkxx76"; depends=[nimble]; }; + nimbleSMC = derive2 { name="nimbleSMC"; version="0.11.0"; sha256="14ps01rphi31570m2qhmgpjhdn73aldhm5a20y6fqf3j24k86jys"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.8"; sha256="0nv7h68hysxnpiinmgw6v3bz4ya53c0p96k9bfvcmalfb7hs8j5z"; depends=[]; }; nipnTK = derive2 { name="nipnTK"; version="0.1.0"; sha256="0imy2x1h9d842ssw7hmmh21c4mj7s6y05mmjin1270skbnrk2zmr"; depends=[bbw withr]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; @@ -13922,7 +13947,6 @@ in with self; { njtr1 = derive2 { name="njtr1"; version="0.3.2"; sha256="1fyp9myzlx670xjpzxq4ivbl1qs7f3rz6n424ydp1ml994mz709a"; depends=[curl dplyr httr lubridate readr stringi stringr tidyselect]; }; nlMS = derive2 { name="nlMS"; version="1.1"; sha256="01ijg1bp3r0dg8ph7qpsx3hqzrrvfhbykml20hqchxk7c5n2w9wz"; depends=[nlme]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; - nlaR = derive2 { name="nlaR"; version="0.4.1"; sha256="11f2ka3fi74bkf0izzc17w2h8v3ngdxhy6m0fjv1wjrbby2cqh8g"; depends=[rappdirs]; }; nlcv = derive2 { name="nlcv"; version="0.3.5"; sha256="1ywnm8a13ifqa1bxnf659h1j6mg9iy02vaszyh9p966ps9c1pjab"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; }; nleqslv = derive2 { name="nleqslv"; version="3.3.4"; sha256="1kqgjgrid0s4f5rr7kcmw2h1zkb5vfvl2nnzrvc5s5fdbd9fg0r7"; depends=[]; }; nlgm = derive2 { name="nlgm"; version="1.0"; sha256="03byqqj8ayq7hbaab4cfrk0nbxmiiq2c2i98szfydzkimhrw922a"; depends=[ggplot2 Rfast Rfast2]; }; @@ -13932,8 +13956,8 @@ in with self; { nlmeU = derive2 { name="nlmeU"; version="0.70-9"; sha256="10vk098mv8h9hv6cn8sih2fmg9cjsqmvndqzqm8bbaahla1v6n7q"; depends=[nlme]; }; nlmeVPC = derive2 { name="nlmeVPC"; version="2.6"; sha256="0ymiif377c6rjplzvs3s4bgc62ymw2l3cigx8rh779blb0w90qf8"; depends=[ggplot2 Hmisc optimx quantreg Rcpp RcppArmadillo timeDate]; }; nlmixr2 = derive2 { name="nlmixr2"; version="2.0.9"; sha256="1mfbm053jkmqkg7hdvzczpfx35r9xc6113vxl20561pk2zxh9fq7"; depends=[cli crayon lotri magrittr nlmixr2data nlmixr2est nlmixr2extra nlmixr2plot rxode2]; }; - nlmixr2data = derive2 { name="nlmixr2data"; version="2.0.7"; sha256="06wchhd5rg76vws8lvh5yf8cia7d09ds61h9zizqk7j9azkx004j"; depends=[]; }; - nlmixr2est = derive2 { name="nlmixr2est"; version="2.1.6"; sha256="0r6mhavj9hlsn7ig4an22j7w0yrhrcrjpcy9r64m21bga791xgnz"; depends=[backports BH checkmate cli knitr lbfgsb3c lotri magrittr Matrix minqa n1qn1 nlme nlmixr2data Rcpp RcppArmadillo rex Rvmmin rxode2 rxode2parse rxode2random symengine]; }; + nlmixr2data = derive2 { name="nlmixr2data"; version="2.0.8"; sha256="1szf14wda6gagp32qm3w7dv5yyk91vs105q69b29x6nc6zi1zkxv"; depends=[]; }; + nlmixr2est = derive2 { name="nlmixr2est"; version="2.1.8"; sha256="1lxlma1yij9mnycgsbqdz6mp5fvvjs69x198gs1qdg12g5n2wb5x"; depends=[backports BH checkmate cli knitr lbfgsb3c lotri magrittr Matrix minqa n1qn1 nlme nlmixr2data Rcpp RcppArmadillo rex rxode2 rxode2parse rxode2random symengine]; }; nlmixr2extra = derive2 { name="nlmixr2extra"; version="2.0.8"; sha256="1sxbkqwhj6lg49c3ah4kylvak1lgj2was6mqsh82klvp72fd61fd"; depends=[checkmate cli crayon data_table digest ggplot2 ggtext lotri nlme nlmixr2est Rcpp RcppArmadillo rxode2 symengine]; }; nlmixr2lib = derive2 { name="nlmixr2lib"; version="0.2.0"; sha256="1clar5nw77dc07q1l014ajc5avfdd2n82chdpbv1gcs2mfyrwr9r"; depends=[checkmate cli nlmixr2est rxode2]; }; nlmixr2plot = derive2 { name="nlmixr2plot"; version="2.0.7"; sha256="0bpb9pxdjpwg3kqldbmw8vlq2w843dgyv0q13265kbcpwqhqmnma"; depends=[ggplot2 nlmixr2est nlmixr2extra rxode2 vpc xgxr]; }; @@ -13943,22 +13967,22 @@ in with self; { nlnet = derive2 { name="nlnet"; version="1.4"; sha256="13lv4b6chsjrhimny3wc1y9ljgbxmm1byj4j04n4vj8icn87gyfd"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; }; nloptr = derive2 { name="nloptr"; version="2.0.3"; sha256="1mqnjswm0dl6vqc8b2s5k3n1mhanaha3l33vh68dh6zx8q9aq9kv"; depends=[testthat]; }; nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; - nlpsem = derive2 { name="nlpsem"; version="0.1.1"; sha256="0qckmhkvfmc589pcd9zrsd903gwvyj5waq9wx4rlk35mjvsrsy1k"; depends=[dplyr ggplot2 Matrix nnet OpenMx readr stringr tidyr]; }; + nlpsem = derive2 { name="nlpsem"; version="0.3"; sha256="0i6skpmnbi99dkcdam61rq5rfk6wv41q0r1q357qm66wbqyj30fr"; depends=[dplyr ggplot2 Matrix nnet OpenMx readr stringr tidyr]; }; nlraa = derive2 { name="nlraa"; version="1.9.3"; sha256="0bwlx9hv8a2a6220lsvwlgn0jwq9r3mbn095gffk5s6g80lgmm8r"; depends=[boot knitr MASS Matrix mgcv nlme]; }; nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; nlrx = derive2 { name="nlrx"; version="0.4.4"; sha256="1ki8jhaa6ngqk046p61ssi0q9bskvc7vlz9j3d5ax0n118j5gx2q"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr progressr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; - nls_multstart = derive2 { name="nls.multstart"; version="1.2.0"; sha256="1aichzwg54jhw1y3csv2bx40cszbgzfa60hr17jb5133nxb99gwh"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; + nls_multstart = derive2 { name="nls.multstart"; version="1.3.0"; sha256="1fv6zw87n6fkblfn8q5mj957j9gx0qgjnkpypjdlircafb849gkf"; depends=[dplyr minpack_lm purrr tibble tidyr]; }; nls2 = derive2 { name="nls2"; version="0.3-3"; sha256="05miqxfpg29jpf1p3bi347w5565bd3cih8dpvnc3p0i0hcbzmlkl"; depends=[proto]; }; nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-3"; sha256="0vn0yv1h8idv91g7qhx8qfyvsvw4rbx7i8r8kfv13d40j1w4cfab"; depends=[nlstools]; }; - nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; }; + nlsem = derive2 { name="nlsem"; version="0.8-1"; sha256="0xw32bpd2snxyxl90sjdn5c0447jq9s6c58vxq40prg738mfqx06"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; }; nlshelper = derive2 { name="nlshelper"; version="0.2"; sha256="02xnx0j8p1im1hdwnia3n51dicscjf8s33y475i3dczvhmivvbmf"; depends=[broom dplyr magicaxis mgcv nlme]; }; nlshrink = derive2 { name="nlshrink"; version="1.0.1"; sha256="0adnr7g3n3brwlvyix8wa7h59gj036l5anv8abqy80ysmfcmsp0y"; depends=[MASS nloptr]; }; nlsic = derive2 { name="nlsic"; version="1.0.4"; sha256="02xvmzq1yv8bz6wksx4nck9ljxkprsn8xk39chjilir6jddkh6fq"; depends=[nnls]; }; nlsmsn = derive2 { name="nlsmsn"; version="0.0-6"; sha256="1wrqfmsb3l4bsdncyjl7hh3vwj9s6l43p7klww6f4k21asvh4p5s"; depends=[]; }; - nlsr = derive2 { name="nlsr"; version="2023.5.8"; sha256="1ya38hk1xwvxnlymlx86imq6ww98y2mswf5fdm4s8r2qs3hy4bf4"; depends=[digest]; }; + nlsr = derive2 { name="nlsr"; version="2023.8.31"; sha256="0df3q1lmqy9abbfqxffssy0vkaizsmfqyr8fx88a2id4dbj5j6xl"; depends=[digest]; }; nlstac = derive2 { name="nlstac"; version="0.2.0"; sha256="0q62bnwdnw4jjzj1gk74il4k5bc2lvaixckaqdqk9q4rkyx6p0z5"; depends=[Deriv foreach stringr]; }; - nlstools = derive2 { name="nlstools"; version="2.0-0"; sha256="07givljg4ynp56613bnyh5a6cf41h6ihsrwp073zwnxr0l9c5gqf"; depends=[]; }; + nlstools = derive2 { name="nlstools"; version="2.0-1"; sha256="1pbsdmg1gaf0v0w5ij75l381f8h91dnc7vlbl8za3aws1cxhjaw5"; depends=[]; }; nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.4"; sha256="0ps6rl0yafg8ajwfk3iqbgjngq354bfbys619p5c94i498bigwcf"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; @@ -13967,6 +13991,7 @@ in with self; { nmaplateplot = derive2 { name="nmaplateplot"; version="1.0.1"; sha256="1k6i4d1n2cadhp1nzb7ij1d58wrgyhrqpwq1flixgkyrzz375z9g"; depends=[ggplot2]; }; nmarank = derive2 { name="nmarank"; version="0.3-0"; sha256="1i2vagjq96q2vhr2lxbm3hqspddfq9qkqjcr8smni6ikmw32akil"; depends=[data_tree dplyr MASS meta mvtnorm netmeta rlang tibble tidyr]; }; nmathresh = derive2 { name="nmathresh"; version="0.1.6"; sha256="1jrf7k7an5y867k40aj28ib7vrjyqky2cslwzmfx28snp8ns1vd3"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; + nmfbin = derive2 { name="nmfbin"; version="0.2.1"; sha256="1g2yhb2g11fd0dl4xiq2xhjizyzg7f8x3rm01gjbdp1c68vlsf8q"; depends=[]; }; nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; }; nmrrr = derive2 { name="nmrrr"; version="1.0.0"; sha256="031rh5m52gznl65r7cxh0p6l7qdaygbda7kcx352958dycmnxfs1"; depends=[DescTools ggplot2 tidyr]; }; nmslibR = derive2 { name="nmslibR"; version="1.0.7"; sha256="0658j1rir16s84aw7xw698pr8j2xp7j70rd306w04f3dxynsrrqm"; depends=[KernelKnn lifecycle Matrix R6 Rcpp RcppArmadillo reticulate]; }; @@ -13980,18 +14005,18 @@ in with self; { nnfor = derive2 { name="nnfor"; version="0.9.8"; sha256="0333c7h8lx1r9brw4dabyd28hyqvsr14hpsykbgx646k0xfkhrkr"; depends=[forecast generics glmnet MASS neuralnet plotrix tsutils uroot]; }; nngeo = derive2 { name="nngeo"; version="0.4.7"; sha256="0scfclw2prjfgm1liwbbys9ds00pyb0fk8q0mw6d6nqnbrw9kfnd"; depends=[data_table nabor sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; - nnlib2Rcpp = derive2 { name="nnlib2Rcpp"; version="0.2.2"; sha256="0a9mzj041zzjzzwwxcvz4vrbd8xl6hrv8m22a779fv2dyk8jnq5g"; depends=[Rcpp]; }; - nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; + nnlib2Rcpp = derive2 { name="nnlib2Rcpp"; version="0.2.3"; sha256="02vjfidbpkd38zsikd63wkx091rm481js3a7pgryv768ddia728g"; depends=[Rcpp]; }; + nnls = derive2 { name="nnls"; version="1.5"; sha256="0lilga63p7k5mkkfcf5p3swx76vwysl979jxszm6svzqhsrgww6d"; depends=[]; }; nnspat = derive2 { name="nnspat"; version="0.1.1"; sha256="0h17p87fzsqizldgxvmis4s8wyyhc0f95amdl8j7fw2kcmrivnay"; depends=[MASS pcds Rdpack]; }; nnt = derive2 { name="nnt"; version="0.1.4"; sha256="1rrqq8m3plsq13hsh53h948wbx37gl87hplj4ms2pxxf1zwqsmnj"; depends=[survival survRM2]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.3.0"; sha256="0pxsddzkrprzjch173shhmd7c2h6rh5xzs3n5bbs97l51ni8m60m"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.2.0"; sha256="1d93h8av0bbv7a56g6m000qpsnzqpfdla0fmcj5y8fbbqkipxnfr"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 hurricaneexposure lubridate magrittr maps plyr RColorBrewer RCurl rlang stringr tibble tidyr viridis XML]; }; noah = derive2 { name="noah"; version="0.1.0"; sha256="1ln23lp4c70fin9sjjhm4ngy47f8sk2mcljp5q449b7hq8gqi12c"; depends=[assertthat crayon digest dplyr hash magrittr purrr R6 rlang stringr]; }; noctua = derive2 { name="noctua"; version="2.6.2"; sha256="1j7ikcviapdddyi71zwybcjyj6f1kyszb44vmbcq7jmvm7iazvmx"; depends=[data_table DBI paws uuid]; }; - nodbi = derive2 { name="nodbi"; version="0.9.6"; sha256="0adhj5r7zbqqrhf64g8vrsyq1k1ia86jgr825ny8l5m3dkcgxv1l"; depends=[DBI jqr jsonlite stringi uuid]; }; + nodbi = derive2 { name="nodbi"; version="0.9.8"; sha256="1ypwxy560pgn5zza1fv6ip0wh1y872lrf7a1blk2lvwf1q38dlkr"; depends=[DBI jqr jsonlite stringi uuid]; }; node2vec = derive2 { name="node2vec"; version="0.1.0"; sha256="03gfpn4xgmdwlrpwi9pdpnh6k75mwp85j6vywkj0jsxhz3rbg95g"; depends=[data_table dplyr igraph rlist vctrs vegan word2vec]; }; - nodeSub = derive2 { name="nodeSub"; version="1.2.5"; sha256="11a744gdfb2lwya01g1gg4165f692hjwym40r0rdi1y4l0jk8l8h"; depends=[ape apTreeshape assertthat babette beastier beautier DDD geiger mauricer pbapply phangorn phylobase rappdirs Rcpp Rmpfr stringr testit tibble tracerer]; }; - nodiv = derive2 { name="nodiv"; version="1.4.1"; sha256="05ryspls03nwap54501mcxnhgvqpnf08c6iad6xcq056qi5glxp2"; depends=[ape picante raster sp vegan]; }; + nodeSub = derive2 { name="nodeSub"; version="1.2.7"; sha256="08ai25fkvnc026hif096f2389m553xqrcz08fkp2yjgavv5rrai6"; depends=[ape babette beastier beautier DDD geiger lifecycle mauricer pbapply phangorn phylobase rappdirs Rcpp Rmpfr stringr testit tibble tracerer]; }; + nodiv = derive2 { name="nodiv"; version="1.4.2"; sha256="1yz2ynn7cfwjim3bmwvf4v7fflghc2kfx9frwz2m85l9pcr3qlx0"; depends=[ape picante raster sp vegan]; }; nofrills = derive2 { name="nofrills"; version="0.3.2"; sha256="1sclrzn7m0r4pxmv9vs0ay0l892p6kdz3yzdqwfkzzp8z45n6yzk"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.3"; sha256="18n2pmjmx1xqmshfvan1s7hlaciz05xhplg8zphcjhm2hfq7svv2"; depends=[]; }; noise = derive2 { name="noise"; version="1.0.1"; sha256="0xqcg79v03d5x783pby6gqxrhylm67xk4ic9ib4jmjyrrbqklad1"; depends=[preprocessCore]; }; @@ -13999,9 +14024,10 @@ in with self; { noisyCE2 = derive2 { name="noisyCE2"; version="1.1.0"; sha256="02zkkyys9qknwm39gz4j4pvlvkd5qlvxqaprklzsd40dgz39cwq4"; depends=[magrittr]; }; noisySBM = derive2 { name="noisySBM"; version="0.1.4"; sha256="1zdkxr48kvpqs49figxxznq3d45nalja92lyal71m066s1blc6dg"; depends=[ggplot2 gtools RColorBrewer]; }; noisyr = derive2 { name="noisyr"; version="1.0.0"; sha256="05nvxz5qa4lsi62va74yq4m68nlacjkl8xj5nsq7dik3357y53dr"; depends=[doParallel dplyr foreach GenomicRanges ggplot2 IRanges magrittr philentropy preprocessCore Rsamtools tibble]; }; + nolock = derive2 { name="nolock"; version="1.0.4"; sha256="1n62fjnscfflvxya4j2km2vbg352gw3irlh8p2mrfil8k157vpnp"; depends=[crayon pacman rstudioapi stringr]; }; nombre = derive2 { name="nombre"; version="0.4.1"; sha256="16hpr628j8rzxg5k71qsgc9xhz1w4gpi3fry5vp1mbwvalmlish2"; depends=[fracture]; }; - nomclust = derive2 { name="nomclust"; version="2.6.2"; sha256="16pxv2vqikias18835crjfx5yignckvrw4imwqi18463mg6y7v9b"; depends=[cluster Rcpp]; }; - nominatimlite = derive2 { name="nominatimlite"; version="0.2.0"; sha256="1p5pl3jgshyhvx5cxi9rf2qr8kd2l9ll7gxfhbj6vxbs9hh1mrcw"; depends=[dplyr jsonlite sf]; }; + nomclust = derive2 { name="nomclust"; version="2.8.0"; sha256="1bl92zaf4iidm48xjxj0v812lx7gk3i3frvb59xr71y91ranwjpv"; depends=[cluster clValid Rcpp]; }; + nominatimlite = derive2 { name="nominatimlite"; version="0.2.1"; sha256="1lz4bnml9vs8rc7p71kiwwr0g38lvawbhsfj62a5cy8g1fxpghjw"; depends=[dplyr jsonlite sf]; }; nomisr = derive2 { name="nomisr"; version="0.4.7"; sha256="0mf301nhsl71h79jxfkwa27j5nifsxp7y6vxbnx87rybr80b3hg1"; depends=[dplyr httr jsonlite rlang rsdmx snakecase tibble]; }; nomnoml = derive2 { name="nomnoml"; version="0.2.7"; sha256="0dbn03agq02d28agzgwz92m2lr76c7xzpa7p5bj684fzw7zsks3w"; depends=[htmlwidgets lifecycle png rlang webshot]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; @@ -14015,9 +14041,9 @@ in with self; { nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.12"; sha256="0fdyr7a5pac40wrrn6frj0q8pn03dic5a2rls3zr85yj48mimyfs"; depends=[lifecycle Matrix Rcpp RcppArmadillo tseries zoo]; }; nonmem2R = derive2 { name="nonmem2R"; version="0.2.4"; sha256="1lnm2mniccpsk30njmi0b18aizblg5wadm3k2kdviyxi8j2735rw"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; }; nonmem2rx = derive2 { name="nonmem2rx"; version="0.1.2"; sha256="0z4mx08ajnqsq6lqhkvskxsiskpm05c5095mc874774s04qzs8by"; depends=[checkmate cli crayon data_table digest dparser ggforce ggplot2 lotri magrittr qs Rcpp rxode2 rxode2parse xml2]; }; - nonmemica = derive2 { name="nonmemica"; version="1.0.1"; sha256="06fn7iwc30la2k6ib9zr7hvlygbh0267rnk1ybys4swq4jdmmigd"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonmemica = derive2 { name="nonmemica"; version="1.0.8"; sha256="000pjp7zk3pw7xhg0w8363b1q52l6ikqjpvdxjd1kb61y99bi6m2"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6-1"; sha256="1ppwv5yad8v7qhjr4z5p5vl51ry3sxqbmg0ynkx11j67byggn6xf"; depends=[Rcpp]; }; - nonnest2 = derive2 { name="nonnest2"; version="0.5-5"; sha256="1ddaqwx8i3ygwvxf11mc8xhgk4nkvnail99nr5szq8i168752zq2"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; + nonnest2 = derive2 { name="nonnest2"; version="0.5-6"; sha256="1s31a03c148azvc20ihmz8vhzgs7a3r0nxzf806zsr5j1zsl94dm"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonpar = derive2 { name="nonpar"; version="1.0.2"; sha256="0gflldd3kjbpdlvbwi073igj6shcqr9g5x6zcp5gfa12404qpflq"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-13"; sha256="04ya0b4nwfcyw7asby8j5npa59p8w8ri3cifpigvqmdg47v9kzmc"; depends=[geometry Hmisc lpSolve]; }; nonparametric_bayes = derive2 { name="nonparametric.bayes"; version="0.0.1"; sha256="1acrjh0fcr15b9k2hpg0ihfav0w2lzjdpjyayz3f4hx596j32vi8"; depends=[mvtnorm progress]; }; @@ -14026,12 +14052,12 @@ in with self; { nor1mix = derive2 { name="nor1mix"; version="1.3-0"; sha256="1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w"; depends=[]; }; nord = derive2 { name="nord"; version="1.0.0"; sha256="1gisqca85vzbqq5hs5bgqjgrjyksxj176x97kv9vv6mwll8kijl9"; depends=[ggplot2]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; - norgeo = derive2 { name="norgeo"; version="2.1.6"; sha256="072mx0kmfn01gpdy48l7889i10kjr675bvwk3d87jldzls6y1pwb"; depends=[data_table DBI httr jsonlite magrittr odbc RSQLite writexl]; }; + norgeo = derive2 { name="norgeo"; version="2.3.1"; sha256="1437b49ig7j5c3ympb8mjn0qz43szpmwqd3s8rlqmlfhycnh9maw"; depends=[data_table DBI httr2 magrittr odbc RSQLite writexl]; }; norm = derive2 { name="norm"; version="1.0-11.1"; sha256="1g33g721c0f2b275b334ir6n0h81fh567vs9vrxk60y21z1ydzy2"; depends=[]; }; - norm2 = derive2 { name="norm2"; version="2.0.4"; sha256="0ahz6x59k00pqalzjc3ajiby1ysmarjssga9amwh9vd6vmzzyfb7"; depends=[]; }; normalizeH = derive2 { name="normalizeH"; version="1.0.0"; sha256="19lychfrv57yk245rzais4hx17csz1s6wm5vk6p7ypr6h9slf2cq"; depends=[]; }; normalp = derive2 { name="normalp"; version="0.7.2"; sha256="0fqpz6v9v3xjmyh7mh2yvkjdn3v4d0nk93x7s0gj28kazl7137kz"; depends=[]; }; normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; }; + normfluodbf = derive2 { name="normfluodbf"; version="1.4.3"; sha256="0slmkqpqi3c3mrjd0ybg2bij1cgrn03ixs6mizjq048r3qbxgipq"; depends=[data_table foreign tibble tidyr]; }; nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; }; nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; nortsTest = derive2 { name="nortsTest"; version="1.0.3"; sha256="0wn4xljczy4z9j95mxisi7gyn2j262zzhp2skz4wj8c5kxj1pc6g"; depends=[forecast ggplot2 gridExtra MASS nortest tseries uroot zoo]; }; @@ -14041,11 +14067,12 @@ in with self; { notebookutils = derive2 { name="notebookutils"; version="1.5.1"; sha256="0f1vwc4y91k3yxsbbr7c47z3gwr3zk9dlyp3xx2ggrk4nnqhlafb"; depends=[]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; novelforestSG = derive2 { name="novelforestSG"; version="2.0.0"; sha256="0mpf645gimahn1sayminas2fam839s8v05g8qkxjywr4gdq5wflz"; depends=[]; }; + novelqualcodes = derive2 { name="novelqualcodes"; version="0.13.0"; sha256="0mgmjd7zrknnsg8a4kjkdk98pnm0z1k73mim40ivb1qfp0pxmn0g"; depends=[ggpattern ggplot2 naturalsort readxl]; }; noweb = derive2 { name="noweb"; version="1.1-2"; sha256="1h0v92l5jzgiy5rz33pan1l6rb3mykckmvn5c8jm3hhph6ipgqad"; depends=[]; }; np = derive2 { name="np"; version="0.60-17"; sha256="0dkz8aing2zdah83sjs874cxgwyzx82x60idziqfbhjf4g5mfyfr"; depends=[boot cubature quadprog quantreg]; }; npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; - npROCRegression = derive2 { name="npROCRegression"; version="1.0-6"; sha256="122sy722wbslmd0yq5gc9zs87ng45zlwcsfvl962czk3yncrn1bv"; depends=[lattice]; }; + npROCRegression = derive2 { name="npROCRegression"; version="1.0-7"; sha256="0fl10gj6s09gfmb7wl1y62fr49qnckjqxbzhjkyx029v9klbfvp7"; depends=[lattice]; }; nparACT = derive2 { name="nparACT"; version="0.8"; sha256="0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b"; depends=[ggplot2 stringr zoo]; }; nparLD = derive2 { name="nparLD"; version="2.2"; sha256="0c5iih0hy25kpg781sxmgq6x68g46ymsqjcg4lh3sff5bw5x08lk"; depends=[MASS]; }; nparMD = derive2 { name="nparMD"; version="0.2.1"; sha256="0wfmw1d4w8frbimq62749siy28bzci3h3lhsl5jx7zl7mxpl0q9a"; depends=[Formula gtools MASS matrixcalc matrixStats]; }; @@ -14069,19 +14096,18 @@ in with self; { nplyr = derive2 { name="nplyr"; version="0.2.0"; sha256="0n9pl6igjpdvsp39d7h5xr64c1ixlhc8bcxpbl70mz95p7jrld8h"; depends=[assertthat dplyr purrr rlang tidyr]; }; npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; }; npmlreg = derive2 { name="npmlreg"; version="0.46-5"; sha256="1f0bzccmral2y56aih37gmi6mjww6wmp2a8z6yxm501fgj2lgzfc"; depends=[statmod]; }; - npmr = derive2 { name="npmr"; version="1.2"; sha256="073i9zcnyp8l5fxblx2sfyn0b4lr6i595q6kl6ispvzmylwqj8na"; depends=[]; }; + npmr = derive2 { name="npmr"; version="1.3"; sha256="1h5cqbkmmswnmaf0b67akiybab9zpi1nvjj5wkdxiwiss7n1an7z"; depends=[]; }; npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; }; npordtests = derive2 { name="npordtests"; version="1.2"; sha256="1axzcyy45h3rs67m0i3cvwbmza1mnmraxan9j4zlpxdd5x9nz4h8"; depends=[]; }; nppbib = derive2 { name="nppbib"; version="1.2-0"; sha256="1nn6wf89jhr3gy4rcd6px0cd5b1bsr7pbaxng4adba8n3yrss7vs"; depends=[]; }; - npphen = derive2 { name="npphen"; version="1.5.2"; sha256="1d585rz07ldmmfcsrb11nl2f7jry2p0cc5dm8vlwr1jv7ag0r9y5"; depends=[ks lubridate raster rgdal snow]; }; + npphen = derive2 { name="npphen"; version="2.0.0"; sha256="17q9zhh7abpsddb25km1y6kyijlf6lh8j43lqv58jsjig98rrk6w"; depends=[ks lubridate terra]; }; npreg = derive2 { name="npreg"; version="1.0-9"; sha256="10pgcjhiannvxkbsw3ywkjzmgsq2m7dqwqhxkfcdnbc052n7s6di"; depends=[]; }; npregderiv = derive2 { name="npregderiv"; version="1.0"; sha256="1k873cs3rs15l13z8017n4anacandx7di6yk1zlamcc5p3vlh59n"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.2"; sha256="1d2p23qqwa06rxfl5v9bcvq2j6pcsvjywq74qgrflkjk45g2kjb5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; nprobust = derive2 { name="nprobust"; version="0.4.0"; sha256="1vry64r3xms6xls6bqq918prjyhs5svhl2yjvq0jxycaaqw2sgyp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; - nprotreg = derive2 { name="nprotreg"; version="1.1.0"; sha256="0krzfxy4nlzwd9dgfk9wds3h7yhdsfyh4mw28kvp39xsj7qrp186"; depends=[foreach]; }; + nprotreg = derive2 { name="nprotreg"; version="1.1.1"; sha256="152z2wsm4gwqw51imk80vxg9spvl9293vqsja8d8gh1rmsm6m5r2"; depends=[foreach]; }; npsf = derive2 { name="npsf"; version="0.8.0"; sha256="011y8k3sdhhgzf4yn0wdxx55yv4kdpgyhj0bbm6krjdpphnr9557"; depends=[Formula Rcpp]; }; - npsp = derive2 { name="npsp"; version="0.7-11"; sha256="17nadnxwp8jm68sqsa4yvhbllw0p8csicsipi7mdw9gfx0cc5dzx"; depends=[quadprog sp spam]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npsurv = derive2 { name="npsurv"; version="0.5-0"; sha256="1ihxhb42cga1hssj2jv4ah0f4hlwsky899ij5261fzh1wxvdp1xw"; depends=[lsei]; }; npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; }; @@ -14089,11 +14115,11 @@ in with self; { npwbs = derive2 { name="npwbs"; version="0.2.0"; sha256="029vxc6iy1p6nv0vw6097rvpkwlf0a24643gr6dbycpbail9qlqg"; depends=[]; }; nrba = derive2 { name="nrba"; version="0.2.0"; sha256="0vlc0w2x2rpddgwxsr5zi2kgfzpvnkfskznjm2q77svigpb3lpc2"; depends=[broom dplyr magrittr survey svrep]; }; nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; }; - nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; }; nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; }; nsarfima = derive2 { name="nsarfima"; version="0.2.0.0"; sha256="0sv63anrsh0ajfvvkb44zsvc7sxws3xpsgwxqa951gy98w8h58g5"; depends=[]; }; nscancor = derive2 { name="nscancor"; version="0.7.0-6"; sha256="1fcw3qpsc7kpg2ha1qkp2277ir2kyhy71vjwypfp49y7nqiwm7kh"; depends=[]; }; nse = derive2 { name="nse"; version="1.21"; sha256="0mw2ijc6z0l8sa7z5fbcapp1rl87zhh5v32iw1mcjw4khwc93bk7"; depends=[coda mcmc mcmcse np Rcpp sandwich]; }; + nser = derive2 { name="nser"; version="1.5.0"; sha256="0l03qkh6b2n2vq4piz583vb3b8jmgh1m5rm47fs2w2faqxxs2y9f"; depends=[curl dplyr googleVis lubridate magrittr purrr readr reticulate rvest stringr xml2]; }; nseval = derive2 { name="nseval"; version="0.4.3"; sha256="07pabn4msb6q50x67z84flb8fpzf43s1dy61cnqd7rn4l7zgc181"; depends=[]; }; nsga2R = derive2 { name="nsga2R"; version="1.1"; sha256="1b3kkd1mi6g13bl2mkzqyvz0ki296fa9pv055r8mpkdm6gk12lb4"; depends=[mco]; }; nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; }; @@ -14103,20 +14129,21 @@ in with self; { nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; }; nswgeo = derive2 { name="nswgeo"; version="0.3.3"; sha256="0nny1dh0c3nkwglqi6rgwgri8hx1h66bzfpy388bjcyc31nkmihr"; depends=[cartographer sf]; }; nsyllable = derive2 { name="nsyllable"; version="1.0.1"; sha256="1rxzfivg5pkx8485l4bxxrdnvik31g5jps5l386x0w7mfs6498jg"; depends=[]; }; - ntdr = derive2 { name="ntdr"; version="0.3.1"; sha256="0fc63vbc9mwhzk3csz7ydr63x433xd5n4j9szjxp6i7l1w73p530"; depends=[dplyr lubridate purrr readxl rvest tidyr]; }; + ntdr = derive2 { name="ntdr"; version="0.3.3"; sha256="1v8lwsp9c81pg0i140fc9zfng6cf4a0p0jyc2k8gdg7hsl9dwks1"; depends=[curl dplyr httr lubridate purrr readxl rvest tidyr]; }; + ntsDists = derive2 { name="ntsDists"; version="1.0.0"; sha256="1vjzqbwqdg8drgbsxazlaalmzb2phsb9261pmpkiy4k0fcan7qzj"; depends=[]; }; nucim = derive2 { name="nucim"; version="1.0.11"; sha256="12qfs4xd8lnkjhb0gkvxym07rndrwh5idvppj16v78amrk96rj5z"; depends=[bioimagetools EBImage fields stringr]; }; nullabor = derive2 { name="nullabor"; version="0.3.9"; sha256="19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tsibble viridis]; }; numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; }; numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; }; numKM = derive2 { name="numKM"; version="0.2.0"; sha256="0g5jw12fmfc6nl6a3ghpslkjd2d7pbihl70sks35r7dalmr6ihzk"; depends=[survival]; }; - numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; + numOSL = derive2 { name="numOSL"; version="2.7"; sha256="05h73s5xspccx0wr8g5a7a3m3gnhj4qvisjykl4dwmsh80gh1r95"; depends=[]; }; numbat = derive2 { name="numbat"; version="1.3.2-1"; sha256="1b9bykgw3z7a8bky5yv2g402gdapv8kcla2kbbyqvs77x4wba4q4"; depends=[ape caTools data_table dendextend dplyr GenomicRanges ggplot2 ggraph ggtree glue igraph IRanges logger magrittr Matrix optparse parallelDist patchwork pryr purrr R_utils Rcpp RcppArmadillo RhpcBLASctl roptim scales scistreer stringr tibble tidygraph tidyr vcfR zoo]; }; numberofalleles = derive2 { name="numberofalleles"; version="1.0.1"; sha256="0rjl21844yqp2503gy71c6vg8xywc4lcx7qr9vwvkjw5wiwxls11"; depends=[partitions pedtools Rcpp ribd]; }; numbers = derive2 { name="numbers"; version="0.8-5"; sha256="02r2mlq3jygvwi7anbrrid6693qc7iklxhc9ksmqjdlmgzdxxmbp"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; numform = derive2 { name="numform"; version="0.7.0"; sha256="0n96jm141h4awazr8sads9d99faw8kdy3vbhmjr58d8iqf7793f8"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.2"; sha256="0wmprgibx9jzaav93m3kqx1h8cflvx287yjfi3b8pvmgna7q8fsy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; - nutrition = derive2 { name="nutrition"; version="1.0.0"; sha256="0jxpa4wxjcv0j03xq5g97bm1czx0d5mm2rixgckncfjijy5c092j"; depends=[]; }; + nutrition = derive2 { name="nutrition"; version="1.1.0"; sha256="061rgb8vdpq971k3g0jhr0mq6gqib25rz010b5sbq9ynb5x66995"; depends=[]; }; nvctr = derive2 { name="nvctr"; version="0.1.4"; sha256="1r7q9snr9ya1586fwbyvnk8rlb9yikl4yp3bn9kni0sw820npk1d"; depends=[magrittr pracma]; }; nvmix = derive2 { name="nvmix"; version="0.1-0"; sha256="12lhch9sib2nx8j7500dchfi27fvpabbcdkcw9qh194fx22ycknx"; depends=[ADGofTest copula Matrix mnormt pcaPP pracma qrng]; }; nycflights13 = derive2 { name="nycflights13"; version="1.0.2"; sha256="07aa76c77pm1wpzkwjmzv8n6ir5i6fxawx8wx586gwc5wajcb1qf"; depends=[tibble]; }; @@ -14135,7 +14162,7 @@ in with self; { oaxaca = derive2 { name="oaxaca"; version="0.1.5"; sha256="1z3sbkgzaqq6n1bz0f17gqrbfjbm8bp20384ryx3jq2v50b6gbry"; depends=[Formula ggplot2 reshape2]; }; obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; }; obcost = derive2 { name="obcost"; version="0.1.0"; sha256="1i2a4xzgagx9f8fs1jh9pgmvsd7hkyhhr3dj349fijbis6fvq6v5"; depends=[dplyr tidyr]; }; - obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.1"; sha256="1pnlbfsp5fjvhwn2yl495v38g1wjg5l4ry79i1a2jznq2l91hn4p"; depends=[crayon matrixStats readr Rfast stringr tibble]; }; + obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.2"; sha256="1scd63giywfbvpynbxbk0kq01rwhx62416dibs5gky15dxfcsvmk"; depends=[crayon matrixStats readr Rfast stringr tibble]; }; objectProperties = derive2 { name="objectProperties"; version="0.6.8"; sha256="02rbxp2w0q6sr3zvgj99a4hi8dldn57isvimfhqjm1j8yc8p3afz"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.3"; sha256="087hknxhw3zqxrzdazbqw9zxi01dvrzcgm6k1i7r231vvvm6nxid"; depends=[]; }; objectremover = derive2 { name="objectremover"; version="0.8.1"; sha256="0qywigwb6r5lzvw8ylgriwignk4ayfkvfnmc6cb1yxsg0hrc4hiv"; depends=[miniUI shiny]; }; @@ -14146,18 +14173,19 @@ in with self; { oc = derive2 { name="oc"; version="1.2.1"; sha256="0g4ij5g2xkkd73srm21b2xc170rgwbdsdx2qjkp3pr30axb0bf91"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; occCite = derive2 { name="occCite"; version="0.5.6"; sha256="08bc0pi2i2fmc9fcmir150b7g8jnd58q3qaakw2gk25yjy14rp7j"; depends=[bib2df BIEN curl DBI dplyr ggplot2 htmltools httr leaflet lubridate RColorBrewer rgbif rlang RPostgreSQL stringr taxize tidyr viridis waffle]; }; - occUncertain = derive2 { name="occUncertain"; version="0.1.0"; sha256="0rlcwiy45kx9168g7bf1hkz9rkbpfgn7b085lzksg97f05hij52z"; depends=[ConR knitr rgdal]; }; + occumb = derive2 { name="occumb"; version="1.0.2"; sha256="1q4vfk9i3wk9hjm297rj3xw051ny6vqdx6zl32i7c9n7gyyk1dwm"; depends=[checkmate crayon jagsUI knitr]; }; occupancy = derive2 { name="occupancy"; version="1.2"; sha256="0j50vg1405n1hp72xqsq1hp3gdbfx5yq9w1zdv6dzjc6vjhbx00d"; depends=[matrixStats]; }; - occupationMeasurement = derive2 { name="occupationMeasurement"; version="0.2.0"; sha256="0igqh8gwpdmrb47k6s7bhyjjjs3qy1g1nx27i6rsbyw52n97sdvm"; depends=[data_table digest shiny stringdist stringr text2vec tm]; }; + occupationMeasurement = derive2 { name="occupationMeasurement"; version="0.3.2"; sha256="03kq8sbcbb1swnc7rl2qqzmvlhfb7n5ba8q546v657cm35h15rr9"; depends=[data_table digest shiny stringdist stringr text2vec tm]; }; ocd = derive2 { name="ocd"; version="1.1"; sha256="06pyc352pvn85k76z9797gwk0ksbb3snvh6krysp68k3lcygq872"; depends=[]; }; oce = derive2 { name="oce"; version="1.8-1"; sha256="0ryykzrlmqipqnjizxzyq084kibpfxid9m7k287ycfmli1d0m492"; depends=[gsw Rcpp]; }; - oceCens = derive2 { name="oceCens"; version="0.1.1"; sha256="03rk7lw8bkd0z0hiwvh5akbvw54bjay84989rznkgcmiljxbxpr4"; depends=[survival]; }; - oceanexplorer = derive2 { name="oceanexplorer"; version="0.0.2"; sha256="1n8lxhnq7asfjlpgjs3xwngnc9dyk4q5yb2jn0kpb87i214z68hs"; depends=[bslib dplyr DT fs ggplot2 glue maps miniUI ncmeta purrr rlang RNetCDF rstudioapi sf shiny shinyFeedback shinyjs stars thematic waiter]; }; + oceCens = derive2 { name="oceCens"; version="0.1.2"; sha256="1ckp89n22scmjli30x99iaxgyk41a27v1n9gxjp9n29y66lw71nb"; depends=[survival]; }; + oceanexplorer = derive2 { name="oceanexplorer"; version="0.1.0"; sha256="07l2la7nrqj8bsyv0flyjs08wishlvq6v2hx5n1g9kag4bcfl6vz"; depends=[bslib dplyr DT fs ggplot2 glue maps miniUI ncmeta purrr rlang RNetCDF rstudioapi sf shiny shinyFeedback shinyjs stars thematic waiter]; }; oceanic = derive2 { name="oceanic"; version="0.1.6"; sha256="12lrn13xfrxny8nqhjh5qg61bx1y8akyqxf7slbpg9npbwp04f1n"; depends=[broom ggplot2 maps sf sp spData]; }; oceanis = derive2 { name="oceanis"; version="1.8.5"; sha256="13zdzqjlf5pihji6np9a3m2j5ycy4jvfl75knzry2ir78zr9ngj7"; depends=[classInt dplyr DT ggplot2 htmlwidgets leaflet leaflet_extras lwgeom sf shiny shinyBS shinyjs shinythemes stringr webshot zip]; }; - oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; + oceanmap = derive2 { name="oceanmap"; version="0.1.5"; sha256="1g2d1irs1dki25p33lrhlnpaf77p91m3jsmc1hwznd7f876ggfh7"; depends=[abind extrafont fields ggedit ggplot2 lubridate mapdata maps ncdf4 plotly plotrix raster reshape2 sf sp]; }; oceanwaves = derive2 { name="oceanwaves"; version="0.2.0"; sha256="1v4gj4ippv1l3r77z2ic19x5zi5lpsh5wihaqay3264zhpb3kv9a"; depends=[bspec ggplot2 signal]; }; ocedata = derive2 { name="ocedata"; version="0.2.2"; sha256="0yj90gaaacq6d53di2vz23za5sz9wy2j626ib3cbdhvxg731pizk"; depends=[]; }; + ocf = derive2 { name="ocf"; version="1.0.0"; sha256="04d0j863a2zqj3v9s9iwlc4v7fxpp6cydpphxcfr6n22f8ciq5bd"; depends=[glmnet Matrix orf ranger Rcpp RcppEigen stringr]; }; ockc = derive2 { name="ockc"; version="1.1"; sha256="1iqv9vjdcv96a8k5ccrh6r3jpjq39g4g0qjhb4hzvfv17p28rpcb"; depends=[flexclust modeltools]; }; oclust = derive2 { name="oclust"; version="0.2.0"; sha256="08247vcjs7hhzbj69f2x39n5y5ycns0qd7pdlvpwyn4j7yd1ji31"; depends=[dbscan entropy MASS mclust mixture mvtnorm]; }; ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; @@ -14165,7 +14193,7 @@ in with self; { ocs4R = derive2 { name="ocs4R"; version="0.2-3"; sha256="09zl9jl1kzvyq0wccp41j32pr3as93qh250iaawhwkpcswjpyl89"; depends=[curl httr jsonlite keyring openssl R6 XML]; }; octopus = derive2 { name="octopus"; version="0.3.0"; sha256="1b71xjnjksz21v4dp0fwq90hsv09ab1wifz4x903qbgvbiv4ig8i"; depends=[bslib DBI dplyr DT glue httr janitor rio shiny shinyAce shinyjs]; }; octopusR = derive2 { name="octopusR"; version="1.0.1"; sha256="1hah1zphwrvj1kx344s9nxq8bw4q358fz9j487hi6dkfhjvg7j21"; depends=[askpass cli glue httr2 rlang tibble]; }; - od = derive2 { name="od"; version="0.4.0"; sha256="1mnf2dl3zj7zamibnv8ai0z2wbbwplzvjbzq3mswj6jc7386ja43"; depends=[sfheaders]; }; + od = derive2 { name="od"; version="0.4.2"; sha256="07qfpl4nm9s1ixpi87riwq9kj1v3p1qmcfyvmw2v14v04hzg9c22"; depends=[sfheaders vctrs]; }; odbc = derive2 { name="odbc"; version="1.3.5"; sha256="0mvqf0my25djxvpx809rbm7484f0m6bpf8bqmg0c04avfiqg2c5i"; depends=[bit64 blob DBI hms Rcpp rlang]; }; oddnet = derive2 { name="oddnet"; version="0.1.0"; sha256="00r6pl0s715gk7sybl725sriqdpddabxhnjjz4y51vzl5fwwfcyv"; depends=[dplyr fable fabletools igraph lookout pcaPP rlang tibble tidyr tsibble]; }; odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; }; @@ -14176,27 +14204,28 @@ in with self; { odeGUTS = derive2 { name="odeGUTS"; version="1.0.2"; sha256="0ra9svfwdvsil5hqbmyxhnz80zm905v1m2lm8s5cbkjkfs5fsnls"; depends=[deSolve dplyr magrittr tidyr zoo]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odetector = derive2 { name="odetector"; version="1.0.1"; sha256="094i6ykv3s0c5yhdnlgpkz1wb6pr9k6r3vsh7zgkxyy5iayi6dlv"; depends=[ppclust]; }; - odin = derive2 { name="odin"; version="1.2.4"; sha256="0m8afhbpjdcdscgw7ngsdr7n8qpxicn3pqjrsjbwi4hrk5aii7ry"; depends=[cinterpolate deSolve digest glue jsonlite R6 ring withr]; }; + odin = derive2 { name="odin"; version="1.2.5"; sha256="1fczgf3x35inlyhkw1h4mf8j9alrv4w98b9jfmbc2a9q29gi161p"; depends=[cinterpolate deSolve digest glue jsonlite R6 ring withr]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; odns = derive2 { name="odns"; version="1.0.2"; sha256="0a2ifmyrsfih5a7jwc0b6l9wl7c1s5x08fq5bfm27xm9jnb8fwsn"; depends=[data_table glue httr jsonlite]; }; odpc = derive2 { name="odpc"; version="2.0.5"; sha256="0cbkq8parb8br1j386xk5mgwz8gkmwvp79f9sjvzhs7z6wlbp0pv"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.4.4"; sha256="037v6523kbl0izfzyg6lp6h4r5p8w23dp8r1fpx07wyr34q2w8vn"; depends=[]; }; + oeli = derive2 { name="oeli"; version="0.1.0"; sha256="16aw16gv9i6yy3hz9kidy2wrg0pwdq99wkqcn7q9skm8dvvi9yhd"; depends=[checkmate cli ggplot2 hexSticker Rcpp RcppArmadillo showtext sysfonts testthat usethis]; }; oem = derive2 { name="oem"; version="2.0.11"; sha256="0p9s68zgma9mcjnz0xg6h07yp38rqj209asg18hji8528iazbv8g"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; oenb = derive2 { name="oenb"; version="0.0.2"; sha256="1jgxw7ycx2lcdzglg9nix8k08fs4r6i5jdsjzrd6w1dg6smsinl5"; depends=[dplyr XML]; }; oesr = derive2 { name="oesr"; version="0.1.0"; sha256="078jjvm9d0g8jaab0x2z4h7h8m2pznamiglhkwv07xc65cskjmpb"; depends=[broom dplyr estimatr extrafont ggplot2 rlang sandwich tibble]; }; oews2020 = derive2 { name="oews2020"; version="1.0.0"; sha256="0qan0dw6v25219xxij8ra36ccdvz21n4c1025dnb36rgb63wa3kg"; depends=[]; }; oews2021 = derive2 { name="oews2021"; version="1.0.0"; sha256="0b03jqn7bz528qky6h35h3kxr6pnfqpllc4h2lgpf790slsfc054"; depends=[]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; - officedown = derive2 { name="officedown"; version="0.3.0"; sha256="086wx177n5yar531n6l2dxwq009ns5x14f4dhf9gd96f12fq4wra"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; }; - officer = derive2 { name="officer"; version="0.6.2"; sha256="0dfk1didy5lfh07chqfwlrdlrib7a5na65rb71ipnxlhbiwbaj09"; depends=[openssl R6 ragg uuid xml2 zip]; }; + officedown = derive2 { name="officedown"; version="0.3.1"; sha256="0ymidhrnbk8z7ni4y0ngizyc7d3f35nmhmhpfqw8jg9faizich8z"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; }; + officer = derive2 { name="officer"; version="0.6.3"; sha256="0z3phawwxj4h1pwzw8lsl6pnypr77b329mg6r2qnzmj0j81585z5"; depends=[openssl R6 ragg uuid xml2 zip]; }; offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ogrdbstats = derive2 { name="ogrdbstats"; version="0.5.0"; sha256="140i4wippqr1260a1c4syg6lfspkf9q8rifnalf6iaaqx2bz4yfq"; depends=[alakazam argparser Biostrings bookdown ComplexHeatmap data_table dplyr ggplot2 gridExtra magrittr RColorBrewer scales stringdist stringr tidyr tigger]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohoegdm = derive2 { name="ohoegdm"; version="0.1.0"; sha256="1p1jica3fr4a5ilz1m2gxyzbapxjvgiw4v5rn90d5qgsmbp1hj42"; depends=[Rcpp RcppArmadillo]; }; - ohsome = derive2 { name="ohsome"; version="0.2.1"; sha256="1lakhx2f84ffgirzxwjbi9nfp6q28idp1i73f1x7cm83l32l2fss"; depends=[geojsonsf httr jsonlite readr sf]; }; + ohsome = derive2 { name="ohsome"; version="0.2.2"; sha256="0zw4r1sv46mfxzbp620a00wsh9i1dc21lmf1iadsdm4iss8pjk44"; depends=[geojsonsf httr jsonlite readr sf]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; - ohun = derive2 { name="ohun"; version="0.1.0"; sha256="1i8ri0fsy15m23j0h3g58i1qm0icz7k5f03k5lrg3c7jz9a8l7jn"; depends=[crayon fftw igraph knitr pbapply RCurl rjson rlang seewave Sim_DiffProc sp tuneR viridis warbleR]; }; + ohun = derive2 { name="ohun"; version="1.0.0"; sha256="09rx31ij775si18b4pfl11djfzzrpf1j324kbldhdq94kz18mf8f"; depends=[checkmate cli fftw ggplot2 igraph rlang seewave sf tuneR warbleR]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; ojsr = derive2 { name="ojsr"; version="0.1.2"; sha256="0nwdws9kqnya9qjc939b7ksrf7ri6d25zzcdxhyhabirhnrqdg7m"; depends=[dplyr magrittr purrr rlang rvest tidyr urltools xml2]; }; okxAPI = derive2 { name="okxAPI"; version="0.1.1"; sha256="0wysfpkij9l265clw6qi4zpr1c860idxfp82xz2nmy1l5b2n8ri0"; depends=[base64enc data_table digest httr jsonlite R6 websocket]; }; @@ -14209,12 +14238,11 @@ in with self; { omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; omicsTools = derive2 { name="omicsTools"; version="1.0.5"; sha256="0k6cpdxafz6x5360m97x8mvvi09mb36yx42slkq6nr4axpm089pf"; depends=[bs4Dash config dplyr DT golem magrittr readr shiny tibble]; }; omicwas = derive2 { name="omicwas"; version="0.8.0"; sha256="03l53vbsard0hpaffcaa9l1aa3nh3w16j00k2jz2jqrrg02z0d7h"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats purrr rlang tidyr]; }; - omnibus = derive2 { name="omnibus"; version="1.1.3"; sha256="09sy56x8730ilv4szg4gzvgrh9vps3brsysvcssg4s6fidssinhn"; depends=[]; }; - omopr = derive2 { name="omopr"; version="0.2"; sha256="1ng94jnarj7pszxzvdlnrr2dbcvv5p5yrscjw6ihqkskpraw9f7w"; depends=[DBI dbplyr dplyr RSQLite]; }; - ompr = derive2 { name="ompr"; version="1.0.3"; sha256="01ph26d4lxvmzmb9lhc8rn235crpcc4xcag8wfrsxcv7r0jz6wka"; depends=[data_table fastmap lazyeval listcomp Matrix rlang]; }; - ompr_roi = derive2 { name="ompr.roi"; version="1.0.1"; sha256="0hgqanpijc31vlj3cnwx2fkr6i5y5wrl0ib7nxcz2pz1yb3gxwbg"; depends=[Matrix ompr ROI slam]; }; + omnibus = derive2 { name="omnibus"; version="1.2.7"; sha256="1wqhizr19w6kx1gb1p34arr23m2272chfyaf5bpb8rqjb9zkswdz"; depends=[]; }; + ompr = derive2 { name="ompr"; version="1.0.4"; sha256="02glc09yrdvwls0i8ik1wh6fp3qa9ry55xd3yy3xk0rav8r3hcj3"; depends=[data_table fastmap lazyeval listcomp Matrix rlang]; }; + ompr_roi = derive2 { name="ompr.roi"; version="1.0.2"; sha256="1w0cyw5ixkri8523vdcfrlaf49farhgdf1bxiizwk5gppb3w5ibl"; depends=[Matrix ompr ROI slam]; }; omsvg = derive2 { name="omsvg"; version="0.1.0"; sha256="018sphpmmgpq5alag0il83q51f3r3jx3pnnzjrvg4gn6691nkwvz"; depends=[dplyr gt htmltools magrittr rlang sass xml2]; }; - omu = derive2 { name="omu"; version="1.1.0"; sha256="1ha1x0df5wb4lajid3w6ab52w1jhhflfp1kp88gjhg9h2kch7prl"; depends=[broom caret dplyr FSA ggfortify ggplot2 httr magrittr plyr randomForest rstatix stringr tidyr]; }; + omu = derive2 { name="omu"; version="1.1.1"; sha256="0hkm6m6jbzbbh0ksnzkwjf6fvyzx64mixwq4rjbj0n2a1rl3mc4d"; depends=[broom caret dplyr FSA ggfortify ggplot2 httr magrittr plyr randomForest rstatix stringr tidyr]; }; onadata = derive2 { name="onadata"; version="0.1"; sha256="0l7fqskgqm421mcijmbbb1xgi99y1j673qil5r9whwfdxk78xgqc"; depends=[]; }; onbabynames = derive2 { name="onbabynames"; version="0.0.1"; sha256="13sp9gnqnsx2b8dq13qnkin813clnanh6hzv3vi7bxy514pvmisj"; depends=[tibble]; }; onbrand = derive2 { name="onbrand"; version="1.0.3"; sha256="1kqi84b91vqgsx5h3k690qn6hfxssj8fh72bvsqbk1x819sdk77w"; depends=[dplyr flextable ggplot2 magrittr officer rlang stringr yaml]; }; @@ -14229,62 +14257,62 @@ in with self; { onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; }; onemap = derive2 { name="onemap"; version="3.0.0"; sha256="0h5bi4zyiglic60msrkfny28k1rb7avqbs87ipzwwayb452b970c"; depends=[dendextend dplyr ggplot2 ggpubr htmlwidgets plotly princurve RColorBrewer Rcpp rebus reshape2 smacof tidyr vcfR]; }; onemapsgapi = derive2 { name="onemapsgapi"; version="1.1.0"; sha256="0q1i17dkgcxqswa9wckxzsf1wr118zsw7yhbrbkbikvm27hqrrva"; depends=[dplyr furrr future httr purrr rlang stringr tidyr]; }; - onetime = derive2 { name="onetime"; version="0.1.0"; sha256="17snjkldm11ry5f1mp18jkmlw7hk0zw5yl1qrmakh1lx7fq1326v"; depends=[filelock rappdirs]; }; - onewaytests = derive2 { name="onewaytests"; version="2.7"; sha256="1434ra36rmkjiw8q5d7cbzkhy7kvq5bnx6s1pfy319p6zcy083nd"; depends=[car ggplot2 moments nortest]; }; + onetime = derive2 { name="onetime"; version="0.2.0"; sha256="1yyi8r8dniavsjlqmj5z9x52av2qz0iz01i2r7qx69apqbkwd57b"; depends=[filelock rappdirs]; }; + onewaytests = derive2 { name="onewaytests"; version="3.0"; sha256="0qmzgg869pdj3sfi8znd02z62px9n04fxl1psrfw8mxl4ainp0v7"; depends=[car ggplot2 moments nortest wesanderson]; }; onion = derive2 { name="onion"; version="1.5-0"; sha256="07q5wwphb6jsk7ya7hgsf5782yalvhyc7h43hsd9rg4rhpmy8in9"; depends=[emulator]; }; onlineBcp = derive2 { name="onlineBcp"; version="0.1.8"; sha256="1pwpnmpgh3hl8mv1pbn577dn832nxbsfaxn3hqghvs4dn06lwngf"; depends=[VIM]; }; onlineCOV = derive2 { name="onlineCOV"; version="1.3"; sha256="04ikvsd76f6xhja7djyv433m88lfj2vf0y9qi6x1s4i9kh8xkbz9"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; - onlineforecast = derive2 { name="onlineforecast"; version="1.0.1"; sha256="0cpwb6bx1qcf05rbi5ycdpgmfb0c5lvhki1c77kzhds5bn3gw5k4"; depends=[digest pbs R6 Rcpp RcppArmadillo]; }; + onlineforecast = derive2 { name="onlineforecast"; version="1.0.2"; sha256="0qj9943hmcf584b7czf877zg5rxz8byg97dkk3gnb57q5ar60f3z"; depends=[digest pbs R6 Rcpp RcppArmadillo]; }; onlineretail = derive2 { name="onlineretail"; version="0.1.2"; sha256="0lid3g4v51c664304cxgjm209qxv88hqglv89frmj4afc0y6k7sc"; depends=[]; }; onls = derive2 { name="onls"; version="0.1-2"; sha256="19pgrhr7xzas4s592l4sgv1dfynf3s3d227zwcdv6z6wrxh40hyj"; depends=[minpack_lm]; }; onmaRg = derive2 { name="onmaRg"; version="1.0.3"; sha256="0n4gf8fx6c4abwxcajz8bpsfvgl42dflb99wfn4632csag1a50rl"; depends=[dplyr httr readxl sf stringr]; }; onnx = derive2 { name="onnx"; version="0.0.3"; sha256="1s0swrcff9v9ffbjkraahmb398gh2jrca2wf5k6gs8037frnl8wd"; depends=[reticulate]; }; onpoint = derive2 { name="onpoint"; version="1.0.4"; sha256="06zdgxcizw66l9ll8g1wsbrj0c4zl8zp2z7l2cn4sz45kr3qkvfg"; depends=[ggplot2 spatstat_explore spatstat_geom spatstat_random]; }; onsr = derive2 { name="onsr"; version="1.0.1"; sha256="0qazwqdbbinsrimn7rf7xcjz5l5zp372i5j54rp87xy098q7c0l3"; depends=[httr jsonlite readr tibble]; }; + onsvplot = derive2 { name="onsvplot"; version="0.3.2"; sha256="06jkq25ivi8qn3c46616a7z47g2qfjpvnfwlzjx8shw4c36j5737"; depends=[ggplot2]; }; ontoFAST = derive2 { name="ontoFAST"; version="1.0.0"; sha256="0l3d8bp86849rp0qrs1dfv7bjmrfdqvahb1x656vk69fi20722ma"; depends=[dplyr ontologyIndex pbapply plyr shiny shinydashboard stringr sunburstR usethis visNetwork]; }; ontologics = derive2 { name="ontologics"; version="0.7.0"; sha256="1ggdnydxl5xdh8vjjxna778d3c3wvw1rcvvjdcnrllms8i30cvga"; depends=[beepr checkmate dplyr fuzzyjoin httr magrittr purrr rdflib readr rlang stringr tibble tidyr tidyselect]; }; ontologyIndex = derive2 { name="ontologyIndex"; version="2.11"; sha256="17ndvqvb74b980gpb3hpg9bd68bb5f52k9s1i2kd1f9cdrdjvw97"; depends=[]; }; ontologyPlot = derive2 { name="ontologyPlot"; version="1.6"; sha256="0n51x2im134wq3a54wrv02j1pgkpm1qcgb9hd0y6fchz43i039j1"; depends=[ontologyIndex paintmap Rgraphviz]; }; ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.5"; sha256="035z572lbsfcnr9c0hl8gir1kgk0dw8dxzr3v8dqd93k6jr6kaxb"; depends=[ontologyIndex Rcpp]; }; - oolong = derive2 { name="oolong"; version="0.4.3"; sha256="0hasipsr0mpr02c2g8m1yb2yz0fwnz2ix3y8b5216qhyapdv5h8s"; depends=[cli cowplot digest ggplot2 irr keyATM purrr quanteda R6 shiny tibble]; }; + oolong = derive2 { name="oolong"; version="0.5.0"; sha256="1if27qswf17614pn94vx5pcmg1j55wvjkmrf63zdyfw4a7sapsc8"; depends=[cli cowplot digest ggplot2 irr keyATM purrr quanteda R6 shiny tibble]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.3"; sha256="0gdp7bghgpz3q0h06w8r926x7wkpcvkpyf0v5qfi1qixbpvk5fdf"; depends=[]; }; ooplah = derive2 { name="ooplah"; version="0.2.0"; sha256="1p74jh9g62yicrw0lhpbn0diqi2myl24z28kpd2b3mglyffadr0b"; depends=[R6]; }; - oosse = derive2 { name="oosse"; version="1.0.5"; sha256="0xa14c7wxkaj8qww3jsw26x3rwayqvpf7qcsw2xaz80j56ss4w9p"; depends=[BiocParallel Matrix Rdpack]; }; + oosse = derive2 { name="oosse"; version="1.0.10"; sha256="186vj059bxlywka1y8i4pgh4xbl3mx1mwh9c1wfb4dd37yirp35k"; depends=[BiocParallel doParallel Matrix Rdpack]; }; oottest = derive2 { name="oottest"; version="0.9.1"; sha256="1y0k0jcncjkcgfxybs2yyfcc7ywa49jnalrw8mn7m04h58gqg77x"; depends=[]; }; opGMMassessment = derive2 { name="opGMMassessment"; version="0.3.5"; sha256="09ii297524q2bgw2iqvd4s5bhnmm6gm5dh4lxskq1yxynfqdl77r"; depends=[AdaptGauss caTools cluster ClusterR DataVisualizations DistributionOptimization doParallel dplyr foreach ggplot2 mclust mixAK mixtools multimode NbClust rlang]; }; opa = derive2 { name="opa"; version="0.8.1"; sha256="1dh7lzprcaz0j24npvmx7rr8yn8nlr5dp77zr4mmhwgv6912mv24"; depends=[Rcpp RcppArmadillo]; }; - opalr = derive2 { name="opalr"; version="3.3.1"; sha256="194ljy4d7id7q5nif6llh34fxpx6s3x5i3m2grixy3i512apqsm0"; depends=[httr jsonlite labelled mime progress]; }; + opalr = derive2 { name="opalr"; version="3.4.0"; sha256="0gc677px1kwvwhkgqpwgg18nwi4hl76c98a2das404966x320dk3"; depends=[httr jsonlite labelled mime progress readr tibble]; }; opdisDownsampling = derive2 { name="opdisDownsampling"; version="0.8.2"; sha256="0laf24x2h6xwhd5wwcwi1iqg5gni29bmlfr86yrvpdrdgr7f4cha"; depends=[benchmarkme caTools doParallel foreach memuse pracma twosamples]; }; openCR = derive2 { name="openCR"; version="2.2.5"; sha256="003xhwskxjh0m9mvp8sdkbjmcb0i0wya1s8d8frnzgsbim2ymi22"; depends=[abind BH MASS nlme plyr Rcpp RcppParallel secr stringr]; }; - openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; depends=[data_table ggplot2]; }; + openEBGM = derive2 { name="openEBGM"; version="0.9.1"; sha256="19q5xlvgc91mcr6sjzppgkmvdlfb6cr7rs952i2yys3w7ylwk3bj"; depends=[data_table ggplot2]; }; openMSE = derive2 { name="openMSE"; version="1.0.0"; sha256="15jp9hybnkwmnkcqawhpd3y3imq6wfxxzxzh90yx4cvzky36hf89"; depends=[crayon DLMtool MSEtool SAMtool]; }; openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; - openSTARS = derive2 { name="openSTARS"; version="1.2.3"; sha256="1xpba5bagq16n1k94izshdizqyx99mad1nx2w77ljznmx5qrpqa6"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; openSkies = derive2 { name="openSkies"; version="1.1.6"; sha256="03nlbmxp36z82myrbamwl1zngsnfxfw80niisapv53n605p4lrg1"; depends=[cluster dbscan ggmap ggplot2 httr magick R6 ssh xml2]; }; openVA = derive2 { name="openVA"; version="1.1.1"; sha256="1qnp9p25xlphf4ns6p27l0ylk169zi831l5ww2pw4ilw1dvmhk21"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openai = derive2 { name="openai"; version="0.4.1"; sha256="1fi1nc9c7kfnig6b5ifpb1v9r3gxszk984rwyq7i1lb6s5jv0b9z"; depends=[assertthat glue httr jsonlite lifecycle magrittr]; }; - openair = derive2 { name="openair"; version="2.17-0"; sha256="1bvwi6avr25bxxdinh918jqjfvxja8njd069lcabk7fwfm0g675q"; depends=[cli cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tibble tidyr]; }; + openair = derive2 { name="openair"; version="2.18-0"; sha256="1hvwb6p5skwpi1i5gvag3kxzvzxi9f4mph53y3gr6r0s8azfnvz0"; depends=[cli cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tibble tidyr]; }; openairmaps = derive2 { name="openairmaps"; version="0.8.0"; sha256="18acrnb57cmq7z4sxnyjaa1nc8l52wa9fijgcb30garz8lhlldab"; depends=[cli dplyr forcats ggmap ggplot2 ggtext leaflet lifecycle lubridate magrittr mgcv openair purrr rlang sf stringr tibble tidyr tidyselect]; }; - openalexR = derive2 { name="openalexR"; version="1.2.0"; sha256="01i33yxs708xcm993v1kzpyrxgcnmjzjjis5k1147dsajp2fas8k"; depends=[httr jsonlite progress tibble]; }; + openalexR = derive2 { name="openalexR"; version="1.2.2"; sha256="0f8kdw25428rw6rgcng0vy4paw08mqzlnk11p8c5gi9f7bx40vw6"; depends=[httr jsonlite progress tibble]; }; openbankeR = derive2 { name="openbankeR"; version="0.1.1"; sha256="04jh3nnp53dzbk96dcz0xi67jqmp66mzbj81cy8mhhd2rl5ry9cj"; depends=[dplyr glue httpcode httr jsonlite magrittr tidyr]; }; openblender = derive2 { name="openblender"; version="0.5.81"; sha256="01akixxj04kgrxhv04icrivfpnipnpg9j62i3y19q3jkl9846lh1"; depends=[httr jsonlite]; }; opencage = derive2 { name="opencage"; version="0.2.2"; sha256="1sjkpp6cj6ivd68p6ql6vwgdvy0fwfkjv84wgwgb4i7f4mnxgnff"; depends=[crul dplyr jsonlite lifecycle memoise progress purrr ratelimitr rlang tibble tidyr withr]; }; opencpu = derive2 { name="opencpu"; version="2.2.11"; sha256="1hdvfbzc8xmv8hrmchad590f91s4vq1nq83wi2ffh4n7q6ixr03s"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes rlang sys vctrs webutils zip]; }; - opencv = derive2 { name="opencv"; version="0.2.3"; sha256="1kpkw3wkvfs2g9pdkk0s9q7a3pq3vq7n9hw55bz0v9c2mmdcz92b"; depends=[magrittr Rcpp]; }; + opencv = derive2 { name="opencv"; version="0.3.1"; sha256="1za5smc5c9zaqi5xwlpj53f990szhw9mqhh6qcmfnr1yddp43cgi"; depends=[magrittr Rcpp]; }; opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.5"; sha256="1fiviazs0ydxvmsqaayhwnxf4wl4sx1psn8i5mpis7218d9ihagy"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openeo = derive2 { name="openeo"; version="1.3.0"; sha256="002zrvrm417ix80vrqnl2wygqh0vjymfi5hl88v6ajfspp9r73qn"; depends=[base64enc htmltools httr2 IRdisplay jsonlite lubridate R6 rlang sf]; }; openintro = derive2 { name="openintro"; version="2.4.0"; sha256="1svvlhdnv8dvqwphsn83asfd5xzvvar2bz334aqndqx76dv9j88j"; depends=[airports cherryblossom ggplot2 readr rmarkdown tibble usdata]; }; - openmeteo = derive2 { name="openmeteo"; version="0.2.1"; sha256="0fnqy3l3s5119vw8abmp1ldn44047m3p40js5r41yf03i56lxd29"; depends=[dplyr httr testthat tibble tibblify tidyr yaml]; }; + openmeteo = derive2 { name="openmeteo"; version="0.2.3"; sha256="0fzl1cb5pzdg5gs2fz60i04mkinrgvjclybgfyjz5zf8i86z9fgl"; depends=[dplyr httr testthat tibble tibblify tidyr yaml]; }; openmetrics = derive2 { name="openmetrics"; version="0.3.0"; sha256="0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82"; depends=[R6]; }; opensensmapr = derive2 { name="opensensmapr"; version="0.6.0"; sha256="0inq86zrkax281wh5rj3pxjp3lgrhsqvma0p6kvizb5c7cwws5in"; depends=[digest dplyr httr lazyeval magrittr purrr readr]; }; - openssl = derive2 { name="openssl"; version="2.1.0"; sha256="0fg5avcrjjn7sv6rzbp19y6jwjjr77xpldxg4xssp5s1p832wnk2"; depends=[askpass]; }; + openssl = derive2 { name="openssl"; version="2.1.1"; sha256="1p2bnr4z4vx3yqq5isqb3z4d9vg2isiz8i0h3vxdb5ramzwjd9zs"; depends=[askpass]; }; opentripplanner = derive2 { name="opentripplanner"; version="0.5.1"; sha256="04qf01jy675glwnxjf430z43c9hi5dxjv6g2h85ny778hzvhq087"; depends=[checkmate curl data_table geodist googlePolylines progressr purrr RcppSimdJson rjson sf sfheaders]; }; openxlsx = derive2 { name="openxlsx"; version="4.2.5.2"; sha256="0rwvzhk2brhbf1cdpg5jmwiwx5jhr9ybzvnhw0pg4bl3wpkqjw7f"; depends=[Rcpp stringi zip]; }; - openxlsx2 = derive2 { name="openxlsx2"; version="0.8"; sha256="01hv3jwmzprcq6w4bwzkzyn6b2mq3w4vn1xfjlwvy3bywggx5zdx"; depends=[magrittr R6 Rcpp stringi zip]; }; + openxlsx2 = derive2 { name="openxlsx2"; version="1.1"; sha256="07hlilx98ma0hms84pwcmz9hzga8kx5488lmizhzvlg6ldh7xfnl"; depends=[magrittr R6 Rcpp stringi zip]; }; opera = derive2 { name="opera"; version="1.2.0"; sha256="09gh0c74y3n25f9p1rya8ybql5mfaqkcnr8i8wwwzfm67vqdfrnh"; depends=[alabama htmltools htmlwidgets pipeR rAmCharts Rcpp RcppEigen Rdpack]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; @@ -14308,26 +14336,26 @@ in with self; { optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; }; optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; }; - optimLanduse = derive2 { name="optimLanduse"; version="1.1.2"; sha256="0vrn794y6fp02ara6xa1vlfx7vim0gbx5bc1pkns2fh76gqpsa4n"; depends=[dplyr lpSolveAPI tidyr]; }; + optimLanduse = derive2 { name="optimLanduse"; version="1.2.0"; sha256="16dd6sq9ss0k2kzqp02jcxsmg3qi5mvvk85nqy2hlpij2hdmh8bj"; depends=[dplyr future future_apply lpSolveAPI tidyr]; }; optimParallel = derive2 { name="optimParallel"; version="1.0-2"; sha256="178ayfaivkbxkghxbg97lx4gl27kxkmgaaw9y8q5206r4cncd6qg"; depends=[]; }; - optimStrat = derive2 { name="optimStrat"; version="2.3"; sha256="1jkwhgpw7nknd7h8c01z25x566bw2qb388i6g5nwcygxsshdgpri"; depends=[cubature mvtnorm shiny]; }; + optimStrat = derive2 { name="optimStrat"; version="2.4"; sha256="0p52ly7yfz9jjlhd5912xdv1j01j1ccm57ygp9nz3rks7fi3b5r5"; depends=[cubature mvtnorm shiny]; }; optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; }; - optimall = derive2 { name="optimall"; version="0.1.2"; sha256="1lq1pd8ns6ivffp5kh3w1vczdwp41mgsywlaykyc7vb6j55qycy4"; depends=[dplyr glue magrittr rlang tibble]; }; + optimall = derive2 { name="optimall"; version="0.1.3"; sha256="191y1q55wvg6f68siz6axpg056hww8bs4i4gxyj6fn1jkg0x2x7c"; depends=[dplyr glue magrittr rlang tibble]; }; optimbase = derive2 { name="optimbase"; version="1.0-10"; sha256="0hdzbqr03jwy1vz3q9iw0kvii5p9g1vm4c3hs3jxszcj1rgrfm12"; depends=[Matrix]; }; optimg = derive2 { name="optimg"; version="0.1.2"; sha256="0fc7d3g5nxjjcbwh6v5m0ryhanw80v250j8m7j2gv4c9ql4g650d"; depends=[ucminf]; }; optimization = derive2 { name="optimization"; version="1.0-9"; sha256="1pg9a78hhm0h4pfagj13r1dmynv714knhw2dxhzhcvlgk9inpam8"; depends=[colorspace Rcpp]; }; - optimizeR = derive2 { name="optimizeR"; version="0.3.2"; sha256="0wm3sikncr3aqdcpnfs1i564izsag116gkh14facdz5j10ichg8s"; depends=[cli glue]; }; + optimizeR = derive2 { name="optimizeR"; version="0.3.3"; sha256="10f5qncn4ngwcvwcw1p81spj9y0zi2w9alvh267v1l28m2pa68q4"; depends=[cli TestFunctions]; }; optimos_prime = derive2 { name="optimos.prime"; version="0.1.2"; sha256="1a76gfzpd2s4gq15cd3frndak7wc6q3xqh9sllkk665031fx6z1h"; depends=[ggplot2 plotly tidyverse]; }; optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-8"; sha256="1q5hfbiq265q5im6wg78spaqsfj421hpzh8bz51zmi188h6xwnwr"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; - optimx = derive2 { name="optimx"; version="2022-4.30"; sha256="045ls1vl1392ihwln6mngz0zg2w93ym1m607vfrg8v1949x8isgb"; depends=[numDeriv]; }; + optimx = derive2 { name="optimx"; version="2023-8.13"; sha256="00w8h450gs8vf0raghjg2818xzj4gz5jr3hwk9m9zc5k3rwmcf8n"; depends=[nloptr numDeriv pracma]; }; optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; optional = derive2 { name="optional"; version="2.0.1"; sha256="1q7k9rsa7m3ag7mwx88101ksy0c01gk0xl0425jfkwm0d4g5pyy0"; depends=[magrittr]; }; options = derive2 { name="options"; version="0.0.2"; sha256="11x18vicg7g3hpjiyhn4hb20g7zccn1bj74q39sh5il3v0wpkbg9"; depends=[]; }; optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; }; optiscale = derive2 { name="optiscale"; version="1.2.2"; sha256="1ay2lfk4isv0gir5diwxlx4ml5bv5qyqbwm34py85fp6bh92987r"; depends=[lattice]; }; - optistock = derive2 { name="optistock"; version="0.0.1"; sha256="1nyz64bfi4s10i4mq7crdkn3b3zqr674vfxkdd3kphjqk0wmiv1j"; depends=[]; }; + optistock = derive2 { name="optistock"; version="0.0.2"; sha256="1wl637hgdhiyk56xv39bb8m4v6nnlqyy6vgkradf90k084m9q52p"; depends=[]; }; optmatch = derive2 { name="optmatch"; version="0.10.6"; sha256="0d8xrq6b2dkr78dk25rikmsypfd2vsvv8y9pmsfv7gfzgxb62xib"; depends=[dplyr Rcpp rlemon tibble]; }; optparse = derive2 { name="optparse"; version="1.7.3"; sha256="1v87db7fm494dwxvdsnl1m2kj84nplq7pkh0g41najhx0npy31v2"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; }; @@ -14340,13 +14368,14 @@ in with self; { orclus = derive2 { name="orclus"; version="0.2-6"; sha256="0d78mn2vl2yxlvdswyxkxp9zg59b8cvfksz9m56kddn79aps1ikl"; depends=[]; }; orcutt = derive2 { name="orcutt"; version="2.3"; sha256="0pj7pqzbcg4gp35nsz3avyawmx69dgj0l2w0x8ypw5qwl4zhmnyk"; depends=[lmtest]; }; ordDisp = derive2 { name="ordDisp"; version="2.1.1"; sha256="0906y98ydiadyqhz9ad2ssw1282a10c418k20vkbwzad2xip7grg"; depends=[VGAM]; }; - ordPens = derive2 { name="ordPens"; version="1.0.0"; sha256="1q6v3xkaahpzkycjnn75a62narwj4g86ha9m786nfp941ql44vlr"; depends=[glmpath grplasso mgcv quadprog RLRsim]; }; + ordPens = derive2 { name="ordPens"; version="1.1.0"; sha256="1837d2rz42y71yq9rzzkc5pkywvyc4zbk7s4kg4kwrvxysg0y6p1"; depends=[glmpath grplasso mgcv ordinalNet quadprog RLRsim]; }; ordbetareg = derive2 { name="ordbetareg"; version="0.7.2"; sha256="12z5ig4m62fy6j76anidj6gpy0g2xcr35yv0xv0avgi57wf4rpwv"; depends=[brms dplyr gganimate ggplot2 tidyr transformr]; }; ordcrm = derive2 { name="ordcrm"; version="1.0.0"; sha256="1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw"; depends=[rms]; }; ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; }; orderly = derive2 { name="orderly"; version="1.4.3"; sha256="0k7xk64schhw9jdbg50hlnf6gfhlgnv1n20rz3fga02z38441xkn"; depends=[crayon DBI digest docopt fs gert ids R6 RSQLite withr yaml zip]; }; orders = derive2 { name="orders"; version="0.1.7"; sha256="1rn5pjfshinv4nqja9aw8cl3y33vgdd3xgn20q72h8gii5isrfps"; depends=[actuar gamlss_dist Newdistns VGAM]; }; orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; + ordgam = derive2 { name="ordgam"; version="0.9.1"; sha256="0flldxv53qyiprq44670b4b98i791si3nmi983pgkzd8s39aa68l"; depends=[cubicBsplines marqLevAlg MASS Matrix mgcv numDeriv sn ucminf]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; ordinal = derive2 { name="ordinal"; version="2022.11-16"; sha256="14yld28vjmvxbwz6mapfri4vrj3nsf9p73fn2z80j6jkz8fsv22l"; depends=[MASS Matrix nlme numDeriv ucminf]; }; ordinalClust = derive2 { name="ordinalClust"; version="1.3.5"; sha256="0hmqvhrmijgzanh08z5v82a07zl7xm69wl8zzj99fksahyrgxjdc"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; @@ -14369,11 +14398,11 @@ in with self; { orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; }; orientlib = derive2 { name="orientlib"; version="0.10.5"; sha256="05xwx040l1ln06rkmsg8l4394b3inaf663mw4fng54wwacgv9jfj"; depends=[]; }; origami = derive2 { name="origami"; version="1.0.7"; sha256="0b66alm1mr6vsgj5cgliqxw8vpm1x504qs42crlf0n6339a38h5l"; depends=[abind assertthat data_table future future_apply listenv]; }; - origin = derive2 { name="origin"; version="1.1.0"; sha256="132ccdh40rz2rxabqjfjrmhpjrm5b5hm9zfqm3qwssgligf30vg3"; depends=[cli rstudioapi]; }; + origin = derive2 { name="origin"; version="1.1.1"; sha256="0m10x4d8qh67davyznx759blrb548jk8d7my2zc285yax0d6wp5z"; depends=[cli rstudioapi]; }; orloca = derive2 { name="orloca"; version="5.3"; sha256="09xsas6qpv00p63n17yd95p88v4rcwwmp187n3y3p0nx9q3y3vrf"; depends=[knitr png rmarkdown ucminf]; }; orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; }; ormBigData = derive2 { name="ormBigData"; version="0.0.1"; sha256="1rq202k4assmij21bjjk1ba7121p5p3rp21k548cc6lk81xj1rcc"; depends=[benchmarkme doParallel foreach Hmisc iterators rms SparseM]; }; - ormPlot = derive2 { name="ormPlot"; version="0.3.5"; sha256="1q9jhg1r815llrz12gdxmdqb4x11kk3ph3pp41da72969hsiw73l"; depends=[ggplot2 gtable rms]; }; + ormPlot = derive2 { name="ormPlot"; version="0.3.6"; sha256="0fr1g2lkzc50y79f1czkagcavnq1kfmk6qxg05gqj07jc66mvici"; depends=[ggplot2 gtable rms]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.3"; sha256="1ar70xk2bqk7jgckfivgp4np3dxaynmgdg41n8x0sg9cpxl2lc38"; depends=[oro_nifti]; }; oro_nifti = derive2 { name="oro.nifti"; version="0.11.4"; sha256="01mn90qxb7i15zr83xrl2cn4akayfzpm83r5x71zczz3qb9gbr7g"; depends=[abind bitops RNifti]; }; oro_pet = derive2 { name="oro.pet"; version="0.2.7"; sha256="0drk4mlacg443y5qljyp5jrq3lcr08qmsxnr8mgp93cxrdlwvr1i"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; @@ -14384,14 +14413,15 @@ in with self; { orthopolynom = derive2 { name="orthopolynom"; version="1.0-6.1"; sha256="1ig2pyyibbynwmhapbicij5g47acnz8npjm46xnjybskcv96wjpc"; depends=[polynom]; }; osDesign = derive2 { name="osDesign"; version="1.8"; sha256="0l5dq8rj4rg4v324610kj2j5nv7py6z1jcplhb6br1gvldj7ng1d"; depends=[]; }; osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; }; - oscar = derive2 { name="oscar"; version="1.1.7"; sha256="0w2qcv82gw58fhhdlb9pjl3d8k2ivhlfw2cnbh9bz1vz5ycgsd9z"; depends=[hamlet Matrix pROC survival]; }; + oscar = derive2 { name="oscar"; version="1.2.1"; sha256="1khyl3y8rpyn0skn45wcl1saa713fh48fv6vh3hfgyf46j8ibgra"; depends=[hamlet Matrix pROC survival]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; osfr = derive2 { name="osfr"; version="0.2.9"; sha256="0gbkg6hlip2bkwifsgvnaimrmi1pamaxf8xv7g0yxw5wdf8zyy5c"; depends=[crul fs httr jsonlite memoise purrr rlang stringi tibble]; }; oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; oskeyring = derive2 { name="oskeyring"; version="0.1.6"; sha256="1fsgz4jln3nk53bxpmjpc7dcapc9j1wdqlrab169ymvrlzypgvqc"; depends=[]; }; - osmdata = derive2 { name="osmdata"; version="0.2.3"; sha256="0ca8r35m77h7cjrbj4vhwdrn53i3p0qq4m907jl915zrw3gvvsrj"; depends=[curl httr2 lubridate magrittr Rcpp reproj rvest tibble xml2]; }; - osmextract = derive2 { name="osmextract"; version="0.4.1"; sha256="03bxdkykp081q3d9n14y0qp31vnllc4rzp2ldzs4s572xfcjd1hb"; depends=[httr jsonlite sf]; }; - osqp = derive2 { name="osqp"; version="0.6.0.8"; sha256="15zd0byk8vy899hm7kd0hpx84hnr84ynai29mr7frraamr2l00ql"; depends=[Matrix R6 Rcpp]; }; + osmclass = derive2 { name="osmclass"; version="0.1.3"; sha256="16vpb1fq93s386anvyl6i8ynk5mijs0c40sh86lcpmp9wmdb6msp"; depends=[collapse data_table stringi]; }; + osmdata = derive2 { name="osmdata"; version="0.2.5"; sha256="0073dnnznq479ffnizrv8wqmfiv3gmdmmlkmkh1hxgr7p32v1i4z"; depends=[curl httr2 lubridate magrittr Rcpp reproj rvest tibble xml2]; }; + osmextract = derive2 { name="osmextract"; version="0.5.0"; sha256="0fapfydxgm9wliqqapjdrpcj7w4f1s9k8ff8nw6hki8hh5hyrk4x"; depends=[httr jsonlite sf]; }; + osqp = derive2 { name="osqp"; version="0.6.3.2"; sha256="0i1jh3fr8d45b7inq9s6iyqszhh18hps8jpzkm0hzgj2k8r3nm0q"; depends=[Matrix R6 Rcpp]; }; osrm = derive2 { name="osrm"; version="4.1.1"; sha256="05zvsmgrfg8143cma3xr2c758a7lbabsb53sxzw5xkc7z19amfyb"; depends=[curl googlePolylines mapiso RcppSimdJson sf]; }; osrmr = derive2 { name="osrmr"; version="0.1.36"; sha256="1vnf6g1d9fjckz9ay910nb9gr1km2adwk3b0k460mxvpr36izkh7"; depends=[assertthat bitops R_utils rjson stringr]; }; otargen = derive2 { name="otargen"; version="1.0.0"; sha256="05h7nsgnb742rix6l4wnlyp87bs6baii6j69phdba5cjss5d6m8c"; depends=[cli dplyr ggiraphExtra ggplot2 ggrepel ghql janitor jsonlite magrittr rlang stringr tibble tidyr]; }; @@ -14403,8 +14433,8 @@ in with self; { otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; }; otsfeatures = derive2 { name="otsfeatures"; version="1.0.0"; sha256="1akny7bdls9ddvkpm906ih9h7bc5sgnj03z7kkzbpy703d1y6krr"; depends=[astsa Bolstad2 ggplot2 latex2exp Rdpack]; }; ottr = derive2 { name="ottr"; version="1.4.0"; sha256="0wl1053xk94ra4y24cnwpixz8igj7c3qy05yhfcb5wkpkvj52k9s"; depends=[jsonlite R6 testthat zip]; }; - ottrpal = derive2 { name="ottrpal"; version="1.1.1"; sha256="07nn49h8a7ag4kk7dibh3idhg5sf0xg3qxbczb8d9hvxssia6h8x"; depends=[bookdown curl dplyr fs glue httr knitr magrittr purrr R_utils readr rmarkdown rprojroot rvest stringr xml2 yaml]; }; - otuSummary = derive2 { name="otuSummary"; version="0.1.1"; sha256="04l667qmp7wqkbdsk87j92gf89s13090kzs8cjlmxsp6i69r34z2"; depends=[reshape2 vegan]; }; + ottrpal = derive2 { name="ottrpal"; version="1.2"; sha256="03wg6qmkgw7sm8w5q0r1wy7rf8d0m11fmp5dycscnfpd5cipsdf2"; depends=[bookdown curl dplyr fs glue httr jsonlite knitr magrittr openssl purrr R_utils readr rmarkdown rprojroot rvest stringr xml2 yaml]; }; + otuSummary = derive2 { name="otuSummary"; version="0.1.2"; sha256="0zyjycymdlzszaqns5y2507lpy52dhl82wm4frv8nfy4xcwb3yxy"; depends=[reshape2]; }; ouch = derive2 { name="ouch"; version="2.19"; sha256="15ryd76max77zwjlbijj4v7h42mscr4zqg8b01cq3gsr51l8bwkf"; depends=[subplex]; }; outForest = derive2 { name="outForest"; version="1.0.1"; sha256="03m3jfbydagv4skpijz1xjhsydfb0ci2n0qz4zigfys6hxhfzg36"; depends=[FNN missRanger ranger]; }; outbreaker2 = derive2 { name="outbreaker2"; version="1.1.3"; sha256="06wlmf51ciy7zy5nchfn2myvkwrvq44cnzzjl75vz32ixn8iy56v"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; @@ -14424,7 +14454,7 @@ in with self; { owd = derive2 { name="owd"; version="1.0.6"; sha256="08f1zzlnkfdzm5rlw14qm6yvn68j2yas21zjsy31pc59rh3lzkyh"; depends=[]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; - ows4R = derive2 { name="ows4R"; version="0.3-5"; sha256="171amkkjjwf89n80dh2ixnvn0xxf1b64b7qhw1i4ch292jqnwmj0"; depends=[geometa httr keyring openssl R6 sf terra XML]; }; + ows4R = derive2 { name="ows4R"; version="0.3-6"; sha256="1nzvvkixgcqpz0hxzb4fyby5c3rlh0ac3i5q00wz3w3bhhdzrdcb"; depends=[geometa httr keyring openssl R6 sf terra XML]; }; ox = derive2 { name="ox"; version="0.1.0"; sha256="0j0va301bmppvmk6paqaqqaw85h8yf92i3pz7i59f2j8q9im82rx"; depends=[]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.1.1"; sha256="1szifw978qr7v8n178jhg4ap2jwvfnwjl2izbbiydwx8q1fyj2q4"; depends=[jsonlite stringi stringr]; }; oysteR = derive2 { name="oysteR"; version="0.1.1"; sha256="11zg959h9104hh8wid4003s8c4z9xhmicj39cc5vq1j8g1g7ilr7"; depends=[cli dplyr glue httr jsonlite purrr rjson rlang stringr tibble tidyr yaml]; }; @@ -14436,33 +14466,33 @@ in with self; { pBrackets = derive2 { name="pBrackets"; version="1.0.1"; sha256="1rhsl59wqplpx4iavhm133fywkjdsbxw1x60fz22hby0cc9ckg6i"; depends=[]; }; pCODE = derive2 { name="pCODE"; version="0.9.4"; sha256="17igf35324r0dkjff7m4v9zlhsbpw4k1idvgswq3mvv449jvybsa"; depends=[deSolve fda MASS pracma]; }; pCalibrate = derive2 { name="pCalibrate"; version="0.2-1"; sha256="0gi4hjnykn4gbj9krmw4z1qy4lbxkvacczkks3zkwalw9ylwkpxl"; depends=[exact2x2 MCMCpack]; }; - pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; - pGPx = derive2 { name="pGPx"; version="0.1.3"; sha256="1bv8fxy2rhb36201h4r4wx8gd5dsjw597n666mnk51r64wfmj62x"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; }; + pGPx = derive2 { name="pGPx"; version="0.1.4"; sha256="037grwk41z5zdcw6nc004x5hj5s6q8y7zck417ylgyygsvgazhsf"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; }; pGRN = derive2 { name="pGRN"; version="0.3.5"; sha256="1sy5nhwcn516q4pjlg96qqaqvs1ig7ixz4r54n9njkf5z92wnhfw"; depends=[bigmemory doParallel dtw foreach future ggplot2 ggraph igraph lmtest proxy tidygraph visNetwork]; }; pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; pROC = derive2 { name="pROC"; version="1.18.4"; sha256="0lqar1lbm461in4jb9rkdnpccl8lshrhig2qxr892m91mdxym46m"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; - pRecipe = derive2 { name="pRecipe"; version="3.0.1"; sha256="02sn80ab1npwzw4vbdh89i6nnwrc0iflmwxhpigribrihacxpvxp"; depends=[data_table doParallel foreach ggplot2 ggpubr lubridate magrittr ncdf4 openair raster scales sf sp]; }; + pRecipe = derive2 { name="pRecipe"; version="3.0.1-1"; sha256="066rkdzrkh9s714x1fg5rmjikkwmna2d42fzlzgk1xjnn4ypsngh"; depends=[data_table doParallel foreach ggplot2 ggpubr lubridate magrittr ncdf4 openair raster scales sf sp]; }; pRepDesigns = derive2 { name="pRepDesigns"; version="1.1.0"; sha256="1bsdgd6zaywr5bh96khjinp5qrv72ibv9y60v63rqzpkdixdzp5z"; depends=[]; }; pTITAN2 = derive2 { name="pTITAN2"; version="1.0.2"; sha256="1mwx7k8ql4l572xvwb5gns9n4kqk779wwm4sg7nbgzz8xvcdh665"; depends=[data_table]; }; - pa = derive2 { name="pa"; version="1.2-3"; sha256="0qavvrc44x1cmnshynmmygwa7isxnmffbhhg53wcmpmypim9wfi4"; depends=[ggplot2]; }; + pa = derive2 { name="pa"; version="1.2-4"; sha256="0rjq0b68qh5ayn5nd174bw6h7d707fy4kli1zi74vj4yc51z0las"; depends=[ggplot2]; }; pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; packDAMipd = derive2 { name="packDAMipd"; version="0.2.2"; sha256="0n32vqpl6ym9wjwk8apsgkh7i4jin253l1v0gphvy2v1azcpyrc9"; depends=[broom car data_table dplyr effects flexsurv ggplot2 gvlma hash haven IPDFileCheck lme4 lmtest MASS nlme readxl relaimpo reshape2 rlang stringr survival survminer SurvRegCensCov systemfit tibble tidyr tidyverse tm valueEQ5D]; }; packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.9.0"; sha256="1d9plb88d4hic6881ibij888ic3p65d0ijlsyxcghi93ag3wsfj3"; depends=[ade4 doParallel FactoMineR foreach MASS pROC]; }; packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; }; - packageRank = derive2 { name="packageRank"; version="0.8.1"; sha256="11kchs0vcvynx9rxn2cx0vky7616a19rdpdlx2v0b8myp3gs7riv"; depends=[cranlogs curl data_table ggplot2 ISOcodes memoise pkgsearch R_utils RCurl rversions sugrrants]; }; + packageRank = derive2 { name="packageRank"; version="0.8.2"; sha256="1gg2qv9g5lr6sfc2ds4mnr95mw39idvsjhf8afsv2k2r73hb2aya"; depends=[cranlogs curl data_table ggplot2 ISOcodes memoise pkgsearch R_utils RCurl rversions sugrrants]; }; packagefinder = derive2 { name="packagefinder"; version="0.3.5"; sha256="1fxv6q6pla3yfr32z6j5g4f0c0f1f9gsyn4w8bp23692lfpip721"; depends=[clipr crayon formattable htmlTable httr jsonlite lubridate pander reactable shiny shinybusy shinyjs stringr textutils tidyr]; }; - packager = derive2 { name="packager"; version="1.15.1"; sha256="1ah9yynp4f500y5hbb7kgsdcgbniggg0r3bfs4fkzq4b9zahgnn6"; depends=[callr checkmate codetools crayon cyclocomp desc fakemake fritools fs gert httr pkgbuild pkgload rcmdcheck remotes rhub rprojroot tinytest whisker whoami]; }; + packagepal = derive2 { name="packagepal"; version="0.1.0"; sha256="0l49qfxdf54m07dpbj3gb3safh4nbc5hz1vgh4dyqxnkrvmh49xl"; depends=[available cli usethis]; }; + packager = derive2 { name="packager"; version="1.15.2"; sha256="0kvlc0cn3v1wpffh4hn29q8jgfxxg4pcxnfnnhykbx13wilrvrph"; depends=[callr checkmate codetools crayon cyclocomp desc fakemake fritools fs gert httr pkgbuild pkgload rcmdcheck remotes rhub rprojroot tinytest whisker whoami]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="1dgpll7ycn6c8qj9xndi2xrnwsg0mp3ifg11jnlrw4n270444hwi"; depends=[dplyr httr magrittr rappdirs]; }; - packcircles = derive2 { name="packcircles"; version="0.3.5"; sha256="0m8ivgc5y1f9ramqw6sxb02ri6aqxz3av0l5csl32mdldrb126nc"; depends=[Rcpp]; }; + packcircles = derive2 { name="packcircles"; version="0.3.6"; sha256="0fjc575i1vxjp2v4niv2syqqk0d609wm86gkq9rvgmch841x40ps"; depends=[Rcpp]; }; packer = derive2 { name="packer"; version="0.1.3"; sha256="0b51nag4dmjxb8fb6z79j92dx1s6427rhmr2piaqdzrfbk9kd7dh"; depends=[assertthat cli fs htmlwidgets jsonlite roxygen2 rprojroot rstudioapi usethis]; }; - packrat = derive2 { name="packrat"; version="0.9.1"; sha256="0i1kzmjzks6g673jkcqmra0nysviab0r915wkgk8aaad0k316h21"; depends=[]; }; + packrat = derive2 { name="packrat"; version="0.9.2"; sha256="1mvj2s78n2r66nlqq5bjrvgdwlwbcqdj81yryc34sv3y4m1mkpv9"; depends=[]; }; pacman = derive2 { name="pacman"; version="0.5.1"; sha256="0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"; depends=[remotes]; }; paco = derive2 { name="paco"; version="0.4.2"; sha256="0p02fdc5f7d7sbdvxill8jln76p1ndiw95k6s9j41slfriq647vd"; depends=[ape plyr vegan]; }; pacotest = derive2 { name="pacotest"; version="0.4.2"; sha256="0zdrvcrf6ynid2wpngdslxzkpc4grcvrf6bzbrni9rvp94sfzjlf"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; - pacs = derive2 { name="pacs"; version="0.4.10"; sha256="1kchwlpyk2dsvlfx32z8v6h1ky7ac546cwrx0gaxxa9n79xj2ba1"; depends=[curl jsonlite memoise stringi xml2]; }; + pacs = derive2 { name="pacs"; version="0.5.1"; sha256="0vqmck5jajlbn3iazb7s6jpfgbwvl7aa084ag25cahsmajczg2v7"; depends=[curl jsonlite memoise stringi xml2]; }; pacviz = derive2 { name="pacviz"; version="1.0.3"; sha256="17njy4m4hfkrksnicb4dphvdx7kc2fa1lr7mb7vv9cxb4ch32fph"; depends=[circlize e1071 plotrix]; }; padr = derive2 { name="padr"; version="0.6.2"; sha256="0mgjdva2yj9m0mps69gafy3w1c4zhik002b5b2j2zvbv3m34mw97"; depends=[dplyr lubridate Rcpp rlang]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; @@ -14480,15 +14510,15 @@ in with self; { pairsD3 = derive2 { name="pairsD3"; version="0.1.3"; sha256="1w1i9d5pls07zs95ikfzmdm3dr6yw3dy6k1rbkhfqb5g2y9g82zr"; depends=[htmlwidgets shiny]; }; pairwise = derive2 { name="pairwise"; version="0.6.1-0"; sha256="03dvpyr0hdz5a4wdim791m69825q762pwahlv3vwlnqas7niw3mf"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pak = derive2 { name="pak"; version="0.5.1"; sha256="00kn409bgpjbv1dixbaq0m0bfqpdvbq18l3ccqa1wjxph4z88l1h"; depends=[]; }; + pak = derive2 { name="pak"; version="0.6.0"; sha256="0syp0ci3ip9wq3wrlcwxj5vj2madhazgvv6q362flvk28djml1zd"; depends=[]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.1-3"; sha256="121akb42lqzp2vvfj6kjlaxsivxd71r7vnwyg6pcymkin94r8c3k"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; - palaeoverse = derive2 { name="palaeoverse"; version="1.2.0"; sha256="02cfj7v88gk984an23dh63apc2a57362fm7j1y8vvy87kjz58m15"; depends=[ape curl geosphere h3jsr httr pbapply sf stringdist]; }; + palaeoverse = derive2 { name="palaeoverse"; version="1.2.1"; sha256="0jvc6gamlzvam3r2iwgjz02hpj47ya7vacvq2mpqbgc6sbnjmi7k"; depends=[ape curl geosphere h3jsr httr pbapply sf stringdist]; }; palasso = derive2 { name="palasso"; version="0.0.8"; sha256="0cgxfzhp394c8xprc2k0qx9c274bbp0cpazk7xilfrgcgk08156i"; depends=[glmnet Matrix survival]; }; - pald = derive2 { name="pald"; version="0.0.2"; sha256="0xix3sf6zqpl10asad7lhqp6yk9v8kz81pqmxbwb85in5lngz5nr"; depends=[glue igraph]; }; + pald = derive2 { name="pald"; version="0.0.3"; sha256="1d99fr96jy9a65fpn7pdbbwaj3n1dfqqd2s9cs3pr43h14h0ra9g"; depends=[glue igraph]; }; paleoTS = derive2 { name="paleoTS"; version="0.5.3"; sha256="1hpgyjnviw9gzy21rsa4vqkiyfpim5y70yrbjyq5z3ifanszggi5"; depends=[doParallel foreach mnormt]; }; - paleobioDB = derive2 { name="paleobioDB"; version="0.7.0"; sha256="0hgf0ns4mp2war254ysb9rcm4kij1d3xrwkr4s4n2h5in8dz23iq"; depends=[gtools maps plyr raster RCurl rjson scales]; }; paleobuddy = derive2 { name="paleobuddy"; version="1.0.0"; sha256="0kaq6vvzw5h0fpvggmvf6v2zg6a06kxcyajv1krzx0p9482nwyzi"; depends=[]; }; paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; + paleopop = derive2 { name="paleopop"; version="2.1.5"; sha256="1mq7skw5k3b9gc2jkjsdq96ih3qwywwdsq1948101cl0ryh3aadn"; depends=[poems R6 sf trend]; }; paleotree = derive2 { name="paleotree"; version="3.4.5"; sha256="09fi0fq0xpxa4d3k7fhl6rvfc302gzmjrxm979j30ixpa8rypp64"; depends=[ape jsonlite phangorn phytools png RCurl]; }; paletteer = derive2 { name="paletteer"; version="1.5.0"; sha256="1mm0k651356cjasv7wibscw82m1k8mwpp4xafpv66dsq24h28ikl"; depends=[prismatic rematch2 rlang rstudioapi]; }; paletteknife = derive2 { name="paletteknife"; version="0.4.2"; sha256="1m86xzx4qa3hlcp9pqmzd7n9js4nq2xap3lpsjxjqm0w3xsvb65s"; depends=[]; }; @@ -14496,31 +14526,30 @@ in with self; { palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; }; palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; }; palinsol = derive2 { name="palinsol"; version="1.0"; sha256="1xxpi81gf8wb2a3a42akvibrk8319h4x13k19zxjg02qyrq9gsfx"; depends=[]; }; - palm = derive2 { name="palm"; version="1.1.4"; sha256="1h323py9dgdymih9j2wk4r1kib767z7z84h2c3albxxf9b2hvq4f"; depends=[gsl minqa mvtnorm R6 Rcpp]; }; + palm = derive2 { name="palm"; version="1.1.5"; sha256="108w8vsb41j1kwvymjcf5123xi8qiprcpiqynlvvfk1bp24jaz45"; depends=[gsl minqa mvtnorm R6 Rcpp]; }; palmerpenguins = derive2 { name="palmerpenguins"; version="0.1.1"; sha256="1d1h3bfx750is4qqj4w00rcigk9rrdy69bvd5bgqz5y7ls5x8h1a"; depends=[]; }; - palmid = derive2 { name="palmid"; version="0.0.3"; sha256="0bh0p7alcbqkingxbg8gai7bch2cv8q90sfw92y7vj857nl09fh7"; depends=[DBI dbplyr downloadthis dplyr DT ggExtra ggplot2 ggplotify ggwordcloud gridExtra htmltools htmlwidgets leaflet plotly rmarkdown RPostgreSQL scales viridisLite]; }; palmtree = derive2 { name="palmtree"; version="0.9-1"; sha256="06438wla5zm2s8vgip15lfy5gmhwh3wkiak8hsylc8zzkvn698cn"; depends=[Formula partykit]; }; palr = derive2 { name="palr"; version="0.3.0"; sha256="0xb2k4vhlczg4ys1haybrlcpmwhpbfivqg8cfj6mbiir452mb507"; depends=[]; }; - pals = derive2 { name="pals"; version="1.7"; sha256="18pbivmqs9yqsb6p8anv42alny0njaq3dajibhzysax0b7rsk2js"; depends=[colorspace dichromat mapproj maps]; }; - pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; - pamm = derive2 { name="pamm"; version="1.121"; sha256="191f0g90s1m3w68mszmdsdv5yw7xd1vsdbwsfvmyydgxn4261pwk"; depends=[lattice lme4 lmerTest mvtnorm]; }; + pals = derive2 { name="pals"; version="1.8"; sha256="0z6lkvkq7b3wsxvizljf08sjqrdcj33p5kdx6074pc5jv36dylhb"; depends=[colorspace dichromat mapproj maps]; }; + pamm = derive2 { name="pamm"; version="1.122"; sha256="0jd0v3vlq1hrhlyhw008h1jlx9f2nd72ngpyn6km0ay04pnbhkvs"; depends=[lattice lme4 lmerTest mvtnorm]; }; pammtools = derive2 { name="pammtools"; version="0.5.92"; sha256="00g4ffzwj4rc2nl507yzh5zj6pqjksw0igw23m26vxqsa8qdkyfc"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; }; - pan = derive2 { name="pan"; version="1.8"; sha256="1vhk65j10gp9wgjj7j9nyq7wny7hkh0xa91hj47a392qq417m9yi"; depends=[]; }; + pan = derive2 { name="pan"; version="1.9"; sha256="0liwcym035174h6c4b9ddmqxa3vkpkk3alyr9psk8yhv7i61hzp3"; depends=[]; }; pander = derive2 { name="pander"; version="0.6.5"; sha256="144zkq5w7v6fpzk3x40i0baybbp0y6x2ckh4b9qljryas9mhgp9a"; depends=[digest Rcpp]; }; - pandoc = derive2 { name="pandoc"; version="0.1.0"; sha256="11kzgj8hp700y4p5mnxsr6sl0f6wvqnhs6wxl4yhn992jw4warc3"; depends=[fs rappdirs rlang]; }; + pandoc = derive2 { name="pandoc"; version="0.2.0"; sha256="00bmvxvp4rskbjphp93lpwkp58bkqzlglir7my3icdgrbcyxagj3"; depends=[fs rappdirs rlang]; }; pandocfilters = derive2 { name="pandocfilters"; version="0.1-6"; sha256="0y2n49n4ln3ac45176nkdd7407bk5vdc0fpl872nasgsvia0zknk"; depends=[jsonlite]; }; panelPomp = derive2 { name="panelPomp"; version="1.1"; sha256="054nma2h355xd8bazbjrwgxa825qrwfjjwny5m9hry5pyb2vszwm"; depends=[pomp]; }; - panelView = derive2 { name="panelView"; version="1.1.16"; sha256="07wmjh0ha7ry8nf5vas50kixljshg7c1wkr8nq992a56dz9l5igq"; depends=[dplyr ggplot2 gridExtra]; }; + panelView = derive2 { name="panelView"; version="1.1.17"; sha256="05zfkjmkypjw72z3ph11q1wzac55b6knv4ngvb47jjpi3n5i91ga"; depends=[dplyr ggplot2 gridExtra]; }; panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; panelhetero = derive2 { name="panelhetero"; version="1.0.1"; sha256="12csjgcjxwl7fxlqib0vgywf32frd7jri3dj9lyq5fmz9riqkdix"; depends=[boot ggplot2 KernSmooth Rearrangement]; }; - panelsummary = derive2 { name="panelsummary"; version="0.1.1"; sha256="15hx8wa9vh4p3n2pwag424hz1pxqrhcl9zr7ppza4gblrg6vxvxv"; depends=[dplyr fixest kableExtra modelsummary rlang stringr tidyselect]; }; + panelr = derive2 { name="panelr"; version="0.7.8"; sha256="0vq7f91lqpd0n507lswgj7zpp56dzps3zcvbgsp2ivaj3c9vy0s5"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble tidyr]; }; + panelsummary = derive2 { name="panelsummary"; version="0.1.2.1"; sha256="00rscxkblqkhyx2kdnl78hy82y9bjwdzhiia7bdx9qbjf0g2qjkl"; depends=[dplyr fixest kableExtra modelsummary rlang stringr tidyselect]; }; panelvar = derive2 { name="panelvar"; version="0.5.5"; sha256="15bks8aqy29rslgbjp4w8xw7w2mcpgcc77bya7a9jcs5715j9xdb"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="1.1.0"; sha256="1x1dbf7jahzc5s4gs0hn6xpw35xxbgp61aym50k384pavsdm9xgw"; depends=[crul hoardr jsonlite oai png tibble xml2]; }; panstarrs = derive2 { name="panstarrs"; version="0.2.0"; sha256="0pnzbw1m1vgy40f7m2wbym9rgdvaa2i9fqkadfnpj4z428b50627"; depends=[bit64 checkmate curl data_table httr jsonlite]; }; - papaja = derive2 { name="papaja"; version="0.1.1"; sha256="1pvknpvfns1r5bwadm58n4xjrlwgqfyhz9diy72zabbksxddqa26"; depends=[bookdown broom glue knitr rmarkdown rmdfiltr tinylabels yaml zip]; }; + papaja = derive2 { name="papaja"; version="0.1.2"; sha256="08ydk9fws5x37q120cdjdx1dsib0y2g9bp826vxzxcaymlwx3dl7"; depends=[bookdown broom glue knitr rmarkdown rmdfiltr tinylabels yaml zip]; }; papci = derive2 { name="papci"; version="0.1.0"; sha256="0ma1pfwgmj6qcg23yzhbnqip4qnxhsmfnvrgrr3ln65q5plmvh58"; depends=[binom dplyr DT Hmisc PropCIs ratesci readxl shiny shinythemes tidyverse]; }; papeR = derive2 { name="papeR"; version="1.0-5"; sha256="095qfgv6h3sl5p69gm1v0qh9axap8gq2a9a3v95688fia2ppym4x"; depends=[car gmodels xtable]; }; paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; @@ -14530,13 +14559,12 @@ in with self; { paradox = derive2 { name="paradox"; version="0.11.1"; sha256="0igza40ycirnf5chs7z2nnh0w6d48v4wv102zn2vnvh0kkvgv3hd"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.6"; sha256="01ly4hxwa64a0ya5gla8rvv72s9mcknsfznivjkh937pbjwb7iih"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="2.0"; sha256="18xw0s9lga2w981cx4daywp6b6gxvgl9mh68r13c5mmhis3b8v14"; depends=[mvtnorm]; }; - parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; parallelMap = derive2 { name="parallelMap"; version="1.5.1"; sha256="1qg7zpz5sd9jp8wzjqahkhipwj1jn192llwg06q4gv9mlcsac261"; depends=[BBmisc checkmate]; }; parallelPlot = derive2 { name="parallelPlot"; version="0.3.1"; sha256="12rpzcz1nc8c9rnsdg7kx6gh98plhp2jv22h58gg5gyl0pcsh2hx"; depends=[htmlwidgets]; }; parallelly = derive2 { name="parallelly"; version="1.36.0"; sha256="123w89hmd7fn7lmdsl044npidvf7472h1ascvf7swjllan8s5h5r"; depends=[]; }; - parallelpam = derive2 { name="parallelpam"; version="1.3"; sha256="14s305v2wkpi8la1xi19fs857d7xhzpjahdlcbr3x9hidvbwl03z"; depends=[memuse Rcpp]; }; + parallelpam = derive2 { name="parallelpam"; version="1.4"; sha256="0iv11jqr9040rnw7hkfdj4vq4s7lhzz6as7f0zcy6jm36b3hllh2"; depends=[memuse Rcpp]; }; paramGUI = derive2 { name="paramGUI"; version="2.2.0"; sha256="16z7fbrykyfysiqfrj00ks567wwrz2mpcwx75crbg45spdw0dck6"; depends=[fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.21.1"; sha256="1vdk80q76srk1qg74xyggkc54a4s9p90v1n94b04wzyxp7sdd9kh"; depends=[bayestestR datawizard insight]; }; + parameters = derive2 { name="parameters"; version="0.21.2"; sha256="05ryyyibnm69hq1xa84r9n2gr1s1ifds70z4awmib2ch62098m43"; depends=[bayestestR datawizard insight]; }; paramhetero = derive2 { name="paramhetero"; version="1.0.0"; sha256="1zkwzmh3igkwfq87v3rmp3axfspl20qn4qmpyqql6ain564yyabw"; depends=[ggplot2 MASS]; }; paramlink = derive2 { name="paramlink"; version="1.1-5"; sha256="0a21cy8q3zv96zdq5q2hfkb2ga1fham00in7wfyyd9wpck9gp009"; depends=[assertthat kinship2 maxLik]; }; paramlink2 = derive2 { name="paramlink2"; version="1.0.4"; sha256="1dw6z49yd7g89hmnzpb5m0w8fz56iwwf7zr01kji0ss9p9vnr9pg"; depends=[pedprobr pedtools]; }; @@ -14544,7 +14572,6 @@ in with self; { paramsim = derive2 { name="paramsim"; version="0.1.0"; sha256="1a227s1xglcc1skpsmwmmwr04mql73plc557sp8bl8444fhjz228"; depends=[doParallel foreach forecast future tibble]; }; paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; }; paran = derive2 { name="paran"; version="1.5.2"; sha256="0d9la83mxfpfgdfrqa40ck5fcp3j2b70d8c8nl9wmdsgvgqrl23s"; depends=[MASS]; }; - parcats = derive2 { name="parcats"; version="0.0.4"; sha256="1dqkkmwfvpz5lkskii1z3lx2xw2jy3rhh2skrg7mc8kv8z3m9i2h"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; }; parfm = derive2 { name="parfm"; version="2.7.7"; sha256="12kcvdpmp99lqgr1775xqjkcn3s5agng1hwhjq2sa3bgrjgmhsh5"; depends=[msm optimx sn survival]; }; parglm = derive2 { name="parglm"; version="0.1.7"; sha256="11knspjg0s7x8c5dqrkdkr33af39rhyggs0s0dxv726zfmg1ldy3"; depends=[Matrix Rcpp RcppArmadillo]; }; parlitools = derive2 { name="parlitools"; version="0.4.1"; sha256="05xii25acmbdbhrkwgw812352vhxqpp5m8qbl346bp6v74ixi8aj"; depends=[dplyr hansard mnis readr sf snakecase stringi]; }; @@ -14555,11 +14582,11 @@ in with self; { parqr = derive2 { name="parqr"; version="0.1.0"; sha256="11956dvv46sgpmbv429c24wxdhfqvc07jxc1i4yymyz1l8wgr3yb"; depends=[arrow magrittr purrr]; }; parquetize = derive2 { name="parquetize"; version="0.5.6.1"; sha256="0wnq5naq50g159ii7s33v5yiaykmgcvbc6d6f8fgng4kbpkmc569"; depends=[arrow cli curl DBI dplyr fst glue haven jsonlite lifecycle readr RSQLite tidyselect]; }; parseRPDR = derive2 { name="parseRPDR"; version="1.0.1"; sha256="14h56y7x38ll63rq4x6grws5ddcbf3rgksfpv95dxgbh25bx5rqr"; depends=[data_table doParallel foreach readr stringr]; }; - parsec = derive2 { name="parsec"; version="1.2.6"; sha256="04irxvzk47cy7bpbzz4a12b5m4ar6y4a060j8ydll4ckjia9nyj0"; depends=[igraph netrankr]; }; + parsec = derive2 { name="parsec"; version="1.2.7"; sha256="0k6w4nd37yz9jlzwv0bkv90v72y5bjz7rhk8gjpbl6ym63brxps6"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.3.1"; sha256="1cfinqlbchmkhkgmdwiy3mnxb17lp02jfk2gpw56hq9vh6wimhqz"; depends=[]; }; parsel = derive2 { name="parsel"; version="0.3.0"; sha256="0d2sviaq94v5szd2qq1kdpirp3zyrx6r3kyins9xyfma9026770x"; depends=[lubridate purrr rlang RSelenium]; }; parsermd = derive2 { name="parsermd"; version="0.1.2"; sha256="15fy5vgzbrxq1yj4bgd0q1n5gjwvfh6s03ar5mj3hpp5mz6qmsdg"; depends=[BH checkmate cli dplyr lifecycle magrittr pillar purrr Rcpp readr rlang rmarkdown tibble tidyr tidyselect withr yaml]; }; - parsnip = derive2 { name="parsnip"; version="1.1.0"; sha256="13bp44i8i99yiahdjikf0xidfgxd251nhbxsnsw0ax1lv24fpggc"; depends=[cli dplyr generics ggplot2 globals glue hardhat lifecycle magrittr pillar prettyunits purrr rlang tibble tidyr vctrs withr]; }; + parsnip = derive2 { name="parsnip"; version="1.1.1"; sha256="1j0bkmv2m4rxmnpq3rqha5jccjxai11m5392hb4dgzni7in36h92"; depends=[cli dplyr generics ggplot2 globals glue hardhat lifecycle magrittr pillar prettyunits purrr rlang tibble tidyr vctrs withr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partR2 = derive2 { name="partR2"; version="0.9.1"; sha256="06ky0hhrq0mcsn9rwrzvwn0rrjj0l8rxs0hqp10668gdq5hjk8bn"; depends=[dplyr ggplot2 lme4 magrittr pbapply purrr rlang tibble tidyr]; }; partialised = derive2 { name="partialised"; version="0.1.1"; sha256="0rb9d5p21f1y0c8arwh1lf516vw30qinf15rkrv49qw97dvvb9db"; depends=[pillar purrr rlang vctrs]; }; @@ -14567,7 +14594,7 @@ in with self; { particles = derive2 { name="particles"; version="0.2.3"; sha256="0x76q9qcfaraiy0w8hrdk4ws16w1a8m363a3l4cphpi6xi329027"; depends=[cpp11 digest dplyr igraph mgcv rlang tidygraph]; }; partition = derive2 { name="partition"; version="0.1.4"; sha256="19f1j6hm35c57r2x51nh2kns3jyd85xxg06lgd94kb13brr1hk2v"; depends=[crayon dplyr forcats ggplot2 infotheo magrittr MASS pillar purrr Rcpp RcppArmadillo rlang stringr tibble tidyr]; }; partitionBEFsp = derive2 { name="partitionBEFsp"; version="1.0"; sha256="0rirqk9v5jbjs2jpjjkg7kvay9f093q2gwx5fx3bm9b0f5869w1b"; depends=[]; }; - partitionComparison = derive2 { name="partitionComparison"; version="0.2.5"; sha256="0wzg2r4c61fd3cp8kwsc313gwcizh5aavw361lc9gqn57p1kml1j"; depends=[lpSolve Rdpack]; }; + partitionComparison = derive2 { name="partitionComparison"; version="0.2.6"; sha256="1z4ckjgjsq94wbnazb3335rcy6hhqh8pf9j5d22z6qkgfgxcv7w6"; depends=[lpSolve Rdpack]; }; partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; partitions = derive2 { name="partitions"; version="1.10-7"; sha256="1kxiy1wl7dr39kyfg2y9hd67s32knd83r2jsb7j9p3vg8iqq7yqb"; depends=[gmp mathjaxr polynom Rdpack sets]; }; partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; @@ -14582,16 +14609,16 @@ in with self; { passt = derive2 { name="passt"; version="0.1.3"; sha256="0yphnw38wwv303lkbfj2y3fwfjnd8l7gyi60c7xaj6qwy4y5ww8k"; depends=[dplyr magrittr rlang tidyr]; }; password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; }; pastclim = derive2 { name="pastclim"; version="1.2.4"; sha256="0izfnafqxn874xbb6phybb8l5hpcpzhnrhp0dvmmfqhmf68z5r7d"; depends=[curl ncdf4 terra]; }; - pasteAsComment = derive2 { name="pasteAsComment"; version="0.2.0"; sha256="1837s2bfxpgjs15q1brr166iyar2xzvmdj0qxknb8hnqrmi207mf"; depends=[clipr rstudioapi]; }; + pasteAsComment = derive2 { name="pasteAsComment"; version="0.2.1"; sha256="165wsvgnrsbx9lh6bmffzyhdfhviap4vl556sbgr8f45lqcgsh69"; depends=[clipr rstudioapi]; }; pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; }; patchDVI = derive2 { name="patchDVI"; version="1.11.0"; sha256="1cxgbrwb2qz39b9q1afz2i1pbnqyyi0hz8zc6j1i0llayyd6pgxk"; depends=[RmdConcord]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; - patchwork = derive2 { name="patchwork"; version="1.1.2"; sha256="0xw9mh1qakj131nw98icxrxwvdlwy2ngwvmagrqr3m84sz9dbffs"; depends=[ggplot2 gtable]; }; + patchwork = derive2 { name="patchwork"; version="1.1.3"; sha256="07npkbalfl2d9aix02m2srxgmd8ymar6v0x65ighg3nq9d7l4xp9"; depends=[cli ggplot2 gtable rlang]; }; patentr = derive2 { name="patentr"; version="0.1.4"; sha256="14jxqaq306mpppzz14f0qw1d0brrrkcs121h5fdiskvly3vjvs1j"; depends=[dplyr lubridate magrittr progress Rcpp rlang xml2]; }; patentsview = derive2 { name="patentsview"; version="0.3.0"; sha256="1ysqarmqqbw7zy1c3nfa08i6byima31pmcvv60qz9qjpyd2np0fn"; depends=[httr jsonlite]; }; path_chain = derive2 { name="path.chain"; version="0.2.0"; sha256="1p28mcar4krgvkgn02xrlwcpzchnppn2l2k2iwh511c3qrfpy653"; depends=[logger rlang stringi]; }; pathdiagram = derive2 { name="pathdiagram"; version="0.1.9.1"; sha256="018frv1n3x0bf1682jibnm5k2dlkg85xa9mps28l22a0z8bplbv5"; depends=[shape]; }; - pathfindR = derive2 { name="pathfindR"; version="2.1.0"; sha256="0ipg5kf3y03r39q9gkbx69hkj9r21w67xdb4c18lpg0ndsrmh3il"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; }; + pathfindR = derive2 { name="pathfindR"; version="2.3.0"; sha256="06r8cxgp1bypvls5g7q56kr18in6z878givwn5daz44qhl84zz77"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 ggraph ggupset igraph KEGGgraph KEGGREST knitr magick msigdbr org_Hs_eg_db pathfindR_data R_utils rmarkdown]; }; pathfindR_data = derive2 { name="pathfindR.data"; version="2.0.0"; sha256="17gq9na4d6ls0dkvy4v1gjg29v7jm7ms9k83c2p6q2q1273ahxpb"; depends=[]; }; pathlit = derive2 { name="pathlit"; version="0.1.0"; sha256="0harvldkhq2c1wb9i4n72w1s3frhjzyn4cjpwk1n350zg12kh9gz"; depends=[httr jsonlite testthat timeSeries usethis]; }; pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; }; @@ -14602,51 +14629,51 @@ in with self; { patientProfilesVis = derive2 { name="patientProfilesVis"; version="2.0.5"; sha256="0kb84jpcmnyakggbb8m96qbbc3a7yj1025k13nhirx4i459d0913"; depends=[clinUtils cowplot ggplot2 gridExtra knitr plyr reshape2 scales stringr]; }; patrick = derive2 { name="patrick"; version="0.2.0"; sha256="1ghjvm82hgal091hfjfyz3ndg32xsggip5pp4y0g7rmrzpfjmpjs"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; - patternize = derive2 { name="patternize"; version="0.0.3"; sha256="072wjjinbkvrijqb90hk6h964m1h2gznj69jq3pidbzcr1xl93g1"; depends=[abind ClusterR dplyr geomorph imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; + patternize = derive2 { name="patternize"; version="0.0.5"; sha256="1d0x27fy41sdxhmyj4cy01xxxcbyp4hvxjcybbmgg1r4ivi1sp08"; depends=[abind ClusterR dplyr geomorph imager magrittr Morpho purrr raster RNiftyReg sf sp vegan]; }; patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; - pavo = derive2 { name="pavo"; version="2.8.0"; sha256="05h19z9z7lnzlbbwvg225xal3dlhjbvij6b82pzvxvai37dq1ijx"; depends=[cluster farver future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; + pavo = derive2 { name="pavo"; version="2.9.0"; sha256="1kl3qd1q6p4rmfbml0lfjj3wi40w3kkb9gahvin8k62m5aa4hmq6"; depends=[cluster farver future_apply geometry lightr magick plot3D progressr sf viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; - paws = derive2 { name="paws"; version="0.3.0"; sha256="1s4nya5xghjj1a2w8bqcmnpnpdw7li22asssm2ihv68zvlxavzdk"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_developer_tools paws_end_user_computing paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; - paws_analytics = derive2 { name="paws.analytics"; version="0.3.0"; sha256="0qjk1gn4p41l4ryqf9xppiphfakypl0xdjk23c9c8xdhqkbw0lcw"; depends=[paws_common]; }; - paws_application_integration = derive2 { name="paws.application.integration"; version="0.3.1"; sha256="19lz1vcvb1bn405saxx4zjsmm1q4zaw77z08iw4xbyny5xhkgyvi"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.5.8"; sha256="1vx74lxgzsl1yl4ak5zympkgwza023qbjwskp19nm2dvxhz75cfh"; depends=[base64enc curl digest httr jsonlite Rcpp xml2]; }; - paws_compute = derive2 { name="paws.compute"; version="0.3.1"; sha256="17xzc1ngir4v043xclw6c1qs092aicj83qmn8sydn9apmlzcps1r"; depends=[paws_common]; }; - paws_cost_management = derive2 { name="paws.cost.management"; version="0.3.1"; sha256="0v0s8wwx2j3a6s0pl9vnvbpgdyhn3jlxri0b2fl3gc3zx6qh07dl"; depends=[paws_common]; }; - paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.3.0"; sha256="18gkr3272jj1pkksm6fy6qz5s5jn0yvb12pz29k204xrzmqwdwgm"; depends=[paws_common]; }; - paws_database = derive2 { name="paws.database"; version="0.3.0"; sha256="08ak299kyr6dr8idcna7i433aab1bis2b9zqmwm1yma3m3xk4n8i"; depends=[paws_common]; }; - paws_developer_tools = derive2 { name="paws.developer.tools"; version="0.3.1"; sha256="1b661gpg7rsdkgpriwczj4cvqg9rh1ajz9ma457bw4p3lv7n53x2"; depends=[paws_common]; }; - paws_end_user_computing = derive2 { name="paws.end.user.computing"; version="0.3.0"; sha256="0as9ix46rsa7sg8k96v6l3ibxqc95pf7swrij31ljmwfy82z2rq3"; depends=[paws_common]; }; - paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.3.0"; sha256="092n5p5hjwaqkdnw4r7n71znabfazc2pg19raja69jgk6zh6csvy"; depends=[paws_common]; }; - paws_management = derive2 { name="paws.management"; version="0.3.1"; sha256="0hdmc07i75hbk2fh580p7q7p3pk8ykr5m1jibnfk8azc4flikwv6"; depends=[paws_common]; }; - paws_networking = derive2 { name="paws.networking"; version="0.3.0"; sha256="0pf1vvwmgsz65bq5diabybnsgyxfbjq1f64srf3qk49ycfh2sc7h"; depends=[paws_common]; }; - paws_security_identity = derive2 { name="paws.security.identity"; version="0.3.1"; sha256="02k15skswd58icafydrbjrp7br5x8l93lwi5z1pwqak6xasi0vqh"; depends=[paws_common]; }; - paws_storage = derive2 { name="paws.storage"; version="0.3.0"; sha256="0z693wawgm975lw54xkbg9hwsf1lz69a4dsg85ywjpjcfvl1g1b7"; depends=[paws_common]; }; + paws = derive2 { name="paws"; version="0.4.0"; sha256="1l9pjmfnhqgzxghxz22fbqc43x9am6d21f982p2sykxv271yclhf"; depends=[paws_analytics paws_application_integration paws_common paws_compute paws_cost_management paws_customer_engagement paws_database paws_developer_tools paws_end_user_computing paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; + paws_analytics = derive2 { name="paws.analytics"; version="0.4.0"; sha256="1x7ix8x0ks357b7gf2skixsd0najjbn8hnq7p6a354p5h7bz39b4"; depends=[paws_common]; }; + paws_application_integration = derive2 { name="paws.application.integration"; version="0.4.0"; sha256="0hilnczvamdv3bi1v6hdki05h8qqh0wlgvh5ilh09113005fpz98"; depends=[paws_common]; }; + paws_common = derive2 { name="paws.common"; version="0.6.2"; sha256="1jgls5fks9s8m616qs6b7hvv0wf7nhzajyds15hnlasqwg387h3d"; depends=[base64enc curl digest httr jsonlite Rcpp xml2]; }; + paws_compute = derive2 { name="paws.compute"; version="0.4.0"; sha256="0q0xikrq7095l8fhii2jyjxfbihhnlm7nzzbspfqdh8xbr7g4kld"; depends=[paws_common]; }; + paws_cost_management = derive2 { name="paws.cost.management"; version="0.4.0"; sha256="1j9zi73y9ng5m6wlws4crfv4j6b8qxk1m9g1hd286g4gg852g80y"; depends=[paws_common]; }; + paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.4.0"; sha256="0skfya3m9i36dd0jqvnnc72k1h3lb4s3fjkvg7na6aq6xgpjh4jv"; depends=[paws_common]; }; + paws_database = derive2 { name="paws.database"; version="0.4.0"; sha256="1rnjjdb4l7a943cawkkzfjkg8shy2vy5d9mcl2p5ms191lw056bn"; depends=[paws_common]; }; + paws_developer_tools = derive2 { name="paws.developer.tools"; version="0.4.0"; sha256="13i5yi23xsrks1dsw0k3cqzr2gqj8p23yajb3a7drim6d4rpsaxl"; depends=[paws_common]; }; + paws_end_user_computing = derive2 { name="paws.end.user.computing"; version="0.4.0"; sha256="0v3ng20vrp5cvpbgipwwpvyhi995n2rp8jls0kklkrjax41x62cn"; depends=[paws_common]; }; + paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.4.0"; sha256="0cwmriprwrz446q4d5ljkpvwdhmamnl98g1ks6p35vbjiv4imk21"; depends=[paws_common]; }; + paws_management = derive2 { name="paws.management"; version="0.4.0"; sha256="0lp8s4caxppwxsra6ijcz1dzkmnznwrrs92y87387vq53y3icc6m"; depends=[paws_common]; }; + paws_networking = derive2 { name="paws.networking"; version="0.4.0"; sha256="1imq29nxy5hxz2vlijdj2jl0lllvm3plb3jwpvsx1wlcvhpz0in3"; depends=[paws_common]; }; + paws_security_identity = derive2 { name="paws.security.identity"; version="0.4.0"; sha256="081339201j19y8y28h0dhr876ii82zpfyqddc21lvmg27z53hj4x"; depends=[paws_common]; }; + paws_storage = derive2 { name="paws.storage"; version="0.4.0"; sha256="0yr99328rwm6i95xhp4yds6dzfvrvbr7ys2hy17iqbyij958j0m4"; depends=[paws_common]; }; + pawscore = derive2 { name="pawscore"; version="1.0.3"; sha256="0pf8lczi0g3cwi4hxrz4lggphpkbabswj0sppm7h688ijb1ph9qg"; depends=[brglm2 signal]; }; pbANOVA = derive2 { name="pbANOVA"; version="0.1.0"; sha256="0m7946jv4zbs0k74klxkl8nbwirc48g6paqrfl5fadkd17xxqq2j"; depends=[DescTools dplyr lmtest MASS plyr Rmisc]; }; pbapply = derive2 { name="pbapply"; version="1.7-2"; sha256="04xf1p7c0066cwnxfmzaikbc322bxnw022ziv8kkhzlc6268rvdf"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-16"; sha256="1sgglw357igphrfrsqbwfk44b31p2vz0d3nr1qivrjp8rqia8b7n"; depends=[rootSolve survival]; }; pbbd = derive2 { name="pbbd"; version="1.0.0"; sha256="07g029qw5949500c879iv86zwg2fldqrz8wzfz335jmcinqimgj6"; depends=[ibd]; }; - pbcc = derive2 { name="pbcc"; version="0.0.3"; sha256="11qnmxky23s6dak0kpd22h9la7khn4zwr9msk0liry8i6slwhchg"; depends=[ggplot2 ggpubr qcc rgenoud]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.4-6"; sha256="0r6kbrvc0z4mb2dhrz1iqdyx0c03f682b5xfi1igp7z3rszd1va1"; depends=[float rlecuyer]; }; + pbcc = derive2 { name="pbcc"; version="0.0.4"; sha256="1bmb9zn9ryis1fnhr6gz24y1mxbi876hkss0kpyl359pbgiq46p3"; depends=[ggplot2 ggpubr qcc rgenoud]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.5-0"; sha256="0wfx33jhdrwp97chsp9v8z2yf49shycvky8dwl9pgwqd9l69aw7x"; depends=[float]; }; pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-4"; sha256="11rdsxkvrvm8rbfh5n3y48kzkilc9941hnwxk9a3fmgrbvnlzxfc"; depends=[pbdMPI rlecuyer]; }; - pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-9"; sha256="1dhg9sakfz4mivwvyfv5hnjrbi6gcd9cgis0dcgmh44q1a6j6cyh"; depends=[]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-10"; sha256="14fi1bcvc77k5qjh0vb5r44p9rzlzrbzbw2c99psnzq2wic018ir"; depends=[]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; - pbixr = derive2 { name="pbixr"; version="0.1.4"; sha256="098fwmar56l8w5r58grirqypdmc2c4hil7bi11z18llja62fncnw"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.5.2"; sha256="1qxnd4pfpsq762x81s3vkw09wdwpfj25bba5474g7z506pqasycf"; depends=[broom dplyr lme4 MASS Matrix numDeriv]; }; pbm = derive2 { name="pbm"; version="1.2.1"; sha256="0nkqhrvlzf2imkq5pbni3c1k4vc75y26rra3czbchs111v7jrcqv"; depends=[]; }; pbmcapply = derive2 { name="pbmcapply"; version="1.5.1"; sha256="1p8jf7c4k45482w72sr0jw4jkz787krrxai3sl6jz5l4lda2iz3z"; depends=[]; }; pbo = derive2 { name="pbo"; version="1.3.5"; sha256="0grj5h06kz8w2p7rzdibg95zpy30r056w14hmy7ij3bpi98sm79z"; depends=[foreach lattice latticeExtra]; }; - pbr = derive2 { name="pbr"; version="0.0.1"; sha256="0gzj4hhrqm7nbxndycqg135l42026xj7y4hpznyi7cib4gf8bqs4"; depends=[htmltools httr jsonlite leaflet]; }; + pbr = derive2 { name="pbr"; version="0.0.2"; sha256="1y984v487hqn22cnhn3cghbvn5bxpvpqsrsizjd06vjwnflpazg2"; depends=[htmltools httr jsonlite leaflet]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pbv = derive2 { name="pbv"; version="0.4-22"; sha256="0658k8ql78y756l15wx0i6gpicgkbczwc6g7dg15i81xy1hg49qb"; depends=[Rcpp RcppArmadillo]; }; - pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.3"; sha256="0xyz0nmgyc1i46b37qs1ip25pv4932qn5fdisbdxmwig2sxvacd9"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders]; }; + pcFactorStan = derive2 { name="pcFactorStan"; version="1.5.4"; sha256="09mjvgvdlc85246jgi4x99jr2x2j6c5vn3y3gwjxw61cmmyybqzf"; depends=[BH igraph lifecycle loo mvtnorm Rcpp RcppEigen RcppParallel reshape2 rstan rstantools StanHeaders]; }; pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; }; pcLasso = derive2 { name="pcLasso"; version="1.2"; sha256="1gkr1kvm4lrd63jcarv9b7gjjcyyny6z49gvy2rcqg17zfqdxysv"; depends=[svd]; }; pcSteiner = derive2 { name="pcSteiner"; version="1.0.0.1"; sha256="021r5c0rw962ywraq75scb2gqv3dxxq4vnaqpia83ljj5ab11qa0"; depends=[igraph]; }; pcaL1 = derive2 { name="pcaL1"; version="1.5.7"; sha256="0k4kq4j45wsplag3nklyhyycpw65jin4i1l6ayci971y1pr3n113"; depends=[]; }; pcaPP = derive2 { name="pcaPP"; version="2.0-3"; sha256="00ynanxpngzsvq5fsyalyzqz6axqcryy94300afvylwp0d7mbb0s"; depends=[mvtnorm]; }; - pcadapt = derive2 { name="pcadapt"; version="4.3.3"; sha256="01wvcflfsnlsq23vq03n870fxsab3ab29k26nqlqxw82lbvx99s3"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; }; + pcadapt = derive2 { name="pcadapt"; version="4.3.5"; sha256="106h6xvqixi1lgrx1280f7jmdyc5k6da6j9vy49iq2gyma6v2q9v"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; }; pcal = derive2 { name="pcal"; version="1.0.0"; sha256="07119k5f4h9jc48bicl4q5i7bdrkha3rz22r6g44c8ilnkvjhw6j"; depends=[Rdpack]; }; - pcalg = derive2 { name="pcalg"; version="2.7-8"; sha256="1phjycamc1m5jk8lg730q2cvbwgkm5paizyp0xminlb4p56za8kr"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pcalg = derive2 { name="pcalg"; version="2.7-9"; sha256="05hi5j42x63l2py9iyrrdiladi8xkvwk1dwms6av96wswy9d5cdq"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pcalls = derive2 { name="pcalls"; version="1.0"; sha256="1vdgvrzfv69p3p5zc9i6gxq53f36s0mia4idzrbsda661f1bhmxk"; depends=[]; }; pcaone = derive2 { name="pcaone"; version="1.0.0"; sha256="0lpi4y8alddaplq2pjpgkbias1k08y02jg1zd236dh3n2qkfmamw"; depends=[Rcpp RcppEigen]; }; pcatsAPIclientR = derive2 { name="pcatsAPIclientR"; version="1.1.0"; sha256="13d7cvpjjhxzln4lg7s17wl1apz83b4y4l361j2m4f8wyqwc6b6a"; depends=[httr jsonlite]; }; @@ -14659,29 +14686,29 @@ in with self; { pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; }; pcgen = derive2 { name="pcgen"; version="0.2.0"; sha256="1v2fmxbj9gz5sg0hizw03ad8cfm9v25708h7fvnf6gb42b2mmyb3"; depends=[ggm graph Hmisc lme4 MASS Matrix pcalg sommer]; }; pch = derive2 { name="pch"; version="2.0"; sha256="1nnawsc6mscwd4z62hhilpn04a9iapx551vvjm3alwk2makhj0wf"; depends=[Hmisc survival]; }; - pchc = derive2 { name="pchc"; version="1.1"; sha256="0crb63i2hps59q96fi6if58wj4nd09nkad2vyqb6pffbr3wckvgb"; depends=[bigstatsr bnlearn dcov doParallel foreach Rfast Rfast2 robustbase]; }; + pchc = derive2 { name="pchc"; version="1.2"; sha256="0h1b1n9mw22wsh51nciphgyqk2cp98qkm4wskxw4ryj6lyqjk4k2"; depends=[bigstatsr bnlearn dcov doParallel foreach Rfast Rfast2 robustbase]; }; pcmabc = derive2 { name="pcmabc"; version="1.1.3"; sha256="1wrdbinc3y71q4ix8cb1vn4nhaa0bp9yxw1n8d5bzdyhg29df2hj"; depends=[ape mvSLOUCH phangorn yuima]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.8"; sha256="18q3fprxzbmm2nsqazppjkl5rvbmn1s9985f2wmzm2dslwpm5a23"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; pcoxtime = derive2 { name="pcoxtime"; version="1.0.4"; sha256="1ill4vkkxv9iymknfkk72sff932l3jb0m70aga1skxkriyr02nwf"; depends=[doParallel foreach ggplot2 pec PermAlgo prodlim Rcpp RcppArmadillo riskRegression survival]; }; pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; - pcsstools = derive2 { name="pcsstools"; version="0.1.1"; sha256="1vp4lflxzzgjfh1nkkfvnb74pjmbcdgrc1hlakjd8i5rw7swvr20"; depends=[gtools Rdpack]; }; + pcsstools = derive2 { name="pcsstools"; version="0.1.2"; sha256="0pqc6qpl95dxphi77wcgi0v22a1q455iqaplsrvg32cf0mn3gikg"; depends=[gtools Rdpack]; }; pct = derive2 { name="pct"; version="0.9.9"; sha256="15rshwdrfkr0ahnywss0qqbcyfxakknv9ffvb58nzc960c97zmy8"; depends=[boot crul readr sf stplanr]; }; pcts = derive2 { name="pcts"; version="0.15.5"; sha256="03iammgirj3vnrwh0fxvy3r08z3da23jbjkb2fzpya1pxfb2rnjq"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; }; pcutils = derive2 { name="pcutils"; version="0.1.0"; sha256="0g96a4ibfyl8r6955mqjnj94lk1bhdj9hzp3ccm84bynn2xihdz8"; depends=[agricolae dplyr ggplot2 magrittr reshape2 scales]; }; - pcv = derive2 { name="pcv"; version="1.0.1"; sha256="0rmb024d378fb13r7rll74p6kj7mkbr2ggic7k446aivccwzr7hr"; depends=[]; }; - pdR = derive2 { name="pdR"; version="1.8"; sha256="1sjlcd8g564jrwmlhpjypgwqywz3ggq4lb6xwqzc1basbsx5zfrn"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; + pcv = derive2 { name="pcv"; version="1.1.0"; sha256="03rpfxdpinr1a6964gch0j852h96jfk4sccs4bv1pzkvv2qsnzlr"; depends=[]; }; + pdR = derive2 { name="pdR"; version="1.9.1"; sha256="1vkgzkk5l2wjxldriqxjrkkvyyg6n3bhb69hx90ficnyy5q3z7s7"; depends=[]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pda = derive2 { name="pda"; version="1.2.6"; sha256="071510s4bkfnc6xhg792j2mk9r702yws1vafrbky77hhdnkj5c0f"; depends=[data_table glmnet httr jsonlite MASS metafor minqa numDeriv ordinal plyr Rcpp RcppArmadillo rvest survival]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; pder = derive2 { name="pder"; version="1.0-2"; sha256="0qrf0igxzalvsanj1mqryi0xl9lq0wlpg8bbgasbx3ibq4yqwn0s"; depends=[plm]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-4"; sha256="0d52xmrzsjc51j0gzd3729rjqh391643yq840b6hlpc2w4ycc46m"; depends=[geometry]; }; - pdfetch = derive2 { name="pdfetch"; version="0.2.8"; sha256="1014cpm1kiq0k04ymnwdmhmw0836z2gizk13p4lxxl02hw91fv10"; depends=[curl dplyr httr jsonlite lubridate magrittr readr stringr tidyr XML xml2 xts zoo]; }; + pdfetch = derive2 { name="pdfetch"; version="0.2.9"; sha256="03hx8h2sfahfy05wwrac048wzzlh1d1g6hbr0qzkkhk4xsv69qa1"; depends=[curl dplyr httr jsonlite lubridate magrittr readr stringr tidyr XML xml2 xts zoo]; }; pdfminer = derive2 { name="pdfminer"; version="1.0"; sha256="0hm9nalazqcg4n1sqcjan8wm1rvv4lnflmlkrqkj5yhhmza7xkfh"; depends=[checkmate jsonlite]; }; pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; - pdftools = derive2 { name="pdftools"; version="3.3.3"; sha256="174hsmdpykgxkgbif562lsnrlsybhjbjh4r7w9pc5hss42jxzh7z"; depends=[qpdf Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="3.4.0"; sha256="0r1c91qrva8lz0gs717llzs6zjiqjrdjhi71asf9bmx600hpp78b"; depends=[qpdf Rcpp]; }; pdi = derive2 { name="pdi"; version="0.4.2"; sha256="04lz16al9c3ycdswfpf1fanghglpzbl8pfggr9bjmcn7k2v91ysv"; depends=[dplyr magrittr purrr randomForest readxl stringr tibble tidyr tidyselect]; }; pdist = derive2 { name="pdist"; version="1.2.1"; sha256="0bvg8si81hs79v39d7svv4zbv2p0sk2r6m9vamibvkh9qvl4x406"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; }; @@ -14693,29 +14720,30 @@ in with self; { peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; }; peRspective = derive2 { name="peRspective"; version="0.1.1"; sha256="1dca7592h9yp8lfj866hjzg0d48c84v2kd9l5bsvkw935wwxwg2w"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; }; peacesciencer = derive2 { name="peacesciencer"; version="1.1.0"; sha256="06mlz2yjihm4xbdipv167ldf8z7r0ldwfn9day5c3lphg73fym5b"; depends=[dplyr geosphere lifecycle magrittr rlang stevemisc stringr tidyr]; }; - peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-3"; sha256="0vdhhds1lngaff7dkx4b1az3syqw8b22w2jskcrw0m49wp1dbbha"; depends=[]; }; pec = derive2 { name="pec"; version="2023.04.12"; sha256="15ggf3fa1p5r0dl7k2j99cc920jvmk0p1ny0jzyrpddh8fcgwlk5"; depends=[foreach lava prodlim riskRegression rms survival timereg]; }; pecora = derive2 { name="pecora"; version="0.1.1"; sha256="0l66brd5d24hn279ck785jy4qnxiv9lc3d1czh4f3l25d0hj99xi"; depends=[matrixStats Rcpp RcppArmadillo]; }; - pedSimulate = derive2 { name="pedSimulate"; version="1.4.0"; sha256="0x1djd9kjnbp8wrx2iy1hh3psf77lmhyipzdbyysd95ym6wkldvk"; depends=[]; }; + pedSimulate = derive2 { name="pedSimulate"; version="1.4.3"; sha256="11p7gkxzd9ajyivxnpw4mzdn4c812gihl8q0x5w6h3s9ixsk8qrl"; depends=[]; }; pedalfast_data = derive2 { name="pedalfast.data"; version="1.0.0"; sha256="02s6igrybcfs8nyxr50iiwclhrwnq3x2x5w886imrlp2wbkf13m4"; depends=[]; }; pedbp = derive2 { name="pedbp"; version="1.0.2"; sha256="0yc6185i3jzpwkpmkm38vggyfba0pvz6hvzqfkl6ch591dvkldch"; depends=[ggplot2 scales]; }; - pedbuildr = derive2 { name="pedbuildr"; version="0.2.1"; sha256="19yzfg5jms2qnww4p8npmk9815hrgqsbd49h8pi62yy9kjqnccai"; depends=[forrel glue pedprobr pedtools]; }; + pedbuildr = derive2 { name="pedbuildr"; version="0.3.0"; sha256="1yq5ag62yf6qjkxvr4g0xggag0ic5gyby4y5vnhlakwn0h78yirv"; depends=[forrel glue pedmut pedprobr pedtools ribd]; }; pedgene = derive2 { name="pedgene"; version="3.6"; sha256="0h66yshna10fannpdvi0m83s53b1hmnjym2mvc7ypcgr1glq6j13"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4.2"; sha256="1b3zhjn6sl1pnkfqim6xzk6qdak6acdpim585xhjl1rbc41540qx"; depends=[HaploSim Matrix reshape]; }; + pedigreeTools = derive2 { name="pedigreeTools"; version="0.2"; sha256="048lpzg0mmbzdc5cd52ssvzlji5293xz7bpqy3cjjszwcfjppc6c"; depends=[Matrix]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmod = derive2 { name="pedmod"; version="0.2.4"; sha256="1xr98vp2s3s2cw4bjdw6156zas15jxvp9fbyz9rxd68i3zrblplx"; depends=[alabama BH psqn Rcpp RcppArmadillo testthat]; }; pedmut = derive2 { name="pedmut"; version="0.6.0"; sha256="0zgkgmzzw8kmiacvfjdfqc04gwiv04g5p71b4rkndgb8d68v0f6m"; depends=[]; }; pedometrics = derive2 { name="pedometrics"; version="0.12.1"; sha256="06s1iyv2nldqqkh1n3cgl3a7ribk17kyadgfx76lpgy016fi7vz5"; depends=[lattice latticeExtra Rcpp]; }; pedprobr = derive2 { name="pedprobr"; version="0.8.0"; sha256="0fkr1lsw1aj6010xnjkqd514gpkz88xjw52i6ic47f6pyl0m6irz"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.2.2.1"; sha256="1b7a9y7w3wa8v0wjg3n30ddf228fb17fgijcm680qqbh3sqrrl7k"; depends=[curl data_table echarts4r httr jsonlite lubridate PerformanceAnalytics readr readxl rvest stringi TTR xefun zoo]; }; + pedquant = derive2 { name="pedquant"; version="0.2.3"; sha256="1dqzc4w76xfmvis2qkv3s3si9hvrwz58xkn1pmm17hwi5r1jk9pl"; depends=[curl data_table echarts4r httr jsonlite lubridate PerformanceAnalytics readr readxl rvest stringi TTR xefun zoo]; }; pedsuite = derive2 { name="pedsuite"; version="1.2.0"; sha256="1l7yyn8w1lsqlnd79vp2yaxyh6wrkxn4rm1kcbcv5bd9ivxc9k8b"; depends=[dvir forrel ibdsim2 paramlink2 pedbuildr pedmut pedprobr pedtools ribd segregatr verbalisr]; }; - pedtools = derive2 { name="pedtools"; version="2.2.0"; sha256="1vzh88bxd3mcas8c41l30xsimp242xahrslyrll4r9f9vs959v01"; depends=[kinship2 pedmut]; }; + pedtools = derive2 { name="pedtools"; version="2.4.0"; sha256="0hd993g377i0hxsy5abklm6ajcpizfps9lp9qb8bcslzclh06h5v"; depends=[kinship2 pedmut]; }; peermodels = derive2 { name="peermodels"; version="0.10.3"; sha256="116xn5w7rwm9q0m7bj4z29l4hspj2nqdcxzir9dqpdqmf7z58v67"; depends=[curl httr httr2 jsonlite stringr]; }; pegas = derive2 { name="pegas"; version="1.2"; sha256="0mdd6wwbgln7272am9pk3p5garmkkf3j76lli4hnxsh9gj9z6fcx"; depends=[ape]; }; pell = derive2 { name="pell"; version="0.1.0"; sha256="1621lnv6sii072did3kj6wapgh9iiqajayvkrmz7q86bp89405sm"; depends=[]; }; pema = derive2 { name="pema"; version="0.1.3"; sha256="0ymzq5s86z97sac1gq8qdh37p2aa39j4pz1n29ga3l0kmv5cxjky"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools shiny sn StanHeaders]; }; + pempi = derive2 { name="pempi"; version="1.0.0"; sha256="1hvqszfnqwbya73fs36d8mqz277nfbgrwga5z9jfxdnkalxw5bxq"; depends=[]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.29.1"; sha256="0nmawl1l2wf77r02qpazqwm5708fk98k7l07wyybviwb1j3x1pqj"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; pemultinom = derive2 { name="pemultinom"; version="0.1.0"; sha256="0xxcar0vmp6cc58471n5lnp5z5avrn3cv60mjdc96ifms0ghi3vl"; depends=[doParallel foreach magrittr nnet Rcpp]; }; penAFT = derive2 { name="penAFT"; version="0.3.0"; sha256="1yhg9fr3fwpxxcp0ri4iqfwa9f2y134y5b13qfils4y15cp0rnzj"; depends=[ggplot2 irlba Matrix Rcpp RcppArmadillo]; }; @@ -14726,12 +14754,12 @@ in with self; { penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.4"; sha256="1vafdczbqrwj9cagjd7la81jsrqkn917sxppxvz3i608yfl32igl"; depends=[corpcor e1071 MASS mlegp statmod tgp]; }; penalizedcdf = derive2 { name="penalizedcdf"; version="0.1.0"; sha256="17r9f7n6icn2yhfy5ibr8zccr10yq5k4vgyh59fgdzzf5qk407n3"; depends=[plot_matrix]; }; penalizedclr = derive2 { name="penalizedclr"; version="2.0.0"; sha256="1dg54h6mgy8s3bq3s4xmj4lj0z6wvf0nj5np81mfzzp6fhjqyxhm"; depends=[clogitL1 penalized survival]; }; - penaltyLearning = derive2 { name="penaltyLearning"; version="2020.5.13"; sha256="0297rp5zn6d0axl44i3baq2vqvhrx6s8irrysvqdcx1rkishf4j0"; depends=[data_table ggplot2]; }; - pencal = derive2 { name="pencal"; version="2.0.1"; sha256="0k8r50010c19f6q05jcyhkzjgq7hvlc29gfhx6mmvd58b5crv57s"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme purrr riskRegression survcomp survival survivalROC]; }; + penaltyLearning = derive2 { name="penaltyLearning"; version="2023.8.31"; sha256="1akajydxzq03pvhmgr3zr69wz6skfgf893dc8krm2aqcdn5b4i9a"; depends=[data_table ggplot2]; }; + pencal = derive2 { name="pencal"; version="2.1.0"; sha256="03mvrrwzpxrxwfd3sh0h7sb2b5kjrddl6wqcvq3kijqm6hs2rv4k"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme purrr riskRegression survcomp survival survivalROC]; }; pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; penfa = derive2 { name="penfa"; version="0.1.1"; sha256="1r8lq4kvlwlk7q0mdzkrdm9sx7lqq4l27jfxa1zcfh50sk1qlam2"; depends=[GJRM MASS mgcv trust]; }; - penppml = derive2 { name="penppml"; version="0.2.2"; sha256="0lspspk5bbxycfkwmw9sbz84rbhjsxmnza3692lrnadyrpaw3s39"; depends=[collapse devtools dplyr fixest glmnet magrittr matrixStats Rcpp RcppEigen rlang]; }; + penppml = derive2 { name="penppml"; version="0.2.3"; sha256="1pxfnq5z7aygd2i3qcn2nvzvbw83gp4zhy3bavir3vpjd655llc3"; depends=[collapse devtools dplyr fixest glmnet magrittr matrixStats Rcpp RcppEigen rlang]; }; pense = derive2 { name="pense"; version="2.2.0"; sha256="1v077lmi7hs793yqv9m4ir0hd8s671714nj2gf3ya48qjmbizyg0"; depends=[lifecycle Matrix Rcpp RcppArmadillo rlang]; }; pensim = derive2 { name="pensim"; version="1.3.6"; sha256="18z43p1iswmnvwaf3k5vhv6rzzmfn618har0a0bl9j5nfzx20rpx"; depends=[MASS penalized]; }; peopleanalytics = derive2 { name="peopleanalytics"; version="0.1.0"; sha256="0ay85yxx30p4i8icn8l8ppjddiwkbw1g6ymnmvw5gnd9hgmwbrx0"; depends=[]; }; @@ -14739,49 +14767,50 @@ in with self; { pepe = derive2 { name="pepe"; version="1.2.0"; sha256="1ihms63crxq0k7hd2yjyxmfw0yfy668srw012vi8mf8p31jdcr3j"; depends=[dplyr ggplot2 psych tidyr]; }; peperr = derive2 { name="peperr"; version="1.5"; sha256="0045bc206y13467kw5xh3awkwcz24sb5xmdcgh5x1w6q1cab7ygp"; depends=[snowfall survival]; }; peppm = derive2 { name="peppm"; version="0.0.1"; sha256="1lvk1rjsx39mb93s9pclriw4fmf1sx05s59qqx5m3aqb4q8ffxkg"; depends=[Rcpp]; }; - pepr = derive2 { name="pepr"; version="0.4.0"; sha256="0mnigx4lpl397k526sxp7ckrnp59hfrnm9gqcq0nx6j5d7379sp9"; depends=[data_table pryr stringr yaml]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; peptoolkit = derive2 { name="peptoolkit"; version="0.0.1"; sha256="067x3v8m3ph2mqcglbd2h4y7xsslcvdr5iailiqxzfqg77mcqxx6"; depends=[caret dplyr Peptides stringr]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; peramo = derive2 { name="peramo"; version="0.1.3"; sha256="0ngzf6piglr00r4i1m3r9mvlw67hs96lbfxv832vwisf631fdvlf"; depends=[dplyr emmeans lme4 magrittr parameters]; }; - perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; }; percentiles = derive2 { name="percentiles"; version="0.2.2"; sha256="08gzl2qq0856nj20bdxl3r0a7p5f4cjmvxkaqkjvq4n275ghvskq"; depends=[assertive_types assertthat dplyr R6]; }; perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.1"; sha256="1i1h5k2aqaqygd8gzq2bmz266mjzdi2mfikkz6hzmhi2il8708w9"; depends=[ape phytools Rcpp RcppArmadillo]; }; - performance = derive2 { name="performance"; version="0.10.4"; sha256="0ddwfkrzwbj1bykvifzrb11hs5kh2a6ykr3ac1hi7cqpqikymfna"; depends=[bayestestR datawizard insight]; }; + performance = derive2 { name="performance"; version="0.10.5"; sha256="1bwcdz2iah6ya1p9ykbj5ybvzwlq9spv6mq3fn68cckymg0hs76r"; depends=[bayestestR datawizard insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; - periscope = derive2 { name="periscope"; version="1.0.2"; sha256="089pyb9hlf846ngjlggx1vygvsdyii3s13xbbgjmiy674j7srvkp"; depends=[DT fresh ggplot2 lubridate shiny shinyBS shinydashboard writexl yaml]; }; - perm = derive2 { name="perm"; version="1.0-0.2"; sha256="182ac1y91yzb34zwdcmx5fdfr5z0cha0gx2bgk36gwxhgfc994kj"; depends=[]; }; + periscope = derive2 { name="periscope"; version="1.0.3"; sha256="1llni5xs5fpnls3zysx0wrp4hc40qc6ll9vdpmffs6v2irnz43bz"; depends=[DT fresh ggplot2 lubridate shiny shinyBS shinydashboard writexl yaml]; }; + periscope2 = derive2 { name="periscope2"; version="0.1.3"; sha256="16w730jy6viqvzvn1lvbjxfy4jqlf6wmpz957lf98kpy0g94hjg0"; depends=[bs4Dash DT fresh lubridate shiny shinyWidgets writexl yaml]; }; + perm = derive2 { name="perm"; version="1.0-0.4"; sha256="1sbvc9pd8j4wigblncd5jsgfnphp4kz1jy3acyivcclh79wh27jn"; depends=[]; }; permChacko = derive2 { name="permChacko"; version="0.1.0"; sha256="0in292c8yclmhbzkdcv4abqh1gh2xwjlbd7k54mqhjj1m51y1l6p"; depends=[]; }; permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; }; - permPATH = derive2 { name="permPATH"; version="1.2"; sha256="074knhcn88nzisfl20ais71micnnjqbm5lqp6jfkqj176r2af7cq"; depends=[R2HTML xtable]; }; + permPATH = derive2 { name="permPATH"; version="1.3"; sha256="1xjhpndlqdafv7g5yrps2rby8by76sh6y7kg2jhwbh6bv7x0d975"; depends=[R2HTML xtable]; }; permimp = derive2 { name="permimp"; version="1.0-2"; sha256="1zq513bkallkkqghjilvgc5iw0pcglrdyc0r2sns4ck07a3q378j"; depends=[ipred party randomForest survival]; }; - permubiome = derive2 { name="permubiome"; version="1.3.1"; sha256="0a4swfkmqqr8a1psc6rlnxnpm43fj42gjkikcqy8d84wrfz2wrr9"; depends=[dabestr ggplot2 gridExtra Matrix rlang]; }; + perms = derive2 { name="perms"; version="1.11"; sha256="027npxl4213nfzkpaigb015djbqsssfvb5lwfs17qrzvp5qqw53m"; depends=[doParallel foreach MASS mclust Rdpack]; }; + permubiome = derive2 { name="permubiome"; version="1.3.2"; sha256="102xmz27c97nc6wlllqq1k3nkvv28a0j7vx1msl0c7m6w2z6395b"; depends=[dabestr dplyr ggplot2 gridExtra Matrix rlang]; }; permuco = derive2 { name="permuco"; version="1.1.2"; sha256="0lh7n94hchq7wcp8j27c1m2v0xa5mq1dzpdvzkv2cwagy45v4383"; depends=[Matrix permute Rcpp]; }; permutations = derive2 { name="permutations"; version="1.1-2"; sha256="0ilwf5d3cl6vv7dgdcdw4crlrxa6h5q4d3z17la71k3cz6ib3hvk"; depends=[freealg magic mathjaxr numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-7"; sha256="1h4dyhcsv8p3h3qxsy98pib9v79dddvrnq7qx6abkblsazxqzy7g"; depends=[]; }; - permutes = derive2 { name="permutes"; version="2.6"; sha256="03raz8vmb9wnhw6qsfizjjix6cdw5f0nqbq2375i0316njna4nsc"; depends=[plyr]; }; + permutes = derive2 { name="permutes"; version="2.8"; sha256="1ibpjg72vfvw3yvldqka0c70ydxvl2vbpqv1cn07yiwf7l0d5f51"; depends=[plyr]; }; perry = derive2 { name="perry"; version="0.3.1"; sha256="0c3i9dc6hfdjfkjq2p630w6l1pz21mmqb8p0ikv6m159cfl3i3nq"; depends=[ggplot2]; }; perryExamples = derive2 { name="perryExamples"; version="0.1.1"; sha256="1abfrri0lq7iwdlk1qfzlq8378xpyvzfwcg1i18rmndfwsyyihjp"; depends=[lars perry quantreg robustbase]; }; - persDx = derive2 { name="persDx"; version="0.4.0"; sha256="0c6rj1ydljghr3lm11s0p7b48wifhq1cnwn6nrlm01pg18z0mzdd"; depends=[pROC survivalROC]; }; - persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; + persDx = derive2 { name="persDx"; version="0.5.0"; sha256="14lafg5xhpp7m2shhf7ymfikl83ldqzssji61vwgqhvk78kaw3dc"; depends=[pROC survivalROC]; }; personalized = derive2 { name="personalized"; version="0.2.7"; sha256="0dx8qy89s2za4v17k02gi4ybkpahbgkyizsb42s4ckx5gjvw1ck7"; depends=[foreach ggplot2 glmnet kernlab mgcv plotly survival xgboost]; }; personalized2part = derive2 { name="personalized2part"; version="0.0.1"; sha256="104flqjyf0x0619msyc0vlkg61znvhf0v86fsdpksdxkgwb7wv7j"; depends=[foreach HDtweedie personalized Rcpp RcppEigen]; }; personalr = derive2 { name="personalr"; version="1.0.3"; sha256="0lla3hy624bqmhwmrsr6my3lw00xm52d935zxjnh7sx05pikkcsv"; depends=[desc devtools fs glue magrittr purrr rprojroot rstudioapi usethis withr xfun]; }; personr = derive2 { name="personr"; version="1.0.0"; sha256="12iyzdc2kksy74npzdgy19lnhm9l9c7f4lkwshmsp6by09kb2dm3"; depends=[ggplot2 rlang rmarkdown shiny whisker]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturbR = derive2 { name="perturbR"; version="0.1.3"; sha256="1sdk5ls8x66lds4cy40xbl383px4xmrh21cw4bgy83rzbjjzwp2h"; depends=[ggplot2 igraph]; }; + peruflorads43 = derive2 { name="peruflorads43"; version="0.1.1"; sha256="12wsnnsjf6ih8lkpq4k20awicxwcdv7m466vvw2afmky844kq0ss"; depends=[]; }; peruse = derive2 { name="peruse"; version="0.3.1"; sha256="10j942fr5jpygl4z8vn2ww2kjiplga5s45c448bclnq1qx3as36k"; depends=[magrittr rlang]; }; - pesel = derive2 { name="pesel"; version="0.7.3"; sha256="125rgbar1aiw7x3ywfb09s3gh3k0zal0p44h4928d854mn4m986s"; depends=[]; }; + perutimber = derive2 { name="perutimber"; version="0.1.0"; sha256="119zilijflhj8a9hn4swdpgy99ffa9n7b53wphgi4641hlnlpif5"; depends=[lifecycle]; }; + pesel = derive2 { name="pesel"; version="0.7.5"; sha256="06d10yzarnfifvdx6lch4fpag5qignjpij513kip1d9afrs3gm73"; depends=[]; }; pestr = derive2 { name="pestr"; version="0.8.2"; sha256="15w89cipky9di4csbp0cbw7s3qslr5mk94wivps77i3k0j9ys74g"; depends=[curl DBI dplyr httr jsonlite magrittr readr rlang RSQLite tidyr]; }; petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.3.0"; sha256="0s67clfpphwxx8lyb2559sk6i6a5zmxdds0pzfj23blbacnlk16c"; depends=[DiagrammeR dplyr lifecycle purrr visNetwork xml2]; }; pewdata = derive2 { name="pewdata"; version="0.3.2"; sha256="1a4ci8hzpmwxs48lsppswcwkxv72yn44w486m9izwvx8wr1nlh2d"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; - pexm = derive2 { name="pexm"; version="1.1.2"; sha256="1asw7z2dr9bqsxzfjyj0hf1zfym743315597ds2h3xvwwvsirwzj"; depends=[coda msm rjags]; }; pez = derive2 { name="pez"; version="1.2-4"; sha256="1z3lpbijivr32r9y0lh2yxsww7sz9kqmsvnril1gzn09d498xz3b"; depends=[ade4 animation ape caper FD Matrix mvtnorm phytools picante quantreg vegan]; }; pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; pfica = derive2 { name="pfica"; version="0.1.3"; sha256="10njqflljcp8rxm5l7aqg6x93wbivdzvkjh7q6z01syblgb9755l"; depends=[expm fda whitening]; }; + pfr = derive2 { name="pfr"; version="1.0.0"; sha256="00fq3d2np5vvvyj6m2zc4hyjaz79j2fdhyxg7rqg71ibaq02r9cn"; depends=[inline rstudioapi]; }; pg = derive2 { name="pg"; version="0.2.4"; sha256="0dbviqi7v1jyxj8nav0w25mghgbv077mgcnznr0pfh85lwzpkawr"; depends=[Rcpp RcppArmadillo]; }; pgTools = derive2 { name="pgTools"; version="1.0.2"; sha256="1262q30ci6h10sk54s9wbadz6v22y4k6m32sclxw93kkvgvlkj6b"; depends=[data_table DBI odbc stringi toolbox]; }; pgam = derive2 { name="pgam"; version="0.4.17"; sha256="03sln908xwg909m3pxi6ihpq3vzb0v0mj6yac7bx29x5rxcd6psy"; depends=[]; }; @@ -14790,7 +14819,7 @@ in with self; { pgenlibr = derive2 { name="pgenlibr"; version="0.3.5"; sha256="1njc0y2pni834wj73cpvx40hw5v8ggnzmmalbrj0iw9zjn4729py"; depends=[Rcpp]; }; pgirmess = derive2 { name="pgirmess"; version="2.0.2"; sha256="1wdfybi6s976sqa8n1q7jni99xbwdmbi0zycl4nqk4kl1nqixlbm"; depends=[boot sf sp spdep]; }; pglm = derive2 { name="pglm"; version="0.2-3"; sha256="16ghdgnpwyqgfa6z6gc93bw933dvazb3alv1867cbn7qnp2gaj3j"; depends=[Formula maxLik plm statmod]; }; - pgmm = derive2 { name="pgmm"; version="1.2.6"; sha256="0wbczca8dmkkhm72dwali9n67zmsc5zd1v55zn3d6kmhh3jjwcyj"; depends=[]; }; + pgmm = derive2 { name="pgmm"; version="1.2.7"; sha256="08fz5la19fnzsk80d1nsqg0fd27z3bq3s8kzizj11r5k1fn95sy8"; depends=[]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; pgraph = derive2 { name="pgraph"; version="1.6"; sha256="1mfpyj4ahs5szkzzv5fs9g26651vcnign3mkfgp23g8nlrs50cqa"; depends=[energy glasso glmnet SAM]; }; pgsc = derive2 { name="pgsc"; version="1.0.0"; sha256="1y4szqn1jhp3yn8q738dpbhnqcqk45vgbmczamai154w3wb0qai7"; depends=[nloptr Rcpp RcppArmadillo reshape2]; }; @@ -14800,8 +14829,11 @@ in with self; { ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; phacking = derive2 { name="phacking"; version="0.2.1"; sha256="0spx3aq35mpd6z87zfn4019jnazang45w3ly2p8kgxcp0wqj67h8"; depends=[BH dplyr ggplot2 metabias metafor purrr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders truncnorm]; }; phangorn = derive2 { name="phangorn"; version="2.11.1"; sha256="086lxqzqx1n3237h9q28r54libaz2xk9h3f6vfj8l49yw356w28h"; depends=[ape digest fastmatch generics igraph Matrix quadprog Rcpp]; }; + phantSEM = derive2 { name="phantSEM"; version="1.0.0.0"; sha256="099kflbj66wfkl7b6f1l68763b7qkpjihp4r1xih5lvjwc8ap0b9"; depends=[corpcor dplyr lavaan tidyr]; }; pharmaRTF = derive2 { name="pharmaRTF"; version="0.1.4"; sha256="1h16r4yhlm6mbwq3k24ssm70bsrg2hvykqh8dayigz5wi2nq5c1f"; depends=[assertthat huxtable purrr stringr]; }; pharmaverse = derive2 { name="pharmaverse"; version="0.0.2"; sha256="0wvil5fswdzfvmqii5j7y81ik2bwjznywb8c9nj3yd99az96qxg4"; depends=[httr]; }; + pharmaverseadam = derive2 { name="pharmaverseadam"; version="0.1.1"; sha256="1cz8jpn29krhnsx6gvp4kdaajr75kf4rskcg5y5q4ljarq892qzc"; depends=[]; }; + pharmaversesdtm = derive2 { name="pharmaversesdtm"; version="0.1.1"; sha256="1gbf6b29nls47i0kw4b5xhd4bgqhyza18k93k58rwn7xjy6rfhcy"; depends=[]; }; pharmr = derive2 { name="pharmr"; version="0.96.0"; sha256="0kwa3jvchayx7jkfp896h0dkq2h2nw5wj0fpnqvspfj0r94pg8m1"; depends=[altair reticulate]; }; phase = derive2 { name="phase"; version="1.2.9"; sha256="12v453jn99jzvicr5xipzkgb1yqmrkv9gbpw7ykl19kakw7qnqs3"; depends=[behavr circular lubridate plotly pracma shiny shinycssloaders shinydashboard shinyFiles shinythemes signal wesanderson zeitgebr zoo]; }; phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.2"; sha256="0gr73nsp0an0ci6l86h9fw6l791jdw0b1497qi58w25zypggdyac"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS plyr RColorBrewer reshape2 rjags]; }; @@ -14821,8 +14853,8 @@ in with self; { phenocamr = derive2 { name="phenocamr"; version="1.1.5"; sha256="1w9lzlmp4q2x12qhp4xmschcd79razy5fybq94381l7dshrwvzln"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; }; phenofit = derive2 { name="phenofit"; version="0.3.8"; sha256="0rnjlhqwjcdmskx58wzh0drhnili4jhkr88lrafa6hi8mc1ppcjz"; depends=[data_table dplyr ggplot2 gridExtra lubridate magrittr numDeriv optimx purrr Rcpp RcppArmadillo stringr ucminf zeallot zoo]; }; phenolocrop = derive2 { name="phenolocrop"; version="0.0.2"; sha256="07wihmqcj32c40a19ivmva7kmm6j79bkbng08j05cr1m21whz2y9"; depends=[purrr]; }; - phenology = derive2 { name="phenology"; version="9.0"; sha256="05i826njk7xd5015sw2nhky1zxilw1v4zdgx0q7lq25ymx23i2p0"; depends=[HelpersMG numDeriv optimx]; }; - phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; + phenology = derive2 { name="phenology"; version="9.1"; sha256="095697ahyhl70h9wlwfbxqp6d9z8kc08k450apx65m1jvcl6jq1b"; depends=[HelpersMG numDeriv optimx]; }; + phenomap = derive2 { name="phenomap"; version="2.0.1"; sha256="12yzp1801csbhq7b0341rg641wf040mj2p2mgabs2b400pm7h4sr"; depends=[doParallel phenex plyr stringr terra]; }; phenopix = derive2 { name="phenopix"; version="2.4.3"; sha256="1vhv2adv9k5gczcdqsbizdl58mzz47w60zwnv6hx650yirddgx3b"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phers = derive2 { name="phers"; version="1.0.2"; sha256="00w84l5p9rwq3hgjx792fk2yhrnal143ph29ybcqrha40hglbbas"; depends=[BEDMatrix checkmate data_table foreach iterators survival]; }; phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; @@ -14835,7 +14867,7 @@ in with self; { phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.11"; sha256="0a5qnl1r8g0h1nsp22awp6hy0lkdi6adc729grpz8mbniz4vdlkc"; depends=[phonTools rmarkdown tuneR uchardet xml2]; }; phonics = derive2 { name="phonics"; version="1.3.10"; sha256="1g4gmfz190xaj800gawl79fzhmgimssa31kqzw8a70scp5psz3fw"; depends=[BH data_table Rcpp]; }; phosphoricons = derive2 { name="phosphoricons"; version="0.2.0"; sha256="0g9qqgxnzi773mjrrzvlykmvqb7dpi2gxc999arbxkdnbp1lv463"; depends=[htmltools]; }; - photobiology = derive2 { name="photobiology"; version="0.10.17"; sha256="1anrs6182wrcndnyfrdgyxh67xap0xxqzsl58fhiw611xbky5rw6"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble tidyr zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.11.0"; sha256="15x6nzl2pgs1bz37z5zn9gphi93c1gibps7gjf10v9rw0ll4gj8q"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble tidyr zoo]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.2"; sha256="0n987klwyj06xikmvg9cvsjzrxll1d7p358jw4ls0j46byki98s5"; depends=[photobiology]; }; photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.27"; sha256="1z5vyh44mp4nfp3b2piv6fs8b6k963yw0zb2dgiz8qfgzsyfhnzr"; depends=[anytime colorSpec dplyr lubridate photobiology readr readxl stringr tibble tidyr tidyselect]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.5.1"; sha256="1wlf8n7g9scnnz3gimbpfn1klqd88ff5yddvcsas6qb8bn7ia3aa"; depends=[photobiology]; }; @@ -14844,10 +14876,11 @@ in with self; { photobiologySensors = derive2 { name="photobiologySensors"; version="0.5.0"; sha256="122cfy6nsxngd8hnbq5frkgnzrb9fxw83l7mfwk0wy6gx7zsfx5s"; depends=[photobiology]; }; photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.5.1"; sha256="0ckfs0kc14478fab35ayilmmvq72ph5bpdhbbb1kmwv3lf40lnc8"; depends=[photobiology]; }; - photosynthesis = derive2 { name="photosynthesis"; version="2.1.3"; sha256="0ahbfcbdrvh9x09x8fl4gh4lz2qk58kn8068ivsgnjmv6ais3ipd"; depends=[checkmate crayon dplyr furrr ggplot2 glue gunit lifecycle magrittr minpack_lm nlme progress purrr readr rlang stringr tealeaves units]; }; + photosynthesis = derive2 { name="photosynthesis"; version="2.1.4"; sha256="1bilhqzhwxanlxvn98piysv45bpw7zh7f5w56rvllxgrpmra68pq"; depends=[checkmate crayon dplyr furrr ggplot2 glue gunit lifecycle magrittr minpack_lm nlme progress purrr readr rlang stringr tealeaves units]; }; + phrases = derive2 { name="phrases"; version="0.1"; sha256="1am90fgi8bqf4mmw797knczj7pv7py2in4rm0m6l1xz4zfjihqw3"; depends=[tidyverse usethis]; }; phreeqc = derive2 { name="phreeqc"; version="3.7.5"; sha256="13z1pl2hqv26bm6k3zj9hh69xw0jf1swjimmib82r8n0xjs5dy8m"; depends=[]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; - phyclust = derive2 { name="phyclust"; version="0.1-33"; sha256="04x4ymqnmc20pns89i4zs2yp75vchdgjszsinnpddjiv3446cy1q"; depends=[ape]; }; + phyclust = derive2 { name="phyclust"; version="0.1-34"; sha256="1wzmd02ng7zphn97xdra3hgivrxqpizqcy5kpg45sk7jx4q7016j"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; depends=[]; }; phyloTop = derive2 { name="phyloTop"; version="2.1.2"; sha256="1f7sr0qp5i0kj1j2xr7fwpkjnpfnpdjy51dx33yz2q8jmn2axxdf"; depends=[ape igraph NHPoisson phylobase]; }; @@ -14858,17 +14891,19 @@ in with self; { phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; }; phylolm = derive2 { name="phylolm"; version="2.6.2"; sha256="04pz7i44s8w6py4nk2zilzjlkrf1c5dbb6jij7zfkk49hvslbynn"; depends=[ape future_apply]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; - phylopath = derive2 { name="phylopath"; version="1.1.3"; sha256="1j0gqd5027zd7xw6c8gkdqxwzqf0gw73m709gxqzk91xscnshg6q"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; }; - phyloregion = derive2 { name="phyloregion"; version="1.0.6"; sha256="161pjy66vhpjwc4h9q4jiqpyzn0v4nawx8ahspjpc7a376rk5552"; depends=[ape betapart clustMixType colorspace dismo igraph Matrix phangorn randomForest raster rgdal rgeos sp vegan]; }; + phylopath = derive2 { name="phylopath"; version="1.2.0"; sha256="1bmsnxkr9cd7v84rkdxy5f9bwh4siwggkq0g23y8pcpl8v9vs8ph"; depends=[ape future_apply ggm ggplot2 ggraph igraph MuMIn phylolm purrr tibble]; }; + phyloregion = derive2 { name="phyloregion"; version="1.0.8"; sha256="10i5s3dv71nr0m3wmph2rynzg9zj8xqzb6a25r5kj66r8v91jz3d"; depends=[ape betapart clustMixType colorspace igraph maptpx Matrix phangorn predicts smoothr terra vegan]; }; phylosamp = derive2 { name="phylosamp"; version="1.0.1"; sha256="1y48c4qjcxcxia2ggp2dfi051z8zpp0a0ks3a7h69gsw34vh9kd7"; depends=[cli lifecycle rlang]; }; + phylosem = derive2 { name="phylosem"; version="1.1.0"; sha256="1j9cpfaylnsmrzxq43sqh94zvwd2ppd9w7yq52hkikxgldrsvi8q"; depends=[ape phylobase phylopath RcppEigen sem TMB]; }; phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.1.0"; sha256="0y1hxj68dcic4i7ihnw9hgf28qp6s6kpq4c08dy7gv19gq7sllgd"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; - phylosignal = derive2 { name="phylosignal"; version="1.3"; sha256="1h73wwczwak5v89mybq16lmmfr0fxfv5mx347ffipy6q9vgvwqx5"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; + phylosignal = derive2 { name="phylosignal"; version="1.3.1"; sha256="13gahqnxvqzvyr4x1aq3cq08832ljizsa5c71hf44175dfmdz5cd"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylotate = derive2 { name="phylotate"; version="1.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; - phylter = derive2 { name="phylter"; version="0.9.7"; sha256="1gdpm6pq4gncgqb5cznr6z2m6gnma8mlwpvm31s50a8rj9qz3hp1"; depends=[ape ggplot2 mrfDepth reshape2 Rfast RSpectra]; }; + phylter = derive2 { name="phylter"; version="0.9.11"; sha256="1dkm6wfrmbbx7ygfbvk68mv4ay3986wzy0wadxskbbvbvqcshjqa"; depends=[ape ggplot2 Rcpp RcppArmadillo RcppEigen reshape2 Rfast RSpectra]; }; phyr = derive2 { name="phyr"; version="1.1.0"; sha256="0jvjxvxx2nz9ra9vp00bmm3dxr2am4zs8cvxij8w4jjyskznxc96"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo tidyr]; }; phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; }; physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; }; + phytoclass = derive2 { name="phytoclass"; version="1.0.0"; sha256="0ci2xzhxzg8fmdjr1ij8r551mm5gzwcxbq328qnzkx8hyph7fbgf"; depends=[bestNormalize dplyr dynamicTreeCut ggplot2 Metrics RcppML tidyr]; }; phytools = derive2 { name="phytools"; version="1.9-16"; sha256="175jg56g6ag1q5p4isjprlgzc9ximlkanh7zxyc9jrqp59r0p00v"; depends=[ape clusterGeneration coda combinat doParallel expm foreach maps MASS mnormt nlme numDeriv optimParallel phangorn plotrix scatterplot3d]; }; piRF = derive2 { name="piRF"; version="0.1.0"; sha256="04k09ylc6hqw57dlv7sfnisn1167dr550y1j9xl7prvlf3jksg06"; depends=[Rdpack]; }; piar = derive2 { name="piar"; version="0.5.0"; sha256="1fh35cs73q24fwaxakysbm9jvv9vlmvz7ir2pqd9d1qgkv5a5n48"; depends=[gpindex]; }; @@ -14878,9 +14913,10 @@ in with self; { picker = derive2 { name="picker"; version="0.2.6"; sha256="1n7h1lvrivy7czzhisd9p3g187ivcyhzyjj7ahkimyb296gy8z1b"; depends=[htmlwidgets]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; piecemaker = derive2 { name="piecemaker"; version="1.0.2"; sha256="15zk36cpip49286djl45qqdfbj4w3yc6if1vk4bqphrascrg2val"; depends=[cli glue rlang stringi stringr]; }; - piecepackr = derive2 { name="piecepackr"; version="1.13.3"; sha256="1aa7yvgb75bfh7d5lvq8zh6wgg35cbwmkw7rq72kva1gzib9c8an"; depends=[gridGeometry grImport2 jpeg png purrr R6 rlang stringr tibble]; }; + piecepackr = derive2 { name="piecepackr"; version="1.13.8"; sha256="1cj623bwagjpj2ih7g8b5aqibq803jn5nam54gfpyw9lccphgp35"; depends=[gridGeometry grImport2 jpeg png purrr R6 rlang stringr tibble]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.3.0"; sha256="0f1ya6p85iai52cdm510zm6qvkpsfkn48948q8lz9v6ykz59v5h2"; depends=[car DiagrammeR emmeans igraph lme4 MASS multcomp MuMIn nlme performance]; }; piggyback = derive2 { name="piggyback"; version="0.1.5"; sha256="1vkawf3jk8ddzapgvbixzq2kswnprfpjkvinby4z5x9gg535lfwq"; depends=[cli fs gh glue httr jsonlite lubridate memoise]; }; + piglet = derive2 { name="piglet"; version="1.0.1"; sha256="09l2qj8naalk8ywkmx0wmk82jllyd60g373jvy619kz7ad9dc1xp"; depends=[alakazam Biostrings circlize ComplexHeatmap data_table DECIPHER dendextend dplyr ggmsa ggplot2 jsonlite magrittr R6 RColorBrewer rlang splitstackshape tigger zen4R]; }; pillar = derive2 { name="pillar"; version="1.9.0"; sha256="1k3sp37dpn46d2xbq621alpvzgnm06x5qb87nk169y47q23b8gpj"; depends=[cli fansi glue lifecycle rlang utf8 vctrs]; }; pim = derive2 { name="pim"; version="2.0.2"; sha256="0kwlm6n23ccs0jz4plsqprg6inj3qv74zhvg9gpxyj3ksvdxp58i"; depends=[BB nleqslv]; }; pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; }; @@ -14890,31 +14926,31 @@ in with self; { pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; pinp = derive2 { name="pinp"; version="0.0.10"; sha256="1qah1b9chn237pfxisjsn6rr4h9h9zdqrk323c0k1qds7vm0xpra"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="1.2.0"; sha256="1ziqg9q9gqjv7m2rgqpki9khsl31am7ylb3jrc2n1ayzlvg8zam9"; depends=[cli digest ellipsis fs generics glue httr jsonlite lifecycle magrittr purrr rappdirs rlang tibble whisker withr yaml]; }; + pins = derive2 { name="pins"; version="1.2.2"; sha256="0pmik7ixnyvjdc0r91hnmkhm5xh1ckw7s32x1p75cpyapb3bbarz"; depends=[cli digest ellipsis fs generics glue httr jsonlite lifecycle magrittr purrr rappdirs rlang tibble whisker withr yaml]; }; pinterestadsR = derive2 { name="pinterestadsR"; version="0.1.0"; sha256="0fjnb9kp3s3v7xp8cwrdljms6vwldq3n37lz5ly0j6wsw4p4ssx5"; depends=[jsonlite]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; }; - pipebind = derive2 { name="pipebind"; version="0.1.1"; sha256="02414573kxawmm2jbrzcph20lbjrwj23s3ybghajyn0d7daw9g41"; depends=[]; }; + pipebind = derive2 { name="pipebind"; version="0.1.2"; sha256="0z9xs4q06bis9xmzx260c0jn7v5vwvsrjlq32xd42vp56m0f63vw"; depends=[]; }; pipefittr = derive2 { name="pipefittr"; version="0.1.2"; sha256="0pzd7f0rhn0rydncki666zlajdwyiay3apa17cb0xy5454d99mvh"; depends=[magrittr miniUI rstudioapi shiny stringr]; }; pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; }; - pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; }; + piqp = derive2 { name="piqp"; version="0.2.2"; sha256="0cipmcbxfyply01kccv0bycip4lcg46s15g97fms8qijhpwi2n3c"; depends=[Matrix R6 Rcpp RcppEigen]; }; piratings = derive2 { name="piratings"; version="0.1.9"; sha256="0krrcf2bwicdf9fn657vkcjg5zliwi82hw3xmaqi46mdix8896gh"; depends=[ggplot2]; }; - pirouette = derive2 { name="pirouette"; version="1.6.6"; sha256="0mi2zg55m9hqlypgc3k3c2b06hisypkakkzghf7bpw1c1ysakym6"; depends=[ape babette beastier beautier DDD forcats magrittr mauricer mcbette nodeSub phangorn phytools plyr pryr readr stringr TESS tibble tidyr tracerer xtable]; }; - pisaRT = derive2 { name="pisaRT"; version="2.0.1"; sha256="0g4z4ixg7bsig1rjhsymncmzpl135r6mr3pqlb60gmz11851bw9w"; depends=[]; }; + pirouette = derive2 { name="pirouette"; version="1.6.9"; sha256="1khcfic386pyhxxyzv3c28krc6rpy334cdk1adawx7c87pyvsp16"; depends=[ape babette beastier beautier DDD forcats magrittr mauricer mcbette nodeSub phangorn phytools plyr pryr readr stringr TESS tibble tidyr tracerer xtable]; }; + pisaRT = derive2 { name="pisaRT"; version="2.0.2"; sha256="1dpskdi4kd9zajj2pl7n686sd2w8kai7zilrwsrcfgl1dkfr1m82"; depends=[]; }; pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; piton = derive2 { name="piton"; version="1.0.0"; sha256="1krf6zi238m275nxjlpyayv8y2drbgs2kg19dpkqm0lmlz5y5ar8"; depends=[Rcpp]; }; pivmet = derive2 { name="pivmet"; version="0.5.0"; sha256="15fq48grdsmgr3ximar8g45jhlbix6745965rfwl9sjwvwk1bb9q"; depends=[bayesmix bayesplot cluster corpcor MASS mclust mvtnorm rjags rstan runjags scales]; }; pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.2.0"; sha256="141aaanb00qc3z4mdws42zhg7j6bcd2i1gp6nf6h6h7ikkmr0v0y"; depends=[curl httr]; }; pivotea = derive2 { name="pivotea"; version="1.0.1"; sha256="1lrxpvas2m3p25x8j9mjbvpnsz984i847knibfjpmhkwyd3ik86z"; depends=[dplyr magrittr purrr rlang tidyr]; }; - pivottabler = derive2 { name="pivottabler"; version="1.5.4"; sha256="1ri6fc88lmnl1795yx3m973ybd85cvn3d4zcwkm5sfivlccd83yi"; depends=[data_table dplyr htmltools htmlwidgets R6]; }; + pivottabler = derive2 { name="pivottabler"; version="1.5.5"; sha256="1kf9z2ashfvgjl0sviryx2r9b9k1k9j9b9nzivr1nxm0d9x9n3yn"; depends=[data_table dplyr htmltools htmlwidgets R6]; }; piwikproR = derive2 { name="piwikproR"; version="0.4.0"; sha256="0xyhqpg34052m1liyzm77fkg7my42zvd7s8l232s575dfkvafqs8"; depends=[digest dplyr fs glue httr lubridate magrittr purrr readr rjson rlang stringr tibble tidyr]; }; pixarfilms = derive2 { name="pixarfilms"; version="0.2.1"; sha256="1qycg7ar9l3myj14xvidxrm9svdf5xmw7ss0m33q266nzwssiqpk"; depends=[tibble]; }; - pixelclasser = derive2 { name="pixelclasser"; version="1.1.0"; sha256="18jm122b8rd5idij8l6q4qgs64p54yvha8n1qb3ihr9h3q2g72a4"; depends=[jpeg tiff]; }; + pixelclasser = derive2 { name="pixelclasser"; version="1.1.1"; sha256="0nkym141dmyy8783nv78pps3lyfpk31fdziq990j45napv8kiamy"; depends=[jpeg tiff]; }; pixelpuzzle = derive2 { name="pixelpuzzle"; version="1.0.1"; sha256="0z0afcjv9wpz5fw21vhv11jx2wrl4fy5nf9q5x5adwncsdmrqjhz"; depends=[beepr cli stringr]; }; pixels = derive2 { name="pixels"; version="0.1.1"; sha256="1vvahrajm8ys5vgfc0iyzj2a6vzvgaakkj6i0m2sy40l2w44dn0q"; depends=[htmlwidgets miniUI shiny]; }; - pixiedust = derive2 { name="pixiedust"; version="0.9.1"; sha256="1jy3xr4wpfs8j3giyia1kwrb5nlmqjbjwvj9qpax6izmcdk4srz2"; depends=[broom checkmate htmltools knitr labelVector magrittr reshape2 scales]; }; + pixiedust = derive2 { name="pixiedust"; version="0.9.4"; sha256="17gaahjzmjgqdkjqjpa7rh3wj1wx55v032ylijqaqklpfnbn7jkq"; depends=[broom checkmate htmltools knitr labelVector magrittr reshape2 scales]; }; pixmap = derive2 { name="pixmap"; version="0.4-12"; sha256="1v1a1adsgh5jlvvi98j4nhb1h681s97ip76zdrga12rlsjaahfw9"; depends=[]; }; pk4adi = derive2 { name="pk4adi"; version="0.1.3.2"; sha256="0iq34byjg5hvmg282z6ppjag5df0y0adij1d1zn32966c1mq9ad2"; depends=[data_table]; }; pkdata = derive2 { name="pkdata"; version="0.1.0"; sha256="1kmcalidw2zidd6i8ds0k057b3187by2k8z6764va43d5garbbcv"; depends=[lubridate]; }; @@ -14929,30 +14965,31 @@ in with self; { pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.4"; sha256="1fr650yb4wjz6flq4f8p2p5bck5q4kkrhlhlwjn832payq9p4zsp"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkglite = derive2 { name="pkglite"; version="0.2.1"; sha256="0kc2h9d0kszvgc5bhzar4h4y604msmdmcc1agvn9irffm54x848d"; depends=[crayon magrittr remotes]; }; - pkgload = derive2 { name="pkgload"; version="1.3.2.1"; sha256="1ckl6cqjk93n91p1i42hza6dciygsc25mibdif89vnyb7w97p651"; depends=[cli crayon desc fs glue rlang rprojroot withr]; }; + pkgload = derive2 { name="pkgload"; version="1.3.3"; sha256="0nb9h61l57cb7yzmsmh5q650zdd7nda6cmnd6m5cqyb4hwi832dh"; depends=[cli crayon desc fs glue pkgbuild rlang rprojroot withr]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.32.10"; sha256="0cr95vmsb4gkl917wg4wwq8jihvwasdg18qzhk2cq224lrrh8awp"; depends=[assertthat codetools digest registry stringr withr xtable]; }; - pkgndep = derive2 { name="pkgndep"; version="1.99.2"; sha256="1x2cd3hhbq3fi1hgwyh7yxk0hq8rq9wq15i7739d0z0vgs9m4kwp"; depends=[BiocManager BiocVersion brew ComplexHeatmap GetoptLong GlobalOptions hash]; }; + pkgndep = derive2 { name="pkgndep"; version="1.99.3"; sha256="1llpizr2wkhfgygr9fd79qxym0xcrxfvz8w5n0kwvkvlq3iqid44"; depends=[BiocManager BiocVersion brew ComplexHeatmap GetoptLong GlobalOptions hash]; }; pkgnet = derive2 { name="pkgnet"; version="0.4.2"; sha256="0y1b5psn680agsnyiy8yr5m5pzb1y6wsa7gms43nwgj6jjmmvgvv"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; pkgnews = derive2 { name="pkgnews"; version="0.0.2"; sha256="0kqyy1fchpcyclxh6gly23pkfcf5b3hpsq1bhj4ykzbl4bc002h2"; depends=[]; }; pkgsearch = derive2 { name="pkgsearch"; version="3.1.2"; sha256="0j0rckhv1lcwlc05ng637n1jv9yyxb6iws91i3mz9qnl5wis8061"; depends=[curl jsonlite parsedate prettyunits]; }; pkgstats = derive2 { name="pkgstats"; version="0.1.1"; sha256="0cmpr27pfkykwp2dwflixwlz3pf16hajvf3ppwx73k2l492cp75c"; depends=[brio checkmate cpp11 dplyr fs igraph readr sys withr]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; - pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; + pkmon = derive2 { name="pkmon"; version="1.1"; sha256="0na3z7v67gjpz15fkbf4yfwk4kiz7y79z2f7ccay8x855jzlbklx"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.3"; sha256="1wi29nnljc096bazicrzvmdqachrwhgwcyq930jrbs6kk7hihrqz"; depends=[binr foreign forestplot rtf]; }; pks = derive2 { name="pks"; version="0.6-0"; sha256="1wmpnpssmipkzfwsvdq33yhl9cba0i81w3rmwd4fbjvphx8bf7ax"; depends=[sets]; }; pksensi = derive2 { name="pksensi"; version="1.2.3"; sha256="0dds9xz484505zclf43gj1w33rm8iy9y0dprj1z0qjihkd9351k6"; depends=[data_table deSolve doParallel foreach ggplot2]; }; plac = derive2 { name="plac"; version="0.1.3"; sha256="0n7d8pzz2fk4npx71c2h7yqp5r3pvfgp7jhh6q82vfc0a3kny6cs"; depends=[Rcpp RcppEigen survival]; }; placer = derive2 { name="placer"; version="0.1.3"; sha256="0d7b6mkyyrcjn1pqxlj9mjis6vzks986i7vhc8ffkp8hz8sc7271"; depends=[]; }; - places = derive2 { name="places"; version="0.1.1"; sha256="08w6z5gbsskcbi5j1rml9mi9qdab6w2q58vz80h6xc6bh6mr0fab"; depends=[data_table dplyr geosphere googleway hms rgdal rlang sp stringr tidyr]; }; plainview = derive2 { name="plainview"; version="0.2.1"; sha256="1ckcwbkygflb25pz5k4d76dsc608zyd1q35hbfhym7h44krx5cz9"; depends=[htmltools htmlwidgets lattice png raster viridisLite]; }; - plan = derive2 { name="plan"; version="0.4-4"; sha256="0xpl1hrq0cs1bi8wn1bb1d4lmb6g1dfzp8wlwa9g2bc12yw5q8hg"; depends=[]; }; + plan = derive2 { name="plan"; version="0.4-5"; sha256="0p81pzysbl58580393hw90w5svqiva9yvcwlmx247fld83lbh9qq"; depends=[]; }; planets = derive2 { name="planets"; version="0.1.0"; sha256="01zh7lgaykr9p186yy0vksn2pmc69b3xxh78w7z6wclvqjb7zh1p"; depends=[]; }; planningML = derive2 { name="planningML"; version="1.0.1"; sha256="1s9lf43kkiciqkrcyq9icxdqfs8a1za60pwpbxnrdsa7gzf76i29"; depends=[caret dplyr glmnet lubridate Matrix MESS pROC]; }; + planr = derive2 { name="planr"; version="0.1.1"; sha256="0pam4jmclsl2hn2mm9aymyqbxzqga9kfm3c0rws2rl9gmarg80g1"; depends=[dplyr magrittr RcppRoll]; }; plantTracker = derive2 { name="plantTracker"; version="1.1.0"; sha256="0qn07pb84j110zrml24gwb27za4wdxn0a4yfhc0c1174fipl6az1"; depends=[igraph Matrix sf units]; }; plantecophys = derive2 { name="plantecophys"; version="1.4-6"; sha256="1qf9a38n8nvvz8dvqra9mdsmkbkhxymjrin0wfis8g1ndf1f406c"; depends=[]; }; plantecowrap = derive2 { name="plantecowrap"; version="1.0.4"; sha256="0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8"; depends=[ggplot2 minpack_lm plantecophys tidyr]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; plasma = derive2 { name="plasma"; version="1.0.0"; sha256="0vxgs0vicpd39ynlnc1xpvimb4327njqlasm9xc5ccffbxnywg36"; depends=[beanplot oompaBase pls plsRcox Polychrome survival viridisLite]; }; + plasso = derive2 { name="plasso"; version="0.1.1"; sha256="0ilfgc8yd4rgbh4g3536c7pfy6yjf7hl894cnjddqp9g0xk0annn"; depends=[doParallel foreach glmnet iterators Matrix]; }; plater = derive2 { name="plater"; version="1.0.4"; sha256="0k2ha44ydcf180y44cgxd1haq55k96df39lahs6fji04imh75fii"; depends=[dplyr rlang]; }; platetools = derive2 { name="platetools"; version="0.1.5"; sha256="0qzq7r8ff27cwmxw649jvk9irm6ny2mz4ylmrpzdkahkskfb5arj"; depends=[ggplot2 RColorBrewer]; }; platowork = derive2 { name="platowork"; version="0.0.1"; sha256="09ps20lqli50nhhd3368fwf8cjsbshn428fbbbckbxnynxk5cwsy"; depends=[]; }; @@ -14965,7 +15002,8 @@ in with self; { plfMA = derive2 { name="plfMA"; version="2.0"; sha256="14v3q4sv3inax3b1sp0i4scrz70ca9yphzikhx0z9dh2w5mggq0k"; depends=[gWidgets2 gWidgets2tcltk limma RColorBrewer tkrplot]; }; plfm = derive2 { name="plfm"; version="2.2.5"; sha256="0vcr1abzslsds0w4y2gyrrlbmqmxi5007km5fbj1xq2mrwjmngpp"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-12"; sha256="06sk9i6fn66w0lrzkj5b95m3xb66d9b602kwh6nkxyh9bjryd70l"; depends=[mvtnorm tgp]; }; - pliman = derive2 { name="pliman"; version="2.0.0"; sha256="1al6r9qgmy26ahqnqlxjjrad1j5c3ici8vs2k91pp3f6hkah5k3q"; depends=[doParallel foreach raster Rcpp RcppArmadillo]; }; + plgraphics = derive2 { name="plgraphics"; version="1.2"; sha256="04i79hrsqqygiq64n7bqzfvrhl1c3k2j3y58zzbqq79v9vshjy7p"; depends=[chron lme4 MASS survival]; }; + pliman = derive2 { name="pliman"; version="2.1.0"; sha256="0pgv7ayb78k481yd071hjvympikhdw6q8wqb9d5fazp9avmjlfz7"; depends=[doParallel foreach Rcpp RcppArmadillo sf stars terra]; }; plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; plinkFile = derive2 { name="plinkFile"; version="0.1.0"; sha256="0803hp822v9rqh4h437q2nmab19yamc4dbyi6iimm67ykp0d5xss"; depends=[]; }; plinkQC = derive2 { name="plinkQC"; version="0.3.4"; sha256="0l5gf7wf33fhzby0n2qzph02v7an2gj2dji1i129hxsxqnynx7dy"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; }; @@ -14979,19 +15017,18 @@ in with self; { plotBart = derive2 { name="plotBart"; version="0.1.7"; sha256="10lkdrmc1f22m544w36ihpivicj1mw0x8cx1750ldyhphrd99za5"; depends=[bartCause dplyr ggdendro ggplot2 rpart tidyr]; }; plotDK = derive2 { name="plotDK"; version="0.1.0"; sha256="0lyhhc8yjxj3jhw72pn7i565z64mifi5iyc375yavs7axlcsl2nr"; depends=[dplyr ggplot2 mapproj plotly purrr rlang]; }; plotGMM = derive2 { name="plotGMM"; version="0.2.2"; sha256="1cgjajw3dprdlq9ri0gllbxcy33x311mbp9xdds8fgq6cs42ggyb"; depends=[amerika ggplot2 wesanderson]; }; - plotHMM = derive2 { name="plotHMM"; version="2022.1.25"; sha256="0qkr6w558aj9nbchvwi48k6m4g36zd3q2phbhl95rawsxv3dwdja"; depends=[Rcpp RcppArmadillo]; }; - plotKML = derive2 { name="plotKML"; version="0.8-3"; sha256="093nbh2558pmca0vaq1xf5gyfy4p60fzgpkx8hyxifj99zvym50j"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plyr raster RColorBrewer rgdal scales sf sp spacetime stars stringr XML zoo]; }; + plotHMM = derive2 { name="plotHMM"; version="2023.8.28"; sha256="12mxkd1m3ivk25sr5sg97q2l2v5m95pmfhbrhrp9jmmpqfr1l983"; depends=[Rcpp RcppArmadillo]; }; plotMCMC = derive2 { name="plotMCMC"; version="2.0.1"; sha256="0vxw6kbs1xvzi3sklxac9q1j4cbr8alr9c8fwifwyvpzpdk48ihf"; depends=[coda gplots lattice]; }; plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; }; plotRCS = derive2 { name="plotRCS"; version="0.1.4"; sha256="1n5xsbm97i8hfyslv1cfvp3hvkr23yvxfq8rxkryzxyfyklv86is"; depends=[ggplot2 rms]; }; - plotROC = derive2 { name="plotROC"; version="2.3.0"; sha256="0kaz9hrimi9gi7cf7flag9kc9yrg5fdyylqa5hn53x4dy8vhj37g"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; + plotROC = derive2 { name="plotROC"; version="2.3.1"; sha256="15jvn1dlx8qh5ghnkhqyc49frw6rp58ikpjs3ga8mjxrqyz7wb1g"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; plotbb = derive2 { name="plotbb"; version="0.0.6"; sha256="0vyp558i0gvr9r3xldkd4ldkd6wx95w7xkkas8cyw0s7i13qqq60"; depends=[magrittr rlang scales]; }; - plotdap = derive2 { name="plotdap"; version="1.0.1"; sha256="1g4dfkbwj6673w76ysn236cz05m25y14fnwqbnm0kra3y18a339l"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap scales sf tidyr viridis]; }; + plotdap = derive2 { name="plotdap"; version="1.0.3"; sha256="151vaz61ycm95sazbn7d03wr7hcmvcmbz12rjls334lp38735954"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr mapdata maps raster rerddap scales sf tidyr viridis]; }; plotfunctions = derive2 { name="plotfunctions"; version="1.4"; sha256="0asmxw8283fpvl83h478j5nyg59xqifqaa8f2f6l199gvvswhhg2"; depends=[]; }; plothelper = derive2 { name="plothelper"; version="0.1.9"; sha256="1ibznjqs4gpbq1vx79gg0fkm842xfqgpmmgqji2m6s712j3bdn5k"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.10.2"; sha256="0y2jiyfx895f15wcpizybssic4draw1vgvqz2b7f82z73319m01b"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr vctrs viridisLite]; }; + plotly = derive2 { name="plotly"; version="4.10.3"; sha256="13sxmanx2xck8dn0prn2fplgx4bafb7h2kk2wjmci21h8hk6qylb"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr vctrs viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; plotmm = derive2 { name="plotmm"; version="0.1.1"; sha256="0ad8bkfbwrcv447wgygsh1akzc7v8mxgfw2ywb5024jy39zbj56b"; depends=[amerika ggplot2 wesanderson]; }; plotmo = derive2 { name="plotmo"; version="3.6.2"; sha256="0g1mznijbi1ggn4pk6sqxqjqlrznfcg57l6p2672vcaqqn73mqyd"; depends=[Formula plotrix TeachingDemos]; }; @@ -15014,23 +15051,24 @@ in with self; { plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plspm = derive2 { name="plspm"; version="0.5.0"; sha256="0r8c7pl54nj60176nbrzm6gmqjqk7jqi8r0d8kx4548xgniwc33s"; depends=[amap diagram shape tester turner]; }; pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; }; - plu = derive2 { name="plu"; version="0.2.3"; sha256="04p4ars9lsfqy3f474kvgvh0090gzlkrrk9vsd163wryhp3glnvn"; depends=[lifecycle]; }; + plu = derive2 { name="plu"; version="0.3.0"; sha256="0s4k5vqgwbw7ayjhs2j8w9az7pn8km5hykkic1ii4jpdiy03c23g"; depends=[lifecycle]; }; plugdensity = derive2 { name="plugdensity"; version="0.8-4"; sha256="0kj7vixfyg4nxq05xgmrhsjd56myz2s1jplhbkmq25kf2r9pb89y"; depends=[]; }; plumber = derive2 { name="plumber"; version="1.2.1"; sha256="1k0y7ylc8bld16imn86g0i0dmxmr3kmh9ax4ys0yrxqzrvji7z3g"; depends=[crayon ellipsis httpuv jsonlite lifecycle magrittr mime promises R6 rlang sodium stringi swagger webutils]; }; plumberDeploy = derive2 { name="plumberDeploy"; version="0.2.1"; sha256="0icl35wck94scjyqw6di2sl6fq7zlvd8hm13fw79iqr0wyrich0r"; depends=[analogsea jsonlite lifecycle ssh]; }; plumbertableau = derive2 { name="plumbertableau"; version="0.1.0"; sha256="1wkd15l5s7fs1nzyl83s41wbrx87yhklpw1fb6f3llrgbjn8rd77"; depends=[curl debugme glue htmltools httpuv httr jsonlite knitr later magrittr markdown plumber promises rlang stringi urltools]; }; plumbr = derive2 { name="plumbr"; version="0.6.10"; sha256="1ncrqg8j4baqrjkd95fkdanaylwl1ygdr7xzc891gig3rknx0n1i"; depends=[objectSignals]; }; + plume = derive2 { name="plume"; version="0.1.0"; sha256="02fqwjppjah0pqfvgv02kmsbf2lcwwxp9k9v74l28nybnx9pmmwp"; depends=[dplyr glue jsonlite knitr purrr R6 readr rlang stringr tibble tidyr tidyselect vctrs yaml]; }; pluralize = derive2 { name="pluralize"; version="0.2.0"; sha256="1s3jp41j8c03qb5zisj6m12ky7cz3n71d6p5apz0r0yn35inrhah"; depends=[V8]; }; pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; }; - plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; - plyr = derive2 { name="plyr"; version="1.8.8"; sha256="030706kwgqa2s5jd93ck271iqb0pj3fshrj9frg4wgp1pfs12cm7"; depends=[Rcpp]; }; + plyr = derive2 { name="plyr"; version="1.8.9"; sha256="00z1mvqisnzbbwcwax1gm9ilahpgp21kk4l7hqdz8fym27vygd8m"; depends=[Rcpp]; }; pm3 = derive2 { name="pm3"; version="0.1.9"; sha256="03q36qmq9hvkws5v79c39z698fjgfpyfxz5nx7g8diy6sj834mw6"; depends=[tableone]; }; - pmc = derive2 { name="pmc"; version="1.0.5"; sha256="1v3x1h1hnxvg3qfkridsvz4f652yfs3fgl0kysnkkshxj9fl862q"; depends=[dplyr geiger ggplot2 ouch phytools tidyr]; }; + pmc = derive2 { name="pmc"; version="1.0.6"; sha256="1j2qiabq2qd4i8y28s87k0jxbbvv2yhjxmxsvvh9i8gzar17p5g7"; depends=[dplyr geiger ggplot2 ouch phytools tidyr]; }; + pmcalibration = derive2 { name="pmcalibration"; version="0.1.0"; sha256="1zhg55jdf8jd92216waa2g18mvni8qh6j2idgf77k6mcwb63m9zw"; depends=[checkmate chk Hmisc MASS mgcv pbapply survival]; }; pmclust = derive2 { name="pmclust"; version="0.2-1"; sha256="0wldf0bj406qxmlc7hsbamiak7qcwf8ixng9dfkswh511m3p05jd"; depends=[MASS pbdMPI]; }; pmd = derive2 { name="pmd"; version="0.2.1"; sha256="14xra1d6qx6gxnpiwfsxz200qhmm7s4zy2j8h5kwbvbpnykdyr5c"; depends=[data_table enviGCMS igraph RColorBrewer]; }; pmetar = derive2 { name="pmetar"; version="0.4.1"; sha256="03jh7x1nj3fgr9rl9f886sml2a14m7jlwad7vm1sw0pc7dqd04cd"; depends=[curl dplyr httr lubridate magrittr RCurl stringr tidyr]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; - pmlbr = derive2 { name="pmlbr"; version="0.2.0"; sha256="1f0i52ws8ywkz4c0s3ax3qa3qinqhv1k9qlghkama3b027zkl9zn"; depends=[FNN]; }; + pmlbr = derive2 { name="pmlbr"; version="0.2.1"; sha256="06kac7h4skccs48ixyjnxxry38dci9cgkckfvkpzaqhzzlbvmn0g"; depends=[FNN]; }; pmledecon = derive2 { name="pmledecon"; version="0.2.1"; sha256="10yry425y2ghcnp3mrjharf4blcqvwnxsm7kz90mzfq91qg4q5lv"; depends=[rmutil splitstackshape]; }; pmml = derive2 { name="pmml"; version="2.5.2"; sha256="1faad5yqyh6dx40056w74vlyw4wxjgh41jv8b2vf2gh26laf22kk"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; @@ -15047,6 +15085,7 @@ in with self; { pocketapi = derive2 { name="pocketapi"; version="0.1"; sha256="0n4fyx4ldm14zy3pz7gygwhahi3p25misvxlmy8l9kqqr51fg26a"; depends=[dplyr glue httr jsonlite magrittr purrr tibble usethis]; }; pocrm = derive2 { name="pocrm"; version="0.13"; sha256="0d4iggxjbl95fz872q9v1wr30nga39sdd5dvwa2zrrm73ak81cz3"; depends=[dfcrm nnet]; }; podcleaner = derive2 { name="podcleaner"; version="0.1.2"; sha256="1r8mvf8bw329n3ifi2dyy4220nbij2rgkvq1xlqzynxf8qadxbrl"; depends=[dplyr fuzzyjoin magrittr progress purrr readr rlang stringi stringr tibble tidyr]; }; + poems = derive2 { name="poems"; version="1.1.0"; sha256="123sq2ixm8qzj6jc95skwl6rr4hiy7dcf34x4mrhqv5sf7k41yzs"; depends=[abc doParallel foreach gdistance geosphere lhs metRology R6 raster trend]; }; pogit = derive2 { name="pogit"; version="1.3.0"; sha256="02h8j7bfayigq9az46mvi7n918p99533mnijnz1nkzrdi2v0x824"; depends=[ggplot2 logistf plyr]; }; poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4.2"; sha256="0dk2c65b7aac2ak3ajgh3wa2jhqyfv1qp90flw8xcx3f5w5gyv7s"; depends=[]; }; @@ -15059,8 +15098,7 @@ in with self; { poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; poismf = derive2 { name="poismf"; version="0.4.0-4"; sha256="1pl0vxrczknfrxx70wc6wy0hjxzdk7jip9was5saxby3b5as2bhp"; depends=[Matrix]; }; - poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; - poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.3"; sha256="1r6f9ks5bd9jg0mmxa8dj633pvz7byihyaakmkxg4xqrr1sa9g3f"; depends=[]; }; + poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.4"; sha256="02mnrrynlmcbcywmgm829kajlixwr91aj49d43pkfc3yxcnj815w"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; poissonreg = derive2 { name="poissonreg"; version="1.0.1"; sha256="1hlp6lvag9a3yv1iapcs3r14w6y5pqdb0zwlhjw88g72amwp7g43"; depends=[dplyr generics glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0.1"; sha256="0236cz8fn3la7df8mk1la8hmr0zzjc1majnq8p0c8grma833j6kp"; depends=[]; }; @@ -15072,7 +15110,7 @@ in with self; { poliscidata = derive2 { name="poliscidata"; version="2.3.0"; sha256="1ywfhksc6gcc2xk5lp6s8nn4wib92sv7p3wq92dzabf75q6mscix"; depends=[abind car descr gplots Hmisc plotrix plyr survey weights xtable]; }; polished = derive2 { name="polished"; version="0.8.1"; sha256="0qn7zlxw7jr0apvn23a6x00xn5fbg2c2hg6713biwsi7iqhb0amc"; depends=[automagic desc digest dplyr DT htmltools httr jose jsonlite lubridate otp purrr rlang rmarkdown shiny shinycssloaders shinydashboard shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid yaml]; }; polite = derive2 { name="polite"; version="0.1.3"; sha256="0k0zqmm1zd0kgmqns41gxfa8pak1k11c3zbvsr0xbqc6x1bc5xyj"; depends=[httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.9.1"; sha256="09y2sg3mlxcwgmpv0sjnc67qr1jicj8lykgihsf7ysrzyc7ag9na"; depends=[data_table ggplot2 glmnet quanteda spacyr stringi stringr textir tm]; }; + politeness = derive2 { name="politeness"; version="0.9.2"; sha256="0lj5jgw9ldnidkbbg8k9ma2xxg3hcaaiq6dcmp8rc2mqp204irff"; depends=[data_table ggplot2 glmnet quanteda spacyr stringi stringr textir tm]; }; politicsR = derive2 { name="politicsR"; version="0.1.0"; sha256="1msf394i70g9k2lcfmp0drq8qm138wdhbf9qaa5342z4wcasmvdv"; depends=[ineq]; }; polle = derive2 { name="polle"; version="1.3"; sha256="1b8hbps8nmvvb8hbcd8y6zs5wc18p9rw878s4nf9q31zi3k33h56"; depends=[data_table DynTxRegime future_apply lava policytree progressr SuperLearner survival targeted]; }; pollen = derive2 { name="pollen"; version="0.82.0"; sha256="0vmggbvacpbdz4zvn3cinip1b0ac44vgbydmsk6698hwgx9iwmfp"; depends=[dplyr lubridate purrr]; }; @@ -15087,9 +15125,8 @@ in with self; { polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0.2"; sha256="1rn1bryxxzsgi85kw4glmk10z61pqyxj79ngdl81b67vrw23fpxw"; depends=[]; }; polyapost = derive2 { name="polyapost"; version="1.7"; sha256="1inq3b8qq17w5zx2lrkrxjzb7drfajsp4qgy0194971m6x2j4cfx"; depends=[boot rcdd]; }; - polyclip = derive2 { name="polyclip"; version="1.10-4"; sha256="0mkg5v045an49c3j279vvabm7p4d9jsnzlfp96dpblvihxvwkll4"; depends=[]; }; + polyclip = derive2 { name="polyclip"; version="1.10-6"; sha256="0qwb5w1ishbhg1nhdp8985ddvcs7ljdyrbv059hx576xmgni6brw"; depends=[]; }; polycor = derive2 { name="polycor"; version="0.8-1"; sha256="0285rvx8238qp8dix0jq0cqq7ks8h6cjwsscbc7dx4n9nph56pzh"; depends=[admisc Matrix mvtnorm]; }; - polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polyglotr = derive2 { name="polyglotr"; version="1.2.1"; sha256="0r4n8y7wqfgxnq8jyyidrdslmffwyap671wrxqbnpm5jn7m6m07q"; depends=[dplyr httr magrittr purrr rlang rvest stringr urltools]; }; polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.1.3"; sha256="0j7f5rdkkwc0y15jjgik9bhkrwypafmm34h7kjkwa806dzgq8xsv"; depends=[doParallel foreach igraph knitr MDSMap]; }; @@ -15101,8 +15138,8 @@ in with self; { polysat = derive2 { name="polysat"; version="1.7-7"; sha256="0fpdy2yya91hz1n24j4mqiggrjjihddaia5p24phgbkw8rxqqp40"; depends=[Rcpp]; }; polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pomcheckr = derive2 { name="pomcheckr"; version="0.1.1"; sha256="0fm2v388ya7v4vrb5rvilghlf49d15jlwz0isf95ldr81a55m9ij"; depends=[assertthat dplyr ggplot2 magrittr rlang stringr tidyr]; }; - pomdp = derive2 { name="pomdp"; version="1.1.0"; sha256="0l9gc5nh99xdmm3k373hi4dh5qky5vb5s7r05kbyly4y4ii8fh5x"; depends=[foreach igraph Matrix pomdpSolve Rcpp]; }; - pomdpSolve = derive2 { name="pomdpSolve"; version="1.0.3"; sha256="046anv1c36d7n7676ny3s7i2aasd6ka26i9z7kmq28blx0zkaf61"; depends=[]; }; + pomdp = derive2 { name="pomdp"; version="1.1.2"; sha256="0v4vj5xiivh1z1jc93zwijhdfjs7lnb81szlgsmn9byc31ydg3br"; depends=[foreach igraph Matrix pomdpSolve processx Rcpp]; }; + pomdpSolve = derive2 { name="pomdpSolve"; version="1.0.4"; sha256="0ywiqry0df1cjy3k8r3rzpd42rmnn578ih03qvp8qydq66bdrh3b"; depends=[]; }; pomodoro = derive2 { name="pomodoro"; version="3.8.0"; sha256="1y7a6097jlrrgqkxhb43n5nahf4m814inhmkm1495w0k5q1zmraf"; depends=[caret gbm ipred pROC randomForest tibble]; }; pomp = derive2 { name="pomp"; version="5.4"; sha256="1qk540101qs007klwjssddvfcpckbhd4ic2rpial9fb4r4v578z7"; depends=[coda data_table deSolve digest mvtnorm]; }; pompom = derive2 { name="pompom"; version="0.2.1"; sha256="09jy4lrb2p71yk604ndfhqfz6znlc3bq72k42f0d1i1a8g3by8h6"; depends=[ggplot2 lavaan qgraph reshape2]; }; @@ -15112,14 +15149,14 @@ in with self; { poolABC = derive2 { name="poolABC"; version="1.0.0"; sha256="0l1sg9w1a385g6cz82b73a13661bx716ppvabvji7b6p99i9kv99"; depends=[doParallel foreach ggplot2 locfit MetricsWeighted nnet poolHelper RColorBrewer rlang scrm]; }; poolHelper = derive2 { name="poolHelper"; version="1.1.0"; sha256="17parinc1shm5nmyxn0lvl2pndjz881lzk4iwqhbnlk1hvwrs7sg"; depends=[MCMCpack Metrics scrm]; }; poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; }; - poolfstat = derive2 { name="poolfstat"; version="2.1.2"; sha256="01qyg7wg9jdzagw03ns7ff6l6lczgbnivmhlxbqdydybp2y8adkp"; depends=[ape data_table DiagrammeR doParallel foreach Matrix nnls progress Rcpp RcppProgress Ryacas zoo]; }; + poolfstat = derive2 { name="poolfstat"; version="2.2.0"; sha256="17wama4lxl7q2i9j2v15kn33i2lszrsyim9qj8dihhx9r6p9vdls"; depends=[ape data_table DiagrammeR doParallel foreach Matrix nnls progress Rcpp RcppProgress Ryacas zoo]; }; pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; poolr = derive2 { name="poolr"; version="1.1-1"; sha256="1y8bish2s96b42xsld0x1nrjz9dzqhdr2w95vdpfymq7mg05d1ry"; depends=[mathjaxr]; }; poorman = derive2 { name="poorman"; version="0.2.6"; sha256="0x1pk00ca7wjxnqfh1jphgsxcrq37s0c1nawv52yh5qgc4z0m3ij"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; pop_lion = derive2 { name="pop.lion"; version="1.0.1"; sha256="1rj95wwcxvsfd1smd21717y9c0672a8vnpnbdsa63pxbzdxc4kaj"; depends=[abind testthat]; }; pop_wolf = derive2 { name="pop.wolf"; version="1.0"; sha256="113l9skpggjxjpwxibfp611z2gnjikfqh6kmj6in52sn9q4yqv83"; depends=[abind]; }; - popEpi = derive2 { name="popEpi"; version="0.4.10"; sha256="1z18ps2ra15xbv94zgvshbj448i7jj2cnhwaxgwnk9c9djna7fa8"; depends=[data_table Epi survival]; }; + popEpi = derive2 { name="popEpi"; version="0.4.11"; sha256="0407vw95id6537q7kmaar0qbkdls6j9w7b2d8y957zrrd1wb43xg"; depends=[data_table Epi survival]; }; popPCR = derive2 { name="popPCR"; version="0.1.1.1"; sha256="03ppgjmdp3rivlgqs7aq082j4rzndf9fw5aq8mzci7fvjkj7whc4"; depends=[mvtnorm]; }; popPyramid = derive2 { name="popPyramid"; version="0.1.1"; sha256="1fvq63d0pjhpzyf6pb2v5w9wy0pskiv2n07jipg98bgyiih1w584"; depends=[dplyr ggplot2 tibble]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-6"; sha256="0nmf93dy2qf7z9mafpy99ry53aapbxlismn7drn732r8gvravapx"; depends=[coda]; }; @@ -15129,26 +15166,26 @@ in with self; { popgenr = derive2 { name="popgenr"; version="0.2"; sha256="164dhizka0yadzihbjqkfs5p0hknw966mq0grigs7r9ppbq9kajh"; depends=[]; }; popkin = derive2 { name="popkin"; version="1.3.23"; sha256="07wlja7c96az0d82c3b0m1kmc04sbgp73asbaks26jwvjw4vmby5"; depends=[ape RColorBrewer]; }; poppr = derive2 { name="poppr"; version="2.9.4"; sha256="14a756dx82l19bswrjq8v64v9py4mqf039y9gw5xrkr13p9jiy56"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas polysat progressr rlang shiny vegan]; }; - popsom = derive2 { name="popsom"; version="6.0"; sha256="1zjg55fs4j36rp75k0961pndjqd4w085lc7v83nprjpc7jnx45g6"; depends=[fields ggplot2 hash]; }; - popstudy = derive2 { name="popstudy"; version="1.0.0"; sha256="17nikgm8kv0c7n63nbcryl78n8r7ak1hc4r20hddid5nq0ldx970"; depends=[correlation corrplot corrr demography DescTools dplyr forecast ggplot2 ggpubr here Hmisc lubridate magrittr moments psych rainbow rcompanion Rdpack scales stackoverflow stringr tidyr zoo]; }; + popstudy = derive2 { name="popstudy"; version="1.0.1"; sha256="09lavka4hr4f8m2j8wqvd4pqxbxhclac1p2f2vq15xk7n4xfbhw3"; depends=[correlation corrplot corrr demography DescTools dplyr forecast ggplot2 ggpubr here Hmisc lubridate magrittr moments rainbow rcompanion Rdpack scales stringr tidyr]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; populR = derive2 { name="populR"; version="0.2.1"; sha256="1j0ip93pd5sq2rcqd0pw5c0nmi1pjjaxi5k4xk97kgwnqcq5ib7n"; depends=[dplyr Metrics osmdata rlang sf units usethis]; }; population = derive2 { name="population"; version="0.3"; sha256="00kagbz4pr4c5z6cb5w4y9nlbjzaa2awc45z2cvrivng76376br3"; depends=[abind]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; - porridge = derive2 { name="porridge"; version="0.3.1"; sha256="0m0aa7cqfkd45csgs0lapf72adjmf0xaii1klnk3kd4kxbclx8a6"; depends=[MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; + porridge = derive2 { name="porridge"; version="0.3.2"; sha256="1x8js6drbkp5qbd48xn3pay1r00vdz7z5abm44k1fvc1mk3svrah"; depends=[MASS Matrix mvtnorm pracma Rcpp RcppArmadillo]; }; port4me = derive2 { name="port4me"; version="0.6.0"; sha256="10sg3r43jccxj4k1wfdbv3fr0080c65kmigsg3shch4pfwyhr1dz"; depends=[]; }; - portalr = derive2 { name="portalr"; version="0.4.0"; sha256="1sgbmsb5zf2fsi1abs1cigwp2qwiijrd06b3z4hdsb58n6dwim1z"; depends=[clipr clisymbols crayon dplyr forecast httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; + portalr = derive2 { name="portalr"; version="0.4.1"; sha256="1i241nn694nyyljldpsah1555spbhksassf7i18pmqigzpk01qix"; depends=[clipr clisymbols crayon dplyr forecast httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; portes = derive2 { name="portes"; version="6.0"; sha256="1jv0jvwknlv9faind0gsyh6j5khh1ffd9wbnbk7ddlp1l1kzlsnr"; depends=[forecast vars]; }; portfolio = derive2 { name="portfolio"; version="0.5-2"; sha256="13w8gyaphg0qspjl6d0jh0jf3wvz4agy8vzkriba0k59qhdbi52f"; depends=[lattice nlme]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.4.1"; sha256="1qf7bbf3frivp0q55h3fj9ki2igaa6djpg3zv1x6hh53nl25dvbb"; depends=[digest evaluate ggplot2 pbapply PerformanceAnalytics quadprog quantmod R_utils rlang xts zoo]; }; + portn = derive2 { name="portn"; version="1.0.0"; sha256="1n759fwk2lwz8nqrc04r3720pffyhinmz2x83g5553ywxs0ds4da"; depends=[Rsolnp]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; portvine = derive2 { name="portvine"; version="1.0.2"; sha256="1lhr4nxlr47sr77gk1q790rl7lwxs58gsaacl9rq7lyw24h8w7rs"; depends=[BH checkmate data_table dplyr dtplyr future_apply kde1d ppcor Rcpp RcppEigen RcppThread rlang rugarch rvinecopulib tidyr wdm]; }; posologyr = derive2 { name="posologyr"; version="1.2.2"; sha256="0a04yqf4vxcwpmlc8h1hrf3116vg8qwj56ffyk3zds2wkx0k4xdd"; depends=[data_table mvtnorm rxode2]; }; postGGIR = derive2 { name="postGGIR"; version="2.4.0.2"; sha256="1jxmvgzq4hv7sy2zcs8jicp0223mhv3mywhxbay2nv3bl0h4xfgs"; depends=[abind accelerometry ActCR ActFrag cosinor cosinor2 denseFLMM dplyr GGIR ineq kableExtra minpack_lm refund survival tidyr xlsx zoo]; }; postHoc = derive2 { name="postHoc"; version="0.1.3"; sha256="1l7r9md9iyav5vvjykpsnqv9whspzcmnppfpqm6qy5s5vk6b8zfd"; depends=[igraph multcomp]; }; postcards = derive2 { name="postcards"; version="0.2.3"; sha256="0kc8nbrqw5h14qw47rxl20yz9q0s8gk2g3lg7kcgsx7f1q514qsw"; depends=[rmarkdown rstudioapi]; }; - postdoc = derive2 { name="postdoc"; version="1.2.0"; sha256="1jgqx1k24dg379lzvviyvmzr37kmdqzlv1j85himyi8h7mvli9n1"; depends=[jsonlite katex prismjs xml2]; }; + postdoc = derive2 { name="postdoc"; version="1.2.2"; sha256="1d9d82z72jh2g777pzxfnav7nq14c4q93jiwcsp3plvgfkj0sfl8"; depends=[curl jsonlite katex prismjs xml2]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; posterior = derive2 { name="posterior"; version="1.4.1"; sha256="1lsqpczf8ll8m1a99kwmxdjm8wpavlqw88qha82s3438ipx5729b"; depends=[abind checkmate distributional matrixStats pillar rlang tensorA tibble vctrs]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; @@ -15156,10 +15193,11 @@ in with self; { postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; postpack = derive2 { name="postpack"; version="0.5.4"; sha256="01h2la7ih7s9110162apbqjjn2i6il5m4300ga0r44r0fyw340a5"; depends=[abind coda mcmcse stringr]; }; potential = derive2 { name="potential"; version="0.2.0"; sha256="1zq82jlqxmz1cjg0wi1r7cqxq32f3dk6gzx11fnf5mfy44613vl2"; depends=[doParallel foreach mapiso sf]; }; - potions = derive2 { name="potions"; version="0.1.0"; sha256="1g25spjzh2l8xcv0vhy4rdlscs41cr9xa173gfafy3b1x3bik91p"; depends=[jsonlite lobstr rlang stringi yaml]; }; + potions = derive2 { name="potions"; version="0.2.0"; sha256="01dzgcapd21x88kp16pj0sqkx9r6xyfa9c6kxlna4vfpkwk99sh7"; depends=[jsonlite lobstr purrr rlang rrapply stringi yaml]; }; potools = derive2 { name="potools"; version="0.2.2"; sha256="1vn99kh9cpicljs3caz3pw12azm19sx8q9nybk0xfffrldmz6r2q"; depends=[data_table]; }; potts = derive2 { name="potts"; version="0.5-11"; sha256="1sm2y2nv3hpqmcshza74yy9awg7ygp6fna6pkzvqv4cakwvvxnck"; depends=[]; }; pould = derive2 { name="pould"; version="1.0.1"; sha256="0hr6j08whbc1jydz20rg0cphfiwx4pyrav49w9qs9dkcaqrpid7l"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; + povmap = derive2 { name="povmap"; version="1.0.0"; sha256="0nqb3ispvljpdb05ps7jwds33n4db2hw4ym5b4ipc20rhdj3g4mr"; depends=[bestNormalize boot formula_tools ggplot2 gridExtra HLMdiag MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 saeRobust spdep stringr survey]; }; pow_int = derive2 { name="pow.int"; version="1.3"; sha256="0rpv14ni7ikhy7rd8z04xy5mvmnagj1ji5a31l56jyldwjrkqa9v"; depends=[]; }; powRICLPM = derive2 { name="powRICLPM"; version="0.1.1"; sha256="01mccy1s0sl3haz4q26vv1dfrgzdrkds8b1c38iv6zy5am68s9iy"; depends=[dplyr furrr future ggplot2 lavaan progressr purrr rlang]; }; powdR = derive2 { name="powdR"; version="1.3.0"; sha256="1bkx43xd46gzgiphknqyz2nyvviia0xkn4h8z4k2dwcfq92iwsbw"; depends=[baseline DT factoextra FactoMineR ggplot2 ggpubr nnls plotly plyr reshape rxylib shiny shinyWidgets tidyr]; }; @@ -15178,13 +15216,14 @@ in with self; { powerly = derive2 { name="powerly"; version="1.8.6"; sha256="0vc2wpx2b4i9vx9jvvlywq5w4dx22bn4r9fcwz123h1m09252ng8"; depends=[bootnet ggplot2 mvtnorm osqp patchwork progress qgraph quadprog R6 rlang splines2]; }; powerpkg = derive2 { name="powerpkg"; version="1.6"; sha256="18cq3zsdvzmqjp0niq0libjk4riarmiar3h6lifq54spqgrvvxh2"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; - ppRep = derive2 { name="ppRep"; version="0.42.1"; sha256="1gginxn2kj7y5rc63rjfb2m25lvzxq3fdp4an0gs0ig73vq6v2jg"; depends=[hypergeo]; }; + ppRep = derive2 { name="ppRep"; version="0.42.3"; sha256="1s4izrqw2rmipdr385nivg8av711q3q1ri59qnqw774iwwni8cwb"; depends=[hypergeo]; }; ppcSpatial = derive2 { name="ppcSpatial"; version="0.3.0"; sha256="0dxl5vv41462vhhdvbjczcghp0rv2f2101qygn4cldfihja397y9"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 scales shiny tidyr tmap]; }; ppcc = derive2 { name="ppcc"; version="1.2"; sha256="17kf97rh0b1zxh7r12rxc2qd1zlrcvlljk69k8w2jchdxiw398sb"; depends=[]; }; ppclust = derive2 { name="ppclust"; version="1.1.0"; sha256="0vmgjjy7gin88qailzfcwapndl5s8fm6i8kw9gv6aykg9mr75xlv"; depends=[inaparc MASS]; }; ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; ppdiag = derive2 { name="ppdiag"; version="0.1.1"; sha256="1p2nbkv2jsqdwwipyp3mz9cpy9lkia2cmigbcpjsa2d2i655hvs5"; depends=[]; }; + ppendemic = derive2 { name="ppendemic"; version="0.1.7"; sha256="0f9gqhkgg1vd3di1xfx0ix4is30v3abcyldpkbnj81kv60zmzcfr"; depends=[]; }; ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.4"; sha256="0hssk8yf8f15x7m03x71v9yrshrzgkww8xfacbbsw5mpqcghc9zl"; depends=[tibble tidyr]; }; @@ -15197,6 +15236,7 @@ in with self; { ppseq = derive2 { name="ppseq"; version="0.2.2"; sha256="1n3ij7dl4g5ky3s52hlfcmbza0vcb6bymka6hyqhycndzws005v7"; depends=[dplyr furrr ggplot2 patchwork plotly purrr tibble tidyr]; }; ppsr = derive2 { name="ppsr"; version="0.0.2"; sha256="1dk62b08sxp87kll8wjfby3iq9l3akiprarh8agjdv6s43c9h2sg"; depends=[ggplot2 gridExtra parsnip rpart withr]; }; pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; + pqrBayes = derive2 { name="pqrBayes"; version="1.0.2"; sha256="0mbhkha99qyk5hkpk13ysb0686lcn6q9vq34838fz1l7xy47mzw3"; depends=[glmnet Rcpp RcppArmadillo]; }; pqrfe = derive2 { name="pqrfe"; version="1.1"; sha256="0apsrlgricjmv202yg1h3iz2715nmf05wcvyznnha0nil7cqg0qi"; depends=[MASS Rcpp RcppArmadillo]; }; prWarp = derive2 { name="prWarp"; version="1.0.0"; sha256="1rx9yby7xwa2bgqa6a1zllan6qfchgfrg2waadmwfmjhcp8qb1mj"; depends=[Morpho]; }; prabclus = derive2 { name="prabclus"; version="2.3-2"; sha256="0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl"; depends=[MASS mclust]; }; @@ -15216,7 +15256,7 @@ in with self; { precmed = derive2 { name="precmed"; version="1.0.0"; sha256="1hkdm1fqq9fswfii9ac016xfnbggdvxcvazi5l8ir0vna9jfkcwb"; depends=[dplyr gam gbm ggplot2 glmnet MASS MESS mgcv randomForestSRC rlang stringr survival tidyr]; }; precommit = derive2 { name="precommit"; version="0.3.2"; sha256="0a8ps21g1k9qsfjy3kakr3j9c4d348zrvf3pllf4cwc798488vhl"; depends=[cli fs here magrittr purrr R_cache rlang rprojroot rstudioapi withr yaml]; }; precondition = derive2 { name="precondition"; version="0.1.0"; sha256="0srmr33q56dimkn0m7aad19ddrp28a0dzrpnyh4hglwy9zxfqz9j"; depends=[rlang]; }; - precrec = derive2 { name="precrec"; version="0.14.2"; sha256="159vxdnp7vi6na3cji1rbsr1311ciqn1aldg0nwnd6sb3hgb14w2"; depends=[assertthat data_table ggplot2 gridExtra Rcpp rlang withr]; }; + precrec = derive2 { name="precrec"; version="0.14.4"; sha256="03hvp5h7fz4v2aswxim0mqgj9rdrhnk5xqz212161kpcrw6m67z8"; depends=[assertthat data_table ggplot2 gridExtra Rcpp rlang withr]; }; predReliability = derive2 { name="predReliability"; version="0.1.0"; sha256="18s9ijg3fcg6qb0y6pnwngmv69ajm93z0xjdzkq3fp5bxk1qylyb"; depends=[cluster rpart]; }; predRupdate = derive2 { name="predRupdate"; version="0.1.0"; sha256="0166q1lriqnl74xmawxf4fpl826dc2j8l72k6rrakwjfbdznhgjy"; depends=[ggExtra ggplot2 pROC rlang survival]; }; predfairness = derive2 { name="predfairness"; version="0.1.0"; sha256="0b9d6a2rk6vw4y5hnh721gmirnm419yynbfg7arjb96558l282kd"; depends=[]; }; @@ -15227,20 +15267,20 @@ in with self; { predictNMB = derive2 { name="predictNMB"; version="0.2.1"; sha256="1g4mak6n3ris9hdk6pl0zb6jmh5ziicqbfv7y6p2i304af768pgy"; depends=[assertthat cutpointr dplyr ggplot2 magrittr pmsampsize rlang scales tibble tidyr]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.8"; sha256="1w5kszqqqg4xx1zq6y4a93b00aa67riqsb1dq21xqpscvyiz5nv9"; depends=[car ggplot2 HRW lme4 lmeInfo lmerTest lmeSplines MASS Matrix nlme numDeriv pbkrtest plotly plyr splines2]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.9"; sha256="0dfmdwqlxzsksidynw0lqg88i9jwvcfh5b3kn296isx6a3bg98cx"; depends=[car ggplot2 glmmTMB HRW lme4 lmeInfo lmerTest lmeSplines MASS Matrix nlme numDeriv pbkrtest plotly plyr splines2]; }; predictoR = derive2 { name="predictoR"; version="3.0.3"; sha256="1r96kclzkybzplssf2ql0grv34p6ff01vplp8bv3ivckmkln8qgz"; depends=[colourpicker config dplyr DT echarts4r glmnet golem htmltools loadeR rlang rpart_plot shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs traineR xgboost xtable]; }; predictrace = derive2 { name="predictrace"; version="2.0.1"; sha256="0xy1vkxgqq9faa62shbdkg3fgwwm8khybbhagqwc6a01ibm32mnk"; depends=[dplyr]; }; - predicts = derive2 { name="predicts"; version="0.1-8"; sha256="1nlgb1hrsvxcbv52vf4ba61rf0ijdrr2mn1g1f2z889jslx914yy"; depends=[terra]; }; + predicts = derive2 { name="predicts"; version="0.1-11"; sha256="1jvaayy7qwi2l8q8m8r42b6rj3945z9vrpgdds6dz8qz35clrpir"; depends=[terra]; }; predieval = derive2 { name="predieval"; version="0.1.1"; sha256="096zfb94iixza0lfzr4p21gkcs9hl7h0d5jhbzdi3hhyz80zymrj"; depends=[ggplot2 Hmisc MASS Matching]; }; - predint = derive2 { name="predint"; version="2.0.0"; sha256="18bgh6iri2s9jd981prbskp5fhcspkrmhnr25dl0rd9s0dvpx8m1"; depends=[ggplot2 lme4]; }; + predint = derive2 { name="predint"; version="2.2.0"; sha256="1q6z1a3sak8xz4v3sqxcz7zhs8822iiyj750qq9gqgx848h94i1i"; depends=[ggplot2 lme4 MASS]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; predtools = derive2 { name="predtools"; version="0.0.3"; sha256="150jlfbjvhnvvvbbjsr3hc0v778p9lyj8ml167inzbw4cynk2g9j"; depends=[dplyr ggplot2 magrittr mvtnorm pROC RConics Rcpp]; }; predtoolsTS = derive2 { name="predtoolsTS"; version="0.1.1"; sha256="0f9fapw9yjdzj6pwcskbyfwjsvg09ahn20vrv4bgi0dx8am291rl"; depends=[caret forecast Metrics tseries TSPred]; }; prefeR = derive2 { name="prefeR"; version="0.1.3"; sha256="0n9ns715f274bcr3mbh7yjyvx3ajz949f7yyyq38f54cs2anwwrd"; depends=[entropy mcmc]; }; preferably = derive2 { name="preferably"; version="0.4.1"; sha256="11xvh0a8m2lpmrrrrn95axqgz9rdipn63zd7c505a8spzwf6dvm5"; depends=[knitr pkgdown]; }; preference = derive2 { name="preference"; version="1.1.6"; sha256="12gpiwd69ik4r2l67fvad0jmp78w919nhly4drxhfiizl3mw4jdn"; depends=[ggplot2 tidyr]; }; - prefio = derive2 { name="prefio"; version="0.1.0"; sha256="1x8jjfijz8wsjflr12x2c45l49i15s4n372zf1qscqhkvbbxszwz"; depends=[dplyr magrittr tidyr]; }; - prefmod = derive2 { name="prefmod"; version="0.8-35"; sha256="0h86lfm1wg936xvxhgaiqxbq7fbrxzxl7v380plwag78g3kp1w5k"; depends=[colorspace gnm]; }; + prefio = derive2 { name="prefio"; version="0.1.1"; sha256="0zc8j1hj47iivx40i1wzilcn3456smbrzz2g6s1khqsx366mw9qr"; depends=[dplyr magrittr tidyr]; }; + prefmod = derive2 { name="prefmod"; version="0.8-36"; sha256="1xac3x07yrhrk5j4aq798yk3hf0ig5p84n40cw85i75k3qxddk6f"; depends=[colorspace gnm]; }; prenoms = derive2 { name="prenoms"; version="0.0.1"; sha256="0r642akcc5fxg736b9d6i53spywk2f7kingni0akgr0gdxc7s6aj"; depends=[tibble]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; prepplot = derive2 { name="prepplot"; version="1.0-1"; sha256="1x6znfhmrsb2zj2cfygsw1fdszcp4xdpaip4b4d5cdl2rykb3bjn"; depends=[plotrix shape]; }; @@ -15253,21 +15293,23 @@ in with self; { preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; }; presize = derive2 { name="presize"; version="0.3.7"; sha256="1qabv7lsrd0rrjkg7icr7qxj4jrx78s6rh1n961s6qrw6gldq4ga"; depends=[kappaSize shiny]; }; presmTP = derive2 { name="presmTP"; version="1.1.0"; sha256="134p58zzk8i0whscvl5qdfn4niksypyxavq1m15cvw4zzk4dk6fw"; depends=[mgcv survPresmooth]; }; - pressuRe = derive2 { name="pressuRe"; version="0.2.1"; sha256="13vw7xln6xh7r98fzpdjir2gb7hps6qbf177q72y1kcvklk2x2km"; depends=[dplyr ggmap ggplot2 magick magrittr pracma readxl scales sf stringr zoo]; }; - prettifyAddins = derive2 { name="prettifyAddins"; version="2.6.0"; sha256="1ahn6sij5nz2l1hinfappj34n0j3aqq86005xv4jpy70gv0ymy3z"; depends=[chromote httr rstudioapi shiny webdriver xml2 XRJulia]; }; + pressuRe = derive2 { name="pressuRe"; version="0.2.3"; sha256="1i73706wpa06zaz5zdb25dshpzwdfyxl160s8nr4pjx5bczaigsh"; depends=[abind dplyr gdistance ggmap ggplot2 magick magrittr pracma raster readxl scales sf stringr zoo]; }; + pretest = derive2 { name="pretest"; version="0.2"; sha256="11q90wf2sis0km20xnpx5wr7h7p80vl2bpah5m1a56qixswql5cm"; depends=[]; }; + prettifyAddins = derive2 { name="prettifyAddins"; version="2.6.1"; sha256="0ncj10j1ygc1dhlqdg5vklzf258bjbg6mry8i8vqqh1dxvl2djwr"; depends=[chromote httr rstudioapi shiny webdriver xml2 XRJulia]; }; prettyB = derive2 { name="prettyB"; version="0.2.2"; sha256="1wszcmn5jnk02iyvjld42291m1irfp9m0b3lcdyyp41iq3icm67g"; depends=[]; }; prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.6"; sha256="0yjpwxdy9mkj2k33zvd5klyv4ava46i19yls87n0bvf79y90ikpy"; depends=[]; }; prettyR = derive2 { name="prettyR"; version="2.2-3"; sha256="1rs90cmr5dyry724php90mp41qwzzk1z3gxfwcj1k157qawacyhr"; depends=[]; }; prettycode = derive2 { name="prettycode"; version="1.1.0"; sha256="1ifh9h73szc23p1ii77z0r68n1gghndqqdm07wd7gxsg5pppp1sg"; depends=[crayon]; }; prettydoc = derive2 { name="prettydoc"; version="0.4.1"; sha256="0aa89jnqhz0l69inrgm1f1riq5bm3ksb8wjl8d4x2f320adsd50h"; depends=[rmarkdown]; }; + prettyglm = derive2 { name="prettyglm"; version="1.0.1"; sha256="1pivjpnspis7zshdj7kasncb8qpy40ld9f40fwlb3x14snrvbqix"; depends=[broom car dplyr forcats kableExtra knitr plotly RColorBrewer stringr tibble tidycat tidyr tidyselect vip]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.4"; sha256="1fg2j6qx828qrg46clrvln2004nlk22yx7wvhr8vig66nc1lm7bd"; depends=[digest httr plyr rjson]; }; - prettyunits = derive2 { name="prettyunits"; version="1.1.1"; sha256="1ibmzgknw5896q2i6r59jz2izblxwgb29ivvjzx50pkd1jl9l6cs"; depends=[]; }; + prettyunits = derive2 { name="prettyunits"; version="1.2.0"; sha256="1smcxrfsz6cxym9h8iaiqrrw5bzp2bbpmf05zr8y70jw59zg4ngh"; depends=[]; }; prevR = derive2 { name="prevR"; version="5.0.0"; sha256="17sygcfj29cvycsi1d2870gwcqq1ij6gppsqj46phc04r8q5hs5v"; depends=[directlabels fields foreign ggplot2 gstat KernSmooth sf stars]; }; prevalence = derive2 { name="prevalence"; version="0.4.1"; sha256="0llxcz7bg62l6qq4xaf2xwmc2k0y2l3zw5nb6bq0a9qnp3anj8ah"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; previsionio = derive2 { name="previsionio"; version="11.7.0"; sha256="08hrklr3ngphdhp50lkz6ls9nn1bzdvs6xj583spsw4vm7j44yfr"; depends=[data_table futile_logger httr jsonlite magrittr Metrics plotly XML]; }; prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; }; - priceR = derive2 { name="priceR"; version="0.1.67"; sha256="0wxspa6ac7lpgdb4p75daipid3q3b3l8k44i6819v9w49z6y2dpi"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr tidyr]; }; + priceR = derive2 { name="priceR"; version="1.0.1"; sha256="0yf7hgvbm8a0ks2c8wnim8b9kqk7dljnaahw7faq2lzn67751dqc"; depends=[dplyr gsubfn jsonlite lubridate purrr stringi stringr tidyr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.2.2"; sha256="0clbc1p809rjgqilv548ck7pfbyajkp2i47vxx8yrrdgkx824gpn"; depends=[ggplot2 rlang survey]; }; prim = derive2 { name="prim"; version="1.0.21"; sha256="085dwmflag45qg0p4w2f9v000zj2kfaijp6jm11dj85swxmx7vjm"; depends=[plot3D scales]; }; primate = derive2 { name="primate"; version="0.2.0"; sha256="0agrz57xvk8azvb8af299l0g0iwamxy0l0m5y41rlsi03szszlii"; depends=[caroline]; }; @@ -15275,16 +15317,16 @@ in with self; { primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; primer = derive2 { name="primer"; version="1.2.0"; sha256="0qs4bzh80a6058v3s25z0w64wqpscgcciqbyqdifixl51z2qadf4"; depends=[deSolve ggplot2 tidyr]; }; primerTree = derive2 { name="primerTree"; version="1.0.6"; sha256="1w2xmmpqsp8plwsacfknkjkgs4x1fksrks614jwlg6fll4zxh42n"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr reshape2 scales stringr XML]; }; - primes = derive2 { name="primes"; version="1.4.0"; sha256="01ybqnfxsd8d913nxqwni5q14p5kzlwk94d3x7znz9w9n3lw5fjd"; depends=[Rcpp]; }; + primes = derive2 { name="primes"; version="1.5.0"; sha256="0wgisbialsv24gchwzm1nx1r1186lb36v80qk9gac3xmq45z6vdv"; depends=[Rcpp]; }; princurve = derive2 { name="princurve"; version="2.1.6"; sha256="0wzk329bxljkzz57y220lsfckpsn45w348m6dcxh29zbj0ik65h2"; depends=[Rcpp]; }; printr = derive2 { name="printr"; version="0.3"; sha256="1xqykwfpv78pg630vw4s8idbayrl52pfp9j4ddhwr33nmvxnkiix"; depends=[knitr]; }; prinvars = derive2 { name="prinvars"; version="1.0.0"; sha256="10cxp5dqjmi0kbx8g2qvpvwv2lcdg4sd2njg81l9g8dphx0c662f"; depends=[elasticnet PMA Rdpack]; }; prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; }; - prioriactions = derive2 { name="prioriactions"; version="0.4.2"; sha256="0zrhpcdaakvc8706psqmp2y26nxyqr17l16wknb10clvh37d4r1b"; depends=[assertthat BH dplyr magrittr Matrix proto Rcpp RcppArmadillo rlang tidyr]; }; + prioriactions = derive2 { name="prioriactions"; version="0.5.0"; sha256="0k0vaqpdj9rlxcmfn6qb1bj8ssbazj33qa4rg4l8agpf9x83n9f8"; depends=[assertthat BH dplyr magrittr Matrix proto Rcpp RcppArmadillo rlang tidyr]; }; prioritizr = derive2 { name="prioritizr"; version="8.0.3"; sha256="0049mgziwlhh68rnv3g3h55ln36wdi6ypf8pb9vpwnl9c72zh0ld"; depends=[ape assertthat BH cli exactextractr igraph magrittr Matrix R6 raster Rcpp RcppArmadillo rlang sf slam terra tibble withr]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.3.2"; sha256="0dvxh43dk9mhsqdj89zilh3r91cqngl07ggw5r5rj761xl3km10w"; depends=[sf terra tibble]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.3.1"; sha256="1vn4i7rg1nsir98lgaxnw4851rwyv8kx25z8nc942qsr3r7cvdf6"; depends=[checkmate glmnet survival]; }; - prism = derive2 { name="prism"; version="0.2.0"; sha256="0gl6qmpgfdxn90aw10z4xj4ijcwj9mr0s9ahm28niinr9y89gzxk"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; + prism = derive2 { name="prism"; version="0.2.1"; sha256="1fgmv58igvkp11n8jgqvxd2qpccpv3s6xwzm2678ikrgc3hynj0x"; depends=[dplyr ggplot2 httr magrittr raster readr stringr]; }; prismadiagramR = derive2 { name="prismadiagramR"; version="1.0.0"; sha256="13x3y4rv9b2d013jd6853zkq8rbxq88wlffmdnjs1rca0fnfrn4f"; depends=[DiagrammeR dplyr]; }; prismatic = derive2 { name="prismatic"; version="1.1.1"; sha256="013i0mq4n8s2zbzvfrz1vjcn2a6l98bamslkcv1a3cn70gpphja9"; depends=[farver]; }; prismjs = derive2 { name="prismjs"; version="1.1.0"; sha256="0siga7l60d0axlnjwbl4smw28rggyxrjwzv8ypw9bhb6x1xnn8in"; depends=[V8 xml2]; }; @@ -15304,9 +15346,10 @@ in with self; { processpredictR = derive2 { name="processpredictR"; version="0.1.0"; sha256="161gbyq21j5yip5p8p235mvcffchm7c8ksks1z7q5cwbrilcx380"; depends=[bupaR cli data_table dplyr edeaR forcats ggplot2 glue keras magrittr mltools plotly progress purrr reticulate rlang stringr tensorflow tidyr tidyselect]; }; processx = derive2 { name="processx"; version="3.8.2"; sha256="1kbyhpzcfiqqx9csn0869zbiza6w97vq1j1y01qlph93bfpqf6z9"; depends=[ps R6]; }; procmaps = derive2 { name="procmaps"; version="0.0.5"; sha256="0c5cby1942s9vdl0a6nyiih6x7kxii02w2l4fp8n9z07h7j5jb69"; depends=[]; }; + procs = derive2 { name="procs"; version="1.0.3"; sha256="0k2v2l843c92raa3d2gdv3ns7bxr5ja48vf7lzqkig5qdixxfafc"; depends=[common fmtr reporter tibble]; }; prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; }; prodigenr = derive2 { name="prodigenr"; version="0.6.2"; sha256="07r6xiqany2qzarfqphs90pcwx7zbki0z7mp329l7szfz01wxiqr"; depends=[cli fs rlang rmarkdown rprojroot whisker withr]; }; - prodlim = derive2 { name="prodlim"; version="2023.03.31"; sha256="003qg4apcayj5kr3730qcs8npibmv1vznzgjcrk9bjhihm7la42m"; depends=[data_table diagram KernSmooth lava Rcpp survival]; }; + prodlim = derive2 { name="prodlim"; version="2023.08.28"; sha256="1s2xalxfq2q6a9ssz01vzpldpa98q3cl5icap0k2xr5v72gj40l0"; depends=[data_table diagram KernSmooth lava Rcpp survival]; }; productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; profExtrema = derive2 { name="profExtrema"; version="0.2.1"; sha256="0gdhamnngh1yh3nb7l656qhdr61s0zn6h1hagh22k2fn11z3xhsl"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; }; @@ -15315,26 +15358,27 @@ in with self; { profileModel = derive2 { name="profileModel"; version="0.6.1"; sha256="01m5nb8cmq0aq555pxk2a99182si65hhmn68yn9nal2j3zl2bp4i"; depends=[]; }; profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; profmem = derive2 { name="profmem"; version="0.6.0"; sha256="0gg6ja0ifwn9jj42rw1gnyil55sl9r2y5rjb6yjcvqwd5arajp3l"; depends=[]; }; - profoc = derive2 { name="profoc"; version="1.2.0"; sha256="05wsc72031fp7pg9r9fl8fl0i19f4pidxnalpydnrd59zqrg1q7j"; depends=[abind lifecycle Matrix Rcpp RcppArmadillo RcppProgress splines2]; }; + profoc = derive2 { name="profoc"; version="1.2.1"; sha256="0s1fyckmfdjr5madwzrmpxkr34z940r43qny8g5aljz4qsbzlcip"; depends=[abind generics ggplot2 lifecycle Matrix Rcpp RcppArmadillo RcppProgress splines2 tibble]; }; profr = derive2 { name="profr"; version="0.3.3"; sha256="00bv1q0qn46nz4zjfs0l2yfh3hk71rajlp2rrlwg442z11k79ap9"; depends=[plyr stringr]; }; proftools = derive2 { name="proftools"; version="0.99-3"; sha256="095pxyyv6k818qwcjygbz1h24k0xkqi1agns8cqh2m5g64aynd70"; depends=[]; }; profvis = derive2 { name="profvis"; version="0.3.8"; sha256="1cmlcp91q8v0550iay9vsw5wllb6w2ldy6k99rb76ylhr5dwf0pc"; depends=[htmlwidgets purrr rlang stringr vctrs]; }; progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; - progressr = derive2 { name="progressr"; version="0.13.0"; sha256="1qd4yn6hhqxjpd7ckkrrqcpmx9ha01fy1y8gmldikk70vp53vyqg"; depends=[digest]; }; - proj4 = derive2 { name="proj4"; version="1.0-12"; sha256="1y3n6zjc4s78pagq5f2x9sdfjg5x5nwnhq67jd06fndlsma8mssa"; depends=[]; }; + progressr = derive2 { name="progressr"; version="0.14.0"; sha256="1bsqcarh38z86klcm5iaqmf6akgy5gaii7797c27ymx5g7w9ja4s"; depends=[digest]; }; + proj4 = derive2 { name="proj4"; version="1.0-13"; sha256="1wvp17x58i614mnrjp0idzfi7s3g7pz41x8cxv05ryi9iz5l0m5c"; depends=[]; }; projections = derive2 { name="projections"; version="0.6.0"; sha256="0wpqklw5aif9vgcp6hyc7j5k8ifxwx5bhhd50llwgrh5xiy9yxyq"; depends=[ggplot2 incidence]; }; projects = derive2 { name="projects"; version="2.1.3"; sha256="0ljrhswr5sfq051x0aicl9yvwakw9d9drgrmcz9d8qhgw1if0mky"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; }; - projpred = derive2 { name="projpred"; version="2.6.0"; sha256="1nkil537n43sz0ajkcyr0i38hb852qgcdxlgnirqkl0w98ax2hac"; depends=[abind gamm4 ggplot2 lme4 loo MASS mclogit mgcv mvtnorm nnet ordinal Rcpp RcppArmadillo rstantools scales]; }; - prolific_api = derive2 { name="prolific.api"; version="0.5.1"; sha256="04maca0pm5jkajafb7bc1qqlapawbbnsmml97xnwvdmi11hb9zsa"; depends=[data_table jsonlite]; }; - prome = derive2 { name="prome"; version="1.8.1.0"; sha256="1knhxdvb178hrdd7hnwli8yslflpynx944wnz9qszivlm9r9i6wf"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + projpred = derive2 { name="projpred"; version="2.7.0"; sha256="0dydkvb0znqli4lbncihk8yimsiakvdyra5cx1cakvm73mn37s5r"; depends=[abind gamm4 ggplot2 gtools lme4 loo MASS mclogit mgcv mvtnorm nnet ordinal Rcpp RcppArmadillo rstantools scales]; }; + prolific_api = derive2 { name="prolific.api"; version="0.5.2"; sha256="1xg1xgkj53zls6zh5nil5njb783ymks9hgfpsxcdnvhnhgsb50k2"; depends=[data_table jsonlite]; }; + prolsirm = derive2 { name="prolsirm"; version="0.1.0"; sha256="1nx4bal130r3c7hb0x5j22rh7988p62qll3rm0j8wkiqdnqkyhay"; depends=[MCMCpack]; }; + prome = derive2 { name="prome"; version="1.9.1.0"; sha256="134nc90av9js4qdq7dxy7z93h621i6w1vbgly38minprfam0wwm0"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; promethee123 = derive2 { name="promethee123"; version="0.1.0"; sha256="0s1wkcrvm32dpqg9ahn10kni1xv3ll7akqz4y6yn1d36km81bf21"; depends=[cowplot ggplot2]; }; - promises = derive2 { name="promises"; version="1.2.0.1"; sha256="1dy4cbqw17awh4q8m7cy3anaj0n9iynabfzflb1g94cyj0bq4fld"; depends=[later magrittr R6 Rcpp rlang]; }; + promises = derive2 { name="promises"; version="1.2.1"; sha256="1gp55inqbbj0ifm4n0j5h8854a9v109xpikyhwv7b8lyydns5q1w"; depends=[fastmap later magrittr R6 Rcpp rlang]; }; promor = derive2 { name="promor"; version="0.2.1"; sha256="0cpf6946522lhnsr6fxm8ppvq69vjpkx7p7p0chx7kibc9ivb1ia"; depends=[caret ggplot2 ggrepel gridExtra kernlab limma missForest naivebayes pcaMethods pROC reshape2 statmod VIM viridis xgboost]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; promotionImpact = derive2 { name="promotionImpact"; version="0.1.5"; sha256="18iq2r5zirddlfx20alm6qnxf9qv3ii3c9bcm789q0q18d2hyj2q"; depends=[crayon dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; - prompt = derive2 { name="prompt"; version="1.0.1"; sha256="19l2vrm7qcdrf2mliniazf3mc6sz3g9v5sysf9nd01p5harqrk8k"; depends=[cli]; }; + prompt = derive2 { name="prompt"; version="1.0.2"; sha256="12fqdz906b96h4iaa1hpfwamp94c9am5287l57dsh2g4dpqvw91l"; depends=[cli]; }; prompter = derive2 { name="prompter"; version="1.1.0"; sha256="113gk5wwsaw0kh7z6caarlp7g536w3ibq3bnm53zp35rij7zrynz"; depends=[shiny]; }; promr = derive2 { name="promr"; version="0.1.3"; sha256="0b737gyg828s2m30l77qc59caazdsp84cg8a72arg0fqs70hk580"; depends=[httr tibble urltools]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; @@ -15347,10 +15391,10 @@ in with self; { protViz = derive2 { name="protViz"; version="0.7.7"; sha256="18l4aw0fx47w9czw73lxh68aj4ljbfr3z39vakbbx6xp2llyw8b1"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; protein8k = derive2 { name="protein8k"; version="0.0.1"; sha256="11qj4sadhcsp1kk5kjmvzj2jnd3srsm5mp0q9h9khp1ps6dk35yw"; depends=[dplyr ggplot2 gridExtra lattice magick pryr rjson rlang shiny]; }; - proteus = derive2 { name="proteus"; version="1.1.1"; sha256="1yl8kqa5lamy7ww4ak73akx1vcaj81wk6galbc4xnn8p4wa8why5"; depends=[abind actuar dplyr fANCOVA ggplot2 ggthemes greybox imputeTS lubridate modeest moments narray purrr readr scales stringr tictoc torch VGAM]; }; + proteus = derive2 { name="proteus"; version="1.1.4"; sha256="1i8h07k5pdsywpw5g8d06xgl5gk06g5q93jimfwkbry9ykagh1cw"; depends=[abind actuar dplyr fANCOVA furrr future ggplot2 ggthemes greybox imputeTS lubridate modeest moments narray purrr readr scales sn stringr tictoc torch VGAM]; }; proto = derive2 { name="proto"; version="1.0.0"; sha256="1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"; depends=[]; }; protoclust = derive2 { name="protoclust"; version="1.6.4"; sha256="0cbl9jxdc2j4z5viczl70zcd9z83qlipvkqi5f2bpypyvi2s0xs1"; depends=[]; }; - protolite = derive2 { name="protolite"; version="2.2.0"; sha256="1bqqw43irk2a9xqlylxlbxpcaa40wdxdx4y6kqhzibxvw1p7drii"; depends=[jsonlite Rcpp]; }; + protolite = derive2 { name="protolite"; version="2.3.0"; sha256="1sccyyf89bban3b83yxzkcyqpgcp7ggm9lirxixzjj433baj9vsk"; depends=[jsonlite Rcpp]; }; proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; protoshiny = derive2 { name="protoshiny"; version="0.1.0"; sha256="0ms8sy8p5cd8vg82m7pny6jcg5mis1l7548m2g392gjcf3hf1sf7"; depends=[DT dynamicTreeCut protoclust rare shiny shinycssloaders shinythemes]; }; prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; @@ -15364,13 +15408,13 @@ in with self; { provSummarizeR = derive2 { name="provSummarizeR"; version="1.5.1"; sha256="1sab34fhyzzzj600ks2xwyv2y1657ir5k2dzkjry8y1mwvag796j"; depends=[provParseR]; }; provTraceR = derive2 { name="provTraceR"; version="1.0"; sha256="19iillyh5zw64mmr6ik4ci1n2p651xqzxa4iq5bwa70imbzyy5ip"; depends=[provParseR]; }; provViz = derive2 { name="provViz"; version="1.0.9"; sha256="0hwd9x02xcldrmmnpknsycqlb78ngdsphs7n141rcxsv167gbmcq"; depends=[]; }; - provenance = derive2 { name="provenance"; version="4.1"; sha256="137mayfp2jm859zymp1c62vs8fw06l58w07c44h2a0szjrwkgc0j"; depends=[IsoplotR MASS]; }; + provenance = derive2 { name="provenance"; version="4.2"; sha256="1ghdvc6h25zx1hn1x2wqbc1zc1jdxv77lg0l6msymy9ap5ndcdrn"; depends=[IsoplotR MASS]; }; proverbs = derive2 { name="proverbs"; version="0.3.0"; sha256="05pqjz83awa7l971vclg3c3f7hj3nfq0dlrzbxmr2zhysnqjnd62"; depends=[cli crayon httr lubridate magrittr purrr stringr]; }; proxirr = derive2 { name="proxirr"; version="0.2"; sha256="0ffnzmd9zy43vzp0mc0ncjwfj5d7p2gzwk8gcwhk1f9yvgiw4wc1"; depends=[]; }; proxy = derive2 { name="proxy"; version="0.4-27"; sha256="0gsng2aggnljl4z82la9hpnd26hngzhj8fizx4wx22npqjj93694"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.3.3"; sha256="00p3604ny6qax5rr1865c27hfp90v2vga0xcrp3bb81xcfadl99y"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.3.1"; sha256="0gcjfjsvj2pjp9ih7nxvs9gfj5b94g8d3ziaz16wfbnjqm4a38lp"; depends=[AhoCorasickTrie docopt dplyr Matrix purrr readr rlang seqinr stringr]; }; - prqlr = derive2 { name="prqlr"; version="0.4.0"; sha256="0p25wrbb4gmgwr7afismlsgyly283zn1xfbqy218r1ia79hzs3b0"; depends=[]; }; + prqlr = derive2 { name="prqlr"; version="0.5.4"; sha256="123dyjq7gbwj15s47dbqcgicx9a2wrbqqzailhr3l828j5zi7679"; depends=[]; }; prrd = derive2 { name="prrd"; version="0.0.5"; sha256="0ig3k1l2md6hzb5asv277ylg0k9a1rkcrbs8d8h4f07pxykhmivf"; depends=[config crayon data_table DBI liteq RSQLite]; }; prt = derive2 { name="prt"; version="0.2.0"; sha256="02f75a9ici0a7fm08r0dhykf73jpixg5cm8ym2z18dhghas4zly4"; depends=[assertthat backports cli crayon data_table fst pillar rlang tibble vctrs]; }; pryr = derive2 { name="pryr"; version="0.1.6"; sha256="013p2xxd51kr9ddx051cvn45mzgj44fm47nkchdb13l0885a7hb8"; depends=[codetools lobstr Rcpp stringr]; }; @@ -15378,11 +15422,11 @@ in with self; { psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; psSubpathway = derive2 { name="psSubpathway"; version="0.1.2"; sha256="1vznsf2xpchzh3ybj3d2dz8611q4681540wmw11y8g4bhl1lfp0w"; depends=[GSVA igraph mpmi pheatmap]; }; psbcGroup = derive2 { name="psbcGroup"; version="1.5"; sha256="01q02lsjjj14b8si9pj12a5cvyq74lb9444vpwpxkbnsznx10bsy"; depends=[LearnBayes mvtnorm SuppDists survival]; }; + psbcSpeedUp = derive2 { name="psbcSpeedUp"; version="2.0.4"; sha256="170jgsy4wbfr98hcml4dxd4al8q2c0dk9d5k40vcfpab377pnllg"; depends=[GGally ggplot2 MASS Rcpp RcppArmadillo xml2]; }; psborrow = derive2 { name="psborrow"; version="0.2.1"; sha256="0m2jcf5awlwkzscsps0fczpaflxzi0w6m9qxlzm7abip277lhgpd"; depends=[data_table doParallel dplyr foreach futile_logger ggplot2 MatchIt mvtnorm rjags survival]; }; pscl = derive2 { name="pscl"; version="1.5.5.1"; sha256="0nwdwyxmy4baiwjjvrypdclzhpbsipik1rkrvgag4y2csg1nf4v1"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.4.0"; sha256="0flzqr9x0z2mjnbm5cjm8hqndkbv2yp11agkx89mbaafsg0hmjn1"; depends=[ggplot2 JWileymisc lavaan reshape2]; }; psd = derive2 { name="psd"; version="2.1.1"; sha256="1c9kq5g2p4iy1jdc9fhfs1v0hcnc8cbrpvafdpy3l4n9m66hahky"; depends=[RColorBrewer Rcpp RcppArmadillo]; }; - psda = derive2 { name="psda"; version="1.4.0"; sha256="0if42szf0gkgdl7d02x43i0fdb6hp47j918vx06aw7qcw6a8j3k2"; depends=[ggplot2 plyr raster rgeos sp]; }; psdr = derive2 { name="psdr"; version="1.0.1"; sha256="02ypgi1gxnp0mn9p1w2j34ypnpbkrwp9i0ma0i7657zddcfnf391"; depends=[devtools ggplot2 qpdf]; }; pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; }; pseudohouseholds = derive2 { name="pseudohouseholds"; version="0.1.1"; sha256="102kc3j106bw6dlarmvwyh4mg68imbyxzc5j6pkzn6xpnvils3fm"; depends=[dplyr furrr sf]; }; @@ -15395,33 +15439,30 @@ in with self; { psmineR = derive2 { name="psmineR"; version="0.1.0"; sha256="0fc30hsqkbfjj7wz2s7yn1w3hrr80k8bmj6ah8diswrq1ms12k3i"; depends=[bupaR cli data_table dplyr forcats ggplot2 glue rlang stringi tidyr]; }; pso = derive2 { name="pso"; version="1.0.4"; sha256="0dq02pv86iwxpvd8wfbryxfsxqrrw4991iim60nyh8mn02gflkmi"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; - psp = derive2 { name="psp"; version="0.1"; sha256="0ls8nqfddl9yqsz6binjf5smg3vbs5r65dqv92zn6hmb51akf7q5"; depends=[]; }; - pspatreg = derive2 { name="pspatreg"; version="1.1.0"; sha256="1gf00i605fss6xn0gyk7y2cqpihmqm4klqd1z1pdxqq41cg8r34s"; depends=[AmesHousing dplyr fields ggplot2 MASS Matrix MBA minqa numDeriv plm Rdpack sf spatialreg spdep stringr]; }; + psp = derive2 { name="psp"; version="1.0.0"; sha256="0fjpjzf0m1f5xw1jrxn78m4r8ghwkcs2fsfhivbvws31gc11h7k0"; depends=[data_table Rcpp RcppArmadillo]; }; + pspatreg = derive2 { name="pspatreg"; version="1.1.2"; sha256="0giaxz7zdwik6qw9xlgipxwksdia044y2h64ik2bz03hi21w5n2i"; depends=[AmesHousing dplyr fields ggplot2 MASS Matrix MBA minqa numDeriv plm Rdpack sf spatialreg spdep stringr]; }; pspearman = derive2 { name="pspearman"; version="0.3-1"; sha256="09l3knwaj4xs9dfz1xcj4mbynd4w1vxcgmzfqxz97czzbf7ingwh"; depends=[]; }; pspline = derive2 { name="pspline"; version="1.0-19"; sha256="0h7y9l64knx291ms5mlc65dl3ljzgmrfzdqk1rd7iy8x7wcvymds"; depends=[]; }; pspline_inference = derive2 { name="pspline.inference"; version="1.0.4"; sha256="1ijz642igm27xg3928w9ffvykai26aar5awbcilrjbkm6fk7yd4w"; depends=[assertthat dplyr magrittr mgcv plotrix plyr reshape2 rlang]; }; psqn = derive2 { name="psqn"; version="0.3.1"; sha256="05nzyapilhzwjgc3lizg424i28mshmwirpggg79hssjqmqraflpj"; depends=[Matrix Rcpp RcppEigen testthat]; }; - psr = derive2 { name="psr"; version="0.1.0"; sha256="0lnszaspilk88hmdjbgid7nh0zrpc57mymchva4kqc3cpckw247a"; depends=[dplyr psych tidyr]; }; - psrwe = derive2 { name="psrwe"; version="3.1"; sha256="0gmsh0294jzazxw4ss6jys92dckgfh4fqirfcdi3pzr6a7nnam8s"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders survival]; }; pssmooth = derive2 { name="pssmooth"; version="1.0.3"; sha256="08syh52gjaf72kq01v6b5dljmwi29nvmjmkkgmjb97zsi15z1wd3"; depends=[chngpt MASS np osDesign]; }; pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; }; psy = derive2 { name="psy"; version="1.2"; sha256="1cps0lc31l2zchlmrmbwhyz9zjxkl4rcjja838cnqci7plcav28l"; depends=[]; }; psycModel = derive2 { name="psycModel"; version="0.4.1"; sha256="0b6kamy2c6a6krs4i1mzzmiacxybyqvyl9kajc9l0ykj1hilixp8"; depends=[dplyr ggplot2 glue insight lavaan lifecycle lme4 lmerTest parameters patchwork performance psych rlang stringr tibble tidyr]; }; - psych = derive2 { name="psych"; version="2.3.6"; sha256="1z5h2hs56fw54dsvpi3sl463l31yn0qjvk779wdb7w175gwmr6db"; depends=[lattice mnormt nlme]; }; + psych = derive2 { name="psych"; version="2.3.9"; sha256="1c8r42yv7x1vjxz8j2hvkii6jxapffiib2s5vvlsm4hp2qffihh4"; depends=[lattice mnormt nlme]; }; psychReport = derive2 { name="psychReport"; version="3.0.2"; sha256="193y07hmx630wn83ss47i2rssl1pswgc87z2ygpkaw8y8vv46wk9"; depends=[broom cli dplyr ez xtable]; }; - psychTools = derive2 { name="psychTools"; version="2.3.6"; sha256="1vb2zvp7ysvzvv71var638phnblcfy9lviq34y8k1adyxc5zkdkh"; depends=[foreign psych]; }; + psychTools = derive2 { name="psychTools"; version="2.3.9"; sha256="06jw5nhb9vbdfb74y5fqnl9974p0bddymwgiyvm8mmfn2083vp1s"; depends=[foreign psych]; }; psychmeta = derive2 { name="psychmeta"; version="2.6.5"; sha256="0rdbi432kr433rqy5y8rjh11cq66zcc8zr4nckjqw88hsz4qhin4"; depends=[boot curl dplyr ggplot2 metafor progress purrr rlang tibble tidyr]; }; psycho = derive2 { name="psycho"; version="0.6.1"; sha256="1a3qccr9jwrbwkfbrvckkhhk9qygrc5n4mq80kpzx0zy5bylxi0a"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters scales stringr]; }; psychometric = derive2 { name="psychometric"; version="2.3"; sha256="0yn1k1z9mf3bmlgygwiwb6y04c52rpx47n2v2x8lac5zds5yb4xl"; depends=[dplyr multilevel nlme purrr]; }; psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.11"; sha256="03ikv5m9cqh9ixg5w3x13bxg7sqxnbpw157vijsmf1v7szggjary"; depends=[abind combinat corpcor dplyr GA glasso IsingSampler lavaan magrittr Matrix mgcv numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo rlang roptim tidyr VCA]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.11.5"; sha256="0syfnjmkwlzfjpl6wpqrbrww1wmddj0l9vwjll1mg0v3as69m28b"; depends=[abind combinat corpcor dplyr GA glasso IsingSampler lavaan magrittr Matrix mgcv numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo rlang roptim tidyr VCA]; }; psychotools = derive2 { name="psychotools"; version="0.7-3"; sha256="1yl5b3ws95c80gwjxdrcqj5pv7k3vf6ixb390xc758hz0b4gawqx"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.16-0"; sha256="1mk747m37yhhgvwikc88s0m86rgwbzkkv797jwxfpk8fsd79xqc8"; depends=[Formula partykit psychotools]; }; psychrolib = derive2 { name="psychrolib"; version="2.5.2"; sha256="0d43zhpl5ik90hqpdy62x7rwmxag3z1mdrn3cl1whr04rmymhk20"; depends=[Rcpp]; }; - psychtm = derive2 { name="psychtm"; version="2021.1.0"; sha256="1qx3ks23wyi7c53p05jq2w18qz0kym0j43japz9sgj6zyh0c5649"; depends=[coda label_switching Rcpp RcppArmadillo RcppProgress rlang tibble]; }; psymetadata = derive2 { name="psymetadata"; version="1.0.1"; sha256="1m1b1fhiv31hjc7iy20c065w25mgzmsbp0vlh2vlzrlqmfw0qpwv"; depends=[Rdpack]; }; psyntur = derive2 { name="psyntur"; version="0.1.0"; sha256="0dh7vdj3ynsxibcf0wmh5h4yknijg78azjzlma25glihpgd2nbbw"; depends=[dplyr effsize ez fastDummies formula_tools GGally ggplot2 ggthemes magrittr plyr psych purrr rlang tidyr tidyselect]; }; - psyphy = derive2 { name="psyphy"; version="0.2-3"; sha256="1cf134l5j7ggclr08jb5vrj4jv4gq9s1b3njj0ic4263xg8wvv6n"; depends=[]; }; + psyphy = derive2 { name="psyphy"; version="0.3"; sha256="0s3bdzbjbdapfgg44qlk4dp2m3h3hhcqy93vh32170rzkxj82p4p"; depends=[]; }; psyverse = derive2 { name="psyverse"; version="0.2.6"; sha256="1ry7n2nsj3vq8j5f10iqcldg3bas9mr1995d7hm1ih6dc4gbg934"; depends=[yaml yum]; }; ptable = derive2 { name="ptable"; version="1.0.0"; sha256="142nw1rq9nm9fc6amcsdfy4qnv89p5yz90cxxbw1r4bylm86grs2"; depends=[data_table flexdashboard ggplot2 nloptr RColorBrewer rlang rmarkdown]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; @@ -15430,27 +15471,27 @@ in with self; { ptm = derive2 { name="ptm"; version="0.2.6"; sha256="1ibkl9nz58nh52vyc18m1j8h0ackfc50ay6rd5dw33rrl0wiw1cp"; depends=[bio3d Biostrings curl httr igraph jsonlite muscle RCurl seqinr xml2]; }; ptmixed = derive2 { name="ptmixed"; version="1.1.3"; sha256="1wdasnmddb2k8n7vzsjqw6kjg6hgh8bjn6m8fgrhxdrpp2pgrqx4"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; ptools = derive2 { name="ptools"; version="2.0.0"; sha256="12k47f2nwf5r0d4r1n3qksdsd1gk3ax519hqz6803hynwlcqx2a3"; depends=[igraph partitions RANN raster sf sp spatstat_geom spatstat_utils]; }; - ptspotter = derive2 { name="ptspotter"; version="1.0.1"; sha256="1yppjmsxx01n9x0a0bbqsaxjixvrzyjq3112p94igg2xpp6h6cvl"; depends=[beepr log4r pryr stringr this_path]; }; - ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; - pttstability = derive2 { name="pttstability"; version="1.1"; sha256="1k6la75f4195ld9dndzxc6v49381r56djmc7ir1wzwvhxjchp8pa"; depends=[rEDM]; }; + ptspotter = derive2 { name="ptspotter"; version="1.0.2"; sha256="0mw9s2h6bhyjrcw9f0ayzcwg30inwyr7dqfk43qc24ppkclh85wh"; depends=[beepr log4r pryr stringr this_path]; }; + pttstability = derive2 { name="pttstability"; version="1.2"; sha256="12a1pj8zrf6ir6szh51mlg6mlpqkqdb8p5656wg27lxf90nwvgj7"; depends=[rEDM]; }; ptvapi = derive2 { name="ptvapi"; version="2.0.3"; sha256="0qz1ras2xbmph9hkxy9hpzw1abf2lrfs38jfw2yfxhhdv0frdcga"; depends=[assertthat digest glue httr jsonlite purrr tibble]; }; ptw = derive2 { name="ptw"; version="1.9-16"; sha256="0rma3h9ksc5qigdvk5vappb4ipd4rpk64wckzcxvxspakr5w71vy"; depends=[RcppDE]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; pubh = derive2 { name="pubh"; version="1.2.7"; sha256="0l87x8mnjssvbcwsm48gsn2mmidkhk7gzy5x2v6qrcxcxw32pm68"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 gtsummary Hmisc huxtable lmtest magrittr moonBook sandwich sjlabelled sjmisc sjPlot survival tibble tidyselect]; }; + public_ctn0094data = derive2 { name="public.ctn0094data"; version="1.0.6"; sha256="105v4if9fqbqfrgkvcc6ws2cggn67fp3nh9y41absd7jvmzsb49h"; depends=[]; }; publipha = derive2 { name="publipha"; version="0.1.2"; sha256="03fpwxh5fyiq84wvmp5yyvsvqnznxyc4ncffn0nfhdnj5giymqvh"; depends=[BH loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders truncnorm]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.19"; sha256="0yh4gjhh7nw5vh3ksay2z5pgskmasbagzbgb3bfxch9b6arv6kgc"; depends=[boot R2HTML RCurl RJSONIO XML]; }; pubmedR = derive2 { name="pubmedR"; version="0.0.3"; sha256="153br94iqayrvvgzrzx0r3ilcrmnznfdnzk8yaii01s8i1g1wxcd"; depends=[rentrez XML]; }; pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.3"; sha256="125d091ba9h8h61y0m1bnflklmz898sp9w6ibca50vwz3d2qy5rz"; depends=[RCurl]; }; puls = derive2 { name="puls"; version="0.1.2"; sha256="0cdgcm4fvakk2mdjmlsnin3d0bf56wrm23p9f4bhh5j1ib68lsh5"; depends=[cluster dplyr fda fda_usc ggplot2 monoClust purrr rlang tibble tidyr]; }; - pulsar = derive2 { name="pulsar"; version="0.3.10"; sha256="01ylrxm4p0zxi22hj3yk1z30bh2xkbh8aywzcbzidk05ysd9fr6l"; depends=[Matrix]; }; + pulsar = derive2 { name="pulsar"; version="0.3.11"; sha256="14wkqxgi8vi5szd01j5q5vis07zav22wljy32g3vljxyn8jyz0pf"; depends=[Matrix]; }; pulseTD = derive2 { name="pulseTD"; version="0.1.0"; sha256="0sdnswinpnm0vvplrh5gl9gx4p03dx175mqxzg5r52rkzd3rfbsr"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicFeatures ggplot2 Rsamtools S4Vectors SummarizedExperiment]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; - puniform = derive2 { name="puniform"; version="0.2.6"; sha256="1rfd7d14an28hba1rhldxn418qagnlk8ngvimb86i3774ll9blvi"; depends=[ADGofTest metafor Rcpp RcppArmadillo]; }; + puniform = derive2 { name="puniform"; version="0.2.7"; sha256="15q5wlcps7387rjz7p1f5kifg1fl5yxxy7gjx6fvspvqwjkjbs4z"; depends=[ADGofTest metafor numDeriv Rcpp RcppArmadillo]; }; pureseqtmr = derive2 { name="pureseqtmr"; version="1.4"; sha256="105v0ydl458xzgkdas7m8llf0672s9klv816sjl27dy0a3k8163f"; depends=[data_table devtools dplyr ggplot2 Peptides plyr rappdirs Rcpp readr stringr tibble]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; - purgeR = derive2 { name="purgeR"; version="1.7"; sha256="0jcvfrgm7b85xf1lqjnidxrp0dmnqk8pjg2sj581jmkimrpf6cad"; depends=[doSNOW foreach progress Rcpp RcppProgress]; }; + purgeR = derive2 { name="purgeR"; version="1.8"; sha256="00dg6hxv5ld13daph77whzarfwm0ryrwnrs7yc0hqd77k36v336d"; depends=[doSNOW foreach progress Rcpp RcppProgress]; }; purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; }; purrr = derive2 { name="purrr"; version="1.0.2"; sha256="0qxvifs5gakjbivs8dgz6nrp6df2ypr3c4dlj84gyga3i2xwc6rc"; depends=[cli lifecycle magrittr rlang vctrs]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.8"; sha256="0ql08dka07wi1cxjcn12pxj00j0cm112074l7byj9vmi3rlqynh8"; depends=[dplyr magrittr purrr Rcpp]; }; @@ -15479,27 +15520,28 @@ in with self; { pxR = derive2 { name="pxR"; version="0.42.7"; sha256="05i1cg35hq0z37xnh2qfcp8mnrphadrg7av5d0mcgi9nx6c1w80j"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.16.2"; sha256="08lwi9adf5wavpc2cbqgyyf3cygih79wkrzf2naydnlf8xn3jcm4"; depends=[checkmate httr jsonlite]; }; pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.5"; sha256="1b1cbvjbnvw2h8l3lbm0ma80zgpm212wzfhyyr6dr115k237xy89"; depends=[curl reticulate XML]; }; - pycno = derive2 { name="pycno"; version="1.3"; sha256="1a7a1cy75vrbyaziw9kywallxg6mxcxj4pz4haa66fcjqv5cqmxa"; depends=[maptools rgeos sp]; }; + pycno = derive2 { name="pycno"; version="1.4"; sha256="1df7fbizm8r705dddb9xhypf39i6avsn5gpq0r7jx07nv1gmbmbw"; depends=[sf sp]; }; pyinit = derive2 { name="pyinit"; version="1.1.3"; sha256="0cbwip549d17ysbk4lrvn6a25vfjjnimjsd5myvnbvg8c9nq5ryn"; depends=[robustbase]; }; pylintR = derive2 { name="pylintR"; version="0.1.0"; sha256="00k9p3igdxhyx353gq8j9mnhrs9fh0j4q2iqa2ljfjdsdw1r2asr"; depends=[fansi htmlwidgets rstudioapi]; }; pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; }; pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; }; + pysparklyr = derive2 { name="pysparklyr"; version="0.1.0"; sha256="0gs0v8a0niqvd120m31vbgp62abvygs73150pdds9lnal16wy2ip"; depends=[cli DBI dbplyr dplyr fs glue httr2 magrittr processx purrr reticulate rlang sparklyr tidyr tidyselect vctrs]; }; pzfx = derive2 { name="pzfx"; version="0.3.0"; sha256="0f8bvwnk44wq8j58rw80b9bclknrh4a3iqdl3p4y26q100cpisgr"; depends=[xml2]; }; qCBA = derive2 { name="qCBA"; version="0.5.1"; sha256="1r9khpmdxjcnlbx4ccg26vsyp3wdc06bvlx9yl9zm4kwfi68aj9y"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; - qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; + qMRI = derive2 { name="qMRI"; version="1.2.7"; sha256="0jiwvnhmm4zwqydqkzsygwkm23nc0zzjz5w7yckwdfc5zafch4hk"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; qPCRhelper = derive2 { name="qPCRhelper"; version="0.1.0"; sha256="0v1d4k2v2sgcy0xh2vq21yv9sw71bj44rc273g9ggg214zqdprxd"; depends=[dplyr ggplot2 ggpubr magrittr rstatix]; }; qPCRtools = derive2 { name="qPCRtools"; version="0.2.1"; sha256="1z5yha37w4zgf0yzkrrap34s4f2ngblvh698d7m0dfdchgai63qp"; depends=[broom data_table dplyr ggplot2 ggpmisc ggthemes kableExtra magrittr multcomp readxl reshape2 rstatix sjmisc stringr tibble tidyr xlsx]; }; qacBase = derive2 { name="qacBase"; version="1.0.3"; sha256="0rmxmaaa162w1qrbkcm2fd2rnrp2kqjjh6mpszpv1lpfdaq7p4yq"; depends=[crayon dplyr ggcorrplot ggExtra ggplot2 haven multcompView patchwork PMCMRplus purrr rlang tidyr]; }; qad = derive2 { name="qad"; version="1.0.4"; sha256="1pvdm6h5zilvrpggvy5qq5lhxxblslkjvjjfdj1f5zaick2hmf3s"; depends=[copula cowplot data_table dplyr ggExtra ggplot2 Rcpp viridis]; }; qap = derive2 { name="qap"; version="0.1-2"; sha256="19adb1bw46pcnmmhqz2jklr0vmma3llxajqp0j9mqfksmsisv927"; depends=[]; }; - qape = derive2 { name="qape"; version="2.0"; sha256="0fzh3n5g9q1wh5pahm7ynw83gc2afb71rqcxfp288zd0shf97q6p"; depends=[dplyr future_apply lme4 Matrix matrixcalc mvtnorm plyr]; }; - qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; + qape = derive2 { name="qape"; version="2.1"; sha256="18ryi0mxpm6rcfqj8dl4rvmkcpkch4yv001lwkbsipdm206704ys"; depends=[dplyr future_apply lme4 Matrix matrixcalc mvtnorm plyr reshape2]; }; qbld = derive2 { name="qbld"; version="1.0.3"; sha256="0zz2n8f4cn03k80wakfgjhablxhbr8hxj5ydl4m7zlya4kdkl5md"; depends=[knitr mcmcse Rcpp RcppArmadillo RcppDist rmarkdown stableGR]; }; qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; - qbr = derive2 { name="qbr"; version="1.2.0"; sha256="16nvf4qna4vbn2jcadl0klddgpgviqn8v0mv3mmc8namrvighxww"; depends=[dplyr httr jsonlite magrittr purrr stringr tibble tidyr]; }; + qbr = derive2 { name="qbr"; version="1.2.3"; sha256="0d6rhzi1kcd0q7vfnwdrvywyxavc97kmkbfza82srz3n91zjkjrb"; depends=[dplyr httr httr2 jsonlite magrittr purrr stringr tibble tidyr]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; + qcauchyreg = derive2 { name="qcauchyreg"; version="1.0"; sha256="1jry8xg6q4d9bxznrw8jxlbivnf5y944xdzv320fv4milk22g30x"; depends=[quantreg]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; qch = derive2 { name="qch"; version="1.0.0"; sha256="1kizr319kjr6xsgz7n0dhgp8rxr4j1x4bcr5cnifkp6z2zh92vka"; depends=[ks mclust]; }; @@ -15508,27 +15550,28 @@ in with self; { qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; qdap = derive2 { name="qdap"; version="2.4.6"; sha256="1dr48b0187w003v98qckzi4zxb6r0yi3jh8f6krknv4c4qasfn9n"; depends=[chron dplyr gender ggplot2 gridExtra igraph NLP openNLP openxlsx plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; - qdapRegex = derive2 { name="qdapRegex"; version="0.7.5"; sha256="1hdilycwrvi0q6cx7k8vg87bamm2xsafjkya5x4smxysm5k1r4qb"; depends=[stringi]; }; + qdapRegex = derive2 { name="qdapRegex"; version="0.7.8"; sha256="1pf1cz03i6sn83d1aaj4cv4jfavs6k81nn5sy7b0aw4i1hpkyiwz"; depends=[stringi]; }; qdapTools = derive2 { name="qdapTools"; version="1.3.7"; sha256="1cf42lxzqha2ah0yjl144pch50imfr5rf6g0b59xr5jf9x96dsjp"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; - qfa = derive2 { name="qfa"; version="2.0"; sha256="0cvqgirfndwwlwpsqamhz9jmq8nqhaak1z908bw567h7l0skxc60"; depends=[colorRamps doParallel fields foreach MASS mgcv nlme quantreg RhpcBLASctl]; }; + qfa = derive2 { name="qfa"; version="2.1"; sha256="1cawddpspdwrnc7ysp0v109j3k1lqpl9gyhp0jg5ribfiipyszww"; depends=[colorRamps doParallel fields foreach MASS mgcv nlme quantreg RhpcBLASctl]; }; qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; - qfratio = derive2 { name="qfratio"; version="1.0.1"; sha256="09cvayyryfll9zmwnlc9rcyc5p6hs4cmcv04hq9cs0pcx4n075j6"; depends=[MASS Rcpp RcppEigen]; }; + qfratio = derive2 { name="qfratio"; version="1.1.0"; sha256="1rdvdx6j1s2fq9frrghw1d2jhjr3m9nzzqhik293ix332wvwpy45"; depends=[MASS Rcpp RcppEigen]; }; qgam = derive2 { name="qgam"; version="1.3.4"; sha256="1jyamamdffaks89rspyhmg18b4iik0nb1j0vgqzvfnm890514cvn"; depends=[doParallel mgcv plyr shiny]; }; qgcomp = derive2 { name="qgcomp"; version="2.15.2"; sha256="0qllrh5zmmd63kwjn7j3f5z56zr27q7czf6shdzcrf6ajy99risp"; depends=[arm future future_apply generics ggplot2 gridExtra nnet pscl survival tibble]; }; qgcompint = derive2 { name="qgcompint"; version="0.7.0"; sha256="0v2b7rr6m5mx3wyclbryxlcdly1a2vj8z0ywsyq4vvj66g2aa0yk"; depends=[arm future future_apply ggplot2 gridExtra qgcomp survival]; }; - qgg = derive2 { name="qgg"; version="1.1.1"; sha256="11ijkr67d2b2avd0slw6cfsdhq3v10xyc36b01fj1s1whpm8vrvw"; depends=[data_table MASS MCMCpack Rcpp RcppArmadillo statmod]; }; + qgg = derive2 { name="qgg"; version="1.1.2"; sha256="0195fzcr0xy2dns4jl5kn3nigy989l47syn8iavfdpqb76zsh0a3"; depends=[coda corpcor data_table MASS MCMCpack Rcpp RcppArmadillo statmod]; }; + qgisprocess = derive2 { name="qgisprocess"; version="0.1.0"; sha256="075fanz6s4qfinx1yc503xl9viap639ricp9mdm314hq2d94lfjr"; depends=[assertthat glue jsonlite processx rappdirs rlang stringr tibble vctrs withr]; }; qgraph = derive2 { name="qgraph"; version="1.9.5"; sha256="1mi19bjx83zb42wmgb716a3l4gvwch3rmybdqmm8k3dl8xr2qnjc"; depends=[abind colorspace corpcor fdrtool ggplot2 glasso gtools Hmisc igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2]; }; qgshiny = derive2 { name="qgshiny"; version="0.1.0"; sha256="0ydhwg4abn8n9pwnjnwf1n1k854zw31z8f2splzdm5j279lsjg3r"; depends=[rmarkdown shiny]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.8"; sha256="1n8jvb9dfb2k60zi9z99sncpwqbbj0h8zngmqq2k795zpa79gf1d"; depends=[ggplot2 lattice latticeExtra scales]; }; - qicharts2 = derive2 { name="qicharts2"; version="0.7.2"; sha256="01vbghxz9zwhjg6fl6djwidhsf0yy0gx3fx5d8syis4wc8xzhmby"; depends=[ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.7.4"; sha256="147wzp1n55nrmrjzkzflrz1g2r4iif5nyncjlmcp9zk22qx1kl05"; depends=[ggplot2 scales]; }; qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.1"; sha256="0qbqx7g4np2ygyxiqmq5cww1az6ijjx6na6b1mp4ywmyxkjg3k29"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; }; - qlcal = derive2 { name="qlcal"; version="0.0.7"; sha256="1dl6bahdyimkw93fgqf7qz62dn1znp2ia972fdvj33sx0zgnwngy"; depends=[BH Rcpp]; }; + qlcal = derive2 { name="qlcal"; version="0.0.8"; sha256="04bs9kgcdm5s6i62gadb70mrw5x96yq31i6004fxspp41p7flb07"; depends=[BH Rcpp]; }; qlifetable = derive2 { name="qlifetable"; version="0.0.1-15"; sha256="0mqwlvkrd3sfnjx3vwc1pr6wzjwk7gz6mgmakxhh6gbh0v3swf0d"; depends=[]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; qmd = derive2 { name="qmd"; version="1.1.2"; sha256="15y1bivli3jy09l4j37zp327x1nchkg6qm8hs46srcxznh9zb99d"; depends=[cowplot dplyr ggplot2 qad Rcpp]; }; @@ -15542,31 +15585,31 @@ in with self; { qpmadr = derive2 { name="qpmadr"; version="1.1.0-0"; sha256="0krv3zhr42z2mkkbn2bkglzfxbf06dmd9vnnc3rcyhm1r85n4fbq"; depends=[checkmate Rcpp RcppEigen]; }; qqboxplot = derive2 { name="qqboxplot"; version="0.3.0"; sha256="1rsipw7cn2gqpqpa0ysj99ms5jpnbynjs4gkkmbr2w0c2466fhgx"; depends=[ggplot2]; }; qqconf = derive2 { name="qqconf"; version="1.3.2"; sha256="18wfvljd6gbf9am3hh14fgp06gpa04vw9nhl7q07li7rmlkxc1cl"; depends=[MASS Rcpp robustbase]; }; - qqman = derive2 { name="qqman"; version="0.1.8"; sha256="1a6qp5wv9bvwjchfw8x4jh48hkynlnfr21a8vqgnswldvwbq7njq"; depends=[calibrate]; }; + qqman = derive2 { name="qqman"; version="0.1.9"; sha256="04xwqp4bnblrn0qijqv9bjdyy7b0vlflf87jg15ifxfkf4br6siz"; depends=[calibrate]; }; qqplotr = derive2 { name="qqplotr"; version="0.0.6"; sha256="0kj1m7m04599d3b6227vja02zwq5d2vc0cyz2c7jvki4g3q2knxf"; depends=[dplyr ggplot2 MASS opdisDownsampling qqconf robustbase]; }; qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; qrLMM = derive2 { name="qrLMM"; version="2.2"; sha256="1y612kqnwqzrg5b7c4fc0al8zxycb6g6bgq747yvkm9kqyhbxszh"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="3.3"; sha256="085xjxgswzfra90s88h0mhpns9fpm9pjpi6y2zcv46a67zfvpn9v"; depends=[ald lqr mvtnorm progress psych quantreg]; }; qra = derive2 { name="qra"; version="0.2.7"; sha256="0wx0lz8a7qc1fdpvgyfhpbryy7wk7yi90ii2yirh57dvpyfq54m0"; depends=[ggplot2 knitr lattice latticeExtra lme4 rmarkdown]; }; - qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrcm = derive2 { name="qrcm"; version="3.0"; sha256="0y1na936vk5qsir5plzjrbv39jpnq01qplza32z31x6y28is2fz9"; depends=[pch survival]; }; qrcmNP = derive2 { name="qrcmNP"; version="0.2.0"; sha256="0hxg9w4k4k14fan6hb476wnnnpf4y6xywc2vbjka7cmpl1ydw1p4"; depends=[qrcm survival]; }; qrcode = derive2 { name="qrcode"; version="0.2.1"; sha256="1sxaqyp35k8cj5ilrrkifnf4icsm306arsfk2xq2vbx4qzxv96hq"; depends=[assertthat]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; - qreport = derive2 { name="qreport"; version="0.1.0"; sha256="1kkmv1029rgaxc65myr0yakdn56dwyrgs4qxsnml06ki3wbcvrxd"; depends=[data_table Formula ggplot2 Hmisc htmltools knitr rms viridis]; }; + qreport = derive2 { name="qreport"; version="1.0-0"; sha256="06ycxcs9kkx3m9f74bjvlj84jjp60wd0hjd40mgpir2559hqmqnb"; depends=[data_table Formula ggplot2 Hmisc htmltools knitr rms viridis]; }; qris = derive2 { name="qris"; version="1.0.0"; sha256="0rdfpxip37wxim9ini4vgjjpk5b9jqdlaygqkbid2jgjzzya98h0"; depends=[ggplot2 nleqslv quantreg Rcpp RcppArmadillo stringr survival]; }; qrjoint = derive2 { name="qrjoint"; version="2.0-9"; sha256="0dvz5adawy143r0ddgrblzac76igwmngnblr6vq57sxlvj1nsm7h"; depends=[coda kernlab Matrix quantreg]; }; + qrlabelr = derive2 { name="qrlabelr"; version="0.1.0"; sha256="128h5jg9hizagh9qa33nb4hjl0ypxpli65p3hwbs9qgxxgwymj17"; depends=[argonDash argonR assertthat bslib desplot dplyr ggplot2 purrr qrencoder raster reactable readxl shiny shinyBS shinycssloaders shinyjs shinyWidgets uuid]; }; qrmdata = derive2 { name="qrmdata"; version="2022-05-31-1"; sha256="1wp92qjmhy12l4l80kbq7rxc8vnwinfi5qbp74a5zkpwrbdrhi2h"; depends=[xts]; }; qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; qrmtools = derive2 { name="qrmtools"; version="0.0-16"; sha256="14396xnh4m1kkrhngpai3s4a94csqqbpi1nlqalq0l53iyvj8bcz"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-9"; sha256="1qkfaqj0bmfvray5cdv83ic967wf2lsvnr37z008vi7kwm2glpig"; depends=[]; }; qrnn = derive2 { name="qrnn"; version="2.1"; sha256="19lavs7r7xhwxgbaw6i6makfrbym7aiz8ar3vcb8ff1p2jdpqnag"; depends=[]; }; qs = derive2 { name="qs"; version="0.25.5"; sha256="0k0688fz95xwb4s9fjgnnif3kzbisxgfgbfad07gpzd0123ki1rz"; depends=[RApiSerialize Rcpp stringfish]; }; - qsimulatR = derive2 { name="qsimulatR"; version="1.1"; sha256="1h1pfr9cdramkr0ph7hmbvz585zwa964fd8z1hzc00pyr36ypf3k"; depends=[]; }; + qsimulatR = derive2 { name="qsimulatR"; version="1.1.1"; sha256="00022yyfwpv7f28isbnqy8001nm6xvxnfb2sbjckl8vbv0sjvs9n"; depends=[]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; qsplines = derive2 { name="qsplines"; version="1.0.1"; sha256="0zln3w2qx8ck9631hkq8ig5bc2l55wg5mdp3i0fm9amg8mhzq37i"; depends=[BH onion Rcpp shiny]; }; - qspray = derive2 { name="qspray"; version="2.1.0"; sha256="0j8n64i2hsyiw37r7hf47g4dlndhgjn8s0jfyc6w7bznyjwadz7w"; depends=[BH DescTools gmp purrr RationalMatrix Rcpp RcppArmadillo Ryacas]; }; + qspray = derive2 { name="qspray"; version="2.1.1"; sha256="164ls4a4cij7szbi6jwia2021cgrv4zjhmamslyhnfymdj2nz051"; depends=[BH DescTools gmp purrr RationalMatrix Rcpp RcppArmadillo Ryacas]; }; qst = derive2 { name="qst"; version="0.1.2"; sha256="0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a"; depends=[DBI dbplyr dplyr magrittr RSQLite tibble]; }; qsub = derive2 { name="qsub"; version="1.1.3"; sha256="0ygys183pj420jr9bz13x009qis3qr1aqxgw3l2d4xx3xv90iy3g"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qte = derive2 { name="qte"; version="1.3.1"; sha256="1hz3rwsi3w2b1xjigf5s3866djcxdkjz7jwcz0rin22v5h6sql80"; depends=[BMisc data_table formula_tools ggplot2 Hmisc pbapply quantreg texreg]; }; @@ -15593,11 +15636,11 @@ in with self; { quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; quadraticSD = derive2 { name="quadraticSD"; version="0.1.0"; sha256="07v71anh0kz898x6j677bxx5lyarc4r0z1j0vx501ffi38icc1f0"; depends=[ggplot2 shiny]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-10"; sha256="1vlpx0yf7b4vka4lrdqsfyjnajbcv25kdp8y27di3ww6h0759h9l"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; - qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; + quadtree = derive2 { name="quadtree"; version="0.1.14"; sha256="15i68ykbr0ld8cfcha1ywf4lmsf7zpgi7qsn2rpf44k92fp6hzc7"; depends=[Rcpp terra]; }; qualV = derive2 { name="qualV"; version="0.3-5"; sha256="09qqfx94f46x585iipr9wii8ji6ih31xymbw4p5v3qixmfpja276"; depends=[KernSmooth]; }; qualitycontrol = derive2 { name="qualitycontrol"; version="0.1.0"; sha256="134dksflv43bixqa5lhcjgwqnahzpb2fnzl4dhc81wdb9pcqsg7v"; depends=[dplyr janitor openxlsx readxl stringr]; }; qualmap = derive2 { name="qualmap"; version="0.2.1"; sha256="0r8v7r2mh1dsvr9lvdcmddp5agbx5djg7850zf6ixlv8zak6cxz5"; depends=[dplyr glue leaflet purrr rlang sf]; }; - qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; + qualpalr = derive2 { name="qualpalr"; version="0.4.4"; sha256="13mahl7v1sldy35ssmr9k0anhx569g1rv44kgvdw5w5s8dm28512"; depends=[assertthat randtoolbox Rcpp RcppArmadillo]; }; qualtRics = derive2 { name="qualtRics"; version="3.1.7"; sha256="0jfzghqj8qz5wz13j4v0h58l7mflmz7jm324j2agr109q2kl2vma"; depends=[cli dplyr glue httr jsonlite lifecycle lubridate purrr readr rlang sjlabelled stringr tibble tidyr]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; quantCurves = derive2 { name="quantCurves"; version="1.0.0"; sha256="0z00agd4q157cjkc4gwyfw3kka043wcf5j7yzn8cqm281fqh1jny"; depends=[KernSmooth locpol np quantreg quantregGrowth]; }; @@ -15612,9 +15655,9 @@ in with self; { quantilogram = derive2 { name="quantilogram"; version="2.2.1"; sha256="0gvr93d6jjixcrislym0mna2l3plqhl8adaqiagdvxg4y0adfmf0"; depends=[np quantreg SparseM]; }; quantities = derive2 { name="quantities"; version="0.2.1"; sha256="15z988jz1kza162qwfbiz90wjm3sc8kfkylwa73nkjifcd9l2ir5"; depends=[errors Rcpp units]; }; quantkriging = derive2 { name="quantkriging"; version="0.1.0"; sha256="0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf"; depends=[ggplot2 hetGP Matrix reshape2]; }; - quantmod = derive2 { name="quantmod"; version="0.4.24"; sha256="00qjsd7kk67xpm0i9d99xd4jplmid5cdq74abbvf3kk8jqyms8r8"; depends=[curl jsonlite TTR xts zoo]; }; + quantmod = derive2 { name="quantmod"; version="0.4.25"; sha256="0cjvz6hd4q0fd87d54wxfaka3awi9jzj8a7x72jawkdxbza9c61z"; depends=[curl jsonlite TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.96"; sha256="14pxwrlf5fy07wx4chz1dlf88ds6ghbmcf2p1vddh9nnrlw0dam2"; depends=[MASS Matrix MatrixModels SparseM survival]; }; + quantreg = derive2 { name="quantreg"; version="5.97"; sha256="18bdcxm2f8gc2bxdxrk80dcafl8d5snckp0913pkdsfyfrbxxrw7"; depends=[MASS Matrix MatrixModels SparseM survival]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="1.7-0"; sha256="0as226mcchbq41wrhl3vb8j4szqvcfk9zdsnf9fnyn50ymh4c5mb"; depends=[quantreg SparseM]; }; @@ -15623,7 +15666,7 @@ in with self; { quarks = derive2 { name="quarks"; version="1.1.3"; sha256="132ic5wr59sb89f352p7zspjx214575x45gla01dkcsimfrinjdg"; depends=[dygraphs ggplot2 progress rugarch shiny shinyjs smoots xts yfR]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; quartets = derive2 { name="quartets"; version="0.1.1"; sha256="0j5qgk3ha621l3njah54rnxf12ndafcai5bdvv96n888c3yki3nd"; depends=[]; }; - quarto = derive2 { name="quarto"; version="1.2"; sha256="186q07r2hwldhk6fvhamaqq21g5c74jp967rqan13l4diakgb739"; depends=[jsonlite later processx rmarkdown rsconnect rstudioapi yaml]; }; + quarto = derive2 { name="quarto"; version="1.3"; sha256="1hbj762hgjk7047nycj7rrngsf8f6g2s06r7jjg78ilrjb429c1w"; depends=[jsonlite later processx rmarkdown rsconnect rstudioapi yaml]; }; queryparser = derive2 { name="queryparser"; version="0.3.2"; sha256="0va2h1midvf8adymqwg79flpqq7ciznk285kmyqdskkn87argjd2"; depends=[]; }; queryup = derive2 { name="queryup"; version="1.0.5"; sha256="0rl31vs1m7qjbix1qgmvnxrvjf2k2ikd8p9frz1yia7xxaq1m286"; depends=[httr jsonlite]; }; quest = derive2 { name="quest"; version="0.1.0"; sha256="15al3j850v7i59zr9yybxjrb3lnpd14369rp5vnpzwxy80jpy7d9"; depends=[car plyr psych psychTools str2str]; }; @@ -15635,9 +15678,8 @@ in with self; { quickPlot = derive2 { name="quickPlot"; version="1.0.2"; sha256="0228mcv6cz74whzxmgcdb79w0k8mibszw4kwnjjs6pljz41rxcbq"; depends=[data_table fpCompare terra]; }; quickReg = derive2 { name="quickReg"; version="1.5.0"; sha256="1l1v3k8albxlaz18l2b2x2ryifq4pbdq6n4q7555hnfcik9rqmw5"; depends=[dplyr ggplot2 nortest psych rlang survival]; }; quickblock = derive2 { name="quickblock"; version="0.2.0"; sha256="0ij4ivpnkjzdixbq7pg4g1xkb031qawadr22qhzp0q210qhmhc0m"; depends=[distances scclust]; }; - quickcheck = derive2 { name="quickcheck"; version="0.1.2"; sha256="060pas64vzgqr038d1ab36h69z6rk6xaqf6kydwcs2phhir67zyc"; depends=[data_table hedgehog hms magrittr purrr testthat tibble]; }; - quickcode = derive2 { name="quickcode"; version="0.2"; sha256="0db2p0ls4cff26v9akl6nzq4d0w3a0v4f334i0fhz8vdf806z8l0"; depends=[rstudioapi]; }; - quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; }; + quickcheck = derive2 { name="quickcheck"; version="0.1.3"; sha256="0rm3pvhyqg1px8fp31cmbmv0zk9mvqhzl8qx9gm51kih2zfrksqy"; depends=[data_table hedgehog hms magrittr purrr testthat tibble]; }; + quickcode = derive2 { name="quickcode"; version="0.5"; sha256="0m4x315k431wjb4nv2z615nwcp4np1ad68kwrxfk6acpa6ynr5ah"; depends=[Polychrome rstudioapi]; }; quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; }; quickpsy = derive2 { name="quickpsy"; version="0.1.5.1"; sha256="0dfqlpghnw79idw3ir03cxx9n88sqs5p14jz7jgpkdwvjpw1y4q9"; depends=[DEoptim dplyr ggplot2 MPDiR]; }; quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; }; @@ -15651,34 +15693,37 @@ in with self; { quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qut = derive2 { name="qut"; version="2.2"; sha256="1jsp3sv1631ar1sad8fy4l60ar2pbi20g50yz9mhs83427n3l63b"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="1.0.3"; sha256="17sr4100ciy5jp0b8sxvqjxf4m176ayzd5yyaw40ri4xf6h0z7la"; depends=[]; }; + qwalkr = derive2 { name="qwalkr"; version="0.1.0"; sha256="0mxzx782lvdrm0hx0v6xgzvw3r9zlfp9bz1vss2l59fgdqlhavn4"; depends=[lifecycle]; }; qwraps2 = derive2 { name="qwraps2"; version="0.5.2"; sha256="1ars25aa50fn6m4v423pzs4rkplxhpi26qi3aq7f39bgmqpnpy83"; depends=[dplyr ggplot2 knitr Rcpp RcppArmadillo rlang xfun]; }; r_blip = derive2 { name="r.blip"; version="1.1"; sha256="1p33g6i6fq9c27d5ix9nd8prv90i4hrf91x34bldlw8041sjqxm0"; depends=[bnlearn foreign]; }; r_jive = derive2 { name="r.jive"; version="2.4"; sha256="12zjzjjy1dwhr1gxb5029p5l3wjhwaysja4zf6insdnx1fd0ybxd"; depends=[abind gplots]; }; - r_proxy = derive2 { name="r.proxy"; version="0.1.2"; sha256="0r3xivqnczmyrf2lnimarmzp0wjxr7dgnf8vaw8faniskydxg0fb"; depends=[curl httr jsonlite]; }; + r_proxy = derive2 { name="r.proxy"; version="0.1.3"; sha256="1v7x23lk5zzzilv6lpmajh2wa1ana330v2607rm816kir8k6ywa0"; depends=[curl httr jsonlite]; }; r02pro = derive2 { name="r02pro"; version="0.2"; sha256="1w8vq6ldhvvpcw6kq1nrfrr15ji5zc5p7nhqcr03ixw4qc20lx9w"; depends=[learnr]; }; + r2country = derive2 { name="r2country"; version="2.0.2.3.1"; sha256="02xz9an51qd3b92s8fask5rgmv227di21yv6xzgkz9ccabp12lq7"; depends=[quickcode]; }; r2d2 = derive2 { name="r2d2"; version="1.0.1"; sha256="1956p9xr9as8v4673d6fsdyas3racfzh6a5pafqz56r8ai1ssbyq"; depends=[KernSmooth MASS sp]; }; r2d3 = derive2 { name="r2d3"; version="0.2.6"; sha256="15mphywsr0603ipbgzac65n1nj7m77fmw3ypc33p9ng4fllg035r"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dictionary = derive2 { name="r2dictionary"; version="0.2"; sha256="09xsmgb1vpqafn9z4yh64qc3gwpd1rpiyj4vpagck8779rxdkqph"; depends=[rstudioapi stringr]; }; - r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.2.1"; sha256="0408r5vlq5kgd0b653sywi62rkfw1sg3m4via072c5bdr207bj8d"; depends=[dplyr glue lifecycle magrittr r2dii_data rlang tidyr tidyselect zoo]; }; - r2dii_data = derive2 { name="r2dii.data"; version="0.3.1"; sha256="00a1flpqak862yf0x98kap1jalz3485mwhps3ywi1i5b9g3g2x4q"; depends=[lifecycle]; }; - r2dii_match = derive2 { name="r2dii.match"; version="0.1.3"; sha256="19k6g7pa7jdsbpclkvppj3m08vji79jnijywzplwy01c84by5gf8"; depends=[data_table dplyr glue lifecycle magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; + r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.3.0"; sha256="11bhhwigybrcr8nbrdwbv6a9rk944la5apnn5y3ahvr457jqdjsv"; depends=[dplyr glue lifecycle magrittr r2dii_data rlang tidyr tidyselect zoo]; }; + r2dii_data = derive2 { name="r2dii.data"; version="0.4.0"; sha256="1jsrdrymdcb4hxi35dn6mpvhikbjzbgm9ycqdh3cfq75c22q600b"; depends=[lifecycle]; }; + r2dii_match = derive2 { name="r2dii.match"; version="0.1.4"; sha256="1nb0yik39wdcc22c0clszg9j3xk5sm5i9rzzcyj7zij55pcak7np"; depends=[data_table dplyr glue lifecycle magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; r2dii_plot = derive2 { name="r2dii.plot"; version="0.3.1"; sha256="090nb09dypsh13mridxiib32vm3fc49r1237rws5wzj4w3icyy6n"; depends=[dplyr forcats ggplot2 ggrepel glue lifecycle magrittr r2dii_data rlang scales stringr]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; r2mlm = derive2 { name="r2mlm"; version="0.3.5"; sha256="1zr30jzls7yypf221m4w6g507j9f9s2hwb68a7qpmwxngibbc6d6"; depends=[dplyr lme4 magrittr nlme rlang rockchalk stringr tidyselect]; }; r2pmml = derive2 { name="r2pmml"; version="0.27.1"; sha256="1liixrwrr23k96rkl3ijfcvxmfh43ffj8y7qr2zr50c1ampipnkr"; depends=[]; }; r2pptx = derive2 { name="r2pptx"; version="0.1.0"; sha256="12p3018b514kk1yxm1xyc0835j34zvpr1fz8k5rpiz30fbxjip58"; depends=[glue officer]; }; r2r = derive2 { name="r2r"; version="0.1.1"; sha256="0vp0ak88m3ssca8b8kxf9w6qkxsdy0qs6cngrr9gqvbrnx0gh9j6"; depends=[digest rlang]; }; - r2redux = derive2 { name="r2redux"; version="1.0.14"; sha256="16pjn77b8vjxcdr3mcc8sj6jlm0a3njrigfi8wp2finvl4x0ld2b"; depends=[]; }; - r2resize = derive2 { name="r2resize"; version="1.7"; sha256="1aq252ay9mxabx84kxx23jzvna2pqwkksv39g2jaiqfx4wrnbifg"; depends=[DT nextGenShinyApps shiny]; }; + r2redux = derive2 { name="r2redux"; version="1.0.16"; sha256="013g3zp7h53yfw0lasnp8c6dp3n9mrsapmwb071x2cnlb385sm6v"; depends=[]; }; + r2resize = derive2 { name="r2resize"; version="1.8"; sha256="0cc6bwk5gahik787z7xbcdr2mbrxvkywsrgc34s9mlxz8x4n1qym"; depends=[DT nextGenShinyApps shiny]; }; r2rtf = derive2 { name="r2rtf"; version="1.1.0"; sha256="0a9lx311qb4yrs68271di8dmy8dgjqd1mv4pibwavkb2x86jxsrp"; depends=[]; }; r2shortcode = derive2 { name="r2shortcode"; version="0.1"; sha256="03djy8m146k31xgvwcbrd1nzwj4wdlvvwzgviv80kskgr6ld9jrj"; depends=[magrittr stringr]; }; r2social = derive2 { name="r2social"; version="1.0"; sha256="1jmhq2qfh3wn47ysl8lairhj7zibiq0dw5nfx0ki1d3vi6f7bv5r"; depends=[htmltools shiny]; }; r2spss = derive2 { name="r2spss"; version="0.3.2"; sha256="1d0znbw0bmgl8k9xwz78lmidh8338n3vq4f9qyqmb87nvjmiilhl"; depends=[car ggplot2 scales]; }; r2sundials = derive2 { name="r2sundials"; version="6.5.0-3"; sha256="15l9a8lhyjrv3ch9c46zlhj6hkx0bnxvq3l1cjny98plwmz2ark6"; depends=[Rcpp RcppArmadillo rmumps]; }; r2symbols = derive2 { name="r2symbols"; version="1.4"; sha256="18q4jlc6agbpryv34bjjx49srq57m3731g13rcfdidk32kfgj7l7"; depends=[htmltools jsonlite]; }; - r3PG = derive2 { name="r3PG"; version="0.1.5"; sha256="1xd2ydz6j4qwq4xqrijsmnfxhni015q760w8dldmk00xxj7mr59z"; depends=[]; }; + r3PG = derive2 { name="r3PG"; version="0.1.6"; sha256="0sr5mxqd1pck4fcn3sh66qdn4kzyibzxmr422c77j7hlqcmqm27n"; depends=[]; }; r3dmol = derive2 { name="r3dmol"; version="0.1.2"; sha256="06wzszqcy50gks1bss81j1l2a4adi271pnz6310w57g681q1ng19"; depends=[bio3d htmlwidgets magrittr]; }; r3js = derive2 { name="r3js"; version="0.0.2"; sha256="1qkk6h2i15mg4ylq30znxyc0la3940263k1w6a17fy2vs26j6n3h"; depends=[ellipsis htmltools htmlwidgets jsonlite vctrs]; }; + r4ds_tutorials = derive2 { name="r4ds.tutorials"; version="0.1.4"; sha256="17j4wvbxg34l7y092x9qdk8vz06lqzqn8z1smvpk1jgkbvgd2v07"; depends=[tutorial_helpers]; }; r4googleads = derive2 { name="r4googleads"; version="0.1.1"; sha256="1v7nfr6fk9q5dchf3ig4169kv0vx1jrbbsgkdgfhhc2mz3cqck16"; depends=[curl jsonlite]; }; r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; }; r4ss = derive2 { name="r4ss"; version="1.44.0"; sha256="1khcp386kxz2rwzfvx0a3bf3ws69dh9vqhjsnwh29gy6g238050d"; depends=[coda corpcor dplyr forcats ggplot2 kableExtra lifecycle stringr]; }; @@ -15693,11 +15738,10 @@ in with self; { rAverage = derive2 { name="rAverage"; version="0.5-8"; sha256="09yap3qv02k5nidi6a4png9xa5yy7cb8hg8s2dq99wnc88s42d26"; depends=[]; }; rBDAT = derive2 { name="rBDAT"; version="0.10.0"; sha256="1vndnip3rpvlgmnmi91r23nyr59v6dmm8m5i2yxi7pim1l35323r"; depends=[]; }; rBMF = derive2 { name="rBMF"; version="1.1"; sha256="16yg1k7vv88q421nk1a70626c7c54bwnb3x7kiyxv2c0ha00f3g8"; depends=[Matrix Rcpp]; }; - rBahadur = derive2 { name="rBahadur"; version="0.9.2"; sha256="0bqr1v27sncxkf98smdw53h9nvf2p76av2bnirv7pdsrdm5yrnad"; depends=[]; }; + rBahadur = derive2 { name="rBahadur"; version="1.0.0"; sha256="1gqr70v5xklzncqrn72879yg10hjz059r4wsvq5hq9jf4gfaqsgz"; depends=[]; }; rBayesianOptimization = derive2 { name="rBayesianOptimization"; version="1.2.0"; sha256="0gwdzv4wl4n940ph23yhjh0s192k9visvivww5k1kmy2b1j88cva"; depends=[data_table foreach GPfit magrittr]; }; rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; }; rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.3.4"; sha256="1ivxxw7jf1s95abjwc794mqklkvlgvgyyb6ii99x6mnga6flh11n"; depends=[data_table future future_apply ggplot2 magrittr nls2 polynom]; }; - rCAT = derive2 { name="rCAT"; version="0.1.6"; sha256="09jyjjbhpm44wrism3zgg56m01yimlcm3xks8g0cq36lsrclcigp"; depends=[pracma rgdal sp]; }; rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1.1"; sha256="1y7n127lxswkgkz8wsxkvlps7f02i7495zlr4d4ixac57av6chs6"; depends=[]; }; rCNV = derive2 { name="rCNV"; version="1.2.0"; sha256="07c47qz5ma0g9nr0qdsmwhiw1fq3a7r40siavgkhd2in9rb5fzrw"; depends=[colorspace data_table qgraph R_utils stringr]; }; @@ -15708,7 +15752,7 @@ in with self; { rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDataPipeline = derive2 { name="rDataPipeline"; version="0.54.1"; sha256="0i0vb7gsjshh1wn0lksdma51xdyn6qw54j02cb0xmzcg896gl2p9"; depends=[assertthat cli configr dplyr git2r httr jsonlite openssl R6 rhdf5 semver usethis yaml]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; - rEDM = derive2 { name="rEDM"; version="1.14.3"; sha256="1cfimbixmijqfrw0sjh3f7hj12rzp2079ircchi5bnlbjpkgsrls"; depends=[Rcpp RcppThread]; }; + rEDM = derive2 { name="rEDM"; version="1.15.0"; sha256="1mbnawfqlinj5djkgr1hmaas0qjiiywxx15p4qlw7wxk36kjf4lf"; depends=[Rcpp RcppThread]; }; rEMM = derive2 { name="rEMM"; version="1.2.0"; sha256="1qicpxxbm8gc5nb2j2n8sa5i342dw8pjgmbw01963vsybhkwzsim"; depends=[cluster clusterGeneration igraph MASS proxy stream]; }; rENA = derive2 { name="rENA"; version="0.2.4"; sha256="0yfmdfw45azyzcy7rf5xsannrlranbxpgfsb52rl6vvd681p4r4x"; depends=[concatenate data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; rFSA = derive2 { name="rFSA"; version="0.9.6"; sha256="1fxd194iq8jnlsnj76mjq2f6db7ln641qwfsf5v63kx3qqhn8x5s"; depends=[hash rPref tibble tidyr]; }; @@ -15719,28 +15763,26 @@ in with self; { rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; }; rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; rJava = derive2 { name="rJava"; version="1.0-6"; sha256="1ijqhvnb8ab38cp9pwdf7zq7xqqlm6x94gkrab2dd98p6d4x1472"; depends=[]; }; - rKIN = derive2 { name="rKIN"; version="1.0.0"; sha256="07r6ihbvhbv3njzlsv8x1znkly5xr16kpbk4613vcza7pgisiqdd"; depends=[dplyr ggplot2 ks MASS randomcoloR RColorBrewer sf shades]; }; + rKIN = derive2 { name="rKIN"; version="1.0.2"; sha256="0dp8m7x5a9glz7yvbv207j3l0226xjxmgf0k2x6rv7zwg9v6y5qk"; depends=[dplyr ggplot2 ks MASS randomcoloR RColorBrewer sf shades]; }; rKOMICS = derive2 { name="rKOMICS"; version="1.3"; sha256="0v04f9kjdwxdggk3cv29hrnbykz3yq523gxh1kh7vls9xpm6c5wr"; depends=[ape circlize ComplexHeatmap dplyr factoextra FactoMineR ggplot2 ggpubr magrittr reshape2 stringr]; }; rKenyaForex = derive2 { name="rKenyaForex"; version="0.1.0"; sha256="1y5hdc1n8kan42vzg6kpfgz68s1bpd93pavcisxh03c76zkf9ap9"; depends=[]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; rLFT = derive2 { name="rLFT"; version="1.0.1"; sha256="0d86z5ckhkavgr2xi9pk7pw8ss3whrssa7na43kj0pirax9cys4z"; depends=[Rcpp sf]; }; rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4.1"; sha256="1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1"; depends=[plyr]; }; - rLiDAR = derive2 { name="rLiDAR"; version="0.1.5"; sha256="0sw79zr7hdwprlwijlg6qmn7pmpcnhxfr7ycdz09058c0kd815h8"; depends=[bitops deldir geometry plyr raster rgeos rgl sp spatstat_geom]; }; rMEA = derive2 { name="rMEA"; version="1.2.2"; sha256="18manb926yd6a3b6im7g2vf1cbvvdkg15i6zl223npckhna2nbx0"; depends=[]; }; - rMIDAS = derive2 { name="rMIDAS"; version="0.4.2"; sha256="0gkn0a091h5hffcmkbqa0qpxhkxxr9jz08dh1816bswfgn9i8ss6"; depends=[data_table mltools reticulate]; }; + rMIDAS = derive2 { name="rMIDAS"; version="1.0.0"; sha256="18z9fkbvyz290qcv0nmsrk8hchr5niwmhaj7gx3gh7m1ldw53asw"; depends=[data_table mltools rappdirs Rdpack reticulate]; }; rMOST = derive2 { name="rMOST"; version="1.0.0"; sha256="1g8g7hl937884l96cyz9wj486qgfm7lla47q8lmzn20fx1izjddr"; depends=[nloptr]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; - rMVP = derive2 { name="rMVP"; version="1.0.6"; sha256="0c3bmn7k5hgw8mgplyhwf6dkgvrxd29yj829wy5j9z1p88gq6wrk"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; - rMisbeta = derive2 { name="rMisbeta"; version="1.0"; sha256="1h4vilnndl0gnz9z0sgbywp4zy44718zpiqcqigbjbd4lymi0y61"; depends=[ROC]; }; + rMVP = derive2 { name="rMVP"; version="1.0.7"; sha256="0n4nffwxllcc81346h57yccqcc535skpnx9girlmskpzbaj14fmb"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; rMultiNet = derive2 { name="rMultiNet"; version="0.1"; sha256="0r4zdh91f87xzjr85i8iafghpi60hlmjp763nm025n4h33qvvrfl"; depends=[dbscan geigen glmnet Matrix plotly rTensor]; }; rNOMADS = derive2 { name="rNOMADS"; version="2.5.1"; sha256="0zv0b8v67g71c8c9212zsj4bwld173s930p3qxdp23ax3l7l3igi"; depends=[fields GEOmap httr MBA rvest stringr uuid XML]; }; rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.2.4"; sha256="1j2rafli0ns34ms5s8zjxwyvlxhl88r5krw0qqzc3igd9sc0mjvn"; depends=[gaston Matrix RcppParallel]; }; rNeighborQTL = derive2 { name="rNeighborQTL"; version="1.1.2"; sha256="1balbky8jyvyn2v56dvx7b80gpys40pfslqrsv25sywmp0cqy68p"; depends=[gaston Matrix qtl]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.2.2"; sha256="10i9lx8h67x3ldysjqgfi6dqbclj7pwfg15wxzr2vw3qzsjyb9cz"; depends=[bnlearn ggplot2 ggpubr rlang tidyr]; }; - rPAex = derive2 { name="rPAex"; version="1.0.3"; sha256="04fxiryv463dilaz4hcvv9a3jxib4zmai80pi27xv2ndch64qk54"; depends=[agricolae raster]; }; - rPBK = derive2 { name="rPBK"; version="0.2.1"; sha256="0xxb8cphhiazq97aqv5qkaxf4a29s4abnbqmmffip7wy8jlws9r2"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + rPAex = derive2 { name="rPAex"; version="1.0.4"; sha256="08r3j1m4dcmxdzsxjalbvi7nvca91ma0v06vy2pki6pp8f91pbdg"; depends=[agricolae terra]; }; + rPBK = derive2 { name="rPBK"; version="0.2.2"; sha256="1g63gz7zhwx5icabcm15n2hpnp3v932b63k0jgl8623dwdybw15d"; depends=[BH ggplot2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; rPackedBar = derive2 { name="rPackedBar"; version="0.2.2"; sha256="1nh0kvj4bqkinczj8llcgy63ibsnk9vgsvm0vqg8g526x0vffdma"; depends=[data_table plotly scales shiny]; }; rPanglaoDB = derive2 { name="rPanglaoDB"; version="0.2.1"; sha256="1ykzih3idgp2yhbw4039hhhzv0nmrmn3wx2c4dxmgp5qzhrg42nf"; depends=[Matrix pbapply Seurat XML xml2]; }; rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; @@ -15756,13 +15798,14 @@ in with self; { rSPDE = derive2 { name="rSPDE"; version="2.3.2"; sha256="1f0q2qykhdawbdldp1kvjqlxyrnq4zxa6vmizdy1l6jk1xcawgds"; depends=[Matrix]; }; rSRD = derive2 { name="rSRD"; version="0.1.7"; sha256="1srvv49xxkq2nx7fvbn3d2hr4v6ypkxgz6ms1l89zgd0ypdgmypa"; depends=[dplyr ggplot2 ggrepel gplots janitor Rcpp rlang stringr tibble]; }; rSpectral = derive2 { name="rSpectral"; version="1.0.0.10"; sha256="12fgyjlk4a6gm2ccjw4mh47ccln2i7iklqammmk8y20i3hd3mh6x"; depends=[graph igraph Rcpp RcppArmadillo Rdpack]; }; - rStrava = derive2 { name="rStrava"; version="1.2.0"; sha256="069k20pjxrgm8gri2cslcvf69mflalfgf7q58a52b1043vflj136"; depends=[dplyr geosphere ggplot2 ggrepel googleway httr magrittr plyr purrr RCurl rvest tibble tidyr V8 XML xml2]; }; + rStrava = derive2 { name="rStrava"; version="1.3.0"; sha256="0k2nz17s4rlb86gmr0c4r56abw4j7dqshjk599kqy28jqmf2nkyy"; depends=[dplyr geosphere ggplot2 ggspatial googleway httr magrittr plyr prettymapr purrr RCurl rvest tibble tidyr XML xml2]; }; rTCRBCRr = derive2 { name="rTCRBCRr"; version="0.1.1"; sha256="0k4blxbnyzgfgcvn59zw8fnw6avhgbmbgkk6a1ycpz1jijy1sn2z"; depends=[magrittr readr tidyr tidyselect]; }; rTG = derive2 { name="rTG"; version="1.0.1"; sha256="1wsas7wvyzbiw31iv0qazjmnxj7al84y5kpvglf1f0dd444y4hc0"; depends=[brnn dplyr ggplot2 knitr magrittr mgcv]; }; rTLsDeep = derive2 { name="rTLsDeep"; version="0.0.5"; sha256="1hkhshpcfdrv7df8lawsgmbrfkmbasd1jc4dddz6yzc21fkg136p"; depends=[caret ggplot2 keras lidR matrixStats reticulate rgl sf tensorflow]; }; + rTPC = derive2 { name="rTPC"; version="1.0.4"; sha256="17ycj1cf7azlxi3mn8lpwji194c3awbhky7l03v4yj1wim0r0mss"; depends=[]; }; rTRIPLEXCWFlux = derive2 { name="rTRIPLEXCWFlux"; version="0.2.0"; sha256="0gliwrbwynxm0ldnvpqs8yl6k63y54kr4ggx21zsvjbqbxs2q4v3"; depends=[]; }; rTRNG = derive2 { name="rTRNG"; version="4.23.1-2"; sha256="0rba3dxy97r75mxfn8rxrk2081my79la2m5m9h5ms2z5px07llqd"; depends=[Rcpp RcppParallel]; }; - rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; + rTableICC = derive2 { name="rTableICC"; version="1.0.9"; sha256="110jcrry258mw6dskv1p3pz5h9161y2dk3m8xl92ycvjfnxxzcbx"; depends=[aster partitions]; }; rTensor = derive2 { name="rTensor"; version="1.4.8"; sha256="1ks4rwaish24sg5gc2jkfdqfq6h8gh9f3wdxk3dxjgpwjqwijz8f"; depends=[]; }; rTensor2 = derive2 { name="rTensor2"; version="0.1.0"; sha256="1var67hgqhkncj7r0lrixmhybs59ivzwnm8i7wivnqhs53sgbbyg"; depends=[gsignal Matrix matrixcalc rTensor wavethresh]; }; rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; }; @@ -15772,7 +15815,7 @@ in with self; { rWind = derive2 { name="rWind"; version="1.1.7"; sha256="1dvzkhi9hbxd9wvggcbkfx7hxaxjssbmfnqsc7qakj8pkbvr7nax"; depends=[gdistance lubridate Matrix raster]; }; rWishart = derive2 { name="rWishart"; version="0.1.2"; sha256="0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="07l7xn0csy95hvviyn6p0h2ybh36cqrm5lz60dphwsq3ahf7sw68"; depends=[plyr RCurl reshape2 RJSONIO]; }; - ra4bayesmeta = derive2 { name="ra4bayesmeta"; version="1.0-7"; sha256="07fcjqw8w787pcfzjxxwq6160433ms6xk9qrvvm8ybxd7n0f5i44"; depends=[bayesmeta]; }; + ra4bayesmeta = derive2 { name="ra4bayesmeta"; version="1.0-8"; sha256="1v55ci595x4rhrfswh53m8556sc4lj49b1339yja8ww4rsrx872a"; depends=[bayesmeta]; }; rabhit = derive2 { name="rabhit"; version="0.2.5"; sha256="0c513sbldd85snww412k3c5rhmzd5k89s2wq4d713qsvzsh4v1xl"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly plyr RColorBrewer readr reshape2 rlang splitstackshape stringi tidyr tigger]; }; rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; }; racademyocean = derive2 { name="racademyocean"; version="0.3.2"; sha256="0p16xwlm67rvbla6mnky6yv5aa2r61v645jlwhg0zn2dyc8xpajk"; depends=[cli dplyr httr2 pbapply purrr rappdirs retry rlang stringr tidyr withr]; }; @@ -15782,19 +15825,19 @@ in with self; { radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.5"; sha256="1lmgh8j3c6jiiwpdz9l5zd07xcv87laxnj789bpqnmxa0szsfngl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="1.5.0"; sha256="1kzbslf6bqi9h7znfp0hj1i7ljagb38sfri016m1xsywmc1s7cl5"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; - radiant_basics = derive2 { name="radiant.basics"; version="1.5.0"; sha256="0b6fj447hcj2q2qr24lwz9xy5n9dkxrfzzcmhlvz4197xxnfhbam"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data rlang scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="1.5.6"; sha256="1dd18brwgcpkqbnxg6jqk4r7aw1i2d7lg9mnfw59q95n6jk86lr5"; depends=[base64enc broom bslib car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly png psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; - radiant_design = derive2 { name="radiant.design"; version="1.6.0"; sha256="0f0mx9y8qbzsa6gh06syd2s0a0bbqlgj8y092629azcisqphnid1"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; - radiant_model = derive2 { name="radiant.model"; version="1.5.0"; sha256="1sawrlazjmgzsd9j2l6va6f62khxfmxi9kdkjjy8xbp87s8ka6wj"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringi stringr tidyr vip xgboost yaml]; }; - radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.5.0"; sha256="158a7ihs4mlkl4vc0lbgi6xcx8w4l57d1d9qj576c4s8718bjy84"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; }; + radiant = derive2 { name="radiant"; version="1.6.0"; sha256="1nn17yq530mb0ayx25dv5dn9fr1qvbll7ih1hnyww7gix6rgji9p"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant_basics = derive2 { name="radiant.basics"; version="1.6.0"; sha256="1dr53n39a7g4dar6zxmdkrzqqksc124s8whj6idy97jg9vj3qjsf"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data rlang scales shiny tidyr]; }; + radiant_data = derive2 { name="radiant.data"; version="1.6.2"; sha256="0227ry366v9kmksa4vyjmhix0jbl894gdc6gckg209wna35fn20p"; depends=[arrow base64enc broom bslib car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly png psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; + radiant_design = derive2 { name="radiant.design"; version="1.6.1"; sha256="0rv9cpw80rhc47fza44z6a9jkij07ajpivr2ky0y2hixzf5c8h5a"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; + radiant_model = derive2 { name="radiant.model"; version="1.6.3"; sha256="182w8wj3zh2ynhxscy9d4wrfc3n3yj89569w7102l1rxyrssi755"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich scales shiny stringi stringr tidyr tidyselect vip xgboost yaml]; }; + radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.6.1"; sha256="0xqn7j8r2v5j8ajkj8ghdrnkhfi10m2351kr926b3qg4898ywfwn"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radlibs = derive2 { name="radlibs"; version="0.2.0"; sha256="1xl7pacqgiv68ay7mkr6bkx3rqqr7z8b9yh42n4zm7ybqfxbx6dr"; depends=[data_table lexicon stringr]; }; radous = derive2 { name="radous"; version="0.1.3"; sha256="1pip3givlkzb8i65nz6w724818jjr8j8nizpc3g35r9bvpmn7c2y"; depends=[checkmate curl glue httr readr]; }; radsafer = derive2 { name="radsafer"; version="2.3.0"; sha256="0zw0dn8pi1yn786fcmm414dap77wdni43dma2pyjbxb15zagpmli"; depends=[dplyr ggplot2 ggthemes lifecycle magrittr RadData readr rlang scatterplot3d stringr]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - ragg = derive2 { name="ragg"; version="1.2.5"; sha256="1yd89p4f2b7r2n1kl6lybbgd04kqvlf14zgmp7pxw770w1slsvwk"; depends=[systemfonts textshaping]; }; - rags2ridges = derive2 { name="rags2ridges"; version="2.2.6"; sha256="1bidnjykiqiz83x98gk2y3sxsskk9fiap6grr7fb7a7h9mjhq0lw"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; + ragg = derive2 { name="ragg"; version="1.2.6"; sha256="1izpw02b8kq6pm37kvxp9pbd9srvfp5bzfjg27j9hbmm794xq50h"; depends=[systemfonts textshaping]; }; + rags2ridges = derive2 { name="rags2ridges"; version="2.2.7"; sha256="09dp04y8wl7cws5y94k9j2rlrmm2ci1lk8y77cb17lxr0i1yv6gb"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.4"; sha256="17i3z0p3a4dqa0bch5l1r830w5nlxhdg71y82jipp6cfiwli588z"; depends=[abind Biobase CGHbase expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="1.1.1"; sha256="0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50"; depends=[futile_logger limSolve]; }; rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; }; @@ -15829,16 +15872,16 @@ in with self; { randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.6"; sha256="1qr7c0pkqn2a9knpbc2ch6chwwrvfw1sr5949mkgml36xyv1syv7"; depends=[cluster doParallel foreach ggplot2 iterators MASS pROC Rcpp]; }; randomcoloR = derive2 { name="randomcoloR"; version="1.1.0.1"; sha256="0rqh1zrdza12qq7475f77yvryhh4hj0pg25lb8ywrcljgaj53bnb"; depends=[cluster colorspace Rtsne scales stringr V8]; }; randomizationInference = derive2 { name="randomizationInference"; version="1.0.4"; sha256="0viji0qblnc423abhccn02gl30jbwa866vl7az9fdp95psaij1kp"; depends=[matrixStats permute]; }; - randomizeBE = derive2 { name="randomizeBE"; version="0.3-5"; sha256="08yfdrf56i8php48ycilc79jk7ms0f6k40swg56mccnqm2yb3b12"; depends=[]; }; - randomizeR = derive2 { name="randomizeR"; version="3.0.1"; sha256="06irrp0g5g3xxc6jzrzlr2sjizf8rp0wgv4x32ldlnh0kyrg0na6"; depends=[coin cubature dplyr ggplot2 magrittr mstate mvtnorm plotrix pracma purrr PwrGSD rlang survival]; }; + randomizeBE = derive2 { name="randomizeBE"; version="0.3-6"; sha256="1pid2cgil2mjkssznd7wb08v69ipnv6k4gary19iba854sx8lzw2"; depends=[]; }; + randomizeR = derive2 { name="randomizeR"; version="3.0.2"; sha256="00w4h8xamf6wix67g921j0xqma5y6zmzd23vr8k2qa48an9bnkfm"; depends=[coin dplyr ggplot2 gsDesign insight magrittr mstate mvtnorm plotrix purrr PwrGSD reshape2 rlang survival]; }; randomizr = derive2 { name="randomizr"; version="1.0.0"; sha256="0r7yawh4dnxawinnlz09f57kgdwa08rpwxq3y35jam3x2q48qijn"; depends=[]; }; randquotes = derive2 { name="randquotes"; version="0.1.1"; sha256="0fj9vx0c4059511wka7ip30yz87y144pz7ny840gp72qm73pp8li"; depends=[curl httr jsonlite xml2]; }; randtests = derive2 { name="randtests"; version="1.0.1"; sha256="1r1b76g9qlss75qqyh05wic4k08xixgx6lgs7gc49an71h0mi5a7"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="2.0.4"; sha256="0jwylffr8zajgd1x24nrv4xxlkic10i8cfd9sy0pkz2g7sai9nll"; depends=[rngWELL]; }; - rang = derive2 { name="rang"; version="0.2.1"; sha256="1aws5hvzm67qj3h1ng3v5m0l1v9v7kbwczgjd900ag8x2vffs69f"; depends=[fastmap httr jsonlite memoise parsedate pkgsearch remotes renv vctrs]; }; + rang = derive2 { name="rang"; version="0.3.0"; sha256="1g5crf9k8pkyvbxxz2wb7pwa91fpk579jaq3d46kafr98xxvrnyb"; depends=[fastmap here httr jsonlite memoise parsedate pkgsearch remotes renv vctrs]; }; rangeBuilder = derive2 { name="rangeBuilder"; version="2.1"; sha256="1r82rmmfwbfl2lxcsnl9xwyr2932jv43cjlvlihi5172irpfgvpw"; depends=[alphahull pbapply Rcpp rnaturalearth sf stringi terra units]; }; rangeMapper = derive2 { name="rangeMapper"; version="2.0.3"; sha256="1wasvd3k2c6crl2q27d9q88x21pv66b6h9x3msfdcw0k0h719dzc"; depends=[data_table DBI exactextractr future future_apply glue magrittr progressr raster RSQLite sf]; }; - rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.4"; sha256="102z7ysbw0i1mbnwg0v3h0i094ksw91q84a53qyxndq4m6f557aj"; depends=[dplyr jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; + rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.5"; sha256="0yv4w8vy7yjmkg8gkmgy05khmvw2h7v8ag5hzfm8km120m8215i8"; depends=[BIEN shiny spocc terra]; }; ranger = derive2 { name="ranger"; version="0.15.1"; sha256="0bibv9xf6w8k8nsc13f2yd4kx99aq0i758h3wfh089szgkpdjrad"; depends=[Matrix Rcpp RcppEigen]; }; rankFD = derive2 { name="rankFD"; version="0.1.1"; sha256="0p8kkscjnfssz58gp2kvpvw206vhqi6m1rknzs35l5ajck3gqzrm"; depends=[coin lattice MASS multcomp mvtnorm]; }; rankICC = derive2 { name="rankICC"; version="1.0.1"; sha256="0rr9vncd6168nijxg8i8xcwsx94vc687ayksqbq6lp4vnz4kflmw"; depends=[]; }; @@ -15847,9 +15890,9 @@ in with self; { rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rankinPlot = derive2 { name="rankinPlot"; version="1.1.0"; sha256="1kf8xwzx2mjgv3ad1yj70gm0mrsyghwkmjk98pwcj3a82qk94skr"; depends=[ggplot2 scales]; }; - rankinma = derive2 { name="rankinma"; version="0.1.8"; sha256="15bzjjjrr78l5s6hfmz9lv3nqm7kyfawnq8iq07qci9n6rsavrby"; depends=[mvtnorm netmeta]; }; - rankrate = derive2 { name="rankrate"; version="1.0.0"; sha256="0i4sf9hhyxry07bc31c1ww7hqig1r2vgkds34q5csq7g3mic3shf"; depends=[gtools lpSolve nloptr]; }; - ranktreeEnsemble = derive2 { name="ranktreeEnsemble"; version="0.21"; sha256="1hzzsrzwsrpxdq5dss291myz6irrfgmhkw2idxng5g9p26dykwzq"; depends=[data_tree gbm randomForestSRC Rcpp]; }; + rankinma = derive2 { name="rankinma"; version="0.1.9"; sha256="04vgvnrmd78vi88iznq6pgznfb3wi5qm7y32h9dyci7mmcb2wfwl"; depends=[mvtnorm netmeta]; }; + rankrate = derive2 { name="rankrate"; version="1.2.0"; sha256="14262gwyr9n9vwj0njb9piw0algmfr2y6sswarsafvmficagbfhm"; depends=[gtools isotone]; }; + ranktreeEnsemble = derive2 { name="ranktreeEnsemble"; version="0.22"; sha256="1hn66622p3jbm1s0pf438lmws27pwab1qv1zwnsph8zg9qprb2nm"; depends=[data_tree gbm randomForestSRC Rcpp]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.3"; sha256="1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"; depends=[httr jsonlite yaml]; }; rapidjsonr = derive2 { name="rapidjsonr"; version="1.2.0"; sha256="07zdirhbzmvq3cp4xn8ngk1lgxbbabzays315zxbs3sxrz6lzjb2"; depends=[]; }; rapidoc = derive2 { name="rapidoc"; version="8.4.3"; sha256="1i7f122iigbaah1c3g5vfmnypwilcgc1i3d0l3985s5fjj44dnhn"; depends=[jsonlite]; }; @@ -15862,28 +15905,31 @@ in with self; { rappsflyer = derive2 { name="rappsflyer"; version="0.2.0"; sha256="1n0h4iqnzb5xr531b6nvqsjx4mpsg1gp85av2b9gqg0wrbzzizm7"; depends=[dplyr httr lgr retry stringr tidyr]; }; rapsimng = derive2 { name="rapsimng"; version="0.3.0"; sha256="1zykznmb6qipkj8yxkf33vrvyqhsp0ajk34hnz7js1zvy5n8rd5l"; depends=[dplyr jsonlite magrittr rlang tibble tidyr]; }; raptr = derive2 { name="raptr"; version="1.0.0"; sha256="07p1z8qi991aqy4nx142b4kblx15j1bc22yx1hf3s3cnbcrdfnzl"; depends=[adehabitatHR assertthat BH boot ggplot2 hypervolume ks Matrix mvtnorm PBSmapping RColorBrewer Rcpp RcppEigen scales sf shape sp terra withr]; }; + raqs = derive2 { name="raqs"; version="1.0.1"; sha256="1fa5rdqk6ffjyifijw742l1wmywr3wgrdm3aimvazn9i7bfj4z8m"; depends=[cli httr2]; }; rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.2"; sha256="0nx4ddbbz01dmbkg3ww2dsqwvqn1m04bln0bk1sphq935c548zpb"; depends=[vegan]; }; + rarestR = derive2 { name="rarestR"; version="0.1.0"; sha256="1f604bghyp3zkd60yp0vrjmyjf548rmika67bn3zf1b0c53rfq8z"; depends=[]; }; rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; - rasciidoc = derive2 { name="rasciidoc"; version="4.1.0"; sha256="1lza10pi62rhx0q8jx11hyl5jybm1gy2a0rgw6q0amfgaqdczir6"; depends=[checkmate fritools gert highr knitr reticulate]; }; + rasciidoc = derive2 { name="rasciidoc"; version="4.1.1"; sha256="09s4km4v603mzc6i1n27c10na6swdzlvclbsar267zk3410acsww"; depends=[checkmate fritools gert highr knitr reticulate]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rassta = derive2 { name="rassta"; version="1.0.5"; sha256="0yia0pwg29fd6hq0f96hdf6k70pj296805a4lgxn4qqwn3gw7006"; depends=[cluster data_table dplyr DT foreach GGally ggplot2 histogram KernSmooth kohonen plotly rlang scales shiny stringdist stringi terra]; }; - raster = derive2 { name="raster"; version="3.6-23"; sha256="0ng18sfw9kmhi48j8b5bzgh2ylvf5wi2zidn66k4vqaxl5s6hidz"; depends=[Rcpp sp terra]; }; + raster = derive2 { name="raster"; version="3.6-26"; sha256="14jmpm6rlhya192ckyjlwhais6fgc16gb600wycsdba6b8i7fmy6"; depends=[Rcpp sp terra]; }; rasterDT = derive2 { name="rasterDT"; version="0.3.2"; sha256="1fj038qa6ivm2w2zzxjcl2dh90ydw1sypchz18sn33zg37wzc7mz"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.2"; sha256="0az96k8l7yjya5mg5ckda43qy9h8iad5gyyxi1ycld3kzcwiinhj"; depends=[raster]; }; + rasterList = derive2 { name="rasterList"; version="0.5.20"; sha256="09w91kjya5bmdi1z6i5m82yaihnzxqh9b3cyadfzd1c68bpsplii"; depends=[raster]; }; rasterVis = derive2 { name="rasterVis"; version="0.51.5"; sha256="18bsrw629p4pkyhrpjmiyhq73w882bhgpwmkih0gjnw3ywwgx7rs"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp terra viridisLite zoo]; }; rasterbc = derive2 { name="rasterbc"; version="1.0.1"; sha256="17knrhvy2qkdz5bvhnllfkv8w4cm5gjjninwh66pk1xfrqkd4skg"; depends=[sf terra]; }; rasterdiv = derive2 { name="rasterdiv"; version="0.3.1"; sha256="01fxi3i1p280n38aaffnnj68w2ri8s5qrapvc44viqv3133n837l"; depends=[foreach progress proxy raster svMisc terra]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; - rasterpic = derive2 { name="rasterpic"; version="0.2.2"; sha256="1yccwv52hmkypcc3ym0nlda4imb2smizn113zfsdrq9f7inrlkhf"; depends=[png sf terra]; }; + rasterpic = derive2 { name="rasterpic"; version="0.2.3"; sha256="05ziry3vxk4blsykvqj73kgfdbvdpi771xfz2xv2873bxkna12xf"; depends=[png sf terra]; }; ratdat = derive2 { name="ratdat"; version="1.0.0"; sha256="1d4ivllasg1yd3i95rsxl3hkyij5r9a3j83scv3ghx6bx7w79aj4"; depends=[]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; ratematrix = derive2 { name="ratematrix"; version="1.2.4"; sha256="0azn52d88m1xxckv4g02vraa9gdr5jmsxqwxwaim90p2s8jy33np"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; - rater = derive2 { name="rater"; version="1.3.0"; sha256="1alkrf9x0hszj83kk3apb2azrmq0bgxg9nn1hjhwz98blyda2b0q"; depends=[BH ggplot2 loo Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; + rater = derive2 { name="rater"; version="1.3.1"; sha256="0ipgjhxn8d9g6yv369hckvq84v8rrw5b230zz24h72dy9s2nyr44"; depends=[BH ggplot2 loo Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.1"; sha256="1vajhgawlwf99rb1w1im1njngbb5n37y7lah1l5vv9j5i3pha1y7"; depends=[]; }; - raters = derive2 { name="raters"; version="2.0.2"; sha256="0an1n6yvziv8y4imprydzs57nar7nkjxsh2xy17g2sa98nng9s40"; depends=[]; }; + raters = derive2 { name="raters"; version="2.0.3"; sha256="0nqk45jv9r3m47kid1irxf1nf9p95pvdp1i87xss1jhyqfx2zxzl"; depends=[]; }; ratesci = derive2 { name="ratesci"; version="0.4-0"; sha256="1imraj95vcwz3i6r767zwckjqs1vp7bfww9d792l5nvwi5zyddp4"; depends=[]; }; rationalfun = derive2 { name="rationalfun"; version="0.1-1"; sha256="0xabnqgzl8qdc4x9547mmkr1rm78p3fysdvk6jhjdi8cp2p6kcjh"; depends=[polynom]; }; ratios = derive2 { name="ratios"; version="1.2.0"; sha256="16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg"; depends=[data_table stringr]; }; @@ -15905,24 +15951,24 @@ in with self; { rb3 = derive2 { name="rb3"; version="0.0.10"; sha256="1gf4i5fbpx238af5f5bzcfmb763mlyk97aq8335slyc8828b9a9c"; depends=[ascii base64enc bizdays cli digest dplyr httr jsonlite proto purrr readr readxl rlang rvest stringr tidyr XML yaml]; }; rbacon = derive2 { name="rbacon"; version="3.1.1"; sha256="03c1d6p43h585kklwsp8x4w4vj1lrdm65i69p5gqb6cv35kvphjp"; depends=[coda data_table Rcpp rintcal]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; - rbcb = derive2 { name="rbcb"; version="0.1.10"; sha256="0qqrb5kvin1ansy3dswdfib2952dlbl7x1zlig3j2mfqcgwn9450"; depends=[httr jsonlite tibble xml2 xts]; }; + rbcb = derive2 { name="rbcb"; version="0.1.13"; sha256="1a2afcghpf7qy79azrisxi6rq4b2lw6sbl1g65sn256zk68w0gr3"; depends=[digest httr jsonlite purrr tibble xml2 xts]; }; rbcc = derive2 { name="rbcc"; version="0.1.0"; sha256="0mfwkbgcnahrk19n14icf26rxf93nqm1r0kr2gi02gmpqrycl0br"; depends=[ggplot2 PearsonDS pracma qcc reshape2]; }; rbch = derive2 { name="rbch"; version="0.1-1"; sha256="0n2s5qfgjvg7vv65myz6dcmmaf37z883z1sw4hryngz2z6w4zz5q"; depends=[gmp httr openssl rjson]; }; - rbedrock = derive2 { name="rbedrock"; version="0.3.0"; sha256="14hlb48bfh96fsgmsimwh09n7qighzs90wvzypwckp6vycbgl5ag"; depends=[bit64 digest dplyr fs magrittr purrr R6 rappdirs readr rlang stringr tibble tidyr vctrs]; }; + rbedrock = derive2 { name="rbedrock"; version="0.3.1"; sha256="019w0rkq0ys7r1dqx9v6izypqrxk5mymfjpz6hny7bp653c3nhwx"; depends=[bit64 digest dplyr fs magrittr purrr R6 rappdirs readr rlang stringr tibble tidyr vctrs]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; rbenvo = derive2 { name="rbenvo"; version="1.0.5"; sha256="0clg2cxyi60yz2mdp95v0hd5gqhk8h2xgmx68852jcpbjf76xasa"; depends=[dplyr forcats ggplot2 lme4 lubridate magrittr Matrix purrr rlang sf stringr tidyr]; }; rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; - rbi = derive2 { name="rbi"; version="0.10.4"; sha256="0p0cvdzhb81drk5b9fb9jcnw5c02i7qfy7vwyyhk2b1vm9rkw681"; depends=[data_table ncdf4 processx reshape2]; }; - rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.3"; sha256="0jlzfnw3r138inap6dnq0a7cbirs5q18ypxgcb3zfqq5zxkdx276"; depends=[data_table lubridate Matrix rbi reshape2]; }; - rbibutils = derive2 { name="rbibutils"; version="2.2.14"; sha256="0qmw098vnll30b1j6iwf57bi0654352cdlwmvaad9g30sdkxlyvs"; depends=[]; }; + rbi = derive2 { name="rbi"; version="1.0.0"; sha256="19gmxwblj1lvdspxiwmyxcl6mp7b1xpabwgy69n9vndfzkwq2bmc"; depends=[data_table ncdf4 processx reshape2]; }; + rbi_helpers = derive2 { name="rbi.helpers"; version="0.4.0"; sha256="1qj5b9wwh40ni549l9xiarp7w5x9q5n22k413azjhnssm7799hbv"; depends=[data_table lubridate Matrix rbi reshape2]; }; + rbibutils = derive2 { name="rbibutils"; version="2.2.15"; sha256="1kjk953xqakbxb2z8rcfcni8b9vi1m27n0ksdddil6x7q03flxb5"; depends=[]; }; rbin = derive2 { name="rbin"; version="0.2.0"; sha256="18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87"; depends=[data_table ggplot2]; }; - rbioacc = derive2 { name="rbioacc"; version="1.1-0"; sha256="0lmkfr0s90hi06llsa0v4jbcx0jd1dx3qq9h6kb67ws0q6h9y028"; depends=[BH GGally ggmcmc ggplot2 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr zoo]; }; - rbioapi = derive2 { name="rbioapi"; version="0.7.9"; sha256="05fi705pn2lfzdn8s7465c9239fffnbllbk6b3mi7vam9ivw3ixr"; depends=[httr jsonlite]; }; + rbioacc = derive2 { name="rbioacc"; version="1.2-0"; sha256="0a2kbkmj0bv1b4bgqrc4kcvffh7a5bhbqpa8xd9r2ws3kzhgr2lh"; depends=[BH GGally ggmcmc ggplot2 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr zoo]; }; + rbioapi = derive2 { name="rbioapi"; version="0.8.0"; sha256="0dxd58y0a5pd5zw3agd405xb6325z629n7lg9ps7hqc66jy59pba"; depends=[httr jsonlite]; }; rbiom = derive2 { name="rbiom"; version="1.0.3"; sha256="13nma1s3p4bzh8mvikrnmkqyyrx9axvxavq6fyk2w0j804w1qzcg"; depends=[magrittr openxlsx plyr R_utils Rcpp RcppParallel rjson rlang slam]; }; rbiouml = derive2 { name="rbiouml"; version="1.11"; sha256="1g1q6xc8x8y71ji75c5fl35sxxss964xmhcqlriybb5zc38m1dh0"; depends=[RCurl RJSONIO]; }; rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; }; rblt = derive2 { name="rblt"; version="0.2.4.6"; sha256="066clmmlmczafzfgh6hbiz9grlfr613bfbr0j79kfdh8b0ga1v1s"; depends=[data_table dygraphs hdf5r shiny xts]; }; - rbmi = derive2 { name="rbmi"; version="1.2.3"; sha256="1l8jnp24a01s0acv529bmxdbxzalh1i9i8h35ikkagvrhbwss8sb"; depends=[assertthat BH Matrix mmrm pkgload R6 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + rbmi = derive2 { name="rbmi"; version="1.2.5"; sha256="17r54595yjqbm5800rmq467pp2b26h2az3hq409iq6ka6an9f1mg"; depends=[assertthat BH Matrix mmrm pkgload R6 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; rbmn = derive2 { name="rbmn"; version="0.9-6"; sha256="0z043fxvh8zzggi70dyqvybd55mcsnv15miiayhb8440vldiy8w6"; depends=[MASS]; }; rbokeh = derive2 { name="rbokeh"; version="0.5.2"; sha256="1h2fpzqf17pw9d09r1g1iyxsj5qma4fsk8vnar7f1z4fjyypvi6q"; depends=[digest gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; }; rbooster = derive2 { name="rbooster"; version="1.1.0"; sha256="0v524hjp3im94hbf6kbmi4xhqnak135mmpmq1sni1c97dqal2hqy"; depends=[earth Hmisc rpart]; }; @@ -15934,8 +15980,7 @@ in with self; { rbw = derive2 { name="rbw"; version="0.3.2"; sha256="12kldcx858gigd9sfki73rgg61smk7qcb43lx7z2r5y9dr0mwaa7"; depends=[dplyr rlang]; }; rcDEA = derive2 { name="rcDEA"; version="1.0"; sha256="012l9l61p3mw38fk3y3rcfjjjj9ds5kb1v2cwfvad2il5w6s9smv"; depends=[Benchmarking np]; }; rcaiman = derive2 { name="rcaiman"; version="1.1.2"; sha256="0qjbkfp571qv2i4z50vk48wrc9k0gayil88a3z85aa9k033y6kk8"; depends=[colorspace filenamer lidR magrittr pracma Rdpack spatial terra testthat]; }; - rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.5.0"; sha256="1d41fi2arsj8v5ccijqzyz55safcjirax9068rsjvr01zpxq6ag8"; depends=[doSNOW foreach iterators knitr sf snow spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_model]; }; + rcarbon = derive2 { name="rcarbon"; version="1.5.1"; sha256="0wgf0jia5iwa7v1aln80521rj1q7rhx3l9rpf3df3za73kn4z7gm"; depends=[doSNOW foreach iterators knitr sf snow spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_model]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.1.1"; sha256="0lqipmrcvgjlh7ya4r3vf7qiypc2pwgqcxzmg4xmb5h5p5l37cq0"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.8"; sha256="1kxy3nv9f3qk5azp8d6khd7skk9m4704mdimgzabrndrlb5ihyw8"; depends=[MASS plyr rlemon]; }; rcbayes = derive2 { name="rcbayes"; version="0.2.0"; sha256="1qwbpx9snqgaz7gshvyhq9ylsf59grjhx56f7cnq25h2f76km9cc"; depends=[BH dplyr magrittr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools shiny shinythemes StanHeaders tibble tidybayes]; }; @@ -15952,14 +15997,15 @@ in with self; { rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rciplot = derive2 { name="rciplot"; version="0.1.1"; sha256="0pz5lvrm9ifhypq490cnqawr87wlh4m0812612s079b9ljsw6dr0"; depends=[dplyr ggplot2 tibble]; }; rcites = derive2 { name="rcites"; version="1.3.0"; sha256="192cdkd4pybpsdab8dzchx96385bdjsm30p8qrlw9wzmij03rx2x"; depends=[cli curl httr jsonlite]; }; - rclipboard = derive2 { name="rclipboard"; version="0.1.6"; sha256="0sb28shhfkpflik78h31736li80gjfzim62911iy3vk9b0szd0vy"; depends=[shiny]; }; + rclipboard = derive2 { name="rclipboard"; version="0.2.0"; sha256="1sm3x134brhi0qxa1bp20z4k0dlpa044qg8zsbgjr00w8yc3rr47"; depends=[bslib shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.4.0"; sha256="1l696byn3kjq2xvz4wxybzaj6ink85h4lz3a35v2132ba5yyzm5v"; depends=[callr cli curl desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; rco = derive2 { name="rco"; version="1.0.2"; sha256="1ch7ak802ri4jr10jqvhvdi6q9fhyhql15ja395xfv6j81d5cmia"; depends=[]; }; + rcoder = derive2 { name="rcoder"; version="0.3.0"; sha256="09l1gvcf453j058rls4y2r342y3p4ywvf1g0qzq4kwavxxcl5rn2"; depends=[dplyr glue rlang]; }; rcolors = derive2 { name="rcolors"; version="0.1.0"; sha256="19lkwd1wdwq9if957qjgrz9mq6s8x49dig8snivhw9ksffcfy4xp"; depends=[magrittr]; }; - rcompanion = derive2 { name="rcompanion"; version="2.4.30"; sha256="0ncg7by6zkpn3p5wkdhsb5h406m4hq5bbgpbixjvsch8vy0srn73"; depends=[boot coin DescTools lmtest multcompView nortest plyr]; }; + rcompanion = derive2 { name="rcompanion"; version="2.4.34"; sha256="0idv0gy1b2qfa0ayzf53mnv0mmk2nq7ykc5n8g7f2zrmfpwb9hcb"; depends=[boot coin DescTools lmtest multcompView nortest plyr]; }; rcompendium = derive2 { name="rcompendium"; version="1.1"; sha256="1fjdm26x01qla660mprs2pi8slbhvmw9m2smhprg66lxvs44g71l"; depends=[clisymbols crayon devtools gert gh gtools renv rmarkdown rstudioapi stringr usethis xfun]; }; rconfig = derive2 { name="rconfig"; version="0.3.0"; sha256="1qxm9l0yd4xir6wr31r1v87g7flbpgggy7lh9lbvg307k8li1j2h"; depends=[jsonlite yaml]; }; - rcontroll = derive2 { name="rcontroll"; version="0.1.0"; sha256="0zjkjvyqq76lyg61y0cd71v6yzyavqwv8zqw3fpky7jwv7szmnii"; depends=[doParallel doSNOW dplyr foreach gganimate ggplot2 iterators lidR lubridate magrittr Rcpp RcppGSL readr reshape2 sys terra tibble tidyr viridis vroom]; }; + rcontroll = derive2 { name="rcontroll"; version="0.1.1"; sha256="14xh5hhb96qk0f3kvvvjbkyswcq17g6y70v5prazldq7i4bzpv8q"; depends=[doParallel doSNOW dplyr foreach gganimate ggplot2 iterators lidR lubridate magrittr Rcpp RcppGSL readr reshape2 sys terra tibble tidyr viridis vroom]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.5.0"; sha256="0a7h3gblc69g1mkalb3yss9x609701zwd3hh4pr2v96fdmsxdpkc"; depends=[forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster sp terra]; }; rcrossref = derive2 { name="rcrossref"; version="1.2.0"; sha256="0hqvhqmfmbhvxv555x3vjwz7rh4r2cw6wj8p3wq4hcf107r555c0"; depends=[crul dplyr DT jsonlite miniUI plyr R6 shiny stringr tibble xml2]; }; @@ -15979,9 +16025,9 @@ in with self; { rddtools = derive2 { name="rddtools"; version="1.6.0"; sha256="12lxdpazfhwn5kkzs91qhs0xcky30dj01yp0v5708ahr1ywqdxmd"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd rdrobust rmarkdown sandwich]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; rdecision = derive2 { name="rdecision"; version="1.1.3"; sha256="134d3990zzym6jng33nfi6kp9b7pwyppn76vn3ms4lhpjw7dbcl3"; depends=[R6 rlang]; }; - rdflib = derive2 { name="rdflib"; version="0.2.6"; sha256="1gx31cxhdfg9hlfjyb178m4qw9ikgdfg6h09mwyyggkhrngnw6gq"; depends=[dplyr jsonld readr redland stringi tidyr]; }; + rdflib = derive2 { name="rdflib"; version="0.2.7"; sha256="10nnb3hqf1dbqxr9zn4d4jmwz4zkklw3vxfhc1vnn7ffhlm84d3f"; depends=[dplyr readr redland stringi tidyr]; }; rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; }; - rdhs = derive2 { name="rdhs"; version="0.7.6"; sha256="1ikh2hq5jb9fifpp496y88xzgqy7k0axg1c70a03wm48nr93xc0y"; depends=[brio digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; + rdhs = derive2 { name="rdhs"; version="0.8.0"; sha256="0zp5h7m7rd4d622rv4xqk4q4ycgzwlw7cwjsl4rvimqfvr69m8zv"; depends=[brio cli digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rlang sf storr xml2]; }; rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; }; rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; rdist = derive2 { name="rdist"; version="0.0.5"; sha256="1jb6dgp1f3307h96v20pjxpkxfz08ij98w0yj5cdx1g2kwfl0h0w"; depends=[Rcpp RcppArmadillo]; }; @@ -15993,17 +16039,18 @@ in with self; { rdomains = derive2 { name="rdomains"; version="0.2.1"; sha256="1gpgryfdv4dhv98nfnr15lqq9ndwi8q17rwm5z7j2klgi5d644ld"; depends=[aws_alexa curl devtools glmnet httr jsonlite Matrix R_utils urltools virustotal XML xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpower = derive2 { name="rdpower"; version="2.2"; sha256="0v598jqka5skffbzb4knfmm5hfbg6gmwjgbclv774wrxxn62sj4z"; depends=[rdrobust]; }; + rdracor = derive2 { name="rdracor"; version="0.7.6"; sha256="1zjd5w2kmpqbnm4j4w72r8bdy3hnvbvvckv3azdjsarbhnpqyfvw"; depends=[data_table httr igraph jsonlite purrr Rdpack stringr tibble tidyr xml2]; }; rdrobust = derive2 { name="rdrobust"; version="2.1.1"; sha256="18345w89w3phkfp4s59k10iha2ywgnrgdm61f8a9ixvhd3vv2qr0"; depends=[ggplot2 MASS]; }; rdrop2 = derive2 { name="rdrop2"; version="0.8.2.1"; sha256="02rhcq1vn349ddjkqamxb0wjb3z3m4wzkvin1mprcz4fzrjxgbdr"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="1.0.0"; sha256="00f1qwsbwg5jggm5b83nhk1lxyw272rv2kg77bcwqvlf3074c3mz"; depends=[crul curl hoardr jsonlite mime tibble zip]; }; rdss = derive2 { name="rdss"; version="1.0.4"; sha256="05sm8ha7rb0wxl0wmvjsckr0gyar8jyah2vpy8s9rqrjkayzcdd5"; depends=[broom dataverse dplyr estimatr generics ggplot2 prediction purrr randomizr readr rlang tibble tidyr]; }; rdtLite = derive2 { name="rdtLite"; version="1.4"; sha256="0m2fxwz0h4rriw62g2hp20iw6ddbq5l8n80z9xgxk49n6pfm1ywj"; depends=[curl digest gtools jsonlite knitr provViz rlang rmarkdown sessioninfo stringi XML]; }; rdwd = derive2 { name="rdwd"; version="1.8.0"; sha256="0lb9r2wcdyix3im460wvv2q7yni3yixl7z8py4nbzp7ah0dc7g1z"; depends=[berryFunctions pbapply]; }; - rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; }; + rdwplus = derive2 { name="rdwplus"; version="1.0.0"; sha256="0bcdpza4rbvfzn69zws5s2l32rs7m39a5h3zxyz4gszff3yn37fx"; depends=[rgrass sf stars stringr]; }; re2 = derive2 { name="re2"; version="0.1.2"; sha256="13cxq6zw66b0wqwv19kkgn8z9kx1p9x1z1fv9cgn1iq7v1br8gm4"; depends=[Rcpp]; }; - reReg = derive2 { name="reReg"; version="1.4.5"; sha256="00mqj2klbkibrqv1fqyv3m583rg711c7xasdpbn7345846851aq8"; depends=[BB dfoptim directlabels ggplot2 MASS nleqslv optimx Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; }; + reReg = derive2 { name="reReg"; version="1.4.6"; sha256="1p1rbj88bc5qz909w2q6mnzkscz2djdm8w3lcfj1pzka6699jz8z"; depends=[BB dfoptim directlabels ggplot2 MASS nleqslv optimx Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; }; reactCheckbox = derive2 { name="reactCheckbox"; version="1.0.0"; sha256="1ph4kzq6i91d0aaf6jfd0klnlwipadnii648sky85dybpa78wy6a"; depends=[htmltools reactR]; }; - reactR = derive2 { name="reactR"; version="0.4.4"; sha256="15c0ij3xglsdavkpzgnkbyl5yb39jrn6zhlrdjiwp1m9cnrqzf2w"; depends=[htmltools]; }; + reactR = derive2 { name="reactR"; version="0.5.0"; sha256="14pi2wc25qa9q0hp8jby07798l53phyj1zifj46fg2pjq8vkz7p7"; depends=[htmltools]; }; reactable = derive2 { name="reactable"; version="0.4.4"; sha256="1wkamzyyl3k3772n5g4rjklkkhdb07jiax064r9alnnq5nzfdaml"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; reactablefmtr = derive2 { name="reactablefmtr"; version="2.0.0"; sha256="1r864j8ma1sas2fglw5hdkhf3lxrkri7mf2k5j8cpq7398kgzp94"; depends=[dplyr htmltools htmlwidgets magrittr purrr reactable sass shiny stringr tippy webshot]; }; reactlog = derive2 { name="reactlog"; version="1.1.1"; sha256="1njihrnq1x162nc2wk16kj1l0vpvk8xcdgjvj36arw4z8nv8wpah"; depends=[jsonlite]; }; @@ -16015,9 +16062,9 @@ in with self; { readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; }; readJDX = derive2 { name="readJDX"; version="0.6.1"; sha256="19aw7jafgg6d6q5xmsphpkyakad6m1x1062h3nxkmfma9xcy4ns4"; depends=[stringr]; }; readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; }; - readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.2"; sha256="1kq1v9y013n12ic3dwxxnvncq635w71d6wkpcvcz6dw45bjkc68k"; depends=[base64enc digest XML]; }; + readMzXmlData = derive2 { name="readMzXmlData"; version="2.8.3"; sha256="1mh6rgy8s0rkvycv99p3zgw831pgzi5cacsj4awb7h4dl11sf8sf"; depends=[base64enc digest XML]; }; readNSx = derive2 { name="readNSx"; version="0.0.2"; sha256="1zi9s9v9q7scfgx4c0kq9f4shvfcxvl4499d853x9hyn3aby1x04"; depends=[cpp11 data_table fastmap hdf5r jsonlite R6]; }; - readODS = derive2 { name="readODS"; version="1.8.0"; sha256="1jdgp9vnm3sg4n34fl9ll7pkpac2lw7dg85mjkjwm1c63dfgrm0i"; depends=[cellranger purrr readr stringi xml2]; }; + readODS = derive2 { name="readODS"; version="2.1.0"; sha256="1znp039wfbq8bbjj9pdkl8hwnhm9x5n8c7y5b53xmpnaqxx5agiz"; depends=[cellranger cpp11 readr stringi tibble vctrs zip]; }; readOffice = derive2 { name="readOffice"; version="0.2.2"; sha256="0dg7fwxdl41nrjqnxvh9rpz0la99iid0wy51gncjwrh3s85fj2ks"; depends=[magrittr purrr rvest xml2]; }; readSX = derive2 { name="readSX"; version="0.8.4"; sha256="0g8nwm1vk8spiffnb93a63vq14q6xm2b9wy708qfkriijrn8n52i"; depends=[cli readxl rlang]; }; readabs = derive2 { name="readabs"; version="0.4.14"; sha256="1m6n8w2hi2r0rrnmy9cnb5a0c37wlq23j6w49lx1zspsfqk6iqiv"; depends=[dplyr fst glue httr hutils labelled purrr readxl rlang rvest stringi tidyr xml2]; }; @@ -16030,9 +16077,9 @@ in with self; { readmoRe = derive2 { name="readmoRe"; version="0.2-12"; sha256="18zxhnh8nzh3l5j94mrqf9l94bxvc82nzhl8sx5k9h08gj4f1zfw"; depends=[plyr R_utils readxl xml2]; }; readobj = derive2 { name="readobj"; version="0.4.1"; sha256="0ga0kk6n98zy8w9wc2fahn15bgsv73n4ncqgqb5ldyr4vjqxr2sr"; depends=[Rcpp]; }; readr = derive2 { name="readr"; version="2.1.4"; sha256="03gbzf29kdvf4rdqgdq2jm7c9ifjla3qzpiyqzw1x9jgijj4y54q"; depends=[cli clipr cpp11 crayon hms lifecycle R6 rlang tibble tzdb vroom]; }; - readrba = derive2 { name="readrba"; version="0.1.4"; sha256="1vwsnh0r4ahx2dr3z9hmmjirhnh2wwqqqj20ii8mjsky8xnw8sqy"; depends=[dplyr httr lubridate purrr readxl rlang rvest stringr tidyr xml2]; }; + readrba = derive2 { name="readrba"; version="0.1.5"; sha256="0nb185mmbcc796l9xy5v9p1y9hssd00wypxsm3s2212mczcbpail"; depends=[dplyr httr lubridate purrr readxl rlang rvest stringr tidyr xml2]; }; readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; }; - readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; + readsdmx = derive2 { name="readsdmx"; version="0.3.1"; sha256="0rqi9kfhis2il0jw08rsbpk9ca0hm3i7vh9l3d0rvx5acck7z4z2"; depends=[Rcpp]; }; readsdr = derive2 { name="readsdr"; version="0.2.0"; sha256="0s16m1cam69c83k6cdpysdfyqzh0ihyjdwdzv3hqxa9054iv5ifx"; depends=[deSolve dplyr magrittr purrr rlang stringi stringr xml2]; }; readsparse = derive2 { name="readsparse"; version="0.1.5-3"; sha256="1xqagkpapi1pqv30baa2dcglrywr69vajfp4y29smbmk26b1sas6"; depends=[Matrix Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.10.1"; sha256="18yr7nsz80dsxxsdgyi68k7506digjawk6khnzpvk5y80yz7hyqi"; depends=[Rcpp]; }; @@ -16042,11 +16089,12 @@ in with self; { readxl = derive2 { name="readxl"; version="1.4.3"; sha256="0j2rkb012h0kvcm8n3817lgfir52dvmkwaxn7mij71gbxz6vpzky"; depends=[cellranger cpp11 progress tibble]; }; readxlsb = derive2 { name="readxlsb"; version="0.1.61"; sha256="1l7lklfk6ifjq6v4m0ha5k1fxak62zac2yn698r03x41k29382f7"; depends=[cellranger Rcpp xml2]; }; readysignal = derive2 { name="readysignal"; version="0.0.9"; sha256="0fhm3xdxilmvs3r6vlbzydfq5xk0vxdkmpw49haknlwpvb18r403"; depends=[httr jsonlite progress rvest]; }; + realTimeloads = derive2 { name="realTimeloads"; version="1.0.0"; sha256="0ragbi8sczhs8hsbgxl4gmb8lwbmhnxiz88almpml2slsmx7nrrq"; depends=[data_table imputeTS mice signal TideHarmonics]; }; realtest = derive2 { name="realtest"; version="0.2.3"; sha256="1k2chcxpqrl4b4xfc80b8kvkn0nw8dfbl6n1965zjzszf7qaizkp"; depends=[]; }; - reappraised = derive2 { name="reappraised"; version="0.1.0"; sha256="0lfxirshmf2y8plb3cqqaynz7gai9vwd7qp96kcs219p027yw82n"; depends=[boot broom data_table dplyr epitools flextable ggplot2 ggpubr magrittr officer purrr readxl rlang tidyr vcd vcdExtra]; }; + reappraised = derive2 { name="reappraised"; version="0.1.1"; sha256="1f8qmxzn4vyn68dfc6c31jrjnymy6r7r4fg9qddx9cv01asfscws"; depends=[boot broom data_table dplyr epitools flextable ggplot2 ggpubr magrittr officer purrr readxl rlang tidyr vcd vcdExtra]; }; rearrr = derive2 { name="rearrr"; version="0.3.3"; sha256="1fmmfji3r5q95ssvjmc9hxhxvh808cib5571mi4l57bp4z703wy1"; depends=[checkmate dplyr lifecycle plyr purrr R6 rlang tibble]; }; reasonabletools = derive2 { name="reasonabletools"; version="0.1"; sha256="08i7wy4jic5v9ka7j716lj6p9r55sv46sqrxsy7ad6sgjvrzn0ss"; depends=[]; }; - rebib = derive2 { name="rebib"; version="0.2.2"; sha256="0ajk25yya6b3lf5ixjkr95jby576lm5v4wvpjgdgq314q9dp6fvw"; depends=[logger stringr xfun]; }; + rebib = derive2 { name="rebib"; version="0.3.2"; sha256="15ydvw4nbdw885y99a4g4zc6xvzaxjl8q3rriwrg7fbilib8i8pz"; depends=[cli logger stringr whisker xfun]; }; rebird = derive2 { name="rebird"; version="1.3.0"; sha256="1lsmrkp5zfwr9jr26bzw2mk2z4261ylz7qclb0a4j0ma8vrd6f5j"; depends=[assertthat dplyr httr jsonlite]; }; rebmix = derive2 { name="rebmix"; version="2.15.0"; sha256="1ikpfsdjwlck9nmx781k0783r94f3ngxixrv1q3w9r7rgk769mx4"; depends=[]; }; rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; @@ -16055,22 +16103,20 @@ in with self; { rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; }; rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; recapr = derive2 { name="recapr"; version="0.4.4"; sha256="1grp8aczn3qjm8ihn2466v5yay60vwyf1x7jsmihgxlvgwki6dh7"; depends=[MASS]; }; - receptiviti = derive2 { name="receptiviti"; version="0.1.4"; sha256="14d5jpfv16pjf9qjimqpxmy7ai8zav8kliq2n57k4p7mk083qmly"; depends=[arrow curl digest dplyr future_apply jsonlite progressr]; }; + receptiviti = derive2 { name="receptiviti"; version="0.1.5"; sha256="0j4ypma8kp37q3kjnh9pxlw24mb8vmj0pis56a9gk6slzqivbbfi"; depends=[arrow curl digest dplyr future_apply jsonlite progressr]; }; recexcavAAR = derive2 { name="recexcavAAR"; version="0.3.0"; sha256="0b91jbgqzkgzvk658ckk639yyz1daa0xql3qgl0kzgqg68d53x20"; depends=[kriging Rcpp]; }; rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; }; - recipes = derive2 { name="recipes"; version="1.0.6"; sha256="13zwnavg5gbdplxwnd5ppjw1zqj6khdfaj1kzfwswsnxgh99fphh"; depends=[cli clock dplyr ellipsis generics glue gower hardhat ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate vctrs withr]; }; - reclin = derive2 { name="reclin"; version="0.1.2"; sha256="0bskmlysc12g5invscr0vvshy8bp1gxjx4wihwbbfzmnk2951qrc"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; + recipes = derive2 { name="recipes"; version="1.0.8"; sha256="03d0g36svzc64fa2w2kcylsw654px0xjqqrb0znra4bfncj0ilnk"; depends=[cli clock dplyr ellipsis generics glue gower hardhat ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate vctrs withr]; }; reclin2 = derive2 { name="reclin2"; version="0.3.4"; sha256="1amwglzn2hpc8xzkpsavc98jd7yq6j02b2d5mynidpy3h3rikgzy"; depends=[data_table lpSolve Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.9"; sha256="1nz5w4v5hhb3qjwxixc526gqsmr1imw582l9gj2acwar4z9mixjp"; depends=[ape cluster phangorn phytools picante plotrix vegan]; }; - recmap = derive2 { name="recmap"; version="1.0.15"; sha256="1973lx65ifyrsxip4qyhba2is45riknaja1x84ybj2l9a9y12d4l"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="1.0.17"; sha256="1q59fw72g6nkc9gzx06mnhwavplxybc0srjb10h5h8l1wwf1s67i"; depends=[GA Rcpp sp]; }; recodeflow = derive2 { name="recodeflow"; version="0.1.0"; sha256="0qi5y1rbdw6dcvkl8gw9fh7rcb0f6ckig8464sgxslgf7cdk2gcz"; depends=[dplyr haven magrittr sjlabelled stringr tidyr XML]; }; - recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recogito = derive2 { name="recogito"; version="0.2.1"; sha256="0hirzw446r192gdvscgqmm7n3bh2fy0qkf9pqnqm2vziv1cqf1bq"; depends=[htmltools htmlwidgets jsonlite]; }; recolorize = derive2 { name="recolorize"; version="0.1.0"; sha256="1biiyqqvnm3310gc9q0apwqfmvmh6cnj9pc77l44js4x3576w3aq"; depends=[abind colorRamps imager mgcv pavo plot3D plotfunctions png raster]; }; recom = derive2 { name="recom"; version="1.0"; sha256="13g8wq4qaa850r7q09cr9x0brxki98h86cq83573jcv4lh3r97yq"; depends=[Rcpp]; }; recombinator = derive2 { name="recombinator"; version="1.0.1"; sha256="1dbsqig2jjp3zypcqxf9c2brb09pv6xikmh6fhz5vgxy5wkyivks"; depends=[crayon]; }; recometrics = derive2 { name="recometrics"; version="0.1.6-3"; sha256="1i7842k6qw9zbcslfwgdfd7358jh63aybi4mifq6knc8qm577nqk"; depends=[float Matrix MatrixExtra Rcpp RhpcBLASctl]; }; - recommenderlab = derive2 { name="recommenderlab"; version="1.0.4"; sha256="02bsb6r2r4p0gadgi8nijih4rr2v7pb0s4jfscgld3341nllz69q"; depends=[arules irlba Matrix matrixStats proxy recosystem registry]; }; + recommenderlab = derive2 { name="recommenderlab"; version="1.0.6"; sha256="1dxpdgmv3hfwix1w8lzc0ijcd8myslsqnznr5pbwsrh7wypwqk1h"; depends=[arules irlba Matrix matrixStats proxy recosystem registry]; }; recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.2-0"; sha256="0292msnm818q7a67z7dgd6x06lb5cqhbzvgxrbk9ifd7l9csw3vy"; depends=[recommenderlab]; }; recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.2-0"; sha256="1c3zknvz4ffy7zgcf9jk7sjbiq79hg3pm072qzda1ksir14nbh4p"; depends=[recommenderlab]; }; reconstructKM = derive2 { name="reconstructKM"; version="0.3.0"; sha256="0fxdmvkm68g114nx2r2r8gy2lwqc5wkfcls7fpdfdfg0aazqqxwq"; depends=[dplyr magrittr rlang survival survminer]; }; @@ -16079,40 +16125,41 @@ in with self; { recosystem = derive2 { name="recosystem"; version="0.5.1"; sha256="01d8r1pwvd606cbs9bq2rq3ahq7jnfgak9p58ch4fs4ki5nxf1sj"; depends=[float Rcpp RcppProgress]; }; recurrentpseudo = derive2 { name="recurrentpseudo"; version="1.0.0"; sha256="1vnljzn933k4wcc751r6s67dfjz1mrwvcb37yziv6qn8zimn8xrz"; depends=[dplyr geepack magrittr prodlim stringr survival]; }; recurse = derive2 { name="recurse"; version="1.1.2"; sha256="0bdm2nd8cq64dwz9b2hnbjv6c3fwpy7gnmbfi6p49nf285p8y632"; depends=[Rcpp]; }; - red = derive2 { name="red"; version="1.5.0"; sha256="0hsmzw3cc3kkiaqhbn0p2fm6biqq0ka9rmv6gcv74nxjzlvl6vvp"; depends=[BAT dismo gdistance geosphere jsonlite maptools raster rgdal rgeos sp]; }; + red = derive2 { name="red"; version="1.6.1"; sha256="1xij1wshb5bv5zd9svhgprdjpn3snxb7wjqjdrqkbgs8y49cixx6"; depends=[BAT dismo gdistance geosphere jsonlite predicts sp terra]; }; redR = derive2 { name="redR"; version="1.0.1"; sha256="0bd1jzjip6p449m9ysi4kybxqljh2wj8z9mrgyk1cy08bjivd1cd"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.5.4"; sha256="1lrfbcvxgbbpi7l3vls3rdj8y3w30gg5f1fjcfscmykvp0i01j3d"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; - redcapAPI = derive2 { name="redcapAPI"; version="2.7.4"; sha256="0lafklj9px2sffh19ycccz62w0f04107p89xyzhxc8lyp057648f"; depends=[checkmate chron getPass httr keyring labelVector lubridate yaml]; }; + redbookperu = derive2 { name="redbookperu"; version="0.0.2"; sha256="0pf6ihk5k4milzz9j2y5wsxj7ishadlx1zvffhkw600c3i7ssi5b"; depends=[]; }; + redcapAPI = derive2 { name="redcapAPI"; version="2.8.0"; sha256="1nsjfwvhdpaxknjrm56fqllz2ynrc4k97b0rp261bg7k931q6465"; depends=[checkmate chron getPass httr keyring labelVector lubridate yaml]; }; reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redditadsR = derive2 { name="redditadsR"; version="0.1.0"; sha256="00kn34d8277f8m4xigr28lpq4s55lvli4xw70g4cbsir7m6ibklv"; depends=[jsonlite]; }; redist = derive2 { name="redist"; version="4.1.1"; sha256="0gvcsbb169apkyg0h35y67js48q995n5dzr4krhv0ihp2qba91ky"; depends=[cli doParallel doRNG dplyr foreach ggplot2 patchwork Rcpp RcppArmadillo RcppThread redistmetrics rlang servr sf stringr sys tidyselect vctrs]; }; redistmetrics = derive2 { name="redistmetrics"; version="1.0.2"; sha256="1jq4qz43j7qjzx2pac3i1p2h331pgj8z9zfg4s1dhn56rwscn8f5"; depends=[cli doParallel dplyr foreach geos magrittr Rcpp RcppArmadillo rlang sf wk]; }; redland = derive2 { name="redland"; version="1.0.17-17"; sha256="135cfxn81dsafrnlcf7plp0d5hhdrw6w7kyjbrp65svky1fb0zsy"; depends=[roxygen2]; }; - redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; + redlistr = derive2 { name="redlistr"; version="1.0.4"; sha256="1m5dphcqcqy52l4r0pqiq80vl8nkh6vgv46qnjc02qjl7i1aipn5"; depends=[plyr raster sf sp terra]; }; redoc = derive2 { name="redoc"; version="2.0.0.49"; sha256="06nfqw6xs0ij21mjbqk9sdvhhh0pqf6fwankvagsbyrv742g7qkx"; depends=[jsonlite]; }; redux = derive2 { name="redux"; version="1.1.3"; sha256="1bbn2aznhfh78gbqq0g2n5lbg1q9aa7v8py3xv9gk97rg27jz49x"; depends=[R6 storr]; }; - ref_ICAR = derive2 { name="ref.ICAR"; version="2.0"; sha256="0fywjhq2m3pw313sf0pyss7qz6gw72f0krk7ml02a35j150h1yzi"; depends=[classInt coda dplyr ggplot2 gtools MCMCglmm mvtnorm pracma Rdpack sf sp spdep]; }; + ref_ICAR = derive2 { name="ref.ICAR"; version="2.0.1"; sha256="1mix12qxap6rqs6dg4nlbm9vlkzxgr1ivkjjkzap3k0km0agldx9"; depends=[classInt coda dplyr ggplot2 gtools MCMCglmm mvtnorm pracma Rdpack sf sp spdep]; }; refdb = derive2 { name="refdb"; version="0.1.1"; sha256="1g30n7jvn532nhbn4mrfkfym40vw1ha0q8yi3d3d3v86gyr5ga4n"; depends=[ape bioseq bold dplyr ggplot2 ggraph igraph leaflet readr rentrez rlang rmarkdown stringr taxize tibble tidyr xml2 yaml]; }; refer = derive2 { name="refer"; version="0.1.0"; sha256="1y0n4xzhn96d25mwjr0735w990rz2kbxhcpsc5k5vwbwq64q6wsd"; depends=[eList matchr]; }; referenceIntervals = derive2 { name="referenceIntervals"; version="1.3.0"; sha256="0q6rpz8llfsk86y8i1sdlqi97gcfx9k7q510pnz9nr7ag0w6w5mc"; depends=[boot extremevalues MASS outliers]; }; refineR = derive2 { name="refineR"; version="1.6.0"; sha256="0fcpbhwfk5qp7jyqifdrmbqsf7yrapix2nqg8pb0biiwl1bi7v59"; depends=[ash future future_apply]; }; refinr = derive2 { name="refinr"; version="0.3.2"; sha256="05jz3hgwghkbdi7r4977scifzcy5vrqmasjayq2mavada6dzj45l"; depends=[Rcpp stringdist stringi]; }; refitME = derive2 { name="refitME"; version="1.2.2"; sha256="125hxp24vlwg3g0v1rlhi3zbvnnzyj95a6d9f52f98hf6bp05yhb"; depends=[caret dplyr expm MASS mgcv mvtnorm sandwich scales SemiPar VGAM VGAMdata]; }; - refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; refreg = derive2 { name="refreg"; version="0.1.1"; sha256="0dqlqh3ndpqjab2cz3aikb9srhmyj3j133lwcnajgycwr5334mri"; depends=[doParallel foreach ggplot2 gridExtra KernSmooth ks matrixcalc mbend mgcv misc3d pracma RColorBrewer rgl sp stringr]; }; refreshr = derive2 { name="refreshr"; version="0.1.0"; sha256="0p240a7f2yajrd5qqjv0la49vm2cs6i32zyxxjcs6rd2a1z9xwfs"; depends=[crayon dplyr lubridate stringr]; }; refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; refuge = derive2 { name="refuge"; version="0.3.3"; sha256="0cq62rgawlam4j4h4sz4zvkgi0x21k4syy4vh7i40bxrq0z9ysyz"; depends=[dplyr httr jsonlite tibble]; }; - refugees = derive2 { name="refugees"; version="2022.12.0"; sha256="16jn2qqf43xrr1vr55cvas66i1iw3lddpgvsm46ryiszgvwq5k0a"; depends=[tibble]; }; + refugees = derive2 { name="refugees"; version="2022.12.1"; sha256="1fkdrm2ryjsdwsn0x0j3kly2yn5v3gq4g3hn4wdvps1kwrl31vng"; depends=[tibble]; }; refund = derive2 { name="refund"; version="0.1-32"; sha256="0c1y1l1jf2swjbjm02ivvxm1y8rklfbwbaacqcbs5bykmmajpjka"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; refund_shiny = derive2 { name="refund.shiny"; version="1.0"; sha256="1qzz9q6bxl9hdr7mqhmva96x12g62m9h9mb6yqhq6003w7cz186g"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; }; regDIF = derive2 { name="regDIF"; version="1.1.0"; sha256="125gw2dk1a43sij0gg98zwp15kc1a3411svf822q5k3d05r1a2wf"; depends=[foreach statmod]; }; regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; + regcensus = derive2 { name="regcensus"; version="1.0.1"; sha256="0sab5pwbnc06vds23nzcargk8igfngsyqhvnh0q40g95b55fm0c8"; depends=[dplyr httr jsonlite stringr tidyverse]; }; regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; - regfilter = derive2 { name="regfilter"; version="1.0.3"; sha256="0ll3mikssqghn58mf1qspd1zbnx2vwk7rpmnp0vb4szci4gmz87x"; depends=[e1071 FNN gbm modelr nnet randomForest rpart]; }; - reghelper = derive2 { name="reghelper"; version="1.1.1"; sha256="0v1987rs6kcpizfhrp3hxsyx9arn5vsbapjfgj9478j73mm844ji"; depends=[ggplot2 lme4 MASS nlme]; }; + regfilter = derive2 { name="regfilter"; version="1.1.1"; sha256="0s5gijp6pgqh9r57mz0kykkbrdvkc3wxbpz9wh15539rgkplynb6"; depends=[arules e1071 entropy FNN gbm ggplot2 infotheo modelr nnet randomForest rpart sf UBL]; }; + reghelper = derive2 { name="reghelper"; version="1.1.2"; sha256="1vd8kd719kyjp65zym6zx3vax1q2kbhpl6la71d5aa59s54ylri3"; depends=[ggplot2 lme4 MASS nlme rlang]; }; regional = derive2 { name="regional"; version="0.3.3"; sha256="0gwm3lqmils8dpv0g0919caqifa90lv3vrjqcky33i7jd18c20g2"; depends=[philentropy terra]; }; regioncode = derive2 { name="regioncode"; version="0.1.1"; sha256="1h5qbpcfgl86g0cy5nz9vvwzqsp335lqhl4djil3k3mab38k778d"; depends=[dplyr knitr pinyin textshaping]; }; regions = derive2 { name="regions"; version="0.1.8"; sha256="16i0w1my9zfwh0p9qvc3vcid0r6rb6gbvvrx03vbg81l6cxrglr4"; depends=[assertthat countrycode dplyr glue here magrittr purrr readxl rlang stringr tibble tidyr tidyselect]; }; @@ -16128,10 +16175,11 @@ in with self; { regr_easy = derive2 { name="regr.easy"; version="1.0.2"; sha256="18b4lznnyqyz4y5ig1dp21kmxqc488c199ss5j91i2v5d1qj2sk8"; depends=[ggplot2 stargazer]; }; regrap = derive2 { name="regrap"; version="1.0.1"; sha256="0yrxhlam7jmxwk1v53kllv6ja1m938symfvqp84xb278r3wb1wv7"; depends=[mvtnorm]; }; regress = derive2 { name="regress"; version="1.3-21"; sha256="0mkf1dyg0r09ifdvmc3g6b0q0h819j0kfh1cb33r1vsr8yfjvgbz"; depends=[]; }; + regressinator = derive2 { name="regressinator"; version="0.1.2"; sha256="0rdnaidbfs2s3qidfcilqrav84xs4v6g3xzwn27bn53s3nayw0r4"; depends=[broom cli dplyr ggplot2 insight nullabor purrr rlang tibble tidyr tidyselect]; }; regressoR = derive2 { name="regressoR"; version="3.0.2"; sha256="0c7kxhkcy02vlb0fabf70bzkrk6l7rsvj7ppx3nxhjrhfp7p8j2m"; depends=[dplyr DT echarts4r glmnet golem htmltools loadeR pls rlang rpart_plot shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs traineR]; }; regrrr = derive2 { name="regrrr"; version="0.1.3"; sha256="1ih27mgqfzjlas97rvj18s8j3p0bpwb03vr71yrq776vzv1v6fcs"; depends=[dplyr ggplot2 lspline magrittr MuMIn purrr robustbase scales stringr tidyr usdm]; }; regsem = derive2 { name="regsem"; version="1.9.5"; sha256="0lvsy7byrhiizyhwnwr22v8g36735nb0liyzl1nzk0py9rjbv4kk"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; - regspec = derive2 { name="regspec"; version="2.6"; sha256="1l9k2f47bqsnfvps7p93g15h1i6b1s66h77h9jvyv5kchyh4ci7c"; depends=[]; }; + regspec = derive2 { name="regspec"; version="2.7"; sha256="1n70820i5g8rk27vxmfl17d8ad4iz5fda4ba4sbkcd6sc93ycndy"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtomean = derive2 { name="regtomean"; version="1.1"; sha256="0xw0pany9cwfxdn26ckk6fdjnqx1916288mhphsnvwns3383nq4k"; depends=[effsize formattable mefa plotrix plyr sjlabelled sjmisc sjPlot]; }; regtools = derive2 { name="regtools"; version="1.7.0"; sha256="00g50dcfy93rgy9a2l24rsjgwk1575gxhpg9dy5r9928nwwd6lx9"; depends=[car data_table FNN glmnet gtools MASS mvtnorm polyreg R_utils rje sandwich text2vec]; }; @@ -16140,12 +16188,11 @@ in with self; { rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.5"; sha256="0yr1fzfahxqffjh5vm6y6b0iay8p0cirlzq2z4hlz7nci57fx5yr"; depends=[]; }; reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; - relSim = derive2 { name="relSim"; version="0.3-4"; sha256="1cap32gc3c3w8gf9zs7jn6mi21ff488kfnya9i763mfyvxqx72i7"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; - relaimpo = derive2 { name="relaimpo"; version="2.2-6"; sha256="1v2zvakzrnc89dshhpkrikfwa7l786sk5vnz4khil5f53biahm4r"; depends=[boot corpcor MASS mitools survey]; }; + relSim = derive2 { name="relSim"; version="0.3.5"; sha256="1wgi1h764cfzfdakmajdhqcz5nldw2arllawsfy6n506ndi4l916"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; + relaimpo = derive2 { name="relaimpo"; version="2.2-7"; sha256="1430p6kxh582k0saagns6mxz7qp6myf6n66hp1p02isl61w3w6sa"; depends=[boot corpcor MASS mitools survey]; }; relatable = derive2 { name="relatable"; version="1.0.0"; sha256="0147gin6dn76gg7gassar64f0w2gny1sh0k60v7914qhb4sj4s7i"; depends=[compare]; }; relations = derive2 { name="relations"; version="0.6-13"; sha256="1nnr0kcr3whbwzi36sg7wn46jp7r0hfkvcwlybvjsjhczcvc6ngq"; depends=[cluster sets slam]; }; reldist = derive2 { name="reldist"; version="1.7-2"; sha256="1j99j9a0igb9nwkp7fkqqkmvyz770xmbi1d25pbnaz7d2jy6q26r"; depends=[densEstBayes mgcv]; }; - relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; }; relevance = derive2 { name="relevance"; version="2.0"; sha256="1n6b8b0mg60i4zmj9008wz49jq0i6b7wbs9hz0lr7d2cjvfnhf07"; depends=[]; }; relevent = derive2 { name="relevent"; version="1.2-1"; sha256="13nvz6gsjqm10hc9fy9vf4x39grj65ynlmy9v4fww02pzih89zjj"; depends=[coda sna trust]; }; relgam = derive2 { name="relgam"; version="1.0"; sha256="0bfsk2pc3vdk8wgdfpz80x0f9p0z37sq114swqn6z11p298hwf2x"; depends=[foreach glmnet]; }; @@ -16157,20 +16204,20 @@ in with self; { rema = derive2 { name="rema"; version="0.0.1"; sha256="15b68pynac9ff9bina0mf94absvfsn21xcdmvd4lbl97pxwj83ph"; depends=[progress Rcpp Rdpack]; }; remaCor = derive2 { name="remaCor"; version="0.0.16"; sha256="1xznj2y3qszw8s1fgbs8fiadg7c0gl3ml1blxmwixb32kr2cv5vq"; depends=[EnvStats ggplot2 mvtnorm Rcpp RcppArmadillo Rdpack reshape2]; }; remap = derive2 { name="remap"; version="0.3.1"; sha256="1g3gy7bacyx16rpzdsfwhp9cw3kcm9r4mafrbj9hb50hsyp940yj"; depends=[sf units]; }; - rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; + rematch = derive2 { name="rematch"; version="2.0.0"; sha256="09jwg3glp32q4ml4khhzi8j7bzg9zhqqdg1m6r8gibh756zzgnhm"; depends=[]; }; rematch2 = derive2 { name="rematch2"; version="2.1.2"; sha256="1fzpz8vhghw8ygwg6rsvfy3783pqk7ch029i5851lwypkplvz77y"; depends=[tibble]; }; remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; remiod = derive2 { name="remiod"; version="1.0.2"; sha256="1darwljspxm6mkkp0d7xx375kvhlfwpzxc93yr2mb0mwi2877yi9"; depends=[coda data_table doFuture foreach future ggplot2 JointAI mathjaxr Matrix mcmcse ordinal progressr rjags survival]; }; remmy = derive2 { name="remmy"; version="0.1.0"; sha256="180b943fb1134r22avidv0s8gvsbx21kpl865l1xfzz95gzj6d7w"; depends=[curl httr2]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; + remotePARTS = derive2 { name="remotePARTS"; version="1.0.4"; sha256="0rhbvqiixzzwkyicd1w75xvbchhillsdwllgrglsbn04b4hzqa73"; depends=[CompQuadForm doParallel foreach geosphere iterators Rcpp RcppEigen]; }; remotes = derive2 { name="remotes"; version="2.4.2.1"; sha256="1790q52z4fy4zb1hnpn066q9fph53syl7gaxlbgbqq1dcndcma3v"; depends=[]; }; - rempsyc = derive2 { name="rempsyc"; version="0.1.4"; sha256="1kwq2r6zw41vdcivr3mmh49gfzswdzz9ah76dg3gbbvafynskkmp"; depends=[dplyr rlang]; }; + rempsyc = derive2 { name="rempsyc"; version="0.1.7"; sha256="1s4iv2ssz12pppjc9glhnryfkqnafid3fz9gmvhs9k5jk3cnq4pa"; depends=[dplyr rlang]; }; remss = derive2 { name="remss"; version="1.0.1"; sha256="15s3qvcfyp1880ddzpvgiw3q5av21052iy1vnpw0hib5pb7xfkfb"; depends=[survival]; }; - renderthis = derive2 { name="renderthis"; version="0.2.0"; sha256="1hvqwq2w30j29pwjm498mza9zxg8ga5bizm795hmdbz1k30m4j3p"; depends=[cli digest fs jsonlite magick pagedown progress quarto rmarkdown withr xaringan zip]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; rentrez = derive2 { name="rentrez"; version="1.2.3"; sha256="0x1g2f6hvkqqlb39z8m5qxhcvsizddic5i7rpqw0wy77xfbna9gv"; depends=[httr jsonlite XML]; }; - renv = derive2 { name="renv"; version="1.0.0"; sha256="0ssp0mam8zkk0qsgadab0c1lkbqac3cq12s3066xz44h2jzsrfj8"; depends=[]; }; + renv = derive2 { name="renv"; version="1.0.3"; sha256="1d2y1yks34dg862zcxx03dak1h2gikis6mabmws2srja2hr18nlq"; depends=[]; }; renz = derive2 { name="renz"; version="0.1.1"; sha256="0xanqqyz8cq8vfxy7vfxcf6fyh8r28bqpc7820fbl77g960cx5jw"; depends=[VGAM]; }; repairData = derive2 { name="repairData"; version="0.1.0"; sha256="1l5ag952165b0nm59mp9v768dp53xm51ckg01i4c6l04qfzx1lm7"; depends=[]; }; repana = derive2 { name="repana"; version="1.23.2"; sha256="1wic76sln37qjdrviaz689c5gjf4pc3ffdgvzcvjh0kjvl7d8jfh"; depends=[config DBI dplyr lubridate magrittr openxlsx pool processx readr rmarkdown rstudioapi]; }; @@ -16190,16 +16237,16 @@ in with self; { reportROC = derive2 { name="reportROC"; version="3.6"; sha256="1hfgyikd7l14yfr2cnabjbb67svydj1snfcagc4w4fxhdwqhd3f2"; depends=[pROC vcd]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; reportRmd = derive2 { name="reportRmd"; version="0.0.2"; sha256="07vk3wmcr47bfjnldfrs2j3dhq5yw9h6l14jahn7hzz5ap2zj0jq"; depends=[aod cmprsk geepack ggplot2 ggpubr gridExtra kableExtra knitr MASS pander plyr rlang rstatix scales survival]; }; - reporter = derive2 { name="reporter"; version="1.4.1"; sha256="1vpqb0s86p8dh7l3his31cjidhm7vxzfgqsjap3rfb6sq7hblzx6"; depends=[common crayon fmtr glue jpeg stringi withr zip]; }; + reporter = derive2 { name="reporter"; version="1.4.2"; sha256="1rym8kmmxw8fgjz1nl2mjzybmbjm8w4jj6bffihhq0v7jxihk3pa"; depends=[common crayon fmtr glue jpeg stringi withr zip]; }; reportfactory = derive2 { name="reportfactory"; version="0.4.0"; sha256="0mkk9gyd3l6m33mkc6w3fmgrzc6na03kwxxwgn0zb83bjpmyyl1z"; depends=[callr fs knitr rmarkdown rprojroot rstudioapi yaml]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; reporttools = derive2 { name="reporttools"; version="1.1.3"; sha256="0sx89qb66lczmzcsybxac4razcncf2xcxr0vfkvb3f8jqc7xwcik"; depends=[xtable]; }; repr = derive2 { name="repr"; version="1.1.6"; sha256="0gv72qydk4r070q3jcqakvfcm4r0n9zzzpl82s0w87iw6sdnqbix"; depends=[base64enc htmltools jsonlite pillar]; }; - representr = derive2 { name="representr"; version="0.1.4"; sha256="1nnaghd3v09ifkndlbvi97rlkd07szzwvx17p08hjd25m3aabnqz"; depends=[doParallel dplyr foreach Rcpp]; }; + representr = derive2 { name="representr"; version="0.1.5"; sha256="0w84kh9nsa8861yfhj13f29wcdfs1mrhjr6jyvxk55f34vj7fhf1"; depends=[doParallel dplyr foreach Rcpp]; }; represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="2.0.2"; sha256="14khx09yzn97xhags48lvym1g37h1l2ymvw6r1jlldhjc7i1cnx8"; depends=[callr cli clipr fs glue knitr lifecycle rlang rmarkdown rstudioapi withr]; }; - reproducer = derive2 { name="reproducer"; version="0.5.2"; sha256="1pi8nhg5cvxzirxrw252wid0zflzcybvfqfkw7zd55fc93fzdd4p"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor nortest openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="2.0.7"; sha256="0hxxjninf9a4bc1djbrwidziwp6q5dbx7y1i7jpwdfm8q105vs4q"; depends=[data_table digest filelock fpCompare lobstr]; }; + reproducer = derive2 { name="reproducer"; version="0.5.3"; sha256="0nm8x1bwigbvkz7bbr313fmxb9ypk6dw2yl9g1cppdws2c6rq1mr"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor nortest openxlsx readr reshape stringr tibble tidyr xtable]; }; + reproducible = derive2 { name="reproducible"; version="2.0.8"; sha256="01rximynm0n3xj04y4fw1dwdya1vcka6z6zncvsxcybnak6725qp"; depends=[data_table digest filelock fpCompare lobstr]; }; reproj = derive2 { name="reproj"; version="0.4.3"; sha256="0bcg5bz2sl4d31iwr55nwr85p1jna9fpbcli26lf04dwznwmx0rl"; depends=[crsmeta PROJ proj4]; }; repsd = derive2 { name="repsd"; version="1.0.1"; sha256="102rnc2g31aijhwsmad86k2wjcvbvzi51c2rp0wk711riq5v7cm1"; depends=[progress]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.1.0"; sha256="123hf7qhhs4jyjbmw4246zmhyngjq7r9ihgg3nxg594kja40khd9"; depends=[tibble]; }; @@ -16208,8 +16255,8 @@ in with self; { requiRements = derive2 { name="requiRements"; version="0.0.3"; sha256="1x8sl77qwzrnfbh668s51sd71r19n5gjl95xh5hnc41avkdkn5by"; depends=[remotes]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; rerandPower = derive2 { name="rerandPower"; version="0.0.1"; sha256="1vk0lrd7hc499prshj3dfyyn2iaz9z6916xsw31ax1l5mipys4mk"; depends=[Runuran]; }; - rerddap = derive2 { name="rerddap"; version="1.0.3"; sha256="1mna7yq1qzmzwpkyif8jr6npd8fd2vfd3lczw3w5vmk9ghqvrfqy"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.1.4"; sha256="1f2x45p63821amj6v5fvfbhdxvv51qyapl6al0x4yh247wqxiivd"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; + rerddap = derive2 { name="rerddap"; version="1.0.4"; sha256="16341yvfnd4p56wbww39fyprb6ngk1f9ydvmg1chcgppsk28f6nz"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; + rerddapXtracto = derive2 { name="rerddapXtracto"; version="1.1.7"; sha256="0zyzzia8sxb2gxbr0ag8ipryn94pvdgpwsl5kmafmil42rv8y054"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; resample = derive2 { name="resample"; version="0.6"; sha256="0rajp5kmr8qgwzhy7wfmhm7fllk9ywm7hz44f5ws94lcn44q158v"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; resampledata3 = derive2 { name="resampledata3"; version="1.0"; sha256="1nankfkvf1cncm0p4qnwdamxinaggaga9654w2bmh6363fkc40j0"; depends=[]; }; @@ -16217,37 +16264,37 @@ in with self; { resemble = derive2 { name="resemble"; version="2.2.2"; sha256="1qf1g0cq593lnvzac4z1v04bjp10aza786pfaivs74m726ihmzq6"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; reservoirnet = derive2 { name="reservoirnet"; version="0.2.0"; sha256="0x87jglv7zyldagrz1kz68xi9l4j920zgpsbpzbj1ksxi2ypp98s"; depends=[dplyr ggplot2 ggpubr janitor magrittr reticulate rlang testthat]; }; - reservr = derive2 { name="reservr"; version="0.0.1"; sha256="1p6k561hj4127g1mi5xwic8zmnj3mvklpc4a38ki5cgvw84kb6xa"; depends=[assertthat BH generics glue keras matrixStats nloptr numDeriv purrr R6 Rcpp RcppArmadillo RcppParallel rlang]; }; + reservr = derive2 { name="reservr"; version="0.0.2"; sha256="0w6bax0ycmix46mm5jmr49vl7l3rnvwg4vv6xq78hdczspdbc0g7"; depends=[assertthat BH generics glue keras matrixStats nloptr numDeriv purrr R6 Rcpp RcppArmadillo RcppParallel rlang]; }; resevol = derive2 { name="resevol"; version="0.3.0.1"; sha256="13whjldpidagyaqh2s7isvs8qms6zw82v067h4zyrzfzh6q3xsa8"; depends=[]; }; reshape = derive2 { name="reshape"; version="0.8.9"; sha256="0j203qmc076x5lp6q2xi4dq4xdb73jmsa42rpxp1c37knnrph4br"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; - resilience = derive2 { name="resilience"; version="2023.1.0"; sha256="0c6d7qjsyfhgbcasndfkmgqpc1n9cvpbbwa93lsn49hhpl3hnyva"; depends=[doParallel foreach nptest]; }; + resilience = derive2 { name="resilience"; version="2023.1.1"; sha256="0pa0c5l3jm5szn7vffg030krn7f9lz9riqvjz9n7waiszfs0mzdr"; depends=[doParallel foreach nptest]; }; + reslife = derive2 { name="reslife"; version="0.1.2"; sha256="0k9a8g9iv3vspcai7z00755l9d7nn5753k3ysd0pm3blsmyq2zpk"; depends=[flexsurv gsl pracma]; }; reslr = derive2 { name="reslr"; version="0.1.1"; sha256="0hklhkr0fxrhhi6apskq498z1vv1w90zsfvvc344rmj9qid2lj2a"; depends=[data_table dplyr fastDummies fields geosphere ggplot2 magrittr ncdf4 plyr posterior purrr R2jags stringr tidybayes tidyr]; }; resourcer = derive2 { name="resourcer"; version="1.4.0"; sha256="0rffkz2ybvr58jpa3kfiw4s3rk0cmrm9r5ca2abbzlcny7kxb7v5"; depends=[httr R6]; }; respR = derive2 { name="respR"; version="2.3.1"; sha256="0y8s000071m9n1v64xgxyl09biih92v347332afsmak582nk6i6b"; depends=[data_table dplyr glue lubridate magrittr marelac purrr readxl roll segmented stringr xml2]; }; respirometry = derive2 { name="respirometry"; version="1.4.0"; sha256="0cb83xdd7b4mnipchqjdaf5lfbh9475gxpk7dbr9g26b4byrg7cc"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; - responsePatterns = derive2 { name="responsePatterns"; version="0.1.0"; sha256="0iyx35kq82w18v8c7lfz7x31c2cgywn4xh8hg0ad3gsdygadq8hq"; depends=[]; }; - restatapi = derive2 { name="restatapi"; version="0.21.2"; sha256="0358vmr9zb5q35wrxvr2022vl6w3i4dvi9nkj4lmzymwvib63w2s"; depends=[data_table rjson xml2]; }; + responsePatterns = derive2 { name="responsePatterns"; version="0.1.1"; sha256="0ym6jbacsi4lv9rcw3k80wiil94ymivm55c4hz6hwbv54ybkzlcj"; depends=[]; }; + restatapi = derive2 { name="restatapi"; version="0.22.1"; sha256="1bd9aggyps8352l01g9jpnvmqqw7inf3zy3mh4l99i3d8s9kdid4"; depends=[data_table rjson xml2]; }; restatis = derive2 { name="restatis"; version="0.1.0"; sha256="0y36qdnadmcdmwik2iyjh8h47jchrbwpal8djy29hx7q1140ra2r"; depends=[askpass httr2 memoise readr tibble vctrs]; }; restaurant = derive2 { name="restaurant"; version="0.1.0"; sha256="1dr9nw5xkll1wnra2xi8dg2yiv85nibdg1i9lsn44v7cgr9vb32j"; depends=[]; }; restez = derive2 { name="restez"; version="2.1.3"; sha256="1q008ykk75h19zqnkv339qx7zb7vmab8f9ywvr8qb7l1n3yxah76"; depends=[ape assertthat cli crayon curl DBI duckdb fs rentrez stringi]; }; restfulr = derive2 { name="restfulr"; version="0.0.15"; sha256="14p6h0gjknqy5z2fprxw7waf4p0cd2qmp18s7qig4ylqn8gqzzs0"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; - restoptr = derive2 { name="restoptr"; version="1.0.5"; sha256="1j4n06n5myq6016v1xsygjl7dac9cya9ikaafa6kggb9p5505p4h"; depends=[assertthat crayon magrittr rJava terra units]; }; + restoptr = derive2 { name="restoptr"; version="1.0.6"; sha256="0m7nw277qgjdxfwx3i1k73l93rqyf766l2af9ymap9dl7hrp8jaq"; depends=[assertthat crayon magrittr rJava terra units]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; - restriktor = derive2 { name="restriktor"; version="0.5-20"; sha256="148h7ii7w0pprlrbv19b8k0lnl5avib45jdrr3xqr4x59pa8ccxl"; depends=[boot ggplot2 ic_infer lavaan MASS mvtnorm norm2 quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.5-30"; sha256="1qlb892rx2i42mlidl5dm20a848j8cca8zq1d100la2829g9k49g"; depends=[boot ggplot2 ic_infer lavaan MASS mvtnorm norm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.5"; sha256="0k3s2i102hvsag7jiahgfpjc09646xjpxcpv5x3d91ch3xipdc0b"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; rethnicity = derive2 { name="rethnicity"; version="0.2.4"; sha256="1h8d9q06dc98l55lqmjxf69ngvdj6r9fcck1bdvk0rin40q07zfk"; depends=[cli Rcpp RcppEigen RcppThread]; }; - reticulate = derive2 { name="reticulate"; version="1.30"; sha256="1pqpc1bhdkhkzddwfpnwv907x29x20za4if30bwgljgsj0x8m3zf"; depends=[here jsonlite Matrix png rappdirs Rcpp RcppTOML rlang withr]; }; + reticulate = derive2 { name="reticulate"; version="1.34.0"; sha256="01j2dr93r5a18irwbm6hlh2v0s2rc5bl6dcmds1m64c1rli8j3cd"; depends=[here jsonlite Matrix png rappdirs Rcpp RcppTOML rlang withr]; }; retriever = derive2 { name="retriever"; version="0.2.1"; sha256="0vachj8rzh8g55y18hz85bsrzr86614frdmr7wz6hszgiq8qgcxy"; depends=[pbapply preprocessCore]; }; - retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; retroharmonize = derive2 { name="retroharmonize"; version="0.2.0"; sha256="10fwmm91p3dgad99a7imkg9cjlk0gy2bkpmzgfr6s9bp07splj6i"; depends=[assertthat dplyr fs glue haven here labelled magrittr pillar purrr rlang snakecase stringr tibble tidyr tidyselect vctrs]; }; retrosheet = derive2 { name="retrosheet"; version="1.1.5"; sha256="0d4s2c3jya5pnq3mcdxai3wv32149rr3d1q5qrzvk4f771s3l34m"; depends=[httr rvest stringi stringr xml2]; }; retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="3.1-0"; sha256="1a2dmcfmnyzpfkyir3g1sz6s8dan2lzapq8v1dph5znmascv1180"; depends=[dplyr purrr rlang]; }; - revdbayes = derive2 { name="revdbayes"; version="1.5.1"; sha256="01q2cy6xhjdfxplhmjrh27i71q3z5byh3wf4wqmzi0z91zmih53p"; depends=[bayesplot exdex Rcpp RcppArmadillo rust]; }; + revdbayes = derive2 { name="revdbayes"; version="1.5.2"; sha256="15h1p7q4l0zfa8vpyypkn32b716hwdp5agf7scf91jkhs3bflsbg"; depends=[bayesplot exdex Rcpp RcppArmadillo rust]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.4.1"; sha256="1m8y1mj39bnf9q0n9mi0ashvb79lksx5dfkxb04qj2h5kkyxg49g"; depends=[pso Rcpp RcppArmadillo]; }; revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; }; reveneraR = derive2 { name="reveneraR"; version="0.1.2"; sha256="0l5l9lqwisphjpf2ni0c0a3cg4xpkxy3sk4nvj93f6pra2fmg4rg"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; @@ -16260,9 +16307,8 @@ in with self; { revulyticsR = derive2 { name="revulyticsR"; version="0.0.3"; sha256="0dz9c26qwasgpp6a5fqh1rgq0hp9dhsrcm1h2hbp0cisri8iwsjf"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; rewie = derive2 { name="rewie"; version="0.1.0"; sha256="1ysrpd2cqmz27sjj3dh0wpg86685d708kjwiqybwjlw9ap55jb06"; depends=[lme4 MASS plm rockchalk]; }; rex = derive2 { name="rex"; version="1.2.1"; sha256="1mmzlc3j7xa0rbjxa369f4sr0iw3gq58g8fmjjxbsjvfq14ychmg"; depends=[lazyeval]; }; - rexpokit = derive2 { name="rexpokit"; version="0.26.6.9"; sha256="0ayh4nn031j702sgx3bh9j4psqf80ai4rf3fnmkfp62bxfffci8l"; depends=[Rcpp]; }; rextendr = derive2 { name="rextendr"; version="0.3.1"; sha256="1jm0vvpqzycbp6an2vi3wmjavhj2wlnncvgxcd1nfzn0fw7vpbrc"; depends=[brio callr cli desc dplyr glue jsonlite pkgbuild processx purrr rlang rprojroot stringi tibble vctrs withr]; }; - rfPermute = derive2 { name="rfPermute"; version="2.5.1"; sha256="156vaxkjs5959bh4fh65zqfy8p7ag66abizx6n3wj6q078048jvj"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; + rfPermute = derive2 { name="rfPermute"; version="2.5.2"; sha256="060v52jil5zannzinc6nvzwqd8kw0glpj3xflw606p9sxpzx11rl"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0.3"; sha256="1f0ljy51xqqrncdg4xpic6ir8zlgvp952pr0s217v7ybgdzs42v6"; depends=[dplyr ggplot2 ggpubr magrittr randomForest ranger titanic]; }; rfacebookstat = derive2 { name="rfacebookstat"; version="2.9.3"; sha256="0g4fgl7d77h3wdp2r7r3smlfsykcfr1gm6chha02z4qg2159ldnk"; depends=[dplyr httr jsonlite pbapply purrr stringr tidyr tidyselect]; }; @@ -16283,35 +16329,34 @@ in with self; { rfordummies = derive2 { name="rfordummies"; version="0.1.6"; sha256="01xv6ds3h8gvi1wi5hgy3r1dhi0767mcgsnshvhva3bnvf1a8398"; depends=[]; }; rfvimptest = derive2 { name="rfvimptest"; version="0.1.3"; sha256="1c14591y4wpi5r7f6azzyac93h6klgk8jqfaszzp01krkb8z2cdy"; depends=[party permimp ranger]; }; rfviz = derive2 { name="rfviz"; version="1.0.1"; sha256="1pxr9bsqg27vgbngj89hhjq0gyzgdlg69rz6kzvvd8gclg42wisv"; depends=[loon randomForest]; }; + rgTest = derive2 { name="rgTest"; version="0.1"; sha256="02cdi05izgl7xkhp9zl01jm762x3dqjmzxjl3akjrid825x6c220"; depends=[ade4]; }; rgabriel = derive2 { name="rgabriel"; version="0.9"; sha256="1za8njmasl7kmmiqgxhr8k2p1kygkadkqgim9wgyjkcnzljg46kb"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="3.7.7"; sha256="1f2qi0vs8s1gxhqvvh6jyswv0p4c29ycm912hswxgc93v6rzghsg"; depends=[crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wk xml2]; }; - rgdal = derive2 { name="rgdal"; version="1.6-7"; sha256="0cxfmm7niixw3dnbqm7a00603dyqjrphajqx0q5vjpdhmpyysp2m"; depends=[sp]; }; + rgbif = derive2 { name="rgbif"; version="3.7.8"; sha256="18xihlvbaagmp6qdbknq6qblbbvz0g1r7shngh0dzfpvwr6bily0"; depends=[crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble whisker wk xml2]; }; rgdax = derive2 { name="rgdax"; version="1.2.1"; sha256="01hpyyhb6jcw9w0q9h4ghgh4cbba27mfl9zdv4vv4ppakvl80czl"; depends=[digest httr jsonlite plyr RCurl]; }; - rgee = derive2 { name="rgee"; version="1.1.5"; sha256="1yq0k935p23qgwaffda8zk5p5546z5i27kivyqf8hg461cn73b3x"; depends=[cli crayon jsonlite leafem leaflet magrittr processx R6 reticulate rstudioapi]; }; - rgeedim = derive2 { name="rgeedim"; version="0.2.4"; sha256="0ln2m3hakklj7sg1g73fv3jpfxr5jwkxn330padwqyxi9ci24nlg"; depends=[jsonlite reticulate]; }; + rgee = derive2 { name="rgee"; version="1.1.7"; sha256="1v6xczz7n3gby7ckh323yr5jqvzsvpjy1qszqh9hk7a56m3y31mh"; depends=[cli crayon jsonlite leafem leaflet magrittr processx R6 reticulate rstudioapi]; }; + rgeedim = derive2 { name="rgeedim"; version="0.2.5"; sha256="0agi04bz9rbl2pwrrn0wgb359198sg3ia87rnarb4ckrrnj2n5gs"; depends=[jsonlite reticulate]; }; rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; }; rgenius = derive2 { name="rgenius"; version="0.1.0"; sha256="1gpglnhicyv16ym224wzaw52w9xr63slm75wvidl3z14izzyy7ga"; depends=[doParallel dplyr foreach httr purrr rvest stringr tibble]; }; rgenoud = derive2 { name="rgenoud"; version="5.9-0.3"; sha256="0pxmisc0vsdchqaaxqcblnhhviizgcwhvsbklr3rq7vrmn6hlmii"; depends=[]; }; rgeoda = derive2 { name="rgeoda"; version="0.0.10-4"; sha256="18rcrlah1iaqvf90cymh71c8wpgy3yxlwlq84waxilpccwhd68x0"; depends=[BH digest Rcpp sf]; }; rgeomstats = derive2 { name="rgeomstats"; version="0.0.1"; sha256="1fy5fvkifv80sf3x0d2y3vyv7adn0h57q1hvip1phcvxg8p5prff"; depends=[cli purrr R6 Rdpack reticulate rlang]; }; - rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; + rgeopat2 = derive2 { name="rgeopat2"; version="0.4.0"; sha256="0l3gj2g4z7fcn5nx9kj3cz4a0g7k4f95gpwxsi82fybsdx5j5byv"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.2.2"; sha256="1nk3qzwcvvq3n1da480zk047wl738fjyvarakm00wwrbnb3ax70j"; depends=[geosphere leaflet pals RANN raster sp spatstat_geom splancs]; }; - rgeos = derive2 { name="rgeos"; version="0.6-4"; sha256="04fyrqdpb4cz9kjqh1cxbpqh1ana7l8zh7wdzxassgzxjvgc80wx"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.16.2"; sha256="00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f"; depends=[igraph servr XML]; }; rgho = derive2 { name="rgho"; version="3.0.1"; sha256="19am8xhflib4062rkidn1501hq5wlj3mjx2hm4vf3jpzgqiqdj59"; depends=[curl dplyr httr lifecycle magrittr ODataQuery rlang tibble tidyr]; }; rgl = derive2 { name="rgl"; version="1.2.1"; sha256="16ybdly3cjm6ibvhfad7d5k6bxaxf33l5s1s766hy9kza8skyani"; depends=[base64enc htmltools htmlwidgets jsonlite knitr magrittr mime R6]; }; rgl2gltf = derive2 { name="rgl2gltf"; version="1.0.3"; sha256="0krn4dp8xf6z5363agz42v4dwhhxdrxpqzhmf9yd8xl2l3yj6pfp"; depends=[base64enc jsonlite R6 rgl]; }; - rglobi = derive2 { name="rglobi"; version="0.2.28"; sha256="1i7il5sicir9xwjya0s8d54kzxhkkpdjz238q4snkdg2iwicxfc6"; depends=[curl RCurl readr rjson]; }; + rglobi = derive2 { name="rglobi"; version="0.3.4"; sha256="14jwl1cl20q7sgsiidd2sd2p2vjjfvqam0bijg9j8328g27cbi63"; depends=[curl RCurl readr]; }; rglplus = derive2 { name="rglplus"; version="1.1"; sha256="1i9i62214yljaxplzk8qk9dbslj1shgddmdvpqj35nr45pavnnqm"; depends=[rgl]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; + rgnoisefilt = derive2 { name="rgnoisefilt"; version="1.1.2"; sha256="0rdjbxws1bimpnwfv46yycafvwjc2lcqgdf993f5mm2sg2fxv2da"; depends=[arules class e1071 entropy FNN gbm ggplot2 infotheo kknn modelr nnet randomForest rpart]; }; rgnparser = derive2 { name="rgnparser"; version="0.2.6"; sha256="17s08arj7hdzmm2cbmwk4cvdlgrviyjsfm8qpvc5j7sjd6b48sdq"; depends=[jsonlite readr sys tibble]; }; - rgoogleads = derive2 { name="rgoogleads"; version="0.9.2"; sha256="03y1dvshy6cadamig1gb72knz64g96w7s965k3cgvhnihm15fwd9"; depends=[cachem cli dplyr gargle httr jsonlite memoise pbapply purrr rappdirs rlang rlist rvest snakecase stringr tidyr withr]; }; + rgoogleads = derive2 { name="rgoogleads"; version="0.10.0"; sha256="1v2g580js7avyqd02d9vyawj04x3yil6iw3w865h5901k40q817d"; depends=[cachem cli dplyr gargle httr jsonlite memoise pbapply purrr rappdirs rlang rlist rvest snakecase stringr tidyr withr]; }; rgoogleclassroom = derive2 { name="rgoogleclassroom"; version="0.9.1"; sha256="0s4s5ipvnbwrf76ihzcjqkf3l1j008gn0ncl2a4znp9ka432gk49"; depends=[assertthat attempt curl dplyr httr jsonlite knitr lubridate magrittr openssl ottrpal purrr R6 stringr]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; - rgplates = derive2 { name="rgplates"; version="0.3.1"; sha256="1j3yyg3ayzd5n6bvfwqcylih3qcwl1c22xgq56z0fjix3acs1z74"; depends=[sf]; }; + rgplates = derive2 { name="rgplates"; version="0.3.2"; sha256="07yyd00lijzm1ym2zi4h74wm6d4lynm57k71g0za50fmch2jhqyp"; depends=[sf]; }; rgraph6 = derive2 { name="rgraph6"; version="2.0-2"; sha256="136imihzm2x6i9d60a8wbv2mc1v2r9rsswnic8q7kdp7l1625xa6"; depends=[Rcpp]; }; - rgrass = derive2 { name="rgrass"; version="0.3-8"; sha256="0ymfimbzpyzi6bvr2rvv8qg4pwbm7av8igi6dp9rxhzipks616ki"; depends=[XML]; }; - rgrass7 = derive2 { name="rgrass7"; version="0.2-12"; sha256="04jg5gvwyx1kk1b6914z7s6n6z654k64cvga6g3bzd3xsiq6rdbs"; depends=[XML]; }; + rgrass = derive2 { name="rgrass"; version="0.3-9"; sha256="06zck7mwi2gv6qdxl2rj00kasyf5injb61hlmlcslr4scj5vdcq6"; depends=[XML]; }; rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; }; rgtmx = derive2 { name="rgtmx"; version="0.1.4"; sha256="0zqab6zhfkc302nsa13nbi5bc45xwrhsrn42g2jnjw2xpnfk3ynz"; depends=[httr jsonlite]; }; rgugik = derive2 { name="rgugik"; version="0.4.0"; sha256="0lkjnwg679fn6ii86h3w6n9b9aylp7m5bipji46bi92v2s2sssm2"; depends=[jsonlite sf]; }; @@ -16320,11 +16365,11 @@ in with self; { rhcoclust = derive2 { name="rhcoclust"; version="2.0.0"; sha256="0ck5slv3y08vcxkdxhw5j6n3jjsg4jj6r8hkb0yhkq2k59b18rg0"; depends=[fields igraph]; }; rheroicons = derive2 { name="rheroicons"; version="1.0.0"; sha256="02yknpdgfjjkkk9456pxfl9qhaphwrhbxw7fh04ki9a1rgalk0xw"; depends=[htmltools shiny stringr]; }; rhierbaps = derive2 { name="rhierbaps"; version="1.1.4"; sha256="0717h3j9pamz0hkwcfadivhfh9n2bd9l55kvll1ipc4dz85cp324"; depends=[ape ggplot2 matrixStats patchwork purrr]; }; - rhino = derive2 { name="rhino"; version="1.4.0"; sha256="1zmqy1pl1sbg6p6b93y0jfyhyy2py5mjj7caq066zcnikyyyswp2"; depends=[box cli config fs glue lintr logger purrr renv rstudioapi sass shiny styler testthat withr yaml]; }; + rhino = derive2 { name="rhino"; version="1.5.0"; sha256="0r5yxp1hrsxqqgw0r2xzzsaxnqksp2lz51vpwfqw55wmxdqjasdj"; depends=[box cli config fs glue lintr logger purrr renv rstudioapi sass shiny styler testthat withr yaml]; }; rhmc = derive2 { name="rhmc"; version="1.0.0"; sha256="1m79f1hx404y0k8lk3n6jnzhr6wwrk83xiym68sq1zvj0wjqiqmw"; depends=[]; }; rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; }; rhoR = derive2 { name="rhoR"; version="1.3.0.3"; sha256="0l387m6l2x3djn1liag4m49835m2mny006sjzqbravb1famrvawi"; depends=[Rcpp RcppArmadillo]; }; - rhoneycomb = derive2 { name="rhoneycomb"; version="2.3.3"; sha256="0alvg8skhpc9l00r9ng1j39ha1pqj5yp7g3gdfp3hq20znya6zgc"; depends=[]; }; + rhoneycomb = derive2 { name="rhoneycomb"; version="2.3.4"; sha256="1vh6y4hfpcbpm448hd083ln197fc7h6pg6bngvmla2aj9vp6rlmx"; depends=[]; }; rhosa = derive2 { name="rhosa"; version="0.2.0"; sha256="00j4s3x05cyz0nr63v9ajj9k13nyml0s3m3hg1zm7hfyzr9gzdjq"; depends=[]; }; rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; }; rhub = derive2 { name="rhub"; version="1.1.2"; sha256="12m751d8qyl7fhrg8660wman2msz3qjkrw0h49pxf7lyzfamn9wm"; depends=[assertthat callr cli crayon desc digest httr jsonlite parsedate pillar prettyunits processx R6 rappdirs rcmdcheck rematch tibble uuid whoami withr]; }; @@ -16332,68 +16377,66 @@ in with self; { rhype = derive2 { name="rhype"; version="0.3.0"; sha256="16nzycgvp8xrjjly7j96kvy816xna5i5rdnd27gmyjmpf0dvp429"; depends=[Matrix R6 RSpectra]; }; ri2 = derive2 { name="ri2"; version="0.4.0"; sha256="0k85rmjl0inida4wx6d612vp35sr4cg2zsmrby8rl7p4gwrbix5v"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; riAFTBART = derive2 { name="riAFTBART"; version="0.3.2"; sha256="0nj7xqvb711fi764dk7v60sr5s5955cglyf54zkdc6ax365xlnj0"; depends=[BART cowplot dbarts doParallel dplyr foreach ggplot2 magrittr MASS MCMCpack msm nnet randomForest RRF stringr survival tidyr twang]; }; - rib = derive2 { name="rib"; version="0.19.0"; sha256="09nnf1v1xg5r8qpxv6f9jg96vfvmk5s9ybkksxqi9f4xzri1izps"; depends=[R6]; }; + rib = derive2 { name="rib"; version="0.19.3"; sha256="1ysrkgk6rjg2q4dwz3rbbvkdd4nv2c20c1b8sa8rj98mjvs0ch2m"; depends=[R6]; }; ribd = derive2 { name="ribd"; version="1.6.1"; sha256="1pzkbazm5mcr05ib2x0cs8aa7jk96k9nhkish96awjd2ihq6c019"; depends=[glue kinship2 pedtools slam]; }; ricegeneann = derive2 { name="ricegeneann"; version="1.0.2"; sha256="0wxqp4pfdhvq4mwzjrqi3m9jiayk5bp1ha222mpm4qz1pl41cy9w"; depends=[riceidconverter]; }; riceidconverter = derive2 { name="riceidconverter"; version="1.1.1"; sha256="143f76v3k2q9ddcxf2nzvd04pjgy7p120ln0zkmxpal20c81dwq6"; depends=[dplyr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; - ricu = derive2 { name="ricu"; version="0.5.5"; sha256="04qzfngqgcil2psnjbiwqx2wn2633mp40m1ry2ckp05sldzv7ad6"; depends=[assertthat backports cli curl data_table fansi fst jsonlite openssl prt readr rlang tibble vctrs]; }; + ricu = derive2 { name="ricu"; version="0.5.6"; sha256="0ajj15hpmsnhkxsnlsbvrdp3bwsbkrl1479p5zfgmzym8rdfirsj"; depends=[assertthat backports cli curl data_table fansi fst jsonlite openssl prt readr rlang tibble vctrs]; }; ridge = derive2 { name="ridge"; version="3.3"; sha256="1xb03ir706k2c3y2kpa4dvnz5i0qhm2ghm7syng0kalpdz7swbaw"; depends=[]; }; - ridgetorus = derive2 { name="ridgetorus"; version="1.0.1"; sha256="1agvxk27db60ggjz102d0gdv8apx2plfbyb44mkhhwmfwcpqmvvs"; depends=[circular Rcpp RcppArmadillo rootSolve sdetorus sphunif]; }; + ridgetorus = derive2 { name="ridgetorus"; version="1.0.2"; sha256="04wabvf7agyk8djfqn41zcsj33940vx32zzf6811h4n5bs14kp65"; depends=[circular Rcpp RcppArmadillo rootSolve sdetorus sphunif]; }; ridgregextra = derive2 { name="ridgregextra"; version="0.1.0"; sha256="08dsh09pcm9s8903lszzk2r3zi9hnvm6hzajwvqc3gkpjcs2q7bp"; depends=[isdals mctest plotly]; }; - ridigbio = derive2 { name="ridigbio"; version="0.3.6"; sha256="0q7m6918kh9drlsjns9xg6k13fdilxhm7f8d8d0lqcx1d8kds6f0"; depends=[httr jsonlite plyr]; }; + ridigbio = derive2 { name="ridigbio"; version="0.3.7"; sha256="0nbd182hjs0minn7vn0b9mphc4yc027pb2qpy96dxghgm6l90amg"; depends=[httr jsonlite plyr]; }; ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; riem = derive2 { name="riem"; version="0.3.0"; sha256="0a0nl1857x7qw8y8n5fq9hfhh1s25cihd2532zxfyvy14icwf72i"; depends=[httr2 jsonlite lubridate magrittr purrr rlang tibble]; }; rifle = derive2 { name="rifle"; version="1.0"; sha256="1r0cfj3vzndgiarl9sb38zmpnpm4p8v9l5cm9c1m6g2q9kvpgpbs"; depends=[MASS]; }; rigr = derive2 { name="rigr"; version="1.0.4"; sha256="0x0f8a33zqid6gld2mc0k8jsmbfz2d58myr8zn7i5cr6w02lpi35"; depends=[sandwich survival]; }; riingo = derive2 { name="riingo"; version="0.3.1"; sha256="1ww9ps0v1yga9dwb68crbhf56xw2svl7az95ifrdrswyyikj02vj"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; }; - rim = derive2 { name="rim"; version="0.6.3"; sha256="0h50rwgy2lmznjx6jblc3srqvr1lp53hpvgll1krkraj45qnmkmx"; depends=[GlobalOptions knitr R6 Rcpp]; }; + rim = derive2 { name="rim"; version="0.6.4"; sha256="0i4xb56kj4w9hd5i4g42y1ml6yy3p94lsmfm5mlkwixg8f25hhwj"; depends=[GlobalOptions knitr R6 Rcpp]; }; rimu = derive2 { name="rimu"; version="0.6"; sha256="0233dxj6z87piz88v15yg7gby0vm44mqhf76944lr8z17w2rrf8m"; depends=[ggplot2 UpSetR]; }; rinat = derive2 { name="rinat"; version="0.1.9"; sha256="05vi5fggqkj64z0sndngjs7vdvxgy2j5xarccllkcrk9mbzyipvc"; depends=[curl ggplot2 httr jsonlite maps plyr sp]; }; rineq = derive2 { name="rineq"; version="0.2.3"; sha256="0z8ngd11nbi0ibc3cqg20ihzhf2gcs4w4nkbb69wnyf86fxf001w"; depends=[]; }; ring = derive2 { name="ring"; version="1.0.4"; sha256="166ma52axbmarwbzkqqcfcms9q9a4yqmsq9cqbmgpkkwm595ywij"; depends=[R6]; }; ringostat = derive2 { name="ringostat"; version="0.1.5"; sha256="1g2425jig3zhrv0vmr5nb5fqj34vcpmvbly7gc94plsv7wvgxvv3"; depends=[cli httr2 readr stringr]; }; - rintcal = derive2 { name="rintcal"; version="0.6.3"; sha256="1skmsxvf15rclpcgyr9iwa66y3h6r8vwzp0c86sdm2yy66p6gdqz"; depends=[data_table jsonlite]; }; + rintcal = derive2 { name="rintcal"; version="0.6.4"; sha256="0gc6wzmhvbmhvcxl17bhdzcms5zqvc7bl2s2jbhcqr010zignybs"; depends=[data_table jsonlite]; }; rintimg = derive2 { name="rintimg"; version="0.1.0"; sha256="0jzs4mdwpzbpl0wchyhl3cpywk25ayaxalr12p4cnjl7vnmdm7dp"; depends=[glue htmltools]; }; rintrojs = derive2 { name="rintrojs"; version="0.3.2"; sha256="19lpq421hrs1wc9bnimbwxx35p8bbzil3x1h9l28gjayn4djmjsh"; depends=[jsonlite shiny]; }; - rio = derive2 { name="rio"; version="0.5.29"; sha256="04jlrhyl0791yxwcpp1s8p1hhkljnijlc5iaxpk56h41w63k39lz"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; - rioja = derive2 { name="rioja"; version="1.0-5"; sha256="1xggjapks2hipn946r65drq45xb7shhbac56r0njh0fm4wwmdzrj"; depends=[mgcv vegan]; }; + rio = derive2 { name="rio"; version="1.0.1"; sha256="1vkvajlmp8kgmkadamy0xm885whfkwacq2jxcrshz1w8amy16k3m"; depends=[curl data_table foreign haven lifecycle R_utils readxl stringi tibble writexl]; }; + rioja = derive2 { name="rioja"; version="1.0-6"; sha256="029p70d3ih5prnjxrk60rnqnfky1xkajmq6ldf6sz8bq6idkn2d3"; depends=[mgcv vegan]; }; + ripc = derive2 { name="ripc"; version="0.2.0"; sha256="06kxi32ffg9ai0jl35mfh10vdf3p72s5vijk8aalvln39b0121g7"; depends=[countrycode dplyr httr lifecycle lubridate magrittr purrr rlang stringr tidyr]; }; ripserr = derive2 { name="ripserr"; version="0.1.1"; sha256="1rwsd1yi5vrzdscjgr27fw0d1a6nkc8g2w5hqgqijiwm25h4wl17"; depends=[Rcpp]; }; rirods = derive2 { name="rirods"; version="0.1.1"; sha256="0sgwxl0grkxb4g9mzsxshspdpciys0p5fi4kq3ihiglxrp3gl9aw"; depends=[askpass base64enc httr2 rappdirs withr]; }; rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; }; riskCommunicator = derive2 { name="riskCommunicator"; version="1.0.1"; sha256="07rfqaf5dpj0wgbz65kdxzl762w8k5a2fsfmg1g895y2i5npq6mz"; depends=[boot dplyr ggplot2 ggpubr magrittr MASS purrr rlang tidyr tidyselect]; }; riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.2"; sha256="1n2z1vhslrip209j79wm03wmwqdcnbm939sir2wfs5h2cfv126xk"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; - riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="2023.03.22"; sha256="1k75681jylvshh61vzhvszn9r5ngxwdyw47xn813jc6pm7xzrcbc"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; - riskSimul = derive2 { name="riskSimul"; version="0.1.1"; sha256="1yb2ipcqipsl92ighcpahjryir86pi59b1d3qiph7yraxbcx2909"; depends=[Runuran]; }; + riskRegression = derive2 { name="riskRegression"; version="2023.09.08"; sha256="08azk0b45vqnnhnwb64lv9brnkykj4hsbn8w5kdnvkhrpi78vw74"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava mets mvtnorm plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; + riskSimul = derive2 { name="riskSimul"; version="0.1.2"; sha256="05n5ffkjdhy799zhv7jd38am0yp3k8240z0abf73bi4mm3bw2raq"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.4.0"; sha256="1b5pjnfz6n716fn1va4kl4y3jzf48sm0i2xaxw0225vmmvq06d9g"; depends=[Matrix mlogit stringr]; }; - riskmetric = derive2 { name="riskmetric"; version="0.2.2"; sha256="0558g0hxjnb6jq9z1bq9l1d8b714f0mszsbc0l0qs4isb7m4iaw8"; depends=[backports BiocManager covr cranlogs curl devtools httr memoise pillar pkgload tibble urltools vctrs xml2]; }; + riskmetric = derive2 { name="riskmetric"; version="0.2.3"; sha256="0fsar4fklb7dy7np0dr5mzd42w3cqm80ag10zx1kk4pvm53653i6"; depends=[backports BiocManager covr cranlogs curl devtools httr memoise pillar pkgload tibble urltools vctrs xml2]; }; risks = derive2 { name="risks"; version="0.4.2"; sha256="1f28v9yqcbg2qp0xilggm61phyqcwfn9rw0vlg09wv12g3ii05xp"; depends=[bcaboot boot broom dplyr purrr rlang sandwich tibble tidyr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4.1"; sha256="11x6qga8m8xgl4hlnjsznd4sicfxc5pbi4gv27s0gnjml0f3irhg"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.4.0"; sha256="1ki3r46d73ws0gnm93llmkv42yfm0mfwvxxafnrhsdcj5kinl4ir"; depends=[]; }; ritis = derive2 { name="ritis"; version="1.0.0"; sha256="0dk1hpj2cahlw4lcdjnnllpnvdimaml57sfcw07iz2s0f8c24yrj"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; }; riverconn = derive2 { name="riverconn"; version="0.3.28"; sha256="063sjfp3p9ahfm9w5pb6p7hs4948fc57yw3i10mf5lcd6v12nxzx"; depends=[dodgr doParallel dplyr foreach igraph magrittr reshape2 rlang tidyr tidyselect]; }; - riverdist = derive2 { name="riverdist"; version="0.16.0"; sha256="1r7ya9z8bf0cdn9j1x5k6da11fil3213rxnfwddqfn9ad8gbb341"; depends=[sf]; }; - rivernet = derive2 { name="rivernet"; version="1.2.1"; sha256="0p8jyigbxipwds9pdw2gzv3ql5yikg1ik4vbk4drylbp5xhmvyja"; depends=[]; }; - riverplot = derive2 { name="riverplot"; version="0.10"; sha256="04ap1dsa7fx03l73jhv1ql3adaaaz2100qawdplxa9xmrllgcgbj"; depends=[RColorBrewer]; }; - rivnet = derive2 { name="rivnet"; version="0.3.0"; sha256="1wy5bz6iy07axqxwddjd4ppap65lm7pmyksiap95cy0a9ybqwz77"; depends=[curl elevatr OCNet raster Rcpp sf spam terra traudem]; }; + riverdist = derive2 { name="riverdist"; version="0.16.1"; sha256="0n4warz8994zln9x1k1cnqgzn9rh8768p5dw8ywc3qbc2kr10ha9"; depends=[sf]; }; + rivernet = derive2 { name="rivernet"; version="1.2.3"; sha256="197y3sv75a7wg1i7a7m5yxpsv6j5hyv0fs5anqkxbz45qhhf163z"; depends=[]; }; + rivnet = derive2 { name="rivnet"; version="0.3.2"; sha256="020167ssaw7a5fsf1snydrf1n0cr2ivqspjywzv8xc14mlhvrb8c"; depends=[curl elevatr fields OCNet raster Rcpp sf spam terra traudem]; }; rivr = derive2 { name="rivr"; version="1.2-3"; sha256="10k4cqrlzcy5g0yqbkrzxfz0dwsnf8kgmfq011lj13kxpb38bpvy"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1.1"; sha256="0wv1vpy8ql1r9ya5mfqxdj7jv5wk029g8hjjp0xqp8dm507vj11x"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-14"; sha256="1jz26x49zsjl95whlkjsr8h98j68ajv2gc7qqnxy732r0bvmsfri"; depends=[coda]; }; - rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; - rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.2.1"; sha256="1ls2zcq28yajb14g6zqdlyb4nliyq1905cpyrc8g8xv0b90k7gj6"; depends=[kableExtra knitr magrittr RJDemetra]; }; - rjdqa = derive2 { name="rjdqa"; version="0.1.1"; sha256="0d7jv3a2a7p7h6jnr5znln06x6m4mksb6cy44xdxir1pwcd1z6br"; depends=[plotrix RJDemetra XLConnect]; }; + rjdmarkdown = derive2 { name="rjdmarkdown"; version="0.2.2"; sha256="1g1r11zi8agifndlnayrh1vbz570s2x535kn89yz1llrk378v9c5"; depends=[kableExtra knitr magrittr RJDemetra]; }; + rjdqa = derive2 { name="rjdqa"; version="0.1.2"; sha256="1pxdavk9806zmc5l201ir753sngg3djm7knsl34jnjqbdys621h5"; depends=[ggdemetra plotrix RJDemetra]; }; rje = derive2 { name="rje"; version="1.12.1"; sha256="07a1wbn5ps9ygfi25fffgmrzw90izj4yk8gxb47r85x6lvqv1p0h"; depends=[]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; rjqpd = derive2 { name="rjqpd"; version="0.2.3"; sha256="14vbp9s2859h4n3m3bq830nvxvk58h3mvvdnb27qsalbcfwd94v5"; depends=[]; }; rjson = derive2 { name="rjson"; version="0.2.21"; sha256="1qm27r1w677zg31gsiln60hcciszbymkw78cnaq7s36cbk9mcawq"; depends=[]; }; rjsoncons = derive2 { name="rjsoncons"; version="1.0.0"; sha256="1y6gf9w914wnygd41iwzy0vr16c4mwacx4pjqqncd3z9h120chpr"; depends=[cpp11 jsonlite]; }; - rjstat = derive2 { name="rjstat"; version="0.4.2"; sha256="0j79svby5zzg63pks5667jvky0m5csyyrb863lpba4aprd80pig0"; depends=[checkmate jsonlite]; }; - rjtools = derive2 { name="rjtools"; version="1.0.10"; sha256="0r7q4f6xxg8dz772y4fkb2y3vkczv70m3c1kmykl2pmpdm9g09j2"; depends=[BiocManager bookdown callr cli cranlogs distill fs glue hunspell purrr rlang stringr tinytex whisker xfun yaml yesno]; }; - rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.3"; sha256="0g9wbcgj97pn2z6b9lbh10pr54c3qaam5cxghvn2ppzd8ccwkkbb"; depends=[XML]; }; + rjstat = derive2 { name="rjstat"; version="0.4.3"; sha256="1x49x3f00dv0fxnyl0kj03q6z654mv0dhzhh8cbn1r4pg5pj63ns"; depends=[checkmate jsonlite]; }; + rjtools = derive2 { name="rjtools"; version="1.0.12"; sha256="1sdyxnj4qf693cvmxjgbykamn2b69pznsgr5qsjia20pq72yzijk"; depends=[BiocManager bookdown callr cli distill fs glue here hunspell purrr rlang rmarkdown stringr tinytex whisker xfun yaml yesno]; }; + rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.2.0"; sha256="14yg801mxj0kvg3aswxvhbncs6mh63ddk0mnfawm39ycgwc19g3d"; depends=[XML]; }; rkafkajars = derive2 { name="rkafkajars"; version="1.2"; sha256="1z1rn02ymzaq3v3pz206wlm78y591xa9780fwf77i4vfq2k9pxrz"; depends=[rJava RUnit]; }; rkeops = derive2 { name="rkeops"; version="1.4.2.2"; sha256="1b2sdbhx1ar1325mf1xgc561as9x8q8vjqslly9xms2h572c8yn3"; depends=[openssl Rcpp RcppEigen RhpcBLASctl stringr]; }; rkt = derive2 { name="rkt"; version="1.6"; sha256="1sqij8ivjrrb1lii3jwvgsx9zqv47ib1lhrh6zvvh5a67didwrih"; depends=[]; }; @@ -16403,15 +16446,14 @@ in with self; { rlc = derive2 { name="rlc"; version="0.4.1"; sha256="1znx2749m9af3jq3avxf50amkhzvimr5ybwmk4g9vhwka86c3vqk"; depends=[hwriter jrc jsonlite plyr R6 stringr]; }; rlcv = derive2 { name="rlcv"; version="1.0.0"; sha256="00fz949jabbzci22yjlhc7bh4j2h44llplcrgsrbi3h97lrg7hc0"; depends=[statmod]; }; rle = derive2 { name="rle"; version="0.9.2"; sha256="0sagl0jggg40lihzy7pfq4593rfvc3b3f7g6ggi85s7n18qvwg40"; depends=[]; }; - rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; + rleafmap = derive2 { name="rleafmap"; version="0.2.1"; sha256="19ad38pqwv8ayyzb1aln9gn7rfn3gam0dbw93pl37nb9vnl81002"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-7"; sha256="0g5z26wsbv3wzrc3gl1z97qxdk5m2pvfg3f5zqkz98wzh1z49b35"; depends=[]; }; rlemon = derive2 { name="rlemon"; version="0.2.1"; sha256="0x83l5i30ppmq5mhq0qxwz5ql6qzwk02bbwdykd6hz0r9w1zl62a"; depends=[Rcpp]; }; rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; }; rlfsm = derive2 { name="rlfsm"; version="1.1.2"; sha256="0qlyz4v1966x73hx3lwv1kgk18304xfp9qm66cb9a6g8bk54xp8z"; depends=[doParallel foreach ggplot2 plyr Rcpp Rdpack reshape2 stabledist]; }; - rlibkriging = derive2 { name="rlibkriging"; version="0.8-0"; sha256="1lkj74rnl0wb7f0rgqb0zz8p1s8616h2kdz17f7j43kgf3i78hy1"; depends=[DiceKriging Rcpp RcppArmadillo]; }; - rliger = derive2 { name="rliger"; version="1.0.0"; sha256="1gqdwmy073sg48id015q02bx20xsqyc6jpbw4nym3c09cqz681dr"; depends=[cowplot doParallel dplyr FNN foreach ggplot2 ggrepel hdf5r ica irlba Matrix mclust patchwork plyr psych RANN Rcpp RcppArmadillo RcppEigen RcppProgress riverplot rlang Rtsne uwot]; }; + rliger = derive2 { name="rliger"; version="1.0.0"; sha256="1gqdwmy073sg48id015q02bx20xsqyc6jpbw4nym3c09cqz681dr"; depends=[cowplot doParallel dplyr FNN foreach ggplot2 ggrepel hdf5r ica irlba Matrix mclust patchwork plyr psych RANN Rcpp RcppArmadillo RcppEigen RcppProgress rlang Rtsne uwot]; }; rlist = derive2 { name="rlist"; version="0.4.6.2"; sha256="15q99rhbbjq8zd976yjmfnny45dd5fg2p2dv1sljg2kwi66nbppb"; depends=[data_table jsonlite XML yaml]; }; - rlistings = derive2 { name="rlistings"; version="0.2.2"; sha256="17fkpvs2ksyx06manmyv2iibs31khgbb4jlqn81gm6wr1i1rsy3l"; depends=[checkmate formatters tibble]; }; + rlistings = derive2 { name="rlistings"; version="0.2.4"; sha256="138ad4rz6cqh9m04kmv9vmr8kjwj7n9kcpnvha6sl7mawgk8y2ks"; depends=[checkmate formatters tibble]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; rlog = derive2 { name="rlog"; version="0.1.0"; sha256="0g9gjf37gly68drm8a8zcnwxcigm2djsm3angglzwd04mmlkgwpy"; depends=[]; }; @@ -16421,10 +16463,11 @@ in with self; { rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; }; rmangal = derive2 { name="rmangal"; version="2.1.3"; sha256="1sh3ggbp5f4p8jqjr7l5an32ikr4gcdll2d7gl7mqjayq497c865"; depends=[httr igraph jsonlite memoise]; }; rmapshaper = derive2 { name="rmapshaper"; version="0.5.0"; sha256="01c1sd02ws3k2dmlj964c4j5jg93x192s3brhmaw4pi4qfjzc21x"; depends=[geojsonsf jsonify readr sf sp V8]; }; - rmapzen = derive2 { name="rmapzen"; version="0.5.0"; sha256="00dv9q5yzw82hm89dzy96zj50zzhz79ps1wg7b9pz9gr6xix7xi9"; depends=[assertthat digest dplyr geojsonio httr ISOcodes jsonlite purrr sf tibble tidyr]; }; + rmapzen = derive2 { name="rmapzen"; version="0.5.1"; sha256="17nphlsck1fjkhfjbwdxzyxxn23z626wy49gpkf2jvan4lg7bb84"; depends=[assertthat digest dplyr geojsonio httr ISOcodes jsonlite purrr sf tibble tidyr]; }; rmarchingcubes = derive2 { name="rmarchingcubes"; version="0.1.3"; sha256="0cdmy728irmbd40xsc2k4r2g8am7s72ks7cw465fa92ml2xa6iq8"; depends=[Rcpp RcppArmadillo]; }; - rmargint = derive2 { name="rmargint"; version="2.0.2"; sha256="0irq5114dd8pngl6k13r2rrsivijiqfldm6mby0q5a9wrj2vmwc9"; depends=[]; }; - rmarkdown = derive2 { name="rmarkdown"; version="2.23"; sha256="09f8gfa4cfjwqb44xdr832blbgknn4ciyisvcrpyz5x51iphi3b6"; depends=[bslib evaluate fontawesome htmltools jquerylib jsonlite knitr stringr tinytex xfun yaml]; }; + rmargint = derive2 { name="rmargint"; version="2.0.3"; sha256="1z76wz067jnd8zg343gkmn4ac4zyzxyafpndkhdrrh5h33y2whjs"; depends=[]; }; + rmarkdown = derive2 { name="rmarkdown"; version="2.25"; sha256="0m814598vc67sjwk83xh9g17n72618l32dgg7fz8y0gycqk6dr06"; depends=[bslib evaluate fontawesome htmltools jquerylib jsonlite knitr stringr tinytex xfun yaml]; }; + rmass2 = derive2 { name="rmass2"; version="0.0.0.2"; sha256="0bbjqna65ldxv3wjidzv89fnsxm939scfsiba4pi54saxa7d9vqc"; depends=[]; }; rmatio = derive2 { name="rmatio"; version="0.18.0"; sha256="11aaa06rq7pz6ma194bp4j9qy1f8rzl31nk731jmacdf2yvbmn6v"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.3.5"; sha256="0rbq2b9fw1x44v7ifxp8qgp4yciinw2sw9mqp4ms5jsxznpi2pi6"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.6.0"; sha256="0p3vqhqyh4lrnlj05bdqxza2dl08nmfadsl0dg67vbr3rjzfh62k"; depends=[psych RColorBrewer]; }; @@ -16435,7 +16478,6 @@ in with self; { rmdformats = derive2 { name="rmdformats"; version="1.0.4"; sha256="00iccwxlks1y4v6m3abzkb0hcpk4cgagigzgy98xaja846lc8acz"; depends=[bookdown htmltools knitr rmarkdown]; }; rmdpartials = derive2 { name="rmdpartials"; version="0.5.8"; sha256="15dw0pk1hdif839k60swna4li04inf7fzsiq9bxbw2wk5pdkqirn"; depends=[digest knitr rlang]; }; rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; }; - rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; rmdwc = derive2 { name="rmdwc"; version="0.3.0"; sha256="0s7k54ggf0zdkkjg8k5jz2kfjpw99i59k82xqgvj7qaxvakm7vss"; depends=[knitr rstudioapi]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetalog = derive2 { name="rmetalog"; version="1.0.3"; sha256="1naqhv81gdcgl2vi2sa3nb006mn8dxc0rdc49v321a5b10bybzvr"; depends=[ggplot2 lpSolve]; }; @@ -16448,9 +16490,10 @@ in with self; { rmio = derive2 { name="rmio"; version="0.4.0"; sha256="1gkd8nkqyfpkp6nvqb7c698difak5ymih3vy6njzqd3gwdp09mhy"; depends=[bigassertr ff]; }; rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; rmoo = derive2 { name="rmoo"; version="0.2.0"; sha256="180dz1b92iswfflbciss13qn730f3nx4km194wn7vci9xghsw1mf"; depends=[GA ggplot2 plotly]; }; + rmp = derive2 { name="rmp"; version="2.1"; sha256="1y1w7grra1a5r3marm6h1xn2rk5jncanpszgn01risll9npkmzb6"; depends=[]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; - rms = derive2 { name="rms"; version="6.7-0"; sha256="1zxv7njzaxh6ivrxcszcn128pfxqyh5ga1q8kx6v5brfgv218flb"; depends=[cluster colorspace digest ggplot2 Hmisc htmlTable htmltools knitr MASS multcomp nlme polspline quantreg rpart SparseM survival]; }; - rmsb = derive2 { name="rmsb"; version="0.1.0"; sha256="1ng6c2abkw3r78l3m4k2648lmra0f6a7jy5nn8av1v1hbvisrg9n"; depends=[BH cluster digest ggplot2 Hmisc knitr loo MASS Rcpp RcppEigen RcppParallel rms rstan rstantools StanHeaders survival]; }; + rms = derive2 { name="rms"; version="6.7-1"; sha256="199xb98zxsbd8wa9g33bgrvbcpq79glnfmq060ic8f9vjw96r0qz"; depends=[cluster colorspace digest ggplot2 Hmisc htmlTable htmltools knitr MASS multcomp nlme polspline quantreg rpart SparseM survival]; }; + rmsb = derive2 { name="rmsb"; version="1.0-0"; sha256="0wzwrv9dzg228gzg39k1lfqxxmv502v4x8xhppq5ifi6zg9sp8sh"; depends=[BH cluster digest ggplot2 Hmisc knitr loo MASS Rcpp RcppEigen RcppParallel rms rstan StanHeaders survival]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; rmsfuns = derive2 { name="rmsfuns"; version="1.0.0.1"; sha256="18bpj7xh3kc7pl6ivi3cripam26bsaf9r9099cjf22qndvy18hb6"; depends=[dplyr magrittr PerformanceAnalytics purrr readr tbl2xts xts zoo]; }; rmstcompsens = derive2 { name="rmstcompsens"; version="0.1.5"; sha256="1bjwf4s5mgl60i3psdzga0nmngnx2a90j2kpf6zysd2939rirv1n"; depends=[dplyr survival]; }; @@ -16459,34 +16502,34 @@ in with self; { rmutil = derive2 { name="rmutil"; version="1.1.10"; sha256="1yd5gkg4jg3rvqrfl8c5r07lcr37n1p9h1a7b6s45iswd77dg7w1"; depends=[]; }; rmweather = derive2 { name="rmweather"; version="0.2.4"; sha256="18ajzwm0jb6wklrxp8cmifym4wn22y2rw4llhjxrc98fkis3jgk3"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble tidyr viridis]; }; rmytarget = derive2 { name="rmytarget"; version="2.4.0"; sha256="1csl5b76r706gzvzhqgg4pdznbdl4i3b0srazwa7xdfc6zbrzljp"; depends=[dplyr httr lubridate purrr stringr tidyr]; }; - rmzqc = derive2 { name="rmzqc"; version="0.5.2"; sha256="1v1xcwj170cgi0qzphvmcmb7abwv9n20gjizbsjqvx0hacj6wfxm"; depends=[jsonlite jsonvalidate knitr ontologyIndex R6 R6P rmarkdown testthat]; }; + rmzqc = derive2 { name="rmzqc"; version="0.5.3"; sha256="0w740vx4f7sbj105ybv1rvfywlbpkfr7jdkvb6j09amzxr1bg9mg"; depends=[jsonlite jsonvalidate knitr ontologyIndex R6 R6P rmarkdown testthat]; }; rnassqs = derive2 { name="rnassqs"; version="0.6.1"; sha256="00daka4pgvmipqq3151jj35fsicpfc06mnim8mm5jx5cyqcvilf7"; depends=[httr jsonlite]; }; - rnaturalearth = derive2 { name="rnaturalearth"; version="0.3.3"; sha256="0cji6hpcpkrsx615627z9dgk0zf78l2nnj3x5kkkpj9lvsm5gj6m"; depends=[httr jsonlite sf sp terra]; }; + rnaturalearth = derive2 { name="rnaturalearth"; version="0.3.4"; sha256="1lqgv2v72jgp3xrxdwh0x644jwd2ixqjqja32r3sj9dfwnpx6b65"; depends=[httr jsonlite sf sp terra]; }; rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; rnbp = derive2 { name="rnbp"; version="0.2.1"; sha256="0vphfxb262jryvvs48l21q3vxqicj51az0li38axg1mslshw0y4g"; depends=[curl httr jsonlite]; }; rncl = derive2 { name="rncl"; version="0.8.7"; sha256="0flrqz7pansy11ds23qv06bcmh6vxqljq0517v6292ibbx7nx1qx"; depends=[progress Rcpp]; }; rneos = derive2 { name="rneos"; version="0.4-0"; sha256="07b3vb0h36ilwb8iylgppl8wpi84f583frmscpj236s1aihqwrmx"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.6"; sha256="14fwf4pqdjrrbnf2s9i0dbmqk2xv0mxs3zz1j1pwnm46fiiawa2g"; depends=[]; }; - rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; + rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-3"; sha256="1ymhrfv83nr2mkqncbi7k8h43xxz53r50vp215hakh093n5im71k"; depends=[]; }; rngWELL = derive2 { name="rngWELL"; version="0.10-9"; sha256="1jyanz789ylbz9a2agqv5c674zrfqn0k7s9d5dfia63dpq8cqscr"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.5.2"; sha256="0kd7x214cqw7hzpmk1iqy1bn7j6x0ady0yz2hsdbclbq9k57d33z"; depends=[digest]; }; rnmamod = derive2 { name="rnmamod"; version="0.3.0"; sha256="1cb6f5s0m7cciwyy8pd16qf4615k2vh58lgx5mdp9mpybwnvwapx"; depends=[dplyr fdrtool gemtc ggfittext ggplot2 ggpubr ggrepel knitr MASS mcmcplots netmeta pcnetmeta R2jags reshape2 scales writexl]; }; rnn = derive2 { name="rnn"; version="1.9.0"; sha256="12js613gmmcpniq5adbmb3anqsza67m0jxk69486jv3am2vyqi5p"; depends=[attention sigmoid]; }; rnoaa = derive2 { name="rnoaa"; version="1.4.0"; sha256="15rhnvzzfdxc37j4yixp21hw5p9ijg7c0la4cyrxj57wnc1r71m1"; depends=[crul data_table dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate scales tibble tidyr tidyselect XML xml2]; }; - rnpn = derive2 { name="rnpn"; version="1.2.5"; sha256="02ka6ibdm9sbx3cffdh1lvr8555iqq3w74cs60djivp56gsvy009"; depends=[curl data_table httr jsonlite magrittr plyr raster rgdal sp tibble XML]; }; + rnpn = derive2 { name="rnpn"; version="1.2.6"; sha256="00bj78zmfwvgl8byr92n0mbzwvgn2a5k16y55n7dcrsnh8xhnir4"; depends=[curl data_table httr jsonlite magrittr plyr raster sp tibble XML]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="2.1.0"; sha256="1x0kqk060kjw84jlrbcp1z6agc5d96xy0ydfbgvh60cg9v1q8kpr"; depends=[curl ggmap ggplot2 httr jsonlite lubridate sf tibble zoo]; }; roadoi = derive2 { name="roadoi"; version="0.7.2"; sha256="1q2mkd7r5aqvahx7rrzv58nd6d13gvlw7kjidqhm7z89na94pn8w"; depends=[dplyr httr jsonlite miniUI plyr purrr rlang shiny tibble tidyr]; }; roads = derive2 { name="roads"; version="1.1.1"; sha256="0n0azkvpgiw0d649y7608izy9vp96vfbj27nr3vl6pi481w7ajcz"; depends=[data_table dplyr igraph rlang sf terra tidyselect units]; }; roahd = derive2 { name="roahd"; version="1.4.3"; sha256="089klcgxry6b8z30h1ssy024lqxqm1bz6qs2kx95qjfl8xgwlwm0"; depends=[dplyr ggplot2 magrittr plotly robustbase scales]; }; - robCompositions = derive2 { name="robCompositions"; version="2.3.1"; sha256="13m03r2mcs6srn3hk46lrjhyv5px9jyvqsqbxri1h79f31bji58b"; depends=[car cluster cvTools data_table e1071 fda fpc GGally ggfortify ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase robustHD rrcov tidyr VIM zCompositions]; }; + robCompositions = derive2 { name="robCompositions"; version="2.4.1"; sha256="1kln6b95hjx3cyr9957ga7a5p6lnafn49q3pnb7vlvcw3p0zyhrf"; depends=[cluster cvTools data_table dplyr e1071 fda fpc GGally ggfortify ggplot2 kernlab magrittr MASS mclust pls Rcpp RcppEigen reshape2 robustbase robustHD rrcov tidyr VIM zCompositions]; }; robStepSplitReg = derive2 { name="robStepSplitReg"; version="1.1.0"; sha256="04azi5pk8jpq5lcssbax8jyf1lb0g8grmxpj56kaifzp764y66wn"; depends=[cellWise glmnet Rcpp RcppArmadillo]; }; robber = derive2 { name="robber"; version="0.2.3"; sha256="1yvhd9zxs3jfz72gqz6db3xj3xpvgch6n5gy6jvwppx3xjfwxg7j"; depends=[blockmodels ggplot2 GREMLINS igraph magrittr pammtools partitions purrr]; }; - robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; + robcbi = derive2 { name="robcbi"; version="1.1-4"; sha256="17i1isd9j14qbrrp3vqslwi1iig9m10hxyhzmjkpffcm2hsjddwc"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6.1"; sha256="0gmhklk8nayhfl2zfp7mhsawryyn950gdh5lgg3vq1nkl12sc8y7"; depends=[]; }; robcp = derive2 { name="robcp"; version="0.3.7"; sha256="0v5sb8q7knzs8qb4a8cmnm6n9x52xffcjhcgirlqmgm3ix1cl3mb"; depends=[Rcpp]; }; roben = derive2 { name="roben"; version="0.1.0"; sha256="18k0h1y2xhvdssg28b9s4whn3kcbdgkz55dp1y3rrczw8xrm54mm"; depends=[glmnet Rcpp RcppArmadillo]; }; - robeth = derive2 { name="robeth"; version="2.7-7"; sha256="19sq1kakkbnikhkc688w7i6xjy9jjxl2h4ymqh1v7yqi4b6kv83n"; depends=[]; }; + robeth = derive2 { name="robeth"; version="2.7-8"; sha256="0f5j9vc1d5nzisqa54ws3l7gn3ccnxg70ybl4fnawi531ih3rw60"; depends=[]; }; robfilter = derive2 { name="robfilter"; version="4.1.3"; sha256="1r56p25c0624dxbd9lh8vbdqp69m0fzcfbzdx1kg4v0c25106ysw"; depends=[lattice MASS robustbase]; }; robflreg = derive2 { name="robflreg"; version="1.1"; sha256="03vz43phq805am0d38lyqfn969dl3fqnfivb9l46k9vbcqmdsx1y"; depends=[expm fda fda_usc fields goffda MASS mvtnorm pcaPP robustbase]; }; robin = derive2 { name="robin"; version="1.1.1"; sha256="1mvv2snvfizwxc743m8kxm3amwgb31079wjc6dlbgdah9f7fja7n"; depends=[DescTools fdatest ggplot2 gridExtra igraph Matrix networkD3 qpdf spam]; }; @@ -16512,14 +16555,14 @@ in with self; { robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; robustDA = derive2 { name="robustDA"; version="1.2"; sha256="0kxdqvv17dgnlqp0hkazwfqsg3h4g9gw1w57blwpay67xp4d1jyx"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; - robustHD = derive2 { name="robustHD"; version="0.7.4"; sha256="13g3damg8rbk08fpv2fv61dp56dbn5ka3ypqz3yy59y3bfggx2mi"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; + robustHD = derive2 { name="robustHD"; version="0.8.0"; sha256="16ihvb2v4i3ld3hx4vjkqc4fs07hnp8zi35pijcayxpp09bfk6s3"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; robustX = derive2 { name="robustX"; version="1.2-7"; sha256="0wy0fv7v03lsvzjhg5m6g331lhqsd8f1adgjw0r6bwdkkak2l2gl"; depends=[robustbase]; }; robustbase = derive2 { name="robustbase"; version="0.99-0"; sha256="0xshwfv6vq47857xfhwnlxcl1511ghn6pyjylrg39i19xhp44za3"; depends=[DEoptimR]; }; robustbetareg = derive2 { name="robustbetareg"; version="0.3.0"; sha256="09f4binbi5gcf80fhpxzrmpm2k2xf6f7rcw9g2xzmni8b4cs2l6p"; depends=[BBmisc betareg crayon Formula MASS Matrix miscTools numDeriv pracma Rmpfr robustbase rstudioapi zoo]; }; robustcov = derive2 { name="robustcov"; version="0.1"; sha256="1bgvf9h727aqfb11q976y2ybp3mpghkyd29waypyfp95csp3cf26"; depends=[caret glasso Rcpp RcppArmadillo]; }; robustfa = derive2 { name="robustfa"; version="1.1-0"; sha256="0r7ydyjg0ch1wqngzdar2bd6jh0fvfzylmxmxq97kq1k6p3gb972"; depends=[rrcov]; }; robustlm = derive2 { name="robustlm"; version="0.1.0"; sha256="17l2kr9dc3z02b2jswfxal13md4xfpz4sqjfg6kyg6ilab1cfd06"; depends=[MASS matrixStats]; }; - robustlmm = derive2 { name="robustlmm"; version="3.2-0"; sha256="0ya6lgfk58500mxs7668m93a0cypaf3bv4pmm633j2gf13fgznr1"; depends=[fastGHQuad lattice lme4 Matrix nlme Rcpp rlang robustbase xtable]; }; + robustlmm = derive2 { name="robustlmm"; version="3.2-3"; sha256="1jk4gf1066xsnnx1zsi2fz8bai3dkmyrm2dfdslrpasnmn6661d4"; depends=[fastGHQuad lattice lme4 Matrix nlme Rcpp rlang robustbase xtable]; }; robustmeta = derive2 { name="robustmeta"; version="1.1-1"; sha256="0f7qj3c01wxhcx86hwjr2gik041vjvnzg444kyn72v7b7fr3nlyz"; depends=[metafor]; }; robustrank = derive2 { name="robustrank"; version="2019.9-10"; sha256="1xikknrmnh95wpvyljdl7v510ddi1g7a88aw3l630s789nq5i02h"; depends=[kyotil]; }; robustrao = derive2 { name="robustrao"; version="1.0-5"; sha256="1r8v9qjx70s8swh09imq9kzdxg0qhnmk00zrg939mig9b12mw1p6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; @@ -16544,11 +16587,9 @@ in with self; { rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; }; rodeo = derive2 { name="rodeo"; version="0.7.7"; sha256="1cfsf6sld72bm1343p6fzpfwq7a976basf3fg5fqsj2rcx6b1q7b"; depends=[deSolve R6]; }; rofanova = derive2 { name="rofanova"; version="1.0.0"; sha256="0w8c5c5q0s2qv1b4nxgf8y1z3g0l9c6jr6i0280b5mp9in9wn8a6"; depends=[abind fda_usc Rcpp RcppArmadillo robustbase]; }; - roger = derive2 { name="roger"; version="1.4-0"; sha256="15gglqh50m69547jah7lrrlrwv6cdclkxsqlw4999mjdapwqq9f0"; depends=[]; }; - roistats = derive2 { name="roistats"; version="0.1.1"; sha256="1278cap5il85s1qls3sc0f4gqq2hi80442qidnsc6d8r3l4ba3fr"; depends=[dplyr magrittr purrr rlang tidyr]; }; - rolap = derive2 { name="rolap"; version="2.0.0"; sha256="1mixv5l6k7d9y360l4p76ah74l97azspfycz4klz1m0ls8m4c89k"; depends=[dm dplyr purrr rlang snakecase tibble tidyr tidyselect]; }; + roger = derive2 { name="roger"; version="1.5-0"; sha256="1b19wkxiw447w16239ssxv52xlxi923mhy5fnwh0v11v2nqnp9ni"; depends=[]; }; + rolap = derive2 { name="rolap"; version="2.3.0"; sha256="0n45zp3ni593qssyaxvpj2wijh6bd0naqkpj1x2fabjibka346y9"; depends=[dm dplyr purrr readr rlang snakecase tibble tidyr tidyselect]; }; roll = derive2 { name="roll"; version="1.1.6"; sha256="1crzr0kqdls08n6i3769zrxbxvh2m4hv5k3xi6ky6ps8hhicwqc9"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - rollRegres = derive2 { name="rollRegres"; version="0.1.4"; sha256="1q1xs43c860fqv5anfdv0zdb5s8n794yvhn1c7px1kdh2g0jbjp7"; depends=[checkmate Rcpp RcppArmadillo]; }; rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; }; rolldown = derive2 { name="rolldown"; version="0.1"; sha256="1awr8lcxz7y9mjhia4p85jvixc72gj525gk2jjl13njgq6shp0b5"; depends=[bookdown htmltools jsonlite]; }; rollinglda = derive2 { name="rollinglda"; version="0.1.2"; sha256="09809fs1lykwhird1sl832fbqa9p7850apj7rmb740rxaa27p6wv"; depends=[checkmate data_table ldaPrototype lubridate tosca]; }; @@ -16557,8 +16598,8 @@ in with self; { rolocISCCNBS = derive2 { name="rolocISCCNBS"; version="0.1"; sha256="100jh5m2c1zp5wg3wd4y2i47dzx1j0g6lfwyqmwk4bz99yzzz5am"; depends=[colorspace roloc]; }; rolog = derive2 { name="rolog"; version="0.9.14"; sha256="0pkyw5222a68m5mhljddkdvrln15mzqfrjxdgx085mn7f9wj51ax"; depends=[Rcpp rswipl]; }; rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; }; - romic = derive2 { name="romic"; version="1.1.1"; sha256="0vqkizgk7dii5vdcmwmaj1i911xywqqj37qz34zi8phjg4hgy473"; depends=[checkmate dplyr ggplot2 glue purrr readr reshape2 rlang shiny stringr tibble tidyr]; }; - rootSolve = derive2 { name="rootSolve"; version="1.8.2.3"; sha256="182bb727sgqi5f3pzmw8jnn328wdjrgj9lfvg49gv8s22rjd3cxm"; depends=[]; }; + romic = derive2 { name="romic"; version="1.1.3"; sha256="0gaiysrg6f0xriphkbkmxvwrp3hk3spg26wlprw7lmi72k81mmaj"; depends=[checkmate cli dplyr ggplot2 glue purrr readr reshape2 rlang shiny stringr tibble tidyr]; }; + rootSolve = derive2 { name="rootSolve"; version="1.8.2.4"; sha256="0p9qmn82bg0ks9hmh2dkygnzhxcnp5z8z8b8aq52w6clliz32sp1"; depends=[]; }; rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; @@ -16574,9 +16615,9 @@ in with self; { rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; }; rosetta = derive2 { name="rosetta"; version="0.3.12"; sha256="0x0hdfhrldc2k72498wzvkxwyj3rk5sxi1xabn66kwswhqgbc564"; depends=[car ggplot2 ggrepel gridExtra kableExtra knitr lavaan lme4 lmerTest multcompView pander plyr psych pwr rmdpartials sjstats ufs]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.14.4"; sha256="166p3dvib0xpvhkb92b3imassv1b9mrblz2m05jai2nzlz0q7hzk"; depends=[httr jsonlite]; }; - rosm = derive2 { name="rosm"; version="0.2.6"; sha256="11nl3602f3wfccwayjd0a3kqs2lyfb09clccvhvalsp0di7ndbhh"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; + rosm = derive2 { name="rosm"; version="0.3.0"; sha256="022f564d0qh3rivp6sxak4amib7c17m383vlfvac0vi0y4x49hf3"; depends=[curl glue jpeg png progress rlang wk]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; - rotasym = derive2 { name="rotasym"; version="1.1.4"; sha256="08xprp6jmf91lvg3y6wh9mdrxpv0vv9aqynlch842294fy0wzgl1"; depends=[Rcpp RcppArmadillo]; }; + rotasym = derive2 { name="rotasym"; version="1.1.5"; sha256="04vmxfj7jwd6h1d5ns4hq8xbc4sm008vsyiw5jlp212a4fdrplaj"; depends=[Rcpp RcppArmadillo]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.6.4"; sha256="19d7filrgwm25cklbpjr082cn0h991xa5lvrijjl59whan4axjkg"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; }; rotatogram = derive2 { name="rotatogram"; version="0.1.3"; sha256="0y1kw8cjvdbdr9ghs7xb9wgj5g9h3nc0q36vxmz8jzjfh4lib68c"; depends=[ggplot2]; }; @@ -16584,25 +16625,26 @@ in with self; { rotor = derive2 { name="rotor"; version="0.3.7"; sha256="02mzcwd94hykysz3cv0q3dlhbbd4k3rm1di7dcw6m4masgzy05zb"; depends=[dint R6]; }; roughnet = derive2 { name="roughnet"; version="1.0.1"; sha256="1brl1zwmmczbismgvbq2m1i1n1v85m410z2ap6r7jqxpfn111kis"; depends=[graphlayouts htmlwidgets igraph jsonlite]; }; roughsf = derive2 { name="roughsf"; version="1.0.0"; sha256="0am4yd168pss53p8869akx4bnw95d3k30fbv17pml8y9iriq6zs5"; depends=[htmlwidgets jsonlite sf]; }; - round = derive2 { name="round"; version="0.20-0"; sha256="1c403i57fwfh3pz6ksg5ws2fydq8zf2fk4x6r9d0xqn0fs7px7j4"; depends=[]; }; + round = derive2 { name="round"; version="0.21-0"; sha256="1c3hp4lh18q1h0sk0j6vgj659f6hv5bgliypzhra6zxgs8w41953"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.2"; sha256="0xx2wai9pdq0g7x8xmwlf48wxv4v18c7ymzvzxpvw1gggppmbk69"; depends=[]; }; roundyh = derive2 { name="roundyh"; version="0.1.0"; sha256="06x97gnc06ib0qkygs8fznxx7pm52bpr778x1pypl8frmkj4sa0g"; depends=[]; }; routr = derive2 { name="routr"; version="0.4.1"; sha256="0sqllafwxqlkf8bl5nc3fpf17aqg5nbimrmc8l3z95y3gwhnqhkb"; depends=[assertthat digest R6 reqres stringi uuid]; }; roxut = derive2 { name="roxut"; version="0.4.0"; sha256="1ciflhmavl24wk4kjbilmm70q6z8i02m36x4pyh4m3czhnpyyv03"; depends=[roxygen2]; }; roxygen2 = derive2 { name="roxygen2"; version="7.2.3"; sha256="1nhn0jhnxzlyqx0qnpd7k7q3azzngyn0j4zs8awmlmyjfywzli6q"; depends=[brew cli commonmark cpp11 desc knitr pkgload purrr R6 rlang stringi stringr withr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; + roxyglobals = derive2 { name="roxyglobals"; version="1.0.0"; sha256="0gsmljh3qf3lgjl7cdh4kayrfjyrcmsrjdmc0y2s5fs21aaj515k"; depends=[brio codetools desc roxygen2]; }; roxytest = derive2 { name="roxytest"; version="0.0.2"; sha256="17cxhdlywng6nky6c5m49yjs2pgrs1jqrzw6rj8kb6cp2zssclas"; depends=[roxygen2]; }; rpact = derive2 { name="rpact"; version="3.4.0"; sha256="0x1np14hvgj9h8spy50j8c8kaxi097asf10vs450fz23acpi8zj4"; depends=[knitr Rcpp rlang]; }; rpaleoclim = derive2 { name="rpaleoclim"; version="1.0.1"; sha256="1fqlqs8l18dy5l24hzyj19hdk6yaxmd25g56hg1c6cm677z1xcli"; depends=[curl fs rlang terra]; }; rpanel = derive2 { name="rpanel"; version="1.1-5.2"; sha256="0b9r458dx65p1s0az14s3bhyh5isqx5ax9dblpsxxm6i9jcnx8f9"; depends=[]; }; - rpart = derive2 { name="rpart"; version="4.1.19"; sha256="0rcm4hk2k0ag9qmb0f933yqrq8jpnclwrzp6825swgsqnp83wwpy"; depends=[]; }; + rpart = derive2 { name="rpart"; version="4.1.21"; sha256="0av28n5as53qrxm41hcrwv59qdv7gfli668q32z0a5r1bdkiqz77"; depends=[]; }; rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.2"; sha256="1v1arv5b02n0jvyifb5km9w3z3wxg9x9g3g4xck4s319z5g6lp7n"; depends=[Rcpp rpart]; }; rpart_plot = derive2 { name="rpart.plot"; version="3.1.1"; sha256="0k826fr6zvx4kbxlxg5347aj3y1qv68s04h9s6b1mwld0m064wrh"; depends=[rpart]; }; rpartScore = derive2 { name="rpartScore"; version="1.0-2"; sha256="0vr93jgb2x3zzzbf0b3bbbb4mc0lvjicqbl5sv6z3wxjsjwl8jsl"; depends=[MASS rpart]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; - rpdo = derive2 { name="rpdo"; version="0.3.1"; sha256="0yhg858i5a6s68000a74l4gldycbfmcwcvkk5zhjqzpxzdm7pqb2"; depends=[chk lifecycle]; }; - rpf = derive2 { name="rpf"; version="1.0.11"; sha256="1yr1i7kswq57mcxv05lh7bvbicz1djqxcl6f13dlgsf3ww56gzg1"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; - rphylopic = derive2 { name="rphylopic"; version="1.1.1"; sha256="1d4kvaxki7pxsv8886jy4c5hls42qn1jyzd29h3llmh0mgj887gd"; depends=[curl ggplot2 grImport2 httr jsonlite lifecycle pbapply png rsvg]; }; + rpdo = derive2 { name="rpdo"; version="0.3.2"; sha256="0sh52y7hmnm9qhyp0m6vp3c23wzz3ds8j577z105s6f3pdf398l0"; depends=[chk lifecycle]; }; + rpf = derive2 { name="rpf"; version="1.0.14"; sha256="15pp6fdqxngsmcibxfzv72g25q3ww3hrazsl4c5fgi0fh450kfz4"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; + rphylopic = derive2 { name="rphylopic"; version="1.2.1"; sha256="0b33ixhlwh3lkm01sh5isrirj5dlff04szdb2hmjyipgmfa0w1k4"; depends=[curl ggplot2 grImport2 httr jsonlite knitr lifecycle pbapply png rsvg]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-9"; sha256="0bmxn578z1arjical1xhzy7ib32ys7p8wkmrjw1b66islwi4b79k"; depends=[xtable]; }; @@ -16613,8 +16655,8 @@ in with self; { rpms = derive2 { name="rpms"; version="0.5.1"; sha256="1y686da4ylv403gbfx43yaa2i2zdcgdv9p1zmlq05dvbkjkvlvw9"; depends=[Rcpp RcppArmadillo]; }; rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; }; rportfolio = derive2 { name="rportfolio"; version="0.0.3"; sha256="1pj08qz1qmdcyxp629lyfggbgzr36wrjir0fj6hpgf5zm588bqiy"; depends=[xts zoo]; }; - rpostgis = derive2 { name="rpostgis"; version="1.4.4"; sha256="1x5s6wayvxmrg84j700kq8zvqsksxglwlfaanpipgqf2sjhr52vj"; depends=[DBI raster rgeos RPostgreSQL sp]; }; - rpql = derive2 { name="rpql"; version="0.8"; sha256="0iljs08pjnk4b08mgryzn70rxva723bk1hi3wyizx05lls2n8ly7"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; + rpostgis = derive2 { name="rpostgis"; version="1.5.0"; sha256="1m7xhib3nbngqa2vnygnyp5m502wn3r3yyfp08grsz8xi8ipbcgz"; depends=[DBI purrr raster RPostgreSQL sf sp terra]; }; + rpql = derive2 { name="rpql"; version="0.8.1"; sha256="065mkdfrhs7jmkwyvkydic04snih1wb18xshddll1r5kam4ixvn2"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; rpredictit = derive2 { name="rpredictit"; version="0.1.0"; sha256="0azq75fhjadchc4pxgs4pccpvskc508zhggxxb7ab012nysap027"; depends=[dplyr DT dygraphs httr jsonlite magrittr quantmod shiny xts]; }; rprev = derive2 { name="rprev"; version="1.0.5"; sha256="0494z0049rxahs4ndjlclzfc65k304a1m01cdlhjg4rz1gc1vrr8"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; rprime = derive2 { name="rprime"; version="0.1.2"; sha256="1h54vclc800pir3vxqcq4cmmxy9fcar1fydqmba2dzpj8dvlad7v"; depends=[assertthat plyr stringi stringr]; }; @@ -16625,12 +16667,12 @@ in with self; { rpsftm = derive2 { name="rpsftm"; version="1.2.7"; sha256="0ncf9ci39pd7p048cgvhl6phhk975xwyjm4aqs1b4hjy1nml4iz2"; depends=[ggplot2 survival]; }; rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpyANTs = derive2 { name="rpyANTs"; version="0.0.2"; sha256="12m5vrvlrlwmxh26xqpzrs5ghl2rjqikvnjglr40ys9jyy9vxj24"; depends=[reticulate rpymat]; }; - rpymat = derive2 { name="rpymat"; version="0.1.6"; sha256="1gv7xfpjqpzhpbxx82yvbiglgxhgy8r5arqflqhip4il7vljyjki"; depends=[fastmap glue IRkernel jsonlite rappdirs reticulate rstudioapi]; }; - rqPen = derive2 { name="rqPen"; version="3.2"; sha256="1afycbk4k9smziax20qfray9pa1gcgq17px0y2i1cc9i05q164dp"; depends=[data_table hqreg hrqglas lifecycle plyr quantreg Rdpack]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.3.1"; sha256="1ml83gw9m9945qws2pi0x3bzm1jn4rh8n7zwivbir685hfprbhvn"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.4.9"; sha256="12m80vr2sxm2ivvd1a27jy6vh9xvk5z4irlkaxm1f0sxi462brra"; depends=[wrapr]; }; + rpymat = derive2 { name="rpymat"; version="0.1.7"; sha256="0zrq4j0xw4blv9bsdrnkf0wb61bsm1lrlh92a2qw8p3daa48833q"; depends=[fastmap glue IRkernel jsonlite rappdirs reticulate rstudioapi]; }; + rqPen = derive2 { name="rqPen"; version="3.2.1"; sha256="0548mwir8lpp4sw1dk62pja45d92mf0i1prz2r7gxwqmm3fwcphh"; depends=[data_table hqreg hrqglas lifecycle plyr quantreg Rdpack]; }; + rqdatatable = derive2 { name="rqdatatable"; version="1.3.3"; sha256="08bjhfay2n58zsa19r81b8884zahdxi1rylhs4a241sqc0zmns23"; depends=[data_table rquery wrapr]; }; + rquery = derive2 { name="rquery"; version="1.4.99"; sha256="0540xw33wxk4w73s234pc0ss6vffzdkz7wqlca67im9h4sph19y3"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4.1"; sha256="0l5ndcpnd3ib83vwh5bs83nvjr4in3v2kbqq8q4y9x90nrxaz901"; depends=[arm coda magic MASS]; }; - rr2 = derive2 { name="rr2"; version="1.1.0"; sha256="1nbjai514zrv5j9w52x59inf9fqy0c7r1ijrr1d3xirkvk8c70mi"; depends=[ape lme4 Matrix nlme phylolm phyr]; }; + rr2 = derive2 { name="rr2"; version="1.1.1"; sha256="0c80zl8qyfd4fdvxp381vixfr8q2dxzn2j7siqawf0dbbvxpdr73"; depends=[ape lme4 Matrix nlme phylolm phyr]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.2"; sha256="1zxd8nvnrzc2akiaigjp6myyq8lkcyi46rrqgxrvd4wmi0zmw3w6"; depends=[]; }; rrMixture = derive2 { name="rrMixture"; version="0.1-2"; sha256="0bh63v9zis8w3ylvbc99iy2hx0wn6302d49bhcw3wr7wmbzvdi8s"; depends=[gtools MASS Matrix matrixcalc Rcpp RcppArmadillo]; }; rrandvec = derive2 { name="rrandvec"; version="1.0.0"; sha256="0n92wm95xjng2j93a055mliph2cmialmcpm9b45jf75zqdhzizp5"; depends=[checkmate Rcpp]; }; @@ -16647,7 +16689,7 @@ in with self; { rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; - rrnni = derive2 { name="rrnni"; version="0.1.0"; sha256="0s6agfka683awsrvnfgc93vk3f3n5m8lzskf5dn8i2jxgkb3l82d"; depends=[ape]; }; + rrnni = derive2 { name="rrnni"; version="0.1.1"; sha256="01rrqvc920rwjiqrznf4ggs74zg099zgsalzws4v9hwwx77rqy0q"; depends=[ape]; }; rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; rrpack = derive2 { name="rrpack"; version="0.1-13"; sha256="0h9m2gsi16zxdhff02fxa6r4kw32m7vs3y6ikwpczhlnxd0d0qjy"; depends=[ggplot2 glmnet MASS Rcpp RcppArmadillo]; }; rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; }; @@ -16655,30 +16697,30 @@ in with self; { rrtable = derive2 { name="rrtable"; version="0.3.0"; sha256="1y1hfscnw466azxk1c2kpa486xn8561zl5inv7yk5q8926ls2zc3"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsae = derive2 { name="rsae"; version="0.2"; sha256="0gi7igaymsikxx73dw3ak9pg2vhlvcz5xlbxz8clfxy1d66g58hd"; depends=[]; }; - rsample = derive2 { name="rsample"; version="1.1.1"; sha256="1fmqfk1yihmh7lkszsf7pvn6zf67lpgff46hv2lpnfbssa3axllh"; depends=[dplyr furrr generics glue pillar purrr rlang slider tibble tidyr tidyselect vctrs]; }; - rsatscan = derive2 { name="rsatscan"; version="1.0.5"; sha256="1schyzs5i4af9q27hi7lfdphaan5962sm2wwjn7bin3vqaara6gc"; depends=[foreign]; }; + rsample = derive2 { name="rsample"; version="1.2.0"; sha256="1vayyj6cijq1ag9r7fpcjfzrgkqhb4zxgajz78hz8dq01q3bgjg0"; depends=[cli dplyr furrr generics glue lifecycle pillar purrr rlang slider tibble tidyr tidyselect vctrs]; }; + rsatscan = derive2 { name="rsatscan"; version="1.0.6"; sha256="19jizazyba32cdz5n65mmr7k4wgv04hxz92z0lrmkqarjci863m9"; depends=[foreign]; }; rsbp = derive2 { name="rsbp"; version="0.1.0"; sha256="0aardngvj9apn8q5vhfpv67rf7d5iqb7xdq7rh8xmgr8341fvbgc"; depends=[dplyr lubridate magrittr purrr reshape2 tibble tidyr xml2]; }; - rscala = derive2 { name="rscala"; version="3.2.21"; sha256="1607nsfyvksv5ylxc5ma2cz8z0njysfyvyw085fkjb28ybfg6zjg"; depends=[]; }; rscc = derive2 { name="rscc"; version="0.2.1"; sha256="10srbalj8i67z30amvf08zfa4hs6phvq17kfgys9ihwaknckcyx3"; depends=[crayon formatR highlight igraph tm]; }; - rsconnect = derive2 { name="rsconnect"; version="1.0.1"; sha256="0yh86jikj3b8khd6n0rc5cx5cmlhms625lcvh79s5pgb2gz81l2h"; depends=[cli curl digest jsonlite lifecycle openssl packrat renv rlang rstudioapi yaml]; }; + rsconnect = derive2 { name="rsconnect"; version="1.1.1"; sha256="1v88ary1gbrhmcbr2syq4jh7ln5ldd9b6pdh508bwxnkivqfdg3p"; depends=[cli curl digest jsonlite lifecycle openssl packrat renv rlang rstudioapi yaml]; }; rscontract = derive2 { name="rscontract"; version="0.1.2"; sha256="0gn0xcvg9nj6m97g4si6bgmgaj6hxpicz8yig7n84jnczh6w510x"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; rscorecard = derive2 { name="rscorecard"; version="0.26.0"; sha256="0l0xx5q93na2fbl1gb11mv4xd514jmkhz95w4054pdmrq6smdc97"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr]; }; rsdNE = derive2 { name="rsdNE"; version="1.1.0"; sha256="0xjnkg009m51zfwih1rpgwch8bs7vvri0x4skrikzx3nvlszcjh3"; depends=[]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-22"; sha256="067mx424qvl9xskcd5r5i3dp92mwjcc8xpd9kd1y0yjbax0dkcg9"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.6-2"; sha256="0l2n4niip9l79m1zvknlm7k203zgr7cdz7rc8qisc3w0gh2nsjch"; depends=[httr plyr R6 XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.6-3"; sha256="0axy02p6kh67sc1nqp67sa1i2n3r24j1cdd3lczxzfkxms0qznc7"; depends=[httr plyr R6 XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; - rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; }; + rsem = derive2 { name="rsem"; version="0.5.1"; sha256="1rzfshfmhicpm45xmmsbns1qkb9p7m5mj0nwcnl7arlmlik4jn4p"; depends=[lavaan MASS]; }; rsetse = derive2 { name="rsetse"; version="0.5.0"; sha256="095f37a48l9dhz5s3zri6y1kv74x150wrrxinrh177mi3m63shgr"; depends=[dplyr igraph magrittr Matrix minpack_lm purrr rlang tibble]; }; rsf = derive2 { name="rsf"; version="0.3.0"; sha256="0vlnmqj6if2d8m4frdyarc985s73zapsj74rjv1nv074z422l2ci"; depends=[bookdown gert here knitr magrittr renv rlang usethis yaml ymlthis]; }; - rshift = derive2 { name="rshift"; version="2.2.0"; sha256="1la9qbpm64w34ngp1kn0diq519yjqxwxlpw92cnz070ms42v33va"; depends=[dplyr ggplot2 magrittr tibble]; }; + rsgeo = derive2 { name="rsgeo"; version="0.1.6"; sha256="04mv8ifl1k2vqacglw0j41j96l9ls8khiligjhk499c5zg4aadip"; depends=[rlang vctrs]; }; + rshift = derive2 { name="rshift"; version="3.0.0"; sha256="0w82dqya4qmcdpin1d7pg2cri69qjsm1qhjn2gfpbs6wkd7m7mic"; depends=[dplyr ggplot2 tibble]; }; rsimsum = derive2 { name="rsimsum"; version="0.11.3"; sha256="1pncp138ch69pb21lks8ziwhn2vhb5y812g2i9zfpdmfnprhg2d6"; depends=[checkmate generics ggplot2 ggridges knitr lifecycle rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.4"; sha256="1la3apypp1kk425r753vqwm3nk9zmynp9gix6db0ckkssw0fjxpw"; depends=[berryFunctions rstudioapi]; }; - rsleep = derive2 { name="rsleep"; version="1.0.8"; sha256="0ygga49kbmmlhbvbjn41abx00fi9zhsnri3j0w2hsk2yjcm3hr68"; depends=[abind edfReader ggplot2 jsonlite psd signal xml2]; }; + rsleep = derive2 { name="rsleep"; version="1.0.9"; sha256="1yrpshyfjyp02qc8qys9h7sv0q6dvq7sj4jccwk5v9q69wpgdgzq"; depends=[abind edfReader ggplot2 jsonlite psd signal xml2]; }; rslp = derive2 { name="rslp"; version="0.2.0"; sha256="186k1gngirqhvhii4ysq77wjf5gf75c7gya73minb0pfg9fn16l7"; depends=[magrittr plyr stringi stringr tokenizers]; }; rslurm = derive2 { name="rslurm"; version="0.6.2"; sha256="0z5lyrkvfh2201sc772gzbz3hc1mc04pxww611iwjf6qwzn5h0al"; depends=[whisker]; }; - rsm = derive2 { name="rsm"; version="2.10.3"; sha256="1dcjsn3wa7rqdpixh37vjgk3z5siwlyn70qffp49m3awn258hwpg"; depends=[estimability]; }; + rsm = derive2 { name="rsm"; version="2.10.4"; sha256="1bh2kp0j10zsrkhv9ylghbi9cyrj4q6crbngv9pk0kkby2r4am2h"; depends=[estimability]; }; rsmatch = derive2 { name="rsmatch"; version="0.2.0"; sha256="1cfm4wqxdqrfkgyh370qjf10b9ddpbhq8w2f0vrz95nbsh0llgw9"; depends=[dplyr MASS Matrix]; }; rsmatrix = derive2 { name="rsmatrix"; version="0.2.6"; sha256="08d2qxwkfb3blqdzjq98b42jj6bv0n5dzmk8aqzy1mh8rr9jkps2"; depends=[Matrix]; }; rsnell = derive2 { name="rsnell"; version="0.1"; sha256="0syz4d761sfka7ykg574sdzp3gi781m6xzz2m1d0yfmb1hl2d2xz"; depends=[dplyr tibble tidyr tidyselect]; }; @@ -16691,13 +16733,13 @@ in with self; { rspm = derive2 { name="rspm"; version="0.4.0"; sha256="0qjjl5k0lfzdwvqa4mjpqp2dkrg5r2gpmninyazaspsdqcydl394"; depends=[]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; rsprite2 = derive2 { name="rsprite2"; version="0.2.1"; sha256="1j1v9d5h2p9574zsl8gi4lkmq1yblklmpd40fd19bw1p67fqhpm0"; depends=[checkmate Rdpack]; }; - rsq = derive2 { name="rsq"; version="2.5"; sha256="1r628srxhhf7b51lnj4qrzgbqajkm0ls47a9rzjkvmfq4ax5i73f"; depends=[Deriv lme4 MASS Matrix nlme]; }; - rstac = derive2 { name="rstac"; version="0.9.2-4"; sha256="0jimlrzw7mcsndd9qlzmk5yx0frhmxgbfmj625xj9fxc707dn2n5"; depends=[crayon httr jsonlite lifecycle magrittr]; }; - rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; + rsq = derive2 { name="rsq"; version="2.6"; sha256="01b9rl2ng1sq0ibpfsf50agkwh01pfpw354vvgdjd0lzh9dxmsgp"; depends=[deming Deriv lme4 MASS Matrix nlme]; }; + rstac = derive2 { name="rstac"; version="0.9.2-5"; sha256="06wq2ck99i4fg6jli04968nqzjh9z8sb18yn2d734gibxf229a42"; depends=[crayon httr jsonlite lifecycle magrittr]; }; + rstack = derive2 { name="rstack"; version="1.0.1"; sha256="070wnq0h68kknjlkdas1pi1j1mc1q5dpmz9hffnldy9rk8igvbix"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; - rstan = derive2 { name="rstan"; version="2.21.8"; sha256="0xah8wl4lg8zh5982m20ipc6cjck1dsfi8lz1jbkg4212p1yvm5j"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen RcppParallel StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.21.4"; sha256="11diz486ak31zx5402kra3s6nd76cvnla8frfn0kc7dzwhiwcspc"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; - rstanemax = derive2 { name="rstanemax"; version="0.1.4"; sha256="1hrrzr3xz0lr6d0pykrizfnb1f9g4hp9hjyaiqpcdzdqd53zxrcx"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; + rstan = derive2 { name="rstan"; version="2.32.3"; sha256="17alp92kj9mnlkzplk7zd83sv2zi2h7yc44fx5f7nz3dpwd9x7d2"; depends=[BH ggplot2 gridExtra inline loo pkgbuild QuickJSR Rcpp RcppEigen RcppParallel StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.26.1"; sha256="0i24ah6mcvvb25pkynkacjn1l7dqk3yfnyk42fv32n83dqnpjm2a"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme posterior Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; + rstanemax = derive2 { name="rstanemax"; version="0.1.5"; sha256="0n15dw6bz7g5j5dng32zna1r4p4ywkmspc82q1b3lcg3zbjmda3f"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="2.3.1.1"; sha256="0bp20jcdbscsm3s4ik86k3hfsdwkj2k6yzj41zwd0q8lq5afwq7j"; depends=[desc Rcpp RcppParallel]; }; rstatix = derive2 { name="rstatix"; version="0.7.2"; sha256="1891a976k2qjrh1vkzfg8icxblxa978wbazg7mqq8pcw3nmzbip0"; depends=[broom car corrplot dplyr generics magrittr purrr rlang tibble tidyr tidyselect]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; }; @@ -16708,18 +16750,18 @@ in with self; { rstudioapi = derive2 { name="rstudioapi"; version="0.15.0"; sha256="1kvc870gx02cpb800zjvdrhfhyfpzgkydgw2g7kxdlrpr8fwhnwk"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="1.1"; sha256="16glxyv6aja7j0vfjccfi8w84wzm2ajfl62l0g5vpl73j7cs6gnk"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; - rsurveycto = derive2 { name="rsurveycto"; version="0.1.4"; sha256="0716zzmfq3an83vij996cnbddmw28yvl1mmmha53f3xpvn109qyn"; depends=[checkmate cli curl data_table glue httr jsonlite rlang withr]; }; + rsurveycto = derive2 { name="rsurveycto"; version="0.1.6"; sha256="1w9xg2qcgqachc8y24vqxgw701si5g9qb5ps68lrn4w33hbywzjl"; depends=[checkmate cli curl data_table glue httr jsonlite rlang withr]; }; rsvd = derive2 { name="rsvd"; version="1.0.5"; sha256="07p2hjmpcwcsang8z9sjkpy94rydcin7m3hyvcgzgm5cd6w8c1p4"; depends=[Matrix]; }; rsvddpd = derive2 { name="rsvddpd"; version="1.0.0"; sha256="0p2cpv3ipkvl27zhncpcyxp6lqw54ncdnxyk659qc24l0fqbw7dc"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; - rsvg = derive2 { name="rsvg"; version="2.4.0"; sha256="1schf5gfqzvwmaigdsic5va9bbk9ycvcisiyll8xjjw116y9cxyb"; depends=[]; }; - rswipl = derive2 { name="rswipl"; version="9.1.12"; sha256="0f3w6gwjklmb1wcjylslzwrplkp7yg0s7x54id8q1053142kkg29"; depends=[Rcpp]; }; - rsyncrosim = derive2 { name="rsyncrosim"; version="1.4.2"; sha256="15l1g71zq18b2j6dxwdbrcw8x2nkjgijr3zp906xx8g76p6n1hi6"; depends=[DBI gtools lifecycle raster RSQLite]; }; + rsvg = derive2 { name="rsvg"; version="2.6.0"; sha256="0w29isj7n33vwacvk5h6ghgm9j3phghnz7a98b1xi60cyk08qi2b"; depends=[]; }; + rswipl = derive2 { name="rswipl"; version="9.1.17"; sha256="1933ag3wzch7qlpp2rfbxdqkx4p0h5znq6v5qh4kifh94v72pl13"; depends=[Rcpp]; }; + rsyncrosim = derive2 { name="rsyncrosim"; version="1.4.9"; sha256="1px8az162hiz5615x49m67y1ymcqla5cbnz5q7n13fahl8z6hrm1"; depends=[DBI gtools lifecycle RSQLite terra]; }; rsyntax = derive2 { name="rsyntax"; version="0.1.4"; sha256="0bmi0qc535scdzrdr9sxnigby5ynw9dk95f99p55plc506z3pfya"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.3"; sha256="1wslqvc8d49qz13vixfb8pqinb5p1k0w297wvflslhfkk5rx98x4"; depends=[]; }; rt = derive2 { name="rt"; version="1.1.0"; sha256="1wwx3pjwsqvar25cddc4090vcngir81a7n9yiv4q8i47h58xmc2g"; depends=[httr stringr]; }; rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; }; rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; }; - rtables = derive2 { name="rtables"; version="0.6.1"; sha256="1fnm5nnm79zn00fpkapbpc948a44yj2gy893gii2617rlgzca88v"; depends=[formatters htmltools magrittr]; }; + rtables = derive2 { name="rtables"; version="0.6.3"; sha256="04s3g436xgnn0j74mkp7j16klrarpw2pq5gqx10n76r554r3j6m5"; depends=[formatters htmltools magrittr]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; rtdists = derive2 { name="rtdists"; version="0.11-5"; sha256="1v8yhyvliw3dm3ciwxxaa9spfw05wp334l7gmvgv20mab2kjxkwp"; depends=[evd gsl msm Rcpp]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; @@ -16743,40 +16785,42 @@ in with self; { rtodoist = derive2 { name="rtodoist"; version="0.1.0"; sha256="12lh14ps4snlyykhc65nvn8ipic8is8ssmgcx73snmifhrzxgdyb"; depends=[digest dplyr getPass glue httr keyring magrittr purrr]; }; rtoot = derive2 { name="rtoot"; version="0.3.2"; sha256="1ifqx2q7ial6qsidgkm8jqgy762s27scdl5m6dgi13v5yzi01xjj"; depends=[clipr curl dplyr httr jsonlite tibble]; }; rtop = derive2 { name="rtop"; version="0.6-6"; sha256="0s5kqz7ah5182k5j1r72hqrv05mlns8b67m57a0mn9gfzjhval6p"; depends=[gstat sf sp units]; }; - rtrek = derive2 { name="rtrek"; version="0.3.3"; sha256="1lnjwslx1l0vgysw3m1s83h246grplmv4mdk4m6ym83mrdmkzvhi"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; + rtrek = derive2 { name="rtrek"; version="0.4.0"; sha256="0w5726mjy8yf9h1kk3snqc4rqbg6b55ybvkbk5xqnp5iarnsd7v4"; depends=[downloader dplyr ggplot2 jpeg jsonlite memoise purrr rvest tibble tidyr xml2]; }; rtrend = derive2 { name="rtrend"; version="0.1.4"; sha256="1l5vlqjxsgin0pjr4gfdf1ba0zapzjs7c4j4mrjpb8p4hvk3wgzz"; depends=[boot fftwtools lubridate magrittr matrixStats plyr Rcpp RcppArmadillo terra]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rtry = derive2 { name="rtry"; version="1.1.0"; sha256="00a9sm08il7g0hq62jxsfib8952wdlkrhlrljnxahmaixghn7hww"; depends=[curl data_table dplyr jsonlite magrittr tidyr]; }; - rts = derive2 { name="rts"; version="1.1-8"; sha256="17ghnpbmnjk7gmnir1897w8ib1dmyw59f23nj85g7k0pji3p8psb"; depends=[raster RCurl sp terra xts zoo]; }; + rts = derive2 { name="rts"; version="1.1-14"; sha256="07rnpn8bz9r7p6xymzmbynrg2xq8wfpzh50j7i578v6rmyhm2fl8"; depends=[raster RCurl terra xts zoo]; }; rts2 = derive2 { name="rts2"; version="0.5"; sha256="0iv2mn4w3agqd921sf44rq6plwcrb4sxazyf455nysdmjbcbsc86"; depends=[BH lubridate R6 Rcpp RcppEigen RcppParallel rstan rstantools sf StanHeaders]; }; - rtsdata = derive2 { name="rtsdata"; version="0.1.3"; sha256="0ylw8m0wf6jvjl3zirns6qk71lwsrljnvz5dn1ngvp7c1x7y1wn9"; depends=[anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; + rtsdata = derive2 { name="rtsdata"; version="0.1.4"; sha256="0djw6qp6jdkz4r0j5dzjql2rhap4syl7psdglgd9razv5vzqmn6c"; depends=[anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; - rtsplot = derive2 { name="rtsplot"; version="0.1.4"; sha256="1zgndf2g39zp67b0ibcy9ib33r0mb7pwmqpy92gb31a0hvckzdj7"; depends=[quantmod RColorBrewer xts zoo]; }; - rtweet = derive2 { name="rtweet"; version="1.1.0"; sha256="0dq6ckf2mp6wm6y8xzjby21s356760fmck1m8nsnv5gz8lhy6dhg"; depends=[bit64 curl httr httr2 jsonlite lifecycle progress rlang tibble withr]; }; + rtsplot = derive2 { name="rtsplot"; version="0.1.5"; sha256="1vryh0s1mz9h9ksf5n27vvrdbsjk8yvizd31cnj4grz71v4c1dh1"; depends=[quantmod RColorBrewer xts zoo]; }; + rtweet = derive2 { name="rtweet"; version="1.2.1"; sha256="18ynravc5vz7ywm1n7ww48gx06dndcishl6lq8nqajxsjwiphq3r"; depends=[bit64 curl httr httr2 jsonlite lifecycle progress rlang tibble withr]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; rtypeform = derive2 { name="rtypeform"; version="2.1.0"; sha256="02qnsw2nd3fnyr0gbmx3690b78k899dxf04g4bqpjlg9y38g1cnr"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr rlang tibble tidyr]; }; rubias = derive2 { name="rubias"; version="0.3.3"; sha256="0xphah4axkchscxcxx7231cb67pqfi4smvy3lazlzbyysgwmr1kk"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; - rucrdtw = derive2 { name="rucrdtw"; version="0.1.4"; sha256="0865x8i2n63xjbq0pzalm4gd6rpg72yrcsm4rw40a3kzy2svvnlm"; depends=[Rcpp]; }; - rugarch = derive2 { name="rugarch"; version="1.4-9"; sha256="01gayzfslq03dhr2c282fr3rkywb0zhppvls56zh4ljv8gi1zh8g"; depends=[chron ks numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; + rucrdtw = derive2 { name="rucrdtw"; version="0.1.5"; sha256="0x4y0czfmn3sp8b8dqh4cmnnbqfzf7kgcllv2x80zhk5nyqpyagx"; depends=[Rcpp]; }; + rugarch = derive2 { name="rugarch"; version="1.5-1"; sha256="07nyfwaqqlizg0cawgiv8wdj7qr36pgi0z1mk9lambzb0w453zlz"; depends=[chron ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; ruijter = derive2 { name="ruijter"; version="0.1.2"; sha256="0phsqnwh47hwl26qihgrrlrazhdzhi6jnmhbylzkpqsclcpl52b7"; depends=[]; }; ruimtehol = derive2 { name="ruimtehol"; version="0.3.1"; sha256="01p8xfl1gbgfzyfwqgnshyvzcjlffvdnfxcr277ic32g6cas65hg"; depends=[BH Rcpp]; }; ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; }; ruler = derive2 { name="ruler"; version="0.3.0"; sha256="0k6xvb06cqiinvkpbmylzm0r11h52yay6k70jfmz2c0g5rb6bj4r"; depends=[dplyr keyholder magrittr purrr rlang tibble tidyr]; }; rules = derive2 { name="rules"; version="1.0.2"; sha256="1y9872akqsb1lm9hyj698dxakd53yxhbanv4z2yb43g84s5bsscl"; depends=[dials dplyr generics parsnip purrr rlang stringr tidyr]; }; rumidas = derive2 { name="rumidas"; version="0.1.1"; sha256="1hnkjj689kn7sx5gvjrh1x3n5pickb9d0adb5n0grjq4j5ympbns"; depends=[highfrequency lubridate maxLik Rdpack roll tseries xts zoo]; }; + ruminate = derive2 { name="ruminate"; version="0.1.1"; sha256="1prkbvbbrwr2hk94dzdkn9qhy0hsf0g0fyhv0ffjbrk51kl591xr"; depends=[digest dplyr DT flextable formods ggplot2 onbrand PKNCA plotly rhandsontable rlang shiny shinyAce shinyWidgets stringr tidyr yaml]; }; runMCMCbtadjust = derive2 { name="runMCMCbtadjust"; version="1.0.3"; sha256="1wiv9zacm30v8yk0p6qmqi1yp7ns29wqdl2ykr2afm39y00agcxi"; depends=[coda]; }; runcharter = derive2 { name="runcharter"; version="0.2.0"; sha256="0n4jkgvlbpafjks22fjackazp246c7skphirjsrzkrg169qwdin0"; depends=[data_table ggplot2 magrittr zoo]; }; runes = derive2 { name="runes"; version="0.1.0"; sha256="1s2vhwya434q70j4aq4qbds8wivscc5cyldr5pch7p41nqj0j7aw"; depends=[]; }; runexp = derive2 { name="runexp"; version="0.2.1"; sha256="0pcxwz0kpfrcsfalwlcwp81k3dyc9rqm9rba25xkp51bwz5scv64"; depends=[doParallel foreach]; }; - runjags = derive2 { name="runjags"; version="2.2.2-1"; sha256="0ab275jgaaz9lr4rp6g9ckdnpccqi26mabn896wyg2q5qzccxxk1"; depends=[coda lattice]; }; + runjags = derive2 { name="runjags"; version="2.2.2-1.1"; sha256="10q5bwf0lj4lpzclfgd5jnzyl9yqgkmflsy5anl5cdi9v15dynci"; depends=[coda lattice]; }; runner = derive2 { name="runner"; version="0.4.3"; sha256="0pad6czgjcpipb4n8qn4psa1nd1li0f9dkgh8ab7g7c8qwjb6yfz"; depends=[Rcpp]; }; runonce = derive2 { name="runonce"; version="0.2.3"; sha256="04lmzw9ldc3b6zdc7sr3mrfiam24372j11l5p1y9i2zjb9rxk1nn"; depends=[bigassertr urltools]; }; runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; - rust = derive2 { name="rust"; version="1.4.0"; sha256="0np7kzvdpih6d2da2glbwwbfrz2r5ys3jzcz829im82nh8l9h4aw"; depends=[Rcpp RcppArmadillo]; }; + rusquant = derive2 { name="rusquant"; version="1.0.2"; sha256="1z1v038d5bzb48f4xa75ypj0lf88x7sf87l90z8q46i8b4iawai8"; depends=[data_table httr jose jsonlite quantmod rvest stringr XML xts]; }; + rust = derive2 { name="rust"; version="1.4.1"; sha256="022b9g095y9ghgr838vn25ajd8ya41kw0h7xxxq3lr970xlijvrp"; depends=[Rcpp RcppArmadillo]; }; ruta = derive2 { name="ruta"; version="1.2.0"; sha256="0nycvy38aci3flrnqns3ppyxph9f57gdpxkpj7jfv871lzd3bkqw"; depends=[keras purrr R_utils tensorflow]; }; rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; }; rutledge = derive2 { name="rutledge"; version="0.1.0"; sha256="04ili75fj8dxhhwmbzgb2mnak89zscdyfaxss7rsl0byjgr0h8zs"; depends=[magrittr tibble]; }; @@ -16805,14 +16849,14 @@ in with self; { rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.4"; sha256="004d0cigay7bz754lrxjdwp1xsclc23wh03dlzyby900xcdizxk7"; depends=[stringi tibble]; }; rwicc = derive2 { name="rwicc"; version="0.1.3"; sha256="14jyc0qq6rxrmwvwdm59axib72q347s6ra8j1h97p75ah59kxndr"; depends=[arm biglm dplyr ggplot2 lubridate magrittr pryr scales]; }; rwisp = derive2 { name="rwisp"; version="1.0.5"; sha256="0wxc2zzfgqnygx6q7b0gjb04vphdl8x1idfp5pz33apwv2192viw"; depends=[]; }; - rworkflows = derive2 { name="rworkflows"; version="0.99.5"; sha256="1svqkwjcrc4waagrxa9vb2i7z6q6kvi5sb4419ibav77qgpw63g2"; depends=[badger desc here yaml]; }; - rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; + rworkflows = derive2 { name="rworkflows"; version="0.99.13"; sha256="17n0qcy8gj7l3vpzy3grnimazqfsmralpakr4mivm614rrl86yzd"; depends=[badger BiocManager data_table desc here renv yaml]; }; + rworldmap = derive2 { name="rworldmap"; version="1.3-8"; sha256="007avjl7jhllybp82illrn8v38a85j6xbzk5pvykfx8ayx4wc3m6"; depends=[fields raster sp terra]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; }; rwty = derive2 { name="rwty"; version="1.0.2"; sha256="0p0bpq5dk8vjqx8ry364xhaq3rgxa49planapggicg7by2mhaacc"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; }; rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; }; rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; }; - rxode2 = derive2 { name="rxode2"; version="2.0.13"; sha256="0xrmbns7ly1ppliyr1yxp67fwdzshl5sw4kicrxfch2k2n9dnfb0"; depends=[backports BH checkmate cli data_table ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo rex rxode2et rxode2ll rxode2parse rxode2random sys]; }; + rxode2 = derive2 { name="rxode2"; version="2.0.14"; sha256="1737f5zkqkmn9a45sk61qi90l116c070fgg4wzdmx0qiay0wsmq0"; depends=[backports BH checkmate cli data_table ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo rex rxode2et rxode2ll rxode2parse rxode2random sys]; }; rxode2et = derive2 { name="rxode2et"; version="2.0.10"; sha256="1lzjl7x190zcn9ga6p4q7kfwanhmipjms433pa8zma9r6538ni92"; depends=[checkmate cli crayon lotri magrittr Rcpp rxode2parse rxode2random]; }; rxode2ll = derive2 { name="rxode2ll"; version="2.0.11"; sha256="0fj5lbs67g1adjywfnav88rsj0sy3lwwf4gyimdh89rbm1glrrs3"; depends=[BH checkmate Rcpp RcppEigen RcppParallel StanHeaders]; }; rxode2parse = derive2 { name="rxode2parse"; version="2.0.16"; sha256="0y0hghvvik7cnh828mrp4mbnffylby3d1g1hrbhszac061n8lbvj"; depends=[BH checkmate crayon data_table digest dparser knitr qs Rcpp RcppEigen rex StanHeaders]; }; @@ -16822,24 +16866,24 @@ in with self; { rym = derive2 { name="rym"; version="1.0.6"; sha256="135h9lmyrpnkc4q5kdcpbr96glc0a9bah01sm4qakzdcb6zsxsh1"; depends=[httr purrr stringr]; }; rytstat = derive2 { name="rytstat"; version="0.3.0"; sha256="1shsc54ss9120ngl59pnd6kqclfh2ilva97xdsx58a9c2kry2dmm"; depends=[cli dplyr gargle httr pbapply rlang snakecase stringr tidyr withr]; }; rzentra = derive2 { name="rzentra"; version="0.1.0"; sha256="1knp1616ck64wgf3r80s1nywdnljc1r9fjvgg531j0fxir04aqkl"; depends=[data_table dplyr httr jsonlite lubridate magrittr purrr]; }; - rzmq = derive2 { name="rzmq"; version="0.9.9"; sha256="1d05jw6ljk5qyv28f0ggvw8nd6hawsgmnk0i9dh902lkkzv158jm"; depends=[]; }; + rzmq = derive2 { name="rzmq"; version="0.9.11"; sha256="16h0x54fq54dl5h4nd5qfxd4frmy4zs25ysijxkyiq4vffyaqpri"; depends=[]; }; s2 = derive2 { name="s2"; version="1.1.4"; sha256="0k209rx7w47rqgydy8h7ldngxm0b8d8yidhwbgw2rrddx8jlj2xy"; depends=[Rcpp wk]; }; - s20x = derive2 { name="s20x"; version="3.1-38"; sha256="1vbc0d4g7wkw551fr8jkgq76ilk83d6nj0sxlkj903h6lg8kbjwg"; depends=[]; }; - s2dv = derive2 { name="s2dv"; version="1.4.1"; sha256="06gqkdddqi86zl38bai6xsx882f9ds0arvxpihfzgbkpakdljlwg"; depends=[abind bigmemory ClimProjDiags easyNCDF easyVerification mapproj maps multiApply NbClust ncdf4 plyr SpecsVerification]; }; + s20x = derive2 { name="s20x"; version="3.1-40"; sha256="1b2bbkbkmr4d4bfihd87c3vwdfxb21hzaxhd6zqnwz1n0xg2zhb5"; depends=[]; }; + s2dv = derive2 { name="s2dv"; version="2.0.0"; sha256="0lgkdb1gphqsggqnyrl1hlfx1x5zxbhb9msr6xyj4hhp03m16z9x"; depends=[abind bigmemory ClimProjDiags easyNCDF easyVerification mapproj maps multiApply NbClust ncdf4 plyr SpecsVerification]; }; s2dverification = derive2 { name="s2dverification"; version="2.10.3"; sha256="10zqw7w8hm7cqbaxy6asflw0i8s5rmki2xhv3d51sm67vb7qn6f4"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s2net = derive2 { name="s2net"; version="1.0.4"; sha256="0wq3y96m2h85kw755rnmnzvxknk5s7ii0g7p0zd8ahcnppkdk6kl"; depends=[MASS Rcpp RcppArmadillo]; }; s3 = derive2 { name="s3"; version="1.0.0"; sha256="1cb9xmi4fb0bi3vglbg3jk872nci015v1yxk3049482r92v6lnsn"; depends=[aws_signature cli digest dplyr fs glue httr prettyunits purrr]; }; s3_resourcer = derive2 { name="s3.resourcer"; version="1.1.1"; sha256="0njl93c1pxsg04fr74pnrpvx3z5m8nk2xv700l0jhbygshw8k5z2"; depends=[aws_s3 httr R6 resourcer sparklyr]; }; - s3fs = derive2 { name="s3fs"; version="0.1.3"; sha256="0ahadn252mnh3wvi510lrzglh20mln4dz50yszm4p221mb4b3kff"; depends=[curl data_table fs future future_apply lgr paws_storage R6]; }; + s3fs = derive2 { name="s3fs"; version="0.1.4"; sha256="12y92npqk78gghi91ad4av57vf89pccrp04qw7p0dw96021wb8kw"; depends=[curl data_table fs future future_apply lgr paws_storage R6]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0.1"; sha256="1gqcnwg7cnknfp36wqay9hibawx6n8z9z5z46vr05bl91m3xxqgs"; depends=[]; }; sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; }; sClust = derive2 { name="sClust"; version="1.0"; sha256="0bvvbb360454d39bkynpbaf6ll9xsc3gxgxivy0igbr2pipfwbap"; depends=[class cluster]; }; - sEparaTe = derive2 { name="sEparaTe"; version="0.3.0"; sha256="0wfwipvv1mirsmnwwa521rd1xrrj7pidw2gjan7xwa52sgfsbdg9"; depends=[]; }; + sEparaTe = derive2 { name="sEparaTe"; version="0.3.2"; sha256="1nxiqsqz0sva9mxk1jscdq6ragc073gmqlrpa68zkfnfdzfrkb32"; depends=[]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; }; sGBJ = derive2 { name="sGBJ"; version="0.1.0"; sha256="145mxfpl8gpycz8fl1ddlxy61rwpcqlfdrva6yhwzv4awwsv1fvn"; depends=[GBJ survival]; }; sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; - sMSROC = derive2 { name="sMSROC"; version="0.1.0"; sha256="16fllr09mjxqwjm4rq9bc89bl1hz1kq6bs6m75qwwwm73j0xk40h"; depends=[flextable foreach ggplot2 icenReg plotROC RISCA rms survival thregI]; }; + sMSROC = derive2 { name="sMSROC"; version="0.1.1"; sha256="18dai7v16w6jj8h2r1qz689fngh5sawlky4068sjhw4shfignd3k"; depends=[flextable foreach ggplot2 icenReg plotROC rms survival thregI]; }; sMTL = derive2 { name="sMTL"; version="0.1.0"; sha256="03xq19vh4g3j3jbpad92m2rg933h9lcy4wrzkdi9y47v8h3fqyw1"; depends=[caret dplyr glmnet JuliaCall JuliaConnectoR]; }; sNPLS = derive2 { name="sNPLS"; version="1.0.27"; sha256="0h05crdmwmzax4pwmyxb2z1dagyqb3kybpxc064y1kl8m84kcyvv"; depends=[clickR future future_apply ggplot2 ggrepel ks MASS Matrix pbapply]; }; sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; }; @@ -16850,29 +16894,25 @@ in with self; { saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; }; sabre = derive2 { name="sabre"; version="0.4.3"; sha256="0vcfcsfc53022rglqxgf5p9b8d8lphyy161jmvlvb77qp959nbrh"; depends=[dplyr entropy raster rlang sf tibble tidyr]; }; sac = derive2 { name="sac"; version="1.0.2"; sha256="1yg133zm0db2lv0m62ij7c27bs4k3kbjic15dwrak534lk885sj2"; depends=[]; }; - saccadr = derive2 { name="saccadr"; version="0.1.2"; sha256="1g8mdfykrqa0wg3aprazm3b05j4a7j4sqm1i04881dpyf5s42mlf"; depends=[cluster dplyr magrittr Rcpp rlang signal tidyr]; }; + saccadr = derive2 { name="saccadr"; version="0.1.3"; sha256="0c51zbkh8b0xi0sshzq5agbijw6nprrb3r1k77wcfqsr2mazfwi5"; depends=[cluster dplyr magrittr Rcpp rlang signal tidyr]; }; sad = derive2 { name="sad"; version="0.1.3"; sha256="0wr4xdx68hrxaw5izy36gm10smk6s1gzrzwayhfp4lhvkn75qsww"; depends=[dualtrees emdist]; }; - sadists = derive2 { name="sadists"; version="0.2.4"; sha256="00iqgwqfia4mybg4v66kb368gydr103zmr8ka9y4j8rmwkg5j9kq"; depends=[hypergeo orthopolynom PDQutils]; }; + sadists = derive2 { name="sadists"; version="0.2.5"; sha256="0c7bmca6yyz5hca2ghr2zc6lmwi94cywz8gkpsakrnmk0f7680xi"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.3"; sha256="1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z"; depends=[lme4 MASS]; }; - sae_prop = derive2 { name="sae.prop"; version="0.1.1"; sha256="1sn8adldg7k2snji7bpb8vf28iqynb8dghkcxfd2649kgg63plai"; depends=[corpcor fpc magic MASS progress]; }; + sae_prop = derive2 { name="sae.prop"; version="0.1.2"; sha256="19q86xjpvr3s3paspkzsr40zvff60mxxh57xpz0fnxldivynh6ia"; depends=[corpcor fpc magic MASS progress]; }; + sae2 = derive2 { name="sae2"; version="1.2-1"; sha256="1ahq2gha8q3k6aj1a1qclibq209a3426sb77qy3fdgph9zkpij1x"; depends=[MASS survey]; }; saeBest = derive2 { name="saeBest"; version="0.1.0"; sha256="0s68w9cikhpac1kdlm1pphvnks1izacs5s87d7r380c3lkgkzd76"; depends=[sae]; }; - saeHB = derive2 { name="saeHB"; version="0.2.1"; sha256="0jlfflpy67y8val89nn29larhw0v9qgsqp3x1sf3h1az9lc7bx5p"; depends=[CARBayesdata coda MASS nimble rjags stringr]; }; - saeHB_ME = derive2 { name="saeHB.ME"; version="1.0"; sha256="0wvh31lhl79fapp96kz6vaa0a8lg3j472vw1gjcjmbvijp9ywywr"; depends=[coda rjags stringr]; }; + saeHB_ME = derive2 { name="saeHB.ME"; version="1.0.1"; sha256="134sib6akpwns49mv3vnwflcpwalpi9jgb5qm6dw61s2b01k1m2q"; depends=[coda rjags stringr]; }; saeHB_ME_beta = derive2 { name="saeHB.ME.beta"; version="1.1.0"; sha256="1i1pgvh6xn26w3g4x7bn0d8qi2g9l8fd58ag1i7lrsrq3rx5m83k"; depends=[coda rjags stringr]; }; saeHB_ZIB = derive2 { name="saeHB.ZIB"; version="0.1.1"; sha256="1z7siwv96iq9cww044gy4a7hnzq02s415xav725jqqwr68chham9"; depends=[coda rjags stringr]; }; - saeHB_gpois = derive2 { name="saeHB.gpois"; version="0.1.1"; sha256="1zz5xg393fv4r7bczp9ff690ypwspmm5p17p7vsn1vhcfwgx71di"; depends=[coda rjags stringr]; }; - saeHB_hnb = derive2 { name="saeHB.hnb"; version="0.1.2"; sha256="1c7k0hhg078dmrz9crydh9napiim4r0kw4bv64y63zqbzsgrchm1"; depends=[coda rjags stringr]; }; saeHB_panel = derive2 { name="saeHB.panel"; version="0.1.1"; sha256="0280hczz47nlrr06wihfl6j0qfnv8w8vvjjr11nzf6p61hkz6sdx"; depends=[coda rjags stringr]; }; saeHB_panel_beta = derive2 { name="saeHB.panel.beta"; version="0.1.3"; sha256="1zhg53nkwky76v1wdiqfmljkz95k6fgz0hvxy1l8mhdfx3d79srk"; depends=[coda dplyr rjags stringr]; }; - saeHB_spatial = derive2 { name="saeHB.spatial"; version="0.1.0"; sha256="0fqc3c5y4rwfpgfbwfsrdhqlwjbal28wi9djm1vlncr8phkzfpln"; depends=[coda rjags stringr]; }; - saeHB_twofold = derive2 { name="saeHB.twofold"; version="0.1.1"; sha256="1fdrh4h9y6blvib7d0hn1dhccz7rrmyf84a3g49chshiympkp6nv"; depends=[coda data_table rjags stringr]; }; - saeHB_zinb = derive2 { name="saeHB.zinb"; version="0.1.1"; sha256="0z8yngvd3rizxkfb8j6jn9gfm7q8888igdq354r9dibprkw4fxbs"; depends=[coda rjags stringr]; }; - saeME = derive2 { name="saeME"; version="1.3"; sha256="0a733af5ykiql4zk89qnvvbxx2kh5avjxdl08iy5qxh7pmv6vl5d"; depends=[MASS]; }; + saeHB_unit = derive2 { name="saeHB.unit"; version="0.1.0"; sha256="0z1p41aa398qgysm3yp7siz38any3z3rjw8hn4hrj9zxx9zn2lcy"; depends=[cli coda dplyr rjags]; }; + saeME = derive2 { name="saeME"; version="1.3.1"; sha256="071f345gpm5qwsj6k7vm8jfm80lgzk5l1gyds3zcxy955gk288cs"; depends=[MASS]; }; saeMSPE = derive2 { name="saeMSPE"; version="1.2"; sha256="086nmcx14sjwnydka805il11lc02jv9l39kk9j1h2j5p9gz0b3gp"; depends=[Matrix Rcpp RcppArmadillo smallarea]; }; saeRobust = derive2 { name="saeRobust"; version="0.4.0"; sha256="1zx5ghsb842fkdhpr9013vgi3nadzs7d4haqqbx7g5nrx1ixfqlm"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.11.0"; sha256="0s0zcls4j3cx7wbvi0l3q4c3b0f9x9i2wcqnz4gzwyqik6pcfaic"; depends=[dplyr functional ggplot2 MASS parallelMap spdep tibble]; }; - saeTrafo = derive2 { name="saeTrafo"; version="1.0.0"; sha256="1mh8kg4zvy5j7k9v0msdirzl00aahdcblqjbfjp6l8i2w4hnk1s8"; depends=[emdi ggplot2 gridExtra HLMdiag moments MuMIn nlme openxlsx parallelMap readODS reshape2 sfsmisc stringr]; }; + saeTrafo = derive2 { name="saeTrafo"; version="1.0.1"; sha256="0dpz946x1731s3m631hks0y5mwsb7ygfca7ilaa06pnqcyd1zz4j"; depends=[emdi ggplot2 gridExtra HLMdiag moments MuMIn nlme openxlsx parallelMap readODS reshape2 rlang sfsmisc stringr]; }; saebnocov = derive2 { name="saebnocov"; version="0.1.0"; sha256="0dxbicvmq13wh2xj820qw2ah3j005pqjynynhgkynfvm9nmymrvr"; depends=[descr dplyr rlang]; }; saeeb = derive2 { name="saeeb"; version="0.1.0"; sha256="04vjxmnqcgqcamgjd9qq1dbx0msm40mnn94jjy9pzvsj2gsbws39"; depends=[COUNT MASS]; }; saekernel = derive2 { name="saekernel"; version="0.1.1"; sha256="0zk124kkxrwr3bliy01d3ag4r0flnjg4z3lmm5wmq3w0r4gwgy4f"; depends=[]; }; @@ -16881,7 +16921,7 @@ in with self; { safejoin = derive2 { name="safejoin"; version="0.1.0"; sha256="0qvra505g7cay3nhq6yqrddb7sw3kx50y8jhgvxi47rxdc3alzba"; depends=[dplyr glue]; }; safer = derive2 { name="safer"; version="0.2.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; }; safestats = derive2 { name="safestats"; version="0.8.7"; sha256="1jxdnvmf6w8hgd5wcfjcmm796nchig1xizhngbzdgl85yi6nw1yy"; depends=[BiasedUrn boot dplyr hypergeo purrr rlang survival]; }; - safetensors = derive2 { name="safetensors"; version="0.1.1"; sha256="17x3vqql7lrj5wy1l75343k228pflr17mz5rcf2j6xnp0s6npm98"; depends=[cli jsonlite R6 rlang]; }; + safetensors = derive2 { name="safetensors"; version="0.1.2"; sha256="0xvg5y2sd7gzcal0qqgxbx8vcvmy50jm0j2ajr8iw3wyy5qpyvkp"; depends=[cli jsonlite R6 rlang]; }; safetyCharts = derive2 { name="safetyCharts"; version="0.3.0"; sha256="1riyd2rb799rr0j95s3wd45rwq8syfm0xllpihycpak0f56vg1s8"; depends=[dplyr DT forcats ggplot2 htmlwidgets huxtable jsonlite pharmaRTF plotly purrr RColorBrewer rlang shiny stringr Tendril Tplyr]; }; safetyData = derive2 { name="safetyData"; version="1.0.0"; sha256="1spa1wh1z8cqsz8vrkj3abny0xs3qp8d80dla8d031d70hvfkdjc"; depends=[]; }; safetyGraphics = derive2 { name="safetyGraphics"; version="2.1.1"; sha256="1bvmxhy2giprf4cy1xfc42rl8hcw0pi3691kzfgqhj65sawdjwfd"; depends=[datamods dplyr DT htmlwidgets jsonlite magrittr purrr rclipboard rlang safetyCharts safetyData shiny shinyjs sortable stringr tidyr yaml]; }; @@ -16899,10 +16939,10 @@ in with self; { samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; }; samplesize4surveys = derive2 { name="samplesize4surveys"; version="4.1.1"; sha256="0v332xb4vkkjr3nwf3231aqgzsj7mqld9ffkla1nj52lxay2ji75"; depends=[dplyr magrittr TeachingSampling timeDate]; }; samplesizeCMH = derive2 { name="samplesizeCMH"; version="0.0.0"; sha256="0gdywqmylid4fkz5syzf1wgcan71whhm9gjylmsg4p05hlwvpv1d"; depends=[]; }; - samplesizelogisticcasecontrol = derive2 { name="samplesizelogisticcasecontrol"; version="2.0.0"; sha256="0mzdh4mnk3pp6yhyqragbyf27fmn1aigy1kyfcaq012nn6cxrhgk"; depends=[mvtnorm]; }; + samplesizeestimator = derive2 { name="samplesizeestimator"; version="1.0.0"; sha256="0s783s2hcb9hndhsw5vdss240bkvb0a634fl6wrq42fc8fd95ixc"; depends=[stringi]; }; + samplesizelogisticcasecontrol = derive2 { name="samplesizelogisticcasecontrol"; version="2.0.2"; sha256="180c5bvrr3nb88ci1cg8kh6kj6gfg1dfmrabp8a232x2n2ykq76m"; depends=[mvtnorm]; }; sampling = derive2 { name="sampling"; version="2.9"; sha256="11xis4vzn2ga8ml9xrgfgqzccvwbnabq35aidzdvpnvciybsanvz"; depends=[lpSolve MASS]; }; samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; }; - samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; samplingR = derive2 { name="samplingR"; version="1.0.1"; sha256="1ikmd7dvmrzc06vgpl8f7777pmds3vcfv74r9izlqhxyz39hgc9s"; depends=[dplyr]; }; samplingVarEst = derive2 { name="samplingVarEst"; version="1.5"; sha256="0h78dzb18cknmg6bnjfxaqfdayyghq6skxca1dj1idqh9p4igaqq"; depends=[]; }; samplingbook = derive2 { name="samplingbook"; version="1.2.4"; sha256="08fhzanzb725hlagm0225121gdgipkbfkixizwykggaimkz5j1ad"; depends=[pps sampling survey]; }; @@ -16913,8 +16953,8 @@ in with self; { sand = derive2 { name="sand"; version="2.0.0"; sha256="0a8skj1wi1n9zlm7jb5cix1i4ssdzfpj4ym2854ala9jy6qj7g7n"; depends=[igraph igraphdata]; }; sandbox = derive2 { name="sandbox"; version="0.2.1"; sha256="0k86dgfjg7ib79cl6nwxv1g9i15pk501kd8ynlaj3mijpnhgvbal"; depends=[RLumModel]; }; sandwich = derive2 { name="sandwich"; version="3.0-2"; sha256="1d72vwxidsyac9mbyxrm06qds63rzcr82nn4c05466gbajsvcc3f"; depends=[zoo]; }; - sandwichr = derive2 { name="sandwichr"; version="1.0.4"; sha256="1g5jg8x4a9qdvcrsali2z1zrbrh628nsings1v02gpvfw2qbdb45"; depends=[caret dplyr geodetector ggplot2 gridExtra lwgeom sf]; }; - sanic = derive2 { name="sanic"; version="0.0.1"; sha256="05fd7jpi7cf9klfh6dqf8wklrjh5q1b3xqddxhdihcsqvcqhg48l"; depends=[Matrix Rcpp RcppEigen]; }; + sandwichr = derive2 { name="sandwichr"; version="1.0.4"; sha256="1g5jg8x4a9qdvcrsali2z1zrbrh628nsings1v02gpvfw2qbdb45"; depends=[caret dplyr ggplot2 gridExtra lwgeom sf]; }; + sanic = derive2 { name="sanic"; version="0.0.2"; sha256="0php70zcxhx6kqcyimx4icx2460ik6frvi3h21jw6qrz631l304r"; depends=[Matrix Rcpp RcppEigen]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.1"; sha256="0gy4z85h639h25hxv7n7irbj7w1m2gxw9sv5480bvbfw756n2pb6"; depends=[]; }; sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; @@ -16922,13 +16962,12 @@ in with self; { sanon = derive2 { name="sanon"; version="1.6"; sha256="0h3l1dzgkddvb3vzg7pcgwrgidphy73jys2h49v84nbfvqr6l85z"; depends=[]; }; sansa = derive2 { name="sansa"; version="0.0.1"; sha256="1p5qv94f62dxzkbl1jn1fx3vksyhqqa3w2ipqwiflaxlk7q9k5pq"; depends=[data_table FNN ggplot2]; }; santaR = derive2 { name="santaR"; version="1.2.3"; sha256="0xyvfanqid5f114m7akhh0pi9mwy9bj8iqfzxpkkvj6ak1ib0i5y"; depends=[bslib doParallel DT foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny]; }; - santoku = derive2 { name="santoku"; version="0.9.1"; sha256="1d3m38jscg48h3r8fc44xpscaqx8bnakl375by46k0znn47v43y9"; depends=[assertthat glue lifecycle Rcpp rlang vctrs]; }; + santoku = derive2 { name="santoku"; version="0.10.0"; sha256="09zm2m3wcn3gzixmq8b9n1j11pca95sg4yw5zxm91cm7fd7f33cd"; depends=[assertthat glue lifecycle Rcpp rlang vctrs]; }; sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; }; - saotd = derive2 { name="saotd"; version="0.3.0"; sha256="11ql731w3rc4spmd2ii52r49sxymxkf7wj2ngdvb8pcs4idar059"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr reshape2 rtweet scales stringr tidyr tidytext topicmodels widyr]; }; + saotd = derive2 { name="saotd"; version="0.3.1"; sha256="1x3zpzhs11bgxa8zhjdwr7n9fi55glhrif43zblh55ih3cqpcfc1"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr reshape2 rtweet scales stringr tidyr tidytext topicmodels widyr]; }; sapevom = derive2 { name="sapevom"; version="0.2.0"; sha256="0vq4rx85pdjc0wjxjf7wj8j5qs3cb20hwhlc2ypbgrlw7zkcp1z4"; depends=[]; }; sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.4"; sha256="0x437nhv3g327apxnihr1wnp4mmzxn9pfk24shpj6a8amxphlzxd"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; saqgetr = derive2 { name="saqgetr"; version="0.2.21"; sha256="0s7mmc8gqx89697wkv369x6sp3d1wha4q2zkkwikh835i3alx4zd"; depends=[dplyr httr lubridate magrittr purrr readr stringr tidyr]; }; - sara4r = derive2 { name="sara4r"; version="0.0.9"; sha256="1vfaz4fs0yayf01w0smsnviwhvjz10krfagp4vhy4lmdcs99s00h"; depends=[raster rgdal sp tcltk2]; }; sarima = derive2 { name="sarima"; version="0.9.1"; sha256="0gj3z7471153g1cyclmkh9lcc2zqpv2d4yzq6k6hi2pxmb5hihsq"; depends=[Formula lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.3.2"; sha256="1nrkifs6kq8kr3jmwi76d6jjbps1ijrnjxrslsyrpyvr2rj4p82h"; depends=[data_table xml2]; }; sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.2.1"; sha256="11c9wq7rr05jq6v6rcg3wy3h7w44clbxx2mysrqj50w38ih3r29b"; depends=[data_table dtw sarp_snowprofile]; }; @@ -16936,17 +16975,17 @@ in with self; { sars = derive2 { name="sars"; version="1.3.6"; sha256="198dz3gbzm7iqa2p813anifzpjkna3blf4yzyy73j43h8w4k5v0b"; depends=[AICcmodavg cli crayon doParallel foreach nortest numDeriv]; }; sarsop = derive2 { name="sarsop"; version="0.6.14"; sha256="0y315gg3masbpvsf9zk0abj0mh0834h1yhmjg1fwwbqvygg64cjp"; depends=[BH digest Matrix processx xml2]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.7"; sha256="0pwmngwmkybz64sqby86vzxq5wwfkh5hxnqncdv0fmp6w6x7jhjn"; depends=[]; }; - sasLM = derive2 { name="sasLM"; version="0.9.11"; sha256="1b9y75hbr6wjckcp4q0a91y5abq990ypkgr5pm9kjhy89mfl9snl"; depends=[mvtnorm]; }; + sasLM = derive2 { name="sasLM"; version="0.9.12"; sha256="03rh64yym31zkfhwaw083839yl76jyrs6aw0vk0jhw82zl7b0z2v"; depends=[mvtnorm]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; sasfunclust = derive2 { name="sasfunclust"; version="1.0.0"; sha256="1ba7g3rxyq5h806na6bsdvh6mw6hydgcf3740qkfd4d5fx7m0mq4"; depends=[fda MASS Matrix matrixcalc mclust Rcpp RcppArmadillo]; }; sasr = derive2 { name="sasr"; version="0.1.2"; sha256="1cpmfclxphk5s3nr1znricm195j9xix5pw8jkyq3hhg0h7xirzi7"; depends=[checkmate reticulate]; }; sass = derive2 { name="sass"; version="0.4.7"; sha256="1vp9qnhkvz4shhvwrwbwcy1xnrgry0rmqxsg96ggv90m6sv0hyki"; depends=[fs htmltools R6 rappdirs rlang]; }; - sassy = derive2 { name="sassy"; version="1.1.0"; sha256="0iimj7wncdsx6h0fk4cg79dqbhyrlg76bl8jkz8rl2ac6ywdyz2p"; depends=[common fmtr libr logr reporter]; }; + sassy = derive2 { name="sassy"; version="1.2.0"; sha256="0485qa549svfb268djycbp4xa99fm1vhglpqlzm4k7szhfb6pkbq"; depends=[common fmtr libr logr procs reporter]; }; satdad = derive2 { name="satdad"; version="1.1"; sha256="1ig7z0z4filq57sk9rc38pnx79j1lxm1sacl9hbi407y0pqx01k7"; depends=[BH graphicalExtremes igraph maps partitions Rcpp RcppArmadillo]; }; sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; satellite = derive2 { name="satellite"; version="1.0.4"; sha256="0z6wh0nmzxgizd8rzafkq8hkxx9s8lkaqins68697284lxvrbrwr"; depends=[plyr raster Rcpp terra]; }; satin = derive2 { name="satin"; version="1.1.0"; sha256="17knbgy89ljp607mkhs62fx9p6b40iqqzgpxr9karlf07l48c0ya"; depends=[geosphere maps ncdf4 PBSmapping sp splancs]; }; - satscanMapper = derive2 { name="satscanMapper"; version="1.0.2"; sha256="12vx1gr2z942wrjn6ks4lq9rb9ycnfg2rnl18scglqjqzlbsn9al"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; + satres = derive2 { name="satres"; version="1.0.0"; sha256="1kxpb15xbl4f3m9gqmvrad9dqcw0m9l6dxcvbqar743aakwh10sc"; depends=[terra]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; savonliquide = derive2 { name="savonliquide"; version="0.2.0"; sha256="1f1s2pzvpqrcb68fqk4ivpimwsphnjjx3b42jivw63y7q7ak4azh"; depends=[crayon glue htmltools httr]; }; sawnuti = derive2 { name="sawnuti"; version="0.1.1"; sha256="07abg9gqm59iz05jly47h9jnf8majnhjqss2ybjpa9mx1aclm50b"; depends=[]; }; @@ -16970,10 +17009,11 @@ in with self; { scDHA = derive2 { name="scDHA"; version="1.2.1"; sha256="075prhak80d6v9hcxsmn3f1mlc4liahh0fdpn8n6hs3ghczrk5cl"; depends=[cluster coro doParallel foreach igraph Matrix matrixStats Rcpp RcppAnnoy RcppArmadillo RcppParallel RhpcBLASctl torch uwot]; }; scDIFtest = derive2 { name="scDIFtest"; version="0.1.1"; sha256="1hq68g7zf7372cach2qfc7l1l8gh5aqkp66k0cxjnrhmvvb1qcax"; depends=[mirt sandwich strucchange zoo]; }; scDiffCom = derive2 { name="scDiffCom"; version="0.1.0"; sha256="1xgrsfrh06n8hzyqv3j99kjk6l85khg099vjdsf7kx9f5p92iixd"; depends=[data_table DelayedArray future future_apply magrittr Seurat]; }; + scGOclust = derive2 { name="scGOclust"; version="0.1.2"; sha256="0776fp7z4kcdyaa2xk7ycjp6x7x5mcf6wnqghphry2g18ag9r5m9"; depends=[biomaRt dplyr limma magrittr Matrix networkD3 Seurat slanter tibble tidyr]; }; scGate = derive2 { name="scGate"; version="1.4.1"; sha256="04m9vwdvwylxndyrkq8h5v0w9py5xvznd35arfg1h6y0l4dskwpz"; depends=[BiocParallel dplyr ggplot2 ggridges patchwork reshape2 Seurat UCell]; }; scINSIGHT = derive2 { name="scINSIGHT"; version="0.1.4"; sha256="1zkm2n19px3yh3y2z1g5l84ym36ar31i96i54mm7wa0ki179swap"; depends=[igraph RANN Rcpp RcppArmadillo stringr]; }; scISR = derive2 { name="scISR"; version="0.1.1"; sha256="0m4sgbyc05qy1zklw45zj4w4wx0fhiwqr90fc3gpkqq7xkd7ihbw"; depends=[cluster entropy irlba markdown matrixStats PINSPlus]; }; - scITD = derive2 { name="scITD"; version="1.0.2"; sha256="0z6b0naz44am9z6mw03k5b550j19xgaxqyklhc57ns0lfv0l506k"; depends=[circlize ComplexHeatmap dplyr edgeR fgsea ggplot2 ggpubr ica Matrix mgcv msigdbr NMF RColorBrewer Rcpp RcppArmadillo RcppProgress reshape2 Rmisc rTensor sccore sva]; }; + scITD = derive2 { name="scITD"; version="1.0.4"; sha256="0xcx8bvl2w2qa4c68w5hvfx9412qvscjvj8d6hp4q62z58xqy1f8"; depends=[circlize ComplexHeatmap dplyr edgeR fgsea ggplot2 ggpubr ica Matrix mgcv msigdbr NMF RColorBrewer Rcpp RcppArmadillo RcppProgress reshape2 Rmisc rTensor sccore sva]; }; scLink = derive2 { name="scLink"; version="1.0.1"; sha256="0gcwx8kfik1lv949r9d9rqqnvrfkr4bj5cj2i9h1r7l1b76kna74"; depends=[glasso]; }; scMappR = derive2 { name="scMappR"; version="1.0.11"; sha256="0a2jm2a10lawqrlcglaz31gx3kbvjz19f4ynhllkj0px61awxjah"; depends=[ADAPTS downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap reshape Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.4"; sha256="01minq4b0pdjlh2r56lvr2ab6r7sp7l9sjz8a9hmx5xmizmygmvr"; depends=[gamlss_dist Rcpp]; }; @@ -16983,6 +17023,7 @@ in with self; { scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; scROSHI = derive2 { name="scROSHI"; version="1.0.0.0"; sha256="15mgbgb21wz1gnkw6mxkvckxj345cxi4w5hzwgxfqjvxq9wx6bik"; depends=[limma S4Vectors SingleCellExperiment SummarizedExperiment uwot]; }; scSorter = derive2 { name="scSorter"; version="0.0.2"; sha256="04gnw9i4j8sk3fjh74idk0d6wflw17z1c3afz6wir5pc4y3lzn2j"; depends=[]; }; + scSpatialSIM = derive2 { name="scSpatialSIM"; version="0.1.3.2"; sha256="04pwzpp92w8fldyr11lycygpali4pa8v8xbssgsipn6fk991xkam"; depends=[crayon dplyr ggplot2 ggpubr magrittr pbmcapply proxy spatstat_geom spatstat_random tidyr]; }; scTenifoldKnk = derive2 { name="scTenifoldKnk"; version="1.0.1"; sha256="0d6gcr0qrm7mc36n2lihl7bq9vj40dblqswznbwvxichv8kc5svz"; depends=[MASS Matrix pbapply RSpectra scTenifoldNet]; }; scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.3"; sha256="02ijwi487pfwhgdmpals2snx5dvdnkbkyp9g1yldw12a9v8rz8q7"; depends=[MASS Matrix pbapply RhpcBLASctl RSpectra]; }; scUtils = derive2 { name="scUtils"; version="0.1.0"; sha256="09c4vwrjj4r0nfcwb8q0a243m0v5wa3qisdlcy7ik58gyxp02zv8"; depends=[assertthat dplyr ggplot2 Matrix scales viridis viridisLite]; }; @@ -17000,6 +17041,7 @@ in with self; { scanstatistics = derive2 { name="scanstatistics"; version="1.1.1"; sha256="04pymq6bikmsjqlwszd9ihv85s5qg8ci5y4dr6jmi95dgdm988pj"; depends=[dplyr ismev magrittr plyr Rcpp RcppArmadillo sets tibble tidyr]; }; scapGNN = derive2 { name="scapGNN"; version="0.1.4"; sha256="0cms24rf3pp87jck8yxvfm5s60ycch9b32nmrhvg5iy59j6fpdxx"; depends=[ActivePathways AdaptGauss coop igraph mixtools reticulate]; }; scape = derive2 { name="scape"; version="2.3.3"; sha256="1jb5c335qsbrpsgngs8c1qlibyb7zvvx6mwydfhm1plx4pkcq0n1"; depends=[coda Hmisc lattice]; }; + scaper = derive2 { name="scaper"; version="0.1.0"; sha256="0ygh5lhbpgxc0mbyvc2cv0m3g405aiappysb7msw7r7g2f4x0w6s"; depends=[dplyr magrittr Seurat SeuratObject stringr VAM xml2]; }; scapesClassification = derive2 { name="scapesClassification"; version="1.0.0"; sha256="0kwl9mbzcmn5qzqbzabf2igbhwbf5m1b1wa8rhm8mfv2qz7psyf2"; depends=[terra]; }; scar = derive2 { name="scar"; version="0.2-2"; sha256="0l2vm6aqi5lrc25akmn826v0zhygys9s167k9dphqn8l3yvlvqbj"; depends=[]; }; scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; @@ -17014,19 +17056,19 @@ in with self; { sccr = derive2 { name="sccr"; version="2.1"; sha256="0cjlzv92b5qrs43d3ry33zcggiqvsqaf8wq4k19ws9lvgh59b62v"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; scdhlm = derive2 { name="scdhlm"; version="0.7.2"; sha256="0l7mv125spx1rp2hd9ms1di0f2kbmff7lb7cvp7vcibj2w7y7irh"; depends=[dplyr lmeInfo magrittr nlme readxl rlang tidyselect]; }; - scellpam = derive2 { name="scellpam"; version="1.4.4"; sha256="0859g5lsjxv5l68dn1p2cilq2ayyvbdnyvsrdyig1vfsf1lbrrgg"; depends=[cluster memuse Rcpp]; }; + scellpam = derive2 { name="scellpam"; version="1.4.5"; sha256="0sgwqpmjwnwvs8s3l4x264kndjsh3k7h5mpxyl0za9s4na3y6s9j"; depends=[cluster memuse Rcpp]; }; scenes = derive2 { name="scenes"; version="0.1.0"; sha256="068x0f9j9apdrv07m4facxxs60axv43q57laypfavxsns3r4dk30"; depends=[cli cookies glue purrr rlang shiny]; }; scgwr = derive2 { name="scgwr"; version="0.1.2-21"; sha256="15pwasxkwirr2wwf8w02cy8zx0bqavzyfixjz3m37c1llrhddpka"; depends=[dplyr FNN optimParallel sp spData]; }; schemr = derive2 { name="schemr"; version="0.2.0"; sha256="192dk2b69wlwwkqrkk1n05q8hsn6djxhscjizj3amj4b701xw612"; depends=[apcluster dplyr magrittr OpenImageR purrr stringr]; }; schoRsch = derive2 { name="schoRsch"; version="1.10"; sha256="0bf4lahfzi6dchqfnykh4saiagcka12h82d9mvd1ddv5phmbyi10"; depends=[]; }; schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; }; scholar = derive2 { name="scholar"; version="0.2.4"; sha256="12r4j1s71szh77nsnqzsi0q5cvkp0cyr2fxzcagk02f42bnp5aww"; depends=[dplyr ggplot2 ggraph httr R_cache rlang rvest stringr tidygraph xml2]; }; - schoolmath = derive2 { name="schoolmath"; version="0.4.1"; sha256="16vd1in016sqxllxmkvs0bav9drk6lynrcqf9d24y77yhm103q76"; depends=[]; }; + schoolmath = derive2 { name="schoolmath"; version="0.4.2"; sha256="0r0hipficyjkvqhy9jv2p7s44ww4zwxs8x52sd5hss2wz4vvkkv7"; depends=[]; }; schrute = derive2 { name="schrute"; version="1.0.1"; sha256="14mjz63g2z4m4rgh7yf05gz5cjcriqvwgrd0an9xzj9pk36arisb"; depends=[magrittr]; }; - schtools = derive2 { name="schtools"; version="0.4.0"; sha256="0pl91886pnrj4id2wp7wkp5iydprsalnjg6inwhaj295glybbrqg"; depends=[dplyr formatR glue rlang stringr tidyr]; }; + schtools = derive2 { name="schtools"; version="0.4.1"; sha256="1y3qm08m3sflb5p57z6glxbrc37limm9nyrab09mvqifz5xh4z3h"; depends=[dplyr formatR glue rlang stringr tidyr]; }; schumaker = derive2 { name="schumaker"; version="1.2.1"; sha256="15i39lzkd1qggd35sp39vy922y3y1n9drjkidz7asniv1miali6j"; depends=[]; }; sciRmdTheme = derive2 { name="sciRmdTheme"; version="0.1"; sha256="17pyvi38qg9r2yshw02car7d08qda6mscxkhh5jdm4ncc91y9i17"; depends=[]; }; - scico = derive2 { name="scico"; version="1.4.0"; sha256="1zcsqmsr9vjs4krz8vmq4z59wh6x25g9ca6yxb0wlq58nmws77k6"; depends=[scales]; }; + scico = derive2 { name="scico"; version="1.5.0"; sha256="1c6905y62s03kiah8ykhkag275pn06ihk5szldib2621ysrj2wb4"; depends=[scales]; }; scicomptools = derive2 { name="scicomptools"; version="1.0.0"; sha256="193byqr8sjb0hk1k4qj26pnqr5dgqfsxn47ckddgcvzk6ybd6cpl"; depends=[data_tree dplyr ggplot2 ggwordcloud gitcreds googledrive magrittr purrr readxl SemNetCleaner stringr tibble tidyr tidytext tidyxl]; }; scidesignR = derive2 { name="scidesignR"; version="1.0.0"; sha256="0krr7kn3l4c0dyn9ln3dz0h9ivr21dnrlmncpxiv560wqxnwi7z0"; depends=[]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; @@ -17035,7 +17077,7 @@ in with self; { scipub = derive2 { name="scipub"; version="1.2.2"; sha256="1k06pmpwpmgiglqhh9ca67m74vb961dczc9394xnwfszq9g3gz1n"; depends=[dplyr forcats gghalves ggplot2 purrr stringr tibble tidyr tidyselect]; }; scistreer = derive2 { name="scistreer"; version="1.2.0"; sha256="03nd4p7ik66v09yv18c0z1bvdnkr5m0axk78yapd2ri80ihmyi3c"; depends=[ape dplyr ggplot2 ggtree igraph parallelDist patchwork phangorn Rcpp RcppArmadillo RcppParallel reshape2 RhpcBLASctl stringr tidygraph]; }; sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; }; - scoper = derive2 { name="scoper"; version="1.2.1"; sha256="1f9bdw7w7zgbjhxxxpld8jss7kbr4k9ksxwzr94wzvapgg06v10p"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang scales shazam stringi tidyr]; }; + scoper = derive2 { name="scoper"; version="1.3.0"; sha256="0y0bqdxr4g929paddrgs8qqxzp0pwsc62kxl6lbzp4l2xmg3j2j2"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang scales shazam stringi tidyr]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; scorecard = derive2 { name="scorecard"; version="0.4.3"; sha256="105xqhipd1vlmm23frjq3qjsd0k6q7cxzakrvw0s2r1v8m4iqagv"; depends=[cli data_table doParallel foreach ggplot2 gridExtra openxlsx stringi xefun xml2]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; @@ -17054,46 +17096,47 @@ in with self; { scquantum = derive2 { name="scquantum"; version="1.0.0"; sha256="0v263qxf3qp7hra3l8fyw8a625z9ym2h2zg5b9lsysdiznbi9bww"; depends=[]; }; scraEP = derive2 { name="scraEP"; version="1.2"; sha256="1qkfd4bp3sd3xrh9bdaqwmmvx7f9rvjcch6hi2p387ky04ywwqn4"; depends=[data_table rvest XML xml2]; }; scrappy = derive2 { name="scrappy"; version="0.0.1"; sha256="0dckq2pdqabnv5cinfqgbrjxp55x4z81lp8xh4yhyb2cnz9gdsqy"; depends=[magrittr rvest xml2]; }; - scribe = derive2 { name="scribe"; version="0.2.0"; sha256="1xkzyfxgnh0725aya6v3jxc2sxhd2xlw9lzff7dif32ih2055vrl"; depends=[]; }; + screenshot = derive2 { name="screenshot"; version="0.9.0"; sha256="14mkm5nsnyxvfzlq2gs9m88xgsvqwjra2j9ax1fx6wya970a1skd"; depends=[dplyr fs imager magrittr purrr rlang tibble]; }; + scribe = derive2 { name="scribe"; version="0.3.0"; sha256="02gwv7c107vaphkpr3giz2lqbaabk32fg6yf6zi0sirkp8dph93d"; depends=[]; }; scrime = derive2 { name="scrime"; version="1.3.5"; sha256="0y2mh9fsffjf3i15bafpasa17z99c1s75r8g6h4hgcwfgpjx75sx"; depends=[]; }; script = derive2 { name="script"; version="0.1.1"; sha256="1ba0mr77g4v4nv7yfs5yaj7x8yqrl3q8a1yia105pclgwq9ybs8i"; depends=[rstudioapi]; }; scriptName = derive2 { name="scriptName"; version="1.0.1"; sha256="1rd3qj7c7pg454a5mxhr64g4kp15cqf5lf8lbsh9x88llvkjci5v"; depends=[purrr rlang]; }; scriptexec = derive2 { name="scriptexec"; version="0.3.1"; sha256="0k10x0npdga1nmchzz9xxv0qijnq2n9pb49z1g06bmva1z8wb4wg"; depends=[]; }; + scriptloc = derive2 { name="scriptloc"; version="1.0.0"; sha256="0k0dmh833chyvcbw5b7i85m0xgj5kd635h70x5y891jcwdrbccvh"; depends=[]; }; scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.4-0"; sha256="1kn6f0ypkl50jvnxz9sc6nyb0cdcnaccgka984jfsniky16f6sn9"; depends=[Rcpp]; }; - scrobbler = derive2 { name="scrobbler"; version="1.0.2"; sha256="14nnqcjrcc5xcdn2swwj0j2jsw5maayd9ba06s6d5i88png2xhv5"; depends=[httr jsonlite]; }; + scrobbler = derive2 { name="scrobbler"; version="1.0.3"; sha256="1f8vcx79yzhy2698xgr7a863hqhqad1kx1zc9xy83bigghsjq1py"; depends=[httr jsonlite]; }; scrollrevealR = derive2 { name="scrollrevealR"; version="0.2.0"; sha256="0k8ffapwxpb25wphm76arma095hrh3wf0gpkx1z6g4rplahf4jxa"; depends=[glue htmltools]; }; scrutiny = derive2 { name="scrutiny"; version="0.3.0"; sha256="0xjyxakfbc6d0fw7ld5myhip9z2rqx3w3m5hg0g8ghx3j1inm3zj"; depends=[cli dplyr glue lifecycle magrittr purrr rlang stringr tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.6"; sha256="11ncpv01a5lgbxl46g07a43ncjp7jdhrrciasxvxc1d56cz26jh1"; depends=[Rcpp]; }; scryr = derive2 { name="scryr"; version="1.0.0"; sha256="040x2qvgrr8j5k3y2g24kngjys271radqhh3jsqi07dhg9bybr5q"; depends=[dplyr httr purrr tibble]; }; scs = derive2 { name="scs"; version="3.2.4"; sha256="13r944b9ip078hqwdpzn3jv21zm47d9l2b1f5y6glcj5pxs9iwy3"; depends=[]; }; - sctransform = derive2 { name="sctransform"; version="0.3.5"; sha256="02vfgv6v3knmn5nxadjyjkzqmni1sgaf3f9ywm7d0knn0pgmd3n0"; depends=[dplyr future future_apply ggplot2 gridExtra magrittr MASS Matrix matrixStats Rcpp RcppArmadillo reshape2 rlang]; }; + sctransform = derive2 { name="sctransform"; version="0.4.1"; sha256="0wgimf7qqgnnmyspn2rpb4a8hl570fv0fwh0r0r4qgjlpvwffssz"; depends=[dplyr future future_apply ggplot2 gridExtra magrittr MASS Matrix matrixStats Rcpp RcppArmadillo reshape2 rlang]; }; scuba = derive2 { name="scuba"; version="1.11-1"; sha256="1gmwzwkj0ylaqwz33djrv3hrqmwhr23q53yp94hv04mhijdh9myl"; depends=[]; }; scutr = derive2 { name="scutr"; version="0.1.2"; sha256="0wq20zvn839iws9qzaknfisr9r2pipdcvxfjvqmk1bw9irfgj3gm"; depends=[mclust smotefamily]; }; sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; }; - sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; }; sda = derive2 { name="sda"; version="1.3.8"; sha256="14cpl7zj9aamdwyc8c9s7hnf660srvjv66lpnsm837d4r7k19icv"; depends=[corpcor entropy fdrtool]; }; sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdam = derive2 { name="sdam"; version="1.1.4"; sha256="0mqhg47z4knzcy1lxcd9fv8qk8ayszbl6sbxnmq5z0hx6wabkdf8"; depends=[grImport2 multiplex]; }; sdamr = derive2 { name="sdamr"; version="0.2.0"; sha256="1hcgdysa62mrzk2wmy366jpwab65m3qyi8bh7kzgifpwwxh5pv9k"; depends=[car dplyr ggplot2]; }; - sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.19.3"; sha256="1nnvn8mfmymfx7f7vi9hdqp03vdhvngmik1jd4magnc6ghrpcdai"; depends=[cli data_table jsonlite Rcpp rlang shiny shinyjs shinythemes shinyTree]; }; + sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.20.0"; sha256="0s4j1fy80ag03smxibxv6y924q1mvcdchilnjnx4xnyagxx24sl7"; depends=[cli data_table jsonlite Rcpp rlang shiny shinyjs shinythemes shinyTree]; }; sdcLog = derive2 { name="sdcLog"; version="0.5.0"; sha256="0ssjgpfg3z8j9s47nmiw6a5jcsi4pppdxidvzm3sryjz4klallwg"; depends=[broom checkmate cli data_table mathjaxr]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.7.6"; sha256="050b8i0bl7lykglzw3iy16ind12ddi6jx74rwh3gxishzddgy11d"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; sdcSpatial = derive2 { name="sdcSpatial"; version="0.5.2"; sha256="0bnq63akzngvf6r9csg11cb98mhwd8ybrqrk4v2i0iiln70sf7b6"; depends=[raster]; }; - sdcTable = derive2 { name="sdcTable"; version="0.32.5"; sha256="0fw2g541cqylj6l716x50yrp86kkdsz3cm7d1zzvvz48m9v6iv00"; depends=[data_table glpkAPI knitr Matrix progress Rcpp Rglpk rlang sdcHierarchies slam SSBtools stringr]; }; + sdcTable = derive2 { name="sdcTable"; version="0.32.6"; sha256="15jjc25zmxlhh6jvf1ml9q2ngf3blr6c1rarfsx993i4lbb6lg12"; depends=[data_table glpkAPI knitr Matrix progress Rcpp Rglpk rlang sdcHierarchies slam SSBtools stringr]; }; sde = derive2 { name="sde"; version="2.0.18"; sha256="1rk9wqaam21fipsinag3ychfkl6p7fpgbamr0119v8gjgskajxl8"; depends=[fda MASS zoo]; }; - sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; }; - sdetorus = derive2 { name="sdetorus"; version="0.1.8"; sha256="1bf622k9szas3bfxz9f82dn28l1hdqxzpvgqwvzygy9vp2gi4gyp"; depends=[colorRamps mvtnorm Rcpp RcppArmadillo]; }; + sdetorus = derive2 { name="sdetorus"; version="0.1.9"; sha256="186zq6ngii16447sj0r8aw07phq8a431xl77xpp4g3c00v0lxkic"; depends=[colorRamps mvtnorm Rcpp RcppArmadillo]; }; sdm = derive2 { name="sdm"; version="1.1-8"; sha256="130zkhhq1l99r16dii21i87wphb4n10xq70rgimm4x0q7zn0jv5y"; depends=[raster sp]; }; sdmApp = derive2 { name="sdmApp"; version="0.0.2"; sha256="1rfzy3bbdya7amyr43dhhv4cvmrxcan0fv167ldpbf0m9snqrnrx"; depends=[raster shiny sp]; }; - sdmTMB = derive2 { name="sdmTMB"; version="0.3.0"; sha256="1zfsw5g9dssxnrg8lajm2cmxqg8rx2i8r5zyyb0q50mhx7bkhilp"; depends=[assertthat cli clisymbols fishMod generics glmmTMB lifecycle Matrix mgcv mvtnorm nlme RcppEigen rlang TMB]; }; - sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.14"; sha256="1vrl6cb2m26xlyx5wxcxnblcykajjf8rj51598zyffy5kx4xjzyl"; depends=[R_utils raster rgdal]; }; + sdmTMB = derive2 { name="sdmTMB"; version="0.4.0"; sha256="00qlbwybdnxk48sfw7s56xzr3jrnh6ysjn9fyfpm8ry1h4rya55n"; depends=[assertthat cli clisymbols fishMod fmesher generics lifecycle lme4 Matrix mgcv mvtnorm nlme RcppEigen rlang TMB]; }; + sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.15"; sha256="19znyvz98b3ykwqllzs2sjrw4sd6pd90130ws5d739xgpgsj1zwv"; depends=[R_utils raster terra]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; sdpdth = derive2 { name="sdpdth"; version="0.2"; sha256="1yn8fsjxpbagargf3mv0p23vsgnl64dxfkggrzvfp0ylxsx8nnvc"; depends=[Matrix matrixcalc rCMA Rcpp RcppArmadillo rJava]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; }; + sdtmval = derive2 { name="sdtmval"; version="0.4.1"; sha256="1alwjknkgbabmivn1wrrbd0wyrs0hxpvx47ibdn7zl7ksfbhlsld"; depends=[dplyr glue haven knitr lubridate magrittr purrr readxl rlang stringr tidyr tidyselect]; }; sdwd = derive2 { name="sdwd"; version="1.0.5"; sha256="14x5hjdbkr5lsh8x3wninxg88acqh6q50famf6qjlfm7727rdysc"; depends=[Matrix]; }; seacarb = derive2 { name="seacarb"; version="3.3.2"; sha256="11jp08s9kjf4aqw1i9rdy9fba14pafqm00bhxx9ixhw60bb7zb4a"; depends=[gsw oce SolveSAPHE]; }; - seagull = derive2 { name="seagull"; version="1.1.0"; sha256="1kmidbxzs8zrjji6wsn8nrdv5mpfmmf6q30h1w4rc0swx1ycsgx4"; depends=[matrixStats Rcpp RcppArmadillo]; }; sealasso = derive2 { name="sealasso"; version="0.1-3"; sha256="0j43my9mj73ada3bzzxazgwcahm2bhzbmqc128xara46gxvwrbzz"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; }; searcher = derive2 { name="searcher"; version="0.0.6"; sha256="03q9nq5zkj344swq3ppliz6dhwaddls8xv633s6brccmrcgdaivm"; depends=[]; }; @@ -17101,16 +17144,16 @@ in with self; { season = derive2 { name="season"; version="0.3.15"; sha256="0f63ichlnj49g0ni9560avr4415iyj5061pixkjmqj83y7bbsz22"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.9.0"; sha256="0kpmqix7lxlsnhacrhk5aa9gvzng3fg024ngpk5apmhai7m2bp20"; depends=[x13binary]; }; seasonalclumped = derive2 { name="seasonalclumped"; version="0.3.2"; sha256="0a9ryds9l00dw6pr9s6r6fzrby53zz63idjywh127a4ga48jwnq3"; depends=[ggplot2 gridExtra magrittr TTR]; }; - seasonalityPlot = derive2 { name="seasonalityPlot"; version="0.99.3"; sha256="12z15qlvyj9rrljzqbhgh384x53qqylwmzias4bhx0k3hq2qvsrj"; depends=[dygraphs htmltools magrittr plotrix quantmod zoo]; }; + seasonalityPlot = derive2 { name="seasonalityPlot"; version="1.0.1"; sha256="0yksbj2va950k5xzpjnpwchh5kdns09s4mh8qdgl8s8gli8hcjq5"; depends=[dygraphs htmltools magrittr plotrix quantmod zoo]; }; seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.15.4"; sha256="1xy2hacd57v75y5snhn4al7bi71wr994jy6m2sdr6qzzsd5pbgpc"; depends=[forecast xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="2.0.2"; sha256="1x4vvassal1lwb9xnwisrhlx2maaqxl84h7klfy8yg9x80fdrhsw"; depends=[lubridate plyr reshape2 rms survival]; }; - secr = derive2 { name="secr"; version="4.6.1"; sha256="1nx05nnx7gx93fmwcd4l8kvb8jqriadrzqvi9hq6y00x1i5dzyhd"; depends=[abind BH MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sf stringr terra]; }; + secr = derive2 { name="secr"; version="4.6.4"; sha256="1c5nrilm2f2dj6byxkssr7y47rlb16i0934vnvmw53i2zh8ab3a4"; depends=[abind BH MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sf stringr terra]; }; secrdesign = derive2 { name="secrdesign"; version="2.8.2"; sha256="1qldq9f4jgyqwsa0yn3q877680qp8nhg8kfcd62n1wr66mmd8f45"; depends=[abind BH kofnGA Rcpp RcppArmadillo secr sf]; }; secret = derive2 { name="secret"; version="1.1.0"; sha256="063gpyc2s2l6zw1j8b8ppzsv9kjsf0s77s5wcn7ipmwkj8qr2g4b"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; - secrlinear = derive2 { name="secrlinear"; version="1.2.1"; sha256="0bb8wy9rmlznlpcv2ffv1pgxv9lnsn1ppy3z6zqbnr82c57dk44v"; depends=[igraph MASS secr sf sp]; }; - secsse = derive2 { name="secsse"; version="2.6.0"; sha256="1q4aqhjw4yzm0qiysh0nn7vc8bqllgaij4xjikfy2smpxzi6lwc8"; depends=[ape BH DDD geiger ggplot2 Rcpp RcppParallel rlang stringr tibble]; }; + secrlinear = derive2 { name="secrlinear"; version="1.2.2"; sha256="1ivhl5imc7ic72h4v5276d2n02s39j78lcdr0rcx3dqycf3yyqag"; depends=[igraph MASS secr sf sp]; }; + secsse = derive2 { name="secsse"; version="3.0.2"; sha256="08rb3s40jj7jyi7294ba7pm9qgycdpk1lp18krh464jbr0iim62h"; depends=[ape BH DDD geiger ggplot2 Rcpp RcppParallel rlang tibble]; }; secuTrialR = derive2 { name="secuTrialR"; version="1.1.1"; sha256="0i45zhbbvq052yn04j0xg69minclr7ns7f1pqdahx1cmf274pl42"; depends=[dplyr haven lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; secure = derive2 { name="secure"; version="0.6"; sha256="1i0csl90w4qvhpnrxwrdhxzlmjw7hn30py36r41cd28igycz2bw3"; depends=[MASS Rcpp RcppArmadillo]; }; sedproxy = derive2 { name="sedproxy"; version="0.7.5"; sha256="1n5970pbdc0zl9vh0fslirlww56as5c090mnhzbic1fdzkhli245"; depends=[dplyr ggplot2 mvtnorm rlang tidyr]; }; @@ -17124,31 +17167,32 @@ in with self; { seeds = derive2 { name="seeds"; version="0.9.1"; sha256="0adk7y5ripg78bwkdgnlfwq9w9h6mlpdrikgbnn5z8az2qahc0in"; depends=[callr coda Deriv deSolve dplyr ggplot2 Hmisc MASS matrixStats mvtnorm pracma R_utils Ryacas statmod tidyr]; }; seeker = derive2 { name="seeker"; version="1.1.3"; sha256="0vq7spb0wdlzgzgljqsrf7ym6in8vbis2607fj2gpxm0643gff3k"; depends=[affy AnnotationDbi BiocManager biomaRt checkmate curl data_table foreach GEOquery glue jsonlite qs R_utils RCurl readr sessioninfo tximport withr yaml]; }; seer = derive2 { name="seer"; version="1.1.8"; sha256="13r26iyciq9wbzn4r3447s4j4m6k5sdymp704i6hkf0fphv4340c"; depends=[dplyr forecast forecTheta furrr future magrittr purrr randomForest stringr tibble tsfeatures urca]; }; - seewave = derive2 { name="seewave"; version="2.2.1"; sha256="0whfanh3949162575ddw5y6s5ydq9v24l929gwdd1jv16xzlnp9h"; depends=[tuneR]; }; + seewave = derive2 { name="seewave"; version="2.2.3"; sha256="13c48sn453yp4j0ap8slnnr2gfhlxasz926p2pazkrg817w7m28z"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; }; segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; }; segRDA = derive2 { name="segRDA"; version="1.0.2"; sha256="0az27z4pppyz5slckwmgk6qqix710m1s96drlq4fh8bqn2qmz812"; depends=[vegan]; }; - segclust2d = derive2 { name="segclust2d"; version="0.3.0"; sha256="0gzxm4dgkfh80vyxl5xxhjr26s5hnzn85dmcvavfihbhqin6nj1s"; depends=[cli dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 rlang scales zoo]; }; + segclust2d = derive2 { name="segclust2d"; version="0.3.1"; sha256="0g1x3871ah2vxyr8rk0dgjkcfridg7zhjsp9ahl50ighmmjdg9mp"; depends=[cli dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 rlang scales zoo]; }; segen = derive2 { name="segen"; version="1.1.0"; sha256="1l60rb1w0rfp1rv5favi4yxzyqs1nb1881mcz66xv789r3awhp11"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments narray philentropy purrr readr Rfast scales tictoc]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; segmenTier = derive2 { name="segmenTier"; version="0.1.2"; sha256="01xbcddinjbkbqkwq2lnsxd3gw8fxys58p498dc2lw8psz3g2wgc"; depends=[Rcpp]; }; segmented = derive2 { name="segmented"; version="1.6-4"; sha256="14ci6hd5xlrz22gvnvy2fzpnp50fbds3wpx4mf2fgi5i7sp0hb27"; depends=[MASS nlme]; }; segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; }; segmetric = derive2 { name="segmetric"; version="0.3.0"; sha256="1cpkak3d91xjz6z4ls29ys1m5gmkqm7pq86vs88xy51z0av4kji7"; depends=[magrittr sf units]; }; - segregation = derive2 { name="segregation"; version="0.6.0"; sha256="0yajbbrbrkk6blb6r5y5fwvfz0j8kbc8fr91kb4f53j1afcbbhbx"; depends=[data_table]; }; + segregation = derive2 { name="segregation"; version="1.0.0"; sha256="170nikyari6kzzplkp8siv24278bjf4vv3w893yrlmqr0hfvw9gb"; depends=[checkmate data_table Rcpp RcppProgress]; }; segregatr = derive2 { name="segregatr"; version="0.3.0"; sha256="1n6fdq16lymfk49z75y2d9s8n9l0v8i0987cfnxigqz8h5jyzm6x"; depends=[pedprobr pedtools]; }; sehrnett = derive2 { name="sehrnett"; version="0.1.0"; sha256="0nsgaf79cs2fnjb42vzlmbi92290vrlp5bpgg6mnik3yh5fq2ndr"; depends=[DBI dplyr magrittr purrr RSQLite tibble]; }; seismic = derive2 { name="seismic"; version="1.1"; sha256="0sxvbknx5ws04nzvj1p9wimrs5swzzds613sflf13v9757vm7pxf"; depends=[]; }; - seismicRoll = derive2 { name="seismicRoll"; version="1.1.4"; sha256="036yvfgy6d4dppfgqd8yx08k3mb03p44hch1ihcmmramz5cvdc29"; depends=[Rcpp]; }; + seismicRoll = derive2 { name="seismicRoll"; version="1.1.5"; sha256="1c0aiqm83w25p5x3rk7niibraxx6m470y0d0d17r61b746sp85ms"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; selcorr = derive2 { name="selcorr"; version="1.0"; sha256="0xasxjb0hk84ai4338pkddy7w02ih2q8v4vgn2zdc744jb9f0gqb"; depends=[MASS]; }; selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; }; selectapref = derive2 { name="selectapref"; version="0.1.2"; sha256="0njibljh3hiqdn4wdb031bdg1bh3xpixgczbi5i01gaavybsq4cc"; depends=[]; }; - selection_index = derive2 { name="selection.index"; version="1.1.4"; sha256="1d738yn30j19302bqx5v9fk357p9jqa0cjj0k9xiq2pvvhcdld3h"; depends=[]; }; + selection_index = derive2 { name="selection.index"; version="1.2.0"; sha256="0yqg0j0sifpc25qpndrmnam64qy1qbzazqqs8rz99lynkwn3z1fh"; depends=[]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.710"; sha256="0gbfzm1kzlc2lf1jfd0gxv8nlnm5bw6w7b55m48338lxb4zyhjcc"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.5"; sha256="07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh"; depends=[adaptMCMC glmnet intervals MASS Rcpp survival]; }; selectr = derive2 { name="selectr"; version="0.4-2"; sha256="09y1n3iy297g49xlpl7xrjpwgnm57pskx5991lyfcpizbz8ax22m"; depends=[R6 stringr]; }; selectspm = derive2 { name="selectspm"; version="0.6"; sha256="02gzbzjdr8ij9gsrvx8wmz9q8r35zjniwcri2hmiz57h0svybvll"; depends=[ecespa spatstat spatstat_explore spatstat_geom spatstat_model spatstat_random]; }; + selenider = derive2 { name="selenider"; version="0.1.2"; sha256="1h0w8y0sqx9q9df64qik04sklgrpc1a0kjkqjr8isdy4bf6zpcxg"; depends=[cli coro curl lifecycle prettyunits processx rlang vctrs withr]; }; seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-15"; sha256="05hk72zxvyv6kkjhk5y6qw253c64108az7030z8j1sz8wq03n0md"; depends=[boot MASS mi]; }; @@ -17160,17 +17204,18 @@ in with self; { semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.2.1"; sha256="0518pdxgjjv8ql1aaysk64pv1pa01bbg3s7qdibw1v0c6pcf3adb"; depends=[checkmate glue htmltools shiny shiny_semantic]; }; semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; }; semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; - semfindr = derive2 { name="semfindr"; version="0.1.5"; sha256="1yqk6jvs28xjm929avm198m3jacdgv32ki4azdl58nqgss2hr26v"; depends=[ggplot2 ggrepel lavaan Matrix rlang]; }; + semfindr = derive2 { name="semfindr"; version="0.1.5.4"; sha256="0rnv8aifwsfimfwpd2mf5ihqb6wjb3kcrgxhxkihbk9ds9kvj11i"; depends=[ggplot2 ggrepel lavaan Matrix rlang]; }; semgram = derive2 { name="semgram"; version="0.1.0"; sha256="0l5n176mhjkn5kcjd1kfq9s897rg510m1acnmjxcaw0kmmhi4ggs"; depends=[data_table rsyntax stringr]; }; - semhelpinghands = derive2 { name="semhelpinghands"; version="0.1.8"; sha256="1qmn4hmfzf0k675cx24iadxfcwij17940dx58x5x48ngql4h48kw"; depends=[boot ggplot2 ggrepel lavaan rlang]; }; + semhelpinghands = derive2 { name="semhelpinghands"; version="0.1.9"; sha256="03y571fvc2cglqsci5ibg178bdc9pg1w8n0kk2b5ir65kyqsqbih"; depends=[boot ggplot2 ggrepel lavaan rlang]; }; semiArtificial = derive2 { name="semiArtificial"; version="2.4.1"; sha256="0zsn3r5n7n3dsa02i194lr6ail7mizq9xp8x3kc5k17z4ckcfysd"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; }; semicmprskcoxmsm = derive2 { name="semicmprskcoxmsm"; version="0.2.0"; sha256="00nxmyp4g1pxzqrw3zd5il92vinzpy12wnjnpm33nbh4wx2i5356"; depends=[fastGHQuad ggplot2 Rcpp survival twang]; }; seminr = derive2 { name="seminr"; version="2.3.2"; sha256="1385wwh7b0fq4jqm6ragdywwafdidq4scbljzbdpvm3wis07abqv"; depends=[DiagrammeR DiagrammeRsvg glue knitr lavaan rmarkdown testthat webp]; }; semlbci = derive2 { name="semlbci"; version="0.10.3"; sha256="0s85i82yfa305j7az775n41qn17z197invgas06nj09yk0v87jni"; depends=[ggplot2 ggrepel lavaan MASS nloptr pbapply rlang]; }; + semmcci = derive2 { name="semmcci"; version="1.1.3"; sha256="18q67mynvms3gxhsm5r0ypb06s059yy5qn1ygnll1qzqcd94wyx2"; depends=[lavaan mice]; }; semmcmc = derive2 { name="semmcmc"; version="0.0.6"; sha256="13asqiw3zazh9k3p39582a0bzm00gmagls2w76kvpygilj4r5391"; depends=[MASS msm]; }; semnar = derive2 { name="semnar"; version="0.8.1"; sha256="18c509yh52sdmvm60p0kzyz86fmzi0by4gnb2jw8nppv8qlnz6zb"; depends=[jsonlite leaflet lubridate parsedate urlshorteneR]; }; semnova = derive2 { name="semnova"; version="0.1-6"; sha256="1vghf8gy0vahwn3nq752wm0rbj33jdy69yqjzin94sk8xa42d0wi"; depends=[lavaan MASS Matrix]; }; - semptools = derive2 { name="semptools"; version="0.2.9.11"; sha256="15bc9xdfff0zcip1g92285xxfbrgvay9m2c9xr7d7c5sxsdj293b"; depends=[dplyr lavaan rlang semPlot]; }; + semptools = derive2 { name="semptools"; version="0.2.10"; sha256="15rzkavr3njaln9mgn93ypbxw93prskvxw1s0865xqp58mh14k8y"; depends=[lavaan rlang semPlot]; }; semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; semtree = derive2 { name="semtree"; version="0.9.18"; sha256="0d3qrv9461kgcgy3m2rsld792him157xzmmv71qrlhkjcs4h5lb6"; depends=[bitops clisymbols cluster crayon data_table digest future_apply ggplot2 lavaan OpenMx plotrix rpart rpart_plot sandwich sets stringr strucchange tidyr zoo]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; @@ -17183,7 +17228,7 @@ in with self; { sensemakr = derive2 { name="sensemakr"; version="0.1.4"; sha256="1bwc4m9fz250iyq5rl63ncgnb5f9490aas8gp51r7yljagq584va"; depends=[]; }; sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.28.1"; sha256="1r57vp9s0hs5z6p9ln0vy5d3b72mp98x48kx85z3sqvqbqvycvdb"; depends=[boot dtwclust foreach ggplot2 numbers Rcpp RcppArmadillo]; }; + sensitivity = derive2 { name="sensitivity"; version="1.29.0"; sha256="1bycbkn6j4mslj1330fvfkid5zv6bmqhvs8aj0l5vyk0pmf17ln7"; depends=[boot dtwclust foreach ggplot2 numbers Rcpp RcppArmadillo]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; }; @@ -17199,10 +17244,8 @@ in with self; { sentimentr = derive2 { name="sentimentr"; version="2.9.0"; sha256="0i0lg2fl079wjv30lpqcxhx62miqakb9kzwwhrr4c18kl0bxbaav"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; sentometrics = derive2 { name="sentometrics"; version="1.0.0"; sha256="06qvwfgshr70n1qgf2zqjvycwwrak8d5hfyn3v5k2qzkfaxkihmm"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; sentopics = derive2 { name="sentopics"; version="0.7.2"; sha256="0gi52lxkmhbhlsbpamwcrji1y664lrwk3k0pigc2gad3za9rdimc"; depends=[data_table quanteda Rcpp RcppArmadillo RcppHungarian RcppProgress]; }; - sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; separationplot = derive2 { name="separationplot"; version="1.4"; sha256="1dvm073mckn6mkyf6fvclc8glsr8d3p2413x5i91w00hphm2lg8z"; depends=[foreign Hmisc MASS RColorBrewer]; }; sepkoski = derive2 { name="sepkoski"; version="0.0.1"; sha256="1jx1ilbz7md501035vklk5bsw8krg8dn18pwkqynsacqy8wjwl2s"; depends=[]; }; - seq2R = derive2 { name="seq2R"; version="2.0.0"; sha256="1ynhmfch8w2s0mh55km6v9afn0z3p43ckg79cz08d2z25lv5syrj"; depends=[seqinr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.2"; sha256="10p8ldj83mvhpcz1yas4xns5qh8zbs533na8nv87phngi8dsb76m"; depends=[survival]; }; seqHMM = derive2 { name="seqHMM"; version="1.2.6"; sha256="17rphq6n2pzgxma0v27vaixi4a343gzc6sk15czfd96kfz7m0gad"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; @@ -17213,17 +17256,17 @@ in with self; { seqimpute = derive2 { name="seqimpute"; version="1.8"; sha256="1vivs790zbwm8c7fwifz0nj0n9wzjmr8whz0f4pwp44gvcickxwn"; depends=[Amelia cluster dfidx doRNG doSNOW dplyr foreach mice mlr nnet plyr ranger rms stringr swfscMisc TraMineR]; }; seqinr = derive2 { name="seqinr"; version="4.2-30"; sha256="0jzfbzai2r5bprynq337s1a4k66m34p5k9nzzmbyzvk7719zxy7s"; depends=[ade4 segmented]; }; seqmagick = derive2 { name="seqmagick"; version="0.1.6"; sha256="1xdi18jsns1m4sxdy4iagrfwz7mkw0182ir0b0db5r9r7xxjr1sg"; depends=[Biostrings magrittr]; }; - seqminer = derive2 { name="seqminer"; version="8.9"; sha256="1cnsy1cjz4rcm32hzcvr1d43y4m7sdkzim1mwsn3490mf3xmi3i1"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="9.1"; sha256="0vdprasxy4dc9p5k43xgcmi0q50iapgcam43qzbh1kr0vi6fgqkr"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.4"; sha256="1aqrg9aqvsabg5mm9jfj5vaxxaapfs1qw3yyzbx7vsspcgjdhyca"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; - sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; - sequoia = derive2 { name="sequoia"; version="2.5.6"; sha256="1nw0yq6b4apm26dxzbrzqdndv55lkv8diayp6ghj93n6c0yws720"; depends=[plyr]; }; + seqtrie = derive2 { name="seqtrie"; version="0.2.5"; sha256="1bawix2b1m4pqxxljf8ljl44x37px9snr9q1x9hz6c0dy6ipwlij"; depends=[BH R6 Rcpp RcppParallel]; }; + sequoia = derive2 { name="sequoia"; version="2.7.2"; sha256="0slh9k3blxpfj8rrln85rxq507fqygwmvclqhnp2dsrmp9z4pj74"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.9.1"; sha256="0mgrrlny1qfddznyc34awh8vkbjnyskbyqrxszdhsm2c5wgp2nwh"; depends=[bit64 DBI dbplyr dplyr htmltools httr jsonlite magrittr purrr readr scales stringi tibble]; }; serial = derive2 { name="serial"; version="3.0"; sha256="1y1gj0lcdn5apiv6c6arks6pqhsbvnrfym6n2izjarx2c27ijrjj"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.5.1"; sha256="0q52lvcxgiqs1x0vyjrahkj8mdxc9s3514064fsqgwns4s03j1aa"; depends=[ca cluster colorspace foreach gclus MASS qap registry TSP vegan]; }; serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; serp = derive2 { name="serp"; version="0.2.4"; sha256="0hd25rxknj636ssy2289xjvq5fflp2p561yb9w0siqihfc7cfjpc"; depends=[crayon ordinal]; }; - serpstatr = derive2 { name="serpstatr"; version="0.2.0"; sha256="1l7hj4npnggmg6fsk5lydg6vrad791hvmv9rhx7yb0nsa1pzi155"; depends=[httr]; }; + serpstatr = derive2 { name="serpstatr"; version="0.2.1"; sha256="09yzxkwgargd42f0bngv6jzhd8arzbvwj2js7lb9yf7vhjq1xv5f"; depends=[httr]; }; serrsBayes = derive2 { name="serrsBayes"; version="0.5-0"; sha256="1w8fs9k4zhy0hwkm30dvi360n28cl2gn9vdqaak64g0nlvb9jy1w"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; servr = derive2 { name="servr"; version="0.27"; sha256="1iaqah3896660d609fb6960x3mg17jak3j5akmmli0z4pdb3rhh1"; depends=[httpuv jsonlite mime xfun]; }; @@ -17231,7 +17274,7 @@ in with self; { sessioninfo = derive2 { name="sessioninfo"; version="1.2.2"; sha256="1jy7n37qnrb4fgzmn8s8yf7kv29yw27x8zklwf8qdb2kgj2q6qpm"; depends=[cli]; }; set = derive2 { name="set"; version="1.2"; sha256="0f36dp9k0nxp1amsd7ybwgbv0vxvgd1kns7cbfsbsh0kljxyplzp"; depends=[do]; }; setRNG = derive2 { name="setRNG"; version="2022.4-1"; sha256="09089vr5x8snwxh38kdhgpjl3jl7zrk056f6f9a2jg5lsrmnxh31"; depends=[]; }; - setartree = derive2 { name="setartree"; version="0.1.0"; sha256="16n5si4rb1qabyw20wjxhcspnhzkic4b10akxc1agh3a8c7mi819"; depends=[generics]; }; + setartree = derive2 { name="setartree"; version="0.2.1"; sha256="13j0shmnnwnbkzgl1wnirvfd9yi29smn3a5cjxg5xg89bjh77wc6"; depends=[generics]; }; sets = derive2 { name="sets"; version="1.0-24"; sha256="1jfaxdyr3w5p086yh7n6661dipc4rx6ak92hp6gv13j1r7sk6mz7"; depends=[]; }; setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.7"; sha256="1i9ij5k8p2v9gxr48vas8hj337mbyx9c4ywv9bbdwkz6kzah46k5"; depends=[]; }; @@ -17246,7 +17289,7 @@ in with self; { sfdct = derive2 { name="sfdct"; version="0.1.0"; sha256="0p3ipp6x8vnsi94078n098yk9wglnawvzh19imcgk2c1l5lazwgf"; depends=[dplyr RTriangle sf sp tibble]; }; sfdep = derive2 { name="sfdep"; version="0.2.3"; sha256="18m6lvkkgmyq7x335bhj5arv45k9093ph1y4wlh1lviwv8r3phf5"; depends=[cli rlang sf spdep]; }; sfheaders = derive2 { name="sfheaders"; version="0.4.3"; sha256="0j23irx9gmcvxkcsixvyf8xhbjv2fjsbdz5xbx08ab6yjxr1p8d3"; depends=[geometries Rcpp]; }; - sfhotspot = derive2 { name="sfhotspot"; version="0.7.1"; sha256="0sccgnq0l6wnnsmpjz8ka62g28ffcsdl3zds6apz79yhacdvmgvj"; depends=[ggplot2 rlang sf SpatialKDE spdep tibble]; }; + sfhotspot = derive2 { name="sfhotspot"; version="0.8.0"; sha256="17vlayqqhv59p9mhrxzxs5r6gfqd6wyyi1k6p05n2sd9c06jzadb"; depends=[ggplot2 rlang sf SpatialKDE spdep tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; sfnetworks = derive2 { name="sfnetworks"; version="0.6.3"; sha256="0caqqcdkm5g8f08k7dws6gcm560m88w6g98sbx0bsamf54cxda33"; depends=[crayon dplyr igraph lwgeom rlang sf sfheaders tibble tidygraph units]; }; sfo = derive2 { name="sfo"; version="0.1.2"; sha256="0q821i9w4kbzpmiym1sha086nr59yydbyig84jy7hws186lkvi7m"; depends=[]; }; @@ -17254,7 +17297,7 @@ in with self; { sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sftime = derive2 { name="sftime"; version="0.2-0"; sha256="1ymi60ag8kqb3293bdcvb83zwsgrz000ylifjvlpzzmh1xsisanq"; depends=[sf]; }; sftrack = derive2 { name="sftrack"; version="0.5.4"; sha256="0cm87fla8bnhp1j35wq2llw1jziqhgfcj1yn503z4ds40gh4wnqa"; depends=[sf]; }; - sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; + sgPLS = derive2 { name="sgPLS"; version="1.8"; sha256="16cjhrla1f4pf2gqfnbi5n1ai69nbr80crwn1f29ldk483d6hjc5"; depends=[mixOmics mvtnorm]; }; sgat = derive2 { name="sgat"; version="0.9"; sha256="14sniq5yfh7xmbnd8d0ighw97352qjgfdg587a6hxafisx9is61p"; depends=[data_table dplyr plyr qdapRegex RCurl RSelenium stringr]; }; sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; @@ -17265,18 +17308,17 @@ in with self; { sglr = derive2 { name="sglr"; version="0.8"; sha256="0f4ndx0a50km7iwwqxbxv10rb5c96210vgimaskjlmsbpaqna601"; depends=[ggplot2 rlang shiny]; }; sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; }; sgo = derive2 { name="sgo"; version="0.9.2"; sha256="1vd1ak6j3c7kg3chqjz3v0aijicba2fcq1h8zy4ah1kjf8cfxklw"; depends=[]; }; - sgof = derive2 { name="sgof"; version="2.3.3"; sha256="0gl54j0vjqvgyc4p0n5q818c862ykdzwz9cdypfw3r7jjgws2ar2"; depends=[poibin]; }; + sgof = derive2 { name="sgof"; version="2.3.4"; sha256="11y3c77yvq3xl3l596zgc1da4jdicyrrxn751dxh5ha21y98w31m"; depends=[poibin]; }; sgolay = derive2 { name="sgolay"; version="1.0.3"; sha256="0qry7286kw6ks5kc3wp89ax43smmb6b77gral72izpbw5wkblphm"; depends=[signal]; }; sgpv = derive2 { name="sgpv"; version="1.1.0"; sha256="0w0slnnw239a34c0h7xr76c4m0rfwl0hq61g9n12vzxd6lfh3gqz"; depends=[]; }; sgr = derive2 { name="sgr"; version="1.3.1"; sha256="0m7rl3yii6zz4p21aiaifj1ram6gi6x5kywpyx9yjan79180q8h7"; depends=[MASS]; }; - sgs = derive2 { name="sgs"; version="0.1.0"; sha256="0j1lcq8h4zz5786fmybm94fpb7s1dm6qjb8s9nqrpj76nblxkr0x"; depends=[caret faux MASS Matrix Rcpp RcppArmadillo Rlab SLOPE]; }; + sgs = derive2 { name="sgs"; version="0.1.1"; sha256="0glyxlimh97qyhjsqkal05ncjmr6wqa00y9fa4j9ilkqyq6nn0jq"; depends=[caret faux MASS Matrix Rcpp RcppArmadillo Rlab SLOPE]; }; sgsR = derive2 { name="sgsR"; version="1.4.4"; sha256="0c5cy2kmx37d76ywad13wzmpghxvavvpxb26a2rrnn399m1dgjg2"; depends=[BalancedSampling clhs dplyr ggplot2 SamplingBigData sf spatstat_geom terra tidyr]; }; sgstar = derive2 { name="sgstar"; version="0.1.2"; sha256="0b3bw10lf5h4kgg3c0s3lxsafaffhn8gc9kxmg7bg35lbxv0r1vn"; depends=[dplyr ggplot2 tidyr]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; shadowr = derive2 { name="shadowr"; version="0.0.2"; sha256="0b5x7pwz6zf7466yxrrl4yzq57ifhiwb5cmly7vq36f98gnsmzvl"; depends=[RSelenium]; }; shadowtext = derive2 { name="shadowtext"; version="0.1.2"; sha256="0zdfidrcnmxmfhngv86ppxrjmpmz9kl78l4yfah2lc5vgmrlwg15"; depends=[ggplot2 scales]; }; - shallot = derive2 { name="shallot"; version="0.4.10"; sha256="05ciafpahcrsh9kwg1yqwbmanvkbv1i1cjjpvq3w4cdqkhn4fam7"; depends=[commonsMath rscala]; }; shape = derive2 { name="shape"; version="1.4.6"; sha256="0yqbrrx2ywmfl99s6d1n6jblc63k1mxbiqyv8y0kq8jws1g3w45r"; depends=[]; }; shapeNA = derive2 { name="shapeNA"; version="0.0.2"; sha256="1ivp8kvnacr2fx3rs7ckzdpinb6bifzzw7riskzj95lygjlkvabw"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="1.0-1"; sha256="02al1g9ycfb63mcx4s16abniggl825ihjanx6silbpv6dn6g1ms8"; depends=[jpeg MASS pixmap plotrix vegan wavethresh]; }; @@ -17284,25 +17326,26 @@ in with self; { shapes = derive2 { name="shapes"; version="1.2.7"; sha256="155q6asc9202f85snyjaxhm8qpj7swgzhg95sisjy506gvcb6c8z"; depends=[MASS minpack_lm rgl scatterplot3d]; }; shapper = derive2 { name="shapper"; version="0.1.3"; sha256="1jaj9j894md45611gdrz05n0kfakawf7vlcc3zxhwdh3f7kwz4lp"; depends=[DALEX ggplot2 reticulate]; }; shapr = derive2 { name="shapr"; version="0.2.2"; sha256="0c8vivr1ia7x4jvdsffv06nl2yahxx38r5xbws5cdkalhbhlwv4h"; depends=[condMVNorm data_table Matrix mvnfast Rcpp RcppArmadillo]; }; - shapviz = derive2 { name="shapviz"; version="0.9.1"; sha256="1lbkfdfflm18mcmsq95ylihmmy3dypvh1w6c10xglhc4g1434sva"; depends=[ggfittext gggenes ggplot2 ggrepel patchwork rlang xgboost]; }; - shar = derive2 { name="shar"; version="2.0.3"; sha256="09m3wg3wk2k2xnf3jip1irmjp59i7f2q70xwrz1j2macm6x0pa1m"; depends=[classInt spatstat_explore spatstat_geom spatstat_model spatstat_random terra]; }; - sharp = derive2 { name="sharp"; version="1.4.2"; sha256="094ixdm4d90l4ggzpali50d0b20bk35b9b0ivzbianq7naqbv6w7"; depends=[abind beepr fake glassoFast glmnet igraph mclust plotrix Rdpack withr]; }; + shapviz = derive2 { name="shapviz"; version="0.9.2"; sha256="1wb61zmwx9nzxgn8y71h1j66xd3q78l31x9qd395d4m6g4xiry0c"; depends=[ggfittext gggenes ggplot2 ggrepel patchwork rlang xgboost]; }; + shar = derive2 { name="shar"; version="2.1.1"; sha256="08bzx1vd86i5nl97i3rqdh0m62xr5zs2j6zvc4pqxg1b9ms1kklk"; depends=[classInt spatstat_explore spatstat_geom spatstat_model spatstat_random terra]; }; + sharp = derive2 { name="sharp"; version="1.4.4"; sha256="1472ax8aq5la2c4lga967r6c25jdhvs80q636r9p73iwyl0x36sz"; depends=[abind beepr fake glassoFast glmnet igraph mclust plotrix Rdpack withr]; }; sharpData = derive2 { name="sharpData"; version="1.4"; sha256="1pnza52wqczjds4vp2fy9ky41y7lyj9ywam11nsr0mpv63jglnc5"; depends=[KernSmooth quadprog]; }; - sharpPen = derive2 { name="sharpPen"; version="1.8"; sha256="11pvah41gi3xhb1n30k8ql28m3f47nnsd37z3mcjs0pv1lbacps2"; depends=[glmnet KernSmooth MASS Matrix np]; }; + sharpPen = derive2 { name="sharpPen"; version="1.9"; sha256="0ra1iq6bfiy87arj7nb4s4adiji3pcp7vrjhsfbm2agfw05k4zj4"; depends=[glmnet KernSmooth locpol Matrix np]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.4.3"; sha256="0ndqckz7pi099yynzfwzcbz9jcz93bb9jcd2a4px2sjbagfmx7ag"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; - sharpshootR = derive2 { name="sharpshootR"; version="2.1"; sha256="0vv1645060696c3jjy41m8wqly8a4hds5w123vvz7j09cdxfs632"; depends=[ape aqp circular cluster curl digest e1071 Hmisc lattice plyr RColorBrewer reshape2 scales soilDB stringi vegan]; }; + sharpshootR = derive2 { name="sharpshootR"; version="2.2"; sha256="0qy2glasnsmrdbgx7pvbhi0dzidgkfjl67ay5gkfjdy477n5micy"; depends=[ape aqp circular cluster curl digest e1071 lattice plyr RColorBrewer reshape2 scales soilDB stringi vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; shattering = derive2 { name="shattering"; version="1.0.7"; sha256="0dmb57pdgzwm001gfm1zm8ba7x71bp2vjk4ml0cy4r05hpdswfh3"; depends=[e1071 FNN NMF pdist pracma rmarkdown Ryacas slam]; }; - shazam = derive2 { name="shazam"; version="1.1.2"; sha256="08zz5sr8vpnibpi6n3s16grcl0vhg2gw27p79h9mkqvz1d5hy7ql"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr tidyselect]; }; + shazam = derive2 { name="shazam"; version="1.2.0"; sha256="16bkwm903v4hv6ng6ncfzax2s5x8qfa4ldlwzclry7iggniq7dzh"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr tidyselect]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; sherlock = derive2 { name="sherlock"; version="0.7.0"; sha256="1hqi2gd5xjczkic34gq35467k3ccswpvy3qlch66blqpppadmzgk"; depends=[cowplot dplyr forcats fs ggh4x ggplot2 magrittr openxlsx plotly purrr readr rlang rstudioapi scales stringr tidyr tidytext]; }; shidashi = derive2 { name="shidashi"; version="0.1.5"; sha256="133pm4chyp9gm050bgccpfi9g4b83m76g23jc59761z229v868p7"; depends=[digest fastmap formatR httr jsonlite shiny yaml]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; shinipsum = derive2 { name="shinipsum"; version="0.1.0"; sha256="0d94189hmg0bl8x0s8fpba5gcvb95sr9k9lbp3kk8482fc5h147n"; depends=[attempt DT dygraphs ggplot2 magrittr plotly]; }; - shiny = derive2 { name="shiny"; version="1.7.4.1"; sha256="07r5jk52hxx336zbqia1wlkkxka9csil6qgmk1dwkc1hvsj5jhr6"; depends=[bslib cachem commonmark crayon ellipsis fastmap fontawesome glue htmltools httpuv jsonlite later lifecycle mime promises R6 rlang sourcetools withr xtable]; }; + shiny = derive2 { name="shiny"; version="1.7.5.1"; sha256="0ipvwvhlhfrsp485pki4hy97v6s1sh851k3f5xsq1583r0fdj8r0"; depends=[bslib cachem commonmark crayon ellipsis fastmap fontawesome glue htmltools httpuv jsonlite later lifecycle mime promises R6 rlang sourcetools withr xtable]; }; shiny_benchmark = derive2 { name="shiny.benchmark"; version="0.1.1"; sha256="14k51vhd3gngdpg67kn9gsd6i47sn9vkxx1qni139jlza7g9n0jx"; depends=[dplyr fs ggplot2 glue jsonlite progress renv shinytest2 stringr testthat]; }; shiny_blueprint = derive2 { name="shiny.blueprint"; version="0.2.0"; sha256="1g0c0iqp5yx24yzzxjnh7yjflx0k5pgkz6p415ml39pyczgq7107"; depends=[checkmate htmltools shiny shiny_react]; }; + shiny_emptystate = derive2 { name="shiny.emptystate"; version="0.1.0"; sha256="07vw8dw6yv3gqp400h2b1x2nv2v3hzgfgmhb8fxxdicbx08vxv47"; depends=[fontawesome htmltools R6 shiny]; }; shiny_exe = derive2 { name="shiny.exe"; version="0.2.0"; sha256="0657ywbnkg3k67321v9rkmfqqrkn89qzyidri0gfhs53c96yrijm"; depends=[]; }; shiny_fluent = derive2 { name="shiny.fluent"; version="0.3.0"; sha256="14cqa2czg3b60cxb8v4kycgk74cgdg9y8pg76mglnjv6rksmvwkl"; depends=[htmltools jsonlite rlang shiny shiny_react]; }; shiny_i18n = derive2 { name="shiny.i18n"; version="0.3.0"; sha256="0kcdvan8ds1kdqdxk6yvqpxlxv6xj4nxr8mp1qns3fzklyf4n4gy"; depends=[glue jsonlite R6 rstudioapi shiny stringr yaml]; }; @@ -17319,18 +17362,20 @@ in with self; { shinyBS = derive2 { name="shinyBS"; version="0.61.1"; sha256="0h51685a9qll4agayldjyryi60ih969219ibg071slv0613p5v8a"; depends=[htmltools shiny]; }; shinyChakraSlider = derive2 { name="shinyChakraSlider"; version="0.1.0"; sha256="1vsbw9dm8ai2w6mfdaksxh13ryh2awajqgkcwcxb99l47h17rvpy"; depends=[htmltools reactR shiny]; }; shinyChakraUI = derive2 { name="shinyChakraUI"; version="1.1.1"; sha256="08qy6qrrprqlarwd3kab9s92dlx51jkhk7mikkf0mdhl6n2q26py"; depends=[fontawesome formatR htmltools jsonlite reactR rlang shiny stringr]; }; - shinyChatR = derive2 { name="shinyChatR"; version="1.0.0"; sha256="1vd8rznqspk3gr8al2qqbkahyk7gf04qgnpd6a3g2gzijrzfdrkx"; depends=[DBI purrr R6 shiny]; }; - shinyCohortBuilder = derive2 { name="shinyCohortBuilder"; version="0.2.0"; sha256="1dai46gqn42ih0n3nlsp6aamq1abkgbjlrpr7m1gc4y94s9ddxlg"; depends=[bslib cohortBuilder dplyr ggiraph ggplot2 glue highr htmltools htmlwidgets jsonlite lifecycle magrittr purrr rlang shiny shinyGizmo shinyWidgets tibble tryCatchLog]; }; - shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; }; + shinyChatR = derive2 { name="shinyChatR"; version="1.1.0"; sha256="08370x2yc8v32h2qgvwd26c2yrx2n89k85sz5dinv110lkrwr6f2"; depends=[data_table DBI purrr R6 shiny]; }; + shinyCohortBuilder = derive2 { name="shinyCohortBuilder"; version="0.2.1"; sha256="1ld8sing87s5r2yxhd5w9wybacx508hgp1crbrpnirq80jnmrazy"; depends=[bslib cohortBuilder dplyr ggiraph ggplot2 glue highr htmltools htmlwidgets jsonlite lifecycle magrittr purrr rlang shiny shinyGizmo shinyWidgets tibble tryCatchLog]; }; + shinyCox = derive2 { name="shinyCox"; version="1.0.1"; sha256="1fl2dj3568x7s47njz2lgnwr12s72mny4wi5gs99wm66mhzi5bf3"; depends=[shiny survival]; }; + shinyCyJS = derive2 { name="shinyCyJS"; version="1.0.0"; sha256="1xgrjk7iyg313x0wkg9q3mp63aidbbhxmjp3jv8cgr4w6qcv0ny6"; depends=[htmlwidgets]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyDatetimePickers = derive2 { name="shinyDatetimePickers"; version="1.1.0"; sha256="1wlll71j8yxgpf08lgsy5hgp0jdy0ldybsqflw2q8vdd3219n67v"; depends=[htmltools lubridate reactR shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.2.0"; sha256="1ajar09hmrk7vcw89wkgvkz2yl0cfnkz915b57w1lmbvpxzgsq3i"; depends=[htmltools shiny]; }; + shinyExprPortal = derive2 { name="shinyExprPortal"; version="1.0.0"; sha256="0vicgrz0l115za2zvjwqmmxbwppq37xmsmd5rrkarqrpv7vwpg7y"; depends=[bslib cli config data_table dplyr DT htmltools iheatmapr markdown qvalue Rfast rlang shiny tidyr vegawidget yaml]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.4.0"; sha256="1xfznq2d4wkk0b0y4k25rwg4d3bhn3gxlkf3chfqk44f4rgril11"; depends=[fontawesome htmltools jsonlite shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.9.3"; sha256="11kjq0vw5c98lzrg80m9w917lkgw5im2h9wgk1b84vlaxrjy2wja"; depends=[fs htmltools jsonlite shiny tibble]; }; shinyGizmo = derive2 { name="shinyGizmo"; version="0.4.2"; sha256="0pjmin2qmfqg5ppqx8ld6pv8y91ci6bagmp4bi476i9bk9q50hz8"; depends=[glue htmltools htmlwidgets magrittr purrr rlang shiny shinyWidgets]; }; shinyGovstyle = derive2 { name="shinyGovstyle"; version="0.0.8"; sha256="1czyz51k0xm62b9bzcsygslm2nd3fnmll4wjxwimlngy00rnjnng"; depends=[htmltools jsonlite shiny shinyjs]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; - shinyHugePlot = derive2 { name="shinyHugePlot"; version="0.2.3"; sha256="1xbhj2vqlq4gw0nv6cw5gxskcp71cbnvk1ykcawr099c1p2p8a8p"; depends=[assertthat bit64 data_table dplyr htmltools jsonlite lazyeval nanotime plotly purrr R6 rlang shiny shinyjs stringr tibble tidyr tidyselect]; }; + shinyHugePlot = derive2 { name="shinyHugePlot"; version="0.2.5"; sha256="0dwx5r31rijnh8fvx74gd8q10glv700r1nf1l9c9c7bpxrmkxkxq"; depends=[assertthat bit64 data_table dplyr htmltools jsonlite lazyeval nanotime plotly purrr R6 rlang shiny shinyjs stringr tibble tidyr tidyselect]; }; shinyIRT = derive2 { name="shinyIRT"; version="0.1"; sha256="01x7nhjs1dx2ldwznhbavc5vzqhgkn73xg395vlf2hgzbxa2ydvj"; depends=[irtoys magrittr mirt psych readxl shiny shinycssloaders shinydashboard]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; @@ -17348,6 +17393,7 @@ in with self; { shinyRadioMatrix = derive2 { name="shinyRadioMatrix"; version="0.2.1"; sha256="195b1990r3b91f4i4azai0i4lxjgw2ngbzdywiy35c1fnmiyy882"; depends=[shiny]; }; shinyRatings = derive2 { name="shinyRatings"; version="0.1.0"; sha256="1hqgp4md0q0mqijp3fxj1z49m6bmjb1r2c2l51796a5arhljxx1y"; depends=[htmltools jsonlite shiny]; }; shinySIR = derive2 { name="shinySIR"; version="0.1.2"; sha256="1g2xcm0n7chswrnw9zq3wz6mimzzf6avhkp1rcd24ga809346jcd"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; + shinySbm = derive2 { name="shinySbm"; version="0.1.5"; sha256="0r6zq235krg4rikpypwp9a2hwblgygl7mmc1phxrpxr8xppgq2da"; depends=[colourpicker config data_table dplyr DT flextable fresh ggplot2 golem magrittr patchwork purrr rmarkdown sbm shiny shinyalert shinydashboard stringr visNetwork]; }; shinySearchbar = derive2 { name="shinySearchbar"; version="1.0.0"; sha256="1v80380vym31aw0i1ghwlbdi2xkf3n59w2as62ywqi79025x3w6y"; depends=[jsonlite shiny]; }; shinySelect = derive2 { name="shinySelect"; version="1.3.0"; sha256="16fnqhw2kd7mamhc4qnravrybbi2fbxkdmdpk07ycnasn00fprp0"; depends=[fontawesome htmltools reactR]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; @@ -17356,7 +17402,7 @@ in with self; { shinyTime = derive2 { name="shinyTime"; version="1.0.3"; sha256="04vpq9fpp1iwila9l33cljig3hfyw7lsg03fqny0q260ka8chhgz"; depends=[htmltools shiny]; }; shinyToastify = derive2 { name="shinyToastify"; version="2.0.0"; sha256="0ipqwgl89pjiycwg78p0db45lbzry989kn6aqjsf79lpvghnk5qs"; depends=[fontawesome htmltools reactR shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.3.1"; sha256="0krffsgdv99cvyzdspb9l7cdnq1vibsbmpd4w48r5pi4v8jbvfj6"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.7.6"; sha256="0y44xlrgdk6y62k5r1mkrlc53w171l1s5la9irqgfclgha3x54jk"; depends=[anytime bslib htmltools jsonlite rlang sass shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.8.0"; sha256="1c5667ndrav8rfcd5cm2bwp21hy7msgnc3s5n4kzyijgdacfbs0s"; depends=[anytime bslib htmltools jsonlite rlang sass shiny]; }; shinyXYpad = derive2 { name="shinyXYpad"; version="0.2.0"; sha256="08acqbh41379p2jh0wc30m4h7rlx81cf578qc604jxnsvilvjr9n"; depends=[shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; shinyalert = derive2 { name="shinyalert"; version="3.0.0"; sha256="1gws8vshnqngm55rnw22qjlqsn9d240p734dnjvsv96d22b8bsnl"; depends=[htmltools knitr shiny uuid]; }; @@ -17369,7 +17415,7 @@ in with self; { shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; shinydashboard = derive2 { name="shinydashboard"; version="0.7.2"; sha256="0hrqkwlpb8rnmp5j74p134g4c4cl16icmwc2ip6k1634fa2y8vm5"; depends=[htmltools promises shiny]; }; shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="2.0.3"; sha256="10sdb1vddx2ij867pqijr63l4233hw1vnn7mzbs0z23g77x8ra29"; depends=[fresh htmltools lifecycle shiny shinydashboard waiter]; }; - shinydisconnect = derive2 { name="shinydisconnect"; version="0.1.0"; sha256="14m83y1iv7qvs1hilc0d18q46qnsciflypgm4dsj7vlvh7ilpdvm"; depends=[checkmate glue htmltools shiny]; }; + shinydisconnect = derive2 { name="shinydisconnect"; version="0.1.1"; sha256="1yhppfx8jpvz48iwxnimcwqhj02vqjrfmh4z5rdn9d35p51c8zjc"; depends=[checkmate glue htmltools shiny]; }; shinydlplot = derive2 { name="shinydlplot"; version="0.1.4"; sha256="1gxr98p2zyvwa6q8a80bz4h1pkgbdn58cwqbd19dbn4liszfxsy8"; depends=[htmltools htmlwidgets plotly shiny shinyBS shinyjs]; }; shinydrive = derive2 { name="shinydrive"; version="0.1.3"; sha256="16yfc9grmjzkpl6xzqn5rpkqd2qnlj4qdgia8img794l6j0y8dgp"; depends=[DT htmltools knitr R_utils shiny yaml]; }; shinyfilter = derive2 { name="shinyfilter"; version="0.1.1"; sha256="00n1l2jzzviz0f2gialj4zc6xfymzqi99raqhmlm0x9fbj1syfga"; depends=[reactable shiny shinyBS shinyjs stringr]; }; @@ -17380,6 +17426,7 @@ in with self; { shinyjqui = derive2 { name="shinyjqui"; version="0.4.1"; sha256="135gwz7syyb6pbn0lkvmq0v1c6r1zivavnqhi1rnzbbzlysi27v1"; depends=[htmltools htmlwidgets jsonlite rlang shiny]; }; shinyjs = derive2 { name="shinyjs"; version="2.1.0"; sha256="1id9gsrkr28xl80a8794in17rxmmz06zqvd5hlns7mqz3fzhrhky"; depends=[digest jsonlite shiny]; }; shinylight = derive2 { name="shinylight"; version="1.1.2"; sha256="0y2gmi8y5b595dca1sch9mzhq2mbbj7mv879md0ajc16ycfi17rp"; depends=[httpuv jsonlite later]; }; + shinylive = derive2 { name="shinylive"; version="0.1.0"; sha256="041qkhr3ynz1haxqv7ndlvygckixj3kj28m8y0laixqvmjdk0lcg"; depends=[archive brio fs jsonlite progress rappdirs rlang]; }; shinyloadtest = derive2 { name="shinyloadtest"; version="1.1.0"; sha256="0684p9anbc3qdn4rqkxp33nm0d04zb264b3blwa23pa5akis2klq"; depends=[curl dplyr ggplot2 httpuv jsonlite magrittr R6 rlang scales stringr svglite vroom websocket xml2]; }; shinylogs = derive2 { name="shinylogs"; version="0.2.1"; sha256="1w19z0zw2k3ni7ckg04q7j0jx4k3cm490z0qccj1smq01wn3czjj"; depends=[anytime bit64 data_table digest htmltools jsonlite nanotime shiny]; }; shinymanager = derive2 { name="shinymanager"; version="1.0.410"; sha256="0nl672dgwj34wm4i3pxk28lv6qw9xsgg3hm0h78q3zdgk8a33kdn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite scrypt shiny]; }; @@ -17393,16 +17440,16 @@ in with self; { shinyr = derive2 { name="shinyr"; version="0.3.0"; sha256="1r4xpb5x0711jbh4v8wkfhgg3s7l1sxqr6i90wsh0k0q3501fs2i"; depends=[caret corrplot dplyr e1071 knitr nnet plotly randomForest RColorBrewer shiny shinydashboard tm wordcloud]; }; shinyrecipes = derive2 { name="shinyrecipes"; version="0.1.0"; sha256="1b4l27qsl1lpssh3jv1pqmw2mq8hanfj0m269yp5618nd5nxd2ck"; depends=[dplyr DT esquisse miniUI purrr recipes rstudioapi shiny shinyglide shinyWidgets sortable stringr tidyr]; }; shinyreforms = derive2 { name="shinyreforms"; version="0.0.1"; sha256="1g1blc57c6zkca0m52bqkw8jwgpplabns07x1cwkk46dmv6sgqci"; depends=[htmltools R6 shiny]; }; - shinyscreenshot = derive2 { name="shinyscreenshot"; version="0.2.0"; sha256="01vm2wc0r3j20hj65q9f0wgffj7r5q2cg5p5mywh1p2rkslgikk3"; depends=[base64enc jsonlite shiny uuid]; }; + shinyscreenshot = derive2 { name="shinyscreenshot"; version="0.2.1"; sha256="1pa1fc0yhsdsc2glyj77zsbpl8qv9x2i7qfha7s77k1zif74px88"; depends=[base64enc htmltools jsonlite shiny uuid]; }; shinyservicebot = derive2 { name="shinyservicebot"; version="0.1.0"; sha256="18xbggiai6ssyl3q0nqhnszxb7zlbffaw0iy3r7vbzswzqx522la"; depends=[digest htmltools htmlwidgets shiny]; }; shinystan = derive2 { name="shinystan"; version="2.6.0"; sha256="0afm703zriyqprz1zvypir80lq2ylfff3qvj5i7p9n365mm8b150"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rstan shiny shinyjs shinythemes threejs xtable xts]; }; shinysurveys = derive2 { name="shinysurveys"; version="0.2.0"; sha256="01bj0g8r71jng03psw9dcjann78divy2xr5yn6y1pa82d96s46b5"; depends=[htmltools jsonlite sass shiny]; }; shinytest = derive2 { name="shinytest"; version="1.5.3"; sha256="1dmmz8r24jh8mnv9q3k62nd6hfmx1f9dyyr6j0ps6cnyjv97xnn7"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rlang rstudioapi shiny testthat webdriver withr]; }; - shinytest2 = derive2 { name="shinytest2"; version="0.2.1"; sha256="1mg0drgwrn9r8mhziwy9fvpmc2szy407418qk4p95wlk3myh878r"; depends=[callr checkmate chromote cpp11 crayon ellipsis fs globals httr jsonlite pingr R6 rlang rmarkdown shiny testthat withr]; }; + shinytest2 = derive2 { name="shinytest2"; version="0.3.1"; sha256="0d0x9hl6vmf7wc5nbpb9rz0wydxvr6z5sl0hkn9g7d32rl6rwq36"; depends=[callr checkmate chromote cpp11 crayon ellipsis fs globals httr jsonlite pingr R6 rlang rmarkdown shiny testthat withr]; }; shinythemes = derive2 { name="shinythemes"; version="1.2.0"; sha256="0qr9bfxw8afxns44i2j4msignf6g5qb2nzpay2lpv343rrlqbmip"; depends=[shiny]; }; shinytitle = derive2 { name="shinytitle"; version="0.1.0"; sha256="1k05s2fmqvz3drnqkxcpxvvmn0sisdqivg7i4x5c6649b97rsbsx"; depends=[shiny]; }; - shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; - shinyvalidate = derive2 { name="shinyvalidate"; version="0.1.2"; sha256="0mps6a1rkadbxf11lcxx4njfwbgpzyx63wndhlwb0dzyz5d02la7"; depends=[glue htmltools rlang shiny]; }; + shinytoastr = derive2 { name="shinytoastr"; version="2.2.0"; sha256="1zcf4ya9anlq6n97iq0b86ybcqbbd2h66vrr41m80zvlkav3z46z"; depends=[shiny]; }; + shinyvalidate = derive2 { name="shinyvalidate"; version="0.1.3"; sha256="01qlqzp0g6782maj73yygmwlchhv4xcnlc7j0w3lp6dcj7qkzz68"; depends=[glue htmltools rlang shiny]; }; shipunov = derive2 { name="shipunov"; version="1.17.1"; sha256="1kwywckhml47qi0i1xiqwkg3lv24xhk3d0brz2jpljv6v1namgk3"; depends=[PBSmapping]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyadsR = derive2 { name="shopifyadsR"; version="0.1.0"; sha256="0vd8md4w4v05l9d5v7kx21kw3rkbkx8iqf4da44x95kfnnxiqjcx"; depends=[jsonlite]; }; @@ -17414,7 +17461,6 @@ in with self; { showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; showtext = derive2 { name="showtext"; version="0.9-6"; sha256="0c4cssqk4s27pxfyb7fii97zhy4awzapj7bx9zkbki4va75mkjhf"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="3.0"; sha256="0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2"; depends=[sysfonts]; }; - shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.2"; sha256="0d80a0qqrsb9ybzqvg3m6a9r16ky7hqchq0hjvj8ipk430mmxdjm"; depends=[MASS mfp rms survival]; }; shrinkDSM = derive2 { name="shrinkDSM"; version="0.2.0"; sha256="0vl3cl9njl0irz9hsli7xkf49jawkywww91j5gxlmz5vdrxnwz9c"; depends=[coda Rcpp RcppArmadillo RcppProgress shrinkTVP stochvol]; }; shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.6"; sha256="1p9s4n3dw95ghcma71ik5zidqk54cbsd30csnbqp2w377241lxd3"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; @@ -17436,25 +17482,25 @@ in with self; { sigQC = derive2 { name="sigQC"; version="0.1.23"; sha256="0fpci6l0h6047qq7igwmm38rma768l706xfmfdfn1qqgkm5sv0x8"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet]; }; sigclust = derive2 { name="sigclust"; version="1.1.0.1"; sha256="1q3jdalm7cbsl78gssl3jsifh56wyczrlx2ya4p74r4fb6sv9kga"; depends=[]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.5"; sha256="1d26llpgnj687b8rwgbyhw88zakp334n4a9gabf72qwrg4awm1v5"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; - sigminer = derive2 { name="sigminer"; version="2.2.0"; sha256="0bgpdijxv2922kgfk885rganl5yn13g0f9h0mmlzvsvhbhav9mdm"; depends=[cli cowplot data_table dplyr furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; }; + sigminer = derive2 { name="sigminer"; version="2.2.2"; sha256="1b495vmijggw2n0lypm0vz7xdrjjz4gbbcdjjpp106wrsmx5risp"; depends=[cli cowplot data_table dplyr furrr future ggplot2 ggpubr maftools magrittr NMF purrr Rcpp rlang tidyr]; }; sigmoid = derive2 { name="sigmoid"; version="1.4.0"; sha256="067ygikaaniikig1ypd6ry187981xar7i539917zf0avszshisxq"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-7"; sha256="0qaf39vfmhn3d0bdjqd805ayfkaj48dkmf5dqd47bpk7dp21b837"; depends=[MASS]; }; signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signatureSurvival = derive2 { name="signatureSurvival"; version="1.0.0"; sha256="0c3wjhpsswi1l76m4nlh9xfi27g1d18c960q31lwd7b659w0x1fp"; depends=[dplyr forestplot ggplot2 gplots gtools survival survminer]; }; signed_backbones = derive2 { name="signed.backbones"; version="0.91.5"; sha256="0xk8sncblzihqzqfpaq7158slvrb6ww3dc4v5di1m2bqwhykncwi"; depends=[reshape2]; }; signibox = derive2 { name="signibox"; version="1.0"; sha256="0yjdpcyjdlmr6brb3a21wcs5rxryvjsnkhl8v73g2cygbhqba8rr"; depends=[]; }; - signnet = derive2 { name="signnet"; version="1.0.1"; sha256="1fws1yqdrsq1668f6ikb1k43c8la5w6qvc2mayr1ir2ywf9gk8h8"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + signnet = derive2 { name="signnet"; version="1.0.2"; sha256="0vp6ja12ipl2cg7sam48ari5civ36fz24yvyvibi4m8ncdnpil6c"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.1.1"; sha256="11abbvynyhbb7y7zndbkivb13yxj8l86nrn361mfv495g1d3ba8s"; depends=[slam]; }; - sigr = derive2 { name="sigr"; version="1.1.4"; sha256="1gx1dmdi8wjqlhp7a9cp915z0n5hl9xsv2hwzdmk0ijbjgipn7fh"; depends=[wrapr]; }; + sigr = derive2 { name="sigr"; version="1.1.5"; sha256="16v6f25pdbfm10b3cicf11nzqz5ykq70vppll7rxqbyafkcfwcra"; depends=[wrapr]; }; siie = derive2 { name="siie"; version="0.4.0"; sha256="1i095ys39q9p9bz12ia93k45ayl8cip956vh5wylw05m82vms2f0"; depends=[data_table]; }; siland = derive2 { name="siland"; version="3.0.2"; sha256="1dhjwl8akkziiax7a369rbxy8bmmnggnnd44v3zj1d2fqskskvdg"; depends=[fasterize fields ggforce ggplot2 lme4 raster reshape2 sf sp]; }; silicate = derive2 { name="silicate"; version="0.7.1"; sha256="193n0gh2kg5900si1m94cliyh0fbmp9dybs17vl1xxn34pg9c9s9"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.1"; sha256="14v35ngwj27j2r4mszwjz1dnk4iydakk5qf4z0swwi931q1jiphc"; depends=[dplyr MASS matrixcalc Rdpack spam tibble]; }; + simDAG = derive2 { name="simDAG"; version="0.1.0"; sha256="0byvh3kx7bbz9wmjfbzb9fpidi3qmnw1yvgpgpd1szxd072ldjj0"; depends=[data_table dplyr Rfast rlang]; }; simDNAmixtures = derive2 { name="simDNAmixtures"; version="1.0.1"; sha256="17865ihl8bv3nqhsqy3dpi82x4q1q5dzff6r3qygdnmh0ymhr7d2"; depends=[dplyr pedtools readr]; }; - simET = derive2 { name="simET"; version="1.0.2"; sha256="0yl3r2jmm8ds755vlgg1065mlqawdwgry2hrrjcnilpph0v9csm5"; depends=[dplyr ggplot2 ggpmisc ggpubr lubridate magrittr plyr rlang stringr tidyr]; }; - simEd = derive2 { name="simEd"; version="2.0.0"; sha256="0rsagk77qgxfjjkqrg2kv88cg9z3gnjff7k1558psvbvc50d3cmg"; depends=[rstream shape]; }; + simET = derive2 { name="simET"; version="1.0.3"; sha256="0l3mk2n1ik9xg660js97n03gix5im2f42q2r7hs9gvhs0g2552kp"; depends=[dplyr ggplot2 ggpmisc ggpubr lubridate magrittr plyr rlang stringr tidyr]; }; simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; }; simFrame = derive2 { name="simFrame"; version="0.5.4"; sha256="1a2p4hx80rrrzs4gjscdsy1jbzpahkw0h2nlna4q8p75blgnzwpn"; depends=[lattice Rcpp]; }; simIDM = derive2 { name="simIDM"; version="0.0.5"; sha256="1fk8slwcm26hnqzrhrv459kq120cwhg38jyxax280g3ynqjss59h"; depends=[checkmate]; }; @@ -17463,7 +17509,6 @@ in with self; { simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.42"; sha256="0nxs3n64mh1sbnbmqbj7hm8d43z0cja8da9yhsygl60r1jyl98xd"; depends=[mvna survival]; }; simMetric = derive2 { name="simMetric"; version="0.1.1"; sha256="09jpjlvmvb9z2v71n8cb14b0zfi78k609c7xvs78rghdiswqfv23"; depends=[assertthat dplyr]; }; - simPATHy = derive2 { name="simPATHy"; version="0.6"; sha256="0xiqcrdnn7pcbhykkjabfym6hqq9hrnjigav8nshs143s9wflw1q"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; simPH = derive2 { name="simPH"; version="1.3.13"; sha256="086060f78f1dmpa6cyhx160blchckplw04gs6997f1hwzswci2l2"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; simPop = derive2 { name="simPop"; version="2.1.2"; sha256="0x66i2k9s16lsjm79sjszkqa1j9nzwdnbb19lpgxbf1fcdwm5lrh"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach lattice MASS matrixStats nnet party ranger Rcpp RcppArmadillo vcd VIM wrswoR xgboost]; }; simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; }; @@ -17477,7 +17522,7 @@ in with self; { simdd = derive2 { name="simdd"; version="1.1-1"; sha256="141jap036w1nfmxgi87wlw455yr8jdrwr8h8ww3351l17h37zsb6"; depends=[]; }; simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; }; simecol = derive2 { name="simecol"; version="0.8-14"; sha256="0b0zx5wqvrfs4rpn6ngdf0c9d99wf9d0niaps41lslvlnpddvjw8"; depends=[deSolve minqa]; }; - simer = derive2 { name="simer"; version="0.9.0.2"; sha256="1i435631s65bsivcm7a1vmw8m2b4zb5s39yf0m64qinyvx1smyi7"; depends=[BH bigmemory igraph MASS Matrix Rcpp RcppArmadillo RcppProgress rjson]; }; + simer = derive2 { name="simer"; version="0.9.0.3"; sha256="060vaaqwvq4dpizwc8jh6712s9aa3cl1ys08bydi85laf22x7zqb"; depends=[BH bigmemory igraph jsonlite MASS Matrix Rcpp RcppArmadillo RcppProgress]; }; simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; @@ -17487,16 +17532,17 @@ in with self; { simglm = derive2 { name="simglm"; version="0.8.9"; sha256="0spvr8bmdqg97y1qklr8c6svgwsdwa5haar4sbsnvpnrq5fb2baw"; depends=[broom dplyr future_apply purrr rlang]; }; simgof = derive2 { name="simgof"; version="1.0.2"; sha256="05d7im59i193f266kqy4lr37dw3v20j9niizhj9w8z1qlfqfqsrk"; depends=[ddst]; }; simhelpers = derive2 { name="simhelpers"; version="0.1.2"; sha256="0ykv03nz7133af0yc7a3j67bpqjch4jkp8szlhy68pbwgin5zm1z"; depends=[dplyr furrr magrittr Rdpack rlang rstudioapi tibble tidyr]; }; + simitation = derive2 { name="simitation"; version="0.0.7"; sha256="1f2d5niq42wyrqlxjfdfb744h5fy646fvlbi7xakkhvkwrah8x5f"; depends=[data_table]; }; simlandr = derive2 { name="simlandr"; version="0.3.0"; sha256="04nl58qayvx1pkhscqy0664dvb6jg54amf43pff81gxsvk7gs20l"; depends=[bigmemory digest dplyr forcats gganimate ggplot2 htmlwidgets ks lifecycle magrittr MASS plotly progress purrr rlang tibble]; }; - simmer = derive2 { name="simmer"; version="4.4.6.1"; sha256="1ky243nf6pvh5r469zxsir3ql6bi2gkx90pm145zvidb4yqjr9vw"; depends=[codetools magrittr Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.4.6.2"; sha256="1kdikdri2gmfi5badxgmbsq4svgqjmsjysjgff86nanwbf85kk08"; depends=[codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.2"; sha256="1a3rm3fmr4ysack47vhmyxdg45pvplhz07bc5fsx17m08hhlyjhv"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.18"; sha256="0wxn6g27i4fk4xkl9l8qbsqg61jr7hz5n974gfld38cigp1f62n9"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.3.0"; sha256="18qrpxf4fsqirfxj4ldkmdyc6zp2px2bcad9j50ihb3r2a33ny3x"; depends=[mgcv]; }; - simmr = derive2 { name="simmr"; version="0.5.1.212"; sha256="1whjbclpdfkdsx99qzx42yl5cln9nl45qrri4ijkk3s6pyrikf6b"; depends=[bayesplot boot checkmate compositions GGally ggplot2 R2jags Rcpp RcppArmadillo RcppDist reshape2 viridis]; }; + simmr = derive2 { name="simmr"; version="0.5.1.215"; sha256="1aaxfc16941fwaiab6zn5ra23ld64nq62bpi8mvnm78rpfy3879w"; depends=[bayesplot boot checkmate compositions GGally ggplot2 R2jags Rcpp RcppArmadillo RcppDist reshape2 viridis]; }; simode = derive2 { name="simode"; version="1.2.0"; sha256="0wlnd01xfdqvjfvmkhkj6nvkrnv5ghjv4md5nhaqsjc8bycawyl0"; depends=[deSolve pracma quadprog]; }; simodels = derive2 { name="simodels"; version="0.0.5"; sha256="149490vgw0549x5zym28kyxgyjhjl2wx7rcak9gabkznwjjrhqk5"; depends=[dplyr geodist od rlang sf]; }; simphony = derive2 { name="simphony"; version="1.0.3"; sha256="0cpp6gga0p80yd7ir1qsgnv236sp35xybp7i0h104yzhnwgcqnkb"; depends=[data_table foreach]; }; - simplace = derive2 { name="simplace"; version="5.0.12"; sha256="1g84a0v6lr70kwjcc2rwqnd5db02cyn51afz529njgmc5kh3675x"; depends=[rJava]; }; + simplace = derive2 { name="simplace"; version="5.0.13"; sha256="0cxhva0hypvjxck1dwajpymrjvmk9h7yvxdbiws8axdcmrwgmq76"; depends=[rJava]; }; simplanonym = derive2 { name="simplanonym"; version="0.1.0"; sha256="1zwc73qbf0xx0ca1pgk3hqdmf9b6ihlwflb2fq31lhk3ngka8kc6"; depends=[dplyr forcats tidyselect]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.2"; sha256="0zayq4n8cc0xgszckjvvf55ygy8hwywv161pp8pqi2k4z91rq4lz"; depends=[]; }; simpleFDR = derive2 { name="simpleFDR"; version="1.1"; sha256="09w7l8pb6kibzifwyqcgshlxjq2gn6s642i78939q00q0m9qvdbk"; depends=[dplyr tidyr]; }; @@ -17507,8 +17553,8 @@ in with self; { simpleRCache = derive2 { name="simpleRCache"; version="0.3.3"; sha256="0rjlvq7ch90bjr8wyglhq1px0widdaxrgxfv9d0a5lm1gj5jggan"; depends=[digest]; }; simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; - simplecolors = derive2 { name="simplecolors"; version="0.1.1"; sha256="1m0lrvkjqjqq7kynjl8j1cn7kqzfjx6gzgjpjk1gvar2g4ip0a8h"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; - simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; + simplecolors = derive2 { name="simplecolors"; version="0.1.2"; sha256="1rckbcc2clxxj61q7z7d1d72q96fd9gvcl8hh8586ffcj5chvmgf"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; + simplegraph = derive2 { name="simplegraph"; version="1.0.1"; sha256="1aps8657clf20fy5qqgvpfq2f8x9w3dqw9z4c3nqhq09b5k6mgfl"; depends=[]; }; simplegraphdb = derive2 { name="simplegraphdb"; version="2021.03.10"; sha256="0573hrv23nimmf3d8dgdynii79h84a3mfr4xxk3cggxhsxpfmb2i"; depends=[DBI rjson RSQLite]; }; simplermarkdown = derive2 { name="simplermarkdown"; version="0.0.6"; sha256="0lffwsrhsdqcqhklh24v0y0x6w4vq9jch93m330kfdv2amab1l06"; depends=[rjson]; }; simplevis = derive2 { name="simplevis"; version="7.1.0"; sha256="1x2lignyqyd9l7sq1gxgb98jav6r3pvai3hgqzpwn982lr8x2k9b"; depends=[dplyr ggplot2 htmlwidgets leafem leaflet leafpop magrittr rlang scales sf shiny snakecase stars stringr tidyr tidyselect viridis]; }; @@ -17518,7 +17564,7 @@ in with self; { simpr = derive2 { name="simpr"; version="0.2.6"; sha256="0r85hphhkk624p671r3vp74j0v6y9qj2pwpm5d1nv81pdcdwk0zi"; depends=[broom dplyr furrr generics lifecycle magrittr purrr rlang tibble tidyr tidyselect]; }; simputation = derive2 { name="simputation"; version="0.2.8"; sha256="02l7j2s74mjd4vgly4nnf2w7as9m3m6qifa292r29iaw12l0zj81"; depends=[glmnet gower MASS missForest norm randomForest rpart VIM]; }; simr = derive2 { name="simr"; version="1.0.7"; sha256="1rfnhyqvdazvar7r1ml71lskh1hdk3yfzv5jlcz18wzffscgkgmb"; depends=[binom car iterators lme4 lmerTest pbkrtest plotrix plyr RLRsim stringr]; }; - simrec = derive2 { name="simrec"; version="1.0.0"; sha256="17zzbzgdisp5qh0vlbmkjf6a3axnpwj2kw03wymfbb3z557pbxlr"; depends=[]; }; + simrec = derive2 { name="simrec"; version="1.0.1"; sha256="1rpsvp7l24ayqc0bbcjsivnqxbrf8491mk6i9ndhyna6hcn9lzzg"; depends=[]; }; simrel = derive2 { name="simrel"; version="2.1.0"; sha256="1knn8kw9m232agm4b3b0fc132frv5i7k8gxvmrcb1pnz62gsmg04"; depends=[FrF2 ggplot2 gridExtra jsonlite magrittr miniUI purrr reshape2 rlang rstudioapi scales sfsmisc shiny testthat tibble tidyr]; }; sims = derive2 { name="sims"; version="0.0.3"; sha256="0wsq8plbrmk4xrs8i3g3pqwp2xkhfh1pffva1bwyx44l1r5imzs2"; depends=[chk future_apply nlist yesno]; }; simsalapar = derive2 { name="simsalapar"; version="1.0-12"; sha256="0aac4mjx4pdfhy52jvr3v2d8hp20qglzfhrvqmrvvn5pcn2qmlh4"; depends=[colorspace gridBase sfsmisc]; }; @@ -17529,7 +17575,7 @@ in with self; { simsurv = derive2 { name="simsurv"; version="1.0.0"; sha256="16b2a3br107hy2fc0vann9wf5h9kb5j76baa37g1sfc0h19kg6kr"; depends=[]; }; simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; }; simtrait = derive2 { name="simtrait"; version="1.1.3"; sha256="0zwas19q7lmmmznv44km1f9wj4vq34hl5zlakfs98lkp7f0z29nx"; depends=[PRROC]; }; - simts = derive2 { name="simts"; version="0.2.1"; sha256="13ny0gryckmk6630n9x35g9ic7w80iwkgkha8kn5afmlvarmq20k"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; + simts = derive2 { name="simts"; version="0.2.2"; sha256="12v6djqij8w0vy25pndri4kng7zq7bncvbg9h28vg1m8sk3nlfc4"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; simuclustfactor = derive2 { name="simuclustfactor"; version="0.0.3"; sha256="0yjcknqx44zjzk1ch8bnfbpf7dg34nwdhsmbnhyskzc67022g470"; depends=[Rdpack]; }; simukde = derive2 { name="simukde"; version="1.3.0"; sha256="0mpj8pfrlagc97v53idsiypjcpbaj07y6klanph5lkiwzsgbz8sv"; depends=[ks MASS mvtnorm]; }; simulMGF = derive2 { name="simulMGF"; version="0.1.1"; sha256="0kycpaayf9rxc53jp3157zjvynpzhn278x1rnmwhvkhp9fmhnxka"; depends=[]; }; @@ -17543,17 +17589,17 @@ in with self; { singR = derive2 { name="singR"; version="0.1.1"; sha256="0spxdlf9r454jw37iw978fnibzlwh252sk5w6hfnxva7njs566pp"; depends=[clue gam ICtest MASS Rcpp RcppArmadillo]; }; singcar = derive2 { name="singcar"; version="0.1.5"; sha256="0ixarjv8jxxpnc6imkk0gisjl0xv0bd9ah7y1sxdj2c8kb9d8k3n"; depends=[CholWishart MASS withr]; }; singleCellHaystack = derive2 { name="singleCellHaystack"; version="1.0.0"; sha256="05xvdxq4mhpxiq1l12brbqmh4cb79djjhh5ap2x3gvhrv0wd7mrd"; depends=[ggplot2 Matrix reshape2]; }; - singleRcapture = derive2 { name="singleRcapture"; version="0.2.0"; sha256="18wvh5v8zx7n9g4l1y6dghmiygpxhck1pyz9k4h2i8dcd6ipbv1c"; depends=[lamW mathjaxr rootSolve sandwich]; }; + singleRcapture = derive2 { name="singleRcapture"; version="0.2.1.1"; sha256="184kvkjjhm3ak58yg0sdzkjnw0jzsm22pxlx3nq5a4jv6ckaxrix"; depends=[doParallel foreach lamW mathjaxr sandwich]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; siplab = derive2 { name="siplab"; version="1.6"; sha256="149crdvw7sz7p4sz58n1ryvv3l0pm57wbvfd93xnljw7hwwq1dvk"; depends=[spatstat spatstat_geom]; }; siqr = derive2 { name="siqr"; version="0.8.1"; sha256="0yyb4abd7lghsb1qrw61zvbll3hs4dsldkvs3syrabwhxady8w43"; depends=[KernSmooth quantreg]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; siren = derive2 { name="siren"; version="1.0.3"; sha256="02j3lbphx1mmmzrhjhk97029fnn9v10989mn69vlzp3k72k2m9z7"; depends=[EFA_MRFA lavaan psych]; }; - sirt = derive2 { name="sirt"; version="3.12-66"; sha256="1m87af7lsjb32w79gvkvmclq68xa1hjxhvhxvzlxs9skzcn9f93b"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; + sirt = derive2 { name="sirt"; version="3.13-228"; sha256="1shd47snf9bxpa3jwg1qca0jxgi0hhr0yw6052yp4nljzqma095f"; depends=[CDM pbapply pbv Rcpp RcppArmadillo TAM]; }; sirus = derive2 { name="sirus"; version="0.3.3"; sha256="0whjshqwy3dhim22rj358811s3h872d861j93zlhh32ivvwj2434"; depends=[ggplot2 glmnet Matrix Rcpp RcppEigen ROCR]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.48"; sha256="1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; - sisireg = derive2 { name="sisireg"; version="1.0.0"; sha256="1gijdz5rllflrh7ndjm245ix8ngpqp5nhqjfpqsdyllwixlkchmv"; depends=[raster zoo]; }; + sisireg = derive2 { name="sisireg"; version="1.1.1"; sha256="1jw1nl8l7kh5fa3hh7zh418brck6zayhhqm50nqhbghlmjs7y67i"; depends=[raster reticulate zoo]; }; sistec = derive2 { name="sistec"; version="0.2.0"; sha256="0y43anin9vybiivf3jrxg19i9z4smmhhjvp52gci6icpn839kr8x"; depends=[dplyr openxlsx rlang shiny stringi stringr]; }; sistmr = derive2 { name="sistmr"; version="0.1.1"; sha256="08kajkb0ypbzcyxs9wv6mdz51r7zj01k2ahskidhlqww80rd407r"; depends=[BlandAltmanLeh dplyr ggbeeswarm ggplot2 ggrepel rlang scales]; }; sitar = derive2 { name="sitar"; version="1.4.0"; sha256="14qc5qy21qyj4gml0gwfn8izbsmzwy30ddc7mazhszi487jrcrp0"; depends=[dplyr forcats ggplot2 glue magrittr nlme purrr rlang rsample tibble tidyr]; }; @@ -17566,7 +17612,7 @@ in with self; { sits = derive2 { name="sits"; version="1.4.1"; sha256="035aq68k68vpwbib81ym4byb6m31z4h6b4hgx49qcjc3bbb6irlc"; depends=[dplyr gdalUtilities lubridate purrr Rcpp RcppArmadillo rstac sf slider terra tibble tidyr torch yaml]; }; sivs = derive2 { name="sivs"; version="0.2.9"; sha256="0g5gw2szsnm3k71zjw0174qnznr6abnyk2nh5afhyappki4yqaia"; depends=[doParallel foreach glmnet pROC varhandle]; }; sizeMat = derive2 { name="sizeMat"; version="1.1.2"; sha256="1vbndadsn80ddrg471vp1qxf0gan38w6dkjk1p2npvfb47wdjj2h"; depends=[MASS matrixStats MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.8.14"; sha256="06m6najky8ydnn6y6f3fh1y7laxnqpzcbyy1cyqcgvfcyfia9qjf"; depends=[bayestestR datawizard dplyr ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sjPlot = derive2 { name="sjPlot"; version="2.8.15"; sha256="10lvn8dnckpjjpapmf0d2zwjkzjvs4iiswd3rmijzviz4ichhxjs"; depends=[bayestestR datawizard dplyr ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjSDM = derive2 { name="sjSDM"; version="1.0.5"; sha256="1qrslxrminbzvqkcngx875kkbaj9f2wd8svdwsd0706v5w72pisg"; depends=[abind checkmate cli crayon ggplot2 ggtern mathjaxr Metrics mgcv mvtnorm reticulate rstudioapi]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.1"; sha256="0cz5qc5lsipd3nlkzj8j03xmpzxp52c3q5av8pr7fm3vsdclawfk"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.2.0"; sha256="1va86q5wddyvqgdpy8d0an2c7v1qbb4hpn0ai6y1v5v1ff87w73k"; depends=[datawizard insight]; }; @@ -17585,11 +17631,11 @@ in with self; { skewlmm = derive2 { name="skewlmm"; version="1.1.0"; sha256="04jxf7bwh71r33s1s2xhiy0ipfaqz97ya86rr4m0f5kxnb942ggv"; depends=[dplyr furrr future ggplot2 ggrepel haven matrixcalc moments MomTrunc mvtnorm nlme numDeriv optimParallel purrr relliptical TruncatedNormal]; }; skewsamp = derive2 { name="skewsamp"; version="1.0.0"; sha256="1b41zjjnn7vphcrbvrvqx66jfd9fb8v22xmgql6wh26a2y81bman"; depends=[]; }; skewt = derive2 { name="skewt"; version="1.0"; sha256="1jaldnqgjzky2vr290vzpzdwsa5s92l977v6k2yhpzmmw4k4x3l7"; depends=[]; }; - skilljaR = derive2 { name="skilljaR"; version="0.1.1"; sha256="1k3zy85i0x444g6mxmw3mh67xhdn4pyfgjjx04m7far8rldwd9p2"; depends=[dplyr httr jsonlite magrittr purrr]; }; + skilljaR = derive2 { name="skilljaR"; version="0.1.2"; sha256="04x1hfg0kvbr5c1abl0kfh1x07kvgyzhxzd38j6blg16awcvfxva"; depends=[dplyr httr jsonlite magrittr purrr]; }; skimr = derive2 { name="skimr"; version="2.1.5"; sha256="11w32vfwm6pz4cvmm60na6pjbyjvw2xq489ij5xqzx0n3pma7wq6"; depends=[cli dplyr knitr magrittr pillar purrr repr rlang stringr tibble tidyr tidyselect vctrs]; }; sklarsomega = derive2 { name="sklarsomega"; version="3.0-2"; sha256="027rx1x5hsn0qx7s6s2sqf13p49jbhi6g7w0fzfqf619p3fzkghg"; depends=[dfoptim extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; - skmeans = derive2 { name="skmeans"; version="0.2-15"; sha256="16q801kk1dblk25wbr80lp5gfc0clxmg1wyzb0py1g8vw8v96mc1"; depends=[clue cluster slam]; }; + skmeans = derive2 { name="skmeans"; version="0.2-16"; sha256="0rigfkjq41ivj2hz35rqak23mmzyz15ic5izzkm3vxbwhsmk9ars"; depends=[clue cluster slam]; }; skpr = derive2 { name="skpr"; version="1.4.0"; sha256="1f5n392w155v9p1slcxl6i0mv1kgi5zn9kjqc6da7c4rafjxzrm3"; depends=[car doParallel doRNG foreach future gt iterators lazyeval lme4 lmerTest magrittr progress promises Rcpp RcppEigen rintrojs scales shiny shinyjs shinythemes survival viridis]; }; skylight = derive2 { name="skylight"; version="1.1"; sha256="06snpj5jdr5wzv87587izvkxnxn24xl11jm7l2x2sj6s6rw16p9w"; depends=[]; }; skynet = derive2 { name="skynet"; version="1.4.3"; sha256="08a5p3rk0qhsxawdxj5sfw07rdk56x6viy37w1b0hxqaxxxv239i"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps RCurl stringr]; }; @@ -17598,6 +17644,7 @@ in with self; { slam = derive2 { name="slam"; version="0.1-50"; sha256="1ggqcf8l1z2hpi7qy4mg0d2ps48bjjb8z1y1xz6fq162cqrbz6bq"; depends=[]; }; slanter = derive2 { name="slanter"; version="0.2-0"; sha256="024dkman0r5qzc215gw0ds932vdaz8krrhv64fjw9pni37ixc3mf"; depends=[Matrix pheatmap pracma]; }; slasso = derive2 { name="slasso"; version="1.0.0"; sha256="0k83szk6jzvn5353p9ia2ipmjyl65ivx95rj62rq8dyjfrdyzs0d"; depends=[cxxfunplus fda fda_usc inline MASS matrixcalc matrixStats plot3D Rcpp RcppArmadillo]; }; + slcm = derive2 { name="slcm"; version="0.1.0"; sha256="0avbgsf3hgvpamw6cbs9l7l8s8bc89sqyjskj7mhjbvxsjdqd416"; depends=[Rcpp RcppArmadillo]; }; sld = derive2 { name="sld"; version="1.0.1"; sha256="1sx3wmpc89hjabj476dhhmsp0mxbfpqxr65y63jrqngx1c3zgbx1"; depends=[lmom]; }; sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; sleeperapi = derive2 { name="sleeperapi"; version="1.0.4"; sha256="0hllaz584xqdj9inmibdm9pd0vcirwz4jdk2prc5cwjavxhkj51y"; depends=[httr jsonlite plyr]; }; @@ -17608,7 +17655,7 @@ in with self; { slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; }; slgf = derive2 { name="slgf"; version="2.0.0"; sha256="07gkl35hq3w42kw103gn9f15s0z4n49nq39ip1nzm3s6d1ad6in6"; depends=[numDeriv Rdpack]; }; slickR = derive2 { name="slickR"; version="0.6.0"; sha256="01p72l3h8izg9pphjhkm83rgfsvlimf8aa5asa5lfgfbma60ivhb"; depends=[base64enc checkmate htmltools htmlwidgets lifecycle xml2]; }; - slider = derive2 { name="slider"; version="0.3.0"; sha256="18gw0bxpbb00qcafmyv2avyj83s710hrj10x998ch9qbbyx1fsmw"; depends=[cli rlang vctrs warp]; }; + slider = derive2 { name="slider"; version="0.3.1"; sha256="1c19lk0ddh5qh0jzx7178l314zyygmlpmbvn7670bcmdbxwjc2i0"; depends=[cli rlang vctrs warp]; }; slideview = derive2 { name="slideview"; version="0.2.0"; sha256="031ahdqswl14sw0nxmhaam37g14cifb83dyp2zjz1mh6qpkzl2gs"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; @@ -17619,16 +17666,17 @@ in with self; { slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; - slr = derive2 { name="slr"; version="1.0.0"; sha256="0bfk6ckmspcci6r2ry6gs8cm47jyqwzn6ljmgjl23hi0scdb10ri"; depends=[ibd MASS]; }; - slurmR = derive2 { name="slurmR"; version="0.5-3"; sha256="1vvzqgyhqp29k1vqd99r9fdn6caidzkph2f3fw38334623103v6n"; depends=[]; }; + slr = derive2 { name="slr"; version="1.1.0"; sha256="0wy6v5hh6w529i1q77l87cq48f3shcbwc36blymdf69v6nc3gs2n"; depends=[ibd MASS]; }; + slurmR = derive2 { name="slurmR"; version="0.5-4"; sha256="1akwdpv3235l9hrqrhlkd8m3l7dbrq6h2nq29jr6mimlp8jvk5g7"; depends=[]; }; sm = derive2 { name="sm"; version="2.2-5.7.1"; sha256="0mql7rlm8wkdwmx1lv7pscdk9ibvsdpfdv8bpaz1hv2gn4pc637a"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-2"; sha256="0cv6xa6miy45pj0lskg70bq7bmwxdprwjl51ghlxgifkv1qdxqhc"; depends=[]; }; smacof = derive2 { name="smacof"; version="2.1-5"; sha256="1i9a3637m943sw6s0hx2b99kny0sv8niywqi9l12pjxx9flnj0zv"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; - smacpod = derive2 { name="smacpod"; version="2.5"; sha256="0br9ahix3q2qv06aj8jr2828ysj0waik6za42ahd9b8hv7chrhad"; depends=[abind pbapply plotrix smerc sp spatstat_explore spatstat_geom spatstat_random]; }; + smacofx = derive2 { name="smacofx"; version="0.6-6"; sha256="0i4v3qbizqniaf92nv2q2860k454hwnhqb789p0nkkcyh9wgyrc9"; depends=[MASS minqa plotrix ProjectionBasedClustering smacof vegan weights]; }; + smacpod = derive2 { name="smacpod"; version="2.6"; sha256="193mqxk17ygr518p2mvk9wnj3hnckxay9jz85ng00kz2kaykdpd6"; depends=[abind pbapply plotrix smerc spatstat_explore spatstat_geom spatstat_random]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smallsets = derive2 { name="smallsets"; version="1.0.0"; sha256="19v4ikfa1fbj9qvhp63vbw13qsgfx879x8j451sfcgl7km1d7xc9"; depends=[colorspace flextable ggplot2 ggtext patchwork plotrix reticulate]; }; smallstuff = derive2 { name="smallstuff"; version="1.0.1"; sha256="0zqwxmazk4nb8sgwwkymaap3l9pfzw3mqbmfzvj0wn7wzjsx10cx"; depends=[class data_table igraph matlib Matrix pryr ROCR]; }; - smam = derive2 { name="smam"; version="0.6.0"; sha256="1vgsx1n9gkkjnv5lrrznpfqvh019qcjki6gy625k3ykqg5zg229v"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; + smam = derive2 { name="smam"; version="0.7.0"; sha256="0xl38rncsfl0rsb560pvvshya22qc9rgpd2r9z86yzwa8mvfgqpx"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; smapr = derive2 { name="smapr"; version="0.2.1"; sha256="1gcq66gs6968c5h303dqd2jyw2rcdwxv642ki1cmpdj6ix665dpr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; }; smartDesign = derive2 { name="smartDesign"; version="0.72"; sha256="1mq8h2zwj8mrq4s2bl3s6hzizpdjbl69c984hydxvzx2vgq1v8za"; depends=[knitr]; }; smartmap = derive2 { name="smartmap"; version="0.1.1"; sha256="0pxbjkkknng7xa8ihba69n1a2w9052fsbb0w8fq1y1qrqmmibwdi"; depends=[leaflet magrittr sf]; }; @@ -17642,7 +17690,7 @@ in with self; { smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; smdi = derive2 { name="smdi"; version="0.2.2"; sha256="0bjwh9qbcr8221k43gayridqrsr3sf7mwgvlwy76k9dmjr0bid63"; depends=[broom dplyr fastDummies forcats ggplot2 glue gt Hotelling lifecycle magrittr mice naniar pROC randomForest stringr survival tableone tibble tidyr tidyselect]; }; smdocker = derive2 { name="smdocker"; version="0.1.4"; sha256="13jkd81irk32m1w9djsgsgl79s8i9ynz10j7m8imqpk402zc7cbd"; depends=[jsonlite paws_compute paws_developer_tools paws_machine_learning paws_management paws_security_identity paws_storage uuid zip]; }; - smerc = derive2 { name="smerc"; version="1.8.2"; sha256="0qdnary5jj361vyfs9z6difaa17dvb8jkpssw399nc8glz5k8xyd"; depends=[pbapply Rcpp RcppProgress]; }; + smerc = derive2 { name="smerc"; version="1.8.3"; sha256="181av1l1r327iszxrihilvfiqbc4m4496g94i5r9vhhamvgk8cwm"; depends=[pbapply Rcpp RcppProgress]; }; smetlite = derive2 { name="smetlite"; version="0.2.9"; sha256="1rhadp3yddw6pnyqjk8g3rzidb1kfb8r0za7yra2fyryjwiaajz8"; depends=[readr stringr]; }; smfishHmrf = derive2 { name="smfishHmrf"; version="0.1"; sha256="1k6mpyp11zv5rc3k98baymr903p2pf424nf9xng20q1li8s8y2ab"; depends=[fs pracma Rdpack]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; @@ -17652,25 +17700,25 @@ in with self; { smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smlmkalman = derive2 { name="smlmkalman"; version="0.1.1"; sha256="1ns717rq0vipplh3l2ypinrscv3bjv86j68aw53ygs6g59h0v2vp"; depends=[pracma scales spdep truncnorm]; }; smmR = derive2 { name="smmR"; version="1.0.3"; sha256="0b6w2k5j65jdngc871ch9ragr7qgwbkl4nhk3gqnbpvkr9m4x88f"; depends=[DiscreteWeibull Rcpp RcppArmadillo seqinr]; }; - smnet = derive2 { name="smnet"; version="2.1.2"; sha256="17zv02f1g86s55g81anhqrxfgy2biamsw606byxwh9kdc5l4vfv6"; depends=[RSQLite spam SSN]; }; smog = derive2 { name="smog"; version="2.1.0"; sha256="1mnnvp6crjwwiym16q4hmn9zwna1gblwqjlan4x9zyvgp1j70k26"; depends=[doParallel dplyr foreach ggplot2 magrittr Rcpp RcppArmadillo Rdpack rmarkdown tidyr]; }; smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; }; smoof = derive2 { name="smoof"; version="1.6.0.3"; sha256="1cazhnd0m5jjzixaqgqh2h3rsa2sw3k8slj5cmgm8v47aaqn91mg"; depends=[BBmisc checkmate ggplot2 ParamHelpers Rcpp RcppArmadillo]; }; - smooth = derive2 { name="smooth"; version="3.2.1"; sha256="1kczg9ww3xpjd1z2a6flcyg038sqaik72akw3sn71m9c63ka7q95"; depends=[generics greybox MASS nloptr pracma Rcpp RcppArmadillo statmod xtable zoo]; }; + smooth = derive2 { name="smooth"; version="4.0.0"; sha256="0r123h71wxgwn694mn2vhc7hhicj8d33h5q4djmkp3m72dkzxyqj"; depends=[generics greybox MASS nloptr pracma Rcpp RcppArmadillo statmod xtable zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.4"; sha256="0i668qsrava00j91m2bsh1y1rflqmyhbrgmwllyy94l1a0xn6j9r"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; smoothedLasso = derive2 { name="smoothedLasso"; version="1.6"; sha256="0007i40a12jgavgd95fbpiil1s331qd05ww6v19l49lbnlk3ldxg"; depends=[Matrix Rdpack]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; - smoothic = derive2 { name="smoothic"; version="1.1.0"; sha256="0a6533ds0yplcja16gpir0la7g8sx23f8papnhd8z3kw1c9i1k19"; depends=[data_table dplyr ggplot2 MASS numDeriv purrr rlang tibble tidyr]; }; + smoothic = derive2 { name="smoothic"; version="1.2.0"; sha256="11id442cgnk6a0nd0c20rz5ccxlq3hhpsmvmlvg93jf4v6c2046z"; depends=[data_table dplyr ggplot2 MASS numDeriv purrr rlang stringr tibble tidyr toOrdinal]; }; smoothie = derive2 { name="smoothie"; version="1.0-3"; sha256="1ari4av4vsydaxg56vsfifc50kxsqy8xlxl7by32capc6pcjwvq8"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-3"; sha256="1m8kiwv9nl3c7xggwspa9pridmpgsq3s1ivwrgsv2aaxddwg1wis"; depends=[MASS]; }; smoothr = derive2 { name="smoothr"; version="1.0.1"; sha256="1sf57ywx4836dcz8s6h20d0r68y41c11gjbg78bpai4k1401a2sq"; depends=[sf terra units]; }; smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; }; - smoots = derive2 { name="smoots"; version="1.1.3"; sha256="09a3f8prplzl7bsmfxbgni2bx4z3xsmx9sdr7jzmx3janlhlf6c5"; depends=[future future_apply progress progressr Rcpp RcppArmadillo]; }; + smoothy = derive2 { name="smoothy"; version="1.0.0"; sha256="1wx13da490vgamjj2yih4xsaja51ga3hiqwkylvj23x3mnvyqkn8"; depends=[dplyr stringr tidyr zoo]; }; + smoots = derive2 { name="smoots"; version="1.1.4"; sha256="1drlnh22gn6fdziplnja5w7gc5lyvpjq54aqqmwfh6h78ivcg0vs"; depends=[future future_apply progress progressr Rcpp RcppArmadillo]; }; smosr = derive2 { name="smosr"; version="1.0.1"; sha256="1arj4skjqnwfk4yr26iwp1j9pjp75xk18hap0ff1wqpxmvajlmgj"; depends=[fields lubridate ncdf4 RCurl terra tidyr]; }; smotefamily = derive2 { name="smotefamily"; version="1.3.1"; sha256="062yps71bqnyff1hzqb7yvigvqg2lnc24r9gfp8m3zhvmyprk3cp"; depends=[dbscan FNN igraph]; }; - smovie = derive2 { name="smovie"; version="1.1.4"; sha256="12l24ilkgpsxq4gs4yp8g2cdws6az0x06s5yzi1qqkym8n86a4f3"; depends=[rpanel]; }; + smovie = derive2 { name="smovie"; version="1.1.5"; sha256="1pr9aqnwn5f9akrpdf8xx2w502c3zqgjj1gzh7aavqb3irsph5ji"; depends=[rpanel]; }; smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; }; sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; }; smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; @@ -17680,7 +17728,7 @@ in with self; { snSMART = derive2 { name="snSMART"; version="0.2.3"; sha256="0d05wn2w9x7gapaz94zpf251rh2mld8agsir3hqbzjyil14xrpv6"; depends=[bayestestR condMVNorm cubature EnvStats geepack HDInterval pracma rjags tidyr truncdist]; }; sna = derive2 { name="sna"; version="2.7-1"; sha256="1qqaazcc8x925bwa9yllwyv98ddpdqgdq026h0ss6vsvq4bz5nk0"; depends=[network statnet_common]; }; snahelper = derive2 { name="snahelper"; version="1.4.1"; sha256="1krmaynhvbbdvyy55h2b1h9w9pw1gjkd2ha4prhcm836rmvyb6av"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; - snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; + snakecase = derive2 { name="snakecase"; version="0.11.1"; sha256="0888fng8zwm2zmi7rap9hc2q2x2gnhz8gyr35wwjx93w6f8rfpra"; depends=[stringi stringr]; }; snap = derive2 { name="snap"; version="1.1.0"; sha256="02bvs1r72y59p33a7yj1rqw75h08pvl794hdvvm15jzq1hy6j0ra"; depends=[CORElearn dbscan dplyr forcats ggplot2 keras purrr readr reticulate stringr tensorflow tictoc]; }; snapKrig = derive2 { name="snapKrig"; version="0.0.2"; sha256="1rgfz1kxlgp3an4cd37mhjn47hkjms0c6m2469wcbcw0xqjii9ld"; depends=[]; }; snapchatadsR = derive2 { name="snapchatadsR"; version="0.1.0"; sha256="0h1wiwycrafh1wzmdw8dm0zw1xpzvj7w0943kh2bx8wpp7ara2vy"; depends=[jsonlite]; }; @@ -17689,9 +17737,9 @@ in with self; { snfa = derive2 { name="snfa"; version="0.0.1"; sha256="01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb"; depends=[abind ggplot2 prodlim quadprog Rdpack rootSolve]; }; snha = derive2 { name="snha"; version="0.1.3"; sha256="1bksc9s23widrdvp1wfx6808b4cdwvmq3iqkd87pbcr16bvpvnwc"; depends=[MASS]; }; snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; }; - snotelr = derive2 { name="snotelr"; version="1.1"; sha256="001pkqqc7ysnjwypzl5fcsszymfqw67p5kn0gyxjqdpz4ns0crbg"; depends=[httr magrittr memoise rvest shiny]; }; + snotelr = derive2 { name="snotelr"; version="1.2"; sha256="140f34dsylsb0z9aw446xhsghl1r1qnddwai87201pymmjgqryn0"; depends=[dplyr httr memoise rvest shiny]; }; snow = derive2 { name="snow"; version="0.4-4"; sha256="1j8kvf3imxijsqkdjz4i9s7qggfxqrpas46y5wz6za92y937yn44"; depends=[]; }; - snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; }; + snowFT = derive2 { name="snowFT"; version="1.6-1"; sha256="0y7ql23vv5qdx0pgblfybjwxc0rgvv7z868c6axgy78xrzm6qjd1"; depends=[rlecuyer snow]; }; snowboot = derive2 { name="snowboot"; version="1.0.2"; sha256="0jj3p0g4rwml8vmlwj10rfisxfjlipcrpvq5z134z4j35jp6ggv3"; depends=[igraph Rcpp Rdpack]; }; snowfall = derive2 { name="snowfall"; version="1.84-6.2"; sha256="0frmasv04wd47h04zbwaryhiyxllarf3ggpa39p5qicjp6r7lilv"; depends=[snow]; }; snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; }; @@ -17699,7 +17747,7 @@ in with self; { snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; }; snplinkage = derive2 { name="snplinkage"; version="1.0.0"; sha256="112wg2gnr4ikj916nb71sm39g41ls05d4j56hhml9hfnkiv76x5p"; depends=[gdsfmt ggplot2 gtable GWASTools magrittr]; }; snplist = derive2 { name="snplist"; version="0.18.2"; sha256="1sa2s3br4agx920jpr250iih61p99v500nh0c1w99w0846g9908c"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; - snpsettest = derive2 { name="snpsettest"; version="0.1.1"; sha256="0vfm09bff7l7z36lzwp0ndnlb230f0kg6dlbjlpk028xd1iy4if1"; depends=[data_table gaston Rcpp RcppArmadillo]; }; + snpsettest = derive2 { name="snpsettest"; version="0.1.2"; sha256="0djz39b59x3kd5albdwjsgvln1qbm9xfbbglbym87xc3924sbwqj"; depends=[data_table gaston Rcpp RcppArmadillo]; }; sns = derive2 { name="sns"; version="1.2.2"; sha256="1zb0s89lp2049i7l919dpd7bd396y9s6v8913qz56fvsq95sbvcn"; depends=[coda mvtnorm numDeriv]; }; snvecR = derive2 { name="snvecR"; version="3.7.7"; sha256="1raxilpafib8fnm8vcz8s4vbfkbkc3gxnrqilksjxvgfs9a50ssz"; depends=[cli curl deSolve dplyr glue lubridate pracma purrr readr rlang tibble tidyr tidyselect withr]; }; sobolnp = derive2 { name="sobolnp"; version="0.1.0"; sha256="00rmigjyd3fsmhrhbvjzrfsl4ir0xpfr4xbgjws6vkx2rmcqnq1s"; depends=[minqa np pbmcapply]; }; @@ -17707,18 +17755,18 @@ in with self; { socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; socialh = derive2 { name="socialh"; version="0.1.1"; sha256="134jdhnnjxgnc8k1ws7pni5g44imxblngf106rwp8ff5a2gmrf6c"; depends=[circlize data_table dplyr ggplot2 magrittr]; }; - socialmixr = derive2 { name="socialmixr"; version="0.2.0"; sha256="0mdsj0dqgn1wckxm9imkhswmbcy391kfqwv42yp1g9y1rcdkvjp4"; depends=[countrycode curl data_table fields httr jsonlite lubridate oai stringr wpp2017 xml2]; }; - socialranking = derive2 { name="socialranking"; version="1.0.0"; sha256="1zq9dlmz7ygnp3cmfkdjmkq2c7rw852d8i06v9j1jl1s67wm33s5"; depends=[Rdpack relations rlang]; }; + socialmixr = derive2 { name="socialmixr"; version="0.3.0"; sha256="0whhpjsbhwnjbv6mvr227g347k52ak2jmdp2kll87m8phh48qd0s"; depends=[countrycode curl data_table fields httr jsonlite lubridate oai wpp2017 xml2]; }; + socialranking = derive2 { name="socialranking"; version="1.0.1"; sha256="0vfjhliha69rqa94y6y0g5yx4ni1cnfpsgf2h8nccypq6m3rcgjr"; depends=[Rdpack relations rlang]; }; socialrisk = derive2 { name="socialrisk"; version="0.5.1"; sha256="1v9hvrqwihfprs32pplxsv00myf0p5pa32601s8s826jss3fkx4w"; depends=[dplyr magrittr rlang stringr tidyr tidyselect]; }; sociome = derive2 { name="sociome"; version="2.2.1"; sha256="0s9ffh9g5ydjglvrc14zhp6im0dz5mq64yakby2myjx670mwwl9w"; depends=[dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; socviz = derive2 { name="socviz"; version="1.2"; sha256="1294xwy26vshmaiw3pkx3f90j8g6fv64gygv88b7lnz6fhai1nq5"; depends=[dplyr fs magrittr rlang tibble]; }; sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; }; - sodium = derive2 { name="sodium"; version="1.2.1"; sha256="1a03z2asvmalnmsn89lapzp8a4fr0qvzdv3xgin8pbqhjyb9hvpp"; depends=[]; }; + sodium = derive2 { name="sodium"; version="1.3.0"; sha256="0b10cbzpybbjwhrbdx2ldjg8gb3cgzra533x6rn3d52zy1sqs6l8"; depends=[]; }; sofa = derive2 { name="sofa"; version="0.4.0"; sha256="1w78f8pnx4vh6znpwwcy9k4j795zji4bv88mi6ihdv09ar7if7yv"; depends=[crul jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4-1"; sha256="1v2a4d688ij5zcvkzpra9yx40xckdfnllnfnyq2450zf3n1kjk7a"; depends=[Matrix]; }; softbib = derive2 { name="softbib"; version="0.0.2"; sha256="0rhia0vx53lhmykf2rmnr9kbcvld35n2and1l3riqdfr6jrdg8pb"; depends=[bibtex checkmate renv rmarkdown]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; - soilDB = derive2 { name="soilDB"; version="2.7.7"; sha256="17bahlm1p6mnvahs144pcss7x0x1hrm7f6xgwf4mn75h06dlfpmd"; depends=[aqp curl data_table DBI]; }; + soilDB = derive2 { name="soilDB"; version="2.7.8"; sha256="1n6yf0zl3l7g0i4nra4i5as3v7f1g6n93fib6a97cc1cnjkqhh2d"; depends=[aqp curl data_table DBI]; }; soilassessment = derive2 { name="soilassessment"; version="0.2.6"; sha256="0cgyji88q3r6b57q32nk8xgxb4q29678h8zgh9ywxhr3mr40i0qv"; depends=[caret deSolve e1071 FuzzyAHP googledrive Hmisc nnet png randomForest raster sf soiltexture sp terra]; }; soilchemistry = derive2 { name="soilchemistry"; version="0.1.0"; sha256="1fkq5zpkcwh7ps2r79kc2pw7q2i4hjjnckx2f29l8064hswd9jc4"; depends=[]; }; soilfoodwebs = derive2 { name="soilfoodwebs"; version="1.0.2"; sha256="09nc2ywxk8kl0akdwxz5zddrnqljvqpixjaz2bjkpxy0xj0qd82l"; depends=[deSolve diagram lpSolve quadprog rootSolve stringr]; }; @@ -17739,7 +17787,7 @@ in with self; { som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.2.0"; sha256="05hm6yqh1d10kbgvy5j0cj2lvcnib4p9lmjcl32zxy1hazpagplq"; depends=[reportr]; }; someMTP = derive2 { name="someMTP"; version="1.4.1.1"; sha256="197ajnnp92qh807a55z0i9z8nw0vmf5vvr216nxjwa2l9kw8c84k"; depends=[]; }; - sommer = derive2 { name="sommer"; version="4.3.1"; sha256="0yb4ljxm85g59w4qhz9sxsx8mlj5ak1wc1yf1fcb1dw7i3q96mwd"; depends=[crayon MASS Matrix Rcpp RcppArmadillo RcppProgress]; }; + sommer = derive2 { name="sommer"; version="4.3.2"; sha256="040gvhmhkqc0d5rq54h2avfhd924q570vshc7lxkljnljlc0izly"; depends=[crayon MASS Matrix Rcpp RcppArmadillo RcppProgress]; }; somspace = derive2 { name="somspace"; version="1.2.4"; sha256="1268sj89cbkp2nm0i905s991a92w4aki93hxia2vqk6fdh200rdl"; depends=[data_table ggplot2 kohonen maps reshape2]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.7"; sha256="1wvdcjk641kcmflda0mibqr519qbqgb26mgwibjhm6pzgvwpy2dg"; depends=[]; }; @@ -17750,7 +17798,7 @@ in with self; { sorcering = derive2 { name="sorcering"; version="0.9.2.3"; sha256="018zrk82qsickxkimm7hbzayixqfzw32fsi080las52rg0i0agin"; depends=[mathjaxr Rcpp RcppArmadillo Rdpack]; }; sorocs = derive2 { name="sorocs"; version="0.1.0"; sha256="0gy23rldhnlz6jmf9rdzl4mmfkn5gjcavq2jfcz6dgjafl3v9vgl"; depends=[MASS MCMCpack mvtnorm]; }; sortable = derive2 { name="sortable"; version="0.5.0"; sha256="1y6cljcjai2k2j7abzn07ab170gpp25zvl9gk755l4gwi7clgl2c"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr rlang shiny]; }; - sorvi = derive2 { name="sorvi"; version="0.8.20"; sha256="034vh2yn3ljjm4p2x2sy4n1gr28m8zfzivf12882if6xyva1xq96"; depends=[checkmate dlstats dplyr ggplot2 gh lubridate purrr rlang rvest tidyr xml2]; }; + sorvi = derive2 { name="sorvi"; version="0.8.21"; sha256="0l8lznn2vnnyzq3i1hab7lcylmhkn9mpzrdymdmai4w2khg8r43b"; depends=[checkmate dlstats dplyr ggplot2 gh lubridate magrittr purrr rlang rvest sf tidyr xml2]; }; sos = derive2 { name="sos"; version="2.1-7"; sha256="11q698wr3xnzr0nmzb9frifrizfl27f1ymdi6mrvyzw0y9cv3sq6"; depends=[brew]; }; sotkanet = derive2 { name="sotkanet"; version="0.9.79"; sha256="1d6g09rf7irk3d8hkm6ahp8zl6lj24jnipwvzr0njx2sqi3fwd4f"; depends=[curl httr jsonlite]; }; sotu = derive2 { name="sotu"; version="1.0.4"; sha256="0hx37as51q3rk7z9vp8awhkj7a87nwd2jlp1hvfkli2j6l07sk7d"; depends=[]; }; @@ -17758,12 +17806,13 @@ in with self; { soundClass = derive2 { name="soundClass"; version="0.0.9.2"; sha256="0z697asv2kzs93b45ndbkxfdzq3fmi1f6aprvpxps4x354gg2pi6"; depends=[DBI dbplyr dplyr generics htmltools keras magrittr RSQLite seewave shiny shinyBS shinyFiles shinyjs signal tuneR zoo]; }; soundcorrs = derive2 { name="soundcorrs"; version="0.4.0"; sha256="1azvsv3bghlab8q24wbb6xwd5a4cydx1cagvhk8h0h5ib9957zab"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="2.6.0"; sha256="18chlzynbkfvqc4dipdxdlk90kz0wqd6qwcax0qg7rc85ghfx8hh"; depends=[doParallel dtw foreach mvtnorm nonlinearTseries phonTools seewave shiny shinyBS shinyjs signal tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="2.6.1"; sha256="005b9l99yfl6n2sn6s90zzi77jpnsv0g4brd0302rdcz7lnqf9yz"; depends=[data_table doParallel dtw foreach mvtnorm nonlinearTseries phonTools seewave shiny shinyBS shinyjs signal tuneR zoo]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7-1"; sha256="1l9i9ram12pjks8h2gzmj119wf4ixwyhljsfv289dn8dgbdjp0cn"; depends=[]; }; sovereign = derive2 { name="sovereign"; version="1.2.1"; sha256="1v5cchwia8v9h4fpb506v6nikp5k042axmryjmqrgimaly8dk9nv"; depends=[broom dplyr furrr future ggplot2 gridExtra lmtest lubridate magrittr mclust purrr randomForest sandwich stringr strucchange tidyr xts zoo]; }; sox = derive2 { name="sox"; version="1.0"; sha256="1rg1658jz6sc8dfp5gd8dmnxl747mw02zz24r7231vjmdwc60bl5"; depends=[glmnet Rcpp survival]; }; - sp = derive2 { name="sp"; version="2.0-0"; sha256="1wc8bwfqalpbsicgdrfkvmg3lm65nghf35m2g8fh4q9hr5gxpy09"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="2.1-1"; sha256="0ns0n4929db2g8wjmg8nscq286df4hxrv7gr4mj8giymm3icsd1d"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9-1"; sha256="1ivsds210rpxj52labc9mf2ncm3vji983w0kj757jl1b308ql30s"; depends=[mvtnorm survival]; }; + spAbundance = derive2 { name="spAbundance"; version="0.1.0"; sha256="1sklcbbk82ikgcvbkzr6cy8cw1hbq22acnlqz4avp277pmp514gc"; depends=[abind coda doParallel foreach lme4 RANN]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBFA = derive2 { name="spBFA"; version="1.3"; sha256="1bi3lhbx37zlj2x0nql51x5422zxc1gcbn8vqjf81badwf80fwsp"; depends=[msm mvtnorm pgdraw Rcpp RcppArmadillo]; }; spBayes = derive2 { name="spBayes"; version="0.4-6"; sha256="0530fhb832nr1vzhwml696cbvwpphjha35i20q0aixxqg8fd35jw"; depends=[coda Formula magic Matrix sp]; }; @@ -17776,15 +17825,15 @@ in with self; { spGARCH = derive2 { name="spGARCH"; version="0.2.2"; sha256="1wrmk2ybgysvibfy8vvp7pyqda5apqp0jxjfp3hlb416fza52966"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spINAR = derive2 { name="spINAR"; version="0.1.0"; sha256="1g4yms3h7m42zfjix1n2yrxi5zj0v97klry6d4r7n0iwx4rllpp4"; depends=[checkmate progress]; }; spMC = derive2 { name="spMC"; version="0.3.15"; sha256="1fv6769xz44xc50ad00df7bacqbwy6xnqm2072zjgkl1dbskfjma"; depends=[]; }; - spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; + spMaps = derive2 { name="spMaps"; version="0.5.0"; sha256="1v5gvnyfj04rxraqngrmpkpq3874y422hr6yirj52iksb8ry0kgh"; depends=[sf sp]; }; spNNGP = derive2 { name="spNNGP"; version="1.0.0"; sha256="0z09hxmm2pbxsbm3zqk839z2gb3g2n2hqkahcbvcgywrqn3v8cal"; depends=[coda Formula RANN]; }; - spNetwork = derive2 { name="spNetwork"; version="0.4.3.7"; sha256="0qhy0dh4cgnxlbkcadnjzwpnbjq0navikr3gsczg562h4jq0ds8w"; depends=[abind BH cubature data_table dbscan dplyr future_apply ggplot2 igraph progressr Rcpp RcppArmadillo RcppProgress Rdpack sf spdep]; }; - spOccupancy = derive2 { name="spOccupancy"; version="0.6.1"; sha256="1ffgkqilh21dblks7q1iclgwimd70ks6xikmrprk010z4n9l2x67"; depends=[abind coda doParallel foreach lme4 MASS RANN]; }; + spNetwork = derive2 { name="spNetwork"; version="0.4.3.8"; sha256="0jxm3csq6prqssw9jdlk0k1ipm19kfv1y8kjgyqfb5m5l1za5xvq"; depends=[abind BH cubature data_table dbscan dplyr future_apply ggplot2 igraph progressr Rcpp RcppArmadillo RcppProgress Rdpack sf spdep]; }; + spOccupancy = derive2 { name="spOccupancy"; version="0.7.1"; sha256="1xlb9j81va9sz9paskf26q60s36cb0vv22c1rwwvp94xf04v2j85"; depends=[abind coda doParallel foreach lme4 RANN]; }; spRingsteen = derive2 { name="spRingsteen"; version="0.1.0"; sha256="13mdbsbq51sp34xp04lgc4klwb3chnnkvh5r99qfapbbr0vra8vl"; depends=[devtools rlang]; }; spTDyn = derive2 { name="spTDyn"; version="2.0.2"; sha256="010x3rjncasly1scngwyiys7asmk4ay51bzhk0zfjazwfkmqd12r"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3.2"; sha256="0dlsyj0mawpgxr1yn4ldqm3xh148c79lk55fq475zjzyiwz9ynfc"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="4.3.20"; sha256="1pykry87df7h1lcbc6zgbmib3063jcjdsycs85426z5n6hshy4k8"; depends=[boot crayon geometry gmp MASS Matrix minqa nlme nloptr numDeriv pbapply proxy Rcpp RcppEigen ROI]; }; + spaMM = derive2 { name="spaMM"; version="4.4.0"; sha256="0c97fs457jcdqf4pncwg4k4nh91kh1s2l94jhwzvfq7s5mk9jwpz"; depends=[backports boot crayon geometry gmp MASS Matrix minqa nlme nloptr numDeriv pbapply proxy Rcpp RcppEigen ROI]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; spacefillr = derive2 { name="spacefillr"; version="0.3.2"; sha256="0raaw9ib8b2dzkh4w28wpxcgxs7ky328yaayb64lc39syf7g19dv"; depends=[Rcpp]; }; @@ -17794,18 +17843,18 @@ in with self; { spacetime = derive2 { name="spacetime"; version="1.3-0"; sha256="06slxywh94g4k7dxnfs9g5yjvwjk2lxwydrjwawg0mgkqsjh569f"; depends=[intervals lattice sp xts zoo]; }; spacyr = derive2 { name="spacyr"; version="1.2.1"; sha256="1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.6.0"; sha256="0xigwi6w21y2fwicml0s2gylwnwp2qvrqskr0v8rd3bn01hg9ja3"; depends=[]; }; - spam = derive2 { name="spam"; version="2.9-1"; sha256="1nvx965vxzs697k9m2l40a15bykflksn9bwa4py1p2wqg6922bn3"; depends=[dotCall64]; }; - spam64 = derive2 { name="spam64"; version="2.9-0"; sha256="1k2ah76l38xwzn7c541b7nip2yx8n8yh6p9j80rpkc3jdni2n9dq"; depends=[]; }; + spam = derive2 { name="spam"; version="2.10-0"; sha256="0ydc513jg7phzdqg8jp7210ayrrmxq91jafqzx8z1v0172i8d73i"; depends=[dotCall64 Rcpp]; }; + spam64 = derive2 { name="spam64"; version="2.10-0"; sha256="0kb7jz12xb0i45b70x3p785md01s7wbwl8lgisq4i83jvlz016ln"; depends=[]; }; spamtree = derive2 { name="spamtree"; version="0.2.2"; sha256="1z1dyv6cvcdilqyfpzgl3zr0jmzjn2sznrvypvxx7c8i6qfq8nd0"; depends=[dplyr FNN magrittr Rcpp RcppArmadillo rlang tibble]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="2.14.0"; sha256="01j2xdvxf022varj7lykiyin90z6g9z2yr6402in3splmqs81r5k"; depends=[abind expm fields irlba jsonlite minpack_lm mmand nloptr numDeriv plyr pracma ptw RNifti RNiftyReg signal smoother stringr]; }; + spant = derive2 { name="spant"; version="2.16.0"; sha256="19n2mnvrd9p0kwgnhh7q2pz01xs22qx2zqw1k4l0gvagb8kjz9pi"; depends=[abind expm fields irlba jsonlite minpack_lm mmand nloptr numDeriv plyr pracma ptw RNifti RNiftyReg signal smoother stringr]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.4"; sha256="1s1hd6hvjxnfb3w10v93pggijmm2h4rcsf7ckl34j2sw9bvv7zka"; depends=[sparklyr]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.8.2"; sha256="17f81nmb7fibvyjiiiymmx8bwsdvvza2xhxdw9sh88b6xain0x3h"; depends=[base64enc config DBI dbplyr digest dplyr ellipsis generics globals glue httr jsonlite openssl purrr rappdirs rlang rstudioapi tibble tidyr tidyselect uuid vctrs withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.8.3"; sha256="1bzvkzb38l3c9r0agkygkjjv7x94f9m6f3p2cf9i305jd8s9qjg9"; depends=[base64enc config DBI dbplyr digest dplyr ellipsis generics globals glue httr jsonlite openssl purrr rappdirs rlang rstudioapi tibble tidyr tidyselect uuid vctrs withr xml2]; }; sparklyr_flint = derive2 { name="sparklyr.flint"; version="0.2.2"; sha256="0sszblvgxi8l8wlic5nrnm4pc9m0byyvayrja2476vnz0pqliv69"; depends=[dbplyr dplyr rlang sparklyr]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.4"; sha256="185cq40958fgwrng14ifil1vwrni5nn6haxfknzarhn805hfkv7c"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr tidyselect]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; @@ -17831,9 +17880,9 @@ in with self; { sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; }; sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.8"; sha256="1x1phd33r3ci72sbm0pkmigwbi4x59pdz8n5919119mkxdf740vs"; depends=[Matrix nnet]; }; sparsediscrim = derive2 { name="sparsediscrim"; version="0.3.0"; sha256="1fzvki3az1y5bz6d7lygv3hjbzn17gq8g2s7xqmldlpq1v4dhjar"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm rlang]; }; - sparsegl = derive2 { name="sparsegl"; version="1.0.1"; sha256="1v1cch790v4icxay0l63pad613z4p5cax6xni4bdx4ih7mhn4ln8"; depends=[cli dotCall64 ggplot2 magrittr Matrix rlang RSpectra tidyr]; }; + sparsegl = derive2 { name="sparsegl"; version="1.0.2"; sha256="0c5iqhq3rn5wsy8a5lj37b4spqhy46d7d5k5q3kn034amml4cyfb"; depends=[cli dotCall64 ggplot2 magrittr Matrix rlang RSpectra tidyr]; }; sparseinv = derive2 { name="sparseinv"; version="0.1.3"; sha256="06inzix9m7b5g7c97lyvyl2g7fdr4iz60791hl2w9mah7nd6bfja"; depends=[Matrix Rcpp spam]; }; - sparsenet = derive2 { name="sparsenet"; version="1.4"; sha256="1r7xmpn3r8dq1zm6ghygks3l014kqlrpfgsl8q23w7rly8ksw3m9"; depends=[Matrix shape]; }; + sparsenet = derive2 { name="sparsenet"; version="1.5"; sha256="1hvl17r1r87cig4dyv9fczb7gadb6zh331knnxw6c0wwxnvxwi09"; depends=[Matrix shape]; }; sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; }; sparsepp = derive2 { name="sparsepp"; version="1.22"; sha256="0wa1585pkbn3y11apyim4z1ixn300c1yyv9bf2qldb6cjfiv7699"; depends=[]; }; sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; @@ -17846,36 +17895,34 @@ in with self; { sparvaride = derive2 { name="sparvaride"; version="0.1.0"; sha256="17skm44cdv540jik8lv5y0dp6yzjgy775vjzq3dv1jv58nqjvps1"; depends=[Rcpp RcppArmadillo]; }; spass = derive2 { name="spass"; version="1.3"; sha256="1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spatPomp = derive2 { name="spatPomp"; version="0.33.0"; sha256="1lwrj40mnb6gcpqjh3w6d9lp5n0y8q3pidgypznhgr5akzyn4lcg"; depends=[abind dplyr foreach ggplot2 magrittr pomp rlang stringr tidyr]; }; - spate = derive2 { name="spate"; version="1.7.4"; sha256="0fc09y54g1h9pmc0rfwbrlzsck27kxhsynzwyxydysmda133spdf"; depends=[mvtnorm truncnorm]; }; + spate = derive2 { name="spate"; version="1.7.5"; sha256="114amd3rh9ns6pyh92c5n991904mfwd6vi5cljzm2w3rhyf9vjci"; depends=[mvtnorm truncnorm]; }; spatgeom = derive2 { name="spatgeom"; version="0.3.0"; sha256="1z6haqqzghji6703crs69nvqx93h19bdkw0frpmrcxa60fxm0kyr"; depends=[cowplot dplyr ggplot2 lwgeom purrr scales sf]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.4"; sha256="1xiq4a8br46qk19k23kkb6l1b7ciw9lmmrvwfznwkamwps6dwlg8"; depends=[Matrix Rcpp]; }; spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-17"; sha256="1msxbxz50qmzjxgix2vcq0f50b4cdvj8nz3qlilp397jrzc3w07i"; depends=[]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="2.0-1"; sha256="1iyym2cb6i7p2wxy8q1yasvlhrl2991mjsnhrv387zjd93lf5kyh"; depends=[sf terra]; }; spatialRF = derive2 { name="spatialRF"; version="1.1.4"; sha256="1lbwk7ziv292kxkz6rpr44jij3q13ljmqaccq56x6c2l8wkxl583"; depends=[doParallel dplyr foreach ggplot2 huxtable magrittr patchwork ranger rlang tibble tidyr tidyselect viridis]; }; spatialTIME = derive2 { name="spatialTIME"; version="1.3.3-3"; sha256="06fwjifvgjb9xcxlgd32s8ik9dcjakc5z25lmhvp63lkyyazvqxs"; depends=[crayon dplyr furrr future ggplot2 magrittr plyr purrr RColorBrewer rlang scales spatstat_explore spatstat_geom tidyr tidyselect]; }; - spatialfusion = derive2 { name="spatialfusion"; version="0.6-6"; sha256="14qccp9ca7b7v9w4fj04a99mx6qchfs8588fl16qfdmfbazwnfra"; depends=[deldir fields Rcpp rgeos rstan sp spam]; }; - spatialprobit = derive2 { name="spatialprobit"; version="1.0"; sha256="1g65c081xmhfp45lidn57xwryk4pmzzixs3b2qzixzg4knks74dy"; depends=[Matrix mvtnorm spatialreg spdep tmvtnorm]; }; + spatialprobit = derive2 { name="spatialprobit"; version="1.0.1"; sha256="1r8pn6pmd2aqy7xia2b0935n69zkr4h0dwp6z418jxgbfc7198yl"; depends=[Matrix mvtnorm spatialreg spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.2-9"; sha256="0gmrrddhhs5fcgfgm8w3rkjk6g6vdndlj92jb8naihbwxkzgkya5"; depends=[boot coda expm LearnBayes MASS Matrix multcomp nlme sf spData spdep]; }; spatialrisk = derive2 { name="spatialrisk"; version="0.7.0"; sha256="0mqi8jrz1msk2aaza67vfp9s21f372mhvbivwxy56fxrl7vp975v"; depends=[classInt colourvalues data_table dplyr fs GenSA geohashTools ggplot2 leafem leafgl leaflet lubridate Rcpp RcppProgress sf tmap units viridis]; }; spatialsample = derive2 { name="spatialsample"; version="0.4.0"; sha256="1f44zzga5df5vqxzvc40sbivdhzx4x62qbqx5vkw9rxw5yrm9d2d"; depends=[cpp11 dplyr ggplot2 glue purrr rlang rsample sf tibble tidyselect units vctrs]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="3.0.3"; sha256="03a0gb8v6028v6q5w3iap8fn9nkb2rpnabqgzmr2dyxnpfgr9dn3"; depends=[future future_apply ggplot2 gsl plyr Rcpp RcppArmadillo segmented]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2.3"; sha256="0j0v0cyqndlg9p7g03gp1br9b2i3p50abzpw67k3cawm96a87crj"; depends=[BH colourvalues geojsonsf geometries jsonify rapidjsonr Rcpp sfheaders]; }; - spatsoc = derive2 { name="spatsoc"; version="0.1.16"; sha256="1pyw6606kwskgcfnzvgzvy8n4i9s3mmn1789d1lhk04h14r33fns"; depends=[adehabitatHR data_table igraph rgeos sp]; }; + spatsoc = derive2 { name="spatsoc"; version="0.2.2"; sha256="0aj9kg9013m0j3nx5qr2mvwczskkk0wy19yx1pb33wnqvhv2w0n0"; depends=[adehabitatHR data_table igraph sf units]; }; spatstat = derive2 { name="spatstat"; version="3.0-6"; sha256="0vlpa5a1b5s27lgxkq65iixrsbbj0x4zahg0sfsak0ackj8ks577"; depends=[spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_utils]; }; spatstat_Knet = derive2 { name="spatstat.Knet"; version="3.0-2"; sha256="1yvdasrxmsa2m9016kclb33kv5893fsz5rcr416yhpf6jixdsfh8"; depends=[Matrix spatstat spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_sparse spatstat_utils]; }; spatstat_data = derive2 { name="spatstat.data"; version="3.0-1"; sha256="002kvli3n9cppaar7q062dm4fapdgkyf1daq5zscxsanwcflpswf"; depends=[Matrix spatstat_utils]; }; - spatstat_explore = derive2 { name="spatstat.explore"; version="3.2-1"; sha256="02n64bml361xakfbj71m7mgkb0p6szqc55lijjsnwa3z69pwwshb"; depends=[abind goftest Matrix nlme spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils]; }; - spatstat_geom = derive2 { name="spatstat.geom"; version="3.2-4"; sha256="09x2z2jqgbmilqg2kx4sgzrz54hbkyfpv9hm759075i2hkaza796"; depends=[deldir polyclip spatstat_data spatstat_utils]; }; + spatstat_explore = derive2 { name="spatstat.explore"; version="3.2-5"; sha256="053wl87whmkkqp058lwzlwv0wydddizsni9m94f6kxgl5ahia1sc"; depends=[abind goftest Matrix nlme spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils]; }; + spatstat_geom = derive2 { name="spatstat.geom"; version="3.2-7"; sha256="13k85918zd2n64mxjwlgzd986zvs3is8vg06k9i195yymfrik65y"; depends=[deldir polyclip spatstat_data spatstat_utils]; }; spatstat_gui = derive2 { name="spatstat.gui"; version="3.0-1"; sha256="1y6z3gdad0nhqg494b5pjq4h0mr3mcrhnnc0chy56lf8chb6p5jb"; depends=[rpanel spatstat spatstat_data spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random spatstat_utils]; }; spatstat_linnet = derive2 { name="spatstat.linnet"; version="3.1-1"; sha256="0adha3bi1a250p8wm7agqdmwzznd6blsfg0km11n25ad8y2r5q0c"; depends=[Matrix spatstat_data spatstat_explore spatstat_geom spatstat_model spatstat_random spatstat_sparse spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="5.0-1"; sha256="02ip6d2mr07n3lv4i5xdmb1j55syk5hwjwr7j81ibxkp3gj8gm61"; depends=[spatstat spatstat_data spatstat_explore spatstat_geom spatstat_model spatstat_random spatstat_sparse spatstat_utils tensor]; }; - spatstat_model = derive2 { name="spatstat.model"; version="3.2-4"; sha256="0vcxwwc4kjfmjd80sk7rbv8a9yg9v2m94brgww8fiibrm6m9psi6"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_explore spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; - spatstat_random = derive2 { name="spatstat.random"; version="3.1-5"; sha256="128rm8k4b5rklddmnhbsv93jj6qym0fngir9nb65cawg3zb991m6"; depends=[spatstat_data spatstat_geom spatstat_utils]; }; + spatstat_model = derive2 { name="spatstat.model"; version="3.2-8"; sha256="1x03fy921rq8dyr6jkpwnx7pf7fc5593mvnl8r1gz3sypnmp6p4d"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_explore spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; + spatstat_random = derive2 { name="spatstat.random"; version="3.2-1"; sha256="1p1imyqrpvdhsc24pq3mvdg9n29h6q8zlawdyahqiymynyp22m4j"; depends=[spatstat_data spatstat_geom spatstat_utils]; }; spatstat_sparse = derive2 { name="spatstat.sparse"; version="3.0-2"; sha256="1gnlgz11dv66b41kdyyzm8nhkhhi4yajlcr2g52h2lfxlryb5g2h"; depends=[abind Matrix spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="3.0-3"; sha256="0j6w9b479qqah2vzbq31v1xa6rjql8a85hdlahqhwqd9j1scd03s"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="1.8-2"; sha256="0v6l1vxcvy6bdg6inszcz4rryb99v9ixxcmh4a3381s4md9h6z4v"; depends=[fields iterators lubridate Matrix raster RColorBrewer rgeos sp spatstat_explore spatstat_geom spatstat_random stringr survival]; }; + spatsurv = derive2 { name="spatsurv"; version="2.0-1"; sha256="17s88w8ikrazhjbilvwcw1i1r9b77ci7f69jgr8lni7dd7l0b0hy"; depends=[fields iterators lubridate Matrix raster RColorBrewer sf sp spatstat_explore spatstat_geom spatstat_random stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.6.0"; sha256="0y30v7p54mmy43w7wclhywwk1zih6h66hkgd7dc101yiqvnx4m84"; depends=[dplyr pkgconfig rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.7"; sha256="02dw1hh3ksx119wf7qkg01m7h60pmsc3vkryw5fikyxyfz871ldl"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.6.3"; sha256="0lvsixjgdfgnr7y7kk2227bcs8sqy2mrpw50dwwgdjvm5q0sr7l7"; depends=[gridExtra rpart]; }; @@ -17885,6 +17932,7 @@ in with self; { spcr = derive2 { name="spcr"; version="2.1.1"; sha256="09clpz0vqssagmfjcrs2qp5i61ppjr9nxn342l6gbdnbw91wc7f3"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; spdep = derive2 { name="spdep"; version="1.2-8"; sha256="144idklvyvnzfdnigzyw6wqhxyrfjw8pm7vdmlk5a0yi235v97wd"; depends=[boot deldir e1071 s2 sf sp spData units]; }; + spdesign = derive2 { name="spdesign"; version="0.0.2"; sha256="0nhz7b6xgc6ns0h2fr39vb6bb3l0x6q8km7d0q5x8n71qdk4lf7h"; depends=[cli future matrixStats randtoolbox stringr]; }; spdl = derive2 { name="spdl"; version="0.0.5"; sha256="185qzlwac7acq126xpvcd71nv25zgkrdr8m73gv2sn1zxj78hyid"; depends=[RcppSpdlog]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; @@ -17893,6 +17941,7 @@ in with self; { speaq = derive2 { name="speaq"; version="2.7.0"; sha256="0z9a3nbfazphp090c6hg892vjq7jp4g4cij3s5wbs1q567inbmlk"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest reshape2 Rfast rvest xml2]; }; spearmanCI = derive2 { name="spearmanCI"; version="1.0"; sha256="1xi51dphv91j5hgrd25sqs1li0g24cwpa1k162arw5b0qfl04f17"; depends=[emplik MASS]; }; spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; }; + speccurvieR = derive2 { name="speccurvieR"; version="0.1.0"; sha256="0sf992nmvfw2f3izb3p43jpnh6x9shvmas4cxx5gmsfbf597si3h"; depends=[combinat dplyr ggplot2 lfe magrittr pbapply stringr tidyr]; }; specieschrom = derive2 { name="specieschrom"; version="1.0.0"; sha256="0h2hgh0amvv7in5hplh6x3k95bnjm6d24nzmc57yihcsqjndli9k"; depends=[colorRamps ggplot2 reshape2]; }; specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; }; specr = derive2 { name="specr"; version="1.0.0"; sha256="1y7d1x9rps0xkm8jghpnva8mmzwqa0c93mk6rf2dyrbyw850ddax"; depends=[broom cowplot dplyr furrr future ggplot2 ggraph glue igraph lifecycle lme4 magrittr parallelly purrr rlang stringr tibble tidyr]; }; @@ -17904,7 +17953,7 @@ in with self; { spectralAnalysis = derive2 { name="spectralAnalysis"; version="4.3.1"; sha256="17d8b27v4d2557hgkk169xkvv4ffkkk7xr4h3wxb6rkvn2pzl9gi"; depends=[baseline BiocGenerics data_table dplyr ggplot2 hNMF jsonlite magrittr NMF nnls plotly pls plyr RColorBrewer signal viridis zoo]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.3"; sha256="09nsszm2f6q8kz84kn7ihhb627q186jwpvr6fm633l8app4ilf2x"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; }; - spectralR = derive2 { name="spectralR"; version="0.1.2"; sha256="0vjx0m7cibv0dk7p5la77caf66bj8k7djhw6i1nibghk7qf00lbk"; depends=[dplyr geojsonio ggplot2 reshape2 rgee rlang sf tibble tidyr]; }; + spectralR = derive2 { name="spectralR"; version="0.1.3"; sha256="1kz47gydsqa3g47m6z546sf5jnfscsly1v3dpj97ns0qf5sh57bp"; depends=[dplyr geojsonio ggplot2 reshape2 rgee rlang sf tibble tidyr]; }; spectre = derive2 { name="spectre"; version="1.0.2"; sha256="1n5z7970pzhavdf7qhxsb7gzz8dsrwa1pwyxf8n6sxvmdbk8v2z1"; depends=[ggplot2 Rcpp RcppProgress testthat]; }; spectrolab = derive2 { name="spectrolab"; version="0.0.18"; sha256="1iwhsz19yfvf71zg1ifg9d3xb9rjbng1h5g7vfakm1jckin9mrv2"; depends=[RColorBrewer shiny shinyjs]; }; sped = derive2 { name="sped"; version="0.3"; sha256="0dxfr9fpwmnl0nq6szg5ph1mfl2qp28n4d2kkq092qyzbvk74rnp"; depends=[pooh]; }; @@ -17924,13 +17973,12 @@ in with self; { spfda = derive2 { name="spfda"; version="0.9.1"; sha256="094j68gyy5yw7d2mn3n864h6vf8nd76x9ypfzc1liggnw7qs0fdl"; depends=[mathjaxr]; }; spfilteR = derive2 { name="spfilteR"; version="1.1.5"; sha256="1s11d88y4jwzd85lyircgz9j67mwbqld1jicynxb7wayk8akfyf4"; depends=[]; }; spflow = derive2 { name="spflow"; version="0.1.0"; sha256="0a5nirccwcc2z4dn3gxdlhdjz7sxv1r23clawy0kwn4ggdkmphp1"; depends=[coda Matrix Rdpack RSpectra]; }; - spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; }; + spgs = derive2 { name="spgs"; version="1.0-4"; sha256="0ln0fhxiavzwp5qlz5akk5896dyznwbz23f816vkjnxmw7pi4p70"; depends=[]; }; spgwr = derive2 { name="spgwr"; version="0.6-36"; sha256="1fkz37zwmarcsl101z172kiar48zyi6s216lhc8zc39g4kqpj99a"; depends=[sp spData]; }; - sphereTessellation = derive2 { name="sphereTessellation"; version="1.1.0"; sha256="0cg21hhgcnnsaiv23j0f3yvalkqzf9z0c7dnpy78ilalyzg29z85"; depends=[BH randomcoloR Rcpp RcppCGAL RcppEigen rgl]; }; spherepc = derive2 { name="spherepc"; version="0.1.7"; sha256="0y05ylyxzawgjlivaxs513mfjjfmw6fm98b83sq76n8yw56pr9ny"; depends=[geosphere rgl sphereplot]; }; sphereplot = derive2 { name="sphereplot"; version="1.5.1"; sha256="1jxjd66hcyqdizzikxsncswswj7c1rprigz1xii82rkcms8iygzm"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="2.0"; sha256="1qr4n4kbmc58qmr8niqq3mnwv18x9q2f24c1kg67asf7n3pnmy77"; depends=[coda Matrix mvtnorm nlme sf sp spatialreg spData spdep stringr]; }; - sphunif = derive2 { name="sphunif"; version="1.0.1"; sha256="0846k5jcnkxgkz3jz1ip06ni1981z658sswjqr46hiy35jrk6z53"; depends=[doFuture foreach future gsl Rcpp RcppArmadillo rotasym]; }; + sphunif = derive2 { name="sphunif"; version="1.1.0"; sha256="0g2f9r69mkggljbrkfmfxqv9vpqgi2d8zzsm9zvfcf72b06asb9n"; depends=[doFuture foreach future gsl Rcpp RcppArmadillo rotasym]; }; spidR = derive2 { name="spidR"; version="1.0.2"; sha256="09n0fz9iqc3n4c72h9hyc0ybzaqzy4l1rypvaig5kl98kx5nng1i"; depends=[httr jsonlite rgbif rworldmap rworldxtra]; }; spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; }; spiderbar = derive2 { name="spiderbar"; version="0.2.5"; sha256="0yhxm3ns9xymm6msklpm1x0ahcq7gkfp1w92aafk2r3pip1g3ds5"; depends=[Rcpp]; }; @@ -17944,18 +17992,18 @@ in with self; { spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; spiralize = derive2 { name="spiralize"; version="1.0.6"; sha256="10zz0f3z033pqi9rm3kgac85i5h8ngg2cx4dlr8z5y8v08dpln6b"; depends=[circlize GetoptLong GlobalOptions lubridate]; }; spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; }; - spiro = derive2 { name="spiro"; version="0.2.0"; sha256="1nd61m6x4nj9fjqbsipl9y7b4bqc2zayg0ni2ap83jfdwwiqj7zn"; depends=[cowplot digest ggplot2 knitr readxl signal xml2]; }; - splancs = derive2 { name="splancs"; version="2.01-43"; sha256="0j641xipb3nzncxwgf1adrcc95jqinhx68fr55mcixk93xg5cldk"; depends=[sp]; }; + spiro = derive2 { name="spiro"; version="0.2.1"; sha256="08v290c62x915624hydzns6qdbfxh08zsbgffkgd89inn2bwj55g"; depends=[cowplot digest ggplot2 knitr readxl signal xml2]; }; + splancs = derive2 { name="splancs"; version="2.01-44"; sha256="0wf1vr8ykcgfcvh4ajqpnpj2qa9l277n2qmnq5f95234npwnvm08"; depends=[sp]; }; splash = derive2 { name="splash"; version="1.0.2"; sha256="1iviwf7dxlrbfzjigl8wd8q3i0jkdnb7mr8zy6zg0w81p4416q42"; depends=[]; }; - spldv = derive2 { name="spldv"; version="0.1.1"; sha256="0v721z8v0dhnkcbljw592hhlgg32a6sh9hz4lx9p2jpkx8mpz9bb"; depends=[car Formula MASS Matrix maxLik memisc numDeriv spatialreg sphet]; }; - splines2 = derive2 { name="splines2"; version="0.5.0"; sha256="1mfp9303src2xvxcg7sgc5cl8mxxx26c9wm6j9c1f6h5bn9jvvzv"; depends=[Rcpp RcppArmadillo]; }; + spldv = derive2 { name="spldv"; version="0.1.3"; sha256="10bvx4z2b0kl2dl91dvr611cfp28dvch41vj9z1k1qlw03ybqpr8"; depends=[car Formula MASS Matrix maxLik memisc numDeriv spatialreg sphet]; }; + splines2 = derive2 { name="splines2"; version="0.5.1"; sha256="0aac9p93sngr4ydyg0s9v3p2w444d09ghb3lan3r14j9v8i1aw1f"; depends=[Rcpp RcppArmadillo]; }; splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; splitSelect = derive2 { name="splitSelect"; version="1.0.3"; sha256="03gziy1hhm35hw8q2w9w6d4x2zci5q2wds0mkzihvfm0wkshi4fw"; depends=[doParallel foreach glmnet multicool]; }; splitTools = derive2 { name="splitTools"; version="1.0.1"; sha256="1qm9rippq5726vgsdcim4xvssv5r00d46zjzbcg06vy71klgrc6p"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.8.2"; sha256="0lq1a07kh2jdvg68p2jzhjcidwp6r83qbkggqdv0rmdj4x47lj5s"; depends=[dplyr ggplot2 lme4 patchwork plyr psych Rcpp robustbase tidyr]; }; - splithalfr = derive2 { name="splithalfr"; version="2.2.0"; sha256="1c3q7x4fipsym0gz22kgl75r594hylbcci3a76q3yp0zazjmxxhx"; depends=[bcaboot dplyr psych rlang tibble]; }; + splithalfr = derive2 { name="splithalfr"; version="2.2.2"; sha256="0zy7p2cvxbq2p24vyi55hl4qcj42igfbsapmx3xh15rpcdhzsmm0"; depends=[bcaboot dplyr psych rlang tibble]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.6-3"; sha256="0qi6kcsp8d6ijdca2rgdy0rr4myiii6qv4mlva4hc5r24w8v3ycm"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spatialreg spdep stringr]; }; splmm = derive2 { name="splmm"; version="1.1.3"; sha256="0z04arwzy5169f6bhc8cbdc07zcmd5safpii5a3g7bqallmzipnr"; depends=[emulator ggplot2 gridExtra MASS miscTools penalized plot3D Rcpp RcppArmadillo]; }; @@ -17968,34 +18016,32 @@ in with self; { spmodel = derive2 { name="spmodel"; version="0.4.0"; sha256="0viv56fk4qq16grzhjx9fviyykwh2rki5q1fs92fnjpghnhjfwv7"; depends=[generics Matrix sf tibble]; }; spmoran = derive2 { name="spmoran"; version="0.2.2.9"; sha256="1xbvr9wrp48a31ggr2j8kivkpjxl1n8cmhfmlz13dcd15byvjrcs"; depends=[doParallel fields FNN foreach ggplot2 Matrix rARPACK RColorBrewer sf spdep vegan]; }; spnaf = derive2 { name="spnaf"; version="0.2.1"; sha256="1v19rhcy8na5iz0mqkadgmqyzq9maqnzb4s7l6blq6zz3krgaj0s"; depends=[dplyr magrittr rlang sf spdep tidyr]; }; - spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; spnn = derive2 { name="spnn"; version="1.2.1"; sha256="1yj89j7nynfyw1ikm6q5kdwdgiiwxx0aa6kgnri5wfnb4l0356l7"; depends=[MASS Rcpp RcppArmadillo]; }; spocc = derive2 { name="spocc"; version="1.2.2"; sha256="1z44hxyd3iyinm6gka0r0hrm8xhbck7pqsgfkydn48i5q26kjjxg"; depends=[crul data_table jsonlite lubridate rebird rgbif ridigbio rvertnet s2 tibble whisker wk]; }; spoiler = derive2 { name="spoiler"; version="1.0.0"; sha256="105shgv62x3qjw4477qfi79h9bdih4n8hg6wn842dyfq940wkr5b"; depends=[htmltools shiny]; }; spongebob = derive2 { name="spongebob"; version="0.4.0"; sha256="1ar5173fwx1am5rgjlnczfla6b49g0azl0h9vn89ipw7f71rr5j7"; depends=[]; }; spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; spooky = derive2 { name="spooky"; version="1.4.0"; sha256="18qlm1dvspw2n7xanrxvflgvdppva3pxrs6m56cia2klv95rn1xn"; depends=[entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments philentropy purrr readr scales tictoc]; }; - spork = derive2 { name="spork"; version="0.2.2"; sha256="09n159nkrgpwf6ck24axgsxh6dm1xays9pgx940pzmaq7vzb5ng4"; depends=[ggplot2 latexpdf png]; }; + spork = derive2 { name="spork"; version="0.2.3"; sha256="1dvww617kcy8x483nclkvbkbafrv7a2c3n0yfd88bc5vhvwcgz81"; depends=[ggplot2 latexpdf png]; }; sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; sportyR = derive2 { name="sportyR"; version="2.2.1"; sha256="1az2w2imm54xr6076fip7b881ydyvbj24if2w992ca3d39qggn6i"; depends=[ggfittext ggplot2 glue rlang]; }; spotidy = derive2 { name="spotidy"; version="0.1.0"; sha256="0hg8d3piiwp4q3257qsv5l41zc3c5a8mbq595ci63id8fc2q2pkd"; depends=[dplyr httr magrittr purrr]; }; spotifyr = derive2 { name="spotifyr"; version="2.2.4"; sha256="14rq4yzvly3yl1xnndpzp6mp2mmbvc0qwkx75lb85gad8271a4ij"; depends=[assertthat dplyr httr janitor jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble xml2]; }; - spotoroo = derive2 { name="spotoroo"; version="0.1.3"; sha256="1j95jqc5bkl2m9ljjgkv33aw5i279xkcf16f1mp9mphjcpl9xl24"; depends=[cli dplyr geodist ggbeeswarm ggExtra ggplot2 ggrepel patchwork progress]; }; + spotoroo = derive2 { name="spotoroo"; version="0.1.4"; sha256="004pjlad31xkxvl9bm4ga33ikmph93blb0qd1rpvs8s0lgi7v6pn"; depends=[cli dplyr geodist ggbeeswarm ggExtra ggplot2 ggrepel patchwork progress]; }; spqdep = derive2 { name="spqdep"; version="0.1.2"; sha256="0q2sp76kgrmw2w033m9i69vx0shziazr31akjmighcy1pdz3b695"; depends=[broom dplyr ggplot2 gridExtra gt gtools igraph lwgeom magrittr Matrix purrr rgeoda rsample sf sp spatialreg spdep tidyr]; }; - spray = derive2 { name="spray"; version="1.0-22"; sha256="1dzv0ciimiprxsmqb9b49sx4j3i6jakx4sw4bhhmfklsj0p018r2"; depends=[disordR magic mathjaxr partitions Rcpp]; }; + spray = derive2 { name="spray"; version="1.0-24"; sha256="0c0kbaf8d9rf87s7aps89vwzq88f8i6cy3lwz7yi9vacp01nykkk"; depends=[disordR magic mathjaxr partitions Rcpp]; }; spreadr = derive2 { name="spreadr"; version="0.2.0"; sha256="180dvr39i1glc0jllsnnglwrxh133q20v7px2fmdi7229pr175id"; depends=[assertthat extrafont ggplot2 igraph Matrix Rcpp]; }; spreval = derive2 { name="spreval"; version="1.1.0"; sha256="1zapfld0d6yyxqvijkb243zqin9xwqhmnznd2nnd4cp0rq3106zf"; depends=[interp timeDate]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; - springer = derive2 { name="springer"; version="0.1.7"; sha256="12778xq093migw5rrxlbzdzyrfj16hadh6wv9l907m6dchv6wakn"; depends=[MASS Rcpp RcppArmadillo]; }; + springer = derive2 { name="springer"; version="0.1.8"; sha256="13gg1xj84fkrkmyrw0h478qg8q2ig0axv1433n05fwy2mzp22yjp"; depends=[MASS Rcpp RcppArmadillo]; }; springpheno = derive2 { name="springpheno"; version="0.5.0"; sha256="16pa56k1pbazv3vx5lhzc8n3pazrfh1q4bi7116bbvsdgpp9vs8g"; depends=[]; }; sprintr = derive2 { name="sprintr"; version="0.9.0"; sha256="0nnzjn7zrcgcmk3rs0hn56jcjrzrn5z0kc77bv4zzvbz5vr8gbwj"; depends=[glmnet Rcpp RcppArmadillo]; }; sprtt = derive2 { name="sprtt"; version="0.2.0"; sha256="0nllzisyf6ykamdi9y9hfscfa3hkmfaz7ddg9l25sqnawjvwrncr"; depends=[dplyr ggplot2 glue lifecycle MBESS purrr]; }; - sps = derive2 { name="sps"; version="0.5.0"; sha256="13ibs39msnjwcmik56632g53wyx872rrinzxyrydzmc54ks7my9p"; depends=[]; }; + sps = derive2 { name="sps"; version="0.5.3"; sha256="1946yjbvpamg9sc62avcj5c9ghih0xckrv8xna5149i3iwrn421a"; depends=[]; }; spsComps = derive2 { name="spsComps"; version="0.3.3.0"; sha256="1yhd2iw9z614mcb2lnq43x5ixfpc5lbdm5avgawp726c3fvflky8"; depends=[assertthat crayon glue htmltools magrittr R6 shiny shinyAce shinytoastr stringr]; }; spsUtil = derive2 { name="spsUtil"; version="0.2.2"; sha256="1hhiz2bmgrvpadag1d4ljynk7mhwknaslja9hcmf665l2x3hzdl6"; depends=[assertthat crayon glue httr magrittr R6 stringr]; }; spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; - spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; spsur = derive2 { name="spsur"; version="1.0.2.5"; sha256="0ar1b48r2hi50rvzkr432lpcc4c9r72hxkz74gip5gf12i7mx2ci"; depends=[Formula ggplot2 gmodels gridExtra MASS Matrix minqa numDeriv Rdpack rlang sparseMVN spatialreg spdep sphet]; }; spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; spsurvey = derive2 { name="spsurvey"; version="5.5.0"; sha256="19nfzw6ac394rn0w6zdn977mf4slxq0mpw2qj9r2ma7z0biwssxn"; depends=[boot crossdes deldir lme4 MASS sampling sf survey units]; }; @@ -18004,7 +18050,7 @@ in with self; { sptotal = derive2 { name="sptotal"; version="1.0.1"; sha256="09wkcc1lbc9d0m19ncqcb3xxgl30lyii6r5nqb9rbjqyf2jl2iak"; depends=[ggplot2 viridis]; }; spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="1.3-2"; sha256="098zga5dm785v5k0s0ql6j17i6zbnka0yhfni4irlki3y1ndw78m"; depends=[gstat magrittr mvtnorm purrr raster sp whisker]; }; - sqlHelpers = derive2 { name="sqlHelpers"; version="0.1.0"; sha256="1h4mpssppicrxm4aga284q8z7dqzrdxzrh4sgnc5ylmgavzf29y9"; depends=[data_table DBI odbc stringi toolbox]; }; + sqlHelpers = derive2 { name="sqlHelpers"; version="0.1.2"; sha256="1r46sak65ipfnflmd7w7ac6p62ihx7l9lpi8cjrx3c5xb6gaaxqx"; depends=[data_table DBI odbc stringi toolbox]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; }; sqliteutils = derive2 { name="sqliteutils"; version="0.1.0"; sha256="0v7d52m9yvl5iadqnscgrcvniwhk7i7fmzd3gw23a0q4qxjs8iy9"; depends=[DBI dbplyr dplyr magrittr RSQLite]; }; @@ -18033,13 +18079,13 @@ in with self; { ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssddata = derive2 { name="ssddata"; version="1.0.0"; sha256="0njcnjcgdghwrbjcbiq4yfn7nq9h4dvylrqh57c6vx35yqc4g375"; depends=[chk dplyr Rdpack]; }; - ssdtools = derive2 { name="ssdtools"; version="1.0.4"; sha256="124laicy7xzy0v695w280vz16jdx09x3vccqmrbml5w495283kb4"; depends=[abind chk doFuture foreach furrr generics ggplot2 goftest lifecycle plyr purrr Rcpp RcppEigen scales ssddata stringr tibble TMB universals VGAM]; }; + ssdtools = derive2 { name="ssdtools"; version="1.0.6"; sha256="13pyl9cscs6zsbfjg2x7gfk568mnrnhv7n5fkl0r47r6x94vbr0s"; depends=[abind chk doFuture foreach furrr generics ggplot2 goftest lifecycle plyr purrr Rcpp RcppEigen scales ssddata stringr tibble TMB universals VGAM]; }; sse = derive2 { name="sse"; version="0.7-17"; sha256="0aqpi70rgmh2kmf11z2cvyl8c9klv8jm81pcpkzjrw3pbpgkqizf"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; - ssfa = derive2 { name="ssfa"; version="1.2.1"; sha256="0g9vdlzk0as0w7307k28n554b92bs2am54fxwl1pgiqwv454mpgp"; depends=[Matrix maxLik sp spatialreg spdep]; }; + ssfa = derive2 { name="ssfa"; version="1.2.2"; sha256="1ypfx6k2zbc5n779ikj6pa8kwc6bg3zn4m044v46qn20348ygg0a"; depends=[Matrix maxLik sp spatialreg spdep]; }; ssfit = derive2 { name="ssfit"; version="1.2"; sha256="1xq3gb76hs1mypjn6zyhwki5qkw3bnj51ljm10khky607mq5qz6q"; depends=[survey]; }; ssgraph = derive2 { name="ssgraph"; version="1.15"; sha256="1ya5pbdjsi34bqv8r89jc7pr7p0smq7bpwfllvzjrviq08r935nd"; depends=[BDgraph]; }; - ssh = derive2 { name="ssh"; version="0.8.3"; sha256="084qckk94cy3plqy0la4vcf54ch7lxv4ws2hzpbpb2pymsv4xipa"; depends=[askpass credentials]; }; + ssh = derive2 { name="ssh"; version="0.9.1"; sha256="1jb9mvy16zj7g62n1b4j1jfydvs526zn372knm8yy1x1zpljwn6h"; depends=[askpass credentials]; }; sship = derive2 { name="sship"; version="0.9.0"; sha256="0h0cbbvqfmik2z0qp34gym81p01x01yndymczb8vpqnj0nfnmyhc"; depends=[httr jsonlite openssl RCurl yaml]; }; ssifs = derive2 { name="ssifs"; version="1.0.2"; sha256="17q1p4cgdwmn3vlhkc4p49j1222wd8d6dcp7n5ngvqcfjn3lrarh"; depends=[ggplot2 gtools igraph netmeta plyr R2jags Rdpack RevEcoR]; }; ssimparser = derive2 { name="ssimparser"; version="0.1.1"; sha256="01c9kbvdrkchf4rad9hysyflpkgdj294lbk94fc5pkc49fqznmrx"; depends=[airportr dplyr magrittr stringr tidyr]; }; @@ -18057,8 +18103,8 @@ in with self; { sssc = derive2 { name="sssc"; version="1.0.0"; sha256="00m5zfd3jnbxa8x76v4pfyl4qdfq90n8rqx4hngany0ka1z5g7m6"; depends=[changepoint e1071 ggplot2 VGAM]; }; ssym = derive2 { name="ssym"; version="1.5.8"; sha256="06qmzlsk232d3vwzb7hjrbrfw0jn6br55v1nldjij3nl75c52xw7"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; }; st = derive2 { name="st"; version="1.2.7"; sha256="0j29k9fg8659yw1jwmcakiic51rin1dj1fmvpapy2wmz4c3pr0fp"; depends=[corpcor fdrtool sda]; }; - stR = derive2 { name="stR"; version="0.5"; sha256="1nlb2d8a11kxiipv96sfmmcq185051vmdiwjjqayln143gvhzp7w"; depends=[foreach forecast Matrix quantreg SparseM]; }; - stRoke = derive2 { name="stRoke"; version="23.6.3"; sha256="00hpcn6g5l7mzjrnq4f4mw6d78cdwzpqgjkxzwnzmripr5disd7c"; depends=[calendar dplyr ggplot2 gtsummary lubridate MASS rankinPlot tidyr]; }; + stR = derive2 { name="stR"; version="0.6"; sha256="1gh26yhcpkiif6zyrrg0rw4118xcf7j1d1wf70wgyrwb1hrr6vcv"; depends=[foreach forecast Matrix quantreg SparseM]; }; + stRoke = derive2 { name="stRoke"; version="23.9.1"; sha256="0rlhi8cj1gb5cpvpds4hr6m1g4g53yqlzrvl5gzn3xkiyd5i3kx3"; depends=[calendar dplyr ggplot2 gtsummary lubridate MASS rankinPlot tidyr]; }; sta = derive2 { name="sta"; version="0.1.7"; sha256="00kv2gd0ar2j992cn7j516y3w9nx83ylxp35xrqg2n43z4kgsacs"; depends=[doParallel foreach geoTS mapview raster RColorBrewer trend]; }; staRdom = derive2 { name="staRdom"; version="1.1.28"; sha256="1nihk9fyng0skzi2g0rgl85c3ka92bmr1jaiq4l9mi81g823bk3b"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr viridisLite zoo]; }; stabiliser = derive2 { name="stabiliser"; version="1.0.6"; sha256="1zyqmj8s8x0h8dji50r3yhn3n3838vci81gm02p971px8x5wq9y8"; depends=[bigstep broom caret dplyr expss ggplot2 glmnet Hmisc knitr lme4 lmerTest matrixStats ncvreg purrr recipes rsample stringr tibble tidyr]; }; @@ -18072,8 +18118,7 @@ in with self; { stabm = derive2 { name="stabm"; version="1.2.2"; sha256="1vslidq2pzpwhsrsklghaqsdjjf4w4wqs2dng0p68zhrv5vlivhq"; depends=[checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; stabs = derive2 { name="stabs"; version="0.6-4"; sha256="1nf1yg14cgxrs4np1yghpzw1nczaslfv3rvf3918wrlzg0vp6l7q"; depends=[]; }; - stacking = derive2 { name="stacking"; version="0.1.0"; sha256="0n12jzcrw4pd9q5dkpawvhll3qhgg5ynsfls939diwpw122wfn3b"; depends=[caret]; }; - stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; }; + stacking = derive2 { name="stacking"; version="0.1.2"; sha256="0kizp8ivkan5qjqvc19fg5f5n1k32z1nw81m41nrnblp5c9klvg7"; depends=[caret]; }; stacks = derive2 { name="stacks"; version="1.0.2"; sha256="179jcgvsydkrg37yz01wj4x9fhvakpmmw2yl18m3aj2llf67ily8"; depends=[butcher cli dplyr foreach generics ggplot2 glmnet glue parsnip purrr recipes rlang rsample tibble tidyr tune vctrs workflows yardstick]; }; stacomiR = derive2 { name="stacomiR"; version="0.6.0.7"; sha256="1w44rvjikvj6fjansg0l06rrhym6icrv1fr8bpq9hrx3h870nrz8"; depends=[dplyr ggplot2 Hmisc intervals lattice lubridate magrittr mgcv pool RColorBrewer reshape2 rlang RPostgres scales stacomirtools stringr withr xtable]; }; stacomirtools = derive2 { name="stacomirtools"; version="0.6.0.1"; sha256="1hw1k0mjddw46j3aagry2mx43wak03kkx4zzxplgcafwks5bp82y"; depends=[DBI pool RODBC RPostgres xtable]; }; @@ -18086,44 +18131,46 @@ in with self; { standartox = derive2 { name="standartox"; version="0.0.2"; sha256="03g07yfw1l0j2xqjl74pvidlrrv2ia2kmhb94asj5d5xq7hr1004"; depends=[data_table fst httr jsonlite]; }; standby = derive2 { name="standby"; version="0.1.0"; sha256="05kn866ibk0a0ncbsmfb31nhj7cfdidd8smvnpyrvw9rjs8k37hv"; depends=[htmltools shiny]; }; stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; + staplr = derive2 { name="staplr"; version="3.2.2"; sha256="1wqknnrbcwcmw0kvyydwrgs0yz5cixpgxglva377lzqlbw8ll7wn"; depends=[assertthat fs glue pdftools purrr rJava stringr XML]; }; stargazer = derive2 { name="stargazer"; version="5.2.3"; sha256="0ra284jxjb1n6sd3114zf5l5pjrb7m7j073k8bhnrx8wl549p3i0"; depends=[]; }; starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; starnet = derive2 { name="starnet"; version="0.0.6"; sha256="0gbg8svyj4nh846q7986ap7jjry599kb1348k9lifz19kvyr4rn4"; depends=[cornet glmnet Matrix survival]; }; starry = derive2 { name="starry"; version="0.1.2"; sha256="18dn18y5vs4fhj3jzm2zmvyx2wqakkrkppmggizz60vrarnaqp8i"; depends=[bslib car corrr dplyr ggplot2 magrittr shiny shinyjs shinyWidgets stringr]; }; - stars = derive2 { name="stars"; version="0.6-2"; sha256="0prip06c28d72wa7h8h8p2y7rw7jnh2h2yhnygbaipc8cbzlvi7x"; depends=[abind classInt lwgeom rlang sf units]; }; + stars = derive2 { name="stars"; version="0.6-4"; sha256="0mqd2dfa8jhxjmfphvv3rkw2lri5sz49042asj5lyln3wkylqjj2"; depends=[abind classInt rlang sf units]; }; starsExtra = derive2 { name="starsExtra"; version="0.2.7"; sha256="06l9rpgw1dmvvn3389zzqrq4y87192k4zzj7xgvwzrdlrcxsqdh7"; depends=[mgcv nngeo sf stars units]; }; starsTileServer = derive2 { name="starsTileServer"; version="0.1.1"; sha256="04z3xaijhgn5g10vvx19lya6v17ypcq00w4jlgkap3fafw61pqhn"; depends=[assertthat leaflet plumber png R6 rlang sf stars units]; }; - startR = derive2 { name="startR"; version="2.2.3"; sha256="0palkna71d80rdcm8laq75b387mldgzaqrfgxjjr19irp6n65q5m"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply PCICt s2dv]; }; + starschemar = derive2 { name="starschemar"; version="1.2.2"; sha256="0988kzdf4082yppmph918rnrrb6ss6bqayalffdxjs4dw2h0nlc3"; depends=[dplyr generics purrr rlang snakecase tibble tidyr]; }; + startR = derive2 { name="startR"; version="2.3.0"; sha256="19mx63231wkxkh79k6fgpw3bs2hcq7kmli4cvrw17ka3jq2b9l56"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply PCICt s2dv]; }; starter = derive2 { name="starter"; version="0.1.14"; sha256="01iq1srny5ljfj3vlgpigxvkyawhpiqvgc5wzafydh8rrzfyj1ld"; depends=[cli dplyr gert glue R_utils renv rlang rprojroot rstudioapi]; }; - starticles = derive2 { name="starticles"; version="0.1.0"; sha256="11jmjsbzniyfnszfffhr78rqa588y77rlx2sbp92a3jpmcbx0h56"; depends=[bookdown knitr rmarkdown]; }; startup = derive2 { name="startup"; version="0.20.0"; sha256="1l03jmlhc32jbf6clxzdfxb0rinwl8sb67hikx6hzbk8k9x2xvc2"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; starvars = derive2 { name="starvars"; version="1.1.10"; sha256="1mq31g05ahpsmda2zrmkg1dlaqqk4c9hm9fjzhgrsxlg4j3klbbf"; depends=[doSNOW foreach ks lessR MASS matrixcalc optimParallel quantmod vars xts zoo]; }; starvz = derive2 { name="starvz"; version="0.7.1"; sha256="0j22605vh0fpf17l78i3x9q5xia9qx841sg7hxhcjybn7vfkafsj"; depends=[arrow BH data_tree dplyr ggplot2 gtools lpSolve magrittr patchwork purrr RColorBrewer Rcpp readr rlang stringr tibble tidyr yaml zoo]; }; starwarsdb = derive2 { name="starwarsdb"; version="0.1.2"; sha256="00n9qqw4lbfk698qgvw8i42sy3dv5i5fiiqma3zks4rr9yspkldq"; depends=[DBI duckdb magrittr tibble]; }; statBasics = derive2 { name="statBasics"; version="0.2.0"; sha256="1yphfzwj8hmqsz1qfckb05xxjyyi9r6g6iqcl8n20bs5hgr3d2s9"; depends=[stringr tibble]; }; + statConfR = derive2 { name="statConfR"; version="0.0.1"; sha256="149aj19kp52yrgzs6aca50m3lfxrbiiy1mljhr6bxspckilmi36x"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.5.0"; sha256="0fd7jsngd8gihivnir3y58961kvbdd5g1m5gm1da91984qs7r9q1"; depends=[cluster doParallel foreach igraph MASS rARPACK]; }; statVisual = derive2 { name="statVisual"; version="1.2.1"; sha256="1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gridExtra knitr limma magrittr pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; - statar = derive2 { name="statar"; version="0.7.5"; sha256="1rjl1k4xp1qlg9c568624cj1z4jv1vvi1zrxrkn48ydb0vivp7gm"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyselect]; }; - statcanR = derive2 { name="statcanR"; version="0.2.4"; sha256="0f0ampyjqp0kgbar8jsbxpx9039jmxgz236v63nqmy1cgkdfn0d4"; depends=[curl data_table dplyr DT ggplot2 httr qpdf qs readr reshape2 tibble]; }; + statar = derive2 { name="statar"; version="0.7.6"; sha256="0fjlmzndcm88dlqf6kmd1ssy0ll2g7vap6cai954lh37zbbbb674"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyselect]; }; + statcanR = derive2 { name="statcanR"; version="0.2.6"; sha256="1hnf3zjlpfp86lii9sz8m2dvzbj9bs320ffdr81q2jsla71xybaa"; depends=[curl data_table dplyr DT ggplot2 httr qpdf qs readr reshape2 tibble]; }; statcheck = derive2 { name="statcheck"; version="1.4.0"; sha256="1hibrynbgsym4hma8isby8kwb8gab9d4bx7m43qj4zayrl6b8scx"; depends=[ggplot2 plyr rlang rmarkdown]; }; statcodelists = derive2 { name="statcodelists"; version="0.9.2"; sha256="0hn7fqsghfnly325b58m5q0ba9hvi1rc0lb4dwp2xm5lynjmsbs9"; depends=[]; }; statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; }; statebins = derive2 { name="statebins"; version="1.4.0"; sha256="1v67da939qg672aqni2i37w70pgasgx6r55b4fjjc3zzviq8gipx"; depends=[ggplot2 scales]; }; - states = derive2 { name="states"; version="0.3.1"; sha256="1yi7yigmxjcpa2p75bq0jj1pmiv5xh6zsxhayg7pa7p7fqdl3d9i"; depends=[dplyr lifecycle rlang]; }; + states = derive2 { name="states"; version="0.3.2"; sha256="1ffaj7rzqnwzki4hr5f90hz3racaigmk8qbzanxbbbfsy881avmr"; depends=[dplyr lifecycle rlang]; }; statespacer = derive2 { name="statespacer"; version="0.5.0"; sha256="18bir894yrbff5h5pbqr342xckb78zzb24x2yrv9ffhrl5dvyk5d"; depends=[Rcpp RcppArmadillo Rdpack]; }; statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.9"; sha256="0isjzb83vwml654b1azgvnwiijpihdk24b3jamls976is359qvrv"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; statgenGxE = derive2 { name="statgenGxE"; version="1.0.5"; sha256="1kq5bin4k66d8l9l4z2b0gx6s8ick5fim0qcsjayvgip25gkxf5z"; depends=[emmeans ggplot2 gridExtra knitr lme4 statgenSTA xtable]; }; statgenHTP = derive2 { name="statgenHTP"; version="1.0.6.1"; sha256="1lhs72y9p98vas7iv1zgqb9zac6plzgv5lffccyg75r88784xn1s"; depends=[animation factoextra ggforce ggnewscale ggplot2 gridExtra LMMsolver locfit lubridate Matrix reshape2 rlang scales spam SpATS]; }; - statgenIBD = derive2 { name="statgenIBD"; version="1.0.5"; sha256="0jiw3rivlmgg883m8jsjzq6gckb2vim4fx1kr1rb3r76i8q2p1ql"; depends=[data_table ggplot2 Matrix Rcpp RcppArmadillo stringi]; }; + statgenIBD = derive2 { name="statgenIBD"; version="1.0.6"; sha256="10avfpm8l2l0yflb979plnijb1gfpk9lsqrc5nri1gsfgqfv7v8p"; depends=[data_table ggplot2 Matrix Rcpp RcppArmadillo rlang stringi]; }; statgenMPP = derive2 { name="statgenMPP"; version="1.0.2"; sha256="1qpf9gic9671hr6zyj56sqwx9wl51qr6gj84rfssdla718h766im"; depends=[data_table foreach ggplot2 gridExtra LMMsolver Matrix scales spam statgenGWAS statgenIBD stringi]; }; statgenQTLxT = derive2 { name="statgenQTLxT"; version="1.0.1"; sha256="0i17xl4q0alyd2w4giynarv7wqhimvbd58chqrjxy4yyq419jzry"; depends=[data_table foreach Rcpp RcppArmadillo sommer statgenGWAS]; }; statgenSTA = derive2 { name="statgenSTA"; version="1.0.11"; sha256="0lashqhahmb0n01a1cy6clv95z5ypm5kgmdiwhvdvdq1l50cz92z"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl rlang scales SpATS xtable]; }; stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; }; stationery = derive2 { name="stationery"; version="1.0"; sha256="07kwlmambjv7njgpw1dhsm2zrv1lk6xj2k6a6psysjllrf5zz8ga"; depends=[knitr kutils rmarkdown]; }; statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; }; - statisfactory = derive2 { name="statisfactory"; version="1.0.1"; sha256="0i5z9f1q7wi0qdgr0zj15x1q3jzavivnkwf07y5d1ch3nqxa4nqw"; depends=[omnibus rlist]; }; + statisfactory = derive2 { name="statisfactory"; version="1.0.4"; sha256="0i5irapzdmp8dfjjam504n47xbdmzqhy7y31ah6az3w9kr4bv7j0"; depends=[omnibus]; }; statmod = derive2 { name="statmod"; version="1.5.0"; sha256="1jbf07h0mnncn2qp4wcw5bnbvsw3lizpd3cg0cpb8mcxn3wkw76n"; depends=[]; }; statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; statnet_common = derive2 { name="statnet.common"; version="4.9.0"; sha256="1mrdzhxxrr6a0hwxczs40f8ppkdimlki1gbg6f3kv69s6rpdr1d4"; depends=[coda]; }; @@ -18131,28 +18178,29 @@ in with self; { statnipokladna = derive2 { name="statnipokladna"; version="0.7.2"; sha256="1n7gvr57c27ilxrnpmr0bz6hc0d39lp6rnn4dkqdwdapzyhfymq4"; depends=[cli curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statpsych = derive2 { name="statpsych"; version="1.4.0"; sha256="16wkwc9vfjrwmqaiijs2xwhfmj5if9h2ppziqvd3k70gzbz0l1mf"; depends=[mathjaxr mnonr Rdpack]; }; - statquotes = derive2 { name="statquotes"; version="0.3.1"; sha256="08xvnqbh0ax261hhgq1pkmcpvdcy44nhhmsxaapy9q8ppfvn7vi1"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="2.0.1"; sha256="1qjf0q952qffphia6h7haff764k9iiwm9lyw9h5jcga03q733myb"; depends=[readr sf]; }; + statquotes = derive2 { name="statquotes"; version="0.3.2"; sha256="0y805alr98zz306jjnikggdd02c3yrp5izzwhh457bsb85i22yri"; depends=[stringr tidytext wordcloud]; }; + stats19 = derive2 { name="stats19"; version="3.0.0"; sha256="1lki2rcpp66kk3a1zwsyjczxjrid2skvdah3srbvz481vzq95zs9"; depends=[readr sf]; }; stats4teaching = derive2 { name="stats4teaching"; version="0.1.0"; sha256="1i2v97k6c75096hp23zpffmdbajdzzkqp508p9dvw841vpx2wxdn"; depends=[asbio car clusterGeneration knitr MASS MVN nortest psych pwr rstatix]; }; - statsExpressions = derive2 { name="statsExpressions"; version="1.5.1"; sha256="1lq4h3a8yr7wnmjkg2rgr8524vdpfacr73pv4wxj44dbg9yh8l3x"; depends=[afex BayesFactor correlation datawizard dplyr effectsize glue insight magrittr parameters performance PMCMRplus purrr rlang tibble tidyr withr WRS2 zeallot]; }; + statsExpressions = derive2 { name="statsExpressions"; version="1.5.2"; sha256="1lqx6wcip0vzlrlhj8yg09009r1r12xg1wxkq93hrlkvya6wm66k"; depends=[afex BayesFactor correlation datawizard dplyr effectsize glue insight magrittr parameters performance PMCMRplus purrr rlang tibble tidyr withr WRS2 zeallot]; }; statsearchanalyticsr = derive2 { name="statsearchanalyticsr"; version="0.1.4"; sha256="0m2zv5sgv7w9yk6q7rwx8x2zy6xx5w0d6c9vynddr08pn4mdqjhs"; depends=[glue httr jsonlite lubridate purrr stringr tibble tidyr]; }; statsr = derive2 { name="statsr"; version="0.3.0"; sha256="138yjifz8q3dqcm3wbzn4sxdydwnqvwkz0h20r8ls3pijqh6fc2y"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tibble tidyr]; }; statswalesr = derive2 { name="statswalesr"; version="0.2.0"; sha256="03h0gq8ag51my5z8mw78rhbkksfpa7af8my6lb468wrcfv69k0gl"; depends=[curl dplyr httr jsonlite rlang]; }; - stcos = derive2 { name="stcos"; version="0.3.0"; sha256="0niy8inajs0vafbh47w5rajlp3bvgi9yakhyabjdrqhkjzs79lpx"; depends=[dplyr Matrix Rcpp RcppArmadillo sf]; }; + stcos = derive2 { name="stcos"; version="0.3.1"; sha256="146s0jdd88pax9xsn2z56x8sfkjx8yr8sf59ma9zryq42ajyq43d"; depends=[dplyr Matrix Rcpp RcppArmadillo sf]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; stdReg = derive2 { name="stdReg"; version="3.4.1"; sha256="0x4awgbja70mdpbavgkg9mpnrxxc0qpsnl8i3rj9hs4vwbdkalr8"; depends=[data_table drgee numDeriv survival]; }; stddiff = derive2 { name="stddiff"; version="3.1"; sha256="1lirfxqiq59vhjkq1zv27ycybbs9n62c14klkkcf74j15a54cmbn"; depends=[]; }; - stdmod = derive2 { name="stdmod"; version="0.2.8"; sha256="0y10syprbxk5hqhjl39cmz6vbvg6pyzkvp9jdm96cxpdyk83c8dw"; depends=[boot ggplot2 lavaan manymome rlang]; }; + stdmod = derive2 { name="stdmod"; version="0.2.9"; sha256="15ibmdz80pl2ch61c43ligrpm9pxhi7mind9dq2bv7m8b2488bdz"; depends=[boot ggplot2 lavaan manymome rlang]; }; stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; steepness = derive2 { name="steepness"; version="0.3-0"; sha256="1lv2n4s8dj7axsmwmpfp4aw6v530r7437f44533pbx6p4n71hpzl"; depends=[]; }; - stelfi = derive2 { name="stelfi"; version="0.0.2"; sha256="0zx1x5kk8ans068j4zddsip6v04bsw6npagayjfa3sdl79ailqha"; depends=[dplyr ggplot2 gridExtra Matrix RcppEigen sf TMB]; }; + stelfi = derive2 { name="stelfi"; version="1.0.0"; sha256="0fj9zg7jgfrripqagyj6ylhzz8vrsiagh3qrq596jr2z58ap54xa"; depends=[dplyr fmesher ggplot2 gridExtra Matrix RcppEigen sf TMB]; }; stellaR = derive2 { name="stellaR"; version="0.3-4"; sha256="0spn25fbsfswx2rshzk34pqkicynyl256a4f7xrh51bhyh9qff44"; depends=[]; }; stemmatology = derive2 { name="stemmatology"; version="0.3.2"; sha256="1l2y4jlszz1dnafdl2wqqfgdjis07i3gzfnp1v1af32pvjy4zqhw"; depends=[cluster igraph xml2]; }; stenR = derive2 { name="stenR"; version="0.6.9"; sha256="19vn7123wys1jqrm4y8f6b4kvwygi1ql6ady2d5jz93vf29ihdzj"; depends=[cli data_table dplyr moments R6 rlang]; }; stencilaschema = derive2 { name="stencilaschema"; version="1.0.0"; sha256="117vl2h78ndnb70s8mpd0bs1n6h1vizv4wzn6g4y9j12ma63nldb"; depends=[]; }; stepPenal = derive2 { name="stepPenal"; version="0.2"; sha256="08gizl6c606ibbv7x2rdvfw37rghkrprwszha79yngkzpajw8gql"; depends=[caret dfoptim glmnet mvtnorm pROC]; }; stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; + stepR = derive2 { name="stepR"; version="2.1-8"; sha256="0gvlxxl82190ra99qwnwxx7q81w228m04x9c687hrihpmldlqjpp"; depends=[digest lowpassFilter R_cache Rcpp]; }; stepSplitReg = derive2 { name="stepSplitReg"; version="1.0.3"; sha256="04ks599bb3rbyc81kyakj6nmj7i8fvkb1pild0gd3i6j84j70071"; depends=[nnls Rcpp RcppArmadillo SplitGLM]; }; stepdownfdp = derive2 { name="stepdownfdp"; version="1.0.0"; sha256="1yqzxn4d52ih03f0mpvb9dw9pn9jfbgnyay1pfhh112zml5h6i3m"; depends=[pracma]; }; stepgbm = derive2 { name="stepgbm"; version="1.0.1"; sha256="1wcc4m9alphacdf9df5z29hz881625czxpyq93kzwc0nhnvz2gp0"; depends=[spm steprf]; }; @@ -18178,7 +18226,7 @@ in with self; { stlTDNN = derive2 { name="stlTDNN"; version="0.1.0"; sha256="1j2f9kxlry15xp7bc03h5jr7v8gzq8frdxyzhq9s78m3d3dbixf4"; depends=[forecast nnfor]; }; stlnpp = derive2 { name="stlnpp"; version="0.3.9"; sha256="0d8afddz7gwdmrciz8bvwfxil7bfpf9h81rcb52mmr7j9da36mp4"; depends=[spatstat spatstat_explore spatstat_geom spatstat_linnet spatstat_random]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; - stm = derive2 { name="stm"; version="1.3.6"; sha256="0qwq4nin2n9fjd06852r8k7arvcgh46kcfb3lm21swgx6j8bgrhb"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; + stm = derive2 { name="stm"; version="1.3.6.1"; sha256="0izf68s8n6jlzksnn2md0apb4b8gm6513r0aa45yrm71gb0v29yc"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; stmgp = derive2 { name="stmgp"; version="1.0.4"; sha256="1yf0hr5gaql424ikjm9ra50vz4ppfsshhf89xphl7c9v9a6bjvw0"; depends=[MASS]; }; stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; }; @@ -18193,23 +18241,25 @@ in with self; { stockAnalyst = derive2 { name="stockAnalyst"; version="1.0.1"; sha256="1pqghpyvwylc00hcnqgcr03js3dz6id012ixn5gj3d3wqyh008bl"; depends=[]; }; stockR = derive2 { name="stockR"; version="1.0.76"; sha256="1n1xnz97x82bc9n930cwm11sl8r40224psya5z29a2zp449a5540"; depends=[gtools RColorBrewer Rcpp]; }; stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; - stoichcalc = derive2 { name="stoichcalc"; version="1.1-4"; sha256="06q35faqrcarx6n00i5s45ynpwi6n6xizyr8w9c436c4ahg0xvyh"; depends=[]; }; - stokes = derive2 { name="stokes"; version="1.1-8"; sha256="0xmmvmjggpqb3qs4rjz6fsmcxl8b6as82abln5n8k62qjj77lhr7"; depends=[disordR mathjaxr partitions permutations spray]; }; + stoichcalc = derive2 { name="stoichcalc"; version="1.1-5"; sha256="077mp485i844cdmjxy0spvh1scgakrwlf16qd0k5fn3h9lkgyg1c"; depends=[]; }; + stokes = derive2 { name="stokes"; version="1.2-0"; sha256="0jxjpbscs28v675fkclrxwh0ndqbnsb6lylszdir8ivmgr4vcjam"; depends=[disordR mathjaxr partitions permutations spray]; }; stopdetection = derive2 { name="stopdetection"; version="0.1.2"; sha256="0hgz18fiqp6ykv9h711fbjx234cjiwa6gifdgg460b0pib8hc66i"; depends=[data_table geodist lubridate]; }; stopp = derive2 { name="stopp"; version="0.1.1"; sha256="1jiwy13kyfphla9y1yx283zih05w64ihkqkwc5cfm8vnlr5h6gwk"; depends=[etasFLP fields gmp KernSmooth latex2exp MASS optimx plot3D sparr spatstat_explore spatstat_geom spatstat_linnet spatstat_model spatstat_random splancs stlnpp stpp]; }; - stoppingrule = derive2 { name="stoppingrule"; version="0.2.0"; sha256="0slrkzaj52cxv948djf9kkk60qrimjy6dn1mfzhv3vccs18kap1q"; depends=[]; }; + stoppingrule = derive2 { name="stoppingrule"; version="0.3.0"; sha256="06hyms83r7n4a4pkkx58j5cy911s9xxqa3amfiphi67nxngza8wr"; depends=[pracma]; }; stops = derive2 { name="stops"; version="1.0-1"; sha256="12zc338wh78an1nsmqr7sbfcr96yrb6xqzg9miwlb58sv28hm8i3"; depends=[acepack clue cmaes cordillera dfoptim DiceKriging DiceOptim energy MASS minerva nloptr pomp pso rgl scagnostics scatterplot3d smacof tgp vegan]; }; stopwords = derive2 { name="stopwords"; version="2.3"; sha256="1ci1cgxrcvlhhplximsfv0plvjdbcd5kv0nphxnpildsn5m1rv65"; depends=[ISOcodes]; }; storr = derive2 { name="storr"; version="1.2.5"; sha256="0qszdq16bf0dbss33zi63ciwmkgjsyc0c3akrr2kl14w3ncw6922"; depends=[digest R6]; }; stortingscrape = derive2 { name="stortingscrape"; version="0.1.3"; sha256="1adrgicrniz02sdp0vqg44b25jq4w4hdbgaszfnra4alw12klvda"; depends=[dplyr httr rvest stringr]; }; storywranglr = derive2 { name="storywranglr"; version="0.2.0"; sha256="07w3dwv2naqbbdzjcv58cisj7cv1rbhrk96a30q8ww11rf953rj4"; depends=[dplyr httr jsonlite tibble urltools]; }; - stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="1.0.2"; sha256="0wp9vxv9z7qm6k5kmsilpdaabgmwx4r3hyr4bggjwrpcf0bd59x9"; depends=[curl data_table dplyr httr jsonlite lwgeom magrittr nabor od pbapply Rcpp rlang sf sfheaders]; }; + stosim = derive2 { name="stosim"; version="0.0.15"; sha256="09fxi9wv47fvc59jnr9y6kmc2gzvxs28hwf15h3f62vvh3v9ksn6"; depends=[Rcpp]; }; + stplanr = derive2 { name="stplanr"; version="1.1.2"; sha256="0n32d8916qkavaqr4016gnggyqrh75lndlvayl8qxq88lmjps2bf"; depends=[curl data_table dplyr httr jsonlite lwgeom magrittr nabor od pbapply Rcpp rlang sf sfheaders]; }; stpm = derive2 { name="stpm"; version="1.7.12"; sha256="16kp69356bj1s26iwwysxdyr87kd3jqhj2gmmz4vc003ai63ga6y"; depends=[MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="2.0-7"; sha256="1w9jn71ha817gldfhkmr2vfx3nkr78g1y662rfxg6flx2wyxs3kq"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat_explore spatstat_geom spatstat_random splancs]; }; - stppSim = derive2 { name="stppSim"; version="1.2.7"; sha256="1hg53fxpp4k6vfafd1aasjf4z1vaik5y137i424jhbxf69aqgl2b"; depends=[chron cowplot data_table dplyr geosphere ggplot2 gstat ks leaflet lubridate magrittr raster rgdal sf SiMRiv sp sparr spatstat_geom splancs stringr terra tibble tidyr]; }; + stppSim = derive2 { name="stppSim"; version="1.3.1"; sha256="0hpy6kxr9m5hmkgnpfs3r1mp5nn9hy52sxb3i1hs9d437mxmhjx6"; depends=[chron cowplot data_table dplyr future_apply geosphere ggplot2 gstat ks leaflet lubridate magrittr otuSummary progressr raster sf SiMRiv sp sparr spatstat_geom splancs stringr terra tibble tidyr]; }; + stpphawkes = derive2 { name="stpphawkes"; version="0.2.1"; sha256="1mfhvfjlshhigyl5bfagjiv3q8dizqf89ikyifkchylni5szblbs"; depends=[extraDistr interp Rcpp RcppArmadillo RcppGSL RcppProgress]; }; str2str = derive2 { name="str2str"; version="0.2.1"; sha256="180m261hr0qr3mnm8hbvjbw3q44cr1kfrnq97fvkpypigdycd9z4"; depends=[abind checkmate plyr reshape]; }; strand = derive2 { name="strand"; version="0.2.0"; sha256="0gd9nnbdilvk4bszg77bxilan6qpg1np7c38w1b7j5sr3r30y5in"; depends=[arrow dplyr ggplot2 lubridate Matrix R6 Rglpk rlang tibble tidyr yaml]; }; + stranslate = derive2 { name="stranslate"; version="0.1.1"; sha256="09ps012v63m66ibmlcz3nbvizzq7v7lc0laf8x6fspswvb7a2zpb"; depends=[crayon knitr stringr]; }; strap = derive2 { name="strap"; version="1.6-0"; sha256="1c4p9gjjjjc7zjml7r7qhb040va8s4x16jqia3j1j5h56d6wlh7m"; depends=[ape geoscale pbapply]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="1.1.6"; sha256="0m41866xr21h4mih4z98y6pcrp2ws0mxxx157vdhbv7rhlh5djvp"; depends=[Rcpp RcppArmadillo]; }; @@ -18225,6 +18275,7 @@ in with self; { strawr = derive2 { name="strawr"; version="0.0.91"; sha256="1nbcn20g3f3f5x9sscj3020n5h4iaphr70s90n2fz31vc4snzq2m"; depends=[Rcpp]; }; stray = derive2 { name="stray"; version="0.1.1"; sha256="1pjw1bdkqsp085lrwca1psma95ncapfz8a5iampxgghydkhh3dm8"; depends=[colorspace FNN ggplot2 ks pcaPP]; }; stream = derive2 { name="stream"; version="2.0-1"; sha256="1mz1gdqfb92qy09w0jkm5j58bz0sqvnagd4lfb4s40412n77khgh"; depends=[BH clue cluster clusterGeneration dbscan fpc magrittr MASS mlbench proxy Rcpp rpart]; }; + streamDAG = derive2 { name="streamDAG"; version="1.5"; sha256="1zzpjp1k0x0kh4jja8x0yjv35pygp5qb8ivqqg7wc7dr5plv87y5"; depends=[asbio igraph plotrix]; }; streamDepletr = derive2 { name="streamDepletr"; version="0.2.0"; sha256="0pa0hsnhscsa98xkqzg7l83yagzq1r6m250m3m4r79baab8ndqp4"; depends=[dplyr Rmpfr sf]; }; streamMOA = derive2 { name="streamMOA"; version="1.3-0"; sha256="0mdkwbph225xsjwnihmzj2gn56n7w6ffd1h432kjlj3b2lwdsyyn"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; }; @@ -18239,12 +18290,13 @@ in with self; { stringfish = derive2 { name="stringfish"; version="0.15.8"; sha256="16w3i3d7jw2s1hzxr3mngrh7yjxvhswqdlpjw5g4z25i84lixcnz"; depends=[Rcpp RcppParallel]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; stringi = derive2 { name="stringi"; version="1.7.12"; sha256="02g0464sbprrbjlacx727p9ad1s5nbxl2mnvfmm9h7q000lsrs7g"; depends=[]; }; + stringmagic = derive2 { name="stringmagic"; version="1.0.0"; sha256="06jm11n80r821h40x3qvnbkf53283mnrhsg5w7x7f1fp5qmcfll1"; depends=[Rcpp]; }; stringr = derive2 { name="stringr"; version="1.5.0"; sha256="0fk34ql5ak57f06l10ai300kxay6r7kkkyfanh8r24qaf3bmkcaj"; depends=[cli glue lifecycle magrittr rlang stringi vctrs]; }; stringstatic = derive2 { name="stringstatic"; version="0.1.2"; sha256="0kj85yas07l9xl49l2j0bk42ymdg57fmgyk45wwl0kmxp146skfq"; depends=[]; }; stringx = derive2 { name="stringx"; version="0.2.5"; sha256="0h6j67krpk1yr0qiq76grlw1dwdxzj1h61fvlbah86k444mfg91a"; depends=[stringi]; }; strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; - striprtf = derive2 { name="striprtf"; version="0.5.3"; sha256="0dqcsh3fb8j0mmmxvxjl77rryhmrjm7a3scqvk2xkgxk4xq6q316"; depends=[magrittr Rcpp stringr]; }; + striprtf = derive2 { name="striprtf"; version="0.6.0"; sha256="1c8z2qf1kp43ir4dmyxq6hc46dclq8vx3ggkj02p8j1icjswm9bh"; depends=[magrittr Rcpp stringr]; }; strucchange = derive2 { name="strucchange"; version="1.5-3"; sha256="11hgz64snlwhfqsmqajmkciflwkz1wficxr340wqvk38iw1b9ina"; depends=[sandwich zoo]; }; strucchangeRcpp = derive2 { name="strucchangeRcpp"; version="1.5-3-1.0.4"; sha256="0vfqbhck0qwc8dsnm5ggc0if03vx4ma53qidi7qsqjyfjfszq1pm"; depends=[Rcpp RcppArmadillo sandwich zoo]; }; structree = derive2 { name="structree"; version="1.1.7"; sha256="178x6maghjaw9lkyjr84pq916vbq0ldh5gqia0r0vqs8k8dvna9i"; depends=[lme4 mgcv penalized]; }; @@ -18253,7 +18305,7 @@ in with self; { studentlife = derive2 { name="studentlife"; version="1.1.0"; sha256="1xvlcwg7ckxsm5hb5ax8r3hzdqnx61ax59ini5xc5jrsmir13g67"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; stxplore = derive2 { name="stxplore"; version="0.1.0"; sha256="1bnpp53s7r8ghvbxvnlk103h66a55xf7y9fcdhvmfgf31d2x5dsd"; depends=[fields ggmap ggplot2 ggridges gridExtra gstat lubridate magrittr RColorBrewer rlang sp spacetime stars tidyr]; }; - styler = derive2 { name="styler"; version="1.10.1"; sha256="0rswg2habyk38hcx0gn9hnvb200bq0dc4fy4k3gqhfhwjq9l7a1b"; depends=[cli magrittr purrr R_cache rlang rprojroot vctrs withr]; }; + styler = derive2 { name="styler"; version="1.10.2"; sha256="043v9xwm72jqrrzzmjgrkf34lncjnn69650ks72z7rjb1wqmbh56"; depends=[cli magrittr purrr R_cache rlang rprojroot vctrs withr]; }; stylo = derive2 { name="stylo"; version="0.7.4"; sha256="0vjfpz4bpdrsax7a0gsj9cwddbsayb4n5fr5xskz63lfrjg2ppcb"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; @@ -18272,7 +18324,7 @@ in with self; { subsemble = derive2 { name="subsemble"; version="0.1.0"; sha256="125msb0krcdj6jbdvzdl75179ajakb1l0xal45bp38am8w62a6zz"; depends=[SuperLearner]; }; subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; }; subtee = derive2 { name="subtee"; version="1.0.1"; sha256="090k3p1j9fj7qk121qb488vzfgzxnvqp7z60jhcyy8l47aazf5g0"; depends=[ggplot2 httr MASS matrixStats survival]; }; - success = derive2 { name="success"; version="1.0.0"; sha256="12i2124wm38bl5vz0fsk6k77v0zym4d17il8ci9wxrbcmkhmnspk"; depends=[ggplot2 pbapply plotly RColorBrewer Rfast survival]; }; + success = derive2 { name="success"; version="1.0.1"; sha256="0imwba2p50da9ymyj1pkg2dbn1ramzahabdnic0k0dmcn9g74d64"; depends=[ggplot2 ggrepel Matrix matrixcalc pbapply plotly Rfast survival]; }; sudachir = derive2 { name="sudachir"; version="0.1.0"; sha256="09ry00c3yhrz8fiyxdxgj9r3x7kldsl6fv35mmi5ysc2549kbcfb"; depends=[cli dplyr glue magrittr purrr reticulate rlang tibble tidyselect]; }; suddengains = derive2 { name="suddengains"; version="0.7.2"; sha256="0mrnj9sjgk66riqz8a8kcbkvzlv3jdvlkqsmv8z7pj74yqrr99sf"; depends=[cli dplyr forcats ggplot2 ggrepel magrittr naniar patchwork psych readr rlang scales stringr tibble tidyr]; }; sudoku = derive2 { name="sudoku"; version="2.8"; sha256="1z130cx30wdqch0a4f27aa9v3v29hx6d5zav308abx42s4ilysbs"; depends=[]; }; @@ -18282,7 +18334,7 @@ in with self; { suggests = derive2 { name="suggests"; version="0.1.0"; sha256="05z2winamc8rdvkvhsbiz7r183qh8balrhv9r2sr3crn0rh2fm62"; depends=[]; }; sugrrants = derive2 { name="sugrrants"; version="0.2.8"; sha256="08cs74afpkvjh32hlrwbl8sdsi3p0ga4ziw32r9pihs28a060fam"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.5"; sha256="10clll3c0ws2mccdp9grz3qw75kv7ydffak2vv9ijky8n1b39qa7"; depends=[GBJ Matrix seqminer]; }; - sumR = derive2 { name="sumR"; version="0.4.10"; sha256="0gijisv3bslyhflik06nc54bbg7z84a1yc97cq3d41ad1q0ch7gk"; depends=[matrixStats]; }; + sumR = derive2 { name="sumR"; version="0.4.14"; sha256="11r628mlilwbz1yh3qw88il13gyqzdba3s5ky5jcza5b6mpwyvgl"; depends=[matrixStats]; }; sumSome = derive2 { name="sumSome"; version="1.1.0"; sha256="1a70kxvp9d9hn38jnvgk934vwbz4bjb6k4kcngp6rp9gv9h2bh2r"; depends=[ARIbrain pARI Rcpp RNifti]; }; summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; summarytools = derive2 { name="summarytools"; version="1.0.1"; sha256="0gr95cd1ja8di6s0xghk6w7nj3bh3z4g7j7ixdy7f88q681aixgx"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; @@ -18301,15 +18353,15 @@ in with self; { superdiag = derive2 { name="superdiag"; version="2.0"; sha256="0zfy9ain6agh276av0p66mks3rap42n8yma0dr6qbc14z3nh8w0m"; depends=[coda]; }; superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; superml = derive2 { name="superml"; version="0.5.6"; sha256="159a80v9a1z2xq0xriqaa5xb7r5slww899vhng5l73c14615jzqw"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; }; - supernova = derive2 { name="supernova"; version="2.5.6"; sha256="12qysa3drisi3jkccrzz2i38f30mmcaryc950k9xjlha3v58kxfa"; depends=[backports cli ggplot2 lifecycle magrittr pillar purrr rlang stringr tibble vctrs]; }; + supernova = derive2 { name="supernova"; version="2.5.7"; sha256="167q33ad0rqzccnlir96692kzsw1n07msgpy9w8939yaiv6div5g"; depends=[backports cli ggplot2 lifecycle magrittr pillar purrr rlang stringr tibble vctrs]; }; superpc = derive2 { name="superpc"; version="1.12"; sha256="0n68qafsww00q0wx37ms3rimrlhbp085ywvv2k5vw951j4z8ivfb"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; - suppdata = derive2 { name="suppdata"; version="1.1-8"; sha256="0npbr1zvn30vh6qccyxld2xzdflh6armj6d807d9qbkjqd81kkyn"; depends=[httr jsonlite rcrossref xml2]; }; + suppdata = derive2 { name="suppdata"; version="1.1-9"; sha256="0h8yl68x61r8dwz6jdx0mss9n2d6nxcxhacbmfkjfmxlyb7rsgd6"; depends=[httr jsonlite rcrossref xml2]; }; support_BWS = derive2 { name="support.BWS"; version="0.4-6"; sha256="0l47a4llraybpfghw8zhb51rs7c0wnlprpmjhc6jb2nclygzc704"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.4-0"; sha256="1zhhgd24r1xsrcf9av8hg7sc5pp165kff44lzzvhh79rl8rzrmyy"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; - support_CEs = derive2 { name="support.CEs"; version="0.5-0"; sha256="194vnld2rg5qcp6vmcx259icj7gl1kyrivh8v8hygy9fy6dp16wc"; depends=[DoE_base MASS simex]; }; - supportR = derive2 { name="supportR"; version="1.1.0"; sha256="1qbwmww4zrwjawjryqcr86sicyj6ypjl520js753dli74dsakm36"; depends=[data_tree dplyr ggplot2 gh googledrive lifecycle magrittr purrr rlang rmarkdown scales stringr tidyr vegan]; }; + support_CEs = derive2 { name="support.CEs"; version="0.6-0"; sha256="0j2gg101vnn1jrc0bajrgj14nl22rdq3hy4h6wimrvzqxj35f42c"; depends=[DoE_base MASS simex]; }; + supportR = derive2 { name="supportR"; version="1.2.0"; sha256="0sk6dnssg8gggdlsvr7dg8cbn67r6fqsqdh6hqvar8204fwn4xcw"; depends=[data_tree dplyr ggplot2 gh googledrive lifecycle magrittr purrr rlang rmarkdown scales stringr tidyr vegan]; }; sur = derive2 { name="sur"; version="1.0.4"; sha256="0rp5pwx3m6nzcy73wzmxpsxp9pc7swj2w5b82m0zdxq5kv9hsjsl"; depends=[learnr]; }; surbayes = derive2 { name="surbayes"; version="0.1.2"; sha256="0n01g84cwq5aj4qafk1zf60ka7s9z3q2gkgzp5xw9dx5lgfh7dgb"; depends=[Matrix Rcpp RcppArmadillo rlist]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; @@ -18317,6 +18369,7 @@ in with self; { surface = derive2 { name="surface"; version="0.5"; sha256="1fw75543aa6yafldffh9cnpm6m0rif0fpcihwj56d7nfnkbslawz"; depends=[ape geiger MASS ouch]; }; surrosurv = derive2 { name="surrosurv"; version="1.1.26"; sha256="1zkrbc71n06i0fccrv5f15rnkbp3cb8lnizh4z16mmqgvn35hg1j"; depends=[copula eha lme4 MASS Matrix msm mvmeta optimx parfm survival]; }; surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; }; + surtvep = derive2 { name="surtvep"; version="1.0.0"; sha256="0mmpyjv8cyayqpkkr7lh31s7bascv6i3h3774sfc015lzjpwl22f"; depends=[ggplot2 ggpubr Rcpp RcppArmadillo rlang tibble]; }; surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; survAH = derive2 { name="survAH"; version="1.0.0"; sha256="1cs3h2gc7i5lpy98lq6vi70k207x42nl1swdp5qs602zfbivx56k"; depends=[survival]; }; survAUC = derive2 { name="survAUC"; version="1.2-0"; sha256="138z4my55lbaxvvk6fih2vn16vvmdy0a07l0yjdhfy87yq7vhvki"; depends=[rms survival]; }; @@ -18331,7 +18384,7 @@ in with self; { survML = derive2 { name="survML"; version="1.0.0"; sha256="0xd5bslpzhrcdz3s51h138czc78n0w5mb8yw9xc771cpv92z11is"; depends=[Iso SuperLearner]; }; survMisc = derive2 { name="survMisc"; version="0.5.6"; sha256="014cf7sfndmib9jmj0p3h67sr750k2pvw7m865zwdpvlqddi44fr"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; survParamSim = derive2 { name="survParamSim"; version="0.1.6"; sha256="1dmxvdz1pp6k9rpln8w1pq1bkjmjx2jhym526c9bkl48xnla1nbw"; depends=[broom dplyr forcats ggplot2 lifecycle magrittr mvtnorm purrr rlang survival tibble tidyr]; }; - survPen = derive2 { name="survPen"; version="1.5.2"; sha256="1mmz7bbl1l0pkpgi8jqfdpq33yqa6c2442g3q7cqlyy1s7p1dcd9"; depends=[Rcpp RcppEigen statmod]; }; + survPen = derive2 { name="survPen"; version="1.6.0"; sha256="1gihr41a7smq4ql52gah249g3q2zd5zf5qiwpbxi7imgfzkmbzza"; depends=[Rcpp RcppEigen statmod]; }; survPresmooth = derive2 { name="survPresmooth"; version="1.1-11"; sha256="1rgz4g4irm6kg1ysb1sz9jar5i7l87blfhlhcmsg5bjbw0ih5xbn"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-4"; sha256="0ybq1238paar6dsf26cl9yfhkk88lqxiksvk5i4dymmx7xbcx7fw"; depends=[survival]; }; survRM2adapt = derive2 { name="survRM2adapt"; version="1.1.0"; sha256="1abi73a0z5g2khkmrgywrba6j9k6k7vpnskjcbqqq21qr5j32crv"; depends=[mvtnorm survival]; }; @@ -18339,20 +18392,19 @@ in with self; { survSNP = derive2 { name="survSNP"; version="0.26"; sha256="0fvmqlzg6j43d5bwvn70n4630n396wrykl5blkszadj3l118rmp4"; depends=[foreach lattice Rcpp survival xtable]; }; survSens = derive2 { name="survSens"; version="1.1.0"; sha256="08xh0jh99xq8lnw8xskmyan78mbk3n2sbjrfpwz7zwmfx4wbip35"; depends=[ggplot2 interp metR reshape2 survival]; }; survSpearman = derive2 { name="survSpearman"; version="1.0.1"; sha256="1b6nj2ikf931926a47a441icbrfjcadwxxnkc35c9yz8nw1kn1ii"; depends=[]; }; - surveil = derive2 { name="surveil"; version="0.2.1"; sha256="1b7nwp3rmvbnaw6l2pjhfia864cirpfhn2smib5c4zl2h9282rjk"; depends=[BH dplyr ggdist ggplot2 gridExtra Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidybayes tidyr]; }; + surveil = derive2 { name="surveil"; version="0.2.2"; sha256="1bk048mjnviwrls2s25wqrrm3iwi6qjkjlhnpb0i7wjm9cckzz7j"; depends=[BH dplyr ggdist ggplot2 gridExtra Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidybayes tidyr]; }; surveillance = derive2 { name="surveillance"; version="1.21.1"; sha256="1a33n91pp53rdfdr96d9sim00xr3bp6diaiqbc97zvri6ib35j8z"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat_geom xtable]; }; - survex = derive2 { name="survex"; version="1.0.0"; sha256="1xvznffkbdgixw814k5w0q5d13mzibm7z5djbb8dcq0yycnmkh3y"; depends=[DALEX ggplot2 kernelshap patchwork pec survival]; }; + survex = derive2 { name="survex"; version="1.1.3"; sha256="1rjq4y1l2f3lyqv6zk4szylnxrpb559p1fq5kycicxv91vvq4f37"; depends=[DALEX ggplot2 kernelshap patchwork pec survival]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.1"; sha256="0ci65w3w06kwab98q9gb7nb7smq9r25qfibkgfilsg1i5li6p9h5"; depends=[survival WriteXLS]; }; survey = derive2 { name="survey"; version="4.2-1"; sha256="0l7iml53k2blmcgvbvplln08fn2s6da856m5izcvw87v6bhn2g6c"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveyCV = derive2 { name="surveyCV"; version="0.2.0"; sha256="183ybmfin4xmpsmssw7hskj1rgwpabpa616bzxlir27kygyrswbz"; depends=[magrittr survey]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.3"; sha256="1ci6gqs1kiizpmddkw9r5nsq9wqdhha3kxhnn6b28fczrsypilf8"; depends=[dplyr functional plyr purrr Rcpp RcppArmadillo stringr]; }; surveydata = derive2 { name="surveydata"; version="0.2.7"; sha256="0wrp92j50a19is4xvh5s82zkp3rvn46gi2344pxinppfax0kjf2h"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; - surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="4.0"; sha256="19ydgcwyvkhknf4qmlw7j25skcj9a4rd6s8j5n7bdqpljl60zync"; depends=[data_table laeken]; }; surveysd = derive2 { name="surveysd"; version="1.3.1"; sha256="16l17ying9xshfn563kp7nn3hdqrg03ny578sgi08b7zfds5yf8b"; depends=[data_table ggplot2 laeken Rcpp]; }; surveyvoi = derive2 { name="surveyvoi"; version="1.0.5"; sha256="1nvyp8cz2x0ld79zgpcs7bdynd6g02iklzy1qgs8nmygwi3drdwy"; depends=[assertthat doParallel dplyr groupdata2 Matrix nloptr plyr PoissonBinomial progress Rcpp RcppAlgos RcppEigen Rsymphony scales sf tibble vegan withr xgboost]; }; survidm = derive2 { name="survidm"; version="1.3.2"; sha256="0ass7ffpk70ph7dcdjm2f6xyzqaavlkhr1pcij2vcasiy4v1vyiv"; depends=[doParallel doRNG foreach ggplot2 gridExtra KernSmooth np plotly Rcpp survival TPmsm]; }; - survival = derive2 { name="survival"; version="3.5-5"; sha256="0xl4arr70xqc7rnix9x9w83985ry0wpcmfi79vh5h0jbal4sax8k"; depends=[Matrix]; }; + survival = derive2 { name="survival"; version="3.5-7"; sha256="0bi76kr5xkcs98r795lz9nvsj6zzxq0w6zn1938z0ffx5b9js3nm"; depends=[Matrix]; }; survival_svb = derive2 { name="survival.svb"; version="0.0-2"; sha256="13lipzn1cnkd5dcg8n69cdghycifiin3jnjvgzsv0g60l1jk0lmp"; depends=[glmnet Rcpp RcppEigen survival]; }; survival666 = derive2 { name="survival666"; version="0.5"; sha256="11vs546lrbxnhpxjmwxhh2hnp6kwcf4hzgigi3x9525hr8n9cy01"; depends=[ggplot2 survival survminer]; }; survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.3.0"; sha256="0s4cihmjhg94zcbvr7c1pxdjyc0rpbqlw1gni5xkdhqp4lnqmygf"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; @@ -18368,7 +18420,7 @@ in with self; { survmixer = derive2 { name="survmixer"; version="1.3"; sha256="00s06h7nn8li4d2kn4yzlnj3px1wkpvnx5w73y98cvrcwm0ad71g"; depends=[]; }; survout = derive2 { name="survout"; version="0.1.0"; sha256="1ypxhdirppr6061zk1is473b8k8yy3m14ij4fa66rczs8gqy5sj2"; depends=[cmprsk dplyr openxlsx survival tibble]; }; survsim = derive2 { name="survsim"; version="1.1.8"; sha256="0gv54bd94a6vdz8li0j409qv7r0h4d681l1p9hj9ilzk7y5bfm70"; depends=[eha statmod]; }; - survstan = derive2 { name="survstan"; version="0.0.3"; sha256="1rk1slkyv13qpik32zmj2i3w7mzcsybdmq3wfh7cfpq9p1qxbw2n"; depends=[actuar BH dplyr extraDistr ggplot2 gridExtra MASS purrr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders survival tibble tidyr]; }; + survstan = derive2 { name="survstan"; version="0.0.4"; sha256="0rwwz52s5ss9l5y7xikdf2d7r86lk0xmx190i6mg1aw8mhxplk2b"; depends=[actuar BH dplyr extraDistr ggplot2 gridExtra MASS purrr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders survival tibble tidyr]; }; susieR = derive2 { name="susieR"; version="0.12.35"; sha256="0fhdc3lkhl4s9h2ng72gypy2z3hgk6566jfhwhsfbddyzd22drpd"; depends=[crayon ggplot2 Matrix matrixStats mixsqp reshape]; }; svDialogs = derive2 { name="svDialogs"; version="1.1.0"; sha256="0z3a5glsi0ab43mdk2yvslxyzg12nbqqqc35jvgzj475mpkbgjif"; depends=[rstudioapi svGUI]; }; svDialogstcltk = derive2 { name="svDialogstcltk"; version="1.0.0"; sha256="03rxw1m1ixisj0z9csmn3xff3rl1wqdvkcl1x7kmx64d0x6jwyfy"; depends=[svDialogs svGUI]; }; @@ -18386,19 +18438,19 @@ in with self; { svd = derive2 { name="svd"; version="0.5.4.1"; sha256="0awnv5aqyfikfs23cz5p8w8hifvd43gvvcnxgcp8h5m2zlyny3kb"; depends=[]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; }; - svgViewR = derive2 { name="svgViewR"; version="1.4.2"; sha256="0xlz86knvxxh96yr1z3px3lm0myaq6csqig11g8rrdg46lxnih3n"; depends=[Rcpp rjson]; }; - svglite = derive2 { name="svglite"; version="2.1.1"; sha256="0mmcipyqq4hs8fnb7301gdhl9ic4m80f1fp2x6z5vc61xrlh2w28"; depends=[cpp11 systemfonts]; }; + svgViewR = derive2 { name="svgViewR"; version="1.4.3"; sha256="0nsm397i1p0z1bbp92k6r12fgkxbgn624wvdwh5r7ydpiam6pvg8"; depends=[Rcpp rjson]; }; + svglite = derive2 { name="svglite"; version="2.1.2"; sha256="0c00djvlnf4qr30srh3xjnx1valqq8grm5ib0q4485z8gphn7hf2"; depends=[cpp11 systemfonts]; }; svgtools = derive2 { name="svgtools"; version="1.1.0"; sha256="1ipwj3qw8c62381b6yf5mazhg2a3ssddijqrq3bac57i8i6m8az1"; depends=[magick rsvg stringr xml2]; }; svines = derive2 { name="svines"; version="0.1.4"; sha256="1piin3nn0z5k9gilcq4lcqj86dqlfm9xqp87cslwypkfkkhn2aia"; depends=[assertthat BH fGarch Rcpp RcppEigen RcppThread rvinecopulib univariateML wdm]; }; svmpath = derive2 { name="svmpath"; version="0.970"; sha256="19b5hfqqsh072l5mbkafm5pjd6qhyj20qd2vq6zl5jjmc45r72w1"; depends=[kernlab]; }; svplots = derive2 { name="svplots"; version="0.1.0"; sha256="0fa3mnsdaz85dy7rr6w454z516simj1zrf08sfbm05rp6jr3c7ws"; depends=[ggplot2]; }; - svrep = derive2 { name="svrep"; version="0.6.0"; sha256="0575bla4594l6xwznqapdb4fc823b4yv55n6mf4pl942ylp5fp5b"; depends=[DBI Matrix mvtnorm survey]; }; + svrep = derive2 { name="svrep"; version="0.6.3"; sha256="1b36d4f7dd5hf1wxmkwpp7sz9sfykf492xakp0v1b3qsby8gcdbc"; depends=[DBI Matrix mvtnorm survey]; }; svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; }; svs = derive2 { name="svs"; version="3.0.0"; sha256="1jn3dbaqpgydkwf9y7hq97nva26vvrpl9zmw2bw4ky1qgzgz1ypb"; depends=[gtools Matrix]; }; svyVGAM = derive2 { name="svyVGAM"; version="1.2"; sha256="01y372p52xjd7j20xk5gwxkl8sfnwdvixx3pb3f6r407ca7l330h"; depends=[survey VGAM]; }; svydiags = derive2 { name="svydiags"; version="0.4"; sha256="0fk990iqhf3c5dda0fkspjsnrxam1bam4h9wlpvwilb2j4c39vs8"; depends=[MASS Matrix survey]; }; svyweight = derive2 { name="svyweight"; version="0.1.0"; sha256="1pg22gc8798dn9r8gphzlagryybb8gv6l18x650wq82mirnvgl6h"; depends=[gdata survey]; }; - swCRTdesign = derive2 { name="swCRTdesign"; version="3.3"; sha256="0vrk1z42g0xm7gycbph31fgdf6wjx3w0k15xcmgm75fzwk2jzhr8"; depends=[]; }; + swCRTdesign = derive2 { name="swCRTdesign"; version="4.0"; sha256="0q0f6f2fhjgqwvlhs14x6vz1fjq4iadx2g7cypifzpr1pq474nwf"; depends=[lme4 lmerTest]; }; swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; }; swaRm = derive2 { name="swaRm"; version="0.6.0"; sha256="0p29dyig4zyrjp5gbm17q4s4g2jxl2idq6cqp6zyhsr0n197d38h"; depends=[geosphere lubridate MASS splancs]; }; swag = derive2 { name="swag"; version="0.1.0"; sha256="1w6schbj5gw7278krjzkcwafz3wv7vp7cfsvy17c0i1b5g3qqkpd"; depends=[caret Rdpack]; }; @@ -18407,26 +18459,27 @@ in with self; { swaprinc = derive2 { name="swaprinc"; version="1.0.1"; sha256="0r90w387chh4xgqn7jfi2wawsgr8faansp94hrp4vkhdmbbsb86z"; depends=[broom broom_mixed dplyr Gifi lme4 magrittr rlang tidyselect]; }; swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; - swdpwr = derive2 { name="swdpwr"; version="1.7"; sha256="0mljayrs629d0pxbd9lzzplvs31i33fqb0bfb01ryvwyv0ckwjx9"; depends=[spatstat_random]; }; + swdpwr = derive2 { name="swdpwr"; version="1.9"; sha256="12ynji4qg30gypldmcqrj2m89ip0biqvy525kgi7s38a3ian3fhn"; depends=[spatstat_random]; }; sweater = derive2 { name="sweater"; version="0.1.7"; sha256="03fq3vbcvbv8fwdp6smxyzb5gj8qp03qf88l99f2na9bax302sr3"; depends=[cli combinat data_table LiblineaR proxy purrr quanteda Rcpp]; }; sweep = derive2 { name="sweep"; version="0.2.5"; sha256="1h9skkcpygj6y8hw3zawcdhvhjyqrr41fqn8jyf9wyvmhz6n84fb"; depends=[broom dplyr forecast lubridate rlang tibble tidyquant tidyr tidyverse timetk]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.3.1"; sha256="10ra6m8arjpgypj15diailnrkgrvkxl3v0xji7v29ci7n03xa46r"; depends=[Rcpp]; }; swfscAirDAS = derive2 { name="swfscAirDAS"; version="0.3.0"; sha256="1x9k883hv10ki6lbcp14j4808hj6krr0jd4cmkni0jbsj0sv0d81"; depends=[dplyr lubridate magrittr purrr readr rlang stringr swfscDAS swfscMisc tidyr]; }; swfscDAS = derive2 { name="swfscDAS"; version="0.6.2"; sha256="146xm4i0khdk217x4mgxi1j006fk8xpqqjf1hll6p2ky65iklmj4"; depends=[dplyr lubridate magrittr purrr readr rlang sf swfscMisc tidyr]; }; - swfscMisc = derive2 { name="swfscMisc"; version="1.6"; sha256="1nsr4n4dqm2jhmf3z2yg9x63x394cank70i41zrp2m0sd9wqprgk"; depends=[dplyr ggplot2 ggrepel HDInterval kknn magrittr mapdata maps rlang sf spatstat_geom tibble tidyr]; }; + swfscMisc = derive2 { name="swfscMisc"; version="1.6.5"; sha256="1qc2d3ykzxqqnjdq93j9nvkb8gfkvyr2x1l657q7jh1wcj8b7754"; depends=[abind dplyr ggplot2 ggrepel HDInterval kknn magrittr modeest rlang runjags sf spatstat_geom tibble tidyr]; }; swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swimplot = derive2 { name="swimplot"; version="1.2.0"; sha256="02w1l67hvz8gha8gcqxcvcr8g2azidn6bvw76h3k75p9rvq8sgpp"; depends=[dplyr ggplot2 tidyr]; }; - swipeR = derive2 { name="swipeR"; version="1.0.0"; sha256="0bxfnxf5q6wdh1mba8m4bnshsgbadlg4hhpr5wbykfk7dak4kkih"; depends=[base64enc htmltools htmlwidgets rChoiceDialogs]; }; + swipeR = derive2 { name="swipeR"; version="1.1.0"; sha256="1wj878y15z9d6ijyv4pvff3vcdn78ybs4rqzhqdfrn47fa99zmdv"; depends=[base64enc htmltools htmlwidgets rChoiceDialogs]; }; swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissparl = derive2 { name="swissparl"; version="0.2.2"; sha256="0rj01qcg0vh3vwrbag42w7mvb9ld800hzn4lszmbiv13yifgi8ys"; depends=[crayon dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble tidyr]; }; - switchSelection = derive2 { name="switchSelection"; version="1.1.0"; sha256="0ry7n5mmjcxk7n3c2mc0ccnjdkw2wn5bdc0n2w8hj0dbjixc2rrm"; depends=[gena hpa mnorm Rcpp RcppArmadillo]; }; + switchSelection = derive2 { name="switchSelection"; version="1.1.2"; sha256="0mgl3s02pz9nbhdnm7fhyd8vbrfl718rv7bardlqc448qyb78hb8"; depends=[gena hpa mnorm Rcpp RcppArmadillo]; }; switchboard = derive2 { name="switchboard"; version="0.1"; sha256="1qh6cfm5h0j17ldljpgj400f2dhcfaa4x1157d46cyfawfdscvc5"; depends=[magrittr]; }; switchcase = derive2 { name="switchcase"; version="0.1.1"; sha256="0h31nzyf7dzalgl65cw0k1fxylbmx78l45r5id2wcqdym23dv9a9"; depends=[]; }; switchr = derive2 { name="switchr"; version="0.14.8"; sha256="1q1rnwm0g5kk5z1szb0f9bvaqgpdnj22lvfnychb7jdhriwmn1zw"; depends=[RCurl RJSONIO]; }; sylcount = derive2 { name="sylcount"; version="0.2-5"; sha256="0934vic6mdrgpralrfvlv7y83kc1h7df7jm37spapy370mzq50lp"; depends=[]; }; syllabifyr = derive2 { name="syllabifyr"; version="0.1.1"; sha256="1z61afxx2bm37hxvv1fl3x7ibhkp3h1ivl3k9prqzsaw4j592vfx"; depends=[dplyr purrr stringr tibble tidyr]; }; + syllogi = derive2 { name="syllogi"; version="1.0.1"; sha256="1d9h61xvx5gjafr2cjk92c3ggvrf4p3wrrfv0kcyrk3qn6xd9d0c"; depends=[]; }; sylly = derive2 { name="sylly"; version="0.1-6"; sha256="0f03k9d15fkym14y94jb7rkh228blc76jlm7pk229b44hcbh3mmm"; depends=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; sym_arma = derive2 { name="sym.arma"; version="1.0"; sha256="13fhmgzd50mwlnz9m6nnn4arr4jdqf5h7dgli5lk08da9wx6cy69"; depends=[]; }; @@ -18443,9 +18496,9 @@ in with self; { synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.6"; sha256="0pslag0nb9v872yr383chjdavz8hv9m0ba3pvxhfpshxsfzczcca"; depends=[Matrix Rcpp RcppArmadillo]; }; - synoptReg = derive2 { name="synoptReg"; version="1.2.1"; sha256="1v282ag4275p5lm6yvzwkpndrf4cnrpn0rw3v6mh5hxnb2pbmjl5"; depends=[dplyr ggplot2 kohonen lubridate magrittr metR raster rnaturalearth rnaturalearthdata RNCEP sf stringr tibble tidyr]; }; synr = derive2 { name="synr"; version="0.6.0"; sha256="128rgwmj2skcnjm8h1kkbqrm0sz67a515l2n16w5p1jybqvd9ps0"; depends=[data_table dbscan ggplot2]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; + syntenyPlotteR = derive2 { name="syntenyPlotteR"; version="1.0.0"; sha256="00w380hcw7zfsr4lgzlp57l7rcl280n3y5m8xsp7n2f5csf8kq5q"; depends=[ggplot2 stringr]; }; synthACS = derive2 { name="synthACS"; version="1.7.1"; sha256="1s4jawg2g0zy41y0ajacki4nif9m3r0hnaz63yhapcnizc37lyy1"; depends=[acs data_table Rcpp retry]; }; synthesis = derive2 { name="synthesis"; version="1.2.3"; sha256="0nhnpqhs1h7iz49h852ns8pgmcl8via506idyp19dp778wbmxkn1"; depends=[MASS]; }; synthesisr = derive2 { name="synthesisr"; version="0.3.0"; sha256="0b50d5hfkscggn2f6h8wyljkar08r8cbc0a4l12f809w5hdnjc63"; depends=[stringdist]; }; @@ -18455,23 +18508,21 @@ in with self; { sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-30"; sha256="1qhw8gda85lliqhj67zsgva4cb6wihr5hks1c9c34y0n3ywgp52r"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="1.0.4"; sha256="1h44bal845jp7ya8i7ff1kz1n3wklkb00jk6hb9lgwa2p5snqxpg"; depends=[cpp11]; }; + systemfonts = derive2 { name="systemfonts"; version="1.0.5"; sha256="08sqw5izpwhawcjkcyscvslz914skwfi0s68rdwrqwwkh8fzn3w4"; depends=[cpp11]; }; syt = derive2 { name="syt"; version="0.2.0"; sha256="1pfl3d6laa075z88fqgjnrsn21lgjsak0bjdws09b9knc0ifgfsz"; depends=[Matrix partitions]; }; - syuzhet = derive2 { name="syuzhet"; version="1.0.6"; sha256="16iccqdbw02iw82nah6kwz3gwfghi864j2y698n4b9dyc386ijzv"; depends=[dplyr dtt NLP rlang textshape tidyr zoo]; }; + syuzhet = derive2 { name="syuzhet"; version="1.0.7"; sha256="0cpjg16hwn6843jdxp4h94qjw1wwwblvjzg30w54rac08m62nkxg"; depends=[dplyr dtt NLP rlang textshape tidyr zoo]; }; tLagInterim = derive2 { name="tLagInterim"; version="1.0"; sha256="17fz38bc4r7m3racscr9yn1s8vmzlkkc14144bb3x4sg40ybyfpx"; depends=[R_utils survival]; }; tLagPropOdds = derive2 { name="tLagPropOdds"; version="1.8"; sha256="08ik62hlnbzb5xn159lfs85dwz69w4jnnk9mbc75mxryzw10p6jd"; depends=[dplyr R_utils survival]; }; tRnslate = derive2 { name="tRnslate"; version="0.0.3"; sha256="0sm0cqxylsxmnhqs1c8w81d6q2sj7nmm86mds59kiyspy9m67sbc"; depends=[]; }; - tRophicPosition = derive2 { name="tRophicPosition"; version="0.8.0"; sha256="0ap7j15qfywilyx8zsnq061mis69yja16hjnla5grlqc0mcrdd7d"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr RColorBrewer rjags]; }; - tTOlr = derive2 { name="tTOlr"; version="0.2"; sha256="1fk33vp6y65mls1iczjf63wzj1rl1knbdcbd4rnqqfdcqhibb3p3"; depends=[lattice latticeExtra]; }; + tTOlr = derive2 { name="tTOlr"; version="0.2.3"; sha256="0pqaj80bvpccw6g8kvvlc4bkkzrrh0nvl4gbfz7b582lzd41xjyn"; depends=[lattice latticeExtra]; }; tab = derive2 { name="tab"; version="5.1.1"; sha256="1kg8c1safi9klkx2mdkmsf5dn9piy4jljwd4ma7g4jz2rwl4jzhv"; depends=[dplyr kableExtra knitr MASS survey]; }; - tabbycat = derive2 { name="tabbycat"; version="0.17.0"; sha256="1q18vnk4jyql46vjj6bhn2sa65yswg1hw8mbrwv7602dfk09p74x"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; + tabbycat = derive2 { name="tabbycat"; version="0.18.0"; sha256="1vp9cmjdj5zz2lkvc5jgd0f28wr2x4d4hif9aqnmwkkwm0ysb16h"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; taber = derive2 { name="taber"; version="0.1.2"; sha256="0cib8fsib4q8nf18vcpailvkplf57cm8fshb09clxm3zcp8j9c17"; depends=[dplyr magrittr]; }; tabit = derive2 { name="tabit"; version="0.2.1"; sha256="0jy95jpbzj4rgaxmm6ki9wr0cl1w13pygq3yavdccjr82mayfpvc"; depends=[]; }; tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.5"; sha256="1cwjqxsqspyrv19wx1fvqk2x2jc3vv6h7k8flpr74a5la1jmxsbd"; depends=[openxlsx]; }; table_express = derive2 { name="table.express"; version="0.4.2"; sha256="0iyx45q64ya82054alj1jm53zh2l8m05z743k0ifscyr0lkmp3zm"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; table_glue = derive2 { name="table.glue"; version="0.0.3"; sha256="1viaz9swdhgk4ysjhyvl9fr4m430qvmwwblij2b2dadwbdl0z9k4"; depends=[glue stringi]; }; table1 = derive2 { name="table1"; version="1.4.3"; sha256="1wr5cqc6a81b5b2fjvw4swb579q5llf63658l6srhxbxx0qba5l3"; depends=[Formula htmltools knitr yaml]; }; - table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableExtra = derive2 { name="tableExtra"; version="1.0.1"; sha256="1rbcxd3rjhvcpayj6d7mh30vkbc7g4mv4qa7552xz3x1wny0n4mm"; depends=[gtable]; }; tableHTML = derive2 { name="tableHTML"; version="2.1.2"; sha256="0x86q0nddkyan9yh2jaldrnc30q1n3q0fnza2fnavzbz5c2hxapw"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; @@ -18483,14 +18534,14 @@ in with self; { tables = derive2 { name="tables"; version="0.9.17"; sha256="1ygf1jir32dwy7617imrr2pkqf5qf894lbxrjm7kqflq3ar6zf5z"; depends=[htmltools knitr]; }; tableschema_r = derive2 { name="tableschema.r"; version="1.1.2"; sha256="1lnl1xybwzg00hqksbj2g6r1hrzwlh2al08hhml0n42khmvpg05g"; depends=[config future httr jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; tablesgg = derive2 { name="tablesgg"; version="0.8-1"; sha256="0vkl9386qnalr5d0libqs2ihszggs0qyx6ffyjn8j8ab3kczzxhr"; depends=[ggplot2 tables]; }; - tablet = derive2 { name="tablet"; version="0.6.2"; sha256="1bsifjz2wdz416ws2iy203ipf1bcqw3r6d2fh124ha0hb1gvyikq"; depends=[dplyr fs kableExtra magrittr reactable rlang spork tidyr yamlet]; }; + tablet = derive2 { name="tablet"; version="0.6.3"; sha256="16wwwwcwwc18imv1zjvw5dvdaqqgscsp4z2xgvdqaa6ljx1l5snj"; depends=[dplyr fs kableExtra magrittr reactable rlang spork tidyr yamlet]; }; tablexlsx = derive2 { name="tablexlsx"; version="0.1.0"; sha256="0rispm626s59g3irdkx8clmjlqsg1vdlyjkzx0z74m13nkgmfw82"; depends=[dplyr magrittr openxlsx]; }; tabnet = derive2 { name="tabnet"; version="0.4.0"; sha256="1wxarcl68s4v88b1x2qw4vc4ybm66zm10qcinwk892n3srs7isfc"; depends=[coro glue hardhat magrittr progress rlang tibble torch vctrs]; }; taboolaR = derive2 { name="taboolaR"; version="0.1.0"; sha256="1nv189d6sjjrhc1nr7xhdf22gfh1z93rlcgm2vk7kcs43avm8fwb"; depends=[jsonlite]; }; - tabr = derive2 { name="tabr"; version="0.4.5"; sha256="1nkzbqy9nb6pd895glld009vmry5rnhd7h9q31s8xh97kwlwk9c2"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; + tabr = derive2 { name="tabr"; version="0.4.9"; sha256="0dsm98lhl7j2bb3z5cliz1f34sv904svhniw6iar1nqh6p9y8a5l"; depends=[crayon dplyr ggplot2 purrr tibble tidyr]; }; tabshiftr = derive2 { name="tabshiftr"; version="0.4.1"; sha256="1ri28zxsxn9bkbq0f47q6mkr889krvixvk63in0jbn9hya77gdy8"; depends=[checkmate crayon dplyr magrittr purrr rlang stringr testthat tibble tidyr tidyselect]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; - tabula = derive2 { name="tabula"; version="2.0.0"; sha256="13mg0cacwx606942n40icr83yzq3px50wqfpxync0zraf6kr4zpp"; depends=[arkhe ggplot2 rlang]; }; + tabula = derive2 { name="tabula"; version="3.0.0"; sha256="1jdm37p1sc55xb3ha7rha65wv1jnfg29xxgpcfa4yikpfby1m834"; depends=[arkhe]; }; tabularMLC = derive2 { name="tabularMLC"; version="0.0.3"; sha256="1gppzbf780ci4vrvy7rd3xa0bvwxca5f05a9xk194xv913vyd440"; depends=[Rcpp RcppArmadillo]; }; tabularaster = derive2 { name="tabularaster"; version="0.7.1"; sha256="0b8jl3bf7q0302mlnqh720qs7rllkgyg127n1h25snb34k1wc3pm"; depends=[dplyr fasterize magrittr raster silicate spatstat_geom tibble]; }; tabularmaps = derive2 { name="tabularmaps"; version="0.1.0"; sha256="07i76n2fpl2ma6jl3zdbay0zmmaaxrxhv1368xm2d575br42nri4"; depends=[ggforce ggplot2 purrr rlang]; }; @@ -18500,6 +18551,7 @@ in with self; { tacmagic = derive2 { name="tacmagic"; version="0.3.1"; sha256="1rayyavjppi5dbcmb4yb2nf85ch2li766sdllfsirb19bb3d4c2d"; depends=[pracma R_matlab]; }; tactile = derive2 { name="tactile"; version="0.2.1"; sha256="1yly05zin0isad69d6j1k2nb9ykvz0gj2xs9mqiq2cda0mdxmh65"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; }; tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; }; + tagr = derive2 { name="tagr"; version="1.0.1"; sha256="0ffypwrdxl22c1l99k7js3wayh83xhjw10m9cdbdxapzzf6xm0bg"; depends=[]; }; tagtools = derive2 { name="tagtools"; version="0.1.0"; sha256="18r4hjip7dsij476h3fj8q7dgpnwh9fcbyvkly3669m5pqc1m3dw"; depends=[CircStats dplyr latex2exp lubridate matlab ncdf4 plotly pracma readr signal stringr zoo zoom]; }; tailDepFun = derive2 { name="tailDepFun"; version="1.0.1"; sha256="0rrjg4ky3pjbfwppmnwyijvlzq3c3nf33rl0w4vly52v1ramp5c6"; depends=[copula cubature mvtnorm SpatialExtremes]; }; tailTransform = derive2 { name="tailTransform"; version="1.0.4"; sha256="0nflrzq5m1jwf91lavwwzl6ja4qswva1z4gpdbm3q5iscg1hbwp7"; depends=[]; }; @@ -18512,16 +18564,16 @@ in with self; { tangram_pipe = derive2 { name="tangram.pipe"; version="1.1.2"; sha256="0v86xn5rvr6c74cqhiwfxgfb4mizqlf5bqc51870na28i2ariaap"; depends=[dplyr]; }; tapkee = derive2 { name="tapkee"; version="1.2"; sha256="1xgz2cv5jb1hdnl8y8zs4x6p1dk1vv8zbs4wfsj61gpfyf9gkh4f"; depends=[]; }; tapnet = derive2 { name="tapnet"; version="0.3"; sha256="1fjg98m19iwbzijs5b5l4ssrbx1shv1hmgn1166cbni9y76m44sh"; depends=[ape bipartite MPSEM phytools vegan]; }; - tarchetypes = derive2 { name="tarchetypes"; version="0.7.7"; sha256="1vqyabk04kpskx1ny7c4knzg90ri99x17vfnwcb6syjbzpcfg444"; depends=[digest dplyr fs furrr future future_callr rlang targets tibble tidyselect vctrs withr]; }; + tarchetypes = derive2 { name="tarchetypes"; version="0.7.9"; sha256="1889jca7zwav1wwig1a4jr1dxmbcszfriqmhdyg97m2s1c9j0r9p"; depends=[digest dplyr fs rlang targets tibble tidyselect vctrs withr]; }; tardis = derive2 { name="tardis"; version="0.1.4"; sha256="1hfqnszhly6cfi7aii3v9nnrj3md389bflvf3igixrn4wb7mfyi5"; depends=[cpp11 dplyr magrittr purrr rlang stringi stringr tidyr]; }; targeted = derive2 { name="targeted"; version="0.3"; sha256="0h05h8pgjjab5clv501m9b2fcycspj0dc7zs72lwp15al2rikmzg"; depends=[data_table digest futile_logger future_apply lava mets optimx progressr R6 Rcpp RcppArmadillo survival]; }; - targets = derive2 { name="targets"; version="1.2.0"; sha256="14vm97jjlpy3a0l0lgzgpk96igvzfpxv38xqcwa0lmp0ia7hj2p8"; depends=[base64url callr cli codetools data_table digest igraph knitr R6 rlang tibble tidyselect vctrs yaml]; }; + targets = derive2 { name="targets"; version="1.3.2"; sha256="0zlbq658zxflz2fk9pksbjx3r5dmay4411byl33gkp3rnynvchgh"; depends=[base64url callr cli codetools data_table digest igraph knitr R6 rlang tibble tidyselect vctrs yaml]; }; tashu = derive2 { name="tashu"; version="0.1.1"; sha256="0rirjalridr79a7j3qz80l2vp6m8paqr97ac241b58756k7nr5j7"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; }; - tastypie = derive2 { name="tastypie"; version="0.1.0"; sha256="15ivl0rvnp1j09axk0jaf1wip5cjbnvfmx0crhqqd5y27mfa2hzd"; depends=[dplyr fmsb ggplot2 packcircles RColorBrewer scales shadowtext tibble]; }; + tastypie = derive2 { name="tastypie"; version="0.1.1"; sha256="0a7wq8jg3f0852y9pla1f63dqnkwn3vnb9p7fh9jq9rf75ljcpjk"; depends=[dplyr fmsb ggplot2 packcircles RColorBrewer scales shadowtext tibble]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; tatoo = derive2 { name="tatoo"; version="1.1.2"; sha256="0lvnl2lqp16af4rkmijl47bx5xf17gpji21s0h8xxzpbxbmy3xwx"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; }; tau = derive2 { name="tau"; version="0.0-24"; sha256="1q8pd7m6rd0899c44plxns5yydifhsccyb51glgw07ni5v4rz3gh"; depends=[]; }; - tauProcess = derive2 { name="tauProcess"; version="1.1.1"; sha256="17i3q7gdhhchcyiiv9jf27x4ig0hzsbfh1lvqhmndpgv9fjmrzjz"; depends=[survival]; }; + tauProcess = derive2 { name="tauProcess"; version="2.1.3"; sha256="0mqvq9bickv6jwfxcqgy3cxr3km6xg1mscgg480wd5fv0v2y4z51"; depends=[survival]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; taxa = derive2 { name="taxa"; version="0.4.2"; sha256="1vb3igz24xkgsds5145h3hqlc7grn3l2kpslg87j4hsw66i86py3"; depends=[cli crayon dplyr magrittr pillar rlang stringr tibble vctrs viridisLite]; }; taxadb = derive2 { name="taxadb"; version="0.2.1"; sha256="0m6rbvnf6ngz6i2w5jvmca0zl0pyy3b30vhjqxi08glii5fkwx2k"; depends=[contentid DBI dbplyr dplyr duckdb magrittr memoise rlang stringi tibble]; }; @@ -18546,23 +18598,28 @@ in with self; { tcl = derive2 { name="tcl"; version="0.2.0"; sha256="0n735xyl0fr3zgigw68xpy1ky3rfd2djwg9qhgbgif0cvgrrki1n"; depends=[eRm lattice ltm MASS Matrix numDeriv psychotools rlang]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive2 { name="tclust"; version="1.5-4"; sha256="1a3i6kvfzc2d6rdf75w03n5172jihhqa8mvzcb4m8l0w6mgdlm9b"; depends=[]; }; - tcpl = derive2 { name="tcpl"; version="3.0.1"; sha256="1xsw532xdf4xksrggsszwbh7rj818hvi9xmndhdhdk6wq6bg7xh4"; depends=[data_table DBI dplyr ggplot2 gridExtra numDeriv plotly RColorBrewer RMariaDB sqldf stringr tcplfit2 tidyr]; }; - tcplfit2 = derive2 { name="tcplfit2"; version="0.1.5"; sha256="1illbx2ifq63ki8yn97gs0lpl4hzdcl2sbwq7id3pgd8pmfka68w"; depends=[numDeriv RColorBrewer stringr]; }; + tcpl = derive2 { name="tcpl"; version="3.1.0"; sha256="0s35j9ky49d2f58hg93a47l6j855vm95a3qzwq3i8wd0p2zh1x7b"; depends=[data_table DBI dplyr ggplot2 gridExtra numDeriv plotly RColorBrewer RMariaDB sqldf stringr tcplfit2 tidyr]; }; + tcplfit2 = derive2 { name="tcplfit2"; version="0.1.6"; sha256="1znhma87nyy36m3viyh80m6gygqh4iwwh1xj0nw6wh88qal4935p"; depends=[numDeriv RColorBrewer stringr]; }; td = derive2 { name="td"; version="0.0.6"; sha256="1zycwnl7n03jw76n8qrk2zhgnakj6npid25pflj6dnmbjc47ih32"; depends=[RcppSimdJson]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; tdata = derive2 { name="tdata"; version="0.2.2.0"; sha256="03p068gsjnf0m6i1bf5dnck9qq6igqig24hn7ahlrkd426f3mj8z"; depends=[BH Rcpp readxl]; }; - tdaunif = derive2 { name="tdaunif"; version="0.1.0"; sha256="0a24lqiimp54fmj4zi7bakxral8ny60n25h9arwl6m00c7cn98pl"; depends=[]; }; + tdaunif = derive2 { name="tdaunif"; version="0.1.1"; sha256="03m8lzg4w1ys0shr2gir5m78c02r71l5pwqgvpcn004kirh3xhwv"; depends=[]; }; tdcmStan = derive2 { name="tdcmStan"; version="2.0.0"; sha256="0xa80r37abc9fzf9zcf0zpimadwa3glhw3qbn7wbg0cq93cm04df"; depends=[dplyr glue magrittr rlang stringr tibble tidyr tidyselect]; }; tdigest = derive2 { name="tdigest"; version="0.4.1"; sha256="1g4yk01lmx8cz5q06bxm3kcsi7c9cvpdfi925csc4qaf5rdrad4y"; depends=[magrittr]; }; tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; - tdsa = derive2 { name="tdsa"; version="1.0-1"; sha256="0k7av6f8f052b9ww7g8frvvmj8k740jsnk55jgfvwdw3k6bjjmwx"; depends=[deSolve mathjaxr numDeriv]; }; + tdsa = derive2 { name="tdsa"; version="1.1-0"; sha256="0zp0g2jcpl26vszbw3s5v6qc6l8jk2jll0nz0f3gywhiv93mjmgr"; depends=[deSolve mathjaxr numDeriv]; }; tdsc = derive2 { name="tdsc"; version="1.0.4"; sha256="1mblw1x9b3pwf0yx3vzminsqkgbqajafbwl3mw014lbdcy9qc3bi"; depends=[data_table moments]; }; tdthap = derive2 { name="tdthap"; version="1.2"; sha256="0x67k50vly92b9n5hpqp4hy87kh8r6nzadsj8xzz4lvcmb4vb6mq"; depends=[]; }; tea = derive2 { name="tea"; version="1.1"; sha256="0ql7lrxk0ihm49kqsvz79ig8i54rwiy9nxav4v9hy72j9kj5bgjn"; depends=[Matrix]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.8"; sha256="161l9nvgi22ihp3l87x4alk22m9451h45n7s3ic60y26sr3zlv3k"; depends=[actuar BH data_table devtools dplyr DT ggplot2 knitr magrittr markdown miniUI pacman Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinydashboard shinythemes yaml]; }; + teal_code = derive2 { name="teal.code"; version="0.4.1"; sha256="1drwxgiigx20db4blzixljknafr651qs0fk5cmcal1xsl1k7hcwp"; depends=[checkmate lifecycle rlang shiny styler]; }; + teal_logger = derive2 { name="teal.logger"; version="0.1.3"; sha256="037l3sb0vbnijhl1an4d4f63kgjq77nrj0hfrn74yj9ml406g3wg"; depends=[glue lifecycle logger shiny withr]; }; + teal_reporter = derive2 { name="teal.reporter"; version="0.2.1"; sha256="0jwc5vrlgxkbahcr4rww1l12cbkrrdda4xrcx6p6lwxbx2m847jg"; depends=[bslib checkmate htmltools knitr lifecycle R6 rmarkdown shiny shinyWidgets yaml zip]; }; + teal_widgets = derive2 { name="teal.widgets"; version="0.4.1"; sha256="06qbwy3bwfl1x2lqggzqjz4skb0n11vnvgyl7pr8pvwv97zlalpr"; depends=[bslib checkmate ggplot2 htmltools lifecycle rtables shiny shinyjs shinyWidgets styler]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.6"; sha256="0gfga3fx047kpngwrkinsq3w5f34svnh3vpfjnc78bvrmmm70wqw"; depends=[checkmate crayon dplyr furrr future glue magrittr purrr rlang stringr units]; }; teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; }; + tectonicr = derive2 { name="tectonicr"; version="0.2.93"; sha256="0a5lxjk4ghjxyhmprh3ay8922dzp59affnkppl2s7zfbz5cnmxz0"; depends=[boot dplyr ggplot2 RColorBrewer sf smoothr spatstat_explore terra tidyr viridis zoo]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; tehtuner = derive2 { name="tehtuner"; version="0.3.0"; sha256="1m1gkkl0kgjrlkbh3vz8lh64gq6l8v3vay0977lwx8g3yzs40z0g"; depends=[earth foreach glmnet party randomForestSRC Rdpack rpart stringr SuperLearner]; }; teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; @@ -18571,7 +18628,7 @@ in with self; { telegram_bot = derive2 { name="telegram.bot"; version="3.0.0"; sha256="0fqv2piddb8i37rpvw6li25jhc9mbi7fyqmib90xah6qmlaji02g"; depends=[curl httpuv httr jsonlite openssl R6]; }; telemac = derive2 { name="telemac"; version="0.1.1"; sha256="12wkhya49yi0qqm73sizgnf6r5lkssg07wc6pq9iychjjd0cxfly"; depends=[data_table dplyr fs gstat magrittr purrr raster Rcpp RcppArmadillo rlang sf sp stringr sys tidyr tidyselect]; }; telemetR = derive2 { name="telemetR"; version="1.0"; sha256="04samfr6m3lnyvq03an5an6z4iyqizn3qyjjblphrix2p5wrl37r"; depends=[dplyr ggplot2 lubridate tidyr zoo]; }; - tempR = derive2 { name="tempR"; version="0.9.9.20"; sha256="12wnb9w5ql4q9n0gppjaxa66rrmdp0mklrhpp1chf9qr9wyzjkxi"; depends=[]; }; + tempR = derive2 { name="tempR"; version="0.9.9.23"; sha256="1s1qyvxc0mz2wydyz4ba94sh71b4d52wzfiq9qsw6y5clff3282p"; depends=[]; }; tempdisagg = derive2 { name="tempdisagg"; version="1.1.1"; sha256="11dr5z1s9d8d2xsl4gm9x15v7jyi88f5c5gk05layh5nl2c1bxni"; depends=[]; }; temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; }; templateICAr = derive2 { name="templateICAr"; version="0.6.2"; sha256="0krkxcykgj239xx2gzww7x3xwdg8a90ysmrkisx8546admwxyj7z"; depends=[abind excursions expm fMRItools ica Matrix matrixStats pesel Rcpp RcppEigen SQUAREM]; }; @@ -18583,7 +18640,7 @@ in with self; { tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; }; tensorBSS = derive2 { name="tensorBSS"; version="0.3.8"; sha256="1chgkdshjpxzy0cxkgjzpr5k4v2hyad1vchrxyqhsj9isfic2581"; depends=[abind fICA ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; tensorTS = derive2 { name="tensorTS"; version="1.0.1"; sha256="0qn6h3icgcg7ipyjk0cc9pbc97d58m56f1w8ijydms42r2xcnipg"; depends=[abind expm MASS Matrix pracma rTensor tensor]; }; - tensorflow = derive2 { name="tensorflow"; version="2.11.0"; sha256="1nqb3vgsw1xrpi1skw6yqwgdri3i8d9np0jylzfj7plizx63z64b"; depends=[config processx reticulate rstudioapi tfautograph tfruns yaml]; }; + tensorflow = derive2 { name="tensorflow"; version="2.14.0"; sha256="1zv7b3r8c2nzyrq295pvdf3kv2mz7cmm4adck508qr12rb9d5ybx"; depends=[config lifecycle processx reticulate rstudioapi tfautograph tfruns yaml]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; tensorregress = derive2 { name="tensorregress"; version="5.1"; sha256="13khpymifjd8bsqb5j43kaqbpampzifp0lzmh4m3hi17jhcg33aq"; depends=[MASS pracma]; }; tensorsparse = derive2 { name="tensorsparse"; version="3.0"; sha256="0xx003nh5bi87cbsqb7ikpcs4yhjhphh7pybzzas44qkwbn4fn1k"; depends=[]; }; @@ -18592,36 +18649,36 @@ in with self; { tergmLite = derive2 { name="tergmLite"; version="2.6.1"; sha256="03dr3bfi5ywavfijkc6gmci8i1kmbsh26awhl7748mn9wcsgs2pc"; depends=[ergm network networkDynamic Rcpp statnet_common tergm tibble]; }; term = derive2 { name="term"; version="0.3.5"; sha256="1ig1hvyv18d1x19jmvkg66m6nn8kdlffj5hx70vzd4sxz68j2k0v"; depends=[chk extras lifecycle purrr rlang universals vctrs]; }; terminaldigits = derive2 { name="terminaldigits"; version="0.1.0"; sha256="0vj7pylr410wi59qj2313iximsyl0v9ffg7z9gcfg720g5zrvfkm"; depends=[discretefit Rcpp]; }; - tern = derive2 { name="tern"; version="0.8.4"; sha256="01k0mimlra38ppc85si3s91bmzcm917wnsf4q99jxff5l1c20khy"; depends=[broom car checkmate cowplot dplyr emmeans forcats formatters ggplot2 gridExtra gtable labeling lifecycle magrittr Rdpack rlang rtables scales survival tibble tidyr]; }; + tern = derive2 { name="tern"; version="0.9.0"; sha256="1z5xqbf81si3l0rcjgc7lygh49cm0h9irmq4q9d3a03kwlwxh080"; depends=[broom car checkmate cowplot dplyr emmeans forcats formatters ggplot2 gridExtra gtable labeling lifecycle magrittr Rdpack rlang rtables scales survival tibble tidyr]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="1.7-39"; sha256="03kc2m89236qh50qfxl1101ys466ddhgjwp80x6hjpmd9fz5jf5l"; depends=[Rcpp]; }; + terra = derive2 { name="terra"; version="1.7-55"; sha256="1v1if9ypmra02ngg4r8qg1hldmxan8lyyhgq3j969glihpyvs03h"; depends=[Rcpp]; }; terrainmeshr = derive2 { name="terrainmeshr"; version="0.1.0"; sha256="1xab6wzq2izzdvsss1rlgp5m3cn45naxhymq6cglipj0fd792jbr"; depends=[Rcpp]; }; - terrainr = derive2 { name="terrainr"; version="0.7.4"; sha256="0qgr38shvdl9c6mcrvj9h6kydfnp7wp93n2qac9za96pbij4js7d"; depends=[base64enc ggplot2 glue httr magick png rlang sf terra unifir units]; }; + terrainr = derive2 { name="terrainr"; version="0.7.5"; sha256="1bxwv94pkd4yskhqcwg891caiknipgr2lwcmy54znr8gchsm5527"; depends=[base64enc ggplot2 glue httr magick png rlang sf terra unifir units]; }; tessellation = derive2 { name="tessellation"; version="2.1.3"; sha256="0ahf48h38gdrp9cdqdrhwia2xh9b972rmmgk8r1ca1mlqkis72zc"; depends=[cxhull english hash interp R6 randomcoloR rgl Rvcg scales sets]; }; - tesselle = derive2 { name="tesselle"; version="1.2.0"; sha256="1kbz26rinxwd8h3kazdalkb32l1hl623r9f3x072j857g2x9v5my"; depends=[arkhe dimensio folio kairos khroma tabula]; }; - tesseract = derive2 { name="tesseract"; version="5.1.0"; sha256="1ynd665mbfklqahzkjfbl6ja1djybgcmc71dpg5dxxjc3ny7rbkd"; depends=[curl digest pdftools rappdirs Rcpp]; }; + tesselle = derive2 { name="tesselle"; version="1.3.0"; sha256="0lyc82jib1k1k1dg5nc0g3plcjrw05n586rakf47j4rka2pfpi70"; depends=[dimensio folio isopleuros kairos khroma tabula]; }; + tesseract = derive2 { name="tesseract"; version="5.2.0"; sha256="1wh14s66y6a56jpn8d3iqz9zs5i1lk1ffjp3p8i4iqm8rq1sm18z"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.2.1"; sha256="1llzvdggjvc72qwkv9iiqxx7prj3hnr9bqpwsib4qmfpmmxsif37"; depends=[mfp]; }; - testCompareR = derive2 { name="testCompareR"; version="1.0.0"; sha256="1kap04yh9b62iwg549p41ff26s4qz90jd4yi0v6456qg7pfb06mf"; depends=[]; }; + testCompareR = derive2 { name="testCompareR"; version="1.0.2"; sha256="1k4y7hk7f9bs0bkcmi434khfg1c0lr930l50rydvjlwdgbhfy4k1"; depends=[]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.2"; sha256="144bni3dg7bdmxnxyyal94j1nddqshgys9wfkdcc262n8y3v13i5"; depends=[]; }; testarguments = derive2 { name="testarguments"; version="0.0.1"; sha256="1x77z0pljfi6z4bs6db3zsjbpyypsd3jbd0ykh4pq07595phh8x5"; depends=[dplyr ggplot2 magrittr plyr reshape2]; }; testassay = derive2 { name="testassay"; version="0.1.1"; sha256="1gc35s5an0cpvadwx4bswy5lzcp01az3gnkjhvph6sm3pi3xjxm7"; depends=[]; }; testcorr = derive2 { name="testcorr"; version="0.2.0"; sha256="0bqhf4p4csyd430240d8gh09axpz3h108fh78sbgpyqdhiq3d1fh"; depends=[forcats ggplot2 knitr reshape2 scales]; }; - testdat = derive2 { name="testdat"; version="0.4.1"; sha256="04hp8n5741l21yfi0g2rhcjp64vkvrhvv1q9wzw214xg8v96fh66"; depends=[dplyr glue lifecycle rlang stringr testthat tidyselect]; }; - testequavar = derive2 { name="testequavar"; version="0.1.3"; sha256="1qih6a5i7982i05d6r6yxr0082psb5b7f6gznzhc4gzv4iyqr2pn"; depends=[]; }; + testdat = derive2 { name="testdat"; version="0.4.2"; sha256="0ybmw0i7pr40h720iwpzvyyr26zb7akjkwbmw6243f644yl4rr0w"; depends=[dplyr glue lifecycle rlang stringr testthat tidyselect]; }; + testequavar = derive2 { name="testequavar"; version="0.1.4"; sha256="1cz7ffcnznd7pd7f0kd9ay0ym46g2hbdv9sq5wngis2p4srf0ykj"; depends=[]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.13"; sha256="104dcxdmzgj340mwk4lpw1y6j1xc4rv4a2v09ckx3nvbmdl73m4h"; depends=[]; }; - testthat = derive2 { name="testthat"; version="3.1.10"; sha256="1xh80rxv0whz618kpwzlzg0jg2vhm4073nyx03hd4xpg0ifhhd9i"; depends=[brio callr cli desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; + testthat = derive2 { name="testthat"; version="3.2.0"; sha256="03k58p8kd7vddx7rlcyi28sy48bh3w4xy4c7wi190l7yjlrfa2sv"; depends=[brio callr cli desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; testtwice = derive2 { name="testtwice"; version="1.0.3"; sha256="06fr13ww2wqk753p0cnl1ldn3nqrvdfnz0lgkpldcn0xwiwjh2x2"; depends=[mvtnorm]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; tetragon = derive2 { name="tetragon"; version="1.3.0"; sha256="0ck7crfa63ra63pbpbq7qvn4kjkbr9wqndin4fd1b4hc8kprqqhx"; depends=[abind dqrng entropy fANCOVA fastDummies ggplot2 greybox imputeTS lubridate modeest moments narray philentropy purrr readr Rfast scales stringr tictoc]; }; tetrascatt = derive2 { name="tetrascatt"; version="0.1.0"; sha256="1bm6as0indwpfw8j2x4wavjjkkz0430hh226flg5jdzhfmg5m2aq"; depends=[Rcpp RcppArmadillo]; }; texmex = derive2 { name="texmex"; version="2.4.8"; sha256="115x7j2kvifzsrmh8zy6xymm1p01sxk4c26zdmi0p51bsgvs46ih"; depends=[ggplot2 mvtnorm Rcpp]; }; - texor = derive2 { name="texor"; version="1.0.3"; sha256="1dyfvs30p5cz7xx49p3q9lii78xrswn00xrmgrjvyahxqhx7zmsd"; depends=[logger pdftools rebib rjtools rmarkdown stringr tinytex xfun yaml]; }; + texor = derive2 { name="texor"; version="1.3.0"; sha256="12sjrxg82ynjs3s4mah5mhm011d9qmmv1s10kbna69n84j4a6vlc"; depends=[cli logger pdftools rebib rjtools rmarkdown stringr tinytex whisker xfun yaml]; }; texreg = derive2 { name="texreg"; version="1.38.6"; sha256="1z8j9whybvzjcrvivk3jhh8clfrbwdb7ss6mhqp0dlhbq2vn7gb8"; depends=[httr]; }; text = derive2 { name="text"; version="1.0"; sha256="1dhq3i9q3frmjl6p7c29g7xvkbb7bpm3sv1hy9r7glymqjqgf718"; depends=[cowplot dplyr furrr future ggplot2 ggrepel magrittr overlapping parsnip purrr recipes reticulate rlang rsample stringi tibble tidyr tune workflows yardstick]; }; - text_alignment = derive2 { name="text.alignment"; version="0.1.3"; sha256="1p2mnycz6c33jlmg617wvxj5vp4a530x2raqxxk554p3f7dqw2jx"; depends=[Rcpp]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.4"; sha256="1zw0hxrplpvn2w36q9cwm7s8hxixdin9yzkwj1fhxh5sgc7fq471"; depends=[Rcpp]; }; text2map = derive2 { name="text2map"; version="0.1.7"; sha256="1lr9bg1vbighpw2knh6bbj0f812frabzb513wc6gc209ig8yfpj3"; depends=[ClusterR doParallel dplyr fastmatch foreach igraph kit magrittr Matrix permute qgraph rlang rsvd stringi stringr text2vec tibble]; }; text2sdg = derive2 { name="text2sdg"; version="1.1.1"; sha256="133cqh9j3akqfh0m3cbi6splbmzp7plm5gxaiv2w0f0qih31f5fk"; depends=[corpustools dplyr ggplot2 lifecycle magrittr ranger stringr text2sdgData tibble tidyr]; }; text2sdgData = derive2 { name="text2sdgData"; version="0.1.1"; sha256="0wqfpkixbgmbd0i13a0vrzjnw2fj0qiyxrmd7grlyjkk1cq8i7yn"; depends=[]; }; @@ -18644,14 +18701,15 @@ in with self; { textometry = derive2 { name="textometry"; version="0.1.6"; sha256="0frxwi3n7syjgjxgzc4ync9svd25bq2zyppiyrla1n85dawi3r8f"; depends=[]; }; textplot = derive2 { name="textplot"; version="0.2.2"; sha256="1ag2h365zsx0fxbl05s2yfhf1q13p40akvbqg4qwsb5ynh2a56bf"; depends=[data_table lattice Matrix]; }; textrank = derive2 { name="textrank"; version="0.3.1"; sha256="0a777wchiax0y8jprvz5xw8h1xh7yvad0wrqhkgbqy5p3cvlcih6"; depends=[data_table digest igraph]; }; - textrecipes = derive2 { name="textrecipes"; version="1.0.3"; sha256="0b771d8qbd70mz854n0d6s7wn8jplczk0dziyz1q3fzjcnkz1cv3"; depends=[cpp11 dplyr generics glue lifecycle magrittr Matrix purrr recipes rlang SnowballC tibble tokenizers vctrs]; }; + textrecipes = derive2 { name="textrecipes"; version="1.0.5"; sha256="17cglg8zgx2fj66i8sx0njmf0h084cc178hc62f3fshlp5yl751z"; depends=[cpp11 dplyr generics glue lifecycle magrittr Matrix purrr recipes rlang SnowballC tibble tokenizers vctrs]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.5"; sha256="1mva0f6pk0kpfw0vf90qw3a25f1i3imdhk2s7hxyzans0z2237jd"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tibble tidyr]; }; textshape = derive2 { name="textshape"; version="1.7.3"; sha256="0k9injxykgj2qprc7dygd7gafvcbh3r9x84qzaa1al21pk0dz7ds"; depends=[data_table slam stringi]; }; - textshaping = derive2 { name="textshaping"; version="0.3.6"; sha256="1niaj1dh09rqrg9hrh98ddnc0f2nkyq9iizv24lcwm9gjs3w1ql0"; depends=[cpp11 systemfonts]; }; + textshaping = derive2 { name="textshaping"; version="0.3.7"; sha256="0hpcjz66ykji89g2lzpp6hfkz10388py8vn2ss08n4xl3yz4v4ps"; depends=[cpp11 systemfonts]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.3-2"; sha256="1911450yhq1f97arv96lxljjpa41kikx8gv71x39zbpwkgz2xsxh"; depends=[]; }; tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; + tfNeuralODE = derive2 { name="tfNeuralODE"; version="0.1.0"; sha256="1wspn1i5dvxly9ggbi07npv314krvb7472kx3crqalcxgjjfzfjl"; depends=[deSolve keras reticulate tensorflow]; }; tfaddons = derive2 { name="tfaddons"; version="0.10.0"; sha256="16adig97qmafval6i29pqdinsgbwjz2isajxdx1xvbf1mrawkmz0"; depends=[keras purrr reticulate rstudioapi tensorflow]; }; tfarima = derive2 { name="tfarima"; version="0.3.2"; sha256="1vql4592js9kzv3466dn57dfx19w6i573nh933v2gcnr6mlzhiga"; depends=[numDeriv Rcpp RcppArmadillo zoo]; }; tfautograph = derive2 { name="tfautograph"; version="0.3.2"; sha256="0fmaq1ggjyxgf2ss7qb8jk74sfwc3s1vc123pd5glclxcy1ib0j2"; depends=[backports reticulate]; }; @@ -18666,77 +18724,79 @@ in with self; { tfprobability = derive2 { name="tfprobability"; version="0.15.1"; sha256="0as8lciyh463x91gv290zzp9sjsrrvgcwiliyi9y5dp0qbj4505x"; depends=[keras magrittr reticulate tensorflow]; }; tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2022.3-1"; sha256="1axrvfigdmwmas0q3qlmk4m7jybqcssjgmyww2knp8jw7kp212vy"; depends=[tframe timeSeries]; }; - tfrmt = derive2 { name="tfrmt"; version="0.0.3"; sha256="1fs0s49aly8gfnahv7in22x289xa1c506mmq4cdrm7lhb8hgvmdc"; depends=[dplyr forcats ggplot2 gt jsonlite magrittr purrr rlang stringi stringr tibble tidyr tidyselect]; }; + tfrmt = derive2 { name="tfrmt"; version="0.1.0"; sha256="0jrgggb2pwnrwwkajnp8wlpzjblzr4d1vlngik5g4sbj6kmpgvvc"; depends=[dplyr forcats ggplot2 glue gt jsonlite magrittr purrr rlang stringi stringr tibble tidyr tidyselect]; }; + tfrmtbuilder = derive2 { name="tfrmtbuilder"; version="0.0.5"; sha256="0zm2z607vi8chrqcfm4yx3xic6cq7ws0r3fqy6p66nyn3h7zndbx"; depends=[bslib dplyr DT fontawesome forcats gt purrr rio rlang shiny shinyAce shinycssloaders shinyFeedback shinyjs shinyWidgets sortable stringr tfrmt tidyr webshot2]; }; tfruns = derive2 { name="tfruns"; version="1.5.1"; sha256="1xk7dl51xd1h54798xwycvxmn77jv80in61hanm36zk0024wpxg8"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; }; tgamtheme = derive2 { name="tgamtheme"; version="0.1.0"; sha256="1igv6vl3vqqx8pbvj5qr21cjphpizq3b5sjss359bhw2gy747npl"; depends=[ggplot2]; }; - tgcd = derive2 { name="tgcd"; version="2.5"; sha256="1zsmard9vai0m4gz5mf5b9qqv6i7h5xhv1mbs2sc0kcznk28jirn"; depends=[]; }; + tgcd = derive2 { name="tgcd"; version="2.7"; sha256="0ncd642yamwg4xgwrzavfral0gwkk0zlffw4w4ixw0yn0f7d7vv9"; depends=[]; }; tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; }; - tglkmeans = derive2 { name="tglkmeans"; version="0.3.10"; sha256="1zjlllmgb4i2afmr29yq8svjlx5jlb87j18l5hy6wmr025c8njic"; depends=[doFuture dplyr future ggplot2 magrittr plyr purrr Rcpp tgstat tibble]; }; + tglkmeans = derive2 { name="tglkmeans"; version="0.3.11"; sha256="036b4f3qns6av2pmldd7dkkcrlxbdfdmlc6mx2yvbcwfzg0qfhcn"; depends=[doFuture dplyr future ggplot2 magrittr plyr purrr Rcpp tgstat tibble]; }; tgp = derive2 { name="tgp"; version="2.4-21"; sha256="12ifd7rm3wskhbpnhfvz92z3graxzryq0iy1jiqmdk6bvhxkiww8"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; }; tgstat = derive2 { name="tgstat"; version="2.3.24"; sha256="0czd3j7z30jgb03813s0jc0701ypnwpkkq7var6n6f6cj7sdvc0l"; depends=[]; }; tgver = derive2 { name="tgver"; version="0.3.0"; sha256="1kw622xcjhca7k178q3wpmjyidjifvql9xpg2ai8842qhgz14bm0"; depends=[callr geojsonsf plumber]; }; thaipdf = derive2 { name="thaipdf"; version="0.1.2"; sha256="03h03bmw6q60jc80z14k7hpli0knhfbmhns0inbz0nhvisfzmsbq"; depends=[cli fs rmarkdown]; }; + thames = derive2 { name="thames"; version="0.1.0"; sha256="1dbrnfp3li8dwqfzbhpcxydh8spfw40f8rv54hpjllh9jhlpzvis"; depends=[uniformly]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; - theft = derive2 { name="theft"; version="0.5.1"; sha256="032k8h4zp1hdi6hg1bf964q4i7zyd1k5ijdkifd82dcfrbhz376a"; depends=[broom dplyr e1071 fabletools feasts ggplot2 janitor purrr R_matlab Rcatch22 reshape2 reticulate rlang Rtsne scales tibble tidyr tsfeatures tsibble]; }; + theft = derive2 { name="theft"; version="0.5.4.1"; sha256="0knm636wx8ljdacd7cb4ny450pkh79lxx09vnpssbz4x0hgm9j64"; depends=[broom dplyr e1071 fabletools feasts ggplot2 janitor purrr R_matlab Rcatch22 reshape2 reticulate rlang Rtsne scales tibble tidyr tsfeatures tsibble]; }; theiaR = derive2 { name="theiaR"; version="0.4.0"; sha256="07m532r67cil2ya2w9lfhycrm8n0ga0r3x7jwbp5jbd83hw4l1p6"; depends=[askpass httr R6 raster XML]; }; - thematic = derive2 { name="thematic"; version="0.1.2.1"; sha256="1hr9373256n1rya3l2z2sqwfifypsh6wrs2s27aqchh9sm0blkmy"; depends=[farver ggplot2 rappdirs rlang rstudioapi scales]; }; - themis = derive2 { name="themis"; version="1.0.1"; sha256="0mnhqcaxlidakfm9y8vyqscx0w9fk6j9mwcdb9l3bi5c1pqy5g81"; depends=[dplyr generics glue gower hardhat lifecycle purrr RANN recipes rlang ROSE tibble withr]; }; + thematic = derive2 { name="thematic"; version="0.1.3"; sha256="01i3qxqil7a1r0cim5whs0glmpkhwgzxn2jc5m0acgrfk9z9rwpf"; depends=[farver ggplot2 rappdirs rlang rstudioapi scales]; }; + themis = derive2 { name="themis"; version="1.0.2"; sha256="1qg1kxax866s84rgjlp2c153793j45lrvay8bqfjnc2cj04h2dgi"; depends=[dplyr generics glue gower hardhat lifecycle purrr RANN recipes rlang ROSE tibble vctrs withr]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; thestats = derive2 { name="thestats"; version="0.1.0"; sha256="15y6ibw7i4nrm8990yirqf64gl1x4l7lj3ajk19vi6ccxw82x2gl"; depends=[dplyr]; }; thewitcher = derive2 { name="thewitcher"; version="1.0.1"; sha256="140f0insb5gqrfdaq5cnzj6bl0akbif57jnyy7ai3rb2rwy9n2nv"; depends=[dplyr ggplot2 gridExtra magrittr MASS readr tidyverse usethis]; }; thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.16"; sha256="104n4g70fk209b721qchrbv95dwxzq6vvhz36asdk40kzzacdzp2"; depends=[assertthat cli devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr withr]; }; - this_path = derive2 { name="this.path"; version="2.0.0"; sha256="19rcrnfr59gaxlrqbakn8d1qcsx7k6zd7vadw0579sbmbmzwm2k0"; depends=[]; }; + this_path = derive2 { name="this.path"; version="2.1.0"; sha256="1qq1la2725m5kgbwizhh62a06ywlh9qgsygh5f9zv1v5fxksxi9y"; depends=[]; }; thor = derive2 { name="thor"; version="1.1.4"; sha256="0y75lnmjdcjxca3a0h9a30c0cll68arbv7rbdxkla92arm3k39vx"; depends=[R6 storr]; }; thorn = derive2 { name="thorn"; version="0.2.0"; sha256="0sybjqwv9al5khkhhc7khbgr7n2vy6aggarh9n75mxpa8hn7j2qr"; depends=[htmlwidgets]; }; - thredds = derive2 { name="thredds"; version="0.1-3"; sha256="08jlvi0z0rdqc46pgzpv84x0r8qxpvnh2w34g1hyprgcwh0b7537"; depends=[httr magrittr R6 rlang xml2]; }; + thredds = derive2 { name="thredds"; version="0.1-4"; sha256="1323hgd7id4q1g88bczvnghdlb3g2vmywhij0f98ghj0a0ip6v00"; depends=[httr magrittr R6 rlang xml2]; }; threeBrain = derive2 { name="threeBrain"; version="1.0.1"; sha256="0pg5azxjqvwjl6235f0vnic04rz8vvaski0ac17mjn5ny1l0qnc1"; depends=[digest dipsaus freesurferformats gifti htmlwidgets jsonlite oro_nifti R6 ravetools servr shiny stringr xml2]; }; threejs = derive2 { name="threejs"; version="0.3.3"; sha256="1711h351nzxfkbbdwvfzyhciyvi9c6wx3jq1g97lzcqgnb45kivn"; depends=[base64enc crosstalk htmlwidgets igraph]; }; threesixtygiving = derive2 { name="threesixtygiving"; version="0.2.2"; sha256="0fnysgyq4gf23vqxwnzwb3f1cv1v1b2cb6z0kywb17mr57cbg7pv"; depends=[anytime curl dplyr httr janitor jsonlite purrr readr readxl tibble tidyr tidyselect]; }; threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; }; threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; }; thregI = derive2 { name="thregI"; version="1.0.4"; sha256="0zddd32fnfi98zwq08akkvhkg3c66sj3jii6ap8p1m9a0wg2k2k3"; depends=[Formula survival]; }; - threshr = derive2 { name="threshr"; version="1.0.3"; sha256="1vs2jfvh1pjzyfz1s4w92sw13yz2nhc28gc3iyqz8a82rrdm4mdq"; depends=[revdbayes rust]; }; + threshr = derive2 { name="threshr"; version="1.0.4"; sha256="10z0iv8rn78b9mk8sgsknnqp4g726bgw47f3cn7bgc2hg1g9f18a"; depends=[revdbayes rust]; }; thriftr = derive2 { name="thriftr"; version="1.1.7"; sha256="0qx96nd9wdmxgvlvv43q51qrqpmb98vz6hmrhlq3hp91w3g20p5a"; depends=[R6 rly stringi]; }; - thunder = derive2 { name="thunder"; version="1.1.1"; sha256="1mx68i2qjhfp94xx4mawr4vz0d4vspryiq48bryhsd36l71qzlv9"; depends=[aiRthermo curl dplyr httr Rcpp]; }; - thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.12.1"; sha256="1qac1kg441x6fx3nxlhj1w1q7b3isivw6hzy7np3g1ics3kxpw8b"; depends=[BH dplyr knitr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr]; }; + thunder = derive2 { name="thunder"; version="1.1.2"; sha256="10ii36qflc4wrvv0xgvvvbc12l3zai15njibsmlfvi8z89ai0jkl"; depends=[aiRthermo curl dplyr httr Rcpp]; }; + thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.12.3"; sha256="038d26hmhmyjwxssl4568ypjn8q28k08abz05ccddiw8ai992rw3"; depends=[BH dplyr knitr lavaan magrittr mvtnorm Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr]; }; tibble = derive2 { name="tibble"; version="3.2.1"; sha256="0c916wl19wbhncv05hjzs2vmvvbcxlswjl6i232ygmkzal62v9v5"; depends=[fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.8"; sha256="18a63vipcw95yk37r490a3a4xag59v7475bch2dizq7nqhfc5wfn"; depends=[assertthat dplyr glue hms lifecycle lubridate pillar purrr Rcpp rlang tibble vctrs zoo]; }; tibblify = derive2 { name="tibblify"; version="0.3.0"; sha256="1hir7rb0zn9cz2yjfrg17is0ryzzxfxsan0sij0c0dh9v171cp0w"; depends=[cli lifecycle purrr rlang tibble tidyselect vctrs withr]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.2"; sha256="037jbwb58mj5asf3kr6hpf3fy9c6fkinnd8hbpfb141a2jsa8pph"; depends=[]; }; - tidier = derive2 { name="tidier"; version="0.0.1"; sha256="1l6w04szx92wcmfix8p3mvazjzclvjqcdkd7n6bf8sq3cmj8n0wa"; depends=[checkmate dplyr furrr magrittr rlang slider tidyr]; }; + tidier = derive2 { name="tidier"; version="0.2.0"; sha256="0n6gzanssni5l5wmm5iqql1k2wfxg7dzq1rk3dhar7rpyxghdnf1"; depends=[checkmate dbplyr dplyr furrr magrittr rlang slider tidyr]; }; tidyAML = derive2 { name="tidyAML"; version="0.0.2"; sha256="0939wymf9k4v2nh0yr1anw5jpqpxnrq8b5c5ikdyrdk70zfpd67j"; depends=[dplyr forcats magrittr parsnip purrr rlang rsample workflows workflowsets]; }; tidyBdE = derive2 { name="tidyBdE"; version="0.3.4"; sha256="1jfkcpg42ndclkiarqh1qx2g1mk8mf7n65rbgi0liwvlv770kvy6"; depends=[dplyr ggplot2 readr scales tibble tidyr]; }; tidyCDISC = derive2 { name="tidyCDISC"; version="0.2.1"; sha256="06pri456bqmvnfna7g092ccd7lqr3bc9gdnw67d7nfz91qwnsny6"; depends=[cicerone config dplyr DT GGally ggcorrplot ggplot2 glue golem gt haven IDEAFilter plotly purrr rlang rmarkdown shiny shinyjs shinyWidgets sjlabelled stringr survival tidyr timevis tippy]; }; tidyCpp = derive2 { name="tidyCpp"; version="0.0.6"; sha256="1w6fr4q137ar6557a8x1jpmfmlsga59621jwq0sf37bnn535i4gw"; depends=[]; }; - tidyDisasters = derive2 { name="tidyDisasters"; version="0.1.1"; sha256="071hr4dmk5pq8m8b58b8zcz5kpgxnqw2l4rb2vkq1zhsrk9ynxmg"; depends=[]; }; tidyEdSurvey = derive2 { name="tidyEdSurvey"; version="0.1.2"; sha256="0m7nf7kzniwqkissfgmmdda75aiww6r5ih17h1xswr8xh7sb4q4y"; depends=[cli dplyr EdSurvey ggplot2 lifecycle rlang tidyselect]; }; - tidyEmoji = derive2 { name="tidyEmoji"; version="0.1.0"; sha256="03amap4lik63nqdznncg8ymw74avmrhci36gy8ckwwskrn9gqw93"; depends=[dplyr emoji purrr stringr tibble tidyr]; }; + tidyEmoji = derive2 { name="tidyEmoji"; version="0.1.1"; sha256="0gy178kdj5c2mdxmczhbh3wai8lk9d2fk6c8qn8fpz3mc97zlx7p"; depends=[dplyr emoji purrr stringr tibble tidyr]; }; tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.8.1"; sha256="19gpp8p3ms60qzny26vx8h7x4zl495ynrfrvf1nndhm2njbx6i4m"; depends=[circlize ComplexHeatmap dendextend dplyr lifecycle magrittr patchwork purrr RColorBrewer rlang tibble tidyr viridis]; }; tidyLPA = derive2 { name="tidyLPA"; version="1.1.0"; sha256="1lyd8cx90j49bm65330i57jyimiid75c2pvnzk7dcp6mbmglvimz"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; tidyREDCap = derive2 { name="tidyREDCap"; version="1.1.1"; sha256="1k06bnxvq5k4j005h269n5ivxn1vr2i8nkdg048q8m7vmpanwz4m"; depends=[cli dplyr janitor labelVector magrittr purrr REDCapR rlang stringr tibble tidyr tidyselect vctrs]; }; tidyRSS = derive2 { name="tidyRSS"; version="2.0.7"; sha256="1v9c4cjh2apxsk5s1qyqg5pb02l83qhlg6bj684zvdmc4fqac6zw"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble tidyselect vctrs xml2]; }; - tidySEM = derive2 { name="tidySEM"; version="0.2.4"; sha256="13zm3i54ricxrrvvz8cdbbn7lykxm20f2gi19mvqvvpri57kzhcp"; depends=[bain blavaan car dbscan future_apply ggplot2 gtable igraph lavaan Matrix MplusAutomation OpenMx progressr psych RANN]; }; + tidySEM = derive2 { name="tidySEM"; version="0.2.5"; sha256="10q1ahcg52vyzjiz94rlhhlgn0pb0cjh7avbsmdg6qha9wkfphgn"; depends=[bain blavaan car dagitty dbscan future_apply ggplot2 gtable igraph lavaan Matrix MplusAutomation nonnest2 OpenMx progressr psych RANN]; }; tidyUSDA = derive2 { name="tidyUSDA"; version="0.4.0"; sha256="0wbhrhb87zrk93b1nhll6pqhh4gpxf3x3j28m09vgzdggxhk9w5y"; depends=[checkmate crayon dplyr fuzzyjoin ggplot2 httr jsonlite magrittr sf tigris]; }; - tidybayes = derive2 { name="tidybayes"; version="3.0.4"; sha256="1gfpjcf8n3rh5g5ii3kd1msbqkq4ncixwydhmxqmaf2q7j8pfz1z"; depends=[arrayhelpers coda dplyr ggdist ggplot2 magrittr posterior rlang tibble tidyr tidyselect vctrs withr]; }; + tidybayes = derive2 { name="tidybayes"; version="3.0.6"; sha256="146vmb3sf3ld6n20bbd8lj972g6xcclmisqsmnjq99jmg3hl8q3h"; depends=[arrayhelpers cli coda dplyr ggdist ggplot2 magrittr posterior rlang tibble tidyr tidyselect vctrs withr]; }; tidybins = derive2 { name="tidybins"; version="0.1.0"; sha256="1kwwz0y1anlf1l8yl80xyiggdi8alsh0drb1529rijfk2jxlljg9"; depends=[badger ClusterR dplyr framecleaner ggplot2 janitor lubridate magrittr OneR purrr rlang rlist scales strex stringr tibble tidyselect xgboost]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; tidycat = derive2 { name="tidycat"; version="0.1.2"; sha256="1c8ib5zcz2xk7yrzh4j5q4ccv6lnw58sh2ggqn04k2wp0gcj2zcs"; depends=[dplyr forcats magrittr stringr tibble tidyr]; }; - tidycensus = derive2 { name="tidycensus"; version="1.4.4"; sha256="08vg9ayzb07ajaycf6qvjqzxjks3a16xlgd2hvx2ar0q2df4sgbw"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tidyselect tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="1.5"; sha256="1macaf6zfklbk8f5zhj6diicfbqnipg8xraclail657p1ii3pfb6"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tidyselect tigris units xml2]; }; tidycharts = derive2 { name="tidycharts"; version="0.1.3"; sha256="1clpjyvqv6xhv7n64xh411x867fnn581qckzcwn18xbbbs56k6nn"; depends=[htmlwidgets knitr lubridate magick magrittr rlang rsvg stringr testthat]; }; - tidyclust = derive2 { name="tidyclust"; version="0.1.2"; sha256="1gfqk2aap3j96fn1wpp6xz7z415x5l9a8jd9hrcm4978dg4r00r7"; depends=[cli dials dplyr flexclust foreach generics glue hardhat modelenv parsnip prettyunits Rfast rlang rsample tibble tidyr tune vctrs]; }; + tidyclust = derive2 { name="tidyclust"; version="0.2.0"; sha256="1zsy329z29j2ad413i7h24aijgqpjvl8imffq4pcqnxydwbf2z0d"; depends=[cli dials dplyr flexclust foreach generics glue hardhat modelenv parsnip prettyunits Rfast rlang rsample tibble tidyr tune vctrs]; }; tidycmprsk = derive2 { name="tidycmprsk"; version="0.2.0"; sha256="1smcjicx7xz07iagzv2a87kc9q0j2sgpnakhv7dc18zw2ndpls1q"; depends=[broom cli cmprsk dplyr ggplot2 gtsummary hardhat purrr rlang stringr survival tibble tidyr]; }; tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; }; tidycomm = derive2 { name="tidycomm"; version="0.2.1"; sha256="1h1xixa7fbijp1iifpwl689b1pz1vvpy7v4sc9wnkqgw0q31b3iy"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; }; tidycwl = derive2 { name="tidycwl"; version="1.0.7"; sha256="172qpalm4n4m39pmg9g3fzd1hhfrnay76v1wmy861vmar000xcdp"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; + tidydann = derive2 { name="tidydann"; version="0.1.0"; sha256="1kn21xx5hd0fy8lkgrfsqz3yxg8zfcpr99lwz4vfqyi624dkdn4h"; depends=[dials generics parsnip rlang tibble]; }; tidydatatutor = derive2 { name="tidydatatutor"; version="0.1.0"; sha256="0d7qr1j5ag6ikzq89xc7w9pvsbcp14r0x8ra9v4svx59bg31n94q"; depends=[clipr knitr rstudioapi]; }; tidydice = derive2 { name="tidydice"; version="1.0.0"; sha256="19qpjd4v4drn8fiqvv4ajs0q9v4lhdnqgpn27arl4dmqi6dnq1h3"; depends=[assertthat dplyr ggplot2 magrittr purrr stringr tibble tidyr]; }; tidydr = derive2 { name="tidydr"; version="0.0.5"; sha256="16vghbd4iacw3480jzf12cm37azhz7xfql5z6hzh8nin48wsawiw"; depends=[ggfun ggplot2 rlang]; }; - tidyestimate = derive2 { name="tidyestimate"; version="1.1.0"; sha256="0cwk6clah4sapbmfl5vvcv6di39azxb07z73pypnqx4gd32kk5q7"; depends=[dplyr ggplot2 ggrepel glue rlang]; }; + tidyestimate = derive2 { name="tidyestimate"; version="1.1.1"; sha256="0jsi14az84np5wr5zrqgnvy3rn9sv7v8yf7k34iacj35gdw7yx6c"; depends=[dplyr ggplot2 ggrepel glue rlang]; }; tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; tidyfit = derive2 { name="tidyfit"; version="0.6.4"; sha256="0amqzqnxkv9a6ywmyqkvyqhls1mm7kqdnysg12zjhcx1bk6wg98d"; depends=[broom crayon dials dplyr furrr magrittr MASS progressr purrr rlang rsample tibble tidyr yardstick]; }; tidyformula = derive2 { name="tidyformula"; version="0.1.0"; sha256="1sz5v8l1gpci1jzs87qgxr95nr881rz5lidlfwgfi8963kgvigvg"; depends=[dplyr purrr rlang]; }; @@ -18749,18 +18809,19 @@ in with self; { tidygeoRSS = derive2 { name="tidygeoRSS"; version="0.0.1"; sha256="0bppkwbxmm8ps1cnrhzxkzm2pbi3s5bfiwx8fcrp31x81jl61w1x"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang sf strex stringr tidyRSS xml2]; }; tidygeocoder = derive2 { name="tidygeocoder"; version="1.0.5"; sha256="1ffj8ka5miv3jnds7fdrkcqdc3m2w1ab724z9m10biky213skqka"; depends=[dplyr httr jsonlite lifecycle progress tibble]; }; tidygraph = derive2 { name="tidygraph"; version="1.2.3"; sha256="11sn8z7bwv84lqlgnqc36n14nyhv1qdfc0gcs7nmgbl34nqhd75h"; depends=[cli cpp11 dplyr igraph magrittr pillar R6 rlang tibble tidyr]; }; + tidyhte = derive2 { name="tidyhte"; version="1.0.2"; sha256="0c19b7yh09gixgicrr7x65a9vzyvzapr4pv130ysx4jksjcqvdfp"; depends=[checkmate dplyr lifecycle magrittr progress purrr R6 rlang SuperLearner tibble]; }; tidyhydat = derive2 { name="tidyhydat"; version="0.6.0"; sha256="15c54pbkm40n3i3kbmx38fkmjp9hjixdpw5ikvwjid9fzky36f1q"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyjson = derive2 { name="tidyjson"; version="0.3.2"; sha256="0znm590kpvkh8zl08saasnsi77x459640mqv0pq15gmsjnycldp6"; depends=[assertthat dplyr jsonlite magrittr purrr rlang tibble tidyr]; }; tidylda = derive2 { name="tidylda"; version="0.0.3"; sha256="1wf5z6rqffah4m6f6wrb2grr8y0wjvfncy6a2i51bk22ja9hknhc"; depends=[dplyr generics gtools Matrix mvrsquared Rcpp RcppArmadillo RcppProgress RcppThread rlang stringr tibble tidyr tidytext]; }; tidylo = derive2 { name="tidylo"; version="0.2.0"; sha256="07xnbycwrqg3cmbxx76drbjd0mx4s23vf3kihlc9rj4ajjx48z8r"; depends=[dplyr rlang]; }; tidylog = derive2 { name="tidylog"; version="1.0.2"; sha256="076am30ayc16wm3bilznxqzd5806yi7dx5m9yv4w7q90i7imsqk7"; depends=[clisymbols dplyr glue tidyr]; }; - tidymodels = derive2 { name="tidymodels"; version="1.1.0"; sha256="1gcfisvqbxkqsf83xc79cn9nz7krddcn45cza9551h4qk853g3kq"; depends=[broom cli conflicted dials dplyr ggplot2 hardhat infer modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows workflowsets yardstick]; }; + tidymodels = derive2 { name="tidymodels"; version="1.1.1"; sha256="1ilmxxmbi9czxwv8n6xajaww9047h34i9vy2dmglj7nqply8wzl0"; depends=[broom cli conflicted dials dplyr ggplot2 hardhat infer modeldata parsnip purrr recipes rlang rsample rstudioapi tibble tidyr tune workflows workflowsets yardstick]; }; tidymv = derive2 { name="tidymv"; version="3.4.2"; sha256="0jl6lhi47nz8a7crlqmrqm0cnj4gx3l06gxjvdw8p52y706a478a"; depends=[dplyr ggplot2 lifecycle magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.3.0"; sha256="0w8i8h3rr7mjxbc5zasw6zi9v95z51635pdl91ip4awgkrkyn9f3"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; tidypaleo = derive2 { name="tidypaleo"; version="0.1.3"; sha256="18z3w068q011a8xw75qm7wd6hqc358q38a5hd2lmm29p65c8mjxj"; depends=[digest dplyr ggplot2 ggstance purrr rioja rlang scales stringr styler tibble tidyr tidyselect vctrs withr]; }; tidyplus = derive2 { name="tidyplus"; version="0.0.2"; sha256="0a8wdl2jz4fijfnzph0g9a1861lvgspl5ppa2hwihrxwr4srv98g"; depends=[chk dplyr rlang stringi stringr tibble tidyr tidyselect vctrs]; }; tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; - tidyposterior = derive2 { name="tidyposterior"; version="1.0.0"; sha256="19cyyhh417i5xcchb8kq3iycaf4y7aznr7y9r004h2k2vk3svc86"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr tune vctrs workflowsets]; }; + tidyposterior = derive2 { name="tidyposterior"; version="1.0.1"; sha256="1yi0pihglp683dmfg0bn9lnb0qsl2xprj3al65v642rcfzrr7h4h"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr tune vctrs workflowsets]; }; tidypredict = derive2 { name="tidypredict"; version="0.5"; sha256="1h05gm6fwjh6v9qqi9jbislf008h7d50k003qymb0x9gz6p75qgy"; depends=[dplyr generics knitr purrr rlang tibble tidyr]; }; tidyquant = derive2 { name="tidyquant"; version="1.0.7"; sha256="1pb7d6x2b8kf16aah1n9kq4il4kp54lcvzd27r5viwdbgvk1sr4h"; depends=[alphavantager curl dplyr ggplot2 httr jsonlite lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr readxl riingo rlang stringr tibble tidyr tidyselect tidyverse timeDate timetk TTR xts]; }; tidyquery = derive2 { name="tidyquery"; version="0.2.4"; sha256="0ld48yqnfhn8j9ikadic55qwjxacp1f8bzihrfw0sh1r3kvl8yib"; depends=[dplyr lubridate queryparser rlang stringr]; }; @@ -18769,19 +18830,19 @@ in with self; { tidyrgee = derive2 { name="tidyrgee"; version="0.1.0"; sha256="0sdjbl4ivjrppg215j1wpcyjlbhn0g7z9cpljvqkwq3mb1abhdfd"; depends=[assertthat crayon dplyr glue lubridate purrr readr reticulate rgee rlang sf stringr tidyr]; }; tidyrules = derive2 { name="tidyrules"; version="0.1.5"; sha256="04y6pnrp132sckjpp9g8yl0z7glcsx9dcfdpa8r27wsc2g491i63"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; tidyselect = derive2 { name="tidyselect"; version="1.2.0"; sha256="0fwy4qp3j0ksy15rkrh3588h7wa8c21h0fzx5s762zg34yvjd3ak"; depends=[cli glue lifecycle rlang vctrs withr]; }; - tidyseurat = derive2 { name="tidyseurat"; version="0.6.1"; sha256="1m7abq60ghvxzv9aflvq9j6q231z17n5kr3cj6yg0prz8iykhjqz"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr Matrix pillar plotly purrr rlang Seurat SeuratObject stringr tibble tidyr tidyselect ttservice vctrs]; }; + tidyseurat = derive2 { name="tidyseurat"; version="0.7.4"; sha256="1mpb57xsaia9gdjnm8gy4kcpfdxrmw5xm0af15mzd96pg39918pm"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr Matrix pillar plotly purrr rlang Seurat SeuratObject stringr tibble tidyr tidyselect ttservice vctrs]; }; tidysmd = derive2 { name="tidysmd"; version="0.2.0"; sha256="1sbn4x59wdshc0xhxycvkf6ssm3w3pgfl64r8s3m77piara2i0dm"; depends=[dplyr purrr rlang smd tidyr tidyselect]; }; tidysq = derive2 { name="tidysq"; version="1.1.3"; sha256="1k4ws5zymrc93rlh8118xxfgjdwr7g99cyhzjp34abcsip1c3g21"; depends=[checkmate cli crayon dplyr pillar Rcpp testthat tibble vctrs]; }; - tidystats = derive2 { name="tidystats"; version="0.5.2"; sha256="1y4jf1rvj8k256shiy2zb68vmvla8sxjr2ynnys5mw2i4ap326kj"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; }; + tidystats = derive2 { name="tidystats"; version="0.6.0"; sha256="1hlybkzx940nrl9pgvcdvvz95kn4pn6y8dpamj91fjx41blyjcsp"; depends=[checkmate dplyr jsonlite purrr readr stringr tibble tidyr]; }; tidystopwords = derive2 { name="tidystopwords"; version="0.9.1"; sha256="00kak679ddwdgvqmjs5312w9k8sapc1n7dxipgqqfjqw2xy0h1jh"; depends=[dplyr]; }; tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; tidysynth = derive2 { name="tidysynth"; version="0.2.0"; sha256="1arvjv3w6my47xwrzxrnpb2npskhqb9xmqhszgrxcqa55s1x6p15"; depends=[dplyr forcats ggplot2 kernlab magrittr optimx rgenoud rlang tibble tidyr]; }; - tidytable = derive2 { name="tidytable"; version="0.10.1"; sha256="1szyzfh0679i3q87j9c2bdsal6lg7fpis5jwasqvgig8zyi20ild"; depends=[data_table glue lifecycle magrittr pillar rlang tidyselect vctrs]; }; + tidytable = derive2 { name="tidytable"; version="0.10.2"; sha256="1jl89sbsn5xzb6khrhq1kk84mvnqd2lpiyvsiq6kl6i0lwxpjicn"; depends=[data_table glue lifecycle magrittr pillar rlang tidyselect vctrs]; }; tidytags = derive2 { name="tidytags"; version="1.1.1"; sha256="0x4gv6k9ccs9r6s73xsk25ixwgmz5818s6jpndg0yqczybw3y5dm"; depends=[dplyr googlesheets4 rlang rtweet stringr]; }; tidyterra = derive2 { name="tidyterra"; version="0.4.0"; sha256="02d6cz7w4vj2zsyrzmmv0wcdrlnp9564yk0qiiwl68hl6zrfb15y"; depends=[cli data_table dplyr ggplot2 magrittr rlang scales sf terra tibble tidyr]; }; tidytext = derive2 { name="tidytext"; version="0.4.1"; sha256="05f8209qx1rvddnkl0h05yig09xahs8lqgq9w5dvdiwarji50rsj"; depends=[cli dplyr generics janeaustenr lifecycle Matrix purrr rlang stringr tibble tokenizers vctrs]; }; tidytidbits = derive2 { name="tidytidbits"; version="0.3.2"; sha256="1zbm165bimjag7azhy77zlzqilygybqxz35q4r3d7hi7p6m96w78"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - tidytlg = derive2 { name="tidytlg"; version="0.1.2"; sha256="0wy6pn5iq4xzm0fjr96wikiyz0f4s1bplxi78rdd9bkcynijzs8l"; depends=[assertthat cellranger crayon dplyr forcats ggplot2 glue huxtable magrittr png purrr readxl rlang rstudioapi stringr tibble tidyr tidyselect usethis]; }; + tidytlg = derive2 { name="tidytlg"; version="0.1.4"; sha256="0di871am8zplavhkh2kjqazc3nv3cn5dzzff0sgj4hxwhfla1f12"; depends=[assertthat cellranger crayon dplyr forcats ggplot2 glue huxtable magrittr png purrr readxl rlang rstudioapi stringr tibble tidyr tidyselect usethis]; }; tidytransit = derive2 { name="tidytransit"; version="1.6.0"; sha256="0x3p5vcyj9mzcl7hbnmzwwbbxc8wih7lf0s35i704fj6kbv9rc47"; depends=[data_table digest dplyr geodist gtfsio hms rlang sf]; }; tidytreatment = derive2 { name="tidytreatment"; version="0.2.2"; sha256="04z3afharkqyjk5kk097kpqlrmvq5220bsdlzmbzwl5k56vgxgxx"; depends=[dplyr purrr readr rlang tidybayes tidyr]; }; tidytree = derive2 { name="tidytree"; version="0.4.5"; sha256="0wllr18ip4vc37pr3qni1vbn68jj6iz5gh1vxdi24438y1gqww6j"; depends=[ape cli dplyr lazyeval magrittr pillar rlang tibble tidyr tidyselect yulab_utils]; }; @@ -18792,17 +18853,18 @@ in with self; { tidyxl = derive2 { name="tidyxl"; version="1.0.8"; sha256="05hkjwlv88ln0psqk5r8p2i4j6g3c3yfw2wmm73wcylcv33lh79h"; depends=[piton Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-11"; sha256="0xgc7vyndxxahfhc2qqzmwi56bnfyl0pn72l820jz5sd24aymhxq"; depends=[]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; + tigers = derive2 { name="tigers"; version="0.1-1"; sha256="1skwg878zwi1j2k70m0m9njq8zpj799y4526kvqmd17xin5yxggk"; depends=[]; }; tigerstats = derive2 { name="tigerstats"; version="0.3.2"; sha256="0p5z4qh0aznj03rnhk4lpqfkwnsa5zgvj51rddkzligg9zx73xwl"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData rlang]; }; - tigger = derive2 { name="tigger"; version="1.0.1"; sha256="130iwg2ds4j56a9ndg1p7qv4s6qbbahmm9fwmy6iak02ds1r0zyl"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang stringi tidyr]; }; + tigger = derive2 { name="tigger"; version="1.1.0"; sha256="02q5ggyl4iy4xx07v0mikf9hkbac0iwbd02rkzafrgjbxfm8mvfa"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang stringi tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="2.0.3"; sha256="1kk1dbg6fs711bg5v6p97rbmvffxfhyc1vkmvpnh51ffkmd2hihv"; depends=[dplyr httr magrittr rappdirs sf stringr uuid]; }; + tigris = derive2 { name="tigris"; version="2.0.4"; sha256="1jhz18ysr26fgm89ky39fqiaxx7spadysishyaml5f2pbam13r27"; depends=[dplyr httr magrittr rappdirs sf stringr uuid]; }; tiktokadsR = derive2 { name="tiktokadsR"; version="0.1.0"; sha256="17x6nxp88iji376qhvvkgxyfcbxz9bvfgv9kmhiznlhq64srdjfs"; depends=[jsonlite]; }; - tikzDevice = derive2 { name="tikzDevice"; version="0.12.4"; sha256="1x9nns15g2f6062grdvzy8sfj460xvsqyiyr3ylc0z425s0jj85c"; depends=[filehash png]; }; - tiledb = derive2 { name="tiledb"; version="0.20.3"; sha256="1sxq6cpyicxyszryqzhwq2w6iyzmgjn8qifxp3nj4v3f7hdcid0l"; depends=[nanotime Rcpp spdl]; }; + tikzDevice = derive2 { name="tikzDevice"; version="0.12.5"; sha256="1v2swv6xs8vijwkqd5cjc3s4hyigj7qa31h31wmnrd5yplshq1kx"; depends=[filehash png]; }; + tiledb = derive2 { name="tiledb"; version="0.21.1"; sha256="0s7m7n41a78n8pgcqdk9zal87212p0f1m79dfwrjrp6i125s5zwm"; depends=[nanotime Rcpp RcppInt64 spdl]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tilemaps = derive2 { name="tilemaps"; version="0.2.0"; sha256="06pwwlndb7nvw2b0h0fak3vnpbi11mxsby43qm9ng3k3sqwrqjz2"; depends=[clue ggplot2 igraph lwgeom sf smoothr]; }; - tiler = derive2 { name="tiler"; version="0.3.0"; sha256="0rfwl4djqhs55faan7fyq7q0pm93va6xvs2z2sarkmqaqixrg31c"; depends=[png raster sp]; }; + tiler = derive2 { name="tiler"; version="0.3.1"; sha256="09xxfkbgjd9x27fjkbk1ady7sxz9lqkmaw5027xgakn65g9vmssz"; depends=[png raster sp]; }; tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; }; timbeR = derive2 { name="timbeR"; version="2.0.1"; sha256="01lpx4pk22k9j4sbbhr9z7r6spfdrfazpxsyp7cxndrswa8m83zq"; depends=[cowplot dplyr ggplot2 magrittr miniUI shiny tibble tidyr]; }; timbr = derive2 { name="timbr"; version="0.2.2"; sha256="1bz368s1iryxrrxsvq2sbzlm2cnrfqxafzvbsgm6smb3skwyp3sb"; depends=[cli dplyr lifecycle memoise pillar purrr rlang tibble tidygraph vctrs]; }; @@ -18812,40 +18874,42 @@ in with self; { timeR = derive2 { name="timeR"; version="1.2.0"; sha256="0lkx2ilbzq29w1c9ssya4f0za0sj7y30y9ml4v3zc21c1la0b6vi"; depends=[lubridate R6]; }; timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; }; - timeSeries = derive2 { name="timeSeries"; version="4030.106"; sha256="1sh31brmvfxvlxh2qyk3qrsqw6w3bykh7dd6m35d24gfl0qqxxr5"; depends=[timeDate]; }; + timeSeries = derive2 { name="timeSeries"; version="4031.107"; sha256="0hmmv8ml2ryw1zkbk55f85ml664as8l0qksj9h1335zn58s6lf44"; depends=[timeDate]; }; timechange = derive2 { name="timechange"; version="0.2.0"; sha256="1wgpab9dvmvkfb1p1arj0knb8qal9hazbhx5jkpxl8r10l420q1x"; depends=[cpp11]; }; timedelay = derive2 { name="timedelay"; version="1.0.11"; sha256="0hr5a2m621ybvl4qyx1xgwzviszj4ccvb149yclds9z87r5h2gm4"; depends=[MASS mvtnorm]; }; - timedeppar = derive2 { name="timedeppar"; version="1.0.2"; sha256="0jazddjqrgipvpdxlqh8y3clhhad22syqw4hhaj19cdbxpvivgvw"; depends=[mvtnorm]; }; + timedeppar = derive2 { name="timedeppar"; version="1.0.3"; sha256="0cg3akp5clyh0jm2808n4glmvfb8pjfsrpiw8724q7zsx3mfhgff"; depends=[mvtnorm]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; - timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; + timeordered = derive2 { name="timeordered"; version="1.0.0"; sha256="0gcf2mvqzqrqxf7qqfhvxb42y32vxaz5nc29vnyig1lh6bnywkhq"; depends=[igraph plyr]; }; timeperiodsR = derive2 { name="timeperiodsR"; version="0.7.1"; sha256="0fb9xwpdg38nnghjarlp2svjs225ng3h8p7vxnsy7rh0g3qck450"; depends=[lubridate]; }; + timeplyr = derive2 { name="timeplyr"; version="0.2.0"; sha256="1pdvs21c3bqpyrks6smdlxmg92n04csnja7kbg6w3fyvxkifj2fq"; depends=[collapse data_table dplyr ggplot2 lubridate pillar Rcpp rlang stringr tidyselect timechange vctrs]; }; timereg = derive2 { name="timereg"; version="2.0.5"; sha256="1vzphh7hfkc65r61wms1dh58i3ng7340whqkw947yb4nyvmdvld0"; depends=[lava numDeriv survival]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="1.0.0-1.1.2"; sha256="17j1nxpgbfbzmfc6zrgcw68ri9ncslic9qdkxkdpfr2gi1w61bpc"; depends=[data_table DBI jsonlite RPostgres xts]; }; - timetk = derive2 { name="timetk"; version="2.8.3"; sha256="1ad5qba68am81pmlbkbp6baq0aicikabnyqv4sijcql567vya8iy"; depends=[anytime assertthat dplyr forcats forecast generics ggplot2 hms lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate tsfeatures xts zoo]; }; - timetools = derive2 { name="timetools"; version="1.15.2"; sha256="0d861nsq5xh9gnzvf3alzk6yjk8afxf3a7z39c1rrprfhwqxmxgx"; depends=[]; }; + timetk = derive2 { name="timetk"; version="2.8.4"; sha256="1ww5nhyvb4ysv0pbbhx8hlalm631gfyv2dvgz4f8f1926h6zy3k6"; depends=[anytime assertthat dplyr forcats forecast generics ggplot2 hms lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidymodels tidyr tidyselect timeDate timeSeries tsfeatures xts zoo]; }; + timetools = derive2 { name="timetools"; version="1.15.3"; sha256="0bhipgygbb76m4byl58ndbjqj88rxbwrar0dmgw842f1yp867bc5"; depends=[]; }; timevis = derive2 { name="timevis"; version="2.1.0"; sha256="16b2iwf1lrw5b8am8c5xqkyg6inwac09qgbp0yigf3isd3qqs829"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; }; - timsac = derive2 { name="timsac"; version="1.3.8-2"; sha256="11hmh469db5hgzyjf5i0igzr8j1dg340ybl0q1wzxhwz6ha256ab"; depends=[]; }; + timsac = derive2 { name="timsac"; version="1.3.8-4"; sha256="0gmqncz114gar0j7lahvcsasmdva2dbl2ka420hlf63f51c2dkjk"; depends=[]; }; tinkr = derive2 { name="tinkr"; version="0.2.0"; sha256="068ym4a0gwayd6a86zq6428j8gkmvxgm7hk0crbjp0lp9cz85dzq"; depends=[commonmark glue magrittr purrr R6 xml2 xslt yaml]; }; tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; }; tint = derive2 { name="tint"; version="0.1.4"; sha256="1vkdgxxgcj3qk3858sp3zi7c2id3dq0zxz23xd4i8lgbqgvvh2s3"; depends=[htmltools knitr rmarkdown]; }; tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; - tinyarray = derive2 { name="tinyarray"; version="2.3.0"; sha256="0q3j0ipv2ds9zfp15czl82p76qrxd0irwbjvz0jqdzivrkqcn231"; depends=[BiocManager clusterProfiler dplyr ggplot2 limma magrittr org_Hs_eg_db patchwork pheatmap stringr survival survminer tibble]; }; - tinylabels = derive2 { name="tinylabels"; version="0.2.3"; sha256="0knqcdnlrydbfklizvx9mp304sjz6wp54nbx1zhy2g2730nwa61k"; depends=[]; }; + tinyarray = derive2 { name="tinyarray"; version="2.3.1"; sha256="1cwywxz0ndaw6vpgs89ywya6p00q5ngchm5aky8nhqvjipmibsk8"; depends=[BiocManager clusterProfiler dplyr ggplot2 limma patchwork pheatmap stringr survival survminer tibble]; }; + tinycodet = derive2 { name="tinycodet"; version="0.1.0.6"; sha256="0458kjvmid6cjj83srb81agwmq4vcd2r4pfnpdpkvvw3n0bbc698"; depends=[stringi]; }; + tinylabels = derive2 { name="tinylabels"; version="0.2.4"; sha256="01pvnirma3wzfqnnz8zvyqajjyysjm3sd6813bgdhz199lcg7hhz"; depends=[]; }; tinyscholar = derive2 { name="tinyscholar"; version="0.1.7"; sha256="0cd9xbm1gk0v241fqa42hly40vkqb6hcvi8jp9iqq8sgmrs33adh"; depends=[curl dplyr ggplot2 gt jsonlite magrittr purrr R_utils rlang rvest stringr xml2]; }; tinysnapshot = derive2 { name="tinysnapshot"; version="0.0.3"; sha256="1f8j5v9j3n6nv9lsp05jfjq8hph91lx61vbqmw7iizqcwgqfhxbx"; depends=[diffobj magick tinytest]; }; tinyspotifyr = derive2 { name="tinyspotifyr"; version="0.2.2"; sha256="19nicp1ml73lylja2np52rcc070maxm9286fjm7bfx3zsblxmakc"; depends=[httr jsonlite]; }; tinytest = derive2 { name="tinytest"; version="1.4.1"; sha256="0x0w1fiqd98vmpz8yrp9ig0ry1wfr16g6bkjzd2a8sq9gn417z7n"; depends=[]; }; tinytest2JUnit = derive2 { name="tinytest2JUnit"; version="1.0.1"; sha256="0m49plrxp2cglj2h37kfr2wknspxdzv4331vcxjf27hm8wk17wwq"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.46"; sha256="00q21bx3vgsxqdfk372cxdcvfmbza2yplzfhr1hd5mad4f4qx30b"; depends=[xfun]; }; - tinytiger = derive2 { name="tinytiger"; version="0.0.4"; sha256="17j5lxlbg6jyw5zpbgaxjhnydiiyrl2d010s5wq8p7jx16sji0w1"; depends=[cli curl glue rlang sf]; }; + tinytex = derive2 { name="tinytex"; version="0.48"; sha256="15bnb4fxdzapgj9ws3rfbcxwdzwbq8h5yy4d1db0m9c1lygrh2qx"; depends=[xfun]; }; + tinytiger = derive2 { name="tinytiger"; version="0.0.8"; sha256="1ixbq9qfv0jlwqca8anng2z9dykpsv46vyrkc7p82a55mx1x8vbg"; depends=[cli curl glue rlang sf]; }; tip = derive2 { name="tip"; version="0.1.0"; sha256="11khhkszd5a81q0h6acx5rvp1k97qj1srcvz2jilwf3v6nrz7daz"; depends=[changepoint doParallel foreach GGally ggplot2 igraph LaplacesDemon mniw network rlang]; }; - tipa = derive2 { name="tipa"; version="1.0.5"; sha256="1mdjpbdbgd5n22l7fc0bfansh536ib1bgjaxzrl8g534cjxdnhgl"; depends=[optimr]; }; + tipa = derive2 { name="tipa"; version="1.0.8"; sha256="0w637cmg82h758kayf17z70kls7gs1h44b1ridd311j0yz4f5x6a"; depends=[optimx]; }; tipitaka = derive2 { name="tipitaka"; version="0.1.2"; sha256="0xf64bpzwywwjm0135c7zjn4ha0h1zj36rj2d4h8dskiq9z90xqi"; depends=[cpp11 dplyr magrittr stringi stringr]; }; - tipmap = derive2 { name="tipmap"; version="0.4.2"; sha256="13m9v6bf0c57791rbf0g5ln0k9yrddvqgmahmmiaajpz6pr0m3k0"; depends=[dplyr ggplot2 purrr RBesT]; }; + tipmap = derive2 { name="tipmap"; version="0.5.2"; sha256="11wznnhv1jf0g72ahdcxvxm4n3kpdbx6ivdx9cb0c5gdyjh482ss"; depends=[assertthat dplyr furrr future ggplot2 magrittr purrr RBesT]; }; tippy = derive2 { name="tippy"; version="0.1.0"; sha256="00c9v07ax7l0x5wpx3ca8hqvdqs3p62d58igp51rsbh9x1ylgjcn"; depends=[htmltools htmlwidgets jsonlite shiny]; }; tipr = derive2 { name="tipr"; version="1.0.1"; sha256="0lx6s0yiyl26gn49xlydyl49b7qb3rl94lahlcyhryayp8sns2ni"; depends=[glue purrr sensemakr tibble]; }; - tipsae = derive2 { name="tipsae"; version="0.0.17"; sha256="0g1s69kb735laj7lfsnsai2wk8sxk8m9sx6a5s7s2wzwpapcbh71"; depends=[BH ggplot2 ggpubr nlme Rcpp RcppEigen RcppParallel Rdpack rstan shiny sp StanHeaders]; }; + tipsae = derive2 { name="tipsae"; version="0.0.18"; sha256="0w7ig4p23zgsn8q95cx6l031yz8kd1dk8jmzw5sf7b2b5snxlhvd"; depends=[BH ggplot2 ggpubr nlme Rcpp RcppEigen RcppParallel Rdpack rstan shiny sp StanHeaders]; }; tis = derive2 { name="tis"; version="1.39"; sha256="1sq3acz8mybsbxng5fga4ynqvh1ly9hs3ca727jiyx1gam712mis"; depends=[]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; @@ -18867,11 +18931,11 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.1"; sha256="0c094z83mcq8blc8w7kvy91d28qqcx6f6193p3frpviznlaq21xk"; depends=[ISOcodes NLP tm xml2]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-2"; sha256="03d0y19yn4akkcjlyc17rb2r9nv8rfnqx1l8i5gp07w5s8czvfxf"; depends=[NLP tm]; }; tm1r = derive2 { name="tm1r"; version="1.1.8"; sha256="15w703rd7mfm32b62yv9mpms2fjq9ifmc1n460vsrpqz1dkiavb9"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="3.3-3"; sha256="012y50hbz2f87mwcmd9lp9ikcplvkz51g4fmanw3swlc1zpqxrb0"; depends=[abind classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; }; + tmap = derive2 { name="tmap"; version="3.3-4"; sha256="1xxa9ya1gci4ys5z00v95kp39rq12vd8kppj8j8n1a913kbbqrn9"; depends=[abind classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; }; tmaptools = derive2 { name="tmaptools"; version="3.1-1"; sha256="0bal3czrdr93qig8s5cf5szld5vjbbks67rismfhlkmlgw6wp2gx"; depends=[dichromat lwgeom magrittr RColorBrewer sf stars units viridisLite XML]; }; - tmbstan = derive2 { name="tmbstan"; version="1.0.9"; sha256="19k73j6i4ki4xdxh7whp09p94rqrpsn5dpr7ms9fqn7sv0xap7y1"; depends=[BH Rcpp RcppEigen RcppParallel rstan StanHeaders TMB]; }; + tmbstan = derive2 { name="tmbstan"; version="1.0.91"; sha256="0wsa1999iaxzzbh27xmw8qfka1hzfi81kf6p3zlhfq8299vrg4py"; depends=[BH Rcpp RcppEigen RcppParallel rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; - tmle = derive2 { name="tmle"; version="1.5.0.2"; sha256="1m1zz48cp8agxswgrwvvzdh50kyyc84hw328nyhbbnfkx19c6wj7"; depends=[glmnet SuperLearner]; }; + tmle = derive2 { name="tmle"; version="2.0.0"; sha256="19rgp2m793zs8wd97c0fmjqj1mvq608xj8nm4w12c9nl8nvwm4w6"; depends=[glmnet SuperLearner]; }; tmod = derive2 { name="tmod"; version="0.50.13"; sha256="160aibvkz4ilyaig3bvkam6g96cngaynwsfrzh6vpq9xyraqxpix"; depends=[beeswarm ggplot2 ggrepel gplots pheatmap plotwidgets purrr RColorBrewer rlang tagcloud tibble tidyr tidyselect XML]; }; tmplate = derive2 { name="tmplate"; version="0.0.3"; sha256="1w04bmir23ip3c7janix8i2qhdnmlg78jrrjlykl95vnsvjwld6g"; depends=[tRnslate]; }; tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; @@ -18886,10 +18950,10 @@ in with self; { toastui = derive2 { name="toastui"; version="0.3.0"; sha256="1v535ml9m9sz2pviv3983lnini147rfsz56s4hfnq2ydb9f1vmay"; depends=[htmltools htmlwidgets magrittr phosphoricons rlang shiny shinyWidgets]; }; todor = derive2 { name="todor"; version="0.1.2"; sha256="1ncg88wh9l2mja5w53ry2b19sa5x9m6cnkvw8lszbmc92idpspig"; depends=[R_utils rex rstudioapi stringr]; }; togglr = derive2 { name="togglr"; version="0.1.99"; sha256="0cvlsza4jbh14knq4if8r5r4xvj1pzwa66i14g8h3qc89m4nvckr"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr memoise parsedate prettyunits purrr rstudioapi]; }; - tok = derive2 { name="tok"; version="0.1.0"; sha256="0c6zgaf78sibg46vdxgdyyxk9fijpmvwa3481kzph4dmxsfxlpw2"; depends=[cli R6]; }; + tok = derive2 { name="tok"; version="0.1.1"; sha256="1rbn5b6gc5qx8d8rggxbvcs2phrdxj9r72sl6l75vpn4hh4ffpi6"; depends=[cli R6]; }; tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.5"; sha256="17hbkcan74j4fkk4j1xcgikaanp3xhs5njjxkapg2yjdhmf2dng6"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.3.0"; sha256="0a8wm4cff3hrll991h2rimw79kpf2jsn78y7yksdk8m18931wmr4"; depends=[Rcpp SnowballC stringi]; }; - tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.1"; sha256="1d382pimyv4mdg2wsv5jzxgq3rhhxjrlv2kbqkqnbr2y5djz3xhv"; depends=[Rcpp]; }; + tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.3"; sha256="0ar84a19c2qafdyx666ggbvl0sqv3pxg3yg3qpv59s7cbbdymwc1"; depends=[Rcpp]; }; tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; tomba = derive2 { name="tomba"; version="1.0.1"; sha256="1433jxghx8jrgy8r9kfp506vn58qpzp4wbzncks7fnignbb6cp50"; depends=[httr jsonlite testthat]; }; tongfen = derive2 { name="tongfen"; version="0.3.5"; sha256="1xg5jvrl4cv86rylhyiyfdyhb9gr5vdabsp1cdfnz7wpmdkpwnxl"; depends=[dplyr lifecycle purrr readr rlang sf stringr tibble tidyr]; }; @@ -18904,9 +18968,9 @@ in with self; { topicmodels_etm = derive2 { name="topicmodels.etm"; version="0.1.0"; sha256="06w2n1gswv268sgzm0nz14mmrahibnsgcxh7hcks3bmq9r8d9ba4"; depends=[Matrix torch]; }; topmodel = derive2 { name="topmodel"; version="0.7.5"; sha256="1bhzjy2ja4953a5wx8s3cz3v0ip6lym193faqxxabxjklgbsp416"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.2"; sha256="1n6108giihc4aa1871m558s2z96m766ysvhak5b6zg1bnvpdj0l8"; depends=[gdistance plotly raster RColorBrewer scales sp]; }; - topologyGSA = derive2 { name="topologyGSA"; version="1.4.7"; sha256="073n8bkrapk6il3izqr3bmcdp7yc29yzpbyzh6fvy9rg0x4d3g0z"; depends=[fields graph gRbase qpgraph]; }; + topologyGSA = derive2 { name="topologyGSA"; version="1.5.0"; sha256="1pzyn916wllmry2gzwp6fhhcd3fjz7k4jlgsgqs3c2b2g0vqknm2"; depends=[fields graph gRbase igraph qpgraph]; }; toposort = derive2 { name="toposort"; version="1.0.0"; sha256="1k534jznd3x0kc1x37rk3148a3y2vg51gv3im8f16jpwzgqwk3l1"; depends=[glue rlang vctrs]; }; - topr = derive2 { name="topr"; version="1.1.7"; sha256="0pnwj0pq2xsdd7iydpd3ix9vxxhdm4y7zhabd8vl3xzh2y9scx5n"; depends=[dplyr egg ggplot2 ggrepel gridExtra magrittr scales stringr tidyr toprdata]; }; + topr = derive2 { name="topr"; version="1.1.10"; sha256="13gwqv7bdphpfhbm86851cnibbhrwfd7mzgyrcj4jdg36b2dqgx9"; depends=[dplyr egg ggplot2 ggrepel gridExtra magrittr scales stringr tidyr toprdata]; }; toprdata = derive2 { name="toprdata"; version="1.0.2"; sha256="1zn8w1c74nxm67xzk556zirhnfyi82wk34amy5a869a15lwchhaz"; depends=[]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; tor = derive2 { name="tor"; version="1.1.2"; sha256="1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx"; depends=[fs readr rlang tibble]; }; @@ -18919,36 +18983,37 @@ in with self; { tornado = derive2 { name="tornado"; version="0.1.2"; sha256="1fzcqpd5imhphx4cmmcjfiz38fbmhbb15bf51z6g7v51m2c3c18y"; depends=[assertthat ggplot2 gridExtra rlang scales survival]; }; tosca = derive2 { name="tosca"; version="0.3-2"; sha256="1z8svczy93lpdj7n1gk9jz8jgzkjsf886ldlkgq1mfi1j6m8557y"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; toscmask = derive2 { name="toscmask"; version="1.2.3"; sha256="1inryfbci03klv4rlkzf20f3a0sc187lxybd4yn1dimz6f5z71ni"; depends=[]; }; - toscutil = derive2 { name="toscutil"; version="2.5.0"; sha256="0mygvr5bkqy4jgnkx2ih60qp0yp1f78nigg6xk4aim9fw9312d3j"; depends=[rlang]; }; + toscutil = derive2 { name="toscutil"; version="2.7.4"; sha256="07b89f43d9dm0lyfc0fd15bv2gxqmzz3ly9gzggix04v8zxivm2i"; depends=[languageserver rlang]; }; tosr = derive2 { name="tosr"; version="0.1.3"; sha256="0fy2y7rr80q7vapyxnhlqshskir5dmfkr1sm5r4rqilnlf0cqi21"; depends=[bibliometrix dplyr igraph magrittr rebus rlang stringr tibble tidyr]; }; totalcensus = derive2 { name="totalcensus"; version="0.6.6"; sha256="09c7hm9yys48p8pjp9kv3szbwrg9xb1xf47zya24yir0gxs7bfmi"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-6"; sha256="0w25zxxj5qaxkx64vz55qw4k4szx85ncbcam7q600ryy1kc5xxxv"; depends=[Rcpp]; }; - tourr = derive2 { name="tourr"; version="1.0.0"; sha256="00n7faawhl44g11qz764lcpmxhbzrgrdypfxwg9hh4q7d6diy4pg"; depends=[dplyr MASS tibble]; }; + tourr = derive2 { name="tourr"; version="1.1.0"; sha256="1hs4f5ry8pn50c93433q4cg9ksyj78g7x4fv7p5i1qg3pjnr7rh0"; depends=[dplyr MASS tibble]; }; toweranNA = derive2 { name="toweranNA"; version="0.1.0"; sha256="1nncjhfz0fgjhvhkfy55kjr6as6qm0n1d1mj1w1z3d6304ai6863"; depends=[FNN pdist regtools rmarkdown]; }; toxEval = derive2 { name="toxEval"; version="1.3.0"; sha256="06lzxni750d5lxlnc1wc7rrfcgc4m61blfvdb1lv60npx1iji8fl"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; }; toxpiR = derive2 { name="toxpiR"; version="1.2.1"; sha256="0n6x87gyzxsib267h0gs5b4sdkwmgjpgqzipfhlrjsnxq55q6599"; depends=[BiocGenerics pryr rlang S4Vectors tidyr]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpc = derive2 { name="tpc"; version="1.0"; sha256="0zkls2vf8j1rq5ryn4w295a6gcy57vr3zghyck8jwgl9pd5zcc4x"; depends=[graph pcalg]; }; tpfp = derive2 { name="tpfp"; version="0.0.1"; sha256="0vm5qssaanvi0sck2hj1qgjra89a42i6nvzbva5z0aj2hkd5h4vh"; depends=[knitr readxl xlsx]; }; - tpn = derive2 { name="tpn"; version="1.6"; sha256="0hcq0x95sqhghpd9j6b37nw06rfc2dcs8cfyv980xx8vh31qspbd"; depends=[moments pracma skewMLRM VGAM]; }; + tpn = derive2 { name="tpn"; version="1.7"; sha256="1n172jl4pglp771kir1h8f9rynssw7qqjkvqhg98yk5vrf0x1cca"; depends=[moments pracma skewMLRM VGAM]; }; tpr = derive2 { name="tpr"; version="0.3-3"; sha256="13xi4a9pdhqyg56jcimcqxfz3zcpzyhb6y7nh73dr09w8picq6gj"; depends=[lgtdl]; }; + tqk = derive2 { name="tqk"; version="0.1.8"; sha256="1l4zsmfnpzcn34pjwzfr511qn7y03bymdak4pcysrj4s49xgx4qj"; depends=[dplyr httr jsonlite magrittr tibble]; }; tracee = derive2 { name="tracee"; version="0.0.3"; sha256="1hv4ymi1p76k2b3x4s6qs53xwda3ybkwbdpnlhfgz7fryvy483r5"; depends=[data_table flextable ggplot2 gridExtra NMdata]; }; tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; }; - tracerer = derive2 { name="tracerer"; version="2.2.2"; sha256="0932074lzkzprn8rr8f59ywhgn33fwvbnkxnxg97k29gapx49iyb"; depends=[jsonlite Rcpp testit]; }; + tracerer = derive2 { name="tracerer"; version="2.2.3"; sha256="0jqf0p0j0g4naspgg9k7jxslwcdqwv7mxca41wyffrgglgya8rci"; depends=[jsonlite Rcpp testit]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; - track2KBA = derive2 { name="track2KBA"; version="1.1.0"; sha256="19vmxcnf1qhkpnfz5k6db5zlmiqf71szfbjxbi3mm94zbnswvv6i"; depends=[adehabitatHR dplyr foreach geosphere ggplot2 lubridate magrittr maps Matching move purrr raster rgdal rgeos rlang sf sp tidyr]; }; + track2KBA = derive2 { name="track2KBA"; version="1.1.1"; sha256="0lhx18vilxlac3z9vrwjcxjvinkdpp1njkvg82dyz1sqby3fa9f8"; depends=[adehabitatHR dplyr foreach geosphere ggplot2 lubridate magrittr maps Matching move purrr raster rlang sf sp tidyr]; }; trackdem = derive2 { name="trackdem"; version="0.6"; sha256="069nl1i73ayjnlsds4dnz6w4n765jijimgz20n9az7r0irvaddhi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; trackdf = derive2 { name="trackdf"; version="0.3.2"; sha256="1rb3q5nwj88rxrh8g8vabawws5d75qvjxkrmya0ppfdxfpysn6d0"; depends=[data_table dplyr lubridate sf tibble]; }; trackdown = derive2 { name="trackdown"; version="1.1.1"; sha256="1l8mqdfpdf25vyibxqcqhyip6aqllb9riz2v6w4k1rfc8b9dl07f"; depends=[cli googledrive rmarkdown]; }; trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackeRapp = derive2 { name="trackeRapp"; version="1.2"; sha256="1y6n9hgzybz5860qpzj9rdb9yl4k6b9h13d91fqn3qarpnx9n5qr"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 zoo]; }; - trackter = derive2 { name="trackter"; version="0.1.1"; sha256="11rk53w0y9p0az6ydiq3vy50j1pj4p4cml5dqabrpcgfz4icjkrs"; depends=[data_table dplyr EBImage features ggplot2 jpeg Momocs pastecs plyr raster zoo]; }; + trackter = derive2 { name="trackter"; version="0.1.1"; sha256="11rk53w0y9p0az6ydiq3vy50j1pj4p4cml5dqabrpcgfz4icjkrs"; depends=[data_table dplyr EBImage features ggplot2 jpeg pastecs plyr raster zoo]; }; tractor_base = derive2 { name="tractor.base"; version="3.3.5.1"; sha256="0fxbzbhpi6l55m14nmww8y3kdxgchzj4mw1yf4xkm2y6s68phvgc"; depends=[ore reportr RNifti shades]; }; trade = derive2 { name="trade"; version="0.8.1"; sha256="198qd3rnw5yh6i2nxsi3d4dvkrpaq37j881ixnabjl496pkkzdnx"; depends=[antitrust]; }; tradestatistics = derive2 { name="tradestatistics"; version="4.5.0"; sha256="0s6v5xfcasrpdqvpxi8nbw9v4w8yvnjwxz21pa9321pchrhw4v6p"; depends=[crul data_table digest jsonlite memoise]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; trainR = derive2 { name="trainR"; version="0.0.1"; sha256="0wmxhw8yxkxpw08jma3r0zy7dhsrkbh5wjvd3izp5gf9dn9533cd"; depends=[dplyr glue lubridate magrittr purrr RCurl stringr tibble tidyr usethis xml2]; }; - traineR = derive2 { name="traineR"; version="2.0.4"; sha256="11amknr1vsqbahfhaj0pxwqviiyh57jll4j3f5ihd1qzk2wxr9jz"; depends=[ada adabag dplyr e1071 gbm ggplot2 glmnet kknn MASS neuralnet nnet randomForest ROCR rpart stringr xgboost]; }; + traineR = derive2 { name="traineR"; version="2.1.0"; sha256="0bk7hrz9bfn9j3hj05zhq6zm9q2nrw5pcrq8yd54ys2135hhqwaj"; depends=[ada adabag dplyr e1071 gbm ggplot2 glmnet kknn MASS neuralnet nnet randomForest ROCR rpart stringr xgboost]; }; traipse = derive2 { name="traipse"; version="0.3.0"; sha256="1ln0l8dkslj8pf0h5g5pj5iwy9x05nfkp1x36dxbi5iab88cv76w"; depends=[geodist geosphere magrittr]; }; traits = derive2 { name="traits"; version="0.5.0"; sha256="04s2523wkbjqxpwllvcy7ikyfri5gldgnynjswsxdy0k945wacvz"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traitstrap = derive2 { name="traitstrap"; version="0.1.0"; sha256="1yq4ngpqizlcmbcypdbsxrc9kixm6b44zimyijl7404bzz6hbs5a"; depends=[dplyr e1071 fitdistrplus ggplot2 glue purrr rlang stringr tibble tidyr]; }; @@ -18956,15 +19021,15 @@ in with self; { trajeR = derive2 { name="trajeR"; version="0.9.0.5"; sha256="1zy3hg1m1a5dpx494mlb72vfpng5892dcginv6rwxc2c1ggv6z86"; depends=[capushe MASS minpack_lm numDeriv Rcpp RcppArmadillo ucminf]; }; trajectories = derive2 { name="trajectories"; version="0.2-7"; sha256="09qz6yc21q54ivjnkh4rpm5m3j81h1vabjvrp9fwrcswj8y8k0y8"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.5.0"; sha256="0xfgqdck4dll9vc4gh2sql29r6hkdpizwcxwwaixxzvsi12khwf7"; depends=[plotrix signal]; }; - tram = derive2 { name="tram"; version="0.8-3"; sha256="1f1v5q9f74jbiqvcd5ncjp2lbkm68p46yi1w0fnlb20j4yfhp3kg"; depends=[basefun Formula Matrix mlt multcomp mvtnorm sandwich survival variables]; }; + tram = derive2 { name="tram"; version="1.0-0"; sha256="1bzrr6zmiaaq68mmah5wn0srivi2aprgchpkk2gfb3dmcbidmrvm"; depends=[basefun Formula Matrix mlt multcomp mvtnorm sandwich survival variables]; }; tramME = derive2 { name="tramME"; version="1.0.5"; sha256="1rfs38v0w2rxldxngbc1d6118cjnc8ad4zn2csqk8bg882b1yn18"; depends=[alabama basefun coneproj lme4 MASS Matrix mgcv mlt mvtnorm nlme numDeriv RcppEigen TMB tram variables]; }; + tramicp = derive2 { name="tramicp"; version="0.0-1"; sha256="1i6j9iqrwfq3y6b8vf90s8bgnzcl1g39lrcbspxrndvz4mgdbavv"; depends=[basefun coin cotram dHSIC MASS mlt multcomp ranger sandwich survival tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-8"; sha256="19hx2hn8m5abfzp4sm0myhxlx9hp2rl7dry5izxsfjjls3h8z1n4"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; trampoline = derive2 { name="trampoline"; version="0.1.1"; sha256="05inq5j8gvnpww6z21dzc57vilsm4gx3m274fpsamp54q85mi68s"; depends=[coro fastmap rlang]; }; tramvs = derive2 { name="tramvs"; version="0.0-4"; sha256="0vvdj4q5pf1p0yzpx17h76pgvwmca51dkjx0m33c74vcxp5wmrks"; depends=[cotram tram variables]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.2"; sha256="17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk"; depends=[rootSolve SQUAREM survival truncSP]; }; transPlotR = derive2 { name="transPlotR"; version="0.0.2"; sha256="0xk7lqv4nf6565msschz72mqfdmpvvfylv0acj9qlg6jsanfxii7"; depends=[cowplot dplyr geomtextpath ggarchery ggplot2 magrittr purrr tidyverse]; }; - transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; - transfR = derive2 { name="transfR"; version="1.0.7"; sha256="0digc0i3cr3hfdlcz3myj7kwlkcspsd4wn82laswxb07nvbbi6sv"; depends=[doParallel foreach Rdpack sf stars units]; }; + transfR = derive2 { name="transfR"; version="1.0.11"; sha256="1qmkqn0gl4d6c0j1f07nmlv1gxh6in7d21dlp80ilmnaqyhb1fnj"; depends=[doParallel foreach Rdpack sf stars units]; }; transforEmotion = derive2 { name="transforEmotion"; version="0.1.1"; sha256="0lnmgbsh26mazx0g1s0jxg3jk1a6vw3bsaw07viv9kx3rdf6wc46"; depends=[dplyr LSAfun osfr pbapply remotes reticulate]; }; transform_hazards = derive2 { name="transform.hazards"; version="0.1.1"; sha256="00nl2pd4hkdgrgpi854pjz7nxx3vxsa9panw69hiksg301afz1hj"; depends=[]; }; transformer = derive2 { name="transformer"; version="0.1.0"; sha256="0nvgcw72mcmj3wy3bf72zahyzs3ir5f154hz03ybk9dydgfkxj8w"; depends=[attention]; }; @@ -18976,6 +19041,7 @@ in with self; { transmem = derive2 { name="transmem"; version="0.1.1"; sha256="1a3c5ddmh9k4f80rbk363s7rkx30qhk9ssmf7xg7rr0lwxphahf3"; depends=[cmna ggformula ggplot2 plot3D]; }; transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; transport = derive2 { name="transport"; version="0.14-6"; sha256="0806w66na5nj8v8czrjqnyhfz8r76rhx8jn76n5p9j7pgmbrn4f6"; depends=[data_table Rcpp RcppEigen]; }; + transreg = derive2 { name="transreg"; version="1.0.0"; sha256="0691gn80fwlkf48m9mrjj76ylllayn3aj03lr48y361bf4qpg56c"; depends=[glmnet joinet starnet]; }; transx = derive2 { name="transx"; version="0.0.1"; sha256="1xx934w4fhk2nwm5h6lf4irj83wsfp8lbplzcha5rnc7aka8pn3v"; depends=[rlang]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-2"; sha256="1pqb888w0q2zhcgjn0q4na2qwbxy4i8kfk6pp2id20gh8s96sm3f"; depends=[]; }; traudem = derive2 { name="traudem"; version="1.0.1"; sha256="0qxvh5zfj14yaywjzf83v01v6n064iq16ba8g72yh0pbb8i98w9i"; depends=[cli purrr rlang sys withr]; }; @@ -18986,35 +19052,34 @@ in with self; { tree3d = derive2 { name="tree3d"; version="0.1.2"; sha256="0q72bnzjz5fppgpwbgc5xy7y0kpymwj0j4y90j00p6yjm1kbq1a6"; depends=[rayvertex]; }; treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.5"; sha256="0rdqvjj16w7ykpxd6m800h4zv79y9c1phhkl14xy10gbi2cqh10g"; depends=[ape ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; + treeDbalance = derive2 { name="treeDbalance"; version="1.0.1"; sha256="0i2sqvqjiw26z3fnbz6h3ki2yjhy0g33rr7wd4bl4vwvr833z7c2"; depends=[rgl]; }; treePlotArea = derive2 { name="treePlotArea"; version="1.4.1"; sha256="1a4r6zbyhicj1ywjxaxd3khx22wqgphp3r7ycd3rlx5rv02fk21i"; depends=[fritools sf]; }; treebalance = derive2 { name="treebalance"; version="1.1.0"; sha256="0wxsd9mx7bcz95vn4a9w1bzqvd8v1qk5qv00p3x58qks7nzxyzdv"; depends=[ape memoise]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; treeclim = derive2 { name="treeclim"; version="2.0.6.0"; sha256="0zdn766vxgycisjyjw7nh7hs817kqhdihyla3fhpzykw9pxnw0b2"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; - treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treedata_table = derive2 { name="treedata.table"; version="0.1.0"; sha256="0dhnb8if5wq6hzhjg40cw80sacigqmlm7nplm1f1ay5cqx1ynfi7"; depends=[ape data_table geiger lazyeval]; }; treedater = derive2 { name="treedater"; version="0.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; }; treediff = derive2 { name="treediff"; version="0.2"; sha256="0vd4b3d5a72zlql3wljh280lxabir7ksmpxng7n124dr4x5aza64"; depends=[adjclust BiocGenerics csaw data_table dplyr HiCDOC InteractionSet limma purrr reshape2 rlang SummarizedExperiment testthat]; }; - treeducken = derive2 { name="treeducken"; version="1.1.0"; sha256="0i2r1l508yi0cq7fzdds0hz2k4bxm67nknybxvbyylmwnwv6a0a1"; depends=[ape apTreeshape Rcpp RcppArmadillo]; }; treefit = derive2 { name="treefit"; version="1.0.2"; sha256="0258844r50ksxjivmnvgzr8f83qz1cqfyq7j5jgyxpqps62q5v7w"; depends=[ggplot2 igraph patchwork pracma]; }; treeheatr = derive2 { name="treeheatr"; version="0.2.1"; sha256="0618j5rlq0xik9vl2l8ircnh98wzdzf9bxnfgmiqrpywgmc8r5nk"; depends=[cluster dplyr ggnewscale ggparty ggplot2 gtable partykit seriation tidyr yardstick]; }; treemap = derive2 { name="treemap"; version="2.4-4"; sha256="1h3pas3kn8zrpdpvp9vs745q94kixw5lxkbq74l5lh0n3wkqnnn5"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; - treemapify = derive2 { name="treemapify"; version="2.5.5"; sha256="0g6bwchyn13iksv8vyc4d0c7n1zpy26x1bd6vkrm8ail98y2ia2m"; depends=[ggfittext ggplot2]; }; + treemapify = derive2 { name="treemapify"; version="2.5.6"; sha256="1w15y842rp2zg5whf3x4fahsi0mvnk92w9rgnsgqivdamzrnd9qg"; depends=[cli ggfittext ggplot2]; }; treemisc = derive2 { name="treemisc"; version="0.0.1"; sha256="0289grmgcvdszsb9lhgygm1dahlcn1m50lh110ny5yjh1b4627kn"; depends=[Matrix Rcpp rpart]; }; treenomial = derive2 { name="treenomial"; version="1.1.4"; sha256="0vx5x7078ccn2bsmcxdls3ymmc7jx71xzq0va0n7gyw36gi7k3nn"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; - treespace = derive2 { name="treespace"; version="1.1.4.2"; sha256="0pys9pz0b8w20rgp8l33k69yrl8bn98gsqy4rld6ky3nqdd8kzks"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; + treeshap = derive2 { name="treeshap"; version="0.2.5"; sha256="05pxfdjcjdihdf28ca7ybai9xypcsgc6pa1fq86sywiwb0w0vpss"; depends=[data_table ggplot2 Rcpp]; }; + treespace = derive2 { name="treespace"; version="1.1.4.3"; sha256="1f5kcydlnbbwf2q2rgb64y3i7x9p7prcw1xc5pjk8wqp2zyr0ijj"; depends=[ade4 adegenet adegraphics ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; }; treestructure = derive2 { name="treestructure"; version="0.1.0"; sha256="0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m"; depends=[ape Rcpp]; }; - treetop = derive2 { name="treetop"; version="0.0.5"; sha256="11lyg0izlzzvds8vig8ryicg94ydapr0wgfk5rj2shxqk9mxzfiz"; depends=[geometry lidR pryr raster rasterVis RColorBrewer rgdal rgl sf shiny sp spatstat_explore spatstat_geom stars]; }; trekcolors = derive2 { name="trekcolors"; version="0.1.3"; sha256="0jm85lrsqlpl1k62fbim48kprsqs50bm0dbajnk8f42x6i3m1xav"; depends=[ggplot2]; }; trekfont = derive2 { name="trekfont"; version="0.9.5"; sha256="1c0rwjmpg6b83kvkwrc0fcg1adx5is1g0wn01iss037jph5j0f2l"; depends=[]; }; trelliscopejs = derive2 { name="trelliscopejs"; version="0.2.6"; sha256="16i1km57yz8bl4ni919d3qmj8aj5l88l7byhd6ksh88ygpfl7wq8"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; - trelloR = derive2 { name="trelloR"; version="0.7.1"; sha256="0rlnqpkvfp736m2ndz90v9rl4x17l3i8j70bsx7pfdd0nfffqsqv"; depends=[httr jsonlite]; }; + trelloR = derive2 { name="trelloR"; version="0.8.0"; sha256="04yh5msbslh3hg6507wmpwng3wrwyjjvj6aa1q2fjdj3np82vv55"; depends=[curl httr jsonlite]; }; tremendousr = derive2 { name="tremendousr"; version="1.0.0"; sha256="0jkhpb7q1kg8n2fjj7n3khzwdsz0kh9w7q2wd9xf5mn69066m3f1"; depends=[cli crayon crul jsonlite]; }; - trend = derive2 { name="trend"; version="1.1.5"; sha256="12xswr925jjbkdccjiigkr6a44jmgvzwvnizciv6rr3mnklv6n66"; depends=[extraDistr]; }; + trend = derive2 { name="trend"; version="1.1.6"; sha256="0991fp6kjk704rfg0l1m7kwbck9fj1rg27zy4llm5ikczd55w05h"; depends=[extraDistr]; }; trendchange = derive2 { name="trendchange"; version="1.2"; sha256="0hsh45mr6az9gj2g8mc0nswarc8hwdv5zldmfvnkmh57rznbqpb3"; depends=[]; }; trendeval = derive2 { name="trendeval"; version="0.1.0"; sha256="0a9ipy88ay7170mmjissky57xgh0y9vk0kirygbsg9ihk0pk9dc5"; depends=[rsample tibble trending yardstick]; }; trending = derive2 { name="trending"; version="0.1.0"; sha256="15nx0s5q2nk2z9lvpkpjzpg6qz0j182zzrl9v7wp70lfbpaahh24"; depends=[ciTools MASS pillar tibble vctrs]; }; - trendsegmentR = derive2 { name="trendsegmentR"; version="1.2.0"; sha256="1lp52zgz3wn6gzypmriyfd4417j3kyma3m1sv2vlcnyhr384ndw8"; depends=[]; }; + trendsegmentR = derive2 { name="trendsegmentR"; version="1.3.0"; sha256="0mq2h50n2lszbva1wh2cfxgvy9snnrd1819kxvif7yfqzny7drqj"; depends=[]; }; trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; }; triact = derive2 { name="triact"; version="0.3.0"; sha256="1ndxqrs1mg6ch99cksd7gnrjvhsklwfrjwrdxns099a3n16m3r0h"; depends=[checkmate data_table lubridate R6]; }; trialr = derive2 { name="trialr"; version="0.1.6"; sha256="1a93pncc0w84z8d2xlgia9jvxad63r3ifxjd4nc284s760i9k2v7"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders stringr tibble tidybayes]; }; @@ -19033,8 +19098,10 @@ in with self; { trip = derive2 { name="trip"; version="1.10.0"; sha256="0jbzwrckazs5zib5lnhlqdc3b825fnk8pzmwixpgq8k7s2m9px0l"; depends=[crsmeta dplyr geodist glue MASS raster reproj rlang sp spatstat_explore spatstat_geom traipse viridis]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-46"; sha256="1zw8akawr0b63a6iz1p8rklk1jm304fwvvfanysghw8kc0jr16hn"; depends=[lattice mgcv reproj sp zoo]; }; tripack = derive2 { name="tripack"; version="1.3-9.1"; sha256="1ghza4by6shalsnqybn5qgv076dxh59b6vycg9v6ii216zbgi0kz"; depends=[]; }; + triplesmatch = derive2 { name="triplesmatch"; version="1.0.0"; sha256="1qjwnyijk3yf9dl18baww806xz2w1jhxcnaw3nlb27g24m28j2dq"; depends=[MASS optmatch rcbalance rlang rlemon]; }; triplot = derive2 { name="triplot"; version="1.3.0"; sha256="1apmdpxdnnmjyi7gcrjrqw44iqphr84nbgw0nfxcspzjgxhc81l1"; depends=[DALEX ggdendro ggplot2 glmnet patchwork]; }; tripsAndDipR = derive2 { name="tripsAndDipR"; version="0.1.0"; sha256="1gm96fxgql9y08w177nyxw0bahyafcs75maz743a9hfb0gjixvy2"; depends=[]; }; + triptych = derive2 { name="triptych"; version="0.1.2"; sha256="171wf85hjjdqv5m78galsrqwjri6j62l0kh5ixgrjvglwvlz15iz"; depends=[class cpp11 dplyr geomtextpath ggplot2 ggrepel monotone patchwork pROC purrr rlang scales tibble tidyr tidyselect vctrs]; }; triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; }; troopdata = derive2 { name="troopdata"; version="0.1.5"; sha256="0s86j75jzinrwn1p5z9l13srzhy55mj3hcnbjr89ia1m6kgih6dc"; depends=[dplyr magrittr rlang tibble]; }; tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; }; @@ -19043,20 +19110,20 @@ in with self; { trtf = derive2 { name="trtf"; version="0.4-2"; sha256="15aalp82igw23rlk36dqqkcnmcy8q869wjbr7ak19gygy8p525wn"; depends=[Formula libcoin mlt partykit sandwich tram variables]; }; truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; }; truh = derive2 { name="truh"; version="1.0.0"; sha256="0acsyzm6rpmzyq8pg33c631hi4xir49gqxbpshcrr6i2v3q6k14j"; depends=[cluster doParallel foreach fpc iterators Rfast]; }; + truncAIPW = derive2 { name="truncAIPW"; version="1.0.1"; sha256="01863yys0ih0piriksspylpsrfv7q4mkrsqhh1mgrkfyw1d11czn"; depends=[survival survPen]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; }; truncnorm = derive2 { name="truncnorm"; version="1.0-9"; sha256="0267gvcg6mmf28x26z6njw373prwpaq8aqkd6aavyhrjsv2aqmji"; depends=[]; }; - truncnormbayes = derive2 { name="truncnormbayes"; version="0.0.2"; sha256="0nsc7h8ddbzqbcfi4mhircgnagkk3an8iwvw7za44frn85vmx6id"; depends=[BH Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; + truncnormbayes = derive2 { name="truncnormbayes"; version="0.0.3"; sha256="06qz9xvqi59afjdq2djjvg455wx892w8p8wy2fb9wc4fnj0xbnrj"; depends=[BH Rcpp RcppEigen RcppParallel Rdpack rstan rstantools StanHeaders]; }; truncreg = derive2 { name="truncreg"; version="0.2-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; }; trust = derive2 { name="trust"; version="0.1-8"; sha256="1b6wsx4vybr5952ii3ska6jbcb3654iibz83n645khxfca5k8blm"; depends=[]; }; trustOptim = derive2 { name="trustOptim"; version="0.8.7.3"; sha256="11cx90zq9987i7kc86kxbip6c75bmw51shlwq2x9ywhybzk8vxl8"; depends=[Matrix Rcpp RcppEigen]; }; trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; tryCatchLog = derive2 { name="tryCatchLog"; version="1.3.1"; sha256="0k40a48qzwmardjnkf0h5s5zryivzvdanz61kxdqdfqlil19ma0d"; depends=[]; }; - ts2net = derive2 { name="ts2net"; version="0.1.0"; sha256="0f45xnvg09qvcc202dfr9d1a29909gmz863pjyq78mhjj0glijqw"; depends=[dbscan dtw igraph infotheo minerva mmpp nonlinearTseries scales zoo]; }; tsBSS = derive2 { name="tsBSS"; version="1.0.0"; sha256="04nsbifc6zkilqifj6iwc0vf2z84y8wcbf8pndgkzi039kk6c385"; depends=[boot BSSprep forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; }; tsDyn = derive2 { name="tsDyn"; version="11.0.4"; sha256="0clwvgqsklmq9h5mx7g9lsw6f09cqglb77zb9xlbjh4brh2f3ljl"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6-1"; sha256="16cyq4xisrp4i8bd8wayzzk08ws0rfq9zrafphb9cssx50gbqb8q"; depends=[]; }; - tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; }; + tsPI = derive2 { name="tsPI"; version="1.0.4"; sha256="1an4dk8pjb0c47891p91sdrgcnd4xl9bal5f41shv1vkp0kk0nyy"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-4"; sha256="07ymkrik1vwblcj5i0crihbrrxkrn8xjkap3lrzxy4vidgqalw3f"; depends=[]; }; tsapp = derive2 { name="tsapp"; version="1.0.4"; sha256="1x3f10rdg3ihq5cx6w1zyz3irv1wsgx6admz5qv3zwwlk0z6cwpx"; depends=[fftwtools hdm Matrix vars]; }; @@ -19072,10 +19139,10 @@ in with self; { tseries = derive2 { name="tseries"; version="0.10-54"; sha256="0a6hnkx1wpw29q5rqq7hi2fal720dx5f62rvc6gxs8lanmik5jn3"; depends=[jsonlite quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.7-2"; sha256="0zlyzda09q7r5iwfsyrv0qr6xpm1rcwjril85hm3mgb2c55c6v9r"; depends=[cubature ks]; }; - tseriesTARMA = derive2 { name="tseriesTARMA"; version="0.3-2"; sha256="0clxwlamqhlsbi7ldwwwk24rr5miyzg71gsw31x10g6zj7hwvrvd"; depends=[lbfgsb3c mathjaxr Matrix Rdpack Rsolnp rugarch]; }; - tsfeatures = derive2 { name="tsfeatures"; version="1.1"; sha256="06b35b95rm72m92hhslqd31dnxp0s3k65qdbp3npkhdkw4xv9aj6"; depends=[forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; }; + tseriesTARMA = derive2 { name="tseriesTARMA"; version="0.3-4"; sha256="00ch7dg9fia7yh9q502wndi72nhz5ywqhhla9qgpgg08sfj2414f"; depends=[lbfgsb3c mathjaxr Matrix Rdpack Rsolnp rugarch zoo]; }; + tsfeatures = derive2 { name="tsfeatures"; version="1.1.1"; sha256="1z0c1pc2hsw76qwy6nibp1dnmk5vq495g2b81j844ajma6gj7ssy"; depends=[forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; }; tsfgrnn = derive2 { name="tsfgrnn"; version="1.0.4"; sha256="02sxbf1j2p0j2pqwsdzfpm63dgm2wn0bxlifms3kb18qjsssnjiz"; depends=[ggplot2 Rcpp]; }; - tsfknn = derive2 { name="tsfknn"; version="0.5.1"; sha256="1xwsyn6g11qrwkqz0mm7b7iy7d81khpb9jvmlq85g3w4ap4cd5nl"; depends=[ggplot2 Rcpp]; }; + tsfknn = derive2 { name="tsfknn"; version="0.5.2"; sha256="0r68azmcavrp3rx65nafn9nvj530x12y47sgzgkrjjbchfwm2jsw"; depends=[ggplot2 Rcpp]; }; tsfngm = derive2 { name="tsfngm"; version="0.1.0"; sha256="1wx1imbvnc2bjvfal45zhgpz296fiydqffb0rk428xpjgp2dj6p7"; depends=[]; }; tsiR = derive2 { name="tsiR"; version="0.4.3"; sha256="0xzcfdad1z8336wnsrk9sy21psd898wwkdkndq7dshqwp2rj2kxl"; depends=[ggplot2 kernlab reshape2]; }; tsibble = derive2 { name="tsibble"; version="1.1.3"; sha256="0qb5ksj366l253rhkjpq7cpancplx2q81xn95b4ddwpnz3p16hhz"; depends=[anytime dplyr ellipsis generics lifecycle lubridate rlang tibble tidyselect vctrs]; }; @@ -19094,6 +19161,7 @@ in with self; { tssim = derive2 { name="tssim"; version="0.1.7"; sha256="154snb0npy8zbkspp475nv9rvv1ls6rbgxz3jr152j79vsiis3ng"; depends=[dsa timeDate tsbox xts zoo]; }; tstools = derive2 { name="tstools"; version="0.4.2"; sha256="0hmx53rgqha3fj9rnv0s2k0ashv8dyl745gng0kq3044jbh1wrln"; depends=[data_table jsonlite xts yaml zoo]; }; tsutils = derive2 { name="tsutils"; version="0.9.3"; sha256="1r77j13vsd0p6s2c3bva5ayhapiswsr6vfacb3i448h5vh551kgq"; depends=[forecast MAPA plotrix RColorBrewer]; }; + tsvio = derive2 { name="tsvio"; version="1.0.4"; sha256="18acapx4dwdxdq8pdv9vdzcc4g3k8x1c7b78814fmc7w940cya2b"; depends=[]; }; tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; tsvr = derive2 { name="tsvr"; version="1.0.2"; sha256="1h8yjnw7f8w6m19jh3a518vkzjcmbhl3lk15d1jyhy8p4ajzzjdx"; depends=[]; }; tswge = derive2 { name="tswge"; version="2.1.0"; sha256="1pl10n20w2vz95q28zjiafcjmjij586h33s5b0nqvxfwlask6xbw"; depends=[astsa dplyr forecast ggplot2 magrittr MASS nnfor plotrix PolynomF signal tidyverse waveslim zoo]; }; @@ -19105,7 +19173,7 @@ in with self; { ttcg = derive2 { name="ttcg"; version="1.0.1"; sha256="1kha6jp89r8qx5rycwlcl1dprw33j71yng03k9l7q3b7d4lz4bg5"; depends=[numDeriv]; }; ttdo = derive2 { name="ttdo"; version="0.0.9"; sha256="0i0qw4zxi1cbqzdfxfdrm2vfppiddgsyf795wny6hz03fl416xkp"; depends=[diffobj tinytest]; }; tth = derive2 { name="tth"; version="4.12-0-1"; sha256="0sdk519sx8h2l0ggddkwlnh9llrx4fzmvwzdjrbi2bg8zv2y30x1"; depends=[]; }; - ttservice = derive2 { name="ttservice"; version="0.3.6"; sha256="1151sm85nd68r1xczw6ja71vc29kq2dwm04wcc64kpqn68pfr3pb"; depends=[dplyr Matrix]; }; + ttservice = derive2 { name="ttservice"; version="0.3.8"; sha256="1gkkr6vhj0kd16c3wvl35marlykqx80fkny5r7ymrn4vvb2zkm94"; depends=[dplyr Matrix]; }; ttt = derive2 { name="ttt"; version="1.0"; sha256="12bjhp78162v5y64qxfccaqxgwdqhmd3iwjda6pi7j6zqmy9p0gm"; depends=[Formula htmltools knitr]; }; tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1.1"; sha256="01lmnlyj6pn2r73hhr57r9c83h3pw9x506h4dj09wmlgrzv4w30a"; depends=[]; }; @@ -19116,19 +19184,20 @@ in with self; { tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; - tune = derive2 { name="tune"; version="1.1.1"; sha256="0kl8bpd1i5ir6lrx055rilvb7kg0iws5f4618956h3g8sif1lvmg"; depends=[cli dials dplyr foreach generics ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr tidyselect vctrs withr workflows yardstick]; }; - tuneR = derive2 { name="tuneR"; version="1.4.4"; sha256="1fzkji3yq4f7y2y0h3k47kcv3pj3lfy524lvra18f5y27pwvjkif"; depends=[signal]; }; + tune = derive2 { name="tune"; version="1.1.2"; sha256="12z1h574ymg9r3q19h5nhbkmzb5p3ckz7xvp6p0yra1mdmzcq0v9"; depends=[cli dials dplyr foreach generics ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr tidyselect vctrs withr workflows yardstick]; }; + tuneR = derive2 { name="tuneR"; version="1.4.5"; sha256="1ysjn8mclrjp4qr4m45qanm20gpdbikmgzfrcn2a0phfz8nhvlpm"; depends=[signal]; }; tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; turboEM = derive2 { name="turboEM"; version="2021.1"; sha256="17j308qla2680k0j8cf2c4v1jlsm21z93zglncmw3n0isa7cwjly"; depends=[doParallel foreach iterators numDeriv quantreg]; }; turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; tutorial_helpers = derive2 { name="tutorial.helpers"; version="0.2.5"; sha256="0nbfd44pzhq41k3r78gm5fqsgb5smm126i27mmpl57kas94wzbs6"; depends=[dplyr gridExtra learnr parsermd purrr readr rmarkdown rstudioapi shiny stringr tibble]; }; + tv = derive2 { name="tv"; version="1.7.3"; sha256="16s87nx7716pn75r27las759vibc3g9xik10rssyhf9ngy5j07ak"; depends=[dplyr lubridate magrittr rlang]; }; tvR = derive2 { name="tvR"; version="0.3.2"; sha256="1i20z09f714fyn3ipcn9i5g4dx7cyjfkyjqzyqzqapkg0m9ny91m"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.5.8"; sha256="0ivabcp1hm0rmr55lrqgsgbg23mkzdg6h11k95m2yg5pm853zbh8"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; - tvem = derive2 { name="tvem"; version="1.3.1"; sha256="1hrjl5kbp0wx7a4aa8bbvf5sdrxcvxsf3318ckgl85w923i8a44k"; depends=[mgcv]; }; - tvgarch = derive2 { name="tvgarch"; version="2.4"; sha256="1k6i6xfwjyhbj7mga46kzx2fwf7lx2jkax59qvc19v46y4rhidlb"; depends=[garchx numDeriv zoo]; }; + tvReg = derive2 { name="tvReg"; version="0.5.9"; sha256="0viv485l2b93j72274h9m3dkrm2ah0kn37pgbxby3ajg2gi86bh9"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; + tvem = derive2 { name="tvem"; version="1.4.1"; sha256="09kcz30nh2yaj1cvldvksx6sjhh1ny2ba0n16k34np8ar4ppcb91"; depends=[mgcv]; }; + tvgarch = derive2 { name="tvgarch"; version="2.4.1"; sha256="17cnk855c4y5bxxnhhi05vjrppw5bbarnrhkasza3ygbnm77cmsd"; depends=[garchx numDeriv zoo]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; - tvm = derive2 { name="tvm"; version="0.5.1"; sha256="0isvsz7fgs8a74wxq9i3d3zah4nfa31rnv8xsqnqp93rbr947x6y"; depends=[ggplot2 reshape2 scales]; }; + tvm = derive2 { name="tvm"; version="0.5.2"; sha256="0kswqml9h12mvs6q48vibq8qd3l9dd9nxi8lmp90cxd4hkmg6vgw"; depends=[ggplot2 reshape2 scales]; }; tvmComp = derive2 { name="tvmComp"; version="1.0.2"; sha256="1q5c3ahdjjz4h19pwq0dpasv87mzbyqs0hadlfx7mpmncdgyqcqq"; depends=[Rdpack]; }; tvmediation = derive2 { name="tvmediation"; version="1.1.0"; sha256="082lw56yhlb6nj7srdinim1hgvb8szzb3gp2y985115qgdypbv6n"; depends=[dplyr ggplot2 locpol]; }; tvthemes = derive2 { name="tvthemes"; version="1.3.2"; sha256="15m1g191nw1bfz1jgcab316c8jzvam2zc5vnlz8k9b6lcqqnv3nl"; depends=[extrafont ggplot2 magick scales]; }; @@ -19168,20 +19237,20 @@ in with self; { tzupdater = derive2 { name="tzupdater"; version="0.1.2"; sha256="0s1simvn76m569iq24qb3w6xli0202cjf1jr3a4qy58fs4sda2kv"; depends=[]; }; u5mr = derive2 { name="u5mr"; version="0.1.1"; sha256="16znlmxanhg1m6fq28z62jv033fxgr4njzz50hgskprvgvx8svkj"; depends=[lifecycle]; }; uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; }; - uGMAR = derive2 { name="uGMAR"; version="3.4.4"; sha256="10ziypw60v71878gvjkzd23r2cczm403cnjdj5lmh8r4zwlsck9y"; depends=[Brobdingnag gsl pbapply]; }; + uGMAR = derive2 { name="uGMAR"; version="3.4.5"; sha256="01zs919b24qb102qf9m19x0zzyg7yx8v8w674awzfk4lvm27d2aq"; depends=[Brobdingnag gsl pbapply]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; uaparserjs = derive2 { name="uaparserjs"; version="0.3.5"; sha256="0v24smgsz1p2wa23mc2llx7dycwmgf7zyxdhwxgwplabpmy3xzhl"; depends=[progress V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.6.2"; sha256="0jv0ls8wbxciv6lhr7qvzarg4s3gckkc1n4w833sfpr0sk4gakaj"; depends=[brew data_table exifr geosphere jsonlite link2GI log4r rlist sf sp zoo]; }; ubiquity = derive2 { name="ubiquity"; version="2.0.0"; sha256="1zjjwpl8zkpr4zvrhsbsj6vpiwy08vs2sw1rpx7aq940v37dvmbz"; depends=[deSolve digest doParallel dplyr flextable foreach ggplot2 knitr magrittr MASS onbrand optimx PKNCA pso readxl rhandsontable rmarkdown scales shiny stringr]; }; - ubms = derive2 { name="ubms"; version="1.2.4"; sha256="10kya1im8czcrqaqq27iylf14v5qcq8nrsb3w0imafak4b8ikz4k"; depends=[BH ggplot2 gridExtra lme4 loo Matrix pbapply Rcpp RcppArmadillo RcppEigen RcppParallel rlang RSpectra rstan rstantools StanHeaders unmarked]; }; + ubms = derive2 { name="ubms"; version="1.2.6"; sha256="10jr2nb8pq0rxx1h0zci4zybbj108maa5kdzgf9bj87pzsrxhda7"; depends=[BH ggplot2 gridExtra lme4 loo Matrix pbapply Rcpp RcppArmadillo RcppEigen RcppParallel rlang RSpectra rstan rstantools StanHeaders unmarked]; }; uchardet = derive2 { name="uchardet"; version="1.1.1"; sha256="0m3xy807smqdxhkhd9cwrcf3ljlyvfmnkd7831qzpgcadam2jcdj"; depends=[]; }; - uci = derive2 { name="uci"; version="0.2.0"; sha256="09lxal5bzi84zjl6nlx8jh93pasa8bkp2p5nzafyyqc69cxmp2ha"; depends=[checkmate cppRouting data_table fields furrr future pbapply sf spdep]; }; + uci = derive2 { name="uci"; version="0.3.0"; sha256="0bqyj69xplr8hbc1b9rpjxvzmnhwkqy2xdyd4my53niq2gm55750"; depends=[checkmate cppRouting data_table fields furrr future pbapply sf spdep]; }; ucie = derive2 { name="ucie"; version="1.0.2"; sha256="032anlli29a0iwzmn35afrcs4if5kipplpn8n4qpy1g14hc5zgvd"; depends=[colorspace dplyr geometry pracma ptinpoly remotes rgl]; }; uclust = derive2 { name="uclust"; version="1.0.0"; sha256="10i78fc81sy635mi8nn1gmryvcbqq7f99ws6byqlnhwyw79qmvb1"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.2.0"; sha256="1x3d3l500kyqamzfjpz4qc38d6d3sha9av3rpxz0m4dhms28zpas"; depends=[]; }; udpipe = derive2 { name="udpipe"; version="0.8.11"; sha256="0crjcfrpb0m7f58w7ksz7kvglvmc45axy9kbbvqz9w6i4kg00aaj"; depends=[data_table Matrix Rcpp]; }; udunits2 = derive2 { name="udunits2"; version="0.13.2.1"; sha256="00prsy8m41v1camcsz94d7gm8qab2mdnwl3x0dyhz4r49b02jm4z"; depends=[]; }; - ufRisk = derive2 { name="ufRisk"; version="1.0.6"; sha256="190rjqhmm7r9yy4f5gyk2p8k250xnnkkssi3nfgv79w62z2hv2qh"; depends=[esemifar fracdiff rugarch smoots]; }; + ufRisk = derive2 { name="ufRisk"; version="1.0.7"; sha256="1cqx416kb8pfaxx2hidv6vyackbps7azrkgkqzwyycrbi177riwb"; depends=[esemifar fracdiff rugarch smoots]; }; ufs = derive2 { name="ufs"; version="0.5.10"; sha256="09nrm8p95i8lksqyxxb2gqmyx650i05pv7a4gvgz4pbpsivxf9id"; depends=[digest diptest dplyr ggplot2 ggrepel ggridges GPArotation gridExtra gtable htmltools kableExtra knitr pander plyr pwr rmdpartials scales SuppDists]; }; ugatsdb = derive2 { name="ugatsdb"; version="0.2.3"; sha256="098dzh6slaxj22730nm9g6b5653600ms2ahxr87iblh5xq0dcidl"; depends=[collapse data_table DBI RMySQL writexl]; }; ugomquantreg = derive2 { name="ugomquantreg"; version="1.0.0"; sha256="1a5vc1qgy3kp1by5bp296w980lkxcghzzxibhap2jg06jnzjfcq8"; depends=[gamlss gamlss_dist pracma Rcpp]; }; @@ -19189,7 +19258,7 @@ in with self; { uiucthemes = derive2 { name="uiucthemes"; version="0.3.1"; sha256="1faggg8hiqw4pblq5r3m9wi3x5m6kbjq0flf88mqa993v9rpdrf6"; depends=[rmarkdown xaringan]; }; uk2us = derive2 { name="uk2us"; version="0.1.0"; sha256="1iskjfifksx9gh94zwh4kk7l984804fidzg4j1k2ww9a4j63rk19"; depends=[]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.3.0"; sha256="1akmg1sj5438nsbjp2xqlrkgsw772j1a1shnn1jqh25d1q3lb0nz"; depends=[]; }; - ukbnmr = derive2 { name="ukbnmr"; version="1.5"; sha256="13wrvldv8mhl15k6lzg9kk0mfcbd2mqaylndcm31hllq121vjpq2"; depends=[data_table MASS]; }; + ukbnmr = derive2 { name="ukbnmr"; version="2.2"; sha256="05bcsz74aayi5rk9nv7izj4xz9mmf1yw933syvvp2g0ly6z8l66w"; depends=[bit64 data_table MASS]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.21"; sha256="1acl04bm8f2hgi26mpmzcwp44yv9zxarzw4r4k20b367k8g9rh8a"; depends=[httr XML]; }; uklr = derive2 { name="uklr"; version="1.0.2"; sha256="1x5lfzb0a64k84dscdj61kcibww8mizf9w62anmb207f8dggj7lg"; depends=[curl httr jsonlite tibble]; }; @@ -19199,7 +19268,7 @@ in with self; { umbridge = derive2 { name="umbridge"; version="1.0"; sha256="0p49mwi8qy90vb5xbv6w97sjv373cmp26vkk5y1nacqx6g6yvc5f"; depends=[httr2 jsonlite magrittr]; }; umiAnalyzer = derive2 { name="umiAnalyzer"; version="1.0.0"; sha256="147x48mr9mj0njwbz39876795rninvk89zm9immkppdm4s5g1ghf"; depends=[BiocManager dplyr DT forcats ggplot2 gridExtra magrittr pheatmap plotly readr Rsamtools scales shiny shinydashboard shinyFiles shinyWidgets stringr tibble tidyr viridis]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="4.15.1"; sha256="0z8i73ziknf5xiv545nnyypcg7kazjnp6dsmn1glx78g91490rzv"; depends=[cowplot DiagrammeR DiagrammeRsvg ggplot2 kableExtra knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl rsvg scales xtable]; }; + umx = derive2 { name="umx"; version="4.16.0"; sha256="04kjmcc9nf3x2ma2a5diajxr0qmssfd6axhdjq38qp7sgpwappxk"; depends=[cowplot DiagrammeR DiagrammeRsvg ggplot2 kableExtra knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl rsvg scales xtable]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.1"; sha256="0fgnvl9ammawgm5nf2icw64yzivqw7sl07dpvrsb5rypvrm8d040"; depends=[]; }; uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; }; uncmbb = derive2 { name="uncmbb"; version="0.2.2"; sha256="0szlz52p0ywl8526mhm0i0pk1vx72kc3474cx0w47xxig83a1j9b"; depends=[dplyr rlang]; }; @@ -19211,19 +19280,21 @@ in with self; { uni_survival_tree = derive2 { name="uni.survival.tree"; version="1.5"; sha256="1brkppsk7likpffzz0ykhqxw99qin57zzcjcib2fcdn3n8gpwq7w"; depends=[compound_Cox survival]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.1"; sha256="0yjjn08aizqq6j5f9pnsjwdfqdmqrj1s8vjja97gzisfy1xscwfa"; depends=[ahaz Iso survival]; }; + unicol = derive2 { name="unicol"; version="0.2.0"; sha256="0fxndcj3x60nv934xkxkc10ws7lah5rv8r264inqs1fbhqjrrln6"; depends=[unikn]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; unifed = derive2 { name="unifed"; version="1.1.6"; sha256="0wy2hasgkzw08l50qq30wb62i1q4skc3zccipv8pm911qlldk3sr"; depends=[]; }; unifir = derive2 { name="unifir"; version="0.2.3"; sha256="1l563qxym1srjj5xzcz8jks3577jpk33k1gb95lcyg7r9bh35j85"; depends=[glue proceduralnames R6]; }; uniformly = derive2 { name="uniformly"; version="0.5.0"; sha256="05zhx5a3ka3xa3h2j2dc17q7alq3zcnahvzbngyrz5ri0q3w1l5l"; depends=[abind pgnorm rgl]; }; - unikn = derive2 { name="unikn"; version="0.8.0"; sha256="03v23j65pxbl3ddvaj71v2fc90kzv7pysa2xrmyfaxalrwc495bp"; depends=[cli ggplot2]; }; + unikn = derive2 { name="unikn"; version="0.9.0"; sha256="040wqf8hnbvij8b044q7akzhd9dkb6k4fcv1dfn9cahqpmlgb02l"; depends=[cli ggplot2]; }; unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0.1"; sha256="0vmd5w4p2qvpg6djddl92q9d3c6kiq0rjv6hq6j7x1b1zwqhgfi5"; depends=[]; }; unisensR = derive2 { name="unisensR"; version="0.3.3"; sha256="1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy"; depends=[hexView vroom XML]; }; uniset = derive2 { name="uniset"; version="0.3.1"; sha256="1lpwsx1l6x186aj7wl5kvfmc5mp4g95p5h69alg8dn1sns84zqjs"; depends=[easycsv]; }; + uniswappeR = derive2 { name="uniswappeR"; version="0.6.1"; sha256="0vsw2jvp3gndjrl7v9fndpaqx4kryf4szsz1si1cx1rxhqvlsf92"; depends=[dplyr ggplot2 ghql jsonlite lubridate patchwork purrr reticulate rlang scales tidyr]; }; unitedR = derive2 { name="unitedR"; version="0.4"; sha256="0h4i814awb8419693jz3x5cyhs2x6y5flmz339bg6ivmg13d9h3s"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.19"; sha256="1dx9wlx27mwqkr3vmxdgvyjp7k8pbq718r8x1ri3akxigp4rbjcx"; depends=[crayon diffobj]; }; - unitquantreg = derive2 { name="unitquantreg"; version="0.0.5"; sha256="1sb9gh0sdhs2bmybqkbnr82ymfiq1317iiihbgj56xxa4rwx13mg"; depends=[Formula MASS numDeriv optimx quantreg Rcpp]; }; - units = derive2 { name="units"; version="0.8-2"; sha256="0kskk6p1c2zrwkacrl8pwdvvbrlf9xpjsmdpvsb7jvg551hl4i0l"; depends=[Rcpp]; }; + unitizer = derive2 { name="unitizer"; version="1.4.20"; sha256="0s2jgvxdlz95ykdz3mwy6l5iry74qyv716d6fz18jxnixcx6vyss"; depends=[crayon diffobj]; }; + unitquantreg = derive2 { name="unitquantreg"; version="0.0.6"; sha256="087d4v5fpiznl37frjg6c01bfgvx3vx0yw8cnbm3wsdj9dak94ym"; depends=[Formula MASS numDeriv optimx quantreg Rcpp]; }; + units = derive2 { name="units"; version="0.8-4"; sha256="1z672lsyrbm8mjv6ni8pa0cxixf9vi249281ym1ayrv13s4s37a9"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.6-0"; sha256="10k1lx4pzl884m00mx191h5hxcgcsiz9486dbyjvsyhh0hv2xi0v"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.4"; sha256="1kp014bhs8v02fp7misrj4fpfp2na9lg45p5zqvlfaypnm5imsr9"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.1.0"; sha256="0j7fl77my2273k72s8k9v5pcb85swxfipjxmk4vw487i7aq8b1nq"; depends=[psych]; }; @@ -19235,72 +19306,72 @@ in with self; { unnest = derive2 { name="unnest"; version="0.0.4"; sha256="1ajap4r3f4sbp9lnpk1c2if0g30lg4ds9l2l222mxrl45ysrknxa"; depends=[]; }; unpivotr = derive2 { name="unpivotr"; version="0.6.3"; sha256="0j3vlh9g0zkm4gql4myisbmkhpvyqa0sb1dkc0xvvqczs93pzzax"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr tidyselect xml2]; }; unrepx = derive2 { name="unrepx"; version="1.0-2"; sha256="1v27r1lap282zjykki377ni2mmimng81fwmpgs1q6kszvpq8fby6"; depends=[]; }; - unrtf = derive2 { name="unrtf"; version="1.4.2"; sha256="1pdii5l0z7dvcyzi7cbwqii1yn4g54nx1k2qshq86pabcjrka05s"; depends=[sys]; }; + unrtf = derive2 { name="unrtf"; version="1.4.3"; sha256="1jm2rwik6vxbvzal98h8631csln7plwk5jcaaw4yvgwssmp141mk"; depends=[sys]; }; unstruwwel = derive2 { name="unstruwwel"; version="0.2.0"; sha256="1s8vfmh1lafb244r0bwp4m0r9x5la95lglxqvhb4sq9wmah04ka7"; depends=[assertthat dplyr lubridate magrittr purrr R6 rlang stringr tibble tidyr]; }; unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; - untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; + untb = derive2 { name="untb"; version="1.7-7"; sha256="0sd9vapgzy3ifpyl08hm5l7d5g1yvyccqf3n9dyc9x5gmqkvhri1"; depends=[Brobdingnag partitions polynom]; }; unusualprofile = derive2 { name="unusualprofile"; version="0.1.2"; sha256="06z44hkmylp29vdb3l99zai58kvvrgxdji6x0cpiv6cx9216lcp3"; depends=[dplyr ggnormalviolin ggplot2 magrittr purrr rlang tibble tidyr]; }; unvotes = derive2 { name="unvotes"; version="0.3.0"; sha256="1vfyvwqfbxp29x2a0sqng6l5pkp2hc3hadp95ysnpannnsd6x0jw"; depends=[]; }; uotm = derive2 { name="uotm"; version="0.1.6"; sha256="0f8mkamgkyn97n6795hi385lakws6nm8aqwrccpdxhpj1ymmrjv7"; depends=[boot forecast ggplot2 hash]; }; - updater = derive2 { name="updater"; version="0.1.1"; sha256="035js05xzs0i3xs6bizm5ixiiylzhdjkr8z0yijiqiqxw38w6h2l"; depends=[cli renv]; }; + updater = derive2 { name="updater"; version="0.1.2"; sha256="1grf0wv1z8n8fabrj4f5mj9vn9fngkqhniqngspbfkxkgws0rilf"; depends=[cli renv]; }; updog = derive2 { name="updog"; version="2.1.3"; sha256="1i7dc8msky5g658iwcvdvda2m0ya9cnbzm9d565l01lf184dfhhk"; depends=[assertthat doFuture doRNG foreach future ggplot2 ggthemes iterators Rcpp RcppArmadillo reshape2]; }; upndown = derive2 { name="upndown"; version="0.1.0"; sha256="0yri819zib1m7cj669x007183x9062xgz0pmhghbh6mfaz6rbclj"; depends=[cir expm numbers]; }; upsetjs = derive2 { name="upsetjs"; version="1.11.1"; sha256="0flpamy4wfjz1b0wi338rcim2zsh33jpskrq6g8jvljlc4asr485"; depends=[htmlwidgets magrittr]; }; upstartr = derive2 { name="upstartr"; version="0.1.1"; sha256="09xzj423v0x4qvqfgyqpxyg63p8f1n5ppjc8swpyv1747ll5zmg8"; depends=[beepr crayon dplyr ggplot2 glue here knitr librarian magrittr openxlsx purrr readr readxl rmarkdown scales sf stringr textclean tgamtheme tidytext]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; + ura = derive2 { name="ura"; version="1.0.0"; sha256="18gs49hcmii951f995ch1sbk69lpf458halff539l8birv26q70d"; depends=[dplyr irr magrittr rlang tibble tidyr]; }; urbin = derive2 { name="urbin"; version="0.1-12"; sha256="18zskhpcngpw0zanya88l8znhbac5f7a89kq231w59yml9ll7y52"; depends=[]; }; urca = derive2 { name="urca"; version="1.3-3"; sha256="1wg9f691pif59xds43gnnw77mmzc9xpnhhvaksk2b0szffvaifj3"; depends=[nlme]; }; urlchecker = derive2 { name="urlchecker"; version="1.0.1"; sha256="06034lb94krbzawqg5xklwcksvyyzl3qy355f66baj5pw7dms5k2"; depends=[cli curl xml2]; }; urlshorteneR = derive2 { name="urlshorteneR"; version="1.5.7"; sha256="0zfvcwcy2ykvkbnqgxhzxf99shcby81cx8fjbmy6b07rj9407arj"; depends=[assertthat cli clipr httr jsonlite lubridate miniUI shiny stringr]; }; urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.1-2"; sha256="0dsb1vdr2bwy64v889svhvkadg5jl9cl77mfiw79vl18b7ixjzxx"; depends=[]; }; - ursa = derive2 { name="ursa"; version="3.9.10"; sha256="13a7r0l99h9afcbzvx0ndfiq9hmh9ggvh7gndfi64l8v37h1dpvk"; depends=[jpeg png rgdal]; }; + ursa = derive2 { name="ursa"; version="3.10.2"; sha256="01linzsfarvpnzgjsc2zq07z3dvw3wwddd1da5jkfmd086774580"; depends=[png sf]; }; us_census_geoheader = derive2 { name="us.census.geoheader"; version="1.0.2"; sha256="17mss1ggaqkd0ac7g9chgqdrpi5xlbfkxsm1jvj48rp2jfwpp4jw"; depends=[tibble]; }; usa = derive2 { name="usa"; version="0.1.0"; sha256="0scdrd6b48n019f7qp77rrkqgmapnrknalq0hml1cy7m43llqf6d"; depends=[tibble]; }; uscoauditlog = derive2 { name="uscoauditlog"; version="1.0.3"; sha256="156by8lans2jk8kjll88ljc6z5idgvqwkvrgdwjkr4l4xnsz0sif"; depends=[openxlsx readxl stringr]; }; usdampr = derive2 { name="usdampr"; version="1.0.1"; sha256="0x84hzsylg22jhvhn4xhkzv4g8j17g73cpj274n7f8cwzcmpj9sx"; depends=[dplyr httr jsonlite tidyr]; }; usdarnass = derive2 { name="usdarnass"; version="0.1.0"; sha256="10fh9anpmbb7i70q3hjxbplrkqa1q86zgh8nldsf2i526p62hpm1"; depends=[httr jsonlite readr]; }; usdata = derive2 { name="usdata"; version="0.2.0"; sha256="1gnd662v6vcmjvj18c1p61q8lxahkyxnk5dbvf26j6z4jvbhk975"; depends=[tibble]; }; - usdm = derive2 { name="usdm"; version="2.1-6"; sha256="1kr11yxvcb7mjdfw0432sf9280r29c02xcwbx6xggr7f18b0cq5h"; depends=[raster terra]; }; + usdm = derive2 { name="usdm"; version="2.1-7"; sha256="1mr728wmi37kj8m47wjlkc23ifv4rk2fyypyj8rqkpwml5nwjprh"; depends=[raster terra]; }; usdoj = derive2 { name="usdoj"; version="1.1.0"; sha256="0ddvp3qh1ynzzpzq8rgblkb1z5j5jwyzkfgd9xyzdkcby90k7zya"; depends=[anytime dplyr httr jsonlite stringr tibble]; }; usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; usedthese = derive2 { name="usedthese"; version="0.3.3"; sha256="0frdjwqhxkvhahm22vvcyfr464i3mi10y1ynm3k98zypcgp0lkdx"; depends=[conflicted dplyr highr kableExtra knitr purrr readr rlang stringr tibble tidyr tidyselect withr]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.8"; sha256="0jbwfr04y65rlc2aa6483w9qcdqa4bmcx76j4rp9fracfszjb1hg"; depends=[dplyr]; }; + usefun = derive2 { name="usefun"; version="0.5.0"; sha256="1gpyix8xpn4jmfjrycan6r1qvp7z7mhcngp02fcws6k2hvd7jajr"; depends=[dplyr PRROC]; }; usemodels = derive2 { name="usemodels"; version="0.2.0"; sha256="1dc74v4dnbj532cdphskm0y7sqgq1q4yzq634dbvq2bjpqdzf3si"; depends=[cli clipr dplyr purrr recipes rlang tidyr tune]; }; usethis = derive2 { name="usethis"; version="2.2.2"; sha256="0imy9izchr9xzc5wrr91ydfr4jifv8lsqx712zkx0vxfi6kw3n6r"; depends=[cli clipr crayon curl desc fs gert gh glue jsonlite lifecycle purrr rappdirs rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; - usincometaxes = derive2 { name="usincometaxes"; version="0.6.0"; sha256="01b4kz1ggnr7rl714x99z77n0cgch4jsxnysz1314rvj11nk7ciq"; depends=[tibble V8 vroom]; }; + usincometaxes = derive2 { name="usincometaxes"; version="0.7.0"; sha256="018hc48l58p8ybdvdshh2kkl0pm6b8wsqgc0qjcq60z6v8s4sqx4"; depends=[tibble V8 vroom]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.3"; sha256="0hql4bc40xa62r465lm4x14yf8dbhsl046i5k8xlq1qr93cw6pnx"; depends=[nlsr]; }; - usmap = derive2 { name="usmap"; version="0.6.2"; sha256="0d0j3q55ja0lm2dm8rans0v7gklywddxx79c6q2p99py80w2y73n"; depends=[rlang usmapdata]; }; - usmapdata = derive2 { name="usmapdata"; version="0.1.0"; sha256="13a4bj6ixqzfwm60r2c3i9zy96mr2hk77n720zs5i0i16acfnxav"; depends=[]; }; + usmap = derive2 { name="usmap"; version="0.6.3"; sha256="0rhg1llarlbsin1dixbwrnb28xjzsbf5b30i5ijkfr2qjv5nrn2p"; depends=[rlang usmapdata]; }; + usmapdata = derive2 { name="usmapdata"; version="0.1.1"; sha256="1nxxf3s0ldnlg2b662lqg0q5961y20iwb77w5gm4mzb3600das34"; depends=[]; }; ussherR = derive2 { name="ussherR"; version="1.10"; sha256="0awhric6xrhgv4wb9saq7jyikd3h74i6vlq3aqip4i1m9j3ym3k1"; depends=[]; }; - ustfd = derive2 { name="ustfd"; version="0.4.0"; sha256="0xc0xhrny5gf0j9pp3yd46b46pkas5gwyjs0d3j94bp17ms8mi1z"; depends=[dplyr glue httr lubridate purrr readr rlang snakecase stringr tibble]; }; + ustfd = derive2 { name="ustfd"; version="0.4.1"; sha256="1pc5yggffy3y4hg3qpiih9fyw4rzc65s5n650ng05k5xdfjmm7n2"; depends=[dplyr glue httr lubridate purrr readr rlang snakecase stringr tibble]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; - utf8 = derive2 { name="utf8"; version="1.2.3"; sha256="0iv3ppy7sddzl4sm3qlghpc64k6zx5j0jzcia8xx8jhzb638da60"; depends=[]; }; + utf8 = derive2 { name="utf8"; version="1.2.4"; sha256="0zbv2s5dkzxim3ydyk12479m28f68mak9m50v396in4wpm5q53s1"; depends=[]; }; utile_tables = derive2 { name="utile.tables"; version="0.3.0"; sha256="0lsfv5mhyzf1mw2mlyp7xqdin7nhbw473gbibsk1anwmhlvwkipy"; depends=[dplyr purrr rlang tidyselect utile_tools]; }; utile_tools = derive2 { name="utile.tools"; version="0.3.0"; sha256="0qxslz6wi4gss9g16p7q6w99pds81pcp9nkffi8b5wrjxj0z2igq"; depends=[lubridate purrr vctrs]; }; utile_visuals = derive2 { name="utile.visuals"; version="0.3.3"; sha256="1f5zhbsx3iaayh9a92w3hlz8nxbfahdk1j8x62r84yp3aw1skbvz"; depends=[dplyr ggplot2 gridExtra purrr]; }; utilities = derive2 { name="utilities"; version="0.6.1"; sha256="0wcw9gcxd66vhr7vb24y94bgqckfkwvg1rcsxdqaz5r06qn2p9nf"; depends=[]; }; - utility = derive2 { name="utility"; version="1.4.5"; sha256="0a11bxyg8la6yvxr04qbhay05jb2ihd7calc1zcisgj43kq6k7xd"; depends=[]; }; + utility = derive2 { name="utility"; version="1.4.6"; sha256="0785pyapq03kyk9lwxyqvs2fdagay1dg71fjqikr6hidbid5fqr3"; depends=[]; }; utilityFunctionTools = derive2 { name="utilityFunctionTools"; version="0.1.1"; sha256="1225nl83yka31j0adm1210kc89vs3hi9i2pqrykax109sgk0nw97"; depends=[spatstat_geom]; }; utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; }; utiml = derive2 { name="utiml"; version="0.1.7"; sha256="16l64scyipj7plwyv6whv3h040sgvzxx43jhjxyhrcdci4pqwh94"; depends=[mldr ROCR]; }; utr_annotation = derive2 { name="utr.annotation"; version="1.0.4"; sha256="0lldkd5fw86qxngjfvigmkdzynz0712wsk9p51xliqlavivvnpny"; depends=[AnnotationFilter AnnotationHub BiocGenerics biomaRt Biostrings data_table doParallel dplyr ensembldb foreach GenomicFeatures GenomicRanges IRanges keras readr rtracklayer stringr tidyr vcfR xml2]; }; - uuid = derive2 { name="uuid"; version="1.1-0"; sha256="0bzlc2knmr338h4ykx8v8c2a1inizxafj8rh13kwii68gpp50nz7"; depends=[]; }; + uuid = derive2 { name="uuid"; version="1.1-1"; sha256="05mpmgvrfsbm3s593l1fnx8z345djbvrqp5j00sgbrh6nw72848n"; depends=[]; }; uwedragon = derive2 { name="uwedragon"; version="0.1.0"; sha256="00rrklym9ms74ad58cbn4xkibp8k5d12kcrnb68x7b27grvgfnqf"; depends=[gtools]; }; - uwo4419 = derive2 { name="uwo4419"; version="0.3.0"; sha256="0hk5qhyarjxz7ngj5ak37vx0rak6xv0hfb4sdrsbci3kv5fqijv7"; depends=[DescTools dplyr ggplot2 gmodels haven magrittr psych RColorBrewer rio tibble tidyr]; }; uwot = derive2 { name="uwot"; version="0.1.16"; sha256="0j4f7vnb3mwf6p4nhg2limy7i32qrcj2gxbs8wsq9c6xxpcs0qsz"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress]; }; uxr = derive2 { name="uxr"; version="0.2.0"; sha256="0zq89xjbmbc4pmzb3w8frnrqafpxbj2s8lhgj7kvmf6k0yqvpyd3"; depends=[cli dplyr huxtable magrittr purrr rlang scales stringr tibble tidyr]; }; - vDiveR = derive2 { name="vDiveR"; version="1.1.0"; sha256="19rdvpyvmvlmqkxalfgbxrkz6y48w779r42icraa348ph1dc1n7f"; depends=[dplyr gghalves ggplot2 ggpubr ggtext gridExtra magrittr maps plyr readr rentrez rlang scales stringr tidyr]; }; + vDiveR = derive2 { name="vDiveR"; version="1.2.0"; sha256="1f2mvpnsm4kcjwc916258ll0cy9f53zfya42xbdi5x6wds08mi66"; depends=[dplyr DT gghalves ggplot2 ggpubr ggtext gridExtra magrittr maps plyr readr rentrez rlang scales stringr tidyr]; }; vICC = derive2 { name="vICC"; version="1.0.0"; sha256="13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv"; depends=[coda ggplot2 nlme Rdpack rjags]; }; - vMF = derive2 { name="vMF"; version="0.0.1"; sha256="1sygiqyzqikrpdiav0117hnv6zynq1d415v73ygjfj4c1v5l05h0"; depends=[BH Rcpp RcppArmadillo]; }; + vMF = derive2 { name="vMF"; version="0.0.2"; sha256="048hlayd4mqj60np3s9fbryd1fxb6zxzvckz18jp0dbmjbmzwbrl"; depends=[Rcpp RcppArmadillo]; }; vaRiskScore = derive2 { name="vaRiskScore"; version="1.1.0"; sha256="031k19ric26xvrva3rs9894n7ak87h96d2c4ip1lrr0lhhbk3awv"; depends=[]; }; - vaccine = derive2 { name="vaccine"; version="0.1.0"; sha256="03kc9pgpqzfsd2xjkf5zvkbfzdffbpx26g1ispd5yn2y7mbliyjb"; depends=[dplyr fdrtool ggplot2 ggpubr Iso memoise rlang Rsolnp simest SuperLearner survival truncnorm]; }; + vaccine = derive2 { name="vaccine"; version="1.0.0"; sha256="19mg2kiv8m3w8x2b2ran4x8bfq73bg9rijvqs66jqv2zhi6siwkl"; depends=[dplyr e1071 earth fdrtool ggplot2 ggpubr glmnet rlang Rsolnp simest SuperLearner survival survML truncnorm]; }; vacuum = derive2 { name="vacuum"; version="0.1.0"; sha256="0cmlvlz83gyga05g71hrnq4kpck9flq0qlhjviqqz9zrmljzin0x"; depends=[dplyr magrittr]; }; vader = derive2 { name="vader"; version="0.2.1"; sha256="1xjak5xlgpk0ds4l825kq90dg6kk5i5al5zmjqjqn8b7xdgix8mf"; depends=[tm]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; @@ -19316,11 +19387,12 @@ in with self; { validate = derive2 { name="validate"; version="1.1.3"; sha256="020l46qd4fyqr7hksgvsvzlh2ibppwgpfasv8a0schl4vjf29a7j"; depends=[settings yaml]; }; validateIt = derive2 { name="validateIt"; version="1.2.1"; sha256="16lcbn853rfnyh8hlvjdxh4abx6wkzsn876fh4mlfkpbcrnmp0ps"; depends=[here pyMTurkR rlang SnowballC tm]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; - validatetools = derive2 { name="validatetools"; version="0.5.0"; sha256="10wardp2c70zx5ii940sjql3xh5p3vqxv4ayyifhhlr8vzvr5cj0"; depends=[lpSolveAPI validate]; }; + validatesuggest = derive2 { name="validatesuggest"; version="0.3.2"; sha256="0pp2zan5ri3bh4ianqdzgylwbq53n7zcd3pxk85rrqx0jxyj3fy9"; depends=[rpart validate whisker]; }; + validatetools = derive2 { name="validatetools"; version="0.5.2"; sha256="16pgqk96daz0dgsq2r9kfl6mkc4fffkai0ir1sh2js9v6d5c74k0"; depends=[lpSolveAPI validate]; }; valmetrics = derive2 { name="valmetrics"; version="1.0.0"; sha256="1fdaljdfvfmqarxdyjs9pcd8ji2z9i379vcxf65jvnhiaqlsms57"; depends=[]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; - valr = derive2 { name="valr"; version="0.6.8"; sha256="156sqh474synjvdm1j332ab75rqab0n81d674xbgs3rfxlr2ksgz"; depends=[broom cli dplyr ggplot2 Rcpp readr rlang rtracklayer stringr tibble]; }; + valr = derive2 { name="valr"; version="0.7.0"; sha256="038s5n8cbffpb9132rpw7q82cxfzlsc86fcywhv63c8szm5g9nrk"; depends=[broom cli dplyr ggplot2 lifecycle Rcpp readr rlang rtracklayer stringr tibble]; }; valse = derive2 { name="valse"; version="0.1-0"; sha256="0l3fdsgrmalifcxscjsxsfq07v8vipg0rdw6xh94q7xw5gdfsms0"; depends=[cowplot ggplot2 MASS reshape2]; }; valueEQ5D = derive2 { name="valueEQ5D"; version="0.7.2"; sha256="1w1l07s1rfxc1ba6kdq0l1vmb2qib6gmdm91706cmy1azfa92n4d"; depends=[testthat]; }; valuemap = derive2 { name="valuemap"; version="2.0.4"; sha256="1mmk60njwbylgp3nn5lkbkvyw6xkq4gg9k18smjlr47ys6bn6k4p"; depends=[devtools dplyr h3jsr htmltools leaflet sf]; }; @@ -19335,14 +19407,14 @@ in with self; { varImp = derive2 { name="varImp"; version="0.4"; sha256="1bxlfqxi8iiv6raawl9668yhlmbak96ahd0ljzwrilnciqbclc2b"; depends=[measures party]; }; varSel = derive2 { name="varSel"; version="0.2"; sha256="05dk2s4lzd4sxrwsfs2yqsj08qrdrfwx1fs07nb9a8sd0in6vlpj"; depends=[]; }; varSelRF = derive2 { name="varSelRF"; version="0.7-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; }; - varTestnlme = derive2 { name="varTestnlme"; version="1.3.4"; sha256="0rj6zh9cga6h1562jw71iqrczzdrrl9rlmfglj55rjyl03sqr4n4"; depends=[alabama anocva corpcor doParallel foreach lme4 lmeresampler Matrix merDeriv msm mvtnorm nlme quadprog saemix]; }; + varTestnlme = derive2 { name="varTestnlme"; version="1.3.5"; sha256="1qxbx1hwylybm4nza6a7bqgck0krvbcvwabp1710dhkk7skfgk8x"; depends=[alabama anocva corpcor doParallel foreach lme4 lmeresampler Matrix merDeriv msm mvtnorm nlme quadprog saemix]; }; varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; }; varbin = derive2 { name="varbin"; version="0.2.1"; sha256="0gcynwc0vx7qlp3z0pcc4i7mjlnxkwy8ydxz2wr244fw32qgp4kq"; depends=[rpart]; }; varbvs = derive2 { name="varbvs"; version="2.6-10"; sha256="0sjna51mz433s24dkjcq2aal6ss41gx6xlm2l45rm6s1q1k4m87f"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; }; varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; vardpoor = derive2 { name="vardpoor"; version="0.20.1"; sha256="0jqls76xhhxc5hppy3pq5wkj9gjx3g3pzfbhnis7k10ysn76a1qj"; depends=[data_table foreach laeken MASS stringr surveyplanning]; }; - varhandle = derive2 { name="varhandle"; version="2.0.5"; sha256="1l42d0s6fbjjc9l28a2m3myxkrx2c0p0b9yj8wjjjgilw19yc3lv"; depends=[]; }; + varhandle = derive2 { name="varhandle"; version="2.0.6"; sha256="0xy5w7cz9sb0xmxvzajg4sf0ip2ihxc5nimh10awchvkywzgsyjf"; depends=[]; }; variability = derive2 { name="variability"; version="0.1.0"; sha256="1nwb6jlkgzmnhkfcfww3gci5p9g21wwg4z78n8xiq6r760byaz67"; depends=[]; }; variables = derive2 { name="variables"; version="1.1-1"; sha256="13hji43m9nb7rpc8p4bz1qva5jhxwdk16mcprvhb5pxp78w7clyf"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; @@ -19350,6 +19422,7 @@ in with self; { variosig = derive2 { name="variosig"; version="0.3-1"; sha256="09cxigii0sj78yqd18p4mm9jjqvd1k2cgjy43pxpmqdhia0q2pmv"; depends=[gstat sp testthat]; }; varitas = derive2 { name="varitas"; version="0.0.2"; sha256="16y0fcisdf4pypwqshy9c45v57axa25k8cpp1pr2ij95zycs3g1k"; depends=[assertthat doParallel dplyr foreach magrittr openxlsx stringr tidyr VennDiagram yaml]; }; varjmcm = derive2 { name="varjmcm"; version="0.1.1"; sha256="1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x"; depends=[expm jmcm MASS Matrix]; }; + varoc = derive2 { name="varoc"; version="0.1.0"; sha256="1b8dfz56ly8hd36h9jf29irnckbc2v6s5whfmha3ah1bal7k2ajp"; depends=[corrplot pROC]; }; varrank = derive2 { name="varrank"; version="0.5"; sha256="0f2k18v6ygb5cwd6jri9ws97zq47znrqacv2adkd2yqp3jhwd24f"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-9"; sha256="1b3w2vi0szpps7kzy30s1n8h2iaj4jxg82ym6zrza0z7msgmypi8"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.3.0"; sha256="0d18wqq7fbs5ljdphsdgqmv8ab0wrzzykjhf4lqksi7n78s1fa2r"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; @@ -19360,26 +19433,26 @@ in with self; { vaultr = derive2 { name="vaultr"; version="1.1.1"; sha256="1ahn79ixwmnglib3cllha941pvhg1jgk89qcxq4gi7ip8zj0v7sj"; depends=[getPass httr jsonlite R6]; }; vccp = derive2 { name="vccp"; version="0.1.1"; sha256="1c0mk46c74kj5y9rfniywbxxmwb2z16szzpq6b2sw8q0qi1cf5ji"; depends=[mosum mvtnorm VineCopula]; }; vcd = derive2 { name="vcd"; version="1.4-11"; sha256="0ch9ks25ab4h4fh4y267s0psvc4ndyaplk8ddva2j54yd1ayhm3s"; depends=[colorspace lmtest MASS]; }; - vcdExtra = derive2 { name="vcdExtra"; version="0.8-4"; sha256="0xvhnjd131jmhviknchhj5fz5np1g44csyzf0hf5617chf1v2kzb"; depends=[ca dplyr glue gnm here MASS purrr readxl stringr tidyr vcd]; }; + vcdExtra = derive2 { name="vcdExtra"; version="0.8-5"; sha256="09kpfnyi6q7xn4x6f7i3k8g6f2fdnm7kk81lxjmlhhn36jxc2p2i"; depends=[ca dplyr glue gnm here MASS purrr readxl stringr tidyr vcd]; }; vcfR = derive2 { name="vcfR"; version="1.14.0"; sha256="1jq4c8w9lq03q8x448p620wphslbw4zymfxc42ydl1x7wp9dnxl5"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcmeta = derive2 { name="vcmeta"; version="1.2.0"; sha256="070qlyhalnkvz1z2sd5ndirn6py44dfc95ncs7ddvlhpd8lxp6xm"; depends=[ggplot2 mathjaxr Rdpack]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; vcpen = derive2 { name="vcpen"; version="1.9"; sha256="0gg5ln9r7i8rh91pf7789fic4aah22jc259qyg606bax2w57qmi5"; depends=[knitr Rcpp RcppArmadillo]; }; vcr = derive2 { name="vcr"; version="1.2.2"; sha256="0vqq4lwgk9ss3x2vhkmgcymdwfppxjbaycm7pwik70sz9pkdk2d4"; depends=[base64enc crul httr R6 rprojroot urltools webmockr yaml]; }; - vctrs = derive2 { name="vctrs"; version="0.6.3"; sha256="1hm5rw85ln0mk1mfmhgygnhjgs2lyc74cq12ddc41d78rl6j5p4k"; depends=[cli glue lifecycle rlang]; }; + vctrs = derive2 { name="vctrs"; version="0.6.4"; sha256="1j01s27ybzn60p17y7k5n5dzsmjqhgjy634sv0dx4977aqiik04a"; depends=[cli glue lifecycle rlang]; }; vctsfr = derive2 { name="vctsfr"; version="0.1.0"; sha256="0g436m3dkyli06asjr4kdbhdx7mq0pcclmfpvblb5bsqrh5944i1"; depends=[ggplot2 shiny]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.2"; sha256="0mip0v8gv358aadc3b4913dcz27kscx3dv15nwns20pan5jvyhv2"; depends=[]; }; vdar = derive2 { name="vdar"; version="0.1.3-2"; sha256="061ahwf8gyjqs5j9mkqnpn7899mivn4qbygnnzihmv065xj5vpd9"; depends=[compositions]; }; vdg = derive2 { name="vdg"; version="1.2.2"; sha256="0fdqmvzw6dd18w653kfvnw16489jpsyl1395xffhm8rz1dqkrhj1"; depends=[ggplot2 gridExtra proxy quantreg]; }; - vdiffr = derive2 { name="vdiffr"; version="1.0.5"; sha256="1w6hqjb57q6ys9d6d4sh8v2s9hkgg1mkpil8lj1nld5pzir7pgqc"; depends=[cpp11 diffobj glue htmltools lifecycle rlang testthat xml2]; }; - vec2dtransf = derive2 { name="vec2dtransf"; version="1.1.2"; sha256="1diwj005b0mzcik2v7phdbn792qy907cna3mzwr4sj21igjrhkmx"; depends=[sp]; }; + vdiffr = derive2 { name="vdiffr"; version="1.0.7"; sha256="1ljj94swqgs8pvicdrlals6pckm7knwfvxxmmbhhi2zfcxdjwhzd"; depends=[cpp11 diffobj glue htmltools lifecycle rlang testthat xml2]; }; + vec2dtransf = derive2 { name="vec2dtransf"; version="1.1.3"; sha256="0sxsbm1q7v58b907xvpppwfljmqm2pyrch2zc82nmb10wfiha8k8"; depends=[sp]; }; veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; }; - vecsets = derive2 { name="vecsets"; version="1.3"; sha256="1pc68v0vrn1fxh7x8cb45m0xfb0228naz4i1cnizbvll6almh5hr"; depends=[pracma]; }; + vecsets = derive2 { name="vecsets"; version="1.3.1"; sha256="1wp5pbjgw6smivmf4rgy0y2gspgbcwb2js8y657jd1spzl5bbvfr"; depends=[pracma]; }; vectorwavelet = derive2 { name="vectorwavelet"; version="0.1.0"; sha256="1z0gl28hgrqgx0ynv248a80fh190pm15c9cg1l1665acrw62kqs7"; depends=[biwavelet fields foreach iterators maps Rcpp spam]; }; vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; vegan = derive2 { name="vegan"; version="2.6-4"; sha256="01hxlb5sy0d28ajq993fqs4z0qjcyl610d0ahjyjpbkrpszd92jx"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.2-0"; sha256="15yb521l487krvhh0bnbawxxd03sqwha4njh9i0na4zx3hrlpqgi"; depends=[cluster rgl scatterplot3d vegan]; }; - vegawidget = derive2 { name="vegawidget"; version="0.4.2"; sha256="0rnr54h11gd2x2llypdvaai6v8z3nk5fbpb7zd0dcy7hh55ncfcs"; depends=[assertthat digest glue htmltools htmlwidgets jsonlite magrittr rlang]; }; + vegawidget = derive2 { name="vegawidget"; version="0.4.3"; sha256="0p09nj45cxv35x84fmdk485v82wbjr724xi1f07p9zd9kn7vmpsf"; depends=[assertthat digest glue htmltools htmlwidgets jsonlite magrittr rlang]; }; vegclust = derive2 { name="vegclust"; version="2.0.2"; sha256="18v1iqgabhsdxi76kvy9wgp9h2i17aw4c43kcki7lzyqiyyql0nx"; depends=[vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.11.4"; sha256="14vmxxpnq3kasciqzxipl21kdlqv7m3dmcr4v8wlm6q2l9cnpzdy"; depends=[curl DBI dbplyr dplyr foreign hoardr httr indicspecies magrittr plyr RCurl RSQLite stringr xml2]; }; vegperiod = derive2 { name="vegperiod"; version="0.4.0"; sha256="0m10m85cf0qk2q2ln1qziqicv79rbjqqi9py18r412j7m43pn013"; depends=[]; }; @@ -19388,18 +19461,17 @@ in with self; { velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; vembedr = derive2 { name="vembedr"; version="0.1.5"; sha256="1hmwgrp9vj7qwmsvnvgry8h707kj53wp5chpxqsbgxi9jryabpc0"; depends=[assertthat glue htmltools httr lifecycle magrittr stringr]; }; venn = derive2 { name="venn"; version="1.11"; sha256="054ky4sh47p5fw271ag79p84vdxm5bqa6gw0dvkz2y00r73ibn9k"; depends=[admisc]; }; - vennLasso = derive2 { name="vennLasso"; version="0.1.6"; sha256="0maydvx0qhdn5alqzqxjn485y9hw9qdr1xvgkmgwnjq59vni6d31"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; }; venneuler = derive2 { name="venneuler"; version="1.1-3"; sha256="0znr5l41mpappv2agji4nxr42vydhd35jbmjwzwapgahff2arlr1"; depends=[rJava]; }; vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; }; verbaliseR = derive2 { name="verbaliseR"; version="0.1"; sha256="16ndjpsfp700h5wz3y7hram6x8lp4piykcrz7y4ybrkgwyaik851"; depends=[stringr]; }; - verbalisr = derive2 { name="verbalisr"; version="0.5.0"; sha256="12qnjspn1y5sfjmicfc6wm1vcbyzhwqldx9n56xsnqsk9589690a"; depends=[pedtools ribd]; }; + verbalisr = derive2 { name="verbalisr"; version="0.5.1"; sha256="0nyydh6mlw2di7cmhdr1x8rm8gdsdnnc45kgx84mb2y6vb0275k4"; depends=[pedtools ribd]; }; verhoeff = derive2 { name="verhoeff"; version="0.4.0"; sha256="0kpxpl5s5342ajg22cwb7y9ks240drp37q1g67n19krdy6ih14kz"; depends=[]; }; verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; }; vermeulen = derive2 { name="vermeulen"; version="0.1.1"; sha256="10jlgrwpgkfiwlyli6mpd0wavi71h39sj6mklnvfskhnblvqdrz8"; depends=[memoise]; }; versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; }; versionsort = derive2 { name="versionsort"; version="1.1.0"; sha256="00r0h2iqlfq0nidqbhx4fv29rlppfx43jv2n2zp38lpx5vbqjhnj"; depends=[]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; - vetiver = derive2 { name="vetiver"; version="0.2.2"; sha256="1ah7mcyzdc7cnhza8zhs8g7vwvffwxqnrhx24rfn6jrlng1yk6is"; depends=[bundle butcher cereal cli ellipsis fs generics glue hardhat lifecycle magrittr pins purrr rapidoc readr rlang tibble vctrs withr]; }; + vetiver = derive2 { name="vetiver"; version="0.2.4"; sha256="19yz8p4w3rqyzsr2xb8ryav566b2321zy3h34gaxlz0am0wsryw3"; depends=[bundle butcher cereal cli ellipsis fs generics glue hardhat lifecycle magrittr pins purrr rapidoc readr rlang tibble vctrs withr]; }; vetr = derive2 { name="vetr"; version="0.2.15"; sha256="0858wivgdbjs4qww6szi32ifc4l0a3nx0c0zf2778d4nxs9zgxk2"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vfinputs = derive2 { name="vfinputs"; version="0.1.0"; sha256="10fh6ybsqy9xm7gwl0kska0pgk810sgq9kvf86gmnm0pmrcqzsdh"; depends=[htmltools jsonlite scales shiny]; }; @@ -19414,21 +19486,24 @@ in with self; { vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; vietnameseConverter = derive2 { name="vietnameseConverter"; version="0.4.0"; sha256="1bnscv1yz4hr6cvpavdj2gjn6dqy96rbagxl9280a2xxav09mps3"; depends=[gsubfn sf utf8]; }; viewpoly = derive2 { name="viewpoly"; version="0.3.2"; sha256="1say30d46vj67ng5mprhwl02jf9d0kv573j80r05z08szmcm4sxb"; depends=[abind config curl dplyr DT ggplot2 ggpubr golem JBrowseR markdown plotly reshape2 shiny shinydashboard shinyjs shinythemes shinyWidgets tidyr vroom]; }; - viking = derive2 { name="viking"; version="1.0.1"; sha256="1wrkv044646756fmc4bmij06pbmzyi8jydbpisngs3pa4wnixcvw"; depends=[]; }; + viking = derive2 { name="viking"; version="1.0.2"; sha256="145xrfifdqnzclzx2c7aj89yw5sd8f34jijpia595dy30lssywwi"; depends=[]; }; villager = derive2 { name="villager"; version="1.1.1"; sha256="0g72zpsqi39ax44n3s3x66b1fbgyx6w2wraf531jsy7vj95ivr2p"; depends=[R6 readr uuid]; }; - vimp = derive2 { name="vimp"; version="2.3.1"; sha256="1m88zjxv6zjbbln851kwj9wfam59q8z93s6dz6lmga530d7z4xja"; depends=[boot data_table dplyr magrittr MASS rlang ROCR SuperLearner tibble]; }; + vimp = derive2 { name="vimp"; version="2.3.3"; sha256="069pcxzavi213idpslnc1skylsb1wn6xldajnn54prlwq9hkfb19"; depends=[boot data_table dplyr magrittr MASS rlang ROCR SuperLearner tibble]; }; vimpclust = derive2 { name="vimpclust"; version="0.1.0"; sha256="0ly7piz7q88sh2g7zq5b2pqph9467b4fclgq9amm0m7xc8vrv4f9"; depends=[ggplot2 mclust PCAmixdata Polychrome rlang]; }; vindecodr = derive2 { name="vindecodr"; version="0.1.1"; sha256="0yvchdf90l8lkzyba5wrpma6vjcgf19li159s8s79y8sgp5pyx7p"; depends=[httr]; }; - vinereg = derive2 { name="vinereg"; version="0.8.3"; sha256="0d1ibrhjsbjaaz2cd9lg76cjplkys716i689khzaiv4sgbjhwdh1"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; + vinereg = derive2 { name="vinereg"; version="0.9.1"; sha256="11k20h2kldlpf880znkjw3afxg9sr5zl7ssll5agl0kxcxi82fwx"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinplotter = derive2 { name="violinplotter"; version="3.0.1"; sha256="1xy57mycdsr9qr48n1jrw0nzwz848r0xcns864d8gyc8zikp3x6a"; depends=[]; }; vioplot = derive2 { name="vioplot"; version="0.4.0"; sha256="1db7g0378jbcd6ssb7afff4y4r0v472qnb625hfwixx4wf1v8aap"; depends=[sm zoo]; }; - vip = derive2 { name="vip"; version="0.4.0"; sha256="1x48hj6vq07vmvskcif9cjqbyhpbijn4s1kjy7z8ra1gbwxw4zyi"; depends=[foreach ggplot2 tibble yardstick]; }; + vip = derive2 { name="vip"; version="0.4.1"; sha256="0n87g2z354az0scsf7w7n144p77yv1mk96w5vacn25p7jlldsram"; depends=[foreach ggplot2 tibble yardstick]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; + viraldomain = derive2 { name="viraldomain"; version="0.0.2"; sha256="0wcardcv3r0v9v80c93wmkkmqr3abb60cn1yny4vv0ls41a08g14"; depends=[applicable dplyr earth ggplot2 nnet parsnip recipes vdiffr workflows]; }; + viralmodels = derive2 { name="viralmodels"; version="1.1.0"; sha256="0k5hmg52zkmqvf8wk0hiyykvm179a29w4969ajjnf4qrsgiiaia0"; depends=[dplyr earth kernlab nnet parsnip recipes rsample tidyselect tune vdiffr workflows workflowsets]; }; + viralx = derive2 { name="viralx"; version="1.1.0"; sha256="054w54m0k1z6jlfz6pp3nlarnady9kndvmmr5ibp7j14jyg7jhxy"; depends=[DALEX DALEXtra dplyr earth Formula parsnip plotmo plotrix recipes rsample TeachingDemos vdiffr workflows]; }; viridis = derive2 { name="viridis"; version="0.6.4"; sha256="1p6n85js15lx0zx07v2dxnb6wx4xzlbvrljf0x6vxy4gqf5si8hb"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.4.2"; sha256="18g1rk24kr47jl01r70vvni2146fl9xxpjcvjp6d5k6y64fi2gw9"; depends=[]; }; virtualPollen = derive2 { name="virtualPollen"; version="1.0.1"; sha256="0caiyl7h9qn3nv34dafv5rs4v7n4avyjpng0rkz6aw3ri1zn8sa0"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; }; - virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; }; + virtualspecies = derive2 { name="virtualspecies"; version="1.6"; sha256="1bqrh17fcskklsdkwkg9lvlki67jigr0c32mq4bfl16iisrc1342"; depends=[ade4 raster rnaturalearth terra viridis]; }; virtuoso = derive2 { name="virtuoso"; version="0.1.8"; sha256="1smb8sjfqcp3jflplgf92swasxzrp72fnnqwyisf87pjknm91qsc"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; }; virustotal = derive2 { name="virustotal"; version="0.2.2"; sha256="020kwhki5740857zd24xm18dg3whzhf527qhmfx1cxyqyld404wy"; depends=[httr plyr]; }; visNetwork = derive2 { name="visNetwork"; version="2.1.2"; sha256="116w3l65lgv18xzav5zz1pbgwpwck66n9cjpja9axrl9zi19vja7"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; @@ -19437,7 +19512,7 @@ in with self; { visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; }; visa = derive2 { name="visa"; version="0.1.0"; sha256="1mx7nbbpxs4fdp781a75qvffa42dx2n6anslbfs9bnprmvzmljqr"; depends=[ggplot2 ggpmisc Matrix RColorBrewer reshape2]; }; visaOTR = derive2 { name="visaOTR"; version="0.1.0"; sha256="12ix8ljbykwf493hw6npli2ad665jip2mzb8p25j5v10f8ij88qm"; depends=[e1071 kernlab Matrix mboost randomForest Rglpk xgboost]; }; - visachartR = derive2 { name="visachartR"; version="3.1.0"; sha256="0jwhb5ad6n9pcxx2ss6jzxj9gzi448x2ssw07h3igs7bxjh47lp1"; depends=[htmlwidgets]; }; + visachartR = derive2 { name="visachartR"; version="3.2.0"; sha256="19pg6r8gix0017q629cq5bmpk4hamw62sr3l1qqbx55naj7aawfr"; depends=[htmlwidgets]; }; visae = derive2 { name="visae"; version="0.2.0"; sha256="0ycwb380z8nb646w7w42952lwvdi8prmph7yv1lraswvp4wjfx3p"; depends=[ca dplyr DT ggplot2 ggrepel magrittr rlang shiny shinyjs tidyr]; }; viscomp = derive2 { name="viscomp"; version="1.0.0"; sha256="18s9qapznc50xwjr3lx48nsn9prji8n13byqzvhy151wm4anak7k"; depends=[circlize dplyr ggExtra ggnewscale ggplot2 Hmisc MASS netmeta plyr qgraph reshape2 tibble tidyr]; }; viscomplexr = derive2 { name="viscomplexr"; version="1.1.1"; sha256="1b45yi5xv4vq52pfa064ll3ghxgkwpbknzq94gg60vcvb7spd0if"; depends=[doParallel foreach plotrix Rcpp Rdpack scales]; }; @@ -19445,17 +19520,17 @@ in with self; { visit = derive2 { name="visit"; version="2.2"; sha256="0mrwah122w9dyivyzs8xlv6vq9w8bpr468zjjw5q974wk7h31mk4"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools sqldf StanHeaders]; }; visreg = derive2 { name="visreg"; version="2.7.0"; sha256="070yhyxxh3w16i54k790n47bgcjn4b10b6g1z553x6afjc3l3a6d"; depends=[lattice]; }; vistime = derive2 { name="vistime"; version="1.2.3"; sha256="18gqx71mpjsccfnab11j3g8wl11x2sk7bbjbcpi23qsk5d7sy112"; depends=[assertive_types ggplot2 ggrepel plotly RColorBrewer rlang]; }; - vistla = derive2 { name="vistla"; version="1.1.0"; sha256="117gng2kp3ngmi9w6h3qcradqc0dmb2alm1j41zpygkby6v8b1jw"; depends=[]; }; + vistla = derive2 { name="vistla"; version="2.0.0"; sha256="1c6mk5wx0zj43m8k67cjlkzwb4jqnszjwmpkcmk7qgiqkfn1brmn"; depends=[]; }; vistributions = derive2 { name="vistributions"; version="0.1.2"; sha256="1nzkbyqks38n7gp55iqhrlxqyfwxk4fvqzi9vsb45h0m0hlmwhxr"; depends=[ggplot2 magrittr]; }; visualFields = derive2 { name="visualFields"; version="1.0.1"; sha256="1z62xappwjdv9f7ql5spydkb626rdj3hvpvzy3d71fwm0y3qwki3"; depends=[boot combinat deldir dplyr DT gtools Hmisc htmlTable oro_dicom plotrix polyclip pracma rlang shiny shinyjs XML]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; visualpred = derive2 { name="visualpred"; version="0.1.0"; sha256="19jq9h9kiv4vbzqz8zrv5gqb1bprq5jy7mcxvdwpfnna2rja6q4z"; depends=[data_table dplyr e1071 FactoMineR gbm ggplot2 ggrepel magrittr MASS MBA mltools nnet pROC randomForest]; }; - visvow = derive2 { name="visvow"; version="1.3.9"; sha256="08cbh2hqvxmd1j1y6p3aigmj6f6fdpw3ffda09j3himmfnxaw1y3"; depends=[Cairo dplyr DT effectsize formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS shinybusy splitstackshape svglite tidyr tikzDevice WriteXLS]; }; + visvow = derive2 { name="visvow"; version="1.3.10"; sha256="0c5gwc8p3kb36kcfswn7k6v8bvm2d9dw4hxd61gvq28s1j2f1492"; depends=[Cairo dplyr DT effectsize formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS shinybusy splitstackshape svglite tidyr tikzDevice vegan WriteXLS]; }; visxhclust = derive2 { name="visxhclust"; version="1.1.0"; sha256="1wx16mg5g58p4mgf5y776i5ahgpqqjy4wbfqhfjph36mrhs6qr22"; depends=[bsplus circlize cluster clValid ComplexHeatmap dendextend dplyr DT dunn_test fastcluster ggplot2 kableExtra knitr patchwork RColorBrewer readr shiny shinycssloaders shinyhelper tidyr]; }; vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; vitae = derive2 { name="vitae"; version="0.5.3"; sha256="19qcympcs9w9klrvhz5ls4p6186dcddv5dv7kn7jkc0js84i9sbv"; depends=[dplyr glue jsonlite knitr pillar rlang rmarkdown tibble vctrs xfun yaml]; }; vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; - vivainsights = derive2 { name="vivainsights"; version="0.3.1"; sha256="0zr8l54sgcxsiqqiq3bvq6zp0i6j8f3p41p3g4fhma1n4dgk65ns"; depends=[data_table dplyr DT ggplot2 ggraph ggrepel ggwordcloud htmltools igraph magrittr markdown networkD3 purrr reshape2 rmarkdown scales tidyr tidyselect tidytext wpa]; }; + vivainsights = derive2 { name="vivainsights"; version="0.4.2"; sha256="16iynrx9jk8zk8592fzbhbr42ppgpb159y38vx7sql901pxrfpj5"; depends=[data_table dplyr ggplot2 ggraph ggrepel ggwordcloud htmltools igraph lifecycle magrittr markdown networkD3 purrr reshape2 rmarkdown scales tidyr tidyselect tidytext wpa]; }; vivaldi = derive2 { name="vivaldi"; version="1.0.1"; sha256="1dvihjc6vjzg2w1j0q6vjhlhpwkknwsd97lpbqbfpacpp337mvx8"; depends=[dplyr ggplot2 glue magrittr plotly seqinr tidyr tidyselect vcfR]; }; vivid = derive2 { name="vivid"; version="0.2.8"; sha256="0zl9p8dsrz9lmylnfxj4b50g1lvk7563ss0w3k1pidkwrs4kazin"; depends=[colorspace condvis2 DendSer dplyr flashlight GGally ggalt ggnewscale ggplot2 igraph RColorBrewer sp]; }; vivo = derive2 { name="vivo"; version="0.2.1"; sha256="1cfval06byviw7himr5nql34h4jaway9gb6dzya3v994p7v851cg"; depends=[DALEX ggplot2]; }; @@ -19470,11 +19545,12 @@ in with self; { vocaldia = derive2 { name="vocaldia"; version="0.8.4"; sha256="1nr1w85m4xhk6777iqww94mb82c3smfhr96mybpi9m1kk7f6rv0i"; depends=[]; }; voi = derive2 { name="voi"; version="1.0"; sha256="1ncxlswjh5z239kipb3mq5j0xvxawhrxd4w6jmdz150gq510nccq"; depends=[dbarts earth ggplot2 gridExtra Matrix mgcv mvtnorm posterior progress]; }; voice = derive2 { name="voice"; version="0.4.21"; sha256="0fh1k0596npm6yah992g3hc79g6lh12b7k97nnxlm1pgpdbb503v"; depends=[dplyr R_utils reticulate seewave tibble tidyselect tuneR wrassp zoo]; }; + voiceR = derive2 { name="voiceR"; version="0.1.0"; sha256="1bc2h04i9l76wqrw93brg5ivpgd0pq20zq2nq8x7p851jfxz84p4"; depends=[doParallel DT foreach FSA ggplot2 ggpubr ggthemes gridExtra gtable kableExtra knitr MASS phia plotly rcompanion rlang rmarkdown seewave shiny shinyFiles shinyjs soundgen stringr tuneR xfun]; }; vol2birdR = derive2 { name="vol2birdR"; version="1.0.1"; sha256="0f6zjrsi7slw7wx84q4iq1afmwclmwjq8ly1r4m9l2hkfg3nclim"; depends=[assertthat pkgbuild Rcpp RcppGSL rlang withr]; }; volatilityTrader = derive2 { name="volatilityTrader"; version="1.0.1"; sha256="1zz6286kmzcj8k66mpj9nidsf86dkw2ms75ck6rrvnl5h1idcacj"; depends=[dplyr ggplot2 magrittr tibble]; }; volcano3D = derive2 { name="volcano3D"; version="2.0.9"; sha256="1k1n49pzsdkwia09mf9ra75cbnx49q99ygn5c92kyq8kqv83d1w8"; depends=[ggplot2 ggpubr htmlwidgets magrittr matrixTests plotly Rfast rlang]; }; volcanoPlot = derive2 { name="volcanoPlot"; version="1.0.0"; sha256="06nkv56c36wgnb7s6gkpp14syzhm5zm2wdfjx9wamxp5cf0wk3mk"; depends=[dplyr DT fmsb ggplot2 purrr shiny tidyr]; }; - volesti = derive2 { name="volesti"; version="1.1.2-6"; sha256="1ykmxl12ap21ds23nqlc861zn24hs9y7h0kkihyhpxnwfvyx1fbp"; depends=[BH Rcpp RcppEigen]; }; + volesti = derive2 { name="volesti"; version="1.1.2-7"; sha256="1x730da30y763j6dcdahspbpf81zqaazqzfvfznsi0kq05856z2n"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; voluModel = derive2 { name="voluModel"; version="0.2.0"; sha256="1ym9cpx4ygzh9956y7sg1zl5kagamkg1wmr3ydzff1gz6ldg7gam"; depends=[dplyr fields ggplot2 ggtext modEvA rangeBuilder sf terra viridisLite]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; @@ -19492,24 +19568,23 @@ in with self; { voxel = derive2 { name="voxel"; version="1.3.5"; sha256="1xlym8xc22dq67h0lylrr16z7b4zdidpgrkvbs7n9fnkh6vijw2j"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti purrr]; }; vpc = derive2 { name="vpc"; version="1.2.2"; sha256="15s9f6hmqawv2594xqv58hnqg2wm1fm8qaj8h9k4m55cx4sf1hik"; depends=[classInt dplyr ggplot2 MASS readr stringr survival tidyr]; }; vprr = derive2 { name="vprr"; version="0.2.3"; sha256="02hx3wbj921fsir8yldkgcygci01w1171bxsxi2khplck4gkqn9i"; depends=[cmocean dplyr ggplot2 gridExtra gsw interp lubridate magick metR oce stringr tidyr usethis withr]; }; - vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrnmf = derive2 { name="vrnmf"; version="1.0.2"; sha256="0n0kmzhygaii9kipcmr943s0vcf8brxgsk25m9illd4fij6nwpp2"; depends=[ica lpSolveAPI Matrix nnls quadprog]; }; - vroom = derive2 { name="vroom"; version="1.6.3"; sha256="0qsz38v64b51jpm2s93lcci4xjjxs8sws4l4p1iwymsa5gjh0j6w"; depends=[bit64 cli cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect tzdb vctrs withr]; }; - vrtest = derive2 { name="vrtest"; version="1.1"; sha256="136p6qhw7ick8dy7gkhv8dww7ici0zg47rk2qmvc9lc1q55j4kf1"; depends=[]; }; - vscc = derive2 { name="vscc"; version="0.6"; sha256="100r5zs39b7wzn1wdxqjgh7nnxwqkwfvmz8xwm572vmwmnn7iv4i"; depends=[ManlyMix mclust teigen]; }; + vroom = derive2 { name="vroom"; version="1.6.4"; sha256="0kg25b3drfv4dgvciwsv6wgw6v0lf1maigyhllw9hh114rmzjild"; depends=[bit64 cli cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect tzdb vctrs withr]; }; + vrtest = derive2 { name="vrtest"; version="1.2"; sha256="1ln1ayh18q5lxiavznq19ccwb90dviw5ncbwpbghiawa1i0q42d2"; depends=[]; }; + vscc = derive2 { name="vscc"; version="0.7"; sha256="082jxk8fw4rplal9672bi6rr1jwpb5h6clrdlv9jj4ffvlbg6vaz"; depends=[ManlyMix mclust MixGHD teigen]; }; vsd = derive2 { name="vsd"; version="0.1.0"; sha256="18whnvary4glblzx1vxf3yzsllnnnbnyijwhbw7bi3agppnwrf22"; depends=[dplyr flexsurv ggplot2 ggpubr magrittr muhaz survival survminer]; }; vsgoftest = derive2 { name="vsgoftest"; version="1.0-1"; sha256="0vypi4cf04bljmx3jwq3ixs86ivd6p7a825ik189y71fyqg9g70v"; depends=[fitdistrplus Rcpp]; }; vsp = derive2 { name="vsp"; version="0.1.1"; sha256="0aa3vqzazh0x5irbmqh9ac1xiprwnbgbrjl9bybxzynl91hwg9yw"; depends=[ggplot2 glue invertiforms LRMF3 magrittr Matrix rlang RSpectra tibble withr]; }; vstdct = derive2 { name="vstdct"; version="0.2"; sha256="0g26cplp5vjppyw8w37vdy3wah3i9wi14j64vl7i8d2fjbhqhqxp"; depends=[dtt MASS nlme]; }; vstsr = derive2 { name="vstsr"; version="1.1.0"; sha256="071nfxkwwpbp2d8khxq7d1pp268pa1fcfj619bs6xwg4wk9srr3k"; depends=[httr jsonlite R6 RCurl]; }; - vtable = derive2 { name="vtable"; version="1.4.4"; sha256="1fc8p4d7c7jy2sxpcbf1qjaq2qz678v0ivlmrxphbmdh6x2lscwy"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; - vtreat = derive2 { name="vtreat"; version="1.6.3"; sha256="181nsjl811m3k1123bvgnnwr253sc2mbj4ljzmawz9wl7dfbwfij"; depends=[digest wrapr]; }; + vtable = derive2 { name="vtable"; version="1.4.5"; sha256="158sywrzqkiy0n7g7zk5d8k51lsc6x1886g5sbr8n0khvdhpnfs6"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; + vtreat = derive2 { name="vtreat"; version="1.6.4"; sha256="1b32rrmnkpm53vgdg479q4wwzlgcisbz9x24rvcn42pjm9r8wwf8"; depends=[digest wrapr]; }; vtree = derive2 { name="vtree"; version="5.6.5"; sha256="0qszya11qh2xzq1blbrcli3l8hhf0dannhh2hn3gi59c9dn3jr16"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny utf8]; }; vtype = derive2 { name="vtype"; version="0.8"; sha256="0j070bn86a6hlg99h2qaf0dlbnjjsmx1zdcmvl3acymr31bqyvrj"; depends=[randomForest]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; - vueR = derive2 { name="vueR"; version="0.5.3"; sha256="0am4iwgadi9c9f7zm5zx3nrzyhy7w1qgp9rkyypzwb6bicjjb9cz"; depends=[htmltools htmlwidgets]; }; + vueR = derive2 { name="vueR"; version="0.6.0"; sha256="07l1q5dgwplcfcp1ipbcx2i4d54f7fn4rclb71yb7ms2g98lq1gw"; depends=[htmltools htmlwidgets]; }; vvauditor = derive2 { name="vvauditor"; version="0.5.8"; sha256="0b8gflvvhxasaxhkyc45qr6z07xk22kh3g4n9rgbsl4816g8x64m"; depends=[dplyr findR magrittr stringr]; }; - vvcanvas = derive2 { name="vvcanvas"; version="0.0.2"; sha256="1f5xmgz08sx4a9mgc6id4y1jqnh5jf828vyd439gpbzr52b67dmm"; depends=[dplyr htm2txt httr jsonlite magrittr purrr rlang stringr tidyr]; }; + vvcanvas = derive2 { name="vvcanvas"; version="0.0.3"; sha256="1dm8d9zammsgl7rq07m0a2brrb2vxinyqpwcmvlpls2aphgsg077"; depends=[dplyr htm2txt httr jsonlite magrittr purrr rlang stringr tidyr]; }; vvconverter = derive2 { name="vvconverter"; version="0.5.8"; sha256="12bnrrvbad7njgqvkb0hp1a041qnyvfiqlg1aaqkym29wlc2zwk3"; depends=[dplyr lubridate stringr]; }; vvfiller = derive2 { name="vvfiller"; version="0.6.7"; sha256="0kknnnkfdw9h4wxs215pgmg1j0mbl5lqfw4xl0il8rw6n0yy7vsn"; depends=[dplyr purrr rlang]; }; vvmover = derive2 { name="vvmover"; version="1.5.10"; sha256="1aaky8vs9yl9k3qfd3lm4wj234gp5z0pgff1lfqj2p0av18q6nn8"; depends=[dplyr readr readxl]; }; @@ -19518,7 +19593,7 @@ in with self; { vvtableau = derive2 { name="vvtableau"; version="0.2.0"; sha256="0vlqp8m8ygknf1dak35w0kdzhsinazzwqp92488l9f447r8r7gz8"; depends=[data_table dplyr httr jsonlite magrittr purrr stringr tidyr XML xml2]; }; vvtermtime = derive2 { name="vvtermtime"; version="0.0.1"; sha256="0c7cry87wgk86wydrw0l8icc25lx5fcxzm1wyfs2ls8ppmpkz3l7"; depends=[httr jsonlite magrittr]; }; vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; - wCorr = derive2 { name="wCorr"; version="1.9.6"; sha256="1f71fxn1cp0rgjf7lmx49dll35ys3lz7s8pw2qrfy59c86wnqvhs"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; + wCorr = derive2 { name="wCorr"; version="1.9.8"; sha256="0ja51w17q80r7xpwqhzn416b48ji9178026wf5ibm4s0hsfz7vb2"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; wINEQ = derive2 { name="wINEQ"; version="1.2.0"; sha256="1b47dxa9q34xylp2bvzl0c9bbsd2l4fw8avq50575sc3w3v0bs62"; depends=[dplyr sampling]; }; wISAM = derive2 { name="wISAM"; version="0.2.8"; sha256="0c5ic98ihpzkycsj9wg0127civm4w1rmkkw6zsjp8sfn20cl8a8z"; depends=[MASS]; }; wNNSel = derive2 { name="wNNSel"; version="0.1"; sha256="19j2yz6lvkxpmjr0vv6pjc7j1c02y0hb3gay5sy1y0xk706aggb5"; depends=[]; }; @@ -19526,30 +19601,29 @@ in with self; { wTO = derive2 { name="wTO"; version="2.0.2"; sha256="0c5cr48h2zvp629iyg1n05fgh1v2wvc5bmzc75c1flrj2rrfs83v"; depends=[data_table HiClimR igraph magrittr plyr reshape2 Rfast som visNetwork]; }; wacolors = derive2 { name="wacolors"; version="0.3.1"; sha256="0c5ja70vgb2f1l2k5j7amxhkydbj44nc290ccr816xglj31nvsiy"; depends=[ggplot2 scales]; }; wactor = derive2 { name="wactor"; version="0.0.1"; sha256="0dc7413jb3yz0nns2lc93w32wv6m4sg17j2ip63gc12vis0nf855"; depends=[ggplot2 Matrix R6 text2vec tibble tokenizers xgboost]; }; - waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; }; + waffle = derive2 { name="waffle"; version="1.0.2"; sha256="17z05mlnp2k9dywr0bbqz633sq1xs8q9879bl2na1in39qxq0l76"; depends=[curl DT extrafont ggplot2 gridExtra gtable htmlwidgets plyr RColorBrewer rlang stringr]; }; waiter = derive2 { name="waiter"; version="0.2.5"; sha256="0ya92qr25ssfkzn888b7rr8rn0304f3gz4h4pnc2a95rknbmxhls"; depends=[htmltools R6 shiny]; }; wakefield = derive2 { name="wakefield"; version="0.3.6"; sha256="1rssh6v8m6fim2pvm4cjw8cbni77bv5qp0rwi6vwdl3jhi5zws7n"; depends=[chron dplyr ggplot2 stringi]; }; wal = derive2 { name="wal"; version="0.1.0"; sha256="0n81c2i2wzmy33kk1k4zjjgv1irh8xqw05clif8n86qr4m0a01sv"; depends=[freesurferformats imager jpeg png spacesXYZ]; }; waldo = derive2 { name="waldo"; version="0.5.1"; sha256="0inzdwna22axhjw0jdrk800g7zbkpcs7g1cmdi83r7j4zxn0ggs5"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; - walkboutr = derive2 { name="walkboutr"; version="0.1.0"; sha256="1rv5pc2zqlx4b71mab3k6cjc1mfhg15aakl5vc1746z7ypsb2whn"; depends=[data_table dplyr geosphere ggforce ggplot2 lubridate lwgeom magrittr measurements sf sp tidyr]; }; - walker = derive2 { name="walker"; version="1.0.7"; sha256="1kgrka1pkk0fb1gx31dx7g3alq9jb4gfxbsadcdj0j5n2hx6ba8d"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS loo Rcpp RcppArmadillo RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; + walkboutr = derive2 { name="walkboutr"; version="0.4.0"; sha256="0w1fav70w9y44p9d32qfsyihzlprmcxwcrbjg0v9fdm31w498qgj"; depends=[data_table dplyr geosphere ggforce ggplot2 lubridate lwgeom magrittr measurements sf sp tidyr]; }; + walker = derive2 { name="walker"; version="1.0.8"; sha256="1y8jj3kf8wrkw3rkai0scnakb9cyb8dbvhji3vprs3cyprcrkf4r"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS loo Rcpp RcppArmadillo RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; walkscore = derive2 { name="walkscore"; version="0.1.2"; sha256="0ayqkmj7iramg234n3ygvssqjy70jw7x327xjzn2izdyfww59z8k"; depends=[dplyr httr tidyr]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="2.0.5"; sha256="1gwlnph0dwivn7zpv6pd2gyhaampfb9ffzicjvsj2v2n4ncvb92f"; depends=[dplyr DT ecospat ENMeval glue knitcitations leafem leaflet leaflet_extras magrittr RColorBrewer rgdal rgeos rlang rmarkdown shiny shinyalert shinyjs shinyWidgets spocc spThin zip]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.5"; sha256="0z674sg78rdv9rmqr7s4w9rw8diciifwr4bc2v57yfvp0n9gcys4"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; warabandi = derive2 { name="warabandi"; version="0.1.0"; sha256="0b1g2fpshhkd15b6fz4v3qwf425p5ahbh57acclqq6znl1acl1hg"; depends=[flextable lubridate readtext]; }; - warbleR = derive2 { name="warbleR"; version="1.1.28"; sha256="061scws8a3jkpnfkpcpwdcxnnqpszshj409qjgcdqrcl0s5d1jh0"; depends=[bioacoustics crayon dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.29"; sha256="1r45syh0j0p23yqnc4fjcznrgaaw2qk2vwpl105nhin5fx8khbyc"; depends=[bioacoustics cli dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave testthat tuneR]; }; warp = derive2 { name="warp"; version="0.2.0"; sha256="0s0acddc5h14245hi1faycxp0fyvw6nlgaz2df7da4fpyd2f638f"; depends=[]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; washdata = derive2 { name="washdata"; version="0.1.3"; sha256="0m7rwwi189sbsv3144x14jqmfax30f6ri1pisy47yggmmjpdplps"; depends=[]; }; washeR = derive2 { name="washeR"; version="0.1.3"; sha256="082myz7lw9dyk4ygyj0q39n4h1gghsd1q7667ngzxa20lm0658wd"; depends=[gplots]; }; washex = derive2 { name="washex"; version="1.2.0"; sha256="0g5cgs6y3l7ng4bcia1w3ysb8z7s3187ph5g052bssd3w01kim6g"; depends=[curl dplyr httr purrr rlang XML xml2]; }; - washi = derive2 { name="washi"; version="0.1.0"; sha256="0b2fdnp92jny59q1qvgi3al83294pg8blfgg0q2lr4phjicxmcp5"; depends=[cli extrafont flextable ggplot2 officer scales]; }; + washi = derive2 { name="washi"; version="0.2.0"; sha256="04cibvi0d9spx8h0r28m1sz5drrkiblzfp63v6csm2n4dv55x075"; depends=[cli flextable ggplot2 officer scales systemfonts]; }; waspasR = derive2 { name="waspasR"; version="0.1.5"; sha256="09c1w9c8ql1xcpwsc0j2p9d0fmzkkq22jn16xvdl8hmlyc409br5"; depends=[]; }; - waspr = derive2 { name="waspr"; version="1.0.0"; sha256="0rs7h9pjiqq7as5k7yrj3phn6lgdl7dzyirbmk2jjp7mw9iqhy9i"; depends=[BH Rcpp RcppArmadillo]; }; + waspr = derive2 { name="waspr"; version="1.0.1"; sha256="1l2q4bc3wx81a6ay7v118yw7rxl9aqih6xa4rdbjd9644ng27whn"; depends=[BH Rcpp RcppArmadillo]; }; waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; waterYearType = derive2 { name="waterYearType"; version="1.0.1"; sha256="09brbqcd41khycz9lhn84w68wpk8lsdnzb6lzc10gm5s5ambgj06"; depends=[]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; @@ -19560,15 +19634,14 @@ in with self; { wavScalogram = derive2 { name="wavScalogram"; version="1.1.2"; sha256="08yxx0szgxa903majjjv4y7lkkc8kp3j0q0lq9sfjcqcjvk850gn"; depends=[abind colorRamps fields]; }; waveband = derive2 { name="waveband"; version="4.7.2"; sha256="1aa1rdwpfj3fx3xc7i9h0la268yv7hsm1fxndq3rk5slzy12zq8z"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; - wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; }; wavemulcor = derive2 { name="wavemulcor"; version="3.1.2"; sha256="0a9qhcgf0l3zpwq8m476py94wb4rasy6a8xj302y6kwg3gvh1smm"; depends=[plot3D RColorBrewer waveslim]; }; - waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; + waver = derive2 { name="waver"; version="0.3.0"; sha256="1yhbp1jimx33g4sjigr5vmqqrinz1mdfgvkaaj4y2gcx7sihiiwx"; depends=[geosphere sf]; }; waves = derive2 { name="waves"; version="0.2.4"; sha256="128q1l0ishdgpa33zh77xpi79nvziix8swq1rwyawnznl9ybs29w"; depends=[caret dplyr ggplot2 lifecycle magrittr pls prospectr randomForest readr rlang scales spectacles stringr tibble tidyr tidyselect]; }; waveslim = derive2 { name="waveslim"; version="1.8.4"; sha256="1510xpkgrhdw394m5anxccdczjikcxazyd09ix2z73i15akyx3j0"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.7.2"; sha256="0mmn8f5x8iw8vn0zsskzs3g41bm28prvzy9bmbng8va94g5795ws"; depends=[MASS]; }; waydown = derive2 { name="waydown"; version="1.1.0"; sha256="1yjx9cd8h8rsi44s7dcqrvfmsbjhw7vkg2z7bl4knsgbki0c978g"; depends=[Matrix numDeriv]; }; - waywiser = derive2 { name="waywiser"; version="0.4.2"; sha256="0gi7488pza1syv58v33b1bq9yws3m799ilx95bch2bqnjjzapp1l"; depends=[dplyr fields FNN glue hardhat Matrix purrr rlang sf spdep tibble tidyselect vctrs yardstick]; }; + waywiser = derive2 { name="waywiser"; version="0.5.0"; sha256="00bw02p6ylwm4hmgrlrd69gbbhhy8mzlkgzxchsjvjs696arypvk"; depends=[dplyr fields FNN glue hardhat Matrix purrr rlang sf spdep tibble tidyselect vctrs yardstick]; }; wbacon = derive2 { name="wbacon"; version="0.6"; sha256="0b91h71fs07knnqrbr167wdlb1iakafbadzr4zznndwplx3ygpbz"; depends=[hexbin]; }; wbs = derive2 { name="wbs"; version="1.4"; sha256="0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj"; depends=[]; }; wbsd = derive2 { name="wbsd"; version="1.0.0"; sha256="16jhimsq8symf6f2awczqkaqkdmlkzhmgk01iimhkvqlx8g2v219"; depends=[Rcpp RcppEigen]; }; @@ -19577,37 +19650,38 @@ in with self; { wcde = derive2 { name="wcde"; version="0.0.5"; sha256="1nrzfcrkrq9vff4anj94wcy3jrmjgrm4py854dm4mcsykprxwgd1"; depends=[countrycode dplyr forcats magrittr progress purrr readr stringr tibble tidyr]; }; wcep = derive2 { name="wcep"; version="1.0.1"; sha256="07x4yq51qsg152mxjavg5nfsim1v5g28py56mrzgwvxvaq3n4pz7"; depends=[coin dplyr progress tidyr]; }; wcox = derive2 { name="wcox"; version="1.0"; sha256="13shz5iz2ab9yqp24m6z7ciw70sdg2jdyqifmshq4flp4a737fr7"; depends=[dplyr survival tidyr]; }; - wdm = derive2 { name="wdm"; version="0.2.3"; sha256="0fsr5kskg71bwhc5zzhalm29cc7z9p9y8wdmgz2bisgry3v880az"; depends=[Rcpp]; }; + wdm = derive2 { name="wdm"; version="0.2.4"; sha256="1lrmscy29ir292vxrgr5b1nprbi1zp3rj65nq963kf9gx829rlg2"; depends=[Rcpp]; }; wdman = derive2 { name="wdman"; version="0.2.6"; sha256="0n0wwb9ip6qc8qzdxn4dsqfbc8b3f607n8l6jigryd7g83ibnbp6"; depends=[assertthat binman processx semver yaml]; }; - wdnet = derive2 { name="wdnet"; version="1.2.0"; sha256="17bcyjag9fa5zmh14d0zsdc3abbxrfkhx11yr6dqm8hs587k17iy"; depends=[CVXR igraph Matrix rARPACK Rcpp RcppArmadillo RcppXPtrUtils wdm]; }; + wdnet = derive2 { name="wdnet"; version="1.2.2"; sha256="163yx18xg6q09n07kbvigklr4y0mdnav76hafsf2i56fz1x5b632"; depends=[CVXR igraph Matrix rARPACK Rcpp RcppArmadillo RcppXPtrUtils wdm]; }; wdnr_gis = derive2 { name="wdnr.gis"; version="0.1.4"; sha256="071mjqk117xidqva5qp9xqnca91c5i28j4pv5k0ccfcz6mlj9sbm"; depends=[arcpullr dplyr ggplot2 httr jsonlite rlang sf]; }; - wdpar = derive2 { name="wdpar"; version="1.3.5"; sha256="1nvfzi3z7cpa9q4w2j9vixgg9n0zsc0g2fpcybrzdlwn8981zl5l"; depends=[assertthat cli countrycode curl httr lwgeom pingr progress rappdirs sf tibble webdriver withr xml2]; }; + wdpar = derive2 { name="wdpar"; version="1.3.7"; sha256="0z7p5gcz4fzaga1z5k8q3rnrwzd2iliq0bixsvnqhaddy5aznpms"; depends=[assertthat cli countrycode curl httr lwgeom pingr progress rappdirs sf tibble webdriver withr xml2]; }; weaana = derive2 { name="weaana"; version="0.1.1"; sha256="1wjvn78fkgc28ag1idy7h6sm0rvl57wbqdbxgbl3g5xv844vh8ls"; depends=[dplyr lubridate magrittr reshape2 rlang settings tibble]; }; weakARMA = derive2 { name="weakARMA"; version="1.0.3"; sha256="16dzyw7jiyqv9hd94dff9lxhqv9rwib1xs1km0xfqcy6xa2jhw8w"; depends=[CompQuadForm MASS matrixStats vars]; }; wearables = derive2 { name="wearables"; version="0.8.1"; sha256="0fjf43cgna1mg4mgg98kqhhl88yfhrr57rln2z6xm6d6bj73q5zn"; depends=[dplyr futile_logger ggplot2 kernlab lubridate magrittr padr R_utils RHRV signal varian waveslim xts]; }; weatherindices = derive2 { name="weatherindices"; version="0.1.0"; sha256="1rqkrbzbihgygx2bg6lpkxqlwmdk88ljdp4j02xygvm0brqy2dc9"; depends=[]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; - webSDM = derive2 { name="webSDM"; version="1.1-3"; sha256="0vhwxldxfbyy8ipadmcn2iicca3fndnvqvyji6c6k5hqpqxzj3l5"; depends=[abind bayesplot brms broom_mixed dismo dplyr GGally ggplot2 glmnet gridExtra igraph jtools Matrix rstanarm rstantools]; }; + webSDM = derive2 { name="webSDM"; version="1.1-4"; sha256="1ix1sl5nyki8p5g7fwmrskz0ys8drdbyap5nbrw9kv3kjxd7dz14"; depends=[abind bayesplot brms broom_mixed dismo dplyr GGally ggplot2 glmnet gridExtra igraph jtools rstanarm rstantools]; }; webchem = derive2 { name="webchem"; version="1.3.0"; sha256="06b9i9jipg564zyw4gkgiidz7501rlp40hxm4z3k5mzy148lr5vq"; depends=[base64enc data_tree dplyr httr jsonlite purrr rlang rvest stringr tibble xml2]; }; webdeveloper = derive2 { name="webdeveloper"; version="1.0.5"; sha256="1nw97df9q0dpzl82pdybw527hc407ch2xg8f0s2z4kf89yp6ckhg"; depends=[future html5 httpuv promises readr stringi]; }; webdriver = derive2 { name="webdriver"; version="1.0.6"; sha256="0k87any9rvv367p2zwy89r3rxszsq3w78pzdq36by4ijn659la2l"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webexercises = derive2 { name="webexercises"; version="1.1.0"; sha256="1r2wgg89a84q54mrwqv4wcsjvcndiwwjn6rk7qz37pfyciv68hzy"; depends=[jsonlite knitr rmarkdown rstudioapi yaml]; }; - webfakes = derive2 { name="webfakes"; version="1.2.0"; sha256="1wirc2g3nqb1nnj7ndgi6qmnn3j846wfsndfrgnhbg2if1pq5l37"; depends=[]; }; + webfakes = derive2 { name="webfakes"; version="1.2.1"; sha256="14gzvj19d1glxdij43zf68rkgbb4lijjz7hb184fbcix09sd2hka"; depends=[]; }; webglobe = derive2 { name="webglobe"; version="1.0.3"; sha256="0gbg4pai4cn7hdc1943aqpx4bn3vgc82zp93a1wl6bmmajv1da4b"; depends=[geojsonio httpuv jsonlite]; }; + webmap = derive2 { name="webmap"; version="1.0.3"; sha256="1v6m9d3y9x2vqz7cbm6vknp5006v6vn7h2acjqddwinbjvvadzi9"; depends=[checkmate htmltools htmlwidgets leaflet]; }; webmockr = derive2 { name="webmockr"; version="0.9.0"; sha256="1a590fyzmag1p6c9a82yp93wd1s4jdznk0416i0pv8r5jwarkdv7"; depends=[base64enc crul curl fauxpas jsonlite magrittr R6 urltools]; }; webmorphR = derive2 { name="webmorphR"; version="0.1.1"; sha256="1f3sjzck4ys1knn2jmk472yww65wblrdwdlvn1gz2a00nc738rn4"; depends=[dplyr geomorph ggplot2 httr jsonlite magick progress rsvg]; }; - webp = derive2 { name="webp"; version="1.1.0"; sha256="199l6qhf7f96gqsg0bqzazvl09q383z4087vb1vjiy22k031zbh6"; depends=[]; }; + webp = derive2 { name="webp"; version="1.2.0"; sha256="0srmqrjff3c15d2921rd3b203c6qq170gschbp92fi3d3qshv0fk"; depends=[]; }; webr = derive2 { name="webr"; version="0.1.5"; sha256="03yhlla74i71nphrfhr5sd57ykj7rjanh2a8nw3cq22rg9g668jk"; depends=[dplyr flextable ggforce ggplot2 magrittr moonBook psych purrr rlang rrtable scales shiny sjlabelled stringr tibble tidyr tidyselect vcd ztable]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; websearchr = derive2 { name="websearchr"; version="0.0.3"; sha256="1c6dwm5g5rjq0b12zrwwi5k9760jb0ph83v4j2gm8zm0x9dhiqm9"; depends=[]; }; webshot = derive2 { name="webshot"; version="0.5.5"; sha256="04xrrf72323sgzsdkbl05p2fdsi486i9avrrxvw0l3n8r8y92xfn"; depends=[callr jsonlite magrittr]; }; - webshot2 = derive2 { name="webshot2"; version="0.1.0"; sha256="12y5ilky4h1wif9rbbmn7d37a6mvxjyy0rbgk2jvr7wy41n72xmw"; depends=[callr chromote later magrittr promises]; }; + webshot2 = derive2 { name="webshot2"; version="0.1.1"; sha256="1i4432ifw6nxid9cjgly5qpirj245pvh1vfvhm695z3grkk5nvlv"; depends=[callr chromote later magrittr promises]; }; websocket = derive2 { name="websocket"; version="1.4.1"; sha256="1ks9cyj39jnb0rkx2ii3ckmpl373m5f8sz0i4q3gk7kkv3js07r8"; depends=[AsioHeaders cpp11 later R6]; }; - webtrackR = derive2 { name="webtrackR"; version="0.0.1"; sha256="1rg9f6l0rcc07k1b0y50qhf0fjf77l1xhg5ssbdc6r89b000fxb3"; depends=[data_table igraph tibble urltools]; }; + webtrackR = derive2 { name="webtrackR"; version="0.1.0"; sha256="0ksfrwmbcl6ss1pyj696k1swrdpn6hv6pq4844rrjq2p42cgybnw"; depends=[data_table httr igraph rvest tibble urltools]; }; webuse = derive2 { name="webuse"; version="0.1.3"; sha256="09xvw0v991cq1ck2kfxblp5cngfh9j6swvh5xv420mvky0kshv32"; depends=[haven]; }; webutils = derive2 { name="webutils"; version="1.1"; sha256="16a6ds0fnb6y8i1r9ba1hf1ydb53am57s070b3hi5jmrs84b9qik"; depends=[curl jsonlite]; }; wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; }; - weed = derive2 { name="weed"; version="1.1.1"; sha256="18kz10c580a25cxcghvp81irwqncvhjan3y5gnzy8gxm894q3p7m"; depends=[countrycode dplyr forcats geonames ggplot2 here magrittr purrr readxl rgeos sf stringr tibble tidyr tidytext]; }; + weed = derive2 { name="weed"; version="1.1.2"; sha256="1i44v0swnlpgmicjllha3sk64cq55gygsphhi27yszg4jpd0sjqm"; depends=[countrycode dplyr forcats geonames ggplot2 here magrittr purrr readxl sf stringr tibble tidyr tidytext]; }; wehoop = derive2 { name="wehoop"; version="1.5.0"; sha256="0zlmsjw01ca0q9l7myq0sg6qaknc1i91s8jmf5b7v0crnmivd6rd"; depends=[cli data_table dplyr glue janitor jsonlite magrittr progressr purrr Rcpp RcppParallel rlang rvest stringr tidyr usethis]; }; weibullness = derive2 { name="weibullness"; version="1.23.8"; sha256="07iq9kmzj8410pzhp5rq875r67019r3a0kk39rgmf3mc96h0p454"; depends=[]; }; weibulltools = derive2 { name="weibulltools"; version="2.1.0"; sha256="1scdpxvc9sj4jfxnf8xcsnpnp2vn0kl25gn1m2yqa3dw97h64mcl"; depends=[dplyr ggplot2 lifecycle magrittr plotly purrr Rcpp RcppArmadillo sandwich segmented tibble]; }; @@ -19624,7 +19698,7 @@ in with self; { welo = derive2 { name="welo"; version="0.1.3"; sha256="1sbrkpajqwnpghcr551gccpksw3lqjwk4n0gjl7j3g4lkm54bf54"; depends=[boot ggplot2 Rdpack reshape2 rio xts]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; }; wevid = derive2 { name="wevid"; version="0.6.2"; sha256="1ranmqhgfkrky7r4qk563n9nlz2syn3vj85lmfajq01csadzjdpl"; depends=[ggplot2 mclust pROC reshape2 zoo]; }; - weyl = derive2 { name="weyl"; version="0.0-3"; sha256="17qfr4rdyn4apxpzfmn1kc2msqgi2vsd9d2vxcb9x13cczq48n5a"; depends=[disordR freealg mathjaxr spray]; }; + weyl = derive2 { name="weyl"; version="0.0-4"; sha256="1i6kzadw37l2bj8n6z2c9j7h7jk2gjhx7lizwlgpjn8sycm2rkqr"; depends=[disordR freealg mathjaxr spray]; }; wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; @@ -19632,6 +19706,7 @@ in with self; { wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; whSample = derive2 { name="whSample"; version="0.9.6.2"; sha256="1dkw155xk36r9vmkqxlg2vw45nbpypivd8q5v3i5995biyib4l2k"; depends=[bit64 data_table dplyr magrittr openxlsx purrr]; }; + whatthreewords = derive2 { name="whatthreewords"; version="0.1.3"; sha256="1shr4d1q2vallz251s6h0m2ncbx7lh0i194pm416q32ha0cz8ska"; depends=[dplyr httr2]; }; wheatmap = derive2 { name="wheatmap"; version="0.2.0"; sha256="064idlrnb85xxav39gp3n854fic6514khvazrf5d0x48crpzyvdp"; depends=[colorspace RColorBrewer]; }; whereami = derive2 { name="whereami"; version="0.2.0"; sha256="0vg1vcs0b660zm08rwd6kg7vs8956pgdkjlba0z9f5ff9z69j1rr"; depends=[cli jsonlite rstudioapi]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; @@ -19644,7 +19719,7 @@ in with self; { whitewater = derive2 { name="whitewater"; version="0.1.3"; sha256="0313rsph166qwmxb96lkzc8rzc1afm6is57v9fxlm6wzwr0cv4d0"; depends=[cli crayon dataRetrieval dplyr furrr future httr lubridate plyr purrr readr stringr tidyr usethis]; }; whoa = derive2 { name="whoa"; version="0.0.2"; sha256="1wa1s2dqwkmfa3avrgqkm6w59b6vm2xnnb77q25w187wdpjq65xx"; depends=[dplyr ggplot2 magrittr Rcpp tibble tidyr vcfR viridis]; }; whoami = derive2 { name="whoami"; version="1.3.0"; sha256="19fwl7z55s4kl2xzwqwh8iwg13kdrv222vyl3kibxgwrjcjwj2y2"; depends=[httr jsonlite]; }; - whomds = derive2 { name="whomds"; version="1.1.0"; sha256="1wzdf4lm0kmqn3hq09rydib5z96vzb2lhd3k98mamlfvydagscxi"; depends=[colorspace dplyr eRm ggplot2 ggraph GPArotation igraph nFactors plyr polycor psych purrr RColorBrewer readr rlang scales srvyr stringr TAM tibble tidygraph tidyr WrightMap]; }; + whomds = derive2 { name="whomds"; version="1.1.1"; sha256="1n7i7hh18mplqrhz554pwx4n70p1k7ryfzcgpxigzqphdny44npp"; depends=[colorspace dplyr eRm ggplot2 ggraph GPArotation igraph nFactors plyr polycor psych purrr RColorBrewer readr rlang scales srvyr stringr TAM tibble tidygraph tidyr WrightMap]; }; wiad = derive2 { name="wiad"; version="0.0.1.0"; sha256="1yr1cng5659n8chfghpyfxvqzl8b57vdjzv5m22cbcvrlq6m6p4j"; depends=[abind data_table dplyr DT shiny]; }; widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; }; widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; @@ -19656,7 +19731,9 @@ in with self; { wikifacts = derive2 { name="wikifacts"; version="0.4.2"; sha256="1fw1chha6mcrmv1f9rjg01g84bgzkgf1h76l926brjs5gsn4i414"; depends=[magrittr rvest xml2]; }; wikilake = derive2 { name="wikilake"; version="0.7.0"; sha256="0niym9azy4qzcr4rriw0bfd97scx1mdpx67szinj7qsh569xb61m"; depends=[dplyr maps rvest selectr sp stringi stringr tidyr units WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="2.1.6"; sha256="11ng7qsb4954mgsz55ix86z0ynh4xgflcp6dzl0y4zi6zdrj87i7"; depends=[ggplot2 glue hellno httr pageviews rvest stringr xml2]; }; + wikiprofiler = derive2 { name="wikiprofiler"; version="0.1.3"; sha256="1az2phwgy8aqbl9sxvsq1madrdlrw7zshq9fhw5q580xx0lfhkmk"; depends=[ggplot2 ggplotify gson rsvg yulab_utils]; }; wikitaxa = derive2 { name="wikitaxa"; version="0.4.0"; sha256="1z7p7dwgl8x4ambwss5dqlp4zgz52mgj0vhx2bqwizarmx9ji1xs"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; + wikkitidy = derive2 { name="wikkitidy"; version="0.1.11"; sha256="150zhpdwfvmai9nczmb64vkwcxg1sja84by4nxk2kwb4cv66dxpn"; depends=[cli dplyr glue httr2 lubridate magrittr openssl pillar purrr rlang stringr tibble tidyr vctrs]; }; wilcoxmed = derive2 { name="wilcoxmed"; version="0.0.1"; sha256="0wnwxgm5g4fxdkrb6h124ngaw0s88yr2s8iqshb77vzj12kvb9m1"; depends=[]; }; wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.5.0"; sha256="0rpbrnclj07pdcsrkc2bin52msh1k2a38454227jk6wfb372gprg"; depends=[adehabitatLT dplyr sf sp]; }; @@ -19667,15 +19744,14 @@ in with self; { wilson = derive2 { name="wilson"; version="2.4.2"; sha256="050hi6rigs024is1ry0yymqapgqfhzpp0ghk5ya028k71k22lksx"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets viridis zip]; }; winch = derive2 { name="winch"; version="0.1.0"; sha256="0v2kyfr5rm4nbh99ii17qh08i88yv0phyf3d59dxfhq1q8wrl6xb"; depends=[lifecycle procmaps]; }; windAC = derive2 { name="windAC"; version="1.2.10"; sha256="077kl7j1db0g2pnr7gc91x2anbw80y5sbl4gy49rzclbhhnwjlrs"; depends=[mvtnorm sf]; }; - windex = derive2 { name="windex"; version="2.0.4.1"; sha256="0iwmb72fwvif6l6carn23f5zrkb5baxszi1imy1ls5c847kvqc0w"; depends=[ape geiger phangorn phytools scatterplot3d]; }; + windex = derive2 { name="windex"; version="2.0.6"; sha256="1qpvq9ikv5jvd3qplhlw4404gggrkimcshxb6k0jp7mjz20b1iah"; depends=[ape geiger phangorn phytools scatterplot3d]; }; windows_pls = derive2 { name="windows.pls"; version="0.1.0"; sha256="1n8az7zsbj2xlgkws7rfnk4ihnj1lchsjvglm7qnkrmjchj8asmn"; depends=[dplyr ggplot2 mdatools readr stringr tidyr tidyverse]; }; windsoraiR = derive2 { name="windsoraiR"; version="0.1.2"; sha256="1smd3zw5ra1fba6mds3diadcmbw59jlvmrvfzzi4fss91wv50jql"; depends=[jsonlite]; }; winfapReader = derive2 { name="winfapReader"; version="0.1-5"; sha256="01hc0kcm7qfzk47rci6lfmrqs4zfj8z7abqydgi2ckq8n1k2pd0h"; depends=[lubridate]; }; wiqid = derive2 { name="wiqid"; version="0.3.3"; sha256="1d5bckkr6cnixccxaa14n7vbsya5cc00y9mryy1j69shhsmxp5ks"; depends=[coda HDInterval MASS mcmcOutput plotrix truncnorm]; }; withdots = derive2 { name="withdots"; version="0.1.1"; sha256="0vpbw9swyi8qf5s2nlml9pdmrzvwn4rpm4gbfsc0vikbzp29dmvi"; depends=[]; }; - withr = derive2 { name="withr"; version="2.5.0"; sha256="1h4bzj0am9lawbh1cam1jmgk1xjmn9da14r90w3q984hswz7nc9p"; depends=[]; }; - wk = derive2 { name="wk"; version="0.7.3"; sha256="0990r1cnsnyjq5sj06bz6wx2kjg62qbixilvz8pn9p37120apyz1"; depends=[]; }; - wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; + withr = derive2 { name="withr"; version="2.5.1"; sha256="1kndhxl0fxn40v9yx0iglilani3ym3ywbjf6zbg1pnb52ncf0nm9"; depends=[]; }; + wk = derive2 { name="wk"; version="0.9.0"; sha256="1nmrgdp3swl34kr51hypm3azf8yhcalg5nngp70l56afsbaskyqh"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wkutils = derive2 { name="wkutils"; version="0.1.3"; sha256="01gsvyzxd89j979zdm8q159wgkha277xwsn097ja5absxlny6991"; depends=[Rcpp tibble vctrs wk]; }; @@ -19689,9 +19765,11 @@ in with self; { womblR = derive2 { name="womblR"; version="1.0.5"; sha256="0acvv7jylissacvln51pi14a8i9y02q5whrz3sx5dsnvsk00slzm"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; woodValuationDE = derive2 { name="woodValuationDE"; version="1.0.1"; sha256="1sbyl4yd766lhjqghm4hq9162wz0qabiwiwnsiwzdn4fbfihxl7v"; depends=[dplyr]; }; wooldridge = derive2 { name="wooldridge"; version="1.4-3"; sha256="16lgdzbjp4yjhihbhz9kpagsdral802lhgg6m94vxprlz2sna1r4"; depends=[]; }; - worcs = derive2 { name="worcs"; version="0.1.10"; sha256="0n4ypq430ln13bwc6g2m58pz071g9kwg0qcc450lqf9idal1l1j0"; depends=[credentials digest gert gh prereg ranger renv rmarkdown rticles tinytex usethis yaml]; }; + worcs = derive2 { name="worcs"; version="0.1.13"; sha256="12qb32vcbc18acj19m5dsrwrb645ca42v9jfsqb8hrr4lzml3hdi"; depends=[credentials digest gert gh prereg ranger renv rmarkdown rticles tinytex usethis yaml]; }; word_alignment = derive2 { name="word.alignment"; version="1.1"; sha256="0inlq96j4zkjncz2v66amz91l5y3b5lx49qi2jg6jbqdldw7aa02"; depends=[data_table openxlsx]; }; - word2vec = derive2 { name="word2vec"; version="0.3.4"; sha256="0qj39vms6zgwb8lpmfkppayizdmhakic3pkacglary3ain61vnsk"; depends=[Rcpp RcppProgress]; }; + word2vec = derive2 { name="word2vec"; version="0.4.0"; sha256="14ba0cj430d02bd6fay3nl4ldwqyj77iwjm4gzgdc0f6sx597iiq"; depends=[Rcpp RcppProgress]; }; + wordPuzzleR = derive2 { name="wordPuzzleR"; version="0.1.0"; sha256="147038i7rr1nr0ippvm7q7brjk9jvyv5pgafsqm3s4hcy1dgh43w"; depends=[purrr scales stringr]; }; + wordbankr = derive2 { name="wordbankr"; version="1.0.1"; sha256="042y7zmy7x8kw9baxi131s5jilq6qdwa1s29r2mrklbadk8qgzf7"; depends=[assertthat DBI dbplyr dplyr glue jsonlite lifecycle purrr quantregGrowth rlang RMySQL robustbase stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.6"; sha256="0j96yyvm6bcrrpbdx4w26piqx44a0vbsr3px9cb4zk8a8da6jwak"; depends=[RColorBrewer Rcpp]; }; wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; }; wordler = derive2 { name="wordler"; version="0.3.1"; sha256="0pvnijh2gvwjbd86ivky0zbi8y1x40xazsv2bdy5s2rfsscf4l88"; depends=[crayon]; }; @@ -19702,20 +19780,18 @@ in with self; { words = derive2 { name="words"; version="1.0.1"; sha256="1kd9f5470c7bdayb324m4m72v7s2kknr68qbggl5m0ww29gxs9wd"; depends=[]; }; wordsalad = derive2 { name="wordsalad"; version="0.2.0"; sha256="18kgwq6f9ymm1bmbvpmxq9gz5fx0qj64439scr21kk1cvsfl4y88"; depends=[fastTextR text2vec tibble word2vec]; }; wordspace = derive2 { name="wordspace"; version="0.2-8"; sha256="17fqd4zrsklv2ik3lg00x66yasfh1kyhs3k9ri6lrk56wwv6hzb2"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; - workboots = derive2 { name="workboots"; version="0.2.0"; sha256="0n55iypiw59n1f09fbynsdznv5mz885rbz4gaqi48ig0hwz896b7"; depends=[assertthat dplyr generics lifecycle Metrics purrr rlang rsample tibble tidyr vip workflows]; }; - workflowr = derive2 { name="workflowr"; version="1.7.0"; sha256="0j1ahxm7xjla1xa38dc8ykn1j5a4yw1p8ivjk3k3va25kam25cp3"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker xfun yaml]; }; + workflowr = derive2 { name="workflowr"; version="1.7.1"; sha256="0ziknnnjqdlzxgxhcqlvpnjlqd33mdglp0wss2pl655slpizzjb4"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; workflows = derive2 { name="workflows"; version="1.1.3"; sha256="10a1my6glvc32zxrar1ir699lwav7iz2ji4s6g9iprjndf3nm8ms"; depends=[cli generics glue hardhat lifecycle modelenv parsnip rlang tidyselect vctrs]; }; workflowsets = derive2 { name="workflowsets"; version="1.0.1"; sha256="1rv82lx1vmhjqlim7y5vpfsa7mb6msvkhiz17hxr5k9244ykmbhi"; depends=[cli dplyr generics ggplot2 glue hardhat lifecycle parsnip pillar prettyunits purrr rlang rsample tibble tidyr tune vctrs withr workflows]; }; workloopR = derive2 { name="workloopR"; version="1.1.4"; sha256="1gynlvmqxyibql5j3db9dwvc0jsc9jqzpy3d3gp43d5lcl11mcmq"; depends=[pracma signal]; }; worldfootballR = derive2 { name="worldfootballR"; version="0.6.2"; sha256="1s11qa30x2an8ndjahnx3wxbwf51xdwfqs42qw14wh83m35q2zn2"; depends=[cli curl dplyr glue httr janitor jsonlite lubridate magrittr progress purrr qdapRegex readr rlang rstudioapi rvest stringi stringr tibble tidyr tidyselect withr xml2]; }; worldmet = derive2 { name="worldmet"; version="0.9.8"; sha256="146zygpdlxgwv871mb5x1whh6lzj3s1cma3rmgfip9h0fypd17q4"; depends=[doParallel dplyr foreach leaflet magrittr openair purrr readr tibble tidyr]; }; - worldriskpollr = derive2 { name="worldriskpollr"; version="0.7.4"; sha256="1m3apmdf0ksih7yq9bp5nkyyyxkp6hdw3jjx071df83c4iv8abm9"; depends=[curl dplyr httr janitor labelled magrittr rlang sjlabelled tidyr]; }; worrms = derive2 { name="worrms"; version="0.4.3"; sha256="1bdr3x1pg4l37p5kg36za32skmwwn7hlfrnf2a3hf65347wiif9j"; depends=[crul data_table jsonlite tibble]; }; worrrd = derive2 { name="worrrd"; version="0.1.0"; sha256="1czzm30xwssjrhw7kqw23d2s03v9lbwa0crld9qf9q80h5zc0kxi"; depends=[cowplot dplyr ggfittext ggplot2 ggtext glue magrittr purrr stringr tibble yaml]; }; wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; }; wowa = derive2 { name="wowa"; version="1.0.2"; sha256="0i677bzgd9qx57x7n7qsaqpacgpap2d0n8gq1lc9hsmg13bs2v8f"; depends=[Rcpp]; }; woylier = derive2 { name="woylier"; version="0.0.5"; sha256="1xa2qdkkqnd6c98a15rfsa3m8jil7gipr4mann3dhkf0zl59g0a4"; depends=[dplyr geozoo tibble tourr]; }; - wpa = derive2 { name="wpa"; version="1.8.1"; sha256="1r9b9w208j2czkjv0z9gi052bcb92psxl42sj0kahhya732mw1yk"; depends=[data_table dplyr DT ggplot2 ggraph ggrepel ggwordcloud htmltools igraph magrittr markdown networkD3 proxy purrr reshape2 rmarkdown scales tidyr tidyselect tidytext]; }; + wpa = derive2 { name="wpa"; version="1.9.0"; sha256="0pdvj8q74dd7z3xdp4cb2j85jfhiljvribr23n99k7bi6kdxwyxi"; depends=[data_table dplyr DT ggplot2 ggraph ggrepel ggwordcloud htmltools igraph magrittr markdown networkD3 proxy purrr reshape2 rmarkdown scales tidyr tidyselect tidytext]; }; wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; @@ -19726,14 +19802,15 @@ in with self; { wql = derive2 { name="wql"; version="1.0.0"; sha256="1s702gvwx49wky2ylh8q5h1vmh6sls2pq69w6jcijh1qs587dngs"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wqspt = derive2 { name="wqspt"; version="1.0.1"; sha256="1xd588kw171djx7q21b2jjarhbzd4i0gx7ccv1j1wyl95yzq07ba"; depends=[cowplot extraDistr ggplot2 gWQS mvtnorm pbapply rlang viridis]; }; - wrGraph = derive2 { name="wrGraph"; version="1.3.3"; sha256="1kj30qm1qqdss6rhnc4fkxr0759jqvgswvy3dydhfxksb2zl75rw"; depends=[lattice RColorBrewer wrMisc]; }; - wrMisc = derive2 { name="wrMisc"; version="1.12.0"; sha256="15xarfqjlvlqkxsm9cgs2q50lkxmmxpmiyjs3hl7yqwzr13f1vk0"; depends=[MASS]; }; - wrProteo = derive2 { name="wrProteo"; version="1.10.0"; sha256="02gzrgfcj3hzyppfvp7vnih99z4z0sd76yd6dyhpqyx9d64q5fpy"; depends=[knitr limma wrMisc]; }; + wqtrends = derive2 { name="wqtrends"; version="1.4.1"; sha256="0zj9p24s4dwvyryzfgcjhfrp5dw4wyy6zzcsrhiqvbbjx9y631my"; depends=[dplyr ggplot2 lubridate mgcv mixmeta plotly purrr tibble tidyr viridisLite]; }; + wrGraph = derive2 { name="wrGraph"; version="1.3.6"; sha256="0ssqwxlhy92646d311ay014czzxsjj1170crlpyx3q9c9qyds9s5"; depends=[lattice RColorBrewer wrMisc]; }; + wrMisc = derive2 { name="wrMisc"; version="1.13.0"; sha256="19plk0yw2djnb08vsia9xh1vhssqbkcgs9m9bn1lsns08nn6cimz"; depends=[MASS]; }; + wrProteo = derive2 { name="wrProteo"; version="1.10.1"; sha256="0dx3ylmkysa5cy6525g7p5x99rq13cdsc7dbfxwzfhi080qg65r5"; depends=[knitr limma wrMisc]; }; wrTopDownFrag = derive2 { name="wrTopDownFrag"; version="1.0.2"; sha256="1rdg6rzjz2h514i3c8z89mvj2j3h1s7rr5fry2mq3xvrwrgd3738"; depends=[wrMisc wrProteo]; }; - wrangle = derive2 { name="wrangle"; version="0.5.10"; sha256="135160r3hlzxkqh97nycp5ad9b6628f61k6mbm0s8rprxwmcslhq"; depends=[dplyr magrittr rlang tidyr]; }; - wrappedtools = derive2 { name="wrappedtools"; version="0.9.2"; sha256="10rvx4plw2l9xbhlb9zv720m91dxy1wx3pf5l60abq5cl4npwjzq"; depends=[boot broom coin dplyr forcats ggplot2 glue kableExtra knitr lifecycle purrr rlang rlist stringr tibble tidyr]; }; + wrangle = derive2 { name="wrangle"; version="0.6.3"; sha256="11bryvsggjphcrz7a92xanx9wcnaxmgm503ns9yq3nxfpyvxfgvf"; depends=[dplyr magrittr rlang tidyr]; }; + wrappedtools = derive2 { name="wrappedtools"; version="0.9.3"; sha256="15ds3y211f3ji2v24y3radraxls6vcjjmfacd3wsfix6pfznr94a"; depends=[boot broom coin dplyr forcats ggplot2 glue kableExtra knitr lifecycle purrr rlang rlist stringr tibble tidyr]; }; wrappr = derive2 { name="wrappr"; version="0.1.0"; sha256="0n60var32fyk40mgk6crq565qcpif8cbgmqkqkl0a2ip1l0vrs30"; depends=[]; }; - wrapr = derive2 { name="wrapr"; version="2.0.9"; sha256="1swgf10vg9sh29mn4gsia1rjln47lrqsv765yl19hlpk85qwhsk4"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="2.1.0"; sha256="1r2mqgf4wiwx83lgs20r59c3h7yynkaif4qp6lbd20y06avb1jz1"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="1.0.4"; sha256="1fapl5cbza3zj2s6x9c55jvy7aj9w1iq30j0519nnj7hc7sf0f1s"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.4.2"; sha256="09whcadnwqcshicbhv1vnvdai087yimmnz9lvc3rld5nn8z66xcg"; depends=[]; }; @@ -19746,19 +19823,19 @@ in with self; { wsrf = derive2 { name="wsrf"; version="1.7.30"; sha256="0myb8hyjyapiahrar4zz1b4larv9nwxlk11mz5vyqyjwm98dxlvf"; depends=[Rcpp]; }; wsyn = derive2 { name="wsyn"; version="1.0.4"; sha256="0wq07n69l52rs0ddl1r3ml5jh5nflsg9mddvc3dxjdpd00mgbxnl"; depends=[fields MASS]; }; wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; }; - wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; - wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; + wv = derive2 { name="wv"; version="0.1.2"; sha256="0dx33bs05k6zi6rnk12v6z2l2pvvx2jdl99vafbpyydf0ls4ppbk"; depends=[coda Rcpp RcppArmadillo simts]; }; wwntests = derive2 { name="wwntests"; version="1.0.2"; sha256="0lp5xipf1lq8mlpdamsvan82s3fr3g5xbxpdnqjc68abnify0r8s"; depends=[ftsa MASS rainbow sde]; }; - wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.21"; sha256="1033kz6zhbhd09dh40gp03dfy2kf9zskqh942i06jx1z2dvx3vvi"; depends=[crayon data_table tidyr wyz_code_offensiveProgramming]; }; - wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.23"; sha256="1cxzh5yp6y2r5n6qkhb4g4dkbyw7mdnsfh883bhksk527ra4qaln"; depends=[crayon data_table R6 stringr tidyr]; }; + wxgenR = derive2 { name="wxgenR"; version="1.3.6"; sha256="1q9rfkb2iv0h1pcra0jg3s8xp57fhxfyn000sgf5gf67k62ia32x"; depends=[doParallel dplyr foreach lubridate magrittr msm plyr sm]; }; + wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.22"; sha256="0xhcqqvh0lkw9mqdrib0q1inwgla5y9ayjc6pdkix6ckabfybagg"; depends=[crayon data_table tidyr wyz_code_offensiveProgramming]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.24"; sha256="1q3yn5yp2qlzqg1xpxlkpdkiij4kzwn9yj8mc9xxx4bxnbspkakq"; depends=[crayon data_table R6 stringr tidyr]; }; wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.19"; sha256="02k6wk45dn6i8kzxhgcxqxvrzxf063dny17jjnj83wsxx2b37jgv"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; }; wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.20"; sha256="1h3mf898wrqx212xxaqqm6vqgg1aicrykrnc32f9wl5hyjcbnq70"; depends=[data_table R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.10.3"; sha256="0f0bbnnv4wbrx6c90rg8s284mh8i3mfcfpbwscv0xviaa7fvlsm6"; depends=[stringr x13binary]; }; - x13binary = derive2 { name="x13binary"; version="1.1.57-3"; sha256="0sp0mwjxpaxlhfv94zb8n9grsq9ssp308c55q8ipkxn116d58ldm"; depends=[]; }; + x13binary = derive2 { name="x13binary"; version="1.1.57-4"; sha256="00g94lxj3a4kzsfir7c7dqi9p3gxb4rc45aa0h712l19c286pmqd"; depends=[]; }; x3ptools = derive2 { name="x3ptools"; version="0.0.3"; sha256="04j40nkwlsaga6kp60rf1grk76dw2i1sqivfm2sj017n0v6mj017"; depends=[assertthat digest dplyr MASS png pracma readr rgl xml2 zoo]; }; - xLLiM = derive2 { name="xLLiM"; version="2.2"; sha256="0gmy3jy1nf0fixgwcgfhrwcd85ran5ic7srzcx46akad828a4znq"; depends=[abind capushe corpcor e1071 glmnet igraph MASS Matrix mda progress randomForest]; }; - xROI = derive2 { name="xROI"; version="0.9.20"; sha256="0xa12qsw5xbbfqyv60apr4f9gx7q6rad4ywayvw8l2zla2wnhq5h"; depends=[colourpicker data_table jpeg lubridate moments raster RCurl rgdal rjson shiny shinyjs sp stringr tiff]; }; + xLLiM = derive2 { name="xLLiM"; version="2.2.1"; sha256="0wamfc7r6b4wgr386yf9q5ci3r1dnym41qw23rs1rdxjc4lbl3rx"; depends=[abind capushe corpcor e1071 glmnet igraph MASS Matrix mda progress randomForest]; }; + xQTLbiolinks = derive2 { name="xQTLbiolinks"; version="1.6.2"; sha256="0hi3admcpraq25d7n1fjbz9pv3gj7pj6wcr5694qa2xqizp7vmv2"; depends=[BiocGenerics cowplot curl data_table DBI GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel IRanges jsonlite RMySQL stringr SummarizedExperiment viridis]; }; xRing = derive2 { name="xRing"; version="0.1.1"; sha256="1k4yhqvmixnjvzbw1ymq4brwn9n71vqsqpqw33p79kn98n4fj7z0"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="3.0.2"; sha256="07mib63zbvffr4w8klpv017d13wvqy3mwrpssr0vydcj8475gjfx"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="1.1"; sha256="06y9qhly14y5r8d1g85jdzz8x5lwzfjkiy5zak6146mknl4nzz11"; depends=[data_table SACCR Trading]; }; @@ -19766,7 +19843,6 @@ in with self; { xaringan = derive2 { name="xaringan"; version="0.28"; sha256="1cv1bplk4awzqr5dwmndf4ig75a3bwvx8lfbyv0q0nxzd759d3za"; depends=[htmltools knitr rmarkdown servr xfun]; }; xaringanExtra = derive2 { name="xaringanExtra"; version="0.7.0"; sha256="1snj4yf5mxn419d3qbm2pixj7gvhmf133sxvjbirjrr3ib6iyn84"; depends=[htmltools jsonlite knitr uuid]; }; xaringanthemer = derive2 { name="xaringanthemer"; version="0.4.2"; sha256="074lq9m61647ac7crjmpf8qjj4l60ps0ic4c4b83g47drar79v2z"; depends=[colorspace glue purrr whisker]; }; - xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; xefun = derive2 { name="xefun"; version="0.1.5"; sha256="0rzd9xi5hxxbydzg67h17zb1q9qmw1y9790vy04k6kj444apxc2j"; depends=[data_table]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; @@ -19774,24 +19850,24 @@ in with self; { xfun = derive2 { name="xfun"; version="0.40"; sha256="1xvngh0kbd87cl39bzmjx5i57pmxik9gw50li8dh42j438cnma8y"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; xgboost = derive2 { name="xgboost"; version="1.7.5.1"; sha256="1g35r6qh4ivgbbvsdysiyy4c9gh396k3wdwz7scfb13g40zq7h2f"; depends=[data_table jsonlite Matrix]; }; + xgrove = derive2 { name="xgrove"; version="0.1-7"; sha256="0sfnylzpgqsg7jvcy9yjywj13zl6np59qiciw0yr8fm4d91sxwnh"; depends=[dplyr gbm rpart rpart_plot]; }; xgxr = derive2 { name="xgxr"; version="1.1.2"; sha256="0mmnh6zab7qllbfpl3vn5sd7hcznm83v5rxi1pw5zv96ax0ikagv"; depends=[assertthat binom Deriv DescTools dplyr ggplot2 glue gtable Hmisc labeling magrittr minpack_lm pander png RCurl readr scales stringr tibble]; }; xhaz = derive2 { name="xhaz"; version="2.0.1"; sha256="1kipqscniyb4s7p29pdkg8hg95wb78jpnax8qh058vzrk5vqz181"; depends=[gtools numDeriv optimParallel statmod stringr survexp_fr survival]; }; xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; - xlcutter = derive2 { name="xlcutter"; version="0.1.0"; sha256="0c1d8v7ald8ngq0jglr38bk04r2hs5w0kn57r69isvv2washbaw2"; depends=[tidyxl]; }; + xlcutter = derive2 { name="xlcutter"; version="0.1.1"; sha256="07gjsz8jab5f2c1v7rcfv9pva8hikdl94nzvixvg6v0a7sq7qa6h"; depends=[tidyxl]; }; xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; }; xlsx = derive2 { name="xlsx"; version="0.6.5"; sha256="01r1ngdm51w18bdan8h94r91m731knkf04zal4g67mx3fpa5x31p"; depends=[rJava xlsxjars]; }; xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; - xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; - xmeta = derive2 { name="xmeta"; version="1.3.1"; sha256="1jl83qpf01h7smgpdkbv434gyimxknk423ri0yy09bxr5smbq7ch"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; }; + xmeta = derive2 { name="xmeta"; version="1.3.2"; sha256="1by3w7mn3kk4942pbjyqb6hbrsxbxywfjy96cq0cmvwzq7aamhxm"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; }; xml2 = derive2 { name="xml2"; version="1.3.5"; sha256="10p214gzzcy2zzcq2xkh1vz2wrjsys5gplvk9c1crq3nmfki0six"; depends=[]; }; xml2relational = derive2 { name="xml2relational"; version="0.1.1"; sha256="05nykrmwqa43f9h6wpk6m1spmqr22r0ffiki4hp3jsyw8k7i78hv"; depends=[fs lubridate rlang stringr tidyr xml2]; }; xmlconvert = derive2 { name="xmlconvert"; version="0.1.2"; sha256="0vj5ar61i94if141jzqk7jq091mb2xwzl0x86dj7ddk8y3c1w9dv"; depends=[httr lubridate readr stringr tibble xml2]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.5"; sha256="1c6bnz3ng1qw7sfip8wq3a4dn36a4d6rbja0sadn0a4pbsmk8q3n"; depends=[]; }; xmlr = derive2 { name="xmlr"; version="0.1.2"; sha256="00mxdb4899sx5py0ngzh3dvhz1sqsar2hmsrkm4jf0b3q9psc86w"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; - xmpdf = derive2 { name="xmpdf"; version="0.1.3"; sha256="140h6dymap3dh5a68z2mdij6163fzqix4md9mfynghz4ckj1cfbq"; depends=[datetimeoffset jsonlite purrr R6 rlang]; }; + xmpdf = derive2 { name="xmpdf"; version="0.1.4"; sha256="0hqk40zwwxkx0zhw2a1phm49lwlwsbphhb3g87b1vvy3xsxilph6"; depends=[datetimeoffset jsonlite purrr R6 rlang]; }; xmrr = derive2 { name="xmrr"; version="1.1.1"; sha256="1kb4kzxb9rcx9fp1answln0sv9c3wdrk82gz79k0i9ypq7dls2ah"; depends=[dplyr ggplot2 purrr qpdf rlang tibble tidyr]; }; xnet = derive2 { name="xnet"; version="0.1.11"; sha256="18lda1gv53awsbkk5p4bzrbilndgybdz8xc6lhl6wy647fw9q9hv"; depends=[]; }; xoi = derive2 { name="xoi"; version="0.72"; sha256="0q1q43540qz97qad36dcwmcmgdci3sbhxk9li897gnjv9gjazdlr"; depends=[qtl]; }; @@ -19799,7 +19875,7 @@ in with self; { xpectr = derive2 { name="xpectr"; version="0.4.3"; sha256="0qpv2r4dz5g37v2b6y5jscsxm1hdmimq8pm0dwwf8df0pp351r3b"; depends=[checkmate clipr dplyr fansi lifecycle plyr rlang rstudioapi testthat tibble withr]; }; xplain = derive2 { name="xplain"; version="0.2.2"; sha256="152a83ckmhns6yniy87mmjva5bkv5x3phv63l1kkcmrr9bclfgz0"; depends=[httr RCurl readr XML]; }; xplorerr = derive2 { name="xplorerr"; version="0.1.2"; sha256="0sca6nngjs6f51di4dgzx868p75bzas0msr0kgivavsv6rj5fz0r"; depends=[Rcpp shiny]; }; - xportr = derive2 { name="xportr"; version="0.3.0"; sha256="02a6m3xcs5982vq58xysslv8hr624bkimigny2dv1x8a9jxc2xcc"; depends=[cli dplyr glue haven janitor lifecycle magrittr purrr readr rlang stringr tidyselect tm]; }; + xportr = derive2 { name="xportr"; version="0.3.1"; sha256="12025w2pawp08019hq28jrl3my4j5z7vl8wild6iv50zk27d1yvi"; depends=[cli dplyr glue haven janitor lifecycle magrittr purrr readr rlang stringr tidyselect tm]; }; xpose = derive2 { name="xpose"; version="0.4.17"; sha256="09c2l89gvlc8wm6i5ykkya5n2i4iifqfn30fymik6asl91q0n7vl"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; xpose_nlmixr2 = derive2 { name="xpose.nlmixr2"; version="0.4.0"; sha256="0scq6brd7sn1ybmacxlpdlmkwxbn9sc2gpzw6438fwfjss6sza8s"; depends=[crayon dplyr ggplot2 magrittr nlmixr2est rlang stringr tibble tidyr vpc xpose]; }; xpose4 = derive2 { name="xpose4"; version="4.7.2"; sha256="149ridxvbbkyxlnyhvw31gh2574cdycrrn89qwzvi4b5wb0p7psi"; depends=[dplyr gam Hmisc lattice lazyeval readr survival tibble]; }; @@ -19810,8 +19886,6 @@ in with self; { xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; - xtensor = derive2 { name="xtensor"; version="0.14.1-0"; sha256="1qni98kxyaggb1ixmmj1hh1jmbz8rhji91nifgrjxc1wsvmvswh0"; depends=[Rcpp]; }; - xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xtranat = derive2 { name="xtranat"; version="0.1.0"; sha256="1gv0kc1gj305iwwhv7wrfrh45rqwaks696q6q39a55m2vxw11xl1"; depends=[]; }; xts = derive2 { name="xts"; version="0.13.1"; sha256="0pc23na5lrzfchd4i22p035y1krjpddi0iw6i78lhbhns330ff9c"; depends=[zoo]; }; xtune = derive2 { name="xtune"; version="2.0.0"; sha256="0k5cf7n84j73cdxzfr7ijjxc65h6lx6fjry81rsxa80fn0sn8qiz"; depends=[crayon glmnet lbfgs selectiveInference]; }; @@ -19824,7 +19898,7 @@ in with self; { yager = derive2 { name="yager"; version="0.1.1"; sha256="178ypdr3f0w9rb4ci8q2hshr62b7993m8q6zxc4pf0msq175n1ml"; depends=[lhs MLmetrics randtoolbox]; }; yahoofinancer = derive2 { name="yahoofinancer"; version="0.2.0"; sha256="1wmxz2xmy39167kx9lfps9wq1ci9hqzpzc5xymnlrazbdviw1isy"; depends=[curl httr jsonlite lubridate magrittr purrr R6 stringr]; }; yaml = derive2 { name="yaml"; version="2.3.7"; sha256="1aw0cvaqw8a0d1r3cplj5kiabkcyz8fghcpi0ax8mi7rw0cv436j"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.10.28"; sha256="122rl8fzdpd7dqzjcdjqahkp5fw19kxf5gji6hia819qhblbik2h"; depends=[csv dplyr encode ggplot2 pillar rlang scales spork tidyr units vctrs xtable yaml]; }; + yamlet = derive2 { name="yamlet"; version="0.10.33"; sha256="1ynb7p5n8piinill37gxg83p2k6qijj32vnyz6fx5ddfp8958rb5"; depends=[csv dplyr encode ggplot2 pillar rlang scales spork tidyr units vctrs xtable yaml]; }; yamlme = derive2 { name="yamlme"; version="0.1.2"; sha256="1019nzchqif4r3c7ywq23bjx711g359q44s8jy0rxyv03rij6xh9"; depends=[rmarkdown yaml]; }; yardstick = derive2 { name="yardstick"; version="1.2.0"; sha256="0aqxnxhyy0bdfm09b7jpzba6c4g5r6l4h48q2xfxsm353nni7wgb"; depends=[cli dplyr generics hardhat lifecycle rlang tibble tidyselect vctrs]; }; yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; }; @@ -19834,10 +19908,10 @@ in with self; { ycevo = derive2 { name="ycevo"; version="0.1.2"; sha256="1s61rdsll7b9dyc1lamyp4mlsw7vyf9lshw2dg3x5i3xf5rmrrsd"; depends=[dplyr magrittr Matrix Rcpp RcppArmadillo rlang]; }; yesno = derive2 { name="yesno"; version="0.1.2"; sha256="1n9v8m1wkk9p2ahl7d1khbffxmshv68q1v44v04y4v1k6qjvm0i2"; depends=[]; }; yfR = derive2 { name="yfR"; version="1.1.0"; sha256="1jdqz0cb13fgvrak1sgs4h2cwgr8rcbg68c35mlaqnmkfn2w3xvc"; depends=[cli dplyr furrr future glue httr humanize jsonlite lubridate magrittr pingr purrr quantmod readr rvest stringr tibble tidyr tidyselect zoo]; }; - yhat = derive2 { name="yhat"; version="2.0-3"; sha256="00cbzj2bvr2pfspycqyf7jrdqyfg63zx25b6r9k3khafvn0ch7h1"; depends=[boot miscTools plotrix yacca]; }; + yhat = derive2 { name="yhat"; version="2.0-4"; sha256="0hzf6fns37jv67ssa6zwivpj2nlaykfjmj5y21dyh739i3102jnv"; depends=[boot miscTools plotrix yacca]; }; yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; - ymd = derive2 { name="ymd"; version="0.0.1"; sha256="02cd7y28s406yzvax2d47xwrsqyd8mhhb879ywjqfj6lvwf3jvkd"; depends=[]; }; + ymd = derive2 { name="ymd"; version="0.1.0"; sha256="18ivf09r7df4jq60pm0gdagcvpb4pz9a19y7dfb096h1yk7rqfa4"; depends=[]; }; ymlthis = derive2 { name="ymlthis"; version="0.1.7"; sha256="127rh8mfff0ii6wcd7iaaz60vlkynjlrs188wwcap8l2qgv67idy"; depends=[crayon fs glue magrittr purrr rlang rmarkdown rstudioapi stringr usethis whoami withr yaml]; }; ympes = derive2 { name="ympes"; version="0.4.0"; sha256="1vxyq148m7kaj9f4lgr5jlnd31rn1wh8cbjn0j2s22kip1p57aaf"; depends=[]; }; yorkr = derive2 { name="yorkr"; version="0.0.41"; sha256="0ypm7di343wpsg7x85bx4044bhf2fxp638yyy0rvj23x11z0ra8v"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; @@ -19846,24 +19920,24 @@ in with self; { ypssc = derive2 { name="ypssc"; version="1.1.0"; sha256="0fpph19amj1cafcbh5k6s75pi7nahzgfvnsbs9i5644gv43iavbj"; depends=[dplyr eulerr Peptides readxl spelling stringr svDialogs]; }; yuima = derive2 { name="yuima"; version="1.15.22"; sha256="04qhb8w0f5ix4f99lsfcnfkx0xpwn12rfdvkg1fk484n0l7gli0r"; depends=[boot calculus coda cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.1"; sha256="1sl45kmqqq7hg3lkpn3cy70f409fwsgg76gjldx1l4cvmyzyf9hl"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; - yulab_utils = derive2 { name="yulab.utils"; version="0.0.7"; sha256="16jxh6z42j97mf7qq828iwknz5a08wm4y70xr5i8f7j7rlqfl579"; depends=[memoise rlang]; }; + yulab_utils = derive2 { name="yulab.utils"; version="0.1.0"; sha256="045s3xg723a8m9cqql74ifqir5k6zl4csdq39vw5im2zgvyajkzg"; depends=[cli digest fs memoise rlang]; }; yum = derive2 { name="yum"; version="0.1.0"; sha256="1k9q34n1pzv4c7hp7cd4yhm8v1qv41an8vfh65n4byvyzipxp85y"; depends=[yaml]; }; - zCompositions = derive2 { name="zCompositions"; version="1.4.0-1"; sha256="1rrhja9iaq123r2gqw1bzrn1ri0s3z4wzq8p0sfcr1yb6pv13vik"; depends=[MASS NADA truncnorm]; }; + zCompositions = derive2 { name="zCompositions"; version="1.4.1"; sha256="1l9hj37x54b4vzbcg2051nfli5rh65llm27hygc2vx7yyi6q75ma"; depends=[MASS NADA truncnorm]; }; zTree = derive2 { name="zTree"; version="1.0.7"; sha256="005zk6wpchpss6865ki35yawgf668pn70163ah97rnfkhfaswm6y"; depends=[plyr]; }; zalpha = derive2 { name="zalpha"; version="0.3.0"; sha256="04hi5lxgcqzmkbqppp5fv8x7wdgap3bgr8b8pv4pvavzh73jlmxs"; depends=[]; }; zctaCrosswalk = derive2 { name="zctaCrosswalk"; version="2.0.0"; sha256="14yda45nqn9ywb7zpwp4kmjziglj0qjgm02lmi8ndvc5wi2r1ma7"; depends=[dplyr readr rlang stringr]; }; zcurve = derive2 { name="zcurve"; version="2.3.0"; sha256="1bgc2inc5wmimbhmxqlyg02hcf3n06z2fx26dnqr9baabmdgkpfa"; depends=[evmix nleqslv Rcpp Rdpack]; }; zdeskR = derive2 { name="zdeskR"; version="0.3.0"; sha256="0a22yhsvzc0z4xbj7cfy33gf73zi1a8ryp0x4na3kximwiiw6v09"; depends=[dplyr httr jsonlite magrittr plyr purrr tidyr]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; - zebu = derive2 { name="zebu"; version="0.2.0.0"; sha256="0nd44j2zxsagg9sav3lm8gzbyq8cdk1kfgbn503hb3a58kcqyg0d"; depends=[data_table ggplot2 Rcpp reshape2]; }; + zebu = derive2 { name="zebu"; version="0.2.2.0"; sha256="1bxzc110nxyssdvnk330qs8qbmf6m7v5gglcfdkxdzy5gcbs1bm6"; depends=[data_table ggplot2 Rcpp reshape2]; }; zeitgebr = derive2 { name="zeitgebr"; version="0.3.5"; sha256="1h2zx3ah1xdyyag40ragrv7gvpnlzqmappbnjp971dn9khqdxfqs"; depends=[behavr data_table lomb pracma WaveletComp]; }; - zen4R = derive2 { name="zen4R"; version="0.8"; sha256="14psa7y6dh9iw2xcjrz4zjv4aclz9m2azr26v7xv42kd4jhk6fhv"; depends=[atom4R httr jsonlite keyring R6 XML xml2]; }; + zen4R = derive2 { name="zen4R"; version="0.9"; sha256="09r3kd5mvaps30k4vszbfbhfb8hp6jq4f1v3kr9b8wgv7vqsa2k4"; depends=[atom4R httr jsonlite keyring R6 utf8 XML xml2]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zenplots = derive2 { name="zenplots"; version="1.0.4"; sha256="1r105ay0p00wfly8z54dg18i1fq7ppvxzri49i7zrlimqawzv19s"; depends=[graph loon MASS PairViz]; }; + zenplots = derive2 { name="zenplots"; version="1.0.5"; sha256="1zhxjql49hbwrim9y8qyyrkqwq09dv84vbini18xjkfv0z0lfmd2"; depends=[graph loon MASS PairViz]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zerotradeflow = derive2 { name="zerotradeflow"; version="0.1.0"; sha256="03fvhk3yd6grqs0d6m3j537xzy0n9s64947g7gagaqbrm3n8j1m6"; depends=[cli dplyr magrittr purrr rlang tidyr tidyverse]; }; zetadiv = derive2 { name="zetadiv"; version="1.2.1"; sha256="0m147z864g2pca28gbna1bb7jqr2f74x15fj8v8hhs3a2lr8lh37"; depends=[car geodist glm2 mgcv nnls scam vegan]; }; - zfit = derive2 { name="zfit"; version="0.3.0"; sha256="0qzfl1fvs3rw5fnf27d26arbi70bj2cgbg7b8jbnka2vb2c20kwm"; depends=[]; }; + zfit = derive2 { name="zfit"; version="0.4.0"; sha256="1pzzzb55v16piy1p1pyjrriiifbgxqnpaxi200cyfd8m39gz9n1j"; depends=[]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; zip = derive2 { name="zip"; version="2.3.0"; sha256="0hs5yz324jpiy2h0jkrlcb2h9ks65mcc2vpf68briy9aj92aisrk"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; @@ -19872,17 +19946,16 @@ in with self; { zipfR = derive2 { name="zipfR"; version="0.6-70"; sha256="15ng7rj7qbgxajx8jb9kv04xmbidg9wwzxr2xaskmlaxrxlqac8c"; depends=[]; }; zipfextR = derive2 { name="zipfextR"; version="1.0.2"; sha256="03rlvvw7rfbhsbwd5njmgkkkrxq1lgjdydmpkn6h1hi97pc0gbhh"; depends=[copula tolerance VGAM]; }; zipsae = derive2 { name="zipsae"; version="1.0.2"; sha256="03kwfpjpwxqlphdy7xyhsf7d0mcg67jhvm7yz4i73ckmjdmq7wrd"; depends=[]; }; + zlib = derive2 { name="zlib"; version="1.0.3"; sha256="0fnx9dgcdgamh7a2grkrkzxsdpsj2zh6xvfh499fca97cbmpxs14"; depends=[Rcpp]; }; zlog = derive2 { name="zlog"; version="1.0.2"; sha256="0fi9aqrmikdg5ibwhn82kslj4lxih03vm27jmi14m73h09yy4in5"; depends=[]; }; - zmisc = derive2 { name="zmisc"; version="0.2.2"; sha256="154qm0f2ds40gwxqv30nf2px26clkf2lw2y51ak12gxpj08b6mix"; depends=[]; }; - zoeppritz = derive2 { name="zoeppritz"; version="1.0-8"; sha256="1711szx9zz17q6pfinyzlyrw7m9772c8ywlixqar2l165bkjalgm"; depends=[]; }; + zmisc = derive2 { name="zmisc"; version="0.2.3"; sha256="1mkk8a93xqwzrs99g6zmd5x3yn0qrz3v44y35jas9wl8x92bzr9f"; depends=[]; }; + zoeppritz = derive2 { name="zoeppritz"; version="1.0-9"; sha256="0bl1hrghyv5vjs02r2f5k9p7l4ialwdpl7si14lz8lbb0r1a6fwq"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.6"; sha256="1px4jjjpn6ikngzlxz1i6fgld9cy5lv6nqn1bjin4q6sqqixyx2j"; depends=[abind coda Formula rjags]; }; - zoid = derive2 { name="zoid"; version="1.1.0"; sha256="0x37250fq3a3jbl1a2p8zkbacwzhc1xylk1nnfmx2fcgjif40lmq"; depends=[BH compositions gtools Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + zoid = derive2 { name="zoid"; version="1.2.0"; sha256="0c23ji48bq5qhsjshfai9srivn7lhjrzcs4fpysiw4245a2psyrr"; depends=[BH compositions gtools Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; }; - zonator = derive2 { name="zonator"; version="0.6.0"; sha256="1plxchpd4ypp36phl13pi9yvlrqi3lk83lv5rldrhdqynhcgfw2k"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; zonebuilder = derive2 { name="zonebuilder"; version="0.0.2"; sha256="0mxf3dz0d6bi5wwjilqivdxhy5ypnq5svky8zygha0clv45l4dmn"; depends=[RColorBrewer sf]; }; zonohedra = derive2 { name="zonohedra"; version="0.2-2"; sha256="0bvlrbc3nkaw9pjzl65idw8ybk7frhyihr3cp93jby5rnip8xpyz"; depends=[logger]; }; zoo = derive2 { name="zoo"; version="1.8-12"; sha256="1f1g7f362sidh99n2pcgnj8iwsn7hnjgpdnkrqml5qzrd0k8dhz6"; depends=[lattice]; }; - zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoolog = derive2 { name="zoolog"; version="1.1.0"; sha256="06g44gjk9w73996n4h1a2q8kcd6q2mvm1vhx0iq0785gvrz18pj9"; depends=[Rdpack stringi]; }; zoom = derive2 { name="zoom"; version="2.0.6"; sha256="05ikad4j1qi5y8mn77n9bw7d6ic3api9d7mbcn855w8xcc69ja4q"; depends=[]; }; @@ -19897,6 +19970,7 @@ in with self; { ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; broken = true; }; ACDC = derive2 { name="ACDC"; version="1.0.0"; sha256="11nlg6pcmfa8pl1f5fxxcig1z1j74yizllh5y9rcdbdfzcasvnzn"; depends=[colorspace deSolve dplyr ggplot2 latex2exp magrittr patchwork tibble tidyr]; broken = true; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; broken = true; }; + ADMMnet = derive2 { name="ADMMnet"; version="0.1.1"; sha256="1la92fwg75ylqbz00znqd0rhv5r509kgh9wwznjacppif773wp6i"; depends=[Matrix Rcpp RcppEigen]; broken = true; }; AGSDest = derive2 { name="AGSDest"; version="2.3.4"; sha256="140bqzgaagdyzgxsn998jw2sxak448i47xyacn2psfnps440gfjr"; depends=[ldbounds]; broken = true; }; AGread = derive2 { name="AGread"; version="1.3.2"; sha256="1l7h6hpf28hpff50s7qaj9cwiqki98wiz2a7z773d7qzm28074gy"; depends=[anytime data_table DBI DescTools dplyr lubridate magrittr PAutilities R_utils Rcpp read_gt3x readr reshape2 rlang RSQLite stringr]; broken = true; }; AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; broken = true; }; @@ -19905,11 +19979,14 @@ in with self; { AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; broken = true; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; broken = true; }; ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.5"; sha256="1d2r2cwpn9rdfbmiccag487pvsq6adn7b321c5z8i7n671h2wi26"; depends=[quadprog shiny]; broken = true; }; + ANTs = derive2 { name="ANTs"; version="0.0.16"; sha256="1bvbr9m5fbq3x5mfn4xhfm2x7a8zs616cf02gzv65r8k9q2348ll"; depends=[gtools Kendall lme4 Rcpp RcppArmadillo RcppEigen rstudioapi]; broken = true; }; APAtree = derive2 { name="APAtree"; version="1.0.1"; sha256="0vhvx2xp62avyq405jqn4i3z8awlifcs1lb527brxxhybrhnk4rv"; depends=[BH FD lwgeom raster Rcpp sf units]; broken = true; }; APML = derive2 { name="APML"; version="0.0.5"; sha256="1md9vryq2qf4cx3jrgh7p2j87qc8iil1cszw0vay5ylzaw4bz1hl"; depends=[dplyr fastDummies ggplot2 h2o performanceEstimation pROC survival]; broken = true; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; broken = true; }; APackOfTheClones = derive2 { name="APackOfTheClones"; version="0.1.3"; sha256="0am6344qmlxq7ww9bqa1f33s1li0rwns1dqb6rc5kplf76b2nkkq"; depends=[data_table dplyr ggforce ggplot2 hash Rcpp rlang Seurat testthat]; broken = true; }; + APfun = derive2 { name="APfun"; version="0.1.6"; sha256="0j54pcjzr5f8xhvp41vrl0i1hchphnij6p87j16rawp21apvnxyd"; depends=[maptools raster rgdal sp withr]; broken = true; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; broken = true; }; + ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; broken = true; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; broken = true; }; ASSOCShiny = derive2 { name="ASSOCShiny"; version="0.1.0"; sha256="1g1ba9d5ywd3gbwjb36xnms8l15dg1vwc6r0nsb5adhpb602xsw1"; depends=[arules arulesViz dplyr plotly rmarkdown shiny shinyMatrix]; broken = true; }; ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; broken = true; }; @@ -19917,18 +19994,22 @@ in with self; { AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; broken = true; }; AWAPer = derive2 { name="AWAPer"; version="0.1.46"; sha256="02n662wvd8qwshfmj9qfff730qs6ls82hkdsphw05jj6llddi4k5"; depends=[chron Evapotranspiration maptools ncdf4 raster sp xts zoo]; broken = true; }; AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; broken = true; }; + AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; broken = true; }; ActiSleep = derive2 { name="ActiSleep"; version="0.2.1"; sha256="0nkfddfv0g1bvsg6811lrmy0cx7knmi225snyp22bh9ly9fnlqp8"; depends=[accelerometry DBI dplyr lazyeval lubridate RSQLite stringr tibble]; broken = true; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; broken = true; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.69"; sha256="0mclsnsxjyg1q7p7654gjsczzdzpa6avx3b9jpmdb0n63zdgmwy3"; depends=[MASS mgcv nlme SemiPar]; broken = true; }; AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; broken = true; }; AirSensor = derive2 { name="AirSensor"; version="1.0.8"; sha256="0wpfg3mry1vdyd9v1981hasizj1mn5wy60ig9swxlqdm7j11wxan"; depends=[countrycode cowplot dplyr dygraphs geodist geosphere GGally ggmap ggplot2 gridExtra httpcode httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaLocationUtils MazamaSpatialUtils openair PWFSLSmoke RColorBrewer readr rlang scales seismicRoll sp stringr tibble tidyr tidyselect worldmet xts zoo]; broken = true; }; AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; broken = true; }; + AlleleShift = derive2 { name="AlleleShift"; version="1.1"; sha256="1cmmxwp3qq28hln6k9hfv61b53nwx08iidhcxj8bdwv7msyp9f8k"; depends=[adegenet BiodiversityR vegan]; broken = true; }; + AlphaHull3D = derive2 { name="AlphaHull3D"; version="2.0.0"; sha256="1jp4m2yd9z8m4gz5hfa08qm02kalrzy6pbjf3rfcb0xjglk1lngr"; depends=[BH Rcpp RcppCGAL RcppEigen rgl Rvcg]; broken = true; }; AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; broken = true; }; AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; broken = true; }; AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-24"; sha256="0qkhw6bik6s82h4yb5bashqjl8wfxarivvz6r5ffn9cgrvlwyahd"; depends=[fastICA R_matlab]; broken = true; }; AnimalAPD = derive2 { name="AnimalAPD"; version="1.0.0"; sha256="1csa6disrg11hpxg4zw0jay15srw9lsgbhl1xgl7hpdr3nqsv3s7"; depends=[activityGCMM brms circular ggplot2 gridExtra loo overlap]; broken = true; }; AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; broken = true; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; broken = true; }; + Apollonius = derive2 { name="Apollonius"; version="1.0.0"; sha256="0dnw42bnzl8qk0f6ylmfp0479d68sy89pbpz23z1cq0ndyrddnmx"; depends=[abind BH gyro plotrix randomcoloR Rcpp RcppCGAL RcppEigen]; broken = true; }; AquaBPsim = derive2 { name="AquaBPsim"; version="0.0.1"; sha256="0bf83kp8j7il5q9kr8r0pxlnsf6l9nvhgkny4y5wgc8pbki0dsmz"; depends=[MASS matlib pedigree readxl]; broken = true; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; broken = true; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; broken = true; }; @@ -19942,14 +20023,17 @@ in with self; { BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; broken = true; }; BBRecapture = derive2 { name="BBRecapture"; version="0.2"; sha256="1w0m8p4mwjsycv9krmsgdyjckic2nwxbyhrz1s2gng2v1h20zvlf"; depends=[HI lme4 locfit secr]; broken = true; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; broken = true; }; + BCDAG = derive2 { name="BCDAG"; version="1.0.0"; sha256="1a4ylby1hm2pfdf22qvw1qpgs742y77kpvmymikx8pc1vnhmwjih"; depends=[gRbase lattice mvtnorm]; broken = true; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; broken = true; }; + BEST = derive2 { name="BEST"; version="0.5.4"; sha256="109zl99bz1bndan1pm3hm0f1da86a18lcyzl0741z14l0m0d91a9"; depends=[coda HDInterval rjags]; broken = true; }; + BGGM = derive2 { name="BGGM"; version="2.0.4"; sha256="0676viahmid0n89jhs93ci8l7rxpam7rn75mdbshgx7f1q3wqiih"; depends=[BFpack GGally ggplot2 ggridges MASS mvnfast network Rcpp RcppArmadillo RcppDist RcppProgress Rdpack reshape sna]; broken = true; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; broken = true; }; BIDistances = derive2 { name="BIDistances"; version="0.0.2"; sha256="1ajwa7ib0m3krhizi905rzkdqm9fhcypm58yqn4c6hnq4kpc9fm1"; depends=[parallelDist]; broken = true; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; broken = true; }; - BIOMASS = derive2 { name="BIOMASS"; version="2.1.8"; sha256="18ypdqh5fc9a7yq8y5insadmvamrzrd9yn00g1cj1lxii0jn4r43"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; broken = true; }; BIS = derive2 { name="BIS"; version="0.3.1"; sha256="1nmbcdk4p34grss2bwwqw5zynp5c2xfhhqs9h9s85nhdm7ark78v"; depends=[dplyr readr rvest tidyr tidyselect xml2]; broken = true; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; broken = true; }; BMRSr = derive2 { name="BMRSr"; version="1.0.3"; sha256="0snb8xs22f1khnywkgrs8pj7w6hg2mfppng0q695xyh4ci157wam"; depends=[dplyr httr purrr readr rlang stringr tibble xml2]; broken = true; }; + BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; broken = true; }; BMTME = derive2 { name="BMTME"; version="1.0.19"; sha256="07iw6aqcwn4a29b85cavfw6hp66csdzlaqwas40zr5ga3kp72j51"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; broken = true; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; broken = true; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; broken = true; }; @@ -19957,25 +20041,30 @@ in with self; { BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; broken = true; }; BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; broken = true; }; BPmodel = derive2 { name="BPmodel"; version="1.1.2"; sha256="1fmiz06ci3x4ljaap6famnz82mrf2rcdg4d282x6wghpy4yv4afa"; depends=[Deriv dplyr extraDistr gamlss gamlss_dist ggplot2 pracma]; broken = true; }; + BSBT = derive2 { name="BSBT"; version="1.2.1"; sha256="0ibqg3jr7l25aikz09s8v5w1z541dsw8pr30ixf6d1bly5bw5ahy"; depends=[expm igraph MASS]; broken = true; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; broken = true; }; BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; broken = true; }; BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; broken = true; }; BaSTA = derive2 { name="BaSTA"; version="1.9.5"; sha256="09wvfg44g9j3gq9arkm2ajm8l4y7gna4fh49ihvmjzqdvsl6gkq6"; depends=[snowfall]; broken = true; }; BacArena = derive2 { name="BacArena"; version="1.8.2"; sha256="1fv3hmr8frqgdl22cvp5w5089ppmqzw42llw2ls054dvsdadlqm9"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; broken = true; }; + Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; broken = true; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; broken = true; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; broken = true; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; broken = true; }; + BayesMRA = derive2 { name="BayesMRA"; version="1.0.0"; sha256="005pygpa8bmr153naxnag7kn876lqwq34d8pzbj954nivlxl4zaw"; depends=[fields igraph Matrix mvnfast Rcpp RcppArmadillo spam]; broken = true; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; broken = true; }; + BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; broken = true; }; + BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; broken = true; }; BayesSPsurv = derive2 { name="BayesSPsurv"; version="0.1.4"; sha256="0j3cjd3xwljmd452c9w83f2cvhjkrc7jvhwzkwdp5i60cw0qqhja"; depends=[ape coda countrycode dplyr FastGP ggplot2 MCMCpack progress Rcpp RcppArmadillo reshape2 rworldmap]; broken = true; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="2.0"; sha256="1b4h6s3cb8904slyy2pq3dzy3941p87s32zacmpwrnp7yvwxzl3d"; depends=[bit ff mvnfast]; broken = true; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; broken = true; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; broken = true; }; BayesianFROC = derive2 { name="BayesianFROC"; version="1.0.0"; sha256="03f0cj528cb4rhkzs4vw4k1wq4gxb3zq121pamjwhbal93b8mz7a"; depends=[bridgesampling car crayon fastDummies ggplot2 knitr pracma Rcpp rhandsontable rstan shiny shinydashboard shinyjs shinythemes]; broken = true; }; BiOFI = derive2 { name="BiOFI"; version="0.1.0"; sha256="0dhqfv1z2r495wr4higpwm2mc1rjgimc9z5w89fshs78y9gj2mrp"; depends=[dplyr ggplot2 ggrepel Hmisc htmlwidgets igraph magrittr networkD3 ppcor tidyverse visNetwork]; broken = true; }; - BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; broken = true; }; BigDataStatMeth = derive2 { name="BigDataStatMeth"; version="0.99.32"; sha256="0iz6pzlhkziwdwv80sy9zcxfvkxxjhqmgn7lk7lv1mkhywqkd9jk"; depends=[beachmat BH data_table Rcpp RcppEigen RcppParallel RCurl rhdf5 Rhdf5lib RSpectra]; broken = true; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; broken = true; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; broken = true; }; + BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.3"; sha256="0fydh3pp7y0glk2rhihcslzx10hgn5la922jbnqzg2nplvzv7ybj"; depends=[expm Formula lmtest numDeriv]; broken = true; }; BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; broken = true; }; BioMedR = derive2 { name="BioMedR"; version="1.2.1"; sha256="0l3nmnqv0gzkbby4fhajbba910zpnbyckvxwds353pn54g9pcry7"; depends=[Biostrings ChemmineR fmcsR GOSemSim MASS org_Hs_eg_db pls randomForest rcdk RCurl rjson]; broken = true; }; Biolinv = derive2 { name="Biolinv"; version="0.1-3"; sha256="1c081rhbgl6n76p2knaiyvjx0l02slix92vgfl2spss5cb9qzkln"; depends=[classInt fields raster sp spatstat spatstat_core spatstat_geom]; broken = true; }; @@ -19985,17 +20074,21 @@ in with self; { BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; broken = true; }; Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; broken = true; }; Boov = derive2 { name="Boov"; version="1.0.0"; sha256="0vj57rlgabgs08sxi8vghkij22av99mbihrqw69d99xy8vjaf277"; depends=[BH data_table gmp PolygonSoup Rcpp RcppCGAL RcppEigen]; broken = true; }; + Brundle = derive2 { name="Brundle"; version="1.0.9"; sha256="0z17wgmi272738n8pn6r60v5gbg8cbmwhc94s8f3vipa44h690bc"; depends=[DESeq2 DiffBind lattice Rsamtools]; broken = true; }; BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; broken = true; }; - CAMAN = derive2 { name="CAMAN"; version="0.77"; sha256="1213lh2zbcv50djcv23k1g66kdxzj527w86s0dl6j0skmy98dy8i"; depends=[mvtnorm sp]; broken = true; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; broken = true; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; broken = true; }; CARS = derive2 { name="CARS"; version="0.2.2"; sha256="18l2bhfwma24q1zg1y1xmlcmnbzjqmmny3h7s179kslagnh3kmsj"; depends=[np]; broken = true; }; CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; broken = true; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; broken = true; }; CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; broken = true; }; + CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; broken = true; }; + CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; broken = true; }; CDSeq = derive2 { name="CDSeq"; version="1.0.8"; sha256="06pjp9hn9ziz4wgkaj0r0zzw69r7635j10rmnl331abc4mchpazy"; depends=[Biobase clue dirmult doParallel dplyr foreach ggplot2 ggpubr gplots iterators magrittr MASS Matrix matrixStats qlcMatrix Rcpp RcppArmadillo RcppThread rlang Seurat]; broken = true; }; + CEDARS = derive2 { name="CEDARS"; version="1.90"; sha256="1fngyc08kvilfd2d75gjg0s6c5zvjywym35sk568yzxnsz89b7yy"; depends=[fastmatch jsonlite mongolite readr shiny udpipe]; broken = true; }; CENFA = derive2 { name="CENFA"; version="1.1.1"; sha256="0b1zpazbqynlnmf8k25r5bjmidymskqc96xpmwqkl23xlz1f2x3s"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; broken = true; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; broken = true; }; + CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; broken = true; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; broken = true; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; broken = true; }; CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; broken = true; }; @@ -20008,8 +20101,10 @@ in with self; { COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; broken = true; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; broken = true; }; CRAC = derive2 { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; broken = true; }; + CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; broken = true; }; CSUV = derive2 { name="CSUV"; version="0.1.1"; sha256="1gh8gxwnrg4j017c08xfhm57rwci24sqmxxx00k3d0mw6j0mbdvw"; depends=[caret doParallel DT futile_logger ggplot2 glmnet HDCI MASS ncvreg relaxo reshape2 shiny shinyjs]; broken = true; }; CTD = derive2 { name="CTD"; version="1.1.0"; sha256="0rc8i01r3fxld01qliybmbifgb5vb55dwk5arzgv95mrxsrbs4ml"; depends=[igraph]; broken = true; }; + CTP = derive2 { name="CTP"; version="3.0.1"; sha256="02f423y7yx0hchzghfdbrrljsfq3af1wcbvk8z1q5wyzq99xcag5"; depends=[clinfun diagram dplyr emmeans Gmisc magrittr MASS shape survival]; broken = true; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; broken = true; }; CVarE = derive2 { name="CVarE"; version="1.1"; sha256="132bsqvdhalifn47xka23ikas1axxkg4jw8yja6ba8dflb8r753i"; depends=[mda]; broken = true; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; broken = true; }; @@ -20023,24 +20118,29 @@ in with self; { CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; broken = true; }; CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; broken = true; }; ClimDown = derive2 { name="ClimDown"; version="1.0.8"; sha256="0qcag9jwvhi9yss55wy5jxabrvym9hljn1fs5gfkzjs5hiwv3gxv"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; broken = true; }; + ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; broken = true; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; broken = true; }; - CoMiRe = derive2 { name="CoMiRe"; version="0.7.1"; sha256="0z42d5xawz7maqnzcqm5dv7v6bvqv3yzabp38bhxa3m3sz4dhvnd"; depends=[ggplot2 gtools KernSmooth mvtnorm NonpModelCheck Rcpp RcppArmadillo rlang splines2 truncnorm]; broken = true; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; broken = true; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; broken = true; }; + Colossus = derive2 { name="Colossus"; version="0.9.3"; sha256="1h3aimby9d7i6mx16sklx1vxi2jqp85phkqd7icj0fysawm712cn"; depends=[data_table ggplot2 Rcpp RcppEigen rlang testthat]; broken = true; }; CombMSC = derive2 { name="CombMSC"; version="1.4.2.1"; sha256="1jxf59hs1px271im2dwc1653y9pfp79gwmacafcva224bvh5vi49"; depends=[]; broken = true; }; CombinePValue = derive2 { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; broken = true; }; + CommEcol = derive2 { name="CommEcol"; version="1.7.1"; sha256="1s6x4mhcx64qdzmp83x3mzmwyj1biawmdj2y752xpm8gpxfjnbc0"; depends=[adespatial ape betapart gmp picante vegan]; broken = true; }; CommT = derive2 { name="CommT"; version="0.1.1"; sha256="1kimm8z3k7p5lxsjnkb203js2rqn09grywxs890fab1hhgssgv2r"; depends=[ape ggplot2 gridExtra phangorn reshape]; broken = true; }; CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; broken = true; }; CompLognormal = derive2 { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; broken = true; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; broken = true; }; ComparisonCR = derive2 { name="ComparisonCR"; version="1.0.4"; sha256="10xw3ppkzpc3njc409ln7g6bg33csf2ilw3f11hn60ry5xbnn82y"; depends=[boot CIFsmry cmprsk]; broken = true; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; broken = true; }; + ConR = derive2 { name="ConR"; version="1.3.0"; sha256="1q93x2b7a2jgkybazk24x8gvwvjjvkhi1gy5zx1sc2f4arm73myq"; depends=[doSNOW fields foreach geosphere raster rgdal rgeos rnaturalearth sf snow sp tibble writexl]; broken = true; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; broken = true; }; ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; broken = true; }; ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; broken = true; }; CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; broken = true; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; broken = true; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="2.0"; sha256="1ly9na1lyjwzm23ip8cnpkrdabsvn0db11i4mhyvxpq4r38zvhnn"; depends=[data_table RColorBrewer rlist stringi]; broken = true; }; + CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; broken = true; }; + CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; broken = true; }; CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; broken = true; }; CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; broken = true; }; Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; broken = true; }; @@ -20052,6 +20152,7 @@ in with self; { CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; broken = true; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; broken = true; }; DAMisc = derive2 { name="DAMisc"; version="1.7.2"; sha256="1mg40fqb0bj8jlw50dkkby67rj83g6pjhw9vbqvfxq30a1pq9inm"; depends=[AICcmodavg boot car clarkeTest coda dplyr DT effects ggplot2 haven janitor jtools lattice latticeExtra magrittr MASS nnet optiscale rlang srvyr survey tibble tidyr tidyselect xtable]; broken = true; }; + DBERlibR = derive2 { name="DBERlibR"; version="0.1.3"; sha256="19hqp0q7j6b7h9bamn3v2d1kdwzi0mlqvx7b618fkixpibqndzn7"; depends=[car dplyr emmeans ggplot2 ggpubr ggrepel psych readr reshape rstatix tibble]; broken = true; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; broken = true; }; DBIsqldf = derive2 { name="DBIsqldf"; version="0.9.9-2"; sha256="1yp9xqrf6dbq9478w0bd55rzhqf78anwrqzlkphbl7fk2d2ipy6i"; depends=[DBI]; broken = true; }; DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; broken = true; }; @@ -20062,12 +20163,13 @@ in with self; { DET = derive2 { name="DET"; version="3.0.1"; sha256="0r2q1r4wc4nhhrr9bllxsp2w6ajja61mh34dyijjsfchx4025ljb"; depends=[doParallel pROC]; broken = true; }; DIDmultiplegt = derive2 { name="DIDmultiplegt"; version="0.1.0"; sha256="1jzc2ixb92mxlm39xf3rmab9c8959xylnxacr4xqjnhi9hlkq30n"; depends=[assertthat dplyr fixest plotrix sampling stringr]; broken = true; }; DPWeibull = derive2 { name="DPWeibull"; version="1.8"; sha256="05sasi42cakq0k3syvn2hnvb0sl2dflw6x98riwgrjvsmnw6bh2g"; depends=[binaryLogic prodlim Rcpp RcppArmadillo survival truncdist]; broken = true; }; - DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; broken = true; }; DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; broken = true; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; broken = true; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; broken = true; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; broken = true; }; + DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; broken = true; }; DUBStepR = derive2 { name="DUBStepR"; version="1.2.0"; sha256="0kma87hqcng3i0ys9r34kl6af8q1i9avmdv9awf0rdrlqyabnrn1"; depends=[Matrix matrixcalc qlcMatrix RANN Seurat]; broken = true; }; + DWBmodelUN = derive2 { name="DWBmodelUN"; version="1.0.0"; sha256="1m71fx9l2rq27d2q5hiqxiyljvf5wjcfkcblqw19rpiixrinv4va"; depends=[dygraphs htmltools ncdf4 raster rgdal]; broken = true; }; Data2LD = derive2 { name="Data2LD"; version="3.2.1"; sha256="1y6nyysm96q5mlrcl0vkjhq5lr624n2266xpmyl4ck0h1dhjb6bz"; depends=[deSolve fda knitr rmarkdown]; broken = true; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; broken = true; }; DataPackageR = derive2 { name="DataPackageR"; version="0.15.8"; sha256="0jrla69v47nycrqb4lccw2s2qabk2l9nm4sgwd1lfpq1zl8b3jwg"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; broken = true; }; @@ -20088,13 +20190,16 @@ in with self; { DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; broken = true; }; DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; broken = true; }; DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; broken = true; }; + DivInsight = derive2 { name="DivInsight"; version="0.1.0"; sha256="0chhr94id5n9zmkif49haqa2fjfhdhddp3ikwyfxp2cwmq223v88"; depends=[dplyr geosphere ggplot2 leaflet rgbif vegan]; broken = true; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; broken = true; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; broken = true; }; + DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; broken = true; }; Dominance = derive2 { name="Dominance"; version="1.2.0"; sha256="1z2gcs7myf90986gzw9g3914ph5cyg6pq6k53h4z566x883q8maz"; depends=[chron igraph]; broken = true; }; DominoDataCapture = derive2 { name="DominoDataCapture"; version="0.1.1"; sha256="168nvarg58x0w7bi365rd810gl5xz1b2kv8jv0myb7qwxdw1igm4"; depends=[lgr rjson uuid]; broken = true; }; DominoPredictionLogging = derive2 { name="DominoPredictionLogging"; version="0.1.0"; sha256="1qzh8inzqk1s6cw9bsl7hazdf6cbfr11zs22723wl4xs31inp1lg"; depends=[lgr rjson uuid]; broken = true; }; DrInsight = derive2 { name="DrInsight"; version="0.1.2"; sha256="1zz9i4aj0ijqfgp30wv0bvrgx2n003dysqg0pm13f7hni27819ff"; depends=[igraph qusage]; broken = true; }; DriveML = derive2 { name="DriveML"; version="0.1.5"; sha256="0gbrrlz40cs95ml92k7q1lrxkm9iv5bjsr2sy9c7jzygnrlmnmms"; depends=[caTools data_table ggplot2 iml mlr ParamHelpers rmarkdown sampling SmartEDA]; broken = true; }; + DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; broken = true; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; broken = true; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; broken = true; }; DynComm = derive2 { name="DynComm"; version="2020.1.6"; sha256="09nhcp9rldwrybwhyg86mgpgwq4hzlpp4rm5a5gl33nnhvcdm0mx"; depends=[igraph Rcpp Rdpack]; broken = true; }; @@ -20102,42 +20207,51 @@ in with self; { EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; broken = true; }; EDCimport = derive2 { name="EDCimport"; version="0.3.0"; sha256="0kb5m60x4pgj5d4m2wmq0mf5xv7v4j3nmlyx8ss4l6hlb3ykq03z"; depends=[cli dplyr forcats ggplot2 glue haven labelled purrr readr rlang stringr tibble tidyr tidyselect]; broken = true; }; EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; broken = true; }; + EGAnet = derive2 { name="EGAnet"; version="2.0.1"; sha256="09m589sji3l7kdgg5mqsmpjk0adn0kzi0vpqqks02x3pf81k5gqr"; depends=[BGGM future future_apply GGally ggdendro ggplot2 ggpubr glasso GPArotation igraph lavaan Matrix network progressr qgraph semPlot sna]; broken = true; }; + EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.1.4"; sha256="02izrgl526znn4xs10c5l3gv0b5chmgr376i26nli988cypmf32h"; depends=[dplyr lubridate MASS plotly RColorBrewer scales viridis xts zoo]; broken = true; }; EIAdata = derive2 { name="EIAdata"; version="0.1.3"; sha256="0cx8x16jn8pfik7yd6vfqh23fqlfxnfj3ya42h5zbvsbka8rislh"; depends=[httr XML xts zoo]; broken = true; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; broken = true; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; broken = true; }; EMVS = derive2 { name="EMVS"; version="1.2.1"; sha256="1aikms2i77hwv6hrk8kn9wrh1v5j5zm918cwdwm5s6cy8fcqf406"; depends=[Rcpp RcppArmadillo]; broken = true; }; + ENMTools = derive2 { name="ENMTools"; version="1.1.1"; sha256="04dvrdw7xnxxa9s1iyxjaf090mmm5kqn5minpz0znjfc9k92cfzs"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster sp spatstat_geom spatstat_random terra]; broken = true; }; EPP = derive2 { name="EPP"; version="0.3.6.1"; sha256="015hp5f3nrf0hqi11cgsi43a97h9cvny4d75hfjd10zf0fj261h9"; depends=[assertthat curl deldir dplyr flexclust httr leaflet leaflet_extras maptools nngeo osrm plyr rgdal rgeos sf sp]; broken = true; }; ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; broken = true; }; ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; broken = true; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; broken = true; }; + EWSmethods = derive2 { name="EWSmethods"; version="1.1.2"; sha256="14hqvxsv88n6sqvwh3sqy6k0s7c121b52bm3krnqsxy872hjl346"; depends=[dplyr egg foreach forecast ggplot2 gtools infotheo moments rEDM reticulate scales seasonal tidyr zoo]; broken = true; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; broken = true; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; broken = true; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; broken = true; }; ElectionsLATAM = derive2 { name="ElectionsLATAM"; version="0.1.1"; sha256="0xs3qff1ayq12cr7xszxvzmyihs4p9vsyrwcglll794vj096ylz4"; depends=[boot dplyr foreign lgr magrittr networkD3 R6 readr readxl testthat webshot]; broken = true; }; + EloOptimized = derive2 { name="EloOptimized"; version="0.3.1"; sha256="09bg1gm8jhjj0r7yzdgi2zlyavrizgiljwh26mpb6ng6p5mkliid"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang]; broken = true; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.2"; sha256="1lsapsz8w8srdqdkxvlg5nsn157wbihxjgdaf53r5iaxzcljkzxc"; depends=[digest kinship2]; broken = true; }; EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; broken = true; }; + EnvExpInd = derive2 { name="EnvExpInd"; version="0.1.0"; sha256="063f3c10a7k9j3f85xilj1s6dd9ky5sw8sbvhzkhg5hg92c9dpns"; depends=[dplyr gstat maptools RCurl sp stringi zoo]; broken = true; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; broken = true; }; - EpiStats = derive2 { name="EpiStats"; version="1.5-1"; sha256="0swxww4x0qqlby4m8xw58jr5x2ml5z896m8w0f1v0mr7kf1v6fpi"; depends=[dplyr epiR]; broken = true; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; broken = true; }; + EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; broken = true; }; EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; broken = true; }; Eunomia = derive2 { name="Eunomia"; version="1.0.1"; sha256="06a42qsf3nx1pbynikkdvmbhh1rmgnfmiggdn86b3a0ij6cq0p2r"; depends=[DatabaseConnector RSQLite SqlRender]; broken = true; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; broken = true; }; - ExGaussEstim = derive2 { name="ExGaussEstim"; version="0.1"; sha256="167y82sqqwmjaxmxag01nvg27c3gb58x8zbjr8ng01ygjc5rpkcb"; depends=[fitdistrplus gamlss_dist HI invgamma nloptr pracma]; broken = true; }; + ExprNet = derive2 { name="ExprNet"; version="1.0.0"; sha256="1cskr8mihnjihgddc44j24wkbiswm6ra1qj5nxva7klc744q5vk7"; depends=[doParallel foreach here igraph]; broken = true; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; broken = true; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; broken = true; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; broken = true; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; broken = true; }; - FFdownload = derive2 { name="FFdownload"; version="1.1.0"; sha256="050mn48q36585s2xf0dbsb385rla1jnnlkppnagrijdpmkvjzfy9"; depends=[plyr rvest timetk xml2 xts zoo]; broken = true; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; broken = true; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; broken = true; }; + FLightR = derive2 { name="FLightR"; version="0.5.4"; sha256="1lbdh4m0s12617s7sarqhlj88j3rn8zaiiwz361rx83map4vvhad"; depends=[bit CircStats circular fields geosphere ggmap ggplot2 ggsn maps mgcv nlme RcppArmadillo sf suntools truncnorm]; broken = true; }; + FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; broken = true; }; FREG = derive2 { name="FREG"; version="1.1"; sha256="1f9ss0aj6w6n0x4np6wi3ynhhcibr5zk54gzbkgpk6q3y7pv0qs1"; depends=[fda]; broken = true; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; broken = true; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; broken = true; }; + FactorsR = derive2 { name="FactorsR"; version="1.5"; sha256="1rla44g75hrqalrblr1yaawmyixmivlacn50marqgd9fjh8blgcd"; depends=[]; broken = true; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; broken = true; }; FastHCS = derive2 { name="FastHCS"; version="0.0.7"; sha256="0l3fi3siwg2jhsj0jbhgccx8pnwd8h8f4z37g1najb41hw8dwn8d"; depends=[matrixStats Rcpp RcppEigen]; broken = true; }; FastLZeroSpikeInference = derive2 { name="FastLZeroSpikeInference"; version="2018.12.10"; sha256="0ybpmns7bc1j5xzqjl7734grihmvvpa3h52gixv3h70l0r89d8ys"; depends=[]; broken = true; }; FcircSEC = derive2 { name="FcircSEC"; version="1.0.0"; sha256="06c1n0xx1q0zh16bgylwbvqzp8q4c5bj626shm2c6r8f9kcjgysh"; depends=[Biostrings seqRFLP stringi]; broken = true; }; FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; broken = true; }; + FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; broken = true; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; broken = true; }; Fiscore = derive2 { name="Fiscore"; version="0.1.3"; sha256="0mxiip7gwhm9ck5a7yn12shk8jwjmq34j99n3shzhh6h482kqs94"; depends=[bio3d dplyr ggplot2 knitr lattice mclust plotly rmarkdown stringr]; broken = true; }; FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; broken = true; }; @@ -20146,13 +20260,13 @@ in with self; { ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; broken = true; }; ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; broken = true; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; broken = true; }; + FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; broken = true; }; FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; broken = true; }; G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; broken = true; }; GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; broken = true; }; GADMTools = derive2 { name="GADMTools"; version="3.9-1"; sha256="0l62gsd3sdyvhsw7bqvgn3fv15xwm13y9nsm8r9fgcqbfpw45g32"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr]; broken = true; }; GBcurves = derive2 { name="GBcurves"; version="0.1.6"; sha256="1agd7nkgahhwcc5p1zybnd6xws0kr0ggk70aznxfn2nijhw7sqwr"; depends=[curl functional httr magrittr readxl rvest xml2 xts]; broken = true; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; broken = true; }; - GDELTtools = derive2 { name="GDELTtools"; version="1.5"; sha256="1lhsyf7kd1lnx2dgifmrd89yl95sf9k6ay19dll2p8b9h3vs7hci"; depends=[dplyr plyr TimeWarp]; broken = true; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; broken = true; }; GEint = derive2 { name="GEint"; version="1.0"; sha256="0srja3kwm4yjmh1vpzfwrx7ii4s9xj9j88pgcm299dnqxkv59y3r"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; broken = true; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; broken = true; }; @@ -20166,6 +20280,7 @@ in with self; { GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; broken = true; }; GRPtests = derive2 { name="GRPtests"; version="0.1.2"; sha256="12w0vskf1n31zspk3vjgdlhrjwpsysvwwr0l0vm57j6faqc31i3s"; depends=[glmnet MASS randomForest ranger RPtests]; broken = true; }; GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; broken = true; }; + GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; broken = true; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; broken = true; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; broken = true; }; GapAnalysis = derive2 { name="GapAnalysis"; version="1.0.2"; sha256="0ky1njrymh102dy7sna2cm5f5gyx4s7k77bnsdal1yndgw7ppqvx"; depends=[data_table fasterize geosphere raster rmarkdown sf sp tmap]; broken = true; }; @@ -20176,21 +20291,26 @@ in with self; { GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; broken = true; }; GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; broken = true; }; GenomicTools = derive2 { name="GenomicTools"; version="0.2.9.7"; sha256="196shxbrcgiwaa7aav2aipsbj1smrkbhinn44aw9qfvz2x9zdz0m"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; broken = true; }; + GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; broken = true; }; GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; broken = true; }; GeoFIS = derive2 { name="GeoFIS"; version="1.0.4"; sha256="095lwn9kldhs8nhpp0b6fzhwn5b8ar8511b4144xjks70f7kg7ym"; depends=[BH data_tree FisPro foreach nnls R6 Rcpp Rdpack rgeos sp]; broken = true; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; broken = true; }; GeoTcgaData = derive2 { name="GeoTcgaData"; version="1.1.1.992"; sha256="0xzz5sg9ywmpwym50hbvb1z7f8wwbbr4shiir8kj4mwf22snsk6d"; depends=[cqn data_table dplyr magrittr plyr topconfects]; broken = true; }; + GeodesiCL = derive2 { name="GeodesiCL"; version="1.0.0"; sha256="1i3i6vlh3nnb7z6qzh2cd6cqka78bfdly952x5ryl7cb2590a4pc"; depends=[dplyr htmltools leaflet leafpop magrittr mapview profvis readr rgdal sp tibble]; broken = true; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; broken = true; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; broken = true; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; broken = true; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; broken = true; }; GmAMisc = derive2 { name="GmAMisc"; version="1.2.1"; sha256="0rvdphdgk1bdfamwf6spy5k9qa5ws92mvf3q3dlhn6qfazp7j4hr"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos sp spatstat_core spatstat_geom spatstat_random]; broken = true; }; + GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0.1"; sha256="1gdjx9dazrff2nj16044b7vr7jwddf5cj0iwnlhan46fnibsfwjf"; depends=[Matrix]; broken = true; }; + Guerry = derive2 { name="Guerry"; version="1.8.1"; sha256="1pci00b69sk9qlgpkbmvcijlbh48xdmshh57xgi84m85j16i4rlw"; depends=[sp]; broken = true; }; GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; broken = true; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; broken = true; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; broken = true; }; HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; broken = true; }; HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; broken = true; }; HCD = derive2 { name="HCD"; version="0.1"; sha256="158szwhpxwj2dj7sibyh8l92dk9cmy6acapmk8wf5hmfybdpgbsh"; depends=[data_table data_tree dendextend irlba Matrix randnet RSpectra stringr]; broken = true; }; + HCV = derive2 { name="HCV"; version="1.2.0"; sha256="00ry36w2v4h3vkf2jq3djcma23xflr7fx7icy2vzwk9ffnmzvpxd"; depends=[BLSM cluster geometry M3C MASS Matrix rgeos sp]; broken = true; }; HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; broken = true; }; HDPenReg = derive2 { name="HDPenReg"; version="0.94.9"; sha256="17lra03iyvs51bgbnbhs4f5rvjvdz9zk7mg2f0xmsr4nvllp44ys"; depends=[Matrix Rcpp rtkore]; broken = true; }; HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; broken = true; }; @@ -20212,10 +20332,12 @@ in with self; { HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; broken = true; }; HierPorfolios = derive2 { name="HierPorfolios"; version="0.1.0"; sha256="0lx10lnslal689ykp7idvngc074yhfx3mkddyrax91djnqsc8aq4"; depends=[cluster fastcluster RiskPortfolios]; broken = true; }; Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; broken = true; }; + HostSwitch = derive2 { name="HostSwitch"; version="0.1.3"; sha256="1937rjjz3lzriym1brjfpp1b02zd40ry4205yrkrs3vxp1lp4234"; depends=[checkmate ggplot2 shiny tippy]; broken = true; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; broken = true; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; broken = true; }; HydeNet = derive2 { name="HydeNet"; version="0.10.11"; sha256="1qi87k2drizqba1nz8psh697ks8ai8xz492kzsrs76xlxpbk1i9k"; depends=[checkmate DiagrammeR dplyr graph magrittr nnet pixiedust plyr rjags stringr]; broken = true; }; IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; broken = true; }; + IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; broken = true; }; IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; broken = true; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; broken = true; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; broken = true; }; @@ -20228,19 +20350,21 @@ in with self; { IGP = derive2 { name="IGP"; version="0.2.0"; sha256="1hsyl6cjm84w4f4v0gw4hi5y483r8v78xb3k3h1ixix9ymjqr8y5"; depends=[R6 reticulate]; broken = true; }; IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; broken = true; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; broken = true; }; - IP = derive2 { name="IP"; version="0.1"; sha256="0ranpsacsl2nm8swc3saw6xh6cdsfdyq58jlpki04kk3hsqbr9p0"; depends=[stringi]; broken = true; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; broken = true; }; IPWpn = derive2 { name="IPWpn"; version="0.1.0"; sha256="0glw8sb8jadnvznfj31l6lal0vqnmsmk96byinw7wy8avkz455fn"; depends=[dplyr MplusAutomation mvtnorm tibble tidyr tidyverse]; broken = true; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; broken = true; }; IRSF = derive2 { name="IRSF"; version="1.0.3"; sha256="1cq196z2i4by7dfij6w849a49d8dzzcdk5a68nxvmvwq3xskywam"; depends=[abind randomForestSRC survival]; broken = true; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; broken = true; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; broken = true; }; + ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; broken = true; }; + ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; broken = true; }; IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; broken = true; }; Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; broken = true; }; IceCast = derive2 { name="IceCast"; version="2.1.0"; sha256="0h3z68lfjw5s51601m17m2gvn12vkwj5gzc70dqzfjmxdkgv3p28"; depends=[coda maptools MASS ncdf4 raster Rcpp RcppArmadillo rgeos sp]; broken = true; }; IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; broken = true; }; ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; broken = true; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; broken = true; }; + IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; broken = true; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; broken = true; }; InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; broken = true; }; IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; broken = true; }; @@ -20248,16 +20372,20 @@ in with self; { InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; broken = true; }; Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; broken = true; }; IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; broken = true; }; + IsoCorr = derive2 { name="IsoCorr"; version="1.0"; sha256="0rhbclbpfd9d0dawbwwprlzx2j9k59gsmrb11yabiv5305b7vpx8"; depends=[]; broken = true; }; IsoMemo = derive2 { name="IsoMemo"; version="1.0.6"; sha256="1srs8iiy1w18gyzkw60gxw90mdmywmlnfsw3da4izl42x0ngqjww"; depends=[curl jsonlite modules]; broken = true; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; broken = true; }; + JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; broken = true; }; JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.10"; sha256="1hkylfrr2036vgkxfs98szm3883bmyvvyr0f3a8xygccf3pn28xc"; depends=[dplyr MASS pracma Rcpp reshape2 statmod]; broken = true; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; broken = true; }; JirAgileR = derive2 { name="JirAgileR"; version="0.0.2.1"; sha256="0f208q0qxvqzgbwdbads9rfalancwk6xwvi5x3vsszpbd6gzas4y"; depends=[httr jsonlite magrittr]; broken = true; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; broken = true; }; + JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; broken = true; }; JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; broken = true; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; broken = true; }; JumpeR = derive2 { name="JumpeR"; version="0.3.0"; sha256="1bh2448462xgiv4k19qgm3dc4wa00ad8v3l6v22pg0l5kpmlx5i2"; depends=[dplyr magrittr pdftools purrr rvest stringr SwimmeR xml2]; broken = true; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; broken = true; }; + KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; broken = true; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; broken = true; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; broken = true; }; KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; broken = true; }; @@ -20273,6 +20401,7 @@ in with self; { LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; broken = true; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; broken = true; }; LDheatmap = derive2 { name="LDheatmap"; version="1.0-6"; sha256="0gr99kys1ahyl8s6cbj6rmh4vwid8kn92lcbjnwh0ahb73m2xjjc"; depends=[genetics Rcpp snpStats]; broken = true; }; + LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; broken = true; }; LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; broken = true; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; broken = true; }; LIHKGr = derive2 { name="LIHKGr"; version="0.1.0"; sha256="16yyalsdbaxncgfabsz2q2fixzmwyd62gvnvnxazf4vlypp6xlqz"; depends=[dplyr magrittr purrr R6 raster RSelenium rvest tibble xml2]; broken = true; }; @@ -20280,13 +20409,14 @@ in with self; { LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; broken = true; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; broken = true; }; LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; broken = true; }; + LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; broken = true; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; broken = true; }; - LTRCforests = derive2 { name="LTRCforests"; version="0.5.5"; sha256="0f0am4wydk4wqiwjzxj2ibdkp5sd47qam4218nn0489knkvas3s7"; depends=[ipred partykit prodlim survival]; broken = true; }; LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; broken = true; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; broken = true; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; broken = true; }; LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; broken = true; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; broken = true; }; + LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.4"; sha256="1slkhgac7izkmp5g203lhzvh991mnqf2qz1m0nd1k89084wvkv7b"; depends=[cluster lattice]; broken = true; }; LogisticDx = derive2 { name="LogisticDx"; version="0.3"; sha256="1hry32grqwlarp0cplx8szf4pf7ml1nxd11ahffmr72ihcv5ckga"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; broken = true; }; LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; broken = true; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; broken = true; }; @@ -20306,6 +20436,8 @@ in with self; { MCMChybridGP = derive2 { name="MCMChybridGP"; version="5.4"; sha256="19nbch76g7jf53nrb1lyzr3zd0z6rpz2k86mq1r9aidwwxh81g7p"; depends=[MASS]; broken = true; }; MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; broken = true; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; broken = true; }; + MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; broken = true; }; + MEtest = derive2 { name="MEtest"; version="1.1"; sha256="0dxm3fs0lqnas70a1ckikvjp2ib9rqsknwcs9n9jfsmm1fqhxdpf"; depends=[statmod]; broken = true; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; broken = true; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; broken = true; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; broken = true; }; @@ -20320,6 +20452,7 @@ in with self; { MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; broken = true; }; MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; broken = true; }; MLDAShiny2 = derive2 { name="MLDAShiny2"; version="0.1.0"; sha256="1mx8js54mrrf16jriy467dysxpkcsza9fvdmpdbmxr5m3y564sc7"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; broken = true; }; + MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; broken = true; }; MLPA = derive2 { name="MLPA"; version="1.10.0"; sha256="1w8vhvs8ri8iyh068g59chz3mn0wapa4jr1wmhjlzwa2c651q2cx"; depends=[]; broken = true; }; MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; broken = true; }; MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; broken = true; }; @@ -20335,8 +20468,13 @@ in with self; { MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; broken = true; }; MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; broken = true; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; broken = true; }; + MSTest = derive2 { name="MSTest"; version="0.1.1"; sha256="0icrpzvgbr84scx44lkg0r3f0x6hppqqikcnr0hpsbg6125ihq5f"; depends=[foreach GA GenSA lmf nloptr numDeriv pso Rcpp RcppArmadillo rlang]; broken = true; }; + MSinference = derive2 { name="MSinference"; version="0.1.0"; sha256="1016i5khs5sh90ywffwkl1jjj3j08iw9hs1zhw08xz9p6sj6qz9n"; depends=[doParallel foreach Rcpp Rdpack]; broken = true; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; broken = true; }; + MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; broken = true; }; + MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; broken = true; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; broken = true; }; + MakeYourPalette = derive2 { name="MakeYourPalette"; version="0.1.3"; sha256="0snawchc2rkxglmcg093gik3gwasn4pxqsvz6rm2r1gkbwbazmh4"; depends=[prismatic raster rgdal]; broken = true; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; broken = true; }; MasterBayes = derive2 { name="MasterBayes"; version="2.58"; sha256="0s6zry5nhwg3zbfgqd6zdrys0irf6336gfcba77z7xwssd4gh9j5"; depends=[coda genetics gtools kinship2]; broken = true; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; broken = true; }; @@ -20353,6 +20491,7 @@ in with self; { MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; broken = true; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; broken = true; }; MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; broken = true; }; + MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; broken = true; }; Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; broken = true; }; Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; broken = true; }; Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; broken = true; }; @@ -20363,8 +20502,11 @@ in with self; { Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; broken = true; }; MinkowskiSum = derive2 { name="MinkowskiSum"; version="1.0.0"; sha256="1v7i3jzj65y8xy8kyl4jp651pqk5xd9bbfj8az1443ng9l39n57h"; depends=[BH data_table gmp PolygonSoup Rcpp RcppCGAL RcppEigen]; broken = true; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; broken = true; }; + MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; broken = true; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; broken = true; }; + MoMPCA = derive2 { name="MoMPCA"; version="1.0.1"; sha256="1snixlq35xbzf005d877i493sf1wm48jqlq9515yl1s6lxmav1n7"; depends=[doParallel dplyr foreach magrittr Matrix slam tm topicmodels]; broken = true; }; ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; broken = true; }; + Momocs = derive2 { name="Momocs"; version="1.4.0"; sha256="08p2kjgfq7h7pwn4lqsfcy4d7rml6n0s1fb90l0iy1a88brbd3br"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp tibble vegan]; broken = true; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; broken = true; }; MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.2"; sha256="1hd0lvvy12r6kxa64vwnjavyv2f7a9jqgjxgmlw86wwh5g09hvfd"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; broken = true; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; broken = true; }; @@ -20389,7 +20531,6 @@ in with self; { NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; broken = true; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; broken = true; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; broken = true; }; - NTS = derive2 { name="NTS"; version="1.1.2"; sha256="02gh9yqflwgqws7a14wwb1y7qx0whw4ss1kkfgh9jp6bxc2dclnf"; depends=[dlm MASS MSwM Rdpack tensor]; broken = true; }; NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; broken = true; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; broken = true; }; NetLogoR = derive2 { name="NetLogoR"; version="0.3.11"; sha256="0pppcpij4wn1gig7lyh122x52dx8x1dy98v5cphmrap8mpj4x7h2"; depends=[abind CircStats data_table matrixStats quickPlot raster sf sp SpaDES_tools]; broken = true; }; @@ -20400,31 +20541,34 @@ in with self; { NonpModelCheck = derive2 { name="NonpModelCheck"; version="4.1"; sha256="0yd30gy1145zizdvy2zh73ppbiz3awg8j1h7j6iabqxy61h0llnw"; depends=[dr]; broken = true; }; NormalBetaPrime = derive2 { name="NormalBetaPrime"; version="2.2"; sha256="03il9c57dbwgw38rzckkk0wkc37z8kfdrb7b4k471gm7mqhsm3m3"; depends=[GIGrvg glmnet HyperbolicDist MASS Matrix pracma pscl truncnorm]; broken = true; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; broken = true; }; + OBsMD = derive2 { name="OBsMD"; version="6.1"; sha256="0jvvcx2lc39rdnlbhykam6cf94lbci9zc1vshwfhvygblnmjgrzr"; depends=[]; broken = true; }; OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; broken = true; }; OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; broken = true; }; + ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; broken = true; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; broken = true; }; ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; broken = true; }; ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; broken = true; }; ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; broken = true; }; ORdensity = derive2 { name="ORdensity"; version="1.0"; sha256="1g9d85dyfhlqmwsigdn64hifasbvw70g3wpph2h9v2ksvia0cd31"; depends=[cluster distances doParallel doRNG foreach plyr Rfast]; broken = true; }; - OTclust = derive2 { name="OTclust"; version="1.0.4"; sha256="11mr67zp68wzf1dd6vb3f31g8a430im97sdjsb0w4awqpmjdyyrz"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; broken = true; }; OjaNP = derive2 { name="OjaNP"; version="1.0-0"; sha256="0xddspnnwlcxh2i66ilh6i920k53y7fv6m1hgj9h28qg2wy0vyah"; depends=[ICS ICSNP Rcpp]; broken = true; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; broken = true; }; OmicInt = derive2 { name="OmicInt"; version="1.1.7"; sha256="1rrh2z8hbfvha8yi7d7m7bpgz514cp9dzv5vs4yn5pagzca6r5np"; depends=[cluster dendextend dplyr ggExtra ggplot2 gtools igraph knitr lattice mclust pheatmap plotly RColorBrewer RCurl reshape2 rmarkdown STRINGdb stringr tidyr tidyselect]; broken = true; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; broken = true; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; broken = true; }; + OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; broken = true; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; broken = true; }; OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; broken = true; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; broken = true; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; broken = true; }; + OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; broken = true; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; broken = true; }; PALMO = derive2 { name="PALMO"; version="0.1.2"; sha256="0vh0i5qb26267w5dzply091dh4mcxyza7yyhh7sy2wmwb04834ak"; depends=[circlize ComplexHeatmap cowplot dplyr factoextra ggforce ggplot2 ggrepel knitr lme4 MAST pbapply pheatmap reshape2 Rtsne Seurat tidyverse]; broken = true; }; PAMA = derive2 { name="PAMA"; version="1.2.0"; sha256="12fvkcdkn66gzr193fq9byf64qlq2x9dkjv9hpfw770l4yw496jn"; depends=[ExtMallows mc2d PerMallows rankdist Rcpp]; broken = true; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; broken = true; }; PAutilities = derive2 { name="PAutilities"; version="1.1.0"; sha256="0qqxizq856wkx2x5g5pdnb4srh5xj0xyaljbk3i6nq5q41vrw5xk"; depends=[dplyr equivalence ggplot2 lazyeval lubridate magrittr Rcpp reshape2 rlang]; broken = true; }; PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; broken = true; }; - PDFEstimator = derive2 { name="PDFEstimator"; version="4.3"; sha256="1pnkds7m7g58ci4n35szdrpq3fpxkblvbyvyf9qwrm8casijfsqs"; depends=[MultiRNG plot3D]; broken = true; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; broken = true; }; + PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; broken = true; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; broken = true; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; broken = true; }; PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; broken = true; }; @@ -20432,18 +20576,23 @@ in with self; { PO_EN = derive2 { name="PO.EN"; version="1.0"; sha256="1b4vcj6dnfji99nlskjvls996cmb1b2s3mfdammi07sdx625pvji"; depends=[glmnet pROC PUlasso Rcpp RcppArmadillo]; broken = true; }; POFIBGE = derive2 { name="POFIBGE"; version="0.1.6"; sha256="0llam63hjf1yi6qc44bpgr6dmc4b8sy0sn8gwcgzz50apsn1glc9"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; broken = true; }; POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; broken = true; }; + PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; broken = true; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; broken = true; }; - PRSim = derive2 { name="PRSim"; version="1.4-3"; sha256="17r51x1vlqq5sllkb0c0namc52agy012wwycs85w13fy3nmy53dv"; depends=[goftest lmomco mev splus2R wavScalogram]; broken = true; }; PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; broken = true; }; PUlasso = derive2 { name="PUlasso"; version="3.2.4"; sha256="0mcmya0a5wzmssq05vpmkx9icfrq49kc0dc9ri3d9kx4w0sabffh"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; broken = true; }; + PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; broken = true; }; + PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.117"; sha256="0140j2bg6mqxsg86ndq3c0ls1kdvd33r2qrwih2cjgmnfq31adkj"; depends=[cluster curl dplyr dygraphs geosphere ggmap glue httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sf slippymath sp stringr tibble tidyr xts]; broken = true; }; + PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; broken = true; }; PandemicLP = derive2 { name="PandemicLP"; version="1.3.0"; sha256="12mhzzp5qjdg4krwa7z51lbcyxnp9lyp3jb16bcchmy3ggd1m3cx"; depends=[BH covid19br curl dplyr plotly Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tidyr]; broken = true; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; broken = true; }; + ParallelDSM = derive2 { name="ParallelDSM"; version="0.3.7"; sha256="10yqq7hki08qvymlw6f1w6rrg6381bzhyqa1v2ryxszx3prxxcps"; depends=[caret gstat pryr quantregForest randomForest raster rgdal snowfall sp stringr]; broken = true; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; broken = true; }; PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; broken = true; }; PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; broken = true; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; broken = true; }; PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; broken = true; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; broken = true; }; + Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; broken = true; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; broken = true; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.5"; sha256="1xcr7769d9jixq0lbc89jqzzxnnzxb8gjlws2l6cjm40hcid2yc9"; depends=[Matrix semver]; broken = true; }; Plasmode = derive2 { name="Plasmode"; version="0.1.0"; sha256="1qcni9zdckhsnw616jn7rdfd09kbl5wd4hljdja0w73jz1wd1z14"; depends=[arm epiDisplay foreign gbm glm2 lattice latticeExtra lme4 MASS Matrix mgcv nlme nnet RColorBrewer survey survival twang xtable]; broken = true; }; @@ -20451,7 +20600,6 @@ in with self; { PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; broken = true; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; broken = true; }; PolygonSoup = derive2 { name="PolygonSoup"; version="1.0.1"; sha256="1b9hwgfcac8jrr8na5g2n779hhm24cy7q4xr3kz9nlr8sp5zymb8"; depends=[BH data_table gmp Rcpp RcppCGAL RcppEigen rgl]; broken = true; }; - PopGenHelpR = derive2 { name="PopGenHelpR"; version="1.0.0"; sha256="0lg92iv1q5w29f70dfnhf6bvc646iiw7bb1c8f5shxxq2mljprc8"; depends=[adegenet dartR dplyr ggplot2 gstat hierfstat magrittr poppr raster reshape2 rnaturalearth scatterpie sp spdep StAMPP vcfR]; broken = true; }; PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; broken = true; }; PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; broken = true; }; PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; broken = true; }; @@ -20468,6 +20616,7 @@ in with self; { QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; broken = true; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; broken = true; }; QPmin = derive2 { name="QPmin"; version="0.5-1"; sha256="1hfvbi2qfynnkg2pmr7qsw75bmijwglnxchbzxcbikm5yw3sd2mz"; depends=[Matrix]; broken = true; }; + QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; broken = true; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; broken = true; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; broken = true; }; QuantTools = derive2 { name="QuantTools"; version="0.5.7.1"; sha256="1nkf7ihzfwgz7svh1jybgcvqwbim2dqzi00l4m9pma463va4q19d"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; broken = true; }; @@ -20478,6 +20627,7 @@ in with self; { R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; broken = true; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; broken = true; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; broken = true; }; + RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; broken = true; }; RAEN = derive2 { name="RAEN"; version="0.2"; sha256="098d990qa987hx2llqwdw2bmi5nmrlda23j1rgmw5nirllk28d30"; depends=[boot doParallel fastcmprsk foreach glmnet lars]; broken = true; }; RAM = derive2 { name="RAM"; version="1.2.1.7"; sha256="0aalswivpjs1glwf4yh3b79lch3n32fyj5xda55h3v7gzs7p0d7f"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; broken = true; }; RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; broken = true; }; @@ -20500,30 +20650,40 @@ in with self; { RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; broken = true; }; RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; broken = true; }; RGISTools = derive2 { name="RGISTools"; version="1.0.2"; sha256="0pildj5pmc34f58bv39gxl3p2g0cr32przdhjnss37kcdlcv5zlb"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp stars tmap urltools XML xml2]; broken = true; }; + RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; broken = true; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.6"; sha256="05wbcdksx5g6y7x4r1pvc9is3afxbpdxdbmc6b4jhn46rg4228z4"; depends=[digest httr lubridate]; broken = true; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.36.2"; sha256="1m3a3h3yxmr2qpcdyxrwxrdplvhb4rprvd8cnmfwk3zkazd69f9n"; depends=[]; broken = true; }; RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; broken = true; }; + RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; broken = true; }; + RKEELjars = derive2 { name="RKEELjars"; version="1.0.20"; sha256="1wsxn9l7xdmm9q3z9lbbkdcnwsfmcrayg08m4mkbwynii5z9x548"; depends=[downloader]; broken = true; }; RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; broken = true; }; RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; broken = true; }; RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; broken = true; }; + ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; broken = true; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; broken = true; }; ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[Matrix ROI slam]; broken = true; }; ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; broken = true; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; broken = true; }; RPS = derive2 { name="RPS"; version="1.0.1"; sha256="16n6wknw2m56kwi6rswgxjwjqblhaz5gyw94f96a7l6navqnvlp4"; depends=[ape geomorph Gmedian igraph MASS matlab]; broken = true; }; RSCABS = derive2 { name="RSCABS"; version="0.9.5"; sha256="193wbf1v18xv098i6abpglb239788d9gjzqbn8p3aai0la6y1pk3"; depends=[gWidgets2 gWidgets2RGtk2 R2HTML RGtk2]; broken = true; }; + RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; broken = true; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; broken = true; }; + RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; broken = true; }; RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; broken = true; }; RStoolbox = derive2 { name="RStoolbox"; version="0.3.0"; sha256="1xjj3bm2brywl02n3d2n8n5zlbv2p98bzbmcx9yj6c2j5rcxhsz7"; depends=[caret codetools doParallel dplyr exactextractr foreach ggplot2 lifecycle raster Rcpp RcppArmadillo reshape2 rgdal sf sp terra XML]; broken = true; }; + RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; broken = true; }; RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; broken = true; }; RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0.1"; sha256="16sdd0115793yj74i9m64yfxxn3gkk4nvb0qk2w8j7jjbqhflis0"; depends=[downloader dplyr ggplot2]; broken = true; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; broken = true; }; + RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; broken = true; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; broken = true; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; broken = true; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; broken = true; }; + RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.18"; sha256="13c6d8n0v44xcvd46id48qgih9bw3hpnp6k4byvln9qjd9ji3pgy"; depends=[Rcpp]; broken = true; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; broken = true; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; broken = true; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; broken = true; }; + RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; broken = true; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; broken = true; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; broken = true; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; broken = true; }; @@ -20531,8 +20691,10 @@ in with self; { RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; broken = true; }; RandomFields = derive2 { name="RandomFields"; version="3.3.14"; sha256="0c5r7l642cw56km56ijachnqhjh5k0izy03cl14rvbwkpywh09i4"; depends=[RandomFieldsUtils sp]; broken = true; }; RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="1.2.5"; sha256="0bjfz3bla6pr7wq4mqqcd4gmxqdx32gci4f71arfski31yx8ihlc"; depends=[]; broken = true; }; + Rarefy = derive2 { name="Rarefy"; version="1.1.1"; sha256="16ivdcpkdgjqy3ymnm296phyjwblzbypzrh4zjanffqd1qn7jb4s"; depends=[ade4 adiv ape dplyr geiger vegan]; broken = true; }; Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; broken = true; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; broken = true; }; + RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; broken = true; }; RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; broken = true; }; RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1.1"; sha256="0dbdsxdxhxm79cq7hi0rh8qphan73521lmivcnb4ca8g6ha2y32v"; depends=[Rcmdr]; broken = true; }; RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; broken = true; }; @@ -20543,12 +20705,17 @@ in with self; { RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; broken = true; }; RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; broken = true; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; broken = true; }; + RcppCGAL = derive2 { name="RcppCGAL"; version="5.5.3"; sha256="0l6kr113y97j3ap6rrkvm6yqz8czyvjax4pswbcv78xf77zyq69c"; depends=[curl gh Rcpp]; broken = true; }; + RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; broken = true; }; + RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; broken = true; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; broken = true; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; broken = true; }; Rdca = derive2 { name="Rdca"; version="0.1.0"; sha256="06s4n5xpla937q9f55xmsickvdiwiapxmwqvn6k0zsacisscaagl"; depends=[dplyr magrittr minpack_lm Rcpp RcppArmadillo Rdpack]; broken = true; }; + Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; broken = true; }; Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; broken = true; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; broken = true; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; broken = true; }; + RefBasedMI = derive2 { name="RefBasedMI"; version="0.1.1"; sha256="0gn80inzb9ldh85ihwn7jzpg6ccjhzb2f56qzk2w2wcd86s9j6lh"; depends=[assertthat data_table Hmisc mice norm2 pastecs]; broken = true; }; RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.2"; sha256="1aya34iz5v3xfpj86x9ab998m7fdwl138ly007mgdayacvqi4a6y"; depends=[quadprog]; broken = true; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; broken = true; }; RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; broken = true; }; @@ -20556,7 +20723,8 @@ in with self; { Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; broken = true; }; ReorderCluster = derive2 { name="ReorderCluster"; version="2.0"; sha256="0zq143xvv2br7016f9b1501ymcpkjqm3al1dn5qfm21axyi2p1iq"; depends=[gplots gtools Rcpp]; broken = true; }; Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; broken = true; }; - Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; broken = true; }; + Rfmtool = derive2 { name="Rfmtool"; version="4.1.10"; sha256="150y9xbnwhmazfd7az283pkyb02sfzv6y7f6fjwixx4cqv4bjzqf"; depends=[]; broken = true; }; + Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; broken = true; }; Rhpc = derive2 { name="Rhpc"; version="0.21-247"; sha256="0r4zikqzkcyyvywxq1s8jcq6h559mxilkmzpnl79781hh537jvii"; depends=[]; broken = true; }; RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; broken = true; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; broken = true; }; @@ -20572,12 +20740,13 @@ in with self; { Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; broken = true; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; broken = true; }; Rpcop = derive2 { name="Rpcop"; version="1.1"; sha256="0lcvcmlamwa9cddjnr7v5lcniilgvvh9h53iz1kddi5919qizi42"; depends=[princurve Rcpp]; broken = true; }; - Rpdb = derive2 { name="Rpdb"; version="2.3"; sha256="0zy5f7bli6ppc9giwf8845mzjcv54r2sqb8hxwgbn9k6rjlszgi8"; depends=[rgl]; broken = true; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; broken = true; }; Rpvt = derive2 { name="Rpvt"; version="0.1.1"; sha256="0ggd6ikp2s9z4086y8w3qzb9jcyyqpby41p3ayjwam94skh154mf"; depends=[Rcpp RcppArmadillo Rdpack]; broken = true; }; + Rquake = derive2 { name="Rquake"; version="2.4-4"; sha256="1929qxqbb6s316zb9x2q1kwz2pvwpvqr1w6iw8vm5vijyf1nvv30"; depends=[GEOmap MBA minpack_lm RPMG RSEIS]; broken = true; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; broken = true; }; RsqMed = derive2 { name="RsqMed"; version="0.2.1.0"; sha256="0answ66a9gi38lw48xjvb0f2cpifxi9c5iwlghwh26baffqp9m64"; depends=[GMMAT SIS]; broken = true; }; RstoxData = derive2 { name="RstoxData"; version="1.2.1"; sha256="0xfznv0nl7xymlxbd7g0lbxqw1zcyc9mm4mx0nwpw896vz7dvyvw"; depends=[data_table Rcpp stringi units xml2 xslt]; broken = true; }; + RtD3 = derive2 { name="RtD3"; version="0.0.1"; sha256="0zbm9pf1z8xl99aj64xy8q3hly98c2rzy34fzkbjyndysvxf9032"; depends=[data_table geojsonsf htmlwidgets jsonlite purrr]; broken = true; }; RtutoR = derive2 { name="RtutoR"; version="1.2"; sha256="19wmi30b5i6zj673d76gxl6j0k3ppfyl5fqrcs0dwmmadrrvbajq"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes officer plotly rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; broken = true; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; broken = true; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; broken = true; }; @@ -20586,6 +20755,8 @@ in with self; { RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-5"; sha256="01n74xnhz1fdvb63g0lxkzsdp1frspin4a764l358immjivdrx2v"; depends=[coda lattice MASS MCMCpack mvtnorm]; broken = true; }; RxODE = derive2 { name="RxODE"; version="1.1.5"; sha256="055g910dwn3v64mqqaidxhk4n6kwfyq3qpvp1grppzz50a0sz2zj"; depends=[assertthat backports BH checkmate cli dparser ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo RcppEigen rex sitmo StanHeaders sys]; broken = true; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; broken = true; }; + SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; broken = true; }; + SAEforest = derive2 { name="SAEforest"; version="1.0.0"; sha256="135rjszhmyjadcysyc4inymap1n6irh7bydizc5aadd89805b0il"; depends=[caret dplyr ggplot2 haven ineq lme4 maptools pbapply pdp ranger reshape2 vip]; broken = true; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; broken = true; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; broken = true; }; SASxport = derive2 { name="SASxport"; version="1.7.0"; sha256="1na94lxrn8kbhxpiflg14nkdx13rjq9bvvqbxyxh1mq0q7vz7a2l"; depends=[Hmisc stringi]; broken = true; }; @@ -20595,6 +20766,7 @@ in with self; { SCAT = derive2 { name="SCAT"; version="0.5.0"; sha256="16dh4l5r8b49n68s571npmk14dnnx6y0np7lzvalg61z31zlya29"; depends=[]; broken = true; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; broken = true; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; broken = true; }; + SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; broken = true; }; SCtools = derive2 { name="SCtools"; version="0.3.2.1"; sha256="0pw0kpqv4hzskfigl7ch509jj2cmp674l9ms2ivbx3sxq9l0hhj1"; depends=[cvTools dplyr furrr future ggplot2 magrittr purrr stringr Synth]; broken = true; }; SDALGCP = derive2 { name="SDALGCP"; version="0.4.0"; sha256="0az11v9dj3pwl5q2kr2apac06b5hg0msi5r17qrcik1d65k18hm0"; depends=[geoR maptools mapview Matrix pdist PrevMap progress raster sp spacetime spatstat spatstat_geom splancs]; broken = true; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; broken = true; }; @@ -20613,6 +20785,7 @@ in with self; { SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; broken = true; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; broken = true; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph]; broken = true; }; + SMARTAR = derive2 { name="SMARTAR"; version="1.1.0"; sha256="0ymhka4pjlqlnpv47abmc76ggijfw83i3jp9mrspnzcnb4d378xm"; depends=[MASS]; broken = true; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; broken = true; }; SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; broken = true; }; SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; broken = true; }; @@ -20622,43 +20795,69 @@ in with self; { SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; broken = true; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; broken = true; }; SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; broken = true; }; + SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; broken = true; }; SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; broken = true; }; SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; broken = true; }; + SPQR = derive2 { name="SPQR"; version="0.1.0"; sha256="1hsz9pbn428vbiwq5chs9j9hpsrsk1aqzjhgqwc5dybqi4x4qb8v"; depends=[coro ggplot2 interp loo progress progressr RColorBrewer Rcpp RcppArmadillo splines2 torch yaImpute]; broken = true; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; broken = true; }; SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; broken = true; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; broken = true; }; SSDL = derive2 { name="SSDL"; version="1.1"; sha256="0m05m00qsjyc69kix124z6nrplqv1yaaag7qxpiizbn664h9hmjb"; depends=[bigstatsr chickn doParallel doRNG foreach glmnet pracma Rcpp RcppArmadillo RcppParallel Rdpack reshape2 rmio]; broken = true; }; + SSN = derive2 { name="SSN"; version="1.1.17"; sha256="10jkpsccp8bm9ksyi6zbzp4p93g88kx68qjky9bkk3bvszfs55ni"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; broken = true; }; STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; broken = true; }; + STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; broken = true; }; + STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; broken = true; }; + STMotif = derive2 { name="STMotif"; version="2.0.1"; sha256="07725wdm65lxmmivdipxd07yqi3syy7dl10shn4x60ahs0il91nw"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; broken = true; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; broken = true; }; + SVMMaj = derive2 { name="SVMMaj"; version="0.2.9.1"; sha256="08f9sndcjgmmxl3zlbq86d8z0dbciv0ab1v9zx80svka7ckfv9z3"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; broken = true; }; SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; broken = true; }; + Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; broken = true; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.2"; sha256="09j06ycr749dbr6xbn5pxw7rp1p3cri40z38hf1kp5kvjxkkpy2w"; depends=[mvtnorm]; broken = true; }; ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; broken = true; }; + SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; broken = true; }; + SeedMatchR = derive2 { name="SeedMatchR"; version="1.0.1"; sha256="0azrlma0p1g342yqyxb1wj9shc0sy2p0ml555h554apasxf020v6"; depends=[AnnotationHub Biostrings cowplot DESeq2 dplyr GenomeInfoDb GenomicFeatures ggmsa ggplot2 lifecycle msa stringr testit twosamples]; broken = true; }; + SeerMapper = derive2 { name="SeerMapper"; version="1.2.5"; sha256="1sjg0a5mvyvgzwpmbr3avm76cb9a45qdwvic665v4hhhsmf2x8xk"; depends=[maptools RColorBrewer rgdal SeerMapper2010East SeerMapper2010Regs SeerMapper2010West SeerMapperEast SeerMapperRegs SeerMapperWest sp stringr]; broken = true; }; + SeerMapper2010East = derive2 { name="SeerMapper2010East"; version="1.2.5"; sha256="0v3cslshg5qjmjnxw4xprdnqwdwnyamyljdyi9nwixjc2nm9inbx"; depends=[sp]; broken = true; }; + SeerMapper2010Regs = derive2 { name="SeerMapper2010Regs"; version="1.2.5"; sha256="1v8vnvkmh3wqinanm5aap3vw36zriqh8xw2im2ncw0rdhf9ccbl5"; depends=[sp]; broken = true; }; + SeerMapper2010West = derive2 { name="SeerMapper2010West"; version="1.2.5"; sha256="1vc1j9hh9yr69dz9fnqfh17xrad3f16kcb63sybdkg02ss5y5ppr"; depends=[sp]; broken = true; }; + SeerMapperEast = derive2 { name="SeerMapperEast"; version="1.2.5"; sha256="1jfllxnqiwrnp416xmn7rzmizwj26skadpj9jvxkv70x053ijmjn"; depends=[sp]; broken = true; }; + SeerMapperRegs = derive2 { name="SeerMapperRegs"; version="1.2.5"; sha256="1di7l6804gi2rsdbwb9naymqzidb8bqf62a6w32jfkl67175cg0c"; depends=[sp]; broken = true; }; + SeerMapperWest = derive2 { name="SeerMapperWest"; version="1.2.5"; sha256="1v5ql5z1sv13lgmla03nzpdxzbxqw73zc3az6xf75vqb042c4wxq"; depends=[sp]; broken = true; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; broken = true; }; - SemNeT = derive2 { name="SemNeT"; version="1.4.3"; sha256="1qjjbx86sh2gk91bnx0rn3wszlf1w8wxyda5k2mqn4gzgpfplcsp"; depends=[broom car dplyr effects ggplot2 igraph magrittr pbapply philentropy plyr purrr qgraph RColorBrewer scales]; broken = true; }; + SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; broken = true; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; broken = true; }; SimEvolEnzCons = derive2 { name="SimEvolEnzCons"; version="2.0.0"; sha256="0h3j8lp1s3zqb9qgy16gd0rdlbr2g1jqrc4a19zhmix2kygs5012"; depends=[ade4 RColorBrewer rgl scatterplot3d]; broken = true; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; broken = true; }; + SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; broken = true; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; broken = true; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; broken = true; }; + SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; broken = true; }; + Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; broken = true; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; broken = true; }; + SmoothHazard = derive2 { name="SmoothHazard"; version="2023.06.27"; sha256="1jigxihw7mw0ivbarjic5qjx4ky450ys8db4j0i5i4z6sv9nfqix"; depends=[lava mvtnorm prodlim]; broken = true; }; SoDA = derive2 { name="SoDA"; version="1.0-6.1"; sha256="0d3jb1dsg1q06c08ldmhj0q2sb1pc0g08rfal29ddng3b4qm1lhh"; depends=[]; broken = true; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; broken = true; }; + SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; broken = true; }; SoftRandomForest = derive2 { name="SoftRandomForest"; version="0.1.0"; sha256="1k439hcp53yg6f2x4bgafsri4jjgpva97dphzsdk5icfs5d38bh8"; depends=[boot]; broken = true; }; Sojourn = derive2 { name="Sojourn"; version="1.1.0"; sha256="0dy3xb6nazify29xir2krj9509bqa68b1jwq3lvvhfakxjqm0j05"; depends=[dplyr lubridate magrittr nnet PAutilities rlang svDialogs zoo]; broken = true; }; SolveRationalMatrixEquation = derive2 { name="SolveRationalMatrixEquation"; version="0.1.0"; sha256="1m0b4sb247k6mlagvs4nj42ga9p48g9736lmhar7v1c5qhi7pw3v"; depends=[]; broken = true; }; + SourceSet = derive2 { name="SourceSet"; version="0.1.5"; sha256="17dbxdqm9jkhyip6xdwrxsqqyncs5skclbi9drjbdcw745p7c6lh"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; broken = true; }; SpNetPrep = derive2 { name="SpNetPrep"; version="1.2"; sha256="1jhjyrb0k5z21vn9bc444rxax3lxsyzyhggrcy7zl9ps7p4ra990"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat spatstat_core spatstat_geom spatstat_linnet]; broken = true; }; + SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; broken = true; }; SpaDES = derive2 { name="SpaDES"; version="2.0.9"; sha256="11acb05b957qwbii701y1b4lvcnvmiixkrlmqkccc8n9icqq107n"; depends=[quickPlot reproducible SpaDES_core SpaDES_tools]; broken = true; }; SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.4"; sha256="0ly411y95rcm30slaj02vn7clmyq3dvinzg1x40vbsqzcjjg1h6l"; depends=[magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; broken = true; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0.1"; sha256="0w2jxaz2kxfksyss5vy6xy499p8jg8lpqlykwgm2srp1fd2l3rs9"; depends=[Rcpp RcppArmadillo]; broken = true; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; broken = true; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; broken = true; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; broken = true; }; + SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; broken = true; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; broken = true; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; broken = true; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; broken = true; }; StatCharrms = derive2 { name="StatCharrms"; version="0.90.96"; sha256="1451aj1476qjpmxhpbgd8g55i7rp2msml64xsiy25h7x9g6d9w05"; depends=[cairoDevice car clinfun coxme gWidgets2 gWidgets2RGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; broken = true; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; broken = true; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; broken = true; }; + SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; broken = true; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; broken = true; }; Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; broken = true; }; SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; broken = true; }; @@ -20671,7 +20870,6 @@ in with self; { SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; broken = true; }; SynthCast = derive2 { name="SynthCast"; version="0.2.1"; sha256="0gln7x1vlfdnr0qaqgagr93r484hv3dp65n24b3wl3p02msz9bgn"; depends=[dplyr forcats Synth tidyr]; broken = true; }; TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; broken = true; }; - TCIU = derive2 { name="TCIU"; version="1.2.2"; sha256="1n08jvc60gng3ziisrvgl9kfi55l6mh7bbnwp5mbnnqh0mkdhfv0"; depends=[cubature doParallel dplyr DT extraDistr fancycut fmri foreach forecast geometry ggplot2 ggpubr gridExtra ICSNP MultiwayRegression plotly pracma RColorBrewer reshape2 rrcov scales spatstat_explore spatstat_geom tidyr zoo]; broken = true; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; broken = true; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; broken = true; }; TDMR = derive2 { name="TDMR"; version="2.2"; sha256="19ljgj5iy41m7rrawzkxkln7acydssk8zm05k3sfb483s8zygwiq"; depends=[adabag SPOT testit twiddler]; broken = true; }; @@ -20695,45 +20893,59 @@ in with self; { TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; broken = true; }; TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; broken = true; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; broken = true; }; + TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; broken = true; }; TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; broken = true; }; TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; broken = true; }; Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; broken = true; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; broken = true; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; broken = true; }; + TidyConsultant = derive2 { name="TidyConsultant"; version="0.1.0"; sha256="1ipv0nx0xmba62c7qjgadpjsr850d9dl0z5zjkh1rj6kfxdgiis2"; depends=[autostats badger framecleaner pacman presenter tidybins validata]; broken = true; }; TileManager = derive2 { name="TileManager"; version="0.4.1"; sha256="0pcskdqxxm07j47bw1j4d3jqf64pk0jqwcp5379hnpi6kr7f5gvh"; depends=[APfun raster rgeos sp XML]; broken = true; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; broken = true; }; + TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.4"; sha256="0ihigrbdkfbqqjxqfx3y5q8ii8n60301s7190jr50a88l1xzgmh8"; depends=[forecast jsonlite locfit trend tseries]; broken = true; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; broken = true; }; TippingPoint = derive2 { name="TippingPoint"; version="1.2.0"; sha256="00m7v94rr3xpqw7r0jgs4g7ylxjpbbnzihc5jniw7m876yxa17kw"; depends=[ggplot2 RColorBrewer reshape2]; broken = true; }; + TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; broken = true; }; ToxicR = derive2 { name="ToxicR"; version="22.8.1.0.3"; sha256="0sc7i3jzqhjwhcz83p7vgjmlpz4f27k0phbi2q5c8gxcnkzbffwp"; depends=[coda doBy dplyr forcats ggplot2 ggridges multcomp Rcpp RcppEigen RcppGSL scales shiny tidyverse]; broken = true; }; + TraitStats = derive2 { name="TraitStats"; version="1.0.2"; sha256="07jiipxkidr0hnb3lbbb8yj007m5qzcbq9p5py276sckalamzri0"; depends=[gridExtra lattice qpdf rlist]; broken = true; }; + TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; broken = true; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; broken = true; }; + TrustVDJ = derive2 { name="TrustVDJ"; version="0.1.0"; sha256="154fawx32v2gdvfdyssj04h1y0q2zc2wn4ww4nzaf0nlwbvc2z6v"; depends=[Biostrings data_table rvest]; broken = true; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; broken = true; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; broken = true; }; TwoRegression = derive2 { name="TwoRegression"; version="1.0.0"; sha256="0mpgdz7swrzabpf835pawlwvbzqajc329whcsxddwq4l6c71sb11"; depends=[dplyr ggplot2 gridExtra lubridate magrittr PAutilities pROC RcppRoll rlang tidyr]; broken = true; }; TwoWayFEWeights = derive2 { name="TwoWayFEWeights"; version="0.1.0"; sha256="0zjbh24jm77vj62rw433dqy57m0hciaw1l2l7x6hpzn34iggdwwv"; depends=[dplyr estimatr fixest rlang stringr]; broken = true; }; + UMR = derive2 { name="UMR"; version="1.1.0"; sha256="05g2gk7bmhzyill6fgq396yk0yi7qz4mdcy3cfzzx5nyr11rc8a7"; depends=[decon distr trust]; broken = true; }; UNF = derive2 { name="UNF"; version="2.0.8"; sha256="1gag7yqh5zs4azds0axlkpksymakw19s4n50pnhx7k6m9hgcbdgh"; depends=[base64enc digest]; broken = true; }; USAboundaries = derive2 { name="USAboundaries"; version="0.4.0"; sha256="0wwaywg01vz8hmwm58bnf86m8yqivi53bww5y3ycg891msnjwrgr"; depends=[]; broken = true; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; broken = true; }; UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; broken = true; }; UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; broken = true; }; + UScensus2010 = derive2 { name="UScensus2010"; version="0.20.0"; sha256="0dby532dmmhaz7gisihg4dn70jyx5llfvm2zl2h0pxyqrxvm69d2"; depends=[foreign maptools sp]; broken = true; }; UncertainInterval = derive2 { name="UncertainInterval"; version="0.7.0"; sha256="1lywwjkbmlbxhp2ahmsw2f47i0p848cky7xx1lxrg5ydfzq9kzl5"; depends=[car MASS nloptr psych reshape2 shiny zoo]; broken = true; }; VARMER = derive2 { name="VARMER"; version="1.0.0"; sha256="0qym31jpmb2dyrqsk1s6wp1c3b15mf79lrrk46p6hkmdddkxqgnj"; depends=[cluster deldir gstat hydroGOF Metrics pracma raster rgl sf tictoc zoo]; broken = true; }; VARSEDIG = derive2 { name="VARSEDIG"; version="2.1"; sha256="1cxp80i5160c6kx666nl0gxs8ypfmkzxr2gqph5a9v6ibiq801sj"; depends=[]; broken = true; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; broken = true; }; VARtests = derive2 { name="VARtests"; version="2.0.5"; sha256="0gmm2qrrl4v5vx0nhiwq5brvanhybpb2q0zlf4dihramhjjbwyar"; depends=[Rcpp RcppArmadillo sn]; broken = true; }; VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; broken = true; }; + VC2copula = derive2 { name="VC2copula"; version="0.1.2"; sha256="1kbzscdblb3n7mkkhvd75h8hyd6xbfb0lcjgysvyip4v7zc7whvc"; depends=[copula VineCopula]; broken = true; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; broken = true; }; + VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; broken = true; }; VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; broken = true; }; VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; broken = true; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; broken = true; }; VariantScan = derive2 { name="VariantScan"; version="1.1.9"; sha256="0mdpj3a39m4gib4a25g3kxwmc82jn6qpi0r6sbgm0aqysv2wisdm"; depends=[caret gam ModelMetrics SNPRelate]; broken = true; }; VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; broken = true; }; + VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; broken = true; }; VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; broken = true; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; broken = true; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; broken = true; }; - WH = derive2 { name="WH"; version="1.0.3"; sha256="0hkl33qlpmijkwir83ql5n1qm57xnii6iv25lj6ki17h6xvyhvmp"; depends=[]; broken = true; }; WLasso = derive2 { name="WLasso"; version="1.0"; sha256="0q44ljdsqsnnwfnnsmyn3p65inbw0y71v7v5pp7cz2dzbhhpfzpw"; depends=[genlasso ggplot2 MASS Matrix tibble]; broken = true; }; WLinfer = derive2 { name="WLinfer"; version="1.2.0"; sha256="1d4x3w5mamwk7binjr45s62zd7lvxw3abadw22084p10kw7lwfk7"; depends=[bbmle boot cubature goftest LindleyR nleqslv pracma]; broken = true; }; WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; broken = true; }; + WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; broken = true; }; + Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; broken = true; }; + WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; broken = true; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; broken = true; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; broken = true; }; XPolaris = derive2 { name="XPolaris"; version="1.0.2"; sha256="1l05svscgkv9bzkawi2kp9zhchrhxxma3271b828j34pkrnnmq5m"; depends=[curl dplyr ggplot2 httr magrittr purrr raster sf tidyr]; broken = true; }; @@ -20746,27 +20958,32 @@ in with self; { aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; broken = true; }; aRbs = derive2 { name="aRbs"; version="0.1.3"; sha256="19s4x2w036xllrsarapmp8rvyxcsky82k4h9mfr2rbhdfid6h1f3"; depends=[crayon data_table dlstats dplyr DT ggplot2 lubridate progress purrr rvest shiny shinyBS shinycssloaders shinydashboard stringr xml2]; broken = true; }; aRchi = derive2 { name="aRchi"; version="2.1.3"; sha256="0irfp76f1vkbhz60s4b3nhqk06f1z08v68qba9hfkmcra2xnqkjy"; depends=[circular data_table DiceKriging dplyr fastcluster FNN gtools lidR pkgcond plyr pracma progress R_matlab Rfast rgl stringr svMisc VoxR]; broken = true; }; + aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; broken = true; }; aaSEA = derive2 { name="aaSEA"; version="1.1.0"; sha256="0him4r8qyp0xssgrmdxjs45yn4d28h5anv4jyxxbbs9phb0m6j3h"; depends=[Bios2cor DT Hmisc magrittr networkD3 plotly seqinr shiny shinydashboard]; broken = true; }; aba = derive2 { name="aba"; version="0.0.9"; sha256="1qnhnbbd8iir686gc48fld62pd4da39flf2djvvif2bxcvwl8y7a"; depends=[broom dplyr generics ggplot2 glue magrittr purrr rlang stringr tibble tidyr]; broken = true; }; abcADM = derive2 { name="abcADM"; version="1.0"; sha256="0vcabnnnwc0psv9v3rda5aap9s8cq1pjh02zva3ki64hlavf2a10"; depends=[BH Rcpp]; broken = true; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; broken = true; }; abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; broken = true; }; + accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; broken = true; }; acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; broken = true; }; + acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; broken = true; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; broken = true; }; - adace = derive2 { name="adace"; version="1.0.1"; sha256="1zkvfbvqwxh4k5a0l06khdblm16q7knfcrxfzpmck8053z7kilgr"; depends=[pracma reshape2]; broken = true; }; adass = derive2 { name="adass"; version="1.0.0"; sha256="1g702pg335q9jwgdygb7n364ibad6z27fcd9yfim8gi4fcpjwlkq"; depends=[fda matrixcalc mvtnorm plot3D Rfast SparseM]; broken = true; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; broken = true; }; adoption = derive2 { name="adoption"; version="0.6.4"; sha256="1xjkvj1ys2xmjgswqfsrry27zyqcc9hk9khl0j4s72gcc8az8sz6"; depends=[quadprog RandomFieldsUtils tkrplot]; broken = true; }; + adoptr = derive2 { name="adoptr"; version="1.0.0"; sha256="08d2fsqh5vczfr9cc8l554p6f0x85g58i5zg5j2m0chlmcispfk2"; depends=[glue nloptr]; broken = true; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; broken = true; }; aemo = derive2 { name="aemo"; version="0.3.0"; sha256="108scwyf0dyvn969cks3ikbj2pf2g4dw051asahx26pl0ggw7ijw"; depends=[assertthat dplyr lubridate stringr]; broken = true; }; agroclim = derive2 { name="agroclim"; version="0.3.0"; sha256="06mv18a73dpcdw2y2df83rx9kfxsd5x2zv6j5md3yzm9ij3rylvx"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 raster reshape sp zoo]; broken = true; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; broken = true; }; + aibd = derive2 { name="aibd"; version="0.1.9"; sha256="1ispw8y0k665fdpw1c0swmhzl596jr89lnwyq741ak6ic92s3pzz"; depends=[commonsMath rscala]; broken = true; }; aif360 = derive2 { name="aif360"; version="0.1.0"; sha256="0r9x9q8kc9alk1j3p0y23ispcbfac89q0c043vh8dw89q267plf8"; depends=[reticulate rstudioapi]; broken = true; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; broken = true; }; akmedoids = derive2 { name="akmedoids"; version="1.3.0"; sha256="19d9fh1cygn04riwc7y7lzdncyxki9rzikf9f5m96vp0y687z2ka"; depends=[clusterCrit dplyr ggplot2 Hmisc kml signal]; broken = true; }; alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; broken = true; }; allhomes = derive2 { name="allhomes"; version="0.3.0"; sha256="1z39qd7hkl2xy0lhf8sgc4rjf4ihi3zbsadchc97h7p7cn9mjbpk"; depends=[dplyr htmltab httr jsonlite magrittr purrr readr rlang stringr tibble tidyr]; broken = true; }; amber = derive2 { name="amber"; version="1.0.3"; sha256="0kc7g5rb0wrs1id1k0qay56063gpffwvcll38983b1l3k215mxiv"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; broken = true; }; + ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; broken = true; }; ambiorix = derive2 { name="ambiorix"; version="2.1.0"; sha256="1831i5fv966cghp5xgq71wqzldlajyjj2p4nkhbw007w2dcn0y21"; depends=[assertthat cli fs glue httpuv jsonlite log promises websocket]; broken = true; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; broken = true; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; broken = true; }; @@ -20774,9 +20991,12 @@ in with self; { analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; broken = true; }; anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; broken = true; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; broken = true; }; - anomalize = derive2 { name="anomalize"; version="0.2.3"; sha256="1nwi2km61dv5ir2ni9vmc26wbgsggvzkfqqqgwix07rc8pmbih3n"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; broken = true; }; + animaltracker = derive2 { name="animaltracker"; version="0.2.0"; sha256="1zv2nj4wfskz1lxfgw8l4gyrlv418drk8zl4cw55i5na6a39shcv"; depends=[dplyr forcats geosphere ggplot2 httr leaflet leaflet_extras lubridate maptools raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr zoo]; broken = true; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; broken = true; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; broken = true; }; + apTreeshape = derive2 { name="apTreeshape"; version="1.5-0.1"; sha256="1wxhfp21ir9yv4wnbh7ay2x05k822nsyd5smlxmk67wm5w4vr1v1"; depends=[ape coda cubature pbapply quantreg]; broken = true; }; + apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; broken = true; }; + approxOT = derive2 { name="approxOT"; version="1.0.2"; sha256="1j17dcs4nxss81q1d3mf6h7nkzrq202n7pqb7phza085xmjvpksx"; depends=[BH Rcpp RcppCGAL RcppEigen]; broken = true; }; apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; broken = true; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; broken = true; }; aptg = derive2 { name="aptg"; version="0.1.1"; sha256="0mdhgc0jrl2za3k2awm92vky2ghcssqq1x2h57ns9b17lwdrsdl4"; depends=[ape brranching phytools taxize xml2]; broken = true; }; @@ -20787,7 +21007,6 @@ in with self; { asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; broken = true; }; assemblerr = derive2 { name="assemblerr"; version="0.1.1"; sha256="12kwdp71bgbk67d4038j2bhbw9ja3vqm0m01bzdsrpk4dxh2p3d3"; depends=[cli glue magrittr purrr rlang tidyselect vctrs]; broken = true; }; astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; broken = true; }; - asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; broken = true; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; broken = true; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; broken = true; }; atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; broken = true; }; @@ -20795,20 +21014,26 @@ in with self; { audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; broken = true; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; broken = true; }; aurin = derive2 { name="aurin"; version="0.6.0"; sha256="0nh6jy0pkwfxzcxz1xcdcnqd9pkrddmdmfb2pjalfmp04z66h6dv"; depends=[checkmate cli glue httr jsonlite magrittr ows4R R6 sf stringr]; broken = true; }; - autoMrP = derive2 { name="autoMrP"; version="1.0.2"; sha256="11r849hglwgbqiq34q7xd3cdli5qrbqh90faj7pdm09sjkk4mn37"; depends=[doParallel doRNG dplyr e1071 EBMAforecast forcats foreach gbm ggplot2 glmmLasso knitr lme4 purrr R_rsp rlang tibble tidyr]; broken = true; }; + autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; broken = true; }; autohd = derive2 { name="autohd"; version="0.1.0"; sha256="14wyiqhmbp8v52s1p5svvcjpwg8pwqrqh3zzm17blcl2hr4p9cy8"; depends=[broom coxme hdbm Hmisc ICBayes icenReg missForest mlr3 Rdpack rjags schoolmath survival SurvRegCensCov tibble usethis]; broken = true; }; automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; broken = true; }; + autostats = derive2 { name="autostats"; version="0.4.0"; sha256="0xyfv2akv308g3r0wq2dcg7l24p6bf3524x1ikj1lfmw07hca6k6"; depends=[broom data_table dials dplyr framecleaner ggeasy ggplot2 ggthemes gtools janitor jtools magrittr nnet parsnip party patchwork presenter purrr recipes recosystem rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost yardstick]; broken = true; }; avfintools = derive2 { name="avfintools"; version="0.1.0"; sha256="1v04z9qr80zikjb5q0h9796sgnmw43l5ygxs99gsgsghlyj9nrla"; depends=[alphavantager dplyr ggplot2 lubridate plotly tibble]; broken = true; }; + aziztest = derive2 { name="aziztest"; version="0.2.1"; sha256="0rpnyrb7zi42l1fc8ni0r5d0y6a4dr56917z8i54mv1jrk4hijjd"; depends=[]; broken = true; }; b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; broken = true; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; broken = true; }; + bRacatus = derive2 { name="bRacatus"; version="1.0.11"; sha256="0mj9bqgvmss9jdaphc4rgmxp4909lnwgi3c86pr6yfsd9zcjgd74"; depends=[data_table geojsonio jsonlite maptools plotfunctions raster rgbif rgdal rgeos rworldmap sp]; broken = true; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; broken = true; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; broken = true; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; broken = true; }; baggingbwsel = derive2 { name="baggingbwsel"; version="1.0"; sha256="0khvkxml4nwkahgl5ijdv0bjgwabmznzq99p71iw26ck808hafkl"; depends=[doParallel foreach kedd mclust misc3d nor1mix Rcpp rgl rpanel sm tkrplot]; broken = true; }; baker = derive2 { name="baker"; version="1.0.0"; sha256="166j6b2j3r0apsnvcnfycxhf1kv4nblscmnjdl2xsw5wwrbx677f"; depends=[abind binom coda ggplot2 ggpubr gridExtra lubridate mgcv mvbutils R2jags reshape2 rjags robCompositions shinydashboard shinyFiles]; broken = true; }; + bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; broken = true; }; barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; broken = true; }; + baseballr = derive2 { name="baseballr"; version="1.5.0"; sha256="0n6ajc846cddi7617pgkm2ywkl7147m2gnhwx8wm4jyj7g3snsw3"; depends=[cli data_table dplyr ggplot2 glue httr janitor jsonlite lubridate magrittr purrr Rcpp RcppParallel rlang rvest stringr tibble tidyr]; broken = true; }; baseflow = derive2 { name="baseflow"; version="0.13.2"; sha256="02ygx32dfszk66f33wfszkvwi51v8zw2s45y9nlrgfws9rlpzll2"; depends=[airGR]; broken = true; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.5"; sha256="0402nvm3i32sx3m3c7r74iaj22h570v819yiwkraicjpmg55dghi"; depends=[investr scales]; broken = true; }; + bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; broken = true; }; batchr = derive2 { name="batchr"; version="0.0.2"; sha256="0fkrv6dlyla7bbl00f16lypnz5idyjz9kdqslgbx3pnfwx5hngwx"; depends=[chk cli furrr hms hmstimer yesno]; broken = true; }; bayesSurv = derive2 { name="bayesSurv"; version="3.6"; sha256="1y1jqd1c2rg4s73ffyq8wjkpq35321nzywigcgh6vkjpd8r8xhpx"; depends=[coda smoothSurv survival]; broken = true; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; broken = true; }; @@ -20822,9 +21047,10 @@ in with self; { bcc = derive2 { name="bcc"; version="1.3.1"; sha256="0ac0wasdifd0v47r9sxrsix5hv7masiphn6dyxpqdrd11z7iimgz"; depends=[qcc]; broken = true; }; bcf = derive2 { name="bcf"; version="1.3.1"; sha256="04vjvzh8y1dfk6ms5zwbylbfalwngvyjbjcszx26v2fakdk990p7"; depends=[Rcpp RcppArmadillo]; broken = true; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; broken = true; }; + bdvis = derive2 { name="bdvis"; version="0.2.33"; sha256="0gcc41pbvx245pcdrm9wxn3clg0iczpqvgrhzmy8c0dz2jfbzc9j"; depends=[chron ggplot2 lattice maps plotrix plyr rgdal sqldf taxize treemap]; broken = true; }; bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; broken = true; }; beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; broken = true; }; - benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; broken = true; }; + beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; broken = true; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; broken = true; }; betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; broken = true; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; broken = true; }; @@ -20836,16 +21062,21 @@ in with self; { binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; broken = true; }; binaryTimeSeries = derive2 { name="binaryTimeSeries"; version="1.0.2"; sha256="0mbs6xpjfhrmx5np58mq5hhmp7n4zv6r3bpmkgnghd3243cdp1kj"; depends=[dplyr ggnewscale ggplot2 magrittr mice prettymapr raster reshape2 rgdal terra]; broken = true; }; binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; broken = true; }; + binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; broken = true; }; binomialMix = derive2 { name="binomialMix"; version="1.0.1"; sha256="1ak3h0lgjmrv9miwn7fl6jvcp8xdld53swjz71q67q999s42np0m"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; broken = true; }; binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; broken = true; }; binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; broken = true; }; + biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; broken = true; }; biokNN = derive2 { name="biokNN"; version="0.1.0"; sha256="113lynbxmv88ycvbsq9drn2f75md7yajhicfw8qd8l6lawiq1fqc"; depends=[cluster desc dplyr ggplot2 lme4 magrittr mice mitml tidyr]; broken = true; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; broken = true; }; biosurvey = derive2 { name="biosurvey"; version="0.1.1"; sha256="1hhch5qagn86pcn43qlmv0azfbjc9yv58yp9v1p5s6r5ffxkgs95"; depends=[diptest doParallel foreach ks maps picante raster rgdal rgeos sp spatstat_geom vegan]; broken = true; }; bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; broken = true; }; + bisg = derive2 { name="bisg"; version="0.1.0"; sha256="08imhy6vsx5axwxz93cbzxs8wf28vdp8avny47v5mw4ihm0kbprn"; depends=[dplyr rlang stringr tidycensus tigris wru]; broken = true; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; broken = true; }; + bivariatemaps = derive2 { name="bivariatemaps"; version="1.0"; sha256="0ciyqf3swr86l98yfjwcnr507k5xjapk1v6iq9vnpkgrc9w3j5m9"; depends=[classInt raster rgeos sp]; broken = true; }; bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; broken = true; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; broken = true; }; + blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; broken = true; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; broken = true; }; blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; broken = true; }; blockcpd = derive2 { name="blockcpd"; version="1.0.0"; sha256="1p3ghk7jbi5cc0qkhc83j8sb2pa84h8rqhazlihmbs8ag92w6gdd"; depends=[Rcpp RcppArmadillo]; broken = true; }; @@ -20856,29 +21087,39 @@ in with self; { bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; broken = true; }; bmotif = derive2 { name="bmotif"; version="2.0.2"; sha256="1zy153z7kasfivj0mvrkyn96s0sgdp34w4pdjpcvfnym3lr02f0m"; depends=[gtools Rcpp reshape2 tensor]; broken = true; }; bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; broken = true; }; + bnclassify = derive2 { name="bnclassify"; version="0.4.7"; sha256="010447r21i5r2nk843v8dmfncqgmp4yf71ahcrppqv8vxfywcg6i"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; broken = true; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; broken = true; }; bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; broken = true; }; + bnspatial = derive2 { name="bnspatial"; version="1.1.1"; sha256="1drm9ia4lr80wahbbn9xrw658ppmgxm4iadwv77jz1x786dda2n1"; depends=[doParallel foreach gRain gRbase raster rgdal sf]; broken = true; }; + bolsec = derive2 { name="bolsec"; version="0.1.0"; sha256="0wrfw8h7s59ln2b0m9g0jgvwqvr4icv2wjxqjx6rcj366a0nx3sk"; depends=[dplyr formattable rvest]; broken = true; }; + bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; broken = true; }; boomer = derive2 { name="boomer"; version="0.1.1"; sha256="16gwdvcp8bz5bgmvxsvc9iyz2a6mpwf5vgilc1lhf9l4n0l1m685"; depends=[crayon pryr rlang rstudioapi styler withr]; broken = true; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; broken = true; }; bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; broken = true; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; broken = true; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; broken = true; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.28"; sha256="12f1lakfy9i1rq70cq0bffpdachsm58rcmbbhgnq1r31g028zrcc"; depends=[npmlreg qicharts statmod]; broken = true; }; + bpca = derive2 { name="bpca"; version="1.3-4"; sha256="1b0qigynj35sr5nf9y6hvcr52ydskqwx5wxwb27zawps3iykyjwf"; depends=[rgl scatterplot3d xtable]; broken = true; }; bpcs = derive2 { name="bpcs"; version="1.0.0"; sha256="0jsy2l1qnzr8098614d6pj7rydf6b9s7kxrkahyzq82ivby9hj5m"; depends=[badger BH coda dplyr ggplot2 gtools HDInterval knitr loo magrittr Rcpp RcppEigen RcppParallel rlang rstan rstantools shinystan StanHeaders stringr tibble tidyr tidyselect]; broken = true; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; broken = true; }; brickr = derive2 { name="brickr"; version="0.3.5"; sha256="1a6yxhq2zly3i3gs4dd19xhyrin1qaxdr7x3a887j7zbcj0j4z9q"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; broken = true; }; + briskaR = derive2 { name="briskaR"; version="1.0.4"; sha256="016gpgbf5zc9jkagj439n2ylfbmsikg0n6v76wf4lchv4wvrsby4"; depends=[deldir deSolve fasterize fftwtools MASS mvtnorm raster Rcpp RcppArmadillo rgdal rgeos sf sp testthat]; broken = true; }; brolgar = derive2 { name="brolgar"; version="1.0.0"; sha256="0jw0cnszwdcj6jdxpr17bq338jaxihaacg62rr3n1ayig54bgbyn"; depends=[dplyr fabletools ggplot2 glue magrittr purrr rlang tibble tidyr tsibble vctrs]; broken = true; }; broomExtra = derive2 { name="broomExtra"; version="4.3.2"; sha256="02ijhqgymm8nv40fy4j6psqkhak3dfwz8i5k0ay3g7aic49lzcbf"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang]; broken = true; }; brranching = derive2 { name="brranching"; version="0.7.0"; sha256="06jy3qhbr0v4m1j4j8a7fb7ic59sx4zhlsm1yb3g6rdwc00d67wj"; depends=[ape conditionz crul curl phylocomr phytools taxize]; broken = true; }; bsem = derive2 { name="bsem"; version="1.0.0"; sha256="1h4wsib6ppqj8nbvj4pzkm04bzrdkg9l7xfmzzmld9cswai4iw52"; depends=[BH coda DiagrammeR lattice magrittr Rcpp RcppEigen rstan rstantools shiny StanHeaders viridis visNetwork]; broken = true; }; buffeRs = derive2 { name="buffeRs"; version="0.31"; sha256="1yr2bg2cyl8sm4g7jrjw9apj5lqhbqscw5mshs8r8niz0fkyq6lg"; depends=[sf]; broken = true; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; broken = true; }; + bvpSolve = derive2 { name="bvpSolve"; version="1.4.4.1"; sha256="0xq5m57cya6l3c1glshrd29ywpm1rky36kqqrp4mw2scakz9p4wj"; depends=[deSolve rootSolve]; broken = true; }; c2d4u_tools = derive2 { name="c2d4u.tools"; version="1.2"; sha256="1ssp3sk5kml8in1ggnir77cq2kpmdmrhjblvw67ydxp22sqw7vwr"; depends=[]; broken = true; }; cRegulome = derive2 { name="cRegulome"; version="0.3.2"; sha256="0cvxad73l85zsgqmis5p24v71kkzi784b8v5z07f0dh9yp41p96q"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; broken = true; }; caMST = derive2 { name="caMST"; version="0.1.6"; sha256="0zg4j81ikm8izgvn4p80z2bxrrg4qlccq4cs3pn2iwy25d6aiknn"; depends=[catR diagram mstR]; broken = true; }; + caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; broken = true; }; cairoDevice = derive2 { name="cairoDevice"; version="2.28.2.1"; sha256="040gd6cyaabdi0lhfdba4isqjihj28hdxm7mc129nl863pxkx6qm"; depends=[]; broken = true; }; + calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; broken = true; }; caliver = derive2 { name="caliver"; version="2.0.0"; sha256="04qa3zrk70c8ak70djfh23jyfxs8293s8wzkk6cs0nyrknhaxzzj"; depends=[ggplot2 lubridate ncdf4 raster rworldmap]; broken = true; }; canadacovid = derive2 { name="canadacovid"; version="0.3.4"; sha256="1hxcz3bk0p063cidj19zzacvxarpracnzglmb1212b2jx9w4i3gw"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang stringr tibble tidyr tidyselect]; broken = true; }; + captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; broken = true; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; broken = true; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; broken = true; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; broken = true; }; @@ -20891,6 +21132,7 @@ in with self; { catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; broken = true; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; broken = true; }; cattonum = derive2 { name="cattonum"; version="0.0.5"; sha256="11h9nh2i2bmd0b562l5avhwpj9ppnfmzd9nsv94cymhwn5h6nmg6"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; broken = true; }; + causalOT = derive2 { name="causalOT"; version="0.1.2"; sha256="04j546sg4b1alq71xaxkh5hqckvqzcyz3nihgdnnxw60gmd4yal6"; depends=[approxOT BH lbfgsb3c loo Matrix matrixStats osqp pbapply R6 Rcpp RcppEigen reticulate RSpectra sandwich]; broken = true; }; cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; broken = true; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; broken = true; }; cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; broken = true; }; @@ -20898,7 +21140,6 @@ in with self; { ccboost = derive2 { name="ccboost"; version="0.1-1.3"; sha256="165v44xghm9xgc9ad5hadvq81mshb3y4rzpi65zc93ggr4jsdfxr"; depends=[mpath xgboost]; broken = true; }; ccdf = derive2 { name="ccdf"; version="1.1.4"; sha256="1kab0qa731w5hhnpdqhf5jbyyq66xjx1xyxnkzwc0qy75cgyc03i"; depends=[CompQuadForm cowplot doParallel foreach ggplot2 matrixStats pbapply randomForest RcppNumerical rpart statmod survey viridisLite]; broken = true; }; ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.6"; sha256="0pwb32sw0h03fnp15zm81znhqcxszzqk288vcbi455639jd2npp5"; depends=[Rcpp sparsebnUtils]; broken = true; }; - ccml = derive2 { name="ccml"; version="1.1.0"; sha256="1ama9qxvqn2x5zw7m0jdym73b5b0d25gf820apylfgmy2i7si2xa"; depends=[ConsensusClusterPlus diceR ggplot2 plyr SNFtool tidyr]; broken = true; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; broken = true; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; broken = true; }; cecs = derive2 { name="cecs"; version="0.2.4"; sha256="1fm1yrb8kd7f97kgsp5wfp02fspzvndki2aqsfcwb0rlrlckflzf"; depends=[cec2013 stringr]; broken = true; }; @@ -20906,16 +21147,22 @@ in with self; { censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; broken = true; }; censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; broken = true; }; censusxy = derive2 { name="censusxy"; version="1.1.1"; sha256="1gdry73xzcixa3hfchlf2xmmlnhk1vsg7k3axvynvlr493i7qf2a"; depends=[doParallel foreach httr]; broken = true; }; + censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; broken = true; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; broken = true; }; + cffdrs = derive2 { name="cffdrs"; version="1.8.20"; sha256="0x2gzqcif79hkrchx50j5yvxwwpgv8g8bxisfsa1xd7sja609hw7"; depends=[data_table doParallel foreach geosphere raster rgdal]; broken = true; }; + cgalMeshes = derive2 { name="cgalMeshes"; version="2.2.0"; sha256="09iq6v5xizf0y3qzr7lkbwck8yh8rhbvr8c3m5gw95rs056njmj8"; depends=[BH data_table onion R6 Rcpp RcppCGAL RcppColors RcppEigen rgl]; broken = true; }; + cgalPolygons = derive2 { name="cgalPolygons"; version="0.1.1"; sha256="13gj0wkpcs51zpvas8rai8wk0wpvmkz91x9r99qfaz4fwzq692aj"; depends=[BH R6 Rcpp RcppCGAL RcppEigen]; broken = true; }; cgdsr = derive2 { name="cgdsr"; version="1.3.0"; sha256="07yc819hkabpzzh0g0cbqza6bcfy67b2marrzz1lj97f9iba78ja"; depends=[httr R_methodsS3 R_oo]; broken = true; }; cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; broken = true; }; cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; broken = true; }; + changeRangeR = derive2 { name="changeRangeR"; version="1.0.2"; sha256="06i4r6ylwq551lm2l7mg2av1l04ijwrj2d8y0avdf1c83spir7dy"; depends=[dplyr phylobase rangeModelMetadata raster rgeos sf sp]; broken = true; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; broken = true; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.2"; sha256="0bji0m4ks2lf9s1rnq58w97ywpgs3m9rpm5p5f70f0kn33yffrix"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; broken = true; }; changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; broken = true; }; cheatR = derive2 { name="cheatR"; version="1.2.1"; sha256="0ph7bw2b3frmq6z7qb99pds8j81dbx0bxkbhb55mczqa7n0k50hy"; depends=[ngram purrr R_utils textreadr]; broken = true; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; broken = true; }; chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; broken = true; }; + checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; broken = true; }; chessR = derive2 { name="chessR"; version="1.5.2"; sha256="1czv5y4ybbi15b87959vri25fy31yv2l2cdd5q6p9fw291kj1qnp"; depends=[curl dplyr httr jsonlite lubridate magrittr purrr rlang rvest stringr tidyr xml2]; broken = true; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; broken = true; }; chickn = derive2 { name="chickn"; version="1.2.3"; sha256="1d3xl2pigan6vb29nk2ks04dsl5vy16cv9z7miskmhcqcx2wm1qb"; depends=[bigstatsr doParallel doRNG foreach MASS mvnfast nloptr pracma Rcpp RcppArmadillo RcppParallel Rdpack rmio zipfR]; broken = true; }; @@ -20928,6 +21175,7 @@ in with self; { citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; broken = true; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; broken = true; }; clampSeg = derive2 { name="clampSeg"; version="1.1-1"; sha256="1zrndnd8n7ssn2fm0l7y31a2la0nsybqsl4j44r0mmc1m0m94vks"; depends=[lowpassFilter stepR]; broken = true; }; + clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; broken = true; }; classyfireR = derive2 { name="classyfireR"; version="0.3.8"; sha256="1k1j4p5xmracrlaxfmvpp1r6krirvpfrv0f0jq8377kmhxmdwmm5"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr rjson RSQLite stringr tibble tidyjson tidyr]; broken = true; }; cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; broken = true; }; clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; broken = true; }; @@ -20938,21 +21186,26 @@ in with self; { clustcurv = derive2 { name="clustcurv"; version="2.0.1"; sha256="1xkl84pd1a3phl5yfm21yr5c0gbmmg1wk9b0lyl2x8466v5hl53q"; depends=[doParallel doRNG foreach ggfortify ggplot2 Gmedian npregfast RColorBrewer survival]; broken = true; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; broken = true; }; clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; broken = true; }; + clusterPower = derive2 { name="clusterPower"; version="0.7.0"; sha256="1ha7iz1afmgccxhxsl3y1fd9rbf35nrzp6bsz4c4zl0931xbazfb"; depends=[car dplyr foreach lme4 lmerTest mathjaxr nlme progress R_utils shiny tidyr]; broken = true; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; broken = true; }; cns = derive2 { name="cns"; version="0.1.0"; sha256="1kn1cq32pp05ag22n7iwjxn6lxpqn443npzk6vdskjm5pbnsc33k"; depends=[]; broken = true; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; broken = true; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; broken = true; }; + coil = derive2 { name="coil"; version="1.2.3"; sha256="023sn4waf8wb99ryxf0biag8rfg3j3sslf8fw7d00llzci8px5zj"; depends=[ape aphid seqinr]; broken = true; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; broken = true; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; broken = true; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; broken = true; }; colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; broken = true; }; colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; broken = true; }; + commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; broken = true; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; broken = true; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; broken = true; }; + compicc = derive2 { name="compicc"; version="0.1.0"; sha256="1j2yy4dw3g96vpm3dq81dixhfzm3nqqawphmmg9hcsqir5f6xg9a"; depends=[irr]; broken = true; }; composits = derive2 { name="composits"; version="0.1.1"; sha256="0njz6yn3dxi5czzmp93lcz2xr5gphiii857s5jggygq0xdszlx86"; depends=[anomalize dobin dplyr fastICA forecast ggplot2 gridExtra ICS kableExtra otsad pracma rlang tibble tidyr tsoutliers]; broken = true; }; compstatr = derive2 { name="compstatr"; version="0.2.1"; sha256="0pg8yacfb7jvg9xr0gmis8a4g339isd77h6wr8dd6w900q47xac0"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; broken = true; }; comtradr = derive2 { name="comtradr"; version="0.3.0"; sha256="17fdcgx27352jqdvz05q3crg29h78d0alp0abxmkzymwk3yq842j"; depends=[httr jsonlite magrittr purrr]; broken = true; }; concurve = derive2 { name="concurve"; version="2.7.7"; sha256="185jwz7a33sc9gbkfbcxwzgzd39xn5x72d0nk6p045mq3xssk3j9"; depends=[bcaboot boot colorspace dplyr flextable ggplot2 knitr metafor officer pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; broken = true; }; + condmixt = derive2 { name="condmixt"; version="1.1"; sha256="1x6n3ylaa9ywvz7v63i2pvd2lxm95wq19xy741g9hy73ld7hd7zn"; depends=[evd]; broken = true; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; broken = true; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; broken = true; }; connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; broken = true; }; @@ -20960,18 +21213,24 @@ in with self; { contact = derive2 { name="contact"; version="1.2.8"; sha256="1db3vgjlz0ivw3sx37mwy7ngjx0in3rxlm3i3akh4xzbfp9gjj87"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; broken = true; }; contextual = derive2 { name="contextual"; version="0.9.8.4"; sha256="0lww36nymg2cla83jdvl7a42cwn0il20apciz0ddplq8rw2i0a91"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; broken = true; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; broken = true; }; + convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; broken = true; }; + convexjlr = derive2 { name="convexjlr"; version="0.8.1"; sha256="1x2ra1xcyd7bvc7wq49wpihh0g9ygh1bq5214vvrhfrjfjifvlaw"; depends=[JuliaCall magrittr]; broken = true; }; + cookiemonster = derive2 { name="cookiemonster"; version="0.0.1"; sha256="0hd4cijmiqip0a2dxqncan6gy4kjkrqgxzsw33fzmm0xqys0ajl0"; depends=[cli openssl rappdirs stringi tibble urltools vctrs]; broken = true; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; broken = true; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; broken = true; }; coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; broken = true; }; coreheat = derive2 { name="coreheat"; version="0.2.2"; sha256="1mahnd6k7whd7nj9ax1fhpm17j35i6prww06qx691l8dfn954ld9"; depends=[Biobase convertid heatmapFlex WGCNA]; broken = true; }; corpus = derive2 { name="corpus"; version="0.10.2"; sha256="0fxa38xbd5fyhh0q1ycx8snj7ly8hv9jclbs77agkb6pb6p7yr64"; depends=[utf8]; broken = true; }; cort = derive2 { name="cort"; version="0.3.2"; sha256="1iayvgwjmpmb96w5841jxhwivca7s4v5bpsdy0lrbk121saqq5z1"; depends=[furrr nloptr osqp purrr Rcpp Rdpack]; broken = true; }; + couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; broken = true; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; broken = true; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; broken = true; }; covLCA = derive2 { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; broken = true; }; covidregionaldata = derive2 { name="covidregionaldata"; version="0.9.3"; sha256="1pq3il8wzygih419avf3nn5swd0z09mf2n0q361w3n7aa2m20yjf"; depends=[countrycode dplyr httr jsonlite lifecycle lubridate memoise purrr R6 readxl rlang stringr tidyr tidyselect vroom xml2]; broken = true; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; broken = true; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; broken = true; }; + cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; broken = true; }; + cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; broken = true; }; cplexAPI = derive2 { name="cplexAPI"; version="1.4.0"; sha256="00h2zir1ffzjiglfyq8bsfmgq9z155jr0k0fxv8fsbfyw2x9dg10"; depends=[]; broken = true; }; cptec = derive2 { name="cptec"; version="0.1.1"; sha256="12y79r56zlm3d9z7886qc625x8c206vg3hmjxpvh3j2fapy287qc"; depends=[magrittr rvest xml2]; broken = true; }; cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; broken = true; }; @@ -20982,6 +21241,7 @@ in with self; { crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; broken = true; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; broken = true; }; crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; broken = true; }; + crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; broken = true; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; broken = true; }; csa = derive2 { name="csa"; version="0.7.0"; sha256="0cmabcvfxfplnzx7mdsfas3jhgz44y86411amaphm75zmv8khcif"; depends=[data_table doParallel foreach ggplot2 ggpubr Lmoments moments raster reshape2 scales]; broken = true; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; broken = true; }; @@ -20995,15 +21255,19 @@ in with self; { cvam = derive2 { name="cvam"; version="0.9.3"; sha256="1fq1xwxhpny8fy2l1a45vj9gj3czkifb1bnbi33dlf99vv1pml7r"; depends=[coda Formula]; broken = true; }; cvcqv = derive2 { name="cvcqv"; version="1.0.0"; sha256="0327r4jw6m4avcz1zvdkxszqwaw2s9sh1i1jagl6aggd7aaiiyg0"; depends=[boot dplyr MBESS R6 SciViews]; broken = true; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; broken = true; }; + cwbtools = derive2 { name="cwbtools"; version="0.3.8"; sha256="1v7pan3d00km7yq03ym3xdvlqhwrlxg5w8y2dl34dlsm67xysxh1"; depends=[cli curl data_table fs httr jsonlite lifecycle pbapply R6 RcppCWB rstudioapi stringi xml2 zen4R]; broken = true; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; broken = true; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; broken = true; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; broken = true; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; broken = true; }; - daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; broken = true; }; - daiR = derive2 { name="daiR"; version="0.9.0"; sha256="0kq633jpiagbpsj0190pzpxmz8df6niqc6lwqgrahxfpda798srk"; depends=[base64enc curl fs gargle glue googleCloudStorageR httr jsonlite magick pdftools purrr stringr]; broken = true; }; + dagHMM = derive2 { name="dagHMM"; version="0.1.0"; sha256="1dw4clv2x71km1sqz1mydscwyj6y9yqx06v3rkmdz13qqcacfmhi"; depends=[bnclassify bnlearn future gtools matrixStats PRROC]; broken = true; }; dalmatian = derive2 { name="dalmatian"; version="1.0.0"; sha256="0hpyg8sl5v87l1hxax9sj863hy9njdyp7hnsaw3cida365p0dswa"; depends=[coda dglm dplyr ggmcmc rlang tidyr]; broken = true; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; broken = true; }; dash = derive2 { name="dash"; version="0.9.4"; sha256="1ggdfzlf7ayv2nc6qpmyrg3cx31cikhnv7smwpx6xlmj2sc75war"; depends=[assertthat base64enc brotli crayon digest fiery glue htmltools jsonlite magrittr mime plotly R6 reqres rlang routr]; broken = true; }; + dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; broken = true; }; + dashHtmlComponents = derive2 { name="dashHtmlComponents"; version="1.0.3"; sha256="01zrwjlhwwajk2lnv7is1r6nril83l65pynx856y9mvnm05xkb7m"; depends=[]; broken = true; }; + dashPivottable = derive2 { name="dashPivottable"; version="0.0.2-1"; sha256="1fv5pnvimf7w1k1lsijh9y2zk4z1z00m6m640jxvqla5i1rqy8cq"; depends=[]; broken = true; }; + dashTable = derive2 { name="dashTable"; version="4.7.0"; sha256="0iy07dxa90vsp3rfk8ij78j9ajz1mpxywmclxzkfj7axjyydxh5w"; depends=[]; broken = true; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; broken = true; }; datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; broken = true; }; datagovindia = derive2 { name="datagovindia"; version="1.0.5"; sha256="1k04k2bz56d3k1nbx8p8pc1x3cxrdmnpgbrgmxl5i1qg3yashj91"; depends=[curl dplyr httr magrittr plyr rlang stringr]; broken = true; }; @@ -21011,19 +21275,26 @@ in with self; { datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; broken = true; }; datapackage_r = derive2 { name="datapackage.r"; version="1.3.5"; sha256="01xx8alj3niznkrn3y2w9j1g60zn1fq0a2clf4r5p2pjyr2rqgy3"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; broken = true; }; datastructures = derive2 { name="datastructures"; version="0.2.9"; sha256="0prw24iy1af02g1nzw588dv085bdnl6pzvizpxspmwzj6vrfbaav"; depends=[BH purrr Rcpp]; broken = true; }; + dataversionr = derive2 { name="dataversionr"; version="0.9.0"; sha256="013c45fbak32bcda9zj8dk0jw57xpbriymks4n38d9nliflqr6z5"; depends=[arrow diffdfs dplyr lubridate magrittr purrr rlang tidyr]; broken = true; }; + datplot = derive2 { name="datplot"; version="1.0.0"; sha256="1y9pls1g2flz8n3jbh4jcp1fn78qwfbgsrzyf3jms9f6w8fs0f1d"; depends=[]; broken = true; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; broken = true; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; broken = true; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; broken = true; }; + dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; broken = true; }; dccvalidator = derive2 { name="dccvalidator"; version="0.3.0"; sha256="1l74pqvac0n7dyfzkz2m0m6j19c8icymbwcifp2g5qvrpznfhxjb"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; broken = true; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; broken = true; }; dcmodifydb = derive2 { name="dcmodifydb"; version="0.3.1"; sha256="1ahrsh9xlp9c7gaz1zcp2bwlb2c4nxcchw89d1r45dvqspj4c8fn"; depends=[DBI dbplyr dcmodify dplyr validate]; broken = true; }; dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; broken = true; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.1"; sha256="0yczn63fhpirvz1g1kq9q0m04sisflxxgxy70c87jyvrw12nfwss"; depends=[deSolve gdata gptk]; broken = true; }; + deTestSet = derive2 { name="deTestSet"; version="1.1.7.4"; sha256="0cknv6d37vxfpvnckhgyrg5bw7i18gj85pyrrdyl5fxsqkqwk6ni"; depends=[deSolve]; broken = true; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; broken = true; }; + debar = derive2 { name="debar"; version="0.1.0"; sha256="03xlhnbvmkg93f6zl3x22rfwvs17fscvl8irmnm19pifk4bvbpyd"; depends=[ape aphid seqinr]; broken = true; }; deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; broken = true; }; define = derive2 { name="define"; version="0.2.9"; sha256="0sq7ryiz1py0yw7g2bncd834zsdiy1y7rck8k4grrx2ips5gv2jy"; depends=[encode Hmisc latexpdf SASxport spec]; broken = true; }; + delaunay = derive2 { name="delaunay"; version="2.0.0"; sha256="0rnbi17fsgh1k7sr2blnf7sgppxv1fqm0l85z16bryx5z7ab602p"; depends=[BH gplots randomcoloR Rcpp RcppCGAL RcppEigen rgl Rvcg scales sets]; broken = true; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; broken = true; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; broken = true; }; + demcon = derive2 { name="demcon"; version="0.4.0"; sha256="1lwsvw40gmrcc38f2j231f7k7q9536pwgnfz1045dhs0cw1amlhx"; depends=[countrycode data_table httr rlang stringr]; broken = true; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; broken = true; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; broken = true; }; depth = derive2 { name="depth"; version="2.1-1.1"; sha256="0szy0027nh4ps1z919i740i50app5q7cfyg1fj7pdyl45nbl8k6m"; depends=[abind circular rgl]; broken = true; }; @@ -21039,19 +21310,24 @@ in with self; { dhReg = derive2 { name="dhReg"; version="0.1.1"; sha256="0cfiy0wwd9b6h1qs6nw2m29zc3j2qqcybf879s5zbgnyxzp2ga2w"; depends=[forecast future future_apply testthat]; broken = true; }; dialectR = derive2 { name="dialectR"; version="1.0"; sha256="11fd2fdxczlcxkk3pwhiw0vb51bndh9qcfp7pqcfj1z7aga52xk0"; depends=[deldir dplyr dtw ggplot2 ggvoronoi Rcpp RcppProgress reticulate sf tibble]; broken = true; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; broken = true; }; + dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; broken = true; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; broken = true; }; + diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; broken = true; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; broken = true; }; diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; broken = true; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; broken = true; }; + dimensionalAnalysis = derive2 { name="dimensionalAnalysis"; version="0.1.0"; sha256="0pzncdrphnldgpvkm847wr6yrk30p1ayfwjlrg44kxackpl1w1y8"; depends=[caracas hash reticulate]; broken = true; }; + disaggregation = derive2 { name="disaggregation"; version="0.2.1"; sha256="0v7wqx84bawl6kw6izy530kqhr3g7bzbnma17s691b7dzz4f5cnf"; depends=[cowplot doParallel dplyr foreach ggplot2 Matrix raster RcppEigen sf sp sparseMVN splancs TMB]; broken = true; }; disastr_api = derive2 { name="disastr.api"; version="1.0.5"; sha256="1h5i6pwak16w0gdk8qjz4w9qpffjhzlsrvjkb4acrvgjgrsvz9kp"; depends=[httr jsonlite]; broken = true; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; broken = true; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; broken = true; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; broken = true; }; - diseasemapping = derive2 { name="diseasemapping"; version="1.5.1"; sha256="0pqilkl56753j1fxy6mh7nx24n6qg2j5faxyxj6abcm6xrnkhmy9"; depends=[rgeos sp]; broken = true; }; + diseasemapping = derive2 { name="diseasemapping"; version="2.0.3"; sha256="0hpf6q754kg1ycjar9vlip7xv57khd83r14s6x0zfh6yc8gwwwfw"; depends=[terra]; broken = true; }; diseq = derive2 { name="diseq"; version="0.4.6"; sha256="0j8xx40qs62ky5wrc4zymsfai2aqh2n3fcd17648n56d7m2p274x"; depends=[bbmle dplyr Formula magrittr MASS Rcpp RcppGSL RcppParallel rlang systemfit tibble tidyr]; broken = true; }; - disk_frame = derive2 { name="disk.frame"; version="0.8.2"; sha256="1mx3lqgasxmqxwrwslmrfcjh7gmd2f6ypz23k1x05bgrhckwhlws"; depends=[arrow benchmarkme bigreadr bit64 crayon data_table dplyr fs fst future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; broken = true; }; + diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; broken = true; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; broken = true; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; broken = true; }; + distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; broken = true; }; distr6 = derive2 { name="distr6"; version="1.6.9"; sha256="1vl8xg0r0g169xdx6prnfpfr1jnn8mc4daayrzpws4my2dc59dqh"; depends=[checkmate data_table ooplah param6 R6 Rcpp set6]; broken = true; }; distribglm = derive2 { name="distribglm"; version="0.4.1"; sha256="09gpkp7s8y2dcpjhqgi2nl6j8pmd500y89d8c8x8sxmh5mg8n5si"; depends=[readr]; broken = true; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; broken = true; }; @@ -21063,10 +21339,13 @@ in with self; { documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; broken = true; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="2.0.0"; sha256="0qxldvlgbysy9j17kb0a9p132a04a4j12h4m0r70zv2752fj24c0"; depends=[]; broken = true; }; dotdot = derive2 { name="dotdot"; version="0.1.0"; sha256="0d8inv2m7pkk6dnv9j9zai4lhghcg656l46d00rhp604rbhzlmw9"; depends=[]; broken = true; }; + downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; broken = true; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; broken = true; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; broken = true; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; broken = true; }; + dplbnDE = derive2 { name="dplbnDE"; version="0.1.3"; sha256="1dqdsy5195mbkibxmfmh6qb4m26sa6h04l8lkcy4b3a0w7j2bmgn"; depends=[bnclassify]; broken = true; }; dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.4.1"; sha256="0ygn8cq4dnmzzxfskcir7g0bksgby5sw2j135gvrk599z3v6avg1"; depends=[bit64 DBI dbplyr dplyr odbc]; broken = true; }; + drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; broken = true; }; drmdel = derive2 { name="drmdel"; version="1.3.2"; sha256="1772fxm3qs01h14qklp2rawcdm0vmjmb2mi62v1zl1hbxisnfq4s"; depends=[]; broken = true; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; broken = true; }; dsims = derive2 { name="dsims"; version="1.0.1"; sha256="15yy3kivg26pmzaby0kaj4vq4526jrnvpiqj24bcvh7sskv8myif"; depends=[Distance dssd ggplot2 gridExtra mgcv mrds rgeos rlang rstudioapi sf sp]; broken = true; }; @@ -21077,15 +21356,18 @@ in with self; { durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; broken = true; }; dwctaxon = derive2 { name="dwctaxon"; version="2.0.2"; sha256="1w6mdqr76gaiwj5bdrk6w544525zf0j0s1qqpszlfxymwqyax6nl"; depends=[assertthat digest dplyr glue purrr rlang settings stringr tibble]; broken = true; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; broken = true; }; + dynamichazard = derive2 { name="dynamichazard"; version="1.0.2"; sha256="1khfy2fhvzgp165arj1yqvqi5p6lg94sxikwp5s5dxnsgzny00xm"; depends=[boot Rcpp RcppArmadillo survival]; broken = true; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; broken = true; }; dynfeature = derive2 { name="dynfeature"; version="1.0.1"; sha256="0qwz7a9gdclz1yp596pj14wkydvb6gzcm565m6vc7sargwbk85d6"; depends=[dplyr dynutils dynwrap purrr ranger reshape2 testthat tibble]; broken = true; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; broken = true; }; dynplot = derive2 { name="dynplot"; version="1.1.2"; sha256="09psc13xfhalk1m41kkwj2ah2dcqkwyzc09kfi1sjpj6nyylcvdn"; depends=[assertthat dplyr dyndimred dynfeature dynutils dynwrap GA ggforce ggplot2 ggraph ggrepel igraph MASS patchwork purrr reshape2 tibble tidygraph tidyr vipor]; broken = true; }; + eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; broken = true; }; + earthtide = derive2 { name="earthtide"; version="0.1.0"; sha256="06js9czzp5l83cdxmpjc7kkcvyadm9ic3zwd68kic21gcmcfaw0k"; depends=[BH R6 Rcpp RcppEigen RcppThread]; broken = true; }; + easyalluvial = derive2 { name="easyalluvial"; version="0.3.1"; sha256="10nd1jay913jpipy0q2zl7f7pihqynpxmmccbg657jzcgnzva1rv"; depends=[dplyr forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress progressr purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; broken = true; }; + easybgm = derive2 { name="easybgm"; version="0.1.0"; sha256="077j8l04cix4vh2jzvmrzmq17j36npsz68qig7gvfvf9lcm3aq1q"; depends=[BDgraph BGGM bgms dplyr ggplot2 HDInterval igraph qgraph]; broken = true; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; broken = true; }; ebmstate = derive2 { name="ebmstate"; version="0.1.3"; sha256="04pg9yqbjrq10ai13c8zm8sy7spnf96ldbbql7qysjl91ljgrqz6"; depends=[HDInterval mstate Rcpp survival]; broken = true; }; - ebvcube = derive2 { name="ebvcube"; version="0.1.4"; sha256="00fcz8ibs2jahkndsh3cz0gm8pmzhvmvpgwi2n5qgfljbb810mnx"; depends=[checkmate curl DelayedArray ggplot2 HDF5Array jsonlite memuse ncdf4 ncmeta reshape2 rhdf5 stringr terra tidyterra withr]; broken = true; }; ecap = derive2 { name="ecap"; version="0.1.2"; sha256="0d260y4phh1a7zlj2lgvdf7xd2z14l9djv7nrwa84pwqqyijc7rl"; depends=[ggplot2 quadprog]; broken = true; }; - ecce = derive2 { name="ecce"; version="1.0.9"; sha256="071ahimmwc1bgcwli4c40h7drdg5ldhh0w1ldzxkjc78qyw8s23d"; depends=[purrr RCurl rjson stringr]; broken = true; }; edbuildr = derive2 { name="edbuildr"; version="0.3.0"; sha256="19fsk8qkxyzncn614fy6hmmxpv1dikqghs101hbzd0g0a511xk8f"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; broken = true; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; broken = true; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; broken = true; }; @@ -21093,6 +21375,8 @@ in with self; { edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; broken = true; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; broken = true; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; broken = true; }; + eechidna = derive2 { name="eechidna"; version="1.4.1"; sha256="1p8vj371i7zglw7898akzj4hd5j7zk35is91jylxalldjab88v9c"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; broken = true; }; + eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; broken = true; }; effectFusion = derive2 { name="effectFusion"; version="1.1.3"; sha256="0653857zgfv2lrksja6k9i7m2jn3ha4lri6mlmcn6fgxkmr54bgw"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; broken = true; }; eflm = derive2 { name="eflm"; version="0.3.0"; sha256="0pl1z0yy257x4yhy2m7w6xkicr2a5b37rdsrf7a5ramk7z2nvs4m"; depends=[tibble]; broken = true; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; broken = true; }; @@ -21101,23 +21385,28 @@ in with self; { elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; broken = true; }; elbird = derive2 { name="elbird"; version="0.2.5"; sha256="1n9z71xii5kymrm5ar4gldz2czk8z94qzd2ms7fwk0cwynbdcc5k"; depends=[cpp11 dplyr matchr purrr R6 tibble vroom]; broken = true; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; broken = true; }; + elementR = derive2 { name="elementR"; version="1.3.7"; sha256="01xbqargzc0bp1l5rcvxikr95ghj9w7w5byhrjbgwbia6y7zhxa2"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; broken = true; }; emba = derive2 { name="emba"; version="0.1.8"; sha256="1bzp1cplr977w87bm0pvabvgai91a3j51pfjn4lc1ncjbr2v6wl0"; depends=[Ckmeans_1d_dp dplyr igraph purrr readr rje stringr tibble tidyr tidyselect usefun visNetwork]; broken = true; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; broken = true; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; broken = true; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; broken = true; }; enRich = derive2 { name="enRich"; version="3.1"; sha256="0xl9rhz6mflzp1g5d51xz74dsm8qp16jbkflhzrha3vfirn2jh8q"; depends=[]; broken = true; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; broken = true; }; + engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; broken = true; }; ensModelVis = derive2 { name="ensModelVis"; version="0.1.0"; sha256="06nhk616h32225p65ms4k9ia5qwd7kngpa4z6hxzn9nzmiirma60"; depends=[dplyr forcats ggplot2 magrittr rlang tidyr]; broken = true; }; entcn = derive2 { name="entcn"; version="1.0.0"; sha256="0zwhhjrc24d3hr9494p9ayxlkd0g6jml9raxwv59mpvpprrasdws"; depends=[RYoudaoTranslate stringr]; broken = true; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; broken = true; }; envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; broken = true; }; + epcc = derive2 { name="epcc"; version="1.4.7"; sha256="0j4cb17gvwsaacmhvm8qp5chr384kl7gj6089gjrc2hqi6kjr0rx"; depends=[cowplot deSolve formattable ggplot2 httr nls2 proto raster readxl rgdal rlang sp]; broken = true; }; epi2me2r = derive2 { name="epi2me2r"; version="0.1.0"; sha256="1zsh9fhwjjh9y98s7hdhchbfdjm5xxqqz1qinq55x9yv11b1xfwy"; depends=[Biobase data_table metagenomeSeq phyloseq taxonomizr]; broken = true; }; epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; broken = true; }; epidemia = derive2 { name="epidemia"; version="1.0.0"; sha256="1lfbibcpm58a05wrikwfzxkfqxw6yk41b1q07wpchxpz1lfv2v5y"; depends=[bayesplot BH dplyr ggplot2 hrbrthemes lme4 magrittr Matrix Rcpp RcppEigen Rdpack rlang rstan rstanarm rstantools scales StanHeaders tidyr zoo]; broken = true; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; broken = true; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; broken = true; }; + epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; broken = true; }; epitopR = derive2 { name="epitopR"; version="0.1.2"; sha256="0bqj62jl48pql7dbmq96fgs0pza3krycd9i6fj0sjz7yxg4i46q6"; depends=[Biostrings dplyr fs here httr janitor purrr readr seqinr stringr tibble tidyverse]; broken = true; }; epitopeR = derive2 { name="epitopeR"; version="1.0.0"; sha256="0zp23cm43j9mm1fvz65y3xgjy0bm2s5h02y046zx2akx24sh3fjh"; depends=[Biostrings dplyr fs httr janitor purrr readr rlang seqinr stringr tibble tidyverse]; broken = true; }; + epitweetr = derive2 { name="epitweetr"; version="2.2.13"; sha256="0vv4y1c8nfcdv2hmv6vvi5jh6ykrbvna2p2gwpcl9q4j7b4wp9jc"; depends=[bit64 crul curl dplyr DT emayili future ggplot2 htmltools httpuv httr janitor jsonlite keyring knitr lifecycle magrittr openxlsx plotly plyr processx readxl rgdal rlang rmarkdown rnaturalearthdata rtweet shiny sp stringr tibble tidytext tidyverse tokenizers xml2 xtable]; broken = true; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; broken = true; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; broken = true; }; equatiomatic = derive2 { name="equatiomatic"; version="0.3.1"; sha256="0gy1wy10zc7h7h1s0hwd545iv4af5x2g8pqsgzyryydd6426g2gj"; depends=[broom broom_mixed knitr shiny]; broken = true; }; @@ -21129,11 +21418,13 @@ in with self; { errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; broken = true; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; broken = true; }; estudy2 = derive2 { name="estudy2"; version="0.10.0"; sha256="0axlhniir8sz06mn18y49q8np3rbx3jfnz410agfajqhq7b5m9s1"; depends=[curl matrixStats quantmod Rcpp zoo]; broken = true; }; + ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; broken = true; }; evaluator = derive2 { name="evaluator"; version="0.4.3"; sha256="1gccymjb1ad3xw3kmqafchazv9rid6v6c3h8w96ai5b2jh8zlgwk"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; broken = true; }; eventr = derive2 { name="eventr"; version="1.0.0"; sha256="08ljjvfrnfmi49b9bgizvvswxydln8ny901grn5j288pq0djjqyk"; depends=[dplyr magrittr purrr]; broken = true; }; eventstudies = derive2 { name="eventstudies"; version="1.2.2"; sha256="01vpd0gnxaibxn3nq6618rxlwapm86idz86n0wj5kfz4a9kj7lsx"; depends=[boot sandwich testthat xts zoo]; broken = true; }; exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; broken = true; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; broken = true; }; + excelstrippr = derive2 { name="excelstrippr"; version="0.1.2"; sha256="1ly76qja9b5l3xwfhigm1apd114y2iq5wdl27sd2h1y80n8xxf2v"; depends=[dplyr readxl tidyr]; broken = true; }; excerptr = derive2 { name="excerptr"; version="2.0.1"; sha256="0lmcxlpxvldxwqxrprqq39hk5f770ii1x38jm2jbs4n75smp4m21"; depends=[checkmate reticulate]; broken = true; }; exoplanets = derive2 { name="exoplanets"; version="0.2.2"; sha256="0jzqzw0sn2cixxl6wdikz6cmm2qijxcjp81c98dfqamjcnbpqc1f"; depends=[cli httr memoise readr tibble]; broken = true; }; exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; broken = true; }; @@ -21149,6 +21440,7 @@ in with self; { extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; broken = true; }; extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; broken = true; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; broken = true; }; + ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; broken = true; }; ezpickr = derive2 { name="ezpickr"; version="2.1.0"; sha256="0jcbmd2bsrq8h6z1zmscph5zvv99gj4n2k1ddrl18wj7cx5mzsii"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble tidyr vroom writexl]; broken = true; }; ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; broken = true; }; fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; broken = true; }; @@ -21156,11 +21448,11 @@ in with self; { fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; broken = true; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.3"; sha256="0dcfwl0ib87p748hvwscm5ii9fhfarqfl3zqxa8kin2n0hrvkdb6"; depends=[fCertificates fExoticOptions fOptions Matrix mvtnorm tmvtnorm]; broken = true; }; fOptions = derive2 { name="fOptions"; version="3042.86"; sha256="1cqyggb1hb7z0gfgkziynz7nm85z0fn3bvz1iwpy49yy8ll7rfzr"; depends=[fBasics timeDate timeSeries]; broken = true; }; - fRLR = derive2 { name="fRLR"; version="1.2.1"; sha256="1fac5ykl1bv0y8m73vzyhghmj6f0q9iy7zr4142wzh2i2zzr0mpz"; depends=[Rcpp]; broken = true; }; facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; broken = true; }; factorEx = derive2 { name="factorEx"; version="1.0.1"; sha256="03dgxxykxgq63cgan5gy5vz4hnwqmg48z2wdv8f69mk9452mg9m2"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; broken = true; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; broken = true; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; broken = true; }; + factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; broken = true; }; factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; broken = true; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; broken = true; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; broken = true; }; @@ -21174,10 +21466,11 @@ in with self; { fastcmprsk = derive2 { name="fastcmprsk"; version="1.1.1"; sha256="00jpmmlpldrqamgw7q7gx6s4rl1bxqlzw2jglw36k5zawcdb69y6"; depends=[dynpred foreach survival]; broken = true; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; broken = true; }; fasthplus = derive2 { name="fasthplus"; version="1.0"; sha256="05j4lg1gkkz1vi99dx73igvk9xyrli8j6m4hzhpcnyhy0h9bxiqj"; depends=[]; broken = true; }; + fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; broken = true; }; + fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; broken = true; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; broken = true; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; broken = true; }; fdakma = derive2 { name="fdakma"; version="1.3.1"; sha256="03w519hpr4z610vrwkd2g03lsb781zsmplb9y0bagz33ik2342l0"; depends=[cli fdacluster rlang]; broken = true; }; - fdaoutlier = derive2 { name="fdaoutlier"; version="0.2.0"; sha256="1jpd9mszd0grn7rwi3dmgl6l5dggwsnz1kyljz2gcfm2wck2zhbz"; depends=[MASS]; broken = true; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; broken = true; }; fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; broken = true; }; feamiR = derive2 { name="feamiR"; version="0.1.0"; sha256="0yp3bxh47aspfnnxi4wm4drkndv265rv58n9x9cp5jazwdy4qgg9"; depends=[dplyr e1071 GA ggplot2 magrittr randomForest reticulate rpart rpart_plot stringr tibble]; broken = true; }; @@ -21207,6 +21500,7 @@ in with self; { flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; broken = true; }; fm_index = derive2 { name="fm.index"; version="0.1.1"; sha256="06zqdzbriygcf8fml5mdyc2ipfpy5p6vsvrdk3kp8bk3fkyc8yd2"; depends=[Rcpp stringi]; broken = true; }; foieGras = derive2 { name="foieGras"; version="0.7-6"; sha256="0g4c9id7q3jgjcgwmncp4bkw9njwb41cp6ycv7psiidkhmnzi03d"; depends=[assertthat CircStats dplyr furrr future ggplot2 lifecycle lubridate mvtnorm patchwork purrr RcppEigen sf stringr tibble tidyr TMB tmvtnorm trip]; broken = true; }; + folderfun = derive2 { name="folderfun"; version="0.1.4"; sha256="0rns8590r1897lj0gyrlj0zbaxjw2gjaxwnwdxiiw2kvyq7mjkis"; depends=[]; broken = true; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; broken = true; }; fontMPlus = derive2 { name="fontMPlus"; version="0.1.1"; sha256="1hvviawbfs3m7mr46y2sjdxkksi10vpbnjic11rjaxqcy9a43f4y"; depends=[extrafont ggplot2 hrbrthemes]; broken = true; }; foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; broken = true; }; @@ -21215,10 +21509,12 @@ in with self; { foster = derive2 { name="foster"; version="0.1.1"; sha256="1gkn3mgxsq3p7nazw80z61yhc1dqxhjvd667xklpjka4rrk2am8p"; depends=[caret data_table dplyr randomForest raster reshape2 rgdal RStoolbox sp spatstat spatstat_geom trend yaImpute]; broken = true; }; fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; broken = true; }; fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; broken = true; }; - frailtySurv = derive2 { name="frailtySurv"; version="1.3.7"; sha256="0jyqnj4mscfcjg38a04246xfggnjgwdgwd7w4krz6wa1c3igzx0f"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; broken = true; }; + frailtypack = derive2 { name="frailtypack"; version="3.5.0"; sha256="0yw08x6ss1af19zrm29i509gkjwmphg1hidxdfwkfgvrvcl4fnxz"; depends=[boot doBy MASS nlme rootSolve shiny statmod survC1 survival]; broken = true; }; frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; broken = true; }; freesurfer = derive2 { name="freesurfer"; version="1.6.8"; sha256="0ks6ms5vp38pykcg66w960nmfgq383iprrbbzw5dlx9xnrx4yhbh"; depends=[neurobase R_utils reshape2]; broken = true; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; broken = true; }; + frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; broken = true; }; + frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; broken = true; }; frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; broken = true; }; frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; broken = true; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; broken = true; }; @@ -21231,15 +21527,20 @@ in with self; { futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; broken = true; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; broken = true; }; g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; broken = true; }; + gDefrag = derive2 { name="gDefrag"; version="0.3"; sha256="016vpj03drygxsa06jin225rfgjvjm938x65990ms15xcwrgv8nb"; depends=[igraph maptools rgdal rgeos sp]; broken = true; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; broken = true; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; broken = true; }; + gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; broken = true; }; gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; broken = true; }; gameofthrones = derive2 { name="gameofthrones"; version="1.0.2"; sha256="10ns4yl1s8adlf334gl8yararj1fpxbg3gy7h69s554m4h878awk"; depends=[ggplot2 gridExtra MASS]; broken = true; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; broken = true; }; + gamlss_ggplots = derive2 { name="gamlss.ggplots"; version="2.1-2"; sha256="0b205awv7abl1jv2gg2ki2xdz91i0xikvixgygwjmwz6vri0p7zx"; depends=[ellipse foreach gamlss gamlss_dist gamlss_foreach gamlss_inf ggplot2 ggridges mgcv]; broken = true; }; gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; broken = true; }; gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; broken = true; }; ganalytics = derive2 { name="ganalytics"; version="0.10.7"; sha256="03jf7325cgg5p6lzcrzzzx0b40vf3l5vhw95lih098kpmlr1zadf"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr tibble XML xml2]; broken = true; }; garchmodels = derive2 { name="garchmodels"; version="0.1.1"; sha256="1nmhsxhfbp7jn85jwnhm4p5kl0jc5n1bjwwwpia774ycr6krazwn"; depends=[dials dplyr magrittr parsnip purrr rlang rmgarch rugarch stringr tibble tidyr]; broken = true; }; + gatoRs = derive2 { name="gatoRs"; version="1.0.0"; sha256="1637mx80fr89w205qzp47fjgh6ms5r173c6schjh30vyf9xdljm6"; depends=[CoordinateCleaner dplyr leaflet magrittr parsedate raster rgbif ridigbio spatstat_geom spThin stringr]; broken = true; }; + gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; broken = true; }; gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; broken = true; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; broken = true; }; gdns = derive2 { name="gdns"; version="0.5.0"; sha256="1bicimkxsyfg9yqaikapwlv8x9xdvsb00fqnfka07i6b63109sxh"; depends=[httr jsonlite magrittr stringi tinytest]; broken = true; }; @@ -21250,13 +21551,17 @@ in with self; { geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; broken = true; }; geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; broken = true; }; genius = derive2 { name="genius"; version="2.2.3"; sha256="03j6yry39nn8bccrnwjx1y36rdw167gjlkzl56g5lqwbrgx26bqy"; depends=[dplyr magrittr purrr reshape2 rlang rvest stringr tibble tidyr tidytext]; broken = true; }; + genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; broken = true; }; genotypeR = derive2 { name="genotypeR"; version="0.0.1.8"; sha256="1kwzjn6hrnfizs44cz4a8qa4mdhdzqssc4axx0s6vngmkmsrffig"; depends=[colorspace doBy plyr reshape2 zoo]; broken = true; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; broken = true; }; + geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; broken = true; }; + geofabrik = derive2 { name="geofabrik"; version="0.1.0"; sha256="0k92gmivccw3kbgkb9bjw7pxc4zc3zdj35x0cbzmjq0k3qxq8ad0"; depends=[]; broken = true; }; + geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; broken = true; }; geomedb = derive2 { name="geomedb"; version="2.0.1"; sha256="1l35c9x1mhqd7z5ragd7w3ay8v2fdnbmbfx9grwi622j8yz1fbmq"; depends=[ape httr jsonlite]; broken = true; }; geometr = derive2 { name="geometr"; version="0.2.10"; sha256="00yhw6k9wj3q0mmhwrjvhybsz5fcx86ms5n1q2l492jljplp46cr"; depends=[checkmate crayon deldir dplyr purrr raster Rcpp rgdal rlang sf sp tibble]; broken = true; }; geonet = derive2 { name="geonet"; version="0.7.3"; sha256="0kp0a1bd8yyvp8w044arawyfmxwmqln3dqk0jzvz1vhbhldgy27s"; depends=[dplyr ggplot2 igraph Matrix mgcv spatstat_core spatstat_geom spatstat_linnet]; broken = true; }; + geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; broken = true; }; georob = derive2 { name="georob"; version="0.3-14"; sha256="1an5mxq49kv038dplm9h6ngvsz71lkvjm34i7jjsdpaz3cyflp7v"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; broken = true; }; - geostatsp = derive2 { name="geostatsp"; version="1.8.6"; sha256="1ciyw84y5zbwsfqvl5dhq8swfpkqcmzhhvdm9hr5rhj3497sls9j"; depends=[abind Matrix numDeriv raster sp]; broken = true; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; broken = true; }; geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; broken = true; }; geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; broken = true; }; @@ -21268,51 +21573,66 @@ in with self; { gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; broken = true; }; ggDCA = derive2 { name="ggDCA"; version="1.1"; sha256="0jpg7n6nk2jgq668ff0l9zk26zk39abc74f6w5x8gf4zsb8y0zp9"; depends=[base_rms do ggplot2 rms set survival]; broken = true; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; broken = true; }; + ggasym = derive2 { name="ggasym"; version="0.1.6"; sha256="1vgsqq2m4w5clmf27mmj6jqn2s8m1izz3gj2bxqpmdcvzf5vxkgr"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; broken = true; }; ggbraid = derive2 { name="ggbraid"; version="0.2.2"; sha256="1y5yskhc63cprvdk1j7nhz8mz9i36qs8sqlr9h09yi172mp6ignn"; depends=[ggplot2]; broken = true; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; broken = true; }; ggfacto = derive2 { name="ggfacto"; version="0.2.2"; sha256="0rxqkhmnzpljcdbg5wzmyq5fivd3d2h1903w8d1cblq7xw969xi0"; depends=[dplyr FactoMineR forcats ggiraph ggplot2 ggrepel gridExtra htmlwidgets kableExtra magrittr purrr rlang stringi stringr tabxplor tibble tidyr tidyselect vctrs widgetframe]; broken = true; }; + ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; broken = true; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; broken = true; }; gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; broken = true; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; broken = true; }; ggpacman = derive2 { name="ggpacman"; version="0.1.0"; sha256="1040d6aciyllrpszh7l7y55fw4dx8cya2yvj0x4i2fibvygz83p6"; depends=[dplyr gganimate ggforce ggplot2 magrittr purrr rlang tidyr]; broken = true; }; + ggsn = derive2 { name="ggsn"; version="0.5.0"; sha256="04vnap83w06hbqqi5kgxmrdb3a13n5mcdk5lllymv6nrzvl84f2x"; depends=[ggmap ggplot2 maptools png sf]; broken = true; }; + ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.5"; sha256="0q02r0nql64am6ixjq59fjn2kzsj2is22ys1j1rzscwkh9f6f17m"; depends=[deldir ggplot2 raster rgeos sp]; broken = true; }; + ghcm = derive2 { name="ghcm"; version="3.0.0"; sha256="0byzi0q3amz7q6if0y54mk3wac0pycci9ypagr65p8rlhx04gqv3"; depends=[CompQuadForm MASS Rcpp refund]; broken = true; }; ghee = derive2 { name="ghee"; version="0.1.0"; sha256="0b3czx2ibi5p8xl7i36zxnab032vrkh5bv204r7wgg1xpx8pdlra"; depends=[gh jsonlite]; broken = true; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; broken = true; }; + giedata = derive2 { name="giedata"; version="0.1.1"; sha256="19sr8phsay7bpqrbh776ms0aw9xgiv0x9knmn88ydzpkcdcd1z9j"; depends=[curl dplyr httr lubridate magrittr purrr]; broken = true; }; giftwrap = derive2 { name="giftwrap"; version="0.0.4"; sha256="1zsw529h69x9yaq2csfws4iqn3mm39z34kwzj0b2y850wzbn2dvp"; depends=[namespace processx readr tibble]; broken = true; }; giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; broken = true; }; - gitgadget = derive2 { name="gitgadget"; version="0.7.6"; sha256="0x30asifnyrvsp0wqrc5xwszsbzrwys9m98b01sfkv8kbg2z45am"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; broken = true; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; broken = true; }; glmdisc = derive2 { name="glmdisc"; version="0.6"; sha256="031rz3s5d7hz9fzmsj7aqhzwrn05rnfvk9292k2r0qpr6k02mk3b"; depends=[caret dplyr gam magrittr MASS nnet Rcpp RcppEigen RcppNumerical]; broken = true; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; broken = true; }; glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; broken = true; }; globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; broken = true; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; broken = true; }; + gmat = derive2 { name="gmat"; version="0.2.2"; sha256="0iq2b3s60fyam45ykk67xyi2yhr8ma1s2vw4059357j1948525p2"; depends=[gRbase igraph]; broken = true; }; + gmeta = derive2 { name="gmeta"; version="2.3-1"; sha256="02w3a8c189wdvcxsnclbgzb6bc9fq88rcw2danxa6i9g7q4kq2sp"; depends=[BiasedUrn binom]; broken = true; }; goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; broken = true; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; broken = true; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; broken = true; }; googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; broken = true; }; + gorpiper = derive2 { name="gorpiper"; version="1.0.1"; sha256="0d5406zh75rxnq9mkkvyvsfj2h42rqyjb64q2qfl8x772vx2pdb0"; depends=[cli crayon data_table fs magrittr processx purrr stringr tibble]; broken = true; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; broken = true; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; broken = true; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; broken = true; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; broken = true; }; grainchanger = derive2 { name="grainchanger"; version="0.3.2"; sha256="1anq9gmbf9cjh6f9q2h7f65j220f56rmb59zhp5j2d26bs7dbnz8"; depends=[checkmate furrr raster sf usethis]; broken = true; }; + granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; broken = true; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; broken = true; }; - grattan = derive2 { name="grattan"; version="2.0.0.0"; sha256="067acsrxzdj4bxybyah4c5j8lzrj1vbmarpbngf4r59qnryj4bf8"; depends=[assertthat checkmate data_table fastmatch forecast fy hutils hutilscpp ineq magrittr zoo]; broken = true; }; gremes = derive2 { name="gremes"; version="0.1.1"; sha256="1i3j23ssx0grkzq1qf4naiqrfd753m992pqhxy5y7c805acm77mj"; depends=[abind copula igraph mev mvtnorm quadprog]; broken = true; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; broken = true; }; + groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; broken = true; }; + groupTesting = derive2 { name="groupTesting"; version="1.0.0"; sha256="00jy1gw6whslmfcqic99hmbxh2z75rj14cjzrm5mnpcajn37s66j"; depends=[pracma]; broken = true; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; broken = true; }; + groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; broken = true; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; broken = true; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; broken = true; }; guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; broken = true; }; + gutenbergr = derive2 { name="gutenbergr"; version="0.2.3"; sha256="1jffisx1sycxw3f09n13jnzn7h47zj34g82n6vww6gwliznfsvvz"; depends=[cli dplyr glue lazyeval magrittr purrr readr stringr urltools]; broken = true; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; broken = true; }; gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; broken = true; }; + gwer = derive2 { name="gwer"; version="3.0"; sha256="0jiq5v37mbn6y7vl5gs8qahb796jrfqj0m54sd38vim8yhhjwfy8"; depends=[assertthat glogis GWmodel maptools Matrix sp spData spdep spgwr]; broken = true; }; gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; broken = true; }; + gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; broken = true; }; gwsem = derive2 { name="gwsem"; version="2.1.4"; sha256="0qqcbkxkkfwraz750wvk1f86mqy6f2ndkspd8qr0ypnnlh3i0yzl"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; broken = true; }; + h3r = derive2 { name="h3r"; version="0.1.0"; sha256="18smkkvdb8kpr5k9y64ww23da7lr9g9fnb5gbwgjh3ddzll8973w"; depends=[h3lib]; broken = true; }; hadron = derive2 { name="hadron"; version="3.1.2"; sha256="04qd3lb6im5shf24ss88jkskab1rwn7m2d94x0ybbmfcg3l5dhm0"; depends=[abind boot dplyr R6 Rcpp stringr]; broken = true; }; - haploR = derive2 { name="haploR"; version="4.0.6"; sha256="1cg92v64xdzmr5hbjhd11rz6rkdddsxcxkqdgbj5hd1ldqsrjj45"; depends=[DT httr plyr RCurl RJSONIO RUnit tibble XML]; broken = true; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; broken = true; }; hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; broken = true; }; hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; broken = true; }; hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; broken = true; }; + hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; broken = true; }; hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; broken = true; }; hddtools = derive2 { name="hddtools"; version="0.9.4"; sha256="011yhs8c6riimz63pa2am56n5aip2yk5gryx2amvk29pzp1v6my9"; depends=[curl raster readxl rgdal sp tidyr XML zoo]; broken = true; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; broken = true; }; @@ -21332,11 +21652,15 @@ in with self; { highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; broken = true; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; broken = true; }; hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; broken = true; }; + hkclustering = derive2 { name="hkclustering"; version="1.0.1"; sha256="19syq06y5dl0mcwyaxr7w1hj8ffp5s140j72djcz0lljhskzmp6f"; depends=[cluster]; broken = true; }; + hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; broken = true; }; hmgm = derive2 { name="hmgm"; version="1.0.3"; sha256="12gaz2pi9ny7y772yzrfvl02p3n89cq1l5dzmcksd172gv9ayyz1"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; broken = true; }; hmi = derive2 { name="hmi"; version="1.0.0"; sha256="0fjcw13mkxza6nkq3fhp188ga1sjspq1sc6wjm4hy13xh7vdjpqq"; depends=[boot broom_mixed coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm]; broken = true; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; broken = true; }; hmma = derive2 { name="hmma"; version="1.1.0"; sha256="1qsvczqq44h46z0nfblv4rarbg64imz8m0jhxdhva27kbzdvqf97"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; broken = true; }; + hoa = derive2 { name="hoa"; version="2.1.4.1"; sha256="152vz6cddphmxvm7vi6f3b7jjpib0nsb6qv2k1wrmfrpvv3hgsxx"; depends=[statmod survival]; broken = true; }; hockeyR = derive2 { name="hockeyR"; version="1.3.0"; sha256="0nb42c1fbmpmpmc9yjcdrypl5jvlqc2ibrzlvz7n51zwvx4v5gc0"; depends=[dplyr glue httr janitor jsonlite lubridate magrittr padr purrr rvest stringr tidyr tidyselect xgboost zoo]; broken = true; }; + homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; broken = true; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; broken = true; }; horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; broken = true; }; hrIPW = derive2 { name="hrIPW"; version="0.1.3"; sha256="1ns0mxkcfs2jva4wsbqkybgasgyxvxlcfxayky6lrfhic8jxvmg4"; depends=[survival]; broken = true; }; @@ -21344,38 +21668,51 @@ in with self; { hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; broken = true; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; broken = true; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; broken = true; }; + htmcglm = derive2 { name="htmcglm"; version="0.0.1"; sha256="04fcjrr2pgzhcrp9jx70a99fsgvqf0724vj3p43kp8dlk95839h4"; depends=[doBy Matrix mcglm sjmisc stringr]; broken = true; }; htmltab = derive2 { name="htmltab"; version="0.8.2"; sha256="09hnf339f3hzll7a0shq615h9d6f6xqrcv0c9iid6575m5qsallf"; depends=[httr XML]; broken = true; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; broken = true; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; broken = true; }; hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.7.9"; sha256="0rvaxvkf72g7ycjpw579kd88p7gyldxcnlvhxijyddvwyx7d7kcy"; depends=[ada AUC doParallel e1071 FNN foreach genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; broken = true; }; + hyd1d = derive2 { name="hyd1d"; version="0.4.6"; sha256="0ikznysqbfx9rrxa87is3ycixf3q6fcvqqzih6d9khsqqz0xc5i4"; depends=[plotrix Rdpack RJSONIO]; broken = true; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; broken = true; }; + hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; broken = true; }; + hydroMOPSO = derive2 { name="hydroMOPSO"; version="0.1-3"; sha256="14yvsxzlzpisn5hqyqcq1fmqsbj96pqcgyhnj414mj366x6w5qxp"; depends=[hydroTSM lhs randtoolbox xts zoo]; broken = true; }; + hydroPSO = derive2 { name="hydroPSO"; version="0.5-1"; sha256="16gdv19yqla80s9fjmvahfn21jv62zivirzs5ch4zm9db54g6bry"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; broken = true; }; + hydroTSM = derive2 { name="hydroTSM"; version="0.6-0"; sha256="1msavd2k05apsky88zkk1l3c6y3v95fwhmr6xmwsap70bj25krsv"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; broken = true; }; hydrorecipes = derive2 { name="hydrorecipes"; version="0.0.3"; sha256="0if79msr8rn1ylk36sqa7maynz20v4y6q7h6xiqijlbnikm7n502"; depends=[dplyr earthtide fftw generics Rcpp RcppArmadillo RcppParallel recipes rlang tibble tidyr]; broken = true; }; hydroscoper = derive2 { name="hydroscoper"; version="1.4.1"; sha256="0jhvjmhcprjdjg6a54ic2f4kxfanpgwzzrkyyiggmj5jjg9yfhfw"; depends=[jsonlite pingr readr stringi stringr tibble]; broken = true; }; hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; broken = true; }; + hyperbrick = derive2 { name="hyperbrick"; version="1.0"; sha256="1a6l6dlylqm1dxz573rz5zqxn1nk85hcbfdxk0qwkr7z3yzl13c8"; depends=[caTools dfoptim OpenImageR pbapply raster rgdal]; broken = true; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; broken = true; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; broken = true; }; + iBATCGH = derive2 { name="iBATCGH"; version="1.3.1"; sha256="0xq4q4kc2f0whrxz1vmi2gca9pxqix2qm4sfkwbch85if2k8l8fj"; depends=[msm Rcpp RcppArmadillo]; broken = true; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; broken = true; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; broken = true; }; + iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; broken = true; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; broken = true; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; broken = true; }; iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; broken = true; }; + iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; broken = true; }; + iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; broken = true; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; broken = true; }; ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; broken = true; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; broken = true; }; icensBKL = derive2 { name="icensBKL"; version="1.4"; sha256="1233cpwc24p01zjzqivl1ddvndhiqwiyjgr8v1aqd3wwz9qqfg6s"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; broken = true; }; + iconr = derive2 { name="iconr"; version="0.1.0"; sha256="17q7zj92yrj49slmrpwkxkjd0imrl9ildms9zj8qx7yc7dcv4c1s"; depends=[igraph magick rgdal]; broken = true; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; broken = true; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; broken = true; }; ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; broken = true; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; broken = true; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; broken = true; }; ifultools = derive2 { name="ifultools"; version="2.0-26"; sha256="1lkmzrh65j6vdb8523axxk9gig5q4zxy08wiqsp16w482d2q2sl1"; depends=[MASS splus2R]; broken = true; }; - iheatmapr = derive2 { name="iheatmapr"; version="0.5.1"; sha256="1pwkwh7ljlpr6zyz6j8knpz3iw60xzkw8amc98x4pc2mw148jvzx"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; broken = true; }; iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; broken = true; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; broken = true; }; imfr = derive2 { name="imfr"; version="0.1.9.1"; sha256="1l1lvzvz9hsqwk60k2w8ry8mvgzj7wrd6ycfhgwv39xid9vk70g7"; depends=[dplyr httr jsonlite]; broken = true; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; broken = true; }; + imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; broken = true; }; imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; broken = true; }; incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; broken = true; }; + independence = derive2 { name="independence"; version="1.0.1"; sha256="0yln5wd8m5fgh4h7k80vq22byf06k4d6574zxyqcig63hls7v568"; depends=[Rcpp]; broken = true; }; individual = derive2 { name="individual"; version="0.1.7"; sha256="0by56qwxdgrb8f1x8d1yv5alf22m375a6gjcr3i31hvzn53ncc6w"; depends=[R6 Rcpp testthat]; broken = true; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; broken = true; }; informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; broken = true; }; @@ -21387,13 +21724,16 @@ in with self; { insol = derive2 { name="insol"; version="1.2.2"; sha256="166kgxgzbh55y2qqya6c2si22x0v7asi70im054g6xxwc5187kh3"; depends=[raster]; broken = true; }; intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; broken = true; }; intePareto = derive2 { name="intePareto"; version="0.1.2"; sha256="0shq97r6x4j7p9vcf855jcvmfhghngbhk5dfqlqqhhcf8ibm2si5"; depends=[biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; broken = true; }; + intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; broken = true; }; interacCircos = derive2 { name="interacCircos"; version="1.0.0"; sha256="1waj0saavvaw2qzhbwcj1k0a2dnmq7zbkdnmb93xj6j1lhfjhbdy"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; broken = true; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; broken = true; }; interplex = derive2 { name="interplex"; version="0.1.0"; sha256="04ylskk2i9pmidknz5wfwba87d710gycrw3p3d29nd2s433scrbk"; depends=[]; broken = true; }; + interpolation = derive2 { name="interpolation"; version="0.1.0"; sha256="12rxbpyi6hn2lijlxl3yaqp0fvxw3ipyk6x1hyl7dp3r8i5q4qy5"; depends=[BH Rcpp RcppCGAL]; broken = true; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; broken = true; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; broken = true; }; intsurvbin = derive2 { name="intsurvbin"; version="0.0.4"; sha256="119zjn1agl2j4fj4yg1pq1sqskzw93xfzppmc5n1x8llmfbxkqsj"; depends=[mgcv MHadaptive msm mvtnorm tmvtnorm]; broken = true; }; intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; broken = true; }; + invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; broken = true; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; broken = true; }; ipmisc = derive2 { name="ipmisc"; version="6.0.2"; sha256="1dn815p2k1v371pv5fra6541zwc1hyjzxlx11m8pgfcyrfgmicyk"; depends=[dplyr magrittr rlang tibble tidyr zeallot]; broken = true; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; broken = true; }; @@ -21406,7 +21746,6 @@ in with self; { isoreader = derive2 { name="isoreader"; version="1.3.2"; sha256="0d0h57imbis7g58gdn7j0pwmc1s71b8ymqwqkg3byagd0yhrxf0w"; depends=[dplyr future glue lubridate magrittr progress purrr R_utils readr rlang stringr tibble tidyr tidyselect UNF vctrs]; broken = true; }; isqg = derive2 { name="isqg"; version="1.4"; sha256="1p7n9y2j45drmmc3qdjvxjgwzdbz17z1i77vp166h5kk36n6fban"; depends=[BH R6 Rcpp Rdpack]; broken = true; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; broken = true; }; - itscalledsoccer = derive2 { name="itscalledsoccer"; version="0.2.2"; sha256="089zsqk5s1ny62jjgc77y64k0w47p81gd2606f3ys0qm1yl7bsfm"; depends=[clisymbols crayon data_table dplyr glue httpcache httr jsonlite magrittr R6 rlang stringi tidyr]; broken = true; }; iva = derive2 { name="iva"; version="0.1.0"; sha256="0dchb263ygilxapwsw2gpl18z12wcjsz8zz5fg7h068hmcysa88g"; depends=[Formula ucminf]; broken = true; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; broken = true; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; broken = true; }; @@ -21425,12 +21764,15 @@ in with self; { jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; broken = true; }; kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; broken = true; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; broken = true; }; + kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; broken = true; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; broken = true; }; kdtools = derive2 { name="kdtools"; version="0.6.0"; sha256="0y8sr3r7i8xjxzix5lfrgsq79vk97qvbjhxg87mwvhin9igjkzlf"; depends=[Rcpp]; broken = true; }; kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; broken = true; }; kerasR = derive2 { name="kerasR"; version="0.8.1"; sha256="0h278g3s6awbnq05n4fi80h80yrikybqccq23wzk3m08p5h9ay6f"; depends=[reticulate]; broken = true; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; broken = true; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; broken = true; }; + kernelPhil = derive2 { name="kernelPhil"; version="0.1"; sha256="0pzsknb0ibm3v0ibfaklb4g2mx7zrva4m29356cirwd29nmd8bqw"; depends=[benchmarkme directlabels dplyr ggplot2 gridExtra Hmisc pbapply reshape2 rgdal wordspace]; broken = true; }; + keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; broken = true; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; broken = true; }; kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; broken = true; }; kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; broken = true; }; @@ -21443,25 +21785,34 @@ in with self; { labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; broken = true; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; broken = true; }; landmap = derive2 { name="landmap"; version="0.0.13"; sha256="04pycbi0pf2n92xzs650h2dc8yzqfvaxn8m6yxqprf3y7qjgys9c"; depends=[forestError gdalUtils geoR glmnet kernlab maptools matrixStats mlr nnet parallelMap ParamHelpers plyr ranger raster rgdal rpart sp spdep xgboost]; broken = true; }; + landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; broken = true; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; broken = true; }; lass0 = derive2 { name="lass0"; version="1.1.0"; sha256="01fafgyhi3fw8ldjw2gf0z9w1si7il3ailwm197fxmw4wqgys9fl"; depends=[doRNG foreach ismev lpSolve]; broken = true; }; lasso2 = derive2 { name="lasso2"; version="1.2-22"; sha256="1l87djh539m444p5nl9975dd3v5nc7j8af9rj4xr54h5d0mbcbjv"; depends=[]; broken = true; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; broken = true; }; + latentFactoR = derive2 { name="latentFactoR"; version="0.0.4"; sha256="0kgzgympcfp6l4jysccrlxrbmqasz1v95wkmfsw8qgi7dzfsgywc"; depends=[BBmisc EGAnet fspe googledrive ineq Matrix mlr mvtnorm psych qgraph rstudioapi xgboost]; broken = true; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; broken = true; }; layer = derive2 { name="layer"; version="0.0.1"; sha256="0mmijkk4ppbmhlp6ah88a9v3iwdd9j6yw7ff8kk7p1iw63qkiyxi"; depends=[dplyr ggnewscale ggplot2 raster scico sf stars]; broken = true; }; + lazyNumbers = derive2 { name="lazyNumbers"; version="1.2.1"; sha256="0dc0j79cv7j3y04mpb2pp3qrjwhiv74rypl9yplwyr36z6fgl00l"; depends=[BH Rcpp RcppCGAL RcppEigen]; broken = true; }; lazygreedy = derive2 { name="lazygreedy"; version="1.0"; sha256="18q4hsls0yrmdcyd6ws4gcvvjdmipcaxprfk65j17jfxqgyzp2yf"; depends=[Rcpp RcppArmadillo]; broken = true; }; lazyraster = derive2 { name="lazyraster"; version="0.5.1"; sha256="1ryp0li6lrqs95h3zwc5lhq8b0mbfvpgcpbfcq6cxcjx63czk8ix"; depends=[quadmesh raster vapour]; broken = true; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; broken = true; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; broken = true; }; + ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; broken = true; }; leaflet_multiopacity = derive2 { name="leaflet.multiopacity"; version="0.1.1"; sha256="0ynbqjs4gdnjsygzwlczrirhazpq2gl9grzyxvnyl4jcpb3yg7y2"; depends=[htmltools htmlwidgets]; broken = true; }; + leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; broken = true; }; + leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; broken = true; }; leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; broken = true; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; broken = true; }; + leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; broken = true; }; legco = derive2 { name="legco"; version="0.1.4"; sha256="0fd1d2zf510lyrwclsy57d8lgqprk6p8c6ghxglgm6gbx9d2yrgg"; depends=[dplyr httr jsonlite]; broken = true; }; + lehdr = derive2 { name="lehdr"; version="1.1.1"; sha256="0sal2qh2rcl4mkdh9a9zy6ixxb99gax04ldawrp091kzwscng9yz"; depends=[dplyr glue httr rappdirs readr rlang stringr]; broken = true; }; letsR = derive2 { name="letsR"; version="4.0"; sha256="07l1wgwnkqnvh47ssg62vj88vgml52n0934w00pjxdk90kk3c5zs"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; broken = true; }; liGP = derive2 { name="liGP"; version="1.0.1"; sha256="01yhrzx67gz7j201mkv1aracrvjh4hxkrc7jn48cfwz0dp1lznws"; depends=[doParallel foreach hetGP laGP]; broken = true; }; libproj = derive2 { name="libproj"; version="8.1.0-1"; sha256="16mavs0kpbn1lskfgyzgw5ns270kdvvh2991c8w26cyl23zrcys6"; depends=[cpp11 rappdirs]; broken = true; }; libsoc = derive2 { name="libsoc"; version="0.7.3"; sha256="0baglknb67gmzr4cimlvz44f11np8glcdjdgs3jy8qlz0c8pm95p"; depends=[]; broken = true; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; broken = true; }; + lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; broken = true; }; likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; broken = true; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; broken = true; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; broken = true; }; @@ -21470,6 +21821,7 @@ in with self; { linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; broken = true; }; lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; broken = true; }; listdtr = derive2 { name="listdtr"; version="1.1"; sha256="13p27cx2w3qb1rcizrva2ib7x7sm310gasi7n5pvvd8rkpwaypzq"; depends=[ggplot2]; broken = true; }; + livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; broken = true; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; broken = true; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; broken = true; }; lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; broken = true; }; @@ -21477,11 +21829,10 @@ in with self; { lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; broken = true; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; broken = true; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; broken = true; }; - lmomPi = derive2 { name="lmomPi"; version="0.6.2"; sha256="0k1clrl3pbbnjaz1yp5syzdvy64zz1q1nd3xsbacwrl0q865xs3n"; depends=[lmom stringr]; broken = true; }; lmvar = derive2 { name="lmvar"; version="1.5.2"; sha256="0wrny8yzk5y4mzpri6xv5wibbnbaxm0195lcbk5jrl5l5gs99bn6"; depends=[Matrix matrixcalc maxLik]; broken = true; }; loadflux = derive2 { name="loadflux"; version="0.0.2"; sha256="08lbpd0nwwck36bkklmqx62lyj9p1ywwk80v1qx7f6zhgfjx8pj4"; depends=[dplyr dygraphs ggplot2 lubridate rlang tidyr tsibble xts zoo]; broken = true; }; + loadr = derive2 { name="loadr"; version="0.1.3"; sha256="01nsjsv7c8grsizfisczqwjrz5saff0pgn7716ig4i8nzargvz7a"; depends=[]; broken = true; }; logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; broken = true; }; - longclust = derive2 { name="longclust"; version="1.2.3"; sha256="1g45d5pak2vhbjrcmxxrk9jyrdxkqwy45phzpsw6b2bjyrgr4i7g"; depends=[]; broken = true; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; broken = true; }; loose_rock = derive2 { name="loose.rock"; version="1.2.0"; sha256="13p3mp8m2in3cbcwgj42hgzrwxmgalc2v0z3r1zn1n77iqjvcd7r"; depends=[digest dplyr futile_options ggplot2 httr MASS reshape2]; broken = true; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; broken = true; }; @@ -21489,8 +21840,10 @@ in with self; { lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; broken = true; }; lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; broken = true; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; broken = true; }; + lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; broken = true; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; broken = true; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; broken = true; }; + lvec = derive2 { name="lvec"; version="0.2.5"; sha256="12q486xvnfyga15yx8av56sflahcni2wm09rx8abj8yzkjgfdiva"; depends=[BH Rcpp]; broken = true; }; lvm4net = derive2 { name="lvm4net"; version="0.3"; sha256="1iq93mrdhymdixnk7y7rkibm3cqljl4y9qkjq4mzkcwcp4960y5q"; depends=[corpcor ellipse ergm glmmML igraph MASS mvtnorm network]; broken = true; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; broken = true; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; broken = true; }; @@ -21500,27 +21853,35 @@ in with self; { machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; broken = true; }; machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; broken = true; }; macroBiome = derive2 { name="macroBiome"; version="0.3.0"; sha256="0a4g3pp3g3iai8q8c1w230wldr0g788qcmfzc1qbmc5cnaxgs56r"; depends=[palinsol raster rworldxtra sp strex]; broken = true; }; + mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; broken = true; }; majesticR = derive2 { name="majesticR"; version="0.1.1"; sha256="0x23p4js9cfnj8c33cp0fql5pvs4fn4frbbzpq85mxjhiifkxxpf"; depends=[jsonlite urltools]; broken = true; }; + mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; broken = true; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; broken = true; }; maple = derive2 { name="maple"; version="0.99.5"; sha256="1cg7grvnrfzdqghlfv5bsii6ips3mykgaw85vx0z9jafhdfpd32f"; depends=[dbarts dplyr ggalluvial ggplot2 plotly rlang Seurat shiny spruce]; broken = true; }; - mapmisc = derive2 { name="mapmisc"; version="1.8.0"; sha256="0xp2ns6j8craz74jw4gjjhzkfbbihcy8d9dg1i08hiws743kzd8s"; depends=[raster sp]; broken = true; }; mapr = derive2 { name="mapr"; version="0.5.2"; sha256="0qc1zqa2yqgy777wbm6lj37vzaaxaz0gdimr62wv9fyddkbkshk4"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; broken = true; }; + maptools = derive2 { name="maptools"; version="1.1-8"; sha256="1xz0cqg629vz7mawwxx650mgmvh3wzn25rnxy4sij5jrypipk1ay"; depends=[foreign lattice sp]; broken = true; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; broken = true; }; + mason = derive2 { name="mason"; version="0.3.0"; sha256="1x5wiagb1sy5gkp0xkbr1jzhrjg1c2bqdh4hy6igwcnws2cbhxyr"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; broken = true; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; broken = true; }; + matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; broken = true; }; mathpix = derive2 { name="mathpix"; version="0.5.0"; sha256="0imd2rxzh3zndl3laa1fx3m90zr97l02y42s7dhi6b0g2m2lirz4"; depends=[base64enc httr magick purrr rstudioapi texPreview]; broken = true; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; broken = true; }; matrixpls = derive2 { name="matrixpls"; version="1.0.13"; sha256="0m9gqq5waicj3znlsyz50cj6w1x6rkvfwknavhxid8r4p9h891ak"; depends=[assertive lavaan MASS matrixcalc psych]; broken = true; }; maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; broken = true; }; maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; broken = true; }; + mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; broken = true; }; mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; broken = true; }; + mcBFtest = derive2 { name="mcBFtest"; version="0.1.0"; sha256="1fmn9pzbvk508ljspksppqxdvggx5bvipgs54nz9605y6p8zzmi5"; depends=[MASS]; broken = true; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; broken = true; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; broken = true; }; - mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; broken = true; }; + mcglm = derive2 { name="mcglm"; version="0.8.0"; sha256="04zl3y5zvms5n0s1mzsb8dm9g57l84zk16516kwni3gxmdkaq4sw"; depends=[assertthat Matrix Rcpp RcppArmadillo]; broken = true; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; broken = true; }; + mclcar = derive2 { name="mclcar"; version="0.2-0"; sha256="0zgf7ha22586nh1yzdnhz1rzrqkn6yzr12qva9ag297ry4z4bn5y"; depends=[fields maxLik nleqslv rsm spam spatialreg spdep]; broken = true; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; broken = true; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; broken = true; }; mdapack = derive2 { name="mdapack"; version="0.0.2"; sha256="1dfcjh8yax06m890ql0kc2rn539z4xbhw7bq9a8cbrm7jnkq03iq"; depends=[covr curl devtools FactoMineR ggplot2 gh git2r httr knitr mice openssl pkgbuild reshape2 rlang rmarkdown roxygen2 spelling testthat VIM]; broken = true; }; mdir = derive2 { name="mdir"; version="0.9.0"; sha256="0zc5dacyfv1vfr86cyhjrwcmd6pws6sm7pqsw00nlp7b77l1qms5"; depends=[ggplot2 Rcpp RcppArmadillo RcppParallel salso stringr testthat tidyr]; broken = true; }; + mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; broken = true; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; broken = true; }; meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; broken = true; }; medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; broken = true; }; @@ -21529,6 +21890,7 @@ in with self; { metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; broken = true; }; metaMix = derive2 { name="metaMix"; version="0.3"; sha256="17qkwg9iz5v63ybyvqppbf044l0pi0ym5pw283174dlx8lfac60q"; depends=[data_table ggplot2 gtools Matrix Rmpi]; broken = true; }; metabolighteR = derive2 { name="metabolighteR"; version="0.1.3"; sha256="0ip7cy40jndcwp8yc42pjzklv35dkxjd3pdlpwk0r0jngp7nbjim"; depends=[crayon dplyr httr magrittr purrr]; broken = true; }; + metabolomicsR = derive2 { name="metabolomicsR"; version="1.0.0"; sha256="0b12nddczh8i6hnv679pa521yps26n98j2cnai8s67xiw5ir0y5v"; depends=[data_table ggplot2 plotROC]; broken = true; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; broken = true; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; broken = true; }; mfbvar = derive2 { name="mfbvar"; version="0.5.6"; sha256="1wv46h6cr0xnvr8dxymx362skf7nf77yw84y6g48rj9mbq8kkkcj"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble zoo]; broken = true; }; @@ -21541,13 +21903,15 @@ in with self; { microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; broken = true; }; microservices = derive2 { name="microservices"; version="0.2.0"; sha256="1yrjjlqmmbbwjd34pm06d6v88b63m2mx37flaw4zpkqni6rsvmwq"; depends=[config desc dplyr fs glue purrr withr]; broken = true; }; migrbc = derive2 { name="migrbc"; version="2.0.9"; sha256="1nbxdm70a9lvbp4sw78719hdpbqnziw1y7r4xk8i390q2c195am1"; depends=[dplyr futile_logger lubridate Rcpp stringr]; broken = true; }; + mindr = derive2 { name="mindr"; version="1.3.2"; sha256="0nv3wripimpbi8zf1h8fkj80ibrzava36kcai9f1gl8frincafr9"; depends=[htmlwidgets knitr]; broken = true; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; broken = true; }; - minioclient = derive2 { name="minioclient"; version="0.0.4"; sha256="1ww0bhf5frz8dpqviz1s1kn1dfj9j62bhjz109kyqixpch92jqbd"; depends=[fs glue jsonlite processx]; broken = true; }; minval = derive2 { name="minval"; version="0.8-2"; sha256="06anbb90c8wg0374ykmb6chcwrcdyi903jkbrmrv3kgx511l699z"; depends=[]; broken = true; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; broken = true; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; broken = true; }; miraculix = derive2 { name="miraculix"; version="0.9.23"; sha256="0i08v5hq43296k3sa7akpq4h5dmvpkgn7cfpqwdyp0qaxkqk0k0s"; depends=[RandomFieldsUtils]; broken = true; }; miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; broken = true; }; + mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; broken = true; }; + misha = derive2 { name="misha"; version="4.2.6"; sha256="0ymgs43dksqzkz4507fywgqynr3xz3fvgkx0fz2bykca0658pv3q"; depends=[curl magrittr]; broken = true; }; mixComp = derive2 { name="mixComp"; version="0.1-2"; sha256="01zgf31mmnjnwwji9yadfhwa49xy4i3wf0f5glifmpnvmr6d7y1d"; depends=[boot cluster expm kdensity matrixcalc Rsolnp]; broken = true; }; mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; broken = true; }; mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; broken = true; }; @@ -21559,23 +21923,31 @@ in with self; { mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; broken = true; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; broken = true; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; broken = true; }; + mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; broken = true; }; + mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; broken = true; }; mlr3proba = derive2 { name="mlr3proba"; version="0.4.9"; sha256="1qhxwx881b482wp85chw0s9390kwyhq32bjr4rlpscb53ppqx6v5"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival survivalmodels]; broken = true; }; - mlstrOpalr = derive2 { name="mlstrOpalr"; version="1.0.1"; sha256="0jpvn3bdvsh187f4fwfmiwfjpvsspbk2jrg5hsd9krhpzl1pgpqx"; depends=[dplyr fabR madshapR opalr rlang stringr tidyr]; broken = true; }; mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; broken = true; }; mnj = derive2 { name="mnj"; version="1.0"; sha256="05rz6krcq56zqvvaz3myf1aki2z635g2zrqyl25n2da1cvyjwdzq"; depends=[rpart]; broken = true; }; mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; broken = true; }; + mnreadR = derive2 { name="mnreadR"; version="2.1.6"; sha256="0h0l05l8cgrdrk8sk60p2284kp2xz35cygzyhlk0h2x29zhw7bb7"; depends=[dplyr ggplot2 nlme tibble tidyr]; broken = true; }; mobsim = derive2 { name="mobsim"; version="0.2.0"; sha256="0an8j5kj0cs1bjz9kwzwc54hm0zaiz5rsaw78ihldw0mx5n175gn"; depends=[Rcpp sads vegan]; broken = true; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; broken = true; }; + modchart = derive2 { name="modchart"; version="0.5"; sha256="1mn8zywqhxhvy0k6mn0jsn90g9yb6sxyv34syzzxrxs2kdzx5szg"; depends=[collapsibleTree dplyr DT dygraphs highcharter htmlwidgets jsonlite lazyeval leaflet magrittr networkD3 plotly RColorBrewer rgdal shiny shinyBS shinydashboard shinydashboardPlus sp sparkline sunburstR treemap]; broken = true; }; modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; broken = true; }; modelROC = derive2 { name="modelROC"; version="1.0"; sha256="0iyx7c98ym7dy6pfssj7474h9wjpzjwy0fyc5bnqyi1lmjgd508k"; depends=[do ggplot2 ROCit survivalROC tmcn]; broken = true; }; modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; broken = true; }; + modelplotr = derive2 { name="modelplotr"; version="1.1.0"; sha256="0i1ssfcyl97zaxc9khdngrmsq9ydrmgv2nd7c6kc6i9z93jbkk4k"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; broken = true; }; modeltime_gluonts = derive2 { name="modeltime.gluonts"; version="0.1.0"; sha256="1nivqpdyr2s6q70bixna0a18gbhrf1r20vm0gj8b51idjignwpp7"; depends=[dplyr forcats fs glue magrittr modeltime parsnip purrr reticulate rlang stringr tibble tidyr timetk]; broken = true; }; modeltime_h2o = derive2 { name="modeltime.h2o"; version="0.1.1"; sha256="0rg7ha1zy0a1fbwrljsglfnfgkl747hjga8xajlzyrczhrmh4vnk"; depends=[dplyr fs glue h2o magrittr modeltime parsnip purrr rlang stringr tibble tidyr timetk]; broken = true; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; broken = true; }; + modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; broken = true; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; broken = true; }; molic = derive2 { name="molic"; version="2.0.3"; sha256="1qgb63wl5726mypv0f07wcf3aznl93vh045ghx66hiqj3kzfir2b"; depends=[doParallel ess foreach ggplot2 ggridges Rcpp]; broken = true; }; + momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; broken = true; }; + monographaR = derive2 { name="monographaR"; version="1.2.1"; sha256="09fkcw13h7dx7j5vyp48fk6yzv9n64568zf2zvmm2c008jw3gkbm"; depends=[circular maptools png raster rmarkdown sp]; broken = true; }; mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; broken = true; }; morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; broken = true; }; + mortyr = derive2 { name="mortyr"; version="0.0.2"; sha256="0flihmkzw8dypp2ijq22cd3rka6h8cd1qdyr4zrs9cv5335nddmk"; depends=[httr jsonlite tibble]; broken = true; }; mosaic_find = derive2 { name="mosaic.find"; version="0.1.2"; sha256="1fzgksh8sp701qjfrvjl2bg967qjkjpilxsfkrazhw71cgmzjgjl"; depends=[minpack_lm]; broken = true; }; mosmafs = derive2 { name="mosmafs"; version="0.1.2-1"; sha256="0xv9gf85d2fy9xdiik2dqd44xygsr6yr8fvmqkak1bpxnrkkb4hl"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; broken = true; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; broken = true; }; @@ -21589,18 +21961,20 @@ in with self; { mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; broken = true; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; broken = true; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; broken = true; }; + msaeDB = derive2 { name="msaeDB"; version="0.2.1"; sha256="0ccvg41d28qjbknhsamw95nq8fdibmz03pwblddkqywfl5yarii3"; depends=[magic MASS]; broken = true; }; msaeOB = derive2 { name="msaeOB"; version="0.1.0"; sha256="05m6r5jk21l9d2j546h7vf8caic83nm0y55zfamr94z4q221486x"; depends=[abind magic MASS Matrix]; broken = true; }; msaeRB = derive2 { name="msaeRB"; version="0.2.1"; sha256="0mpyirvaflmp6gc35kbz1rw5ydxxdgfji3j9c8hjrjqz6759birb"; depends=[abind magic MASS Matrix]; broken = true; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; broken = true; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; broken = true; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; broken = true; }; mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; broken = true; }; + muHVT = derive2 { name="muHVT"; version="3.0.0"; sha256="0a963dhzzirv03pq9hlzyq5alcj224ci55jyn7bsmn06lpl13gk3"; depends=[cluster conf_design deldir dplyr ggplot2 Hmisc magrittr MASS plyr polyclip purrr reshape2 rgeos scales sp splancs tidyr]; broken = true; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; broken = true; }; + mudata2 = derive2 { name="mudata2"; version="1.1.3"; sha256="0gqdqdp370gbvmqr5gxgc6xnwb6lsm4wzd2xrq3x9s46nx3zaha3"; depends=[dplyr fs glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; broken = true; }; mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; broken = true; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; broken = true; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; broken = true; }; multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; broken = true; }; - multibiasmeta = derive2 { name="multibiasmeta"; version="0.1.0"; sha256="1f17qdfqq0l2rivd48hs9gsgca8swvza8q9m1hwxcmpswa4spjy5"; depends=[dplyr EValue metabias metafor purrr Rdpack rlang robumeta]; broken = true; }; multicolor = derive2 { name="multicolor"; version="0.1.7"; sha256="0sqrxrggv2gjiq2s5bh9r0mx4yd3zpldzbnwwhv6pm4qypkragn5"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; broken = true; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; broken = true; }; multicross = derive2 { name="multicross"; version="2.1.0"; sha256="17hk03wsms9ij6hp6dw77cvvngdb5i66is6pcl1q21pyp327zqi6"; depends=[crossmatch MASS Matrix nbpMatching]; broken = true; }; @@ -21613,23 +21987,21 @@ in with self; { mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; broken = true; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; broken = true; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; broken = true; }; - mvPot = derive2 { name="mvPot"; version="0.1.5"; sha256="18kzlz42ridmwjrai6f598vvhmvk7gwyp869qjqclbf9jpc1xlcx"; depends=[evd gmp MASS numbers]; broken = true; }; mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; broken = true; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; broken = true; }; - mvpd = derive2 { name="mvpd"; version="0.0.3"; sha256="1vhvj5297lh1r2n3633g91phjnllp2sbk9qxhaljlslpld4893bc"; depends=[cubature libstableR Matrix matrixStats mvtnorm stabledist]; broken = true; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; broken = true; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; broken = true; }; mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; broken = true; }; mwaved = derive2 { name="mwaved"; version="1.1.8"; sha256="092sqd9harx289bgghw9x495llzhab0vkgkjka5jhi4ad1rfk3vh"; depends=[Rcpp shiny]; broken = true; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; broken = true; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; broken = true; }; + nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; broken = true; }; nCal = derive2 { name="nCal"; version="2021.9-12"; sha256="133dpy2rp8sabwdlk0wjxs9rzixzcja73im94qaw26z5xsnaydhf"; depends=[drc gdata gWidgets2 kyotil]; broken = true; }; nCov2019 = derive2 { name="nCov2019"; version="0.4.6"; sha256="00jwywvb4prypn7cvwd1fb29jffvzdmg18axnl9ncncr0xjmvgx3"; depends=[downloader ggplot2 jsonlite RColorBrewer]; broken = true; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; broken = true; }; nVennR = derive2 { name="nVennR"; version="0.2.3"; sha256="035gblc8427v0vq288rib3jfpz5fmcpvqg6nfaijwmbkz3gd41b6"; depends=[Rcpp]; broken = true; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; broken = true; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; broken = true; }; - naryn = derive2 { name="naryn"; version="2.6.14"; sha256="17a46jk98n67jgvr2dc01v9kpbsrhrbn3qpm23hf68dxjgfwnkx5"; depends=[dplyr glue lifecycle magrittr purrr stringr tidyr]; broken = true; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; broken = true; }; ndvtest = derive2 { name="ndvtest"; version="1.0-0"; sha256="15jqh58n63g2vr919z10d5ryhvk7325bv4gmd2xgdpi76p2dbyg0"; depends=[CompQuadForm nonnest2 Rdpack sandwich]; broken = true; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; broken = true; }; @@ -21641,8 +22013,9 @@ in with self; { networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; broken = true; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; broken = true; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; broken = true; }; - nevada = derive2 { name="nevada"; version="0.1.0"; sha256="0z1wi3769204cgi6hk13nnm6z6nx3dlx334mbs13r7p5rhmf794g"; depends=[cli dplyr flipr forcats ggplot2 igraph magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr withr]; broken = true; }; + nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; broken = true; }; nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; broken = true; }; + nlaR = derive2 { name="nlaR"; version="0.4.1"; sha256="11f2ka3fi74bkf0izzc17w2h8v3ngdxhy6m0fjv1wjrbby2cqh8g"; depends=[rappdirs]; broken = true; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; broken = true; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; broken = true; }; nlmixr = derive2 { name="nlmixr"; version="2.0.7"; sha256="1fqshr8y9rrkbnvcrpk0m12gimd1m0lrc2cl8x1x78hnhfs4dvlb"; depends=[backports BH brew dparser fastGHQuad ggplot2 lbfgsb3c magrittr Matrix minqa n1qn1 nlme Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders symengine]; broken = true; }; @@ -21653,6 +22026,7 @@ in with self; { nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; broken = true; }; nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; broken = true; }; nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; broken = true; }; + norm2 = derive2 { name="norm2"; version="2.0.4"; sha256="0ahz6x59k00pqalzjc3ajiby1ysmarjssga9amwh9vd6vmzzyfb7"; depends=[]; broken = true; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; broken = true; }; normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; broken = true; }; nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; broken = true; }; @@ -21661,11 +22035,12 @@ in with self; { nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; broken = true; }; npm = derive2 { name="npm"; version="1.0.0"; sha256="01v913ylsh895yxkkpyviplcxcc3c90znccvjp7wbflmxxnvrasd"; depends=[assertthat cli crayon erratum]; broken = true; }; nprcgenekeepr = derive2 { name="nprcgenekeepr"; version="1.0.5"; sha256="1j6pfc694yf1m42a0fhlbh5wdbmgs61fswbw7083h69d2sr2zq05"; depends=[anytime futile_logger htmlTable lubridate Matrix plotrix readxl Rlabkey rlang shiny stringi WriteXLS]; broken = true; }; + npsp = derive2 { name="npsp"; version="0.7-11"; sha256="17nadnxwp8jm68sqsa4yvhbllw0p8csicsipi7mdw9gfx0cc5dzx"; depends=[quadprog sp spam]; broken = true; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; broken = true; }; + nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; broken = true; }; nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; broken = true; }; nsdr = derive2 { name="nsdr"; version="0.1.1"; sha256="1p73aj465lk52n3dikkqi54zm2f9v00ikpmry10p42qhfkgrw61l"; depends=[]; broken = true; }; nse2r = derive2 { name="nse2r"; version="0.1.6"; sha256="0b7ll490xf8r4787qkaz01z3djc7dzgzqg3w4nmmrnrfv36mkybf"; depends=[jsonlite magrittr yahoofinancer]; broken = true; }; - nser = derive2 { name="nser"; version="1.4.5"; sha256="1zbmryi32ky06wqb42rncc72vr7c7753hii6w2dsnby9fjm75yw2"; depends=[curl dplyr googleVis jsonlite lubridate magrittr purrr readr RSelenium rvest stringr]; broken = true; }; nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; broken = true; }; nsrr = derive2 { name="nsrr"; version="0.2.0"; sha256="1x1c7pvyfvzmaymxcz6ghr5002wz48796c3hsihwbx6951w623sq"; depends=[digest httr jsonlite]; broken = true; }; ntwk = derive2 { name="ntwk"; version="1.0.0"; sha256="1c12c3pq992f02z3ikx17zv2djq9d9ly232ha0j5jswsksqzx024"; depends=[assertthat copCAR ghyp Matrix mvtnorm pracma zoo]; broken = true; }; @@ -21674,12 +22049,15 @@ in with self; { obliqueRF = derive2 { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; broken = true; }; obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; broken = true; }; occTest = derive2 { name="occTest"; version="0.1.1"; sha256="11dqkah6z50zbxiyniv4f2f0n742gmgzqdaarvc17vn750b6b595"; depends=[alphahull biogeo CoordinateCleaner countrycode data_table dataPreparation dplyr DT ggplot2 Matrix outliers pingr plyr raster rgbif rgdal rgeos rnaturalearth rnaturalearthdata sf sp spocc stringr svMisc tictoc tidyverse]; broken = true; }; + occUncertain = derive2 { name="occUncertain"; version="0.1.0"; sha256="0rlcwiy45kx9168g7bf1hkz9rkbpfgn7b085lzksg97f05hij52z"; depends=[ConR knitr rgdal]; broken = true; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; broken = true; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; broken = true; }; + omopr = derive2 { name="omopr"; version="0.2"; sha256="1ng94jnarj7pszxzvdlnrr2dbcvv5p5yrscjw6ihqkskpraw9f7w"; depends=[DBI dbplyr dplyr RSQLite]; broken = true; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; broken = true; }; onepass = derive2 { name="onepass"; version="0.1.2"; sha256="1r8wk00aqc0sc7l6mmy1k4hkijfikynysrx5vvahbd6mlcdb3bmp"; depends=[jsonlite]; broken = true; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; broken = true; }; oops = derive2 { name="oops"; version="0.2.0"; sha256="0xg69riqphvsqqa953v4mlcakvl0invf29678nrljibg31n4wak5"; depends=[]; broken = true; }; + openSTARS = derive2 { name="openSTARS"; version="1.2.3"; sha256="1xpba5bagq16n1k94izshdizqyx99mad1nx2w77ljznmx5qrpqa6"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; broken = true; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; broken = true; }; opentimsr = derive2 { name="opentimsr"; version="1.0.13"; sha256="0m4xp70cq4h76r4qk7krn5p9w3xv44z5lrkpys7kbvxr38g5y0il"; depends=[DBI Rcpp RSQLite]; broken = true; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; broken = true; }; @@ -21702,6 +22080,7 @@ in with self; { owidR = derive2 { name="owidR"; version="1.4.1"; sha256="0m0nzm3582p996hjs951vmssvhc35dwiw8520b61qs05bxfiiwkj"; depends=[curl dplyr forcats ggplot2 ggrepel htmltools httr jsonlite leaflet lifecycle magrittr purrr readr rlang rvest scales sf stringr xml2]; broken = true; }; oxcgrt = derive2 { name="oxcgrt"; version="0.1.0"; sha256="006kdggqdy7nkllln5p7fsapmmn5wlampyw2ifc4ls9jbz0p5h16"; depends=[countrycode dplyr jsonlite magrittr stringr tibble tidyr]; broken = true; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; broken = true; }; + pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; broken = true; }; pacbpred = derive2 { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; broken = true; }; packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; broken = true; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; broken = true; }; @@ -21710,13 +22089,16 @@ in with self; { pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; broken = true; }; pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="3.1.6"; sha256="0aiq8gr33pr5lia6cf6ak7zy5z81am5j5a0py0a2m9ljgmsgmn4s"; depends=[BayesFactor dplyr insight ipmisc parameters PMCMRplus purrr rlang WRS2]; broken = true; }; paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; broken = true; }; + paleobioDB = derive2 { name="paleobioDB"; version="0.7.0"; sha256="0hgf0ns4mp2war254ysb9rcm4kij1d3xrwkr4s4n2h5in8dz23iq"; depends=[gtools maps plyr raster RCurl rjson scales]; broken = true; }; paleofire = derive2 { name="paleofire"; version="1.2.4"; sha256="1vgai4my6kl0fldghp6a1qr8xhxiyw137kd80d0zir6q47nlnc2x"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; broken = true; }; - paleopop = derive2 { name="paleopop"; version="2.1.4"; sha256="1lddn51xxv148www1zymz6m7d2ywz0hyigawidzbqhf92n87hmw6"; depends=[poems R6 sf trend]; broken = true; }; + palmid = derive2 { name="palmid"; version="0.0.3"; sha256="0bh0p7alcbqkingxbg8gai7bch2cv8q90sfw92y7vj857nl09fh7"; depends=[DBI dbplyr downloadthis dplyr DT ggExtra ggplot2 ggplotify ggwordcloud gridExtra htmltools htmlwidgets leaflet plotly rmarkdown RPostgreSQL scales viridisLite]; broken = true; }; + pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; broken = true; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; broken = true; }; - panelr = derive2 { name="panelr"; version="0.7.7"; sha256="0w3kzh2r6qshh1dmjafd5q92x26rc027mcm0vk570l4l39w05fpq"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble tidyr]; broken = true; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; broken = true; }; + parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; broken = true; }; param6 = derive2 { name="param6"; version="0.2.4"; sha256="0h4r2l670zvsbq0cakbm7f5yc0ghaf40kby80q3ql8lwgfnay1jd"; depends=[checkmate data_table dictionar6 R6 set6]; broken = true; }; parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; broken = true; }; + parcats = derive2 { name="parcats"; version="0.0.4"; sha256="1dqkkmwfvpz5lkskii1z3lx2xw2jy3rhh2skrg7mc8kv8z3m9i2h"; depends=[dplyr easyalluvial forcats htmlwidgets magrittr purrr stringr tibble tidyr]; broken = true; }; parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; broken = true; }; partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; broken = true; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; broken = true; }; @@ -21730,31 +22112,39 @@ in with self; { pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; broken = true; }; pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; broken = true; }; pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; broken = true; }; + pbixr = derive2 { name="pbixr"; version="0.1.4"; sha256="098fwmar56l8w5r58grirqypdmc2c4hil7bi11z18llja62fncnw"; depends=[dplyr formatR jsonlite stringr textclean xml2 zip]; broken = true; }; pca3d = derive2 { name="pca3d"; version="0.10.2"; sha256="0xpln78zdh6q7xff6pj2jaq2kafrijmlikmpnsfar2fzgkaw7jx6"; depends=[ellipse rgl]; broken = true; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; broken = true; }; pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; broken = true; }; + peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; broken = true; }; peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; broken = true; }; - pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; broken = true; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; broken = true; }; + pepr = derive2 { name="pepr"; version="0.4.0"; sha256="0mnigx4lpl397k526sxp7ckrnp59hfrnm9gqcq0nx6j5d7379sp9"; depends=[data_table pryr stringr yaml]; broken = true; }; perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; broken = true; }; + perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; broken = true; }; permGPU = derive2 { name="permGPU"; version="0.15"; sha256="1bxydc5dw7ka45k6ban35d5xb1dw9yq9480qns8b39cc0x3acmhc"; depends=[Biobase foreach RUnit survival]; broken = true; }; + persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; broken = true; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; broken = true; }; + pexm = derive2 { name="pexm"; version="1.1.2"; sha256="1asw7z2dr9bqsxzfjyj0hf1zfym743315597ds2h3xvwwvsirwzj"; depends=[coda msm rjags]; broken = true; }; pfocal = derive2 { name="pfocal"; version="1.0.0"; sha256="1flpzwv66q5rx6y2irck589svx7kmrcbymb6pn5s7p269skxh0p4"; depends=[Rcpp]; broken = true; }; ph2rand = derive2 { name="ph2rand"; version="0.1.0"; sha256="0k6azygcvzkirjx3vpx6kbhax1yai8r467kmmnvhh3p0v46mc5zp"; depends=[dplyr ggplot2 Rcpp scales tibble tidyr]; broken = true; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; broken = true; }; phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; broken = true; }; physx = derive2 { name="physx"; version="1.0"; sha256="1b6bx08jzfg4pxicawkn013bqrvqkp19pigxl3iwjrqclvi8mx73"; depends=[celestial cubature data_table docore MASS pracma Rcpp]; broken = true; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; broken = true; }; - piglet = derive2 { name="piglet"; version="1.0.0"; sha256="0nszn3iq0ccpga3kj97s8h349v0g5422jgrdi8pckv89chzvm858"; depends=[alakazam Biostrings circlize data_table DECIPHER dendextend dplyr ggplot2 jsonlite magrittr R6 RColorBrewer rlang splitstackshape tigger zen4R]; broken = true; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; broken = true; }; pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; broken = true; }; pipenostics = derive2 { name="pipenostics"; version="0.1.7"; sha256="0c0qnh8kjgnmsg8arj7jhpdyjcdm58j9lzwi0yvl7ygk4k2klgv3"; depends=[checkmate]; broken = true; }; + pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; broken = true; }; plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; broken = true; }; + places = derive2 { name="places"; version="0.1.1"; sha256="08w6z5gbsskcbi5j1rml9mi9qdab6w2q58vz80h6xc6bh6mr0fab"; depends=[data_table dplyr geosphere googleway hms rgdal rlang sp stringr tidyr]; broken = true; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; broken = true; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; broken = true; }; plot3logit = derive2 { name="plot3logit"; version="3.1.3"; sha256="0p12xm7i9319h3rx732vh49gzz3f817mdwkp4y8ha6f7pf2fjwz8"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack stringr Ternary tibble tidyr tidyselect]; broken = true; }; + plotKML = derive2 { name="plotKML"; version="0.8-3"; sha256="093nbh2558pmca0vaq1xf5gyfy4p60fzgpkx8hyxifj99zvym50j"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plyr raster RColorBrewer rgdal scales sf sp spacetime stars stringr XML zoo]; broken = true; }; plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; broken = true; }; plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; broken = true; }; + plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; broken = true; }; pm4py = derive2 { name="pm4py"; version="1.2.7"; sha256="11xbsmsc9pxd98fy28l3nxzhb6c2pwvh1gmm34jnqn0rjbpb2n9i"; depends=[bupaR petrinetR purrr reticulate stringr]; broken = true; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; broken = true; }; pmdplyr = derive2 { name="pmdplyr"; version="0.3.3"; sha256="1grnqqydi84hnig1522lv4xbh9ds32wnq7sha7jn1q4186wlz1qa"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; broken = true; }; @@ -21762,12 +22152,14 @@ in with self; { pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; broken = true; }; pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; broken = true; }; podr = derive2 { name="podr"; version="0.0.5"; sha256="135nq0dw1x6ngf6mxy3yds3xsxhaf5rnv1cmhavlrklhdfygc0a4"; depends=[assertthat DBI dplyr lubridate magrittr odbc plogr RPostgres rstudioapi shiny stringr tibble]; broken = true; }; - poems = derive2 { name="poems"; version="1.0.4"; sha256="1z7hbj7rmifw5r7jqriibzddmhvnj143gvc9lbfkbmkrphl9p9jn"; depends=[abc doParallel foreach gdistance geosphere lhs metRology R6 raster trend]; broken = true; }; + poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; broken = true; }; polyPK = derive2 { name="polyPK"; version="3.1.0"; sha256="0cb83sq8iz4swr73vwhh8n4k62p6321nsy1sz5fba0wiicycxf55"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls sqldf xlsx]; broken = true; }; + polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; broken = true; }; polyglot = derive2 { name="polyglot"; version="0.3.0"; sha256="1mmmdqaq882qys41lmm009ncg9s9h5x1q8psv0v3pwpar0d7vgff"; depends=[magick pins]; broken = true; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; broken = true; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; broken = true; }; popRF = derive2 { name="popRF"; version="1.0.0"; sha256="0w3w1ffyy5b8glviib7ryjqzhmfp5aw6am3z8qpvis6l745p7vgh"; depends=[doParallel foreach gdalUtils plyr quantregForest randomForest raster]; broken = true; }; + popsom = derive2 { name="popsom"; version="6.0"; sha256="1zjg55fs4j36rp75k0961pndjqd4w085lc7v83nprjpc7jnx45g6"; depends=[fields ggplot2 hash]; broken = true; }; postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; broken = true; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.1"; sha256="0ah6n3wpjiwyh0mancqqpvyknx25dxr13p0nqnrfzmhfwyaywar0"; depends=[dplyr httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; broken = true; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; broken = true; }; @@ -21777,7 +22169,6 @@ in with self; { praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; broken = true; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; broken = true; }; presser = derive2 { name="presser"; version="1.1.0"; sha256="1slkdfh0wq242adp6a60612sjz117bii3pbahn00bfmnpa9g1wya"; depends=[]; broken = true; }; - prettyglm = derive2 { name="prettyglm"; version="1.0.0"; sha256="1ccq5l3m4q1h44pdgk00avch0kldr00632n681dlw8wkdgb0x8wf"; depends=[broom car dplyr forcats kableExtra knitr plotly RColorBrewer stringr tibble tidycat tidyr tidyselect vip]; broken = true; }; prewas = derive2 { name="prewas"; version="1.1.1"; sha256="16dpwpks0sqfq7pdhbpipb8hnm2viic2dnz1g7v86ar51z8db4xk"; depends=[ape future future_apply phangorn vcfR]; broken = true; }; prider = derive2 { name="prider"; version="1.0.4"; sha256="0sinaav8vwdd9aqgpnclah6kyw0r7afr39kz1ms9w8r6sya62q5g"; depends=[blaster dplyr gplots magrittr purrr Rcpp stringr tibble tidyr]; broken = true; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; broken = true; }; @@ -21792,30 +22183,39 @@ in with self; { proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; broken = true; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; broken = true; }; protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; broken = true; }; + psda = derive2 { name="psda"; version="1.4.0"; sha256="0if42szf0gkgdl7d02x43i0fdb6hp47j918vx06aw7qcw6a8j3k2"; depends=[ggplot2 plyr raster rgeos sp]; broken = true; }; pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; broken = true; }; + psr = derive2 { name="psr"; version="0.1.0"; sha256="0lnszaspilk88hmdjbgid7nh0zrpc57mymchva4kqc3cpckw247a"; depends=[dplyr psych tidyr]; broken = true; }; psre = derive2 { name="psre"; version="0.1.2"; sha256="0xk8aigj8x3skg5ikrbpmfh3gfw0yd3gn0xlpwjgkhhj706jvri3"; depends=[boot car cowplot DAMisc dplyr fANCOVA ggplot2 ggrepel lawstat magrittr MASS metap mgcv multcomp nortest rlang sm tibble tidyr]; broken = true; }; + psrwe = derive2 { name="psrwe"; version="3.1"; sha256="0gmsh0294jzazxw4ss6jys92dckgfh4fqirfcdi3pzr6a7nnam8s"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders survival]; broken = true; }; pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; broken = true; }; + psychtm = derive2 { name="psychtm"; version="2021.1.0"; sha256="1qx3ks23wyi7c53p05jq2w18qz0kym0j43japz9sgj6zyh0c5649"; depends=[coda label_switching Rcpp RcppArmadillo RcppProgress rlang tibble]; broken = true; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; broken = true; }; psyosphere = derive2 { name="psyosphere"; version="0.1.6"; sha256="1hcas3jk2n11lyw1ysmci0sysxf7qg9h2msqqg7q9nqp5gbf90np"; depends=[geosphere ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; broken = true; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; broken = true; }; + ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; broken = true; }; pubchunks = derive2 { name="pubchunks"; version="0.3.0"; sha256="14jzl0ra0d68s246a9jhfgp1wyy9g7d0rzahvl97crkklld1crvx"; depends=[data_table rcrossref xml2]; broken = true; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; broken = true; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; broken = true; }; + qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; broken = true; }; qmix = derive2 { name="qmix"; version="0.1.2.0"; sha256="172lhvj7adphxq9gws2i9lysc9bj1wpk60f4hf2h5sisnli15v0x"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; broken = true; }; qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; broken = true; }; qqr = derive2 { name="qqr"; version="0.0.1"; sha256="1vi4nbm356vahm4hnvy686nysbn4n63p9cjd4i9dm73lhsf9ilmn"; depends=[dplyr rvest stringr tidyverse xml2]; broken = true; }; + qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; broken = true; }; qrandom = derive2 { name="qrandom"; version="1.2.6"; sha256="00s2c3f9ji27drfyz674bszq1a7xxx8mx0m9g5vrzk9hbm1kcsfj"; depends=[curl jsonlite Rmpfr]; broken = true; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; broken = true; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; broken = true; }; - quadtree = derive2 { name="quadtree"; version="0.1.10"; sha256="07n5fllbgd9n36hra373fbvwav43w6wil5iabncah4x6a49a5aha"; depends=[raster Rcpp]; broken = true; }; + qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; broken = true; }; qualypsoss = derive2 { name="qualypsoss"; version="1.1.1"; sha256="1kcdmbj0wyycp7i4d3hb1addnl1c7ndkc6qnbnds0vcfk1dfxd8h"; depends=[doParallel foreach ggthemes MASS mvtnorm QUALYPSO]; broken = true; }; quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; broken = true; }; quickerstats = derive2 { name="quickerstats"; version="0.0.1"; sha256="0jlczz042701p6j4m60k425m9x3q88m27mmf62ngz80dylcl2fdx"; depends=[curl httr readr tibble]; broken = true; }; + quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; broken = true; }; quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; broken = true; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; broken = true; }; r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; broken = true; }; rAltmetric = derive2 { name="rAltmetric"; version="0.7.0"; sha256="1vbvjv273vg3pi30vxxa2bivlajfsbqrzflk3payp6ym9myi27mg"; depends=[httr jsonlite rlist]; broken = true; }; rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; broken = true; }; + rCAT = derive2 { name="rCAT"; version="0.1.6"; sha256="09jyjjbhpm44wrism3zgg56m01yimlcm3xks8g0cq36lsrclcigp"; depends=[pracma rgdal sp]; broken = true; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; broken = true; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; broken = true; }; rDppDiversity = derive2 { name="rDppDiversity"; version="0.0.2"; sha256="0833v5wkamqipfxpsdxz040q6vlgg9qqpwiaivvh8ar5sci10v88"; depends=[Rcpp]; broken = true; }; @@ -21831,6 +22231,8 @@ in with self; { rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; broken = true; }; rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; broken = true; }; rKolada = derive2 { name="rKolada"; version="0.2.1"; sha256="1c1ci6dn3yqgp7qm1fih8dlq67dpbc1wlxhzcrzs0zzign47vgvd"; depends=[dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr urltools]; broken = true; }; + rLiDAR = derive2 { name="rLiDAR"; version="0.1.5"; sha256="0sw79zr7hdwprlwijlg6qmn7pmpcnhxfr7ycdz09058c0kd815h8"; depends=[bitops deldir geometry plyr raster rgeos rgl sp spatstat_geom]; broken = true; }; + rMisbeta = derive2 { name="rMisbeta"; version="1.0"; sha256="1h4vilnndl0gnz9z0sgbywp4zy44718zpiqcqigbjbd4lymi0y61"; depends=[ROC]; broken = true; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; broken = true; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; broken = true; }; rRofex = derive2 { name="rRofex"; version="2.0.6"; sha256="0yg3bxadgmn5d7bljzn9bjzy833lfi6bwz24z52f8qcbm1nqchgb"; depends=[dplyr glue httr jsonlite later lifecycle magrittr purrr rlang tibble tidyr websocket]; broken = true; }; @@ -21847,7 +22249,6 @@ in with self; { ranlip = derive2 { name="ranlip"; version="1.0.1"; sha256="04jh7m8gmz0b4h507amnj708sg5qf4fzawybss01681hsnb3swnz"; depends=[Rcpp]; broken = true; }; rapbase = derive2 { name="rapbase"; version="1.24.2"; sha256="1fllkd5cp09759jfybls331jlkc6yxh6bp1wlizq949scbgj9j23"; depends=[blob bookdown DBI digest dplyr DT jsonlite kableExtra knitr magrittr readr rlang RMariaDB rmarkdown rpivotTable sendmailR shiny shinyalert sship yaml]; broken = true; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; broken = true; }; - rasterList = derive2 { name="rasterList"; version="0.5.17"; sha256="14ylmwylr55wjc7sg3wdni0wzvi0makgjj8v0ir06aw5p62ivp42"; depends=[raster]; broken = true; }; rasterly = derive2 { name="rasterly"; version="0.2.0"; sha256="1fv0ayh8r78qss7ikcwnj0i5x8iyz4c3icsfb554zji9bw30x7qr"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; broken = true; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; broken = true; }; rawr = derive2 { name="rawr"; version="0.1.3"; sha256="0k0x1pmxs73j6dmjg33n4hhwjwzpnhzbmmmjza6kw7hj6lfmipx4"; depends=[clipr dplyr jsonlite rvest stringr xml2]; broken = true; }; @@ -21859,6 +22260,7 @@ in with self; { rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; broken = true; }; rcage = derive2 { name="rcage"; version="1.2"; sha256="1xa9hdzl3dkrhzjp3bng9pxip9c0crr6zh6iq5916h78nm5k7bir"; depends=[ClustGeo ff fields ggplot2 gridExtra LaplacesDemon MASS Matrix pracma raster rgeos rlang sf sp]; broken = true; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; broken = true; }; + rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; broken = true; }; rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; broken = true; }; rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; broken = true; }; rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; broken = true; }; @@ -21870,16 +22272,20 @@ in with self; { rdaemon = derive2 { name="rdaemon"; version="1.0.6"; sha256="1qr6v7kgk9nd5qp96667x51331xmpp1yz1r190dgd1fqigw735s5"; depends=[base64enc futile_logger Rcpp]; broken = true; }; rdddr = derive2 { name="rdddr"; version="1.0.0"; sha256="0biq1nxfhkbmay70hfp5yg6zakzcdr7rp0x2zpmyq200cwyyr6lm"; depends=[broom dataverse DeclareDesign dplyr estimatr fabricatr generics ggplot2 prediction purrr randomizr readr rlang tibble tidyr]; broken = true; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; broken = true; }; - rdracor = derive2 { name="rdracor"; version="0.7.2"; sha256="006m1fppdfsmvyllks4x94z8v0q1d36m3af95yw53b1vrz6v9nvx"; depends=[data_table httr igraph jsonlite purrr Rdpack stringr tibble tidyr xml2]; broken = true; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; broken = true; }; + reclin = derive2 { name="reclin"; version="0.1.2"; sha256="0bskmlysc12g5invscr0vvshy8bp1gxjx4wihwbbfzmnk2951qrc"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; broken = true; }; + recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; broken = true; }; + refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; broken = true; }; regexTestR = derive2 { name="regexTestR"; version="0.1.3"; sha256="0nnp2xlrrywpi1lmj8ymsjgiqvq8777hhdgcwjq549m7whfw6lsg"; depends=[config data_table DT golem htmltools pkgload processx purrr RColorBrewer rvest shiny shinyBS shinythemes stringr tidyr xml2]; broken = true; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; broken = true; }; regweight = derive2 { name="regweight"; version="1.0.2"; sha256="1ziqii9xlp86n6ga99glwnh2kf6pkm8m326yra40yf2w3h180pbm"; depends=[checkmate dplyr ggplot2 glue gt lpdensity rlang scales tidyr tidyselect]; broken = true; }; relMix = derive2 { name="relMix"; version="1.3.3"; sha256="03zzmsx2i7ib1mhdfk5igvr1winl9g2dfjqz2kzvcx3rl7l6hjym"; depends=[Familias gWidgets2 gWidgets2tcltk]; broken = true; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; broken = true; }; relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; broken = true; }; + relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; broken = true; }; reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; broken = true; }; remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; broken = true; }; + renderthis = derive2 { name="renderthis"; version="0.2.0"; sha256="1hvqwq2w30j29pwjm498mza9zxg8ga5bizm795hmdbz1k30m4j3p"; depends=[cli digest fs jsonlite magick pagedown progress quarto rmarkdown withr xaringan zip]; broken = true; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; broken = true; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; broken = true; }; rescue = derive2 { name="rescue"; version="1.0.3"; sha256="0wq4ka1a7yhbjwr99ngykhn2r3czn3rqi63r6jn46pz15vnicwad"; depends=[data_table dbscan igraph irlba Matrix reticulate]; broken = true; }; @@ -21887,30 +22293,42 @@ in with self; { retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; broken = true; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; broken = true; }; retrocombinator = derive2 { name="retrocombinator"; version="1.0.0"; sha256="0ci5cm9ml2gsn0n0scaahpfi8kyn6i0s3fb4mn7m9s83c0ls6xgv"; depends=[dplyr ggplot2 magrittr Rcpp rlang]; broken = true; }; + retrodesign = derive2 { name="retrodesign"; version="0.2.0"; sha256="1662z7i8r4073klcsva9l2g7kcrsi1a73gd5f9306q20lvmfr2nr"; depends=[]; broken = true; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; broken = true; }; + rexpokit = derive2 { name="rexpokit"; version="0.26.6.9"; sha256="0ayh4nn031j702sgx3bh9j4psqf80ai4rf3fnmkfp62bxfffci8l"; depends=[Rcpp]; broken = true; }; rfinance = derive2 { name="rfinance"; version="0.1.0"; sha256="0xy4jw50vqbvicpwc3drzgg8ywgpdyxda7bqym52c76vsghcmq2d"; depends=[cli curl data_table dplyr glue httr janitor lubridate magrittr PerformanceAnalytics readr rvest stringr tibble TTR xml2 xts]; broken = true; }; rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; broken = true; }; + rgdal = derive2 { name="rgdal"; version="1.6-7"; sha256="0cxfmm7niixw3dnbqm7a00603dyqjrphajqx0q5vjpdhmpyysp2m"; depends=[sp]; broken = true; }; rgeolocate = derive2 { name="rgeolocate"; version="1.4.2"; sha256="08dps73sdlhsyzkykw3y9ckxazznymfsx63p9rcssghb2silw9xw"; depends=[httr Rcpp]; broken = true; }; + rgeos = derive2 { name="rgeos"; version="0.6-4"; sha256="04fyrqdpb4cz9kjqh1cxbpqh1ana7l8zh7wdzxassgzxjvgc80wx"; depends=[sp]; broken = true; }; rgovcan = derive2 { name="rgovcan"; version="1.0.3"; sha256="0b1fk7w3x60y0j74pglv14i0d76f13pzslghrday04qzkxy9smvd"; depends=[ckanr cli crayon crul tibble]; broken = true; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; broken = true; }; + rgrass7 = derive2 { name="rgrass7"; version="0.2-13"; sha256="03h62c8bv0c6xhlkscq00gaq0a3i43cpbj7d93803fq5y5x8vvxr"; depends=[XML]; broken = true; }; rgrassdoc = derive2 { name="rgrassdoc"; version="1.0.0"; sha256="18fcacf4v9n8cd27rc2lidwqm04151ya30pcs0bfhkssz80x0zds"; depends=[cli rlang rstudioapi xml2]; broken = true; }; rgudhi = derive2 { name="rgudhi"; version="0.2.0"; sha256="0biljmhg95wlfhhr9n8idggwzwmhal5idsm2ppgxxx8y1b8cmxbd"; depends=[cli curl dplyr fs ggplot2 purrr R6 Rdpack reticulate rlang tibble withr]; broken = true; }; rhli = derive2 { name="rhli"; version="0.0.2"; sha256="1mb6bizqkg7zd8nc5a81fw7d0y0vcv6zh6y28k9vikqmc5l1n21q"; depends=[]; broken = true; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; broken = true; }; rijkspalette = derive2 { name="rijkspalette"; version="1.0.2"; sha256="00726q8s36si08ghd9sgi7ikadcj11xqwhgv8f3cml6lvwz7ppzz"; depends=[crayon imager jsonlite]; broken = true; }; riot = derive2 { name="riot"; version="1.1.0"; sha256="1a5w6m443rc16fbzkmrrsisac92ch2x2psvywl5i60hlr0r88d60"; depends=[cli dplyr fs purrr Rcpp readr rlang tibble]; broken = true; }; + riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; broken = true; }; + riverplot = derive2 { name="riverplot"; version="0.10"; sha256="04ap1dsa7fx03l73jhv1ql3adaaaz2100qawdplxa9xmrllgcgbj"; depends=[RColorBrewer]; broken = true; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; broken = true; }; + rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; broken = true; }; rjpdmp = derive2 { name="rjpdmp"; version="2.0.0"; sha256="0r0r58zrwab4zxhgbfhh4qk6vbbza00m8h73mz70f5kqp786i9wy"; depends=[data_table Rcpp RcppArmadillo]; broken = true; }; rkafka = derive2 { name="rkafka"; version="1.4"; sha256="00m9zj2fnd32dhm7gn3fclpmp9r2y06sd8yckdbhlvd784b2d4c9"; depends=[rJava rkafkajars RUnit]; broken = true; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; broken = true; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; broken = true; }; + rlibkriging = derive2 { name="rlibkriging"; version="0.8-0"; sha256="1lkj74rnl0wb7f0rgqb0zz8p1s8616h2kdz17f7j43kgf3i78hy1"; depends=[DiceKriging Rcpp RcppArmadillo]; broken = true; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; broken = true; }; + rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; broken = true; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; broken = true; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; broken = true; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.4.1"; sha256="0w5x4ndv5r8v7ji3dhmch0di4krphxrclyidfg5b3qbmn1hlhlih"; depends=[Rcpp RcppArmadillo]; broken = true; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; broken = true; }; robustarima = derive2 { name="robustarima"; version="0.2.6"; sha256="137x9w3fq523bw2wix7bwc255mq7kvqa047chcnb2prihn9d6as7"; depends=[splusTimeDate splusTimeSeries]; broken = true; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; broken = true; }; + roistats = derive2 { name="roistats"; version="0.1.1"; sha256="1278cap5il85s1qls3sc0f4gqq2hi80442qidnsc6d8r3l4ba3fr"; depends=[dplyr magrittr purrr rlang tidyr]; broken = true; }; + rollRegres = derive2 { name="rollRegres"; version="0.1.4"; sha256="1q1xs43c860fqv5anfdv0zdb5s8n794yvhn1c7px1kdh2g0jbjp7"; depends=[checkmate Rcpp RcppArmadillo]; broken = true; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; broken = true; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; broken = true; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; broken = true; }; @@ -21925,6 +22343,7 @@ in with self; { rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; broken = true; }; rromeo = derive2 { name="rromeo"; version="0.1.1"; sha256="1jjk5b41qg22a0zpjha2p2mfcb5q00gicqlxhkahjbj49q0c3mn9"; depends=[httr xml2]; broken = true; }; rsat = derive2 { name="rsat"; version="0.1.18"; sha256="1idm50m94qx4fgri05wwjb49w7fdzl911g1fa138y5rm6wkawsc5"; depends=[calendR curl fields httr leafem leaflet raster Rdpack rjson rvest sf sp stars terra tmap XML xml2 zip]; broken = true; }; + rscala = derive2 { name="rscala"; version="3.2.25"; sha256="0nybhx8pblnniinvg74kbgg5bvw7y80ql8frij0178yglpbgrka9"; depends=[]; broken = true; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; broken = true; }; rsnps = derive2 { name="rsnps"; version="0.6.0"; sha256="1qslwgqcr4xf5vnrqx02nj84iyq8fhxfsj7yyyl6727v5xvgc12p"; depends=[crul data_table httr jsonlite plyr stringr]; broken = true; }; rsqliteadmin = derive2 { name="rsqliteadmin"; version="1.0.1"; sha256="1d9szm3nsr1q3hqrmapxdlymmgb3655n8v6x2vpcpahg54ajqrp5"; depends=[config data_table disk_frame DT fs golem magrittr RSQLite shiny shinyAce shinydashboard shinyFiles shinyjqui]; broken = true; }; @@ -21938,6 +22357,12 @@ in with self; { sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; broken = true; }; sabarsi = derive2 { name="sabarsi"; version="0.1.0"; sha256="14c94zby3jjm6jr28nrg3qp6r6iw68wsb5l5bpd6jjz9pkljrk9i"; depends=[]; broken = true; }; saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; broken = true; }; + saeHB = derive2 { name="saeHB"; version="0.2.1"; sha256="0jlfflpy67y8val89nn29larhw0v9qgsqp3x1sf3h1az9lc7bx5p"; depends=[CARBayesdata coda MASS nimble rjags stringr]; broken = true; }; + saeHB_gpois = derive2 { name="saeHB.gpois"; version="0.1.1"; sha256="1zz5xg393fv4r7bczp9ff690ypwspmm5p17p7vsn1vhcfwgx71di"; depends=[coda rjags stringr]; broken = true; }; + saeHB_hnb = derive2 { name="saeHB.hnb"; version="0.1.2"; sha256="1c7k0hhg078dmrz9crydh9napiim4r0kw4bv64y63zqbzsgrchm1"; depends=[coda rjags stringr]; broken = true; }; + saeHB_spatial = derive2 { name="saeHB.spatial"; version="0.1.0"; sha256="0fqc3c5y4rwfpgfbwfsrdhqlwjbal28wi9djm1vlncr8phkzfpln"; depends=[coda rjags stringr]; broken = true; }; + saeHB_twofold = derive2 { name="saeHB.twofold"; version="0.1.1"; sha256="1fdrh4h9y6blvib7d0hn1dhccz7rrmyf84a3g49chshiympkp6nv"; depends=[coda data_table rjags stringr]; broken = true; }; + saeHB_zinb = derive2 { name="saeHB.zinb"; version="0.1.1"; sha256="0z8yngvd3rizxkfb8j6jn9gfm7q8888igdq354r9dibprkw4fxbs"; depends=[coda rjags stringr]; broken = true; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; broken = true; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; broken = true; }; sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; broken = true; }; @@ -21945,7 +22370,10 @@ in with self; { salem = derive2 { name="salem"; version="0.2.0"; sha256="1pk27d57bmds0jvnvwai2scjy798lb7w6lb84yxl4ccgyn1ldh45"; depends=[]; broken = true; }; samon = derive2 { name="samon"; version="4.0.1"; sha256="1zhnv7kdpd2zhp6il5x56v4yh5703n1nsnkrysygns4i7xhvcf6z"; depends=[]; broken = true; }; sampSurf = derive2 { name="sampSurf"; version="0.7-6"; sha256="1f2ndfrxz0v0di9sb17rxs3iik2qw2nj1dn7apl55b2d07nsmpk3"; depends=[boot lattice latticeExtra raster rasterVis sp]; broken = true; }; + samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; broken = true; }; sapa = derive2 { name="sapa"; version="2.0-3"; sha256="0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc"; depends=[ifultools splus2R]; broken = true; }; + sara4r = derive2 { name="sara4r"; version="0.0.9"; sha256="1vfaz4fs0yayf01w0smsnviwhvjz10krfagp4vhy4lmdcs99s00h"; depends=[raster rgdal sp tcltk2]; broken = true; }; + satscanMapper = derive2 { name="satscanMapper"; version="1.0.2"; sha256="12vx1gr2z942wrjn6ks4lq9rb9ycnfg2rnl18scglqjqzlbsn9al"; depends=[foreign RColorBrewer SeerMapper sp stringr]; broken = true; }; saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; broken = true; }; sbde = derive2 { name="sbde"; version="1.0-0"; sha256="0m9mcr42bs74bmkyjfzyf01l2784d5bwy5g4ivl8505y8faz946c"; depends=[coda extremefit]; broken = true; }; scCAN = derive2 { name="scCAN"; version="1.0.4"; sha256="1w509y629xpqd748k7rghv8plav0jyyigfcf3n2c1m2a6qhh338x"; depends=[FNN purrr scDHA]; broken = true; }; @@ -21958,23 +22386,27 @@ in with self; { scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; broken = true; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; broken = true; }; scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; broken = true; }; + sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; broken = true; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; broken = true; }; - sdcMicro = derive2 { name="sdcMicro"; version="5.7.5"; sha256="071m7szdwmlzljrlms4lpz4cdka5lwms925zkkixfbx5j4i0vray"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; broken = true; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; broken = true; }; + sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; broken = true; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; broken = true; }; seAMLess = derive2 { name="seAMLess"; version="0.1.0"; sha256="18rpka0qq6hh7v241bv5k8ln03qk90lpf3ak2plq861lnf3p0wxb"; depends=[Biobase ggplot2 ggtern randomForest]; broken = true; }; + seagull = derive2 { name="seagull"; version="1.1.0"; sha256="1kmidbxzs8zrjji6wsn8nrdv5mpfmmf6q30h1w4rc0swx1ycsgx4"; depends=[matrixStats Rcpp RcppArmadillo]; broken = true; }; seedwater = derive2 { name="seedwater"; version="2.0"; sha256="1q6q612245hqqx89jzlp77f73vj2baxi0bghd9l8kpjz4ydh6rv8"; depends=[rpanel]; broken = true; }; selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; broken = true; }; selfmade = derive2 { name="selfmade"; version="0.1"; sha256="0d3v202dqr3c2564g6w7k27mhy1nxx7ngpiai7yxq2s88wa7cydi"; depends=[lme4 Matrix mgcv]; broken = true; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; broken = true; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; broken = true; }; - semmcci = derive2 { name="semmcci"; version="1.0.4"; sha256="1pyb6l8y3mkh6jdxjk2mi2jif3i1s3cvnmlq95gyahpnwf4mi5jw"; depends=[lavaan]; broken = true; }; sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; broken = true; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; broken = true; }; + sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; broken = true; }; seplyr = derive2 { name="seplyr"; version="1.0.4"; sha256="09lv2jic2dhwl2pra56kf7087inbjg9b5461dyy2a31h5ji68j08"; depends=[dplyr rlang tidyr wrapr]; broken = true; }; + seq2R = derive2 { name="seq2R"; version="2.0.0"; sha256="1ynhmfch8w2s0mh55km6v9afn0z3p43ckg79cz08d2z25lv5syrj"; depends=[seqinr]; broken = true; }; seqR = derive2 { name="seqR"; version="1.0.1"; sha256="0a80w7pyf2hbyzlm010xj3xv1dzkdc2w9s48hhfbsig88f497ki7"; depends=[Matrix Rcpp RcppParallel rlang slam]; broken = true; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; broken = true; }; sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; broken = true; }; + sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; broken = true; }; sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; broken = true; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; broken = true; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; broken = true; }; @@ -21983,16 +22415,20 @@ in with self; { sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; broken = true; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; broken = true; }; shadow = derive2 { name="shadow"; version="0.7.1"; sha256="055064jwxf9fkvw95w8if5aqcxrgg3b224qs1c81v8m8adr46v0r"; depends=[raster rgeos sp]; broken = true; }; + shallot = derive2 { name="shallot"; version="0.4.10"; sha256="05ciafpahcrsh9kwg1yqwbmanvkbv1i1cjjpvq3w4cdqkhn4fam7"; depends=[commonsMath rscala]; broken = true; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; broken = true; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; broken = true; }; shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; broken = true; }; + shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; broken = true; }; shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; broken = true; }; siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; broken = true; }; siconfir = derive2 { name="siconfir"; version="2.0.3"; sha256="1s9zxswbyi7g9bim6szgf7rrsci3ias6rvd2r7rsj13d0bangn8x"; depends=[dplyr httr magrittr purrr rlang stringr tibble tidyr]; broken = true; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; broken = true; }; sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; broken = true; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; broken = true; }; + simEd = derive2 { name="simEd"; version="2.0.0"; sha256="0rsagk77qgxfjjkqrg2kv88cg9z3gnjff7k1558psvbvc50d3cmg"; depends=[rstream shape]; broken = true; }; simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; depends=[splancs]; broken = true; }; + simPATHy = derive2 { name="simPATHy"; version="0.6"; sha256="0xiqcrdnn7pcbhykkjabfym6hqq9hrnjigav8nshs143s9wflw1q"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; broken = true; }; simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; broken = true; }; simfinR = derive2 { name="simfinR"; version="0.2.3"; sha256="1swlgwmd5frz72i3vjv7am8s6vr6i7mv76j7hxffk3l7xmq7y53s"; depends=[crayon digest dplyr jsonlite lubridate magrittr memoise purrr]; broken = true; }; sismonr = derive2 { name="sismonr"; version="2.1.0"; sha256="1v4vfz6zc4f70fay8r9vaxj62pcp8gqnh4aczbqpym9874330vi9"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; broken = true; }; @@ -22002,6 +22438,7 @@ in with self; { smartR = derive2 { name="smartR"; version="0.62.3"; sha256="0ardb4arhr7qmr30b3ahf7hkwlys9i420bm8h2688phahgfkk0y8"; depends=[caret chron cluster foreign ggplot2 ggrepel ggthemes gridExtra gstat gsubfn gWidgets2 gWidgets2RGtk2 igraph jpeg jsonlite lattice mapdata mapproj maps maptools marmap mtsdi nnls PBSmapping plyr R6 RColorBrewer reshape2 rgdal rgeos rjags ROCR rpart scales shape sp spdep sqldf vegan]; broken = true; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; broken = true; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; broken = true; }; + smnet = derive2 { name="smnet"; version="2.1.2"; sha256="17zv02f1g86s55g81anhqrxfgy2biamsw606byxwh9kdc5l4vfv6"; depends=[RSQLite spam SSN]; broken = true; }; smoothSurv = derive2 { name="smoothSurv"; version="2.5"; sha256="1bhzbbgz3y7a1hifspg2ny4qalz5017wxlry03i5ss47lbpsylij"; depends=[survival]; broken = true; }; snappier = derive2 { name="snappier"; version="0.2.0"; sha256="0pnrmgv42kmw84ajh24as9fqyczcwsnbi8dyq20q4ndynlkrj5rb"; depends=[]; broken = true; }; snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; broken = true; }; @@ -22021,6 +22458,8 @@ in with self; { spagmix = derive2 { name="spagmix"; version="0.3-5"; sha256="0rjdsg1pl8vpbcyyiqaqgc10h3i0q8xqivpawfaw43ybz15csnzl"; depends=[abind mvtnorm RandomFields sparr spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; broken = true; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; broken = true; }; sparsebn = derive2 { name="sparsebn"; version="0.1.2"; sha256="1b1601n3nmxck6a27xqxpsa79p4xnz7yyzdfqiddn9zd2b4v9wc5"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; broken = true; }; + spatialEco = derive2 { name="spatialEco"; version="2.0-1"; sha256="1iyym2cb6i7p2wxy8q1yasvlhrl2991mjsnhrv387zjd93lf5kyh"; depends=[sf terra]; broken = true; }; + spatialfusion = derive2 { name="spatialfusion"; version="0.6-6"; sha256="14qccp9ca7b7v9w4fj04a99mx6qchfs8588fl16qfdmfbazwnfra"; depends=[deldir fields Rcpp rgeos rstan sp spam]; broken = true; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; broken = true; }; spatstat_core = derive2 { name="spatstat.core"; version="2.4-4"; sha256="0fyi8y1z919nzn47kaviln7gflhcp5qdi3gfvf7nwkdix3pkk373"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; broken = true; }; spdplyr = derive2 { name="spdplyr"; version="0.4.0"; sha256="0lijp78wgrky103137vfk3k4s051qppd6jq6s065k9i7y1azbpc1"; depends=[dplyr rlang sp spbabel tibble]; broken = true; }; @@ -22031,12 +22470,14 @@ in with self; { spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; broken = true; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; broken = true; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; broken = true; }; + sphereTessellation = derive2 { name="sphereTessellation"; version="1.1.0"; sha256="0cg21hhgcnnsaiv23j0f3yvalkqzf9z0c7dnpy78ilalyzg29z85"; depends=[BH randomcoloR Rcpp RcppCGAL RcppEigen rgl]; broken = true; }; spiR = derive2 { name="spiR"; version="0.2.1"; sha256="0v3304d0ar6344377m6zd4p6f9m8ibq37i5ys4lnxnw41lhjx1x2"; depends=[dplyr ggplot2 ggsci gsheet lubridate readr reshape2]; broken = true; }; spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; broken = true; }; splashr = derive2 { name="splashr"; version="0.6.0"; sha256="0l57w5gwr0p2049z1201nlqsy23h37gsybd1lj3vycxz43ir7213"; depends=[curl dplyr formatR HARtools httr jsonlite lubridate magick openssl purrr scales stevedore stringi xml2]; broken = true; }; splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.4"; sha256="131g7vd6kqr4vx58myciwlvkvpbblvzhj4qw0l57a45mwa90sqy3"; depends=[]; broken = true; }; splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.5"; sha256="0j62vb601036zj1zj68qhgmg0bbrbrpz8bak0g6n5qf25yr9y09x"; depends=[splusTimeDate]; broken = true; }; spm12r = derive2 { name="spm12r"; version="2.8.3"; sha256="04bv4x7p2vv9n8zi5axpkcj13h6q08lc6qyd1czvxrpdmzsp40yb"; depends=[git2r matlabr neurobase oro_nifti R_utils]; broken = true; }; + spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; broken = true; }; sporm = derive2 { name="sporm"; version="1.1.1"; sha256="1bj795kmzjjcwvnrwg7dfz4jbfj488iydm0s79wrsgdq4chrrgyb"; depends=[]; broken = true; }; spotGUI = derive2 { name="spotGUI"; version="0.2.3"; sha256="0hybpw0lgqrzrryfp08qvl42hrgdmx2hq7bavxjihm8mp0375dmz"; depends=[batchtools gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyFiles shinyjs smoof SPOT XML]; broken = true; }; spots = derive2 { name="spots"; version="0.1.0"; sha256="0q5jfb99hrlz5c1jnn4a96pg07bccbw0khfq8mvaq4r3vdykzmqy"; depends=[Matrix RSpectra]; broken = true; }; @@ -22045,6 +22486,7 @@ in with self; { sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; broken = true; }; spruce = derive2 { name="spruce"; version="0.99.1"; sha256="1kklv4d2ycjcxv183cpqa6qn46zn8nww1z8xn4sy7ipz394i10cf"; depends=[BayesLogit dplyr ggplot2 igraph MCMCpack mvtnorm patchwork Rcpp RcppArmadillo rlang Seurat tidyr tidyselect truncnorm]; broken = true; }; spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; depends=[pedometrics Rcpp sp SpatialTools]; broken = true; }; + spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; broken = true; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; broken = true; }; sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; broken = true; }; squashinformr = derive2 { name="squashinformr"; version="0.2.6"; sha256="0qsgvcmw4yxsj3y2li3k33mycr2k3n8v9b09rcvs0qk036fmivgx"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr]; broken = true; }; @@ -22054,13 +22496,13 @@ in with self; { sspm = derive2 { name="sspm"; version="0.9.1"; sha256="1j62cphwqfkn6jmabqcqcbxd65by41ghvf3cpnbj6n20wakpkh05"; depends=[checkmate cli dplyr magrittr mgcv purrr rlang sf stringr tibble tidyr units]; broken = true; }; sstModel = derive2 { name="sstModel"; version="1.0.0"; sha256="04dvj6dbxidn1df2rslppl2pw2ql09rag39jrzdbnv6z20szbbd9"; depends=[data_table MASS openxlsx readxl shiny shinydashboard]; broken = true; }; ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; broken = true; }; + stUPscales = derive2 { name="stUPscales"; version="1.0.3.5"; sha256="1jsir7p9gwlmndrryc3rl78ysv6q6p97apwgwv4ykkk2kv7jk8m6"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; broken = true; }; + stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; broken = true; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; broken = true; }; stanette = derive2 { name="stanette"; version="2.21.4"; sha256="0417wbvc1gqkfnqg736cljbf0yg1csv7s98ndzzw7f18wbh69nqk"; depends=[BH brew coda ggplot2 gridExtra inline lattice loo pkgbuild Rcpp RcppEigen RcppParallel StanHeaders V8]; broken = true; }; - staplr = derive2 { name="staplr"; version="3.1.1"; sha256="0g3a13qndi4w35wq9bm0gb2b8v9svih9gbj5ymggqlcwz1dzywga"; depends=[assertthat glue rJava stringr XML]; broken = true; }; - starschemar = derive2 { name="starschemar"; version="1.2.0"; sha256="0jjaic1zwdc3lvdlgs0vzkjjivjs2dskmhx4qg469ban34az0591"; depends=[dplyr generics pander purrr readr rlang snakecase tibble tidyr tidyselect]; broken = true; }; + starticles = derive2 { name="starticles"; version="0.1.0"; sha256="11jmjsbzniyfnszfffhr78rqa588y77rlx2sbp92a3jpmcbx0h56"; depends=[bookdown knitr rmarkdown]; broken = true; }; stat_extend = derive2 { name="stat.extend"; version="0.2.1"; sha256="1qwjqnjds733xvxhby604yqvwlj1rkr3411diwzhbgwp89rhy11r"; depends=[sets]; broken = true; }; static = derive2 { name="static"; version="0.1.0"; sha256="1n9ijilh81w2fz4cyd4abjj7qam8q7rirmp8lni5cxsb4il0qbfa"; depends=[]; broken = true; }; - stepR = derive2 { name="stepR"; version="2.1-4"; sha256="18n368q7kc6q46ilvsvzjlrnlc93dgz01dzi4n10cn9sa2cvk496"; depends=[digest lowpassFilter R_cache Rcpp]; broken = true; }; stickr = derive2 { name="stickr"; version="0.3.1"; sha256="0krz123vz4bdcdi4p27r637pgz4rcj6kmyiqdf5x69riddvfxx8r"; depends=[base64enc fs gh stringr]; broken = true; }; stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; broken = true; }; stockfish = derive2 { name="stockfish"; version="1.0.0"; sha256="1il3na3d96k34vj62pvxrs2ah3a9ly8ww3gi3nr0459piw4wd611"; depends=[processx R6]; broken = true; }; @@ -22080,6 +22522,7 @@ in with self; { survMS = derive2 { name="survMS"; version="0.0.1"; sha256="0313pwf0l6wq9l4qjj1al9ybzm79kdxwzdrw6k0af706rxfzzha0"; depends=[ggplot2]; broken = true; }; survRatio = derive2 { name="survRatio"; version="0.1"; sha256="1xrqin3q3b7r8ga4i71ci97rsm4lj5ffd0720n7s563jkpnpyb9l"; depends=[ggplot2 ggpubr gridExtra survival]; broken = true; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; broken = true; }; + surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; broken = true; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; broken = true; }; survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; broken = true; }; sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; broken = true; }; @@ -22097,8 +22540,11 @@ in with self; { symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; broken = true; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; broken = true; }; synfd = derive2 { name="synfd"; version="0.1.3"; sha256="1h8vfrfw00449vjbj6z4y7m5p7rxzvqjcykyxw5sb473f63gr5px"; depends=[L1pack Rdpack]; broken = true; }; + synoptReg = derive2 { name="synoptReg"; version="1.2.1"; sha256="1v282ag4275p5lm6yvzwkpndrf4cnrpn0rw3v6mh5hxnb2pbmjl5"; depends=[dplyr ggplot2 kohonen lubridate magrittr metR raster rnaturalearth rnaturalearthdata RNCEP sf stringr tibble tidyr]; broken = true; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; broken = true; }; + tRophicPosition = derive2 { name="tRophicPosition"; version="0.8.0"; sha256="0ap7j15qfywilyx8zsnq061mis69yja16hjnla5grlqc0mcrdd7d"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr RColorBrewer rjags]; broken = true; }; taRifx = derive2 { name="taRifx"; version="1.0.6.2"; sha256="05cvjsi65fvy9hg2v3fldzwn1yd2kfirl3ffg9yfajm903dk3l49"; depends=[plyr reshape2]; broken = true; }; + table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; broken = true; }; tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; broken = true; }; tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; broken = true; }; tabxplor = derive2 { name="tabxplor"; version="1.1.0"; sha256="03m4v9zpqy62kjrbjp6asc9k90fy00gl0si34nmdaqdvj1pr2s0f"; depends=[cli crayon data_table DescTools dplyr forcats kableExtra magrittr pillar purrr rlang stringi stringr tibble tidyr tidyselect vctrs]; broken = true; }; @@ -22115,6 +22561,7 @@ in with self; { thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; broken = true; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; broken = true; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; broken = true; }; + tidyDisasters = derive2 { name="tidyDisasters"; version="0.1.1"; sha256="071hr4dmk5pq8m8b58b8zcz5kpgxnqw2l4rb2vkq1zhsrk9ynxmg"; depends=[]; broken = true; }; tidyMicro = derive2 { name="tidyMicro"; version="1.47"; sha256="02pc6rh0l7xdrqhihi53zp17x0walc0mpm70spm7yrwzkbc486lv"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; broken = true; }; tidylab = derive2 { name="tidylab"; version="4.1.1"; sha256="052wgx4dfbr806b9r0cfblkwaf1qnrlf5ngm1c029ggss3br7ki4"; depends=[cli crayon decorators dplyr microservices purrr rstudioapi tibble usethat]; broken = true; }; tidyndr = derive2 { name="tidyndr"; version="0.2.1"; sha256="0scjqnyl78aqqc03adlv3v0i67k3pi2a6m0cg6cxypaxhzzb2xg0"; depends=[dplyr forcats janitor lubridate magrittr purrr rlang stringr tibble tidyr tidyselect vroom]; broken = true; }; @@ -22140,14 +22587,18 @@ in with self; { trackr = derive2 { name="trackr"; version="0.10.7"; sha256="0h7ihymdvfvnnyxfxjwshslrxngh3i2ksqvhxynrp46m20mwjavd"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; broken = true; }; tradepolicy = derive2 { name="tradepolicy"; version="0.6.0"; sha256="1hpynl8klfsid7s8ksz7flzd7jblxx8vz0di9hcw5ppvihgh0jki"; depends=[broom cli crayon dplyr fixest ggplot2 magrittr msm purrr rstudioapi sandwich tibble tidyr]; broken = true; }; traitdataform = derive2 { name="traitdataform"; version="0.6.8"; sha256="0p2i7fqfkq5zq4bvgdk9my31m0r0crqpld3ql1x8y8xyp94a6rsp"; depends=[curl data_table getPass plyr RCurl reshape2 suppdata taxize units XML]; broken = true; }; + transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; broken = true; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; broken = true; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; broken = true; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; broken = true; }; treasuryTR = derive2 { name="treasuryTR"; version="0.1.6"; sha256="1m7pw2y9q03vn32y63la56l816b3yqkix1yd3j3nk6mwmdyqcyjq"; depends=[dplyr lubridate quantmod xts zoo]; broken = true; }; + treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; broken = true; }; + treeducken = derive2 { name="treeducken"; version="1.1.0"; sha256="0i2r1l508yi0cq7fzdds0hz2k4bxm67nknybxvbyylmwnwv6a0a1"; depends=[ape apTreeshape Rcpp RcppArmadillo]; broken = true; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; broken = true; }; treeman = derive2 { name="treeman"; version="1.1.4"; sha256="1rlq8sklvpj6an8x9wvs3501y6dpl2vhl5zfmz0yvmif04msf49v"; depends=[ape bigmemory plyr RJSONIO stringr]; broken = true; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; broken = true; }; treeplyr = derive2 { name="treeplyr"; version="0.1.10"; sha256="0k5hblnpbs8h2812blc6crx1j9w9r7lzkz3fraxkn4gdfpfi5100"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; broken = true; }; + treetop = derive2 { name="treetop"; version="0.0.5"; sha256="11lyg0izlzzvds8vig8ryicg94ydapr0wgfk5rj2shxqk9mxzfiz"; depends=[geometry lidR pryr raster rasterVis RColorBrewer rgdal rgl sf shiny sp spatstat_explore spatstat_geom stars]; broken = true; }; tricolore = derive2 { name="tricolore"; version="1.2.2"; sha256="0pxahddc3dah4n4xk4i0dkiwvh4wf03gcx8q3nfrsk07zzap1zh1"; depends=[assertthat ggplot2 ggtern shiny]; broken = true; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; broken = true; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; broken = true; }; @@ -22156,6 +22607,7 @@ in with self; { truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; broken = true; }; truthiness = derive2 { name="truthiness"; version="1.2.5"; sha256="0cssqlrilx2lglr2f53yysqgf604g4y326ijf8avlg6v5l6hlcr1"; depends=[dplyr DT emmeans ez forcats ggplot2 lme4 magrittr MASS ordinal purrr Rdpack readr rmarkdown tibble tidyr]; broken = true; }; ts_extend = derive2 { name="ts.extend"; version="0.1.1"; sha256="03b358nywx0zynb6006886mzvz1mbbaim6b5m641drklh6k0l6r1"; depends=[]; broken = true; }; + ts2net = derive2 { name="ts2net"; version="0.1.0"; sha256="0f45xnvg09qvcc202dfr9d1a29909gmz863pjyq78mhjj0glijqw"; depends=[dbscan dtw igraph infotheo minerva mmpp nonlinearTseries scales zoo]; broken = true; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; broken = true; }; tsgui = derive2 { name="tsgui"; version="0.2.1"; sha256="0crm2ripxpjaz1cqz9lkj3y9xj4ia0hlq4lvz1rff0wq6d5w79dn"; depends=[RandomFieldsUtils tcltk2 tkrplot]; broken = true; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; broken = true; }; @@ -22171,11 +22623,11 @@ in with self; { unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; broken = true; }; unfoldr = derive2 { name="unfoldr"; version="0.7.1"; sha256="1khas7d04g4y2kwldnsja5xk1n5mys2s66pln3l0gqlsbk67na12"; depends=[]; broken = true; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; broken = true; }; - uniswappeR = derive2 { name="uniswappeR"; version="0.6.0"; sha256="0n180v0kya6djkd3zngn4zvqzga3dhav41r94ckbzb1yww5ck1vd"; depends=[dplyr ggplot2 ghql httr jsonlite lubridate patchwork purrr reticulate rlang scales tibble tidyr]; broken = true; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; broken = true; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; broken = true; }; usethat = derive2 { name="usethat"; version="0.3.0"; sha256="0i6nw3vgll6i31l95iflhq88ssw86pmz46jgw8g6k6f58rgnykmc"; depends=[microservices purrr usethis withr]; broken = true; }; usethis2 = derive2 { name="usethis2"; version="0.2.0"; sha256="0ljvfgwg73y71yvyz2pp4c1rzgiqk1x7kmgswxa1ay05zwdgyi0x"; depends=[microservices purrr usethis withr]; broken = true; }; + uwo4419 = derive2 { name="uwo4419"; version="0.3.0"; sha256="0hk5qhyarjxz7ngj5ak37vx0rak6xv0hfb4sdrsbci3kv5fqijv7"; depends=[DescTools dplyr ggplot2 gmodels haven magrittr psych RColorBrewer rio tibble tidyr]; broken = true; }; validatedb = derive2 { name="validatedb"; version="0.1.4"; sha256="0lq0d0hcszd2jgip9m5j07lgbc279nxryz5drzv2qaap357ic9l1"; depends=[dbplyr dplyr validate]; broken = true; }; valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; broken = true; }; vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; broken = true; }; @@ -22183,6 +22635,7 @@ in with self; { vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; broken = true; }; vcrpart = derive2 { name="vcrpart"; version="1.0-4"; sha256="1mg87jpdih33lalxhfcxbri439d4cgi7hqdrnvijr7qabjmnc7p4"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; broken = true; }; vdra = derive2 { name="vdra"; version="1.0.0"; sha256="1ldl3wm55a5ywc5398lzky6l6x5a9djxwrqnrd570fg4iq6d30l1"; depends=[]; broken = true; }; + vennLasso = derive2 { name="vennLasso"; version="0.1.6"; sha256="0maydvx0qhdn5alqzqxjn485y9hw9qdr1xvgkmgwnjq59vni6d31"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; broken = true; }; vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; broken = true; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; broken = true; }; viewshed3d = derive2 { name="viewshed3d"; version="4.0.0"; sha256="039xx39w3k3hckf0qci7j1364s47vja5s18siqjh6c5yy1w8q737"; depends=[data_table hyper_fit lidR nabor pkgcond plotrix pracma raster rgl sp viridis]; broken = true; }; @@ -22191,13 +22644,16 @@ in with self; { vmsbase = derive2 { name="vmsbase"; version="2.2.1"; sha256="1xxn0vm9r8kiix6whlc12r0wanf6acrl9a86h44nwm019xfmlfyp"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets2 gWidgets2RGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; broken = true; }; vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; broken = true; }; vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; broken = true; }; + vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; broken = true; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; broken = true; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; broken = true; }; wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; broken = true; }; wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; broken = true; }; waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; broken = true; }; wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; broken = true; }; + wallace = derive2 { name="wallace"; version="2.1.0"; sha256="0gql7pwpwdhnqrrqh6qv0zyl8r1pgf5hh3h64rdnap4fhn1id5b9"; depends=[dplyr DT ecospat ENMeval knitcitations leafem leaflet leaflet_extras magrittr RColorBrewer rJava rlang rmarkdown sf shiny shinyalert shinyjs shinyWidgets spocc spThin zip]; broken = true; }; water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; broken = true; }; + wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; broken = true; }; weathercan = derive2 { name="weathercan"; version="0.6.2"; sha256="1mr926rymacx1f8k79pwhcyl5xcymq77l4dxaa2ddlrx5cmyh5cv"; depends=[dplyr httr lubridate memoise purrr rappdirs readr rlang rvest stringi stringr tidyr tidyselect xml2]; broken = true; }; weatherr = derive2 { name="weatherr"; version="0.1.3"; sha256="14w7kkja3a1zmdc7l084iprx1czqgdfjzjc29wdlwzmaiq02c4d3"; depends=[ggmap lubridate RJSONIO XML]; broken = true; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; broken = true; }; @@ -22208,19 +22664,26 @@ in with self; { winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; broken = true; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; broken = true; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; broken = true; }; + wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; broken = true; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; broken = true; }; - wordbankr = derive2 { name="wordbankr"; version="1.0.0"; sha256="1jcls9pw0qwf14d9f1kwyd77yrwmcx7k4hzs1h2dli29mvi6hcxg"; depends=[assertthat DBI dbplyr dplyr glue jsonlite lifecycle purrr quantregGrowth rlang RMySQL robustbase stringr tidyr]; broken = true; }; wordgraph = derive2 { name="wordgraph"; version="0.1.0"; sha256="06q42sjdj7i680zqx66hsvrpmkrlcyxnvsk1lygnqhlv97ycl3vv"; depends=[dplyr ggplot2 ggraph plyr purrr tibble tidygraph]; broken = true; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; broken = true; }; + workboots = derive2 { name="workboots"; version="0.2.0"; sha256="0n55iypiw59n1f09fbynsdznv5mz885rbz4gaqi48ig0hwz896b7"; depends=[assertthat dplyr generics lifecycle Metrics purrr rlang rsample tibble tidyr vip workflows]; broken = true; }; + worldriskpollr = derive2 { name="worldriskpollr"; version="0.7.4"; sha256="1m3apmdf0ksih7yq9bp5nkyyyxkp6hdw3jjx071df83c4iv8abm9"; depends=[curl dplyr httr janitor labelled magrittr rlang sjlabelled tidyr]; broken = true; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; broken = true; }; + wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; broken = true; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; broken = true; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; broken = true; }; - xQTLbiolinks = derive2 { name="xQTLbiolinks"; version="1.5.2"; sha256="07rapfdl9sdn2bp958w3mvxiqpvrvndnb5l8wfa2bnpwpx2sgfk6"; depends=[BiocGenerics cowplot curl data_table DBI GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel IRanges jsonlite RMySQL stringr SummarizedExperiment viridis]; broken = true; }; + xROI = derive2 { name="xROI"; version="0.9.20"; sha256="0xa12qsw5xbbfqyv60apr4f9gx7q6rad4ywayvw8l2zla2wnhq5h"; depends=[colourpicker data_table jpeg lubridate moments raster RCurl rgdal rjson shiny shinyjs sp stringr tiff]; broken = true; }; + xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; broken = true; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; broken = true; }; xlsimple = derive2 { name="xlsimple"; version="1.0.5"; sha256="1snamzq6yljiqakqd6492ylznr9kfl8w0lnaayfn14fk3w03skck"; depends=[XLConnect]; broken = true; }; + xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; broken = true; }; xpose_nlmixr = derive2 { name="xpose.nlmixr"; version="0.3.0"; sha256="1qxcq18mp5zxc7karixjfi93zm5mvpfnvp8sd8x0ibdbq8vk20my"; depends=[crayon dplyr ggplot2 magrittr nlme nlmixr rlang stringr tibble tidyr vpc xpose]; broken = true; }; xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; broken = true; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; broken = true; }; + xtensor = derive2 { name="xtensor"; version="0.14.1-0"; sha256="1qni98kxyaggb1ixmmj1hh1jmbz8rhji91nifgrjxc1wsvmvswh0"; depends=[Rcpp]; broken = true; }; + xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; broken = true; }; xtreg2way = derive2 { name="xtreg2way"; version="1.0.0"; sha256="0wllz0frakmadavgpqhd2b8fiw6wgwh5wzd270czc6cm5bq9gfng"; depends=[MASS Matrix pracma]; broken = true; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; broken = true; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; broken = true; }; @@ -22236,5 +22699,7 @@ in with self; { zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; broken = true; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; broken = true; }; ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; broken = true; }; + zonator = derive2 { name="zonator"; version="0.6.0"; sha256="1plxchpd4ypp36phl13pi9yvlrqi3lk83lv5rldrhdqynhcgfw2k"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; broken = true; }; + zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; broken = true; }; zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 853469be7e..1f94b2328e 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -546,7 +546,7 @@ let AMOUNTAIN = [ pkgs.gsl ]; Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ]; tcltk2 = with pkgs; [ tcl tk ]; - tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ]; + tikzDevice = with pkgs; [ which texliveMedium ]; gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which xorg.xdpyinfo ]; rsvg = [ pkgs.librsvg.dev ]; @@ -1032,6 +1032,7 @@ let }); quarto = old.quarto.overrideAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.quarto ]; postPatch = '' substituteInPlace "R/quarto.R" \ --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" @@ -1377,6 +1378,12 @@ let env.NIX_LDFLAGS = "-lfribidi -lharfbuzz"; }); + httpuv = old.httpuv.overrideAttrs (_: { + preConfigure = '' + patchShebangs configure + ''; + }); + ijtiff = old.ijtiff.overrideAttrs (_: { preConfigure = '' patchShebangs configure diff --git a/third_party/nixpkgs/pkgs/development/libraries/clang-ocl/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clang-ocl/default.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/libraries/clang-ocl/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/clang-ocl/default.nix index 8053b672d3..7af83bd2e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clang-ocl/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix new file mode 100644 index 0000000000..f12ef2bfc8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/default.nix @@ -0,0 +1,170 @@ +{ lib +, stdenv +, callPackage +, fetchFromGitHub +, rocmUpdateScript +, makeWrapper +, cmake +, perl +, clang +, hip-common +, hipcc +, rocm-device-libs +, rocm-comgr +, rocm-runtime +, roctracer +, rocminfo +, rocm-smi +, numactl +, libGL +, libxml2 +, libX11 +, python3Packages +}: + +let + wrapperArgs = [ + "--prefix PATH : $out/bin" + "--prefix LD_LIBRARY_PATH : ${rocm-runtime}" + "--set HIP_PLATFORM amd" + "--set HIP_PATH $out" + "--set HIP_CLANG_PATH ${clang}/bin" + "--set DEVICE_LIB_PATH ${rocm-device-libs}/amdgcn/bitcode" + "--set HSA_PATH ${rocm-runtime}" + "--set ROCM_PATH $out" + ]; +in stdenv.mkDerivation (finalAttrs: { + pname = "clr"; + version = "5.7.1"; + + outputs = [ + "out" + "icd" + ]; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "clr"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw="; + }; + + nativeBuildInputs = [ + makeWrapper + cmake + perl + python3Packages.python + python3Packages.cppheaderparser + ]; + + buildInputs = [ + numactl + libGL + libxml2 + libX11 + ]; + + propagatedBuildInputs = [ + rocm-device-libs + rocm-comgr + rocm-runtime + rocminfo + ]; + + cmakeFlags = [ + "-DCMAKE_POLICY_DEFAULT_CMP0072=NEW" # Prefer newer OpenGL libraries + "-DCLR_BUILD_HIP=ON" + "-DCLR_BUILD_OCL=ON" + "-DHIP_COMMON_DIR=${hip-common}" + "-DHIPCC_BIN_DIR=${hipcc}/bin" + "-DHIP_PLATFORM=amd" + "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" + "-DROCM_PATH=${rocminfo}" + + # Temporarily set variables to work around upstream CMakeLists issue + # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + postPatch = '' + patchShebangs hipamd/src + + # We're not on Windows so these are never installed to hipcc... + substituteInPlace hipamd/CMakeLists.txt \ + --replace "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)" "" \ + --replace "install(PROGRAMS \''${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)" "" + + substituteInPlace hipamd/src/hip_embed_pch.sh \ + --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" + ''; + + postInstall = '' + patchShebangs $out/bin + + # hipcc.bin and hipconfig.bin is mysteriously never installed + cp -a ${hipcc}/bin/{hipcc.bin,hipconfig.bin} $out/bin + + wrapProgram $out/bin/hipcc.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.bin ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipcc.pl ${lib.concatStringsSep " " wrapperArgs} + wrapProgram $out/bin/hipconfig.pl ${lib.concatStringsSep " " wrapperArgs} + + # Just link rocminfo, it's easier + ln -s ${rocminfo}/bin/* $out/bin + + # Replace rocm-opencl-icd functionality + mkdir -p $icd/etc/OpenCL/vendors + echo "$out/lib/libamdocl64.so" > $icd/etc/OpenCL/vendors/amdocl64.icd + ''; + + passthru = { + # All known and valid general GPU targets + # We cannot use this for each ROCm library, as each defines their own supported targets + # See: https://github.com/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix + gpuTargets = lib.forEach [ + "803" + "900" + "906" + "908" + "90a" + "940" + "941" + "942" + "1010" + "1012" + "1030" + "1100" + "1101" + "1102" + ] (target: "gfx${target}"); + + updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + page = "tags?per_page=1"; + filter = ".[0].name | split(\"-\") | .[1]"; + }; + + impureTests = { + rocm-smi = callPackage ./test-rocm-smi.nix { + inherit rocm-smi; + clr = finalAttrs.finalPackage; + }; + opencl-example = callPackage ./test-opencl-example.nix { + clr = finalAttrs.finalPackage; + }; + }; + }; + + meta = with lib; { + description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; + homepage = "https://github.com/ROCm-Developer-Tools/clr"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix new file mode 100644 index 0000000000..d6714c6b7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, makeImpureTest +, fetchFromGitHub +, clr +, cmake +, pkg-config +, glew +, freeglut +, opencl-headers +, ocl-icd +}: + +let + + examples = stdenv.mkDerivation { + pname = "amd-app-samples"; + version = "2018-06-10"; + + src = fetchFromGitHub { + owner = "OpenCL"; + repo = "AMD_APP_samples"; + rev = "54da6ca465634e78fc51fc25edf5840467ee2411"; + hash = "sha256-qARQpUiYsamHbko/I1gPZE9pUGJ+3396Vk2n7ERSftA="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ glew freeglut opencl-headers ocl-icd ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + # Example path is bin/x86_64/Release/cl/Reduction/Reduction + cp -r bin/*/*/*/*/* $out/bin/ + + runHook postInstall + ''; + + cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; + + meta = with lib; { + description = "Samples from the AMD APP SDK (with OpenCRun support) "; + homepage = "https://github.com/OpenCL/AMD_APP_samples"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = lib.teams.rocm.members; + }; + }; + +in +makeImpureTest { + name = "opencl-example"; + testedPackage = "rocmPackages_5.clr"; + + sandboxPaths = [ "/sys" "/dev/dri" "/dev/kfd" ]; + + nativeBuildInputs = [ examples ]; + + OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors"; + + testScript = '' + # Examples load resources from current directory + cd ${examples}/bin + echo OCL_ICD_VENDORS=$OCL_ICD_VENDORS + pwd + + HelloWorld | grep HelloWorld + ''; + + meta = with lib; { + maintainers = teams.rocm.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/test.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix similarity index 60% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/test.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix index 398a4818e7..25c0a7e0c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/test.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/clr/test-rocm-smi.nix @@ -1,11 +1,15 @@ -{ lib, makeImpureTest, clinfo, rocm-opencl-icd, rocm-smi }: +{ lib +, makeImpureTest +, clinfo +, clr +, rocm-smi +}: + makeImpureTest { - name = "rocm-opencl"; - testedPackage = "rocm-opencl-icd"; - + name = "rocm-smi"; + testedPackage = "rocmPackages_5.clr"; nativeBuildInputs = [ clinfo rocm-smi ]; - - OCL_ICD_VENDORS = "${rocm-opencl-icd}/etc/OpenCL/vendors/"; + OCL_ICD_VENDORS = "${clr.icd}/etc/OpenCL/vendors"; testScript = '' # Test fails if the number of platforms is 0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/composable_kernel/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 54bf1251c3..75039fc7d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -1,10 +1,10 @@ { lib , stdenv , fetchFromGitHub -, unstableGitUpdater +, rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , openmp , clang-tools-extra , gtest @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; - version = "unstable-2023-01-16"; + version = "5.7.1"; outputs = [ "out" @@ -25,24 +25,21 @@ stdenv.mkDerivation (finalAttrs: { "example" ]; - # ROCm 5.6 should release composable_kernel as stable with a tag in the future src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; - rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; - hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr clang-tools-extra ]; - buildInputs = [ - openmp - ]; + buildInputs = [ openmp ]; cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" @@ -71,7 +68,11 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/example_* $example/bin ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; # Times out otherwise requiredSystemFeatures = [ "big-parallel" ]; @@ -82,5 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix new file mode 100644 index 0000000000..d5f1c2678c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix @@ -0,0 +1,527 @@ +{ callPackage +, recurseIntoAttrs +, symlinkJoin +, fetchFromGitHub +, cudaPackages +, python3Packages +, elfutils +, boost179 +, opencv +, ffmpeg_4 +, libjpeg_turbo +, rapidjson-unstable +}: + +let + rocmUpdateScript = callPackage ./update.nix { }; +in rec { + ## RadeonOpenCompute ## + llvm = recurseIntoAttrs (callPackage ./llvm/default.nix { inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr; }); + + rocm-core = callPackage ./rocm-core { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + rocm-cmake = callPackage ./rocm-cmake { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + rocm-thunk = callPackage ./rocm-thunk { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + rocm-smi = python3Packages.callPackage ./rocm-smi { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + # Eventually will be in the LLVM repo + rocm-device-libs = callPackage ./rocm-device-libs { + inherit rocmUpdateScript rocm-cmake; + stdenv = llvm.rocmClangStdenv; + }; + + rocm-runtime = callPackage ./rocm-runtime { + inherit rocmUpdateScript rocm-device-libs rocm-thunk; + stdenv = llvm.rocmClangStdenv; + }; + + # Eventually will be in the LLVM repo + rocm-comgr = callPackage ./rocm-comgr { + inherit rocmUpdateScript rocm-cmake rocm-device-libs; + stdenv = llvm.rocmClangStdenv; + }; + + rocminfo = callPackage ./rocminfo { + inherit rocmUpdateScript rocm-cmake rocm-runtime; + stdenv = llvm.rocmClangStdenv; + }; + + clang-ocl = callPackage ./clang-ocl { + inherit rocmUpdateScript rocm-cmake rocm-device-libs; + stdenv = llvm.rocmClangStdenv; + }; + + # Unfree + hsa-amd-aqlprofile-bin = callPackage ./hsa-amd-aqlprofile-bin { + stdenv = llvm.rocmClangStdenv; + }; + + # Broken, too many errors + rdc = callPackage ./rdc { + inherit rocmUpdateScript rocm-smi rocm-runtime; + # stdenv = llvm.rocmClangStdenv; + }; + + rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { }; + + ## ROCm-Developer-Tools ## + hip-common = callPackage ./hip-common { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + # Eventually will be in the LLVM repo + hipcc = callPackage ./hipcc { + inherit rocmUpdateScript; + stdenv = llvm.rocmClangStdenv; + }; + + # Replaces hip, opencl-runtime, and rocclr + clr = callPackage ./clr { + inherit rocmUpdateScript hip-common hipcc rocm-device-libs rocm-comgr rocm-runtime roctracer rocminfo rocm-smi; + inherit (llvm) clang; + stdenv = llvm.rocmClangStdenv; + }; + + hipify = callPackage ./hipify { + inherit rocmUpdateScript; + inherit (llvm) clang; + stdenv = llvm.rocmClangStdenv; + }; + + # Needs GCC + rocprofiler = callPackage ./rocprofiler { + inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin; + inherit (llvm) clang; + }; + + # Needs GCC + roctracer = callPackage ./roctracer { + inherit rocmUpdateScript rocm-device-libs rocm-runtime clr; + }; + + # Needs GCC + rocgdb = callPackage ./rocgdb { + inherit rocmUpdateScript; + elfutils = elfutils.override { enableDebuginfod = true; }; + }; + + rocdbgapi = callPackage ./rocdbgapi { + inherit rocmUpdateScript rocm-cmake rocm-comgr rocm-runtime; + stdenv = llvm.rocmClangStdenv; + }; + + rocr-debug-agent = callPackage ./rocr-debug-agent { + inherit rocmUpdateScript clr rocdbgapi; + stdenv = llvm.rocmClangStdenv; + }; + + ## ROCmSoftwarePlatform ## + rocprim = callPackage ./rocprim { + inherit rocmUpdateScript rocm-cmake clr; + stdenv = llvm.rocmClangStdenv; + }; + + rocsparse = callPackage ./rocsparse { + inherit rocmUpdateScript rocm-cmake rocprim clr; + stdenv = llvm.rocmClangStdenv; + }; + + rocthrust = callPackage ./rocthrust { + inherit rocmUpdateScript rocm-cmake rocprim clr; + stdenv = llvm.rocmClangStdenv; + }; + + rocrand = callPackage ./rocrand { + inherit rocmUpdateScript rocm-cmake clr; + stdenv = llvm.rocmClangStdenv; + }; + + hiprand = rocrand; # rocrand includes hiprand + + rocfft = callPackage ./rocfft { + inherit rocmUpdateScript rocm-cmake rocrand rocfft clr; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + rccl = callPackage ./rccl { + inherit rocmUpdateScript rocm-cmake rocm-smi clr hipify; + stdenv = llvm.rocmClangStdenv; + }; + + hipcub = callPackage ./hipcub { + inherit rocmUpdateScript rocm-cmake rocprim clr; + stdenv = llvm.rocmClangStdenv; + }; + + hipsparse = callPackage ./hipsparse { + inherit rocmUpdateScript rocm-cmake rocsparse clr; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + hipfort = callPackage ./hipfort { + inherit rocmUpdateScript rocm-cmake; + stdenv = llvm.rocmClangStdenv; + }; + + hipfft = callPackage ./hipfft { + inherit rocmUpdateScript rocm-cmake rocfft clr; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + tensile = python3Packages.callPackage ./tensile { + inherit rocmUpdateScript rocminfo; + stdenv = llvm.rocmClangStdenv; + }; + + rocblas = callPackage ./rocblas { + inherit rocblas rocmUpdateScript rocm-cmake clr tensile; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + rocsolver = callPackage ./rocsolver { + inherit rocmUpdateScript rocm-cmake rocblas rocsparse clr; + stdenv = llvm.rocmClangStdenv; + }; + + rocwmma = callPackage ./rocwmma { + inherit rocmUpdateScript rocm-cmake rocm-smi rocblas clr; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + rocalution = callPackage ./rocalution { + inherit rocmUpdateScript rocm-cmake rocprim rocsparse rocrand rocblas clr; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + rocmlir = callPackage ./rocmlir { + inherit rocmUpdateScript rocm-cmake clr; + stdenv = llvm.rocmClangStdenv; + }; + + rocmlir-rock = rocmlir.override { + buildRockCompiler = true; + }; + + hipsolver = callPackage ./hipsolver { + inherit rocmUpdateScript rocm-cmake rocblas rocsolver clr; + stdenv = llvm.rocmClangStdenv; + }; + + hipblas = callPackage ./hipblas { + inherit rocmUpdateScript rocm-cmake rocblas rocsolver clr; + stdenv = llvm.rocmClangStdenv; + }; + + # hipBlasLt - Very broken with Tensile at the moment, only supports GFX9 + # hipTensor - Only supports GFX9 + + miopengemm = callPackage ./miopengemm { + inherit rocmUpdateScript rocm-cmake clr; + stdenv = llvm.rocmClangStdenv; + }; + + composable_kernel = callPackage ./composable_kernel { + inherit rocmUpdateScript rocm-cmake clr; + inherit (llvm) openmp clang-tools-extra; + stdenv = llvm.rocmClangStdenv; + }; + + half = callPackage ./half { + inherit rocmUpdateScript rocm-cmake; + stdenv = llvm.rocmClangStdenv; + }; + + miopen = callPackage ./miopen { + inherit rocmUpdateScript rocm-cmake rocblas clang-ocl miopengemm composable_kernel rocm-comgr clr rocm-docs-core half; + inherit (llvm) clang-tools-extra; + stdenv = llvm.rocmClangStdenv; + rocmlir = rocmlir-rock; + boost = boost179.override { enableStatic = true; }; + }; + + miopen-hip = miopen.override { + useOpenCL = false; + }; + + miopen-opencl = miopen.override { + useOpenCL = true; + }; + + migraphx = callPackage ./migraphx { + inherit rocmUpdateScript rocm-cmake rocblas composable_kernel miopengemm miopen clr half rocm-device-libs; + inherit (llvm) openmp clang-tools-extra; + stdenv = llvm.rocmClangStdenv; + rocmlir = rocmlir-rock; + }; + + ## GPUOpen-ProfessionalCompute-Libraries ## + rpp = callPackage ./rpp { + inherit rocmUpdateScript rocm-cmake rocm-docs-core clr half; + inherit (llvm) openmp; + stdenv = llvm.rocmClangStdenv; + }; + + rpp-hip = rpp.override { + useOpenCL = false; + useCPU = false; + }; + + rpp-opencl = rpp.override { + useOpenCL = true; + useCPU = false; + }; + + rpp-cpu = rpp.override { + useOpenCL = false; + useCPU = true; + }; + + mivisionx = callPackage ./mivisionx { + inherit rocmUpdateScript rocm-cmake rocm-device-libs clr rpp rocblas miopengemm miopen migraphx half rocm-docs-core; + inherit (llvm) clang openmp; + opencv = opencv.override { enablePython = true; }; + ffmpeg = ffmpeg_4; + rapidjson = rapidjson-unstable; + stdenv = llvm.rocmClangStdenv; + + # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice + # See: https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/issues/1051 + libjpeg_turbo = libjpeg_turbo.overrideAttrs { + version = "2.0.6.1"; + + src = fetchFromGitHub { + owner = "rrawther"; + repo = "libjpeg-turbo"; + rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb"; + sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY="; + }; + }; + }; + + mivisionx-hip = mivisionx.override { + rpp = rpp-hip; + useOpenCL = false; + useCPU = false; + }; + + mivisionx-opencl = mivisionx.override { + rpp = rpp-opencl; + miopen = miopen-opencl; + useOpenCL = true; + useCPU = false; + }; + + mivisionx-cpu = mivisionx.override { + rpp = rpp-cpu; + useOpenCL = false; + useCPU = true; + }; + + ## Meta ## + # Emulate common ROCm meta layout + # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations + # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues! + # See: https://rocm.docs.amd.com/en/latest/_images/image.004.png + # See: https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/package_manager_integration.html + meta = rec { + rocm-developer-tools = symlinkJoin { + name = "rocm-developer-tools-meta"; + + paths = [ + hsa-amd-aqlprofile-bin + rocm-core + rocr-debug-agent + roctracer + rocdbgapi + rocprofiler + rocgdb + rocm-language-runtime + ]; + }; + + rocm-ml-sdk = symlinkJoin { + name = "rocm-ml-sdk-meta"; + + paths = [ + rocm-core + miopen-hip + rocm-hip-sdk + rocm-ml-libraries + ]; + }; + + rocm-ml-libraries = symlinkJoin { + name = "rocm-ml-libraries-meta"; + + paths = [ + llvm.clang + llvm.mlir + llvm.openmp + rocm-core + miopen-hip + rocm-hip-libraries + ]; + }; + + rocm-hip-sdk = symlinkJoin { + name = "rocm-hip-sdk-meta"; + + paths = [ + rocprim + rocalution + hipfft + rocm-core + hipcub + hipblas + rocrand + rocfft + rocsparse + rccl + rocthrust + rocblas + hipsparse + hipfort + rocwmma + hipsolver + rocsolver + rocm-hip-libraries + rocm-hip-runtime-devel + ]; + }; + + rocm-hip-libraries = symlinkJoin { + name = "rocm-hip-libraries-meta"; + + paths = [ + rocblas + hipfort + rocm-core + rocsolver + rocalution + rocrand + hipblas + rocfft + hipfft + rccl + rocsparse + hipsparse + hipsolver + rocm-hip-runtime + ]; + }; + + rocm-openmp-sdk = symlinkJoin { + name = "rocm-openmp-sdk-meta"; + + paths = [ + rocm-core + llvm.clang + llvm.mlir + llvm.openmp # openmp-extras-devel (https://github.com/ROCm-Developer-Tools/aomp) + rocm-language-runtime + ]; + }; + + rocm-opencl-sdk = symlinkJoin { + name = "rocm-opencl-sdk-meta"; + + paths = [ + rocm-core + rocm-runtime + clr + clr.icd + rocm-thunk + rocm-opencl-runtime + ]; + }; + + rocm-opencl-runtime = symlinkJoin { + name = "rocm-opencl-runtime-meta"; + + paths = [ + rocm-core + clr + clr.icd + rocm-language-runtime + ]; + }; + + rocm-hip-runtime-devel = symlinkJoin { + name = "rocm-hip-runtime-devel-meta"; + + paths = [ + clr + rocm-core + hipify + rocm-cmake + llvm.clang + llvm.mlir + llvm.openmp + rocm-thunk + rocm-runtime + rocm-hip-runtime + ]; + }; + + rocm-hip-runtime = symlinkJoin { + name = "rocm-hip-runtime-meta"; + + paths = [ + rocm-core + rocminfo + clr + rocm-language-runtime + ]; + }; + + rocm-language-runtime = symlinkJoin { + name = "rocm-language-runtime-meta"; + + paths = [ + rocm-runtime + rocm-core + rocm-comgr + llvm.openmp # openmp-extras-runtime (https://github.com/ROCm-Developer-Tools/aomp) + ]; + }; + + rocm-all = symlinkJoin { + name = "rocm-all-meta"; + + paths = [ + rocm-developer-tools + rocm-ml-sdk + rocm-ml-libraries + rocm-hip-sdk + rocm-hip-libraries + rocm-openmp-sdk + rocm-opencl-sdk + rocm-opencl-runtime + rocm-hip-runtime-devel + rocm-hip-runtime + rocm-language-runtime + ]; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/half/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/half/default.nix new file mode 100644 index 0000000000..1ddd06b014 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/half/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "half"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "half"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-82It+/wm8+umBdQYn7lz/fS69h+f0mzwPdGxoJNYUq0="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + ]; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "C++ library for half precision floating point arithmetics"; + homepage = "https://github.com/ROCmSoftwarePlatform/half"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.unix; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hip-common/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hip-common/default.nix similarity index 72% rename from third_party/nixpkgs/pkgs/development/compilers/hip-common/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hip-common/default.nix index 1721091d6a..6e2f950c01 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hip-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -2,34 +2,19 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, substituteAll -, llvm -, rocm-runtime -, rocminfo -, lsb-release }: stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-44CZWk6EsP5EduzBCBbOh2kshS89qOm4v3mx/xNDzV0="; + hash = "sha256-1Abit9qZCwrCVcnaFT4uMygFB9G6ovRasLmTsOsJ/Fw="; }; - patches = [ - (substituteAll { - src = ./0000-fixup-paths.patch; - inherit llvm rocminfo; - clang = stdenv.cc; - rocm_runtime = rocm-runtime; - lsb_release = lsb-release; - }) - ]; - dontConfigure = true; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipblas/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipblas/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/libraries/hipblas/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipblas/default.nix index e8402c0d05..c604dda465 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -4,7 +4,7 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , gfortran , rocblas , rocsolver @@ -18,7 +18,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-mSZCq8UaiffMzWVflW1nAX6CQZ1DqwWJaSIzKslZSEk="; + hash = "sha256-abaEZN82dsoEC5gIF3/6epRDVz5ItUo6CkZsybu/G+g="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr gfortran ]; @@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - # Fixed in develop branch by using C++17 and related refactor - broken = versions.minor finalAttrs.version != versions.minor hip.version || buildTests || buildBenchmarks || buildSamples; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hipcc/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcc/default.nix similarity index 57% rename from third_party/nixpkgs/pkgs/development/compilers/hipcc/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcc/default.nix index af0cb35c14..20c428bbf8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hipcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -2,47 +2,31 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, substituteAll , cmake -, llvm -, rocm-runtime -, rocminfo , lsb-release }: stdenv.mkDerivation (finalAttrs: { pname = "hipcc"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIPCC"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-PEwue4O43MiMkF8UmTeHsmlikBG2V3/nFQLKmtHrRWQ="; + hash = "sha256-lJX6nF1V4YmK5ai7jivXlRnG3doIOf6X9CWLHVdRuVg="; }; - patches = [ - (substituteAll { - src = ./0000-fixup-paths.patch; - inherit llvm rocminfo; - version_major = lib.versions.major finalAttrs.version; - version_minor = lib.versions.minor finalAttrs.version; - version_patch = lib.versions.patch finalAttrs.version; - clang = stdenv.cc; - rocm_runtime = rocm-runtime; - lsb_release = lsb-release; - }) - ]; - nativeBuildInputs = [ cmake ]; - installPhase = '' - runHook preInstall + postPatch = '' + substituteInPlace src/hipBin_amd.h \ + --replace "/usr/bin/lsb_release" "${lsb-release}/bin/lsb_release" + ''; - mkdir -p $out/bin - mv *.bin $out/bin - - runHook postInstall + postInstall = '' + rm -r $out/hip/bin + ln -s $out/bin $out/hip/bin ''; passthru.updateScript = rocmUpdateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipcub/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcub/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/libraries/hipcub/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcub/default.nix index d0f33c0dc1..943a14c379 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipcub/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -5,17 +5,18 @@ , cmake , rocm-cmake , rocprim -, hip +, clr , gtest , gbenchmark , buildTests ? false , buildBenchmarks ? false +, gpuTargets ? [ ] }: # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "5.4.4"; + version = "5.7.1"; outputs = [ "out" @@ -29,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-reFxSOYQOf9QcoZzaLt4D1yKGQoDxpt/3rwiHgP1DCo="; + hash = "sha256-ygBEA3NuCQ13QrSzGqyWXkx8Dy9WhR3u4syzapRTkFU="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr ]; buildInputs = [ @@ -48,12 +49,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${clr}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ @@ -82,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfft/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfft/default.nix index c4d13cb4f5..b0c5928a19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -4,7 +4,7 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , git , rocfft , gtest @@ -15,12 +15,13 @@ , buildTests ? false , buildBenchmarks ? false , buildSamples ? false +, gpuTargets ? [ ] }: # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -36,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yDtm9J0wqH6zo4HcgQbqhvwbzbOiJPQ48gJ2gC8PvjA="; + hash = "sha256-fuYRKdlTrRMwxr3cgMeT3YniPzs4nuvF8YCzr3LLPFM="; fetchSubmodules = true; }; nativeBuildInputs = [ - hip + clr git cmake rocm-cmake @@ -60,14 +61,16 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" - "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${hip}" - "-DHIP_PATH=${hip}" + "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" + "-DHIP_ROOT_DIR=${clr}" + "-DHIP_PATH=${clr}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_CLIENTS_TESTS=ON" ] ++ lib.optionals buildBenchmarks [ @@ -102,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfort/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfort/default.nix index 5c5f0f61e8..4b6c7c56af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "5.6.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-x1pF9md7RIcobE/4UxHxOaURbljFZGOashW1KM0lmo0="; + hash = "sha256-DRjUWhdinDKP7CZgq2SmU3lGmmodCuXvco9aEeMLSZ4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/hipify/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipify/default.nix similarity index 76% rename from third_party/nixpkgs/pkgs/development/compilers/hipify/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipify/default.nix index 342e8e7e8b..e553c0e385 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hipify/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipify/default.nix @@ -3,18 +3,19 @@ , fetchFromGitHub , rocmUpdateScript , cmake +, clang , libxml2 }: stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-EaHtI1ywjEHioWptuHvCllJ3dENtSClVoE6NpWTOa9I="; + hash = "sha256-lCQ2VTUGmFC90Xu70/tvoeDhFaInGqLT3vC2A1UojNI="; }; nativeBuildInputs = [ cmake ]; @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${stdenv.cc}/bin/clang" + --replace "\''${LLVM_TOOLS_BINARY_DIR}/clang" "${clang}/bin/clang" ''; passthru.updateScript = rocmUpdateScript { @@ -31,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { repo = finalAttrs.src.repo; }; - # Fixup weird install paths + # Fixup bad symlinks postInstall = '' - mkdir -p $out/bin - mv $out/{*.sh,hipify-*} $out/bin - cp -afs $out/bin $out/hip + rm -r $out/hip/bin + ln -s $out/bin $out/hip/bin + patchShebangs $out/bin ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipsolver/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsolver/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/development/libraries/hipsolver/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsolver/default.nix index ff499b342f..9c5c1cad22 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -4,7 +4,7 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , gfortran , rocblas , rocsolver @@ -18,7 +18,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "5.4.4"; + version = "5.7.1"; outputs = [ "out" @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-p9hgKqRALLItv/HTpVlTsu+m9wlwCBYPYnJcm8StIao="; + hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr gfortran ]; @@ -95,6 +95,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsparse/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsparse/default.nix index 4f4b0c7cdc..0e77079348 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hipsparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -5,19 +5,20 @@ , cmake , rocm-cmake , rocsparse -, hip +, clr , gfortran , git , gtest , openmp , buildTests ? false , buildSamples ? false +, gpuTargets ? [ ] }: # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.4.4"; + version = "5.7.1"; outputs = [ "out" @@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40="; + hash = "sha256-txigaOoZMI/v+EQLgGlj2O0IHfE7EpgjL0cyv49nKzo="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr gfortran ]; @@ -59,16 +60,15 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_CLIENTS_TESTS=ON" ]; # We have to manually generate the matrices # CMAKE_MATRICES_DIR seems to be reset in clients/tests/CMakeLists.txt - postPatch = '' - substituteInPlace clients/common/utility.cpp \ - --replace "#ifdef __cpp_lib_filesystem" " #if true" - '' + lib.optionalString buildTests '' + postPatch = lib.optionalString buildTests '' mkdir -p matrices ln -s ${rocsparse.passthru.matrices.matrix-01}/*.mtx matrices @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $sample/bin mv clients/staging/example_* $sample/bin patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( - finalAttrs.buildInputs ++ [ hip gfortran.cc ])} $sample/bin/example_* + finalAttrs.buildInputs ++ [ clr gfortran.cc ])} $sample/bin/example_* ''; passthru.updateScript = rocmUpdateScript { @@ -131,6 +131,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix new file mode 100644 index 0000000000..8bd479c5c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, callPackage +, dpkg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hsa-amd-aqlprofile-bin"; + version = "5.7.1"; + + src = fetchurl { + url = "https://repo.radeon.com/rocm/apt/5.7.1/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.50701.50701-98~22.04_amd64.deb"; + hash = "sha256-LWAtZ0paJW8lhE+QAMwq2l8wM+96bxk5rNWyQXTc9Vo="; + }; + + nativeBuildInputs = [ dpkg ]; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a opt/rocm-${finalAttrs.version}/* $out + chmod +x $out/lib/libhsa-amd-aqlprofile64.so.1.* + chmod +x $out/lib/hsa-amd-aqlprofile/librocprofv2_att.so + + runHook postInstall + ''; + + passthru.updateScript = (callPackage ./update.nix { }) { inherit (finalAttrs) version; }; + + meta = with lib; { + description = "AQLPROFILE library for AMD HSA runtime API extension support"; + homepage = "https://rocm.docs.amd.com/en/latest/"; + license = with licenses; [ unfree ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix new file mode 100644 index 0000000000..95260a7932 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix @@ -0,0 +1,51 @@ +{ lib +, writeScript +}: + +{ version }: + +let + prefix = "hsa-amd-aqlprofile"; + extVersion = lib.strings.concatStrings (lib.strings.intersperse "0" (lib.versions.splitVersion version)); + major = lib.versions.major version; + minor = lib.versions.minor version; + patch = lib.versions.patch version; + + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + apt="https://repo.radeon.com/rocm/apt" + pool="pool/main/h/${prefix}/" + url="$apt/latest/$pool" + res="$(curl -sL "$url")" + deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" + patch="${patch}" + + # Try up to 10 patch versions + for i in {1..10}; do + ((patch++)) + extVersion="$(echo "$deb" | grep -o -P "(?<=\.....).*(?=\..*-)")" + + if (( ''${#extVersion} == 5 )) && (( $extVersion <= ${extVersion} )); then + url="https://repo.radeon.com/rocm/apt/${major}.${minor}.$patch/pool/main/h/${prefix}/" + res="$(curl -sL "$url")" + deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" + else + break + fi + done + + extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" + version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" + + if (( ''${#extVersion} == 5 )); then + repoVersion="$version" + + if (( ''${version:4:1} == 0 )); then + repoVersion=''${version:0:3} + fi + + update-source-version rocmPackages_5.${prefix}-bin "$version" "" "$apt/$repoVersion/$pool$deb" --ignore-same-hash + fi + ''; +in [ updateScript ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/base.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/base.nix index 5475f41130..82de9e6f36 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/base.nix @@ -24,8 +24,7 @@ , targetDir ? "llvm" , targetProjects ? [ ] , targetRuntimes ? [ ] -# "NATIVE" resolves into x86 or aarch64 depending on stdenv -, llvmTargetsToBuild ? [ "NATIVE" ] +, llvmTargetsToBuild ? [ "NATIVE" ] # "NATIVE" resolves into x86 or aarch64 depending on stdenv , extraPatches ? [ ] , extraNativeBuildInputs ? [ ] , extraBuildInputs ? [ ] @@ -39,6 +38,7 @@ ) )] , extraPostInstall ? "" +, hardeningDisable ? [ ] , requiredSystemFeatures ? [ ] , extraLicenses ? [ ] , isBroken ? false @@ -53,7 +53,7 @@ let llvmTargetsToBuild' = [ "AMDGPU" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.4.4"; + version = "5.7.1"; outputs = [ "out" @@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-BDvC6QFDFtahA9hmJDLiM6K4mrO3j9E9rEXm7KulcuA="; + hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8="; }; nativeBuildInputs = [ @@ -108,22 +108,20 @@ in stdenv.mkDerivation (finalAttrs: { "-DLLVM_ENABLE_PROJECTS=${lib.concatStringsSep ";" targetProjects}" ] ++ lib.optionals ((finalAttrs.passthru.isLLVM || targetDir == "runtimes") && targetRuntimes != [ ]) [ "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" targetRuntimes}" - ] ++ lib.optionals (finalAttrs.passthru.isLLVM || finalAttrs.passthru.isClang) [ - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_ENABLE_EH=ON" + ] ++ lib.optionals finalAttrs.passthru.isLLVM [ + "-DLLVM_INSTALL_UTILS=ON" + "-DLLVM_INSTALL_GTEST=ON" ] ++ lib.optionals (buildDocs || buildMan) [ "-DLLVM_INCLUDE_DOCS=ON" "-DLLVM_BUILD_DOCS=ON" # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core "-DLLVM_ENABLE_SPHINX=ON" - "-DLLVM_ENABLE_OCAMLDOC=OFF" "-DSPHINX_OUTPUT_HTML=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ] ++ lib.optionals buildTests [ "-DLLVM_INCLUDE_TESTS=ON" "-DLLVM_BUILD_TESTS=ON" - ] ++ lib.optionals (buildTests && !finalAttrs.passthru.isLLVM) [ "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" ] ++ extraCMakeFlags; @@ -141,10 +139,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = buildTests; checkTarget = lib.concatStringsSep " " checkTargets; - postInstall = lib.optionalString finalAttrs.passthru.isLLVM '' - # `lit` expects these for some test suites - mv bin/{FileCheck,not,count,yaml2obj,obj2yaml} $out/bin - '' + lib.optionalString buildMan '' + postInstall = lib.optionalString buildMan '' mkdir -p $info '' + extraPostInstall; @@ -159,7 +154,7 @@ in stdenv.mkDerivation (finalAttrs: { }; }; - inherit requiredSystemFeatures; + inherit hardeningDisable requiredSystemFeatures; meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/default.nix new file mode 100644 index 0000000000..9226fb8780 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, wrapBintoolsWith +, overrideCC +, rocm-device-libs +, rocm-runtime +, rocm-thunk +, clr +}: + +let + ## Stage 1 ## + # Projects + llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; }; + clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; }; + lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; }; + + # Runtimes + runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; }; + + ## Stage 2 ## + # Helpers + bintools-unwrapped = callPackage ./stage-2/bintools-unwrapped.nix { inherit llvm lld; }; + bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; + rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; }; +in rec { + inherit + llvm + clang-unwrapped + lld + bintools; + + # Runtimes + libc = callPackage ./stage-2/libc.nix { inherit rocmUpdateScript; stdenv = rStdenv; }; + libunwind = callPackage ./stage-2/libunwind.nix { inherit rocmUpdateScript; stdenv = rStdenv; }; + libcxxabi = callPackage ./stage-2/libcxxabi.nix { inherit rocmUpdateScript; stdenv = rStdenv; }; + libcxx = callPackage ./stage-2/libcxx.nix { inherit rocmUpdateScript; stdenv = rStdenv; }; + compiler-rt = callPackage ./stage-2/compiler-rt.nix { inherit rocmUpdateScript llvm; stdenv = rStdenv; }; + + ## Stage 3 ## + # Helpers + clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; }; + rocmClangStdenv = overrideCC stdenv clang; + + # Projects + clang-tools-extra = callPackage ./stage-3/clang-tools-extra.nix { inherit rocmUpdateScript llvm clang-unwrapped; stdenv = rocmClangStdenv; }; + libclc = callPackage ./stage-3/libclc.nix { inherit rocmUpdateScript llvm clang; stdenv = rocmClangStdenv; }; + lldb = callPackage ./stage-3/lldb.nix { inherit rocmUpdateScript clang; stdenv = rocmClangStdenv; }; + mlir = callPackage ./stage-3/mlir.nix { inherit rocmUpdateScript clr; stdenv = rocmClangStdenv; }; + polly = callPackage ./stage-3/polly.nix { inherit rocmUpdateScript; stdenv = rocmClangStdenv; }; + flang = callPackage ./stage-3/flang.nix { inherit rocmUpdateScript clang-unwrapped mlir; stdenv = rocmClangStdenv; }; + openmp = callPackage ./stage-3/openmp.nix { inherit rocmUpdateScript llvm clang-unwrapped clang rocm-device-libs rocm-runtime rocm-thunk; stdenv = rocmClangStdenv; }; + + # Runtimes + pstl = callPackage ./stage-3/pstl.nix { inherit rocmUpdateScript; stdenv = rocmClangStdenv; }; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix new file mode 100644 index 0000000000..113313f4e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix @@ -0,0 +1,46 @@ +{ callPackage +, rocmUpdateScript +, llvm +}: + +callPackage ../base.nix rec { + inherit rocmUpdateScript; + targetName = "clang-unwrapped"; + targetDir = "clang"; + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DCLANG_INCLUDE_TESTS=ON" + ]; + + extraPostPatch = '' + # Looks like they forgot to add finding libedit to the standalone build + ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules + + substituteInPlace CMakeLists.txt \ + --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" + + # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` + rm test/Analysis/scan-build/*.test + rm test/Analysis/scan-build/rebuild_index/rebuild_index.test + + # `does not depend on a module exporting 'baz.h'` + rm test/Modules/header-attribs.cpp + + # We do not have HIP or the ROCm stack available yet + rm test/Driver/hip-options.hip + + # ???? `ld: cannot find crti.o: No such file or directory` linker issue? + rm test/Interpreter/dynamic-library.cpp + + # `fatal error: 'stdio.h' file not found` + rm test/OpenMP/amdgcn_emit_llvm.c + ''; + + extraPostInstall = '' + mv bin/clang-tblgen $out/bin + ''; + + requiredSystemFeatures = [ "big-parallel" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix new file mode 100644 index 0000000000..a7b042eabf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix @@ -0,0 +1,13 @@ +{ callPackage +, rocmUpdateScript +, llvm +}: + +callPackage ../base.nix rec { + inherit rocmUpdateScript; + buildMan = false; # No man pages to build + targetName = "lld"; + targetDir = targetName; + extraBuildInputs = [ llvm ]; + checkTargets = [ "check-${targetName}" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix new file mode 100644 index 0000000000..51959ec8bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -0,0 +1,10 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix { + inherit rocmUpdateScript; + requiredSystemFeatures = [ "big-parallel" ]; + isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix new file mode 100644 index 0000000000..5f6f278ab1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix @@ -0,0 +1,30 @@ +{ lib +, callPackage +, rocmUpdateScript +, llvm +}: + +callPackage ../base.nix rec { + inherit rocmUpdateScript; + buildDocs = false; + buildMan = false; + buildTests = false; + targetName = "runtimes"; + targetDir = targetName; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + "libcxx" + "compiler-rt" + ]; + + extraBuildInputs = [ llvm ]; + + extraCMakeFlags = [ + "-DLIBCXX_INCLUDE_BENCHMARKS=OFF" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; + + extraLicenses = [ lib.licenses.mit ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list new file mode 100644 index 0000000000..e005d6c928 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list @@ -0,0 +1,171 @@ +../libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp +../libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp +../libcxx/test/libcxx/depr/depr.default.allocator/allocator.members/allocate.cxx2a.pass.cpp +../libcxx/test/libcxx/depr/depr.default.allocator/allocator.members/construct.cxx2a.pass.cpp +../libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp +../libcxx/test/libcxx/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp +../libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp +../libcxx/test/libcxx/localization/locales/locale/locale.types/locale.facet/no_allocation.pass.cpp +../libcxx/test/libcxx/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_underaligned_buffer.pass.cpp +../libcxx/test/libcxx/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp +../libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp +../libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp +../libcxx/test/std/containers/associative/map/map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_allocator_requirements.pass.cpp +../libcxx/test/std/containers/associative/multiset/insert_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/containers/associative/set/insert_and_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +../libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +../libcxx/test/std/containers/sequences/vector.bool/ctor_exceptions.pass.cpp +../libcxx/test/std/containers/sequences/vector/vector.cons/exceptions.pass.cpp +../libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp +../libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/insert_and_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/insert_allocator_requirements.pass.cpp +../libcxx/test/std/containers/unord/unord.multiset/insert_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/containers/unord/unord.set/insert_and_emplace_allocator_requirements.pass.cpp +../libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp +../libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp +../libcxx/test/std/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/replace_filename.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/status.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/increment.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move.pass.cpp +../libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.compare.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/path.decompose.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/clear.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/remove_filename.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_extension.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_filename.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/swap.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.factory.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp +../libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp +../libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file_large.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.exists/exists.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_other/is_other.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove/remove.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.rename/rename.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp +../libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp +../libcxx/test/std/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp +../libcxx/test/std/localization/locale.stdcvt/codecvt_utf16.pass.cpp +../libcxx/test/std/localization/locale.stdcvt/codecvt_utf8.pass.cpp +../libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp +../libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp +../libcxx/test/std/strings/basic.string/string.cons/substr_rvalue.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp +../libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp +../libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp +../libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp +../libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp +../libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp +../libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp +../libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.global/new_delete_resource.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.global/null_memory_resource.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp +../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix new file mode 100644 index 0000000000..ef40dd4d38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/bintools-unwrapped.nix @@ -0,0 +1,28 @@ +{ runCommand +, llvm +, lld +}: + +runCommand "rocm-llvm-binutils-${llvm.version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/$(basename $prog) + done + + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/ar + ln -s ${llvm}/bin/llvm-as $out/bin/as + ln -s ${llvm}/bin/llvm-dwp $out/bin/dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/readelf + ln -s ${llvm}/bin/llvm-size $out/bin/size + ln -s ${llvm}/bin/llvm-strip $out/bin/strip + ln -s ${lld}/bin/lld $out/bin/ld +'' diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix new file mode 100644 index 0000000000..3b8e41705e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/compiler-rt.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, callPackage +, rocmUpdateScript +, llvm +, glibc +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "compiler-rt"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + "libcxx" + targetName + ]; + + extraCMakeFlags = [ + "-DCOMPILER_RT_INCLUDE_TESTS=ON" + "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON" + "-DCOMPILER_RT_CXX_LIBRARY=libcxx" + "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF" # We can't run most of these + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; + + extraPostPatch = '' + # `No such file or directory: 'ldd'` + substituteInPlace ../compiler-rt/test/lit.common.cfg.py \ + --replace "'ldd'," "'${glibc.bin}/bin/ldd'," + + # We can run these + substituteInPlace ../compiler-rt/test/CMakeLists.txt \ + --replace "endfunction()" "endfunction()''\nadd_subdirectory(builtins)''\nadd_subdirectory(shadowcallstack)" + + # Could not launch llvm-config in /build/source/runtimes/build/bin + mkdir -p build/bin + ln -s ${llvm}/bin/llvm-config build/bin + ''; + + extraLicenses = [ lib.licenses.mit ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix new file mode 100644 index 0000000000..7e7cf9c2a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libc.nix @@ -0,0 +1,26 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildMan = false; # No man pages to build + targetName = "libc"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + + extraPostPatch = '' + # `Failed to match ... against ...` `Match value not within tolerance value of MPFR result:` + # We need a better way, but I don't know enough sed magic and patching `CMakeLists.txt` isn't working... + substituteInPlace ../libc/test/src/math/log10_test.cpp \ + --replace "i < N" "i < 0" \ + --replace "test(mpfr::RoundingMode::Nearest);" "" \ + --replace "test(mpfr::RoundingMode::Downward);" "" \ + --replace "test(mpfr::RoundingMode::Upward);" "" \ + --replace "test(mpfr::RoundingMode::TowardZero);" "" + ''; + + checkTargets = [ "check-${targetName}" ]; + hardeningDisable = [ "fortify" ]; # Prevent `error: "Assumed value of MB_LEN_MAX wrong"` +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix new file mode 100644 index 0000000000..4732272427 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxx.nix @@ -0,0 +1,42 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildMan = false; # No man pages to build + targetName = "libcxx"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + "libcxxabi" + targetName + ]; + + extraCMakeFlags = [ + "-DLIBCXX_INCLUDE_DOCS=ON" + "-DLIBCXX_INCLUDE_TESTS=ON" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXXABI_INCLUDE_TESTS=OFF" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + "-DLIBCXXABI_INSTALL_LIBRARY=OFF" + "-DLIBCXXABI_INSTALL_HEADERS=OFF" + ]; + + # Most of these can't find `bash` or `mkdir`, might just be hard-coded paths, or PATH is altered + extraPostPatch = '' + chmod +w -R ../libcxx/test/{libcxx,std} + cat ${./1000-libcxx-failing-tests.list} | xargs -d \\n rm + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix new file mode 100644 index 0000000000..e15ec777ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libcxxabi.nix @@ -0,0 +1,37 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libcxxabi"; + targetDir = "runtimes"; + + targetRuntimes = [ + "libunwind" + targetName + "libcxx" + ]; + + extraCMakeFlags = [ + "-DLIBCXXABI_INCLUDE_TESTS=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + + # Workaround having to build combined + "-DLIBUNWIND_INCLUDE_DOCS=OFF" + "-DLIBUNWIND_INCLUDE_TESTS=OFF" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + "-DLIBUNWIND_INSTALL_LIBRARY=OFF" + "-DLIBUNWIND_INSTALL_HEADERS=OFF" + "-DLIBCXX_INCLUDE_DOCS=OFF" + "-DLIBCXX_INCLUDE_TESTS=OFF" + "-DLIBCXX_USE_COMPILER_RT=ON" + "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_INSTALL_LIBRARY=OFF" + "-DLIBCXX_INSTALL_HEADERS=OFF" + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix new file mode 100644 index 0000000000..3d599e0d4b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/libunwind.nix @@ -0,0 +1,26 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildMan = false; # No man pages to build + targetName = "libunwind"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + + extraCMakeFlags = [ + "-DLIBUNWIND_INCLUDE_DOCS=ON" + "-DLIBUNWIND_INCLUDE_TESTS=ON" + "-DLIBUNWIND_USE_COMPILER_RT=ON" + ]; + + extraPostPatch = '' + # `command had no output on stdout or stderr` (Says these unsupported tests) + chmod +w -R ../libunwind/test + rm ../libunwind/test/floatregister.pass.cpp + rm ../libunwind/test/unwind_leaffunction.pass.cpp + rm ../libunwind/test/libunwind_02.pass.cpp + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix new file mode 100644 index 0000000000..45d369a654 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-2/rstdenv.nix @@ -0,0 +1,35 @@ +{ stdenv +, overrideCC +, wrapCCWith +, llvm +, clang-unwrapped +, lld +, runtimes +, bintools +}: + +overrideCC stdenv (wrapCCWith rec { + inherit bintools; + libcxx = runtimes; + cc = clang-unwrapped; + + extraPackages = [ + llvm + lld + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/include $out/resource-root + ln -s ${runtimes}/lib $out/resource-root + ''; +}) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch new file mode 100644 index 0000000000..f4221a0881 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/0000-mlir-fix-debugtranslation.patch @@ -0,0 +1,36 @@ +From f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74 Mon Sep 17 00:00:00 2001 +From: Scott Linder +Date: Mon, 11 Sep 2023 18:37:37 +0000 +Subject: [PATCH] [HeterogeneousDWARF] Update MLIR DI Metadata handling + +Pass a default DW_MSPACE_LLVM_none to satisfy new API + +Change-Id: I50df461f00b5510a715f55f61107122318102d22 +--- + lib/Target/LLVMIR/DebugTranslation.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/Target/LLVMIR/DebugTranslation.cpp b/lib/Target/LLVMIR/DebugTranslation.cpp +index 2053f5bcef06aa6..635ee5d7e5fefdc 100644 +--- a/lib/Target/LLVMIR/DebugTranslation.cpp ++++ b/lib/Target/LLVMIR/DebugTranslation.cpp +@@ -148,7 +148,8 @@ llvm::DIDerivedType *DebugTranslation::translateImpl(DIDerivedTypeAttr attr) { + /*File=*/nullptr, /*Line=*/0, + /*Scope=*/nullptr, translate(attr.getBaseType()), attr.getSizeInBits(), + attr.getAlignInBits(), attr.getOffsetInBits(), +- /*DWARFAddressSpace=*/std::nullopt, /*Flags=*/llvm::DINode::FlagZero); ++ /*DWARFAddressSpace=*/std::nullopt, llvm::dwarf::DW_MSPACE_LLVM_none, ++ /*Flags=*/llvm::DINode::FlagZero); + } + + llvm::DIFile *DebugTranslation::translateImpl(DIFileAttr attr) { +@@ -185,7 +186,8 @@ DebugTranslation::translateImpl(DILocalVariableAttr attr) { + llvmCtx, translate(attr.getScope()), getMDStringOrNull(attr.getName()), + translate(attr.getFile()), attr.getLine(), translate(attr.getType()), + attr.getArg(), +- /*Flags=*/llvm::DINode::FlagZero, attr.getAlignInBits(), ++ /*Flags=*/llvm::DINode::FlagZero, llvm::dwarf::DW_MSPACE_LLVM_none, ++ attr.getAlignInBits(), + /*Annotations=*/nullptr); + } + diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list new file mode 100644 index 0000000000..e53b21b3c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1000-openmp-failing-tests.list @@ -0,0 +1,122 @@ +runtime/test/tasking/hidden_helper_task/gtid.cpp +runtime/test/ompt/parallel/parallel_if0.c +runtime/test/ompt/parallel/serialized.c +runtime/test/ompt/teams/parallel_team.c +runtime/test/ompt/teams/serial_teams.c +runtime/test/ompt/teams/serialized.c +runtime/test/ompt/teams/team.c +libomptarget/test/api/assert.c +libomptarget/test/api/omp_device_managed_memory.c +libomptarget/test/api/omp_device_memory.c +libomptarget/test/api/omp_get_device_num.c +libomptarget/test/api/omp_host_pinned_memory.c +libomptarget/test/api/omp_host_pinned_memory_alloc.c +libomptarget/test/api/omp_target_memcpy_async1.c +libomptarget/test/api/omp_target_memcpy_async2.c +libomptarget/test/api/omp_target_memcpy_rect_async1.c +libomptarget/test/api/omp_target_memcpy_rect_async2.c +libomptarget/test/mapping/array_section_implicit_capture.c +libomptarget/test/mapping/data_absent_at_exit.c +libomptarget/test/mapping/data_member_ref.cpp +libomptarget/test/mapping/declare_mapper_api.cpp +libomptarget/test/mapping/declare_mapper_target.cpp +libomptarget/test/mapping/declare_mapper_target_data.cpp +libomptarget/test/mapping/declare_mapper_target_data_enter_exit.cpp +libomptarget/test/mapping/firstprivate_aligned.cpp +libomptarget/test/mapping/has_device_addr.cpp +libomptarget/test/mapping/implicit_device_ptr.c +libomptarget/test/mapping/is_device_ptr.cpp +libomptarget/test/mapping/lambda_mapping.cpp +libomptarget/test/mapping/low_alignment.c +libomptarget/test/mapping/map_back_race.cpp +libomptarget/test/mapping/power_of_two_alignment.c +libomptarget/test/mapping/pr38704.c +libomptarget/test/mapping/prelock.cpp +libomptarget/test/mapping/present/target_data_at_exit.c +libomptarget/test/mapping/private_mapping.c +libomptarget/test/mapping/ptr_and_obj_motion.c +libomptarget/test/mapping/reduction_implicit_map.cpp +libomptarget/test/mapping/target_derefence_array_pointrs.cpp +libomptarget/test/mapping/target_map_for_member_data.cpp +libomptarget/test/mapping/target_update_array_extension.c +libomptarget/test/mapping/target_use_device_addr.c +libomptarget/test/offloading/atomic-compare-signedness.c +libomptarget/test/offloading/bug47654.cpp +libomptarget/test/offloading/bug49021.cpp +libomptarget/test/offloading/bug49779.cpp +libomptarget/test/offloading/bug50022.cpp +libomptarget/test/offloading/bug51781.c +libomptarget/test/offloading/bug51982.c +libomptarget/test/offloading/bug53727.cpp +libomptarget/test/offloading/complex_reduction.cpp +libomptarget/test/offloading/cuda_no_devices.c +libomptarget/test/offloading/d2d_memcpy.c +libomptarget/test/offloading/dynamic_module.c +libomptarget/test/offloading/dynamic_module_load.c +libomptarget/test/offloading/global_constructor.cpp +libomptarget/test/offloading/lone_target_exit_data.c +libomptarget/test/offloading/memory_manager.cpp +libomptarget/test/offloading/parallel_offloading_map.cpp +libomptarget/test/offloading/static_linking.c +libomptarget/test/offloading/std_complex_arithmetic.cpp +libomptarget/test/offloading/target-teams-atomic.c +libomptarget/test/offloading/target_constexpr_mapping.cpp +libomptarget/test/offloading/target_critical_region.cpp +libomptarget/test/offloading/target_depend_nowait.cpp +libomptarget/test/offloading/target_nowait_target.cpp +libomptarget/test/offloading/taskloop_offload_nowait.cpp +libomptarget/test/offloading/test_libc.cpp +libomptarget/test/ompt/veccopy.c +libomptarget/test/ompt/veccopy_disallow_both.c +libomptarget/test/ompt/veccopy_emi.c +libomptarget/test/ompt/veccopy_emi_map.c +libomptarget/test/ompt/veccopy_map.c +libomptarget/test/ompt/veccopy_no_device_init.c +libomptarget/test/ompt/veccopy_wrong_return.c +libomptarget/test/api/is_initial_device.c +libomptarget/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp +libomptarget/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp +libomptarget/test/mapping/declare_mapper_nested_default_mappers_var.cpp +libomptarget/test/mapping/target_pointers_members_map.cpp +libomptarget/test/api/omp_dynamic_shared_memory_mixed.c +libomptarget/test/api/omp_env_vars.c +libomptarget/test/api/omp_get_mapped_ptr.c +libomptarget/test/api/omp_get_num_devices.c +libomptarget/test/api/omp_get_num_devices_with_empty_target.c +libomptarget/test/mapping/alloc_fail.c +libomptarget/test/mapping/array_section_use_device_ptr.c +libomptarget/test/mapping/declare_mapper_nested_default_mappers.cpp +libomptarget/test/mapping/declare_mapper_nested_mappers.cpp +libomptarget/test/mapping/declare_mapper_target_update.cpp +libomptarget/test/mapping/delete_inf_refcount.c +libomptarget/test/mapping/lambda_by_value.cpp +libomptarget/test/mapping/ompx_hold/omp_target_disassociate_ptr.c +libomptarget/test/mapping/ompx_hold/struct.c +libomptarget/test/mapping/ompx_hold/target-data.c +libomptarget/test/mapping/ompx_hold/target.c +libomptarget/test/mapping/present/target.c +libomptarget/test/mapping/present/target_array_extension.c +libomptarget/test/mapping/present/target_data.c +libomptarget/test/mapping/present/target_data_array_extension.c +libomptarget/test/mapping/present/target_enter_data.c +libomptarget/test/mapping/present/target_exit_data_delete.c +libomptarget/test/mapping/present/target_exit_data_release.c +libomptarget/test/mapping/present/target_update.c +libomptarget/test/mapping/present/target_update_array_extension.c +libomptarget/test/mapping/present/zero_length_array_section.c +libomptarget/test/mapping/present/zero_length_array_section_exit.c +libomptarget/test/mapping/target_data_array_extension_at_exit.c +libomptarget/test/mapping/target_has_device_addr.c +libomptarget/test/mapping/target_implicit_partial_map.c +libomptarget/test/mapping/target_wrong_use_device_addr.c +libomptarget/test/offloading/host_as_target.c +libomptarget/test/offloading/info.c +libomptarget/test/offloading/offloading_success.c +libomptarget/test/offloading/offloading_success.cpp +libomptarget/test/offloading/wtime.c +libomptarget/test/unified_shared_memory/api.c +libomptarget/test/unified_shared_memory/associate_ptr.c +libomptarget/test/unified_shared_memory/close_enter_exit.c +libomptarget/test/unified_shared_memory/close_manual.c +libomptarget/test/unified_shared_memory/close_member.c +libomptarget/test/unified_shared_memory/close_modifier.c diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list new file mode 100644 index 0000000000..0b3d2d2259 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/1001-mlir-failing-tests.list @@ -0,0 +1,11 @@ +./test/Target/LLVMIR/openmp-llvm.mlir +./test/mlir-spirv-cpu-runner/double.mlir +./test/mlir-spirv-cpu-runner/simple_add.mlir +./test/mlir-vulkan-runner/addf.mlir +./test/mlir-vulkan-runner/addi.mlir +./test/mlir-vulkan-runner/addi8.mlir +./test/mlir-vulkan-runner/mulf.mlir +./test/mlir-vulkan-runner/smul_extended.mlir +./test/mlir-vulkan-runner/subf.mlir +./test/mlir-vulkan-runner/time.mlir +./test/mlir-vulkan-runner/umul_extended.mlir diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix new file mode 100644 index 0000000000..d18673ecb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix @@ -0,0 +1,42 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, llvm +, clang-unwrapped +, gtest +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` + targetName = "clang-tools-extra"; + + targetProjects = [ + "clang" + "clang-tools-extra" + ]; + + extraBuildInputs = [ gtest ]; + + extraCMakeFlags = [ + "-DLLVM_INCLUDE_DOCS=OFF" + "-DLLVM_INCLUDE_TESTS=OFF" + "-DCLANG_INCLUDE_DOCS=OFF" + "-DCLANG_INCLUDE_TESTS=ON" + "-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON" + ]; + + extraPostInstall = '' + # Remove LLVM and Clang + for path in `find ${llvm} ${clang-unwrapped}`; do + if [ $path != ${llvm} ] && [ $path != ${clang-unwrapped} ]; then + rm -f $out''${path#${llvm}} $out''${path#${clang-unwrapped}} || true + fi + done + + # Cleanup empty directories + find $out -type d -empty -delete + ''; + + requiredSystemFeatures = [ "big-parallel" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix new file mode 100644 index 0000000000..91f34265f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/clang.nix @@ -0,0 +1,73 @@ +{ stdenv +, wrapCCWith +, llvm +, lld +, clang-unwrapped +, bintools +, libc +, libunwind +, libcxxabi +, libcxx +, compiler-rt +}: + +wrapCCWith rec { + inherit libcxx bintools; + + # We do this to avoid HIP pathing problems, and mimic a monolithic install + cc = stdenv.mkDerivation (finalAttrs: { + inherit (clang-unwrapped) version; + pname = "rocm-llvm-clang"; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + clang_version=`${clang-unwrapped}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/{bin,include/c++/v1,lib/{cmake,clang/$clang_version/{include,lib}},libexec,share} + + for path in ${llvm} ${clang-unwrapped} ${lld} ${libc} ${libunwind} ${libcxxabi} ${libcxx} ${compiler-rt}; do + cp -as $path/* $out + chmod +w $out/{*,include/c++/v1,lib/{clang/$clang_version/include,cmake}} + rm -f $out/lib/libc++.so + done + + ln -s $out/lib/* $out/lib/clang/$clang_version/lib + ln -sf $out/include/* $out/lib/clang/$clang_version/include + + runHook postInstall + ''; + + passthru.isClang = true; + }); + + extraPackages = [ + llvm + lld + libc + libunwind + libcxxabi + compiler-rt + ]; + + nixSupport.cc-cflags = [ + "-resource-dir=$out/resource-root" + "-fuse-ld=lld" + "-rtlib=compiler-rt" + "-unwindlib=libunwind" + "-Wno-unused-command-line-argument" + ]; + + extraBuildCommands = '' + clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + mkdir -p $out/resource-root + ln -s ${cc}/lib/clang/$clang_version/{include,lib} $out/resource-root + + # Not sure why, but hardening seems to make things break + echo "" > $out/nix-support/add-hardening.sh + + # GPU compilation uses builtin `lld` + substituteInPlace $out/bin/{clang,clang++} \ + --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix new file mode 100644 index 0000000000..421663dcb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/flang.nix @@ -0,0 +1,31 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, clang-unwrapped +, mlir +, graphviz +, python3Packages +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + targetName = "flang"; + targetDir = targetName; + + extraNativeBuildInputs = [ + graphviz + python3Packages.sphinx-markdown-tables + ]; + + extraBuildInputs = [ mlir ]; + + extraCMakeFlags = [ + "-DCLANG_DIR=${clang-unwrapped}/lib/cmake/clang" + "-DMLIR_TABLEGEN_EXE=${mlir}/bin/mlir-tblgen" + "-DCLANG_TABLEGEN_EXE=${clang-unwrapped}/bin/clang-tblgen" + "-DFLANG_INCLUDE_TESTS=OFF" # `The dependency target "Bye" of target ...` + ]; + + # `flang/lib/Semantics/check-omp-structure.cpp:1905:1: error: no member named 'v' in 'Fortran::parser::OmpClause::OmpxDynCgroupMem'` + isBroken = true; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix new file mode 100644 index 0000000000..1fd72ee671 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/libclc.nix @@ -0,0 +1,36 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, llvm +, clang +, spirv-llvm-translator +}: + +let + spirv = (spirv-llvm-translator.override { inherit llvm; }); +in callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + targetName = "libclc"; + targetDir = targetName; + extraBuildInputs = [ spirv ]; + + # `spirv-mesa3d` isn't compiling with LLVM 15.0.0, it does with LLVM 14.0.0 + # Try removing the `spirv-mesa3d` and `clspv` patches next update + # `clspv` tests fail, unresolved calls + extraPostPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ + --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ + "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ + --replace " spirv-mesa3d-" "" \ + --replace " spirv64-mesa3d-" "" \ + --replace "NOT \''${t} MATCHES" \ + "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" + ''; + + checkTargets = [ ]; + isBroken = true; # ROCm 5.7.0 doesn't have IR/AttributeMask.h yet...? +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix new file mode 100644 index 0000000000..9b7d25e06d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/lldb.nix @@ -0,0 +1,39 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, clang +, xz +, swig +, lua5_3 +, graphviz +, gtest +, python3Packages +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildTests = false; # FIXME: Bad pathing for clang executable in tests, using relative path most likely + targetName = "lldb"; + targetDir = targetName; + extraNativeBuildInputs = [ python3Packages.sphinx-automodapi ]; + + extraBuildInputs = [ + xz + swig + lua5_3 + graphviz + gtest + ]; + + extraCMakeFlags = [ + "-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR=${clang}/resource-root/lib/clang/$clang_version" + "-DLLDB_INCLUDE_TESTS=ON" + "-DLLDB_INCLUDE_UNITTESTS=ON" + ]; + + extraPostPatch = '' + export clang_version=`clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` + ''; + + checkTargets = [ "check-${targetName}" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix new file mode 100644 index 0000000000..1b0bc29ea6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -0,0 +1,57 @@ +{ stdenv +, callPackage +, rocmUpdateScript +, clr +, vulkan-headers +, vulkan-loader +, glslang +, shaderc +, lit +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildDocs = false; # No decent way to hack this to work + buildMan = false; # No man pages to build + targetName = "mlir"; + targetDir = targetName; + + # Fix `DebugTranslation.cpp:139:10: error: no matching function for call to 'get'` + # We patch at a different source root, so we modify the patch and include it locally + # https://github.com/RadeonOpenCompute/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch + extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ]; + extraNativeBuildInputs = [ clr ]; + + extraBuildInputs = [ + vulkan-headers + vulkan-loader + glslang + shaderc + ]; + + extraCMakeFlags = [ + "-DMLIR_INCLUDE_DOCS=ON" + "-DMLIR_INCLUDE_TESTS=ON" + "-DMLIR_ENABLE_ROCM_RUNNER=ON" + "-DMLIR_ENABLE_SPIRV_CPU_RUNNER=ON" + "-DMLIR_ENABLE_VULKAN_RUNNER=ON" + "-DROCM_TEST_CHIPSET=gfx000" # CPU runner + ]; + + extraPostPatch = '' + # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` + substituteInPlace CMakeLists.txt \ + --replace "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" + + # Mainly `No such file or directory` + cat ${./1001-mlir-failing-tests.list} | xargs -d \\n rm + ''; + + extraPostInstall = '' + mkdir -p $out/bin + mv bin/mlir-tblgen $out/bin + ''; + + checkTargets = [ "check-${targetName}" ]; + requiredSystemFeatures = [ "big-parallel" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix new file mode 100644 index 0000000000..5fd7b6fd9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/openmp.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, callPackage +, rocmUpdateScript +, llvm +, clang +, clang-unwrapped +, rocm-device-libs +, rocm-runtime +, rocm-thunk +, perl +, elfutils +, libdrm +, numactl +, lit +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + targetName = "openmp"; + targetDir = targetName; + extraNativeBuildInputs = [ perl ]; + + extraBuildInputs = [ + rocm-device-libs + rocm-runtime + rocm-thunk + elfutils + libdrm + numactl + ]; + + extraCMakeFlags = [ + "-DCMAKE_MODULE_PATH=/build/source/llvm/cmake/modules" # For docs + "-DCLANG_TOOL=${clang}/bin/clang" + "-DCLANG_OFFLOAD_BUNDLER_TOOL=${clang-unwrapped}/bin/clang-offload-bundler" + "-DPACKAGER_TOOL=${clang-unwrapped}/bin/clang-offload-packager" + "-DOPENMP_LLVM_TOOLS_DIR=${llvm}/bin" + "-DOPENMP_LLVM_LIT_EXECUTABLE=${lit}/bin/.lit-wrapped" + "-DDEVICELIBS_ROOT=${rocm-device-libs.src}" + ]; + + extraPostPatch = '' + # We can't build this target at the moment + substituteInPlace libomptarget/DeviceRTL/CMakeLists.txt \ + --replace "gfx1010" "" + + # No idea what's going on here... + cat ${./1000-openmp-failing-tests.list} | xargs -d \\n rm + ''; + + checkTargets = [ "check-${targetName}" ]; + extraLicenses = [ lib.licenses.mit ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix new file mode 100644 index 0000000000..e001f33dfd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/polly.nix @@ -0,0 +1,18 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + targetName = "polly"; + targetDir = targetName; + + extraPostPatch = '' + # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` + substituteInPlace CMakeLists.txt \ + --replace "NOT TARGET gtest" "FALSE" + ''; + + checkTargets = [ "check-${targetName}" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix new file mode 100644 index 0000000000..dc7d7cd6cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/llvm/stage-3/pstl.nix @@ -0,0 +1,15 @@ +{ stdenv +, callPackage +, rocmUpdateScript +}: + +callPackage ../base.nix rec { + inherit stdenv rocmUpdateScript; + buildDocs = false; # No documentation to build + buildMan = false; # No man pages to build + buildTests = false; # Too many errors + targetName = "pstl"; + targetDir = "runtimes"; + targetRuntimes = [ targetName ]; + checkTargets = [ "check-${targetName}" ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/migraphx/default.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/migraphx/default.nix index 3b32b86f41..3283ffc10c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/migraphx/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -5,11 +5,12 @@ , pkg-config , cmake , rocm-cmake -, hip +, clr , clang-tools-extra , openmp , rocblas , rocmlir +, composable_kernel , miopengemm , miopen , protobuf @@ -19,7 +20,9 @@ , sqlite , oneDNN_2 , blaze -, texlive +, cppcheck +, rocm-device-libs +, texliveSmall , doxygen , sphinx , docutils @@ -30,8 +33,7 @@ }: let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small + latex = lib.optionalAttrs buildDocs (texliveSmall.withPackages (ps: with ps; [ latexmk tex-gyre fncychap @@ -42,11 +44,11 @@ let tabulary varwidth titlesec - epstopdf; - }; + epstopdf + ])); in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -60,14 +62,14 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UDhm+j9qs4Rk81C1PE4kkacytfY2StYbfsCOtFL+p6s="; + hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ="; }; nativeBuildInputs = [ pkg-config cmake rocm-cmake - hip + clr clang-tools-extra python3Packages.python ] ++ lib.optionals buildDocs [ @@ -84,6 +86,7 @@ in stdenv.mkDerivation (finalAttrs: { openmp rocblas rocmlir + composable_kernel miopengemm miopen protobuf @@ -93,18 +96,16 @@ in stdenv.mkDerivation (finalAttrs: { sqlite oneDNN_2 blaze + cppcheck python3Packages.pybind11 python3Packages.onnx ]; cmakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0079=NEW" - # "-DCMAKE_C_COMPILER=hipcc" - # "-DCMAKE_CXX_COMPILER=hipcc" - "-DMIGRAPHX_ENABLE_GPU=OFF" # GPU compilation is broken, don't know why + "-DMIGRAPHX_ENABLE_GPU=ON" "-DMIGRAPHX_ENABLE_CPU=ON" "-DMIGRAPHX_ENABLE_FPGA=ON" - "-DMIGRAPHX_ENABLE_MLIR=ON" + "-DMIGRAPHX_ENABLE_MLIR=OFF" # LLVM or rocMLIR mismatch? # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -113,10 +114,20 @@ in stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...` + export CXXFLAGS+="--rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" patchShebangs tools + # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` + substituteInPlace CMakeLists.txt \ + --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" + + # JIT library was removed from composable_kernel... + # https://github.com/ROCmSoftwarePlatform/composable_kernel/issues/782 substituteInPlace src/targets/gpu/CMakeLists.txt \ - --replace "CMAKE_CXX_COMPILER MATCHES \".*clang\\\+\\\+\$\"" "TRUE" + --replace " COMPONENTS jit_library" "" \ + --replace " composable_kernel::jit_library" "" \ + --replace "if(WIN32)" "if(TRUE)" '' + lib.optionalString (!buildDocs) '' substituteInPlace CMakeLists.txt \ --replace "add_subdirectory(doc)" "" @@ -155,6 +166,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/miopen/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/miopen/default.nix new file mode 100644 index 0000000000..4a0cf92188 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/miopen/default.nix @@ -0,0 +1,239 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, rocmUpdateScript +, runCommand +, pkg-config +, cmake +, rocm-cmake +, rocblas +, rocmlir +, clr +, clang-tools-extra +, clang-ocl +, miopengemm +, composable_kernel +, frugally-deep +, rocm-docs-core +, half +, boost +, sqlite +, bzip2 +, lbzip2 +, nlohmann_json +, texliveSmall +, doxygen +, sphinx +, zlib +, gtest +, rocm-comgr +, python3Packages +, buildDocs ? false # Needs internet because of rocm-docs-core +, buildTests ? false +, useOpenCL ? false +}: + +let + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "MIOpen"; + rev = "rocm-${version}"; + hash = "sha256-xcKmFI8HcRA9bbh6EQGElKykIQ3RJX/q5f4IxXvM1Is="; + fetchLFS = true; + leaveDotGit = true; + + # If you're reading this, it's gonna take a bit of time. + # fetchSubModules doesn't work with postFetch??? + # fetchLFS isn't actually fetching the LFS files... + postFetch = '' + export HOME=$(mktemp -d) + cd $out + + # We need more history to fetch LFS files + git remote add origin $url + git fetch origin + git clean -fdx + git checkout rocm-${version} + + # We need to do this manually since using leaveDotGit and fetchSubmodules errors + git submodule update --init + + # Fetch the LFS files + git lfs install + git lfs fetch --all + git lfs checkout + + # Remove the defunct .git folder + rm -rf .git + ''; + }; + + latex = lib.optionalAttrs buildDocs (texliveSmall.withPackages (ps: with ps; [ + latexmk + tex-gyre + fncychap + wrapfig + capt-of + framed + needspace + tabulary + varwidth + titlesec + ])); + + gfx900 = runCommand "miopen-gfx900.kdb" { preferLocalBuild = true; } '' + ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx900.kdb.bz2 > $out + ''; + + gfx906 = runCommand "miopen-gfx906.kdb" { preferLocalBuild = true; } '' + ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx906.kdb.bz2 > $out + ''; + + gfx908 = runCommand "miopen-gfx908.kdb" { preferLocalBuild = true; } '' + ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx908.kdb.bz2 > $out + ''; + + gfx90a = runCommand "miopen-gfx90a.kdb" { preferLocalBuild = true; } '' + ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx90a.kdb.bz2 > $out + ''; + + gfx1030 = runCommand "miopen-gfx1030.kdb" { preferLocalBuild = true; } '' + ${lbzip2}/bin/lbzip2 -ckd ${src}/src/kernels/gfx1030.kdb.bz2 > $out + ''; +in stdenv.mkDerivation (finalAttrs: { + inherit version src; + pname = "miopen"; + + # Find zstd and add to target. Mainly for torch. + patches = [ + (fetchpatch { + url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; + hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M="; + }) + (fetchpatch { + url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; + hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; + }) + ]; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildTests [ + "test" + ]; + + nativeBuildInputs = [ + pkg-config + cmake + rocm-cmake + clr + clang-tools-extra + ]; + + buildInputs = [ + rocblas + rocmlir + clang-ocl + miopengemm + composable_kernel + half + boost + sqlite + bzip2 + nlohmann_json + frugally-deep + ] ++ lib.optionals buildDocs [ + latex + doxygen + sphinx + rocm-docs-core + python3Packages.sphinx-rtd-theme + python3Packages.breathe + python3Packages.myst-parser + ] ++ lib.optionals buildTests [ + zlib + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-Wno-#warnings" # -> + "-DMIOPEN_USE_MIOPENGEMM=ON" + "-DUNZIPPER=${bzip2}/bin/bunzip2" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (!useOpenCL) [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DMIOPEN_BACKEND=HIP" + ] ++ lib.optionals useOpenCL [ + "-DMIOPEN_BACKEND=OpenCL" + ] ++ lib.optionals buildTests [ + "-DBUILD_TESTS=ON" + "-DMIOPEN_TEST_ALL=ON" + ]; + + postPatch = '' + patchShebangs test src/composable_kernel fin utils install_deps.cmake + + substituteInPlace CMakeLists.txt \ + --replace "unpack_db(\"\''${CMAKE_SOURCE_DIR}/src/kernels/\''${FILE_NAME}.kdb.bz2\")" "" \ + --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ + --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' + + substituteInPlace test/gtest/CMakeLists.txt \ + --replace "include(googletest)" "" + + ln -sf ${gfx900} src/kernels/gfx900.kdb + ln -sf ${gfx906} src/kernels/gfx906.kdb + ln -sf ${gfx908} src/kernels/gfx908.kdb + ln -sf ${gfx90a} src/kernels/gfx90a.kdb + ln -sf ${gfx1030} src/kernels/gfx1030.kdb + ''; + + # Unfortunately, it seems like we have to call make on these manually + postBuild = lib.optionalString buildDocs '' + python -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html + '' + lib.optionalString buildTests '' + make -j$NIX_BUILD_CORES check + ''; + + postInstall = '' + rm $out/bin/install_precompiled_kernels.sh + ln -sf ${gfx900} $out/share/miopen/db/gfx900.kdb + ln -sf ${gfx906} $out/share/miopen/db/gfx906.kdb + ln -sf ${gfx908} $out/share/miopen/db/gfx908.kdb + ln -sf ${gfx90a} $out/share/miopen/db/gfx90a.kdb + ln -sf ${gfx1030} $out/share/miopen/db/gfx1030.kdb + '' + lib.optionalString buildDocs '' + mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} + '' + lib.optionalString buildTests '' + mkdir -p $test/bin + mv bin/test_* $test/bin + patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ + [ clr rocm-comgr ])} $test/bin/* + ''; + + requiredSystemFeatures = [ "big-parallel" ]; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Machine intelligence library for ROCm"; + homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/miopengemm/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/miopengemm/default.nix similarity index 81% rename from third_party/nixpkgs/pkgs/development/libraries/miopengemm/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/miopengemm/default.nix index f288cfda54..f56e42da59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/miopengemm/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -4,8 +4,9 @@ , rocmUpdateScript , cmake , rocm-cmake -, rocm-opencl-runtime -, texlive +, clr +, clblast +, texliveSmall , doxygen , sphinx , openblas @@ -16,8 +17,7 @@ }: let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small + latex = lib.optionalAttrs buildDocs (texliveSmall.withPackages (ps: with ps; [ latexmk tex-gyre fncychap @@ -27,11 +27,11 @@ let needspace tabulary varwidth - titlesec; - }; + titlesec + ])); in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; - version = "5.4.3"; + version = "5.5.0"; outputs = [ "out" @@ -53,11 +53,10 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake rocm-cmake + clr ]; - buildInputs = [ - rocm-opencl-runtime - ] ++ lib.optionals buildDocs [ + buildInputs = lib.optionals buildDocs [ latex doxygen sphinx @@ -65,6 +64,9 @@ in stdenv.mkDerivation (finalAttrs: { python3Packages.breathe ] ++ lib.optionals buildTests [ openblas + ] ++ lib.optionals buildBenchmarks [ + clblast + python3Packages.openai-triton ]; cmakeFlags = [ @@ -77,10 +79,8 @@ in stdenv.mkDerivation (finalAttrs: { "-DOPENBLAS=ON" ] ++ lib.optionals buildBenchmarks [ "-DAPI_BENCH_MIOGEMM=ON" - # Needs https://github.com/CNugteren/CLBlast - # "-DAPI_BENCH_CLBLAST=ON" - # Needs https://github.com/openai/triton - # "-DAPI_BENCH_ISAAC=ON" + "-DAPI_BENCH_CLBLAST=ON" + "-DAPI_BENCH_ISAAC=ON" ]; # Unfortunately, it seems like we have to call make on these manually @@ -118,6 +118,8 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + # They are not making tags or releases, this may break other derivations in the future + # Use version major instead of minor, 6.0 will HOPEFULLY have a release or tag + broken = versions.major finalAttrs.version != versions.major stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/mivisionx/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/mivisionx/default.nix new file mode 100644 index 0000000000..7eac2a4ca4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -0,0 +1,145 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocm-device-libs +, clr +, pkg-config +, rpp +, rocblas +, miopengemm +, miopen +, migraphx +, clang +, openmp +, protobuf +, qtcreator +, opencv +, ffmpeg +, boost +, libjpeg_turbo +, half +, lmdb +, rapidjson +, rocm-docs-core +, python3Packages +, useOpenCL ? false +, useCPU ? false +, buildDocs ? false # Needs internet +, gpuTargets ? [ ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mivisionx-" + ( + if (!useOpenCL && !useCPU) then "hip" + else if (!useOpenCL && !useCPU) then "opencl" + else "cpu" + ); + + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "GPUOpen-ProfessionalCompute-Libraries"; + repo = "MIVisionX"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + clr + pkg-config + ] ++ lib.optionals buildDocs [ + rocm-docs-core + python3Packages.python + ]; + + buildInputs = [ + miopengemm + miopen + migraphx + rpp + rocblas + openmp + half + protobuf + qtcreator + opencv + ffmpeg + boost + libjpeg_turbo + lmdb + rapidjson + python3Packages.pybind11 + python3Packages.numpy + python3Packages.torchWithRocm + ]; + + cmakeFlags = [ + "-DROCM_PATH=${clr}" + "-DAMDRPP_PATH=${rpp}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_PREFIX_PYTHON=lib" + # "-DAMD_FP16_SUPPORT=ON" `error: typedef redefinition with different types ('__half' vs 'half_float::half')` + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals (!useOpenCL && !useCPU) [ + "-DBACKEND=HIP" + ] ++ lib.optionals (useOpenCL && !useCPU) [ + "-DBACKEND=OCL" + ] ++ lib.optionals useCPU [ + "-DBACKEND=CPU" + ]; + + postPatch = '' + # We need to not use hipcc and define the CXXFLAGS manually due to `undefined hidden symbol: tensorflow:: ...` + export CXXFLAGS+="--rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + patchShebangs rocAL/rocAL_pybind/examples + + # Properly find miopengemm and miopen + substituteInPlace amd_openvx_extensions/CMakeLists.txt \ + --replace "miopengemm PATHS \''${ROCM_PATH} QUIET" "miopengemm PATHS ${miopengemm} QUIET" \ + --replace "miopen PATHS \''${ROCM_PATH} QUIET" "miopen PATHS ${miopen} QUIET" \ + --replace "\''${ROCM_PATH}/include/miopen/config.h" "${miopen}/include/miopen/config.h" + + # Properly find turbojpeg + substituteInPlace amd_openvx/cmake/FindTurboJpeg.cmake \ + --replace "\''${TURBO_JPEG_PATH}/include" "${libjpeg_turbo.dev}/include" \ + --replace "\''${TURBO_JPEG_PATH}/lib" "${libjpeg_turbo.out}/lib" + + # Fix bad paths + substituteInPlace rocAL/rocAL/rocAL_hip/CMakeLists.txt amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt amd_openvx/openvx/hipvx/CMakeLists.txt \ + --replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clang}/bin/clang++" + ''; + + postBuild = lib.optionalString buildDocs '' + python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html + ''; + + postInstall = lib.optionalString (!useOpenCL && !useCPU) '' + patchelf $out/lib/rocal_pybind*.so --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" + chmod +x $out/lib/rocal_pybind*.so + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; + homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rccl/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rccl/default.nix similarity index 74% rename from third_party/nixpkgs/pkgs/development/libraries/rccl/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rccl/default.nix index b3aaaff82f..3f011d3fdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rccl/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rccl/default.nix @@ -5,15 +5,18 @@ , cmake , rocm-cmake , rocm-smi -, hip +, clr +, perl +, hipify , gtest , chrpath , buildTests ? false +, gpuTargets ? [ ] }: stdenv.mkDerivation (finalAttrs: { pname = "rccl"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -25,13 +28,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hQTzaiPMo5FAVScmxV0iNhy80uJ1xvx/kzlbfwROOs4="; + hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr + perl + hipify ]; buildInputs = [ @@ -42,22 +47,25 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" + "-DBUILD_BFD=OFF" # Can't get it to detect bfd.h # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_TESTS=ON" ]; - # Replace the manually set parallel jobs to NIX_BUILD_CORES postPatch = '' + patchShebangs src tools + + # Really strange behavior, `#!/usr/bin/env perl` should work... substituteInPlace CMakeLists.txt \ - --replace "8 P" "$NIX_BUILD_CORES P" \ - --replace "8)" "$NIX_BUILD_CORES)" + --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" ''; postInstall = lib.optionalString buildTests '' @@ -78,6 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rdc/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rdc/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/tools/misc/rdc/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rdc/default.nix index 906f35b47c..8b447454fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rdc/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rdc/default.nix @@ -11,15 +11,14 @@ , openssl , doxygen , graphviz -, texlive +, texliveSmall , gtest , buildDocs ? true , buildTests ? false }: let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small + latex = lib.optionalAttrs buildDocs (texliveSmall.withPackages (ps: with ps; [ changepage latexmk varwidth @@ -37,11 +36,11 @@ let etoc helvetic wasy - courier; - }; + courier + ])); in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "5.4.2"; + version = "5.7.1"; outputs = [ "out" @@ -55,7 +54,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-dYacqkRp+zVejo/4dME1K6EN8t/1EBtIynEQ+AQ4JZo="; + hash = "sha256-xZD/WI/LfNtKK9j6ZjuU0OTTFZz3G4atyD5mVcSsQ8A="; }; nativeBuildInputs = [ @@ -120,6 +119,7 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version; + # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version; + broken = true; # Too many errors, unsure how to fix }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocalution/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocalution/default.nix index 2796215d03..2a0e149bb3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocalution/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -8,7 +8,7 @@ , rocsparse , rocprim , rocrand -, hip +, clr , git , openmp , openmpi @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jovhodhNa7tr1bSqpZCKI/9xF7Ie96JB+giqAEfis2k="; + hash = "sha256-+UGpFuZsC4+kmo8LWZWC2YoFJSdTukjN47e1YqW5Zu4="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr git ]; @@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCM_PATH=${hip}" - "-DHIP_ROOT_DIR=${hip}" + "-DROCM_PATH=${clr}" + "-DHIP_ROOT_DIR=${clr}" "-DSUPPORT_HIP=ON" "-DSUPPORT_OMP=ON" "-DSUPPORT_MPI=ON" @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { rm $sample/bin/rocalution-bench || true patchelf --set-rpath \ - $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} \ + $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ clr ])} \ $sample/bin/* '' + lib.optionalString (buildTests || buildBenchmarks) '' rmdir $out/bin @@ -110,6 +110,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocblas/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocblas/default.nix similarity index 53% rename from third_party/nixpkgs/pkgs/development/libraries/rocblas/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocblas/default.nix index 11385ae640..ca6a9e6e72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -1,10 +1,12 @@ -{ lib +{ rocblas +, lib , stdenv , fetchFromGitHub , rocmUpdateScript +, runCommand , cmake , rocm-cmake -, hip +, clr , python3 , tensile , msgpack @@ -18,16 +20,60 @@ , buildTests ? false , buildBenchmarks ? false , tensileLogic ? "asm_full" -, tensileCOVersion ? "V3" +, tensileCOVersion ? "default" , tensileSepArch ? true , tensileLazyLib ? true , tensileLibFormat ? "msgpack" , gpuTargets ? [ "all" ] }: -stdenv.mkDerivation (finalAttrs: { +let + # NOTE: Update the default GPU targets on every update + gfx80 = (rocblas.override { + gpuTargets = [ + "gfx803" + ]; + }).overrideAttrs { pname = "rocblas-tensile-gfx80"; }; + + gfx90 = (rocblas.override { + gpuTargets = [ + "gfx900" + "gfx906:xnack-" + "gfx908:xnack-" + "gfx90a:xnack+" + "gfx90a:xnack-" + ]; + }).overrideAttrs { pname = "rocblas-tensile-gfx90"; }; + + gfx94 = (rocblas.override { + gpuTargets = [ + "gfx940" + "gfx941" + "gfx942" + ]; + }).overrideAttrs { pname = "rocblas-tensile-gfx94"; }; + + gfx10 = (rocblas.override { + gpuTargets = [ + "gfx1010" + "gfx1012" + "gfx1030" + ]; + }).overrideAttrs { pname = "rocblas-tensile-gfx10"; }; + + gfx11 = (rocblas.override { + gpuTargets = [ + "gfx1100" + "gfx1101" + "gfx1102" + ]; + }).overrideAttrs { pname = "rocblas-tensile-gfx11"; }; + + # Unfortunately, we have to do two full builds, otherwise we get overlapping _fallback.dat files + fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; +in stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -41,13 +87,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-XhYpzBXviMnUdbF6lZi9g0LARKpzWLtDxJxLI3MuHiM="; + hash = "sha256-3wKnwvAra8u9xqlC05wUD+gSoBILTVJFU2cIV6xv3Lk="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr ]; buildInputs = [ @@ -56,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { msgpack libxml2 python3Packages.msgpack + python3Packages.joblib ] ++ lib.optionals buildTests [ gtest ] ++ lib.optionals (buildTests || buildBenchmarks) [ @@ -80,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals buildTensile [ "-DVIRTUALENV_HOME_DIR=/build/source/tensile" "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/lib/python${python3.pythonVersion}/site-packages/Tensile" + "-DTensile_ROOT=/build/source/tensile/${python3.sitePackages}/Tensile" "-DTensile_LOGIC=${tensileLogic}" "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" @@ -94,8 +141,21 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" ]; - # Tensile REALLY wants to write to the nix directory if we include it normally - postPatch = lib.optionalString buildTensile '' + postPatch = lib.optionalString (finalAttrs.pname != "rocblas") '' + # Return early and install tensile files manually + substituteInPlace library/src/CMakeLists.txt \ + --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" + '' + lib.optionalString (buildTensile && finalAttrs.pname == "rocblas") '' + # Link the prebuilt Tensile files + mkdir -p build/Tensile/library + + for path in ${gfx80} ${gfx90} ${gfx94} ${gfx10} ${gfx11} ${fallbacks}; do + ln -s $path/lib/rocblas/library/* build/Tensile/library + done + + unlink build/Tensile/library/TensileManifest.txt + '' + lib.optionalString buildTensile '' + # Tensile REALLY wants to write to the nix directory if we include it normally cp -a ${tensile} tensile chmod +w -R tensile @@ -108,7 +168,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" ''; - postInstall = lib.optionalString buildTests '' + postInstall = lib.optionalString (finalAttrs.pname == "rocblas") '' + ln -sf ${fallbacks}/lib/rocblas/library/TensileManifest.txt $out/lib/rocblas/library + '' + lib.optionalString (finalAttrs.pname != "rocblas") '' + mkdir -p $out/lib/rocblas/library + rm -rf $out/share + '' + lib.optionalString (finalAttrs.pname != "rocblas" && finalAttrs.pname != "rocblas-tensile-fallbacks") '' + rm Tensile/library/{TensileManifest.txt,*_fallback.dat} + mv Tensile/library/* $out/lib/rocblas/library + '' + lib.optionalString (finalAttrs.pname == "rocblas-tensile-fallbacks") '' + mv Tensile/library/{TensileManifest.txt,*_fallback.dat} $out/lib/rocblas/library + '' + lib.optionalString buildTests '' mkdir -p $test/bin cp -a $out/bin/* $test/bin rm $test/bin/*-bench || true @@ -134,6 +204,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocdbgapi/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocdbgapi/default.nix similarity index 79% rename from third_party/nixpkgs/pkgs/development/libraries/rocdbgapi/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index dfeb924991..dbc3f64781 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocdbgapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -7,15 +7,15 @@ , git , rocm-comgr , rocm-runtime -, texlive +, hwdata +, texliveSmall , doxygen , graphviz , buildDocs ? true }: let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small + latex = lib.optionalAttrs buildDocs (texliveSmall.withPackages (ps: with ps; [ changepage latexmk varwidth @@ -33,11 +33,11 @@ let etoc helvetic wasy - courier; - }; + courier + ])); in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "5.4.2"; + version = "5.7.1"; outputs = [ "out" @@ -49,7 +49,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCm-Developer-Tools"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-KoFa6JzoEPT5/ns9X/hMfu8bOh29HD9n2qGJ3gzhiBA="; + hash = "sha256-qMXvgcS61lgcylz62ErYq8fhpYIR31skQEeKUryuP1w="; }; nativeBuildInputs = [ @@ -65,6 +65,16 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-comgr rocm-runtime + hwdata + ]; + + cmakeFlags = [ + "-DPCI_IDS_PATH=${hwdata}/share/hwdata" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; # Unfortunately, it seems like we have to call make on this manually diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocfft/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocfft/default.nix index d1136d4be8..309a7f2fe2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, hip +, clr , python3 , rocm-cmake , sqlite @@ -14,118 +14,42 @@ , gtest , openmp , rocrand -# NOTE: Update the default GPU targets on every update -, gpuTargets ? [ - "gfx803" - "gfx900" - "gfx906" - "gfx908" - "gfx90a" - "gfx1030" - "gfx1100" - "gfx1102" -] +, gpuTargets ? [ ] }: -let - # To avoid output limit exceeded errors in hydra, we build kernel - # device libs and the kernel RTC cache database in separate derivations - kernelDeviceLibs = map - (target: - (rocfft.overrideAttrs (prevAttrs: { - pname = "rocfft-device-${target}"; - - patches = prevAttrs.patches ++ [ - # Add back install rule for device library - # This workaround is needed because rocm_install_targets - # doesn't support an EXCLUDE_FROM_ALL option - ./device-install.patch - ]; - - buildFlags = [ "rocfft-device-${target}" ]; - - installPhase = '' - runHook preInstall - cmake --install . --component device - runHook postInstall - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - })).override { - gpuTargets = [ target ]; - } - ) - gpuTargets; - - # TODO: Figure out how to also split this by GPU target - # - # It'll be bit more complicated than what we're doing for the kernel - # device libs, because the kernel cache needs to be compiled into - # one sqlite database (whereas the device libs can be linked into - # rocfft as separate libraries for each GPU target). - # - # It's not clear why this needs to even be a db in the first place. - # It would simplify things A LOT if we could just store these - # pre-compiled kernels as files (but that'd need a lot of patching). - kernelRtcCache = rocfft.overrideAttrs (_: { - pname = "rocfft-kernel-cache"; - - buildFlags = [ "rocfft_kernel_cache_target" ]; - - installPhase = '' - runHook preInstall - cmake --install . --component kernel_cache - runHook postInstall - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - }); -in stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; - version = "5.4.3"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk="; + hash = "sha256-GZSi03geTT+NUztBWhGYyghLqJGsFjUQzVAKQ7d03uA="; }; - patches = [ - # Exclude kernel compilation & installation from "all" target, - # and split device libraries by GPU target - ./split-kernel-compilation.patch - ]; - nativeBuildInputs = [ cmake - hip + clr python3 rocm-cmake ]; - buildInputs = [ - sqlite - ] ++ lib.optionals (finalAttrs.pname == "rocfft") kernelDeviceLibs; + buildInputs = [ sqlite ]; cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" - "-DUSE_HIP_CLANG=ON" "-DSQLITE_USE_SYSTEM_PACKAGE=ON" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ]; - postInstall = lib.optionalString (finalAttrs.pname == "rocfft") '' - ln -s ${kernelRtcCache}/lib/rocfft_kernel_cache.db "$out/lib" - ''; - passthru = { test = stdenv.mkDerivation { pname = "${finalAttrs.pname}-test"; @@ -135,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - hip + clr rocm-cmake ]; @@ -168,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - hip + clr rocm-cmake ]; @@ -201,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - hip + clr rocm-cmake ]; @@ -232,12 +156,14 @@ stdenv.mkDerivation (finalAttrs: { }; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "FFT implementation for ROCm"; homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rocgdb/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocgdb/default.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/tools/misc/rocgdb/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocgdb/default.nix index 8775ca6d2d..facec0cf16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rocgdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DORPvfon32+rIk+YcO9LlUefNvvC7trmiTswg9MMuIs="; + hash = "sha256-TlT7vvTrVd7P6ilVnWIG5VIrjTleFgDezK/mudBV+xE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-cmake/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index 206038c0b6..d88912154f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "5.4.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JarQqiiZ36WV1d6vyQD546GN1EtoKLcdvcZsG3QWD2Y="; + hash = "sha256-aVjzuJ4BiSfwOdjufFc5CznfnL8di5h992zl+pzD0DU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-comgr/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 6dc7b87934..8411c4d53c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -15,16 +15,15 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; - version = "5.4.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs="; + hash = "sha256-QB3G0V92UTW67hD6+zSuExN1+eMT820iYSlMyZeWSFw="; }; - patches = [ ./cmake.patch ]; sourceRoot = "${finalAttrs.src.name}/lib/comgr"; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix new file mode 100644 index 0000000000..a29575168b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rocm-core"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "rocm-core"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-jFAHLqf/AR27Nbuq8aypWiKqApNcTgG5LWESVjVCKIg="; + }; + + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DROCM_VERSION=${finalAttrs.version}" ]; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + page = "tags?per_page=1"; + filter = ".[0].name | split(\"-\") | .[1]"; + }; + + meta = with lib; { + description = "Utility for getting the ROCm release version"; + homepage = "https://github.com/RadeonOpenCompute/rocm-core"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/cmake.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-device-libs/cmake.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/cmake.patch rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-device-libs/cmake.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 92e84fe141..844f38a9a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; - version = "5.4.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk="; + hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU="; }; patches = [ ./cmake.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix new file mode 100644 index 0000000000..220e89fe71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, buildPythonPackage +, setuptools +, beautifulsoup4 +, gitpython +, pydata-sphinx-theme +, pygithub +, sphinx +, breathe +, myst-parser +, sphinx-book-theme +, sphinx-copybutton +, sphinx-design +, sphinx-external-toc +, sphinx-notfound-page +, pyyaml +, fastjsonschema +}: + +buildPythonPackage rec { + pname = "rocm-docs-core"; + version = "0.26.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "RadeonOpenCompute"; + repo = "rocm-docs-core"; + rev = "v${version}"; + hash = "sha256-Mr6/Ne6P+TapoCqN7xkKMNse3fTaIAvvLmMl0kVg7Vs="; + }; + + buildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + beautifulsoup4 + gitpython + pydata-sphinx-theme + pygithub + sphinx + breathe + myst-parser + sphinx-book-theme + sphinx-copybutton + sphinx-design + sphinx-external-toc + sphinx-notfound-page + pyyaml + fastjsonschema + ]; + + pythonImportsCheck = [ "rocm_docs" ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "ROCm Documentation Python package for ReadTheDocs build standardization"; + homepage = "https://github.com/RadeonOpenCompute/rocm-docs-core"; + license = with licenses; [ mit cc-by-40 ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-runtime/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index d10f7811cc..79174c7032 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "5.4.3"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JkTXTQmdESHSFbA6HZdMK3pYEApz9aoAlMzdXayzdyY="; + hash = "sha256-D7Ahan5cxDhqPtV5iDDNys0A4FlxQ9oVRa2EeMoY5Qk="; }; sourceRoot = "${finalAttrs.src.name}/src"; @@ -50,8 +50,10 @@ stdenv.mkDerivation (finalAttrs: { --replace 'hsa/include/hsa' 'include/hsa' # We compile clang before rocm-device-libs, so patch it in afterwards + # Replace object version: https://github.com/RadeonOpenCompute/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) substituteInPlace image/blit_src/CMakeLists.txt \ - --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' + --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' \ + --replace '-mcode-object-version=4' '-mcode-object-version=5' ''; fixupPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/cmake.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-smi/cmake.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/system/rocm-smi/cmake.patch rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-smi/cmake.patch diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-smi/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 7e3f1fb29c..66c1c765c1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -8,25 +8,33 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.4.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-nkidiDNNU6MGhne9EbYClkODJZw/zZu3LWzlniJKyJE="; + hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU="; }; - postPatch = '' - sed '1i#include ' -i src/rocm_smi{,_gpu_metrics}.cc # since gcc12 probably - ''; - - nativeBuildInputs = [ cmake wrapPython ]; - patches = [ ./cmake.patch ]; + nativeBuildInputs = [ + cmake + wrapPython + ]; + + cmakeFlags = [ + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + postInstall = '' wrapPythonProgramsIn $out + mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py ''; passthru.updateScript = rocmUpdateScript { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-thunk/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 86f0044799..98fbc56517 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -4,35 +4,29 @@ , rocmUpdateScript , pkg-config , cmake -, rocm-cmake , libdrm , numactl -, valgrind -, gcc }: stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.4.4"; + version = "5.7.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE="; + hash = "sha256-jAMBks2/JaXiA45B3qvLHY8fPeFcr1GHT5Jieuduqhw="; }; nativeBuildInputs = [ pkg-config cmake - rocm-cmake ]; buildInputs = [ libdrm numactl - valgrind - gcc.cc.libgcc or null # TODO: unhack this? ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocminfo/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocminfo/default.nix index 61488b806e..c80dbc4aea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rocminfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.4.4"; + version = "5.7.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; + sha256 = "sha256-UzOo2qDT/uM+vdGdBM4pV5e143mfa+/6sZLBExOO26g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocmlir/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocmlir/default.nix similarity index 69% rename from third_party/nixpkgs/pkgs/development/libraries/rocmlir/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocmlir/default.nix index b8dee13854..74fe00e781 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocmlir/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -3,29 +3,36 @@ , fetchFromGitHub , rocmUpdateScript , cmake +, rocm-cmake , ninja -, hip -, rocminfo +, clr , git , libxml2 , libedit +, zstd , zlib , ncurses -, python3 +, python3Packages , buildRockCompiler ? false +, buildTests ? false # `argument of type 'NoneType' is not iterable` }: # Theoretically, we could have our MLIR have an output # with the source and built objects so that we can just # use it as the external LLVM repo for this let + suffix = + if buildRockCompiler + then "-rock" + else ""; + llvmNativeTarget = if stdenv.isx86_64 then "X86" else if stdenv.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { - pname = "rocmlir"; - version = "5.4.1"; + pname = "rocmlir${suffix}"; + version = "5.7.1"; outputs = [ "out" @@ -37,49 +44,66 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI="; + hash = "sha256-vPi4UVljohVAfnwDVQqeOVaJPa6v8aV5uBOtqLddTtc="; }; nativeBuildInputs = [ cmake + rocm-cmake ninja - ] ++ lib.optionals (!buildRockCompiler) [ - hip + clr + python3Packages.python + python3Packages.tomli ]; buildInputs = [ git libxml2 libedit - python3 ]; propagatedBuildInputs = [ + zstd zlib ncurses ]; cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + "-DLLVM_ENABLE_ZSTD=ON" "-DLLVM_ENABLE_ZLIB=ON" "-DLLVM_ENABLE_TERMINFO=ON" + "-DROCM_PATH=${clr}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ lib.optionals buildRockCompiler [ "-DBUILD_FAT_LIBROCKCOMPILER=ON" ] ++ lib.optionals (!buildRockCompiler) [ - "-DROCM_PATH=${rocminfo}" "-DROCM_TEST_CHIPSET=gfx000" ]; + postPatch = '' + patchShebangs mlir + + substituteInPlace mlir/utils/performance/common/CMakeLists.txt \ + --replace "/opt/rocm" "${clr}" + ''; + dontBuild = true; doCheck = true; # Certain libs aren't being generated, try enabling tests next update checkTarget = if buildRockCompiler then "librockCompiler" - else "check-mlir-miopen-build-only"; + else if buildTests + then "check-rocmlir" + else "check-rocmlir-build-only"; postInstall = let - libPath = lib.makeLibraryPath [ zlib ncurses hip stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ zstd zlib ncurses clr stdenv.cc.cc ]; in lib.optionals (!buildRockCompiler) '' mkdir -p $external/lib cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocprim/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprim/default.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/libraries/rocprim/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprim/default.nix index 9b6ed7edc4..10d1f187ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocprim/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -4,16 +4,17 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , gtest , gbenchmark , buildTests ? false , buildBenchmarks ? false +, gpuTargets ? [ ] }: stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -27,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Sqr3lbDMK1Gwucqmr/CHoxw/L6bGj3wlXoHzKTnTqoc="; + hash = "sha256-+ukFWsWv3RhS+Z6tmR4TRT8QTYEDuAEk12F9Gv1eXGU="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr ]; buildInputs = lib.optionals buildTests [ @@ -49,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ @@ -58,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString buildTests '' mkdir -p $test/bin mv $out/bin/test_* $test/bin + mv $out/bin/rocprim $test/bin '' + lib.optionalString buildBenchmarks '' mkdir -p $benchmark/bin mv $out/bin/benchmark_* $benchmark/bin @@ -77,6 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch new file mode 100644 index 0000000000..aaa31c4974 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch @@ -0,0 +1,15 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 8473a42..07ea873 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -112,10 +112,6 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE) + DEPENDS ${INPUT_FILE} clang + COMMENT "Building ${OUTPUT_FILE}..." + VERBATIM) +- install( +- FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1 +- COMPONENT tests) + set(HSACO_TARGET_LIST + ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} + PARENT_SCOPE) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch new file mode 100644 index 0000000000..aba7709c4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch @@ -0,0 +1,111 @@ +diff --git a/bin/rocprofv2 b/bin/rocprofv2 +index 92f7489..8839d4d 100755 +--- a/bin/rocprofv2 ++++ b/bin/rocprofv2 +@@ -2,7 +2,8 @@ + set -eo pipefail + CURRENT_DIR="$(dirname -- "$0")" + ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]})) +-ROCM_DIR=$(dirname -- "$ROCPROFV2_DIR") ++ROCPROFILER_DIR=$(dirname -- "$ROCPROFV2_DIR") ++ROCM_DIR=@rocmtoolkit_merged@ + PLUGIN_LIST=("ctf" "perfetto" "file" "att") + RUN_FROM_BUILD=0 + if [[ $ROCPROFV2_DIR == *"/build"* ]]; then +@@ -10,7 +11,7 @@ if [[ $ROCPROFV2_DIR == *"/build"* ]]; then + ROCM_DIR=$ROCPROFV2_DIR + fi + +-export ROCPROFILER_METRICS_PATH=$ROCM_DIR/libexec/rocprofiler/counters/derived_counters.xml ++export ROCPROFILER_METRICS_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/counters/derived_counters.xml + export LD_LIBRARY_PATH=$ROCM_DIR/lib:$LD_LIBRARY_PATH + + usage() { +@@ -70,8 +71,8 @@ while [ 1 ]; do + exit 1 + fi + elif [[ "$1" = "--list-counters" ]]; then +- export LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so +- eval $ROCM_DIR/libexec/rocprofiler/ctrl ++ export LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so ++ eval $ROCPROFILER_DIR/libexec/rocprofiler/ctrl + exit 1 + elif [[ "$1" = "-i" || "$1" = "--input" ]]; then + if [ $2 ] && [ -n $2 ] && [ -r $2 ]; then +@@ -171,7 +172,7 @@ while [ 1 ]; do + if [ $RUN_FROM_BUILD == 1 ]; then + ATT_PATH=$ROCM_DIR/plugin/att/att/att.py + else +- ATT_PATH=$ROCM_DIR/libexec/rocprofiler/att/att.py ++ ATT_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/att/att.py + export ROCPROFV2_ATT_LIB_PATH=$ROCM_DIR/lib/hsa-amd-aqlprofile/librocprofv2_att.so + fi + ATT_ARGV=$3 +@@ -236,13 +237,13 @@ if [ -n "$PMC_LINES" ] && [ ! -n "$ATT_ARGV" ]; then + export OUTPUT_PATH=$FINAL_PATH + fi + let COUNTER=COUNTER+1 +- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* ++ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* + if [ -n "$OUTPUT_PATH" ]; then + echo -e "\nThe output path for the following counters: $OUTPUT_PATH" + fi + done + else +- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* ++ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* + fi + + get_pmc_results_txt_path() { +diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh +index c1a3daa..bc868a5 100755 +--- a/bin/rpl_run.sh ++++ b/bin/rpl_run.sh +@@ -24,16 +24,17 @@ + + time_stamp=`date +%y%m%d_%H%M%S` + BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) +-ROOT_DIR=$(dirname $BIN_DIR) ++ROCPROFILER_DIR=$(dirname $BIN_DIR) ++ROOT_DIR=@rocmtoolkit_merged@ + RUN_DIR=`pwd` + TMP_DIR="/tmp" + DATA_DIR="rpl_data_${time_stamp}_$$" + +-RPL_PATH=$ROOT_DIR/lib ++RPL_PATH=$ROCPROFILER_DIR/lib + TLIB_PATH=$RPL_PATH/rocprofiler + TTLIB_PATH=$ROOT_DIR/lib/roctracer + ROCM_LIB_PATH=$ROOT_DIR/lib +-PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler ++PROF_BIN_DIR=$ROCPROFILER_DIR/libexec/rocprofiler + + if [ -z "$ROCP_PYTHON_VERSION" ] ; then + ROCP_PYTHON_VERSION=python3 +@@ -73,7 +74,7 @@ export ROCP_METRICS=$TLIB_PATH/metrics.xml + # Disable AQL-profile read API + export AQLPROFILE_READ_API=0 + # ROC Profiler package path +-export ROCP_PACKAGE_DIR=$ROOT_DIR ++export ROCP_PACKAGE_DIR=$ROCPROFILER_DIR + # enabled SPM KFD mode + export ROCP_SPM_KFD_MODE=1 + +@@ -350,7 +351,7 @@ convert_time_val() { + + ################################################################################################ + # main +-echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'" ++echo "RPL: on '$time_stamp' from '$ROCPROFILER_DIR' in '$RUN_DIR'" + # Parsing arguments + if [ -z "$1" ] ; then + usage +@@ -557,7 +558,7 @@ elif [ "$input_type" = "txt" -o "$input_type" = "none" ] ; then + else + echo "" > $RES_DIR/input.xml + fi +- input_list=`/bin/ls $RES_DIR/input*.xml` ++ input_list=`ls $RES_DIR/input*.xml` + export ROCPROFILER_SESS=$RES_DIR + else + fatal "Bad input file type '$INPUT_FILE'" diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/default.nix new file mode 100644 index 0000000000..c66c56a64e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -0,0 +1,136 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, symlinkJoin +, substituteAll +, cmake +, clang +, clr +, rocm-core +, rocm-thunk +, rocm-device-libs +, roctracer +, rocdbgapi +, rocm-smi +, hsa-amd-aqlprofile-bin +, numactl +, libpciaccess +, libxml2 +, elfutils +, mpi +, systemd +, gtest +, python3Packages +, gpuTargets ? clr.gpuTargets +}: + +let + rocmtoolkit-merged = symlinkJoin { + name = "rocmtoolkit-merged"; + + paths = [ + rocm-core + rocm-thunk + rocm-device-libs + roctracer + rocdbgapi + rocm-smi + hsa-amd-aqlprofile-bin + clr + ]; + + postBuild = '' + rm -rf $out/nix-support + ''; + }; +in stdenv.mkDerivation (finalAttrs: { + pname = "rocprofiler"; + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "ROCm-Developer-Tools"; + repo = "rocprofiler"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; + }; + + patches = [ + # These just simply won't build + ./0000-dont-install-tests-hsaco.patch + + # Fix bad paths + (substituteAll { + src = ./0001-fix-shell-scripts.patch; + rocmtoolkit_merged = rocmtoolkit-merged; + }) + ]; + + nativeBuildInputs = [ + cmake + clang + clr + python3Packages.lxml + python3Packages.cppheaderparser + python3Packages.pyyaml + python3Packages.barectf + ]; + + buildInputs = [ + numactl + libpciaccess + libxml2 + elfutils + mpi + systemd + gtest + ]; + + propagatedBuildInputs = [ rocmtoolkit-merged ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" + "-DHIP_ROOT_DIR=${clr}" + "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + # Manually define CMAKE_INSTALL_ + # See: https://github.com/NixOS/nixpkgs/pull/197838 + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postPatch = '' + patchShebangs . + + substituteInPlace tests-v2/featuretests/profiler/CMakeLists.txt \ + --replace "--build-id=sha1" "--build-id=sha1 --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + + substituteInPlace test/CMakeLists.txt \ + --replace "\''${ROCM_ROOT_DIR}/amdgcn/bitcode" "${rocm-device-libs}/amdgcn/bitcode" + ''; + + postInstall = '' + # Why do these not already have the executable bit set? + chmod +x $out/lib/rocprofiler/librocprof-tool.so + chmod +x $out/share/rocprofiler/tests-v1/test/ocl/SimpleConvolution + + # Why do these have the executable bit set? + chmod -x $out/libexec/rocprofiler/counters/basic_counters.xml + chmod -x $out/libexec/rocprofiler/counters/derived_counters.xml + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Profiling with perf-counters and derived metrics"; + homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; + license = with licenses; [ mit ]; # mitx11 + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor clr.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocr-debug-agent/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/libraries/rocr-debug-agent/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index 4361ffec34..6dd0ec45b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocr-debug-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -3,40 +3,38 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, hip +, clr , git , rocdbgapi -, rocm-runtime , elfutils }: stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "5.4.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5l6svWSWCxVoyr1zJabxbt5rXQMtdZtHrf9gS2PcRKc="; + hash = "sha256-AUDbNrFtUQ5Hm+uv5KMovh7P9wXQKLyRNx9gEQFnv6Y="; }; nativeBuildInputs = [ cmake - hip + clr git ]; buildInputs = [ rocdbgapi - rocm-runtime elfutils ]; cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${hip}" - "-DHIP_PATH=${hip}" + "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" + "-DHIP_ROOT_DIR=${clr}" + "-DHIP_PATH=${clr}" ]; # Weird install target @@ -56,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ ncsa ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocrand/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocrand/default.nix index 5128e17376..d61b95394c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocrand/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -4,16 +4,17 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, clr , gtest , gbenchmark , buildTests ? false , buildBenchmarks ? false +, gpuTargets ? [ ] }: stdenv.mkDerivation (finalAttrs: { pname = "rocrand"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -27,14 +28,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xK1JRTW+7odlXRQV9WC6ZfXqRKow/TQ9grHCigw+/us="; + hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY="; fetchSubmodules = true; # For inline hipRAND }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr ]; buildInputs = lib.optionals buildTests [ @@ -46,12 +47,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_C_COMPILER=hipcc" "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${clr}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ @@ -80,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsolver/default.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsolver/default.nix index 632e93fa6c..ade9c69e53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -5,7 +5,8 @@ , cmake , rocm-cmake , rocblas -, hip +, rocsparse +, clr , fmt , gtest , gfortran @@ -17,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver"; - version = "5.4.4"; + version = "5.7.1"; outputs = [ "out" @@ -31,19 +32,20 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UHUcA9CVPuYFpE2DTvRrRMMj51yNPo5wMTKnByL2RTg="; + hash = "sha256-qxmjm4tgpCnfJ2SqUXndk6y0MsPJUKHvjv/3Uc0smr4="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr ] ++ lib.optionals (buildTests || buildBenchmarks) [ gfortran ]; buildInputs = [ rocblas + rocsparse fmt ] ++ lib.optionals buildTests [ gtest @@ -53,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" + "-DCMAKE_CXX_FLAGS=-Wno-switch" # Way too many warnings # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -90,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd2 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + timeout = 14400; # 4 hours + maxSilent = 14400; # 4 hours + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocsparse/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsparse/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/libraries/rocsparse/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsparse/default.nix index d821ee6938..e19334df15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocsparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -6,7 +6,7 @@ , cmake , rocm-cmake , rocprim -, hip +, clr , gfortran , git , gtest @@ -14,11 +14,12 @@ , python3Packages , buildTests ? false , buildBenchmarks ? false # Seems to depend on tests +, gpuTargets ? [ ] }: stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -32,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jzHD55c4rlPab5IAj2UzHTJI9MKhTfevsLthSZKOEzQ="; + hash = "sha256-30q9bqgZJUaNrkMXTAG+Z34yjsQ5DpJP+WBcCiEmF58="; }; nativeBuildInputs = [ cmake rocm-cmake - hip + clr gfortran ]; @@ -59,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals (buildTests || buildBenchmarks) [ "-DBUILD_CLIENTS_TESTS=ON" "-DCMAKE_MATRICES_DIR=/build/source/matrices" @@ -141,6 +144,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocsparse/deps.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsparse/deps.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/rocsparse/deps.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocsparse/deps.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocthrust/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocthrust/default.nix similarity index 87% rename from third_party/nixpkgs/pkgs/development/libraries/rocthrust/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocthrust/default.nix index 45099cb9f4..4fe2e0828a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocthrust/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -5,15 +5,16 @@ , cmake , rocm-cmake , rocprim -, hip +, clr , gtest , buildTests ? false , buildBenchmarks ? false +, gpuTargets ? [ ] }: stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -27,14 +28,14 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JT2PX53N39H+EaThPHo2ol+BUjDQniSQlKMLiYD8NoM="; + hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc="; }; nativeBuildInputs = [ cmake rocm-cmake rocprim - hip + clr ]; buildInputs = lib.optionals buildTests [ @@ -43,12 +44,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" + "-DHIP_ROOT_DIR=${clr}" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DBUILD_TEST=ON" ] ++ lib.optionals buildBenchmarks [ @@ -79,6 +82,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/roctracer/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/roctracer/default.nix index a81f7dc189..7be3ea0f75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/roctracer/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -3,14 +3,13 @@ , fetchFromGitHub , rocmUpdateScript , cmake -, clang -, hip +, clr , rocm-device-libs -, rocprofiler , libxml2 , doxygen , graphviz , gcc-unwrapped +, libbacktrace , rocm-runtime , python3Packages , buildDocs ? false # Nothing seems to be generated, so not making the output @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" @@ -33,28 +32,26 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm-Developer-Tools"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5vYUNczylB2ehlvhq1u/H8KUXt8ku2E+jawKrKsU7LY="; + hash = "sha256-P6QYyAjMRwFFWKF8AhbrYGe+mYVJXdbBW1or6vcobYU="; }; nativeBuildInputs = [ cmake - clang - hip + clr ] ++ lib.optionals buildDocs [ doxygen graphviz ]; buildInputs = [ - rocm-device-libs - rocprofiler libxml2 + libbacktrace python3Packages.python python3Packages.cppheaderparser ]; cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${hip}/hip/cmake" + "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -85,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { find $out/test -executable -type f -exec mv {} $test/bin \; rm $test/bin/{*.sh,*.py} patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( - finalAttrs.buildInputs ++ [ hip gcc-unwrapped.lib rocm-runtime ])} $test/bin/* + finalAttrs.buildInputs ++ [ clr gcc-unwrapped.lib rocm-runtime ])} $test/bin/* rm -rf $out/test ''; @@ -101,6 +98,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor clr.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch similarity index 85% rename from third_party/nixpkgs/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch index cee6036797..fa47a3c422 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/0000-dont-fetch-googletest.patch @@ -1,8 +1,8 @@ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index e1160bb..2a5462e 100644 +index 0d00883..86ce282 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -30,26 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" +@@ -30,30 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) @@ -12,20 +12,24 @@ index e1160bb..2a5462e 100644 -FetchContent_Declare( - googletest - GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG 609281088cfefc76f9d0ce82e1ff6c30cc3591e5 +- GIT_TAG release-1.12.1 -) -FetchContent_GetProperties(googletest) -if(NOT googletest_POPULATED) +- - # Fetch the content using default details - FetchContent_Populate(googletest) - # Save the shared libs setting, then force to static libs - set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE) +- - # Add gtest targets as static libs - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- - # Restore shared libs setting - set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) -endif() - +- set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rocwmma_gtest_main.cpp) diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocwmma/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/default.nix similarity index 66% rename from third_party/nixpkgs/pkgs/development/libraries/rocwmma/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/default.nix index 08667b6d3c..e982e036c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocwmma/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -4,44 +4,24 @@ , rocmUpdateScript , cmake , rocm-cmake -, hip +, rocm-smi +, clr , openmp , gtest , rocblas -, texlive -, doxygen -, sphinx -, python3Packages -, buildDocs ? true -, buildTests ? false +, buildTests ? false # Will likely fail building because wavefront shifts are not supported for certain archs , buildExtendedTests ? false , buildBenchmarks ? false , buildSamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] }: -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec; - }; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "5.4.3"; + version = "5.7.1"; outputs = [ "out" - ] ++ lib.optionals buildDocs [ - "doc" ] ++ lib.optionals (buildTests || buildBenchmarks) [ "test" ] ++ lib.optionals buildBenchmarks [ @@ -54,7 +34,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "ROCmSoftwarePlatform"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM="; + hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ @@ -64,28 +44,21 @@ in stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake rocm-cmake - hip + clr ]; buildInputs = [ openmp ] ++ lib.optionals (buildTests || buildBenchmarks) [ + rocm-smi gtest rocblas - ] ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - python3Packages.sphinx-rtd-theme - python3Packages.breathe ]; cmakeFlags = [ "-DCMAKE_CXX_COMPILER=hipcc" "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" - "-DROCWMMA_BUILD_VALIDATION_TESTS=ON" "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" - "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON" # Manually define CMAKE_INSTALL_ # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" @@ -100,21 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON" ]; - postPatch = lib.optionalString buildDocs '' - patchShebangs docs/*.sh - ''; - - # Unfortunately, it seems like we have to call make on this manually - # -DROCWMMA_BUILD_DOCS=ON is invalid, despite being on the README - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - ../docs/run_doc.sh - ''; - - postInstall = lib.optionalString buildDocs '' - mv ../docs/source/_build/html $out/share/doc/rocwmma - mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma - '' + lib.optionalString (buildTests || buildBenchmarks) '' + postInstall = lib.optionalString (buildTests || buildBenchmarks) '' mkdir -p $test/bin mv $out/bin/{*_test,*-validate} $test/bin '' + lib.optionalString buildBenchmarks '' @@ -141,6 +100,6 @@ in stdenv.mkDerivation (finalAttrs: { license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; }; }) diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/rpp/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rpp/default.nix new file mode 100644 index 0000000000..a9456587ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/rpp/default.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchFromGitHub +, rocmUpdateScript +, cmake +, rocm-cmake +, rocm-docs-core +, half +, clr +, openmp +, boost +, python3Packages +, buildDocs ? false # Needs internet +, useOpenCL ? false +, useCPU ? false +, gpuTargets ? [ ] +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rpp-" + ( + if (!useOpenCL && !useCPU) then "hip" + else if (!useOpenCL && !useCPU) then "opencl" + else "cpu" + ); + + version = "5.7.1"; + + src = fetchFromGitHub { + owner = "GPUOpen-ProfessionalCompute-Libraries"; + repo = "rpp"; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-s6ODmxPBLpR5f8VALaW6F0p0rZSxSd2LH2+60SEfLCk="; + }; + + nativeBuildInputs = [ + cmake + rocm-cmake + clr + ] ++ lib.optionals buildDocs [ + rocm-docs-core + python3Packages.python + ]; + + buildInputs = [ + half + openmp + boost + ]; + + cmakeFlags = [ + "-DROCM_PATH=${clr}" + ] ++ lib.optionals (gpuTargets != [ ]) [ + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + ] ++ lib.optionals (!useOpenCL && !useCPU) [ + "-DCMAKE_C_COMPILER=hipcc" + "-DCMAKE_CXX_COMPILER=hipcc" + "-DBACKEND=HIP" + ] ++ lib.optionals (useOpenCL && !useCPU) [ + "-DBACKEND=OCL" + ] ++ lib.optionals useCPU [ + "-DBACKEND=CPU" + ]; + + postPatch = lib.optionalString (!useOpenCL && !useCPU) '' + # Bad path + substituteInPlace CMakeLists.txt \ + --replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clr}/bin/hipcc" + ''; + + postBuild = lib.optionalString buildDocs '' + python3 -m sphinx -T -E -b html -d _build/doctrees -D language=en ../docs _build/html + ''; + + passthru.updateScript = rocmUpdateScript { + name = finalAttrs.pname; + owner = finalAttrs.src.owner; + repo = finalAttrs.src.repo; + }; + + meta = with lib; { + description = "Comprehensive high-performance computer vision library for AMD processors"; + homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp"; + license = with licenses; [ mit ]; + maintainers = teams.rocm.members; + platforms = platforms.linux; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tensile/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/tensile/default.nix similarity index 60% rename from third_party/nixpkgs/pkgs/development/libraries/tensile/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/tensile/default.nix index c611716785..fa111c056c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tensile/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/tensile/default.nix @@ -3,28 +3,51 @@ , fetchFromGitHub , rocmUpdateScript , buildPythonPackage +, pytestCheckHook +, setuptools , pyyaml , msgpack , pandas +, joblib +, filelock +, rocminfo }: buildPythonPackage rec { pname = "tensile"; - version = "5.4.2"; + version = "5.7.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "Tensile"; rev = "rocm-${version}"; - hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag="; + hash = "sha256-CyPGiM/53duJc/oNtOsl6JSsl9uOOYm5R7O6YXaVOm4="; }; - buildInputs = [ + buildInputs = [ setuptools ]; + + propagatedBuildInputs = [ pyyaml msgpack pandas + joblib ]; + doCheck = false; # Too many errors, not sure how to set this up properly + + nativeCheckInputs = [ + pytestCheckHook + filelock + rocminfo + ]; + + preCheck = '' + export ROCM_PATH=${rocminfo} + ''; + + pythonImportsCheck = [ "Tensile" ]; + passthru.updateScript = rocmUpdateScript { name = pname; owner = src.owner; diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/update-script/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/update.nix similarity index 73% rename from third_party/nixpkgs/pkgs/development/rocm-modules/update-script/default.nix rename to third_party/nixpkgs/pkgs/development/rocm-modules/5/update.nix index 6188587de3..e20697675c 100644 --- a/third_party/nixpkgs/pkgs/development/rocm-modules/update-script/default.nix +++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/update.nix @@ -5,14 +5,14 @@ { name ? "" , owner ? "" , repo ? "" -, page ? "releases?per_page=1" -, filter ? ".[0].tag_name | split(\"-\") | .[1]" +, page ? "releases/latest" +, filter ? ".tag_name | split(\"-\") | .[1]" }: let pname = if lib.hasPrefix "rocm-llvm-" name - then "llvmPackages_rocm.${lib.removePrefix "rocm-llvm-" name}" + then "llvm.${lib.removePrefix "rocm-llvm-" name}" else name; updateScript = writeScript "update.sh" '' @@ -27,6 +27,6 @@ let version="''${version}.0" fi - update-source-version ${pname} "$version" --ignore-same-hash + update-source-version rocmPackages_5.${pname} "$version" --ignore-same-hash ''; in [ updateScript ] diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix index 746eb2bb11..57a10dadc4 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -80,6 +80,8 @@ in rec { outputs = [ "out" ]; out = res; outputName = "out"; + suffix = version; + gemType = "path"; }; in res; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 54842ff641..c4c3cd8b8d 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.19"; - source.sha256 = "sha256-M03HlkODhHMv3xm/ovYjdTt+2FFg0Izh8gAJmEzvs2I="; + version = "2.4.22"; + source.sha256 = "sha256-dHulCw5n3yXL07SPlYMad6TVOlgdVfBjly/LFG0ULF8="; dontPatchShebangs = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index ff9e3b1968..a380f9734b 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx +, cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie @@ -76,7 +76,7 @@ in cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -334,6 +334,13 @@ in ''; }; + google-protobuf = attrs: + lib.optionalAttrs (lib.versionAtLeast attrs.version "3.25.0") { + # Fails on 3.25.0 with: + # convert.c:312:32: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + hardeningDisable = [ "format" ]; + }; + grpc = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools @@ -369,7 +376,12 @@ in }; iconv = attrs: { + dontBuild = false; buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + patches = [ + # Fix incompatible function pointer conversion errors with clang 16 + ./iconv-fix-incompatible-function-pointer-conversions.patch + ]; }; idn-ruby = attrs: { diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch new file mode 100644 index 0000000000..1cc38cbae1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch @@ -0,0 +1,51 @@ +diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c +index 2801049..77fae7e 100644 +--- a/ext/iconv/iconv.c ++++ b/ext/iconv/iconv.c +@@ -188,7 +188,7 @@ static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, in + static VALUE iconv_s_allocate _((VALUE klass)); + static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self)); +-static VALUE iconv_s_convert _((struct iconv_env_t* env)); ++static VALUE iconv_s_convert _((VALUE env)); + static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_init_state _((VALUE cd)); + static VALUE iconv_finish _((VALUE self)); +@@ -204,7 +204,7 @@ static VALUE charset_map; + * Returns the map from canonical name to system dependent name. + */ + static VALUE +-charset_map_get(void) ++charset_map_get(VALUE klass) + { + return charset_map; + } +@@ -642,7 +642,7 @@ iconv_s_allocate(VALUE klass) + } + + static VALUE +-get_iconv_opt_i(VALUE i, VALUE arg) ++get_iconv_opt_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) + { + VALUE name; + #if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ +@@ -784,8 +784,9 @@ iconv_s_open(int argc, VALUE *argv, VALUE self) + } + + static VALUE +-iconv_s_convert(struct iconv_env_t* env) ++iconv_s_convert(VALUE env_value) + { ++ struct iconv_env_t* env = (struct iconv_env_t*)env_value; + VALUE last = 0; + + for (; env->argc > 0; --env->argc, ++env->argv) { +@@ -906,7 +907,7 @@ list_iconv(unsigned int namescount, const char *const *names, void *data) + + #if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST) + static VALUE +-iconv_s_list(void) ++iconv_s_list(VALUE klass) + { + #ifdef HAVE_ICONVLIST + int state; diff --git a/third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 1cbbdf0bf2..25412b45b4 100644 --- a/third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/third_party/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config + autoreconfHook guile pkg-config ]; buildInputs = [ guile diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix index 3ae9b7ce8a..24a1465e69 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix @@ -5,7 +5,7 @@ # : string , version # : string -, sha256 +, sha256 ? lib.fakeSha256 # : string , description # : list Platform diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/default.nix index afded05e0c..798ae11df5 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/default.nix @@ -8,17 +8,22 @@ lib.makeScope pkgs.newScope (self: buildPackage = callPackage ./build-skaware-package.nix { }; cleanPackaging = callPackage ./clean-packaging.nix { }; + # execline execline = callPackage ./execline { }; execline-man-pages = callPackage ./execline-man-pages { }; + # servers & tools mdevd = callPackage ./mdevd { }; nsss = callPackage ./nsss { }; - sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + tipidee = callPackage ./tipidee { }; utmps = callPackage ./utmps { }; + # libs skalibs = callPackage ./skalibs { }; skalibs_2_10 = callPackage ./skalibs/2_10.nix { }; + sdnotify-wrapper = callPackage ./sdnotify-wrapper { }; + # s6 tooling s6 = callPackage ./s6 { }; s6-dns = callPackage ./s6-dns { }; s6-linux-init = callPackage ./s6-linux-init { }; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix index c57db92401..caa9a8030a 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/execline/default.nix @@ -2,7 +2,7 @@ with skawarePackages; let - version = "2.9.3.0"; + version = "2.9.4.0"; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -19,7 +19,7 @@ in buildPackage { inherit version; pname = "execline"; - sha256 = "yAJ/pwki0RfN7ozCDSd+ONA/2WDm0TbYzsMmA9TsI40="; + sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix index 3762e4a16d..9f4caa4ed0 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "mdevd"; - version = "0.1.6.2"; - sha256 = "rC/PkATweQRZLFiU4sQB4VuwJ+zze8uOpmHip5k0R74="; + version = "0.1.6.3"; + sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA="; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix index 1533da89bc..3f81c0e66b 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.2.0.3"; - sha256 = "seOX7VsydhGnwsjB3GDpH+81PFT+rUZPiHcgvAkUFI4="; + version = "0.2.0.4"; + sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0="; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix index a4f018621f..d5ece13451 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.5"; - sha256 = "VpebXVElw4BxqAtePfDUprKnxSu4Y6JBC249eX/+Hug="; + version = "2.3.6.0"; + sha256 = "AefHUyzF56a4kVRhsBwvcGt/IhF4KSPiXqpU7gxtx8c="; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix index f95e2343cb..a602165592 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-init"; - version = "1.1.1.0"; - sha256 = "rUg/NTJleQB+Wn48ufH9EXfq9x7FwRxHzXhKBClWqO4="; + version = "1.1.2.0"; + sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38="; description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix index f6eba321c1..9a6871b9f4 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.6.1.2"; - sha256 = "2GPcXXgt535GUEFFGI+1fbsLZiUGF6Z9NB6wy0qdnNk="; + version = "2.6.2.0"; + sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c="; description = "A set of minimalistic Linux-specific system utilities"; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix index e8367dd19c..9cddabb585 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.5.1.3"; - sha256 = "oJ5DyVn/ngyqj/QAJgjnPA9X+H8EqNnCTmya/v5F6Xc="; + version = "2.6.0.0"; + sha256 = "MdHWj7BdY5zr6VFLui9npU5YAfJsDRYvh1XNSxYuGLA="; description = "A suite of small networking utilities for Unix systems"; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix index 759731bfe1..b02628ad80 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-portable-utils"; - version = "2.3.0.2"; - sha256 = "hxQmkTTwEmUNqsBA5WRjct6lZYucDYmnygO7Kr7E0eg="; + version = "2.3.0.3"; + sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8="; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix index 442e29dac1..586f04ddff 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.4.1"; - sha256 = "1yaMq3xUIzBc+VmKM9T82rijFZUrPsgPechbjLdhWPY="; + version = "0.5.4.2"; + sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI="; description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix index 35d90086ad..8a1b3aa87a 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.11.3.2"; - sha256 = "fBYTitLw/74O0q6N0M7K2p98eH7dM6aQhNIZEQaT33Q="; + version = "2.12.0.0"; + sha256 = "sha256-mBjDqeIYGSQGJw9B00K+23oZ8Z3gBbqzxitACTAz72w="; description = "skarnet.org's small & secure supervision software suite"; @@ -35,7 +35,6 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6.* rm ./libs6auto.a.xyzzy - rm ./libs6lockd.a.xyzzy mv doc $doc/share/doc/s6/html mv examples $doc/share/doc/s6/examples diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix index 3123b8c427..80db4b6248 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix @@ -1,11 +1,15 @@ -{ skawarePackages, pkgs }: +{ lib +, stdenv +, skawarePackages +, pkgs +}: with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.13.1.1"; - sha256 = "snKhq3mff6xEubT7Ws54qWFrL+SIIVl1S4CIxNgZnjM="; + version = "2.14.0.0"; + sha256 = "p0X9NM+EvsdDmO/6G29MOcVXNnM5ObEmA45SstXcwdI="; description = "A set of general-purpose C programming libraries"; @@ -21,6 +25,17 @@ buildPackage { # Empty the default path, which would be "/usr/bin:bin". # It would be set when PATH is empty. This hurts hermeticity. "--with-default-path=" + + ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ + # ./configure: sysdep posixspawnearlyreturn cannot be autodetected + # when cross-compiling. Please manually provide a value with the + # --with-sysdep-posixspawnearlyreturn=yes|no|... option. + # + # posixspawnearlyreturn: `yes` if the target has a broken + # `posix_spawn()` implementation that can return before the + # child has successfully exec'ed. That happens with old glibcs + # and some virtual platforms. + "--with-sysdep-posixspawnearlyreturn=no" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix new file mode 100644 index 0000000000..6b44516615 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix @@ -0,0 +1,40 @@ +{ skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "tipidee"; + version = "0.0.1.0"; + sha256 = "sha256-rKi9IX9CcRhY4n44i2vDom9MIeuGxRAHF7u0C3nNvFU="; + + description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; + + outputs = [ "bin" "lib" "out" "dev" "doc" ]; + + configureFlags = [ + "--libdir=\${lib}/lib" + "--libexecdir=\${lib}/libexec" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + + # we set sysconfdir to /etc here to allow tipidee-config + # to look in the global paths for its configs. + # This is not encouraged, but a valid use-case. + "--sysconfdir=/etc" + ]; + + postInstall = '' + # remove all tipidee executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libtipidee.* + + mv doc $doc/share/doc/tipidee/html + mv examples $doc/share/doc/tipidee/examples + ''; + +} diff --git a/third_party/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix b/third_party/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix index 7e09585939..406635e061 100644 --- a/third_party/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix +++ b/third_party/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.2.1"; - sha256 = "BCPfx0vxOQ5G4uDCECIbsgX8247yMn5x7QhQd3xdyb0="; + version = "0.1.2.2"; + sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I="; description = "A secure utmpx and wtmp implementation"; diff --git a/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix index c3c3fbcafc..dce24f0ad8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/abuild/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.11.21"; + version = "3.12.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "sha256-M88JPQKBkixAsWfGUirFsjFwB7m8/x63dpnoEHZpQTE="; + sha256 = "sha256-p4TohsZZTi4HxtJsyuoE5HDfkGa0pv53saGj3X9bmrI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix index b42fe4c16c..ce51efafdb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/air/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.45.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-q1BnY0ztnhtsks1+GC1awR9o6nodXyb8rf1waVAs3gM="; + hash = "sha256-6XQakQXGFMepX29KeiLlGM6EI8tiIfmKQuqZQXYNoto="; }; vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix index a3d5e1353d..b9d0a663aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-85J4evMEhfkfQ3IoeHulufI9wbwAqW8QmEmJfs5hUpc="; + hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index 6d77425814..33fed022b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.2.5"; + version = "5.2.6"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-KpAfPZqDfbf3LLBhTZ/rFftGf42onJnFMvnO2jzxqmo="; + sha256 = "sha256-SNXUARAu4szX7otyAKy3F/piNhxlPVNN6Dj2UwevL8A="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index 674e136c9f..ef133b6f98 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,40 +2,15 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "refs/tags/v${version}"; - hash = "sha256-pc9mtVR/PBhM5l1PnDkm+y+McxbrfAmQzxmLi761VF4="; + hash = "sha256-TdyEnTloaciSpkPmnm+OM75sz9jaCaQ3VoDEepfescU="; }; - patches = [ - (fetchpatch { - url = "https://github.com/crystal-ameba/ameba/commit/c7f2cba409787a1928fbb54494b4645ec11005cc.patch"; - hash = "sha256-tYEPke6omMdCGG2llJGXDZ3jTO4YAqpknzTPi2576UI="; - }) - (fetchpatch { - # Fixes: Error: type must be Ameba::Severity, not (Ameba::Severity | Nil) - name = "crystal-1.9-compatibility-1.patch"; - url = "https://github.com/crystal-ameba/ameba/commit/d0d8b18c8365fd956d1e65ae6051e83a5e129f18.patch"; - hash = "sha256-NmA3OoS5aOW+28TV/D/LUKEEu3lzHlcpolggHBB/wHE="; - }) - (fetchpatch { - # Ignore some failing lints on the Ameba codebase run during the check phase. - name = "crystal-1.9-compatibility-2.patch"; - url = "https://github.com/crystal-ameba/ameba/commit/c9d25f3409e6a127bbd7188267810657a2c2924e.patch"; - hash = "sha256-JMKiO0izSXfgw7uM9XXQ0r/ntOwRnjzYeVHqVLAvLXo="; - }) - (fetchpatch { - # Fixes test failures due to Crystal compiler error messages changing. - name = "crystal-1.9-compatibility-3.patch"; - url = "https://github.com/crystal-ameba/ameba/commit/db59b23f9bfcf53dbe53d2918bd9c3d79ac24bb6.patch"; - hash = "sha256-MKbEm9CR4+VzioCjcOFuFF0xnc1Ty0Ij4d3FcvQO6hY="; - }) - ]; - format = "make"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 86970b6b22..cf7eb3fd61 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -3,33 +3,16 @@ , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "2.7.1"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "2.5.6"; - format = "setuptools"; + version = "3.0.37"; + pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; - repo = pname; + repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-X+JEhoFKT+nxgxABojC8jZiGp8bubJWi0qWNfU9kwDc="; + hash = "sha256-cRc5mBMTh5HCqq5hKfvJmYROs74ZiWjX17cgQv7ub+I="; }; patches = [ @@ -45,12 +28,12 @@ buildPythonApplication rec { "pycep-parser" ]; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aiodns aiohttp aiomultiprocess @@ -82,6 +65,7 @@ buildPythonApplication rec { prettytable pycep-parser pyyaml + pydantic rustworkx semantic-version spdx-tools @@ -92,7 +76,7 @@ buildPythonApplication rec { update_checker ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ aioresponses mock pytest-asyncio @@ -119,12 +103,10 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.205 - "test_non_multiline_pair" - "test_secret_value_in_keyword" - "test_runner_verify_secrets_skip_invalid_suppressed" - "test_runner_verify_secrets_skip_all_no_effect" + # Assertion error "test_runner" + # AssertionError: assert [' cmd/api-linter/version.go <> .bazelrc <> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "bb529ba133c0256df49139bd403c17835edbf60d2ecd6463549c6a5fe279364d", + "strip_prefix": "BLAKE3-1.3.3", + "urls": [ + "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.zip" + ] + }, "boringssl": { "generator_function": "grpc_deps", "generator_name": "boringssl", @@ -538,44 +556,44 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v12.6.zip": { - "name": "java_tools-v12.6.zip", - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "java_tools-v12.7.zip": { + "name": "java_tools-v12.7.zip", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, - "java_tools_darwin_arm64-v12.6.zip": { - "name": "java_tools_darwin_arm64-v12.6.zip", - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "java_tools_darwin_arm64-v12.7.zip": { + "name": "java_tools_darwin_arm64-v12.7.zip", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, - "java_tools_darwin_x86_64-v12.6.zip": { - "name": "java_tools_darwin_x86_64-v12.6.zip", - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "java_tools_darwin_x86_64-v12.7.zip": { + "name": "java_tools_darwin_x86_64-v12.7.zip", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, - "java_tools_linux-v12.6.zip": { - "name": "java_tools_linux-v12.6.zip", - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "java_tools_linux-v12.7.zip": { + "name": "java_tools_linux-v12.7.zip", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, - "java_tools_windows-v12.6.zip": { - "name": "java_tools_windows-v12.6.zip", - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "java_tools_windows-v12.7.zip": { + "name": "java_tools_windows-v12.7.zip", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -1076,18 +1094,18 @@ "generator_function": "dist_http_archive", "generator_name": "platforms", "name": "platforms", - "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" ] }, - "platforms-0.0.5.tar.gz": { - "name": "platforms-0.0.5.tar.gz", - "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "platforms-0.0.7.tar.gz": { + "name": "platforms-0.0.7.tar.gz", + "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" ] }, "python-3.7.0": { @@ -1159,10 +1177,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, "remote_java_tools_darwin_x86_64": { @@ -1187,10 +1205,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, "remote_java_tools_for_testing": { @@ -1205,10 +1223,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, "remote_java_tools_linux": { @@ -1233,10 +1251,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, "remote_java_tools_test": { @@ -1251,10 +1269,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, "remote_java_tools_test_darwin_arm64": { @@ -1269,10 +1287,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, "remote_java_tools_test_darwin_x86_64": { @@ -1287,10 +1305,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, "remote_java_tools_test_linux": { @@ -1305,10 +1323,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, "remote_java_tools_test_windows": { @@ -1323,10 +1341,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "remote_java_tools_windows": { @@ -1351,10 +1369,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "remotejdk11_linux": { @@ -1991,11 +2009,17 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", + "strip_prefix": "", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz" + ] + }, + "rules_java-5.5.1.tar.gz": { + "name": "rules_java-5.5.1.tar.gz", + "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", + "urls": [ + "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz" ] }, "rules_jvm_external": { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 8c46b2456e..f22e7c3c22 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.3"; + version = "6.4.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; + hash = "sha256-k4qbveJ1BORnwjOIZcJLWIGVMRjCAqVhISggQ/VTzA4="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index d560b0af84..1ab073a64c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -51,6 +51,7 @@ let py_binary( name = "bin", srcs = [ "bin.py" ], + imports = [ "." ], deps = [ ":lib" ], ) ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 62389d622c..5aac94c837 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.8"; + version = "1.5.11"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-KqfXNk89VHhRbTK0kBiO02q/sfp3bs674lU3gUpwAi0=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-1MmX7icqUJgU5y9vYSE4nMzJfLH1SJvYJ24kw697HuY=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-T07t0CTSkCPQfjhg/L0NhyZgMobXL7DCKZZefPxdBJk=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-3GiMFRikru+8J+eDkba9bNNrpmtuAdH9qEjnH55beiQ=" else throw "unsupported platform"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh index e007cbac95..4506e3f0f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix index 7fa99a9622..5ae28b1512 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix @@ -38,7 +38,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2023-10-01"; + version = "2023-10-15"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +63,7 @@ let # tooling prelude-src = let - prelude-hash = "75aa81a92edd2bf477538f9a3f0fe6a47e811842"; + prelude-hash = "880be565178cf1e08ce9badef52b215f91e48479"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json index 53df40eb62..b444cfeeae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-SshYnziEP/2jdoeLZYkQOvH56VBOJZaf0TUt++tLO1U=" -, "x86_64-linux": "sha256-eztjSDjgtXZWeDSPsKNSUGlIR+g8DsByIjDpcGNXB2s=" -, "x86_64-darwin": "sha256-buC0mShgDPU1+oeuNdjP6hNq1MoJDIPaEHCGL+Rcsr8=" -, "aarch64-linux": "sha256-52Ld12TzC51OutjZY+idpd7GhFr2tPksz1pda4F9Zag=" -, "aarch64-darwin": "sha256-b9peYBF9FZbSdMiwC8E/+y15pWlFe37/Euj5v8q3v1E=" +, "_prelude": "sha256-mm9jU74rsLpiMzuDmSih6tzY4+NOiR15j+W96BVe/OI=" +, "x86_64-linux": "sha256-qxymUjsSwCf6ev5TwlkWVGtMc9tj6Vt4yMIPaLHFAMM=" +, "x86_64-darwin": "sha256-DGfpByvL4gmP+CR7VLCZS8IGSJ3esHhuKxHUfXJb/6k=" +, "aarch64-linux": "sha256-zc9LEYmpVJttCTI6Qxm25KZRX8CJVJzVtSbouw0LB6g=" +, "aarch64-darwin": "sha256-HUzpKJQN/22IQYmHLhW0fVQs0f86rREMTlp+yOfK0+Y=" } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh deleted file mode 100644 index 6305a405af..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -mesonConfigurePhase() { - runHook preConfigure - - if [ -z "${dontAddPrefix-}" ]; then - mesonFlags="--prefix=$prefix $mesonFlags" - fi - - # See multiple-outputs.sh and meson’s coredata.py - mesonFlags="\ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --localedir=${!outputLib}/share/locale \ - -Dauto_features=${mesonAutoFeatures:-enabled} \ - -Dwrap_mode=${mesonWrapMode:-nodownload} \ - $mesonFlags" - - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" - - echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - - meson setup build $mesonFlags "${mesonFlagsArray[@]}" - cd build - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "meson: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "meson: enabled parallel installing" - fi - - runHook postConfigure -} - -if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= - configurePhase=mesonConfigurePhase -fi 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 d1c0b303ed..e2477e8d31 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 rec { pname = "mill"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-4X+ufTHECOmM797SN0VFAE8b9mnHkdOqSJ8h29PujLU="; + hash = "sha256-sCJMCy4TLRQV3zI28Aydv5a8OV8OHOjLbwhfyIlxOeY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index 1514b29f3a..e45c5acd71 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.14.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-DP54+0pTKdimaivKVr2ABWSRMPgeoXkT7HHzKwBkXu0="; + hash = "sha256-FPhUGFumbO28rPWNDTrUNqMx0ppbotp9z6u8cCEHu/g="; }; - cargoHash = "sha256-6mE/CrX3u10DFh3UrOOtkubo0oAs/+F4gAiSDbZmVjU="; + cargoHash = "sha256-hak0xMV6MSqM88bNY+2C5B5YlRWlZ+dDYu50pYEDsmI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/muon/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/muon/default.nix index c3be1a4bc5..92593bb60e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/muon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/muon/default.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; broken = stdenv.isDarwin; # typical `ar failure` + mainProgram = "muon"; }; }) # TODO LIST: diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 993e955df4..bd6b512f28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "7b70bbfc1cbe04172b5299ac092050d78d615a5a"; - version = "2023-09-18"; + rev = "85c92ae7ebeeeb04cce7e405ad6096ea5fd67b22"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "Uu1eyshAWkc9VgxPHa6V0+o4At/hDS/OuIJluHlxZjE="; + sha256 = "7T0Fw1sfftxRF9cbQRC3sk87cFM/k1yqDHAkemYbIx8="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 3e78f7a476..1b833d6d1f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-kj15F8y5mp/ZhfSr/YHKrK7UIoTmfT92lsxSOefFlcs="; + hash = "sha256-I1Q7xFl7VS6OLCfWlf5nLsI1q4pk92azeCj7aMbZ2RA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index f248e9c112..8d1af88a84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.4", + "version": "1.0.5", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1gqnsm8pcwrk1v1v4xaj0j0w5xsmh3xv61h6sv72297illxxkbgq" + "sha256": "1p2ibii71digdz7qqqyahvdmmxyx19crwgn4bmas0hahl6mz553x" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "124xqn18xyn35pg18p0rz40d8vjgijp6sc6wg4i81ih2mrxqxsbc" + "sha256": "1y9ghb829jz9yg4l7bgwnbl3cm7z7c20cyfc71v9iz8bq5ns9akr" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0r581a1zzlk7qbcsfbv79asj5y56zzx9249h099k29rbdjc3ya26" + "sha256": "12qjrm979pfbr0j7s59dyn7xkk585av7l0qxf77rz71009kvql0a" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "018cmr71qhdqvmprrfb8clsj718gfkdvyw48dqkf2jsafq0kglk2" + "sha256": "17x4nv5f8g1kx8l4n8ncxf60zwhwpqg8fh5cl8qy9s5h9h81n0rz" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix new file mode 100644 index 0000000000..097a8ffd51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "3.1.2"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + setupHook = ./setup-hook.sh; + + doCheck = true; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix new file mode 100644 index 0000000000..65499280c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix @@ -0,0 +1,50 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.1.0"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-ctKNdi4hJnh/Fz49WeCJI5+LL06e8xFNV/ELEgaYXYU="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix new file mode 100644 index 0000000000..61d1719642 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix @@ -0,0 +1,54 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.5.2"; + src = fetchurl { + url = "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"; + hash = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + patches = [ + ./env.patch + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix deleted file mode 100644 index 5b0aff8072..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/common.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ version, sha256 }: - -{ fetchurl, python, lib }: - -python.pkgs.buildPythonApplication rec { - pname = "scons"; - inherit version; - - src = fetchurl { - url = - if lib.versionAtLeast version "4.3.0" then - "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz" - else - "mirror://sourceforge/scons/scons-${version}.tar.gz"; - inherit sha256; - }; - - setupHook = ./setup-hook.sh; - - patches = lib.optionals (lib.versionAtLeast version "4.3.0") [ - ./env.patch - ]; - - postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" - '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' - substituteInPlace setup.cfg \ - --replace "build/doc/man/" "" - ''; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = lib.versionOlder version "4.0.0"; - - postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" - ''; - - passthru = { - # expose the used python version so tools using this (and extensing scos with other python modules) - # can use the exact same python version. - inherit python; - }; - - meta = with lib; { - description = "An improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - homepage = "https://scons.org/"; - changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix deleted file mode 100644 index f338d346a7..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ callPackage, python2, python3 }: - -let - mkScons = args: callPackage (import ./common.nix args) { - python = python3; - }; -in { - scons_3_1_2 = (mkScons { - version = "3.1.2"; - sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }); - scons_4_1_0 = mkScons { - version = "4.1.0"; - sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; - }; - scons_latest = mkScons { - version = "4.5.2"; - sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh index 67358ee843..bfd8f3cc07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2206 + sconsBuildPhase() { runHook preBuild @@ -15,7 +17,7 @@ sconsBuildPhase() { $buildFlags ${buildFlagsArray[@]} ) - echoCmd 'build flags' "${flagsArray[@]}" + echoCmd 'scons build flags' "${flagsArray[@]}" scons "${flagsArray[@]}" runHook postBuild @@ -39,7 +41,7 @@ sconsInstallPhase() { ${installTargets:-install} ) - echoCmd 'install flags' "${flagsArray[@]}" + echoCmd 'scons install flags' "${flagsArray[@]}" scons "${flagsArray[@]}" runHook postInstall @@ -50,9 +52,9 @@ sconsCheckPhase() { if [ -z "${checkTarget:-}" ]; then if scons -n check >/dev/null 2>&1; then - checkTarget=check + checkTarget="check" elif scons -n test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi @@ -65,21 +67,21 @@ sconsCheckPhase() { ${checkFlagsArray[@]} ) - echoCmd 'check flags' "${flagsArray[@]}" + echoCmd 'scons check flags' "${flagsArray[@]}" scons "${flagsArray[@]}" fi runHook postCheck } -if [ -z "${buildPhase-}" ]; then +if [ -z "${dontUseSconsBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=sconsBuildPhase fi -if [ -z "${dontUseSconsInstall-}" -a -z "${installPhase-}" ]; then - installPhase=sconsInstallPhase -fi - -if [ -z "${checkPhase-}" ]; then +if [ -z "${dontUseSconsCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=sconsCheckPhase fi + +if [ -z "${dontUseSconsInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=sconsInstallPhase +fi diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix index 25a8266f85..133a693919 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "turtle-build"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "raviqqe"; repo = "turtle-build"; rev = "v${version}"; - hash = "sha256-7XorSt2LFWYNdvCot+I7Uh6S1mhRbD7PkWkvYdIbjKs="; + hash = "sha256-pyCswNJ4LuXViewQl+2o5g06uVjXVphxh2wXO9m5Mec="; }; - cargoHash = "sha256-TebXKOgBdf/ZFITQu5OuusytDJKEkGzRD7fLhk1uh8Y="; + cargoHash = "sha256-ObPzzYh8Siu01DH/3pXk322H7NaD7sHYTYBUk0WvZUs="; meta = with lib; { description = "Ninja-compatible build system for high-level programming languages written in Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix index 6d8222e387..01fc3b3aaf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.3"; + version = "2.8.5"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-BC6RazVbT1sr4RLQ1ZR4hHZGXDqFSvuqpt5vPyMDylA="; + hash = "sha256-GcZ747z8valsqHoY7/rDm/zMRD+7N1THu8AVEd7NJK8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 8ee0811f98..a221505943 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-Sjmh7zVaZ8ATgDr1VN0U03rHlPBvv3lVDxKmAahjJ2M="; + hash = "sha256-imhl8CezFoSi0M0nMxIFL/ZVa8eDAA4s/ZVIMr/QUJ4="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index 6787ca6b07..41843024a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-u85Yrg3aMG6Tx8onivSy1p7yB4lZxsBWF4bxnwO68EE="; + hash = "sha256-ph44J90g5zOTi/+FVbdnDDJp1gXcxPt7coA1rvhsQSQ="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index 0f09d28140..b768021035 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-v46Yfj0gRT84R1vttKkpan28dkeJWHNgzKzI+ZVCiNc="; + hash = "sha256-t4//83DD3hCnxsuuw7nB06SWCY4/GcRcIk8Cr3C4bDw="; }; - vendorHash = "sha256-KZ2nAd+5D5PFgSDhNeHg6Hnp+h7HqZ2CRsKUek0KZhM="; + vendorHash = "sha256-42CrWLwBcv2GE+hEgJJOd7hFQu7rjYrXkPhhUykqIQw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix index 6ee77fdec3..56c3a72ea7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.15.4"; + version = "1.15.6"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-5fVFl9u1IR8FDo3dA9TXMam036VoTHaHkotlSo3cISo="; + sha256 = "sha256-OK6KELzazvB+zOghEYjFySs3a+lto4/z7h8s9IlbLLg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index affe321dc9..2355b85669 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "butane"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - hash = "sha256-HkvDJVSGve6t1gEek8FvfIK20r5TOHRJ71KsGUj95fM="; + hash = "sha256-v3HJpkfzGFii4hUfKRiFwcBcAObL1ItYw/9t8FO9gss="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix index 734a766c43..2aca42bbb2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-ulbpitTCIuRg50GAin54RNVMUl8ZuwYW1SnenvemckA="; + hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; }; - vendorHash = "sha256-giOL4/ZofaylhX+s7y75RR7d3WDxNCmr25JHBZZkH9s="; + vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix index 3082ec2bd7..01b31266d0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.23.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - hash = "sha256-gPFG1AgInakF8leMM0c1zZt2OdZdIKcUmItwICV8p1I="; + hash = "sha256-Hss4MgE09v2KvL8OIapFgocO+5EWE2WEr5xBAjhwNeE="; }; propagatedBuildInputs = [ @@ -34,6 +34,10 @@ buildPythonApplication rec { "check_jsonschema.cli" ]; + disabledTests = [ + "test_schemaloader_yaml_data" + ]; + meta = with lib; { description = "A jsonschema CLI and pre-commit hook"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; diff --git a/third_party/nixpkgs/pkgs/development/tools/circup/default.nix b/third_party/nixpkgs/pkgs/development/tools/circup/default.nix index 71b5864fdb..f960106629 100644 --- a/third_party/nixpkgs/pkgs/development/tools/circup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/circup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.2.3"; + version = "1.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "adafruit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6RjZHMZBL8p72+JeZOzyD/x1qiZay2ApJEmp9IXXpDA="; + hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 20f905a50e..dc78761cc2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.09.07"; + version = "2023.10.20"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-F7ePdITYKkGB6nsR3EFJ7zLDCUoT0g3i+AAjXzBd624="; + sha256 = "sha256-f9u/pk3CEEmiLgnS2biaUHpsMHjVEwZL2jyB/1PiZUY="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix index 1ed22b7eb4..8b7b39bba1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "A set of cli tools for the conventional commit and semver specifications"; homepage = "https://github.com/oknozor/cocogitto"; license = licenses.mit; - maintainers = with maintainers; [ travisdavis-ops ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix index 859ce0a746..aff3646340 100644 --- a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.5"; + version = "2.2.6"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-Cu1bbLzVOAvPNzTavaMUfW2SCnQHc9mOM+IHAgVHhT4="; + sha256 = "sha256-esewCJw4o4SfSst5ALZ90X3XgOuOAsaxytpotvFeHB0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix index e39dcbefc7..102ec3d996 100644 --- a/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/confluent-cli/default.nix @@ -2,17 +2,28 @@ stdenv.mkDerivation rec { pname = "confluent-cli"; - version = "3.17.0"; + version = "3.37.0"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 - src = fetchurl (if stdenv.hostPlatform.isDarwin then { - url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz"; - sha256 = "03104736f65591a5be9536424460d9b8c8fc8ac8b5eb646e832371397aaf7cef"; - } else { + src = { + x86_64-linux = fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_amd64.tar.gz"; - sha256 = "3243beca4fefd49cf067f9a4df4f5072a8ac5dac91638e9f10ef0b0544d30445"; - }); + hash = "sha256-vJB/0odVA86fZtRh/Cg5KPD8q8CQFENlRzjpI41UOc8="; + }; + aarch64-linux = fetchurl { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_linux_arm64.tar.gz"; + hash = "sha256-lj7i7oQzX1AfhYfrXDiOjz1/EV4y3/CI4MyPKzNGcss="; + }; + x86_64-darwin = fetchurl { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_amd64.tar.gz"; + hash = "sha256-gEQBxChsM5CXFRsWBVVcQ88xQ2N4lqkIxHfZKPEMlOY"; + }; + aarch64-darwin = fetchurl { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_${version}_darwin_arm64.tar.gz"; + hash = "sha256-6i5Z3m0gMzPuqWm/SJOuxjO3ioh/Uhk3A9uykksYfPo="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -30,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ rguevara84 ]; + maintainers = with maintainers; [ rguevara84 autophagy ]; # TODO: There's support for i686 systems but I do not have any such system # to build it locally on, it's also unfree so I cannot rely on ofborg to @@ -38,6 +49,6 @@ stdenv.mkDerivation rec { # files in the S3 bucket: # # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27 - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } 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 a025de299c..4195a84530 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 @@ -24,13 +24,15 @@ , moto , markdown , lz4 -, setuptoolsTrial +, setuptools-trial , buildbot-worker , buildbot-plugins , buildbot-pkg , parameterized , git , openssh +, setuptools +, pythonRelaxDepsHook , glibcLocales , nixosTests , callPackage @@ -66,7 +68,7 @@ let package = buildPythonApplication rec { pname = "buildbot"; version = "3.9.2"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -88,6 +90,7 @@ let autobahn pyjwt pyyaml + setuptools ] # tls ++ twisted.optional-dependencies.tls; @@ -100,7 +103,7 @@ let moto markdown lz4 - setuptoolsTrial + setuptools-trial buildbot-worker buildbot-pkg buildbot-plugins.www @@ -108,8 +111,11 @@ let git openssh glibcLocales + pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "Twisted" ]; + patches = [ # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 5f3c0efab4..29d0bcf7fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -15,7 +15,7 @@ # tests , parameterized , psutil -, setuptoolsTrial +, setuptools-trial # passthru , nixosTests @@ -36,7 +36,7 @@ buildPythonPackage (rec { ''; nativeBuildInputs = [ - setuptoolsTrial + setuptools-trial ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 4caf0cae4a..9189c59638 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.55.0"; + version = "3.59.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-HvpEEutvdVHyzDtHdlc7ZB9xwnCKYWKbH/A1gAtR+Wk="; + sha256 = "sha256-pYaxjXoNn6MOE2oHUSKrBzP5oKhtfJwSHFCkcpkyzas="; }; - vendorHash = "sha256-bIOS9Ja+mue6LNXUGmkLobh+lLiJfBDtNrAX3fp0jMY="; + vendorHash = "sha256-JSuam9Tn+ZekfLrj78tBncH7Q2aP4CaUgaaDkJ/azEw="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 5e30c977c4..62856ffd38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.105.1"; + version = "0.106.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F0T/4KUz0iU/THE8iRSdKe0Wo3HWQMYOd5vmbO61SzA="; + sha256 = "sha256-W+3sqWPYpMkbmA8dGEodZy+pZGRBLJdthicBFdkn6oU="; }; vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix deleted file mode 100644 index 9b695e5381..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, dagger }: - -buildGoModule rec { - pname = "dagger"; - version = "0.8.7"; - - src = fetchFromGitHub { - owner = "dagger"; - repo = "dagger"; - rev = "v${version}"; - hash = "sha256-vlHLqqUMZAuBgI5D1L2g6u3PDZsUp5oUez4x9ydOUtM="; - }; - - vendorHash = "sha256-B8Qvyvh9MRGFDBvc/Hu+IitBBdHvEU3QjLJuIy1S04A="; - proxyVendor = true; - - subPackages = [ - "cmd/dagger" - ]; - - ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd dagger \ - --bash <($out/bin/dagger completion bash) \ - --fish <($out/bin/dagger completion fish) \ - --zsh <($out/bin/dagger completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = dagger; - command = "dagger version"; - version = "v${version}"; - }; - - meta = with lib; { - description = "A portable devkit for CICD pipelines"; - homepage = "https://dagger.io"; - license = licenses.asl20; - maintainers = with maintainers; [ jfroche sagikazarmark ]; - }; -} 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 cc6d2a70f2..55df9269f9 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.10.0"; + version = "7.11.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-KmKIr7Y3CQmv1rXdju6xwUHABqj/dkXpgWc/yNrAza8="; + hash = "sha256-lp6EXdwmgmjhFxRQXn2P4iRrtJS1QTvg4225V/6E7MI="; }; - vendorHash = "sha256-lc0okniezfTNLsnCBIABQxSgakRUidsprrEnkH8il2g="; + vendorHash = "sha256-p3EhXrRjAFG7Ayfj/ArAWO7KL3S/iR/nwFwXcDc+DSs="; subPackages = [ "fly" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix index 8b9a108d3d..f32c5b138a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "forgejo-actions-runner"; - version = "2.4.0"; + version = "3.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-EEwXo2MvdBlSMho4rrYD4wXLccS/30NbCuxO0CUktgE="; + hash = "sha256-idA74R6kbI7Bk0XvT7BOyctT0IKymsJoFCWgYrtZstU="; }; - vendorHash = "sha256-FspNmiphGHSeZFmdlWIDsEUrCc8THfb0Wm67cMCTtHI="; + vendorHash = "sha256-HE//SD/doMf42y2KF10JAuUe86hpFhCUM61da2NC5CE="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 96741dc8b2..57a78dbb31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -24,13 +24,13 @@ assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.309.0"; + version = "2.311.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-P70kNcd5TjWsHj16y11SEYROGG+JUkpwE9eVpHzvTes="; + hash = "sha256-71SwPuX1XZygT/TdAHECudxFxsQuXrl/tcAYVAxfxfI="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -81,6 +81,14 @@ buildDotnetModule rec { url = "https://github.com/actions/runner/commit/5ff0ce1.patch"; hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas="; }) + ] ++ lib.optionals (nodeRuntimes == [ "node20" ]) [ + # If the package is built without Node 16, make Node 20 the default internal version + # https://github.com/actions/runner/pull/2844 + (fetchpatch { + name = "internal-node-20.patch"; + url = "https://github.com/actions/runner/commit/acdc6ed.patch"; + hash = "sha256-3/6yhhJPr9OMWBFc5/NU/DRtn76aTYvjsjQo2u9ZqnU="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix index bf6c56d8f8..eef1830e14 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -12,6 +12,7 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Runtime"; version = "1.0.2-rc2-24027"; sha256 = "0ippdn16381l8i2iy63i45nk0p303fjbd4amh7biwvqxgagfbvhh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2-rc2-24027"; sha256 = "05y0jz6vfl9zs0lmmwsz6arf7r0mg2dm93ymizrzmqn706krz45x"; }) @@ -19,6 +20,7 @@ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) @@ -51,27 +53,35 @@ (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0-rc2-24027"; sha256 = "0n3ndk1g5qdd892sjcz3y2qmg8ki8b001qfgl2fkwv5f52m65pz9"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "1qnd05bsrz88cr4wnkq7haf2bwml2zzjcscjk94v8ka4isi1i89b"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1-rc2-24027"; sha256 = "0dpgj544rfdqlgjc1nwslwbq49mp286wyy6rfnklxlbfgc2mr216"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0-rc2-24027"; sha256 = "0pkd72vrqn1jxc20g8h2pgqz02xn2rfbl0m4i7b82xa8bc483jmz"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) @@ -81,6 +91,7 @@ (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; }) @@ -97,7 +108,6 @@ (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0-rc2-24027"; sha256 = "1cizj1xvaz7dm701r4bl6s08858j1r2794y7xx8abyw8j91c957w"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; }) @@ -128,14 +138,13 @@ (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Watcher"; version = "4.0.0-rc2-24027"; sha256 = "0g2h4q0w42frdz101z2cxs4n9zpxvzb43wnzawx1f26vpilz7km4"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.0.1-rc2-24027"; sha256 = "1j9z5as3k7ydr4yi83lwh09hqj32g2ndpjgj25xvny5a32dl2mhz"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11-rc2-24027"; sha256 = "16wv24cb39639i7fcw005hh1rggyz2bgn51dpkdc67aq9lz76ivm"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) @@ -170,6 +179,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) @@ -190,21 +200,15 @@ (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; sha256 = "0ixqw47krkazsw0ycm22ivkv7dpg6cjz8z8g0ii44bsx4l8gcx17"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.1.0-rc2-24027"; sha256 = "183qanczf0jb6njgr9pibyr5jh0m8xwrja3j0pcdnzab0cii3n17"; }) (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0-rc2-24027"; sha256 = "0nny9yvnhf3l5hjsy3ina8cha6sjln993vzkzdqka9d7rq1z23d5"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0-rc2-24027"; sha256 = "19f83159vrfnfppzchjclk82w2x1mkvnx1y5yg1f238dpjb2ri8w"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0-rc2-24027"; sha256 = "1mqw7xkh4pj110f249c4jpv9mg1sd8c2cr6kj2zc0mic325vvg0s"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.4.0"; sha256 = "1bn7d2czpc994qzdph4drv7p1cv4x55j2dhbmr113p0gs4hx33zh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0-rc2-24027"; sha256 = "16zwyw3glsq2flq1crd0c24i336bc42rj28a9rjvvkg428vz4rf8"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0-rc2-24027"; sha256 = "1gfxc9p73zak46klrfsyxgkcyzbvqnjarsm0wkvmj31n9g4dpjkz"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) @@ -217,14 +221,13 @@ (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.0.12-rc2-24027"; sha256 = "1111sgvbxrxq9c1i0nziqddlzfdc2bsawd0jcf2nna9nkcn4d6br"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.0.1-rc2-24027"; sha256 = "1ansaxwkc4xi2ngpiv8gjmv02d75y0nb4lfqzxy73r3radakqvdp"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11-rc2-24027"; sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) @@ -232,7 +235,6 @@ (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0-rc2-24027"; sha256 = "1gv963m4523m3m9gbn819bfzmhxqsv93m5kaqmbv4ijyziby2872"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b6e11c7eb4..f07ac564b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.4.0"; + version = "16.5.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-RIxGgS+7gNvexZLLtXymGZaODhax/oSi1gAUxXHZBp4="; + vendorHash = "sha256-C37ijxvyY9PG/Qn29Fmk0pxK+hq45kHIBveBltfIfTo="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-XYlrIUBT/zlnGYxckv36dqSEEpxUom/OJfqnL/HwYDo="; + sha256 = "sha256-NLidtwn1zT7BxzMEF5K41fwbZaICA/KuAr8MIjpJD+A="; }; patches = [ @@ -69,6 +69,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm globin ] ++ teams.gitlab.members; + maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index c90845ddcd..aa4de161d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.414.2"; + version = "2.414.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-kiu/Ymn92tYUu2VAJB7QzlUjpKUyginhX157t//VZbg="; + hash = "sha256-LZMlS8GG3zSbxK0GtrHddXxJMZDwVY0RHb2pUXqEe1k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index dfca2742b5..899fdc7d82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-siPLI463qUQs9tBMlmrMv6G5ry0JrEEIelpid9/cf88="; + hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A="; }; vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix index f44f48d6e2..cdb54fa07f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub }: let - version = "1.0.2"; - srcHash = "sha256-OeOKR9lTGXU2qumyXq3s/CI56IX4XiI/ZTRHNoY6MEI="; - vendorHash = "sha256-+2wQKNyCb9xtB1TeE1/oSMEvKoXVX9ARZxsNqE2rfrg="; - yarnHash = "sha256-QNeQwWU36A05zaARWmqEOhfyZRW68OgF4wTonQLYQfs="; + version = "1.0.5"; + srcHash = "sha256-tkgkhYuLHfmT42P+UMZ7uNB2wBKo0YGiw0a5RoMAu6M="; + vendorHash = "sha256-QTTnTPOgP+FlbqXNCGJc9VuBzQcMujpvFB3+DykYTPY="; + yarnHash = "sha256-TrcTc5svLLSedRC8gCwIBW7/mtHo+uSNZGImtRiVJ0w="; in { inherit version yarnHash vendorHash; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json index b92624a01c..565c05aa8c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -70,7 +70,8 @@ }, "pnpm": { "overrides": { - "semver@<7.5.2": ">=7.5.2" + "semver@<7.5.2": ">=7.5.2", + "postcss@<8.4.31": ">=8.4.31" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock index 22790763a4..cf7c076e74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/yarn.lock @@ -784,7 +784,7 @@ "@vue/shared" "3.3.4" "estree-walker" "2.0.2" "magic-string" "0.30.0" - "postcss" "8.4.24" + "postcss" "8.4.31" "source-map-js" "1.0.2" "@vue/compiler-ssr@3.3.4": @@ -1548,7 +1548,7 @@ "eslint" "8.44.0" "eslint-utils" "3.0.0" "lodash" "4.17.21" - "postcss" "8.4.24" + "postcss" "8.4.31" "postcss-safe-parser" "6.0.0" "postcss-scss" "4.0.6" "postcss-selector-parser" "6.0.13" @@ -2583,14 +2583,14 @@ resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz" integrity "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==" dependencies: - "postcss" "8.4.24" + "postcss" "8.4.31" "postcss-scss@4.0.6": version "4.0.6" resolved "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz" integrity "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==" dependencies: - "postcss" "8.4.24" + "postcss" "8.4.31" "postcss-selector-parser@6.0.13": version "6.0.13" @@ -2608,13 +2608,13 @@ "debug" "4.3.4" "fast-diff" "1.3.0" "lodash.sortedlastindex" "4.1.0" - "postcss" "8.4.24" + "postcss" "8.4.31" "stylus" "0.57.0" -"postcss@8.4.24": - version "8.4.24" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz" - integrity "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==" +"postcss@8.4.31": + version "8.4.31" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" + integrity "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==" dependencies: "nanoid" "3.3.6" "picocolors" "1.0.0" @@ -3055,7 +3055,7 @@ dependencies: "@types/node" "18.16.19" "esbuild" "0.17.19" - "postcss" "8.4.24" + "postcss" "8.4.31" "rollup" "3.26.0" "vue-demi@0.14.5": diff --git a/third_party/nixpkgs/pkgs/development/tools/cosmocc/default.nix b/third_party/nixpkgs/pkgs/development/tools/cosmocc/default.nix deleted file mode 100644 index c3db97dfdc..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/cosmocc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ runCommand, cosmopolitan }: - -let - inherit (cosmopolitan) version; - - cosmocc = - runCommand "cosmocc-${version}" - { - pname = "cosmocc"; - inherit version; - - meta = cosmopolitan.meta // { - description = "compilers for Cosmopolitan C/C++ programs"; - }; - passthru.tests = { - cc = runCommand "c-test" { } '' - cat > hello.c << END - #include - int main() { - printf("Hello world!\n"); - return 0; - } - END - ${cosmocc}/bin/cosmocc hello.c - ./a.out > $out - ''; - }; - } '' - mkdir -p $out/bin - install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin - sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* - ''; -in -cosmocc diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index f768064fbe..61aec684a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -1,21 +1,34 @@ { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts -, coreutils, git, gnused, nix, nixfmt }: +, coreutils, git, gnused, nix, zlib }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in stdenv.mkDerivation rec { pname = "coursier"; version = "2.1.7"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; + hash = "sha256-aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; }; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + installPhase = '' + runHook preInstall + install -Dm555 $src $out/bin/cs patchShebangs $out/bin/cs - wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin + wrapProgram $out/bin/cs \ + --prefix PATH ":" ${lib.makeBinPath [ jre ]} \ + --prefix LD_LIBRARY_PATH ":" ${libPath} + + runHook postInstall ''; passthru.updateScript = writeScript "update.sh" '' @@ -38,5 +51,6 @@ stdenv.mkDerivation rec { description = "Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix index 2e85a90c3f..ada4dde017 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.38.5"; + version = "0.38.6"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpfOpfEb8wxqaFFh8h0H4nn8bbBr7s0dWcRiREGddQ4="; + hash = "sha256-6y3kZyhY1WKHLw3ekZMQeoSGUgxhBu8dPl58ZnCDa+E="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock index cad9810973..11d066eaea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/cucumber/Gemfile.lock @@ -2,37 +2,35 @@ GEM remote: https://rubygems.org/ specs: builder (3.2.4) - cucumber (8.0.0) + cucumber (9.0.2) builder (~> 3.2, >= 3.2.4) - cucumber-ci-environment (~> 9.0, >= 9.0.4) - cucumber-core (~> 11.0, >= 11.0.0) - cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-html-formatter (~> 19.1, >= 19.1.0) - cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-ci-environment (~> 9.2, >= 9.2.0) + cucumber-core (~> 11.1, >= 11.1.0) + cucumber-cucumber-expressions (~> 16.1, >= 16.1.2) + cucumber-gherkin (>= 24, < 26.2.1) + cucumber-html-formatter (~> 20.4, >= 20.4.0) + cucumber-messages (>= 19, < 23) diff-lcs (~> 1.5, >= 1.5.0) - mime-types (~> 3.4, >= 3.4.1) + mini_mime (~> 1.1, >= 1.1.5) multi_test (~> 1.1, >= 1.1.0) - sys-uname (~> 1.2, >= 1.2.2) - cucumber-ci-environment (9.1.0) - cucumber-core (11.0.0) - cucumber-gherkin (~> 23.0, >= 23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) + sys-uname (~> 1.2, >= 1.2.3) + cucumber-ci-environment (9.2.0) + cucumber-core (11.1.0) + cucumber-gherkin (>= 24, < 27) + cucumber-messages (>= 19, < 22) cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-cucumber-expressions (15.2.0) - cucumber-gherkin (23.0.1) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-html-formatter (19.2.0) - cucumber-messages (~> 18.0, >= 18.0.0) - cucumber-messages (18.0.0) + cucumber-cucumber-expressions (16.1.2) + cucumber-gherkin (26.2.0) + cucumber-messages (>= 19.1.4, < 22.1) + cucumber-html-formatter (20.4.0) + cucumber-messages (>= 18.0, < 22.1) + cucumber-messages (21.0.1) cucumber-tag-expressions (4.1.0) diff-lcs (1.5.0) - ffi (1.15.5) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + ffi (1.16.3) + mini_mime (1.1.5) multi_test (1.1.0) - sys-uname (1.2.2) + sys-uname (1.2.3) ffi (~> 1.1) PLATFORMS @@ -42,4 +40,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 2.3.22 + 2.4.20 diff --git a/third_party/nixpkgs/pkgs/development/tools/cucumber/default.nix b/third_party/nixpkgs/pkgs/development/tools/cucumber/default.nix index fdd77be07f..a7da4ab7d0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cucumber/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cucumber/default.nix @@ -9,9 +9,11 @@ bundlerApp { meta = with lib; { description = "A tool for executable specifications"; - homepage = "https://cucumber.io/"; - license = with licenses; mit; - maintainers = with maintainers; [ manveru nicknovitski ]; - platforms = platforms.unix; + homepage = "https://cucumber.io/"; + changelog = "https://github.com/cucumber/cucumber-ruby/blob/main/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "cucumber"; + maintainers = with maintainers; [ manveru nicknovitski anthonyroussel ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cucumber/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/cucumber/gemset.nix index f702301c24..16d750887a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cucumber/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cucumber/gemset.nix @@ -10,25 +10,25 @@ version = "3.2.4"; }; cucumber = { - dependencies = ["builder" "cucumber-ci-environment" "cucumber-core" "cucumber-cucumber-expressions" "cucumber-gherkin" "cucumber-html-formatter" "cucumber-messages" "diff-lcs" "mime-types" "multi_test" "sys-uname"]; + dependencies = ["builder" "cucumber-ci-environment" "cucumber-core" "cucumber-cucumber-expressions" "cucumber-gherkin" "cucumber-html-formatter" "cucumber-messages" "diff-lcs" "mini_mime" "multi_test" "sys-uname"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahpifcqv0h5r9cgd97fwr73ps90h50jzi0h17zsaw4ksb3b6g2m"; + sha256 = "0hwbq5sn4hsd922j1p3a4p2404306yczgx2vqggvr20q01fzx55h"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.2"; }; cucumber-ci-environment = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmn2hfrjlbazgcryr3hwvsa5v4csfbjqxb4q7wbjhaxl9xxn0k7"; + sha256 = "0a11b6w6khjb7rw7ksxdw4bprmg9gfc8xdrsbgv8767ri891s4lq"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; cucumber-core = { dependencies = ["cucumber-gherkin" "cucumber-messages" "cucumber-tag-expressions"]; @@ -36,20 +36,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drg9w5cz5mchh077y9ixsy7yiyrzg3cqc29mmkl3vjcwlkhn3rh"; + sha256 = "02mrykswrxziy08fc9fjvg3l2aa6jfji2012wzh7pyamhm8pcnjb"; type = "gem"; }; - version = "11.0.0"; + version = "11.1.0"; }; cucumber-cucumber-expressions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xkgpy69p24winh4p5q2b3534i02xxbxl5rn0capqv97qjyj63j"; + sha256 = "0s8bazf8bwlm0zar2316p4xxmpy44wyjnw2z6bj7zc5nl8nmyvym"; type = "gem"; }; - version = "15.2.0"; + version = "16.1.2"; }; cucumber-gherkin = { dependencies = ["cucumber-messages"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsvcjy78c114q3znacs25zhq3f49q9kkxq4j9iw8b6kwimrl8wj"; + sha256 = "0in9cn9pza3vylc1mlpc3ivri493ikq7f9pnsjkfr6ahagacnh4i"; type = "gem"; }; - version = "23.0.1"; + version = "26.2.0"; }; cucumber-html-formatter = { dependencies = ["cucumber-messages"]; @@ -68,20 +68,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gnmm1r4gyqqwzx482zsbahjyamnj0lxxky86zs4a376jv9bicyz"; + sha256 = "1al5cafzbiqd7fhwyvs0xcpjszav0q5816x9r02v3hzri10wvp5s"; type = "gem"; }; - version = "19.2.0"; + version = "20.4.0"; }; cucumber-messages = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8abkxykq7ab15pirrrf0jz9200i3x3pda2ffyxmck6063lyjgv"; + sha256 = "0482a63y7my0arn2bv208g401dq8525f0gwhnwaa11mhv6ph0q5i"; type = "gem"; }; - version = "18.0.0"; + version = "21.0.1"; }; cucumber-tag-expressions = { groups = ["default"]; @@ -108,31 +108,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; - mime-types = { - dependencies = ["mime-types-data"]; + mini_mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "3.4.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; - type = "gem"; - }; - version = "3.2022.0105"; + version = "1.1.5"; }; multi_test = { groups = ["default"]; @@ -150,9 +139,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gk625krfm00nppb2ni0794kzr1cqbs1a0059fhp4s3lcrmx69jc"; + sha256 = "03j9qpqip89a0vk6s0gvhxzhbvafjcj5rss7i3jwha0831aivib3"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index 16def898b0..0ff3e90dc0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -1,4 +1,11 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles, testers, cue }: +{ buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, installShellFiles +, testers +, cue +}: buildGoModule rec { pname = "cue"; @@ -11,13 +18,21 @@ buildGoModule rec { hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts="; }; + vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; + + patches = [ + # Fix tests with go1.21. See https://github.com/cue-lang/cue/issues/2548. + (fetchpatch { + url = "https://github.com/cue-lang/cue/commit/3bf3dbd655284d3628399a83a703f4849b5f9374.patch"; + hash = "sha256-9Zi2mrqB1JTFvadiqWTgzzi1pffZ3gOmTtrDDQWye1Q="; + }) + ]; + postPatch = '' # Disable script tests rm -f cmd/cue/cmd/script_test.go ''; - vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; - excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix index 4a39395f8b..e1290fd907 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Fhuksf0EMzu3JBLO4eZyc8GctNyfNE1v/8a3TOFKKQg="; + sha256 = "sha256-G2n6VGP3ncuZ9siXojr4gx0VacIkKSt4OSQo3ZOecr0="; }; - vendorHash = "sha256-DpHb+TCBW0fkwRZRqeGABo5psLJNBOW1nSSRWWVn+Mg="; + vendorHash = "sha256-/sdW1cDFpOMkXN4RXJQB1PpDbyNmTEOo9OrK5A7cRGQ="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix b/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix index d10ef137a3..3703cc757c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/darklua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-OgQOsc6upMJveUUJSGqvopsyoKs7ALd6pVYxCi5fmS8="; + hash = "sha256-lBnEMQqAUkr377aYNRvpbIyZMmB6NIY/bmB1Oe8QPIM="; }; - cargoHash = "sha256-qq42K4cPrWu/92P4dpegZ/0Wv2ndCb5d5+DgEKzdhbw="; + cargoHash = "sha256-YmtOVS58I8YdNpWBXBuwSFUVKQsVSuGlql70SPFkamM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix index 337f0393dc..7afa8b43a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix @@ -1,24 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: buildGoModule rec { pname = "atlas"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-dOqL/9sJUbaHqF3N5PEL7f6LxQQWNL0FvaH5BxQp4Xg="; + hash = "sha256-qEui+Y7auNFJwLSUT90jJH7IPgNW06phbJel9y3C1bk="; }; modRoot = "cmd/atlas"; - vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis="; + proxyVendor = true; + vendorHash = "sha256-BJB+ZwrfZsYlyVX0G3qNQW8KexxMmc1Y9m2TRbOX6Tc="; nativeBuildInputs = [ installShellFiles ]; - env.GOWORK = "off"; - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; subPackages = [ "." ]; @@ -30,6 +29,12 @@ buildGoModule rec { --zsh <($out/bin/atlas completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = atlas; + command = "atlas version"; + version = "v${version}"; + }; + meta = with lib; { description = "A modern tool for managing database schemas"; homepage = "https://atlasgo.io/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index 2495e09bba..8ac28618b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NX2687jG0TAt3rOV5XEmgHYiNhuBoWbnUEFnf3w5k6A="; + sha256 = "sha256-KJBg64GaWXUV6go8IO9cI82NUeD0j59ySZTTzINo8So="; }; - vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw="; + vendorHash = "sha256-u3UtrsHohuQrSk4ypMXasLPYwkcRYMvOdpBpO8PpwZg="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index bad6a1644b..fe89b0c791 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-5dYWCcCQymwzWGY67lds5QQzHHkKt3OGkvqXDLwt/q8="; + hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk="; }; - vendorHash = "sha256-1sfIwawsWefh+nj4auqRjU4dWuDbgpvhAc8cF8DhICg="; + vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 512388ecee..4880659c04 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.23.2"; + version = "4.24.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-/H0qn6l9kSA9Y5tmRxXUCVPGyRVaUiWg3cTIB5uaNkE="; + hash = "sha256-bs9jinW1AbeYGJ2oJOFn8p25NHcYYQnyVJUIxiZtCyo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix index 818709ae1e..27b37eff48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.11"; + version = "0.3.13"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03gGGx8RZEK2RrToN30gkIlHss/e3UcSi3AmMh9twDU="; + sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix index a60ad380ce..affda7ff49 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix @@ -1,14 +1,19 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, pgweb +}: buildGoModule rec { pname = "pgweb"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - hash = "sha256-0wwDye7Iku9+brYoVqlCpnm+A3xsr8tL2dyWaBVvres="; + hash = "sha256-gM7hqFriXkcwNO+I3d138kfp1F4YsO/Qbq0NzMszkwM="; }; postPatch = '' @@ -29,7 +34,14 @@ buildGoModule rec { in [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; + passthru.tests.version = testers.testVersion { + version = "v${version}"; + package = pgweb; + command = "pgweb --version"; + }; + meta = with lib; { + changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}"; description = "A web-based database browser for PostgreSQL"; longDescription = '' A simple postgres browser that runs as a web server. You can view data, @@ -37,6 +49,7 @@ buildGoModule rec { ''; homepage = "https://sosedoff.github.io/pgweb/"; license = licenses.mit; + mainProgram = "pgweb"; maintainers = with maintainers; [ zupo luisnquin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock index 535adb0d32..5f4df8b9a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -323,6 +323,7 @@ dependencies = [ "enumflags2", "indoc", "insta", + "query-engine-metrics", "query-engine-tests", "query-tests-setup", "reqwest", @@ -1046,6 +1047,30 @@ dependencies = [ "similar", ] +[[package]] +name = "driver-adapters" +version = "0.1.0" +dependencies = [ + "async-trait", + "bigdecimal", + "chrono", + "expect-test", + "futures", + "metrics 0.18.1", + "napi", + "napi-derive", + "num-bigint", + "once_cell", + "psl", + "quaint", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-core", + "uuid", +] + [[package]] name = "either" version = "1.9.0" @@ -1149,18 +1174,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.28", -] - [[package]] name = "enumflags2" version = "0.7.7" @@ -1881,28 +1894,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "js-connectors" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "chrono", - "expect-test", - "futures", - "napi", - "napi-derive", - "num-bigint", - "once_cell", - "psl", - "quaint", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-core", -] - [[package]] name = "js-sys" version = "0.3.61" @@ -2319,9 +2310,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f" +checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b" dependencies = [ "async-trait", "futures-channel", @@ -3162,7 +3153,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "native-tls", "tokio", @@ -3173,7 +3164,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "base64 0.13.1", "byteorder", @@ -3190,7 +3181,7 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "bit-vec", "bytes", @@ -3625,8 +3616,8 @@ dependencies = [ "anyhow", "async-trait", "connection-string", + "driver-adapters", "futures", - "js-connectors", "napi", "napi-build", "napi-derive", @@ -3693,12 +3684,12 @@ version = "0.1.0" dependencies = [ "async-trait", "colored", - "enum_dispatch", "enumflags2", "hyper", "indexmap 1.9.3", "indoc", "itertools", + "jsonrpc-core", "nom", "once_cell", "parse-hyperlinks", @@ -3713,6 +3704,7 @@ dependencies = [ "request-handlers", "serde", "serde_json", + "sql-query-connector", "strip-ansi-escapes", "thiserror", "tokio", @@ -5171,7 +5163,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "async-trait", "byteorder", @@ -5509,7 +5501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] @@ -5743,9 +5735,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5753,16 +5745,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -5780,9 +5772,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5790,22 +5782,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-logger" diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index bb76554c3d..a180878f9a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.2.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-7bZ6qy5AL7c2F6HfyM7/G36XTkSVsq+T+xxNlrBCXL4="; + sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw="; }; # Use system openssl. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; - "postgres-native-tls-0.5.0" = "sha256-150GAIccGDAD+t/iWkLbXe4SblrW/KUcxkTy4Mrie5U="; + "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix index fe3df4ee9a..128f00c0eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-t/l1fMZpGCLtxjCtOMv4eaj6oNyFX9BFgfc3OwYrxs0="; + hash = "sha256-McJ3V3kndawheWo/xsBU8Xi8K47vHMpQHTpDbR4vkWk="; }; - cargoHash = "sha256-bdPjLOHh5qC1/LNfsUC26h4v3EuwiM9HqoQxeeNCOIw="; + cargoHash = "sha256-Q1PSpGpd5QRT6QKQOd6hVdZrlDBawfsqqp/CTJfnl7E="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index 69fe4ee889..bca69a4534 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.22.0"; + version = "1.23.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; - hash = "sha256-aSu+d3ti/PpR5oQwciq1Cz+vxDPunGsVaUg/o/rfmsY="; + hash = "sha256-MM4O/njW4R1darZMtoevuLMt14/BrCAaFvSX06CTso8="; }; proxyVendor = true; - vendorHash = "sha256-sjGswoIUM+UL6qJORdB3UmPh7T6JmTBI5kksgGcRtY0="; + vendorHash = "sha256-tJ+Bih+vwkYfEvIsJ6R2Z0eDS9m1eTOS68uyad0F6f0="; subPackages = [ "cmd/sqlc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix index 67d905ae05..cc68d8b93b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix @@ -1,37 +1,11 @@ -{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }: +{ lib, stdenv, makeWrapper, fetchurl, unzip, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; version = "23.2.0.178.1027"; - src = requireFile rec { - url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "sqlcl-${version}.zip"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the - download and repeat until the version is correct. This is necessary - because as the time of this writing there exists no permanent link - for the current version yet. - Also consider updating this package yourself (you probably just need - to change the `version` variable and update the sha256 to the one of - the new file) or opening an issue at the nixpkgs repo. - - click "Download" - - sign in or create an oracle account if neccessary - - on the next page, click the "${name}" link - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; + src = fetchurl { + url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; @@ -58,8 +32,8 @@ stdenv.mkDerivation rec { also supporting your previously written SQL*Plus scripts. ''; homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; - license = licenses.unfree; + license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ misterio77 ]; }; -} +}) 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 d9ab451208..89ae63369f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.3.2"; + version = "2.3.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-buDDu5UQmO1ImWXzqwlFZHYbn2FUjAxs8KbQX+g/mvg="; + hash = "sha256-l9py+qMI8t5L+FcUmJYXwemjUy/pcugbvhdW3oUOZMo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index af36a997a6..3fe77e6774 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -12,14 +12,57 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.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", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" 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" @@ -31,30 +74,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -65,17 +107,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -86,9 +128,9 @@ checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -101,20 +143,36 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", + "cpufeatures", "password-hash", ] [[package]] -name = "assert_cmd" -version = "2.0.11" +name = "arrayvec" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert_cmd" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -126,10 +184,25 @@ dependencies = [ ] [[package]] -name = "async-channel" -version = "1.8.0" +name = "assert_fs" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[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", @@ -145,29 +218,29 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -189,7 +262,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -241,6 +314,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" @@ -249,9 +337,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -265,7 +353,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a" dependencies = [ - "base64 0.21.1", + "base64 0.21.4", "blowfish", "getrandom", "subtle", @@ -273,23 +361,41 @@ dependencies = [ ] [[package]] -name = "bigdecimal" -version = "0.3.1" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "num-bigint", - "num-integer", - "num-traits", "serde", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitvec" version = "1.0.1" @@ -331,13 +437,57 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.5.0" +name = "borsh" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive", + "hashbrown 0.13.2", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal", + "borsh-schema-derive-internal", + "proc-macro-crate", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bstr" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -349,16 +499,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] -name = "bung" -version = "0.1.0" +name = "bytecheck" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da8bcf29331f126c3b4f20a6698909d58004290723aac75e3eafab41ae3c2953" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ - "byteorder", - "rmp", - "serde", + "bytecheck_derive", + "ptr_meta", + "simdutf8", ] +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + [[package]] name = "byteorder" version = "1.4.3" @@ -367,15 +534,74 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[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" [[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 = "cedar-policy" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740e9c6999327357726ab9170defa1229c9a91f000c40cb02b343385cd7d8cf9" +dependencies = [ + "cedar-policy-core", + "cedar-policy-validator", + "itertools 0.10.5", + "lalrpop-util", + "ref-cast", + "serde", + "serde_json", + "smol_str", + "thiserror", +] + +[[package]] +name = "cedar-policy-core" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c43c92ddadc29024643ef24ff0aeb665bb665750d401f6b5f4a9a44eae898ae" +dependencies = [ + "either", + "ipnet", + "itertools 0.10.5", + "lalrpop", + "lalrpop-util", + "lazy_static", + "regex", + "rustc_lexer", + "serde", + "serde_json", + "serde_with", + "smol_str", + "stacker", + "thiserror", +] + +[[package]] +name = "cedar-policy-validator" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf263ac64b18d94d9cd8ae4d05b65100fc21647e20eb42f7735fb54ec887afa3" +dependencies = [ + "cedar-policy-core", + "itertools 0.10.5", + "serde", + "serde_json", + "serde_with", + "smol_str", + "stacker", + "thiserror", + "unicode-security", +] [[package]] name = "cfg-if" @@ -385,18 +611,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -425,10 +650,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -437,25 +662,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", - "clap_derive 4.3.0", - "once_cell", + "clap_derive 4.4.2", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim", ] @@ -474,14 +697,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -495,9 +718,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cli-table" @@ -537,6 +760,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + [[package]] name = "const-random" version = "0.1.15" @@ -576,24 +805,24 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -616,9 +845,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -636,28 +865,79 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" +name = "darling" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.32", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.32", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", ] +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] +name = "deunicode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" + [[package]] name = "diff" version = "0.1.13" @@ -686,6 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -700,21 +981,41 @@ dependencies = [ ] [[package]] -name = "dlv-list" -version = "0.5.0" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +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 = "dlv-list" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aead04dc46b5f263c25721cf25c9e595951d15055f8063f92392fa0d7f64cf4" dependencies = [ "const-random", ] [[package]] name = "dmp" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796e147190351ab441586c68b74494b18a70b0e39fb9bf8e84e38635bf4c92a" +checksum = "bfaa1135a34d26e5cc5b4927a8935af887d4f30a5653a797c33b9a4222beb6d9" dependencies = [ - "regex", "urlencoding", ] @@ -725,29 +1026,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "either" -version = "1.8.1" +name = "earcutr" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools 0.10.5", + "num-traits", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "errno" -version = "0.3.1" +name = "endian-type" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -775,6 +1107,27 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[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 = "float_next_after" version = "1.0.0" @@ -802,9 +1155,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -815,6 +1168,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + [[package]] name = "funty" version = "2.0.0" @@ -848,13 +1207,15 @@ dependencies = [ [[package]] name = "futures-concurrency" -version = "7.2.1" +version = "7.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f9eed2df6a47eb0338716fcf2a3bcd0f0e84b81dcd54ada4bb64e23b7f3f70" +checksum = "d7cf7759a91582f72d30e68a2507feecac3dbcf6314ae91fa7046d6173d502e7" dependencies = [ "bitvec", "futures-core", "pin-project", + "slab", + "smallvec", ] [[package]] @@ -886,7 +1247,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -903,7 +1264,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -957,29 +1318,48 @@ dependencies = [ [[package]] name = "geo" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268" +checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" dependencies = [ + "earcutr", "float_next_after", "geo-types", "geographiclib-rs", "log", "num-traits", - "robust", - "rstar", + "robust 0.2.3", + "rstar 0.10.0", + "serde", +] + +[[package]] +name = "geo" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +dependencies = [ + "earcutr", + "float_next_after", + "geo-types", + "geographiclib-rs", + "log", + "num-traits", + "robust 1.1.0", + "rstar 0.11.0", "serde", ] [[package]] name = "geo-types" -version = "0.7.9" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f0b3068e1537a4b861ec3734f4aa9c317d537cf0845bf6fb6221973499d26c" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" dependencies = [ "approx", "num-traits", - "rstar", + "rstar 0.10.0", + "rstar 0.11.0", "serde", ] @@ -994,22 +1374,52 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] -name = "h2" -version = "0.3.19" +name = "gimli" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags 1.3.2", + "ignore", + "walkdir", +] + +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1017,7 +1427,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1038,12 +1448,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] [[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 = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heapless" @@ -1075,18 +1497,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -1127,15 +1546,15 @@ 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 = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1148,7 +1567,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1157,22 +1576,23 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.1", + "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", ] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1192,15 +1612,38 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.3.0" +name = "ident_case" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + [[package]] name = "include_dir" version = "0.7.3" @@ -1231,6 +1674,17 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", + "serde", +] + [[package]] name = "inout" version = "0.1.3" @@ -1249,33 +1703,21 @@ dependencies = [ "cfg-if", ] -[[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 = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.2", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1288,25 +1730,69 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lalrpop" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" +dependencies = [ + "regex", +] + [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lexicmp" @@ -1319,9 +1805,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libm" @@ -1331,15 +1817,15 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1347,11 +1833,17 @@ 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" + +[[package]] +name = "lru" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ - "cfg-if", + "hashbrown 0.13.2", ] [[package]] @@ -1365,9 +1857,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "mime" @@ -1375,6 +1867,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[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 = "minimal-lexical" version = "0.2.1" @@ -1382,15 +1884,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "mio" -version = "0.8.6" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "wasi", + "windows-sys", ] [[package]] @@ -1421,6 +1931,21 @@ dependencies = [ "getrandom", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + [[package]] name = "nom" version = "7.1.3" @@ -1431,6 +1956,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -1443,15 +1974,32 @@ 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-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", + "smallvec", + "zeroize", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1463,10 +2011,21 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "num-iter" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -1474,19 +2033,28 @@ dependencies = [ [[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 0.3.2", "libc", ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-multimap" @@ -1500,18 +2068,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "overload" @@ -1537,15 +2096,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] @@ -1560,16 +2119,16 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.12" +name = "path-clean" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", @@ -1578,10 +2137,39 @@ dependencies = [ ] [[package]] -name = "percent-encoding" -version = "2.2.0" +name = "pem" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +dependencies = [ + "base64 0.21.4", + "serde", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.0.0", +] [[package]] name = "pharos" @@ -1594,30 +2182,45 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.1.0" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +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.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[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" @@ -1625,6 +2228,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1632,15 +2256,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "predicates" -version = "3.0.3" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "predicates" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools", + "float-cmp", + "itertools 0.11.0", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -1661,16 +2294,23 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1703,9 +2343,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1717,10 +2357,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] -name = "quote" -version = "1.0.27" +name = "psm" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[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 = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1731,6 +2400,17 @@ 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", + "serde", +] + [[package]] name = "rand" version = "0.8.5" @@ -1767,14 +2447,66 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1782,24 +2514,27 @@ dependencies = [ ] [[package]] -name = "regex-automata" -version = "0.1.10" +name = "regex-syntax" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "regex-syntax" -version = "0.7.2" +name = "rend" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.1", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -1813,16 +2548,17 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.1", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -1830,10 +2566,47 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] +[[package]] +name = "retain_mut" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" + +[[package]] +name = "revision" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87eb86913082f8976b06d07a59f17df9120e6f38b882cf3fc5a45b4499e224b6" +dependencies = [ + "bincode", + "chrono", + "geo 0.26.0", + "regex", + "revision-derive", + "roaring", + "rust_decimal", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "revision-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf996fc5f61f1dbec35799b5c00c6dda12e8862e8cb782ed24e10d0292e60ed3" +dependencies = [ + "darling", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "ring" version = "0.16.20" @@ -1850,14 +2623,43 @@ dependencies = [ ] [[package]] -name = "rmp" -version = "0.8.11" +name = "rkyv" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "roaring" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" +dependencies = [ + "bytemuck", "byteorder", - "num-traits", - "paste", + "retain_mut", + "serde", ] [[package]] @@ -1866,6 +2668,34 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" +[[package]] +name = "robust" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" + +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rstar" version = "0.10.0" @@ -1877,6 +2707,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rstar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +dependencies = [ + "heapless", + "num-traits", + "smallvec", +] + [[package]] name = "rust-ini" version = "0.19.0" @@ -1887,6 +2728,47 @@ dependencies = [ "ordered-multimap", ] +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rust_decimal" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_lexer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" +dependencies = [ + "unicode-xid", +] + [[package]] name = "rustc_version" version = "0.4.0" @@ -1898,23 +2780,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", @@ -1924,9 +2805,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -1936,28 +2817,34 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.1", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", ] [[package]] -name = "ryu" -version = "1.0.13" +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa20" @@ -1979,9 +2866,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" @@ -2006,10 +2893,16 @@ dependencies = [ ] [[package]] -name = "semver" -version = "1.0.17" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -2022,30 +2915,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -2063,6 +2957,35 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +dependencies = [ + "base64 0.21.4", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.0.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "serial_test" version = "2.0.0" @@ -2085,7 +3008,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2112,9 +3035,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -2122,19 +3045,68 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.8" +name = "signature" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[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 = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + +[[package]] +name = "snap" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "socket2" @@ -2146,6 +3118,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "spin" version = "0.5.2" @@ -2162,10 +3144,20 @@ dependencies = [ ] [[package]] -name = "sqlparser" -version = "0.34.0" +name = "spki" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlparser" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" dependencies = [ "log", ] @@ -2177,16 +3169,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "storekey" -version = "0.4.1" +name = "stacker" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475592c1aa8849fa7874777c9df46aa93ffc47851c7c60bee88b1745a1adb893" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "storekey" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43c42833834a5d23b344f71d87114e0cc9994766a5c42938f4b50e7b2aef85b2" dependencies = [ "byteorder", + "memchr", "serde", "thiserror", ] +[[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", + "precomputed-hash", +] + [[package]] name = "strsim" version = "0.10.0" @@ -2201,9 +3220,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surrealdb" -version = "1.0.0-beta.9+20230402" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02e7f6cba9dcb779fe13984a064b7f68e398425355430dcf7184fc4abfc0f97" +checksum = "46fb62fbf4b5f0f28c52e919c7a0f5eb4aa4cd6b92b1e25f2e71a7f2d9f92524" dependencies = [ "addr", "any_ascii", @@ -2211,40 +3230,53 @@ dependencies = [ "async-channel", "async-executor", "async-recursion", + "base64 0.21.4", "bcrypt", - "bigdecimal", - "bung", + "bincode", + "bytes", + "cedar-policy", "chrono", + "deunicode", "dmp", "flume", + "fst", "futures", "futures-concurrency", "fuzzy-matcher", - "geo", - "indexmap", + "geo 0.25.1", + "indexmap 1.9.3", + "ipnet", "lexicmp", - "log", + "lru", "md-5", "nanoid", "nom", "once_cell", + "path-clean", "pbkdf2", "pharos", + "pin-project-lite", + "radix_trie", "rand", "regex", "reqwest", - "rustls 0.20.8", + "revision", + "roaring", + "rust-stemmers", + "rust_decimal", + "rustls 0.20.9", "scrypt", "semver", "serde", "serde_json", "sha-1", "sha2", + "snap", "storekey", "surrealdb-derive", + "surrealdb-jsonwebtoken", "thiserror", "tokio", - "tokio-stream", "tokio-tungstenite", "tokio-util", "tracing", @@ -2253,36 +3285,58 @@ dependencies = [ "url", "uuid", "wasm-bindgen-futures", + "wasmtimer", "ws_stream_wasm", ] [[package]] name = "surrealdb-derive" -version = "0.7.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0f2a75e22417f587cf23a5efa9f680f4002b8655b8481a01ee5e787f15d82b" +checksum = "aacdb4c58b9ebef0291310afcd63af0012d85610d361f3785952c61b6f1dddf4" dependencies = [ "quote", "syn 1.0.109", ] +[[package]] +name = "surrealdb-jsonwebtoken" +version = "8.3.0-surreal.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" +dependencies = [ + "base64 0.21.4", + "getrandom", + "hmac", + "pem", + "rand", + "ring", + "rsa", + "serde", + "serde_json", + "sha2", + "simple_asn1", +] + [[package]] name = "surrealdb-migrations" -version = "0.9.12" +version = "1.0.0-preview.1" dependencies = [ "anyhow", "assert_cmd", + "assert_fs", "chrono", "chrono-human-duration", - "clap 4.3.0", + "clap 4.4.3", "cli-table", "convert_case", "diffy", "dir-diff", "fs_extra", "include_dir", - "itertools", + "itertools 0.11.0", "names", + "predicates", "pretty_assertions", "regex", "rust-ini", @@ -2308,9 +3362,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -2323,6 +3377,30 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix", + "windows-sys", +] + +[[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.2.0" @@ -2346,22 +3424,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2376,13 +3454,30 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +dependencies = [ + "time-core", ] [[package]] @@ -2411,19 +3506,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2434,7 +3529,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2443,18 +3538,18 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls 0.21.7", "tokio", ] @@ -2471,9 +3566,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -2490,11 +3585,12 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "tokio-rustls 0.23.4", "tungstenite", "webpki", + "webpki-roots 0.22.6", ] [[package]] @@ -2512,6 +3608,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -2532,13 +3637,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2580,7 +3685,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.20.8", + "rustls 0.20.9", "sha1", "thiserror", "url", @@ -2596,14 +3701,23 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand", "serde", ] +[[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.13" @@ -2612,9 +3726,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2625,6 +3739,22 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-security" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +dependencies = [ + "unicode-normalization", + "unicode-script", +] + [[package]] name = "unicode-segmentation" version = "1.10.1" @@ -2637,6 +3767,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + [[package]] name = "untrusted" version = "0.7.1" @@ -2645,9 +3781,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2656,9 +3792,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf-8" @@ -2674,9 +3810,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "atomic", "getrandom", @@ -2707,9 +3843,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -2717,20 +3853,13 @@ dependencies = [ [[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", ] -[[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" @@ -2739,9 +3868,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2749,24 +3878,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2776,9 +3905,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2786,28 +3915,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -2817,10 +3946,23 @@ dependencies = [ ] [[package]] -name = "web-sys" -version = "0.3.63" +name = "wasmtimer" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "wasm-bindgen", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -2828,9 +3970,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", @@ -2845,6 +3987,12 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -2882,16 +4030,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.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", + "windows-targets", ] [[package]] @@ -2900,130 +4039,74 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[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", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix index 7cf5131719..40d7614033 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "0.9.12"; + version = "1.0.0-preview.1"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-avDztyxjRTa66MUfIvwtxY1SiGNAtVdepUPHggrbDk0="; + hash = "sha256-G3pgUOAkLTcqUP8SLk2Tt38kuHD/2fDY5NLh0BTdNyk="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 1fa12861d9..38bbd1cb15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MQi8A7eWOShP/VhxuX4Uhz1ueLtKvOi1x4E7aFXEsQo="; + sha256 = "sha256-YgG8yuHnJrhrqJHNUkMjJvKNzEQ3ClY9OQzt+ET4LEk="; }; - vendorHash = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4="; + vendorHash = "sha256-8Q+KMYu1yiHEYS035NmCvxSgIS/+oRhhcZa6SwmvGgk="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix index da97407406..ad78378006 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/vitess/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vitess"; - version = "17.0.2"; + version = "17.0.3"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-uST+FtYhGIn/Tieyofbh2r8xonw8qsS6ODrpd/A27r4="; + hash = "sha256-/nj//8mCP6ytsdJAj/rJ0/vDEyyvOyUWNaLELBe/yts="; }; vendorHash = "sha256-0OrPbMG7ElOD+9/kWx1HtvGUBiFpIsNs5Vu7QofzE6Q="; diff --git a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix index 27e11032d9..cf44600892 100644 --- a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.1"; + version = "1.23.3"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g="; + sha256 = "sha256-Lm9z8XB7BdB7ikiyJyuVtV8eqlPucxmMNNC90E99qpA="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix index e1a225ed03..c373b18108 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.5.13"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-BUbgujVPog5OZXTvaOUzAiu5s6QxA7bfbiikYXB5wMU="; + hash = "sha256-xjmxikIcR3v5lpxq7w2p0bukPunUTYH/HTQhy9fAOz8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-JPbGvY+SMxqwCoh8Ea5iDmseonnp4Kczr5EzRbocb1s="; + vendorHash = "sha256-fDh+6aBrHUqioNbgufFiD5c4i8SGAYrUuFXgTVmhrRE="; nativeBuildInputs = [ installShellFiles ]; @@ -38,6 +38,6 @@ buildGoModule rec { description = "Instant, easy, predictable shells and containers."; homepage = "https://www.jetpack.io/devbox"; license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom lagoja ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 8f103fd628..9a7c8dcccd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -8,13 +8,12 @@ python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "6.0.3"; - - format = "setuptools"; + version = "7.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-csdQUxnopH+kYtoqdvyXKNW3fGkQNSREJYxjes9Dgi8="; + hash = "sha256-AI/GNubb7+nwz/vM6v/JoUtWup6rBJieKXtFQzrdPkE="; }; postPatch = '' @@ -22,22 +21,24 @@ python3.pkgs.buildPythonApplication rec { --replace "--flake8" "" ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-changelog-shortener + wheel + ]; + buildInputs = [ glibcLocales ]; propagatedBuildInputs = with python3.pkgs; [ - argon2-cffi-bindings build check-manifest devpi-common iniconfig - pep517 pkginfo pluggy platformdirs - py - setuptools ]; nativeCheckInputs = [ @@ -67,6 +68,10 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "devpi" + ]; + meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; homepage = "http://doc.devpi.net"; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix index f3de637823..c705848c20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildPythonApplication, isPy27 +{ lib, fetchFromGitHub, buildPythonApplication +, pythonOlder , aiohttp , appdirs , beautifulsoup4 @@ -24,16 +25,16 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.7.0"; - format = "setuptools"; + version = "6.9.2"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M="; + hash = "sha256-HnxWLxOK+6B8O/7lpNjuSUQ0Z7NOmV2n01WFyjow6oU="; }; sourceRoot = "${src.name}/server"; @@ -43,6 +44,10 @@ buildPythonApplication rec { --replace "--flake8" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp appdirs @@ -87,13 +92,21 @@ buildPythonApplication rec { disabledTests = [ "root_passwd_hash_option" "TestMirrorIndexThings" + "test_auth_mirror_url_no_hash" + "test_auth_mirror_url_with_hash" + "test_auth_mirror_url_hidden_in_logs" ]; __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "devpi_server" + ]; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; + changelog = "https://github.com/devpi/devpi/blob/${src.rev}/server/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/devpod/Cargo.lock new file mode 100644 index 0000000000..87d28317d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/Cargo.lock @@ -0,0 +1,4518 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "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.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.4", +] + +[[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 = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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 = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byte-unit" +version = "4.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +dependencies = [ + "serde", + "utf8-width", +] + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.4", +] + +[[package]] +name = "cargo_toml" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" +dependencies = [ + "serde", + "toml 0.5.11", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +dependencies = [ + "byteorder", + "uuid 0.8.2", +] + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid 1.3.1", +] + +[[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.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" +dependencies = [ + "smallvec", +] + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +dependencies = [ + "bitflags", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation", + "foreign-types", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[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-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[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 = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "devpod-desktop" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "cocoa", + "dirs", + "dispatch", + "lazy_static", + "log", + "objc", + "regex", + "reqwest", + "semver", + "serde", + "serde_json", + "serde_qs", + "serde_yaml", + "strip-ansi-escapes", + "tauri", + "tauri-build", + "tauri-plugin-deep-link", + "tauri-plugin-log", + "tauri-plugin-store", + "thiserror", + "tokio", + "ts-rs", + "url", + "window-vibrancy", + "windows 0.48.0", + "winreg 0.50.0", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +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-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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "dtoa-short" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[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 = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[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 = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide 0.6.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", +] + +[[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 = "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.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.4", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.0.4", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.0.4", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.44.0", +] + +[[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.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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.4", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.0.4", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.4", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.0.4", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[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 = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.6", +] + +[[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 = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.6", + "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.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[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 = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[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 = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "infer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +dependencies = [ + "cfb 0.6.1", +] + +[[package]] +name = "infer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +dependencies = [ + "cfb 0.7.3", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "cfg-if", + "libc", + "rustc_version", + "to_method", + "winapi", +] + +[[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 = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[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.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" +dependencies = [ + "serde", + "serde_json", + "treediff", +] + +[[package]] +name = "kuchiki" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +dependencies = [ + "cssparser", + "html5ever", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.141" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + +[[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.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[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.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[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", + "value-bag", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time 0.3.20", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[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 = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[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 = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "notify-rust" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +dependencies = [ + "dbus", + "log", + "mac-notification-sys", + "tauri-winrt-notification", +] + +[[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-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "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" +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 = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da30ff0a93f6801dc6c4f384ebe70146a40aac8ebf34e4e8ff1f528e859318a3" + +[[package]] +name = "objc2" +version = "0.3.0-beta.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags", + "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 2.0.15", +] + +[[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.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] +name = "os_pipe" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.4", +] + +[[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 0.2.16", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +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_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[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 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "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 = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[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 = "plist" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +dependencies = [ + "base64 0.21.0", + "indexmap 1.9.3", + "line-wrap", + "quick-xml 0.28.2", + "serde", + "time 0.3.20", +] + +[[package]] +name = "png" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-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.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.9", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.9", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.0", + "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 0.10.1", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +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", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.160" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "serde_json" +version = "1.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +dependencies = [ + "itoa 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +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 1.0.6", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_yaml" +version = "0.9.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +dependencies = [ + "indexmap 2.0.0", + "itoa 1.0.6", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "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 = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[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 = "strip-ansi-escapes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" +dependencies = [ + "vte", +] + +[[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 = "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.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" +dependencies = [ + "cfg-expr 0.14.0", + "heck 0.4.1", + "pkg-config", + "toml 0.7.3", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "paste", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid 1.3.1", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tauri" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" +dependencies = [ + "anyhow", + "attohttpc", + "base64 0.13.1", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http", + "ico", + "ignore", + "infer 0.9.0", + "minisign-verify", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time 0.3.20", + "tokio", + "url", + "uuid 1.3.1", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.1", + "json-patch", + "semver", + "serde_json", + "tauri-utils", + "winres", +] + +[[package]] +name = "tauri-codegen" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +dependencies = [ + "base64 0.13.1", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time 0.3.20", + "uuid 1.3.1", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-deep-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2" +dependencies = [ + "dirs", + "interprocess", + "log", + "objc2", + "once_cell", + "tauri-utils", + "windows-sys 0.48.0", + "winreg 0.50.0", +] + +[[package]] +name = "tauri-plugin-log" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +dependencies = [ + "byte-unit", + "fern", + "log", + "serde", + "serde_json", + "serde_repr", + "tauri", + "time 0.3.20", +] + +[[package]] +name = "tauri-plugin-store" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +dependencies = [ + "gtk", + "http", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "uuid 1.3.1", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid 1.3.1", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +dependencies = [ + "brotli", + "ctor", + "glob", + "heck 0.4.1", + "html5ever", + "infer 0.7.0", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +dependencies = [ + "quick-xml 0.23.1", + "windows 0.39.0", +] + +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.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 = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[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 = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "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", +] + +[[package]] +name = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "itoa 1.0.6", + "libc", + "num_threads", + "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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] +name = "tokio" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "socket2", + "windows-sys 0.45.0", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap 1.9.3", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[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", + "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", + "quote", + "syn 1.0.109", +] + +[[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 = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "ts-rs" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4added4070a4fdf9df03457206cd2e4b12417c8560a2954d91ffcbe60177a56a" +dependencies = [ + "chrono", + "thiserror", + "ts-rs-macros", +] + +[[package]] +name = "ts-rs-macros" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 1.0.109", + "termcolor", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.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 = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + +[[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", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +dependencies = [ + "getrandom 0.2.9", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "version_check", +] + +[[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.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vte" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.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.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.0.4", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[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 = "window-vibrancy" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f762d9cc392fb85e6b1b5eed1ef13d73fed5149a5cbb017a7137497d14ef612" +dependencies = [ + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.42.0", +] + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +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", + "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.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + +[[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", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +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.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-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-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[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.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" + +[[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.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" + +[[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.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" + +[[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.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" + +[[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.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" + +[[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 = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "wry" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[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-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/add-tauri-updater-feature.patch b/third_party/nixpkgs/pkgs/development/tools/devpod/add-tauri-updater-feature.patch new file mode 100644 index 0000000000..3fc7ac9910 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/add-tauri-updater-feature.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 03f64e53..9e2ddcb6 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -15,6 +15,7 @@ serde_json = "1.0" + serde = { version = "1.0", features = ["derive"] } + # Tauri + tauri = { version = "1.2.4", features = [ ++ "updater", + "process-relaunch", + "window-close", + "notification-all", + diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix new file mode 100644 index 0000000000..6ddb483e03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/default.nix @@ -0,0 +1,185 @@ +{ lib +, buildGoModule +, copyDesktopItems +, darwin +, desktopToDarwinBundle +, fetchFromGitHub +, fetchYarnDeps +, gtk3 +, installShellFiles +, jq +, libayatana-appindicator +, libsoup +, makeDesktopItem +, mkYarnPackage +, openssl +, pkg-config +, rust +, rustPlatform +, stdenv +, testers +, webkitgtk +}: + +let + pname = "devpod"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "loft-sh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-e9sa9LniG5fj3S+x9T91v6ILPI0CD2y3QnZxXcKy6Ik="; + }; + + meta = with lib; { + description = "Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker"; + homepage = "https://devpod.sh"; + license = licenses.mpl20; + maintainers = with maintainers; [ maxbrunet ]; + }; +in +rec { + devpod = buildGoModule { + inherit version src pname meta; + + vendorHash = null; + + CGO_ENABLED = 0; + + ldflags = [ + "-X github.com/loft-sh/devpod/pkg/version.version=v${version}" + ]; + + excludedPackages = [ "./e2e" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + $out/bin/devpod completion bash >devpod.bash + $out/bin/devpod completion fish >devpod.fish + $out/bin/devpod completion zsh >devpod.zsh + installShellCompletion devpod.{bash,fish,zsh} + ''; + + passthru.tests.version = testers.testVersion { + package = pname; + version = "v${version}"; + }; + }; + + devpod-desktop = + let + frontend-build = mkYarnPackage { + inherit version; + pname = "devpod-frontend"; + + src = "${src}/desktop"; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/desktop/yarn.lock"; + sha256 = "sha256-Nezh2nGhrxmNLLqZVugJqr895CIa2QWE3CNLjkjrEEs="; + }; + + packageJSON = ./package.json; + + buildPhase = '' + export HOME=$(mktemp -d) + yarn --offline run build + + cp -r deps/devpod/dist $out + ''; + + doDist = false; + dontInstall = true; + }; + + rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; + in + rustPlatform.buildRustPackage { + inherit version src; + pname = "devpod-desktop"; + + sourceRoot = "${src.name}/desktop/src-tauri"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-log-0.1.0" = "sha256-Ei0j7UNzsK45c8fEV8Yw3pyf4oSG5EYgLB4BRfafq6A="; + }; + }; + + # Workaround: + # The `tauri` dependency features on the `Cargo.toml` file does not match the allowlist defined under `tauri.conf.json`. + # Please run `tauri dev` or `tauri build` or add the `updater` feature. + # Upstream is not interested in fixing that: https://github.com/loft-sh/devpod/pull/648 + patches = [ ./add-tauri-updater-feature.patch ]; + + postPatch = '' + ln -s ${devpod}/bin/devpod bin/devpod-cli-${rustTargetPlatformSpec} + cp -r ${frontend-build} frontend-build + + substituteInPlace tauri.conf.json --replace '"distDir": "../dist",' '"distDir": "frontend-build",' + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + # Since `cargo build` is used instead of `tauri build`, configs are merged manually. + jq --slurp '.[0] * .[1]' tauri.conf.json tauri-linux.conf.json >tauri.conf.json.merged + mv tauri.conf.json.merged tauri.conf.json + ''; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + jq + ] ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = [ + libsoup + openssl + ] ++ lib.optionals stdenv.isLinux [ + gtk3 + libayatana-appindicator + webkitgtk + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.WebKit + ]; + + desktopItems = [ + (makeDesktopItem { + name = "DevPod"; + categories = [ "Development" ]; + comment = "Spin up dev environments in any infra"; + desktopName = "DevPod"; + exec = "DevPod %U"; + icon = "DevPod"; + terminal = false; + type = "Application"; + mimeTypes = [ "x-scheme-handler/devpod" ]; + }) + ]; + + postInstall = '' + ln -sf ${devpod}/bin/devpod $out/bin/devpod-cli + mv $out/bin/devpod-desktop $out/bin/DevPod + + mkdir -p $out/share/icons/hicolor/{256x256@2,128x128,32x32}/apps + cp icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/DevPod.png + cp icons/128x128.png $out/share/icons/hicolor/128x128/apps/DevPod.png + cp icons/32x32.png $out/share/icons/hicolor/32x32/apps/DevPod.png + ''; + + meta = meta // { + mainProgram = "DevPod"; + # darwin does not build + # https://github.com/h4llow3En/mac-notification-sys/issues/28 + platforms = lib.platforms.linux; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/devpod/package.json b/third_party/nixpkgs/pkgs/development/tools/devpod/package.json new file mode 100644 index 0000000000..3a5848669d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/devpod/package.json @@ -0,0 +1,63 @@ +{ + "name": "devpod", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview", + "tauri": "tauri", + "desktop:dev": "tauri dev --config src-tauri/tauri-dev.conf.json", + "desktop:dev:debug": "export DEBUG=true; yarn desktop:dev", + "desktop:build:dev": "DEBUG=true tauri build --config src-tauri/tauri-dev.conf.json", + "desktop:build:debug": "tauri build --debug", + "desktop:build": "tauri build --features enable-updater", + "format:check": "prettier --check .", + "format:fix": "prettier --write .", + "types:check": "tsc -p ./tsconfig.json --noEmit" + }, + "dependencies": { + "@chakra-ui/icons": "2.1.1", + "@chakra-ui/react": "2.8.1", + "@emotion/react": "11.11.1", + "@emotion/styled": "11.11.0", + "@headlessui/react": "1.7.17", + "@tanstack/react-query": "4.36.1", + "@tanstack/react-query-devtools": "4.36.1", + "@tanstack/react-table": "8.10.7", + "@tauri-apps/api": "1.5.0", + "dayjs": "1.11.10", + "framer-motion": "10.16.4", + "markdown-to-jsx": "7.3.2", + "react": "18.2.0", + "react-dom": "18.2.0", + "react-hook-form": "7.47.0", + "react-icons": "4.11.0", + "react-router": "6.16.0", + "react-router-dom": "6.16.0", + "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store", + "uuid": "9.0.1", + "xterm": "5.3.0", + "xterm-addon-fit": "0.7.0" + }, + "devDependencies": { + "@tanstack/eslint-plugin-query": "4.36.1", + "@tauri-apps/cli": "1.5.2", + "@types/node": "18.15.3", + "@types/react": "18.2.28", + "@types/react-dom": "18.2.13", + "@types/uuid": "9.0.5", + "@typescript-eslint/eslint-plugin": "5.59.11", + "@typescript-eslint/parser": "5.59.11", + "@vitejs/plugin-react": "4.1.0", + "eslint": "8.44.0", + "eslint-config-prettier": "8.8.0", + "eslint-config-react-app": "7.0.1", + "eslint-plugin-react": "7.32.2", + "eslint-plugin-react-hooks": "4.6.0", + "prettier": "3.0.3", + "typescript": "5.0.4", + "vite": "4.4.9" + } +} diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 31e6a3e71d..074d4f5474 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.99.0"; + version = "1.100.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-xwkbekTnwisgr1gkUewMkz0E5iQg6bWgVz8tne7ME9Y="; + sha256 = "sha256-1NQ09Cn62VUi670y1jq8W05a9dg1CdQypIIh1QmR0p0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index 61b4f4beb4..32964e7b97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchCrate, rustPlatform, Security }: +{ lib, stdenv, fetchCrate, rustPlatform, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.40.2"; + version = "0.42.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kkGBSyLirHlJOzNh8GtY6k8kxpgouqHRQQEM/eDU7TA="; + sha256 = "sha256-aj5gk8+wEYSuvh92+W3jJ5rB87OzuT+atBAB/pm4Sr0="; }; - cargoHash = "sha256-jImnU9ksYYmQOoaLBH+lMdoAsgo9ZFlu0tng61wrXXw="; + cargoHash = "sha256-1TOlOJZjngAdxZQmFCn8uWuibI0BFzmteNlJMrrFDDo="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix index 3a5802a187..a549563aab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-CnSccws3loqfbtjGKe3tkXNVOmNtQX/0+szODMErgxE="; + sha256 = "sha256-MyQVTAfKHog6BiqqT8eaIPlUMctHz+Oe4eZqfpgiHNs="; }; - vendorHash = "sha256-PgQvckmqewzE2QXlP9xtzP5s2S6DDl2o8KWrNXFhEO4="; + vendorHash = "sha256-VAPJqa1930Vmjjj9rSjVTk6e4HD3JbOk6VC8v37kijQ="; subPackages = [ "cmd/dyff" diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index c9d2cc352e..d5d901e1d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.19"; + version = "0.7.21"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; + hash = "sha256-ts+XSPRkDQElyM8nr6Vtf8Ov6C5OoiIhMNnFv6YA2bw="; }; - vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; + vendorHash = "sha256-/ZHoi5aHJ79kjUgbFKBVHDZyVyCdFfY/fJDrHdUmuUE="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/development/tools/eclint/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclint/default.nix index 4c957011d8..933a19fc12 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eclint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eclint/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eclint"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WSxhdPekCNgeWf+ObIOblCUj3PyJvykGyCXrFmCXLA="; + sha256 = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY="; }; - vendorHash = "sha256-hdMBd0QI2uWktBV+rH73rCnnkIlw2zDT9OabUuWIGks="; + vendorHash = "sha256-aNQuALDe37lsmTGpClIBOQJlL0NFSAZCgcmTjx0kP+U="; ldflags = [ "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix index 42f8eecbb2..0c7ff5382f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/efm-langserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.48"; + version = "0.0.49"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-do/p4sQ/OoswiC/19gKk5xeWbZ8iEOX5oPg5cY7ofYA="; + sha256 = "sha256-sHdULnaLHe4FqP631c4ITNDn62nGJgAIIvO3C4kY3jI="; }; - vendorHash = "sha256-+QYJijb5l++fX7W4xVtAZyQwjEsGEuStFAUHPB4cVHE="; + vendorHash = "sha256-ZChHQ0Bcu9sVHvhdrmTfLryRwsFQNQSFDOKRu0keUIo="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix index 493cce3596..eb4c354ba5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/default.nix @@ -122,13 +122,13 @@ rec { headers = "03mb1v5xzn2lp317r0mik9dx2nnxc7m26imygk13dgmafydd6aah"; }; - electron_22-bin = mkElectron "22.3.26" { - armv7l-linux = "265ce4e53f92b1e23c3b6c3e5aa67bba556a6e42f87159aabd65d898b75037dd"; - aarch64-linux = "9d085db80629418f1eb7ab214b746b6ce29bf578ac49642991a3b37fe46b3ae6"; - x86_64-linux = "22e15f9bc467f6b67a2ecdb443b23a33e3b599d918e8933b5a6c652c1b73d324"; - x86_64-darwin = "964ae05bcc8f4c81fbc86d6e2f1e0cd65fe1b1e47a715aba7a883ff6f6d02577"; - aarch64-darwin = "2dd42d9b2ed6cd9649ef9fb9aadda04fbbb01de3a6ea6ac053d95aaaa80ed16e"; - headers = "0nqz6g68m16155dmaydbca2z05pgs4qnkd8djba9zpqh7priv24n"; + electron_22-bin = mkElectron "22.3.27" { + armv7l-linux = "9f8372606e5ede83cf1c73a3d8ff07047e4e3ef614aa89a76cd497dc06cf119d"; + aarch64-linux = "60279395a5ce4eaf3c08f1e717771b203830902d3fe3a7c311bc37deb1a0e15e"; + x86_64-linux = "631d8eb08098c48ce2b29421e74c69ac0312b1e42f445d8a805414ba1242bf3a"; + x86_64-darwin = "01f053d08cb2855acb14f0465f4e36324a41bd13b3b2ead142970a56df3e9db1"; + aarch64-darwin = "2b87e9f766692caaa16d7750bfab2f609c0eab906f55996c7d438d8e18ac8867"; + headers = "0hxp7jn30jncffw5xn8imk1hww56af34npp8ma58ha3qdm89146q"; }; electron_23-bin = mkElectron "23.3.13" { @@ -166,4 +166,13 @@ rec { aarch64-darwin = "97cb2d00d06f331b4c028fa96373abdd7b5a71c2aa31b56cdf67d391f889f384"; headers = "00r11n0i0j7brkjbb8b0b4df6kgkwdplic4l50y9l4a7sbg6i43m"; }; + + electron_27-bin = mkElectron "27.0.0" { + armv7l-linux = "81070012b0abbd763c59301044585be7a0f0092d80f9a8507744720e267dae2e"; + aarch64-linux = "202c5c6817081739e7bf15127c17c84ce2e553457c69a17557dec0928d40f354"; + x86_64-linux = "6c31e5733513c86eb5bb30169800bba5de8a055baadd9e0a5d153ea8fd2324ae"; + x86_64-darwin = "8c2b944f3949265526410704ecd925c85ebb20d61f5c739081336bd1d29bd083"; + aarch64-darwin = "2fc319c53f6dc61e2e424d46712caead7022b5124c9674f3b15b45c556dd0623"; + headers = "1pb8xhaarkmgss00ap4jbf693i03z4mwh5ilpkz6dsg1b9fka84q"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix index f7e8f6461a..6e1493528e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/binary/generic.nix @@ -24,6 +24,7 @@ , xorg , pango , systemd +, pciutils }: version: hashes: @@ -39,7 +40,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "22.0.0" || versions.major version == "23") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "25.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -92,6 +93,7 @@ let xorg.libXrandr xorg.libxkbfile pango + pciutils stdenv.cc.cc.lib systemd ] diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix index 66701b12a6..19725cc8f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix @@ -42,13 +42,13 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ [ + patches = base.patches ++ lib.optional (lib.versionOlder info.version "28") (substituteAll { name = "version.patch"; src = if lib.versionAtLeast info.version "27" then ./version.patch else ./version-old.patch; inherit (info) version; }) - ]; + ; unpackPhase = '' runHook preUnpack @@ -167,6 +167,8 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { enable_check_raw_ptr_fields = false; } // lib.optionalAttrs (lib.versionOlder info.version "26") { use_gnome_keyring = false; + } // lib.optionalAttrs (lib.versionAtLeast info.version "28") { + override_electron_version = info.version; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/info.json index a0801c3d9f..a3b470f78d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/info.json @@ -1,18 +1,910 @@ { + "28": { + "deps": { + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-TOsL+5sF65sOCSLx0yamXWC5olYbDUO/Np9HK5sT5DI=", + "owner": "electron", + "repo": "electron", + "rev": "v28.0.0-alpha.3" + }, + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lIe6mjAee6DUOPDvPM43QJ7VKRQ960w7UqxbXPRPIA=", + "url": "https://chromium.googlesource.com/chromium/src.git", + "rev": "119.0.6045.21", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6kuGJCCRgOwrV85e2i+UTyzt40u2pTET6cs0/MtI9Hk=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", + "rev": "7cf98622abaf832e2d4784889ebc69d5b6fde4d8" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iFIXi4kq/LhNhFPJG4UJfO08MCxvthpiZ0WT9jg0lHE=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", + "rev": "e8e4eb8f1c413ea4365256b2b83a6093c95d2d86" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ytY/QvFzbqkGbsB+um1Rxo+O5DEOFUxUzRIuKMrC8YE=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", + "rev": "43e5a34c5b7066a7ee15c74f09dc37b4b9b5630e" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aYgan6NIIIWDzCplczvU57TZQ6GAluejBoWjfx5FPs4=", + "url": "https://chromium.googlesource.com/website.git", + "rev": "98972e05cf600ceefe641ac5d83b661e2792fcb4" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "url": "https://chromium.googlesource.com/chromium/cdm.git", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dziuBpghbxrXXH6on6WxYvfHInSaUWyNrWbYwAJeMuA=", + "url": "https://quiche.googlesource.com/quiche.git", + "rev": "0c75f987990bfb2fe27eeaa8f3cc78f98f3ef42d" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2JvDcfRiwFDjiGWlzwsTq6HP/I6lq+NaI6S57ZrCLGY=", + "url": "https://chromium.googlesource.com/angle/angle.git", + "rev": "5cff2421ef225d14d3a4253b81073389fc840024" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yXo4h4SgMdmHxtT5IeFDzBa5hq/7RZtMRrktaLJkvfs=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", + "rev": "a55b0930e9db612b25cc67701569931200bc2ee0" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/AuMmFWKOaYCsd9cHbZBYUqJUHXJ0xxOuIWe/+lEZ1c=", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", + "rev": "79562f0175dba82f671046b5bdea0853323445b7" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", + "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PE1LHtfdL9grVxBKaSVoc/kc6eHLaP7LKJFWxx+BByE=", + "url": "https://dawn.googlesource.com/dawn.git", + "rev": "e1f1c0135a5eca328a320d4f14d21b24576eea9b" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", + "rev": "62e175ef9fae75335575964c845a302447c012c7" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uCSypev3Jvy6vfzF0AG3w9DIewV7u4w7TNtw1WVVrXM=", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", + "rev": "6b4b0eb5f2ca9b9039a7dbf7b324a9478fbd6f03" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+pKnhSC7qQf8P5YL7ei1IPJ0ur89IJAiItnXhw6HKLo=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", + "rev": "be1210e145e89e7a2943947d983f9592495e0f52" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s=", + "url": "https://boringssl.googlesource.com/boringssl.git", + "rev": "d24a38200fef19150eef00cad35b138936c08767" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git", + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "url": "https://chromium.googlesource.com/cast_core/public", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-j5NFdjcsv3CaAOrUmNkuxodQyudxqWCNPTd6ovW83sg=", + "url": "https://chromium.googlesource.com/catapult.git", + "rev": "4f81c1e295978227d83f1b42ceff40b4f9b5b08c" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mWnpJb5yV30slOvqc543uqxN1t6TEGP2H3MKl7x6mbw=", + "url": "https://chromium.googlesource.com/chromium-variations.git", + "rev": "990efdd6cf54f2124621d065e2de629856c395e4" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "url": "https://chromium.googlesource.com/external/colorama.git", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", + "rev": "936b9ab5515dead115606559502e3864958f7f6e" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-nOSaLZGqmt+8W5Ut9QHDKznh1cekl1jL2ghCM4mgbgc=", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", + "rev": "959002f82d7962a473d8bf301845f2af720e0aa4" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uTeouExil2es07n1a4oVa/r6CUraZ0+iu8Q+A1n4kgA=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", + "rev": "b7b78587c03de1cd478f31f734498430773adeb3" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", + "url": "https://chromium.googlesource.com/crossbench.git", + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zx8VtOMxysriVmcPb9YkdS84WXV6NsSkfnCSV8OBwbc=", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", + "rev": "90a30a5b5357636fa05bb315c393275be7ca705c" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-OUmCxucDd8jXbEqqNyt9j0j+9zp2G9s3aaFliFkg45A=", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend", + "rev": "fa727c5e31709a4447a79a2270157b7ba86414c4" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-a7TnzR57VmIBUqAEKmxncgV/22g3z7b1lEHsYnNZjKo=", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", + "rev": "18018ed013029ca3f28f52a62360999b5a659eac" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", + "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yu+bMwlTqT5I+BbJhemGMvs/Yw9TusNnFsHgERXYb2M=", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", + "rev": "0343396e49d1c0bf4ca1058130efd9585ecb3c8f" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", + "url": "https://chromium.googlesource.com/external/fontconfig.git", + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+n7BwWerzg8bMIgZYBOtCibfNkECijNVJKNk7qOQVhU=", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", + "rev": "7b308a29dd105074eea9c8d5953a182d325f74f1" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "url": "https://chromium.googlesource.com/codecs/libgav1.git", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "url": "https://chromium.googlesource.com/external/leveldb.git", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-53SzbbDlzLl1MTeHxBhLpVGMKICd3ka6qfGcru9AVog=", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", + "rev": "ce460dd7cae252b8505ce0009121bcac17939e3a" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "url": "https://chromium.googlesource.com/external/libaddressinput.git", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-76duDNvaq8o7RdswZglifr+gml86fSTdXAEx0nOTybI=", + "url": "https://aomedia.googlesource.com/aom.git", + "rev": "0d59418942412c4176805198f2ab7ff446637c3b" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZAsOy32MHx3YPvEnbBGGT4+iYhFyFPik0+9cLRoVDP4=", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", + "rev": "0d4747af5b3f7b150c3838e6148c49a0bf0e0064" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", + "url": "https://aomedia.googlesource.com/libavifinfo.git", + "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0tTpC11sFIPq+FPlkGFrDNaAK93isQV/Fd2x1lHmtQ8=", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", + "rev": "d477a2d174fc0e31f6dd06264ff3f47ff8da5378" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", + "url": "https://beto-core.googlesource.com/beto-core.git", + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-grvqHNesTNc3pUkM5YH4P+LaeSWXEKBM8Kw/eRMaB4E=", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git", + "rev": "10d2e376519e88221117e38cd901054b0153501c" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "url": "https://chromium.googlesource.com/external/liblouis-github.git", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "url": "https://chromium.googlesource.com/external/libphonenumber.git", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", + "url": "https://chromium.googlesource.com/webm/libvpx.git", + "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "url": "https://chromium.googlesource.com/webm/libwebm.git", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "url": "https://chromium.googlesource.com/webm/libwebp.git", + "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "url": "https://chromium.googlesource.com/linux-syscall-support.git", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rxNhfd/ujWtLWDjEbx/ZIo9tdILB1gD5q4cwxQ6DPnw=", + "url": "https://chromium.googlesource.com/openscreen", + "rev": "934f2462ad01c407a596641dbc611df49e2017b4" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iVOmMH0h0mbHy9m0vy86SzS5Oeyhgd4CC26LgPws9P4=", + "url": "https://pdfium.googlesource.com/pdfium.git", + "rev": "2e2cfb0399db35fbe2e3ef0be62559fe01837ec5" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qv1fTy/0xUauutP0PFaCwPvr1qptfeB3iqNjHXPDKyc=", + "url": "https://android.googlesource.com/platform/external/perfetto.git", + "rev": "a3d4c1de9bcf2a0471ab183c45cf111efd29571e" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zrVjt229SfVipS05zF5glhd7/D1zpojDyiSnYZpGok4=", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", + "rev": "26f7d889e1f7e75e95e65490086538edf9f5275c" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zi3A49YqDE5S4iSpw9t9kTzitbQbcslm1zsepWX5cbw=", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", + "rev": "6ffa93a89376555b09134c59b84d8f5e9cfc6ce6" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qHJujO+LYJ41zmoP2xSYRd9K8vLp4bCztYcMO8MI9Lo=", + "url": "https://skia.googlesource.com/skia.git", + "rev": "ab212df482c8fd5b1c1fb302717876d542549624" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "url": "https://chromium.googlesource.com/external/smhasher.git", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", + "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-r7u2WjgPvoVY9Oj2RVqfI/G6PFh/2gWNDVQ5R2qhtLU=", + "url": "https://swiftshader.googlesource.com/SwiftShader.git", + "rev": "7f4d495c89c200c1945cce5995d348dd41dadb5a" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mpofo5P6WrkA3hN+sjAhHG4GBQ71vEFnuxfdLRf5epw=", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", + "rev": "edf7215123c67d76199d099779137b974b6e1293" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uJFrlLEjFJJSR0+eCtx7bpIC0z8NaHuk/uLeaFBLKKw=", + "url": "https://chromium.googlesource.com/vulkan-deps", + "rev": "7413048934e28b97ae00c37c419e576db8add866" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CBA9LlD+Ttki3nc693MSmud0feafxi2/PC2YSn3BX2A=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", + "rev": "b0ed4788858157e271779a7726cccc1149a05407" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wgpdjmes05dMeBr7mrv9UvpabdzJ9lTZ38eO/6Ps60E=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", + "rev": "37fee00a71b5a47247c1cf20256a3f794537c6c0" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yAzbZHLtx+XP34Umkp0CuP/vn7JrW4VPVgVOFi50KHM=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", + "rev": "79743b899fde5c954897b2694291002626358fac" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/J1eb6ZYSoYZDE8AR/CeRc5GoQEyIlYiHC+JKvi5I5w=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", + "rev": "1bc0e6f59abc3c9cd75f93baef47e9612a448045" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GAl5xC7PCGsVHHUhLkIuwj2zlTCgyNWaBjk6I0qDkhQ=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", + "rev": "7e691380166fb1cd9b193ac9db896bc23a4ea9ad" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6iJxI1SwOjN26dyVs6JSYWODZbA25G/M2ZabGLCGRIo=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", + "rev": "9e33cfc66f88c863e9a13492b8045ca28118ebbf" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-r2VdG1o2JXbtN14nGjeZ+Ru4Cn1Za/eQd3NU2O6CnkA=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", + "rev": "3a19c1973f0e4732b8f3746593aee2ac425ecb78" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zz8r7zHe3MaEzMIyVx6Walsd5QicQ3MxEAunmgWHZcI=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", + "rev": "2169a0849e3df4e2133b728dec67d3b16bd30263" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AUeSb7/sgTZGg/VEkdvGDnj88gqjE1t6qGY0oTAcYsY=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", + "rev": "d82e3c2f34dcf3b849fd7ed6d932ff61dcd838c5" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", + "rev": "e87036508bb156f9986ea959323de1869e328f58" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0ICSMZhnsLqMNfqSGjqM3p4ssxptkBtt7EMCpxknW4A=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", + "rev": "3fda2fbf51db54398c0155facee82cc9533958a2" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", + "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vkwuibUzHacAh5x/g05cGR+UohZmcATysnnFfldM2zA=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", + "rev": "609645eb5b272668cbfb120d1aa9549eee86e02d" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uRRtsEVMn85RfFgo1qzYnwA1eN6LvXRme+FUntvCuYA=", + "url": "https://webrtc.googlesource.com/src.git", + "rev": "71e3fbf5d750e84d181315a663eb5dbc29a5330c" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s9Avx9o+1igKulOpKhtbbkoINuh1wNercPszRaA4TZM=", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", + "rev": "bbbaa7352a3ea729987d3e654d37be93e8009691" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-95OOpYKGve+YWzqqguQIg1emTOAuaGyYpWxrWVDOKAQ=", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", + "rev": "cdceb0fce59785c841bf697e00067163106064e1" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qP5gRxEEKV+I3Q6wk0H94OTnKVAieo9SJZGLB9Ti5qw=", + "url": "https://chromium.googlesource.com/v8/v8.git", + "rev": "f6ebdead2b58e457b923c8121a9267a5d80f59cf" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-feGhB6o14/qgSQvhJ5eMD74KqWrlOoTpaGAlCs486IU=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.18.0" + }, + "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/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + } + }, + "version": "28.0.0-alpha.3", + "modules": "119", + "chrome": "119.0.6045.21", + "node": "18.18.0", + "chromium": { + "version": "119.0.6045.21", + "deps": { + "gn": { + "version": "2023-09-12", + "url": "https://gn.googlesource.com/gn", + "rev": "991530ce394efb58fcd848195469022fa17ae126", + "hash": "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=" + } + } + }, + "electron_yarn_hash": "1akq5cxcy7fpn4m5qk5kx94vy30z0ybx6ka5qp8an0p33yx9wg8z", + "chromium_npm_hash": "sha256-10OGEsA0BDrkbTeIbdXLYRyKNwVsb/tP2ryBBuhi+m8=" + }, "27": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-tQzmHL107F2jO6oDhkSDSOM+q91wxfYvrM9dw7jNlRE=", + "hash": "sha256-UIOHCvqMXuCCrduDo6tnxc6qJuHw2LX4Kgmiu/geiR8=", "owner": "electron", "repo": "electron", - "rev": "v27.0.0-beta.9" + "rev": "v27.0.0" }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5X2g/SjWsEER6gla4TG6BvGWsVLAr3HR4W74QTTM4k8=", + "hash": "sha256-dT23fhZ9RDY2j7YChaK/hUePkHULTXoXyHNpldmh4Gw=", "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "118.0.5993.18", + "rev": "118.0.5993.54", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " }, "src/third_party/clang-format/script": { @@ -77,9 +969,9 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-TP2ZFHIPbyPWnVBS6R8VsKNnmRDLP29sXD1G6Uo4LMg=", + "hash": "sha256-It05E3+qG17dEbhbaX/VQJaydWOQ1mpsj95dT5IJkgo=", "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "17c4741d70dd5a98724a5a8316dc7e05a9b6d48e" + "rev": "05f45adc147393562b518ca1f82a3ccba7ee40f7" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", @@ -257,9 +1149,9 @@ }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Uc8Rww8zppFWxZZSnSGwyaB5m7WqZMXhHv84wSl7f7o=", + "hash": "sha256-D3W8U19i5pHWPLviMKbpzhiDoF6A0+tClYJcZWdbTqk=", "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "666c79779cdc48a2fd41d7cbc5ee79ecd289e79a" + "rev": "bcf0ed097be848d234fb5290c1e4d69672dc5405" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", @@ -521,9 +1413,9 @@ }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-jYy35aQyO+1iNwTT2lzLHwJc7avryC6q2f3uPAEKKVg=", + "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "6da1bd01d64d3d246b633bf25c766dfe751345b7" + "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", @@ -581,9 +1473,9 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-JkOKXDRuzZxc+xhnUNwhz6Y7ElhxrTdCfyEJEtbWjvM=", + "hash": "sha256-CtCGOoKbbyUGUHfqd7n3uPlv9GEExuYgMTCIaU+ypOA=", "url": "https://chromium.googlesource.com/openscreen", - "rev": "91b081e995ec03894ce54eded84ebd3b45247d13" + "rev": "fd0e81e558086c30fa91a4af89361cef8d1327e4" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", @@ -791,9 +1683,9 @@ }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GEv2JBC7GJeNOC3kG/Z3R4dTWOgSkMIt6Eytj8jfRGI=", + "hash": "sha256-KpiNGAue945kGCuQYGhxiWVUFTE1tcntSAXBZdkrE9A=", "url": "https://webrtc.googlesource.com/src.git", - "rev": "5afcec093c1403fe9e3872706d04671cbc6d2983" + "rev": "d8f2b0380b3ec980af35ce4b92ba6a211ec8c76d" }, "src/third_party/wuffs/src": { "fetcher": "fetchFromGitiles", @@ -833,9 +1725,9 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5lGIgzBWnKwRCKRmLrTTyaSfFgKZsd0f01zxqDvhkzA=", + "hash": "sha256-+y24A6/c4tl4zu1GcxsiEWvAMMCsat7X0jl2XCmBX6g=", "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "748d3360122aeb3bcb450fb4b7c1b18049cab004" + "rev": "6b05d242aae3392bef6b86fbe44428126607b3d0" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -873,32 +1765,32 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "27.0.0-beta.9", + "version": "27.0.0", "modules": "118", - "chrome": "118.0.5993.18", + "chrome": "118.0.5993.54", "node": "18.17.1", "chromium": { - "version": "118.0.5993.18", + "version": "118.0.5993.54", "deps": { "gn": { "version": "2023-08-10", "url": "https://gn.googlesource.com/gn", "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", - "sha256": "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab" + "hash": "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=" } } }, - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", - "electron_yarn_hash": "039zdwb38982h6qinhipja8abza33ihihb4i5fadpsgh0cl7ldsy" + "electron_yarn_hash": "039zdwb38982h6qinhipja8abza33ihihb4i5fadpsgh0cl7ldsy", + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" }, "26": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-deYr/VWVnnkLmotT5aqMomz7GzJlhKdkuxZhzj8guT0=", + "hash": "sha256-sEhO5qSm4etyWEurTGSKtJcheG+JJkC78Fhl3c5WBOE=", "owner": "electron", "repo": "electron", - "rev": "v26.3.0" + "rev": "v26.4.0" }, "src": { "fetcher": "fetchFromGitiles", @@ -1717,7 +2609,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "26.3.0", + "version": "26.4.0", "modules": "116", "chrome": "116.0.5845.228", "node": "18.16.1", @@ -1728,7 +2620,7 @@ "version": "2023-06-09", "url": "https://gn.googlesource.com/gn", "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", - "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" + "hash": "sha256-XP+NQG8kjzXPzQ25YaZiPymexZwAGwhpodqgdTWWCZI=" } } }, @@ -1739,10 +2631,10 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-OVPwnoHyiHcxwixTWu0W2sxkJNRtB7uiXqdEzbzi+Fc=", + "hash": "sha256-Yo/ZvOLOPIktV5gzZK80LKVZb3xMXrzGkdQw9u4djoI=", "owner": "electron", "repo": "electron", - "rev": "v25.9.0" + "rev": "v25.9.1" }, "src": { "fetcher": "fetchFromGitiles", @@ -2537,7 +3429,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "25.9.0", + "version": "25.9.1", "modules": "116", "chrome": "114.0.5735.289", "node": "18.15.0", @@ -2548,11 +3440,11 @@ "version": "2023-04-19", "url": "https://gn.googlesource.com/gn", "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + "hash": "sha256-U0rinjJAToVh4zCBd/9I3O4McxW88b7Bp6ibmmqCuQc=" } } }, - "electron_yarn_hash": "0fq44b91ha1lbgakwfz16z0g10y66c7m8gvlkg1ci81rzjrj0qpz", - "chromium_npm_hash": "sha256-WFkyT1V4jNkWUyyHF68yEe50GhdlNZJBXuQvVVGPk6A=" + "chromium_npm_hash": "sha256-WFkyT1V4jNkWUyyHF68yEe50GhdlNZJBXuQvVVGPk6A=", + "electron_yarn_hash": "0fq44b91ha1lbgakwfz16z0g10y66c7m8gvlkg1ci81rzjrj0qpz" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/update.py b/third_party/nixpkgs/pkgs/development/tools/electron/update.py index 60b5a43d66..128b1dc050 100755 --- a/third_party/nixpkgs/pkgs/development/tools/electron/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/electron/update.py @@ -188,7 +188,7 @@ def get_gn_source(repo): "version": datetime.fromisoformat(gn["date"]).date().isoformat(), "url": gn["url"], "rev": gn["rev"], - "sha256": gn["sha256"] + "hash": gn["hash"] } } @@ -268,7 +268,7 @@ def update(version): @cli.command("update-all") def update_all(): - repos = Parallel(n_jobs=2, require='sharedmem')(delayed(get_electron_info)(major_version) for major_version in range(27, 24, -1)) + repos = Parallel(n_jobs=2, require='sharedmem')(delayed(get_electron_info)(major_version) for major_version in range(28, 24, -1)) out = {n[0]: n[1] for n in Parallel(n_jobs=2, require='sharedmem')(delayed(get_update)(repo) for repo in repos)} with open('info.json', 'w') as f: diff --git a/third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix index c0c8adc047..8b6b7678ec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eltclsh/default.nix @@ -11,12 +11,12 @@ tcl.mkTclDerivation rec { pname = "eltclsh"; - version = "1.18"; + version = "1.19"; src = fetchgit { url = "https://git.openrobots.org/robots/eltclsh.git"; rev = "eltclsh-${version}"; - hash = "sha256-C996BJxEoCSpA0x/nSnz4nnmleTIWyzm0imZp/K+Q/o="; + hash = "sha256-YcJRaNct/cLNsjWk+NLzGiDYOG0jNgKudBczKckQU14="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 0521218a7f..1cc99e2aea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-27CrfdZFz+HyIHiUJDpCP9JKJ4BneDQhU0zl1qSp4nc="; + hash = "sha256-mIXsPj804jxDd8+jPH8tWnnUj7dXIRwfKTeT4WDWb5c="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix b/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix index a49dbfdefc..1a59a96b08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eslint_d/default.nix @@ -2,22 +2,22 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "12.2.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-rups2y07Y3GkvGt/T9lPG0NUoCxddp/P9PAYczZYNIw="; + hash = "sha256-tlpuJ/p+U7DuzEmy5ulY3advKN+1ID9LDjUl8fDANVs="; }; - npmDepsHash = "sha256-enHppjkX1syANgFmfAX+LlISyN5ltADjojjrvukAI+I="; + npmDepsHash = "sha256-MiuCupnzMUjwWh47SLnMRmtHBMbXdyjEZwgvaZz4JN0="; dontNpmBuild = true; meta = with lib; { description = "Makes eslint the fastest linter on the planet"; - homepage = "github.com/mantoni/eslint_d.js"; + homepage = "https://github.com/mantoni/eslint_d.js"; license = licenses.mit; maintainers = [ maintainers.ehllie ]; mainProgram = "eslint_d"; diff --git a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix index 927f002e54..c5089bc2d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/espup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-2LSlnGte65eemlDw67mPhmf+RuLwnbavNyMYMLgrx/E="; + hash = "sha256-D5ck96nR8agiYf1t6ViOaEWws9AQ0EBZ48YKp68jfRA="; }; - cargoHash = "sha256-4Gm8nQIsZzaPYtqf7eAyX0iX0rUFBnEiavJR1qcc8/g="; + cargoHash = "sha256-mKpAGS6Rxoq2v/VW0AncVx/9BjvG7wM8ePTR+661e5U="; nativeBuildInputs = [ pkg-config @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { 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 09069eb883..383ca09294 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.16"; + version = "0.16.17"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-QYwUXZdix5GeOYF3F9XR4lIE9cKZGGgEOtROzirLw3o="; + sha256 = "sha256-AiYqMXLc8YaPILx5TnL8E3xrYCDqBUfI+zzFQIknNJE="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/fblog/default.nix b/third_party/nixpkgs/pkgs/development/tools/fblog/default.nix index 89f32bd298..c2ce571996 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fblog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-f4iJ9Fp6Rd1jv2ywRCjvFHjbdCGb116NiQ42fvQUE8A="; + hash = "sha256-T0NvcNg2UeUpEf1hjSdoaUkIzCAP29vo6edfeno/oyo="; }; - cargoHash = "sha256-dt8OMlqNxd78sDxMPHG6jHEmF4LuFIMSo0BuQDWOM6o="; + cargoHash = "sha256-3/j/TjsQjXFe+rTfCncjoownXzaUiUBUkCXbFc5RM2o="; meta = with lib; { description = "A small command-line JSON log viewer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index da7b0d662b..88fc8f6e4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -5,6 +5,7 @@ , buildPythonApplication , python3 , pythonRelaxDepsHook +, installShellFiles , androguard , babel , clint @@ -26,14 +27,14 @@ buildPythonApplication rec { pname = "fdroidserver"; - version = "2.2.1"; + version = "unstable-2023-10-23"; format = "setuptools"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "refs/tags/${version}"; - sha256 = "sha256-+Y1YTgELsX834WIrhx/NX34yLMHdkKM+YUNvnHPiC/s="; + rev = "f4b10cf83935432d19948dac669964384bef0728"; + hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; }; pythonRelaxDeps = [ @@ -47,16 +48,19 @@ buildPythonApplication rec { ''; preConfigure = '' - ${python3.pythonForBuild.interpreter} setup.py compile_catalog + ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog ''; postInstall = '' patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin + installShellCompletion --cmd fdroid \ + --bash completion/bash-completion ''; nativeBuildInputs = [ pythonRelaxDepsHook + installShellFiles ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix b/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix index d7c4e27b0e..a0ba21d606 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fermyon-spin/default.nix @@ -43,8 +43,12 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp $src/* $out/bin + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index af3aff1e59..cd42388f0f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "9.22.2"; + version = "9.22.3"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-IaURrRP1Q/Neu/HmPfCDsL6rZ59Gll5AzgniQhRK3GU="; + sha256 = "sha256-utAJpbU5NkKyJyyWB0yfwHZJxQAVJgiKm12wmGK1ojQ="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { This package is only the Community Edition of the Flyway command-line tool. ''; + mainProgram = "flyway"; downloadPage = "https://github.com/flyway/flyway"; homepage = "https://flywaydb.org/"; changelog = "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html"; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index 4ce0ab1718..e1836b9205 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.2"; + version = "3.17.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7+8wjWxePU3OrIf9SLYzu6jAaaeB3MUzZ/H6tdFn3ts="; + sha256 = "sha256-NkzlhxlQISqFmYeO7LttwMWhvL7YblrWREkvnKrpTuA="; }; subPackages = [ "." ]; - vendorHash = "sha256-vES8WGaurEW5X9PX+ILN4XUGoSEtayq7UAes+1URKzg="; + vendorHash = "sha256-iZl5DWZYecXCirJumnidgEWrqfaz+fvM3udOWOC6Upk="; meta = with lib; { description = "Thrift improved"; diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix index caba7da641..a8d8c7348b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.64.1"; + version = "0.67.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-/1XJ09NKOlTjBLe3PvAceIIhk1AiSXenBOFjERKDZko="; + sha256 = "sha256-txHkQDLyIejsEZGpfIGqeiJ8EUePZq1btxfd+EZD4aM="; }; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix index ecf2396eb9..dab6f0aa4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix @@ -70,7 +70,7 @@ (fetchNuGet { pname = "IcedTasks"; version = "0.5.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.17"; sha256 = "14h8rkc9q6shh9fqa640bzfs1k1y5nfriwviwjynpjf79xbbcpvs"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.19"; sha256 = "1n910ipbscr7b3cr873cr5zh40ysn0n9z47dlqlndbq0g3kl6vi5"; }) (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; }) (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; }) (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/fx/default.nix b/third_party/nixpkgs/pkgs/development/tools/fx/default.nix index 9af1c4d8ee..05589b5c97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fx"; - version = "30.2.0"; + version = "31.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-1U3XaqRJpwC41R8hiF7vQ32DOTGGxhaU1ZWiXzys8/M="; + hash = "sha256-AVaMViu+65xyYW3TzIigNXf5FfKb2v+TU/BMZqCX/Js="; }; - vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw="; + vendorHash = "sha256-kE6JotKP3YQ0B3HvyNU3fTvuwbnqTW8cwGVBYpiBvso="; meta = with lib; { description = "Terminal JSON viewer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix deleted file mode 100644 index 7ecb7895d2..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gdm/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "gdm"; - version = "1.4"; - - goPackagePath = "github.com/sparrc/gdm"; - - src = fetchFromGitHub { - owner = "sparrc"; - repo = "gdm"; - rev = version; - sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Minimalist dependency manager for Go written in Go"; - homepage = "https://github.com/sparrc/gdm"; - license = licenses.unlicense; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix index 441bbaba15..b5d66566a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gi-crystal/default.nix @@ -5,13 +5,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-9px6JRdVzsUoU5wlO+blH1OBGKskozF3WvqLV/EYiiA="; + hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index de44dfa246..73f0bc8093 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.12.1"; + version = "2.13.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-2nPTCd5kV6qxv4fkneu6A4gzFsRQSJiDfzh08ona0r8="; + sha256 = "sha256-r2tAYH8E1j/gC+IRwcOv0Frcgd2RKEZjVzmuzOOhR7A="; }; - vendorHash = "sha256-wUpWvq6iiS9HkCi4ztXLNs1nCgAomyUo8YaFcElnfeI="; + vendorHash = "sha256-5dEKb+KnUZTxSSoaOH1GpqMmYdLcXKMs2nq0SvR2pUs="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix index b7803843c3..97e1cea9c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix @@ -9,6 +9,7 @@ , gtk3 , glib , gjs +, enableWebkit2gtk ? stdenv.isLinux , webkitgtk_4_1 , gobject-introspection , wrapGAppsHook @@ -49,13 +50,18 @@ stdenv.mkDerivation rec { gtk3 glib gjs - webkitgtk_4_1 libxml2 python3 python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf gnome.adwaita-icon-theme + ] ++ lib.optionals enableWebkit2gtk [ + webkitgtk_4_1 + ]; + + mesonFlags = [ + (lib.mesonEnable "webkit2gtk" enableWebkit2gtk) ]; postPatch = '' @@ -74,6 +80,6 @@ stdenv.mkDerivation rec { description = "User interface designer for GTK applications"; maintainers = teams.gnome.members; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix index 74659dcf50..c4b06de2ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchzip +, wrapGAppsHook , cairo , dbus , fontconfig @@ -16,19 +17,20 @@ , libglvnd , libuuid , libxcb -, makeWrapper }: stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.1"; + version = "1.0.2"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-v63sV0HNHSU9H5rhtJcwZCuIXEGe1+BDyxV0/EqBk2E="; + hash = "sha256-a+B+uAxFXlWVn8b0M17TtP4WTKhMmR6//smV1nmZyxU="; }; + nativeBuildInputs = [ wrapGAppsHook ]; + sourceRoot = "."; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix index a55589c5a6..be6719c351 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchgit, python3 }: +{ lib, stdenv, fetchFromSavannah, python3 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnulib"; - version = "20210702"; + version = "20231109"; - src = fetchgit { - url = "https://git.savannah.gnu.org/r/gnulib.git"; - rev = "901694b904cd861adc2529b2e05a3fb33f9b534f"; - sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w"; + src = fetchFromSavannah { + repo = "gnulib"; + rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634"; + hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE="; }; postPatch = '' @@ -40,6 +40,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Central location for code to be shared among GNU packages"; homepage = "https://www.gnu.org/software/gnulib/"; + changelog = "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=ChangeLog"; license = licenses.gpl3Plus; mainProgram = "gnulib-tool"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix index d024281205..2a7379db08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-junit-report/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-junit-report"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jstemmer"; repo = "go-junit-report"; rev = "v${version}"; - sha256 = "sha256-Xz2tJtacsd6PqqA0ZT2eRgTACZonhdDtRWfBGcHW3A4="; + sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI="; }; vendorHash = "sha256-+KmC7m6xdkWTT/8MkGaW9gqkzeZ6LWL0DXbt+12iTHY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 36379a5208..552b71cc70 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.35.2"; + version = "2.36.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-MsaAITGFDnAylxMU+PGbSl+H/W/Y7pghBbfQyqp31AM="; + sha256 = "sha256-lJkxN0FtwfuOMCMGEISkZMMKULE5X5kTltIgDm7Ta0Y="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix index 986d2d7745..e99d4cb6a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.1.1"; - commitHash = "bd6af8e0ea69167dd0627f3bd54f9105bda0f8b5"; + version = "4.1.3-stable"; + commitHash = "fc79201851a16215f9554884aa242ed957801b10"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-0CErsMTrBC/zYcabAtjYn8BWAZ1HxgozKdgiqdsn3q8="; + hash = "sha256-z5JRPhdEO20AodS12MApgur0BMHGToUjo2r2eI77nNc="; }; nativeBuildInputs = [ @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { description = "Free and Open Source 2D and 3D game engine"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ twey shiryel ]; + maintainers = with maintainers; [ shiryel ]; mainProgram = "godot4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix b/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix index 09bd154177..7f79d3b5fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.4.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-VsG3Y7V59tTh1XS45s3NKGwMxS/y6KbIxWbRK6bHdaw="; + hash = "sha256-OMCmW2GhByuVN8+Kuaw9o2oCrdA6C9fK/C7yl7wI2Ls="; }; vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo="; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 5bfb0996e6..26f2aeae13 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.54.2"; + version = "1.55.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-7nbgiUrp7S7sXt7uFXX8NHYbIRLZZQcg+18IdwAZBfE="; + hash = "sha256-DO71wfDmCuziEcsme1g1uNIl3MswA+EkQcYzOYHbG+I="; }; - vendorHash = "sha256-IyH5lG2a4zjsg/MUonCUiAgMl4xx8zSflRyzNgk8MR0="; + vendorHash = "sha256-0+jImfMdVocOczGWeO03YXUg5yKYTu3WeJaokSlcYFM="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix index e6a99d1eea..7a5df1067e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -1,9 +1,16 @@ +# Gomplate 3.x does not build with go > 1.20. +# Version 4 of gomplate (yet unreleased) should not have this issue. +# +# see https://github.com/hairyhenderson/gomplate/issues/1872 + { lib -, buildGoModule +#, buildGoModule +, buildGo120Module , fetchFromGitHub }: -buildGoModule rec { +# buildGoModule rec { +buildGo120Module rec { pname = "gomplate"; version = "3.11.5"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix index e5c8d50e47..c98a2fc198 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-cVW0CsVEBitSXS1Ciyt/EhE38KM7x4Up3aYUwKwrxvg="; + hash = "sha256-z+5MR4tiKa2vVJslFdAcVLxrR6aXoPxAHaqNgN2QlMc="; }; - vendorHash = "sha256-mxSfdkqwJBUu34VWQ2Xlb2Jbz1QgWUH78Xngge9+AfA="; + vendorHash = "sha256-jekw3uc2ZEH9s+26jMFVteHUD0iyURlVq8zBlVPihqs="; subPackages = [ "cmd/gosec" diff --git a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix index 853e76a864..3b7892022b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gptcommit/default.nix @@ -5,12 +5,13 @@ , pkg-config , nix-update-script , Security +, SystemConfiguration , openssl }: let pname = "gptcommit"; - version = "0.5.13"; + version = "0.5.14"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,17 +20,18 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O0dqLN2wDXRIVcb9whlzK0BJOm/qhTH+nLpCwSUObng="; + hash = "sha256-xjaFr1y2Fd7IWbJlegnIsfS5/oMJYd6QTnwp7IK17xM="; }; - cargoSha256 = "sha256-JwwQaThefWhJVRJ/a0WfdKJqr/NHgll6D6Y2QaeqWsc="; + cargoHash = "sha256-VZrlEJi/UPQTGFiSpZs+Do+69CY3zdqGkAnUxMYvvaw="; nativeBuildInputs = [ pkg-config ]; # 0.5.6 release has failing tests doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isLinux [ openssl ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ] + ++ lib.optionals stdenv.isLinux [ openssl ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix index 4f81b849a9..97a436c61b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.11.3"; + version = "0.15.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-yMM6LR5Zviwr1OduSUxsSzdzrb+Lv5ILkVjXWD0b0FU="; + sha256 = "sha256-yboht3dE8njp+q5RzdaM7Bc3BVsPr7HlVM1UbRN+Bds="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-d95w9cApLyYu+OOP4UM5/+4DDU2LqyHU8E3wSTW8c7Q="; + vendorHash = "sha256-6iwNykvW1m+hl6FzMNbvvPpBNp8OQn2/vfJLmAj60Mw="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/third_party/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix deleted file mode 100644 index 6de9e48ae6..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/guile/guile-lint/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, guile }: - -stdenv.mkDerivation rec { - pname = "guile-lint"; - version = "14"; - - src = fetchurl { - url = "https://download.tuxfamily.org/user42/${pname}-${version}.tar.bz2"; - sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; - }; - - buildInputs = [ guile ]; - - unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${pname}-${version}"''; - - prePatch = '' - substituteInPlace guile-lint.in --replace \ - "exec guile" "exec ${guile}/bin/guile" - ''; - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Checks syntax and semantics in a Guile program or module"; - homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-platform.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-platform.nix new file mode 100644 index 0000000000..3b1b17fba2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-platform.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, lib + # GHC source tree to build ghc-toolchain from +, ghcSrc +, ghcVersion +}: +mkDerivation { + pname = "ghc-platform"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/libraries/ghc-platform" + ''; + libraryHaskellDepends = [ base ]; + description = "Platform information used by GHC and friends"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix new file mode 100644 index 0000000000..035fee7aca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix @@ -0,0 +1,19 @@ +{ mkDerivation, base, directory, filepath, ghc-platform, lib +, process, text, transformers + # GHC source tree to build ghc-toolchain from +, ghcVersion +, ghcSrc +}: +mkDerivation { + pname = "ghc-toolchain"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/utils/ghc-toolchain" + ''; + libraryHaskellDepends = [ + base directory filepath ghc-platform process text transformers + ]; + description = "Utility for managing GHC target toolchains"; + license = lib.licenses.bsd3; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix similarity index 71% rename from third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix rename to third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix index 1801d63cf8..1be21d6f45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -1,20 +1,19 @@ -{ # GHC source tree to build hadrian from - ghcSrc ? null, ghcVersion ? null -, mkDerivation, base, bytestring, Cabal, containers, directory +# See also ./make-hadria.nix +{ mkDerivation, base, bytestring, Cabal, containers, directory , extra, filepath, lib, mtl, parsec, shake, text, transformers , unordered-containers, cryptohash-sha256, base16-bytestring -, userSettings ? null -# Whether to pass --hyperlinked-source to haddock or not. This is a custom -# workaround as we wait for this to be configurable via userSettings or similar. -# https://gitlab.haskell.org/ghc/ghc/-/issues/23625 -, enableHyperlinkedSource ? true , writeText + # Dependencies that are not on Hackage and only used in certain Hadrian versions +, ghc-platform ? null +, ghc-toolchain ? null + # GHC source tree to build hadrian from +, ghcSrc +, ghcVersion + # Customization +, userSettings ? null +, enableHyperlinkedSource }: -if ghcSrc == null || ghcVersion == null -then throw "hadrian: need to specify ghcSrc and ghcVersion arguments manually" -else - mkDerivation { pname = "hadrian"; version = ghcVersion; @@ -44,7 +43,13 @@ mkDerivation { parsec shake text transformers unordered-containers ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [ cryptohash-sha256 base16-bytestring + ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [ + ghc-platform ghc-toolchain ]; + passthru = { + # Expose »private« dependencies if any + inherit ghc-platform ghc-toolchain; + }; description = "GHC build system"; license = lib.licenses.bsd3; } diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix new file mode 100644 index 0000000000..6aa30cb9e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -0,0 +1,59 @@ +# Hadrian is the build system used to (exclusively) build GHC. It can +# (theoretically) be used starting with GHC 9.4 and is required since 9.6. It is +# developed in the GHC source tree and specific to the GHC version it is released +# with, i.e. Hadrian always needs to be built from the same GHC source tree as +# the GHC we want to build. +# +# This fact makes it impossible to integrate Hadrian into our Haskell package +# sets which are also used to bootstrap GHC, since a package set can bootstrap +# multiple GHC versions (usually two major versions). A bootstrap set would need +# knowledge of the GHC it would eventually bootstrap which would make the logic +# unnecessarily complicated. +# +# Luckily Hadrian is, while annoying to bootstrap, relatively simple. Specifically +# all it requires to build is (relative to the GHC we are trying to build) a +# build->build GHC and build->build Haskell packages. We can get all of this +# from bootPkgs which is already passed to the GHC expression. +# +# The solution is the following: The GHC expression passes its source tree and +# version along with some parameters to this function (./make-hadrian.nix) +# which acts as a common expression builder for all Hadrian version as well as +# related packages that are managed in the GHC source tree. Its main job is to +# expose all possible compile time customization in a common interface and +# take care of all differences between Hadrian versions. +{ bootPkgs +, lib +}: + +{ # GHC source tree and version to build hadrian & friends from. + # These are passed on to the actual package expressions. + ghcSrc +, ghcVersion + # Contents of a non-default UserSettings.hs to use when building hadrian, if any. + # Should be a string or null. +, userSettings ? null + # Whether to pass --hyperlinked-source to haddock or not. This is a custom + # workaround as we wait for this to be configurable via userSettings or similar. + # https://gitlab.haskell.org/ghc/ghc/-/issues/23625 +, enableHyperlinkedSource ? false +}: + +let + callPackage' = f: args: bootPkgs.callPackage f ({ + inherit ghcSrc ghcVersion; + } // args); + + ghc-platform = callPackage' ./ghc-platform.nix { }; + ghc-toolchain = callPackage' ./ghc-toolchain.nix { + inherit ghc-platform; + }; +in + +callPackage' ./hadrian.nix ({ + inherit userSettings enableHyperlinkedSource; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { + # Starting with GHC 9.9 development, additional in tree packages are required + # to build hadrian. (Hackage-released conditional dependencies are handled + # in ./hadrian.nix without requiring intervention here.) + inherit ghc-platform ghc-toolchain; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index a6f287c37b..59a1303764 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,10 +1,77 @@ { lib , stdenv -, supportedGhcVersions ? [ "94" ] -, dynamic ? true , haskellPackages , haskell + +# Which GHC versions this hls can support. +# These are looked up in nixpkgs as `pkgs.haskell.packages."ghc${version}`. +# Run +# $ nix-instantiate --eval -E 'with import {}; builtins.attrNames pkgs.haskell.packages' +# to list for your nixpkgs version. +, supportedGhcVersions ? [ "94" ] + +# Whether to build hls with the dynamic run-time system. +# See https://haskell-language-server.readthedocs.io/en/latest/troubleshooting.html#static-binaries for more information. +, dynamic ? true + +# Which formatters are supported. Pass `[]` to remove all formatters. +# +# Maintainers: if a new formatter is added, add it here and down in knownFormatters +, supportedFormatters ? [ "ormolu" "fourmolu" "floskell" "stylish-haskell" ] }: + +# make sure the user only sets GHC versions that actually exist +assert supportedGhcVersions != []; +assert + lib.asserts.assertEachOneOf + "supportedGhcVersions" + supportedGhcVersions + (lib.pipe haskell.packages [ + lib.attrNames + (lib.filter (lib.hasPrefix "ghc")) + (map (lib.removePrefix "ghc")) + ]); + +let + # A mapping from formatter name to + # - cabal flag to disable + # - formatter-specific packages that can be stripped from the build of hls if it is disabled + knownFormatters = { + ormolu = { + cabalFlag = "ormolu"; + packages = [ + "hls-ormolu-plugin" + ]; + }; + fourmolu = { + cabalFlag = "fourmolu"; + packages = [ + "hls-fourmolu-plugin" + ]; + }; + floskell = { + cabalFlag = "floskell"; + packages = [ + "hls-floskell-plugin" + ]; + }; + stylish-haskell = { + cabalFlag = "stylishhaskell"; + packages = [ + "hls-stylish-haskell-plugin" + ]; + }; + }; + +in + +# make sure any formatter that is set is actually supported by us +assert + lib.asserts.assertEachOneOf + "supportedFormatters" + supportedFormatters + (lib.attrNames knownFormatters); + # # The recommended way to override this package is # @@ -13,9 +80,43 @@ # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # let - inherit (lib) concatStringsSep concatMapStringsSep take splitString pipe optionals; - inherit (haskell.lib.compose) justStaticExecutables overrideCabal enableCabalFlag disableCabalFlag; + inherit (haskell.lib.compose) + justStaticExecutables + overrideCabal + enableCabalFlag + disableCabalFlag + ; + getPackages = version: haskell.packages."ghc${version}"; + + # Given the list of `supportedFormatters`, remove every formatter that we know of (knownFormatters) + # by disabling the cabal flag and also removing the formatter libraries. + removeUnnecessaryFormatters = + let + # only formatters that were not requested + unwanted = lib.pipe knownFormatters [ + (lib.filterAttrs (fmt: _: ! (lib.elem fmt supportedFormatters))) + lib.attrsToList + ]; + # all flags to disable + flags = map (fmt: fmt.value.cabalFlag) unwanted; + # all dependencies to remove from hls + deps = lib.concatMap (fmt: fmt.value.packages) unwanted; + + # remove nulls from a list + stripNulls = lib.filter (x: x != null); + + # remove all unwanted dependencies of formatters we don’t want + stripDeps = overrideCabal (drv: { + libraryHaskellDepends = lib.pipe (drv.libraryHaskellDepends or []) [ + # the existing list may contain nulls, so let’s strip them first + stripNulls + (lib.filter (dep: ! (lib.elem dep.pname deps))) + ]; + }); + + in drv: lib.pipe drv ([stripDeps] ++ map disableCabalFlag flags); + tunedHls = hsPkgs: lib.pipe hsPkgs.haskell-language-server ([ (haskell.lib.compose.overrideCabal (old: { @@ -27,32 +128,39 @@ let ''; })) ((if dynamic then enableCabalFlag else disableCabalFlag) "dynamic") - ] ++ optionals (!dynamic) [ + removeUnnecessaryFormatters + ] + ++ lib.optionals (!dynamic) [ justStaticExecutables ]); + targets = version: let packages = getPackages version; - in [ - "haskell-language-server-${packages.ghc.version}" - ]; + in [ "haskell-language-server-${packages.ghc.version}" ]; + makeSymlinks = version: - concatMapStringsSep "\n" (x: - "ln -s ${ - tunedHls (getPackages version) - }/bin/haskell-language-server $out/bin/${x}") (targets version); -in assert supportedGhcVersions != []; stdenv.mkDerivation { + lib.concatMapStringsSep "\n" + (x: + "ln -s ${ + tunedHls (getPackages version) + }/bin/haskell-language-server $out/bin/${x}") + (targets version); + +in stdenv.mkDerivation { pname = "haskell-language-server"; version = haskellPackages.haskell-language-server.version; + buildCommand = '' mkdir -p $out/bin ln -s ${tunedHls (getPackages (builtins.head supportedGhcVersions))}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper - ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} + ${lib.concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} ''; + meta = haskellPackages.haskell-language-server.meta // { maintainers = [ lib.maintainers.maralorn ]; longDescription = '' This package provides the executables ${ - concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) + lib.concatMapStringsSep ", " (x: lib.concatStringsSep ", " (targets x)) supportedGhcVersions } and haskell-language-server-wrapper. You can choose for which ghc versions to install hls with pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "92" ]; }. diff --git a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix index 368a1a6e5c..03e934175c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.18.1"; + version = "2.19.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-31Xqgzd208ypK8u1JV5Rh5cCqGr1MJkLP490nIeovsE="; + hash = "sha256-A7YfjXdblFGBABD/PeJMzh9WdPeIUWOWAr/UlD3ki28="; }; vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo="; diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index 39fc54b6ac..f92a698f73 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.37.0"; + version = "1.38.3"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-6UQaO2ArAYd6Lr1maciC83k1GlR8FLx+acAZh6SjI3g="; + hash = "sha256-argcQvt4875TNOX5P5sOF41u6GcFq79gnH41To73foM="; }; - vendorHash = "sha256-mxAG3o3IY70xn8WymUzF96Q2XWwQ0efWrrw1VV4Y8HU="; + vendorHash = "sha256-RXojFeT80oroBSweyb0eYo+LC/JTi1F3LmQ10XpnEXA="; ldflags = [ "-s" @@ -32,11 +32,11 @@ buildGoModule rec { done ''; - meta = { + meta = with lib; { changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}"; description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = "https://github.com/hetznercloud/cli"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.zauberpony ]; + license = licenses.mit; + maintainers = with maintainers; [ zauberpony techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix index 9237871599..00af9d409f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hjson-go"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk="; + hash = "sha256-ox6/PY7Nx282bUekLoXezWfKDiDzCBUZMa5/nu2qG40="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix index b649310214..6758f1b44e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix @@ -22,7 +22,7 @@ , setuptools , toposort , wheezy-template -, libclang +, llvmPackages , gst_all_1 }: @@ -100,9 +100,9 @@ buildPythonApplication rec { postPatch = '' substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix index 32bd62594b..d9490abad5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.17"; + version = "0.11.18"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-RDxHQgKVMqTFjiuxF87l4OXcAG9zIG8Xr0cnp/0J4Wg="; + hash = "sha256-JP0n1sepH9kFOdrKTmt7Q79pe4GQInYKQH3xi2/G59s="; fetchSubmodules = true; }; - cargoHash = "sha256-wQLECnW+z62okJKpebNvUeRCiUfbuHCou1/uhO8gH+0="; + cargoHash = "sha256-YCa4WL2sgdITKfdfH3PGdiRHbSkE6JSJRHipaN00GwA="; # skip flaky tests checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix index 99411a0904..5c4b4ca9e3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix @@ -1,59 +1,87 @@ -{ stdenv, lib, callPackage, fetchurl }: +{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }: + +# this expression is mostly automated, and you are STRONGLY +# RECOMMENDED to use to nix-update for updating this expression when new +# releases come out, which runs the sibling `update.sh` script. +# +# from the root of the nixpkgs git repository, run: +# +# nix-shell maintainers/scripts/update.nix \ +# --argstr commit true \ +# --argstr package infisical let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; + # build hashes, which correspond to the hashes of the precompiled binaries procured by GitHub Actions. + buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); - plat = { - x86_64-linux = "linux_amd64"; - x86_64-darwin = "darwin_amd64"; - aarch64-linux = "linux_arm64"; - aarch64-darwin = "darwin_arm64"; - }.${system} or throwSystem; + # the version of infisical + version = "0.14.3"; - archive_fmt = "tar.gz"; + # the platform-specific, statically linked binary + src = + let + suffix = { + # map the platform name to the golang toolchain suffix + # NOTE: must be synchronized with update.sh! + x86_64-linux = "linux_amd64"; + x86_64-darwin = "darwin_amd64"; + aarch64-linux = "linux_arm64"; + aarch64-darwin = "darwin_arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + name = "infisical_${version}_${suffix}.tar.gz"; + hash = buildHashes."${stdenv.hostPlatform.system}"; + url = "https://github.com/Infisical/infisical/releases/download/infisical-cli%2Fv${version}/${name}"; + in + fetchurl { inherit name url hash; }; - sha256 = { - x86_64-linux = "194akxb692xpqppakw49aywp5ma43yfcwv5imw4pm05cna0n06b1"; - x86_64-darwin = "0bgjx54c00v0nb88rzdv09g92yw9qsf2fxd8565g6fsw591va1pa"; - aarch64-linux = "0z07aikjhk9055apbvyaxdp8cgjl291fqgwgfbp9y3826q7s0riq"; - aarch64-darwin = "0garlx458jy6dpqbfd0y2p7xj9hagm815cflybbbxf5yz2v9da01"; - }.${system} or throwSystem; in - stdenv.mkDerivation (finalAttrs: { - pname = "infisical"; - version = "0.3.7"; +stdenv.mkDerivation { + pname = "infisical"; + version = version; + inherit src; - src = fetchurl { - url = "https://github.com/Infisical/infisical/releases/download/v${finalAttrs.version}/infisical_${finalAttrs.version}_${plat}.tar.gz"; - inherit sha256; - }; + nativeBuildInputs = [ installShellFiles ]; - sourceRoot = "."; - installPhase = '' - mkdir -p $out/bin/ $out/share/completions/ $out/share/man/ - cp completions/* $out/share/completions/ - cp manpages/* $out/share/man/ - cp infisical $out/bin + doCheck = true; + dontConfigure = true; + dontStrip = true; + + sourceRoot = "."; + buildPhase = "chmod +x ./infisical"; + checkPhase = "./infisical --version"; + installPhase = '' + mkdir -p $out/bin/ $out/share/completions/ $out/share/man/ + cp infisical $out/bin + cp completions/* $out/share/completions/ + cp manpages/* $out/share/man/ + ''; + postInstall = '' + installManPage share/man/infisical.1.gz + installShellCompletion share/completions/infisical.{bash,fish,zsh} + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = infisical; }; + }; + + meta = with lib; { + description = "The official Infisical CLI"; + longDescription = '' + Infisical is the open-source secret management platform: + Sync secrets across your team/infrastructure and prevent secret leaks. ''; - - postInstall = '' - installManPage share/man/infisical.1.gz - installShellCompletion share/completions/infisical.{bash,fish,zsh} - chmod +x bin/infisical - ''; - - meta = with lib; { - description = "The official Infisical CLI"; - longDescription = '' - Infisical is an Open Source, End-to-End encrypted platform that lets you - securely sync secrets and configs across your team, devices, and infrastructure - ''; - mainProgram = "infisical"; - homepage = "https://infisical.com/"; - downloadPage = "https://github.com/Infisical/infisical/releases/"; - license = licenses.mit; - maintainers = [ maintainers.ivanmoreau ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; - }; - }) + homepage = "https://infisical.com"; + changelog = "https://github.com/infisical/infisical/releases/tag/infisical-cli%2Fv${version}"; + license = licenses.mit; + mainProgram = "infisical"; + maintainers = [ maintainers.ivanmoreau maintainers.jgoux ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json b/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json new file mode 100644 index 0000000000..0e79f2a1e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json @@ -0,0 +1,6 @@ +{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh" +, "x86_64-linux": "sha256-sTfwooMN5ckdaxpd4R3yQvDEYT7muYZTyFEm0exM33M=" +, "x86_64-darwin": "sha256-B94+mF5Wu0pHKIo8CuHAbrorzIxK2U64Np3JFlTc1kk=" +, "aarch64-linux": "sha256-eGuKnC6h1YPW0UdY5wcChbiSzATAcSmHZ6mKBI2sR80=" +, "aarch64-darwin": "sha256-s4s1la165cQ5I296ZCeW3ZIyYapTfRxa20QdZmXvido=" +} diff --git a/third_party/nixpkgs/pkgs/development/tools/infisical/update.sh b/third_party/nixpkgs/pkgs/development/tools/infisical/update.sh new file mode 100755 index 0000000000..5810d2ee48 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/infisical/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts nix coreutils +# shellcheck shell=bash +set -euo pipefail + +RELEASE_NAME=$(curl -s https://api.github.com/repos/infisical/infisical/releases \ + | jq -r 'sort_by(.created_at) | reverse | + (map + (select ((.prerelease == false) and (.draft == false))) | + first + ) | .name') +VERSION=$(echo "$RELEASE_NAME" | sed -E 's/^infisical-cli\/v//') + +echo "Latest infisical release: $VERSION" + +ARCHS=( + "x86_64-linux:linux_amd64" + "x86_64-darwin:darwin_amd64" + "aarch64-linux:linux_arm64" + "aarch64-darwin:darwin_arm64" +) + +NFILE=pkgs/development/tools/infisical/default.nix +HFILE=pkgs/development/tools/infisical/hashes.json +rm -f "$HFILE" && touch "$HFILE" + +printf "{ \"_comment\": \"@generated by pkgs/development/tools/infisical/update.sh\"\n" >> "$HFILE" + +for arch in "${ARCHS[@]}"; do + IFS=: read -r arch_name arch_target <<< "$arch" + sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/infisical/infisical/releases/download/${RELEASE_NAME}/infisical_${VERSION}_${arch_target}.tar.gz")" + srihash="$(nix hash to-sri --type sha256 "$sha256hash")" + echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE" +done +echo "}" >> "$HFILE" + +sed -i \ + '0,/version\s*=\s*".*";/s//version = "'"$VERSION"'";/' \ + "$NFILE" + +echo "Done; wrote $HFILE and updated version in $NFILE." diff --git a/third_party/nixpkgs/pkgs/development/tools/initool/default.nix b/third_party/nixpkgs/pkgs/development/tools/initool/default.nix index d13158feb5..76ab9f805a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/initool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/initool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "initool"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256-99dkog0fr+IrMyrEBDf21tSGGREgAoHcU2+MJdGIvCM="; + hash = "sha256-qi8K3O6K9ZIKFlNFJ3O9/iKE+8M/mf/8V8qgl1BOaKo="; }; nativeBuildInputs = [ mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix index 6ab2cb3210..b3a23a28f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-Snn34Jl6GXtGUwOXBwo0icmuNfesLHUwA7sIvdv0xlY="; + hash = "sha256-Wz10goMJYWbFak4v10W6ez+z+T+ohG06HU+rS8AXQqg="; }; - cargoHash = "sha256-sL884chxQntagj5/h4yWLtDS8T7hbRFjHIqNbbzcsmI="; + cargoHash = "sha256-fvuwn5pA33QE4YplG5VAkHF1MgwRni0nbA6B2JkNndU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix index 97fa2298b0..e0ce19dc8d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/dex2jar/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dex2jar"; - version = "2.1"; + version = "2.4"; src = fetchurl { - url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex2jar-${finalAttrs.version}.zip"; - hash = "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg="; + url = "https://github.com/pxb1988/dex2jar/releases/download/v${finalAttrs.version}/dex-tools-v${finalAttrs.version}.zip"; + hash = "sha256-7nxF6zwdJHSmFF2NRH5lGnNqItlmS209O+WlqBfdojo="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 4d980d521d..3d7226fbb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.4"; + version = "7.0.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Qy4ozTRdDF8ENyk4AB2a/4AuMSLJd/3w/q9TjGgrkPE="; + hash = "sha256-gRRYUn5XQp6QHhI6+ZjXqLq7wfUZ8PiUgQSXBMu8uns="; }; - cargoHash = "sha256-or69dz+wMhp8CPLzip6c6S7HpilAE2DAVkv/3IJMJWQ="; + cargoHash = "sha256-Fv7CWCuV6LUXqDSCxE4JLdUdKyDUSBX/KybfM6VfRss="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix b/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix index 8491900b2c..58902f43d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qN248U4Fx4IAjJegCUj98PzrypMp9PQEr2RUaKX3yE4="; + sha256 = "sha256-z2EKtSM+/wWGgwsHKDcxtc/M6UZ01AiTZaaCYCWjU7M="; }; - vendorHash = "sha256-qZTqqSANg0FpupWXTrHuYmnaTE387FhC40ZrZ9tlfew="; + vendorHash = "sha256-7UiQjTgcwGOTEJEaWywEdZvpkM/MoXU3d6k8oVmUiW8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 0a4ba7c346..732bd8d43f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.14.0"; + version = "1.16.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gItTmei+nxa56CoVv9xBmsOUH5AP48XNxdlHmXRqo2Y="; + hash = "sha256-lXZCRoTVIguufyhHn7h4vAajG53qIn8AeDBZuha6be8="; }; - cargoHash = "sha256-iZh9M3QgTH0brh6DkKeQyJiCDmYFUggMiZWTkAGjggE="; + cargoHash = "sha256-+r8fcoG23p7ug3xireAnUvJHiB/PXAUzBAKowGqKN8E="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 6f00c9d932..525c16a9ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4ucnq/FTvdDpzf1RWRY+U5A+BCaaQWMTEaZtmU0JD90="; + hash = "sha256-90r6dyesYfa/eC/joUDPDfGU8r8qbPzzhwf0EwnGee0="; }; subPackages = [ "./" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix index d06f603dfa..9f8983305f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec { description = "A highly efficient daemon for streaming data from Kafka into Delta Lake"; homepage = "https://github.com/delta-io/kafka-delta-ingest"; license = licenses.asl20; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/karate/default.nix b/third_party/nixpkgs/pkgs/development/tools/karate/default.nix index ac3ba5ffdb..bd99903e98 100644 --- a/third_party/nixpkgs/pkgs/development/tools/karate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/karate/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-LTGxS5dsp+UrDzI+eoJJSodShe34KWHWW1QgqnhJawM="; + sha256 = "sha256-3gNoXUchrfGkZC6UAfw2TXorzSlqnOZCe0gnuUHIIb4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix b/third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix index 9ef755afbc..6c69694826 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdoctor"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+92.zip"; - hash = "sha256-rGK5U1JeXID9OcT8uzO3oO6f9MZgrW69LUHbEtj0SSQ="; + url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip"; + hash = "sha256-H4lpdMf1AIU8BC+6DlvcwM1wLuEl+Hd9xBli/TGFMV4="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index cae88d5416..63f6fff66b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { CGO_ENABLED = 0; GOFLAGS = [ "-trimpath" ]; - ldFlags = [ "-buildid=" "-w" ]; + ldflags = [ "-buildid=" "-w" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix index 5c34490cd2..66a196ab02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jBysfeoZ9W94c07xFODBASrWGJbZRHsUODfEul9f4Ug="; + hash = "sha256-z0VemNdN35p5fA+cenXil7Vonl+ryu1ruKxzWFwMPfI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix index cbe77811fa..f5afe95996 100644 --- a/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4OEc5NfCF8DHCyQfQL2ZmSFBkwYr32dGThVZHsRutVA="; + sha256 = "sha256-PSJNPN5hd5Tgt6F70II2gMiUiU0irncSefm6Q7WjUDE="; }; - vendorHash = "sha256-5B1gA8cigwBNYNYmLb9Jq9wXl/d3hP3+brJFecnKxCY="; + vendorHash = "sha256-0zWTVE82GaSyWfgbRASpNdO/d4kKOts1XdPspmgfpV8="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix index 60d14dc79e..0b64b59467 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "1pc1ck87l849xfy1lcdr1v3p84qyxn9725pvh09czvlqs58yy6ax"; + sha256 = "15bvk6sv6fjvfq2a5yyxh3kvpkyws0pxdqbygkkrxxsl8bnr3409"; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "ktlint"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix index 5821a1753b..bcacc28214 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L0JjbjV5KwI4qas8iLp5OLkleQlD29jsYLpe3ER1l2Y="; + sha256 = "sha256-gygzibpTpdVg1ZenAXIDHXYwAemlr6qkioE+GV52NkE="; }; - vendorHash = "sha256-1erG3TFv3DR6SLDIrmRefAPjXhgXEVYFiAsUPiI7kX4="; + vendorHash = "sha256-ZeAAvL5pOvHMAsDBe/0CBeayTsUrPDK5a5rAxHAu64o="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/4.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/4.nix new file mode 100644 index 0000000000..bb31aeefc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/4.nix @@ -0,0 +1,48 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kustomize_4"; + version = "4.5.7"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kustomize"; + rev = "kustomize/v${version}"; + hash = "sha256-AHDUwXcYkI04nOBY8jScf+OE6k9Z5OqzhtWExK1rrKg="; + }; + + # rev is the commit of the tag, mainly for kustomize version command output + rev = "56d82a8378dfc8dc3b3b1085e5a6e67b82966bd7"; + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in + [ + "-s" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; + + # avoid finding test and development commands + modRoot = "kustomize"; + proxyVendor = true; + vendorHash = "sha256-9+k0Me5alZDNC27Mx0Q6vp0B2SEa+Qy0FoLSr/Rahkc="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd kustomize \ + --bash <($out/bin/kustomize completion bash) \ + --fish <($out/bin/kustomize completion fish) \ + --zsh <($out/bin/kustomize completion zsh) + ''; + + meta = with lib; { + description = "Customization of kubernetes YAML configurations"; + longDescription = '' + kustomize lets you customize raw, template-free YAML files for + multiple purposes, leaving the original YAML untouched and usable + as is. + ''; + homepage = "https://github.com/kubernetes-sigs/kustomize"; + license = licenses.asl20; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man saschagrunert ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index 6f62f7d86c..a8e90fc7b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.1.1"; + version = "5.2.1"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-XtpMws2o3h19PsRJXKg+y5/Zk3bc6mJ4O1LLZ40ioTM="; + hash = "sha256-NuDg9Vtfxddosi8J7p6+WI2jDM2k16gbWsQcZF27vJo="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-/XyxZHhlxD0CpaDAuJbLkOHysLXo1+ThTcexqtNdVIs="; + vendorHash = "sha256-pA0B4CA5RXyo2GTyk9Xa/unpU46gnLI6ulCY5vTLTvA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index ee6c8d0b5c..d751e0f43f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.2.1"; + version = "4.2.5"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jm4mA91fyXQ8eScvRGDAmCBFVqT2GP57XIBZQo/bApg="; + hash = "sha256-zhu1fBqa6rNO2MoOFUE50I3dtAaOP4Dr9v2rTNB5oro="; }; - vendorHash = "sha256-tNYPgXFDJuNRlrVE0ywg77goNzfoWHFVzOG9mHqK3q8="; + vendorHash = "sha256-GuzBSFENkHTri1FF2Ar6paGId7Yj7HuWSEDirFZrqZM="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix b/third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix index 0bc8bddefb..32e6ec7a35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lalrpop/default.nix @@ -1,6 +1,5 @@ { lib , rustPlatform -, rust , fetchFromGitHub , substituteAll , stdenv @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./use-correct-binary-path-in-tests.patch; - target_triple = rust.toRustTarget stdenv.hostPlatform; + target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix index efc6307f1a..cefb7a969a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -8,9 +8,9 @@ in buildDotnetGlobalTool rec { pname = "csharp-ls"; - version = "0.8.0"; + version = "0.10.0"; - nugetSha256 = "sha256-F3N6ESE/VmQA5sOMm3eqSkhSNVCCsnAXTCC+McsAnQw="; + nugetSha256 = "sha256-1t8U2Q4lIlj2QwbnevAMMGcqtpPh5zk0Bd7EHa7qvCI="; dotnet-sdk = sdk_7_0; dotnet-runtime = sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix index 59b3e2ad38..093f6c583b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/glslls/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "glslls"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "glsl-language-server"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-UgQXxme0uySKYhhVMOO7+EZ4BL2s8nmq9QxC2SFQqRg="; + hash = "sha256-wi1QiqaWRh1DmIhwmu94lL/4uuMv6DnB+whM61Jg1Zs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix index 0c02135827..6085ec71a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-fRpVAYg4UwRe3bcjQPOnCGWSANfoTwD5Y9vs3QET1eM="; + hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; }; modRoot = "gopls"; - vendorHash = "sha256-9d7vgCMc1M5Cab+O10lQmKGfL9gqO3sajd+3rF5cums="; + vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix index a138526a4c..9222f9d997 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-dNF0Q/jat2YE/3ZEKqJVX+4+iizJIV25U9U3e+2bfUM="; + hash = "sha256-XTY32B0RkLcZxTuKWUtZlrrUARkoT2+qYkL8Amai2cE="; }; vendorHash = "sha256-wMYrgAgAEgwfjMLP81H0cKWm/kh63ppDkSiymfsaj7U="; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix new file mode 100644 index 0000000000..08e83763fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "jq-lsp"; + version = "unstable-2023-10-27"; + + src = fetchFromGitHub { + owner = "wader"; + repo = "jq-lsp"; + rev = "b4707e7776a4eb3093b1a7533ebd41368240095a"; + hash = "sha256-AU4xGweeFx+kSsrqkTtSjl+N77cITF/qvAVZGUZY5SE="; + }; + + vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; + + meta = with lib; { + description = "jq language server"; + homepage = "https://github.com/wader/jq-lsp"; + license = licenses.mit; + maintainers = with maintainers; [ sysedwinistrator ]; + mainProgram = "jq-lsp"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix index 7907181256..8ec9ebb8f3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.3.5"; + version = "1.3.7"; src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-hoZDbhedauW1TK78rX37Gwn/6OWLXZzy8wKsUrbTmKI="; + hash = "sha256-BEQywg3ZU4LtF9trntGbDp64SIWH4y93o/VVMSRP+cc="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index faf6629810..c6eec2aff5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; + hash = "sha256-iAxRGG7/zaUbJ/PWgmjxGS0UTq9/OXc8RWzlpUTUftc="; fetchSubmodules = true; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/luals/lua-language-server"; changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda sei40kr ]; + maintainers = with maintainers; [ figsoda gepbird sei40kr ]; mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; 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 df78ed497d..9bbd3d5ec8 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.0.1"; + version = "1.1.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE="; + outputHash = "sha256-9zigJM0xEJSYgohbjc9ZLBKbPa/WGVSv3KVFE3QUzWE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock index 3c7e5cc534..a331e3613e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.13.4" +version = "0.13.5" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "str-util", @@ -127,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "cm-syntax" -version = "0.13.4" +version = "0.13.5" dependencies = [ "lex-util", "paths", @@ -143,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "fast-hash", ] @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "serde", @@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "once_cell", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "diff" @@ -248,7 +248,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "log", ] @@ -280,29 +280,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "drop_bomb", "rowan", @@ -312,16 +301,16 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "rustc-hash", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "flate2" @@ -336,7 +325,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "form_urlencoded" @@ -376,15 +365,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "humantime" @@ -395,7 +384,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "idna" @@ -410,24 +399,24 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "nohash-hasher", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] name = "input" -version = "0.13.4" +version = "0.13.5" dependencies = [ "cm-syntax", "config", @@ -475,7 +464,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.4" +version = "0.13.5" dependencies = [ "analysis", "anyhow", @@ -503,13 +492,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.4" +version = "0.13.5" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "line-index" @@ -523,9 +512,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "log" @@ -560,22 +549,22 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "millet-cli" -version = "0.13.4" +version = "0.13.5" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +582,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.4" +version = "0.13.5" dependencies = [ "anyhow", "env_logger", @@ -613,7 +602,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "paths", @@ -624,7 +613,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.4" +version = "0.13.5" dependencies = [ "config", "diagnostic", @@ -648,7 +637,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.4" +version = "0.13.5" dependencies = [ "lex-util", "paths", @@ -687,9 +676,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -711,7 +700,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.4" +version = "0.13.5" dependencies = [ "better-panic", ] @@ -719,7 +708,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "dunce", "fast-hash", @@ -732,7 +721,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "fast-hash", ] @@ -760,10 +749,20 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.66" +name = "prettyplease" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -800,9 +799,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", @@ -812,9 +811,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", @@ -823,15 +822,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "rowan" -version = "0.15.11" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" +checksum = "906057e449592587bf6724f00155bf82a6752c868d78a8fb3aa41f4e6357cfe8" dependencies = [ "countme", "hashbrown 0.12.3", @@ -854,9 +853,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", @@ -893,9 +892,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -924,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "str-util", @@ -932,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.4" +version = "0.13.5" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "fmt-util", @@ -950,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.4" +version = "0.13.5" dependencies = [ "config", "pretty_assertions", @@ -966,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.13.4" +version = "0.13.5" dependencies = [ "config", "elapsed", @@ -980,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "once_cell", @@ -989,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.4" +version = "0.13.5" dependencies = [ "la-arena", "sml-lab", @@ -1000,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.4" +version = "0.13.5" dependencies = [ "config", "cov-mark", @@ -1015,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.4" +version = "0.13.5" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.4" +version = "0.13.5" dependencies = [ "cov-mark", "diagnostic", @@ -1037,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "sml-comment", @@ -1046,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.4" +version = "0.13.5" [[package]] name = "sml-parse" -version = "0.13.4" +version = "0.13.5" dependencies = [ "diagnostic", "event-parse", @@ -1062,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.4" +version = "0.13.5" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.4" +version = "0.13.5" dependencies = [ "num-bigint", "num-traits", @@ -1078,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.4" +version = "0.13.5" dependencies = [ "chain-map", "config", @@ -1101,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.4" +version = "0.13.5" dependencies = [ "chain-map", "code-h2-md-map", @@ -1120,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.4" +version = "0.13.5" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1128,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.4" +version = "0.13.5" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1139,7 +1138,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.4" +version = "0.13.5" dependencies = [ "fast-hash", "sml-hir", @@ -1157,16 +1156,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.31" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1176,13 +1175,15 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "char-name", "fast-hash", "identifier-case", + "prettyplease", "proc-macro2", "quote", + "syn", "ungrammar", ] @@ -1201,16 +1202,16 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "tests" -version = "0.13.4" +version = "0.13.5" dependencies = [ "analysis", "cm-syntax", @@ -1236,7 +1237,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "line-index", "text-size-util", @@ -1251,7 +1252,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" dependencies = [ "text-size", ] @@ -1274,13 +1275,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -1299,9 +1300,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "serde", @@ -1313,7 +1314,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "ungrammar" @@ -1338,9 +1339,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -1353,14 +1354,14 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" +source = "git+https://github.com/azdavis/language-util.git#bc4bb79b0309c596b3c5fded6b2eb4e7d9bf0a02" [[package]] name = "url" @@ -1398,9 +1399,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", ] @@ -1545,16 +1546,16 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.13.4" +version = "0.13.5" dependencies = [ "anyhow", "flate2", diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 27b7a7a567..6d9a0c6124 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-TLv2czZsZDOk8i8/0VxALflC/WV+MvRlbgbxB4kKsW0="; + hash = "sha256-pgCsDbFYRN7QMAIzgdNn0vo/KLAZzMgjzil0AjxjKEc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-txHvmD0ClTQqe6QhZ0DLgK5RON0UvZkxXCoZxC8U5+E="; + "char-name-0.1.0" = "sha256-pLzkXx0twW4X3iHeiUT6KwEzXxYk0IhwISRqeaJVjvo="; "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; 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 20714daaab..ab33801962 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.6.5"; + version = "0.6.8"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-VXxxtIJwtRfgQFteifR5zFn6DCSNgJxDYNdt0jM2kG4="; + hash = "sha256-l6jhdTPtt+OPZOzsRJ4F9VVFaLYhaoUUjqtiP40ADPE="; }; - cargoHash = "sha256-FJd0mWpimI/OgG65+OquyAUO2a47gUfE4R5XhhYNJhs="; + cargoHash = "sha256-LgkcVlUCILRmYd+INLe4FiexR+Exmc/tPIYQ+hUypMc="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix deleted file mode 100644 index 5bafc0c178..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nls/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, nickel -, stdenv -}: - -rustPlatform.buildRustPackage { - pname = "nls"; - - inherit (nickel) src version nativeBuildInputs; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM="; - "tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; - "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; - "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; - "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; - "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; - }; - }; - - cargoBuildFlags = [ "-p nickel-lang-lsp" ]; - - meta = { - inherit (nickel.meta) homepage changelog license maintainers; - description = "A language server for the Nickel programming language"; - longDescription = '' - The Nickel Language Server (NLS) is a language server for the Nickel - programming language. NLS offers error messages, type hints, and - auto-completion right in your favorite LSP-enabled editor. - ''; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix index 167b86216f..f4bda019b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix @@ -6,25 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "postgres-lsp"; - version = "unstable-2023-09-21"; + version = "unstable-2023-10-20"; - src = (fetchFromGitHub { + src = fetchFromGitHub { owner = "supabase"; repo = "postgres_lsp"; - rev = "f25f23a683c4e14dea52e3e423584588ab349081"; - hash = "sha256-z8WIUfgnPYdzhBit1V6A5UktjoYCblTKXxwpbHOmFJA="; + rev = "88901a987de9a2d8db05c36bcd87c5c877b51460"; + hash = "sha256-HY83SO2dlXKamIqFEz53A8YDYx9EynX8FCX9EjF+tdw="; fetchSubmodules = true; - }).overrideAttrs { - # workaround to be able to fetch git@github.com submodules - # https://github.com/NixOS/nixpkgs/issues/195117 - env = { - GIT_CONFIG_COUNT = 1; - GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; - GIT_CONFIG_VALUE_0 = "git@github.com:"; - }; }; - cargoHash = "sha256-Nyxiere6/e5Y7YcgHitVkaiS1w3JXkbohIcBNc00YXY="; + cargoHash = "sha256-m8m0Q3UAq6kV2IoXMFTkP0WKzSXiWPkfOkta639dcj0="; nativeBuildInputs = [ protobuf diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix index c2ba3b7974..f6cd1d9a1f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.48"; + version = "0.0.49"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-NQvMOBjRIf7sQBff2iZe8MbnZiZZN0DTE+HBvxsvKpM="; + hash = "sha256-1BExqeIL6jaonJVB3aRYDDHRw7xdxHoouH5BlooJDW8="; }; - cargoHash = "sha256-eDa3UKPgATJQLIkHpG/G50V20TW/5vwjRTfshHb3zTQ="; + cargoHash = "sha256-HBRczmEqqH+lMgnHeP/WpqHD05tkovJmR12hXwCrw8k="; nativeBuildInputs = [ git diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 3740472e2c..5b40af17c3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.40"; + version = "0.0.45"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; - rev = "v${version}"; - hash = "sha256-CQ4SDIGhUTn7fdvoGag+XM7HcY+qJyp9McyzpoTQ0tM="; + rev = "refs/tags/v${version}"; + hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 52f5b366b4..1cac595547 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[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", "once_cell", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -58,6 +58,15 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -83,9 +92,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "flate2", "futures-core", @@ -96,13 +105,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -146,17 +155,16 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "biblatex" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9fd60378277e44cd400ec5f35e768ce0d5a63d8d18ac7b1a9231196251dae5" +checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" dependencies = [ - "chrono", "numerals", "paste", "strum 0.24.1", @@ -196,18 +204,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] [[package]] -name = "bpaf" -version = "0.9.5" +name = "bitvec" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dc3b1bd654a8d16eea03586c3eee8ffd25c7f242b9eae9730cc442834fe56d9" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bpaf" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "565688a36ddfcfc189cc927c94a6b69cc96c9f8a69030151ae8f0ed2b54a2ad3" dependencies = [ "owo-colors", "supports-color", @@ -215,9 +235,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -229,6 +249,28 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytemuck" version = "1.14.0" @@ -237,9 +279,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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" @@ -258,18 +300,18 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -357,6 +399,16 @@ dependencies = [ "half", ] +[[package]] +name = "citationberg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +dependencies = [ + "quick-xml 0.28.2", + "serde", +] + [[package]] name = "cobs" version = "0.2.3" @@ -392,9 +444,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -415,6 +467,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -445,9 +506,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -457,9 +518,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -475,15 +536,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.9", + "socket2 0.4.10", "winapi", ] [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -501,7 +562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -509,15 +570,18 @@ dependencies = [ [[package]] name = "data-url" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "dirs" @@ -548,7 +612,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -566,6 +630,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ecow" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" +dependencies = [ + "serde", +] + [[package]] name = "either" version = "1.9.0" @@ -581,6 +654,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -592,15 +671,15 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -611,25 +690,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[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 = "event-listener" version = "2.5.3" @@ -646,6 +714,12 @@ dependencies = [ "regex", ] +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + [[package]] name = "fastrand" version = "1.9.0" @@ -657,15 +731,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -684,9 +758,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -706,14 +780,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontdb" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" dependencies = [ "log", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -741,10 +815,16 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.28" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -757,9 +837,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -767,15 +847,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -784,9 +864,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -805,32 +885,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -931,29 +1011,30 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "hayagriva" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065e90e53aa502be868a307f58ca6b46e31143641e809047c689de75619d8cea" +checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" dependencies = [ "biblatex", - "chrono", - "isolang", - "lazy_static", - "linked-hash-map", + "ciborium", + "citationberg", + "indexmap 2.1.0", + "numerals", "paste", - "regex", - "strum 0.24.1", + "rkyv", + "serde", + "serde_yaml", "thiserror", "unic-langid", "unicode-segmentation", + "unscanny", "url", - "yaml-rust", ] [[package]] @@ -1019,7 +1100,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1028,9 +1109,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -1055,22 +1136,22 @@ dependencies = [ [[package]] name = "hypher" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e315d77ea8aa1aedf53ad979ff0e763cfa2a1b3403248e427ae052f403cad" +checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1084,9 +1165,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" dependencies = [ "displaydoc", "serde", @@ -1097,9 +1178,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" dependencies = [ "displaydoc", "litemap", @@ -1109,13 +1190,35 @@ dependencies = [ ] [[package]] -name = "icu_properties" -version = "1.2.0" +name = "icu_locid_transform" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_properties" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" dependencies = [ "displaydoc", "icu_collections", + "icu_locid_transform", + "icu_properties_data", "icu_provider", "serde", "tinystr", @@ -1123,10 +1226,16 @@ dependencies = [ ] [[package]] -name = "icu_provider" -version = "1.2.0" +name = "icu_properties_data" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305" +checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" dependencies = [ "displaydoc", "icu_locid", @@ -1134,6 +1243,7 @@ dependencies = [ "postcard", "serde", "stable_deref_trait", + "tinystr", "writeable", "yoke", "zerofrom", @@ -1142,58 +1252,64 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3" +checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" dependencies = [ "icu_locid", + "icu_locid_transform", "icu_provider", "tinystr", - "yoke", "zerovec", ] [[package]] name = "icu_provider_blob" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" dependencies = [ "icu_provider", "postcard", "serde", "writeable", - "yoke", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "icu_segmenter" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3300a7b6bf187be98a57264ad094f11f2e062c2e8263132af010ff522ee5495" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" dependencies = [ + "core_maths", "displaydoc", "icu_collections", "icu_locid", "icu_provider", - "num-traits", + "icu_segmenter_data", "serde", "utf8_iter", "zerovec", ] +[[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + [[package]] name = "idna" version = "0.4.0" @@ -1244,12 +1360,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "serde", ] @@ -1276,9 +1392,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "internment" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161079c3ad892faa215fcfcf3fd7a6a3c9288df2b06a2c2bad7fbfad4f01d69d" +checksum = "5e976188335292f66a1533fd41d5c2ce24b32dc2c000569b8dccf4e57f489806" dependencies = [ "hashbrown 0.12.3", "parking_lot", @@ -1286,9 +1402,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -1332,15 +1448,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "isolang" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80f221db1bc708b71128757b9396727c04de86968081e18e89b0575e03be071" -dependencies = [ - "phf", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1397,15 +1504,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" @@ -1436,9 +1543,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lipsum" @@ -1452,15 +1559,15 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1487,15 +1594,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -1518,9 +1625,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -1579,12 +1686,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -1612,15 +1718,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oklab" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" -dependencies = [ - "rgb", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -1633,7 +1730,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -1650,7 +1747,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1750,7 +1847,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.9.1", + "ordered-float 3.9.2", "percent-encoding", "rand", "regex", @@ -1767,18 +1864,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -1790,10 +1887,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] -name = "parking" -version = "2.1.0" +name = "palette" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "libm", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1807,13 +1927,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1826,12 +1946,13 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d77bc47c8968aa63f86a7e6693e270a6cbd1e3b784c364f1711a0ddecc71447" +checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" dependencies = [ "bitflags 1.3.2", "itoa", + "memchr", "ryu", ] @@ -1841,24 +1962,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - [[package]] name = "pico-args" version = "0.5.0" @@ -1882,7 +1985,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1903,7 +2006,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" dependencies = [ - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -1914,14 +2017,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ "base64", "indexmap 1.9.3", "line-wrap", - "quick-xml", + "quick-xml 0.30.0", "serde", "time", ] @@ -1957,14 +2060,21 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d534c6e61df1c7166e636ca612d9820d486fe96ddad37f7abc671517b297488e" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", + "embedded-io", "serde", ] +[[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" @@ -1997,9 +2107,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2014,10 +2124,40 @@ dependencies = [ ] [[package]] -name = "quick-xml" -version = "0.29.0" +name = "ptr_meta" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +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-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2031,6 +2171,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.8.5" @@ -2085,6 +2231,15 @@ 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_users" version = "0.4.3" @@ -2098,25 +2253,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] @@ -2126,10 +2281,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "reqwest" -version = "0.11.20" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -2155,6 +2325,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -2171,9 +2342,9 @@ dependencies = [ [[package]] name = "resvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" dependencies = [ "gif", "jpeg-decoder", @@ -2188,33 +2359,60 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -2227,11 +2425,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2240,9 +2438,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", @@ -2261,9 +2459,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -2277,17 +2475,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.18.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category", + "unicode-properties", "unicode-script", ] @@ -2329,14 +2527,20 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" version = "2.9.2" @@ -2362,38 +2566,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2402,20 +2606,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2434,11 +2638,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -2447,9 +2651,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", ] @@ -2460,6 +2664,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 = "simplecss" version = "0.2.1" @@ -2518,9 +2728,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[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", @@ -2528,20 +2738,14 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -2591,7 +2795,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.2", + "strum_macros 0.25.3", ] [[package]] @@ -2609,15 +2813,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2638,9 +2842,9 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2adc7de163bd53f323850e65269280b2a66ffceee291cb8eca34f2eabc3acad" +checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" dependencies = [ "image", "miniz_oxide", @@ -2650,9 +2854,9 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", "siphasher 0.3.11", @@ -2671,9 +2875,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2682,13 +2886,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "unicode-xid", ] @@ -2705,7 +2909,7 @@ dependencies = [ "fnv", "once_cell", "plist", - "regex-syntax", + "regex-syntax 0.7.5", "serde", "serde_json", "thiserror", @@ -2713,6 +2917,33 @@ dependencies = [ "yaml-rust", ] +[[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 = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "temp-dir" version = "0.1.11" @@ -2721,35 +2952,35 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", + "fastrand 2.0.1", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2780,18 +3011,19 @@ dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float 2.10.0", + "ordered-float 2.10.1", "threadpool", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2799,24 +3031,24 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] name = "tiny-skia" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" dependencies = [ "arrayref", "arrayvec", @@ -2829,9 +3061,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" dependencies = [ "arrayref", "bytemuck", @@ -2840,9 +3072,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", "serde", @@ -2866,9 +3098,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2876,7 +3108,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] @@ -2889,7 +3121,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2940,9 +3172,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2966,21 +3198,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.0", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -2991,7 +3223,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3000,11 +3232,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3062,7 +3294,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3073,11 +3305,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", @@ -3086,20 +3317,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -3117,12 +3348,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -3159,12 +3390,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - [[package]] name = "ttf-parser" version = "0.19.2" @@ -3179,23 +3404,23 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "base64", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", "comemo", - "ecow", + "ecow 0.2.0", "flate2", "fontdb", - "if_chain", "image", - "indexmap 2.0.0", + "indexmap 2.1.0", + "kurbo", "log", "miniz_oxide", - "oklab", "once_cell", + "palette", "pdf-writer", "pixglyph", "regex", @@ -3209,11 +3434,11 @@ dependencies = [ "svg2pdf", "time", "tiny-skia", - "toml 0.8.0", + "toml 0.8.6", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typst-macros", - "typst-syntax 0.8.0", + "typst-syntax 0.9.0", "unicode-ident", "unicode-math-class", "unicode-properties", @@ -3226,17 +3451,31 @@ dependencies = [ "xmp-writer", ] +[[package]] +name = "typst-ide" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +dependencies = [ + "comemo", + "ecow 0.2.0", + "if_chain", + "log", + "serde", + "typst", + "unscanny", +] + [[package]] name = "typst-library" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "az", "chinese-number", "ciborium", "comemo", "csv", - "ecow", + "ecow 0.2.0", "hayagriva", "hypher", "icu_properties", @@ -3244,6 +3483,7 @@ dependencies = [ "icu_provider_adapters", "icu_provider_blob", "icu_segmenter", + "indexmap 2.1.0", "kurbo", "lipsum", "log", @@ -3255,9 +3495,9 @@ dependencies = [ "smallvec", "syntect", "time", - "toml 0.8.0", + "toml 0.8.6", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typed-arena", "typst", "unicode-bidi", @@ -3268,7 +3508,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.10.1" +version = "0.11.0" dependencies = [ "anyhow", "async-compression", @@ -3281,7 +3521,7 @@ dependencies = [ "elsa", "futures", "if_chain", - "indexmap 2.0.0", + "indexmap 2.1.0", "internment", "itertools 0.11.0", "lazy_static", @@ -3308,6 +3548,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "typst", + "typst-ide", "typst-library", "typstfmt_lib", "walkdir", @@ -3315,13 +3556,13 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3330,7 +3571,7 @@ version = "0.7.0" source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "comemo", - "ecow", + "ecow 0.1.2", "once_cell", "serde", "tracing", @@ -3342,11 +3583,11 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.8.0" -source = "git+https://github.com/typst/typst.git?tag=v0.8.0#360cc9b9570f263d52530b98d0c93523e7bdb100" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" dependencies = [ "comemo", - "ecow", + "ecow 0.2.0", "once_cell", "serde", "tracing", @@ -3358,8 +3599,8 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.5" -source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.5#98b08f5ab033e657c8e81f95c86b111f4fd662a4" +version = "0.2.6" +source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.6#b45cab03ac76e621ef1174160d03c4f7637a82df" dependencies = [ "globmatch", "itertools 0.10.5", @@ -3386,6 +3627,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" dependencies = [ + "serde", "tinystr", ] @@ -3407,12 +3649,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" -[[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -3478,9 +3714,9 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" @@ -3502,9 +3738,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" dependencies = [ "base64", "log", @@ -3517,9 +3753,9 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" dependencies = [ "data-url", "flate2", @@ -3535,9 +3771,9 @@ dependencies = [ [[package]] name = "usvg-text-layout" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ "fontdb", "kurbo", @@ -3551,9 +3787,9 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" dependencies = [ "rctree", "strict-num", @@ -3567,6 +3803,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" + [[package]] name = "valuable" version = "0.1.0" @@ -3587,9 +3829,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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" @@ -3637,7 +3879,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3671,7 +3913,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3702,7 +3944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" dependencies = [ "smallvec", - "spin 0.9.8", + "spin", "wasmi_arena", "wasmi_core", "wasmparser-nostd", @@ -3789,10 +4031,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -3865,9 +4107,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] @@ -3884,9 +4126,18 @@ dependencies = [ [[package]] name = "writeable" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] [[package]] name = "xattr" @@ -3899,9 +4150,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -3911,9 +4162,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd742bbbb930fc972b28bf66b7546dfbc7bb9a4c7924299df0ae6a5641fcadf" +checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" [[package]] name = "yaml-rust" @@ -3926,9 +4177,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" dependencies = [ "serde", "stable_deref_trait", @@ -3938,42 +4189,42 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af46c169923ed7516eef0aa32b56d2651b229f57458ebe46b49ddd6efef5b7a2" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] name = "zerofrom" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae7c1f7d4b8eafce526bc0771449ddc2f250881ae31c50d22c032b5a1c499" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] name = "zerovec" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" dependencies = [ "serde", "yoke", @@ -3983,12 +4234,11 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486558732d5dde10d0f8cb2936507c1bb21bc539d924c949baf5f36a58e51bac" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.38", ] diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix index 24d9dfcb00..5cd6b423aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -7,31 +7,37 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.10.1"; + # Please update the corresponding vscode extension when updating + # this derivation. + version = "0.11.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-ZQLxZzWVGwFtU68ASlzBDMz8RHrA0h925u6UDk7vPe4="; + hash = "sha256-L0d+fDCLxU/XHC99VlIcZdiO3RohtWfoRnUPGIHodcc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA="; + "typst-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.5" = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag="; + "typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; }; }; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; checkFlags = [ # requires internet access "--skip=workspace::package::external::remote_repo::test::full_download" + ] ++ lib.optionals stdenv.isDarwin [ + # both tests fail on darwin with 'Attempted to create a NULL object.' + "--skip=workspace::fs::local::test::read" + "--skip=workspace::package::external::manager::test::local_package" ]; # workspace::package::external::manager::test::local_package tries to access the data directory diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix index 4b27311671..2e31b44398 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix @@ -17,17 +17,17 @@ 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 = "2023-08-29"; - GIT_VERSION = "v0.0-3410-g398a8505"; + GIT_DATE = "2023-10-26"; + GIT_VERSION = "v0.0-3428-gcfcbb82b"; # 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))); src = fetchFromGitHub { owner = "chipsalliance"; - repo = "verible"; - rev = "${GIT_VERSION}"; - sha256 = "sha256-qi//Dssgg5ITrL5jCpZXpSrhSm2xCqe53D9ctK7SQoU="; + repo = "verible"; + rev = "${GIT_VERSION}"; + hash = "sha256-snWhOuGyAdtdJDMttcbEjlkwPUO1mdR9vuro0tZt+Z8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 3499d54ce0..1c71adeceb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.66.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-tVeGfPm5WdZjARp7n4WD3YQzMUWA3M3TJo2oVivtkiA="; + hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM="; }; - cargoHash = "sha256-bXz216QvTpBuUNAi5sF0Lga+1ubjlokqPglUyAVXThg="; + cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 5f6cf13b54..aa77056416 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "vscode-langservers-extracted"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "hrsh7th"; repo = pname; rev = "v${version}"; - hash = "sha256-RLRDEHfEJ2ckn0HTMu0WbMK/o9W20Xwm+XI6kCq57u8="; + hash = "sha256-sGnxmEQ0J74zNbhRpsgF/cYoXwn4jh9yBVjk6UiUdK0="; }; - npmDepsHash = "sha256-DhajWr+O0zgJALr7I/Nc5GmkOsa9QXfAQpZCaULV47M="; + npmDepsHash = "sha256-LFWC87Ahvjf2moijayFze1Jk0TmTc7rOUd/s489PHro="; buildPhase = let diff --git a/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix index 6144b533d6..411660a1f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/librarian-puppet-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "librarian-puppet-go"; - version = "0.3.9"; + version = "0.3.10"; goPackagePath = "github.com/tmtk75/librarian-puppet-go"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tmtk75"; repo = "librarian-puppet-go"; rev = "v${version}"; - sha256 = "19x2hz3b8xkhy2nkyjg6s4qvs55mh84fvjwp157a86dmxwkdf45y"; + sha256 = "sha256-IEhqyowyLTXDEhg4nkix1N45S0+k+RngMP6TsaZQ4mI="; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix index 1dce8caeeb..9bc67375e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, tex}: +{lib, stdenv, fetchurl, texliveMedium}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JVqPYkYPXBT0xLNWuW4DV6N6ZlKuBYQGT46frhnpU64="; }; - buildInputs = [ tex ]; + buildInputs = [ texliveMedium ]; patchPhase = '' sed -ie 's|nuweb -r|./nuweb -r|' Makefile diff --git a/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix index 9bbf37d579..7a6ae03aea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ls-lint"; - version = "2.1.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "loeffel-io"; repo = "ls-lint"; rev = "v${version}"; - sha256 = "sha256-AlIXZ2tf1pFj6LVz8kyCFq0dUEPBm+0ejQH7VXm4H+M="; + sha256 = "sha256-twXaiPccc6DZdzKdvB+BzHbRuwgDy05C3jNg7Ur8yrA="; }; - vendorHash = "sha256-/6Y20AvhUShaE1sNTccB62x8YkVLLjhl6fg5oY4gL4I="; + vendorHash = "sha256-uyNOcIjrICr76Q8izXGRMhofDcjQrzbB/ISHTqRY5fI="; meta = with lib; { description = "An extremely fast file and directory name linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix b/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix index cdfb4f0d5d..b7ab1f95de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix @@ -1,38 +1,20 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "lurk"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jakwai01"; repo = pname; rev = "v${version}"; - hash = "sha256-D/wJAmlc6OUuD8kSfGevG+UoPKy58X0lObL7mjiBG+c="; + hash = "sha256-7Yi77IsP/tmzrTvBVgIj2+fOXYKCT59pILeEuGuk4Y4="; }; - cargoHash = "sha256-PFR6jMAvEybT/XOfLrv21F8ZxSX0BZDiEFtgQL5fL18="; - - cargoPatches = [ - # update the version to 0.3.3 - (fetchpatch { - name = "chore-prepare-release.patch"; - url = "https://github.com/JakWai01/lurk/commit/cb4355674159255ac4186283a93de294de057d1b.patch"; - hash = "sha256-N+/8AGEToEqhkQ6BYGQP279foZbt6DzUBmAUaHm9hW4="; - }) - ]; - - patches = [ - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/JakWai01/lurk/commit/87eb4aa8bf9a551b24cec2146699cb2c22d62019.patch"; - hash = "sha256-m44m1338VODX+HGEVMLozKfVvXsQxvLIpo28VBK//vM="; - }) - ]; + cargoHash = "sha256-Cvtg9msoYkIIlaUw4hxWy2wSrE1uORR/2R2Geq4SI4w="; meta = with lib; { description = "A simple and pretty alternative to strace"; diff --git a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix index 6e15d4aa6b..45ef51945d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2023-07-25"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-DxubrZAj2MOF7gUMDl8rW1jGHaw70KGe5Nit1SBQBW8="; + sha256 = "sha256-dAyZIqc9YGuhGydT17s4D1q4CKH6uK5CYW0c0ZJwJAI="; }; projectFile = "Marksman/Marksman.fsproj"; @@ -52,7 +52,7 @@ buildDotnetModule rec { ''; homepage = "https://github.com/artempyanykh/marksman"; license = licenses.mit; - maintainers = with maintainers; [ stasjok ]; + maintainers = with maintainers; [ stasjok plusgut ]; platforms = dotnet-sdk.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/marksman/deps.nix b/third_party/nixpkgs/pkgs/development/tools/marksman/deps.nix index 300fa38e1b..b6e14d84e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/marksman/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/marksman/deps.nix @@ -10,7 +10,7 @@ (fetchNuGet { pname = "FSharp.SystemCommandLine"; version = "0.13.0-beta4"; sha256 = "10h58gqfdg2hdy9laf6ry8djfysrdmwlj9n0d7ydwyszb6zgnd20"; }) (fetchNuGet { pname = "FSharpPlus"; version = "1.2.4"; sha256 = "08yg36hgmglll053kkqkkadcfcrdd37qqwqwfwzyrmyqp1mw4mj2"; }) (fetchNuGet { pname = "Glob"; version = "1.1.9"; sha256 = "1q72haq20bf414xwdabsx30lp5c55fjh7hav6r9sp2cqhmva0y53"; }) - (fetchNuGet { pname = "Markdig"; version = "0.30.2"; sha256 = "0m4vjg3kzvknk376yfzazr6i6qkb833s63857a5xcym0l04chlha"; }) + (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/mask/default.nix b/third_party/nixpkgs/pkgs/development/tools/mask/default.nix index 0856a83738..e936535779 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mask/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mask/default.nix @@ -1,17 +1,17 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mPnykI3scTBzGjDa8nawWYRvZBkq74/t5WMbMbs3zVE="; + rev = "mask/${version}"; + hash = "sha256-pi8dD4Fko39yn1maXNOqm+aDWYJhxE/b4kH7H18InbY="; }; - cargoSha256 = "sha256-h58MA3F4UA4gp64UPnK6Tvlvr4PFvrVKmjp48lZjH68="; + cargoHash = "sha256-zbvYSTR0m7S4m0WFQrCqCrMXqMcDW2oIMznD5PDdeHE="; # tests require mask to be installed doCheck = false; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A CLI task runner defined by a simple markdown file"; homepage = "https://github.com/jacobdeichert/mask"; - changelog = "https://github.com/jacobdeichert/mask/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jacobdeichert/mask/blob/mask/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix index 52811b02c4..d41bf13604 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-aZzz8KVvvhpdHAQ1QzSafc9Byu7bB9SobFjSad5RVPg="; + hash = "sha256-66RbqwAeBA0HKT+1CD5+O5W40NrU7jlzLOG45Lpn+J0="; }; - vendorHash = "sha256-1pVf5d05zuKmFHTdKnuDKbvKggVea0Z8vppj/hOw1rs="; + vendorHash = "sha256-ls6CO5fwmD4JkxuoToeY4PyfPs65ACDrZhmbY0zNgT4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 2e61e9a771..70ebddff11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.1.1"; + version = "4.1.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-GlNyzR2kRmeGyheaRcz+CPEh11atHeeVn/Rwn+q1gRA="; + sha256 = "sha256-9d46sXrG9tYhtAoIGzy7JYnt+wfS4vtGu81MS4W9c1s="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 4cd859ed3f..567e93efd6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.52"; + version = "0.2.54"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mw0Ul6m8mgx2I3ExoDs5luN4PQXAI0NADTSYt+DFCs8="; + hash = "sha256-1DYK47pucEh423ySyBy3hwi6QeB/nNQvwapEJZYRX8E="; }; - vendorHash = "sha256-WoeJ4yB3bTx6I+Ga5X7ZhPfjw3NERp1v/ot5pPsYYLw="; + vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automake/builder.sh b/third_party/nixpkgs/pkgs/development/tools/misc/automake/builder.sh index 0cb1d5d61e..b08e7251e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/automake/builder.sh +++ b/third_party/nixpkgs/pkgs/development/tools/misc/automake/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 1e6c2b94f2..8fa555cf80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -12,42 +12,42 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.90.0"; + version = "1.91.0"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-Cq44SJXe8B/RtVGFDDljDBPVs85ELa1K8B7q1u5SEug="; - "8.2" = "sha256-YZ6rEYfssG8bF40wpEGvW5zb1aoIpo3pM+AEZ7yU74E="; + "8.1" = "sha256-PIpfTeHWVO8MJ4+c8o1iC477M+HXzuHbnwv1EkYkQHY="; + "8.2" = "sha256-wEdEFooXlJTeuVfMeX3OI3uKJ5Acj1ZqmVYt6fyGQXI="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-Gc0kin1z4WLT67lQjfQb1yxZ45bo/q9KV4RQN5zmnTc="; - "8.2" = "sha256-46OF4GMwHFG1CPQJfHI7OrMYGw2hJXgRIFLKcnaKnaI="; + "8.1" = "sha256-yEfWtUegN4HVRS95eY3vYA97iGAaY2gxoGtb9DZpXhY="; + "8.2" = "sha256-FGbgozRmniS/rtAcvPiA+w8miauc8Gr/np5NdP4iGT8="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-rV4YoqGOOQWK2WR5RY7SQ/xePpD54vA4+Km8rFNpv4g="; - "8.2" = "sha256-9NuJfa/n3/tyiSn7lcrOUhD+eYUuanJsrzVAJ9cYWhs="; + "8.1" = "sha256-zfVx3NGkjhZK7YjTi8FBJyrn++Ub7vlFDCmiY/7F/yE="; + "8.2" = "sha256-gMoBIsvnR6lQMT4IaHWJEp+GbU/Yiid+pmDejR/vAUA="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-G9cep5apYGFEdTOka3QClteCmEUktLtV8I+oIBzsZ9U="; - "8.2" = "sha256-3wGiekRaGUEHdTpUniPz0Nay2AM0DOQfgFUAC1ezBCs="; + "8.1" = "sha256-UDd4knBfgdUriJ6N1cfka/iCIjaWiOgIbrq6kNkYUjA="; + "8.2" = "sha256-BZzFVLfebKzuSDz2DQEwd9HOxJ1nZSNmQHpayiGe8qI="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-BKdngfG78U0lHa7MTW1kndeM2umyEn7ns5T4mglLWnA="; - "8.2" = "sha256-02kXdXqj8HuJG0NblkwYPvgiAmbxC19X0xQ7XU2anhg="; + "8.1" = "sha256-51w3Ji8R6ulloZuTPHu/0gkYiq33H1tMOwrGe2DWtRI="; + "8.2" = "sha256-0p6CNKjhdD3L6x6gtMKLTKrHUO4LMwXpVU7hR32ejMI="; }; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 0faf885d60..218444d1a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -86,11 +86,19 @@ stdenv.mkDerivation (finalAttrs: { }; inherit (unwrappedCC) lib; nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + # Unwrapped clang does not have a targetPrefix because it is multi-target + # target is decided with argv0. + buildCommand = let + targetPrefix = if unwrappedCC.isClang or false + then + "" + else + (lib.optionalString (unwrappedCC ? targetConfig && unwrappedCC.targetConfig != null && unwrappedCC.targetConfig != "") "${unwrappedCC.targetConfig}-"); + in '' mkdir -p $out/bin wrap() { - local cname="$1" + local cname="${targetPrefix}$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ --run ${lib.escapeShellArg extraConfig} \ @@ -127,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }"; license = licenses.gpl3Plus; + mainProgram = "ccache"; maintainers = with maintainers; [ kira-bruneau r-burns ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 5fb7386b08..7346469804 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.29041"; + version = "0.1.29314"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEprN5I9ZWz4xTVdl4qZQHfbLbp4Khh63m37ZBq8pgA="; + sha256 = "sha256-RJ4WzKGmdfUHJASusVZqq8JKJlnrxxzV4IaZYuK8JTg="; }; - vendorHash = "sha256-EcQ5/zp041P4qi8nenrWuVItV3mFI3EHHRhKm/tqpfA="; + vendorHash = "sha256-eW36aQSK4W/HwTCPmeHIX53QN229KZhgGTb3oU10IcY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix index 9c2641487d..6d2bc2b009 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -4,32 +4,33 @@ , cmake-format , pygls , cmake -, pdm-pep517 +, pdm-backend , pytest-datadir , pytestCheckHook +, pythonOlder }: buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "regen100"; repo = "cmake-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-ExEAi47hxxEJeoT3FCwpRwJrf3URnI47/5FDL7fS5sY="; + hash = "sha256-7AlF+FqhZR+6lLsR1dxAGHd/GU+mB3ojYLDXVm7Il4M="; }; - PDM_PEP517_SCM_VERSION = version; - patches = [ # Test timeouts occasionally cause the build to fail ./disable-test-timeouts.patch ]; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -44,6 +45,16 @@ buildPythonApplication rec { pytestCheckHook ]; + # version.py generated by pdm, no idea why it's not present in test phase + # https://github.com/regen100/cmake-language-server/blob/68bbc8187b6110a75f498647af7c44df790ffa87/pyproject.toml#L35-L36 + preCheck = '' + echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py + ''; + + postCheck = '' + rm cmake_language_server/version.py + ''; + dontUseCmakeConfigure = true; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index f69b36fc4b..81cf9c120e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-zNYNwPPVlsvQiHy28rWB7OlnriJVktoFrDkJaIO9z8E="; + hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; }; - cargoHash = "sha256-BkflZ/d4TAZjjkQB5f0+rL4Zt7uWBLM3gM2UNKYZz+Q="; + cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index bae63abbb7..56bd85b772 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "cvise"; - version = "2.8.0"; + version = "2.9.0"; format = "other"; src = fetchFromGitHub { owner = "marxin"; repo = "cvise"; rev = "refs/tags/v${version}"; - hash = "sha256-9HFCFgpRXqefFJLulwvi6nx0fl0G6IXI9gSinekJXRU="; + hash = "sha256-4LEKVh3jNU3xOq75+IQezjhbL/6uAGQ3r0Au2cxx1WA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index f379844fa2..6737e791f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -13,23 +13,24 @@ let sass-language = fetchFromGitHub { owner = "sass"; repo = "sass"; - rev = "refs/tags/embedded-protocol-2.2.0"; - hash = "sha256-rSjhQZnLL4UXhp8rBIcaEtQyE81utTfljJTkyhQW5wA="; + rev = "refs/tags/embedded-protocol-2.3.0"; + hash = "sha256-J2heASfIwj4lxjsRs/0zRHSaF2tij9bO7IgXp0u/eiI="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-Q7pXYcEOqROxVMw5irB23i44PwhFz7YWBVJcftzu998="; + hash = "sha256-kn3cwi1k2CkzbS+Q/JaYy8Nq3Ej0GyWifG1Bq5ZEVHA="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-ypKiiLW4Zr0rhTLTXzOoRqZsFC3nGzqUhPFdKKIWDmk="; + depsListFile = ./deps.json; + vendorHash = "sha256-PQvY+qFXovSXH5wuc60wCrt5RiooKcaGKYzbjKSvqso="; nativeBuildInputs = [ buf diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/deps.json b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/deps.json new file mode 100644 index 0000000000..75548f50d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dart-sass/deps.json @@ -0,0 +1,930 @@ +[ + { + "name": "sass", + "version": "1.69.0", + "kind": "root", + "source": "root", + "dependencies": [ + "args", + "async", + "charcode", + "cli_pkg", + "cli_repl", + "collection", + "http", + "js", + "meta", + "native_synchronization", + "node_interop", + "package_config", + "path", + "pool", + "protobuf", + "pub_semver", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "stream_transform", + "string_scanner", + "term_glyph", + "typed_data", + "watcher", + "analyzer", + "archive", + "crypto", + "dart_style", + "dartdoc", + "grinder", + "node_preamble", + "lints", + "protoc_plugin", + "pub_api_client", + "pubspec_parse", + "test", + "test_descriptor", + "test_process", + "yaml", + "cli_util" + ] + }, + { + "name": "cli_util", + "version": "0.4.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "meta", + "version": "1.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.18.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_process", + "version": "2.1.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "path", + "test" + ] + }, + { + "name": "test", + "version": "1.24.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "matcher", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "test_core", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml" + ] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "stream_channel", + "version": "2.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "test_core", + "version": "0.5.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "vm_service", + "yaml" + ] + }, + { + "name": "vm_service", + "version": "11.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_api", + "version": "0.6.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stack_trace", + "version": "1.11.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.13.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "61.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "test_descriptor", + "version": "2.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "matcher", + "meta", + "path", + "term_glyph", + "test" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "pub_api_client", + "version": "2.6.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "collection", + "http", + "oauth2", + "path", + "pubspec" + ] + }, + { + "name": "pubspec", + "version": "2.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "pub_semver", + "yaml", + "uri" + ] + }, + { + "name": "uri", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "oauth2", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "crypto", + "http", + "http_parser" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "protoc_plugin", + "version": "21.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "fixnum", + "path", + "protobuf" + ] + }, + { + "name": "protobuf", + "version": "3.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "grinder", + "version": "0.9.4", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "cli_util", + "glob", + "meta", + "path", + "collection" + ] + }, + { + "name": "dartdoc", + "version": "6.3.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "cli_util", + "collection", + "crypto", + "glob", + "html", + "logging", + "markdown", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "yaml" + ] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "html", + "version": "0.15.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "csslib", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "dart_style", + "version": "2.3.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "archive", + "version": "3.3.9", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "node_interop", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "js" + ] + }, + { + "name": "native_synchronization", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "cli_repl", + "version": "0.2.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "js" + ] + }, + { + "name": "cli_pkg", + "version": "2.5.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "archive", + "async", + "charcode", + "cli_util", + "collection", + "crypto", + "glob", + "grinder", + "http", + "js", + "meta", + "node_interop", + "node_preamble", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "retry", + "string_scanner", + "test", + "test_process", + "xml", + "yaml" + ] + }, + { + "name": "xml", + "version": "6.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "6.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "retry", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "charcode", + "version": "1.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index 4f657ff3b6..13a689c61c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -1,17 +1,19 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, devspace }: buildGoModule rec { pname = "devspace"; - version = "6.3.3"; + version = "6.3.4"; src = fetchFromGitHub { - owner = "loft-sh"; + owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU="; + hash = "sha256-AKEa9LDe1bLJxJH5k4axALoWkTh+bkBviCpof7x7+fY="; }; vendorHash = null; @@ -26,10 +28,14 @@ buildGoModule rec { # TODO: add a nixosTest to be able to perform the package check doCheck = false; + passthru.tests.version = testers.testVersion { + package = devspace; + }; + meta = with lib; { - description = "DevSpace is an open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; + description = "An open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; homepage = "https://devspace.sh/"; - changelog = "https://github.com/loft-sh/devspace/releases/tag/v${version}"; + changelog = "https://github.com/devspace-sh/devspace/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ darkonion0 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix index bf7be5dda7..8322c7e2b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/doq/default.nix @@ -5,16 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "doq"; - version = "0.9.1"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "heavenshell"; repo = "py-doq"; rev = "refs/tags/${version}"; - hash = "sha256-6ff7R/2Jo4jYm1hA70yopjklpKIMWlj7DH9eKxOlfgU="; + hash = "sha256-iVu+5o8pZ5OhIzNItWbzUzqC3VQ6HCD7nP5gW/PVAMM="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-generate + ]; + propagatedBuildInputs = with python3.pkgs; [ jinja2 parso @@ -23,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ parameterized - unittestCheckHook + pytestCheckHook ]; pythonImportsCheck = [ "doq" ]; @@ -34,5 +39,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/heavenshell/py-doq/releases/tag/${src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ natsukium ]; + mainProgram = "doq"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index a548f599ce..57e7e79dfd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - hash = "sha256-TycKc6Zgf9QFTH3lfNC+/O52cp2xhKsKflxuQTac794="; + hash = "sha256-ktZeBj5feJMf4XR4hybKdNrNCIrQD6KPetZffAZjwqI="; }; - vendorHash = "sha256-S93ZvC92V9nrBicEv1yQ3DEuf1FmxtvFoKPR15e8VmA="; + vendorHash = "sha256-dhvRZ+AYSmSzHsf3yOYBSvZbw7dfwQiILu+VSUX8N3s="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 83a30f3e6f..d61cf96161 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.189"; + version = "0.190"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ob2PGjOOK3zUq8P/EaDt3G5pD2lXildHjYF5tBSHCMg="; + hash = "sha256-jgCjqbXwS8HcJzroYoHS0m7UEgILOR/8wjGY8QIx1pI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix index d24d4b66d6..6420d56bba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gengetopt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { 'set +o posix' ''; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + meta = { description = "Command-line option parser generator"; 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 e86577ba85..e569009f27 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.2"; + version = "2.0.3"; vendorHash = null; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "sha256-C+MaDtvfPYABSC2qoMfZVHe2xX/WtDjp6v/ayFCIGac="; + sha256 = "sha256-bgAuN+pF9JekCQ/Eg4ph3WDv3RP8MB/10GDp1JMp9Kg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix index 85f0f08aeb..9a8384c01f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-gpTJObgLbH+4fBnBrI6YA3Y4ENuGHV6xP7oHbSFQyEw="; + sha256 = "sha256-cSQDQlc8LgKc9wfJIzXcuaC2GJf46wSwYnmIwMo5ra0="; }; - vendorHash = "sha256-FuUxCm/p8ke55kMjsmHwZTJMWO4cQZZ/B1RDpdxUr8U="; + vendorHash = "sha256-laAqRfu1PIheoGksiM3aZHUdmLpDGsTGBmoenh7Yh9w="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch new file mode 100644 index 0000000000..0c8e6ae434 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/crypt-passphrase-argon2-fix-output-len.patch @@ -0,0 +1,28 @@ +From 6a5fb9efaea35ca29836371307f5083576f421ab Mon Sep 17 00:00:00 2001 +From: Stig Palmquist +Date: Fri, 20 Oct 2023 00:09:28 +0200 +Subject: [PATCH] Set output length of C::P::Argon2 hashes to 16 + +Since the default lengths in Crypt::Passphrase::Argon2 changed from 16 +to 32 in in 0.009, some tests that expected the passphrase to be +unchanged started failing. +--- + src/lib/Hydra/Schema/Result/Users.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/Hydra/Schema/Result/Users.pm b/src/lib/Hydra/Schema/Result/Users.pm +index b3de6543..c28ae931 100644 +--- a/src/lib/Hydra/Schema/Result/Users.pm ++++ b/src/lib/Hydra/Schema/Result/Users.pm +@@ -216,7 +216,7 @@ sub json_hint { + + sub _authenticator() { + my $authenticator = Crypt::Passphrase->new( +- encoder => 'Argon2', ++ encoder => { module => 'Argon2', output_size => 16 }, + validators => [ + (sub { + my ($password, $hash) = @_; +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix index 410bad3525..26102f36da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix @@ -123,13 +123,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-08-23"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "00d30874da759eb0f44f446415b2469920ff41b5"; - sha256 = "sha256-e+68WCN1e1h2rf1pmwNNukTt5EBtF9KQNXhqJtoyJzo="; + rev = "33f8a36736ea52d0cc31b947dc7e500134866a92"; + hash = "sha256-ovt2GZQ4Ia+q6D0XboBNIdXrzy1rWC52UYzxmcMlgYk="; }; buildInputs = [ @@ -205,6 +205,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + ./crypt-passphrase-argon2-fix-output-len.patch + ]; + postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/indent/darwin.patch b/third_party/nixpkgs/pkgs/development/tools/misc/indent/darwin.patch deleted file mode 100644 index 5458a0d93b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/indent/darwin.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/config.h.in b/config.h.in -index 07e6fce..0c57e2a 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -432,8 +432,8 @@ - # endif - # define _GL_EXTERN_INLINE extern - #else --# define _GL_INLINE static _GL_UNUSED --# define _GL_EXTERN_INLINE static _GL_UNUSED -+# define _GL_INLINE static -+# define _GL_EXTERN_INLINE static - #endif - - #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix index a94a907c10..8e6ba9b70c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/indent/default.nix @@ -1,20 +1,47 @@ -{ lib, stdenv, fetchurl, texinfo, buildPackages, pkgsStatic }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, libintl +, texinfo +, buildPackages +, pkgsStatic +}: stdenv.mkDerivation rec { pname = "indent"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; + hash = "sha256-nmRjT8TOZ5eyBLy4iXzhT90KtIyldpb3h2fFnK5XgJU="; }; - patches = [ ./darwin.patch ]; + patches = [ + (fetchpatch { + name = "CVE-2023-40305.part-1.patch"; + url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=df4ab2d19e247d059e0025789ba513418073ab6f"; + hash = "sha256-OLXBlYTdEuFK8SIsyC5Xr/hHWlvXiRqY2h79w+H5pGk="; + }) + (fetchpatch { + name = "CVE-2023-40305.part-2.patch"; + url = "https://git.savannah.gnu.org/cgit/indent.git/patch/?id=2685cc0bef0200733b634932ea7399b6cf91b6d7"; + hash = "sha256-t+QF7N1aqQ28J2O8esZ2bc5K042cUuZR4MeMeuWIgPw="; + }) + ]; + + # avoid https://savannah.gnu.org/bugs/?64751 + postPatch = '' + sed -E -i '/output\/else-comment-2-br(-ce)?.c/d' regression/TEST + sed -E -i 's/else-comment-2-br(-ce)?.c//g' regression/TEST + ''; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; strictDeps = true; nativeBuildInputs = [ texinfo ]; - pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling + buildInputs = [ libintl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration" @@ -23,6 +50,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + doCheck = true; + passthru.tests.static = pkgsStatic.indent; meta = { homepage = "https://www.gnu.org/software/indent/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix index fd25c767ab..a724d67a1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "iozone"; - version = "3.493"; + version = "3.506"; src = fetchurl { - url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tgz"; - hash = "sha256-Y0wSNgC0u0LoJ0g/oVsq+uba2ikHt4SxTgFBWTPUMZg="; + url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; + hash = "sha256-EUzlwHGHO5ose6bnPQXV735mVkOSrL/NwLMmHbEPy+c="; }; license = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix deleted file mode 100644 index 8b38246d67..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: - -stdenv.mkDerivation rec { - pname = "kconfig-frontends"; - version = "4.11.0.1"; - - src = fetchurl { - sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; - url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; - }; - - nativeBuildInputs = [ bison flex gperf pkg-config ]; - buildInputs = [ bash ncurses python3 ]; - - strictDeps = true; - - configureFlags = [ - "--enable-frontends=conf,mconf,nconf" - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; - - meta = with lib; { - description = "Out of Linux tree packaging of the kconfig infrastructure"; - longDescription = '' - Configuration language and system for the Linux kernel and other - projects. Features simple syntax and grammar, limited yet adequate option - types, simple organization of options, and direct and reverse - dependencies. - ''; - homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbe ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix index 370aebb3ac..5b326beb1e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/kool/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kool"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-Gtw+47EQVPxiW9xjY/cWlE4aJ1aYYhpvsVQzt0EnI8I="; + hash = "sha256-YVgUKA7bMcncZDYaxaN2kCbE3JUmM9aM3GoQkOXEWpA="; }; - vendorHash = "sha256-8t+OZB9jrlOVHLURPmtz0ent6COEOVMFfObe2LH1jRM="; + vendorHash = "sha256-zsrqppHl7Z8o+J1SzZnv1jOdPO04JaF1K38a//+uAxU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index 1315469961..b3660f7cad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.10"; + version = "2.13.11"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5dEJXsEyJWXzjxSTRvcZZ0lsKB6sxR7Fx3mUuFDn0zU="; + sha256 = "sha256-rFuu75+mkJNrHKAezRdC2nYsLAhRH/G06SOTjZTQ+Xk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix index 3bace16de5..0c19b59c5c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.1"; - sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; + version = "2.13.6"; + sha256 = "sha256-5+BFlt1zrHqpnifNAA+UnbsP7VG9KQmfmwiiXB3wztU="; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 941a582cea..20acab5a85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,13 +2,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-02-26"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919"; - sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo="; + rev = "4240b25b95d7165cde66fc2acaf5a0f9ad40fd0c"; + sha256 = "sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk="; }; patches = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix index 80ffef0044..6aabcbffbb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "n98-magerun2"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "https://github.com/netz98/n98-magerun2/releases/download/${finalAttrs.version}/n98-magerun2.phar"; - hash = "sha256-DE5q1zoWZ4gJSs5JM5cr157oh5ufD1gaNt9X9vtuW/c="; + hash = "sha256-w+58TTyoS44Ouaz6KFIJLhSl/UeF1I7cSznlZH6fLXw="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 5f6113343f..cfcd86f9dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.5.21"; + version = "1.5.125"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${version}"; - sha256 = "sha256-XVvGsHltlA3h9hd3C88G3s2wIZ1EVM6DmvdiwD82vTw="; + sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index c5e217244f..37593e0090 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.14"; + version = "1.12.21"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-4v+fDmDnmoAZimf63nSCqUp0y+a5UKQBxNWSNp64XE4="; + hash = "sha256-SjA5J9fILU/FBNXRS/cvGZVWAK2qqOyMsd6wC/CJYaE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix index 6d52dcaff6..3fe98a6f43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/orogene/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix index 6f554e6d35..8af08bd831 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ptags/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ptags"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "dalance"; repo = "ptags"; rev = "v${version}"; - sha256 = "sha256-hFHzNdTX3nw2OwRxk9lKrt/YpaBXwi5aE/Qn3W9PRf4="; + sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys="; }; - cargoSha256 = "sha256-cFezB7uwUznC/8NXJNrBqP0lf0sXAQBoGksXFOGrUIg="; + cargoHash = "sha256-Se4q4G3hzXIHHSY2YxeRHxU6+wnqR9bfrIQSOagFYZE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix index e6bac18d98..5a1c7d7314 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/regex-cli/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "regex-cli"; - version = "0.1.0"; + version = "0.1.1"; src = fetchCrate { inherit pname version; - hash = "sha256-4l12Eaab1G3SP3Srxt3UR9MCRlLm0KDPx/Z2rQpSQR0="; + hash = "sha256-i+3HluKbR+5e2Nd0E0Xy+mwsC9x3+21rFdCNmII8HsM="; }; - cargoHash = "sha256-fAIYWzfzq/VuBc684SG7p365uudX9M/TtVdMahyrmdk="; + cargoHash = "sha256-u6Gaeo9XDcyxZwBt67IF1X7rr4vR9jIrzr8keHGU88w="; meta = with lib; { description = "A command line tool for debugging, ad hoc benchmarking and generating regular expressions"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix index fc9b48793f..76d6e4d429 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-gAoxWdczeaN4VqeQY0qJeLK8aABGhuwXf41QFKUxAG0="; + hash = "sha256-V7Ir1FGKjKYu/J2KSBaDwLdH/MHTS+aChHWcrVTu4dY="; }; - cargoHash = "sha256-UXPVqc4RNIFKx0f/BPCfkJxilioXbRZSAgqQv1MzK7k="; + cargoHash = "sha256-eiYUlHA4vK/zhfULwekt3dRVx//u5mrQ6tRdQh0tmTc="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix index b11573355a..3795476c3e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/runme/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , installShellFiles , nodejs +, python3 , runtimeShell , stdenv , testers @@ -11,16 +12,16 @@ buildGo121Module rec { pname = "runme"; - version = "1.7.6"; + version = "1.7.8"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-gYaC1ROvW4wFrOKt1Wjl/ExhWX0ZQXHW6n6N70tXa+E="; + hash = "sha256-ZM8gdZ26XAlC+j6U0+oQJIb+5gOGFUAYHPP82kA1ogU="; }; - vendorHash = "sha256-/eofPpXmfpc7Vjz97hjKXH/Fl/EAk0zrnI279iit7MI="; + vendorHash = "sha256-nKH4hT0J9QfrDdvovu/XNxU4PtZYKkfqEBiCTNLWyRA="; nativeBuildInputs = [ installShellFiles @@ -28,6 +29,7 @@ buildGo121Module rec { nativeCheckInputs = [ nodejs + python3 ]; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix index 0050d026fc..c30ace5d8c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rustywind/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-wPr+BNj3/YP+g0OkqkGSN1X8g/p3xDRcHvdDMAOP9Cc="; + hash = "sha256-3VG3EIcNp1fcNctrQO+mcGkAObHYPZQGdU83mi7WxPs="; }; - cargoHash = "sha256-frBE3pJvQdntt48/RHz3F2qqrgmXFR//5CyCfdcSfik="; + cargoHash = "sha256-hqGhh3YZ8Pz0hhC+HNdwc7PZVzGeMZqmctVjbQx7SQo="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index bd12125d83..c15e7f6451 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.9"; + version = "2.4.12"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-zM5XztFv+A7cNMqNPGAO5i0B45w6AMyRL4OR+tG03JY="; + hash = "sha256-QqGtozLZtrS5UgnLmsKWxqbcTykLhlossVxuN4WNYzo="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index f268a95614..138765bb22 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.5.4"; + version = "0.6.0"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-CaZM8c1dref98VL240PEUQE8XtWAvVlQSGnPQspg+jw="; + sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; }; - cargoSha256 = "sha256-F4lnE5ig3UnZJOdxpnGLesDP3rgEOFzZO0WGQ8mtj+o="; + cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix index 36fb940f19..d960292641 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/scip/default.nix @@ -1,33 +1,22 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , testers , scip }: buildGoModule rec { pname = "scip"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; rev = "v${version}"; - hash = "sha256-tcnBv+dxuLD/ixeOLGrHu2UVfOnrfANjyaRzW5oDC94="; + hash = "sha256-lZ3W2Z69P5QQN+PgF9+Apj/uEXWaTS+5QOg17m1mGPU="; }; - vendorHash = "sha256-+IR3fc6tvSwPGDZ4DxrE48Ii3azcT0LMmID1LRAu5g8="; - - patches = [ - # update documentation to fix broken test - # https://github.com/sourcegraph/scip/pull/174 - (fetchpatch { - name = "test-fix-out-of-sync-documentation.patch"; - url = "https://github.com/sourcegraph/scip/commit/7450b7701637956d4ae6669338c808234f7a7bfa.patch"; - hash = "sha256-Y5nAVHyy430xdN89ohA8XAssNdSSPq4y7QaesN48jVs="; - }) - ]; + vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ="; ldflags = [ "-s" @@ -35,8 +24,10 @@ buildGoModule rec { "-X=main.Reproducible=true" ]; - postInstall = '' - mv $out/bin/{cmd,scip} + # update documentation to fix broken test + postPatch = '' + substituteInPlace docs/CLI.md \ + --replace 0.3.0 0.3.1 ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix index 028f2f8d50..36145a05e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.1.1"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0="; + sha256 = "sha256-ikOKpQHMLPCC2IfqWvW0I1auiCdyIZZMu6nMGle/bE0="; }; - cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo="; + cargoHash = "sha256-tprtlG/M2ItE7Ay/9QWrZQHdVEPYD9hDJ+uPR8pq1Xk="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 258e1e3304..591eaeaa1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.5"; + version = "6.6"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-37BRcCOJ4ZeaFRiStZAa/J6Tu8HHDYTJBq3jIkypGYA="; + sha256 = "sha256-QhtBhsBrcFFj5k3IXycevc9nZgr4ZnKDFH1ehZ/IqWw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite platforms = platforms.linux; maintainers = with maintainers; [ globin ma27 qyliss ]; + mainProgram = "strace"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 9e67586220..81ef5745c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.32.0"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-GZZUqTs0CXWYJs6R2Iy0TkAO1FJ/b60UTNVWq0n0bgo="; + hash = "sha256-uvSAqk9LE0NbOWn2rcygDu7Hl28Wu3KkM5UhI4aocGo="; }; - vendorHash = "sha256-z/7WQKoUNaugtDuvCjurUM6BgKYLt3nJMg8pnkj+Wsg="; + vendorHash = "sha256-xoyassGp//8YXG/B1e3kW96UvltQLa662ZlH9/CMzm0="; ldflags = [ "-s" "-w" ]; 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 e33a288286..1948b6f876 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.10.0"; + version = "5.11.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-MTWaGgDIDo3CaRHyHWqliKsPdbU/TZPsyfF7SoHTnhk="; + hash = "sha256-bN2LvuB/BD21SL5fG9QNPpR9hUk52U2BJJ6TFMhwDBk="; }; - cargoHash = "sha256-8Vrp4d5luf91pKpUC4wWn4otsanqopCHwCjcnfTzyLk="; + cargoHash = "sha256-V4hANIkReF7EEtFsBv1hA/Ftre6YQPs69LpG/GR0Egc="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,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.9.2/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.11.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; homepage = "https://github.com/latex-lsp/texlab"; + changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ doronbehar kira-bruneau ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ttags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ttags/default.nix new file mode 100644 index 0000000000..f07f2d3ef5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ttags/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, rustPlatform, testers, ttags }: +let version = "0.3.0"; +in rustPlatform.buildRustPackage { + pname = "ttags"; + inherit version; + + src = fetchFromGitHub { + owner = "npezza93"; + repo = "ttags"; + rev = "${version}"; + hash = "sha256-yqrCcA/+FyGPpX3hhULiwhMfrDWjq+rzT04M+o9ry5s="; + }; + + cargoHash = "sha256-jW3xIlo2cN5aoEUp3FxN4pwGFvlg50i5RMNgQopGb88="; + + passthru.tests.version = testers.testVersion { + package = ttags; + command = "ttags --version"; + version = version; + }; + + meta = with lib; { + description = "Generate tags using tree-sitter"; + longDescription = '' + ttags generates tags (similar to ctags) for various + languages, using tree-sitter. + + Can be run as a language server that updates the tags + for a file when it is saved. + + Supported languages: + - Haskell + - JavaScript + - Nix + - Ruby + - Rust + - Swift + ''; + homepage = "https://github.com/npezza93/ttags"; + license = licenses.mit; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/yakut/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/yakut/default.nix new file mode 100644 index 0000000000..4c993c19cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/yakut/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchPypi +, stdenv +, click +, coloredlogs +, psutil +, pycyphal +, pyserial +, ruamel-yaml +, requests +, scipy +, simplejson +}: + +buildPythonApplication rec { + pname = "yakut"; + version = "0.13.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-MBVSt01D36rBPW2bopujyu8Opwwavmm7S3tdaWp5ACw="; + }; + + buildInputs = [ + stdenv.cc.cc.lib + click + coloredlogs + psutil + pycyphal + pyserial + ruamel-yaml + requests + scipy + simplejson + ]; + + # Can't seem to run the tests on nix + doCheck = false; + + meta = with lib; { + description = "Simple CLI tool for diagnostics and debugging of Cyphal networks"; + longDescription = '' + Yakút is a simple cross-platform command-line interface (CLI) tool for diagnostics and debugging of Cyphal networks. By virtue of being based on PyCyphal, Yakut supports all Cyphal transports (UDP, serial, CAN, ...) and is compatible with all major features of the protocol. It is designed to be usable with GNU/Linux, Windows, and macOS. + ''; + homepage = "https://github.com/OpenCyphal/yakut/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix index f281a70f80..ea725b0131 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" - ${python.pythonForBuild.interpreter} build.py --system-libclang --clang-completer --ninja + ${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/mod/default.nix b/third_party/nixpkgs/pkgs/development/tools/mod/default.nix index d27c068076..074a5853ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-+xgh/al6954I+DseSHk9k7Rbj0TzQxCtX4X3pbQmoG0="; + sha256 = "sha256-ZFAjiTCmx9o/rUa1vK1Fmz6sE695zzlexTyWJO05M6k="; }; - vendorHash = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y="; + vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index 4ba0bfdd2a..d8edce696a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -1,25 +1,35 @@ { lib , stdenv , fetchFromGitHub +, nix-update-script + , cmake , mimalloc , ninja -, openssl +, tbb , zlib -, testers +, zstd + +, buildPackages +, clangStdenv +, gccStdenv +, hello , mold -, nix-update-script +, mold-wrapped +, runCommandCC +, testers +, useMoldLinker }: stdenv.mkDerivation rec { pname = "mold"; - version = "2.1.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "rui314"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-4W6quVSkxS2I6KEy3fVyBTypD0fg4EecgeEVM0Yw58s="; + repo = "mold"; + rev = "v${version}"; + hash = "sha256-YXFfjJp4dSxzEyAtrEi/ONQZKD7QAU/MZ62l4QCcbwE="; }; nativeBuildInputs = [ @@ -28,14 +38,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - openssl + tbb zlib + zstd ] ++ lib.optionals (!stdenv.isDarwin) [ mimalloc ]; cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" + "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ @@ -44,11 +56,53 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = mold; }; + tests = + let + helloTest = name: helloMold: + let + command = "$READELF -p .comment ${lib.getExe helloMold}"; + emulator = stdenv.hostPlatform.emulator buildPackages; + in + runCommandCC "mold-${name}-test" { passthru = { inherit helloMold; }; } + '' + echo "Testing running the 'hello' binary which should be linked with 'mold'" >&2 + ${emulator} ${lib.getExe helloMold} + + echo "Checking for mold in the '.comment' section" >&2 + if output=$(${command} 2>&1); then + if grep -Fw -- "mold" - <<< "$output"; then + touch $out + else + echo "No mention of 'mold' detected in the '.comment' section" >&2 + echo "The command was:" >&2 + echo "${command}" >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + echo -n "${command}" >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + '' + ; + in + { + version = testers.testVersion { package = mold; }; + } // lib.optionalAttrs stdenv.isLinux { + adapter-gcc = helloTest "adapter-gcc" (hello.override (old: { stdenv = useMoldLinker gccStdenv; })); + adapter-llvm = helloTest "adapter-llvm" (hello.override (old: { stdenv = useMoldLinker clangStdenv; })); + wrapped = helloTest "wrapped" (hello.overrideAttrs (previousAttrs: { + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ mold-wrapped ]; + NIX_CFLAGS_LINK = toString (previousAttrs.NIX_CFLAGS_LINK or "") + " -fuse-ld=mold"; + })); + }; }; meta = with lib; { - description = "A faster drop-in replacement for existing Unix linkers"; + description = "A faster drop-in replacement for existing Unix linkers (unwrapped)"; longDescription = '' mold is a faster drop-in replacement for existing Unix linkers. It is several times faster than the LLVM lld linker. mold is designed to @@ -58,8 +112,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ azahi nitsky paveloom ]; - mainProgram = "mold"; platforms = platforms.unix; + mainProgram = "mold"; + maintainers = with maintainers; [ azahi nitsky paveloom ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/moq/default.nix b/third_party/nixpkgs/pkgs/development/tools/moq/default.nix index 6707cf7300..f057a92de3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/moq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/moq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moq"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-T+vBzhc9XafCeXsW4/24vOn4U7N1t0S8DXkPNav7I94="; + sha256 = "sha256-TOFWaPJ+XfgiQCVRXze29TG7Zfur0SV4mQNdgVIGj5o="; }; vendorHash = "sha256-lfs61YK5HmUd3/qA4o9MiWeTFhu4MTAkNH+f0iGlRe0="; diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index b12e13d280..ba362d65a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -5,7 +5,6 @@ , fetchurl , git , cctools -, developer_cmds , DarwinTools , makeWrapper , CoreServices @@ -38,16 +37,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; - version = "8.0.34"; + version = "8.0.35"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; }) (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; + hash = "sha256-2Dn/RR5BWHMsD/QzKYPo8tqyAQGmHCGwVl2+bzNfy5I="; }) ]; @@ -66,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; + ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; buildInputs = [ boost diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix new file mode 100644 index 0000000000..e7a12deb3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/innovation.nix @@ -0,0 +1,129 @@ +{ lib +, stdenv +, pkg-config +, cmake +, fetchurl +, git +, cctools +, DarwinTools +, makeWrapper +, CoreServices +, bison +, openssl +, protobuf +, curl +, zlib +, libssh +, zstd +, lz4 +, boost +, readline +, libtirpc +, rpcsvc-proto +, libedit +, libevent +, icu +, re2 +, ncurses +, libfido2 +, python3 +, cyrus_sasl +, openldap +, antlr +}: + +let + pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + + mysqlShellVersion = "8.2.0"; + mysqlServerVersion = "8.2.0"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "mysql-shell-innovation"; + version = mysqlShellVersion; + + srcs = [ + (fetchurl { + url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; + hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk="; + }) + (fetchurl { + url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-kuRo+3vcDtc9aOgAuxJTy0e6E85iOFfCx/ZHtrNg08k="; + }) + ]; + + sourceRoot = "mysql-shell-${finalAttrs.version}-src"; + + postUnpack = '' + mv mysql-${mysqlServerVersion} mysql + ''; + + postPatch = '' + substituteInPlace ../mysql/cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + ''; + + nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] + ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; + + buildInputs = [ + boost + curl + libedit + libssh + lz4 + openssl + protobuf + readline + zlib + zstd + libevent + icu + re2 + ncurses + libfido2 + cyrus_sasl + openldap + python3 + antlr.runtime.cpp + ] ++ pythonDeps + ++ lib.optionals stdenv.isLinux [ libtirpc ] + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + + preConfigure = '' + # Build MySQL + echo "Building mysqlclient mysqlxclient" + + cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ + -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build + + cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient + ''; + + cmakeFlags = [ + "-DMYSQL_SOURCE_DIR=../mysql" + "-DMYSQL_BUILD_DIR=../mysql/build" + "-DMYSQL_CONFIG_EXECUTABLE=../../mysql/build/scripts/mysql_config" + "-DWITH_ZSTD=system" + "-DWITH_LZ4=system" + "-DWITH_ZLIB=system" + "-DWITH_PROTOBUF=${protobuf}" + "-DHAVE_PYTHON=1" + ]; + + postFixup = '' + wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" + ''; + + meta = with lib; { + homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/"; + description = "A new command line scriptable shell for MySQL"; + license = licenses.gpl2; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "mysqlsh"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix b/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix index 2d8b075a68..6c71e374ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix @@ -11,7 +11,7 @@ let commonMeta = { license = lib.licenses.asl20; - homepage = "http://www.martiansoftware.com/nailgun/"; + homepage = "https://www.martiansoftware.com/nailgun/"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix index 821453314a..f8fd1bb283 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nc4nix/default.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "nc4nix"; - version = "unstable-2023-06-06"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "nc4nix"; - rev = "3e015450726533770fd00e2771530cbe90f40517"; - sha256 = "sha256-i3lx5Q+EswtimdRMZ0OPMWh01kBK9q+UI1pY6j/ZhuY="; + rev = "47666b418a71c609f8d2b2c2679956c2ac9818e5"; + hash = "sha256-cXg0emFFAYI1Jtiz+Xilmct3JNiO9cSWUbghyIRQBnY="; }; patches = [ @@ -25,15 +25,6 @@ buildGoModule { sha256 = "sha256-0JxyhSQLtlgLtsMv82wMjQHGdmOoQ2dcPPNAw2cFByE="; name = "switch_hash_calculation_method.patch"; }) - - # Fix invalid entries (pre-releases of apps are not to be taken into account, - # but if only pre-releases are compatible with a given Nextcloud version, - # invalid entries are generated) - (fetchpatch { - url = "https://github.com/helsinki-systems/nc4nix/commit/c48131b5ca382585fd3294d51d59acc1e92fadb1.patch"; - sha256 = "sha256-/zc3Smjd6CksC5wUvoB6uAyTzPcIgqimb+zASIuTft0="; - excludes = [ "25.json" "26.json" "27.json" ]; - }) ]; vendorHash = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; diff --git a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix index 60efba29b3..bfa390248f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.2.61"; + version = "0.2.62"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-MoQf7dxdmUlIZZMjuKBJOCu61L8qiAlmVssf6pUhqA8="; + sha256 = "sha256-zSZ62RMHZLuhIPdde0cfWae+uFpWVjMfHuLAJdRedJA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix index 9fdb579b54..7fa9595e18 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.1.17"; + version = "10.2.1"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-03GDrKjlvl3O3kJlbbyDYxtlfwLkZbvxC9gvP534zSY="; + hash = "sha256-vnF+ES6RK4iiIJsWUV57DqoLischh+1MlmlK46Z6USY="; }; - npmDepsHash = "sha256-nZ9ant2c+15bRBikFcKZW8aiFqI3WC6hktSiBfnma/I="; + npmDepsHash = "sha256-9yd+k+HpARM63/esW+av0zfcuAVsp9Lkfp6hmUQO5Yg="; env = { npm_config_build_from_source = true; @@ -37,6 +37,5 @@ buildNpmPackage rec { license = licenses.mit; mainProgram = "nest"; maintainers = [ maintainers.ehllie ]; - broken = stdenv.isDarwin; # https://github.com/nestjs/nest-cli/pull/2281 }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix index a97ce8499b..22104d3d4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-camlidl"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "camlidl"; - rev = "camlidl111"; - sha256 = "sha256-8m0zem/6nvpEJtjJNP/+vafeVLlMvNQGdl8lyf/OeBg="; + rev = "camlidl112"; + hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0="; }; nativeBuildInputs = [ ocaml ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp + substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index d49f8878b7..59814a5421 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-G5x9fhNKjTqdcVYT8CkQ7PMRZ98boibt6SGl+nsNZRM="; + hash = "sha256-hm8jB62tr3YE87+dmLtAmHkrqgRpU6ZybJbED8XtP3E="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix index 517ef2ce9e..57b457bff2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,11 +1,9 @@ -{ lib, fetchFromGitHub, ncurses, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; @@ -13,13 +11,7 @@ with ocamlPackages; buildDunePackage rec { hash = "sha256-xmPGGB/zUpfeAxUIhR1PhfoESAJq7sTpqHuf++EH3Lw="; }; - nativeBuildInputs = [ ocp-build ]; - buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ]; - - configurePhase = '' - export TERM=xterm - ocp-build -init - ''; + buildInputs = [ lablgtk3-sourceview3 ocp-index ]; meta = { homepage = "https://www.typerex.org/ocaml-top.html"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index 0ac69f86c9..7dd6843d52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "ocamlify is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocamlify"; version = "0.0.2"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix index de26536eb1..33f9a123b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner_1_0, re }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "ocp-build is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocp-build"; version = "1.99.21"; diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index 3ad7c28471..aeff229f83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "18.10.3"; + version = "18.22.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gNSG4jGGkvLyitqO4o44tv/nRGzOcX5haLUFdj/PqBM="; + hash = "sha256-lQqDXiT+DRLmU+4DBvj2Gnd1RjaRgMorhXo1BmJLQqU="; }; - vendorHash = "sha256-ia5uglahH4btHYqeG3yyStOoM1ALxm/lQ+pyc0oxIwE="; + vendorHash = "sha256-/SVS0Vd6GvKEAzRobxaTwJ+uy8dwCINBOYzQN65ppAs="; sourceRoot = "${src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix index efaa5dbc05..428f3d9186 100644 --- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.20.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-AeZ/pp7zWi8liDu247WXetXK/CurV0GUZ/isVdDF3yQ="; + hash = "sha256-HqMnZireYw8k7TXkR+M+Ct97OISaBUNCABR0nYqljjQ="; }; - vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU="; + vendorHash = "sha256-z4ERIfwLPYIMpSetepDx0U2WUA+9RXjoQICMbp+qS3k="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/third_party/nixpkgs/pkgs/development/tools/ols/default.nix b/third_party/nixpkgs/pkgs/development/tools/ols/default.nix index a9e7b25603..cedaa46690 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ols/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "nightly-2023-07-09"; + version = "nightly-2023-11-04"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "255ad5958026dc3a3116f621eaebd501b8b26a22"; - hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM="; + rev = "b19c24eb17e7c16bcfb3144665fd405fd5e580f3"; + hash = "sha256-c8mHVdXbn7aRKI/QBIZvBvl4sCNK49q+crQmTCjptwM="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation { description = "Language server for the Odin programming language"; homepage = "https://github.com/DanielGavin/ols"; license = licenses.mit; - maintainers = with maintainers; [ astavie ]; + maintainers = with maintainers; [ astavie znaniye ]; platforms = odin.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix b/third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix index 4acf2264fc..28c922f2bd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; + hash = "sha256-D0K8Prc3yuaA2vqFs645WOn1ajeRLF+2uHWTP4+3OQ0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix index 7d86762355..96b540e5fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-t/OiLSr0RFin2yGVFaddDvGBWNUYddvjsERzm2DuXKE="; + sha256 = "sha256-CoTp9IhsG09jZuxxiYgboNDmJ+AAiyw7lIjwL1Jq8u4="; }; - vendorHash = "sha256-ihuZuBsTP/i8M7Fwu5arizryMFZxZ0J26k+JeqnSiJQ="; + vendorHash = "sha256-bsReLqKR1jfu2pU912B/kyBlB6TjM8vY8IfiNEvTwcc="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 7b7da31ad1..aa8b4ae20f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,14 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.55.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-piQ8Cig2zG6UhzVbiDCTruAXNis8P5HUja4xiiol9jA="; + hash = "sha256-zDTL/kP0ldPiZhLqLQmpIoDaq979KNDVJyXp93sPZAk="; }; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +35,10 @@ buildGoModule rec { + "`opa build` does not need this feature.") "opa_wasm"); + checkFlags = lib.optionals (!enableWasmEval) [ + "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" + ]; + preCheck = '' # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we diff --git a/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix b/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix index 0fa12e417e..a96156ca71 100644 --- a/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/out-of-tree/default.nix @@ -1,15 +1,15 @@ -{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, buildGoModule, fetchgit, qemu, podman, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; - version = "2.0.4"; + version = "2.1.1"; nativeBuildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "sha256-D2LiSDnF7g1h0XTulctCnZ+I6FZSLA0XRd9LQLOMP9c="; + sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; }; vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; @@ -18,7 +18,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/out-of-tree \ - --prefix PATH : "${lib.makeBinPath [ qemu ]}" + --prefix PATH : "${lib.makeBinPath [ qemu podman ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix index 48534355f4..48c7cbba56 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-2Ne0RqwAX0uHWJLAgDRTipSjjWl2Va71uo06IgI9f0Y="; + hash = "sha256-zjTJF8yU3Hb8CTzzsPdo2EJI7QriEsjUyXVwprb22xQ="; }; - cargoHash = "sha256-WI8EvFEz0lflt93YZbGORCLLop7k44yI9r2I1y+Gjkk="; + cargoHash = "sha256-mRmoCH0VVO9LhFfEd4VfDbCfl5VCpcIKBkaNzU0+9SU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix index b16b0491c9..4f61866557 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # Disable a failing test. rm -rf ../../tests/style.d + '' + lib.optionalString stdenv.cc.isClang '' + export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix index 1e9eec3f80..c8c553afad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pandoc/default.nix @@ -6,6 +6,15 @@ let in (haskell.lib.compose.overrideCabal (drv: { + # pandoc-cli's pandoc executable report the libraries version via --version, match that, + inherit (static.scope.pandoc) version; + # but prevent haskellPackages.mkDerivation from recomputing the src tarball based on that. + inherit (static) src; + # Make it possible to recover the cli version if necessary. + passthru = drv.passthru or {} // { + cliVersion = static.version; + }; + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; @@ -24,6 +33,9 @@ in remove-references-to \ -t ${haskellPackages.warp} \ $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.pandoc_3_1_8} \ + $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc @@ -36,5 +48,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh index 55259b9321..c1d20845e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index f359ed9c16..db5590ccbb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fig2dev, tex, ghostscript, colm +{ lib, stdenv, fetchurl, fig2dev, texliveSmall, ghostscript, colm , build-manual ? false }: @@ -13,7 +13,7 @@ let inherit sha256; }; - buildInputs = lib.optionals build-manual [ fig2dev ghostscript tex ]; + buildInputs = lib.optionals build-manual [ fig2dev ghostscript texliveSmall ]; preConfigure = lib.optionalString build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix index 0dd520eb9e..6e224c7178 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.3.8"; + version = "3.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-ujBdR4NDY9TwHwghtj2uMJoLtuYpzw5cUCMSbEsXlmY="; + sha256 = "sha256-gk+VVfjVPopuzhrEuWNxQxKYjOFbqOGD9YS1npN71Bg="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix index 9ed70fbf88..4b6db0adb7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.7.0"; + version = "1.9.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-axeBD1wjMc5HZy+0Oi5wltr7M6zrQI/NzU6717vUpg0="; + hash = "sha256-nVHm0JJsFXGnYlBBlcR5zBS46PZuALle3ik3GMTPYTQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index f5c20e128d..0412a059a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -166,6 +166,6 @@ rustPlatform.buildRustPackage { * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application ''; license = licenses.mit; - maintainers = with maintainers; [ oxalica Profpatsch ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 0140f12364..29b65870fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -66,6 +66,7 @@ tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json; + tree-sitter-proto = lib.importJSON ./tree-sitter-proto.json; tree-sitter-pug = lib.importJSON ./tree-sitter-pug.json; tree-sitter-python = lib.importJSON ./tree-sitter-python.json; tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json; @@ -101,4 +102,5 @@ tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json; tree-sitter-yang = lib.importJSON ./tree-sitter-yang.json; tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json; + tree-sitter-wgsl = lib.importJSON ./tree-sitter-wgsl.json; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json new file mode 100644 index 0000000000..0bea1a55e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/mitchellh/tree-sitter-proto", + "rev": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f", + "date": "2021-06-12T09:29:04-07:00", + "path": "/nix/store/dsfx2jxc6nll0324pl3w6qcdv5acvyj5-tree-sitter-proto", + "sha256": "001y2z2683fagryqj5f0gs3rcgx2nbw3x3r9afydhss80ihb8zvi", + "hash": "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json index d85d551b9a..0f35892e4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uben0/tree-sitter-typst", - "rev": "b8f3ac3a00247b5be0da2123e6b2d79e3dca4aff", - "date": "2023-09-17T16:51:18+02:00", - "path": "/nix/store/k4sh7jiqrry4960ygjbs72qvi9amd3s8-tree-sitter-typst", - "sha256": "1qihml8jkc32ra1ijmrc1crjmqxspdq163k0hhy9rrq6sqgyh33w", - "hash": "sha256-fAzoH9YG55w8hGAOE3C7uuMqMwssVxmDymKwKRGtMOI=", + "rev": "791cac478226e3e78809b67ff856010bde709594", + "date": "2023-10-01T17:18:34+02:00", + "path": "/nix/store/fsdpsqf4g0maba3lqnq7237hvp443wn0-tree-sitter-typst-791cac4", + "sha256": "1mwj2qf1k1pfd892lkpw6jsd014209aiz6kdsyh5mhxgnb4893v0", + "hash": "sha256-YI+EyLKvw1qg122aH1UCggTQtDT8TioSau6GGRwWktc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json new file mode 100644 index 0000000000..51c6f00b20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/szebniok/tree-sitter-wgsl", + "rev": "40259f3c77ea856841a4e0c4c807705f3e4a2b65", + "date": "2023-01-09T17:32:53+01:00", + "path": "/nix/store/v97b952wz1x5np7cp5as603qzj2686yf-tree-sitter-wgsl", + "sha256": "0w15rhwafbjjmgbxj9fln9pca2w1wr7h5xwni9rniszlkxqf90my", + "hash": "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index b2267f33c7..b2f301aee5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -126,6 +126,10 @@ let orga = "MDeiml"; repo = "tree-sitter-markdown"; }; + "tree-sitter-proto" = { + orga = "mitchellh"; + repo = "tree-sitter-proto"; + }; "tree-sitter-rego" = { orga = "FallenAngel97"; repo = "tree-sitter-rego"; @@ -379,6 +383,10 @@ let orga = "winglang"; repo = "wing"; }; + "tree-sitter-wgsl" = { + orga = "szebniok"; + repo = "tree-sitter-wgsl"; + }; }; allGrammars = @@ -403,7 +411,8 @@ let jsonFile = name: val: (formats.json { }).generate name val; # implementation of the updater - updateImpl = passArgs "updateImpl-with-args" { + updateImpl = passArgs "updateImpl-with-args" + { binaries = { curl = "${curl}/bin/curl"; nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git"; @@ -414,9 +423,10 @@ let ignoredTreeSitterOrgRepos ; } - (writers.writePython3 "updateImpl" { - flakeIgnore = ["E501"]; - } ./update_impl.py); + (writers.writePython3 "updateImpl" + { + flakeIgnore = [ "E501" ]; + } ./update_impl.py); # Pass the given arguments to the command, in the ARGS environment variable. # The arguments are just a json object that should be available in the script. @@ -429,7 +439,7 @@ let lib.concatMapStringsSep "\n" f (lib.mapAttrsToList (k: v: { name = k; } // v) attrs); - jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON {}); + jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON { }); # Run the given script for each of the attr list. # The attrs are passed to the script as a json value. @@ -443,34 +453,34 @@ let outputDir = "${toString ./.}/grammars"; update-all-grammars = writeShellScript "update-all-grammars.sh" '' - set -euo pipefail - ${updateImpl} fetch-and-check-tree-sitter-repos '{}' - echo "writing files to ${outputDir}" 1>&2 - mkdir -p "${outputDir}" - ${forEachParallel - "repos-to-fetch" - (writeShellScript "fetch-repo" '' - ${updateImpl} fetch-repo "$1" - '') - (lib.mapAttrsToList - (nixRepoAttrName: attrs: attrs // { - inherit - nixRepoAttrName - outputDir; - }) - allGrammars) - } - ${updateImpl} print-all-grammars-nix-file "$(< ${ - jsonFile "all-grammars.json" { - allGrammars = - (lib.mapAttrsToList - (nixRepoAttrName: attrs: attrs // { - inherit nixRepoAttrName; - }) - allGrammars); - inherit outputDir; - } - })" + set -euo pipefail + ${updateImpl} fetch-and-check-tree-sitter-repos '{}' + echo "writing files to ${outputDir}" 1>&2 + mkdir -p "${outputDir}" + ${forEachParallel + "repos-to-fetch" + (writeShellScript "fetch-repo" '' + ${updateImpl} fetch-repo "$1" + '') + (lib.mapAttrsToList + (nixRepoAttrName: attrs: attrs // { + inherit + nixRepoAttrName + outputDir; + }) + allGrammars) + } + ${updateImpl} print-all-grammars-nix-file "$(< ${ + jsonFile "all-grammars.json" { + allGrammars = + (lib.mapAttrsToList + (nixRepoAttrName: attrs: attrs // { + inherit nixRepoAttrName; + }) + allGrammars); + inherit outputDir; + } + })" ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix index 0f4300fc67..03d3d440c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/picotool/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; + postInstall = '' + install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d + ''; + meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/README.md b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/README.md deleted file mode 100644 index ac4861534f..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/README.md +++ /dev/null @@ -1,6 +0,0 @@ -Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix - -The update procedure is as-follows: -1. Send your change to the upstream poetry2nix repository -2. Get it approved with tests passing -3. Run the update script in pkgs/development/tools/poetry2nix diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix deleted file mode 100755 index 559025f3ec..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/env python -from concurrent.futures import ThreadPoolExecutor -import subprocess -import textwrap -import argparse -import toml -import json -import sys - -from typing import Dict, Any, Tuple, List - - -class Package: - def __init__(self, attrs: Dict[str, Any]) -> None: - self.attrs = attrs - self.name = attrs["name"] - self.source = self.attrs["source"] - - def fetch(self) -> Tuple["Package", subprocess.CompletedProcess]: - raise NotImplementedError() - - def expression(self, output: str) -> str: - raise NotImplementedError() - - -class UrlPackage(Package): - def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: - return ( - self, - subprocess.run( - [ - "nix-prefetch-url", - "--unpack", - self.source["url"], - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True - ), - ) - - def expression(self, output: str) -> str: - sha256 = output.rstrip() - return textwrap.dedent(""" - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchzip { - url = "%s"; - sha256 = "%s"; - }; - } - );""" % (self.name, self.name, self.source["url"], sha256)) - - -class GitPackage(Package): - def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: - reference = self.source.get("resolved_reference", self.source["reference"]) - - return ( - self, - subprocess.run( - [ - "nix-prefetch-git", - "--fetch-submodules", - "--url", - self.source["url"], - "--rev", - reference, - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True - ), - ) - - def expression(self, output: str) -> str: - meta = json.loads(output) - return textwrap.dedent(""" - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "%s"; - rev = "%s"; - sha256 = "%s"; - }; - } - );""" % (self.name, self.name, meta["url"], meta["rev"], meta["sha256"])) - - -def parse_args() -> argparse.Namespace: - argparser = argparse.ArgumentParser(description="Poetry2nix CLI") - - subparsers = argparser.add_subparsers(dest="subcommand") - subparsers.required = True - - parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) - parser_lock.add_argument( - "--lock", default="poetry.lock", help="Path to input poetry.lock", - ) - parser_lock.add_argument( - "--out", default="poetry-git-overlay.nix", help="Output file", - ) - return argparser.parse_args() - - -def indent(expr: str, spaces: int = 2) -> str: - i = " " * spaces - return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) - - -def main() -> None: - args = parse_args() - - with open(args.lock) as lockf: - lock = toml.load(lockf) - - pkgs: List[Package] = [] - for pkg in lock["package"]: - if "source" in pkg: - source_type = pkg["source"]["type"] - if source_type == "git": - pkgs.append(GitPackage(pkg)) - elif source_type == "url": - pkgs.append(UrlPackage(pkg)) - - with ThreadPoolExecutor() as e: - futures = [] - - for pkg in pkgs: - futures.append(e.submit(pkg.fetch)) - - lines = [ - "{ pkgs }:", - "self: super: {", - ] - - for f in futures: - package, p = f.result() - if p.returncode != 0: - sys.stderr.write(p.stderr) - sys.stderr.flush() - exit(p.returncode) - expr = package.expression(p.stdout) - lines.append(indent(expr)) - - lines.extend(["", "}", ""]) - - expr = "\n".join(lines) - - with open(args.out, "w") as fout: - fout.write(expr) - - print(f"Wrote {args.out}") - - -if __name__ == "__main__": - main() diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix deleted file mode 100644 index b96316e59d..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs ? import { } -, lib ? pkgs.lib -, version -}: -let - inherit (pkgs) python3; -in -pkgs.stdenv.mkDerivation { - pname = "poetry2nix"; - inherit version; - - buildInputs = [ - (python3.withPackages (ps: [ ps.toml ])) - ]; - - nativeBuildInputs = [ - pkgs.makeWrapper - ]; - - src = ./bin; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - patchShebangs poetry2nix - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mv poetry2nix $out/bin - - wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ - pkgs.nix-prefetch-git - ]} - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/nix-community/poetry2nix"; - description = "CLI to supplement sha256 hashes for git dependencies"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.adisbladis ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix deleted file mode 100644 index c59501b0a3..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ /dev/null @@ -1,531 +0,0 @@ -{ pkgs ? import { } -, lib ? pkgs.lib -, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } -}: -let - # Poetry2nix version - version = "1.42.1"; - - inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; - - # Map SPDX identifiers to license names - spdxLicenses = lib.listToAttrs (lib.filter (pair: pair.name != null) (builtins.map (v: { name = if lib.hasAttr "spdxId" v then v.spdxId else null; value = v; }) (lib.attrValues lib.licenses))); - # Get license by id falling back to input string - getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId; - - # Experimental withPlugins functionality - toPluginAble = (import ./plugins.nix { inherit pkgs lib; }).toPluginAble; - - # List of known build systems that are passed through from nixpkgs unmodified - knownBuildSystems = builtins.fromJSON (builtins.readFile ./known-build-systems.json); - nixpkgsBuildSystems = lib.subtractLists [ "poetry" "poetry-core" ] knownBuildSystems; - - mkInputAttrs = - { py - , pyProject - , attrs - , includeBuildSystem ? true - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] # * means all extras, otherwise include the dependencies for a given extra - }: - let - getInputs = attr: attrs.${attr} or [ ]; - - # Get dependencies and filter out depending on interpreter version - getDeps = depSet: - let - compat = isCompatible (poetryLib.getPythonVersion py); - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames depSet); - in - ( - builtins.map - ( - dep: - let - pkg = py.pkgs."${normalizePackageName dep}"; - constraints = depSet.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) - depAttrs - ); - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - rawDeps = pyProject.tool.poetry."dependencies" or { }; - - rawRequiredDeps = lib.filterAttrs (_: v: !(v.optional or false)) rawDeps; - - desiredExtrasDeps = lib.unique - (lib.concatMap (extra: pyProject.tool.poetry.extras.${extra}) extras); - - allRawDeps = - if extras == [ "*" ] then - rawDeps - else - rawRequiredDeps // lib.getAttrs desiredExtrasDeps rawDeps; - checkInputs' = getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # =poetry-1.2.0 dependency groups - ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups); - in - { - buildInputs = mkInput "buildInputs" (if includeBuildSystem then buildSystemPkgs else [ ]); - propagatedBuildInputs = mkInput "propagatedBuildInputs" ( - getDeps allRawDeps ++ ( - # >=poetry-1.2.0 dependency groups - if pyProject.tool.poetry.group or { } != { } - then lib.flatten (map (g: getDeps pyProject.tool.poetry.group.${g}.dependencies) groups) - else [ ] - ) - ); - nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" checkInputs'; - nativeCheckInputs = mkInput "nativeCheckInputs" checkInputs'; - }; - - -in -lib.makeScope pkgs.newScope (self: { - - inherit version; - - /* Returns a package of editable sources whose changes will be available without needing to restart the - nix-shell. - In editablePackageSources you can pass a mapping from package name to source directory to have - those packages available in the resulting environment, whose source changes are immediately available. - - */ - mkPoetryEditablePackage = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , python ? pkgs.python3 - , pyProject ? readTOML pyproject - # Example: { my-app = ./src; } - , editablePackageSources - }: - assert editablePackageSources != { }; - import ./editable.nix { - inherit pyProject python pkgs lib poetryLib editablePackageSources; - }; - - /* Returns a package containing scripts defined in tool.poetry.scripts. - */ - mkPoetryScriptsPackage = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , python ? pkgs.python3 - , pyProject ? readTOML pyproject - , scripts ? pyProject.tool.poetry.scripts - }: - assert scripts != { }; - import ./shell-scripts.nix { - inherit lib python scripts; - }; - - /* - Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. - */ - mkPoetryPackages = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , poetrylockPos ? { file = toString poetrylock; line = 0; column = 0; } - , overrides ? self.defaultPoetryOverrides - , python ? pkgs.python3 - , pwd ? projectDir - , preferWheels ? false - # Example: { my-app = ./src; } - , editablePackageSources ? { } - , pyProject ? readTOML pyproject - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - }: - let - /* The default list of poetry2nix override overlays */ - mkEvalPep508 = import ./pep508.nix { - inherit lib poetryLib; - inherit (python) stdenv; - }; - getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - - poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; poetry2nix = self; }; - - scripts = pyProject.tool.poetry.scripts or { }; - hasScripts = scripts != { }; - scriptsPackage = self.mkPoetryScriptsPackage { - inherit python scripts; - }; - - editablePackageSources' = lib.filterAttrs (name: path: path != null) editablePackageSources; - hasEditable = editablePackageSources' != { }; - editablePackage = self.mkPoetryEditablePackage { - inherit pyProject python; - editablePackageSources = editablePackageSources'; - }; - - poetryLock = readTOML poetrylock; - - # Lock file version 1.1 files - lockFiles = - let - lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - in - lib.listToAttrs (lib.mapAttrsToList (n: v: { name = normalizePackageName n; value = v; }) lockfiles); - - evalPep508 = mkEvalPep508 python; - - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = - let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true && isCompatible (poetryLib.getPythonVersion python) pkgMeta.python-versions; - in - lib.partition supportsPythonVersion poetryLock.package; - compatible = partitions.right; - incompatible = partitions.wrong; - - # Create an overridden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - lockPkgs = builtins.listToAttrs ( - builtins.map - ( - pkgMeta: - let normalizedName = normalizePackageName pkgMeta.name; in - { - name = normalizedName; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd preferWheels; - pos = poetrylockPos; - source = pkgMeta.source or null; - # Default to files from lock file version 2.0 and fall back to 1.1 - files = pkgMeta.files or lockFiles.${normalizedName}; - pythonPackages = self; - - sourceSpec = ( - (normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName} - or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName} - or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+ - or { } - ); - } - ); - } - ) - (lib.reverseList compatible) - ); - buildSystems = builtins.listToAttrs (builtins.map (x: { name = x; value = super.${x}; }) nixpkgsBuildSystems); - in - lockPkgs // buildSystems // { - # Create a dummy null package for the current project in case any dependencies depend on the root project (issue #307) - ${pyProject.tool.poetry.name} = null; - }; - overlays = builtins.map - getFunctorFn - ( - [ - # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). - (self: super: { - # Upstream nixpkgs uses non canonical names - async-generator = super.async-generator or super.async_generator or null; - }) - - (self: super: lib.attrsets.mapAttrs - ( - name: value: - if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name - then null - else value - ) - super) - - ( - self: super: - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit lib python poetryLib evalPep508; - }; - - # # Use poetry-core from the poetry build (pep517/518 build-system) - poetry-core = poetryPkg.passthru.python.pkgs.poetry-core; - poetry = poetryPkg; - - __toPluginAble = toPluginAble self; - } // lib.optionalAttrs (! super ? setuptools-scm) { - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - } - ) - - # Fix infinite recursion in a lot of packages because of checkInputs - (self: super: lib.mapAttrs - (name: value: ( - if lib.isDerivation value && lib.hasAttr "overridePythonAttrs" value - then value.overridePythonAttrs (_: { doCheck = false; }) - else value - )) - super) - - # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = normalizePackageName x.name; value = null; }) incompatible)) - # Create poetry2nix layer - baseOverlay - - ] ++ # User provided overrides - (if builtins.typeOf overrides == "list" then overrides else [ overrides ]) - ); - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; - py = python.override { inherit packageOverrides; self = py; }; - - inputAttrs = mkInputAttrs { inherit py pyProject groups checkGroups extras; attrs = { }; includeBuildSystem = false; }; - - requiredPythonModules = python.pkgs.requiredPythonModules; - /* Include all the nested dependencies which are required for each package. - This guarantees that using the "poetryPackages" attribute will return - complete list of dependencies for the poetry project to be portable. - */ - storePackages = requiredPythonModules (builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs)); - in - { - python = py; - poetryPackages = storePackages - ++ lib.optional hasScripts scriptsPackage - ++ lib.optional hasEditable editablePackage; - poetryLock = poetryLock; - inherit pyProject; - }; - - /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. - In editablePackageSources you can pass a mapping from package name to source directory to have - those packages available in the resulting environment, whose source changes are immediately available. - - Example: - poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } - */ - mkPoetryEnv = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , overrides ? self.defaultPoetryOverrides - , pwd ? projectDir - , python ? pkgs.python3 - , preferWheels ? false - , editablePackageSources ? { } - , extraPackages ? ps: [ ] - , groups ? [ "dev" ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - }: - let - inherit (lib) hasAttr; - - pyProject = readTOML pyproject; - - # Automatically add dependencies with develop = true as editable packages, but only if path dependencies - getEditableDeps = set: lib.mapAttrs - (name: value: projectDir + "/${value.path}") - (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set); - - excludedEditablePackageNames = builtins.filter - (pkg: editablePackageSources."${pkg}" == null) - (builtins.attrNames editablePackageSources); - - allEditablePackageSources = ( - (getEditableDeps (pyProject.tool.poetry."dependencies" or { })) - // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { })) - // ( - # Poetry>=1.2.0 - if pyProject.tool.poetry.group or { } != { } then - builtins.foldl' (acc: g: acc // getEditableDeps pyProject.tool.poetry.group.${g}.dependencies) { } groups - else { } - ) - // editablePackageSources - ); - - editablePackageSources' = builtins.removeAttrs - allEditablePackageSources - excludedEditablePackageNames; - - poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels pyProject groups checkGroups extras; - editablePackageSources = editablePackageSources'; - }; - - inherit (poetryPython) poetryPackages; - - # Don't add editable sources to the environment since they will sometimes fail to build and are not useful in the development env - editableAttrs = lib.attrNames editablePackageSources'; - envPkgs = builtins.filter (drv: ! lib.elem (drv.pname or drv.name or "") editableAttrs) poetryPackages; - - in - poetryPython.python.withPackages (ps: envPkgs ++ (extraPackages ps)); - - /* Creates a Python application from pyproject.toml and poetry.lock - - The result also contains a .dependencyEnv attribute which is a python - environment of all dependencies and this apps modules. This is useful if - you rely on dependencies to invoke your modules for deployment: e.g. this - allows `gunicorn my-module:app`. - */ - mkPoetryApplication = - { projectDir ? null - , src ? ( - # Assume that a project which is the result of a derivation is already adequately filtered - if lib.isDerivation projectDir then projectDir else self.cleanPythonSources { src = projectDir; } - ) - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , overrides ? self.defaultPoetryOverrides - , meta ? { } - , python ? pkgs.python3 - , pwd ? projectDir - , preferWheels ? false - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - , ... - }@attrs: - let - poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels groups checkGroups extras; - }; - py = poetryPython.python; - - hooks = py.pkgs.callPackage ./hooks { }; - - inherit (poetryPython) pyProject; - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - "pyproject" - "preferWheels" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - inputAttrs = mkInputAttrs { inherit py pyProject attrs groups checkGroups extras; }; - - app = py.pkgs.buildPythonPackage ( - passedAttrs // inputAttrs // { - nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ - hooks.removePathDependenciesHook - hooks.removeGitDependenciesHook - ]; - } // { - pname = normalizePackageName pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; - - inherit src; - - format = "pyproject"; - # Like buildPythonApplication, but without the toPythonModule part - # Meaning this ends up looking like an application but it also - # provides python modules - namePrefix = ""; - - passthru = { - python = py; - dependencyEnv = ( - lib.makeOverridable ({ app, ... }@attrs: - let - args = builtins.removeAttrs attrs [ "app" ] // { - extraLibs = [ app ]; - }; - in - py.buildEnv.override args) - ) { inherit app; }; - }; - - # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals - pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs; - - meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) - { - inherit (pyProject.tool.poetry) description; - } // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) { - inherit (pyProject.tool.poetry) homepage; - } // { - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - } // meta; - - } - ); - in - app; - - /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ - cli = import ./cli.nix { - inherit pkgs lib; - inherit (self) version; - }; - - # inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages; - - inherit (poetryLib) cleanPythonSources; - - - /* - Create a new default set of overrides with the same structure as the built-in ones - */ - mkDefaultPoetryOverrides = defaults: { - __functor = defaults; - - extend = overlay: - let - composed = lib.foldr lib.composeExtensions overlay [ defaults ]; - in - self.mkDefaultPoetryOverrides composed; - - overrideOverlay = fn: - let - overlay = self: super: - let - defaultSet = defaults self super; - customSet = fn self super; - in - defaultSet // customSet; - in - self.mkDefaultPoetryOverrides overlay; - }; - - /* - The default list of poetry2nix override overlays - - Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function - */ - defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib; }); - - /* - Convenience functions for specifying overlays with or without the poerty2nix default overrides - */ - overrides = { - /* - Returns the specified overlay in a list - */ - withoutDefaults = overlay: [ - overlay - ]; - - /* - Returns the specified overlay and returns a list - combining it with poetry2nix default overrides - */ - withDefaults = overlay: [ - overlay - self.defaultPoetryOverrides - ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix deleted file mode 100644 index 13a07e4c85..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ pkgs -, lib -, poetryLib -, pyProject -, python -, editablePackageSources -}: -let - name = poetryLib.normalizePackageName pyProject.tool.poetry.name; - - # Just enough standard PKG-INFO fields for an editable installation - pkgInfoFields = { - Metadata-Version = "2.1"; - Name = name; - # While the pyproject.toml could contain arbitrary version strings, for - # simplicity we just use the same one for PKG-INFO, even though that - # should follow follow PEP 440: https://www.python.org/dev/peps/pep-0345/#version - # This is how poetry transforms it: https://github.com/python-poetry/poetry/blob/6cd3645d889f47c10425961661b8193b23f0ed79/poetry/version/version.py - Version = pyProject.tool.poetry.version; - Summary = pyProject.tool.poetry.description; - }; - - pkgInfoFile = builtins.toFile "${name}-PKG-INFO" - (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}: ${value}") pkgInfoFields)); - - entryPointsFile = builtins.toFile "${name}-entry_points.txt" - (lib.generators.toINI { } pyProject.tool.poetry.plugins); - - # A python package that contains simple .egg-info and .pth files for an editable installation - editablePackage = python.pkgs.toPythonModule (pkgs.runCommand "${name}-editable" - { } '' - mkdir -p "$out/${python.sitePackages}" - cd "$out/${python.sitePackages}" - - # See https://docs.python.org/3.8/library/site.html for info on such .pth files - # These add another site package path for each line - touch poetry2nix-editable.pth - ${lib.concatMapStringsSep "\n" - (src: '' - echo "${toString src}" >> poetry2nix-editable.pth - '') - (lib.attrValues editablePackageSources)} - - # Create a very simple egg so pkg_resources can find this package - # See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format - mkdir "${name}.egg-info" - cd "${name}.egg-info" - ln -s ${pkgInfoFile} PKG-INFO - ${lib.optionalString (pyProject.tool.poetry ? plugins) '' - ln -s ${entryPointsFile} entry_points.txt - ''} - '' - ); -in -editablePackage diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json deleted file mode 100644 index 33052efe29..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - "egg", - "tar", - "tar.bz2", - "tar.gz", - "tar.lz", - "tar.lzma", - "tar.xz", - "tbz", - "tgz", - "tlz", - "txz", - "whl", - "zip" -] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh deleted file mode 100644 index e56dee6849..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh +++ /dev/null @@ -1,24 +0,0 @@ -source $stdenv/setup -set -euo pipefail - -curl="curl \ - --location \ - --max-redirs 20 \ - --retry 2 \ - --disable-epsv \ - --cookie-jar cookies \ - --insecure \ - --speed-time 5 \ - --progress-bar \ - --fail \ - $curlOpts \ - $NIX_CURL_FLAGS" - -echo "Trying to fetch with predicted URL: $predictedURL" - -$curl $predictedURL --output $out && exit 0 - -echo "Predicted URL '$predictedURL' failed, querying pypi.org" -$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url -url=$(cat url) -$curl -k $url --output $out diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py deleted file mode 100644 index 44ea092acb..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py +++ /dev/null @@ -1,134 +0,0 @@ -# Some repositories (such as Devpi) expose the Pypi legacy API -# (https://warehouse.pypa.io/api-reference/legacy.html). -# -# Note it is not possible to use pip -# https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12 - -import os -import sys -import netrc -from urllib.parse import urlparse, urlunparse -from html.parser import HTMLParser -import urllib.request -import shutil -import ssl -from os.path import normpath - - -# Parse the legacy index page to extract the href and package names -class Pep503(HTMLParser): - def __init__(self): - super().__init__() - self.sources = {} - self.url = None - self.name = None - - def handle_data(self, data): - if self.url is not None: - self.name = data - - def handle_starttag(self, tag, attrs): - if tag == "a": - for name, value in attrs: - if name == "href": - self.url = value - - def handle_endtag(self, tag): - if self.url is not None: - self.sources[self.name] = self.url - self.url = None - - -url = sys.argv[1] -package_name = sys.argv[2] -index_url = url + "/" + package_name + "/" -package_filename = sys.argv[3] - -# Parse username and password for this host from the netrc file if given. -username, password = None, None -if os.environ["NETRC"]: - netrc_obj = netrc.netrc(os.environ["NETRC"]) - host = urlparse(index_url).netloc - # Strip port number if present - if ":" in host: - host = host.split(":")[0] - username, _, password = netrc_obj.authenticators(host) - -print("Reading index %s" % index_url) - -context = ssl.create_default_context() -context.check_hostname = False -context.verify_mode = ssl.CERT_NONE - -# Extract out username/password from index_url, if present. -parsed_url = urlparse(index_url) -username = parsed_url.username or username -password = parsed_url.password or password -index_url = parsed_url._replace(netloc=parsed_url.netloc.rpartition("@")[-1]).geturl() - -req = urllib.request.Request(index_url) -if username and password: - import base64 - - password_b64 = base64.b64encode(":".join((username, password)).encode()).decode( - "utf-8" - ) - req.add_header("Authorization", "Basic {}".format(password_b64)) -response = urllib.request.urlopen(req, context=context) -index = response.read() - -parser = Pep503() -parser.feed(str(index, "utf-8")) -if package_filename not in parser.sources: - print( - "The file %s has not be found in the index %s" % (package_filename, index_url) - ) - exit(1) - -package_file = open(package_filename, "wb") -# Sometimes the href is a relative or absolute path within the index's domain. -indicated_url = urlparse(parser.sources[package_filename]) -if indicated_url.netloc == "": - parsed_url = urlparse(index_url) - - if indicated_url.path.startswith("/"): - # An absolute path within the index's domain. - path = parser.sources[package_filename] - else: - # A relative path. - path = parsed_url.path + "/" + parser.sources[package_filename] - - package_url = urlunparse( - ( - parsed_url.scheme, - parsed_url.netloc, - path, - None, - None, - None, - ) - ) -else: - package_url = parser.sources[package_filename] - -# Handle urls containing "../" -parsed_url = urlparse(package_url) -real_package_url = urlunparse( - ( - parsed_url.scheme, - parsed_url.netloc, - normpath(parsed_url.path), - parsed_url.params, - parsed_url.query, - parsed_url.fragment, - ) -) -print("Downloading %s" % real_package_url) - -req = urllib.request.Request(real_package_url) -if username and password: - req.add_unredirected_header("Authorization", "Basic {}".format(password_b64)) -response = urllib.request.urlopen(req, context=context) - -with response as r: - shutil.copyfileobj(r, package_file) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix deleted file mode 100644 index 40dd371b59..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ python -, stdenv -, buildPackages -, makeSetupHook -, wheel -, pip -, pkgs -, lib -}: -let - inherit (python.pythonForBuild.pkgs) callPackage; - pythonInterpreter = python.pythonForBuild.interpreter; - pythonSitePackages = python.sitePackages; - - nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]); - makeRemoveSpecialDependenciesHook = { fields, kind }: - nonOverlayedPython.pkgs.callPackage - ( - _: - makeSetupHook - { - name = "remove-path-dependencies.sh"; - substitutions = { - # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion - # because building of tomlkit and its dependencies also use these hooks. - pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ]; - pythonInterpreter = nonOverlayedPython.interpreter; - pyprojectPatchScript = "${./pyproject-without-special-deps.py}"; - inherit fields; - inherit kind; - }; - } ./remove-special-dependencies.sh - ) - { }; - makeSetupHookArgs = deps: - if lib.elem "propagatedBuildInputs" (builtins.attrNames (builtins.functionArgs makeSetupHook)) then - { propagatedBuildInputs = deps; } - else - { inherit deps; }; -in -{ - removePathDependenciesHook = makeRemoveSpecialDependenciesHook { - fields = [ "path" ]; - kind = "path"; - }; - - removeGitDependenciesHook = makeRemoveSpecialDependenciesHook { - fields = [ "git" "branch" "rev" "tag" ]; - kind = "git"; - }; - - - pipBuildHook = callPackage - ( - { pip, wheel }: - makeSetupHook - ({ - name = "pip-build-hook.sh"; - substitutions = { - inherit pythonInterpreter pythonSitePackages; - }; - } // (makeSetupHookArgs [ pip wheel ])) ./pip-build-hook.sh - ) - { }; - - poetry2nixFixupHook = callPackage - ( - _: - makeSetupHook - { - name = "fixup-hook.sh"; - substitutions = { - inherit pythonSitePackages; - filenames = builtins.concatStringsSep " " [ - "pyproject.toml" - "README.md" - "LICENSE" - ]; - }; - } ./fixup-hook.sh - ) - { }; - - # As of 2023-03 a newer version of packaging introduced a new behaviour where python-requires - # cannot contain version wildcards. This behaviour is complaint with PEP440 - # - # The wildcards are a no-op anyway so we can work around this issue by just dropping the precision down to the last known number. - poetry2nixPythonRequiresPatchHook = callPackage - ( - _: - let - # Python pre 3.9 does not contain the ast.unparse method. - # We can extract this from Python 3.8 for any - unparser = stdenv.mkDerivation { - name = "${python.name}-astunparse"; - inherit (python) src; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/poetry2nix_astunparse - cp ./Tools/parser/unparse.py $out/poetry2nix_astunparse/__init__.py - ''; - }; - - pythonPath = - [ ] - ++ lib.optional (lib.versionOlder python.version "3.9") unparser; - - in - makeSetupHook - { - name = "require-python-patch-hook.sh"; - substitutions = { - inherit pythonInterpreter pythonPath; - patchScript = ./python-requires-patch-hook.py; - }; - } ./python-requires-patch-hook.sh - ) - { }; - - # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion - # It doesn't _really_ depend on wheel though, it just copies the wheel. - wheelUnpackHook = callPackage - (_: - makeSetupHook - { - name = "wheel-unpack-hook.sh"; - } ./wheel-unpack-hook.sh - ) - { }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh deleted file mode 100644 index 8cbe2b178c..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh +++ /dev/null @@ -1,20 +0,0 @@ -poetry2nix-fixup-hook() { - - # Including tests in the output is a common mistake - if [ -z "${dontFixupTests-}" ]; then - rm -rf $out/@pythonSitePackages@/tests - fi - - # Including files in site-packages is a common packaging mistake - # - # While we cannot remove all normal files dumped in site-packages - # we can clean up some common mistakes - if [ -z "${dontFixupSitePackages-}" ]; then - for f in @filenames@; do - rm -f $out/@pythonSitePackages@/$f - done - fi - -} - -postFixupHooks+=(poetry2nix-fixup-hook) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh deleted file mode 100644 index 31e06909b3..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -# Setup hook to use for pip projects -echo "Sourcing pip-build-hook" - -pipBuildPhase() { - echo "Executing pipBuildPhase" - runHook preBuild - - mkdir -p dist - echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . - echo "Finished creating a wheel..." - - runHook postBuild - echo "Finished executing pipBuildPhase" -} - -pipShellHook() { - echo "Executing pipShellHook" - runHook preShellHook - - # Long-term setup.py should be dropped. - if [ -e pyproject.toml ]; then - tmp_path=$(mktemp -d) - export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" - mkdir -p "$tmp_path/@pythonSitePackages@" - @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 - fi - - runHook postShellHook - echo "Finished executing pipShellHook" -} - -if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then - echo "Using pipBuildPhase" - buildPhase=pipBuildPhase -fi - -if [ -z "${shellHook-}" ]; then - echo "Using pipShellHook" - shellHook=pipShellHook -fi diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py deleted file mode 100644 index 76f52604e4..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python -# Patch out special dependencies (git and path) from a pyproject.toml file - -import argparse -import sys - -import tomlkit - - -def main(input, output, fields_to_remove): - data = tomlkit.loads(input.read()) - - try: - deps = data["tool"]["poetry"]["dependencies"] - except KeyError: - pass - else: - for dep in deps.values(): - if isinstance(dep, dict): - any_removed = False - for field in fields_to_remove: - any_removed |= dep.pop(field, None) is not None - if any_removed: - dep["version"] = "*" - dep.pop("develop", None) - - output.write(tomlkit.dumps(data)) - - -if __name__ == "__main__": - p = argparse.ArgumentParser() - p.add_argument( - "-i", - "--input", - type=argparse.FileType("r"), - default=sys.stdin, - help="Location from which to read input TOML", - ) - p.add_argument( - "-o", - "--output", - type=argparse.FileType("w"), - default=sys.stdout, - help="Location to write output TOML", - ) - p.add_argument( - "-f", - "--fields-to-remove", - nargs="+", - help="The fields to remove from the dependency's TOML", - ) - - args = p.parse_args() - main(args.input, args.output, args.fields_to_remove) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py deleted file mode 100644 index cbf4b63741..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python -import ast -import sys -import io - - -# Python2 compat -if sys.version_info[0] < 3: - FileNotFoundError = IOError - - -# Python <= 3.8 compat -def astunparse(tree): - # Use bundled unparse by default - if hasattr(ast, "unparse"): - return ast.unparse(tree) - - # Use example tool from Python sources for older interpreter versions - from poetry2nix_astunparse import Unparser - - buf = io.StringIO() - up = Unparser(tree, buf) - - return buf.getvalue() - - -class Rewriter(ast.NodeVisitor): - def __init__(self, *args, **kwargs): - super(Rewriter, self).__init__(*args, **kwargs) - self.modified = False - - def visit_Call(self, node): - function_name = "" - - if isinstance(node.func, ast.Name): - function_name = node.func.id - elif isinstance(node.func, ast.Attribute): - function_name = node.func.attr - else: - return - - if function_name != "setup": - return - - for kw in node.keywords: - if kw.arg != "python_requires": - continue - - value = kw.value - if not isinstance(value, ast.Constant): - return - - # Rewrite version constraints without wildcard characters. - # - # Only rewrite the file if the modified value actually differs, as we lose whitespace and comments when rewriting - # with the AST module. - python_requires = ", ".join( - [v.strip().rstrip(".*") for v in value.value.split(",")] - ) - if value.value != python_requires: - value.value = python_requires - self.modified = True - - -if __name__ == "__main__": - sys.path.extend(sys.argv[1:]) - - try: - with open("setup.py", encoding="utf-8-sig") as f: - tree = ast.parse(f.read()) - except FileNotFoundError: - exit(0) - - r = Rewriter() - r.visit(tree) - - if r.modified: - with open("setup.py", "w") as f: - f.write(astunparse(tree)) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh deleted file mode 100644 index 57a718fe45..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -poetry2nix-python-requires-patch-hook() { - if [ -z "${dontFixupPythonRequires-}" ]; then - @pythonInterpreter@ @patchScript@ @pythonPath@ - fi -} - -postPatchHooks+=(poetry2nix-python-requires-patch-hook) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh deleted file mode 100644 index 904efa615b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh +++ /dev/null @@ -1,23 +0,0 @@ -remove-@kind@-dependencies-hook() { - # Tell poetry not to resolve special dependencies. Any version is fine! - - if ! test -f pyproject.toml; then - return - fi - - echo "Removing @kind@ dependencies" - - # NOTE: We have to reset PYTHONPATH to avoid having propagatedBuildInputs - # from the currently building derivation leaking into our unrelated Python - # environment. - PYTHONPATH=@pythonPath@ \ - @pythonInterpreter@ \ - @pyprojectPatchScript@ \ - --fields-to-remove @fields@ < pyproject.toml > pyproject.formatted.toml - - mv pyproject.formatted.toml pyproject.toml - - echo "Finished removing @kind@ dependencies" -} - -postPatchHooks+=(remove-@kind@-dependencies-hook) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh deleted file mode 100644 index fca808a933..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Setup hook to use in case a wheel is fetched -echo "Sourcing wheel setup hook" - -wheelUnpackPhase(){ - echo "Executing wheelUnpackPhase" - runHook preUnpack - - mkdir -p dist - cp "$src" "dist/$(stripHash "$src")" - -# runHook postUnpack # Calls find...? - echo "Finished executing wheelUnpackPhase" -} - -if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then - echo "Using wheelUnpackPhase" - unpackPhase=wheelUnpackPhase -fi diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json deleted file mode 100644 index 201aae3c92..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - "poetry", - "poetry-core", - "flit", - "flit-core", - "pbr", - "cython", - "hatchling", - "hatch-vcs", - "setuptools", - "setuptools-scm" -] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix deleted file mode 100644 index 4c52c07b69..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ /dev/null @@ -1,250 +0,0 @@ -{ lib, pkgs, stdenv }: -let - inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver; - inherit (builtins) genList length; - - # Replace a list entry at defined index with set value - ireplace = idx: value: list: ( - genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) - ); - - # Normalize package names as per PEP 503 - normalizePackageName = name: - let - parts = builtins.split "[-_.]+" name; - partsWithoutSeparator = builtins.filter (x: builtins.typeOf x == "string") parts; - in - lib.strings.toLower (lib.strings.concatStringsSep "-" partsWithoutSeparator); - - # Normalize an entire attrset of packages - normalizePackageSet = lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair (normalizePackageName name) value); - - # Get a full semver pythonVersion from a python derivation - getPythonVersion = python: - let - pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ]; - ver = lib.splitVersion python.version; - major = l: lib.elemAt l 0; - minor = l: lib.elemAt l 1; - joinVersion = v: lib.concatStringsSep "." v; - in - joinVersion (if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); - - # Compare a semver expression with a version - isCompatible = version: - let - operators = { - "||" = cond1: cond2: cond1 || cond2; - "," = cond1: cond2: cond1 && cond2; # , means && - "&&" = cond1: cond2: cond1 && cond2; - }; - splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; - in - expr: - let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; - in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; - fromTOML = builtins.fromTOML or - ( - toml: builtins.fromJSON ( - builtins.readFile ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' - ) - ) - ); - readTOML = path: fromTOML (builtins.readFile path); - - # - # Returns the appropriate manylinux dependencies and string representation for the file specified - # - getManyLinuxDeps = f: - let - ml = pkgs.pythonManylinuxPackages; - in - if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } - else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } - else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } - else if lib.strings.hasInfix "manylinux_" f then { pkg = [ ml.manylinux2014 ]; str = "pep600"; } - else { pkg = [ ]; str = null; }; - - # Predict URL from the PyPI index. - # Args: - # pname: package name - # file: filename including extension - # hash: SRI hash - # kind: Language implementation and version tag - predictURLFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" - ); - - - # Fetch from the PyPI index. - # At first we try to fetch the predicated URL but if that fails we - # will use the Pypi API to determine the correct URL. - # Args: - # pname: package name - # file: filename including extension - # version: the version string of the dependency - # hash: SRI hash - # kind: Language implementation and version tag - fetchFromPypi = lib.makeOverridable ( - { pname, file, version, hash, kind, curlOpts ? "" }: - let - predictedURL = predictURLFromPypi { inherit pname file hash kind; }; - in - (pkgs.stdenvNoCC.mkDerivation { - name = file; - nativeBuildInputs = [ - pkgs.buildPackages.curl - pkgs.buildPackages.jq - ]; - isWheel = lib.strings.hasSuffix "whl" file; - system = "builtin"; - - preferLocalBuild = true; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "NIX_CURL_FLAGS" - ]; - - inherit pname file version curlOpts predictedURL; - - builder = ./fetch-from-pypi.sh; - - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = hash; - - passthru = { - urls = [ predictedURL ]; # retain compatibility with nixpkgs' fetchurl - }; - }) - ); - - fetchFromLegacy = lib.makeOverridable ( - { python, pname, url, file, hash }: - let - pathParts = - (builtins.filter - ({ prefix, path }: "NETRC" == prefix) - builtins.nixPath); - netrc_file = if (pathParts != [ ]) then (builtins.head pathParts).path else ""; - in - pkgs.runCommand file - { - nativeBuildInputs = [ python ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = hash; - NETRC = netrc_file; - passthru.isWheel = lib.strings.hasSuffix "whl" file; - } '' - python ${./fetch_from_legacy.py} ${url} ${pname} ${file} - mv ${file} $out - '' - ); - - getBuildSystemPkgs = - { pythonPackages - , pyProject - }: - let - missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " - + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; - requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; - requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires; - in - builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; - - # Find gitignore files recursively in parent directory stopping with .git - findGitIgnores = path: - let - parent = path + "/.."; - gitIgnore = path + "/.gitignore"; - isGitRoot = builtins.pathExists (path + "/.git"); - hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ]; - in - lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; - - /* - Provides a source filtering mechanism that: - - - Filters gitignore's - - Filters pycache/pyc files - - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks - */ - cleanPythonSources = { src }: - let - gitIgnores = findGitIgnores src; - pycacheFilter = name: type: - (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) - || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) - ; - in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; - }; - }; - - # Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels. - # (a.k.a. `uname -m` output from CentOS 7) - # - # This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1. - # s390x is not supported in Nixpkgs, so we don't map it. - manyLinuxTargetMachines = { - x86_64 = "x86_64"; - i686 = "i686"; - aarch64 = "aarch64"; - armv7l = "armv7l"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }; - - # Machine tag for our target platform (if available) - getTargetMachine = stdenv: manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null; - -in -{ - inherit - fetchFromPypi - fetchFromLegacy - getManyLinuxDeps - isCompatible - readTOML - getBuildSystemPkgs - satisfiesSemver - cleanPythonSources - normalizePackageName - normalizePackageSet - getPythonVersion - getTargetMachine - ; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix deleted file mode 100644 index 5e39e1e6f5..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ autoPatchelfHook -, lib -, python -, buildPythonPackage -, poetryLib -, evalPep508 -}: -{ name -, version -, pos ? __curPos -, files -, source -, dependencies ? { } -, pythonPackages -, python-versions -, pwd -, sourceSpec -, supportedExtensions ? lib.importJSON ./extensions.json -, preferWheels ? false -, ... -}: - -pythonPackages.callPackage - ( - { preferWheel ? preferWheels - , ... - }@args: - let - inherit (python) stdenv; - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromLegacy fetchFromPypi normalizePackageName; - - inherit (import ./pep425.nix { - inherit lib poetryLib python stdenv; - }) selectWheel - ; - fileCandidates = - let - supportedRegex = ("^.*(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." "+" ] [ "\\." "\\+" ] version + ".*$") fname != null; - hasSupportedExtension = fname: builtins.match supportedRegex fname != null; - isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; - in - builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; - toPath = s: pwd + "/${s}"; - isLocked = lib.length fileCandidates > 0; - isSource = source != null; - isGit = isSource && source.type == "git"; - isUrl = isSource && source.type == "url"; - isWheelUrl = isSource && source.type == "url" && lib.strings.hasSuffix ".whl" source.url; - isDirectory = isSource && source.type == "directory"; - isFile = isSource && source.type == "file"; - isLegacy = isSource && source.type == "legacy"; - localDepPath = toPath source.url; - - buildSystemPkgs = - let - pyProjectPath = localDepPath + "/pyproject.toml"; - pyProject = poetryLib.readTOML pyProjectPath; - in - if builtins.pathExists pyProjectPath then - poetryLib.getBuildSystemPkgs - { - inherit pythonPackages pyProject; - } else [ ]; - - pname = normalizePackageName name; - preferWheel' = preferWheel && pname != "wheel"; - fileInfo = - let - isBdist = f: lib.strings.hasSuffix "whl" f.file; - isSdist = f: ! isBdist f && ! isEgg f; - isEgg = f: lib.strings.hasSuffix ".egg" f.file; - binaryDist = selectWheel fileCandidates; - sourceDist = builtins.filter isSdist fileCandidates; - eggs = builtins.filter isEgg fileCandidates; - # the `wheel` package cannot be built from a wheel, since that requires the wheel package - # this causes a circular dependency so we special-case ignore its `preferWheel` attribute value - entries = (if preferWheel' then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - lockFileEntry = ( - if lib.length entries > 0 then builtins.head entries - else throw "Missing suitable source/wheel file entry for ${name}" - ); - _isEgg = isEgg lockFileEntry; - in - rec { - inherit (lockFileEntry) file hash; - name = file; - format = - if _isEgg then "egg" - else if lib.strings.hasSuffix ".whl" name then "wheel" - else "pyproject"; - kind = - if _isEgg then python.pythonVersion - else if format == "pyproject" then "source" - else (builtins.elemAt (lib.strings.splitString "-" name) 2); - }; - - format = if isWheelUrl then "wheel" else if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; - - hooks = python.pkgs.callPackage ./hooks { }; - in - buildPythonPackage { - inherit pname version; - - # Circumvent output separation (https://github.com/NixOS/nixpkgs/pull/190487) - format = if format == "pyproject" then "poetry2nix" else format; - - doCheck = false; # We never get development deps - - # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` - dontStrip = format == "wheel"; - - nativeBuildInputs = [ - hooks.poetry2nixFixupHook - ] - ++ lib.optional (!pythonPackages.isPy27) hooks.poetry2nixPythonRequiresPatchHook - ++ lib.optional (isLocked && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook - ++ lib.optionals (format == "wheel") [ - hooks.wheelUnpackHook - pythonPackages.pipInstallHook - pythonPackages.setuptools - ] - ++ lib.optionals (format == "pyproject") [ - hooks.removePathDependenciesHook - hooks.removeGitDependenciesHook - hooks.pipBuildHook - ]; - - buildInputs = ( - lib.optional (isLocked) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isDirectory buildSystemPkgs - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools - ); - - propagatedBuildInputs = - let - compat = isCompatible (poetryLib.getPythonVersion python); - deps = lib.filterAttrs - (n: v: v) - ( - lib.mapAttrs - ( - n: v: - let - constraints = v.python or ""; - pep508Markers = v.markers or ""; - in - compat constraints && evalPep508 pep508Markers - ) - dependencies - ); - depAttrs = lib.attrNames deps; - in - builtins.map (n: pythonPackages.${normalizePackageName n}) depAttrs; - - inherit pos; - - meta = { - broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; - license = [ ]; - inherit (python.meta) platforms; - }; - - passthru = { - inherit args; - preferWheel = preferWheel'; - }; - - # We need to retrieve kind from the interpreter and the filename of the package - # Interpreters should declare what wheel types they're compatible with (python type + ABI) - # Here we can then choose a file based on that info. - src = - if isGit then - ( - builtins.fetchGit ({ - inherit (source) url; - rev = source.resolved_reference or source.reference; - ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD"); - } // ( - lib.optionalAttrs ((sourceSpec ? rev) && (lib.versionAtLeast builtins.nixVersion "2.4")) { - allRefs = true; - }) // ( - lib.optionalAttrs (lib.versionAtLeast builtins.nixVersion "2.4") { - submodules = true; - }) - ) - ) - else if isWheelUrl then - builtins.fetchurl - { - inherit (source) url; - sha256 = fileInfo.hash; - } - else if isUrl then - builtins.fetchTarball - { - inherit (source) url; - sha256 = fileInfo.hash; - } - else if isDirectory then - (poetryLib.cleanPythonSources { src = localDepPath; }) - else if isFile then - localDepPath - else if isLegacy then - fetchFromLegacy - { - pname = name; - inherit python; - inherit (fileInfo) file hash; - inherit (source) url; - } - else - fetchFromPypi { - pname = name; - inherit (fileInfo) file hash kind; - inherit version; - }; - } - ) -{ } diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json deleted file mode 100644 index 04174d1c43..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ /dev/null @@ -1,19989 +0,0 @@ -{ - "aadict": [ - "setuptools" - ], - "aafigure": [ - "setuptools" - ], - "aardwolf": [ - "setuptools" - ], - "abodepy": [ - "setuptools" - ], - "absl-py": [ - "setuptools" - ], - "absolufy-imports": [ - "setuptools" - ], - "accuweather": [ - "setuptools" - ], - "acme": [ - "setuptools" - ], - "acme-tiny": [ - "setuptools", - "setuptools-scm" - ], - "acoustics": [ - "flit-core", - "setuptools" - ], - "acquire": [ - "setuptools", - "setuptools-scm" - ], - "actdiag": [ - "setuptools" - ], - "adafruit-io": [ - "setuptools", - "setuptools-scm" - ], - "adafruit-nrfutil": [ - "setuptools" - ], - "adafruit-platformdetect": [ - "setuptools", - "setuptools-scm" - ], - "adafruit-pureio": [ - "setuptools", - "setuptools-scm" - ], - "adal": [ - "setuptools" - ], - "adax": [ - "setuptools" - ], - "adax-local": [ - "setuptools" - ], - "adb-enhanced": [ - "setuptools" - ], - "adb-homeassistant": [ - "setuptools" - ], - "adb-shell": [ - "setuptools" - ], - "adblock": [ - "setuptools" - ], - "add-trailing-comma": [ - "setuptools" - ], - "addict": [ - "setuptools" - ], - "adext": [ - "setuptools", - "setuptools-scm" - ], - "adguardhome": [ - "poetry-core", - "setuptools" - ], - "adjusttext": [ - "setuptools" - ], - "adlfs": [ - "setuptools" - ], - "advantage-air": [ - "setuptools" - ], - "advocate": [ - "setuptools" - ], - "aemet-opendata": [ - "setuptools" - ], - "aenum": [ - "setuptools" - ], - "aeppl": [ - "setuptools" - ], - "aesara": [ - "cython", - "setuptools" - ], - "aesedb": [ - "setuptools" - ], - "afdko": [ - "setuptools", - "setuptools-scm" - ], - "affine": [ - { - "buildSystem": "setuptools", - "until": "2.4.0" - }, - { - "buildSystem": "flit-core", - "from": "2.4.0" - } - ], - "afsapi": [ - "setuptools", - "setuptools-scm" - ], - "agate": [ - "setuptools" - ], - "agate-dbf": [ - "setuptools" - ], - "agate-excel": [ - "setuptools" - ], - "agate-sql": [ - "setuptools" - ], - "agent-py": [ - "setuptools" - ], - "aggdraw": [ - "setuptools" - ], - "ailment": [ - "setuptools" - ], - "aio-geojson-client": [ - "setuptools" - ], - "aio-geojson-generic-client": [ - "setuptools" - ], - "aio-geojson-geonetnz-quakes": [ - "setuptools" - ], - "aio-geojson-geonetnz-volcano": [ - "setuptools" - ], - "aio-geojson-nsw-rfs-incidents": [ - "setuptools" - ], - "aio-geojson-usgs-earthquakes": [ - "setuptools" - ], - "aio-georss-client": [ - "setuptools" - ], - "aio-georss-gdacs": [ - "setuptools" - ], - "aio-pika": [ - "setuptools" - ], - "aioairq": [ - "setuptools" - ], - "aioairzone": [ - "setuptools" - ], - "aioaladdinconnect": [ - "setuptools" - ], - "aioambient": [ - "poetry-core", - "setuptools" - ], - "aioamqp": [ - "setuptools" - ], - "aioapns": [ - "setuptools" - ], - "aioaseko": [ - "setuptools" - ], - "aioasuswrt": [ - "setuptools" - ], - "aioazuredevops": [ - "setuptools" - ], - "aiobiketrax": [ - "poetry-core", - "setuptools" - ], - "aioblescan": [ - "setuptools" - ], - "aioboto3": [ - "poetry" - ], - "aiobotocore": [ - "setuptools" - ], - "aiobroadlink": [ - "setuptools" - ], - "aiocache": [ - "setuptools" - ], - "aiocoap": [ - "setuptools" - ], - "aioconsole": [ - "setuptools" - ], - "aiocontextvars": [ - "setuptools" - ], - "aiocron": [ - "setuptools" - ], - "aiocsv": [ - "cython" - ], - "aiocurrencylayer": [ - "poetry-core", - "setuptools" - ], - "aiodiscover": [ - "setuptools" - ], - "aiodns": [ - "setuptools" - ], - "aioeafm": [ - "poetry-core", - "setuptools" - ], - "aioeagle": [ - "setuptools" - ], - "aioecowitt": [ - "setuptools" - ], - "aioemonitor": [ - "setuptools" - ], - "aioesphomeapi": [ - "setuptools" - ], - "aioextensions": [ - "setuptools" - ], - "aiofile": [ - "poetry-core", - "setuptools" - ], - "aiofiles": [ - "poetry-core", - "setuptools" - ], - "aioflo": [ - "poetry-core", - "setuptools" - ], - "aioftp": [ - "setuptools" - ], - "aiogithubapi": [ - "poetry-core", - "setuptools" - ], - "aioguardian": [ - "poetry-core", - "setuptools" - ], - "aioharmony": [ - "setuptools" - ], - "aiohomekit": [ - "poetry-core", - "setuptools" - ], - "aiohttp": [ - "setuptools" - ], - "aiohttp-apispec": [ - "setuptools" - ], - "aiohttp-cors": [ - "setuptools" - ], - "aiohttp-jinja2": [ - "setuptools" - ], - "aiohttp-remotes": [ - "flit-core", - "setuptools" - ], - "aiohttp-retry": [ - "setuptools" - ], - "aiohttp-socks": [ - "setuptools" - ], - "aiohttp-swagger": [ - "setuptools" - ], - "aiohttp-wsgi": [ - "setuptools" - ], - "aiohue": [ - "setuptools" - ], - "aiohwenergy": [ - "setuptools" - ], - "aioimaplib": [ - "setuptools" - ], - "aioinflux": [ - "setuptools" - ], - "aioitertools": [ - "flit-core", - "setuptools" - ], - "aiojobs": [ - "flit-core", - "setuptools" - ], - "aiokafka": [ - "cython", - "setuptools" - ], - "aiokef": [ - "setuptools" - ], - "aiolifx": [ - "setuptools" - ], - "aiolifx-connection": [ - "setuptools" - ], - "aiolifx-effects": [ - "setuptools" - ], - "aiolifx-themes": [ - "poetry-core" - ], - "aiolimiter": [ - "poetry-core", - "setuptools" - ], - "aiolip": [ - "setuptools" - ], - "aiolookin": [ - "setuptools" - ], - "aiolyric": [ - "setuptools" - ], - "aiomodernforms": [ - "setuptools" - ], - "aiomultiprocess": [ - "flit-core", - "setuptools" - ], - "aiomusiccast": [ - "poetry-core", - "setuptools" - ], - "aiomysensors": [ - "poetry-core", - "setuptools" - ], - "aiomysql": [ - "setuptools", - "setuptools-scm" - ], - "aionanoleaf": [ - "setuptools" - ], - "aionotify": [ - "setuptools" - ], - "aionotion": [ - "poetry-core", - "setuptools" - ], - "aiooncue": [ - "setuptools" - ], - "aioopenexchangerates": [ - "poetry-core", - "setuptools" - ], - "aiopath": [ - "poetry-core", - "setuptools" - ], - "aiopg": [ - "setuptools" - ], - "aioprocessing": [ - "flit-core", - "setuptools" - ], - "aiopulse": [ - "setuptools" - ], - "aiopvapi": [ - "setuptools" - ], - "aiopvpc": [ - "poetry-core", - "setuptools" - ], - "aiopyarr": [ - "setuptools" - ], - "aiopylgtv": [ - "setuptools" - ], - "aioqsw": [ - "setuptools" - ], - "aiorecollect": [ - "poetry-core", - "setuptools" - ], - "aioredis": [ - "setuptools" - ], - "aioresponses": [ - "pbr", - "setuptools" - ], - "aioridwell": [ - "poetry-core", - "setuptools" - ], - "aiormq": [ - "setuptools" - ], - "aiorpcx": [ - "setuptools" - ], - "aiortm": [ - "poetry-core", - "setuptools" - ], - "aiorun": [ - "flit-core", - "setuptools" - ], - "aiosenseme": [ - "setuptools" - ], - "aiosenz": [ - "setuptools" - ], - "aioserial": [ - "setuptools" - ], - "aioshelly": [ - "setuptools" - ], - "aioshutil": [ - "setuptools", - "setuptools-scm" - ], - "aiosignal": [ - "setuptools" - ], - "aioskybell": [ - "setuptools" - ], - "aioslimproto": [ - "setuptools" - ], - "aiosmb": [ - "setuptools" - ], - "aiosmtpd": [ - "setuptools" - ], - "aiosmtplib": [ - "poetry-core", - "setuptools" - ], - "aiosqlite": [ - "flit-core", - "setuptools" - ], - "aiosteamist": [ - "poetry-core", - "setuptools" - ], - "aiostream": [ - "setuptools" - ], - "aioswitcher": [ - "poetry-core", - "setuptools" - ], - "aiosyncthing": [ - "setuptools" - ], - "aiotractive": [ - "setuptools" - ], - "aiounifi": [ - "setuptools" - ], - "aiounittest": [ - "setuptools" - ], - "aiovlc": [ - "setuptools" - ], - "aiowatttime": [ - "poetry-core", - "setuptools" - ], - "aiowebostv": [ - "setuptools" - ], - "aioweenect": [ - "poetry-core" - ], - "aiowinreg": [ - "setuptools" - ], - "aioymaps": [ - "setuptools" - ], - "aiozeroconf": [ - "setuptools" - ], - "airly": [ - "setuptools" - ], - "airthings-ble": [ - "poetry-core", - "setuptools" - ], - "airthings-cloud": [ - "setuptools" - ], - "airtouch4pyapi": [ - "setuptools" - ], - "ajpy": [ - "setuptools" - ], - "ajsonrpc": [ - "setuptools" - ], - "alabaster": [ - "setuptools" - ], - "aladdin-connect": [ - "setuptools" - ], - "alarmdecoder": [ - "setuptools" - ], - "ale-py": [ - "setuptools" - ], - "alectryon": [ - "setuptools" - ], - "alembic": [ - "setuptools" - ], - "algebraic-data-types": [ - "setuptools" - ], - "aliyun-python-sdk-cdn": [ - "setuptools" - ], - "aliyun-python-sdk-config": [ - "setuptools" - ], - "aliyun-python-sdk-core": [ - "setuptools" - ], - "aliyun-python-sdk-dbfs": [ - "setuptools" - ], - "aliyun-python-sdk-iot": [ - "setuptools" - ], - "aliyun-python-sdk-kms": [ - "setuptools" - ], - "aliyun-python-sdk-sts": [ - "setuptools" - ], - "allpairspy": [ - "setuptools" - ], - "allure-behave": [ - "setuptools", - "setuptools-scm" - ], - "allure-pytest": [ - "setuptools", - "setuptools-scm" - ], - "allure-python-commons": [ - "setuptools", - "setuptools-scm" - ], - "allure-python-commons-test": [ - "setuptools", - "setuptools-scm" - ], - "alog": [ - "setuptools" - ], - "alpha-vantage": [ - "setuptools" - ], - "altair": [ - "setuptools" - ], - "amaranth": [ - "setuptools", - "setuptools-scm" - ], - "amaranth-boards": [ - "setuptools", - "setuptools-scm" - ], - "amaranth-soc": [ - "setuptools", - "setuptools-scm" - ], - "amarna": [ - "setuptools" - ], - "amazon-ion": [ - "setuptools" - ], - "ambee": [ - "poetry-core", - "setuptools" - ], - "amberelectric": [ - "setuptools" - ], - "ambiclimate": [ - "setuptools" - ], - "amcrest": [ - "setuptools" - ], - "amiibo-py": [ - "setuptools" - ], - "amply": [ - "setuptools", - "setuptools-scm" - ], - "amqp": [ - "setuptools" - ], - "amqplib": [ - "setuptools" - ], - "amqtt": [ - "poetry-core", - "setuptools" - ], - "androguard": [ - "setuptools" - ], - "android-backup": [ - "setuptools" - ], - "androidtv": [ - "setuptools" - ], - "angr": [ - "setuptools" - ], - "angrcli": [ - "setuptools" - ], - "angrop": [ - "setuptools" - ], - "aniso8601": [ - "setuptools" - ], - "annexremote": [ - "setuptools" - ], - "annoy": [ - "setuptools" - ], - "anonip": [ - "setuptools" - ], - "ansi": [ - "setuptools" - ], - "ansi2html": [ - "setuptools", - "setuptools-scm" - ], - "ansible": [ - "setuptools" - ], - "ansible-base": [ - "setuptools" - ], - "ansible-compat": [ - "setuptools", - "setuptools-scm" - ], - "ansible-core": [ - "setuptools" - ], - "ansible-doctor": [ - "poetry-core", - "setuptools" - ], - "ansible-kernel": [ - "setuptools" - ], - "ansible-later": [ - "poetry-core", - "setuptools" - ], - "ansible-lint": [ - "setuptools", - "setuptools-scm" - ], - "ansible-molecule": [ - "setuptools" - ], - "ansible-runner": [ - "pbr", - "setuptools" - ], - "ansicolor": [ - "setuptools" - ], - "ansicolors": [ - "setuptools" - ], - "ansiconv": [ - "setuptools" - ], - "ansimarkup": [ - "setuptools" - ], - "ansiwrap": [ - "setuptools" - ], - "antlr4-8-python3-runtime": [ - "setuptools" - ], - "antlr4-9-python3-runtime": [ - "setuptools" - ], - "antlr4-python3-runtime": [ - "setuptools" - ], - "anyascii": [ - { - "buildSystem": "setuptools", - "until": "0.1.7" - }, - { - "buildSystem": "flit-core", - "from": "0.1.7" - } - ], - "anybadge": [ - "setuptools" - ], - "anyconfig": [ - "setuptools" - ], - "anyio": [ - "setuptools", - "setuptools-scm" - ], - "anytree": [ - "setuptools" - ], - "aocd": [ - "setuptools" - ], - "apache-beam": [ - "cython", - "setuptools" - ], - "apache-libcloud": [ - "setuptools" - ], - "apcaccess": [ - "setuptools" - ], - "apipkg": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "apispec": [ - "setuptools" - ], - "aplpy": [ - "cython", - "setuptools" - ], - "appdirs": [ - "setuptools" - ], - "applicationinsights": [ - "setuptools" - ], - "appnope": [ - "setuptools" - ], - "apprise": [ - "setuptools" - ], - "approvaltests": [ - "setuptools" - ], - "appthreat-vulnerability-db": [ - "setuptools" - ], - "apptools": [ - "setuptools" - ], - "aprslib": [ - "setuptools" - ], - "apscheduler": [ - "setuptools", - "setuptools-scm" - ], - "apsw": [ - "setuptools" - ], - "apycula": [ - "setuptools", - "setuptools-scm" - ], - "aqipy-atmotech": [ - "setuptools" - ], - "aqualogic": [ - "setuptools" - ], - "arabic-reshaper": [ - "setuptools" - ], - "arc4": [ - "setuptools" - ], - "arcam-fmj": [ - "setuptools" - ], - "archinfo": [ - "setuptools" - ], - "archspec": [ - "poetry-core", - "setuptools" - ], - "area": [ - "setuptools" - ], - "arelle": [ - "setuptools" - ], - "arelle-headless": [ - "setuptools" - ], - "aresponses": [ - "setuptools" - ], - "argcomplete": [ - "setuptools" - ], - "argh": [ - "setuptools" - ], - "argon2-cffi": [ - "flit-core", - "setuptools" - ], - "argon2-cffi-bindings": [ - "setuptools", - "setuptools-scm" - ], - "argparse-addons": [ - "setuptools" - ], - "args": [ - "setuptools" - ], - "aria2p": [ - "poetry", - "setuptools" - ], - "arnparse": [ - "setuptools" - ], - "arpeggio": [ - "setuptools" - ], - "arpy": [ - "setuptools" - ], - "arrayqueues": [ - "setuptools" - ], - "arris-tg2492lg": [ - "setuptools" - ], - "arrow": [ - "setuptools" - ], - "arviz": [ - "setuptools" - ], - "arxiv2bib": [ - "setuptools" - ], - "asana": [ - "setuptools" - ], - "ascii-magic": [ - "setuptools" - ], - "asciimatics": [ - "setuptools", - "setuptools-scm" - ], - "asciitree": [ - "setuptools" - ], - "asdf": [ - "setuptools", - "setuptools-scm" - ], - "asdf-standard": [ - "setuptools", - "setuptools-scm" - ], - "asdf-transform-schemas": [ - "setuptools", - "setuptools-scm" - ], - "ase": [ - "setuptools" - ], - "asf-search": [ - "setuptools" - ], - "asgi-csrf": [ - "setuptools" - ], - "asgineer": [ - "setuptools" - ], - "asgiref": [ - "setuptools" - ], - "asks": [ - "setuptools" - ], - "asmog": [ - "setuptools" - ], - "asn1": [ - "setuptools" - ], - "asn1ate": [ - "setuptools" - ], - "asn1crypto": [ - "setuptools" - ], - "asn1tools": [ - "setuptools" - ], - "aspell-python": [ - "setuptools" - ], - "aspy-refactor-imports": [ - "setuptools" - ], - "aspy-yaml": [ - "setuptools" - ], - "assay": [ - "setuptools" - ], - "assertpy": [ - "setuptools" - ], - "asterisk-mbox": [ - "setuptools" - ], - "asteval": [ - "setuptools", - "setuptools-scm" - ], - "astor": [ - "setuptools" - ], - "astral": [ - "setuptools" - ], - "astroid": [ - "setuptools", - "setuptools-scm" - ], - "astropy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "astropy-extension-helpers": [ - "setuptools", - "setuptools-scm" - ], - "astropy-healpix": [ - "setuptools", - "setuptools-scm" - ], - "astropy-helpers": [ - "setuptools" - ], - "astroquery": [ - "setuptools" - ], - "asttokens": [ - "setuptools", - "setuptools-scm" - ], - "astunparse": [ - "setuptools" - ], - "asv": [ - "setuptools" - ], - "async-cache": [ - "setuptools" - ], - "async-dns": [ - "poetry-core", - "setuptools" - ], - "async-generator": [ - "setuptools" - ], - "async-lru": [ - "setuptools" - ], - "async-modbus": [ - "setuptools" - ], - "async-stagger": [ - "setuptools" - ], - "async-timeout": [ - "setuptools" - ], - "async-upnp-client": [ - "setuptools" - ], - "asyncclick": [ - "setuptools", - "setuptools-scm" - ], - "asynccmd": [ - "setuptools" - ], - "asyncio-dgram": [ - "setuptools" - ], - "asyncio-mqtt": [ - "setuptools", - "setuptools-scm" - ], - "asyncio-nats-client": [ - "setuptools" - ], - "asyncio-rlock": [ - "setuptools" - ], - "asyncio-throttle": [ - "setuptools" - ], - "asyncmy": [ - "cython", - "poetry-core", - "setuptools" - ], - "asyncpg": [ - "setuptools" - ], - "asyncsleepiq": [ - "setuptools" - ], - "asyncssh": [ - "setuptools" - ], - "asyncstdlib": [ - "flit-core", - "setuptools" - ], - "asynctest": [ - "setuptools" - ], - "asyncua": [ - "setuptools" - ], - "asyncwhois": [ - "setuptools" - ], - "asysocks": [ - "setuptools" - ], - "atc-ble": [ - "poetry-core", - "setuptools" - ], - "atenpdu": [ - "setuptools" - ], - "atlassian-python-api": [ - "setuptools" - ], - "atom": [ - "setuptools", - "setuptools-scm" - ], - "atomiclong": [ - "setuptools" - ], - "atomicwrites": [ - "setuptools" - ], - "atomicwrites-homeassistant": [ - "setuptools" - ], - "atomman": [ - "cython", - "setuptools" - ], - "atpublic": [ - "pdm-pep517", - "setuptools" - ], - "atsim-potentials": [ - "setuptools" - ], - "attrdict": [ - "setuptools" - ], - "attrs": [ - { - "buildSystem": "setuptools", - "until": "23.1.0" - }, - { - "buildSystem": "hatchling", - "from": "23.1.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "23.1.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "23.1.0" - } - ], - "aubio": [ - "setuptools" - ], - "audible": [ - "setuptools" - ], - "audio-metadata": [ - "setuptools" - ], - "audioread": [ - "setuptools" - ], - "audiotools": [ - "setuptools" - ], - "augeas": [ - "setuptools" - ], - "augmax": [ - "setuptools" - ], - "auroranoaa": [ - "setuptools" - ], - "aurorapy": [ - "setuptools" - ], - "autarco": [ - "poetry-core", - "setuptools" - ], - "auth0-python": [ - "setuptools" - ], - "authcaptureproxy": [ - "poetry-core", - "setuptools" - ], - "authheaders": [ - "setuptools" - ], - "authlib": [ - "setuptools" - ], - "authres": [ - "setuptools" - ], - "autobahn": [ - "setuptools" - ], - "autodoc": [ - "setuptools" - ], - "autoflake": [ - "setuptools", - "hatchling" - ], - "autograd": [ - "setuptools" - ], - "autoit-ripper": [ - "setuptools" - ], - "autologging": [ - "setuptools" - ], - "automat": [ - "setuptools", - "setuptools-scm" - ], - "automate-home": [ - "setuptools" - ], - "autopage": [ - "setuptools" - ], - "autopep8": [ - "setuptools" - ], - "av": [ - "cython", - "setuptools" - ], - "avea": [ - "setuptools" - ], - "avion": [ - "setuptools" - ], - "avro": [ - "setuptools" - ], - "avro-python3": [ - "setuptools" - ], - "avro3k": [ - "setuptools" - ], - "awacs": [ - "setuptools" - ], - "awesome-slugify": [ - "setuptools" - ], - "awesomeversion": [ - "poetry-core", - "setuptools" - ], - "awkward": [ - "setuptools" - ], - "awkward0": [ - "setuptools" - ], - "aws-adfs": [ - "poetry-core", - "setuptools" - ], - "aws-cdk-asset-awscli-v1": [ - "setuptools" - ], - "aws-cdk-asset-kubectl-v20": [ - "setuptools" - ], - "aws-cdk-asset-node-proxy-agent": [ - "setuptools" - ], - "aws-cdk-asset-node-proxy-agent-v5": [ - "setuptools" - ], - "aws-cdk-assets": [ - "setuptools" - ], - "aws-cdk-aws-apigateway": [ - "setuptools" - ], - "aws-cdk-aws-applicationautoscaling": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling-common": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling-hooktargets": [ - "setuptools" - ], - "aws-cdk-aws-batch-alpha": [ - "setuptools" - ], - "aws-cdk-aws-certificatemanager": [ - "setuptools" - ], - "aws-cdk-aws-cloudformation": [ - "setuptools" - ], - "aws-cdk-aws-cloudfront": [ - "setuptools" - ], - "aws-cdk-aws-cloudwatch": [ - "setuptools" - ], - "aws-cdk-aws-codebuild": [ - "setuptools" - ], - "aws-cdk-aws-codecommit": [ - "setuptools" - ], - "aws-cdk-aws-codeguruprofiler": [ - "setuptools" - ], - "aws-cdk-aws-codepipeline": [ - "setuptools" - ], - "aws-cdk-aws-codestarnotifications": [ - "setuptools" - ], - "aws-cdk-aws-cognito": [ - "setuptools" - ], - "aws-cdk-aws-ec2": [ - "setuptools" - ], - "aws-cdk-aws-ecr": [ - "setuptools" - ], - "aws-cdk-aws-ecr-assets": [ - "setuptools" - ], - "aws-cdk-aws-ecs": [ - "setuptools" - ], - "aws-cdk-aws-efs": [ - "setuptools" - ], - "aws-cdk-aws-elasticloadbalancing": [ - "setuptools" - ], - "aws-cdk-aws-elasticloadbalancingv2": [ - "setuptools" - ], - "aws-cdk-aws-events": [ - "setuptools" - ], - "aws-cdk-aws-events-targets": [ - "setuptools" - ], - "aws-cdk-aws-globalaccelerator": [ - "setuptools" - ], - "aws-cdk-aws-iam": [ - "setuptools" - ], - "aws-cdk-aws-kinesis": [ - "setuptools" - ], - "aws-cdk-aws-kinesisfirehose": [ - "setuptools" - ], - "aws-cdk-aws-kms": [ - "setuptools" - ], - "aws-cdk-aws-lambda": [ - "setuptools" - ], - "aws-cdk-aws-lambda-python-alpha": [ - "setuptools" - ], - "aws-cdk-aws-logs": [ - "setuptools" - ], - "aws-cdk-aws-route53": [ - "setuptools" - ], - "aws-cdk-aws-route53-targets": [ - "setuptools" - ], - "aws-cdk-aws-s3": [ - "setuptools" - ], - "aws-cdk-aws-s3-assets": [ - "setuptools" - ], - "aws-cdk-aws-sam": [ - "setuptools" - ], - "aws-cdk-aws-secretsmanager": [ - "setuptools" - ], - "aws-cdk-aws-servicediscovery": [ - "setuptools" - ], - "aws-cdk-aws-signer": [ - "setuptools" - ], - "aws-cdk-aws-sns": [ - "setuptools" - ], - "aws-cdk-aws-sns-subscriptions": [ - "setuptools" - ], - "aws-cdk-aws-sqs": [ - "setuptools" - ], - "aws-cdk-aws-ssm": [ - "setuptools" - ], - "aws-cdk-aws-stepfunctions": [ - "setuptools" - ], - "aws-cdk-cloud-assembly-schema": [ - "setuptools" - ], - "aws-cdk-core": [ - "setuptools" - ], - "aws-cdk-custom-resources": [ - "setuptools" - ], - "aws-cdk-cx-api": [ - "setuptools" - ], - "aws-cdk-lib": [ - "setuptools" - ], - "aws-cdk-region-info": [ - "setuptools" - ], - "aws-error-utils": [ - "poetry" - ], - "aws-lambda-builders": [ - "setuptools" - ], - "aws-lambda-context": [ - "setuptools" - ], - "aws-sam-translator": [ - "setuptools" - ], - "aws-sso-lib": [ - "poetry" - ], - "aws-sso-util": [ - "poetry" - ], - "aws-xray-sdk": [ - "setuptools" - ], - "awscli": [ - "setuptools" - ], - "awscli-cwlogs": [ - "setuptools" - ], - "awscli-local": [ - "setuptools" - ], - "awscrt": [ - "setuptools" - ], - "awsiotpythonsdk": [ - "setuptools" - ], - "awslambdaric": [ - "setuptools" - ], - "axis": [ - "setuptools" - ], - "azure-appconfiguration": [ - "setuptools" - ], - "azure-applicationinsights": [ - "setuptools" - ], - "azure-batch": [ - "setuptools" - ], - "azure-common": [ - "setuptools" - ], - "azure-containerregistry": [ - "setuptools" - ], - "azure-core": [ - "setuptools" - ], - "azure-cosmos": [ - "setuptools" - ], - "azure-cosmosdb-nspkg": [ - "setuptools" - ], - "azure-cosmosdb-table": [ - "setuptools" - ], - "azure-data-tables": [ - "setuptools" - ], - "azure-datalake-store": [ - "setuptools" - ], - "azure-eventgrid": [ - "setuptools" - ], - "azure-eventhub": [ - "setuptools" - ], - "azure-functions-devops-build": [ - "setuptools" - ], - "azure-graphrbac": [ - "setuptools" - ], - "azure-identity": [ - "setuptools" - ], - "azure-keyvault": [ - "setuptools" - ], - "azure-keyvault-administration": [ - "setuptools" - ], - "azure-keyvault-certificates": [ - "setuptools" - ], - "azure-keyvault-keys": [ - "setuptools" - ], - "azure-keyvault-nspkg": [ - "setuptools" - ], - "azure-keyvault-secrets": [ - "setuptools" - ], - "azure-loganalytics": [ - "setuptools" - ], - "azure-mgmt-advisor": [ - "setuptools" - ], - "azure-mgmt-apimanagement": [ - "setuptools" - ], - "azure-mgmt-appconfiguration": [ - "setuptools" - ], - "azure-mgmt-applicationinsights": [ - "setuptools" - ], - "azure-mgmt-authorization": [ - "setuptools" - ], - "azure-mgmt-batch": [ - "setuptools" - ], - "azure-mgmt-batchai": [ - "setuptools" - ], - "azure-mgmt-billing": [ - "setuptools" - ], - "azure-mgmt-botservice": [ - "setuptools" - ], - "azure-mgmt-cdn": [ - "setuptools" - ], - "azure-mgmt-cognitiveservices": [ - "setuptools" - ], - "azure-mgmt-commerce": [ - "setuptools" - ], - "azure-mgmt-common": [ - "setuptools" - ], - "azure-mgmt-compute": [ - "setuptools" - ], - "azure-mgmt-consumption": [ - "setuptools" - ], - "azure-mgmt-containerinstance": [ - "setuptools" - ], - "azure-mgmt-containerregistry": [ - "setuptools" - ], - "azure-mgmt-containerservice": [ - "setuptools" - ], - "azure-mgmt-core": [ - "setuptools" - ], - "azure-mgmt-cosmosdb": [ - "setuptools" - ], - "azure-mgmt-databoxedge": [ - "setuptools" - ], - "azure-mgmt-datafactory": [ - "setuptools" - ], - "azure-mgmt-datalake-analytics": [ - "setuptools" - ], - "azure-mgmt-datalake-nspkg": [ - "setuptools" - ], - "azure-mgmt-datalake-store": [ - "setuptools" - ], - "azure-mgmt-datamigration": [ - "setuptools" - ], - "azure-mgmt-deploymentmanager": [ - "setuptools" - ], - "azure-mgmt-devspaces": [ - "setuptools" - ], - "azure-mgmt-devtestlabs": [ - "setuptools" - ], - "azure-mgmt-dns": [ - "setuptools" - ], - "azure-mgmt-eventgrid": [ - "setuptools" - ], - "azure-mgmt-eventhub": [ - "setuptools" - ], - "azure-mgmt-extendedlocation": [ - "setuptools" - ], - "azure-mgmt-hanaonazure": [ - "setuptools" - ], - "azure-mgmt-hdinsight": [ - "setuptools" - ], - "azure-mgmt-imagebuilder": [ - "setuptools" - ], - "azure-mgmt-iotcentral": [ - "setuptools" - ], - "azure-mgmt-iothub": [ - "setuptools" - ], - "azure-mgmt-iothubprovisioningservices": [ - "setuptools" - ], - "azure-mgmt-keyvault": [ - "setuptools" - ], - "azure-mgmt-kusto": [ - "setuptools" - ], - "azure-mgmt-loganalytics": [ - "setuptools" - ], - "azure-mgmt-logic": [ - "setuptools" - ], - "azure-mgmt-machinelearningcompute": [ - "setuptools" - ], - "azure-mgmt-managedservices": [ - "setuptools" - ], - "azure-mgmt-managementgroups": [ - "setuptools" - ], - "azure-mgmt-managementpartner": [ - "setuptools" - ], - "azure-mgmt-maps": [ - "setuptools" - ], - "azure-mgmt-marketplaceordering": [ - "setuptools" - ], - "azure-mgmt-media": [ - "setuptools" - ], - "azure-mgmt-monitor": [ - "setuptools" - ], - "azure-mgmt-msi": [ - "setuptools" - ], - "azure-mgmt-netapp": [ - "setuptools" - ], - "azure-mgmt-network": [ - "setuptools" - ], - "azure-mgmt-notificationhubs": [ - "setuptools" - ], - "azure-mgmt-nspkg": [ - "setuptools" - ], - "azure-mgmt-policyinsights": [ - "setuptools" - ], - "azure-mgmt-powerbiembedded": [ - "setuptools" - ], - "azure-mgmt-privatedns": [ - "setuptools" - ], - "azure-mgmt-rdbms": [ - "setuptools" - ], - "azure-mgmt-recoveryservices": [ - "setuptools" - ], - "azure-mgmt-recoveryservicesbackup": [ - "setuptools" - ], - "azure-mgmt-redhatopenshift": [ - "setuptools" - ], - "azure-mgmt-redis": [ - "setuptools" - ], - "azure-mgmt-relay": [ - "setuptools" - ], - "azure-mgmt-reservations": [ - "setuptools" - ], - "azure-mgmt-resource": [ - "setuptools" - ], - "azure-mgmt-scheduler": [ - "setuptools" - ], - "azure-mgmt-search": [ - "setuptools" - ], - "azure-mgmt-security": [ - "setuptools" - ], - "azure-mgmt-servicebus": [ - "setuptools" - ], - "azure-mgmt-servicefabric": [ - "setuptools" - ], - "azure-mgmt-servicefabricmanagedclusters": [ - "setuptools" - ], - "azure-mgmt-servicelinker": [ - "setuptools" - ], - "azure-mgmt-signalr": [ - "setuptools" - ], - "azure-mgmt-sql": [ - "setuptools" - ], - "azure-mgmt-sqlvirtualmachine": [ - "setuptools" - ], - "azure-mgmt-storage": [ - "setuptools" - ], - "azure-mgmt-subscription": [ - "setuptools" - ], - "azure-mgmt-synapse": [ - "setuptools" - ], - "azure-mgmt-trafficmanager": [ - "setuptools" - ], - "azure-mgmt-web": [ - "setuptools" - ], - "azure-multiapi-storage": [ - "setuptools" - ], - "azure-nspkg": [ - "setuptools" - ], - "azure-servicebus": [ - "setuptools" - ], - "azure-servicefabric": [ - "setuptools" - ], - "azure-servicemanagement-legacy": [ - "setuptools" - ], - "azure-storage": [ - "setuptools" - ], - "azure-storage-blob": [ - "setuptools" - ], - "azure-storage-common": [ - "setuptools" - ], - "azure-storage-file": [ - "setuptools" - ], - "azure-storage-file-share": [ - "setuptools" - ], - "azure-storage-nspkg": [ - "setuptools" - ], - "azure-storage-queue": [ - "setuptools" - ], - "azure-synapse-accesscontrol": [ - "setuptools" - ], - "azure-synapse-artifacts": [ - "setuptools" - ], - "azure-synapse-managedprivateendpoints": [ - "setuptools" - ], - "azure-synapse-spark": [ - "setuptools" - ], - "b2sdk": [ - "setuptools", - "setuptools-scm" - ], - "babel": [ - "setuptools" - ], - "babelfish": [ - "setuptools" - ], - "babelgladeextractor": [ - "setuptools" - ], - "backcall": [ - "flit-core", - "setuptools" - ], - "backoff": [ - "poetry-core", - "setuptools" - ], - "backports-abc": [ - "setuptools" - ], - "backports-cached-property": [ - "setuptools", - "setuptools-scm" - ], - "backports-csv": [ - "setuptools" - ], - "backports-datetime-fromisoformat": [ - "setuptools" - ], - "backports-entry-points-selectable": [ - "setuptools", - "setuptools-scm" - ], - "backports-functools-lru-cache": [ - "setuptools", - "setuptools-scm" - ], - "backports-shutil-which": [ - "setuptools" - ], - "backports-ssl-match-hostname": [ - "setuptools", - "setuptools-scm" - ], - "backports-tempfile": [ - "setuptools", - "setuptools-scm" - ], - "backports-unittest-mock": [ - "setuptools", - "setuptools-scm" - ], - "backports-weakref": [ - "setuptools", - "setuptools-scm" - ], - "backports-zoneinfo": [ - "setuptools" - ], - "bagit": [ - "setuptools", - "setuptools-scm" - ], - "banal": [ - "setuptools" - ], - "bandit": [ - "pbr", - "setuptools" - ], - "bap": [ - "setuptools" - ], - "baron": [ - "setuptools" - ], - "base32-crockford": [ - "setuptools" - ], - "base36": [ - "setuptools" - ], - "base58": [ - "setuptools" - ], - "base58check": [ - "setuptools" - ], - "baseline": [ - "setuptools" - ], - "baselines": [ - "setuptools" - ], - "basemap": [ - "cython", - "setuptools" - ], - "basemap-data": [ - "setuptools" - ], - "bash-kernel": [ - "flit-core", - "setuptools" - ], - "bashlex": [ - "setuptools" - ], - "basiciw": [ - "setuptools" - ], - "batchgenerators": [ - "setuptools" - ], - "batchspawner": [ - "setuptools" - ], - "batinfo": [ - "setuptools" - ], - "bayesian-optimization": [ - "setuptools" - ], - "bayespy": [ - "setuptools" - ], - "bbox": [ - "setuptools" - ], - "bc-detect-secrets": [ - "setuptools" - ], - "bc-jsonpath-ng": [ - "setuptools" - ], - "bc-python-hcl2": [ - "setuptools" - ], - "bcdoc": [ - "setuptools" - ], - "bcrypt": [ - "setuptools" - ], - "beaker": [ - "setuptools" - ], - "beancount": [ - "setuptools" - ], - "beancount-docverif": [ - "setuptools", - "setuptools-scm" - ], - "beanstalkc": [ - "setuptools" - ], - "beartype": [ - "setuptools" - ], - "beautifulsoup4": [ - "hatchling", - "setuptools" - ], - "beautifultable": [ - "setuptools" - ], - "bech32": [ - "setuptools" - ], - "bedup": [ - "setuptools" - ], - "behave": [ - "setuptools" - ], - "bellows": [ - "setuptools" - ], - "bencode-py": [ - "setuptools" - ], - "beniget": [ - "setuptools" - ], - "bespon": [ - "setuptools" - ], - "betacode": [ - "setuptools" - ], - "betamax": [ - "setuptools" - ], - "betamax-matchers": [ - "setuptools" - ], - "betamax-serializers": [ - "setuptools" - ], - "betterproto": [ - "poetry-core", - "setuptools" - ], - "bibtexparser": [ - "setuptools" - ], - "bidict": [ - "setuptools" - ], - "bids-validator": [ - "setuptools" - ], - "biliass": [ - "setuptools" - ], - "billiard": [ - "setuptools" - ], - "bimmer-connected": [ - "pbr", - "setuptools" - ], - "binaryornot": [ - "setuptools" - ], - "bincopy": [ - "setuptools" - ], - "binho-host-adapter": [ - "setuptools" - ], - "binwalk": [ - "setuptools" - ], - "binwalk-full": [ - "setuptools" - ], - "biopython": [ - "setuptools" - ], - "bip-utils": [ - "setuptools" - ], - "biplist": [ - "setuptools" - ], - "bitarray": [ - "setuptools" - ], - "bitbox02": [ - "setuptools" - ], - "bitcoin-utils-fork-minimal": [ - "setuptools" - ], - "bitcoinlib": [ - "setuptools" - ], - "bitcoinrpc": [ - "setuptools" - ], - "bite-parser": [ - "poetry-core", - "setuptools" - ], - "bitlist": [ - "setuptools" - ], - "bitmath": [ - "setuptools" - ], - "bitsandbytes": [ - "setuptools" - ], - "bitstring": [ - "setuptools" - ], - "bitstruct": [ - "setuptools" - ], - "bitvavo-aio": [ - "setuptools" - ], - "bizkaibus": [ - "setuptools" - ], - "bjoern": [ - "setuptools" - ], - "bkcharts": [ - "setuptools" - ], - "black": [ - { - "buildSystem": "setuptools", - "until": "22.10.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "22.10.0" - }, - { - "buildSystem": "hatchling", - "from": "22.10.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "22.10.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "22.10.0" - } - ], - "black-macchiato": [ - "setuptools" - ], - "blacken-docs": [ - "setuptools" - ], - "bleach": [ - "setuptools" - ], - "bleak": [ - "poetry-core", - "setuptools" - ], - "bleak-retry-connector": [ - "poetry-core", - "setuptools" - ], - "blebox-uniapi": [ - "setuptools" - ], - "bless": [ - "setuptools" - ], - "blessed": [ - "setuptools" - ], - "blessings": [ - "setuptools" - ], - "blinker": [ - "setuptools" - ], - "blinkpy": [ - "setuptools" - ], - "blinkstick": [ - "setuptools" - ], - "blis": [ - "cython", - "setuptools" - ], - "block-io": [ - "setuptools" - ], - "blockchain": [ - "setuptools" - ], - "blockdiag": [ - "setuptools" - ], - "blocksat-cli": [ - "setuptools" - ], - "blspy": [ - "setuptools", - "setuptools-scm" - ], - "blue": [ - "setuptools" - ], - "bluemaestro-ble": [ - "poetry-core", - "setuptools" - ], - "bluepy": [ - "setuptools" - ], - "bluepy-devices": [ - "setuptools" - ], - "bluetooth-adapters": [ - "poetry-core", - "setuptools" - ], - "bluetooth-auto-recovery": [ - "poetry-core", - "setuptools" - ], - "bluetooth-data-tools": [ - "poetry-core", - "setuptools" - ], - "bluetooth-sensor-state-data": [ - "poetry-core", - "setuptools" - ], - "blurhash": [ - "setuptools" - ], - "bme280spi": [ - "setuptools" - ], - "bme680": [ - "setuptools" - ], - "bokeh": [ - "setuptools" - ], - "boltons": [ - "setuptools" - ], - "boltz-client": [ - "poetry" - ], - "boltztrap2": [ - "cython", - "setuptools" - ], - "bond-api": [ - "setuptools" - ], - "bond-async": [ - "setuptools" - ], - "boolean-py": [ - "setuptools" - ], - "booleanoperations": [ - "setuptools", - "setuptools-scm" - ], - "boost-histogram": [ - "setuptools", - "setuptools-scm" - ], - "boschshcpy": [ - "setuptools" - ], - "boto": [ - "setuptools" - ], - "boto3": [ - "setuptools" - ], - "boto3-stubs": [ - "setuptools" - ], - "botocore": [ - "setuptools" - ], - "botocore-stubs": [ - "poetry-core", - "setuptools" - ], - "bottle": [ - "setuptools" - ], - "bottleneck": [ - "setuptools" - ], - "boxx": [ - "setuptools" - ], - "bpycv": [ - "setuptools" - ], - "bpython": [ - "setuptools" - ], - "braceexpand": [ - "setuptools" - ], - "bracex": [ - "hatchling", - "setuptools" - ], - "braintree": [ - "setuptools" - ], - "branca": [ - "setuptools" - ], - "bravado-core": [ - "setuptools" - ], - "bravia-tv": [ - "setuptools" - ], - "breathe": [ - "setuptools" - ], - "breezy": [ - "setuptools" - ], - "brelpy": [ - "setuptools" - ], - "broadlink": [ - "setuptools" - ], - "brother": [ - "setuptools" - ], - "brother-ql": [ - "setuptools" - ], - "brotli": [ - "setuptools" - ], - "brotlicffi": [ - "setuptools" - ], - "brotlipy": [ - "setuptools" - ], - "brottsplatskartan": [ - "setuptools" - ], - "browser-cookie3": [ - "setuptools" - ], - "brunns-matchers": [ - "setuptools" - ], - "brunns-row": [ - "setuptools" - ], - "brunt": [ - "setuptools" - ], - "bsblan": [ - "poetry-core", - "setuptools" - ], - "bsddb3": [ - "setuptools" - ], - "bsdiff4": [ - "setuptools" - ], - "bson": [ - "setuptools" - ], - "bsuite": [ - "setuptools" - ], - "bt-proximity": [ - "setuptools" - ], - "btchip": [ - "setuptools" - ], - "bthome-ble": [ - "poetry-core", - "setuptools" - ], - "btrees": [ - "setuptools" - ], - "btrfs": [ - "setuptools" - ], - "btrfsutil": [ - "setuptools" - ], - "btsocket": [ - "setuptools" - ], - "bucketstore": [ - "setuptools" - ], - "bugsnag": [ - "setuptools" - ], - "bugwarrior": [ - "setuptools" - ], - "bugz": [ - "setuptools" - ], - "bugzilla": [ - "setuptools" - ], - "buienradar": [ - "setuptools" - ], - "build": [ - { - "buildSystem": "setuptools", - "until": "0.10.0" - }, - { - "buildSystem": "flit-core", - "from": "0.10.0" - } - ], - "buildbot": [ - "setuptools" - ], - "buildbot-full": [ - "setuptools" - ], - "buildbot-pkg": [ - "setuptools" - ], - "buildbot-plugins-console-view": [ - "setuptools" - ], - "buildbot-plugins-grid-view": [ - "setuptools" - ], - "buildbot-plugins-waterfall-view": [ - "setuptools" - ], - "buildbot-plugins-wsgi-dashboards": [ - "setuptools" - ], - "buildbot-plugins-www": [ - "setuptools" - ], - "buildbot-ui": [ - "setuptools" - ], - "buildbot-worker": [ - "setuptools" - ], - "buildcatrust": [ - "setuptools" - ], - "builddsl": [ - "poetry" - ], - "bumps": [ - "setuptools" - ], - "bunch": [ - "setuptools" - ], - "bundlewrap": [ - "setuptools" - ], - "bwapy": [ - "setuptools" - ], - "bx-python": [ - "cython", - "setuptools" - ], - "bytecode": [ - "setuptools" - ], - "bz2file": [ - "setuptools" - ], - "cachecontrol": [ - "setuptools" - ], - "cached-property": [ - "setuptools" - ], - "cachelib": [ - "setuptools" - ], - "cachetools": [ - "setuptools" - ], - "cachey": [ - "setuptools" - ], - "cachy": [ - "setuptools" - ], - "caio": [ - "setuptools" - ], - "cairo-lang": [ - "setuptools" - ], - "cairocffi": [ - "setuptools" - ], - "cairosvg": [ - "setuptools" - ], - "caldav": [ - "setuptools" - ], - "callee": [ - "setuptools" - ], - "calmjs-parse": [ - "setuptools" - ], - "can": [ - "setuptools" - ], - "canmatrix": [ - "setuptools" - ], - "canonicaljson": [ - "setuptools" - ], - "canopen": [ - "setuptools", - "setuptools-scm" - ], - "capstone": [ - "setuptools" - ], - "capturer": [ - "setuptools" - ], - "carbon": [ - "setuptools" - ], - "cart": [ - "setuptools" - ], - "cartopy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "casa-formats-io": [ - "setuptools", - "setuptools-scm" - ], - "casbin": [ - "setuptools" - ], - "case": [ - "setuptools" - ], - "casefy": [ - "hatchling" - ], - "cashu": [ - "poetry" - ], - "cassandra-driver": [ - "cython", - "setuptools" - ], - "castepxbin": [ - "setuptools" - ], - "casttube": [ - "setuptools" - ], - "catalogue": [ - "setuptools" - ], - "catboost": [ - "setuptools" - ], - "cattrs": [ - "poetry-core", - "setuptools" - ], - "cbeams": [ - "setuptools" - ], - "cbor": [ - "setuptools" - ], - "cbor2": [ - "setuptools", - "setuptools-scm" - ], - "cccolutils": [ - "setuptools" - ], - "cchardet": [ - "setuptools" - ], - "cdcs": [ - "setuptools" - ], - "celery": [ - "setuptools" - ], - "celery-redbeat": [ - "setuptools" - ], - "cement": [ - "setuptools" - ], - "censys": [ - "poetry-core", - "setuptools" - ], - "cepa": [ - "setuptools" - ], - "cerberus": [ - "setuptools" - ], - "cert-chain-resolver": [ - "setuptools" - ], - "certauth": [ - "setuptools" - ], - "certbot": [ - "setuptools" - ], - "certbot-dns-cloudflare": [ - "setuptools" - ], - "certbot-dns-google": [ - "setuptools" - ], - "certbot-dns-inwx": [ - "setuptools" - ], - "certbot-dns-rfc2136": [ - "setuptools" - ], - "certbot-dns-route53": [ - "setuptools" - ], - "certifi": [ - "setuptools" - ], - "certipy": [ - "setuptools" - ], - "certomancer": [ - "setuptools" - ], - "certvalidator": [ - "setuptools" - ], - "cexprtk": [ - "setuptools" - ], - "cfel-pylint-checkers": [ - "poetry-core" - ], - "cffi": [ - "setuptools" - ], - "cffsubr": [ - "setuptools", - "setuptools-scm" - ], - "cfgv": [ - "setuptools" - ], - "cfn-flip": [ - "setuptools" - ], - "cfn-lint": [ - "setuptools" - ], - "cfnresponse": [ - "setuptools" - ], - "cfscrape": [ - "setuptools" - ], - "cftime": [ - "cython", - "setuptools" - ], - "cgen": [ - "setuptools" - ], - "cgroup-utils": [ - "setuptools" - ], - "chacha20poly1305-reuseable": [ - "poetry-core", - "setuptools" - ], - "chai": [ - "setuptools" - ], - "chainer": [ - "setuptools" - ], - "chainmap": [ - "setuptools" - ], - "chalice": [ - "setuptools" - ], - "chameleon": [ - "setuptools" - ], - "channels": [ - "setuptools" - ], - "channels-redis": [ - "setuptools" - ], - "characteristic": [ - "setuptools" - ], - "chardet": [ - "setuptools" - ], - "charset-normalizer": [ - "setuptools" - ], - "chart-studio": [ - "setuptools" - ], - "chat-downloader": [ - "setuptools" - ], - "check-manifest": [ - "setuptools" - ], - "cheetah3": [ - "setuptools" - ], - "cheroot": [ - "setuptools", - "setuptools-scm" - ], - "cherrypy": [ - "setuptools", - "setuptools-scm" - ], - "chess": [ - "setuptools" - ], - "chevron": [ - "setuptools" - ], - "chex": [ - "setuptools" - ], - "chia-rs": [ - "setuptools" - ], - "chiabip158": [ - "setuptools", - "setuptools-scm" - ], - "chiapos": [ - "setuptools", - "setuptools-scm" - ], - "chiavdf": [ - "setuptools", - "setuptools-scm" - ], - "chirpstack-api": [ - "setuptools" - ], - "chispa": [ - "poetry-core", - "setuptools" - ], - "ci-info": [ - "setuptools" - ], - "ci-py": [ - "setuptools" - ], - "cinemagoer": [ - "setuptools" - ], - "circuit-webhook": [ - "setuptools" - ], - "circuitbreaker": [ - "setuptools" - ], - "cirq": [ - "setuptools" - ], - "cirq-aqt": [ - "setuptools" - ], - "cirq-core": [ - "setuptools" - ], - "cirq-google": [ - "setuptools" - ], - "cirq-ionq": [ - "setuptools" - ], - "cirq-pasqal": [ - "setuptools" - ], - "cirq-rigetti": [ - "setuptools" - ], - "cirq-web": [ - "setuptools" - ], - "ciscoconfparse": [ - "poetry-core", - "setuptools" - ], - "ciscomobilityexpress": [ - "setuptools" - ], - "ciso8601": [ - "setuptools" - ], - "citeproc-py": [ - "setuptools" - ], - "cjkwrap": [ - "setuptools" - ], - "ckcc-protocol": [ - "setuptools" - ], - "claripy": [ - "setuptools" - ], - "class-registry": [ - "setuptools" - ], - "classify-imports": [ - "setuptools" - ], - "cld2-cffi": [ - "setuptools" - ], - "cle": [ - "setuptools" - ], - "cleo": [ - "poetry-core", - "setuptools" - ], - "clevercsv": [ - "setuptools" - ], - "clf": [ - "setuptools" - ], - "cli-helpers": [ - "setuptools" - ], - "click": [ - "setuptools" - ], - "click-completion": [ - "setuptools" - ], - "click-configfile": [ - "setuptools" - ], - "click-datetime": [ - "setuptools" - ], - "click-default-group": [ - "setuptools" - ], - "click-didyoumean": [ - { - "buildSystem": "setuptools", - "until": "0.2.0" - }, - { - "buildSystem": "poetry", - "from": "0.2.0" - } - ], - "click-help-colors": [ - "setuptools" - ], - "click-log": [ - "setuptools" - ], - "click-odoo": [ - "setuptools-scm" - ], - "click-odoo-contrib": [ - "setuptools" - ], - "click-option-group": [ - "setuptools" - ], - "click-plugins": [ - "setuptools" - ], - "click-repl": [ - "setuptools" - ], - "click-spinner": [ - "setuptools" - ], - "click-threading": [ - "setuptools" - ], - "clickclick": [ - "setuptools" - ], - "clickgen": [ - "setuptools" - ], - "clickhouse-cityhash": [ - "setuptools" - ], - "clickhouse-cli": [ - "setuptools" - ], - "clickhouse-driver": [ - "setuptools" - ], - "cliff": [ - "pbr", - "setuptools" - ], - "clifford": [ - "setuptools" - ], - "cligj": [ - "setuptools" - ], - "clikit": [ - "poetry-core", - "setuptools" - ], - "clint": [ - "setuptools" - ], - "clintermission": [ - "setuptools" - ], - "clize": [ - "setuptools", - "setuptools-scm" - ], - "clldutils": [ - "setuptools" - ], - "cloudflare": [ - "setuptools" - ], - "cloudflare-dyndns": [ - "poetry-core", - "setuptools" - ], - "cloudinary": [ - "setuptools" - ], - "cloudpickle": [ - "setuptools" - ], - "cloudscraper": [ - "setuptools" - ], - "cloudsmith-api": [ - "setuptools" - ], - "cloudsplaining": [ - "setuptools" - ], - "cloup": [ - "setuptools", - "setuptools-scm" - ], - "clustershell": [ - "setuptools" - ], - "clvm": [ - "setuptools", - "setuptools-scm" - ], - "clvm-rs": [ - "setuptools" - ], - "clvm-tools": [ - "setuptools", - "setuptools-scm" - ], - "clvm-tools-rs": [ - "setuptools" - ], - "cma": [ - "setuptools" - ], - "cmarkgfm": [ - "setuptools" - ], - "cmd2": [ - "setuptools", - "setuptools-scm" - ], - "cmdline": [ - "setuptools" - ], - "cmdstanpy": [ - "setuptools" - ], - "cmigemo": [ - "setuptools" - ], - "cmsis-pack-manager": [ - "setuptools", - "setuptools-scm" - ], - "cmsis-svd": [ - "setuptools" - ], - "cnvkit": [ - "setuptools" - ], - "co2signal": [ - "setuptools" - ], - "coapthon3": [ - "setuptools" - ], - "cock": [ - "setuptools" - ], - "coconut": [ - "setuptools" - ], - "cocotb": [ - "setuptools", - "setuptools-scm" - ], - "cocotb-bus": [ - "setuptools" - ], - "codecov": [ - "setuptools" - ], - "codepy": [ - "setuptools" - ], - "codespell": [ - "setuptools" - ], - "cogapp": [ - "setuptools" - ], - "coincurve": [ - "setuptools" - ], - "coinmetrics-api-client": [ - "poetry-core", - "setuptools" - ], - "colander": [ - "babel", - "setuptools" - ], - "colanderalchemy": [ - "setuptools" - ], - "collections-extended": [ - "poetry-core", - "setuptools" - ], - "color-operations": [ - "setuptools" - ], - "colorama": [ - { - "buildSystem": "hatchling", - "from": "0.4.6" - }, - "setuptools" - ], - "colorcet": [ - "setuptools" - ], - "colorclass": [ - "poetry", - "setuptools" - ], - "colored": [ - "setuptools" - ], - "colored-traceback": [ - "setuptools" - ], - "coloredlogs": [ - "setuptools" - ], - "colorful": [ - "setuptools" - ], - "colorhash": [ - "poetry" - ], - "colorlog": [ - "setuptools" - ], - "colorlover": [ - "setuptools" - ], - "colormath": [ - "setuptools" - ], - "colorspacious": [ - "setuptools" - ], - "colorthief": [ - "setuptools" - ], - "colorzero": [ - "setuptools" - ], - "colour": [ - "setuptools" - ], - "cometblue-lite": [ - "setuptools" - ], - "comm": [ - "hatchling" - ], - "commandparse": [ - "setuptools" - ], - "commentjson": [ - "setuptools" - ], - "commitizen": [ - "poetry-core" - ], - "commoncode": [ - "setuptools", - "setuptools-scm" - ], - "commonmark": [ - "setuptools" - ], - "compiledb": [ - "setuptools" - ], - "compreffor": [ - "setuptools", - "setuptools-scm" - ], - "concurrent-log-handler": [ - "setuptools" - ], - "conda": [ - "setuptools" - ], - "config-formatter": [ - "setuptools" - ], - "configargparse": [ - "setuptools" - ], - "configclass": [ - "setuptools" - ], - "confight": [ - "setuptools" - ], - "configobj": [ - "setuptools" - ], - "configparser": [ - "setuptools", - "setuptools-scm" - ], - "configshell": [ - "setuptools" - ], - "configupdater": [ - "setuptools", - "setuptools-scm" - ], - "confluent-kafka": [ - "setuptools" - ], - "confusable-homoglyphs": [ - "setuptools" - ], - "confuse": [ - "flit-core", - "setuptools" - ], - "connect-box": [ - "setuptools" - ], - "connection-pool": [ - "setuptools" - ], - "connexion": [ - "setuptools" - ], - "cons": [ - "setuptools" - ], - "consonance": [ - "setuptools" - ], - "constantly": [ - "setuptools" - ], - "construct": [ - "setuptools" - ], - "construct-classes": [ - "poetry-core" - ], - "constructs": [ - "setuptools" - ], - "consul": [ - "setuptools" - ], - "consulate": [ - "setuptools" - ], - "container-inspector": [ - "setuptools", - "setuptools-scm" - ], - "contexter": [ - "setuptools" - ], - "contextlib2": [ - "setuptools" - ], - "contexttimer": [ - "setuptools" - ], - "contourpy": [ - "pybind11", - "setuptools" - ], - "convertdate": [ - "setuptools" - ], - "cookiecutter": [ - "setuptools" - ], - "cookies": [ - "setuptools" - ], - "coordinates": [ - "setuptools" - ], - "copier": [ - "poetry-core", - "poetry-dynamic-versioning" - ], - "copier-template-tester": [ - "poetry-core" - ], - "coqpit": [ - "setuptools" - ], - "coqui-trainer": [ - "setuptools" - ], - "corallium": [ - "poetry-core" - ], - "coreapi": [ - "setuptools" - ], - "coreschema": [ - "setuptools" - ], - "cornice": [ - "setuptools" - ], - "coronavirus": [ - "setuptools" - ], - "corsair-scan": [ - "setuptools" - ], - "cot": [ - "setuptools" - ], - "covcore": [ - "setuptools" - ], - "coverage": [ - "setuptools" - ], - "coveralls": [ - "setuptools" - ], - "cppe": [ - "setuptools" - ], - "cppheaderparser": [ - "setuptools" - ], - "cppy": [ - "setuptools", - "setuptools-scm" - ], - "cpyparsing": [ - "cython", - "setuptools" - ], - "cram": [ - "setuptools" - ], - "cramjam": [ - "setuptools" - ], - "crashtest": [ - "poetry-core", - "setuptools" - ], - "crate": [ - "setuptools" - ], - "crayons": [ - "setuptools" - ], - "crc16": [ - "setuptools" - ], - "crc32c": [ - "setuptools" - ], - "crccheck": [ - "setuptools" - ], - "crcmod": [ - "setuptools" - ], - "credis": [ - "cython", - "poetry-core" - ], - "credstash": [ - "setuptools" - ], - "crispy-bootstrap5": [ - "setuptools" - ], - "criticality-score": [ - "setuptools" - ], - "cron-descriptor": [ - "setuptools" - ], - "croniter": [ - "setuptools" - ], - "cronsim": [ - "setuptools" - ], - "crossplane": [ - "setuptools" - ], - "crownstone-cloud": [ - "setuptools" - ], - "crownstone-core": [ - "setuptools" - ], - "crownstone-sse": [ - "setuptools" - ], - "crownstone-uart": [ - "setuptools" - ], - "cruft": [ - "poetry-core" - ], - "cryptg": [ - "setuptools" - ], - "cryptography": [ - "setuptools" - ], - "cryptolyzer": [ - "setuptools" - ], - "cryptoparser": [ - "setuptools" - ], - "crytic-compile": [ - "setuptools" - ], - "csrmesh": [ - "setuptools" - ], - "css-html-js-minify": [ - "setuptools" - ], - "css-parser": [ - "setuptools" - ], - "cssbeautifier": [ - "setuptools" - ], - "csscompressor": [ - "setuptools" - ], - "cssmin": [ - "setuptools" - ], - "cssselect": [ - "setuptools" - ], - "cssselect2": [ - "flit", - "flit-core", - "setuptools" - ], - "cssutils": [ - "setuptools", - "setuptools-scm" - ], - "csvw": [ - "setuptools" - ], - "cucumber-tag-expressions": [ - "setuptools" - ], - "cufflinks": [ - "setuptools" - ], - "cupy": [ - "cython", - "setuptools" - ], - "curio": [ - "setuptools" - ], - "curtsies": [ - "setuptools" - ], - "curve25519-donna": [ - "setuptools" - ], - "customerio": [ - "setuptools" - ], - "cvxopt": [ - "setuptools" - ], - "cvxpy": [ - "setuptools" - ], - "cwcwidth": [ - "cython", - "setuptools" - ], - "cx-freeze": [ - "setuptools" - ], - "cx-oracle": [ - "setuptools" - ], - "cxxfilt": [ - "setuptools" - ], - "cycler": [ - "setuptools" - ], - "cyclonedx-python-lib": [ - "poetry-core", - "setuptools" - ], - "cymem": [ - "cython", - "setuptools" - ], - "cypari2": [ - "cython", - "setuptools" - ], - "cypherpunkpay": [ - "poetry-core", - "setuptools" - ], - "cysignals": [ - "cython", - "setuptools" - ], - "cysimdjson": [ - "cython" - ], - "cysystemd": [ - "setuptools" - ], - "cython": [ - "setuptools" - ], - "cython-3": [ - "setuptools" - ], - "cytoolz": [ - "cython", - "setuptools" - ], - "d20": [ - "setuptools" - ], - "d2to1": [ - "setuptools" - ], - "dacite": [ - "setuptools" - ], - "daemonize": [ - "setuptools" - ], - "daemonocle": [ - "setuptools" - ], - "dalle-mini": [ - "setuptools" - ], - "daphne": [ - "setuptools" - ], - "darglint": [ - "poetry" - ], - "dasbus": [ - "setuptools" - ], - "dash": [ - "setuptools" - ], - "dash-core-components": [ - "setuptools" - ], - "dash-html-components": [ - "setuptools" - ], - "dash-renderer": [ - "setuptools" - ], - "dash-table": [ - "setuptools" - ], - "dask": [ - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "dask-gateway": [ - "setuptools" - ], - "dask-gateway-server": [ - "setuptools" - ], - "dask-glm": [ - "setuptools", - "setuptools-scm" - ], - "dask-image": [ - "setuptools" - ], - "dask-jobqueue": [ - "setuptools" - ], - "dask-ml": [ - "setuptools", - "setuptools-scm" - ], - "dask-mpi": [ - "setuptools" - ], - "dask-yarn": [ - "setuptools" - ], - "databases": [ - "setuptools" - ], - "databind": [ - "poetry" - ], - "databind-core": [ - "poetry" - ], - "databind-json": [ - "poetry" - ], - "databricks-cli": [ - "setuptools" - ], - "databricks-connect": [ - "setuptools" - ], - "databricks-sql-connector": [ - "poetry-core" - ], - "dataclass-wizard": [ - "setuptools" - ], - "dataclasses-json": [ - "setuptools" - ], - "dataclasses-serialization": [ - "setuptools" - ], - "datadiff": [ - "setuptools" - ], - "datadog": [ - "hatchling", - "setuptools" - ], - "datafusion": [ - "setuptools" - ], - "datamodeldict": [ - "setuptools" - ], - "datapoint": [ - "setuptools" - ], - "datargs": [ - "poetry" - ], - "dataset": [ - "setuptools" - ], - "datasets": [ - "setuptools" - ], - "datasette": [ - "setuptools" - ], - "datasette-template-sql": [ - "setuptools" - ], - "datashader": [ - "setuptools" - ], - "datashape": [ - "setuptools" - ], - "datauri": [ - "setuptools" - ], - "dateparser": [ - "setuptools" - ], - "dateutil": [ - "setuptools", - "setuptools-scm" - ], - "dateutils": [ - "setuptools" - ], - "datrie": [ - "cython", - "setuptools" - ], - "dawg-python": [ - "setuptools" - ], - "db-dtypes": [ - "setuptools" - ], - "dbf": [ - "setuptools" - ], - "dbfread": [ - "setuptools" - ], - "dbus-client-gen": [ - "setuptools" - ], - "dbus-fast": [ - "poetry-core", - "setuptools" - ], - "dbus-next": [ - "setuptools" - ], - "dbus-python": [ - "setuptools" - ], - "dbus-python-client-gen": [ - "setuptools" - ], - "dbus-signature-pyparsing": [ - "setuptools" - ], - "dbutils": [ - "setuptools" - ], - "ddsketch": [ - "setuptools" - ], - "ddt": [ - "setuptools" - ], - "ddtrace": [ - "cython", - "setuptools" - ], - "deal": [ - "flit-core", - "setuptools" - ], - "deal-solver": [ - "flit-core", - "setuptools" - ], - "deap": [ - "setuptools" - ], - "debian": [ - "setuptools" - ], - "debian-inspector": [ - "setuptools", - "setuptools-scm" - ], - "debtcollector": [ - "pbr", - "setuptools" - ], - "debts": [ - "setuptools" - ], - "debuglater": [ - "setuptools" - ], - "debugpy": [ - "setuptools" - ], - "decli": [ - "setuptools" - ], - "decopatch": [ - "setuptools", - "setuptools-scm" - ], - "decorator": [ - "setuptools" - ], - "deemix": [ - "setuptools" - ], - "deep-chainmap": [ - "setuptools" - ], - "deep-merge": [ - "setuptools" - ], - "deep-translator": [ - "setuptools" - ], - "deepdiff": [ - "setuptools" - ], - "deepdish": [ - "setuptools" - ], - "deepmerge": [ - "setuptools", - "setuptools-scm" - ], - "deeptoolsintervals": [ - "setuptools" - ], - "deepwave": [ - "setuptools" - ], - "deezer-py": [ - "setuptools" - ], - "deezer-python": [ - "poetry-core", - "setuptools" - ], - "defcon": [ - "setuptools", - "setuptools-scm" - ], - "deform": [ - "setuptools" - ], - "defusedxml": [ - "setuptools" - ], - "delegator-py": [ - "setuptools" - ], - "delorean": [ - "setuptools" - ], - "deltachat": [ - "setuptools", - "setuptools-scm" - ], - "deluge-client": [ - "setuptools" - ], - "demetriek": [ - "poetry-core" - ], - "demjson3": [ - "setuptools" - ], - "dendropy": [ - "setuptools" - ], - "denonavr": [ - "setuptools" - ], - "dependency-injector": [ - "setuptools" - ], - "deploykit": [ - "setuptools" - ], - "deprecated": [ - "setuptools" - ], - "deprecation": [ - "setuptools" - ], - "derpconf": [ - "setuptools" - ], - "desktop-notifier": [ - "setuptools" - ], - "detect-secrets": [ - "setuptools" - ], - "devito": [ - "setuptools" - ], - "devolo-home-control-api": [ - "setuptools", - "setuptools-scm" - ], - "devolo-plc-api": [ - "setuptools", - "setuptools-scm" - ], - "devtools": [ - "setuptools" - ], - "diagrams": [ - "poetry-core", - "setuptools" - ], - "diceware": [ - "setuptools" - ], - "dicom2nifti": [ - "setuptools" - ], - "dict2xml": [ - "setuptools" - ], - "dictdiffer": [ - "setuptools", - "setuptools-scm" - ], - "dictionaries": [ - "setuptools" - ], - "dictpath": [ - "setuptools" - ], - "dicttoxml": [ - "setuptools" - ], - "dicttoxml2": [ - "setuptools" - ], - "diff-cover": [ - "setuptools" - ], - "diff-match-patch": [ - "setuptools" - ], - "digi-xbee": [ - "setuptools" - ], - "digital-ocean": [ - "setuptools" - ], - "dill": [ - "setuptools" - ], - "dinghy": [ - "setuptools" - ], - "dingz": [ - "setuptools" - ], - "diofant": [ - "setuptools", - "setuptools-scm" - ], - "dipy": [ - "cython", - "setuptools" - ], - "directv": [ - "setuptools" - ], - "dirty-equals": [ - "poetry-core", - "setuptools" - ], - "discid": [ - "setuptools" - ], - "discogs-client": [ - "setuptools" - ], - "discordpy": [ - "setuptools" - ], - "discovery30303": [ - "poetry-core", - "setuptools" - ], - "diskcache": [ - "setuptools" - ], - "dissect": [ - "setuptools", - "setuptools-scm" - ], - "dissect-cim": [ - "setuptools", - "setuptools-scm" - ], - "dissect-clfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-cstruct": [ - "setuptools", - "setuptools-scm" - ], - "dissect-esedb": [ - "setuptools", - "setuptools-scm" - ], - "dissect-etl": [ - "setuptools", - "setuptools-scm" - ], - "dissect-eventlog": [ - "setuptools", - "setuptools-scm" - ], - "dissect-evidence": [ - "setuptools", - "setuptools-scm" - ], - "dissect-extfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-fat": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ffs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-hypervisor": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ntfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ole": [ - "setuptools", - "setuptools-scm" - ], - "dissect-regf": [ - "setuptools", - "setuptools-scm" - ], - "dissect-shellitem": [ - "setuptools", - "setuptools-scm" - ], - "dissect-sql": [ - "setuptools", - "setuptools-scm" - ], - "dissect-target": [ - "setuptools", - "setuptools-scm" - ], - "dissect-util": [ - "setuptools", - "setuptools-scm" - ], - "dissect-vmfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-volume": [ - "setuptools", - "setuptools-scm" - ], - "dissect-xfs": [ - "setuptools", - "setuptools-scm" - ], - "dissononce": [ - "setuptools" - ], - "distlib": [ - "setuptools" - ], - "distorm3": [ - "setuptools" - ], - "distrax": [ - "setuptools" - ], - "distributed": [ - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "distro": [ - "setuptools" - ], - "distutils-extra": [ - "setuptools" - ], - "dj-database-url": [ - "setuptools" - ], - "dj-email-url": [ - "setuptools" - ], - "dj-inmemorystorage": [ - "setuptools" - ], - "dj-rest-auth": [ - "setuptools" - ], - "dj-search-url": [ - "setuptools" - ], - "django": [ - "setuptools" - ], - "django-3": [ - "setuptools" - ], - "django-4": [ - "setuptools" - ], - "django-admin-sortable2": [ - "setuptools" - ], - "django-allauth": [ - "setuptools" - ], - "django-anymail": [ - "setuptools" - ], - "django-appconf": [ - "setuptools" - ], - "django-auth-ldap": [ - "setuptools", - "setuptools-scm" - ], - "django-bootstrap-form": [ - "setuptools" - ], - "django-cache-memoize": [ - "setuptools" - ], - "django-cache-url": [ - "setuptools" - ], - "django-cacheops": [ - "setuptools" - ], - "django-celery-beat": [ - "setuptools" - ], - "django-celery-email": [ - "setuptools" - ], - "django-classytags": [ - "setuptools" - ], - "django-cleanup": [ - "setuptools" - ], - "django-cockroachdb": [ - "setuptools" - ], - "django-colorfield": [ - "setuptools" - ], - "django-colorful": [ - "setuptools" - ], - "django-compat": [ - "setuptools" - ], - "django-compressor": [ - "setuptools" - ], - "django-configurations": [ - "setuptools", - "setuptools-scm" - ], - "django-contrib-comments": [ - "setuptools" - ], - "django-cors-headers": [ - "setuptools" - ], - "django-countries": [ - "setuptools" - ], - "django-coverage-plugin": [ - "setuptools" - ], - "django-crispy-forms": [ - "setuptools" - ], - "django-cryptography": [ - "setuptools" - ], - "django-csp": [ - "setuptools" - ], - "django-debug-toolbar": [ - { - "buildSystem": "setuptools", - "until": "3.8.0" - }, - { - "buildSystem": "hatchling", - "from": "3.8.0" - } - ], - "django-discover-runner": [ - "setuptools" - ], - "django-dynamic-preferences": [ - "setuptools" - ], - "django-encrypted-model-fields": [ - "poetry-core", - "setuptools" - ], - "django-environ": [ - "setuptools" - ], - "django-extensions": [ - "setuptools" - ], - "django-filter": [ - "setuptools" - ], - "django-floppyforms": [ - "setuptools" - ], - "django-formtools": [ - "setuptools", - "setuptools-scm" - ], - "django-graphiql-debug-toolbar": [ - "poetry-core", - "setuptools" - ], - "django-gravatar2": [ - "setuptools" - ], - "django-guardian": [ - "setuptools" - ], - "django-haystack": [ - "setuptools", - "setuptools-scm" - ], - "django-health-check": [ - "setuptools", - "setuptools-scm" - ], - "django-hijack": [ - "setuptools" - ], - "django-htmx": [ - "setuptools" - ], - "django-ipware": [ - "setuptools" - ], - "django-jinja": [ - "setuptools" - ], - "django-js-asset": [ - "setuptools" - ], - "django-logentry-admin": [ - "setuptools" - ], - "django-mailman3": [ - "setuptools" - ], - "django-maintenance-mode": [ - "setuptools" - ], - "django-model-utils": [ - "setuptools", - "setuptools-scm" - ], - "django-modelcluster": [ - "setuptools" - ], - "django-modeltranslation": [ - "setuptools" - ], - "django-mptt": [ - "setuptools" - ], - "django-multiselectfield": [ - "setuptools" - ], - "django-nested-admin": [ - "setuptools" - ], - "django-nose": [ - "setuptools" - ], - "django-oauth-toolkit": [ - "setuptools" - ], - "django-otp": [ - "setuptools" - ], - "django-paintstore": [ - "setuptools" - ], - "django-permissionedforms": [ - "setuptools" - ], - "django-pglocks": [ - "setuptools" - ], - "django-phonenumber-field": [ - "setuptools", - "setuptools-scm" - ], - "django-picklefield": [ - "setuptools" - ], - "django-polymorphic": [ - "setuptools" - ], - "django-postgresql-netfields": [ - "setuptools" - ], - "django-prometheus": [ - "setuptools" - ], - "django-q": [ - "poetry-core", - "setuptools" - ], - "django-ranged-response": [ - "setuptools" - ], - "django-raster": [ - "setuptools" - ], - "django-redis": [ - "setuptools" - ], - "django-registration": [ - "setuptools" - ], - "django-rest-auth": [ - "setuptools" - ], - "django-rest-polymorphic": [ - "setuptools" - ], - "django-rest-swagger": [ - "setuptools" - ], - "django-reversion": [ - "setuptools" - ], - "django-rosetta": [ - "setuptools" - ], - "django-rq": [ - "setuptools" - ], - "django-sesame": [ - "setuptools" - ], - "django-silk": [ - "setuptools", - "setuptools-scm" - ], - "django-simple-captcha": [ - "setuptools" - ], - "django-sites": [ - "setuptools" - ], - "django-sr": [ - "setuptools" - ], - "django-statici18n": [ - "setuptools" - ], - "django-storages": [ - "setuptools" - ], - "django-stubs": [ - "setuptools" - ], - "django-stubs-ext": [ - "setuptools" - ], - "django-tables2": [ - "setuptools" - ], - "django-tagging": [ - "setuptools" - ], - "django-taggit": [ - "setuptools" - ], - "django-tastypie": [ - "setuptools" - ], - "django-timezone-field": [ - "poetry-core", - "setuptools" - ], - "django-treebeard": [ - "setuptools" - ], - "django-types": [ - "poetry-core" - ], - "django-versatileimagefield": [ - "setuptools" - ], - "django-webpack-loader": [ - "setuptools" - ], - "django-widget-tweaks": [ - "setuptools", - "setuptools-scm" - ], - "djangoql": [ - "setuptools" - ], - "djangorestframework": [ - "setuptools" - ], - "djangorestframework-camel-case": [ - "setuptools" - ], - "djangorestframework-dataclasses": [ - "setuptools" - ], - "djangorestframework-guardian": [ - "setuptools" - ], - "djangorestframework-jwt": [ - "setuptools" - ], - "djangorestframework-recursive": [ - "setuptools" - ], - "djangorestframework-simplejwt": [ - "setuptools", - "setuptools-scm" - ], - "djangorestframework-stubs": [ - "setuptools" - ], - "djangorestframework-types": [ - "poetry" - ], - "djlint": [ - "poetry" - ], - "djmail": [ - "setuptools" - ], - "dkimpy": [ - "setuptools" - ], - "dlib": [ - "setuptools" - ], - "dlinfo": [ - "setuptools", - "setuptools-scm" - ], - "dlx": [ - "setuptools" - ], - "dm-env": [ - "setuptools" - ], - "dm-haiku": [ - "setuptools" - ], - "dm-sonnet": [ - "setuptools" - ], - "dm-tree": [ - "setuptools" - ], - "dmenu-python": [ - "setuptools" - ], - "dnachisel": [ - "setuptools" - ], - "dns": [ - "setuptools", - "setuptools-scm" - ], - "dnslib": [ - "setuptools" - ], - "dnspython": [ - "poetry-core", - "setuptools", - "setuptools-scm" - ], - "dnspythonchia": [ - "setuptools", - "setuptools-scm" - ], - "dnsq": [ - "setuptools" - ], - "doc8": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "docformatter": [ - { - "buildSystem": "poetry-core", - "from": "1.5.0" - }, - "setuptools" - ], - "docker": [ - "setuptools", - "setuptools-scm" - ], - "docker-py": [ - "setuptools" - ], - "docker-pycreds": [ - "setuptools" - ], - "dockerfile-parse": [ - "setuptools" - ], - "dockerpty": [ - "setuptools" - ], - "dockerspawner": [ - "setuptools" - ], - "docloud": [ - "setuptools" - ], - "docopt": [ - "setuptools" - ], - "docopt-ng": [ - "setuptools" - ], - "docplex": [ - "setuptools" - ], - "docrep": [ - "setuptools" - ], - "docstr-coverage": [ - "setuptools" - ], - "docstring-parser": [ - "poetry-core", - "setuptools" - ], - "docstring-to-markdown": [ - "setuptools" - ], - "doctest-ignore-unicode": [ - "setuptools" - ], - "docutils": [ - "setuptools" - ], - "docx2python": [ - "setuptools" - ], - "docx2txt": [ - "setuptools" - ], - "dodgy": [ - "setuptools" - ], - "dogpile-cache": [ - "setuptools" - ], - "dogtail": [ - "setuptools" - ], - "doit": [ - "setuptools" - ], - "doit-py": [ - "setuptools" - ], - "domeneshop": [ - "setuptools" - ], - "dominate": [ - "setuptools" - ], - "doorbirdpy": [ - "setuptools" - ], - "dopy": [ - "setuptools" - ], - "dot2tex": [ - "setuptools" - ], - "dotmap": [ - "setuptools" - ], - "dotty-dict": [ - "poetry-core", - "setuptools", - "setuptools-scm" - ], - "downloader-cli": [ - "setuptools" - ], - "dparse": [ - "setuptools" - ], - "dparse2": [ - "setuptools" - ], - "dpath": [ - "setuptools" - ], - "dpcontracts": [ - "setuptools" - ], - "dpkt": [ - "setuptools" - ], - "draftjs-exporter": [ - "setuptools" - ], - "dragonfly": [ - "setuptools" - ], - "dremel3dpy": [ - "setuptools" - ], - "drf-jwt": [ - "setuptools" - ], - "drf-nested-routers": [ - "setuptools" - ], - "drf-spectacular": [ - "setuptools" - ], - "drf-spectacular-sidecar": [ - "setuptools" - ], - "drf-yasg": [ - "setuptools", - "setuptools-scm" - ], - "drivelib": [ - "setuptools" - ], - "drms": [ - "setuptools", - "setuptools-scm" - ], - "dropbox": [ - "setuptools" - ], - "ds-store": [ - "setuptools" - ], - "ds4drv": [ - "setuptools" - ], - "dsinternals": [ - "setuptools" - ], - "dsmr-parser": [ - "setuptools" - ], - "dtlssocket": [ - "cython", - "setuptools" - ], - "ducc0": [ - "setuptools" - ], - "duckdb": [ - "pybind11", - "setuptools", - "setuptools-scm" - ], - "duckdb-engine": [ - "poetry-core", - "setuptools" - ], - "duecredit": [ - "setuptools" - ], - "duet": [ - "setuptools" - ], - "dufte": [ - "setuptools" - ], - "dugong": [ - "setuptools" - ], - "dulwich": [ - "setuptools" - ], - "dunamai": [ - "poetry-core", - "setuptools" - ], - "dungeon-eos": [ - "setuptools" - ], - "duo-client": [ - "setuptools" - ], - "durus": [ - "setuptools" - ], - "dvc-data": [ - "setuptools", - "setuptools-scm" - ], - "dvc-objects": [ - "setuptools", - "setuptools-scm" - ], - "dvc-render": [ - "setuptools", - "setuptools-scm" - ], - "dvc-task": [ - "setuptools", - "setuptools-scm" - ], - "dvclive": [ - "setuptools" - ], - "dwdwfsapi": [ - "setuptools" - ], - "dyn": [ - "setuptools" - ], - "dynalite-devices": [ - "setuptools" - ], - "dynd": [ - "cython", - "setuptools" - ], - "eagle100": [ - "setuptools" - ], - "easy-thumbnails": [ - "setuptools" - ], - "easydict": [ - "setuptools" - ], - "easygui": [ - "setuptools" - ], - "easyprocess": [ - "setuptools" - ], - "easywatch": [ - "setuptools" - ], - "ebaysdk": [ - "setuptools" - ], - "ec2instanceconnectcli": [ - "setuptools" - ], - "ecdsa": [ - "setuptools" - ], - "ecoaliface": [ - "setuptools" - ], - "ecos": [ - "setuptools" - ], - "ecpy": [ - "setuptools" - ], - "ecs-logging": [ - "flit-core", - "setuptools" - ], - "ed25519": [ - "setuptools" - ], - "edalize": [ - "setuptools" - ], - "editables": [ - "setuptools" - ], - "editdistance": [ - "cython", - "setuptools" - ], - "editdistance-s": [ - "setuptools" - ], - "editorconfig": [ - "setuptools" - ], - "edward": [ - "setuptools" - ], - "eebrightbox": [ - "pbr" - ], - "effect": [ - "setuptools" - ], - "eggdeps": [ - "setuptools" - ], - "egginstallhook": [ - "setuptools" - ], - "einops": [ - "setuptools" - ], - "eiswarnung": [ - "poetry-core", - "setuptools" - ], - "elastic-apm": [ - "setuptools" - ], - "elasticsearch": [ - "setuptools" - ], - "elasticsearch-dsl": [ - "setuptools" - ], - "elasticsearchdsl": [ - "setuptools" - ], - "elegy": [ - "poetry", - "setuptools" - ], - "elementpath": [ - "setuptools" - ], - "elevate": [ - "setuptools", - "setuptools-scm" - ], - "elgato": [ - "poetry-core", - "setuptools" - ], - "eliot": [ - "setuptools" - ], - "eliqonline": [ - "setuptools" - ], - "elkm1-lib": [ - "poetry-core", - "setuptools" - ], - "elmax": [ - "poetry-core", - "setuptools" - ], - "elmax-api": [ - "setuptools" - ], - "email-validator": [ - "setuptools" - ], - "emailthreads": [ - "setuptools" - ], - "embit": [ - "setuptools" - ], - "embrace": [ - "setuptools" - ], - "emcee": [ - "setuptools", - "setuptools-scm" - ], - "emoji": [ - "setuptools" - ], - "empty-files": [ - "setuptools" - ], - "empy": [ - "setuptools" - ], - "emulated-roku": [ - "setuptools" - ], - "emv": [ - "setuptools" - ], - "enaml": [ - "setuptools", - "setuptools-scm" - ], - "enamlx": [ - "setuptools" - ], - "enhancements": [ - "setuptools" - ], - "enlighten": [ - "setuptools" - ], - "enocean": [ - "setuptools" - ], - "enrich": [ - "setuptools", - "setuptools-scm" - ], - "entrance": [ - "setuptools" - ], - "entrance-with-router-features": [ - "setuptools" - ], - "entry-points-txt": [ - "setuptools" - ], - "entrypoint2": [ - "setuptools" - ], - "entrypoints": [ - "flit", - "flit-core", - "setuptools" - ], - "enturclient": [ - "poetry-core", - "setuptools" - ], - "enum-compat": [ - "setuptools" - ], - "enum34": [ - "setuptools" - ], - "enumatch": [ - "poetry" - ], - "env-canada": [ - "setuptools" - ], - "envier": [ - "setuptools" - ], - "environmental-override": [ - "setuptools" - ], - "environs": [ - "setuptools" - ], - "envisage": [ - "setuptools" - ], - "envoy-reader": [ - "setuptools" - ], - "envoy-utils": [ - "setuptools" - ], - "envs": [ - "poetry-core", - "setuptools" - ], - "enzyme": [ - "setuptools" - ], - "epc": [ - "setuptools" - ], - "ephem": [ - "setuptools" - ], - "ephemeral-port-reserve": [ - "setuptools" - ], - "epson-projector": [ - "setuptools" - ], - "eradicate": [ - "setuptools" - ], - "erppeek": [ - "setuptools" - ], - "escapism": [ - "setuptools" - ], - "esprima": [ - "setuptools" - ], - "et-xmlfile": [ - "setuptools" - ], - "etcd": [ - "setuptools" - ], - "ete3": [ - "setuptools" - ], - "etebase": [ - "setuptools" - ], - "etebase-server": [ - "setuptools" - ], - "etelemetry": [ - "setuptools" - ], - "eternalegypt": [ - "setuptools" - ], - "etesync": [ - "setuptools" - ], - "eth-abi": [ - "setuptools" - ], - "eth-account": [ - "setuptools" - ], - "eth-hash": [ - "setuptools" - ], - "eth-keyfile": [ - "setuptools" - ], - "eth-keys": [ - "setuptools" - ], - "eth-rlp": [ - "setuptools" - ], - "eth-typing": [ - "setuptools" - ], - "eth-utils": [ - "setuptools" - ], - "etils": [ - "flit-core", - "setuptools" - ], - "etuples": [ - "setuptools" - ], - "ev3dev2": [ - "setuptools" - ], - "evdev": [ - "setuptools" - ], - "eve": [ - "setuptools" - ], - "eventlet": [ - "setuptools" - ], - "events": [ - "setuptools" - ], - "evohome-async": [ - "setuptools" - ], - "evtx": [ - "setuptools" - ], - "ewmh": [ - "setuptools" - ], - "exceptiongroup": [ - "flit-core", - "flit-scm", - "flit-core", - "setuptools" - ], - "exchangelib": [ - "setuptools" - ], - "exdown": [ - "setuptools" - ], - "execnet": [ - "setuptools", - "setuptools-scm" - ], - "executing": [ - "setuptools", - "setuptools-scm" - ], - "executor": [ - "setuptools" - ], - "exif": [ - "setuptools" - ], - "exifread": [ - "setuptools" - ], - "expandvars": [ - "setuptools" - ], - "expects": [ - "setuptools" - ], - "expecttest": [ - "poetry-core", - "setuptools" - ], - "expiringdict": [ - "setuptools" - ], - "explorerscript": [ - "setuptools" - ], - "exrex": [ - "setuptools" - ], - "extractcode": [ - "setuptools", - "setuptools-scm" - ], - "extractcode-7z": [ - "setuptools" - ], - "extractcode-libarchive": [ - "setuptools" - ], - "extras": [ - "setuptools" - ], - "eyed3": [ - "setuptools" - ], - "ezdxf": [ - "setuptools" - ], - "ezyrb": [ - "setuptools" - ], - "f90nml": [ - "setuptools", - "setuptools-scm" - ], - "faadelays": [ - "setuptools" - ], - "fabric": [ - "setuptools" - ], - "fabric2": [ - "setuptools" - ], - "fabric3": [ - "setuptools" - ], - "fabulous": [ - "setuptools" - ], - "face": [ - "setuptools" - ], - "face-recognition": [ - "setuptools" - ], - "face-recognition-models": [ - "setuptools" - ], - "facebook-sdk": [ - "setuptools" - ], - "facedancer": [ - "setuptools" - ], - "factory-boy": [ - "setuptools" - ], - "faiss": [ - "setuptools" - ], - "fake-useragent": [ - "setuptools" - ], - "faker": [ - "setuptools" - ], - "fakeredis": [ - "poetry-core", - "setuptools" - ], - "falcon": [ - "cython", - "setuptools" - ], - "fancycompleter": [ - "setuptools" - ], - "faraday-agent-parameters-types": [ - "setuptools" - ], - "faraday-plugins": [ - "setuptools" - ], - "fastapi": [ - "flit-core", - "hatchling", - "setuptools" - ], - "fastapi-csrf-protect": [ - "poetry-core" - ], - "fastapi-mail": [ - "hatchling", - "poetry-core", - "setuptools" - ], - "fastapi-restful": [ - "poetry" - ], - "fastapi-utils": [ - "poetry" - ], - "fastavro": [ - "cython", - "setuptools" - ], - "fastbencode": [ - "cython", - "setuptools" - ], - "fastcache": [ - "setuptools" - ], - "fastcore": [ - "setuptools" - ], - "fastdiff": [ - "setuptools" - ], - "fastdtw": [ - "cython", - "setuptools" - ], - "fastecdsa": [ - "setuptools" - ], - "fasteners": [ - "setuptools" - ], - "fastentrypoints": [ - "setuptools" - ], - "fastimport": [ - "setuptools" - ], - "fastjsonschema": [ - "setuptools" - ], - "fastnumbers": [ - "setuptools" - ], - "fastpair": [ - "setuptools" - ], - "fastparquet": [ - "setuptools" - ], - "fastpbkdf2": [ - "setuptools" - ], - "fastprogress": [ - "setuptools" - ], - "fastrlock": [ - "cython", - "setuptools" - ], - "fasttext": [ - "setuptools" - ], - "faust-streaming": [ - "setuptools" - ], - "favicon": [ - "setuptools" - ], - "fb-re2": [ - "setuptools" - ], - "fe25519": [ - "setuptools" - ], - "feedgen": [ - "setuptools" - ], - "feedgenerator": [ - "setuptools" - ], - "feedparser": [ - "setuptools" - ], - "fenics": [ - "setuptools" - ], - "ffcv": [ - "setuptools" - ], - "ffmpeg-progress-yield": [ - "setuptools" - ], - "ffmpeg-python": [ - "setuptools" - ], - "ffmpy": [ - "setuptools" - ], - "fhconfparser": [ - "poetry-core" - ], - "fiblary3-fork": [ - "setuptools" - ], - "fido2": [ - "poetry-core", - "setuptools" - ], - "fields": [ - "setuptools" - ], - "file-read-backwards": [ - "setuptools" - ], - "filebrowser-safe": [ - "setuptools" - ], - "filebytes": [ - "setuptools" - ], - "filecheck": [ - "poetry-core", - "setuptools" - ], - "filelock": [ - { - "buildSystem": "setuptools", - "until": "3.9.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "3.9.0" - }, - { - "buildSystem": "hatchling", - "from": "3.9.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "3.9.0" - } - ], - "filemagic": [ - "setuptools" - ], - "filetype": [ - "setuptools" - ], - "filterpy": [ - "setuptools" - ], - "finalfusion": [ - "cython", - "setuptools" - ], - "findimports": [ - "setuptools" - ], - "findpython": [ - "setuptools" - ], - "fingerprints": [ - "setuptools" - ], - "finitude": [ - "setuptools" - ], - "fints": [ - "setuptools" - ], - "fiona": [ - { - "buildSystem": "setuptools", - "until": "1.9.0" - }, - { - "buildSystem": "cython", - "from": "1.9.0" - } - ], - "fipy": [ - "setuptools" - ], - "fire": [ - "setuptools" - ], - "fireflyalgorithm": [ - "poetry-core", - "setuptools" - ], - "firetv": [ - "setuptools" - ], - "first": [ - "setuptools" - ], - "fitbit": [ - "setuptools" - ], - "fivem-api": [ - "setuptools", - "setuptools-scm" - ], - "fixerio": [ - "setuptools" - ], - "fixtures": [ - "pbr", - "setuptools" - ], - "fjaraskupan": [ - "setuptools" - ], - "flake8": [ - "setuptools" - ], - "flake8-blind-except": [ - "setuptools" - ], - "flake8-bugbear": [ - "setuptools" - ], - "flake8-builtins": [ - "setuptools" - ], - "flake8-coding": [ - "setuptools" - ], - "flake8-commas": [ - "setuptools" - ], - "flake8-comprehensions": [ - "setuptools" - ], - "flake8-debugger": [ - "poetry-core", - "setuptools" - ], - "flake8-deprecated": [ - "setuptools" - ], - "flake8-docstrings": [ - "setuptools" - ], - "flake8-ensure-ascii": [ - "setuptools" - ], - "flake8-future-import": [ - "setuptools" - ], - "flake8-import-order": [ - "setuptools" - ], - "flake8-length": [ - "setuptools" - ], - "flake8-mock": [ - "setuptools" - ], - "flake8-mutable": [ - "setuptools" - ], - "flake8-noqa": [ - "setuptools" - ], - "flake8-pep3101": [ - "setuptools" - ], - "flake8-plone-hasattr": [ - "setuptools" - ], - "flake8-plugin-utils": [ - "poetry" - ], - "flake8-polyfill": [ - "setuptools" - ], - "flake8-print": [ - "poetry-core" - ], - "flake8-pyprojecttoml": [ - "setuptools" - ], - "flake8-pytest-style": [ - "poetry-core" - ], - "flake8-quotes": [ - "setuptools" - ], - "flake8-simplify": [ - "setuptools" - ], - "flake8-string-format": [ - "setuptools" - ], - "flake8-super-call": [ - "setuptools" - ], - "flake8-todo": [ - "setuptools" - ], - "flake8-tuple": [ - "setuptools" - ], - "flaky": [ - "setuptools" - ], - "flametree": [ - "setuptools" - ], - "flammkuchen": [ - "setuptools" - ], - "flanker": [ - "setuptools" - ], - "flashtext": [ - "setuptools" - ], - "flask": [ - "setuptools" - ], - "flask-admin": [ - "setuptools" - ], - "flask-api": [ - "setuptools" - ], - "flask-appbuilder": [ - "setuptools" - ], - "flask-assets": [ - "setuptools" - ], - "flask-autoindex": [ - "setuptools" - ], - "flask-babel": [ - "setuptools" - ], - "flask-babelex": [ - "setuptools" - ], - "flask-basicauth": [ - "setuptools" - ], - "flask-bcrypt": [ - "setuptools" - ], - "flask-bootstrap": [ - "setuptools" - ], - "flask-caching": [ - "setuptools" - ], - "flask-common": [ - "setuptools" - ], - "flask-compress": [ - "setuptools", - "setuptools-scm" - ], - "flask-cors": [ - "setuptools" - ], - "flask-elastic": [ - "setuptools" - ], - "flask-gravatar": [ - "setuptools" - ], - "flask-httpauth": [ - "setuptools" - ], - "flask-jwt-extended": [ - "setuptools" - ], - "flask-limiter": [ - "setuptools" - ], - "flask-login": [ - "setuptools" - ], - "flask-mail": [ - "setuptools" - ], - "flask-mailman": [ - "poetry-core" - ], - "flask-marshmallow": [ - "setuptools" - ], - "flask-migrate": [ - "setuptools" - ], - "flask-minio": [ - "pytest-runner", - "setuptools" - ], - "flask-mongoengine": [ - "setuptools" - ], - "flask-openid": [ - "setuptools" - ], - "flask-paginate": [ - "setuptools" - ], - "flask-paranoid": [ - "setuptools" - ], - "flask-principal": [ - "setuptools" - ], - "flask-pymongo": [ - "setuptools" - ], - "flask-restful": [ - "setuptools" - ], - "flask-restplus": [ - "setuptools" - ], - "flask-restx": [ - "setuptools" - ], - "flask-reverse-proxy-fix": [ - "setuptools" - ], - "flask-script": [ - "setuptools" - ], - "flask-seasurf": [ - "setuptools" - ], - "flask-security-too": [ - "setuptools" - ], - "flask-session": [ - "setuptools" - ], - "flask-silk": [ - "setuptools" - ], - "flask-socketio": [ - "setuptools" - ], - "flask-sockets": [ - "setuptools" - ], - "flask-sqlalchemy": [ - "setuptools" - ], - "flask-sslify": [ - "setuptools" - ], - "flask-swagger": [ - "setuptools" - ], - "flask-swagger-ui": [ - "setuptools" - ], - "flask-talisman": [ - "setuptools" - ], - "flask-testing": [ - "setuptools" - ], - "flask-versioned": [ - "setuptools" - ], - "flask-wtf": [ - "setuptools" - ], - "flaskbabel": [ - "setuptools" - ], - "flatbuffers": [ - "setuptools" - ], - "flatdict": [ - "setuptools" - ], - "flatten-dict": [ - "poetry-core", - "setuptools" - ], - "flax": [ - "setuptools" - ], - "fleep": [ - "setuptools" - ], - "flet": [ - "poetry-core" - ], - "flet-core": [ - "poetry-core", - "setuptools" - ], - "flexmock": [ - "setuptools" - ], - "flickrapi": [ - "setuptools" - ], - "flipr-api": [ - "poetry-core", - "setuptools" - ], - "flit": [ - "flit-core" - ], - "flit-scm": [ - "flit-core", - "setuptools-scm" - ], - "flow-record": [ - "setuptools", - "setuptools-scm" - ], - "flower": [ - "setuptools" - ], - "flowlogs-reader": [ - "setuptools" - ], - "fluent-logger": [ - "setuptools" - ], - "flufl-bounce": [ - "setuptools" - ], - "flufl-i18n": [ - "setuptools" - ], - "flufl-lock": [ - "setuptools" - ], - "flux-led": [ - "setuptools" - ], - "flynt": [ - "setuptools" - ], - "fn": [ - "setuptools" - ], - "fnvhash": [ - "setuptools" - ], - "folium": [ - "setuptools", - "setuptools-scm" - ], - "fontmake": [ - "setuptools", - "setuptools-scm" - ], - "fontmath": [ - "setuptools", - "setuptools-scm" - ], - "fontparts": [ - "setuptools", - "setuptools-scm" - ], - "fontpens": [ - "setuptools" - ], - "fonttools": [ - "setuptools", - "setuptools-scm" - ], - "foobot-async": [ - "setuptools" - ], - "foolscap": [ - "setuptools" - ], - "forbiddenfruit": [ - "setuptools" - ], - "fordpass": [ - "setuptools" - ], - "forecast-solar": [ - "setuptools" - ], - "formbox": [ - "flit-core", - "setuptools" - ], - "formencode": [ - "setuptools", - "setuptools-scm" - ], - "fortiosapi": [ - "setuptools" - ], - "foundationdb51": [ - "setuptools" - ], - "foundationdb52": [ - "setuptools" - ], - "foundationdb60": [ - "setuptools" - ], - "foundationdb61": [ - "setuptools" - ], - "fountains": [ - "setuptools" - ], - "foxdot": [ - "setuptools" - ], - "fpdf": [ - "setuptools" - ], - "fpylll": [ - "cython", - "setuptools" - ], - "fpyutils": [ - "setuptools" - ], - "fqdn": [ - "setuptools" - ], - "freebox-api": [ - "poetry-core", - "setuptools" - ], - "freetype-py": [ - "setuptools", - "setuptools-scm" - ], - "freezegun": [ - "setuptools" - ], - "frigidaire": [ - "setuptools" - ], - "frilouz": [ - "setuptools" - ], - "fritzconnection": [ - "setuptools" - ], - "fritzprofiles": [ - "setuptools" - ], - "frozendict": [ - "setuptools" - ], - "frozenlist": [ - "cython", - "setuptools" - ], - "fs": [ - "setuptools" - ], - "fs-s3fs": [ - "setuptools" - ], - "fsspec": [ - "setuptools" - ], - "ftfy": [ - "poetry", - "setuptools" - ], - "ftputil": [ - "setuptools" - ], - "func-timeout": [ - "setuptools" - ], - "funcparserlib": [ - "poetry-core", - "setuptools" - ], - "funcsigs": [ - "setuptools" - ], - "functorch": [ - "setuptools" - ], - "funcy": [ - "setuptools" - ], - "furl": [ - "setuptools" - ], - "furo": [ - "flit-core", - "setuptools" - ], - "fuse": [ - "setuptools" - ], - "fusepy": [ - "setuptools" - ], - "future": [ - "setuptools" - ], - "future-fstrings": [ - "setuptools" - ], - "future-typing": [ - "setuptools" - ], - "futures": [ - "setuptools" - ], - "futurist": [ - "pbr", - "setuptools" - ], - "fuzzyfinder": [ - "setuptools" - ], - "fuzzywuzzy": [ - "setuptools" - ], - "fx2": [ - "setuptools" - ], - "galario": [ - "cython" - ], - "galois": [ - "setuptools", - "setuptools-scm" - ], - "gamble": [ - "setuptools" - ], - "gaphas": [ - "poetry-core", - "setuptools" - ], - "garages-amsterdam": [ - "poetry-core", - "setuptools" - ], - "garminconnect": [ - "setuptools" - ], - "garminconnect-aio": [ - "setuptools" - ], - "garminconnect-ha": [ - "setuptools" - ], - "gast": [ - "setuptools" - ], - "gatt": [ - "setuptools" - ], - "gattlib": [ - "setuptools" - ], - "gb-io": [ - "setuptools" - ], - "gbinder-python": [ - "cython", - "setuptools" - ], - "gbulb": [ - "setuptools" - ], - "gcal-sync": [ - "setuptools" - ], - "gcovr": [ - "setuptools" - ], - "gcsfs": [ - "setuptools" - ], - "gdal": [ - "setuptools" - ], - "gdata": [ - "setuptools" - ], - "gdown": [ - "setuptools" - ], - "gdtoolkit": [ - "setuptools" - ], - "ge25519": [ - "setuptools" - ], - "gehomesdk": [ - "setuptools" - ], - "gekitchen": [ - "setuptools" - ], - "gemfileparser": [ - "setuptools" - ], - "genanki": [ - "setuptools" - ], - "generic": [ - "poetry-core", - "setuptools" - ], - "geniushub-client": [ - "setuptools" - ], - "genome-collector": [ - "setuptools" - ], - "genpy": [ - "setuptools" - ], - "genshi": [ - "setuptools" - ], - "gensim": [ - "cython", - "setuptools" - ], - "genson": [ - "setuptools" - ], - "gentools": [ - "setuptools" - ], - "genzshcomp": [ - "setuptools" - ], - "geoalchemy2": [ - "setuptools", - "setuptools-scm" - ], - "geocachingapi": [ - "setuptools", - "setuptools-scm" - ], - "geographiclib": [ - "setuptools" - ], - "geoip": [ - "setuptools" - ], - "geoip2": [ - "setuptools" - ], - "geojson": [ - "setuptools" - ], - "geojson-client": [ - "setuptools" - ], - "geomet": [ - "setuptools" - ], - "geometric": [ - "setuptools" - ], - "geopandas": [ - "setuptools" - ], - "geopy": [ - "setuptools" - ], - "georss-client": [ - "setuptools" - ], - "georss-generic-client": [ - "setuptools" - ], - "georss-ign-sismologia-client": [ - "setuptools" - ], - "georss-ingv-centro-nazionale-terremoti-client": [ - "setuptools" - ], - "georss-nrcan-earthquakes-client": [ - "setuptools" - ], - "georss-qld-bushfire-alert-client": [ - "setuptools" - ], - "georss-tfs-incidents-client": [ - "setuptools" - ], - "georss-wa-dfes-client": [ - "setuptools" - ], - "get-video-properties": [ - "setuptools" - ], - "getkey": [ - "setuptools" - ], - "getmac": [ - "setuptools" - ], - "gevent": [ - "setuptools" - ], - "gevent-socketio": [ - "setuptools" - ], - "gevent-websocket": [ - "setuptools" - ], - "geventhttpclient": [ - "setuptools" - ], - "gflags": [ - "setuptools" - ], - "ghapi": [ - "setuptools" - ], - "ghdiff": [ - "setuptools" - ], - "ghp-import": [ - "setuptools" - ], - "ghrepo-stats": [ - "setuptools" - ], - "gibberish-detector": [ - "setuptools" - ], - "gidgethub": [ - "flit-core", - "setuptools" - ], - "gigalixir": [ - "setuptools" - ], - "gin-config": [ - "setuptools" - ], - "gios": [ - "setuptools" - ], - "gipc": [ - "setuptools" - ], - "gistyc": [ - "setuptools" - ], - "git-annex-adapter": [ - "setuptools" - ], - "git-autoshare": [ - "setuptools-scm" - ], - "git-filter-repo": [ - "setuptools", - "setuptools-scm" - ], - "git-revise": [ - "setuptools" - ], - "git-sweep": [ - "setuptools" - ], - "gitdb": [ - "setuptools" - ], - "github-to-sqlite": [ - "setuptools" - ], - "github-webhook": [ - "setuptools" - ], - "github3-py": [ - "setuptools" - ], - "gitlint": [ - { - "buildSystem": "setuptools", - "until": "0.19" - }, - { - "buildSystem": "hatchling", - "from": "0.19" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.19" - } - ], - "gitlint-core": [ - { - "buildSystem": "setuptools", - "until": "0.19" - }, - { - "buildSystem": "hatchling", - "from": "0.19" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.19" - } - ], - "gitpython": [ - "setuptools" - ], - "glad": [ - "setuptools" - ], - "glances-api": [ - "poetry-core", - "setuptools" - ], - "glasgow": [ - "setuptools", - "setuptools-scm" - ], - "glcontext": [ - "setuptools" - ], - "glean-parser": [ - "setuptools", - "setuptools-scm" - ], - "glean-sdk": [ - "setuptools" - ], - "glfw": [ - "setuptools" - ], - "glob2": [ - "setuptools" - ], - "globus-sdk": [ - "setuptools" - ], - "glom": [ - "setuptools" - ], - "glymur": [ - "setuptools" - ], - "glyphslib": [ - "setuptools", - "setuptools-scm" - ], - "gmpy": [ - "setuptools" - ], - "gmpy2": [ - "setuptools" - ], - "gntp": [ - "setuptools" - ], - "gnureadline": [ - "setuptools" - ], - "goalzero": [ - "setuptools" - ], - "goobook": [ - "poetry-core", - "setuptools" - ], - "goocalendar": [ - "setuptools" - ], - "goodwe": [ - "setuptools" - ], - "google-api-core": [ - "setuptools" - ], - "google-api-python-client": [ - "setuptools" - ], - "google-auth": [ - "setuptools" - ], - "google-auth-httplib2": [ - "setuptools" - ], - "google-auth-oauthlib": [ - "setuptools" - ], - "google-cloud-access-context-manager": [ - "setuptools" - ], - "google-cloud-appengine-logging": [ - "setuptools" - ], - "google-cloud-asset": [ - "setuptools" - ], - "google-cloud-audit-log": [ - "setuptools" - ], - "google-cloud-automl": [ - "setuptools" - ], - "google-cloud-bigquery": [ - "setuptools" - ], - "google-cloud-bigquery-datatransfer": [ - "setuptools" - ], - "google-cloud-bigquery-logging": [ - "setuptools" - ], - "google-cloud-bigquery-storage": [ - "setuptools" - ], - "google-cloud-bigtable": [ - "setuptools" - ], - "google-cloud-compute": [ - "setuptools" - ], - "google-cloud-container": [ - "setuptools" - ], - "google-cloud-core": [ - "setuptools" - ], - "google-cloud-datacatalog": [ - "setuptools" - ], - "google-cloud-dataproc": [ - "setuptools" - ], - "google-cloud-datastore": [ - "setuptools" - ], - "google-cloud-dlp": [ - "setuptools" - ], - "google-cloud-dns": [ - "setuptools" - ], - "google-cloud-error-reporting": [ - "setuptools" - ], - "google-cloud-firestore": [ - "setuptools" - ], - "google-cloud-iam": [ - "setuptools" - ], - "google-cloud-iam-logging": [ - "setuptools" - ], - "google-cloud-iot": [ - "setuptools" - ], - "google-cloud-kms": [ - "setuptools" - ], - "google-cloud-language": [ - "setuptools" - ], - "google-cloud-logging": [ - "setuptools" - ], - "google-cloud-monitoring": [ - "setuptools" - ], - "google-cloud-org-policy": [ - "setuptools" - ], - "google-cloud-os-config": [ - "setuptools" - ], - "google-cloud-pubsub": [ - "setuptools" - ], - "google-cloud-redis": [ - "setuptools" - ], - "google-cloud-resource-manager": [ - "setuptools" - ], - "google-cloud-runtimeconfig": [ - "setuptools" - ], - "google-cloud-secret-manager": [ - "setuptools" - ], - "google-cloud-securitycenter": [ - "setuptools" - ], - "google-cloud-spanner": [ - "setuptools" - ], - "google-cloud-speech": [ - "setuptools" - ], - "google-cloud-storage": [ - "setuptools" - ], - "google-cloud-tasks": [ - "setuptools" - ], - "google-cloud-testutils": [ - "setuptools" - ], - "google-cloud-texttospeech": [ - "setuptools" - ], - "google-cloud-trace": [ - "setuptools" - ], - "google-cloud-translate": [ - "setuptools" - ], - "google-cloud-videointelligence": [ - "setuptools" - ], - "google-cloud-vision": [ - "setuptools" - ], - "google-cloud-websecurityscanner": [ - "setuptools" - ], - "google-compute-engine": [ - "setuptools" - ], - "google-crc32c": [ - "setuptools" - ], - "google-i18n-address": [ - "setuptools" - ], - "google-nest-sdm": [ - "setuptools" - ], - "google-pasta": [ - "setuptools" - ], - "google-re2": [ - "setuptools" - ], - "google-resumable-media": [ - "setuptools" - ], - "googleapis-common-protos": [ - "setuptools" - ], - "googlemaps": [ - "setuptools" - ], - "googletrans": [ - "setuptools" - ], - "gorilla": [ - "setuptools" - ], - "govee-ble": [ - "poetry-core", - "setuptools" - ], - "goveelights": [ - "setuptools" - ], - "gpapi": [ - "setuptools" - ], - "gpaw": [ - "setuptools" - ], - "gphoto2": [ - "setuptools" - ], - "gpiozero": [ - "setuptools" - ], - "gplaycli": [ - "setuptools" - ], - "gprof2dot": [ - "setuptools" - ], - "gps3": [ - "setuptools" - ], - "gpsoauth": [ - "setuptools" - ], - "gpt-2-simple": [ - "setuptools" - ], - "gpxpy": [ - "setuptools" - ], - "gpy": [ - "cython", - "setuptools" - ], - "gpyopt": [ - "cython", - "setuptools" - ], - "gql": [ - "setuptools" - ], - "gqt": [ - "setuptools" - ], - "gradient": [ - "setuptools" - ], - "gradient-statsd": [ - "setuptools" - ], - "gradient-utils": [ - "poetry-core", - "setuptools" - ], - "grammalecte": [ - "setuptools" - ], - "grandalf": [ - "setuptools" - ], - "graph-tool": [ - "setuptools" - ], - "grapheme": [ - "setuptools" - ], - "graphene": [ - "setuptools" - ], - "graphene-django": [ - "setuptools" - ], - "graphite-web": [ - "setuptools" - ], - "graphql-core": [ - "poetry-core", - "setuptools" - ], - "graphql-relay": [ - "poetry-core", - "setuptools" - ], - "graphql-server-core": [ - "setuptools" - ], - "graphql-subscription-manager": [ - "setuptools" - ], - "graphqlclient": [ - "setuptools" - ], - "graphtage": [ - "setuptools" - ], - "graphviz": [ - "setuptools" - ], - "grappelli-safe": [ - "setuptools" - ], - "greatfet": [ - "setuptools" - ], - "greeclimate": [ - "setuptools" - ], - "green": [ - "setuptools" - ], - "greeneye-monitor": [ - "setuptools" - ], - "greenlet": [ - "setuptools" - ], - "gremlinpython": [ - "setuptools" - ], - "grequests": [ - "setuptools" - ], - "gridnet": [ - "poetry-core", - "setuptools" - ], - "griffe": [ - "pdm-pep517", - "setuptools" - ], - "grip": [ - "setuptools" - ], - "groestlcoin-hash": [ - "setuptools" - ], - "growattserver": [ - "setuptools" - ], - "grpc-google-iam-v1": [ - "setuptools" - ], - "grpcio": [ - "cython", - "setuptools" - ], - "grpcio-gcp": [ - "setuptools" - ], - "grpcio-reflection": [ - "setuptools" - ], - "grpcio-status": [ - "setuptools" - ], - "grpcio-tools": [ - "setuptools" - ], - "grpclib": [ - "setuptools" - ], - "gruut": [ - "setuptools" - ], - "gruut-ipa": [ - "setuptools" - ], - "gsd": [ - "cython", - "setuptools" - ], - "gspread": [ - "setuptools" - ], - "gssapi": [ - "cython", - "setuptools" - ], - "gst-python": [ - "setuptools" - ], - "gtfs-realtime-bindings": [ - "setuptools" - ], - "gtimelog": [ - "setuptools" - ], - "gtts": [ - "setuptools" - ], - "gtts-token": [ - "setuptools" - ], - "gudhi": [ - "cython", - "setuptools" - ], - "guessit": [ - "setuptools" - ], - "guestfs": [ - "setuptools" - ], - "gumath": [ - "setuptools" - ], - "gunicorn": [ - "setuptools" - ], - "guppy3": [ - "setuptools" - ], - "gurobipy": [ - "setuptools" - ], - "guzzle-sphinx-theme": [ - "setuptools" - ], - "gviz-api": [ - "setuptools" - ], - "gvm-tools": [ - "poetry-core", - "setuptools" - ], - "gym": [ - "setuptools" - ], - "gyp": [ - "setuptools" - ], - "gypsum-dl": [ - "setuptools" - ], - "h11": [ - "setuptools" - ], - "h2": [ - "setuptools" - ], - "h3": [ - "cython", - "setuptools" - ], - "h5netcdf": [ - "setuptools", - "setuptools-scm" - ], - "h5py": [ - "cython", - "setuptools" - ], - "h5py-mpi": [ - "cython", - "setuptools" - ], - "ha-ffmpeg": [ - "setuptools" - ], - "ha-philipsjs": [ - "setuptools" - ], - "habanero": [ - "setuptools" - ], - "habitipy": [ - "setuptools" - ], - "hachoir": [ - "setuptools" - ], - "hacking": [ - "pbr", - "setuptools" - ], - "hahomematic": [ - "setuptools" - ], - "halo": [ - "setuptools" - ], - "halohome": [ - "setuptools" - ], - "hammett": [ - "setuptools" - ], - "hammock": [ - "setuptools" - ], - "handout": [ - "setuptools" - ], - "hangups": [ - "setuptools" - ], - "hap-python": [ - "setuptools" - ], - "hashids": [ - "flit-core" - ], - "hass-nabucasa": [ - "setuptools" - ], - "hatasmota": [ - "setuptools" - ], - "hatch-fancy-pypi-readme": [ - "hatchling", - "setuptools" - ], - "hatch-nodejs-version": [ - "hatchling" - ], - "hatch-vcs": [ - "hatchling", - "setuptools", - "setuptools-scm" - ], - "hatchling": [ - "setuptools" - ], - "haversine": [ - "setuptools" - ], - "hawkauthlib": [ - "setuptools" - ], - "hcloud": [ - "setuptools" - ], - "hcs-utils": [ - "setuptools" - ], - "hdate": [ - "poetry-core", - "setuptools" - ], - "hdbscan": [ - "cython", - "setuptools" - ], - "hdfs": [ - "setuptools" - ], - "hdmedians": [ - "cython", - "setuptools" - ], - "headerparser": [ - "setuptools" - ], - "heapdict": [ - "setuptools" - ], - "heatzypy": [ - "setuptools" - ], - "helpdev": [ - "setuptools" - ], - "helper": [ - "setuptools" - ], - "hepunits": [ - "setuptools", - "setuptools-scm" - ], - "herepy": [ - "setuptools" - ], - "hetzner": [ - "setuptools" - ], - "hexbytes": [ - "setuptools" - ], - "hexdump": [ - "setuptools" - ], - "hg-evolve": [ - "setuptools" - ], - "hg-git": [ - "setuptools" - ], - "hglib": [ - "setuptools" - ], - "hickle": [ - "setuptools" - ], - "hid": [ - "setuptools" - ], - "hidapi": [ - "cython", - "setuptools" - ], - "hieroglyph": [ - "setuptools" - ], - "hijri-converter": [ - "setuptools" - ], - "hikvision": [ - "setuptools" - ], - "hiredis": [ - "setuptools" - ], - "hiro": [ - "setuptools" - ], - "hiyapyco": [ - "setuptools" - ], - "hjson": [ - "setuptools" - ], - "hkavr": [ - "setuptools" - ], - "hkdf": [ - "setuptools" - ], - "hlk-sw16": [ - "setuptools" - ], - "hmmlearn": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "hocr-tools": [ - "setuptools" - ], - "hole": [ - "setuptools" - ], - "holidays": [ - "setuptools" - ], - "holoviews": [ - "setuptools" - ], - "home-assistant-bluetooth": [ - "cython", - "poetry-core", - "setuptools" - ], - "homeassistant-pyozw": [ - "cython", - "setuptools" - ], - "homeconnect": [ - "setuptools" - ], - "homematicip": [ - "setuptools" - ], - "homepluscontrol": [ - "setuptools" - ], - "hopcroftkarp": [ - "setuptools" - ], - "howdoi": [ - "setuptools" - ], - "hpack": [ - "setuptools" - ], - "hpccm": [ - "setuptools" - ], - "hs-dbus-signature": [ - "setuptools" - ], - "hsaudiotag3k": [ - "setuptools" - ], - "hsluv": [ - "setuptools" - ], - "hstspreload": [ - "setuptools" - ], - "html-sanitizer": [ - "setuptools" - ], - "html-tag-names": [ - "poetry" - ], - "html-void-elements": [ - "poetry" - ], - "html2text": [ - "setuptools" - ], - "html5-parser": [ - "setuptools" - ], - "html5lib": [ - "flit-core", - "setuptools" - ], - "htmllaundry": [ - "setuptools" - ], - "htmlmin": [ - "setuptools" - ], - "htseq": [ - "cython", - "setuptools" - ], - "httmock": [ - "setuptools" - ], - "http-ece": [ - "setuptools" - ], - "http-message-signatures": [ - "setuptools", - "setuptools-scm" - ], - "http-parser": [ - "setuptools" - ], - "http-sfv": [ - "setuptools" - ], - "httpagentparser": [ - "setuptools" - ], - "httpauth": [ - "setuptools" - ], - "httpbin": [ - "setuptools" - ], - "httpcore": [ - "setuptools" - ], - "httpie": [ - "setuptools" - ], - "httpie-ntlm": [ - "setuptools" - ], - "httplib2": [ - "setuptools" - ], - "httpretty": [ - "setuptools" - ], - "httpserver": [ - "setuptools" - ], - "httpsig": [ - "setuptools", - "setuptools-scm" - ], - "httptools": [ - "setuptools" - ], - "httpx": [ - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "0.23.1" - }, - { - "buildSystem": "hatchling", - "from": "0.23.1" - }, - { - "buildSystem": "setuptools", - "until": "0.23.1" - } - ], - "httpx-auth": [ - "setuptools" - ], - "httpx-ntlm": [ - "setuptools" - ], - "httpx-socks": [ - "setuptools" - ], - "huawei-lte-api": [ - "setuptools" - ], - "huey": [ - "setuptools" - ], - "huggingface-hub": [ - "setuptools" - ], - "huisbaasje-client": [ - "setuptools" - ], - "humanfriendly": [ - "setuptools" - ], - "humanize": [ - { - "buildSystem": "setuptools", - "until": "4.6.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "4.6.0" - }, - { - "buildSystem": "hatchling", - "from": "4.6.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "4.6.0" - } - ], - "humblewx": [ - "setuptools" - ], - "hupper": [ - "setuptools" - ], - "huum": [ - "poetry-core", - "setuptools" - ], - "hvac": [ - { - "buildSystem": "setuptools", - "until": "1.0.0" - }, - { - "buildSystem": "poetry-core", - "from": "1.0.0" - } - ], - "hvplot": [ - "setuptools" - ], - "hwi": [ - "setuptools" - ], - "hy": [ - "setuptools" - ], - "hydra": [ - "setuptools" - ], - "hydra-check": [ - "poetry-core", - "setuptools" - ], - "hydrawiser": [ - "setuptools" - ], - "hypchat": [ - "setuptools" - ], - "hypercorn": [ - "poetry-core", - "setuptools" - ], - "hyperframe": [ - "setuptools" - ], - "hyperion-py": [ - "poetry-core", - "setuptools" - ], - "hyperlink": [ - "setuptools" - ], - "hyperopt": [ - "setuptools" - ], - "hypothesis": [ - "setuptools" - ], - "hypothesis-auto": [ - "poetry-core", - "setuptools" - ], - "hypothesis-graphql": [ - "poetry" - ], - "hypothesmith": [ - "setuptools" - ], - "hyppo": [ - "setuptools" - ], - "hyrule": [ - "setuptools" - ], - "i-pi": [ - "setuptools" - ], - "i2c-tools": [ - "setuptools" - ], - "i2csense": [ - "setuptools" - ], - "i3-py": [ - "setuptools" - ], - "i3ipc": [ - "setuptools" - ], - "iapws": [ - "setuptools" - ], - "iaqualink": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "ibeacon-ble": [ - "poetry-core" - ], - "ibis": [ - "setuptools" - ], - "ibis-framework": [ - "poetry-core", - "setuptools" - ], - "ibm-cloud-sdk-core": [ - "setuptools" - ], - "ibm-watson": [ - "setuptools" - ], - "icalendar": [ - "setuptools" - ], - "icecream": [ - "setuptools" - ], - "icmplib": [ - "pbr", - "setuptools" - ], - "icnsutil": [ - "setuptools" - ], - "icontract": [ - "setuptools" - ], - "ics": [ - "setuptools" - ], - "idasen": [ - "poetry-core", - "setuptools" - ], - "identify": [ - "setuptools" - ], - "idna": [ - "flit-core", - "setuptools" - ], - "idna-ssl": [ - "setuptools" - ], - "ifaddr": [ - "setuptools" - ], - "ifconfig-parser": [ - "setuptools" - ], - "ifcopenshell": [ - "setuptools" - ], - "ignite": [ - "setuptools" - ], - "igraph": [ - "setuptools" - ], - "ihatemoney": [ - "setuptools" - ], - "ijson": [ - "setuptools" - ], - "ilua": [ - "setuptools" - ], - "image-go-nord": [ - "setuptools" - ], - "image-match": [ - "setuptools" - ], - "imagecodecs-lite": [ - "cython", - "setuptools" - ], - "imagecorruptions": [ - "setuptools" - ], - "imageio": [ - "setuptools" - ], - "imageio-ffmpeg": [ - "setuptools" - ], - "imagesize": [ - "setuptools" - ], - "imantics": [ - "setuptools" - ], - "imap-tools": [ - "setuptools" - ], - "imapclient": [ - "setuptools" - ], - "imaplib2": [ - "setuptools" - ], - "imbalanced-learn": [ - "setuptools" - ], - "img2pdf": [ - "setuptools" - ], - "imgsize": [ - "setuptools" - ], - "iminuit": [ - "setuptools" - ], - "immutabledict": [ - "poetry-core", - "setuptools" - ], - "immutables": [ - "setuptools" - ], - "impacket": [ - "setuptools" - ], - "importlab": [ - "setuptools" - ], - "importlib-metadata": [ - "setuptools", - "setuptools-scm" - ], - "importlib-resources": [ - "setuptools", - "setuptools-scm" - ], - "importmagic": [ - "setuptools" - ], - "impyla": [ - "setuptools" - ], - "imread": [ - "setuptools" - ], - "imutils": [ - "setuptools" - ], - "in-place": [ - "setuptools" - ], - "incomfort-client": [ - "setuptools" - ], - "incremental": [ - "setuptools" - ], - "infinity": [ - "setuptools" - ], - "inflect": [ - "setuptools", - "setuptools-scm" - ], - "inflection": [ - "setuptools" - ], - "influxdb": [ - "setuptools" - ], - "influxdb-client": [ - "setuptools" - ], - "inform": [ - "setuptools" - ], - "iniconfig": [ - { - "buildSystem": "setuptools", - "until": "2.0.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "2.0.0" - }, - { - "buildSystem": "hatchling", - "from": "2.0.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "2.0.0" - } - ], - "inifile": [ - "setuptools" - ], - "iniparse": [ - "setuptools" - ], - "injector": [ - "setuptools" - ], - "inkbird-ble": [ - "poetry-core", - "setuptools" - ], - "inkex": [ - "setuptools" - ], - "inotify": [ - "setuptools" - ], - "inotify-simple": [ - "setuptools" - ], - "inotifyrecursive": [ - "setuptools" - ], - "inquirer": [ - "poetry-core", - "setuptools" - ], - "insegel": [ - "setuptools" - ], - "insights-core": [ - "setuptools" - ], - "installer": [ - "flit-core" - ], - "insteon-frontend-home-assistant": [ - "setuptools" - ], - "intake": [ - "setuptools" - ], - "intake-parquet": [ - "setuptools" - ], - "intbitset": [ - "setuptools" - ], - "intelhex": [ - "setuptools" - ], - "intellifire4py": [ - "setuptools" - ], - "internetarchive": [ - "setuptools" - ], - "interruptingcow": [ - "setuptools" - ], - "intervaltree": [ - "setuptools" - ], - "into-dbus-python": [ - "setuptools" - ], - "intreehooks": [ - "setuptools" - ], - "invocations": [ - "setuptools" - ], - "invoke": [ - "setuptools" - ], - "iocapture": [ - "setuptools" - ], - "iodata": [ - "cython", - "setuptools" - ], - "ionhash": [ - "setuptools" - ], - "iotawattpy": [ - "setuptools" - ], - "iowait": [ - "setuptools" - ], - "ipaddr": [ - "setuptools" - ], - "ipaddress": [ - "setuptools" - ], - "ipdb": [ - "setuptools" - ], - "ipdbplugin": [ - "setuptools" - ], - "ipfshttpclient": [ - "flit-core", - "setuptools" - ], - "iptools": [ - "setuptools" - ], - "ipwhl": [ - "flit-core", - "setuptools" - ], - "ipwhois": [ - "setuptools" - ], - "ipy": [ - "setuptools" - ], - "ipydatawidgets": [ - "setuptools" - ], - "ipykernel": [ - "hatchling", - "setuptools" - ], - "ipympl": [ - "setuptools" - ], - "ipyparallel": [ - "hatchling", - "setuptools" - ], - "ipython": [ - "setuptools" - ], - "ipython-genutils": [ - "setuptools" - ], - "ipython-sql": [ - "setuptools" - ], - "ipyvue": [ - "setuptools" - ], - "ipyvuetify": [ - "setuptools" - ], - "ipywidgets": [ - "setuptools" - ], - "irc": [ - "setuptools", - "setuptools-scm" - ], - "ircrobots": [ - "setuptools" - ], - "ircstates": [ - "setuptools" - ], - "irctokens": [ - "setuptools" - ], - "isbnlib": [ - "setuptools" - ], - "islpy": [ - "setuptools" - ], - "ismartgate": [ - "setuptools" - ], - "iso-639": [ - "setuptools" - ], - "iso3166": [ - "setuptools" - ], - "iso4217": [ - "setuptools" - ], - "iso8601": [ - "poetry-core", - "setuptools" - ], - "isodate": [ - "setuptools" - ], - "isoduration": [ - "setuptools" - ], - "isort": [ - "poetry-core", - "setuptools" - ], - "isosurfaces": [ - "setuptools" - ], - "isounidecode": [ - "setuptools" - ], - "isoweek": [ - "setuptools" - ], - "itanium-demangler": [ - "setuptools" - ], - "itemadapter": [ - "setuptools" - ], - "itemdb": [ - "setuptools" - ], - "itemloaders": [ - "setuptools" - ], - "iteration-utilities": [ - "setuptools" - ], - "itsdangerous": [ - "setuptools" - ], - "itunespy": [ - "setuptools" - ], - "itypes": [ - "setuptools" - ], - "j2cli": [ - "setuptools" - ], - "jaconv": [ - "setuptools" - ], - "jaeger-client": [ - "setuptools" - ], - "janus": [ - "setuptools" - ], - "jarac-itertools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-classes": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-collections": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-context": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-functools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-itertools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-logging": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-stream": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-test": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-text": [ - "setuptools", - "setuptools-scm" - ], - "jarowinkler": [ - "cython", - "setuptools" - ], - "javaobj-py3": [ - "setuptools" - ], - "javaproperties": [ - "setuptools" - ], - "jax": [ - "setuptools" - ], - "jaxlib": [ - "setuptools" - ], - "jaxlib-bin": [ - "setuptools" - ], - "jaxlib-build": [ - "setuptools" - ], - "jaxlibwithcuda": [ - "setuptools" - ], - "jaxlibwithoutcuda": [ - "setuptools" - ], - "jaydebeapi": [ - "setuptools" - ], - "jc": [ - "setuptools" - ], - "jdatetime": [ - "setuptools" - ], - "jdcal": [ - "setuptools" - ], - "jedi": [ - "setuptools" - ], - "jedi-language-server": [ - "poetry-core", - "setuptools" - ], - "jeepney": [ - "flit-core", - "setuptools" - ], - "jellyfin-apiclient-python": [ - "setuptools" - ], - "jellyfish": [ - "setuptools" - ], - "jenkins-job-builder": [ - "pbr", - "setuptools" - ], - "jieba": [ - "setuptools" - ], - "jinja2": [ - "setuptools" - ], - "jinja2-ansible-filters": [ - "setuptools" - ], - "jinja2-git": [ - "poetry-core", - "setuptools" - ], - "jinja2-pluralize": [ - "setuptools" - ], - "jinja2-time": [ - "setuptools" - ], - "jira": [ - "setuptools", - "setuptools-scm" - ], - "jmespath": [ - "setuptools" - ], - "jmp": [ - "setuptools" - ], - "joblib": [ - "setuptools" - ], - "johnnycanencrypt": [ - "setuptools" - ], - "josepy": [ - "setuptools" - ], - "journalwatch": [ - "setuptools" - ], - "jplephem": [ - "setuptools" - ], - "jproperties": [ - "setuptools", - "setuptools-scm" - ], - "jpylyzer": [ - "setuptools" - ], - "jpype1": [ - "setuptools" - ], - "jq": [ - "cython", - "setuptools" - ], - "js2py": [ - "setuptools" - ], - "jsbeautifier": [ - "setuptools" - ], - "jschema-to-python": [ - "pbr", - "setuptools" - ], - "jsii": [ - "setuptools" - ], - "jsmin": [ - "setuptools" - ], - "json-home-client": [ - "setuptools" - ], - "json-logging": [ - "setuptools" - ], - "json-merge-patch": [ - "setuptools" - ], - "json-rpc": [ - "setuptools" - ], - "json-schema-for-humans": [ - "poetry-core", - "setuptools" - ], - "json-stream": [ - "setuptools" - ], - "json-tricks": [ - "setuptools" - ], - "json5": [ - "setuptools" - ], - "jsonconversion": [ - "setuptools" - ], - "jsondate": [ - "setuptools" - ], - "jsondiff": [ - "setuptools" - ], - "jsonfield": [ - "setuptools" - ], - "jsonlines": [ - "setuptools" - ], - "jsonmerge": [ - "setuptools" - ], - "jsonnet": [ - "setuptools" - ], - "jsonpatch": [ - "setuptools" - ], - "jsonpath": [ - "setuptools" - ], - "jsonpath-ng": [ - "setuptools" - ], - "jsonpath-rw": [ - "setuptools" - ], - "jsonpickle": [ - "setuptools", - "setuptools-scm" - ], - "jsonpointer": [ - "setuptools" - ], - "jsonref": [ - { - "buildSystem": "setuptools", - "until": "0.3.0" - }, - { - "buildSystem": "poetry", - "from": "0.3.0", - "until": "1.1.0" - }, - { - "buildSystem": "pdm-pep517", - "from": "1.1.0" - } - ], - "jsonrpc-async": [ - "setuptools" - ], - "jsonrpc-base": [ - "setuptools" - ], - "jsonrpc-websocket": [ - "setuptools" - ], - "jsonrpclib-pelix": [ - "setuptools" - ], - "jsons": [ - "setuptools" - ], - "jsonschema": [ - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "4.11.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "4.6.0" - }, - { - "buildSystem": "hatchling", - "from": "4.6.0" - }, - { - "buildSystem": "setuptools", - "until": "4.6.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "4.6.0" - } - ], - "jsonschema-3": [ - "setuptools-scm" - ], - "jsonschema-spec": [ - "poetry-core" - ], - "jsonstreams": [ - "setuptools" - ], - "jug": [ - "setuptools" - ], - "junit-xml": [ - "setuptools" - ], - "junitparser": [ - "setuptools" - ], - "junos-eznc": [ - "setuptools" - ], - "jupyter": [ - "setuptools" - ], - "jupyter-book": [ - "flit-core", - "setuptools" - ], - "jupyter-c-kernel": [ - "setuptools" - ], - "jupyter-cache": [ - "setuptools" - ], - "jupyter-client": [ - "hatchling", - "setuptools" - ], - "jupyter-console": [ - { - "buildSystem": "setuptools", - "until": "6.6.0" - }, - { - "buildSystem": "hatchling", - "from": "6.6.0" - } - ], - "jupyter-core": [ - { - "buildSystem": "hatchling", - "from": "4.11.0" - }, - { - "buildSystem": "setuptools", - "until": "4.11.0" - } - ], - "jupyter-events": [ - "hatchling" - ], - "jupyter-lsp": [ - "setuptools" - ], - "jupyter-packaging": [ - "hatchling", - "setuptools" - ], - "jupyter-repo2docker": [ - "setuptools" - ], - "jupyter-server": [ - { - "buildSystem": "setuptools", - "until": "1.21.0" - }, - { - "buildSystem": "jupyter-packaging", - "from": "1.21.0" - } - ], - "jupyter-server-fileid": [ - "hatchling" - ], - "jupyter-server-mathjax": [ - "jupyter-packaging", - "setuptools" - ], - "jupyter-server-terminals": [ - "hatchling" - ], - "jupyter-server-ydoc": [ - "hatchling" - ], - "jupyter-sphinx": [ - "setuptools" - ], - "jupyter-telemetry": [ - "setuptools" - ], - "jupyter-ydoc": [ - { - "buildSystem": "hatchling" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "0.2.3" - } - ], - "jupyterhub": [ - "setuptools" - ], - "jupyterhub-ldapauthenticator": [ - "setuptools" - ], - "jupyterhub-systemdspawner": [ - "setuptools" - ], - "jupyterhub-tmpauthenticator": [ - "setuptools" - ], - "jupyterlab": [ - { - "buildSystem": "jupyter-packaging", - "until": "4" - }, - { - "buildSystem": "setuptools", - "until": "4" - }, - { - "buildSystem": "hatchling", - "from": "4" - }, - { - "buildSystem": "hatch-jupyter-builder", - "from": "4" - } - ], - "jupyterlab-code-formatter": [ - "jupyter-packaging" - ], - "jupyterlab-git": [ - "jupyter-packaging", - "setuptools" - ], - "jupyterlab-launcher": [ - "setuptools" - ], - "jupyterlab-lsp": [ - "setuptools" - ], - "jupyterlab-pygments": [ - "jupyter-packaging", - "setuptools" - ], - "jupyterlab-server": [ - "hatchling", - "setuptools" - ], - "jupyterlab-widgets": [ - "setuptools" - ], - "jupytext": [ - "setuptools" - ], - "justbackoff": [ - "setuptools" - ], - "justbases": [ - "setuptools" - ], - "justbytes": [ - "setuptools" - ], - "justnimbus": [ - "poetry-core", - "setuptools" - ], - "justpy": [ - "flit-core" - ], - "jwcrypto": [ - "setuptools" - ], - "jxmlease": [ - "setuptools" - ], - "k5test": [ - "setuptools" - ], - "kafka-python": [ - "setuptools" - ], - "kaggle": [ - "setuptools" - ], - "kaitaistruct": [ - "setuptools" - ], - "kajiki": [ - "setuptools" - ], - "kaldi-active-grammar": [ - "setuptools" - ], - "kanidm": [ - "poetry-core", - "setuptools" - ], - "kaptan": [ - "setuptools" - ], - "karton-asciimagic": [ - "setuptools" - ], - "karton-autoit-ripper": [ - "setuptools" - ], - "karton-classifier": [ - "setuptools" - ], - "karton-config-extractor": [ - "setuptools" - ], - "karton-core": [ - "setuptools" - ], - "karton-dashboard": [ - "setuptools" - ], - "karton-mwdb-reporter": [ - "setuptools" - ], - "karton-yaramatcher": [ - "setuptools" - ], - "kazoo": [ - "setuptools" - ], - "kbcstorage": [ - "setuptools", - "setuptools-scm" - ], - "kconfiglib": [ - "setuptools" - ], - "keep": [ - "setuptools" - ], - "keepkey": [ - "setuptools" - ], - "keepkey-agent": [ - "setuptools" - ], - "kegtron-ble": [ - "poetry-core" - ], - "keras": [ - "setuptools" - ], - "keras-applications": [ - "setuptools" - ], - "keras-preprocessing": [ - "setuptools" - ], - "kerberos": [ - "setuptools" - ], - "keyboard": [ - "setuptools" - ], - "keyring": [ - "setuptools", - "setuptools-scm" - ], - "keyring-pass": [ - "poetry-core" - ], - "keyrings-alt": [ - "setuptools", - "setuptools-scm" - ], - "keyrings-cryptfile": [ - "setuptools" - ], - "keyrings-google-artifactregistry-auth": [ - "setuptools", - "setuptools-scm" - ], - "keystone-engine": [ - "setuptools" - ], - "keystoneauth1": [ - "pbr", - "setuptools" - ], - "keyutils": [ - "setuptools" - ], - "kinparse": [ - "setuptools" - ], - "kiss-headers": [ - "setuptools" - ], - "kitchen": [ - "setuptools" - ], - "kivy": [ - "cython", - "setuptools" - ], - "kivy-garden": [ - "setuptools" - ], - "kiwisolver": [ - "setuptools", - "setuptools-scm" - ], - "klaus": [ - "setuptools" - ], - "klein": [ - "setuptools" - ], - "kmapper": [ - "setuptools" - ], - "kml2geojson": [ - "poetry-core", - "setuptools" - ], - "knack": [ - "setuptools" - ], - "kombu": [ - "setuptools" - ], - "konnected": [ - "setuptools" - ], - "kopf": [ - "setuptools", - "setuptools-scm" - ], - "korean-lunar-calendar": [ - "setuptools" - ], - "kraken-common": [ - "poetry" - ], - "krakenex": [ - "setuptools" - ], - "kubernetes": [ - "setuptools" - ], - "kubernetes-stubs": [ - "poetry" - ], - "l18n": [ - "setuptools" - ], - "labgrid": [ - "setuptools", - "setuptools-scm" - ], - "labmath": [ - "setuptools" - ], - "langcodes": [ - "poetry-core", - "setuptools" - ], - "langdetect": [ - "setuptools" - ], - "language-data": [ - "poetry-core", - "setuptools" - ], - "language-formatters-pre-commit-hooks": [ - "setuptools" - ], - "lark": [ - "setuptools" - ], - "lark-parser": [ - "setuptools" - ], - "latexcodec": [ - "setuptools" - ], - "latexify-py": [ - "hatchling" - ], - "launchpadlib": [ - "setuptools" - ], - "laundrify-aio": [ - "setuptools" - ], - "lazr-config": [ - "setuptools" - ], - "lazr-delegates": [ - "setuptools" - ], - "lazr-restfulclient": [ - "setuptools" - ], - "lazr-uri": [ - "setuptools" - ], - "lazy": [ - "setuptools" - ], - "lazy-import": [ - "setuptools" - ], - "lazy-object-proxy": [ - "setuptools", - "setuptools-scm" - ], - "lc7001": [ - "poetry-core", - "setuptools" - ], - "ldap": [ - "setuptools" - ], - "ldap3": [ - "setuptools" - ], - "ldapdomaindump": [ - "setuptools" - ], - "ldappool": [ - "pbr", - "setuptools" - ], - "ldaptor": [ - "setuptools" - ], - "leather": [ - "setuptools" - ], - "leb128": [ - "setuptools" - ], - "led-ble": [ - "poetry-core", - "setuptools" - ], - "ledger-agent": [ - "setuptools" - ], - "ledgerblue": [ - "setuptools" - ], - "ledgerwallet": [ - "setuptools" - ], - "lektor": [ - "setuptools" - ], - "leveldb": [ - "setuptools" - ], - "levenshtein": [ - "cython", - "setuptools" - ], - "lexid": [ - "setuptools" - ], - "lhapdf": [ - "cython" - ], - "libagent": [ - "setuptools" - ], - "libais": [ - "setuptools" - ], - "libarchive-c": [ - "setuptools" - ], - "libarcus": [ - "setuptools" - ], - "libasyncns": [ - "setuptools" - ], - "libclang": [ - "setuptools" - ], - "libcloud": [ - "setuptools" - ], - "libcst": [ - "setuptools", - "setuptools-scm" - ], - "libevdev": [ - "setuptools" - ], - "libgpuarray": [ - "cython", - "setuptools" - ], - "libiio": [ - "setuptools" - ], - "libkeepass": [ - "setuptools" - ], - "liblarch": [ - "setuptools" - ], - "liblzfse": [ - "setuptools" - ], - "libmr": [ - "cython", - "setuptools" - ], - "libnacl": [ - "setuptools" - ], - "libpurecool": [ - "setuptools" - ], - "libpyfoscam": [ - "setuptools" - ], - "libpyvivotek": [ - "setuptools" - ], - "librosa": [ - "setuptools" - ], - "librouteros": [ - "setuptools" - ], - "libsass": [ - "setuptools" - ], - "libsavitar": [ - "setuptools" - ], - "libsixel": [ - "setuptools" - ], - "libsoundtouch": [ - "setuptools" - ], - "libthumbor": [ - "setuptools" - ], - "libtmux": [ - "poetry-core", - "setuptools" - ], - "libusb1": [ - "setuptools" - ], - "libusbsio": [ - "setuptools" - ], - "libversion": [ - "setuptools" - ], - "libvirt": [ - "setuptools" - ], - "libvirt-python": [ - "setuptools" - ], - "license-expression": [ - "setuptools", - "setuptools-scm" - ], - "licensecheck": [ - "poetry-core" - ], - "life360": [ - "setuptools" - ], - "lightgbm": [ - "setuptools" - ], - "lightning": [ - "setuptools" - ], - "lightning-cloud": [ - "setuptools" - ], - "lightning-utilities": [ - "setuptools" - ], - "lightparam": [ - "setuptools" - ], - "lightwave": [ - "setuptools" - ], - "lightwave2": [ - "setuptools" - ], - "ligo-segments": [ - "setuptools" - ], - "lima": [ - "setuptools" - ], - "limiter": [ - "setuptools" - ], - "limitlessled": [ - "setuptools" - ], - "limits": [ - "setuptools" - ], - "limnoria": [ - "setuptools" - ], - "line-profiler": [ - "cython", - "setuptools" - ], - "linecache2": [ - "pbr", - "setuptools" - ], - "lingua": [ - "flit-core", - "setuptools" - ], - "linkify-it-py": [ - "setuptools" - ], - "linode": [ - "setuptools" - ], - "linode-api": [ - "setuptools" - ], - "linuxfd": [ - "setuptools" - ], - "linz-logger": [ - "poetry-core" - ], - "liquidctl": [ - "setuptools" - ], - "lit": [ - "setuptools" - ], - "littleutils": [ - "setuptools" - ], - "livelossplot": [ - "setuptools" - ], - "livereload": [ - "setuptools" - ], - "livestreamer": [ - "setuptools" - ], - "livestreamer-curses": [ - "setuptools" - ], - "lizard": [ - "setuptools" - ], - "llama-cpp-python": [ - "setuptools", - "scikit-build" - ], - "llfuse": [ - "cython", - "setuptools" - ], - "llvmlite": [ - "setuptools" - ], - "lmdb": [ - "setuptools" - ], - "lmfit": [ - "setuptools" - ], - "lml": [ - "setuptools" - ], - "lmnotify": [ - "setuptools" - ], - "lmtpd": [ - "setuptools" - ], - "lnurl": [ - "setuptools" - ], - "loca": [ - "flit-core", - "setuptools" - ], - "localimport": [ - "setuptools" - ], - "localstack": [ - "setuptools" - ], - "localstack-client": [ - "setuptools" - ], - "localstack-ext": [ - "setuptools" - ], - "localzone": [ - "setuptools" - ], - "locationsharinglib": [ - "setuptools" - ], - "locket": [ - "setuptools" - ], - "lockfile": [ - "pbr", - "setuptools" - ], - "log-symbols": [ - "setuptools" - ], - "logbook": [ - "setuptools" - ], - "logfury": [ - "setuptools", - "setuptools-scm" - ], - "logi-circle": [ - "setuptools" - ], - "logical-unification": [ - "setuptools" - ], - "logilab-astng": [ - "setuptools" - ], - "logilab-common": [ - "setuptools" - ], - "logilab-constraint": [ - "setuptools" - ], - "logster": [ - "setuptools" - ], - "loguru": [ - "setuptools" - ], - "logutils": [ - "setuptools" - ], - "logzero": [ - "setuptools" - ], - "lomond": [ - "setuptools" - ], - "loo-py": [ - "setuptools" - ], - "loopy": [ - "setuptools" - ], - "losant-rest": [ - "setuptools" - ], - "lrcalc-python": [ - "cython", - "setuptools" - ], - "lru-dict": [ - "setuptools" - ], - "lsassy": [ - "poetry-core", - "setuptools" - ], - "luddite": [ - "setuptools" - ], - "luftdaten": [ - "poetry-core", - "setuptools" - ], - "luhn": [ - "setuptools" - ], - "lunarcalendar": [ - "setuptools" - ], - "lupa": [ - "cython", - "setuptools" - ], - "lupupy": [ - "setuptools" - ], - "luxor": [ - "setuptools" - ], - "luxtronik": [ - "setuptools" - ], - "lxmf": [ - "setuptools" - ], - "lxml": [ - "cython", - "setuptools" - ], - "lxml-stubs": [ - "setuptools" - ], - "lyricwikia": [ - "setuptools" - ], - "lz4": [ - "pkgconfig", - "setuptools", - "setuptools-scm" - ], - "lzstring": [ - "setuptools" - ], - "m2crypto": [ - "setuptools" - ], - "m3u8": [ - "setuptools" - ], - "mac-alias": [ - "setuptools" - ], - "maestral": [ - "pbr", - "setuptools" - ], - "magic": [ - "setuptools" - ], - "magic-wormhole": [ - "setuptools" - ], - "magic-wormhole-mailbox-server": [ - "setuptools" - ], - "magic-wormhole-transit-relay": [ - "setuptools" - ], - "magicgui": [ - "setuptools", - "setuptools-scm" - ], - "mahotas": [ - "setuptools" - ], - "mail-parser": [ - "setuptools" - ], - "mailcap-fix": [ - "setuptools" - ], - "mailchecker": [ - "setuptools" - ], - "mailchimp": [ - "setuptools" - ], - "mailmanclient": [ - "setuptools" - ], - "mailsuite": [ - "hatchling", - "setuptools" - ], - "makefun": [ - "setuptools", - "setuptools-scm" - ], - "mako": [ - "setuptools" - ], - "malduck": [ - "setuptools" - ], - "manage-fastapi": [ - "poetry" - ], - "managesieve": [ - "setuptools" - ], - "mangum": [ - "setuptools" - ], - "manhole": [ - "setuptools" - ], - "manifestoo": [ - { - "buildSystem": "flit-core", - "until": "0.5" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.5" - }, - { - "buildSystem": "hatchling", - "from": "0.5" - } - ], - "manifestoo-core": [ - "hatch-vcs", - "hatchling" - ], - "manimpango": [ - "cython", - "setuptools" - ], - "manuel": [ - "setuptools" - ], - "mapbox-earcut": [ - "setuptools" - ], - "mariadb": [ - "setuptools" - ], - "marisa-trie": [ - "cython", - "setuptools" - ], - "markdown": [ - "setuptools" - ], - "markdown-include": [ - "setuptools" - ], - "markdown-it-py": [ - "flit-core", - "setuptools" - ], - "markdown-macros": [ - "setuptools" - ], - "markdown2": [ - "setuptools" - ], - "markdownify": [ - "setuptools" - ], - "markerlib": [ - "setuptools" - ], - "markups": [ - "setuptools" - ], - "markupsafe": [ - "setuptools" - ], - "marshmallow": [ - "setuptools" - ], - "marshmallow-dataclass": [ - "setuptools" - ], - "marshmallow-enum": [ - "setuptools" - ], - "marshmallow-oneofschema": [ - "setuptools" - ], - "marshmallow-polyfield": [ - "setuptools" - ], - "marshmallow-sqlalchemy": [ - "setuptools" - ], - "mask-rcnn": [ - "cython" - ], - "mastodon-py": [ - "setuptools" - ], - "mat2": [ - "setuptools" - ], - "matchpy": [ - "setuptools", - "setuptools-scm" - ], - "mathlibtools": [ - "setuptools" - ], - "matlink-gpapi": [ - "setuptools" - ], - "matplotlib": [ - "setuptools", - "setuptools-scm" - ], - "matplotlib-inline": [ - "setuptools" - ], - "matrix-api-async": [ - "setuptools" - ], - "matrix-client": [ - "setuptools" - ], - "matrix-common": [ - "setuptools" - ], - "matrix-nio": [ - "poetry-core", - "setuptools" - ], - "mattermostdriver": [ - "setuptools" - ], - "mautrix": [ - "setuptools" - ], - "mautrix-appservice": [ - "setuptools" - ], - "maxcube-api": [ - "setuptools" - ], - "maxminddb": [ - "setuptools" - ], - "maxminddb-geolite2": [ - "setuptools" - ], - "maya": [ - "setuptools" - ], - "mayavi": [ - "setuptools" - ], - "mbddns": [ - "setuptools" - ], - "mbtest": [ - "setuptools" - ], - "mccabe": [ - "setuptools" - ], - "mcstatus": [ - "poetry-core", - "setuptools" - ], - "md-toc": [ - "setuptools" - ], - "md2gemini": [ - "setuptools" - ], - "mdformat": [ - "poetry-core", - "setuptools" - ], - "mdit-py-plugins": [ - "flit-core", - "setuptools" - ], - "mdp": [ - "setuptools" - ], - "mdurl": [ - "flit-core", - "setuptools" - ], - "mdutils": [ - "setuptools" - ], - "mdx-truly-sane-lists": [ - "setuptools" - ], - "measurement": [ - "setuptools", - "setuptools-scm" - ], - "meater-python": [ - "setuptools" - ], - "mecab-python3": [ - "setuptools", - "setuptools-scm" - ], - "mechanicalsoup": [ - "setuptools" - ], - "mechanize": [ - "setuptools" - ], - "mediafile": [ - "flit-core", - "setuptools" - ], - "mediapy": [ - "setuptools" - ], - "meeko": [ - "setuptools" - ], - "meilisearch": [ - "setuptools" - ], - "meinheld": [ - "setuptools" - ], - "meld3": [ - "setuptools" - ], - "memcached": [ - "setuptools" - ], - "memory-allocator": [ - "cython", - "setuptools" - ], - "memory-profiler": [ - "setuptools" - ], - "mercantile": [ - "setuptools" - ], - "mercurial": [ - "setuptools" - ], - "mergedb": [ - "setuptools", - "setuptools-scm" - ], - "mergedeep": [ - "setuptools" - ], - "mergedict": [ - "setuptools" - ], - "merkletools": [ - "setuptools" - ], - "meross-iot": [ - "setuptools" - ], - "mesa": [ - "setuptools" - ], - "meshio": [ - "setuptools" - ], - "meshlabxml": [ - "setuptools" - ], - "meshtastic": [ - "setuptools" - ], - "meson": [ - "setuptools" - ], - "mesonpep517": [ - "setuptools" - ], - "messagebird": [ - "setuptools" - ], - "metakernel": [ - "hatchling", - "setuptools" - ], - "metar": [ - "setuptools" - ], - "meteoalertapi": [ - "setuptools" - ], - "meteocalc": [ - "setuptools" - ], - "meteofrance-api": [ - "poetry-core", - "setuptools" - ], - "metprint": [ - "poetry-core" - ], - "mezzanine": [ - "setuptools" - ], - "micawber": [ - "setuptools" - ], - "micloud": [ - "setuptools" - ], - "midiutil": [ - "setuptools" - ], - "mido": [ - "setuptools" - ], - "migen": [ - "setuptools" - ], - "migra": [ - "poetry-core" - ], - "mike": [ - "setuptools" - ], - "milc": [ - "setuptools" - ], - "milksnake": [ - "setuptools" - ], - "mill-local": [ - "setuptools" - ], - "millheater": [ - "setuptools" - ], - "minexr": [ - "setuptools" - ], - "miniaudio": [ - "setuptools" - ], - "minidb": [ - "setuptools" - ], - "minidump": [ - "setuptools" - ], - "minikanren": [ - "setuptools" - ], - "minikerberos": [ - "setuptools" - ], - "minimal-dydb": [ - "poetry-core" - ], - "minimock": [ - "setuptools" - ], - "mininet-python": [ - "setuptools" - ], - "minio": [ - "setuptools" - ], - "miniupnpc": [ - "setuptools" - ], - "misaka": [ - "setuptools" - ], - "mistletoe": [ - "setuptools" - ], - "mistune": [ - "setuptools" - ], - "mistune-2-0": [ - "setuptools" - ], - "mitmproxy": [ - "setuptools" - ], - "mitogen": [ - "setuptools" - ], - "mixer": [ - "setuptools" - ], - "mixpanel": [ - "setuptools" - ], - "mizani": [ - "setuptools" - ], - "mkdocs": [ - { - "buildSystem": "hatchling", - "from": "1.4.1" - }, - "setuptools" - ], - "mkdocs-autorefs": [ - "pdm-pep517", - "poetry", - "setuptools" - ], - "mkdocs-awesome-pages-plugin": [ - "poetry" - ], - "mkdocs-drawio-exporter": [ - "setuptools" - ], - "mkdocs-exclude": [ - "setuptools" - ], - "mkdocs-exclude-search": [ - "setuptools" - ], - "mkdocs-gen-files": [ - "poetry" - ], - "mkdocs-git-revision-date-localized-plugin": [ - "setuptools" - ], - "mkdocs-gitlab": [ - "setuptools" - ], - "mkdocs-jupyter": [ - "ipython-genutils", - "poetry-core" - ], - "mkdocs-literate-nav": [ - "poetry" - ], - "mkdocs-macros": [ - "setuptools" - ], - "mkdocs-macros-plugin": [ - "setuptools" - ], - "mkdocs-material": [ - { - "buildSystem": "hatchling", - "from": "8.5.3" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "8.5.3" - }, - "setuptools" - ], - "mkdocs-material-extensions": [ - { - "buildSystem": "hatchling", - "from": "1.1" - }, - "setuptools" - ], - "mkdocs-minify": [ - "setuptools" - ], - "mkdocs-redirects": [ - "setuptools" - ], - "mkdocs-swagger-ui-tag": [ - "setuptools" - ], - "mkdocs-table-reader-plugin": [ - "setuptools" - ], - "mkdocstrings": [ - "pdm-pep517", - "setuptools" - ], - "mkdocstrings-python": [ - "setuptools" - ], - "mkl-service": [ - "cython", - "setuptools" - ], - "ml-collections": [ - "setuptools" - ], - "mlflow": [ - "setuptools" - ], - "mlrose": [ - "setuptools" - ], - "mmcif-pdbx": [ - "setuptools" - ], - "mmh3": [ - "setuptools" - ], - "mne-python": [ - "setuptools" - ], - "mnemonic": [ - "setuptools" - ], - "mnist": [ - "setuptools" - ], - "moat-ble": [ - "poetry-core", - "setuptools" - ], - "mock": [ - "pbr", - "setuptools" - ], - "mock-open": [ - "setuptools" - ], - "mock-services": [ - "setuptools" - ], - "mocket": [ - "setuptools" - ], - "mockito": [ - "setuptools" - ], - "mockupdb": [ - "setuptools" - ], - "mode-streaming": [ - "setuptools" - ], - "moderngl": [ - "setuptools" - ], - "moderngl-window": [ - "setuptools" - ], - "mohawk": [ - "setuptools" - ], - "moku": [ - "setuptools" - ], - "monai": [ - "setuptools" - ], - "monero": [ - "setuptools" - ], - "mongodict": [ - "setuptools" - ], - "mongoengine": [ - "setuptools" - ], - "mongomock": [ - "pbr", - "setuptools" - ], - "monkeyhex": [ - "setuptools" - ], - "monosat": [ - "cython", - "setuptools" - ], - "monotonic": [ - "setuptools" - ], - "monty": [ - "setuptools" - ], - "moonraker-api": [ - "setuptools" - ], - "more-itertools": [ - "flit-core", - "setuptools" - ], - "more-properties": [ - "setuptools" - ], - "morecantile": [ - { - "buildSystem": "setuptools", - "until": "3.2.0" - }, - { - "buildSystem": "flit-core", - "from": "3.2.0" - } - ], - "morphys": [ - "setuptools" - ], - "mortgage": [ - "setuptools" - ], - "motionblinds": [ - "setuptools" - ], - "motioneye-client": [ - "poetry-core", - "setuptools" - ], - "moto": [ - "setuptools" - ], - "motor": [ - "setuptools" - ], - "mouseinfo": [ - "setuptools" - ], - "moviepy": [ - "setuptools" - ], - "mox": [ - "setuptools" - ], - "mox3": [ - "pbr", - "setuptools" - ], - "mpd2": [ - "setuptools" - ], - "mpi4py": [ - "setuptools" - ], - "mpldatacursor": [ - "setuptools" - ], - "mplfinance": [ - "setuptools" - ], - "mplleaflet": [ - "setuptools" - ], - "mpmath": [ - "setuptools", - "setuptools-scm" - ], - "mpv": [ - "setuptools" - ], - "mpyq": [ - "setuptools" - ], - "ms-active-directory": [ - "setuptools" - ], - "ms-cv": [ - "setuptools" - ], - "msal": [ - "setuptools" - ], - "msal-extensions": [ - "setuptools" - ], - "msgpack": [ - "setuptools" - ], - "msgpack-numpy": [ - "cython", - "setuptools" - ], - "msgpack-python": [ - "setuptools" - ], - "msgpack-types": [ - "poetry" - ], - "msgraph-core": [ - "flit-core", - "setuptools" - ], - "msldap": [ - "setuptools" - ], - "msoffcrypto-tool": [ - "poetry-core", - "setuptools" - ], - "msrest": [ - "setuptools" - ], - "msrestazure": [ - "setuptools" - ], - "mss": [ - "setuptools" - ], - "mt-940": [ - "setuptools" - ], - "mujson": [ - "setuptools" - ], - "mullvad-api": [ - "setuptools" - ], - "mulpyplexer": [ - "setuptools" - ], - "multi-key-dict": [ - "setuptools" - ], - "multiaddr": [ - "setuptools" - ], - "multidict": [ - "setuptools" - ], - "multihash": [ - "setuptools" - ], - "multimethod": [ - "setuptools" - ], - "multipledispatch": [ - "setuptools" - ], - "multiprocess": [ - "setuptools" - ], - "multiset": [ - "setuptools", - "setuptools-scm" - ], - "multitasking": [ - "setuptools" - ], - "munch": [ - "pbr", - "setuptools" - ], - "munkres": [ - "setuptools" - ], - "murmurhash": [ - "cython", - "setuptools" - ], - "musicbrainzngs": [ - "setuptools" - ], - "mutag": [ - "setuptools" - ], - "mutagen": [ - "setuptools" - ], - "mutatormath": [ - "setuptools" - ], - "mutesync": [ - "setuptools" - ], - "mutf8": [ - "setuptools" - ], - "mutmut": [ - "setuptools" - ], - "mwclient": [ - "setuptools" - ], - "mwdblib": [ - "setuptools" - ], - "mwoauth": [ - "setuptools" - ], - "mwparserfromhell": [ - "setuptools" - ], - "mxnet": [ - "setuptools" - ], - "myfitnesspal": [ - "setuptools" - ], - "mygpoclient": [ - "setuptools" - ], - "myhome": [ - "poetry-core", - "setuptools" - ], - "myjwt": [ - "setuptools" - ], - "mypy": [ - "setuptools" - ], - "mypy-boto3-batch": [ - "setuptools" - ], - "mypy-boto3-builder": [ - "poetry-core", - "setuptools" - ], - "mypy-boto3-cognito": [ - "setuptools" - ], - "mypy-boto3-cognito-idp": [ - "setuptools" - ], - "mypy-boto3-dynamodb": [ - "setuptools" - ], - "mypy-boto3-ec2": [ - "setuptools" - ], - "mypy-boto3-events": [ - "setuptools" - ], - "mypy-boto3-lambda": [ - "setuptools" - ], - "mypy-boto3-logs": [ - "setuptools" - ], - "mypy-boto3-rds": [ - "setuptools" - ], - "mypy-boto3-s3": [ - "setuptools" - ], - "mypy-boto3-s3control": [ - "setuptools" - ], - "mypy-boto3-secretsmanager": [ - "setuptools" - ], - "mypy-boto3-sns": [ - "setuptools" - ], - "mypy-boto3-sqs": [ - "setuptools" - ], - "mypy-boto3-ssm": [ - "setuptools" - ], - "mypy-boto3-stepfunctions": [ - "setuptools" - ], - "mypy-boto3-sts": [ - "setuptools" - ], - "mypy-extensions": [ - "setuptools" - ], - "mypy-protobuf": [ - "setuptools" - ], - "mysql-connector": [ - "setuptools" - ], - "mysqlclient": [ - "setuptools" - ], - "myst-docutils": [ - "flit-core", - "setuptools" - ], - "myst-nb": [ - "flit-core", - "setuptools" - ], - "myst-parser": [ - "flit-core", - "setuptools" - ], - "nad-receiver": [ - "setuptools" - ], - "nagiosplugin": [ - "setuptools" - ], - "name-that-hash": [ - "poetry-core", - "setuptools" - ], - "namedlist": [ - "setuptools" - ], - "nameparser": [ - "setuptools" - ], - "names": [ - "setuptools" - ], - "nampa": [ - "setuptools" - ], - "nanoid": [ - "setuptools" - ], - "nanoleaf": [ - "setuptools" - ], - "nanomsg-python": [ - "setuptools" - ], - "nanotime": [ - "setuptools" - ], - "napalm": [ - "setuptools" - ], - "napalm-hp-procurve": [ - "setuptools" - ], - "napari": [ - "setuptools", - "setuptools-scm" - ], - "napari-console": [ - "setuptools", - "setuptools-scm" - ], - "napari-npe2": [ - "setuptools", - "setuptools-scm" - ], - "napari-plugin-engine": [ - "setuptools", - "setuptools-scm" - ], - "napari-svg": [ - "setuptools", - "setuptools-scm" - ], - "nats-py": [ - "setuptools" - ], - "nats-python": [ - "poetry-core", - "setuptools" - ], - "natsort": [ - "setuptools" - ], - "naturalsort": [ - "setuptools" - ], - "nbclassic": [ - "jupyter-packaging", - "setuptools" - ], - "nbclient": [ - { - "buildSystem": "hatchling", - "from": "0.7.1" - }, - "setuptools" - ], - "nbconflux": [ - "setuptools" - ], - "nbconvert": [ - { - "buildSystem": "setuptools", - "until": "7.0.0" - }, - { - "buildSystem": "hatchling", - "from": "7.0.0" - } - ], - "nbdime": [ - "setuptools", - "setuptools-scm" - ], - "nbformat": [ - { - "buildSystem": "setuptools", - "until": "5.5.0" - }, - { - "buildSystem": "flit-core", - "from": "5.5.0", - "until": "5.6.0" - }, - { - "buildSystem": "hatchling", - "from": "5.6.0" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "5.6.0" - } - ], - "nbmerge": [ - "setuptools" - ], - "nbsmoke": [ - "setuptools" - ], - "nbsphinx": [ - "setuptools" - ], - "nbval": [ - "setuptools" - ], - "nbxmpp": [ - "setuptools" - ], - "ncclient": [ - "setuptools" - ], - "nclib": [ - "setuptools" - ], - "ndg-httpsclient": [ - "setuptools" - ], - "ndjson": [ - "setuptools" - ], - "ndms2-client": [ - "setuptools" - ], - "ndspy": [ - "setuptools" - ], - "ndtypes": [ - "setuptools" - ], - "nengo": [ - "setuptools" - ], - "neo": [ - "setuptools" - ], - "neo4j": [ - "setuptools" - ], - "nessclient": [ - "setuptools" - ], - "nest-asyncio": [ - "setuptools" - ], - "nested-lookup": [ - "setuptools" - ], - "nestedtext": [ - "setuptools" - ], - "net2grid": [ - "poetry-core", - "setuptools" - ], - "netaddr": [ - "setuptools" - ], - "netcdf4": [ - "cython", - "setuptools" - ], - "netdata": [ - "poetry-core", - "setuptools" - ], - "netdisco": [ - "setuptools" - ], - "netifaces": [ - "setuptools" - ], - "netio": [ - "setuptools" - ], - "netmap": [ - "setuptools" - ], - "netmiko": [ - "setuptools" - ], - "nettigo-air-monitor": [ - "setuptools" - ], - "netutils": [ - "poetry-core", - "setuptools" - ], - "networkx": [ - "setuptools" - ], - "newrelic": [ - "setuptools" - ], - "newversion": [ - "poetry-core", - "setuptools" - ], - "nexia": [ - "setuptools" - ], - "nextcloudmonitor": [ - "setuptools" - ], - "nextcord": [ - "setuptools" - ], - "nextdns": [ - "setuptools" - ], - "nghttp2": [ - "cython", - "setuptools" - ], - "niaaml": [ - "poetry-core" - ], - "niaarm": [ - "poetry-core", - "setuptools" - ], - "niapy": [ - "setuptools" - ], - "nibabel": [ - "setuptools" - ], - "nibe": [ - "setuptools" - ], - "nicegui": [ - "poetry-core" - ], - "niko-home-control": [ - "setuptools" - ], - "nikola": [ - "setuptools" - ], - "nilearn": [ - "setuptools" - ], - "niluclient": [ - "setuptools" - ], - "nimfa": [ - "setuptools" - ], - "nine": [ - "setuptools" - ], - "nipy": [ - "setuptools" - ], - "nitime": [ - "cython", - "setuptools" - ], - "nitransforms": [ - "setuptools", - "setuptools-scm" - ], - "nix-kernel": [ - "setuptools" - ], - "nix-prefetch-github": [ - "setuptools" - ], - "nixpkgs": [ - "pbr", - "setuptools" - ], - "nixpkgs-pytools": [ - "setuptools" - ], - "nkdfu": [ - "flit-core", - "setuptools" - ], - "nltk": [ - "setuptools" - ], - "nmapthon2": [ - "setuptools" - ], - "nocasedict": [ - "setuptools" - ], - "nocaselist": [ - "setuptools" - ], - "node-semver": [ - "setuptools" - ], - "nodeenv": [ - "setuptools" - ], - "nodepy-runtime": [ - "setuptools" - ], - "noise": [ - "setuptools" - ], - "noiseprotocol": [ - "setuptools" - ], - "nomadnet": [ - "setuptools" - ], - "normality": [ - "setuptools" - ], - "nose": [ - "setuptools" - ], - "nose-cov": [ - "setuptools" - ], - "nose-cprof": [ - "setuptools" - ], - "nose-exclude": [ - "setuptools" - ], - "nose-pattern-exclude": [ - "setuptools" - ], - "nose-randomly": [ - "setuptools" - ], - "nose-timer": [ - "setuptools" - ], - "nose-warnings-filters": [ - "setuptools" - ], - "nose2": [ - "setuptools" - ], - "nosejs": [ - "setuptools" - ], - "nosexcover": [ - "setuptools" - ], - "notebook": [ - "setuptools" - ], - "notebook-shim": [ - { - "buildSystem": "setuptools", - "until": "0.2.0" - }, - { - "buildSystem": "hatchling", - "from": "0.2.0" - }, - "jupyter-packaging" - ], - "notedown": [ - "setuptools" - ], - "notifications-python-client": [ - "setuptools" - ], - "notify-events": [ - "setuptools" - ], - "notify-py": [ - "poetry-core", - "setuptools" - ], - "notify2": [ - "setuptools" - ], - "notifymuch": [ - "setuptools" - ], - "notmuch": [ - "setuptools" - ], - "notmuch2": [ - "setuptools" - ], - "nototools": [ - "setuptools", - "setuptools-scm" - ], - "notus-scanner": [ - "poetry-core", - "setuptools" - ], - "nox": [ - "setuptools" - ], - "nplusone": [ - "setuptools" - ], - "npm": [ - "setuptools" - ], - "npyscreen": [ - "setuptools" - ], - "nr-io-lexer": [ - "poetry" - ], - "nr-python-environment": [ - "poetry" - ], - "nr-util": [ - "poetry" - ], - "nsapi": [ - "setuptools" - ], - "ntc-templates": [ - "poetry-core", - "setuptools" - ], - "ntlm-auth": [ - "setuptools" - ], - "ntplib": [ - "setuptools" - ], - "nuitka": [ - "setuptools" - ], - "nulltype": [ - "setuptools" - ], - "num2words": [ - "setuptools" - ], - "numba": [ - "setuptools" - ], - "numba-scipy": [ - "setuptools" - ], - "numbawithcuda": [ - "setuptools" - ], - "numcodecs": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "numdifftools": [ - "setuptools" - ], - "numericalunits": [ - "setuptools" - ], - "numexpr": [ - "setuptools" - ], - "numpy": [ - "cython", - "setuptools" - ], - "numpy-stl": [ - "cython", - "setuptools" - ], - "numpydoc": [ - "setuptools" - ], - "numpyro": [ - "setuptools" - ], - "nunavut": [ - "setuptools" - ], - "nutils": [ - "setuptools" - ], - "nvchecker": [ - "setuptools" - ], - "nvidia-ml-py3": [ - "setuptools", - "setuptools-scm" - ], - "nwdiag": [ - "setuptools" - ], - "nxt-python": [ - "setuptools" - ], - "oasatelematics": [ - "setuptools" - ], - "oath": [ - "setuptools" - ], - "oauth": [ - "setuptools" - ], - "oauth2": [ - "setuptools" - ], - "oauth2client": [ - "setuptools" - ], - "oauthenticator": [ - "setuptools" - ], - "oauthlib": [ - "setuptools" - ], - "objax": [ - "setuptools" - ], - "objgraph": [ - "setuptools" - ], - "obspy": [ - "setuptools" - ], - "oci": [ - "setuptools" - ], - "ocifs": [ - "setuptools" - ], - "ocrmypdf": [ - "setuptools", - "setuptools-scm" - ], - "od": [ - "setuptools" - ], - "odfpy": [ - "setuptools" - ], - "oemthermostat": [ - "setuptools", - "setuptools-scm" - ], - "offtrac": [ - "setuptools" - ], - "ofxclient": [ - "setuptools" - ], - "ofxhome": [ - "setuptools" - ], - "ofxparse": [ - "setuptools" - ], - "ofxtools": [ - "setuptools" - ], - "olefile": [ - "setuptools" - ], - "oletools": [ - "setuptools" - ], - "omegaconf": [ - "setuptools" - ], - "omnikinverter": [ - "poetry-core", - "setuptools" - ], - "omnilogic": [ - "setuptools" - ], - "ondilo": [ - "setuptools" - ], - "onetimepad": [ - "setuptools" - ], - "onetimepass": [ - "setuptools" - ], - "onkyo-eiscp": [ - "setuptools" - ], - "online-judge-api-client": [ - "setuptools" - ], - "online-judge-tools": [ - "setuptools" - ], - "onlykey-solo-python": [ - "setuptools" - ], - "onnx": [ - "setuptools" - ], - "onvif-zeep-async": [ - "setuptools" - ], - "oocsi": [ - "setuptools" - ], - "open-garage": [ - "setuptools" - ], - "open-meteo": [ - "poetry-core", - "setuptools" - ], - "openai": [ - "setuptools" - ], - "openant": [ - "setuptools" - ], - "openapi-codec": [ - "setuptools" - ], - "openapi-core": [ - "poetry-core", - "setuptools" - ], - "openapi-python-client": [ - "poetry-core" - ], - "openapi-schema-validator": [ - "poetry-core", - "setuptools" - ], - "openapi-spec-validator": [ - "poetry-core", - "setuptools" - ], - "openbabel-bindings": [ - "setuptools" - ], - "opencv4": [ - "setuptools" - ], - "openerz-api": [ - "setuptools" - ], - "openevsewifi": [ - "poetry-core", - "setuptools" - ], - "openhomedevice": [ - "setuptools" - ], - "openidc-client": [ - "setuptools" - ], - "openmm": [ - "cython" - ], - "openpaperwork-core": [ - "setuptools" - ], - "openpaperwork-gtk": [ - "setuptools" - ], - "openpyxl": [ - "setuptools" - ], - "openrazer": [ - "setuptools" - ], - "openrazer-daemon": [ - "setuptools" - ], - "openrouteservice": [ - "setuptools" - ], - "opensensemap-api": [ - "setuptools" - ], - "opensfm": [ - "setuptools" - ], - "openshift": [ - "setuptools" - ], - "opensimplex": [ - "setuptools" - ], - "openstackdocstheme": [ - "pbr", - "setuptools" - ], - "openstacksdk": [ - "pbr", - "setuptools" - ], - "openstep-plist": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "opentelemetry-api": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-jaeger-proto-grpc": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-jaeger-thrift": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-otlp-proto-http": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-asgi": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-asyncpg": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-fastapi": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-httpx": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-proto": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-sdk": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-semantic-conventions": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.33b0" - } - ], - "opentelemetry-util-http": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.33b0" - } - ], - "opentimestamps": [ - "setuptools" - ], - "opentracing": [ - "setuptools" - ], - "openvino": [ - "cython" - ], - "openwebifpy": [ - "setuptools" - ], - "openwrt-luci-rpc": [ - "setuptools" - ], - "openwrt-ubus-rpc": [ - "setuptools" - ], - "opsdroid-get-image-size": [ - "setuptools" - ], - "opt-einsum": [ - "setuptools" - ], - "optax": [ - "setuptools" - ], - "option": [ - "poetry-core" - ], - "optional-django": [ - "setuptools" - ], - "opuslib": [ - "setuptools" - ], - "oralb-ble": [ - "poetry-core" - ], - "ordered-set": [ - "flit-core", - "setuptools" - ], - "orderedmultidict": [ - "setuptools" - ], - "orjson": [ - "setuptools" - ], - "orm": [ - "setuptools" - ], - "ormar": [ - "poetry-core", - "setuptools" - ], - "ortools": [ - "setuptools" - ], - "orvibo": [ - "setuptools" - ], - "os-service-types": [ - "pbr", - "setuptools" - ], - "osc": [ - "setuptools" - ], - "osc-lib": [ - "pbr", - "setuptools" - ], - "oscpy": [ - "setuptools" - ], - "oscrypto": [ - "setuptools" - ], - "oset": [ - "setuptools" - ], - "oslo-concurrency": [ - "pbr", - "setuptools" - ], - "oslo-config": [ - "pbr", - "setuptools" - ], - "oslo-context": [ - "pbr", - "setuptools" - ], - "oslo-db": [ - "pbr", - "setuptools" - ], - "oslo-i18n": [ - "pbr", - "setuptools" - ], - "oslo-log": [ - "pbr", - "setuptools" - ], - "oslo-serialization": [ - "pbr", - "setuptools" - ], - "oslo-utils": [ - "pbr", - "setuptools" - ], - "oslotest": [ - "pbr", - "setuptools" - ], - "osmnx": [ - "setuptools" - ], - "osmpythontools": [ - "setuptools" - ], - "ospd": [ - "setuptools" - ], - "osqp": [ - "setuptools", - "setuptools-scm" - ], - "oss2": [ - "setuptools" - ], - "ossfs": [ - "setuptools" - ], - "outcome": [ - "setuptools" - ], - "overly": [ - "setuptools" - ], - "overrides": [ - "setuptools" - ], - "ovh": [ - "setuptools" - ], - "ovmfvartool": [ - "setuptools" - ], - "ovoenergy": [ - "setuptools" - ], - "owslib": [ - "setuptools" - ], - "oyaml": [ - "setuptools" - ], - "p1monitor": [ - "poetry-core", - "setuptools" - ], - "pa-ringbuffer": [ - "setuptools" - ], - "packageurl-python": [ - "setuptools" - ], - "packaging": [ - { - "buildSystem": "setuptools", - "until": "20.4" - }, - { - "buildSystem": "flit-core", - "from": "20.4", - "until": "20.8" - }, - { - "buildSystem": "setuptools", - "from": "20.8", - "until": "22.0" - }, - { - "buildSystem": "flit-core", - "from": "22.0" - } - ], - "packbits": [ - "setuptools" - ], - "packet-python": [ - "setuptools" - ], - "pad4pi": [ - "setuptools" - ], - "paddle-client": [ - "poetry" - ], - "pafy": [ - "setuptools" - ], - "pagelabels": [ - "setuptools" - ], - "paho-mqtt": [ - "setuptools" - ], - "palace": [ - "cython", - "setuptools" - ], - "palettable": [ - "setuptools" - ], - "pallets-sphinx-themes": [ - "setuptools" - ], - "pam": [ - "setuptools" - ], - "pamela": [ - "setuptools" - ], - "pamqp": [ - "setuptools" - ], - "panacotta": [ - "setuptools" - ], - "panasonic-viera": [ - "setuptools" - ], - "pandarrallel": [ - "setuptools" - ], - "pandas": [ - "cython", - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "pandas-datareader": [ - "setuptools" - ], - "pandas-stubs": [ - "poetry-core", - "setuptools" - ], - "pandoc-attributes": [ - "setuptools" - ], - "pandoc-xnos": [ - "setuptools" - ], - "pandocfilters": [ - "setuptools" - ], - "panel": [ - "setuptools" - ], - "panflute": [ - "setuptools" - ], - "pao": [ - "setuptools" - ], - "papermill": [ - "setuptools" - ], - "paperwork-backend": [ - "setuptools" - ], - "paperwork-shell": [ - "setuptools" - ], - "papis": [ - "setuptools" - ], - "papis-python-rofi": [ - "setuptools" - ], - "param": [ - "setuptools" - ], - "parameter-expansion-patched": [ - "setuptools", - "setuptools-scm" - ], - "parameterized": [ - "setuptools" - ], - "paramiko": [ - "setuptools" - ], - "paramz": [ - "setuptools" - ], - "paranoid-crypto": [ - "setuptools" - ], - "parfive": [ - "setuptools", - "setuptools-scm" - ], - "parquet": [ - "setuptools" - ], - "parse": [ - "setuptools" - ], - "parse-type": [ - "setuptools" - ], - "parsedatetime": [ - "setuptools" - ], - "parsedmarc": [ - "setuptools" - ], - "parsel": [ - "setuptools" - ], - "parsimonious": [ - "setuptools" - ], - "parsita": [ - "poetry" - ], - "parsley": [ - "setuptools" - ], - "parso": [ - "setuptools" - ], - "parsy": [ - "setuptools" - ], - "partd": [ - "setuptools" - ], - "particle": [ - "setuptools", - "setuptools-scm" - ], - "parts": [ - "setuptools" - ], - "parver": [ - "setuptools" - ], - "passlib": [ - "setuptools" - ], - "paste": [ - "setuptools" - ], - "pastedeploy": [ - "setuptools" - ], - "pastel": [ - "poetry-core", - "setuptools" - ], - "pastescript": [ - "setuptools" - ], - "patch": [ - "setuptools" - ], - "patch-ng": [ - "setuptools" - ], - "path": [ - "setuptools", - "setuptools-scm" - ], - "path-and-address": [ - "setuptools" - ], - "pathable": [ - "poetry-core", - "setuptools" - ], - "pathlib2": [ - "setuptools" - ], - "pathos": [ - "setuptools" - ], - "pathpy": [ - "setuptools", - "setuptools-scm" - ], - "pathspec": [ - { - "buildSystem": "setuptools", - "until": "0.11.0" - }, - { - "buildSystem": "flit-core", - "from": "0.11.0" - } - ], - "pathtools": [ - "setuptools" - ], - "pathvalidate": [ - "setuptools" - ], - "pathy": [ - "setuptools" - ], - "patiencediff": [ - "setuptools" - ], - "patool": [ - "setuptools" - ], - "patrowl4py": [ - "setuptools" - ], - "patsy": [ - "setuptools" - ], - "paver": [ - "setuptools" - ], - "paypalrestsdk": [ - "setuptools" - ], - "pbkdf2": [ - "setuptools" - ], - "pbr": [ - "setuptools" - ], - "pc-ble-driver-py": [ - "setuptools" - ], - "pcapy-ng": [ - "cython", - "setuptools" - ], - "pcodedmp": [ - "setuptools" - ], - "pcpp": [ - "setuptools" - ], - "pdb-tools": [ - "setuptools" - ], - "pdb2pqr": [ - "setuptools" - ], - "pdbpp": [ - "setuptools", - "setuptools-scm" - ], - "pdbtools": [ - "setuptools" - ], - "pdf2image": [ - "setuptools" - ], - "pdfkit": [ - "setuptools" - ], - "pdfminer": [ - "setuptools" - ], - "pdfminer-six": [ - "setuptools" - ], - "pdfposter": [ - "setuptools" - ], - "pdfrw": [ - "setuptools" - ], - "pdftotext": [ - "setuptools" - ], - "pdfx": [ - "setuptools" - ], - "pdm-pep517": [ - "setuptools" - ], - "pdoc": [ - "setuptools" - ], - "pdoc3": [ - "setuptools", - "setuptools-scm" - ], - "pdunehd": [ - "setuptools" - ], - "peaqevcore": [ - "setuptools" - ], - "pebble": [ - "setuptools" - ], - "pecan": [ - "setuptools" - ], - "peco": [ - "setuptools" - ], - "peewee": [ - "cython", - "setuptools" - ], - "pefile": [ - "setuptools", - "setuptools-scm" - ], - "peft": [ - "setuptools" - ], - "pelican": [ - "setuptools" - ], - "pem": [ - "setuptools" - ], - "pencompy": [ - "setuptools" - ], - "pendulum": [ - "poetry-core", - "setuptools" - ], - "pep257": [ - "setuptools" - ], - "pep440": [ - "flit-core", - "setuptools" - ], - "pep440-version-utils": [ - "poetry" - ], - "pep517": [ - "flit-core", - "setuptools" - ], - "pep8": [ - "setuptools" - ], - "pep8-naming": [ - "setuptools" - ], - "peppercorn": [ - "setuptools" - ], - "percol": [ - "setuptools" - ], - "periodictable": [ - "setuptools" - ], - "persim": [ - "setuptools" - ], - "persistent": [ - "setuptools" - ], - "persisting-theory": [ - "setuptools" - ], - "pescea": [ - "setuptools" - ], - "petname": [ - "setuptools" - ], - "pex": [ - "flit-core", - "setuptools" - ], - "pexif": [ - "setuptools" - ], - "pexpect": [ - "setuptools" - ], - "pg-activity": [ - "setuptools" - ], - "pg8000": [ - "setuptools" - ], - "pgcli": [ - "setuptools" - ], - "pglast": [ - "setuptools" - ], - "pgpdump": [ - "setuptools" - ], - "pgpy": [ - "setuptools" - ], - "pgsanity": [ - "setuptools" - ], - "pgspecial": [ - "setuptools" - ], - "phe": [ - "setuptools" - ], - "phik": [ - "setuptools" - ], - "phone-modem": [ - "setuptools" - ], - "phonemizer": [ - "setuptools" - ], - "phonenumbers": [ - "setuptools" - ], - "phonopy": [ - "setuptools" - ], - "phpserialize": [ - "setuptools" - ], - "phx-class-registry": [ - "setuptools" - ], - "pi1wire": [ - "setuptools" - ], - "piccata": [ - "setuptools" - ], - "piccolo-theme": [ - "setuptools" - ], - "pick": [ - "poetry-core", - "setuptools" - ], - "pickleshare": [ - "setuptools" - ], - "picobox": [ - "setuptools", - "setuptools-scm" - ], - "picos": [ - "setuptools" - ], - "pid": [ - "setuptools" - ], - "piexif": [ - "setuptools" - ], - "pijuice": [ - "setuptools" - ], - "pika": [ - "setuptools" - ], - "pika-pool": [ - "setuptools" - ], - "pikepdf": [ - "setuptools", - "setuptools-scm" - ], - "pilkit": [ - "setuptools" - ], - "pillow": [ - "setuptools" - ], - "pillow-simd": [ - "setuptools" - ], - "pillowfight": [ - "setuptools" - ], - "pims": [ - "setuptools" - ], - "pinboard": [ - "setuptools" - ], - "pint": [ - "setuptools", - "setuptools-scm" - ], - "pint-pandas": [ - "setuptools", - "setuptools-scm" - ], - "pip": [ - "setuptools" - ], - "pip-api": [ - "setuptools" - ], - "pip-licenses": [ - "setuptools", - "pytest-runner" - ], - "pip-requirements-parser": [ - "setuptools", - "setuptools-scm" - ], - "pip-tools": [ - "setuptools", - "setuptools-scm" - ], - "pipdate": [ - "setuptools" - ], - "pipdeptree": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "pipenv-poetry-migrate": [ - "poetry-core", - "setuptools" - ], - "pipx": [ - "hatchling", - "setuptools" - ], - "pivy": [ - "setuptools" - ], - "pixcat": [ - "setuptools" - ], - "pixelmatch": [ - "poetry-core", - "setuptools" - ], - "pkce": [ - "setuptools" - ], - "pkgconfig": [ - "poetry-core", - "setuptools" - ], - "pkginfo": [ - "setuptools" - ], - "pkginfo2": [ - "setuptools" - ], - "pkgutil-resolve-name": [ - "flit-core" - ], - "pkutils": [ - "setuptools" - ], - "plac": [ - "setuptools" - ], - "plaid-python": [ - "setuptools" - ], - "plantuml": [ - "setuptools" - ], - "plantuml-markdown": [ - "setuptools" - ], - "plaster": [ - "setuptools" - ], - "plaster-pastedeploy": [ - "setuptools" - ], - "platformdirs": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "playsound": [ - "setuptools" - ], - "playwright": [ - "setuptools-scm" - ], - "plexapi": [ - "setuptools" - ], - "plexauth": [ - "setuptools" - ], - "plexwebsocket": [ - "setuptools" - ], - "plone-testing": [ - "setuptools" - ], - "plotly": [ - "setuptools" - ], - "plotnine": [ - "setuptools" - ], - "pluggy": [ - "setuptools", - "setuptools-scm" - ], - "pluginbase": [ - "setuptools" - ], - "plugincode": [ - "setuptools", - "setuptools-scm" - ], - "plugnplay": [ - "setuptools" - ], - "plugwise": [ - "setuptools" - ], - "plum-py": [ - "setuptools" - ], - "plumbum": [ - { - "buildSystem": "setuptools", - "until": "1.8.1" - }, - { - "buildSystem": "setuptools-scm", - "until": "1.8.1" - }, - { - "buildSystem": "hatch-vcs", - "from": "1.8.1" - }, - { - "buildSystem": "hatchling", - "from": "1.8.1" - } - ], - "pluralizer": [ - "setuptools" - ], - "plux": [ - "pytest-runner", - "setuptools" - ], - "ply": [ - "setuptools" - ], - "plyer": [ - "setuptools" - ], - "plyfile": [ - "setuptools" - ], - "plyplus": [ - "setuptools" - ], - "plyvel": [ - "setuptools" - ], - "pmdarima": [ - "setuptools" - ], - "pmsensor": [ - "setuptools" - ], - "pmw": [ - "setuptools" - ], - "pocket": [ - "setuptools" - ], - "podcastparser": [ - "setuptools" - ], - "podcats": [ - "setuptools" - ], - "poetry-dynamic-versioning": [ - "poetry-core", - "setuptools" - ], - "poetry-plugin-export": [ - "poetry-core" - ], - "poetry-semver": [ - "setuptools" - ], - "poetry2conda": [ - "poetry", - "setuptools" - ], - "poezio": [ - "setuptools" - ], - "polarizationsolver": [ - "setuptools" - ], - "polib": [ - "setuptools" - ], - "policy-sentry": [ - "setuptools" - ], - "policyuniverse": [ - "setuptools" - ], - "polyline": [ - "setuptools" - ], - "pomegranate": [ - "cython", - "setuptools" - ], - "pontos": [ - "poetry-core", - "setuptools" - ], - "pony": [ - "setuptools" - ], - "ponywhoosh": [ - "setuptools" - ], - "pooch": [ - "setuptools", - "setuptools-scm" - ], - "pook": [ - "setuptools" - ], - "poolsense": [ - "setuptools" - ], - "poppler-qt5": [ - "setuptools" - ], - "portalocker": [ - "setuptools" - ], - "portend": [ - "setuptools", - "setuptools-scm" - ], - "portpicker": [ - "setuptools" - ], - "posix-ipc": [ - "setuptools" - ], - "pot": [ - "cython", - "setuptools" - ], - "potentials": [ - "setuptools" - ], - "potr": [ - "setuptools" - ], - "power": [ - "setuptools" - ], - "powerline": [ - "setuptools" - ], - "powerline-mem-segment": [ - "setuptools" - ], - "powerlinememsegment": [ - "setuptools" - ], - "pox": [ - "setuptools" - ], - "poyo": [ - "setuptools" - ], - "ppdeep": [ - "setuptools" - ], - "ppft": [ - "setuptools" - ], - "pplpy": [ - "cython", - "setuptools" - ], - "pprintpp": [ - "setuptools" - ], - "pproxy": [ - "setuptools" - ], - "ppscore": [ - "setuptools" - ], - "pq": [ - "setuptools" - ], - "prance": [ - "setuptools", - "setuptools-scm" - ], - "praw": [ - "setuptools" - ], - "prawcore": [ - "setuptools" - ], - "prayer-times-calculator": [ - "setuptools" - ], - "pre-commit": [ - "setuptools" - ], - "pre-commit-hooks": [ - "setuptools" - ], - "pre-commit-po-hooks": [ - "setuptools" - ], - "precis-i18n": [ - "setuptools" - ], - "prefixed": [ - "setuptools" - ], - "preggy": [ - "setuptools" - ], - "premailer": [ - "setuptools" - ], - "preprocess-cancellation": [ - "poetry-core", - "setuptools" - ], - "preshed": [ - "cython", - "setuptools" - ], - "pretend": [ - "setuptools" - ], - "prettytable": [ - { - "buildSystem": "setuptools", - "until": "3.5.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "3.5.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "3.5.0" - }, - { - "buildSystem": "hatchling", - "from": "3.5.0" - } - ], - "primecountpy": [ - "cython", - "setuptools" - ], - "primer3": [ - "cython", - "setuptools" - ], - "priority": [ - "setuptools" - ], - "prison": [ - "setuptools" - ], - "privacyidea-ldap-proxy": [ - "setuptools" - ], - "proboscis": [ - "setuptools" - ], - "process-tests": [ - "setuptools" - ], - "proglog": [ - "setuptools" - ], - "progress": [ - "setuptools" - ], - "progressbar": [ - "setuptools" - ], - "progressbar2": [ - "setuptools" - ], - "progressbar33": [ - "setuptools" - ], - "prometheus-client": [ - "setuptools" - ], - "prometheus-fastapi-instrumentator": [ - "poetry" - ], - "prometheus-flask-exporter": [ - "setuptools" - ], - "promise": [ - "setuptools" - ], - "prompt-toolkit": [ - "setuptools" - ], - "property-manager": [ - "setuptools" - ], - "propka": [ - "setuptools" - ], - "prospector": [ - "poetry-core" - ], - "protego": [ - "setuptools" - ], - "proto-plus": [ - "setuptools" - ], - "protobuf": [ - "setuptools" - ], - "protobuf3-to-dict": [ - "setuptools" - ], - "protoletariat": [ - "poetry-core" - ], - "proton-client": [ - "setuptools" - ], - "protonup": [ - "setuptools" - ], - "protonvpn-nm-lib": [ - "setuptools" - ], - "prov": [ - "setuptools" - ], - "prox-tv": [ - "setuptools" - ], - "proxmoxer": [ - "setuptools" - ], - "proxy-py": [ - "setuptools", - "setuptools-scm" - ], - "proxy-tools": [ - "setuptools" - ], - "psautohint": [ - "setuptools", - "setuptools-scm" - ], - "pscript": [ - "setuptools" - ], - "psd-tools": [ - "cython", - "setuptools" - ], - "psrpcore": [ - "setuptools" - ], - "psutil": [ - "setuptools" - ], - "psutil-home-assistant": [ - "setuptools" - ], - "psycopg": [ - "setuptools" - ], - "psycopg-pool": [ - "setuptools" - ], - "psycopg2": [ - "setuptools" - ], - "psycopg2-binary": [ - "setuptools" - ], - "psycopg2cffi": [ - "setuptools" - ], - "psygnal": [ - "setuptools", - "setuptools-scm" - ], - "ptable": [ - "setuptools" - ], - "ptest": [ - "setuptools" - ], - "ptpython": [ - "setuptools" - ], - "ptyprocess": [ - "flit-core", - "setuptools" - ], - "publication": [ - "flit" - ], - "publicsuffix": [ - "setuptools" - ], - "publicsuffix2": [ - "setuptools" - ], - "pubnub": [ - "setuptools" - ], - "pubnubsub-handler": [ - "setuptools" - ], - "pudb": [ - "setuptools" - ], - "pulp": [ - "setuptools" - ], - "pulsectl": [ - "setuptools" - ], - "pulumi": [ - "setuptools" - ], - "pulumi-aws": [ - "setuptools" - ], - "pulumi-azure-native": [ - "setuptools" - ], - "pure-cdb": [ - "setuptools" - ], - "pure-eval": [ - "setuptools", - "setuptools-scm" - ], - "pure-pcapy3": [ - "setuptools" - ], - "pure-python-adb": [ - "setuptools" - ], - "pure-python-adb-homeassistant": [ - "setuptools" - ], - "pure-sasl": [ - "setuptools" - ], - "puremagic": [ - "setuptools" - ], - "purepng": [ - "cython", - "setuptools" - ], - "purl": [ - "setuptools" - ], - "push-receiver": [ - "setuptools" - ], - "pushbullet": [ - "setuptools" - ], - "pushover-complete": [ - "setuptools" - ], - "pvlib": [ - "setuptools" - ], - "pvo": [ - "poetry-core", - "setuptools" - ], - "pweave": [ - "setuptools" - ], - "pwntools": [ - "setuptools" - ], - "py": [ - "setuptools", - "setuptools-scm" - ], - "py-air-control": [ - "setuptools" - ], - "py-air-control-exporter": [ - "setuptools" - ], - "py-canary": [ - "setuptools" - ], - "py-cid": [ - "setuptools" - ], - "py-cord": [ - "setuptools", - "setuptools-scm" - ], - "py-cpuinfo": [ - "setuptools" - ], - "py-deprecate": [ - "setuptools" - ], - "py-desmume": [ - "setuptools" - ], - "py-dmidecode": [ - "setuptools" - ], - "py-ecc": [ - "setuptools" - ], - "py-eth-sig-utils": [ - "setuptools" - ], - "py-libzfs": [ - "cython" - ], - "py-lru-cache": [ - "setuptools" - ], - "py-multiaddr": [ - "setuptools" - ], - "py-multibase": [ - "setuptools" - ], - "py-multicodec": [ - "setuptools" - ], - "py-multihash": [ - "pytest-runner", - "setuptools" - ], - "py-nextbusnext": [ - "setuptools" - ], - "py-nightscout": [ - "setuptools" - ], - "py-partiql-parser": [ - "setuptools" - ], - "py-scrypt": [ - "setuptools" - ], - "py-sneakers": [ - "setuptools" - ], - "py-sonic": [ - "setuptools" - ], - "py-stringmatching": [ - "setuptools" - ], - "py-synologydsm-api": [ - "poetry-core", - "setuptools" - ], - "py-tes": [ - "setuptools" - ], - "py-tree-sitter": [ - "setuptools" - ], - "py-ubjson": [ - "setuptools" - ], - "py-vapid": [ - "setuptools" - ], - "py-zabbix": [ - "setuptools" - ], - "py17track": [ - "poetry-core", - "setuptools" - ], - "py2bit": [ - "setuptools" - ], - "py3exiv2": [ - "setuptools" - ], - "py3rijndael": [ - "setuptools" - ], - "py3status": [ - "setuptools" - ], - "py3to2": [ - "setuptools" - ], - "py4j": [ - "setuptools" - ], - "pyacoustid": [ - "setuptools" - ], - "pyads": [ - "setuptools" - ], - "pyaehw4a1": [ - "setuptools" - ], - "pyaes": [ - "setuptools" - ], - "pyaftership": [ - "setuptools" - ], - "pyahocorasick": [ - "setuptools" - ], - "pyairnow": [ - "poetry-core", - "setuptools" - ], - "pyairtable": [ - "setuptools" - ], - "pyairvisual": [ - "poetry-core", - "setuptools" - ], - "pyalgotrade": [ - "setuptools" - ], - "pyalmond": [ - "setuptools" - ], - "pyamg": [ - "setuptools", - "setuptools-scm" - ], - "pyaml": [ - "setuptools" - ], - "pyannotate": [ - "setuptools" - ], - "pyarlo": [ - "setuptools" - ], - "pyarr": [ - "setuptools" - ], - "pyarrow": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "pyasn": [ - "setuptools" - ], - "pyasn1": [ - "setuptools" - ], - "pyasn1-modules": [ - "setuptools" - ], - "pyatag": [ - "setuptools" - ], - "pyathena": [ - "setuptools" - ], - "pyatmo": [ - "setuptools", - "setuptools-scm" - ], - "pyatome": [ - "setuptools" - ], - "pyatspi": [ - "setuptools" - ], - "pyatv": [ - "setuptools" - ], - "pyaudio": [ - "setuptools" - ], - "pyaussiebb": [ - "poetry-core", - "setuptools" - ], - "pyautogui": [ - "setuptools" - ], - "pyavm": [ - "setuptools" - ], - "pyaxmlparser": [ - "setuptools" - ], - "pybalboa": [ - "setuptools" - ], - "pybase64": [ - "setuptools" - ], - "pybigwig": [ - "setuptools" - ], - "pybind11": [ - "setuptools" - ], - "pybindgen": [ - "setuptools", - "setuptools-scm" - ], - "pyblackbird": [ - "setuptools" - ], - "pyblake2": [ - "setuptools" - ], - "pybluez": [ - "setuptools" - ], - "pybotvac": [ - "setuptools" - ], - "pybravia": [ - "poetry-core" - ], - "pybrowserid": [ - "setuptools" - ], - "pybtex": [ - "setuptools" - ], - "pybtex-docutils": [ - "setuptools" - ], - "pybullet": [ - "setuptools" - ], - "pycairo": [ - "setuptools" - ], - "pycangjie": [ - "cython", - "setuptools" - ], - "pycapnp": [ - "cython", - "setuptools" - ], - "pycaption": [ - "setuptools" - ], - "pycares": [ - "setuptools" - ], - "pycarwings2": [ - "setuptools" - ], - "pycategories": [ - "setuptools" - ], - "pycdio": [ - "setuptools" - ], - "pycec": [ - "setuptools" - ], - "pycep-parser": [ - "poetry-core", - "setuptools" - ], - "pycfdns": [ - "setuptools" - ], - "pycflow2dot": [ - "setuptools" - ], - "pycfmodel": [ - "setuptools" - ], - "pychannels": [ - "setuptools" - ], - "pychef": [ - "setuptools" - ], - "pychm": [ - "setuptools" - ], - "pychromecast": [ - "setuptools" - ], - "pycketcasts": [ - "setuptools" - ], - "pyclimacell": [ - "setuptools" - ], - "pyclip": [ - "setuptools" - ], - "pyclipper": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "pycm": [ - "setuptools" - ], - "pycmarkgfm": [ - "setuptools" - ], - "pycocotools": [ - "cython", - "setuptools" - ], - "pycodestyle": [ - "setuptools" - ], - "pycognito": [ - "setuptools" - ], - "pycoin": [ - "setuptools" - ], - "pycollada": [ - "setuptools" - ], - "pycomfoconnect": [ - "setuptools" - ], - "pycontracts": [ - "setuptools" - ], - "pycontrol4": [ - "setuptools" - ], - "pycoolmasternet-async": [ - "setuptools" - ], - "pycosat": [ - "setuptools" - ], - "pycountry": [ - "setuptools" - ], - "pycparser": [ - "setuptools" - ], - "pycrc": [ - "setuptools" - ], - "pycritty": [ - "setuptools" - ], - "pycron": [ - "setuptools" - ], - "pycrypto": [ - "setuptools" - ], - "pycryptodome": [ - "setuptools" - ], - "pycryptodomex": [ - "setuptools" - ], - "pycsdr": [ - "setuptools" - ], - "pyct": [ - "setuptools" - ], - "pyctr": [ - "setuptools" - ], - "pycuda": [ - "setuptools" - ], - "pycups": [ - "setuptools" - ], - "pycurl": [ - "setuptools" - ], - "pycxx": [ - "setuptools" - ], - "pydaikin": [ - "setuptools" - ], - "pydal": [ - "setuptools" - ], - "pydanfossair": [ - "setuptools" - ], - "pydantic": [ - "cython", - "setuptools" - ], - "pydantic-dydb": [ - "poetry-core" - ], - "pydash": [ - "setuptools" - ], - "pydata-sphinx-theme": [ - "setuptools" - ], - "pydbus": [ - "setuptools" - ], - "pydeck": [ - "setuptools" - ], - "pydeconz": [ - "setuptools" - ], - "pydelijn": [ - "setuptools" - ], - "pydenticon": [ - "setuptools" - ], - "pydeprecate": [ - "setuptools" - ], - "pydeps": [ - "setuptools" - ], - "pydes": [ - "setuptools" - ], - "pydevccu": [ - "setuptools" - ], - "pydevd": [ - "setuptools" - ], - "pydevd-odoo": [ - "setuptools" - ], - "pydexcom": [ - "setuptools" - ], - "pydicom": [ - "setuptools" - ], - "pydigiham": [ - "setuptools" - ], - "pydispatcher": [ - "setuptools" - ], - "pydmd": [ - "setuptools" - ], - "pydns": [ - "setuptools" - ], - "pydocstyle": [ - { - "buildSystem": "setuptools", - "until": "6.2.0" - }, - { - "buildSystem": "poetry-core", - "from": "6.2.0" - } - ], - "pydocumentdb": [ - "setuptools" - ], - "pydoods": [ - "setuptools" - ], - "pydot": [ - "setuptools" - ], - "pydpkg": [ - "poetry" - ], - "pydrive2": [ - "setuptools" - ], - "pydroid-ipcam": [ - "setuptools" - ], - "pydruid": [ - "setuptools" - ], - "pydsdl": [ - "setuptools" - ], - "pydub": [ - "setuptools" - ], - "pyduke-energy": [ - "setuptools" - ], - "pydy": [ - "cython", - "setuptools" - ], - "pydyf": [ - "flit-core", - "setuptools" - ], - "pyeapi": [ - "setuptools" - ], - "pyebus": [ - "poetry-core", - "setuptools" - ], - "pyeclib": [ - "setuptools" - ], - "pyeconet": [ - "setuptools" - ], - "pyecowitt": [ - "setuptools" - ], - "pyedimax": [ - "setuptools" - ], - "pyee": [ - "setuptools" - ], - "pyefergy": [ - "setuptools" - ], - "pyeight": [ - "setuptools" - ], - "pyelftools": [ - "setuptools" - ], - "pyemby": [ - "setuptools" - ], - "pyemd": [ - "cython", - "setuptools" - ], - "pyenchant": [ - "setuptools" - ], - "pyenvisalink": [ - "setuptools" - ], - "pyephember": [ - "setuptools" - ], - "pyepsg": [ - "setuptools" - ], - "pyerfa": [ - "setuptools", - "setuptools-scm" - ], - "pyeverlights": [ - "setuptools" - ], - "pyevilgenius": [ - "setuptools" - ], - "pyevmasm": [ - "setuptools" - ], - "pyexcel": [ - "setuptools" - ], - "pyexcel-io": [ - "setuptools" - ], - "pyexcel-ods": [ - "setuptools" - ], - "pyexcel-xls": [ - "setuptools" - ], - "pyext": [ - "setuptools" - ], - "pyezviz": [ - "setuptools" - ], - "pyface": [ - "setuptools" - ], - "pyfaidx": [ - "setuptools", - "setuptools-scm" - ], - "pyfakefs": [ - "setuptools" - ], - "pyfakewebcam": [ - "setuptools" - ], - "pyfantom": [ - "setuptools" - ], - "pyfcm": [ - "setuptools" - ], - "pyfftw": [ - "cython", - "setuptools" - ], - "pyfido": [ - "setuptools" - ], - "pyfiglet": [ - "setuptools" - ], - "pyfireservicerota": [ - "setuptools" - ], - "pyflakes": [ - "setuptools" - ], - "pyflexit": [ - "setuptools" - ], - "pyflic": [ - "setuptools" - ], - "pyflick": [ - "setuptools" - ], - "pyflume": [ - "setuptools" - ], - "pyflunearyou": [ - "poetry-core", - "setuptools" - ], - "pyfma": [ - "setuptools" - ], - "pyfnip": [ - "setuptools" - ], - "pyfreedompro": [ - "setuptools" - ], - "pyfribidi": [ - "setuptools" - ], - "pyfritzhome": [ - "setuptools" - ], - "pyfronius": [ - "setuptools" - ], - "pyftdi": [ - "setuptools" - ], - "pyftgl": [ - "setuptools" - ], - "pyftpdlib": [ - "setuptools" - ], - "pyfttt": [ - "setuptools" - ], - "pyfuse3": [ - "cython", - "setuptools" - ], - "pyfxa": [ - "setuptools" - ], - "pyfzf": [ - "setuptools" - ], - "pygal": [ - "setuptools" - ], - "pygame": [ - "setuptools" - ], - "pygame-gui": [ - "setuptools" - ], - "pygame-sdl2": [ - "cython", - "setuptools" - ], - "pygatt": [ - "setuptools" - ], - "pygccxml": [ - "setuptools" - ], - "pygdbmi": [ - "setuptools" - ], - "pygeoip": [ - "setuptools" - ], - "pygeos": [ - "cython", - "setuptools" - ], - "pygetwindow": [ - "setuptools" - ], - "pygit2": [ - "setuptools" - ], - "pygithub": [ - "setuptools" - ], - "pyglet": [ - "setuptools" - ], - "pygls": [ - "setuptools", - "setuptools-scm" - ], - "pygltflib": [ - "setuptools" - ], - "pygmars": [ - "setuptools", - "setuptools-scm" - ], - "pygments": [ - "setuptools" - ], - "pygments-better-html": [ - "setuptools" - ], - "pygments-markdown-lexer": [ - "setuptools" - ], - "pygmt": [ - "setuptools", - "setuptools-scm" - ], - "pygobject3": [ - "setuptools" - ], - "pygogo": [ - "setuptools" - ], - "pygpgme": [ - "setuptools" - ], - "pygraphviz": [ - "setuptools" - ], - "pygreat": [ - "setuptools" - ], - "pygrok": [ - "setuptools" - ], - "pygtail": [ - "setuptools" - ], - "pygtfs": [ - "setuptools", - "setuptools-scm" - ], - "pygti": [ - "setuptools", - "setuptools-scm" - ], - "pygtkspellcheck": [ - "setuptools" - ], - "pygtrie": [ - "setuptools" - ], - "pyhamcrest": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "pyhanko": [ - "setuptools" - ], - "pyhanko-certvalidator": [ - "setuptools" - ], - "pyhaversion": [ - "setuptools" - ], - "pyhcl": [ - "setuptools" - ], - "pyheos": [ - "setuptools" - ], - "pyhiveapi": [ - "setuptools" - ], - "pyhocon": [ - "setuptools" - ], - "pyhomematic": [ - "setuptools" - ], - "pyhomepilot": [ - "setuptools" - ], - "pyhomeworks": [ - "setuptools" - ], - "pyhs100": [ - "setuptools" - ], - "pyhumps": [ - "poetry-core", - "setuptools" - ], - "pyi2cflash": [ - "setuptools" - ], - "pyialarm": [ - "setuptools" - ], - "pyicloud": [ - "setuptools" - ], - "pyicu": [ - "setuptools" - ], - "pyimpfuzzy": [ - "setuptools" - ], - "pyinfra": [ - "setuptools" - ], - "pyinotify": [ - "setuptools" - ], - "pyinputevent": [ - "setuptools" - ], - "pyinsteon": [ - "setuptools" - ], - "pyinstrument": [ - "setuptools" - ], - "pyintesishome": [ - "setuptools" - ], - "pyipma": [ - "setuptools" - ], - "pyipp": [ - "poetry-core", - "setuptools" - ], - "pyiqvia": [ - "poetry-core", - "setuptools" - ], - "pyisbn": [ - "setuptools" - ], - "pyisy": [ - "setuptools" - ], - "pyjet": [ - "cython", - "setuptools" - ], - "pyjks": [ - "setuptools" - ], - "pyjnius": [ - "cython", - "setuptools" - ], - "pyjsg": [ - "pbr" - ], - "pyjson5": [ - "setuptools" - ], - "pyjsparser": [ - "setuptools" - ], - "pyjwkest": [ - "setuptools" - ], - "pyjwt": [ - "setuptools" - ], - "pykakasi": [ - "setuptools", - "setuptools-scm" - ], - "pykdtree": [ - "setuptools" - ], - "pykeepass": [ - "setuptools" - ], - "pykerberos": [ - "setuptools" - ], - "pykeyatome": [ - "setuptools" - ], - "pykira": [ - "setuptools" - ], - "pykka": [ - "poetry-core", - "setuptools" - ], - "pykmtronic": [ - "setuptools" - ], - "pykodi": [ - "setuptools" - ], - "pykoplenti": [ - "setuptools" - ], - "pykostalpiko": [ - "setuptools" - ], - "pykrakenapi": [ - "setuptools" - ], - "pykube-ng": [ - "setuptools" - ], - "pykulersky": [ - "setuptools" - ], - "pykwalify": [ - "setuptools" - ], - "pykwb": [ - "setuptools" - ], - "pylacrosse": [ - "setuptools" - ], - "pylama": [ - "setuptools" - ], - "pylast": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "pylatexenc": [ - "setuptools" - ], - "pylaunches": [ - "setuptools" - ], - "pyld": [ - "setuptools" - ], - "pylev": [ - "setuptools" - ], - "pylgnetcast": [ - "setuptools" - ], - "pylibacl": [ - "setuptools" - ], - "pylibconfig2": [ - "setuptools" - ], - "pylibdmtx": [ - "setuptools" - ], - "pylibftdi": [ - "setuptools" - ], - "pyliblo": [ - "cython", - "setuptools" - ], - "pylibmc": [ - "setuptools" - ], - "pylightning": [ - "setuptools" - ], - "pylink-square": [ - "setuptools" - ], - "pylint": [ - "setuptools" - ], - "pylint-celery": [ - "setuptools" - ], - "pylint-django": [ - "setuptools" - ], - "pylint-flask": [ - "setuptools" - ], - "pylint-plugin-utils": [ - "setuptools", - "poetry" - ], - "pylint-venv": [ - "poetry-core" - ], - "pylitterbot": [ - "poetry-core", - "setuptools" - ], - "pyln-bolt7": [ - "poetry" - ], - "pyln-client": [ - "poetry" - ], - "pyln-proto": [ - "poetry" - ], - "pylnk3": [ - "setuptools" - ], - "pylru": [ - "setuptools" - ], - "pyls-flake8": [ - "setuptools" - ], - "pyls-isort": [ - "setuptools" - ], - "pyls-spyder": [ - "setuptools" - ], - "pylsp-mypy": [ - "setuptools" - ], - "pylutron": [ - "setuptools" - ], - "pylutron-caseta": [ - "setuptools" - ], - "pylxd": [ - "setuptools" - ], - "pylyrics": [ - "setuptools" - ], - "pylzma": [ - "setuptools" - ], - "pymacaroons": [ - "setuptools" - ], - "pymaging": [ - "setuptools" - ], - "pymaging-png": [ - "setuptools" - ], - "pymailgunner": [ - "setuptools" - ], - "pymanopt": [ - "setuptools" - ], - "pymarkdown": [ - "setuptools" - ], - "pymarshal": [ - "setuptools" - ], - "pymata-express": [ - "setuptools" - ], - "pymatgen": [ - "cython", - "setuptools" - ], - "pymaven-patch": [ - "pbr", - "setuptools" - ], - "pymavlink": [ - "setuptools" - ], - "pymazda": [ - "setuptools" - ], - "pymbolic": [ - "setuptools" - ], - "pymc": [ - "setuptools" - ], - "pymc3": [ - "setuptools" - ], - "pymdown-extensions": [ - "hatchling", - "setuptools" - ], - "pymdstat": [ - "setuptools" - ], - "pymediainfo": [ - "setuptools", - "setuptools-scm" - ], - "pymediaroom": [ - "setuptools" - ], - "pymeeus": [ - "setuptools" - ], - "pymelcloud": [ - "setuptools" - ], - "pymemcache": [ - "setuptools" - ], - "pymemoize": [ - "setuptools" - ], - "pyment": [ - "setuptools" - ], - "pymetar": [ - "setuptools" - ], - "pymeteireann": [ - "setuptools" - ], - "pymeteoclimatic": [ - "setuptools" - ], - "pymetno": [ - "setuptools" - ], - "pymfy": [ - "poetry-core", - "setuptools" - ], - "pymicrobot": [ - "setuptools" - ], - "pymitv": [ - "setuptools" - ], - "pymodbus": [ - "setuptools" - ], - "pymongo": [ - "setuptools" - ], - "pymoo": [ - "cython", - "setuptools" - ], - "pymorphy2": [ - "setuptools" - ], - "pymorphy2-dicts-ru": [ - "setuptools" - ], - "pympler": [ - "setuptools" - ], - "pymsgbox": [ - "setuptools" - ], - "pymssql": [ - "cython", - "setuptools" - ], - "pymsteams": [ - "setuptools" - ], - "pymumble": [ - "setuptools" - ], - "pymunk": [ - "setuptools" - ], - "pymupdf": [ - "setuptools" - ], - "pymvglive": [ - "setuptools" - ], - "pymyq": [ - "setuptools" - ], - "pymysensors": [ - "setuptools" - ], - "pymysql": [ - "setuptools" - ], - "pymysqlsa": [ - "setuptools" - ], - "pymystem3": [ - "setuptools" - ], - "pynac": [ - "setuptools" - ], - "pynacl": [ - "setuptools" - ], - "pynamecheap": [ - "setuptools" - ], - "pynamodb": [ - "setuptools" - ], - "pynanoleaf": [ - "setuptools" - ], - "pynello": [ - "setuptools" - ], - "pynest2d": [ - "setuptools" - ], - "pynetbox": [ - "setuptools", - "setuptools-scm" - ], - "pynetdicom": [ - "setuptools" - ], - "pynetgear": [ - "setuptools" - ], - "pynina": [ - "setuptools" - ], - "pynisher": [ - "setuptools" - ], - "pynixutil": [ - "poetry" - ], - "pynmea2": [ - "setuptools" - ], - "pynndescent": [ - "setuptools" - ], - "pynobo": [ - "setuptools" - ], - "pynput": [ - "setuptools" - ], - "pynrrd": [ - "setuptools" - ], - "pynuki": [ - "poetry-core", - "setuptools" - ], - "pynut2": [ - "setuptools" - ], - "pynvim": [ - "setuptools" - ], - "pynvml": [ - "setuptools" - ], - "pynws": [ - "setuptools" - ], - "pynx584": [ - "setuptools" - ], - "pynzb": [ - "setuptools" - ], - "pyobihai": [ - "setuptools" - ], - "pyocr": [ - "setuptools" - ], - "pyoctoprintapi": [ - "setuptools" - ], - "pyodbc": [ - "setuptools" - ], - "pyogg": [ - "setuptools" - ], - "pyombi": [ - "setuptools" - ], - "pyomo": [ - "setuptools" - ], - "pyopencl": [ - "pybind11", - "setuptools" - ], - "pyopengl": [ - "setuptools" - ], - "pyopenssl": [ - "setuptools" - ], - "pyopenuv": [ - "poetry-core", - "setuptools" - ], - "pyopnsense": [ - "pbr", - "setuptools" - ], - "pyoppleio": [ - "setuptools" - ], - "pyosf": [ - "setuptools" - ], - "pyosmium": [ - "setuptools" - ], - "pyotgw": [ - "setuptools" - ], - "pyotp": [ - "setuptools" - ], - "pyoverkiz": [ - "poetry-core", - "setuptools" - ], - "pyowm": [ - "setuptools" - ], - "pyownet": [ - "setuptools" - ], - "pyp": [ - "setuptools" - ], - "pypandoc": [ - "setuptools" - ], - "pyparser": [ - "setuptools" - ], - "pyparsing": [ - "flit-core", - "setuptools" - ], - "pyparted": [ - "setuptools" - ], - "pypass": [ - "pbr", - "setuptools" - ], - "pypblib": [ - "setuptools" - ], - "pypca": [ - "setuptools" - ], - "pypcap": [ - "setuptools" - ], - "pypck": [ - "setuptools" - ], - "pypdf": [ - "flit" - ], - "pypdf2": [ - "setuptools" - ], - "pypdf3": [ - "setuptools" - ], - "pypeg2": [ - "setuptools" - ], - "pypemicro": [ - "setuptools" - ], - "pyperclip": [ - "setuptools" - ], - "pyperf": [ - "setuptools" - ], - "pypeul": [ - "poetry-core" - ], - "pyphen": [ - "flit", - "setuptools" - ], - "pyphotonfile": [ - "setuptools" - ], - "pypika-tortoise": [ - "poetry-core" - ], - "pypillowfight": [ - "setuptools" - ], - "pypinyin": [ - "setuptools" - ], - "pypiserver": [ - "setuptools" - ], - "pyplaato": [ - "setuptools" - ], - "pypng": [ - "setuptools" - ], - "pypoint": [ - "setuptools" - ], - "pypoolstation": [ - "poetry-core", - "setuptools" - ], - "pyppeteer": [ - "poetry-core", - "setuptools" - ], - "pyprecice": [ - "cython", - "setuptools" - ], - "pypresence": [ - "setuptools" - ], - "pyprind": [ - "setuptools" - ], - "pyprof2calltree": [ - "setuptools" - ], - "pyproj": [ - "cython", - "setuptools" - ], - "pyproject-flake8": [ - "flit-core" - ], - "pyproject-hooks": [ - "flit-core" - ], - "pyproject-metadata": [ - "setuptools" - ], - "pyprosegur": [ - "setuptools" - ], - "pyprusalink": [ - "setuptools" - ], - "pypsrp": [ - "poetry-core", - "setuptools" - ], - "pypubsub": [ - "setuptools" - ], - "pypugjs": [ - "setuptools" - ], - "pypykatz": [ - "setuptools" - ], - "pypytools": [ - "setuptools" - ], - "pyqldb": [ - "setuptools" - ], - "pyqrcode": [ - "setuptools" - ], - "pyqt-builder": [ - "setuptools" - ], - "pyqt4": [ - "setuptools" - ], - "pyqt5": [ - "setuptools" - ], - "pyqt5-sip": [ - "setuptools" - ], - "pyqt5-with-qtmultimedia": [ - "setuptools" - ], - "pyqt5-with-qtwebkit": [ - "setuptools" - ], - "pyqt6": [ - "setuptools" - ], - "pyqtgraph": [ - "setuptools" - ], - "pyqtwebengine": [ - "setuptools" - ], - "pyquaternion": [ - "setuptools" - ], - "pyquery": [ - "setuptools" - ], - "pyquil": [ - "poetry-core", - "setuptools" - ], - "pyqvrpro": [ - "setuptools" - ], - "pyrabbit2": [ - "setuptools" - ], - "pyrad": [ - "poetry-core", - "setuptools" - ], - "pyradios": [ - "setuptools" - ], - "pyrainbird": [ - "setuptools" - ], - "pyramid": [ - "setuptools" - ], - "pyramid-chameleon": [ - "setuptools" - ], - "pyramid-deferred-sqla": [ - "setuptools" - ], - "pyramid-exclog": [ - "setuptools" - ], - "pyramid-force-https": [ - "setuptools" - ], - "pyramid-hawkauth": [ - "setuptools" - ], - "pyramid-heroku": [ - "setuptools" - ], - "pyramid-jinja2": [ - "setuptools" - ], - "pyramid-jwt": [ - "setuptools" - ], - "pyramid-mako": [ - "setuptools" - ], - "pyramid-mixpanel": [ - "setuptools" - ], - "pyramid-multiauth": [ - "setuptools" - ], - "pyramid-openapi3": [ - "poetry" - ], - "pyramid-redirect": [ - "setuptools" - ], - "pyramid-redis": [ - "setuptools" - ], - "pyramid-retry": [ - "setuptools" - ], - "pyramid-splinter": [ - "setuptools" - ], - "pyramid-tm": [ - "setuptools" - ], - "pyreadability": [ - "setuptools" - ], - "pyreadstat": [ - "cython" - ], - "pyrect": [ - "setuptools" - ], - "pyregion": [ - "cython", - "setuptools" - ], - "pyrepl": [ - "setuptools" - ], - "pyrevolve": [ - "cython", - "setuptools" - ], - "pyrfc3339": [ - "setuptools" - ], - "pyrfxtrx": [ - "setuptools" - ], - "pyric": [ - "setuptools" - ], - "pyrisco": [ - "setuptools" - ], - "pyrituals": [ - "setuptools" - ], - "pyrmvtransport": [ - "flit", - "setuptools" - ], - "pyro-api": [ - "setuptools" - ], - "pyro-ppl": [ - "setuptools" - ], - "pyro4": [ - "setuptools" - ], - "pyro5": [ - "setuptools" - ], - "pyrogram": [ - "setuptools" - ], - "pyroma": [ - "setuptools" - ], - "pyroute2": [ - "setuptools" - ], - "pyrr": [ - "setuptools" - ], - "pyrsistent": [ - "setuptools" - ], - "pyrss2gen": [ - "setuptools" - ], - "pyruckus": [ - "setuptools" - ], - "pysabnzbd": [ - "setuptools" - ], - "pysaj": [ - "setuptools" - ], - "pysam": [ - "cython", - "setuptools" - ], - "pysaml2": [ - "setuptools" - ], - "pysatochip": [ - "setuptools" - ], - "pysbd": [ - "setuptools" - ], - "pyscard": [ - "setuptools" - ], - "pyscf": [ - "setuptools" - ], - "pyschedule": [ - "setuptools" - ], - "pyschemes": [ - "setuptools" - ], - "pyscreenshot": [ - "setuptools" - ], - "pyscreeze": [ - "setuptools" - ], - "pyscrypt": [ - "setuptools" - ], - "pyscss": [ - "setuptools" - ], - "pysdcp": [ - "setuptools" - ], - "pysdl2": [ - "setuptools" - ], - "pysecuritas": [ - "setuptools" - ], - "pysendfile": [ - "setuptools" - ], - "pysensibo": [ - "setuptools" - ], - "pysensors": [ - "setuptools" - ], - "pyserde": [ - "poetry", - "poetry-dynamic-versioning" - ], - "pyserial": [ - "setuptools" - ], - "pyserial-asyncio": [ - "setuptools" - ], - "pysftp": [ - "setuptools" - ], - "pysha3": [ - "setuptools" - ], - "pyshark": [ - "setuptools" - ], - "pyshex": [ - "pbr" - ], - "pyshexc": [ - "pbr" - ], - "pyshp": [ - "setuptools" - ], - "pysiaalarm": [ - "setuptools", - "setuptools-scm" - ], - "pyside": [ - "setuptools" - ], - "pyside2": [ - "setuptools" - ], - "pysideshiboken": [ - "setuptools" - ], - "pysidetools": [ - "setuptools" - ], - "pysigma": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-elasticsearch": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-insightidr": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-opensearch": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-qradar": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-splunk": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-crowdstrike": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-sysmon": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-windows": [ - "poetry-core", - "setuptools" - ], - "pysignalclirestapi": [ - "setuptools" - ], - "pysigset": [ - "setuptools" - ], - "pysimplegui": [ - "setuptools" - ], - "pysingleton": [ - "setuptools" - ], - "pyskyqhub": [ - "setuptools" - ], - "pyskyqremote": [ - "setuptools" - ], - "pyslurm": [ - "cython", - "setuptools" - ], - "pysma": [ - "setuptools" - ], - "pysmappee": [ - "setuptools" - ], - "pysmart": [ - "setuptools" - ], - "pysmart-smartx": [ - "setuptools" - ], - "pysmartapp": [ - "setuptools" - ], - "pysmartdl": [ - "setuptools" - ], - "pysmartthings": [ - "setuptools" - ], - "pysmb": [ - "setuptools" - ], - "pysmbc": [ - "setuptools" - ], - "pysmf": [ - "cython", - "setuptools" - ], - "pysmi": [ - "setuptools" - ], - "pysml": [ - "poetry-core", - "setuptools" - ], - "pysmt": [ - "setuptools" - ], - "pysnmp": [ - "setuptools" - ], - "pysnmp-pyasn1": [ - "poetry-core", - "setuptools" - ], - "pysnmp-pysmi": [ - "poetry-core", - "setuptools" - ], - "pysnmplib": [ - "poetry-core", - "setuptools" - ], - "pysnooper": [ - "setuptools" - ], - "pysnooz": [ - "poetry-core" - ], - "pysnow": [ - "poetry-core", - "setuptools" - ], - "pysocks": [ - "setuptools" - ], - "pysolcast": [ - "setuptools", - "setuptools-scm" - ], - "pysolr": [ - "setuptools", - "setuptools-scm" - ], - "pysoma": [ - "setuptools" - ], - "pysonos": [ - "setuptools" - ], - "pysoundfile": [ - "setuptools" - ], - "pyspark": [ - "setuptools" - ], - "pyspcwebgw": [ - "setuptools" - ], - "pyspf": [ - "setuptools" - ], - "pyspice": [ - "setuptools" - ], - "pyspiflash": [ - "setuptools" - ], - "pyspinel": [ - "setuptools" - ], - "pyspnego": [ - "setuptools" - ], - "pysptk": [ - "cython", - "setuptools" - ], - "pysqlite": [ - "setuptools" - ], - "pysqlitecipher": [ - "setuptools" - ], - "pysqueezebox": [ - "setuptools" - ], - "pysrim": [ - "setuptools" - ], - "pysrt": [ - "setuptools" - ], - "pyssim": [ - "setuptools" - ], - "pystac": [ - "setuptools" - ], - "pystache": [ - "setuptools" - ], - "pystemd": [ - "setuptools" - ], - "pystemmer": [ - "cython", - "setuptools" - ], - "pystray": [ - "setuptools" - ], - "pysvg-py3": [ - "setuptools" - ], - "pysvn": [ - "setuptools" - ], - "pyswitchbee": [ - "setuptools" - ], - "pyswitchbot": [ - "setuptools" - ], - "pysychonaut": [ - "setuptools" - ], - "pysyncobj": [ - "setuptools" - ], - "pysyncthru": [ - "setuptools" - ], - "pytabix": [ - "setuptools" - ], - "pytado": [ - "setuptools" - ], - "pytaglib": [ - "cython", - "setuptools" - ], - "pytankerkoenig": [ - "setuptools" - ], - "pytap2": [ - "setuptools" - ], - "pytautulli": [ - "setuptools" - ], - "pyte": [ - "setuptools" - ], - "pytelegrambotapi": [ - "setuptools" - ], - "pytenable": [ - "setuptools" - ], - "pytesseract": [ - "setuptools" - ], - "pytest": [ - "setuptools", - "setuptools-scm" - ], - "pytest-6": [ - "setuptools", - "setuptools-scm" - ], - "pytest-aio": [ - "setuptools" - ], - "pytest-aiohttp": [ - "setuptools", - "setuptools-scm" - ], - "pytest-annotate": [ - "setuptools" - ], - "pytest-arraydiff": [ - "setuptools", - "setuptools-scm" - ], - "pytest-astropy": [ - "setuptools", - "setuptools-scm" - ], - "pytest-astropy-header": [ - "setuptools", - "setuptools-scm" - ], - "pytest-asyncio": [ - "setuptools", - "setuptools-scm" - ], - "pytest-bdd": [ - "setuptools", - "poetry-core" - ], - "pytest-benchmark": [ - "setuptools" - ], - "pytest-black": [ - "setuptools", - "setuptools-scm" - ], - "pytest-cache": [ - "setuptools" - ], - "pytest-cases": [ - "setuptools", - "setuptools-scm" - ], - "pytest-catchlog": [ - "setuptools" - ], - "pytest-celery": [ - "flit-core", - "setuptools" - ], - "pytest-check": [ - "flit-core", - "setuptools" - ], - "pytest-cid": [ - "flit-core", - "setuptools" - ], - "pytest-clarity": [ - "setuptools" - ], - "pytest-click": [ - "setuptools" - ], - "pytest-console-scripts": [ - "setuptools", - "setuptools-scm" - ], - "pytest-cov": [ - "setuptools" - ], - "pytest-cram": [ - "setuptools" - ], - "pytest-datadir": [ - "setuptools", - "setuptools-scm" - ], - "pytest-datafiles": [ - "setuptools" - ], - "pytest-dependency": [ - "setuptools" - ], - "pytest-describe": [ - "setuptools" - ], - "pytest-django": [ - "setuptools", - "setuptools-scm" - ], - "pytest-docker": [ - "setuptools" - ], - "pytest-doctestplus": [ - "setuptools", - "setuptools-scm" - ], - "pytest-dotenv": [ - "setuptools" - ], - "pytest-env": [ - "setuptools" - ], - "pytest-error-for-skips": [ - "setuptools" - ], - "pytest-expect": [ - "setuptools" - ], - "pytest-factoryboy": [ - "setuptools" - ], - "pytest-filter-subpackage": [ - "setuptools", - "setuptools-scm" - ], - "pytest-fixture-config": [ - "setuptools" - ], - "pytest-flake8": [ - "setuptools" - ], - "pytest-flakes": [ - "setuptools" - ], - "pytest-flask": [ - "setuptools", - "setuptools-scm" - ], - "pytest-forked": [ - "setuptools", - "setuptools-scm" - ], - "pytest-freezegun": [ - "setuptools" - ], - "pytest-golden": [ - "poetry-core" - ], - "pytest-helpers-namespace": [ - "setuptools", - "setuptools-scm" - ], - "pytest-html": [ - "setuptools", - "setuptools-scm" - ], - "pytest-httpbin": [ - "setuptools" - ], - "pytest-httpserver": [ - "poetry-core", - "setuptools" - ], - "pytest-httpx": [ - "setuptools" - ], - "pytest-instafail": [ - "setuptools" - ], - "pytest-isort": [ - "poetry-core", - "setuptools" - ], - "pytest-json-report": [ - "setuptools" - ], - "pytest-lazy-fixture": [ - "setuptools" - ], - "pytest-localserver": [ - "setuptools" - ], - "pytest-logdog": [ - "setuptools", - "setuptools-scm" - ], - "pytest-metadata": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mock": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mockservers": [ - "poetry-core", - "setuptools" - ], - "pytest-mpl": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mypy": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mypy-plugins": [ - "setuptools" - ], - "pytest-openfiles": [ - "setuptools", - "setuptools-scm" - ], - "pytest-order": [ - "setuptools" - ], - "pytest-ordering": [ - "setuptools" - ], - "pytest-param-files": [ - "flit-core", - "setuptools" - ], - "pytest-profiling": [ - "setuptools", - "setuptools-git" - ], - "pytest-pylint": [ - "setuptools" - ], - "pytest-qt": [ - "setuptools", - "setuptools-scm" - ], - "pytest-raises": [ - "setuptools" - ], - "pytest-raisesregexp": [ - "setuptools" - ], - "pytest-raisin": [ - "flit-core", - "setuptools" - ], - "pytest-random-order": [ - "setuptools" - ], - "pytest-randomly": [ - "setuptools" - ], - "pytest-regressions": [ - "setuptools", - "setuptools-scm" - ], - "pytest-remotedata": [ - "setuptools", - "setuptools-scm" - ], - "pytest-repeat": [ - "setuptools", - "setuptools-scm" - ], - "pytest-rerunfailures": [ - "setuptools" - ], - "pytest-resource-path": [ - "setuptools" - ], - "pytest-runner": [ - "setuptools", - "setuptools-scm" - ], - "pytest-server-fixtures": [ - "setuptools" - ], - "pytest-services": [ - "setuptools", - "setuptools-scm" - ], - "pytest-shutil": [ - "setuptools" - ], - "pytest-skip-slow": [ - "setuptools" - ], - "pytest-snapshot": [ - "setuptools", - "setuptools-scm" - ], - "pytest-socket": [ - "poetry-core", - "setuptools" - ], - "pytest-splinter": [ - "setuptools" - ], - "pytest-splinter4": [ - "setuptools" - ], - "pytest-subprocess": [ - "setuptools" - ], - "pytest-subtesthack": [ - "setuptools" - ], - "pytest-subtests": [ - "setuptools", - "setuptools-scm" - ], - "pytest-sugar": [ - "setuptools" - ], - "pytest-test-utils": [ - "setuptools" - ], - "pytest-testmon": [ - "setuptools" - ], - "pytest-timeout": [ - "setuptools" - ], - "pytest-tornado": [ - "setuptools" - ], - "pytest-tornasync": [ - "setuptools" - ], - "pytest-trio": [ - "setuptools" - ], - "pytest-twisted": [ - "setuptools" - ], - "pytest-unordered": [ - "setuptools" - ], - "pytest-vcr": [ - "setuptools" - ], - "pytest-virtualenv": [ - "setuptools" - ], - "pytest-warnings": [ - "setuptools" - ], - "pytest-watch": [ - "setuptools" - ], - "pytest-xdist": [ - "setuptools", - "setuptools-scm" - ], - "pytest-xprocess": [ - "setuptools", - "setuptools-scm" - ], - "pytest-xvfb": [ - "setuptools" - ], - "pytestcache": [ - "setuptools" - ], - "pytestcov": [ - "setuptools" - ], - "pytestrunner": [ - "setuptools", - "setuptools-scm" - ], - "python-awair": [ - "poetry-core", - "setuptools" - ], - "python-axolotl": [ - "setuptools" - ], - "python-axolotl-curve25519": [ - "setuptools" - ], - "python-barcode": [ - "setuptools", - "setuptools-scm" - ], - "python-baseconv": [ - "setuptools" - ], - "python-benedict": [ - "setuptools" - ], - "python-bidi": [ - "setuptools" - ], - "python-binance": [ - "setuptools" - ], - "python-bitcoinlib": [ - "setuptools" - ], - "python-box": [ - "setuptools" - ], - "python-bsblan": [ - "poetry-core" - ], - "python-cinderclient": [ - "pbr", - "setuptools" - ], - "python-codon-tables": [ - "setuptools" - ], - "python-constraint": [ - "setuptools" - ], - "python-crfsuite": [ - "setuptools" - ], - "python-crontab": [ - "setuptools" - ], - "python-csxcad": [ - "cython", - "setuptools" - ], - "python-ctags3": [ - "setuptools" - ], - "python-daemon": [ - "setuptools" - ], - "python-datemath": [ - "setuptools" - ], - "python-dateutil": [ - "setuptools", - "setuptools-scm" - ], - "python-dbusmock": [ - "setuptools", - "setuptools-scm" - ], - "python-didl-lite": [ - "setuptools" - ], - "python-digitalocean": [ - "setuptools" - ], - "python-docx": [ - "setuptools" - ], - "python-doi": [ - "setuptools" - ], - "python-dotenv": [ - "setuptools" - ], - "python-dxf": [ - "setuptools" - ], - "python-ecobee-api": [ - "setuptools" - ], - "python-editor": [ - "setuptools" - ], - "python-engineio": [ - "setuptools" - ], - "python-etcd": [ - "setuptools" - ], - "python-ethtool": [ - "setuptools" - ], - "python-family-hub-local": [ - "setuptools" - ], - "python-fedora": [ - "setuptools" - ], - "python-flirt": [ - "setuptools" - ], - "python-fontconfig": [ - "cython", - "setuptools" - ], - "python-forecastio": [ - "setuptools" - ], - "python-frontmatter": [ - "setuptools" - ], - "python-fsutil": [ - "setuptools" - ], - "python-gammu": [ - "setuptools" - ], - "python-gitlab": [ - "setuptools" - ], - "python-glanceclient": [ - "pbr", - "setuptools" - ], - "python-gnupg": [ - "setuptools" - ], - "python-google-nest": [ - "setuptools" - ], - "python-gvm": [ - "poetry-core", - "setuptools" - ], - "python-hcl2": [ - "setuptools" - ], - "python-heatclient": [ - "pbr", - "setuptools" - ], - "python-hglib": [ - "setuptools" - ], - "python-homewizard-energy": [ - "poetry-core", - "setuptools" - ], - "python-hosts": [ - "setuptools" - ], - "python-hpilo": [ - "setuptools" - ], - "python-http-client": [ - "setuptools" - ], - "python-i18n": [ - "setuptools" - ], - "python-igraph": [ - "setuptools" - ], - "python-ipmi": [ - "setuptools" - ], - "python-ironicclient": [ - "pbr", - "setuptools" - ], - "python-izone": [ - "setuptools", - "setuptools-scm" - ], - "python-jenkins": [ - "pbr", - "setuptools" - ], - "python-jose": [ - "setuptools" - ], - "python-json-logger": [ - "setuptools" - ], - "python-jsonrpc-server": [ - "setuptools" - ], - "python-juicenet": [ - "setuptools" - ], - "python-kasa": [ - "poetry-core", - "setuptools" - ], - "python-keycloak": [ - "poetry-core", - "setuptools" - ], - "python-keyczar": [ - "setuptools" - ], - "python-keystoneclient": [ - "pbr", - "setuptools" - ], - "python-language-server": [ - "setuptools" - ], - "python-ldap": [ - "setuptools" - ], - "python-ldap-test": [ - "setuptools" - ], - "python-levenshtein": [ - "setuptools" - ], - "python-linux-procfs": [ - "setuptools" - ], - "python-logstash": [ - "setuptools" - ], - "python-louvain": [ - "setuptools" - ], - "python-lsp-black": [ - "setuptools" - ], - "python-lsp-jsonrpc": [ - "setuptools" - ], - "python-lsp-server": [ - "setuptools", - "setuptools-scm" - ], - "python-ly": [ - "setuptools" - ], - "python-lz4": [ - "setuptools", - "setuptools-scm" - ], - "python-lzf": [ - "setuptools" - ], - "python-lzo": [ - "setuptools" - ], - "python-magic": [ - "setuptools" - ], - "python-manilaclient": [ - "pbr", - "setuptools" - ], - "python-mapnik": [ - "setuptools" - ], - "python-markdown-math": [ - "setuptools" - ], - "python-memcached": [ - "setuptools" - ], - "python-miio": [ - "poetry-core", - "setuptools" - ], - "python-mimeparse": [ - "setuptools" - ], - "python-mnist": [ - "setuptools" - ], - "python-monkey-business": [ - "setuptools" - ], - "python-mpv-jsonipc": [ - "setuptools" - ], - "python-multipart": [ - "setuptools", - "hatchling" - ], - "python-mystrom": [ - "setuptools" - ], - "python-nest": [ - "setuptools" - ], - "python-nmap": [ - "setuptools" - ], - "python-nomad": [ - "setuptools" - ], - "python-novaclient": [ - "pbr", - "setuptools" - ], - "python-nvd3": [ - "setuptools" - ], - "python-oauth2": [ - "setuptools" - ], - "python-olm": [ - "setuptools" - ], - "python-opendata-transport": [ - "setuptools" - ], - "python-openems": [ - "cython", - "setuptools" - ], - "python-openstackclient": [ - "pbr", - "setuptools" - ], - "python-openzwave": [ - "cython", - "setuptools" - ], - "python-openzwave-mqtt": [ - "setuptools" - ], - "python-osc": [ - "setuptools" - ], - "python-owasp-zap-v2-4": [ - "setuptools" - ], - "python-packer": [ - "setuptools" - ], - "python-pae": [ - "poetry-core", - "setuptools" - ], - "python-pam": [ - "setuptools" - ], - "python-periphery": [ - "setuptools" - ], - "python-picnic-api": [ - "setuptools" - ], - "python-pidfile": [ - "setuptools" - ], - "python-pipedrive": [ - "setuptools" - ], - "python-pkcs11": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "python-prctl": [ - "setuptools" - ], - "python-ptrace": [ - "setuptools" - ], - "python-rabbitair": [ - "setuptools" - ], - "python-rapidjson": [ - "setuptools" - ], - "python-redis-lock": [ - "setuptools" - ], - "python-registry": [ - "setuptools" - ], - "python-rtmidi": [ - "setuptools" - ], - "python-sat": [ - "setuptools" - ], - "python-schema-registry-client": [ - "setuptools" - ], - "python-simple-hipchat": [ - "setuptools" - ], - "python-slugify": [ - "setuptools" - ], - "python-smarttub": [ - "setuptools" - ], - "python-snap7": [ - "setuptools" - ], - "python-snappy": [ - "setuptools" - ], - "python-socketio": [ - "setuptools" - ], - "python-socks": [ - "setuptools" - ], - "python-songpal": [ - "poetry-core", - "setuptools" - ], - "python-sql": [ - "setuptools" - ], - "python-status": [ - "setuptools" - ], - "python-stdnum": [ - "setuptools" - ], - "python-string-utils": [ - "setuptools" - ], - "python-subunit": [ - "setuptools" - ], - "python-swiftclient": [ - "pbr", - "setuptools" - ], - "python-tado": [ - "setuptools" - ], - "python-telegram": [ - "setuptools" - ], - "python-telegram-bot": [ - "setuptools" - ], - "python-toolbox": [ - "setuptools" - ], - "python-trovo": [ - "poetry", - "setuptools" - ], - "python-twitch-client": [ - "setuptools" - ], - "python-twitter": [ - "setuptools" - ], - "python-u2flib-host": [ - "setuptools" - ], - "python-uinput": [ - "setuptools" - ], - "python-ulid": [ - "setuptools", - "setuptools-scm" - ], - "python-unshare": [ - "setuptools" - ], - "python-utils": [ - "setuptools" - ], - "python-vagrant": [ - "setuptools" - ], - "python-velbus": [ - "setuptools" - ], - "python-vipaccess": [ - "setuptools" - ], - "python-vlc": [ - "setuptools" - ], - "python-whois": [ - "setuptools" - ], - "python-wink": [ - "setuptools" - ], - "python-xmp-toolkit": [ - "setuptools" - ], - "python-zbar": [ - "setuptools" - ], - "python3-application": [ - "setuptools" - ], - "python3-eventlib": [ - "setuptools" - ], - "python3-gnutls": [ - "setuptools" - ], - "python3-openid": [ - "setuptools" - ], - "python3-saml": [ - "setuptools" - ], - "pythoncatchconflictshook": [ - "setuptools" - ], - "pythondialog": [ - "setuptools" - ], - "pythonefl": [ - "setuptools" - ], - "pythonegardia": [ - "setuptools" - ], - "pythonfinder": [ - "setuptools" - ], - "pythonix": [ - "setuptools" - ], - "pythonnet": [ - "setuptools" - ], - "pythonping": [ - "setuptools" - ], - "pythran": [ - "setuptools" - ], - "pytibber": [ - "setuptools" - ], - "pytile": [ - "poetry-core", - "setuptools" - ], - "pytimeparse": [ - "setuptools" - ], - "pytkdocs": [ - "pdm-pep517" - ], - "pytm": [ - "setuptools" - ], - "pytmx": [ - "setuptools" - ], - "pytoml": [ - "setuptools" - ], - "pytomlpp": [ - "setuptools" - ], - "pytomorrowio": [ - "setuptools" - ], - "pytoolconfig": [ - "pdm-pep517" - ], - "pytools": [ - "setuptools" - ], - "pytorch": [ - "setuptools" - ], - "pytorch-bin": [ - "setuptools" - ], - "pytorch-lightning": [ - "setuptools" - ], - "pytorch-metric-learning": [ - "setuptools" - ], - "pytorch-pfn-extras": [ - "setuptools" - ], - "pytorchwithcuda": [ - "setuptools" - ], - "pytorchwithoutcuda": [ - "setuptools" - ], - "pytraccar": [ - "poetry-core", - "setuptools" - ], - "pytradfri": [ - "setuptools" - ], - "pytrafikverket": [ - "setuptools" - ], - "pytransportnsw": [ - "setuptools" - ], - "pytransportnswv2": [ - "setuptools" - ], - "pytrends": [ - "setuptools" - ], - "pytricia": [ - "setuptools" - ], - "pyttsx3": [ - "setuptools" - ], - "pytube": [ - "setuptools" - ], - "pytun": [ - "setuptools" - ], - "pyturbojpeg": [ - "setuptools" - ], - "pytweening": [ - "setuptools" - ], - "pytwitchapi": [ - "setuptools" - ], - "pytz": [ - "setuptools" - ], - "pytz-deprecation-shim": [ - "setuptools" - ], - "pytzdata": [ - "poetry", - "setuptools" - ], - "pyu2f": [ - "setuptools" - ], - "pyuavcan": [ - "setuptools" - ], - "pyudev": [ - "setuptools" - ], - "pyunifi": [ - "setuptools" - ], - "pyunifiprotect": [ - "setuptools" - ], - "pyupdate": [ - "setuptools" - ], - "pyupgrade": [ - "setuptools" - ], - "pyuptimerobot": [ - "setuptools" - ], - "pyusb": [ - "setuptools", - "setuptools-scm" - ], - "pyuseragents": [ - "setuptools" - ], - "pyutil": [ - "setuptools" - ], - "pyutilib": [ - "setuptools" - ], - "pyuv": [ - "setuptools" - ], - "pyvcd": [ - "setuptools", - "setuptools-scm" - ], - "pyvera": [ - "poetry-core", - "setuptools" - ], - "pyverilog": [ - "setuptools" - ], - "pyversasense": [ - "setuptools" - ], - "pyvesync": [ - "setuptools" - ], - "pyvex": [ - "setuptools" - ], - "pyvicare": [ - "setuptools" - ], - "pyvips": [ - "setuptools" - ], - "pyvis": [ - "setuptools" - ], - "pyvisa": [ - "setuptools", - "setuptools-scm" - ], - "pyvisa-py": [ - "setuptools", - "setuptools-scm" - ], - "pyviz-comms": [ - "setuptools" - ], - "pyvizio": [ - "setuptools" - ], - "pyvlx": [ - "setuptools" - ], - "pyvmomi": [ - "setuptools" - ], - "pyvo": [ - "setuptools", - "setuptools-scm" - ], - "pyvolumio": [ - "setuptools" - ], - "pyvoro": [ - "setuptools" - ], - "pywal": [ - "setuptools" - ], - "pywatchman": [ - "setuptools" - ], - "pywavelets": [ - "cython", - "setuptools" - ], - "pywayland": [ - "setuptools" - ], - "pywbem": [ - "pbr", - "setuptools" - ], - "pyweatherflowrest": [ - "setuptools" - ], - "pywebpush": [ - "setuptools" - ], - "pywebview": [ - "setuptools" - ], - "pywemo": [ - "poetry-core", - "setuptools" - ], - "pywerview": [ - "setuptools" - ], - "pywilight": [ - "setuptools" - ], - "pywinrm": [ - "setuptools" - ], - "pywizlight": [ - "setuptools" - ], - "pywlroots": [ - "setuptools" - ], - "pyworld": [ - "cython", - "setuptools" - ], - "pyws66i": [ - "setuptools" - ], - "pyx": [ - "setuptools" - ], - "pyxattr": [ - "setuptools" - ], - "pyxb": [ - "setuptools" - ], - "pyxbe": [ - "setuptools" - ], - "pyxdg": [ - "setuptools" - ], - "pyxeoma": [ - "setuptools" - ], - "pyxiaomigateway": [ - "setuptools" - ], - "pyxl3": [ - "setuptools" - ], - "pyxnat": [ - "setuptools" - ], - "pyyaml": [ - "cython", - "setuptools" - ], - "pyyaml-env-tag": [ - "flit-core", - "setuptools" - ], - "pyyaml-include": [ - "setuptools", - "setuptools-scm" - ], - "pyzbar": [ - "setuptools" - ], - "pyzerproc": [ - "setuptools" - ], - "pyzmq": [ - "packaging", - "setuptools" - ], - "pyzufall": [ - "setuptools" - ], - "qcelemental": [ - "setuptools" - ], - "qcengine": [ - "setuptools" - ], - "qcs-api-client": [ - "poetry-core", - "setuptools" - ], - "qdarkstyle": [ - "setuptools" - ], - "qdldl": [ - "setuptools" - ], - "qdx": [ - "poetry" - ], - "qiling": [ - "setuptools" - ], - "qimage2ndarray": [ - "setuptools" - ], - "qingping-ble": [ - "poetry-core", - "setuptools" - ], - "qiskit": [ - "setuptools" - ], - "qiskit-aer": [ - "cython", - "setuptools" - ], - "qiskit-finance": [ - "setuptools" - ], - "qiskit-ibmq-provider": [ - "setuptools" - ], - "qiskit-ignis": [ - "setuptools" - ], - "qiskit-machine-learning": [ - "setuptools" - ], - "qiskit-nature": [ - "setuptools" - ], - "qiskit-optimization": [ - "setuptools" - ], - "qiskit-terra": [ - "cython", - "setuptools" - ], - "qmk-dotty-dict": [ - "setuptools", - "setuptools-scm" - ], - "qnap-qsw": [ - "setuptools" - ], - "qnapstats": [ - "setuptools" - ], - "qrcode": [ - "setuptools" - ], - "qreactor": [ - "setuptools" - ], - "qscintilla": [ - "setuptools" - ], - "qscintilla-qt4": [ - "setuptools" - ], - "qscintilla-qt5": [ - "setuptools" - ], - "qstylizer": [ - "pbr", - "setuptools" - ], - "qt5reactor": [ - "setuptools" - ], - "qtawesome": [ - "setuptools" - ], - "qtconsole": [ - "setuptools" - ], - "qtpy": [ - "setuptools" - ], - "qualysclient": [ - "setuptools" - ], - "quamash": [ - "setuptools" - ], - "quandl": [ - "setuptools" - ], - "quantities": [ - "setuptools" - ], - "quantum-gateway": [ - "setuptools" - ], - "querystring-parser": [ - "setuptools" - ], - "questionary": [ - "poetry-core", - "setuptools" - ], - "queuelib": [ - "setuptools" - ], - "qutip": [ - "cython", - "setuptools" - ], - "r2pipe": [ - "setuptools" - ], - "rachiopy": [ - "setuptools" - ], - "radicale-infcloud": [ - "setuptools" - ], - "radio-beam": [ - "setuptools", - "setuptools-scm" - ], - "radios": [ - "poetry-core", - "setuptools" - ], - "radiotherm": [ - "setuptools" - ], - "radish-bdd": [ - "setuptools" - ], - "railroad-diagrams": [ - "setuptools" - ], - "rainbowstream": [ - "setuptools" - ], - "raincloudy": [ - "setuptools" - ], - "ramlfications": [ - "setuptools" - ], - "random2": [ - "setuptools" - ], - "rangehttpserver": [ - "setuptools" - ], - "rapidfuzz": [ - "packaging", - "scikit-build", - "setuptools" - ], - "rapidfuzz-capi": [ - "setuptools" - ], - "rarfile": [ - "setuptools" - ], - "rasterio": [ - "cython", - "setuptools" - ], - "ratelim": [ - "setuptools" - ], - "ratelimit": [ - "setuptools" - ], - "ratelimiter": [ - "setuptools" - ], - "raven": [ - "setuptools" - ], - "rawkit": [ - "setuptools" - ], - "ray": [ - "cython" - ], - "rbtools": [ - "setuptools" - ], - "rcssmin": [ - "setuptools" - ], - "rdbms-subsetter": [ - "setuptools" - ], - "rdflib": [ - { - "buildSystem": "setuptools", - "until": "6.3.0" - }, - { - "buildSystem": "poetry", - "from": "6.3.0" - } - ], - "rdkit": [ - "setuptools" - ], - "re-assert": [ - "setuptools" - ], - "reactivex": [ - "poetry-core" - ], - "readability-lxml": [ - "setuptools" - ], - "readchar": [ - "setuptools" - ], - "readlike": [ - "setuptools" - ], - "readme": [ - "setuptools" - ], - "readme-renderer": [ - "setuptools" - ], - "readstats": [ - "cython" - ], - "readthedocs-sphinx-ext": [ - "setuptools" - ], - "rebulk": [ - "setuptools" - ], - "recoll": [ - "setuptools" - ], - "recommonmark": [ - "setuptools" - ], - "recordlinkage": [ - "setuptools" - ], - "redbaron": [ - "setuptools" - ], - "redis": [ - "setuptools" - ], - "rednose": [ - "setuptools" - ], - "reedsolo": [ - "cython", - "setuptools" - ], - "reflink": [ - "setuptools" - ], - "regenmaschine": [ - "poetry-core", - "setuptools" - ], - "regex": [ - "setuptools" - ], - "regional": [ - "setuptools" - ], - "reikna": [ - "setuptools" - ], - "related": [ - "setuptools" - ], - "relatorio": [ - "setuptools" - ], - "releases": [ - "setuptools" - ], - "remarshal": [ - "poetry-core", - "setuptools" - ], - "remi": [ - "setuptools" - ], - "renault-api": [ - "poetry-core", - "setuptools" - ], - "rencode": [ - "cython", - "setuptools" - ], - "reolink": [ - "setuptools" - ], - "reorder-python-imports": [ - "setuptools" - ], - "reparser": [ - "setuptools" - ], - "repath": [ - "setuptools" - ], - "repeated-test": [ - "setuptools-scm" - ], - "repocheck": [ - "setuptools" - ], - "reportengine": [ - "flit", - "setuptools" - ], - "reportlab": [ - "setuptools" - ], - "repoze-lru": [ - "setuptools" - ], - "repoze-sphinx-autointerface": [ - "setuptools" - ], - "repoze-who": [ - "setuptools" - ], - "represent": [ - "setuptools" - ], - "reproject": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "reqif": [ - "poetry-core", - "setuptools" - ], - "requests": [ - "setuptools" - ], - "requests-aws4auth": [ - "setuptools" - ], - "requests-cache": [ - "poetry-core", - "setuptools" - ], - "requests-credssp": [ - "setuptools" - ], - "requests-download": [ - "setuptools" - ], - "requests-file": [ - "setuptools" - ], - "requests-futures": [ - "setuptools" - ], - "requests-hawk": [ - "setuptools" - ], - "requests-http-signature": [ - "setuptools", - "setuptools-scm" - ], - "requests-kerberos": [ - "setuptools" - ], - "requests-mock": [ - "pbr", - "setuptools" - ], - "requests-ntlm": [ - "setuptools" - ], - "requests-oauthlib": [ - "setuptools" - ], - "requests-pkcs12": [ - "setuptools" - ], - "requests-toolbelt": [ - "setuptools" - ], - "requests-unixsocket": [ - "pbr", - "setuptools" - ], - "requestsexceptions": [ - "pbr", - "setuptools" - ], - "requirements-detector": [ - "poetry-core", - "setuptools" - ], - "requirements-parser": [ - "poetry-core", - "setuptools" - ], - "resampy": [ - "cython", - "setuptools" - ], - "reserved": [ - "setuptools" - ], - "resolvelib": [ - "setuptools" - ], - "responses": [ - "setuptools" - ], - "respx": [ - "setuptools" - ], - "resteasy": [ - "setuptools" - ], - "restfly": [ - "setuptools" - ], - "restrictedpython": [ - "setuptools" - ], - "restructuredtext-lint": [ - "setuptools" - ], - "restview": [ - "setuptools" - ], - "result": [ - "setuptools" - ], - "rethinkdb": [ - "setuptools" - ], - "retry": [ - "pbr", - "setuptools" - ], - "retry-decorator": [ - "setuptools" - ], - "retrying": [ - "setuptools" - ], - "returns": [ - "poetry" - ], - "retworkx": [ - "setuptools" - ], - "rfc3339": [ - "setuptools" - ], - "rfc3339-validator": [ - "setuptools" - ], - "rfc3986": [ - "setuptools" - ], - "rfc3986-validator": [ - "pytest-runner", - "setuptools" - ], - "rfc3987": [ - "setuptools" - ], - "rfc6555": [ - "setuptools" - ], - "rfc7464": [ - "setuptools" - ], - "rfcat": [ - "setuptools" - ], - "rflink": [ - "setuptools" - ], - "rich": [ - "poetry-core", - "setuptools" - ], - "rich-argparse-plus": [ - "flit" - ], - "rich-rst": [ - "setuptools" - ], - "ring-doorbell": [ - "setuptools" - ], - "rio-tiler": [ - { - "buildSystem": "flit-core", - "until": "4.0.0" - }, - { - "buildSystem": "hatchling", - "from": "4.0.0" - } - ], - "ripe-atlas-cousteau": [ - "setuptools" - ], - "ripe-atlas-sagan": [ - "setuptools" - ], - "riprova": [ - "setuptools" - ], - "ripser": [ - "cython", - "setuptools" - ], - "rising": [ - "setuptools" - ], - "ritassist": [ - "setuptools" - ], - "rjpl": [ - "setuptools" - ], - "rjsmin": [ - "setuptools" - ], - "rki-covid-parser": [ - "setuptools" - ], - "rlax": [ - "setuptools" - ], - "rlp": [ - "setuptools" - ], - "rmcl": [ - "poetry-core", - "setuptools" - ], - "rmfuse": [ - "poetry-core" - ], - "rmrl": [ - "poetry-core", - "setuptools" - ], - "rnc2rng": [ - "setuptools" - ], - "rnginline": [ - "setuptools" - ], - "rns": [ - "setuptools" - ], - "robot-detection": [ - "setuptools" - ], - "robotframework": [ - "setuptools" - ], - "robotframework-databaselibrary": [ - "setuptools" - ], - "robotframework-requests": [ - "setuptools" - ], - "robotframework-selenium2library": [ - "setuptools" - ], - "robotframework-seleniumlibrary": [ - "setuptools" - ], - "robotframework-sshlibrary": [ - "setuptools" - ], - "robotstatuschecker": [ - "setuptools" - ], - "robotsuite": [ - "setuptools" - ], - "rocket-errbot": [ - "setuptools" - ], - "roku": [ - "setuptools" - ], - "rokuecp": [ - "poetry-core", - "setuptools" - ], - "rollbar": [ - "setuptools" - ], - "roman": [ - "setuptools" - ], - "ronin": [ - "setuptools" - ], - "roombapy": [ - "poetry-core", - "setuptools" - ], - "roonapi": [ - "poetry-core", - "setuptools" - ], - "rope": [ - "setuptools" - ], - "ropgadget": [ - "setuptools" - ], - "ropper": [ - "setuptools" - ], - "roundrobin": [ - "setuptools" - ], - "routes": [ - "setuptools" - ], - "rova": [ - "setuptools" - ], - "rpcq": [ - "setuptools" - ], - "rpdb": [ - "setuptools" - ], - "rpi-bad-power": [ - "setuptools" - ], - "rpi-gpio": [ - "setuptools" - ], - "rpi-gpio2": [ - "setuptools" - ], - "rplcd": [ - "setuptools" - ], - "rply": [ - "setuptools" - ], - "rpmfile": [ - "setuptools", - "setuptools-scm" - ], - "rpmfluff": [ - "setuptools" - ], - "rpy2": [ - "setuptools" - ], - "rpyc": [ - "hatchling", - "setuptools" - ], - "rq": [ - "setuptools" - ], - "rsa": [ - "poetry-core", - "setuptools" - ], - "rsskey": [ - "flit-core", - "setuptools" - ], - "rst2ansi": [ - "setuptools" - ], - "rst2pdf": [ - "setuptools" - ], - "rstcheck": [ - "poetry-core", - "setuptools" - ], - "rstcheck-core": [ - "poetry-core", - "setuptools" - ], - "rtmidi-python": [ - "cython", - "setuptools" - ], - "rtmixer": [ - "cython", - "setuptools" - ], - "rtoml": [ - "setuptools" - ], - "rtree": [ - "setuptools" - ], - "rtslib": [ - "setuptools" - ], - "rtsp-to-webrtc": [ - "setuptools" - ], - "ruamel-base": [ - "setuptools" - ], - "ruamel-yaml": [ - "setuptools" - ], - "ruamel-yaml-clib": [ - "setuptools" - ], - "rubymarshal": [ - "setuptools" - ], - "ruffus": [ - "setuptools" - ], - "runway-python": [ - "setuptools" - ], - "ruuvitag-ble": [ - "hatchling" - ], - "ruyaml": [ - "setuptools", - "setuptools-scm" - ], - "rx": [ - "setuptools" - ], - "rxv": [ - "setuptools", - "setuptools-scm" - ], - "rzpipe": [ - "setuptools" - ], - "s2clientprotocol": [ - "setuptools" - ], - "s3-credentials": [ - "setuptools" - ], - "s3cmd": [ - "setuptools" - ], - "s3fs": [ - "setuptools" - ], - "s3transfer": [ - "setuptools" - ], - "sabyenc": [ - "setuptools" - ], - "sabyenc3": [ - "setuptools" - ], - "sacn": [ - "setuptools" - ], - "sacred": [ - "setuptools" - ], - "sacremoses": [ - "setuptools" - ], - "safe": [ - "setuptools" - ], - "safeeyes": [ - "setuptools" - ], - "safeio": [ - "setuptools" - ], - "safety": [ - "setuptools" - ], - "sagemaker": [ - "setuptools" - ], - "salmon-mail": [ - "setuptools" - ], - "salt-pepper": [ - "setuptools", - "setuptools-scm" - ], - "sampledata": [ - "setuptools" - ], - "samplerate": [ - "setuptools" - ], - "samsungctl": [ - "setuptools" - ], - "samsungtvws": [ - "setuptools" - ], - "sane": [ - "setuptools" - ], - "sane-python": [ - "poetry-core" - ], - "saneyaml": [ - "setuptools", - "setuptools-scm" - ], - "sanic": [ - "poetry-core", - "setuptools" - ], - "sanic-auth": [ - "setuptools" - ], - "sanic-routing": [ - "setuptools" - ], - "sanic-testing": [ - "setuptools" - ], - "sansio-multipart": [ - "setuptools" - ], - "sapi-python-client": [ - "setuptools", - "setuptools-scm" - ], - "sarge": [ - "setuptools" - ], - "sarif-om": [ - "pbr", - "setuptools" - ], - "sasmodels": [ - "setuptools" - ], - "sat-search": [ - "pytest-runner", - "setuptools" - ], - "sat-stac": [ - "setuptools" - ], - "scales": [ - "setuptools" - ], - "scancode-toolkit": [ - "setuptools" - ], - "scandir": [ - "setuptools" - ], - "scapy": [ - "setuptools" - ], - "schedule": [ - "setuptools" - ], - "schema": [ - "setuptools" - ], - "schema-salad": [ - "setuptools" - ], - "schemainspect": [ - "setuptools" - ], - "schiene": [ - "setuptools" - ], - "schwifty": [ - "setuptools" - ], - "scikit-bio": [ - "cython", - "setuptools" - ], - "scikit-build": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "scikit-fmm": [ - "setuptools" - ], - "scikit-fuzzy": [ - "setuptools" - ], - "scikit-hep-testdata": [ - "setuptools", - "setuptools-scm" - ], - "scikit-image": [ - "cython", - "setuptools" - ], - "scikit-learn": [ - "cython", - "setuptools" - ], - "scikit-learn-extra": [ - "cython", - "setuptools" - ], - "scikit-misc": [ - "cython", - "setuptools" - ], - "scikit-optimize": [ - "setuptools" - ], - "scikit-spatial": [ - "poetry" - ], - "scikit-survival": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "scikit-tda": [ - "cython", - "setuptools" - ], - "scikitimage": [ - "cython", - "setuptools" - ], - "scikitlearn": [ - "cython", - "setuptools" - ], - "scikits-odes": [ - "cython", - "setuptools" - ], - "scipy": [ - "cython", - "setuptools" - ], - "scmrepo": [ - "setuptools" - ], - "scooby": [ - "setuptools" - ], - "scour": [ - "setuptools" - ], - "scp": [ - "setuptools" - ], - "scramp": [ - "setuptools" - ], - "scrap-engine": [ - "setuptools", - "setuptools-scm" - ], - "scrapy": [ - "setuptools" - ], - "scrapy-deltafetch": [ - "setuptools" - ], - "scrapy-fake-useragent": [ - "setuptools" - ], - "scrapy-splash": [ - "setuptools" - ], - "screeninfo": [ - "poetry-core", - "setuptools" - ], - "screenlogicpy": [ - "setuptools" - ], - "scripttest": [ - "setuptools" - ], - "scs": [ - "setuptools" - ], - "sdds": [ - "setuptools" - ], - "sdnotify": [ - "setuptools" - ], - "seaborn": [ - { - "buildSystem": "setuptools", - "until": "0.12.0" - }, - { - "buildSystem": "flit-core", - "from": "0.12.0" - } - ], - "seabreeze": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "seatconnect": [ - "setuptools", - "setuptools-scm" - ], - "seccomp": [ - "cython", - "setuptools" - ], - "secp256k1": [ - "setuptools" - ], - "secretstorage": [ - "setuptools" - ], - "secure": [ - "setuptools" - ], - "securetar": [ - "setuptools" - ], - "seekpath": [ - "setuptools" - ], - "segments": [ - "setuptools" - ], - "segno": [ - "setuptools" - ], - "selectors2": [ - "setuptools" - ], - "selinux": [ - "setuptools" - ], - "semantic-version": [ - "setuptools" - ], - "semver": [ - "setuptools" - ], - "send2trash": [ - "setuptools" - ], - "sendgrid": [ - "setuptools" - ], - "sense-energy": [ - "setuptools" - ], - "sensor-state-data": [ - "poetry-core", - "setuptools" - ], - "sensorpro-ble": [ - "poetry-core", - "setuptools" - ], - "sensorpush-ble": [ - "poetry-core", - "setuptools" - ], - "sentencepiece": [ - "setuptools" - ], - "sentinel": [ - "poetry-core", - "setuptools" - ], - "sentinels": [ - "setuptools" - ], - "sentry-sdk": [ - "setuptools" - ], - "sepaxml": [ - "setuptools" - ], - "seqdiag": [ - "setuptools" - ], - "seqeval": [ - "setuptools" - ], - "sequoia": [ - "setuptools" - ], - "serpent": [ - "setuptools" - ], - "serpy": [ - "setuptools" - ], - "servefile": [ - "setuptools" - ], - "serverlessrepo": [ - "setuptools" - ], - "service-identity": [ - "setuptools" - ], - "setproctitle": [ - "setuptools" - ], - "setupmeta": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-declarative-requirements": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-git": [ - "setuptools" - ], - "setuptools-lint": [ - "setuptools" - ], - "setuptools-rust": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-scm": [ - "setuptools" - ], - "setuptools-scm-git-archive": [ - "setuptools", - "setuptools-scm" - ], - "setuptoolsbuildhook": [ - "setuptools" - ], - "setuptoolscheckhook": [ - "setuptools" - ], - "setuptoolstrial": [ - "setuptools" - ], - "seventeentrack": [ - "poetry-core", - "setuptools" - ], - "sexpdata": [ - "setuptools" - ], - "sfepy": [ - "cython", - "setuptools" - ], - "sgmllib3k": [ - "setuptools" - ], - "sgp4": [ - "setuptools" - ], - "sh": [ - "setuptools" - ], - "shamir-mnemonic": [ - "setuptools" - ], - "shap": [ - "setuptools" - ], - "shapely": [ - "cython", - "setuptools" - ], - "sharedmem": [ - "setuptools" - ], - "sharkiq": [ - "setuptools" - ], - "sharkiqpy": [ - "setuptools" - ], - "shellcheck-py": [ - "setuptools" - ], - "shellescape": [ - "setuptools" - ], - "shellingham": [ - "setuptools" - ], - "shexjsg": [ - "pbr" - ], - "shiboken2": [ - "setuptools" - ], - "shippai": [ - "setuptools" - ], - "shiv": [ - "setuptools" - ], - "shodan": [ - "setuptools" - ], - "shortuuid": [ - "poetry", - "setuptools" - ], - "should-dsl": [ - "setuptools" - ], - "showit": [ - "setuptools" - ], - "shtab": [ - "setuptools", - "setuptools-scm" - ], - "shutilwhich": [ - "setuptools" - ], - "sievelib": [ - "setuptools", - "setuptools-scm" - ], - "signedjson": [ - "setuptools", - "setuptools-scm" - ], - "signify": [ - "setuptools" - ], - "sigrok": [ - "setuptools" - ], - "sigtools": [ - "setuptools", - "setuptools-scm" - ], - "simanneal": [ - "setuptools" - ], - "simber": [ - "setuptools" - ], - "simple-di": [ - "setuptools" - ], - "simple-rest-client": [ - "setuptools" - ], - "simple-rlp": [ - "setuptools" - ], - "simple-salesforce": [ - "setuptools" - ], - "simple-term-menu": [ - "setuptools" - ], - "simple-websocket-server": [ - "setuptools" - ], - "simpleaudio": [ - "setuptools" - ], - "simplebayes": [ - "setuptools" - ], - "simpleeval": [ - "setuptools" - ], - "simplefix": [ - "setuptools" - ], - "simplegeneric": [ - "setuptools" - ], - "simplehound": [ - "setuptools" - ], - "simplejson": [ - "setuptools" - ], - "simplekml": [ - "setuptools" - ], - "simplenote": [ - "setuptools" - ], - "simplisafe-python": [ - "poetry-core", - "setuptools" - ], - "simpy": [ - "setuptools", - "setuptools-scm" - ], - "single-source": [ - "poetry-core" - ], - "single-version": [ - "poetry-core", - "setuptools" - ], - "singledispatch": [ - "setuptools" - ], - "siobrultech-protocols": [ - "setuptools" - ], - "siosocks": [ - "setuptools" - ], - "sip": [ - "setuptools" - ], - "sip-4": [ - "setuptools" - ], - "six": [ - "setuptools" - ], - "sjcl": [ - "setuptools" - ], - "skein": [ - "setuptools" - ], - "skia-pathops": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "skidl": [ - "setuptools" - ], - "skodaconnect": [ - "setuptools", - "setuptools-scm" - ], - "skybellpy": [ - "setuptools" - ], - "skyfield": [ - "setuptools" - ], - "skytemple-dtef": [ - "setuptools" - ], - "skytemple-eventserver": [ - "setuptools" - ], - "skytemple-files": [ - "setuptools" - ], - "skytemple-icons": [ - "setuptools" - ], - "skytemple-rust": [ - "setuptools" - ], - "skytemple-ssb-debugger": [ - "setuptools" - ], - "slack-bolt": [ - "setuptools" - ], - "slack-sdk": [ - "setuptools" - ], - "slackclient": [ - "setuptools" - ], - "sleepyq": [ - "setuptools" - ], - "slicedimage": [ - "setuptools" - ], - "slicer": [ - "setuptools" - ], - "slicerator": [ - "setuptools" - ], - "slither-analyzer": [ - "setuptools" - ], - "slixmpp": [ - "setuptools" - ], - "slob": [ - "setuptools" - ], - "slowapi": [ - "poetry-core", - "setuptools" - ], - "slugid": [ - "setuptools" - ], - "slumber": [ - "setuptools" - ], - "sly": [ - "setuptools" - ], - "smart-meter-texas": [ - "setuptools" - ], - "smart-open": [ - "setuptools" - ], - "smarthab": [ - "setuptools" - ], - "smartypants": [ - "setuptools" - ], - "smbprotocol": [ - "setuptools" - ], - "smbus-cffi": [ - "setuptools" - ], - "smbus2": [ - "setuptools" - ], - "smdebug-rulesconfig": [ - "setuptools" - ], - "smhi-pkg": [ - "setuptools" - ], - "smmap": [ - "setuptools" - ], - "smpplib": [ - "setuptools" - ], - "snakebite": [ - "setuptools" - ], - "snakeviz": [ - "setuptools" - ], - "snapcast": [ - "setuptools" - ], - "snapshottest": [ - "setuptools" - ], - "sniffio": [ - "setuptools" - ], - "snitun": [ - "setuptools" - ], - "snowballstemmer": [ - "setuptools" - ], - "snowflake-connector-python": [ - "setuptools" - ], - "snowflake-sqlalchemy": [ - "setuptools" - ], - "snscrape": [ - "setuptools", - "setuptools-scm" - ], - "snuggs": [ - "setuptools" - ], - "social-auth-app-django": [ - "setuptools" - ], - "social-auth-core": [ - "setuptools" - ], - "socialscan": [ - "setuptools" - ], - "socid-extractor": [ - "setuptools" - ], - "socketio-client": [ - "setuptools" - ], - "sockjs": [ - "setuptools" - ], - "sockjs-tornado": [ - "setuptools" - ], - "socksio": [ - "flit-core", - "setuptools" - ], - "socksipy-branch": [ - "setuptools" - ], - "soco": [ - "setuptools" - ], - "softlayer": [ - "setuptools" - ], - "solaredge": [ - "setuptools" - ], - "solax": [ - "setuptools", - "setuptools-scm" - ], - "solc-select": [ - "setuptools" - ], - "solo-python": [ - "flit-core", - "setuptools" - ], - "somajo": [ - "setuptools" - ], - "somecomfort": [ - "setuptools" - ], - "somfy-mylink-synergy": [ - "setuptools" - ], - "sonarr": [ - "setuptools" - ], - "sonora": [ - "poetry-core" - ], - "sopel": [ - "setuptools" - ], - "sorl-thumbnail": [ - "setuptools", - "setuptools-scm" - ], - "sortedcollections": [ - "setuptools" - ], - "sortedcontainers": [ - "setuptools" - ], - "soundcloud-v2": [ - "setuptools" - ], - "sounddevice": [ - "setuptools" - ], - "soundfile": [ - "setuptools" - ], - "soupsieve": [ - "hatchling", - "setuptools" - ], - "spacy": [ - "setuptools" - ], - "spacy-alignments": [ - "setuptools" - ], - "spacy-legacy": [ - "setuptools" - ], - "spacy-loggers": [ - "setuptools" - ], - "spacy-pkuseg": [ - "cython", - "setuptools" - ], - "spacy-transformers": [ - "setuptools" - ], - "spake2": [ - "setuptools" - ], - "spark-parser": [ - "setuptools" - ], - "sparklines": [ - "setuptools" - ], - "sparqlslurper": [ - "pbr" - ], - "sparse": [ - "setuptools" - ], - "spdx-tools": [ - "setuptools" - ], - "speaklater": [ - "setuptools" - ], - "speaklater3": [ - "setuptools" - ], - "spectral-cube": [ - "setuptools", - "setuptools-scm" - ], - "speedtest-cli": [ - "setuptools" - ], - "spglib": [ - "setuptools" - ], - "sphfile": [ - "setuptools" - ], - "sphinx": [ - "cython", - "flit-core", - "setuptools" - ], - "sphinx-argparse": [ - "setuptools" - ], - "sphinx-autobuild": [ - "setuptools" - ], - "sphinx-autodoc-typehints": [ - "setuptools" - ], - "sphinx-automodapi": [ - "cython" - ], - "sphinx-basic-ng": [ - "setuptools" - ], - "sphinx-better-theme": [ - "setuptools" - ], - "sphinx-book-theme": [ - "setuptools" - ], - "sphinx-comments": [ - "setuptools" - ], - "sphinx-copybutton": [ - "setuptools" - ], - "sphinx-design": [ - "flit-core", - "setuptools" - ], - "sphinx-external-toc": [ - "flit-core", - "setuptools" - ], - "sphinx-fortran": [ - "setuptools" - ], - "sphinx-inline-tabs": [ - "flit-core", - "setuptools" - ], - "sphinx-jinja": [ - "pbr", - "setuptools" - ], - "sphinx-jupyterbook-latex": [ - "setuptools" - ], - "sphinx-markdown-parser": [ - "setuptools" - ], - "sphinx-material": [ - "setuptools" - ], - "sphinx-mdinclude": [ - "flit-core", - "setuptools" - ], - "sphinx-multitoc-numbering": [ - "setuptools" - ], - "sphinx-pypi-upload": [ - "setuptools" - ], - "sphinx-pytest": [ - "flit-core", - "setuptools" - ], - "sphinx-rtd-theme": [ - "setuptools" - ], - "sphinx-serve": [ - "setuptools" - ], - "sphinx-testing": [ - "setuptools" - ], - "sphinx-thebe": [ - "setuptools" - ], - "sphinx-togglebutton": [ - "setuptools" - ], - "sphinxcontrib-actdiag": [ - "setuptools" - ], - "sphinxcontrib-apidoc": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-applehelp": [ - "setuptools" - ], - "sphinxcontrib-autoapi": [ - "setuptools" - ], - "sphinxcontrib-bibtex": [ - "setuptools" - ], - "sphinxcontrib-blockdiag": [ - "setuptools" - ], - "sphinxcontrib-confluencebuilder": [ - "setuptools" - ], - "sphinxcontrib-devhelp": [ - "setuptools" - ], - "sphinxcontrib-excel-table": [ - "setuptools" - ], - "sphinxcontrib-fulltoc": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-htmlhelp": [ - "setuptools" - ], - "sphinxcontrib-httpdomain": [ - "setuptools" - ], - "sphinxcontrib-jsmath": [ - "setuptools" - ], - "sphinxcontrib-katex": [ - "setuptools" - ], - "sphinxcontrib-newsfeed": [ - "setuptools" - ], - "sphinxcontrib-nwdiag": [ - "setuptools" - ], - "sphinxcontrib-openapi": [ - "setuptools", - "setuptools-scm" - ], - "sphinxcontrib-plantuml": [ - "setuptools" - ], - "sphinxcontrib-programoutput": [ - "setuptools" - ], - "sphinxcontrib-qthelp": [ - "setuptools" - ], - "sphinxcontrib-seqdiag": [ - "setuptools" - ], - "sphinxcontrib-serializinghtml": [ - "setuptools" - ], - "sphinxcontrib-spelling": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-tikz": [ - "setuptools" - ], - "sphinxcontrib-websupport": [ - "setuptools" - ], - "sphinxext-opengraph": [ - "setuptools", - "setuptools-scm" - ], - "spiderpy": [ - "poetry-core", - "setuptools" - ], - "spidev": [ - "setuptools" - ], - "spinners": [ - "setuptools" - ], - "splinter": [ - "setuptools" - ], - "spotipy": [ - "setuptools" - ], - "spsdk": [ - "setuptools" - ], - "spur": [ - "setuptools" - ], - "spyder": [ - "setuptools" - ], - "spyder-kernels": [ - "setuptools" - ], - "spyse-python": [ - "setuptools" - ], - "sqlalchemy": [ - "cython", - "setuptools" - ], - "sqlalchemy-aio": [ - "setuptools" - ], - "sqlalchemy-citext": [ - "setuptools" - ], - "sqlalchemy-continuum": [ - "setuptools" - ], - "sqlalchemy-i18n": [ - "setuptools" - ], - "sqlalchemy-jsonfield": [ - "setuptools", - "setuptools-scm" - ], - "sqlalchemy-migrate": [ - "pbr", - "setuptools" - ], - "sqlalchemy-mixins": [ - "setuptools" - ], - "sqlalchemy-utils": [ - "setuptools" - ], - "sqlalchemy2-stubs": [ - "setuptools" - ], - "sqlbag": [ - "setuptools" - ], - "sqlglot": [ - "setuptools" - ], - "sqlite-fts4": [ - "setuptools" - ], - "sqlite-utils": [ - "setuptools" - ], - "sqlitedict": [ - "setuptools" - ], - "sqlmap": [ - "setuptools" - ], - "sqlmodel": [ - "poetry-core" - ], - "sqlobject": [ - "setuptools" - ], - "sqlparse": [ - { - "buildSystem": "setuptools", - "until": "0.4.4" - }, - { - "buildSystem": "flit-core", - "from": "0.4.4" - } - ], - "srp": [ - "setuptools" - ], - "srpenergy": [ - "setuptools" - ], - "srptools": [ - "setuptools" - ], - "srsly": [ - "cython", - "setuptools" - ], - "srt": [ - "setuptools" - ], - "srvlookup": [ - "setuptools" - ], - "ssdeep": [ - "setuptools" - ], - "ssdp": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "sse-starlette": [ - "setuptools" - ], - "sseclient": [ - "setuptools" - ], - "sseclient-py": [ - "setuptools" - ], - "ssh-mitm": [ - "setuptools" - ], - "sshpubkeys": [ - "setuptools" - ], - "sshtunnel": [ - "setuptools" - ], - "sslib": [ - "setuptools" - ], - "stack-data": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "stanza": [ - "setuptools" - ], - "starkbank-ecdsa": [ - "setuptools" - ], - "starlette": [ - "hatchling", - "setuptools" - ], - "starline": [ - "setuptools" - ], - "starsessions": [ - "poetry" - ], - "stashy": [ - "setuptools" - ], - "staticjinja": [ - "poetry-core", - "setuptools" - ], - "statistics": [ - "setuptools" - ], - "statmake": [ - "poetry-core", - "setuptools" - ], - "statsd": [ - "setuptools" - ], - "statsforecast": [ - "setuptools" - ], - "statsmodels": [ - "cython", - "setuptools" - ], - "statuscake": [ - "setuptools" - ], - "stdiomask": [ - "setuptools" - ], - "stdlib-list": [ - "setuptools" - ], - "steamodd": [ - "setuptools" - ], - "stem": [ - "setuptools" - ], - "stestr": [ - "pbr", - "setuptools" - ], - "stevedore": [ - "pbr", - "setuptools" - ], - "stickytape": [ - "setuptools" - ], - "stim": [ - "setuptools" - ], - "stm32loader": [ - "setuptools" - ], - "stone": [ - "setuptools" - ], - "stookalert": [ - "setuptools" - ], - "stopit": [ - "setuptools" - ], - "strategies": [ - "setuptools" - ], - "stravalib": [ - "setuptools" - ], - "strawberry-graphql": [ - "poetry", - "setuptools" - ], - "streamdeck": [ - "setuptools" - ], - "streaming-form-data": [ - "cython", - "setuptools" - ], - "streamlabswater": [ - "setuptools" - ], - "streamlink": [ - "setuptools" - ], - "streamz": [ - "setuptools" - ], - "strenum": [ - "setuptools" - ], - "strict-rfc3339": [ - "setuptools" - ], - "strictyaml": [ - "setuptools" - ], - "stringcase": [ - "setuptools" - ], - "stringly": [ - "setuptools" - ], - "stripe": [ - "setuptools" - ], - "striprtf": [ - "setuptools" - ], - "structlog": [ - "flit-core", - "hatch-fancy-pypi-readme", - "hatch-vcs", - "hatchling", - "setuptools" - ], - "structlog-sentry": [ - "poetry-core" - ], - "stumpy": [ - "setuptools" - ], - "stups-cli-support": [ - "setuptools" - ], - "stups-fullstop": [ - "setuptools" - ], - "stups-pierone": [ - "setuptools" - ], - "stups-tokens": [ - "setuptools" - ], - "stups-zign": [ - "setuptools" - ], - "stytra": [ - "setuptools" - ], - "subarulink": [ - "setuptools" - ], - "subliminal": [ - "setuptools" - ], - "subprocess-tee": [ - "setuptools", - "setuptools-scm" - ], - "subprocess32": [ - "setuptools", - "setuptools-scm" - ], - "subunit": [ - "setuptools" - ], - "subunit2sql": [ - "pbr", - "setuptools" - ], - "subzerod": [ - "setuptools" - ], - "suds-community": [ - "setuptools" - ], - "sumo": [ - "cython", - "setuptools" - ], - "sumtypes": [ - "setuptools" - ], - "sunpy": [ - "setuptools", - "setuptools-scm" - ], - "sunwatcher": [ - "setuptools" - ], - "superqt": [ - "setuptools", - "setuptools-scm" - ], - "supervise-api": [ - "setuptools" - ], - "supervisor": [ - "setuptools" - ], - "sure": [ - "setuptools" - ], - "surepy": [ - "poetry-core", - "setuptools" - ], - "surt": [ - "setuptools" - ], - "survey": [ - "setuptools" - ], - "svg-path": [ - "setuptools" - ], - "svglib": [ - "setuptools" - ], - "svgwrite": [ - "setuptools" - ], - "svix-ksuid": [ - "setuptools" - ], - "swagger-spec-validator": [ - "setuptools" - ], - "swagger-ui-bundle": [ - "setuptools" - ], - "swift": [ - "pbr", - "setuptools" - ], - "swisshydrodata": [ - "setuptools" - ], - "swspotify": [ - "poetry-core", - "setuptools" - ], - "sybil": [ - "setuptools" - ], - "symengine": [ - "cython", - "setuptools" - ], - "sympy": [ - "setuptools" - ], - "syncer": [ - "setuptools" - ], - "synergy": [ - "setuptools" - ], - "synologydsm-api": [ - "poetry-core", - "setuptools" - ], - "syslog-rfc5424-formatter": [ - "setuptools" - ], - "systembridge": [ - "setuptools" - ], - "systemd": [ - "setuptools" - ], - "sysv-ipc": [ - "setuptools" - ], - "tableaudocumentapi": [ - "setuptools" - ], - "tables": [ - "cython", - "setuptools" - ], - "tablib": [ - "setuptools", - "setuptools-scm" - ], - "tabula-py": [ - "setuptools", - "setuptools-scm" - ], - "tabulate": [ - { - "buildSystem": "setuptools-scm", - "from": "0.9.0" - }, - "setuptools" - ], - "tabview": [ - "setuptools" - ], - "tacacs-plus": [ - "setuptools", - "pytest-runner" - ], - "tadasets": [ - "setuptools" - ], - "tag-expressions": [ - "setuptools" - ], - "tago": [ - "setuptools" - ], - "tahoma-api": [ - "setuptools" - ], - "tailer": [ - "setuptools" - ], - "tailscale": [ - "poetry-core", - "setuptools" - ], - "tan": [ - { - "buildSystem": "setuptools", - "until": "22.12.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "22.12.0" - }, - { - "buildSystem": "hatchling", - "from": "22.12.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "22.12.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "22.12.0" - } - ], - "tank-utility": [ - "setuptools" - ], - "tappy": [ - "setuptools" - ], - "tarsafe": [ - "poetry" - ], - "tasklib": [ - "setuptools" - ], - "taskw": [ - "setuptools" - ], - "tatsu": [ - "setuptools" - ], - "taxi": [ - "setuptools" - ], - "tba-api-v3client": [ - "setuptools" - ], - "tbats": [ - "setuptools" - ], - "tblib": [ - "setuptools" - ], - "tbm-utils": [ - "setuptools" - ], - "tcxparser": [ - "setuptools" - ], - "tcxreader": [ - "setuptools" - ], - "teamcity-messages": [ - "setuptools" - ], - "telegram": [ - "setuptools" - ], - "telegraph": [ - "setuptools" - ], - "telepath": [ - "setuptools" - ], - "telethon": [ - "setuptools" - ], - "telethon-session-sqlalchemy": [ - "setuptools" - ], - "teletype": [ - "setuptools" - ], - "telfhash": [ - "setuptools" - ], - "tellduslive": [ - "setuptools" - ], - "temescal": [ - "setuptools" - ], - "tempest": [ - "pbr", - "setuptools" - ], - "tempita": [ - "setuptools" - ], - "tempora": [ - "setuptools", - "setuptools-scm" - ], - "tenacity": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "tensorboard": [ - "setuptools" - ], - "tensorboard-data-server": [ - "setuptools" - ], - "tensorboard-plugin-profile": [ - "setuptools" - ], - "tensorboard-plugin-wit": [ - "setuptools" - ], - "tensorboardx": [ - "setuptools" - ], - "tensorflow": [ - "setuptools" - ], - "tensorflow-bin": [ - "setuptools" - ], - "tensorflow-bin-2": [ - "setuptools" - ], - "tensorflow-build": [ - "setuptools" - ], - "tensorflow-build-2": [ - "setuptools" - ], - "tensorflow-datasets": [ - "setuptools" - ], - "tensorflow-estimator": [ - "setuptools" - ], - "tensorflow-estimator-2": [ - "setuptools" - ], - "tensorflow-metadata": [ - "setuptools" - ], - "tensorflow-probability": [ - "setuptools" - ], - "tensorflow-tensorboard": [ - "setuptools" - ], - "tensorflow-tensorboard-2": [ - "setuptools" - ], - "tensorflowwithcuda": [ - "setuptools" - ], - "tensorflowwithoutcuda": [ - "setuptools" - ], - "tensorly": [ - "setuptools" - ], - "tensorrt": [ - "setuptools" - ], - "termcolor": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "terminado": [ - "hatchling", - "setuptools" - ], - "terminaltables": [ - "poetry", - "setuptools" - ], - "termplotlib": [ - "setuptools" - ], - "termstyle": [ - "setuptools" - ], - "tern": [ - "pbr", - "setuptools" - ], - "tesla-powerwall": [ - "setuptools" - ], - "tesla-wall-connector": [ - "poetry-core", - "setuptools" - ], - "teslajsonpy": [ - "poetry-core", - "setuptools" - ], - "tess": [ - "cython", - "setuptools" - ], - "tesserocr": [ - "cython", - "setuptools" - ], - "test-tube": [ - "setuptools" - ], - "testcontainers": [ - "setuptools" - ], - "testfixtures": [ - "setuptools" - ], - "testing-common-database": [ - "setuptools" - ], - "testing-postgresql": [ - "setuptools" - ], - "testpath": [ - "flit", - "flit-core", - "setuptools" - ], - "testrepository": [ - "pbr", - "setuptools" - ], - "testresources": [ - "pbr", - "setuptools" - ], - "testscenarios": [ - "setuptools" - ], - "testtools": [ - "pbr", - "setuptools" - ], - "text-unidecode": [ - "setuptools" - ], - "textacy": [ - "setuptools" - ], - "textdistance": [ - "setuptools" - ], - "textfsm": [ - "setuptools" - ], - "textile": [ - "setuptools" - ], - "texttable": [ - "setuptools" - ], - "textual": [ - "poetry-core", - "setuptools" - ], - "textwrap3": [ - "setuptools" - ], - "textx": [ - "setuptools" - ], - "tflearn": [ - "setuptools" - ], - "tgcrypto": [ - "setuptools" - ], - "theano": [ - "setuptools" - ], - "theano-pymc": [ - "setuptools" - ], - "theanowithcuda": [ - "setuptools" - ], - "theanowithoutcuda": [ - "setuptools" - ], - "thermobeacon-ble": [ - "poetry-core", - "setuptools" - ], - "thermopro-ble": [ - "poetry-core", - "setuptools" - ], - "thespian": [ - "setuptools" - ], - "thinc": [ - "cython", - "setuptools" - ], - "threadloop": [ - "setuptools" - ], - "threadpool": [ - "setuptools" - ], - "threadpoolctl": [ - "flit-core", - "setuptools" - ], - "threat9-test-bed": [ - "setuptools", - "setuptools-scm" - ], - "three-merge": [ - "setuptools" - ], - "thrift": [ - "setuptools" - ], - "thrift-sasl": [ - "setuptools" - ], - "thriftpy2": [ - "cython", - "setuptools" - ], - "tidylib": [ - "setuptools" - ], - "tifffile": [ - "setuptools" - ], - "tika": [ - "setuptools" - ], - "tikzplotlib": [ - "flit-core", - "setuptools" - ], - "tilequant": [ - "setuptools" - ], - "tiler": [ - "setuptools" - ], - "tilt-ble": [ - "poetry-core", - "setuptools" - ], - "time-machine": [ - "setuptools" - ], - "timeago": [ - "setuptools" - ], - "timecop": [ - "setuptools" - ], - "timelib": [ - "setuptools" - ], - "timeout-decorator": [ - "setuptools" - ], - "timetagger": [ - "setuptools" - ], - "timezonefinder": [ - "poetry-core", - "setuptools" - ], - "tinycss": [ - "cython", - "setuptools" - ], - "tinycss2": [ - "flit-core", - "setuptools" - ], - "tinydb": [ - "poetry-core", - "setuptools" - ], - "tinyobjloader-py": [ - "setuptools" - ], - "tissue": [ - "setuptools" - ], - "titlecase": [ - "setuptools", - "setuptools-scm" - ], - "tkcalendar": [ - "setuptools" - ], - "tkinter": [ - "setuptools" - ], - "tld": [ - "setuptools" - ], - "tldextract": [ - "setuptools", - "setuptools-scm" - ], - "tls-parser": [ - "setuptools" - ], - "tlsh": [ - "setuptools" - ], - "tlslite-ng": [ - "setuptools" - ], - "tmb": [ - "setuptools" - ], - "todoist": [ - "setuptools" - ], - "toggl-cli": [ - "pbr", - "setuptools" - ], - "token-bucket": [ - "setuptools" - ], - "tokenize-rt": [ - "setuptools" - ], - "tokenizers": [ - "setuptools" - ], - "tokenlib": [ - "setuptools" - ], - "tololib": [ - "setuptools", - "setuptools-scm" - ], - "toml": [ - "setuptools" - ], - "toml-adapt": [ - "poetry-core", - "setuptools" - ], - "toml-cli": [ - "poetry" - ], - "toml-sort": [ - "poetry" - ], - "tomlcheck": [ - "poetry" - ], - "tomli": [ - { - "buildSystem": "poetry-core", - "until": "1.0.2" - }, - { - "buildSystem": "flit-core", - "from": "1.0.2" - } - ], - "tomli-w": [ - "flit-core", - "setuptools" - ], - "tomlkit": [ - "poetry-core", - "setuptools" - ], - "toolz": [ - "setuptools" - ], - "toonapi": [ - "setuptools" - ], - "toposort": [ - "setuptools" - ], - "torch": [ - "setuptools" - ], - "torch-bin": [ - "setuptools" - ], - "torch-tb-profiler": [ - "setuptools" - ], - "torchaudio-bin": [ - "setuptools" - ], - "torchfile": [ - "setuptools" - ], - "torchgpipe": [ - "setuptools" - ], - "torchinfo": [ - "setuptools" - ], - "torchmetrics": [ - "setuptools" - ], - "torchvision": [ - "setuptools" - ], - "torchvision-bin": [ - "setuptools" - ], - "torchwithcuda": [ - "setuptools" - ], - "torchwithoutcuda": [ - "setuptools" - ], - "tornado": [ - "setuptools" - ], - "tornado-utils": [ - "setuptools" - ], - "torpy": [ - "setuptools" - ], - "torrequest": [ - "setuptools" - ], - "tortoise-orm": [ - "poetry-core" - ], - "total-connect-client": [ - "setuptools" - ], - "towncrier": [ - "setuptools" - ], - "tox": [ - "setuptools", - "setuptools-scm" - ], - "tplink-omada-client": [ - "hatchling" - ], - "tpm2-pytss": [ - "setuptools", - "setuptools-scm" - ], - "tqdm": [ - "setuptools", - "setuptools-scm" - ], - "traceback2": [ - "pbr", - "setuptools" - ], - "tracing": [ - "setuptools" - ], - "trackpy": [ - "setuptools" - ], - "traitlets": [ - { - "buildSystem": "flit-core", - "until": "5.2.1" - }, - { - "buildSystem": "hatchling", - "from": "5.2.1" - }, - "setuptools" - ], - "traits": [ - "setuptools" - ], - "traitsui": [ - "setuptools" - ], - "traittypes": [ - "setuptools" - ], - "transaction": [ - "setuptools" - ], - "transformers": [ - "setuptools" - ], - "transforms3d": [ - "setuptools" - ], - "transitions": [ - "setuptools" - ], - "translatepy": [ - "setuptools" - ], - "translationstring": [ - "setuptools" - ], - "transliterate": [ - "setuptools" - ], - "transmission-rpc": [ - "poetry-core", - "setuptools" - ], - "transmissionrpc": [ - "setuptools" - ], - "trectools": [ - "setuptools" - ], - "treelog": [ - "setuptools" - ], - "treeo": [ - "poetry-core", - "setuptools" - ], - "treex": [ - "poetry-core", - "setuptools" - ], - "treq": [ - "setuptools" - ], - "trezor": [ - "setuptools" - ], - "trezor-agent": [ - "setuptools" - ], - "trfl": [ - "setuptools" - ], - "trimesh": [ - "setuptools" - ], - "trino": [ - "setuptools" - ], - "trio": [ - "setuptools" - ], - "trio-asyncio": [ - "setuptools" - ], - "trio-websocket": [ - "setuptools" - ], - "troposphere": [ - "setuptools" - ], - "trove-classifiers": [ - "calver", - "setuptools" - ], - "trueskill": [ - "setuptools" - ], - "trustme": [ - "setuptools" - ], - "trytond": [ - "setuptools" - ], - "ttls": [ - "poetry-core", - "setuptools" - ], - "ttp": [ - "poetry-core", - "setuptools" - ], - "ttp-templates": [ - "poetry-core", - "setuptools" - ], - "tubes": [ - "setuptools" - ], - "tubeup": [ - "setuptools" - ], - "tumpa": [ - "setuptools" - ], - "tunigo": [ - "setuptools" - ], - "turnt": [ - "flit-core", - "setuptools" - ], - "tusker": [ - "poetry" - ], - "tuya-iot-py-sdk": [ - "setuptools" - ], - "tuyaha": [ - "setuptools" - ], - "tweedledum": [ - "setuptools" - ], - "tweepy": [ - "setuptools" - ], - "twentemilieu": [ - "poetry-core", - "setuptools" - ], - "twiggy": [ - "setuptools" - ], - "twilio": [ - "setuptools" - ], - "twill": [ - "setuptools" - ], - "twine": [ - "setuptools", - "setuptools-scm" - ], - "twinkly-client": [ - "setuptools" - ], - "twisted": [ - "setuptools" - ], - "twitch-python": [ - "setuptools" - ], - "twitchapi": [ - "setuptools" - ], - "twitter": [ - "setuptools", - "setuptools-scm" - ], - "twitter-common-collections": [ - "setuptools" - ], - "twitter-common-confluence": [ - "setuptools" - ], - "twitter-common-dirutil": [ - "setuptools" - ], - "twitter-common-lang": [ - "setuptools" - ], - "twitter-common-log": [ - "setuptools" - ], - "twitter-common-options": [ - "setuptools" - ], - "twitterapi": [ - "setuptools" - ], - "twofish": [ - "setuptools" - ], - "txaio": [ - "setuptools" - ], - "txamqp": [ - "setuptools" - ], - "txdbus": [ - "setuptools" - ], - "txgithub": [ - "setuptools" - ], - "txredisapi": [ - "setuptools" - ], - "txrequests": [ - "setuptools" - ], - "txtorcon": [ - "setuptools" - ], - "txzmq": [ - "setuptools" - ], - "typeapi": [ - "poetry" - ], - "typecode": [ - "setuptools", - "setuptools-scm" - ], - "typecode-libmagic": [ - "setuptools" - ], - "typecov": [ - "setuptools" - ], - "typed-argument-parser": [ - "setuptools" - ], - "typed-ast": [ - "setuptools" - ], - "typed-settings": [ - "setuptools" - ], - "typeguard": [ - "setuptools", - "setuptools-scm" - ], - "typer": [ - "flit-core", - "setuptools" - ], - "types-aioboto3": [ - "setuptools" - ], - "types-aiobotocore": [ - "setuptools" - ], - "types-aiobotocore-cloudformation": [ - "setuptools" - ], - "types-aiobotocore-ec2": [ - "setuptools" - ], - "types-aiobotocore-elbv2": [ - "setuptools" - ], - "types-aiobotocore-lambda": [ - "setuptools" - ], - "types-aiobotocore-organizations": [ - "setuptools" - ], - "types-aiobotocore-resourcegroupstaggingapi": [ - "setuptools" - ], - "types-aiobotocore-secretsmanager": [ - "setuptools" - ], - "types-aiobotocore-ssm": [ - "setuptools" - ], - "types-aiobotocore-stepfunctions": [ - "setuptools" - ], - "types-aiobotocore-sts": [ - "setuptools" - ], - "types-awscrt": [ - "poetry-core" - ], - "types-backports": [ - "setuptools" - ], - "types-beautifulsoup4": [ - "setuptools" - ], - "types-cachetools": [ - "setuptools" - ], - "types-click": [ - "setuptools" - ], - "types-colorama": [ - "setuptools" - ], - "types-cryptography": [ - "setuptools" - ], - "types-dataclasses": [ - "setuptools" - ], - "types-dateutil": [ - "setuptools" - ], - "types-decorator": [ - "setuptools" - ], - "types-docutils": [ - "setuptools" - ], - "types-enum34": [ - "setuptools" - ], - "types-freezegun": [ - "setuptools" - ], - "types-futures": [ - "setuptools" - ], - "types-html5lib": [ - "setuptools" - ], - "types-ipaddress": [ - "setuptools" - ], - "types-jsonschema": [ - "setuptools" - ], - "types-markdown": [ - "setuptools" - ], - "types-orjson": [ - "setuptools" - ], - "types-paramiko": [ - "setuptools" - ], - "types-pillow": [ - "setuptools" - ], - "types-pkg-resources": [ - "setuptools" - ], - "types-protobuf": [ - "setuptools" - ], - "types-psutil": [ - "setuptools" - ], - "types-psycopg2": [ - "setuptools" - ], - "types-pygments": [ - "setuptools" - ], - "types-pyopenssl": [ - "setuptools" - ], - "types-python-dateutil": [ - "setuptools" - ], - "types-pytz": [ - "setuptools" - ], - "types-pyyaml": [ - "setuptools" - ], - "types-redis": [ - "setuptools" - ], - "types-requests": [ - "setuptools" - ], - "types-s3transfer": [ - "poetry-core" - ], - "types-setuptools": [ - "setuptools" - ], - "types-six": [ - "setuptools" - ], - "types-tabulate": [ - "setuptools" - ], - "types-termcolor": [ - "setuptools" - ], - "types-toml": [ - "setuptools" - ], - "types-typed-ast": [ - "setuptools" - ], - "types-urllib3": [ - "setuptools" - ], - "typesentry": [ - "setuptools" - ], - "typesystem": [ - "setuptools" - ], - "typical": [ - "poetry-core", - "setuptools" - ], - "typing": [ - "setuptools" - ], - "typing-extensions": [ - "flit-core", - "setuptools" - ], - "typing-inspect": [ - "setuptools" - ], - "typish": [ - "setuptools" - ], - "typogrify": [ - "setuptools" - ], - "tzdata": [ - "setuptools" - ], - "tzlocal": [ - "setuptools" - ], - "u-msgpack-python": [ - "setuptools" - ], - "ua-parser": [ - "setuptools" - ], - "uamqp": [ - "setuptools" - ], - "uarray": [ - "setuptools" - ], - "uasiren": [ - "setuptools", - "setuptools-scm" - ], - "ubersmith": [ - "setuptools" - ], - "uc-micro-py": [ - "setuptools" - ], - "udatetime": [ - "setuptools" - ], - "ueagle": [ - "setuptools" - ], - "ueberzug": [ - "setuptools" - ], - "ufo2ft": [ - "setuptools", - "setuptools-scm" - ], - "ufolib2": [ - "setuptools", - "setuptools-scm" - ], - "ufonormalizer": [ - "setuptools", - "setuptools-scm" - ], - "ufoprocessor": [ - "setuptools", - "setuptools-scm" - ], - "uharfbuzz": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "ujson": [ - "setuptools", - "setuptools-scm" - ], - "ukkonen": [ - "setuptools" - ], - "ukpostcodeparser": [ - "setuptools" - ], - "ukrainealarm": [ - "setuptools", - "setuptools-scm" - ], - "ultraheat-api": [ - "setuptools" - ], - "umalqurra": [ - "setuptools" - ], - "umap-learn": [ - "setuptools" - ], - "unasync": [ - "setuptools" - ], - "uncertainties": [ - "setuptools" - ], - "unicode-slugify": [ - "setuptools" - ], - "unicodecsv": [ - "setuptools" - ], - "unicodedata2": [ - "setuptools" - ], - "unicorn": [ - "setuptools" - ], - "unicrypto": [ - "setuptools" - ], - "unidecode": [ - "setuptools" - ], - "unidic-lite": [ - "setuptools" - ], - "unidiff": [ - "setuptools" - ], - "unifi": [ - "setuptools" - ], - "unifi-discovery": [ - "poetry-core", - "setuptools" - ], - "unifiled": [ - "setuptools" - ], - "unify": [ - "setuptools" - ], - "unipath": [ - "setuptools" - ], - "units": [ - "setuptools" - ], - "unittest-data-provider": [ - "setuptools" - ], - "unittest-xml-reporting": [ - "setuptools" - ], - "unittest2": [ - "setuptools" - ], - "univers": [ - "setuptools", - "setuptools-scm" - ], - "unpaddedbase64": [ - "poetry-core", - "setuptools" - ], - "unrardll": [ - "setuptools" - ], - "untangle": [ - "setuptools" - ], - "untokenize": [ - "setuptools" - ], - "uonet-request-signer-hebe": [ - "setuptools" - ], - "upass": [ - "setuptools" - ], - "upb-lib": [ - "setuptools" - ], - "upcloud-api": [ - "setuptools" - ], - "update-checker": [ - "setuptools" - ], - "update-copyright": [ - "setuptools" - ], - "update-dotdee": [ - "setuptools" - ], - "upnpy": [ - "setuptools" - ], - "uproot": [ - "setuptools" - ], - "uproot3": [ - "setuptools" - ], - "uproot3-methods": [ - "setuptools" - ], - "uptime": [ - "setuptools" - ], - "uptime-kuma-monitor": [ - "setuptools" - ], - "uranium": [ - "setuptools" - ], - "uri-template": [ - "setuptools" - ], - "uritemplate": [ - "setuptools" - ], - "uritools": [ - "setuptools" - ], - "url-normalize": [ - "poetry", - "setuptools" - ], - "urlextract": [ - "setuptools" - ], - "urlgrabber": [ - "setuptools" - ], - "urllib3": [ - { - "buildSystem": "flit-core", - "until": "2.0.2" - }, - { - "buildSystem": "hatchling", - "from": "2.0.2" - }, - "setuptools" - ], - "urlpy": [ - "setuptools" - ], - "urwid": [ - "setuptools" - ], - "urwid-readline": [ - "setuptools" - ], - "urwidtrees": [ - "setuptools" - ], - "us": [ - "setuptools" - ], - "usb-devices": [ - "poetry-core" - ], - "usbrelay-py": [ - "setuptools" - ], - "usbtmc": [ - "setuptools" - ], - "user-agents": [ - "setuptools" - ], - "userpath": [ - "setuptools" - ], - "ush": [ - "setuptools" - ], - "utils": [ - "setuptools" - ], - "uuid": [ - "setuptools" - ], - "uvcclient": [ - "setuptools" - ], - "uvicorn": [ - "hatchling", - "setuptools" - ], - "uvloop": [ - "cython", - "setuptools" - ], - "uwsgidecorators": [ - "setuptools" - ], - "vaa": [ - "flit-core", - "setuptools" - ], - "validate-email": [ - "setuptools" - ], - "validators": [ - "setuptools" - ], - "validobj": [ - "flit", - "setuptools" - ], - "validphys2": [ - "setuptools" - ], - "vallox-websocket-api": [ - "setuptools" - ], - "vapoursynth": [ - "cython", - "setuptools" - ], - "variants": [ - "setuptools", - "setuptools-scm" - ], - "varint": [ - "setuptools" - ], - "vcrpy": [ - "setuptools" - ], - "vcver": [ - "setuptools" - ], - "vcversioner": [ - "setuptools" - ], - "vdf": [ - "setuptools" - ], - "vdirsyncer": [ - "setuptools", - "setuptools-scm" - ], - "vector": [ - "hatch-vcs", - "hatchling" - ], - "vega": [ - "setuptools" - ], - "vega-datasets": [ - "setuptools" - ], - "vehicle": [ - "poetry-core", - "setuptools" - ], - "velbus-aio": [ - "setuptools" - ], - "venstarcolortouch": [ - "setuptools" - ], - "venusian": [ - "setuptools" - ], - "verboselogs": [ - "setuptools" - ], - "versioneer": [ - "setuptools" - ], - "versionfinder": [ - "setuptools" - ], - "versioningit": [ - "setuptools" - ], - "versiontag": [ - "setuptools" - ], - "versiontools": [ - "setuptools" - ], - "verspec": [ - "setuptools" - ], - "vertica-python": [ - "setuptools" - ], - "veryprettytable": [ - "setuptools" - ], - "videocr": [ - "setuptools" - ], - "vidstab": [ - "setuptools" - ], - "viewstate": [ - "setuptools" - ], - "vilfo-api-client": [ - "setuptools", - "setuptools-scm" - ], - "vincenty": [ - "setuptools" - ], - "vine": [ - "setuptools" - ], - "virtkey": [ - "setuptools" - ], - "virtual-display": [ - "setuptools" - ], - "virtualenv": [ - { - "buildSystem": "setuptools-scm", - "until": " 20.18" - }, - { - "buildSystem": "hatch-vcs", - "from": " 20.18" - }, - "cython" - ], - "virtualenv-clone": [ - "setuptools" - ], - "virtualenvwrapper": [ - "pbr", - "setuptools" - ], - "visitor": [ - "setuptools" - ], - "vispy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "viv-utils": [ - "setuptools" - ], - "vivisect": [ - "setuptools" - ], - "vmprof": [ - "setuptools" - ], - "vncdo": [ - "setuptools" - ], - "vobject": [ - "setuptools" - ], - "volkszaehler": [ - "setuptools" - ], - "voluptuous": [ - "setuptools" - ], - "voluptuous-serialize": [ - "setuptools" - ], - "volvooncall": [ - "setuptools" - ], - "vonage": [ - "setuptools" - ], - "vowpalwabbit": [ - "setuptools" - ], - "vpk": [ - "setuptools" - ], - "vqgan-jax": [ - "setuptools" - ], - "vsts": [ - "setuptools" - ], - "vsts-cd-manager": [ - "setuptools" - ], - "vsure": [ - "setuptools" - ], - "vt-py": [ - "setuptools" - ], - "vulcan-api": [ - "setuptools" - ], - "vultr": [ - "setuptools" - ], - "vulture": [ - "setuptools" - ], - "vxi11": [ - "setuptools" - ], - "vyper": [ - "setuptools", - "setuptools-scm" - ], - "w3lib": [ - "setuptools" - ], - "wadllib": [ - "setuptools" - ], - "wagtail": [ - "setuptools" - ], - "waitress": [ - "setuptools" - ], - "waitress-django": [ - "setuptools" - ], - "wakeonlan": [ - "poetry-core", - "setuptools" - ], - "wallbox": [ - "setuptools" - ], - "wand": [ - "setuptools" - ], - "wandb": [ - "setuptools" - ], - "waqiasync": [ - "setuptools" - ], - "warcio": [ - "setuptools" - ], - "warlock": [ - "poetry-core", - "setuptools" - ], - "warrant": [ - "setuptools" - ], - "warrant-lite": [ - "setuptools" - ], - "wasabi": [ - "setuptools" - ], - "wasmer": [ - "setuptools" - ], - "wasmer-compiler-cranelift": [ - "setuptools" - ], - "wasmer-compiler-llvm": [ - "setuptools" - ], - "wasmer-compiler-singlepass": [ - "setuptools" - ], - "wasmerpackages-wasmer": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-cranelift": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-llvm": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-singlepass": [ - "setuptools" - ], - "watchdog": [ - "setuptools" - ], - "watchfiles": [ - "setuptools" - ], - "watchgod": [ - "setuptools" - ], - "waterfurnace": [ - "setuptools" - ], - "watermark": [ - "setuptools" - ], - "wavedrom": [ - "setuptools", - "setuptools-scm" - ], - "wavefile": [ - "setuptools" - ], - "wavinsentio": [ - "setuptools" - ], - "wazeroutecalculator": [ - "setuptools" - ], - "wcag-contrast-ratio": [ - "setuptools" - ], - "wcmatch": [ - "hatchling", - "setuptools" - ], - "wcwidth": [ - "setuptools" - ], - "weasyprint": [ - "flit-core", - "setuptools" - ], - "web": [ - "setuptools" - ], - "web-cache": [ - "setuptools" - ], - "web3": [ - "setuptools" - ], - "webargs": [ - "setuptools" - ], - "webassets": [ - "setuptools" - ], - "webauthn": [ - "setuptools" - ], - "webcolors": [ - "setuptools" - ], - "webdav4": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "webdavclient3": [ - "setuptools" - ], - "webencodings": [ - "setuptools" - ], - "webexteamssdk": [ - "setuptools" - ], - "webhelpers": [ - "setuptools" - ], - "webob": [ - "setuptools" - ], - "weboob": [ - "setuptools" - ], - "webrtcvad": [ - "setuptools" - ], - "websocket-client": [ - "setuptools" - ], - "websockets": [ - "setuptools" - ], - "websockify": [ - "setuptools" - ], - "webssh": [ - "setuptools" - ], - "webtest": [ - "setuptools" - ], - "webtest-aiohttp": [ - "setuptools" - ], - "webthing": [ - "setuptools" - ], - "weconnect": [ - "setuptools" - ], - "weconnect-mqtt": [ - "setuptools" - ], - "werkzeug": [ - "setuptools" - ], - "west": [ - "setuptools" - ], - "wfuzz": [ - "setuptools" - ], - "wget": [ - "setuptools" - ], - "whatthepatch": [ - "setuptools" - ], - "wheel": [ - { - "buildSystem": "setuptools", - "until": "0.40.0" - }, - { - "buildSystem": "flit-core", - "from": "0.40.0" - } - ], - "wheel-filename": [ - "setuptools" - ], - "wheel-inspect": [ - "setuptools" - ], - "whichcraft": [ - "setuptools" - ], - "whirlpool-sixth-sense": [ - "setuptools" - ], - "whisper": [ - "setuptools" - ], - "whispers": [ - "setuptools" - ], - "whitenoise": [ - "setuptools" - ], - "whodap": [ - "setuptools" - ], - "whois": [ - "setuptools" - ], - "whoosh": [ - "setuptools" - ], - "widgetsnbextension": [ - "jupyter-packaging", - "setuptools" - ], - "widlparser": [ - "setuptools" - ], - "wiffi": [ - "setuptools" - ], - "wifi": [ - "setuptools" - ], - "wikitextparser": [ - "setuptools" - ], - "willow": [ - "setuptools" - ], - "winacl": [ - "setuptools" - ], - "winsspi": [ - "setuptools" - ], - "withings-api": [ - "poetry-core" - ], - "wktutils": [ - "setuptools" - ], - "wled": [ - "poetry-core", - "setuptools" - ], - "wmctrl": [ - "setuptools" - ], - "woob": [ - "setuptools" - ], - "woodblock": [ - "setuptools" - ], - "word2vec": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "wordcloud": [ - "cython", - "setuptools" - ], - "wordfreq": [ - "setuptools" - ], - "wrapio": [ - "setuptools" - ], - "wrapt": [ - "setuptools" - ], - "wrf-python": [ - "setuptools" - ], - "ws4py": [ - "setuptools" - ], - "wsdiscovery": [ - "setuptools" - ], - "wsgi-intercept": [ - "setuptools" - ], - "wsgidav": [ - "setuptools" - ], - "wsgiprox": [ - "setuptools" - ], - "wsgiproxy2": [ - "setuptools" - ], - "wsgitools": [ - "setuptools" - ], - "wslink": [ - "setuptools" - ], - "wsnsimpy": [ - "setuptools" - ], - "wsproto": [ - "setuptools" - ], - "wtf-peewee": [ - "setuptools" - ], - "wtforms": [ - "setuptools" - ], - "wurlitzer": [ - "setuptools" - ], - "www-authenticate": [ - "setuptools" - ], - "wxpython-4-0": [ - "setuptools" - ], - "wxpython-4-1": [ - "setuptools" - ], - "wxpython-4-2": [ - "setuptools" - ], - "x11-hash": [ - "setuptools" - ], - "x256": [ - "setuptools" - ], - "xapian": [ - "setuptools" - ], - "xapp": [ - "setuptools" - ], - "xarray": [ - "setuptools", - "setuptools-scm" - ], - "xarray-einstats": [ - "flit-core", - "setuptools" - ], - "xattr": [ - "setuptools" - ], - "xbox-webapi": [ - "setuptools" - ], - "xboxapi": [ - "setuptools" - ], - "xcffib": [ - "setuptools" - ], - "xdg": [ - "poetry-core", - "setuptools" - ], - "xdis": [ - "setuptools" - ], - "xdot": [ - "setuptools" - ], - "xhtml2pdf": [ - "setuptools" - ], - "xiaomi-ble": [ - "poetry-core", - "setuptools" - ], - "xkbcommon": [ - "setuptools" - ], - "xkcdpass": [ - "setuptools" - ], - "xknx": [ - "setuptools" - ], - "xlib": [ - "setuptools", - "setuptools-scm" - ], - "xlrd": [ - "setuptools" - ], - "xlsx2csv": [ - "setuptools" - ], - "xlsxwriter": [ - "setuptools" - ], - "xlwt": [ - "setuptools" - ], - "xmind": [ - "setuptools" - ], - "xml-marshaller": [ - "setuptools" - ], - "xml2rfc": [ - "setuptools" - ], - "xmldiff": [ - "setuptools" - ], - "xmljson": [ - "setuptools" - ], - "xmlschema": [ - "setuptools" - ], - "xmlsec": [ - "setuptools", - "setuptools-scm" - ], - "xmltodict": [ - "setuptools" - ], - "xmodem": [ - "setuptools" - ], - "xnd": [ - "setuptools" - ], - "xpath-expressions": [ - "poetry-core", - "setuptools" - ], - "xpybutil": [ - "setuptools" - ], - "xsdata": [ - "setuptools" - ], - "xstatic": [ - "setuptools" - ], - "xstatic-bootbox": [ - "setuptools" - ], - "xstatic-bootstrap": [ - "setuptools" - ], - "xstatic-jquery": [ - "setuptools" - ], - "xstatic-jquery-file-upload": [ - "setuptools" - ], - "xstatic-jquery-ui": [ - "setuptools" - ], - "xstatic-pygments": [ - "setuptools" - ], - "xtensor-python": [ - "setuptools" - ], - "xvfbwrapper": [ - "setuptools" - ], - "xxh": [ - "setuptools" - ], - "xxhash": [ - "setuptools", - "setuptools-scm" - ], - "yabadaba": [ - "setuptools" - ], - "yacs": [ - "setuptools" - ], - "yahooweather": [ - "setuptools" - ], - "yalesmartalarmclient": [ - "setuptools" - ], - "yalexs": [ - "setuptools" - ], - "yalexs-ble": [ - "poetry-core", - "setuptools" - ], - "yamale": [ - "setuptools" - ], - "yamlfix": [ - "setuptools" - ], - "yamllint": [ - "setuptools" - ], - "yamlloader": [ - "setuptools" - ], - "yamlordereddictloader": [ - "setuptools" - ], - "yanc": [ - "setuptools" - ], - "yangson": [ - "setuptools", - "setuptools-scm" - ], - "yapf": [ - "setuptools" - ], - "yappi": [ - "setuptools" - ], - "yapsy": [ - "setuptools" - ], - "yara-python": [ - "setuptools" - ], - "yaralyzer": [ - "poetry" - ], - "yarg": [ - "setuptools" - ], - "yarl": [ - "setuptools" - ], - "yaspin": [ - "poetry-core", - "setuptools" - ], - "yaswfp": [ - "setuptools" - ], - "yattag": [ - "setuptools" - ], - "ydiff": [ - "setuptools" - ], - "yeelight": [ - "setuptools" - ], - "yfinance": [ - "setuptools" - ], - "yoda": [ - "cython" - ], - "yolink-api": [ - "setuptools" - ], - "youless-api": [ - "setuptools" - ], - "youtube-dl": [ - "setuptools" - ], - "youtube-dl-light": [ - "setuptools" - ], - "youtube-search": [ - "setuptools" - ], - "youtube-search-python": [ - "setuptools" - ], - "youtube-transcript-api": [ - "setuptools" - ], - "yowsup": [ - "setuptools" - ], - "yoyo-migrations": [ - "setuptools" - ], - "ypy-websocket": [ - "hatchling" - ], - "yq": [ - "setuptools", - "setuptools-scm" - ], - "yt-dlp": [ - "setuptools" - ], - "yt-dlp-light": [ - "setuptools" - ], - "yte": [ - "poetry-core", - "setuptools" - ], - "ytmusicapi": [ - "setuptools", - "setuptools-scm" - ], - "yubico-client": [ - "setuptools" - ], - "yubikey-manager": [ - "poetry-core" - ], - "yutto": [ - "poetry-core", - "setuptools" - ], - "z3": [ - "setuptools" - ], - "z3c-checkversions": [ - "setuptools" - ], - "zadnegoale": [ - "setuptools" - ], - "zamg": [ - "poetry-core" - ], - "zarr": [ - "setuptools", - "setuptools-scm" - ], - "zc-buildout": [ - "setuptools" - ], - "zc-buildout221": [ - "setuptools" - ], - "zc-lockfile": [ - "setuptools" - ], - "zconfig": [ - "setuptools" - ], - "zcs": [ - "setuptools" - ], - "zdaemon": [ - "setuptools" - ], - "zeep": [ - "setuptools" - ], - "zeroc-ice": [ - "setuptools" - ], - "zeroconf": [ - "setuptools" - ], - "zerorpc": [ - "setuptools" - ], - "zeversolarlocal": [ - "flit-core", - "setuptools" - ], - "zfec": [ - "setuptools" - ], - "zha-quirks": [ - "setuptools" - ], - "zict": [ - "setuptools" - ], - "zigpy": [ - "setuptools" - ], - "zigpy-cc": [ - "setuptools" - ], - "zigpy-deconz": [ - "setuptools" - ], - "zigpy-xbee": [ - "setuptools" - ], - "zigpy-zigate": [ - "setuptools" - ], - "zigpy-znp": [ - "setuptools" - ], - "zimports": [ - "setuptools" - ], - "zipp": [ - "setuptools", - "setuptools-scm" - ], - "zipseeker": [ - "setuptools" - ], - "zipstream": [ - "setuptools" - ], - "zipstream-new": [ - "setuptools" - ], - "zipstream-ng": [ - "setuptools" - ], - "zk": [ - "setuptools" - ], - "zm-py": [ - "setuptools" - ], - "zodb": [ - "setuptools" - ], - "zodbpickle": [ - "setuptools" - ], - "zope-broken": [ - "setuptools" - ], - "zope-cachedescriptors": [ - "setuptools" - ], - "zope-component": [ - "setuptools" - ], - "zope-configuration": [ - "setuptools" - ], - "zope-contenttype": [ - "setuptools" - ], - "zope-copy": [ - "setuptools" - ], - "zope-deferredimport": [ - "setuptools" - ], - "zope-deprecation": [ - "setuptools" - ], - "zope-dottedname": [ - "setuptools" - ], - "zope-event": [ - "setuptools" - ], - "zope-exceptions": [ - "setuptools" - ], - "zope-filerepresentation": [ - "setuptools" - ], - "zope-hookable": [ - "setuptools" - ], - "zope-i18nmessageid": [ - "setuptools" - ], - "zope-interface": [ - "setuptools" - ], - "zope-lifecycleevent": [ - "setuptools" - ], - "zope-location": [ - "setuptools" - ], - "zope-proxy": [ - "setuptools" - ], - "zope-schema": [ - "setuptools" - ], - "zope-size": [ - "setuptools" - ], - "zope-sqlalchemy": [ - "setuptools" - ], - "zope-testbrowser": [ - "setuptools" - ], - "zope-testing": [ - "setuptools" - ], - "zope-testrunner": [ - "setuptools" - ], - "zopfli": [ - "setuptools", - "setuptools-scm" - ], - "zstandard": [ - "setuptools" - ], - "zstd": [ - "setuptools" - ], - "zulip": [ - "setuptools" - ], - "zwave-js-server-python": [ - "setuptools" - ], - "zwave-me-ws": [ - "poetry-core", - "setuptools" - ], - "zxcvbn": [ - "setuptools" - ] -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix deleted file mode 100644 index 2a2a5e9a0b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ /dev/null @@ -1,3030 +0,0 @@ -{ pkgs ? import { } -, lib ? pkgs.lib -}: - -let - addBuildSystem = - { self - , drv - , attr - , extraAttrs ? [ ] - }: - let - buildSystem = - if builtins.isAttrs attr then - let - fromIsValid = - if builtins.hasAttr "from" attr then - lib.versionAtLeast drv.version attr.from - else - true; - untilIsValid = - if builtins.hasAttr "until" attr then - lib.versionOlder drv.version attr.until - else - true; - intendedBuildSystem = - if attr.buildSystem == "cython" then - self.python.pythonForBuild.pkgs.cython - else - self.${attr.buildSystem}; - in - if fromIsValid && untilIsValid then intendedBuildSystem else null - else - if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr}; - in - ( - # Flit only works on Python3 - if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv - else if drv == null then null - else if drv ? overridePythonAttrs == false then drv - else - drv.overridePythonAttrs ( - old: - # We do not need the build system for wheels. - if old ? format && old.format == "wheel" then - { } - else - { - nativeBuildInputs = - (old.nativeBuildInputs or [ ]) - ++ lib.optionals (!(builtins.isNull buildSystem)) [ buildSystem ] - ++ map (a: self.${a}) extraAttrs; - } - ) - ); - - -in -lib.composeManyExtensions [ - # NixOps - (self: super: - lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super) - // { - # NixOps >=2 dependency - nixos-modules-contrib = addBuildSystem { inherit self; drv = super.nixos-modules-contrib; attr = "poetry"; }; - } - ) - - # Add build systems - (self: super: - let - buildSystems = lib.importJSON ./build-systems.json; - in - lib.mapAttrs - (attr: systems: builtins.foldl' - (drv: attr: addBuildSystem { - inherit drv self attr; - }) - (super.${attr} or null) - systems) - buildSystems) - - # Build fixes - (self: super: - let - inherit (self.python) stdenv; - inherit (pkgs.buildPackages) pkg-config; - pyBuildPackages = self.python.pythonForBuild.pkgs; - - selectQt5 = version: - let - selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version)); - in - pkgs."qt${selector}" or pkgs.qt5; - - in - - { - automat = super.automat.overridePythonAttrs ( - old: lib.optionalAttrs (lib.versionOlder old.version "22.10.0") { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.m2r ]; - } - ); - - aiohttp-swagger3 = super.aiohttp-swagger3.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - ansible = super.ansible.overridePythonAttrs ( - old: { - # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies - # in a correct manner. - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.pycrypto - self.paramiko - self.jinja2 - self.pyyaml - self.httplib2 - self.six - self.netaddr - self.dnspython - self.jmespath - self.dopy - self.ncclient - ]; - } - ); - - ansible-base = super.ansible-base.overridePythonAttrs ( - old: - { - prePatch = ''sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py''; - postInstall = '' - for m in docs/man/man1/*; do - install -vD $m -t $out/share/man/man1 - done - ''; - } - // lib.optionalAttrs (lib.versionOlder old.version "2.4") { - prePatch = ''sed -i "s,/usr/,$out," lib/ansible/constants.py''; - } - ); - - ansible-lint = super.ansible-lint.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; - } - ); - - argcomplete = super.argcomplete.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.importlib-metadata ]; - } - ); - - arpeggio = super.arpeggio.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - astroid = super.astroid.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - av = super.av.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ]; - } - ); - - argon2-cffi = - if (lib.versionAtLeast super.argon2-cffi.version "21.2.0") then - addBuildSystem - { - inherit self; - drv = super.argon2-cffi; - attr = "flit-core"; - } else super.argon2-cffi; - - awscrt = super.awscrt.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - } - ); - bcrypt = - let - getCargoHash = version: { - "4.0.0" = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0="; - "4.0.1" = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; - }.${version} or ( - lib.warn "Unknown bcrypt version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - in - super.bcrypt.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.libffi ] - ++ lib.optionals (lib.versionAtLeast old.version "4" && stdenv.isDarwin) - [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ]; - nativeBuildInputs = with pkgs; - (old.nativeBuildInputs or [ ]) - ++ lib.optionals (lib.versionAtLeast old.version "4") [ rustc cargo pkgs.rustPlatform.cargoSetupHook self.setuptools-rust ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "4") { - cargoDeps = - pkgs.rustPlatform.fetchCargoTarball - { - src = old.src; - sourceRoot = "${old.pname}-${old.version}/src/_bcrypt"; - name = "${old.pname}-${old.version}"; - sha256 = getCargoHash old.version; - }; - cargoRoot = "src/_bcrypt"; - } - ); - bjoern = super.bjoern.overridePythonAttrs ( - old: { - buildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libev ]; - } - ); - - borgbackup = super.borgbackup.overridePythonAttrs ( - old: { - BORG_OPENSSL_PREFIX = pkgs.openssl.dev; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl pkgs.acl ]; - } - ); - - cairocffi = super.cairocffi.overridePythonAttrs ( - old: { - inherit (pkgs.python3.pkgs.cairocffi) patches; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cairosvg = super.cairosvg.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cattrs = - let - drv = super.cattrs; - in - if drv.version == "1.10.0" then - drv.overridePythonAttrs - (old: { - # 1.10.0 contains a pyproject.toml that requires a pre-release Poetry - # We can avoid using Poetry and use the generated setup.py - preConfigure = old.preConfigure or "" + '' - rm pyproject.toml - ''; - }) else drv; - - ccxt = super.ccxt.overridePythonAttrs (old: { - preBuild = '' - ln -s README.{rst,md} - ''; - }); - - celery = super.celery.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - cerberus = super.cerberus.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - cssselect2 = super.cssselect2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cffi = - # cffi is bundled with pypy - if self.python.implementation == "pypy" then null else - ( - super.cffi.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ]; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; - prePatch = (old.prePatch or "") + lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' - # Remove setup.py impurities - substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" - substituteInPlace setup.py --replace "'/usr/include/ffi'," "" - substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev pkgs.libffi}/include' - ''; - - } - ) - ); - - cmdstanpy = super.cmdstanpy.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ]; - patchPhase = '' - substituteInPlace cmdstanpy/model.py \ - --replace 'cmd = [make]' \ - 'cmd = ["${pkgs.cmdstan}/bin/stan"]' - ''; - CMDSTAN = "${pkgs.cmdstan}"; - } - ); - - contourpy = super.contourpy.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ]; - } - ); - - cloudflare = super.cloudflare.overridePythonAttrs ( - old: { - postPatch = '' - rm -rf examples/* - ''; - } - ); - - colour = super.colour.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; - } - ); - - coincurve = super.coincurve.overridePythonAttrs ( - old: { - # package setup logic - LIB_DIR = "${lib.getLib pkgs.secp256k1}/lib"; - - # for actual C toolchain build - NIX_CFLAGS_COMPILE = "-I ${lib.getDev pkgs.secp256k1}/include"; - NIX_LDFLAGS = "-L ${lib.getLib pkgs.secp256k1}/lib"; - } - ); - - configparser = super.configparser.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - confluent-kafka = super.confluent-kafka.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.rdkafka - ]; - } - ); - - copier = super.copier.overrideAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.git ]; - }); - - cryptography = - let - getCargoHash = version: { - "35.0.0" = "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="; - "36.0.0" = "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="; - "36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ="; - "36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8"; - "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8="; - "37.0.4" = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI"; - "38.0.1" = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; - "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; - "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; - "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; - "39.0.1" = "sha256-0x+KIqJznDEyIUqVuYfIESKmHBWfzirPeX2R/cWlngc="; - "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; - "40.0.0" = "sha256-/TBANavYria9YrBpMgjtFyqg5feBcloETcYJ8fdBgkI="; - "40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; - "40.0.2" = "sha256-cV4GTfbVYanElXOVmynvrru2wJuWvnT1Z1tQKXdkbg0="; - "41.0.1" = "sha256-38q81vRf8QHR8lFRM2KbH7Ng5nY7nmtWRMoPWS9VO/U="; - "41.0.2" = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; - "41.0.3" = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0="; - }.${version} or ( - lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - sha256 = getCargoHash super.cryptography.version; - isWheel = lib.hasSuffix ".whl" super.cryptography.src; - scrypto = - if isWheel then - ( - super.cryptography.overridePythonAttrs { preferWheel = true; } - ) else super.cryptography; - in - scrypto.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] - ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi - ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) [ pkgs.rustPlatform.cargoSetupHook pkgs.cargo pkgs.rustc ] - ++ [ pkg-config ] - ; - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.libxcrypt ] - ++ [ (if lib.versionAtLeast old.version "37" then pkgs.openssl_3 else pkgs.openssl_1_1) ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ]; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { - CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; - } // lib.optionalAttrs (lib.versionAtLeast old.version "3.5" && !isWheel) rec { - cargoDeps = - pkgs.rustPlatform.fetchCargoTarball { - src = old.src; - sourceRoot = "${old.pname}-${old.version}/${cargoRoot}"; - name = "${old.pname}-${old.version}"; - inherit sha256; - }; - cargoRoot = "src/rust"; - } - ); - - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - postPatch = '' - substituteInPlace setup.py --replace 'setuptools>=50.3.2,<51.0.0' 'setuptools' - ''; - }); - - cysystemd = super.cysystemd.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.systemd ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - }); - - daphne = super.daphne.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" - ''; - }); - - darts = super.darts.override { - preferWheel = true; - }; - - datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace setup.py --replace "setuptools==" "setuptools>=" - ''; - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - }); - - databricks-connect = super.databricks-connect.overridePythonAttrs (old: { - sourceRoot = "."; - }); - - dbt-extractor = super.dbt-extractor.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cargo pkgs.rustc pkgs.maturin ]; - } - ); - - dbus-python = super.dbus-python.overridePythonAttrs (old: { - outputs = [ "out" "dev" ]; - - postPatch = old.postPatch or "" + '' - substituteInPlace ./configure --replace /usr/bin/file ${pkgs.file}/bin/file - substituteInPlace ./dbus-python.pc.in --replace 'Cflags: -I''${includedir}' 'Cflags: -I''${includedir}/dbus-1.0' - ''; - - configureFlags = (old.configureFlags or [ ]) ++ [ - "PYTHON_VERSION=${lib.versions.major self.python.version}" - ]; - - preConfigure = lib.concatStringsSep "\n" [ - (old.preConfigure or "") - (if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' - MACOSX_DEPLOYMENT_TARGET=10.16 - '' else "") - ]; - - preBuild = old.preBuild or "" + '' - make distclean - ''; - - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ]; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.dbus pkgs.dbus-glib ] - # My guess why it's sometimes trying to -lncurses. - # It seems not to retain the dependency anyway. - ++ lib.optional (! self.python ? modules) pkgs.ncurses; - }); - - dcli = super.dcli.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - ddtrace = super.ddtrace.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ - (lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]); - }); - - dictdiffer = super.dictdiffer.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - django = ( - super.django.overridePythonAttrs ( - old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) - ++ [ pkgs.gettext self.pytest-runner ]; - } - ) - ); - - django-bakery = super.django-bakery.overridePythonAttrs ( - old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); - } - ); - - django-cors-headers = super.django-cors-headers.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-hijack = super.django-hijack.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-prometheus = super.django-prometheus.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-rosetta = super.django-rosetta.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-stubs-ext = super.django-stubs-ext.overridePythonAttrs ( - old: { - prePatch = (old.prePatch or "") + "touch ../LICENSE.txt"; - } - ); - - dlib = super.dlib.overridePythonAttrs ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; - - enableParallelBuilding = true; - dontUseCmakeConfigure = true; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs; - buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs; - } - ); - - # Setuptools >= 60 broke build_py_2to3 - docutils = - if lib.versionOlder super.docutils.version "0.16" && lib.versionAtLeast super.setuptools.version "60" then - ( - super.docutils.overridePythonAttrs ( - old: { - SETUPTOOLS_USE_DISTUTILS = "stdlib"; - } - ) - ) else super.docutils; - - duckdb = super.duckdb.overridePythonAttrs (old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) '' - cd tools/pythonpkg - - substituteInPlace setup.py \ - --replace 'multiprocessing.cpu_count()' "$NIX_BUILD_CORES" \ - --replace 'setuptools_scm<7.0.0' 'setuptools_scm' - ''; - }); - - # Environment markers are not always included (depending on how a dep was defined) - enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - - eth-hash = super.eth-hash.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - eth-keyfile = super.eth-keyfile.overridePythonAttrs (old: { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - eth-keys = super.eth-keys.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - # FIXME: this is a workaround for https://github.com/nix-community/poetry2nix/issues/1161 - eth-utils = super.eth-utils.override { preferWheel = true; }; - - evdev = super.evdev.overridePythonAttrs (old: { - preConfigure = '' - substituteInPlace setup.py --replace /usr/include/linux ${pkgs.linuxHeaders}/include/linux - ''; - }); - - faker = super.faker.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - fancycompleter = super.fancycompleter.overridePythonAttrs ( - old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); - - fastecdsa = super.fastecdsa.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ pkgs.gmp.dev ]; - }); - - fastparquet = super.fastparquet.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - file-magic = super.file-magic.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - } - ); - - fiona = super.fiona.overridePythonAttrs ( - old: { - format = lib.optionalString (!(old.src.isWheel or false)) "setuptools"; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.gdal ]; - nativeBuildInputs = old.nativeBuildInputs or [ ] - ++ lib.optionals ((old.src.isWheel or false) && (!pkgs.stdenv.isDarwin)) [ pkgs.autoPatchelfHook ] - # for gdal-config - ++ [ pkgs.gdal ]; - } - ); - - flatbuffers = super.flatbuffers.overrideAttrs (old: { - VERSION = old.version; - }); - - gdal = - let - # Build gdal without python bindings to prevent version mixing - # We're only interested in the native libraries, not the python ones - # as we build that separately. - gdal = pkgs.gdal.overrideAttrs (old: { - doInstallCheck = false; - doCheck = false; - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DBUILD_PYTHON_BINDINGS=OFF" - ]; - }); - in - super.gdal.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ gdal ]; - preBuild = (old.preBuild or "") + '' - substituteInPlace setup.cfg \ - --replace "../../apps/gdal-config" '${gdal}/bin/gdal-config' - ''; - } - ); - - grandalf = super.grandalf.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - granian = - let - getRepoHash = version: { - "0.2.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; - "0.2.2" = "sha256-KWwefJ3CfOUGCgAm7AhFlIxRF9qxNEo3npGOxVJ23FY="; - "0.2.3" = "sha256-2JnyO0wxkV49R/0wzDb/PnUWWHi3ckwK4nVe7dWeH1k="; - "0.2.4" = "sha256-GdQJvVPsWgC1z7La9h11x2pRAP+L998yImhTFrFT5l8="; - "0.2.5" = "sha256-vMXMxss77rmXSjoB53eE8XN2jXyIEf03WoQiDfvhDmw="; - "0.2.6" = "sha256-l9W9+KDg/43mc0toEz1n1pqw+oQdiHdAxGlS+KLIGhw="; - "0.3.0" = "sha256-icBjtW8fZjT3mLo43nKWdirMz6GZIy/RghEO95pHJEU="; - "0.3.1" = "sha256-EKK+RxkJ//fY43EjvN1Fry7mn2ZLIaNlTyKPJRxyKZs="; - }.${version}; - sha256 = getRepoHash super.granian.version; - in - super.granian.overridePythonAttrs (old: rec { - src = pkgs.fetchFromGitHub { - owner = "emmett-framework"; - repo = "granian"; - rev = "v${old.version}"; - inherit sha256; - }; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${src.out}/Cargo.lock"; - }; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - }); - - gitpython = super.gitpython.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.typing-extensions ]; - } - ); - - grpcio = super.grpcio.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ]; - - outputs = [ "out" "dev" ]; - - GRPC_BUILD_WITH_BORING_SSL_ASM = ""; - GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; - GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; - GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; - DISABLE_LIBC_COMPATIBILITY = 1; - }); - - grpcio-tools = super.grpcio-tools.overridePythonAttrs (old: { - outputs = [ "out" "dev" ]; - }); - - gunicorn = super.gunicorn.overridePythonAttrs (old: { - # actually needs setuptools as a runtime dependency - propagatedBuildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - }); - - h3 = super.h3.overridePythonAttrs ( - old: { - preBuild = (old.preBuild or "") + '' - substituteInPlace h3/h3.py \ - --replace "'{}/{}'.format(_dirname, libh3_path)" '"${pkgs.h3}/lib/libh3${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' - ''; - } - ); - - h5py = super.h5py.overridePythonAttrs ( - old: - if old.format != "wheel" then - ( - let - mpi = pkgs.hdf5.mpi; - mpiSupport = pkgs.hdf5.mpiSupport; - in - { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = - (old.buildInputs or [ ]) - ++ [ pkgs.hdf5 self.pkgconfig ] - ++ lib.optional mpiSupport mpi - ; - propagatedBuildInputs = - (old.propagatedBuildInputs or [ ]) - ++ lib.optionals mpiSupport [ self.mpi4py pkgs.openssh ] - ; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - HDF5_DIR = "${pkgs.hdf5}"; - HDF5_MPI = if mpiSupport then "ON" else "OFF"; - # avoid strict pinning of numpy - postPatch = '' - substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" - ''; - pythonImportsCheck = [ "h5py" ]; - } - ) else old - ); - - hid = super.hid.overridePythonAttrs ( - old: { - postPatch = '' - found= - for name in libhidapi-hidraw libhidapi-libusb libhidapi-iohidmanager libhidapi; do - full_path=${pkgs.hidapi.out}/lib/$name${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} - if test -f $full_path; then - found=t - sed -i -e "s|'$name\..*'|'$full_path'|" hid/__init__.py - fi - done - test -n "$found" || { echo "ERROR: No known libraries found in ${pkgs.hidapi.out}/lib, please update/fix this build expression."; exit 1; } - ''; - } - ); - - hikari = super.hikari.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - hikari-lightbulb = super.hikari-lightbulb.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - horovod = super.horovod.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; - } - ); - - httplib2 = super.httplib2.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyparsing ]; - }); - - icecream = super.icecream.overridePythonAttrs (old: { - # # ERROR: Could not find a version that satisfies the requirement executing>=0.3.1 (from icecream) (from versions: none) - postPatch = '' - substituteInPlace setup.py --replace 'executing>=0.3.1' 'executing' - ''; - }); - - igraph = super.igraph.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - } - ); - - imagecodecs = super.imagecodecs.overridePythonAttrs ( - old: { - patchPhase = '' - substituteInPlace setup.py \ - --replace "/usr/include/openjpeg-2.3" \ - "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir} - substituteInPlace setup.py \ - --replace "/usr/include/jxrlib" \ - "$out/include/libjxr" - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/zopfli.h"' \ - '' - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/zlib_container.h"' \ - '' - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/gzip_container.h"' \ - '' - ''; - - preBuild = '' - mkdir -p $out/include/libjxr - ln -s ${pkgs.jxrlib}/include/libjxr/**/* $out/include/libjxr - - ''; - - buildInputs = (old.buildInputs or [ ]) ++ [ - # Commented out packages are declared required, but not actually - # needed to build. They are not yet packaged for nixpkgs. - # bitshuffle - pkgs.brotli - # brunsli - pkgs.bzip2 - pkgs.c-blosc - # charls - pkgs.giflib - pkgs.jxrlib - pkgs.lcms - pkgs.libaec - pkgs.libaec - pkgs.libjpeg_turbo - # liblzf - # liblzma - pkgs.libpng - pkgs.libtiff - pkgs.libwebp - pkgs.lz4 - pkgs.openjpeg - pkgs.snappy - # zfp - pkgs.zopfli - pkgs.zstd - pkgs.zlib - ]; - } - ); - - # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); - - intreehooks = super.intreehooks.overridePythonAttrs ( - old: { - doCheck = false; - } - ); - - ipython = super.ipython.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - isort = super.isort.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - jaraco-functools = super.jaraco-functools.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - trio = super.trio.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.async-generator self.idna ]; - }); - - jeepney = super.jeepney.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.outcome self.trio ]; - }); - - jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs ( - old: { - preBuild = (old.preBuild or "") + '' - echo "${old.version}" > VERSION - ''; - } - ); - - jira = super.jira.overridePythonAttrs ( - old: { - inherit (pkgs.python3Packages.jira) patches; - buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner - self.cryptography - self.pyjwt - self.setuptools-scm-git-archive - ]; - } - ); - - jq = super.jq.overridePythonAttrs (attrs: { - buildInputs = [ pkgs.jq ]; - patches = [ - (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/088da8735f6620b60d724aa7db742607ea216087/pkgs/development/python-modules/jq/jq-py-setup.patch"; - sha256 = "sha256-MYvX3S1YGe0QsUtExtOtULvp++AdVrv+Fid4Jh1xewQ="; - }) - ]; - }); - - jsondiff = - if lib.versionOlder "2.0.0" - then - super.jsondiff.overridePythonAttrs - ( - old: { - preBuild = lib.optionalString (!(old.src.isWheel or false)) ( - (old.preBuild or "") + '' - substituteInPlace setup.py \ - --replace "'jsondiff=jsondiff.cli:main_deprecated'," "" - '' - ); - } - ) - else super.jsondiff; - - jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; - }); - - jsonschema = - if lib.versionAtLeast super.jsonschema.version "4.0.0" - then - super.jsonschema.overridePythonAttrs - (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.importlib-resources ]; - }) - else super.jsonschema; - - jupyter = super.jupyter.overridePythonAttrs ( - old: { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); - - jupyter-packaging = super.jupyter-packaging.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools self.wheel ]; - }); - - jupyter-server = super.jupyter-server.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ self.hatchling ]; - buildInputs = (old.buildInputs or [ ]) - ++ [ self.hatch-jupyter-builder ]; - }); - - jupyterlab-widgets = super.jupyterlab-widgets.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.jupyter-packaging ]; - } - ); - - kerberos = super.kerberos.overrideAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libkrb5 ]; - }); - - keyring = super.keyring.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - kiwisolver = super.kiwisolver.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.cppy - ]; - } - ); - - lap = super.lap.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.numpy - ]; - } - ); - - libarchive = super.libarchive.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - - postPatch = '' - substituteInPlace libarchive/library.py --replace \ - "_FILEPATH = find_and_load_library()" "_FILEPATH = '${pkgs.libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; - propagatedBuildInputs = [ pkgs.libvirt ]; - }); - - lightgbm = super.lightgbm.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - postConfigure = '' - export HOME=$(mktemp -d) - ''; - } - ); - - llama-cpp-python = super.llama-cpp-python.overridePythonAttrs ( - old: { - buildInputs = with pkgs; lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Accelerate - ]; - nativeBuildInputs = [ pkgs.cmake ] ++ (old.nativeBuildInputs or [ ]); - preBuild = '' - cd "$OLDPWD" - ''; - } - ); - - llvmlite = super.llvmlite.overridePythonAttrs ( - old: - let - # see https://github.com/numba/llvmlite#compatibility - llvm_version = toString ( - if lib.versionAtLeast old.version "0.40.0" then 14 - else if lib.versionAtLeast old.version "0.37.0" then 11 - else if lib.versionAtLeast old.version "0.34.0" && !stdenv.buildPlatform.isAarch64 then 10 - else if lib.versionAtLeast old.version "0.33.0" then 9 - else if lib.versionAtLeast old.version "0.29.0" then 8 - else if lib.versionAtLeast old.version "0.27.0" then 7 - else if lib.versionAtLeast old.version "0.23.0" then 6 - else if lib.versionAtLeast old.version "0.21.0" then 5 - else 4 - ); - llvm = pkgs."llvmPackages_${llvm_version}".llvm or (throw "LLVM${llvm_version} has been removed from nixpkgs; upgrade llvmlite or use older nixpkgs"); - in - { - inherit llvm; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.llvmlite.llvm ]; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm.dev}/bin/llvm-config - ''; - - __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - passthru = old.passthru // { llvm = llvm; }; - } - ); - - lsassy = - if super.lsassy.version == "3.1.1" then - super.lsassy.overridePythonAttrs - (old: { - # pyproject.toml contains a constraint `rich = "^10.6.0"` which is not replicated in setup.py - # hence pypi misses it and poetry pins rich to 11.0.0 - preConfigure = (old.preConfigure or "") + '' - rm pyproject.toml - ''; - }) else super.lsassy; - - lxml = super.lxml.overridePythonAttrs ( - old: { - nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; - buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; - } - ); - - markdown-it-py = super.markdown-it-py.overridePythonAttrs ( - old: { - propagatedBuildInputs = builtins.filter (i: i.pname != "mdit-py-plugins") old.propagatedBuildInputs; - preConfigure = lib.optionalString (!(old.src.isWheel or false)) ( - (old.preConfigure or "") + '' - substituteInPlace pyproject.toml --replace 'plugins = ["mdit-py-plugins"]' 'plugins = []' - '' - ); - } - ); - - markupsafe = super.markupsafe.overridePythonAttrs ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); - - matplotlib = super.matplotlib.overridePythonAttrs ( - old: - let - enableGhostscript = old.passthru.args.enableGhostscript or false; - enableGtk3 = old.passthru.args.enableGtk3 or false; - enableQt = old.passthru.args.enableQt or false; - enableTk = old.passthru.args.enableTk or false; - - interactive = enableTk || enableGtk3 || enableQt; - - passthru = { - config = { - directories = { basedirlist = "."; }; - libs = { - system_freetype = true; - system_qhull = true; - } // lib.optionalAttrs stdenv.isDarwin { - # LTO not working in darwin stdenv, see Nixpkgs #19312 - enable_lto = false; - }; - }; - }; - - inherit (pkgs) tk tcl wayland qhull; - inherit (pkgs.xorg) libX11; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - in - { - XDG_RUNTIME_DIR = "/tmp"; - - buildInputs = old.buildInputs or [ ] ++ [ - pkgs.which - ] ++ lib.optionals enableGhostscript [ - pkgs.ghostscript - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.7.0") [ - self.pybind11 - ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.certifi - pkgs.libpng - pkgs.freetype - qhull - ] - ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ lib.optionals enableQt [ self.pyqt5 ] - ; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ - self.setuptools-scm - self.setuptools-scm-git-archive - ]; - - # Clang doesn't understand -fno-strict-overflow, and matplotlib builds with -Werror - hardeningDisable = if stdenv.isDarwin then [ "strictoverflow" ] else [ ]; - - passthru = old.passthru or { } // passthru; - - MPLSETUPCFG = pkgs.writeText "mplsetup.cfg" (lib.generators.toINI { } passthru.config); - - # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the - # corresponding interpreter object for its library paths. This fails if - # `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both - # installed under the same path which is not true in Nix. - # With the following patch we just hard-code these paths into the install - # script. - postPatch = - let - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; - in - lib.optionalString enableTk '' - sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py - '' + lib.optionalString (stdenv.isLinux && interactive) '' - # fix paths to libraries in dlopen calls (headless detection) - substituteInPlace src/_c_internal_utils.c \ - --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ - --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 - '' + - # avoid matplotlib trying to download dependencies - '' - echo "[libs] - system_freetype=true - system_qhull=true" > mplsetup.cfg - ''; - - } - ); - - mccabe = super.mccabe.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - mip = super.mip.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ]; - } - ); - - mmdet = super.mmdet.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytorch ]; - } - ); - - molecule = - if lib.versionOlder super.molecule.version "3.0.0" then - (super.molecule.overridePythonAttrs ( - old: { - patches = (old.patches or [ ]) ++ [ - # Fix build with more recent setuptools versions - (pkgs.fetchpatch { - url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; - sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; - excludes = [ "pyproject.toml" ]; - }) - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.setuptools-scm self.setuptools-scm-git-archive ]; - } - )) else - super.molecule.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.setuptools-scm self.setuptools-scm-git-archive ]; - }); - - munch = super.munch.overridePythonAttrs ( - old: { - # Latest version of pypi imports pkg_resources at runtime, so setuptools is needed at runtime. :( - # They fixed this last year but never released a new version. - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - mpi4py = super.mpi4py.overridePythonAttrs ( - old: - let - cfg = pkgs.writeTextFile { - name = "mpi.cfg"; - text = ( - lib.generators.toINI - { } - { - mpi = { - mpicc = "${pkgs.mpi.outPath}/bin/mpicc"; - }; - } - ); - }; - in - { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; - enableParallelBuilding = true; - preBuild = '' - ln -sf ${cfg} mpi.cfg - ''; - } - ); - - multiaddr = super.multiaddr.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - mypy = super.mypy.overridePythonAttrs ( - old: - let - # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled - # version is also the default in the wheels on Pypi that include binaries. - # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. - MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; - - envAttrs = - if old ? env - then { env = old.env // { inherit MYPY_USE_MYPYC; }; } - else { inherit MYPY_USE_MYPYC; }; - in - { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.types-typed-ast - self.types-setuptools - ] - ++ lib.optional (lib.strings.versionAtLeast old.version "0.990") self.types-psutil - ; - - # when testing reduce optimisation level to drastically reduce build time - # (default is 3) - # MYPYC_OPT_LEVEL = 1; - } // envAttrs // lib.optionalAttrs (old.format != "wheel") { - # FIXME: Remove patch after upstream has decided the proper solution. - # https://github.com/python/mypy/pull/11143 - patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch"; - sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk="; - }) - ] ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.940") && lib.strings.versionOlder old.version "0.960") [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch"; - sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM="; - }) - ] ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.960") && (lib.strings.versionOlder old.version "0.971")) [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch"; - sha256 = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI="; - }) - ]; - } - ); - - mysqlclient = super.mysqlclient.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; - } - ); - - netcdf4 = super.netcdf4.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; - } - ); - - numpy = super.numpy.overridePythonAttrs ( - old: - let - blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; - cfg = pkgs.writeTextFile { - name = "site.cfg"; - text = ( - lib.generators.toINI - { } - { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); - }; - in - { - # fails to build with format=pyproject and setuptools >= 65 - format = if (old.format == "poetry2nix") then "setuptools" else old.format; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; - buildInputs = (old.buildInputs or [ ]) ++ [ blas ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - preConfigure = '' - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; - }; - } - ); - - # The following are dependencies of torch >= 2.0.0. - # torch doesn't officially support system CUDA, unless you build it yourself. - nvidia-cudnn-cu11 = super.nvidia-cudnn-cu11.overridePythonAttrs (attrs: { - autoPatchelfIgnoreMissingDeps = true; - # (Bytecode collision happens with nvidia-cuda-nvrtc-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - self.nvidia-cublas-cu11 - ]; - }); - - nvidia-cuda-nvrtc-cu11 = super.nvidia-cuda-nvrtc-cu11.overridePythonAttrs (_: { - # (Bytecode collision happens with nvidia-cudnn-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - }); - - nvidia-cusolver-cu11 = super.nvidia-cusolver-cu11.overridePythonAttrs (attrs: { - autoPatchelfIgnoreMissingDeps = true; - # (Bytecode collision happens with nvidia-cusolver-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - self.nvidia-cublas-cu11 - ]; - }); - - omegaconf = super.omegaconf.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.jdk ]; - } - ); - - open3d = super.open3d.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ]; - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.libusb1 - ] ++ lib.optionals stdenv.isLinux [ - pkgs.udev - ] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [ - pkgs.mesa - ( - pkgs.symlinkJoin { - name = "llvm-with-ubuntu-compatible-symlink"; - paths = [ - pkgs.llvm_10.lib - (pkgs.runCommand "llvm-ubuntu-compatible-symlink" { } - '' - mkdir -p "$out/lib/"; - ln -s "${pkgs.llvm_10.lib}/lib/libLLVM-10.so" "$out/lib/libLLVM-10.so.1" - '' - ) - ]; - }) - ]; - - # Patch the dylib in the binary distribution to point to the nix build of libomp - preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") '' - install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so - ''; - - # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support. - autoPatchelfIgnoreMissingDeps = true; - }); - - openbabel-wheel = super.openbabel-wheel.override { preferWheel = true; }; - - # Overrides for building packages based on OpenCV - # These flags are inspired by the opencv 4.x package in nixpkgs - _opencv-python-override = - old: { - # Disable OpenCL on macOS - # Can't use cmakeFlags because cmake is called by setup.py - CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF"; - - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - buildInputs = [ - self.scikit-build - ] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - Accelerate - AVFoundation - Cocoa - CoreMedia - MediaToolbox - VideoDecodeAcceleration - ]) ++ (old.buildInputs or [ ]); - dontUseCmakeConfigure = true; - }; - - opencv-python = super.opencv-python.overridePythonAttrs self._opencv-python-override; - - opencv-python-headless = super.opencv-python-headless.overridePythonAttrs self._opencv-python-override; - - opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override; - - openexr = super.openexr.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); - - openvino = super.openvino.overridePythonAttrs ( - old: { - buildInputs = [ - pkgs.ocl-icd - pkgs.hwloc - pkgs.tbb - pkgs.numactl - pkgs.libxml2 - ] ++ (old.buildInputs or [ ]); - } - ); - - orjson = - let - getCargoHash = version: { - "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4="; - "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4="; - "3.7.2" = "sha256-2U37IhftNYjH7sV7Nh51YpR/WjmPmmzX/aGuHsFgwf4="; - "3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ="; - "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; - "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; - "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; - "3.8.4" = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; - "3.8.5" = "sha256-JtUCJ3TP9EKGcddeyW1e/72k21uKneq9SnZJeLvn9Os="; - "3.8.6" = "sha256-8T//q6nQoZhh8oJWDCeQf3gYRew58dXAaxkYELY4CJM="; - "3.8.7" = "sha256-JBO8nl0sC+XIn17vI7hC8+nA1HYI9jfvZrl9nCE3k1s="; - "3.8.8" = "sha256-AK4HtqPKg2O2FeLHCbY9o+N1BV4QFMNaHVE1NaFYHa4="; - "3.8.10" = "sha256-AcrTEHv7GYtGe4fXYsM24ElrzfhnOxLYlaon1ZrlD4A="; - }.${version} or ( - lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - in - super.orjson.overridePythonAttrs (old: if old.src.isWheel or false then { } else { - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { - inherit (old) src; - name = "${old.pname}-${old.version}"; - hash = getCargoHash old.version; - }; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - buildInputs = (old.buildInputs or [ ]) ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv; - }); - - osqp = super.osqp.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; - dontUseCmakeConfigure = true; - } - ); - - - pandas = super.pandas.overridePythonAttrs (old: { - - buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx; - - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' - cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - - - enableParallelBuilding = true; - }); - - pantalaimon = super.pantalaimon.overridePythonAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ]; - postInstall = old.postInstall or "" + '' - installManPage docs/man/*.[1-9] - ''; - }); - - pao = super.pao.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.pyutilib ]; - }); - - paramiko = super.paramiko.overridePythonAttrs (old: { - doCheck = false; # requires networking - }); - - parsel = super.parsel.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - pdal = super.pdal.overridePythonAttrs ( - old: { - PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config"; - } - ); - - peewee = super.peewee.overridePythonAttrs ( - old: - let - withPostgres = old.passthru.withPostgres or false; - withMysql = old.passthru.withMysql or false; - in - { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ lib.optional withPostgres self.psycopg2 - ++ lib.optional withMysql self.mysql-connector; - } - ); - - pikepdf = super.pikepdf.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.qpdf self.pybind11 ]; - pythonImportsCheck = old.pythonImportsCheck or [ ] ++ [ "pikepdf" ]; - } - ); - - pillow = super.pillow.overridePythonAttrs ( - old: - let - preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure; - in - { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ pkg-config self.pytest-runner ]; - buildInputs = with pkgs; (old.buildInputs or [ ]) - ++ [ freetype libjpeg zlib libtiff libxcrypt libwebp tcl lcms2 ] - ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ] - ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ]; - preConfigure = lib.optional (old.format != "wheel") preConfigure; - } - ); - - pip-requirements-parser = super.pip-requirements-parser.overridePythonAttrs (old: { - dontConfigure = true; - }); - - pluralizer = super.pluralizer.overridePythonAttrs (old: { - preBuild = '' - export PYPI_VERSION="${old.version}" - ''; - }); - - poethepoet = super.poethepoet.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.poetry ]; - }); - - poetry-core = super.poetry-core.overridePythonAttrs (old: - let - initFile = - if lib.versionOlder super.poetry-core.version "1.1" - then "poetry/__init__.py" - else "./src/poetry/core/__init__.py"; - in - { - # "Vendor" dependencies (for build-system support) - postPatch = '' - echo "import sys" >> ${initFile} - for path in $propagatedBuildInputs; do - echo "sys.path.insert(0, \"$path\")" >> ${initFile} - done - ''; - - # Propagating dependencies leads to issues downstream - # We've already patched poetry to prefer "vendored" dependencies - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - }); - - # Requires poetry which isn't available during bootstrap - poetry-plugin-export = super.poetry-plugin-export.overridePythonAttrs (old: { - dontUsePythonImportsCheck = true; - pipInstallFlags = [ - "--no-deps" - ]; - }); - - portend = super.portend.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - prettytable = super.prettytable.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - prophet = super.prophet.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ]; - PROPHET_REPACKAGE_CMDSTAN = "false"; - CMDSTAN = "${pkgs.cmdstan}"; - }); - - psycopg2 = super.psycopg2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - psycopg2cffi = super.psycopg2cffi.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - py-solc-x = super.py-solc-x.overridePythonAttrs ( - old: { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.requests self.semantic-version ]; - } - ); - - pyarrow = - if (!super.pyarrow.src.isWheel or false) && lib.versionAtLeast super.pyarrow.version "0.16.0" then - super.pyarrow.overridePythonAttrs - ( - old: - let - parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); - - # Starting with nixpkgs revision f149c7030a7, pyarrow takes "python3" as an argument - # instead of "python". Below we inspect function arguments to maintain compatibilitiy. - _arrow-cpp = pkgs.arrow-cpp.override ( - builtins.intersectAttrs - (lib.functionArgs pkgs.arrow-cpp.override) - { python = self.python; python3 = self.python; } - ); - - ARROW_HOME = _arrow-cpp; - arrowCppVersion = parseMinor _arrow-cpp; - pyArrowVersion = parseMinor super.pyarrow; - errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; - in - if arrowCppVersion != pyArrowVersion then throw errorMessage else { - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - pkgs.cmake - ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ - _arrow-cpp - ]; - - preBuild = '' - export PYARROW_PARALLEL=$NIX_BUILD_CORES - ''; - - PARQUET_HOME = _arrow-cpp; - inherit ARROW_HOME; - - PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_FLIGHT = if _arrow-cpp.enableFlight then 1 else 0; - PYARROW_WITH_DATASET = 1; - PYARROW_WITH_PARQUET = 1; - PYARROW_CMAKE_OPTIONS = [ - "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - - # This doesn't use setup hook to call cmake so we need to workaround #54606 - # ourselves - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - ]; - - dontUseCmakeConfigure = true; - } - ) else - super.pyarrow; - - pycairo = ( - drv: ( - drv.overridePythonAttrs ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs ( - old: { - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.meson - pkgs.ninja - pkg-config - ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.cairo - ]; - - mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) - super.pycairo; - - pycocotools = super.pycocotools.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.numpy - ]; - } - ); - - pyfftw = super.pyfftw.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.fftw - pkgs.fftwFloat - pkgs.fftwLongDouble - ]; - }); - - pyfuse3 = super.pyfuse3.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ]; - }); - - pygame = super.pygame.overridePythonAttrs ( - old: rec { - nativeBuildInputs = [ - pkg-config - pkgs.SDL - ]; - - buildInputs = [ - pkgs.SDL - pkgs.SDL_image - pkgs.SDL_mixer - pkgs.SDL_ttf - pkgs.libpng - pkgs.libjpeg - pkgs.portmidi - pkgs.xorg.libX11 - pkgs.freetype - ]; - - # Tests fail because of no audio device and display. - doCheck = false; - preConfigure = '' - sed \ - -e "s/origincdirs = .*/origincdirs = []/" \ - -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ - -e "/\/include\/smpeg/d" \ - -i buildconfig/config_unix.py - ${lib.concatMapStrings - (dep: '' - sed \ - -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ - -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ - -i buildconfig/config_unix.py - '') - buildInputs - } - LOCALBASE=/ ${self.python.interpreter} buildconfig/config.py - ''; - } - ); - - pygeos = super.pygeos.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; - } - ); - - pygobject = super.pygobject.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); - - pylint = super.pylint.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - pymediainfo = super.pymediainfo.overridePythonAttrs ( - old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace pymediainfo/__init__.py \ - --replace "libmediainfo.0.dylib" \ - "${pkgs.libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \ - --replace "libmediainfo.dylib" \ - "${pkgs.libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}" \ - --replace "libmediainfo.so.0" \ - "${pkgs.libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" - ''; - } - ); - - pynetbox = super.pynetbox.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - pynput = super.pynput.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ self.sphinx ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.setuptools-lint ]; - }); - - pymssql = super.pymssql.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.openssl pkgs.libkrb5 ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ pkgs.freetds ]; - }); - - pyopencl = super.pyopencl.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ]; - } - ); - - pyopenssl = super.pyopenssl.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; - } - ); - - pyproj = super.pyproj.overridePythonAttrs ( - old: { - PROJ_DIR = "${pkgs.proj}"; - PROJ_LIBDIR = "${pkgs.proj}/lib"; - PROJ_INCDIR = "${pkgs.proj.dev}/include"; - } - ); - - pyrealsense2 = super.pyrealsense2.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libusb1.out ]; - }); - - pyrfr = super.pyrfr.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ]; - }); - - pyscard = super.pyscard.overridePythonAttrs (old: - # see https://github.com/NixOS/nixpkgs/blob/93568862a610dc1469dc40b15c1096a9357698ac/pkgs/development/python-modules/pyscard/default.nix - let - inherit (pkgs) PCSC pcsclite; - withApplePCSC = stdenv.isDarwin; - in - { - postPatch = - if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ ( - if withApplePCSC then [ PCSC ] else [ pcsclite ] - ); - NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) - "-I ${lib.getDev pcsclite}/include/PCSC"; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.swig - ]; - } - ); - - pytaglib = super.pytaglib.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.taglib ]; - }); - - pytezos = super.pytezos.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libsodium ]; - }); - - python-bugzilla = super.python-bugzilla.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.docutils - ]; - } - ); - - python-ldap = super.python-ldap.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ]; - } - ); - - python-snap7 = super.python-snap7.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.snap7 - ]; - - postPatch = (old.postPatch or "") + '' - echo "Patching find_library call." - substituteInPlace snap7/common.py \ - --replace "find_library('snap7')" "\"${pkgs.snap7}/lib/libsnap7.so\"" - ''; - }); - - - pytoml = super.pytoml.overridePythonAttrs ( - old: { - doCheck = false; - } - ); - - pytorch-lightning = super.pytorch-lightning.override { - unpackPhase = '' - # $src remains a gzipped tarball otherwise. - mkdir -p tmp - tar xvf $src --directory=tmp - mv tmp/pytorch-lightning*/* . - rm -rf tmp - ''; - }; - - pyqt5 = - let - qt5 = selectQt5 super.pyqt5.version; - in - super.pyqt5.overridePythonAttrs ( - old: { - postPatch = '' - # Confirm license - sed -i s/"if tool == 'pep517':"/"if True:"/ project.py - ''; - - dontConfigure = true; - dontWrapQtApps = true; - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ - self.pyqt-builder - self.sip - qt5.full - ]; - } - ); - - pyqt5-qt5 = - let - qt5 = selectQt5 super.pyqt5-qt5.version; - in - super.pyqt5-qt5.overridePythonAttrs ( - old: { - dontWrapQtApps = true; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ - qt5.full - qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full - pkgs.gtk3 - pkgs.speechd - pkgs.postgresql - pkgs.unixODBC - ]; - } - ); - - pytest-datadir = super.pytest-datadir.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - pytest = super.pytest.overridePythonAttrs ( - old: { - # Fixes https://github.com/pytest-dev/pytest/issues/7891 - postPatch = old.postPatch or "" + '' - # sometimes setup.cfg doesn't exist - if [ -f setup.cfg ]; then - sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg - fi - ''; - } - ); - - pytest-django = super.pytest-django.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "'pytest>=3.6'," "" - substituteInPlace setup.py --replace "'pytest>=3.6'" "" - ''; - } - ); - - pytest-randomly = super.pytest-randomly.overrideAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.importlib-metadata - ]; - }); - - pytest-runner = super.pytest-runner or super.pytestrunner; - - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( - old: { - buildInputs = [ self.pytest-runner ]; - } - ); - - # pytest-splinter seems to put a .marker file in an empty directory - # presumably so it's tracked by and can be installed with MANIFEST.in, see - # https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b - # - # This directory then gets used as an empty initial profile directory and is - # zipped up. But if the .marker file is in the Nix store, it has the - # creation date of 1970, and Zip doesn't work with such old files, so it - # fails at runtime! - # - # We fix this here by just removing the file after the installation - # - # The error you get without this is: - # - # E ValueError: ZIP does not support timestamps before 1980 - # /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError - pytest-splinter = super.pytest-splinter.overrideAttrs (old: { - postInstall = old.postInstall or "" + '' - rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker - ''; - }); - - python-jose = super.python-jose.overridePythonAttrs ( - old: { - buildInputs = [ self.pytest-runner ]; - } - ); - - python-magic = super.python-magic.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace magic/loader.py \ - --replace "'libmagic.so.1'" "'${lib.getLib pkgs.file}/lib/libmagic.so.1'" - ''; - pythonImportsCheck = old.pythonImportsCheck or [ ] ++ [ "magic" ]; - } - ); - - python-olm = super.python-olm.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.olm ]; - } - ); - - python-pam = super.python-pam.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace src/pam/__internals.py \ - --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so"' \ - --replace 'find_library("pam_misc")' '"${pkgs.pam}/lib/libpam_misc.so"' - ''; - } - ); - - python-snappy = super.python-snappy.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.snappy ]; - } - ); - - python-twitter = super.python-twitter.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - }); - - pythran = super.pythran.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - }); - - ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - python-prctl = super.python-prctl.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.libcap - ]; - } - ); - - pyudev = super.pyudev.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${lib.getLib pkgs.systemd}/lib/libudev.so'" - ''; - }); - - pyusb = super.pyusb.overridePythonAttrs ( - old: { - postPatch = '' - libusb=${pkgs.libusb1.out}/lib/libusb-1.0${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} - test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py - ''; - } - ); - - pywavelets = super.pywavelets.overridePythonAttrs ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.hdf5 ]; - } - ); - - pyzmq = super.pyzmq.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.zeromq ]; - } - ); - - recommonmark = super.rich.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; - } - ); - - rich = super.rich.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; - } - ); - - rockset = super.rockset.overridePythonAttrs ( - old: { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); - - scaleapi = super.scaleapi.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); - - panel = super.panel.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ]; - } - ); - - # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs - # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs ( - old: { - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - - # Link include and share so it can be used by packages that use pybind11 through cmake - postInstall = '' - ln -s $out/${self.python.sitePackages}/pybind11/{include,share} $out/ - ''; - } - ); - - rasterio = super.rasterio.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gdal ]; - }); - - rfc3986-validator = super.rfc3986-validator.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pytest-runner - ]; - }); - - rlp = super.rlp.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - rmfuse = super.rmfuse.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - rtree = super.rtree.overridePythonAttrs (old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ]; - postPatch = '' - substituteInPlace rtree/finder.py --replace \ - "find_library('spatialindex_c')" \ - "'${pkgs.libspatialindex}/lib/libspatialindex_c${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - ruamel-yaml = super.ruamel-yaml.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.ruamel-yaml-clib ]; - } - ); - - scipy = super.scipy.overridePythonAttrs ( - old: - if old.format != "wheel" then { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ - [ pkgs.gfortran ] ++ - lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ - lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; - dontUseMesonConfigure = true; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = lib.optional (lib.versionOlder super.scipy.version "1.9.0") '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } else old - ); - - scikit-image = super.scikit-image.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pythran - self.packaging - self.wheel - self.numpy - ]; - } - ); - - scikit-learn = super.scikit-learn.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.gfortran - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ] ++ lib.optionals stdenv.isLinux [ - pkgs.glibcLocales - ]; - - enableParallelBuilding = true; - } - ); - - secp256k1 = super.secp256k1.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig pkgs.autoconf pkgs.automake pkgs.libtool ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - # Local setuptools versions like "x.y.post0" confuse an internal check - postPatch = '' - substituteInPlace setup.py \ - --replace 'setuptools_version.' '"${self.setuptools.version}".' \ - --replace 'pytest-runner==' 'pytest-runner>=' - ''; - }); - - selenium = - let - v4orLater = lib.versionAtLeast super.selenium.version "4"; - selenium = super.selenium.override { - # Selenium >=4 is built with Bazel - preferWheel = v4orLater; - }; - in - selenium.overridePythonAttrs (old: { - # Selenium <4 can be installed from sources, with setuptools - buildInputs = old.buildInputs ++ (lib.optionals (!v4orLater) [ self.setuptools ]); - }); - - shapely = super.shapely.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; - - GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - - GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${lib.getLib stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - - # Fix library paths - postPatch = lib.optionalString (!(old.src.isWheel or false)) (old.postPatch or "" + '' - ${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py - ''); - } - ); - - shellcheck-py = super.shellcheck-py.overridePythonAttrs (old: { - - # Make fetching/installing external binaries no-ops - preConfigure = - let - fakeCommand = "type('FakeCommand', (Command,), {'initialize_options': lambda self: None, 'finalize_options': lambda self: None, 'run': lambda self: None})"; - in - '' - substituteInPlace setup.py \ - --replace "'fetch_binaries': fetch_binaries," "'fetch_binaries': ${fakeCommand}," \ - --replace "'install_shellcheck': install_shellcheck," "'install_shellcheck': ${fakeCommand}," - ''; - - propagatedUserEnvPkgs = (old.propagatedUserEnvPkgs or [ ]) ++ [ - pkgs.shellcheck - ]; - - }); - - soundfile = super.soundfile.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${pkgs.libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - suds = super.suds.overridePythonAttrs (old: { - # Fix naming convention shenanigans. - # https://github.com/suds-community/suds/blob/a616d96b070ca119a532ff395d4a2a2ba42b257c/setup.py#L648 - SUDS_PACKAGE = "suds"; - }); - - systemd-python = super.systemd-python.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ pkgs.systemd ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - }); - - tables = super.tables.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pywavelets ]; - HDF5_DIR = lib.getDev pkgs.hdf5; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); - - tempora = super.tempora.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - tensorboard = super.tensorboard.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.wheel - self.absl-py - ]; - HDF5_DIR = "${pkgs.hdf5}"; - propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.hdf5 - self.google-auth-oauthlib - self.tensorboard-plugin-wit - self.numpy - self.markdown - self.tensorboard-data-server - self.grpcio - self.protobuf - self.werkzeug - self.absl-py - ]; - } - ); - - tensorflow = super.tensorflow.overridePythonAttrs ( - old: { - postInstall = '' - rm $out/bin/tensorboard - ''; - } - ); - - tensorflow-macos = super.tensorflow-macos.overridePythonAttrs ( - old: { - postInstall = self.tensorflow.postInstall; - } - ); - - tensorpack = super.tensorpack.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); - - tinycss2 = super.tinycss2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - # The tokenizers build requires a complex rust setup (cf. nixpkgs override) - # - # Instead of providing a full source build, we use a wheel to keep - # the complexity manageable for now. - tokenizers = super.tokenizers.override { - preferWheel = true; - }; - - torch = super.torch.overridePythonAttrs (old: { - # torch has an auto-magical way to locate the cuda libraries from site-packages. - autoPatchelfIgnoreMissingDeps = true; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.numpy - ]; - }); - - torchvision = super.torchvision.overridePythonAttrs (old: { - autoPatchelfIgnoreMissingDeps = true; - - # (no patchelf on darwin, since no elves there.) - preFixup = lib.optionals (!stdenv.isDarwin) '' - addAutoPatchelfSearchPath "${self.torch}/${self.python.sitePackages}/torch/lib" - ''; - - buildInputs = (old.buildInputs or [ ]) ++ [ - self.torch - ]; - }); - - # Circular dependency between triton and torch (see https://github.com/openai/triton/issues/1374) - # You can remove this once triton publishes a new stable build and torch takes it. - triton = super.triton.overridePythonAttrs (old: { - propagatedBuildInputs = builtins.filter (e: e.pname != "torch") old.propagatedBuildInputs; - pipInstallFlags = [ "--no-deps" ]; - }); - - typed_ast = super.typed-ast.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pytest-runner - ]; - }); - - urwidtrees = super.urwidtrees.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.urwid - ]; - } - ); - - vose-alias-method = super.vose-alias-method.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - vispy = super.vispy.overrideAttrs ( - old: { - inherit (pkgs.python3.pkgs.vispy) patches; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.setuptools-scm-git-archive - ]; - } - ); - - uvloop = super.uvloop.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); - - - # Stop infinite recursion by using bootstrapped pkg from nixpkgs - bootstrapped-pip = super.bootstrapped-pip.override { - wheel = ((if self.python.isPy2 then pkgs.python2 else pkgs.python3).pkgs.override { - python = self.python; - }).wheel; - }; - - watchfiles = - let - # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 - getRepoHash = version: { - "0.20.0" = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M="; - "0.19.0" = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; - "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; - "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; - "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; - "0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a"; - "0.15.0" = "14k3avrj7v794kk4mk2xggn40a4s0zg8iq8wmyyyrf7va6hz29hf"; - "0.14.1" = "1pgfbhxrvr3dw46x9piqj3ydxgn4lkrfp931q0cajinrpv4acfay"; - "0.14" = "0lml67ilyly0i632pffdy1gd07404vx90xnkw8q6wf6xp5afmkka"; - "0.13" = "0rkz8yr01mmxm2lcmbnr9i5c7n371mksij7v3ws0aqlrh3kgww02"; - "0.12" = "16788a0d8n1bb705f0k3dvav2fmbbl6pcikwpgarl1l3fcfff8kl"; - "0.11" = "0vx56h9wfxj7x3aq7jign4rnlfm7x9nhjwmsv8p22acbzbs10dgv"; - "0.10" = "0ypdy9sq4211djqh4ni5ap9l7whq9hw0vhsxjfl3a0a4czlldxqp"; - }.${version}; - sha256 = getRepoHash super.watchfiles.version; - in - super.watchfiles.overridePythonAttrs (old: rec { - src = pkgs.fetchFromGitHub { - owner = "samuelcolvin"; - repo = "watchfiles"; - rev = "v${old.version}"; - inherit sha256; - }; - patchPhase = builtins.concatStringsSep "\n" [ - (old.patchPhase or "") - '' - substituteInPlace "Cargo.lock" --replace 'version = "0.0.0"' 'version = "${old.version}"' - substituteInPlace "Cargo.toml" --replace 'version = "0.0.0"' 'version = "${old.version}"' - '' - ]; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${src.out}/Cargo.lock"; - }; - buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.CoreServices - pkgs.libiconv - ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - }); - - weasyprint = super.weasyprint.overridePythonAttrs ( - old: { - inherit (pkgs.python3.pkgs.weasyprint) patches; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - web3 = super.web3.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - weblate-language-data = super.weblate-language-data.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.translate-toolkit - ]; - } - ); - - wheel = if self.python.isPy2 then - super.wheel.override { - inherit (self) bootstrapped-pip; - } - else - super.wheel; - - zipp = if super.zipp == null then null else - super.zipp.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - psutil = super.psutil.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ - lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.IOKit; - } - ); - - sentencepiece = super.sentencepiece.overridePythonAttrs ( - old: { - dontUseCmakeConfigure = true; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - pkgs.cmake - pkgs.gperftools - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.sentencepiece - ]; - } - ); - - sentence-transformers = super.sentence-transformers.overridePythonAttrs ( - old: { - buildInputs = - (old.buildInputs or [ ]) - ++ [ self.typing-extensions ]; - } - ); - - supervisor = super.supervisor.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.meld3 - self.setuptools - ]; - } - ); - - cytoolz = super.cytoolz.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.toolz ]; - } - ); - - # For some reason the toml dependency of tqdm declared here: - # https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2 - # is not translated correctly to a nix dependency. - tqdm = super.tqdm.overridePythonAttrs ( - old: { - buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]); - } - ); - - watchdog = super.watchdog.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; - } - ); - - # pyee cannot find `vcversioner` and other "setup requirements", so it tries to - # download them from the internet, which only works when nix sandboxing is disabled. - # Additionally, since pyee uses vcversioner to specify its version, we need to do this - # manually specify its version. - pyee = super.pyee.overrideAttrs ( - old: { - postPatch = old.postPatch or "" + '' - sed -i setup.py \ - -e '/setup_requires/,/],/d' \ - -e 's/vcversioner={},/version="${old.version}",/' - ''; - } - ); - - minimal-snowplow-tracker = super.minimal-snowplow-tracker.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ super.setuptools ]; - } - ); - - # nixpkgs has setuptools_scm 4.1.2 - # but newrelic has a seemingly unnecessary version constraint for <4 - # So we patch that out - newrelic = super.newrelic.overridePythonAttrs ( - old: { - postPatch = old.postPatch or "" + '' - substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"' - ''; - } - ); - - wxpython = super.wxpython.overridePythonAttrs (old: - let - localPython = self.python.withPackages (ps: with ps; [ - setuptools - numpy - six - ]); - in - { - DOXYGEN = "${pkgs.doxygen}/bin/doxygen"; - - nativeBuildInputs = with pkgs; [ - which - doxygen - gtk3 - pkg-config - autoPatchelfHook - ] ++ (old.nativeBuildInputs or [ ]); - - buildInputs = with pkgs; [ - gtk3 - webkitgtk - ncurses - SDL2 - xorg.libXinerama - xorg.libSM - xorg.libXxf86vm - xorg.libXtst - xorg.xorgproto - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libGLU - libGL - libglvnd - mesa - ] ++ old.buildInputs; - - buildPhase = '' - ${localPython.interpreter} build.py -v build_wx - ${localPython.interpreter} build.py -v dox etg --nodoc sip - ${localPython.interpreter} build.py -v build_py - ''; - - installPhase = '' - ${localPython.interpreter} setup.py install --skip-build --prefix=$out - ''; - }); - - marisa-trie = super.marisa-trie.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - ua-parser = super.ua-parser.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyyaml ]; - } - ); - - pygraphviz = super.pygraphviz.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.graphviz ]; - }); - - pysqlite = super.pysqlite.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.sqlite ]; - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} - ''; - }); - - selinux = super.selinux.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; - }); - - setuptools-scm = super.setuptools-scm.overridePythonAttrs (old: { - setupHook = pkgs.writeText "setuptools-scm-setup-hook.sh" '' - poetry2nix-setuptools-scm-hook() { - if [ -z "''${dontPretendSetuptoolsSCMVersion-}" ]; then - export SETUPTOOLS_SCM_PRETEND_VERSION="$version" - fi - } - - preBuildHooks+=(poetry2nix-setuptools-scm-hook) - ''; - }); - - uwsgi = super.uwsgi.overridePythonAttrs - (old: - { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ncurses ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "2.0.19" && lib.versionOlder old.version "2.0.20") { - sourceRoot = "."; - }); - - wcwidth = super.wcwidth.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]); - }); - - wtforms = super.wtforms.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; - }); - - nbconvert = - let - patchExporters = lib.optionalString (lib.versionAtLeast self.nbconvert.version "6.5.0") '' - substituteInPlace \ - ./nbconvert/exporters/templateexporter.py \ - --replace \ - 'root_dirs.extend(jupyter_path())' \ - 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ - --subst-var out - ''; - in - super.nbconvert.overridePythonAttrs (old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) ( - patchExporters + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") '' - substituteInPlace \ - ./hatch_build.py \ - --replace \ - 'if self.target_name not in ["wheel", "sdist"]:' \ - 'if True:' - '' - ); - postInstall = lib.optionalString (old.src.isWheel or false) '' - pushd $out/${self.python.sitePackages} - ${patchExporters} - popd - ''; - }); - - meson-python = super.meson-python.overridePythonAttrs (old: { - dontUseMesonConfigure = true; - }); - - mkdocs = super.mkdocs.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ]; - }); - - # patch mkdocstrings to fix jinja2 imports - mkdocstrings = - let - patchJinja2Imports = self.pkgs.fetchpatch { - name = "fix-jinja2-imports.patch"; - url = "https://github.com/mkdocstrings/mkdocstrings/commit/b37722716b1e0ed6393ec71308dfb0f85e142f3b.patch"; - hash = "sha256-DD1SjEvs5HBlSRLrqP3jhF/yoeWkF7F3VXCD1gyt5Fc="; - }; - in - super.mkdocstrings.overridePythonAttrs ( - old: lib.optionalAttrs - (lib.versionAtLeast old.version "0.17" && lib.versionOlder old.version "0.18") - { - patches = old.patches or [ ] ++ lib.optionals (!(old.src.isWheel or false)) [ patchJinja2Imports ]; - # strip the first two levels ("a/src/") when patching since we're in site-packages - # just above mkdocstrings - postInstall = lib.optionalString (old.src.isWheel or false) '' - pushd "$out/${self.python.sitePackages}" - patch -p2 < "${patchJinja2Imports}" - popd - ''; - } - ); - - flake8-mutable = super.flake8-mutable.overridePythonAttrs - (old: { buildInputs = old.buildInputs or [ ] ++ [ self.pytest-runner ]; }); - pydantic = super.pydantic.overridePythonAttrs - (old: { buildInputs = old.buildInputs or [ ] ++ [ pkgs.libxcrypt ]; }); - - y-py = super.y-py.override { - preferWheel = true; - }; - } - ) -] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py deleted file mode 100644 index d3b365459b..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py +++ /dev/null @@ -1,46 +0,0 @@ -""" -Rewrite libc/library path references to Nix store paths -Nixpkgs uses a normal patch for this but we need to be less -sensitive to changes between versions. -""" -from textwrap import dedent -import sys -import ast -import os - - -with open(sys.argv[1]) as f: - mod = ast.parse(f.read(), "geos.py") - - -class LibTransformer(ast.NodeTransformer): - _lgeos_replaced = False - - def visit_If(self, node): - if ast.unparse(node).startswith("if sys.platform.startswith('linux')"): - return ast.parse( - dedent( - """ - free = CDLL(%s).free - free.argtypes = [c_void_p] - free.restype = None - """ - ) - % (lambda x: "'" + x + "'" if x else None)(os.environ.get("GEOS_LIBC")) - ) - return node - - def visit_Assign(self, node): - _target = node.targets[0] - if ( - not self._lgeos_replaced - and isinstance(_target, ast.Name) - and _target.id == "_lgeos" - ): - self._lgeos_replaced = True - return ast.parse("_lgeos = CDLL('%s')" % os.environ["GEOS_LIBRARY_PATH"]) - return node - - -with open(sys.argv[1], "w") as f: - f.write(ast.unparse(LibTransformer().visit(mod))) diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix deleted file mode 100644 index 1ef253365a..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }: -let - inherit (lib.strings) escapeRegex hasPrefix hasSuffix hasInfix splitString removePrefix removeSuffix; - targetMachine = poetryLib.getTargetMachine stdenv; - - pythonVer = - let - ver = builtins.splitVersion python.version; - major = builtins.elemAt ver 0; - minor = builtins.elemAt ver 1; - tags = [ "cp" "py" ]; - in - { inherit major minor tags; }; - abiTag = "cp${pythonVer.major}${pythonVer.minor}m"; - - # - # Parses wheel file returning an attribute set - # - toWheelAttrs = str: - let - entries' = splitString "-" str; - el = builtins.length entries'; - entryAt = builtins.elemAt entries'; - - # Hack: Remove version "suffixes" like 2.11.4-1 - entries = - if el == 6 then [ - (entryAt 0) # name - (entryAt 1) # version - # build tag is skipped - (entryAt (el - 3)) # python version - (entryAt (el - 2)) # abi - (entryAt (el - 1)) # platform - ] else entries'; - p = removeSuffix ".whl" (builtins.elemAt entries 4); - in - { - pkgName = builtins.elemAt entries 0; - pkgVer = builtins.elemAt entries 1; - pyVer = builtins.elemAt entries 2; - abi = builtins.elemAt entries 3; - platform = p; - }; - - # - # Builds list of acceptable osx wheel files - # - # accepted versions in descending order of preference - # list of wheel files to select from - findBestMatches = versions: candidates: - let - v = lib.lists.head versions; - vs = lib.lists.tail versions; - in - if (builtins.length versions == 0) - then [ ] - else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); - - # x = "cpXX" | "py2" | "py3" | "py2.py3" - isPyVersionCompatible = pyver@{ major, minor, tags }: x: - let - isCompat = m: - builtins.elem m.tag tags - && m.major == major - && builtins.compareVersions minor m.minor >= 0; - parseMarker = v: - let - tag = builtins.substring 0 2 v; - major = builtins.substring 2 1 v; - end = builtins.substring 3 3 v; - minor = if builtins.stringLength end > 0 then end else "0"; - in - { inherit major minor tag; }; - markers = splitString "." x; - in - lib.lists.any isCompat (map parseMarker markers); - - # - # Selects the best matching wheel file from a list of files - # - selectWheel = files: - let - filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || hasPrefix pyabi x || hasPrefix x pyabi || ( - # The CPython stable ABI is abi3 as in the shared library suffix. - python.passthru.implementation == "cpython" && - builtins.elemAt (lib.splitString "." python.version) 0 == "3" && - x == "abi3" - ); - withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); - withPlatform = - if isLinux - then - if targetMachine != null - then - # See PEP 600 for details. - (p: - builtins.match "any|manylinux(1|2010|2014)_${escapeRegex targetMachine}|manylinux_[0-9]+_[0-9]+_${escapeRegex targetMachine}" p != null - ) - else - (p: p == "any") - else - if stdenv.isDarwin - then - if stdenv.targetPlatform.isAarch64 - then (p: p == "any" || (hasInfix "macosx" p && lib.lists.any (e: hasSuffix e p) [ "arm64" "aarch64" ])) - else (p: p == "any" || (hasInfix "macosx" p && hasSuffix "x86_64" p)) - else (p: p == "any"); - withPlatforms = x: lib.lists.any withPlatform (splitString "." x.platform); - filterWheel = x: - let - f = toWheelAttrs x.file; - in - (withPython pythonVer abiTag f) && (withPlatforms f); - filtered = builtins.filter filterWheel filesWithoutSources; - choose = files: - let - osxMatches = [ "12_0" "11_0" "10_15" "10_14" "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; - linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "manylinux_" "any" ]; - chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); - chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); - in - if isLinux - then chooseLinux files - else chooseOSX files; - in - if (builtins.length filtered == 0) - then [ ] - else choose (filtered); -in -{ - inherit selectWheel toWheelAttrs isPyVersionCompatible; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix deleted file mode 100644 index c9cef28fe8..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ lib, stdenv, poetryLib }: python: -let - inherit (poetryLib) ireplace; - - targetMachine = poetryLib.getTargetMachine stdenv; - - # Like builtins.substring but with stop being offset instead of length - substr = start: stop: s: builtins.substring start (stop - start) s; - - # Strip leading/trailing whitespace from string - stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; - findSubExpressionsFun = acc: c: ( - if c == "(" then - ( - let - posNew = acc.pos + 1; - isOpen = acc.openP == 0; - startPos = if isOpen then posNew else acc.startPos; - in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } - ) else if c == ")" then - ( - let - openP = acc.openP - 1; - exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); - in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } - ) else acc // { pos = acc.pos + 1; } - ); - - # Make a tree out of expression groups (parens) - findSubExpressions = expr': - let - expr = " " + expr'; - acc = builtins.foldl' - findSubExpressionsFun - { - exprs = [ ]; - expr = expr; - pos = 0; - openP = 0; - exprPos = 0; - startPos = 0; - } - (lib.stringToCharacters expr); - tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; - in - acc.exprs ++ tailExprs; - parseExpressions = exprs: - let - splitCond = ( - s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) - (builtins.split " (and|or) " (s + " ")) - ); - mapfn = expr: ( - if (builtins.match "^ ?$" expr != null) then null # Filter empty - else if (builtins.elem expr [ "and" "or" ]) then { - type = "bool"; - value = expr; - } - else { - type = "expr"; - value = expr; - } - ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); - in - builtins.foldl' - ( - acc: v: acc ++ (if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) - ) [ ] - exprs; - - # Transform individual expressions to structured expressions - # This function also performs variable substitution, replacing environment markers with their explicit values - transformExpressions = exprs: - let - variables = { - os_name = ( - if python.pname == "jython" then "java" - else "posix" - ); - sys_platform = ( - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported platform" - ); - platform_machine = targetMachine; - platform_python_implementation = - let - impl = python.passthru.implementation; - in - ( - if impl == "cpython" then "CPython" - else if impl == "pypy" then "PyPy" - else throw "Unsupported implementation ${impl}" - ); - platform_release = ""; # Field not reproducible - platform_system = ( - if stdenv.isLinux then "Linux" - else if stdenv.isDarwin then "Darwin" - else throw "Unsupported platform" - ); - platform_version = ""; # Field not reproducible - python_version = python.passthru.pythonVersion; - python_full_version = python.version; - implementation_name = python.implementation; - implementation_version = python.version; - # extra = ""; - }; - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - processVar = value: builtins.foldl' (acc: v: v acc) value [ - stripStr - substituteVar - ]; - in - if builtins.typeOf exprs == "set" then - ( - if exprs.type == "expr" then - ( - let - mVal = ''[a-zA-Z0-9\'"_\. \-]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m' = builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e; - m = builtins.map stripStr (if m' != null then m' else builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e); - m0 = processVar (builtins.elemAt m 0); - m2 = processVar (builtins.elemAt m 2); - in - { - type = "expr"; - value = { - # HACK: We don't know extra at eval time, so we assume the expression is always true - op = if m0 == "extra" then "true" else builtins.elemAt m 1; - values = [ m0 m2 ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; - - # Recursively eval all expressions - evalExpressions = exprs: - let - unmarshal = v: ( - # TODO: Handle single quoted values - if v == "True" then true - else if v == "False" then false - else builtins.fromJSON v - ); - hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); - op = { - "true" = x: y: true; - "<=" = x: y: op.">=" y x; - "<" = x: y: lib.versionOlder (unmarshal x) (unmarshal y); - "!=" = x: y: x != y; - "==" = x: y: x == y; - ">=" = x: y: lib.versionAtLeast (unmarshal x) (unmarshal y); - ">" = x: y: op."<" y x; - "~=" = v: c: - let - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - op.">=" v c && op."<" v upperConstraint; - "===" = x: y: x == y; - "in" = x: y: - let - values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); - in - builtins.elem (unmarshal x) values; - }; - in - if builtins.typeOf exprs == "set" then - ( - if exprs.type == "expr" then - ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; - - # Now that we have performed an eval all that's left to do is to concat the graph into a single bool - reduceExpressions = exprs: - let - cond = { - "and" = x: y: x && y; - "or" = x: y: x || y; - }; - reduceExpressionsFun = acc: v: ( - if builtins.typeOf v == "set" then - ( - if v.type == "value" then - ( - acc // { - value = cond."${acc.cond}" acc.value v.value; - } - ) else if v.type == "bool" then - ( - acc // { - cond = v.value; - } - ) else throw "Unsupported type" - ) else if builtins.typeOf v == "list" then - ( - let - ret = builtins.foldl' - reduceExpressionsFun - { - value = true; - cond = "and"; - } - v; - in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } - ) else throw "Unsupported type" - ); - in - ( - builtins.foldl' - reduceExpressionsFun - { - value = true; - cond = "and"; - } - exprs - ).value; -in -e: builtins.foldl' (acc: v: v acc) e [ - findSubExpressions - parseExpressions - transformExpressions - evalExpressions - reduceExpressions -] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix deleted file mode 100644 index b0423a98f9..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, poetry2nix -, python -, fetchFromGitHub -, projectDir ? ./. -, pyproject ? projectDir + "/pyproject.toml" -, poetrylock ? projectDir + "/poetry.lock" -}: - - -poetry2nix.mkPoetryApplication { - - inherit python; - - inherit projectDir pyproject poetrylock; - - src = fetchFromGitHub (lib.importJSON ./src.json); - - # "Vendor" dependencies (for build-system support) - postPatch = '' - # Figure out the location of poetry.core - # As poetry.core is using the same root import name as the poetry package and the python module system wont look for the root - # in the separate second location we need to link poetry.core to poetry - POETRY_CORE=$(python -c 'import poetry.core; import os.path; print(os.path.dirname(poetry.core.__file__))') - - echo "import sys" >> src/poetry/__init__.py - for path in $propagatedBuildInputs; do - echo "sys.path.insert(0, \"$path\")" >> src/poetry/__init__.py - done - ''; - - postInstall = '' - ln -s $POETRY_CORE $out/${python.sitePackages}/poetry/core - - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/site-functions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/site-functions/_poetry" - mkdir -p "$out/share/fish/vendor_completions.d" - "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" - ''; - - # Propagating dependencies leads to issues downstream - # We've already patched poetry to prefer "vendored" dependencies - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - - # Fails because of impurities (network, git etc etc) - doCheck = false; - - overrides = [ - poetry2nix.defaultPoetryOverrides - (self: super: { - cryptography = super.cryptography.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ - "CVE-2023-2650" - "CVE-2023-2975" - "CVE-2023-3446" - "CVE-2023-3817" - "CVE-2023-38325" - ]; - }; - }); - requests = super.requests.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "2.31.0") [ - "CVE-2023-32681" - ]; - }; - }); - }) - ]; - - meta = with lib; { - inherit (python.meta) platforms; - maintainers = with maintainers; [ adisbladis jakewaksbaum ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock deleted file mode 100644 index 4920580e54..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ /dev/null @@ -1,1906 +0,0 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. - -[[package]] -name = "attrs" -version = "23.1.0" -description = "Classes Without Boilerplate" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, - {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, -] - -[package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]", "pre-commit"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] -tests = ["attrs[tests-no-zope]", "zope-interface"] -tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] - -[[package]] -name = "backports-cached-property" -version = "1.0.2" -description = "cached_property() - computed once per instance, cached as attribute" -category = "main" -optional = false -python-versions = ">=3.6.0" -files = [ - {file = "backports.cached-property-1.0.2.tar.gz", hash = "sha256:9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd"}, - {file = "backports.cached_property-1.0.2-py3-none-any.whl", hash = "sha256:baeb28e1cd619a3c9ab8941431fe34e8490861fb998c6c4590693d50171db0cc"}, -] - -[[package]] -name = "cachecontrol" -version = "0.12.11" -description = "httplib2 caching for requests" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "CacheControl-0.12.11-py2.py3-none-any.whl", hash = "sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b"}, - {file = "CacheControl-0.12.11.tar.gz", hash = "sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144"}, -] - -[package.dependencies] -lockfile = {version = ">=0.9", optional = true, markers = "extra == \"filecache\""} -msgpack = ">=0.5.2" -requests = "*" - -[package.extras] -filecache = ["lockfile (>=0.9)"] -redis = ["redis (>=2.10.5)"] - -[[package]] -name = "cachy" -version = "0.3.0" -description = "Cachy provides a simple yet effective caching library." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "cachy-0.3.0-py2.py3-none-any.whl", hash = "sha256:338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"}, - {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, -] - -[package.extras] -memcached = ["python-memcached (>=1.59,<2.0)"] -msgpack = ["msgpack-python (>=0.5,<0.6)"] -redis = ["redis (>=3.3.6,<4.0.0)"] - -[[package]] -name = "certifi" -version = "2022.12.7" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, -] - -[[package]] -name = "cffi" -version = "1.15.1" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "cfgv" -version = "3.3.1" -description = "Validate configuration and produce human readable error messages." -category = "dev" -optional = false -python-versions = ">=3.6.1" -files = [ - {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, - {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, -] - -[[package]] -name = "charset-normalizer" -version = "3.1.0" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, -] - -[[package]] -name = "cleo" -version = "2.0.1" -description = "Cleo allows you to create beautiful and testable command-line interfaces." -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "cleo-2.0.1-py3-none-any.whl", hash = "sha256:6eb133670a3ed1f3b052d53789017b6e50fca66d1287e6e6696285f4cb8ea448"}, - {file = "cleo-2.0.1.tar.gz", hash = "sha256:eb4b2e1f3063c11085cebe489a6e9124163c226575a3c3be69b2e51af4a15ec5"}, -] - -[package.dependencies] -crashtest = ">=0.4.1,<0.5.0" -rapidfuzz = ">=2.2.0,<3.0.0" - -[[package]] -name = "colorama" -version = "0.4.6" -description = "Cross-platform colored terminal text." -category = "dev" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" -files = [ - {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, - {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, -] - -[[package]] -name = "coverage" -version = "7.2.5" -description = "Code coverage measurement for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "coverage-7.2.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:883123d0bbe1c136f76b56276074b0c79b5817dd4238097ffa64ac67257f4b6c"}, - {file = "coverage-7.2.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d2fbc2a127e857d2f8898aaabcc34c37771bf78a4d5e17d3e1f5c30cd0cbc62a"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f3671662dc4b422b15776cdca89c041a6349b4864a43aa2350b6b0b03bbcc7f"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780551e47d62095e088f251f5db428473c26db7829884323e56d9c0c3118791a"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:066b44897c493e0dcbc9e6a6d9f8bbb6607ef82367cf6810d387c09f0cd4fe9a"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9a4ee55174b04f6af539218f9f8083140f61a46eabcaa4234f3c2a452c4ed11"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:706ec567267c96717ab9363904d846ec009a48d5f832140b6ad08aad3791b1f5"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ae453f655640157d76209f42c62c64c4d4f2c7f97256d3567e3b439bd5c9b06c"}, - {file = "coverage-7.2.5-cp310-cp310-win32.whl", hash = "sha256:f81c9b4bd8aa747d417407a7f6f0b1469a43b36a85748145e144ac4e8d303cb5"}, - {file = "coverage-7.2.5-cp310-cp310-win_amd64.whl", hash = "sha256:dc945064a8783b86fcce9a0a705abd7db2117d95e340df8a4333f00be5efb64c"}, - {file = "coverage-7.2.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:40cc0f91c6cde033da493227797be2826cbf8f388eaa36a0271a97a332bfd7ce"}, - {file = "coverage-7.2.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a66e055254a26c82aead7ff420d9fa8dc2da10c82679ea850d8feebf11074d88"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c10fbc8a64aa0f3ed136b0b086b6b577bc64d67d5581acd7cc129af52654384e"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a22cbb5ede6fade0482111fa7f01115ff04039795d7092ed0db43522431b4f2"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:292300f76440651529b8ceec283a9370532f4ecba9ad67d120617021bb5ef139"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7ff8f3fb38233035028dbc93715551d81eadc110199e14bbbfa01c5c4a43f8d8"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:a08c7401d0b24e8c2982f4e307124b671c6736d40d1c39e09d7a8687bddf83ed"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ef9659d1cda9ce9ac9585c045aaa1e59223b143f2407db0eaee0b61a4f266fb6"}, - {file = "coverage-7.2.5-cp311-cp311-win32.whl", hash = "sha256:30dcaf05adfa69c2a7b9f7dfd9f60bc8e36b282d7ed25c308ef9e114de7fc23b"}, - {file = "coverage-7.2.5-cp311-cp311-win_amd64.whl", hash = "sha256:97072cc90f1009386c8a5b7de9d4fc1a9f91ba5ef2146c55c1f005e7b5c5e068"}, - {file = "coverage-7.2.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bebea5f5ed41f618797ce3ffb4606c64a5de92e9c3f26d26c2e0aae292f015c1"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:828189fcdda99aae0d6bf718ea766b2e715eabc1868670a0a07bf8404bf58c33"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6e8a95f243d01ba572341c52f89f3acb98a3b6d1d5d830efba86033dd3687ade"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8834e5f17d89e05697c3c043d3e58a8b19682bf365048837383abfe39adaed5"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d1f25ee9de21a39b3a8516f2c5feb8de248f17da7eead089c2e04aa097936b47"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1637253b11a18f453e34013c665d8bf15904c9e3c44fbda34c643fbdc9d452cd"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8e575a59315a91ccd00c7757127f6b2488c2f914096077c745c2f1ba5b8c0969"}, - {file = "coverage-7.2.5-cp37-cp37m-win32.whl", hash = "sha256:509ecd8334c380000d259dc66feb191dd0a93b21f2453faa75f7f9cdcefc0718"}, - {file = "coverage-7.2.5-cp37-cp37m-win_amd64.whl", hash = "sha256:12580845917b1e59f8a1c2ffa6af6d0908cb39220f3019e36c110c943dc875b0"}, - {file = "coverage-7.2.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b5016e331b75310610c2cf955d9f58a9749943ed5f7b8cfc0bb89c6134ab0a84"}, - {file = "coverage-7.2.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:373ea34dca98f2fdb3e5cb33d83b6d801007a8074f992b80311fc589d3e6b790"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a063aad9f7b4c9f9da7b2550eae0a582ffc7623dca1c925e50c3fbde7a579771"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38c0a497a000d50491055805313ed83ddba069353d102ece8aef5d11b5faf045"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2b3b05e22a77bb0ae1a3125126a4e08535961c946b62f30985535ed40e26614"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0342a28617e63ad15d96dca0f7ae9479a37b7d8a295f749c14f3436ea59fdcb3"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cf97ed82ca986e5c637ea286ba2793c85325b30f869bf64d3009ccc1a31ae3fd"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c2c41c1b1866b670573657d584de413df701f482574bad7e28214a2362cb1fd1"}, - {file = "coverage-7.2.5-cp38-cp38-win32.whl", hash = "sha256:10b15394c13544fce02382360cab54e51a9e0fd1bd61ae9ce012c0d1e103c813"}, - {file = "coverage-7.2.5-cp38-cp38-win_amd64.whl", hash = "sha256:a0b273fe6dc655b110e8dc89b8ec7f1a778d78c9fd9b4bda7c384c8906072212"}, - {file = "coverage-7.2.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5c587f52c81211d4530fa6857884d37f514bcf9453bdeee0ff93eaaf906a5c1b"}, - {file = "coverage-7.2.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4436cc9ba5414c2c998eaedee5343f49c02ca93b21769c5fdfa4f9d799e84200"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6599bf92f33ab041e36e06d25890afbdf12078aacfe1f1d08c713906e49a3fe5"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:857abe2fa6a4973f8663e039ead8d22215d31db613ace76e4a98f52ec919068e"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6f5cab2d7f0c12f8187a376cc6582c477d2df91d63f75341307fcdcb5d60303"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:aa387bd7489f3e1787ff82068b295bcaafbf6f79c3dad3cbc82ef88ce3f48ad3"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:156192e5fd3dbbcb11cd777cc469cf010a294f4c736a2b2c891c77618cb1379a"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bd3b4b8175c1db502adf209d06136c000df4d245105c8839e9d0be71c94aefe1"}, - {file = "coverage-7.2.5-cp39-cp39-win32.whl", hash = "sha256:ddc5a54edb653e9e215f75de377354e2455376f416c4378e1d43b08ec50acc31"}, - {file = "coverage-7.2.5-cp39-cp39-win_amd64.whl", hash = "sha256:338aa9d9883aaaad53695cb14ccdeb36d4060485bb9388446330bef9c361c252"}, - {file = "coverage-7.2.5-pp37.pp38.pp39-none-any.whl", hash = "sha256:8877d9b437b35a85c18e3c6499b23674684bf690f5d96c1006a1ef61f9fdf0f3"}, - {file = "coverage-7.2.5.tar.gz", hash = "sha256:f99ef080288f09ffc687423b8d60978cf3a465d3f404a18d1a05474bd8575a47"}, -] - -[package.dependencies] -tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} - -[package.extras] -toml = ["tomli"] - -[[package]] -name = "crashtest" -version = "0.4.1" -description = "Manage Python errors with ease" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "crashtest-0.4.1-py3-none-any.whl", hash = "sha256:8d23eac5fa660409f57472e3851dab7ac18aba459a8d19cbbba86d3d5aecd2a5"}, - {file = "crashtest-0.4.1.tar.gz", hash = "sha256:80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce"}, -] - -[[package]] -name = "cryptography" -version = "40.0.2" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "cryptography-40.0.2-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:8f79b5ff5ad9d3218afb1e7e20ea74da5f76943ee5edb7f76e56ec5161ec782b"}, - {file = "cryptography-40.0.2-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:05dc219433b14046c476f6f09d7636b92a1c3e5808b9a6536adf4932b3b2c440"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4df2af28d7bedc84fe45bd49bc35d710aede676e2a4cb7fc6d103a2adc8afe4d"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0dcca15d3a19a66e63662dc8d30f8036b07be851a8680eda92d079868f106288"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:a04386fb7bc85fab9cd51b6308633a3c271e3d0d3eae917eebab2fac6219b6d2"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:adc0d980fd2760c9e5de537c28935cc32b9353baaf28e0814df417619c6c8c3b"}, - {file = "cryptography-40.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d5a1bd0e9e2031465761dfa920c16b0065ad77321d8a8c1f5ee331021fda65e9"}, - {file = "cryptography-40.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a95f4802d49faa6a674242e25bfeea6fc2acd915b5e5e29ac90a32b1139cae1c"}, - {file = "cryptography-40.0.2-cp36-abi3-win32.whl", hash = "sha256:aecbb1592b0188e030cb01f82d12556cf72e218280f621deed7d806afd2113f9"}, - {file = "cryptography-40.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:b12794f01d4cacfbd3177b9042198f3af1c856eedd0a98f10f141385c809a14b"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:142bae539ef28a1c76794cca7f49729e7c54423f615cfd9b0b1fa90ebe53244b"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:956ba8701b4ffe91ba59665ed170a2ebbdc6fc0e40de5f6059195d9f2b33ca0e"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4f01c9863da784558165f5d4d916093737a75203a5c5286fde60e503e4276c7a"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3daf9b114213f8ba460b829a02896789751626a2a4e7a43a28ee77c04b5e4958"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:48f388d0d153350f378c7f7b41497a54ff1513c816bcbbcafe5b829e59b9ce5b"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c0764e72b36a3dc065c155e5b22f93df465da9c39af65516fe04ed3c68c92636"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:cbaba590180cba88cb99a5f76f90808a624f18b169b90a4abb40c1fd8c19420e"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7a38250f433cd41df7fcb763caa3ee9362777fdb4dc642b9a349721d2bf47404"}, - {file = "cryptography-40.0.2.tar.gz", hash = "sha256:c33c0d32b8594fa647d2e01dbccc303478e16fdd7cf98652d5b3ed11aa5e5c99"}, -] - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] -docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff"] -sdist = ["setuptools-rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"] -test-randomorder = ["pytest-randomly"] -tox = ["tox"] - -[[package]] -name = "deepdiff" -version = "5.8.1" -description = "Deep Difference and Search of any Python object/data." -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "deepdiff-5.8.1-py3-none-any.whl", hash = "sha256:e9aea49733f34fab9a0897038d8f26f9d94a97db1790f1b814cced89e9e0d2b7"}, - {file = "deepdiff-5.8.1.tar.gz", hash = "sha256:8d4eb2c4e6cbc80b811266419cb71dd95a157094a3947ccf937a94d44943c7b8"}, -] - -[package.dependencies] -ordered-set = ">=4.1.0,<4.2.0" - -[package.extras] -cli = ["clevercsv (==0.7.1)", "click (==8.0.3)", "pyyaml (==5.4.1)", "toml (==0.10.2)"] - -[[package]] -name = "distlib" -version = "0.3.6" -description = "Distribution utilities" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"}, - {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, -] - -[[package]] -name = "dulwich" -version = "0.20.50" -description = "Python Git Library" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:97f02f8d500d4af08dc022d697c56e8539171acc3f575c2fe9acf3b078e5c8c9"}, - {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7301773e5cc16d521bc6490e73772a86a4d1d0263de506f08b54678cc4e2f061"}, - {file = "dulwich-0.20.50-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b70106580ed11f45f4c32d2831d0c9c9f359bc2415fff4a6be443e3a36811398"}, - {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f9c4f2455f966cad94648278fa9972e4695b35d04f82792fa58e1ea15dd83f0"}, - {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9163fbb021a8ad9c35a0814a5eedf45a8eb3a0b764b865d7016d901fc5a947fc"}, - {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:322ff8ff6aa4d6d36294cd36de1c84767eb1903c7db3e7b4475ad091febf5363"}, - {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d3290a45651c8e534f8e83ae2e30322aefdd162f0f338bae2e79a6ee5a87513"}, - {file = "dulwich-0.20.50-cp310-cp310-win32.whl", hash = "sha256:80ab07131a6e68594441f5c4767e9e44e87fceafc3e347e541c928a18c679bd8"}, - {file = "dulwich-0.20.50-cp310-cp310-win_amd64.whl", hash = "sha256:eefe786a6010f8546baac4912113eeed4e397ddb8c433a345b548a04d4176496"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:df3562dde3079d57287c233d45b790bc967c5aae975c9a7b07ca30e60e055512"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e1ae18d5805f0c0c5dac65795f8d48660437166b12ee2c0ffea95bfdbf9c1051"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d2f7df39bd1378d3b0bfb3e7fc930fd0191924af1f0ef587bcd9946afe076c06"}, - {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:731e7f319b34251fadeb362ada1d52cc932369d9cdfa25c0e41150cda28773d0"}, - {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4d11d44176e5d2fa8271fc86ad1e0a8731b9ad8f77df64c12846b30e16135eb"}, - {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7aaabb8e4beadd53f75f853a981caaadef3ef130e5645c902705704eaf136daa"}, - {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c3dc9f97ec8d3db08d9723b9fd06f3e52c15b84c800d153cfb59b0a3dc8b8d40"}, - {file = "dulwich-0.20.50-cp311-cp311-win32.whl", hash = "sha256:3b1964fa80cafd5a1fd71615b0313daf6f3295c6ab05656ea0c1d2423539904a"}, - {file = "dulwich-0.20.50-cp311-cp311-win_amd64.whl", hash = "sha256:a24a3893108f3b97beb958670d5f3f2a3bec73a1fe18637a572a85abd949a1c4"}, - {file = "dulwich-0.20.50-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6d409a282f8848fd6c8d7c7545ad2f75c16de5d5977de202642f1d50fdaac554"}, - {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5411d0f1092152e1c0bb916ae490fe181953ae1b8d13f4e68661253e10b78dbb"}, - {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6343569f998ce429e2a5d813c56768ac51b496522401db950f0aa44240bfa901"}, - {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a405cd236766060894411614a272cfb86fe86cde5ca73ef264fc4fa5a715fff4"}, - {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ee0f9b02019c0ea84cdd31c00a0c283669b771c85612997a911715cf84e33d99"}, - {file = "dulwich-0.20.50-cp36-cp36m-win32.whl", hash = "sha256:2644466270267270f2157ea6f1c0aa224f6f3bf06a307fc39954e6b4b3d82bae"}, - {file = "dulwich-0.20.50-cp36-cp36m-win_amd64.whl", hash = "sha256:d4629635a97e3af1b5da48071e00c8e70fad85f3266fadabe1f5a8f49172c507"}, - {file = "dulwich-0.20.50-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0e4862f318d99cc8a500e3622a89613a88c07d957a0f628cdc2ed86addff790f"}, - {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c96e3fb9d48c0454dc242c7accc7819780c9a7f29e441a9eff12361ed0fa35f9"}, - {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cc6092a4f0bbbff2e553e87a9c6325955b64ea43fca21297c8182e19ae8a43c"}, - {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:519b627d49d273e2fd01c79d09e578675ca6cd05193c1787e9ef165c9a1d66ea"}, - {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a75cab01b909c4c683c2083e060e378bc01701b7366b5a7d9846ef6d3b9e3d5"}, - {file = "dulwich-0.20.50-cp37-cp37m-win32.whl", hash = "sha256:ea8ffe26d91dbcd5580dbd5a07270a12ea57b091604d77184da0a0d9fad50ed3"}, - {file = "dulwich-0.20.50-cp37-cp37m-win_amd64.whl", hash = "sha256:8f3af857f94021cae1322d86925bfc0dd31e501e885ab5db275473bfac0bb39d"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3fb35cedb1243bc420d885ef5b4afd642c6ac8f07ddfc7fdbca1becf9948bf7e"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4bb23a9cec63e16c0e432335f068169b73dd44fa9318dd7cd7a4ca83607ff367"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5267619b34ddaf8d9a6b841492cd17a971fd25bf9a5657f2de928385c3a08b94"}, - {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9091f1d53a3c0747cbf0bd127c64e7f09b770264d8fb53e284383fcdf69154e7"}, - {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6ec7c8fea2b44187a3b545e6c11ab9947ffb122647b07abcdb7cc3aaa770c0e"}, - {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:11b180b80363b4fc70664197028181a17ae4c52df9965a29b62a6c52e40c2dbe"}, - {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c83e7840d9d0a94d7033bc109efe0c22dfcdcd816bcd4469085e42809e3bf5ba"}, - {file = "dulwich-0.20.50-cp38-cp38-win32.whl", hash = "sha256:c075f69c2de19d9fd97e3b70832d2b42c6a4a5d909b3ffd1963b67d86029f95f"}, - {file = "dulwich-0.20.50-cp38-cp38-win_amd64.whl", hash = "sha256:06775c5713cfeda778c7c67d4422b5e7554d3a7f644f1dde646cdf486a30285a"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:49f66f1c057c18d7d60363f461f4ab8329320fbe1f02a7a33c255864a7d3c942"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4e541cd690a5e3d55082ed51732d755917e933cddeb4b0204f2a5ec5d5d7b60b"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:80e8750ee2fa0ab2784a095956077758e5f6107de27f637c4b9d18406652c22c"}, - {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fbb6368f18451dc44c95c55e1a609d1a01d3821f7ed480b22b2aea1baca0f4a7"}, - {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3ee45001411b638641819b7b3b33f31f13467c84066e432256580fcab7d8815"}, - {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4842e22ed863a776b36ef8ffe9ed7b772eb452b42c8d02975c29d27e3bc50ab4"}, - {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:790e4a641284a7fb4d56ebdaf8b324a5826fbbb9c54307c06f586f9f6a5e56db"}, - {file = "dulwich-0.20.50-cp39-cp39-win32.whl", hash = "sha256:f08406b6b789dea5c95ba1130a0801d8748a67f18be940fe7486a8b481fde875"}, - {file = "dulwich-0.20.50-cp39-cp39-win_amd64.whl", hash = "sha256:78c388ad421199000fb7b5ed5f0c7b509b3e31bd7cad303786a4d0bf89b82f60"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:cb194c53109131bcbcd1ca430fcd437cdaf2d33e204e45fbe121c47eaa43e9af"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7542a72c5640dd0620862d6df8688f02a6c336359b5af9b3fcfe11b7fa6652f"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4aa1d0861517ebbbe0e0084cc9ab4f7ab720624a3eda2bd10e45f774ab858db8"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:583c6bbc27f13fe2e41a19f6987a42681c6e4f6959beae0a6e5bb033b8b081a8"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0c61c193d02c0e1e0d758cdd57ae76685c368d09a01f00d704ba88bd96767cfe"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2edbff3053251985f10702adfafbee118298d383ef5b5b432a5f22d1f1915df"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a344230cadfc5d315752add6ce9d4cfcfc6c85e36bbf57fce9444bcc7c6ea8fb"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:57bff9bde0b6b05b00c6acbb1a94357caddb2908ed7026a48c715ff50d220335"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e29a3c2037761fa816aa556e78364dfc8e3f44b873db2d17aed96f9b06ac83a3"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2aa2a4a84029625bf9c63771f8a628db1f3be2d2ea3cb8b17942cd4317797152"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd9fa00971ecf059bb358085a942ecac5be4ff71acdf299f44c8cbc45c18659f"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:af4adac92fb95671ea3a24f2f8e5e5e8f638711ce9c33a3ca6cd68bf1ff7d99f"}, - {file = "dulwich-0.20.50.tar.gz", hash = "sha256:50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be"}, -] - -[package.dependencies] -urllib3 = ">=1.25" - -[package.extras] -fastimport = ["fastimport"] -https = ["urllib3 (>=1.24.1)"] -paramiko = ["paramiko"] -pgp = ["gpg"] - -[[package]] -name = "exceptiongroup" -version = "1.1.1" -description = "Backport of PEP 654 (exception groups)" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, -] - -[package.extras] -test = ["pytest (>=6)"] - -[[package]] -name = "execnet" -version = "1.9.0" -description = "execnet: rapid multi-Python deployment" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"}, - {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"}, -] - -[package.extras] -testing = ["pre-commit"] - -[[package]] -name = "filelock" -version = "3.12.0" -description = "A platform independent file lock." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "filelock-3.12.0-py3-none-any.whl", hash = "sha256:ad98852315c2ab702aeb628412cbf7e95b7ce8c3bf9565670b4eaecf1db370a9"}, - {file = "filelock-3.12.0.tar.gz", hash = "sha256:fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718"}, -] - -[package.extras] -docs = ["furo (>=2023.3.27)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "flatdict" -version = "4.0.1" -description = "Python module for interacting with nested dicts as a single level dict with delimited keys." -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "flatdict-4.0.1.tar.gz", hash = "sha256:cd32f08fd31ed21eb09ebc76f06b6bd12046a24f77beb1fd0281917e47f26742"}, -] - -[[package]] -name = "html5lib" -version = "1.1" -description = "HTML parser based on the WHATWG HTML specification" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"}, - {file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"}, -] - -[package.dependencies] -six = ">=1.9" -webencodings = "*" - -[package.extras] -all = ["chardet (>=2.2)", "genshi", "lxml"] -chardet = ["chardet (>=2.2)"] -genshi = ["genshi"] -lxml = ["lxml"] - -[[package]] -name = "httpretty" -version = "1.1.4" -description = "HTTP client mock for Python" -category = "dev" -optional = false -python-versions = ">=3" -files = [ - {file = "httpretty-1.1.4.tar.gz", hash = "sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"}, -] - -[[package]] -name = "identify" -version = "2.5.23" -description = "File identification library for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "identify-2.5.23-py2.py3-none-any.whl", hash = "sha256:17d9351c028a781456965e781ed2a435755cac655df1ebd930f7186b54399312"}, - {file = "identify-2.5.23.tar.gz", hash = "sha256:50b01b9d5f73c6b53e5fa2caf9f543d3e657a9d0bbdeb203ebb8d45960ba7433"}, -] - -[package.extras] -license = ["ukkonen"] - -[[package]] -name = "idna" -version = "3.4" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" -files = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] - -[[package]] -name = "importlib-metadata" -version = "4.13.0" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "importlib_metadata-4.13.0-py3-none-any.whl", hash = "sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116"}, - {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"}, -] - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -perf = ["ipython"] -testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"] - -[[package]] -name = "importlib-resources" -version = "5.12.0" -description = "Read resources from Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "importlib_resources-5.12.0-py3-none-any.whl", hash = "sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a"}, - {file = "importlib_resources-5.12.0.tar.gz", hash = "sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6"}, -] - -[package.dependencies] -zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "iniconfig" -version = "2.0.0" -description = "brain-dead simple config-ini parsing" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, - {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, -] - -[[package]] -name = "jaraco-classes" -version = "3.2.3" -description = "Utility functions for Python class constructs" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jaraco.classes-3.2.3-py3-none-any.whl", hash = "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158"}, - {file = "jaraco.classes-3.2.3.tar.gz", hash = "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a"}, -] - -[package.dependencies] -more-itertools = "*" - -[package.extras] -docs = ["jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "jeepney" -version = "0.8.0" -description = "Low-level, pure Python DBus protocol wrapper." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jeepney-0.8.0-py3-none-any.whl", hash = "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755"}, - {file = "jeepney-0.8.0.tar.gz", hash = "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"}, -] - -[package.extras] -test = ["async-timeout", "pytest", "pytest-asyncio (>=0.17)", "pytest-trio", "testpath", "trio"] -trio = ["async_generator", "trio"] - -[[package]] -name = "jsonschema" -version = "4.17.3" -description = "An implementation of JSON Schema validation for Python" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jsonschema-4.17.3-py3-none-any.whl", hash = "sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6"}, - {file = "jsonschema-4.17.3.tar.gz", hash = "sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d"}, -] - -[package.dependencies] -attrs = ">=17.4.0" -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} -pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""} -pyrsistent = ">=0.14.0,<0.17.0 || >0.17.0,<0.17.1 || >0.17.1,<0.17.2 || >0.17.2" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"] -format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] - -[[package]] -name = "keyring" -version = "23.13.1" -description = "Store and access your passwords safely." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "keyring-23.13.1-py3-none-any.whl", hash = "sha256:771ed2a91909389ed6148631de678f82ddc73737d85a927f382a8a1b157898cd"}, - {file = "keyring-23.13.1.tar.gz", hash = "sha256:ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=4.11.4", markers = "python_version < \"3.12\""} -importlib-resources = {version = "*", markers = "python_version < \"3.9\""} -"jaraco.classes" = "*" -jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} -pywin32-ctypes = {version = ">=0.2.0", markers = "sys_platform == \"win32\""} -SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""} - -[package.extras] -completion = ["shtab"] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "lockfile" -version = "0.12.2" -description = "Platform-independent file locking module" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, - {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, -] - -[[package]] -name = "more-itertools" -version = "9.1.0" -description = "More routines for operating on iterables, beyond itertools" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "more-itertools-9.1.0.tar.gz", hash = "sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d"}, - {file = "more_itertools-9.1.0-py3-none-any.whl", hash = "sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3"}, -] - -[[package]] -name = "msgpack" -version = "1.0.5" -description = "MessagePack serializer" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:525228efd79bb831cf6830a732e2e80bc1b05436b086d4264814b4b2955b2fa9"}, - {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4f8d8b3bf1ff2672567d6b5c725a1b347fe838b912772aa8ae2bf70338d5a198"}, - {file = "msgpack-1.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cdc793c50be3f01106245a61b739328f7dccc2c648b501e237f0699fe1395b81"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5cb47c21a8a65b165ce29f2bec852790cbc04936f502966768e4aae9fa763cb7"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e42b9594cc3bf4d838d67d6ed62b9e59e201862a25e9a157019e171fbe672dd3"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:55b56a24893105dc52c1253649b60f475f36b3aa0fc66115bffafb624d7cb30b"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1967f6129fc50a43bfe0951c35acbb729be89a55d849fab7686004da85103f1c"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20a97bf595a232c3ee6d57ddaadd5453d174a52594bf9c21d10407e2a2d9b3bd"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d25dd59bbbbb996eacf7be6b4ad082ed7eacc4e8f3d2df1ba43822da9bfa122a"}, - {file = "msgpack-1.0.5-cp310-cp310-win32.whl", hash = "sha256:382b2c77589331f2cb80b67cc058c00f225e19827dbc818d700f61513ab47bea"}, - {file = "msgpack-1.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:4867aa2df9e2a5fa5f76d7d5565d25ec76e84c106b55509e78c1ede0f152659a"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9f5ae84c5c8a857ec44dc180a8b0cc08238e021f57abdf51a8182e915e6299f0"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9e6ca5d5699bcd89ae605c150aee83b5321f2115695e741b99618f4856c50898"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5494ea30d517a3576749cad32fa27f7585c65f5f38309c88c6d137877fa28a5a"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ab2f3331cb1b54165976a9d976cb251a83183631c88076613c6c780f0d6e45a"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28592e20bbb1620848256ebc105fc420436af59515793ed27d5c77a217477705"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe5c63197c55bce6385d9aee16c4d0641684628f63ace85f73571e65ad1c1e8d"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ed40e926fa2f297e8a653c954b732f125ef97bdd4c889f243182299de27e2aa9"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b2de4c1c0538dcb7010902a2b97f4e00fc4ddf2c8cda9749af0e594d3b7fa3d7"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bf22a83f973b50f9d38e55c6aade04c41ddda19b00c4ebc558930d78eecc64ed"}, - {file = "msgpack-1.0.5-cp311-cp311-win32.whl", hash = "sha256:c396e2cc213d12ce017b686e0f53497f94f8ba2b24799c25d913d46c08ec422c"}, - {file = "msgpack-1.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c4c68d87497f66f96d50142a2b73b97972130d93677ce930718f68828b382e2"}, - {file = "msgpack-1.0.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a2b031c2e9b9af485d5e3c4520f4220d74f4d222a5b8dc8c1a3ab9448ca79c57"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f837b93669ce4336e24d08286c38761132bc7ab29782727f8557e1eb21b2080"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1d46dfe3832660f53b13b925d4e0fa1432b00f5f7210eb3ad3bb9a13c6204a6"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:366c9a7b9057e1547f4ad51d8facad8b406bab69c7d72c0eb6f529cf76d4b85f"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4c075728a1095efd0634a7dccb06204919a2f67d1893b6aa8e00497258bf926c"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:f933bbda5a3ee63b8834179096923b094b76f0c7a73c1cfe8f07ad608c58844b"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:36961b0568c36027c76e2ae3ca1132e35123dcec0706c4b7992683cc26c1320c"}, - {file = "msgpack-1.0.5-cp36-cp36m-win32.whl", hash = "sha256:b5ef2f015b95f912c2fcab19c36814963b5463f1fb9049846994b007962743e9"}, - {file = "msgpack-1.0.5-cp36-cp36m-win_amd64.whl", hash = "sha256:288e32b47e67f7b171f86b030e527e302c91bd3f40fd9033483f2cacc37f327a"}, - {file = "msgpack-1.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:137850656634abddfb88236008339fdaba3178f4751b28f270d2ebe77a563b6c"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c05a4a96585525916b109bb85f8cb6511db1c6f5b9d9cbcbc940dc6b4be944b"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56a62ec00b636583e5cb6ad313bbed36bb7ead5fa3a3e38938503142c72cba4f"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef8108f8dedf204bb7b42994abf93882da1159728a2d4c5e82012edd92c9da9f"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1835c84d65f46900920b3708f5ba829fb19b1096c1800ad60bae8418652a951d"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e57916ef1bd0fee4f21c4600e9d1da352d8816b52a599c46460e93a6e9f17086"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:17358523b85973e5f242ad74aa4712b7ee560715562554aa2134d96e7aa4cbbf"}, - {file = "msgpack-1.0.5-cp37-cp37m-win32.whl", hash = "sha256:cb5aaa8c17760909ec6cb15e744c3ebc2ca8918e727216e79607b7bbce9c8f77"}, - {file = "msgpack-1.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:ab31e908d8424d55601ad7075e471b7d0140d4d3dd3272daf39c5c19d936bd82"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b72d0698f86e8d9ddf9442bdedec15b71df3598199ba33322d9711a19f08145c"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:379026812e49258016dd84ad79ac8446922234d498058ae1d415f04b522d5b2d"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:332360ff25469c346a1c5e47cbe2a725517919892eda5cfaffe6046656f0b7bb"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:476a8fe8fae289fdf273d6d2a6cb6e35b5a58541693e8f9f019bfe990a51e4ba"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9985b214f33311df47e274eb788a5893a761d025e2b92c723ba4c63936b69b1"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48296af57cdb1d885843afd73c4656be5c76c0c6328db3440c9601a98f303d87"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:addab7e2e1fcc04bd08e4eb631c2a90960c340e40dfc4a5e24d2ff0d5a3b3edb"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:916723458c25dfb77ff07f4c66aed34e47503b2eb3188b3adbec8d8aa6e00f48"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:821c7e677cc6acf0fd3f7ac664c98803827ae6de594a9f99563e48c5a2f27eb0"}, - {file = "msgpack-1.0.5-cp38-cp38-win32.whl", hash = "sha256:1c0f7c47f0087ffda62961d425e4407961a7ffd2aa004c81b9c07d9269512f6e"}, - {file = "msgpack-1.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:bae7de2026cbfe3782c8b78b0db9cbfc5455e079f1937cb0ab8d133496ac55e1"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:20c784e66b613c7f16f632e7b5e8a1651aa5702463d61394671ba07b2fc9e025"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:266fa4202c0eb94d26822d9bfd7af25d1e2c088927fe8de9033d929dd5ba24c5"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:18334484eafc2b1aa47a6d42427da7fa8f2ab3d60b674120bce7a895a0a85bdd"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57e1f3528bd95cc44684beda696f74d3aaa8a5e58c816214b9046512240ef437"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:586d0d636f9a628ddc6a17bfd45aa5b5efaf1606d2b60fa5d87b8986326e933f"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a740fa0e4087a734455f0fc3abf5e746004c9da72fbd541e9b113013c8dc3282"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3055b0455e45810820db1f29d900bf39466df96ddca11dfa6d074fa47054376d"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:a61215eac016f391129a013c9e46f3ab308db5f5ec9f25811e811f96962599a8"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:362d9655cd369b08fda06b6657a303eb7172d5279997abe094512e919cf74b11"}, - {file = "msgpack-1.0.5-cp39-cp39-win32.whl", hash = "sha256:ac9dd47af78cae935901a9a500104e2dea2e253207c924cc95de149606dc43cc"}, - {file = "msgpack-1.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:06f5174b5f8ed0ed919da0e62cbd4ffde676a374aba4020034da05fab67b9164"}, - {file = "msgpack-1.0.5.tar.gz", hash = "sha256:c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c"}, -] - -[[package]] -name = "mypy" -version = "1.2.0" -description = "Optional static typing for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "mypy-1.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:701189408b460a2ff42b984e6bd45c3f41f0ac9f5f58b8873bbedc511900086d"}, - {file = "mypy-1.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fe91be1c51c90e2afe6827601ca14353bbf3953f343c2129fa1e247d55fd95ba"}, - {file = "mypy-1.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d26b513225ffd3eacece727f4387bdce6469192ef029ca9dd469940158bc89e"}, - {file = "mypy-1.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3a2d219775a120581a0ae8ca392b31f238d452729adbcb6892fa89688cb8306a"}, - {file = "mypy-1.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:2e93a8a553e0394b26c4ca683923b85a69f7ccdc0139e6acd1354cc884fe0128"}, - {file = "mypy-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3efde4af6f2d3ccf58ae825495dbb8d74abd6d176ee686ce2ab19bd025273f41"}, - {file = "mypy-1.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:695c45cea7e8abb6f088a34a6034b1d273122e5530aeebb9c09626cea6dca4cb"}, - {file = "mypy-1.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0e9464a0af6715852267bf29c9553e4555b61f5904a4fc538547a4d67617937"}, - {file = "mypy-1.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8293a216e902ac12779eb7a08f2bc39ec6c878d7c6025aa59464e0c4c16f7eb9"}, - {file = "mypy-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:f46af8d162f3d470d8ffc997aaf7a269996d205f9d746124a179d3abe05ac602"}, - {file = "mypy-1.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:031fc69c9a7e12bcc5660b74122ed84b3f1c505e762cc4296884096c6d8ee140"}, - {file = "mypy-1.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:390bc685ec209ada4e9d35068ac6988c60160b2b703072d2850457b62499e336"}, - {file = "mypy-1.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4b41412df69ec06ab141808d12e0bf2823717b1c363bd77b4c0820feaa37249e"}, - {file = "mypy-1.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4e4a682b3f2489d218751981639cffc4e281d548f9d517addfd5a2917ac78119"}, - {file = "mypy-1.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a197ad3a774f8e74f21e428f0de7f60ad26a8d23437b69638aac2764d1e06a6a"}, - {file = "mypy-1.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c9a084bce1061e55cdc0493a2ad890375af359c766b8ac311ac8120d3a472950"}, - {file = "mypy-1.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaeaa0888b7f3ccb7bcd40b50497ca30923dba14f385bde4af78fac713d6d6f6"}, - {file = "mypy-1.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bea55fc25b96c53affab852ad94bf111a3083bc1d8b0c76a61dd101d8a388cf5"}, - {file = "mypy-1.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:4c8d8c6b80aa4a1689f2a179d31d86ae1367ea4a12855cc13aa3ba24bb36b2d8"}, - {file = "mypy-1.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:70894c5345bea98321a2fe84df35f43ee7bb0feec117a71420c60459fc3e1eed"}, - {file = "mypy-1.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4a99fe1768925e4a139aace8f3fb66db3576ee1c30b9c0f70f744ead7e329c9f"}, - {file = "mypy-1.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:023fe9e618182ca6317ae89833ba422c411469156b690fde6a315ad10695a521"}, - {file = "mypy-1.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d19f1a239d59f10fdc31263d48b7937c585810288376671eaf75380b074f238"}, - {file = "mypy-1.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:2de7babe398cb7a85ac7f1fd5c42f396c215ab3eff731b4d761d68d0f6a80f48"}, - {file = "mypy-1.2.0-py3-none-any.whl", hash = "sha256:d8e9187bfcd5ffedbe87403195e1fc340189a68463903c39e2b63307c9fa0394"}, - {file = "mypy-1.2.0.tar.gz", hash = "sha256:f70a40410d774ae23fcb4afbbeca652905a04de7948eaf0b1789c8d1426b72d1"}, -] - -[package.dependencies] -mypy-extensions = ">=1.0.0" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""} -typing-extensions = ">=3.10" - -[package.extras] -dmypy = ["psutil (>=4.0)"] -install-types = ["pip"] -python2 = ["typed-ast (>=1.4.0,<2)"] -reports = ["lxml"] - -[[package]] -name = "mypy-extensions" -version = "1.0.0" -description = "Type system extensions for programs checked with the mypy type checker." -category = "dev" -optional = false -python-versions = ">=3.5" -files = [ - {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, - {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, -] - -[[package]] -name = "nodeenv" -version = "1.7.0" -description = "Node.js virtual environment builder" -category = "dev" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" -files = [ - {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"}, - {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"}, -] - -[package.dependencies] -setuptools = "*" - -[[package]] -name = "ordered-set" -version = "4.1.0" -description = "An OrderedSet is a custom MutableSet that remembers its order, so that every" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "ordered-set-4.1.0.tar.gz", hash = "sha256:694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8"}, - {file = "ordered_set-4.1.0-py3-none-any.whl", hash = "sha256:046e1132c71fcf3330438a539928932caf51ddbc582496833e23de611de14562"}, -] - -[package.extras] -dev = ["black", "mypy", "pytest"] - -[[package]] -name = "packaging" -version = "23.1" -description = "Core utilities for Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"}, - {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"}, -] - -[[package]] -name = "pexpect" -version = "4.8.0" -description = "Pexpect allows easy control of interactive console applications." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, - {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, -] - -[package.dependencies] -ptyprocess = ">=0.5" - -[[package]] -name = "pkginfo" -version = "1.9.6" -description = "Query metadata from sdists / bdists / installed packages." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkginfo-1.9.6-py3-none-any.whl", hash = "sha256:4b7a555a6d5a22169fcc9cf7bfd78d296b0361adad412a346c1226849af5e546"}, - {file = "pkginfo-1.9.6.tar.gz", hash = "sha256:8fd5896e8718a4372f0ea9cc9d96f6417c9b986e23a4d116dda26b62cc29d046"}, -] - -[package.extras] -testing = ["pytest", "pytest-cov"] - -[[package]] -name = "pkgutil-resolve-name" -version = "1.3.10" -description = "Resolve a name to an object." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"}, - {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"}, -] - -[[package]] -name = "platformdirs" -version = "2.6.2" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"}, - {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"}, -] - -[package.dependencies] -typing-extensions = {version = ">=4.4", markers = "python_version < \"3.8\""} - -[package.extras] -docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] - -[[package]] -name = "pluggy" -version = "1.0.0" -description = "plugin and hook calling mechanisms for python" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} - -[package.extras] -dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] - -[[package]] -name = "poetry-core" -version = "1.4.0" -description = "Poetry PEP 517 Build Backend" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "poetry_core-1.4.0-py3-none-any.whl", hash = "sha256:5559ab80384ac021db329ef317086417e140ee1176bcfcb3a3838b544e213c8e"}, - {file = "poetry_core-1.4.0.tar.gz", hash = "sha256:514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""} - -[[package]] -name = "poetry-plugin-export" -version = "1.3.1" -description = "Poetry plugin to export the dependencies to various formats" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "poetry_plugin_export-1.3.1-py3-none-any.whl", hash = "sha256:941d7ba02a59671d6327b16dc6deecc9262477abbc120d728a500cf125bc1e06"}, - {file = "poetry_plugin_export-1.3.1.tar.gz", hash = "sha256:d949742757a8a5f0b5810495bffaf4ed8a767f2e2ffda9887cf72f896deabf84"}, -] - -[package.dependencies] -poetry = ">=1.3.0,<2.0.0" -poetry-core = ">=1.3.0,<2.0.0" - -[[package]] -name = "pre-commit" -version = "2.21.0" -description = "A framework for managing and maintaining multi-language pre-commit hooks." -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"}, - {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"}, -] - -[package.dependencies] -cfgv = ">=2.0.0" -identify = ">=1.0.0" -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} -nodeenv = ">=0.11.1" -pyyaml = ">=5.1" -virtualenv = ">=20.10.0" - -[[package]] -name = "psutil" -version = "5.9.5" -description = "Cross-platform lib for process and system monitoring in Python." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"}, - {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"}, - {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"}, - {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"}, - {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"}, - {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"}, - {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"}, - {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"}, -] - -[package.extras] -test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] - -[[package]] -name = "ptyprocess" -version = "0.7.0" -description = "Run a subprocess in a pseudo terminal" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, - {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, -] - -[[package]] -name = "py" -version = "1.11.0" -description = "library with cross-python path, ini-parsing, io, code, log facilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, - {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, -] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] - -[[package]] -name = "pyrsistent" -version = "0.19.3" -description = "Persistent/Functional/Immutable data structures" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pyrsistent-0.19.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:20460ac0ea439a3e79caa1dbd560344b64ed75e85d8703943e0b66c2a6150e4a"}, - {file = "pyrsistent-0.19.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c18264cb84b5e68e7085a43723f9e4c1fd1d935ab240ce02c0324a8e01ccb64"}, - {file = "pyrsistent-0.19.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b774f9288dda8d425adb6544e5903f1fb6c273ab3128a355c6b972b7df39dcf"}, - {file = "pyrsistent-0.19.3-cp310-cp310-win32.whl", hash = "sha256:5a474fb80f5e0d6c9394d8db0fc19e90fa540b82ee52dba7d246a7791712f74a"}, - {file = "pyrsistent-0.19.3-cp310-cp310-win_amd64.whl", hash = "sha256:49c32f216c17148695ca0e02a5c521e28a4ee6c5089f97e34fe24163113722da"}, - {file = "pyrsistent-0.19.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f0774bf48631f3a20471dd7c5989657b639fd2d285b861237ea9e82c36a415a9"}, - {file = "pyrsistent-0.19.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ab2204234c0ecd8b9368dbd6a53e83c3d4f3cab10ecaf6d0e772f456c442393"}, - {file = "pyrsistent-0.19.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e42296a09e83028b3476f7073fcb69ffebac0e66dbbfd1bd847d61f74db30f19"}, - {file = "pyrsistent-0.19.3-cp311-cp311-win32.whl", hash = "sha256:64220c429e42a7150f4bfd280f6f4bb2850f95956bde93c6fda1b70507af6ef3"}, - {file = "pyrsistent-0.19.3-cp311-cp311-win_amd64.whl", hash = "sha256:016ad1afadf318eb7911baa24b049909f7f3bb2c5b1ed7b6a8f21db21ea3faa8"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c4db1bd596fefd66b296a3d5d943c94f4fac5bcd13e99bffe2ba6a759d959a28"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aeda827381f5e5d65cced3024126529ddc4289d944f75e090572c77ceb19adbf"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:42ac0b2f44607eb92ae88609eda931a4f0dfa03038c44c772e07f43e738bcac9"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-win32.whl", hash = "sha256:e8f2b814a3dc6225964fa03d8582c6e0b6650d68a232df41e3cc1b66a5d2f8d1"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-win_amd64.whl", hash = "sha256:c9bb60a40a0ab9aba40a59f68214eed5a29c6274c83b2cc206a359c4a89fa41b"}, - {file = "pyrsistent-0.19.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a2471f3f8693101975b1ff85ffd19bb7ca7dd7c38f8a81701f67d6b4f97b87d8"}, - {file = "pyrsistent-0.19.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc5d149f31706762c1f8bda2e8c4f8fead6e80312e3692619a75301d3dbb819a"}, - {file = "pyrsistent-0.19.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3311cb4237a341aa52ab8448c27e3a9931e2ee09561ad150ba94e4cfd3fc888c"}, - {file = "pyrsistent-0.19.3-cp38-cp38-win32.whl", hash = "sha256:f0e7c4b2f77593871e918be000b96c8107da48444d57005b6a6bc61fb4331b2c"}, - {file = "pyrsistent-0.19.3-cp38-cp38-win_amd64.whl", hash = "sha256:c147257a92374fde8498491f53ffa8f4822cd70c0d85037e09028e478cababb7"}, - {file = "pyrsistent-0.19.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b735e538f74ec31378f5a1e3886a26d2ca6351106b4dfde376a26fc32a044edc"}, - {file = "pyrsistent-0.19.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99abb85579e2165bd8522f0c0138864da97847875ecbd45f3e7e2af569bfc6f2"}, - {file = "pyrsistent-0.19.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a8cb235fa6d3fd7aae6a4f1429bbb1fec1577d978098da1252f0489937786f3"}, - {file = "pyrsistent-0.19.3-cp39-cp39-win32.whl", hash = "sha256:c74bed51f9b41c48366a286395c67f4e894374306b197e62810e0fdaf2364da2"}, - {file = "pyrsistent-0.19.3-cp39-cp39-win_amd64.whl", hash = "sha256:878433581fc23e906d947a6814336eee031a00e6defba224234169ae3d3d6a98"}, - {file = "pyrsistent-0.19.3-py3-none-any.whl", hash = "sha256:ccf0d6bd208f8111179f0c26fdf84ed7c3891982f2edaeae7422575f47e66b64"}, - {file = "pyrsistent-0.19.3.tar.gz", hash = "sha256:1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440"}, -] - -[[package]] -name = "pytest" -version = "7.3.1" -description = "pytest: simple powerful testing with Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-7.3.1-py3-none-any.whl", hash = "sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362"}, - {file = "pytest-7.3.1.tar.gz", hash = "sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} -iniconfig = "*" -packaging = "*" -pluggy = ">=0.12,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} - -[package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] - -[[package]] -name = "pytest-cov" -version = "4.0.0" -description = "Pytest plugin for measuring coverage." -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"}, - {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"}, -] - -[package.dependencies] -coverage = {version = ">=5.2.1", extras = ["toml"]} -pytest = ">=4.6" - -[package.extras] -testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] - -[[package]] -name = "pytest-forked" -version = "1.6.0" -description = "run tests in isolated forked subprocesses" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-forked-1.6.0.tar.gz", hash = "sha256:4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f"}, - {file = "pytest_forked-1.6.0-py3-none-any.whl", hash = "sha256:810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0"}, -] - -[package.dependencies] -py = "*" -pytest = ">=3.10" - -[[package]] -name = "pytest-github-actions-annotate-failures" -version = "0.1.8" -description = "pytest plugin to annotate failed tests with a workflow command for GitHub Actions" -category = "dev" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" -files = [ - {file = "pytest-github-actions-annotate-failures-0.1.8.tar.gz", hash = "sha256:2d6e6cb5f8d0aae4a27a20cc4e20fabd3199a121c57f44bc48fe28e372e0be23"}, - {file = "pytest_github_actions_annotate_failures-0.1.8-py2.py3-none-any.whl", hash = "sha256:6a882ff21672fa79deae8d917eb965a6bde2b25191e7632e1adfc23ffac008ab"}, -] - -[package.dependencies] -pytest = ">=4.0.0" - -[[package]] -name = "pytest-mock" -version = "3.10.0" -description = "Thin-wrapper around the mock package for easier use with pytest" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-mock-3.10.0.tar.gz", hash = "sha256:fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f"}, - {file = "pytest_mock-3.10.0-py3-none-any.whl", hash = "sha256:f4c973eeae0282963eb293eb173ce91b091a79c1334455acfac9ddee8a1c784b"}, -] - -[package.dependencies] -pytest = ">=5.0" - -[package.extras] -dev = ["pre-commit", "pytest-asyncio", "tox"] - -[[package]] -name = "pytest-randomly" -version = "3.12.0" -description = "Pytest plugin to randomly order tests and control random.seed." -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-randomly-3.12.0.tar.gz", hash = "sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2"}, - {file = "pytest_randomly-3.12.0-py3-none-any.whl", hash = "sha256:f4f2e803daf5d1ba036cc22bf4fe9dbbf99389ec56b00e5cba732fb5c1d07fdd"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=3.6.0", markers = "python_version < \"3.10\""} -pytest = "*" - -[[package]] -name = "pytest-xdist" -version = "2.5.0" -description = "pytest xdist plugin for distributed testing and loop-on-failing modes" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"}, - {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"}, -] - -[package.dependencies] -execnet = ">=1.1" -psutil = {version = ">=3.0", optional = true, markers = "extra == \"psutil\""} -pytest = ">=6.2.0" -pytest-forked = "*" - -[package.extras] -psutil = ["psutil (>=3.0)"] -setproctitle = ["setproctitle"] -testing = ["filelock"] - -[[package]] -name = "pywin32-ctypes" -version = "0.2.0" -description = "" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, - {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, -] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] - -[[package]] -name = "rapidfuzz" -version = "2.15.1" -description = "rapid fuzzy string matching" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fc0bc259ebe3b93e7ce9df50b3d00e7345335d35acbd735163b7c4b1957074d3"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d59fb3a410d253f50099d7063855c2b95df1ef20ad93ea3a6b84115590899f25"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c525a3da17b6d79d61613096c8683da86e3573e807dfaecf422eea09e82b5ba6"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4deae6a918ecc260d0c4612257be8ba321d8e913ccb43155403842758c46fbe"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2577463d10811386e704a3ab58b903eb4e2a31b24dfd9886d789b0084d614b01"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f67d5f56aa48c0da9de4ab81bffb310683cf7815f05ea38e5aa64f3ba4368339"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d7927722ff43690e52b3145b5bd3089151d841d350c6f8378c3cfac91f67573a"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6534afc787e32c4104f65cdeb55f6abe4d803a2d0553221d00ef9ce12788dcde"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d0ae6ec79a1931929bb9dd57bc173eb5ba4c7197461bf69e3a34b6dd314feed2"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:be7ccc45c4d1a7dfb595f260e8022a90c6cb380c2a346ee5aae93f85c96d362b"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:8ba013500a2b68c64b2aecc5fb56a2dad6c2872cf545a0308fd044827b6e5f6a"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:4d9f7d10065f657f960b48699e7dddfce14ab91af4bab37a215f0722daf0d716"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7e24a1b802cea04160b3fccd75d2d0905065783ebc9de157d83c14fb9e1c6ce2"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win32.whl", hash = "sha256:dffdf03499e0a5b3442951bb82b556333b069e0661e80568752786c79c5b32de"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:7d150d90a7c6caae7962f29f857a4e61d42038cfd82c9df38508daf30c648ae7"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win_arm64.whl", hash = "sha256:87c30e9184998ff6eb0fa9221f94282ce7c908fd0da96a1ef66ecadfaaa4cdb7"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6986413cb37035eb796e32f049cbc8c13d8630a4ac1e0484e3e268bb3662bd1b"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a72f26e010d4774b676f36e43c0fc8a2c26659efef4b3be3fd7714d3491e9957"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b5cd54c98a387cca111b3b784fc97a4f141244bbc28a92d4bde53f164464112e"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da7fac7c3da39f93e6b2ebe386ed0ffe1cefec91509b91857f6e1204509e931f"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f976e76ac72f650790b3a5402431612175b2ac0363179446285cb3c901136ca9"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:abde47e1595902a490ed14d4338d21c3509156abb2042a99e6da51f928e0c117"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca8f1747007a3ce919739a60fa95c5325f7667cccf6f1c1ef18ae799af119f5e"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c35da09ab9797b020d0d4f07a66871dfc70ea6566363811090353ea971748b5a"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a3a769ca7580686a66046b77df33851b3c2d796dc1eb60c269b68f690f3e1b65"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d50622efefdb03a640a51a6123748cd151d305c1f0431af762e833d6ffef71f0"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b7461b0a7651d68bc23f0896bffceea40f62887e5ab8397bf7caa883592ef5cb"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:074ee9e17912e025c72a5780ee4c7c413ea35cd26449719cc399b852d4e42533"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7025fb105a11f503943f17718cdb8241ea3bb4d812c710c609e69bead40e2ff0"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win32.whl", hash = "sha256:2084d36b95139413cef25e9487257a1cc892b93bd1481acd2a9656f7a1d9930c"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:5a738fcd24e34bce4b19126b92fdae15482d6d3a90bd687fd3d24ce9d28ce82d"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win_arm64.whl", hash = "sha256:dc3cafa68cfa54638632bdcadf9aab89a3d182b4a3f04d2cad7585ed58ea8731"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3c53d57ba7a88f7bf304d4ea5a14a0ca112db0e0178fff745d9005acf2879f7d"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6ee758eec4cf2215dc8d8eafafcea0d1f48ad4b0135767db1b0f7c5c40a17dd"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d93ba3ae59275e7a3a116dac4ffdb05e9598bf3ee0861fecc5b60fb042d539e"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c3ff75e647908ddbe9aa917fbe39a112d5631171f3fcea5809e2363e525a59d"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6d89c421702474c6361245b6b199e6e9783febacdbfb6b002669e6cb3ef17a09"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f69e6199fec0f58f9a89afbbaea78d637c7ce77f656a03a1d6ea6abdc1d44f8"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:41dfea282844d0628279b4db2929da0dacb8ac317ddc5dcccc30093cf16357c1"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2dd03477feefeccda07b7659dd614f6738cfc4f9b6779dd61b262a73b0a9a178"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:5efe035aa76ff37d1b5fa661de3c4b4944de9ff227a6c0b2e390a95c101814c0"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ed2cf7c69102c7a0a06926d747ed855bc836f52e8d59a5d1e3adfd980d1bd165"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a0e441d4c2025110ec3eba5d54f11f78183269a10152b3a757a739ffd1bb12bf"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-win32.whl", hash = "sha256:a4a54efe17cc9f53589c748b53f28776dfdfb9bc83619685740cb7c37985ac2f"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:bb8318116ecac4dfb84841d8b9b461f9bb0c3be5b616418387d104f72d2a16d1"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e9296c530e544f68858c3416ad1d982a1854f71e9d2d3dcedb5b216e6d54f067"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:49c4bcdb9238f11f8c4eba1b898937f09b92280d6f900023a8216008f299b41a"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ebb40a279e134bb3fef099a8b58ed5beefb201033d29bdac005bddcdb004ef71"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a7381c11cb590bbd4e6f2d8779a0b34fdd2234dfa13d0211f6aee8ca166d9d05"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfdcdedfd12a0077193f2cf3626ff6722c5a184adf0d2d51f1ec984bf21c23c3"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f85bece1ec59bda8b982bd719507d468d4df746dfb1988df11d916b5e9fe19e8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b393f4a1eaa6867ffac6aef58cfb04bab2b3d7d8e40b9fe2cf40dd1d384601"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53de456ef020a77bf9d7c6c54860a48e2e902584d55d3001766140ac45c54bc7"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2492330bc38b76ed967eab7bdaea63a89b6ceb254489e2c65c3824efcbf72993"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:099e4c6befaa8957a816bdb67ce664871f10aaec9bebf2f61368cf7e0869a7a1"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:46599b2ad4045dd3f794a24a6db1e753d23304699d4984462cf1ead02a51ddf3"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:591f19d16758a3c55c9d7a0b786b40d95599a5b244d6eaef79c7a74fcf5104d8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ed17359061840eb249f8d833cb213942e8299ffc4f67251a6ed61833a9f2ea20"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-win32.whl", hash = "sha256:aa1e5aad325168e29bf8e17006479b97024aa9d2fdbe12062bd2f8f09080acf8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:c2bb68832b140c551dbed691290bef4ee6719d4e8ce1b7226a3736f61a9d1a83"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3fac40972cf7b6c14dded88ae2331eb50dfbc278aa9195473ef6fc6bfe49f686"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f0e456cbdc0abf39352800309dab82fd3251179fa0ff6573fa117f51f4e84be8"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:22b9d22022b9d09fd4ece15102270ab9b6a5cfea8b6f6d1965c1df7e3783f5ff"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46754fe404a9a6f5cbf7abe02d74af390038d94c9b8c923b3f362467606bfa28"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:91abb8bf7610efe326394adc1d45e1baca8f360e74187f3fa0ef3df80cdd3ba6"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e40a2f60024f9d3c15401e668f732800114a023f3f8d8c40f1521a62081ff054"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a48ee83916401ac73938526d7bd804e01d2a8fe61809df7f1577b0b3b31049a3"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c71580052f9dbac443c02f60484e5a2e5f72ad4351b84b2009fbe345b1f38422"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:82b86d5b8c1b9bcbc65236d75f81023c78d06a721c3e0229889ff4ed5c858169"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:fc4528b7736e5c30bc954022c2cf410889abc19504a023abadbc59cdf9f37cae"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e1e0e569108a5760d8f01d0f2148dd08cc9a39ead79fbefefca9e7c7723c7e88"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:94e1c97f0ad45b05003806f8a13efc1fc78983e52fa2ddb00629003acf4676ef"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47e81767a962e41477a85ad7ac937e34d19a7d2a80be65614f008a5ead671c56"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win32.whl", hash = "sha256:79fc574aaf2d7c27ec1022e29c9c18f83cdaf790c71c05779528901e0caad89b"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:f3dd4bcef2d600e0aa121e19e6e62f6f06f22a89f82ef62755e205ce14727874"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win_arm64.whl", hash = "sha256:cac095cbdf44bc286339a77214bbca6d4d228c9ebae3da5ff6a80aaeb7c35634"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b89d1126be65c85763d56e3b47d75f1a9b7c5529857b4d572079b9a636eaa8a7"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19b7460e91168229768be882ea365ba0ac7da43e57f9416e2cfadc396a7df3c2"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93c33c03e7092642c38f8a15ca2d8fc38da366f2526ec3b46adf19d5c7aa48ba"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:040faca2e26d9dab5541b45ce72b3f6c0e36786234703fc2ac8c6f53bb576743"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:6e2a3b23e1e9aa13474b3c710bba770d0dcc34d517d3dd6f97435a32873e3f28"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2e597b9dfd6dd180982684840975c458c50d447e46928efe3e0120e4ec6f6686"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d14752c9dd2036c5f36ebe8db5f027275fa7d6b3ec6484158f83efb674bab84e"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:558224b6fc6124d13fa32d57876f626a7d6188ba2a97cbaea33a6ee38a867e31"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c89cfa88dc16fd8c9bcc0c7f0b0073f7ef1e27cceb246c9f5a3f7004fa97c4d"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:509c5b631cd64df69f0f011893983eb15b8be087a55bad72f3d616b6ae6a0f96"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0f73a04135a03a6e40393ecd5d46a7a1049d353fc5c24b82849830d09817991f"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c99d53138a2dfe8ada67cb2855719f934af2733d726fbf73247844ce4dd6dd5"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f01fa757f0fb332a1f045168d29b0d005de6c39ee5ce5d6c51f2563bb53c601b"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60368e1add6e550faae65614844c43f8a96e37bf99404643b648bf2dba92c0fb"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:785744f1270828cc632c5a3660409dee9bcaac6931a081bae57542c93e4d46c4"}, - {file = "rapidfuzz-2.15.1.tar.gz", hash = "sha256:d62137c2ca37aea90a11003ad7dc109c8f1739bfbe5a9a217f3cdb07d7ac00f6"}, -] - -[package.extras] -full = ["numpy"] - -[[package]] -name = "requests" -version = "2.29.0" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "requests-2.29.0-py3-none-any.whl", hash = "sha256:e8f3c9be120d3333921d213eef078af392fba3933ab7ed2d1cba3b56f2568c3b"}, - {file = "requests-2.29.0.tar.gz", hash = "sha256:f2e34a75f4749019bb0e3effb66683630e4ffeaf75819fb51bebef1bf5aef059"}, -] - -[package.dependencies] -certifi = ">=2017.4.17" -charset-normalizer = ">=2,<4" -idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] - -[[package]] -name = "requests-toolbelt" -version = "0.10.1" -description = "A utility belt for advanced users of python-requests" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "requests-toolbelt-0.10.1.tar.gz", hash = "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d"}, - {file = "requests_toolbelt-0.10.1-py2.py3-none-any.whl", hash = "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7"}, -] - -[package.dependencies] -requests = ">=2.0.1,<3.0.0" - -[[package]] -name = "secretstorage" -version = "3.3.3" -description = "Python bindings to FreeDesktop.org Secret Service API" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99"}, - {file = "SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"}, -] - -[package.dependencies] -cryptography = ">=2.0" -jeepney = ">=0.6" - -[[package]] -name = "setuptools" -version = "67.7.2" -description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "setuptools-67.7.2-py3-none-any.whl", hash = "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b"}, - {file = "setuptools-67.7.2.tar.gz", hash = "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] - -[[package]] -name = "shellingham" -version = "1.5.0.post1" -description = "Tool to Detect Surrounding Shell" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "shellingham-1.5.0.post1-py2.py3-none-any.whl", hash = "sha256:368bf8c00754fd4f55afb7bbb86e272df77e4dc76ac29dbcbb81a59e9fc15744"}, - {file = "shellingham-1.5.0.post1.tar.gz", hash = "sha256:823bc5fb5c34d60f285b624e7264f4dda254bc803a3774a147bf99c0e3004a28"}, -] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - -[[package]] -name = "tomlkit" -version = "0.11.8" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomlkit-0.11.8-py3-none-any.whl", hash = "sha256:8c726c4c202bdb148667835f68d68780b9a003a9ec34167b6c673b38eff2a171"}, - {file = "tomlkit-0.11.8.tar.gz", hash = "sha256:9330fc7faa1db67b541b28e62018c17d20be733177d290a13b24c62d1614e0c3"}, -] - -[[package]] -name = "trove-classifiers" -version = "2023.4.29" -description = "Canonical source for classifiers on PyPI (pypi.org)." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "trove-classifiers-2023.4.29.tar.gz", hash = "sha256:8adcc06f1eb7c495f0bdceb698bd9c044b3e57b0d5767d99ec4b6b17c9bbe957"}, - {file = "trove_classifiers-2023.4.29-py3-none-any.whl", hash = "sha256:c27d168cd341325fb75338ce46e1c4a2f2179b0ff3df3733190ee3662a25a4fa"}, -] - -[[package]] -name = "typed-ast" -version = "1.5.4" -description = "a fork of Python 2 and 3 ast modules with type comment support" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, - {file = "typed_ast-1.5.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe"}, - {file = "typed_ast-1.5.4-cp310-cp310-win_amd64.whl", hash = "sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72"}, - {file = "typed_ast-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6"}, - {file = "typed_ast-1.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1"}, - {file = "typed_ast-1.5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c"}, - {file = "typed_ast-1.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6"}, - {file = "typed_ast-1.5.4-cp38-cp38-win_amd64.whl", hash = "sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72"}, - {file = "typed_ast-1.5.4-cp39-cp39-win_amd64.whl", hash = "sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1"}, - {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, -] - -[[package]] -name = "types-html5lib" -version = "1.1.11.13" -description = "Typing stubs for html5lib" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-html5lib-1.1.11.13.tar.gz", hash = "sha256:2a5ced934bcc7b47800b88ddb2541bbdf5bded7fb6d421693c978228e1fe631d"}, - {file = "types_html5lib-1.1.11.13-py3-none-any.whl", hash = "sha256:d01603307f3bb39af9712e72eda5aa498420fe12179411533a54b2b03f6531eb"}, -] - -[[package]] -name = "types-jsonschema" -version = "4.17.0.7" -description = "Typing stubs for jsonschema" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-jsonschema-4.17.0.7.tar.gz", hash = "sha256:130e57c5f1ca755f95775d0822ad7a3907294e1461306af54baf804f317fd54c"}, - {file = "types_jsonschema-4.17.0.7-py3-none-any.whl", hash = "sha256:e129b52be6df841d97a98f087631dd558f7812eb91ff7b733c3301bd2446271b"}, -] - -[[package]] -name = "types-requests" -version = "2.29.0.0" -description = "Typing stubs for requests" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-requests-2.29.0.0.tar.gz", hash = "sha256:c86f4a955d943d2457120dbe719df24ef0924e11177164d10a0373cf311d7b4d"}, - {file = "types_requests-2.29.0.0-py3-none-any.whl", hash = "sha256:4cf6e323e856c779fbe8815bb977a5bf5d6c5034713e4c17ff2a9a20610f5b27"}, -] - -[package.dependencies] -types-urllib3 = "<1.27" - -[[package]] -name = "types-urllib3" -version = "1.26.25.12" -description = "Typing stubs for urllib3" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-urllib3-1.26.25.12.tar.gz", hash = "sha256:a1557355ce8d350a555d142589f3001903757d2d36c18a66f588d9659bbc917d"}, - {file = "types_urllib3-1.26.25.12-py3-none-any.whl", hash = "sha256:3ba3d3a8ee46e0d5512c6bd0594da4f10b2584b47a470f8422044a2ab462f1df"}, -] - -[[package]] -name = "typing-extensions" -version = "4.5.0" -description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"}, - {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, -] - -[[package]] -name = "urllib3" -version = "1.26.15" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[[package]] -name = "virtualenv" -version = "20.16.5" -description = "Virtual Python Environment builder" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"}, - {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"}, -] - -[package.dependencies] -distlib = ">=0.3.5,<1" -filelock = ">=3.4.1,<4" -platformdirs = ">=2.4,<3" - -[package.extras] -docs = ["proselint (>=0.13)", "sphinx (>=5.1.1)", "sphinx-argparse (>=0.3.1)", "sphinx-rtd-theme (>=1)", "towncrier (>=21.9)"] -testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "virtualenv" -version = "20.21.1" -description = "Virtual Python Environment builder" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "virtualenv-20.21.1-py3-none-any.whl", hash = "sha256:09ddbe1af0c8ed2bb4d6ed226b9e6415718ad18aef9fa0ba023d96b7a8356049"}, - {file = "virtualenv-20.21.1.tar.gz", hash = "sha256:4c104ccde994f8b108163cf9ba58f3d11511d9403de87fb9b4f52bf33dbc8668"}, -] - -[package.dependencies] -distlib = ">=0.3.6,<1" -filelock = ">=3.4.1,<4" -importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.8\""} -platformdirs = ">=2.4,<4" - -[package.extras] -docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] -test = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.3.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "webencodings" -version = "0.5.1" -description = "Character encoding aliases for legacy web content" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] - -[[package]] -name = "xattr" -version = "0.10.1" -description = "Python wrapper for extended filesystem attributes" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "xattr-0.10.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:16a660a883e703b311d1bbbcafc74fa877585ec081cd96e8dd9302c028408ab1"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1e2973e72faa87ca29d61c23b58c3c89fe102d1b68e091848b0e21a104123503"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:13279fe8f7982e3cdb0e088d5cb340ce9cbe5ef92504b1fd80a0d3591d662f68"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:1dc9b9f580ef4b8ac5e2c04c16b4d5086a611889ac14ecb2e7e87170623a0b75"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:485539262c2b1f5acd6b6ea56e0da2bc281a51f74335c351ea609c23d82c9a79"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:295b3ab335fcd06ca0a9114439b34120968732e3f5e9d16f456d5ec4fa47a0a2"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a126eb38e14a2f273d584a692fe36cff760395bf7fc061ef059224efdb4eb62c"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:b0e919c24f5b74428afa91507b15e7d2ef63aba98e704ad13d33bed1288dca81"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:e31d062cfe1aaeab6ba3db6bd255f012d105271018e647645941d6609376af18"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:209fb84c09b41c2e4cf16dd2f481bb4a6e2e81f659a47a60091b9bcb2e388840"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c4120090dac33eddffc27e487f9c8f16b29ff3f3f8bcb2251b2c6c3f974ca1e1"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3e739d624491267ec5bb740f4eada93491de429d38d2fcdfb97b25efe1288eca"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2677d40b95636f3482bdaf64ed9138fb4d8376fb7933f434614744780e46e42d"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40039f1532c4456fd0f4c54e9d4e01eb8201248c321c6c6856262d87e9a99593"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:148466e5bb168aba98f80850cf976e931469a3c6eb11e9880d9f6f8b1e66bd06"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0aedf55b116beb6427e6f7958ccd80a8cbc80e82f87a4cd975ccb61a8d27b2ee"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c3024a9ff157247c8190dd0eb54db4a64277f21361b2f756319d9d3cf20e475f"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f1be6e733e9698f645dbb98565bb8df9b75e80e15a21eb52787d7d96800e823b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7880c8a54c18bc091a4ce0adc5c6d81da1c748aec2fe7ac586d204d6ec7eca5b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:89c93b42c3ba8aedbc29da759f152731196c2492a2154371c0aae3ef8ba8301b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6b905e808df61b677eb972f915f8a751960284358b520d0601c8cbc476ba2df6"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1ef954d0655f93a34d07d0cc7e02765ec779ff0b59dc898ee08c6326ad614d5"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:199b20301b6acc9022661412346714ce764d322068ef387c4de38062474db76c"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec0956a8ab0f0d3f9011ba480f1e1271b703d11542375ef73eb8695a6bd4b78b"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ffcb57ca1be338d69edad93cf59aac7c6bb4dbb92fd7bf8d456c69ea42f7e6d2"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f0563196ee54756fe2047627d316977dc77d11acd7a07970336e1a711e934db"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc354f086f926a1c7f04886f97880fed1a26d20e3bc338d0d965fd161dbdb8ab"}, - {file = "xattr-0.10.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c0cd2d02ef2fb45ecf2b0da066a58472d54682c6d4f0452dfe7ae2f3a76a42ea"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:49626096ddd72dcc1654aadd84b103577d8424f26524a48d199847b5d55612d0"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ceaa26bef8fcb17eb59d92a7481c2d15d20211e217772fb43c08c859b01afc6a"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8c014c371391f28f8cd27d73ea59f42b30772cd640b5a2538ad4f440fd9190b"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:46c32cd605673606b9388a313b0050ee7877a0640d7561eea243ace4fa2cc5a6"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:772b22c4ff791fe5816a7c2a1c9fcba83f9ab9bea138eb44d4d70f34676232b4"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:183ad611a2d70b5a3f5f7aadef0fcef604ea33dcf508228765fd4ddac2c7321d"}, - {file = "xattr-0.10.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8068df3ebdfa9411e58d5ae4a05d807ec5994645bb01af66ec9f6da718b65c5b"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bc40570155beb85e963ae45300a530223d9822edfdf09991b880e69625ba38a"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:436e1aaf23c07e15bed63115f1712d2097e207214fc6bcde147c1efede37e2c5"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7298455ccf3a922d403339781b10299b858bb5ec76435445f2da46fb768e31a5"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:986c2305c6c1a08f78611eb38ef9f1f47682774ce954efb5a4f3715e8da00d5f"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5dc6099e76e33fa3082a905fe59df766b196534c705cf7a2e3ad9bed2b8a180e"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:042ad818cda6013162c0bfd3816f6b74b7700e73c908cde6768da824686885f8"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9d4c306828a45b41b76ca17adc26ac3dc00a80e01a5ba85d71df2a3e948828f2"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a606280b0c9071ef52572434ecd3648407b20df3d27af02c6592e84486b05894"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5b49d591cf34cda2079fd7a5cb2a7a1519f54dc2e62abe3e0720036f6ed41a85"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b8705ac6791426559c1a5c2b88bb2f0e83dc5616a09b4500899bfff6a929302"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5ea974930e876bc5c146f54ac0f85bb39b7b5de2b6fc63f90364712ae368ebe"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f55a2dd73a12a1ae5113c5d9cd4b4ab6bf7950f4d76d0a1a0c0c4264d50da61d"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:475c38da0d3614cc5564467c4efece1e38bd0705a4dbecf8deeb0564a86fb010"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:925284a4a28e369459b2b7481ea22840eed3e0573a4a4c06b6b0614ecd27d0a7"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa32f1b45fed9122bed911de0fcc654da349e1f04fa4a9c8ef9b53e1cc98b91e"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c5d3d0e728bace64b74c475eb4da6148cd172b2d23021a1dcd055d92f17619ac"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8faaacf311e2b5cc67c030c999167a78a9906073e6abf08eaa8cf05b0416515c"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:cc6b8d5ca452674e1a96e246a3d2db5f477aecbc7c945c73f890f56323e75203"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3725746a6502f40f72ef27e0c7bfc31052a239503ff3eefa807d6b02a249be22"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:789bd406d1aad6735e97b20c6d6a1701e1c0661136be9be862e6a04564da771f"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9a7a807ab538210ff8532220d8fc5e2d51c212681f63dbd4e7ede32543b070f"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3e5825b5fc99ecdd493b0cc09ec35391e7a451394fdf623a88b24726011c950d"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80638d1ce7189dc52f26c234cee3522f060fadab6a8bc3562fe0ddcbe11ba5a4"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3ff0dbe4a6ce2ce065c6de08f415bcb270ecfd7bf1655a633ddeac695ce8b250"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5267e5f9435c840d2674194150b511bef929fa7d3bc942a4a75b9eddef18d8d8"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b27dfc13b193cb290d5d9e62f806bb9a99b00cd73bb6370d556116ad7bb5dc12"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:636ebdde0277bce4d12d2ef2550885804834418fee0eb456b69be928e604ecc4"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d60c27922ec80310b45574351f71e0dd3a139c5295e8f8b19d19c0010196544f"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b34df5aad035d0343bd740a95ca30db99b776e2630dca9cc1ba8e682c9cc25ea"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f24a7c04ff666d0fe905dfee0a84bc899d624aeb6dccd1ea86b5c347f15c20c1"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3878e1aff8eca64badad8f6d896cb98c52984b1e9cd9668a3ab70294d1ef92d"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4abef557028c551d59cf2fb3bf63f2a0c89f00d77e54c1c15282ecdd56943496"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0e14bd5965d3db173d6983abdc1241c22219385c22df8b0eb8f1846c15ce1fee"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f9be588a4b6043b03777d50654c6079af3da60cc37527dbb80d36ec98842b1e"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bc4ae264aa679aacf964abf3ea88e147eb4a22aea6af8c6d03ebdebd64cfd6"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:827b5a97673b9997067fde383a7f7dc67342403093b94ea3c24ae0f4f1fec649"}, - {file = "xattr-0.10.1.tar.gz", hash = "sha256:c12e7d81ffaa0605b3ac8c22c2994a8e18a9cf1c59287a1b7722a2289c952ec5"}, -] - -[package.dependencies] -cffi = ">=1.0" - -[[package]] -name = "zipp" -version = "3.15.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[metadata] -lock-version = "2.0" -python-versions = "^3.7" -content-hash = "c1c21f02e493ffbfd622bec8546c83edad08325b957851dd3f9a287867ce24a4" diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml deleted file mode 100644 index 463cc513ff..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ /dev/null @@ -1,198 +0,0 @@ -[tool.poetry] -name = "poetry" -version = "1.3.2" -description = "Python dependency management and packaging made easy." -authors = [ - "Sébastien Eustace ", -] -maintainers = [ - "Arun Babu Neelicattu ", - "Bjorn Neergaard ", - "Branch Vincent ", - "Bryce Drennan ", - "Daniel Eades ", - "Randy Döring ", - "Steph Samson ", - "finswimmer ", -] -license = "MIT" - -readme = "README.md" - -packages = [ - { include = "poetry", from = "src" } -] -include = [ - { path = "tests", format = "sdist" } -] - -homepage = "https://python-poetry.org/" -repository = "https://github.com/python-poetry/poetry" -documentation = "https://python-poetry.org/docs" - -keywords = ["packaging", "dependency", "poetry"] - -classifiers = [ - "Topic :: Software Development :: Build Tools", - "Topic :: Software Development :: Libraries :: Python Modules" -] - -[tool.poetry.urls] -Changelog = "https://python-poetry.org/history/" - -[tool.poetry.build] -generate-setup-file = false - -# Requirements -[tool.poetry.dependencies] -python = "^3.7" - -poetry-core = "1.4.0" -poetry-plugin-export = "^1.2.0" -"backports.cached-property" = { version = "^1.0.2", python = "<3.8" } -cachecontrol = { version = "^0.12.9", extras = ["filecache"] } -cleo = "^2.0.0" -crashtest = "^0.4.1" -dulwich = "^0.20.46" -filelock = "^3.8.0" -html5lib = "^1.0" -importlib-metadata = { version = "^4.4", python = "<3.10" } -jsonschema = "^4.10.0" -keyring = "^23.9.0" -# packaging uses calver, so version is unclamped -packaging = ">=20.4" -pexpect = "^4.7.0" -pkginfo = "^1.5" -platformdirs = "^2.5.2" -requests = "^2.18" -requests-toolbelt = ">=0.9.1,<0.11.0" -shellingham = "^1.5" -tomli = { version = "^2.0.1", python = "<3.11" } -# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225 -tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3" -# trove-classifiers uses calver, so version is unclamped -trove-classifiers = ">=2022.5.19" -# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953 -virtualenv = [ - { version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" }, - # see https://github.com/python-poetry/poetry/pull/6950 for details - { version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" }, -] -xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" } -urllib3 = "^1.26.0" - -[tool.poetry.group.dev.dependencies] -pre-commit = "^2.6" - -[tool.poetry.group.test.dependencies] -# Cachy frozen to test backwards compatibility for `poetry.utils.cache`. -cachy = "0.3.0" -deepdiff = "^5.0" -flatdict = "^4.0.1" -httpretty = "^1.0" -pytest = "^7.1" -pytest-cov = "^4.0" -pytest-mock = "^3.9" -pytest-randomly = "^3.12" -pytest-xdist = { version = "^2.5", extras = ["psutil"] } -zipp = { version = "^3.4", python = "<3.8" } - -[tool.poetry.group.typing.dependencies] -mypy = ">=0.990" -types-html5lib = ">=1.1.9" -types-jsonschema = ">=4.9.0" -types-requests = ">=2.28.8" -typing-extensions = { version = "^4.0.0", python = "<3.8" } - -# only used in github actions -[tool.poetry.group.github-actions] -optional = true -[tool.poetry.group.github-actions.dependencies] -pytest-github-actions-annotate-failures = "^0.1.7" - - -[tool.poetry.scripts] -poetry = "poetry.console.application:main" - - -[build-system] -requires = ["poetry-core>=1.1.0"] -build-backend = "poetry.core.masonry.api" - - -[tool.isort] -py_version = 37 -profile = "black" -force_single_line = true -combine_as_imports = true -lines_between_types = 1 -lines_after_imports = 2 -src_paths = ["src", "tests"] -extend_skip = ["setup.py"] -known_third_party = ["poetry.core"] - - -[tool.black] -target-version = ['py37'] -preview = true -force-exclude = ''' -.*/setup\.py$ -''' - - -[tool.mypy] -files = "src" -mypy_path = "src" -namespace_packages = true -explicit_package_bases = true -show_error_codes = true -strict = true -enable_error_code = [ - "ignore-without-code", - "redundant-expr", - "truthy-bool", -] - -# use of importlib-metadata backport at python3.7 makes it impossible to -# satisfy mypy without some ignores: but we get a different set of ignores at -# different python versions. -# -# , meanwhile suppress that -# warning. -[[tool.mypy.overrides]] -module = [ - 'poetry.console.commands.self.show.plugins', - 'poetry.installation.executor', - 'poetry.mixology.version_solver', - 'poetry.plugins.plugin_manager', - 'poetry.repositories.installed_repository', - 'poetry.utils.env', -] -warn_unused_ignores = false - -[[tool.mypy.overrides]] -module = [ - 'cachecontrol.*', - 'lockfile.*', - 'pexpect.*', - 'pkginfo.*', - 'requests_toolbelt.*', - 'shellingham.*', - 'virtualenv.*', - 'xattr.*', -] -ignore_missing_imports = true - - -[tool.pytest.ini_options] -addopts = "-n auto" -testpaths = [ - "tests" -] - - -[tool.coverage.report] -exclude_lines = [ - "pragma: no cover", - "if TYPE_CHECKING:" -] diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json deleted file mode 100644 index 049ba40b47..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "python-poetry", - "repo": "poetry", - "rev": "1.3.0", - "sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv", - "fetchSubmodules": true -} - diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix deleted file mode 100644 index 1c78904b62..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ pkgs, lib }: -let - inherit (pkgs) stdenv; - - mkPluginDrv = - { self - , plugins - , drv - , postInstall ? "" - , nativeBuildInputs ? [ ] - , buildInputs ? [ ] - }: - let - env = self.python.withPackages (ps: plugins); - in - stdenv.mkDerivation { - pname = drv.pname + "-with-plugins"; - - inherit (drv) src version meta; - - buildInputs = drv.buildInputs ++ drv.propagatedBuildInputs ++ buildInputs; - nativeBuildInputs = builtins.filter (x: x.name != "python-output-dist-hook") (drv.nativeBuildInputs ++ nativeBuildInputs); - - dontConfigure = true; - dontBuild = true; - dontUsePythonRecompileBytecode = true; - - passthru = { - inherit (drv.passthru) withPlugins; - inherit plugins; - }; - - # Link bin/ from environment, but only if it's in a plugin - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do - for bin in $bindir/*; do - ln -s ${env}/bin/$(basename $bin) $out/bin/ - done - done - - runHook postInstall - ''; - - inherit postInstall; - }; - -in -{ - - # Provide the `withPlugins` function - toPluginAble = self: { drv - , finalDrv - , postInstall ? "" - , nativeBuildInputs ? [ ] - , buildInputs ? [ ] - }: drv.overridePythonAttrs (old: { - passthru = old.passthru // { - withPlugins = pluginFn: mkPluginDrv { - plugins = [ finalDrv ] ++ pluginFn self; - inherit self postInstall nativeBuildInputs buildInputs; - drv = finalDrv; - }; - }; - }); - -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix deleted file mode 100644 index 0ef1d4c316..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, ireplace }: -let - inherit (builtins) elemAt match; - operators = - let - matchWildCard = s: match "([^*])(\\.[*])" s; - mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: - let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in - operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: - let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in - f v c; - in - { - # Prefix operators - "==" = dropWildcardPrecision (mkComparison 0); - ">" = dropWildcardPrecision (mkComparison 1); - "<" = dropWildcardPrecision (mkComparison (-1)); - "!=" = v: c: ! operators."==" v c; - ">=" = v: c: operators."==" v c || operators.">" v c; - "<=" = v: c: operators."==" v c || operators."<" v c; - # Semver specific operators - "~" = mkIdxComparison 1; - "^" = mkIdxComparison 0; - "~=" = v: c: - let - # Prune constraint - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - operators.">=" v c && operators."<" v upperConstraint; - # Infix operators - "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; - # Arbitrary equality clause, just run simple comparison - "===" = v: c: v == c; - # - }; - re = { - operators = "([=>> $out/bin/${bin} - #!${python.interpreter} - import sys - import re - - # Insert "" to add CWD to import path - sys.path.insert(0, "") - - from ${module} import ${fn} - - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', "", sys.argv[0]) - sys.exit(${fn}()) - EOF - chmod +x $out/bin/${bin} - ''; -in -python.pkgs.buildPythonPackage { - name = "poetry2nix-env-scripts"; - dontUnpack = true; - dontUseSetuptoolsBuild = true; - dontConfigure = true; - dontUseSetuptoolsCheck = true; - - format = "poetry2nix"; - - installPhase = '' - mkdir -p $out/bin - ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)} - ''; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update deleted file mode 100755 index 047f7a8fea..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/update +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -pwd=$(pwd) -workdir=$(mktemp -d) - -function cleanup { - cd "$pwd" - rm -rf $workdir -} -trap cleanup EXIT - -cd "$workdir" - -curl -L -s https://github.com/nix-community/poetry2nix/archive/master.tar.gz | tar -xz -mv poetry2nix-master/* . - -mkdir build -cp *.* build/ -cp -r overrides pkgs hooks bin build/ -rm build/shell.nix build/generate.py build/overlay.nix build/flake.* build/check-fmt.nix build/pkgs/poetry/update* - -cat > build/README.md << EOF -Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix - -The update procedure is as-follows: -1. Send your change to the upstream poetry2nix repository -2. Get it approved with tests passing -3. Run the update script in pkgs/development/tools/poetry2nix -EOF - -rm -rf "$pwd/poetry2nix" -mv build "$pwd/poetry2nix" diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix index 3d2adfd8cf..2e4d996af0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "sha256-AzHQnPYhmCHGco7JoKal57PC6NKUoMTeflHtFsBxQpA="; + sha256 = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index 0147913cca..f92cfd4d0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM="; + hash = "sha256-SBPYRmnrwtE9zyPdHWVGgalrRn5TOeewo6fdAwsNQSk="; }; vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix index 29892b954f..fa11e1b60e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix @@ -16,6 +16,7 @@ buildDartApplication rec { sourceRoot = "${src.name}/protoc_plugin"; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-yNgQLCLDCbA07v9tIwPRks/xPAzLVykNtIk+8C0twYM="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/deps.json b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/deps.json new file mode 100644 index 0000000000..c00a66e0d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-dart/deps.json @@ -0,0 +1,549 @@ +[ + { + "name": "protoc_plugin", + "version": "21.1.0", + "kind": "root", + "source": "root", + "dependencies": [ + "fixnum", + "path", + "protobuf", + "collection", + "dart_flutter_team_lints", + "matcher", + "test" + ] + }, + { + "name": "test", + "version": "1.24.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "matcher", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "test_core", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.18.0", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "stream_channel", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "test_core", + "version": "0.5.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "test_api", + "vm_service", + "yaml" + ] + }, + { + "name": "vm_service", + "version": "11.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "test_api", + "version": "0.6.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stack_trace", + "version": "1.11.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "64.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "dart_flutter_team_lints", + "version": "1.0.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "protobuf", + "version": "3.1.0", + "kind": "direct", + "source": "path", + "dependencies": [ + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 28a83a07d8..7308414504 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "protoc-gen-grpc-web"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = finalAttrs.version; - sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw="; + sha256 = "sha256-yqiSuqan4vynE3AS8OnYdzA+3AVlVFTBkxTuJe17114="; }; sourceRoot = "${finalAttrs.src.name}/javascript/net/grpc/web/generator"; diff --git a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix index 47bdd5530e..69fcacb4bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protolint/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.zane ]; + mainProgram = "protolint"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index f7dbb73606..5e3b6b7942 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.156.0"; + version = "0.161.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-1VlG+0jzx6Yho0bc3RypXgOFoM+NgOQ2RX4FB5ZllSw="; + sha256 = "sha256-7PzuFhlOlU5uGsJyGOY761JfzqaPkkkftRlYrvUKEoU="; }; - vendorHash = "sha256-T5UmaS7PPZdkPpFxJIqpF5pH24uFrHbrbsI5gfElUOY="; + vendorHash = "sha256-fhYd2C9xY0kQez6+MofimJP+brLvMDFXlW6kDSI4iqA="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix index 3528d689df..6a611503ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.44"; + version = "0.0.45"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-7Q+1shNZ18BZ6W6CslwUZhX0LtxPdTXOSNH5VhBHFxE="; + sha256 = "sha256-DDuzJcYfa0zHqLdyoZ/Vi14+0C6ucgkmb5ndrhTlOik="; }; vendorHash = "sha256-XOgHvOaHExazQfsu1brYDq1o2fUh6dZeJlpVhCQX9ns="; diff --git a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix index a314b2f533..d8d5280908 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.28"; + version = "2.3.32"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-KxYxHNoXk4RVA5+mpE3hjrl1c+7Ei/km/zrMIvvV+1M="; + hash = "sha256-miJ/WONNDieLryD2J9JmkmSCG5Iesg2N2GT/FI9NGY0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix index 5cef44df99..54badbaddc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-IfcX7DLRAsBMXitEgsEOjKtiXnX4bX03Md8/14gv3aY="; + sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index 1d075250a4..151c489de6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-pydnIUqUBMLHonEGcvB+K+48QQYQuFfZxbAETJjU+3o="; + hash = "sha256-XzDxfjXY7Mu6qDZ66r3c0/RDBQF7wCONZTpfQ0j1B1c="; }; - cargoHash = "sha256-VgLQfUk1xeAwr9KUo1Vz4Ndw0FAnYGw3af0v3ueNPuA="; + cargoHash = "sha256-J/ecoC8efv0IfAta7Ug0g7N/2jGV+DOACgbhXVfNK3k="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix index f31ec6d8c1..23daf7a836 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-NshDX7sbXnmK6k/EDD5thUcNKvSV4bNdJ5N2hNLlsnA="; + hash = "sha256-stZWTzrRk+dyscV+OtL5aEOv+MLrN3bMSIrhrZXmCfc="; }; - cargoHash = "sha256-JzspNL4T28awa/1Uajw0gLM3bYyUBYTjnfCXn9qG7SY="; + cargoHash = "sha256-pexYgL3gSeuglAQWn09nXgxQCUX+TFvnFU0uiwHEfzk="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 6909c59a92..b3cece9601 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -68,10 +68,10 @@ let in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "sha256-/uVXMVrVS7n4/mqz6IlKkk63hy67fn9KRjZ1wP5MHB0="; + sha256 = "sha256-RioBe0MAR47M84aavFaTJikGsJtcZDak8Tkg3WtX2l0="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix b/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix index 81969db777..8a0bbe36ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.2"; + version = "0.5.3"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-PC3eHTmhjNjf3ENeP3ODrR2Ynlzg4FqJL6L8cKvD67A="; + sha256 = "sha256-cYfQ27QPdx3TA7zUZ7x0+kIr//EXL+a2APK5pnlupJM="; }; - vendorHash = "sha256-OPB/xGdaq1yv4ATrKbLcqqJj84s0cYrJdmKFHZ3EkHY="; + vendorHash = "sha256-UbzMkHpmIfJoCToAT1vOYJvqkhxSGogohT2aemegZ94="; outputs = [ "out" ] ++ bins; diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix index 375a8d978d..74a3d6b149 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-09-20"; + version = "unstable-2023-11-09"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "d2946997e49e9358d520f008085cfbe235855c12"; - sha256 = "sha256-2agiaRAis6wVGbY3wj+T5RumGlKF9YaHByLwU100dlc="; + rev = "66460cb9628864e230f6b30adc49c4b848d2e843"; + sha256 = "sha256-pB68YxLHiNFhW+0PZ+UW39V59aE11CXZH7WXyqgyRIk="; }; - cargoSha256 = "sha256-rgXQYcqXckm1EL7OX/HtRfEdzTV09lM+YurcPYd/8FE="; + cargoSha256 = "sha256-iw+7xsVNpIQIxDAmN878v88k1EYe1FnJPVpGBhyVstA="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix index 07001487ab..7a1540f138 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "CLI to render Go template text files"; inherit (src.meta) homepage; license = licenses.gpl3; - maintainers = with maintainers; [ yurrriq ]; + maintainers = []; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix index 2d1b2ffa08..0ec1dc8fe5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "22.12.14.113"; + version = "23.10.14.114"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - hash = "sha256-tNOkZcdjwvrsleWMtcQ76KMBnssnuYQU3gqXnBVPN6w="; + hash = "sha256-70BSwRKj1WPvWxQzWPrs8ECkcVosAUaX5cK7FaDUhRc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix index b7c5ab87a6..75e32e0c7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -4,46 +4,37 @@ , installShellFiles , stdenv , darwin +, rust-jemalloc-sys # tests , ruff-lsp }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.292"; + version = "0.1.5"; src = fetchFromGitHub { owner = "astral-sh"; - repo = pname; - rev = "v${version}"; - hash = "sha256-4D7p5ZMdyemDBaWcCO62bhuPPcIypegqP0YZeX+GJRQ="; + repo = "ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-g52cIw0af/wQSuA4QhC2dCjcDGikirswBDAtwf8Drvo="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libcst-0.1.0" = "sha256-f4lR1vf0iL6WS7yXUzWUt/tax+xjU6rylG1EgeLex88="; - "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; - }; - }; + cargoHash = "sha256-1jfKRpyGewNlvMkL/MKnOaRJyajwLAuw+YyeTyTtcP4="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; cargoBuildFlags = [ "--package=ruff_cli" ]; cargoTestFlags = cargoBuildFlags; - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - # See https://github.com/jemalloc/jemalloc/issues/1997 - # Using a value of 48 should work on both emulated and native x86_64-darwin. - export JEMALLOC_SYS_WITH_LG_VADDR=48 - ''; - # tests expect no colors preCheck = '' export NO_COLOR=1 diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock index f63ff520e6..da77248667 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - rufo (0.12.0) + rufo (0.16.2) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES rufo BUNDLED WITH - 2.1.4 + 2.4.20 diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix index 1c63c3f3b7..c1d65faba6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwasskcm0nrf7f52019x4fvxa5zckj4fcvf4cdl0qflrcwb1l9f"; + sha256 = "11nm1vzr3vd85yy4rd7ndrrx1ygm3m2jmw9r0b9lfxlj8rc1rip2"; type = "gem"; }; - version = "0.12.0"; + version = "0.16.2"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix index 6c085ad23f..0ef6f59b89 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.18.2"; + version = "0.18.3"; src = fetchCrate { inherit pname version; - hash = "sha256-mBY4M0phjwWS2qWTlVSjLpD0lzMDutMRMbAerbMSXmI="; + hash = "sha256-8KLH6aPZhHtxC4hbMaebv1JiVkZH8p5QqnUXkJrmr4w="; }; - cargoHash = "sha256-bBcyJxlb18Bf76GOR6anTNQYqRpYs3dkGVy9rC5au5k="; + cargoHash = "sha256-8MOZvhREm4ch2flstx7J25j8mvwV3uGez5f1xkZ+S7I="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix new file mode 100644 index 0000000000..26409d2500 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bazel"; + version = "0.8.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; + }; + + cargoSha256 = "+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + # `test_data` is explicitly excluded from the package published to crates.io, so tests cannot be run + doCheck = false; + + meta = with lib; { + description = "Part of the `crate_universe` collection of tools which use Cargo to generate build targets for Bazel"; + homepage = "https://github.com/bazelbuild/rules_rust"; + license = licenses.asl20; + maintainers = with maintainers; [ rickvanprim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix index 4aa3c411f1..d46a57355d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-benchcmp/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchFromGitHub , substituteAll -, rust , stdenv }: @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { # patch the binary path so tests can find the binary when `--target` is present (substituteAll { src = ./fix-test-binary-path.patch; - shortTarget = rust.toRustTarget stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index ea860cc089..74b5a5dd3a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-z69uGnXyzV4spa3pNMwZrqOX1i0RYCgo8dwfZ86MBlA="; + hash = "sha256-OVtSvlmMRngxhUeq4u+exVc7WQUqBnksDpb8esbly9Y="; }; - cargoHash = "sha256-/eXdbHDVzM4hHRfP/gw+IXZVDuZcergGyotnvQEKEiw="; + cargoHash = "sha256-3OuyN+nm2t+LH8lue3xYoBQp7OYjzhDbnc2LCGqFJgY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix index 3d78e18dd5..0274f80e01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bundle-licenses"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sstadick"; repo = "cargo-bundle-licenses"; rev = "v${version}"; - hash = "sha256-tjxdZ28frY/GRFvhg28DkVajqFC+02962Sgai8NhxK0="; + hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0="; }; - cargoHash = "sha256-uVLoRLGnTe/8ipehGbc5mfWuMsFt3KP9KatXEJFUUEI="; + cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk="; meta = with lib; { description = "Generate a THIRDPARTY file with all licenses in a cargo project"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix index f2a9376e2f..d1f5c7d26f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.2.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-AGbo38weLBPxkaXgJpi+FXGuhPh7nyZcJOhw6BCDYOc="; + hash = "sha256-TjK84A/hoG5TyXbXgr4SPolUBT9tMqz/Mn9pMK6BQE4="; }; - cargoHash = "sha256-NR+Z5oMaReEOZrLk7d/pB1F37k8tE7FXh4HdVnh+YFc="; + cargoHash = "sha256-Nfd8YBh+5HlLbxKajptJEH3NFbtBH2V6668c3DHc13g="; nativeBuildInputs = [ curl @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index d1a1b4a49f..b17c6e8adc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -7,23 +7,18 @@ , darwin }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "unstable-2023-09-20"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "9bfbdeabee2e91894059c1f061f0c18931428823"; - hash = "sha256-ZLhW2aIpibU4YX5f40BqQ0tKENY4row+FIl3d/hi3dY="; + rev = "v${version}"; + hash = "sha256-XJKychPpBYMzFlW9jUPaBWuNAlcbqUQwxy+cMW2Ivyg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "warg-api-0.1.0" = "sha256-kzxvGZUMUOueR8t1tiCpGJlPxqEHQMb1m1jhPYoatbA="; - }; - }; + cargoHash = "sha256-cEmbXitYGztfBS5M9uczgmFPKRktP4skFETx8SJah2A="; nativeBuildInputs = [ pkg-config @@ -32,7 +27,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; # requires the wasm32-wasi target @@ -41,7 +36,9 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A Cargo subcommand for creating WebAssembly components based on the component model proposal"; homepage = "https://github.com/bytecodealliance/cargo-component"; + changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "cargo-component"; }; } 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 fa824ae613..30a2fd44ea 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.0"; + version = "0.25.4"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-Lt8ubK96ntcQJEnQ37nF8N4gJ8nmphwkbM6KJor13lo="; + sha256 = "sha256-cXGZhTLIxR9VHrQT+unbl69AviiQ6FCOJTdOP/4fRYI="; }; - cargoHash = "sha256-cYhzEVHpi7qMCU9fe3wxOQGX6YssJIeo4onLUBtqN6A="; + cargoHash = "sha256-H/5OZCnshGOUKVaBTbFAiMpYdsNC/96gV+rOgiuwDYc="; 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 22466ca34b..961f3287e6 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 @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.3.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-h3ga4H9gIS3H6krPqXyYHMIhlxFQPbEfZV8cpQWWhpw="; + hash = "sha256-lh3nK3yj03pEurjw6/fMh70GnBawxUqilupUzfgryG0="; }; - cargoHash = "sha256-RP4/bcKA+5tjBFkR6DGNUPLpi/1fZAsRZeLMRSg1aes="; + cargoHash = "sha256-lUeCMyH6qE76SVjubWVo/Hpj6J8PM6ndOqrJufcfByw="; nativeBuildInputs = [ pkg-config @@ -33,12 +33,11 @@ rustPlatform.buildRustPackage rec { xz zstd ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ git - ] ++ lib.optionals stdenv.isDarwin [ rustup ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 248fa29f8d..a25f80d561 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.72"; + version = "1.0.74"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-W9mrqF5zQWvCEsgm3fNPG0p/ZHgL1agTAfYW1t9tajo="; + sha256 = "sha256-3CbI1iv8kSBJ8HFJDfCRPTyMr6KhuuVs7u96d6H5FGE="; }; - cargoHash = "sha256-4gV69Ld60hBErfVXgrKfoeI6QrnYrg6w5hHqRufUlG8="; + cargoHash = "sha256-FekLNZMR3++MTlM8yJ5RmZI4t5B6lyKRxBlupOVzUFM="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix index f2890b0cd6..73eac19e56 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "sha256-npPE9dB7yxIfCxq3NGgI1J6OkDI7qfsusY/dD9w3bp4="; + sha256 = "sha256-yeNA6HkhWEUqarBDRbyD3RBIlBZZVrbAMng7d5beBB4="; }; - cargoSha256 = "sha256-m92PT89uTuJWlGAAL/wopHYv7vXaRd3woEW70S7kVUI="; + cargoSha256 = "sha256-IHOVaRfjopaSRY8HF8ATdNNLfhTVrIKvYsAuocqRdWI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ 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 a6ddc95e53..4fb099b3c0 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.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-u4LEE3fDYneKhNU38VeVNvqcbDO0pws6yldgcvwSv6M="; + sha256 = "sha256-be0jgjhaboutT+c3rRyp6fjmv8nAkggkcqofWmH83Zc="; }; - cargoSha256 = "sha256-pgffaqHWnm3RBE9TGbpRJX35BFpXW/na9wmad9eyCXw="; + cargoHash = "sha256-Sset3+jRm6yOUkvLYxBHdFvVCYOq3bvix9b3pnt7AV8="; nativeBuildInputs = [ pkg-config ]; 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 fbb3aeb7cc..4de6345b9b 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.8"; + version = "0.6.13"; src = fetchCrate { inherit pname version; - hash = "sha256-ZFFrluvnm5kCOyIe4c+gT2N4W7aeg1Cv1666by92BJo="; + hash = "sha256-5WwbtubANrLHXvaWzO/u1NeeetVUvl/ujq89BqFZ2ZQ="; }; - cargoHash = "sha256-Nbs2pE9WqwsTJLV3nUAWVVz6gwcmhyk9hv/uaOoAkIQ="; + cargoHash = "sha256-25I1j0QiyeHtUq6IK7ehRK3JLKygiigtfvEe+N74TgY="; # some necessary files are absent in the crate version doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix index 18842a94a9..36f13c7fc8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-insta/default.nix @@ -5,18 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = "refs/tags/${version}"; - hash = "sha256-s6d0q4K2UTG+BWzvH5KOAllzYAkEapEuDoiI9KQW31I="; + hash = "sha256-w/dxIQ7KRrn86PwiE/g5L9Gn8KszPF9u/zlwE/FYDu4="; }; sourceRoot = "${src.name}/cargo-insta"; - cargoHash = "sha256-ZQUzoKE3OGaY22VYiku7GqjGN9jUNx09a0EcgCRzzcM="; + cargoHash = "sha256-mEtmZ+wFo1WI1IMNYsVqSVScFDLdiXBbghH7c0l/3NQ="; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/Cargo.lock index dc7fda56ec..ce1eea3f15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", "opaque-debug", @@ -35,7 +35,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom", "once_cell", "version_check", ] @@ -58,6 +58,54 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +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 = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -70,6 +118,15 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + [[package]] name = "async-priority-channel" version = "0.1.0" @@ -87,7 +144,7 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -98,7 +155,7 @@ checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -107,17 +164,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9f65e4fb35ff6a80b3298d1f028649f3a23da141fa3951e9b24dde1d515b67e" -[[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.1.0" @@ -545,7 +591,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55d7e5deac5e49330042b4e174dafe84ebf71685bfcd94f285bac7aa31e0aeb1" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "http", @@ -612,19 +658,34 @@ checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide 0.5.4", "object 0.29.0", "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 = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "base64-simd" version = "0.7.0" @@ -640,6 +701,27 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[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" @@ -759,7 +841,7 @@ dependencies = [ [[package]] name = "cargo-lambda" -version = "0.18.1" +version = "0.21.1" dependencies = [ "build-data", "cargo-lambda-build", @@ -770,17 +852,19 @@ dependencies = [ "cargo-test-macro", "cargo-test-support", "clap", + "clap-cargo", "dunce", - "miette 4.7.1", + "miette 5.10.0", "snapbox", "tokio", "tracing", "tracing-subscriber", + "zip", ] [[package]] name = "cargo-lambda-build" -version = "0.18.1" +version = "0.21.1" dependencies = [ "async-trait", "cargo-lambda-interactive", @@ -789,14 +873,17 @@ dependencies = [ "cargo-zigbuild", "clap", "home", - "miette 4.7.1", + "miette 5.10.0", "object 0.28.4", "rustc_version", + "serde", + "serde_json", "sha2", "strum", "strum_macros", "thiserror", "tokio", + "toml", "tracing", "which", "zip", @@ -804,7 +891,7 @@ dependencies = [ [[package]] name = "cargo-lambda-deploy" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-sdk-iam", "aws-sdk-s3", @@ -815,7 +902,7 @@ dependencies = [ "cargo-lambda-metadata", "cargo-lambda-remote", "clap", - "miette 4.7.1", + "miette 5.10.0", "serde", "serde_json", "strum", @@ -827,23 +914,24 @@ dependencies = [ [[package]] name = "cargo-lambda-interactive" -version = "0.18.1" +version = "0.21.1" dependencies = [ "indicatif", "inquire", "is-terminal", - "miette 4.7.1", + "miette 5.10.0", "tokio", ] [[package]] name = "cargo-lambda-invoke" -version = "0.18.1" +version = "0.21.1" dependencies = [ + "base64 0.21.2", "cargo-lambda-remote", "clap", - "dirs 4.0.0", - "miette 4.7.1", + "dirs", + "miette 5.10.0", "reqwest", "serde", "serde_json", @@ -856,11 +944,12 @@ dependencies = [ [[package]] name = "cargo-lambda-metadata" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-sdk-lambda", - "cargo_metadata 0.14.2", + "cargo_metadata", "clap", + "env-file-reader", "miette 4.7.1", "remove_dir_all", "serde", @@ -873,14 +962,14 @@ dependencies = [ [[package]] name = "cargo-lambda-new" -version = "0.18.1" +version = "0.21.1" dependencies = [ "cargo-lambda-interactive", "cargo-lambda-metadata", "clap", "dunce", "liquid", - "miette 4.7.1", + "miette 5.10.0", "regex", "reqwest", "strum", @@ -894,7 +983,7 @@ dependencies = [ [[package]] name = "cargo-lambda-remote" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-config", "aws-credential-types", @@ -906,23 +995,23 @@ dependencies = [ [[package]] name = "cargo-lambda-watch" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws_lambda_events", "axum", - "base64", + "base64 0.21.2", "cargo-lambda-invoke", "cargo-lambda-metadata", "chrono", "clap", "dunce", "http-api-problem", + "http-serde", "hyper", "ignore-files", - "miette 4.7.1", + "miette 5.10.0", "opentelemetry", "opentelemetry-aws", - "project-origins", "query_map", "reqwest", "serde", @@ -982,7 +1071,7 @@ dependencies = [ "snapbox", "tar", "termcolor", - "toml_edit", + "toml_edit 0.15.0", "url", "winapi", ] @@ -1016,9 +1105,9 @@ checksum = "f7f66533431659d54043e78b4867fe62cad4e9a5c65c8e659d84e5ae19cec5d6" dependencies = [ "anyhow", "cargo-options", - "cargo_metadata 0.15.2", + "cargo_metadata", "clap", - "dirs 4.0.0", + "dirs", "fs-err", "path-slash", "rustc_version", @@ -1031,22 +1120,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" +checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" dependencies = [ "camino", "cargo-platform", @@ -1065,12 +1141,6 @@ dependencies = [ "jobserver", ] -[[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" @@ -1104,47 +1174,60 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.27" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap-cargo" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" +dependencies = [ + "anstyle", + "clap", +] + +[[package]] +name = "clap_builder" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", "terminal_size 0.2.2", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clearscreen" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aa24cc5e1d6b3fc49ad4cd540b522fedcbe88bc6f259ff16e20e7010b6f8c7" +checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" dependencies = [ "nix", "terminfo", @@ -1163,6 +1246,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "combine" version = "4.6.6" @@ -1302,7 +1391,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1311,7 +1400,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1321,7 +1410,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1333,7 +1422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -1345,7 +1434,7 @@ version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1373,6 +1462,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -1449,7 +1544,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.103", ] [[package]] @@ -1466,9 +1561,15 @@ checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.6" @@ -1480,16 +1581,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1499,6 +1590,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -1510,6 +1611,17 @@ dependencies = [ "winapi", ] +[[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 = "doc-comment" version = "0.3.3" @@ -1534,6 +1646,15 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1546,9 +1667,26 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] +[[package]] +name = "env-file-reader" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a86dcbc0fd1a07f5c318a2215338f0c870336851e8b566ebef1576eddb3728" +dependencies = [ + "lalrpop", + "lalrpop-util", + "logos", +] + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + [[package]] name = "errno" version = "0.2.8" @@ -1560,6 +1698,17 @@ dependencies = [ "winapi", ] +[[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" @@ -1591,12 +1740,18 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "windows-sys 0.42.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.25" @@ -1709,7 +1864,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1752,24 +1907,13 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -1805,7 +1949,7 @@ dependencies = [ "btoi", "gix-date", "itoa", - "nom 7.1.1", + "nom", "thiserror", ] @@ -1823,7 +1967,7 @@ dependencies = [ "gix-ref", "gix-sec", "memchr", - "nom 7.1.1", + "nom", "once_cell", "smallvec", "thiserror", @@ -1912,7 +2056,7 @@ dependencies = [ "gix-validate", "hex 0.4.3", "itoa", - "nom 7.1.1", + "nom", "smallvec", "thiserror", ] @@ -1942,7 +2086,7 @@ dependencies = [ "gix-tempfile", "gix-validate", "memmap2", - "nom 7.1.1", + "nom", "thiserror", ] @@ -1953,7 +2097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" dependencies = [ "bitflags", - "dirs 4.0.0", + "dirs", "gix-path", "libc", "windows", @@ -2012,7 +2156,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -2028,6 +2172,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.4.0" @@ -2045,12 +2195,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -2084,9 +2231,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2124,9 +2271,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "http-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ "http", "serde", @@ -2146,9 +2293,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -2244,7 +2391,7 @@ dependencies = [ "futures", "gix-config", "ignore", - "miette 5.5.0", + "miette 5.10.0", "project-origins", "thiserror", "tokio", @@ -2258,7 +2405,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -2315,7 +2472,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2342,14 +2499,14 @@ checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "is-terminal" -version = "0.4.0" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes 1.0.2", - "rustix 0.36.3", - "windows-sys 0.42.0", + "rustix 0.37.3", + "windows-sys 0.48.0", ] [[package]] @@ -2421,6 +2578,37 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +dependencies = [ + "regex", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2494,6 +2682,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "liquid" version = "0.26.0" @@ -2533,7 +2727,7 @@ checksum = "926454345f103e8433833077acdbfaa7c3e4b90788d585a8358f02f0b8f5a469" dependencies = [ "proc-macro2", "proc-quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2567,7 +2761,30 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", +] + +[[package]] +name = "logos" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" +dependencies = [ + "beef", + "fnv", + "proc-macro2", + "quote", + "regex-syntax", + "syn 1.0.103", ] [[package]] @@ -2624,10 +2841,23 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c90329e44f9208b55f45711f9558cec15d7ef8295cc65ecd6d4188ae8edc58c" dependencies = [ - "atty", - "backtrace", "miette-derive 4.7.1", "once_cell", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "backtrace", + "backtrace-ext", + "is-terminal", + "miette-derive 5.10.0", + "once_cell", "owo-colors", "supports-color", "supports-hyperlinks", @@ -2638,18 +2868,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "miette" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd9b301defa984bbdbe112b4763e093ed191750a0d914a78c1106b2d0fe703" -dependencies = [ - "miette-derive 5.5.0", - "once_cell", - "thiserror", - "unicode-width", -] - [[package]] name = "miette-derive" version = "4.7.1" @@ -2658,18 +2876,18 @@ checksum = "6b5bc45b761bcf1b5e6e6c4128cd93b84c218721a8d9b894aa0aff4ed180174c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "miette-derive" -version = "5.5.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c2401ab7ac5282ca5c8b518a87635b1a93762b0b90b9990c509888eeccba29" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -2723,6 +2941,12 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + [[package]] name = "newline-converter" version = "0.2.2" @@ -2739,23 +2963,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", "pin-utils", "static_assertions", ] -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.1" @@ -2888,7 +3102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2904,7 +3118,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2941,7 +3155,7 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project", - "rand 0.8.5", + "rand", "thiserror", ] @@ -2965,12 +3179,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "outref" version = "0.1.0" @@ -3005,7 +3213,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -3019,7 +3227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3077,7 +3285,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3092,39 +3300,58 @@ dependencies = [ ] [[package]] -name = "phf" -version = "0.8.0" +name = "petgraph" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "phf_shared", + "fixedbitset", + "indexmap 1.9.2", +] + +[[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.8.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.8.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", - "rand 0.7.3", + "phf_shared 0.11.2", + "rand", ] [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +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", ] @@ -3146,7 +3373,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3180,28 +3407,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-hack" @@ -3211,9 +3420,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3228,7 +3437,7 @@ dependencies = [ "proc-macro2", "proc-quote-impl", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3266,27 +3475,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - [[package]] name = "rand" version = "0.8.5" @@ -3294,18 +3489,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3315,16 +3500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[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", + "rand_core", ] [[package]] @@ -3333,25 +3509,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3392,7 +3550,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom", "redox_syscall", "thiserror", ] @@ -3442,7 +3600,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -3512,7 +3670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", @@ -3526,13 +3684,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 1.0.2", "libc", "linux-raw-sys 0.1.3", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.2", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.7" @@ -3563,7 +3735,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -3721,7 +3893,7 @@ checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3735,6 +3907,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3753,7 +3934,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -3770,7 +3951,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -3913,6 +4094,19 @@ 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", +] + [[package]] name = "strsim" version = "0.10.0" @@ -3935,7 +4129,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.103", ] [[package]] @@ -3946,30 +4140,30 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supports-color" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" dependencies = [ - "atty", + "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b34f7c5f01ecc9d78dba4b3f445f31df750a67621cf31626f3b7441ce6406" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ - "atty", + "is-terminal", ] [[package]] name = "supports-unicode" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b945e45b417b125a8ec51f1b7df2f8df7920367700d1f98aedd21e5735f8b2" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" dependencies = [ - "atty", + "is-terminal", ] [[package]] @@ -3983,6 +4177,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -4011,13 +4216,24 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "redox_syscall", "rustix 0.36.3", "windows-sys 0.42.0", ] +[[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.1.3" @@ -4049,13 +4265,13 @@ dependencies = [ [[package]] name = "terminfo" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ - "dirs 2.0.2", + "dirs", "fnv", - "nom 5.1.2", + "nom", "phf", "phf_codegen", ] @@ -4073,22 +4289,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -4140,6 +4356,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -4176,14 +4401,17 @@ dependencies = [ [[package]] name = "tokio-graceful-shutdown" -version = "0.5.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b9614e6d7b687b4daf9b5191d45039258b19405fb1493051cee400f29ec0e57" +checksum = "30666f313a52f7e87e9f14212d3e33c2ab59b444c405188ffcf8c36a84ca7688" dependencies = [ - "anyhow", "async-recursion", + "async-trait", "futures", "log", + "miette 5.10.0", + "pin-project-lite", + "thiserror", "tokio", "tokio-util", ] @@ -4196,7 +4424,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4235,6 +4463,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime 0.6.3", + "toml_edit 0.19.11", +] + [[package]] name = "toml_datetime" version = "0.5.0" @@ -4244,6 +4484,15 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.15.0" @@ -4251,11 +4500,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" dependencies = [ "combine", - "indexmap", + "indexmap 1.9.2", "itertools", "kstring", "serde", - "toml_datetime", + "toml_datetime 0.5.0", +] + +[[package]] +name = "toml_edit" +version = "0.19.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime 0.6.3", + "winnow", ] [[package]] @@ -4313,7 +4575,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4328,7 +4590,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4426,7 +4688,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -4480,13 +4742,19 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ - "getrandom 0.2.8", + "getrandom", ] [[package]] @@ -4537,12 +4805,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -4561,7 +4823,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -4576,7 +4838,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -4586,7 +4848,7 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4610,7 +4872,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4623,9 +4885,9 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "watchexec" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44a7216549b0e37228ec8ffd46ef32119c5f27a29a2a1cddd655e3059b80e6e" +checksum = "f8b97d05a9305a9aa6a7bedef64cd012ebc9b6f1f5ed0368fb48f0fe58f96988" dependencies = [ "async-priority-channel", "async-recursion", @@ -4634,7 +4896,7 @@ dependencies = [ "command-group", "futures", "ignore-files", - "miette 5.5.0", + "miette 5.10.0", "nix", "normalize-path", "notify", @@ -4676,7 +4938,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2a5df96c388901c94ca04055fcd51d4196ca3e971c5e805bd4a4b61dd6a7e5" dependencies = [ - "miette 5.5.0", + "miette 5.10.0", "nix", "thiserror", ] @@ -4758,12 +5020,12 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -4786,12 +5048,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -4801,7 +5063,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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]] @@ -4810,21 +5081,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "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.36.1" @@ -4837,6 +5129,12 @@ 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.36.1" @@ -4849,6 +5147,12 @@ 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.36.1" @@ -4861,6 +5165,12 @@ 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.36.1" @@ -4873,12 +5183,24 @@ 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.36.1" @@ -4891,6 +5213,21 @@ 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 = "winnow" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix index f3cceec061..9efbc79ca0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "0.18.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-un+GQflxhMHCMH5UEeUVsYx59ryn7MR4ApooeOuhccc="; + hash = "sha256-QlTAYfd0taXfK370nzqictwK7bZ4bnh1oPBJKZzhnMo="; }; cargoLock = { @@ -37,10 +37,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ]; checkFlags = [ - # Disabled because they accesses the network. + # Disabled because they access the network. "--skip=test_build_basic_extension" "--skip=test_build_basic_function" + "--skip=test_build_basic_zip_extension" + "--skip=test_build_basic_zip_function" + "--skip=test_build_event_type_function" + "--skip=test_build_http_feature_function" "--skip=test_build_http_function" + "--skip=test_build_internal_zip_extension" "--skip=test_build_logs_extension" "--skip=test_build_telemetry_extension" "--skip=test_download_example" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock index 6f570e9b38..1849049179 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -25,9 +25,9 @@ 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", "once_cell", @@ -36,22 +36,23 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "getrandom", "once_cell", "serde", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -151,13 +152,13 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -174,7 +175,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.4", + "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -245,9 +246,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -266,9 +267,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -304,9 +305,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -318,7 +319,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9bda9b4595376bf255f68dafb5dcc5b0e2842b38dc2a7b52c4e0bfe9fd1c651" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "anyhow", "chrono", "either", @@ -367,9 +368,9 @@ dependencies = [ [[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" @@ -388,7 +389,7 @@ dependencies = [ [[package]] name = "cargo-leptos" -version = "0.2.0" +version = "0.2.1" dependencies = [ "ansi_term", "anyhow", @@ -429,18 +430,18 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -488,9 +489,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -498,9 +499,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -510,21 +511,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -597,9 +598,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -685,7 +686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -736,7 +737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -888,25 +889,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "fastrand" version = "2.0.1" @@ -927,9 +917,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1024,42 +1014,42 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-io", @@ -1140,7 +1130,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]] @@ -1149,14 +1139,14 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1239,7 +1229,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1261,16 +1251,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1316,12 +1306,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -1346,9 +1336,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1369,9 +1359,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -1410,9 +1400,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -1447,26 +1437,27 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "leptos_hot_reload" -version = "0.5.0" -source = "git+https://github.com/leptos-rs/leptos#e0d15c1a094f193a85cd9304bf86edabbf46a902" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6902fabee84955a85a6cdebf8ddfbfb134091087b172e32ebb26e571d4640ca" dependencies = [ "anyhow", "camino", - "indexmap 2.0.2", + "indexmap 2.1.0", "parking_lot", "proc-macro2", "quote", "rstml", "serde", - "syn 2.0.37", + "syn 2.0.38", "walkdir", ] [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libflate" @@ -1494,12 +1485,12 @@ dependencies = [ [[package]] name = "lightningcss" -version = "1.0.0-alpha.47" +version = "1.0.0-alpha.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9e0bcd2b6bb94c671476ae1d4cba1d5da256394ae18e3f656d2d339d577b5a" +checksum = "c2999490cc10a59ad8a87d731791a5d438d2d025e3f137aa7d4c23e1827985b0" dependencies = [ - "ahash 0.7.6", - "bitflags 2.4.0", + "ahash 0.7.7", + "bitflags 2.4.1", "browserslist-rs", "const-str", "cssparser", @@ -1525,15 +1516,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1614,9 +1605,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -1721,9 +1712,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1755,11 +1746,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1776,7 +1767,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1787,9 +1778,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" dependencies = [ "cc", "libc", @@ -1811,11 +1802,11 @@ checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" [[package]] name = "parcel_selectors" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0fbe4365a6ec3fda13f9551aa5ea9f1e1ee8da513953b153de29ac00cf684a" +checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cssparser", "fxhash", "log", @@ -1851,13 +1842,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -1942,7 +1933,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1980,7 +1971,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2038,9 +2029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2053,7 +2044,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "version_check", "yansi", ] @@ -2161,6 +2152,15 @@ 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_users" version = "0.4.3" @@ -2174,9 +2174,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2186,9 +2186,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2197,9 +2197,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" @@ -2216,7 +2216,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -2291,7 +2291,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.37", + "syn 2.0.38", "syn_derive", "thiserror", ] @@ -2313,11 +2313,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.15" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2397,18 +2397,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2426,20 +2426,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2505,9 +2505,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "siphasher" @@ -2532,9 +2532,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[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 0.3.9", @@ -2542,9 +2542,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2595,9 +2595,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2606,14 +2606,14 @@ dependencies = [ [[package]] name = "syn_derive" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6eef0000c4a12ecdfd7873ea84a8b5aab5e44db72e38e07b028a25386f29a5" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2668,35 +2668,35 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "windows-sys 0.48.0", ] [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2716,19 +2716,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.8", + "mio 0.8.9", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -2741,7 +2741,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2768,9 +2768,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2810,11 +2810,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 1.0.0", "log", "pin-project-lite", "tracing-core", @@ -2822,9 +2821,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2912,9 +2911,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "vcpkg" @@ -2987,9 +2986,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2997,24 +2996,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21c60239a09bf9bab8dfa752be4e6c637db22296b9ded493800090448692da9" +checksum = "f2252adf46913da7b729caf556b81cedd1335165576e6446d84618e8835d89dd" dependencies = [ "anyhow", "base64 0.9.3", @@ -3034,9 +3033,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafbe1984f67cc12645f12ab65e6145e8ddce1ab265d0be58435f25bb0ce2608" +checksum = "43f3b73cf8fcb86da78c6649c74acef205723f57af99b9f549b2609c83fe7815" dependencies = [ "anyhow", "walrus", @@ -3044,9 +3043,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3056,9 +3055,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3066,22 +3065,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581419e3995571a1d2d066e360ca1c0c09da097f5a53c98e6f00d96eddaf0ffe" +checksum = "930dd8e8226379aebb7d512f31b9241a3c59a1801452932e5a15bebfd3b708fb" dependencies = [ "anyhow", "walrus", @@ -3089,15 +3088,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d272073981137e8426cf2a6830d43d1f84f988a050b2f8b210f0e266b8983" +checksum = "759b1e9784f903a7890bcf147aa7c8c529a6318a2db05f88c054194a3e6c6d57" dependencies = [ "anyhow", "walrus", @@ -3106,9 +3105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9c65b1ff5041ea824ca24c519948aec16fb6611c617d601623c0657dfcd47b" +checksum = "2dc12bc175c837239520b8aa9dcfb68a025fcf56a718a02551a75a972711c816" dependencies = [ "anyhow", "walrus", @@ -3116,9 +3115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5c796220738ab5d44666f37205728a74141c0039d1166bcf8110b26bafaa1e" +checksum = "6a5510ab88377b4e3160a7e5d90a876d0a1da2d9b9b67495f437246714c0980f" dependencies = [ "anyhow", "log", @@ -3134,9 +3133,9 @@ checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -3198,10 +3197,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -3391,6 +3390,26 @@ version = "1.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" +[[package]] +name = "zerocopy" +version = "0.7.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "zip" version = "0.6.6" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix index fe39ff7950..ed40ca1256 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -15,20 +15,17 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = "v${version}"; - hash = "sha256-+qAXBLV+Jn1qWG7TThn4twUBvN7lO4MX2SSo/gdjgFY="; + rev = "${version}"; + hash = "sha256-i2nKtQC63BbZsrYvg+HkdqQfK59f0LzZ9dfmFBaqn14="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "leptos_hot_reload-0.5.0" = "sha256-huOwadWMYPGGWmZHxztFPPzs4UhIPEmq9rKOB6WPCTE="; - }; }; nativeBuildInputs = optionals (!isDarwin) [ pkg-config ]; @@ -47,6 +44,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A build tool for the Leptos web framework"; homepage = "https://github.com/leptos-rs/cargo-leptos"; + changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ benwis ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index f591540785..43df364aba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -21,11 +21,12 @@ , fetchFromGitHub , rustPlatform , rustc +, git }: let pname = "cargo-llvm-cov"; - version = "0.5.33"; + version = "0.5.36"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -36,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk="; + sha256 = "sha256-ZI5vxtMcIEtVPIeedha3S6GEvvQDBB9eyOFwkAAO22I="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -54,7 +55,8 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU="; + sha256 = "sha256-Ii21kjQ4nWEttvGY9bxhGmfLkI2MrAsYJZcwfE2y6uQ="; + leaveDotGit = true; }; # Upstream doesn't include the lockfile so we need to add it back @@ -62,13 +64,24 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ="; + cargoSha256 = "sha256-BHocUJpk4qplwMfpSXNTZjOpUCZGS676xYrqtSFnP7s="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests LLVM_COV = "${llvm}/bin/llvm-cov"; LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + nativeCheckInputs = [ + git + ]; + + preCheck = '' + # `cargo-llvm-cov`'s tests rely on `git ls-files` so the staging area needs + # to not have everything staged as deleted, which is how `leaveDotGit` in + # `fetchFromGitHub` leaves the staging area for reproducibility reasons. + git restore --staged . + ''; + meta = { inherit homepage; changelog = homepage + "/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 4a0be763b9..083494fb0b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.35"; + version = "0.4.36"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-lxS9j733dhoM5bQSuo9jGOIHaKtcHzCDR5E9ko8U8xI="; + hash = "sha256-kj5dsZWf1dp6NG9AIj5GdRoXIb6J3bSXnJNNEVAKnaM="; }; - cargoHash = "sha256-d5b/ggk/FxCgUJrYCtrmSPAwLftMKzuOhg+0mQQ+ntM="; + cargoHash = "sha256-iZtT1ywFIgPhBnW4losd1J+WHUtzgW47657vGi6mI7I="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index f057155988..505702a232 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.2"; + version = "0.37.4"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-uYMPRbh2stIkNxehPnJPryIo+bGxDG7g+l4bTkEQWoY="; + hash = "sha256-ZcigUYHNhzLFXA726FqalSt0hIzBVBvmep8jqzaCioc="; }; - cargoHash = "sha256-CXGar3Xp6iBldBGOxjXRBGBwjNh4Kv6SwIkaNKEnkQs="; + cargoHash = "sha256-hmEo5UQlVtgdmb6b/vhK5GHHUCgbEKdnAu2S+xrDpuk="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix similarity index 83% rename from third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix rename to third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix index 7bdf412ebe..3564862e19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/tauri-mobile/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -11,23 +11,23 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; - pname = "tauri-mobile"; - version = "unstable-2023-06-06"; + pname = "cargo-mobile2"; + version = "0.7.0"; in rustPlatform.buildRustPackage { inherit pname version; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; - rev = "43b2a3ba3a05b9ca3d3c9d8d7eafbeb4f24bf396"; - hash = "sha256-fVQmhtUn2Lwtr/id/qWtgnHQdXkf0jAOg4apOgnLD4Y="; + rev = "cargo-mobile2-v${version}"; + hash = "sha256-aJPiPhDbu7Nwnd65kPMxeULrcjdSu0EF34ma3n/NTYI="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-MtLfcDJcLVhsIGD6pjpomuu9GYGqa7L8xnaQ++f+0H4="; + cargoHash = "sha256-Inc+PWJO+PM99YYwQEG1J0/17RkLauraFVzO2CO15rQ="; preBuild = '' mkdir -p $out/share/ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix index 8b902499bf..7712e9c9ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.9.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - hash = "sha256-BFASEf9WUVJHsakujjeBBxfxPYlsuzonqFuDLXmLgwc="; + hash = "sha256-71NRaIDWPbhDn6cfYhyZZzO2huQlj1vkKdBV6WJqI9s="; }; - cargoHash = "sha256-FojpC4RMrW0hZ0jvXxznxR6rKDDxrNMPoLoHEscOPEo="; + cargoHash = "sha256-lgqe9pXg/PE9WrXVpSJWYE6FUMGBgUDpEyJ31RSEj5A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix index b05282f4f7..556446af31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mommy/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mommy"; - version = "0.1.1"; + version = "0.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-p1SAYUQu1HpYJ6TbLJ3lfA9VlKHvB7z5yiFXmTQOCXA="; + sha256 = "sha256-/f6jHXwUJqAlqmVvvxfB4tvKkYwCmqI8GgPBHf5Qg1E="; }; - cargoSha256 = "sha256-5RidY+6EF23UNzz1suSdA4LL59FalipaJ+ISSsmiCXM="; + cargoSha256 = "sha256-hj6oRuTlCxGq5SosVBkVwrG0Sgv5iDz5naCXPueYFqM="; meta = with lib; { description = "Cargo wrapper that encourages you after running commands"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix index fefa6bb21f..a3d97ff443 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "23.10.0"; + version = "23.11.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-AJcteYaEm1pJ2tn1mydZAhrhqoMtEVJUrfGY/Vt71Ks="; + hash = "sha256-UZ4agGxJfkqERrl354RjQb6x+FDMbrrXCjZBp6Gzu/c="; }; - cargoHash = "sha256-0NLP8KtzeX3jjWjSXBKku4c1LzKmoJce1RPUB+aO804="; + cargoHash = "sha256-0zezsxZPCt0jtV/4RrSQ6rriWvuwzztHFEUONvW1ZOs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix index a5b3bb0a14..4b1bccb159 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jMhDKMFJVz/PdMnSrA+moknXPfwFhPj/fggHDAUCsNY="; + sha256 = "sha256-PdRiiGRYdbnViK34PnYoLFteipoK2arw79IVOQnJKNE="; }; - cargoHash = "sha256-IUMS0oCucYeBSfjxIYl0hhJw2GIpSgh+Vm1iUQ+Jceo="; + cargoHash = "sha256-6rQwyogm62xx9JmDWfRtCpF1Rqjtt5SDYUdtZBfryuw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreGraphics 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 0dc2a708af..92e382071d 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 @@ -1,19 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.59"; + version = "0.9.62"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-32n1z5e40qkhHBAbwGhXa7L5NfkkN72AIKF796y82+g="; + hash = "sha256-GxDURkXmZvxaX9RLq/hlqtX1woWm2JKtv5x5goCY4ZU="; }; - cargoHash = "sha256-sme7VE5JnjIWONaFYIOnv72UjUC/S+VezNSmRunmDv0="; + cargoHash = "sha256-zQB8sPeKT43qC5JjrHa7E41NyDyiQ3PGvBqgszs+tBI="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix index 40114a810d..2f3c6ae76c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -6,26 +6,28 @@ , stdenv , curl , CoreFoundation +, CoreServices , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.13.1"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-u8VMVW2LJcwDRv43705aOcP0WMRfB3hakdgufYuI7I4="; + sha256 = "sha256-rbfCrq9AwjrynNSklR1un3BUGv0kblwIxy72lTjEDVc="; }; - cargoHash = "sha256-rXLgNzbzMZG+nviAnK9n7ISWuNOPMugubHNMwJRKRZc="; + cargoHash = "sha256-kBolewLzKGq3rmSeWlLMDqKb4QQfWf3J6DnXTB0SV54="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation + CoreServices Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3bb615f3c1..c7a5cc9574 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -2,17 +2,17 @@ let pname = "cargo-pgrx"; - version = "0.10.2"; + version = "0.11.0"; in rustPlatform.buildRustPackage rec { inherit version pname; src = fetchCrate { inherit version pname; - hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; + hash = "sha256-GiUjsSqnrUNgiT/d3b8uK9BV7cHFvaDoq6cUGRwPigM="; }; - cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="; + cargoHash = "sha256-oXOPpK8VWzbFE1xHBQYyM5+YP/pRdLvTVN/fjxrgD/c="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix index 35d3fb133e..15c5ad5145 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix @@ -2,27 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-readme"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { - owner = "livioribeiro"; + owner = "webern"; repo = pname; - # Git tag is missing, see upstream issue: - # https://github.com/livioribeiro/cargo-readme/issues/61 - rev = "cf66017c0120ae198210ebaf58a0be6a78372974"; - sha256 = "sha256-/ufHHM13L83M3UYi6mjdhIjgXx7bZgzvR/X02Zsx7Fw="; + rev = "v${version}"; + sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; }; - cargoSha256 = "sha256-Isd05qOuVBNfXOI5qsaDOhjF7QIKAG5xrZsBFK2PpQQ="; + cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; - patches = [ - (fetchpatch { - # Fixup warning thrown at build when running test-suite - # unused return, see upstream PR: - # https://github.com/livioribeiro/cargo-readme/pull/62 - url = "https://github.com/livioribeiro/cargo-readme/commit/060f2daaa2b2cf981bf490dc36bcc6527545ea03.patch"; - sha256 = "sha256-wlAIgTI9OqtA/Jnswoqp7iOj+1zjrUZA7JpHUiF/n+s="; - }) + # disable doc tests + cargoTestFlags = [ + "--bins" "--lib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/Cargo.lock index 0e4455addf..6e75ae6d73 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/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" @@ -19,9 +28,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -57,9 +66,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -86,6 +95,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "async-compression" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + [[package]] name = "atty" version = "0.2.14" @@ -103,12 +125,33 @@ 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 = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + [[package]] name = "base64ct" version = "1.6.0" @@ -121,6 +164,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "block-buffer" version = "0.10.4" @@ -132,9 +181,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "regex-automata", @@ -147,6 +196,12 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + [[package]] name = "camino" version = "1.1.4" @@ -167,7 +222,7 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.24.12" +version = "0.25.0" dependencies = [ "anyhow", "assert_fs", @@ -178,7 +233,6 @@ dependencies = [ "clap", "clap-cargo", "concolor-control", - "crates-index", "difflib", "dirs-next", "dunce", @@ -188,20 +242,22 @@ dependencies = [ "globset", "ignore", "indexmap 1.9.3", - "itertools", + "itertools 0.11.0", "log", "maplit", "once_cell", "predicates", "quick-error", "regex", + "reqwest", "semver", "serde", "snapbox", + "tame-index", "termcolor", "time", - "toml", - "toml_edit", + "toml 0.8.6", + "toml_edit 0.20.7", "trycmd", ] @@ -223,7 +279,7 @@ dependencies = [ "flate2", "git2", "glob", - "itertools", + "itertools 0.10.5", "lazy_static", "pasetors", "serde", @@ -232,7 +288,7 @@ dependencies = [ "tar", "termcolor", "time", - "toml", + "toml 0.7.6", "url", "windows-sys 0.48.0", ] @@ -260,9 +316,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ "camino", "cargo-platform", @@ -274,11 +330,12 @@ dependencies = [ [[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 = [ "jobserver", + "libc", ] [[package]] @@ -289,9 +346,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -299,9 +356,9 @@ dependencies = [ [[package]] name = "clap-cargo" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" +checksum = "38ae55615695e768a76899c8411b4ebacfbe525e964f94fd24f0007b10b45cd3" dependencies = [ "anstyle", "cargo_metadata", @@ -310,9 +367,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -323,9 +380,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -335,9 +392,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -352,7 +409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "concolor-query", ] @@ -402,27 +459,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crates-index" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65aa5fcd68f892b56202f15a18a53308b2d489b728958dbce48d2d1f3bbaa685" -dependencies = [ - "git2", - "hex", - "home", - "memchr", - "num_cpus", - "rayon", - "rustc-hash", - "semver", - "serde", - "serde_derive", - "serde_json", - "smol_str", - "toml", -] - [[package]] name = "crates-io" version = "0.36.1" @@ -527,7 +563,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.9", "winapi", ] @@ -658,6 +694,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -770,6 +815,54 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-core", + "futures-io", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -783,9 +876,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -794,6 +887,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "git-conventional" version = "0.12.4" @@ -811,7 +910,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -845,7 +944,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -861,6 +960,25 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -908,9 +1026,6 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] [[package]] name = "hkdf" @@ -939,6 +1054,40 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + [[package]] name = "humantime" version = "2.1.0" @@ -955,6 +1104,44 @@ dependencies = [ "serde", ] +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "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", + "tokio", + "tokio-rustls", +] + [[package]] name = "idna" version = "0.3.0" @@ -1022,6 +1209,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-terminal" version = "0.4.7" @@ -1030,7 +1223,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -1043,6 +1236,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" @@ -1075,9 +1277,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libgit2-sys" @@ -1125,6 +1327,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" + [[package]] name = "log" version = "0.4.18" @@ -1152,6 +1360,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -1161,6 +1375,17 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + [[package]] name = "miow" version = "0.5.0" @@ -1195,6 +1420,15 @@ dependencies = [ "libc", ] +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1298,6 +1532,18 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkcs8" version = "0.10.2" @@ -1323,7 +1569,7 @@ dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1356,9 +1602,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1415,7 +1661,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1424,7 +1670,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1440,9 +1686,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1452,9 +1698,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1463,9 +1709,51 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "async-compression", + "base64", + "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", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] [[package]] name = "rfc6979" @@ -1478,10 +1766,24 @@ dependencies = [ ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "ring" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" @@ -1489,14 +1791,58 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "ryu" version = "1.0.13" @@ -1527,6 +1873,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sec1" version = "0.7.2" @@ -1583,13 +1939,25 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" 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 = "sha2" version = "0.10.6" @@ -1629,6 +1997,15 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + [[package]] name = "smol_str" version = "0.2.0" @@ -1640,9 +2017,9 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" +checksum = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" dependencies = [ "anstream", "anstyle", @@ -1662,9 +2039,9 @@ dependencies = [ [[package]] name = "snapbox-macros" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" +checksum = "ed1559baff8a696add3322b9be3e940d433e7bb4e38d79017205fd37ff28b28e" dependencies = [ "anstream", ] @@ -1679,6 +2056,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.2" @@ -1689,6 +2082,12 @@ dependencies = [ "der", ] +[[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" @@ -1712,6 +2111,47 @@ dependencies = [ "unicode-ident", ] +[[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 = "tame-index" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239b73acdc37c857aae3832bdc739b937b038e5e8b148191a79545a2beb5af74" +dependencies = [ + "camino", + "home", + "http", + "memchr", + "reqwest", + "semver", + "serde", + "serde_json", + "smol_str", + "thiserror", + "toml 0.7.6", + "twox-hash", +] + [[package]] name = "tar" version = "0.4.38" @@ -1731,26 +2171,26 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.19", "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix", + "rustix 0.38.15", "windows-sys 0.48.0", ] @@ -1832,6 +2272,46 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.4", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" version = "0.7.6" @@ -1841,14 +2321,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -1867,10 +2359,54 @@ dependencies = [ ] [[package]] -name = "trycmd" -version = "0.14.17" +name = "toml_edit" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "trycmd" +version = "0.14.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed009372a42fb103e6f8767b9222925485e03cca032b700d203e2c5b67bee4fb" dependencies = [ "glob", "humantime", @@ -1879,7 +2415,17 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit", + "toml_edit 0.20.7", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", ] [[package]] @@ -1918,6 +2464,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.3.1" @@ -1966,6 +2518,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" @@ -1997,6 +2558,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.86" @@ -2026,6 +2599,22 @@ version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +[[package]] +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -2213,6 +2802,16 @@ 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 = "zeroize" version = "1.6.0" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix index af35138423..8e9c84797d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.12"; + version = "0.25.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-dB5gpaY6OB/IjMvqLUMH41l6Q/xMookxfVGXRcdhcBM="; + hash = "sha256-UJdGbuQfvlZHjCKyHCXPDJ5AdUWJCRUS/vNeTKAwyYI="; }; cargoLock = { @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ curl - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix index aa710f493c..91d9144222 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.4.1"; + version = "1.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-imp7TzSVWo6l23tQu2oMMdVj/3sT9mU+lIBc0cVwO+s="; + hash = "sha256-FPkZk5qKHrRR3V8s04yLgOVOKj+Rln3Cu/VW2bnr2fE="; }; - cargoHash = "sha256-TQOFXFdfD4iVy4K9IjcX0L7zLeNw9RAHb2WE5rERP/0="; + cargoHash = "sha256-aFHuIEDpGCel1FC7D0hTUmzHbEj7wVarsE0wNZ/3Khw="; # multiple impurities in tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 3bf3add13e..4143c08da5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-K6csc/jJ0iDegK9ZSOy1aNb0GSxSXHMSOVUtFEYUBhc="; + hash = "sha256-bfkRuFVlKfzyTomFhgnxbDj76Mfq/Q/Y3ZQUuMpkYQ0="; }; - cargoHash = "sha256-9tWzJ64UlMHQ61SRbEXACNDA+4hTPjQTBzSjEO+0rik="; + cargoHash = "sha256-poPTFF+XCAHhHftxOOPaN+dixX2uqtZVfn20DB+cZ5o="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 48304081a7..265e0a32f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -2,22 +2,13 @@ # 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 0.27.3", -] - [[package]] name = "addr2line" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli", ] [[package]] @@ -33,16 +24,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -76,30 +67,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -115,9 +105,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -129,6 +119,12 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arbitrary" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" + [[package]] name = "arc-swap" version = "1.6.0" @@ -207,6 +203,17 @@ dependencies = [ "wait-timeout", ] +[[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", + "futures-core", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -231,7 +238,7 @@ dependencies = [ "chrono", "hmac 0.11.0", "log", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2 0.9.9", @@ -256,18 +263,38 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", +] + +[[package]] +name = "async-stripe" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" +dependencies = [ + "futures-util", + "http-types", + "hyper", + "hyper-rustls 0.24.1", + "serde", + "serde_json", + "serde_path_to_error", + "serde_qs 0.10.1", + "smart-default", + "smol_str", + "thiserror", + "tokio", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -307,7 +334,7 @@ dependencies = [ "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -468,7 +495,7 @@ dependencies = [ "once_cell", "percent-encoding", "regex", - "sha2 0.10.7", + "sha2 0.10.8", "time", "tracing", ] @@ -741,12 +768,12 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] @@ -825,9 +852,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -879,9 +906,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" +checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ "base64 0.21.4", "bollard-stubs", @@ -908,12 +935,13 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.42.0-rc.7" +version = "1.43.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" +checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" dependencies = [ "serde", - "serde_with 2.3.3", + "serde_repr", + "serde_with 3.3.0", ] [[package]] @@ -929,7 +957,7 @@ dependencies = [ "indexmap 1.9.3", "js-sys", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", @@ -939,12 +967,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", - "regex-automata 0.3.8", + "regex-automata 0.4.3", "serde", ] @@ -959,15 +987,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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" @@ -1002,65 +1030,77 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc48200a1a0fa6fba138b1802ad7def18ec1cdd92f7b2a04e21f1bd887f7b9" +checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 1.0.11", + "io-lifetimes", "windows-sys 0.48.0", ] +[[package]] +name = "cap-net-ext" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" +dependencies = [ + "cap-primitives", + "cap-std", + "rustix", + "smallvec", +] + [[package]] name = "cap-primitives" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b6df5b295dca8d56f35560be8c391d59f0420f72e546997154e24e765e6451" +checksum = "2bf30c373a3bee22c292b1b6a7a26736a38376840f1af3d2d806455edf8c3899" dependencies = [ "ambient-authority", - "fs-set-times 0.19.2", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", - "winx 0.35.1", + "winx", ] [[package]] name = "cap-rand" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25555efacb0b5244cf1d35833d55d21abc916fff0eaad254b8e2453ea9b8ab" +checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" dependencies = [ "ambient-authority", - "rand", + "rand 0.8.5", ] [[package]] name = "cap-std" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3373a62accd150b4fcba056d4c5f3b552127f0ec86d3c8c102d60b978174a012" +checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 1.0.11", - "rustix 0.37.23", + "io-lifetimes", + "rustix", ] [[package]] name = "cap-time-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95002993b7baee6b66c8950470e59e5226a23b3af39fc59c47fe416dd39821a" +checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.37.23", - "winx 0.35.1", + "rustix", + "winx", ] [[package]] @@ -1069,7 +1109,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "semver 1.0.19", + "semver 1.0.20", "serde", "toml 0.7.8", "url", @@ -1077,16 +1117,16 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] [[package]] name = "cargo-shuttle" -version = "0.28.1" +version = "0.30.1" dependencies = [ "anyhow", "assert_cmd", @@ -1111,6 +1151,7 @@ dependencies = [ "ignore", "indicatif", "indoc", + "percent-encoding", "portpicker", "regex", "reqwest", @@ -1118,7 +1159,7 @@ dependencies = [ "reqwest-retry", "rexpect", "rmp-serde", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "shuttle-common", @@ -1150,7 +1191,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -1174,9 +1215,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -1196,9 +1237,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1209,20 +1250,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.24" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.24" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1232,23 +1272,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -1308,6 +1348,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.7" @@ -1348,8 +1397,8 @@ dependencies = [ "base64 0.20.0", "hmac 0.12.1", "percent-encoding", - "rand", - "sha2 0.10.7", + "rand 0.8.5", + "sha2 0.10.8", "subtle", "time", "version_check", @@ -1402,27 +1451,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0853f4732d9557cc1f3b4a97112bd5f00a7c619c9828edb45d0a2389ce2913f9" +checksum = "03b9d1a9e776c27ad55d7792a380785d1fe8c2d7b099eed8dbd8f4af2b598192" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed06a9dd2e065be7c1f89cdc820c8c328d2cb69b2be0ba6338fe4050b30bf510" +checksum = "5528483314c2dd5da438576cd8a9d0b3cedad66fb8a4727f90cd319a81950038" dependencies = [ "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.27.3", - "hashbrown 0.13.2", + "gimli", + "hashbrown 0.14.1", "log", "regalloc2", "smallvec", @@ -1431,33 +1481,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f0e0e34689be78c2689b31374404d21f1c7667431fd7cd29bed0fa8a67ce8" +checksum = "0f46a8318163f7682e35b8730ba93c1b586a2da8ce12a0ed545efc1218550f70" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05c0a89f82c5731ccad8795cd91cc3c771295aa42c268c7f81607388495d374" +checksum = "37d1239cfd50eecfaed468d46943f8650e32969591868ad50111613704da6c70" + +[[package]] +name = "cranelift-control" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc530560c8f16cc1d4dd7ea000c56f519c60d1a914977abe849ce555c35a61d" +dependencies = [ + "arbitrary", +] [[package]] name = "cranelift-entity" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f184fc14ff49b119760e5f96d1c836d89ee0f5d1b94073ebe88f45b745a9c7a5" +checksum = "f333fa641a9ad2bff0b107767dcb972c18c2bfab7969805a1d7e42449ccb0408" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1990b107c505d3bb0e9fe7ee9a4180912c924c12da1ebed68230393789387858" +checksum = "06abf6563015a80f03f8bc4df307d0a81363f4eb73108df3a34f6e66fb6d5307" dependencies = [ "cranelift-codegen", "log", @@ -1467,15 +1527,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d398114545d4de2b152c28b1428c840e55764a6b58eea2a0e5c661d9a382a" +checksum = "0eb29d0edc8a5c029ed0f7ca77501f272738e3c410020b4a00f42ffe8ad2a8aa" [[package]] name = "cranelift-native" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c769285ed99f5791ca04d9716b3ca3508ec4e7b959759409fddf51ad0481f51" +checksum = "006056a7fa920870bad06bf8e1b3033d70cbb7ee625b035efa9d90882a931868" dependencies = [ "cranelift-codegen", "libc", @@ -1484,9 +1544,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.94.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cbcdec1d7b678919910d213b9e98d5d4c65eeb2153ac042535b00931f093d3" +checksum = "7b3d08c05f82903a1f6a04d89c4b9ecb47a4035710f89a39a21a147a80214672" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1494,7 +1554,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser", + "wasmparser 0.112.0", "wasmtime-types", ] @@ -1597,7 +1657,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossterm_winapi", "libc", "mio", @@ -1698,10 +1758,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -1710,6 +1770,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + [[package]] name = "der" version = "0.7.8" @@ -1737,10 +1806,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1885,7 +1955,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -1944,27 +2014,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[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", + "syn 2.0.38", ] [[package]] @@ -1975,25 +2032,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "etcetera" version = "0.8.0" @@ -2013,9 +2059,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "faster-hex" @@ -2037,9 +2083,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -2048,20 +2094,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] -[[package]] -name = "file-per-thread-logger" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "filetime" version = "0.2.22" @@ -2088,9 +2124,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2098,13 +2134,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -2131,23 +2166,12 @@ checksum = "3b5dd19b048b2dfde153588594b4f3da47b18afd18d171bb8d1d27741256bbaa" [[package]] name = "fs-set-times" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857cf27edcb26c2a36d84b2954019573d335bb289876113aceacacdca47a4fd4" +checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" dependencies = [ - "io-lifetimes 1.0.11", - "rustix 0.36.15", - "windows-sys 0.45.0", -] - -[[package]] -name = "fs-set-times" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" -dependencies = [ - "io-lifetimes 1.0.11", - "rustix 0.38.13", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", ] @@ -2216,6 +2240,21 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[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-macro" version = "0.3.28" @@ -2224,7 +2263,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -2275,6 +2314,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.1", + "debugid", + "fxhash", + "serde", + "serde_json", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2285,6 +2337,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "getrandom" version = "0.2.10" @@ -2294,26 +2357,20 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +dependencies = [ + "fallible-iterator", + "indexmap 2.0.2", + "stable_deref_trait", +] [[package]] name = "git2" @@ -2434,9 +2491,9 @@ dependencies = [ [[package]] name = "gix-command" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256" +checksum = "3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7" dependencies = [ "bstr", ] @@ -2482,7 +2539,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-path", "libc", @@ -2597,7 +2654,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-features", "gix-path", @@ -2605,9 +2662,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" +checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" dependencies = [ "faster-hex", "thiserror", @@ -2620,7 +2677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "parking_lot 0.12.1", ] @@ -2642,7 +2699,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "btoi", "filetime", @@ -2678,7 +2735,7 @@ checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -2687,7 +2744,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-commitgraph", "gix-date", "gix-hash", @@ -2757,9 +2814,9 @@ dependencies = [ [[package]] name = "gix-packetline" -version = "0.16.6" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6df0b75361353e7c0a6d72d49617a37379a7a22cba4569ae33a7720a4c8755a" +checksum = "8a8384b1e964151aff0d5632dd9b191059d07dff358b96bd940f1b452600d7ab" dependencies = [ "bstr", "faster-hex", @@ -2796,7 +2853,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bstr", "gix-attributes", "gix-config-value", @@ -2814,7 +2871,7 @@ dependencies = [ "gix-command", "gix-config-value", "parking_lot 0.12.1", - "rustix 0.38.13", + "rustix", "thiserror", ] @@ -2919,7 +2976,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gix-path", "libc", "windows", @@ -3014,7 +3071,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" dependencies = [ - "fastrand 2.0.0", + "fastrand 2.0.1", ] [[package]] @@ -3126,9 +3183,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash", "allocator-api2", @@ -3140,7 +3197,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -3178,9 +3235,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -3274,6 +3331,27 @@ dependencies = [ "serde", ] +[[package]] +name = "http-types" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", + "base64 0.13.1", + "futures-lite", + "http", + "infer", + "pin-project-lite", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs 0.8.5", + "serde_urlencoded", + "url", +] + [[package]] name = "httparse" version = "1.8.0" @@ -3286,12 +3364,6 @@ 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.27" @@ -3351,6 +3423,7 @@ dependencies = [ "futures-util", "http", "hyper", + "log", "rustls 0.21.7", "rustls-native-certs", "tokio", @@ -3384,16 +3457,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -3468,20 +3541,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "serde", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -3492,9 +3565,15 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "instant" @@ -3517,7 +3596,7 @@ dependencies = [ "base64 0.21.4", "hyper", "hyper-rustls 0.24.1", - "ring", + "ring 0.16.20", "serde", "serde_json", "thiserror", @@ -3535,22 +3614,11 @@ dependencies = [ [[package]] name = "io-extras" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde93d48f0d9277f977a333eca8313695ddd5301dc96f7e02aeddcb0dd99096f" +checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" dependencies = [ - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", + "io-lifetimes", "windows-sys 0.48.0", ] @@ -3566,7 +3634,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys 0.48.0", "winreg", @@ -3585,7 +3653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -3615,9 +3683,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "ittapi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e0d0b7b3b53d92a7e8b80ede3400112a6b8b4c98d1f5b8b16bb787c780582c" +checksum = "25a5c0b993601cad796222ea076565c5d9f337d35592f8622c753724f06d7271" dependencies = [ "anyhow", "ittapi-sys", @@ -3626,9 +3694,9 @@ dependencies = [ [[package]] name = "ittapi-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f8763c96e54e6d6a0dccc2990d8b5e33e3313aaeae6185921a3f4c1614a77c" +checksum = "cb7b5e473765060536a660eed127f758cf1a810c73e49063264959c60d1727d9" dependencies = [ "cc", ] @@ -3657,9 +3725,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3681,7 +3749,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.4", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -3704,9 +3772,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" @@ -3722,9 +3790,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -3757,27 +3825,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3839,9 +3895,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" @@ -3862,26 +3918,27 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if 1.0.0", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix", ] [[package]] @@ -3902,15 +3959,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -3959,15 +4007,15 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] [[package]] name = "mongodb" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" +checksum = "e22d517e7e678e1c9a2983ec704b43f3b22f38b1b7a247ea3ddb36d21578bf4e" dependencies = [ "async-trait", "base64 0.13.1", @@ -3986,28 +4034,28 @@ dependencies = [ "md-5", "pbkdf2", "percent-encoding", - "rand", + "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.9", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_bytes", "serde_with 1.14.0", "sha-1", - "sha2 0.10.7", + "sha2 0.10.8", "socket2 0.4.9", "stringprep", "strsim", "take_mut", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.1", "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver 0.21.2", "typed-builder", "uuid", - "webpki-roots 0.22.6", + "webpki-roots 0.25.2", ] [[package]] @@ -4092,7 +4140,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", + "rand 0.8.5", "smallvec", "zeroize", ] @@ -4120,9 +4168,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -4162,24 +4210,15 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", -] - [[package]] name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ + "crc32fast", + "hashbrown 0.14.1", + "indexmap 2.0.2", "memchr", ] @@ -4295,7 +4334,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand", + "rand 0.8.5", "thiserror", "tokio", "tokio-stream", @@ -4329,6 +4368,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.11.2" @@ -4347,7 +4392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -4366,13 +4411,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -4423,7 +4468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -4443,7 +4488,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -4506,9 +4551,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand", + "rand 0.8.5", ] +[[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" @@ -4517,13 +4568,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -4589,9 +4640,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4604,19 +4655,19 @@ checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.1", "lazy_static", "num-traits", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rusty-fork", "tempfile", "unarray", @@ -4687,9 +4738,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -4723,6 +4774,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -4730,8 +4794,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -4741,7 +4815,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[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]] @@ -4750,7 +4833,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.10", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -4759,7 +4851,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4770,9 +4862,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -4780,14 +4872,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -4797,7 +4887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -4820,39 +4910,49 @@ 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_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regalloc2" -version = "0.6.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4866,13 +4966,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4888,10 +4988,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "reqwest" -version = "0.11.20" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -4916,10 +5022,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls 0.24.1", "tower-service", - "trust-dns-resolver 0.22.0", + "trust-dns-resolver 0.23.1", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -4953,7 +5060,7 @@ dependencies = [ "async-trait", "chrono", "futures", - "getrandom", + "getrandom 0.2.10", "http", "hyper", "parking_lot 0.11.2", @@ -4978,13 +5085,13 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" dependencies = [ "anyhow", "chrono", - "rand", + "rand 0.8.5", ] [[package]] @@ -5010,11 +5117,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rmp" version = "0.8.12" @@ -5052,7 +5173,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", + "rand_core 0.6.4", "signature", "spki", "subtle", @@ -5080,7 +5201,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.32", + "syn 2.0.38", "walkdir", ] @@ -5090,7 +5211,7 @@ version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "walkdir", ] @@ -5121,7 +5242,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.19", + "semver 1.0.20", ] [[package]] @@ -5145,47 +5266,19 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.15" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", "itoa", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys", "once_cell", "windows-sys 0.48.0", ] -[[package]] -name = "rustix" -version = "0.38.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.7", - "windows-sys 0.48.0", -] - [[package]] name = "rustls" version = "0.20.9" @@ -5193,7 +5286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -5205,8 +5298,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki", "sct", ] @@ -5233,29 +5326,19 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustrict" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6b50905364a8bafca05898f2816b2f75e00d4aaf4c0c33a17fc898b9bc7153" +checksum = "1f35794fdc3d71a3ac840726c688e7892e58ed71f407b48a975b9d41fc819e80" dependencies = [ "arrayvec 0.7.4", "bitflags 1.3.2", @@ -5322,8 +5405,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -5360,9 +5443,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -5375,9 +5458,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -5393,22 +5476,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5424,6 +5507,28 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_qs" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + [[package]] name = "serde_repr" version = "0.1.16" @@ -5432,7 +5537,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -5468,14 +5573,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.2", "serde", "serde_json", "time", @@ -5506,9 +5612,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 1.0.0", "cpufeatures", @@ -5536,9 +5642,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5547,9 +5653,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", ] @@ -5571,7 +5677,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "clap", @@ -5588,9 +5694,10 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", + "async-stripe", "async-trait", "axum", "axum-extra 0.7.7", @@ -5600,8 +5707,9 @@ dependencies = [ "hyper", "jsonwebtoken", "opentelemetry", - "rand", - "ring", + "portpicker", + "rand 0.8.5", + "ring 0.16.20", "serde", "serde_json", "shuttle-common", @@ -5617,7 +5725,7 @@ dependencies = [ [[package]] name = "shuttle-builder" -version = "0.28.0" +version = "0.30.1" dependencies = [ "async-trait", "clap", @@ -5643,7 +5751,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.28.0" +version = "0.30.1" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5653,14 +5761,14 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.32", + "syn 2.0.38", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5683,12 +5791,12 @@ dependencies = [ "opentelemetry-otlp", "pin-project", "proptest", - "rand", + "rand 0.8.5", "reqwest", - "ring", + "ring 0.16.20", "rmp-serde", "rustrict", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "sqlx", @@ -5709,7 +5817,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.28.0" +version = "0.30.1" dependencies = [ "cargo-shuttle", "hyper", @@ -5725,7 +5833,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5749,7 +5857,7 @@ dependencies = [ "pipe", "portpicker", "prost-types", - "rand", + "rand 0.8.5", "rmp-serde", "serde", "serde_json", @@ -5779,7 +5887,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5804,10 +5912,10 @@ dependencies = [ "pem", "pin-project", "portpicker", - "rand", + "rand 0.8.5", "rcgen", "reqwest", - "ring", + "ring 0.16.20", "rustls 0.20.9", "rustls-pemfile", "serde", @@ -5837,7 +5945,7 @@ dependencies = [ [[package]] name = "shuttle-logger" -version = "0.28.0" +version = "0.30.1" dependencies = [ "async-trait", "chrono", @@ -5863,11 +5971,11 @@ dependencies = [ [[package]] name = "shuttle-orchestrator" -version = "0.28.0" +version = "0.30.1" [[package]] name = "shuttle-proto" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "chrono", @@ -5886,7 +5994,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.28.0" +version = "0.30.1" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5897,7 +6005,7 @@ dependencies = [ "once_cell", "portpicker", "prost", - "rand", + "rand 0.8.5", "serde_json", "shuttle-common", "shuttle-proto", @@ -5912,7 +6020,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.28.0" +version = "0.30.1" dependencies = [ "async-trait", "chrono", @@ -5936,7 +6044,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -5970,7 +6078,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.28.0" +version = "0.30.1" dependencies = [ "anyhow", "async-trait", @@ -6023,7 +6131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -6055,9 +6163,29 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "smol_str" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +dependencies = [ + "serde", +] [[package]] name = "snailquote" @@ -6081,9 +6209,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -6114,6 +6242,12 @@ dependencies = [ "der", ] +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "sqlformat" version = "0.2.2" @@ -6127,9 +6261,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -6140,9 +6274,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash", "atoi", @@ -6161,7 +6295,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -6171,7 +6305,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -6185,9 +6319,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -6198,9 +6332,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -6211,7 +6345,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -6224,13 +6358,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "bytes", "chrono", @@ -6252,11 +6386,11 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -6268,13 +6402,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "byteorder", "chrono", "crc", @@ -6293,11 +6427,11 @@ dependencies = [ "md-5", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -6309,9 +6443,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "chrono", @@ -6401,9 +6535,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -6429,19 +6563,40 @@ dependencies = [ ] [[package]] -name = "system-interface" -version = "0.25.9" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 2.4.0", + "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-interface" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" +dependencies = [ + "bitflags 2.4.1", "cap-fs-ext", "cap-std", "fd-lock", - "io-lifetimes 2.0.2", - "rustix 0.38.13", + "io-lifetimes", + "rustix", "windows-sys 0.48.0", - "winx 0.36.2", + "winx", ] [[package]] @@ -6500,17 +6655,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6544,22 +6699,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -6574,14 +6729,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -6589,15 +6745,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -6619,9 +6775,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -6631,7 +6787,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -6654,7 +6810,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -6704,9 +6860,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -6714,14 +6870,14 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tungstenite", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -6785,7 +6941,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -6848,7 +7004,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -6900,7 +7056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "base64 0.21.4", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -6940,11 +7096,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 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6953,20 +7108,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -7053,7 +7208,7 @@ dependencies = [ "ipnet", "lazy_static", "log", - "rand", + "rand 0.8.5", "smallvec", "thiserror", "tinyvec", @@ -7063,21 +7218,21 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner 0.5.1", + "enum-as-inner 0.6.0", "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.4.0", "ipnet", - "lazy_static", - "rand", + "once_cell", + "rand 0.8.5", "smallvec", "thiserror", "tinyvec", @@ -7108,22 +7263,23 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" dependencies = [ "cfg-if 1.0.0", "futures-util", "ipconfig", - "lazy_static", "lru-cache", + "once_cell", "parking_lot 0.12.1", + "rand 0.8.5", "resolv-conf", "smallvec", "thiserror", "tokio", "tracing", - "trust-dns-proto 0.22.0", + "trust-dns-proto 0.23.1", ] [[package]] @@ -7134,9 +7290,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c89fd17b7536f2cf66c97cff6e811e89e728ca0ed13caeed610c779360d8b4" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -7158,9 +7314,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -7168,7 +7324,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "rustls 0.21.7", "sha1", "thiserror", @@ -7189,17 +7345,17 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ulid" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9d3475df4ff8a8f7804c0fc3394b44fdcfc4fb635717bf05fbb7c41c83a376" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ - "rand", + "rand 0.8.5", "serde", ] @@ -7232,9 +7388,9 @@ checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -7253,9 +7409,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -7275,6 +7431,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -7284,6 +7446,7 @@ dependencies = [ "form_urlencoded", "idna 0.4.0", "percent-encoding", + "serde", ] [[package]] @@ -7319,7 +7482,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_json", "utoipa-gen", @@ -7334,7 +7497,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "uuid", ] @@ -7356,11 +7519,11 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom", + "getrandom 0.2.10", "serde", ] @@ -7398,10 +7561,16 @@ dependencies = [ ] [[package]] -name = "walkdir" -version = "2.3.3" +name = "waker-fn" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -7416,6 +7585,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7424,9 +7599,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ef833092c0215e44f601591593cb3bf0853d5cd1e3104d698808dc525f2852" +checksum = "ec076cd75f207327f5bfaebb915ef03d82c3a01a6d9b5d0deb6eafffceab3095" dependencies = [ "anyhow", "async-trait", @@ -7434,36 +7609,36 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", - "fs-set-times 0.18.1", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes", "is-terminal", "once_cell", - "rustix 0.36.15", + "rustix", "system-interface", "tracing", "wasi-common", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasi-common" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474a216b3461220699d5e192ceac8fbc5b489af020760803b5a9d1e030dc8b0f" +checksum = "3f391b334c783c1154369be62c31dc8598ffa1a6c34ea05d7f8cf0b18ce7c272" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.4.1", "cap-rand", "cap-std", "io-extras", "log", - "rustix 0.36.15", + "rustix", "thiserror", "tracing", "wasmtime", "wiggle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -7487,7 +7662,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -7521,7 +7696,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7541,6 +7716,15 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" +dependencies = [ + "leb128", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -7558,85 +7742,113 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap 1.9.3", - "url", + "indexmap 2.0.2", + "semver 1.0.20", +] + +[[package]] +name = "wasmparser" +version = "0.115.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" +dependencies = [ + "indexmap 2.0.2", + "semver 1.0.20", +] + +[[package]] +name = "wasmprinter" +version = "0.2.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e" +dependencies = [ + "anyhow", + "wasmparser 0.115.0", ] [[package]] name = "wasmtime" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15ac4b4bee3bcf3750911c7104cf50f12c6b1055cc491254c508294b019fd79" +checksum = "16ed7db409c1acf60d33128b2a38bee25aaf38c4bd955ab98a5b623c8294593c" dependencies = [ "anyhow", "async-trait", "bincode", + "bumpalo", "cfg-if 1.0.0", - "indexmap 1.9.3", + "encoding_rs", + "fxprof-processed-profile", + "indexmap 2.0.2", "libc", "log", - "object 0.30.4", + "object", "once_cell", "paste", "psm", "rayon", "serde", + "serde_derive", + "serde_json", "target-lexicon", - "wasmparser", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", "wasmtime-cache", "wasmtime-component-macro", + "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit", "wasmtime-runtime", + "wasmtime-winch", "wat", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-asm-macros" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f9859a704f6b807a3e2e3466ab727f3f748134a96712d0d27c48ba32b32992" +checksum = "53af0f8f6271bd687fe5632c8fe0a0f061d0aa1b99a0cd4e1df8e4cbeb809d2f" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66f6967ff6d89a4aa0abe11a145c7a2538f10d9dca6a0718dba6470166c8182" +checksum = "41376a7c094335ee08abe6a4eff79a32510cc805a249eff1b5e7adf0a42e7cdf" dependencies = [ "anyhow", "base64 0.21.4", "bincode", "directories-next", - "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix", "serde", - "sha2 0.10.7", + "serde_derive", + "sha2 0.10.8", "toml 0.5.11", - "windows-sys 0.45.0", + "windows-sys 0.48.0", "zstd", ] [[package]] name = "wasmtime-component-macro" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f851a08ee7b76f74a51d1fd1ce22b139a40beb1792b4f903279c46b568eb1ec" +checksum = "74ab5b291f2dad56f1e6929cc61fb7cac68845766ca77c3838b5d05d82c33976" dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -7644,172 +7856,261 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc0e0e733a8d097a137e05d5e7f62376600d32bd89bdc22c002d1826ae5af2e" +checksum = "21436177bf19f6b60dc0b83ad5872e849892a4a90c3572785e1a28c0e2e1132c" [[package]] name = "wasmtime-cranelift" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ce3bc589c19cd055cc5210daaf77288563010f45cce40c58b57182b9b5bdd" +checksum = "920e42058862d1f7a3dd3fca73cb495a20d7506e3ada4bbc0a9780cd636da7ca" dependencies = [ "anyhow", + "cfg-if 1.0.0", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.27.3", + "gimli", "log", - "object 0.30.4", + "object", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516d63bbe18219e64a9705cf3a2c865afe1fb711454ea03091dc85a1d708194d" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a205f0f0ea33bcb56756718a9a9ca1042614237d6258893c519f6fed593325" +checksum = "59cef239d663885f1427f8b8f4fde7be6075249c282580d94b480f11953ca194" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.27.3", - "indexmap 1.9.3", + "gimli", + "indexmap 2.0.2", "log", - "object 0.30.4", + "object", "serde", + "serde_derive", "target-lexicon", "thiserror", - "wasmparser", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", + "wasmprinter", + "wasmtime-component-util", "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d55f4f52b3f26b03e6774f2e6c41c72d4106175c58ddd0b74b4b4a81c1ba702c" +checksum = "2ef118b557df6193cd82cfb45ab57cd12388fedfe2bb76f090b2d77c96c1b56e" dependencies = [ "cc", "cfg-if 1.0.0", - "rustix 0.36.15", + "rustix", "wasmtime-asm-macros", - "windows-sys 0.45.0", + "wasmtime-versioned-export-macros", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b111d642a32c858096a57456e503f6b72abdbd04d15b44e12f329c238802f66" +checksum = "c8089d5909b8f923aad57702ebaacb7b662aa9e43a3f71e83e025c5379a1205f" dependencies = [ - "addr2line 0.19.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli 0.27.3", + "gimli", "ittapi", "log", - "object 0.30.4", + "object", "rustc-demangle", + "rustix", "serde", + "serde_derive", "target-lexicon", "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit-debug" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7da0f3ae2e2cefa9d28f3f11bcf7d956433a60ccb34f359cd8c930e2bf1cf5a" +checksum = "9b13924aedf6799ad66edb25500a20e3226629978b30a958c55285352bad130a" dependencies = [ - "object 0.30.4", + "object", "once_cell", - "rustix 0.36.15", + "rustix", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52aab5839634bd3b158757b52bb689e04815023f2a83b281d657b3a0f061f7a0" +checksum = "c6ff5f3707a5e3797deeeeac6ac26b2e1dd32dbc06693c0ab52e8ac4d18ec706" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-runtime" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b738633d1c81b5df6f959757ac529b5c0f69ca917c1cfefac2e114af5c397014" +checksum = "11ab4ce04ac05342edfa7f42895f2a5d8b16ee914330869acb865cd1facf265f" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap 1.9.3", + "encoding_rs", + "indexmap 2.0.2", "libc", "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset 0.9.0", "paste", - "rand", - "rustix 0.36.15", + "rand 0.8.5", + "rustix", + "sptr", + "wasm-encoder 0.32.0", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys 0.45.0", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc565951214d0707de731561b84457e1200c545437a167f232e150c496295c6e" +checksum = "ecf61e21d5bd95e1ad7fa42b7bdabe21220682d6a6046d376edca29760849222" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", - "wasmparser", + "wasmparser 0.112.0", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe877472cbdd6d96b4ecdc112af764e3b9d58c2e4175a87828f892ab94c60643" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "wasmtime-wasi" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e94602bafb39e36746156127a97f4e33991fa02179f9f8e5b3372365ec61da8" +checksum = "b6db393deb775e8bece53a6869be6425e46b28426aa7709df8c529a19759f4be" dependencies = [ "anyhow", + "async-trait", + "bitflags 2.4.1", + "bytes", + "cap-fs-ext", + "cap-net-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "futures", + "io-extras", + "io-lifetimes", + "is-terminal", "libc", + "once_cell", + "rustix", + "system-interface", + "thiserror", + "tokio", + "tracing", "wasi-cap-std-sync", "wasi-common", "wasmtime", "wiggle", + "windows-sys 0.48.0", +] + +[[package]] +name = "wasmtime-winch" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc5a770003807c55f2187a0092dea01722b0e24151e35816bd5091538bb8e88" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "object", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "winch-codegen", ] [[package]] name = "wasmtime-wit-bindgen" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f2a35ff0a64ae07d4fcfd7c9b745e517be00ddb9991f8e2ad2c913cc11094" +checksum = "62003d48822f89cc393e93643366ddbee1766779c0874353b8ba2ede4679fbf9" dependencies = [ "anyhow", "heck", + "indexmap 2.0.2", "wit-parser", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5412bb464066d64c3398c96e6974348f90fa2a55110ad7da3f9295438cd4de84" + [[package]] name = "wast" version = "35.0.2" @@ -7821,23 +8122,23 @@ dependencies = [ [[package]] name = "wast" -version = "64.0.0" +version = "66.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "93cb43b0ac6dd156f2c375735ccfd72b012a7c0a6e6d09503499b8d3cb6e6072" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.35.0", ] [[package]] name = "wat" -version = "1.0.71" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "e367582095d2903caeeea9acbb140e1db9c7677001efa4347c3687fd34fe7072" dependencies = [ - "wast 64.0.0", + "wast 66.0.2", ] [[package]] @@ -7852,9 +8153,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", "home", @@ -7869,30 +8170,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -7901,7 +8184,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.4", + "rustls-webpki", ] [[package]] @@ -7919,7 +8202,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.13", + "rustix", ] [[package]] @@ -7936,13 +8219,13 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wiggle" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6627da83e9cdf851594a1dcf047573e700ecaa7ce79b70e02f3df5e5d24d0096" +checksum = "da341f21516453768bd115bdc17b186c0a1ab6773c2b2eeab44a062db49bd616" dependencies = [ "anyhow", "async-trait", - "bitflags 1.3.2", + "bitflags 2.4.1", "thiserror", "tracing", "wasmtime", @@ -7951,28 +8234,28 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0857652586aafc82fca56bbbf90fde5d5e086ffba58b0f1c0f113e54c500b55b" +checksum = "e22c6bd943a4bae37052b79d249fb32d7afa22b3f6a147a5f2e7bc2b9f901879" dependencies = [ "anyhow", "heck", "proc-macro2", "quote", "shellexpand", - "syn 1.0.109", + "syn 2.0.38", "witx", ] [[package]] name = "wiggle-macro" -version = "7.0.1" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97189f1092c8877865aa64467ca99afd0182eb23ad1b4ce22319f18422543d55" +checksum = "7d72d838b7c9302b2ca7c44f36d6af5ce1988239a16deba951d99c4630d17caf" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wiggle-generate", ] @@ -7994,9 +8277,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", ] @@ -8007,6 +8290,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "winch-codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50647204d600a2a112eefac0645ba6653809a15bd362c7e4e6a049a5bdff0de9" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-environ", +] + [[package]] name = "windows" version = "0.48.0" @@ -8016,6 +8315,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -8150,9 +8458,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -8167,38 +8475,30 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winx" -version = "0.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960" -dependencies = [ - "bitflags 1.3.2", - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", -] - [[package]] name = "winx" version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "windows-sys 0.48.0", ] [[package]] name = "wit-parser" -version = "0.6.4" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f887c3da527a51b321076ebe6a7513026a4757b6d4d144259946552d6fc728b3" +checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" dependencies = [ "anyhow", "id-arena", - "indexmap 1.9.3", + "indexmap 2.0.2", "log", "pulldown-cmark", + "semver 1.0.20", + "serde", + "serde_json", "unicode-xid", "url", ] @@ -8253,9 +8553,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "yansi" @@ -8311,11 +8611,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 93cd93d4d6..ec3be0eb3f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.28.1"; + version = "0.30.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-j4YFCvBvNJbzxaOwguhczWQt1CzCAMQsxZAVgJoLgUs="; + hash = "sha256-zfRIw1PN3KCMrwnlFM3AFh/Dt8ywu2l3EABz87s8JK0="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 679dfc54e8..6af361a12d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -3,24 +3,25 @@ , fetchFromGitHub , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XqT2l839fRDNj6zJB0vlVMmoRB2Lz61cN297PNIvFX8="; + hash = "sha256-pJsRY9fDHDQTd0J/gbSzl/JM3kzm8v+w13JRbTYnMFM="; }; - cargoSha256 = "sha256-PzPQnexT1oeZ0FkTLyZiQJlMx+WDoSHD+J1JzoME6sA="; + cargoHash = "sha256-XDGOhPO09d5nq355LiDBKc5v8dx8RuzGKC2fnFF/M+E="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix index 2b682000c1..1c5564c723 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -2,16 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "holmgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tumcGnYqY/FGP8UWA0ccfdAK49LBcT8qH6SshrDXNAI="; + sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; }; - cargoSha256 = "sha256-fcosKyGOy0SKrHbsKdxQJimelt1ByAM4YKo7WpHV8CA="; + cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + + checkFlags = [ + # Requires a rustup toolchain to be installed. + "--skip check_toolchain_listing_on_multiple_projects" + ]; meta = with lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index 11b82f3fd8..a40f44e5aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.30"; + version = "1.0.31"; src = fetchCrate { inherit pname version; - hash = "sha256-5k4nx4VSYN4jscCwj5NVYnV5/GS0PRCA23xR6STHr88="; + hash = "sha256-2V2JXSlFzYoSidByWGFTGwNHM9c5Go1cdHLp0b7N+hI="; }; - cargoHash = "sha256-eyGDizffuIPpa797YplD6763/JlVtoMAxybK9KsgmLE="; + cargoHash = "sha256-mcYAqzfZO0M/UQTeYp4eCD7VVIWhtHi7VxBZtrr/aCk="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix index a8d959db55..6ade17d202 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.3.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-+Zez3dxLtcPFzrPdi+yGucr+55GDmMsaLlUZcyqprtc="; + hash = "sha256-HdA7c64ru21DvjhIswRW6r+EH3uYj4ipWzBcfVcc644="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-ErUzhmPA2M1H4B4SrEt4FRWHcWLA1UzQqVA1gkrmdJQ="; + cargoHash = "sha256-hmig/QKzdt/rIl4gggTygwZ6rEmekw0OlppN6pXvvmw="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; @@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec { description = "Build smaller, faster, and more secure desktop applications with a web frontend"; homepage = "https://tauri.app/"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya happysalada ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix index 706e33235c..9df84462ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-JUpXLdFaG653u9a4Nq7TC1ZNEcZ0QzgYMjGS8Kam0ec="; + hash = "sha256-vLD7M+Pg0BHJq9zDPeJLY+v/Vri/XtV3pQu0+ZE84Ew="; }; - cargoHash = "sha256-7yPvHCmdokb/oJqR3h+RJOQbE/pcrIDBltnG5zfoqMk="; + cargoHash = "sha256-NKT5AijwNm/BVhHGVAXq6sWBJYjSpq90TXHjlrihldo="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; 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 55bf3bb36b..29c0e5302a 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.42"; + version = "0.1.43"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8CQnmUk7jMlcdtZh6046B5duKnZKaMVk2xG4D2svqVw="; + sha256 = "sha256-aZzkVyRWxpSB0lPD7A8kbZc93h43OyPn0Pk9tCIZRnA="; }; - cargoHash = "sha256-e3ku9c4VLZtnJIUDRMAcUVaJnOsMqckj3XmuJHSR364="; + cargoHash = "sha256-kQ1NQDvOBU8mmQQgNR4l1bBN0nr/ZSudJkL7Gf9hpgU="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix index 2660bc5d23..99c10f7d21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "13.1.0"; + version = "13.2.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2j35R7QTn7Z3yqzOU+VWAoZfYodecDt45Plx/D7+GyU="; + sha256 = "sha256-yMHGn/RPtYuxS3rHzm87mW7nBUEaSOGsCT7Ckxvhabk="; }; - cargoHash = "sha256-OEv9LOep4YNWY7oixY5zD9QgxqSYTrcf5oSXpxvnKIs="; + cargoHash = "sha256-hO2W0NRV9fGHnnS1kOkQ+e0sFzVSBQk3MOm8qDYbA00="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix index cbc1e41945..7fcdf761ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wasi/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wasi"; - version = "0.1.27"; + version = "0.1.28"; src = fetchCrate { inherit version; pname = "cargo-wasi-src"; - sha256 = "sha256-u6+Fn/j2cvpBqTIfyPC8jltcCKGimFcu4NiMFCAfmwg="; + sha256 = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; }; - cargoHash = "sha256-Hi5Z5TmiHXp7YrqXfbwACKEximksQRhdoMGU1iLmXOk="; + cargoHash = "sha256-yXtxznUp2gECq2CvRByiFzbTjYtWvTheDjGoynJWb+o="; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: - # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.27/tests/tests/support.rs#L13-L18 + # https://github.com/bytecodealliance/cargo-wasi/blob/0.1.28/tests/tests/support.rs#L13-L18 doCheck = false; meta = with lib; { 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 fda47b5070..63217b655a 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 @@ -5,7 +5,6 @@ , Cocoa , CoreServices , Foundation -, rust , libiconv }: @@ -27,7 +26,7 @@ rustPlatform.buildRustPackage rec { # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) preCheck = '' - export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + export PATH="$(pwd)/target/${stdenv.hostPlatform.rust.rustcTarget}/release:$PATH" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 2b1e893fd0..5a4e14a733 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-l9uPn5eLGfCq2E6gogXCefbhxro6iOOYraeIPj9/S50="; + hash = "sha256-7XY2hFmc4Vqh8fVCSrpQkoXZKZxX3kqppIDGc3T7qRw="; }; - cargoHash = "sha256-2mbGwElBfo4L/iGZm3iRBR5UGeMFlfaSp79vVvCAIo0="; + cargoHash = "sha256-a/WRXiTSmQyAlxXqeFUWWSPFbHKL7Sifv2CW7rgbLWk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index cba3b4b3dd..5f8b3d2cdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { - owner = "kolloch"; + owner = "nix-community"; repo = pname; rev = version; - sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; + sha256 = "sha256-nyX1lfaA0eBSB/BaxPzCsyD8p/hxCwNIvr4Ru3i/YX0="; }; sourceRoot = "${src.name}/crate2nix"; - cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; + cargoSha256 = "sha256-3+emOr3hh+DDkboJbYyJFZgkzmcdA9jdronz7wM4x28="; nativeBuildInputs = [ makeWrapper ]; @@ -32,6 +32,13 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram $out/bin/crate2nix \ --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} + + rm -rf $out/lib $out/bin/crate2nix.d + mkdir -p \ + $out/share/bash-completion/completions \ + $out/share/zsh/vendor-completions + $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions + $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions ''; meta = with lib; { @@ -40,9 +47,10 @@ rustPlatform.buildRustPackage rec { Crate2nix generates Nix files from Cargo.toml/lock files so that you can build every crate individually in a Nix sandbox. ''; - homepage = "https://github.com/kolloch/crate2nix"; + homepage = "https://github.com/nix-community/crate2nix"; license = licenses.asl20; maintainers = with maintainers; [ kolloch cole-h ]; platforms = platforms.all; }; } + diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix index 3bf083932d..7756e6f4f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.15"; + version = "0.1.17"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; rev = version; - hash = "sha256-LbF/j6yKcH/OmrcYAvTN8L2XFYnULAAh9hCGsG/JkFg="; + hash = "sha256-LZOB0HF6Chs1BxRPqQnMQrjk2CbFR2UoVQl+W32R9yI="; }; - cargoHash = "sha256-92sRJt6d96BoinXlw432Fyn2EjsuSUdOwyFtqj0iUXw="; + cargoHash = "sha256-9io8cSKwBONw8epPw5foa+/ur4VvvjQrOcj5Hse3oJ4="; meta = with lib; { description = "A formatter for the leptos view! macro"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 4b66ecfa46..37cec14ee4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hxtT5cL1PTXkTXGB0nVPhMI8Vlqrk4q2MHW0KGosFwc="; + hash = "sha256-MVmu9m+9XhWuPBEEoaYmsSbMFziSZaM5Gg5kOr1DT54="; }; - cargoHash = "sha256-IZWh/Bp9TdB+flc1PXVkwrIdOr83TFk6X6O5M0FVaO4="; + cargoHash = "sha256-hrdrGFtL2vGczINnvDa4rclkXsNWnEqtTt3NVaRay8w="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix index ae30c18bd8..4bb0a4de6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs"; - version = "0.21.0"; + version = "0.21.1"; src = fetchCrate { inherit pname version; - hash = "sha256-3L4dvEIPxbNYh+Z5G1iccqLLYi13RTRaFnOD4U/zNtE="; + hash = "sha256-UmQwz9Ejb5+epwGKsglV3QdWGqOEH/3DRqvKtfm14kg="; }; - cargoHash = "sha256-peCXG9TrsnBqQOy+pgRNGstn0bwKNCdWQ3Jn5r0fcOI="; + cargoHash = "sha256-awa84xvIRrEhuPm4N2xt5bsYy2wbLjJokrKoAxCYvR4="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index eb3b2a7102..b159e01497 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-10-02"; - cargoSha256 = "sha256-KCjdsvHWVr3vsyv+KhxwXTI3WJbAggb9HLyN/1ioek8="; + version = "2023-11-13"; + cargoSha256 = "sha256-Nrq8si+myWLmhaJrvxK+Ki599A5VddNcCd5kQZWTnNs="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-2K3Aq4gjPZBDnkAMJaMA4ElE+BNbmrqtSBWtt9kPGaM="; + sha256 = "sha256-gjMqmlCvLVlptL35HHvALrOKrFyxjg5hryXbbpVyoeY="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index c944588228..999ae8b5eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.30.1"; + version = "0.30.2"; src = fetchCrate { inherit pname version; - hash = "sha256-Yjdrz/8uonM2kRCNAe6YZNPDDVmjqDiEk8CwgZUbBCg="; + hash = "sha256-nZ9c4Rog7dvlsnu4y33Yp+PJzwvBKvwyxF4V5UeJCVE="; }; - cargoHash = "sha256-875B7e/RCXs84yiwou5NZgxmjolxCKkQsUcRxXnV+Qo="; + cargoHash = "sha256-wVv46yYlKsyxk+2eXwsd0jMC64Xk5+Krp18B2pKo0mo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index 87c4a0f3ee..dbaeb264b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-aKU+1eoLm/h5Rj/vAZOyAnyl5/TpStL5g8PPdYCJ8o0="; + sha256 = "sha256-0imHwZNyhJXFai1J5tHqnQ6Ta10nETQ5TILGH0bHc8Y="; }; - cargoSha256 = "sha256-y2BoV59oJPMBf9rUgMhHu87teurwPSNowRbuPfXubGA="; + cargoHash = "sha256-Lm3agCnxDxcj7op17uiokK8Y790oMxwHJStvP/9DsI0="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index f17208fbfb..55ce40832f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,17 +10,17 @@ let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = upstream-info.sha256_linux; + hash = upstream-info.hash_linux; }; x86_64-darwin = { system = "mac-x64"; - sha256 = upstream-info.sha256_darwin; + hash = upstream-info.hash_darwin; }; aarch64-darwin = { system = "mac-arm64"; - sha256 = upstream-info.sha256_darwin_aarch64; + hash = upstream-info.hash_darwin_aarch64; }; }; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${version}/${spec.system}/chromedriver-${spec.system}.zip"; - sha256 = spec.sha256; + hash = spec.hash; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sem/default.nix b/third_party/nixpkgs/pkgs/development/tools/sem/default.nix index 144521a70f..36afa5d741 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sem/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sem/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sem"; - version = "0.28.3"; + version = "0.28.4"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-g/OMkR3G3g6lp1lQn9L8QxOuUoQDsvxLBC7TYZ1Onsg="; + sha256 = "sha256-T7f/yfzNITlU03N059y1B/I1H77Pji34EK+x0Qs6XwQ="; }; - vendorHash = "sha256-GAYCdq4eHTyxQ5JaNYLd3mQ2LvgLHdmYdz4RN+Hpe70="; + vendorHash = "sha256-CDjfhnnt4+ml8k/2QPGaSlJFpxDYWNjA5nzLXL2APX4="; subPackages = [ "." ]; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index c84ceff3e6..c5fa54b240 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.21.1"; + version = "2.21.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-GMK3fAmYYxwwlXXbCluDFu8YWId77F4mrdxXIIO+jc8="; + sha256 = "sha256-2CNV1y2/D2KrQylWqd5DDQYOAhR7pGeBFva1wysGZRw="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-wUQ9HbBNNB66394RPHaoGJkFrL28xW5CIXDzGnMIPKY="; + cargoHash = "sha256-jZUL2/iLOITIfonXzJS/K6wRSPPb2aY9ASbq1KTf+kM="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index 8625bdcff3..3200790995 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.7.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-szoeGv8U8M4Wai1GFUkgE8Rn+URRrlkZvzMBxCcqvGI="; + hash = "sha256-ddb1+h4mcQ1Uu4UvCL4IL4sjEbI70HZ4B/MMsUHbhSk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix index 1475de9419..2094cde2ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/smlfmt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smlfmt"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "shwestrick"; repo = pname; rev = "v${version}"; - hash = "sha256-7CTfMiEvuOena5SOE0qKpFPq6ARxmkE6d+loznZNbC0="; + hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE="; }; nativeBuildInputs = [ mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index 274aff3f4e..8827d6b709 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "sdk-${version}"; - hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix index b9fd274952..8306a05def 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "2.3.2"; + version = "3.1.5"; src = fetchzip { - url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; + url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; + hash = "sha256-5Q6bAuEEBkiRHjX8Ie5FFhPfzwKRdlNIQucTqDEIZuQ="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -24,6 +24,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "${lib.getExe finalAttrs.finalPackage} --version"; + version = "v${finalAttrs.version}"; + }; + updateScript = gitUpdater { + url = "https://github.com/spring-projects/spring-boot"; + ignoredVersions = ".*-(RC|M).*"; + rev-prefix = "v"; + }; + }; + meta = with lib; { description = '' CLI which makes it easy to create spring-based applications @@ -40,9 +53,11 @@ stdenv.mkDerivation rec { a command line tool that runs “spring scripts”. ''; homepage = "https://spring.io/projects/spring-boot"; + changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "spring"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix index 8fac2f9aa0..92c1c0037f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.7"; + version = "0.16.10"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-y28dn/LhqQxbszKwOjpiU93oP1tq/H0NL9vonhERLzw="; + hash = "sha256-NwSQLpqgOuVBH+EYjSch3h0BMJZPK3/FcKO4iUnNt+E="; }; proxyVendor = true; - vendorHash = "sha256-ugLjaKCVgVl2jhH/blQ44y/c8hxQpbdlxUC4u+FgMGM="; + vendorHash = "sha256-2MwibiWT9rrbNVva61wR1OPrG+fZkxTDznC2pdm3CKE="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock index 2449a6038e..dab324f352 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.21.2) - pg_query (2.1.3) - google-protobuf (>= 3.19.2) - sqlint (0.2.1) - pg_query (~> 2) + google-protobuf (3.25.0) + pg_query (4.2.3) + google-protobuf (>= 3.22.3) + sqlint (0.3.0) + pg_query (>= 1) PLATFORMS ruby @@ -14,4 +14,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 2.3.9 + 2.4.20 diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix index 0bbd8fe005..05925a45e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5g23mjc4fiwymrfkvgcmsym50rapw7vm988fm46rlpg3zijgl1"; + sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; type = "gem"; }; - version = "3.21.2"; + version = "3.25.0"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; type = "gem"; }; - version = "2.1.3"; + version = "4.2.3"; }; sqlint = { dependencies = ["pg_query"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wbsi0ivashmpgavz7j22qns3zcya8j6sd2f9y8hk8bnqx7i3ak0"; + sha256 = "06gljzjhbfvxs85699jr1p7y2j8hhi629kfarad7yjqy7ssl541n"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix index 15072d9568..417c66ea3a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-eic5j/mD4PBCMcATTSTJSKazZFJOxQuW7NyiYPjKCcM="; + hash = "sha256-gFJaW7Mb3HKN6D/qnpfNQVxBOKbxIBZOVWJ63wiGoeU="; }; - cargoHash = "sha256-kzb00W9IlshhiV+vUIOlO6BnprHr2XPf8P207WYFP5I="; + cargoHash = "sha256-a1kAVIyGnVF3IWkDQbmV3L9cfY+1564RW6eWfBHbTZ8="; nativeBuildInputs = [ pkg-config @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://squawkhq.com/"; changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ andrewsmith ]; + maintainers = with lib.maintainers; [ andrewsmith marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 1afb444c32..23fac8ddac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f4U3vzgvFF1N6X8f8zwtqSaQfiwNX7CecpcJ0GKx2P0="; + sha256 = "sha256-Bw9+BUvZC4sRLFyU5K6FHsWVZ3PTlMAonRmTSwV5AwU="; }; - cargoSha256 = "sha256-az5j0qvP3mZXRJZOmslDb40MSMS+iAvXYVNGw8vt7gg="; + cargoSha256 = "sha256-bainEM4eRMNyecSBi5k1ifjDULWdXed6GP6i10IVA+w="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix new file mode 100644 index 0000000000..fdf103f190 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, cmake +}: + +rustPlatform.buildRustPackage rec { + pname = "subxt"; + version = "0.31.0"; + + src = fetchFromGitHub { + owner = "paritytech"; + repo = "subxt"; + rev = "v${version}"; + hash = "sha256-eEsb88f16Ug9h7JNkzwSTxJZEV5r4XmmzsTxTQGk+j8="; + }; + + cargoHash = "sha256-kcs55NgwsqgZXcx+a6g0o9KdUG4tt0ZBv3dU/Pb0NJk="; + + # Only build the command line client + cargoBuildFlags = [ "--bin" "subxt" ]; + + # Needed by wabt-sys + nativeBuildInputs = [ cmake ]; + + # Requires a running substrate node + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/paritytech/subxt"; + description = "Submit transactions to a substrate node via RPC."; + license = with licenses; [ gpl3Plus asl20 ]; + maintainers = [ maintainers.FlorianFranzen ]; + }; +} 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 c7807fc9c6..77217a8acd 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.102.2"; + version = "1.112.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-EhGGqBJdAnlccUFDUqzbujaVnQ8VggjY6vlGjI80TN8="; + hash = "sha256-2Cw+TQMKWwjWUgsif+Ot9OZ1kIlancoT4TfJ343mnLY="; }; - vendorHash = "sha256-AiYLSXDmTrswAd64PjF0OH0/z4blAP68HfWlwL48fww="; + vendorHash = "sha256-vseD7Oov7Gi1lEnF1hEAChoPByFa8T82njWBINC/Ea4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index d626027ee1..f150ebc0d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -1,15 +1,20 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, symfony-cli +}: buildGoModule rec { pname = "symfony-cli"; - version = "5.5.10"; - vendorHash = "sha256-eeVi/O4p7bF4CPqJBCpLfx1Yc5vZZ3b8RV5ERcIL8H4="; + version = "5.7.3"; + vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-n0R+J41lJYxswMnknYAAEKwwIqOremZF73cRBYfD3CE="; + hash = "sha256-mxyGdyR1yZY+YOyf9ngk6P2oBmUL+IbwLWaCvZziSIM="; }; ldflags = [ @@ -23,11 +28,16 @@ buildGoModule rec { ''; # Tests requires network access - checkPhase = '' - $GOPATH/bin/symfony-cli - ''; + doCheck = false; + + passthru.tests.version = testers.testVersion { + inherit version; + package = symfony-cli; + command = "symfony version --no-ansi"; + }; meta = { + changelog = "https://github.com/symfony-cli/symfony-cli/releases/tag/v${version}"; description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; license = lib.licenses.agpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix b/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix index c05fbdc0c5..59564cec7f 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-tlsAztU6Rk7xq1T3NNDlB0Gt3iRpvAk72VO+gGuYEps="; - aarch64-linux = "sha256-bYe/QJ7UuMq5tDhhof/83gfUN0DbenQu/wbrvLylKeM="; - armv7l-linux = "sha256-d0kK0clkSUW4ARTNUVWpmJidXwxLucjC4Vwu924YB1E="; - x86_64-darwin = "sha256-4cvrHklkQ0fo7fVi1aRKOMhX4ky7dENwGh2jqTneQLo="; - x86_64-linux = "sha256-FX0N1WmV9pixd3ZoBXnSdBSSDBqj//S8e5nEaQuEdxc="; + aarch64-darwin = "sha256-VAJypHejh3ZW2x3fPNvuFw3VkmBbsSTnmBHuqU3hXVY="; + aarch64-linux = "sha256-Yxw6DIP8j3JANgvN870socG0aNX76d3c0z12ePbuFSs="; + armv7l-linux = "sha256-yS8LDmUit5pM4WrMjhqUJD4e0fWKWf8cr4w1PACj+8g="; + x86_64-darwin = "sha256-cTIp7HesR9Ae6yFpUy0H1hrqtHSSReIKZmKE06XCsWU="; + x86_64-linux = "sha256-Z3Co095akfV/11UWvpc0WAp3gdUrpjVskUw1v01Eifs="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/teller/default.nix b/third_party/nixpkgs/pkgs/development/tools/teller/default.nix index 8930777229..a906e6c1f5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/teller/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/teller/default.nix @@ -19,6 +19,7 @@ buildGoModule { # use make instead of default checks because e2e does not work with `buildGoDir` checkPhase = '' runHook preCheck + HOME="$(mktemp -d)" # We do not set trimpath for tests, in case they reference test assets export GOFLAGS=''${GOFLAGS//-trimpath/} diff --git a/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix b/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix deleted file mode 100644 index 7f3e4a80ba..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "tfplugindocs"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform-plugin-docs"; - rev = "v${version}"; - sha256 = "sha256-GiMjm7XG/gFGOQXYeXsKbU7WQdrkQ0+J/SvfbLu24bo="; - }; - - vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w="; - - meta = with lib; { - description = "Generate and validate Terraform plugin/provider documentation"; - homepage = "https://github.com/hashicorp/terraform-plugin-docs"; - license = licenses.mpl20; - maintainers = with maintainers; [ lewo ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix index b6472fd072..4c86ea2fb9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tracy/default.nix @@ -1,28 +1,26 @@ { lib , stdenv , fetchFromGitHub -, pkg-config + , capstone +, darwin +, dbus , freetype , glfw -, dbus , hicolor-icon-theme +, pkg-config , tbb -, darwin }: -let - disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 -in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.9.1"; + version = "0.10"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-K1lQNRS8+ju9HyKNVXtHqslrPWcPgazzTitvwkIO3P4"; + sha256 = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA="; }; patches = lib.optionals (stdenv.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")) [ @@ -52,15 +50,18 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin "-Wno-format-security" ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation" - ++ lib.optional disableLTO "-fno-lto"); + # workaround issue #19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto"); buildPhase = '' runHook preBuild + make -j $NIX_BUILD_CORES -C capture/build/unix release + make -j $NIX_BUILD_CORES -C csvexport/build/unix release + make -j $NIX_BUILD_CORES -C import-chrome/build/unix release + make -j $NIX_BUILD_CORES -C library/unix release make -j $NIX_BUILD_CORES -C profiler/build/unix release LEGACY=1 - make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release - make -j $NIX_BUILD_CORES -C capture/build/unix/ release - make -j $NIX_BUILD_CORES -C update/build/unix/ release + make -j $NIX_BUILD_CORES -C update/build/unix release runHook postBuild ''; @@ -68,16 +69,35 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy - install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome - install -D ./capture/build/unix/capture-release $out/bin/capture - install -D ./update/build/unix/update-release $out/bin/update + install -D -m 0755 capture/build/unix/capture-release $out/bin/capture + install -D -m 0755 csvexport/build/unix/csvexport-release $out/bin/tracy-csvexport + install -D -m 0755 import-chrome/build/unix/import-chrome-release $out/bin/import-chrome + install -D -m 0755 library/unix/libtracy-release.so $out/lib/libtracy.so + install -D -m 0755 profiler/build/unix/Tracy-release $out/bin/tracy + install -D -m 0755 update/build/unix/update-release $out/bin/update + mkdir -p $out/include/Tracy/client + mkdir -p $out/include/Tracy/common + mkdir -p $out/include/Tracy/tracy + + cp -p public/client/*.{h,hpp} $out/include/Tracy/client + cp -p public/common/*.{h,hpp} $out/include/Tracy/common + cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace extra/desktop/tracy.desktop \ + --replace Exec=/usr/bin/tracy Exec=tracy + + install -D -m 0644 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml + install -D -m 0644 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop + install -D -m 0644 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg + install -D -m 0644 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png + install -D -m 0644 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg + '' + '' runHook postInstall ''; postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy ''; meta = with lib; { @@ -85,6 +105,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; - maintainers = with maintainers; [ mpickering nagisa ]; + mainProgram = "tracy"; + maintainers = with maintainers; [ mpickering nagisa paveloom ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix index 2567afc408..dac5acb6e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-PALt0tSCYbViC1RHrri0IiD4TUjMnkIwgd3Pe+K9i3Q="; + hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s="; }; - cargoSha256 = "sha256-MkjLAaktc0A0yJqixpgnrn8NOHVmcaQL65L0TvrEPRg="; + cargoSha256 = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc="; meta = { description = "one CLI to format the code tree"; diff --git a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 0859e1a362..0cf07a9c29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -4,28 +4,26 @@ buildGo121Module, fetchFromGitHub, installShellFiles, + nix-update-script, }: buildGo121Module rec { pname = "turso-cli"; - version = "0.85.3"; + version = "0.87.2"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-dJpHrqPyikkUnE4Un1fGOEJL49U5IiInYeSWmI04r18="; + hash = "sha256-EZSVKmOIzwokCKreLnZj4DWEhjjXo3TFhieGVR7w7NM="; }; - vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE="; + vendorHash = "sha256-3IV0MgDe71lqLQ6tB2NM2kYokXGWvR+hh4lvxw5QWjA="; nativeBuildInputs = [ installShellFiles ]; - # Build with production code - tags = ["prod"]; - # Include version for `turso --version` reporting - preBuild = '' - echo "v${version}" > internal/cmd/version.txt - ''; + ldflags = [ + "-X github.com/tursodatabase/turso-cli/internal/cmd.version=v${version}" + ]; preCheck = '' export HOME=$(mktemp -d) @@ -38,6 +36,8 @@ buildGo121Module rec { --zsh <($out/bin/turso completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "This is the command line interface (CLI) to Turso."; homepage = "https://turso.tech"; diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index e83bb95d1f..0a7434a2dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.15.0"; + version = "5.16.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-KV5afgfQmQOJAPLNUjELB0+JZ8Qlz9wqOphZm/IBJcc="; + sha256 = "sha256-J/0g0HLn25KwQvphCq32qgX4Pdu+OmZT3UImcTS1o1M="; }; buildInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix index 7daa9401a1..42dfe97d8c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twitch-cli/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.20"; + version = "1.1.21"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-hIyZwXDI3lJQOK27RaABf7cnj7jOxKdLUdZB5fp+7kY="; + hash = "sha256-LJWZi83AynmmGBajtk8CLmQ6Vd1IqLKNaiZMLZCLly0="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-OhcRMXY8s+XciF+gV3cZ8fxtzo9+I76tBPZ0xG8ddHU="; + vendorHash = "sha256-1uUokMeI0D/apDFJLq+Go5BQp1JMYxJQF8nKvw52E7o="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 7d7eae9452..e11473d09e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.17"; + version = "1.16.23"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-T7JekWWSGetaREhbYeh5LygXWaI5vwSSmMIFvzBtB3k="; + hash = "sha256-n/R6/wkFApSOG1QmtJ3YDFsotVrgLIYqopHJAlod2GA="; }; - cargoHash = "sha256-aYhdTNtvKfvgmt9Y1YTNEKYQy3m5bH9tsUbbL87crqw="; + cargoHash = "sha256-n+OBj54d3EtxKszAC7A5DUlJeS92RRgpfu9VuW+rTAI="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix b/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix index 04b4e45500..c4b2a421b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-Dr6EKpKVy2DLhivJ42Bx+WJL2L710sQlXroaAm66Gpo="; + sha256 = "sha256-SvnmdpsdXbPSC+4inoMvu55az33Zucqf4c3yQ0g6EMw="; }; - vendorHash = "sha256-J7rZAvEx0jgkhJIEE19rV2WdBCIvkqYzB72ZiABs56U="; + vendorHash = "sha256-ai+Mro/ooUElJJq8BbnCo9PupIAwlanDeh+oe5otJJ4="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix b/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix index 482ff69ee0..0b0183aef1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.35.0"; + version = "0.35.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-aN8O+5zzGGLWAPk/oNFOnBBv2rsljWaxTKlC19XTt58="; + sha256 = "sha256-zoZPAJTEmKHL78wfAHqayBxw8tRANIsMckj+wXtbLTw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix index b093d8c109..2f3bfbe8c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.8.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-DeKqLbgHmk6034ItyBzWRXLSeOj3+h49bzf9IX3Aa00="; + hash = "sha256-LOm4d6SV5rlb7NovhSp7V0JIaOfHIZOqeIcpIvTsZsA="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-g6XdHl/Jxa+kpIjvnaP/RtoByo5O4IDC+s8M4DfGU/8="; + cargoHash = "sha256-Pz+jA4uC/40mj5Jn/lB+XcoN/QSD23iLwsEowTUI0pg="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix b/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix index 7d80b364c1..caddb568c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.21.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-iBbKVfkmt8n06JJ8TSO8BDCeiird9gTkOQhlREtZ5Cw="; + hash = "sha256-cFqjoWQu/6cvbT1vxReERybuKpeL4LCVl5qhvSwr6fs="; }; npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; diff --git a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 754b2d4a5e..09a11cef84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,18 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.261"; - - # If we were to use "dev" here instead of headers, the setupHook would be - # placed in that output instead of "out". - outputs = ["out" "headers"]; - outputInclude = "headers"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "v${version}"; - hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 16dfcd878a..43b8206016 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.18.2"; + version = "2.20.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-RW8t5s28eUxHKEz+UHdeHlRMYprKlA9AdtiEy661des="; + hash = "sha256-3Zd507yAymmQRgybm96VD413kId0/kMxIHbmUh8j6Kk="; }; - vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs="; + vendorHash = "sha256-OVoOCExAU6cDyWhSpk4hkhBZpWehH+4/vU/X81w9XgA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix index 5c71762bd3..64b8f4dd47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.33"; + version = "1.0.34"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-zSgV+lrNpQcR+V6Icyf3cPMeAdRDfsL2EErF8pxev5c="; + sha256 = "sha256-KlaMc3k1y6KviMDrMbKPcJOywJasrPZrnvSos8hgu+8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index d7b6aba2a2..c87f49aa7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -7,9 +7,9 @@ , stdenv , curl , Security -, version ? "0.2.87" -, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0=" -, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko=" +, version ? "0.2.88" +, hash ? "sha256-CpyB2poKIqP4Zfn3Gk1hA9m6EQ/ZiyO91wZViMH7Wsk=" +, cargoHash ? "sha256-0D5ABJ3jwsrFIvXSOYgOqJtV5B9JUsHZfJEKl6PO47I=" }: rustPlatform.buildRustPackage rec { diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix index 3bea40fdb6..7857b66c91 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-2EKUnRvd1w1TxO7OFKYpTzSXC3fdIU7Jk0MIPPTY96U="; + sha256 = "sha256-JaFaqYIwcRXYl5JukAfViUn8VTpMPThFO8EaVTPIudA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix index 0213dfcf77..3ed1fc89bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.3"; + version = "0.5.4"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-Uny5FiMox0oIaJ+WE7p3kw4guSzktEF+WzuxjgFXh2I="; + hash = "sha256-MPmB6G5JCIEfFYchVmV8sS5Zfzfui9tClDI6RlLdP6U="; }; vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; @@ -23,6 +23,12 @@ buildGoModule { subPackages = [ "." ]; + checkFlags = [ + # Flaky tests. + # See https://github.com/bokwoon95/wgo/blob/e0448e04b6ca44323f507d1aca94425b7c69803c/START_HERE.md?plain=1#L26. + "-skip=TestWgoCmd_FileEvent" + ]; + meta = with lib; { description = "Live reload for Go apps"; homepage = "https://github.com/bokwoon95/wgo"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix index 2f666bf709..7f573d1566 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix @@ -2,27 +2,32 @@ , lib , gitUpdater , fetchFromGitHub +, testers , cmake , pkg-config , boost , gtest , wayland +, wayland-scanner }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlcs"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "MirServer"; repo = "wlcs"; - rev = "v${version}"; - hash = "sha256-+YM5dT45p9wk0gJeATmhWDFJJMaUdcTfw8GLS/vMkw4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-YYrhcN1BSJISn/7lxu7Db5YaOK+okdHVJuMwqSDzAIU="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config + wayland-scanner ]; buildInputs = [ @@ -31,8 +36,11 @@ stdenv.mkDerivation rec { wayland ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { @@ -57,5 +65,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.linux; + pkgConfigModules = [ + "wlcs" + ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix index a4ac97c926..c840be21cb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wp-cli/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.6.0"; + version = "2.9.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; + hash = "sha256-r2t8zCHtCQfLUE21oFnw4SAReQWmAXv91Ddc7jyT2GQ="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix index b8181e812f..e9ae6ef416 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "yarn-berry"; - version = "3.4.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${version}"; - hash = "sha256-eBBB/F+mnGi93Qf23xgt306/ogoV76RXOM90O14u5Tw="; + hash = "sha256-9QNeXamNqRx+Bfg8nAhnImPuNFyqrHIs1eF9prSwIR4="; }; buildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = with lib; { homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management."; license = licenses.bsd2; - maintainers = with maintainers; [ ryota-ka ]; + maintainers = with maintainers; [ ryota-ka thehedgeh0g ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index 2e870975d3..9dbbd19d46 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.35.2"; + version = "4.40.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-iQJx++MeyXT7hS4NATvzYq+YErTEKYCajAzcn1QIWDU="; + hash = "sha256-S2hsZkospf1VMH/fDLiALEraOA8dbG62JejGY2T/tRU="; }; - vendorHash = "sha256-nh7boYBNYvNe+uMxV460bkmWQ61VYuvFYQ5CIaNEv98="; + vendorHash = "sha256-ggb8ZX2KBj/oY+vomCme/7KlnfsykMm4l027kwlxpWY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix index e89e00fa01..668fc47fe7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.0"; + version = "0.46.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-ZCWdOvwWXSeFzRQiiObuJqvz0ngAJ8n/0LeoGCv2vu4="; + sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix index 8619e36173..557e0aff6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aLehlxMztOqtItzouWESQs5K2EZ+O8EAwUQT9v7GX08="; + sha256 = "sha256-d/XJirgJlS4jTlmATQpFH+Yn7M4EdY0yNDKM1A2NjoA="; }; vendorHash = "sha256-n/7HV3dyV8qsJeEk+vikZvuM5G7nf0QOwVBtInJdU2k="; diff --git a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix index e82d69a94a..796095e109 100644 --- a/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bootstrap-studio/default.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "6.4.5"; + version = "6.5.1"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-kCMqDNRC3H3WBpDJCBXBxvWRuiGCrZ7gRGghXiGtGq8="; + sha256 = "sha256-mx9KkMwFzdjhzofr+4l7MTerGfSSsI8+z8jmaoV8uvo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index 8b6c7c962c..f0f8a34545 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.4"; + version = "1.0.11"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ko0DFCYUfuww3qrz4yUde6Mr4yPVcMJwwGdrG9Fiwhg="; + hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-0KFAvfyTJU1z/KeKVbxFx6+Ijz4YzMsCMiytom730QI="; + hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-YEIXthisgNx+99wZF8hZ1T3MU20Yeyms3/q1UGDAwso="; + hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-lEEIrmIEcIdE2SqnKlVxpiq9ae2wNRepHY61jWqk584="; + hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 9e201961f1..603c9bf5d9 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.37.1"; + version = "1.38.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-ZfICDkW6q4OLvpSZnRpa6i324OuLNuOHXuSOQ7/aUJ8="; + hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4="; }; - cargoHash = "sha256-n+6Hz9Q20vq1Bf/Ny7I3IpGbkEECjjBG8xHN1v0z0Pw="; + cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 522fe48a3b..e4d2a2fec7 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -1,21 +1,20 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; in fetch_librusty_v8 { - version = "0.78.0"; + version = "0.81.0"; shas = { - x86_64-linux = "sha256-1df7bH3ZdgIasZvvNH3iKQ4lmcGNq6ldgMV9nDgOC14="; - aarch64-linux = "sha256-riSyGvOGwqL1hSAXpUvBju/3DN20THtg0NuIzn1m1M8="; - x86_64-darwin = "sha256-4Nnkrj9GfliYUInb7SssqzFIDbV0XVxdEBC28klqBDM="; - aarch64-darwin = "sha256-oepRKVb05zAUeZo2RN3Vca0CUQ+Fd1duIU3xOG+FEJw="; + x86_64-linux = "sha256-e77LYm/sus7EY4eiRuEp6G25djDaT4wSD4FBCxy4vcE="; + aarch64-linux = "sha256-wPfUcuT2Z2sy5nLf8xR3QjGQKk6OsM/45jnYv/Hw+Zs="; + x86_64-darwin = "sha256-UbnRiywM7b7q3rITZzNeWAuKU+HXXAqVapQ9j5ND6go="; + aarch64-darwin = "sha256-42d3VGBv5lW1InfzYfWr6Xj0GpyJ6GWswVNtUa8ID30="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts b/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts index b38e0a28f1..39831f6ea2 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts +++ b/third_party/nixpkgs/pkgs/development/web/deno/update/librusty_v8.ts @@ -40,13 +40,12 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.\${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/third_party/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix index 6e9fc0a669..1e0a306c13 100644 --- a/third_party/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 249be524ad..4ced81546c 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,26 +2,25 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.104"; + version = "0.1.117"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-iTizgA3MtcG6YN7aHaZF4UXT6jBKodsMxXG61UgDNaQ="; + hash = "sha256-cB1t7TKAqHuzbvrXkOMJPXtNXTqNB/TBDS3OHYX96ko="; }; - vendorHash = "sha256-5Nu9XpYjlZHGazWTK7LmfnEGgewKa017PLHtV9HycD0="; + vendorHash = "sha256-+mCOSgRmvfAXHwtLup3vYhLY0zTtXIJeOtYD69B4/7o="; subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}" "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z" - "-X github.com/superfly/flyctl/internal/buildinfo.environment=production" - "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}" + "-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}" ]; + tags = ["production"]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix index 3450c693d4..9990cf4553 100644 --- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Lh0bfU1A/deQiTunjGbhErd8GXiVwCJCI3cuvClVRTU="; + sha256 = "sha256-v+AAIDWRAgBXmhX2BecEio4s5dVA77K+YycZY1k9uvg="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index e058c05761..3559db1ec6 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,11 +16,11 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.5.7"; + version = "2023.5.8"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-XB8ktjF6VWj57whbXC0iwH3WpuMkGnRZCCdx86Mj2ZI="; + sha256 = "sha256-x5DYS3DteYtq1EQuJ3EFV/d/YThPgnhhIj+GpEJsFDY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix index 44b4af4408..3d420158ca 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE="; + hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk="; }; # the integration tests will try to clone a remote repos @@ -39,6 +39,6 @@ crystal.buildCrystalPackage rec { maintainers = with maintainers; [ peterhoeg ]; mainProgram = "lucky"; platforms = platforms.unix; - broken = lib.versionOlder crystal.version "0.35.1"; + broken = lib.versionOlder crystal.version "1.6.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock index 9bf2212760..b9956fd780 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock @@ -2,17 +2,17 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 1.1.0 + version: 1.5.0 lucky_task: git: https://github.com/luckyframework/lucky_task.git - version: 0.1.1 + version: 0.3.0 + + lucky_template: + git: https://github.com/luckyframework/lucky_template.git + version: 0.2.0 nox: - git: https://github.com/matthewmcgarvey/nox.git + git: https://github.com/crystal-loot/nox.git version: 0.2.2 - teeplate: - git: https://github.com/luckyframework/teeplate.git - version: 0.8.5 - diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix index fef8c1602b..a06b87c502 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix @@ -1,22 +1,22 @@ { ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.1.0"; - sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8"; + rev = "v1.5.0"; + sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; }; lucky_task = { url = "https://github.com/luckyframework/lucky_task.git"; - rev = "v0.1.1"; - sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; + rev = "v0.3.0"; + sha256 = "0lp2wv01wdcfr3h43n3dqgaymvypy0i6kbffb4mg4l30lijgpfb6"; + }; + lucky_template = { + url = "https://github.com/luckyframework/lucky_template.git"; + rev = "v0.2.0"; + sha256 = "1xix82d0xanq4xkcv83hm56nj5f2rsbrqhk70j5zr37d3kydfypl"; }; nox = { - url = "https://github.com/matthewmcgarvey/nox.git"; + url = "https://github.com/crystal-loot/nox.git"; rev = "v0.2.2"; sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; }; - teeplate = { - url = "https://github.com/luckyframework/teeplate.git"; - rev = "v0.8.5"; - sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; - }; } diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index 1c832bb456..ae30de0e6c 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.12.9"; + version = "2.20.5"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-+NBYn+gEsoclROnq2msNB4knviGn/XA9vNAuB0JZNek="; + hash = "sha256-+oaK6OdBRxtWW+0zp+pbCcGyphuOLzyv/LfjDqDiTGw="; }; - vendorHash = "sha256-/Pw7fHVXWsovxfyzkWfb6UiRDBmiua82667N4Scl5+A="; + vendorHash = "sha256-GQqdr0zMQhi6QfLAyFchtWPOGfpo5yODDinKWA/s+qs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 8b615a55dd..b1bd0ae912 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -34,6 +34,7 @@ let */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" + "--openssl-use-def-ca-store" ]; copyLibHeaders = @@ -52,6 +53,12 @@ let strictDeps = true; + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; + }; + CC_host = "cc"; CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix index e7dec1c12f..c2d5d58bea 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -1,8 +1,20 @@ -{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in @@ -10,5 +22,5 @@ in inherit enableNpm; version = "14.21.3"; sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; + patches = lib.optional pkgs.stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index d4bb94c07d..930b648ca5 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -1,8 +1,20 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, fetchpatch, enableNpm ? true }: let + # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix index 13a50dc12d..b36e8e3d0f 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -1,15 +1,27 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in buildNodejs { inherit enableNpm; - version = "18.18.0"; - sha256 = "sha256-5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A="; + version = "18.18.2"; + sha256 = "sha256-ckni8K+UPsOFmVBPSyor0x+5OHhykbbMymyLrfAeO1Y="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix index a4c83d32a3..a66db24b0e 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.8.0"; - sha256 = "sha256-QSvoR65t9hAQup2jzD5r5bZ6oALjVOkZ9Z7INgNxcEw="; + version = "20.9.0"; + sha256 = "sha256-oj2WgQq/BFVCazSdR85TEPMwlbe8BXG5zFEPSBw6RRk="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix new file mode 100644 index 0000000000..af3af652fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v21.nix @@ -0,0 +1,19 @@ +{ callPackage, openssl, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; +in +buildNodejs { + inherit enableNpm; + version = "21.2.0"; + sha256 = "sha256-1Xyc6jlHZPodmvUeUsdEn3EZPp1ExKgfvt7GU+yCdwc="; + patches = [ + ./revert-arm64-pointer-auth.patch + ./disable-darwin-v8-system-instrumentation-node19.patch + ./bypass-darwin-xcrun-node16.patch + ./node-npm-build-npm-package-logic.patch + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix index 831ad4f5cd..4c39eab90f 100644 --- a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/default.nix @@ -6,11 +6,11 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "adamcstephens"; repo = "pnpm-lock-export"; - rev = "cc03755d6718a9c0d268d0f375907328ac15dc92"; - hash = "sha256-9OlFgmdKjvz4pB36Wm/fUAQDsD8zs32OSA3m2IAgrH8="; + rev = "a7ede6d96f9d273b6b495718b85ed40f432c34ba"; + hash = "sha256-RQGyUQOyFZW7UbIPRRlZu8FKcZN2kO0DcPfB8uLFFg4="; }; - npmDepsHash = "sha256-nqkH7vFD78YvYr9Klguk2o7qHr5wr3ZjaywUKRRRjJo="; + npmDepsHash = "sha256-1VTXzlafuI+dU4k1JyZPVI5/5h0gt/eggPPXKYxKsbs="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json index 7ca48860c5..6618d656f3 100644 --- a/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json +++ b/third_party/nixpkgs/pkgs/development/web/pnpm-lock-export/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@cvent/pnpm-lock-export", + "name": "pnpm-lock-export", "version": "0.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@cvent/pnpm-lock-export", + "name": "pnpm-lock-export", "version": "0.4.0", "license": "MIT", "dependencies": { @@ -36,7 +36,7 @@ "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "eslint": "^8.45.0", - "jest": "^28.1.3", + "jest": "^29.5.3", "prettier": "^3.0.0", "tmp-promise": "^3.0.3", "typescript": "^4.9.5" @@ -65,45 +65,110 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dependencies": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -124,12 +189,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", - "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -139,22 +204,19 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -167,22 +229,22 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -201,28 +263,28 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -274,43 +336,43 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -382,9 +444,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -453,6 +515,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -567,33 +644,33 @@ } }, "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -611,13 +688,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -801,41 +878,29 @@ } }, "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/console/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -843,126 +908,55 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/console/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/console/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/console/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/console/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -973,25 +967,13 @@ } } }, - "node_modules/@jest/core/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/core/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -999,88 +981,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/core/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/core/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/core/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/core/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/core/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/core/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/create-cache-key-function": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-27.5.1.tgz", @@ -1094,39 +1006,27 @@ } }, "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3" + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/environment/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/environment/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1134,269 +1034,67 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/environment/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/environment/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect-utils": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz", - "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==", - "dev": true, - "dependencies": { - "jest-get-type": "^29.4.3" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/expect/node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2" + "jest-get-type": "^29.6.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/@jest/expect/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@jest/expect/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/expect/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1404,121 +1102,40 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/fake-timers/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/fake-timers/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/fake-timers/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/globals/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1526,36 +1143,30 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/globals/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/globals/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -1563,21 +1174,20 @@ "glob": "^7.1.3", "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -1588,25 +1198,13 @@ } } }, - "node_modules/@jest/reporters/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/reporters/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1614,92 +1212,22 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/reporters/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/reporters/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/reporters/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/reporters/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/schemas": { - "version": "29.6.0", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", - "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { "@sinclair/typebox": "^0.27.8" @@ -1709,53 +1237,41 @@ } }, "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/test-result/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1763,84 +1279,66 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/test-result/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/test-result/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", + "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/transform/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1848,41 +1346,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/transform/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/transform/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/transform/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/transform/node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", @@ -1927,9 +1402,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -1951,21 +1426,15 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, "node_modules/@manypkg/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz", @@ -2488,21 +1957,21 @@ "dev": true }, "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@sinonjs/commons": "^3.0.0" } }, "node_modules/@swc/core": { @@ -2728,9 +2197,9 @@ "dev": true }, "node_modules/@types/babel__core": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", - "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", "dev": true, "dependencies": { "@babel/parser": "^7.20.7", @@ -2741,18 +2210,18 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", "dev": true, "dependencies": { "@babel/parser": "^7.1.0", @@ -2760,18 +2229,18 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", - "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", "dev": true, "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", "dev": true, "dependencies": { "@types/node": "*" @@ -2829,12 +2298,6 @@ "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==", "dev": true }, - "node_modules/@types/prettier": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", - "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", - "dev": true - }, "node_modules/@types/semver": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", @@ -3905,21 +3368,21 @@ "dev": true }, "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" @@ -3941,10 +3404,35 @@ "node": ">=8" } }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -3953,7 +3441,7 @@ "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-preset-current-node-syntax": { @@ -3980,16 +3468,16 @@ } }, "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -4135,9 +3623,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -4154,10 +3642,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -4258,9 +3746,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001518", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz", - "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==", + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "dev": true, "funding": [ { @@ -4566,9 +4054,9 @@ } }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, "node_modules/cookie": { @@ -4629,6 +4117,53 @@ "node": ">= 0.10" } }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@types/yargs": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4687,10 +4222,18 @@ } }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deep-is": { "version": "0.1.4", @@ -4802,9 +4345,9 @@ } }, "node_modules/diff-sequences": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", - "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4885,15 +4428,15 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.477", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.477.tgz", - "integrity": "sha512-shUVy6Eawp33dFBFIoYbIwLHrX0IZ857AlH9ug2o4rvbWmpaCUdBpQ5Zw39HRrfzAFm4APJE9V+E2A/WB0YqJw==", + "version": "1.4.575", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.575.tgz", + "integrity": "sha512-kY2BGyvgAHiX899oF6xLXSIf99bAvvdPhDoJwG77nxCSyWYuRH6e9a9a3gpXBvCs6lj4dQZJkfnW2hdKWHEISg==", "dev": true }, "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { "node": ">=12" @@ -5268,17 +4811,16 @@ } }, "node_modules/expect": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz", - "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/expect-utils": "^29.6.2", - "@types/node": "*", - "jest-get-type": "^29.4.3", - "jest-matcher-utils": "^29.6.2", - "jest-message-util": "^29.6.2", - "jest-util": "^29.6.2" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -5653,9 +5195,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "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, "optional": true, @@ -6299,28 +5841,19 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-report": { @@ -6365,21 +5898,21 @@ } }, "node_modules/jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^28.1.3" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -6391,16 +5924,17 @@ } }, "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { "execa": "^5.0.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-changed-files/node_modules/execa": { @@ -6427,54 +5961,43 @@ } }, "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6482,160 +6005,41 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-circus/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-circus/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-circus/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-circus/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", + "create-jest": "^29.7.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "yargs": "^17.3.1" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -6646,25 +6050,13 @@ } } }, - "node_modules/jest-cli/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-cli/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6672,72 +6064,49 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-cli/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-cli/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-cli/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@types/node": "*", @@ -6752,25 +6121,13 @@ } } }, - "node_modules/jest-config/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-config/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6778,139 +6135,68 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-config/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-config/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-config/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-config/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-config/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-config/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-diff": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz", - "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^29.4.3", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.2" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6918,113 +6204,42 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-each/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-each/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-each/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-each/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-environment-node/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-environment-node/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7032,94 +6247,59 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-environment-node/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-environment-node/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-environment-node/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-get-type": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", - "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "walker": "^1.0.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, - "node_modules/jest-haste-map/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-haste-map/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7127,136 +6307,59 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-haste-map/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-haste-map/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-haste-map/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/jest-leak-detector/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-leak-detector/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz", - "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^29.6.2", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.2" + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz", - "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^29.6.2", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -7265,12 +6368,12 @@ } }, "node_modules/jest-message-util/node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7282,46 +6385,35 @@ } }, "node_modules/jest-message-util/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-mock/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-mock/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7329,19 +6421,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-mock/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-mock/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -7365,159 +6451,86 @@ } }, "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/jest-resolve/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/jest-resolve/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7525,140 +6538,58 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runner/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-runner/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-runner/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-runner/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runtime/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7666,176 +6597,56 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-runtime/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-runtime/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^28.1.3", + "expect": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" + "pretty-format": "^29.7.0", + "semver": "^7.5.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "dependencies": { - "jest-get-type": "^28.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7843,159 +6654,25 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-snapshot/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-snapshot/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-snapshot/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-util": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz", - "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -8007,12 +6684,12 @@ } }, "node_modules/jest-util/node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8024,50 +6701,38 @@ } }, "node_modules/jest-util/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^28.1.3" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-validate/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8075,36 +6740,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-validate/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-validate/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-validate/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -8117,68 +6764,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-validate/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-validate/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-watcher/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-watcher/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8186,53 +6797,31 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-watcher/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-watcher/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-watcher/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker/node_modules/supports-color": { @@ -8250,25 +6839,13 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jest/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8276,19 +6853,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -9488,12 +8059,12 @@ } }, "node_modules/pretty-format": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", - "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, @@ -9581,6 +8152,22 @@ "node": ">=6" } }, + "node_modules/pure-rand": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, "node_modules/qs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", @@ -9846,9 +8433,9 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" @@ -10443,19 +9030,6 @@ "node": ">=8" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -10508,22 +9082,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -10829,9 +9387,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -10892,14 +9450,14 @@ } }, "node_modules/v8-to-istanbul": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", - "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" diff --git a/third_party/nixpkgs/pkgs/development/web/publii/default.nix b/third_party/nixpkgs/pkgs/development/web/publii/default.nix index 58713b35a3..9fb23dc7fc 100644 --- a/third_party/nixpkgs/pkgs/development/web/publii/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.42.1"; + version = "0.43.1"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-GHGXu/z2L4aJG1O1THPIxnRBdPJOIVuQsZP0zhjTZlo="; + hash = "sha256-+AhvRHw/u66ziqhlHE4BShgoimInE+vT5/kbMn69VF4="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix b/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix index c2fcc8a646..b6e5826be9 100644 --- a/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix +++ b/third_party/nixpkgs/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.50"; + version = "1.4.72"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-J4SCmIwGlVD8MHs13NO3JFKfH1rvh2dgVV0/8BX9IcY="; + hash = "sha256-wKnwyjgEV1M5CJR0uxs9vNbF3iJvDPWOqya0iLHXjGw="; fetchSubmodules = true; }; - vendorHash = "sha256-dugSK/5mowBfRqnzI3sZqCm69E0WtX2Tydh6Q06+vLU="; + vendorHash = "sha256-hK5w3JhcYUW5bAUovv/ldHoYcY0oIh5q4LWxiGuP2NQ="; buildInputs = [ alsa-lib diff --git a/third_party/nixpkgs/pkgs/games/animatch/default.nix b/third_party/nixpkgs/pkgs/games/animatch/default.nix new file mode 100644 index 0000000000..b6bf547380 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/animatch/default.nix @@ -0,0 +1,41 @@ +{ lib +, allegro5 +, cmake +, fetchFromGitLab +, libGL +, stdenv +, xorg +}: +stdenv.mkDerivation rec { + pname = "animatch"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "HolyPangolin"; + repo = "animatch"; + fetchSubmodules = true; + rev = "v${version}"; + hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + allegro5 + libGL + xorg.libX11 + ]; + + cmakeFlags = [ + "-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games + ]; + + meta = { + homepage = "https://gitlab.com/HolyPangolin/animatch/"; + description = "A cute match three game for the Librem 5 smartphone"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 133622e6eb..7404be23bc 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.66"; + version = "23.10.1"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-P1PEKz0vblPxiLri34QrP0+qOsltJsvPL2JVmYj1wFg="; + sha256 = "sha256-Kv0SH+bLnBSM/tYHe2kEJc4n7izZTBNWQs2nm/teLEU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-cFYuw+ZSQd5Rw+x7eIKEDzV9UyvuxX3iZ8drmtQNZ78="; + sha256 = "sha256-MSlKsEv4N/H7G1bUOBlPBXerpHIW32P6Va02aRq1+54="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-0xtHT0rq7QnHqhIySpBKtO+kMAu88Q5nWmWvMSxVtBo="; + sha256 = "sha256-jEm9WJBXx77KpldzBuxK1Pu6VGiARZPnRmMhEjZdm1I="; }; }; @@ -45,7 +45,7 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 atemu ]; + maintainers = with maintainers; [ mahmoudk1000 ]; }; passthru = { inherit sources; }; diff --git a/third_party/nixpkgs/pkgs/games/atlauncher/default.nix b/third_party/nixpkgs/pkgs/games/atlauncher/default.nix index 5e94a821c0..d6e3dc05a8 100644 --- a/third_party/nixpkgs/pkgs/games/atlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/atlauncher/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.34.0"; + version = "3.4.34.2"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-gHUYZaxADchikoCmAfqFjVbMYhhiwg2BZKctmww1Mlw="; + hash = "sha256-l9OoHunK0xfY6xbNpjs9lfsVd3USM1GHgutTMMVq8S8="; }; env.ICON = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/ball-and-paddle/default.nix b/third_party/nixpkgs/pkgs/games/ball-and-paddle/default.nix deleted file mode 100644 index a935f3d468..0000000000 --- a/third_party/nixpkgs/pkgs/games/ball-and-paddle/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: - -stdenv.mkDerivation rec { - pname = "ballandpaddle"; - version = "0.8.1"; - - src = fetchurl { - url = "mirror://gnu/ballandpaddle/ballandpaddle-${version}.tar.gz"; - sha256 = "0zgpydad0mj7fbkippw3n9hlda6nac084dq5xfbsks9jn1xd30ny"; - }; - - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf guile gettext ]; - - patches = [ ./getenv-decl.patch ]; - - preConfigure = '' - sed -i "Makefile.in" \ - -e "s|desktopdir *=.*$|desktopdir = $out/share/applications|g ; - s|pixmapsdir *=.*$|pixmapsdir = $out/share/pixmaps|g" - ''; - - meta = { - description = "GNU Ball and Paddle, an old-fashioned ball and paddle game"; - - longDescription = '' - GNU Ball and Paddle is an old-fashioned ball and paddle game - with a set amount of blocks to destroy on each level, while - moving a paddle left and right at the bottom of the - screen. Various powerups may make different things occur. - - It now uses GNU Guile for extension and the levels are written - with Guile. Follow the example level sets and the documentation. - ''; - - license = lib.licenses.gpl3Plus; - - homepage = "https://www.gnu.org/software/ballandpaddle/"; - - maintainers = [ ]; - - platforms = lib.platforms.unix; - - hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - }; -} diff --git a/third_party/nixpkgs/pkgs/games/ball-and-paddle/getenv-decl.patch b/third_party/nixpkgs/pkgs/games/ball-and-paddle/getenv-decl.patch deleted file mode 100644 index 6bf26b50a1..0000000000 --- a/third_party/nixpkgs/pkgs/games/ball-and-paddle/getenv-decl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make the getenv(3) declaration visible. - ---- ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-08 02:13:16.000000000 +0200 -+++ ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-16 23:30:28.000000000 +0200 -@@ -17,6 +17,7 @@ - * along with this program. If not, see . - **/ - -+#include - #include "settingsmanager.h" - - SettingsManager::SettingsManager () - diff --git a/third_party/nixpkgs/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/third_party/nixpkgs/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch new file mode 100644 index 0000000000..4fe3e373af --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch @@ -0,0 +1,11 @@ +--- a/src/headers.h ++++ b/src/headers.h +@@ -56,7 +56,7 @@ extern DECLSPEC int SDLCALL SDL_GetGamma(float *red, float *green, float *blue); + #define textdomain(x) while(false) + #endif + +-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) ++#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) && !(defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 38) + static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); } + static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; } + #endif diff --git a/third_party/nixpkgs/pkgs/games/blobwars/default.nix b/third_party/nixpkgs/pkgs/games/blobwars/default.nix index b0951064c2..dd94fc1096 100644 --- a/third_party/nixpkgs/pkgs/games/blobwars/default.nix +++ b/third_party/nixpkgs/pkgs/games/blobwars/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99"; }; + patches = [ ./blobwars-2.00-glibc-2.38.patch ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; diff --git a/third_party/nixpkgs/pkgs/games/brogue-ce/default.nix b/third_party/nixpkgs/pkgs/games/brogue-ce/default.nix new file mode 100644 index 0000000000..77e58ed5a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/brogue-ce/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, SDL2 +, SDL2_image +}: + +stdenv.mkDerivation rec { + pname = "brogue-ce"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "tmewett"; + repo = "BrogueCE"; + rev = "v${version}"; + hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; + }; + + postPatch = '' + substituteInPlace linux/brogue-multiuser.sh \ + --replace broguedir= "broguedir=$out/opt/brogue-ce #" + ''; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + SDL2 + SDL2_image + ]; + + makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; + + desktopItems = [(makeDesktopItem { + name = "brogue-ce"; + desktopName = "Brogue CE"; + genericName = "Roguelike"; + comment = "Brave the Dungeons of Doom!"; + icon = "brogue-ce"; + exec = "brogue-ce"; + categories = [ "Game" "AdventureGame" ]; + })]; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r bin $out/opt/brogue-ce + install -Dm755 linux/brogue-multiuser.sh $out/bin/brogue-ce + install -Dm 644 bin/assets/icon.png $out/share/icons/hicolor/256x256/apps/brogue-ce.png + runHook postInstall + ''; + + meta = with lib; { + description = "A community-lead fork of the minimalist roguelike game Brogue"; + homepage = "https://github.com/tmewett/BrogueCE"; + license = licenses.agpl3; + maintainers = with maintainers; [ AndersonTorres fgaz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/brogue/default.nix b/third_party/nixpkgs/pkgs/games/brogue/default.nix index e5b0f838be..0cd3e779c5 100644 --- a/third_party/nixpkgs/pkgs/games/brogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ maintainers.skeidel ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix index e24432a25b..0e4ca1aad8 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix @@ -44,7 +44,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers; changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; }; }); diff --git a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix index 2492559502..850e67eefc 100644 --- a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix +++ b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix @@ -15,17 +15,18 @@ , udev , hidapi , fftw +, speexdsp }: mkDerivation rec { pname = "chiaki4deck"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-ayU2mYDpgGMgDK5AI5gwgu6h+YLKPG7P32ECWdL5wA4="; + hash = "sha256-udSGtpBUbxEZU9l+jLmUWJbkaCxKGoPuKAaYVmEEezk="; fetchSubmodules = true; }; @@ -50,6 +51,7 @@ mkDerivation rec { fftw libevdev udev + speexdsp ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix index cd8d5d933d..768a4936d8 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/gzdoom/default.nix @@ -10,6 +10,7 @@ , fluidsynth , game-music-emu , gtk3 +, imagemagick , libGL , libjpeg , libsndfile @@ -26,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.11.0"; + version = "4.11.3"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-F3FXV76jpwkOE6QoNi1+TjLOt9x7q3pcZq3hQmRfL5E="; + hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748="; }; outputs = [ "out" "doc" ]; @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake copyDesktopItems + imagemagick makeWrapper ninja pkg-config @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; + comment = meta.description; + icon = "gzdoom"; categories = [ "Game" ]; }) ]; @@ -88,6 +92,12 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + + for size in 16 24 32 48 64 128; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png + done; ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix index c17adb7217..7ec57b7151 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , directx-shader-compiler , libGLU @@ -26,6 +27,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = fetchpatch { + name = "replace-HLSL-ternary-operators.patch"; + url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/feffa4a4dd9a2a5f3c608f720cde41bea37797d3.patch"; + hash = "sha256-aR1eoWZL3+ps7P7yFXFvGsMFxpUSBDiyBsja/ISin4I="; + }; + postPatch = '' substituteInPlace neo/extern/nvrhi/tools/shaderCompiler/CMakeLists.txt \ --replace "AppleClang" "Clang" diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix b/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix index 1df734af5e..7ecc5d5d1b 100644 --- a/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix +++ b/third_party/nixpkgs/pkgs/games/doom-ports/slade/git.nix @@ -15,17 +15,18 @@ , glew , lua , mpg123 +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2022-08-15"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26"; - sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI="; + rev = "d05af4bd3a9a655dfe17d02760bab3542cc0b909"; + sha256 = "sha256-lzTSE0WH+4fOad9E/pL3LDc4L151W0hFEmD0zsS0gpQ="; }; postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/sirjuddington/SLADE.git"; + }; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix index dd8e6b5503..55157950c4 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texlive, perlPackages, jdk8, jre8 }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -46,9 +46,7 @@ let versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { - texlive = texlive.combine { - inherit (texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; + texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about. diff --git a/third_party/nixpkgs/pkgs/games/eidolon/default.nix b/third_party/nixpkgs/pkgs/games/eidolon/default.nix index 8807852f24..34bfd41518 100644 --- a/third_party/nixpkgs/pkgs/games/eidolon/default.nix +++ b/third_party/nixpkgs/pkgs/games/eidolon/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "~nicohman"; repo = pname; rev = version; - sha256 = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; + hash = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix index ceb3d74816..57766c2e84 100644 --- a/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix +++ b/third_party/nixpkgs/pkgs/games/endgame-singularity/default.nix @@ -54,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { free # earth images from NASA, some fonts cc0 # cick0.wav ]; + mainProgram = "singularity"; maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix b/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix index a2614b2f1a..446c692ad8 100644 --- a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix +++ b/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/extremetuxracer/"; maintainers = with lib.maintainers; [ ]; + mainProgram = "etr"; platforms = with lib.platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index 37af433969..9c51b457fb 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-lDMKMh0ztRI3sIV4+xIc25JcY5Opj5dY7pKiPx86qD0="; + hash = "sha256-l2NIoZrevI1PWK4mRjGP6jbx0LvXjz9oFsiTJ6m43JQ="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix index e7e57a5955..3f6b02ddbb 100644 --- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix +++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; - sha256 = "sha256-U8lsHrw40Xo6a3jZw6GiPnOALvvg9PdecVAdkZewUjg="; + sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U="; }; dontUnpack = true; @@ -32,24 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OajjGj/Bgqg8H/6PjXkwJHwbSQqtzbQ1b3Xwk3aI3jc="; - }; - - # Of all the files in the source and data archives, there doesn't seem to be - # a decent icon :-) - iconsrc = fetchurl { - url = "https://wiki.flightgear.org/w/images/6/62/FlightGear_logo.png"; - sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p"; - }; - - desktopItem = makeDesktopItem { - name = "flightgear"; - exec = "fgfs"; - icon = iconsrc; - comment = "FlightGear Flight Simulator"; - desktopName = "FlightGear"; - genericName = "Flight simulator"; - categories = [ "Game" "Simulation" ]; + sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -60,11 +43,6 @@ stdenv.mkDerivation rec { glew qtdeclarative curl ]; - postInstall = '' - mkdir -p "$out/share/applications/" - cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/ - ''; - qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; @@ -75,5 +53,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; + mainProgram = "fgfs"; }; } diff --git a/third_party/nixpkgs/pkgs/games/freecell-solver/default.nix b/third_party/nixpkgs/pkgs/games/freecell-solver/default.nix deleted file mode 100644 index 065e82a0e4..0000000000 --- a/third_party/nixpkgs/pkgs/games/freecell-solver/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, cmake -, perl, gmp, libtap, gperf -, perlPackages, python3 }: - -with lib; -stdenv.mkDerivation rec { - - pname = "freecell-solver"; - version = "4.18.0"; - - src = fetchurl { - url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; - sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; - }; - - nativeBuildInputs = [ - cmake perl pkg-config - ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [ - GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit - ]); - - buildInputs = [ - gmp libtap gperf - python3 python3.pkgs.random2 - ]; - - # "ninja t/CMakeFiles/delta-states-test.t.exe.dir/__/delta_states.c.o" fails - # to depend on the generated "is_king.h". - enableParallelBuilding = false; - - meta = { - description = "A FreeCell automatic solver"; - longDescription = '' - FreeCell Solver is a program that automatically solves layouts - of Freecell and similar variants of Card Solitaire such as Eight - Off, Forecell, and Seahaven Towers, as well as Simple Simon - boards. - ''; - homepage = "https://fc-solve.shlomifish.org/"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/games/freenukum/default.nix b/third_party/nixpkgs/pkgs/games/freenukum/default.nix index 89c26099db..ed6c41edac 100644 --- a/third_party/nixpkgs/pkgs/games/freenukum/default.nix +++ b/third_party/nixpkgs/pkgs/games/freenukum/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { owner = "silwol"; repo = "freenukum"; rev = "v${version}"; - sha256 = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; + hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index 6674c85c33..94f8a28add 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; - homepage = "http://hedgewars.org/"; + homepage = "https://hedgewars.org/"; license = licenses.gpl2; longDescription = '' Each player controls a team of several hedgehogs. During the course of diff --git a/third_party/nixpkgs/pkgs/games/heroic/default.nix b/third_party/nixpkgs/pkgs/games/heroic/default.nix index eca0860207..65ff3b9040 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/default.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-kCvMUhN1kjGb5rV+lkKm1FFYBJUSQGOKTY1DQdiAWLU="; + hash = "sha256-umPQIxwIahjbO4QbkKEoeSSeYT2UatsTGRPrLgw5KW8="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-kHZL7TENVK58dvr8PBFtWYZ2PSKEYESX4e1xYmMA5+Y="; + hash = "sha256-o5ztk4okH21Op1jqHZfranR12M8B1Y/K95aWb10tf5o="; }; nativeBuildInputs = [ @@ -45,8 +45,18 @@ in stdenv.mkDerivation rec { ./remove-drm-support.patch # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. ./fix-non-steam-shortcuts.patch + # Fix reg add infinite loop + # Submitted upstream: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3210 + ./fix-infinite-loop.patch ]; + postPatch = '' + # We are not packaging this as an Electron application bundle, so Electron + # reports to the application that is is not "packaged", which causes Heroic + # to take some incorrect codepaths meant for development environments. + substituteInPlace src/**/*.ts --replace 'app.isPackaged' 'true' + ''; + configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix index 19b44b280f..24f7c96bc9 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/heroic/fhsenv.nix @@ -29,6 +29,7 @@ buildFHSEnv { perl psmisc python3 + unzip which xorg.xrandr zstd @@ -96,6 +97,7 @@ buildFHSEnv { libsoup libtheora libtiff + libunwind libusb1 libv4l libva diff --git a/third_party/nixpkgs/pkgs/games/heroic/fix-infinite-loop.patch b/third_party/nixpkgs/pkgs/games/heroic/fix-infinite-loop.patch new file mode 100644 index 0000000000..99aae02c3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/heroic/fix-infinite-loop.patch @@ -0,0 +1,23 @@ +From b698779053b7ba31bd8e69b230e86515e3019bf6 Mon Sep 17 00:00:00 2001 +From: K900 +Date: Sun, 5 Nov 2023 22:04:32 +0300 +Subject: [PATCH] Force add the registry entry + +Otherwise, newer Wine versions will prompt to overwrite it and loop there forever. +--- + src/backend/storeManagers/legendary/setup.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/storeManagers/legendary/setup.ts b/src/backend/storeManagers/legendary/setup.ts +index 1837106621..b5c2432435 100644 +--- a/src/backend/storeManagers/legendary/setup.ts ++++ b/src/backend/storeManagers/legendary/setup.ts +@@ -20,7 +20,7 @@ export const legendarySetup = async (appName: string) => { + + // Fixes games like Fallout New Vegas and Dishonored: Death of the Outsider + await runWineCommandOnGame(appName, { +- commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher'], ++ commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher', '/f'], + wait: true, + protonVerb: 'waitforexitandrun' + }) diff --git a/third_party/nixpkgs/pkgs/games/heroic/remove-drm-support.patch b/third_party/nixpkgs/pkgs/games/heroic/remove-drm-support.patch index f3cd80f003..44045bef2b 100644 --- a/third_party/nixpkgs/pkgs/games/heroic/remove-drm-support.patch +++ b/third_party/nixpkgs/pkgs/games/heroic/remove-drm-support.patch @@ -1,22 +1,26 @@ diff --git a/src/backend/main.ts b/src/backend/main.ts -index 2cd1a28f..a60e04d0 100644 +index 83b58bb2..f61656fa 100644 --- a/src/backend/main.ts +++ b/src/backend/main.ts -@@ -19,8 +19,7 @@ import { - powerSaveBlocker, +@@ -19,7 +19,6 @@ import { protocol, screen, -- clipboard, -- components -+ clipboard + clipboard, +- components, + session } from 'electron' import 'backend/updater' - import { autoUpdater } from 'electron-updater' -@@ -286,8 +285,7 @@ if (!gotTheLock) { - initImagesCache() +@@ -310,14 +309,7 @@ if (!gotTheLock) { + } if (!process.env.CI) { -- await components.whenReady() +- await components.whenReady().catch((e) => { +- logError([ +- 'Failed to download / update DRM components.', +- 'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps', +- e +- ]) +- }) - logInfo(['DRM module staus', components.status()]) + logInfo('DRM modules disabled for nixpkgs') } diff --git a/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix b/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix index f55b775164..bca6c8ecf8 100644 --- a/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix +++ b/third_party/nixpkgs/pkgs/games/hikounomizu/default.nix @@ -13,20 +13,22 @@ , libogg , libvorbis , libGLU +, enet , synfigstudio , inkscape , imagemagick , pngquant , xz +, bc }: stdenv.mkDerivation rec { pname = "hikounomizu"; - version = "0.9.2"; + version = "1.0.1"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; - hash = "sha256-ZtvzQAiYG4IcdgKiBDIQFOJVnLbz1TsiIbdZr/0Y2U8="; + hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; nativeBuildInputs = [ @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { imagemagick pngquant xz + bc ]; buildInputs = [ @@ -51,10 +54,11 @@ stdenv.mkDerivation rec { libogg libvorbis libGLU + enet ]; postBuild = '' - make data -j$NIX_BUILD_CORES + make data HNM_PARALLEL=$NIX_BUILD_CORES ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/hmcl/default.nix b/third_party/nixpkgs/pkgs/games/hmcl/default.nix index f6ded13dc0..fcaa01ea2d 100644 --- a/third_party/nixpkgs/pkgs/games/hmcl/default.nix +++ b/third_party/nixpkgs/pkgs/games/hmcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A Minecraft Launcher which is multi-functional, cross-platform and popular"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; inherit (jre.meta) platforms; }; }) diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index cd44b9904c..2735cfff19 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1q"; + version = "12.1x"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU="; + sha256 = "sha256-MzeTNjGFL8l+8afndjpMqbEKD872ic+AqnpgY2VAPRA="; }; CXXFLAGS = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.roguetemple.com/z/hyper/"; + homepage = "https://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/games/infra-arcana/default.nix b/third_party/nixpkgs/pkgs/games/infra-arcana/default.nix index 4e80ad3e4d..6eb1f44aa8 100644 --- a/third_party/nixpkgs/pkgs/games/infra-arcana/default.nix +++ b/third_party/nixpkgs/pkgs/games/infra-arcana/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "infra-arcana"; - version = "22.0.0"; + version = "22.1.0"; src = fetchFromGitLab { owner = "martin-tornqvist"; repo = "ia"; rev = "v${version}"; - sha256 = "sha256-EFpeuzxhRriQOBtmw0D+SY6sOWGyY8iA5Xnm6PCaMX0="; + sha256 = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock b/third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock index b01d46510f..55e2b382e6 100644 --- a/third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock +++ b/third_party/nixpkgs/pkgs/games/jumpy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -19,10 +19,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] -name = "addr2line" -version = "0.19.0" +name = "accesskit" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +dependencies = [ + "enumn", + "serde", +] + +[[package]] +name = "accesskit_consumer" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_windows" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec", + "once_cell", + "paste", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -33,17 +90,6 @@ 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 0.2.8", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.3" @@ -51,33 +97,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", + "serde", "version_check", ] [[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", ] [[package]] -name = "aligned-vec" -version = "0.5.0" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", "nix 0.24.3", ] @@ -93,22 +141,34 @@ dependencies = [ ] [[package]] -name = "android_log-sys" -version = "0.2.0" +name = "android-activity" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] [[package]] -name = "android_logger" -version = "0.11.3" +name = "android-properties" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" -dependencies = [ - "android_log-sys", - "env_logger", - "log", - "once_cell", -] +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_system_properties" @@ -119,51 +179,17 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" - -[[package]] -name = "anstyle-parse" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-wincon" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" -dependencies = [ - "anstyle", - "windows-sys 0.45.0", -] - [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "append-only-vec" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" [[package]] name = "approx" @@ -176,9 +202,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "core-graphics", @@ -187,8 +213,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "once_cell", - "parking_lot 0.12.1", + "parking_lot", "thiserror", "winapi", "x11rb", @@ -196,89 +221,58 @@ dependencies = [ [[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 = "ash" -version = "0.37.2+1.3.238" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[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 2.1.0", - "event-listener", + "concurrent-queue", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.1.0", - "fastrand", + "concurrent-queue", + "fastrand 2.0.1", "futures-lite", "slab", ] -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue 2.1.0", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-timer" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d62d1c449a11d63d953da8602322493f7718b83c2f649c6a7ba9e08c7af188f" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "atomic-arena" @@ -287,19 +281,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10" [[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic_refcell" +name = "atomicell" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" +checksum = "157342dd84c64f16899b4b16c1fb2cce54b887990362aac3c590b3d13810890f" [[package]] name = "autocfg" @@ -309,9 +294,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -324,72 +309,41 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bevy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9" +checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" dependencies = [ "bevy_internal", ] [[package]] -name = "bevy-inspector-egui" -version = "0.17.0" +name = "bevy_a11y" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4f9fa859e4840e7cbcc0ddf2c8a1441ff8f663c317769c5ccc70cdf13bcf2" +checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" dependencies = [ - "bevy-inspector-egui-derive", + "accesskit", "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", + "bevy_derive", "bevy_ecs", - "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "egui", - "image", - "once_cell", - "pretty-type-name", - "smallvec", -] - -[[package]] -name = "bevy-inspector-egui-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97826e6225a5b56e77683e7b99418171f7531d48682b8531252dc6b8ef3e8113" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "bevy_app" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42" +checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" dependencies = [ "bevy_derive", "bevy_ecs", "bevy_reflect", + "bevy_tasks", "bevy_utils", "downcast-rs", "wasm-bindgen", @@ -398,11 +352,12 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4" +checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_diagnostic", "bevy_ecs", @@ -410,13 +365,12 @@ dependencies = [ "bevy_reflect", "bevy_tasks", "bevy_utils", + "bevy_winit", "crossbeam-channel", "downcast-rs", - "fastrand", + "fastrand 1.9.0", "js-sys", - "ndk-glue", - "notify", - "parking_lot 0.12.1", + "parking_lot", "serde", "thiserror", "wasm-bindgen", @@ -426,9 +380,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0" +checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" dependencies = [ "bevy_app", "bevy_ecs", @@ -437,17 +391,17 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bytemuck", - "serde", ] [[package]] name = "bevy_core_pipeline" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014" +checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" dependencies = [ "bevy_app", "bevy_asset", + "bevy_core", "bevy_derive", "bevy_ecs", "bevy_math", @@ -455,27 +409,27 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "radsort", "serde", ] [[package]] name = "bevy_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6" +checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" dependencies = [ "bevy_macro_utils", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_diagnostic" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4" +checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" dependencies = [ "bevy_app", "bevy_core", @@ -483,22 +437,23 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "sysinfo", ] [[package]] name = "bevy_dylib" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d193c3d56e3bdd106596327d15dd67ddfd862f8b5aa8260677efefe3ddef736" +checksum = "22ea11f830028e1c9d37f8bc88c5873f1c4c0346661209c2ba015f899c51863c" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_ecs" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74" +checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -507,30 +462,30 @@ dependencies = [ "bevy_tasks", "bevy_utils", "downcast-rs", - "event-listener", + "event-listener 2.5.3", "fixedbitset", - "fxhash", + "rustc-hash", "serde", + "thiserror", "thread_local", ] [[package]] name = "bevy_ecs_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce" +checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_egui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb8036050af170243e803eb68e0b5d34f549828a8de92479619fb6dac842f85" +version = "0.21.0" +source = "git+https://github.com/zicklag/bevy_egui?branch=feat/egui-0.23#aeb3d7f1eaaacc67cf3966974d1e31f31e8fad62" dependencies = [ "arboard", "bevy", @@ -541,65 +496,54 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24" +checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" dependencies = [ "bevy_macro_utils", "encase_derive_impl", ] -[[package]] -name = "bevy_fluent" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76fd2fd9c24ecf87bdf6c41bef009825d380c6e260016dac1e6d428d9e0dc69" -dependencies = [ - "anyhow", - "bevy", - "fluent", - "fluent-langneg", - "fluent_content", - "globset", - "indexmap", - "intl-memoizer", - "ron", - "serde", - "serde_yaml", - "thiserror", - "tracing", - "unic-langid", - "uuid", -] - -[[package]] -name = "bevy_framepace" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97caa0b25d627df47f7cfba0b2a9612f4b4ca9d0f53d897a3d70e02fcffea833" -dependencies = [ - "bevy", - "spin_sleep", -] - [[package]] name = "bevy_gilrs" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af552dad82f854b2fae24f36a389fd8ee99d65fe86ae876e854e70d53ff16d9" +checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" dependencies = [ "bevy_app", "bevy_ecs", "bevy_input", + "bevy_log", + "bevy_time", "bevy_utils", "gilrs", + "thiserror", +] + +[[package]] +name = "bevy_gizmos" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", ] [[package]] name = "bevy_hierarchy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a" +checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" dependencies = [ "bevy_app", "bevy_core", @@ -612,25 +556,25 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51" +checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" dependencies = [ "bevy_app", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_utils", - "serde", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11" +checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" dependencies = [ + "bevy_a11y", "bevy_app", "bevy_asset", "bevy_core", @@ -639,6 +583,7 @@ dependencies = [ "bevy_diagnostic", "bevy_ecs", "bevy_gilrs", + "bevy_gizmos", "bevy_hierarchy", "bevy_input", "bevy_log", @@ -647,6 +592,7 @@ dependencies = [ "bevy_ptr", "bevy_reflect", "bevy_render", + "bevy_scene", "bevy_sprite", "bevy_tasks", "bevy_time", @@ -654,27 +600,13 @@ dependencies = [ "bevy_utils", "bevy_window", "bevy_winit", - "ndk-glue", -] - -[[package]] -name = "bevy_kira_audio" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b310ffe1c870e6ca5f0db228953f68af5a861302ec759edae43450f5835a0ece" -dependencies = [ - "anyhow", - "bevy", - "kira", - "parking_lot 0.12.1", - "thiserror", ] [[package]] name = "bevy_log" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b" +checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" dependencies = [ "android_log-sys", "bevy_app", @@ -688,39 +620,40 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677" +checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" dependencies = [ "quote", - "syn 1.0.109", - "toml", + "rustc-hash", + "syn 2.0.38", + "toml_edit", ] [[package]] name = "bevy_math" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf" +checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" dependencies = [ - "glam 0.22.0", + "glam", "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13" +checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" dependencies = [ - "glam 0.22.0", + "glam", ] [[package]] name = "bevy_pbr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf" +checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" dependencies = [ "bevy_app", "bevy_asset", @@ -733,33 +666,35 @@ dependencies = [ "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", "bytemuck", + "naga_oil", "radsort", ] [[package]] name = "bevy_prototype_lyon" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c063aff10ca720d5cadf9cf669800eff2166f6f28cf7f20648ece1c3bdb2442" +checksum = "9e347c16caede05dc5f774ba388cefeef0ab558a5601fc6b5ffd6606bef77308" dependencies = [ "bevy", + "lyon_algorithms", "lyon_tessellation", "svgtypes", ] [[package]] name = "bevy_ptr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4" +checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" [[package]] name = "bevy_reflect" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a" +checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" dependencies = [ "bevy_math", "bevy_ptr", @@ -767,35 +702,37 @@ dependencies = [ "bevy_utils", "downcast-rs", "erased-serde", - "glam 0.22.0", + "glam", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "serde", "smallvec", + "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018" +checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" dependencies = [ "bevy_macro_utils", "bit-set", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "uuid", ] [[package]] name = "bevy_render" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5" +checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_asset", "bevy_core", @@ -808,57 +745,73 @@ dependencies = [ "bevy_mikktspace", "bevy_reflect", "bevy_render_macros", + "bevy_tasks", "bevy_time", "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "codespan-reporting", "downcast-rs", "encase", "futures-lite", - "hex", "hexasphere", "image", + "js-sys", "naga", - "once_cell", - "parking_lot 0.12.1", + "naga_oil", + "parking_lot", "regex", "serde", "smallvec", "thiserror", "thread_local", + "wasm-bindgen", + "web-sys", "wgpu", + "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572" +checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] -name = "bevy_simple_tilemap" -version = "0.10.1" -source = "git+https://github.com/forbjok/bevy_simple_tilemap.git?rev=963d447fa1fd2d6f89228106275b7086840be762#963d447fa1fd2d6f89228106275b7086840be762" +name = "bevy_scene" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" dependencies = [ - "bevy", - "bitflags", - "bytemuck", - "rayon", + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "ron", + "serde", + "thiserror", + "uuid", ] [[package]] name = "bevy_sprite" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145" +checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" dependencies = [ "bevy_app", "bevy_asset", @@ -871,7 +824,7 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "bytemuck", "fixedbitset", "guillotiere", @@ -881,76 +834,78 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853" +checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" dependencies = [ "async-channel", "async-executor", "async-task", - "concurrent-queue 1.2.4", + "concurrent-queue", "futures-lite", - "once_cell", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d" +checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bevy_utils", "crossbeam-channel", - "serde", + "thiserror", ] [[package]] name = "bevy_transform" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec" +checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" dependencies = [ "bevy_app", "bevy_ecs", "bevy_hierarchy", "bevy_math", "bevy_reflect", - "serde", -] - -[[package]] -name = "bevy_tweening" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d38b2abf5518df10c3c32ee57a54b9ba7067f3bd1c137b912e286d573962145" -dependencies = [ - "bevy", - "interpolation", ] [[package]] name = "bevy_utils" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739" +checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" dependencies = [ - "ahash 0.7.6", - "getrandom 0.2.8", - "hashbrown", + "ahash", + "bevy_utils_proc_macros", + "getrandom 0.2.10", + "hashbrown 0.14.1", "instant", + "petgraph", + "thiserror", "tracing", "uuid", ] [[package]] -name = "bevy_window" -version = "0.9.1" +name = "bevy_utils_proc_macros" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e" +checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "bevy_window" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" dependencies = [ "bevy_app", "bevy_ecs", @@ -958,46 +913,41 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle 0.5.2", - "serde", + "raw-window-handle", ] [[package]] name = "bevy_winit" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b7e647ecd0b3577468da37767dcdd7c26ca9f80da0060b2ec4c77336b6d2e1" +checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" dependencies = [ + "accesskit_winit", "approx", + "bevy_a11y", "bevy_app", + "bevy_derive", "bevy_ecs", + "bevy_hierarchy", "bevy_input", "bevy_math", + "bevy_tasks", "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle 0.5.2", + "raw-window-handle", "wasm-bindgen", "web-sys", "winit", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bindgen" -version = "0.64.0" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -1008,7 +958,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1026,34 +976,39 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bitfield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" - -[[package]] -name = "bitfield-rle" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0" -dependencies = [ - "failure", - "varinteger", -] - [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + [[package]] name = "bitset-core" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f421f1bcb30aa9d851a03c2920ab5d96ca920d5786645a597b5fc37922f8b89e" +[[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" @@ -1061,209 +1016,250 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "bones_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "bevy_asset", - "bones_bevy_utils", - "bones_ecs", - "serde", - "type_ulid", - "ulid", + "generic-array", ] [[package]] -name = "bones_bevy_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_reflect", - "bevy_utils", - "bones_bevy_asset_macros", - "bones_bevy_utils", - "bones_lib", - "glam 0.22.0", + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + +[[package]] +name = "bones_asset" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "anyhow", + "append-only-vec", + "async-channel", + "bevy_tasks", + "bones_schema", + "bones_utils", + "bs58", + "dashmap", + "ehttp", + "erased-serde", + "event-listener 3.0.0", + "notify", + "once_cell", + "paste", + "path-absolutize", + "semver", "serde", "serde_json", "serde_yaml", - "type_ulid", - "uuid", -] - -[[package]] -name = "bones_bevy_asset_macros" -version = "0.2.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", + "sha2", + "tracing", "ulid", ] [[package]] name = "bones_bevy_renderer" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ + "anyhow", "bevy", + "bevy_egui", "bevy_prototype_lyon", - "bevy_simple_tilemap", - "bones_bevy_asset", - "bones_lib", - "glam 0.22.0", + "bones_framework", + "directories 5.0.1", + "glam", "serde", - "serde_json", "serde_yaml", - "type_ulid", -] - -[[package]] -name = "bones_bevy_utils" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "bevy_ecs", - "type_ulid", + "web-sys", ] [[package]] name = "bones_ecs" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "aligned-vec", "anyhow", - "atomic_refcell", - "bevy_derive", + "atomicell", "bitset-core", - "bytemuck", - "either", - "fxhash", - "itertools", - "serde", + "bones_schema", + "bones_utils", + "glam", + "paste", "thiserror", - "type_ulid", ] [[package]] -name = "bones_input" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_framework" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy", - "bones_bevy_utils", - "glam 0.22.0", + "bones_asset", + "bones_lib", + "bones_schema", + "csscolorparser", + "egui", + "fluent", + "fluent-langneg", + "glam", + "hex", + "image", "instant", - "type_ulid", + "intl-memoizer", + "kira", + "noise", + "serde", + "serde_yaml", + "sys-locale", + "thiserror", + "tracing", + "ttf-parser", + "unic-langid", ] [[package]] name = "bones_lib" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bones_asset", - "bones_bevy_utils", "bones_ecs", - "bones_input", - "bones_render", - "noise", - "serde", - "type_ulid", + "instant", ] [[package]] -name = "bones_matchmaker_proto" -version = "0.1.0" +name = "bones_schema" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "append-only-vec", + "bones_schema_macros", + "bones_utils", + "erased-serde", + "glam", + "humantime", + "paste", + "serde", + "sptr", + "ulid", +] + +[[package]] +name = "bones_schema_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "proc-macro2", + "quote", + "venial", +] + +[[package]] +name = "bones_utils" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "bevy_ptr", + "bones_utils_macros", + "branches", + "futures-lite", + "fxhash", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "maybe-owned", + "parking_lot", + "serde", + "smallvec", + "turborand", + "ulid", + "ustr", +] + +[[package]] +name = "bones_utils_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "quote", + "venial", +] + +[[package]] +name = "branches" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff7e71011db4da9f456122f586cf576ee42b249b26a5b2a840eee2141c4ef38" -dependencies = [ - "serde", -] +checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a" [[package]] -name = "bones_render" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "bevy_render", - "bevy_transform", - "bones_asset", - "bones_bevy_utils", - "bones_ecs", - "glam 0.22.0", - "hex", - "serde", - "thiserror", - "type_ulid", -] - -[[package]] -name = "bstr" -version = "1.4.0" +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "memchr", - "serde", + "tinyvec", ] [[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 = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[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" - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[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 = [ "jobserver", + "libc", ] [[package]] @@ -1301,51 +1297,9 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] -[[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - [[package]] name = "clipboard-win" version = "4.5.0" @@ -1357,43 +1311,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -1410,6 +1327,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + [[package]] name = "combine" version = "4.6.6" @@ -1420,35 +1343,11 @@ dependencies = [ "memchr", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "concurrent-queue" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1465,9 +1364,24 @@ dependencies = [ [[package]] name = "const_panic" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] [[package]] name = "core-foundation" @@ -1475,21 +1389,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -1497,7 +1405,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", @@ -1506,32 +1414,31 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", + "bitflags 1.3.2", + "core-foundation-sys", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" dependencies = [ "bindgen", ] @@ -1543,7 +1450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.3", + "core-foundation-sys", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -1554,13 +1461,22 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "windows 0.46.0", ] +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -1570,12 +1486,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam" version = "0.8.2" @@ -1592,9 +1502,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1613,14 +1523,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] @@ -1636,13 +1546,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "csscolorparser" version = "0.6.2" @@ -1652,56 +1572,28 @@ dependencies = [ "phf", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "d3d12" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", - "libloading", + "bitflags 1.3.2", + "libloading 0.7.4", "winapi", ] [[package]] -name = "darling" -version = "0.13.4" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cfg-if", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1711,43 +1603,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] -name = "derive_more" -version = "0.99.17" +name = "data-encoding" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "block-buffer", + "crypto-common", ] [[package]] name = "directories" -version = "4.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f" dependencies = [ - "dirs-sys", + "libc", + "winapi", ] [[package]] -name = "dirs" -version = "4.0.0" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1758,13 +1657,22 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", +] + +[[package]] +name = "document-features" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157" +dependencies = [ + "litrs", ] [[package]] @@ -1775,144 +1683,171 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691" +checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" dependencies = [ "bytemuck", -] - -[[package]] -name = "egui" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9" -dependencies = [ - "ahash 0.8.3", - "epaint", - "nohash-hasher", -] - -[[package]] -name = "egui_extras" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1975cd88ff7430f93b29e6b9868b648a8ff6a43b08b9ff8474ee0a648bd8f9a6" -dependencies = [ - "egui", "serde", ] [[package]] -name = "either" -version = "1.8.1" +name = "egui" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +dependencies = [ + "accesskit", + "ahash", + "epaint", + "nohash-hasher", + "serde", +] + +[[package]] +name = "egui_extras" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" +dependencies = [ + "egui", + "enum-map", + "log", + "serde", +] + +[[package]] +name = "ehttp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88f45662356f96afc7d9e2bc9910ad8352ee01417f7c69b8b16a53c8767a75d" +dependencies = [ + "document-features", + "js-sys", + "ureq", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0" +checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "encase" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", "encase_derive", - "glam 0.22.0", + "glam", "thiserror", ] [[package]] name = "encase_derive" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[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" +name = "enum-map" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "epaint" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a" -dependencies = [ - "ab_glyph", - "ahash 0.8.3", - "atomic_refcell", - "bytemuck", - "ecolor", - "emath", - "nohash-hasher", - "parking_lot 0.12.1", -] - -[[package]] -name = "erased-serde" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ + "enum-map-derive", "serde", ] [[package]] -name = "errno" -version = "0.3.0" +name = "enum-map-derive" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.45.0", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "enumn" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ - "cc", - "libc", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "epaint" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot", + "serde", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", ] [[package]] @@ -1941,25 +1876,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "failure" -version = "0.1.8" +name = "event-listener" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] @@ -1972,15 +1896,30 @@ dependencies = [ ] [[package]] -name = "filetime" -version = "0.2.20" +name = "fastrand" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.45.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -1991,9 +1930,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", @@ -2010,9 +1949,9 @@ dependencies = [ [[package]] name = "fluent" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a" dependencies = [ "fluent-bundle", "unic-langid", @@ -2052,29 +1991,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fluent_content" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a582c297515a2fb08cbaa1166498dd18b11ba0e4d7c9cad5b10386a6a2208c8a" -dependencies = [ - "fluent", - "fluent-langneg", - "intl-memoizer", - "thiserror", - "tracing", - "unic-langid", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "spin 0.9.7", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2098,9 +2014,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2115,29 +2031,10 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.28" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-core" @@ -2145,17 +2042,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.28" @@ -2164,11 +2050,11 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[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", @@ -2177,47 +2063,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - [[package]] name = "fxhash" version = "0.2.1" @@ -2227,6 +2072,16 @@ dependencies = [ "byteorder", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "gethostname" version = "0.2.3" @@ -2250,9 +2105,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -2261,27 +2116,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "ggrs" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831" -dependencies = [ - "bincode", - "bitfield-rle", - "bytemuck", - "instant", - "js-sys", - "parking_lot 0.11.2", - "rand 0.8.5", - "serde", -] - [[package]] name = "gilrs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e" +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a" dependencies = [ "fnv", "gilrs-core", @@ -2292,9 +2131,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2244818258229abc01fe5a7817664e8b82af29eb70e67ab39d49018ae679912" +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" dependencies = [ "core-foundation", "io-kit-sys", @@ -2302,61 +2141,42 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.25.1", + "nix 0.26.4", "uuid", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.44.0", + "windows 0.51.1", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ "bytemuck", - "num-traits", + "mint", "serde", ] -[[package]] -name = "glam" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" - [[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - [[package]] name = "glow" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -2366,11 +2186,11 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -2380,27 +2200,40 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", ] [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.1", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags", + "bitflags 2.4.0", ] [[package]] @@ -2413,60 +2246,38 @@ dependencies = [ "svg_fmt", ] -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ - "ahash 0.7.6", + "ahash", + "allocator-api2", "serde", ] [[package]] -name = "heapless" -version = "0.7.16" +name = "hassle-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "serde", - "spin 0.9.7", - "stable_deref_trait", -] - -[[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.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" dependencies = [ + "bitflags 1.3.2", + "com-rs", "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", ] -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - [[package]] name = "hex" version = "0.4.3" @@ -2475,12 +2286,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "8.1.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" dependencies = [ - "glam 0.23.0", - "once_cell", + "constgebra", + "glam", ] [[package]] @@ -2489,6 +2300,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "humantime" version = "2.1.0" @@ -2505,37 +2325,21 @@ dependencies = [ "serde", ] -[[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.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] -[[package]] -name = "if-addrs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2553,17 +2357,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", +] + [[package]] name = "inotify" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2589,12 +2403,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "interpolation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02" - [[package]] name = "intl-memoizer" version = "0.5.1" @@ -2616,35 +2424,12 @@ dependencies = [ [[package]] name = "io-kit-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919" +checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" dependencies = [ - "core-foundation-sys 0.8.3", - "mach", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "core-foundation-sys", + "mach2", ] [[package]] @@ -2658,21 +2443,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "iyes_loopless" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47fd2cbdb1d7f295c25e6bfccfd78a84b6eef3055bc9f01b34ae861721b01ee" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_time", - "bevy_utils", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2726,9 +2499,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2741,9 +2514,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2752,91 +2525,28 @@ dependencies = [ name = "jumpy" version = "0.7.0" dependencies = [ - "anyhow", "async-channel", - "async-timer", - "base64 0.21.0", - "bevy", - "bevy-inspector-egui", "bevy_dylib", - "bevy_egui", - "bevy_fluent", - "bevy_framepace", - "bevy_kira_audio", - "bevy_prototype_lyon", - "bevy_tweening", - "bitfield", - "bones_bevy_asset", + "bevy_tasks", "bones_bevy_renderer", - "bones_lib", - "bones_matchmaker_proto", - "bytemuck", - "bytes", - "clap", - "directories", - "downcast-rs", + "bones_framework", + "directories 1.0.2", "egui_extras", - "either", - "fluent", - "fluent_content", - "fnv", - "futures-lite", - "getrandom 0.2.8", - "ggrs", - "iyes_loopless", - "jumpy_core", - "leafwing-input-manager", - "log", - "mdns-sd", - "mimalloc", - "normalize-path", - "numquant", - "once_cell", - "peg", - "ping-rs", - "postcard", - "puffin", - "puffin_egui", - "quinn", - "quinn_runtime_bevy", - "rand 0.8.5", - "rcgen", - "rustls", - "serde", - "serde_json", - "serde_yaml", - "smallvec", - "thiserror", - "tracing", - "turborand", - "type_ulid", - "unic-langid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "jumpy_core" -version = "0.7.0" -dependencies = [ - "bevy", - "bones_bevy_asset", - "bones_lib", - "bytemuck", - "csscolorparser", - "glam 0.22.0", - "hex", "humantime-serde", - "indexmap", + "indexmap 2.0.2", "nalgebra", + "once_cell", "ordered-float", + "peg", "petgraph", "puffin", "rapier2d", "serde", + "serde_yaml", + "shiftnanigans", + "thiserror", "tracing", "turborand", - "type_ulid", ] [[package]] @@ -2846,27 +2556,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.4", "pkg-config", ] [[package]] name = "kira" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda" +version = "0.8.5" +source = "git+https://github.com/zicklag/kira.git?branch=feat/sync#e587b155e862567677c114d0d6fc2963be37c14b" dependencies = [ "atomic-arena", "cpal", + "glam", + "mint", "ringbuf", "symphonia", ] [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -2874,11 +2585,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -2894,38 +2605,11 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "leafwing-input-manager" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb82c6ee7d41f195f9384497dcee11bde691d07c1703667724de8afdf67ae987" -dependencies = [ - "bevy", - "derive_more", - "fixedbitset", - "itertools", - "leafwing_input_manager_macros", - "petitset", - "serde", -] - -[[package]] -name = "leafwing_input_manager_macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec3d0a4b25f0e6a66547cc3a1eb98b8477814db58de8035063f3db42353a7de" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2938,20 +2622,20 @@ dependencies = [ ] [[package]] -name = "libm" -version = "0.2.6" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] -name = "libmimalloc-sys" -version = "0.1.33" +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libudev-sys" @@ -2964,16 +2648,16 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.1" +name = "litrs" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2981,11 +2665,18 @@ 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" + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ - "cfg-if", + "lyon_path", + "num-traits", ] [[package]] @@ -3001,9 +2692,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", "num-traits", @@ -3020,15 +2711,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "mach2" version = "0.4.1" @@ -3053,35 +2735,30 @@ 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]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ + "autocfg", "rawpointer", ] [[package]] -name = "mdns-sd" -version = "0.7.2" +name = "maybe-owned" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0b1898d42fb934073c893ab88e8ae72076a5d862417dcf214c028011019753" -dependencies = [ - "flume", - "if-addrs", - "polling", - "socket2", -] +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3094,9 +2771,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3107,7 +2784,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "foreign-types", @@ -3115,15 +2792,6 @@ dependencies = [ "objc", ] -[[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3132,39 +2800,45 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[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" +name = "mint" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "naga" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", - "petgraph", "pp-rs", "rustc-hash", "spirv", @@ -3174,13 +2848,33 @@ dependencies = [ ] [[package]] -name = "nalgebra" -version = "0.32.2" +name = "naga_oil" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + +[[package]] +name = "nalgebra" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", - "glam 0.22.0", + "glam", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -3192,32 +2886,26 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - [[package]] name = "ndk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", + "num_enum 0.5.11", + "raw-window-handle", "thiserror", ] @@ -3227,36 +2915,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "android_logger", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -3272,7 +2930,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -3280,12 +2938,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] @@ -3317,28 +2974,32 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "normalize-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2" - [[package]] name = "notify" -version = "5.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.42.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", ] [[package]] @@ -3353,9 +3014,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -3394,31 +3055,30 @@ dependencies = [ [[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", "libm", ] -[[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 = "num_enum" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -3434,10 +3094,16 @@ dependencies = [ ] [[package]] -name = "numquant" -version = "0.2.0" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] name = "objc" @@ -3460,6 +3126,32 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -3480,9 +3172,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3512,15 +3204,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "optional" @@ -3529,10 +3221,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" [[package]] -name = "ordered-float" -version = "3.6.0" +name = "orbclient" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -3545,29 +3246,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ "ttf-parser", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[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.6", -] +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3576,48 +3266,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] name = "parry2d" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c6edd297a40754e762344dbeb454bdfb51472f03280473065b9b0898008ce3" +checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce" dependencies = [ "approx", "arrayvec", - "bitflags", + "bitflags 1.3.2", "downcast-rs", "either", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -3630,9 +3306,27 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] [[package]] name = "peeking_take_while" @@ -3642,9 +3336,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "peg" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -3652,9 +3346,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -3663,49 +3357,31 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[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", -] - -[[package]] -name = "petitset" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac" -dependencies = [ - "serde", + "indexmap 2.0.2", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", @@ -3713,9 +3389,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand 0.8.5", @@ -3723,116 +3399,51 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[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" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ping-rs" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b" -dependencies = [ - "futures", - "mio", - "paste", - "socket2", - "windows 0.43.0", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.7" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] -[[package]] -name = "polling" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue 2.1.0", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "postcard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" -dependencies = [ - "cobs", - "heapless", - "serde", -] - [[package]] name = "pp-rs" version = "0.2.1" @@ -3848,12 +3459,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty-type-name" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -3866,127 +3471,47 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.55" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" [[package]] name = "puffin" -version = "0.14.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" dependencies = [ "anyhow", - "bincode", "byteorder", + "cfg-if", "instant", "once_cell", - "parking_lot 0.12.1", - "ruzstd", - "serde", - "zstd", -] - -[[package]] -name = "puffin_egui" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba98235ecff9f174793e135d2c6860f917cc7cd419a630b9978f1ab5d6026a3c" -dependencies = [ - "egui", - "indexmap", - "instant", - "natord", - "once_cell", - "puffin", - "time", - "vec1", -] - -[[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2", - "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quinn_runtime_bevy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4d0c40761a7f14497d4ad43c3887fff819aff1a68d6d731377d98b2106e3be" -dependencies = [ - "async-executor", - "async-io", - "bevy_tasks", - "futures-lite", - "pin-project", - "quinn", - "quinn-proto", - "quinn-udp", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "radsort" version = "0.1.0" @@ -4052,7 +3577,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.10", ] [[package]] @@ -4088,10 +3613,10 @@ dependencies = [ "approx", "arrayvec", "bit-vec", - "bitflags", + "bitflags 1.3.2", "crossbeam", "downcast-rs", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -4100,15 +3625,6 @@ dependencies = [ "simba", ] -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -4121,40 +3637,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[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 = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - [[package]] name = "rectangle-pack" version = "0.4.2" @@ -4167,7 +3649,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -4176,20 +3667,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.4.2", + "regex-syntax 0.8.2", ] [[package]] @@ -4198,7 +3690,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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] @@ -4208,10 +3711,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "renderdoc-sys" -version = "0.7.1" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "ring" @@ -4222,7 +3731,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted", "web-sys", "winapi", @@ -4245,20 +3754,21 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags", + "base64", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -4266,84 +3776,39 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] -name = "rustls-native-certs" -version = "0.6.2" +name = "rustls-webpki" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", -] - -[[package]] -name = "ruzstd" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" -dependencies = [ - "byteorder", - "thiserror", - "twox-hash", + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -4357,20 +3822,11 @@ 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 0.42.0", -] - [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -4382,29 +3838,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.3", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - [[package]] name = "self_cell" version = "0.10.2" @@ -4413,35 +3846,38 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4450,11 +3886,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.19" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4462,31 +3898,49 @@ dependencies = [ ] [[package]] -name = "sha1_smol" -version = "1.0.0" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[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", ] [[package]] -name = "shlex" -version = "1.1.0" +name = "shiftnanigans" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "9635466532d454fa020acbb12f629f1fc02fc9b4d5b39cc72ca478be37e314bc" +dependencies = [ + "bitvec", + "fastrand 1.9.0", + "itertools", + "log", + "nohash-hasher", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "libm", @@ -4497,16 +3951,22 @@ dependencies = [ ] [[package]] -name = "siphasher" -version = "0.3.10" +name = "simd-adler32" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[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.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4522,28 +3982,27 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" dependencies = [ "serde", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "smol_str" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ - "libc", - "winapi", + "serde", ] [[package]] name = "spade" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3" +checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", @@ -4557,40 +4016,21 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spin_sleep" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" -dependencies = [ - "once_cell", - "winapi", -] - [[package]] name = "spirv" version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "sptr" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "static_assertions" @@ -4604,12 +4044,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "svg_fmt" version = "0.4.1" @@ -4627,9 +4061,9 @@ dependencies = [ [[package]] name = "symphonia" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1" +checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" dependencies = [ "lazy_static", "symphonia-codec-vorbis", @@ -4640,9 +4074,9 @@ dependencies = [ [[package]] name = "symphonia-codec-vorbis" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74" +checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203" dependencies = [ "log", "symphonia-core", @@ -4651,12 +4085,12 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" +checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "bytemuck", "lazy_static", "log", @@ -4664,9 +4098,9 @@ dependencies = [ [[package]] name = "symphonia-format-ogg" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474df6e86b871dcb56913130bada1440245f483057c4a2d8a2981455494c4439" +checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d" dependencies = [ "log", "symphonia-core", @@ -4676,9 +4110,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e" +checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" dependencies = [ "encoding_rs", "lazy_static", @@ -4688,9 +4122,9 @@ dependencies = [ [[package]] name = "symphonia-utils-xiph" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b" +checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8" dependencies = [ "symphonia-core", "symphonia-metadata", @@ -4709,9 +4143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4719,44 +4153,61 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "sys-locale" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "libc", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "sysinfo" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] @@ -4771,47 +4222,20 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", "weezl", ] -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - [[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", ] @@ -4831,50 +4255,29 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.2", "toml_datetime", "winnow", ] [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4882,20 +4285,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.38", ] [[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", @@ -4914,9 +4317,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -4943,30 +4346,20 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "turborand" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68386c3caec086d54b19acec7f2ec3bd31109a71dfcea80b23c03520c9fb149" +checksum = "e28d61f1c96db8c016037a77961fa5da84fc3a57fe69a15283ace0ab1647bac0" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "type-map" version = "0.4.0" @@ -4976,39 +4369,20 @@ dependencies = [ "rustc-hash", ] -[[package]] -name = "type_ulid" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "type_ulid_macros", - "ulid", -] - -[[package]] -name = "type_ulid_macros" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "ulid", -] - [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", + "serde", ] [[package]] @@ -5038,9 +4412,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5053,9 +4427,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5065,9 +4439,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" @@ -5076,10 +4450,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.3.1" +name = "ureq" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -5087,20 +4477,26 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "ustr" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87" +dependencies = [ + "ahash", + "byteorder", + "lazy_static", + "parking_lot", + "serde", +] [[package]] name = "uuid" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "serde", - "sha1_smol", ] [[package]] @@ -5109,24 +4505,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "varinteger" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812" - -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - [[package]] name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "venial" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "version_check" version = "0.9.4" @@ -5135,15 +4529,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5163,9 +4557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5173,24 +4567,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5200,9 +4594,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5210,28 +4604,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5239,30 +4644,26 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", - "dirs", + "home", "jni 0.21.1", "log", "ndk-context", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "url", "web-sys", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -5272,16 +4673,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.14.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ "arrayvec", + "cfg-if", "js-sys", "log", "naga", - "parking_lot 0.12.1", - "raw-window-handle 0.5.2", + "parking_lot", + "profiling", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -5294,21 +4697,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.14.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags", - "cfg_aliases", + "bitflags 2.4.0", "codespan-reporting", - "fxhash", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", + "rustc-hash", "smallvec", "thiserror", "web-sys", @@ -5318,35 +4720,38 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.14.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 2.4.0", "block", "core-graphics-types", "d3d12", "foreign-types", - "fxhash", "glow", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", + "hassle-rs", "js-sys", "khronos-egl", - "libloading", + "libc", + "libloading 0.8.1", "log", "metal", "naga", "objc", - "parking_lot 0.12.1", + "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys", + "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", @@ -5357,23 +4762,31 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.14.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags", + "bitflags 2.4.0", + "js-sys", + "web-sys", ] [[package]] name = "wide" -version = "0.7.8" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", "safe_arch", ] +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.3.9" @@ -5392,9 +4805,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", ] @@ -5414,28 +4827,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[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.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows" version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] @@ -5444,35 +4842,59 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.42.2", + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -5481,7 +4903,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "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.5", ] [[package]] @@ -5490,15 +4921,30 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] +[[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_aarch64_gnullvm" version = "0.42.2" @@ -5506,10 +4952,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5518,10 +4964,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5530,10 +4976,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5542,10 +4988,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5553,6 +4999,12 @@ 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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -5560,10 +5012,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5572,13 +5024,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "winit" -version = "0.27.5" +name = "windows_x86_64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.28.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ - "bitflags", - "cocoa", + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -5587,28 +5046,37 @@ dependencies = [ "log", "mio", "ndk", - "ndk-glue", - "objc", + "objc2", "once_cell", - "parking_lot 0.12.1", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", + "raw-window-handle", + "redox_syscall 0.3.5", "wasm-bindgen", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -5643,40 +5111,7 @@ dependencies = [ ] [[package]] -name = "yasna" -version = "0.5.1" +name = "xml-rs" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" -dependencies = [ - "time", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/third_party/nixpkgs/pkgs/games/jumpy/default.nix b/third_party/nixpkgs/pkgs/games/jumpy/default.nix index 8839c01085..d4f8a8fcbd 100644 --- a/third_party/nixpkgs/pkgs/games/jumpy/default.nix +++ b/third_party/nixpkgs/pkgs/games/jumpy/default.nix @@ -16,29 +16,24 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw="; + sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930="; - "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4="; + "bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc="; + "bones_asset-0.3.0" = "sha256-1UeOXW6O/gMQBBUnHxRreJgmiUTPC5SJB+uLn9V8aa4="; + "kira-0.8.5" = "sha256-z4R5aIaoRQQprL6JsVrFI69rwTOsW5OH01+jORS+hBQ="; }; }; - patches = [ - # jumpy uses an outdated version of mimalloc - # which fails to build on aarch64-linux - ./update-mimalloc.patch - ]; - nativeBuildInputs = [ makeWrapper pkg-config @@ -57,7 +52,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -67,11 +62,12 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; + # jumpy only loads assets from the current directory + # https://github.com/fishfolk/bones/blob/f84d07c2f2847d9acd5c07098fe1575abc496400/framework_crates/bones_asset/src/io.rs#L50 postInstall = '' mkdir $out/share cp -r assets $out/share - wrapProgram $out/bin/jumpy \ - --set-default JUMPY_ASSET_DIR $out/share/assets + wrapProgram $out/bin/jumpy --chdir $out/share ''; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/third_party/nixpkgs/pkgs/games/jumpy/update-mimalloc.patch b/third_party/nixpkgs/pkgs/games/jumpy/update-mimalloc.patch deleted file mode 100644 index cd602e3af1..0000000000 --- a/third_party/nixpkgs/pkgs/games/jumpy/update-mimalloc.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2945,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.31" -+version = "0.1.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877" -+checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" - dependencies = [ - "cc", - "libc", -@@ -3117,9 +3117,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.35" -+version = "0.1.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa" -+checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" - dependencies = [ - "libmimalloc-sys", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -75,7 +75,7 @@ web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] } - - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] - bevy_dylib = "0.9.1" --mimalloc = { version = "0.1.32", default-features = false } -+mimalloc = { version = "0.1.37", default-features = false } - # Networking deps - ggrs = { version = "0.9.3", features = ["sync-send"] } - bitfield = "0.14.0" diff --git a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix index 569148f2cf..5fce31eaa8 100644 --- a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.33"; + version = "unstable-2023-10-14"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; - rev = "refs/tags/${version}"; - sha256 = "sha256-fEQUChkxrKV2IkFGORUolZE2qTzA10Xxogjl5Va4TcE="; + rev = "450784283dd49152dda6322db2fb2ef33e7c382e"; + sha256 = "sha256-iwIaxD35tkOX6NX1SVNmN2OQACwaX/C4xnfgT5YcUvg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix b/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix index c8b0448794..7993fd0657 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "lpairs2"; - version = "2.2.1"; + version = "2.3"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-n2/3QxsnRzVgzKzOUF6RLzpHJ2R8z67Mkjwdh2ghn28="; + hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix index aaa4a7c34e..8cf581b376 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-wjziFFTAOJxSl6fvLhTv6ATZQGJefusDhqKXgOwsRvY="; + hash = "sha256-EpHGpkLQa57hU6wKLnhVosmD6DnGGPGilN8E2ClSXLA="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix index e538a19938..a28ccea53c 100644 --- a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - hash = "sha256-zSAtQPgniI4hwhqiknP4zQAH6dhEmoAC1iF577ahnFU="; + hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json index 142ef4e51c..67d2f4cab6 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.20": { - "url": "https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar", - "sha1": "84194a2f286ef7c14ed7ce0090dba59902951553", - "version": "1.20.1", + "url": "https://piston-data.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar", + "sha1": "5b868151bd02b41319f54c8d4061b8cae84e665c", + "version": "1.20.2", "javaVersion": 17 }, "1.19": { diff --git a/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix b/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix index 19fdae615a..11950a8f74 100644 --- a/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix +++ b/third_party/nixpkgs/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.34"; + version = "6.0.39"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-qYt4LrSQYFr3C0Mkks5aBOYFp60Y3OjFamXxaD5h+mU="; + hash = "sha256-gV+16gxXfogHFFAXz/aG+D/uaXbZTgVjYK24QQizQ0c="; }; - cargoHash = "sha256-s2WvRXxEm+/QceHpJA41ZRts6NCcG04kib3L78KwBPg="; + cargoHash = "sha256-D6HnpXxixmVugbjr5pMYZiVeGLgje41k3n3xic6Ecps="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/third_party/nixpkgs/pkgs/games/nile/default.nix b/third_party/nixpkgs/pkgs/games/nile/default.nix index beb444ae11..e3bf056fc3 100644 --- a/third_party/nixpkgs/pkgs/games/nile/default.nix +++ b/third_party/nixpkgs/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.0.0"; + version = "unstable-2023-10-03"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "f5f3b96f6483c59cfc646afbda6e97cb0bd94778"; - hash = "sha256-HibY3U9/MibEDwHY+YiErW/pz6qwtps8wwjhznTISgA="; + rev = "8f7ab2650fc730efc8960b5fcd71421d724a4108"; + hash = "sha256-Vhjp9JX8VX0PWsvEh5eOhz7vsIEaiCyPNPOjibE8GXo="; }; disabled = pythonOlder "3.8"; diff --git a/third_party/nixpkgs/pkgs/games/openmw/default.nix b/third_party/nixpkgs/pkgs/games/openmw/default.nix index 3f6ce29c3a..99c58df372 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/default.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/default.nix @@ -1,79 +1,69 @@ { lib , stdenv -, mkDerivation -, fetchFromGitHub +, fetchFromGitLab , fetchpatch , cmake , pkg-config , wrapQtAppsHook -, openscenegraph -, mygui +, SDL2 +, CoreMedia +, VideoToolbox +, VideoDecodeAcceleration +, boost , bullet , ffmpeg -, boost -, SDL2 -, unshield -, openal , libXt +, luajit , lz4 +, mygui +, openal +, openscenegraph , recastnavigation -, VideoDecodeAcceleration +, unshield +, yaml-cpp }: let - openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; }) - .overrideDerivation (self: { - src = fetchFromGitHub { - owner = "OpenMW"; - repo = "osg"; - rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"; - sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo="; - }; - patches = [ - (fetchpatch { - # For Darwin, OSG doesn't build some plugins as they're redundant with QuickTime. - # OpenMW doesn't like this, and expects them to be there. Apply their patch for it. - name = "darwin-osg-plugins-fix.patch"; - url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch"; - sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U="; - }) - ]; - }); + GL = "GLVND"; # or "LEGACY"; - bullet_openmw = bullet.overrideDerivation (old: rec { - version = "3.17"; - src = fetchFromGitHub { - owner = "bulletphysics"; - repo = "bullet3"; - rev = version; - sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q="; - }; - patches = []; - cmakeFlags = (old.cmakeFlags or []) ++ [ + osg' = (openscenegraph.override { colladaSupport = true; }).overrideDerivation (old: { + patches = [ + (fetchpatch { + # Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW. + name = "darwin-osg-plugins-fix.patch"; + url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch"; + sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U="; + }) + ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-Wno-dev" + "-DOpenGL_GL_PREFERENCE=${GL}" + "-DBUILD_OSG_PLUGINS_BY_DEFAULT=0" + "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" + ] ++ (map (e: "-DBUILD_OSG_PLUGIN_${e}=1") [ "BMP" "DAE" "DDS" "FREETYPE" "JPEG" "OSG" "PNG" "TGA" ]); + }); + + bullet' = bullet.overrideDerivation (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-Wno-dev" + "-DOpenGL_GL_PREFERENCE=${GL}" "-DUSE_DOUBLE_PRECISION=ON" "-DBULLET2_MULTITHREADING=ON" ]; }); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openmw"; - version = "0.47.0"; + version = "0.48.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "OpenMW"; repo = "openmw"; rev = "${pname}-${version}"; - sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; + hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff"; - sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; - }) - ]; - postPatch = '' sed '1i#include ' -i components/myguiplatform/myguidatamanager.cpp # gcc12 '' + lib.optionalString stdenv.isDarwin '' @@ -84,27 +74,30 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; # If not set, OSG plugin .so files become shell scripts on Darwin. - dontWrapQtApps = true; + dontWrapQtApps = stdenv.isDarwin; buildInputs = [ SDL2 boost - bullet_openmw + bullet' ffmpeg libXt + luajit + lz4 mygui openal - openscenegraph_openmw - unshield - lz4 + osg' recastnavigation + unshield + yaml-cpp ] ++ lib.optionals stdenv.isDarwin [ + CoreMedia VideoDecodeAcceleration + VideoToolbox ]; cmakeFlags = [ - # as of 0.46, openmw is broken with GLVND - "-DOpenGL_GL_PREFERENCE=LEGACY" + "-DOpenGL_GL_PREFERENCE=${GL}" "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" ] ++ lib.optionals stdenv.isDarwin [ "-DOPENMW_OSX_DEPLOYMENT=ON" diff --git a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix index 8b6c96c528..48454b42df 100644 --- a/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/third_party/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -3,6 +3,7 @@ , cmake , openmw , fetchFromGitHub +, fetchpatch , luajit , makeWrapper , symlinkJoin @@ -85,8 +86,15 @@ let --replace "\"./\"" "\"$out/bin/\"" ''; - # https://github.com/TES3MP/openmw-tes3mp/issues/552 - patches = oldAttrs.patches ++ [ ./tes3mp.patch ]; + patches = [ + (fetchpatch { + url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch"; + sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + }) + + # https://github.com/TES3MP/openmw-tes3mp/issues/552 + ./tes3mp.patch + ]; env.NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/third_party/nixpkgs/pkgs/games/openra/build-engine.nix b/third_party/nixpkgs/pkgs/games/openra/build-engine.nix index 664a4c0735..10e8b49392 100644 --- a/third_party/nixpkgs/pkgs/games/openra/build-engine.nix +++ b/third_party/nixpkgs/pkgs/games/openra/build-engine.nix @@ -36,7 +36,7 @@ buildDotnetModule rec { dontDotnetFixup = true; preBuild = '' - make VERSION=${version} version + make VERSION=${engine.build}-${version} version ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/openra/engines/release/default.nix b/third_party/nixpkgs/pkgs/games/openra/engines/release/default.nix index 7c778679f3..3b1715aca5 100644 --- a/third_party/nixpkgs/pkgs/games/openra/engines/release/default.nix +++ b/third_party/nixpkgs/pkgs/games/openra/engines/release/default.nix @@ -2,7 +2,7 @@ buildOpenRAEngine { build = "release"; - version = "20230225"; - sha256 = "sha256-f1OwyxNNn1Wh5sfz4s81bbHDY6ot2tvjMD8EK87Hc7k="; + version = "20231010"; + sha256 = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; deps = ./deps.nix; } diff --git a/third_party/nixpkgs/pkgs/games/openra/engines/release/deps.nix b/third_party/nixpkgs/pkgs/games/openra/engines/release/deps.nix index 81863502e1..877e93c608 100644 --- a/third_party/nixpkgs/pkgs/games/openra/engines/release/deps.nix +++ b/third_party/nixpkgs/pkgs/games/openra/engines/release/deps.nix @@ -3,29 +3,27 @@ { fetchNuGet }: [ (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) - (fetchNuGet { pname = "Linguini.Bundle"; version = "0.3.1"; sha256 = "14dz8idlr8pxv1psqbc4v3v460naj2kixwv2kwr5y11v4dj6vnvj"; }) - (fetchNuGet { pname = "Linguini.Shared"; version = "0.3.0"; sha256 = "0hvml8qkb73408aqyb49dp6b168jrr6g1n0qszdhmgax4mgxdqxf"; }) - (fetchNuGet { pname = "Linguini.Syntax"; version = "0.3.0"; sha256 = "1qgj6vbdjjl30cqcyn8df30jj15c2ahj7clgb5fwcja47mnw3jd8"; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.5.0"; sha256 = "0515ifvvqhmhwdf7kw1wpamxn588hi150v6b8p4jfmr07y1dc4ml"; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.5.0"; sha256 = "1y45lf6ipa53469sdz110d16rxfyrkdr2xscgagwg07lr2833nbb"; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.5.0"; sha256 = "06438fc5mizi702n8d7pqa21n5i7kwl1bwzxfy1l883j9gh64gjp"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; sha256 = "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm"; }) (fetchNuGet { pname = "MP3Sharp"; version = "1.0.5"; sha256 = "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.CommandLine"; version = "4.4.1"; sha256 = "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab"; }) - (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; }) - (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.20"; sha256 = "0nq52kdpwsvmhxgcv26wajvn3yxd5l89918rnrzxa463hmyb2rmv"; }) - (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.9"; sha256 = "1i5clsxszmdkhjcdkp9324zidhzp0dsvn7cbcgrnafs18yabjmzq"; }) + (fetchNuGet { pname = "NVorbis"; version = "0.10.5"; sha256 = "0yiqqlb8mmnz04yq4iykkxq9np4m29z29bjwm5ic0adyq8fr4cnl"; }) + (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.22"; sha256 = "134ar57v7k5i4zb7xl9j2f6abwjjhl5kwx3cap5zrb5jdfb1x42p"; }) + (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.11"; sha256 = "1gb1mpckj2ji64fyca6cd1lbl7adyfjl5czgvhllhgv5h2jfwir1"; }) (fetchNuGet { pname = "OpenRA-FuzzyLogicLibrary"; version = "1.0.1"; sha256 = "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim"; }) - (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.19"; sha256 = "1ywm3b15qywrxby3s9wjs9flfjq7vld0gqz0xw4psgvz38gdgh7p"; }) - (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.36"; sha256 = "1vywf2bfqkq0mr58gfd5kafv12rri2bzfajajcj8ha9fmhdibj3s"; }) - (fetchNuGet { pname = "Pfim"; version = "0.10.3"; sha256 = "1myjs99g14q1yj3j5hzhx8ic7i3rqh2mi3qy9gdfzi6n9dlz1b3d"; }) + (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.22"; sha256 = "05bxqdams1s4la5fqlsijzmja1wf59gcy5y04jh91996q9glkq1d"; }) + (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.40"; sha256 = "0ysrryn63akysiv92mh0mra87pd8l8zvahp8pbxsliapdfq2n2qk"; }) + (fetchNuGet { pname = "Pfim"; version = "0.11.2"; sha256 = "1mf91sfxa4c5xp5qmgyc85v84aprhgdy951f1f41xmygvmkk94mp"; }) (fetchNuGet { pname = "rix0rrr.BeaconLib"; version = "1.0.2"; sha256 = "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -62,8 +60,9 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) - (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) + (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) + (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -110,5 +109,5 @@ (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) + (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) ] diff --git a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix index da113ed1af..b8b0716976 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.54.4"; + version = "0.55.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0="; + hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/third_party/nixpkgs/pkgs/games/orthorobot/default.nix b/third_party/nixpkgs/pkgs/games/orthorobot/default.nix index 6ca7059645..10bf3f9268 100644 --- a/third_party/nixpkgs/pkgs/games/orthorobot/default.nix +++ b/third_party/nixpkgs/pkgs/games/orthorobot/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { patches = [ # support for love11 + # https://github.com/Stabyourself/orthorobot/pull/3 (fetchpatch { - url = "https://github.com/Stabyourself/orthorobot/pull/3.patch"; + name = "Stabyourself-orthorobot-pull-3.patch"; + url = "https://github.com/Stabyourself/orthorobot/compare/48f07423950b29a94b04aefe268f2f951f55b62e...05856ba7dbf1bb86d0f16a5f511d8ee9f2176015.patch"; sha256 = "sha256-WHHP6QM7R5eEkVF+J2pGNnds/OKRIRXyon85wjd3GXI="; }) ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix index e2a6e10d03..eccc2146d2 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.1008.0"; + version = "2023.1026.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-gtXbccVrQ2edEcDR7wG2Upv4b4a64tvu+/fiKghMquM="; + sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-qo4EovNt158XXfYOek4lmil2Qwv185fLjZIaBsXzw74="; + sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-aZDRwZeCC4qBNktLeD7ezbp1Bydf6mP8crtpdayUiqI="; + sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -70,7 +70,7 @@ let unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ delan stepbrobd ]; + maintainers = with maintainers; [ delan stepbrobd spacefault ]; mainProgram = "osu!"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 4286edf6f0..bc206ef014 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -9,7 +9,6 @@ , SDL2 , lttng-ust , numactl -, dotnetCorePackages , libglvnd , xorg , udev @@ -17,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.815.0"; + version = "2023.1026.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-Lm/unDa1ADc2zprrgP/a2bOzHb02CwU9gcvhmTOXKIM="; + sha256 = "sha256-kbi4Um1MRctpwD7ndlcB+K7AxDbWHqAHmkJbEI0fNzI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -84,7 +83,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ oxalica thiagokokada ]; + maintainers = with maintainers; [ thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 5bae8db341..740a1d289a 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -6,11 +6,11 @@ (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.4.20"; sha256 = "115nbg7d4j2v5l40hqp4q4s0pm84r1yl7d8fbxyw89s1nbab6qp3"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { pname = "Fody"; version = "6.7.0"; sha256 = "0fv0zrffa296qjyi11yk31vfqh6gm1nxsx8g5zz380jcsrilnp3h"; }) + (fetchNuGet { pname = "Fody"; version = "6.8.0"; sha256 = "1y159433n5wzlvc8hjjrhjarf7mjvngbmh34jkd452zlrjqrhmns"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.46"; sha256 = "0yx0xgbbzd6fdyslf7pc37bxk4hfkj1c7359ibqwmapv9aby7lm2"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.54"; sha256 = "178sd0ym900knjz7dmy2bvggijbqfp4zbmscgkxfjq3agvjfap8a"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) @@ -65,21 +65,21 @@ (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.4.59"; sha256 = "13igx5m5hkqqyhyw04z2nwfxn2jwlrpvvwx4c8qrayv9j4l31ajm"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.59"; sha256 = "1y8mg95x87jddk0hyf58cc1zy666mqbla7479njkm7kmpwz61s8c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.2"; sha256 = "1k5gjiwmcrbwfz54jafz6mmf4md7jgk3j8jdpp9ax72glwa7ia4a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.2"; sha256 = "0rnra67gkg0qs7wys8bacm1raf9khb688ch2yr56m88kwdk5bhw4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.2"; sha256 = "19dviyc68m56mmy05lylhp2bxvww2gqx1y07kc0yqp61rcjb1d85"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.2"; sha256 = "0ms9syxlxk6f5pxjw23s2cz4ld60vk84v67l0bhnnb8v42rz97nn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.2"; sha256 = "15qs3pdji2sd629as4i8zd5bjbs165waim9jypxqjkb55bslz8d7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.2"; sha256 = "0c3ia03m1shc2xslqln5m986kpvc1dqb15j85vqxbzb0jj6fr52y"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.2"; sha256 = "028r8sk5dlxkfxw6wz2ys62rm9dqa85s6rfhilrfy1phsl47rkal"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.2"; sha256 = "1zkznsq5r7gg2pnlj9y7swrbvzyywf6q5xf9ggcwbvccwp0g6jr4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.2"; sha256 = "1x5pymqc315nb8z2414dvqdpcfd5zy5slcfa9b3vjhrbbbngaly7"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.129"; sha256 = "08bpg5v467zyx5ni8pj9x2nkqx3r2vbfdh7v72laii0707163fb2"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.129"; sha256 = "1q0pprliqr8wrn09k8sa2p9l28q30rk6sl47vlazgwc678f96vg7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.12"; sha256 = "0dih84mzrgnf0zm2k8w9ivhlxx1vin9srir8jqcvhibw0xwrpzzw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.12"; sha256 = "1k9xak1f13nb4kp3ld0azlx2mp7ya8rbnd23587yanzv4lwpgab8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.12"; sha256 = "0xs23299gmnjf92jjbn3bgi7493a89zylhvm7gcraayin1g8prpc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.12"; sha256 = "0yjqyn7kdq4nmysaj9lab870hxc07l5q5qgkj7ppmrq7vzf49lbf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.12"; sha256 = "1x5d3jh4vxvankxx6xp1937m6p3ryz39cwwiajnck1lj5mkwhw5h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.12"; sha256 = "1zqidbidqa0jyrsfm5rna6h37q18acqxh0v5vwxp6cf65r39w1z1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.12"; sha256 = "1irln0dn89kls3k2h9j9hj616psl71xpid3vz7cllc0n0fjxkz0y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.12"; sha256 = "1374x6j7r79piji2r8ppddyzgf9nadc6mmgabk3jgg9m4lc67z48"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.12"; sha256 = "0zmvb48yvm1i6pysqbz63jk0y4c61nxapdwlb3c5nxwgjcy0n06k"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.12"; sha256 = "05ljbjqjipq5lhn5ydh1567wd5qgz9dbhlc9i5xjid8pdfn4zzs1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) @@ -89,13 +89,15 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.2"; sha256 = "18ipxpw73wi5gdj7vxhmqgk8rl3l95w6h5ajxbccdfyv5p75v66d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.12"; sha256 = "0cdh6kchc9yjlid6vdx74p1r5i7x7dalys107hbj4aqcrqx0jnnd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; sha256 = "0i7li76gmk6hml12aig4cvyvja9mgl16qr8pkwvx5vm6lc9a3nn4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; sha256 = "0ghz4y4gxnf2vw8yvhz9nkw21p6q2qqwh19phkk1xwxywyilr3mq"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -106,7 +108,7 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MongoDB.Bson"; version = "2.11.3"; sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r"; }) + (fetchNuGet { pname = "MongoDB.Bson"; version = "2.19.1"; sha256 = "1v7n5lnslb8v6iwcfasipgl03bd215n153bdkc8dc93k3hplyiqx"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "NativeLibraryLoader"; version = "1.0.13"; sha256 = "18vi5gpa243jvz8cixyhbbrccj4js5sc8g4gy10ldjy50szrpnqh"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) @@ -124,28 +126,28 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.1"; sha256 = "0ww8ib1la21x80v54w6vf5ddq0s2bv49rlzdhdg35pbw51jx1m95"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.1"; sha256 = "04cj5vp665pnja7y07i3zpw3r1ff9kr9b8iglyqjhq7bz0y2dxvy"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.1"; sha256 = "0vp3bgspczw76gh4qm61dhrrxkds4nsqarppg5rdicxpvirj66yq"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.1"; sha256 = "1ikdwfk2n9knfps15j1hrx1f02c0sksi70vjk1bml8cvmz6chjg7"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.3"; sha256 = "1ac4s2422gyfmi5b2znn6i9j5p3w3w2jjng7g9lzh1mfgad3wfc2"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.3"; sha256 = "176lj975yz2m34dzhjjawnsca4vviaayvmqinh6vsss6v1084fws"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.3"; sha256 = "0dd37qfh6mxsf13bfnywy5ni17wvy6g419ksc4ga3ljv0zhrbpfz"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.3"; sha256 = "0pq43y1zlx4a0lidav1w6jsywvwc4z3aaq4w53w68cqf855k4wv9"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.712.0"; sha256 = "064qrrlhhfx18mmrxqhq06d0sdhzzpqxjgc3znpflqh5j1l4j4m1"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.712.0"; sha256 = "1zs9ky53faxqhf6hx1pvnnni79dil8m7f8w4yh9if306bnllnwl4"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.815.0"; sha256 = "0xda8fd70x6ljbaqliikbjff84arjm3va5ibdv5p9sijn5arhzy8"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1012.0"; sha256 = "1fx69kqgyb60widy44nyr5clw3y8l33vrivfddchm6ywmpbbdgaw"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1004.1-nativelibs"; sha256 = "0kwap1zc26c2p106i4dl724g9kmk1qn0jzi6pvlc9bn348v42nmy"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.719.0"; sha256 = "1isy0jd8xkjw72m4akh85nmlcfp6na1ksghyajs4amiagjgvvn47"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1023.0"; sha256 = "1q7w5ivi8pyvz3jkm48ddfj738grd4hmynfhp39a9hfmm0i9nnvj"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g9f8aa2931a"; sha256 = "0jzjaakcfy3x85wx8smp4j7hffbynqakgqvwslr3bkbqlfdxxbil"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "120d6zjh5ss79iz44m9fc4bzhj62yyzawp1wd9knvxq322a6i82n"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "0xn2cazwv6c6wllas4advsam1dgvqlw1k1vlrp0imswgz6zbvf4f"; }) - (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; }) - (fetchNuGet { pname = "Realm"; version = "11.1.2"; sha256 = "0kfq7knlw0njvhkqz9hjpgi1qqxsh8i1vj07zbj20jspamqrwdyd"; }) - (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.1.2"; sha256 = "01w9lbzwd0d5gc0v2jahbwlhka1fxpj5lpz0cq7v04r0y6064v23"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) + (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) + (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) + (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -171,6 +173,7 @@ (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) @@ -189,23 +192,22 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.28.1"; sha256 = "09xl3bm5clqxnn8wyy36zwmj8ai8zci6ngw64d0r3rzgd95gbf61"; }) + (fetchNuGet { pname = "Sentry"; version = "3.40.0"; sha256 = "1vijf4dfv842y2567sgs4bx51g7jyqsrmg689nj4nbbf44aay99a"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) (fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; sha256 = "0wbw20m7nyhxj32k153l668sxigamlwig0qpz8l8d0jqz35vizm0"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -245,7 +247,11 @@ (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) @@ -268,7 +274,6 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) @@ -302,10 +307,11 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.1"; sha256 = "1lqh6nrrkx4sksvn5509y6j9z8zkhcls0yghd0n31zywmmy3pnf2"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix index 2fa4545362..2086177918 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/default.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix @@ -1,40 +1,50 @@ -{ lib, stdenv, fetchurl, bash, jre }: - -stdenv.mkDerivation rec { +{ + lib, + stdenvNoCC, + fetchurl, + jre, + makeBinaryWrapper, +}: +stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; - version = "1.20.1.83"; + version = "1.20.2.234"; - jar = let - mcVersion = lib.versions.pad 3 version; - buildNum = builtins.elemAt (lib.versions.splitVersion version) 3; - in fetchurl { - url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4="; - }; - - preferLocalBuild = true; - - dontUnpack = true; - dontConfigure = true; - - buildPhase = '' - cat > minecraft-server << EOF - #!${bash}/bin/sh - exec ${jre}/bin/java \$@ -jar $out/share/papermc/papermc.jar nogui - ''; + src = + let + mcVersion = lib.versions.pad 3 finalAttrs.version; + buildNum = builtins.elemAt (lib.splitVersion finalAttrs.version) 3; + in + fetchurl { + url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; + hash = "sha256-fR7Dq09iFGVXodQjrS7Hg4NcrKPJbNg0hexU520JC6c="; + }; installPhase = '' - install -Dm444 ${jar} $out/share/papermc/papermc.jar - install -Dm555 -t $out/bin minecraft-server + runHook preInstall + + install -D $src $out/share/papermc/papermc.jar + + makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ + --append-flags "-jar $out/share/papermc/papermc.jar nogui" + + runHook postInstall ''; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + dontUnpack = true; + preferLocalBuild = true; + allowSubstitutes = false; + meta = { description = "High-performance Minecraft Server"; - homepage = "https://papermc.io/"; + homepage = "https://papermc.io/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; mainProgram = "minecraft-server"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/games/portmod/default.nix index c67626d0b0..f9631c6d76 100644 --- a/third_party/nixpkgs/pkgs/games/portmod/default.nix +++ b/third_party/nixpkgs/pkgs/games/portmod/default.nix @@ -12,20 +12,20 @@ }: let - version = "2.1.0"; + version = "2.6.2"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - hash = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; + hash = "sha256-ufr2guaPdCvI5JOicL/lTrT3t6UlaY1hEB2xbwzhw6A="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; + cargoHash = "sha256-sAjgGVVjgXaWbmN/eGEvatYjkHeFTZNX1GXFcJqs3GI="; nativeBuildInputs = [ python3Packages.python @@ -49,22 +49,32 @@ python3Packages.buildPythonApplication rec { inherit src version; pname = "portmod"; + format = "pyproject"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; # build the rust library independantly prePatch = '' substituteInPlace setup.py \ - --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "from setuptools_rust import Binding, RustExtension, Strip" "" \ + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=Strip.Debug)" "" + + substituteInPlace pyproject.toml \ + --replace '"setuptools-rust"' "" ''; + nativeBuildInputs = with python3Packages; [ + setuptools + wheel + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools requests chardet colorama + deprecated restrictedpython appdirs gitpython @@ -95,6 +105,9 @@ python3Packages.buildPythonApplication rec { "test_sync" "test_manifest" "test_add_repo" + "test_init_prefix_interactive" + "test_scan_sources" + "test_unpack" ]; # for some reason, installPhase doesn't copy the compiled binary diff --git a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix index 9f260aaba9..2409794cdf 100644 --- a/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/prismlauncher/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , canonicalize-jars-hook , cmake , cmark @@ -23,51 +22,24 @@ let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; repo = "libnbtplusplus"; - rev = "2203af7eeb48c45398139b583615134efd8d407f"; - sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; + rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; + hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; }; in assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; -stdenv.mkDerivation -rec { +stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; - rev = version; - sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; + rev = finalAttrs.version; + hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA="; }; - patches = lib.optionals stdenv.isDarwin [ - # https://github.com/PrismLauncher/PrismLauncher/pull/1452 - # These patches allow us to disable the Sparkle updater and cmake bundling - # TODO: remove these when updating to 8.0 - (fetchpatch { - name = "disable-sparkle-when-url-is-empty.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; - hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; - }) - (fetchpatch { - name = "make-install_bundle-cached.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; - hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; - }) - (fetchpatch { - name = "dont-include-sparkle-when-not-enabled.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; - hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; - }) - (fetchpatch { - name = "introduce-internal-updater-variable.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; - hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; buildInputs = [ @@ -111,4 +83,4 @@ rec { license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix index 522a8e39fd..9a3597937d 100644 --- a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix +++ b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.20"; + version = "8.30"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; + sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/quake3/wrapper/default.nix b/third_party/nixpkgs/pkgs/games/quake3/wrapper/default.nix index 3c777c5b27..a1a5bfb03d 100644 --- a/third_party/nixpkgs/pkgs/games/quake3/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; diff --git a/third_party/nixpkgs/pkgs/games/raylib-games/default.nix b/third_party/nixpkgs/pkgs/games/raylib-games/default.nix index 6cb2b540f4..34ef5c8014 100644 --- a/third_party/nixpkgs/pkgs/games/raylib-games/default.nix +++ b/third_party/nixpkgs/pkgs/games/raylib-games/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, raylib }: +{ lib, stdenv, fetchFromGitHub, raylib, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ]; + buildInputs = [ raylib ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/third_party/nixpkgs/pkgs/games/runelite/default.nix b/third_party/nixpkgs/pkgs/games/runelite/default.nix index 0f71164f62..a4963eb2a9 100644 --- a/third_party/nixpkgs/pkgs/games/runelite/default.nix +++ b/third_party/nixpkgs/pkgs/games/runelite/default.nix @@ -1,69 +1,63 @@ -{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }: +{ lib +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, maven +, jre +, xorg +, gitUpdater +}: -stdenv.mkDerivation rec { +maven.buildMavenPackage rec { pname = "runelite"; - version = "2.5.0"; + version = "2.6.9"; - jar = fetchurl { - url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ=="; + src = fetchFromGitHub { + owner = "runelite"; + repo = "launcher"; + rev = version; + hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q="; }; - - icon = fetchurl { - url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; - hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ=="; - }; - - # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually - jogl = fetchurl { - url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; - hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg=="; - }; - gluegen = fetchurl { - url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar"; - hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A=="; - }; - dontUnpack = true; + mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg="; desktop = makeDesktopItem { name = "RuneLite"; type = "Application"; exec = "runelite"; - icon = icon; + icon = "runelite"; comment = "Open source Old School RuneScape client"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; categories = [ "Game" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; + # tests require internet :( + mvnParameters = "-Dmaven.test.skip"; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - mkdir -p $out/share/runelite - mkdir -p $out/share/applications - mkdir -p $out/natives + mkdir -p $out/share/icons - unzip ${jogl} 'natives/*' -d $out - unzip ${gluegen} 'natives/*' -d $out + cp target/RuneLite.jar $out/share + cp appimage/runelite.png $out/share/icons - ln -s ${jar} $out/share/runelite/RuneLite.jar - ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop - - # RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place makeWrapper ${jre}/bin/java $out/bin/runelite \ - --chdir "$out" \ --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ - --add-flags "-jar $out/share/runelite/RuneLite.jar" + --add-flags "-jar $out/share/RuneLite.jar" ''; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.bsd2; - maintainers = with maintainers; [ kmeakin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ kmeakin moody ]; platforms = [ "x86_64-linux" ]; + mainProgram = "runelite"; }; } diff --git a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix index 0e9a782403..e2365f9ad2 100644 --- a/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix +++ b/third_party/nixpkgs/pkgs/games/sauerbraten/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; + homepage = "http://sauerbraten.org"; maintainers = with maintainers; [ raskin ajs124 ]; mainProgram = "sauerbraten_client"; hydraPlatforms = diff --git a/third_party/nixpkgs/pkgs/games/sfrotz/default.nix b/third_party/nixpkgs/pkgs/games/sfrotz/default.nix index e6b9593719..e90f1639e1 100644 --- a/third_party/nixpkgs/pkgs/games/sfrotz/default.nix +++ b/third_party/nixpkgs/pkgs/games/sfrotz/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "sfrotz"; - version = "2.52"; + version = "2.54"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + sha256 = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix index 8173fb5fe1..35f92f1457 100644 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20230918.2d9e414"; + version = "20231025.35f7965"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM="; + hash = "sha256-c9D8lr5V/1BrKQjBsj931uGpnpR5p80CgP0Y/HNc40E="; }; sgt-puzzles-menu = fetchurl { diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix index e74887799e..625fe50108 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/default.nix @@ -1,123 +1,30 @@ -{ lib, stdenv -, makeWrapper +{ callPackage , fetchFromGitHub , nixosTests -, gradle -, perl -, jre -, libpulseaudio -, makeDesktopItem -, copyDesktopItems }: -let +callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.1.4"; + version = "2.2.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-WbRvsHxTYYlhJavYVGMGK25fXEfSfnIztJ6KuCgBjF8="; + hash = "sha256-0wSlCazsy3TYckWc2bQJL1xBVN2DuYsBIbb9Ajnfl7M="; }; - patches = [ - ./disable-beryx.patch - ]; - - postPatch = '' - # disable gradle plugins with native code and their targets - perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle - perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm)/ ... /^}/" build.gradle - # Remove unbuildable Android/iOS stuff - rm android/build.gradle ios/build.gradle - ''; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon desktop:release - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; - }; - - desktopItem = makeDesktopItem { - name = "shattered-pixel-dungeon"; - desktopName = "Shattered Pixel Dungeon"; - comment = "An open-source traditional roguelike dungeon crawler"; - icon = "shattered-pixel-dungeon"; - exec = "shattered-pixel-dungeon"; - terminal = false; - categories = [ "Game" "AdventureGame" ]; - keywords = [ "roguelike" "dungeon" "crawler" ]; - }; - -in stdenv.mkDerivation rec { - inherit pname version src patches postPatch; - - nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ]; - - desktopItems = [ desktopItem ]; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle - gradle --offline --no-daemon desktop:release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar - mkdir $out/bin - makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ - --add-flags "-jar $out/share/shattered-pixel-dungeon.jar" - - for s in 16 32 48 64 128 256; do - install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ - $out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png - done - - runHook postInstall - ''; + depsHash = "sha256-QfAV6LYD6S/8ptaqqKSDtOe4kStwp6LJp8WVc3sH8yc="; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; }; - meta = with lib; { + desktopName = "Shattered Pixel Dungeon"; + + meta = { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch index 5bd6e5bcf1..9530f5b137 100644 --- a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch @@ -38,10 +38,3 @@ index 97f35f7..afd5116 100644 dependencies { implementation project(':core') -@@ -123,4 +124,4 @@ dependencies { - - implementation project(':services:updates:githubUpdates') - implementation project(':services:news:shatteredNews') --} -\ No newline at end of file -+} diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch new file mode 100644 index 0000000000..fb905939f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch @@ -0,0 +1,29 @@ +diff --git a/build.gradle b/build.gradle +--- a/build.gradle ++++ b/build.gradle +@@ -11,7 +11,6 @@ buildscript { + //FIXME the version of R8 coming with gradle plugin 4.0.0 causes serious problems + //noinspection GradleDependency + classpath 'com.android.tools.build:gradle:3.6.4' +- classpath "com.palantir.gradle.gitversion:gradle-git-version:0.12.3" + } + } + +@@ -19,16 +18,13 @@ buildscript { + + allprojects { + +- apply plugin: "com.palantir.git-version" +- +- def details = versionDetails() + + ext { + appName = 'Summoning Pixel Dungeon' + appPackageName = 'com.trashboxbobylev.summoningpixeldungeon' + + appVersionCode = 432 +- appVersionName = '@version@-' + details.gitHash.substring(0, 7) ++ appVersionName = '@version@' + + appAndroidCompileSDK = 33 + appAndroidMinSDK = 15 diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix new file mode 100644 index 0000000000..7134e7aca8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "experienced-pixel-dungeon"; + version = "2.15.3"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Experienced-Pixel-Dungeon-Redone"; + rev = "ExpPD-${version}"; + hash = "sha256-qwZk08e+GX8YAVnOZCQ6sIIfV06lWn5bM6/PKD0PAH0="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Experienced Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone"; + downloadPage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike without limits on experience and items"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/generic.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/generic.nix new file mode 100644 index 0000000000..92427674c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -0,0 +1,137 @@ +# Generic builder for shattered pixel forks/mods +{ pname +, version +, src +, depsHash +, meta +, desktopName +, patches ? [ ./disable-beryx.patch ] + +, lib +, stdenv +, makeWrapper +, gradle +, perl +, jre +, libpulseaudio +, makeDesktopItem +, copyDesktopItems +, ... +}@attrs: + +let + cleanAttrs = builtins.removeAttrs attrs [ + "lib" + "stdenv" + "makeWrapper" + "gradle" + "perl" + "jre" + "libpulseaudio" + "makeDesktopItem" + "copyDesktopItems" + ]; + + postPatch = '' + # disable gradle plugins with native code and their targets + perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm|git-version)/ ... /^}/" build.gradle + # Remove unbuildable Android/iOS stuff + rm -f android/build.gradle ios/build.gradle + ${attrs.postPatch or ""} + ''; + + desktopItem = makeDesktopItem { + name = pname; + inherit desktopName; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + categories = [ "Game" "AdventureGame" ]; + keywords = [ "roguelike" "dungeon" "crawler" ]; + }; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src patches postPatch; + nativeBuildInputs = [ gradle perl ] ++ attrs.nativeBuildInputs or []; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + gradle --no-daemon desktop:release + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashMode = "recursive"; + outputHash = depsHash; + }; + +in stdenv.mkDerivation (cleanAttrs // { + inherit pname version src patches postPatch; + + nativeBuildInputs = [ + gradle + perl + makeWrapper + copyDesktopItems + ] ++ attrs.nativeBuildInputs or []; + + desktopItems = [ desktopItem ]; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + # point to offline repo + sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle + gradle --offline --no-daemon desktop:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 desktop/build/libs/desktop-*.jar $out/share/${pname}.jar + mkdir $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + --add-flags "-jar $out/share/${pname}.jar" + + for s in 16 32 48 64 128 256; do + # Some forks only have some icons and/or name them slightly differently + if [ -f desktop/src/main/assets/icons/icon_$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + if [ -f desktop/src/main/assets/icons/icon_''${s}x$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_''${s}x$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + done + + runHook postInstall + ''; + + meta = with lib; { + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; + mainProgram = pname; + } // meta; +}) diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix new file mode 100644 index 0000000000..34a24a758f --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rat-king-adventure"; + version = "1.5.2a"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Rat-King-Adventure"; + rev = version; + hash = "sha256-UgUm7GIn1frS66YYrx+ax+oqMKnQnDlqpn9e1kWwDzo="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Adventure"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Rat-King-Adventure"; + downloadPage = "https://github.com/TrashboxBobylev/Rat-King-Adventure/releases"; + description = "An expansive fork of RKPD2, itself a fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rkpd2.nix new file mode 100644 index 0000000000..a3864dd3b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/rkpd2.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rkpd2"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Zrp200"; + repo = "rkpd2"; + rev = "v${version}"; + hash = "sha256-3WKQCXFDyliObXaIRp3x0kRh3XeNd24SCoTgdFA8/rM="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Pixel Dungeon 2"; + + meta = { + homepage = "https://github.com/Zrp200/rkpd2"; + downloadPage = "https://github.com/Zrp200/rkpd2/releases"; + description = "Fork of popular roguelike game Shattered Pixel Dungeon that drastically buffs heroes and thus makes the game significantly easier"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix new file mode 100644 index 0000000000..062e76cf85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "shorter-pixel-dungeon"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Shorter-Pixel-Dungeon"; + rev = "Short-${version}"; + hash = "sha256-8vmh65XlNqfIh4WHLPuWU68tb3ajKI8kBMI68CYlsSk="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Shorter Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon/releases"; + description = "A shorter fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix new file mode 100644 index 0000000000..488110684c --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -0,0 +1,36 @@ +{ callPackage +, fetchFromGitHub +, gradle_6 +, substitute +}: + +callPackage ./generic.nix rec { + pname = "summoning-pixel-dungeon"; + version = "1.2.5a"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Summoning-Pixel-Dungeon"; + # The GH release is named "$version-$hash", but it's actually a mutable "_latest" tag + rev = "89ff59e7f42abcc88b7a1f24391f95ddc30f9d29"; + hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; + }; + + patches = [(substitute { + src = ./disable-git-version.patch; + replacements = [ "--subst-var-by" "version" version ]; + })]; + + depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; + + desktopName = "Summoning Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; + }; + + # Probably due to https://github.com/gradle/gradle/issues/17236 + gradle = gradle_6; +} diff --git a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 9d598798de..8d1078a8a0 100644 --- a/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/third_party/nixpkgs/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.22.1"; + version = "0.24.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo="; + hash = "sha256-n0OiNxw9QDibX5HBSzq6jdOxyUd0bPkjKd+mtb/S/BY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/starsector/default.nix b/third_party/nixpkgs/pkgs/games/starsector/default.nix index 3951f36f83..e1bc4a8dbb 100644 --- a/third_party/nixpkgs/pkgs/games/starsector/default.nix +++ b/third_party/nixpkgs/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.96a-RC8"; + version = "0.96a-RC10"; src = fetchzip { - url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-RDXqFqiWpBG3kasofzbOl7Zp0a9LiMpJKsHcFaJtm2Y="; + url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; + sha256 = "sha256-RBSnms+QlKgTOhm3t2hDfv7OcMrQCk1rfkz9GaM74WM="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1) update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix ''; } diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index a6734b6406..8ba5087ef7 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -3,6 +3,7 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile +, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap , extraArgs ? "" # arguments to always pass to steam , extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # include game specific libraries @@ -80,7 +81,7 @@ in buildFHSEnv rec { xorg.libXfixes libGL libva - pipewire.lib + pipewire # steamwebhelper harfbuzz @@ -168,6 +169,7 @@ in buildFHSEnv rec { libcaca libcanberra libgcrypt + libunwind libvpx librsvg xorg.libXft @@ -277,6 +279,8 @@ in buildFHSEnv rec { exec steam ${extraArgs} "$@" ''; + inherit extraBwrapArgs; + meta = if steam != null then @@ -287,21 +291,11 @@ in buildFHSEnv rec { description = "Steam dependencies (dummy package, do not use)"; }; - # allows for some gui applications to share IPC - # this fixes certain issues where they don't render correctly - unshareIpc = false; - - # Some applications such as Natron need access to MIT-SHM or other - # shared memory mechanisms. Unsharing the pid namespace - # breaks the ability for application to reference shared memory. - unsharePid = false; - passthru.run = buildFHSEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiArch multiPkgs profile extraInstallCommands; - inherit unshareIpc unsharePid; + inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; runScript = writeShellScript "steam-run" '' run="$1" @@ -321,6 +315,7 @@ in buildFHSEnv rec { meta = (steam.meta or {}) // { description = "Run commands in the same FHS environment that is used for Steam"; + mainProgram = "steam-run"; name = "steam-run"; }; }; diff --git a/third_party/nixpkgs/pkgs/games/steam/runtime.nix b/third_party/nixpkgs/pkgs/games/steam/runtime.nix index c8c67e94b4..593d78afe0 100644 --- a/third_party/nixpkgs/pkgs/games/steam/runtime.nix +++ b/third_party/nixpkgs/pkgs/games/steam/runtime.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = writeShellScript "update.sh" '' version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt) - ${nix-update}/bin/nix-update --version "$version" steamPackages.steam-runtime + ${lib.getExe nix-update} --version "$version" steamPackages.steam-runtime ''; }; diff --git a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix b/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix index 2901f42e09..c1c9415b90 100644 --- a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix +++ b/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix @@ -12,30 +12,35 @@ , lua , luajit , zlib +, jsoncpp +, libpng , Cocoa }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "unstable-2022-08-30"; + version = "97.0.352"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; - sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; + rev = "v${version}"; + sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + installPhase = '' install -Dm 755 powder $out/bin/powder mkdir -p $out/share/applications - mv ../resources/powder.desktop $out/share/applications mv ../resources $out/share + '' + lib.optionalString stdenv.isLinux '' + mv ./resources/powder.desktop $out/share/applications ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index f4b350ad38..70971fb1ad 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.8.9-patch2"; + version = "4.8.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-ek2FDzo7EbgZGbQyZ6mBmVoPRKkJu0JFewbVvsGzZMA="; + hash = "sha256-16TpsKNLcm6lbi4exYxDZWfmRsvfAhT1ktP36zC9Psg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index a3e7516c6f..4ac45503f2 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.0"; + version = "3.7.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-GmqPnay/K36cJgP622ht18csaohcUYZpvMD8LaOH4eM="; + sha256 = "sha256-6TXpUsQBzhZ02SCbCqZW2LZfQ370Ma57bsblmpgZmoc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index 22f64b383f..d2138759bc 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.12"; + version = "1.18.15"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-akeW03+IdRvt3Fs3gF6TcYv9gD33DHPtpmiiMa0b92k="; + hash = "sha256-luZwRKVptSd69tCaf6Jv0YOfwOeDOcuY7VoL+21tTEo="; }; diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index 22a2be3083..9979d16247 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; + hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix b/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix index b88c3ac947..0a621f625e 100644 --- a/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix +++ b/third_party/nixpkgs/pkgs/games/xivlauncher/default.nix @@ -71,7 +71,7 @@ in meta = with lib; { description = "Custom launcher for FFXIV"; - homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; + homepage = "https://github.com/goatcorp/XIVLauncher.Core"; license = licenses.gpl3; maintainers = with maintainers; [ sersorrel witchof0x20 ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/games/xmage/default.nix b/third_party/nixpkgs/pkgs/games/xmage/default.nix index 15a65efeb7..b6aa8e22af 100644 --- a/third_party/nixpkgs/pkgs/games/xmage/default.nix +++ b/third_party/nixpkgs/pkgs/games/xmage/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , jdk8 , unzip }: -stdenv.mkDerivation rec { - pname = "xmage"; - version = "1.4.42V6"; +stdenv.mkDerivation (finalAttrs: { + pname = "xmage"; + version = "1.4.50V2"; src = fetchurl { - url = "https://github.com/magefree/mage/releases/download/xmage_1.4.42V6/xmage_${version}.zip"; - sha256 = "14s4885ldi0rplqmab5m775plsqmmm0m89j402caiqm2q9mzvkhd"; + url = + "https://github.com/magefree/mage/releases/download/xmage_${finalAttrs.version}/xmage_${finalAttrs.version}.zip"; + sha256 = "sha256-t1peHYwCRy3wiIIwOD3nUyoxSOxbw6B/g++A1ofIbmg="; }; preferLocalBuild = true; @@ -19,13 +21,15 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip $src ''; - installPhase = '' + installPhase = let + strVersion = lib.substring 0 6 finalAttrs.version; + in '' mkdir -p $out/bin cp -rv ./* $out cat << EOS > $out/bin/xmage -exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.42.jar -EOS + exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-${strVersion}.jar + EOS chmod +x $out/bin/xmage ''; @@ -38,5 +42,5 @@ EOS homepage = "http://xmage.de/"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/games/xskat/default.nix b/third_party/nixpkgs/pkgs/games/xskat/default.nix index 74c2be586c..6baf397ad6 100644 --- a/third_party/nixpkgs/pkgs/games/xskat/default.nix +++ b/third_party/nixpkgs/pkgs/games/xskat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imake ]; src = fetchurl { - url = "http://www.xskat.de/xskat-${version }.tar.gz"; + url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${version}.tar.gz"; sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.free; longDescription = "Play the german card game Skat against the AI or over IRC."; - homepage = "http://www.xskat.de/"; + homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix b/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix index 575f582d2c..096528fa35 100644 --- a/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ananicy-rules-cachyos/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ananicy"; - version = "unstable-2023-06-28"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "b2b4342d769bc3c6abc4ce77bd53d6ca06d659e5"; - sha256 = "sha256-TGX7GlfSeKu68mVM71/kdJH31gzMmhzCAqA390aEq8U="; + rev = "3dafc3eb667b6ed7024359de78bf961c7248954d"; + sha256 = "sha256-bMwM/2R6jdgrQ6C0JnHyMp9L4OWI6KVGcninrr7wLQ8="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix b/third_party/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix index f5edc72934..1a3b4ebfbe 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/cups-pk-helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; - homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; + homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index 99d56af97c..ba414d7aec 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-WOlwzxlV4cyH0IR8MlJtnCzO4zXl8OOIKygxOLoOcmI="; + sha256 = "sha256-3VQijdkDUmQozn43lhr67SMK0xB4gUHadc66oINiz2w="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/hl2260d/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl2260d/default.nix new file mode 100644 index 0000000000..9883bd99a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/hl2260d/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, coreutils, perl, gnugrep, which +, debugLvl ? "0" +}: + +let + version = "3.2.0-1"; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf102692/hl2260dlpr-${version}.i386.deb"; + hash = "sha256-R+cM2SKc/MP6keo3PUrKXPC6a2dEQQdBunrpNtAHlH0="; + }; + + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf102693/hl2260dcupswrapper-${version}.i386.deb"; + hash = "sha256-k6+ulZVoFTpEY6WJ9TO9Rzp2c4dwPqL3NY5/XYJpvOc="; + }; +in +stdenv.mkDerivation { + pname = "cups-brother-hl2260d"; + inherit version; + + nativeBuildInputs = [ makeWrapper dpkg ]; + buildInputs = [ cups ghostscript perl ]; + + dontPatchELF = true; + dontBuild = true; + + unpackPhase = '' + mkdir -p $out + dpkg-deb -x ${cupsdeb} $out + dpkg-deb -x ${lprdeb} $out + ''; + + patchPhase = '' + # Patch lpr + INFDIR=$out/opt/brother/Printers/HL2260D/inf + LPDDIR=$out/opt/brother/Printers/HL2260D/lpd + + substituteInPlace $LPDDIR/filter_HL2260D \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/HL2260D\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HL2260D\"; #" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $INFDIR/braddprinter + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/brprintconflsr3 + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $LPDDIR/rawtobr3 + + # Patch cupswrapper + WRAPPER=$out/opt/brother/Printers/HL2260D/cupswrapper/brother_lpdwrapper_HL2260D + PAPER_CFG=$out/opt/brother/Printers/HL2260D/cupswrapper/paperconfigml1 + + substituteInPlace $WRAPPER \ + --replace "basedir =~" "basedir = \"$out/opt/brother/Printers/HL2260D\"; #" \ + --replace "PRINTER =~" "PRINTER = \"HL2260D\"; #" \ + --replace "\$DEBUG=0;" "\$DEBUG=${debugLvl};" + substituteInPlace $WRAPPER \ + --replace "\`cp " "\`cp -p " \ + --replace "\$TEMPRC\`" "\$TEMPRC; chmod a+rw \$TEMPRC\`" \ + --replace "\`mv " "\`cp -p " + # This config script make this assumption that the *.ppd are found in a global location `/etc/cups/ppd`. + substituteInPlace $PAPER_CFG \ + --replace "/etc/cups/ppd" "$out/share/cups/model" + ''; + + installPhase = '' + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/HL2260D/cupswrapper/brother-HL2260D-cups-en.ppd $out/share/cups/model + + mkdir -p $out/lib/cups/filter/ + makeWrapper \ + $out/opt/brother/Printers/HL2260D/cupswrapper/brother_lpdwrapper_HL2260D \ + $out/lib/cups/filter/brother_lpdwrapper_HL2260D \ + --prefix PATH : ${lib.makeBinPath [coreutils gnugrep gnused]} + + wrapProgram $out/opt/brother/Printers/HL2260D/lpd/filter_HL2260D \ + --prefix PATH ":" ${ lib.makeBinPath [ ghostscript which ] } + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother HL-2260D printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; + downloadPage = "https://support.brother.com/g/b/downloadtop.aspx?c=cn_ot&lang=en&prod=hl2260d_cn"; + maintainers = with maintainers; [ u2x1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix index 7137b5df56..ad2d113465 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/kyodialog/default.nix @@ -23,8 +23,8 @@ assert region == "Global" || region == "EU"; let - kyodialog_version = "9.2"; - date = "20220928"; + kyodialog_version = "9.3"; + date = "20230720"; in stdenv.mkDerivation rec { pname = "cups-kyodialog"; @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { dontStrip = true; src = fetchzip { + # Steps to find the release download URL: + # 1. Go to https://www.kyoceradocumentsolutions.us/en/support/downloads.html + # 2. Search for printer model, e.g. "TASKalfa 6053ci" + # 3. Locate e.g. "Linux Print Driver (9.3)" in the list urls = [ "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" - "https://web.archive.org/web/20221122230412/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" + "https://web.archive.org/web/20231021143259/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" ]; - sha256 = "sha256-WCHuAQO2T6S8JtRsI2Yf/ypeCLMH365Ax/qX+Ah2s3k="; + hash = "sha256-3h2acOmaQIiqe2Fd9QiqEfre5TrxzRrll6UlUruwj1o="; extension = "tar.gz"; stripRoot = false; postFetch = '' diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index bdb5227441..829bc6509e 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup arch=$(uname -m) diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 498394cda0..fe6c5a21ce 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.4.0"; + version = "10.6.2"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-NEbQ4GoZXnFes6jvqKDg4T8eDAHHEYytJ7W7qeZSCmE="; + hash = "sha256-j4dqLV1Q17RQczkTqGTh8S8Y6ELqXjWuJRr+xB/x2yE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-mpN4YCiuL2jrZ4r/YOUhQSOBlGGHndQyrB9GT5mTAyI="; + vendorHash = "sha256-aCekNpf6C5fGIEk0pLkz4hJ6mQfBIzeCsIL6Fxf2QGk="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es="; + url = "https://web.archive.org/web/20231104101556/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-Bi5hbmMyFP4Pv2MklwNdkhGLXbI5qf6Ibvj0vWok2tI="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index e66b44bad0..b85e162efb 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.01.2"; + version = "10.02.0"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-7iDw4S9VOj0EV45xoNRd7+vHERfOTcLBQEOYW/5zSK1/iy/pj8m09bk17LMuUNw0C+Z9bvWBkFQuxtD52h3jgA=="; + hash = "sha512-xJNEFRBj6RWt1VoKhCwqZF2DYqXLymY70HY49L02maCMreN6nv6QWtWkHgFDU+XhsSaLeSXkMSitMNWwMTlrcQ=="; }; patches = [ @@ -122,7 +122,10 @@ stdenv.mkDerivation rec { doCheck = false; # don't build/install statically linked bin/gs - buildFlags = [ "so" ]; + buildFlags = [ "so" ] + # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0) + # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) + ++ lib.optional (x11Support && stdenv.isDarwin) "LDFLAGS=-headerpad_max_install_names"; installTargets = [ "soinstall" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix index 26cad916e2..089661293c 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { pname = "ghostscript-test-corpus-render"; - version = "unstable-2022-12-01"; + version = "unstable-2023-05-19"; src = fetchgit { url = "git://git.ghostscript.com/tests.git"; - rev = "e81c3a1d7c679aab8230e9152165d8cffb687242"; - hash = "sha256-h+UHpCHASYOhf4xG6gkVJK9TEG85kE3jNx5cD1I3LQg="; + rev = "f7d5087d3d6c236707842dcd428818c6cb8fb041"; + hash = "sha256-xHOEo1ZJG1GCcEKqaXLDpfRRQxpbSy0bzicKju9hG40="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix index 7d00c7586e..6522924a31 100644 --- a/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/third_party/nixpkgs/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6943"; + version = "1.0.7531"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "MrLRA0XdaDWD7frh4XDXLTcjsAYWal5qwT5C6cq4MKc="; + sha256 = "ppRjUhx/VBkbFNhQunaUfOnwckOqJRQUTVMhKYZ0StU="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index 17c271793a..5663e5dec9 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -3,9 +3,7 @@ , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf , makeWrapper, t1utils, boehmgc, rsync -, texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf fontinst; - } +, texliveSmall, tex ? texliveSmall.withPackages (ps: with ps; [ lh metafont epsf fontinst ]) }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix index a839ef5e8e..57cecfc6b8 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.8"; + version = "2.25.9"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-pycbGmVp3HVKOAGpe4gEmBWjMT2BqrSqKISsAZCEkx0="; + hash = "sha256-ncsmHeCcnAtfrzDOcyHgfmsHGrUJ70zqFQLl+97tgpM="; }; passthru.updateScript = { diff --git a/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix b/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix index 4ecacaf418..1cd78fdce0 100644 --- a/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix +++ b/third_party/nixpkgs/pkgs/misc/mnemonicode/default.nix @@ -1,20 +1,21 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mnemonicode"; - version = "2015-11-30"; + version = "1.0.0"; src = fetchFromGitHub { owner = "singpolyma"; repo = "mnemonicode"; - rev = "1687fabdf48acf68d4186f219bc20bffe02e8ee0"; - sha256 = "0kp1jhhqfwfiqg9kx0mbyr4qh4yc4zg4szqk5fbf809nx2pvprm5"; + rev = finalAttrs.version; + hash = "sha256-bGipPvLj6ig+lMLsl/Yve8PmuA93ETvhNKoMPh0JMBM="; }; installPhase = '' mkdir -p $out/bin - cp mnencode $out/bin - cp mndecode $out/bin + mv mnencode $out/bin + mv mndecode $out/bin ''; meta = with lib; { + homepage = "https://github.com/singpolyma/mnemonicode"; description = '' Routines which implement a method for encoding binary data into a sequence of words which can be spoken over the phone, for example, and converted @@ -22,6 +23,7 @@ stdenv.mkDerivation { ''; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ kirillrdy ]; + mainProgram = "mnencode"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix b/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix deleted file mode 100644 index 038bdd5a73..0000000000 --- a/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip -, sqlite, which, lua, installShellFiles, makeWrapper -}: -let - luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]); -in -stdenv.mkDerivation rec { - pname = "openrussian-cli"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "rhaberkorn"; - repo = "openrussian-cli"; - rev = version; - sha256 = "1ria7s7dpqip2wdwn35wmkry84g8ghdqnxc9cbxzzq63vl6pgvcn"; - }; - - nativeBuildInputs = [ - pkg-config wget unzip sqlite which installShellFiles makeWrapper - ]; - - buildInputs = [ luaEnv ]; - - makeFlags = [ - "LUA=${luaEnv}/bin/lua" - "LUAC=${luaEnv}/bin/luac" - ]; - - dontConfigure = true; - - # Can't use "make install" here - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/openrussian - cp openrussian-sqlite3.db $out/share/openrussian - cp openrussian $out/bin - - wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ - --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' - - runHook postInstall - ''; - - postInstall = '' - installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash - installManPage ./openrussian.1 - ''; - - meta = with lib; { - description = "Offline Console Russian Dictionary (based on openrussian.org)"; - homepage = "https://github.com/rhaberkorn/openrussian-cli"; - license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; - maintainers = with maintainers; [ zane ]; - mainProgram = "openrussian"; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/sagetex/default.nix b/third_party/nixpkgs/pkgs/misc/sagetex/default.nix index 0f22158e3e..96513b4f9f 100644 --- a/third_party/nixpkgs/pkgs/misc/sagetex/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sagetex/default.nix @@ -1,10 +1,11 @@ { lib , stdenv , fetchFromGitHub -, texlive +, writeShellScript +, texliveBasic }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation rec { pname = "sagetex"; version = "3.6.1"; @@ -15,8 +16,14 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38="; }; - buildInputs = [ - texlive.combined.scheme-basic + outputs = [ "tex" ]; + + nativeBuildInputs = [ + texliveBasic + # multiple-outputs.sh fails if $out is not defined + (writeShellScript "force-tex-output.sh" '' + out="''${tex-}" + '') ]; buildPhase = '' @@ -29,11 +36,6 @@ stdenv.mkDerivation (finalAttrs: rec { cp -va *.sty *.cfg *.def "$path/" ''; - passthru = { - tlType = "run"; - pkgs = [ finalAttrs.finalPackage ]; - }; - meta = with lib; { description = "Embed code, results of computations, and plots from Sage into LaTeX documents"; homepage = "https://github.com/sagemath/sagetex"; @@ -41,4 +43,4 @@ stdenv.mkDerivation (finalAttrs: rec { maintainers = with maintainers; [ alexnortung ]; platforms = platforms.all; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix index b43e6400c8..78479199b1 100644 --- a/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -16,12 +16,12 @@ }: let - version = "2.1.1"; + version = "2.2"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-lVjbbFZ0Oh3AOzj1mAH7QOkcyJH4/AyJ5bCwZ3YfFI4="; + hash = "sha256-yFxKqEMF77aRFc1JehIOvdECWJk7TPEjqCRbPZnUmHQ="; }; in stdenv.mkDerivation rec { @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Genymobile"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SRIQqmvqB1kudUvt0HTFPMdk7MLWEcK2jOT0on1rh+E="; + repo = "scrcpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-2/IsDZJAtERs2AG6J4LR/ffy4XYmaj0KeSwZLQ849Lc="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and control Android devices over USB or TCP/IP"; homepage = "https://github.com/Genymobile/scrcpy"; + changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # server diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix index 01346b9ccc..612f7b9250 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0i5jAqOGq+N5bUM103Gk1Wzgwe7wUQRjJ+T4XqUkuZw="; + sha256 = "sha256-PUCbirnOPYIqt56IF6UQ7Jd0bJLsVY2pGIn/C95HTrQ="; }; - cargoHash = "sha256-LOU1BCFeX+F2dJdajgLDAtgyyrn6KkvLx3KtF9NkKcY="; + cargoHash = "sha256-6OTiciRqZyuX4FaDg131DEaVssUT2OYXdw/cxxJmLso="; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 3b771ffedc..a2bf191dd3 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.72"; + version = "5.73"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-1RGXWWeuc1UHKs3M9rG/QU+KFr5QzMgHDxPmJGI+x3I="; + sha256 = "sha256-MOH85e5L/r99fXRq9Gf5awvIUh/NC1C4Vh/VtW3rh10="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix index dfbe3998c9..5add4a5b53 100644 --- a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix +++ b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.3"; + version = "9.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-g8MQFhDBBUuEDGsJ14rHGsaGEznOtCMVOv+5kljXByY="; + sha256 = "sha256-WBbJ6e2I7SGqvZo3yH8L1ZbNPkyA6zTGS12Gq186DL4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 5705087ed6..d17cbe7c33 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -580,12 +580,12 @@ in rec { tilish = mkTmuxPlugin { pluginName = "tilish"; - version = "2020-08-12"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "jabirali"; repo = "tmux-tilish"; - rev = "73d2404cdc0ef6bd7fbc8982edae0b0e2a4dd860"; - sha256 = "1x58h3bg9d69j40fh8rcjpxvg0i6j04pj8p3jk57l3cghxis5j05"; + rev = "22f7920837d827dc6cb31143ea916afa677c24c1"; + sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo="; }; meta = with lib; { @@ -611,12 +611,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2023-07-06"; + version = "unstable-2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "51081a2688579228d860b3cb410f4437e857fc6e"; - sha256 = "sha256-qElRHAbnZ+qRasvkfo+lKNahRHklvLOH0BmbQ1oyN6A="; + rev = "d62b6865c0e7c956ad1f0396823a6f34cf7452a7"; + hash = "sha256-hVkSQYvBXrkXbKc98V9hwwvFp6z7/mX1K4N3N9j4NN4="; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch deleted file mode 100644 index fa2575cb93..0000000000 --- a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e861e42..018c19c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ - #;**********************************************************************; - - AC_INIT([tpm2-pkcs11], -- [m4_esyscmd_s([git describe --tags --always --dirty])], -+ [git-@VERSION@], - [https://github.com/tpm2-software/tpm2-pkcs11/issues], - [], - [https://github.com/tpm2-software/tpm2-pkcs11]) diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix index dd0cf011b1..91b7c31eb3 100644 --- a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix @@ -2,32 +2,38 @@ , pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf , tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python3, glibc, libyaml , abrmdSupport ? true, tpm2-abrmd ? null +, fapiSupport ? true }: stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "sha256-f5wi0nIM071yaQCwPkY1agKc7OEQa/IxHJc4V2i0Q9I="; + sha256 = "sha256-SoHtgZRIYNJg4/w1MIocZAM26mkrM+UOQ+RKCh6nwCk="; }; - patches = lib.singleton ( - substituteAll { - src = ./0001-configure-ac-version.patch; - VERSION = version; - }); + patches = [ + ./version.patch + ./graceful-fapi-fail.patch + ]; # The preConfigure phase doesn't seem to be working here # ./bootstrap MUST be executed as the first step, before all # of the autoreconfHook stuff postPatch = '' + echo ${version} > VERSION ./bootstrap ''; + configureFlags = lib.optionals (!fapiSupport) [ + # Note: this will be renamed to with-fapi in next release. + "--enable-fapi=no" + ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive makeWrapper patchelf ]; diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch new file mode 100644 index 0000000000..26712e9830 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch @@ -0,0 +1,51 @@ +From 2e3e3c0b0f4e0c19e411fd46358930bf158ad3f5 Mon Sep 17 00:00:00 2001 +From: Jonathan McDowell +Date: Wed, 1 Feb 2023 09:29:58 +0000 +Subject: [PATCH] Gracefully fail FAPI init when it's not compiled in + +Instead of emitting: + + WARNING: Getting tokens from fapi backend failed. + +errors when FAPI support is not compiled in gracefully fail the FAPI +init and don't log any warnings. We'll still produce a message +indicating this is what's happened in verbose mode, but normal operation +no longer gets an unnecessary message. + +Fixes #792 + +Signed-off-by: Jonathan McDowell +--- + src/lib/backend.c | 4 +++- + src/lib/backend_fapi.c | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/lib/backend.c b/src/lib/backend.c +index ca5e2ccf..128f58b9 100644 +--- a/src/lib/backend.c ++++ b/src/lib/backend.c +@@ -53,7 +53,9 @@ CK_RV backend_init(void) { + LOGE(msg); + return rv; + } +- LOGW(msg); ++ if (rv != CKR_FUNCTION_NOT_SUPPORTED) { ++ LOGW(msg); ++ } + } else { + fapi_init = true; + } +diff --git a/src/lib/backend_fapi.c b/src/lib/backend_fapi.c +index fe594f0e..3a203632 100644 +--- a/src/lib/backend_fapi.c ++++ b/src/lib/backend_fapi.c +@@ -977,7 +977,8 @@ CK_RV backend_fapi_token_changeauth(token *tok, bool user, twist toldpin, twist + + CK_RV backend_fapi_init(void) { + +- return CKR_OK; ++ LOGV("FAPI not enabled, failing init"); ++ return CKR_FUNCTION_NOT_SUPPORTED; + } + + CK_RV backend_fapi_destroy(void) { diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/version.patch b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/version.patch new file mode 100644 index 0000000000..297a7bd537 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/version.patch @@ -0,0 +1,10 @@ +--- a/bootstrap ++++ b/bootstrap +@@ -4,7 +4,6 @@ + + # Generate a VERSION file that is included in the dist tarball to avoid needed git + # when calling autoreconf in a release tarball. +-git describe --tags --always --dirty > VERSION + + # generate list of source files for use in Makefile.am + # if you add new source files, you must run ./bootstrap again diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 9ac7616012..54a5f6be09 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -30,6 +30,16 @@ let url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; hash = "sha256-a2pIWBwUq7D5W9h8GvTXQJIkBte4AQAqn5Ryf93gIdU="; }; + + # Dependencies for the tools need to be included as either native or cross, + # depending on which we're building + toolsDeps = [ + ncurses # tools/kwboot + libuuid # tools/mkeficapsule + gnutls # tools/mkeficapsule + openssl # tools/mkimage + ]; + buildUBoot = lib.makeOverridable ({ version ? null , src ? null @@ -40,6 +50,7 @@ let , extraPatches ? [] , extraMakeFlags ? [] , extraMeta ? {} + , crossTools ? false , ... } @ args: stdenv.mkDerivation ({ pname = "uboot-${defconfig}"; @@ -53,7 +64,7 @@ let postPatch = '' patchShebangs tools - patchShebangs arch/arm/mach-rockchip + patchShebangs scripts ''; nativeBuildInputs = [ @@ -63,7 +74,6 @@ let dtc flex installShellFiles - openssl (buildPackages.python3.withPackages (p: [ p.libfdt p.setuptools # for pkg_resources @@ -71,14 +81,9 @@ let ])) swig which # for scripts/dtc-version.sh - ]; + ] ++ lib.optionals (!crossTools) toolsDeps; depsBuildBuild = [ buildPackages.stdenv.cc ]; - - buildInputs = [ - ncurses # tools/kwboot - libuuid # tools/mkeficapsule - gnutls # tools/mkeficapsule - ]; + buildInputs = lib.optionals crossTools toolsDeps; hardeningDisable = [ "all" ]; @@ -133,7 +138,9 @@ in { hardeningDisable = []; dontStrip = false; extraMeta.platforms = lib.platforms.linux; - extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ]; + + crossTools = true; + extraMakeFlags = [ "HOST_TOOLS_ALL=y" "NO_SDL=1" "cross_tools" ]; outputs = [ "out" "man" ]; @@ -183,6 +190,7 @@ in { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -190,7 +198,7 @@ in { ubootClearfog = buildUBoot { defconfig = "clearfog_defconfig"; extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["u-boot-spl.kwb"]; + filesToInstall = ["u-boot-with-spl.kwb"]; }; ubootCubieboard2 = buildUBoot { @@ -341,6 +349,7 @@ in { defconfig = "a64-olinuxino-emmc_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -354,6 +363,7 @@ in { defconfig = "orangepi_zero_plus2_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -374,6 +384,7 @@ in { defconfig = "orangepi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinnerH6}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -387,6 +398,7 @@ in { defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -394,6 +406,7 @@ in { defconfig = "pine64-lts_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -401,6 +414,7 @@ in { defconfig = "pinebook_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -542,6 +556,7 @@ in { defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; diff --git a/third_party/nixpkgs/pkgs/misc/uq/default.nix b/third_party/nixpkgs/pkgs/misc/uq/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/misc/vencord/default.nix b/third_party/nixpkgs/pkgs/misc/vencord/default.nix index a54a5f911a..aaf2e7bb60 100644 --- a/third_party/nixpkgs/pkgs/misc/vencord/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vencord/default.nix @@ -2,12 +2,11 @@ , fetchFromGitHub , lib , esbuild -, buildGoModule , buildWebExtension ? false }: let - version = "1.5.5"; - gitHash = "9e63da6"; + version = "1.6.3"; + gitHash = "86e9434"; in buildNpmPackage rec { pname = "vencord"; @@ -17,27 +16,25 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - sha256 = "sha256-W4pu2ivOxqp0KpXjnYQmFyz+nwRptegHlTra2IsRFQ8="; + hash = "sha256-AqyUnDMIASJ/kUTeICdN94W5U0E52RFs6hM2/E8AjXI="; }; - ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.15.18"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - }); + ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { + version = "0.15.18"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${final.version}"; + hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + })); # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-sNviCa5ld6/ZeH1i/ZAjlsL1VAwJaES8ZdJZn2AYvQ8="; + npmDepsHash = "sha256-i6hTMYyseoHnAGBezG5fdniBA9yXylCbAgAcjGH+wfM="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; @@ -57,6 +54,8 @@ buildNpmPackage rec { cp -r dist/ $out ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Vencord web extension"; homepage = "https://github.com/Vendicated/Vencord"; diff --git a/third_party/nixpkgs/pkgs/misc/vencord/package-lock.json b/third_party/nixpkgs/pkgs/misc/vencord/package-lock.json index 2db48c3728..3134090b3f 100644 --- a/third_party/nixpkgs/pkgs/misc/vencord/package-lock.json +++ b/third_party/nixpkgs/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.5.5", + "version": "1.6.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.5.5", + "version": "1.6.3", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -326,6 +326,246 @@ "postcss-selector-parser": "^6.0.13" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", + "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", + "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/linux-x64": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", @@ -342,6 +582,102 @@ "node": ">=12" } }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -358,18 +694,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", - "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -390,21 +726,21 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.53.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", + "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -426,9 +762,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@nodelib/fs.scandir": { @@ -512,72 +848,75 @@ } }, "node_modules/@types/diff": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.5.tgz", - "integrity": "sha512-rt7WqM1bWwKJMRxlB5Rhke56UN21Bqwp1ILER31bafTivcapYdfhtPd5xRWfhf08yjPxoDcfjVkkECdRwFe7EA==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.7.tgz", + "integrity": "sha512-adBosR2GntaQQiuHnfRN9HtxYpoHHJBcdyz7VSXhjpSAmtvIfu/S1fjTqwuIx/Ypba6LCZdfWIqPYx2BR5TneQ==", "dev": true }, "node_modules/@types/filesystem": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.33.tgz", - "integrity": "sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==", + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.34.tgz", + "integrity": "sha512-La4bGrgck8/rosDUA1DJJP8hrFcKq0BV6JaaVlNnOo1rJdJDcft3//slEbAmsWNUJwXRCc0DXpeO40yuATlexw==", "dev": true, "dependencies": { "@types/filewriter": "*" } }, "node_modules/@types/filewriter": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.30.tgz", - "integrity": "sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==", + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.31.tgz", + "integrity": "sha512-12df1utOvPC80+UaVoOO1d81X8pa5MefHNS+gWX9R2ucSESpMz9K5QwlTWDGKASrzCpSFwj7NPYh+nTsolgEGA==", "dev": true }, "node_modules/@types/har-format": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.13.tgz", - "integrity": "sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.14.tgz", + "integrity": "sha512-pEmBAoccWvO6XbSI8A7KvIDGEoKtlLWtdqVCKoVBcCDSFvR4Ijd7zGLu7MWGEqk2r8D54uWlMRt+VZuSrfFMzQ==", "dev": true }, "node_modules/@types/json-schema": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", - "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", + "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", "dev": true }, "node_modules/@types/lodash": { - "version": "4.14.199", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz", - "integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==", + "version": "4.14.200", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz", + "integrity": "sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==", "dev": true }, "node_modules/@types/minimist": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz", - "integrity": "sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz", + "integrity": "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==", "dev": true }, "node_modules/@types/node": { - "version": "18.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.3.tgz", - "integrity": "sha512-0OVfGupTl3NBFr8+iXpfZ8NR7jfFO+P1Q+IO/q0wbo02wYkP5gy36phojeYWpLQ6WAMjl+VfmqUk2YbUfp0irA==", - "dev": true + "version": "18.18.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz", + "integrity": "sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz", - "integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz", + "integrity": "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==", "dev": true }, "node_modules/@types/prop-types": { - "version": "15.7.8", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz", - "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==", + "version": "15.7.9", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz", + "integrity": "sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==", "dev": true }, "node_modules/@types/react": { - "version": "18.2.24", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz", - "integrity": "sha512-Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw==", + "version": "18.2.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.35.tgz", + "integrity": "sha512-LG3xpFZ++rTndV+/XFyX5vUP7NI9yxyk+MQvBDq+CVs8I9DLSc3Ymwb1Vmw5YDoeNeHN4PDZa3HylMKJYT9PNQ==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -586,30 +925,30 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.8", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.8.tgz", - "integrity": "sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==", + "version": "18.2.14", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz", + "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==", "dev": true, "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz", - "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==", + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz", + "integrity": "sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==", "dev": true }, "node_modules/@types/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, "node_modules/@types/yauzl": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz", - "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz", + "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==", "dev": true, "optional": true, "dependencies": { @@ -617,9 +956,9 @@ } }, "node_modules/@types/yazl": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.3.tgz", - "integrity": "sha512-pZtZPktPV+rN+6oje9Akz5kBwOhpjKlr7X74osNVtmYKcMdgoBtMFbNNPeS2+juE5aEVGZuIbHISqMCn2RupNw==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.4.tgz", + "integrity": "sha512-oIm9eKVrxukZgW05COfMzX9Zcz+cJmywKAULOVMr2ji9Bjly701zgjNDtFsVQsVlXsRMLwnIfUNqSpC1Uz+iaw==", "dev": true, "dependencies": { "@types/node": "*" @@ -813,6 +1152,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vap/core": { "version": "0.0.12", "resolved": "https://registry.npmjs.org/@vap/core/-/core-0.0.12.tgz", @@ -832,9 +1177,9 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1251,75 +1596,17 @@ "node": ">=0.10.0" } }, - "node_modules/class-utils/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/class-utils/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/cliui": { @@ -1444,12 +1731,12 @@ } }, "node_modules/css-functions-list": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz", - "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", "dev": true, "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-tree": { @@ -1694,6 +1981,118 @@ "esbuild-windows-arm64": "0.15.18" } }, + "node_modules/esbuild-android-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", + "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", + "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", + "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", + "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", + "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", + "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", + "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/esbuild-linux-64": { "version": "0.15.18", "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", @@ -1710,6 +2109,198 @@ "node": ">=12" } }, + "node_modules/esbuild-linux-arm": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", + "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", + "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", + "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", + "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", + "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", + "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", + "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", + "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", + "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", + "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", + "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", + "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -1732,18 +2323,19 @@ } }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.53.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", + "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.53.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -2137,12 +2729,12 @@ } }, "node_modules/flat-cache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", - "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", + "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", "dev": true, "dependencies": { - "flatted": "^3.2.7", + "flatted": "^3.2.9", "keyv": "^4.5.3", "rimraf": "^3.0.2" }, @@ -2189,11 +2781,28 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "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, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/get-caller-file": { "version": "2.0.5", @@ -2317,9 +2926,9 @@ } }, "node_modules/globals": { - "version": "13.22.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz", - "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2390,18 +2999,6 @@ "node": ">=6" } }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2450,6 +3047,18 @@ "node": ">=0.10.0" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/highlight.js": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz", @@ -2594,15 +3203,15 @@ "dev": true }, "node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", + "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==", "dev": true, "dependencies": { - "kind-of": "^6.0.0" + "hasown": "^2.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.10" } }, "node_modules/is-arrayish": { @@ -2618,41 +3227,40 @@ "dev": true }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz", + "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==", "dev": true, "dependencies": { - "kind-of": "^6.0.0" + "hasown": "^2.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz", + "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/is-extendable": { @@ -2838,9 +3446,9 @@ } }, "node_modules/keyv": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", - "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, "dependencies": { "json-buffer": "3.0.1" @@ -2856,9 +3464,9 @@ } }, "node_modules/known-css-properties": { - "version": "0.28.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz", - "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true }, "node_modules/levn": { @@ -3229,51 +3837,17 @@ "node": ">=0.10.0" } }, - "node_modules/object-copy/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-copy/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/object-copy/node_modules/kind-of": { @@ -3595,9 +4169,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -4068,66 +4642,17 @@ "node": ">=0.10.0" } }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/snapdragon/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/snapdragon/node_modules/is-extendable": { @@ -4139,15 +4664,6 @@ "node": ">=0.10.0" } }, - "node_modules/snapdragon/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/snapdragon/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -4239,9 +4755,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz", - "integrity": "sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==", + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "dev": true }, "node_modules/split-string": { @@ -4290,75 +4806,17 @@ "node": ">=0.10.0" } }, - "node_modules/static-extend/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/static-extend/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/string_decoder": { @@ -4430,9 +4888,9 @@ "dev": true }, "node_modules/stylelint": { - "version": "15.10.3", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz", - "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "dependencies": { "@csstools/css-parser-algorithms": "^2.3.1", @@ -4442,12 +4900,12 @@ "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^8.2.0", - "css-functions-list": "^3.2.0", + "css-functions-list": "^3.2.1", "css-tree": "^2.3.1", "debug": "^4.3.4", "fast-glob": "^3.3.1", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", @@ -4456,13 +4914,13 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.28.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", "meow": "^10.1.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.27", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", "postcss-selector-parser": "^6.0.13", @@ -4514,6 +4972,18 @@ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", "dev": true }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.1.tgz", + "integrity": "sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==", + "dev": true, + "dependencies": { + "flat-cache": "^3.1.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/stylelint/node_modules/is-plain-object": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", @@ -4741,9 +5211,9 @@ } }, "node_modules/tsx": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.13.0.tgz", - "integrity": "sha512-rjmRpTu3as/5fjNq/kOkOtihgLxuIz6pbKdj9xwP4J5jOLkBxw/rjN5ANw+KyrrOXV5uB7HC8+SrrSJxT65y+A==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.14.0.tgz", + "integrity": "sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==", "dev": true, "dependencies": { "esbuild": "~0.18.20", @@ -4757,6 +5227,38 @@ "fsevents": "~2.3.3" } }, + "node_modules/tsx/node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/tsx/node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/tsx/node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -4841,6 +5343,12 @@ "through": "^2.3.8" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", diff --git a/third_party/nixpkgs/pkgs/misc/vencord/update.sh b/third_party/nixpkgs/pkgs/misc/vencord/update.sh new file mode 100755 index 0000000000..0317f695f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/vencord/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../.. -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs +set -eou pipefail + +tempDir=$(mktemp -d) + +ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") +latestTag=$(echo "$ghTags" | jq -r .[0].name) +gitHash=$(echo "$ghTags" | jq -r .[0].commit.sha) + +pushd "$tempDir" +curl "https://raw.githubusercontent.com/Vendicated/Vencord/$latestTag/package.json" -o package.json +npm install --legacy-peer-deps -f + +npmDepsHash=$(prefetch-npm-deps ./package-lock.json) +popd + +pushd ../../.. +update-source-version vencord "${latestTag#v}" +popd + +sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i default.nix +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix +cp "$tempDir/package-lock.json" package-lock.json diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix index aa73c7f86c..5cf92a41a6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,19 +1,23 @@ -{ fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, stdenv }: -# Reverse engineered CoreSymbolication to make dtrace buildable - -stdenv.mkDerivation rec { - name = "CoreSymbolication"; +stdenv.mkDerivation { + pname = "core-symbolication"; + version = "unstable-2018-06-17"; src = fetchFromGitHub { - repo = name; + repo = "CoreSymbolication"; owner = "matthewbauer"; - rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a"; - sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj"; + rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4"; + hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; - installPhase = '' - mkdir -p $out/include - cp -r CoreSymbolication $out/include - ''; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with lib; { + description = "Reverse engineered headers for Apple's CoreSymbolication framework"; + homepage = "https://github.com/matthewbauer/CoreSymbolication"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix index 72a3750284..11e4c84395 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { ./sw_vers-CFPriv.patch ]; - postPatch = '' - substituteInPlace Makefile \ - --replace gcc cc - ''; - configurePhase = '' export SRCROOT=. export SYMROOT=. export DSTROOT=$out ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "STRIP=${stdenv.cc.targetPrefix}strip" + ]; + postInstall = '' mv $out/usr/* $out rmdir $out/usr diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/aldente/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/aldente/default.nix index 6dd464a405..7ca454609a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/aldente/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/aldente/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-bREI0RS4xvEccyw3yed5aD8oG5wmD5hyG82qW2tqlEA="; + hash = "sha256-pSqBDDumCbORLQ+B3skSqKmgG2KybR5Zb4ojiNQcAaM="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index f95932516d..4566c8af84 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -2,6 +2,7 @@ # generated by hand to avoid exposing all private frameworks # frameworks here are only the necessary ones used by public frameworks. { + Apple80211 = {}; AVFCapture = {}; AVFCore = {}; AddressBookCore = { inherit ContactsPersistence; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix index 0c959695d7..5484ba5acb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, libxml2, xar, cpio, pkgs, python3Minimal, pbzx, lib, darwin-stubs, print-reexports }: +{ stdenv, fetchurl, cpio, pbzx, pkgs, lib, darwin-stubs, print-reexports }: let - xarMinimal = xar.override { - libxml2 = libxml2.override { pythonSupport = false; }; - }; # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; @@ -19,27 +16,23 @@ let sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih"; }; - nativeBuildInputs = [ xarMinimal cpio python3Minimal pbzx ]; + nativeBuildInputs = [ cpio pbzx ]; outputs = [ "out" "dev" "man" ]; unpackPhase = '' - xar -x -f $src + pbzx $src | cpio -idm ''; + sourceRoot = "."; + installPhase = '' - start="$(pwd)" mkdir -p $out - cd $out - pbzx -n $start/Payload | cpio -idm - mv usr/* . - rmdir usr + cp -R System/Library $out + cp -R usr/* $out - mv System/* . - rmdir System - - pushd lib + pushd $out/lib cp ${darwin-stubs}/usr/lib/libcups*.tbd . ln -s libcups.2.tbd libcups.tbd ln -s libcupscgi.1.tbd libcupscgi.tbd diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 6e6712f375..931bebeae5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,6 +1,13 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { + patches = [ + # The source release version of math.h is missing some symbols that are actually present + # in newer SDKs. Patch them into the header to avoid implicit function declaration errors + # when compiling with newer versions of clang. + ./missing-declarations.patch + ]; + installPhase = '' mkdir -p $out/include diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch new file mode 100644 index 0000000000..e56934e59d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch @@ -0,0 +1,292 @@ +--- a/Source/Intel/math.h 2023-10-20 09:43:42.640416006 -0400 ++++ b/Source/Intel/math.h 2023-10-20 09:47:59.743127003 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved. ++ * Copyright (c) 2002-2015 Apple Inc. All rights reserved. + * + * @APPLE_LICENSE_HEADER_START@ + * +@@ -27,14 +27,17 @@ + * Contains: typedefs, prototypes, and macros germane to C99 floating point.* + * * + *******************************************************************************/ ++#ifndef __MATH_H__ ++#define __MATH_H__ ++ + #ifndef __MATH__ + #define __MATH__ ++#endif + +-#include /* For definition of __DARWIN_UNIX03 et al */ ++#include ++#include + +-#ifdef __cplusplus +-extern "C" { +-#endif ++__BEGIN_DECLS + + /****************************************************************************** + * Floating point data types * +@@ -87,14 +90,26 @@ + #define FP_SUBNORMAL 5 + #define FP_SUPERNORMAL 6 /* meaningful only on PowerPC */ + +-/* fma() *function call* is more costly than equivalent (in-line) multiply and add operations */ +-/* For single and double precision, the cost isn't too bad, because we can fall back on higher */ +-/* precision hardware, with the necessary range to handle infinite precision products. However, */ +-/* expect the long double fma to be at least an order of magnitude slower than a simple multiply */ +-/* and an add. */ +-#undef FP_FAST_FMA +-#undef FP_FAST_FMAF +-#undef FP_FAST_FMAL ++#if defined __arm64__ || defined __ARM_VFPV4__ ++/* On these architectures, fma(), fmaf( ), and fmal( ) are generally about as ++ fast as (or faster than) separate multiply and add of the same operands. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# define FP_FAST_FMAL 1 ++#elif (defined __i386__ || defined __x86_64__) && (defined __FMA__) ++/* When targeting the FMA ISA extension, fma() and fmaf( ) are generally ++ about as fast as (or faster than) separate multiply and add of the same ++ operands, but fmal( ) may be more costly. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# undef FP_FAST_FMAL ++#else ++/* On these architectures, fma( ), fmaf( ), and fmal( ) function calls are ++ significantly more costly than separate multiply and add operations. */ ++# undef FP_FAST_FMA ++# undef FP_FAST_FMAF ++# undef FP_FAST_FMAL ++#endif + + /* The values returned by `ilogb' for 0 and NaN respectively. */ + #define FP_ILOGB0 (-2147483647 - 1) +@@ -191,6 +206,23 @@ + static __inline__ int __inline_isnormalf( float __x ) { float fabsf = __builtin_fabsf(__x); if( __x != __x ) return 0; return fabsf < __builtin_inff() && fabsf >= __FLT_MIN__; } + static __inline__ int __inline_isnormald( double __x ) { double fabsf = __builtin_fabs(__x); if( __x != __x ) return 0; return fabsf < __builtin_inf() && fabsf >= __DBL_MIN__; } + static __inline__ int __inline_isnormal( long double __x ) { long double fabsf = __builtin_fabsl(__x); if( __x != __x ) return 0; return fabsf < __builtin_infl() && fabsf >= __LDBL_MIN__; } ++ ++#if defined __i386__ || defined __x86_64__ ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { ++ long double __ld; ++ struct{ unsigned long long __m; unsigned short __sexp; } __p; ++ } __u; ++ __u.__ld = __x; ++ return (int)(__u.__p.__sexp >> 15); ++} ++#else ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { long double __f; unsigned long long __u;} __u; ++ __u.__f = __x; ++ return (int)(__u.__u >> 63); ++} ++#endif + + #else + +@@ -509,7 +541,112 @@ + extern long double __infl( void ); + extern float __nan( void ); /* 10.3 (and later) must retain in ABI for backward compatability */ + +-#if !defined(_ANSI_SOURCE) ++ ++/****************************************************************************** ++ * Apple extensions to the C standard * ++ ******************************************************************************/ ++ ++/* Because these functions are not specified by any relevant standard, they ++ are prefixed with __, which places them in the implementor's namespace, so ++ they should not conflict with any developer or third-party code. If they ++ are added to a relevant standard in the future, un-prefixed names may be ++ added to the library and they may be moved out of this section of the ++ header. ++ ++ Because these functions are non-standard, they may not be available on non- ++ Apple platforms. */ ++ ++/* __exp10(x) returns 10**x. Edge cases match those of exp( ) and exp2( ). */ ++extern float __exp10f(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __exp10(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++/* __sincos(x,sinp,cosp) computes the sine and cosine of x with a single ++ function call, storing the sine in the memory pointed to by sinp, and ++ the cosine in the memory pointed to by cosp. Edge cases match those of ++ separate calls to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp); ++ ++/* __sinpi(x) returns the sine of pi times x; __cospi(x) and __tanpi(x) return ++ the cosine and tangent, respectively. These functions can produce a more ++ accurate answer than expressions of the form sin(M_PI * x) because they ++ avoid any loss of precision that results from rounding the result of the ++ multiplication M_PI * x. They may also be significantly more efficient in ++ some cases because the argument reduction for these functions is easier ++ to compute. Consult the man pages for edge case details. */ ++extern float __cospif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __cospi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __sinpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __sinpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __tanpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __tanpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090) || \ ++ (defined __IPHONE_OS_VERSION_MIN_REQUIRED && __IPHONE_OS_VERSION_MIN_REQUIRED < 70000) ++/* __sincos and __sincosf were introduced in OSX 10.9 and iOS 7.0. When ++ targeting an older system, we simply split them up into discrete calls ++ to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ *__sinp = sinf(__x); ++ *__cosp = cosf(__x); ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ *__sinp = sin(__x); ++ *__cosp = cos(__x); ++} ++#else ++/* __sincospi(x,sinp,cosp) computes the sine and cosine of pi times x with a ++ single function call, storing the sine in the memory pointed to by sinp, ++ and the cosine in the memory pointed to by cosp. Edge cases match those ++ of separate calls to __sinpi( ) and __cospi( ), and are documented in the ++ man pages. ++ ++ These functions were introduced in OSX 10.9 and iOS 7.0. Because they are ++ implemented as header inlines, weak-linking does not function as normal, ++ and they are simply hidden when targeting earlier OS versions. */ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp); ++ ++/* Implementation details of __sincos and __sincospi allowing them to return ++ two results while allowing the compiler to optimize away unnecessary load- ++ store traffic. Although these interfaces are exposed in the math.h header ++ to allow compilers to generate better code, users should call __sincos[f] ++ and __sincospi[f] instead and allow the compiler to emit these calls. */ ++struct __float2 { float __sinval; float __cosval; }; ++struct __double2 { double __sinval; double __cosval; }; ++ ++extern struct __float2 __sincosf_stret(float); ++extern struct __double2 __sincos_stret(double); ++extern struct __float2 __sincospif_stret(float); ++extern struct __double2 __sincospi_stret(double); ++ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincosf_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincos_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincospif_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincospi_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++#endif ++ ++/****************************************************************************** ++ * POSIX/UNIX extensions to the C standard * ++ ******************************************************************************/ ++ ++#if __DARWIN_C_LEVEL >= 199506L + extern double j0 ( double ); + + extern double j1 ( double ); +@@ -543,14 +680,32 @@ + extern int signgam; /* required for unix 2003 */ + + +-#endif /* !defined(_ANSI_SOURCE) */ ++#endif /* __DARWIN_C_LEVEL >= 199506L */ + +-#if !defined(__NOEXTENSIONS__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#define __WANT_EXTENSIONS__ +-#endif ++/* Long-double versions of M_E, etc for convenience on Intel where long- ++ double is not the same as double. Define __MATH_LONG_DOUBLE_CONSTANTS ++ to make these constants available. */ ++#if defined __MATH_LONG_DOUBLE_CONSTANTS ++#define M_El 0xa.df85458a2bb4a9bp-2L ++#define M_LOG2El 0xb.8aa3b295c17f0bcp-3L ++#define M_LOG10El 0xd.e5bd8a937287195p-5L ++#define M_LN2l 0xb.17217f7d1cf79acp-4L ++#define M_LN10l 0x9.35d8dddaaa8ac17p-2L ++#define M_PIl 0xc.90fdaa22168c235p-2L ++#define M_PI_2l 0xc.90fdaa22168c235p-3L ++#define M_PI_4l 0xc.90fdaa22168c235p-4L ++#define M_1_PIl 0xa.2f9836e4e44152ap-5L ++#define M_2_PIl 0xa.2f9836e4e44152ap-4L ++#define M_2_SQRTPIl 0x9.06eba8214db688dp-3L ++#define M_SQRT2l 0xb.504f333f9de6484p-3L ++#define M_SQRT1_2l 0xb.504f333f9de6484p-4L ++#endif /* defined __MATH_LONG_DOUBLE_CONSTANTS */ + +-#ifdef __WANT_EXTENSIONS__ ++/****************************************************************************** ++ * Legacy BSD extensions to the C standard * ++ ******************************************************************************/ + ++#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL + #define FP_SNAN FP_NAN + #define FP_QNAN FP_NAN + +@@ -560,11 +715,6 @@ + /* Legacy API: please use C99 lround() instead. */ + extern long int roundtol ( double ); + +-/* +- * XOPEN/SVID +- */ +-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) + #if !defined(__cplusplus) + /* used by matherr below */ + struct exception { +@@ -592,19 +742,12 @@ + #define TLOSS 5 + #define PLOSS 6 + +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#if !defined( __STRICT_ANSI__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + /* Legacy API: please use C99 isfinite() instead. */ + extern int finite ( double ); + + /* Legacy API: please use C99 tgamma() instead. */ + extern double gamma ( double ); + +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + #if !defined(__cplusplus) + extern int matherr ( struct exception * ); + #endif +@@ -633,14 +776,8 @@ + extern double lgamma_r ( double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + extern long double lgammal_r ( long double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + #endif /* _REENTRANT */ +- +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#endif /* __WANT_EXTENSIONS__ */ + +-#ifdef __cplusplus +-} +-#endif ++#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */ + +-#endif /* __MATH__ */ ++__END_DECLS ++#endif /* __MATH_H__ */ diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 38b13f784a..998bc867e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, appleDerivation', launchd, bootstrap_cmds, xnu, xpc, ppp, IOKit, eap8021x, Security +{ lib, stdenv, runCommand, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security , headersOnly ? false }: +let + privateHeaders = runCommand "swift-corelibs-foundation-private" { } '' + mkdir -p $out/include/CoreFoundation + + cp ${swift-corelibs-foundation}/Library/Frameworks/CoreFoundation.framework/PrivateHeaders/* \ + $out/include/CoreFoundation + ''; +in appleDerivation' stdenv { meta.broken = stdenv.cc.nativeLibc; nativeBuildInputs = lib.optionals (!headersOnly) [ bootstrap_cmds ]; - buildInputs = lib.optionals (!headersOnly) [ launchd ppp xpc IOKit eap8021x ]; + buildInputs = lib.optionals (!headersOnly) [ privateHeaders launchd ppp xpc IOKit eap8021x ]; propagatedBuildInputs = lib.optionals (!headersOnly) [ Security ]; @@ -13,7 +21,6 @@ appleDerivation' stdenv { NIX_CFLAGS_COMPILE = toString [ "-ISystemConfiguration.framework/Headers" "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders" - "-D_DNS_SD_LIBDISPATCH" # Needed for DNSServiceSetDispatchQueue to be available ]; }; @@ -23,11 +30,6 @@ appleDerivation' stdenv { substituteInPlace SystemConfiguration.fproj/SCNetworkReachability.c \ --replace ''$'#define\tHAVE_VPN_STATUS' "" - - # Our neutered CoreFoundation doesn't have this function, but I think we'll live... - substituteInPlace SystemConfiguration.fproj/SCNetworkConnectionPrivate.c \ - --replace 'CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' \ - --replace 'CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' ''; dontBuild = headersOnly; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 30d123ab80..e4431c68c9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -5,12 +5,17 @@ let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; arch = if stdenv.isAarch64 then "arm" else "i386"; in appleDerivation { + patches = [ + # Fixes a build failure with newer versions of clang that make implicit int an error. + ./fix-implicit-int.patch + ]; + nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; env.NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; - patchPhase = '' + prePatch = '' # ugly hacks for missing headers # most are bsd related - probably should make this a drv unpackFile ${Libc.src} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch new file mode 100644 index 0000000000..df0fff930d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch @@ -0,0 +1,11 @@ +diff -ur a/diskdev_cmds.xcodeproj/project.pbxproj b/diskdev_cmds.xcodeproj/project.pbxproj +--- a/quota.tproj/quota.c 2021-10-06 01:13:40.000000000 -0400 ++++ b/quota.tproj/quota.c 2023-10-27 08:24:05.960965958 -0400 +@@ -115,6 +115,7 @@ + + int + main(argc, argv) ++ int argc; + char *argv[]; + { + int ngroups; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 4082f5b760..0ba4caee62 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -4,6 +4,9 @@ appleDerivation' stdenvNoCC { dontBuild = true; installPhase = '' mkdir -p $out/include - cp mDNSShared/dns_sd.h $out/include + # TODO: Do this only for 765.50.9 once there is a way to apply version-specific + # logic in a source-release derivation. + substitute mDNSShared/dns_sd.h $out/include/dns_sd.h \ + --replace '#define _DNS_SD_LIBDISPATCH 0' '#define _DNS_SD_LIBDISPATCH 1' ''; } diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index c99523d6c8..c6fc009430 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -20,7 +20,12 @@ appleDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it + env.NIX_CFLAGS_COMPILE = toString [ + # hardeningDisable doesn't cut it + "-Wno-error=format-security" + # Required to build with clang 16 + "-Wno-error=deprecated-non-prototype" + ]; meta = { platforms = lib.platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix index 30fc882f00..94476ef303 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.59.0"; + version = "1.61.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-EA8DzfJtd1lM0/N1bQ8x9GQ8KiILwRKPIFKk6XlaBhg="; + hash = "sha256-MHJbVIVVDcuXig3E52wCnegt1mmRh9+kYbEL6MWjdqQ="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix index 6ea01f7c64..590e6427d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.73"; + version = "0.74"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-D+heCrJVo2xsKY9XtEuhrG/59yFIJTGhKJIfN9Vhc+M="; + hash = "sha256-ERfzgw8R39dOc9F/dgcgCKbEVFNChC5LqDFBDzbS+Wg="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix index 069fac3d59..ab1c0b5818 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , AppKit +, Carbon , CoreAudio , CoreWLAN , CoreVideo @@ -21,17 +22,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.16.3"; + version = "2.19.3"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-PCAGIcO7lvIAEFXlJn/e9zG5kxvDABshxFbu/bXWX7o="; + hash = "sha256-QT926AnV9jLc1KvYks6ukIAcMbVHOupTJWQ6vBHpcxc="; }; buildInputs = [ AppKit + Carbon CoreAudio CoreWLAN CoreVideo diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index d77976773c..5c593b1488 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, ninja, pkg-config, launchd, libdispatch, python3, libxml2, objc4, icu }: +{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, pkg-config, launchd, libdispatch, python3Minimal, libxml2, objc4, icu }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z"; }; - nativeBuildInputs = [ cmake ninja pkg-config python3 ]; + nativeBuildInputs = [ cmake pkg-config python3Minimal ]; buildInputs = [ (lib.getDev launchd) libdispatch libxml2 objc4 icu ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix index d3aea92097..f7055d378c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.3.5"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-aDIjf4TqhSIgYaJulI5FgXxlNiZ1qcNY+Typ7+S5Hc8="; + hash = "sha256-SyrqkNWRUKQS3D17XYsC/dcCKlPLGNNsG5obEiHE1Lk="; }; nativeBuildInputs = [ undmg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix index 585891b13c..841746957c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "5.0.9"; + version = "6.0.1"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-6dqQ+kau/aUAM4oPSkcgZJlJModcjKOXPlTB32MvoLQ="; + hash = "sha256-CXkGVoJcGSkooxe7eIhwaM6FkOI45NVw5jdLJAzgFBM="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-uy1KOBJa9BNK5bd+5q5okMouAV0H3DUXrG3Mvr5U6oc="; + hash = "sha256-u+MkGd/rkT1RVkzC2IcAcFM9eClFdj3WBFnftUVwkwc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix index f2ea933bd5..d2b24855b0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; + sha256 = "sha256-zvMPwgItp1bTq64DZcUbYls60XhgufOeEKaAoAFf64M="; }; sourceRoot = "${src.name}/src"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/default.nix deleted file mode 100644 index 15077cc8d7..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, pkgs }: - -lib.makeScope pkgs.newScope (self: { - alsa-firmware = self.callPackage ./alsa-firmware { }; - alsa-lib = self.callPackage ./alsa-lib { }; - alsa-oss = self.callPackage ./alsa-oss { }; - alsa-plugins = self.callPackage ./alsa-plugins { }; - alsa-plugins-wrapper = self.callPackage ./alsa-plugins/wrapper.nix { }; - alsa-tools = self.callPackage ./alsa-tools { }; - alsa-topology-conf = self.callPackage ./alsa-topology-conf { }; - alsa-ucm-conf = self.callPackage ./alsa-ucm-conf { }; - alsa-utils = self.callPackage ./alsa-utils { fftw = pkgs.fftwFloat; }; -}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index e74ef77391..07cdbf6bdc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20230614"; + version = "20231030"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-TLQHZYcnO7VzIHH+aCj78plTwK5RrcsU/OfNXApAvdM="; + sha256 = "sha256-+h0FwvfIoluhldOi6cgVDvmNWe1Lvj1SV3pL8Zh+gRM="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix index dc46c790c3..98487799aa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.4"; + tag = "0.3.5"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-EeVOrZtmKi5VfPerW9IntjRvdU3AbFPHG+pyAI4ciGk="; + hash = "sha256-rKz9a4Z+tx63rhknQIl/zu/WIMjxxM0+NGyaxnzxLk4="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix index e0a4b9a086..fc2b2f0c4e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix @@ -3,15 +3,31 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # autosuspend is incompatible with tzlocal v5 + # See https://github.com/regebro/tzlocal#api-change + tzlocal = super.tzlocal.overridePythonAttrs (prev: { + src = prev.src.override { + version = "4.3.1"; + hash = "sha256-7jLvjCCAPBmpbtNmrd09SnKe9jCctcc1mgzC7ut/pGo="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "4.3.0"; + version = "6.0.0"; + + disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-gS8NNks4GaIGl7cEqWSP53I4/tIV4LypkmZ5vNOjspY="; + hash = "sha256-gS8NNks4GaIGl7cEqWSP53I4/tIV4LypkmZ5vNOjspY="; }; postPatch = '' @@ -19,27 +35,28 @@ python3.pkgs.buildPythonApplication rec { --replace '--cov-config=setup.cfg' "" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ + dbus-python + icalendar + jsonpath-ng + lxml + mpd2 portalocker psutil - dbus-python - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - python-dbusmock - pytest-httpserver - dateutils - freezegun - pytest-mock + python-dateutil + pytz requests requests-file - icalendar tzlocal - jsonpath-ng - mpd2 - lxml + ]; + + nativeCheckInputs = with python.pkgs; [ + freezegun pytest-datadir + pytest-httpserver + pytest-mock + pytestCheckHook + python-dbusmock ]; # Disable tests that need root @@ -50,11 +67,13 @@ python3.pkgs.buildPythonApplication rec { doCheck = true; - meta = with lib ; { + meta = with lib; { description = "A daemon to automatically suspend and wake up a system"; homepage = "https://autosuspend.readthedocs.io"; + changelog = "https://github.com/languitar/autosuspend/releases/tag/v${version}"; license = licenses.gpl2Only; - maintainers = [ maintainers.bzizou ]; + maintainers = with maintainers; [ bzizou anthonyroussel ]; + mainProgram = "autosuspend"; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix index e1c026fb53..53a255fc21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2023.1"; + version = "2023.2"; sha256 = { - batman-adv = "sha256-9GpyhmYKXsNQahvn72C0ccUaxwVQWX1ZgEBHmre5Nrg="; - alfred = "sha256-Q4BIJI83N1fTqL3ny8bbZoX00BBdEw2i9aVPKQkMaXQ="; - batctl = "sha256-5b9HMF2VWrsZkkS9Dl//q5YQixr/q9DZcFUz+AWTlfE="; + batman-adv = "sha256-OQfc1X4sW/2dQHE5YLlAK/HaT4DFm1/wN3ifu7vY+iU="; + alfred = "sha256-qSBgKFZPieW/t3FK4piDoWEPYr4+YcCW4f6zYgBxjg4="; + batctl = "sha256-cLX5MfpjYyVpe9829tE0oDxJBvTBfLdlCjxxSQFDbsg="; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix index acb484ba6b..c6c7d9d0f5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix @@ -23,11 +23,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.66"; + version = "5.70"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-Of6mS1kMlJKYSgwnqJ/CA+HNx0hmCG77j0aYZ3qytXQ="; + sha256 = "sha256-N+Ny6RaVXhRMuIL4iOS+QImPEK47fCE93N1V7pwAkng="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix index 748db1a62b..df618cbff5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { dbus gobject-introspection umockdev - (python3.pythonForBuild.withPackages + (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix index 8f258d227b..e7da864b90 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ch9344/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.wch-ic.com/"; + homepage = "https://www.wch-ic.com/"; downloadPage = "https://www.wch.cn/downloads/CH9344SER_LINUX_ZIP.html"; description = "WCH CH9344/CH348 UART driver"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix index 39425f265e..ab55839c34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix @@ -67,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.19.4"; + version = "1.19.6"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - hash = "sha256-XptnokBWtBx0W2k2C9jVwIYH8pOrDUbuQLvh8JrW/w8="; + hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix index d64996c496..f62d846371 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; - sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; + hash = "sha256-AFOgcYPQaUg70GJhS8YcuAgMV32mHN9+ExsGThoa8Yg="; }; patches = [ @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; + mainProgram = "cpufreq-set"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix index 32842a8eea..f3ebdf1427 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dcgm/default.nix @@ -1,8 +1,6 @@ { lib -, callPackage , gcc11Stdenv , fetchFromGitHub -, addOpenGLRunpath , catch2 , cmake , cudaPackages_10_2 @@ -87,13 +85,13 @@ let # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22 in gcc11Stdenv.mkDerivation rec { pname = "dcgm"; - version = "3.1.8"; + version = "3.2.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version. src = fetchFromGitHub { owner = "NVIDIA"; repo = "DCGM"; rev = "refs/tags/v${version}"; - hash = "sha256-OXqXkP2ZUNPzafGIgJ0MKa39xB84keVFFYl+JsHgnks="; + hash = "sha256-iMyYOr3dSpdRV2S/TlB/tEOAWYhK09373ZRbd5vzogQ="; }; # Add our paths to the CUDA paths so FindCuda.cmake can find them. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 463795936e..e71062e8ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -12,11 +12,11 @@ }: let - arch = - if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" + bins = + if stdenv.hostPlatform.system == "x86_64-linux" then "x64-ubuntu-1604" + else if stdenv.hostPlatform.system == "i686-linux" then "x86-ubuntu-1604" + else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu" else throw "Unsupported architecture"; - bins = "${arch}-ubuntu-1604"; libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; in @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://www.displaylink.com/"; license = licenses.unfree; maintainers = with maintainers; [ abbradar ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index c3bd0c64a4..c92f40e393 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -15,14 +15,14 @@ let mod = kernel != null; - dpdkVersion = "22.11.1"; -in stdenv.mkDerivation rec { + dpdkVersion = "23.07"; +in stdenv.mkDerivation { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; + sha256 = "sha256-4IYU6K65KUB9c9cWmZKJpE70A0NSJx8JOX7vkysjs9Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index c85a75d1f1..789a59f751 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -3,20 +3,20 @@ , autoreconfHook , pkg-config , dbus -, fetchpatch , sysctl +, gitUpdater }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.58"; + version = "0.59"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-CwUwwvyT541aIvypVMqRhHkVJLna121Cme+v7c0FLWo="; + hash = "sha256-uJcGYT+JSdz/XTyJb/VUyedmSKJW/4BbTM3fw3ebtIc="; }; nativeBuildInputs = [ @@ -30,19 +30,17 @@ stdenv.mkDerivation rec { sysctl ]; - patches = [ - # /proc/sys/net/core/somaxconn doesn't always exist in the nix build environment - (fetchpatch { - name = "skip-sysctl-test-if-sysfs-not-available.patch"; - url = "https://patchwork.kernel.org/project/ell/patch/526DA75D-01AB-4D85-BF5C-5F25E5C39480@kloenk.dev/raw/"; - hash = "sha256-YYGYWQ67cbMLt6RnqZmHt+tpvVIDKPbSCqPIouk6alU="; - }) - ]; enableParallelBuilding = true; # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; + passthru = { + updateScript = gitUpdater { + url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + }; + }; + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; description = "Embedded Linux Library"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix index 42e2098187..150e3b95b4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix @@ -9,67 +9,109 @@ , ninja , libselinux , jitterentropy - # A more detailed explaination of the following meson build options can be found - # in the source code of esdm. - # A brief explanation is given: +, botan3 +, openssl +, libkcapi + +# A more detailed explaination of the following meson build options can be found +# in the source code of esdm. +# A brief explanation is given. + +# general options , selinux ? false # enable selinux support , drngHashDrbg ? true # set the default drng callback , drngChaCha20 ? false # set the default drng callback , ais2031 ? false # set the seeding strategy to be compliant with AIS 20/31 +, sp80090c ? false # set compliance with NIST SP800-90C +, cryptoBackend ? "botan" # set backend for hash and drbg operations , linuxDevFiles ? true # enable linux /dev/random and /dev/urandom support , linuxGetRandom ? true # enable linux getrandom support -, esJitterRng ? true # enable support for the entropy source: jitter rng -, esCPU ? true # enable support for the entropy source: cpu-based entropy -, esKernel ? true # enable support for the entropy source: kernel-based entropy -, esIRQ ? false # enable support for the entropy source: interrupt-based entropy -, esSched ? false # enable support for the entropy source: scheduler-based entropy -, esHwrand ? true # enable support for the entropy source: /dev/hwrng , hashSha512 ? false # set the conditioning hash: SHA2-512 , hashSha3_512 ? true # set the conditioning hash: SHA3-512 +, openSSLRandProvider ? true # build ESDM provider for OpenSSL 3.x +, botanRng ? true # build ESDM class for Botan 3.x + +# client-related options (handle with care, consult source code and meson options) +# leave as is if in doubt +, connectTimeoutExponent ? 28 # (1 << EXPONENT nanoseconds) +, rxTxTimeoutExponent ? 28 # (1 << EXPONENT nanoseconds) +, reconnectAttempts ? 10 # how often to attempt unix socket connection before giving up + +# entropy sources +, esJitterRng ? true # enable support for the entropy source: jitter rng (running in user space) +, esJitterRngEntropyRate ? 256 # amount of entropy to account for jitter rng source +, esJitterRngKernel ? true # enable support for the entropy source: jitter rng (running in kernel space) +, esJitterRngKernelEntropyRate ? 256 # amount of entropy to account for kernel jitter rng source +, esCPU ? true # enable support for the entropy source: cpu-based entropy +, esCPUEntropyRate ? 8 # amount of entropy to account for cpu rng source +, esKernel ? true # enable support for the entropy source: kernel-based entropy +, esKernelEntropyRate ? 128 # amount of entropy to account for kernel-based source +, esIRQ ? false # enable support for the entropy source: interrupt-based entropy +, esIRQEntropyRate ? 256 # amount of entropy to account for interrupt-based source (only set irq XOR sched != 0) +, esSched ? false # enable support for the entropy source: scheduler-based entropy +, esSchedEntropyRate ? 0 # amount of entropy to account for interrupt-based source (only set irq XOR sched != 0) +, esHwrand ? true # enable support for the entropy source: /dev/hwrng +, esHwrandEntropyRate ? 128 # amount of entropy to account for /dev/hwrng-based sources }: assert drngHashDrbg != drngChaCha20; assert hashSha512 != hashSha3_512; +assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend == "builtin" "Unsupported ESDM crypto backend"; stdenv.mkDerivation rec { pname = "esdm"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "esdm"; rev = "v${version}"; - sha256 = "sha256-swBKVb5gnND76w2ULT+5hR/jVOqxEe4TAB1gyaLKE9Q="; + sha256 = "sha256-q6TGL1agltV9CFfcA6hZszVwGIBBngs22ZqhQgc9FeM="; }; - patches = [ - (fetchpatch { - name = "arm64.patch"; - url = "https://github.com/smuellerDD/esdm/commit/86b93a0ddf684448aba152c8f1b3baf40a6d41c0.patch"; - sha256 = "sha256-gjp13AEsDNj23fcGanAAn2KCbYKA0cphhf4mCxek9Yg="; - }) - ]; - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ protobufc fuse3 jitterentropy ] - ++ lib.optional selinux libselinux; + buildInputs = [ protobufc ] + ++ lib.optional (cryptoBackend == "botan" || botanRng) botan3 + ++ lib.optional (cryptoBackend == "openssl" || openSSLRandProvider) openssl + ++ lib.optional selinux libselinux + ++ lib.optional esJitterRng jitterentropy + ++ lib.optional linuxDevFiles fuse3 + ++ lib.optional esJitterRngKernel libkcapi; mesonFlags = [ (lib.mesonBool "b_lto" false) + (lib.mesonBool "fips140" false) (lib.mesonBool "ais2031" ais2031) + (lib.mesonBool "sp80090c" sp80090c) + (lib.mesonEnable "node" true) # multiple DRNGs + (lib.mesonOption "threading_max_threads" (toString 64)) + (lib.mesonOption "crypto_backend" cryptoBackend) (lib.mesonEnable "linux-devfiles" linuxDevFiles) (lib.mesonEnable "linux-getrandom" linuxGetRandom) + (lib.mesonOption "client-connect-timeout-exponent" (toString connectTimeoutExponent)) + (lib.mesonOption "client-rx-tx-timeout-exponent" (toString rxTxTimeoutExponent)) + (lib.mesonOption "client-reconnect-attempts" (toString reconnectAttempts)) (lib.mesonEnable "es_jent" esJitterRng) + (lib.mesonOption "es_jent_entropy_rate" (toString esJitterRngEntropyRate)) + (lib.mesonEnable "es_jent_kernel" esJitterRngKernel) + (lib.mesonOption "es_jent_kernel_entropy_rate" (toString esJitterRngKernelEntropyRate)) (lib.mesonEnable "es_cpu" esCPU) + (lib.mesonOption "es_cpu_entropy_rate" (toString esCPUEntropyRate)) (lib.mesonEnable "es_kernel" esKernel) + (lib.mesonOption "es_kernel_entropy_rate" (toString esKernelEntropyRate)) (lib.mesonEnable "es_irq" esIRQ) + (lib.mesonOption "es_irq_entropy_rate" (toString esIRQEntropyRate)) (lib.mesonEnable "es_sched" esSched) + (lib.mesonOption "es_sched_entropy_rate" (toString esSchedEntropyRate)) (lib.mesonEnable "es_hwrand" esHwrand) + (lib.mesonOption "es_hwrand_entropy_rate" (toString esHwrandEntropyRate)) (lib.mesonEnable "hash_sha512" hashSha512) (lib.mesonEnable "hash_sha3_512" hashSha3_512) (lib.mesonEnable "selinux" selinux) (lib.mesonEnable "drng_hash_drbg" drngHashDrbg) (lib.mesonEnable "drng_chacha20" drngChaCha20) + (lib.mesonEnable "openssl-rand-provider" openSSLRandProvider) + (lib.mesonEnable "botan-rng" botanRng) ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix index ebb6fbe2cc..bd34ac0db4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20="; }; - env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error" + "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility + "-Wno-error=sign-compare" + ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -43,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19" || stdenv.isAarch64; + broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.6"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 3def168d2f..f4914d8432 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gettext , libgudev +, libdrm , polkit , libxmlb , glib @@ -18,14 +19,12 @@ , curl , libjcat , elfutils -, libsmbios , efivar , valgrind , meson , libuuid , colord , ninja -, gcab , gnutls , protobufc , python3 @@ -124,7 +123,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.6"; + version = "1.9.7"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU="; + hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM="; }; patches = [ @@ -169,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { gettext shared-mime-info valgrind - gcab gnutls protobufc # for protoc python @@ -183,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { gusb sqlite libarchive + libdrm curl elfutils libgudev @@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: { libcbor libqmi xz # for liblzma - ] ++ lib.optionals haveDell [ - libsmbios ] ++ lib.optionals haveFlashrom [ flashrom ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index b76a77fb3a..283e04b475 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -4,6 +4,8 @@ in { stdenvNoCC, fetchzip, lib, + rdfind, + which, }: stdenvNoCC.mkDerivation rec { @@ -15,6 +17,11 @@ stdenvNoCC.mkDerivation rec { hash = source.sourceHash; }; + nativeBuildInputs = [ + rdfind + which + ]; + installFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index 09f14bc729..afe371a888 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,6 @@ -# This file is autogenerated! Run ./update.sh to regenerate. { - version = "20230919"; - revision = "20230919"; - sourceHash = "sha256-xcGEaWCcCAhN4gnnaj03u7LekP4+cRtcioTYhvAOQtg="; - outputHash = "sha256-6W9QTShp/UzlcILwyyn56wppQORUGPff2TodEt4qhwQ="; + version = "20231111"; + revision = "20231111"; + sourceHash = "sha256-S9Xkj2CbamHxqjTDfqRJu91MNrSntxrQ7HYyhvdH6Jo="; + outputHash = "sha256-Qrz9fSHUQf0Gl8pfol4yfe95sD8DQV/+riT1NCFussQ="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/freeipa/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/freeipa/default.nix index c7d7d5af09..99d8527fc1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/freeipa/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/freeipa/default.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation rec { pname = "freeipa"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; - sha256 = "sha256-9DbfxJeEUGnBE7pULTPrVgqRePILUFk4Kn0WFNmcFVg="; + sha256 = "sha256-l/e2Dq/ako41QWEZyJCD+PA44PzTnzC8B7jYAm/Tt6Q="; }; nativeBuildInputs = [ @@ -167,5 +167,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.s1341 ]; platforms = platforms.linux; + mainProgram = "ipa"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index bbd871a1b9..f4b8bfc566 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash }: +{ version, hash }: { lib, stdenv, fetchFromGitHub, fetchpatch , fusePackages, util-linux, gettext, shadow @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "libfuse"; repo = "libfuse"; rev = "${pname}-${version}"; - sha256 = sha256Hash; + inherit hash; }; preAutoreconf = "touch config.rpath"; @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" + "-Dinitscriptdir=" ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 6aa3e46d4e..f692c2fb41 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -7,11 +7,11 @@ let in { fuse_2 = mkFuse { version = "2.9.9"; - sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n"; + hash = "sha256-dgjM6M7xk5MHi9xPyCyvF0vq0KM8UCsEYBcMhkrdvfs="; }; fuse_3 = mkFuse { - version = "3.11.0"; - sha256Hash = "1wx80xxlvjn0wxhmkr1g91vwrgxssyzds1hizzxc2xrd4kjh9dfb"; + version = "3.16.2"; + hash = "sha256-QO9s+IkR0rkqIYNqt2IYST6AVBkCr56jcuuz5nKJuA4="; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch index 903f30325d..582d3eb0de 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -1,12 +1,13 @@ +diff --git a/lib/meson.build b/lib/meson.build --- a/lib/meson.build +++ b/lib/meson.build @@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), soversion: '3', include_directories: include_dirs, dependencies: deps, install: true, link_depends: 'fuse_versionscript', -- c_args: [ '-DFUSE_USE_VERSION=35', +- c_args: [ '-DFUSE_USE_VERSION=312', - '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], -+ c_args: [ '-DFUSE_USE_VERSION=35' ], ++ c_args: [ '-DFUSE_USE_VERSION=312' ], link_args: ['-Wl,--version-script,' + meson.current_source_dir() + '/fuse_versionscript' ]) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch index 147bcb439f..769e308866 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,18 +1,20 @@ ---- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 -+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 -@@ -37,10 +37,10 @@ - fi +--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200 ++++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200 +@@ -39,12 +39,12 @@ - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + if [ "${udevrulesdir}" != "" ]; then + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" + "${sysconfdir}${udevrulesdir}/99-fuse3.rules" + fi - install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ -- "${DESTDIR}/etc/init.d/fuse3" -+ "${sysconfdir}/init.d/fuse3" + if [ "$initscriptdir" != "" ]; then + install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${initscriptdir}/fuse3" ++ "${sysconfdir}${initscriptdir}/fuse3" - - if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix index d44db7adf1..43f7ed5cb3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fwts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + + substituteInPlace src/lib/src/fwts_devicetree.c \ + src/devicetree/dt_base/dt_base.c \ + --replace "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix index 77caa13159..13cb397b17 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hd-idle"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "adelolmo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7EXfI3E83ltpjq2M/qZX2P/bNtQQBWZRBCD7i5uit0I="; + sha256 = "sha256-WHJcysTN9LHI1WnDuFGTyTirxXirpLpJIeNDj4sZGY0="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hid-tmff2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hid-tmff2/default.nix new file mode 100644 index 0000000000..ac297c78e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation { + pname = "hid-tmff2"; + # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12 + version = "0.81"; + + src = fetchFromGitHub { + owner = "Kimplul"; + repo = "hid-tmff2"; + rev = "ca168637fbfb085ebc9ade0c47fa0653dac5d25b"; + hash = "sha256-Nm5m5xjwJGy+ia4nTkvPZynIxUj6MVGGbSNmIcIpziM="; + # For hid-tminit. Source: https://github.com/scarburato/hid-tminit + fetchSubmodules = true; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installFlags = [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; + + postPatch = "sed -i '/depmod -A/d' Makefile"; + + meta = with lib; { + description = "A linux kernel module for Thrustmaster T300RS, T248 and TX(experimental)"; + homepage = "https://github.com/Kimplul/hid-tmff2"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rayslash ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix index a35bd38add..e4b41f3a0c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = "https://w1.fi/hostapd/"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; - maintainers = with maintainers; [ ninjatrappeur hexa ]; + maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index a64a0574d8..5bfdf61dff 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.374"; + version = "0.376"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-RvjYd8iD6JkGhh6TDy/Qo+UzLxbhPvIJvhl/Rw14lbk="; + hash = "sha256-M1uBamN09XepOembDAcHXO/UvnM9s/OiN+eNzChF5Tw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix index 9429bd2830..62e6149b6f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "23.08"; + version = "23.11"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-T97cTJLGSJgOoQFgL/lI+AldqsCEcHilhTTDZy+pmU8="; + sha256 = "sha256-/OSU/7QR8NAjcAIo+unVQfORvCH5VpjfRn5sIrCxwbE="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix index 016651deb4..1d7dc9e4d1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-oSKNP/WY0Ivhj5LgyeerzZbleMcUn8ho0aqsiunqvyU="; + sha256 = "sha256-ZIvWdNxGSUmQtMKB/MVHEZ0fJ8b//zSXz+1r/P9ZDkE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 64749e209b..a86af7e6db 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl , gitUpdater @@ -6,27 +6,13 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-TFG43svH5NoVn/sGb1kM+5Pb+a9/+GsWR85Ct8F5onI="; + hash = "sha256-pwF5CF+huW08M7BAyAm3XitXVjrcUFpK0F4mCd83NGM="; }; - patches = [ - # To avoid ./configure failing due to invalid arguments: - (fetchpatch { # configure: restore backward compatibility - url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; - sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; - }) - - # fix build on musl. applied anywhere to prevent patchrot. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/iproute2/include.patch?id=bd46efb8a8da54948639cebcfa5b37bd608f1069"; - sha256 = "sha256-NpNnSXQntuzzpjswE42yzo7nqmrQgI5YcHR2kp9NEwA="; - }) - ]; - postPatch = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 6aa369e4eb..8326ef1c46 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.17"; + version = "7.19"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vknJ/0id1mEMrWVB50PDOE6slunyRwfaezkp2PKsZNg="; + sha256 = "sha256-m8H7pI1leG4+C2Pca2aahmgj13hAxpkMDGsjB47CxNY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix index 9d2848556e..b82484514e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix @@ -2,31 +2,18 @@ , autoreconfHook, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? true -, fetchpatch +, gitUpdater }: stdenv.mkDerivation rec { - version = "1.8.9"; + version = "1.8.10"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - sha256 = "72Y5pDvoMlpPjqaBI/+sI2y2lujHhQG2ToEGr7AIyH8="; + sha256 = "XMJVwYk1bjF9BwdVzpNx62Oht4PDRJj7jDAmTzzFnJw="; }; - patches = [ - (fetchpatch { - name = "format-security.patch"; - url = "https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc"; - sha256 = "OdytFmHk+3Awu+sDQpGTl5/qip4doRblmW2vQzfNZiU="; - }) - (fetchurl { - name = "static.patch"; - url = "https://lore.kernel.org/netfilter-devel/20230402232939.1060151-1-hi@alyssa.is/raw"; - sha256 = "PkH+1HbJjBb3//ffBe0XUQok1lBwgj/STL8Ppu/28f4="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ @@ -35,10 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" - ''; - configureFlags = [ "--enable-bpf-compiler" "--enable-devel" @@ -47,6 +30,8 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optional (!nftablesCompat) "--disable-nftables"; + enableParallelBuilding = true; + postInstall = lib.optionalString nftablesCompat '' rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} ln -sv xtables-nft-multi $out/bin/iptables @@ -57,6 +42,13 @@ stdenv.mkDerivation rec { ln -sv xtables-nft-multi $out/bin/ip6tables-save ''; + passthru = { + updateScript = gitUpdater { + url = "https://git.netfilter.org/iptables"; + rev-prefix = "v"; + }; + }; + meta = with lib; { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = "https://www.netfilter.org/projects/iptables/index.html"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix index 6e97532ee5..c49a0a7b91 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }: +{ stdenv, lib, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "isgx-${version}-${kernel.version}"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/intel/linux-sgx-driver"; license = with licenses; [ bsd3 /* OR */ gpl2Only ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix index 1c38f4b7f4..9d97f73780 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+O7PD9VkzsQ8FOxS19pouJMKFQ+nsdpAkb+R2KN2U8="; + sha256 = "sha256-BJlsCNfRxGCWb7JEo9OIM1LCZ0t61SIAPZ9Oy4q0jes="; }; # vlock is moved into its own output, since it depends on pam. This diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch index fad33be45b..61e8918017 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kbd/search-paths.patch @@ -18,34 +18,30 @@ Without this patch, kbd will only look inside DATADIR "/" KEYMAPDIR "/mac/include/", --- a/src/libkfont/context.c +++ b/src/libkfont/context.c -@@ -13,6 +13,7 @@ +@@ -13,5 +13,6 @@ /* search for the map file in these directories (with trailing /) */ static const char *const mapdirpath[] = { - "", + "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", NULL }; -@@ -28,6 +29,7 @@ static const char *const mapsuffixes[] = { +@@ -28,5 +29,6 @@ static const char *const mapsuffixes[] = { /* search for the font in these directories (with trailing /) */ static const char *const fontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", NULL }; -@@ -42,6 +44,7 @@ static char const *const fontsuffixes[] = { +@@ -42,5 +44,6 @@ static char const *const fontsuffixes[] = { static const char *const unidirpath[] = { - "", + "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", NULL }; -@@ -55,6 +58,7 @@ static const char *const unisuffixes[] = { +@@ -55,5 +58,6 @@ static const char *const unisuffixes[] = { /* hide partial fonts a bit - loading a single one is a bad idea */ const char *const partfontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", NULL diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix index ff40e585b1..e0a3c4319b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix @@ -119,7 +119,10 @@ in { hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; }; patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + + # Fix regression turning `struct sockaddr_ll` flexible size. + ./revert-af_packet-flex.patch ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch new file mode 100644 index 0000000000..ed6c8861d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch @@ -0,0 +1,31 @@ +Revert commit https://github.com/torvalds/linux/commit/a0ade8404c3bc2bf2631cb0f20d372eed22d9d96 + +The change caused API regression by turning fixed size struct to +flexible size struct. It was an unintentional change, broke `udp2raw`: + https://github.com/NixOS/nixpkgs/pull/252587#issuecomment-1744427473 +--- a/include/uapi/linux/if_packet.h ++++ b/include/uapi/linux/if_packet.h +@@ -18,11 +18,7 @@ struct sockaddr_ll { + unsigned short sll_hatype; + unsigned char sll_pkttype; + unsigned char sll_halen; +- union { +- unsigned char sll_addr[8]; +- /* Actual length is in sll_halen. */ +- __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); +- }; ++ unsigned char sll_addr[8]; + }; + + /* Packet types */ +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -3607,7 +3607,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, + if (dev) { + sll->sll_hatype = dev->type; + sll->sll_halen = dev->addr_len; +- memcpy(sll->sll_addr_flex, dev->dev_addr, dev->addr_len); ++ memcpy(sll->sll_addr, dev->dev_addr, dev->addr_len); + } else { + sll->sll_hatype = 0; /* Bad: we have no ARPHRD_UNSPEC */ + sll->sll_halen = 0; 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 038a3105a1..2954ee8f78 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 @@ -146,7 +146,7 @@ let scheduler = { IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" - BLK_CGROUP_IOLATENCY = whenAtLeast "4.19" yes; + BLK_CGROUP_IOLATENCY = yes; BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = yes; @@ -183,8 +183,8 @@ let BPF_JIT = whenPlatformHasEBPFJit yes; BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304 HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; - BPF_STREAM_PARSER = whenAtLeast "4.19" yes; - XDP_SOCKETS = whenAtLeast "4.19" yes; + BPF_STREAM_PARSER = yes; + XDP_SOCKETS = yes; XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes; WAN = yes; TCP_CONG_ADVANCED = yes; @@ -208,7 +208,7 @@ let IPV6_FOU_TUNNEL = module; IPV6_SEG6_LWTUNNEL = yes; IPV6_SEG6_HMAC = yes; - IPV6_SEG6_BPF = whenAtLeast "4.18" yes; + IPV6_SEG6_BPF = yes; NET_CLS_BPF = module; NET_ACT_BPF = module; NET_SCHED = yes; @@ -237,22 +237,17 @@ let NF_CONNTRACK_TIMEOUT = yes; NF_CONNTRACK_TIMESTAMP = yes; NETFILTER_NETLINK_GLUE_CT = yes; - NF_TABLES_INET = mkMerge [ (whenOlder "4.17" module) - (whenAtLeast "4.17" yes) ]; - NF_TABLES_NETDEV = mkMerge [ (whenOlder "4.17" module) - (whenAtLeast "4.17" yes) ]; + NF_TABLES_INET = yes; + NF_TABLES_NETDEV = yes; NFT_REJECT_NETDEV = whenAtLeast "5.11" module; # IP: Netfilter Configuration - NF_TABLES_IPV4 = mkMerge [ (whenOlder "4.17" module) - (whenAtLeast "4.17" yes) ]; - NF_TABLES_ARP = mkMerge [ (whenOlder "4.17" module) - (whenAtLeast "4.17" yes) ]; + NF_TABLES_IPV4 = yes; + NF_TABLES_ARP = yes; # IPv6: Netfilter Configuration - NF_TABLES_IPV6 = mkMerge [ (whenOlder "4.17" module) - (whenAtLeast "4.17" yes) ]; + NF_TABLES_IPV6 = yes; # Bridge Netfilter Configuration - NF_TABLES_BRIDGE = mkMerge [ (whenBetween "4.19" "5.3" yes) + NF_TABLES_BRIDGE = mkMerge [ (whenOlder "5.3" yes) (whenAtLeast "5.3" module) ]; # needed for `dropwatch` @@ -274,7 +269,7 @@ let # Kernel TLS TLS = module; - TLS_DEVICE = whenAtLeast "4.18" yes; + TLS_DEVICE = yes; # infiniband INFINIBAND = module; @@ -323,11 +318,13 @@ let FB_3DFX_ACCEL = yes; FB_VESA = yes; FRAMEBUFFER_CONSOLE = yes; - FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; + FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; + FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # On 5.14 this conflicts with FB_SIMPLE. DRM_SIMPLEDRM = whenAtLeast "5.14" no; + DRM_FBDEV_EMULATION = yes; }; fonts = { @@ -357,8 +354,7 @@ let # Allow device firmware updates DRM_DP_AUX_CHARDEV = yes; # amdgpu display core (DC) support - DRM_AMD_DC_DCN1_0 = whenBetween "4.15" "5.6" yes; - DRM_AMD_DC_PRE_VEGA = whenBetween "4.15" "4.18" yes; + DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes; DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes; DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes; DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes; @@ -368,8 +364,8 @@ let DRM_AMD_DC_SI = whenAtLeast "5.10" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { # Intel GVT-g graphics virtualization supports 64-bit only - DRM_I915_GVT = whenAtLeast "4.16" yes; - DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module; + DRM_I915_GVT = yes; + DRM_I915_GVT_KVMGT = module; # Enable Hyper-V Synthetic DRM Driver DRM_HYPERV = whenAtLeast "5.14" module; } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { @@ -425,25 +421,9 @@ let usb-serial = { USB_SERIAL_GENERIC = yes; # USB Generic Serial Driver - } // optionalAttrs (versionOlder version "4.16") { - # Include firmware for various USB serial devices. - # Only applicable for kernels below 4.16, after that no firmware is shipped in the kernel tree. - USB_SERIAL_KEYSPAN_MPR = yes; - USB_SERIAL_KEYSPAN_USA28 = yes; - USB_SERIAL_KEYSPAN_USA28X = yes; - USB_SERIAL_KEYSPAN_USA28XA = yes; - USB_SERIAL_KEYSPAN_USA28XB = yes; - USB_SERIAL_KEYSPAN_USA19 = yes; - USB_SERIAL_KEYSPAN_USA18X = yes; - USB_SERIAL_KEYSPAN_USA19W = yes; - USB_SERIAL_KEYSPAN_USA19QW = yes; - USB_SERIAL_KEYSPAN_USA19QI = yes; - USB_SERIAL_KEYSPAN_USA49W = yes; - USB_SERIAL_KEYSPAN_USA49WLC = yes; }; usb = { - USB_DEBUG = { optional = true; tristate = whenOlder "4.18" "n";}; USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) @@ -514,7 +494,6 @@ let CIFS_XATTR = yes; CIFS_POSIX = option yes; CIFS_FSCACHE = yes; - CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = whenOlder "5.15" yes; CIFS_UPCALL = yes; CIFS_ACL = whenOlder "5.3" yes; @@ -569,7 +548,7 @@ let SECURITY_APPARMOR = yes; DEFAULT_SECURITY_APPARMOR = yes; - RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG + RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in @@ -581,10 +560,15 @@ let PERSISTENT_KEYRINGS = yes; # enable temporary caching of the last request_key() result KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; - } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { + # randomized slab caches + RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; + + # NIST SP800-90A DRBG modes - enabled by most distributions + # and required by some out-of-tree modules (ShuffleCake) + # This does not include the NSA-backdoored Dual-EC mode from the same NIST publication. + CRYPTO_DRBG_HASH = yes; + CRYPTO_DRBG_CTR = yes; - # Detect buffer overflows on the stack - CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";}; } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; @@ -596,9 +580,11 @@ let # AMD SME AMD_MEM_ENCRYPT = yes; # AMD SEV and AMD SEV-SE - KVM_AMD_SEV = whenAtLeast "4.16" yes; + KVM_AMD_SEV = yes; # AMD SEV-SNP SEV_GUEST = whenAtLeast "5.19" module; + # Shadow stacks + X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes; }; microcode = { @@ -702,7 +688,6 @@ let XEN_PVH = option yes; XEN_PVHVM = option yes; XEN_SAVE_RESTORE = option yes; - XEN_SCRUB_PAGES = whenOlder "4.19" yes; XEN_SELFBALLOONING = whenOlder "5.3" yes; # Enable device detection on virtio-mmio hypervisors @@ -737,7 +722,6 @@ let ZSWAP = option yes; ZPOOL = yes; ZBUD = option yes; - ZSMALLOC = module; }; brcmfmac = { @@ -756,40 +740,11 @@ let tests = { # This menu disables all/most of them on >= 4.16 RUNTIME_TESTING_MENU = option no; - } // optionalAttrs (versionOlder version "4.16") { - # For older kernels, painstakingly disable each symbol. - ARM_KPROBES_TEST = option no; - ASYNC_RAID6_TEST = option no; - ATOMIC64_SELFTEST = option no; - BACKTRACE_SELF_TEST = option no; - INTERVAL_TREE_TEST = option no; - PERCPU_TEST = option no; - RBTREE_TEST = option no; - TEST_BITMAP = option no; - TEST_BPF = option no; - TEST_FIRMWARE = option no; - TEST_HASH = option no; - TEST_HEXDUMP = option no; - TEST_KMOD = option no; - TEST_KSTRTOX = option no; - TEST_LIST_SORT = option no; - TEST_LKM = option no; - TEST_PARMAN = option no; - TEST_PRINTF = option no; - TEST_RHASHTABLE = option no; - TEST_SORT = option no; - TEST_STATIC_KEYS = option no; - TEST_STRING_HELPERS = option no; - TEST_UDELAY = option no; - TEST_USER_COPY = option no; - TEST_UUID = option no; } // { CRC32_SELFTEST = option no; CRYPTO_TEST = option no; EFI_TEST = option no; GLOB_SELFTEST = option no; - DRM_DEBUG_MM_SELFTEST = { optional = true; tristate = whenOlder "4.18" "n";}; - LNET_SELFTEST = { optional = true; tristate = whenOlder "4.18" "n";}; LOCK_TORTURE_TEST = option no; MTD_TESTS = option no; NOTIFIER_ERROR_INJECTION = option no; @@ -801,23 +756,11 @@ let XZ_DEC_TEST = option no; }; - criu = if (versionAtLeast version "4.19") then { + criu = { # Unconditionally enabled, because it is required for CRIU and # it provides the kcmp() system call that Mesa depends on. CHECKPOINT_RESTORE = yes; - } else optionalAttrs (features.criu or false) ({ - # For older kernels, CHECKPOINT_RESTORE is hidden behind EXPERT. - EXPERT = yes; - CHECKPOINT_RESTORE = yes; - } // optionalAttrs (features.criu_revert_expert or true) { - RFKILL_INPUT = option yes; - HID_PICOLCD_FB = option yes; - HID_PICOLCD_BACKLIGHT = option yes; - HID_PICOLCD_LCD = option yes; - HID_PICOLCD_LEDS = option yes; - HID_PICOLCD_CIR = option yes; - DEBUG_MEMORY_INIT = option yes; - }); + }; misc = let # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz. @@ -861,7 +804,6 @@ let PM_TRACE_RTC = no; # Disable some expensive (?) features. ACCESSIBILITY = yes; # Accessibility support AUXDISPLAY = yes; # Auxiliary Display support - DONGLE = whenOlder "4.17" yes; # Serial dongle support HIPPI = yes; MTD_COMPLEX_MAPPINGS = yes; # needed for many devices @@ -903,6 +845,8 @@ let CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; + FSCACHE_STATS = yes; + DVB_DYNAMIC_MINORS = option yes; # we use udev EFI_STUB = yes; # EFI bootloader in the bzImage itself @@ -917,7 +861,6 @@ let FUSION = yes; # Fusion MPT device support IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; - IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels @@ -939,7 +882,7 @@ let MLX5_CORE_EN = option yes; - NVME_MULTIPATH = whenAtLeast "4.15" yes; + NVME_MULTIPATH = yes; PSI = whenAtLeast "4.20" yes; @@ -1014,7 +957,7 @@ let X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; X86_PLATFORM_DRIVERS_HP = whenAtLeast "6.1" yes; - LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; + LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; @@ -1072,6 +1015,28 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; + # https://docs.kernel.org/arch/arm/mem_alignment.html + # tldr: + # when buggy userspace code emits illegal misaligned LDM, STM, + # LDRD and STRDs, the instructions trap, are caught, and then + # are emulated by the kernel. + # + # This is the default on armv7l, anyway, but it is explicitly + # enabled here for the sake of providing context for the + # aarch64 compat option which follows. + ALIGNMENT_TRAP = mkIf (stdenv.hostPlatform.system == "armv7l-linux") yes; + + # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220701135322.3025321-1-ardb@kernel.org/ + # tldr: + # when encountering alignment faults under aarch64, this option + # makes the kernel attempt to handle the fault by doing the + # same style of misaligned emulation that is performed under + # armv7l (see above option). + # + # This minimizes the potential for aarch32 userspace to behave + # differently when run under aarch64 kernels compared to when + # it is run under an aarch32 kernel. + COMPAT_ALIGNMENT_FIXUPS = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); } // optionalAttrs (versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch deleted file mode 100644 index 4e247e4328..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch +++ /dev/null @@ -1,784 +0,0 @@ -commit 827b86ad1dd21feed4c0b99faf6059f245f7dadb -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, make the @val array u64 for consistency. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 3b31fc05a0f1..a1b95e83fa87 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -7174,7 +7174,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -7214,7 +7214,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -7235,7 +7235,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -7261,7 +7261,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = true, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index f95ab29a45d0..6151c23f722f 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -276,26 +276,33 @@ static int cpuacct_all_seq_show(struct seq_file *m, void *V) - return 0; - } - --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, -+ u64 (*val)[CPUACCT_STAT_NSTATS]) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); -- s64 val[CPUACCT_STAT_NSTATS]; - int cpu; -- int stat; - -- memset(val, 0, sizeof(val)); -+ memset(val, 0, sizeof(*val)); -+ - for_each_possible_cpu(cpu) { - u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat; - -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -- val[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -- val[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_USER]; -+ (*val)[CPUACCT_STAT_USER] += cpustat[CPUTIME_NICE]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SYSTEM]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_IRQ]; -+ (*val)[CPUACCT_STAT_SYSTEM] += cpustat[CPUTIME_SOFTIRQ]; - } -+} -+ -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ u64 val[CPUACCT_STAT_NSTATS]; -+ int stat; -+ -+ cpuacct_stats_read(css_ca(seq_css(sf)), &val); - - for (stat = 0; stat < CPUACCT_STAT_NSTATS; stat++) { -- seq_printf(sf, "%s %lld\n", -+ seq_printf(sf, "%s %llu\n", - cpuacct_stat_desc[stat], - (long long)nsec_to_clock_t(val[stat])); - } - -commit fdb64d002b3a223ce4bb11aa4448a42050470052 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index a1b95e83fa87..f01d56e58a1b 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -7253,6 +7253,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* Terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_online = cpu_cgroup_css_online, -@@ -7262,7 +7395,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = true, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 6151c23f722f..fc1cf13c3af1 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -347,6 +347,31 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, val[CPUACCT_STAT_NSTATS]; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &val); -+ -+ val[CPUACCT_STAT_USER] *= TICK_NSEC; -+ val[CPUACCT_STAT_SYSTEM] *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_USER], NSEC_PER_USEC); -+ do_div(val[CPUACCT_STAT_SYSTEM], NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", -+ usage, val[CPUACCT_STAT_USER], val[CPUACCT_STAT_SYSTEM]); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ba72807c73d4..ddf7af466d35 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *tsk, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif - -commit 8dde150866b8c433216105c50b7e889d5242d583 -Author: Tejun Heo -Date: Fri Aug 5 12:41:01 2016 -0400 - - cgroup: add documentation regarding CPU controller cgroup v2 support - - Signed-off-by: Tejun Heo - -diff --git a/Documentation/cgroup-v2-cpu.txt b/Documentation/cgroup-v2-cpu.txt -new file mode 100644 -index 000000000000..1ed7032d4472 ---- /dev/null -+++ b/Documentation/cgroup-v2-cpu.txt -@@ -0,0 +1,368 @@ -+ -+ -+CPU Controller on Control Group v2 -+ -+August, 2016 Tejun Heo -+ -+ -+While most controllers have support for cgroup v2 now, the CPU -+controller support is not upstream yet due to objections from the -+scheduler maintainers on the basic designs of cgroup v2. This -+document explains the current situation as well as an interim -+solution, and details the disagreements and arguments. The latest -+version of this document can be found at the following URL. -+ -+ https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu -+ -+This document was posted to the linux-kernel and cgroup mailing lists. -+Unfortunately, no consensus was reached as of Oct, 2016. The thread -+can be found at the following URL. -+ -+ http://lkml.kernel.org/r/20160805170752.GK2542@mtj.duckdns.org -+ -+ -+CONTENTS -+ -+1. Current Situation and Interim Solution -+2. Disagreements and Arguments -+ 2-1. Contentious Restrictions -+ 2-1-1. Process Granularity -+ 2-1-2. No Internal Process Constraint -+ 2-2. Impact on CPU Controller -+ 2-2-1. Impact of Process Granularity -+ 2-2-2. Impact of No Internal Process Constraint -+ 2-3. Arguments for cgroup v2 -+3. Way Forward -+4. References -+ -+ -+1. Current Situation and Interim Solution -+ -+All objections from the scheduler maintainers apply to cgroup v2 core -+design, and there are no known objections to the specifics of the CPU -+controller cgroup v2 interface. The only blocked part is changes to -+expose the CPU controller interface on cgroup v2, which comprises the -+following two patches: -+ -+ [1] sched: Misc preps for cgroup unified hierarchy interface -+ [2] sched: Implement interface for cgroup unified hierarchy -+ -+The necessary changes are superficial and implement the interface -+files on cgroup v2. The combined diffstat is as follows. -+ -+ kernel/sched/core.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++-- -+ kernel/sched/cpuacct.c | 57 ++++++++++++------ -+ kernel/sched/cpuacct.h | 5 + -+ 3 files changed, 189 insertions(+), 22 deletions(-) -+ -+The patches are easy to apply and forward-port. The following git -+branch will always carry the two patches on top of the latest release -+of the upstream kernel. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu -+ -+There also are versioned branches going back to v4.4. -+ -+ git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/cgroup-v2-cpu-$KERNEL_VER -+ -+While it's difficult to tell whether the CPU controller support will -+be merged, there are crucial resource control features in cgroup v2 -+that are only possible due to the design choices that are being -+objected to, and every effort will be made to ease enabling the CPU -+controller cgroup v2 support out-of-tree for parties which choose to. -+ -+ -+2. Disagreements and Arguments -+ -+There have been several lengthy discussion threads [3][4] on LKML -+around the structural constraints of cgroup v2. The two that affect -+the CPU controller are process granularity and no internal process -+constraint. Both arise primarily from the need for common resource -+domain definition across different resources. -+ -+The common resource domain is a powerful concept in cgroup v2 that -+allows controllers to make basic assumptions about the structural -+organization of processes and controllers inside the cgroup hierarchy, -+and thus solve problems spanning multiple types of resources. The -+prime example for this is page cache writeback: dirty page cache is -+regulated through throttling buffered writers based on memory -+availability, and initiating batched write outs to the disk based on -+IO capacity. Tracking and controlling writeback inside a cgroup thus -+requires the direct cooperation of the memory and the IO controller. -+ -+This easily extends to other areas, such as CPU cycles consumed while -+performing memory reclaim or IO encryption. -+ -+ -+2-1. Contentious Restrictions -+ -+For controllers of different resources to work together, they must -+agree on a common organization. This uniform model across controllers -+imposes two contentious restrictions on the CPU controller: process -+granularity and the no-internal-process constraint. -+ -+ -+ 2-1-1. Process Granularity -+ -+ For memory, because an address space is shared between all threads -+ of a process, the terminal consumer is a process, not a thread. -+ Separating the threads of a single process into different memory -+ control domains doesn't make semantical sense. cgroup v2 ensures -+ that all controller can agree on the same organization by requiring -+ that threads of the same process belong to the same cgroup. -+ -+ There are other reasons to enforce process granularity. One -+ important one is isolating system-level management operations from -+ in-process application operations. The cgroup interface, being a -+ virtual filesystem, is very unfit for multiple independent -+ operations taking place at the same time as most operations have to -+ be multi-step and there is no way to synchronize multiple accessors. -+ See also [5] Documentation/cgroup-v2.txt, "R-2. Thread Granularity" -+ -+ -+ 2-1-2. No Internal Process Constraint -+ -+ cgroup v2 does not allow processes to belong to any cgroup which has -+ child cgroups when resource controllers are enabled on it (the -+ notable exception being the root cgroup itself). This is because, -+ for some resources, a resource domain (cgroup) is not directly -+ comparable to the terminal consumer (process/task) of said resource, -+ and so putting the two into a sibling relationship isn't meaningful. -+ -+ - Differing Control Parameters and Capabilities -+ -+ A cgroup controller has different resource control parameters and -+ capabilities from a terminal consumer, be that a task or process. -+ There are a couple cases where a cgroup control knob can be mapped -+ to a per-task or per-process API but they are exceptions and the -+ mappings aren't obvious even in those cases. -+ -+ For example, task priorities (also known as nice values) set -+ through setpriority(2) are mapped to the CPU controller -+ "cpu.shares" values. However, how exactly the two ranges map and -+ even the fact that they map to each other at all are not obvious. -+ -+ The situation gets further muddled when considering other resource -+ types and control knobs. IO priorities set through ioprio_set(2) -+ cannot be mapped to IO controller weights and most cgroup resource -+ control knobs including the bandwidth control knobs of the CPU -+ controller don't have counterparts in the terminal consumers. -+ -+ - Anonymous Resource Consumption -+ -+ For CPU, every time slice consumed from inside a cgroup, which -+ comprises most but not all of consumed CPU time for the cgroup, -+ can be clearly attributed to a specific task or process. Because -+ these two types of entities are directly comparable as consumers -+ of CPU time, it's theoretically possible to mix tasks and cgroups -+ on the same tree levels and let them directly compete for the time -+ quota available to their common ancestor. -+ -+ However, the same can't be said for resource types like memory or -+ IO: the memory consumed by the page cache, for example, can be -+ tracked on a per-cgroup level, but due to mismatches in lifetimes -+ of involved objects (page cache can persist long after processes -+ are gone), shared usages and the implementation overhead of -+ tracking persistent state, it can no longer be attributed to -+ individual processes after instantiation. Consequently, any IO -+ incurred by page cache writeback can be attributed to a cgroup, -+ but not to the individual consumers inside the cgroup. -+ -+ For memory and IO, this makes a resource domain (cgroup) an object -+ of a fundamentally different type than a terminal consumer -+ (process). A process can't be a first class object in the resource -+ distribution graph as its total resource consumption can't be -+ described without the containing resource domain. -+ -+ Disallowing processes in internal cgroups avoids competition between -+ cgroups and processes which cannot be meaningfully defined for these -+ resources. All resource control takes place among cgroups and a -+ terminal consumer interacts with the containing cgroup the same way -+ it would with the system without cgroup. -+ -+ Root cgroup is exempt from this constraint, which is in line with -+ how root cgroup is handled in general - it's excluded from cgroup -+ resource accounting and control. -+ -+ -+Enforcing process granularity and no internal process constraint -+allows all controllers to be on the same footing in terms of resource -+distribution hierarchy. -+ -+ -+2-2. Impact on CPU Controller -+ -+As indicated earlier, the CPU controller's resource distribution graph -+is the simplest. Every schedulable resource consumption can be -+attributed to a specific task. In addition, for weight based control, -+the per-task priority set through setpriority(2) can be translated to -+and from a per-cgroup weight. As such, the CPU controller can treat a -+task and a cgroup symmetrically, allowing support for any tree layout -+of cgroups and tasks. Both process granularity and the no internal -+process constraint restrict how the CPU controller can be used. -+ -+ -+ 2-2-1. Impact of Process Granularity -+ -+ Process granularity prevents tasks belonging to the same process to -+ be assigned to different cgroups. It was pointed out [6] that this -+ excludes the valid use case of hierarchical CPU distribution within -+ processes. -+ -+ To address this issue, the rgroup (resource group) [7][8][9] -+ interface, an extension of the existing setpriority(2) API, was -+ proposed, which is in line with other programmable priority -+ mechanisms and eliminates the risk of in-application configuration -+ and system configuration stepping on each other's toes. -+ Unfortunately, the proposal quickly turned into discussions around -+ cgroup v2 design decisions [4] and no consensus could be reached. -+ -+ -+ 2-2-2. Impact of No Internal Process Constraint -+ -+ The no internal process constraint disallows tasks from competing -+ directly against cgroups. Here is an excerpt from Peter Zijlstra -+ pointing out the issue [10] - R, L and A are cgroups; t1, t2, t3 and -+ t4 are tasks: -+ -+ -+ R -+ / | \ -+ t1 t2 A -+ / \ -+ t3 t4 -+ -+ -+ Is fundamentally different from: -+ -+ -+ R -+ / \ -+ L A -+ / \ / \ -+ t1 t2 t3 t4 -+ -+ -+ Because if in the first hierarchy you add a task (t5) to R, all of -+ its A will run at 1/4th of total bandwidth where before it had -+ 1/3rd, whereas with the second example, if you add our t5 to L, A -+ doesn't get any less bandwidth. -+ -+ -+ It is true that the trees are semantically different from each other -+ and the symmetric handling of tasks and cgroups is aesthetically -+ pleasing. However, it isn't clear what the practical usefulness of -+ a layout with direct competition between tasks and cgroups would be, -+ considering that number and behavior of tasks are controlled by each -+ application, and cgroups primarily deal with system level resource -+ distribution; changes in the number of active threads would directly -+ impact resource distribution. Real world use cases of such layouts -+ could not be established during the discussions. -+ -+ -+2-3. Arguments for cgroup v2 -+ -+There are strong demands for comprehensive hierarchical resource -+control across all major resources, and establishing a common resource -+hierarchy is an essential step. As with most engineering decisions, -+common resource hierarchy definition comes with its trade-offs. With -+cgroup v2, the trade-offs are in the form of structural constraints -+which, among others, restrict the CPU controller's space of possible -+configurations. -+ -+However, even with the restrictions, cgroup v2, in combination with -+rgroup, covers most of identified real world use cases while enabling -+new important use cases of resource control across multiple resource -+types that were fundamentally broken previously. -+ -+Furthermore, for resource control, treating resource domains as -+objects of a different type from terminal consumers has important -+advantages - it can account for resource consumptions which are not -+tied to any specific terminal consumer, be that a task or process, and -+allows decoupling resource distribution controls from in-application -+APIs. Even the CPU controller may benefit from it as the kernel can -+consume significant amount of CPU cycles in interrupt context or tasks -+shared across multiple resource domains (e.g. softirq). -+ -+Finally, it's important to note that enabling cgroup v2 support for -+the CPU controller doesn't block use cases which require the features -+which are not available on cgroup v2. Unlikely, but should anybody -+actually rely on the CPU controller's symmetric handling of tasks and -+cgroups, backward compatibility is and will be maintained by being -+able to disconnect the controller from the cgroup v2 hierarchy and use -+it standalone. This also holds for cpuset which is often used in -+highly customized configurations which might be a poor fit for common -+resource domains. -+ -+The required changes are minimal, the benefits for the target use -+cases are critical and obvious, and use cases which have to use v1 can -+continue to do so. -+ -+ -+3. Way Forward -+ -+cgroup v2 primarily aims to solve the problem of comprehensive -+hierarchical resource control across all major computing resources, -+which is one of the core problems of modern server infrastructure -+engineering. The trade-offs that cgroup v2 took are results of -+pursuing that goal and gaining a better understanding of the nature of -+resource control in the process. -+ -+I believe that real world usages will prove cgroup v2's model right, -+considering the crucial pieces of comprehensive resource control that -+cannot be implemented without common resource domains. This is not to -+say that cgroup v2 is fixed in stone and can't be updated; if there is -+an approach which better serves both comprehensive resource control -+and the CPU controller's flexibility, we will surely move towards -+that. It goes without saying that discussions around such approach -+should consider practical aspects of resource control as a whole -+rather than absolutely focusing on a particular controller. -+ -+Until such consensus can be reached, the CPU controller cgroup v2 -+support will be maintained out of the mainline kernel in an easily -+accessible form. If there is anything cgroup developers can do to -+ease the pain, please feel free to contact us on the cgroup mailing -+list at cgroups@vger.kernel.org. -+ -+ -+4. References -+ -+[1] http://lkml.kernel.org/r/20160105164834.GE5995@mtj.duckdns.org -+ [PATCH 1/2] sched: Misc preps for cgroup unified hierarchy interface -+ Tejun Heo -+ -+[2] http://lkml.kernel.org/r/20160105164852.GF5995@mtj.duckdns.org -+ [PATCH 2/2] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo -+ -+[3] http://lkml.kernel.org/r/1438641689-14655-4-git-send-email-tj@kernel.org -+ [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Tejun Heo -+ -+[4] http://lkml.kernel.org/r/20160407064549.GH3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Peter Zijlstra -+ -+[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt -+ Control Group v2 -+ Tejun Heo -+ -+[6] http://lkml.kernel.org/r/CAPM31RJNy3jgG=DYe6GO=wyL4BPPxwUm1f2S6YXacQmo7viFZA@mail.gmail.com -+ Re: [PATCH 3/3] sched: Implement interface for cgroup unified hierarchy -+ Paul Turner -+ -+[7] http://lkml.kernel.org/r/20160105154503.GC5995@mtj.duckdns.org -+ [RFD] cgroup: thread granularity support for cpu controller -+ Tejun Heo -+ -+[8] http://lkml.kernel.org/r/1457710888-31182-1-git-send-email-tj@kernel.org -+ [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP -+ Tejun Heo -+ -+[9] http://lkml.kernel.org/r/20160311160522.GA24046@htj.duckdns.org -+ Example program for PRIO_RGRP -+ Tejun Heo -+ -+[10] http://lkml.kernel.org/r/20160407082810.GN3430@twins.programming.kicks-ass.net -+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource -+ Peter Zijlstra diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md deleted file mode 100644 index b454e14801..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md +++ /dev/null @@ -1,21 +0,0 @@ -Patches for CPU Controller on Control Group v2 -=============================================== - -See Tejun Heo's [explanation][1] for why these patches are currently -out-of-tree. - -Generating the patches ------------------------ - -In a linux checkout, with remote tc-cgroup pointing to -git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git, your -nixpkgs checkout in the same directory as your linux checkout (or -modify the command accordingly), and setting `ver` to the appropriate -version: - -```shell -$ ver=4.7 -$ git log --reverse --patch v$ver..remotes/tc-cgroup/cgroup-v2-cpu-v$ver > ../nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/$ver.patch -``` - -[1]: https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix deleted file mode 100644 index 5bef5633aa..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - ents = builtins.readDir ./.; -in builtins.listToAttrs (builtins.filter (x: x != null) (map (name: let - match = builtins.match "(.*)\\.patch" name; -in if match == null then null else { - name = builtins.head match; - value = { - name = "cpu-cgroup-v2-${name}"; - patch = ./. + "/${name}"; - }; -}) (builtins.attrNames ents))) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index a21890a38c..df67005dd8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -25,6 +25,10 @@ # Additional make flags passed to kbuild , extraMakeFlags ? [] +, # enables the options in ./common-config.nix; if `false` then only + # `structuredExtraConfig` is used + enableCommonConfig ? true + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -131,8 +135,6 @@ let platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; - # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.linux-kernel.target; makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags; @@ -183,7 +185,9 @@ let moduleStructuredConfig = (lib.evalModules { modules = [ module + ] ++ lib.optionals enableCommonConfig [ { settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; } + ] ++ [ { settings = structuredExtraConfig; _file = "structuredExtraConfig"; } ] ++ structuredConfigFromPatches 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 a02bc35821..d8f8bb2fa7 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 @@ -2,71 +2,81 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.326-hardened1.patch", - "sha256": "08jq0v7i5aghynscvhv3v3sgqbd2yyn6daqc9qg9cw02lxmvnjzz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.326-hardened1/linux-hardened-4.14.326-hardened1.patch" + "name": "linux-hardened-4.14.328-hardened1.patch", + "sha256": "1qq2l4nwhxgl4drx6isc1ly892kffjq4hqb4zadqs6sxvsdm7x57", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.328-hardened1/linux-hardened-4.14.328-hardened1.patch" }, - "sha256": "0y0lvzidw775mgx211wnc1c6223iqv8amz5y9jkz9h7l3l7y8p2m", - "version": "4.14.326" + "sha256": "1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x", + "version": "4.14.328" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.295-hardened1.patch", - "sha256": "0jfsbg8b3h1swb46p4lnsc0b5z8b5j9jjy2fi8fy0762v4g7ps7c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.295-hardened1/linux-hardened-4.19.295-hardened1.patch" + "name": "linux-hardened-4.19.297-hardened1.patch", + "sha256": "1qj09bynl7ml880xpc2956jn0b1gmm77yf3jc45v3jq3610jhna4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.297-hardened1/linux-hardened-4.19.297-hardened1.patch" }, - "sha256": "1b1qslpk1kka7nxam48s22xsqd9qmp716hmibgfsjxl5y3jc4cmp", - "version": "4.19.295" + "sha256": "0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx", + "version": "4.19.297" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.197-hardened1.patch", - "sha256": "0h0yarjpc2syg2rdp7ipz0cr466mgm85ii8y5g0dbj9wkflrl54g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.197-hardened1/linux-hardened-5.10.197-hardened1.patch" + "name": "linux-hardened-5.10.199-hardened1.patch", + "sha256": "10vwd5wygfnxpbz15bq56pjygba3vqqal0d7xry2bch4p444pp5f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.199-hardened1/linux-hardened-5.10.199-hardened1.patch" }, - "sha256": "1awkm7lln5gf6kld9z5h4mg39bd778jsdswwlwb7iv7bn03lafhq", - "version": "5.10.197" + "sha256": "1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0", + "version": "5.10.199" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.134-hardened1.patch", - "sha256": "1q8vfffiwp3zwrjh7r8q4yn9hybswfl41kz4s97jckf90x84xj8d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.134-hardened1/linux-hardened-5.15.134-hardened1.patch" + "name": "linux-hardened-5.15.137-hardened1.patch", + "sha256": "19gs1w380qgvazwjwhxypizpfx71faa7hsji0x5cgyw6vxhi6l1b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.137-hardened1/linux-hardened-5.15.137-hardened1.patch" }, - "sha256": "1lxra3h8pq41hdr1acazwcqk6r8alv9p840ys19nivaprfp84wgk", - "version": "5.15.134" + "sha256": "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp", + "version": "5.15.137" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.257-hardened1.patch", - "sha256": "0kf0s69yl9xwnmjk312gphj9fsz1jxcfivwhg10hdvw3cfhjq2dn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.257-hardened1/linux-hardened-5.4.257-hardened1.patch" + "name": "linux-hardened-5.4.259-hardened1.patch", + "sha256": "1w8ipflgisd127gmx6wyz8p5qfi8cfd2a5j2xgibspkf45nzfwi8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.259-hardened1/linux-hardened-5.4.259-hardened1.patch" }, - "sha256": "1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf", - "version": "5.4.257" + "sha256": "195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz", + "version": "5.4.259" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.56-hardened1.patch", - "sha256": "01j6qi94wr8bm1vnyw8108as94xiwa92vhh860b4gk71msz7carg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.56-hardened1/linux-hardened-6.1.56-hardened1.patch" + "name": "linux-hardened-6.1.61-hardened1.patch", + "sha256": "0d9zhh32dx1q828q50kmznmsa6yinppbklhgg8ix7b7k23857ha6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.61-hardened1/linux-hardened-6.1.61-hardened1.patch" }, - "sha256": "1327in80nl0ghbjignjsdw0w5crj4d06d5fivj4q6af26bggvply", - "version": "6.1.56" + "sha256": "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d", + "version": "6.1.61" + }, + "6.4": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.4.16-hardened1.patch", + "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" + }, + "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", + "version": "6.4.16" }, "6.5": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.5.6-hardened1.patch", - "sha256": "12xvphbs2i9a262117lfxs9gz0ckfspdv74y5jjkjbmw5gx26fgg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.6-hardened1/linux-hardened-6.5.6-hardened1.patch" + "name": "linux-hardened-6.5.10-hardened1.patch", + "sha256": "0p2lj7ryiizr1sxvm2kgds3l8sg9fns35y2fcyqq61lg7ymzj1fi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.10-hardened1/linux-hardened-6.5.10-hardened1.patch" }, - "sha256": "1xnjjm50ks18ifrp36md2p2xca4lw160y57j9p152w2l2i16vqvq", - "version": "6.5.6" + "sha256": "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1", + "version": "6.5.10" } } 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 d99acc2f11..94ab60aa67 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 @@ -1,38 +1,38 @@ { "testing": { - "version": "6.6-rc5", - "hash": "sha256:19hnqly7ins0ycirjwrp3g0am43h2i62qfd1y81yhiy1dpyhbbc9" + "version": "6.7-rc1", + "hash": "sha256:1a071vvmm08sp48d0arqzcmqnz5xdb1vflfhxcqwmpzaabjrgadk" }, "6.5": { - "version": "6.5.6", - "hash": "sha256:1xnjjm50ks18ifrp36md2p2xca4lw160y57j9p152w2l2i16vqvq" - }, - "6.4": { - "version": "6.4.16", - "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" + "version": "6.5.11", + "hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif" }, "6.1": { - "version": "6.1.56", - "hash": "sha256:1327in80nl0ghbjignjsdw0w5crj4d06d5fivj4q6af26bggvply" + "version": "6.1.62", + "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" }, "5.15": { - "version": "5.15.134", - "hash": "sha256:1lxra3h8pq41hdr1acazwcqk6r8alv9p840ys19nivaprfp84wgk" + "version": "5.15.138", + "hash": "sha256:1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g" }, "5.10": { - "version": "5.10.197", - "hash": "sha256:1awkm7lln5gf6kld9z5h4mg39bd778jsdswwlwb7iv7bn03lafhq" + "version": "5.10.200", + "hash": "sha256:012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx" }, "5.4": { - "version": "5.4.257", - "hash": "sha256:1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf" + "version": "5.4.260", + "hash": "sha256:1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q" }, "4.19": { - "version": "4.19.295", - "hash": "sha256:1b1qslpk1kka7nxam48s22xsqd9qmp716hmibgfsjxl5y3jc4cmp" + "version": "4.19.298", + "hash": "sha256:0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x" }, "4.14": { - "version": "4.14.326", - "hash": "sha256:0y0lvzidw775mgx211wnc1c6223iqv8amz5y9jkz9h7l3l7y8p2m" + "version": "4.14.329", + "hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny" + }, + "6.6": { + "version": "6.6.1", + "hash": "sha256:0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix deleted file mode 100644 index 69bbdf648d..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args: - -buildLinux (args // rec { - version = "4.14.180-176"; - - # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.180"; - - # branchVersion needs to be x.y. - extraMeta.branch = "4.14"; - - src = fetchFromGitHub { - owner = "hardkernel"; - repo = "linux"; - rev = version; - sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v"; - }; - - kernelPatches = args.kernelPatches ++ [{ - name = "usbip-tools-fno-common"; - patch = fetchurl { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a"; - hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4="; - }; - }]; - - defconfig = "odroidxu4_defconfig"; - - # This extraConfig is (only) required because the gator module fails to build as-is. - extraConfig = '' - - GATOR n - - # This attempted fix applies correctly but does not fix the build. - #GATOR_MALI_MIDGARD_PATH ${src}/drivers/gpu/arm/midgard - - '' + (args.extraConfig or ""); - - extraMeta.platforms = [ "armv7l-linux" ]; - -} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index ef020b7eb5..9cf5f46cfb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19408"; - sha256 = "1bfpzdfd7k859ids5d5ixzn36c7f62gh2lw6gv4szwakw032gh9i"; + rev = "19441"; + sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 249f89a449..65ca352b53 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.194-rt95"; # updated by ./update-rt.sh + version = "5.10.199-rt97"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394"; + sha256 = "1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "02p01a9jpv92v0dfg6hj90wcrgy3sqjpaadrw44mnsqk4q5ndh70"; + sha256 = "13k7md0a63q4r5vqqvbszmg3kzp5np0hdaj1siyl4yvs9j78d03s"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 0050e77bb5..bc45a86905 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.133-rt69"; # updated by ./update-rt.sh + version = "5.15.137-rt71"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1paxzzcagc7s8i491zjny43rxhfamafyly438kj8hyw96iwmx17g"; + sha256 = "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0iikbpb1wcf7fm18j230cd4p4cksr0k6041c8w0gvznws8mr3dww"; + sha256 = "11zk02ni3b0l1wwrfvyc1q92bd9as61hwgbwlj42xv5gbpd39jlw"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index f45926020b..85c8a8b8a1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.54-rt15"; # updated by ./update-rt.sh + version = "6.1.59-rt16"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; + sha256 = "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ihdid1ihg26kjini66j87vh4220gl8xm9dai7zignha2zh238kh"; + sha256 = "1cmgw6a8zlj89172mp85lxaksz1pvc155mj2fq59l1ry35gwb5q7"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 0763ffda26..c58c4e67e4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -6,27 +6,32 @@ # bcachefs-tools stores the expected-revision in: # https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision # but this does not means that it'll be the latest-compatible revision -, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832" -, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw=" +, currentCommit ? "4d2faeb4fb58c389dc9f76b8d5ae991ef4497e04" +, diffHash ? "sha256-DtMc8P4lTRzvS6PVvD7WtWEPsfnxIXSpqMsKKWs+edI=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... } @ args: - # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - version = "${kernel.version}-bcachefs-unstable-${commitDate}"; - extraMeta = { - branch = "master"; - broken = stdenv.isAarch64; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius ]; - }; + argsOverride = { + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; + modDirVersion = kernel.modDirVersion; + + extraMeta = { + homepage = "https://bcachefs.org/"; + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; + }; + } // argsOverride; structuredExtraConfig = with lib.kernel; { BCACHEFS_FS = module; BCACHEFS_QUOTA = option yes; BCACHEFS_POSIX_ACL = option yes; + # useful for bug reports + FTRACE = option yes; }; kernelPatches = [ { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index d5b67b5efb..2ba31fbc97 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod +, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools , fetchpatch }: @@ -120,10 +120,6 @@ let # Ensure that depmod gets resolved through PATH sed -i Makefile -e 's|= /sbin/depmod|= depmod|' - # fixup for pre-5.4 kernels using the $(cd $foo && /bin/pwd) pattern - # FIXME: remove when no longer needed - substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd - # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. # This way kernels can be bit-by-bit reproducible depending on settings # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). @@ -368,8 +364,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ] - ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ubootTools ] ++ optional (lib.versionOlder version "5.8") libelf ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] 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 ab3b4e5606..5d4ebc214d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -44,8 +44,6 @@ patch = ./modinst-arg-list-too-long.patch; }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - hardened = let mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in { name = lib.removeSuffix ".patch" src.name; 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 843ec92b7c..691b4899f2 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 @@ -2,15 +2,18 @@ let # These names are how they are designated in https://xanmod.org. + + # NOTE: When updating these, please also take a look at the changes done to + # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.55"; - hash = "sha256-kmiMbzH1hyteicjk1WfCQPYhLsVAbl1t5LJ83rUNZ1k="; + version = "6.1.62"; + hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw="; variant = "lts"; }; mainVariant = { - version = "6.5.5"; - hash = "sha256-XjSuhZ5ooXOVllKc29Pd+PlOK6OtcgVMVFzxOx5nkIw="; + version = "6.5.11"; + hash = "sha256-1bb5LG6JvqX5eNSe2Xyu86HxaqkUVkKUf1H3T7bFkGE="; variant = "main"; }; @@ -26,27 +29,16 @@ let }; structuredExtraConfig = with lib.kernel; { - # AMD P-state driver - X86_AMD_PSTATE = lib.mkOverride 60 yes; - # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; - - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; - # Preemptive Full Tickless Kernel at 500Hz - HZ = freeform "500"; - HZ_500 = yes; + # Preemptive Full Tickless Kernel at 250Hz + HZ = freeform "250"; + HZ_250 = yes; HZ_1000 = no; }; 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 fc97aee3f1..456a6c7c27 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 @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.5.6"; #zen - suffix = "zen2"; #zen - sha256 = "0q7zk9r8qp88sg6h9kig1f55h5xl0wyp13d57cpi5s5xa8w3l8wa"; #zen + version = "6.6.1"; #zen + suffix = "zen1"; #zen + sha256 = "13m820wggf6pkp351w06mdn2lfcwbn08ydwksyxilqb88vmr0lpq"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.6"; #lqx - suffix = "lqx1"; #lqx - sha256 = "0c409zh6rlrf8c3lr1ci55h0k6lh6ncc4hfv6p50q321czpgfnc6"; #lqx + version = "6.5.11"; #lqx + suffix = "lqx2"; #lqx + sha256 = "0rak2ald95bwb5qlp8pf2g93a0gkv8rypiv5s8dpds3cilwmxrg9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix index 36128a081a..3a044cf9d8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - hash = "sha256-cfgWoNOr46uotGMZrlyhR+eno4QBs/XiYgJfTcCMR10="; + hash = "sha256-1nOilPdC1ZNoIi/1w4Ri2BCYxVBjeZ3m+4p7o9SvBDY="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index 0843ca3556..3f971e7a6e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "30"; + version = "31"; # autogen.sh is missing from the release tarball, # and we need to run it to regenerate gtk_doc.make, @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/.gitignore?id=61a93a043aa52ad62a11ba940d4ba93cb3254e78 src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/snapshot/kmod-${version}.tar.gz"; - sha256 = "sha256-/dih2LoqgRrAsVdHRwld28T8pXgqnzapnQhqkXnxbbc="; + hash = "sha256-FNR015/AoYBbi7Eb1M2TXH3yxUuddKICCu+ot10CdeQ="; }; outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix index 0d14661354..4762b63eda 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmscon/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "KMS/DRM based System Console"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; + homepage = "https://www.freedesktop.org/wiki/Software/kmscon/"; license = licenses.mit; maintainers = with maintainers; [ omasanori ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch new file mode 100644 index 0000000000..2b4b35774d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch @@ -0,0 +1,38 @@ +From 592de67191a3969fcccef6293740c7142793d461 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Wed, 1 Nov 2023 21:54:05 +0100 +Subject: [PATCH] skip installing example configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This requires root if prefix dir is pointed to /etc, +which we cannot do in nix builds. + +Signed-off-by: Jörg Thalheim +--- + meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 5f5935f..8373013 100644 +--- a/meson.build ++++ b/meson.build +@@ -114,10 +114,10 @@ else + runstatedir = rundir + endif + +-install_data( +- sources: 'ksmbd.conf.example', +- install_dir: get_option('sysconfdir') / 'ksmbd', +-) ++#install_data( ++# sources: 'ksmbd.conf.example', ++# install_dir: get_option('sysconfdir') / 'ksmbd', ++#) + + systemdsystemunitdir = get_option('systemdsystemunitdir') + if systemdsystemunitdir == '' +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix index 6813e773a9..4098f6c222 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, autoconf -, automake +, meson +, ninja , glib , libkrb5 , libnl @@ -13,22 +13,23 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.9"; + version = "3.5.0"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk="; + sha256 = "sha256-8mjfKCazigHnuN7Egf11ZuD+nQx7ZTesn0a4LsVvV/M="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - preConfigure = "./autogen.sh"; - - configureFlags = lib.optional withKerberos "--enable-krb5"; + nativeBuildInputs = [ meson ninja libtool pkg-config ]; + patches = [ ./0001-skip-installing-example-configuration.patch ]; + mesonFlags = [ + "-Drundir=/run" + "--sysconfdir /etc" + ]; meta = with lib; { description = "Userspace utilities for the ksmbd kernel SMB server"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix index fe5535eea8..a409ad2fbf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.5"; + version = "0.0.9"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "v${version}-prerelease"; - sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; + rev = "v${version}-prerelese"; + hash = "sha256-P4vqzNX2nF4LnoQDOV8WEiXAICQCyjj9xPpFNvMu93k="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -19,15 +19,22 @@ python3.pkgs.buildPythonApplication rec { pyqt5 argcomplete pyyaml + darkdetect xorg.libxcb libsForQt5.qtbase ]; - postInstall = '' - cp -r ./{legion.py,legion_cli.py,legion_gui.py} $out/${python3.sitePackages} - cp ./legion_logo.png $out/${python3.sitePackages}/legion_logo.png + postPatch = '' + substituteInPlace ./setup.cfg \ + --replace "_VERSION" "${version}" + substituteInPlace ../../extra/service/fancurve-set \ + --replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" + substituteInPlace ./legion_linux/legion.py \ + --replace "/etc/legion_linux" "$out/share/legion_linux" + ''; - rm -rf $out/data + postInstall = '' + cp ./legion_linux/legion_logo.png $out/${python3.sitePackages}/legion_logo.png ''; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix index c9eea70db9..5248c263b3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postBuild = lib.optionalString (pythonSupport) '' cd python - ${python.pythonForBuild.interpreter} setup.py install --prefix=../pythonlib + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=../pythonlib cd - ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix index fa7af44298..129bb49e81 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix @@ -11,27 +11,34 @@ , stdenv , swig , systemd +, fetchpatch # ImportError: cannot import name 'mlog' from 'mesonbuild' , withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.4"; + version = "1.6"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; src = fetchFromGitHub { owner = "linux-nvme"; repo = "libnvme"; - rev = "v${version}"; - sha256 = "sha256-8DlEQ4LH6UhIHr0znJGqkuCosLHqA6hkJjmiCawNE1k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7bvjsmt16/6RycSDKIECtJ4ES7NTaspU6IMpUw0sViA="; }; + patches = [ + # included in next release + (fetchpatch { + url = "https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1.patch"; + hash = "sha256-IUjPUBmGQC4oAKFFlBrjonqD2YdyNPC9siK4t/t2slE="; + }) + ]; + postPatch = '' - patchShebangs meson-vcs-tag.sh - chmod +x doc/kernel-doc-check - patchShebangs doc/kernel-doc doc/kernel-doc-check doc/list-man-pages.sh + patchShebangs scripts ''; nativeBuildInputs = [ @@ -39,7 +46,7 @@ stdenv.mkDerivation rec { ninja perl # for kernel-doc pkg-config - python3.pythonForBuild + python3.pythonOnBuildForHost swig ]; @@ -53,6 +60,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=man" + (lib.mesonBool "tests" finalAttrs.doCheck) (lib.mesonBool "docs-build" withDocs) ]; @@ -60,13 +68,14 @@ stdenv.mkDerivation rec { export KBUILD_BUILD_TIMESTAMP="$(date -u -d @$SOURCE_DATE_EPOCH)" ''; - doCheck = true; + # mocked ioctl conflicts with the musl one: https://github.com/NixOS/nixpkgs/pull/263768#issuecomment-1782877974 + doCheck = !stdenv.hostPlatform.isMusl; meta = with lib; { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; - maintainers = [ maintainers.fogti ]; + maintainers = with maintainers; [ fogti vifino ]; license = with licenses; [ lgpl21Plus ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix index ec6d3f5aa4..695012effc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=y" ] ++ optionals enablePython [ - "PYTHON=${python3.pythonForBuild.interpreter}" + "PYTHON=${python3.pythonOnBuildForHost.interpreter}" "PYTHONLIBDIR=$(py)/${python3.sitePackages}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index 471882ae1b..01607be58f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "linux-wifi-hotspot"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "lakinduakash"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCVJPEAZZzOGCf45oo1J7wWtYn/IJfcASHnKR+R0Ge4="; + sha256 = "sha256-u9OdSpdxnjHOrK6PP/SFvGRtezssoZSoJFGVdRbOIPU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix index 70d84d6311..96477c5f44 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://linuxcontainers.org/lxcfs/news/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index b58d471680..de51beb2cc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20230808"; + version = "20231114"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-xyb4FUV7vG2YSuN4H6eBaf8c4At70NZiUuepbgg2HNg="; + hash = "sha256-cZ7APDjwjarPCzk1HWxqIXdGwNOl6HG0KSCtffmEhx0="; }; nativeBuildInputs = [ iucode-tool libarchive ]; @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.intel.com/"; + homepage = "https://www.intel.com/"; + changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix index 41e3547a78..5eea877803 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix @@ -84,6 +84,17 @@ kaem.runCommand "${pname}-${version}" { "-e" (builtins.toFile "bash-builder.sh" '' export CONFIG_SHELL=$SHELL + + # Normalize the NIX_BUILD_CORES variable. The value might be 0, which + # means that we're supposed to try and auto-detect the number of + # available CPU cores at run-time. We don't have nproc to detect the + # number of available CPU cores so default to 1 if not set. + NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}" + if [ $NIX_BUILD_CORES -le 0 ]; then + NIX_BUILD_CORES=1 + fi + export NIX_BUILD_CORES + bash -eux $buildCommandPath '') ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix index 35c4da7acf..86fa3a5868 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -54,6 +54,17 @@ bootBash.runCommand "${pname}-${version}" { "-e" (builtins.toFile "bash-builder.sh" '' export CONFIG_SHELL=$SHELL + + # Normalize the NIX_BUILD_CORES variable. The value might be 0, which + # means that we're supposed to try and auto-detect the number of + # available CPU cores at run-time. + NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}" + if ((NIX_BUILD_CORES <= 0)); then + guess=$(nproc 2>/dev/null || true) + ((NIX_BUILD_CORES = guess <= 0 ? 1 : guess)) + fi + export NIX_BUILD_CORES + bash -eux $buildCommandPath '') ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix index eb4fe9bcf9..9d7480d239 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix @@ -6,7 +6,7 @@ , gnupatch }: let - pname = "coreutils"; + pname = "bootstrap-coreutils"; version = "5.0"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix index dece020a5e..14584e0a7e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix @@ -12,7 +12,7 @@ , gzip }: let - pname = "coreutils"; + pname = "bootstrap-coreutils-musl"; version = "9.4"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 11b7f5b11a..a246b587dd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -24,14 +24,12 @@ lib.makeScope }; binutils = callPackage ./binutils { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; }; bzip2 = callPackage ./bzip2 { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; @@ -53,7 +51,6 @@ lib.makeScope }; findutils = callPackage ./findutils { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix index d6a6560e01..ea9fdaf885 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix @@ -130,11 +130,12 @@ bash.runCommand "${pname}-${version}" { --disable-libmpx \ --disable-libsanitizer \ --disable-lto \ - --disable-multilib + --disable-multilib \ + --disable-plugin # Build make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix index f8a7d2126b..fba3b731a0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix @@ -126,11 +126,12 @@ bash.runCommand "${pname}-${version}" { --disable-bootstrap \ --disable-libsanitizer \ --disable-lto \ - --disable-multilib + --disable-multilib \ + --disable-plugin # Build make -j $NIX_BUILD_CORES # Install - make -j $NIX_BUILD_CORES install + make -j $NIX_BUILD_CORES install-strip '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index a0663c9dbe..7f2e8ab81a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -1,13 +1,12 @@ -{ +{ hostPlatform }: rec { - name = "stage0-posix-${version}-${rev}-source"; - # Pinned from https://github.com/oriansj/stage0-posix/commit/3189b5f325b7ef8b88e3edec7c1cde4fce73c76c - version = "unstable-2023-05-02"; - rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c"; + name = "stage0-posix-${version}-source"; + version = "1.6.0"; + rev = "Release_${version}"; outputHashAlgo = "sha256"; - outputHash = "sha256-7Y9+csTwZIQp0WGbagX+Q4f2zavN7AUk1TSBp/H5Xks="; + outputHash = "sha256-epUaShjKiAd749ICvc6rS6WhUkS8R4heKuPdwUjEtsQ="; /* Since `make-minimal-bootstrap-sources` requires nixpkgs and nix it @@ -65,7 +64,7 @@ rec { */ minimal-bootstrap-sources = derivation { inherit name; - system = builtins.currentSystem; + system = hostPlatform.system; outputHashMode = "recursive"; inherit outputHashAlgo outputHash; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix index 381902cd2c..6cc7cddb82 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix @@ -12,12 +12,13 @@ # { lib +, hostPlatform , fetchFromGitHub , fetchpatch }: let - expected = import ./bootstrap-sources.nix { }; + expected = import ./bootstrap-sources.nix { inherit hostPlatform; }; in fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index 58ceb7404b..0fea46da56 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2023-08-07"; + version = "unstable-2023-10-10"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "613495ecaca97a19fa7f8f3ea23306472b36453c"; - sha256 = "zOjm/YDxqU6bu6GMyQTuzuZbrCfaU4FBodRWLb8GTdE="; + passthru.rev = "b5ca140312d279ad2f22068fd72a6230eea13436"; + sha256 = "QU4r8eajrrhT6u6WHEf1xtB1iyecBeHxu4vS+QcwAgM="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix new file mode 100644 index 0000000000..6e29e27ccb --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mstflint_access/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, kernel, kmod, mstflint }: + +stdenv.mkDerivation rec { + pname = "mstflint_access"; + inherit (mstflint) version; + + src = fetchurl { + url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; + hash = "sha256-rfZts0m8x6clVazpbAa2xK+dYgRU9Us5rbcWa0uHJ1M="; + }; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KVER=${kernel.modDirVersion}" + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + preConfigure = lib.optionals (lib.versionAtLeast kernel.version "6.4") '' + sed -i "s/class_create(THIS_MODULE, dev->name)/class_create(dev->name)/g" mst_main.c + ''; + + installPhase = '' + runHook preInstall + + install -D ${pname}.ko $out/lib/modules/${kernel.modDirVersion}/extra/${pname}.ko + + runHook postInstall + ''; + + meta = with lib; { + description = "A kernel module for Nvidia NIC firmware update"; + homepage = "https://github.com/Mellanox/mstflint"; + license = [ licenses.gpl2Only ]; + maintainers = with maintainers; [ thillux ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix new file mode 100644 index 0000000000..493d0e6af1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nct6687d/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, kernel +}: + +stdenv.mkDerivation rec { + pname = "nct6687d"; + version = "unstable-2023-09-22"; + + src = fetchFromGitHub { + owner = "Fred78290"; + repo = "nct6687d"; + rev = "cdfe855342a9383a9c4c918d51576c36d989070d"; + hash = "sha256-iOLWxj4I6oYkNXFSkmw7meTQEnrIfb4Mw+/LkzgzDxM="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI"; + license = with licenses; [ gpl2Only ]; + homepage = "https://github.com/Fred78290/nct6687d/"; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix index e84d6aa6ac..4482170d34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nftables/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { - version = "1.0.8"; + version = "1.0.9"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-k3N0DeQagtvJiBjgpGoHP664qNBon6T6GnQ5nDK/PVA="; + hash = "sha256-o8MEzZugYSOe4EdPmvuTipu5nYm5YCRvZvDDoKheFM0="; }; nativeBuildInputs = [ @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ++ lib.optional withXtables "--with-xtables"; passthru.tests = { - inherit (nixosTests) firewall-nftables lxd-nftables; + inherit (nixosTests) firewall-nftables; + lxd-nftables = nixosTests.lxd.nftables; nat = { inherit (nixosTests.nat.nftables) firewall standalone; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild new file mode 100644 index 0000000000..84e8d223bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild @@ -0,0 +1,165 @@ +#!/usr/bin/env bash + +# We're faking a `nix build` command-line to re-use Nix's own completion +# for the few options passed through to Nix. +_nixos-rebuild_pretend-nix() { + COMP_LINE="nix build ${COMP_LINE}" + # number of prepended chars + (( COMP_POINT = COMP_POINT + 10)) + + COMP_WORDS=( + nix build + "${COMP_WORDS[@]}" + ) + # Add the amount of prepended words + (( COMP_CWORD = COMP_CWORD + 2)) + _complete_nix "nix" +} + +_nixos-rebuild() { + local curr="$2" + local prev="$3" + local subcommandGiven=0 + local word + local subcommand + + __load_completion nix + + # Arrays are re-ordered by the completion, so it's fine to sort them in logical chunks + local all_args=( + --verbose -v + + # nixos-rebuild options + --fast + --no-build-nix + --profile-name -p # name + --rollback + --specialisation -c # name + --use-remote-sudo + --build-host # host + --target-host # host + # Used with list-generations + --json + + # generation switching options + --install-bootloader + + # nix-channel options + --upgrade + --upgrade-all + + # flakes options + --commit-lock-file + --flake # flake-uri + --override-input # input-name flake-uri + --recreate-lock-file + --update-input + --no-flake + --no-registries + --no-update-lock-file + --no-write-lock-file + + # Nix-copy options + --use-substitutes --substitute-on-destination -s + + # Nix options + --option + --impure + --builders # builder-spec + --show-trace + --keep-failed -K + --keep-going -k + --max-jobs -j # number + --log-format # format + -I # NIX_PATH + ) + + local all_subcommands=( + boot + build + build-vm + build-vm-with-bootloader + dry-activate + dry-build + edit + list-generations + switch + test + ) + + # Suggest arguments that can be consumed under some conditions only + for word in "${COMP_WORDS[@]}"; do + for subcommand in "${all_subcommands[@]}"; do + if [[ "$word" == "$subcommand" ]]; then + subcommandGiven=1 + fi + done + done + + # Fake out a way to complete the second arg to some options + case "${COMP_WORDS[COMP_CWORD-2]}" in + "--override-input") + prev="--override-input_2" + ;; + "--option") + prev="--option_2" + ;; + esac + + case "$prev" in + --max-jobs|-j) + COMPREPLY=( ) + ;; + + --profile-name|-p) + if [[ "$curr" == "" ]]; then + COMPREPLY=( /nix/var/nix/profiles/* ) + else + COMPREPLY=( "$curr"* ) + fi + ;; + + --build-host|--target-host|-t|-h) + _known_hosts_real "$curr" + ;; + + --specialisation|-c) + COMPREPLY=() + ;; + + -I) + _nixos-rebuild_pretend-nix + ;; + --builders) + _nixos-rebuild_pretend-nix + ;; + --flake) + _nixos-rebuild_pretend-nix + ;; + --override-input) + _nixos-rebuild_pretend-nix + ;; + --override-input_2) + _nixos-rebuild_pretend-nix + ;; + --log-format) + _nixos-rebuild_pretend-nix + ;; + --option) + _nixos-rebuild_pretend-nix + ;; + --option_2) + _nixos-rebuild_pretend-nix + ;; + + *) + if [[ "$curr" == -* ]] || (( subcommandGiven )); then + COMPREPLY=( $(compgen -W "${all_args[*]}" -- "$2") ) + else + COMPREPLY=( $(compgen -W "${all_subcommands[*]}" -- "$2") ) + fi + ;; + esac +} + +complete -F _nixos-rebuild nixos-rebuild diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix index c6ec086679..6c150b1b8c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -28,10 +28,14 @@ substituteAll { ]; postInstall = '' installManPage ${./nixos-rebuild.8} + + installShellCompletion \ + --bash ${./_nixos-rebuild} ''; # run some a simple installer tests to make sure nixos-rebuild still works for them passthru.tests = { + install-bootloader = nixosTests.nixos-rebuild-install-bootloader; simple-installer = nixosTests.installer.simple; specialisations = nixosTests.nixos-rebuild-specialisations; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index b0ff5b0a67..d947361b3b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -421,6 +421,14 @@ nixpkgs=./my-nixpkgs Additional options to be passed to .Ic ssh on the command line. +.Ed +. +.It Ev NIXOS_SWITCH_USE_DIRTY_ENV +Expose the the current environment variables to post activation scripts. Will +skip usage of +.Ic systemd-run +during system activation. Possibly dangerous, specially in remote environments +(e.g.: via SSH). Will be removed in the future. .El . . diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 2f89642845..dddae8da20 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -117,11 +117,11 @@ while [ "$#" -gt 0 ]; do specialisation="$1" shift 1 ;; - --build-host|h) + --build-host) buildHost="$1" shift 1 ;; - --target-host|t) + --target-host) targetHost="$1" shift 1 ;; @@ -653,18 +653,54 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then - if [[ -z "$specialisation" ]]; then - cmd="$pathToConfig/bin/switch-to-configuration" + # Using systemd-run here to protect against PTY failures/network + # disconnections during rebuild. + # See: https://github.com/NixOS/nixpkgs/issues/39118 + cmd=( + "systemd-run" + "-E" "LOCALE_ARCHIVE" # Will be set to new value early in switch-to-configuration script, but interpreter starts out with old value + "-E" "NIXOS_INSTALL_BOOTLOADER" + "--collect" + "--no-ask-password" + "--pty" + "--quiet" + "--same-dir" + "--service-type=exec" + "--unit=nixos-rebuild-switch-to-configuration" + "--wait" + ) + # Check if we have a working systemd-run. In chroot environments we may have + # a non-working systemd, so we fallback to not using systemd-run. + # You may also want to explicitly set NIXOS_SWITCH_USE_DIRTY_ENV environment + # variable, since systemd-run runs inside an isolated environment and + # this may break some post-switch scripts. However keep in mind that this + # may be dangerous in remote access (e.g. SSH). + if [[ -n "$NIXOS_SWITCH_USE_DIRTY_ENV" ]]; then + log "warning: skipping systemd-run since NIXOS_SWITCH_USE_DIRTY_ENV is set. This environment variable will be ignored in the future" + cmd=() + elif ! targetHostCmd "${cmd[@]}" true &>/dev/null; then + logVerbose "Skipping systemd-run to switch configuration since it is not working in target host." + cmd=( + "env" + "-i" + "LOCALE_ARCHIVE=$LOCALE_ARCHIVE" + "NIXOS_INSTALL_BOOTLOADER=$NIXOS_INSTALL_BOOTLOADER" + ) else - cmd="$pathToConfig/specialisation/$specialisation/bin/switch-to-configuration" + logVerbose "Using systemd-run to switch configuration." + fi + if [[ -z "$specialisation" ]]; then + cmd+=("$pathToConfig/bin/switch-to-configuration") + else + cmd+=("$pathToConfig/specialisation/$specialisation/bin/switch-to-configuration") - if [[ ! -f "$cmd" ]]; then + if [[ ! -f "${cmd[-1]}" ]]; then log "error: specialisation not found: $specialisation" exit 1 fi fi - if ! targetHostCmd "$cmd" "$action"; then + if ! targetHostCmd "${cmd[@]}" "$action"; then log "warning: error(s) occurred while switching to the new configuration" exit 1 fi 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 da26a13c40..81590a6f86 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix @@ -7,16 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "nsncd"; - version = "unstable-2022-11-14"; + version = "unstable-2023-10-26"; + # https://github.com/twosigma/nsncd/pull/71 has not been upstreamed + # to twosigma/nsncd yet. Using the nix-community fork in the + # meantime. src = fetchFromGitHub { owner = "nix-community"; repo = "nsncd"; - rev = "47e580f1db99603df6e212a2e62f18cc970cef40"; - hash = "sha256-Nv3MYZcuYgD66BAGs3Tg37s086HAGsaDBFvELqQF3Tk="; + rev = "d6513421f420e407248c6d0aee39ae2f861a7cec"; + hash = "sha256-PykzwpPxMDHJOr2HubXuw+Krk9Jbi0E3M2lEAOXhx2M="; }; - cargoSha256 = "sha256-c1L6nEUBHw1YegmoRrI3WU/bF80Nzbz13hsGlNyBR9o="; + cargoSha256 = "sha256-cUM7rYXWpJ0aMiurXBp15IlxAmf/x5uiodxEqBPCQT0="; meta = with lib; { description = "the name service non-caching daemon"; @@ -25,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/twosigma/nsncd"; license = licenses.asl20; - maintainers = with maintainers; [ flokli ninjatrappeur ]; + maintainers = with maintainers; [ flokli picnoir ]; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix index ad0138f18b..f4995264b0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix @@ -16,12 +16,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/intel/numatop/pull/54.patch"; + # https://github.com/intel/numatop/pull/54 + url = "https://github.com/intel/numatop/compare/eab0ac5253c5843aa0f0ac36e2eec7612207711b...c1001fd926c24eae2d40729492e07270ce133b72.patch"; sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; name = "fix-string-operations.patch"; }) (fetchpatch { - url = "https://github.com/intel/numatop/pull/64.patch"; + # https://github.com/intel/numatop/pull/64 + url = "https://github.com/intel/numatop/commit/635e2ce2ccb1ac793cc276a7fcb8a92b1ffefa5d.patch"; sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; name = "fix-format-strings-mvwprintw.patch"; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index b7824f2097..fbb116ab42 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup unpackManually() { 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 73987fa5bd..7fec21a823 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 @@ -27,49 +27,43 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.113.01"; - sha256_64bit = "sha256-KOME2N/oG39en2BAS/OMYvyjVXjZdSLjxwoOjyMWdIE="; - sha256_aarch64 = "sha256-mw/p5ELGTNcM4P94soJIGqpLMBJHSPf+z9qsGnISuCk="; - openSha256 = "sha256-SePRFb5S2T0pOmkSGflYfJkJBjG3Dx/Z0MjwnWccfcI="; - settingsSha256 = "sha256-hiX5Nc4JhiYYt0jaRgQzfnmlEQikQjuO0kHnqGdDa04="; - persistencedSha256 = "sha256-V5Wu8a7EhwZarGsflAhEQDE9s9PjuQ3JNMU1nWvNNsQ="; + version = "535.129.03"; + sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4="; + sha256_aarch64 = "sha256-i6jZYUV6JBvN+Rt21v4vNstHPIu9sC+2ZQpiLOLoWzM="; + openSha256 = "sha256-/Hxod/LQ4CGZN1B1GRpgE/xgoYlkPpMh+n8L7tmxwjs="; + settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk="; + persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; }; latest = selectHighestVersion production (generic { - version = "530.41.03"; - sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE="; - sha256_aarch64 = "sha256-uM5zMEO/AO32VmqUOzmc05FFm/lz76jPSSaQmeZUlFo="; - openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g="; - settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; - persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; + version = "545.29.02"; + sha256_64bit = "sha256-RncPlaSjhvBFUCOzWdXSE3PAfRPCIrWAXyJMdLPKuIU="; + sha256_aarch64 = "sha256-Y2RDOuDtiIclr06gmLrPDfE5VFmFamXxiIIKtKAewro="; + openSha256 = "sha256-PukpOBtG5KvZKWYfJHVQO6SuToJUd/rkjpOlEi8pSmk="; + settingsSha256 = "sha256-zj173HCZJaxAbVV/A2sbJ9IPdT1+3yrwyxD+AQdkSD8="; + persistencedSha256 = "sha256-mmMi2pfwzI1WYOffMVdD0N1HfbswTGg7o57x9/IiyVU="; patchFlags = [ "-p1" "-d" "kernel" ]; - patches = [ - # source: https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c - (fetchpatch { - url = "https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c/raw/688b612624945926676de28059fe749203b4b549/nvidia-470xx-fix-linux-6.4.patch"; - hash = "sha256-OyRmezyzqAi7mSJHDjsWQVocSsgJPTW5DvHDFVNX7Dk="; - }) - ]; + patches = []; }); beta = selectHighestVersion latest (generic { - version = "535.43.02"; - sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM="; - sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4="; - openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM="; - settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc="; - persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4="; + version = "545.23.06"; + sha256_64bit = "sha256-QTnTKAGfcvKvKHik0BgAemV3PrRqRlM3B9jjZeupCC8="; + sha256_aarch64 = "sha256-qkVP6AiXNoRTqgqPvs/AfErEq8BTQw25rtJ6GS06JTM="; + openSha256 = "sha256-m7D5LZdhFCZYAIbhrgZ0pN2z19LsU3I3Q7qsKX7Z6mM="; + settingsSha256 = "sha256-+X6gDeU8Qlvprb05aB2quM55y0zEcBXtb65e3Rq9gKg="; + persistencedSha256 = "sha256-RQJAIwPqOUI5FB3uf0/Y4K/iwFfoLpU1/+BOK/KF5VA="; }); # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.11"; + version = "535.43.16"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-cL/gnPNqjsj8ZYJP4WmybS2Fnh6EHsUbi4nGlt6Bt00="; - openSha256 = "sha256-QzNRwXk6c5iTJD0YGKAlW1swF/PBW/7LFnkllkBEhUU="; + sha256_64bit = "sha256-c93CJSMPlGZgk+jhp9zTHCKSZ0LdnJu+ifLo+qMvIIk="; + openSha256 = "sha256-509KaBavGIOOpzdrdJuAR1PYq91Clwo8n+nhruxO1wM="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; @@ -93,25 +87,14 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.199.02"; - sha256_64bit = "sha256-/fggDt8RzjLDW0JiGjr4aV4RGnfEKL8MTTQ4tCjXaP0="; - sha256_aarch64 = "sha256-UmF7LszdrO2d+bOaoQYrTVKXUwDqzMy1UDBW5SPuZy4="; - settingsSha256 = "sha256-FkKPE4QV5IiVizGYUNUYoEXRpEhojt/cbH/I8iCn3hw="; - persistencedSha256 = "sha256-JP71wt3uCNOgheLNlQbW3DqVFQNTC5vj4y4COWKQzAs="; + version = "470.223.02"; + sha256_64bit = "sha256-s2hi1TNsw+br6Ow6tPiFsYPaJY8d+x4FrkBrP2xNRPg="; + sha256_aarch64 = "sha256-CFkg2ARlGWqlFQKm8SlbwMH6eLidHKA/q5QGVOpPGuU="; + settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0="; + persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc="; patchFlags = [ "-p1" "-d" "kernel" ]; - patches = [ - # source: https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba - (fetchpatch { - url = "https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba/raw/37ff2b5ccf99f295ff958c9a44ca4ed4f42503b4/nvidia-470xx-fix-linux-6.5.patch"; - hash = "sha256-s5r7nwuMva0BLy2qJBVKqNtnUN9am5+PptnVwNdzdbk="; - }) - # source: https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35 - (fetchpatch { - url = "https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35/raw/615feaefed2de3a28bd12fe9783894b84a7c86e4/nvidia-470xx-fix-linux-6.6.patch"; - hash = "sha256-gdV+a+JFzQX8MzRz9eb4gVbnOfTWN+Ds9sOeyIBN5y0="; - }) - ]; + patches = []; }; # Last one supporting x86 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index 0b801d4b27..b11dc06c85 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation { url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch"; hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak="; }) - ++ lib.optional (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + ++ lib.optional + ((lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + && (lib.versionOlder nvidia_x11.settingsVersion "545.29")) (fetchpatch { # fix wayland support for compositors that use wl_output version 4 url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index d267a12266..e0d0372fd6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,18 +4,19 @@ , libnvme , json_c , zlib +, libhugetlbfs , python3Packages }: stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.4"; + version = "2.6"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-vnhvVVfEDnmEIdIkfTRoiLB7dZ1rJV3U4PmUUoaxTUs="; + hash = "sha256-MFyBkwTNOBQdHWj7In1OquRIAsjsd4/DHYfUyFA9YDQ="; }; mesonFlags = [ @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libnvme json_c zlib + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [ + libhugetlbfs ]; meta = with lib; { @@ -47,7 +50,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 vifino ]; mainProgram = "nvme"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 40ef0796df..61a27bd51f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-KPO9xqLgPML6smoO7P50yP81b4iCvRFIR74ciUiva7o="; + sha256 = "sha256-bWlm+JYNf7+faKSQfW5fhxoH/D2I8ujjakswH+1r49o="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix index 5c8cd9efc9..7ac560824d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.41.0.0_DPDK_22.11"; + version = "1.42.0.0_DPDK_22.11"; src = fetchurl { url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; - hash = "sha256-4p+R+7IeDKQFqBzQTvXfR407exxhoS8pnKxF9Qnr8tw="; + hash = "sha256-qtdqYE4+ab6/9Z0YXXCItcfj+3+gyprcNMAnAZkl4GA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 34f9b15794..ed2c60da26 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/lib diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix index b16bebbe3d..a35f40be59 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext, audit, libxcrypt +{ lib, stdenv, buildPackages, fetchurl +, fetchpatch +, flex, cracklib, db4, gettext, audit, libxcrypt , nixosTests +, autoreconfHook269, pkg-config-unwrapped }: stdenv.mkDerivation rec { @@ -11,12 +14,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; - patches = [ ./suid-wrapper-path.patch ]; + patches = [ + ./suid-wrapper-path.patch + # Pull support for localization on non-default --prefix: + # https://github.com/NixOS/nixpkgs/issues/249010 + # https://github.com/linux-pam/linux-pam/pull/604 + (fetchpatch { + name = "bind-locales.patch"; + url = "https://github.com/linux-pam/linux-pam/commit/77bd338125cde583ecdfb9fd69619bcd2baf15c2.patch"; + hash = "sha256-tlc9RcLZpEH315NFD4sdN9yOco8qhC6+bszl4OHm+AI="; + }) + ]; outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ flex ] + # autoreconfHook269 is needed for `suid-wrapper-path.patch` and + # `bind-locales.patch` above. + # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` + nativeBuildInputs = [ flex autoreconfHook269 pkg-config-unwrapped ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ cracklib db4 libxcrypt ] diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch index 71533c51a1..a427ccf388 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -1,6 +1,6 @@ It needs the SUID version during runtime, and that can't be in /nix/store/** ---- a/modules/pam_unix/Makefile.in -+++ b/modules/pam_unix/Makefile.in -@@ -651 +651 @@ +--- a/modules/pam_unix/Makefile.am ++++ b/modules/pam_unix/Makefile.am +@@ -21 +21 @@ - -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ + -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mktemp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mktemp/default.nix new file mode 100644 index 0000000000..04ba58785e --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mktemp/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pam +, e2fsprogs +}: + +stdenv.mkDerivation rec { + pname = "pam_mktemp"; + version = "1.1.1"; + + src = fetchurl { + url = "https://openwall.com/pam/modules/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-Zs+AwYQ5yjRW25ZALy7qwUsaBQPMHRvn8rFtXwefPz0="; + }; + + patches = [ + (fetchpatch { + name = "inherit_private_prefix_from_home.patch"; + url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=3d2e8ad6da6a44c047bf7a8afa1e1bb2a6e36a55"; + hash = "sha256-xe44fi2xH9jqlStlIR4QPB0KS7spflRdOsvNPEmxJpU"; + }) + (fetchpatch { + name = "allow_private_prefix_to_be_stricter.patch"; + url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=bb2cee0c695d22310e5364c30d74bccb0dbf3205"; + hash = "sha256-TouysUVlNnl+m7lJ2VKPxUTYD2om1Jh5FEJ6NHMAI4U="; + }) + ]; + + patchFlags = "-p2"; + + dontConfigure = true; + + buildInputs = [ pam e2fsprogs ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.openwall.com/pam/"; + description = "PAM for login service to provide per-user private directories"; + license = licenses.bsd0; + maintainers = with maintainers; [ wladmis ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix index 8970f7ed62..0a7e02f4ad 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_p11/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { patches = [ # fix with openssl 3.x + # https://github.com/OpenSC/pam_p11/pull/22 (fetchpatch { - url = "https://github.com/OpenSC/pam_p11/pull/22.patch"; + name = "OpenSC-pam_p11-pull-22.patch"; + url = "https://github.com/OpenSC/pam_p11/compare/cd4eba2e921e1c2f93cde71922a76af99376246c...debd4f7acfaf998cfe4002e0be5c35ad9a9591b5.patch"; excludes = [ ".github/build.sh" ]; hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE="; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix index ae08f59cc1..e81f42b65a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { wrapGAppsNoGuiHook python3.pkgs.wrapPython # checkInput but cheked for during the configuring - (python3.pythonForBuild.withPackages (ps: with ps; [ + (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ pygobject3 dbus-python python-dbusmock 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 001162608c..314a95bd55 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 @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.0.0-54570"; + version = "19.1.1-54734"; # 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-y7UC+E5i2cxkOJ9nVI6aQAFJ5kTXv9uaZoMO4/SCS6k="; + hash = "sha256-02YxBkV9pZGfXuK6GvUDTgE9U5H2MOMk24h9qGJdFTM="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix index 67b839a1bd..56a92ffa44 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-RRiz56r9NOwH0AY9JQ/UdJmbILIAIYw65W9dIRPxQbQ="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + ./v3-CVE-2023-4016.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # NOTE: Starting from 4.x we will not need a patch anymore, but need to add # "--disable-w" to configureFlags instead to prevent the utmp errors (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch new file mode 100644 index 0000000000..2e260eaf73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch @@ -0,0 +1,63 @@ +This is https://gitlab.com/procps-ng/procps/-/commit/2c933ecba3bb1d3041a5a7a53a7b4078a6003413.diff +back-ported to procps 3.3.17. That commit changes xmalloc to xcalloc. This patch differs in two ways: + +* We modify it to change malloc (no x-) to xcalloc instead +* We pull in procps-4's definition of xcalloc + +Alternative considered: Also pull in commits that changed malloc to xmalloc and defined xcalloc. +This alternative is rejected because those commits contain many other unrelated changes. + +diff --git a/ps/parser.c b/ps/parser.c +index 4263a1fb..ee9a57d9 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -36,6 +36,14 @@ + #include "common.h" + #include "c.h" + ++static void *xxcalloc(const size_t nelems, const size_t size) ++{ ++ void *ret = calloc(nelems, size); ++ if (!ret && size && nelems) ++ xerrx(EXIT_FAILURE, "cannot allocate %zu bytes", nelems*size); ++ return ret; ++} ++ + #define ARG_GNU 0 + #define ARG_END 1 + #define ARG_PGRP 2 +@@ -184,7 +192,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + const char *err; /* error code that could or did happen */ + /*** prepare to operate ***/ + node = malloc(sizeof(selection_node)); +- node->u = malloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */ + node->n = 0; + buf = strdup(arg); + /*** sanity check and count items ***/ +@@ -205,6 +212,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + } while (*++walk); + if(need_item) goto parse_error; + node->n = items; ++ node->u = xxcalloc(items, sizeof(sel_union)); + /*** actually parse the list ***/ + walk = buf; + while(items--){ +@@ -1031,15 +1039,15 @@ static const char *parse_trailing_pids(void){ + thisarg = ps_argc - 1; /* we must be at the end now */ + + pidnode = malloc(sizeof(selection_node)); +- pidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ pidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + pidnode->n = 0; + + grpnode = malloc(sizeof(selection_node)); +- grpnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ grpnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + grpnode->n = 0; + + sidnode = malloc(sizeof(selection_node)); +- sidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ sidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + sidnode->n = 0; + + while(i--){ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix index ecb0fe535d..0477985cc1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/projecteur/default.nix @@ -1,24 +1,39 @@ -{ lib, mkDerivation, fetchFromGitHub, - cmake, pkg-config, - qtbase, qtgraphicaleffects, wrapQtAppsHook }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, qtbase +, qtgraphicaleffects +, wrapQtAppsHook +}: + mkDerivation rec { pname = "projecteur"; - version = "0.9.2"; + version = "0.10"; src = fetchFromGitHub { owner = "jahnf"; repo = "Projecteur"; rev = "v${version}"; fetchSubmodules = false; - sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg="; + hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A="; }; postPatch = '' sed '1i#include ' -i src/device.h # gcc12 ''; - buildInputs = [ qtbase qtgraphicaleffects ]; - nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ]; + buildInputs = [ + qtbase + qtgraphicaleffects + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}" @@ -26,11 +41,12 @@ mkDerivation rec { "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ]; - meta = with lib; { + meta = { description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)."; homepage = "https://github.com/jahnf/Projecteur"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ benneti ]; + license = lib.licenses.mit; + mainProgram = "projecteur"; + maintainers = with lib.maintainers; [ benneti drupol ]; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 6fc6e0012b..5b627ea903 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.19.11"; + version = "0.22.3"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; + hash = "sha256-HLQxmBlzTdsOAMqfc4taoMM+V2G5novMsbc1drZlNGg="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix index 30f8da7d5f..4517cb29e7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/r8125/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.004.01"; + version = "9.011.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "0h2y4mzydhc7var5281bk2jj1knig6i64k11ii4b94az3g9dbq24"; + sha256 = "sha256-QV1DKkWVtqcnuqgAdJnPpj6Z6ch+lw61zpouXKlyfqQ="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix index 6185bf9912..8e3a9b0ceb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "rt-tests"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-LzN3YB3Lb7tjyEplrFaNYtiGwHUUTztZBsMrUndd2cU="; + sha256 = "sha256-apRJwRqcyzfmyGCCv5BDN92pKP3Nafa9SkxlZ+Bxrm0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index ecfd6a87e6..a4fc11c864 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation { pname = "rtl8188eus-aircrack"; - version = "${kernel.version}-unstable-2022-03-19"; + version = "${kernel.version}-unstable-2023-09-21"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8188eus"; - rev = "0958f294f90b49d6bad4972b14f90676e5d858d3"; - sha256 = "sha256-dkCcwvOLxqU1IZ/OXTp67akjWgsaH1Cq4N8d9slMRI8="; + rev = "3fae7237ba121f1169e9a2ea55040dc123697d3b"; + sha256 = "sha256-ILSMEt9nMdg1ZbFeatWm8Yxf6a/E7Vm7KtKhN933KTc="; }; prePatch = '' @@ -18,13 +18,6 @@ stdenv.mkDerivation { --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - patches = [ - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/daa3a2e12290050be3af956915939a55aed50d5f.patch"; - hash = "sha256-VsvaAhO74LzqUxbmdDT9qwVl6Y9lXfGfrHHK3SbnOVA="; - }) - ]; - hardeningDisable = [ "pic" ]; enableParallelBuilding = true; @@ -40,6 +33,6 @@ stdenv.mkDerivation { homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; maintainers = with maintainers; [ fortuneteller2k ]; - broken = (lib.versionAtLeast kernel.version "5.17") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + broken = (lib.versionAtLeast kernel.version "6.6") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix index 2775b18018..73b098894b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-07-23"; + version = "${kernel.version}-unstable-2023-09-24"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "83db18e610845df9434a628ca3feb9004296b307"; - sha256 = "sha256-as3S7WQkug3suJ5ovUbRu/UzO5GDrGLdgkiWrCrvztk="; + rev = "888ba1b309e6258a736ef5c37a68836cd0ea5517"; + sha256 = "sha256-oLRGRKUNTmIw+Zn23TArGumo24AIH2YEMpnStyXBNw8="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix index 9204121a8c..0744ed2896 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-n/LHFv14aDLbobeamOgDYBml1DgSGJmfmg/qff78i4c="; + sha256 = "sha256-Lqq4LNRmqQyeIJfr/+tYdKMEk+P54VnwZAQZcE0ev8Y="; }; nativeBuildInputs = [ pciutils cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Adjust power management settings for Ryzen Mobile Processors."; homepage = "https://github.com/FlyGoat/RyzenAdj"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rhendric ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix index 746f9b17a6..38fec65b33 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo="; + hash = "sha256-DzPPnttnJSOMQwXWyFcz6fEtjwBC3p2PpZpBAQ/Ew18="; }; outputs = [ "out" "su" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index 96a3ace57d..62db758c7a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -5,21 +5,21 @@ libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit, nss_wrapper, ncurses, Po4a, http-parser, jansson, jose, docbook_xsl, docbook_xml_dtd_44, - nixosTests, + testers, nix-update-script, nixosTests, withSudo ? false }: let docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sssd"; - version = "2.9.1"; + version = "2.9.3"; src = fetchFromGitHub { owner = "SSSD"; - repo = pname; - rev = version; - sha256 = "sha256-OafSo28MN92py33foE8oMkPUmV9WUUOkKWJgm0i7MJU="; + repo = "sssd"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-WTVOt2TpTCyMmFYzWJMBQdwgmov7m1Sd8CwyL4ywPUY="; }; postPatch = '' @@ -96,14 +96,23 @@ stdenv.mkDerivation rec { done ''; - passthru.tests = { inherit (nixosTests) sssd sssd-ldap; }; + passthru = { + tests = { + inherit (nixosTests) sssd sssd-ldap; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "sssd --version"; + }; + }; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "System Security Services Daemon"; homepage = "https://sssd.io/"; - changelog = "https://sssd.io/release-notes/sssd-${version}.html"; + changelog = "https://sssd.io/release-notes/sssd-${finalAttrs.version}.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ illustris ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch new file mode 100644 index 0000000000..dd9af6738c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 1 Sep 2023 09:57:02 +0200 +Subject: [PATCH] systemctl-edit: suggest `systemdctl edit --runtime` on system + scope + +This is a NixOS-specific change. When trying to modify a unit with +`systemctl edit` on NixOS, it'll fail with "Read-only file system": + + $ systemctl edit libvirtd + Failed to open "/etc/systemd/system/libvirtd.service.d/.#override.conffa9825a0c9a249eb": Read-only file system + +This is because `/etc/systemd/system` is a symlink into the store. In +fact, I'd consider this a feature rather than a bug since this ensures I +don't introduce state imperatively. + +However, people wrongly assume that it's not possible to edit units +ad-hoc and re-deploy their system for quick&dirty debugging where this +would be absolutely fine (and doable with `--runtime` which adds a +transient and non-persistent unit override in `/run`). + +To make sure that people learn about it quicker, this patch +throws an error which suggests using `--runtime` when running +`systemctl edit` on the system scope. + +For the user scope this isn't needed because user-level unit overrides +are written into `$XDG_CONFIG_HOME/systemd/user`. +--- + src/systemctl/systemctl-edit.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c +index e3f25d52d5..81c9c6f6b7 100644 +--- a/src/systemctl/systemctl-edit.c ++++ b/src/systemctl/systemctl-edit.c +@@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) { + sd_bus *bus; + int r; + ++ if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM) ++ return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead."); ++ + if (!on_tty()) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units if not on a tty."); + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index d96a6882d6..0311d46d1f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -124,7 +124,7 @@ , withRemote ? !stdenv.hostPlatform.isMusl , withResolved ? true , withShellCompletions ? true -, withSysusers ? false # conflicts with the NixOS user management +, withSysusers ? true , withSysupdate ? true , withTimedated ? true , withTimesyncd ? true @@ -134,6 +134,8 @@ , withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false + # build only libudev and libsystemd +, buildLibsOnly ? false # name argument , pname ? "systemd" @@ -201,6 +203,15 @@ stdenv.mkDerivation (finalAttrs: { ./0016-inherit-systemd-environment-when-calling-generators.patch ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch + ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch + + # Fix for `RuntimeError: ELF .dynamic section is missing.` + # https://github.com/systemd/systemd/issues/29381 + # https://github.com/systemd/systemd/pull/29392 + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch"; + hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -371,7 +382,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh ''; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); nativeBuildInputs = [ @@ -435,7 +446,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ])) ; - #dontAddPrefix = true; + mesonBuildType = "release"; mesonFlags = [ "-Dversion-tag=${version}" @@ -481,7 +492,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dportabled=${lib.boolToString withPortabled}" "-Dhwdb=${lib.boolToString withHwdb}" "-Dremote=${lib.boolToString withRemote}" - "-Dsysusers=false" "-Dtimedated=${lib.boolToString withTimedated}" "-Dtimesyncd=${lib.boolToString withTimesyncd}" "-Duserdb=${lib.boolToString withUserDb}" @@ -697,7 +707,9 @@ stdenv.mkDerivation (finalAttrs: { export DESTDIR=/ ''; - postInstall = '' + mesonInstallTags = lib.optionals buildLibsOnly [ "devel" "libudev" "libsystemd" ]; + + postInstall = lib.optionalString (!buildLibsOnly) '' mkdir -p $out/example/systemd mv $out/lib/{binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd @@ -715,8 +727,10 @@ stdenv.mkDerivation (finalAttrs: { find $out -name "*kernel-install*" -exec rm {} \; '' + lib.optionalString (!withDocumentation) '' rm -rf $out/share/doc - '' + lib.optionalString withKmod '' + '' + lib.optionalString (withKmod && !buildLibsOnly) '' mv $out/lib/modules-load.d $out/example + '' + lib.optionalString withSysusers '' + mv $out/lib/sysusers.d $out/example ''; # Avoid *.EFI binary stripping. At least on aarch64-linux strip @@ -740,7 +754,7 @@ stdenv.mkDerivation (finalAttrs: { # To cross compile a derivation that builds a UKI with ukify, we need to wrap # ukify with the correct binutils. When wrapping, no splicing happens so we # have to explicitly pull binutils from targetPackages. - wrapProgram $out/lib/systemd/ukify --set PATH ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] } + wrapProgram $out/lib/systemd/ukify --prefix PATH : ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }:${placeholder "out"}/lib/systemd ''; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) @@ -773,6 +787,6 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; - maintainers = with maintainers; [ flokli kloenk mic92 ]; + maintainers = with maintainers; [ flokli kloenk ]; }; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix index 86964ab4d3..ecbec75fd8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-DUaSLv1V6skWXQ7aqD62uspq+I9KiWmjlwwxykVve5A="; + hash = "sha256-mt4YQ0iB/Mlnm+o9sGgYVEdbxjF7qArxA5FIK4MAZ8M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix index 381a150066..f6bb705258 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/targetcli/default.nix @@ -1,14 +1,14 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.56"; + version = "2.1.57"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - hash = "sha256-sWLwjfuy9WPnrGK0BxUGnNrhtGDoQyRFMY1OSlyxqs4="; + hash = "sha256-7JRNHKku9zTeSafL327hkM/E5EWTKqwPudCfmngvWuo="; }; propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ]; @@ -18,6 +18,10 @@ python3.pkgs.buildPythonApplication rec { install -D targetclid.8 -t $out/share/man/man8/ ''; + passthru.tests = { + inherit (nixosTests) iscsi-root; + }; + meta = with lib; { description = "A command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/targetcli-fb"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix index af04476aa1..9c97377cfe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tomb/default.nix @@ -1,19 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, gettext, zsh, pinentry, cryptsetup, gnupg, util-linux, e2fsprogs, sudo +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, makeWrapper +, zsh +, coreutils +, cryptsetup +, e2fsprogs +, file +, gawk +, getent +, gettext +, gnugrep +, gnupg +, libargon2 +, lsof +, pinentry +, util-linux +, nix-update-script }: stdenv.mkDerivation rec { pname = "tomb"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { - owner = "dyne"; - repo = "Tomb"; - rev = "v${version}"; - sha256 = "0d6vmfcf4kd0p2bcljmdnyc2fmbwvar81cc472zx86r7yc3ih102"; + owner = "dyne"; + repo = "Tomb"; + rev = "refs/tags/v${version}"; + hash = "sha256-lLxQJX0P6b6lbXEcrq45EsX9iKiayZ9XkhqgMfpN3/w="; }; - buildInputs = [ sudo zsh pinentry ]; + buildInputs = [ zsh pinentry ]; nativeBuildInputs = [ makeWrapper ]; @@ -23,22 +41,39 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - doInstallCheck = true; - installCheckPhase = "$out/bin/tomb -h"; - installPhase = '' - install -Dm755 tomb $out/bin/tomb + install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry util-linux e2fsprogs ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils + cryptsetup + e2fsprogs + file + gawk + getent + gettext + gnugrep + gnupg + libargon2 + lsof + pinentry + util-linux + ]} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "File encryption on GNU/Linux"; - homepage = "https://www.dyne.org/software/tomb/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + homepage = "https://www.dyne.org/software/tomb/"; + changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md"; + license = licenses.gpl3Only; + mainProgram = "tomb"; + maintainers = with maintainers; [ peterhoeg anthonyroussel ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix index 09a2d8bf63..e0ab2b2802 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/trinity/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "trinity"; - version = "1.9"; + version = "1.9-unstable-2023-07-10"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "v${version}"; - sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; + rev = "e71872454d26baf37ae1d12e9b04a73d64179555"; + hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps="; }; - patches = [ - # Pull upstream fix for -fno-common toolchains - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch"; - sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg"; - }) - ]; - postPatch = '' patchShebangs configure patchShebangs scripts @@ -27,12 +18,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; + installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { description = "A Linux System call fuzz tester"; - homepage = "https://codemonkey.org.uk/projects/trinity/"; - license = licenses.gpl2; + homepage = "https://github.com/kernelslacker/trinity"; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix index c9fb057da6..04c1518aab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix @@ -9,21 +9,21 @@ let src = fetchFromGitHub { owner = "AaronErhardt"; repo = "tuxedo-rs"; - rev = "a77a9f6c64e6dd1ede3511934392cbc16271ef6b"; - hash = "sha256-bk17vI1gLHayvCWfmZdCMqgmbJFOTDaaCaHcj9cLpMY="; + rev = "74b863e6dcb1ec2e6c8fb02c16bb6f23b59e67f6"; + hash = "sha256-Yujki2vGzaT8Ze5Usk8FPg8bn86MvyyPTiWuWwEw7Xs="; }; in rustPlatform.buildRustPackage { pname = "tuxedo-rs"; - version = "0.2.2"; + version = "0.2.3"; inherit src; # Some of the tests are impure and rely on files in /etc/tailord doCheck = false; - cargoHash = "sha256-vuXqab9W8NSD5U9dk15xM4fM/vd/fGgGdsvReMncWHg="; + cargoHash = "sha256-uYt442u/BIzw/lBu18LrsJf5D46oUOFzBJ5pUjCpK6w="; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix index 19ac7fcd42..fe01cecc8c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,39 +1,73 @@ -{ appimageTools, lib, fetchurl }: +{ lib +, stdenvNoCC +, fetchurl +, appimageTools +, electron +, makeWrapper +, asar +, autoPatchelfHook +, libusb1 +}: + let pname = "uhk-agent"; - version = "3.0.2"; + version = "3.2.0"; + src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-RrZ2J6bmk8VXVmpUi9bjqQRJBYjGIczMaSEG9aQ4U4I="; + sha256 = "sha256-YMm84jKtWz5DeGJhBlmo2hlIy4iarEvWylgAWY/itII="; }; appimageContents = appimageTools.extract { name = "${pname}-${version}"; inherit src; }; -in appimageTools.wrapType2 { +in +stdenvNoCC.mkDerivation { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ polkit udev ]; + dontUnpack = true; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + nativeBuildInputs = [ + asar + makeWrapper + autoPatchelfHook + ]; - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - install -m 644 -D ${appimageContents}/resources/rules/50-uhk60.rules $out/rules/50-uhk60.rules - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + buildInputs = [ + libusb1 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out"/{opt,share/applications} + + cp -r --no-preserve=mode "${appimageContents}/resources" "$out/opt/${pname}" + cp -r --no-preserve=mode "${appimageContents}/usr/share/icons" "$out/share/icons" + cp -r --no-preserve=mode "${appimageContents}/${pname}.desktop" "$out/share/applications/${pname}.desktop" + + substituteInPlace "$out/share/applications/${pname}.desktop" \ + --replace "Exec=AppRun" "Exec=${pname}" + + asar extract "$out/opt/${pname}/app.asar" "$out/opt/${pname}/app.asar.unpacked" + rm "$out/opt/${pname}/app.asar" + + makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ + --add-flags "$out/opt/${pname}/app.asar.unpacked" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + runHook postInstall ''; - # wrapType2 does not passthru pname+version - passthru.version = version; meta = with lib; { description = "Agent is the configuration application of the Ultimate Hacking Keyboard"; homepage = "https://github.com/UltimateHackingKeyboard/agent"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ ngiger ]; + maintainers = with maintainers; [ ngiger nickcao ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix index bcb7799731..1b68c46b65 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-udev-rules/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' runHook preInstall - install -D -m 644 ${uhk-agent.out}/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules + install -D -m 644 ${uhk-agent.out}/opt/uhk-agent/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index a002e1af88..36d8a3b9c4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -24,7 +24,7 @@ , libimobiledevice , withDocs ? withIntrospection , mesonEmulatorHook -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix index 20936fa7d4..cfd94bf33c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "015"; + version = "017"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - sha256 = "sha256-w7RRux9P+fY1bKxaaVaprI6F2BZRr1ainmiflPpv2m4="; + hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch new file mode 100644 index 0000000000..068744d4f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch @@ -0,0 +1,277 @@ +commit 68564ebb50f8afab5a9527c534417e247cca0b27 +Author: Filipe Manana +Date: Thu Aug 17 10:20:13 2023 +0100 + + libmount: Fix regression when mounting with atime + + A regression was introduced in v2.39 that causes mounting with the atime + option to fail: + + $ mkfs.ext4 -F /dev/sdi + $ mount -o atime /dev/sdi /mnt/sdi + mount: /mnt/sdi: not mount point or bad option. + dmesg(1) may have more information after failed mount system call. + + The failure comes from the mount_setattr(2) call returning -EINVAL. This + is because we pass an invalid value for the attr_clr argument. From a + strace capture we have: + + mount_setattr(4, "", AT_EMPTY_PATH, {attr_set=0, attr_clr=MOUNT_ATTR_NOATIME, propagation=0 /* MS_??? */, userns_fd=0}, 32) = -1 EINVAL (Invalid argument) + + We can't pass MOUNT_ATTR_NOATIME to mount_setattr(2) through the attr_clr + argument because all atime options are exclusive, so in order to set atime + one has to pass MOUNT_ATTR__ATIME to attr_clr and leave attr_set as + MOUNT_ATTR_RELATIME (which is defined as a value of 0). + + This can be read from the man page for mount_setattr(2) and also from the + kernel source: + + $ cat fs/namespace.c + static int build_mount_kattr(const struct mount_attr *attr, size_t usize, + struct mount_kattr *kattr, unsigned int flags) + { + (...) + /* + * Since the MOUNT_ATTR_ values are an enum, not a bitmap, + * users wanting to transition to a different atime setting cannot + * simply specify the atime setting in @attr_set, but must also + * specify MOUNT_ATTR__ATIME in the @attr_clr field. + * So ensure that MOUNT_ATTR__ATIME can't be partially set in + * @attr_clr and that @attr_set can't have any atime bits set if + * MOUNT_ATTR__ATIME isn't set in @attr_clr. + */ + if (attr->attr_clr & MOUNT_ATTR__ATIME) { + if ((attr->attr_clr & MOUNT_ATTR__ATIME) != MOUNT_ATTR__ATIME) + return -EINVAL; + + /* + * Clear all previous time settings as they are mutually + * exclusive. + */ + kattr->attr_clr |= MNT_RELATIME | MNT_NOATIME; + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: + kattr->attr_set |= MNT_RELATIME; + break; + case MOUNT_ATTR_NOATIME: + kattr->attr_set |= MNT_NOATIME; + break; + case MOUNT_ATTR_STRICTATIME: + break; + default: + return -EINVAL; + } + (...) + + So fix this by setting attr_clr MOUNT_ATTR__ATIME if we want to clear any + atime related option. + + Signed-off-by: Filipe Manana + +diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c +index 1e962ec6d..0702adae7 100644 +--- a/libmount/src/optlist.c ++++ b/libmount/src/optlist.c +@@ -875,7 +875,18 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl + + if (opt->ent->mask & MNT_INVERT) { + DBG(OPTLIST, ul_debugobj(ls, " clr: %s", opt->ent->name)); +- *clr |= x; ++ /* ++ * All atime settings are mutually exclusive so *clr must ++ * have MOUNT_ATTR__ATIME set. ++ * ++ * See the function fs/namespace.c:build_mount_kattr() ++ * in the linux kernel source. ++ */ ++ if (x == MOUNT_ATTR_RELATIME || x == MOUNT_ATTR_NOATIME || ++ x == MOUNT_ATTR_STRICTATIME) ++ *clr |= MOUNT_ATTR__ATIME; ++ else ++ *clr |= x; + } else { + DBG(OPTLIST, ul_debugobj(ls, " set: %s", opt->ent->name)); + *set |= x; +diff --git a/tests/expected/libmount/context-mount-flags b/tests/expected/libmount/context-mount-flags +index 960641863..eb71323dd 100644 +--- a/tests/expected/libmount/context-mount-flags ++++ b/tests/expected/libmount/context-mount-flags +@@ -3,3 +3,6 @@ ro,nosuid,noexec + successfully mounted + rw,nosuid,noexec + successfully umounted ++successfully mounted ++rw,relatime ++successfully umounted +diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context +index f5b47185e..a5d2e81a3 100755 +--- a/tests/ts/libmount/context ++++ b/tests/ts/libmount/context +@@ -116,8 +116,15 @@ $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPU + + ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG +-ts_finalize_subtest + ++# Test that the atime option works after the migration to use the new kernel mount APIs. ++ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ ++ts_finalize_subtest + + ts_init_subtest "mount-loopdev" + mkdir -p $MOUNTPOINT &> /dev/null + +commit 1ec71634aa4ef5ddca23d65c8a296f3614231e8a +Author: Colin Gillespie +Date: Wed Aug 9 18:28:07 2023 +1000 + + libblkid: (bcachefs) fix not detecting large superblocks + + Probing does not detect bcachefs filesystems with a superblock larger + than 4KiB. Bcachefs superblocks grow in size and can become much larger + than this. + + Increase the superblock maximum size limit to 1MiB. + + Validate the superblock isn't larger than the maximum size defined in + the superblocks layout section. + + (cherry picked from commit 48d573797797650d96456979797c0155d58f61cb) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 40e702d75..236877042 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -102,6 +102,15 @@ union bcachefs_sb_csum { + uint8_t raw[16]; + } __attribute__((packed)); + ++struct bcachefs_sb_layout { ++ uint8_t magic[16]; ++ uint8_t layout_type; ++ uint8_t sb_max_size_bits; ++ uint8_t nr_superblocks; ++ uint8_t pad[5]; ++ uint64_t sb_offset[61]; ++} __attribute__((packed)); ++ + struct bcachefs_super_block { + union bcachefs_sb_csum csum; + uint16_t version; +@@ -123,7 +132,7 @@ struct bcachefs_super_block { + uint64_t flags[8]; + uint64_t features[2]; + uint64_t compat[2]; +- uint8_t layout[512]; ++ struct bcachefs_sb_layout layout; + struct bcachefs_sb_field _start[]; + } __attribute__((packed)); + +@@ -143,7 +152,7 @@ struct bcachefs_super_block { + /* granularity of offset and length fields within superblock */ + #define BCACHEFS_SECTOR_SIZE 512 + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 4096 ++#define BCACHEFS_SB_MAX_SIZE 0x100000 + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -302,6 +311,9 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); ++ if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ return BLKID_PROBE_NONE; ++ + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + + +commit acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 +Author: Karel Zak +Date: Wed Aug 23 11:53:45 2023 +0200 + + libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] + + Addresses: https://github.com/util-linux/util-linux/pull/2427 + Signed-off-by: Karel Zak + (cherry picked from commit 17873d38fc97913c0a31d4bd08cfbfe45c4de5be) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 236877042..6ab3fe9d4 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -311,7 +311,7 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) + return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + +commit 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f +Author: Thomas Weißschuh +Date: Wed Aug 23 11:58:33 2023 +0200 + + libblkid: (bcachefs) fix size validation + + Avoid signed shift out-of-bounds. + + Also mark the constants explitly as unsigned instead of casting. + + Signed-off-by: Thomas Weißschuh + (cherry picked from commit befe455f59de8c7bc66b85ed52aae8cbc95325fa) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 6ab3fe9d4..28ac4b52b 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -142,17 +142,19 @@ struct bcachefs_super_block { + /* magic string len */ + #define BCACHE_SB_MAGIC_LEN (sizeof(BCACHE_SB_MAGIC) - 1) + /* super block offset */ +-#define BCACHE_SB_OFF 0x1000 ++#define BCACHE_SB_OFF 0x1000U + /* supper block offset in kB */ + #define BCACHE_SB_KBOFF (BCACHE_SB_OFF >> 10) + /* magic string offset within super block */ + #define BCACHE_SB_MAGIC_OFF offsetof(struct bcache_super_block, magic) + /* start of checksummed data within superblock */ +-#define BCACHE_SB_CSUMMED_START 8 ++#define BCACHE_SB_CSUMMED_START 8U + /* granularity of offset and length fields within superblock */ +-#define BCACHEFS_SECTOR_SIZE 512 ++#define BCACHEFS_SECTOR_SIZE 512U ++/* maximum superblock size shift */ ++#define BCACHEFS_SB_MAX_SIZE_SHIFT 0x10U + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 0x100000 ++#define BCACHEFS_SB_MAX_SIZE (1U << BCACHEFS_SB_MAX_SIZE_SHIFT) + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -311,12 +313,16 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) +- return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + ++ if (bcs->layout.sb_max_size_bits > BCACHEFS_SB_MAX_SIZE_SHIFT) ++ return BLKID_PROBE_NONE; ++ ++ if (sb_size > (BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) ++ return BLKID_PROBE_NONE; ++ + sb = blkid_probe_get_sb_buffer(pr, mag, sb_size); + if (!sb) + return BLKID_PROBE_NONE; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index 45c0d57cbf..d710fabb7a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + ./bcachefs-patch-set.patch ]; # We separate some of the utilities into their own outputs. This diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix index aeb6afec24..7c1994687a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "vmware-modules"; - version = "workstation-17.0.2-2023-08-12-${kernel.version}"; + version = "workstation-17.0.2-2023-09-29-${kernel.version}"; src = fetchFromGitHub { owner = "mkubecek"; repo = "vmware-host-modules"; # Developer no longer provides tags for kernel compatibility fixes - # Commit hash for branch workstation-17.0.2 as of 2023-08-12 - rev = "8b2d31498a8df9b1215f407c989b065953b73455"; - sha256 = "sha256-R0nY4O3ASQkOop+ddU4k72HiIJU/aJz0l3lkJN/kuHc="; + # Commit hash for branch workstation-17.0.2 as of 2023-09-29 + rev = "29de7e2bd45d32e6983106d6f15810c70ba3e654"; + hash = "sha256-l0QJbjySINM/7EyNhZl6UnUonwPoGnCnsQeC8YtI15c="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix index fbe5d95e2a..e95506461a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wireless-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "30.pre9"; src = fetchurl { - url = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${version}.tar.gz"; + url = "https://hewlettpackard.github.io/wireless-tools/wireless_tools.${version}.tar.gz"; sha256 = "0qscyd44jmhs4k32ggp107hlym1pcyjzihiai48xs7xzib4wbndb"; }; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ]; meta = { + description = "Wireless tools for Linux"; + homepage = "https://hewlettpackard.github.io/wireless-tools/Tools.html"; platforms = lib.platforms.linux; license = lib.licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix index 41aa909532..8adbb8cab8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/generic.nix @@ -76,22 +76,14 @@ stdenv'.mkDerivation { substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" - # TODO: drop when upgrading to 2.2.0 - ${if isUnstable then '' - substituteInPlace ./contrib/initramfs/Makefile.am \ - --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" - substituteInPlace ./udev/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - '' else '' - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" - - find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \; - - substituteInPlace ./cmd/vdev_id/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ - "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - ''} + substituteInPlace ./contrib/initramfs/Makefile.am \ + --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" + substituteInPlace ./udev/vdev_id \ + --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + substituteInPlace ./config/zfs-build.m4 \ + --replace "bashcompletiondir=/etc/bash_completion.d" \ + "bashcompletiondir=$out/share/bash-completion/completions" ''; nativeBuildInputs = [ autoreconfHook269 nukeReferences ] @@ -138,6 +130,14 @@ stdenv'.mkDerivation { "INSTALL_MOD_PATH=\${out}" ]; + preConfigure = '' + # The kernel module builds some tests during the configurePhase, this envvar controls their parallelism + export TEST_JOBS=$NIX_BUILD_CORES + if [ -z "$enableParallelBuilding" ]; then + export TEST_JOBS=1 + fi + ''; + # Enabling BTF causes zfs to be build with debug symbols. # Since zfs compress kernel modules on installation, our strip hooks skip stripping them. # Hence we strip modules prior to compression. @@ -202,15 +202,15 @@ stdenv'.mkDerivation { changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; - # The case-block for TARGET_CPU has branches for only five CPU families, + # The case-block for TARGET_CPU has branches for only some CPU families, # which prevents ZFS from building on any other platform. Since the NixOS # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS # does not build is the only way to produce a NixOS installer on such # platforms. - # https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16 + # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 platforms = with lib.systems.inspect.patterns; - map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ]; + map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7); maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix index 1a77396300..3e53ba902c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/stable.nix @@ -16,20 +16,13 @@ callPackage ./generic.nix args { if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then linuxKernel.packages.linux_6_5 else linuxKernel.packages.linux_6_1; - extraPatches = [ - # applied in version 2.2.x - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch"; - sha256 = "XEaK227ubfOwlB2s851UvZ6xp/QOtYUWYsKTkEHzmo0="; - }) - ]; # this package should point to the latest release. - version = "2.1.13"; + version = "2.2.0"; - sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; + sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix index 45b7dd6c74..9c7e14c31b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/unstable.nix @@ -12,18 +12,21 @@ in callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.5" + then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM + then linuxKernel.packages.linux_6_5 + else linuxKernel.packages.linux_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.0-rc4"; + version = "2.2.1-unstable-2023-10-21"; + rev = "95785196f26e92d82cf4445654ba84e4a9671c57"; - sha256 = "sha256-zTG6iujlWB2H8j6i+t59zdyztoDFk373AjgHzC8x5mQ="; + sha256 = "sha256-s1sdXSrLu6uSOmjprbUa4cFsE2Vj7JX5i75e4vRnlvg="; isUnstable = true; } diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix index 3a47d3dc84..3cbda3a7eb 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -28,12 +28,19 @@ rec { generate = ...; }); + + Please note that `pkgs` may not always be available for use due to the split + options doc build introduced in fc614c37c653, so lazy evaluation of only the + 'type' field is required. + */ inherit (import ./formats/java-properties/default.nix { inherit lib pkgs; }) javaProperties; + libconfig = (import ./formats/libconfig/default.nix { inherit lib pkgs; }).format; + json = {}: { type = with lib.types; let diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/default.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/default.nix new file mode 100644 index 0000000000..7433a72853 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/default.nix @@ -0,0 +1,121 @@ +{ lib +, pkgs +}: +let + inherit (pkgs) buildPackages callPackage; + # Implementation notes: + # Libconfig spec: https://hyperrealm.github.io/libconfig/libconfig_manual.html + # + # Since libconfig does not allow setting names to start with an underscore, + # this is used as a prefix for both special types and include directives. + # + # The difference between 32bit and 64bit values became optional in libconfig + # 1.5, so we assume 64bit values for all numbers. + + libconfig-generator = buildPackages.rustPlatform.buildRustPackage { + name = "libconfig-generator"; + version = "0.1.0"; + src = ./src; + + passthru.updateScript = ./update.sh; + + cargoLock.lockFile = ./src/Cargo.lock; + }; + + libconfig-validator = buildPackages.runCommandCC "libconfig-validator" + { + buildInputs = with buildPackages; [ libconfig ]; + } + '' + mkdir -p "$out/bin" + $CC -lconfig -x c - -o "$out/bin/libconfig-validator" ${./validator.c} + ''; +in +{ + format = { generator ? libconfig-generator, validator ? libconfig-validator }: { + inherit generator; + + type = with lib.types; + let + valueType = (oneOf [ + bool + int + float + str + path + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "libconfig value"; + }; + in + attrsOf valueType; + + lib = { + mkHex = value: { + _type = "hex"; + inherit value; + }; + mkOctal = value: { + _type = "octal"; + inherit value; + }; + mkFloat = value: { + _type = "float"; + inherit value; + }; + mkArray = value: { + _type = "array"; + inherit value; + }; + mkList = value: { + _type = "list"; + inherit value; + }; + }; + + generate = name: value: + callPackage + ({ + stdenvNoCC + , libconfig-generator + , libconfig-validator + , writeText + }: stdenvNoCC.mkDerivation rec { + inherit name; + + dontUnpack = true; + + json = builtins.toJSON value; + passAsFile = [ "json" ]; + + strictDeps = true; + nativeBuildInputs = [ libconfig-generator ]; + buildPhase = '' + runHook preBuild + libconfig-generator < $jsonPath > output.cfg + runHook postBuild + ''; + + doCheck = true; + nativeCheckInputs = [ libconfig-validator ]; + checkPhase = '' + runHook preCheck + libconfig-validator output.cfg + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mv output.cfg $out + runHook postInstall + ''; + + passthru.json = writeText "${name}.json" json; + }) + { + libconfig-generator = generator; + libconfig-validator = validator; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock new file mode 100644 index 0000000000..f8f921f996 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock @@ -0,0 +1,40 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "libconfig-generator" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "serde" +version = "1.0.183" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" + +[[package]] +name = "serde_json" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +dependencies = [ + "itoa", + "ryu", + "serde", +] diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml new file mode 100644 index 0000000000..20ad44d221 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "libconfig-generator" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +serde = "1.0.178" +serde_json = "1.0.104" diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs new file mode 100644 index 0000000000..4da45f647d --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs @@ -0,0 +1,271 @@ +use serde_json::Value; +use std::mem::discriminant; + +#[derive(Debug)] +enum LibConfigIntNumber { + Oct(i64), + Hex(i64), + Int(i64), +} + +#[derive(Debug)] +enum LibConfigValue { + Bool(bool), + Int(LibConfigIntNumber), + Float(f64), + String(String), + Array(Vec), + List(Vec), + Group(Vec, Vec<(String, LibConfigValue)>), +} + +fn validate_setting_name(key: &str) -> bool { + let first_char = key.chars().next().expect("Empty setting name"); + (first_char.is_alphabetic() || first_char == '*') + && key[1..] + .chars() + .all(|c| c.is_alphanumeric() || c == '_' || c == '*') +} + +const SPECIAL_TYPES: [&str; 5] = ["octal", "hex", "float", "list", "array"]; + +fn object_is_special_type(o: &serde_json::Map) -> Option<&str> { + o.get("_type").and_then(|x| x.as_str()).and_then(|x| { + if SPECIAL_TYPES.contains(&x) { + Some(x) + } else { + None + } + }) +} + +fn vec_is_array(v: &Vec) -> bool { + if v.is_empty() { + return true; + } + + let first_item = v.first().unwrap(); + + if match first_item { + LibConfigValue::Array(_) => true, + LibConfigValue::List(_) => true, + LibConfigValue::Group(_, _) => true, + _ => false, + } { + return false; + }; + + v[1..] + .iter() + .all(|item| discriminant(first_item) == discriminant(item)) +} + +fn json_to_libconfig(v: &Value) -> LibConfigValue { + match v { + Value::Null => panic!("Null value not allowed in libconfig"), + Value::Bool(b) => LibConfigValue::Bool(b.clone()), + Value::Number(n) => { + if n.is_i64() { + LibConfigValue::Int(LibConfigIntNumber::Int(n.as_i64().unwrap())) + } else if n.is_f64() { + LibConfigValue::Float(n.as_f64().unwrap()) + } else { + panic!("{} is not i64 or f64, cannot be represented as number in libconfig", n); + } + } + Value::String(s) => LibConfigValue::String(s.to_string()), + Value::Array(a) => { + let items = a + .iter() + .map(|item| json_to_libconfig(item)) + .collect::>(); + LibConfigValue::List(items) + } + Value::Object(o) => { + if let Some(_type) = object_is_special_type(o) { + let value = o + .get("value") + .expect(format!("Missing value for special type: {}", &_type).as_str()); + + return match _type { + "octal" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Int(LibConfigIntNumber::Oct( + i64::from_str_radix(&str_value, 8) + .expect(format!("Invalid octal value: {}", value).as_str()), + )) + } + "hex" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Int(LibConfigIntNumber::Hex( + i64::from_str_radix(&str_value[2..], 16) + .expect(format!("Invalid hex value: {}", value).as_str()), + )) + } + "float" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Float( + str_value + .parse::() + .expect(format!("Invalid float value: {}", value).as_str()), + ) + } + "list" => { + let items = value + .as_array() + .expect( + format!("Value is not an array for special type: {}", &_type) + .as_str(), + ) + .to_owned() + .iter() + .map(|item| json_to_libconfig(item)) + .collect::>(); + + LibConfigValue::List(items) + } + "array" => { + let items = value + .as_array() + .expect( + format!("Value is not an array for special type: {}", &_type) + .as_str(), + ) + .to_owned() + .iter() + .map(|item| json_to_libconfig(item)) + .collect::>(); + + if !vec_is_array(&items) { + panic!( + "This can not be an array because of its contents: {:#?}", + items + ); + } + + LibConfigValue::Array(items) + } + _ => panic!("Invalid type: {}", _type), + }; + } + + let mut items = o + .iter() + .filter(|(key, _)| key.as_str() != "_includes") + .map(|(key, value)| (key.clone(), json_to_libconfig(value))) + .collect::>(); + items.sort_by(|(a,_),(b,_)| a.partial_cmp(b).unwrap()); + + let includes = o + .get("_includes") + .map(|x| { + x.as_array() + .expect("_includes is not an array") + .iter() + .map(|x| { + x.as_str() + .expect("_includes item is not a string") + .to_owned() + }) + .collect::>() + }) + .unwrap_or(vec![]); + + for (key,_) in items.iter() { + if !validate_setting_name(key) { + panic!("Invalid setting name: {}", key); + } + } + LibConfigValue::Group(includes, items) + } + } +} + +impl ToString for LibConfigValue { + fn to_string(&self) -> String { + match self { + LibConfigValue::Bool(b) => b.to_string(), + LibConfigValue::Int(i) => match i { + LibConfigIntNumber::Oct(n) => format!("0{:o}", n), + LibConfigIntNumber::Hex(n) => format!("0x{:x}", n), + LibConfigIntNumber::Int(n) => n.to_string(), + }, + LibConfigValue::Float(n) => format!("{:?}", n), + LibConfigValue::String(s) => { + format!("\"{}\"", s.replace("\\", "\\\\").replace("\"", "\\\"")) + } + LibConfigValue::Array(a) => { + let items = a + .iter() + .map(|item| item.to_string()) + .collect::>() + .join(", "); + format!("[{}]", items) + } + LibConfigValue::List(a) => { + let items = a + .iter() + .map(|item| item.to_string()) + .collect::>() + .join(", "); + format!("({})", items) + } + LibConfigValue::Group(i, o) => { + let includes = i + .iter() + .map(|x| x.replace("\\", "\\\\").replace("\"", "\\\"")) + .map(|x| format!("@include \"{}\"", x)) + .collect::>() + .join("\n"); + let items = o + .iter() + .map(|(key, value)| format!("{}={};", key, value.to_string())) + .collect::>() + .join(""); + if includes.is_empty() { + format!("{{{}}}", items) + } else { + format!("{{\n{}\n{}}}", includes, items) + } + } + } + } +} + +fn main() { + let stdin = std::io::stdin().lock(); + let json = serde_json::Deserializer::from_reader(stdin) + .into_iter::() + .next() + .expect("Could not read content from stdin") + .expect("Could not parse JSON from stdin"); + + for (key, value) in json + .as_object() + .expect("Top level of JSON file is not an object") + { + print!("{}={};", key, json_to_libconfig(value).to_string()); + } + print!("\n\n"); +} diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix new file mode 100644 index 0000000000..7b0df23ee6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix @@ -0,0 +1,76 @@ +{ lib, formats, stdenvNoCC, writeText, ... }: +let + libconfig = formats.libconfig { }; + + include_expr = { + val = 1; + }; + + include_file = writeText "libconfig-test-include" '' + val=1; + ''; + + expression = { + simple_top_level_attr = "1.0"; + nested.attrset.has.a.integer.value = 100; + some_floaty = 29.95; + ## Same syntax here on these two, but they should get serialized differently: + # > A list may have zero or more elements, each of which can be a scalar value, an array, a group, or another list. + list1d = libconfig.lib.mkList [ 1 "mixed!" 5 2 ]; + # You might also omit the mkList, as a list will be a list (in contrast to an array) by default. + list2d = [ 1 [ 1 1.2 "foo" ] [ "bar" 1.2 1 ] ]; + # > An array may have zero or more elements, but the elements must all be scalar values of the same type. + array1d = libconfig.lib.mkArray [ 1 5 2 ]; + array2d = [ + (libconfig.lib.mkArray [ 1 2 ]) + (libconfig.lib.mkArray [ 2 1 ]) + ]; + nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$"; + + weirderTypes = { + _includes = [ include_file ]; + pi = 3.141592654; + bigint = 9223372036854775807; + hex = libconfig.lib.mkHex "0x1FC3"; + octal = libconfig.lib.mkOctal "0027"; + float = libconfig.lib.mkFloat "1.2E-3"; + array_of_ints = libconfig.lib.mkArray [ + (libconfig.lib.mkOctal "0732") + (libconfig.lib.mkHex "0xA3") + 1234 + ]; + list_of_weird_types = [ + 3.141592654 + 9223372036854775807 + (libconfig.lib.mkHex "0x1FC3") + (libconfig.lib.mkOctal "0027") + (libconfig.lib.mkFloat "1.2E-32") + (libconfig.lib.mkFloat "1") + ]; + }; + }; + + libconfig-test-cfg = libconfig.generate "libconfig-test.cfg" expression; +in + stdenvNoCC.mkDerivation { + name = "pkgs.formats.libconfig-test-comprehensive"; + + dontUnpack = true; + dontBuild = true; + + doCheck = true; + checkPhase = '' + cp ${./expected.txt} expected.txt + substituteInPlace expected.txt \ + --subst-var-by include_file "${include_file}" + diff -U3 ./expected.txt ${libconfig-test-cfg} + ''; + + installPhase = '' + mkdir $out + cp expected.txt $out + cp ${libconfig-test-cfg} $out/libconfig-test.cfg + cp ${libconfig-test-cfg.passthru.json} $out/libconfig-test.json + ''; + } + diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt new file mode 100644 index 0000000000..ef6e09f811 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt @@ -0,0 +1,6 @@ +array1d=[1, 5, 2];array2d=([1, 2], [2, 1]);list1d=(1, "mixed!", 5, 2);list2d=(1, (1, 1.2, "foo"), ("bar", 1.2, 1));nasty_string="\"@ +\\ ^*bf +0\";'''$";nested={attrset={has={a={integer={value=100;};};};};};simple_top_level_attr="1.0";some_floaty=29.95;weirderTypes={ +@include "@include_file@" +array_of_ints=[0732, 0xa3, 1234];bigint=9223372036854775807;float=0.0012;hex=0x1fc3;list_of_weird_types=(3.141592654, 9223372036854775807, 0x1fc3, 027, 1.2e-32, 1.0);octal=027;pi=3.141592654;}; + diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/default.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/default.nix new file mode 100644 index 0000000000..6cd03fe485 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/test/default.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + comprehensive = pkgs.callPackage ./comprehensive { }; +} diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/update.sh b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/update.sh new file mode 100755 index 0000000000..ffc5ad3917 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p cargo -i bash +cd "$(dirname "$0")" +cargo update diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/validator.c b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/validator.c new file mode 100644 index 0000000000..738be0b774 --- /dev/null +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats/libconfig/validator.c @@ -0,0 +1,21 @@ +// Copyright (C) 2005-2023 Mark A Lindner, ckie +// SPDX-License-Identifier: LGPL-2.1-or-later +#include +#include +int main(int argc, char **argv) +{ + config_t cfg; + config_init(&cfg); + if (argc != 2) + { + fprintf(stderr, "USAGE: validator "); + } + if(! config_read_file(&cfg, argv[1])) + { + fprintf(stderr, "[libconfig] %s:%d - %s\n", config_error_file(&cfg), + config_error_line(&cfg), config_error_text(&cfg)); + config_destroy(&cfg); + return 1; + } + printf("[libconfig] validation ok\n"); +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/tests/default.nix b/third_party/nixpkgs/pkgs/pkgs-lib/tests/default.nix index ae91e15aa9..289780f576 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/tests/default.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/tests/default.nix @@ -17,6 +17,7 @@ let jdk11 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk11_headless; }; jdk17 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk17_headless; }; }; + libconfig = recurseIntoAttrs (import ../formats/libconfig/test { inherit pkgs; }); }; flatten = prefix: as: diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix index 40c267b00e..f1a874b348 100644 --- a/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix +++ b/third_party/nixpkgs/pkgs/servers/akkoma/admin-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, fixup_yarn_lock, yarn, nodejs +, prefetch-yarn-deps, yarn, nodejs , python3, pkg-config, libsass }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps yarn nodejs pkg-config @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export HOME="$(mktemp -d)" yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/cross-env diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix index 07b4ea245b..9024ad98c6 100644 --- a/third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/third_party/nixpkgs/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitea, fetchYarnDeps -, fixup_yarn_lock, yarn, nodejs +, prefetch-yarn-deps, yarn, nodejs , jpegoptim, oxipng, nodePackages }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - fixup_yarn_lock + prefetch-yarn-deps yarn nodejs jpegoptim @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { export HOME="$(mktemp -d)" yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache} - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive diff --git a/third_party/nixpkgs/pkgs/servers/akkoma/default.nix b/third_party/nixpkgs/pkgs/servers/akkoma/default.nix index 90c7c53525..fca88e6a3c 100644 --- a/third_party/nixpkgs/pkgs/servers/akkoma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/akkoma/default.nix @@ -1,7 +1,7 @@ { lib , beamPackages , fetchFromGitea, fetchFromGitHub, fetchFromGitLab -, cmake, file, libxcrypt +, cmake, file , writeText , nixosTests , ... @@ -48,6 +48,9 @@ beamPackages.mixRelease rec { rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2"; hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro="; }; + + # the binary is not getting installed by default + postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/"; }; concurrent_limiter = beamPackages.buildMix rec { name = "concurrent_limiter"; @@ -169,6 +172,10 @@ beamPackages.mixRelease rec { passthru = { tests = with nixosTests; { inherit akkoma akkoma-confined; }; inherit mixNixDeps; + + # Used to make sure the service uses the same version of elixir as + # the package + elixirPackage = beamPackages.elixir; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/althttpd/default.nix b/third_party/nixpkgs/pkgs/servers/althttpd/default.nix index 1f3271be6a..49d552f48d 100644 --- a/third_party/nixpkgs/pkgs/servers/althttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/althttpd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "althttpd"; - version = "unstable-2022-08-12"; + version = "unstable-2023-08-12"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "823a1d985d4bacaa"; - sha256 = "sha256-yfVsOfqtHw9ftnK5B4RWeRR/ygfsTEDm7fFSaVxsCas="; + rev = "c0bdc68e6c56ef25"; + sha256 = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index 8d3a490c45..a8bd3ba5a7 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.4"; + version = "3.12.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-9D59IZl7zYJzkSYuFcA6IPttCI9SjacE/l04cUh3An8="; + hash = "sha256-EX7+f6R1dfU2hYt2ftEjpevmaUtAJ1wHcr+X30z5Bb8="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index f677ce61ac..b6af64e984 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -52,6 +52,6 @@ optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated homepage = "https://www.atlassian.com/software/confluence"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ globin willibutz ciil techknowlogick ma27 ]; + maintainers = with maintainers; [ willibutz ciil techknowlogick ]; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix b/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix index 918aec8e16..4544ea56ff 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix @@ -51,6 +51,6 @@ optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` description = "Single sign-on and identity management tool"; homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index dbbbbe9944..d50873a833 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ma27 ]; + maintainers = with maintainers; [ ciil megheaiulian techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix b/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix index 51dbc97b07..500f088279 100644 --- a/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/audiobookshelf/default.nix @@ -17,13 +17,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eqi6QVX8ZxX87IJcDNlDEzWYH7FBvYMs/iBAopLGYl4="; + sha256 = "sha256-yPDByM09rc9zRLh0ONcY5bScY4NOrKDv0Pdwo97Czcs="; }; client = buildNpmPackage { @@ -37,7 +37,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-j6Q3i3ktvBUMQxCMNIqRjSMly6UMzewaF1EfAmNF8mQ="; + npmDepsHash = "sha256-ZNkHDNjaQbUt3oWnNIYPYkcvjelieY4RJxNSbzR1+JM="; }; wrapper = import ./wrapper.nix { @@ -52,7 +52,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-fxXetf6KVK8hEwYZsER/rmt5tDagEOiyh+dJJE8FOXY="; + npmDepsHash = "sha256-PVgK8R8sf16KKQS/mPXtvit9CW9+4Gc9Onpaw+SSgNI="; installPhase = '' mkdir -p $out/opt/client diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 5b7bea8034..21904dc615 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.3.0"; + version = "1.3.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-f9LKJZX+dZRUGq+g/PHvCzN8UpDiBpEVvqEO6CZPoAE="; + sha256 = "sha256-AhUMrvnZoo0XMfJ6F9Bi4mC0hk5T3EkQPX/s4tHWcic="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ d-xo ]; + mainProgram = "bazarr"; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix b/third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix index 98cdd42dde..fbd2db4ec3 100644 --- a/third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.9.1"; - hash = "sha256-jAjUrEYfaihMuyL/sLDzdPfq0sKoEglCfRFz0sAtx3g="; + version = "2.10.0"; + hash = "sha256-RpcT2zneKbbZieI2Omf+fcfmU7/MnkpYGKhFj9tnKrs="; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/bloat/default.nix b/third_party/nixpkgs/pkgs/servers/bloat/default.nix index 5f1ba32447..4a28c4377f 100644 --- a/third_party/nixpkgs/pkgs/servers/bloat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-09-24"; + version = "unstable-2023-10-15"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "8e3999fc3d9761f9ce71c35a7154a77c251caa66"; - hash = "sha256-+JHBTYZETAmxUxb2SBMIuZ5/StU7mHQceHbjDmta+Kw="; + rev = "67b13c71baea56eeb15532ca1b1377f6da8d18ac"; + hash = "sha256-h885uAuVjpVsp5cAAX9pIxfydcBiajBX3ZSmQUr3/4Q="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/brickd/default.nix b/third_party/nixpkgs/pkgs/servers/brickd/default.nix index 3977521a6f..d3cf54114c 100644 --- a/third_party/nixpkgs/pkgs/servers/brickd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/brickd/default.nix @@ -30,10 +30,11 @@ stdenv.mkDerivation { ''; buildPhase = '' - export # build the brickd binary mkdir src/daemonlib cp -r ${daemonlib}/* src/daemonlib + substituteInPlace src/daemonlib/utils.{c,h} \ + --replace "_GNU_SOURCE" "__GLIBC__" cd src/brickd make diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 6942cf7a5a..26140404cc 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.7.4"; + version = "2.7.5"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - hash = "sha256-8wdSRAONIPYe6kC948xgAGHm9cePbXsOBp9gzeDI0AI="; + hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - hash = "sha256-oZSAY7vS8ersnj3vUtxj/qKlLvNvNL2RQHrNr4Cc60k="; + hash = "sha256-0IZZ7mkEzZI2Y8ed//m0tbBQZ0YcCXA0/b10ntNIXUk="; }; - vendorHash = "sha256-CnWAVGPrHIjWJgh4LwJvrjQJp/Pz92QHdANXZIcIhg8="; + vendorHash = "sha256-YNcQtjPGQ0XMSog+sWlH4lG/QdbdI0Lyh/fUGqQUFaY="; subPackages = [ "cmd/caddy" ]; @@ -64,6 +64,7 @@ buildGoModule { homepage = "https://caddyserver.com"; description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS"; license = licenses.asl20; + mainProgram = "caddy"; maintainers = with maintainers; [ Br1ght0ne emilylange techknowlogick ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index f59ebb6fe2..1604358029 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -25,13 +25,13 @@ let in python.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q="; + hash = "sha256-tRrOquetn3P2NmrXq7DQHRGP1sWnLR7bV2Lw0W/lUPQ="; }; propagatedBuildInputs = with python.pkgs; [ @@ -64,8 +64,6 @@ python.pkgs.buildPythonApplication rec { # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters # are stored in the DB. ./db-migrations.patch - # environ in tornado.wsgi.WSGIContainer no longer a static method from 6.3 version - ./static_environ.patch ]; # calibre-web doesn't follow setuptools directory structure. The following is taken from the script diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/static_environ.patch b/third_party/nixpkgs/pkgs/servers/calibre-web/static_environ.patch deleted file mode 100644 index 4f94283a4e..0000000000 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/static_environ.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py -index af93219c..cf302042 100644 ---- a/cps/tornado_wsgi.py -+++ b/cps/tornado_wsgi.py -@@ -53,7 +53,7 @@ class MyWSGIContainer(WSGIContainer): - return response.append - - app_response = self.wsgi_application( -- MyWSGIContainer.environ(request), start_response -+ self.environ(request), start_response - ) - try: - response.extend(app_response) -@@ -86,9 +86,8 @@ class MyWSGIContainer(WSGIContainer): - request.connection.finish() - self._log(status_code, request) - -- @staticmethod -- def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]: -- environ = WSGIContainer.environ(request) -+ def environ(self, request: httputil.HTTPServerRequest) -> Dict[Text, Any]: -+ environ = super().environ(request) - environ['RAW_URI'] = request.path - return environ - diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 959b16ceac..19a0b5e923 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -6,12 +6,12 @@ , ninja , python3 , perl +, nasm , yasm , nixosTests , darwin , findutils -# currently for BLAKE3 hash function , rustSupport ? true , corrosion @@ -24,19 +24,19 @@ let inherit (llvmPackages) stdenv; mkDerivation = ( if stdenv.isDarwin - then darwin.apple_sdk_11_0.llvmPackages_15.stdenv + then darwin.apple_sdk_11_0.llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.13.6"; + version = "23.10.3.5"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-lts"; + rev = "v${version}-stable"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-ryUjXN8UNGmkZTkqNHotB4C2E1MHZhx2teqXrlp5ySQ="; + hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -67,7 +67,9 @@ in mkDerivation rec { ninja python3 perl + llvmPackages.lld ] ++ lib.optionals stdenv.isx86_64 [ + nasm yasm ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools @@ -92,17 +94,11 @@ in mkDerivation rec { preBuild = "cd generator"; hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; } else null; - blake3Deps = if rustSupport then rustPlatform.fetchCargoTarball { + rustDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "blake3-deps"; - preBuild = "cd rust/BLAKE3"; - hash = "sha256-lDMmmsyjEbTfI5NgTgT4+8QQrcUE/oUWfFgj1i19W0Q="; - } else null; - skimDeps = if rustSupport then rustPlatform.fetchCargoTarball { - inherit src; - name = "skim-deps"; - preBuild = "cd rust/skim"; - hash = "sha256-gEWB+U8QrM0yYyMXpwocszJZgOemdTlbSzKNkS0NbPk="; + name = "rust-deps"; + preBuild = "cd rust"; + hash = "sha256-fWDAGm19b7uZv8aBdBoieY5c6POd8IxFXbGdtONpZbw="; } else null; dontCargoSetupPostUnpack = true; @@ -117,14 +113,12 @@ in mkDerivation rec { corrosionDepsCopy="$cargoDepsCopy" popd - pushd rust/BLAKE3 - cargoDeps="$blake3Deps" cargoSetupPostUnpackHook - blake3DepsCopy="$cargoDepsCopy" - popd - - pushd rust/skim - cargoDeps="$skimDeps" cargoSetupPostUnpackHook - skimDepsCopy="$cargoDepsCopy" + pushd rust + cargoDeps="$rustDeps" cargoSetupPostUnpackHook + rustDepsCopy="$cargoDepsCopy" + cat .cargo/config >> .cargo/config.toml.in + cat .cargo/config >> skim/.cargo/config.toml.in + rm .cargo/config popd popd @@ -152,15 +146,15 @@ in mkDerivation rec { cargoDepsCopy="$corrosionDepsCopy" cargoSetupPostPatchHook popd - pushd rust/BLAKE3 - cargoDepsCopy="$blake3DepsCopy" cargoSetupPostPatchHook - popd - - pushd rust/skim - cargoDepsCopy="$skimDepsCopy" cargoSetupPostPatchHook + pushd rust + cargoDepsCopy="$rustDepsCopy" cargoSetupPostPatchHook popd cargoSetupPostPatchHook() { true; } + '' + lib.optionalString stdenv.isDarwin '' + # Make sure Darwin invokes lld.ld64 not lld. + substituteInPlace cmake/tools.cmake \ + --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld' ''; cmakeFlags = [ @@ -169,6 +163,12 @@ in mkDerivation rec { "-DENABLE_EMBEDDED_COMPILER=ON" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and + # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. + NIX_CFLAGS_COMPILE = "-Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; + }; + # https://github.com/ClickHouse/ClickHouse/issues/49988 hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index 321e988af7..fe8f95ecdf 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.5.1"; + version = "23.02.6.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-9VvZ8xySYFyBa5tZzf5WCShbEDpqE1/5t76jXX6t+bc="; + sha256 = "sha256-azgGM4qfS0xtUaiGfXtu8MNYdgpZRUfx+zBgAAlmt6g="; }; outputs = [ "out" "dev" ]; @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { # increase string length to allow for full # path of 'echo' in nix store ./common-env-echo.patch - # Required for configure to pick up the right dlopen path - ./pmix-configure.patch ]; prePatch = '' @@ -72,6 +70,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" + "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (optional enableGtk2 "--disable-gtktest") ++ (optional (!enableX11) "--disable-x11"); diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch b/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch deleted file mode 100644 index 21c2197c3f..0000000000 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/pmix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 1cf53bc..ab68441 100755 ---- a/configure -+++ b/configure -@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext - as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5 - fi - _x_ac_pmix_v3_found="1" -- PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include" -+ PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\"" - if test "$ac_with_rpath" = "yes"; then - PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir" - else diff --git a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix index 3f77c88b19..2c4e1c5d4f 100644 --- a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-dJwG+QRplXX7etxG/e1kzcRMJppF6TYofio8FO1p+aI="; + hash = "sha256-HaK3Do6oRGm6ovvNNGvZE34rYNRQnrmt1GKglTSZ9ls="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Confluent event streaming platform based on Apache Kafka"; homepage = "https://www.confluent.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ zoedsoupe ]; + maintainers = with lib.maintainers; [ zoedsoupe autophagy ]; platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/dante/clang-osint-m4.patch b/third_party/nixpkgs/pkgs/servers/dante/clang-osint-m4.patch new file mode 100644 index 0000000000..65281e22ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dante/clang-osint-m4.patch @@ -0,0 +1,34 @@ +diff -ur a/osdep.m4 b/osdep.m4 +--- a/osdep.m4 2017-01-18 09:11:20.000000000 -0500 ++++ b/osdep.m4 2023-10-21 12:43:59.464797030 -0400 +@@ -381,6 +381,7 @@ + unset have_sa_len + AC_MSG_CHECKING([for sa_len in sockaddr]) + AC_TRY_COMPILE([ ++#include + #include + #include + ], [struct sockaddr sa; +@@ -397,12 +398,13 @@ + unset sa_len_type_found + for type in uint8_t "unsigned char"; do + AC_TRY_COMPILE([ ++#include + #include + #include ], [ + struct sockaddr sa; + $type *sa_len_ptr; + sa_len_ptr = &sa.sa_len; +-sa_len_ptr++; /* use to avoid warning/error */], ++(*sa_len_ptr)++; /* use to avoid warning/error */], + [AC_DEFINE_UNQUOTED(sa_len_type, [$type], [sa_len type]) + sa_len_type_found=t + break]) +@@ -636,6 +638,7 @@ + in_port_t, in_addr_t], + , , + [ ++#include + #include + #include + ]) diff --git a/third_party/nixpkgs/pkgs/servers/dante/default.nix b/third_party/nixpkgs/pkgs/servers/dante/default.nix index 49e6a26f45..a5806a20d4 100644 --- a/third_party/nixpkgs/pkgs/servers/dante/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dante/default.nix @@ -22,12 +22,17 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; - patches = lib.optionals remove_getaddrinfo_checks [ + patches = [ + # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer + # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`. + ./clang-osint-m4.patch + ] ++ lib.optionals remove_getaddrinfo_checks [ (fetchpatch { name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y="; - }) ]; + }) + ]; postPatch = '' substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' "" diff --git a/third_party/nixpkgs/pkgs/servers/db-rest/default.nix b/third_party/nixpkgs/pkgs/servers/db-rest/default.nix new file mode 100644 index 0000000000..7fda8f978f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/db-rest/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nodejs_18 +, nix-update-script +, fetchpatch +}: +buildNpmPackage rec { + pname = "db-rest"; + version = "6.0.3"; + + nodejs = nodejs_18; + + src = fetchFromGitHub { + owner = "derhuerst"; + repo = pname; + rev = version; + hash = "sha256-kHT8/8ivqcP6YRBvkZ4jpJ/xBMM1PddLgV1Z/MFmSTM="; + }; + + patches = [ + # add files and bin property to package.json + # keep until https://github.com/derhuerst/db-rest/pull/37 is merged and released + (fetchpatch { + url = "https://github.com/derhuerst/db-rest/commit/7d2c8bebdd5e8152b181748e3c36683ecf9e71c9.patch"; + hash = "sha256-KyNcvSJLQrX8BO/4814wefeeC+s0pvM2ng44q6diU24="; + }) + ]; + + npmDepsHash = "sha256-d/Qs194TU4ooy6GsBsZhrf5H1iPCUnlieBgtuqfAtkQ="; + + preConfigure = '' + patchShebangs ./build/index.js + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A clean REST API wrapping around the Deutsche Bahn API"; + homepage = "https://v6.db.transport.rest/"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ marie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/deconz/default.nix b/third_party/nixpkgs/pkgs/servers/deconz/default.nix index ae1fb61191..7f5d60b153 100644 --- a/third_party/nixpkgs/pkgs/servers/deconz/default.nix +++ b/third_party/nixpkgs/pkgs/servers/deconz/default.nix @@ -11,6 +11,7 @@ , makeWrapper , gzip , gnutar +, nixosTests }: stdenv.mkDerivation rec { @@ -73,11 +74,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests = { inherit (nixosTests) deconz; }; + }; + meta = with lib; { description = "Manage Zigbee network with ConBee, ConBee II or RaspBee hardware"; homepage = "https://www.dresden-elektronik.com/wireless/software/deconz.html"; license = licenses.unfree; - platforms = with platforms; linux; + platforms = with platforms; [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "deCONZ"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix index 82ee6d5954..d722f6beb0 100644 --- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-wM9ayB3L9pc3696Ze5hVZPKGwrB5fD+64Wf8DUIjf1k="; + hash = "sha256-Hy3QuwAHmZSsjy5A/1mrmrxdtle466HsQtDat3tYS8s="; }; - vendorHash = "sha256-COljILLiAFoX8IShpAmLrxkw6yw7YQE4lpe8IR92j6g="; + vendorHash = "sha256-M7ogR1ya+sqlWVQpaXlvJy9YwhdM4XBDw8e2ZBPvEGY="; subPackages = [ # The server diff --git a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix index 4589d08978..ce20cf8f22 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/dnsdist/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-HA03XCVFPTSbiOA/9YmqJgPKhpL8mDZMBo6tNygEcE8="; + hash = "sha256-ZojwmyxS+b+TXwdp9O4o3Qdg5WItreez9Ob6N3bwerg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 7582ccdb95..bc18c91ef7 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f3f4b1d49ec9b81113b14a38354b823bd4a470356ed7e8e555595b6fd1ac80c9"; + sha256 = "0d65d4b59f5df69b78c6295ade0a2ea7931831de7ef5eeee3e00f8a20af679e4"; }; outputs = [ "bin" "out" "dev" ]; @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { inherit knot-resolver; } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) knot kea; + prometheus-exporter = nixosTests.prometheus-exporters.knot; # Some dependencies are very version-sensitive, so the might get dropped # or embedded after some update, even if the nixPackagers didn't intend to. # For non-linux I don't know a good replacement for `ldd`. diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 0c714cce59..5ff385cf65 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-Ch7cE+jyvWYfOeMWOH2UHiLeagO4p6L8Zi/fi5Quor4="; + sha256 = "sha256-TLgYBFjs+1KKPZo0uihEts0u1pyhxGHd4koOvWaCkUQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix index 44150271b1..e20a7cacca 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Oxc/2kxRuwe1pR2MWZ7t15YqAgVrQQ48nZ1p7Ze+Nbk="; + hash = "sha256-d7kRmb33GHQzRQHGfiZGnCZno3PYQjgD/mV0Fylcd7o="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix index 88280cf518..03814c365d 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "trust-dns"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { - owner = "bluejekyll"; - repo = "trust-dns"; + owner = "hickory-dns"; + repo = "hickory-dns"; rev = "v${version}"; - sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY="; + hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE="; }; - cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM="; + cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; license = with licenses; [ asl20 mit ]; + mainProgram = "hickory-dns"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix b/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix index c6aa3c7562..7b33435a9d 100644 --- a/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-7eWdhsYkeUKnr7BzJhJ9/jFn76CdK7Qq1eIfV/OG7es="; + sha256 = "sha256-ep/Je83rUE2mcRqIBbgNH+7uFYf0EoHuRo7JOgT2aIs="; }; # don't do anything? diff --git a/third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix b/third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix index 76994cac91..0a06d7b17c 100644 --- a/third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fastnetmon-advanced/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, bzip2 }: +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, bzip2 +, nixosTests +}: stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.350"; + version = "2.0.353"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-rd0xdpENsdH8jOoUkQHW8/fXE4zEjQemFT4Q2tXjtT8="; + hash = "sha256-EkZlQL/rb5x+6apV0nZ4Ay6hUEPifPCZF6CQaxKSWuM="; }; nativeBuildInputs = [ @@ -58,9 +64,12 @@ stdenv.mkDerivation rec { $out/bin/fnm-gobgpd --help 2>&1 | grep "Application Options" ''; + passthru.tests = { inherit (nixosTests) fastnetmon-advanced; }; + meta = with lib; { description = "A high performance DDoS detector / sensor - commercial edition"; homepage = "https://fastnetmon.com"; + changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = teams.wdz.members; license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/servers/felix/default.nix b/third_party/nixpkgs/pkgs/servers/felix/default.nix index 409f52ab9d..a9796f922d 100644 --- a/third_party/nixpkgs/pkgs/servers/felix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "7.0.1"; + version = "7.0.5"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "sha256-WypiOdJhqKngIFVNf/XXAUDRdS8rANxWrcT846hcWTo="; + sha256 = "sha256-N9mbkIzMkMV2RLONv15EiosJxMU9iEJvwPWEauPIEe8="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch b/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch deleted file mode 100644 index 7929eeee08..0000000000 --- a/third_party/nixpkgs/pkgs/servers/fishnet/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 963e40e..fb76d78 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -230,7 +230,7 @@ dependencies = [ - - [[package]] - name = "fishnet" --version = "2.5.1-dev" -+version = "2.5.1" - dependencies = [ - "arrayvec", - "atty", \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix index 10695e5478..6a80808051 100644 --- a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix +++ b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix @@ -6,21 +6,21 @@ }: let - nnueFile = "nn-13406b1dcbe0.nnue"; + nnueFile = "nn-5af11540bbfe.nnue"; nnue = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; + hash = "sha256-WvEVQLv+/LVOOMXdAAyrS0ad+nWZodVb5dJyLCCokps="; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.5.1"; + version = "2.7.1"; src = fetchFromGitHub { - owner = "niklasf"; + owner = "lichess-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c="; + hash = "sha256-q73oGQYSWx1aFy9IvbGpecOoc0wLEY2IzJH9GufnvCs="; fetchSubmodules = true; }; @@ -29,19 +29,18 @@ rustPlatform.buildRustPackage rec { cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so="; + # Copying again bacause the file is deleted during build. + postBuild = '' + cp -v '${nnue}' 'Stockfish/src/${nnueFile}' + ''; - # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in - # the next update. - cargoPatches = [ - ./Cargo.lock.patch - ]; + cargoHash = "sha256-NO3u2ZXSiDQnZ/FFZLOtTnQoGMyN9pSI4sqGIXtjEcI="; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; - homepage = "https://github.com/niklasf/fishnet"; + homepage = "https://github.com/lichess-org/fishnet"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tu-maurice ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix index 0abc196d8d..eab68fb93d 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "6.1"; + version = "6.2"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8="; + sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; }; # utmp.h is deprecated on aarch64-darwin diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix new file mode 100644 index 0000000000..c7bc7fbc2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/geospatial/fit-trackee/default.nix @@ -0,0 +1,105 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchPypi +, postgresql +, postgresqlTestHook +}: +let + python = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.49"; + src = fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk="; + }; + # Remove "test/typing" that does not exist + disabledTestPaths = [ + "test/aaa_profiling" + "test/ext/mypy" + ]; + }); + }; + }; + +in +python.pkgs.buildPythonApplication rec { + pname = "fit-trackee"; + version = "0.7.22"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SamR1"; + repo = "FitTrackee"; + rev = "v${version}"; + hash = "sha256-aPQ8jLssN9nx0Bpd/44E3sQi2w0cR8ecG76DJjreeHA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace psycopg2-binary psycopg2 \ + --replace 'poetry>=0.12' 'poetry-core' \ + --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + ''; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python.pkgs; [ + authlib + babel + dramatiq + flask + flask-bcrypt + flask-dramatiq + flask-limiter + flask-migrate + gpxpy + gunicorn + humanize + psycopg2 + pyjwt + pyopenssl + pytz + shortuuid + sqlalchemy + staticmap + ua-parser + ] ++ dramatiq.optional-dependencies.redis; + + pythonImportsCheck = [ "fittrackee" ]; + + nativeCheckInputs = with python.pkgs; [ + pytestCheckHook + freezegun + postgresqlTestHook + postgresql + ]; + + pytestFlagsArray = [ + "fittrackee" + ]; + + postgresqlTestSetupPost = '' + export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABAS?host=$PGHOST + ''; + + postInstall = '' + mkdir -p $out/var/share/fittrackee-instance + ''; + + preCheck = '' + export TMP=$(mktemp -d) + ''; + + meta = with lib; { + description = "Self-hosted outdoor activity tracker :bicyclist"; + homepage = "https://github.com/SamR1/FitTrackee"; + changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix index 88aa9c140b..4f0b657fda 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.23.2"; + version = "2.24.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-4zOtcUWeb/zubEY3wNCYBeStRSga2bm1BnBa+qcyeCw="; + sha256 = "sha256-xX1rAONMh5XSWGPXkVMemAvG34DDNmu2018HsTvY7G0="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix index 3a5ec55b5b..d871c79d6c 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/martin/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-dx6TcEZpnsWbRliBo/CkOZNwXiipRYS8+oWHTEAF5XQ="; + hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E="; }; - cargoHash = "sha256-6r2rrSthEdQ/CnrGt4/VZW2jp66zE0au8r81+nBD8UE="; + cargoHash = "sha256-RO9nUH2+0jOCbvGtZ5j802mL85tY+Jz7ygPrNuFeE98="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix index ac5c008990..7907ba1860 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/mbtileserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HGzgqUH9OxwjfYR9I9JzcP11+SB8A3hC/3Uk1dOCq+k="; + sha256 = "sha256-hKDgKiy3tmZ7gxmxZlflJHcxatrSqE1d1uhSLJh8XLo="; }; - vendorHash = "sha256-vuNOOPVGUkmKJ477N20DvhJTcMIW1lNmrgJLeMpNImM="; + vendorHash = "sha256-QcyFnzRdGdrVqgKEMbhaD7C7dkGKKhTesMMZKrrLx70="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; diff --git a/third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix b/third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix index ac2711d156..9cdcef2be7 100644 --- a/third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/go-cqhttp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-cqhttp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Mrs4s"; repo = pname; rev = "v${version}"; - hash = "sha256-/nmPiB2BHltguAJFHCvtS3oh/BttEH75GhgSa25cI3s="; + hash = "sha256-mKenmsGdVg60zjVMTfbEtqtPcJdJo60Nz6IUQ9RB7j0="; }; - vendorHash = "sha256-Oqig/qtdGFO2/t7vvkApqdNhjNnYzEavNpyneAMa10k="; + vendorHash = "sha256-YNARh25xrcPGvhhXzYmg3CsWwzvXq44uWt0S1PjRVdM="; meta = with lib; { description = "The Golang implementation of OneBot based on Mirai and MiraiGo"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/check_manifest.py new file mode 100644 index 0000000000..bbe9535824 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 + +import json +import importlib_metadata +import sys + +from packaging.requirements import Requirement + + +def check_requirement(req: str): + # https://packaging.pypa.io/en/stable/requirements.html + requirement = Requirement(req) + try: + version = importlib_metadata.distribution(requirement.name).version + except importlib_metadata.PackageNotFoundError: + print(f" - Dependency {requirement.name} is missing", file=sys.stderr) + return False + + # https://packaging.pypa.io/en/stable/specifiers.html + if not version in requirement.specifier: + print( + f" - {requirement.name}{requirement.specifier} expected, but got {version}", + file=sys.stderr, + ) + return False + + return True + + +def check_manifest(manifest_file: str): + with open(manifest_file) as fd: + manifest = json.load(fd) + if "requirements" in manifest: + ok = True + for requirement in manifest["requirements"]: + ok &= check_requirement(requirement) + if not ok: + print("Manifest requirements are not met", file=sys.stderr) + sys.exit(1) + + +if __name__ == "__main__": + if len(sys.argv) < 2: + raise RuntimeError(f"Usage {sys.argv[0]} ") + manifest_file = sys.argv[1] + check_manifest(manifest_file) diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/default.nix new file mode 100644 index 0000000000..05b7c2d4b0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -0,0 +1,38 @@ +{ lib +, home-assistant +, makeSetupHook +}: + +{ pname +, version +, format ? "other" +, ... +}@args: + +let + manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix { + inherit makeSetupHook; + inherit (home-assistant) python; + }; +in +home-assistant.python.pkgs.buildPythonPackage ( + { + inherit format; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r $src/custom_components/ $out/ + + runHook postInstall + ''; + + nativeCheckInputs = with home-assistant.python.pkgs; [ + importlib-metadata + manifestRequirementsCheckHook + packaging + ] ++ (args.nativeCheckInputs or []); + + } // builtins.removeAttrs args [ "nativeCheckInputs" ] +) diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix new file mode 100644 index 0000000000..76317c9d0b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -0,0 +1,11 @@ +{ python +, makeSetupHook +}: + +makeSetupHook { + name = "manifest-requirements-check-hook"; + substitutions = { + pythonCheckInterpreter = python.interpreter; + checkManifest = ./check_manifest.py; + }; +} ./manifest-requirements-check-hook.sh diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh new file mode 100644 index 0000000000..74f29ca399 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.sh @@ -0,0 +1,25 @@ +# Setup hook to check HA manifest requirements +echo "Sourcing manifest-requirements-check-hook" + +function manifestCheckPhase() { + echo "Executing manifestCheckPhase" + runHook preCheck + + manifests=$(shopt -s nullglob; echo $out/custom_components/*/manifest.json) + + if [ ! -z "$manifests" ]; then + echo Checking manifests $manifests + @pythonCheckInterpreter@ @checkManifest@ $manifests + else + echo "No custom component manifests found in $out" >&2 + exit 1 + fi + + runHook postCheck + echo "Finished executing manifestCheckPhase" +} + +if [ -z "${dontCheckManifest-}" ] && [ -z "${installCheckPhase-}" ]; then + echo "Using manifestCheckPhase" + preDistPhases+=" manifestCheckPhase" +fi 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 8bbabc1db3..5c2a067b3f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,13 @@ # Do not edit! { - version = "2023.10.0"; + version = "2023.11.2"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ jaraco-abode + jaraco-functools ]; "accuweather" = ps: with ps; [ accuweather @@ -682,6 +683,8 @@ "cpuspeed" = ps: with ps; [ py-cpuinfo ]; + "cribl" = ps: with ps; [ + ]; "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud @@ -944,6 +947,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "eastron" = ps: with ps; [ + ]; "easyenergy" = ps: with ps; [ easyenergy ]; @@ -984,7 +989,6 @@ pythonegardia ]; "eight_sleep" = ps: with ps; [ - pyeight ]; "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra @@ -1245,6 +1249,9 @@ "fitbit" = ps: with ps; [ aiohttp-cors fitbit + fnv-hash-fast + psutil-home-assistant + sqlalchemy ]; "fivem" = ps: with ps; [ fivem-api @@ -1538,6 +1545,13 @@ psutil-home-assistant sqlalchemy ]; + "google_tasks" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "google_translate" = ps: with ps; [ gtts ]; @@ -1959,10 +1973,31 @@ aiohttp-cors aioimaplib ]; - "imap_email_content" = ps: with ps; [ + "improv_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors - aioimaplib - ]; + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: py-improv-ble-client "incomfort" = ps: with ps; [ incomfort-client ]; @@ -2370,6 +2405,9 @@ psutil-home-assistant sqlalchemy ]; + "local_todo" = ps: with ps; [ + ical + ]; "locative" = ps: with ps; [ aiohttp-cors ]; @@ -2485,7 +2523,6 @@ maxcube-api ]; "mazda" = ps: with ps; [ - pymazda ]; "meater" = ps: with ps; [ meater-python @@ -2772,7 +2809,8 @@ sqlalchemy ]; "myq" = ps: with ps; [ - ]; # missing inputs: python-myq + python-myq + ]; "mysensors" = ps: with ps; [ aiohttp-cors janus @@ -3241,6 +3279,8 @@ "poolsense" = ps: with ps; [ poolsense ]; + "portlandgeneral" = ps: with ps; [ + ]; "powerwall" = ps: with ps; [ tesla-powerwall ]; @@ -3332,6 +3372,7 @@ ]; "python_script" = ps: with ps; [ restrictedpython + restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -3464,6 +3505,21 @@ psutil-home-assistant sqlalchemy ]; + "recovery_mode" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + hass-nabucasa + hassil + home-assistant-frontend + home-assistant-intents + janus + mutagen + pillow + psutil-home-assistant + pyturbojpeg + sqlalchemy + webrtc-noise-gain + ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ @@ -3617,21 +3673,6 @@ "sabnzbd" = ps: with ps; [ pysabnzbd ]; - "safe_mode" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - hass-nabucasa - hassil - home-assistant-frontend - home-assistant-intents - janus - mutagen - pillow - psutil-home-assistant - pyturbojpeg - sqlalchemy - webrtc-noise-gain - ]; "saj" = ps: with ps; [ pysaj ]; @@ -3829,9 +3870,6 @@ pyudev sqlalchemy ]; - "shiftr" = ps: with ps; [ - paho-mqtt - ]; "shodan" = ps: with ps; [ shodan ]; @@ -4107,7 +4145,8 @@ subarulink ]; "suez_water" = ps: with ps; [ - ]; # missing inputs: pysuez + pysuez + ]; "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ @@ -4208,6 +4247,8 @@ "tailscale" = ps: with ps; [ tailscale ]; + "tami4" = ps: with ps; [ + ]; # missing inputs: Tami4EdgeAPI "tank_utility" = ps: with ps; [ tank-utility ]; @@ -4390,6 +4431,9 @@ ]; "tod" = ps: with ps; [ ]; + "todo" = ps: with ps; [ + aiohttp-cors + ]; "todoist" = ps: with ps; [ todoist-api-python ]; @@ -4698,7 +4742,8 @@ pyweatherflowudp ]; "weatherkit" = ps: with ps; [ - ]; # missing inputs: apple_weatherkit + apple-weatherkit + ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -4732,6 +4777,7 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiowithings fnv-hash-fast hass-nabucasa hassil @@ -4741,7 +4787,6 @@ pyturbojpeg sqlalchemy webrtc-noise-gain - withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors @@ -5230,6 +5275,7 @@ "google_mail" "google_pubsub" "google_sheets" + "google_tasks" "google_translate" "google_travel_time" "google_wifi" @@ -5289,7 +5335,6 @@ "image_processing" "image_upload" "imap" - "imap_email_content" "influxdb" "inkbird" "input_boolean" @@ -5346,6 +5391,7 @@ "local_calendar" "local_file" "local_ip" + "local_todo" "locative" "lock" "logbook" @@ -5405,6 +5451,7 @@ "mullvad" "mutesync" "my" + "myq" "mysensors" "mystrom" "mythicbeastsdns" @@ -5516,6 +5563,7 @@ "rdw" "recollect_waste" "recorder" + "recovery_mode" "reddit" "remote" "renault" @@ -5542,7 +5590,6 @@ "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" - "safe_mode" "samsungtv" "scene" "schedule" @@ -5655,6 +5702,7 @@ "time_date" "timer" "tod" + "todo" "todoist" "tolo" "tomato" @@ -5722,6 +5770,7 @@ "waze_travel_time" "weather" "weatherflow" + "weatherkit" "webhook" "webostv" "websocket_api" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/README.md b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/README.md new file mode 100644 index 0000000000..a7244b25c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/README.md @@ -0,0 +1,57 @@ +# Packaging guidelines + +## buildHomeAssistantComponent + +Custom components should be packaged using the + `buildHomeAssistantComponent` function, that is provided at top-level. +It builds upon `buildPythonPackage` but uses a custom install and check +phase. + +Python runtime dependencies can be directly consumed as unqualified +function arguments. Pass them into `propagatedBuildInputs`, for them to +be available to Home Assistant. + +Out-of-tree components need to use python packages from +`home-assistant.python.pkgs` as to not introduce conflicting package +versions into the Python environment. + + +**Example Boilerplate:** + +```nix +{ lib +, buildHomeAssistantcomponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent { + # pname, version + + src = fetchFromGithub { + # owner, repo, rev, hash + }; + + propagatedBuildInputs = [ + # python requirements, as specified in manifest.json + ]; + + meta = with lib; { + # changelog, description, homepage, license, maintainers + } +} + +## Package name normalization + +Apply the same normalization rules as defined for python packages in +[PEP503](https://peps.python.org/pep-0503/#normalized-names). +The name should be lowercased and dots, underlines or multiple +dashes should all be replaced by a single dash. + +## Manifest check + +The `buildHomeAssistantComponent` builder uses a hook to check whether +the dependencies specified in the `manifest.json` are present and +inside the specified version range. + +There shouldn't be a need to disable this hook, but you can set +`dontCheckManifest` to `true` in the derivation to achieve that. diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix new file mode 100644 index 0000000000..4a96b30596 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/default.nix @@ -0,0 +1,6 @@ +{ callPackage +}: + +{ + prometheus-sensor = callPackage ./prometheus-sensor {}; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix new file mode 100644 index 0000000000..07bcd9abec --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +}: + +buildHomeAssistantComponent rec { + pname = "prometheus-sensor"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mweinelt"; + repo = "ha-prometheus-sensor"; + rev = "refs/tags/${version}"; + hash = "sha256-10COLFXvmpm8ONLyx5c0yiQdtuP0SC2NKq/ZYHro9II="; + }; + + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/mweinelt/ha-prometheus-sensor/blob/${version}/CHANGELOG.md"; + description = "Import prometheus query results into Home Assistant"; + homepage = "https://github.com/mweinelt/ha-prometheus-sensor"; + maintainers = with maintainers; [ hexa ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/README.md b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/README.md new file mode 100644 index 0000000000..b67fd0fb91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/README.md @@ -0,0 +1,13 @@ +# Packaging guidelines + +## Entrypoint + +Every lovelace module has an entrypoint in the form of a `.js` file. By +default the nixos module will try to load `${pname}.js` when a module is +configured. + +The entrypoint used can be overridden in `passthru` like this: + +```nix +passthru.entrypoint = "demo-card-bundle.js"; +``` diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix new file mode 100644 index 0000000000..4bb1e63b5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -0,0 +1,8 @@ +{ callPackage +}: + +{ + mini-graph-card = callPackage ./mini-graph-card {}; + + mini-media-player = callPackage ./mini-media-player {}; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix new file mode 100644 index 0000000000..60942d5f4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "mini-graph-card"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kalkih"; + repo = "mini-graph-card"; + rev = "refs/tags/v${version}"; + hash = "sha256-AC4VawRtWTeHbFqDJ6oQchvUu08b4F3ManiPPXpyGPc="; + }; + + npmDepsHash = "sha256-0ErOTkcCnMqMTsTkVL320SxZaET/izFj9GiNWC2tQtQ="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/mini-graph-card-bundle.js $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "mini-graph-card-bundle.js"; + + meta = with lib; { + changelog = "https://github.com/kalkih/mini-graph-card/releases/tag/v${version}"; + description = "Minimalistic graph card for Home Assistant Lovelace UI"; + homepage = "https://github.com/kalkih/mini-graph-card"; + maintainers = with maintainers; [ hexa ]; + license = licenses.mit; + }; +} + diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix new file mode 100644 index 0000000000..6945b18bde --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "mini-media-player"; + version = "1.16.5"; + + src = fetchFromGitHub { + owner = "kalkih"; + repo = "mini-media-player"; + rev = "v${version}"; + hash = "sha256-ydkY7Qx2GMh4CpvvBAQubJ7PlxSscDZRJayn82bOczM="; + }; + + npmDepsHash = "sha256-v9NvZOrQPMOoG3LKACnu79jKgZtcnGiopWad+dFbplw="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v ./dist/mini-media-player-bundle.js $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "mini-media-player-bundle.js"; + + meta = with lib; { + changelog = "https://github.com/kalkih/mini-media-player/releases/tag/v${version}"; + description = "Minimalistic media card for Home Assistant Lovelace UI"; + homepage = "https://github.com/kalkih/mini-media-player"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index eb5367cda9..1c0de10079 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,26 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { + version = "0.2.4"; + src = fetchFromGitHub { + owner = "CorantGmbH"; + repo = "aioairq"; + rev = "refs/tags/v${version}"; + hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + }; + }); + + # https://github.com/home-assistant/core/pull/101913 + aiohttp = super.aiohttp.overridePythonAttrs (old: rec { + version = "3.8.5"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -57,16 +77,6 @@ let ]; }); - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { - version = "0.33"; - src = fetchFromGitHub { - owner = "ndokter"; - repo = "dsmr_parser"; - rev = "refs/tags/v${version}"; - hash = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w="; - }; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -87,6 +97,25 @@ let }; }); + intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { + version = "2.2.2"; + src = fetchFromGitHub { + owner = "jeeftor"; + repo = "intellifire4py"; + rev = "refs/tags/${version}"; + hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; + }; + nativeBuildInputs = with super; [ + setuptools + ]; + propagatedBuildInputs = with super; [ + aenum + aiohttp + pydantic + ]; + doCheck = false; # requires asynctest, which does not work on python 3.11 + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { @@ -96,6 +125,16 @@ let }; }); + justnimbus = super.justnimbus.overridePythonAttrs (oldAttrs: rec { + version = "0.6.0"; + src = fetchFromGitHub { + owner = "kvanzuijlen"; + repo = "justnimbus"; + rev = "refs/tags/${version}"; + hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + }; + }); + # moto tests are a nuissance moto = super.moto.overridePythonAttrs (_: { doCheck = false; @@ -153,6 +192,15 @@ let }; }); + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.9.6"; + src = fetchPypi { + pname = "psutil"; + inherit version; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; + }; + }); + py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { version = "2.1.4"; src = fetchFromGitHub { @@ -183,6 +231,16 @@ let }; }); + pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { + version = "0.2.3"; + src = fetchFromGitHub { + owner = "gagebenne"; + repo = "pydexcom"; + rev = "refs/tags/${version}"; + hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -192,6 +250,16 @@ let }; }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { + version = "0.8.6"; + src = fetchFromGitHub { + owner = "AustinBrunkhorst"; + repo = "pysnooz"; + rev = "refs/tags/v${version}"; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -201,6 +269,16 @@ let }; }); + python-tado = super.python-tado.overridePythonAttrs (oldAttrs: rec { + version = "0.15.0"; + src = fetchFromGitHub { + owner = "wmalgadey"; + repo = "PyTado"; + rev = "refs/tags/${version}"; + hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; + }; + }); + pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -211,46 +289,6 @@ let }; }); - python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec { - version = "13.15"; - src = fetchFromGitHub { - owner = "python-telegram-bot"; - repo = "python-telegram-bot"; - rev = "v${version}"; - hash = "sha256-EViSjr/nnuJIDTwV8j/O50hJkWV3M5aTNnWyzrinoyg="; - }; - propagatedBuildInputs = [ - self.apscheduler - self.cachetools - self.certifi - self.cryptography - self.decorator - self.future - self.tornado - self.urllib3 - ]; - setupPyGlobalFlags = [ "--with-upstream-urllib3" ]; - postPatch = '' - rm -r telegram/vendor - substituteInPlace requirements.txt \ - --replace "APScheduler==3.6.3" "APScheduler" \ - --replace "cachetools==4.2.2" "cachetools" \ - --replace "tornado==6.1" "tornado" - ''; - doCheck = false; - }); - - # Pinned due to API changes in 0.3.0 - tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { - version = "0.2.0"; - src = fetchFromGitHub { - owner = "frenck"; - repo = "python-tailscale"; - rev = "refs/tags/v${version}"; - hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -262,16 +300,6 @@ let }; }); - websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { - version = "11.0.1"; - src = fetchFromGitHub { - owner = "aaugustin"; - repo = "websockets"; - rev = "refs/tags/${version}"; - hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; - }; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -296,7 +324,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.0"; + hassVersion = "2023.11.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-UmgIQJRQRDMzjUO9lJVpKsIvrFHBzoXc5Kig69ZHttU="; + hash = "sha256-cnneRq0hIyvgKo0du/52ze0IVs8TgTPNQM3T1kyy03s="; }; # Secondary source is git for tests @@ -320,7 +348,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-M8TuH9oF4+6PuHDCHiGWxSnrQcOw/OsJVSfX/8XfyIM="; + hash = "sha256-OljfYmlXSJVoWWsd4jcSF4nI/FXHqRA8e4LN5AaPVv8="; }; nativeBuildInputs = with python.pkgs; [ @@ -336,6 +364,10 @@ in python.pkgs.buildPythonApplication rec { # leave this in, so users don't have to constantly update their downstream patch handling patches = [ + # Follow symlinks in /var/lib/hass/www + ./patches/static-symlinks.patch + + # Patch path to ffmpeg binary (substituteAll { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; @@ -459,6 +491,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_entity_registry.py::test_get_or_create_updates_data" # AssertionError: assert 2 == 1 "--deselect=tests/helpers/test_entity_values.py::test_override_single_value" + # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" + "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" # tests are located in tests/ "tests" ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 39f41f6fca..1c7bc02172 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 = "20231002.0"; + version = "20231030.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-19HFMuR7INHM805HwWyWS2qWXPOYuFjnpf0UP93tObg="; + hash = "sha256-qzodzqWpAXZjwBJkiCyBi5zzfpEqqtauJn2PKZ5UtJ0="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix index 5f815628a5..26fe812366 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.10.2"; + version = "2023.10.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk="; + hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; fetchSubmodules = true; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { postInstall = '' pushd intents # https://github.com/home-assistant/intents/blob/main/script/package#L18 - ${python.pythonForBuild.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data + ${python.pythonOnBuildForHost.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data popd ''; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py index 1df4d98fb4..bb5e709943 100755 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/parse-requirements.py @@ -56,6 +56,15 @@ EXTRA_COMPONENT_DEPS = { ], } +# Sometimes we have unstable versions for libraries that are not +# well-maintained. This allows us to mark our weird version as newer +# than a certain wanted version +OUR_VERSION_IS_NEWER_THAN = { + "blinkstick": "1.2.0", + "gps3": "0.33.3", + "pybluez": "0.22", +} + def run_sync(cmd: List[str]) -> None: @@ -226,7 +235,12 @@ def main() -> None: Version.parse(our_version) except InvalidVersion: print(f"Attribute {attr_name} has invalid version specifier {our_version}", file=sys.stderr) - attr_outdated = True + + # allow specifying that our unstable version is newer than some version + if newer_than_version := OUR_VERSION_IS_NEWER_THAN.get(attr_name): + attr_outdated = Version.parse(newer_than_version) < Version.parse(required_version) + else: + attr_outdated = True else: attr_outdated = Version.parse(our_version) < Version.parse(required_version) finally: diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/patches/static-symlinks.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/patches/static-symlinks.patch new file mode 100644 index 0000000000..7784a60f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/patches/static-symlinks.patch @@ -0,0 +1,37 @@ +diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py +index 2ec991750f..9a937006ce 100644 +--- a/homeassistant/components/frontend/__init__.py ++++ b/homeassistant/components/frontend/__init__.py +@@ -383,7 +383,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: + + local = hass.config.path("www") + if os.path.isdir(local): +- hass.http.register_static_path("/local", local, not is_dev) ++ hass.http.register_static_path("/local", local, not is_dev, follow_symlinks=True) + + # Can be removed in 2023 + hass.http.register_redirect("/config/server_control", "/developer-tools/yaml") +diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py +index 122b7b79ce..3cf2b7e0db 100644 +--- a/homeassistant/components/http/__init__.py ++++ b/homeassistant/components/http/__init__.py +@@ -411,16 +411,16 @@ class HomeAssistantHTTP: + ) + + def register_static_path( +- self, url_path: str, path: str, cache_headers: bool = True ++ self, url_path: str, path: str, cache_headers: bool = True, follow_symlinks: bool = False + ) -> None: + """Register a folder or file to serve as a static path.""" + if os.path.isdir(path): + if cache_headers: + resource: CachingStaticResource | web.StaticResource = ( +- CachingStaticResource(url_path, path) ++ CachingStaticResource(url_path, path, follow_symlinks=follow_symlinks) + ) + else: +- resource = web.StaticResource(url_path, path) ++ resource = web.StaticResource(url_path, path, follow_symlinks=follow_symlinks) + self.app.router.register_resource(resource) + self.app["allow_configured_cors"](resource) + return diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 2ede793de9..b3652e734f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.10.0"; + version = "2023.11.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-/RVv2gfODAiG5mPteeHOleqkQwmamCfliCGrf1eSIr4="; + hash = "sha256-stVfFXb5QfC+wZUSk53+jt/hb8kO1gCcgeOnHHpNlWE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index e4561cdcc3..63cd9558a6 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -49,6 +49,10 @@ let # tries to retrieve file from github "test_non_text_stdout_capture" ]; + sma = [ + # missing operating_status attribute in entity + "test_sensor_entities" + ]; vesync = [ # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration "test_async_get_config_entry_diagnostics__single_humidifier" @@ -128,6 +132,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ + # pinned version incompatible with urllib3>=2.0 + "telegram_bot" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; 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 279b1750b9..650b0c0c6c 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,22 +14,22 @@ , stdenv }: -buildGo121Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.120.3"; + version = "0.122.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-FYjDuGIsdGhPXOdYMQuoMp6L4MH70fpOymqw4+bu5hc="; + hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; }; - vendorHash = "sha256-LNMNqlb/aj+ZHuwMvtK//oWyi34mm47ShAAD427szS4="; + vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-quznAvgAFJJnKabsFZxAu7yDkAuvujg6of6En8JaFs4="; + hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ buildGo121Module rec { meta = with lib; { description = "EV Charge Controller"; homepage = "https://evcc.io"; - changelog = "https://github.com/andig/evcc/releases/tag/${version}"; + changelog = "https://github.com/evcc-io/evcc/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 87ba408e1f..4024f3cc4e 100644 --- a/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-p2h1XPVMTZ23nxu/rX/qOQ5DXOZ0ORaXR41ng4pgmmg="; + hash = "sha256-ANQbbKXA1G6O/qEK6frTp9J26nNM+NgVya6d6DsPrv4="; }; - npmDepsHash = "sha256-ZUdBXkQnwh0jrrSKukHeSv3HS1q24Qd12zVnpV71qIY="; + npmDepsHash = "sha256-sk1RqMX4aGJcjysN7udBSPnUvD1vLHdyZ88JQbReOqw="; preBuild = '' mkdir -p config diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 98a00afc51..c6e7ad1f56 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.57"; + version = "2.4.58"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-28y4Su6V4JXt+7geXrkmzNJOatpV3Ng8rssmLlz5TSo="; + sha256 = "sha256-+hbXKgeCEKVMR91b7y+Lm4oB2UkJpRRTlWs+xkQupMU="; }; # FIXME: -dev depends on -doc diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index 9cdc0c58ee..dd36489614 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , bzip2 , cmake , doxygen , fetchurl +, fetchpatch , fuse , libevent , xz @@ -23,6 +25,15 @@ stdenv.mkDerivation rec { sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533"; }; + patches = [ + # this patch fixes the build for glibc >= 2.38 + (fetchpatch { + name = "strlcpy-glibc238.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=0;bug=1052360;msg=10"; + hash = "sha256-uhQj+ZcHCV36Tm0pF/+JG59bSaRdTZCrMcKL3YhZTk8="; + }) + ]; + nativeBuildInputs = [ cmake doxygen pkg-config ]; buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix b/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix index 89058fd217..8713ee3539 100644 --- a/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/dufs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.36.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-WZ+tyrx4ayFyPmDJq6dGaTRiR6bSQq5k5iOfb+ETe/I="; + hash = "sha256-Q5t3FUT/ukGME+ZJXpLWnii2XCPrBVDAlbjW8FrpOZs="; }; - cargoHash = "sha256-HZiWmqIh21b12DP+hnx1pWBWgSa5j71kp6GCRKGMHv0="; + cargoHash = "sha256-6ybYfeufHr3ulTbKe27CDS5m1mCluPwS/5GYemYXat8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch index 1ff1fe66f1..fc10f59992 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch @@ -1,22 +1,29 @@ -From 1b6ad143c0f5f96c42f603bb93a72f788b88b622 Mon Sep 17 00:00:00 2001 +From 4a9739da420b9584d5b9582c19cf3f86a6a90609 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 12 May 2023 08:12:04 +0100 -Subject: [PATCH 1/2] nixpkgs: use system Python +Subject: [PATCH 1/3] nixpkgs: use system Python --- - bazel/python_dependencies.bzl | 4 ---- - bazel/repositories_extra.bzl | 13 +------------ - 2 files changed, 1 insertion(+), 16 deletions(-) + bazel/python_dependencies.bzl | 11 ++++------- + bazel/repositories_extra.bzl | 16 ---------------- + 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl -index 37c0183664..0bee5feb7e 100644 +index ea50bf30ba..b82f374720 100644 --- a/bazel/python_dependencies.bzl +++ b/bazel/python_dependencies.bzl -@@ -1,24 +1,20 @@ +@@ -1,27 +1,24 @@ load("@rules_python//python:pip.bzl", "pip_parse") --load("@python3_10//:defs.bzl", "interpreter") +-load("@python3_11//:defs.bzl", "interpreter") +-load("@envoy_toolshed//:packages.bzl", "load_packages") def envoy_python_dependencies(): +- # TODO(phlax): rename base_pip3 -> pip3 and remove this +- load_packages() ++ pip_parse( ++ name = "pip3", ++ requirements_lock = "@envoy_toolshed//:requirements.txt", ++ ) pip_parse( name = "base_pip3", - python_interpreter_target = interpreter, @@ -38,34 +45,39 @@ index 37c0183664..0bee5feb7e 100644 extra_pip_args = ["--require-hashes"], ) diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl -index 9d1b31c5d6..ac5605eb30 100644 +index 40d348073f..17b98b1ea1 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl -@@ -1,23 +1,12 @@ +@@ -1,29 +1,13 @@ load("@emsdk//:deps.bzl", emsdk_deps = "deps") -load("@rules_python//python:repositories.bzl", "python_register_toolchains") load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates") load("//bazel/external/cargo:crates.bzl", "raze_fetch_remote_crates") load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") +-def _python_minor_version(python_version): +- return "_".join(python_version.split(".")[:-1]) +- -# Python version for `rules_python` --PYTHON_VERSION = "3.10.2" +-PYTHON_VERSION = "3.11.3" +-PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION) - # Envoy deps that rely on a first stage of dependency loading in envoy_dependencies(). --def envoy_dependencies_extra(python_version = PYTHON_VERSION): -+def envoy_dependencies_extra(): + def envoy_dependencies_extra( +- python_version = PYTHON_VERSION, + ignore_root_user_error = False): emsdk_deps() raze_fetch_remote_crates() wasmtime_fetch_remote_crates() - # Registers underscored Python minor version - eg `python3_10` - python_register_toolchains( -- name = "python%s" % ("_".join(python_version.split(".")[:-1])), +- name = "python%s" % _python_minor_version(python_version), - python_version = python_version, -- ignore_root_user_error = True, +- ignore_root_user_error = ignore_root_user_error, - ) - aspect_bazel_lib_dependencies() -- -2.40.0 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch index 422f926e01..494b1e4e72 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch @@ -1,7 +1,7 @@ -From 30e059d652bd4e352e2c1dc3c44d03a1e42ff912 Mon Sep 17 00:00:00 2001 +From 10e577a3c300f76ead5a5512f2fe970f12e46592 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 12 May 2023 08:13:21 +0100 -Subject: [PATCH 2/2] nixpkgs: use system Go +Subject: [PATCH 2/3] nixpkgs: use system Go --- bazel/dependency_imports.bzl | 29 +---------------------------- @@ -9,11 +9,11 @@ Subject: [PATCH 2/2] nixpkgs: use system Go 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index 681617f1b8..a10c560baf 100644 +index b743a1936d..afa04ef5c0 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -17,7 +17,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis - load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") +@@ -18,7 +18,7 @@ load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") + load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies") # go version for rules_go -GO_VERSION = "1.18" @@ -22,17 +22,17 @@ index 681617f1b8..a10c560baf 100644 JQ_VERSION = "1.6" YQ_VERSION = "4.24.4" @@ -27,7 +27,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y - rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False) + rules_foreign_cc_dependencies() go_rules_dependencies() go_register_toolchains(go_version) - envoy_download_go_sdks(go_version) gazelle_dependencies(go_sdk = "go_sdk") apple_rules_dependencies() pip_dependencies() -@@ -146,29 +145,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y - # use_category = ["api"], - # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28" +@@ -148,29 +147,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y ) + + protoc_gen_jsonschema_go_dependencies() - -def envoy_download_go_sdks(go_version): - go_download_sdk( @@ -60,10 +60,10 @@ index 681617f1b8..a10c560baf 100644 - version = go_version, - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index 6d2cf2014c..a8375bcdef 100644 +index 71667227f7..b10a47d344 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl -@@ -196,9 +196,6 @@ def _go_deps(skip_targets): +@@ -215,9 +215,6 @@ def _go_deps(skip_targets): if "io_bazel_rules_go" not in skip_targets: external_http_archive( name = "io_bazel_rules_go", @@ -74,5 +74,5 @@ index 6d2cf2014c..a8375bcdef 100644 external_http_archive("bazel_gazelle") -- -2.40.0 +2.42.0 diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch new file mode 100644 index 0000000000..5a24e7e4a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -0,0 +1,29 @@ +From 6175deb13a2df8bd25a56021ba8754e4be445219 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Fri, 13 Oct 2023 21:42:51 +0000 +Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains + +--- + bazel/dependency_imports.bzl | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl +index afa04ef5c0..a5ffaf4ff3 100644 +--- a/bazel/dependency_imports.bzl ++++ b/bazel/dependency_imports.bzl +@@ -24,7 +24,11 @@ JQ_VERSION = "1.6" + YQ_VERSION = "4.24.4" + + def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION): +- rules_foreign_cc_dependencies() ++ rules_foreign_cc_dependencies( ++ register_default_tools=False, # no prebuilt toolchains ++ register_built_tools=False, # nor from source ++ register_preinstalled_tools=True, # use host tools (default) ++ ) + go_rules_dependencies() + go_register_toolchains(go_version) + gazelle_dependencies(go_sdk = "go_sdk") +-- +2.42.0 + diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix index 7c75833168..0b1d88e43e 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/default.nix @@ -14,7 +14,7 @@ , linuxHeaders , nixosTests -# v8 (upstream default), wavm, wamr, wasmtime, disabled + # v8 (upstream default), wavm, wamr, wasmtime, disabled , wasmRuntime ? "wamr" }: @@ -24,8 +24,8 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.26.4"; - rev = "cfa32deca25ac57c2bbecdad72807a9b13493fc1"; + version = "1.27.1"; + rev = "6b9db09c69965d5bfb37bdd29693f8b7f9e9e9ec"; }; in buildBazelPackage rec { @@ -36,7 +36,7 @@ buildBazelPackage rec { owner = "envoyproxy"; repo = "envoy"; inherit (srcVer) rev; - hash = "sha256-j5QyqT+9tpChg5JxdSw21rtb9AI036vIiAmzCNzGWGc="; + hash = "sha256-eZ3UCVqQbtK2GbawUVef5+BMSQbqe+owtwH+b887mQE="; postFetch = '' chmod -R +w $out @@ -59,6 +59,9 @@ buildBazelPackage rec { # use system Go, not bazel-fetched binary Go ./0002-nixpkgs-use-system-Go.patch + + # use system C/C++ tools + ./0003-nixpkgs-use-system-C-C-toolchains.patch ]; nativeBuildInputs = [ @@ -80,8 +83,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-MvY4cLdLOeb7+Zt7Oz7Kzz1+dsUceemP/V02egvHg+M="; - aarch64-linux = "sha256-U5mnAq8RHDygxiYeNc0HDeOgoaGyrd0MPjHKdyUkM0A="; + x86_64-linux = "sha256-OQ4vg4S3DpM+Zo+igncx3AXJnL8FkJbwh7KnBhbnCUM="; + aarch64-linux = "sha256-/X8i1vzQ4QvFxi1+5rc1/CGHmRhhu5F3X5A3PgbW+Mc="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/http/envoy/protobuf.patch b/third_party/nixpkgs/pkgs/servers/http/envoy/protobuf.patch index 1cc071bd86..dc70263503 100644 --- a/third_party/nixpkgs/pkgs/servers/http/envoy/protobuf.patch +++ b/third_party/nixpkgs/pkgs/servers/http/envoy/protobuf.patch @@ -1,33 +1,39 @@ diff --git a/BUILD.bazel b/BUILD.bazel -index 0f6e41e3a..c0d2bbccf 100644 +index 637882c49..2cb08f1b0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel -@@ -138,7 +138,7 @@ cc_library( +@@ -165,6 +165,8 @@ alias( visibility = ["//visibility:public"], - deps = [":protobuf_lite"] + select({ - "//build_defs:config_msvc": [], -- "//conditions:default": ["@zlib//:zlib"], -+ "//conditions:default": ["//external:zlib"], - }), ) -@@ -755,7 +820,7 @@ cc_test( - "@com_google_googletest//:gtest_main", - ] + select({ - "//build_defs:config_msvc": [], -- "//conditions:default": ["@zlib//:zlib"], -+ "//conditions:default": ["//external:zlib"], - }), ++# Envoy: Patch ++ + cc_binary( + name = "protoc", + copts = COPTS, +@@ -173,6 +175,14 @@ cc_binary( + deps = ["//src/google/protobuf/compiler:protoc_lib"], ) ++alias( ++ name = "protobuf_python_genproto", ++ actual = "//python:well_known_types_py_pb2_genproto", ++ visibility = ["//visibility:public"], ++) ++ ++# /Envoy: Patch ++ + cc_binary( + name = "protoc_static", + copts = COPTS, diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py -index e7555ee10..a93beb1c5 100644 +index 88de4cf8a..b3e046997 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -31,3 +31,10 @@ # Copyright 2007 Google Inc. All Rights Reserved. - __version__ = '4.21.12' + __version__ = '4.23.1' + + +if __name__ != '__main__': @@ -35,19 +41,76 @@ index e7555ee10..a93beb1c5 100644 + __import__('pkg_resources').declare_namespace(__name__) + except ImportError: + __path__ = __import__('pkgutil').extend_path(__path__, __name__) -diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc -index 9993811dc..d80006af7 100644 ---- a/src/google/protobuf/generated_message_tctable_lite.cc -+++ b/src/google/protobuf/generated_message_tctable_lite.cc -@@ -343,11 +343,6 @@ const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) { +diff --git a/src/google/protobuf/compiler/BUILD.bazel b/src/google/protobuf/compiler/BUILD.bazel +index a2171c806..8aec6187f 100644 +--- a/src/google/protobuf/compiler/BUILD.bazel ++++ b/src/google/protobuf/compiler/BUILD.bazel +@@ -306,7 +306,7 @@ cc_library( + srcs = ["retention.cc"], + hdrs = ["retention.h"], + include_prefix = "google/protobuf/compiler", +- visibility = ["//src/google/protobuf:__subpackages__"], ++ visibility = ["//visibility:public"], + deps = [ + "//src/google/protobuf:protobuf_nowkt", + "@com_google_absl//absl/types:span", +diff --git a/src/google/protobuf/io/BUILD.bazel b/src/google/protobuf/io/BUILD.bazel +index 8f39625c2..2c2c73dcd 100644 +--- a/src/google/protobuf/io/BUILD.bazel ++++ b/src/google/protobuf/io/BUILD.bazel +@@ -142,7 +142,7 @@ cc_library( + "@com_google_absl//absl/log:absl_log", + ] + select({ + "//build_defs:config_msvc": [], +- "//conditions:default": ["@zlib//:zlib"], ++ "//conditions:default": ["//external:zlib"], + }), + ) - namespace { +diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h +index 869ebf100..fec92e2b1 100644 +--- a/src/google/protobuf/map.h ++++ b/src/google/protobuf/map.h +@@ -883,7 +883,7 @@ class KeyMapBase : public UntypedMapBase { + TreeConvert(b); + } + ABSL_DCHECK(TableEntryIsTree(b)) +- << (void*)table_[b] << " " << (uintptr_t)table_[b]; ++ << reinterpret_cast(table_[b]) << " " << static_cast(table_[b]); + InsertUniqueInTree(b, node); + index_of_first_non_null_ = (std::min)(index_of_first_non_null_, b); + } +diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h +index 70b12b1e7..b8f46db45 100644 +--- a/src/google/protobuf/map_field.h ++++ b/src/google/protobuf/map_field.h +@@ -345,7 +345,7 @@ class PROTOBUF_EXPORT MapFieldBase : public MapFieldBaseForParse { --// Offset returns the address `offset` bytes after `base`. --inline void* Offset(void* base, uint32_t offset) { -- return static_cast(base) + offset; --} -- - // InvertPacked changes tag bits from the given wire type to length - // delimited. This is the difference expected between packed and non-packed - // repeated fields. + protected: + // "protected" stops users from deleting a `MapFieldBase *` +- ~MapFieldBase(); ++ virtual ~MapFieldBase(); + + public: + // Returns reference to internal repeated field. Data written using +diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc +index 1c6a24945..6186c2ad1 100644 +--- a/src/google/protobuf/port_def.inc ++++ b/src/google/protobuf/port_def.inc +@@ -1004,7 +1004,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + // Turn on -Wdeprecated-enum-enum-conversion. This deprecation comes in C++20 + // via http://wg21.link/p1120r0. +-#pragma clang diagnostic error "-Wdeprecated-enum-enum-conversion" ++// #pragma clang diagnostic error "-Wdeprecated-enum-enum-conversion" + // This error has been generally flaky, but we need to disable it specifically + // to fix https://github.com/protocolbuffers/protobuf/issues/12313 + #pragma clang diagnostic ignored "-Wunused-parameter" +@@ -1062,6 +1062,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), + #pragma warning(disable: 4125) + #endif + ++#pragma GCC diagnostic ignored "-Wundef" + #if PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII + #define PROTOBUF_DEBUG true + #else diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/11.x.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/11.x.nix new file mode 100644 index 0000000000..3196b24d74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/11.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "11.0.18"; + hash = "sha256-HxtO2r6YWo6+MAYUgk7dNSPDqQZoyO9t/8NdI5pPkL4="; +} diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/12.x.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/12.x.nix new file mode 100644 index 0000000000..4dba445b6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/12.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "12.0.3"; + hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; +} diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/common.nix similarity index 73% rename from third_party/nixpkgs/pkgs/servers/http/jetty/default.nix rename to third_party/nixpkgs/pkgs/servers/http/jetty/common.nix index efcce583ce..83adac4ddd 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/common.nix @@ -1,11 +1,15 @@ +{ version, hash }: + { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.16"; + + inherit version; + src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-iL1s4o/1Hds0N/fzXgwOMriPtZNG7ei2t4frF1ImW+E="; + inherit hash; }; dontBuild = true; @@ -17,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Web server and javax.servlet container"; - homepage = "https://www.eclipse.org/jetty/"; + homepage = "https://eclipse.dev/jetty/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; + maintainers = with maintainers; [ emmanuelrosa anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index b0bb720c21..7a5d6f5e55 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -15,26 +15,15 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.71"; + version = "1.4.73"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-uLaRXaIDlv3DVN8zJNXkQBabLl6nhZ46d1IThBMlr6w="; + sha256 = "sha256-gYgW0LMUsKqHKKcHZRNDX21esifzthMjRo4fENvoTKg="; }; - patches = [ - # disable tests for des/md5, which we don't support any more - ./disable-legacy-crypt-tests.patch - ]; - postPatch = '' patchShebangs tests - # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests - sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm - # it's difficult to prevent this test from trying to use /var/tmp (which - # the sandbox doesn't have) so until libredirect has support for mkstemp - # calls it's easiest to disable it - sed -i '/test_mod_ssi/d' src/t/test_mod.c ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch b/third_party/nixpkgs/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch deleted file mode 100644 index 4a411c0b98..0000000000 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -uNr lighttpd-1.4.71.orig/tests/mod-fastcgi.t lighttpd-1.4.71.new/tests/mod-fastcgi.t ---- lighttpd-1.4.71.orig/tests/mod-fastcgi.t 2023-05-27 21:56:16.000000000 +0200 -+++ lighttpd-1.4.71.new/tests/mod-fastcgi.t 2023-06-01 07:01:59.789873512 +0200 -@@ -79,7 +79,7 @@ - ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - - $t->{REQUEST} = ( <handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); - - SKIP: { -- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; -+ skip "no crypt-des", 2; - $t->{REQUEST} = ( <handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); - - SKIP: { -- skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; -- skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; -- skip "no crypt-md5 under openbsd",1 if $^O eq 'openbsd'; -+ skip "no crypt-md5", 1; - $t->{REQUEST} = ( < pin.json << EOF { "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcHash": "$src_hash", + "srcHash": "sha256-$src_hash", "yarnSha256": "$yarn_sha256" } EOF diff --git a/third_party/nixpkgs/pkgs/servers/jibri/default.nix b/third_party/nixpkgs/pkgs/servers/jibri/default.nix index 108c99ff04..8ac17d930f 100644 --- a/third_party/nixpkgs/pkgs/servers/jibri/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-140-gccc7278"; + version = "8.0-145-g1a4bb8e"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "TiKCK41ar3X1aOrGitnNBr/iWru1HOjjGkwLBB76M1M="; + sha256 = "Qemr2108R/Lg1C5UvWQbK7PSbrKvBkfATNpvFDqJ3bI="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/jicofo/default.nix b/third_party/nixpkgs/pkgs/servers/jicofo/default.nix index 4bee944a71..bdae8d3f32 100644 --- a/third_party/nixpkgs/pkgs/servers/jicofo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1038"; + version = "1.0-1050"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "9VO3bKOoHtl/q6gEmwi8Lc4GXgJSyFJ7jxKfaKQ549c="; + sha256 = "fenxq6syLoKV9jgj8qN7JrkWFeFWSk1QmK7o2hLhwyA="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index 0a4cbb840b..3b14ac17c1 100644 --- a/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-69-gad606ca2"; + version = "2.3-44-g8983b11f"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "+5fcxUiCMy45CdDuORU5Xo//f4iAAJEzt1gO+fKU43c="; + sha256 = "TUWACKQz4wEGv2VKqKsuQLjtJZr24gtVZ4l7LCXe7VE="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock b/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock new file mode 100644 index 0000000000..b1c3081224 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/kanidm/Cargo.lock @@ -0,0 +1,6715 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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 = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "argon2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "asn1-rs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "assert_cmd" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "async-compression" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 2.0.38", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "authenticator-ctap2-2021" +version = "0.3.2-dev.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06c690e5e2800f70c0cf8773a9fe7680d66e719dae9b4cabedd13ef4885d056" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "cfg-if", + "core-foundation", + "devd-rs", + "libc", + "libudev", + "log", + "memoffset 0.6.5", + "nom", + "openssl", + "openssl-sys", + "rand", + "runloop", + "serde", + "serde_bytes", + "serde_cbor", + "serde_json", + "sha2 0.10.8", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "axum-macros", + "bitflags 1.3.2", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "multer", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-auth" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe42cdd03ddd244e9e2f5ceb7c6e1d6a123db07cdb8570250392459ef635a016" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.13.1", + "http", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-csp" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4faf3873ea8d6828e5705070e10fdf4f61420d22523835a2a140ae4b2e8d2526" +dependencies = [ + "axum", + "http", + "regex", + "tokio", +] + +[[package]] +name = "axum-macros" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "axum-server" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "openssl", + "pin-project-lite", + "tokio", + "tokio-openssl", + "tower-service", +] + +[[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 = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + +[[package]] +name = "base64" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "base64urlsafedata" +version = "0.1.3" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64 0.21.5", + "paste 1.0.14", + "serde", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.66.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease 0.2.15", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.38", + "which", +] + +[[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 = "bitfield" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[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.4", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array 0.14.7", +] + +[[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 = "boolinator" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "regex-automata 0.4.3", + "serde", +] + +[[package]] +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +dependencies = [ + "num-traits", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[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.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[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 = "checked_int_cast" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clru" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compact_jwt" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa76ef19968577838a34d02848136bb9b6bdbfd7675fb968fe9c931bc434b33" +dependencies = [ + "base64 0.13.1", + "base64urlsafedata", + "hex", + "openssl", + "serde", + "serde_json", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "concread" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80f1d231b98d340d3b9a5d2ba3bd86cd25498ee1242d2e3a61916bf6f8f538a6" +dependencies = [ + "ahash 0.7.7", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", + "lru 0.7.8", + "smallvec", + "sptr", + "tokio", + "tracing", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +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 = "cron" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot 0.12.1", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array 0.14.7", + "typenum", +] + +[[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 = "cursive" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +dependencies = [ + "ahash 0.8.6", + "cfg-if", + "crossbeam-channel", + "crossterm", + "cursive_core", + "lazy_static", + "libc", + "log", + "signal-hook", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "cursive_core" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +dependencies = [ + "ahash 0.8.6", + "crossbeam-channel", + "enum-map", + "enumset", + "lazy_static", + "log", + "num", + "owning_ref", + "time", + "unicode-segmentation", + "unicode-width", + "xi-unicode", +] + +[[package]] +name = "daemon" +version = "1.1.0-rc.15-dev" +dependencies = [ + "clap", + "clap_complete", + "fs2", + "futures", + "kanidm_build_profiles", + "kanidm_lib_file_permissions", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_core", + "reqwest", + "sd-notify", + "serde", + "sketching", + "tikv-jemallocator", + "tokio", + "tokio-util", + "toml", + "whoami", +] + +[[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", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[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", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "devd-rs" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9313f104b590510b46fc01c0a324fc76505c13871454d3c48490468d04c8d395" +dependencies = [ + "libc", + "nom", +] + +[[package]] +name = "dialoguer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +dependencies = [ + "console", + "shell-words", + "tempfile", + "zeroize", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array 0.12.4", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "dyn-clone" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-iterator" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "enum-map" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53337c2dbf26a3c31eccc73a37b10c1614e8d4ae99b6a50d553e8936423c1f16" +dependencies = [ + "enum-map-derive", +] + +[[package]] +name = "enum-map-derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "enumset" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +dependencies = [ + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "escargot" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "768064bd3a0e2bedcba91dc87ace90beea91acc41b6a01a3ca8e9aa8827461bf" +dependencies = [ + "log", + "once_cell", + "serde", + "serde_json", +] + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[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 = "fallible_collections" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "fantoccini" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65f0fbe245d714b596ba5802b46f937f5ce68dcae0f32f9a70b5c3b04d3c6f64" +dependencies = [ + "base64 0.13.1", + "cookie", + "futures-core", + "futures-util", + "http", + "hyper", + "hyper-tls", + "mime", + "serde", + "serde_json", + "time", + "tokio", + "url", + "webdriver", +] + +[[package]] +name = "faster-hex" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +dependencies = [ + "serde", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fernet" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3364d69f691f3903b1a71605fa04f40a7c2d259f0f0512347e36d19a63debf1f" +dependencies = [ + "base64 0.21.5", + "byteorder", + "getrandom", + "openssl", + "zeroize", +] + +[[package]] +name = "file-id" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13be71e6ca82e91bc0cb862bebaac0b2d1924a5a1d970c822b2f98b63fda8c3" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-concurrency" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "113411b30b3a4fd9aba3eb9654f436976b71bc7f709318aeae7f8e90f74a71d6" +dependencies = [ + "async-trait", + "futures-core", + "pin-project", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +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.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gix" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06a8c9f9452078f474fecd2880de84819b8c77224ab62273275b646bf785f906" +dependencies = [ + "gix-actor", + "gix-commitgraph", + "gix-config", + "gix-date", + "gix-diff", + "gix-discover", + "gix-features", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-hashtable", + "gix-lock", + "gix-macros", + "gix-object", + "gix-odb", + "gix-pack", + "gix-path", + "gix-ref", + "gix-refspec", + "gix-revision", + "gix-revwalk", + "gix-sec", + "gix-tempfile", + "gix-trace", + "gix-traverse", + "gix-url", + "gix-utils", + "gix-validate", + "once_cell", + "parking_lot 0.12.1", + "smallvec", + "thiserror", + "unicode-normalization", +] + +[[package]] +name = "gix-actor" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8c6778cc03bca978b2575a03e04e5ba6f430a9dd9b0f1259f0a8a9a5e5cc66" +dependencies = [ + "bstr", + "btoi", + "gix-date", + "itoa", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-chunk" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-commitgraph" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4676ede3a7d37e7028e2889830349a6aca22efc1d2f2dd9fa3351c1a8ddb0c6a" +dependencies = [ + "bstr", + "gix-chunk", + "gix-features", + "gix-hash", + "memmap2", + "thiserror", +] + +[[package]] +name = "gix-config" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1108c4ac88248dd25cc8ab0d0dae796e619fb72d92f88e30e00b29d61bb93cc4" +dependencies = [ + "bstr", + "gix-config-value", + "gix-features", + "gix-glob", + "gix-path", + "gix-ref", + "gix-sec", + "memchr", + "once_cell", + "smallvec", + "thiserror", + "unicode-bom", + "winnow", +] + +[[package]] +name = "gix-config-value" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" +dependencies = [ + "bitflags 2.4.1", + "bstr", + "gix-path", + "libc", + "thiserror", +] + +[[package]] +name = "gix-date" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" +dependencies = [ + "bstr", + "itoa", + "thiserror", + "time", +] + +[[package]] +name = "gix-diff" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45e342d148373bd9070d557e6fb1280aeae29a3e05e32506682d027278501eb" +dependencies = [ + "gix-hash", + "gix-object", + "thiserror", +] + +[[package]] +name = "gix-discover" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4cacda5ee9dd1b38b0e2506834e40e66c08cf050ef55c344334c76745f277b" +dependencies = [ + "bstr", + "dunce", + "gix-hash", + "gix-path", + "gix-ref", + "gix-sec", + "thiserror", +] + +[[package]] +name = "gix-features" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f414c99e1a7abc69b21f3225a6539d203b0513f1d1d448607c4ea81cdcf9ee59" +dependencies = [ + "crc32fast", + "flate2", + "gix-hash", + "gix-trace", + "libc", + "once_cell", + "prodash", + "sha1_smol", + "thiserror", + "walkdir", +] + +[[package]] +name = "gix-fs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "404795da3d4c660c9ab6c3b2ad76d459636d1e1e4b37b0c7ff68eee898c298d4" +dependencies = [ + "gix-features", +] + +[[package]] +name = "gix-glob" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ac79c444193b0660fe0c0925d338bd338bd643e32138784dccfb12c628b892" +dependencies = [ + "bitflags 2.4.1", + "bstr", + "gix-features", + "gix-path", +] + +[[package]] +name = "gix-hash" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" +dependencies = [ + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-hashtable" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" +dependencies = [ + "gix-hash", + "hashbrown 0.14.2", + "parking_lot 0.12.1", +] + +[[package]] +name = "gix-lock" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1568c3d90594c60d52670f325f5db88c2d572e85c8dd45fabc23d91cadb0fd52" +dependencies = [ + "gix-tempfile", + "gix-utils", + "thiserror", +] + +[[package]] +name = "gix-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "gix-object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5528d5b2c984044d547e696e44a8c45fa122e83cd8c2ac1da69bd474336be8" +dependencies = [ + "bstr", + "btoi", + "gix-actor", + "gix-date", + "gix-features", + "gix-hash", + "gix-validate", + "itoa", + "smallvec", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-odb" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0446eca295459deb3d6dd6ed7d44a631479f1b7381d8087166605c7a9f717c6" +dependencies = [ + "arc-swap", + "gix-date", + "gix-features", + "gix-hash", + "gix-object", + "gix-pack", + "gix-path", + "gix-quote", + "parking_lot 0.12.1", + "tempfile", + "thiserror", +] + +[[package]] +name = "gix-pack" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be19ee650300d7cbac5829b637685ec44a8d921a7c2eaff8a245d8f2f008870c" +dependencies = [ + "clru", + "gix-chunk", + "gix-features", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-path", + "gix-tempfile", + "memmap2", + "parking_lot 0.12.1", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +dependencies = [ + "bstr", + "gix-trace", + "home", + "once_cell", + "thiserror", +] + +[[package]] +name = "gix-quote" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +dependencies = [ + "bstr", + "btoi", + "thiserror", +] + +[[package]] +name = "gix-ref" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cccbfa8d5cd9b86465f27a521e0c017de54b92d9fd37c143e49c658a2f04f3a" +dependencies = [ + "gix-actor", + "gix-date", + "gix-features", + "gix-fs", + "gix-hash", + "gix-lock", + "gix-object", + "gix-path", + "gix-tempfile", + "gix-validate", + "memmap2", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-refspec" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678ba30d95baa5462df9875628ed40655d5f5b8aba7028de86ed57f36e762c6c" +dependencies = [ + "bstr", + "gix-hash", + "gix-revision", + "gix-validate", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-revision" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e80a5992ae446fe1745dd26523b86084e3f1b6b3e35377fe09b4f35ac8f151" +dependencies = [ + "bstr", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "gix-trace", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b806349bc1f668e09035800e07ac8045da4e39a8925a245d93142c4802224ec1" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-sec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" +dependencies = [ + "bitflags 2.4.1", + "gix-path", + "libc", + "windows 0.48.0", +] + +[[package]] +name = "gix-tempfile" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2762b91ff95e27ff3ea95758c0d4efacd7435a1be3629622928b8276de0f72a8" +dependencies = [ + "gix-fs", + "libc", + "once_cell", + "parking_lot 0.12.1", + "tempfile", +] + +[[package]] +name = "gix-trace" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" + +[[package]] +name = "gix-traverse" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec6358f8373fb018af8fc96c9d2ec6a5b66999e2377dc40b7801351fec409ed" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-url" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c79d595b99a6c7ab274f3c991735a0c0f5a816a3da460f513c48edf1c7bf2cc" +dependencies = [ + "bstr", + "gix-features", + "gix-path", + "home", + "thiserror", + "url", +] + +[[package]] +name = "gix-utils" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +dependencies = [ + "fastrand", +] + +[[package]] +name = "gix-validate" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" +dependencies = [ + "bstr", + "thiserror", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +dependencies = [ + "gloo-console", + "gloo-dialogs", + "gloo-events", + "gloo-file", + "gloo-history", + "gloo-net", + "gloo-render", + "gloo-storage", + "gloo-timers 0.2.6", + "gloo-utils 0.1.7", + "gloo-worker", +] + +[[package]] +name = "gloo-console" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" +dependencies = [ + "futures-channel", + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +dependencies = [ + "gloo-events", + "gloo-utils 0.1.7", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.1.7", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[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 = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +dependencies = [ + "anymap2", + "bincode", + "gloo-console", + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "headers" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +dependencies = [ + "base64 0.21.5", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "hostname-validator" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +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 = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "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.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +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 = "idlset" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340756d15be4b22d5e501bad90a9f68fcdc6b9b7d2f6d6afe350645e9839dac6" +dependencies = [ + "serde", + "serde_derive", + "smallvec", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-iter", + "num-rational 0.3.2", + "num-traits", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif", + "jpeg-decoder", + "num-rational 0.4.1", + "num-traits", +] + +[[package]] +name = "implicit-clone" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c6ecbd987bb94f1f3c76c6787879756cf4b6f73bfff48d79308e8c56b46f65f" +dependencies = [ + "indexmap 1.9.3", +] + +[[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.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.48.0", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kanidm-ipa-sync" +version = "1.1.0-rc.15-dev" +dependencies = [ + "base64urlsafedata", + "chrono", + "clap", + "clap_complete", + "cron", + "kanidm_client", + "kanidm_lib_file_permissions", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_lib", + "ldap3_client", + "serde", + "serde_json", + "tokio", + "toml", + "tracing", + "tracing-subscriber", + "url", + "uuid", +] + +[[package]] +name = "kanidm-ldap-sync" +version = "1.1.0-rc.15-dev" +dependencies = [ + "base64urlsafedata", + "chrono", + "clap", + "clap_complete", + "cron", + "kanidm_client", + "kanidm_lib_file_permissions", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_lib", + "ldap3_client", + "serde", + "serde_json", + "sketching", + "tokio", + "toml", + "tracing", + "tracing-subscriber", + "url", + "uuid", +] + +[[package]] +name = "kanidm_build_profiles" +version = "1.1.0-rc.15-dev" +dependencies = [ + "base64 0.21.5", + "gix", + "serde", + "toml", +] + +[[package]] +name = "kanidm_client" +version = "1.1.0-rc.15-dev" +dependencies = [ + "hyper", + "kanidm_lib_file_permissions", + "kanidm_proto", + "reqwest", + "serde", + "serde_json", + "time", + "tokio", + "toml", + "tracing", + "url", + "uuid", + "webauthn-rs-proto", +] + +[[package]] +name = "kanidm_lib_crypto" +version = "1.1.0-rc.15-dev" +dependencies = [ + "argon2", + "base64 0.21.5", + "base64urlsafedata", + "hex", + "kanidm_proto", + "openssl", + "openssl-sys", + "rand", + "serde", + "sketching", + "tracing", + "tss-esapi", + "uuid", +] + +[[package]] +name = "kanidm_lib_file_permissions" +version = "1.1.0-rc.15-dev" +dependencies = [ + "kanidm_utils_users", + "whoami", +] + +[[package]] +name = "kanidm_proto" +version = "1.1.0-rc.15-dev" +dependencies = [ + "base32", + "base64urlsafedata", + "num_enum", + "scim_proto", + "serde", + "serde_json", + "serde_with", + "time", + "tracing", + "url", + "urlencoding", + "utoipa", + "uuid", + "webauthn-rs-proto", +] + +[[package]] +name = "kanidm_tools" +version = "1.1.0-rc.15-dev" +dependencies = [ + "async-recursion", + "clap", + "clap_complete", + "compact_jwt", + "cursive", + "dialoguer", + "futures-concurrency", + "kanidm_build_profiles", + "kanidm_client", + "kanidm_proto", + "lazy_static", + "libc", + "qrcode", + "regex", + "rpassword 7.2.0", + "serde", + "serde_json", + "shellexpand", + "sketching", + "time", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "uuid", + "webauthn-authenticator-rs", + "zxcvbn", +] + +[[package]] +name = "kanidm_unix_int" +version = "1.1.0-rc.15-dev" +dependencies = [ + "async-trait", + "base64urlsafedata", + "bytes", + "clap", + "clap_complete", + "csv", + "futures", + "hashbrown 0.14.2", + "kanidm_build_profiles", + "kanidm_client", + "kanidm_lib_crypto", + "kanidm_lib_file_permissions", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_core", + "kanidmd_testkit", + "libc", + "libsqlite3-sys", + "lru 0.8.1", + "notify-debouncer-full", + "rpassword 7.2.0", + "rusqlite", + "selinux", + "serde", + "serde_json", + "sketching", + "tokio", + "tokio-util", + "toml", + "tracing", + "tss-esapi", + "uuid", + "walkdir", +] + +[[package]] +name = "kanidm_utils_users" +version = "1.1.0-rc.15-dev" +dependencies = [ + "libc", +] + +[[package]] +name = "kanidmd_core" +version = "1.1.0-rc.15-dev" +dependencies = [ + "async-trait", + "axum", + "axum-auth", + "axum-csp", + "axum-macros", + "axum-server", + "bytes", + "chrono", + "compact_jwt", + "cron", + "filetime", + "futures", + "futures-util", + "hashbrown 0.14.2", + "http", + "hyper", + "kanidm_build_profiles", + "kanidm_lib_crypto", + "kanidm_lib_file_permissions", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_lib", + "ldap3_proto", + "libc", + "openssl", + "rand", + "regex", + "serde", + "serde_json", + "serde_with", + "sketching", + "tempfile", + "time", + "tokio", + "tokio-openssl", + "tokio-util", + "toml", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "url", + "urlencoding", + "utoipa", + "utoipa-swagger-ui", + "uuid", + "walkdir", +] + +[[package]] +name = "kanidmd_lib" +version = "1.1.0-rc.15-dev" +dependencies = [ + "base64 0.21.5", + "base64urlsafedata", + "compact_jwt", + "concread", + "criterion", + "dyn-clone", + "enum-iterator", + "fernet", + "futures", + "hashbrown 0.14.2", + "hex", + "idlset", + "image 0.24.7", + "kanidm_build_profiles", + "kanidm_lib_crypto", + "kanidm_proto", + "kanidm_utils_users", + "kanidmd_lib_macros", + "lazy_static", + "ldap3_proto", + "libc", + "libsqlite3-sys", + "lodepng", + "nonempty", + "num_enum", + "openssl", + "openssl-sys", + "rand", + "regex", + "rusqlite", + "serde", + "serde_cbor_2", + "serde_json", + "serde_with", + "sketching", + "smartstring", + "smolset", + "sshkey-attest", + "svg", + "time", + "tokio", + "tokio-util", + "toml", + "tracing", + "url", + "urlencoding", + "uuid", + "webauthn-authenticator-rs", + "webauthn-rs", + "webauthn-rs-core", + "whoami", + "zxcvbn", +] + +[[package]] +name = "kanidmd_lib_macros" +version = "1.1.0-rc.15-dev" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "kanidmd_testkit" +version = "1.1.0-rc.15-dev" +dependencies = [ + "assert_cmd", + "compact_jwt", + "escargot", + "fantoccini", + "futures", + "http", + "hyper-tls", + "kanidm_build_profiles", + "kanidm_client", + "kanidm_lib_crypto", + "kanidm_proto", + "kanidmd_core", + "kanidmd_lib", + "lazy_static", + "oauth2", + "openssl", + "petgraph", + "regex", + "reqwest", + "serde", + "serde_json", + "sketching", + "tempfile", + "testkit-macros", + "time", + "tokio", + "tokio-openssl", + "tracing", + "url", + "uuid", + "webauthn-authenticator-rs", +] + +[[package]] +name = "kanidmd_web_ui_admin" +version = "1.1.0-rc.15-dev" +dependencies = [ + "gloo", + "gloo-utils 0.2.0", + "js-sys", + "kanidm_proto", + "kanidmd_web_ui_shared", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "time", + "url", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "web-sys", + "yew", + "yew-router", +] + +[[package]] +name = "kanidmd_web_ui_login_flows" +version = "1.1.0-rc.15-dev" +dependencies = [ + "gloo", + "gloo-utils 0.2.0", + "js-sys", + "kanidm_proto", + "kanidmd_web_ui_shared", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "time", + "url", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "web-sys", + "yew", + "yew-router", +] + +[[package]] +name = "kanidmd_web_ui_shared" +version = "1.1.0-rc.15-dev" +dependencies = [ + "gloo", + "js-sys", + "kanidm_proto", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "time", + "url", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "web-sys", + "yew", +] + +[[package]] +name = "kanidmd_web_ui_user" +version = "1.1.0-rc.15-dev" +dependencies = [ + "gloo", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", + "js-sys", + "kanidm_proto", + "kanidmd_web_ui_shared", + "lazy_static", + "qrcode", + "regex", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "time", + "url", + "uuid", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "wasm-timer", + "web-sys", + "yew", + "yew-router", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[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 = "lber" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df7f9fd9f64cf8f59e1a4a0753fe7d575a5b38d3d7ac5758dcee9357d83ef0a" +dependencies = [ + "bytes", + "nom", +] + +[[package]] +name = "ldap3_client" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a229cd5ee2a4e5a1a279b6216494aa2a5053a189c5ce37bb31f9156b63b63de" +dependencies = [ + "base64 0.13.1", + "base64urlsafedata", + "futures-util", + "ldap3_proto", + "openssl", + "serde", + "tokio", + "tokio-openssl", + "tokio-util", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "ldap3_proto" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d073b5c98def43cec39ccd95e536b3b2448e36289222ecd64dfdf1389d1702" +dependencies = [ + "bytes", + "lber", + "nom", + "peg", + "serde", + "tokio-util", + "tracing", + "uuid", +] + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libnss" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c" +dependencies = [ + "lazy_static", + "libc", + "paste 0.1.18", +] + +[[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 = "libudev" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" +dependencies = [ + "libc", + "libudev-sys", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "lodepng" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" +dependencies = [ + "crc32fast", + "fallible_collections", + "flate2", + "libc", + "rgb", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] +name = "lru" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +dependencies = [ + "hashbrown 0.12.3", +] + +[[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 = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "mathru" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a42bf938e4c9a6ad581cf528d5606eb50c5458ac759ca23719291e2f6499bec" +dependencies = [ + "rand", +] + +[[package]] +name = "mbox" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f88d5c34d63aad11aa4321ef55ccb064af58b3ad8091079ae22bf83e5eb75d6" +dependencies = [ + "libc", + "rustc_version", + "stable_deref_trait", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "log", + "memchr", + "mime", + "spin", + "version_check", +] + +[[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 = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonempty" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" +dependencies = [ + "serde", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-debouncer-full" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219" +dependencies = [ + "crossbeam-channel", + "file-id", + "notify", + "parking_lot 0.12.1", + "walkdir", +] + +[[package]] +name = "nss_kanidm" +version = "1.1.0-rc.15-dev" +dependencies = [ + "kanidm_unix_int", + "lazy_static", + "libc", + "libnss", + "paste 1.0.14", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational 0.4.1", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +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-integer", + "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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "oauth2" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" +dependencies = [ + "base64 0.13.1", + "chrono", + "getrandom", + "http", + "rand", + "serde", + "serde_json", + "serde_path_to_error", + "sha2 0.10.8", + "thiserror", + "url", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" +dependencies = [ + "serde", +] + +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "openssl" +version = "0.10.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +dependencies = [ + "bitflags 2.4.1", + "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 2.0.38", +] + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "orca" +version = "1.1.0-rc.15-dev" +dependencies = [ + "clap", + "crossbeam", + "csv", + "dialoguer", + "futures-util", + "hashbrown 0.14.2", + "kanidm_build_profiles", + "kanidm_client", + "kanidm_proto", + "ldap3_proto", + "mathru", + "openssl", + "rand", + "serde", + "serde_json", + "tikv-jemallocator", + "tokio", + "tokio-openssl", + "tokio-util", + "toml", + "tracing", + "tracing-subscriber", + "uuid", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owning_ref" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "pam_kanidm" +version = "1.1.0-rc.15-dev" +dependencies = [ + "kanidm_unix_int", + "libc", + "pkg-config", + "tracing", + "tracing-subscriber", +] + +[[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.6", +] + +[[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 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "peg" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pest" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.0.2", + "serde", + "serde_derive", +] + +[[package]] +name = "picky-asn1" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" +dependencies = [ + "oid", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" +dependencies = [ + "picky-asn1", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" +dependencies = [ + "base64 0.21.5", + "oid", + "picky-asn1", + "picky-asn1-der", + "serde", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pinned" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +dependencies = [ + "futures", + "rustversion", + "thiserror", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "predicates" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +dependencies = [ + "anstyle", + "difflib", + "itertools 0.11.0", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.38", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prodash" +version = "26.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" + +[[package]] +name = "prokio" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +dependencies = [ + "futures", + "gloo", + "num_cpus", + "once_cell", + "pin-project", + "pinned", + "tokio", + "tokio-stream", + "wasm-bindgen-futures", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[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 = "qrcode" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f" +dependencies = [ + "checked_int_cast", + "image 0.23.14", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +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 = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +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_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "reference-counted-singleton" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "async-compression", + "base64 0.21.5", + "bytes", + "cookie", + "cookie_store", + "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", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + +[[package]] +name = "rpassword" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "runloop" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd" + +[[package]] +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +dependencies = [ + "bitflags 1.3.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "shellexpand", + "syn 2.0.38", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2 0.10.8", + "walkdir", +] + +[[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 = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scim_proto" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e53f2c444b72dd7410aa1cdc3c0942349262e84364dc7968dc7402525ea2ca" +dependencies = [ + "base64urlsafedata", + "peg", + "serde", + "serde_json", + "time", + "tracing", + "tracing-subscriber", + "url", + "uuid", +] + +[[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 = "sd-notify" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selinux" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80b091d970bd4a17a59cb1b7c537786f2bee4292abb5ec89ee3b7f17e9077138" +dependencies = [ + "bitflags 2.4.1", + "libc", + "once_cell", + "reference-counted-singleton", + "selinux-sys", + "thiserror", +] + +[[package]] +name = "selinux-sys" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56602385930248c57e45f6174a6a48e12b723d0cc2ae8f467fcbe80c0d06f41" +dependencies = [ + "bindgen", + "cc", + "dunce", + "walkdir", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-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.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_cbor_2" +version = "0.12.0-dev" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46d75f449e01f1eddbe9b00f432d616fbbd899b809c837d0fbc380496a0dd55" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +dependencies = [ + "base64 0.21.5", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.0.2", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +dependencies = [ + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[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 = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[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-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "sketching" +version = "1.1.0-rc.15-dev" +dependencies = [ + "num_enum", + "tracing", + "tracing-forest", + "tracing-subscriber", +] + +[[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.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +dependencies = [ + "serde", +] + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "serde", + "static_assertions", + "version_check", +] + +[[package]] +name = "smolset" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d372e8fe15dc5229e7d6c65f5810849385e79e24f9d9d64263e132879c7be0" +dependencies = [ + "smallvec", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + +[[package]] +name = "sshkey-attest" +version = "0.5.0-dev" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64urlsafedata", + "nom", + "openssl", + "serde", + "serde_cbor_2", + "sshkeys", + "tracing", + "uuid", + "webauthn-rs-core", +] + +[[package]] +name = "sshkeys" +version = "0.3.2" +source = "git+https://github.com/dnaeon/rust-sshkeys.git?rev=fa5bd02dd6e90ee724fdb981253c1e7726a7f534#fa5bd02dd6e90ee724fdb981253c1e7726a7f534" +dependencies = [ + "base64 0.12.3", + "byteorder", + "serde", + "sha2 0.8.2", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[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 = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "svg" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112" + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +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 = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[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 = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.4.1", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "testkit-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "libc", + "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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[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 = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "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", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +dependencies = [ + "async-compression", + "bitflags 2.4.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", + "uuid", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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-forest" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f" +dependencies = [ + "smallvec", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "uuid", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tss-esapi" +version = "7.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de234df360c349f78ecd33f0816ab3842db635732212b5cfad67f2638336864e" +dependencies = [ + "bitfield", + "enumflags2", + "hostname-validator", + "log", + "mbox", + "num-derive 0.4.1", + "num-traits", + "oid", + "picky-asn1", + "picky-asn1-x509", + "regex", + "serde", + "tss-esapi-sys", + "zeroize", +] + +[[package]] +name = "tss-esapi-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "535cd192581c2ec4d5f82e670b1d3fbba6a23ccce8c85de387642051d7cad5b5" +dependencies = [ + "pkg-config", + "target-lexicon", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bom" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utoipa" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b208a50ff438dcdc887ea3f2db59530bd2f4bc3d2c70630e4d7ee7a281a1d1b" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd516d8879043e081537690bc96c8f17b5a4602c336aecb8f1de89d9d9c7e72" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.38", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" +dependencies = [ + "axum", + "mime_guess", + "regex", + "rust-embed", + "serde", + "serde_json", + "utoipa", + "zip", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +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 = "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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "serde", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webauthn-attestation-ca" +version = "0.1.0" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64urlsafedata", + "openssl", + "serde", + "tracing", + "uuid", +] + +[[package]] +name = "webauthn-authenticator-rs" +version = "0.5.0-dev" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "async-stream", + "async-trait", + "authenticator-ctap2-2021", + "base64urlsafedata", + "bitflags 1.3.2", + "futures", + "hex", + "nom", + "num-derive 0.3.3", + "num-traits", + "openssl", + "rpassword 5.0.1", + "serde", + "serde_bytes", + "serde_cbor_2", + "serde_json", + "tokio", + "tokio-stream", + "tracing", + "unicode-normalization", + "url", + "uuid", + "webauthn-rs-core", + "webauthn-rs-proto", + "windows 0.41.0", +] + +[[package]] +name = "webauthn-rs" +version = "0.5.0-dev" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64urlsafedata", + "serde", + "tracing", + "url", + "uuid", + "webauthn-rs-core", +] + +[[package]] +name = "webauthn-rs-core" +version = "0.5.0-dev" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64 0.21.5", + "base64urlsafedata", + "compact_jwt", + "der-parser", + "nom", + "openssl", + "rand", + "serde", + "serde_cbor_2", + "serde_json", + "thiserror", + "tracing", + "url", + "uuid", + "webauthn-attestation-ca", + "webauthn-rs-proto", + "x509-parser", +] + +[[package]] +name = "webauthn-rs-proto" +version = "0.5.0-dev" +source = "git+https://github.com/kanidm/webauthn-rs.git?rev=2218d2055c0c900ef57b398423eee5e8d5521f4c#2218d2055c0c900ef57b398423eee5e8d5521f4c" +dependencies = [ + "base64urlsafedata", + "js-sys", + "serde", + "serde-wasm-bindgen 0.4.5", + "serde_json", + "url", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "webdriver" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9973cb72c8587d5ad5efdb91e663d36177dc37725e6c90ca86c626b0cc45c93f" +dependencies = [ + "base64 0.13.1", + "bytes", + "cookie", + "http", + "log", + "serde", + "serde_derive", + "serde_json", + "time", + "unicode-segmentation", + "url", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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 = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +dependencies = [ + "wasm-bindgen", + "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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +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" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3ed69de2c1f8d0524a8a3417a80a85dd316a071745fbfdf5eb028b310058ab" +dependencies = [ + "windows_aarch64_gnullvm 0.41.0", + "windows_aarch64_msvc 0.41.0", + "windows_i686_gnu 0.41.0", + "windows_i686_msvc 0.41.0", + "windows_x86_64_gnu 0.41.0", + "windows_x86_64_gnullvm 0.41.0", + "windows_x86_64_msvc 0.41.0", +] + +[[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-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.5", +] + +[[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.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_aarch64_gnullvm" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "163d2761774f2278ecb4e6719e80b2b5e92e5a2be73a7bcd3ef624dd5e3091fd" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef005ff2bceb00d3b84166a359cc19084f9459754fd3fe5a504dee3dddcd0a0c" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4df2d51e32f03f8b4b228e487828c03bcb36d97b216fc5463bcea5bb1440b" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568a966834571f2f3267f07dd72b4d8507381f25e53d056808483b2637385ef7" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc395dac1adf444e276d096d933ae7961361c8cda3245cffef7a9b3a70a8f994" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e8ec22b715d5b436e1d59c8adad6c744dc20cd984710121d5836b4e8dbb5e0" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9761f0216b669019df1512f6e25e5ee779bf61c5cdc43c7293858e7efd7926" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +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 = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs", + "base64 0.13.1", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "yew" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc" +dependencies = [ + "console_error_panic_hook", + "futures", + "gloo", + "implicit-clone", + "indexmap 1.9.3", + "js-sys", + "prokio", + "rustversion", + "serde", + "slab", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew-macro", +] + +[[package]] +name = "yew-macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301" +dependencies = [ + "boolinator", + "once_cell", + "prettyplease 0.1.25", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "yew-router" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426ee0486d2572a6c5e39fbdbc48b58d59bb555f3326f54631025266cf04146e" +dependencies = [ + "gloo", + "js-sys", + "route-recognizer", + "serde", + "serde_urlencoded", + "tracing", + "wasm-bindgen", + "web-sys", + "yew", + "yew-router-macro", +] + +[[package]] +name = "yew-router-macro" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zerocopy" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] + +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.9+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zxcvbn" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4" +dependencies = [ + "derive_builder", + "fancy-regex", + "itertools 0.10.5", + "js-sys", + "lazy_static", + "quick-error", + "regex", + "time", +] diff --git a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix b/third_party/nixpkgs/pkgs/servers/kanidm/default.nix index e6c49b846f..72260dd415 100644 --- a/third_party/nixpkgs/pkgs/servers/kanidm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kanidm/default.nix @@ -11,6 +11,7 @@ , sqlite , pam , bashInteractive +, rust-jemalloc-sys }: let @@ -18,17 +19,23 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.1.0-beta.13"; + version = "1.1.0-rc.15"; src = fetchFromGitHub { owner = pname; repo = pname; - # Latest 1.1.0-beta.13 tip - rev = "5d1e2f90e6901017ab3ef9b5fbc10e25a5451fd2"; - hash = "sha256-70yeHVOrCuC+H96UC84kly3CCQ+y1RGzF5K/2FIag/o="; + # Latest 1.1.0-rc.15 tip + rev = "a5ca8018e3a636dbb0a79b3fd869db059d92979d"; + hash = "sha256-PFGoeGn7a/lVR6rOmOKA3ydAoo3/+9RlkwBAKS22Psg="; }; - cargoHash = "sha256-Qdc+E5+k9NNE4s6eAnpkam56pc2JJPahkuT4lB328cY="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "base64urlsafedata-0.1.3" = "sha256-D+u4CIhx8BNyx+EH1efS4mrinjeSJopWCteSaMY1kh8="; + "sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM="; + }; + }; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; @@ -59,6 +66,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite pam + rust-jemalloc-sys ]; # The UI needs to be in place before the tests are run. diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 41b872fb4a..4ed62d93a0 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 = "22.0.4"; + version = "22.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-wl6kZmm6o9UspKdVHDqUvoDCRALp1ut7Sun/RDuEMLI="; + hash = "sha256-D08WPJUOIIDD9JTTq4C4+wzj/fTZvFbxVXWbVzx0MKY="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 6428e7510c..0a6f0f1391 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-09-10"; + version = "unstable-2023-10-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "8ef0f7d7e3d3b2ac7bc1e80ed3295ceca6bba4e7"; - sha256 = "sha256-f/fPnZvtnASphYtvM9NBae0on8GWSwQPykukZ3XCy3M="; + rev = "f7567a0db954eabe4c6b8da3f73ce68693698646"; + sha256 = "sha256-zOXoHTySTtq2fR7ujU6aiKAgvw11ogM8K+HJF1RoWEQ="; }; sourceRoot = "${src.name}/klippy"; diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix index 1225fe4b36..fbb8b38d5e 100644 --- a/third_party/nixpkgs/pkgs/servers/komga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.5.1"; + version = "1.6.4"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-mEeeMMTZlAfBxp44gV8OLjyGrzcp+XCMPJLJ/sFELHs="; + sha256 = "sha256-tqrC3l2njYGRVIdvt86JVKTCVaAK7GPoYacx3hFRggg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix index 53050cfa7c..daad39ee1c 100644 --- a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { homepage = "https://lidarr.audio/"; license = licenses.gpl3; maintainers = [ maintainers.etu ]; + mainProgram = "Lidarr"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix index 698a82a629..dc8d0dd648 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/exim/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.96.1"; + version = "4.96.2"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - hash = "sha256-k6wHVcMX4f276ozLcKhoh2vfMUhpKJHHKtD+gWdnAz0="; + hash = "sha256-A44yfo0ek9AFusm7Bv0irsRNUCiTDW2+iBetRLv8HeY="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 334a24b1ed..9c335f1182 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchPypi +, fetchpatch }: with python3.pkgs; @@ -17,6 +18,10 @@ buildPythonPackage rec { patches = [ ./0001-Disable-broken-test_help_output-testcase.patch + (fetchpatch { + url = "https://gitlab.com/mailman/hyperkitty/-/commit/5bb394662882bfc73c3e877458da44343aa06922.patch"; + hash = "sha256-9vcY6nu3txDftH6aYpdh9qSrLzZceGjVFxuD1Ux18gw="; + }) ]; postPatch = '' @@ -66,6 +71,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ globin qyliss ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 4bb9cdda1a..ba3fdbacdb 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix index 20c1771d08..955c553d8a 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/package.nix @@ -2,7 +2,6 @@ , fetchpatch , python3 , fetchPypi -, sphinx , postfix , lynx }: @@ -30,8 +29,7 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - importlib-resources - lazr_config + lazr-config passlib requests sqlalchemy @@ -52,6 +50,11 @@ buildPythonPackage rec { url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) + (fetchpatch { + url = "https://gitlab.com/mailman/mailman/-/commit/5e4431af6bb7d672a7ed7e3329f8fac7812d47f8.patch"; + excludes = [ ".gitlab-ci.yml" ]; + hash = "sha256-y2AE9hU4Z1BpBlJywxMWiuRvltWkk+R9YgMkpemvlIo="; + }) ./log-stderr.patch ]; @@ -78,6 +81,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ qyliss ma27 ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index 1e93b20f32..14a31b59da 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/python.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/python.nix index 7c6edbd5e9..e5eb2251b5 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/python.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/python.nix @@ -18,7 +18,13 @@ python3.override { [1] 72a14ea563a3f5bf85db659349a533fe75a8b0ce [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ - django = super.django_3; + elasticsearch = super.elasticsearch.overridePythonAttrs ({ pname, ... }: rec { + version = "7.17.9"; + src = fetchPypi { + inherit pname version; + hash = "sha256-ZsTs4q3+fMEg4rameYof1cd3rs+C7sObuVzvfPx+orM="; + }; + }); # https://gitlab.com/mailman/hyperkitty/-/merge_requests/541 mistune = super.mistune.overridePythonAttrs (old: rec { @@ -29,6 +35,15 @@ python3.override { hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; }; }); + + # django-q tests fail with redis 5.0.0. + redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { + version = "4.5.4"; + src = fetchPypi { + inherit pname version; + hash = "sha256-c+w12k2iZ9aEfkf2hzD91fYuLKaePvWIXGp4qTdMOJM="; + }; + }); }) overlay; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix index ed5c267ad0..21fa64085d 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/web.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi +{ lib, python3, fetchPypi, fetchpatch , sassc, hyperkitty, postorius }: @@ -14,6 +14,13 @@ buildPythonPackage rec { sha256 = "sha256-UWdqrcx529r6kwgf0YEHiDrpZlGoUBR6OdYtHMTPMGY="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mailman/mailman-web/-/commit/448bba249d39c09c0cef5e059415cc07a3ce569c.patch"; + hash = "sha256-rs1vaV4YyLyJ0+EGY70CirvjArpGQr29DOTvgj68wgs="; + }) + ]; + postPatch = '' # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix index 9c8b683373..baf15dce13 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailpit/default.nix @@ -7,17 +7,19 @@ , npmHooks , fetchFromGitHub , fetchNpmDeps +, testers +, mailpit }: let - version = "1.7.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-jT9QE0ikp9cJlT8qtfPPjKOUuqWyQk94D3UbkyaGXa8="; + hash = "sha256-MrhTgyY89rU2EQILRSFJk8U7QWaoUf2p83ksFjA7xOM="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -29,7 +31,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-6VCs8125fTJkZW+eZgK56j7ccK8tcGhIXiq2HkYp4XM="; + hash = "sha256-r4yv2qImIlNMPJagz5i1sxqBDnFAucc2kDUmjGktM6A="; }; nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; @@ -49,7 +51,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-XBYIO7fdo5EahJB7EcAuY9SGKZb8dsvoJHp/D5LO5Qo="; + vendorHash = "sha256-TXa97oOul9cf07uNGdIoxIM++da5HBFeoh05LaJzQTA="; CGO_ENABLED = 0; @@ -59,11 +61,18 @@ buildGoModule { cp -r ${ui} server/ui/dist ''; + passthru.tests.version = testers.testVersion { + inherit version; + package = mailpit; + command = "mailpit version"; + }; + meta = with lib; { description = "An email and SMTP testing tool with API for developers"; homepage = "https://github.com/axllent/mailpit"; changelog = "https://github.com/axllent/mailpit/releases/tag/v${version}"; maintainers = with maintainers; [ stephank ]; license = licenses.mit; + mainProgram = "mailpit"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix index 897f6ffc7a..17d34d368f 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-RNzjDAvyz0RfD4GV6hT9RNJOfHSUXCLfwN4+V5acX28="; + hash = "sha256-zFPgMVQQUnEKIgt35KxcRUxuBNSmTM8ZfAZvP22iKgg="; }; # set the version during buildtime diff --git a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix index 3bac9e0c6e..f93bc85711 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/opensmtpd/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, libressl, db, pam, libxcrypt, nixosTests +{ lib +, stdenv +, fetchurl +, autoreconfHook +, autoconf-archive +, pkgconf +, libtool +, bison +, libasr +, libevent +, zlib +, libressl +, db +, pam +, libxcrypt +, nixosTests }: stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.8.0p2"; + version = "7.4.0p0"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib libressl db pam libxcrypt ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconf libtool bison ]; + buildInputs = [ libevent zlib libressl db pam libxcrypt ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"; + hash = "sha256-wYHMw0NKEeWDYZ4AAoUg1Ff+Bi403AO+6jWAeCIM43Q="; }; patches = [ ./proc_path.diff # TODO: upstream to OpenSMTPD, see https://github.com/NixOS/nixpkgs/issues/54045 - ./cross_fix.diff # TODO: remove when https://github.com/OpenSMTPD/OpenSMTPD/pull/1177 will have made it into a release ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` - # requirement postPatch = '' substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" - sh bootstrap ''; configureFlags = [ @@ -43,9 +53,6 @@ stdenv.mkDerivation rec { "--with-table-db" ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 - makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; - installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -59,7 +66,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog vifino ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index e9dea5282a..ca8d54d600 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-Z5CQPNu14ORxlmkeuaXyz4BQJi3vlB4Dnm1L9AQ6XjA="; + hash = "sha256-FpRsmHSnhqCfU7F9HIPcH6rjXL+AurNKsBeYtwQglos="; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -84,6 +84,8 @@ in stdenv.mkDerivation rec { make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; + enableParallelBuilding = true; + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; installTargets = [ "non-interactive-package" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 004490c868..180554acd7 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -28,13 +28,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.7.1"; + version = "3.7.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-emxvSqtpTcv0LZjzhMncvnApRLXFDeyFVmkoeSVp6f4="; + hash = "sha256-TqsY0AUDEpFOGIAH6jDdofIJAYQYtj8Uk4djk5hYemo="; }; hardeningEnable = [ "pie" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/smtprelay/default.nix b/third_party/nixpkgs/pkgs/servers/mail/smtprelay/default.nix new file mode 100644 index 0000000000..8142dc76b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/smtprelay/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "smtprelay"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "decke"; + repo = "smtprelay"; + rev = "refs/tags/v${version}"; + hash = "sha256-zZ3rgbo8nvrpFMtUmhyXnTgoVd0FIh1kWzuM2hCh5gY="; + }; + + vendorHash = "sha256-assGzM8/APNVVm2vZapPK6sh3tWNTnw6PSFwvEqNDPk="; + + subPackages = [ + "." + ]; + + CGO_ENABLED = 0; + + # We do not supply the build time as the build wouldn't be reproducible otherwise. + ldflags = [ + "-s" + "-w" + "-X=main.appVersion=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/decke/smtprelay"; + description = "Simple Golang SMTP relay/proxy server"; + changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ juliusrickert ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix index 8e9aee8ad9..8b6623200e 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix @@ -52,6 +52,9 @@ perlPackages.buildPerlPackage rec { export HOME=$NIX_BUILD_TOP/home mkdir -p $HOME mkdir t/log # pre-create to avoid race conditions + + # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8068 + checkFlagsArray+=(TEST_FILES='$(shell find t -name *.t -not -name spamd_ssl_accept_fail.t)') ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock b/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock index 8a6878319e..80e61090a9 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/mail/stalwart/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", @@ -73,7 +73,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -85,7 +85,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.10", "once_cell", "serde", "version_check", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -137,15 +137,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -161,21 +161,14 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", ] -[[package]] -name = "antispam" -version = "0.1.0" -dependencies = [ - "fancy-regex", -] - [[package]] name = "anyhow" version = "1.0.75" @@ -184,9 +177,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -206,6 +199,15 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + [[package]] name = "asn1-rs" version = "0.5.2" @@ -219,7 +221,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -247,13 +249,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -275,18 +277,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -333,15 +335,15 @@ dependencies = [ "rust-ini", "serde", "thiserror", - "time 0.3.28", + "time", "url", ] [[package]] name = "aws-region" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" +checksum = "42fed2b9fca70f2908268d057a607f2a906f47edbf856ea8587de9038d264e22" dependencies = [ "thiserror", ] @@ -426,9 +428,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -491,13 +493,13 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.12", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", "which", ] @@ -516,12 +518,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bitfield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" - [[package]] name = "bitflags" version = "1.3.2" @@ -530,9 +526,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -579,16 +575,15 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq 0.3.0", - "digest 0.10.7", ] [[package]] @@ -640,48 +635,38 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.6.0" +name = "buffered-reader" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "66d3bea5bcc3ecc38fe5388e6bc35e6fe7bd665eb3ae9a44283e15b91ad3867d" dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "buffer-redux" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2886ea01509598caac116942abd33ab5a88fa32acdf7e4abfa0fc489ca520c9" -dependencies = [ - "memchr", - "safemem", + "lazy_static", + "libc", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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" [[package]] name = "bzip2" @@ -704,16 +689,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "camellia" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" -dependencies = [ - "byteorder", - "cipher 0.4.4", -] - [[package]] name = "cast5" version = "0.11.1" @@ -760,6 +735,17 @@ dependencies = [ "nom", ] +[[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 = "cfb-mode" version = "0.8.2" @@ -777,18 +763,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -823,20 +808,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -846,14 +830,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -862,6 +846,17 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +[[package]] +name = "cmac" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" +dependencies = [ + "cipher 0.4.4", + "dbl", + "digest 0.10.7", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -923,9 +918,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -945,12 +940,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" -[[package]] -name = "crc24" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" - [[package]] name = "crc32fast" version = "1.3.2" @@ -1021,12 +1010,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1038,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -1054,9 +1043,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1066,9 +1055,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1084,75 +1073,38 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "platforms", - "rustc_version", + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", "subtle", "zeroize", ] [[package]] -name = "curve25519-dalek-derive" -version = "0.1.0" +name = "curve25519-dalek-ng" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[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", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1164,6 +1116,21 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +[[package]] +name = "dbl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" +dependencies = [ + "generic-array", +] + +[[package]] +name = "decancer" +version = "1.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080b09f6adad25c23d8c47c54e52e59b0dc09d079c4b23e0f147dac440359d0d" + [[package]] name = "der" version = "0.7.8" @@ -1191,44 +1158,14 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - [[package]] name = "des" version = "0.8.1" @@ -1240,16 +1177,23 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" dependencies = [ "console", "shell-words", "tempfile", + "thiserror", "zeroize", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.9.0" @@ -1279,6 +1223,7 @@ dependencies = [ "argon2", "async-trait", "bb8", + "flate2", "futures", "ldap3", "lru-cache", @@ -1291,14 +1236,16 @@ dependencies = [ "pbkdf2 0.12.2", "pwhash", "regex", + "reqwest", "rustls 0.21.7", "scrypt", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", + "sieve-rs", "smtp-proto", "sqlx", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -1352,7 +1299,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1373,6 +1320,34 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "dyn-clone" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" + +[[package]] +name = "eax" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28" +dependencies = [ + "aead", + "cipher 0.4.4", + "cmac", + "ctr", + "subtle", +] + +[[package]] +name = "ecb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +dependencies = [ + "cipher 0.4.4", +] + [[package]] name = "ecdsa" version = "0.16.8" @@ -1383,7 +1358,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature", + "signature 2.1.0", "spki", ] @@ -1401,30 +1376,29 @@ dependencies = [ "once_cell", "openssl", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", ] [[package]] name = "ed25519" -version = "2.2.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "pkcs8", - "signature", + "signature 1.6.4", ] [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek", "ed25519", - "serde", - "sha2 0.10.7", + "rand 0.7.3", + "sha2 0.9.9", "zeroize", ] @@ -1439,9 +1413,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct", "crypto-bigint", @@ -1452,12 +1426,21 @@ dependencies = [ "hkdf", "pem-rfc7468", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", ] +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1481,14 +1464,14 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1499,25 +1482,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "etcetera" version = "0.8.0" @@ -1571,9 +1543,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -1581,16 +1553,10 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core", + "rand_core 0.6.4", "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - [[package]] name = "filetime" version = "0.2.22" @@ -1603,6 +1569,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1611,9 +1583,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -1622,13 +1594,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -1691,7 +1662,7 @@ dependencies = [ "foundationdb-sys", "futures", "memchr", - "rand", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", @@ -1716,7 +1687,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "try_map", ] @@ -1802,7 +1773,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1865,6 +1836,19 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + [[package]] name = "getrandom" version = "0.2.10" @@ -1872,8 +1856,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1905,7 +1891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1939,9 +1925,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -1953,7 +1939,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1967,9 +1953,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1977,6 +1963,57 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "ring 0.16.20", + "rustls 0.21.7", + "rustls-pemfile", + "thiserror", + "tinyvec", + "tokio", + "tokio-rustls", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "rustls 0.21.7", + "smallvec", + "thiserror", + "tokio", + "tokio-rustls", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.3" @@ -2105,7 +2142,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2144,7 +2181,7 @@ dependencies = [ "hyper 0.14.27", "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2162,15 +2199,17 @@ dependencies = [ [[package]] name = "hyper-util" version = "0.0.0" -source = "git+https://github.com/hyperium/hyper-util#f898015fc9eca9f459ddac521db278d904099e89" +source = "git+https://github.com/hyperium/hyper-util#1ed4c2ccdb23f576eb7024555f08b376b9d5c9eb" dependencies = [ + "bytes", "futures-channel", "futures-util", "http", + "http-body 1.0.0-rc.2", "hyper 1.0.0-rc.4", "once_cell", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower", "tower-service", @@ -2179,16 +2218,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2209,19 +2248,12 @@ dependencies = [ "cipher 0.4.4", ] -[[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.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2236,9 +2268,15 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + [[package]] name = "imap" -version = "0.3.6" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "dashmap", @@ -2249,12 +2287,13 @@ dependencies = [ "mail-parser", "mail-send", "md5", + "nlp", "parking_lot", "rustls 0.21.7", "rustls-pemfile", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -2282,19 +2321,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -2303,6 +2342,15 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "infer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +dependencies = [ + "cfb", +] + [[package]] name = "inout" version = "0.1.3" @@ -2328,7 +2376,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -2360,6 +2408,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -2394,7 +2451,7 @@ checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" dependencies = [ "cedarwood", "fxhash", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lazy_static", "phf", "phf_codegen", @@ -2403,14 +2460,14 @@ dependencies = [ [[package]] name = "jmap" -version = "0.3.6" +version = "0.4.2" dependencies = [ "aes", "aes-gcm", "aes-gcm-siv", "async-stream", "async-trait", - "base64 0.21.3", + "base64 0.21.4", "bincode", "cbc", "chrono", @@ -2429,33 +2486,35 @@ dependencies = [ "mail-parser", "mail-send", "mime", + "nlp", "p256", - "pgp", - "rand", + "rand 0.8.5", "rasn", "rasn-cms", "rasn-pkix", "reqwest", "rsa", + "sequoia-openpgp", "serde", "serde_json", - "sha2 0.10.7", + "sha1", + "sha2 0.10.8", "sieve-rs", "smtp", "smtp-proto", "sqlx", "store", "tokio", - "tokio-tungstenite 0.20.0", + "tokio-tungstenite 0.20.1", "tracing", - "tungstenite 0.20.0", + "tungstenite 0.20.1", "utils", ] [[package]] name = "jmap-client" version = "0.3.0" -source = "git+https://github.com/stalwartlabs/jmap-client#a55af189d41a21cf5a51c1c69852cf6143cc8102" +source = "git+https://github.com/stalwartlabs/jmap-client#5b6595e770c75c3a5b2ae2e90ee18e35d6c6b5cf" dependencies = [ "ahash 0.8.3", "async-stream", @@ -2489,9 +2548,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2505,15 +2564,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - [[package]] name = "konst" version = "0.3.6" @@ -2534,6 +2584,34 @@ dependencies = [ "typewit", ] +[[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.6.29", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" + [[package]] name = "lazy_static" version = "1.4.0" @@ -2574,12 +2652,12 @@ dependencies = [ "log", "nom", "percent-encoding", - "ring", + "ring 0.16.20", "rustls 0.21.7", "rustls-native-certs", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-stream", "tokio-util", "url", @@ -2588,9 +2666,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2604,9 +2682,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librocksdb-sys" @@ -2654,15 +2732,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2695,36 +2773,36 @@ dependencies = [ [[package]] name = "mail-auth" -version = "0.3.2" -source = "git+https://github.com/stalwartlabs/mail-auth#a6cd1d6cc0a79943903e8154eecc29f2de003e2a" +version = "0.3.6" +source = "git+https://github.com/stalwartlabs/mail-auth#8a1b216adc60b95192645033aed6d20fa89821cd" dependencies = [ "ahash 0.8.3", "flate2", + "hickory-resolver", "lru-cache", "mail-builder", "mail-parser", "parking_lot", - "quick-xml 0.28.2", - "ring", + "quick-xml 0.30.0", + "ring 0.17.5", "rustls-pemfile", "serde", "serde_json", - "trust-dns-resolver", "zip", ] [[package]] name = "mail-builder" version = "0.3.1" -source = "git+https://github.com/stalwartlabs/mail-builder#1eb0b5a72211c491cbe338920e8dfd3a675d6653" +source = "git+https://github.com/stalwartlabs/mail-builder#665f46db8542a97f5b86fd1ff9ea8d74d5ab7e4f" dependencies = [ "gethostname", ] [[package]] name = "mail-parser" -version = "0.8.2" -source = "git+https://github.com/stalwartlabs/mail-parser#da62659eb609a8222edf7d1f57b28550a853921e" +version = "0.9.1" +source = "git+https://github.com/stalwartlabs/mail-parser#b6c080ff45c0de95703a4fadb6a41dab49cd1566" dependencies = [ "encoding_rs", "serde", @@ -2732,8 +2810,8 @@ dependencies = [ [[package]] name = "mail-send" -version = "0.4.0" -source = "git+https://github.com/stalwartlabs/mail-send#ffa60e3f653d0f4057b7c97d103751a80adc4c12" +version = "0.4.1" +source = "git+https://github.com/stalwartlabs/mail-send#53904ce6cf4fcb9a42a92a541f5d64d4d972d6cb" dependencies = [ "base64 0.20.0", "gethostname", @@ -2741,13 +2819,13 @@ dependencies = [ "rustls 0.21.7", "smtp-proto", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots 0.25.2", ] [[package]] name = "mail-server" -version = "0.3.6" +version = "0.4.2" dependencies = [ "directory", "imap", @@ -2764,7 +2842,7 @@ dependencies = [ [[package]] name = "managesieve" -version = "0.1.0" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "bincode", @@ -2782,7 +2860,7 @@ dependencies = [ "sieve-rs", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "utils", ] @@ -2808,17 +2886,11 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" @@ -2853,10 +2925,11 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -2868,9 +2941,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2890,6 +2963,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memsec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa0916b001582d253822171bd23f4a0229d32b9507fae236f5da8cad515ba7c" + [[package]] name = "mime" version = "0.3.17" @@ -2933,10 +3012,10 @@ dependencies = [ ] [[package]] -name = "multimap" -version = "0.8.3" +name = "new_debug_unreachable" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" @@ -2951,6 +3030,35 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "nlp" +version = "0.4.2" +dependencies = [ + "ahash 0.8.3", + "bincode", + "farmhash", + "jieba-rs", + "lazy_static", + "lru-cache", + "nohash", + "parking_lot", + "phf", + "rust-stemmers", + "serde", + "siphasher 1.0.0", + "tinysegmenter", + "tokio", + "utils", + "whatlang", + "xxhash-rust", +] + +[[package]] +name = "nohash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" + [[package]] name = "nom" version = "7.1.3" @@ -2994,23 +3102,11 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand", - "serde", + "rand 0.8.5", "smallvec", "zeroize", ] -[[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -3034,9 +3130,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3060,9 +3156,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3094,7 +3190,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3111,7 +3207,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3122,18 +3218,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.27.0+1.1.1v" +version = "300.1.5+3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3144,9 +3240,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -3154,9 +3250,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", @@ -3167,17 +3263,18 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http", - "opentelemetry", "opentelemetry-http", "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "reqwest", "thiserror", @@ -3187,34 +3284,31 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" dependencies = [ - "futures", - "futures-util", - "opentelemetry", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "tonic", - "tonic-build", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry_api" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.3", @@ -3222,30 +3316,41 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", + "ordered-float", "percent-encoding", - "rand", + "rand 0.8.5", + "regex", + "serde_json", "thiserror", "tokio", "tokio-stream", ] +[[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-multimap" version = "0.4.3" @@ -3271,19 +3376,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.7", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3298,13 +3391,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -3316,7 +3409,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -3327,7 +3420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -3346,7 +3439,7 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash 0.4.2", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3358,7 +3451,7 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash 0.5.0", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3389,59 +3482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", -] - -[[package]] -name = "pgp" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" -dependencies = [ - "aes", - "base64 0.21.3", - "bitfield", - "block-padding", - "blowfish 0.9.1", - "bstr", - "buffer-redux", - "byteorder", - "camellia", - "cast5", - "cfb-mode", - "chrono", - "cipher 0.4.4", - "crc24", - "curve25519-dalek", - "derive_builder", - "des", - "digest 0.10.7", - "ed25519-dalek", - "elliptic-curve", - "flate2", - "generic-array", - "hex", - "idea", - "log", - "md-5 0.10.5", - "nom", - "num-bigint-dig", - "num-derive", - "num-traits", - "p256", - "p384", - "rand", - "ripemd", - "rsa", - "sha1", - "sha2 0.10.7", - "sha3", - "signature", - "smallvec", - "thiserror", - "twofish", - "x25519-dalek", - "zeroize", + "indexmap 2.0.2", ] [[package]] @@ -3451,7 +3492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -3461,7 +3502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] @@ -3470,8 +3511,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", - "rand", + "phf_shared 0.11.2", + "rand 0.8.5", ] [[package]] @@ -3481,10 +3522,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher 0.3.11", ] [[package]] @@ -3493,7 +3543,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3513,7 +3563,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3555,12 +3605,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" - [[package]] name = "polyval" version = "0.6.1" @@ -3579,6 +3623,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +[[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" @@ -3586,23 +3636,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "prettyplease" -version = "0.1.25" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3640,9 +3686,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3657,28 +3703,6 @@ dependencies = [ "prost-derive", ] -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease 0.1.25", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -3686,21 +3710,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "pwhash" version = "1.0.0" @@ -3711,8 +3726,8 @@ dependencies = [ "byteorder", "hmac 0.10.1", "md-5 0.9.1", - "rand", - "sha-1", + "rand 0.8.5", + "sha-1 0.9.8", "sha2 0.9.9", ] @@ -3734,9 +3749,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -3767,6 +3782,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -3774,8 +3802,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -3785,7 +3823,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[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]] @@ -3794,14 +3841,23 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.10", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] name = "rasn" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5ce12835340cdd47a8abf36aabc02ce2d2a1d88e29d6c5126b5e7bf95eb53" +checksum = "0ef6075807dc2ea24ddbfaf1546bf4b956ac1f8338eae4dffa35d69846c8b691" dependencies = [ "arrayvec", "bitvec", @@ -3821,9 +3877,9 @@ dependencies = [ [[package]] name = "rasn-cms" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae05ee5eb8b58bcbbb7d5d28270281b9aa305b9a6aa271cac54f3a967f11fa2" +checksum = "8d8d8656a9e88bca3a726fc7c365e4c8a4455d1f95ecd58f7817cfc642674cbc" dependencies = [ "rasn", "rasn-pkix", @@ -3831,12 +3887,12 @@ dependencies = [ [[package]] name = "rasn-derive" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c8ad6b5a6cd2f18516cde588b72797c56b884f0bd2dfdd82eb392781b85507" +checksum = "eda946c91626f958f853e47616cdfdd1fcd9c36a65a2388eb9a5d80dd644efd3" dependencies = [ "either", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "rayon", @@ -3846,18 +3902,18 @@ dependencies = [ [[package]] name = "rasn-pkix" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b82b75a434efa7dbb6ff898c9504586e3adffa9e445336edd9c0431c27b4c2" +checksum = "6c91ef69d71656ca94e119989fd2056679823852d2544f94cd96bd6912a49a06" dependencies = [ "rasn", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3865,14 +3921,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3893,27 +3947,36 @@ 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_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3927,13 +3990,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3944,17 +4007,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -3977,8 +4040,9 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -4026,11 +4090,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -4087,8 +4165,8 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core", - "signature", + "rand_core 0.6.4", + "signature 2.1.0", "spki", "subtle", "zeroize", @@ -4110,7 +4188,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4152,9 +4230,9 @@ dependencies = [ "reqwest", "serde", "serde_derive", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", - "time 0.3.28", + "time", "tokio", "tokio-stream", "url", @@ -4182,15 +4260,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rusticata-macros" version = "4.1.0" @@ -4202,11 +4271,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -4220,7 +4289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -4232,8 +4301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki 0.101.6", "sct", ] @@ -4255,27 +4324,27 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4290,12 +4359,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "salsa20" version = "0.10.2" @@ -4338,7 +4401,7 @@ dependencies = [ "password-hash 0.5.0", "pbkdf2 0.12.2", "salsa20", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4347,8 +4410,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4389,16 +4452,64 @@ dependencies = [ ] [[package]] -name = "semver" -version = "1.0.18" +name = "sequoia-openpgp" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "a16854c0f6297de6db4df195e28324dfbc2429802f0e48cd04007db8e3049709" +dependencies = [ + "aes", + "anyhow", + "base64 0.21.4", + "block-padding", + "blowfish 0.9.1", + "buffered-reader", + "cast5", + "cfb-mode", + "chrono", + "cipher 0.4.4", + "des", + "digest 0.10.7", + "dyn-clone", + "eax", + "ecb", + "ecdsa", + "ed25519", + "ed25519-dalek", + "generic-array", + "getrandom 0.2.10", + "idea", + "idna 0.3.0", + "lalrpop", + "lalrpop-util", + "lazy_static", + "libc", + "md-5 0.10.6", + "memsec", + "num-bigint-dig", + "once_cell", + "p256", + "rand 0.7.3", + "rand 0.8.5", + "rand_core 0.6.4", + "regex", + "regex-syntax 0.6.29", + "ripemd", + "rsa", + "sha-1 0.10.1", + "sha1collisiondetection", + "sha2 0.10.8", + "thiserror", + "twofish", + "typenum", + "x25519-dalek-ng", + "xxhash-rust", +] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -4414,20 +4525,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4468,7 +4579,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4485,16 +4596,37 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.5" +name = "sha-1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha1collisiondetection" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20793cf8330b2c7da4c438116660fed24e380bcb8a1bcfff2581b5593a0b38e" +dependencies = [ + "digest 0.9.0", + "generic-array", +] + [[package]] name = "sha2" version = "0.9.9" @@ -4510,30 +4642,20 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - [[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", ] @@ -4546,14 +4668,14 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "sieve-rs" version = "0.3.1" -source = "git+https://github.com/stalwartlabs/sieve#cea1451c13006016cff96aacfb88290318576e96" +source = "git+https://github.com/stalwartlabs/sieve#b7b62b3b33d05b7c1e50ea5123a35ef461c66b8d" dependencies = [ "ahash 0.8.3", "bincode", @@ -4573,6 +4695,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.1.0" @@ -4580,7 +4708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4589,6 +4717,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + [[package]] name = "slab" version = "0.4.9" @@ -4600,31 +4734,37 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smtp" -version = "0.3.6" +version = "0.4.2" dependencies = [ "ahash 0.8.3", "blake3", "dashmap", + "decancer", "directory", "form_urlencoded", "http-body-util", "hyper 1.0.0-rc.4", "hyper-util", + "idna 0.4.0", + "imagesize", + "infer", "lazy_static", "lru-cache", "mail-auth", "mail-builder", "mail-parser", "mail-send", + "md5", + "nlp", "num_cpus", "parking_lot", - "rand", + "rand 0.8.5", "rayon", "regex", "reqwest", @@ -4633,22 +4773,24 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "sieve-rs", "smtp-proto", "sqlx", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", + "unicode-security", "utils", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", + "whatlang", "x509-parser", ] [[package]] name = "smtp-proto" version = "0.1.1" -source = "git+https://github.com/stalwartlabs/smtp-proto#434ede72159b5f9ea588b9ee8c361a3247aa2f35" +source = "git+https://github.com/stalwartlabs/smtp-proto#d5949da111db6d9299c6a8928bf77f3dce337a1d" [[package]] name = "snafu" @@ -4675,9 +4817,9 @@ dependencies = [ [[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", @@ -4685,9 +4827,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4720,20 +4862,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools", + "itertools 0.11.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4744,9 +4886,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash 0.8.3", "atoi", @@ -4764,7 +4906,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -4774,7 +4916,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -4787,9 +4929,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -4800,9 +4942,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -4813,7 +4955,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -4826,13 +4968,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bitflags 2.4.1", "byteorder", "bytes", "crc", @@ -4849,15 +4991,15 @@ dependencies = [ "hmac 0.12.1", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", "percent-encoding", - "rand", + "rand 0.8.5", "rsa", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4868,13 +5010,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bitflags 2.4.1", "byteorder", "crc", "dotenvy", @@ -4889,14 +5031,14 @@ dependencies = [ "home", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -4907,9 +5049,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "flume", @@ -4929,7 +5071,7 @@ dependencies = [ [[package]] name = "stalwart-cli" -version = "0.3.6" +version = "0.4.2" dependencies = [ "clap", "console", @@ -4951,9 +5093,9 @@ dependencies = [ [[package]] name = "stalwart-install" -version = "0.3.6" +version = "0.4.2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "clap", "dialoguer", "flate2", @@ -4961,7 +5103,7 @@ dependencies = [ "libc", "openssl", "pwhash", - "rand", + "rand 0.8.5", "reqwest", "rpassword", "rusqlite", @@ -4985,36 +5127,47 @@ dependencies = [ "farmhash", "foundationdb", "futures", - "jieba-rs", "lazy_static", "lru-cache", "maybe-async 0.2.7", + "nlp", "num_cpus", "parking_lot", "r2d2", - "rand", + "rand 0.8.5", "rayon", "roaring", "rocksdb", "rusqlite", "rust-s3", - "rust-stemmers", "serde", - "siphasher", - "tinysegmenter", + "siphasher 1.0.0", "tokio", "tracing", "utils", - "whatlang", "xxhash-rust", ] [[package]] -name = "stringprep" -version = "0.1.3" +name = "string_cache" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -5031,6 +5184,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.109" @@ -5044,9 +5203,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5071,6 +5230,27 @@ dependencies = [ "unicode-xid", ] +[[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 = "tap" version = "1.0.1" @@ -5118,7 +5298,7 @@ version = "0.1.0" dependencies = [ "ahash 0.8.3", "async-trait", - "base64 0.21.3", + "base64 0.21.4", "bytes", "chrono", "csv", @@ -5140,6 +5320,7 @@ dependencies = [ "mail-parser", "mail-send", "managesieve", + "nlp", "num_cpus", "rayon", "reqwest", @@ -5154,7 +5335,7 @@ dependencies = [ "sqlx", "store", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "tracing-subscriber", "utils", @@ -5162,22 +5343,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5192,23 +5373,13 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -5216,19 +5387,28 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinysegmenter" version = "0.1.1" @@ -5256,9 +5436,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -5268,7 +5448,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -5291,18 +5471,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", + "syn 2.0.38", ] [[package]] @@ -5336,28 +5505,28 @@ dependencies = [ "log", "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tungstenite 0.19.0", "webpki-roots 0.23.1", ] [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.20.0", + "tungstenite 0.20.1", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -5369,14 +5538,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -5388,28 +5556,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", ] [[package]] @@ -5423,7 +5575,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -5446,11 +5598,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", @@ -5464,39 +5615,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.28", + "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-journald" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" dependencies = [ - "pin-project", - "tracing", + "libc", + "tracing-core", + "tracing-subscriber", ] [[package]] @@ -5512,12 +5664,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", "tracing-log", @@ -5542,59 +5696,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand", - "ring", - "rustls 0.20.9", - "rustls-pemfile", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tokio-rustls 0.23.4", - "tracing", - "url", - "webpki", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "rustls 0.20.9", - "smallvec", - "thiserror", - "tokio", - "tokio-rustls 0.23.4", - "tracing", - "trust-dns-proto", - "webpki-roots 0.22.6", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -5619,7 +5720,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "rustls 0.21.7", "sha1", "thiserror", @@ -5630,9 +5731,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -5640,7 +5741,7 @@ dependencies = [ "http", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", "thiserror", "url", @@ -5658,15 +5759,24 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" +checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "unicase" @@ -5685,9 +5795,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5698,6 +5808,22 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-security" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +dependencies = [ + "unicode-normalization", + "unicode-script", +] + [[package]] name = "unicode-segmentation" version = "1.10.1" @@ -5706,9 +5832,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5738,6 +5864,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -5749,6 +5881,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf-8" version = "0.7.6" @@ -5763,9 +5901,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.3.6" +version = "0.4.2" dependencies = [ "ahash 0.8.3", + "chrono", "dashmap", "mail-auth", "mail-send", @@ -5778,20 +5917,21 @@ dependencies = [ "serde", "smtp-proto", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "tracing-appender", + "tracing-journald", "tracing-opentelemetry", "tracing-subscriber", ] [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom", + "getrandom 0.2.10", ] [[package]] @@ -5823,9 +5963,9 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" @@ -5854,7 +5994,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5888,7 +6028,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5924,12 +6064,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5947,7 +6087,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.2", + "rustls-webpki 0.100.3", ] [[package]] @@ -5956,7 +6096,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.4", + "rustls-webpki 0.101.6", ] [[package]] @@ -5977,13 +6117,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -6021,10 +6162,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -6181,14 +6322,14 @@ dependencies = [ ] [[package]] -name = "x25519-dalek" -version = "2.0.0" +name = "x25519-dalek-ng" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "bf7074de8999662970c3c4c8f7f30925028dd8f4ca31ad4c055efa9cdf2ec326" dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", + "curve25519-dalek-ng", + "rand 0.8.5", + "rand_core 0.6.4", "zeroize", ] @@ -6206,7 +6347,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -6220,15 +6361,15 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xxhash-rust" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" [[package]] name = "zeroize" @@ -6247,7 +6388,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6266,7 +6407,7 @@ dependencies = [ "hmac 0.12.1", "pbkdf2 0.11.0", "sha1", - "time 0.3.28", + "time", "zstd", ] @@ -6302,11 +6443,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix b/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix index 6a1044c38b..2be1e000f8 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/stalwart/default.nix @@ -13,7 +13,7 @@ }: let - version = "0.3.6"; + version = "0.4.2"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -23,21 +23,21 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-QZF51TkuV73EHWXABvqybEZ56CR4zXC/HrmWtVDuM0U="; + hash = "sha256-Ah53htK38Bm2yGN44IiC6iRWgxkMVRtrNvXXvPh+SJc="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "hyper-util-0.0.0" = "sha256-wGtB6hUjIOKR7UZJrX9ve4x4/7TDQuSPG0Sq9VyW7iI="; - "jmap-client-0.3.0" = "sha256-GNqSPygiVq5Z9y8Kfhzacq3lTIEg2o4UxzOMDbBO7xY="; - "mail-auth-0.3.2" = "sha256-CTafQCXPo91ZUlfS9JUqU+RfUf4+6EbdG97+nIqQtNw="; - "mail-builder-0.3.1" = "sha256-r32iiHtQp0C94Qqc4Vspc08QaXZ+e1u7e39fNYoQGsY="; - "mail-parser-0.8.2" = "sha256-XvKEgzQ+HDoLI16CmqE/RRgApg0q9Au9sqOOEpZz6W0="; - "mail-send-0.4.0" = "sha256-czfzadxvrLQD4qhw/yVI45ajo5EAVu1Bj2lwBY1dVQY="; - "sieve-rs-0.3.1" = "sha256-JIhOklif2IuU3kUVxZb68BZvMV1dR0NtQe3UOayC+vM="; - "smtp-proto-0.1.1" = "sha256-HhKZQHQv3tMEfRZgCoAtyxVzwHbcB4FSjKlMoU1PkHg="; + "hyper-util-0.0.0" = "sha256-9vp8eWjK/pjkJCMjVSI9J2b4amhXK5sat1VAq5Jd6mI="; + "jmap-client-0.3.0" = "sha256-TJQEi2qH/92QA3YJrPBWgpO0nE5o7Atv6btq2gPNTmw="; + "mail-auth-0.3.6" = "sha256-FTC0ZHyZ5H2yBlmNrOijm50xQ3qd2Q+52z8THCW5A5Q="; + "mail-builder-0.3.1" = "sha256-JPV3vp/5+9yFoNNZzxuQ9sbnF8HgDbfHhtb6zQfLFqQ="; + "mail-parser-0.9.1" = "sha256-PJh6s7SvspakhuziEy+dZccIN0hJpjkcIUGTYQRvKGc="; + "mail-send-0.4.1" = "sha256-WK6pC8ZtSoIScanNatDbb3Y7Ch43Dj3463VHDwmEyG0="; + "sieve-rs-0.3.1" = "sha256-PJ24mwlpA6EpB3l749HfSFQhYAmpPxKmYJh/nBmDKDs="; + "smtp-proto-0.1.1" = "sha256-C73wm+dfq+LKteHH9wATw2L23YMw3dhzTIyFJMoqvBA="; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix index 31a092359c..7b20fe7038 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests -, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript +, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript , fetchYarnDeps, fixup_yarn_lock , brotli @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { mastodonGems = bundlerEnv { name = "${pname}-gems-${version}"; - inherit version gemset; - ruby = ruby_3_0; + inherit version gemset ruby; gemdir = src; # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem # symlinks with directories, resolving this error when running rake: diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix index 1d5fbcc6db..3843024584 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -5,32 +5,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10y18l67i6ry7v9w0qwh26477g4gm0qrjjpa87pa5a42hzkglnc7"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ihayijdgasf0rp10x6h335k3y1hgqr6c9s8lxqmhm4gpczajaac"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03557cskby5alpncnhgm1j1kq43xqq75sdd6r2x22q3j2jv68pj5"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,21 +38,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7ffyan8sbv4ywjghiyiv077vfxyf6i6y0h4k0mfpdmf76l0i86"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g5gw9ywirw7814wn8cdnnv1df58x5gplgpb15gaw5gzkw9cgvd8"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmzc2c00lsdr5hpmsgs8axs5pbhv5xyqiyi69wf81pqypd2cy3l"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -76,48 +76,38 @@ }; version = "0.10.13"; }; - active_record_query_trace = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19888wjdpqvr2kaci6v6jyjw9pjf682zb1iyx2lz12mpdmy3500n"; - type = "gem"; - }; - version = "1.8"; - }; activejob = { dependencies = ["activesupport" "globalid"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153z9lmkip3v243xxa5rcc8am82ma73ar46q4vxbmzi850a5yjj2"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpr0zspih2rf2ppzjxaw8sq6gfqg9vss5h0fs4r85p03579swin"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06403rkjnyr80yj4g05lb5hn04yfzipa7bm0gplbqrrykr3hvh5r"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,21 +115,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094kvh8bp792xccql54kky8prmvqvfzwwv9xas2pnh8s4v3avbzl"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -147,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; }; aes_key_wrap = { groups = ["default"]; @@ -195,7 +185,7 @@ version = "3.2.0"; }; ast = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -210,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; + sha256 = "034x6mbrv9apd83v99v9pm8vl3d17w5bbwws26gr4wv95fylmgnc"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.0"; }; attr_required = { groups = ["default"]; @@ -250,10 +240,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nz23laxgrxbv5svswi3bksmbhz86j691n4099qp4049i5a5cx91"; + sha256 = "0m2kha6ip4ynhvl1l8z4vg0j96ngq4f2v6jl4j2y27m2kzmgcxz5"; type = "gem"; }; - version = "1.701.0"; + version = "1.809.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; + sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; type = "gem"; }; - version = "3.170.0"; + version = "3.181.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; + sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; type = "gem"; }; - version = "1.62.0"; + version = "1.71.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sg212jsj6ydyrr6r284mgqcl83kln2hfd9nlyisf3pj5lbdjd1c"; + sha256 = "0yymj15nwnvam95lw5fxwxx7b6xm4hkj8z7byzvjmx9aji1x245m"; type = "gem"; }; - version = "1.119.0"; + version = "1.133.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,35 +284,67 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; + }; + 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"; + }; + base64 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; }; bcrypt = { groups = ["default" "pam_authentication"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rakdhrnlclrpy7sihi9ipwdh7fjkkvzga171464lq6rzp07cf65"; + sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; type = "gem"; }; - version = "3.1.17"; + version = "3.1.18"; }; better_errors = { - dependencies = ["coderay" "erubi" "rack"]; + dependencies = ["erubi" "rack" "rouge"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.1"; }; better_html = { dependencies = ["actionview" "activesupport" "ast" "erubi" "parser" "smart_properties"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -336,10 +358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mz9hz5clknznw8i5f3l2zb9103mlgh96djdhlvlfpf2chkr0s1z"; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; type = "gem"; }; - version = "2.4.14"; + version = "2.4.15"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -378,20 +400,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "1gliwnyma9f1mpr928c79i36q51yl68dwjd3jgwvsyr4piiiqr1r"; type = "gem"; }; - version = "5.4.0"; + version = "6.0.1"; }; browser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; type = "gem"; }; - version = "4.2.0"; + version = "5.3.1"; }; brpoplpush-redis_script = { dependencies = ["concurrent-ruby" "redis"]; @@ -414,17 +436,6 @@ }; version = "3.2.4"; }; - bullet = { - dependencies = ["activesupport" "uniform_notifier"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; - type = "gem"; - }; - version = "7.0.7"; - }; bundler-audit = { dependencies = ["thor"]; groups = ["development"]; @@ -436,26 +447,16 @@ }; version = "0.9.1"; }; - byebug = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; - type = "gem"; - }; - version = "11.1.3"; - }; capistrano = { dependencies = ["airbrussh" "i18n" "rake" "sshkit"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1673k8yzy4gl96f1xjj6zf1r2pgm2h042vdsiw03wqx4ygbq2las"; + sha256 = "14pflh85rrs2l8k0m286j4vaab5vad2sfqq9dncqb31z05vy29mn"; type = "gem"; }; - version = "3.17.1"; + version = "3.17.3"; }; capistrano-bundler = { dependencies = ["capistrano"]; @@ -463,10 +464,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168kyi0gv2s84jm533m8rg0dii50flr06n6s2ci6kzsib3n9n8dr"; + sha256 = "09rndb1fa9r7mhb2sc6p3k0pcarhg8mv0kfmvd1zdb0ciwwp7514"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; capistrano-rails = { dependencies = ["capistrano" "capistrano-bundler"]; @@ -474,10 +475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iyhs77bff09g18dlz0li5f44khjwpqc09gk5hzcnf5v9yvijpg9"; + sha256 = "05lk7y4qyzadzzshjyhgfgx00ggqliq7n561wkx8m331wljv7kx7"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; capistrano-rbenv = { dependencies = ["capistrano" "sshkit"]; @@ -507,10 +508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.38.0"; + version = "3.39.2"; }; case_transform = { dependencies = ["activesupport"]; @@ -549,10 +550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jfdz0z27p839m09xmw5anrw5jp3jd5hd5gnx4vlk6kk520cy6sf"; + sha256 = "0zca6v8i66jkxfdfjnn9xwg21pk95qn4ic8vzfvrx49d6sb8319y"; type = "gem"; }; - version = "7.2.4"; + version = "7.3.4"; }; chunky_png = { groups = ["default"]; @@ -584,16 +585,6 @@ }; version = "1.2.15"; }; - coderay = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; - type = "gem"; - }; - version = "1.1.3"; - }; color_diff = { groups = ["default"]; platforms = []; @@ -619,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -630,10 +621,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; crack = { dependencies = ["rexml"]; @@ -662,10 +653,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; + }; + database_cleaner-active_record = { + dependencies = ["activerecord" "database_cleaner-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hdsqnws9gyc9sxiyc8pjiwr0xa7136m1qbhmd1pk3vsrrvk13k"; + type = "gem"; + }; + version = "2.1.0"; + }; + database_cleaner-core = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; + type = "gem"; + }; + version = "2.0.1"; }; date = { groups = ["default" "development"]; @@ -682,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lswmjwxf1clzaimikhiwd9s1n07qkyz7a9xwng64j4fxsajykqp"; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; devise = { dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; @@ -693,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gl0b4jqf7ysv3rg99sgxa5y9va2k13p0si3a88pr7m8g6z8pm7x"; + sha256 = "0vpd7d61d4pfmyb2plnnv82wmczzlhw4k4gjhd2fv4r6vq8ilqqi"; type = "gem"; }; - version = "4.8.1"; + version = "4.9.2"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -704,10 +716,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35"; + sha256 = "1nk43p339zyp4y5vab3w3s0zbjd4xfs8qn0ymxdnz6d961dbbdm8"; type = "gem"; }; - version = "4.0.2"; + version = "4.1.0"; }; devise_pam_authenticatable2 = { dependencies = ["devise" "rpam2"]; @@ -883,13 +895,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby"; + sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867"; type = "gem"; }; - version = "0.95.0"; + version = "0.100.0"; }; fabrication = { - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -904,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; + sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; type = "gem"; }; - version = "3.1.1"; + version = "3.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"]; @@ -915,10 +927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.3"; }; faraday-em_http = { groups = ["default"]; @@ -966,10 +978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -1021,6 +1033,17 @@ }; version = "1.0.3"; }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + type = "gem"; + }; + version = "1.2.0"; + }; fast_blank = { groups = ["default"]; platforms = []; @@ -1036,10 +1059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr"; + sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx"; type = "gem"; }; - version = "2.2.6"; + version = "2.2.7"; }; ffi = { groups = ["default"]; @@ -1111,14 +1134,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7m38n4f5cjqa4gf4fycw6fqvf6m5hhsx4jawryv3bi4hls07d1"; + sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1127,17 +1150,6 @@ }; version = "2.5.1"; }; - gitlab-omniauth-openid-connect = { - dependencies = ["addressable" "omniauth" "openid_connect"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pp9cf6b68pky9bndmals070kibab525wjn9igx9pc5h8z1jv5bd"; - type = "gem"; - }; - version = "0.10.1"; - }; globalid = { dependencies = ["activesupport"]; groups = ["default" "development"]; @@ -1149,27 +1161,38 @@ }; version = "1.1.0"; }; - hamlit = { + haml = { dependencies = ["temple" "thor" "tilt"]; - groups = ["default"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06imnwpzvpagwn0b9a8kwv7hncii32flmafz20z95hd77hhr6ab7"; + sha256 = "154svzqlkdq7gslv3p8mfih28gbw4gsj4pd8wr1wpwz6nyzmhh8m"; type = "gem"; }; - version = "2.13.0"; + version = "6.1.2"; }; - hamlit-rails = { - dependencies = ["actionpack" "activesupport" "hamlit" "railties"]; + haml-rails = { + dependencies = ["actionpack" "activesupport" "haml" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v75yd6x0nwky83smd9hw5ym9h0pi32jrzbnvq55pzj0rc95gg2p"; + sha256 = "1sjrdwc4azzfpsp2xk0365z031482gcrs0c54d5wx0igkqca0fr7"; type = "gem"; }; - version = "0.2.3"; + version = "2.1.0"; + }; + haml_lint = { + dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qics7sll6yw7fm499q4b1frfr5f3gav94ach0fwy49zprl9yk33"; + type = "gem"; + }; + version = "0.50.0"; }; hashdiff = { groups = ["default" "test"]; @@ -1191,15 +1214,26 @@ }; version = "5.0.0"; }; - highline = { - groups = ["default" "development" "test"]; + hcaptcha = { + dependencies = ["json"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "0fh6391zlv2ikvzqj2gymb70k1avk1j9da8bzgw0scsz2wqq98m2"; type = "gem"; }; - version = "2.0.3"; + version = "7.1.0"; + }; + highline = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + type = "gem"; + }; + version = "2.1.0"; }; hiredis = { groups = ["default"]; @@ -1300,14 +1334,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; i18n-tasks = { dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1347,7 +1381,7 @@ version = "1.6.2"; }; json = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1361,10 +1395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "179h6jfdsp9dmzyma7s7ykv1ia43r6z8x96j335q99p6mc5sk5qv"; + sha256 = "1rvsalsrs8njk2gqxgq0ydg5cd02jqdawskbq2ccz663qxz8wwq5"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.2"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -1383,10 +1417,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aq71is278w69brhg4yp0f4ldxmy2nyj45c1rfbf73qi945mrbln"; + sha256 = "1z3kqacjmqs02vwwqm9di7sw7f7nchxx99v84myrrzmh64c6zfcq"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.5"; }; json-ld-preloaded = { dependencies = ["json-ld" "rdf"]; @@ -1405,10 +1439,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; + sha256 = "155rygs093i8i04i38a97hs5icmqk2jkkhx76w31yxyr3bxfbgx3"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1425,10 +1459,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.1"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1479,10 +1513,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ngapld22knlkyn0dhhddkfm4vfj0lgmwj4y6x4mhi2hzfwxcxr"; + sha256 = "14gnkcp924v8sbay7q6vz4kn37jylbnvrhi4y5c5jcffd51fbwid"; type = "gem"; }; - version = "7.1.1"; + version = "7.2.1"; + }; + language_server-protocol = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; }; launchy = { dependencies = ["addressable"]; @@ -1490,10 +1534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -1544,10 +1588,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; + sha256 = "01kdw5dbzimb89rq4zf44zf8990czb5qxvib0hzja1l4hrha8cki"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1555,10 +1599,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1571,17 +1615,6 @@ }; version = "2.8.1"; }; - makara = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a6x6w1ij484s1z0wp667d6v0zb8bylhhr3av10yz60a2nz4r1l7"; - type = "gem"; - }; - version = "0.5.1"; - }; marcel = { groups = ["default"]; platforms = []; @@ -1613,8 +1646,19 @@ }; version = "0.4.2"; }; + md-paperclip-azure = { + dependencies = ["addressable" "azure-storage-blob" "hashie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hb1a06x3i8zrhl715jf46ha8r4iy0srcpdhnmp9l14qnnhzn0l5"; + type = "gem"; + }; + version = "2.2.0"; + }; memory_profiler = { - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1639,60 +1683,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.0808"; }; mini_mime = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.17.0"; + version = "5.19.0"; }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; multi_json = { groups = ["default"]; @@ -1709,10 +1753,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; type = "gem"; }; - version = "2.1.1"; + version = "2.3.0"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; + type = "gem"; + }; + version = "0.3.2"; + }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; + type = "gem"; + }; + version = "4.0.2"; }; net-imap = { dependencies = ["date" "net-protocol"]; @@ -1720,20 +1786,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1763,10 +1829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4kxfvx1v4awv8kgincishi7h16dj9sn74gz8x92i81668j1wgm"; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; type = "gem"; }; - version = "4.0.0.rc1"; + version = "4.0.0"; }; net-smtp = { dependencies = ["net-protocol"]; @@ -1784,10 +1850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr"; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; nio4r = { groups = ["default"]; @@ -1805,19 +1871,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g6wvxab4qwnbny983n9bckc0afy6y6s3g5v3csdbsp8n7g9vxi3"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.14.5"; + version = "1.15.4"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jzs1n71pi6najhs9h8jx156gzgk3h9bwjr60vazizwdz3mm69ia"; - type = "gem"; + fetchSubmodules = false; + rev = "e020fcc3a54d993ab45b7194d89ab720296c111b"; + sha256 = "18pbm9qkancy38v0gpb6f5k0xd8r347jl4xvj4jn98ihfhzgwygj"; + type = "git"; + url = "https://github.com/jhawthorn/nsa.git"; }; version = "0.2.8"; }; @@ -1826,30 +1894,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; + sha256 = "0m4vsd6i093kmyz9gckvzpnws997laldaiaf86hg5lza1ir82x7n"; type = "gem"; }; - version = "3.13.23"; + version = "3.16.1"; }; omniauth = { - dependencies = ["hashie" "rack"]; + dependencies = ["hashie" "rack" "rack-protection"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; + sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; type = "gem"; }; - version = "1.9.2"; + version = "2.1.1"; }; omniauth-cas = { dependencies = ["addressable" "nokogiri" "omniauth"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kzlh1nac4yz70917cdcsk0r23gy5h7i0x5kbmkvkpbgk6gvrb0z"; - type = "gem"; + fetchSubmodules = false; + rev = "4211e6d05941b4a981f9a36b49ec166cecd0e271"; + sha256 = "1zs0xp062f6wk7xxy8w81838qr855kp7idbgpbrhpl319xzc1xkc"; + type = "git"; + url = "https://github.com/stanhu/omniauth-cas.git"; }; version = "2.0.0"; }; @@ -1859,10 +1929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.1"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1870,10 +1940,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; type = "gem"; }; - version = "1.10.3"; + version = "2.1.0"; + }; + omniauth_openid_connect = { + dependencies = ["omniauth" "openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08yl0x203k6nrshc70zawfqh79ap1c3fyka9zwwy61cvn7sih4sz"; + type = "gem"; + }; + version = "0.6.1"; }; openid_connect = { dependencies = ["activemodel" "attr_required" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; @@ -1891,10 +1972,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1902,10 +1983,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; orm_adapter = { groups = ["default" "pam_authentication"]; @@ -1922,31 +2003,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9ivy30jx7hjl8l3il47dmc9xgla8dj762v5cw0mgzpd9rq6vr4"; + sha256 = "1yq0h1niimm8z6z8p1yxb104kxqw69bvbrax84598zfjxifcxhxz"; type = "gem"; }; - version = "2.14.14"; + version = "2.14.17"; }; parallel = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; + dependencies = ["ast" "racc"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.3"; }; parslet = { groups = ["default"]; @@ -1974,10 +2055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.4"; }; pghero = { dependencies = ["activerecord"]; @@ -1985,20 +2066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi1mls8r6r43dy5m6dsdqk28q564164h97pp7a111pgkbdmxf83"; + sha256 = "0gzbgq392b0z7ma1jrdnzzfppdlgjdl9akc4iajq4g46raqd4899"; type = "gem"; }; - version = "3.1.0"; - }; - pkg-config = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; - type = "gem"; - }; - version = "1.5.1"; + version = "3.3.4"; }; posix-spawn = { groups = ["default"]; @@ -2016,10 +2087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r"; + sha256 = "10rzwdz43yy20lwzsr2as6aivhvwjvqh4nd48sa0ga57sizf1fb4"; type = "gem"; }; - version = "1.18.0"; + version = "1.21.0"; }; premailer-rails = { dependencies = ["actionmailer" "net-smtp" "premailer"]; @@ -2033,7 +2104,7 @@ version = "1.12.0"; }; private_address_check = { - groups = ["production" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2042,48 +2113,15 @@ }; version = "0.5.0"; }; - pry = { - dependencies = ["coderay" "method_source"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; - type = "gem"; - }; - version = "0.14.1"; - }; - pry-byebug = { - dependencies = ["byebug" "pry"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; - type = "gem"; - }; - version = "3.10.1"; - }; - pry-rails = { - dependencies = ["pry"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; - type = "gem"; - }; - version = "0.3.9"; - }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -2091,10 +2129,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "5.6.5"; + version = "6.3.1"; }; pundit = { dependencies = ["activesupport"]; @@ -2122,20 +2160,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.1"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-attack = { dependencies = ["rack"]; @@ -2143,10 +2181,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; type = "gem"; }; - version = "6.6.1"; + version = "6.7.0"; }; rack-cors = { dependencies = ["rack"]; @@ -2154,10 +2192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw"; type = "gem"; }; - version = "1.1.1"; + version = "2.0.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -2170,6 +2208,17 @@ }; version = "1.21.3"; }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + type = "gem"; + }; + version = "3.0.5"; + }; rack-proxy = { dependencies = ["rack"]; groups = ["default"]; @@ -2187,21 +2236,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ympjpkhz06xqsay18hskpbs64nh05hzrsckx8va6ikrxhs2ksq"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2215,62 +2264,64 @@ version = "1.0.5"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mcgv748vppnm3fnml37wjy3dw61wj8vfw14ldaj1yx1bmkhb07"; + sha256 = "1bbh5gsw46djmrgddwaq3wsjmj9rsh5dk13wkclwxf1rg9jpkn3g"; type = "gem"; }; - version = "6.0.0"; + version = "7.0.7"; }; rails-settings-cached = { dependencies = ["rails"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wyhyls0aqb1iw7mnaldg39w3mnbi3anmpbvb52rjwkpj2mchhnc"; - type = "gem"; + fetchSubmodules = false; + rev = "86328ef0bd04ce21cc0504ff5e334591e8c2ccab"; + sha256 = "06r637gimh5miq2i6ywxn9gp7nqk8n8555yw8239mykalbzda69h"; + type = "git"; + url = "https://github.com/mastodon/rails-settings-cached.git"; }; version = "0.6.6"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g92if3cxxysl9h6x6ibs7y9dsbcniiwgcldvg00kib02b3pxkbb"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2295,10 +2346,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0799a5hqh7rjkqnbfb5cq62m2dx4zlnnag3xy1l4jyjywsk7v5kv"; + sha256 = "1jx4xyip4inrhr099zac8ah5232g70rv39mm19p85sgpwg80a6ip"; type = "gem"; }; - version = "3.2.9"; + version = "3.2.11"; }; rdf-normalize = { dependencies = ["rdf"]; @@ -2306,10 +2357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dngmsk9wg1vws56pl87dys0ns4bcn9arf8ip6zxa0gypr3ifq3m"; + sha256 = "12slrdq6xch5rqj1m79k1wv09264pmhs76nm300j1jsjpcfmdg0r"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.1"; }; redcarpet = { groups = ["default"]; @@ -2326,10 +2377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw"; + sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; type = "gem"; }; - version = "4.5.1"; + version = "4.8.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -2337,10 +2388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; redlock = { dependencies = ["redis"]; @@ -2358,10 +2409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; type = "gem"; }; - version = "2.6.2"; + version = "2.8.1"; }; request_store = { dependencies = ["rack"]; @@ -2380,30 +2431,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; + sha256 = "0m9s0mkkprrz02gxhq0ijlwjy0nx1j5yrjf8ssjnhyagnx03lyrx"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rotp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.2"; + }; + rouge = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; + type = "gem"; + }; + version = "4.1.2"; }; rpam2 = { groups = ["default" "pam_authentication"]; @@ -2421,10 +2482,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.0"; }; rqrcode_core = { groups = ["default"]; @@ -2442,10 +2503,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2453,10 +2514,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2464,10 +2525,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.5"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2475,118 +2536,138 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "5.1.2"; + version = "6.0.3"; }; rspec-sidekiq = { - dependencies = ["rspec-core" "sidekiq"]; + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "sidekiq"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spzw3sc2p0n9qfb89y1v8igd60y7c5z9w2hjqqbbgbyjvy0agp8"; + sha256 = "0dijmcwjn8k6lrld3yqbqfrqb5g73l57yx98y5frx54p5qxjzbzy"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.1"; }; - rspec_junit_formatter = { - dependencies = ["rspec-core"]; + rspec_chunked = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; + sha256 = "0h4bsj3m7vb47qnx5bry4v0xscrb3lhg1f1vyxl524znb3i2qqzv"; type = "gem"; }; - version = "0.6.0"; + version = "0.6"; }; rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; + dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4n844yr2jrbddf79cam8qg41k2gkpyjjgd4zgbd8df1ijbld6p"; + sha256 = "1i3571gchdj3c28znr5kisj0fkppy57208g9j1kv23rhk3p5q5p2"; type = "gem"; }; - version = "1.44.1"; + version = "1.56.3"; }; rubocop-ast = { dependencies = ["parser"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.24.1"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; - groups = ["default" "development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; type = "gem"; }; - version = "2.17.0"; + version = "2.18.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; + type = "gem"; + }; + version = "2.23.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "1v3a2g3wk3aqa0k0zzla10qkxlc625zkj3yf4zcsybs86r5bm4xn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; type = "gem"; }; - version = "2.17.4"; + version = "2.20.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; + type = "gem"; + }; + version = "2.23.2"; + }; + ruby-prof = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "13fsfw43zx9pcix1fzxb95g09yadqjvc8971k74krrjz81vbyh51"; type = "gem"; }; - version = "2.18.1"; + version = "1.6.3"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-saml = { dependencies = ["nokogiri" "rexml"]; @@ -2594,10 +2675,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k"; + sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; ruby2_keywords = { groups = ["default"]; @@ -2609,16 +2690,26 @@ }; version = "0.0.5"; }; + rubyzip = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; rufus-scheduler = { dependencies = ["fugit"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1as4yrb8y5lq49div8p3vqgwrrhdgwnvx4m73y3712nmnlpx6cws"; + sha256 = "14lr8c2sswn0sisvrfi4448pmr34za279k3zlxgh581rl1y0gjjz"; type = "gem"; }; - version = "3.8.2"; + version = "3.9.1"; }; safety_net_attestation = { dependencies = ["jwt"]; @@ -2653,6 +2744,17 @@ }; version = "1.7.0"; }; + selenium-webdriver = { + dependencies = ["rexml" "rubyzip" "websocket"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; + type = "gem"; + }; + version = "4.11.0"; + }; semantic_range = { groups = ["default"]; platforms = []; @@ -2669,10 +2771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; + sha256 = "0w9a1cwv86c9zb3hj1m42gbjk6r7rgs5ismalr9c9nx365yyj90i"; type = "gem"; }; - version = "6.5.8"; + version = "6.5.10"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2686,15 +2788,15 @@ version = "0.2.0"; }; sidekiq-scheduler = { - dependencies = ["redis" "rufus-scheduler" "sidekiq" "tilt"]; + dependencies = ["rufus-scheduler" "sidekiq" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ij0m4m4zi3ffn1csdrj4g96l4vpqlsw3rrgjxda9yqsq4ylf624"; + sha256 = "0p5jjs3x2pa2fy494xs39xbq642pri13809dcr1l3hjsm56qvp1h"; type = "gem"; }; - version = "4.0.3"; + version = "5.0.3"; }; sidekiq-unique-jobs = { dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "redis" "sidekiq" "thor"]; @@ -2761,7 +2863,7 @@ version = "0.1.4"; }; smart_properties = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2798,20 +2900,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1szshiw7bzizi380z1hkdbwhjdaixb5bgbx7c3wf7970mjdashkd"; + sha256 = "14a717mr2cmpgld5fcdd124cvlc5b634f96rhwlnmmc4m8bbkcp9"; type = "gem"; }; - version = "1.21.2"; + version = "1.21.5"; }; stackprof = { - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; + sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; type = "gem"; }; - version = "0.2.23"; + version = "0.2.25"; }; statsd-ruby = { groups = ["default"]; @@ -2829,10 +2931,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rmhhqvvrn7874r9cjf4wpv36vnxvxsrgb1kfgdk3dalg4rig7q6"; + sha256 = "1vhqx7q8qpq3x9ba504n7bp0r9dxcck0r0hd73cac2iqkix6khlv"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; strong_migrations = { dependencies = ["activerecord"]; @@ -2840,10 +2942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk45ri2rnp00x4mdsvwdzdd9yziqxj5v9sjk74nzw0y927y3m1w"; + sha256 = "0wz4zhsp4xia8zcpi98v4sgjlv2prd515l8jz4f7j0wk45dfkjs1"; type = "gem"; }; - version = "0.7.9"; + version = "0.8.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -2856,19 +2958,29 @@ }; version = "1.3.0"; }; - temple = { - groups = ["default"]; + sysexits = { + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; type = "gem"; }; - version = "0.8.2"; + version = "1.2.0"; + }; + temple = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4"; + type = "gem"; + }; + version = "0.10.2"; }; terminal-table = { dependencies = ["unicode-display_width"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2888,6 +3000,16 @@ }; version = "0.6.0"; }; + test-prof = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mhzw33lv7h8d7pyh65lis5svnmm8m6fnszbsfg3j3xk9hcl0an5"; + type = "gem"; + }; + version = "1.2.3"; + }; thor = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; @@ -2899,24 +3021,24 @@ version = "1.2.2"; }; tilt = { - groups = ["default"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.0.11"; + version = "2.2.0"; }; timeout = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -2924,10 +3046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kyq8z36953snxksv2xmc71znw7zykzis5r23hx3k06dij71vxsy"; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; tty-color = { groups = ["default"]; @@ -3009,10 +3131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; type = "gem"; }; - version = "1.2022.7"; + version = "1.2023.3"; }; unf = { dependencies = ["unf_ext"]; @@ -3036,7 +3158,7 @@ version = "0.0.8.2"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -3045,15 +3167,15 @@ }; version = "2.4.2"; }; - uniform_notifier = { - groups = ["default" "development"]; + uri = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "1.16.0"; + version = "0.12.2"; }; validate_email = { dependencies = ["activemodel" "mail"]; @@ -3094,10 +3216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs21q8krknb3db4s87l7xhzihp46ldsf6ql6689g2j0489l6da1"; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; type = "gem"; }; - version = "2.5.2"; + version = "3.0.0"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; @@ -3116,10 +3238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; webpacker = { dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; @@ -3145,16 +3267,26 @@ }; version = "0.3.8"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -3202,10 +3334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.11"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index 995b58476d..fd1101238a 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -1,16 +1,18 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches }: let - version = "4.1.9"; + version = "4.2.1"; in -applyPatches { +( + applyPatches { + src = fetchFromGitHub { + owner = "mastodon"; + repo = "mastodon"; + rev = "v${version}"; + hash = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw="; + }; + patches = []; + }) // { inherit version; - src = fetchFromGitHub { - owner = "mastodon"; - repo = "mastodon"; - rev = "${version}"; - hash = "sha256-xpE/mg2AeioW6NThUjLS+SBxGavG4w1xtp3BOMADfYo="; - }; - patches = []; - yarnHash = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; + yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; } diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh index 6955f9e618..ab43031585 100755 --- a/third_party/nixpkgs/pkgs/servers/mastodon/update.sh +++ b/third_party/nixpkgs/pkgs/servers/mastodon/update.sh @@ -53,9 +53,10 @@ fi if [[ -z "$REVISION" ]]; then REVISION="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/$OWNER/$REPO/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" - VERSION="$(echo "$REVISION" | cut -c2-)" fi +VERSION="$(echo "$REVISION" | cut -c2-)" + rm -f gemset.nix source.nix cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 @@ -85,15 +86,17 @@ cat > source.nix << EOF let version = "$VERSION"; in -applyPatches { +( + applyPatches { + src = fetchFromGitHub { + owner = "$OWNER"; + repo = "$REPO"; + rev = "v\${version}"; + hash = "$HASH"; + }; + patches = [$PATCHES]; + }) // { inherit version; - src = fetchFromGitHub { - owner = "$OWNER"; - repo = "$REPO"; - rev = "\${version}"; - hash = "$HASH"; - }; - patches = [$PATCHES]; yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; } EOF diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index 6cb8f16d20..cc162e6373 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix @@ -7,6 +7,7 @@ , darwin , nixosTests , rocksdb +, rust-jemalloc-sys }: rustPlatform.buildRustPackage rec { @@ -42,7 +43,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ + sqlite + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix index 83b1ff0070..59e4ca1b19 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-hebbot/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}"; license = with licenses; [ agpl3 ]; + mainProgram = "hebbot"; maintainers = with maintainers; [ a-kenji ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 45e9e89b3d..4b7c6d21f3 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.93.0"; + version = "1.95.1"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-fmY5xjpbFwzrX47ijPxOUTI0w9stYVPpSV+HRF4GdlA="; + hash = "sha256-5RyJCMYsf6p9rd1ATEHa+FMV6vv3ULbcx7PXxMSUGSU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9cCEfDV5X65JublgkUP6NVfMIObPawx+nXTmIG9lg5o="; + hash = "sha256-gNjpML+j9ABv24WrAiJI5hoEoIqcVPL2I4V/W+sWFSg="; }; postPatch = '' @@ -113,10 +113,6 @@ python3.pkgs.buildPythonApplication rec { sentry = [ sentry-sdk ]; - opentracing = [ - jaeger-client - opentracing - ]; jwt = [ authlib ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index 99b28a4def..6113bd6ff4 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -5,7 +5,6 @@ , makeWrapper , matrix-sdk-crypto-nodejs , mkYarnPackage -, rust , cargo , rustPlatform , rustc @@ -60,7 +59,7 @@ mkYarnPackage rec { buildPhase = '' runHook preBuild cd deps/${pname} - napi build --target ${rust.toRustTargetSpec stdenv.targetPlatform} --dts ../src/libRs.d.ts --release ./lib + napi build --target ${stdenv.targetPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib yarn run build:app:fix-defs yarn run build:app yarn run build:web diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix index bb8003e389..aca863ed2d 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.10"; + version = "0.99.12"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-TjChelGVicA59q6iIIDTI7nSj8KtjpA4bfZqsfoiOQg="; + hash = "sha256-7M+Ti1SfurRngXg2oCdLveG6QyjM2BjKnoovJxz7ZOY="; }; - vendorHash = "sha256-E3nCcw6eTKKcL55ls6n5pYlRFffsefsN0G1Hwd49uh8="; + vendorHash = "sha256-li5kEF7U7KyyMLMhVBqvnLuLXI6QrJl1KeusKrQXo8w="; subPackages = [ "cmd/syncv3" ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 37023092a0..5ae3077060 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.43.1"; + version = "0.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z8OXrra7+fptd4zs1gxJVGLR+SA8hoexK2qY9zpSowU="; + hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index a876a0b9bb..c1dfec34f7 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -8,21 +8,21 @@ buildGoModule rec { pname = "mattermost"; - version = "8.1.3"; + version = "8.1.4"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-Xcg24hnQqrq/hW+tlzpdNUmvrC/3zIXzyi2ZkU1a96U="; + hash = "sha256-mubKY1nzTmysg015368z/ORqIIOAGPUEthhXNrW1sPk="; } + "/server"; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-FXc0W3W05Hx8jdNHHjRXTcfKw8j6rRZbn2TTEKx/UfU="; + hash = "sha256-st900RxTLwIXg0lyUZZnYom99fbiafF7ignaqF1YwME="; }; - vendorHash = "sha256-uHKd8shLDVd+zjRhEJcxAn+H9e9jqEM8XXqYx7B4hiQ="; + vendorHash = "sha256-UFZlBZJf/AtJiY+EtekSrnwUmrYnH151XnRyRQFTft0="; subPackages = [ "cmd/mattermost" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index a456ee8c3f..c66d5557d7 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterircd"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-bDM+P9UwH4cpieOQQfEi2xIKTRQ1zInW9iFK3yAU1Xk="; + sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix index f2273fa0ec..d7be9a051d 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-194AB7r63gijTyeh8mn5N/AgVBeh39YMwdmvuAi3c9k="; + hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs="; }; - vendorHash = "sha256-389ewqgpdFNRGAyka+oumx0RVadCSt1BXsXxIGTQwW0="; + vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix index b522dc0636..41a72eec05 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "unstable-2023-07-16"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "f4cddafd474b12be09efd15c6652c04d0650458e"; - sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8="; + rev = "refs/tags/v${version}"; + hash = "sha256-a/EWz/aCkBE6XdDpmZcx2Q7/xKNwGCiZUhZc9YIIDhU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index e0db6f3c08..8d201624a6 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-GWtci/OiipaUFzzha3GvkoKmN1lb9Fg3i+X1ZFkGKtc="; + hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc="; }; buildInputs = [ olm ]; - vendorHash = "sha256-IEBSY61Bjuc42GqQUvChqLayO1hiDEDBxlMoAKJo12E="; + vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix b/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix index 9e9e95d67f..29397ad3c8 100644 --- a/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-VIXrptVF5kjjz9vHqqjAM5gYk2o/wkUvudXixCloPgE="; + hash = "sha256-Upm/fiW3hXzBS+IpwzE3C6h6Z7ZpA2k+j2UqAWT8hF0="; }; - vendorHash = "sha256-bUZU9I2lqjMOupkCQKSfdrWsBYmAVrLEXod0l+J3p6g="; + vendorHash = "sha256-uaOfULtZ+BdbX1TmDyZtYnoXV8579RSW6eocmPsXyP8="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index 3baacb2fc8..95f95cda68 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.21"; + version = "1.6.22"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-x4iYDvxBfdXZPEQrHIuHafsgGIlsKd44h9IqLxQ9ou4="; + sha256 = "sha256-NHg6kKTM90xBBwhf2Stoh0nSOyds/a2fBOT3JaBdHKc="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index d25298b567..2fb8c1f5cb 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.47.0"; + version = "0.47.6"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-m/A6RkFjlxGWvsMGWQBB6PVx8k4dWjRpU2Pw3qHrqAk="; + hash = "sha256-LWF8O6v1x1iX5eJCugQ1noLeUJsVthZ7cGuyW3w6XGg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index cfc2dd01bc..88244b78e2 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -1,20 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; - version = "2.0.48"; + version = "2.0.50"; -in buildGoModule { +in buildGo121Module { inherit pname version; src = fetchFromGitHub { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-g2Cnkf022aU/kUkb6N8huB+SFY60uNxyI9BVEycl37c="; + sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; }; - vendorHash = "sha256-d4/oDvMRZtetZ7RyCHVnPqA78yPVFyw4UhjfPD1XuMo="; + vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index b9505f15da..5d572c18e2 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -12,6 +12,12 @@ let splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; in builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ]; + + # CopyrightYear will be printed to the CLI UI. + # Example: + # versionToYear "2021-04-22T15-44-28Z" + # => "2021" + versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0; in buildGoModule rec { pname = "minio"; @@ -35,7 +41,12 @@ buildGoModule rec { tags = [ "kqueue" ]; ldflags = let t = "github.com/minio/minio/cmd"; in [ - "-s" "-w" "-X ${t}.Version=${versionToTimestamp version}" "-X ${t}.ReleaseTag=RELEASE.${version}" "-X ${t}.CommitID=${src.rev}" + "-s" + "-w" + "-X ${t}.Version=${versionToTimestamp version}" + "-X ${t}.CopyrightYear=${versionToYear version}" + "-X ${t}.ReleaseTag=RELEASE.${version}" + "-X ${t}.CommitID=${src.rev}" ]; passthru.tests.minio = nixosTests.minio; diff --git a/third_party/nixpkgs/pkgs/servers/mir/default.nix b/third_party/nixpkgs/pkgs/servers/mir/default.nix index 6221c46768..078125016b 100644 --- a/third_party/nixpkgs/pkgs/servers/mir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mir/default.nix @@ -1,13 +1,12 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , gitUpdater , testers , cmake , pkg-config , python3 -, doxygen -, libxslt , boost , egl-wayland , freetype @@ -40,15 +39,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "mir"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${finalAttrs.version}"; - hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws="; + hash = "sha256-c1+gxzLEtNCjR/mx76O5QElQ8+AO4WsfcG7Wy1+nC6E="; }; + patches = [ + # Fix gbm-kms tests + # Remove when version > 2.15.0 + (fetchpatch { + name = "0001-mir-Fix-the-signature-of-drmModeCrtcSetGamma.patch"; + url = "https://github.com/MirServer/mir/commit/98250e9c32c5b9b940da2fb0a32d8139bbc68157.patch"; + hash = "sha256-tTtOHGNue5rsppOIQSfkOH5sVfFSn/KPGHmubNlRtLI="; + }) + ]; + postPatch = '' # Fix scripts that get run in tests patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in @@ -73,21 +82,13 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/platform/graphics/CMakeLists.txt \ --replace "/usr/include/drm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" \ --replace "/usr/include/libdrm/drm_fourcc.h" "${lib.getDev libdrm}/include/libdrm/drm_fourcc.h" - - # Fix date in generated docs not honouring SOURCE_DATE_EPOCH - # Install docs to correct dir - substituteInPlace cmake/Doxygen.cmake \ - --replace '"date"' '"date" "--date=@'"$SOURCE_DATE_EPOCH"'"' \ - --replace "\''${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc" "\''${CMAKE_INSTALL_DOCDIR}" ''; strictDeps = true; nativeBuildInputs = [ cmake - doxygen glib # gdbus-codegen - libxslt lttng-ust # lttng-gen-tp pkg-config (python3.withPackages (ps: with ps; [ @@ -137,9 +138,8 @@ stdenv.mkDerivation (finalAttrs: { wlcs ]; - buildFlags = [ "all" "doc" ]; - cmakeFlags = [ + "-DBUILD_DOXYGEN=OFF" "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" "-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_RUNTIME_DIR=/tmp ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" ]; passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index 4a74b6e4a7..0098317d06 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; + hash = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; }; - vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; + vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix index 9beb2b095c..8a1a1aca85 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8="; }; + separateDebugInfo = true; + cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix index 5a62a8a154..562a6c83ae 100644 --- a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix @@ -10,20 +10,20 @@ mkYarnPackage rec { pname = "mjolnir"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - hash = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w="; + hash = "sha256-xejFKz2MmdjMFU0X0SdI+qXTBRAwIvkcfZPQqXB9LV0="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-B4s0CYr5Ihoh4gkckwZ3z0Nb4LMET48WvRXuhk3fpQM="; + hash = "sha256-RpvdyxJj92k4wFjBBmWCnEpFVOXVWlHEm0SmEBUlnTM="; }; packageResolutions = { diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/package.json b/third_party/nixpkgs/pkgs/servers/mjolnir/package.json index f7ed5aba81..4b24df8280 100644 --- a/third_party/nixpkgs/pkgs/servers/mjolnir/package.json +++ b/third_party/nixpkgs/pkgs/servers/mjolnir/package.json @@ -1,6 +1,6 @@ { "name": "mjolnir", - "version": "1.6.3", + "version": "1.6.5", "description": "A moderation tool for Matrix", "main": "lib/index.js", "repository": "git@github.com:matrix-org/mjolnir.git", @@ -30,7 +30,7 @@ "@types/jsdom": "^16.2.11", "@types/mocha": "^9.0.0", "@types/nedb": "^1.8.12", - "@types/node": "^16.7.10", + "@types/node": "^18.0.0", "@types/pg": "^8.6.5", "@types/request": "^2.48.8", "@types/shell-quote": "1.7.1", @@ -55,15 +55,15 @@ "humanize-duration-ts": "^2.1.1", "js-yaml": "^4.1.0", "jsdom": "^16.6.0", - "matrix-appservice-bridge": "8.0.0", + "matrix-appservice-bridge": "8.1.2", "parse-duration": "^1.0.2", "pg": "^8.8.0", "prom-client": "^14.1.0", "shell-quote": "^1.7.3", "ulidx": "^0.3.0", - "yaml": "^2.1.1" + "yaml": "^2.2.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } } diff --git a/third_party/nixpkgs/pkgs/servers/mobilizon/common.nix b/third_party/nixpkgs/pkgs/servers/mobilizon/common.nix index 39f1fd85f5..7a4707322b 100644 --- a/third_party/nixpkgs/pkgs/servers/mobilizon/common.nix +++ b/third_party/nixpkgs/pkgs/servers/mobilizon/common.nix @@ -17,6 +17,10 @@ url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; }) + (fetchpatch { + url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch"; + sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ="; + }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mobilizon/default.nix b/third_party/nixpkgs/pkgs/servers/mobilizon/default.nix index 73ae391ead..a4dca53c08 100644 --- a/third_party/nixpkgs/pkgs/servers/mobilizon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mobilizon/default.nix @@ -8,6 +8,7 @@ , cmake , nixosTests , mobilizon-frontend +, ... }: let @@ -126,6 +127,7 @@ mixRelease rec { ${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json ''; + elixirPackage = beamPackages.elixir; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/mobilizon/mix.nix b/third_party/nixpkgs/pkgs/servers/mobilizon/mix.nix index 5c2f5b3353..c6707e6249 100644 --- a/third_party/nixpkgs/pkgs/servers/mobilizon/mix.nix +++ b/third_party/nixpkgs/pkgs/servers/mobilizon/mix.nix @@ -13,9 +13,9 @@ let version = "1.7.5"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe"; version = "${version}"; - sha256 = "05n33srckncg3f50nxzx3r05n8axiwb2c4p91snr8qm2vj5a7a92"; + sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -26,9 +26,9 @@ let version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe_phoenix"; version = "${version}"; - sha256 = "139gnamfbba5hyk1fx1zf8vfr0j17fd9q0vxxp9cf39qbj91hsfk"; + sha256 = "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"; }; beamDeps = [ absinthe absinthe_plug decimal phoenix phoenix_html phoenix_pubsub ]; @@ -39,9 +39,9 @@ let version = "1.5.8"; src = fetchHex { - pkg = "${name}"; + pkg = "absinthe_plug"; version = "${version}"; - sha256 = "0nkfk5gqbg8yvlysgxfcak7y4lsy8q2jfyqyhql5hwvvciv43c5v"; + sha256 = "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"; }; beamDeps = [ absinthe plug ]; @@ -52,9 +52,9 @@ let version = "3.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "argon2_elixir"; version = "${version}"; - sha256 = "142n65kcfsci052d0f7rzqzz0gg4xq7hgj7lzjsk0i9r2y1bf4x8"; + sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; }; beamDeps = [ comeonin elixir_make ]; @@ -65,9 +65,9 @@ let version = "0.5.1"; src = fetchHex { - pkg = "${name}"; + pkg = "atomex"; version = "${version}"; - sha256 = "0gxb379zfx5qk0ljxvy225iplxfvxbgfx470h8wm1f6abwdqjj32"; + sha256 = "6248891b5fcab8503982e090eedeeadb757a6311c2ef2e2998b874f7d319ab3f"; }; beamDeps = [ xml_builder ]; @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -91,9 +91,9 @@ let version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "1qp2r1f4hvpybhgi547p33ci7bh2w6xn6jl9il68xg4370vlxwpb"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8"; + sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"; }; beamDeps = []; @@ -117,9 +117,9 @@ let version = "2.12.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "077z80ijg0nfyslgdfl72c2wcfl76c7i1gmlrm040m9fy9fxhs7f"; + sha256 = "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"; }; beamDeps = []; @@ -130,9 +130,9 @@ let version = "2.24.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cldr_utils"; version = "${version}"; - sha256 = "101p43y2x6z6rd4ga5hr372z5y34rn3mm3j6pk84kf5m642k080q"; + sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"; }; beamDeps = [ castore certifi decimal ]; @@ -143,9 +143,9 @@ let version = "0.1.6"; src = fetchHex { - pkg = "${name}"; + pkg = "codepagex"; version = "${version}"; - sha256 = "0ndxsmalk70wqig1zzgl95g6mp2fb992y1l4y3nq3qnxjw84c88m"; + sha256 = "1521461097dde281edf084062f525a4edc6a5e49f4fd1f5ec41c9c4955d5bd59"; }; beamDeps = []; @@ -156,9 +156,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "5.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "1wgsa5p4lfs9v8chky6as0w7a6j8n0545f5pasfrj08dwnlr6qvr"; + sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; }; beamDeps = []; @@ -182,9 +182,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -195,9 +195,9 @@ let version = "3.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z"; + sha256 = "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"; }; beamDeps = [ plug ]; @@ -208,9 +208,9 @@ let version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -221,9 +221,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -234,9 +234,9 @@ let version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -247,9 +247,9 @@ let version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8"; + sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; }; beamDeps = [ bunt file_system jason ]; @@ -260,9 +260,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo_code_climate"; version = "${version}"; - sha256 = "1ji1d2qidnlz80pc3ql2ghwvhf1851c4fq0xh8ly5x2nh3irylkm"; + sha256 = "75529fe38056f4e229821d604758282838b8397c82e2c12e409fda16b16821ca"; }; beamDeps = [ credo jason ]; @@ -273,9 +273,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "dataloader"; version = "${version}"; - sha256 = "1w7ygm885fidf8i5q89ya1mg800dy0zqig6djpiidqkcny0igmh9"; + sha256 = "09d61781b76ce216e395cdbc883ff00d00f46a503e215c22722dba82507dfef0"; }; beamDeps = [ ecto telemetry ]; @@ -283,12 +283,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9"; + sha256 = "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"; }; beamDeps = [ telemetry ]; @@ -299,9 +299,9 @@ let version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -312,9 +312,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "dialyxir"; version = "${version}"; - sha256 = "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"; + sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"; }; beamDeps = [ erlex ]; @@ -325,9 +325,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "digital_token"; version = "${version}"; - sha256 = "1lf4vp5bdjz4hmm6zb0knqz8qm4jn3fwma540a5i46n6wwkdcm94"; + sha256 = "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"; }; beamDeps = [ cldr_utils jason ]; @@ -338,9 +338,9 @@ let version = "0.21.0"; src = fetchHex { - pkg = "${name}"; + pkg = "doctor"; version = "${version}"; - sha256 = "1q748x232m665qik23mb1rywp9267i0gmvfy9jr4wy3rm8fq69x2"; + sha256 = "a227831daa79784eb24cdeedfa403c46a4cb7d0eab0e31232ec654314447e4e0"; }; beamDeps = [ decimal ]; @@ -351,9 +351,9 @@ let version = "1.4.33"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid"; + sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"; }; beamDeps = []; @@ -364,9 +364,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -377,9 +377,9 @@ let version = "3.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4"; + sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; }; beamDeps = [ decimal jason telemetry ]; @@ -390,9 +390,9 @@ let version = "3.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_autoslug_field"; version = "${version}"; - sha256 = "1zyr5zlsi8zwc4q8gkhw324h43a46k4k558nbi5y4qsjh0addpdn"; + sha256 = "b6ddd614805263e24b5c169532c934440d0289181cce873061fca3a8e92fd9ff"; }; beamDeps = [ ecto slugify ]; @@ -403,9 +403,9 @@ let version = "0.9.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_dev_logger"; version = "${version}"; - sha256 = "1mf2068xqzv7dns2xyzl57cgm6hhbbdggvlni08cgz749a5wk2rf"; + sha256 = "2e8bc98b4ae4fcc7108896eef7da5a109afad829f4fb2eb46d677fdc9101c2d5"; }; beamDeps = [ ecto jason ]; @@ -416,9 +416,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -429,9 +429,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_shortuuid"; version = "${version}"; - sha256 = "0rgvivrvl504jgfh2yqgcd74ar3q1qbxxwzngrd2zsbbx1qknbmr"; + sha256 = "b92e3b71e86be92f5a7ef6f3de170e7864454e630f7b01dd930414baf38efb65"; }; beamDeps = [ ecto shortuuid ]; @@ -442,9 +442,9 @@ let version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "01whmapzs08xzachra73lhb0d8f7mvysz29qbqivjz55pkg1ih38"; + sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -455,9 +455,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_feed_parser"; version = "${version}"; - sha256 = "13x2rgckh41zkgbwg63wb7lvyy5xmn7vqq3i7nvy6virggz64g1d"; + sha256 = "2d3c62fe7b396ee3b73d7160bc8fadbd78bfe9597c98c7d79b3f1038d9cba28f"; }; beamDeps = [ timex ]; @@ -468,9 +468,9 @@ let version = "0.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "0v3y9i3bif14486dliwn9arwd0pcp4nv24gjwnxm5b8gjpzrzhav"; + sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; }; beamDeps = [ castore ]; @@ -481,9 +481,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "erlex"; version = "${version}"; - sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; }; beamDeps = []; @@ -494,9 +494,9 @@ let version = "0.11.0"; src = fetchHex { - pkg = "${name}"; + pkg = "erlport"; version = "${version}"; - sha256 = "1r7f0j12gnx65p6c86w035rjlzp1sa52ghyip0lx6j1rmz63dccf"; + sha256 = "8eb136ccaf3948d329b8d1c3278ad2e17e2a7319801bc4cc2da6db278204eee4"; }; beamDeps = []; @@ -507,9 +507,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -520,9 +520,9 @@ let version = "2.37.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr"; version = "${version}"; - sha256 = "1fljryh921whv90v6m1aax2rabybark3nw11cv76lwc0a0fpnin8"; + sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -533,9 +533,9 @@ let version = "1.22.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_calendars"; version = "${version}"; - sha256 = "0s812jkj4hf5274gp568syk3xp2d9228wwkn7gwjx2rix3cqqh77"; + sha256 = "e7408cd9e8318b2ef93b76728e84484ddc3ea6d7c894fbc811c54122a7140169"; }; beamDeps = [ ex_cldr_numbers ex_doc jason ]; @@ -546,9 +546,9 @@ let version = "2.15.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_currencies"; version = "${version}"; - sha256 = "1y3g1q0g7ygcajqzqh9kb1y3kchbarkrf89nssi7fs66jrik2885"; + sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"; }; beamDeps = [ ex_cldr jason ]; @@ -559,9 +559,9 @@ let version = "2.14.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_dates_times"; version = "${version}"; - sha256 = "155z81x9z0wwd4l32rbq2pc64rp6kmdz35vsvz1fqskgah08nnpq"; + sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94"; }; beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; @@ -572,9 +572,9 @@ let version = "0.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_languages"; version = "${version}"; - sha256 = "0yj4rj4r0wdzhrwkg1xdg1x28d1pp3kk8fr45n3v9d5pfbpizyr2"; + sha256 = "22fb1fef72b7b4b4872d243b34e7b83734247a78ad87377986bf719089cc447a"; }; beamDeps = [ ex_cldr jason ]; @@ -585,9 +585,9 @@ let version = "2.32.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "0jjh9a5w5ybvzpxpvia3kgig50h259yjgfbbhnsmcnv0p0k3ri08"; + sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -598,9 +598,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_cldr_plugs"; version = "${version}"; - sha256 = "1zwbhpj9cxr2bl16cn5539hslj8gqi0q0xmfky27qjm17ra9i6k9"; + sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff"; }; beamDeps = [ ex_cldr gettext jason plug ]; @@ -611,9 +611,9 @@ let version = "0.30.6"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "17qhflrr5mrbavcw7pg6xabib270k2a3sagr4z3q5r7lmkfz4j5x"; + sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -624,9 +624,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_ical"; version = "${version}"; - sha256 = "1yxyflmkvmglks7whmbz944kyq6qljjpki666dk9w9g058xlfxnv"; + sha256 = "db76473b2ae0259e6633c6c479a5a4d8603f09497f55c88f9ef4d53d2b75befb"; }; beamDeps = [ timex ]; @@ -637,9 +637,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -650,9 +650,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_optimizer"; version = "${version}"; - sha256 = "11i2npj15w3a91lxdpf9ll7lpdv99zf7y9bg5yz6d2ympicw1xg6"; + sha256 = "e6f5c059bcd58b66be2f6f257fdc4f69b74b0fa5c9ddd669486af012e4b52286"; }; beamDeps = [ file_info ]; @@ -663,9 +663,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_unit_notifier"; version = "${version}"; - sha256 = "0rf3b2cb4fqsg0hgas9axr8p5p471ainzc788ky65ng8c9hgvzsm"; + sha256 = "55fffd6062e8d962fc44e8b06fa30a87dc7251ee2a69f520781a3bb29858c365"; }; beamDeps = []; @@ -676,9 +676,9 @@ let version = "0.17.1"; src = fetchHex { - pkg = "${name}"; + pkg = "excoveralls"; version = "${version}"; - sha256 = "1q2sk1kha63hyp03wf3m9r30aqikh241jjns2h7wd11yjpd6zg4m"; + sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0"; }; beamDeps = [ castore jason ]; @@ -689,9 +689,9 @@ let version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "exgravatar"; version = "${version}"; - sha256 = "1q80jcrnagivsjr9mz0z9h4bwlf0xyyx6ijl7szd74c9ppwqz8dc"; + sha256 = "aca18ff9bd8991d3be3e5446d3bdefc051be084c1ffc9ab2d43b3e65339300e1"; }; beamDeps = []; @@ -702,9 +702,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "expo"; version = "${version}"; - sha256 = "0idzpg3bc9ady0lqrkxs6y0x9daffjsapppfm9cf0vf545h56b62"; + sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45"; }; beamDeps = []; @@ -715,9 +715,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "export"; version = "${version}"; - sha256 = "07q2l7f9yr3bd3xqc5q1qa9qrhnjzc9xnjrg6lj1hgq5yi7l99rx"; + sha256 = "3da7444ff4053f1824352f4bdb13fbd2c28c93c2011786fb686b649fdca1021f"; }; beamDeps = [ erlport ]; @@ -728,9 +728,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06"; + sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -741,9 +741,9 @@ let version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "1qjnbs63q0d95dqhh2r9sz3zpg2y4hjy23kxsqanwf6h21njibg8"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -754,9 +754,9 @@ let version = "0.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "file_info"; version = "${version}"; - sha256 = "19c14xv0xzbl3m6y5p7dlxn8sfqi9bff8pv722837ff8q80svrsh"; + sha256 = "50e7ad01c2c8b9339010675fe4dc4a113b8d6ca7eddce24d1d74fd0e762781a5"; }; beamDeps = [ mimetype_parser ]; @@ -767,9 +767,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -780,9 +780,9 @@ let version = "0.34.3"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm"; + sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; }; beamDeps = []; @@ -793,9 +793,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y"; + sha256 = "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"; }; beamDeps = [ ranch ]; @@ -803,12 +803,12 @@ let geo = buildMix rec { name = "geo"; - version = "3.5.1"; + version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geo"; version = "${version}"; - sha256 = "175mqwzdn4jkwxkklc3k97pbnc4mxjfsw49cld92nh0lyb2zsp66"; + sha256 = "1dbdebf617183b54bc3c8ad7a36531a9a76ada8ca93f75f573b0ae94006168da"; }; beamDeps = [ jason ]; @@ -816,15 +816,15 @@ let geo_postgis = buildMix rec { name = "geo_postgis"; - version = "3.4.3"; + version = "3.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geo_postgis"; version = "${version}"; - sha256 = "1p7pdwrfbg244n50lhv27xbkmvgfi47y71nwbggzj5v469j36zc2"; + sha256 = "0bebc5b00f8b11835066bd6213fbeeec03704b4a1c206920b81c1ec2201d185f"; }; - beamDeps = [ geo jason postgrex ]; + beamDeps = [ ecto geo jason postgrex ]; }; geohax = buildMix rec { @@ -832,9 +832,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geohax"; version = "${version}"; - sha256 = "0912z8fn86r7sxgbvhmzfqvbxc96v5awklhmqrkwnfi10pwz4gl9"; + sha256 = "893ef2f905213acb67c615d2c955d926b1be3676bfc2bd5ed7271b641dfa2224"; }; beamDeps = []; @@ -845,9 +845,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geolix"; version = "${version}"; - sha256 = "1pq1qcjaqsnnvsbgzzbfdj290n9mkp808cj45kppvfyhircbyhl7"; + sha256 = "8742bf588ed0bb7def2c443204d09d355990846c6efdff96ded66aac24c301df"; }; beamDeps = []; @@ -858,9 +858,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "geolix_adapter_mmdb2"; version = "${version}"; - sha256 = "16r6q2qmgdpj5pvb36s3rgfd1qm6rnzp8szqzp7i18z8x8prdzq6"; + sha256 = "06ff962feae8a310cffdf86b74bfcda6e2d0dccb439bb1f62df2b657b1c0269b"; }; beamDeps = [ geolix mmdb2_decoder ]; @@ -871,9 +871,9 @@ let version = "0.20.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gettext"; version = "${version}"; - sha256 = "0ggb458h60ch3inndqp9xhbailhb0jkq3xnp85sa94sy8dvv20qw"; + sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"; }; beamDeps = []; @@ -884,9 +884,9 @@ let version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian"; version = "${version}"; - sha256 = "1hvl8ajr49f8lv2b79dbi33bn016kl2dchmd2vczl28vrbwl3qmv"; + sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3"; }; beamDeps = [ jose plug ]; @@ -897,9 +897,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian_db"; version = "${version}"; - sha256 = "0w0d9bwsiz7hw9i7b3v8gpjsvblzhbkcnnpxlzrrbhwjmi1xbrzq"; + sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70"; }; beamDeps = [ ecto ecto_sql guardian postgrex ]; @@ -910,9 +910,9 @@ let version = "2.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "guardian_phoenix"; version = "${version}"; - sha256 = "1350z7sk4m8n2wxllnjm07gzpm8ybm3811i23wijn68mcwj3kx11"; + sha256 = "21f439246715192b231f228680465d1ed5fbdf01555a4a3b17165532f5f9a08c"; }; beamDeps = [ guardian phoenix ]; @@ -923,9 +923,9 @@ let version = "1.18.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "1zb59ghnlmlqcxkcr9caj7sbdv16ah7a394hf0jxnmvqz74xb55g"; + sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -936,9 +936,9 @@ let version = "6.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "hammer"; version = "${version}"; - sha256 = "0mxsd2psl3qddgflq17r5hc432hd15ccvayyj8ihfv9aard42zml"; + sha256 = "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"; }; beamDeps = [ poolboy ]; @@ -949,9 +949,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "haversine"; version = "${version}"; - sha256 = "0q3hc16zd5pvz9xvhk5692v1fkk3fg42cw536yaaa65wjpl4ip2l"; + sha256 = "54dc48e895bc18a59437a37026c873634e17b648a64cb87bfafb96f64d607060"; }; beamDeps = []; @@ -962,9 +962,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -975,9 +975,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "http_signatures"; version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; }; beamDeps = []; @@ -988,9 +988,9 @@ let version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "08crb48yz7r7w00pzw9gfk862g99z2ma2x6awab0rqvjd7951crb"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -1001,9 +1001,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -1014,9 +1014,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -1027,9 +1027,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ip_reserved"; version = "${version}"; - sha256 = "1zm4820yvdashvz14p9jhv2bwc1hshvyym1zx84yzjhiwavd5z2m"; + sha256 = "55fcd2b6e211caef09ea3f54ef37d43030bec486325d12fe865ab5ed8140a4fe"; }; beamDeps = [ inet_cidr ]; @@ -1040,9 +1040,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"; + sha256 = "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"; }; beamDeps = [ decimal ]; @@ -1053,9 +1053,9 @@ let version = "1.11.6"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2"; + sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; }; beamDeps = []; @@ -1066,9 +1066,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "1qb5y4i88d7nxar69an171m9fqpb6rpy4w42q2rimq11j1084xwv"; + sha256 = "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"; }; beamDeps = []; @@ -1079,9 +1079,9 @@ let version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "junit_formatter"; version = "${version}"; - sha256 = "0ax79m9fn7asbfjk523vvawnvbn2nbhgvnm6j6xdh5ac9fzca7vn"; + sha256 = "761fc5be4b4c15d8ba91a6dafde0b2c2ae6db9da7b8832a55b5a1deb524da72b"; }; beamDeps = []; @@ -1092,9 +1092,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "linkify"; version = "${version}"; - sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; + sha256 = "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"; }; beamDeps = []; @@ -1105,9 +1105,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"; + sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"; }; beamDeps = [ nimble_parsec ]; @@ -1118,9 +1118,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1"; + sha256 = "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"; }; beamDeps = [ makeup nimble_parsec ]; @@ -1131,9 +1131,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk"; + sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; }; beamDeps = [ makeup ]; @@ -1144,9 +1144,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -1157,9 +1157,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -1170,9 +1170,9 @@ let version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "0p50h0ki8ay5sraiqxiajgwy1829bvyagj65bj9wjny4cnin83fs"; + sha256 = "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"; }; beamDeps = []; @@ -1183,9 +1183,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -1196,9 +1196,9 @@ let version = "0.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mimetype_parser"; version = "${version}"; - sha256 = "0lm8yzcmg17nhvr4p4dbmamb280a9dzqx4rwv66ffz40cz2q13vx"; + sha256 = "7d8f80c567807ce78cd93c938e7f4b0a20b1aaaaab914bf286f68457d9f7a852"; }; beamDeps = []; @@ -1209,9 +1209,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mix_test_watch"; version = "${version}"; - sha256 = "1bmswsjcngjj4rsp67wzhi4p69n32lp8j8qp09kk8lzf9nsn48pq"; + sha256 = "f82262b54dee533467021723892e15c3267349849f1f737526523ecba4e6baae"; }; beamDeps = [ file_system ]; @@ -1222,9 +1222,9 @@ let version = "3.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mmdb2_decoder"; version = "${version}"; - sha256 = "17amvw553l6drkaszc5xpf8rcz4fwzpm8kwl5mw29j7si3rz0sii"; + sha256 = "316af0f388fac824782d944f54efe78e7c9691bbbdb0afd5cccdd0510adf559d"; }; beamDeps = []; @@ -1235,9 +1235,9 @@ let version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -1248,9 +1248,9 @@ let version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -1261,9 +1261,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1wpyh6wp76lyx0q2cys23rpmci4gj1pqwnqvfk467xxanchlk1pr"; + sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; }; beamDeps = []; @@ -1274,9 +1274,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_csv"; version = "${version}"; - sha256 = "0amij6y3pgkpazhjr3madrn9c9lv6malq11ln1w82562zhbq2qnh"; + sha256 = "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"; }; beamDeps = []; @@ -1287,9 +1287,9 @@ let version = "1.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"; + sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"; }; beamDeps = []; @@ -1300,9 +1300,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "1c715055095d3f2705c4e236c18b618420a35490da94149ff8b580a2144f653f"; }; beamDeps = []; @@ -1313,9 +1313,9 @@ let version = "2.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "oauth2"; version = "${version}"; - sha256 = "0h9bps7gq7bac5gc3q0cgpsj46qnchpqbv5hzsnd2z9hnf2pzh4a"; + sha256 = "8ac07f85b3307dd1acfeb0ec852f64161b22f57d0ce0c15e616a1dfc8ebe2b41"; }; beamDeps = [ tesla ]; @@ -1326,9 +1326,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "oauther"; version = "${version}"; - sha256 = "0kn0msy3z0rx7l4pp8zc5r7yhvmwa3sscr08gfi2rivmm278isvq"; + sha256 = "78eb888ea875c72ca27b0864a6f550bc6ee84f2eeca37b093d3d833fbcaec04e"; }; beamDeps = []; @@ -1339,9 +1339,9 @@ let version = "2.15.4"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "1707222miq6di3605cqyfcgdy6i0wlb3326z928kxcgzvwgn3kjz"; + sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1352,9 +1352,9 @@ let version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "paasaa"; version = "${version}"; - sha256 = "0blzqack3i8w1f0hjqjgsybqjazcyf54dv3anbnk225c3g1dybbk"; + sha256 = "732ddfc21bac0831edb26aec468af3ec2b8997d74f6209810b1cc53199c29f2e"; }; beamDeps = []; @@ -1365,9 +1365,9 @@ let version = "3.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "16p4c2xjrvz16kzpr9pmcvi6nxq6rwckqi9fp0ksibaxwxn402k2"; + sha256 = "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"; }; beamDeps = []; @@ -1378,9 +1378,9 @@ let version = "1.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "119h8lcvarlm7xrlrb301wgrd3plwwmbvl3f3dckfpjy75ff2rl9"; + sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1391,9 +1391,9 @@ let version = "4.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h"; + sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1404,9 +1404,9 @@ let version = "3.3.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "07d1x5nyk9qahqhyc7785774cyfwm07nnjr8kpxj073wcs7azba4"; + sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"; }; beamDeps = [ plug ]; @@ -1417,9 +1417,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_reload"; version = "${version}"; - sha256 = "1aqm6sxy4ijd5gi8lmjmcaxal1smg2smibjlzrkq9w6xwwsbizwv"; + sha256 = "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"; }; beamDeps = [ file_system phoenix ]; @@ -1430,9 +1430,9 @@ let version = "0.19.5"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "1lx9gi70a3cabjnjhslqbs8ysnpjz5yj324vjkxxg6zv7kfs1smj"; + sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1443,9 +1443,9 @@ let version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1456,9 +1456,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1469,9 +1469,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n"; + sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; }; beamDeps = [ phoenix_html ]; @@ -1482,9 +1482,9 @@ let version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "0vykabqxyk08gkfm45zy5dnlnzygwx6g9z4z2h7fxix51qiyfad9"; + sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1495,9 +1495,9 @@ let version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "04wdyv6nma74bj1m49vkm2bc5mjf8zclfg957fng8g71hw0wabw4"; + sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1508,9 +1508,9 @@ let version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "04v6xc4v741dr2y38j66fmcc4xc037dnaxzkj2vih6j53yif2dny"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1521,9 +1521,9 @@ let version = "1.2.5"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "0hnqgzc3zas7j7wycgnkkdhaji5farkqccy2n4p1gqj5ccfrlm16"; + sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; }; beamDeps = []; @@ -1534,9 +1534,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1547,9 +1547,9 @@ let version = "0.17.3"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "1389zgxvv90nzz0nwb7l5l4gyg2hldmyg2s4h5xcmzd46mlz8v4l"; + sha256 = "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"; }; beamDeps = [ db_connection decimal jason ]; @@ -1560,9 +1560,9 @@ let version = "3.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "progress_bar"; version = "${version}"; - sha256 = "1dzj622nf3drhswlvqia3b19j4wfclindi1d3b4yqjmjbarc50b9"; + sha256 = "6981c2b25ab24aecc91a2dc46623658e1399c21a2ae24db986b90d678530f2b7"; }; beamDeps = [ decimal ]; @@ -1573,9 +1573,9 @@ let version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1586,9 +1586,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "remote_ip"; version = "${version}"; - sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; + sha256 = "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"; }; beamDeps = [ combine plug ]; @@ -1599,9 +1599,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "replug"; version = "${version}"; - sha256 = "0q7sikahnvmr8jw9ziklh2am73h9cilhq1j697z59s24x5bpl7zp"; + sha256 = "f71f7a57e944e854fe4946060c6964098e53958074c69fb844b96e0bd58cfa60"; }; beamDeps = [ plug ]; @@ -1612,9 +1612,9 @@ let version = "8.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sentry"; version = "${version}"; - sha256 = "1d0sd34ckmnkx60zfqvwb7gf37cbjk166nay1x8qbs31xx0pdz7r"; + sha256 = "f9fc7641ef61e885510f5e5963c2948b9de1de597c63f781e9d3d6c9c8681ab4"; }; beamDeps = [ hackney jason plug plug_cowboy ]; @@ -1625,9 +1625,9 @@ let version = "3.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "shortuuid"; version = "${version}"; - sha256 = "0f8dkll158j48jlynjkdrjc6vw72sv04lgxq5ii93fsca47zin6z"; + sha256 = "dfd8f80f514cbb91622cb83f4ac0d6e2f06d98cc6d4aeba94444a212289d0d39"; }; beamDeps = []; @@ -1638,9 +1638,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sitemapper"; version = "${version}"; - sha256 = "0gr23zpwih1z2hycpbxgjnlvpg721f5z8savmh87zzp9wn2adxv0"; + sha256 = "60f7a684e5e9fe7f10ac5b69f48b0be2bcbba995afafcb3c143fc0c8ef1f223f"; }; beamDeps = [ xml_builder ]; @@ -1651,9 +1651,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "19argym7xifhsbrp21glkgs0dz1xpd00yfhsbhqdd0dpqm4d1rcz"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1664,9 +1664,9 @@ let version = "0.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "slugger"; version = "${version}"; - sha256 = "1fmgnl4ydq4ivbfk1a934vcn0d0wb24lhnvcmqg5sq0jwz8dxl10"; + sha256 = "20d0ded0e712605d1eae6c5b4889581c3460d92623a930ddda91e0e609b5afba"; }; beamDeps = []; @@ -1677,9 +1677,9 @@ let version = "1.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "slugify"; version = "${version}"; - sha256 = "0xmyv324a5prnzj20y1j1nkn18rki7cq3ri567d15csnn2z0n2fb"; + sha256 = "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"; }; beamDeps = []; @@ -1690,9 +1690,9 @@ let version = "0.13.0"; src = fetchHex { - pkg = "${name}"; + pkg = "sobelow"; version = "${version}"; - sha256 = "03aawfxpxb567dxhka8737fxjy50hmggj56s55smvhszp0k90vnd"; + sha256 = "cd6e9026b85fc35d7529da14f95e85a078d9dd1907a9097b3ba6ac7ebbe34a0d"; }; beamDeps = [ jason ]; @@ -1703,9 +1703,9 @@ let version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; }; beamDeps = []; @@ -1716,9 +1716,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "struct_access"; version = "${version}"; - sha256 = "0sjq5v0zdqx7iqs0hqa7lfqzxf4jzi8rb409aywq2q12q3f13i74"; + sha256 = "e4c411dcc0226081b95709909551fc92b8feb1a3476108348ea7e3f6c12e586a"; }; beamDeps = []; @@ -1729,9 +1729,9 @@ let version = "0.7.4"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "0rx1xgdy4y9j8isnd2gnf2hz3vc7zrafy7cm6j194326pyyv1i77"; + sha256 = "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"; }; beamDeps = []; @@ -1742,9 +1742,9 @@ let version = "1.11.5"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "0h00h0ml8s6ca72ihq1bn4dj4aqldpapc7p1pg9mcbwdsvf5gvi1"; + sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040"; }; beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; @@ -1755,9 +1755,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs"; + sha256 = "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"; }; beamDeps = []; @@ -1768,9 +1768,9 @@ let version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f"; + sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"; }; beamDeps = [ castore hackney jason mime telemetry ]; @@ -1781,9 +1781,9 @@ let version = "3.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1anijimbrb3ngdy6fdspr8c9hz6dip7nakx0gayzkfmsxzvj944b"; + sha256 = "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"; }; beamDeps = [ combine gettext tzdata ]; @@ -1794,9 +1794,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tz_world"; version = "${version}"; - sha256 = "140kip660zbfxpckzi2y4mxg1pysvwcr2cc68viqrd4r12m6bdbq"; + sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390"; }; beamDeps = [ castore certifi geo jason ]; @@ -1807,9 +1807,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "11wpm1mjla8hbkb5mssprg3gsq1v24s8m8nyk3hx5z7aaa1yr756"; + sha256 = "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"; }; beamDeps = [ hackney ]; @@ -1820,9 +1820,9 @@ let version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "1qf97azn8064ymawfm58p2bqpmrigipr4fs5xp3jb8chshqizz9y"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1833,9 +1833,9 @@ let version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_cas"; version = "${version}"; - sha256 = "08g3kdcx2zxv963nqvwspsh1pqiiclx4hrwsm82jyz11kqmsws2h"; + sha256 = "5068ae2b9e217c2f05aa9a67483a6531e21ba0be9a6f6c8749bb7fd1599be321"; }; beamDeps = [ httpoison sweet_xml ueberauth ]; @@ -1846,9 +1846,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_discord"; version = "${version}"; - sha256 = "1d4nk3hshwj1ybr5ywz95m6qrrp0f2jcnyjbvbmdqkdv3bwqxyfn"; + sha256 = "d6f98ef91abb4ddceada4b7acba470e0e68c4d2de9735ff2f24172a8e19896b4"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1859,9 +1859,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_facebook"; version = "${version}"; - sha256 = "1a1pjlxa86v5kbqsxb7lcggbs45pq6380zpppy5dll0wdgbfb35z"; + sha256 = "bf8ce5d66b1c50da8abff77e8086c1b710bdde63f4acaef19a651ba43a9537a8"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1872,9 +1872,9 @@ let version = "0.8.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_github"; version = "${version}"; - sha256 = "1iiw953l4mk087r2jrpcnyqdmgv2n8cq5947f8fsbkrjkj3v42mf"; + sha256 = "ae0ab2879c32cfa51d7287a48219b262bfdab0b7ec6629f24160564247493cc6"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1885,9 +1885,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_gitlab_strategy"; version = "${version}"; - sha256 = "07h94s9fy46mqkn4g3wd62lkpgpjfcdk1cd60myc0qxh9dwjwvp8"; + sha256 = "e86e2e794bb063c07c05a6b1301b73f2be3ba9308d8f47ecc4d510ef9226091e"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1898,9 +1898,9 @@ let version = "0.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_google"; version = "${version}"; - sha256 = "0f005491i5jbhx76p7xshcpjcgjf0afqd4c6fgh3djdcaabclqi4"; + sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1911,9 +1911,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_keycloak_strategy"; version = "${version}"; - sha256 = "06r10w0azlpypjgggar1lf7h2yazn2dpyicy97zxkjyxgf9jfc60"; + sha256 = "c03027937bddcbd9ff499e457f9bb05f79018fa321abf79ebcfed2af0007211b"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1924,9 +1924,9 @@ let version = "0.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth_twitter"; version = "${version}"; - sha256 = "0rb0n41s60b89385ggzvags3mxgbp4iv7gxympqpdyd3w6iqxjl3"; + sha256 = "83ca8ea3e1a3f976f1adbebfb323b9ebf53af453fbbf57d0486801a303b16065"; }; beamDeps = [ httpoison oauther ueberauth ]; @@ -1937,9 +1937,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1950,9 +1950,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unplug"; version = "${version}"; - sha256 = "0fkwkg6qm2lsvil8xdba9mmcgi5iw41w42dqhm72shdab1bshwfi"; + sha256 = "d171a85758aa412d4e85b809c203e1b1c4c76a4d6ab58e68dc9a8a8acd9b7c3a"; }; beamDeps = [ plug ]; @@ -1963,9 +1963,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "0xgn5mfbi4c7yv33k11mhyxz7ijjy5wlmjs4rnlh3ay3hcb271dl"; + sha256 = "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"; }; beamDeps = []; @@ -1976,9 +1976,9 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "vite_phx"; version = "${version}"; - sha256 = "0dn9bygcsjyxllw2cxm9iggmqjyx9i67dix2y07ljcd1jih75c88"; + sha256 = "08b1726094a131490ff0a2c7764c4cdd4b5cdf8ba9762638a5dd4bcd9e5fc936"; }; beamDeps = [ jason phoenix ]; @@ -1989,9 +1989,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websock"; version = "${version}"; - sha256 = "0lxlp1h18595nqczfg15iy34kw5xbbab3yk6ml9cf8mcgwyla1b1"; + sha256 = "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"; }; beamDeps = []; @@ -2002,9 +2002,9 @@ let version = "0.5.4"; src = fetchHex { - pkg = "${name}"; + pkg = "websock_adapter"; version = "${version}"; - sha256 = "1azlnjpndkhz4h78fcz9p4ssf1shpfh2rqnszhiy5jsjkk3kihnj"; + sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"; }; beamDeps = [ plug plug_cowboy websock ]; @@ -2015,9 +2015,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "xml_builder"; version = "${version}"; - sha256 = "1jb29bv6hgz7z2bdw119am6z17nkg1033936h4smsmhpp4pxarlx"; + sha256 = "9d66d52fb917565d358166a4314078d39ef04d552904de96f8e73f68f64a62c9"; }; beamDeps = []; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/client.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alerta/client.nix index b22e995ed5..d8de093c27 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/client.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alerta/client.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta"; - version = "8.5.1"; + version = "8.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O13Ic2iHjNF/llp6vdaAiiWExcTBPsz46GAWY3oGDY8="; + sha256 = "sha256-5KLR+F5GtNkFXJMctJ5F4OvkQRhohd6SWB2ZFVtc/0s="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix index 06383d4360..e695994981 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "alerta-server"; - version = "8.7.0"; + version = "9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EM3owmj+6gFjU0ARaQP3FLYXliGaGCRSaLgkiPwhGdU="; + sha256 = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index 79780d39d8..409ae5f375 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "unstable-2023-07-28"; + version = "unstable-2023-10-22"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "fdd3d9182bea6f7f11e4f934631c4abef3aa0584"; - hash = "sha256-U6oZ80EYx56FJ7VsDKzCXH4TvFEH+oPmgK/Nd8T/Zp4="; + rev = "bf2a7fee4170e418e7ac774af7679257fe26dc69"; + hash = "sha256-wf5TtUmBC8ikpaUp3KLs8rBMunFPevNYYoactudHMsU="; }; modRoot = "./cmd"; - vendorHash = "sha256-hvgObwmNKk6yTJSyEHuHZ5abuXGPwPC42xUSAAF8UA0="; + vendorHash = "sha256-LEtiJC3L6Q7MZH2gvpR9y2Zn9vig+9mWlRyVuKY3rsA="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh b/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh deleted file mode 100755 index c1834db9d3..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cockpit/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -set -eu -o pipefail - -version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)" - -update-source-version cockpit "$version" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index cc2ccc3b01..a970b99806 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.36.2"; + version = "0.37.4"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-c8eay3lwAVqodw6MPU02tSQ+8D0+qywCI+U6bfJVk5A="; + hash = "sha256-wR5Xexebe6LB15hKQwFtVjyTZPFmvuyozji9BmxuZ/g="; }; - vendorHash = "sha256-kz/yogvKqUGP+TQjrzophA4qQ+Qf32cV/CuyNuM9fzM="; + vendorHash = "sha256-emtSRn/xT9RSEdGrkfaa+IuP5yF+tVLP1j+bzOoNHXg="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 5029fc6011..e988bc7f0b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.7.2"; + version = "3.8.4"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-I5UHNt4vOsXqgeQ96CxJwxuD/MiGK1NEAFJItN1CkwA="; + hash = "sha256-YfqIWPciFyPIpQypSDNEK2yXV1Ah9TiLiEzEFA/KcMw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-YT2tHvLtn4Z2CxH9utmsT8r/UM4/OdPFXByp9pBHDqU="; + hash = "sha256-HgUHxfFchqarVMmxbEg1gRN9vSkEx48aSy1yreux9fs="; }; packageJSON = ./package.json; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index 6b55fb7440..8e32a849b6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "http://github.com/grafana/grafana-image-renderer.git" + "url": "https://github.com/grafana/grafana-image-renderer.git" }, "scripts": { "eslint": "eslint . --ext .ts", @@ -16,13 +16,14 @@ "watch": "tsc-watch --onSuccess \"node build/app.js server --config=dev.json\"", "watch:debug": "tsc-watch --onSuccess \"cross-env DEBUG=puppeteer-cluster:* node build/app.js server --config=dev.json\"", "build": "tsc", - "start": "node build/app.js --config=dev.json", + "start": "node build/app.js server --config=dev.json", "create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp" }, "dependencies": { "@grpc/grpc-js": "^1.7.0", "@grpc/proto-loader": "^0.7.2", "@hapi/boom": "^10.0.0", + "@puppeteer/browsers": "^1.6.0", "chokidar": "^3.5.2", "dompurify": "^2.4.0", "express": "^4.16.3", @@ -37,13 +38,13 @@ "on-finished": "^2.3.0", "poolpeteer": "^0.23.0", "prom-client": "^14.1.0", - "puppeteer": "^17.1.3", + "puppeteer": "^21.0.3", "puppeteer-cluster": "^0.23.0", "unique-filename": "^2.0.1", "winston": "^3.8.2" }, "devDependencies": { - "@grafana/eslint-config": "5.0.0", + "@grafana/eslint-config": "^6.0.0", "@types/dompurify": "2.3.4", "@types/express": "^4.17.14", "@types/jsdom": "20.0.0", @@ -55,7 +56,7 @@ "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", - "eslint-plugin-jsdoc": "39.3.6", + "eslint-plugin-jsdoc": "^46.5.0", "eslint-plugin-prettier": "4.2.1", "eslint-plugin-react": "7.31.8", "eslint-plugin-react-hooks": "4.6.0", @@ -68,7 +69,7 @@ "typescript": "4.8.3" }, "resolutions": { - "jpeg-js": "^0.4.4" + "xml2js": "^0.6.2" }, "lint-staged": { "*.ts": [ @@ -80,6 +81,6 @@ }, "bin": "build/app.js", "engines": { - "node": ">= 16" + "node": ">= 18" } } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 94277e9771..c4c9c75903 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.1.1"; + version = "10.2.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-XktCIGuCyzU9RqmkFtonobwLZcSrfELZfeVcLtkM/O4="; + hash = "sha256-PNKvu7DfVHzBaRGM/Zej0oI5pbi6gPta+ZzVEXXmTsI="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-mjFoAHzFzdJsVtYSHEwWP5tgEkNch9rPPT+nkU+XaPY="; + hash = "sha256-KE026VWxlJYzRqTqry4h8vm1NIXB7sJUucz+W/s1eoE="; }; - vendorHash = "sha256-7T4ui3JhtG9CPLc8Xx3F79UUFKiTL9N1aVrAxXZhu54="; + vendorHash = "sha256-Mybo7ZVP7fwmBwloC3jHJnqPmhbj1DQSwz8T2onkL3Y="; nativeBuildInputs = [ wire ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 4d4f0516e3..355153937b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin rec { pname = "grafana-clickhouse-datasource"; - version = "3.1.0"; + version = "3.3.0"; zipHash = { - x86_64-linux = "sha256-x/Uruhk7mhPbsfAcST6tLnxJDd4vlqIkOUI4nAOZN50="; - aarch64-linux = "sha256-nNAIKoXYyhT1fwSB/a+uD1XUe5RxE9MYrbtHHx6T1fI="; - x86_64-darwin = "sha256-u9KRR7k/ktMu1KO5tpN/A+x48yDyXXPEnSNEx0hkT8Y="; - aarch64-darwin = "sha256-ME/LkVXoN1Sp4L3e9qFXgBfa7mCLRyKfEGHiBbaN8iY="; + x86_64-linux = "sha256-FkOX/2vPmLtxe/oOISldlVhayy7AwfFxLeiwJ5TNgYY="; + aarch64-linux = "sha256-4rCj+NaKPZbuVohlKmSf1M6n5ng9HZMrwzBCgLPdiok="; + x86_64-darwin = "sha256-bpey6EwwAqXgxjvjJ6ou4rinidHCpUr+Z89YpAZK7z8="; + aarch64-darwin = "sha256-u/U2lu4szf9JFt/zfhGmWKH2OUqpJDNaSI69EDdi1+w="; }; meta = with lib; { description = "Connects Grafana to ClickHouse"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 76493726c3..61704eaaef 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-clock-panel"; - version = "2.1.2"; - zipHash = "sha256-LRlyK0mv5gFNknjc9mDr84NDTIXDzlKV9spQVhZSv+I="; + version = "2.1.3"; + zipHash = "sha256-ZedeV/SQsBu55jAxFyyXQefir4hEl1/TQDmaTJN9bag="; meta = with lib; { description = "Clock panel for Grafana"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 0a886441ea..ff06ec2137 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "2.0.4"; - zipHash = "sha256-wkf/LK+kcjTbMJzlAg6zRWgEO5LjdDR/oy7/SrNuCXM="; + version = "2.1.4"; + zipHash = "sha256-15mi5NzbbWXJ/69VEwUS058atQ+z2g4C3T9/b+/Exwk="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix index 8d00551498..630e583366 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-worldmap-panel"; - version = "1.0.3"; - zipHash = "sha256-xpcQTymxA4d8jRnHm4cHAFOzPT1BseOaX0Qeq5vDvac="; + version = "1.0.6"; + zipHash = "sha256-/lgsdBEL9HdJX1X1Qy0THBlYdUUI8SRtgF1Wig1Ktpk="; meta = with lib; { description = "World Map panel for Grafana"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix index c5b9823d01..4d21fe4fff 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "redis-datasource"; - version = "2.1.1"; - zipHash = "sha256-Qhdh2UYOq/El08jTheKRa3f971QKeVmMWiA6rnXNUi4="; + version = "2.2.0"; + zipHash = "sha256-a4at8o185XSOyNxZZKfb0/j1CVoKQ9JZx0ofoPUBqKs="; meta = with lib; { description = "Redis Data Source for Grafana"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix index 2435d570cb..4adaefa053 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,23 +1,93 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, libiconv +, buildGoModule +, pkg-config +}: -buildGoPackage rec { +let + libflux_version = "0.171.0"; + flux = rustPlatform.buildRustPackage rec { + pname = "libflux"; + version = "v${libflux_version}"; + src = fetchFromGitHub { + owner = "influxdata"; + repo = "flux"; + rev = "v${libflux_version}"; + hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM="; + }; + patches = [ + # https://github.com/influxdata/flux/pull/5273 + # fix compile error with Rust 1.64 + (fetchpatch { + url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + stripLen = 2; + extraPrefix = ""; + hash = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + }) + ]; + sourceRoot = "${src.name}/libflux"; + cargoSha256 = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko="; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + pkgcfg = '' + Name: flux + Version: ${libflux_version} + Description: Library for the InfluxData Flux engine + Cflags: -I/out/include + Libs: -L/out/lib -lflux -lpthread + ''; + passAsFile = [ "pkgcfg" ]; + postInstall = '' + mkdir -p $out/include $out/pkgconfig + cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include + substitute $pkgcfgPath $out/pkgconfig/flux.pc \ + --replace /out $out + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib + ''; + }; +in +buildGoModule rec { pname = "kapacitor"; - version = "1.5.7"; - - goPackagePath = "github.com/influxdata/kapacitor"; + version = "1.7.0"; src = fetchFromGitHub { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "0lzx25d4y5d8rsddgnypfskcxa5qlwc294sdzmn8dlq995yphpac"; + hash = "sha256-vDluZZrct1x+OMVU8MNO56YBZq7JNlpW68alOrAGYSM="; }; + vendorHash = "sha256-OX4QAthg15lwMyhOPyLTS++CMvGI5Um+FSd025PhW3E="; + + nativeBuildInputs = [ pkg-config ]; + + PKG_CONFIG_PATH = "${flux}/pkgconfig"; + + # Check that libflux is at the right version + preBuild = '' + flux_ver=$(grep github.com/influxdata/flux go.mod | awk '{print $2}') + if [ "$flux_ver" != "v${libflux_version}" ]; then + echo "go.mod wants libflux $flux_ver, but nix derivation provides ${libflux_version}" + exit 1 + fi + ''; + + # Remove failing server tests + preCheck = '' + rm server/server_test.go + ''; + meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; - license = licenses.mit; homepage = "https://influxdata.com/time-series-platform/kapacitor/"; - maintainers = with maintainers; [ offline ]; - platforms = with platforms; linux; + downloadPage = "https://github.com/influxdata/kapacitor/releases"; + license = licenses.mit; + changelog = "https://github.com/influxdata/kapacitor/blob/master/CHANGELOG.md"; + maintainers = with maintainers; [ offline totoroot ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/librenms/broken-binary-paths.diff b/third_party/nixpkgs/pkgs/servers/monitoring/librenms/broken-binary-paths.diff new file mode 100644 index 0000000000..158ef779b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/librenms/broken-binary-paths.diff @@ -0,0 +1,18 @@ +diff --git a/LibreNMS/Config.php b/LibreNMS/Config.php +index 5ed6b71..de7718a 100644 +--- a/LibreNMS/Config.php ++++ b/LibreNMS/Config.php +@@ -460,13 +460,6 @@ class Config + self::persist('device_display_default', $display_value); + } + +- // make sure we have full path to binaries in case PATH isn't set +- foreach (['fping', 'fping6', 'snmpgetnext', 'rrdtool', 'traceroute'] as $bin) { +- if (! is_executable(self::get($bin))) { +- self::persist($bin, self::locateBinary($bin)); +- } +- } +- + if (! self::has('rrdtool_version')) { + self::persist('rrdtool_version', Rrd::version()); + } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix new file mode 100644 index 0000000000..0fab1b3348 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix @@ -0,0 +1,115 @@ +{ lib +, fetchFromGitHub +, unixtools +, php82 +, python3 +, makeWrapper +, nixosTests +# run-time dependencies +, graphviz +, ipmitool +, libvirt +, monitoring-plugins +, mtr +, net-snmp +, nfdump +, nmap +, rrdtool +, system-sendmail +, whois +, dataDir ? "/var/lib/librenms", logDir ? "/var/log/librenms" }: + + +let + phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]); +in phpPackage.buildComposerProject rec { + pname = "librenms"; + version = "23.9.1"; + + src = fetchFromGitHub { + owner = "librenms"; + repo = pname; + rev = "${version}"; + sha256 = "sha256-glcD9AhxkvMmGo/7/RhQFeOtvHJ4pSiEFxaAjeVrTaI="; + }; + + vendorHash = "sha256-s6vdGfM7Ehy1bbkB44EQaHBBvTkpVw9yxhVsc/O8dHc="; + + php = phpPackage; + + buildInputs = [ + unixtools.whereis + (python3.withPackages (ps: with ps; [ + pymysql + python-dotenv + redis + setuptools + psutil + command_runner + ])) + ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mv $out/share/php/librenms/* $out + rm -r $out/share + + # This broken logic leads to bad settings being persisted in the database + patch -p1 -d $out -i ${./broken-binary-paths.diff} + + substituteInPlace \ + $out/misc/config_definitions.json \ + --replace '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \ + --replace '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \ + --replace '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \ + --replace '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \ + --replace '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \ + --replace '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \ + --replace '"default": "/usr/bin/dot",' '"default": "${graphviz}/bin/dot",' \ + --replace '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \ + --replace '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \ + --replace '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \ + --replace '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \ + --replace '"default": "/usr/bin/sfdp",' '"default": "${graphviz}/bin/sfdp",' \ + --replace '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \ + --replace '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \ + --replace '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \ + --replace '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \ + --replace '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \ + --replace '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \ + --replace '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/libexec",' \ + --replace '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",' + + substituteInPlace $out/LibreNMS/wrapper.py --replace '/usr/bin/env php' '${phpPackage}/bin/php' + substituteInPlace $out/LibreNMS/__init__.py --replace '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"' + substituteInPlace $out/snmp-scan.py --replace '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"' + + wrapProgram $out/daily.sh --prefix PATH : ${phpPackage}/bin + + rm -rf $out/logs $out/rrd $out/bootstrap/cache $out/storage $out/.env + ln -s ${logDir} $out/logs + ln -s ${dataDir}/config.php $out/config.php + ln -s ${dataDir}/.env $out/.env + ln -s ${dataDir}/rrd $out/rrd + ln -s ${dataDir}/storage $out/storage + ln -s ${dataDir}/cache $out/bootstrap/cache + + runHook postInstall + ''; + + passthru = { + phpPackage = phpPackage; + tests.librenms = nixosTests.librenms; + }; + + meta = with lib; { + description = "A auto-discovering PHP/MySQL/SNMP based network monitoring"; + homepage = "https://www.librenms.org/"; + license = licenses.gpl3Only; + maintainers = teams.wdz.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 68f94050e0..72ffed83f3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.1"; + version = "2.9.2"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-hfX1srlAd8huLViHlEyk3mcfMhY/LmeryQtAhB7rafw="; + hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index ba061dbd93..47237a3eeb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.77.1"; + version = "0.78.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BPLAAl4V3LN0I+ReiQX3hJcgdZZ6/7lLfBdwl9HzTHc="; + sha256 = "sha256-L8kYbJ9RmCoec9keBHv61K94rjnH+Q4dRkn6PCtjgJI="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-K+T6DxOvVotvTZE8WhWZ0v/T6UqJ5N6xxsdJrr8DQt4="; + vendorHash = "sha256-A3e6qd6yjKsNUaXiltbS9G4WEMd3F1FxaxqMMVuBCUI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix index fbde71958f..b54888cad9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.10.0"; + version = "2.10.3"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-4UBbtJRQ6F3Dm+G4OWZeWtD4MJWtq91yiSZNW7EhEto="; + hash = "sha256-tVJcvxKcxhSeYyqBsBeG+OrWoD+hTDAoPuIXB72MMkY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 4dd05ecb53..bc99ae1f8f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.73"; + version = "2.0.75"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-KyPId549mTm/DrtityM4NHDlZt081UKwfRWS/eWQbXw="; + sha256 = "sha256-fxjF2CV5SoUTirusGQBpbNu9MYKU5yx+DHS2h0NJoic="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix index edf82742bc..6f357ccb08 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/default.nix @@ -1,19 +1,47 @@ -{ lib, stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, perl +, php +, gd +, libpng +, openssl +, zlib +, unzip +, nixosTests +, nix-update-script +}: stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.6"; + version = "4.4.14"; - src = fetchurl { - url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; + src = fetchFromGitHub { + owner = "NagiosEnterprises"; + repo = "nagioscore"; + rev = "refs/tags/nagios-${version}"; + hash = "sha256-EJKMgU3Nzfefq2VXxBrfDDrQZWZvj7HqKnWR9j75fGI="; }; patches = [ ./nagios.patch ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ php perl gd libpng zlib ]; - configureFlags = [ "--localstatedir=/var/lib/nagios" ]; + buildInputs = [ + php + perl + gd + libpng + openssl + zlib + ]; + + configureFlags = [ + "--localstatedir=/var/lib/nagios" + "--with-ssl=${openssl.dev}" + "--with-ssl-inc=${openssl.dev}/include" + "--with-ssl-lib=${lib.getLib openssl}/lib" + ]; + buildFlags = [ "all" ]; # Do not create /var directories @@ -28,15 +56,22 @@ stdenv.mkDerivation rec { sed -i 's@/bin/@@g' $out/etc/objects/commands.cfg ''; - passthru.tests = { - inherit (nixosTests) nagios; + passthru = { + tests = { + inherit (nixosTests) nagios; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "nagios-(.*)" ]; + }; }; meta = { description = "A host, service and network monitoring program"; - homepage = "https://www.nagios.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ immae thoughtpolice relrod ]; + homepage = "https://www.nagios.org/"; + changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${version}/Changelog"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + mainProgram = "nagios"; + maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 708623bc9f..26f7cc890d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.75.0"; + version = "2.76.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-Tz1ogwht6MCRUM4Knr7Ka0VNN2yUmh/lQrJNdPEUMiI="; + hash = "sha256-nk+uYO8tJPUezu/nqfwNhK4q/ds9C96re/fWebrTa1Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index c782378908..2f6122caa6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -21,6 +21,7 @@ , openldap , procps , runtimeShell +, unixtools }: let @@ -33,6 +34,7 @@ let lm_sensors net-snmp procps + unixtools.ping ]; mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } '' @@ -58,7 +60,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg="; }; - # TODO: Awful hack. Grrr... this of course only works on NixOS. + # 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 # localhost (which won't work for ping6 if IPv6 support isn't @@ -74,8 +76,8 @@ stdenv.mkDerivation rec { -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|' configureFlagsArray+=( - --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s' - --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s' + --with-ping-command='ping -4 -n -U -w %d -c %d %s' + --with-ping6-command='ping -6 -n -U -w %d -c %d %s' ) install -Dm555 ${share} $out/share diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 15a5fbfa2d..f61e400d86 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; rev = version; - sha256 = "sha256-XGHOEnAichQEir0k8wj/OSuj1zk8UsLYi9azg6lgpws="; + sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc="; }; - vendorHash = "sha256-X6zrCTGZaSdQS9bwzjbSGkmNs38JBxZMtrqajQxkzK0="; + vendorHash = "sha256-0EXRpehdpOYpq6H9udmNnQ24EucvAcPUKOlFSAAewbE="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index 3fb61b42e0..c995d4036a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -7,7 +7,10 @@ }: buildGoModule rec { pname = "dcgm-exporter"; - version = "3.2.5-3.1.7"; + + # The first portion of this version string corresponds to a compatible DCGM + # version. + version = "3.2.5-3.1.7"; # N.B: If you change this, update dcgm as well to the matching version. src = fetchFromGitHub { owner = "NVIDIA"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 77bb07b358..d50fac3c71 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.47.1"; + version = "2.47.2"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-NgVwxKhag/acE5sdP3910CuGWVWfmTSnXSSztEjLobs="; + hash = "sha256-QLJXY6WzmKcOoLmBTVvCRhTRCAt3IXiHmd9KeLrfz+I="; }; in buildGoModule rec { @@ -47,7 +47,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-AK2DLFDWrpnkvOUb9dFYjdAa6+Vm6ftZQpexy/FULrs="; + hash = "sha256-mV5sfv4+2a9R34wWcqMu/h/VqBSutmnSWnx0Q3K9L6M="; }; vendorHash = "sha256-qFp+tMHhXmJGY9MSukVRjBVzaIBgfxB0BorWiuInMwk="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix index a7649ba17b..27e5da34ef 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-qe3i/sukAkE3DNiSc5BsY9OFWoAVuLsuYStlPfpVZQQ="; + hash = "sha256-jmvVhNaE0cVLHTLH6qKIi4ETr7Q8CTEhXPwzjWyfx5k="; }; - vendorHash = "sha256-M+XDd2ubF4HLpFNPlhn++YXWwPwL6+5TMU+BDdkP+k0="; + vendorHash = "sha256-AYuyOAU7T9YluX77zPu4o377L4wCQzVUrQunt0UIZlU="; subPackages = [ "cmd/exportarr" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix new file mode 100644 index 0000000000..e603c2a881 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "imap-mailstat-exporter"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "bt909"; + repo = "imap-mailstat-exporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-aR/94C9SI+FPs3zg3bpexmgGYrhxghyHwpXj25x0yuw="; + }; + + vendorHash = "sha256-M5Ho4CiO5DC6mWzenXEo2pu0WLHj5S8AV3oEFwD31Sw="; + + nativeBuildInputs = [ installShellFiles ]; + + meta = with lib; { + description = "Export Prometheus-style metrics about how many emails you have in your INBOX and in additional configured folders"; + homepage = "https://github.com/bt909/imap-mailstat-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ raboof ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index e2ee9ae4e5..11264a6379 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-hifG1lpFUVLoy7Ol3N6h+s+hZjnQxja5svpY4lFFsxw="; + hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw="; }; - vendorHash = "sha256-UuPZmxoKVj7FusOS6H1gn6SAzQIZAKyX+m+QS657yXw="; + vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 7a72ab9cb9..2b50c78507 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-9Oh1GsqoIml/SKCmLHuJSnz0k2szEYkb6ArEsU5p198="; + sha256 = "sha256-KdVyRddAr2gqiFyIGBfWbi4DHAaiey4p4OBFND/2u7U="; }; - vendorHash = "sha256-cQChRpjhL3plUk/J+8z2cg3u9IhMo6aTAbY8M/qlXSQ="; + vendorHash = "sha256-fytDr56ZhhO5u6u9CRIEKXGqgnzntSVqEVItibpLyPM="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; homepage = "https://github.com/czerwonk/junos_exporter"; license = licenses.mit; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix index f0b6055f2b..8b2573db4f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -1,39 +1,41 @@ -{ stdenv, fetchFromGitHub, lib, python3, nixosTests }: +{ lib +, python3 +, fetchPypi +, nixosTests +}: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "unstable-2021-08-21"; + version = "3.3.2"; + pyproject = true; - src = fetchFromGitHub { - owner = "ghedo"; - repo = "knot_exporter"; - rev = "b18eb7db735b50280f0815497475f4c7092a6550"; - sha256 = "sha256-FGzkO/KHDhkM3PA2urNQcrMi3MHADkd0YwAvu1jvfrU="; + src = fetchPypi { + pname = "knot_exporter"; + inherit version; + hash = "sha256-/TBzq9MhYb664TsSD46Ep7gOkLBmmPSK9d89xlgvbSw="; }; - dontBuild = true; + nativeBuildInputs = [ + python3.pkgs.hatchling + ]; - nativeBuildInputs = [ python3.pkgs.wrapPython ]; - buildInputs = [ python3 ]; + propagatedBuildInputs = with python3.pkgs; [ + libknot + prometheus-client + psutil + ]; - installPhase = '' - runHook preInstall - - install -Dm0755 knot_exporter $out/bin/knot_exporter - patchShebangs $out/bin - buildPythonPath ${python3.pkgs.prometheus-client} - patchPythonScript $out/bin/knot_exporter - - runHook postInstall - ''; + pythonImportsCheck = [ + "knot_exporter" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) knot; }; meta = with lib; { - homepage = "https://github.com/ghedo/knot_exporter"; - description = " Prometheus exporter for Knot DNS"; + description = "Prometheus exporter for Knot DNS"; + homepage = "https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/knot_exporter"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; + maintainers = with maintainers; [ ma27 hexa ]; + mainProgram = "knot-exporter"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nats-exporter.nix index b710acec9e..3ba045745f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nats-exporter"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3LgxMbcq4vmFxFTrLrJECFqaD5xp9oJsFrqPXATkzqg="; + sha256 = "sha256-TsFj/iUG/PkGvVVn5RSWwEnHsEIGWMY8iapBHVpzt1c="; }; - vendorHash = "sha256-2QGz+7CGBrQPukDMRDapQ5MMMqRTPS6kqsa9J6UXEXY="; + vendorHash = "sha256-IoguUXHxEeyHb2io41ROgam8+7vD5WKzEWwNh4Dlk1o="; preCheck = '' # Fix `insecure algorithm SHA1-RSA` problem diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index a0984b5102..2ca413c20a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "sha256-8Pz1Xa8P0T+5P4qCoyRyRqPtAaSiZw4BV+rSZf4exC0="; + sha256 = "sha256-OiuhxawEpD29EhbzA9DYeJ1J1/uMQGgBTZR9m/5egHI="; }; - vendorHash = "sha256-NIJH5Ya+fZ+37y+Lim/WizNCOYk1lpPRf6u70IoiFZk="; + vendorHash = "sha256-QlMj4ATpJATlQAsrxIHG/1vrD5E/4brsda3BoGGzDgk="; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix index 83e6d38c82..78d611cd3f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.6.1"; + version = "1.7.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "sha256-BCZLMSJP/63N+pZsK8er87Zem7IFGdkyruDs6UVDZSM="; + sha256 = "sha256-+KY/YXEqT/40QzODOk8lKAo0zMcNuiMvj6ippbJE9ho="; }; - vendorHash = "sha256-hn2cMKhLl5qsm4sZErs6PXTs8yajowxw9a9vtHe5cAk="; + vendorHash = "sha256-HrlzDupZP9+GxB58Lg62tvku1Sl2zo2iV0KnBNwkM58="; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 6b03f90e58..635ca0936b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "Prometheus exporter for OpenVPN"; broken = true; license = licenses.asl20; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index d1418a9a24..62f041b285 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-Y66VxzKaadTNE/84aQxgTKsr/KpXwq2W/1BOvsvyNbM="; + sha256 = "sha256-fxVU2z1RGgI8AoKiJb+3LIEa1KDhPptmdP21/ESzmgw="; }; - vendorHash = "sha256-+ly4zZFCnrWycdi/RP8L0yG5/lsGzu4VwKDlea2prio="; + vendorHash = "sha256-/AL9Qkcrp5Kvj2epJMuNrtwqBbyCy4P6oVGUfODXS/Q="; ldflags = let diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix index d4a67bc835..821cab9078 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI="; + hash = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI="; }; vendorHash = "sha256-lnyKsipr/f9W9LWLb2lizKGLvIbS3XnSlOH1u1B87OY="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index dac1e8a970..3450ea73c6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-EIkMxmaugAPPeJfAA9HBbPp59bVHvgP0ZdUy0xhrrlY="; + sha256 = "sha256-KF3tbMgcmZHn8u2wPVidH35vi/Aj7xXUvXPXUci6qrM="; }; - vendorHash = "sha256-it69pime0RAhhu/qlRFGediemMllGhA3srHpGcUet7k="; + vendorHash = "sha256-zwWiUXexGI9noHSRC+h9/IT0qdNwPMDZyP3AIKtnRn0="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 74bd2f1395..cc87fd0d76 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.7"; + version = "0.5.2"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aSygfs5jVc1CTb+uj16U//99ypP4kixz7gqDvxIxxfM="; + sha256 = "sha256-TkTxmumL7T8stNPWkVrMdB23jjMyQcv2x9F+rK6Vj6E="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a08a5b41cc..666b8ed9bd 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-I0/UX4Tpbd2cfsMQQ3gAGfJ3Bgr+JxRARNmV2v2mLeM="; + hash = "sha256-H5ckrDAs9gwQCkVe4TKF4yuqLh2S/+dPaaRH+5aoj+o="; }; - vendorHash = "sha256-cTAjOCP0qWMIKa0xGSK7Id+Oqz3ompDlwAqwub9oNWI="; + vendorHash = "sha256-LhPfOc83/IWkTk3C1DZggWngPJWobZFeCl4cum/aIQo="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 767f6ebd61..7abe243d30 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "systemd_exporter"; - version = "0.5.0"; + version = "0.6.0"; - vendorHash = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU="; + vendorHash = "sha256-D5ASUP6XHNeHZqH/ui5GvxWis/NQrRpN/+wkO4fKkA8="; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM="; + sha256 = "sha256-zLg4cOZUh50OFPp4mKR/FY0JfzVmXmDFcKkhB6DalGc="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 49854d0960..3e5ec75a29 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-EM7CHvpqPwCKgb5QU+jYmMaovHp12hJD1zVxcYygHdU="; + hash = "sha256-JpLrCkPg0vVR0bKKHY5qf1/OD+O7yvWxS7kb7Yg3+c4="; }; - vendorHash = "sha256-AgZo+5gYJ2EaxSI+Jxl7ldu6iZ+uSncYR0n+D2mMC4w="; + vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc="; postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix index c84bc07314..1b3a206dd6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "riemann"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MjTUrqdi9K71PhpLzR3lqdOiNM7Ilmh8HWf3BUOr+b0="; + sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 52605250cf..8dcee384d6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.28.1"; + version = "1.28.5"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-ag5Hk/LAHS2XDZ0MUAycLfDLr9awMl3T+5NoQGUIl/w="; + hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU="; }; - vendorHash = "sha256-3hmYyUDlBPEcoM/1MhH6yoH/Kb21rITrAzy7APQpLqI="; + vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/.npmrc b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/.npmrc deleted file mode 100644 index 521a9f7c07..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/.npmrc +++ /dev/null @@ -1 +0,0 @@ -legacy-peer-deps=true diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix index 2bebed16c7..917343ffec 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-AJAnWMJDIPbZyVcz6lGMSIq/EuwL2xgj9+4jySNzUb8="; + hash = "sha256-YffkCFws/61uX6BwYqTeuAq5vqLOC+FeUt6rtQG6xws="; }; - npmDepsHash = "sha256-ABVCpJH0cS8zPNdPLlNVgAKYd1zSinS3rLJHj4hiMEY="; + npmDepsHash = "sha256-USyLvC6ior1YhiZz6YySaG7xiYziHB01SHC9BPwuvJo="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix index b62f9f7e8c..7ccd36981a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.93.5"; + version = "1.93.6"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs="; + sha256 = "sha256-5z8o6I2AoX43t4UeOjxha9fkEDxVDRhdGNgVZGlHrRE="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 5077f09f6d..aa781f7e26 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -9,7 +9,7 @@ , audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters -, libsamplerate +, libsamplerate, soxr # Outputs , alsa-lib, libjack2, libpulseaudio, libshout, pipewire # Misc @@ -62,6 +62,7 @@ let lame = [ lame ]; # Filter plugins libsamplerate = [ libsamplerate ]; + soxr = [ soxr ]; # Output plugins alsa = [ alsa-lib ]; jack = [ libjack2 ]; @@ -116,13 +117,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-OqSK4oo+Tx7zf7slHH/sRPCCUOBjyipsqDCPovw45Mo="; + sha256 = "sha256-S71PXj+XTGsp5aJXH+82D7tdemfA6cnLBWT/fDmb8oA="; }; buildInputs = [ @@ -147,14 +148,6 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - (fetchpatch { - name = "mpd-systemd-paths.patch"; - url = "https://github.com/MusicPlayerDaemon/MPD/commit/838af929a0ae07e238d30cd7afc96cd7311457ef.patch"; - hash = "sha256-dqMxoeyRwRuhrbDxXyw1EyqPwXxJt48MdkdTweL7M/k="; - }) - ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 48058cf0d2..f586b606f1 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,6 +13,7 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , fetchpatch +, nixosTests }: let @@ -28,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hOnZ6oHLvunZL6MrCmR5GkROQNww34QQ3m4gYDaSpb4="; + sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; patches = lib.optionals stdenv.isDarwin [ @@ -58,6 +59,8 @@ stdenv.mkDerivation rec { popd ''; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ cmake docbook_xsl libxslt ]; buildInputs = [ @@ -74,6 +77,10 @@ stdenv.mkDerivation rec { "-DWITH_WEBSOCKETS=ON" ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + passthru.tests = { + inherit (nixosTests) mosquitto; + }; + meta = with lib; { description = "An open source MQTT v3.1/3.1.1/5.0 broker"; homepage = "https://mosquitto.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 9355509795..b65d97a156 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.1"; + version = "2.10.4"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-gc1CGMlH5rSbq5Fr4MzMFP5FiS8nxip5JrIZsGQ/ad0="; + hash = "sha256-jcN/ycRj8DksBj/Qy0IhoVwQsKuMF+sBkaKM1rZYJPc="; }; - vendorHash = "sha256-ZyqIMR9rhgJXHaLFXBj3wdXGuKt0ricwti9uN62QjCE="; + vendorHash = "sha256-5p23qIWN7+nL+NKbKpBqov7+isNXKmJQRzzojTqKIU4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix b/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix index b399c3b841..651ed424fc 100644 --- a/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/networking/rustus/default.nix @@ -10,7 +10,7 @@ let pname = "rustus"; - version = "0.7.4"; + version = "0.7.6"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "s3rius"; repo = pname; rev = version; - hash = "sha256-RmtkGemFGqvDYd+om/2o4Ki3NWKjJ4/cJ0z40J+L+SY="; + hash = "sha256-osxdqwNUONCScFarpQV48C7CR1DVR/mCttaglqiAKPo="; }; - cargoHash = "sha256-Ayki+hJTyaITOZhiyY8X6d5tR3+CLHZe94zJ9d/Kn4I="; + cargoHash = "sha256-M0mJ+9VznzHDmdKAsT3YamyG/P0JF8oPeVHaX44NWM4="; env.OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index ec45f75656..6cfecd47a9 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, fetchurl, nixosTests +{ lib, stdenvNoCC, fetchurl, nixosTests , nextcloud27Packages , nextcloud26Packages -, nextcloud25Packages }: let @@ -9,9 +8,7 @@ let version, hash , eol ? false, extraVulnerabilities ? [] , packages - }: let - major = lib.versions.major version; - in stdenv.mkDerivation rec { + }: stdenvNoCC.mkDerivation rec { pname = "nextcloud"; inherit version; @@ -20,9 +17,6 @@ let inherit hash; }; - # This patch is only necessary for NC version <26. - patches = lib.optional (lib.versionOlder major "26") (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch"); - passthru = { tests = nixosTests.nextcloud; inherit packages; @@ -47,33 +41,27 @@ let }; }; in { - nextcloud24 = throw '' - Nextcloud v24 has been removed from `nixpkgs` as the support for is dropped - by upstream in 2023-04. Please upgrade to at least Nextcloud v25 by declaring + nextcloud25 = throw '' + Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring - services.nextcloud.package = pkgs.nextcloud25; + services.nextcloud.package = pkgs.nextcloud26; in your NixOS config. - WARNING: if you were on Nextcloud 23 you have to upgrade to Nextcloud 24 - first on 22.11 because Nextcloud doesn't support upgrades across multiple major versions! + WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25 + first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions! ''; - nextcloud25 = generic { - version = "25.0.12"; - hash = "sha256-UgMYQkEdh7hjL47EEq14y0K9VIi+LT77/OSmhRykTYw="; - packages = nextcloud25Packages; - }; - nextcloud26 = generic { - version = "26.0.7"; - hash = "sha256-vtJEqLlNE7YWqSdAUhZwwdZ9Q8SAR3I/sTGAv/bUjpI="; + version = "26.0.8"; + hash = "sha256-ydCay0RuM2AZYIKRM/jzdutvJ5pN73CCF/xxWBiSiH8="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.1"; - hash = "sha256-OpFQBWaHRnVnb6O1v64lh6g5zeQd+sUxgEOxYsExH6s="; + version = "27.1.3"; + hash = "sha256-HWFJNSReSjdbSsmRwC8yNZK3U5cvhviHY/2A7X0nV5M="; packages = nextcloud27Packages; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json deleted file mode 100644 index 9838732d8a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ /dev/null @@ -1,292 +0,0 @@ -{ - "bookmarks": { - "sha256": "1kdpma5f3rb9g29j364lqv6bkar5qgwlvcxmhpmzllwlkmjpc9w8", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v12.1.0/bookmarks-12.1.0.tar.gz", - "version": "12.1.0", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", - "homepage": "https://github.com/nextcloud/bookmarks", - "licenses": [ - "agpl" - ] - }, - "calendar": { - "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", - "version": "4.5.1", - "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", - "homepage": "https://github.com/nextcloud/calendar/", - "licenses": [ - "agpl" - ] - }, - "contacts": { - "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", - "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", - "homepage": "https://github.com/nextcloud/contacts#readme", - "licenses": [ - "agpl" - ] - }, - "cospend": { - "sha256": "189hgyxc2qz4w3l0351ssmbvblf2s78f6ckql8pncbgimw4x171a", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.8/cospend-1.5.8.tar.gz", - "version": "1.5.8", - "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)", - "homepage": "https://github.com/julien-nc/cospend-nc", - "licenses": [ - "agpl" - ] - }, - "deck": { - "sha256": "01bpcq96y1yp4cmkssjcpqamk3wsg99jbsyhich2kjj9a33d0a5v", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.6/deck-v1.8.6.tar.gz", - "version": "1.8.6", - "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", - "homepage": "https://github.com/nextcloud/deck", - "licenses": [ - "agpl" - ] - }, - "files_markdown": { - "sha256": "0p97ha6x3czzbflavmjn4jmz3z706h5f84spg4j7dwq3nc9bqrf7", - "url": "https://github.com/icewind1991/files_markdown/releases/download/v2.4.1/files_markdown-v2.4.1.tar.gz", - "version": "2.4.1", - "description": "Markdown Editor extends the Nextcloud text editor with a live preview for markdown files.\n\nA full list of features can be found [in the README](https://github.com/icewind1991/files_markdown)", - "homepage": "https://github.com/icewind1991/files_markdown", - "licenses": [ - "agpl" - ] - }, - "files_texteditor": { - "sha256": "1irvxz29fj9ccplgizwkchc885fqvqsmk9rj4gfwgpa8bgkya1y6", - "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.1/files_texteditor-v2.15.1.tar.gz", - "version": "2.15.1", - "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", - "homepage": "https://github.com/nextcloud/files_texteditor", - "licenses": [ - "agpl" - ] - }, - "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", - "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", - "homepage": "https://github.com/nextcloud/forms", - "licenses": [ - "agpl" - ] - }, - "groupfolders": { - "sha256": "0mkw8w3miq14ky3c04d3pli1n1jcrsf47005pv8ny170zyhai943", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.6/groupfolders-v13.1.6.tar.gz", - "version": "13.1.6", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", - "homepage": "https://github.com/nextcloud/groupfolders", - "licenses": [ - "agpl" - ] - }, - "impersonate": { - "sha256": "0mlr2dcsbf0njbywcq5vrjjfrac3wk6z9zrcsd39pjznq5l4qky7", - "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.12.1/impersonate-v1.12.1.tar.gz", - "version": "1.12.1", - "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.", - "homepage": "https://github.com/nextcloud/impersonate", - "licenses": [ - "agpl" - ] - }, - "keeweb": { - "sha256": "11q15ajg1357y5y5a640dvsy6hhvvar7wp34zfsb07n7hqlmyci0", - "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz", - "version": "0.6.13", - "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", - "homepage": "https://github.com/jhass/nextcloud-keeweb", - "licenses": [ - "agpl" - ] - }, - "mail": { - "sha256": "1i05dbdhbsg6pmzs7w9dh0wmfd4irv4d44v1gwsfmr00w4mwn9v1", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.7/mail-v2.2.7.tar.gz", - "version": "2.2.7", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", - "homepage": "https://github.com/nextcloud/mail#readme", - "licenses": [ - "agpl" - ] - }, - "maps": { - "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", - "version": "1.1.0", - "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", - "homepage": "https://github.com/nextcloud/maps", - "licenses": [ - "agpl" - ] - }, - "memories": { - "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", - "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", - "version": "5.4.1", - "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", - "homepage": "https://memories.gallery", - "licenses": [ - "agpl" - ] - }, - "news": { - "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", - "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", - "version": "23.0.0", - "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", - "homepage": "https://github.com/nextcloud/news", - "licenses": [ - "agpl" - ] - }, - "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", - "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", - "homepage": "https://github.com/nextcloud/notes", - "licenses": [ - "agpl" - ] - }, - "notify_push": { - "sha256": "0hdxnkar2ibis5p0gp3yr1i6894la9wxq4pzrbqdrq2cgvsj6a18", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.3/notify_push-v0.6.3.tar.gz", - "version": "0.6.3", - "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", - "homepage": "", - "licenses": [ - "agpl" - ] - }, - "onlyoffice": { - "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", - "version": "7.9.0", - "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", - "homepage": "https://www.onlyoffice.com", - "licenses": [ - "apache" - ] - }, - "polls": { - "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", - "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", - "version": "5.3.2", - "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", - "homepage": "https://github.com/nextcloud/polls", - "licenses": [ - "agpl" - ] - }, - "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", - "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", - "homepage": "https://github.com/nextcloud/previewgenerator", - "licenses": [ - "agpl" - ] - }, - "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", - "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", - "homepage": "https://github.com/pbek/qownnotesapi", - "licenses": [ - "agpl" - ] - }, - "registration": { - "sha256": "0x1x5mk83qh5lffcs7h0gjjihzsphc6iqmbch1ni76h9pw4zxrw1", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.2.0/registration-v2.2.0.tar.gz", - "version": "2.2.0", - "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", - "homepage": "https://github.com/nextcloud/registration", - "licenses": [ - "agpl" - ] - }, - "spreed": { - "sha256": "0n6dbvfmasyrrpzqp5i5k6bcp6ipwawkvn7hl557nhy2d60k0ffs", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.8/spreed-v15.0.8.tar.gz", - "version": "15.0.8", - "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", - "homepage": "https://github.com/nextcloud/spreed", - "licenses": [ - "agpl" - ] - }, - "tasks": { - "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", - "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", - "version": "0.15.0", - "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", - "homepage": "https://github.com/nextcloud/tasks/", - "licenses": [ - "agpl" - ] - }, - "twofactor_nextcloud_notification": { - "sha256": "03fp8wcwhyp8ivrcf20klgg17sxc9fia5sa44rbrv3cicmwmw50b", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.7.0/twofactor_nextcloud_notification-v3.7.0.tar.gz", - "version": "3.7.0", - "description": "Allows using any of your logged in devices as second factor", - "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", - "licenses": [ - "agpl" - ] - }, - "twofactor_totp": { - "sha256": "189cwq78dqanqxhsl69dahdkh230zhz2r285lvf0b7pg0sxcs0yc", - "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz", - "version": "6.4.1", - "description": "A Two-Factor-Auth Provider for TOTP (RFC 6238)", - "homepage": "https://github.com/nextcloud/twofactor_totp#readme", - "licenses": [ - "agpl" - ] - }, - "twofactor_webauthn": { - "sha256": "1lqcw74rsnl8c4sirw9208ra3c8zl8zp93scs7y8fv2n4n60l465", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.2.0/twofactor_webauthn-v1.2.0.tar.gz", - "version": "1.2.0", - "description": "A two-factor provider for WebAuthn devices", - "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", - "licenses": [ - "agpl" - ] - }, - "unsplash": { - "sha256": "1ya1h4nb9cyj1hdgb5l5isx7a43a7ri92cm0h8nwih20hi6a9wzx", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.1/unsplash.tar.gz", - "version": "2.2.1", - "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", - "homepage": "https://github.com/nextcloud/unsplash/", - "licenses": [ - "agpl" - ] - }, - "user_saml": { - "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", - "version": "5.2.2", - "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", - "homepage": "https://github.com/nextcloud/user_saml", - "licenses": [ - "agpl" - ] - } -} diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json index dbdd35e814..10146a3183 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", - "version": "4.5.1", + "sha256": "1827l5hxsvfnyc2m78rs95cnb2fwi14nl7ricpl25ndh1j0a7ccz", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.2/calendar-v4.5.2.tar.gz", + "version": "4.5.2", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -110,19 +110,19 @@ ] }, "mail": { - "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz", - "version": "3.4.0", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz", + "version": "3.4.3", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz", - "version": "1.1.1", + "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "version": "1.2.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -130,9 +130,9 @@ ] }, "memories": { - "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", - "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", - "version": "5.4.1", + "sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd", + "url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz", + "version": "6.0.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", - "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", - "version": "23.0.0", + "sha256": "1bkh73h0ibxyjpy3cmvhnlr7isvgqkcxdw2dw15mxksj2cln9wki", + "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz", + "version": "24.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", - "version": "7.9.0", + "sha256": "0hf015rvramksh7v06n7pn5kmyhgqzg17vmrgfqjbndg1r6rghpc", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.4/onlyoffice.tar.gz", + "version": "7.9.4", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -220,9 +220,9 @@ ] }, "spreed": { - "sha256": "1fnlilb9l4vfqdkyk0f3djzdkv0pw3yy30f7psfj6hh6y82pvfky", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.6/spreed-v16.0.6.tar.gz", - "version": "16.0.6", + "sha256": "06cixw0bbmz20fybdqq192bk11xraaaplqybbxa0xjs3x6pcw1na", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.7/spreed-v16.0.7.tar.gz", + "version": "16.0.7", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json index a8bb03bc69..257a773ecb 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", - "version": "4.5.1", + "sha256": "1827l5hxsvfnyc2m78rs95cnb2fwi14nl7ricpl25ndh1j0a7ccz", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.2/calendar-v4.5.2.tar.gz", + "version": "4.5.2", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -110,19 +110,19 @@ ] }, "mail": { - "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz", - "version": "3.4.0", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz", + "version": "3.4.3", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz", - "version": "1.1.1", + "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "version": "1.2.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -130,9 +130,9 @@ ] }, "memories": { - "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", - "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", - "version": "5.4.1", + "sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd", + "url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz", + "version": "6.0.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", - "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", - "version": "23.0.0", + "sha256": "1bkh73h0ibxyjpy3cmvhnlr7isvgqkcxdw2dw15mxksj2cln9wki", + "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz", + "version": "24.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "1872y2fpz3hrmafhcc6n84d63j5wgzx2plpirr91z3a8650frf3m", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.0/onlyoffice.tar.gz", - "version": "8.2.0", + "sha256": "0wnlm12wy7vsjmgh49ag7mm51mr2h8m05vdiwzkrfm7zazgdwadh", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v8.2.4/onlyoffice.tar.gz", + "version": "8.2.4", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ @@ -220,9 +220,9 @@ ] }, "spreed": { - "sha256": "07q6kxbvrg652px8a4wi1msxm2z7r7z7s8v4nnccvdcscv90d99d", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz", - "version": "17.1.1", + "sha256": "1hbgnz0zbhka82csh4rkr1p7zrgbc8wiznqmzh4w1q3d9pz47xis", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.2/spreed-v17.1.2.tar.gz", + "version": "17.1.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch deleted file mode 100644 index f4f1f748d9..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 1adc542ca1d7f60067febd692596eb6e8f334f9c Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 10 Sep 2022 15:18:05 +0200 -Subject: [PATCH] Setup: remove custom dbuser creation behavior - -Both PostgreSQL and MySQL can be authenticated against from Nextcloud by -supplying a database password. Now, during setup the following things -happen: - -* When using postgres and the db user has elevated permissions, a new - unprivileged db user is created and the settings `dbuser`/`dbpass` are - altered in `config.php`. - -* When using MySQL, the password is **always** regenerated since - 24.0.5/23.0.9[1]. - -I consider both cases problematic: the reason why people do configuration -management is to have it as single source of truth! So, IMHO any -application that silently alters config and thus causes deployed -nodes to diverge from the configuration is harmful for that. - -I guess it was sheer luck that it worked for so long in NixOS because -nobody has apparently used password authentication with a privileged -user to operate Nextcloud (which is a good thing in fact). - -[1] https://github.com/nextcloud/server/pull/33513 ---- - lib/private/Setup/MySQL.php | 56 -------------------------------- - lib/private/Setup/PostgreSQL.php | 37 --------------------- - 2 files changed, 93 deletions(-) - -diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index caa73edccec..bc958e84e44 100644 ---- a/lib/private/Setup/MySQL.php -+++ b/lib/private/Setup/MySQL.php -@@ -141,62 +141,6 @@ class MySQL extends AbstractDatabase { - $rootUser = $this->dbUser; - $rootPassword = $this->dbPassword; - -- //create a random password so we don't need to store the admin password in the config file -- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS); -- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols) -- . $this->random->generate(2, ISecureRandom::CHAR_UPPER) -- . $this->random->generate(2, ISecureRandom::CHAR_LOWER) -- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS) -- . $this->random->generate(2, $saveSymbols) -- ; -- $this->dbPassword = str_shuffle($password); -- -- try { -- //user already specified in config -- $oldUser = $this->config->getValue('dbuser', false); -- -- //we don't have a dbuser specified in config -- if ($this->dbUser !== $oldUser) { -- //add prefix to the admin username to prevent collisions -- $adminUser = substr('oc_' . $username, 0, 16); -- -- $i = 1; -- while (true) { -- //this should be enough to check for admin rights in mysql -- $query = 'SELECT user FROM mysql.user WHERE user=?'; -- $result = $connection->executeQuery($query, [$adminUser]); -- -- //current dbuser has admin rights -- $data = $result->fetchAll(); -- $result->closeCursor(); -- //new dbuser does not exist -- if (count($data) === 0) { -- //use the admin login data for the new database user -- $this->dbUser = $adminUser; -- $this->createDBUser($connection); -- -- break; -- } else { -- //repeat with different username -- $length = strlen((string)$i); -- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i; -- $i++; -- } -- } -- } else { -- // Reuse existing password if a database config is already present -- $this->dbPassword = $rootPassword; -- } -- } catch (\Exception $ex) { -- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ -- 'exception' => $ex, -- 'app' => 'mysql.setup', -- ]); -- // Restore the original credentials -- $this->dbUser = $rootUser; -- $this->dbPassword = $rootPassword; -- } -- - $this->config->setValues([ - 'dbuser' => $this->dbUser, - 'dbpassword' => $this->dbPassword, -diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php -index af816c7ad04..e49e5508e15 100644 ---- a/lib/private/Setup/PostgreSQL.php -+++ b/lib/private/Setup/PostgreSQL.php -@@ -45,43 +45,6 @@ class PostgreSQL extends AbstractDatabase { - $connection = $this->connect([ - 'dbname' => 'postgres' - ]); -- //check for roles creation rights in postgresql -- $builder = $connection->getQueryBuilder(); -- $builder->automaticTablePrefix(false); -- $query = $builder -- ->select('rolname') -- ->from('pg_roles') -- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE'))) -- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); -- -- try { -- $result = $query->execute(); -- $canCreateRoles = $result->rowCount() > 0; -- } catch (DatabaseException $e) { -- $canCreateRoles = false; -- } -- -- if ($canCreateRoles) { -- $connectionMainDatabase = $this->connect(); -- //use the admin login data for the new database user -- -- //add prefix to the postgresql user name to prevent collisions -- $this->dbUser = 'oc_' . strtolower($username); -- //create a new password so we don't need to store the admin config in the config file -- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC); -- -- $this->createDBUser($connection); -- -- // Go to the main database and grant create on the public schema -- // The code below is implemented to make installing possible with PostgreSQL version 15: -- // https://www.postgresql.org/docs/release/15.0/ -- // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases -- // Therefore we assume that the database is only used by one user/service which is Nextcloud -- // Additional services should get installed in a separate database in order to stay secure -- // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS -- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"'); -- $connectionMainDatabase->close(); -- } - - $this->config->setValues([ - 'dbuser' => $this->dbUser, --- -2.39.1 - diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 440471a86a..7c46ba3461 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.5.1"; + version = "5.7"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-fbulqSRHPdlpoLH391/axxtjJ7G/9lH9BdqoLKRuIuE="; + sha256 = "sha256-4GYte9kPUR4kFHrUzHXtiMGbuRhZ+4iw1hmqi+geljc="; }; preConfigure = "cd src"; diff --git a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix index 25b58d88b3..b6b9b4e592 100644 --- a/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nginx-sso"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "Luzifer"; repo = "nginx-sso"; rev = "v${version}"; - hash = "sha256-mJwUAMjFUSbJZ8o096o2ntfd7c7dNU+LbgbL/l8aDGc="; + hash = "sha256-Lpaqcxw1q609rYuEd1zrAKXE0GDEi72wl2eoFezvrV8="; }; - vendorHash = "sha256-nyzcFYnUm2xxAdiy16vVyeF57zRI9D+P+/58pP6evDs="; + vendorHash = "sha256-XReXxugMfR2l2LMTvXpSJa7Z9BX7LytwYdYNijPtciE="; postInstall = '' mkdir -p $out/share diff --git a/third_party/nixpkgs/pkgs/servers/nitter/default.nix b/third_party/nixpkgs/pkgs/servers/nitter/default.nix index 07fc8b50e6..6610f26263 100644 --- a/third_party/nixpkgs/pkgs/servers/nitter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nitter/default.nix @@ -22,13 +22,13 @@ buildNimPackage rec { pname = "nitter"; - version = "unstable-2023-08-08"; + version = "unstable-2023-10-31"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7"; - hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8="; + rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c"; + hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/nominatim/default.nix b/third_party/nixpkgs/pkgs/servers/nominatim/default.nix index 3994177e08..8c0410b87a 100644 --- a/third_party/nixpkgs/pkgs/servers/nominatim/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nominatim/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchurl -, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, gzip -, postgresql_12 -, python3, python3Packages, php +, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc +# Nominatim needs to be built with the same postgres version it will target +, postgresql +, python3, php }: let @@ -36,21 +37,19 @@ stdenv.mkDerivation rec { zlib expat boost - python3 + (python3.withPackages (ps: with ps; [ + pyyaml + python-dotenv + psycopg2 + psutil + jinja2 + pyicu + datrie + ])) # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway # python3Packages.behave # disabled since I can't get it to run tests anyway - postgresql_12 - ]; - - propagatedBuildInputs = with python3Packages; [ - pyyaml - python-dotenv - psycopg2 - psutil - jinja2 - pyicu - datrie + postgresql ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 2277c997b7..2b7e3c0473 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-kUsEdEKwYjyM5G8YKTt90fWzX21hiulRj3W5jK45Keg="; + hash = "sha256-G2kCh5F2WfrSOCr+fEO02mlOSVfV2Oy3uZGNEarLR+M="; }; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index 0fba93fb5b..4f683b83a5 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -1,17 +1,18 @@ { lib , buildGo121Module , fetchFromGitHub +, nixosTests }: buildGo121Module rec { pname = "ferretdb"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-jasAfbE3CRlBJeyMnqKJBbmA+W/QnytGIUdyXR55EaU="; + hash = "sha256-D1iMYh76a9H38tiZWByuJZrABWfjQFCkyxtbtLM/DMw="; }; postPatch = '' @@ -19,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-5TjKGGEX66qNr2/25zRd7UESi03g7FI1AfEsW2mBcDE="; + vendorHash = "sha256-WrnACseWo+bLn0IJhGY/DFsrMFAyy7J02cjO4FvE2xA="; CGO_ENABLED = 0; @@ -34,6 +35,8 @@ buildGo121Module rec { $out/bin/ferretdb --version | grep ${version} ''; + passthru.tests = nixosTests.ferretdb; + meta = with lib; { description = "A truly Open Source MongoDB alternative"; homepage = "https://www.ferretdb.io/"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix index 16b2ca4042..36385fd46c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/janusgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "janusgraph"; - version = "0.6.3"; + version = "0.6.4"; src = fetchzip { url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; - sha256 = "sha256-KpGvDfQExU6pHheqmcOFoAhHdF4P+GBQu779h+/L5mE="; + sha256 = "sha256-rfqZE7HYgudVjrz+Ij+ggltaBXvYbczgRwCqsNTojTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix index 16a4ccef56..05fed1ac92 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/5.0.nix @@ -6,8 +6,8 @@ let }; variants = if stdenv.isLinux then { - version = "5.0.21"; - sha256 = "sha256-knAqb6bT1KpO1Gi4sKhG22OtCPhOR3NMmhRjUgseUPM="; + version = "5.0.22"; + sha256 = "sha256-NIsx6nwXGsuk+ff+LOCwOMpT/HAaNn89t4jtJvKprIA="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } else lib.optionalAttrs stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/6.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/6.0.nix index 12110393f9..8d7d6fbe78 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/6.0.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/6.0.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "6.0.10"; - sha256 = "sha256-7YJ0Ndyl635ebDWuIGfC5DFIGUXr518ghC/0Qq42HEM="; + version = "6.0.11"; + sha256 = "sha256-hIbbCDQ0Sqnm6ohtEpbdGWk18nLIlr6T0T9UL6WAFA8="; patches = [ (fetchpatch { name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index 5be49f1889..df7efb33b6 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, sconsPackages +, scons_3_1_2 , boost , gperftools , pcre-cpp @@ -31,7 +31,8 @@ with lib; let variants = - if versionAtLeast version "6.0" then rec { + if versionAtLeast version "6.0" + then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -41,12 +42,13 @@ let pymongo ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; - } else rec { + } + else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -54,7 +56,7 @@ let setuptools ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; @@ -84,7 +86,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ variants.scons ] - ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; + ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; buildInputs = [ boost @@ -147,7 +149,7 @@ in stdenv.mkDerivation rec { "--disable-warnings-as-errors" "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ] - ++ map (lib: "--use-system-${lib}") system-libraries; + ++ map (lib: "--use-system-${lib}") system-libraries; # This seems to fix mongodb not able to find OpenSSL's crypto.h during build hardeningDisable = [ "fortify3" ]; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix index f2bbf4b9a2..d989d125b2 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.2"; + version = "7.3.3"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-JiMY4TICsf7OQPXYCOqlQ+av0InR10EptXHm/QXEpGI="; + hash = "sha256-THQGgvSxij1xpAsOj3oCYYDfhoe/ji3jZ6PMT+5UThc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 25d8896945..c3ac0ebbf9 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "7.2.1"; + version = "7.2.3"; src = fetchurl { url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-XHbZkKGxxflJvNHu2Q0Mik9wNpvb3LQCiMVh3fiJZ6Q="; + hash = "sha256-PisZbW603bnnQwiL/CkVzLtC1A9aij7djLaccW7DS+c="; }; patches = lib.optionals useSystemJemalloc [ diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 95435b4ea7..25517c0b43 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.93.5"; + version = "1.93.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs="; + hash = "sha256-MGIFM7PhKTeu7hnE9M2fj4EsJQv5AIDhFbypEJjYNwc="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix index 2b5b34eb3d..ea5a35eeb7 100644 --- a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-60S8M1Y9BxuMxXGxEaxW82Va5lSnZZPfQnPq2ivTXdU="; + sha256 = "sha256-0rtxKSVIyCzYnhRneLOEu1e1qtAO6dGBAUr/oKq95Hw="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 3af259d0e7..04db11a9a5 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -32,6 +32,69 @@ stdenv.mkDerivation { version = "${version}-${kernel.modDirVersion}"; inherit src; + patches = [ + # cf: Fix cast-function-type err w/disable-checking + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6867a3e8429f37fb748575df52256227ae9e5b53"; + hash = "sha256-FDvOFDzl2eFN7ZKUqQBQSWGo0ntayc8NCYh/haVi8Ng="; + }) + # LINUX: Make 'fs flush*' invalidate dentry + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=898098e01e19970f80f60a0551252b2027246038"; + hash = "sha256-ehwRrzpqB8iJKuZ/18oJsrHVlKQs6EzCNaPtSG1m0sw="; + }) + # Linux 6.5: Replace generic_file_splice_read + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=fef245769366efe8694ddadd1e1f2ed5ef8608f4"; + hash = "sha256-TD1xYvlc9aJyravNZLPhceeOwBawvn0Ndxd50rszTJU="; + }) + # LINUX: Make sysctl definitions more concise + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=d15c7ab50c92671052cbe9a93b0440c81156d8aa"; + hash = "sha256-6K593AJvgC34RfnIqW8+0A/v9cF6tsbVMeKpCv+QrK4="; + }) + # Linux 6.5: Use register_sysctl() + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=63801cfd1fc06ec3259fcfd67229f3a3c70447ed"; + hash = "sha256-eoQxaZ28OanSoaHRJcfvXQORbe21YLhwPLoJUILjMkU="; + }) + # hcrypto: rename abort to _afscrypto_abort + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=538f450033a67e251b473ff92238b3124b85fc72"; + hash = "sha256-ztfJQKvGHGdWQe/0+BGkgRFxOi3n4YY+EFxgbD3DO1E="; + }) + # cf: Avoid nested C functions built by autoconf + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=d50ced2a17e05884ea18bb3dfcde6378b2531dc7"; + hash = "sha256-dK2/9bGhlXCPCB9t9T/K2dKdRBShVKXtYXWPttsOhAM="; + }) + # cf: Use static allocated structs for cf tests + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=00f13c45d637249a0d698458e08c1b8e2da8e219"; + hash = "sha256-YNszJIxBDIsl3RgBcHEpNtYIrNLC0tnSbIOQvX0oZ+s="; + }) + # LINUX: Pass an array of structs to register_sysctl + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=5b647bf17a878271e1ce9882e41663770ee73528"; + hash = "sha256-9o4cr/KORtanTfuKMAMAOvePB+vK579rR85rY+m8VNM="; + }) + # linux: Replace fop iterate with fop iterate_shared + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6de0a646036283266e1d4aeb583e426005ca5ad4"; + hash = "sha256-cL3ByjUS3QU8fSbuN7ZEEKyjb+6TbbZL10UKbSgNl6c="; + }) + # Linux 6.6: convert to ctime accessor functions + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=6413fdbc913834f2884989e5811841f4ccea2b5f"; + hash = "sha256-vdK25vfS5Yr0xQufzUk431FXHwMIWlP2UpLjqnobJWI="; + }) + # Linux 6.6: Pass request_mask to generic_fillattr + (fetchpatch { + url = "https://git.openafs.org?p=openafs.git;a=patch;h=4f1d8104d17d2b4e95c7abaf5498db6b80aefa8f"; + hash = "sha256-XJpqbDB/LOuqZj3gPHlcLeGzAQCGvPH8ArgWf+sbBJU="; + }) + ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index 43f9d7a7fe..422ee821cd 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -12,7 +12,9 @@ , python3 , esbuild , nodejs +, node-gyp , libsecret +, libkrb5 , xorg , ripgrep , AppKit @@ -37,12 +39,12 @@ let esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.16.17"; + version = "0.17.14"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -58,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.79.2"; + version = "1.84.0"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-u5LuDcKTN4CEpRnFCeEbni6hiDDwTV9LUEmXaQYJvJw="; + hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ="; }; yarnCache = stdenv.mkDerivation { @@ -87,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE="; + outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw="; }; nativeBuildInputs = [ @@ -102,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ (with xorg; [ libX11 libxkbfile ]) + ++ (with xorg; [ libX11 libxkbfile libkrb5 ]) ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -140,8 +142,16 @@ stdenv.mkDerivation (finalAttrs: { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" - # set nodedir, so we can build binaries later - npm config set nodedir "${nodejs}" + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix index 54f345e4f9..39b6d845e0 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/libosmo-sccp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libosmo-sccp"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-sccp"; rev = version; - hash = "sha256-icEyI0zgsiBfawcNW8IarVPj0VNxzsev2W+cRGPev7Y="; + hash = "sha256-GrC++v7PCAnaEtMFt+el/ct2g+/9Axev04g/jMIGyOQ="; }; configureFlags = [ "--with-systemdsystemunitdir=$out" ]; diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix index 3aa14e1f56..6ba3e2f8f0 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix @@ -8,19 +8,15 @@ , libosmo-netif }: -let - inherit (stdenv) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-bts"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bts"; rev = version; - hash = "sha256-tg6SxTSmPAkmoWsA0U69/EESlziR4cnq/+PWLavS3mk="; + hash = "sha256-Y972aa98bNU3IhuGMV80nh4ZjQKUdK6of1Q8H75Ips8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix index 201a7ee9ab..9047c74397 100644 --- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "osmo-iuh"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-iuh"; rev = version; - hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs="; + hash = "sha256-rAU2+NxD+j2jntZ7dHvakv2aTsfzAg0+SFDHtSJNpn8="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix b/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix index 47b3b696fd..85985584c8 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.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-w0wk69hERGz6fs6uXBYiomcVlQeeTGCfTICu2q7ryNg="; + hash = "sha256-N9qMMAIgmBUEscydJKBQneLcX8odOEXY+560lJJz52g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix b/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix index 0246d3f5b0..e11167000d 100644 --- a/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.19"; + version = "0.3.20"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lVPRg9zU3VOTrxr2pTHzfvaGjoP/h88W4JmQhOKshRc="; + sha256 = "sha256-gV7Yo14oGFzuO1b/JGXeuqn4k+9aNTwngEJHoD9+NMI="; fetchSubmodules = true; }; - cargoHash = "sha256-+wh6qHXW9KXXOkMIkRr+tI3ViBrHpE2G+96mhXFJDtI="; + cargoHash = "sha256-bXf7PZm2l1hwnFVbfEJWLyRaVY3cZFaDSe8b77JtyaU="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/third_party/nixpkgs/pkgs/servers/peertube/default.nix b/third_party/nixpkgs/pkgs/servers/peertube/default.nix index d901a66c4f..d4c20cf2dd 100644 --- a/third_party/nixpkgs/pkgs/servers/peertube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/peertube/default.nix @@ -45,18 +45,18 @@ let in stdenv.mkDerivation rec { pname = "peertube"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - hash = "sha256-C9mBF+QymGXyBB3IFX6MNgsZpHk739qv1/DLuvzrTaU="; + hash = "sha256-8JzU0JVb+JQCNiro8hPHBwkofNTUy90YkSCzTOoB+/A="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-W+pX2XO27j6qAVxvo+Xf1h7g3V0LUMtwNf+meZmkgwE="; + hash = "sha256-pzXH6hdDf8O6Kr12Xw0jRcnPRD2TrDGdiEfxVr3KmwY="; }; yarnOfflineCacheTools = fetchYarnDeps { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${src}/client/yarn.lock"; - hash = "sha256-TAv8QAAfT3q28jUo26h0uCGsoqBzAn8lybIaqNAApU8="; + hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU="; }; nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ]; diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/backend.nix b/third_party/nixpkgs/pkgs/servers/photoprism/backend.nix index 688a4283fb..f1f0bc4557 100644 --- a/third_party/nixpkgs/pkgs/servers/photoprism/backend.nix +++ b/third_party/nixpkgs/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-gg/vIekHnoABucYqFDfo8574waN4rP7nkT57U3Gil5I="; + vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c="; subPackages = [ "cmd/photoprism" ]; diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix index 24d9aec7bd..0a2c2d3a4f 100644 --- a/third_party/nixpkgs/pkgs/servers/photoprism/default.nix +++ b/third_party/nixpkgs/pkgs/servers/photoprism/default.nix @@ -1,40 +1,40 @@ { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "230719-73fa7bbe8"; + version = "231011-63f708417"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-MRRF+XCk25dGK6A2AdD6/4PdXWoZNHuh/EsYOY0i7y0="; + hash = "sha256-g/j+L++vb+wiE23d/lm6lga0MeaPrCotEojD9Sajkmg="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; backend = pkgs.callPackage ./backend.nix { inherit libtensorflow src version; }; frontend = pkgs.callPackage ./frontend.nix { inherit src version; }; - fetchModel = { name, sha256 }: + fetchModel = { name, hash }: fetchzip { - inherit sha256; + inherit hash; url = "https://dl.photoprism.org/tensorflow/${name}.zip"; stripRoot = false; }; facenet = fetchModel { name = "facenet"; - sha256 = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo="; + hash = "sha256-aS5kkNhxOLSLTH/ipxg7NAa1w9X8iiG78jmloR1hpRo="; }; nasnet = fetchModel { name = "nasnet"; - sha256 = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE="; + hash = "sha256-bF25jPmZLyeSWy/CGXZE/VE2UupEG2q9Jmr0+1rUYWE="; }; nsfw = fetchModel { name = "nsfw"; - sha256 = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg="; + hash = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg="; }; assets_path = "$out/share/${pname}"; diff --git a/third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix b/third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix index 436ad4e31e..9793fa461c 100644 --- a/third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-tFO6gdERlljGJfMHvv6gMahZ6FgrXQOC/RQOsg1WAVk="; + npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo="; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix index 1945068b23..fc5d0b4ce7 100644 --- a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-9gD39eHIQEd59UNlz/Sw7V7ekBvk/pHETfo8HzfdQDQ="; + sha256 = "sha256-VFyFQ3c4EEbQAj3bUgjWbmpCyugcpfz0phgBz0ZUB/Q="; }; patches = [ @@ -26,17 +26,6 @@ beamPackages.mixRelease rec { overrides = final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually - gettext = beamPackages.buildMix rec { - name = "gettext"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "tusooa"; - repo = "gettext"; - rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; - sha256 = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; - }; - }; prometheus_ex = beamPackages.buildMix rec { name = "prometheus_ex"; version = "3.0.5"; @@ -175,7 +164,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; - maintainers = with maintainers; [ ninjatrappeur yuka kloenk yayayayaka ]; + maintainers = with maintainers; [ picnoir yuka kloenk yayayayaka ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/pleroma/mix.nix b/third_party/nixpkgs/pkgs/servers/pleroma/mix.nix index cd5bb10b79..2b3512f1c8 100644 --- a/third_party/nixpkgs/pkgs/servers/pleroma/mix.nix +++ b/third_party/nixpkgs/pkgs/servers/pleroma/mix.nix @@ -13,9 +13,9 @@ let version = "0.3.5"; src = fetchHex { - pkg = "${name}"; + pkg = "accept"; version = "${version}"; - sha256 = "1f0vmjjyyz8klhdb3k8zrcxpidhfy6706327nmisnbnc1ci8rc8i"; + sha256 = "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"; }; beamDeps = []; @@ -26,9 +26,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "base62"; version = "${version}"; - sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + sha256 = "d41336bda8eaa5be197f1e4592400513ee60518e5b9f4dcf38f4b4dae6f377bb"; }; beamDeps = [ custom_base ]; @@ -39,9 +39,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "bbcode_pleroma"; version = "${version}"; - sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + sha256 = "19851074419a5fedb4ef49e1f01b30df504bb5dbb6d6adfc135238063bebd1c3"; }; beamDeps = [ nimble_parsec ]; @@ -49,12 +49,12 @@ let bcrypt_elixir = buildMix rec { name = "bcrypt_elixir"; - version = "2.3.0"; + version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bcrypt_elixir"; version = "${version}"; - sha256 = "0s9psinz913l690xbcrl21m23zwinw4r2ypjgg7ybl3f9wfxd09c"; + sha256 = "42182d5f46764def15bf9af83739e3bf4ad22661b1c34fc3e88558efced07279"; }; beamDeps = [ comeonin elixir_make ]; @@ -62,15 +62,15 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.0.1"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "benchee"; version = "${version}"; - sha256 = "1nxd6blgmalb1qm9n11yaq24din2grc3pnnfsx6wkiz9hzkqmm9s"; + sha256 = "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"; }; - beamDeps = [ deep_merge ]; + beamDeps = [ deep_merge statistex ]; }; bunt = buildMix rec { @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -88,12 +88,12 @@ let cachex = buildMix rec { name = "cachex"; - version = "3.3.0"; + version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "189irin4xkbnj6b3ih1h5fvli1xq6m1sz1xiyqryyk71vphmw3nr"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "calendar"; version = "${version}"; - sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + sha256 = "990e9581920c82912a5ee50e62ff5ef96da6b15949a2ee4734f935fdef0f0a6f"; }; beamDeps = [ tzdata ]; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.18"; + version = "0.1.22"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "01kawrhxcc0i7zkygss5ia8hmkzv39q4bnrwnf0fz0mpa9jazfv1"; + sha256 = "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"; }; beamDeps = []; @@ -130,9 +130,9 @@ let version = "2.9.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + sha256 = "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"; }; beamDeps = []; @@ -143,9 +143,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -153,12 +153,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.2"; + version = "5.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "012zr4s7b5bipng6yszqxkqr1lcv7imf8gyvxad56jachh1396fh"; + sha256 = "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "concurrent_limiter"; version = "${version}"; - sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk"; + sha256 = "53968ff238c0fbb4d7ed76ddb1af0be6f3b2f77909f6796e249e737c505a16eb"; }; beamDeps = [ telemetry ]; @@ -182,9 +182,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -195,9 +195,9 @@ let version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf"; + sha256 = "ee4ae1418e6ce117fc42c2ba3e6cbdca4e95ecd2fe59a05ec6884ca16d469aea"; }; beamDeps = [ plug ]; @@ -205,12 +205,12 @@ let covertool = buildRebar3 rec { name = "covertool"; - version = "2.0.4"; + version = "2.0.6"; src = fetchHex { - pkg = "${name}"; + pkg = "covertool"; version = "${version}"; - sha256 = "1p0c1n3nl4063xwi1sv176l1x68xqf07qwvj444a5z888fx6i5aw"; + sha256 = "5db3fcd82180d8ea4ad857d4d1ab21a8d31b5aee0d60d2f6c0f9e25a411d1e21"; }; beamDeps = []; @@ -218,12 +218,12 @@ let cowboy = buildErlangMk rec { name = "cowboy"; - version = "2.9.0"; + version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -234,9 +234,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -244,12 +244,12 @@ let cowlib = buildRebar3 rec { name = "cowlib"; - version = "2.11.0"; + version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -257,12 +257,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.6.7"; + version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; + sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; }; beamDeps = [ bunt file_system jason ]; @@ -273,7 +273,7 @@ let version = "1.1.8"; src = fetchHex { - pkg = "${name}"; + pkg = "crontab"; version = "${version}"; sha256 = "1gkb7ps38j789acj8dw2q7jnhhw43idyvh36fb3i52yjkhli7ra8"; }; @@ -286,9 +286,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "custom_base"; version = "${version}"; - sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + sha256 = "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"; }; beamDeps = []; @@ -296,25 +296,25 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.4.2"; + version = "2.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "0s1nx1gi96r8g7x8y7cklz8z823a6llh4fk996i5xxcr3flkrrag"; + sha256 = "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"; }; - beamDeps = [ connection telemetry ]; + beamDeps = [ telemetry ]; }; decimal = buildMix rec { name = "decimal"; - version = "2.0.0"; + version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -325,9 +325,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "deep_merge"; version = "${version}"; - sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + sha256 = "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"; }; beamDeps = []; @@ -338,9 +338,9 @@ let version = "1.4.22"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark"; version = "${version}"; - sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw"; + sha256 = "1caf5145665a42fd76d5317286b0c171861fb1c04f86ab103dde76868814fdfb"; }; beamDeps = [ earmark_parser ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.29"; + version = "1.4.32"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; + sha256 = "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"; }; beamDeps = []; @@ -364,9 +364,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.9.2"; + version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; + sha256 = "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"; }; beamDeps = [ decimal jason telemetry ]; @@ -390,9 +390,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -400,12 +400,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.4"; + version = "0.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "1ra9jh2p1jp1hn4g7aynivbrj52y9c20aspmqw6ksbkp3cpv079i"; + sha256 = "def61f1f92d4f40d51c80bbae2157212d6c0a459eb604be446e47369cbd40b23"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -413,12 +413,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.9.0"; + version = "3.10.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "0lv4b45j0bja98q0qhlp97a7zvb0g7x2bgkqr721m2rv0whggwx8"; + sha256 = "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -429,9 +429,9 @@ let version = "1.0.14"; src = fetchHex { - pkg = "${name}"; + pkg = "eimp"; version = "${version}"; - sha256 = "1dl3xdfd42y389fc3sbssva163jgpy48pni2kqnvjy9027rk64ah"; + sha256 = "501133f3112079b92d9e22da8b88bf4f0e13d4d67ae9c15c42c30bd25ceb83b6"; }; beamDeps = [ p1_utils ]; @@ -439,12 +439,12 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.6.2"; + version = "0.6.3"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "1na8agkks1hrwq1lxfj4yd96bvfcs4hk7mbra9z6lli2vanrxr03"; + sha256 = "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"; }; beamDeps = []; @@ -455,35 +455,22 @@ let version = "0.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "esbuild"; version = "${version}"; - sha256 = "1rgzjjb0j3m0xz8gs112dydfz7m5brlpfm2qmz7w8qyr6ars10zi"; + sha256 = "f183a0b332d963c4cfaf585477695ea59eef9a6f2204fdd0efa00e099694ffe5"; }; beamDeps = [ castore ]; }; - esshd = buildMix rec { - name = "esshd"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "10cryiv674p2mn9gvncl9j3rzgv0523chz9q6sm91lq960g38gnp"; - }; - - beamDeps = []; - }; - eternal = buildMix rec { name = "eternal"; version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -494,9 +481,9 @@ let version = "2.1.9"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws"; version = "${version}"; - sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y"; + sha256 = "3e6c776703c9076001fbe1f7c049535f042cb2afa0d2cbd3b47cbc4e92ac0d10"; }; beamDeps = [ hackney jason sweet_xml ]; @@ -504,12 +491,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.2.0"; + version = "2.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "1g91dd4jfmqp9ds8ji5kqlgcm2bk6ajci3mpi0grxqki6dhmq5qm"; + sha256 = "85dda6e27754d94582869d39cba3241d9ea60b6aa4167f9c88e309dc687e56bb"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -520,9 +507,9 @@ let version = "0.2.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_const"; version = "${version}"; - sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + sha256 = "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"; }; beamDeps = []; @@ -530,12 +517,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.24.2"; + version = "0.29.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "1nmpdxydbc1khcayab98gfv7km2qrqmgp1s64kjdkf11x3cy2d71"; + sha256 = "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -546,9 +533,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -559,22 +546,35 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_syslogger"; version = "${version}"; - sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb"; + sha256 = "ab9fab4136dbc62651ec6f16fa4842f10cf02ab4433fa3d0976c01be99398399"; }; beamDeps = [ poison syslog ]; }; + expo = buildMix rec { + name = "expo"; + version = "0.4.1"; + + src = fetchHex { + pkg = "expo"; + version = "${version}"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; + }; + + beamDeps = []; + }; + fast_html = buildMix rec { name = "fast_html"; version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; + sha256 = "605f4f4829443c14127694ebabb681778712ceecb4470ec32aa31012330e6506"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -582,12 +582,12 @@ let fast_sanitize = buildMix rec { name = "fast_sanitize"; - version = "0.2.2"; + version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "0rj4x64rl7pspagp30dhw9yzal4q2c8937am1m5akbshjbdh9wk9"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -598,9 +598,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -611,9 +611,9 @@ let version = "0.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "finch"; version = "${version}"; - sha256 = "0l3mvf0jnh49rj58vj1051fvsj6294wjhlh8ycpfqb07har132yx"; + sha256 = "dd8b11b282072cec2ef30852283949c248bd5d2820c88d8acc89402b81db7550"; }; beamDeps = [ castore mint nimble_options nimble_pool telemetry ]; @@ -624,9 +624,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "flake_id"; version = "${version}"; - sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + sha256 = "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"; }; beamDeps = [ base62 ecto ]; @@ -634,15 +634,15 @@ let floki = buildMix rec { name = "floki"; - version = "0.30.1"; + version = "0.34.3"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "1f3b2wd1pmsgkl8np13pwgp57161p0wxfwnnrjzlq73x8hj3bh79"; + sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; }; - beamDeps = [ html_entities ]; + beamDeps = []; }; gen_smtp = buildRebar3 rec { @@ -650,22 +650,35 @@ let version = "0.15.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99"; + sha256 = "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"; }; beamDeps = []; }; - gun = buildRebar3 rec { - name = "gun"; - version = "2.0.0-rc.2"; + gettext = buildMix rec { + name = "gettext"; + version = "0.22.2"; src = fetchHex { - pkg = "${name}"; + pkg = "gettext"; version = "${version}"; - sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + sha256 = "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"; + }; + + beamDeps = [ expo ]; + }; + + gun = buildRebar3 rec { + name = "gun"; + version = "2.0.1"; + + src = fetchHex { + pkg = "gun"; + version = "${version}"; + sha256 = "a10bc8d6096b9502205022334f719cc9a08d9adcfbfc0dbee9ef31b56274a20b"; }; beamDeps = [ cowlib ]; @@ -676,9 +689,9 @@ let version = "1.18.1"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + sha256 = "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -689,9 +702,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hpax"; version = "${version}"; - sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; + sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; }; beamDeps = []; @@ -702,9 +715,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -715,9 +728,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "http_signatures"; version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; }; beamDeps = []; @@ -725,12 +738,12 @@ let httpoison = buildMix rec { name = "httpoison"; - version = "1.8.0"; + version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "0fiwkdrbj7mmz449skp7laz2jdwsqn3svddncmicd46gk2m9w218"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -741,9 +754,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -754,9 +767,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -767,9 +780,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; + sha256 = "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"; }; beamDeps = [ decimal ]; @@ -777,12 +790,12 @@ let joken = buildMix rec { name = "joken"; - version = "2.3.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "joken"; version = "${version}"; - sha256 = "07mwnzzb9slhzqjmd0nbs4dyjkbb3v06km82mhvdbi8fkjkn7cjp"; + sha256 = "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"; }; beamDeps = [ jose ]; @@ -790,12 +803,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.1"; + version = "1.11.5"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "1i8szzpmiqc7xdv0lp38ng9fild7c5182b4pzkx4qbydnfgnr3q7"; + sha256 = "dcd3b215bafe02ea7c5b23dafd3eb8062a5cd8f2d904fd9caa323d37034ab384"; }; beamDeps = []; @@ -806,9 +819,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + sha256 = "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"; }; beamDeps = []; @@ -819,9 +832,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "linkify"; version = "${version}"; - sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; + sha256 = "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"; }; beamDeps = []; @@ -832,9 +845,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "majic"; version = "${version}"; - sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; + sha256 = "7905858f76650d49695f14ea55cd9aaaee0c6654fa391671d4cf305c275a0a9e"; }; beamDeps = [ elixir_make mime nimble_pool plug ]; @@ -845,9 +858,9 @@ let version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "1a9cp9zp85yfybhdxapi9haa1yykzq91bw8abmk0qp1z5p05i8fg"; + sha256 = "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"; }; beamDeps = [ nimble_parsec ]; @@ -858,9 +871,9 @@ let version = "0.14.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "04fyrd0fcyfvv4i3ngm3gbykhfrp9z6l2p1bhgg9xv7ah0d8nhzj"; + sha256 = "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"; }; beamDeps = [ makeup ]; @@ -868,12 +881,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.1"; + version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p"; + sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; }; beamDeps = [ makeup ]; @@ -884,9 +897,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -897,9 +910,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -910,9 +923,9 @@ let version = "1.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + sha256 = "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"; }; beamDeps = []; @@ -923,9 +936,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -933,12 +946,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.4.2"; + version = "1.5.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mint"; version = "${version}"; - sha256 = "106x9nmzi4ji5cqaddn76pxiyxdihk12z2qgszcdgd2rrjxsaxff"; + sha256 = "4a63e1e76a7c3956abd2c72f370a0d0aecddc3976dea5c27eccbecfa5e7d5b1e"; }; beamDeps = [ castore hpax ]; @@ -949,7 +962,7 @@ let version = "2.18.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mochiweb"; version = "${version}"; sha256 = "16j8cfn3hq0g474xc5xl8nk2v46hwvwpfwi9rkzavnsbaqg2ngmr"; }; @@ -959,12 +972,12 @@ let mock = buildMix rec { name = "mock"; - version = "0.3.7"; + version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -972,12 +985,12 @@ let mogrify = buildMix rec { name = "mogrify"; - version = "0.9.1"; + version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "01bzbfd0c932acnla5s3b5f9gvyyiwi0rgs815f15lipjccdykhk"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -985,12 +998,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.0"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1pzlqq9y4i9i7d0dm8ah2c5a7y2h9649gkz9hfqamnmbnwh0l6r0"; + sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; }; beamDeps = []; @@ -1001,9 +1014,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_options"; version = "${version}"; - sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + sha256 = "e6701c1af326a11eea9634a3b1c62b475339ace9456c1a23ec3bc9a847bca02d"; }; beamDeps = []; @@ -1011,12 +1024,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "0.5.0"; + version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "1cx9p22kkywkg40yqy9xswy4ighdw7i8cc9x1481pzy1d620n12w"; + sha256 = "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"; }; beamDeps = []; @@ -1027,9 +1040,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "1c715055095d3f2705c4e236c18b618420a35490da94149ff8b580a2144f653f"; }; beamDeps = []; @@ -1037,12 +1050,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.13.4"; + version = "2.13.6"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "097isyz3mlix1qkazsgbhgvx6sp02rvs2xdviy9dgqh9nj16zlm7"; + sha256 = "3c1c5eb16f377b3cbbf2ea14be24d20e3d91285af9d1ac86260b7c2af5464887"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1050,12 +1063,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.10.0"; + version = "3.17.3"; src = fetchHex { - pkg = "${name}"; + pkg = "open_api_spex"; version = "${version}"; - sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + sha256 = "165db21a85ca83cffc8e7c8890f35b354eddda8255de7404a2848ed652b9f0fe"; }; beamDeps = [ jason plug poison ]; @@ -1066,9 +1079,9 @@ let version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + sha256 = "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"; }; beamDeps = []; @@ -1079,9 +1092,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "pbkdf2_elixir"; version = "${version}"; - sha256 = "07s862m4y74fyv9gwdhrhx04rvpfrwgqkjlyy51b9w1h8r50md6k"; + sha256 = "d3b40a4a4630f0b442f19eca891fcfeeee4c40871936fed2f68e1c4faa30481f"; }; beamDeps = [ comeonin ]; @@ -1089,12 +1102,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.15"; + version = "1.6.16"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "0wh6s8id3b4c4hgiawq995p192wxsws4sr4bm1g7b55kyvxvj2np"; + sha256 = "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; @@ -1102,12 +1115,12 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.0"; + version = "4.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9"; + sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1115,12 +1128,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.2.0"; + version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "0ky5idgid1psz6hmh2b2kmj6n974axww74hrxwv02p6jasx9gv1n"; + sha256 = "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"; }; beamDeps = [ plug ]; @@ -1128,12 +1141,12 @@ let phoenix_live_dashboard = buildMix rec { name = "phoenix_live_dashboard"; - version = "0.6.2"; + version = "0.6.5"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_dashboard"; version = "${version}"; - sha256 = "0ywfqndxhjwx0pxv381p2rj5xzbaxvy248s41c1bba1ciarwdijv"; + sha256 = "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1144,9 +1157,9 @@ let version = "1.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_reload"; version = "${version}"; - sha256 = "1b5blinpmzdgspgk0dsy01bfjwwnhikb1gfiwnx8smazdrkrcrvn"; + sha256 = "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"; }; beamDeps = [ file_system phoenix ]; @@ -1154,12 +1167,12 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.17.5"; + version = "0.17.14"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "1qxhb1lw68vkz6h7q6ki0502pklfxgsx8sf72j11pxsd7mm6wn65"; + sha256 = "afeb6ba43ce329a6f7fc1c9acdfc6d3039995345f025febb7f409a92f6faebd3"; }; beamDeps = [ jason phoenix phoenix_html telemetry ]; @@ -1167,12 +1180,12 @@ let phoenix_pubsub = buildMix rec { name = "phoenix_pubsub"; - version = "2.1.1"; + version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1180,12 +1193,12 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "1.1.0"; + version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "0gbwv2ffbxh8afsvdd221lhmpcijjjxls9zkzn060jwszl5g30ma"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1193,12 +1206,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.0"; + version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0ms39n5s6kh532s20yxzj7sh0rz5lslh09ibq5j21lkglacny1hv"; + sha256 = "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"; }; beamDeps = [ phoenix_html ]; @@ -1206,12 +1219,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.1"; + version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "1xm6p2r0rmspqax83s6rzqwx5gvbamy8cjwi533l3wy5xwn8wdbc"; + sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1219,12 +1232,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.10.4"; + version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; + sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1232,12 +1245,12 @@ let plug_cowboy = buildMix rec { name = "plug_cowboy"; - version = "2.6.0"; + version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "19jgv5dm53hv5aqgxxzr3fnrpgfll9ics199swp6iriwfl5z4g07"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1245,12 +1258,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.3"; + version = "1.2.5"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "18plj2idhp3f0nmqyjjf2rzj849l3br0797m8ln20p5dqscj0rxm"; + sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; }; beamDeps = []; @@ -1261,9 +1274,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_static_index_html"; version = "${version}"; - sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + sha256 = "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"; }; beamDeps = [ plug ]; @@ -1274,9 +1287,9 @@ let version = "3.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "poison"; version = "${version}"; - sha256 = "1kng8xadrs03i77irxvdk9vfncrqzncmgxc5gc8y8gkknw76dj7y"; + sha256 = "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"; }; beamDeps = []; @@ -1287,9 +1300,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1297,25 +1310,25 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.16.5"; + version = "0.17.1"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd"; + sha256 = "14b057b488e73be2beee508fb1955d8db90d6485c6466428fe9ccf1d6692a555"; }; - beamDeps = [ connection db_connection decimal jason ]; + beamDeps = [ db_connection decimal jason ]; }; pot = buildRebar3 rec { name = "pot"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "pot"; version = "${version}"; - sha256 = "0vgvpiwiy1gm2npfm3qdybwvg39jllw13aig8ll1bn9icnbzb1zd"; + sha256 = "78fe127f5a4f5f919d6ea5a2a671827bd53eb9d37e5b4128c0ad3df99856c2e0"; }; beamDeps = []; @@ -1326,9 +1339,9 @@ let version = "1.7.1"; src = fetchHex { - pkg = "${name}"; + pkg = "prom_ex"; version = "${version}"; - sha256 = "027dlv89wl35wy0lbl7xf7308j42c42ls3ssj8rri4lap1r8i5sc"; + sha256 = "4c978872b88a929833925a0f4d0561824804c671fdd04581e765509ed0a6ed08"; }; beamDeps = [ ecto finch jason oban phoenix phoenix_live_view plug plug_cowboy telemetry telemetry_metrics telemetry_metrics_prometheus_core telemetry_poller ]; @@ -1336,15 +1349,15 @@ let prometheus = buildMix rec { name = "prometheus"; - version = "4.8.0"; + version = "4.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus"; version = "${version}"; - sha256 = "1dgwd8wxw2cifwmsmjvkbgr1n686n125ssm4b0vxngh70dqy3hhg"; + sha256 = "2a99bb6dce85e238c7236fde6b0064f9834dc420ddbd962aac4ea2a3c3d59384"; }; - beamDeps = []; + beamDeps = [ quantile_estimator ]; }; prometheus_ecto = buildMix rec { @@ -1352,9 +1365,9 @@ let version = "1.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_ecto"; version = "${version}"; - sha256 = "10pd5cmm6m62xwlfp7al8yj62zn181rjizc1v9zb64zrfygjhrld"; + sha256 = "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"; }; beamDeps = [ ecto prometheus_ex ]; @@ -1365,9 +1378,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_phoenix"; version = "${version}"; - sha256 = "0xccdidbzffgy2mpy18p017ijcgav2kv47b0v9ixklz9qi541lf4"; + sha256 = "c4d1404ac4e9d3d963da601db2a7d8ea31194f0017057fabf0cfb9bf5a6c8c75"; }; beamDeps = [ phoenix prometheus_ex ]; @@ -1378,22 +1391,35 @@ let version = "1.1.5"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_plugs"; version = "${version}"; - sha256 = "0ybazh6r52vjpf14gjcphsavl3ggk9iapc0rr9wnv4yb7i4acwq2"; + sha256 = "0273a6483ccb936d79ca19b0ab629aef0dba958697c94782bb728b920dfc6a79"; }; beamDeps = [ accept plug prometheus_ex ]; }; + quantile_estimator = buildRebar3 rec { + name = "quantile_estimator"; + version = "0.2.1"; + + src = fetchHex { + pkg = "quantile_estimator"; + version = "${version}"; + sha256 = "282a8a323ca2a845c9e6f787d166348f776c1d4a41ede63046d72d422e3da946"; + }; + + beamDeps = []; + }; + ranch = buildRebar3 rec { name = "ranch"; version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1401,12 +1427,12 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.1"; + version = "2.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "recon"; version = "${version}"; - sha256 = "0j26nin8h3zzypppkdxsjiwgjc8jm8n73b6cikvdh8h1snvcc8ap"; + sha256 = "6c6683f46fd4a1dfd98404b9f78dcabc7fcd8826613a89dcb984727a8c3099d7"; }; beamDeps = []; @@ -1414,12 +1440,12 @@ let sleeplocks = buildRebar3 rec { name = "sleeplocks"; - version = "1.1.1"; + version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "1q823i5bisc83pyssgrqkggyxiasm7b8dygzj2r943adzyp3gvl4"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1427,12 +1453,25 @@ let ssl_verify_fun = buildRebar3 rec { name = "ssl_verify_fun"; - version = "1.1.6"; + version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; + }; + + beamDeps = []; + }; + + statistex = buildMix rec { + name = "statistex"; + version = "1.0.0"; + + src = fetchHex { + pkg = "statistex"; + version = "${version}"; + sha256 = "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"; }; beamDeps = []; @@ -1440,12 +1479,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.2"; + version = "0.7.3"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "1s56f3ak35z2h9gk3g302akhwx7p4lrylichv4s4ai8g2a5fd538"; + sha256 = "e110c867a1b3fe74bfc7dd9893aa851f0eed5518d0d7cad76d7baafd30e4f5ba"; }; beamDeps = []; @@ -1453,12 +1492,12 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.8.2"; + version = "1.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; + sha256 = "8b7167d93047bac6e1a1c367bf7d899cf2e4fea0592ee04a70673548ef6091b9"; }; beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; @@ -1469,9 +1508,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "syslog"; version = "${version}"; - sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + sha256 = "4c6a41373c7e20587be33ef841d3de6f3beba08519809329ecc4d27b15b659e1"; }; beamDeps = []; @@ -1482,9 +1521,9 @@ let version = "3.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "table_rex"; version = "${version}"; - sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; }; beamDeps = []; @@ -1495,9 +1534,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "0yn5mr83hrx0dslsqxmfr5zf0a65hdak6926zd72i85lb7x0kg3k"; + sha256 = "73bc09fa59b4a0284efb4624335583c528e07ec9ae76aca96ea0673850aec57a"; }; beamDeps = []; @@ -1508,9 +1547,9 @@ let version = "0.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; }; beamDeps = [ telemetry ]; @@ -1521,9 +1560,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus_core"; version = "${version}"; - sha256 = "0c5pfm0jbri0x7p6cryif0b0h2iy0jqk4hmljz4kh3pqaq6ilda8"; + sha256 = "48351a0d56f80e38c997b44232b1043e0a081670d16766eee920e6254175b730"; }; beamDeps = [ telemetry telemetry_metrics ]; @@ -1534,9 +1573,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_poller"; version = "${version}"; - sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk"; + sha256 = "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"; }; beamDeps = [ telemetry ]; @@ -1547,9 +1586,9 @@ let version = "1.4.4"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; + sha256 = "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"; }; beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; @@ -1557,12 +1596,12 @@ let timex = buildMix rec { name = "timex"; - version = "3.7.5"; + version = "3.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1r3l50p8f8mxgghh079v1y5g02kzqr15ijbi7mkfzwl0lvf0hmm1"; + sha256 = "0ec4b09f25fe311321f9fc04144a7e3affe48eb29481d7a5583849b6c4dfa0a7"; }; beamDeps = [ combine gettext tzdata ]; @@ -1573,9 +1612,9 @@ let version = "0.0.7"; src = fetchHex { - pkg = "${name}"; + pkg = "trailing_format_plug"; version = "${version}"; - sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + sha256 = "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"; }; beamDeps = [ plug ]; @@ -1586,9 +1625,9 @@ let version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "0nia83zpk0pb4jkpvhkmmgw8i5p6kd6cf776q6aj0pcym6i9llam"; + sha256 = "55519aa2a99e5d2095c1e61cc74c9be69688f8ab75c27da724eb8279ff402a5a"; }; beamDeps = [ hackney ]; @@ -1596,12 +1635,12 @@ let ueberauth = buildMix rec { name = "ueberauth"; - version = "0.6.3"; + version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "0q0vz7vlbw66a32d7yij3p5l4a59bi0sygiynn8na38ll7c97hmg"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1612,9 +1651,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1625,9 +1664,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + sha256 = "6c7729a2d214806450d29766abc2afaa7a2cbecf415be64f36a6691afebb50e5"; }; beamDeps = []; @@ -1638,9 +1677,9 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "web_push_encryption"; version = "${version}"; - sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + sha256 = "4f82b2e57622fb9337559058e8797cb0df7e7c9790793bdc4e40bc895f70e2a2"; }; beamDeps = [ httpoison jose ]; @@ -1651,9 +1690,9 @@ let version = "0.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websockex"; version = "${version}"; - sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm"; + sha256 = "95f2e7072b85a3a4cc385602d42115b73ce0b74a9121d0d6dbbf557645ac53e4"; }; beamDeps = []; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 6ef9287004..93cd01950d 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.6.7557-1cf77d501"; + version = "1.32.7.7621-871adbd44"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0ym2s425084l5lzpw9j1aqw2nc6f4l5vzizvpj1gicf4yp2dyk91"; + sha256 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1jqgglyzlfzq5saa21338vn2v3x25vl24x1w17j5wq30ca7nmzdr"; + sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/plik/programs.nix b/third_party/nixpkgs/pkgs/servers/plik/programs.nix index edb6e11d2c..1ad89b1fb9 100644 --- a/third_party/nixpkgs/pkgs/servers/plik/programs.nix +++ b/third_party/nixpkgs/pkgs/servers/plik/programs.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: let - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "root-gg"; repo = "plik"; rev = version; - hash = "sha256-Agkwo1oat1LDP6EJBVOoq+d+p80BGOLS4K7WTue5Nbg="; + hash = "sha256-WCtfkzlZnyzZDwNDBrW06bUbLYTL2C704Y7aXbiVi5c="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index 197035bc56..fb70c7747e 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.18.6"; + version = "0.19.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-QfipP/nq/vE0TnK/JGLIbO282bFSrnIgGzkfU6N+euY="; + hash = "sha256-5VvjEFiZ7jnjqdagWeP2xrwDKtU9S6rQmsaupDFiK+c="; }; - vendorHash = "sha256-pDLj0Az7aQow1Q+7ANxv5kZQrqBby6gzkfAoV87/k9E="; + vendorHash = "sha256-RGpB8f/1+eWZIAqb4OFUFlxhYRRm1WOh2edHp8KuGF4="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix b/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix index 33ce80cdaa..1c07a56a7e 100644 --- a/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix @@ -1,6 +1,6 @@ { rustPlatform , lib -, fetchurl +, fetchzip , openssl , pkg-config , systemd @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchurl { + src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - sha256 = "sha256-Tru9DsitRQLiO4Ln70J9LvkEqcj2i4A+eArBvIhd/ls="; + hash = "sha256-JetfcA7Pn6nsCxCkgxP4jS6tijx89any/0GrmLa+DR0="; }; - cargoSha256 = "0q3ibxnzw8gngvrgfkv4m64dr411c511xkvb6j9k63vhy9vwarz7"; + cargoSha256 = "sha256-QUr0IHmzbhFNd6rBDEX8RZul/d1TLv0t+ySCQYMlpmE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; diff --git a/third_party/nixpkgs/pkgs/servers/prayer/default.nix b/third_party/nixpkgs/pkgs/servers/prayer/default.nix deleted file mode 100644 index c335358b6d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/prayer/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: - -let - ssl = lib.optionals uwimap.withSSL - "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; -in -stdenv.mkDerivation rec { - pname = "prayer"; - version = "1.3.5"; - - src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz"; - sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; - }; - - patches = [ - ./install.patch - - # fix build errors which result from openssl changes - (fetchpatch { - url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch"; - sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch"; - sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1"; - }) - ]; - - postPatch = '' - sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ - ${ssl} \ - -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ - -e 's,^PREFIX .*,PREFIX='$out, \ - -e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \ - Config - sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ - templates/src/*.pl - sed -i -e '//d' lib/os_linux.h - '' + /* html-tidy updates */ '' - substituteInPlace ./session/html_secure_tidy.c \ - --replace buffio.h tidybuffio.h - ''; - - buildInputs = [ openssl db zlib uwimap html-tidy pam ]; - nativeBuildInputs = [ perl ]; - - NIX_LDFLAGS = "-lpam"; - - meta = { - homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/"; - description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/prayer/install.patch b/third_party/nixpkgs/pkgs/servers/prayer/install.patch deleted file mode 100644 index 439202dd95..0000000000 --- a/third_party/nixpkgs/pkgs/servers/prayer/install.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/accountd/Makefile b/accountd/Makefile -index c3e8107..7946776 100644 ---- a/accountd/Makefile -+++ b/accountd/Makefile -@@ -75,6 +75,6 @@ clean: - -rm -f prayer-accountd test core *.o *~ \#*\# - - install: -- $(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \ -+ $(INSTALL) -m 755 \ - prayer-accountd ${BROOT}${BIN_DIR} - -diff --git a/files/Makefile b/files/Makefile -index 743d0ed..7eff064 100644 ---- a/files/Makefile -+++ b/files/Makefile -@@ -52,20 +52,20 @@ distclean: - - install-cert: - if [ -f certs/prayer.pem ]; then \ -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \ -+ $(INSTALL) \ - -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \ - fi - - install-config: etc/prayer.cf -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -D -m $(PUBLIC_FILE) \ - etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE} - - install-aconfig: -- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -D -m $(PUBLIC_FILE) \ - etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE} - - install-motd: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ -+ $(INSTALL) -m $(PUBLIC_FILE) \ - etc/motd.html ${BROOT}${PREFIX}/etc - - install: -@@ -83,6 +83,6 @@ install: - if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi - - redhat-install-init.d: -- install -D -o root -g root -m 755 \ -+ install -D -m 755 \ - ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer - #chkconfig prayer --level 2345 on -diff --git a/files/install.sh b/files/install.sh -index 8d1d1f4..0804a08 100755 ---- a/files/install.sh -+++ b/files/install.sh -@@ -2,8 +2,6 @@ - # - # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $ - --PATH=/bin:/sbin/:/usr/bin:/usr/sbin -- - error=0 - - if [ "x$PREFIX" = "x" ]; then -@@ -55,24 +53,20 @@ if [ $error != 0 ]; then - exit 1 - fi - --if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then -- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX} --fi -- - if [ ! -d ${PREFIX} ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX} -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX} - fi - - if [ ! -d ${PREFIX}/etc ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc - fi - - if [ ! -d ${PREFIX}/certs ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs -+ ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs - fi - - if [ ! -d ${BIN_DIR} ]; then -- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR} -+ ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR} - fi - - for i in icons static -@@ -83,5 +77,4 @@ do - fi - echo Copying ${i} - (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -) -- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i}) - done -diff --git a/servers/Makefile b/servers/Makefile -index 021aed5..5ccbd08 100644 ---- a/servers/Makefile -+++ b/servers/Makefile -@@ -107,13 +107,13 @@ clean: - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-chroot $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-session $(BROOT)$(BIN_DIR) - - prayer: $(PRAYER_OBJS) prayer_main.o -diff --git a/templates/cam/Makefile b/templates/cam/Makefile -index 9f4122a..396b628 100644 ---- a/templates/cam/Makefile -+++ b/templates/cam/Makefile -@@ -124,7 +124,7 @@ _template_index.c: - $(COMPILE) $(TYPE) $@ $* - - install: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) -diff --git a/templates/old/Makefile b/templates/old/Makefile -index 31016cf..288a64c 100644 ---- a/templates/old/Makefile -+++ b/templates/old/Makefile -@@ -123,7 +123,7 @@ _template_index.c: - $(COMPILE) $(TYPE) $@ $* - - install: -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) - cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) -diff --git a/utils/Makefile b/utils/Makefile -index 9c79916..ef82481 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -72,15 +72,15 @@ clean: - -rm -f $(BIN) core *.o *.flc *~ \#*\# - - install: all -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ -+ $(INSTALL) -m $(PUBLIC_DIR) -d \ - $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-ssl-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-sem-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-db-prune $(BROOT)$(BIN_DIR) -- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ -+ $(INSTALL) -m $(PUBLIC_EXEC) \ - prayer-cyclog $(BROOT)$(BIN_DIR) - - prayer-ssl-prune: $(PRUNE_OBJS) diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index 6ca9bb0640..9e43e30559 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-3dKTYw37kmIq9DG4S5qOtjK1QzZeSSCWKeXsfrXctFs="; - aarch64-linux = "sha256-SWt1XTWlWcxF3pcSkiyIXBKllwmVkJvoxB3NrIAj9KQ="; - x86_64-darwin = "sha256-YC6cH5KHzNVdWaNp4vGoGBM8UzVaiE9WfWj5vL/NZ2w="; - x86_64-linux = "sha256-lSar09oOHr2M3pAbF9JlQhYqyd2GoNmVAGmSjm0ZpOg="; + aarch64-darwin = "sha256-5K18Vd0Ly/2YSmAvTbgiSQR8ifaz9wMs3vI0WFtB90g="; + aarch64-linux = "sha256-QI4+TVW/Zj1sI4yoxTGpzYNPufKnp68fLgDmajzD+6Y="; + x86_64-darwin = "sha256-qofWOMJIen8dI1wDFwNWeYuV9Ett3KvaTLfuK/v2USs="; + x86_64-linux = "sha256-qqAoXPdsjpn6Al5CLcvqfsZe9PRp8Swg1Wiy0w20hHs="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.7.4.3769"; + version = "1.9.4.4039"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix b/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix index 91f24a4292..30ca1318b9 100644 --- a/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ps3netsrv/default.nix @@ -1,31 +1,36 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { +{ lib, stdenv, fetchzip, mbedtls, meson, ninja }: +let + webManModVersion = "1.47.42"; +in +stdenv.mkDerivation rec { pname = "ps3netsrv"; - version = "1.1.0"; + version = "20220813"; - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "dirkvdb"; - repo = "ps3netsrv--"; - rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; - sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY="; - fetchSubmodules = true; + src = fetchzip { + url = "https://github.com/aldostools/webMAN-MOD/releases/download/${webManModVersion}/${pname}_${version}.zip"; + hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; }; - buildPhase = "make CXX=$CXX"; - installPhase = '' - mkdir -p $out/bin - cp ps3netsrv++ $out/bin + sourceRoot = "./source/${pname}"; + + buildInputs = [ + meson + ninja + mbedtls + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Doff64_t=off_t"; + + postInstall = '' + install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT ''; meta = { - description = "C++ implementation of the ps3netsrv server"; - homepage = "https://github.com/dirkvdb/ps3netsrv--"; - license = lib.licenses.mit; + description = "PS3 Net Server (mod by aldostools)"; + homepage = "https://github.com/aldostools/webMAN-MOD/"; + license = lib.licenses.gpl3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ makefu ]; - mainProgram = "ps3netsrv++"; + mainProgram = "ps3netsrv"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix index fe701f7b81..6b62f06621 100644 --- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config +{ lib, stdenv, fetchurl, pkg-config , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus @@ -88,45 +88,47 @@ stdenv.mkDerivation rec { ); mesonFlags = [ - "-Dalsa=${if !libOnly && alsaSupport then "enabled" else "disabled"}" - "-Dasyncns=${if !libOnly then "enabled" else "disabled"}" - "-Davahi=${if zeroconfSupport then "enabled" else "disabled"}" - "-Dbluez5=${if !libOnly && bluetoothSupport then "enabled" else "disabled"}" + (lib.mesonEnable "alsa" (!libOnly && alsaSupport)) + (lib.mesonEnable "asyncns" (!libOnly)) + (lib.mesonEnable "avahi" zeroconfSupport) + (lib.mesonEnable "bluez5" (!libOnly && bluetoothSupport)) # advanced bluetooth audio codecs are provided by gstreamer - "-Dbluez5-gstreamer=${if (!libOnly && bluetoothSupport && advancedBluetoothCodecs) then "enabled" else "disabled"}" - "-Ddatabase=simple" - "-Ddoxygen=false" - "-Delogind=disabled" + (lib.mesonEnable "bluez5-gstreamer" (!libOnly && bluetoothSupport && advancedBluetoothCodecs)) + (lib.mesonOption "database" "simple") + (lib.mesonBool "doxygen" false) + (lib.mesonEnable "elogind" false) # gsettings does not support cross-compilation - "-Dgsettings=${if stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" - "-Dgstreamer=disabled" - "-Dgtk=disabled" - "-Djack=${if jackaudioSupport && !libOnly then "enabled" else "disabled"}" - "-Dlirc=${if remoteControlSupport then "enabled" else "disabled"}" - "-Dopenssl=${if airtunesSupport then "enabled" else "disabled"}" - "-Dorc=disabled" - "-Dsystemd=${if useSystemd && !libOnly then "enabled" else "disabled"}" - "-Dtcpwrap=disabled" - "-Dudev=${if !libOnly && udevSupport then "enabled" else "disabled"}" - "-Dvalgrind=disabled" - "-Dwebrtc-aec=${if !libOnly then "enabled" else "disabled"}" - "-Dx11=${if x11Support then "enabled" else "disabled"}" + (lib.mesonEnable "gsettings" (stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) + (lib.mesonEnable "gstreamer" false) + (lib.mesonEnable "gtk" false) + (lib.mesonEnable "jack" (jackaudioSupport && !libOnly)) + (lib.mesonEnable "lirc" remoteControlSupport) + (lib.mesonEnable "openssl" airtunesSupport) + (lib.mesonEnable "orc" false) + (lib.mesonEnable "systemd" (useSystemd && !libOnly)) + (lib.mesonEnable "tcpwrap" false) + (lib.mesonEnable "udev" (!libOnly && udevSupport)) + (lib.mesonEnable "valgrind" false) + (lib.mesonEnable "webrtc-aec" (!libOnly)) + (lib.mesonEnable "x11" x11Support) - "-Dlocalstatedir=/var" - "-Dsysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" + (lib.mesonOption "localstatedir" "/var") + (lib.mesonOption "sysconfdir" "/etc") + (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc") + (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d") # pulseaudio complains if its binary is moved after installation; # this is needed so that wrapGApp can operate *without* # renaming the unwrapped binaries (see below) "--bindir=${placeholder "out"}/.bin-unwrapped" ] - ++ lib.optional (stdenv.isLinux && useSystemd) "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ++ lib.optionals (stdenv.isLinux && useSystemd) [ + (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user") + ] ++ lib.optionals stdenv.isDarwin [ - "-Ddbus=disabled" - "-Dglib=disabled" - "-Doss-output=disabled" + (lib.mesonEnable "dbus" false) + (lib.mesonEnable "glib" false) + (lib.mesonEnable "oss-output" false) ]; # tests fail on Darwin because of timeouts @@ -143,6 +145,8 @@ stdenv.mkDerivation rec { + '' moveToOutput lib/cmake "$dev" rm -f $out/.bin-unwrapped/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps + + cp config.h $dev/include/pulse ''; preFixup = lib.optionalString (stdenv.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform)) '' diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix index 2338ef9508..c86c97157c 100644 --- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Y08mLq/lpWqwcffPczL+ntS7CWLmOgz9irfbhIKbL5A="; - arm64-linux_hash = "sha256-gswwyq9ZIObwrcs6PABhcN4saF8VDQHLpP2trAnVSck="; - x64-osx_hash = "sha256-MxlUQLXiCg02AMTYsAWrM4l3IfgCRIPoU0cgwT8S98g="; - arm64-osx_hash = "sha256-mZqP5hCJqSBY7BDooa+FGi6cdEey9DqVMV8fhp9/2IM="; + x64-linux_hash = "sha256-SwlEbkhTjlnECK3Z3MYzHOQQvU1byipPM7whPQaJiDk="; + arm64-linux_hash = "sha256-gFlB/GaEXJIFXLG2zf/r6iqa8Uw98bjeAezc5UCXUz4="; + x64-osx_hash = "sha256-2ypOaHGsK4KEZAZzVEZuMRxcn16hINMQDyw92eSKy7g="; + arm64-osx_hash = "sha256-1tO7XYy0AoGOAgO+HkBb6Z2BIsBGDZ59rIy93CT7Fxg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "4.7.5.7809"; + version = "5.1.3.8246"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; @@ -52,6 +52,7 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; + mainProgram = "Radarr"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/readarr/default.nix b/third_party/nixpkgs/pkgs/servers/readarr/default.nix index 74dc9acfc9..e0a66d136d 100644 --- a/third_party/nixpkgs/pkgs/servers/readarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/readarr/default.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-H48WjqRAG7I+IPhCANuJ137IwCXkTa5vrfh5Wm4tOyE="; - arm64-linux_hash = "sha256-lBclZfdYuI/ICgEpnekxNdMB6lvsJfK6Wzf/mMmtafU="; - x64-osx_hash = "sha256-1UUK0xU0WdLMjkbIEWVqpwa74tir9CkTSq63uqq9ygY="; + x64-linux_hash = "sha256-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc="; + arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k="; + x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.6.2232"; + version = "0.3.10.2287"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; @@ -46,6 +46,7 @@ in stdenv.mkDerivation rec { homepage = "https://readarr.com"; license = licenses.gpl3; maintainers = [ maintainers.jocelynthode ]; + mainProgram = "Readarr"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index a66b2bb114..c8f2d80618 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.13"; + version = "23.2.14"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-32/mj1/PeeTrtN9COh/hTL4zFcpLnsS0R2uTGpyMUNk="; + sha256 = "sha256-VvbyVAcNPe1UOEfX+HSY4OaOBS78YZuFgpIYo2s1kXo="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-8HEJm7m5VgCanV+TY7g00uBUTaWsdv1mxpohmyicjlY="; + vendorHash = "sha256-mLMMw48d1FOvIIjDNza0rZSWP55lP1AItR/hT3lYXDg="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' @@ -43,7 +43,6 @@ buildGoModule rec { }; meta = with lib; { - broken = true; description = "Redpanda client"; homepage = "https://redpanda.com/"; license = licenses.bsl11; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/server.nix b/third_party/nixpkgs/pkgs/servers/redpanda/server.nix index fa86b5437c..ec4250820d 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/server.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/server.nix @@ -16,7 +16,7 @@ , p11-kit , pkg-config , procps -, protobuf3_21 +, protobuf_21 , python3 , snappy , src @@ -100,7 +100,7 @@ llvmPackages_14.stdenv.mkDerivation rec { dpdk hdr-histogram p11-kit - protobuf3_21 + protobuf_21 rapidjson seastar snappy @@ -109,6 +109,7 @@ llvmPackages_14.stdenv.mkDerivation rec { ]; meta = with lib; { + broken = true; description = "Kafka-compatible streaming platform."; license = licenses.bsl11; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/servers/roadrunner/default.nix b/third_party/nixpkgs/pkgs/servers/roadrunner/default.nix index b6885bc9ee..25f3434628 100644 --- a/third_party/nixpkgs/pkgs/servers/roadrunner/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roadrunner/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "roadrunner"; - version = "2023.2.2"; + version = "2023.3.4"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; rev = "v${version}"; - hash = "sha256-tkJ7MDFHWps6bCppFJXMFYQl7+i8OhuDVrk1n78rrUc"; + hash = "sha256-khG0T88TR7hg9OO7E9eCGTB3q3c5r94nANSZ1J6vCj0="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-pRZaJ1PBtshhna71V86IJ0VKs0u9wCFG27mghcE/8xY"; + vendorHash = "sha256-UP+a47EALxFTxMl9yxinF4QiifQXAgAZ6ZOt9ebhlDc="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 26dab59538..a7e71c722f 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-XmDM1Q9i+wDEPTNewIqb2vvyvdAlUiVsxACZCLOa2Y8="; + sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/rt/default.nix b/third_party/nixpkgs/pkgs/servers/rt/default.nix index 894da7a652..59933570d7 100644 --- a/third_party/nixpkgs/pkgs/servers/rt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rt"; - version = "5.0.3"; + version = "5.0.5"; src = fetchFromGitHub { repo = pname; rev = "${pname}-${version}"; owner = "bestpractical"; - hash = "sha256-ZitlueLEbV3mGJg0aDrLa5IReJiOVaEf+JicbA9zUS4="; + hash = "sha256-4E6xEk1sIiNBKJT4jD+SNK8Fs+hX8EuTv+jD1U1g6qY="; }; patches = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { GD GDGraph GnuPGInterface - GraphViz + GraphViz2 HTMLFormatExternal HTMLFormatTextWithLinks HTMLFormatTextWithLinksAndTables diff --git a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix index 76295880d4..0dc72f74bb 100644 --- a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bVy3/Ot4cb2Tr+wEDtWD3W2FYlXQVQ6tYC8DDyCiivY="; + sha256 = "sha256-9qP0/PGXRbQzSIsxUoGzbtc2KNg6SKrqGYcg/K6SuKo="; }; - cargoHash = "sha256-lCpp1VM6G36mFCm3u+4trsdFszd8SbUEgK1iIm/LwQ4="; + cargoHash = "sha256-76s3cWAKS6aeIG1ctHU6uCMWHDKsMcf5HWhUWzEuAkI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix index ed8744ef3c..4dfa865722 100644 --- a/third_party/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/third_party/nixpkgs/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.18.6"; + version = "4.19.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-KEyKmUzpich81oCMOQ/LnQDDayGg3BqKdUdLZ8nnFec="; + hash = "sha256-nmPwUF4cYx8dsLepNJpR6SXAJsoDrz/V2BIii7WX05M="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix index 7b7717828e..fbf9f06cff 100644 --- a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; + env = lib.optionalAttrs stdenv.cc.isClang { + # Prevent warning about using a GNU extension from being promoted to an error. + NIX_CFLAGS_COMPILE = "-Wno-error=gnu-folding-constant"; + }; + doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; diff --git a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix index 35fdeed8ce..73eb1fd97f 100644 --- a/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-oJLxdXHn+fEp2ATWdyFRbfM/QebAWiT7cogxIwLrgfs="; + hash = "sha256-j9bN09E4VikDPqvhRULfOjATme5KgVGrdv0rIPdd4Sw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock index 2fc31649d2..ddb34d1095 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/Cargo.lock @@ -457,7 +457,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api" -version = "1.5.1" +version = "1.6.1" dependencies = [ "chrono", "common", @@ -842,11 +842,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -913,9 +914,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -985,9 +986,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -995,9 +996,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -1050,6 +1051,7 @@ dependencies = [ "futures", "hashring", "indicatif", + "io", "itertools 0.11.0", "log", "merge", @@ -1099,12 +1101,17 @@ dependencies = [ [[package]] name = "common" -version = "0.1.0" +version = "0.0.0" dependencies = [ + "ordered-float 3.9.1", "serde", "validator", ] +[[package]] +name = "common-workspace-stub" +version = "0.0.0" + [[package]] name = "config" version = "0.13.3" @@ -2113,7 +2120,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.4", + "spin 0.9.8", "stable_deref_trait", ] @@ -2360,6 +2367,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io" +version = "0.0.0" +dependencies = [ + "atomicwrites", + "bincode", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "io-lifetimes" version = "0.7.5" @@ -2379,9 +2397,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" dependencies = [ "bitflags 1.3.2", "libc", @@ -2893,6 +2911,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memory" +version = "0.0.0" +dependencies = [ + "log", + "memmap2 0.7.1", + "parking_lot", + "serde", +] + [[package]] name = "merge" version = "0.1.0" @@ -3681,7 +3709,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.5.1" +version = "1.6.1" dependencies = [ "actix-cors", "actix-files", @@ -3690,7 +3718,6 @@ dependencies = [ "actix-web-validator", "anyhow", "api", - "atty", "chrono", "clap", "collection", @@ -3703,6 +3730,7 @@ dependencies = [ "futures-util", "itertools 0.11.0", "log", + "memory", "num-traits", "num_cpus", "parking_lot", @@ -4349,9 +4377,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "chrono", "dyn-clone", @@ -4365,9 +4393,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -4448,10 +4476,12 @@ dependencies = [ "futures", "geo", "geohash", + "io", "io-uring", "itertools 0.11.0", "log", "memmap2 0.7.1", + "memory", "num-derive", "num-traits", "num_cpus", @@ -4474,6 +4504,7 @@ dependencies = [ "serde_cbor", "serde_json", "smol_str", + "sparse", "sysinfo", "tar", "tempfile", @@ -4544,9 +4575,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4717,6 +4748,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "sparse" +version = "0.1.0" +dependencies = [ + "common", + "io", + "memmap2 0.7.1", + "memory", + "serde", + "serde_json", + "tempfile", +] + [[package]] name = "spin" version = "0.5.2" @@ -4725,9 +4769,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -4757,8 +4801,10 @@ dependencies = [ "env_logger", "futures", "http", + "io", "itertools 0.11.0", "log", + "memory", "num_cpus", "parking_lot", "proptest", @@ -5281,9 +5327,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f" +checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97" dependencies = [ "tracing-core", "tracing-subscriber", @@ -5292,9 +5338,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7" +checksum = "546e6c86bca7bd67b86437eade85e98b327de24cdb8429c701a98af755034572" dependencies = [ "loom", "once_cell", @@ -5303,9 +5349,9 @@ dependencies = [ [[package]] name = "tracy-client-sys" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819" +checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a" dependencies = [ "cc", ] diff --git a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix index 0055148198..a3aee4fc59 100644 --- a/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/qdrant/default.nix @@ -5,19 +5,20 @@ , stdenv , pkg-config , openssl +, rust-jemalloc-sys , nix-update-script , Security }: rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-CWE3tCeLJjtuFcvnGLdODtx0mvVSl2ULIcxgf3X3SPU="; + sha256 = "sha256-G9nA0F3KKl6mLgcpuMW1uikOyBcBsJ1qd2IlMhW4vhg="; }; cargoLock = { @@ -32,7 +33,10 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + openssl + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix index 9fdcbef3e7..f4d75be434 100644 --- a/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/quickwit/default.nix @@ -4,6 +4,7 @@ , rustPlatform , nix-update-script , protobuf +, rust-jemalloc-sys , Security }: @@ -32,7 +33,9 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/quickwit"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoLock = { lockFile = ./Cargo.lock; diff --git a/third_party/nixpkgs/pkgs/servers/search/sonic-server/default.nix b/third_party/nixpkgs/pkgs/servers/search/sonic-server/default.nix index 7d39d8cc75..81d56fcf03 100644 --- a/third_party/nixpkgs/pkgs/servers/search/sonic-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/sonic-server/default.nix @@ -1,21 +1,25 @@ { lib , rustPlatform , fetchFromGitHub +, nix-update-script +, testers +, sonic-server }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "sonic-server"; - version = "1.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "valeriansaliou"; repo = "sonic"; - rev = "f5302f5c424256648ba0be32b3c5909d846821fe"; - sha256 = "sha256-WebEluXijgJckZQOka2BDPYn7PqzPTsIcV2T380fxW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-V97K4KS46DXje4qKA11O9NEm0s13aTUnM+XW8lGc6fo="; }; - cargoSha256 = "sha256-ObhKGjaIma6fUVUT3xadpy/GPYlnm0nKmRVxFmoePyQ="; + cargoHash = "sha256-vWAFWoscV0swwrBQoa3glKXMRgdGYa+QrPprlVCP1QM="; + # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; nativeBuildInputs = [ @@ -27,21 +31,32 @@ rustPlatform.buildRustPackage { ''; postInstall = '' - mkdir -p $out/etc/ - mkdir -p $out/usr/lib/systemd/system/ - install -Dm444 -t $out/etc/sonic config.cfg - substitute \ - ./examples/config/systemd.service $out/usr/lib/systemd/system/sonic-server.service \ - --replace /bin/sonic $out/bin/sonic \ + install -Dm444 -t $out/lib/systemd/system debian/sonic.service + + substituteInPlace \ + $out/lib/systemd/system/sonic.service \ + --replace /usr/bin/sonic $out/bin/sonic \ --replace /etc/sonic.cfg $out/etc/sonic/config.cfg ''; + passthru = { + tests = { + version = testers.testVersion { + command = "sonic --version"; + package = sonic-server; + }; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Fast, lightweight and schema-less search backend"; homepage = "https://github.com/valeriansaliou/sonic"; + changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ pleshevskiy ]; + mainProgram = "sonic"; + maintainers = with maintainers; [ pleshevskiy anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix index d195d6511a..f63805cd36 100644 --- a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.21.1"; + version = "1.21.7"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-rWoVuWzfRJhhYDwOBcmSIJXh0WwvZFYM2GPOMvP98xM="; + hash = "sha256-fhBjKmWtbivntgBFmxfG4bQNUvCdP5uWtysOvsSqFuw="; }; - vendorHash = "sha256-HUfkwmAIwTPDZsgRLte7tu/0QKT82WriTqJ14iiKKOs="; + vendorHash = "sha256-/ylYXwgJKtkAIvYgSsl8MzBxuxp0Nco3ZR4ZBdmmS+w="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix index b9316756b1..a5b17b9825 100644 --- a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.4.7"; + version = "0.4.9"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zincsearch"; rev = "v${version}"; - hash = "sha256-6ZwEH9Xm+iIZ0SDa8qb82lIN3KU6DMe2wt0q9doKgkE="; + hash = "sha256-NIrLhbtpk1mFbWRFPxkH1r4mBiwT488MYBjRgIV7igE="; }; webui = buildNpmPackage { @@ -40,7 +40,7 @@ buildGoModule rec { cp -r ${webui}/share/zinc-ui web/dist ''; - vendorHash = "sha256-/uZh50ImKWW7vYMfRqTbTAMUoRTZ9jXMbc3K16wYJkE="; + vendorHash = "sha256-kP7QlES7VpZrOS4TGOFB9qciXGBEUVqzVLhz+2KiK98="; subPackages = [ "cmd/zincsearch" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix index f7d1fd77b0..7ca94e4e40 100644 --- a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-AmTJfjLpnPHtPMKP9djKTZozNPkojPqRJ3eoypY53bA="; + hash = "sha256-OFj9lYwI42zEcyUtsAwnkNUAaa6J4Ids4pMXquUcpJA="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix b/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix index a43af617bb..7e034c17f5 100644 --- a/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shairport-sync/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; rev = "refs/tags/${version}"; - hash = "sha256-Yj0SKMKACj2B/ADPkUzO4EvaYZX39erKmjaTsr5UN0s="; + hash = "sha256-M7bJO8KVxP2H27aB0qJcsaN9uHADWeOYPdNo8Xfg9gc="; }; nativeBuildInputs = [ @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { # To achieve this, we coerce the output to a string to prevent # mkDerivation's splicing logic from kicking in. "${glib.dev}" + ] ++ optional enableAirplay2 [ + unixtools.xxd ]; makeFlags = [ @@ -83,7 +85,6 @@ stdenv.mkDerivation rec { libgcrypt libuuid ffmpeg - unixtools.xxd ] ++ optional stdenv.isLinux glib; @@ -116,11 +117,12 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { homepage = "https://github.com/mikebrady/shairport-sync"; description = "Airtunes server and emulator with multi-room capabilities"; - license = licenses.mit; - maintainers = with maintainers; [ lnl7 jordanisaacs ]; - platforms = platforms.unix; + license = lib.licenses.mit; + mainProgram = "shairport-sync"; + maintainers = with lib.maintainers; [ lnl7 jordanisaacs ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index 2e723c9b3e..e75dc72a13 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.0"; + version = "3.30.4"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Y9FXaDODeuMaXeqmfBCd96JgwrqDe5k6RCtGKvTOMKw="; + hash = "sha256-me52Ji+IWPN6IEDWsAlIoGPS45uA22+dxHJjqnYPniE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index 499bef7e23..55721a38cd 100644 --- a/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -1,12 +1,28 @@ -{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook -, ncurses, gnutls, readline -, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid -, ldns, libedit, yasm, which, libsndfile, libtiff, libxcrypt - +{ fetchFromGitHub +, fetchpatch +, stdenv +, lib +, pkg-config +, autoreconfHook +, ncurses +, gnutls +, readline +, openssl +, perl +, sqlite +, libjpeg +, speex +, pcre +, libuuid +, ldns +, libedit +, yasm +, which +, libsndfile +, libtiff +, libxcrypt , callPackage - , SystemConfiguration - , modules ? null , nixosTests }: @@ -110,6 +126,20 @@ stdenv.mkDerivation rec { done ''; + ## TODO Validate with the next upstream release + patches = [ + (fetchpatch { + name = "CVE-2023-44488.patch"; + url = "https://github.com/signalwire/freeswitch/commit/f1fb05214e4f427dcf922f531431ab649cf0622b.patch"; + hash = "sha256-6GMebE6O2EBx60NE2LSRVljaiLm9T4zTrkIpwGvaB08="; + }) + (fetchpatch { + name = "CVE-2023-5217.patch"; + url = "https://github.com/signalwire/freeswitch/commit/6f9e72c585265d8def8a613b36cd4f524c201980.patch"; + hash = "sha256-l64mBpyq/TzRM78n73kbuD0UNsk5zIH5QNJlMKdPfr4="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix b/third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix index c4677e37f1..2db991ceac 100644 --- a/third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sip/kamailio/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "kamailio"; - version = "5.7.1"; + version = "5.7.2"; meta = { description = "Fast and flexible SIP server, proxy, SBC, and load balancer"; @@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: { }; src = fetchurl { - url = "https://www.kamailio.org/pub/kamailio/5.7.1/src/kamailio-${finalAttrs.version}_src.tar.gz"; - hash = "sha256-TkrAj5ohwzJ959UvXNwaMmcIwTRowUitP9/UNQ8D1zw="; + url = "https://www.kamailio.org/pub/kamailio/5.7.2/src/kamailio-${finalAttrs.version}_src.tar.gz"; + hash = "sha256-csmgZ9qNb6kg03N9mM1/ZsMh+Ay+EHbi1aOStCJQMSI="; }; buildInputs = with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/sks/default.nix b/third_party/nixpkgs/pkgs/servers/sks/default.nix index 2ace06edc9..b40f76b266 100644 --- a/third_party/nixpkgs/pkgs/servers/sks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sks/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/snac2/default.nix b/third_party/nixpkgs/pkgs/servers/snac2/default.nix index b13b6c2b9f..49c2c27890 100644 --- a/third_party/nixpkgs/pkgs/servers/snac2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.41"; + version = "2.42"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-WVbGORth3paDo1eK/J7MPUstVQifcU7ksVEb87vknN0="; + hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E="; }; buildInputs = [ curl openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index ae37dab2e9..197e9b48d1 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.28.4"; + version = "2.29.1"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-tXP7jxpqBASNShNe9rHiewSgdW/KgkH80V24VgJlXZE="; + sha256 = "sha256-ZE17VCrpHlZ4GMc7+DaUyuehKtYWMr7NJFV1hGQ+UsA="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix index a3f35d3288..5def527fd0 100644 --- a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, git }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, git, bash }: buildGoModule rec { pname = "soft-serve"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-Xst/eNam3HuHixEmPUl2J7B7cLYaeGVaUnzXIVugBbw="; + hash = "sha256-PY/BHfuDRHXpzyUawzZhDr1m0c1tWqawW7GP9muhYAs="; }; - vendorHash = "sha256-tzJu2DmbvPU1tPIWP88q66PBtC1XEduQac8cIxwb/sM="; + vendorHash = "sha256-jtEiikjEOThTSrd+UIEInxQmt2z5YVyksuTC17VmdkA="; doCheck = false; @@ -20,10 +20,14 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' + # Soft-serve generates git-hooks at run-time. + # The scripts require git and bash inside the path. wrapProgram $out/bin/soft \ - --prefix PATH : "${lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git bash ]}" ''; + passthru.tests = nixosTests.soft-serve; + meta = with lib; { description = "A tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix index ac5ae80cdc..716a386c4f 100644 --- a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://sonarr.tv/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fadenb purcell ]; + mainProgram = "NzbDrone"; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sozu/default.nix b/third_party/nixpkgs/pkgs/servers/sozu/default.nix index beb544de0b..63f94093a8 100644 --- a/third_party/nixpkgs/pkgs/servers/sozu/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.5"; + version = "0.15.15"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-EKp+BR1x98BFDl4d6cCwBlldF6NT66SfrchNvyasI0s="; + hash = "sha256-zxGP2SWrq8beb+mJpgB39T7B1HpE76YP6se01vMewuw="; }; - cargoHash = "sha256-8uiMQPXhZyk3YteTQfxzFIt9xlJzvogUy+WqsHBzmhk="; + cargoHash = "sha256-KqCDOWCMRYpBMsESTdhMEgTu6qAxcg4RHe252JBggqs="; nativeBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix index cc38536247..d0d4aba42a 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "zed"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-+u8qrF/P8a19Bc085upT65xVPGIVR3My/k/enhdUJmQ="; + hash = "sha256-+YgGxqnHkdPbRbQj5o1+Hx259Ih07x0sdt6AHoD1UvI="; }; vendorHash = "sha256-f0UNUOi0WXm06dko+7O00C0dla/JlfGlXaZ00TMX0WU="; diff --git a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix index 88a5accaff..2e66ce3c64 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix @@ -6,7 +6,7 @@ let version = "23.1.7"; - name = "cockroachdb"; + pname = "cockroachdb"; # For several reasons building cockroach from source has become # nearly impossible. See https://github.com/NixOS/nixpkgs/pull/152626 @@ -28,7 +28,7 @@ let in buildFHSEnv { - inherit name; + inherit pname version; runScript = "${src}/cockroach"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index e2ddc06729..7500c0ca4f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.15.0"; + version = "1.21.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-+pUlnL8Ie/+of/kEv7d3gqF3d0HaYjWgZf0ycNQcaC0="; + sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-e90yn7vZo15BrP91PrFGMogNNy3VAP8rew4cjVa6puM="; + vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M="; proxyVendor = true; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 09c9bfaa3c..668f5190be 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.5"; + version = "11.47.11"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-GuGGs3hAheNYsaiUG7femLhi38c4gB528bruRotOdNE="; + hash = "sha256-ZYogc8KjFYbmS7OlL2ufGxdnMAYOYeUFk8AVe7rDer0="; }; nativeBuildInputs = [ bison cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix index efa3089e47..a4a6e869f9 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.4.1"; + version = "12.4.2"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-Ci59MLU50Dl+rmUstX7c/BdAJJ/GCCYLqcyrxGr2g7E="; + sha256 = "sha256-JGt6SXg4Ok+czMwGpDk9xdVw/WSkNLeBxqghcM3WmRE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index 4eec452d0f..e136f02757 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.34"; + version = "8.0.35"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix index 69a7893ed7..5b048cdddd 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, ant, unzip }: +{ lib, stdenv, fetchurl, ant, unzip, gitUpdater }: stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - sha256 = "sha256-xFYvNbb5cj6xrMHAnTzGLC8v5fxqRcmZhf4haK3wtUk="; + hash = "sha256-N0emBuTaYlyL1SS0wDOR8uiz4yGUOMllKR7LC60eFEg="; }; installPhase = '' @@ -18,11 +18,17 @@ stdenv.mkDerivation rec { buildInputs = [ ant ]; + passthru.updateScript = gitUpdater { + url = "https://github.com/mysql/mysql-connector-j.git"; + }; + meta = with lib; { description = "MySQL Connector/J"; - homepage = "https://dev.mysql.com/doc/connector-j/8.1/en/"; + homepage = "https://dev.mysql.com/doc/connector-j/en/"; + changelog = "https://dev.mysql.com/doc/relnotes/connector-j/en/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix new file mode 100644 index 0000000000..02660eb187 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/8.0.x.nix @@ -0,0 +1,96 @@ +{ lib, stdenv, fetchurl, bison, cmake, pkg-config +, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 +, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests +# Percona-specific deps +, coreutils, cyrus_sasl, gnumake, openldap +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server"; + version = "8.0.34-26"; + + src = fetchurl { + url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-xOaXfnh/lg/TutanwGt+EmxG4UA8oTPdil2nvU3NZXQ="; + }; + + nativeBuildInputs = [ bison cmake pkg-config ] + ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = [ + boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + zstd libfido2 openldap perl cyrus_sasl + ] ++ lib.optionals stdenv.isLinux [ + numactl libtirpc + ] ++ lib.optionals stdenv.isDarwin [ + cctools CoreServices developer_cmds DarwinTools + ]; + + outputs = [ "out" "static" ]; + + cmakeFlags = [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + postInstall = '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_8_0; + }; + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + ''; + license = licenses.gpl2; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/no-force-outline-atomics.patch b/third_party/nixpkgs/pkgs/servers/sql/percona-server/no-force-outline-atomics.patch new file mode 100644 index 0000000000..a716a4f7f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/no-force-outline-atomics.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 727d66011f9..acae1aada57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG + ENDIF() + ENDIF() + +-# For aarch64 some sub-architectures support LSE atomics and some don't. Thus, +-# compiling for the common denominator (-march=armv8-a) means LSE is not used. +-# The -moutline-atomics switch enables run-time detection of LSE support. +-# There are compilers (gcc 9.3.1 for example) which support this switch, but +-# do not enable it by default, even though it seems to help. So, we force it. +-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS) +- IF(HAVE_OUTLINE_ATOMICS) +- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics") +- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics") +- ENDIF() +-ENDIF() +- + IF(LINUX) + OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF) + SET(LINK_RANDOMIZE_SEED "mysql" diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index b0f2bcb616..dd47de9075 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-JJks9VfXNCbXBIaY3/x7AZ5jZNTYdXriz14kcShqIIg="; + hash = "sha256-fh3WIMjYWoSQr/JQYdUFXXrvnPPov+LZ53GbjuWRFOI="; }; nativeBuildInputs = [ pkg-config ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.pgbouncer.org/"; + mainProgram = "pgbouncer"; description = "Lightweight connection pooler for PostgreSQL"; changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${replaceStrings ["."] ["_"] version}"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index a94712556a..ec2f95f5bd 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -17,7 +17,7 @@ let , version, hash, psqlSchema # for tests - , nixosTests, thisAttr + , testers, nixosTests, thisAttr # JIT , jitSupport ? false @@ -34,10 +34,11 @@ let lz4Enabled = atLeast "14"; zstdEnabled = atLeast "15"; - stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; - in stdenv'.mkDerivation rec { pname = "postgresql"; - inherit version; + + stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; + in stdenv'.mkDerivation (finalAttrs: { + inherit pname version; src = fetchurl { url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; @@ -110,23 +111,50 @@ let locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; }) - ] ++ lib.optionals (stdenv'.hostPlatform.isMusl && atLeast "12") [ - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-Yb6lMBDqeVP/BLMyIr5rmR6OkaVzo68cV/+cL2LOe/M="; - }) - ] ++ lib.optionals (stdenv'.hostPlatform.isMusl && atLeast "13") [ - (if olderThan "14" then - fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; - hash = "sha256-IOOx7/laDYhTz1Q1r6H1FSZBsHCgD4lHvia+/os7CCo="; - } - else - fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; - hash = "sha256-pnl+wM3/IUyq5iJzk+h278MDA9R0GQXQX8d4wJcB2z4="; - }) - ] ++ lib.optionals stdenv'.isLinux [ + ] ++ lib.optionals stdenv'.hostPlatform.isMusl ( + let + self = { + "12" = { + icu-collations-hack = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + }; + "13" = { + inherit (self."14") icu-collations-hack; + disable-test-collate-icu-utf8 = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; + hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y="; + }; + }; + "14" = { + icu-collations-hack = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg="; + }; + disable-test-collate-icu-utf8 = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; + hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM="; + }; + }; + "15" = { + icu-collations-hack = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; + hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I="; + }; + }; + "16" = { + icu-collations-hack = fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e"; + hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0="; + }; + }; + }; + + patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}"); + in + lib.attrValues patchesForVersion + ) ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) ]; @@ -230,6 +258,8 @@ let withJIT = if jitSupport then this else jitToggle; withoutJIT = if jitSupport then jitToggle else this; + dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; + pkgs = let scope = { postgresql = this; @@ -254,6 +284,7 @@ let tests = { postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; } // lib.optionalAttrs jitSupport { postgresql-jit = nixosTests.postgresql-jit.${thisAttr}; }; @@ -265,7 +296,9 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; + pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ]; platforms = platforms.unix; # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode @@ -280,7 +313,7 @@ let # a query, postgres would coredump with `Illegal instruction`. broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform); }; - }; + }); postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { name = "postgresql-and-plugins-${postgresql.version}"; @@ -312,57 +345,46 @@ let }; mkPackages = self: { - # TODO: remove ahead of 23.11 branchoff - # "PostgreSQL 11 will stop receiving fixes on November 9, 2023" - postgresql_11 = self.callPackage generic { - version = "11.21"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-B7CDdHHV3XeyUWazRxjzuhCBa2rWHmkeb8VHzz/P+FA="; - this = self.postgresql_11; - thisAttr = "postgresql_11"; - inherit self; - }; - postgresql_12 = self.callPackage generic { - version = "12.16"; + version = "12.17"; psqlSchema = "12"; - hash = "sha256-xfH/96D5Ph7DdGQXsFlCkOzmF7SZXtlbjVJ68LoOOPM="; + hash = "sha256-k+jhsjmB1fA8bFdj93soGEwc5NtxlPpGbi7bZdnBxfY="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.12"; + version = "13.13"; psqlSchema = "13"; - hash = "sha256-DaHtzuNRS3vHum268MAEmeisFZBmjoeJxQJTpiSfIYs="; + hash = "sha256-ivacJZkEeirSRlZ9aOxBMa7xFpVNjD5GnpeJCAs3pHQ="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.9"; + version = "14.10"; psqlSchema = "14"; - hash = "sha256-sf47qbGn86ljfdFlbf2tKIkBYHP9TTXxO1AUPLu2qO8="; + hash = "sha256-yZQxxI6dRwsNCrlG6yFBo80ZEwwvtNxLMoSnd07Mg5k="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.4"; + version = "15.5"; psqlSchema = "15"; - hash = "sha256-uuxaS9xENzNmU7bLXZ7Ym+W9XAxYuU4L7O4KmZ5jyPk="; + hash = "sha256-j1OqldeOuOglNupGtoGHeTtCu6O09lqjQvVAsjybEKY="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; }; postgresql_16 = self.callPackage generic { - version = "16.0"; + version = "16.1"; psqlSchema = "16"; - hash = "sha256-356CPrIjMEROHUjlLMZRNaZSpv2zzjJePwhUkzn1G5k="; + hash = "sha256-zjxNhdGbASH+DT+O8fpgH3GYnob4pm99w61UbdVWT+w="; this = self.postgresql_16; thisAttr = "postgresql_16"; inherit self; 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 c0de0c30d5..3a1c1c8388 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix @@ -6,7 +6,6 @@ let "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; - "11" = "sha256-ZkNAIMO69BxF3knQ+jcUBVuDgcoZXZccF5O+acpZ81M="; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix new file mode 100644 index 0000000000..62f2e9263e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "hypopg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "HypoPG"; + repo = "hypopg"; + rev = version; + hash = "sha256-YzQnkQi9BlDryUySnWHWeTanhgfVUXjHjOqj+nQucCY="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension *.control + install -D -t $out/share/postgresql/extension *.sql + ''; + + meta = with lib; { + description = "Hypothetical Indexes for PostgreSQL"; + homepage = "https://hypopg.readthedocs.io"; + license = licenses.postgresql; + platforms = postgresql.meta.platforms; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index cf0ba46d87..092212aa3d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp *.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/periods.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/periods.nix index 9a390e258d..102f80cf8d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/periods.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ postgresql ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index cb9aa5e57d..dcd23a0949 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,25 +1,32 @@ -{ lib, stdenv, fetchurl, postgresql }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }: stdenv.mkDerivation rec { pname = "pg_bigm"; version = "1.2-20200228"; - src = fetchurl { - url = "mirror://osdn/pgbigm/72448/${pname}-${version}.tar.gz"; - sha256 = "1hxn90prldwriqmqlf33ypgbxw5v54gkzx1305yzghryzfg7rhbl"; + src = fetchFromGitHub { + owner = "pgbigm"; + repo = "pg_bigm"; + rev = "v${version}"; + hash = "sha256-3lspEglVWzEUTiRIWqW0DpQe8gDn9R/RxsWuI9znYc8="; }; + patches = [ + # Fix compatiblity with PostgreSQL 16. Remove with the next release. + (fetchpatch { + url = "https://github.com/pgbigm/pg_bigm/commit/2a9d783c52a1d7a2eb414da6f091f6035da76edf.patch"; + hash = "sha256-LuMpSUPnT8cPChQfA9sJEKP4aGpsbN5crfTKLnDzMN8="; + }) + ]; + buildInputs = [ postgresql ]; makeFlags = [ "USE_PGXS=1" ]; installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension + install -D -t $out/lib pg_bigm${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control ''; meta = with lib; { 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 450f5b06e2..02c6e6435a 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.0"; + version = "1.6.2"; buildInputs = [ postgresql ]; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - hash = "sha256-s1wjBx84Z12fRlaT1y3CPEFHK8tzMKp7wF+t7suRNL4="; + hash = "sha256-/dD1gX0+RRsBFIjSV9TVk+ppPw0Jrzssl+rRZ2qAp4w="; }; installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp *.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix new file mode 100644 index 0000000000..a39dcd5372 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_embedding"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "neondatabase"; + repo = pname; + rev = version; + hash = "sha256-NTBxsQB8mR7e/CWwkCEyDiYhi3Nxl/aKgRBwqc0THcI="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search"; + homepage = "https://github.com/neondatabase/pg_embedding"; + maintainers = with maintainers; [ ivan ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + broken = versionOlder postgresql.version "12"; + }; +} 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 f710c5c3d3..afc5b9fe65 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 @@ -22,10 +22,6 @@ let version = "1.3.9"; hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; }; - "11" = { - version = "1.3.9"; - hash = "sha256-8t/HhB/2Kjx4xMItmmKv3g9gba5VCBHdplYtYD/3UhA="; - }; }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in stdenv.mkDerivation { @@ -47,7 +43,7 @@ stdenv.mkDerivation { buildInputs = [ postgresql ]; installPhase = '' - install -D -t $out/lib pg_hint_plan.so + install -D -t $out/lib pg_hint_plan${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 71533645ef..a60601aef5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_hll"; - version = "2.17"; + version = "2.18"; buildInputs = [ postgresql ]; @@ -10,21 +10,19 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-hll"; rev = "refs/tags/v${version}"; - sha256 = "sha256-KYpyidy7t7v9puNjjmif16uz383zlo521luZpH3w/1I="; + hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; + install -D -t $out/lib hll${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; meta = with lib; { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; - changelog = "https://github.com/citusdata/postgresql-hll/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; 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 61f9a89704..2b2cf18595 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,19 +2,19 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-MAZsEPQu1AqI53h01M5bErc/MUJRauNPO9Hizig+2dc="; + hash = "sha256-uSYhNUfd4mw7mGGAcP43X/0v/bNp6SdZjPzktGONgaQ="; }; buildInputs = [ postgresql ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib pg_ivm${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; homepage = "https://github.com/sraoss/pg_ivm"; + changelog = "https://github.com/sraoss/pg_ivm/releases/tag/v${version}"; maintainers = with maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_net.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_net.nix index fc52857de1..3cfcafad74 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_net"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ curl postgresql ]; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { owner = "supabase"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9Ki3fyinHTYrfckxAY0fCTlzJd9l+n7QRUV7mIWrqmc="; + hash = "sha256-j5qLgn/i4ljysuwgT46579N+9VpGr483vQEX/3lUYFA="; }; installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp sql/*.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension ''; @@ -24,8 +24,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; + changelog = "https://github.com/supabase/pg_net/releases/tag/v${version}"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionOlder postgresql.version "12"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix index b288a27baf..e008993fcf 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.7.4"; + version = "5.0.0"; buildInputs = [ postgresql ]; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DdE/hqCrju678Xk3xXGVFhKQM3x9skQQKolNJ2/3gbs="; + sha256 = "sha256-T7+cPi8LIftWVwI9mi0LAwWCTxp/r6iyKT1wKO/Ztbk="; }; installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} - cp src/*.so $out/lib + cp src/*${postgresql.dlSuffix} $out/lib cp updates/* $out/share/postgresql/extension cp -r sql/* $out/share/postgresql/extension cp *.control $out/share/postgresql/extension @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; - changelog = "https://github.com/pgpartman/pg_partman/raw/v${version}/CHANGELOG.txt"; + changelog = "https://github.com/pgpartman/pg_partman/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; + broken = versionOlder postgresql.version "14"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_rational.nix index 5cfd624099..df80ea49a5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{lib,share/postgresql/extension} - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp *.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index 043adf7250..1fe9fd3cac 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix index dd1c745bc8..fd07b4e105 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack.so -t $out/lib/ + install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension ''; 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 5e9976c014..06b8ce6909 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 @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 - install -D safeupdate.so -t $out/lib + install -D safeupdate${postgresql.dlSuffix} -t $out/lib ''; meta = with lib; { 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 a4a8e6b0fe..227ea83578 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 @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ postgresql gcc ]; buildPhase = "USE_PGXS=1 make"; installPhase = '' - install -D pg_similarity.so -t $out/lib/ + install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension ''; 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 ec236b4d91..2a11417c90 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.5.0"; + version = "2.6.0"; buildInputs = [ postgresql ]; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "sha256-BqOPnIReV6HnMQkqAGxB3PI10gh9ZEn4IN3A+g1h7/M="; + sha256 = "sha256-kq3P+a9NWLKN/CsISGHfInbeL4ex4KIeDhTKyyN7FVE="; }; installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp *.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix new file mode 100644 index 0000000000..6daa5e0cf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "pg_uuidv7"; + version = "1.3.0"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "fboulnois"; + repo = "pg_uuidv7"; + rev = "v${version}"; + hash = "sha256-kHxS9tL7fpKhjJ8Xx5tee1fv10zVcTt2FgUQSaRdNZo="; + }; + + installPhase = '' + install -D -t $out/lib pg_uuidv7${postgresql.dlSuffix} + install -D {sql/pg_uuidv7--${lib.versions.majorMinor version}.sql,pg_uuidv7.control} -t $out/share/postgresql/extension + ''; + + meta = with lib; { + description = "A tiny Postgres extension to create version 7 UUIDs"; + homepage = "https://github.com/fboulnois/pg_uuidv7"; + changelog = "https://github.com/fboulnois/pg_uuidv7/blob/main/CHANGELOG.md"; + maintainers = with maintainers; [ gaelreyrol ]; + platforms = postgresql.meta.platforms; + license = licenses.mpl20; + broken = versionOlder postgresql.version "13"; + }; +} 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 c5e536363f..f4c03d611f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,14 +1,38 @@ { lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: -stdenv.mkDerivation rec { +let + source = { + "16" = { + version = "16.0"; + hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc="; + }; + "15" = { + version = "1.7.0"; + hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + }; + "14" = { + version = "1.6.2"; + hash = "sha256-Bl7Jk2B0deZUDiI391vk4nilwuVGHd1wuaQRSCoA3Mk="; + }; + "13" = { + version = "1.5.2"; + hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; + }; + "12" = { + version = "1.4.3"; + hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4="; + }; + }.${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); +in +stdenv.mkDerivation { pname = "pgaudit"; - version = "1.7.0"; + inherit (source) version; src = fetchFromGitHub { owner = "pgaudit"; repo = "pgaudit"; - rev = version; - hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + rev = source.version; + hash = source.hash; }; buildInputs = [ libkrb5 openssl postgresql ]; @@ -16,7 +40,7 @@ stdenv.mkDerivation rec { makeFlags = [ "USE_PGXS=1" ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib pgaudit${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; @@ -24,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; + changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}"; maintainers = with maintainers; [ idontgetoutmuch ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; 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 b847de1f3a..535a16abad 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D pgroonga.so -t $out/lib/ + install -D pgroonga${postgresql.dlSuffix} -t $out/lib/ install -D pgroonga.control -t $out/share/postgresql/extension install -D data/pgroonga-*.sql -t $out/share/postgresql/extension - install -D pgroonga_database.so -t $out/lib/ + install -D pgroonga_database${postgresql.dlSuffix} -t $out/lib/ install -D pgroonga_database.control -t $out/share/postgresql/extension install -D data/pgroonga_database-*.sql -t $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 03b229e81b..51cef6b3f4 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.5.0"; + version = "3.5.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6ckNKfun2A4WARhN6/hxPWAi8o+qGlrdYSDVQC9sKR0="; + sha256 = "sha256-X7ZXGPUkhPDBB2QpUGfqDTgOairkYZF78Ol0XEAmxD8="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index a0ef596aad..f2fc5a329f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl postgresql ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix index 24c0e3e59b..3e8ba36994 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgtap"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "theory"; repo = "pgtap"; rev = "v${version}"; - sha256 = "sha256-RaafUnrMRbvyf2m2Z+tK6XxVXDGnaOkYkSMxIJLnf6A="; + sha256 = "sha256-HOgCb1CCfsfbMbMMWuzFJ4B8CfVm9b0sI2zBY3/kqyI="; }; nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index d709f822fb..26b330b3b5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - hash = "sha256-7GRqGgU15VQAY0wvZqfPU9og7s+/0NlOpTMclXPVwlQ="; + hash = "sha256-ZNzq+dATZn9LUgeOczsaadr5hwdbt9y/+sAOPIdr77U="; }; buildInputs = [ postgresql ]; installPhase = '' - install -D -t $out/lib vector.so + install -D -t $out/lib vector${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension sql/vector-*.sql install -D -t $out/share/postgresql/extension vector.control ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix deleted file mode 100644 index 6403138fd7..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }: - -stdenv.mkDerivation rec { - pname = "pipelinedb"; - version = "1.0.0-13"; - - src = fetchFromGitHub { - owner = "pipelinedb"; - repo = pname; - rev = version; - sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; - }; - - buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ]; - - makeFlags = [ "USE_PGXS=1" ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium"; - - preConfigure = '' - substituteInPlace Makefile \ - --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" - ''; - - installPhase = '' - mkdir -p $out/bin - install -D -t $out/lib/ pipelinedb.so - install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control} - ''; - - meta = with lib; { - description = "High-performance time-series aggregation for PostgreSQL"; - homepage = "https://www.pipelinedb.com/"; - license = licenses.asl20; - platforms = postgresql.meta.platforms; - maintainers = [ maintainers.marsam ]; - broken = versions.major postgresql.version != "11"; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index abbb1ac4d3..61836a4573 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-4J4uKcQ/jRKKgrpUUed9MXDmOJaYKYDzznt1DItr6T0="; + hash = "sha256-mC8cDLfTu/gpMjNfXGCAV8EhE+kMq2MofzibIWijX3w="; }; buildInputs = [ postgresql ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; 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 7dcb3c0c46..1800b42471 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export USE_PGXS=1 ''; installPhase = '' - install -D plr.so -t $out/lib/ + install -D plr${postgresql.dlSuffix} -t $out/lib/ install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension ''; 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 61e7ee9fc9..93f6076715 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib,share/postgresql/extension} cp repmgr{,d} $out/bin - cp *.so $out/lib + cp *${postgresql.dlSuffix} $out/lib cp *.sql $out/share/postgresql/extension cp *.control $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix index 8edd9a2fb4..0fb6635529 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/rum.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "USE_PGXS=1" ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.control install -D -t $out/share/postgresql/extension *.sql ''; 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 49c3ee044b..7eec155435 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 @@ -1,26 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, freetds }: +{ lib, stdenv, fetchFromGitHub, postgresql, freetds, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2021-12-14"; + version = "unstable-2023-09-28"; buildInputs = [ postgresql freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; - repo = pname; - rev = "1611a2805f85d84f463ae50c4e0765cb9bed72dc"; - sha256 = "sha256-SYHo/o9fJjB1yzN4vLJB0RrF3HEJ4MzmEO44/Jih/20="; + repo = "tds_fdw"; + rev = "22ee5d3f46909b35efb2600b44ec19a35179630e"; + hash = "sha256-MmaLN1OWUJMWJhPUXBevSyBmMgZqeEFPGuxuLPSp4Pk="; }; installPhase = '' version="$(sed -En "s,^default_version *= *'([^']*)'.*,\1,p" tds_fdw.control)" - install -D tds_fdw.so -t $out/lib + install -D tds_fdw${postgresql.dlSuffix} -t $out/lib install -D sql/tds_fdw.sql "$out/share/postgresql/extension/tds_fdw--$version.sql" install -D tds_fdw.control -t $out/share/postgresql/extension ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index ec654c4a09..cb401829b2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -2,28 +2,26 @@ stdenv.mkDerivation rec { pname = "temporal_tables"; - version = "unstable-2021-02-20"; + version = "1.2.2"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "arkhipov"; - repo = pname; - rev = "3ce22da51f2549e8f8b8fbf2850c63eb3a2f1fbb"; - sha256 = "sha256-kmcl6vVHRZj2G5GijEyaZgDpZBDcdIUKzXv0rYYqUu4="; + repo = "temporal_tables"; + rev = "v${version}"; + sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; + install -D -t $out/lib temporal_tables${postgresql.dlSuffix} + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; meta = with lib; { - description = "Temporal Tables PostgreSQL Extension "; - homepage = "https://github.com/mlt/temporal_tables"; + description = "Temporal Tables PostgreSQL Extension"; + homepage = "https://github.com/arkhipov/temporal_tables"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.bsd2; 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 863e22f18b..a567db9481 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.12.0"; + version = "2.12.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-e4Sq5VzX5YPiFzG4T8OcCqzgxaWsyVeB21GAKl0aPDk="; + hash = "sha256-bZHgkcCmkheTupVLOBZ5UsgIVyy7aIJoge+ot2SmMFg="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; - changelog = "https://github.com/timescale/timescaledb/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ marsam ]; platforms = postgresql.meta.platforms; license = with licenses; if enableUnfree then tsl else asl20; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 582451b3ba..b42095acd7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ postgresql ]; installPhase = '' - install -D tsearch_extras.so -t $out/lib/ + install -D tsearch_extras${postgresql.dlSuffix} -t $out/lib/ install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix new file mode 100644 index 0000000000..f62eae5b6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -0,0 +1,45 @@ +{ lib +, fetchzip +, nixosTests +, stdenv + +, mecab +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "tsja"; + version = "0.5.0"; + + src = fetchzip { + url = "https://www.amris.jp/tsja/tsja-${version}.tar.xz"; + hash = "sha256-h59UhUG/7biN8NaDiGK6kXDqfhR9uMzt8CpwbJ+PpEM="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local/pgsql ${postgresql} \ + --replace -L/usr/local/lib "" \ + --replace -I/usr/local/include "" + substituteInPlace tsja.c --replace /usr/local/lib/mecab ${mecab}/lib/mecab + ''; + + buildInputs = [ mecab postgresql ]; + + installPhase = '' + mkdir -p $out/lib $out/share/postgresql/extension + mv libtsja.so $out/lib + mv dbinit_libtsja.txt $out/share/postgresql/extension/libtsja_dbinit.sql + ''; + + passthru.tests.tsja = nixosTests.tsja; + + meta = with lib; { + description = "PostgreSQL extension implementing Japanese text search"; + homepage = "https://www.amris.jp/tsja/index.html"; + maintainers = with maintainers; [ chayleaf ]; + # GNU-specific linker options are used + platforms = platforms.gnu; + license = licenses.gpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix index f9e01a7bd5..26d4cb0c15 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "USE_PGXS=1" ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension sql/*.sql ''; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 64254e8261..6685602ec3 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -4,6 +4,8 @@ self: super: { apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + hypopg = super.callPackage ./ext/hypopg.nix { }; + jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; periods = super.callPackage ./ext/periods.nix { }; @@ -16,6 +18,8 @@ self: super: { pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; + pg_embedding = super.callPackage ./ext/pg_embedding.nix { }; + pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; pg_ivm = super.callPackage ./ext/pg_ivm.nix { }; @@ -54,8 +58,6 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; - pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; - smlar = super.callPackage ./ext/smlar.nix { }; temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; @@ -77,11 +79,15 @@ self: super: { pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; + pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { }; + promscale_extension = super.callPackage ./ext/promscale_extension.nix { }; repmgr = super.callPackage ./ext/repmgr.nix { }; rum = super.callPackage ./ext/rum.nix { }; + tsja = super.callPackage ./ext/tsja.nix { }; + wal2json = super.callPackage ./ext/wal2json.nix { }; } diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix index e24487f30d..9c8087887e 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/default.nix @@ -26,7 +26,6 @@ , perl , python3 , prometheus-cpp -, re2 , zlib , texinfo }: @@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } { f = "prometheus-cpp"; p = prometheus-cpp; } - { f = "re2"; p = re2; } ] )} diff --git a/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch b/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch index 04e469ae13..6a6d003a60 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch +++ b/third_party/nixpkgs/pkgs/servers/sql/proxysql/makefiles.patch @@ -143,17 +143,6 @@ index 710e070b..fd1352f6 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a - - - re2/re2/obj/libre2.a: -- cd re2 && rm -rf re2-*/ || true -- cd re2 && tar -zxf re2-*.tar.gz --# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile --# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch - cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - ifeq ($(UNAME_S),Darwin) - cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile @@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a diff --git a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix index 2ca2f1bd8d..cefa00d416 100644 --- a/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sqlpage/default.nix @@ -11,64 +11,64 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js"; - sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js"; + sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI="; }; tablerCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css"; - sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; + sha256 = "sha256-lS3nKxMMZiKIRJG7UgUonOHYuvHgW5eckEjvHMYxb9Q="; }; tablerVendorsCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css"; - sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css"; + sha256 = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY="; }; tablerJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js"; - sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js"; + sha256 = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ="; }; listJsFixed = fetchurl { - url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js"; - sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s="; + url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js"; + sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg"; - sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg"; + sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY="; }; in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.9.5"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s="; + hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ "$(cat ${tablerCss})" substituteInPlace sqlpage/sqlpage.css \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \ "$(cat ${tablerVendorsCss})" substituteInPlace sqlpage/sqlpage.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \ "$(cat ${tablerJs})" substituteInPlace sqlpage/sqlpage.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" ''; - cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw="; + cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 3ce09c88a8..5205115f83 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; + knownVulnerabilities = [ "Squid has multiple unresolved security vulnerabilities, for more information see https://megamansec.github.io/Squid-Security-Audit/" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/sslh/default.nix b/third_party/nixpkgs/pkgs/servers/sslh/default.nix index 6add47454c..735054eb61 100644 --- a/third_party/nixpkgs/pkgs/servers/sslh/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sslh/default.nix @@ -1,22 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; - version = "1.22c"; + version = "2.0.1"; src = fetchFromGitHub { owner = "yrutschle"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180="; + hash = "sha256-KXjoYtiGaOrdWRbI0umNfxbtS7p+YaW352lC/5f+AM4="; }; postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ]; + buildInputs = [ libcap libev libconfig perl tcp_wrappers pcre2 ]; makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ]; + postInstall = '' + # install all flavours + install -p sslh-fork "$out/sbin/sslh-fork" + install -p sslh-select "$out/sbin/sslh-select" + install -p sslh-ev "$out/sbin/sslh-ev" + ln -sf sslh-fork "$out/sbin/sslh" + ''; + installFlags = [ "PREFIX=$(out)" ]; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix index f314d97b7a..a14313cdaf 100644 --- a/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.22.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-RrwAT+la07A8PQhmUWmV4qrYha6GUFKMRx7jkVegPb8="; + hash = "sha256-NJjzfl44qRPph3M6u1jYELSvMzsPww8aD8DDNXSQjOo="; }; - cargoHash = "sha256-YOBo2ey83QN26+9cUvoA1QWEPI3oTpwIJoqcPaWvovA="; + cargoHash = "sha256-gHs8aFZozWgF4uE2mp/qRb9J3hRAohRwu15Q5/FLtTs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix index bf3f4fa300..b5b855a4b6 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sunshine/default.nix @@ -1,8 +1,6 @@ { lib , stdenv -, callPackage , fetchFromGitHub -, fetchurl , autoPatchelfHook , makeWrapper , buildNpmPackage @@ -14,7 +12,6 @@ , libxcb , openssl , libopus -, ffmpeg_5-full , boost , pkg-config , libdrm @@ -23,47 +20,45 @@ , libcap , mesa , curl +, pcre +, pcre2 +, libuuid +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, libepoxy , libva , libvdpau , numactl , amf-headers +, intel-media-sdk , svt-av1 , vulkan-loader , libappindicator +, libnotify , config , cudaSupport ? config.cudaSupport , cudaPackages ? {} }: -let - libcbs = callPackage ./libcbs.nix { }; - # get cmake file used to find external ffmpeg from previous sunshine version - findFfmpeg = fetchurl { - url = "https://raw.githubusercontent.com/LizardByte/Sunshine/6702802829869547708dfec98db5b8cbef39be89/cmake/FindFFMPEG.cmake"; - sha256 = "sha256:1hl3sffv1z8ghdql5y9flk41v74asvh23y6jmaypll84f1s6k1xa"; - }; -in stdenv.mkDerivation rec { pname = "sunshine"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-/ceN44PAEtXzrAUi4AEldW1FBhJqIXah1Zd0S6fiV3s="; + sha256 = "sha256-uvQAJkoKazFLz5iTpYSAGYJQZ2EprQ+p9+tryqorFHM="; fetchSubmodules = true; }; - # remove pre-built ffmpeg; use ffmpeg from nixpkgs - patches = [ - ./ffmpeg.diff - ]; - # fetch node_modules needed for webui ui = buildNpmPackage { inherit src version; pname = "sunshine-ui"; - npmDepsHash = "sha256-pwmkpZjDwluKJjcY0ehetQbAlFnj1tsW100gRjolboc="; + npmDepsHash = "sha256-+T1XAf4SThoJLOFpnVxDa2qiKFLIKQPGewjA83GQovM="; dontNpmBuild = true; @@ -88,9 +83,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libcbs avahi - ffmpeg_5-full libevdev libpulseaudio xorg.libX11 @@ -109,6 +102,16 @@ stdenv.mkDerivation rec { libcap libdrm curl + pcre + pcre2 + libuuid + libselinux + libsepol + libthai + libdatrie + xorg.libXdmcp + libxkbcommon + libepoxy libva libvdpau numactl @@ -116,8 +119,11 @@ stdenv.mkDerivation rec { amf-headers svt-av1 libappindicator + libnotify ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit + ] ++ lib.optionals stdenv.isx86_64 [ + intel-media-sdk ]; runtimeDependencies = [ @@ -132,16 +138,13 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # fix hardcoded libevdev and icon path - substituteInPlace CMakeLists.txt \ - --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' \ - --replace '/usr/share' "$out/share" + # fix hardcoded libevdev path + substituteInPlace cmake/compile_definitions/linux.cmake \ + --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' substituteInPlace packaging/linux/sunshine.desktop \ - --replace '@PROJECT_NAME@' 'Sunshine' - - # add FindFFMPEG to source tree - cp ${findFfmpeg} cmake/FindFFMPEG.cmake + --replace '@PROJECT_NAME@' 'Sunshine' \ + --replace '@PROJECT_DESCRIPTION@' 'Self-hosted game stream host for Moonlight' ''; preBuild = '' @@ -163,7 +166,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./updater.sh; meta = with lib; { - description = "Sunshine is a Game stream host for Moonlight."; + description = "Sunshine is a Game stream host for Moonlight"; homepage = "https://github.com/LizardByte/Sunshine"; license = licenses.gpl3Only; maintainers = with maintainers; [ devusb ]; diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff b/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff deleted file mode 100644 index ea028df595..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sunshine/ffmpeg.diff +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccca6fc..8789a4a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -349,6 +349,8 @@ else() - set(WAYLAND_FOUND OFF) - endif() - -+ find_package(FFMPEG REQUIRED) -+ - if(X11_FOUND) - add_compile_definitions(SUNSHINE_BUILD_X11) - include_directories(SYSTEM ${X11_INCLUDE_DIR}) -@@ -547,43 +549,7 @@ set_source_files_properties(third-party/nanors/rs.c - - list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_TRAY=${SUNSHINE_TRAY}) - --# Pre-compiled binaries --if(WIN32) -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") -- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid mfx) --elseif(APPLE) -- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64") -- else() -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") -- endif() --else() - set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) -- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") -- else() -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") -- list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) -- set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") -- set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") -- endif() --endif() --set(FFMPEG_INCLUDE_DIRS -- ${FFMPEG_PREPARED_BINARIES}/include) --if(EXISTS ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) -- set(HDR10_PLUS_LIBRARY -- ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) --endif() --set(FFMPEG_LIBRARIES -- ${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx264.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a -- ${HDR10_PLUS_LIBRARY} -- ${FFMPEG_PLATFORM_LIBRARIES}) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -@@ -593,7 +559,6 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors/deps/obl -- ${FFMPEG_INCLUDE_DIRS} - ${PLATFORM_INCLUDE_DIRS} - ) - -@@ -627,7 +592,9 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES - ${CMAKE_THREAD_LIBS_INIT} - enet - opus -+ cbs - ${FFMPEG_LIBRARIES} -+ ${FFMPEG_PLATFORM_LIBRARIES} - ${Boost_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix b/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix deleted file mode 100644 index 566c28123a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/sunshine/libcbs.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, nasm -}: -stdenv.mkDerivation { - pname = "libcbs"; - version = "unstable-2022-02-07"; - - src = fetchFromGitHub { - owner = "LizardByte"; - repo = "build-deps"; - # repo is not versioned -- used latest commit combined with sunshine release - rev = "d6e889188ca10118d769ee1ee3cddf9cf485642b"; - fetchSubmodules = true; - sha256 = "sha256-6xQDJey5JrZXyZxS/yhUBvFi6UD5MsQ3uVtUFrG09Vc="; - }; - - nativeBuildInputs = [ - cmake - nasm - ]; - - # modify paths to allow patches to be applied directly by derivation - prePatch = '' - substituteInPlace ffmpeg_patches/cbs/* \ - --replace 'a/libavcodec' 'a/ffmpeg_sources/ffmpeg/libavcodec' \ - --replace 'b/libavcodec' 'b/ffmpeg_sources/ffmpeg/libavcodec' \ - --replace 'a/libavutil' 'a/ffmpeg_sources/ffmpeg/libavutil' \ - --replace 'b/libavutil' 'b/ffmpeg_sources/ffmpeg/libavutil' - - substituteInPlace cmake/ffmpeg_cbs.cmake \ - --replace '--enable-static' '--enable-shared --enable-pic' \ - --replace 'add_library(cbs' 'add_library(cbs SHARED' \ - --replace 'libcbs.a' 'libcbs.so' - ''; - - patches = [ - "ffmpeg_patches/cbs/01-explicit-intmath.patch" - "ffmpeg_patches/cbs/02-include-cbs-config.patch" - "ffmpeg_patches/cbs/03-remove-register.patch" - "ffmpeg_patches/cbs/04-size-specifier.patch" - ]; - - CFLAGS = [ - "-Wno-format-security" - ]; -} diff --git a/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json b/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json index 975ebadbf1..0af94fdd8a 100644 --- a/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json +++ b/third_party/nixpkgs/pkgs/servers/sunshine/package-lock.json @@ -5,15 +5,15 @@ "packages": { "": { "dependencies": { - "@fortawesome/fontawesome-free": "6.4.0", - "bootstrap": "5.2.3", + "@fortawesome/fontawesome-free": "6.4.2", + "bootstrap": "5.3.2", "vue": "2.6.12" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz", - "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", + "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -30,9 +30,9 @@ } }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", "funding": [ { "type": "github", @@ -44,7 +44,7 @@ } ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.8" } }, "node_modules/vue": { diff --git a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock index 00406a8730..059eca302c 100644 --- a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/Cargo.lock @@ -8,14 +8,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes 0.5.6", "futures-core", "futures-sink", "log", - "pin-project 0.4.29", - "tokio", - "tokio-util", + "pin-project 0.4.30", + "tokio 0.2.25", + "tokio-util 0.3.1", ] [[package]] @@ -63,8 +63,8 @@ dependencies = [ "actix-service", "actix-threadpool", "actix-utils", - "base64 0.13.0", - "bitflags", + "base64 0.13.1", + "bitflags 1.3.2", "brotli", "bytes 0.5.6", "cookie", @@ -77,7 +77,7 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2", + "h2 0.2.7", "http", "httparse", "indexmap", @@ -86,11 +86,11 @@ dependencies = [ "lazy_static", "log", "mime", - "percent-encoding 2.1.0", - "pin-project 1.0.10", + "percent-encoding 2.3.0", + "pin-project 1.1.3", "rand 0.7.3", "regex", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "serde_urlencoded", "sha-1", @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -118,7 +118,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.135", + "serde 1.0.189", ] [[package]] @@ -133,7 +133,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -149,7 +149,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "mio", + "mio 0.6.23", "mio-uds", "num_cpus", "slab", @@ -163,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.29", + "pin-project 0.4.30", ] [[package]] @@ -191,7 +191,7 @@ dependencies = [ "lazy_static", "log", "num_cpus", - "parking_lot", + "parking_lot 0.11.2", "threadpool", ] @@ -216,14 +216,14 @@ dependencies = [ "actix-codec", "actix-rt", "actix-service", - "bitflags", + "bitflags 1.3.2", "bytes 0.5.6", "either", "futures-channel", "futures-sink", "futures-util", "log", - "pin-project 0.4.29", + "pin-project 0.4.30", "slab", ] @@ -255,15 +255,15 @@ dependencies = [ "fxhash", "log", "mime", - "pin-project 1.0.10", + "pin-project 1.1.3", "regex", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "serde_urlencoded", "socket2 0.3.19", "time 0.2.27", "tinyvec", - "url 2.2.2", + "url 2.4.1", ] [[package]] @@ -274,14 +274,14 @@ checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "addr2line" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -294,39 +294,63 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "alloc-no-stdlib" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ "alloc-no-stdlib", ] [[package]] -name = "anyhow" -version = "1.0.53" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +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 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "arrayvec" @@ -336,23 +360,23 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "assert-json-diff" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.135", + "serde 1.0.189", "serde_json", ] [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -361,16 +385,16 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "awc" @@ -382,40 +406,40 @@ dependencies = [ "actix-http", "actix-rt", "actix-service", - "base64 0.13.0", + "base64 0.13.1", "bytes 0.5.6", "cfg-if 1.0.0", "derive_more", "futures-core", "log", "mime", - "percent-encoding 2.1.0", + "percent-encoding 2.3.0", "rand 0.7.3", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "serde_urlencoded", ] [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.5.1", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] name = "base64" @@ -425,38 +449,37 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "bb8" -version = "0.4.2" +name = "base64" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374bba43fc924d90393ee7768e6f75d223a98307a488fe5bc34b66c3e96932a6" -dependencies = [ - "async-trait", - "futures 0.3.19", - "tokio", -] +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bindgen" -version = "0.57.0" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", + "clap", + "env_logger 0.9.3", "lazy_static", "lazycell", + "log", "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "which", ] [[package]] @@ -466,13 +489,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitmaps" -version = "2.1.0" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -484,19 +504,28 @@ dependencies = [ ] [[package]] -name = "boringssl-src" -version = "0.3.0+688fc5c" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f901accdf830d2ea2f4e27f923a5e1125cd8b1a39ab578b9db1a42d578a6922b" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "boringssl-src" +version = "0.5.2+6195bf8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab565ccc5e276ea82a2013dd08bf2c999866b06daf1d4f30fee419c4aaec6d5" dependencies = [ "cmake", ] [[package]] name = "brotli" -version = "3.3.3" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -505,9 +534,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -515,15 +544,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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" @@ -533,41 +562,44 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytestring" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" +checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", ] [[package]] name = "cadence" -version = "0.26.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7685b737fff763407351ce3a0d18c980a68e154b36f2d0b0fafebbac47de032" +checksum = "f39286bc075b023101dccdb79456a1334221c768b8faede0c2aff7ed29a9482d" dependencies = [ "crossbeam-channel", ] [[package]] name = "cc" -version = "1.0.72" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom", + "nom 7.1.3", ] [[package]] @@ -584,23 +616,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "libc", - "num-integer", - "num-traits 0.2.14", - "serde 1.0.135", - "time 0.1.43", - "winapi 0.3.9", + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits 0.2.17", + "wasm-bindgen", + "windows-targets", ] [[package]] name = "clang-sys" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -608,23 +640,38 @@ dependencies = [ ] [[package]] -name = "cmake" -version = "0.1.45" +name = "clap" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -634,8 +681,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", - "nom", - "serde 1.0.135", + "nom 5.1.3", + "serde 1.0.189", ] [[package]] @@ -645,9 +692,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" dependencies = [ "lazy_static", - "nom", + "nom 5.1.3", "rust-ini", - "serde 1.0.135", + "serde 1.0.189", "serde-hjson", "serde_json", "toml", @@ -672,7 +719,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ - "percent-encoding 2.1.0", + "percent-encoding 2.3.0", "time 0.2.27", "version_check", ] @@ -685,9 +732,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -695,36 +742,36 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.6", + "crossbeam-utils 0.8.16", ] [[package]] @@ -751,44 +798,43 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.6" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", - "lazy_static", ] [[package]] -name = "crypto-mac" -version = "0.11.1" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "subtle", + "typenum", ] [[package]] name = "curl" -version = "0.4.42" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de97b894edd5b5bcceef8b78d7da9b75b1d2f2f9a910569d0bde3dd31d84939" +checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.3", + "socket2 0.4.9", "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.52+curl-7.81.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b8c2d1023ea5fded5b7b892e4b8e95f70038a421126a056761a84246a28971" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -796,7 +842,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -808,18 +854,27 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.135", - "tokio", + "serde 1.0.189", + "tokio 0.2.25", ] [[package]] name = "debugid" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.135", - "uuid", + "serde 1.0.189", + "uuid 1.5.0", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", ] [[package]] @@ -832,7 +887,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -856,7 +911,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -894,6 +949,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -929,48 +995,48 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.135", - "strsim", + "serde 1.0.189", + "strsim 0.10.0", ] [[package]] name = "dyn-clone" -version = "1.0.5" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum-as-inner" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -980,76 +1046,63 @@ dependencies = [ ] [[package]] -name = "erased-serde" -version = "0.3.18" +name = "env_logger" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "serde 1.0.135", + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde 1.0.189", ] [[package]] name = "errno" -version = "0.2.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[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 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 = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", - "miniz_oxide 0.4.4", + "miniz_oxide", ] [[package]] @@ -1075,12 +1128,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding 2.3.0", ] [[package]] @@ -1089,7 +1141,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -1107,9 +1159,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1122,9 +1174,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1132,15 +1184,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1149,38 +1201,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1190,7 +1242,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.13", "pin-utils", "slab", ] @@ -1206,9 +1258,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1227,57 +1279,58 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.4" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "gimli" -version = "0.26.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "google-cloud-rust-raw" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f0936883f3207fa424f69fc218956a5778de6fb847ea3c491f1dc47a39fb26" +checksum = "fbabcfb0bcc5e3222191c3f0fba962b0cbf4242d2effe2a865090eee492ffc9c" dependencies = [ - "futures 0.3.19", + "futures 0.3.28", "grpcio", "protobuf", ] [[package]] name = "grpcio" -version = "0.9.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d99e00eed7e0a04ee2705112e7cfdbe1a3cc771147f22f016a8cd2d002187b" +checksum = "609832ca501baeb662dc81932fda9ed83f5d058f4b899a807ba222ce696f430a" dependencies = [ - "futures 0.3.19", + "futures-executor", + "futures-util", "grpcio-sys", "libc", "log", - "parking_lot", + "parking_lot 0.12.1", "protobuf", ] [[package]] name = "grpcio-sys" -version = "0.9.1+1.38.0" +version = "0.12.1+1.46.5-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447d1a926beeef466606cc45717f80897998b548e7dc622873d453e1ecb4be4" +checksum = "cf625d1803b6f44203f0428ddace847fb4994def5c803fc8a7a2f18fb3daec62" dependencies = [ "bindgen", "boringssl-src", @@ -1303,17 +1356,36 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] [[package]] -name = "hashbrown" -version = "0.11.2" +name = "h2" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.33.0", + "tokio-util 0.7.9", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hawk" @@ -1327,17 +1399,14 @@ dependencies = [ "once_cell", "ring", "thiserror", - "url 2.2.2", + "url 2.4.1", ] [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1348,6 +1417,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hex" version = "0.4.3" @@ -1356,22 +1431,29 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "digest", "hmac", ] [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", ] [[package]] @@ -1387,13 +1469,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", - "itoa 1.0.1", + "itoa 1.0.9", ] [[package]] @@ -1407,10 +1489,21 @@ dependencies = [ ] [[package]] -name = "httparse" -version = "1.5.1" +name = "http-body" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.5.0", + "http", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1418,6 +1511,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[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" @@ -1434,15 +1533,39 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http", - "http-body", + "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa 0.4.8", - "pin-project 1.0.10", + "pin-project 1.1.3", "socket2 0.3.19", - "tokio", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "httparse", + "httpdate 1.0.3", + "itoa 1.0.9", + "pin-project-lite 0.2.13", + "socket2 0.4.9", + "tokio 1.33.0", "tower-service", "tracing", "want", @@ -1456,10 +1579,10 @@ checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.6", "futures-util", - "hyper", + "hyper 0.13.10", "log", "rustls", - "tokio", + "tokio 0.2.25", "tokio-rustls", "webpki", ] @@ -1471,12 +1594,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.5.0", + "hyper 0.14.27", + "native-tls", + "tokio 1.33.0", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +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.1.5" @@ -1499,31 +1658,27 @@ dependencies = [ "unicode-normalization", ] +[[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 = "if_chain" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" -[[package]] -name = "im" -version = "14.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696059c87b83c5a258817ecd67c3af915e3ed141891fc35a1e79908801cf0ce7" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - [[package]] name = "indexmap" -version = "1.8.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1548,7 +1703,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unindent", ] @@ -1561,16 +1716,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "io-lifetimes" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - [[package]] name = "iovec" version = "0.1.4" @@ -1594,9 +1739,20 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "rustix", + "windows-sys", +] [[package]] name = "itoa" @@ -1606,15 +1762,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1654,7 +1810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -1662,15 +1818,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi 0.3.9", @@ -1678,9 +1834,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1690,33 +1846,31 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -1735,9 +1889,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -1747,9 +1901,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.1" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "migrations_internals" @@ -1769,40 +1923,36 @@ dependencies = [ "migrations_internals", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[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 = "mime_guess" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", ] [[package]] -name = "miniz_oxide" -version = "0.4.4" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1826,6 +1976,17 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -1834,7 +1995,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -1869,9 +2030,9 @@ dependencies = [ [[package]] name = "mysqlclient-sys" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9637d93448044078aaafea7419aed69d301b4a12bcc4aa0ae856eb169bef85" +checksum = "f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b" dependencies = [ "pkg-config", "vcpkg", @@ -1879,9 +2040,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -1897,9 +2058,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -1908,9 +2069,9 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" dependencies = [ "lexical-core", "memchr", @@ -1918,13 +2079,13 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.44" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "autocfg", - "num-traits 0.2.14", + "memchr", + "minimal-lexical", ] [[package]] @@ -1933,51 +2094,51 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", ] [[package]] name = "num_threads" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a1eb3a36534514077c1e079ada2fb170ef30c47d203aa6916138cf882ecd52" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.28.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.9.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -1987,18 +2148,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "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 2.0.38", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2007,17 +2180,27 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", "vcpkg", ] +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde 1.0.189", + "winapi 0.3.9", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -2026,23 +2209,46 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.6", +] + +[[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 0.9.9", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets", +] + [[package]] name = "paste" version = "0.1.18" @@ -2076,48 +2282,48 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" dependencies = [ - "pin-project-internal 0.4.29", + "pin-project-internal 0.4.30", ] [[package]] name = "pin-project" -version = "1.0.10" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.0.10", + "pin-project-internal 1.1.3", ] [[package]] name = "pin-project-internal" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2128,9 +2334,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2140,15 +2346,21 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[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.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -2159,7 +2371,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2176,24 +2388,24 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "protobuf" -version = "2.25.2" +version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "pyo3" @@ -2204,7 +2416,7 @@ dependencies = [ "cfg-if 1.0.0", "indoc", "libc", - "parking_lot", + "parking_lot 0.11.2", "paste", "pyo3-build-config", "pyo3-macros", @@ -2228,7 +2440,7 @@ checksum = "fc0bc5215d704824dfddddc03f93cb572e1155c68b6761c37005e1c288808ea8" dependencies = [ "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2240,7 +2452,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2251,21 +2463,21 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.15" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "r2d2" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot", + "parking_lot 0.12.1", "scheduled-thread-pool", ] @@ -2290,7 +2502,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2310,7 +2522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2324,11 +2536,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.10", ] [[package]] @@ -2341,38 +2553,60 @@ dependencies = [ ] [[package]] -name = "rand_xoshiro" -version = "0.4.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "rand_core 0.5.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "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_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.4", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2381,9 +2615,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2391,16 +2625,16 @@ version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.10", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -2408,16 +2642,16 @@ dependencies = [ "mime", "mime_guess", "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.8", + "percent-encoding 2.3.0", + "pin-project-lite 0.2.13", "rustls", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-rustls", "tokio-tls", - "url 2.2.2", + "url 2.4.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2425,6 +2659,44 @@ dependencies = [ "winreg 0.7.0", ] +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.4", + "bytes 1.5.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding 2.3.0", + "pin-project-lite 0.2.13", + "serde 1.0.189", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio 1.33.0", + "tokio-native-tls", + "tower-service", + "url 2.4.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + [[package]] name = "resolv-conf" version = "0.7.0" @@ -2458,9 +2730,9 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -2483,21 +2755,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver 1.0.20", ] [[package]] name = "rustix" -version = "0.36.9" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -2515,15 +2786,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2536,28 +2807,27 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot", + "parking_lot 0.12.1", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -2571,11 +2841,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.5.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09d3c15d814eda1d6a836f2f2b56a6abc1446c8a34351cb3180d3db92ffe4ce" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2584,9 +2854,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.5.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e90dd10c41c6bfc633da6e0c659bd25d31e0791e5974ac42970267d59eba87f7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2603,9 +2873,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.4" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "semver-parser" @@ -2615,94 +2885,111 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd0927ec4a785fc4328abe9089afbe074b3874983b3373fc328a73a9f8310cb" +checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" dependencies = [ "curl", - "httpdate", - "reqwest", + "httpdate 1.0.3", + "native-tls", + "reqwest 0.11.22", "sentry-backtrace", "sentry-contexts", "sentry-core", - "sentry-failure", + "sentry-debug-images", "sentry-panic", - "serde_json", + "sentry-tracing", + "tokio 1.33.0", + "ureq", ] [[package]] name = "sentry-backtrace" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4585422b92435a04569441aef8dc3417eb9d7547fd591b67fdf6fdfe204232c9" +checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" dependencies = [ "backtrace", - "lazy_static", + "once_cell", "regex", "sentry-core", ] [[package]] name = "sentry-contexts" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d607b3be0593e026f1c089f0086c244429fe3026eca8e075e8f9e834703ee4c0" +checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" dependencies = [ "hostname", - "lazy_static", "libc", - "regex", - "rustc_version 0.2.3", + "os_info", + "rustc_version 0.4.0", "sentry-core", "uname", ] [[package]] name = "sentry-core" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c118347dc0958e66f8b0f3866f0d85bbf8a63bffe64603baebe3f989e929e6" +checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" dependencies = [ - "im", - "lazy_static", - "rand 0.7.3", + "once_cell", + "rand 0.8.5", "sentry-types", + "serde 1.0.189", + "serde_json", ] [[package]] -name = "sentry-failure" -version = "0.19.1" +name = "sentry-debug-images" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8599d375040329e106653a133a1d876af53df8b504cff1de7b6f4471fd41eec3" +checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" dependencies = [ - "failure", - "sentry-backtrace", + "findshlibs", + "once_cell", "sentry-core", ] [[package]] name = "sentry-panic" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3943c3fc7fff39244158b625bb2235a27e7e4d0b862b5e52cb57db51e6a6e6e" +checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" dependencies = [ "sentry-backtrace", "sentry-core", ] [[package]] -name = "sentry-types" -version = "0.19.1" +name = "sentry-tracing" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b41bac48a3586249431fa9efb88cd1414c3455117eb57c02f5bda9634e158d" +checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.31.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" dependencies = [ - "chrono", "debugid", - "serde 1.0.135", + "hex", + "rand 0.8.5", + "serde 1.0.189", "serde_json", "thiserror", - "url 2.2.2", - "uuid", + "time 0.3.30", + "url 2.4.1", + "uuid 1.5.0", ] [[package]] @@ -2713,9 +3000,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.135" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -2734,24 +3021,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.135" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "itoa 1.0.1", + "itoa 1.0.9", "ryu", - "serde 1.0.135", + "serde 1.0.189", ] [[package]] @@ -2761,9 +3048,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa 1.0.9", "ryu", - "serde 1.0.135", + "serde 1.0.189", ] [[package]] @@ -2772,10 +3059,10 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -2796,47 +3083,38 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer", "cfg-if 1.0.0", "cpufeatures", - "digest", - "opaque-debug", + "digest 0.10.7", ] [[package]] name = "shlex" -version = "0.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] -[[package]] -name = "sized-chunks" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59044ea371ad781ff976f7b06480b9f0180e834eda94114f2afb4afc12b7718" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "slog" @@ -2849,9 +3127,9 @@ dependencies = [ [[package]] name = "slog-async" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe" +checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84" dependencies = [ "crossbeam-channel", "slog", @@ -2881,7 +3159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "slog", ] @@ -2918,14 +3196,14 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.9", + "time 0.3.30", ] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -2940,14 +3218,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.3" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "spin" version = "0.5.2" @@ -2991,9 +3279,9 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.135", + "serde 1.0.189", "serde_derive", - "syn", + "syn 1.0.109", ] [[package]] @@ -3005,11 +3293,11 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.135", + "serde 1.0.189", "serde_derive", "serde_json", "sha1", - "syn", + "syn 1.0.109", ] [[package]] @@ -3018,6 +3306,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +[[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" @@ -3026,66 +3320,61 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.86" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syncserver" -version = "0.13.6" +version = "0.14.1" dependencies = [ "actix-cors", "actix-http", "actix-rt", - "actix-service", "actix-web", "async-trait", "backtrace", - "base64 0.13.0", - "bb8", - "bytes 1.1.0", + "base64 0.21.4", "cadence", "chrono", - "deadpool", - "diesel", - "diesel_logger", - "diesel_migrations", "docopt", "dyn-clone", - "env_logger", - "futures 0.3.19", - "google-cloud-rust-raw", - "grpcio", + "env_logger 0.10.0", + "futures 0.3.28", "hawk", "hex", "hmac", "hostname", - "http", "lazy_static", - "log", "mime", - "mockito", - "num_cpus", - "protobuf", - "pyo3", "rand 0.8.5", "regex", - "reqwest", - "scheduled-thread-pool", + "reqwest 0.10.10", "sentry", "sentry-backtrace", - "serde 1.0.135", + "serde 1.0.189", "serde_derive", "serde_json", "sha2", @@ -3099,15 +3388,16 @@ dependencies = [ "syncserver-common", "syncserver-db-common", "syncserver-settings", + "syncstorage-db", "syncstorage-settings", "thiserror", - "time 0.3.9", + "time 0.3.30", + "tokenserver-auth", "tokenserver-common", + "tokenserver-db", "tokenserver-settings", - "tokio", - "url 2.2.2", + "tokio 0.2.25", "urlencoding", - "uuid", "validator", "validator_derive", "woothee", @@ -3115,68 +3405,168 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.13.6" +version = "0.14.1" dependencies = [ + "actix-web", + "cadence", + "futures 0.3.28", "hkdf", + "serde 1.0.189", + "serde_json", "sha2", + "slog", + "slog-scope", ] [[package]] name = "syncserver-db-common" -version = "0.13.6" +version = "0.14.1" dependencies = [ - "async-trait", "backtrace", - "chrono", "deadpool", "diesel", "diesel_migrations", - "futures 0.3.19", - "grpcio", - "hostname", + "futures 0.3.28", "http", - "lazy_static", - "serde 1.0.135", - "serde_json", "syncserver-common", "thiserror", - "url 2.2.2", ] [[package]] name = "syncserver-settings" -version = "0.13.6" +version = "0.14.1" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.135", + "serde 1.0.189", "slog-scope", "syncserver-common", "syncstorage-settings", "tokenserver-settings", - "url 2.2.2", + "url 2.4.1", +] + +[[package]] +name = "syncstorage-db" +version = "0.14.1" +dependencies = [ + "async-trait", + "cadence", + "env_logger 0.10.0", + "futures 0.3.28", + "hostname", + "lazy_static", + "log", + "rand 0.8.5", + "slog-scope", + "syncserver-common", + "syncserver-db-common", + "syncserver-settings", + "syncstorage-db-common", + "syncstorage-mysql", + "syncstorage-settings", + "syncstorage-spanner", + "tokio 0.2.25", +] + +[[package]] +name = "syncstorage-db-common" +version = "0.14.1" +dependencies = [ + "async-trait", + "backtrace", + "chrono", + "diesel", + "diesel_migrations", + "futures 0.3.28", + "http", + "lazy_static", + "serde 1.0.189", + "serde_json", + "syncserver-common", + "syncserver-db-common", + "thiserror", +] + +[[package]] +name = "syncstorage-mysql" +version = "0.14.1" +dependencies = [ + "async-trait", + "backtrace", + "base64 0.21.4", + "diesel", + "diesel_logger", + "diesel_migrations", + "env_logger 0.10.0", + "futures 0.3.28", + "http", + "slog-scope", + "syncserver-common", + "syncserver-db-common", + "syncserver-settings", + "syncstorage-db-common", + "syncstorage-settings", + "thiserror", + "url 2.4.1", ] [[package]] name = "syncstorage-settings" -version = "0.13.6" +version = "0.14.1" dependencies = [ "rand 0.8.5", - "serde 1.0.135", + "serde 1.0.189", "syncserver-common", - "time 0.3.9", + "time 0.3.30", ] [[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +name = "syncstorage-spanner" +version = "0.14.1" dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", + "async-trait", + "backtrace", + "cadence", + "deadpool", + "env_logger 0.10.0", + "form_urlencoded", + "futures 0.3.28", + "google-cloud-rust-raw", + "grpcio", + "http", + "log", + "protobuf", + "slog-scope", + "syncserver-common", + "syncserver-db-common", + "syncstorage-db-common", + "syncstorage-settings", + "thiserror", + "tokio 0.2.25", + "url 2.4.1", + "uuid 0.8.2", +] + +[[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]] @@ -3187,15 +3577,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -3211,39 +3601,49 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] -name = "thiserror" -version = "1.0.30" +name = "textwrap" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if 1.0.0", "once_cell", ] @@ -3256,16 +3656,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.2.27" @@ -3283,16 +3673,26 @@ dependencies = [ [[package]] name = "time" -version = "0.3.9" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "itoa 1.0.1", + "deranged", + "itoa 1.0.9", "libc", "num_threads", - "time-macros 0.2.4", + "powerfmt", + "serde 1.0.189", + "time-core", + "time-macros 0.2.15", ] +[[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.1.1" @@ -3305,9 +3705,12 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] [[package]] name = "time-macros-impl" @@ -3319,42 +3722,84 @@ dependencies = [ "proc-macro2", "quote", "standback", - "syn", + "syn 1.0.109", ] [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokenserver-auth" +version = "0.14.1" +dependencies = [ + "async-trait", + "dyn-clone", + "futures 0.3.28", + "mockito", + "pyo3", + "reqwest 0.10.10", + "serde 1.0.189", + "serde_json", + "syncserver-common", + "tokenserver-common", + "tokenserver-settings", + "tokio 0.2.25", +] [[package]] name = "tokenserver-common" -version = "0.13.6" +version = "0.14.1" dependencies = [ "actix-web", "backtrace", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "syncserver-common", - "syncserver-db-common", "thiserror", ] [[package]] -name = "tokenserver-settings" -version = "0.13.6" +name = "tokenserver-db" +version = "0.14.1" dependencies = [ - "serde 1.0.135", + "async-trait", + "backtrace", + "diesel", + "diesel_logger", + "diesel_migrations", + "env_logger 0.10.0", + "futures 0.3.28", + "http", + "serde 1.0.189", + "serde_derive", + "serde_json", + "slog-scope", + "syncserver-common", + "syncserver-db-common", + "syncserver-settings", + "thiserror", + "tokenserver-common", + "tokenserver-settings", + "tokio 0.2.25", +] + +[[package]] +name = "tokenserver-settings" +version = "0.14.1" +dependencies = [ + "serde 1.0.189", "tokenserver-common", ] @@ -3371,9 +3816,8 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-uds", - "num_cpus", "pin-project-lite 0.1.12", "signal-hook-registry", "slab", @@ -3381,6 +3825,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes 1.5.0", + "libc", + "mio 0.8.8", + "num_cpus", + "pin-project-lite 0.2.13", + "socket2 0.5.4", + "windows-sys", +] + [[package]] name = "tokio-macros" version = "0.2.6" @@ -3389,7 +3849,17 @@ checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[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 1.33.0", ] [[package]] @@ -3400,7 +3870,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -3411,7 +3881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -3425,43 +3895,57 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes 1.5.0", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.13", + "tokio 1.33.0", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.135", + "serde 1.0.189", ] [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.13", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] @@ -3470,10 +3954,19 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.10", + "pin-project 1.1.3", "tracing", ] +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "tracing-core", +] + [[package]] name = "trust-dns-proto" version = "0.19.7" @@ -3483,15 +3976,15 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "enum-as-inner", - "futures 0.3.19", + "futures 0.3.28", "idna 0.2.3", "lazy_static", "log", "rand 0.7.3", "smallvec", "thiserror", - "tokio", - "url 2.2.2", + "tokio 0.2.25", + "url 2.4.1", ] [[package]] @@ -3501,7 +3994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" dependencies = [ "cfg-if 0.1.10", - "futures 0.3.19", + "futures 0.3.28", "ipconfig", "lazy_static", "log", @@ -3509,21 +4002,21 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.25", "trust-dns-proto", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uname" @@ -3536,45 +4029,45 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[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.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-segmentation" -version = "1.8.0" +name = "unicode-width" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unindent" -version = "0.1.7" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "untrusted" @@ -3582,6 +4075,19 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64 0.21.4", + "log", + "native-tls", + "once_cell", + "url 2.4.1", +] + [[package]] name = "url" version = "1.7.2" @@ -3595,22 +4101,21 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.2.3", - "matches", - "percent-encoding 2.1.0", - "serde 1.0.135", + "idna 0.4.0", + "percent-encoding 2.3.0", + "serde 1.0.189", ] [[package]] name = "urlencoding" -version = "2.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "uuid" @@ -3618,31 +4123,39 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.4", - "serde 1.0.135", + "getrandom 0.2.10", + "serde 1.0.189", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "serde 1.0.189", ] [[package]] name = "validator" -version = "0.14.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna 0.2.3", + "idna 0.4.0", "lazy_static", "regex", - "serde 1.0.135", + "serde 1.0.189", "serde_derive", "serde_json", - "url 2.2.2", - "validator_types", + "url 2.4.1", ] [[package]] name = "validator_derive" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -3650,26 +4163,38 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.109", "validator_types", ] [[package]] name = "validator_types" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] +[[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.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.4" @@ -3678,22 +4203,20 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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 0.3.9", "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", ] @@ -3705,42 +4228,42 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.135", + "serde 1.0.189", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3750,9 +4273,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3760,28 +4283,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3806,6 +4329,18 @@ dependencies = [ "webpki", ] +[[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 = "widestring" version = "0.4.3" @@ -3842,9 +4377,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 0.3.9", ] @@ -3856,34 +4391,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -3896,45 +4425,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" @@ -3955,10 +4484,20 @@ dependencies = [ ] [[package]] -name = "woothee" -version = "0.11.0" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d5a45c5d9c772e577c263597681448fd91a46aed911783394eec396e45d4ee" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys", +] + +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" dependencies = [ "lazy_static", "regex", diff --git a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix index decda34070..399c56376e 100644 --- a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix @@ -2,7 +2,6 @@ , rustPlatform , pkg-config , python3 -, openssl , cmake , libmysqlclient , makeBinaryWrapper @@ -21,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.13.6"; + version = "0.14.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LCMbhFoxi/fYaivW5gNyDhfytW/avhrrd29fXobSxJU="; + hash = "sha256-7lIFHK0XSOtfDEy6N9jcPGOd5Por5i1CBdDZQBiHm8c="; }; nativeBuildInputs = [ @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libmysqlclient - openssl ]; preFixup = '' @@ -54,8 +52,6 @@ rustPlatform.buildRustPackage rec { }; }; - buildFeatures = [ "grpcio/openssl" ]; - # almost all tests need a DB to test against doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix b/third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix index 9acba46310..7761695042 100644 --- a/third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tacacsplus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz"; - sha256 = "17i18z3s58c8yy8jxp01q3hzz5nirs4cjxms18zzkli6ip4jszql"; + hash = "sha256-FH8tyY0m0vk/Crp2yYjO0Zb/4cAB3C6R94ihosdHIZ4="; }; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index abdeb97319..b4c2d24751 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.50.1"; + version = "1.54.0"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-YosV9zyWbZ18xeiKJ6/4ZzSSfcoACWadZQsqGBD/hZ4="; + hash = "sha256-/l3csuj1AZQo7C0BzkhqvkMNEQxc6Ers0KtZvxWS96Q="; }; - vendorHash = "sha256-aVtlDzC+sbEWlUAzPkAryA/+dqSzoAFc02xikh6yhf8="; + vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/tang/default.nix b/third_party/nixpkgs/pkgs/servers/tang/default.nix index 227daa2cfb..4206973dbd 100644 --- a/third_party/nixpkgs/pkgs/servers/tang/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tang/default.nix @@ -13,6 +13,7 @@ , testers , tang , gitUpdater +, nixosTests }: stdenv.mkDerivation rec { @@ -53,10 +54,13 @@ stdenv.mkDerivation rec { ''; passthru = { - tests.version = testers.testVersion { - package = tang; - command = "${tang}/libexec/tangd --version"; - version = "tangd ${version}"; + tests = { + inherit (nixosTests) tang; + version = testers.testVersion { + package = tang; + command = "${tang}/libexec/tangd --version"; + version = "tangd ${version}"; + }; }; updateScript = gitUpdater { }; }; @@ -67,5 +71,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/latchset/tang/releases/tag/v${version}"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.gpl3Plus; + mainProgram = "tangd"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 3872b77835..2bab6f7423 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.13.1"; + version = "2.13.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uVBvtwMJRqPWJKQ0Tn9wLiuR02Btsbxd9+rl9tAlgg="; + sha256 = "sha256-G1YNOJ2snddhFOWDkRQikQ1qC3G1BHg+qb2j5ffIR8k="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/teleport/11/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/11/default.nix index 59d788872b..3a935b630e 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/11/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/11/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "11.3.25"; - hash = "sha256-KIbRn90BUJp8Uc8GMHuIMMSn5tJQbxzE0ntngx1ELaE="; + version = "11.3.27"; + hash = "sha256-A3EeFQsDOaggfb5S+eyRCe/vm054MabfRrcHPxhO0So="; vendorHash = "sha256-hjMv/H4dlinlv3ku7i1km2/b+6uCdbznHtVOMIjDlUc="; yarnHash = "sha256-hip0WQVZpx2qfVDmEy4nk4UFYEjX1Xhj8HsIIQ8PF1Y="; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/servers/teleport/12/Cargo.lock b/third_party/nixpkgs/pkgs/servers/teleport/12/Cargo.lock index 895145e392..c150d003f3 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/12/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/teleport/12/Cargo.lock @@ -1734,9 +1734,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", diff --git a/third_party/nixpkgs/pkgs/servers/teleport/12/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/12/default.nix index e53fdcce49..6fcba5773f 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/12/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/12/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "12.4.20"; - hash = "sha256-Qz+JOS4YPj2865Fkj7eVJMdilHMOGbTD179bQ5wHY7A="; - vendorHash = "sha256-cS8ylLujgp9Is+D2JjoK4yGgWRCVRyRw3NPQAAuE2vY="; - yarnHash = "sha256-tOdT7X8jM+tl1GZ7lBN2aW8KRiVW/zWK9fZIU7CSHVE="; + version = "12.4.23"; + hash = "sha256-kCHRBa9rdwfcb98XG/08ZaJmI1NhEiSCoXuH8/3xJlk="; + vendorHash = "sha256-yOvQQHjtDSLqQZcw2OIOy6CDqwYSgMpL2Rxlk2u//OE="; + yarnHash = "sha256-beHCg9qUSisYMJ/9eeqWmbc9+V9YGgXBheZSFpbqoPY="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/servers/teleport/13/Cargo.lock b/third_party/nixpkgs/pkgs/servers/teleport/13/Cargo.lock index b82c0b0e43..e0b56c33db 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/13/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/teleport/13/Cargo.lock @@ -449,17 +449,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.0" @@ -713,7 +702,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", - "rustix 0.36.5", + "rustix 0.36.16", "windows-sys 0.42.0", ] @@ -1363,16 +1352,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1382,7 +1371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" dependencies = [ "bitflags 1.3.2", - "errno 0.3.0", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.0", @@ -1786,9 +1775,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", diff --git a/third_party/nixpkgs/pkgs/servers/teleport/13/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/13/default.nix index 58d682f52a..65a4cf6406 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/13/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/13/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "13.4.1"; - hash = "sha256-wgSaek4eq5Jx9SZFenvdRSU1wEtfJHzTz9GdczzUU2w="; - vendorHash = "sha256-DesT18nV/SxOsKCC+Nt0hgtH7CRtRL0B5FQhE1J148I="; - yarnHash = "sha256-iyMcP9L6dwBhN8JL9eSVEzsXI2EOjfyxjF9Dm4Gs04s="; + version = "13.4.5"; + hash = "sha256-uZolRnESFP65Xgvr29laEok2kBbm7G2qY9j8yKRrUdo="; + vendorHash = "sha256-Bkr6R9P2YTqvTEQkHvVdsRmWp6pv3Qg0WaQ+pERclWc="; + yarnHash = "sha256-60k4LRHpX4rYXZZ0CC44PqzL3PDu8PadV0kwXatnByI="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock b/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock index 8b18ac74ae..fc4c503d45 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock @@ -449,17 +449,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.1" @@ -708,7 +697,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", - "rustix 0.36.5", + "rustix 0.36.16", "windows-sys 0.42.0", ] @@ -1356,16 +1345,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1375,7 +1364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.4.0", - "errno 0.3.1", + "errno", "libc", "linux-raw-sys 0.4.3", "windows-sys 0.48.0", @@ -1789,9 +1778,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted 0.7.1", @@ -1843,13 +1832,37 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] +[[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", + "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]] diff --git a/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix index 15a594ef13..d62c454932 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/14/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "14.0.1"; - hash = "sha256-esQwk2PFnk3/REzLr3ExtzEcUs2q4Tn/2KpfFWAx5uU="; - vendorHash = "sha256-lzwrkW0dHxCHBSJjzNhXgq3Av8Zj8xEn3kfTRtT/q04="; - yarnHash = "sha256-Y2dVxRyKPLD2xjwr0QqrKHf/4gnMCErmDzievu5zTGg="; + version = "14.1.1"; + hash = "sha256-xdJBl5imHuo1IP0ja33eaaE4i/sSP3kg/wQwehC1Hao="; + vendorHash = "sha256-+kCns/xHUfUOW2xBk6CaPZYWe/vcEguz2/4lqaJEbFc="; + yarnHash = "sha256-fWBMeat1bSIEMSADn8oDVfQtnUBojjy5ZCdVhw8PGMs="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix index 2a992d01ad..9a35bf29bd 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; + hash = "sha256-vqYewQT2alW9HFYRh/Ok3jFt2a+VsfqDypNaT+mngys="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index ff6103c94d..41b6ae78a8 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.4"; + version = "2.10.5"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-rpXSK/6ssUxzYbR1Nf0Cw7Sk6GnhExO4z8OZGQWITZM="; + hash = "sha256-b6CqpVDgyZvgBInlgni1+zukZ7DMzFUV3JdXmh+A+18="; stripRoot = false; }; - vendorHash = "sha256-CsLn8YqQozO+H66ss59Jh+fmDLVx/CzpFY09x2SoI2k="; + vendorHash = "sha256-bQy003IqezNSZU4K9qvApvYW+W4g6RkIqr4okkN/0gI="; subPackages = [ "cmd/traefik" ]; diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix index d11f51a8d8..435e872d33 100644 --- a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-zwKK8TPEATAgJwHh04hurzU3NrhyHA70qkf5kXW1yQc="; + sha256 = "sha256-BNvJkDOSlcNXt5W9/3/4I+MhQYn0W37zrJRYpAoZWaA="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/third_party/nixpkgs/pkgs/servers/unifi-video/default.nix b/third_party/nixpkgs/pkgs/servers/unifi-video/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/servers/unstructured-api/default.nix b/third_party/nixpkgs/pkgs/servers/unstructured-api/default.nix index 117af0ec81..7fb028de5f 100644 --- a/third_party/nixpkgs/pkgs/servers/unstructured-api/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unstructured-api/default.nix @@ -21,7 +21,7 @@ let safetensors uvicorn ] ++ packages.unstructured.optional-dependencies.local-inference); - version = "0.0.42"; + version = "0.0.57"; unstructured_api_nltk_data = symlinkJoin { name = "unstructured_api_nltk_data"; @@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-Tn4o7gAIlvWUTbAmbTCF9LgMk0up16iWuNPTy6pxOuk="; + hash = "sha256-FdRrGqF1cJImFVNs/tZo1457f9yhhpwxGGmpAdZUWso="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index acf4b07516..2c7563fe03 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -24,13 +24,13 @@ let }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { - interpreter = pkg.pythonForBuild.interpreter; + interpreter = pkg.pythonOnBuildForHost.interpreter; path = "plugins/python"; inputs = [ pkg ncurses ]; install = '' install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py - ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ - ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonOnBuildForHost.executable} -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonOnBuildForHost.executable} -O -m compileall $out/${pkg.sitePackages}/ ''; }; @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.22"; + version = "2.0.23"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-pfy3EDXq3KVY2mC3BMAp/87IUiP4NhdTWZo+zVBJ+Pc="; + hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index 82a1acf44c..a3521fe073 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -51,19 +51,14 @@ let }; in { - # EOL TBA + # EOL (LTS) TBA varnish60 = common { version = "6.0.11"; hash = "sha256-UVkA2+tH/9MOs5BlyuAzFnmD7Pm9A6lDWic2B+HRKNs="; }; - # EOL 2023-09-15 - varnish72 = common { - version = "7.2.1"; - hash = "sha256-TZN9FyCo7BnFM/ly2TA6HJiJt7/KdDeJOuXCfPIEqUA="; - }; - # EOL 2024-03-15 - varnish73 = common { - version = "7.3.0"; - hash = "sha256-4tu7DsJwqQZHw4aGbm4iaZOu1G5I3nUacruBlzfxSuc="; + # EOL 2024-09-15 + varnish74 = common { + version = "7.4.1"; + hash = "sha256-h02Deq9JuPJxjLYLjIx5AOnqEMJk8hjIjNZy1Zb0uJ8="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/varnish/modules.nix b/third_party/nixpkgs/pkgs/servers/varnish/modules.nix index 4a92160029..ee05a8181a 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/modules.nix @@ -41,12 +41,8 @@ in version = "0.15.1"; sha256 = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj"; }; - modules20 = common { - version = "0.20.0"; - sha256 = "sha256-3eH3qCa24rWqYXsTTDmm/9LjBMxcxUuozuRzZ3e8cUo="; - }; - modules22 = common { - version = "0.22.0"; - sha256 = "sha256-eoa6i6AuOS4pxQKA/lbJnwFc39cRiLqnBSpPM4Oitrc="; + modules23 = common { + version = "0.23.0"; + sha256 = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/varnish/packages.nix b/third_party/nixpkgs/pkgs/servers/varnish/packages.nix index 9daa0f8ac5..1d0b3e45da 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish72, varnish73, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish74, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,12 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish72Packages = rec { - varnish = varnish72; - modules = (callPackages ./modules.nix { inherit varnish; }).modules20; - }; - varnish73Packages = rec { - varnish = varnish73; - modules = (callPackages ./modules.nix { inherit varnish; }).modules22; + varnish74Packages = rec { + varnish = varnish74; + modules = (callPackages ./modules.nix { inherit varnish; }).modules23; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix index 8c2fcf3225..29d8eb1fdf 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix @@ -1,26 +1,26 @@ { lib , fetchFromGitHub -, fetchurl , python3 }: + python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.40.3"; + version = "0.45.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; - rev = version; - sha256 = "sha256-RYxhkCSL17rU3C4rOArYptmYpdK/CDPw9xfXkKja2xs="; + rev = "refs/tags/${version}"; + hash = "sha256-QTkkMFGyEGSakvFCiJ36Xr3IiG9K7GDy2dpNGWjUngs="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.3.0" "apprise" \ + --replace "apprise~=1.5.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ --replace "dnspython<2.3.0" "dnspython" \ - --replace "pytest ~=6.2" "" \ + --replace "pytest ~=7.2" "" \ --replace "pytest-flask ~=1.2" "" \ --replace "selenium~=4.1.0" "selenium" \ --replace "werkzeug~=2.0.0" "werkzeug" @@ -39,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { flask-compress flask-expects-json flask-login + flask-paginate flask-restful flask-wtf inscriptis @@ -70,8 +71,9 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { + description = "Self-hosted free open source website change detection tracking, monitoring and notification service"; homepage = "https://github.com/dgtlmoon/changedetection.io"; - description = "Simplest self-hosted free open source website change detection tracking, monitoring and notification service"; + changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix index 6f815b63ce..a1042c8e59 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.1"; + version = "18.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-vOHspLYH0hB2aPVzfTqHzKdHFScyxFez5kHozAiokBo="; + sha256 = "sha256-8RZqzuMjy83WNvIBpNxjJpfuILCXIuwP0mrs+/cSTns="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix index 2aa727ca2d..8a8502ad82 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.21.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI="; + hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; }; passthru.tests = { @@ -26,12 +26,6 @@ stdenvNoCC.mkDerivation rec { # There's nothing to build. dontBuild = true; - # the data folder is no in this package and thereby declared by an env-var - overrideConfig = pkgs.writeText "constants.local.php" '' - 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ="; + hash = "sha256-zLBFUyadpsqGeEhBCPrh3KKWn6f3zCy64YxTBMLIGsk="; }; phpConfig = writeText "config.php" '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix index d879bc589c..7adf281ff9 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/outline/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.71.0"; + version = "0.72.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-vwYq5b+cMYf/gnpCwLEpErYKqYw/RwcvyBjhp+5+bTY="; + hash = "sha256-y54EYWI1DbxosUflp5z+b4i1vO1qDju8LxEK0nt4S/g="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-j9iaxXfMlG9dT6fvYgPQg6Y0QvCRiBU1peO0YgsGHOY="; + hash = "sha256-uXWBYZAjMA88NtADA4s2kB4Ubb2atrW6F4kAzDGA1WI="; }; configurePhase = '' @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { makeWrapper ${nodejs}/bin/node $out/bin/outline-server \ --add-flags $build/server/index.js \ --set NODE_ENV production \ - --set NODE_PATH $node_modules + --set NODE_PATH $node_modules \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} # required to run migrations runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix index 3f18b700d6..320186855f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix @@ -9,24 +9,15 @@ python3.pkgs.buildPythonApplication rec { pname = "peering-manager"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-N34piaSP+QKZzjT42nAR47DTtqGtZ/GMeTeTyRQw3/4="; + sha256 = "sha256-He1AXfNsjVHYt2cBDjObz6sRcPbtsMotAsw+hvMrWyA="; }; - patches = [ - # restore support unix sockets for redis connections - # https://github.com/peering-manager/peering-manager/pull/773 - (fetchpatch { - url = "https://github.com/peering-manager/peering-manager/commit/ff66823c04d8c545a46dcec91d61eda7c21f99aa.patch"; - hash = "sha256-x5E0LFhGrc5LPY4pwAMNUtigltLGqqbRCe1PIm0yLA8="; - }) - ]; - format = "other"; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 0930b3a497..4318f2d29a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://github.com/mattrude/pgpkeyserver-lite"; description = "A lightweight static front-end for a sks keyserver"; license = licenses.gpl3; - maintainers = with maintainers; [ calbrecht globin ]; + maintainers = with maintainers; [ calbrecht ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix index d99c00b2f3..c2acf17036 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gUBSPkfIjvIU94tdasaoSl8zKPdfZ2PuT7sD8zU+iCI="; + sha256 = "sha256-kCWzje3tGfSn3gSdS4AFsoWFOLV9DhWKmzJltZs1KqY="; }; - cargoHash = "sha256-ENFFhZ+OUcQPmQoYj5xFmUBJpofe8ovQgcEepujwcFA="; + cargoHash = "sha256-PiKkCiMNMbgBN8qJvzHnZBC782uKsS9aGyKEzG0cEec="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix index 9255a92f28..e933877a53 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/plausible/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , nodejs , nixosTests +, ... }: let 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 70cf53e725..e1c459541e 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 @@ -2,21 +2,18 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2022-06-14"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-yH+m65CIZokZSbnv1zfpKC/Qr/mPPC6dG49Zn62X0l4="; + sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU="; }; - postPatch = '' - substituteInPlace lib/rssbridge.php \ - --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ - --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ - --replace "define('WHITELIST', PATH_ROOT . 'whitelist.txt');" "define('WHITELIST', getenv('RSSBRIDGE_DATA') . '/whitelist.txt');" - ''; + patches = [ + ./paths.patch + ]; installPhase = '' mkdir $out/ @@ -27,7 +24,7 @@ stdenv.mkDerivation rec { description = "The RSS feed for websites missing it"; homepage = "https://github.com/RSS-Bridge/rss-bridge"; license = licenses.unlicense; - maintainers = with maintainers; [ dawidsowa ]; + maintainers = with maintainers; [ dawidsowa mynacol ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch new file mode 100644 index 0000000000..b226676cb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/paths.patch @@ -0,0 +1,43 @@ +diff --git a/lib/Configuration.php b/lib/Configuration.php +index c38d7cc9..d95e5174 100644 +--- a/lib/Configuration.php ++++ b/lib/Configuration.php +@@ -104,8 +104,8 @@ final class Configuration + } + } + +- if (file_exists(__DIR__ . '/../whitelist.txt')) { +- $enabledBridges = trim(file_get_contents(__DIR__ . '/../whitelist.txt')); ++ if (file_exists(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')) { ++ $enabledBridges = trim(file_get_contents(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')); + if ($enabledBridges === '*') { + self::setConfig('system', 'enabled_bridges', ['*']); + } else { +diff --git a/lib/RssBridge.php b/lib/RssBridge.php +index 6ba952eb..a0bbaf03 100644 +--- a/lib/RssBridge.php ++++ b/lib/RssBridge.php +@@ -11,8 +11,8 @@ final class RssBridge + Configuration::verifyInstallation(); + + $customConfig = []; +- if (file_exists(__DIR__ . '/../config.ini.php')) { +- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); ++ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { ++ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); + } + Configuration::loadConfiguration($customConfig, getenv()); + +diff --git a/lib/bootstrap.php b/lib/bootstrap.php +index dc1c0f04..194a3f8f 100644 +--- a/lib/bootstrap.php ++++ b/lib/bootstrap.php +@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/'; + const PATH_LIB_ACTIONS = __DIR__ . '/../actions/'; + + /** Path to the cache folder */ +-const PATH_CACHE = __DIR__ . '/../cache/'; ++define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/'); + + /** URL to the RSS-Bridge repository */ + const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/'; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix deleted file mode 100644 index 995d2d9fee..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }: - -with python3Packages; - -toPythonModule (buildPythonApplication rec { - pname = "searx"; - version = "1.1.0"; - - # pypi doesn't receive updates - src = fetchFromGitHub { - owner = "searx"; - repo = "searx"; - rev = "v${version}"; - sha256 = "sha256-+Wsg1k/h41luk5aVfSn11/lGv8hZYVvpHLbbYHfsExw="; - }; - - patches = [ - ./fix-flask-babel-3.0.patch - ]; - - postPatch = '' - sed -i 's/==.*$//' requirements.txt - ''; - - preBuild = '' - export SEARX_DEBUG="true"; - ''; - - propagatedBuildInputs = [ - babel - certifi - python-dateutil - flask - flask-babel - gevent - grequests - jinja2 - langdetect - lxml - ndg-httpsclient - pyasn1 - pyasn1-modules - pygments - pysocks - pytz - pyyaml - requests - speaklater - setproctitle - werkzeug - ]; - - # tests try to connect to network - doCheck = false; - - pythonImportsCheck = [ "searx" ]; - - postInstall = '' - # Create a symlink for easier access to static data - mkdir -p $out/share - ln -s ../${python3.sitePackages}/searx/static $out/share/ - ''; - - passthru.tests = { inherit (nixosTests) searx; }; - - meta = with lib; { - homepage = "https://github.com/searx/searx"; - description = "A privacy-respecting, hackable metasearch engine"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc globin danielfullmer ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searx/fix-flask-babel-3.0.patch b/third_party/nixpkgs/pkgs/servers/web-apps/searx/fix-flask-babel-3.0.patch deleted file mode 100644 index d69cc30b60..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searx/fix-flask-babel-3.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 38b3a4f70e3226a091c53300659752c595b120f9 -Author: rnhmjoj -Date: Fri Jun 30 21:48:35 2023 +0200 - - Fix for flask-babel 3.0 - -diff --git a/searx/webapp.py b/searx/webapp.py -index 2027e72d..f3174a45 100755 ---- a/searx/webapp.py -+++ b/searx/webapp.py -@@ -167,7 +167,7 @@ _flask_babel_get_translations = flask_babel.get_translations - def _get_translations(): - if has_request_context() and request.form.get('use-translation') == 'oc': - babel_ext = flask_babel.current_app.extensions['babel'] -- return Translations.load(next(babel_ext.translation_directories), 'oc') -+ return Translations.load(babel_ext.translation_directories[0], 'oc') - - return _flask_babel_get_translations() - -@@ -188,7 +188,6 @@ def _get_browser_or_settings_language(request, lang_list): - return settings['search']['default_lang'] or 'en' - - --@babel.localeselector - def get_locale(): - if 'locale' in request.form\ - and request.form['locale'] in settings['locales']: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/slskd/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/slskd/default.nix index bff64dd3bb..c1a68f2d5e 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/slskd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/slskd/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv +{ lib , buildNpmPackage , fetchFromGitHub -, fetchurl -, unzip , dotnetCorePackages , buildDotnetModule , mono @@ -27,14 +25,13 @@ let platforms = platforms.linux; }; - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; - - wwwroot = buildNpmPackage' { + wwwroot = buildNpmPackage { inherit meta version; pname = "slskd-web"; src = "${src}/src/web"; npmFlags = [ "--legacy-peer-deps" ]; + nodejs = nodejs_18; npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; installPhase = '' cp -r build $out diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composer-env.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composer-env.nix deleted file mode 100644 index 71714b7640..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composer-env.nix +++ /dev/null @@ -1,244 +0,0 @@ -# This file originates from composer2nix - -{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }: - -let - inherit (phpPackages) composer; - - filterSrc = src: - builtins.filterSource (path: type: type != "directory" || (baseNameOf path != ".git" && baseNameOf path != ".git" && baseNameOf path != ".svn")) src; - - buildZipPackage = { name, src }: - stdenv.mkDerivation { - inherit name src; - nativeBuildInputs = [ unzip ]; - buildCommand = '' - shopt -s dotglob - unzip $src - baseDir=$(find . -type d -mindepth 1 -maxdepth 1) - cd $baseDir - mkdir -p $out - mv * $out - ''; - }; - - buildPackage = - { name - , src - , packages ? {} - , devPackages ? {} - , buildInputs ? [] - , symlinkDependencies ? false - , executable ? false - , removeComposerArtifacts ? false - , postInstall ? "" - , noDev ? false - , composerExtraArgs ? "" - , unpackPhase ? "true" - , buildPhase ? "true" - , ...}@args: - - let - reconstructInstalled = writeTextFile { - name = "reconstructinstalled.php"; - executable = true; - text = '' - #! ${php}/bin/php - - ''; - }; - - constructBin = writeTextFile { - name = "constructbin.php"; - executable = true; - text = '' - #! ${php}/bin/php - - ''; - }; - - bundleDependencies = dependencies: - lib.concatMapStrings (dependencyName: - let - dependency = dependencies.${dependencyName}; - in - '' - ${if dependency.targetDir == "" then '' - vendorDir="$(dirname ${dependencyName})" - mkdir -p "$vendorDir" - ${if symlinkDependencies then - ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' - else - ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' - } - '' else '' - namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")" - mkdir -p "$namespaceDir" - ${if symlinkDependencies then - ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' - else - ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' - } - ''} - '') (builtins.attrNames dependencies); - - extraArgs = removeAttrs args [ "packages" "devPackages" "buildInputs" ]; - in - stdenv.mkDerivation ({ - buildInputs = [ php composer ] ++ buildInputs; - - inherit unpackPhase buildPhase; - - installPhase = '' - ${if executable then '' - mkdir -p $out/share/php - cp -av $src $out/share/php/$name - chmod -R u+w $out/share/php/$name - cd $out/share/php/$name - '' else '' - cp -av $src $out - chmod -R u+w $out - cd $out - ''} - - # Remove unwanted files - rm -f *.nix - - export HOME=$TMPDIR - - # Remove the provided vendor folder if it exists - rm -Rf vendor - - # If there is no composer.lock file, compose a dummy file. - # Otherwise, composer attempts to download the package.json file from - # the registry which we do not want. - if [ ! -f composer.lock ] - then - cat > composer.lock < vendor/composer/installed.json - - # Copy or symlink the provided dependencies - cd vendor - ${bundleDependencies packages} - ${lib.optionalString (!noDev) (bundleDependencies devPackages)} - cd .. - - # Reconstruct autoload scripts - # We use the optimize feature because Nix packages cannot change after they have been built - # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload. - composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} - - # Run the install step as a validation to confirm that everything works out as expected - composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} - - ${lib.optionalString executable '' - # Reconstruct the bin/ folder if we deploy an executable project - ${php}/bin/php ${constructBin} composer.json - ln -s $(pwd)/vendor/bin $out/bin - ''} - - ${lib.optionalString (!symlinkDependencies) '' - # Patch the shebangs if possible - if [ -d $(pwd)/vendor/bin ] - then - # Look for all executables in bin/ - for i in $(pwd)/vendor/bin/* - do - # Look for their location - realFile=$(readlink -f "$i") - - # Restore write permissions - chmod u+wx "$(dirname "$realFile")" - chmod u+w "$realFile" - - # Patch shebang - sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \ - -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \ - "$realFile" > tmp - mv tmp "$realFile" - chmod u+x "$realFile" - done - fi - ''} - - if [ "$removeComposerArtifacts" = "1" ] - then - # Remove composer stuff - rm -f composer.json composer.lock - fi - - # Execute post install hook - runHook postInstall - ''; - } // extraArgs); -in -{ - inherit filterSrc; - composer = lib.makeOverridable composer; - buildZipPackage = lib.makeOverridable buildZipPackage; - buildPackage = lib.makeOverridable buildPackage; -} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composition.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composition.nix deleted file mode 100644 index d8df4b81fa..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/composition.nix +++ /dev/null @@ -1,15 +0,0 @@ -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, noDev ? false, php ? pkgs.php, phpPackages ? pkgs.phpPackages}: - -let - composerEnv = import ./composer-env.nix { - inherit (pkgs) stdenv lib writeTextFile fetchurl unzip; - inherit php phpPackages; - }; -in -import ./php-packages.nix { - inherit composerEnv noDev; - inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; -} - diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix index a4fa8aee8b..33fedd334a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix @@ -1,52 +1,48 @@ { lib -, pkgs -, stdenv -, fetchFromGitHub , dataDir ? "/var/lib/snipe-it" +, fetchFromGitHub , mariadb , nixosTests , php -, phpPackages }: -let - package = (import ./composition.nix { - inherit pkgs php phpPackages; - inherit (stdenv.hostPlatform) system; - noDev = true; # Disable development dependencies - }).overrideAttrs (attrs : { - installPhase = attrs.installPhase + '' - # Before symlinking the following directories, copy the invalid_barcode.gif - # to a different location. The `snipe-it-setup` oneshot service will then - # copy the file back during bootstrap. - mkdir -p $out/share/snipe-it - cp $out/public/uploads/barcodes/invalid_barcode.gif $out/share/snipe-it/ - - rm -R $out/storage $out/public/uploads $out/bootstrap/cache - ln -s ${dataDir}/.env $out/.env - ln -s ${dataDir}/storage $out/ - ln -s ${dataDir}/public/uploads $out/public/uploads - ln -s ${dataDir}/bootstrap/cache $out/bootstrap/cache - - chmod +x $out/artisan - - substituteInPlace config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" - ''; - }); - -in package.override rec { +php.buildComposerProject (finalAttrs: { pname = "snipe-it"; version = "6.2.2"; src = fetchFromGitHub { owner = "snipe"; - repo = pname; - rev = "v${version}"; - sha256 = "11i9ijkl7am5k48y7r5k6nki2827cd7mw3dr1xj8dvb8diwaskqi"; + repo = "snipe-it"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EU+teGxo7YZkD7kNXk9jRyARpzWz5OMRmaWqQ6eMKYY="; }; - passthru.tests = nixosTests.snipe-it; - passthru.phpPackage = php; + vendorHash = "sha256-JcBcrETbjGJFlG1dH/XXqmb9MlKr0ICdnEx7/61Z5io="; + + postInstall = '' + snipe_it_out="$out/share/php/snipe-it" + + # Before symlinking the following directories, copy the invalid_barcode.gif + # to a different location. The `snipe-it-setup` oneshot service will then + # copy the file back during bootstrap. + mkdir -p $out/share/snipe-it + cp $snipe_it_out/public/uploads/barcodes/invalid_barcode.gif $out/share/snipe-it/ + + rm -R $snipe_it_out/storage $snipe_it_out/public/uploads $snipe_it_out/bootstrap/cache + ln -s ${dataDir}/.env $snipe_it_out/.env + ln -s ${dataDir}/storage $snipe_it_out/ + ln -s ${dataDir}/public/uploads $snipe_it_out/public/uploads + ln -s ${dataDir}/bootstrap/cache $snipe_it_out/bootstrap/cache + + chmod +x $snipe_it_out/artisan + + substituteInPlace $snipe_it_out/config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" + ''; + + passthru = { + tests = nixosTests.snipe-it; + phpPackage = php; + }; meta = with lib; { description = "A free open source IT asset/license management system"; @@ -62,4 +58,4 @@ in package.override rec { maintainers = with maintainers; [ yayayayaka ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/php-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/php-packages.nix deleted file mode 100644 index 465310daf9..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ /dev/null @@ -1,1708 +0,0 @@ -{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}: - -let - packages = { - "alek13/slack" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "alek13-slack-9222449402df4e1e57d7850be87898b2c99803bd"; - src = fetchurl { - url = "https://api.github.com/repos/php-slack/slack/zipball/9222449402df4e1e57d7850be87898b2c99803bd"; - sha256 = "02kxal8066rlq4002qf36yfq8i3pafrrlbspqbvh3vxhnzzj2f2k"; - }; - }; - }; - "arietimmerman/laravel-scim-server" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; - src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; - sha256 = "0b08j7xfrbvp6ckv413sfpqq8v4qk59y9wcwch5kc19fb8y3dgiq"; - }; - }; - }; - "asm89/stack-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "asm89-stack-cors-73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - src = fetchurl { - url = "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - sha256 = "1idpisw39ba2dic9jl2s2yrkdgbyny9dfxf0qdr5i0wfvvlmbdih"; - }; - }; - }; - "aws/aws-crt-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; - src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; - sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; - }; - }; - }; - "aws/aws-sdk-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-8f8742caa42b260950320c98ddc5da4926e2373d"; - src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/8f8742caa42b260950320c98ddc5da4926e2373d"; - sha256 = "0z87ncxqvcs6bjp1b0dw1gib0f1k35sxzag8vzcd4ssh9n1m29gm"; - }; - }; - }; - "bacon/bacon-qr-code" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - src = fetchurl { - url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058"; - }; - }; - }; - "barryvdh/laravel-debugbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-debugbar-3372ed65e6d2039d663ed19aa699956f9d346271"; - src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271"; - sha256 = "08ll8z25mbq21q8gxdlgdb0pymx7z3xxc1la68m879l5r2ddhi05"; - }; - }; - }; - "barryvdh/laravel-dompdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; - src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; - sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; - }; - }; - }; - "brick/math" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "brick-math-ca57d18f028f84f777b2168cd1911b0dee2343ae"; - src = fetchurl { - url = "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae"; - sha256 = "1nr1grrb9g5g3ihx94yk0amp8zx8prkkvg2934ygfc3rrv03cq9w"; - }; - }; - }; - "dasprid/enum" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; - src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; - sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; - }; - }; - }; - "defuse/php-encryption" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "defuse-php-encryption-77880488b9954b7884c25555c2a0ea9e7053f9d2"; - src = fetchurl { - url = "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2"; - sha256 = "1lcvpg56nw72cxyh6sga7fx94qw9l0l1y78z7y7ny3hgdniwhihx"; - }; - }; - }; - "dflydev/dot-access-data" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dflydev-dot-access-data-0992cc19268b259a39e86f296da5f0677841f42c"; - src = fetchurl { - url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c"; - sha256 = "0qdf1gbfkj7vjqhn7m99s1gpjkj2crqrqh1wzpdzyz27izgjgsyw"; - }; - }; - }; - "doctrine/annotations" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-annotations-648b0343343565c4a056bfc8392201385e8d89f0"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0"; - sha256 = "0mkxq1yaqp6an2gjcgsmg7hq37mrwcj27f94sfkfxq9x6qh02k57"; - }; - }; - }; - "doctrine/cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-cache-56cd022adb5514472cb144c087393c1821911d09"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09"; - sha256 = "1ri5pwrnq8pxjv8ljscvlaqzjj7ii87420af4dq133qm35jn4ffr"; - }; - }; - }; - "doctrine/collections" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-collections-1958a744696c6bb3bb0d28db2611dc11610e78af"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af"; - sha256 = "0ygsw2vgrkz1wd9aw6gd8y6kjwxq9bjqcp3dgdx0p8w9mz7bdpm5"; - }; - }; - }; - "doctrine/common" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-common-f3812c026e557892c34ef37f6ab808a6b567da7f"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f"; - sha256 = "16jf1wzs6ccpw2ny7rkzpf0asdwr1cfzcyw8g5x88i4j9jazn8xa"; - }; - }; - }; - "doctrine/dbal" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; - sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; - }; - }; - }; - "doctrine/deprecations" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; - sha256 = "1sk1f020n0w7p7r4rsi7wnww85vljrim1i5h9wb0qiz2c4l8jj09"; - }; - }; - }; - "doctrine/event-manager" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; - sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; - }; - }; - }; - "doctrine/inflector" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-inflector-4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; - sha256 = "0390gkbk3vdjd98h7wjpdv0579swbavrdb6yrlslfdr068g4bmbf"; - }; - }; - }; - "doctrine/instantiator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-instantiator-10dcfce151b967d20fde1b34ae6640712c3891bc"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc"; - sha256 = "1m6pw3bb8v04wqsysj8ma4db8vpm9jnd7ddh8ihdqyfpz8pawjp7"; - }; - }; - }; - "doctrine/lexer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-lexer-c268e882d4dbdd85e36e4ad69e02dc284f89d229"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229"; - sha256 = "12g069nljl3alyk15884nd1jc4mxk87isqsmfj7x6j2vxvk9qchs"; - }; - }; - }; - "doctrine/persistence" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-persistence-7a6eac9fb6f61bba91328f15aa7547f4806ca288"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288"; - sha256 = "0mszkf7lxdhbr5b3ibpn7ipyrf6a6kfj283fvh83akyv1mplsl0h"; - }; - }; - }; - "doctrine/reflection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-reflection-1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; - sha256 = "08n0m6z8b66b0v8awl1w8s8ncg61sa25273ba42fbjmn24b3h6mp"; - }; - }; - }; - "dompdf/dompdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; - sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3"; - }; - }; - }; - "dragonmantank/cron-expression" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dragonmantank-cron-expression-be85b3f05b46c39bbc0d95f6c071ddff669510fa"; - src = fetchurl { - url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa"; - sha256 = "09k5cj8bay6jkphjl5ngfx7qb17dxnlvpf6918a9ms8am731s2a6"; - }; - }; - }; - "eduardokum/laravel-mail-auto-embed" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "eduardokum-laravel-mail-auto-embed-ea098444590521d574c84a37ed732c92b840d5b4"; - src = fetchurl { - url = "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/ea098444590521d574c84a37ed732c92b840d5b4"; - sha256 = "1amqglrskwx9lfdl06k5j0inz3j41lbr0kmq6hjxx1gia0ddh91f"; - }; - }; - }; - "egulias/email-validator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; - src = fetchurl { - url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; - sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; - }; - }; - }; - "enshrined/svg-sanitize" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "enshrined-svg-sanitize-e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; - src = fetchurl { - url = "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; - sha256 = "1pv8lkpyl0fp0ychfqlds31lpy73pzz9z2rjngxhpvzfka39gchg"; - }; - }; - }; - "erusev/parsedown" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "erusev-parsedown-cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; - src = fetchurl { - url = "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; - sha256 = "1iil9v8g03m5vpxxg3a5qb2sxd1cs5c4p5i0k00cqjnjsxfrazxd"; - }; - }; - }; - "ezyang/htmlpurifier" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ezyang-htmlpurifier-12ab42bd6e742c70c0a52f7b82477fcd44e64b75"; - src = fetchurl { - url = "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75"; - sha256 = "168kkjcq1w9vdnly5k72qc8jb8amdcmax9wja0xwfh926gb6dpz7"; - }; - }; - }; - "facade/flare-client-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-b2adf1512755637d0cef4f7d1b54301325ac78ed"; - src = fetchurl { - url = "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed"; - sha256 = "10yqn1bi4q6mp89g16d02dc7crxdigjxyvax973fdnmxnvafl0cb"; - }; - }; - }; - "facade/ignition" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-ignition-6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; - src = fetchurl { - url = "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; - sha256 = "1mxn6kqwbgd3vs36ckwydpx7kvjky6fvnhmbvn0c2zp0hsliq7rw"; - }; - }; - }; - "facade/ignition-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-ignition-contracts-3c921a1cdba35b68a7f0ccffc6dffc1995b18267"; - src = fetchurl { - url = "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267"; - sha256 = "1nsjwd1k9q8qmfvh7m50rs42yxzxyq4f56r6dq205gwcmqsjb2j0"; - }; - }; - }; - "fideloper/proxy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fideloper-proxy-a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; - src = fetchurl { - url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; - sha256 = "11whawpjkiphdfpfwm5c2v3finc3apl9gp8b4lwq76370i41plcf"; - }; - }; - }; - "filp/whoops" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "filp-whoops-a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; - src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; - sha256 = "0hc9zfh3i7br30831grccm4wny9dllpswhaw8hdn988mvg5xrdy0"; - }; - }; - }; - "firebase/php-jwt" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "firebase-php-jwt-018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; - src = fetchurl { - url = "https://api.github.com/repos/firebase/php-jwt/zipball/018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; - sha256 = "1jzri64bl3hiwah9nk3yq8nfjfn4z0xb0znp1dwh65qzjy54f0jh"; - }; - }; - }; - "fruitcake/laravel-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fruitcake-laravel-cors-783a74f5e3431d7b9805be8afb60fd0a8f743534"; - src = fetchurl { - url = "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534"; - sha256 = "13mqhjks048fb5042l0rfrr52rz7knp9gjn8qviw9cx76kllw2c9"; - }; - }; - }; - "graham-campbell/result-type" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca"; - src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca"; - sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83"; - }; - }; - }; - "guzzlehttp/guzzle" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; - sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; - }; - }; - }; - "guzzlehttp/promises" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; - sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; - }; - }; - }; - "guzzlehttp/psr7" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-0454e12ef0cd597ccd2adb036f7bda4e7fface66"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66"; - sha256 = "1vlrryjzwjigf2q1nichnrxl43r75cw3yjf17d3dy7ixhvlpnlv6"; - }; - }; - }; - "intervention/image" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "intervention-image-04be355f8d6734c826045d02a1079ad658322dad"; - src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad"; - sha256 = "1cbg43hm2jgwb7gm1r9xcr4cpx8ng1zr93zx6shk9xhjlssnv0bx"; - }; - }; - }; - "javiereguiluz/easyslugger" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "javiereguiluz-easyslugger-11524a3fd70e3f0c98043755a0ffa228f2529211"; - src = fetchurl { - url = "https://api.github.com/repos/javiereguiluz/EasySlugger/zipball/11524a3fd70e3f0c98043755a0ffa228f2529211"; - sha256 = "12x5cgp3qmz5d9wvgpd6c0whygm9z3y392fdi4kqjlzi3n5yknnp"; - }; - }; - }; - "laravel/framework" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-framework-96aecced5126d48e277e5339193c376fe82b6565"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/96aecced5126d48e277e5339193c376fe82b6565"; - sha256 = "1s4bcjpfsjafqigj28xbwa3bycs2cd1h4jnbpn9c9zj87w4smhzm"; - }; - }; - }; - "laravel/helpers" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-helpers-c28b0ccd799d58564c41a62395ac9511a1e72931"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/helpers/zipball/c28b0ccd799d58564c41a62395ac9511a1e72931"; - sha256 = "0s9ppwkwl5c1gp1bd12fvb2k1n77h0qj5vl4c88i325y5fcfgvnb"; - }; - }; - }; - "laravel/passport" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-passport-b62b418a6d9e9aca231a587be0fc14dc55cd8d77"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/passport/zipball/b62b418a6d9e9aca231a587be0fc14dc55cd8d77"; - sha256 = "139yqi5561cqzn35g336hf6m0gffcn4ixvmks7wz9kv4f0f336vn"; - }; - }; - }; - "laravel/serializable-closure" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540"; - sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; - }; - }; - }; - "laravel/slack-notification-channel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-slack-notification-channel-060617a31562c88656c95c5971a36989122d4b53"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/slack-notification-channel/zipball/060617a31562c88656c95c5971a36989122d4b53"; - sha256 = "1b2hw28aqb805ac5w7knm9myrgyh40aqw9njyzmvsr2jrphjwgr4"; - }; - }; - }; - "laravel/socialite" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-socialite-a14a177f2cc71d8add71e2b19e00800e83bdda09"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/a14a177f2cc71d8add71e2b19e00800e83bdda09"; - sha256 = "1fxlywrr2pansda2p9k475i20il2b5sz93w9b0kr7lihf242rz1z"; - }; - }; - }; - "laravel/tinker" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-tinker-dff39b661e827dae6e092412f976658df82dbac5"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5"; - sha256 = "0az4n99pfrhrnr7diwi656f8y9qbynxzdw25md29ji8bw0isbc6d"; - }; - }; - }; - "laravel/ui" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; - }; - }; - }; - "laravelcollective/html" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravelcollective-html-78c3cb516ac9e6d3d76cad9191f81d217302dea6"; - src = fetchurl { - url = "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6"; - sha256 = "14nm7wzlp8hz0ja1xhs10nhci3bq9ss73jpavbs0qazipfpc38sn"; - }; - }; - }; - "lcobucci/clock" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "lcobucci-clock-353d83fe2e6ae95745b16b3d911813df6a05bfb3"; - src = fetchurl { - url = "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3"; - sha256 = "18jdhd0jl5sqy5qkg2kjlrwyilyd80mck9gcpwa9xm7il9s9lf8m"; - }; - }; - }; - "lcobucci/jwt" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "lcobucci-jwt-fe2d89f2eaa7087af4aa166c6f480ef04e000582"; - src = fetchurl { - url = "https://api.github.com/repos/lcobucci/jwt/zipball/fe2d89f2eaa7087af4aa166c6f480ef04e000582"; - sha256 = "04rm6gfjlhxfllhmppx2fmxl8knflcxz6ss12y4lisg938xgm187"; - }; - }; - }; - "league/commonmark" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-commonmark-155ec1c95626b16fda0889cf15904d24890a60d5"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5"; - sha256 = "1bl4f0s6adgilly5yivcyg6ya42f173vc734518vjrdmzzh1wk2m"; - }; - }; - }; - "league/config" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-config-a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"; - sha256 = "0mwqf6pdapgbxcry328kl9974awjmnv491c6ryirw74lqkapw2bn"; - }; - }; - }; - "league/csv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-csv-9d2e0265c5d90f5dd601bc65ff717e05cec19b47"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47"; - sha256 = "0mcngirl2r8aw7hgbwaq3hrkkib4xwvhngijdhrkdzg4hj6ii3ap"; - }; - }; - }; - "league/event" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-event-d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/event/zipball/d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; - sha256 = "1fc8aj0mpbrnh3b93gn8pypix28nf2gfvi403kfl7ibh5iz6ds5l"; - }; - }; - }; - "league/flysystem" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99"; - sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva"; - }; - }; - }; - "league/flysystem-aws-s3-v3" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; - sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; - }; - }; - }; - "league/flysystem-cached-adapter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-cached-adapter-d1925efb2207ac4be3ad0c40b8277175f99ffaff"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff"; - sha256 = "1gvp89cl27ypcy4h0qjm04dc5k77jfm95m4paasglzfsi6g40i71"; - }; - }; - }; - "league/mime-type-detection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; - sha256 = "1a63nvqd6cz3vck3y8vjswn6c3cfwh13p0cn0ci5pqdf0bgjvvfz"; - }; - }; - }; - "league/oauth1-client" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-oauth1-client-d6365b901b5c287dd41f143033315e2f777e1167"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167"; - sha256 = "0hkh8l7884g8ssja1biwfb59x0jj951lwk6kmiacjqvyvzs07qmx"; - }; - }; - }; - "league/oauth2-server" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-oauth2-server-7aeb7c42b463b1a6fe4d084d3145e2fa22436876"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth2-server/zipball/7aeb7c42b463b1a6fe4d084d3145e2fa22436876"; - sha256 = "08fla005m5w3cvcivsi8x5jbxgyx814xhh9jmx6kcxrbwcpw2cpf"; - }; - }; - }; - "league/uri" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-uri-2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri/zipball/2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; - sha256 = "1cibnnh81jvkn28050scyldnzbshqhy5464gqmdfw0ar1a6bz545"; - }; - }; - }; - "league/uri-interfaces" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-uri-interfaces-00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"; - sha256 = "01jllf6n9fs4yjcf6sjc4ivqp7k7dkqhbpz354bq9mr14njsjv6x"; - }; - }; - }; - "livewire/livewire" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "livewire-livewire-020ad095cf1239138b097d22b584e2701ec3edfb"; - src = fetchurl { - url = "https://api.github.com/repos/livewire/livewire/zipball/020ad095cf1239138b097d22b584e2701ec3edfb"; - sha256 = "0kklhhk351fbw38dw810si3gpzppjnm8hn9f6h8arxhcgxc8vnx7"; - }; - }; - }; - "maatwebsite/excel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maatwebsite-excel-8a54972e3d616c74687c3cbff15765555761885c"; - src = fetchurl { - url = "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/8a54972e3d616c74687c3cbff15765555761885c"; - sha256 = "0h49x9aagq4wi05fymwhknvi16gl0na1xgi2cp9vlhy5ncrmpxy2"; - }; - }; - }; - "maennchen/zipstream-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maennchen-zipstream-php-211e9ba1530ea5260b45d90c9ea252f56ec52729"; - src = fetchurl { - url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729"; - sha256 = "02llnd0f72lmqhn84ggv2kkdk6968bg29wv196386dabf7ilq4wg"; - }; - }; - }; - "markbaker/complex" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "markbaker-complex-ab8bc271e404909db09ff2d5ffa1e538085c0f22"; - src = fetchurl { - url = "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/ab8bc271e404909db09ff2d5ffa1e538085c0f22"; - sha256 = "1zgy7bz25a6wa4f0m9q3ax38a3dfzv8cz2mfcppf3znb2mxs8w5y"; - }; - }; - }; - "markbaker/matrix" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "markbaker-matrix-c66aefcafb4f6c269510e9ac46b82619a904c576"; - src = fetchurl { - url = "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/c66aefcafb4f6c269510e9ac46b82619a904c576"; - sha256 = "0vfa7phvjkgsfplpxd3s2h00c28hy389yig29bmcpxlfk008vicn"; - }; - }; - }; - "masterminds/html5" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947"; - src = fetchurl { - url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947"; - sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k"; - }; - }; - }; - "maximebf/debugbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maximebf-debugbar-0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"; - src = fetchurl { - url = "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"; - sha256 = "02g3kz29pgf31q2q7zmm2w999n4bncm6336bh0ixv8v9vl1mssd4"; - }; - }; - }; - "mediconesystems/livewire-datatables" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "mediconesystems-livewire-datatables-bf6f24d529208e6bdec58276e92792719c73c827"; - src = fetchurl { - url = "https://api.github.com/repos/MedicOneSystems/livewire-datatables/zipball/bf6f24d529208e6bdec58276e92792719c73c827"; - sha256 = "0pdr1ax3735f2147w6bz843rrfjnrr57z6355xkdax9a16zvc0lm"; - }; - }; - }; - "monolog/monolog" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; - src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524"; - sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; - }; - }; - }; - "mtdowling/jmespath.php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; - src = fetchurl { - url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; - sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; - }; - }; - }; - "myclabs/php-enum" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "myclabs-php-enum-b942d263c641ddb5190929ff840c68f78713e937"; - src = fetchurl { - url = "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937"; - sha256 = "16123l5459sjbmnz5nx68x8kpq5mc7miz95q4sjvancpb1dgl8d3"; - }; - }; - }; - "neitanod/forceutf8" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "neitanod-forceutf8-c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; - src = fetchurl { - url = "https://api.github.com/repos/neitanod/forceutf8/zipball/c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; - sha256 = "1fvh2iapy7q22n65p6xkcbxcmp68x917gkv2cb0gs59671fwxsjf"; - }; - }; - }; - "nesbot/carbon" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nesbot-carbon-a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; - src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; - sha256 = "0rjlq01108i309q9lyfv0vvb9vmsnqy5ylk9h8wvhd7916vw3jnc"; - }; - }; - }; - "nette/schema" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nette-schema-9a39cef03a5b34c7de64f551538cbba05c2be5df"; - src = fetchurl { - url = "https://api.github.com/repos/nette/schema/zipball/9a39cef03a5b34c7de64f551538cbba05c2be5df"; - sha256 = "1kr5lai6r1l6w85ck64b1cq9cp0r2kwa10i1xcmlc7q0xlrxwhp2"; - }; - }; - }; - "nette/utils" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nette-utils-0af4e3de4df9f1543534beab255ccf459e7a2c99"; - src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99"; - sha256 = "0pmcgx3h3bl02sdqvhb9ap548ldxnhl3051imqss2yd64fkxf5fj"; - }; - }; - }; - "nikic/php-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; - src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1"; - sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; - }; - }; - }; - "nunomaduro/collision" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nunomaduro-collision-8b610eef8582ccdc05d8f2ab23305e2d37049461"; - src = fetchurl { - url = "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461"; - sha256 = "0w559vqpknkl6fbhz5hnkc9g37ydcyrqx82w3kjl88vmjycd1f61"; - }; - }; - }; - "nyholm/psr7" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nyholm-psr7-e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; - src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; - sha256 = "0abjvcrg19km5p6bcjfmfhrravsb60hap71zzznpwmf83bq16l8r"; - }; - }; - }; - "onelogin/php-saml" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b"; - src = fetchurl { - url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b"; - sha256 = "1df8mxmdh14y2scw80yhh1l90lvdnxq1pjlli3is1cakc0cdw90z"; - }; - }; - }; - "opis/closure" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "opis-closure-3d81e4309d2a927abbe66df935f4bb60082805ad"; - src = fetchurl { - url = "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad"; - sha256 = "0hqs6rdkkcggswrgjlispkby2yg4hwn63bl2ma62lnmpfbpwn0sd"; - }; - }; - }; - "paragonie/constant_time_encoding" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-constant_time_encoding-58c3f47f650c94ec05a151692652a868995d2938"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938"; - sha256 = "0i9km0lzvc7df9758fm1p3y0679pzvr5m9x3mrz0d2hxlppsm764"; - }; - }; - }; - "paragonie/random_compat" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; - sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; - }; - }; - }; - "paragonie/sodium_compat" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933"; - sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78"; - }; - }; - }; - "phenx/php-font-lib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phenx-php-font-lib-dd448ad1ce34c63d09baccd05415e361300c35b4"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4"; - sha256 = "0l20inbvipjdg9fdd32v8b7agjyvcs0rpqswcylld64vbm2sf3il"; - }; - }; - }; - "phenx/php-svg-lib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685"; - sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5"; - }; - }; - }; - "php-http/message-factory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "php-http-message-factory-a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - src = fetchurl { - url = "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - sha256 = "13drpc83bq332hz0b97whibkm7jpk56msq4yppw9nmrchzwgy7cs"; - }; - }; - }; - "phpdocumentor/reflection-common" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-reflection-common-1d01c49d4ed62f25aa84a747ad35d5a16924662b"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b"; - sha256 = "1wx720a17i24471jf8z499dnkijzb4b8xra11kvw9g9hhzfadz1r"; - }; - }; - }; - "phpdocumentor/reflection-docblock" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-reflection-docblock-622548b623e81ca6d78b721c5e029f4ce664f170"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170"; - sha256 = "1vs0fhpqk8s9bc0sqyfhpbs63q14lfjg1f0c1dw4jz97145j6r1n"; - }; - }; - }; - "phpdocumentor/type-resolver" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-type-resolver-77a32518733312af16a44300404e945338981de3"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3"; - sha256 = "0y6byv5psmrcy6ga7nghzblv61rjbni046h0pgjda8r8qmz26yr4"; - }; - }; - }; - "phpoffice/phpspreadsheet" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpoffice-phpspreadsheet-69991111e05fca3ff7398e1e7fca9ebed33efec6"; - src = fetchurl { - url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6"; - sha256 = "091g479mzh4w057m6v7xpn8i8l8k4abvvyd9l51c2sf7mskjz1n0"; - }; - }; - }; - "phpoption/phpoption" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; - src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; - sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; - }; - }; - }; - "phpseclib/phpseclib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; - src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; - sha256 = "08azglzhm6j821p5w3nb61ny7gz4lgj5kdmr1f1h723f8sjjwmfs"; - }; - }; - }; - "phpspec/prophecy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpspec-prophecy-bbcd7380b0ebf3961ee21409db7b38bc31d69a13"; - src = fetchurl { - url = "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13"; - sha256 = "1xw7x12lws8qdrryhbgjiih48gxwlq99ayhhsy0q2ls9i9p6mw0w"; - }; - }; - }; - "pragmarx/google2fa" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-80c3d801b31fe165f8fe99ea085e0a37834e1be3"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3"; - sha256 = "0qfjgkl02ifc0zicv3d5d6zs8mwpq68bg211jy3psgghnqpxyhlm"; - }; - }; - }; - "pragmarx/google2fa-laravel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-laravel-f9014fd7ea36a1f7fffa233109cf59b209469647"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/f9014fd7ea36a1f7fffa233109cf59b209469647"; - sha256 = "1y1b24fyfsf8mrhla3j699x1x6pd23rw5k3pjsag0vqgvd4v3a8n"; - }; - }; - }; - "pragmarx/google2fa-qrcode" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-qrcode-fd5ff0531a48b193a659309cc5fb882c14dbd03f"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/fd5ff0531a48b193a659309cc5fb882c14dbd03f"; - sha256 = "1csa15v68bznrz3262xjcdgcgw0lg8fwb6fhrbms2mnylhq4s35g"; - }; - }; - }; - "psr/cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; - sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; - }; - }; - }; - "psr/container" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-container-513e0666f7216c7459170d56df27dfcefe1689ea"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea"; - sha256 = "00yvj3b5ls2l1d0sk38g065raw837rw65dx1sicggjnkr85vmfzz"; - }; - }; - }; - "psr/event-dispatcher" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-event-dispatcher-dbefd12671e8a14ec7f180cab83036ed26714bb0"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0"; - sha256 = "05nicsd9lwl467bsv4sn44fjnnvqvzj1xqw2mmz9bac9zm66fsjd"; - }; - }; - }; - "psr/http-client" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; - }; - }; - }; - "psr/http-factory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; - }; - }; - }; - "psr/http-message" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; - sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; - }; - }; - }; - "psr/log" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; - sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; - }; - }; - }; - "psr/simple-cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; - sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; - }; - }; - }; - "psy/psysh" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psy-psysh-77fc7270031fbc28f9a7bea31385da5c4855cb7a"; - src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a"; - sha256 = "058wlfpslslxh59844ybwk2knplfxd67mc9k4gia3vmakc2n7ysb"; - }; - }; - }; - "ralouphie/getallheaders" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; - src = fetchurl { - url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; - sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; - }; - }; - }; - "ramsey/collection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - src = fetchurl { - url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; - }; - }; - }; - "ramsey/uuid" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ramsey-uuid-fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; - src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; - sha256 = "1fhjsyidsj95x5dd42z3hi5qhzii0hhhxa7xvc5jj7spqjdbqln4"; - }; - }; - }; - "robrichards/xmlseclibs" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; - src = fetchurl { - url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; - sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; - }; - }; - }; - "rollbar/rollbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "rollbar-rollbar-ff3db5739dd635740caed02ddad43e671b5a37e5"; - src = fetchurl { - url = "https://api.github.com/repos/rollbar/rollbar-php/zipball/ff3db5739dd635740caed02ddad43e671b5a37e5"; - sha256 = "1mkbw0mcaj50ks0x6ql2qq7dr2i5nfr46x6chdf8hvnm1vjnphmd"; - }; - }; - }; - "rollbar/rollbar-laravel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "rollbar-rollbar-laravel-d7647ffabf234beabfd0239ffaca003d934653b4"; - src = fetchurl { - url = "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/d7647ffabf234beabfd0239ffaca003d934653b4"; - sha256 = "0jm70pqhzdczrwzq4m7vxcwkzj1fcjn4r19qjpawvbsw4ldlcdg7"; - }; - }; - }; - "sabberworm/php-css-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; - src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; - sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; - }; - }; - }; - "sebastian/comparator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-comparator-55f4261989e546dc112258c7a75935a81a7ce382"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382"; - sha256 = "1d4bgf4m2x0kn3nw9hbb45asbx22lsp9vxl74rp1yl3sj2vk9sch"; - }; - }; - }; - "sebastian/diff" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-diff-3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - sha256 = "0967nl6cdnr0v0z83w4xy59agn60kfv8gb41aw3fpy1n2wpp62dj"; - }; - }; - }; - "sebastian/exporter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-exporter-65e8b7db476c5dd267e65eea9cab77584d3cfff9"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9"; - sha256 = "071813jw7nlsa3fs1hlrkl5fsjz4sidyq0i26p22m43isvvyad0q"; - }; - }; - }; - "sebastian/recursion-context" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-recursion-context-cd9d8cf3c5804de4341c283ed787f099f5506172"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172"; - sha256 = "1k0ki1krwq6329vsbw3515wsyg8a7n2l83lk19pdc12i2lg9nhpy"; - }; - }; - }; - "spatie/db-dumper" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-db-dumper-05e5955fb882008a8947c5a45146d86cfafa10d1"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/db-dumper/zipball/05e5955fb882008a8947c5a45146d86cfafa10d1"; - sha256 = "0g0scxq259qn1maxa61qh3cl5a88778qgx27dgbxr9p8kszivlsg"; - }; - }; - }; - "spatie/laravel-backup" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-laravel-backup-332fae80b12cacb9e4161824ba195d984b28c8fb"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/laravel-backup/zipball/332fae80b12cacb9e4161824ba195d984b28c8fb"; - sha256 = "02gcsv825zhw727bphrykp7lg7nhna7a2pzc20pnchkl9qbb6pnj"; - }; - }; - }; - "spatie/temporary-directory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-temporary-directory-f517729b3793bca58f847c5fd383ec16f03ffec6"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/temporary-directory/zipball/f517729b3793bca58f847c5fd383ec16f03ffec6"; - sha256 = "1pn6l9c86yigpzn83ajpq2wiy8ds0rlxmiq0iwby14cijc98ma3m"; - }; - }; - }; - "squizlabs/php_codesniffer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "squizlabs-php_codesniffer-1359e176e9307e906dc3d890bcc9603ff6d90619"; - src = fetchurl { - url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619"; - sha256 = "0bgb02zirxg0swfil3hacp7ry4cv5rwnbjkrj4l3hqln97cvmn21"; - }; - }; - }; - "swiftmailer/swiftmailer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; - src = fetchurl { - url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; - sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; - }; - }; - }; - "symfony/console" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-console-4d671ab4ddac94ee439ea73649c69d9d200b5000"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000"; - sha256 = "13p16qi328f7jds94vh2gswpq2zgkh99zr7x0ihvy9ysmdc4vln2"; - }; - }; - }; - "symfony/css-selector" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-css-selector-0628e6c6d7c92f1a7bae543959bdc17347be2436"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/0628e6c6d7c92f1a7bae543959bdc17347be2436"; - sha256 = "1piyal7jg8sslxn4h4znrl1fsppbv2ik2s99i5na8wyq6wpz9zp4"; - }; - }; - }; - "symfony/deprecation-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-deprecation-contracts-e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; - sha256 = "09k869asjb7cd3xh8i5ps824k5y6v510sbpzfalndwy3knig9fig"; - }; - }; - }; - "symfony/error-handler" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d"; - sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; - }; - }; - }; - "symfony/event-dispatcher" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; - }; - }; - }; - "symfony/event-dispatcher-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-contracts-f98b54df6ad059855739db6fcbc2d36995283fe1"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1"; - sha256 = "114zpsd8vac016a0ppf5ag5lmgllrha7nwln8vvhq9282r79xhsl"; - }; - }; - }; - "symfony/finder" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-finder-9b630f3427f3ebe7cd346c277a1408b00249dad9"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9"; - sha256 = "0b2rdx4080jav1ixqxrl4mabn91amf81xsj533b067vdfq4rcfv4"; - }; - }; - }; - "symfony/http-foundation" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; - sha256 = "1wd6ja7wfc6gkmbvpvlmg1d2fbnscnqsx5m2c2qzfnr64pm8wnxm"; - }; - }; - }; - "symfony/http-kernel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-255ae3b0a488d78fbb34da23d3e0c059874b5948"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948"; - sha256 = "0mjkq7badxnrwh8f7xwrpgxsaikb2zb9pf2576v5g3mj4ipf8m2b"; - }; - }; - }; - "symfony/mime" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-mime-02265e1e5111c3cd7480387af25e82378b7ab9cc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc"; - sha256 = "0fm8smz4y87igkwl7sgp05xzxknbsjb16qma6v6k543ba8p46fzy"; - }; - }; - }; - "symfony/polyfill-ctype" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; - sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; - }; - }; - }; - "symfony/polyfill-iconv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc"; - sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; - }; - }; - }; - "symfony/polyfill-intl-grapheme" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2"; - sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; - }; - }; - }; - "symfony/polyfill-intl-idn" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; - sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; - }; - }; - }; - "symfony/polyfill-intl-normalizer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd"; - sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; - }; - }; - }; - "symfony/polyfill-mbstring" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; - sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; - }; - }; - }; - "symfony/polyfill-php72" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2"; - sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; - }; - }; - }; - "symfony/polyfill-php73" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85"; - sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; - }; - }; - }; - "symfony/polyfill-php80" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace"; - sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; - }; - }; - }; - "symfony/polyfill-php81" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1"; - sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; - }; - }; - }; - "symfony/process" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-process-597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; - sha256 = "1vv2xwk3cvr144yxjj6k4afhkv50v2b957lscncs6m3rvi2zs1nk"; - }; - }; - }; - "symfony/psr-http-message-bridge" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-psr-http-message-bridge-22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; - sha256 = "18zvhrcry8173wklv3zpf8k06xx15smrw1dnj0zmq97injnam6fl"; - }; - }; - }; - "symfony/routing" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-routing-e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; - sha256 = "1lk7dbcxvfwmyx65hm0v78ma79f67jnq2xnzg6k0wz52161rk6cl"; - }; - }; - }; - "symfony/service-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; - sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; - }; - }; - }; - "symfony/string" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-string-4432bc7df82a554b3e413a8570ce2fea90e94097"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097"; - sha256 = "08abxmddl3nphkqf6a58r8w1d5la2f3m9rkbhdfv2k78h2nn19v7"; - }; - }; - }; - "symfony/translation" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca"; - sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; - }; - }; - }; - "symfony/translation-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; - sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; - }; - }; - }; - "symfony/var-dumper" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657"; - sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; - }; - }; - }; - "tecnickcom/tc-lib-barcode" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-barcode-4907ef1e384dbb7d3100c897925e7dc071a419a3"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/4907ef1e384dbb7d3100c897925e7dc071a419a3"; - sha256 = "1wwrws42lh60zmx7d49dqwlli09j1q6m1669cdlya907icx6cxbd"; - }; - }; - }; - "tecnickcom/tc-lib-color" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-color-f9e45c59496418227184626ad31e83470153c11f"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/f9e45c59496418227184626ad31e83470153c11f"; - sha256 = "04g9fkk4ifc8sj27jz3nj6rnqgfyls6b2p1ll59wm9d99rngyq72"; - }; - }; - }; - "tecnickcom/tcpdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tcpdf-e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; - sha256 = "17769rpyfq6z8lw5bj7icvkz7003d6kbj1hiji5cixrkahvc57fy"; - }; - }; - }; - "tijsverkoyen/css-to-inline-styles" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; - src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; - sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; - }; - }; - }; - "tmilos/lexer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-lexer-e7885595614759f1da2ff79b66e3fb26d7f875fa"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/lexer/zipball/e7885595614759f1da2ff79b66e3fb26d7f875fa"; - sha256 = "0b1dysgnfph13xcc04kvi0kncsq63q1kw973q5ichwl4h9w5qfdk"; - }; - }; - }; - "tmilos/scim-filter-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-scim-filter-parser-cfd9ba1f33e1e15adcab2481bffd74cb9fb35704"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/scim-filter-parser/zipball/cfd9ba1f33e1e15adcab2481bffd74cb9fb35704"; - sha256 = "08vp7p7jbzarmq1dlsiy7wb5klqp6ln8iidhnhq9xcqa1frrfj87"; - }; - }; - }; - "tmilos/scim-schema" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-scim-schema-bb871e667b33080b4cd36d7a9b2ac2cdbf796062"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/scim-schema/zipball/bb871e667b33080b4cd36d7a9b2ac2cdbf796062"; - sha256 = "0k78qica59y2cmad17qcww6gm0caqa1shvv73scgyf0fxzqpay8w"; - }; - }; - }; - "tmilos/value" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-value-9e78ad9c026b14cacec1a27552ee0ada9d7d1c06"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/value/zipball/9e78ad9c026b14cacec1a27552ee0ada9d7d1c06"; - sha256 = "1lbmm5l0q8mn2qs9jczqk1lc72m77455b3dv774fdfpy8vm2d7iy"; - }; - }; - }; - "unicodeveloper/laravel-password" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "unicodeveloper-laravel-password-806e345ae992e0adf38c4cfa32063d7d7c9d189a"; - src = fetchurl { - url = "https://api.github.com/repos/unicodeveloper/laravel-password/zipball/806e345ae992e0adf38c4cfa32063d7d7c9d189a"; - sha256 = "1qd63zahc0mw7ypfghm2q1zfq1w3vr58zxh5gdgcx0srlg2v69gc"; - }; - }; - }; - "vlucas/phpdotenv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f"; - src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f"; - sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl"; - }; - }; - }; - "voku/portable-ascii" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "voku-portable-ascii-87337c91b9dfacee02452244ee14ab3c43bc485a"; - src = fetchurl { - url = "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a"; - sha256 = "1j2xpbv7xiwxwb6gfc3h6imc6xcbyb2jw3h8wgfnpvjl5yfbi4xb"; - }; - }; - }; - "watson/validating" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "watson-validating-fda4daaf804ead4aef641e1fb3f3b40a8448167e"; - src = fetchurl { - url = "https://api.github.com/repos/dwightwatson/validating/zipball/fda4daaf804ead4aef641e1fb3f3b40a8448167e"; - sha256 = "00i2k7q0n62yy20k6p09j7hwbxxwq1n15gprsp4rl9wbagwwx4m9"; - }; - }; - }; - "webmozart/assert" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "webmozart-assert-11cb2199493b2f8a3b53e7f19068fc6aac760991"; - src = fetchurl { - url = "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991"; - sha256 = "18qiza1ynwxpi6731jx1w5qsgw98prld1lgvfk54z92b1nc7psix"; - }; - }; - }; - }; - devPackages = {}; -in -composerEnv.buildPackage { - inherit packages devPackages noDev; - name = "snipe-it"; - src = composerEnv.filterSrc ./.; - executable = false; - symlinkDependencies = false; - meta = { - license = "AGPL-3.0-or-later"; - }; -} - diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/update.sh deleted file mode 100755 index 226c71af3e..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/update.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update -# shellcheck shell=bash -cd "$(dirname "$0")" - -usage () { - cat < /dev/null; then - echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script." - exit 1 -fi - -CURRENT_VERSION=$(nix eval -f ../../../.. --raw snipe-it.version) -TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/snipe/snipe-it/releases/latest | jq -r ".tag_name") -TARGET_VERSION=${TARGET_VERSION_REMOTE:1} -SNIPE_IT=https://github.com/snipe/snipe-it/raw/$TARGET_VERSION_REMOTE -SHA256=$(nix-prefetch-url --unpack "https://github.com/snipe/snipe-it/archive/v$TARGET_VERSION/snipe-it.tar.gz") - -if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then - echo "snipe-it is up-to-date: ${CURRENT_VERSION}" - exit 0 -fi - -curl -LO "$SNIPE_IT/composer.json" -curl -LO "$SNIPE_IT/composer.lock" - -composer2nix --name "snipe-it" \ - --composition=composition.nix \ - --no-dev -rm composer.json composer.lock - -# change version number -sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ - -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ - -i ./default.nix - -# fix composer-env.nix -sed -e "s/stdenv\.lib/lib/g" \ - -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \ - -i ./composer-env.nix - -# fix composition.nix -sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \ - -i composition.nix - -# fix missing newline -echo "" >> composition.nix -echo "" >> php-packages.nix - -if [ -z ${DONT_BUILD+x} ]; then - ( - cd ../../../.. - nix-build -A snipe-it - ) -fi - -if [ -n "$COMMIT_CHANGES" ]; then - git add . - git commit -m "snipe-it: $CURRENT_VERSION -> $TARGET_VERSION - -https://github.com/snipe/snipe-it/releases/tag/v$TARGET_VERSION" -fi - -exit $? diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 251735e0f7..87bde25166 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.6.6"; + version = "2.6.7"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Release tarball includes vendored files src = fetchurl { url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; - hash = "sha256-0CkJFSHPnOz333+7uMUqXI3A9dsA9FchZXXmwq7F09o="; + hash = "sha256-prk/sF72v5qyBv1Lz/2nY6LPM+on5/gwAMM1u9+X8xA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix index 464d499cf1..b3401ff78f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix @@ -7,7 +7,7 @@ let nodejs = nodejs_20; -in buildNpmPackage.override { nodejs = nodejs_20; } rec { +in buildNpmPackage rec { pname = "whitebophir"; version = "1.19.1"; @@ -18,6 +18,8 @@ in buildNpmPackage.override { nodejs = nodejs_20; } rec { hash = "sha256-4T7s9WrpyHVPcw0QY0C0sczDJYKzA4bAAfEv8q2pOy4="; }; + inherit nodejs; + npmDepsHash = "sha256-mKDkkX7vWrnfEg1D65bqn/MtyUS0DKjTtkDW6ebso7g="; # geckodriver tries to access network diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 9bac7c33f3..77d85bc81e 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -1,15 +1,11 @@ { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress6_3; wordpress6_3 = { - version = "6.3.1"; - hash = "sha256-HVV7pANMimJN4P1PsuAyIAZFejvYMQESXmVpoxac8X8="; + version = "6.3.2"; + hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; - wordpress6_2 = { - version = "6.2.2"; - hash = "sha256-0qpvPauGbeP1MLHmz6gItJf80Erts7E7x28TM9AmAPk="; - }; - wordpress6_1 = { - version = "6.1.2"; - hash = "sha256-ozpuCVeni71CUylmUBk8wVo5ygZAKY7IdZ12DKbpSrw="; + wordpress6_4 = { + version = "6.4.1"; + hash = "sha256-NF3tvVNUYlKPvtvJZzM7djGflOUT4VUlm4AyHPFzfdw="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/languages.json b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/languages.json index dea632e542..66a2f6c1ba 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1208447", - "sha256": "1xavixayja6b2mxjp478yxkiimykmg50r23bl011nmkvir7sgm9f", + "rev": "1238966", + "sha256": "1qrizj0smwlxzv70l2f4dz737qggij2saqx4dc0vfrp4pn0qxw56", "version": "6.3" }, "fr_FR": { "path": "fr_FR", - "rev": "1227211", - "sha256": "1fgzjbzwd3h1i92ylxjmyagswgd2lg1bimnz00zckqk3z1jl2693", + "rev": "1263147", + "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", "version": "6.3" }, "ro_RO": { "path": "ro_RO", - "rev": "1219994", - "sha256": "0xjdv91pqpvzqajcaazcqvb79842llzl27lp2cqr4r8p2kivg94d", + "rev": "1255832", + "sha256": "0c6hp40rgxg8ai3f35k2bgh4q66qf1g8qgv3jgbq6dcxr090fia2", "version": "6.3" } } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/plugins.json b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/plugins.json index 16e1a8528e..5514822edb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -7,8 +7,8 @@ }, "akismet": { "path": "akismet/tags/5.3", - "rev": "2966753", - "sha256": "17ayrjbwc6ij7qqaph3jjn94i27nmhr6hki5gjl4dzrz8142zrwn", + "rev": "2991242", + "sha256": "1i7y09x2aikndf80wl7xv65m71nv5s0w6jcadpp0dsyzp2m3gjnn", "version": "5.3" }, "antispam-bee": { @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.29", - "rev": "2959271", - "sha256": "0ggyy9l33czv72vp1y4n03ky2nr2ysllkz5phfy9axhhv5a01ip0", - "version": "2.0.29" + "path": "breeze/tags/2.0.32", + "rev": "2995658", + "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", + "version": "2.0.32" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -42,10 +42,10 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.10", - "rev": "2956191", - "sha256": "1mi4ml1s92ljd85f1fiig1p1yi962db07m4kjw7vl3b7l3j4qdq5", - "version": "2.4.10" + "path": "cookie-notice/tags/2.4.11.1", + "rev": "2974733", + "sha256": "0bq6i4s7zkx0x5qb65d93h0sdkd17vka10k8xicfin7qdy5fdcf6", + "version": "2.4.11.1" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", @@ -53,11 +53,17 @@ "sha256": "03vay6j7ac44pg55hlm02lglm3ggmjxdq95dhh0cmavbiafimhqq", "version": "1.0.1" }, + "embed-extended": { + "path": "embed-extended/tags/1.4.0", + "rev": "2982701", + "sha256": "1qfxy9rp6ipp6r6m70vr30clbm2akssra4jbk8fss3qiz85rmfxa", + "version": "1.4.0" + }, "gutenberg": { - "path": "gutenberg/tags/16.7.0", - "rev": "2972264", - "sha256": "0mpbpp0c8dmpv3591i92xhjr44dnhbpgx4vln0q4cjdq5c6638r8", - "version": "16.7.0" + "path": "gutenberg/tags/17.0.2", + "rev": "2995211", + "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", + "version": "17.0.2" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,10 +78,10 @@ "version": "2.4.5" }, "jetpack": { - "path": "jetpack/tags/12.6.2", - "rev": "2972327", - "sha256": "1659k1418rcmxc51pfwlbbfcq3fskr1n04vlzgx5wi7a3bgjv47n", - "version": "12.6.2" + "path": "jetpack/tags/12.8.1", + "rev": "2995420", + "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", + "version": "12.8.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -96,52 +102,52 @@ "version": "2.06" }, "mailpoet": { - "path": "mailpoet/tags/4.29.0", - "rev": "2972087", - "sha256": "0n0aq8p4265zskq5vblpn551v45870vrmnjzbyvppnyagydfc1q8", - "version": "4.29.0" + "path": "mailpoet/tags/4.35.1", + "rev": "2990976", + "sha256": "0pf7r8q939420bzwd0mlv5zbnlkg824hg40vf3w082ryclzyiap5", + "version": "4.35.1" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2967306", - "sha256": "038sfnyr0ab8hzk5ybs0vnpiklhp1649dszbmlxilb5lm8rphbgq", - "version": "1.14.4" + "rev": "2980433", + "sha256": "0vx71g1dihlmxrrgmc8fa3glxxndgxcrysidbc23hz33xd18wcbh", + "version": "1.15.1" }, "opengraph": { - "path": "opengraph/tags/1.11.1", - "rev": "2950019", - "sha256": "0vfxv2d3z572m99nlxzla0l5s1lp14a6inb3x1plr779zn0rlg5c", - "version": "1.11.1" + "path": "opengraph/tags/1.11.2", + "rev": "2995321", + "sha256": "03cg7jm0g3rfwkvgjcg392mw09mlbmnvhw261rlldycfglmi270m", + "version": "1.11.2" }, "simple-login-captcha": { "path": "simple-login-captcha/tags/1.3.5", - "rev": "2947230", - "sha256": "054f51gybpy71iwdjnxf89v8x8dlvg4k4ggd2psvjjf16ai258dw", + "rev": "2988106", + "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, "static-mail-sender-configurator": { - "path": "static-mail-sender-configurator/tags/0.9.3", - "rev": "2574393", - "sha256": "0dirfpm71av0a6qhfsczn94ry9gam4zsyin0czzy8bjzbwd6m649", - "version": "0.9.3" + "path": "static-mail-sender-configurator/tags/0.10.0", + "rev": "2941521", + "sha256": "1mrwgqp1ril54xqr8k2gwgjcsbf4xv3671v15xawapwz730h2c4r", + "version": "0.10.0" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.0", - "rev": "2972415", - "sha256": "1ppa3npnvzn3a50hflpfzxgp3c79gn7zxvxiga9qhamhqpvnk48d", - "version": "5.11.0" + "path": "webp-converter-for-media/tags/5.11.4", + "rev": "2995294", + "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", + "version": "5.11.4" }, "webp-express": { - "path": "webp-express/tags/0.25.6", - "rev": "2899406", - "sha256": "1ah2gbm5aiqa4yw3kfhx49n6j3jyl6s44s9c5xqnpsjxr211h7p4", - "version": "0.25.6" + "path": "webp-express/tags/0.25.8", + "rev": "2981697", + "sha256": "17v94im2cnvjiglfzbqq598blwn7m5j84sd8ysbq8lc60kwn0vi3", + "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/20.7", - "rev": "2909990", - "sha256": "187lkzb9p889xj8s9cwp3r7pjbzq3nv34ix2hcy8a7sr4380518w", - "version": "20.7" + "path": "wordpress-seo/tags/21.5", + "rev": "2986840", + "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", + "version": "21.5" }, "worker": { "path": "worker/tags/4.9.17", @@ -156,10 +162,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.1.9", - "rev": "2962251", - "sha256": "0dwd8csv3ixixiajgihxx1xhwq9vy3idlhw4ya2xsyk38gisfa4z", - "version": "1.1.9" + "path": "wp-fastest-cache/tags/1.2.2", + "rev": "2994820", + "sha256": "1mj18yrljjdrd07b0yjkd9pwdciyn4jyrs6hgx6jcys0mc5p009v", + "version": "1.2.2" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -168,22 +174,22 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.9.0", - "rev": "2960628", - "sha256": "1zxpbm92v2hmqipr9jy5awv3wmp7zik85hk9sb7i4ccvds8i90yw", - "version": "3.9.0" + "path": "wp-mail-smtp/tags/3.10.0", + "rev": "2992136", + "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", + "version": "3.10.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.1.6.2", - "rev": "2968479", - "sha256": "1sx8zki5ip2s3lkjdllsyybmsisy7dqzgnpgwj0ksk2gr4aksz1y", - "version": "14.1.6.2" + "path": "wp-statistics/tags/14.2", + "rev": "2976338", + "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", + "version": "14.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2945958", - "sha256": "0s8rp2h43sslb5c2h3d9h72qcwd7krn8hggh412l5r2j87cn4qwf", - "version": "1.0.33" + "rev": "2978937", + "sha256": "0pn3l5v43hc572bym15pcdirq9n64mdgshacnr92hryq4vagyvzb", + "version": "1.0.34" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -192,9 +198,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.4", - "rev": "2972627", - "sha256": "17gydpbhfk4j4r2scs3nn938xynxgqx3c5jdn4avxh4s4ms649al", - "version": "1.8.4" + "path": "wpforms-lite/tags/1.8.4.1", + "rev": "2982999", + "sha256": "08yl41kxxdq36wcrypjrrbmckkpx464sqcarbk7pkzz83933z2pv", + "version": "1.8.4.1" } } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/themes.json b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/themes.json index 8cd103dbc2..92d09ef4ca 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -1,32 +1,32 @@ { "twentynineteen": { - "path": "twentynineteen/2.5", - "rev": "188109", - "sha256": "0v9fn05mjy81axxff2f37jvsz698hpp8dy18nlnghdab99f36j9c", - "version": "2.5" + "path": "twentynineteen/2.7", + "rev": "207575", + "sha256": "19zbbpj1qxfz6599di2455qr97z5x4vrprf0bf20c8dq8n8lrh41", + "version": "2.7" }, "twentytwenty": { - "path": "twentytwenty/2.2", - "rev": "188108", - "sha256": "1swmg6n0xcdpz21b2h277ajjhv41apnmnnp1w8frii458vxd121r", - "version": "2.2" + "path": "twentytwenty/2.4", + "rev": "207576", + "sha256": "0xp2jcgsn16gv9ad8dirm7j24mi7633yrl524wi858l3m8dh4q4a", + "version": "2.4" }, "twentytwentyone": { - "path": "twentytwentyone/1.8", - "rev": "188107", - "sha256": "19kb1wvdjyrh5xqhbn69c2gr3mfdl24cbzpdz2d5idb8fqyha5kr", - "version": "1.8" + "path": "twentytwentyone/2.0", + "rev": "207577", + "sha256": "0ypdqxfd1va9m6f3zbc0281i69br5hpvvjdqb03kk2xnmam2hjaa", + "version": "2.0" }, "twentytwentythree": { - "path": "twentytwentythree/1.2", - "rev": "198780", - "sha256": "1qybkprcjv89qrzkbv8lrhir6ns1wx3kzdimjnjhx70ggkbygh5y", - "version": "1.2" + "path": "twentytwentythree/1.3", + "rev": "207579", + "sha256": "0r2k73yskqaxhl641ri1shy74rck5xvmfi7b562kz3j44hx0dz4f", + "version": "1.3" }, "twentytwentytwo": { - "path": "twentytwentytwo/1.4", - "rev": "188106", - "sha256": "1y6rmfqchifhs9ckilmn3jnc9hc683a8r2gcsiq0vvvvik9ca09r", - "version": "1.4" + "path": "twentytwentytwo/1.6", + "rev": "207578", + "sha256": "0ga1682a5sh038xfc7whvdws5vfy1g3qvvy13rm5dln79x022riq", + "version": "1.6" } } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 505874af68..da458b8ede 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -8,6 +8,7 @@ , "cookie-notice" , "co-authors-plus" , "disable-xml-rpc" +, "embed-extended" , "gutenberg" , "hello-dolly" , "hkdev-maintenance-mode" diff --git a/third_party/nixpkgs/pkgs/servers/windmill/Cargo.lock b/third_party/nixpkgs/pkgs/servers/windmill/Cargo.lock index ea77339fbf..89e22cadf6 100644 --- a/third_party/nixpkgs/pkgs/servers/windmill/Cargo.lock +++ b/third_party/nixpkgs/pkgs/servers/windmill/Cargo.lock @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -123,15 +123,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -142,17 +142,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -163,9 +163,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -204,7 +204,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -251,14 +251,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -292,9 +292,9 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.26", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] @@ -313,7 +313,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "http", "rand 0.8.5", @@ -321,20 +321,20 @@ dependencies = [ "serde", "serde-aux", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "url", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -378,7 +378,7 @@ dependencies = [ "serde", "serde_json", "serde_qs 0.9.2", - "sha2 0.10.7", + "sha2 0.10.8", "smart-default", "smol_str", "thiserror", @@ -388,30 +388,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-timer" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5fa6ed76cb2aa820707b4eb9ec46f42da9ce70b0eafab5e5e34942b38a44d5" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -440,9 +429,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -529,9 +518,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64-simd" @@ -582,6 +571,19 @@ dependencies = [ "num-traits", ] +[[package]] +name = "bigdecimal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "bincode" version = "1.3.3" @@ -604,23 +606,23 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.12", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", "which", ] [[package]] name = "bindgen" -version = "0.66.1" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -631,7 +633,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -657,9 +659,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -722,17 +724,18 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand 1.9.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[package]] @@ -782,9 +785,9 @@ dependencies = [ [[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", @@ -793,9 +796,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -824,9 +827,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" @@ -851,16 +854,22 @@ dependencies = [ ] [[package]] -name = "byteorder" -version = "1.4.3" +name = "bytemuck" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" [[package]] name = "bzip2" @@ -883,15 +892,193 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "candle-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" +dependencies = [ + "byteorder", + "candle-gemm", + "half", + "memmap2", + "num-traits", + "num_cpus", + "rand 0.8.5", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-gemm" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" +dependencies = [ + "candle-gemm-c32", + "candle-gemm-c64", + "candle-gemm-common", + "candle-gemm-f16", + "candle-gemm-f32", + "candle-gemm-f64", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-c32" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-c64" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-common" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" +dependencies = [ + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f16" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" +dependencies = [ + "candle-gemm-common", + "candle-gemm-f32", + "dyn-stack", + "half", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f32" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-gemm-f64" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" +dependencies = [ + "candle-gemm-common", + "dyn-stack", + "lazy_static", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "candle-nn" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" +dependencies = [ + "candle-core", + "half", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" +dependencies = [ + "candle-core", + "candle-nn", + "num-traits", + "rand 0.8.5", + "rayon", + "serde", + "serde_json", + "tracing", + "wav", +] + [[package]] name = "cargo-lock" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", "serde", - "toml 0.7.6", + "toml 0.7.8", "url", ] @@ -922,18 +1109,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -980,20 +1166,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1003,14 +1188,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1050,13 +1235,26 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -1075,9 +1273,9 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", "konst", @@ -1085,9 +1283,9 @@ dependencies = [ [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -1116,7 +1314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", - "time 0.3.28", + "time", "version_check", ] @@ -1138,9 +1336,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -1317,7 +1515,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1339,17 +1537,17 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -1386,7 +1584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -1397,7 +1595,7 @@ checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1409,7 +1607,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1529,7 +1727,7 @@ dependencies = [ "strum", "strum_macros", "syn 1.0.109", - "syn 2.0.29", + "syn 2.0.38", "thiserror", ] @@ -1573,8 +1771,8 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.4.1", - "windows-sys", + "uuid 1.5.0", + "windows-sys 0.48.0", ] [[package]] @@ -1610,10 +1808,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1699,6 +1898,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -1709,6 +1917,18 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -1750,9 +1970,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "dyn-iter" @@ -1760,6 +1980,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" +[[package]] +name = "dyn-stack" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" +dependencies = [ + "bytemuck", + "reborrow", +] + [[package]] name = "either" version = "1.9.0" @@ -1778,6 +2008,12 @@ dependencies = [ "log", ] +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "encoding_rs" version = "0.8.31" @@ -1795,23 +2031,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "esaxx-rs" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" dependencies = [ "cc", - "libc", ] [[package]] @@ -1822,7 +2056,7 @@ checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ "cfg-if", "home", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1848,9 +2082,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -1861,9 +2095,15 @@ dependencies = [ "cfg-if", "libc", "redox_syscall 0.3.5", - "windows-sys", + "windows-sys 0.48.0", ] +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1872,9 +2112,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1884,13 +2124,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -1933,7 +2172,7 @@ dependencies = [ "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1961,7 +2200,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1973,7 +2212,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1985,7 +2224,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2086,7 +2325,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2126,17 +2365,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.3", + "base64 0.21.4", "dirs-next", "hyper", "hyper-rustls", - "ring", + "ring 0.16.20", "rustls", "rustls-pemfile", "serde", "serde_json", "thiserror", - "time 0.3.28", + "time", "tokio", "tracing", "tracing-futures", @@ -2161,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2258,9 +2497,9 @@ dependencies = [ [[package]] name = "gosyn" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b93546d5d444f37319802767121681f21309d5a16854513ba50ad8d761f362" +checksum = "2c003b8c167a1abb8b170baacf075dcdac2aaf5732bc94fead3d6ce429df7aa8" dependencies = [ "anyhow", "strum", @@ -2287,6 +2526,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", + "rand 0.8.5", + "rand_distr", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2307,9 +2559,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -2317,21 +2569,20 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -2360,9 +2611,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2370,6 +2621,23 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "ureq", +] + [[package]] name = "hkdf" version = "0.12.3" @@ -2394,7 +2662,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2475,7 +2743,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2512,16 +2780,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2568,12 +2836,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -2599,7 +2880,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2618,7 +2899,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2628,8 +2909,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.9", - "windows-sys", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] @@ -2658,9 +2939,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2680,9 +2961,9 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "pem 1.1.1", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -2856,9 +3137,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" @@ -2884,9 +3165,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -2940,15 +3221,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2992,6 +3273,22 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + [[package]] name = "magic-crypt" version = "3.1.12" @@ -3011,18 +3308,18 @@ dependencies = [ [[package]] name = "mail-builder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765969f4385f88a62738e8ed63e2fa630571d7ed6fd96ca6932d699513dd8c28" +checksum = "ef70f53409852d2612f2249810cbbe0c9931ca25b739b734bafc7f61d88051d4" dependencies = [ "gethostname", ] [[package]] name = "mail-send" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d2b8d0cb56f199d36f527ff96453cf3b1cdfdacb5e4d154ac1d8fcd89873c2" +checksum = "4cbc58a799366b3b2956a2c5ae7e2892ea34b3016343cbbdc5deb844aa6c0973" dependencies = [ "base64 0.20.0", "gethostname", @@ -3031,7 +3328,7 @@ dependencies = [ "smtp-proto", "tokio", "tokio-rustls", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] @@ -3051,9 +3348,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" @@ -3068,18 +3365,29 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", + "stable_deref_trait", +] [[package]] name = "memoffset" @@ -3130,7 +3438,28 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "monostate" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -3146,7 +3475,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "termcolor", "thiserror", ] @@ -3175,7 +3504,7 @@ dependencies = [ "priority-queue", "serde", "serde_json", - "socket2 0.5.3", + "socket2 0.5.5", "thiserror", "tokio", "tokio-native-tls", @@ -3190,10 +3519,10 @@ version = "0.30.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" dependencies = [ - "base64 0.21.3", - "bigdecimal", - "bindgen 0.66.1", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bindgen 0.68.1", + "bitflags 2.4.1", "bitvec", "byteorder", "bytes", @@ -3214,12 +3543,12 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "subprocess", "thiserror", - "time 0.3.28", - "uuid 1.4.1", + "time", + "uuid 1.5.0", ] [[package]] @@ -3246,6 +3575,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -3329,9 +3669,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3348,10 +3688,16 @@ dependencies = [ ] [[package]] -name = "object" -version = "0.32.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3362,6 +3708,28 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + [[package]] name = "opaque-debug" version = "0.3.0" @@ -3385,7 +3753,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3402,7 +3770,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3413,9 +3781,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3423,6 +3791,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "outref" version = "0.5.1" @@ -3437,9 +3811,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3453,15 +3827,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3517,7 +3891,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "serde", ] @@ -3527,7 +3901,7 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "serde", ] @@ -3557,10 +3931,11 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] @@ -3572,7 +3947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -3660,7 +4035,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3698,7 +4073,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3713,6 +4088,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkcs1" version = "0.4.1" @@ -3770,7 +4156,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3786,9 +4172,15 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] +[[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + [[package]] name = "postgres" version = "0.19.7" @@ -3822,15 +4214,15 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "byteorder", "bytes", "fallible-iterator", "hmac", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "stringprep", ] @@ -3847,9 +4239,15 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid 1.4.1", + "uuid 1.5.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" @@ -3874,12 +4272,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3943,9 +4341,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3999,7 +4397,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.29", + "syn 2.0.38", "thiserror", "typify", "unicode-ident", @@ -4019,7 +4417,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4081,6 +4479,18 @@ dependencies = [ "serde", ] +[[package]] +name = "quick_cache" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" +dependencies = [ + "ahash 0.8.3", + "equivalent", + "hashbrown 0.14.2", + "parking_lot", +] + [[package]] name = "quote" version = "1.0.33" @@ -4164,6 +4574,16 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -4174,10 +4594,56 @@ dependencies = [ ] [[package]] -name = "redis" -version = "0.23.2" +name = "raw-cpuid" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd6543a7bc6428396845f6854ccf3d1ae8823816592e2cbe74f20f50f209d02" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] +name = "redis" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" dependencies = [ "async-std", "async-trait", @@ -4189,7 +4655,7 @@ dependencies = [ "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tokio-util", "url", @@ -4213,6 +4679,15 @@ 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_users" version = "0.4.3" @@ -4226,14 +4701,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4247,13 +4722,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4268,6 +4743,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "regress" version = "0.6.0" @@ -4280,21 +4761,21 @@ dependencies = [ [[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.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "async-compression 0.4.1", - "base64 0.21.3", + "async-compression 0.4.4", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4318,6 +4799,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -4334,16 +4816,10 @@ dependencies = [ ] [[package]] -name = "retainer" -version = "0.3.0" +name = "riff" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8c01a8276c14d0f8d51ebcf8a48f0748f9f73f5f6b29e688126e6a52bcb145" -dependencies = [ - "async-lock", - "async-timer", - "log", - "rand 0.8.5", -] +checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" [[package]] name = "ring" @@ -4355,11 +4831,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rkyv" version = "0.7.42" @@ -4374,7 +4864,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4466,7 +4956,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.29", + "syn 2.0.38", "walkdir", ] @@ -4476,7 +4966,7 @@ version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "walkdir", ] @@ -4524,7 +5014,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] @@ -4542,40 +5032,40 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki", "sct", ] @@ -4597,27 +5087,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4686,13 +5166,23 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "safetensors" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "samael" version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bindgen 0.65.1", "chrono", "data-encoding", @@ -4710,7 +5200,7 @@ dependencies = [ "serde", "thiserror", "url", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -4734,28 +5224,28 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "chrono", "dyn-clone", "schemars_derive", "serde", "serde_json", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -4781,8 +5271,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4834,9 +5324,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -4857,10 +5347,16 @@ dependencies = [ ] [[package]] -name = "serde" -version = "1.0.188" +name = "seq-macro" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -4898,13 +5394,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4920,11 +5416,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4980,7 +5476,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5017,7 +5513,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5037,9 +5533,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", @@ -5067,9 +5563,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -5078,18 +5574,18 @@ 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", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -5135,7 +5631,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -5155,9 +5651,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smart-default" @@ -5198,9 +5694,9 @@ checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" [[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", @@ -5208,12 +5704,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5267,6 +5763,18 @@ dependencies = [ "der 0.7.8", ] +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + [[package]] name = "sql-builder" version = "3.1.1" @@ -5279,20 +5787,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -5303,12 +5811,13 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash 0.8.3", "atoi", + "bigdecimal 0.3.1", "byteorder", "bytes", "chrono", @@ -5324,7 +5833,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -5334,7 +5843,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -5342,15 +5851,15 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", "webpki-roots 0.24.0", ] [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -5361,9 +5870,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -5374,7 +5883,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -5387,13 +5896,14 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bitflags 2.4.1", "byteorder", "bytes", "chrono", @@ -5411,7 +5921,7 @@ dependencies = [ "hmac", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", "percent-encoding", @@ -5419,25 +5929,26 @@ dependencies = [ "rsa 0.9.2", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid 1.5.0", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bitflags 2.4.1", "byteorder", "chrono", "crc", @@ -5453,28 +5964,29 @@ dependencies = [ "home", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", + "num-bigint", "once_cell", "rand 0.8.5", "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid 1.5.0", "whoami", ] [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "chrono", @@ -5491,7 +6003,7 @@ dependencies = [ "sqlx-core", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -5555,15 +6067,16 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -5585,15 +6098,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5675,7 +6188,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5684,7 +6197,7 @@ version = "0.107.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "is-macro", "num-bigint", "scoped-tls", @@ -5724,7 +6237,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5767,7 +6280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8d8ca5dd849cea79e6a9792d725f4082ad3ade7a9541fba960c42d55ae778f2" dependencies = [ "better_scoped_tls", - "bitflags 2.4.0", + "bitflags 2.4.1", "indexmap 1.9.3", "once_cell", "phf 0.10.1", @@ -5807,7 +6320,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5911,7 +6424,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5923,7 +6436,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5947,7 +6460,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5963,9 +6476,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5978,6 +6491,39 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "unicode-xid", +] + +[[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 = "tap" version = "1.0.1" @@ -5991,10 +6537,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.9", - "windows-sys", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] @@ -6010,9 +6556,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6028,22 +6574,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6069,23 +6615,13 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -6093,15 +6629,15 @@ 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.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -6130,6 +6666,54 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tinyvector" +version = "0.1.0" +source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" +dependencies = [ + "anyhow", + "bincode", + "lazy_static", + "rayon", + "schemars", + "serde", + "thiserror", + "tracing", +] + +[[package]] +name = "tokenizers" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9be88c795d8b9f9c4002b3a8f26a6d0876103a6f523b32ea3bac52d8560c17c" +dependencies = [ + "aho-corasick", + "clap", + "derive_builder", + "esaxx-rs", + "getrandom 0.2.10", + "indicatif", + "itertools 0.11.0", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand 0.8.5", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + [[package]] name = "tokio" version = "1.32.0" @@ -6144,10 +6728,10 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6158,7 +6742,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6202,7 +6786,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.3", + "socket2 0.5.5", "tokio", "tokio-util", "whoami", @@ -6258,9 +6842,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -6281,9 +6865,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -6302,11 +6886,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -6361,11 +6945,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -6392,11 +6976,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", @@ -6405,25 +6988,36 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-futures" version = "0.2.5" @@ -6511,9 +7105,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typify" @@ -6538,7 +7132,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.29", + "syn 2.0.38", "thiserror", "unicode-ident", ] @@ -6555,7 +7149,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.29", + "syn 2.0.38", "typify-impl", ] @@ -6567,12 +7161,12 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -6656,15 +7250,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-id" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -6675,6 +7269,15 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + [[package]] name = "unicode-segmentation" version = "1.10.1" @@ -6683,9 +7286,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -6718,10 +7321,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.0" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64 0.21.4", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots 0.25.2", +] + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -6765,9 +7393,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom 0.2.10", "serde", @@ -6793,9 +7421,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" [[package]] name = "vcpkg" @@ -6817,15 +7445,15 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[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.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -6846,12 +7474,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" @@ -6879,7 +7501,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -6913,7 +7535,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6961,6 +7583,15 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wav" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" +dependencies = [ + "riff", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -6973,12 +7604,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -6990,22 +7621,13 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - [[package]] name = "webpki-roots" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.4", + "rustls-webpki", ] [[package]] @@ -7016,13 +7638,14 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.20", ] [[package]] @@ -7053,9 +7676,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", ] @@ -7068,11 +7691,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "axum", - "base64 0.21.3", + "base64 0.21.4", "chrono", "dotenv", "futures", @@ -7083,17 +7706,16 @@ dependencies = [ "prometheus", "rand 0.8.5", "reqwest", - "rsa 0.7.2", "rsmq_async", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "tokio", "tokio-metrics", "tracing", "url", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-api", "windmill-api-client", "windmill-common", @@ -7103,7 +7725,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "argon2", @@ -7112,8 +7734,11 @@ dependencies = [ "async-stripe", "async_zip", "axum", - "base64 0.21.3", + "base64 0.21.4", "bytes", + "candle-core", + "candle-nn", + "candle-transformers", "chrono", "chrono-tz", "cookie", @@ -7121,6 +7746,7 @@ dependencies = [ "futures", "git-version", "hex", + "hf-hub", "hmac", "hyper", "itertools 0.11.0", @@ -7129,21 +7755,24 @@ dependencies = [ "mail-send", "mime_guess", "prometheus", + "quick_cache", "rand 0.8.5", "regex", "reqwest", - "retainer", + "rsa 0.7.2", "rsmq_async", "rust-embed", "samael", "serde", "serde_json", "serde_urlencoded", - "sha2 0.10.7", + "sha2 0.10.8", "sql-builder", "sqlx", "tempfile", - "time 0.3.28", + "time", + "tinyvector", + "tokenizers", "tokio", "tokio-tar", "tokio-util", @@ -7153,6 +7782,7 @@ dependencies = [ "tracing", "tracing-subscriber", "urlencoding", + "uuid 1.5.0", "windmill-audit", "windmill-common", "windmill-parser", @@ -7162,10 +7792,11 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.160.0" +version = "1.188.1" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", + "openapiv3", "prettyplease 0.1.25", "progenitor", "progenitor-client", @@ -7174,12 +7805,12 @@ dependencies = [ "serde", "serde_json", "syn 1.0.109", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] name = "windmill-audit" -version = "1.160.0" +version = "1.188.1" dependencies = [ "chrono", "serde", @@ -7192,7 +7823,7 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "axum", @@ -7200,24 +7831,27 @@ dependencies = [ "hex", "hmac", "hyper", + "itertools 0.11.0", "lazy_static", "prometheus", "rand 0.8.5", + "regex", "reqwest", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "thiserror", "tokio", "tracing", + "tracing-flame", "tracing-subscriber", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] name = "windmill-parser" -version = "1.160.0" +version = "1.188.1" dependencies = [ "serde", "serde_json", @@ -7225,7 +7859,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7236,17 +7870,19 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "gosyn", "itertools 0.11.0", + "lazy_static", + "regex", "windmill-parser", ] [[package]] name = "windmill-parser-graphql" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7257,7 +7893,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "itertools 0.11.0", @@ -7268,7 +7904,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", @@ -7285,7 +7921,7 @@ dependencies = [ [[package]] name = "windmill-parser-sql" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "lazy_static", @@ -7296,7 +7932,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7313,7 +7949,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "getrandom 0.2.10", @@ -7331,10 +7967,12 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", + "axum", + "bigdecimal 0.4.2", "chrono", "chrono-tz", "cron", @@ -7353,18 +7991,19 @@ dependencies = [ "tokio", "tracing", "ulid", - "uuid 1.4.1", + "uuid 1.5.0", "windmill-audit", "windmill-common", ] [[package]] name = "windmill-worker" -version = "1.160.0" +version = "1.188.1" dependencies = [ "anyhow", "async-recursion", - "base64 0.21.3", + "base64 0.21.4", + "bytes", "chrono", "const_format", "deno_ast", @@ -7384,24 +8023,25 @@ dependencies = [ "lazy_static", "mysql_async", "native-tls", + "nix", "once_cell", "pem 3.0.2", "postgres-native-tls", "prometheus", "rand 0.8.5", "regex", + "reqwest", "rsmq_async", "rust_decimal", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "tokio", "tokio-postgres", "tracing", "urlencoding", - "uuid 1.4.1", - "windmill-api-client", + "uuid 1.5.0", "windmill-audit", "windmill-common", "windmill-parser", @@ -7416,12 +8056,21 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[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]] @@ -7430,7 +8079,22 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[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]] @@ -7439,51 +8103,93 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[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.5" @@ -7492,9 +8198,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -7506,7 +8212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -7536,12 +8242,68 @@ dependencies = [ "lzma-sys", ] +[[package]] +name = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + [[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" @@ -7563,11 +8325,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/third_party/nixpkgs/pkgs/servers/windmill/default.nix b/third_party/nixpkgs/pkgs/servers/windmill/default.nix index f3d58aaa89..a10610ea19 100644 --- a/third_party/nixpkgs/pkgs/servers/windmill/default.nix +++ b/third_party/nixpkgs/pkgs/servers/windmill/default.nix @@ -16,7 +16,6 @@ , pixman , pkg-config , python3 -, rust , rustfmt , stdenv , swagger-cli @@ -24,13 +23,13 @@ let pname = "windmill"; - version = "1.160.0"; + version = "1.188.1"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-WsIYGqBBcLq5CE/zcgqPVCYtxM3GfSxSqF2JeW6C0ss="; + hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -43,7 +42,11 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-GUrOfN3SyxkvQllgHXDao8JFl5zY4DBxftelsX0Rkqo="; + npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; + + # without these you get a + # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory + env.NODE_OPTIONS="--max-old-space-size=8192"; preBuild = '' npm run generate-backend-client @@ -66,11 +69,10 @@ rustPlatform.buildRustPackage { SQLX_OFFLINE = "true"; RUSTY_V8_ARCHIVE = let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); meta = { inherit (args) version; }; }; @@ -90,6 +92,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; + "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; }; }; @@ -101,7 +104,7 @@ rustPlatform.buildRustPackage { ]; postPatch = '' - substituteInPlace windmill-worker/src/worker.rs \ + substituteInPlace windmill-worker/src/bash_executor.rs \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace windmill-api/src/lib.rs \ @@ -154,7 +157,7 @@ rustPlatform.buildRustPackage { description = "Open-source developer platform to turn scripts into workflows and UIs"; homepage = "https://windmill.dev"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ dit7ya happysalada ]; mainProgram = "windmill"; # limited by librusty_v8 platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix index 33a8f0ae2c..93986677b2 100644 --- a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-NOR7YCLcwjf+oAi46qL6NteKLMSvJpqu9UzO6UvgcVQ="; + sha256 = "sha256-NSL67j/nnE6Ftm39XNav3/TPUSFXHxQE5OxpNEIdtVc="; }; - vendorHash = "sha256-v8R0e52CpyLKiuYcEZFWAY64tgCBZE2dY0vgqsHWeAc="; + vendorHash = "sha256-8TQkzsvHjdkYXVmUKaqbs7nURx8kUv2HGs9cBv3hPJc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/builder.sh b/third_party/nixpkgs/pkgs/servers/x11/xorg/builder.sh index a9c607ae35..833acf43a5 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/builder.sh +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # This is the builder for all X.org components. source $stdenv/setup diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index bd499329e2..e561e854a7 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -6,7 +6,7 @@ self: with self; { inherit pixman; # THIS IS A GENERATED FILE. DO NOT EDIT! - appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "appres"; version = "1.0.6"; builder = ./builder.sh; @@ -18,11 +18,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "bdftopcf"; version = "1.1.1"; builder = ./builder.sh; @@ -34,11 +38,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "bitmap"; version = "1.1.0"; builder = ./builder.sh; @@ -50,11 +58,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + editres = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "editres"; version = "1.0.8"; builder = ./builder.sh; @@ -66,11 +78,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "encodings"; version = "1.0.7"; builder = ./builder.sh; @@ -82,11 +98,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-adobe-100dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -100,11 +120,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-adobe-75dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -118,11 +142,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-adobe-utopia-100dpi"; version = "1.0.5"; builder = ./builder.sh; @@ -136,11 +164,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-adobe-utopia-75dpi"; version = "1.0.5"; builder = ./builder.sh; @@ -154,11 +186,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-adobe-utopia-type1"; version = "1.0.5"; builder = ./builder.sh; @@ -172,11 +208,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + fontalias = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-alias"; version = "1.0.5"; builder = ./builder.sh; @@ -188,11 +228,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-arabic-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -206,11 +250,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-100dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -224,11 +272,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-75dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -242,11 +294,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-lucidatypewriter-100dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -260,11 +316,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-lucidatypewriter-75dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -278,11 +338,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-ttf"; version = "1.0.4"; builder = ./builder.sh; @@ -296,11 +360,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bh-type1"; version = "1.0.4"; builder = ./builder.sh; @@ -314,11 +382,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bitstream-100dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -332,11 +404,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bitstream-75dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -350,11 +426,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstreamspeedo = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbitstreamspeedo = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bitstream-speedo"; version = "1.0.2"; builder = ./builder.sh; @@ -368,11 +448,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-bitstream-type1"; version = "1.0.4"; builder = ./builder.sh; @@ -386,11 +470,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-cronyx-cyrillic"; version = "1.0.4"; builder = ./builder.sh; @@ -404,11 +492,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-cursor-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -422,11 +514,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-daewoo-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -440,11 +536,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-dec-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -458,11 +558,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-ibm-type1"; version = "1.0.4"; builder = ./builder.sh; @@ -476,11 +580,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-isas-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -494,11 +602,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-jis-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -512,11 +624,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-micro-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -530,11 +646,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-misc-cyrillic"; version = "1.0.4"; builder = ./builder.sh; @@ -548,11 +668,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-misc-ethiopic"; version = "1.0.5"; builder = ./builder.sh; @@ -566,11 +690,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-misc-meltho"; version = "1.0.4"; builder = ./builder.sh; @@ -584,11 +712,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-misc-misc"; version = "1.1.3"; builder = ./builder.sh; @@ -602,11 +734,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-mutt-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -620,11 +756,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-schumacher-misc"; version = "1.1.3"; builder = ./builder.sh; @@ -638,11 +778,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-screen-cyrillic"; version = "1.0.5"; builder = ./builder.sh; @@ -656,11 +800,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-sony-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -674,11 +822,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-sun-misc"; version = "1.0.4"; builder = ./builder.sh; @@ -692,43 +844,55 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation { + fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "fonttosfnt"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2"; - sha256 = "0r1s43ypy0a9z6hzdq5y02s2acj965rax4flwdyylvc54ppv86qs"; + url = "mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz"; + sha256 = "1bv1glfz4jqvkwx8hmv2vqilvxxl6jww3rvbzv6zbl6b83r96yma"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + fontutil = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-util"; - version = "1.4.0"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.4.0.tar.xz"; - sha256 = "0z8gsi0bz5nnpsl008fyb4isrkrqrmhxjar5ywwpx30j83wlnwlz"; + url = "mirror://xorg/individual/font/font-util-1.4.1.tar.xz"; + sha256 = "15fcd3rzlgm51fwgfapg6vzyd1kkd28rj149xq7iajqr7h9697sw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "fontutil" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-winitzki-cyrillic"; version = "1.0.4"; builder = ./builder.sh; @@ -742,11 +906,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale, testers }: stdenv.mkDerivation (finalAttrs: { pname = "font-xfree86-type1"; version = "1.0.5"; builder = ./builder.sh; @@ -760,11 +928,15 @@ self: with self; { buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' ''; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + gccmakedep = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "gccmakedep"; version = "1.0.3"; builder = ./builder.sh; @@ -776,11 +948,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "iceauth"; version = "1.0.9"; builder = ./builder.sh; @@ -792,11 +968,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + ico = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "ico"; version = "1.0.6"; builder = ./builder.sh; @@ -808,11 +988,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "imake"; version = "1.0.9"; builder = ./builder.sh; @@ -824,11 +1008,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libAppleWM"; version = "1.4.1"; builder = ./builder.sh; @@ -840,11 +1028,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "applewm" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libFS"; version = "1.0.9"; builder = ./builder.sh; @@ -856,11 +1048,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "libfs" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libICE"; version = "1.1.1"; builder = ./builder.sh; @@ -872,11 +1068,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "ice" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libuuid, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libSM"; version = "1.2.4"; builder = ./builder.sh; @@ -888,11 +1088,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "sm" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libWindowsWM"; version = "1.0.1"; builder = ./builder.sh; @@ -904,27 +1108,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "windowswm" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.6"; + version = "1.8.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.6.tar.xz"; - sha256 = "1jawl8zp1h7hdmxx1sc6kmxkki187d9yixr2l03ai6wqqry5nlsr"; + url = "mirror://xorg/individual/lib/libX11-1.8.7.tar.xz"; + sha256 = "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpthreadstubs libxcb xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "x11" "x11-xcb" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXScrnSaver"; version = "1.2.4"; builder = ./builder.sh; @@ -936,11 +1148,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xscrnsaver" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + libXTrap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXTrap"; version = "1.0.1"; builder = ./builder.sh; @@ -952,11 +1168,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xtrap" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXau"; version = "1.0.11"; builder = ./builder.sh; @@ -968,11 +1188,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xau" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXmu, libXpm, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXaw"; version = "1.0.15"; builder = ./builder.sh; @@ -984,11 +1208,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xaw6" "xaw7" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXcomposite"; version = "0.4.6"; builder = ./builder.sh; @@ -1000,11 +1228,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcomposite" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXcursor"; version = "1.2.1"; builder = ./builder.sh; @@ -1016,11 +1248,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcursor" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXfixes, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXdamage"; version = "1.1.6"; builder = ./builder.sh; @@ -1032,11 +1268,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xdamage" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXdmcp"; version = "1.1.4"; builder = ./builder.sh; @@ -1048,11 +1288,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xdmcp" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXext"; version = "1.3.5"; builder = ./builder.sh; @@ -1064,11 +1308,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xext" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXfixes"; version = "6.0.1"; builder = ./builder.sh; @@ -1080,11 +1328,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xfixes" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXfont"; version = "1.5.4"; builder = ./builder.sh; @@ -1096,11 +1348,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xfont" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXfont2"; version = "2.0.6"; builder = ./builder.sh; @@ -1112,11 +1368,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xfont2" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXft"; version = "2.3.8"; builder = ./builder.sh; @@ -1128,11 +1388,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xft" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXi"; version = "1.8.1"; builder = ./builder.sh; @@ -1144,11 +1408,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xi" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXinerama"; version = "1.1.5"; builder = ./builder.sh; @@ -1160,11 +1428,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xinerama" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXmu"; version = "1.1.4"; builder = ./builder.sh; @@ -1176,11 +1448,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xmuu" "xmu" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXau, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXp"; version = "1.0.4"; builder = ./builder.sh; @@ -1192,27 +1468,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXau libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xp" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, libXt, gettext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXpm"; - version = "3.5.16"; + version = "3.5.17"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXpm-3.5.16.tar.xz"; - sha256 = "0lczckznwbzsf5pca487g8bzbqjgj3a96z78cz69pgcxlskmvg76"; + url = "mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz"; + sha256 = "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xpm" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes, libXrandr }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXfixes, libXrandr, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXpresent"; version = "1.0.1"; builder = ./builder.sh; @@ -1224,27 +1508,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xpresent" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXrandr"; - version = "1.5.3"; + version = "1.5.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz"; - sha256 = "0a5l9q37c9m6gfdchlj43a9j3mw2avfwasfn0ivlkqbq980kjxl9"; + url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz"; + sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xrandr" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXrender"; version = "0.9.11"; builder = ./builder.sh; @@ -1256,11 +1548,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xrender" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXres"; version = "1.2.2"; builder = ./builder.sh; @@ -1272,11 +1568,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xres" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXt"; version = "1.3.0"; builder = ./builder.sh; @@ -1288,11 +1588,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto libSM libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xt" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXtst"; version = "1.2.4"; builder = ./builder.sh; @@ -1304,11 +1608,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xtst" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXv"; version = "1.0.12"; builder = ./builder.sh; @@ -1320,11 +1628,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xv" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXvMC"; version = "1.0.13"; builder = ./builder.sh; @@ -1336,11 +1648,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXv ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xvmc-wrapper" "xvmc" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXxf86dga"; version = "1.1.6"; builder = ./builder.sh; @@ -1352,11 +1668,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xxf86dga" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXxf86misc"; version = "1.0.4"; builder = ./builder.sh; @@ -1368,11 +1688,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xxf86misc" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXxf86vm"; version = "1.1.5"; builder = ./builder.sh; @@ -1384,11 +1708,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xxf86vm" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libdmx"; version = "1.1.5"; builder = ./builder.sh; @@ -1400,11 +1728,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "dmx" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libfontenc"; version = "1.1.7"; builder = ./builder.sh; @@ -1416,11 +1748,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "fontenc" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, hwdata, zlib }: stdenv.mkDerivation { + libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, hwdata, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libpciaccess"; version = "0.17"; builder = ./builder.sh; @@ -1433,43 +1769,55 @@ self: with self; { nativeBuildInputs = [ pkg-config ]; buildInputs = [ hwdata zlib ]; configureFlags = [ "--with-pciids-path=${hwdata}/share/hwdata" ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "pciaccess" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libpthread-stubs"; - version = "0.4"; + version = "0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2"; - sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; + url = "mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz"; + sha256 = "1g224hyy694jch54357zc895z46r90xs193hg4m7rfnfxinmdnjr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "pthread-stubs" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxcb"; - version = "1.15"; + version = "1.16"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.15.tar.xz"; - sha256 = "0nd035rf83xf531cnjzsf9ykb5w9rdzz6bbyhi683xkwh57p8f6c"; + url = "mirror://xorg/individual/lib/libxcb-1.16.tar.xz"; + sha256 = "0w8xf6ff6axvla734lfb2291hrjrqqhn6mqabvdrdwgvl1m5cj23"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-composite" "xcb-xtest" "xcb-record" "xcb-glx" "xcb-dpms" "xcb-xevie" "xcb-dri2" "xcb-shm" "xcb-sync" "xcb-xprint" "xcb-dri3" "xcb-screensaver" "xcb-render" "xcb-xkb" "xcb-xinput" "xcb-shape" "xcb-ge" "xcb-xfixes" "xcb" "xcb-damage" "xcb-present" "xcb-xf86dri" "xcb-xvmc" "xcb-randr" "xcb-xinerama" "xcb-xselinux" "xcb-xv" "xcb-res" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja }: stdenv.mkDerivation { + libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxcvt"; version = "0.1.2"; builder = ./builder.sh; @@ -1481,11 +1829,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxkbfile"; version = "1.1.2"; builder = ./builder.sh; @@ -1497,11 +1849,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xkbfile" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxshmfence"; version = "1.3.2"; builder = ./builder.sh; @@ -1513,11 +1869,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xshmfence" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + listres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, xorgproto, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "listres"; version = "1.0.5"; builder = ./builder.sh; @@ -1529,11 +1889,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "lndir"; version = "1.0.4"; builder = ./builder.sh; @@ -1545,27 +1909,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - luit = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + luit = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "luit"; - version = "20190106"; + version = "20230201"; builder = ./builder.sh; src = fetchurl { - url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; - sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; + url = "https://invisible-mirror.net/archives/luit/luit-20230201.tgz"; + sha256 = "0vy5fqp26pnrdn0hmgnmar6m2y06syrz188jqh03vqkyphfqsapf"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "makedepend"; version = "1.0.8"; builder = ./builder.sh; @@ -1577,11 +1949,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "mkfontscale"; version = "1.2.2"; builder = ./builder.sh; @@ -1593,11 +1969,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "oclock"; version = "1.0.5"; builder = ./builder.sh; @@ -1609,11 +1989,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "sessreg"; version = "1.1.3"; builder = ./builder.sh; @@ -1625,11 +2009,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, libXrandr }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, libXrandr, testers }: stdenv.mkDerivation (finalAttrs: { pname = "setxkbmap"; version = "1.3.4"; builder = ./builder.sh; @@ -1641,11 +2029,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + smproxy = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libXmu, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "smproxy"; version = "1.0.7"; builder = ./builder.sh; @@ -1657,11 +2049,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + transset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "transset"; version = "1.0.3"; builder = ./builder.sh; @@ -1673,11 +2069,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXrandr, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXext, libXmu, xorgproto, libXrandr, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "twm"; version = "1.0.12"; builder = ./builder.sh; @@ -1689,11 +2089,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXrandr libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + utilmacros = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "util-macros"; version = "1.20.0"; builder = ./builder.sh; @@ -1705,11 +2109,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-macros" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + viewres = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "viewres"; version = "1.0.7"; builder = ./builder.sh; @@ -1721,11 +2129,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "x11perf"; version = "1.6.1"; builder = ./builder.sh; @@ -1737,11 +2149,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXext, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xauth"; version = "1.1.2"; builder = ./builder.sh; @@ -1753,11 +2169,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { + xbacklight = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, xcbutil, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xbacklight"; version = "1.2.3"; builder = ./builder.sh; @@ -1769,11 +2189,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutil ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xbitmaps = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xbitmaps"; version = "1.1.3"; builder = ./builder.sh; @@ -1785,11 +2209,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xbitmaps" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xcalc = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcalc"; version = "1.1.2"; builder = ./builder.sh; @@ -1801,27 +2229,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { + xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-proto"; - version = "1.15.2"; + version = "1.16.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xcb-proto-1.15.2.tar.xz"; - sha256 = "1vak6q53abwxnkfn6by7j24m48kd2iy7jnskkqzzx8l0ysqvwwkh"; + url = "mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz"; + sha256 = "06aij66rs8g378wg8swd7b3g73wqrrbbwl8shhnsi29amm41hnm7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-proto" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util"; version = "0.4.1"; builder = ./builder.sh; @@ -1833,11 +2269,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-atom" "xcb-event" "xcb-aux" "xcb-util" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-cursor"; version = "0.1.4"; builder = ./builder.sh; @@ -1849,11 +2289,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-cursor" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4, python3 }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbproto, xorgproto, m4, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-errors"; version = "1.0.1"; builder = ./builder.sh; @@ -1865,11 +2309,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 python3 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-errors" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutil, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-image"; version = "0.4.1"; builder = ./builder.sh; @@ -1881,11 +2329,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-image" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-keysyms"; version = "0.4.1"; builder = ./builder.sh; @@ -1897,11 +2349,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-keysyms" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-renderutil"; version = "0.3.10"; builder = ./builder.sh; @@ -1913,11 +2369,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-renderutil" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4 }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-wm"; version = "0.4.2"; builder = ./builder.sh; @@ -1929,11 +2389,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xcb-icccm" "xcb-ewmh" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xclock"; version = "1.1.1"; builder = ./builder.sh; @@ -1945,11 +2409,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11 }: stdenv.mkDerivation { + xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcmsdb"; version = "1.0.6"; builder = ./builder.sh; @@ -1961,11 +2429,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, xorgproto, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkg-config, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, xorgproto, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcompmgr"; version = "1.1.9"; builder = ./builder.sh; @@ -1977,11 +2449,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes xorgproto libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xconsole = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xconsole"; version = "1.0.8"; builder = ./builder.sh; @@ -1993,11 +2469,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor, xorgproto }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkg-config, fetchurl, libpng, libX11, libXcursor, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcursorgen"; version = "1.0.8"; builder = ./builder.sh; @@ -2009,11 +2489,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXcursor xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor }: stdenv.mkDerivation { + xcursorthemes = callPackage ({ stdenv, pkg-config, fetchurl, libXcursor, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcursor-themes"; version = "1.0.7"; builder = ./builder.sh; @@ -2025,11 +2509,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcursor ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xdm"; version = "1.1.14"; builder = ./builder.sh; @@ -2041,11 +2529,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkg-config, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xorgproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xdpyinfo"; version = "1.3.4"; builder = ./builder.sh; @@ -2057,11 +2549,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkg-config, fetchurl, libGL, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xdriinfo"; version = "1.0.7"; builder = ./builder.sh; @@ -2073,11 +2569,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL xorgproto libX11 ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xev"; version = "1.2.5"; builder = ./builder.sh; @@ -2089,11 +2589,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, libXext, libXi, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, libXext, libXi, libXmu, xorgproto, libXrender, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xeyes"; version = "1.3.0"; builder = ./builder.sh; @@ -2105,11 +2609,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb libXext libXi libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-evdev"; version = "2.10.6"; builder = ./builder.sh; @@ -2121,11 +2629,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-evdev" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-joystick"; version = "1.6.4"; builder = ./builder.sh; @@ -2137,11 +2649,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-joystick" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-keyboard"; version = "2.0.0"; builder = ./builder.sh; @@ -2153,27 +2669,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-libinput"; - version = "1.3.0"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.3.0.tar.xz"; - sha256 = "1fqsik2hdibz7zx7bb2rkh6wadz0p31xpd50ljsnij9bl8hblihl"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz"; + sha256 = "1673ydfrvfqd4inz3vx1qyxa0mhr0f4bi0r7mrcmpisxi76i8g9s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libinput xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-libinput" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-mouse"; version = "1.9.5"; builder = ./builder.sh; @@ -2185,11 +2709,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-mouse" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-synaptics"; version = "1.9.2"; builder = ./builder.sh; @@ -2201,11 +2729,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-synaptics" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-vmmouse"; version = "13.2.0"; builder = ./builder.sh; @@ -2217,11 +2749,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto udev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-void"; version = "1.4.2"; builder = ./builder.sh; @@ -2233,11 +2769,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-amdgpu"; version = "23.0.0"; builder = ./builder.sh; @@ -2249,11 +2789,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoapm = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-apm"; version = "1.3.0"; builder = ./builder.sh; @@ -2265,11 +2809,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ark"; version = "0.7.6"; builder = ./builder.sh; @@ -2281,11 +2829,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ast"; version = "1.1.6"; builder = ./builder.sh; @@ -2297,27 +2849,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ati"; - version = "5eba006e4129e8015b822f9e1d2f1e613e252cda"; + version = "22.0.0"; builder = ./builder.sh; src = fetchurl { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2"; - sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b"; + url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz"; + sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-chips"; version = "1.4.0"; builder = ./builder.sh; @@ -2329,11 +2889,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-cirrus"; version = "1.6.0"; builder = ./builder.sh; @@ -2345,11 +2909,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-dummy"; version = "0.4.1"; builder = ./builder.sh; @@ -2361,11 +2929,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-fbdev"; version = "0.5.0"; builder = ./builder.sh; @@ -2377,11 +2949,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-geode"; version = "2.11.21"; builder = ./builder.sh; @@ -2393,11 +2969,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-glide"; version = "1.2.2"; builder = ./builder.sh; @@ -2409,11 +2989,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkg-config, fetchurl, libpciaccess, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-glint"; version = "1.2.9"; builder = ./builder.sh; @@ -2425,11 +3009,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-i128"; version = "1.4.1"; builder = ./builder.sh; @@ -2441,11 +3029,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-i740"; version = "1.4.0"; builder = ./builder.sh; @@ -2457,11 +3049,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkg-config, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-intel"; version = "2.99.917"; builder = ./builder.sh; @@ -2473,11 +3069,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-mga"; version = "2.0.1"; builder = ./builder.sh; @@ -2489,11 +3089,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-neomagic"; version = "1.3.1"; builder = ./builder.sh; @@ -2505,11 +3109,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-newport"; version = "0.2.4"; builder = ./builder.sh; @@ -2521,11 +3129,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonouveau = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-nouveau"; version = "3ee7cbca8f9144a3bb5be7f71ce70558f548d268"; builder = ./builder.sh; @@ -2537,11 +3149,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-nv"; version = "2.1.22"; builder = ./builder.sh; @@ -2553,11 +3169,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver }: stdenv.mkDerivation { + xf86videoomap = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-omap"; version = "0.4.5"; builder = ./builder.sh; @@ -2569,11 +3189,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, libXvMC, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-openchrome"; version = "0.6.0"; builder = ./builder.sh; @@ -2585,11 +3209,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-qxl"; version = "0.1.6"; builder = ./builder.sh; @@ -2601,11 +3229,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-r128"; version = "6.12.1"; builder = ./builder.sh; @@ -2617,11 +3249,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-rendition"; version = "4.2.7"; builder = ./builder.sh; @@ -2633,11 +3269,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-s3virge"; version = "1.11.1"; builder = ./builder.sh; @@ -2649,11 +3289,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-savage"; version = "2.4.0"; builder = ./builder.sh; @@ -2665,11 +3309,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-siliconmotion"; version = "1.7.10"; builder = ./builder.sh; @@ -2681,11 +3329,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-sis"; version = "0.12.0"; builder = ./builder.sh; @@ -2697,11 +3349,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-sisusb"; version = "0.9.7"; builder = ./builder.sh; @@ -2713,11 +3369,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-suncg6"; version = "1.1.3"; builder = ./builder.sh; @@ -2729,11 +3389,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-sunffb"; version = "1.2.3"; builder = ./builder.sh; @@ -2745,11 +3409,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-sunleo"; version = "1.2.3"; builder = ./builder.sh; @@ -2761,11 +3429,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-tdfx"; version = "1.5.0"; builder = ./builder.sh; @@ -2777,11 +3449,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-tga"; version = "1.2.2"; builder = ./builder.sh; @@ -2793,11 +3469,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-trident"; version = "1.4.0"; builder = ./builder.sh; @@ -2809,11 +3489,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-v4l"; version = "0.3.0"; builder = ./builder.sh; @@ -2825,11 +3509,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovboxvideo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-vboxvideo"; version = "1.0.0"; builder = ./builder.sh; @@ -2841,11 +3529,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-vesa"; version = "2.6.0"; builder = ./builder.sh; @@ -2857,11 +3549,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, udev, libpciaccess, libX11, libXext, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-vmware"; version = "13.4.0"; builder = ./builder.sh; @@ -2873,11 +3569,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-voodoo"; version = "1.2.6"; builder = ./builder.sh; @@ -2889,11 +3589,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkg-config, fetchurl, xorgserver, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-wsfb"; version = "0.4.0"; builder = ./builder.sh; @@ -2905,11 +3609,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-xgi"; version = "1.6.1"; builder = ./builder.sh; @@ -2921,11 +3629,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xfd"; version = "1.1.4"; builder = ./builder.sh; @@ -2937,11 +3649,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xfontsel = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xfontsel"; version = "1.1.0"; builder = ./builder.sh; @@ -2953,11 +3669,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkg-config, fetchurl, libXfont2, xorgproto, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xfs"; version = "1.2.1"; builder = ./builder.sh; @@ -2969,11 +3689,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXfont2 xorgproto xtrans ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + xfsinfo = callPackage ({ stdenv, pkg-config, fetchurl, libFS, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xfsinfo"; version = "1.0.7"; builder = ./builder.sh; @@ -2985,11 +3709,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libFS xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXxf86vm, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xgamma"; version = "1.0.7"; builder = ./builder.sh; @@ -3001,11 +3729,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xgc"; version = "1.0.6"; builder = ./builder.sh; @@ -3017,11 +3749,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto, gettext }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXau, libXmu, xorgproto, gettext, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xhost"; version = "1.0.9"; builder = ./builder.sh; @@ -3033,11 +3769,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xinit"; version = "1.4.2"; builder = ./builder.sh; @@ -3049,11 +3789,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXi, libXinerama, libXrandr, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xinput"; version = "1.6.4"; builder = ./builder.sh; @@ -3065,11 +3809,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbcomp"; version = "1.4.6"; builder = ./builder.sh; @@ -3081,11 +3829,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xkbcomp" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { + xkbevd = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbevd"; version = "1.1.5"; builder = ./builder.sh; @@ -3097,11 +3849,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbprint"; version = "1.0.6"; builder = ./builder.sh; @@ -3113,11 +3869,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbutils"; version = "1.0.5"; builder = ./builder.sh; @@ -3129,27 +3889,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.39"; + version = "2.40"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.39.tar.xz"; - sha256 = "10m6mbjymi7qf30g5yd400kqijdjg7ym9qjzh0bc3c7pxwrzbias"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz"; + sha256 = "1qrakn6gyj701mxwbrlhjv4gd73ws51140ns68a1kivxxhdvlgbs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkill"; version = "1.0.6"; builder = ./builder.sh; @@ -3161,11 +3929,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xload"; version = "1.1.4"; builder = ./builder.sh; @@ -3177,11 +3949,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config gettext wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + xlsatoms = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xlsatoms"; version = "1.1.4"; builder = ./builder.sh; @@ -3193,11 +3969,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb }: stdenv.mkDerivation { + xlsclients = callPackage ({ stdenv, pkg-config, fetchurl, libxcb, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xlsclients"; version = "1.1.5"; builder = ./builder.sh; @@ -3209,11 +3989,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xlsfonts"; version = "1.0.7"; builder = ./builder.sh; @@ -3225,11 +4009,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmag"; version = "1.0.7"; builder = ./builder.sh; @@ -3241,11 +4029,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libX11 libXaw libXmu libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmessage"; version = "1.0.6"; builder = ./builder.sh; @@ -3257,11 +4049,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmodmap"; version = "1.0.11"; builder = ./builder.sh; @@ -3273,11 +4069,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmore"; version = "1.0.3"; builder = ./builder.sh; @@ -3289,11 +4089,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libXaw libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-cf-files"; version = "1.0.8"; builder = ./builder.sh; @@ -3305,11 +4109,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xorgdocs = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-docs"; version = "1.7.2"; builder = ./builder.sh; @@ -3321,11 +4129,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3 }: stdenv.mkDerivation { + xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorgproto"; version = "2023.2"; builder = ./builder.sh; @@ -3337,27 +4149,35 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xf86vidmodeproto" "xineramaproto" "xproxymngproto" "glproto" "presentproto" "applewmproto" "xcmiscproto" "recordproto" "resourceproto" "printproto" "xcalibrateproto" "renderproto" "fontsproto" "dpmsproto" "kbproto" "videoproto" "dri2proto" "bigreqsproto" "dri3proto" "evieproto" "inputproto" "fixesproto" "lg3dproto" "xf86rushproto" "compositeproto" "xwaylandproto" "trapproto" "dmxproto" "xextproto" "xproto" "xf86dgaproto" "xf86miscproto" "xf86bigfontproto" "windowswmproto" "scrnsaverproto" "damageproto" "xf86driproto" "randrproto" "fontcacheproto" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.8"; + version = "21.1.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz"; - sha256 = "0lmimvaw9x0ymdhjfqsrbx689bcapy8c24ajw9705j2harrxpaiq"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz"; + sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto openssl libX11 libXau libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-server" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xorgsgmldoctools = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-sgml-doctools"; version = "1.12"; builder = ./builder.sh; @@ -3369,11 +4189,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xorg-sgml-doctools" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xpr"; version = "1.1.0"; builder = ./builder.sh; @@ -3385,11 +4209,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xprop"; version = "1.2.6"; builder = ./builder.sh; @@ -3401,11 +4229,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXrandr, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xrandr"; version = "1.5.2"; builder = ./builder.sh; @@ -3417,11 +4249,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xrdb"; version = "1.2.2"; builder = ./builder.sh; @@ -3433,11 +4269,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xrefresh"; version = "1.0.7"; builder = ./builder.sh; @@ -3449,11 +4289,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXext, libXmu, xorgproto, libXxf86misc, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xset"; version = "1.2.5"; builder = ./builder.sh; @@ -3465,11 +4309,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto }: stdenv.mkDerivation { + xsetroot = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xbitmaps, libXcursor, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xsetroot"; version = "1.1.3"; builder = ./builder.sh; @@ -3481,11 +4329,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook }: stdenv.mkDerivation { + xsm = callPackage ({ stdenv, pkg-config, fetchurl, libICE, libSM, libX11, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xsm"; version = "1.0.5"; builder = ./builder.sh; @@ -3497,11 +4349,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; buildInputs = [ libICE libSM libX11 libXaw xorgproto libXt ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + xstdcmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXmu, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xstdcmap"; version = "1.0.5"; builder = ./builder.sh; @@ -3513,11 +4369,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xtrans = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { + xtrans = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrans"; version = "1.5.0"; builder = ./builder.sh; @@ -3529,11 +4389,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "xtrans" ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXt, libXTrap, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xtrap"; version = "1.0.3"; builder = ./builder.sh; @@ -3545,11 +4409,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXTrap ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, libXv, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xvinfo"; version = "1.1.5"; builder = ./builder.sh; @@ -3561,11 +4429,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXv ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkg-config, fetchurl, libxkbfile, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xwd"; version = "1.0.9"; builder = ./builder.sh; @@ -3577,11 +4449,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxcb, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xwininfo"; version = "1.1.6"; builder = ./builder.sh; @@ -3593,11 +4469,15 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xwud"; version = "1.0.6"; builder = ./builder.sh; @@ -3609,7 +4489,11 @@ self: with self; { strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; - meta.platforms = lib.platforms.unix; - }) {}; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ ]; + platforms = lib.platforms.unix; + }; + })) {}; } diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 819adafd6a..175ee92208 100755 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -18,6 +18,7 @@ my %pkgVersions; my %pkgRequires; my %pkgNativeRequires; +my %pcProvides; my %pcMap; my %extraAttrs; @@ -112,6 +113,7 @@ while (<>) { my $pc = $pcFile; $pc =~ s/.*\///; $pc =~ s/.pc.in//; + push @{$pcProvides{$pkg}}, $pc; print "PROVIDES $pc\n"; die "collision with $pcMap{$pc}" if defined $pcMap{$pc}; $pcMap{$pc} = $pkg; @@ -328,9 +330,14 @@ foreach my $pkg (sort (keys %pkgURLs)) { $extraAttrsStr = join "", map { "\n " . $_ } @{$extraAttrs{$pkg}}; } + my $pcProvidesStr = ""; + if (defined $pcProvides{$pkg}) { + $pcProvidesStr = join "", map { "\"" . $_ . "\" " } @{$pcProvides{$pkg}}; + } + print OUT < .rev - rm -rf .git + rm -rf .git .github ) done + # not a typo; comes from `make deps` rm deps/.got cp -r deps $out @@ -70,7 +83,7 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-Lj4YSPOiiJQ6uN4cAR+1s/eVSfoIsuvWR7gGkVYrOfc="; + outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI="; }; configureFlags = [ @@ -99,6 +112,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''} rm $out/bin/{mix,iex,elixir} ''; diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index bb8b68c17d..dc9df3e188 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -2,7 +2,6 @@ , icu , lua , nixosTests -, withLibevent ? true , withDBI ? true # use withExtraLibs to add additional dependencies of community modules , withExtraLibs ? [ ] @@ -16,7 +15,6 @@ let luaEnv = lua.withPackages(p: with p; [ luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound ] - ++ lib.optional withLibevent p.luaevent ++ lib.optional withDBI p.luadbi ++ withExtraLuaPackages p ); @@ -86,6 +84,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://prosody.im"; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index a93163b560..1b8ae2e317 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.33.1"; + version = "1.33.2"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-Rd8PJWKPUriVf3BmHFvhmb+SQskVeqOFdJB8Gsopgnw="; + hash = "sha256-pRY4FOIJwsLSKYieN0D1esKdoUqx62NMFgiYXaXguJ0="; }; - npmDepsHash = "sha256-rEqbwdeIQg6YS7uLeoP2uMbJWsnovIHBVp9CPlTc2NY="; + npmDepsHash = "sha256-9bOFM8Ie0334H2L94ypgkMrB6zyVJ9YTvNnKeBJjOUI="; nativeBuildInputs = [ python3 diff --git a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix index 1df644b9fb..6590f10fbb 100644 --- a/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zookeeper/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: let - # Latest supported LTS JDK for Zookeeper 3.6: - # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware + # Latest supported LTS JDK for Zookeeper 3.7: + # https://zookeeper.apache.org/doc/r3.7.2/zookeeperAdmin.html#sc_requiredSoftware jre = jdk11_headless; in stdenv.mkDerivation rec { pname = "zookeeper"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; - hash = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ=="; + hash = "sha512-avv8GvyLk3AoG9mGLzfbscuV7FS7LtQ3GDGqXA8Iz+53UFC9V85fwINuYa8n7tnwB29UuYmX3Q4VFZGWBW5S6g=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix b/third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix index af516a1bca..d6cc156cba 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/nix-bash-completions/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { postPatch = '' # Nix 2.4+ provides its own completion for the nix command, see https://github.com/hedning/nix-bash-completions/issues/20 - substituteInPlace _nix --replace 'nix nixos-option' 'nixos-option' + # NixOS provides its own completions for nixos-rebuild now. + substituteInPlace _nix \ + --replace 'nix nixos-option' 'nixos-option' \ + --replace 'nixos-rebuild nixos-install' 'nixos-install' ''; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/carapace/default.nix b/third_party/nixpkgs/pkgs/shells/carapace/default.nix index ee5f254089..2fef908935 100644 --- a/third_party/nixpkgs/pkgs/shells/carapace/default.nix +++ b/third_party/nixpkgs/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.27.0"; + version = "0.28.3"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-UcJbWOYkNUJEilJL/LG5o+I1ugqEOEGfs+uvKUMnTMU="; + hash = "sha256-d56tA+tTlnwE9t0toJCCpRwNXGNwNVastdcJPunCO0c="; }; - vendorHash = "sha256-PN8ARsJQqRj333ervoy24PZoWkrCIYiGxOovzEhPNZQ="; + vendorHash = "sha256-jbKF68fPwMigKSoSOP6pJMjn+PW2yeI/oZKv2ytoHuY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index 4df95a9ca6..1fa5b9c615 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH - builtin status --is-login + builtin status is-login or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" ${if fishEnvPreInit != null then '' and begin @@ -298,7 +298,7 @@ let homepage = "https://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ cole-h winter srapenne ]; + maintainers = with maintainers; [ cole-h winter ]; mainProgram = "fish"; }; diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix index e39f619853..417ac87257 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefish.nix @@ -3,15 +3,15 @@ , fetchFromGitHub , }: -buildFishPlugin rec { +buildFishPlugin { pname = "bobthefish"; - version = "unstable-2022-08-02"; + version = "unstable-2023-06-16"; src = fetchFromGitHub { owner = "oh-my-fish"; repo = "theme-bobthefish"; - rev = "2dcfcab653ae69ae95ab57217fe64c97ae05d8de"; - sha256 = "sha256-jBbm0wTNZ7jSoGFxRkTz96QHpc5ViAw9RGsRBkCQEIU="; + rev = "c2c47dc964a257131b3df2a127c2631b4760f3ec"; + sha256 = "sha256-LB4g+EA3C7OxTuHfcxfgl8IVBe5NufFc+5z9VcS0Bt0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix index 1930890d4d..56d179cd24 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/bobthefisher.nix @@ -3,15 +3,15 @@ , fetchFromGitHub , }: -buildFishPlugin rec { +buildFishPlugin { pname = "bobthefisher"; - version = "unstable-2023-03-09"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "Scrumplex"; repo = "bobthefisher"; - rev = "6528033a2c9ca90611d04b6a4afd2131b9495cdc"; - sha256 = "sha256-UDoSMFKtd6ur10guqJlkpA0YSCBv45FR5QKJqdXZWgw="; + rev = "f4179a14b087c7fbfc2e892da429adad40a39e44"; + sha256 = "sha256-l1DHSZa40BX2/4GCjm5E53UOeFEnMioWbZtCW14WX6k="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix index 073ae04952..52c4725114 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "10.0"; + version = "10.1"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - hash = "sha256-CqRSkwNqI/vdxPKrShBykh+eHQq9QIiItD6jWdZ/DSM="; + hash = "sha256-ivXa1S/HrXFzESsV0d9zIwQiuCOYNpa1tUrvA/b15yY="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/tide.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/tide.nix index 94cbfaa6b8..39afd487af 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/tide.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/tide.nix @@ -4,13 +4,13 @@ # Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716 buildFishPlugin rec { pname = "tide"; - version = "5.6.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "IlanCosman"; repo = "tide"; rev = "v${version}"; - hash = "sha256-cCI1FDpvajt1vVPUd/WvsjX/6BJm6X1yFPjqohmo1rI="; + hash = "sha256-oLD7gYFCIeIzBeAW1j62z5FnzWAp3xSfxxe7kBtTLgA="; }; #buildFishplugin will only move the .fish files, but tide has a tide configure function diff --git a/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix b/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix index 7521380982..62ae03ec9e 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/wrapper.nix @@ -18,7 +18,7 @@ let name = "wrapfish.aliases.fish"; destination = "/share/fish/vendor_conf.d/aliases.fish"; text = '' - status --is-interactive; and begin + status is-interactive; and begin # Aliases ${aliasesStr} end diff --git a/third_party/nixpkgs/pkgs/shells/loksh/default.nix b/third_party/nixpkgs/pkgs/shells/loksh/default.nix index d646e91e28..39231e6e14 100644 --- a/third_party/nixpkgs/pkgs/shells/loksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/loksh/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "loksh"; - version = "7.3"; + version = "7.4"; src = fetchFromGitHub { owner = "dimkr"; repo = finalAttrs.pname; rev = finalAttrs.version; fetchSubmodules = true; - sha256 = "sha256-djjJH+mknmOfleVJhSkCLqCIaELh2gjZZE/xdNZuPtY="; + sha256 = "sha256-gQK9gq6MsKVyOikOW0sW/SbIM1K/3I8pn58P/SqzKys="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/shells/murex/default.nix b/third_party/nixpkgs/pkgs/shells/murex/default.nix index aa8ddafd40..81b585b28f 100644 --- a/third_party/nixpkgs/pkgs/shells/murex/default.nix +++ b/third_party/nixpkgs/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "5.0.9310"; + version = "5.1.2210"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gwaNz4OgYs5mAMi/HtLOXoIJA/iHPKX+eiVBP2l2YFU="; + sha256 = "sha256-N0sWTWZJT4hjivTreYfG5VkxiWgTjlH+/9VZD6YKQXY="; }; vendorHash = "sha256-PClKzvpztpry8xsYLfWB/9s/qI5k2m8qHBxkxY0AJqI="; diff --git a/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix b/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix index 87a3c06312..8b2c36daf1 100644 --- a/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nix-your-shell/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-4Z/z4VgnJQd8Uc0tMDnx7sChzXtG5ZDL88jTlhPSonM="; meta = with lib; { + mainProgram = "nix-your-shell"; description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; license = [ licenses.mit ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 34b8f9504f..6d424d94a4 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.85.0"; + version = "0.87.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-/c3JTgIT+T41D0S7irQ0jq2MDzmx3os4pYpVr10cL3E="; + hash = "sha256-anIkIVRsJW2f2hj/Bz9lcw1vFoWhGHAE/XgIvnxbJg8="; }; - cargoHash = "sha256-lBipwX72j0Af3PCat18s9NIjJiKZFZTcU9Utwt+eQzI="; + cargoHash = "sha256-vwOAYigKItd2T/ze5H26cMfIssoAnt0XFQtfA8exLyM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix index 0abe1d4abf..4b8181e293 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-08-24"; + version = "unstable-2023-10-31"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "36a45f28a39ee1526a748b53f438a41ae939fc7c"; - hash = "sha256-QhERyWomyOOk9aYRjm69ykzOR3G/uGM/A4Pr9PlB71w="; + rev = "c2bb125a6790bef1e448680e077345c4d10dcb12"; + hash = "sha256-Sug07QTL7fxxQAf9YOprMNEQSDqeXEk7qt1g2dP0Eqk="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix index 44b5b05a73..f4571d4da0 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/default.nix @@ -4,4 +4,6 @@ lib.makeScope newScope (self: with self; { gstat = callPackage ./gstat.nix { inherit Security; }; formats = callPackage ./formats.nix { inherit IOKit Foundation; }; query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; + regex = callPackage ./regex.nix { inherit IOKit; }; + net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; }) diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix index 5f75951b8c..15c134018e 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; + cargoHash = "sha256-fpqXXgvTuRnU4NkJ/B4m3VTkeujE7sMWOma4KEvlxYw="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index bf788098a5..10ab89368a 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; + cargoHash = "sha256-o/cOHlwo2TBlO+e6DBBKf5x6bgVGozVNMGRb2nCWPT4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix new file mode 100644 index 0000000000..031fa30eb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, IOKit +, CoreFoundation +, unstableGitUpdater +}: + +rustPlatform.buildRustPackage { + pname = "nu-plugin-net"; + version = "unstable-2023-10-24"; + + src = fetchFromGitHub { + owner = "fennewald"; + repo = "nu_plugin_net"; + rev = "8b63996ea2ff8bf282c9b0f5f6d01960cfe3d074"; + hash = "sha256-QFo2cMI41GDBsuPNay5MyVyY+HdrLjAWedz8kDNA3JY="; + }; + + cargoHash = "sha256-ekfUQOsaWdpDASnRzoYh5Y/p3BnP7rvSYCCWQ6DJDnE="; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + IOKit + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A nushell plugin to list system network interfaces"; + homepage = "https://github.com/fennewald/nu_plugin_net"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "nu-plugin-net"; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix index 25097a5d62..72094adc2a 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; + cargoHash = "sha256-seqr4FZHg/f/8iMwSurJRKr41pUbKKti6H2z/JfYkuU="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/regex.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/regex.nix new file mode 100644 index 0000000000..4689a83902 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/regex.nix @@ -0,0 +1,35 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +, IOKit +}: + +rustPlatform.buildRustPackage { + pname = "nushell_plugin_regex"; + version = "unstable-2023-10-08"; + + src = fetchFromGitHub { + owner = "fdncred"; + repo = "nu_plugin_regex"; + rev = "e1aa88e703f1f632ede685dd733472d34dd0c8e7"; + hash = "sha256-GJgnsaeNDJoJjw8RPw6wpEq1mIult18Eh4frl8Plgxc="; + }; + + cargoHash = "sha256-AACpzSavY6MlYnl1lDYxVlfsEvEpNK0u8SzsoSZbqFc="; + + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "A Nushell plugin to parse regular expressions"; + homepage = "https://github.com/fdncred/nu_plugin_regex"; + license = licenses.mit; + maintainers = with maintainers; [ aidalgol ]; + platforms = with platforms; all; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/oh/default.nix b/third_party/nixpkgs/pkgs/shells/oh/default.nix index 10bd86ba05..4504d6c861 100644 --- a/third_party/nixpkgs/pkgs/shells/oh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oh"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "michaelmacinnis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DMxC5fv5ZLDv7gMajC/eyJd2YpO+OXFdvwAPYotnczw="; + sha256 = "sha256-ryIh6MRIOVZPm2USpJC69Z/upIXGUHgcd17eZBA9Edc="; }; - vendorHash = "sha256-f4rqXOu6yXUzNsseSaV9pb8c2KXItYOalB5pfH3Acnc="; + vendorHash = "sha256-Qma5Vk0JO/tTrZanvTCE40LmjeCfBup3U3N7gyhfp44="; meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index 1fe9fe7f66..fe4c253968 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "oil"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-H7oWI3+660MhMdDTTPX11/YalnItzhxfdBrtwKR8xrM="; + hash = "sha256-ll4YmmP9A9EpnIyd4Pv8Ot8lrK/grsWzqgn6am9PIRE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index 0366dac5b9..58485bc8c9 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.3.7"; + version = "7.3.9"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -88,19 +88,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-KSBsYw369fURSmoD/YyZm9CLEIbhDR12mRp1xLCJ4Wc="; + hash = "sha256-g63hMkJUIYFpSl9NylCQs0WYdq/8S3UaFVtRjhZOs+s="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-GaAu3nD0xRqqE0Lm7Z5Da6YUQGiCFc5xHuJYDLKySGc="; + hash = "sha256-zy6VZyXj9TV5QlVFnCgiB6XfIOyS79kPOFhvMRpOrP4="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-+6cy4PLpt3ZR7ui3H9rAg3C39kVryPtqE5HKzMpBa24="; + hash = "sha256-DI+m3Ik1Zw293H6VR19DNAECBApqdIENlrK2/D/3vNc="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-GKsAH+A89/M1fxvw4C4yb7+ITcfD6Y4Oicb1K8AswwI="; + hash = "sha256-eHlh46eV+g3eCiKalVGixwKY9mlk2lXRwUJF6By5lP0="; }; }; tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix index 248cd8e2f0..6efbb285f2 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agdsn-zsh-config"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "agdsn"; repo = "agdsn-zsh-config"; rev = "v${version}"; - sha256 = "sha256-79bD3YQcpNTKYvEoKu22gqOKvNH7eZPGS/iU+/4IbAU="; + sha256 = "sha256-kbpiA+aI3mXQAanmTyZo2rJNOKX77FKjpVsQywyyq90="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix index 5f9573b71a..fa4d9f4cf4 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agkozak-zsh-prompt"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "agkozak"; repo = "agkozak-zsh-prompt"; rev = "v${version}"; - sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY="; + sha256 = "sha256-QDUI9EYflITttkX9Khij62ybBMYJwPfayqj+wr495mM="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix index a1bb818f6d..3506f0853f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.1"; + version = "1.9.2"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-wRLMjaBpzttQ6MUgl1AFC2SRlEEwjASdEnguGlP+XgU="; + hash = "sha256-h+Gay1InnOY6tc8Iir5QzCC7FQj9cVWSn5YViEAHraU="; }; dontPatch = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index 4a05ee9ead..5af94223ec 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -11,7 +11,9 @@ , ncurses , pcre , pkg-config -, buildPackages }: +, buildPackages +, nixosTests +}: let version = "5.9"; @@ -143,5 +145,8 @@ EOF passthru = { shellPath = "/bin/zsh"; + tests = { + inherit (nixosTests) zsh-history oh-my-zsh; + }; }; } diff --git a/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix index aa5af013e4..40c4edaff8 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index eae5f77904..f64f96a60a 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } 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 41935f75bd..b7c7284e9f 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.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aoifMAjJvv1WAlINNkMwCCop6znxyivoD3vQDo/ZbfQ="; + sha256 = "sha256-dl8Ao9Sg+wbFpp6LfWD6isEKou75UzfJkTjZrue4A0A="; }; 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 9a8f9f9b55..27b9e02dc9 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-iKL2vn7TmQr78y0Bn02DgNf9DS5jZyh6uK9MzYTFZaA"; + hash = "sha256-MvxJkEbJKMmYRku/RF6ayOb7u7NI4HZehO8ty64jEnE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-f-sy-h/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-f-sy-h/default.nix new file mode 100644 index 0000000000..0e18eaa958 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-f-sy-h/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "zsh-f-sy-h"; + version = "1.67"; + + src = fetchFromGitHub { + owner = "z-shell"; + repo = "F-Sy-H"; + rev = "v${version}"; + sha256 = "0bcsc4kgda577fs3bnvymmxdz3z5mf19pn8ngfqsklabnf79f5nf"; + }; + + strictDeps = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + plugindir="$out/share/zsh/site-functions" + + mkdir -p "$plugindir" + cp -r -- F-Sy-H.plugin.zsh chroma functions share themes "$plugindir"/ + ''; + + meta = with lib; { + description = "Feature-rich Syntax Highlighting for Zsh"; + homepage = "https://github.com/z-shell/F-Sy-H"; + license = licenses.bsd3; + maintainers = with maintainers; [ mrfreezeex ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix index 95cdb3273c..b3db825bbb 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/stdenv/adapters.nix b/third_party/nixpkgs/pkgs/stdenv/adapters.nix index f29bdf671c..dd29871907 100644 --- a/third_party/nixpkgs/pkgs/stdenv/adapters.nix +++ b/third_party/nixpkgs/pkgs/stdenv/adapters.nix @@ -42,6 +42,50 @@ rec { stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = (prev.extraBuildInputs or []) ++ pkgs; }); + # Override the libc++ dynamic library used in the stdenv to use the one from the platform’s + # default stdenv. This allows building packages and linking dependencies with different + # compiler versions while still using the same libc++ implementation for compatibility. + # + # Note that this adapter still uses the headers from the new stdenv’s libc++. This is necessary + # because older compilers may not be able to parse the headers from the default stdenv’s libc++. + overrideLibcxx = stdenv: + assert stdenv.cc.libcxx != null; + let + llvmLibcxxVersion = lib.getVersion llvmLibcxx; + stdenvLibcxxVersion = lib.getVersion stdenvLibcxx; + + stdenvLibcxx = pkgs.stdenv.cc.libcxx; + stdenvCxxabi = pkgs.stdenv.cc.libcxx.cxxabi; + + llvmLibcxx = stdenv.cc.libcxx; + llvmCxxabi = stdenv.cc.libcxx.cxxabi; + + libcxx = pkgs.runCommand "${stdenvLibcxx.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit cxxabi; + isLLVM = true; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvLibcxx}' "$out" + echo '${stdenvLibcxx}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmLibcxx}/include' "$dev/include" + ''; + + cxxabi = pkgs.runCommand "${stdenvCxxabi.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit (stdenvCxxabi) libName; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvCxxabi}' "$out" + echo '${stdenvCxxabi}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmCxxabi}/include' "$dev/include" + ''; + in + overrideCC stdenv (stdenv.cc.override { + inherit libcxx; + extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ]; + }); + # Override the setup script of stdenv. Useful for testing new # versions of the setup script without causing a rebuild of # everything. @@ -60,12 +104,13 @@ rec { mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else (mkDerivationSuper args).overrideAttrs(finalAttrs: { - NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + " -static"; - } // lib.optionalAttrs (!(finalAttrs.dontAddStaticConfigureFlags or false)) { - configureFlags = (finalAttrs.configureFlags or []) ++ [ - "--disable-shared" # brrr... - ]; + else (mkDerivationSuper args).overrideAttrs (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + configureFlags = (args.configureFlags or []) ++ [ + "--disable-shared" # brrr... + ]; + cmakeFlags = (args.cmakeFlags or []) ++ ["-DCMAKE_SKIP_INSTALL_RPATH=On"]; })); } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") { extraBuildInputs = (old.extraBuildInputs or []) ++ [ @@ -192,18 +237,15 @@ rec { useMoldLinker = stdenv: let bintools = stdenv.cc.bintools.override { extraBuildCommands = '' - wrap ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold - wrap ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ${stdenv.cc.bintools.targetPrefix}ld.mold ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold + wrap ${stdenv.cc.bintools.targetPrefix}ld ${../build-support/bintools-wrapper/ld-wrapper.sh} ${pkgs.mold}/bin/ld.mold ''; }; in stdenv.override (old: { - cc = stdenv.cc.override { - inherit bintools; - }; - allowedRequisites = - lib.mapNullable (rs: rs ++ [ bintools pkgs.mold (lib.getLib pkgs.mimalloc) (lib.getLib pkgs.openssl) ]) (stdenv.allowedRequisites or null); - # gcc >12.1.0 supports '-fuse-ld=mold' - # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 + allowedRequisites = null; + cc = stdenv.cc.override { inherit bintools; }; + # gcc >12.1.0 supports '-fuse-ld=mold' + # the wrap ld above in bintools supports gcc <12.1.0 and shouldn't harm >12.1.0 # https://github.com/rui314/mold#how-to-use } // lib.optionalAttrs (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12")) { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { @@ -248,4 +290,131 @@ rec { env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }; }); }); + + # Overriding the SDK changes the Darwin SDK used to build the package, which: + # * Ensures that the compiler and bintools have the correct Libsystem version; and + # * Replaces any SDK references with those in the SDK corresponding to the requested SDK version. + # + # `sdkVersion` can be any of the following: + # * A version string indicating the requested SDK version; or + # * An attrset consisting of either or both of the following fields: darwinSdkVersion and darwinMinVersion. + overrideSDK = stdenv: sdkVersion: + let + inherit ( + { inherit (stdenv.hostPlatform) darwinMinVersion darwinSdkVersion; } + // (if lib.isAttrs sdkVersion then sdkVersion else { darwinSdkVersion = sdkVersion; }) + ) darwinMinVersion darwinSdkVersion; + + sdk = pkgs.darwin."apple_sdk_${lib.replaceStrings [ "." ] [ "_" ] darwinSdkVersion}"; + # TODO: Make this unconditional after #229210 has been merged, + # and the 10.12 SDK is updated to follow the new structure. + Libsystem = if darwinSdkVersion == "10.12" then pkgs.darwin.Libsystem else sdk.Libsystem; + + replacePropagatedFrameworks = pkg: + let + propagatedInputs = pkg.propagatedBuildInputs; + mappedInputs = map mapPackageToSDK propagatedInputs; + + env = { + inherit (pkg) outputs; + # Map old frameworks to new ones and the package’s outputs to their original outPaths. + # Also map any packages that have propagated frameworks to their proxy packages using + # the requested SDK version. These mappings are rendered into tab-separated files to be + # parsed and read back with `read`. + dependencies = lib.concatMapStrings (pair: "${pair.fst}\t${pair.snd}\n") (lib.zipLists propagatedInputs mappedInputs); + pkgOutputs = lib.concatMapStrings (output: "${output}\t${(lib.getOutput output pkg).outPath}\n") pkg.outputs; + passAsFile = [ "dependencies" "pkgOutputs" ]; + }; + in + # Only remap the package’s propagated inputs if there are any and if any of them were themselves remapped. + if lib.length propagatedInputs > 0 && propagatedInputs != mappedInputs + then pkgs.runCommand pkg.name env '' + # Iterate over the outputs in the package being replaced to make sure the proxy is + # a fully functional replacement. This is like `symlinkJoin` except for outputs and + # the contents of `nix-support`, which will be customized for the requested SDK. + while IFS=$'\t\n' read -r outputName pkgOutputPath; do + mkdir -p "''${!outputName}" + + for targetPath in "$pkgOutputPath"/*; do + targetName=$(basename "$targetPath") + + # `nix-support` is special-cased because any propagated inputs need their SDK + # frameworks replaced with those from the requested SDK. + if [ "$targetName" == "nix-support" ]; then + mkdir "''${!outputName}/nix-support" + + for file in "$targetPath"/*; do + fileName=$(basename "$file") + + if [ "$fileName" == "propagated-build-inputs" ]; then + cp "$file" "''${!outputName}/nix-support/$fileName" + + while IFS=$'\t\n' read -r oldFramework newFramework; do + substituteInPlace "''${!outputName}/nix-support/$fileName" \ + --replace "$oldFramework" "$newFramework" + done < "$dependenciesPath" + fi + done + else + ln -s "$targetPath" "''${!outputName}/$targetName" + fi + done + done < "$pkgOutputsPath" + '' + else pkg; + + # Remap a framework from one SDK version to another. + mapPackageToSDK = pkg: + let + name = lib.getName pkg; + framework = lib.removePrefix "apple-framework-" name; + in + /**/ if pkg == null then pkg + else if name != framework then sdk.frameworks."${framework}" + else replacePropagatedFrameworks pkg; + + mapRuntimeToSDK = pkg: + # Only remap xcbuild for now, which exports the SDK used to build it. + if pkg != null && lib.isAttrs pkg && lib.getName pkg == "xcodebuild" + then pkg.override { stdenv = overrideSDK stdenv { inherit darwinMinVersion darwinSdkVersion; }; } + else pkg; + + mapInputsToSDK = inputs: args: + let + runsAtBuild = lib.flip lib.elem [ + "depsBuildBuild" + "depsBuildBuildPropagated" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "depsBuildTarget" + "depsBuildTargetPropagated" + ]; + atBuildInputs = lib.filter runsAtBuild inputs; + atRuntimeInputs = lib.subtractLists atBuildInputs inputs; + in + lib.genAttrs atRuntimeInputs (input: map mapPackageToSDK (args."${input}" or [ ])) + // lib.genAttrs atBuildInputs (input: map mapRuntimeToSDK (args."${input}" or [ ])); + + mkCC = cc: cc.override { + bintools = cc.bintools.override { libc = Libsystem; }; + libc = Libsystem; + }; + in + # TODO: make this work across all input types and not just propagatedBuildInputs + stdenv.override (old: { + buildPlatform = old.buildPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + hostPlatform = old.hostPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + targetPlatform = old.targetPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + + allowedRequisites = null; + cc = mkCC old.cc; + + extraBuildInputs = [sdk.frameworks.CoreFoundation ]; + mkDerivationFromStdenv = extendMkDerivationArgs old (mapInputsToSDK [ + "buildInputs" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "propagatedBuildInputs" + ]); + }); } diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index 25a80fd11a..c94c56daae 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -245,7 +245,8 @@ in coreutils = bootstrapTools; gnugrep = bootstrapTools; - pbzx = bootstrapTools; + # Either pbzx or Libsystem is required from bootstrap tools (one is used building the other). + pbzx = if localSystem.isAarch64 then bootstrapTools else super.pbzx; cpio = self.stdenv.mkDerivation { name = "bootstrap-stage0-cpio"; buildCommand = '' @@ -255,7 +256,11 @@ in passthru.isFromBootstrapFiles = true; }; - darwin = super.darwin.overrideScope (selfDarwin: _: { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Prevent CF from being propagated to the initial stdenv. Packages that require it + # will have to manually add it to their build inputs. + CF = null; + binutils-unwrapped = bootstrapTools // { version = "boot"; }; @@ -296,15 +301,6 @@ in sigtool = bootstrapTools; } // lib.optionalAttrs (! useAppleSDKLibs) { - CF = self.stdenv.mkDerivation { - name = "bootstrap-stage0-CF"; - buildCommand = '' - mkdir -p $out/Library/Frameworks - ln -s ${bootstrapTools}/Library/Frameworks/CoreFoundation.framework $out/Library/Frameworks - ''; - passthru.isFromBootstrapFiles = true; - }; - Libsystem = self.stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' @@ -424,15 +420,18 @@ in # making sure both packages are present on x86_64-darwin and aarch64-darwin. (prevStage: # previous stage0 stdenv: - assert lib.all isFromBootstrapFiles (with prevStage; [ bash coreutils cpio gnugrep pbzx ]); + assert lib.all isFromBootstrapFiles ( + with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ] + ); assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ binutils-unwrapped cctools print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ CF Libsystem ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); + assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); + assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null); assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx libcxxabi @@ -445,7 +444,11 @@ in inherit (prevStage) ccWrapperStdenv coreutils gnugrep; - cmake = super.cmakeMinimal; + # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. + cmake = self.cmakeMinimal; + cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); curl = super.curlMinimal; @@ -457,9 +460,18 @@ in ninja = super.ninja.override { buildDocs = false; }; - python3 = super.python3Minimal; + # Use this stage’s CF to build Python. It’s required but can’t be included in the stdenv. + python3 = self.python3Minimal; + python3Minimal = super.python3Minimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Use this stage’s CF to build configd. It’s required but can’t be included in the stdenv. + configd = superDarwin.configd.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + }); + signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -529,7 +541,8 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -628,7 +641,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -725,7 +739,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -824,8 +839,9 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -951,7 +967,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1031,7 +1048,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1047,9 +1065,9 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - autoconf automake bash bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff - libedit libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl texinfo unzip which + autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff + libedit libtool m4 ninja openldap openssh patchutils perl pkg-config python3 scons + serf sqlite subversion sysctl texinfo unzip which # CF dependencies - don’t rebuild them. icu @@ -1057,11 +1075,40 @@ in # LLVM dependencies - don’t rebuild them. libffi libiconv libxml2 ncurses zlib; + # These overrides are required to break an infinite recursion. curl depends on Darwin + # frameworks, but those frameworks require these dependencies to build, which + # depend on curl indirectly. + cpio = super.cpio.override { + inherit (prevStage) fetchurl; + }; + + libyaml = super.libyaml.override { + inherit (prevStage) fetchFromGitHub; + }; + + pbzx = super.pbzx.override { + inherit (prevStage) fetchFromGitHub; + }; + + python3Minimal = super.python3Minimal.override { + inherit (prevStage) fetchurl; + }; + + xar = super.xar.override { + inherit (prevStage) fetchurl; + }; + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs # CF dependencies - don’t rebuild them. libobjc objc4; + # rewrite-tbd is also needed to build Darwin frameworks, so it’s built using the + # previous stage’s fetchFromGitHub to avoid an infinite recursion (same as above). + rewrite-tbd = superDarwin.rewrite-tbd.override { + inherit (prevStage) fetchFromGitHub; + }; + signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -1158,16 +1205,18 @@ in (prevStage: # previous stage4 stdenv: assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped brotli bzip2 curl diffutils ed file findutils gawk gettext gmp - gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib zstd + bash binutils-unwrapped brotli bzip2 cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 + libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch + pbzx pcre python3Minimal xar xz zlib zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1176,9 +1225,9 @@ in ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff libedit - libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config.pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which + autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit + libtool m4 ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons + serf sqlite subversion sysctl.provider texinfo unzip which ]); assert prevStage.darwin.cctools == prevStage.darwin.cctools-llvm; @@ -1307,14 +1356,14 @@ in overrides = self: super: { inherit (prevStage) - bash binutils brotli bzip2 coreutils curl diffutils ed file findutils gawk gettext - gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib - zstd; + bash binutils brotli bzip2 coreutils cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 + libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx + pcre python3Minimal xar xz zlib zstd; darwin = super.darwin.overrideScope (_: _: { inherit (prevStage.darwin) - CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi xnu; + CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port; }); diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 448d6ecd9f..deda9b052e 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -28,7 +28,7 @@ in rec { cctools_ = darwin.cctools; # Avoid debugging larger changes for now. - bzip2_ = bzip2.override (args: { linkStatic = true; }); + bzip2_ = bzip2.override (args: { enableStatic = true; enableShared = false; }); # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 63fd00d266..9a794531bc 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -152,9 +152,8 @@ let # flakeNote will be printed in the remediation messages below. flakeNote = " - Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+ - (Flake) command, `--impure` must be passed in order to read this - environment variable. + Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake, + then pass `--impure` in order to allow use of environment variables. "; remediate_allowlist = allow_attr: rebuild_amendment: attrs: diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default-builder.sh b/third_party/nixpkgs/pkgs/stdenv/generic/default-builder.sh index 8c6fec7873..d49fb8aa57 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default-builder.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default-builder.sh @@ -1,6 +1,4 @@ -if [ -f .attrs.sh ]; then - . .attrs.sh -fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index beba687e78..63d02c8f08 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -3,6 +3,43 @@ stdenv: let + # Lib attributes are inherited to the lexical scope for performance reasons. + inherit (lib) + any + assertMsg + attrNames + boolToString + chooseDevOutputs + concatLists + concatMap + concatMapStrings + concatStringsSep + elem + elemAt + extendDerivation + filter + findFirst + flip + head + imap1 + isAttrs + isBool + isDerivation + isInt + isList + isString + mapAttrs + mapNullable + optional + optionalAttrs + optionalString + optionals + remove + splitString + subtractLists + unique + ; + checkMeta = import ./check-meta.nix { inherit lib config; # Nix itself uses the `system` field of a derivation to decide where @@ -115,7 +152,7 @@ let # Including it then would cause needless mass rebuilds. # # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909 - configurePlatforms ? lib.optionals + configurePlatforms ? optionals (stdenv.hostPlatform != stdenv.buildPlatform || config.configurePlatformsByDefault) [ "build" "host" ] @@ -165,6 +202,17 @@ let , ... } @ attrs: +# Policy on acceptable hash types in nixpkgs +assert attrs ? outputHash -> ( + let algo = + attrs.outputHashAlgo or (head (splitString "-" attrs.outputHash)); + in + if algo == "md5" then + throw "Rejected insecure ${algo} hash '${attrs.outputHash}'" + else + true +); + let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when # no package has `doCheck = true`. @@ -172,12 +220,12 @@ let doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform; separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; - outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; + outputs' = outputs ++ optional separateDebugInfo' "debug"; # Turn a derivation into its outPath without a string context attached. # See the comment at the usage site. unsafeDerivationToUntrackedOutpath = drv: - if lib.isDerivation drv + if isDerivation drv then builtins.unsafeDiscardStringContext drv.outPath else drv; @@ -187,9 +235,9 @@ let ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; - hardeningDisable' = if lib.any (x: x == "fortify") hardeningDisable + hardeningDisable' = if any (x: x == "fortify") hardeningDisable # disabling fortify implies fortify3 should also be disabled - then lib.unique (hardeningDisable ++ [ "fortify3" ]) + then unique (hardeningDisable ++ [ "fortify3" ]) else hardeningDisable; supportedHardeningFlags = [ "fortify" "fortify3" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; # Musl-based platforms will keep "pie", other platforms will not. @@ -201,19 +249,19 @@ let # - static armv7l, where compilation fails. !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) then supportedHardeningFlags - else lib.remove "pie" supportedHardeningFlags; + else remove "pie" supportedHardeningFlags; enabledHardeningOptions = if builtins.elem "all" hardeningDisable' then [] - else lib.subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); + else subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". - erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable); + erroneousHardeningFlags = subtractLists supportedHardeningFlags (hardeningEnable ++ remove "all" hardeningDisable); checkDependencyList = checkDependencyList' []; - checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep: - if lib.isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep - else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep - else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); + checkDependencyList' = positions: name: deps: flip imap1 deps (index: dep: + if isDerivation dep || dep == null || builtins.isString dep || builtins.isPath dep then dep + else if isList dep then checkDependencyList' ([index] ++ positions) name dep + else throw "Dependency is not of a valid type: ${concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}"); in if builtins.length erroneousHardeningFlags != 0 then abort ("mkDerivation was called with unsupported hardening flags: " + lib.generators.toPretty {} { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; @@ -222,20 +270,20 @@ else let doCheck = doCheck'; doInstallCheck = doInstallCheck'; buildInputs' = buildInputs - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck installCheckInputs; + ++ optionals doCheck checkInputs + ++ optionals doInstallCheck installCheckInputs; nativeBuildInputs' = nativeBuildInputs - ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh - ++ lib.optionals doCheck nativeCheckInputs - ++ lib.optionals doInstallCheck nativeInstallCheckInputs; + ++ optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh + ++ optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ optionals doCheck nativeCheckInputs + ++ optionals doInstallCheck nativeInstallCheckInputs; outputs = outputs'; references = nativeBuildInputs ++ buildInputs ++ propagatedNativeBuildInputs ++ propagatedBuildInputs; - dependencies = map (map lib.chooseDevOutputs) [ + dependencies = map (map chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild)) (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs')) @@ -249,7 +297,7 @@ else let (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget)) ] ]; - propagatedDependencies = map (map lib.chooseDevOutputs) [ + propagatedDependencies = map (map chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated)) (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs)) @@ -265,26 +313,26 @@ else let ]; computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) + concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraNativeBuildInputs ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies); + ++ concatLists dependencies); computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) - (lib.concatLists propagatedDependencies); + concatMap (input: input.__propagatedSandboxProfile or []) + (concatLists propagatedDependencies); computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) + unique (concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraNativeBuildInputs ++ stdenv.extraBuildInputs - ++ lib.concatLists dependencies)); + ++ concatLists dependencies)); computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) - (lib.concatLists propagatedDependencies)); + unique (concatMap (input: input.__propagatedImpureHostDeps or []) + (concatLists propagatedDependencies)); - envIsExportable = lib.isAttrs env && !lib.isDerivation env; + envIsExportable = isAttrs env && !isDerivation env; derivationArg = (removeAttrs attrs @@ -295,8 +343,8 @@ else let "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"] - ++ lib.optional (__structuredAttrs || envIsExportable) "env")) - // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { + ++ optional (__structuredAttrs || envIsExportable) "env")) + // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let # Indicate the host platform of the derivation if cross compiling. @@ -304,7 +352,7 @@ else let # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the # hash can't be the same. See #32986. - hostSuffix = lib.optionalString + hostSuffix = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) "-${stdenv.hostPlatform.config}"; @@ -313,17 +361,17 @@ else let # nix and nixStatic. This should be also achieved by moving the # hostSuffix before the version, so we could contemplate removing # it again. - staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; + staticMarker = optionalString stdenv.hostPlatform.isStatic "-static"; in lib.strings.sanitizeDerivationName ( if attrs ? name then attrs.name + hostSuffix else # we cannot coerce null to a string below - assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null."; + assert assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null."; "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); - }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // { + }) // optionalAttrs __structuredAttrs { env = checkedEnv; } // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; inherit stdenv; @@ -340,22 +388,22 @@ else let __ignoreNulls = true; inherit __structuredAttrs strictDeps; - depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; - nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; - depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; - depsHostHost = lib.elemAt (lib.elemAt dependencies 1) 0; - buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; - depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; + depsBuildBuild = elemAt (elemAt dependencies 0) 0; + nativeBuildInputs = elemAt (elemAt dependencies 0) 1; + depsBuildTarget = elemAt (elemAt dependencies 0) 2; + depsHostHost = elemAt (elemAt dependencies 1) 0; + buildInputs = elemAt (elemAt dependencies 1) 1; + depsTargetTarget = elemAt (elemAt dependencies 2) 0; - depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; - propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; - depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; - depsHostHostPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; - propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; - depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; + depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0; + propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1; + depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2; + depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0; + propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1; + depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0; # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck - configureFlags = let inherit (lib) optional elem; in + configureFlags = configureFlags ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" @@ -363,21 +411,21 @@ else let cmakeFlags = cmakeFlags - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ - "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" - ] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [ + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ + "-DCMAKE_SYSTEM_NAME=${findFirst isString "Generic" (optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" + ] ++ optionals (stdenv.hostPlatform.uname.processor != null) [ "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" - ] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [ + ] ++ optionals (stdenv.hostPlatform.uname.release != null) [ "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + ] ++ optionals (stdenv.hostPlatform.isDarwin) [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.system != null) [ "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.processor != null) [ "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" - ] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [ + ] ++ optionals (stdenv.buildPlatform.uname.release != null) [ "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" - ] ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DCMAKE_CROSSCOMPILING_EMULATOR=env" ]); @@ -391,7 +439,8 @@ else let crossFile = builtins.toFile "cross-file.conf" '' [properties] - needs_exe_wrapper = ${lib.boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} + bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] + needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} [host_machine] system = '${stdenv.targetPlatform.parsed.kernel.name}' @@ -401,8 +450,9 @@ else let [binaries] llvm-config = 'llvm-config-native' + rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] ''; - crossFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; in crossFlags ++ mesonFlags; inherit patches; @@ -410,28 +460,28 @@ else let inherit doCheck doInstallCheck; inherit outputs; - } // lib.optionalAttrs (__contentAddressed) { + } // optionalAttrs (__contentAddressed) { inherit __contentAddressed; # Provide default values for outputHashMode and outputHashAlgo because # most people won't care about these anyways outputHashAlgo = attrs.outputHashAlgo or "sha256"; outputHashMode = attrs.outputHashMode or "recursive"; - } // lib.optionalAttrs (enableParallelBuilding) { + } // optionalAttrs (enableParallelBuilding) { inherit enableParallelBuilding; enableParallelChecking = attrs.enableParallelChecking or true; enableParallelInstalling = attrs.enableParallelInstalling or true; - } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { + } // optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { + } // optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; - } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + } // optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; - # TODO: remove lib.unique once nix has a list canonicalization primitive + # TODO: remove `unique` once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; - final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + final = concatStringsSep "\n" (filter (x: x != "") (unique profiles)); in final; - __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); + __propagatedSandboxProfile = unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ "/dev/zero" "/dev/random" @@ -458,21 +508,21 @@ else let # to be built eventually, we would still like to get the error early and without # having to wait while nix builds a derivation that might not be used. # See also https://github.com/NixOS/nix/issues/4629 - lib.optionalAttrs (attrs ? disallowedReferences) { + optionalAttrs (attrs ? disallowedReferences) { disallowedReferences = map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; } // - lib.optionalAttrs (attrs ? disallowedRequisites) { + optionalAttrs (attrs ? disallowedRequisites) { disallowedRequisites = map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; } // - lib.optionalAttrs (attrs ? allowedReferences) { + optionalAttrs (attrs ? allowedReferences) { allowedReferences = - lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; } // - lib.optionalAttrs (attrs ? allowedRequisites) { + optionalAttrs (attrs ? allowedRequisites) { allowedRequisites = - lib.mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; meta = checkMeta.commonMeta { inherit validity attrs pos references; }; @@ -480,20 +530,20 @@ else let checkedEnv = let - overlappingNames = lib.attrNames (builtins.intersectAttrs env derivationArg); + overlappingNames = attrNames (builtins.intersectAttrs env derivationArg); in - assert lib.assertMsg envIsExportable + assert assertMsg envIsExportable "When using structured attributes, `env` must be an attribute set of environment variables."; - assert lib.assertMsg (overlappingNames == [ ]) - "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${lib.concatStringsSep ", " overlappingNames}"; - lib.mapAttrs - (n: v: assert lib.assertMsg (lib.isString v || lib.isBool v || lib.isInt v || lib.isDerivation v) + assert assertMsg (overlappingNames == [ ]) + "The ‘env’ attribute set cannot contain any attributes passed to derivation. The following attributes are overlapping: ${concatStringsSep ", " overlappingNames}"; + mapAttrs + (n: v: assert assertMsg (isString v || isBool v || isInt v || isDerivation v) "The ‘env’ attribute set can only contain derivation, string, boolean or integer attributes. The ‘${n}’ attribute is of type ${builtins.typeOf v}."; v) env; in -lib.extendDerivation +extendDerivation validity.handled ({ # A derivation that always builds successfully and whose runtime @@ -542,7 +592,7 @@ lib.extendDerivation # should be made available to Nix expressions using the # derivation (e.g., in assertions). passthru) - (derivation (derivationArg // lib.optionalAttrs envIsExportable checkedEnv)); + (derivation (derivationArg // optionalAttrs envIsExportable checkedEnv)); in fnOrAttrs: diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index ad9857fc9d..37c10fb295 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -16,29 +16,15 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi -if [ -f .attrs.sh ]; then +if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then __structuredAttrs=1 echo "structuredAttrs is enabled" -else - __structuredAttrs= -fi -if [ -n "$__structuredAttrs" ]; then for outputName in "${!outputs[@]}"; do # ex: out=/nix/store/... export "$outputName=${outputs[$outputName]}" done - # Before Nix 2.4, $NIX_ATTRS_*_FILE was named differently: - # https://github.com/NixOS/nix/commit/27ce722 - if [[ -n "${ATTRS_JSON_FILE:-}" ]]; then - export NIX_ATTRS_JSON_FILE="$ATTRS_JSON_FILE" - fi - - if [[ -n "${ATTRS_SH_FILE:-}" ]]; then - export NIX_ATTRS_SH_FILE="$ATTRS_SH_FILE" - fi - # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox # https://github.com/NixOS/nix/issues/6736; please keep around until the # fix reaches *every patch version* that's >= lib/minver.nix @@ -49,6 +35,7 @@ if [ -n "$__structuredAttrs" ]; then export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" fi else + __structuredAttrs= : "${outputs:=out}" fi @@ -1539,6 +1526,44 @@ showPhaseFooter() { } +runPhase() { + local curPhase="$*" + if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then return; fi + if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then return; fi + if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then return; fi + if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then return; fi + if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then return; fi + if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then return; fi + if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then return; fi + if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then return; fi + if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi + + if [[ -n $NIX_LOG_FD ]]; then + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" + fi + + showPhaseHeader "$curPhase" + dumpVars + + local startTime=$(date +"%s") + + # Evaluate the variable named $curPhase if it exists, otherwise the + # function named $curPhase. + eval "${!curPhase:-$curPhase}" + + local endTime=$(date +"%s") + + showPhaseFooter "$curPhase" "$startTime" "$endTime" + + if [ "$curPhase" = unpackPhase ]; then + # make sure we can cd into the directory + [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" + + cd "${sourceRoot:-.}" + fi +} + + genericBuild() { # variable used by our gzip wrapper to add -n. # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. @@ -1565,39 +1590,7 @@ genericBuild() { # phase name is space-free, which it must be because it's the name # of either a shell variable or a shell function. for curPhase in ${phases[*]}; do - if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi - if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi - if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi - if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi - if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi - if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi - if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi - - if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" - fi - - showPhaseHeader "$curPhase" - dumpVars - - local startTime=$(date +"%s") - - # Evaluate the variable named $curPhase if it exists, otherwise the - # function named $curPhase. - eval "${!curPhase:-$curPhase}" - - local endTime=$(date +"%s") - - showPhaseFooter "$curPhase" "$startTime" "$endTime" - - if [ "$curPhase" = unpackPhase ]; then - # make sure we can cd into the directory - [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" - - cd "${sourceRoot:-.}" - fi + runPhase "$curPhase" done } diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 5c03312cc7..35cdb6311d 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -68,7 +68,7 @@ mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix; mips64el-linux = import (if localSystem.isMips64n32 - then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix + then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/atomics.cc b/third_party/nixpkgs/pkgs/test/cc-wrapper/atomics.cc new file mode 100644 index 0000000000..23601ae92f --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/cc-wrapper/atomics.cc @@ -0,0 +1,8 @@ +#include +#include + +int main() +{ + std::atomic_int x = {0}; + return !std::atomic_is_lock_free(&x); +} diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix index 8809030989..a0088751d4 100644 --- a/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/test/cc-wrapper/default.nix @@ -9,7 +9,8 @@ let ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; emulator = stdenv.hostPlatform.emulator buildPackages; - libcxxStdenvSuffix = lib.optionalString (stdenv.cc.libcxx != null) "-libcxx"; + isCxx = stdenv.cc.libcxx != null; + libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -30,6 +31,21 @@ in stdenv.mkDerivation { $CXX -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check + # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 + # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found + # in libcxxStdenv + echo "checking whether cxxabi.h can be included... " >&2 + $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${emulator} ./include-cxxabi + + # cxx doesn't have libatomic.so + ${lib.optionalString (!isCxx) '' + # https://github.com/NixOS/nixpkgs/issues/91285 + echo "checking whether libatomic.so can be linked... " >&2 + $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 + ''} + ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/include-cxxabi.cc b/third_party/nixpkgs/pkgs/test/cc-wrapper/include-cxxabi.cc new file mode 100644 index 0000000000..6ffc97e414 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/cc-wrapper/include-cxxabi.cc @@ -0,0 +1,8 @@ +#include +#include + +int main(int argc, char **argv) +{ + std::cerr << "ok" << std::endl; + return 0; +} diff --git a/third_party/nixpkgs/pkgs/test/cross/default.nix b/third_party/nixpkgs/pkgs/test/cross/default.nix index ff83aedca1..71d7d5f75e 100644 --- a/third_party/nixpkgs/pkgs/test/cross/default.nix +++ b/third_party/nixpkgs/pkgs/test/cross/default.nix @@ -13,7 +13,7 @@ let compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; args' = lib.concatStringsSep " " args; - in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { + in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.stdenv.hostPlatform.config}" { nativeBuildInputs = [ pkgs.dos2unix ]; } '' # Just in case we are using wine, get rid of that annoying extra @@ -59,12 +59,12 @@ let crossSystem = crossSystemFun system; }; - emulator = crossPkgs.hostPlatform.emulator pkgs; + emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs; # Apply some transformation on windows to get dlls in the right # place. Unfortunately mingw doesn’t seem to be able to do linking # properly. - platformFun = pkg: if crossPkgs.hostPlatform.isWindows then + platformFun = pkg: if crossPkgs.stdenv.hostPlatform.isWindows then pkgs.buildEnv { name = "${pkg.name}-winlinks"; paths = [pkg] ++ pkg.buildInputs; @@ -92,7 +92,7 @@ let }; pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand - "test-pkg-config-${crossPkgs.hostPlatform.config}" + "test-pkg-config-${crossPkgs.stdenv.hostPlatform.config}" { depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ]; nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ]; @@ -134,6 +134,7 @@ let pkgs.pkgsMusl.stdenv pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash + #pkgs.pkgsCross.gnu64_simplekernel.bash # https://github.com/NixOS/nixpkgs/issues/264989 pkgs.pkgsCross.arm-embedded.stdenv pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel pkgs.pkgsCross.raspberryPi.stdenv # for armv6l @@ -141,9 +142,20 @@ let pkgs.pkgsCross.m68k.stdenv pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc + pkgs.pkgsCross.s390.stdenv pkgs.pkgsCross.mips64el-linux-gnuabi64.stdenv pkgs.pkgsCross.mips64el-linux-gnuabin32.stdenv pkgs.pkgsCross.mingwW64.stdenv + + ] ++ lib.optionals (with pkgs.stdenv.buildPlatform; isx86_64 && isLinux) [ + # Musl-to-glibc cross on the same architecture tends to turn up + # lots of interesting corner cases. Only expected to work for + # x86_64-linux buildPlatform. + pkgs.pkgsMusl.pkgsCross.gnu64.hello + + # Two web browsers -- exercises almost the entire packageset + pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser + pkgs.pkgsCross.aarch64-multiplatform.firefox ]; in { diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/extension.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/extension.nix index 05861ee5e0..664349416b 100644 --- a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/extension.nix +++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,13 +11,15 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; - "11.7" = throw "The tag 11.7 of cuda-samples does not exist"; + # The tag 11.7 of cuda-samples does not exist "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; - }.${prev.cudaVersion}; + "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; + "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng="; + }; -in { +in prev.lib.attrsets.optionalAttrs (builtins.hasAttr prev.cudaVersion sha256) { cuda-samples = final.callPackage ./generic.nix { - inherit sha256; + sha256 = sha256.${prev.cudaVersion}; }; } diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix index 267eca10d8..e690f32959 100644 --- a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix +++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,31 +1,46 @@ -{ lib -, cudaPackages +{ autoAddOpenGLRunpathHook +, backendStdenv +, cmake +, cudatoolkit +, cudaVersion , fetchFromGitHub , fetchpatch -, addOpenGLRunpath -, cudatoolkit +, freeimage +, glfw3 +, lib , pkg-config , sha256 -, glfw3 -, freeimage }: -cudaPackages.backendStdenv.mkDerivation rec { +backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; - version = lib.versions.majorMinor cudatoolkit.version; + version = cudaVersion; src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; inherit sha256; }; - nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ]; + nativeBuildInputs = [ + pkg-config + autoAddOpenGLRunpathHook + glfw3 + freeimage + ] + # CMake has to run as a native, build-time dependency for libNVVM samples. + ++ lib.lists.optionals (lib.strings.versionAtLeast finalAttrs.version "12.2") [ + cmake + ]; + + # CMake is not the primary build tool -- that's still make. + # As such, we disable CMake's build system. + dontUseCmakeConfigure = true; buildInputs = [ cudatoolkit ]; # See https://github.com/NVIDIA/cuda-samples/issues/75. - patches = lib.optionals (version == "11.3") [ + patches = lib.optionals (finalAttrs.version == "11.3") [ (fetchpatch { url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; @@ -41,21 +56,15 @@ cudaPackages.backendStdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/* + install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* runHook postInstall ''; - postFixup = '' - for exe in $out/bin/*; do - addOpenGLRunpath $exe - done - ''; - meta = { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 05d8ee61e9..d8c5f3208b 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -8,6 +8,8 @@ with pkgs; llvmTests = let pkgSets = lib.pipe pkgNames [ (filter (lib.hasPrefix "llvmPackages")) + (filter (n: n != "rocmPackages.llvm")) + # Is a throw alias. (filter (n: n != "llvmPackages_rocm")) (filter (n: n != "llvmPackages_latest")) (filter (n: n != "llvmPackages_git")) @@ -37,41 +39,43 @@ with pkgs; name = "cc-wrapper-supported"; builtGCC = let - names = lib.pipe (attrNames gccTests) ([ - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.cc)) + inherit (lib) filterAttrs; + sets = lib.pipe gccTests ([ + (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc)) # Broken - (filter (n: n != "gcc49Stdenv")) - (filter (n: n != "gccMultiStdenv")) + (filterAttrs (n: _: n != "gcc49Stdenv")) + (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 - (filter (n: n != "gcc11Stdenv")) + (filterAttrs (n: _: n != "gcc11Stdenv")) ]); in - toJSON (lib.genAttrs names (name: { name = pkgs.${name}; })); + toJSON sets; builtLLVM = let - names = lib.pipe (attrNames llvmTests) ([ - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.stdenv.cc)) - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.libcxxStdenv.cc)) + inherit (lib) filterAttrs; + 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.isLinux && stdenv.hostPlatform.isAarch64) [ # libcxx does not build for some reason on aarch64-linux - (filter (n: n != "llvmPackages_7")) + (filterAttrs (n: _: n != "llvmPackages_7")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - (filter (n: n != "llvmPackages_5")) - (filter (n: n != "llvmPackages_6")) - (filter (n: n != "llvmPackages_7")) - (filter (n: n != "llvmPackages_8")) - (filter (n: n != "llvmPackages_9")) - (filter (n: n != "llvmPackages_10")) + (filterAttrs (n: _: n != "llvmPackages_5")) + (filterAttrs (n: _: n != "llvmPackages_6")) + (filterAttrs (n: _: n != "llvmPackages_7")) + (filterAttrs (n: _: n != "llvmPackages_8")) + (filterAttrs (n: _: n != "llvmPackages_9")) + (filterAttrs (n: _: n != "llvmPackages_10")) ]); in - toJSON (lib.genAttrs names (name: { stdenv = pkgs.${name}.stdenv; libcxx = pkgs.${name}.libcxxStdenv; })); + toJSON sets; buildCommand = '' touch $out ''; @@ -104,6 +108,7 @@ with pkgs; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; + fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; diff --git a/third_party/nixpkgs/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/third_party/nixpkgs/pkgs/test/haskell/upstreamStackHpackVersion/default.nix index ddf2677025..f3ddbcd3e0 100644 --- a/third_party/nixpkgs/pkgs/test/haskell/upstreamStackHpackVersion/default.nix +++ b/third_party/nixpkgs/pkgs/test/haskell/upstreamStackHpackVersion/default.nix @@ -25,7 +25,7 @@ let # This is a statically linked version of stack, so it should be usable within # the Nixpkgs builder (at least on x86_64-linux). stackDownloadUrl = - "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64-static.tar.gz"; + "https://github.com/commercialhaskell/stack/releases/download/v${stack.version}/stack-${stack.version}-linux-x86_64.tar.gz"; # This test code has been explicitly pulled out of the derivation below so # that it can be hashed and added to the `name` of the derivation. This is @@ -49,10 +49,11 @@ let ) # Fetch the statically-linked upstream Stack binary. + echo "Trying to download a statically linked stack binary from ${stackDownloadUrl} to ./stack.tar.gz ..." "''${curl[@]}" "${stackDownloadUrl}" > ./stack.tar.gz tar xf ./stack.tar.gz - upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64-static/stack --version)" + upstream_stack_version_output="$(./stack-${stack.version}-linux-x86_64/stack --version)" echo "upstream \`stack --version\` output: $upstream_stack_version_output" nixpkgs_stack_version_output="$(stack --version)" diff --git a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.c b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.c index 3ae8678d44..d998a5f6f9 100644 --- a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.c +++ b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.c @@ -3,19 +3,21 @@ #include int main(int argc, char **argv) { - char **argv_tmp = calloc(4 + argc + 2 + 1, sizeof(*argv_tmp)); + char **argv_tmp = calloc(6 + argc + 2 + 1, sizeof(*argv_tmp)); assert(argv_tmp != NULL); argv_tmp[0] = argv[0]; argv_tmp[1] = "-x"; argv_tmp[2] = "-y"; argv_tmp[3] = "-z"; argv_tmp[4] = "-abc"; + argv_tmp[5] = "-g"; + argv_tmp[6] = "*.txt"; for (int i = 1; i < argc; ++i) { - argv_tmp[4 + i] = argv[i]; + argv_tmp[6 + i] = argv[i]; } - argv_tmp[4 + argc + 0] = "-foo"; - argv_tmp[4 + argc + 1] = "-bar"; - argv_tmp[4 + argc + 2] = NULL; + argv_tmp[6 + argc + 0] = "-foo"; + argv_tmp[6 + argc + 1] = "-bar"; + argv_tmp[6 + argc + 2] = NULL; argv = argv_tmp; argv[0] = "/send/me/flags"; diff --git a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.cmdline b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.cmdline index f42d26f3ad..1ca964ab4e 100644 --- a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.cmdline +++ b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.cmdline @@ -1,3 +1,4 @@ --append-flags "-foo -bar" \ --add-flags "-x -y -z" \ - --add-flags -abc + --add-flags -abc \ + --add-flags "-g *.txt" diff --git a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.env b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.env index 3626b8cf97..f0641ef36f 100644 --- a/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.env +++ b/third_party/nixpkgs/pkgs/test/make-binary-wrapper/add-flags.env @@ -4,5 +4,7 @@ SUBST_ARGV0 -y -z -abc +-g +*.txt -foo -bar diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc deleted file mode 100644 index 1d953f4bd7..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore deleted file mode 100644 index 75e92a9089..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -target -.direnv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.lock b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.lock deleted file mode 100644 index aa4459c7cf..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.lock +++ /dev/null @@ -1,582 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys", -] - -[[package]] -name = "countme" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" - -[[package]] -name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[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 = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[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 = "nixpkgs-check-by-name" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "colored", - "lazy_static", - "regex", - "rnix", - "serde", - "serde_json", - "temp-env", - "tempfile", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rnix" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb35cedbeb70e0ccabef2a31bcff0aebd114f19566086300b8f42c725fc2cb5f" -dependencies = [ - "rowan", -] - -[[package]] -name = "rowan" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" -dependencies = [ - "countme", - "hashbrown", - "memoffset", - "rustc-hash", - "text-size", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[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.186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "temp-env" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e010429b1f3ea1311190c658c7570100f03c1dab05c16cfab774181c648d656a" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys", -] - -[[package]] -name = "text-size" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[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_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[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_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml deleted file mode 100644 index 70b44d0482..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "nixpkgs-check-by-name" -version = "0.1.0" -edition = "2021" - -[dependencies] -rnix = "0.11.0" -regex = "1.9.3" -clap = { version = "4.3.23", features = ["derive"] } -serde_json = "1.0.105" -tempfile = "3.8.0" -serde = { version = "1.0.185", features = ["derive"] } -anyhow = "1.0" -lazy_static = "1.4.0" -colored = "2.0.4" - -[dev-dependencies] -temp-env = "0.3.5" diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md deleted file mode 100644 index 4dd694acd2..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md +++ /dev/null @@ -1,98 +0,0 @@ -# Nixpkgs pkgs/by-name checker - -This directory implements a program to check the [validity](#validity-checks) of the `pkgs/by-name` Nixpkgs directory once introduced. -It is being used by [this GitHub Actions workflow](../../../.github/workflows/check-by-name.yml). -This is part of the implementation of [RFC 140](https://github.com/NixOS/rfcs/pull/140). - -## API - -This API may be changed over time if the CI workflow making use of it is adjusted to deal with the change appropriately. - -- Command line: `nixpkgs-check-by-name ` -- Arguments: - - ``: The path to the Nixpkgs to check -- Exit code: - - `0`: If the [validation](#validity-checks) is successful - - `1`: If the [validation](#validity-checks) is not successful - - `2`: If an unexpected I/O error occurs -- Standard error: - - Informative messages - - Error messages if validation is not successful - -## Validity checks - -These checks are performed by this tool: - -### File structure checks -- `pkgs/by-name` must only contain subdirectories of the form `${shard}/${name}`, called _package directories_. -- The `name`'s of package directories must be unique when lowercased -- `name` is a string only consisting of the ASCII characters `a-z`, `A-Z`, `0-9`, `-` or `_`. -- `shard` is the lowercased first two letters of `name`, expressed in Nix: `shard = toLower (substring 0 2 name)`. -- Each package directory must contain a `package.nix` file and may contain arbitrary other files. - -### Nix parser checks -- Each package directory must not refer to files outside itself using symlinks or Nix path expressions. - -### Nix evaluation checks -- `pkgs.${name}` is defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`. -- `pkgs.lib.isDerivation pkgs.${name}` is `true`. - -## Development - -Enter the development environment in this directory either automatically with `direnv` or with -``` -nix-shell -``` - -Then use `cargo`: -``` -cargo build -cargo test -cargo fmt -cargo clippy -``` - -## Tests - -Tests are declared in [`./tests`](./tests) as subdirectories imitating Nixpkgs with these files: -- `default.nix`: - Always contains - ```nix - import ../mock-nixpkgs.nix { root = ./.; } - ``` - which makes - ``` - nix-instantiate --eval -A --arg overlays - ``` - work very similarly to the real Nixpkgs, just enough for the program to be able to test it. -- `pkgs/by-name`: - The `pkgs/by-name` directory to check. - -- `all-packages.nix` (optional): - Contains an overlay of the form - ```nix - self: super: { - # ... - } - ``` - allowing the simulation of package overrides to the real [`pkgs/top-level/all-packages.nix`](../../top-level/all-packages.nix`). - The default is an empty overlay. - -- `expected` (optional): - A file containing the expected standard output. - The default is expecting an empty standard output. - -## Hydra builds - -This program will always be available pre-built for `x86_64-linux` on the `nixos-unstable` channel and `nixos-XX.YY` channels. -This is ensured by including it in the `tested` jobset description in [`nixos/release-combined.nix`](../../../nixos/release-combined.nix). - -This allows CI for PRs to development branches `master` and `release-XX.YY` to fetch the pre-built program from the corresponding channel and use that to check the PR. This has the following benefits: -- It allows CI to check all PRs, even if they would break the CI tooling. -- It makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. -- It improves security, since we don't have to build potentially untrusted code from PRs. - The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). -- It allows anybody to make updates to the tooling and for those updates to be automatically used by CI without needing a separate release mechanism. - -The tradeoff is that there's a delay between updates to the tool and those updates being used by CI. -This needs to be considered when updating the [API](#api). diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix deleted file mode 100644 index 0d4e2fcc48..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - rustPlatform, - nix, - rustfmt, - clippy, - mkShell, -}: -let - package = - rustPlatform.buildRustPackage { - name = "nixpkgs-check-by-name"; - src = lib.cleanSource ./.; - cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = [ - nix - rustfmt - clippy - ]; - # Needed to make Nix evaluation work inside the nix build - preCheck = '' - export TEST_ROOT=$(pwd)/test-tmp - export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_LOCALSTATE_DIR=$TEST_ROOT/var - export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_STORE_DIR=$TEST_ROOT/store - - # Ensure that even if tests run in parallel, we don't get an error - # We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first - nix-store --init - ''; - postCheck = '' - cargo fmt --check - cargo clippy -- -D warnings - ''; - passthru.shell = mkShell { - inputsFrom = [ package ]; - }; - }; -in -package diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix deleted file mode 100644 index 33bcf45b8d..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - pkgs = import ../../.. { - config = {}; - overlays = []; - }; -in pkgs.tests.nixpkgs-check-by-name.shell diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix deleted file mode 100644 index 7c0ae75521..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ /dev/null @@ -1,59 +0,0 @@ -# Takes a path to nixpkgs and a path to the json-encoded list of attributes to check. -# Returns an attribute set containing information on each requested attribute. -# If the attribute is missing from Nixpkgs it's also missing from the result. -# -# The returned information is an attribute set with: -# - call_package_path: The from ` = callPackage { ... }`, -# or null if it's not defined as with callPackage, or if the is not a path -# - is_derivation: The result of `lib.isDerivation ` -{ - attrsPath, - nixpkgsPath, -}: -let - attrs = builtins.fromJSON (builtins.readFile attrsPath); - - # This overlay mocks callPackage to persist the path of the first argument - callPackageOverlay = self: super: { - callPackage = fn: args: - let - result = super.callPackage fn args; - in - if builtins.isAttrs result then - # If this was the last overlay to be applied, we could just only return the `_callPackagePath`, - # but that's not the case because stdenv has another overlays on top of user-provided ones. - # So to not break the stdenv build we need to return the mostly proper result here - result // { - _callPackagePath = fn; - } - else - # It's very rare that callPackage doesn't return an attribute set, but it can occur. - { - _callPackagePath = fn; - }; - }; - - pkgs = import nixpkgsPath { - # Don't let the users home directory influence this result - config = { }; - overlays = [ callPackageOverlay ]; - }; - - attrInfo = attr: { - # These names are used by the deserializer on the Rust side - call_package_path = - if pkgs.${attr} ? _callPackagePath && builtins.isPath pkgs.${attr}._callPackagePath then - toString pkgs.${attr}._callPackagePath - else - null; - is_derivation = pkgs.lib.isDerivation pkgs.${attr}; - }; - - attrInfos = builtins.listToAttrs (map (name: { - inherit name; - value = attrInfo name; - }) attrs); - -in -# Filter out attributes not in Nixpkgs -builtins.intersectAttrs pkgs attrInfos diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs deleted file mode 100644 index 17e22495b2..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ /dev/null @@ -1,130 +0,0 @@ -use crate::structure; -use crate::utils::ErrorWriter; -use std::path::Path; - -use anyhow::Context; -use serde::Deserialize; -use std::collections::HashMap; -use std::io; -use std::path::PathBuf; -use std::process; -use tempfile::NamedTempFile; - -/// Attribute set of this structure is returned by eval.nix -#[derive(Deserialize)] -struct AttributeInfo { - call_package_path: Option, - is_derivation: bool, -} - -const EXPR: &str = include_str!("eval.nix"); - -/// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are -/// of the form `callPackage { ... }`. -/// See the `eval.nix` file for how this is achieved on the Nix side -pub fn check_values( - error_writer: &mut ErrorWriter, - nixpkgs: &structure::Nixpkgs, - eval_accessible_paths: Vec<&Path>, -) -> anyhow::Result<()> { - // Write the list of packages we need to check into a temporary JSON file. - // This can then get read by the Nix evaluation. - let attrs_file = NamedTempFile::new().context("Failed to create a temporary file")?; - // We need to canonicalise this path because if it's a symlink (which can be the case on - // Darwin), Nix would need to read both the symlink and the target path, therefore need 2 - // NIX_PATH entries for restrict-eval. But if we resolve the symlinks then only one predictable - // entry is needed. - let attrs_file_path = attrs_file.path().canonicalize()?; - - serde_json::to_writer(&attrs_file, &nixpkgs.package_names).context(format!( - "Failed to serialise the package names to the temporary path {}", - attrs_file_path.display() - ))?; - - // With restrict-eval, only paths in NIX_PATH can be accessed, so we explicitly specify the - // ones needed needed - - let mut command = process::Command::new("nix-instantiate"); - command - // Inherit stderr so that error messages always get shown - .stderr(process::Stdio::inherit()) - // Clear NIX_PATH to be sure it doesn't influence the result - .env_remove("NIX_PATH") - .args([ - "--eval", - "--json", - "--strict", - "--readonly-mode", - "--restrict-eval", - "--show-trace", - "--expr", - EXPR, - ]) - // Pass the path to the attrs_file as an argument and add it to the NIX_PATH so it can be - // accessed in restrict-eval mode - .args(["--arg", "attrsPath"]) - .arg(&attrs_file_path) - .arg("-I") - .arg(&attrs_file_path) - // Same for the nixpkgs to test - .args(["--arg", "nixpkgsPath"]) - .arg(&nixpkgs.path) - .arg("-I") - .arg(&nixpkgs.path); - - // Also add extra paths that need to be accessible - for path in eval_accessible_paths { - command.arg("-I"); - command.arg(path); - } - - let result = command - .output() - .context(format!("Failed to run command {command:?}"))?; - - if !result.status.success() { - anyhow::bail!("Failed to run command {command:?}"); - } - // Parse the resulting JSON value - let actual_files: HashMap = serde_json::from_slice(&result.stdout) - .context(format!( - "Failed to deserialise {}", - String::from_utf8_lossy(&result.stdout) - ))?; - - for package_name in &nixpkgs.package_names { - let relative_package_file = structure::Nixpkgs::relative_file_for_package(package_name); - let absolute_package_file = nixpkgs.path.join(&relative_package_file); - - if let Some(attribute_info) = actual_files.get(package_name) { - let is_expected_file = - if let Some(call_package_path) = &attribute_info.call_package_path { - absolute_package_file == *call_package_path - } else { - false - }; - - if !is_expected_file { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute is not defined as `pkgs.callPackage {} {{ ... }}`.", - relative_package_file.display() - ))?; - continue; - } - - if !attribute_info.is_derivation { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute defined by {} is not a derivation", - relative_package_file.display() - ))?; - } - } else { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}", - relative_package_file.display() - ))?; - continue; - } - } - Ok(()) -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs deleted file mode 100644 index 8c663061bb..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ /dev/null @@ -1,200 +0,0 @@ -mod eval; -mod references; -mod structure; -mod utils; - -use anyhow::Context; -use clap::Parser; -use colored::Colorize; -use std::io; -use std::path::{Path, PathBuf}; -use std::process::ExitCode; -use structure::Nixpkgs; -use utils::ErrorWriter; - -/// Program to check the validity of pkgs/by-name -#[derive(Parser, Debug)] -#[command(about)] -struct Args { - /// Path to nixpkgs - nixpkgs: PathBuf, -} - -fn main() -> ExitCode { - let args = Args::parse(); - match check_nixpkgs(&args.nixpkgs, vec![], &mut io::stderr()) { - Ok(true) => { - eprintln!("{}", "Validated successfully".green()); - ExitCode::SUCCESS - } - Ok(false) => { - eprintln!("{}", "Validation failed, see above errors".yellow()); - ExitCode::from(1) - } - Err(e) => { - eprintln!("{} {:#}", "I/O error: ".yellow(), e); - ExitCode::from(2) - } - } -} - -/// Checks whether the pkgs/by-name structure in Nixpkgs is valid. -/// -/// # Arguments -/// - `nixpkgs_path`: The path to the Nixpkgs to check -/// - `eval_accessible_paths`: -/// Extra paths that need to be accessible to evaluate Nixpkgs using `restrict-eval`. -/// This is used to allow the tests to access the mock-nixpkgs.nix file -/// - `error_writer`: An `io::Write` value to write validation errors to, if any. -/// -/// # Return value -/// - `Err(e)` if an I/O-related error `e` occurred. -/// - `Ok(false)` if the structure is invalid, all the structural errors have been written to `error_writer`. -/// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`. -pub fn check_nixpkgs( - nixpkgs_path: &Path, - eval_accessible_paths: Vec<&Path>, - error_writer: &mut W, -) -> anyhow::Result { - let nixpkgs_path = nixpkgs_path.canonicalize().context(format!( - "Nixpkgs path {} could not be resolved", - nixpkgs_path.display() - ))?; - - // Wraps the error_writer to print everything in red, and tracks whether anything was printed - // at all. Later used to figure out if the structure was valid or not. - let mut error_writer = ErrorWriter::new(error_writer); - - if !nixpkgs_path.join(structure::BASE_SUBPATH).exists() { - eprintln!( - "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", - structure::BASE_SUBPATH - ); - } else { - let nixpkgs = Nixpkgs::new(&nixpkgs_path, &mut error_writer)?; - - if error_writer.empty { - // Only if we could successfully parse the structure, we do the semantic checks - eval::check_values(&mut error_writer, &nixpkgs, eval_accessible_paths)?; - references::check_references(&mut error_writer, &nixpkgs)?; - } - } - Ok(error_writer.empty) -} - -#[cfg(test)] -mod tests { - use crate::check_nixpkgs; - use crate::structure; - use anyhow::Context; - use std::fs; - use std::path::Path; - use tempfile::{tempdir_in, TempDir}; - - #[test] - fn tests_dir() -> anyhow::Result<()> { - for entry in Path::new("tests").read_dir()? { - let entry = entry?; - let path = entry.path(); - let name = entry.file_name().to_string_lossy().into_owned(); - - if !path.is_dir() { - continue; - } - - let expected_errors = - fs::read_to_string(path.join("expected")).unwrap_or(String::new()); - - test_nixpkgs(&name, &path, &expected_errors)?; - } - Ok(()) - } - - // tempfile::tempdir needs to be wrapped in temp_env lock - // because it accesses TMPDIR environment variable. - fn tempdir() -> anyhow::Result { - let empty_list: [(&str, Option<&str>); 0] = []; - Ok(temp_env::with_vars(empty_list, tempfile::tempdir)?) - } - - // We cannot check case-conflicting files into Nixpkgs (the channel would fail to - // build), so we generate the case-conflicting file instead. - #[test] - fn test_case_sensitive() -> anyhow::Result<()> { - let temp_nixpkgs = tempdir()?; - let path = temp_nixpkgs.path(); - - if is_case_insensitive_fs(&path)? { - eprintln!("We're on a case-insensitive filesystem, skipping case-sensitivity test"); - return Ok(()); - } - - let base = path.join(structure::BASE_SUBPATH); - - fs::create_dir_all(base.join("fo/foo"))?; - fs::write(base.join("fo/foo/package.nix"), "{ someDrv }: someDrv")?; - - fs::create_dir_all(base.join("fo/foO"))?; - fs::write(base.join("fo/foO/package.nix"), "{ someDrv }: someDrv")?; - - test_nixpkgs( - "case_sensitive", - &path, - "pkgs/by-name/fo: Duplicate case-sensitive package directories \"foO\" and \"foo\".\n", - )?; - - Ok(()) - } - - /// Tests symlinked temporary directories. - /// This is needed because on darwin, `/tmp` is a symlink to `/private/tmp`, and Nix's - /// restrict-eval doesn't also allow access to the canonical path when you allow the - /// non-canonical one. - /// - /// The error if we didn't do this would look like this: - /// error: access to canonical path '/private/var/folders/[...]/.tmpFbcNO0' is forbidden in restricted mode - #[test] - fn test_symlinked_tmpdir() -> anyhow::Result<()> { - // Create a directory with two entries: - // - actual (dir) - // - symlinked -> actual (symlink) - let temp_root = tempdir()?; - fs::create_dir(temp_root.path().join("actual"))?; - std::os::unix::fs::symlink("actual", temp_root.path().join("symlinked"))?; - let tmpdir = temp_root.path().join("symlinked"); - - temp_env::with_var("TMPDIR", Some(&tmpdir), || { - test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "") - }) - } - - fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { - let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); - - // We don't want coloring to mess up the tests - let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { - let mut writer = vec![]; - check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) - .context(format!("Failed test case {name}"))?; - Ok(writer) - })?; - - let actual_errors = String::from_utf8_lossy(&writer); - - if actual_errors != expected_errors { - panic!( - "Failed test case {name}, expected these errors:\n\n{}\n\nbut got these:\n\n{}", - expected_errors, actual_errors - ); - } - Ok(()) - } - - /// Check whether a path is in a case-insensitive filesystem - fn is_case_insensitive_fs(path: &Path) -> anyhow::Result { - let dir = tempdir_in(path)?; - let base = dir.path(); - fs::write(base.join("aaa"), "")?; - Ok(base.join("AAA").exists()) - } -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs deleted file mode 100644 index 16dc60729c..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs +++ /dev/null @@ -1,184 +0,0 @@ -use crate::structure::Nixpkgs; -use crate::utils; -use crate::utils::{ErrorWriter, LineIndex}; - -use anyhow::Context; -use rnix::{Root, SyntaxKind::NODE_PATH}; -use std::ffi::OsStr; -use std::fs::read_to_string; -use std::io; -use std::path::{Path, PathBuf}; - -/// Small helper so we don't need to pass in the same arguments to all functions -struct PackageContext<'a, W: io::Write> { - error_writer: &'a mut ErrorWriter, - /// The package directory relative to Nixpkgs, such as `pkgs/by-name/fo/foo` - relative_package_dir: &'a PathBuf, - /// The absolute package directory - absolute_package_dir: &'a PathBuf, -} - -/// Check that every package directory in pkgs/by-name doesn't link to outside that directory. -/// Both symlinks and Nix path expressions are checked. -pub fn check_references( - error_writer: &mut ErrorWriter, - nixpkgs: &Nixpkgs, -) -> anyhow::Result<()> { - // Check the directories for each package separately - for package_name in &nixpkgs.package_names { - let relative_package_dir = Nixpkgs::relative_dir_for_package(package_name); - let mut context = PackageContext { - error_writer, - relative_package_dir: &relative_package_dir, - absolute_package_dir: &nixpkgs.path.join(&relative_package_dir), - }; - - // The empty argument here is the subpath under the package directory to check - // An empty one means the package directory itself - check_path(&mut context, Path::new("")).context(format!( - "While checking the references in package directory {}", - relative_package_dir.display() - ))?; - } - Ok(()) -} - -/// Checks for a specific path to not have references outside -fn check_path(context: &mut PackageContext, subpath: &Path) -> anyhow::Result<()> { - let path = context.absolute_package_dir.join(subpath); - - if path.is_symlink() { - // Check whether the symlink resolves to outside the package directory - match path.canonicalize() { - Ok(target) => { - // No need to handle the case of it being inside the directory, since we scan through the - // entire directory recursively anyways - if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { - context.error_writer.write(&format!( - "{}: Path {} is a symlink pointing to a path outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - ))?; - } - } - Err(e) => { - context.error_writer.write(&format!( - "{}: Path {} is a symlink which cannot be resolved: {e}.", - context.relative_package_dir.display(), - subpath.display(), - ))?; - } - } - } else if path.is_dir() { - // Recursively check each entry - for entry in utils::read_dir_sorted(&path)? { - let entry_subpath = subpath.join(entry.file_name()); - check_path(context, &entry_subpath) - .context(format!("Error while recursing into {}", subpath.display()))? - } - } else if path.is_file() { - // Only check Nix files - if let Some(ext) = path.extension() { - if ext == OsStr::new("nix") { - check_nix_file(context, subpath).context(format!( - "Error while checking Nix file {}", - subpath.display() - ))? - } - } - } else { - // This should never happen, git doesn't support other file types - anyhow::bail!("Unsupported file type for path {}", subpath.display()); - } - Ok(()) -} - -/// Check whether a nix file contains path expression references pointing outside the package -/// directory -fn check_nix_file( - context: &mut PackageContext, - subpath: &Path, -) -> anyhow::Result<()> { - let path = context.absolute_package_dir.join(subpath); - let parent_dir = path.parent().context(format!( - "Could not get parent of path {}", - subpath.display() - ))?; - - let contents = - read_to_string(&path).context(format!("Could not read file {}", subpath.display()))?; - - let root = Root::parse(&contents); - if let Some(error) = root.errors().first() { - context.error_writer.write(&format!( - "{}: File {} could not be parsed by rnix: {}", - context.relative_package_dir.display(), - subpath.display(), - error, - ))?; - return Ok(()); - } - - let line_index = LineIndex::new(&contents); - - for node in root.syntax().descendants() { - // We're only interested in Path expressions - if node.kind() != NODE_PATH { - continue; - } - - let text = node.text().to_string(); - let line = line_index.line(node.text_range().start().into()); - - // Filters out ./foo/${bar}/baz - // TODO: We can just check ./foo - if node.children().count() != 0 { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\", which is not yet supported and may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text - ))?; - continue; - } - - // Filters out search paths like - if text.starts_with('<') { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the nix search path expression \"{}\" which may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text - ))?; - continue; - } - - // Resolves the reference of the Nix path - // turning `../baz` inside `/foo/bar/default.nix` to `/foo/baz` - match parent_dir.join(Path::new(&text)).canonicalize() { - Ok(target) => { - // Then checking if it's still in the package directory - // No need to handle the case of it being inside the directory, since we scan through the - // entire directory recursively anyways - if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\" which may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text, - ))?; - } - } - Err(e) => { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\" which cannot be resolved: {e}.", - context.relative_package_dir.display(), - subpath.display(), - text, - ))?; - } - }; - } - - Ok(()) -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs deleted file mode 100644 index ea80128e48..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs +++ /dev/null @@ -1,152 +0,0 @@ -use crate::utils; -use crate::utils::ErrorWriter; -use lazy_static::lazy_static; -use regex::Regex; -use std::collections::HashMap; -use std::io; -use std::path::{Path, PathBuf}; - -pub const BASE_SUBPATH: &str = "pkgs/by-name"; -pub const PACKAGE_NIX_FILENAME: &str = "package.nix"; - -lazy_static! { - static ref SHARD_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_-]{1,2}$").unwrap(); - static ref PACKAGE_NAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_-]+$").unwrap(); -} - -/// Contains information about the structure of the pkgs/by-name directory of a Nixpkgs -pub struct Nixpkgs { - /// The path to nixpkgs - pub path: PathBuf, - /// The names of all packages declared in pkgs/by-name - pub package_names: Vec, -} - -impl Nixpkgs { - // Some utility functions for the basic structure - - pub fn shard_for_package(package_name: &str) -> String { - package_name.to_lowercase().chars().take(2).collect() - } - - pub fn relative_dir_for_shard(shard_name: &str) -> PathBuf { - PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) - } - - pub fn relative_dir_for_package(package_name: &str) -> PathBuf { - Nixpkgs::relative_dir_for_shard(&Nixpkgs::shard_for_package(package_name)) - .join(package_name) - } - - pub fn relative_file_for_package(package_name: &str) -> PathBuf { - Nixpkgs::relative_dir_for_package(package_name).join(PACKAGE_NIX_FILENAME) - } -} - -impl Nixpkgs { - /// Read the structure of a Nixpkgs directory, displaying errors on the writer. - /// May return early with I/O errors. - pub fn new( - path: &Path, - error_writer: &mut ErrorWriter, - ) -> anyhow::Result { - let base_dir = path.join(BASE_SUBPATH); - - let mut package_names = Vec::new(); - - for shard_entry in utils::read_dir_sorted(&base_dir)? { - let shard_path = shard_entry.path(); - let shard_name = shard_entry.file_name().to_string_lossy().into_owned(); - let relative_shard_path = Nixpkgs::relative_dir_for_shard(&shard_name); - - if shard_name == "README.md" { - // README.md is allowed to be a file and not checked - continue; - } - - if !shard_path.is_dir() { - error_writer.write(&format!( - "{}: This is a file, but it should be a directory.", - relative_shard_path.display(), - ))?; - // we can't check for any other errors if it's a file, since there's no subdirectories to check - continue; - } - - let shard_name_valid = SHARD_NAME_REGEX.is_match(&shard_name); - if !shard_name_valid { - error_writer.write(&format!( - "{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", - relative_shard_path.display() - ))?; - } - - let mut unique_package_names = HashMap::new(); - - for package_entry in utils::read_dir_sorted(&shard_path)? { - let package_path = package_entry.path(); - let package_name = package_entry.file_name().to_string_lossy().into_owned(); - let relative_package_dir = - PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); - - if !package_path.is_dir() { - error_writer.write(&format!( - "{}: This path is a file, but it should be a directory.", - relative_package_dir.display(), - ))?; - continue; - } - - if let Some(duplicate_package_name) = - unique_package_names.insert(package_name.to_lowercase(), package_name.clone()) - { - error_writer.write(&format!( - "{}: Duplicate case-sensitive package directories \"{duplicate_package_name}\" and \"{package_name}\".", - relative_shard_path.display(), - ))?; - } - - let package_name_valid = PACKAGE_NAME_REGEX.is_match(&package_name); - if !package_name_valid { - error_writer.write(&format!( - "{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", - relative_package_dir.display(), - ))?; - } - - let correct_relative_package_dir = Nixpkgs::relative_dir_for_package(&package_name); - if relative_package_dir != correct_relative_package_dir { - // Only show this error if we have a valid shard and package name - // Because if one of those is wrong, you should fix that first - if shard_name_valid && package_name_valid { - error_writer.write(&format!( - "{}: Incorrect directory location, should be {} instead.", - relative_package_dir.display(), - correct_relative_package_dir.display(), - ))?; - } - } - - let package_nix_path = package_path.join(PACKAGE_NIX_FILENAME); - if !package_nix_path.exists() { - error_writer.write(&format!( - "{}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", - relative_package_dir.display(), - ))?; - } else if package_nix_path.is_dir() { - error_writer.write(&format!( - "{}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", - relative_package_dir.display(), - ))?; - } - - package_names.push(package_name.clone()); - } - } - - Ok(Nixpkgs { - path: path.to_owned(), - package_names, - }) - } -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs deleted file mode 100644 index 325c736eca..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs +++ /dev/null @@ -1,72 +0,0 @@ -use anyhow::Context; -use colored::Colorize; -use std::fs; -use std::io; -use std::path::Path; - -/// Deterministic file listing so that tests are reproducible -pub fn read_dir_sorted(base_dir: &Path) -> anyhow::Result> { - let listing = base_dir - .read_dir() - .context(format!("Could not list directory {}", base_dir.display()))?; - let mut shard_entries = listing - .collect::>>() - .context(format!("Could not list directory {}", base_dir.display()))?; - shard_entries.sort_by_key(|entry| entry.file_name()); - Ok(shard_entries) -} - -/// A simple utility for calculating the line for a string offset. -/// This doesn't do any Unicode handling, though that probably doesn't matter -/// because newlines can't split up Unicode characters. Also this is only used -/// for error reporting -pub struct LineIndex { - /// Stores the indices of newlines - newlines: Vec, -} - -impl LineIndex { - pub fn new(s: &str) -> LineIndex { - let mut newlines = vec![]; - let mut index = 0; - // Iterates over all newline-split parts of the string, adding the index of the newline to - // the vec - for split in s.split_inclusive('\n') { - index += split.len(); - newlines.push(index); - } - LineIndex { newlines } - } - - /// Returns the line number for a string index - pub fn line(&self, index: usize) -> usize { - match self.newlines.binary_search(&index) { - // +1 because lines are 1-indexed - Ok(x) => x + 1, - Err(x) => x + 1, - } - } -} - -/// A small wrapper around a generic io::Write specifically for errors: -/// - Print everything in red to signal it's an error -/// - Keep track of whether anything was printed at all, so that -/// it can be queried whether any errors were encountered at all -pub struct ErrorWriter { - pub writer: W, - pub empty: bool, -} - -impl ErrorWriter { - pub fn new(writer: W) -> ErrorWriter { - ErrorWriter { - writer, - empty: true, - } - } - - pub fn write(&mut self, string: &str) -> io::Result<()> { - self.empty = false; - writeln!(self.writer, "{}", string.red()) - } -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix deleted file mode 100644 index 793dfabd65..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -args: -builtins.removeAttrs - (import ../mock-nixpkgs.nix { root = ./.; } args) - [ "foo" ] diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected deleted file mode 100644 index fff17c6c7c..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.foo: This attribute is not defined but it should be defined automatically as pkgs/by-name/fo/foo/package.nix diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected deleted file mode 100644 index 3627368c0e..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/FOO: Incorrect directory location, should be pkgs/by-name/fo/FOO instead. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected deleted file mode 100644 index 8c8eafdcb3..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/fo@: Invalid package directory name "fo@", must be ASCII characters consisting of a-z, A-Z, 0-9, "-" or "_". diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected deleted file mode 100644 index 248aa88779..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/A: Invalid directory name "A", must be at most 2 ASCII characters consisting of a-z, 0-9, "-" or "_". diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected deleted file mode 100644 index ce1afcbf2d..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/foo: Missing required "package.nix" file. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix deleted file mode 100644 index 50ad676175..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix +++ /dev/null @@ -1,101 +0,0 @@ -/* -This file returns a mocked version of Nixpkgs' default.nix for testing purposes. -It does not depend on Nixpkgs itself for the sake of simplicity. - -It takes one attribute as an argument: -- `root`: The root of Nixpkgs to read other files from, including: - - `./pkgs/by-name`: The `pkgs/by-name` directory to test - - `./all-packages.nix`: A file containing an overlay to mirror the real `pkgs/top-level/all-packages.nix`. - This allows adding overrides on top of the auto-called packages in `pkgs/by-name`. - -It returns a Nixpkgs-like function that can be auto-called and evaluates to an attribute set. -*/ -{ - root, -}: -# The arguments for the Nixpkgs function -{ - # Passed by the checker to modify `callPackage` - overlays ? [], - # Passed by the checker to make sure a real Nixpkgs isn't influenced by impurities - config ? {}, -}: -let - - # Simplified versions of lib functions - lib = { - fix = f: let x = f x; in x; - - extends = overlay: f: final: - let - prev = f final; - in - prev // overlay final prev; - - callPackageWith = autoArgs: fn: args: - let - f = if builtins.isFunction fn then fn else import fn; - fargs = builtins.functionArgs f; - allArgs = builtins.intersectAttrs fargs autoArgs // args; - in - f allArgs; - - isDerivation = value: value.type or null == "derivation"; - }; - - # The base fixed-point function to populate the resulting attribute set - pkgsFun = self: { - inherit lib; - callPackage = lib.callPackageWith self; - someDrv = { type = "derivation"; }; - }; - - baseDirectory = root + "/pkgs/by-name"; - - # Generates { = ; } entries mapping package names to their `package.nix` files in `pkgs/by-name`. - # Could be more efficient, but this is only for testing. - autoCalledPackageFiles = - let - entries = builtins.readDir baseDirectory; - - namesForShard = shard: - if entries.${shard} != "directory" then - # Only README.md is allowed to be a file, but it's not this code's job to check for that - { } - else - builtins.mapAttrs - (name: _: baseDirectory + "/${shard}/${name}/package.nix") - (builtins.readDir (baseDirectory + "/${shard}")); - - in - builtins.foldl' - (acc: el: acc // el) - { } - (map namesForShard (builtins.attrNames entries)); - - # Turns autoCalledPackageFiles into an overlay that `callPackage`'s all of them - autoCalledPackages = self: super: - builtins.mapAttrs (name: file: - self.callPackage file { } - ) autoCalledPackageFiles; - - # A list optionally containing the `all-packages.nix` file from the test case as an overlay - optionalAllPackagesOverlay = - if builtins.pathExists (root + "/all-packages.nix") then - [ (import (root + "/all-packages.nix")) ] - else - [ ]; - - # All the overlays in the right order, including the user-supplied ones - allOverlays = - [ - autoCalledPackages - ] - ++ optionalAllPackagesOverlay - ++ overlays; - - # Apply all the overlays in order to the base fixed-point function pkgsFun - f = builtins.foldl' (f: overlay: lib.extends overlay f) pkgsFun allOverlays; -in -# Evaluate the fixed-point -lib.fix f diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected deleted file mode 100644 index e6c9237901..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix deleted file mode 100644 index bd68dba1de..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ }: null diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected deleted file mode 100644 index e6c9237901..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix deleted file mode 100644 index b021e28c21..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ }: { } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix deleted file mode 100644 index 8bedb90d89..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - nonDerivation = self.callPackage ./someDrv.nix { }; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected deleted file mode 100644 index 1c6377d8ae..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix deleted file mode 100644 index bd68dba1de..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ }: null diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix deleted file mode 100644 index 4fad280ae1..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - nonDerivation = null; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected deleted file mode 100644 index 1c6377d8ae..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix deleted file mode 100644 index bd68dba1de..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ }: null diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix deleted file mode 100644 index 4c521d2d44..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - nonDerivation = self.callPackage ({ }: { }) { }; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected deleted file mode 100644 index 1c6377d8ae..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix deleted file mode 100644 index bd68dba1de..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ }: null diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected deleted file mode 100644 index 3ad4b8f820..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/foo: This path is a file, but it should be a directory. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected deleted file mode 100644 index 67a0c69fe2..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/foo: "package.nix" must be a file. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected deleted file mode 100644 index 7d20c32aad..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "/foo" which cannot be resolved: No such file or directory (os error 2). diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index 7a51ba1ec7..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ someDrv }: someDrv // { - escape = /foo; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected deleted file mode 100644 index 3d7fb64e80..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "../." which may point outside the directory of that package. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index 5989f52eb8..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ someDrv }: someDrv // { - escape = ../.; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected deleted file mode 100644 index b0cdff4a47..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/aa: File package.nix at line 2 contains the nix search path expression "" which may point outside the directory of that package. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index 864fdce133..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ someDrv }: someDrv // { - nixPath = ; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected deleted file mode 100644 index 281aba0092..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/aa: File invalid.nix could not be parsed by rnix: unexpected token at 28..29 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix deleted file mode 100644 index ee6b002a52..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix +++ /dev/null @@ -1 +0,0 @@ -this is not a valid nix file! diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected deleted file mode 100644 index ad662af27a..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index a94ba75412..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ someDrv }: someDrv // { - pathWithSubexpr = ./${"test"}; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix deleted file mode 100644 index 7e4a7548fe..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# Recursive -../package.nix diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix deleted file mode 100644 index bd55e601bf..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix +++ /dev/null @@ -1,2 +0,0 @@ -# Recursive test -import ./file.nix diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix deleted file mode 100644 index 474db5b0eb..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ someDrv }: someDrv // { - nixFile = ./file.nix; - nonNixFile = ./file; - directory = ./dir; -} diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected deleted file mode 100644 index 447b38e6b6..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo: This is a file, but it should be a directory. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected deleted file mode 100644 index 335c5d6b6e..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/foo: Path package.nix is a symlink pointing to a path outside the directory of that package. diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix deleted file mode 100644 index a1b92efbba..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix +++ /dev/null @@ -1 +0,0 @@ -{ someDrv }: someDrv diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix deleted file mode 100644 index af25d14501..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ../mock-nixpkgs.nix { root = ./.; } diff --git a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected b/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected deleted file mode 100644 index f622f3e7fd..0000000000 --- a/third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected +++ /dev/null @@ -1 +0,0 @@ -pkgs/by-name/fo/foo: Path foo.nix is a symlink which cannot be resolved: No such file or directory (os error 2). diff --git a/third_party/nixpkgs/pkgs/test/simple/builder.sh b/third_party/nixpkgs/pkgs/test/simple/builder.sh index 908faec3c3..0b09a109be 100644 --- a/third_party/nixpkgs/pkgs/test/simple/builder.sh +++ b/third_party/nixpkgs/pkgs/test/simple/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi set -x export NIX_DEBUG=1 diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index 0fa87cccc2..3882eb2b62 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -142,6 +142,15 @@ in ''; }; + # Check that mkDerivation rejects MD5 hashes + rejectedHashes = lib.recurseIntoAttrs { + md5 = + let drv = runCommand "md5 outputHash rejected" { + outputHash = "md5-fPt7dxVVP7ffY3MxkQdwVw=="; + } "true"; + in assert !(builtins.tryEval drv).success; {}; + }; + test-inputDerivation = let inherit (stdenv.mkDerivation { dep1 = derivation { name = "dep1"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; diff --git a/third_party/nixpkgs/pkgs/test/texlive/default.nix b/third_party/nixpkgs/pkgs/test/texlive/default.nix index 12c42444f1..12fdd5c45f 100644 --- a/third_party/nixpkgs/pkgs/test/texlive/default.nix +++ b/third_party/nixpkgs/pkgs/test/texlive/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildEnv, runCommand, fetchurl, file, texlive, writeShellScript, writeText }: +{ lib, stdenv, buildEnv, runCommand, fetchurl, file, texlive, writeShellScript, writeText, texliveInfraOnly, texliveSmall, texliveMedium, texliveFull }: rec { @@ -6,7 +6,7 @@ rec { { name , format , text - , texLive ? texlive.combined.scheme-small + , texLive ? texliveSmall , options ? "-interaction=errorstopmode" , preTest ? "" , postTest ? "" @@ -43,7 +43,7 @@ rec { lualatex = mkTeXTest { name = "opentype-fonts-lualatex"; format = "lualatex"; - texLive = texlive.combine { inherit (texlive) scheme-small libertinus-fonts; }; + texLive = texliveSmall.withPackages (ps: [ ps.libertinus-fonts ]); text = '' \documentclass{article} \usepackage{fontspec} @@ -61,7 +61,7 @@ rec { chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ - (texlive.combine { inherit (texlive) scheme-infraonly chktex; }) + (texlive.withPackages (ps: [ ps.chktex ])) ]; input = builtins.toFile "chktex-sample.tex" '' \documentclass{article} @@ -77,7 +77,7 @@ rec { dvipng = lib.recurseIntoAttrs { # https://github.com/NixOS/nixpkgs/issues/75605 basic = runCommand "texlive-test-dvipng-basic" { - nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + nativeBuildInputs = [ file texliveMedium ]; input = fetchurl { name = "test_dvipng.tex"; url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; @@ -99,7 +99,7 @@ rec { # test dvipng's limited capability to render postscript specials via GS ghostscript = runCommand "texlive-test-ghostscript" { - nativeBuildInputs = [ file (texlive.combine { inherit (texlive) scheme-small dvipng; }) ]; + nativeBuildInputs = [ file (texliveSmall.withPackages (ps: [ ps.dvipng ])) ]; input = builtins.toFile "postscript-sample.tex" '' \documentclass{minimal} \begin{document} @@ -140,7 +140,7 @@ rec { # https://github.com/NixOS/nixpkgs/issues/75070 dvisvgm = runCommand "texlive-test-dvisvgm" { - nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + nativeBuildInputs = [ file texliveMedium ]; input = builtins.toFile "dvisvgm-sample.tex" '' \documentclass{article} \begin{document} @@ -166,10 +166,7 @@ rec { texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ - (texlive.combine { - inherit (texlive) scheme-infraonly luatex texdoc; - pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; - }) + (texlive.withPackages (ps: with ps; [ luatex ps.texdoc ps.texdoc.texdoc ])) ]; } '' texdoc --version @@ -214,7 +211,7 @@ rec { }; # check that all languages are available, including synonyms - allLanguages = let hyphenBase = lib.head texlive.hyphen-base.pkgs; texLive = texlive.combined.scheme-full; in + allLanguages = let hyphenBase = texlive.pkgs.hyphen-base; texLive = texliveFull; in lib.recurseIntoAttrs { # language.def etex = mkTeXTest { @@ -289,9 +286,9 @@ rec { # test that language files are generated as expected hyphen-base = runCommand "texlive-test-hyphen-base" { - hyphenBase = lib.head texlive.hyphen-base.pkgs; - schemeFull = texlive.combined.scheme-full; - schemeInfraOnly = texlive.combined.scheme-infraonly; + hyphenBase = texlive.pkgs.hyphen-base; + schemeFull = texliveFull; + schemeInfraOnly = texliveInfraOnly; } '' mkdir -p "$out"/{scheme-infraonly,scheme-full} @@ -322,8 +319,8 @@ rec { # test that fmtutil.cnf is fully regenerated on scheme-full fmtutilCnf = runCommand "texlive-test-fmtutil.cnf" { - kpathsea = lib.head texlive.kpathsea.pkgs; - schemeFull = texlive.combined.scheme-full; + kpathsea = texlive.pkgs.kpathsea.tex; + schemeFull = texliveFull; } '' mkdir -p "$out" @@ -335,7 +332,7 @@ rec { # verify that the restricted mode gets enabled when # needed (detected by checking if it disallows --gscmd) repstopdf = runCommand "texlive-test-repstopdf" { - nativeBuildInputs = [ (texlive.combine { inherit (texlive) scheme-infraonly epstopdf; }) ]; + nativeBuildInputs = [ (texlive.withPackages (ps: [ ps.epstopdf ])) ]; } '' ! (epstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden >/dev/null (repstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden >/dev/null @@ -345,7 +342,7 @@ rec { # verify that the restricted mode gets enabled when # needed (detected by checking if it disallows --gscmd) rpdfcrop = runCommand "texlive-test-rpdfcrop" { - nativeBuildInputs = [ (texlive.combine { inherit (texlive) scheme-infraonly pdfcrop; }) ]; + nativeBuildInputs = [ (texlive.withPackages (ps: [ ps.pdfcrop ])) ]; } '' ! (pdfcrop --gscmd echo $(command -v pdfcrop) 2>&1 || true) | grep 'restricted mode' >/dev/null (rpdfcrop --gscmd echo $(command -v pdfcrop) 2>&1 || true) | grep 'restricted mode' >/dev/null @@ -454,14 +451,13 @@ rec { ''; # link all binaries in single derivation - allPackages = with lib; concatLists (catAttrs "pkgs" (filter isAttrs (attrValues texlive))); - binPackages = lib.filter (p: p.tlType == "bin") allPackages; + binPackages = lib.catAttrs "out" (lib.attrValues texlive.pkgs); binaries = buildEnv { name = "texlive-binaries"; paths = binPackages; }; in runCommand "texlive-test-binaries" { inherit binaries contextTestTex latexTestTex texTestTex; - texliveScheme = texlive.combined.scheme-full; + texliveScheme = texliveFull; } '' loadables="$(command -v bash)" @@ -565,8 +561,7 @@ rec { # check that all scripts have a Nix shebang shebangs = let - allPackages = with lib; concatLists (catAttrs "pkgs" (filter isAttrs (attrValues texlive))); - binPackages = lib.filter (p: p.tlType == "bin") allPackages; + binPackages = lib.catAttrs "out" (lib.attrValues texlive.pkgs); in runCommand "texlive-test-shebangs" { } ('' @@ -615,7 +610,7 @@ rec { correctLicenses = scheme: builtins.foldl' (acc: pkg: concatLicenses acc (lib.toList (pkg.meta.license or []))) [] - scheme.passthru.packages; + scheme.passthru.requiredTeXPackages; correctLicensesAttrNames = scheme: lib.sort lt (map licenseToAttrName (correctLicenses scheme)); @@ -625,7 +620,7 @@ rec { (savedLicensesAttrNames scheme) != (correctLicensesAttrNames scheme); incorrectSchemes = lib.filterAttrs (n: hasLicenseMismatch) - texlive.combined; + (texlive.combined // texlive.schemes); prettyPrint = name: scheme: '' license info for ${name} is incorrect! Note that order is enforced. @@ -648,10 +643,13 @@ rec { # this is effectively an eval-time assertion, converted into a derivation for # ease of testing fixedHashes = with lib; let - combine = findFirst (p: (head p.pkgs).pname == "combine") { pkgs = []; } (head texlive.collection-latexextra.pkgs).tlDeps; - all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs; - fods = filter (p: isDerivation p && p.tlType != "bin") all; - errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname + optionalString (p.tlType != "run") ("." + p.tlType)} does not have a fixed output hash\n") fods; + fods = lib.concatMap + (p: lib.optional (p ? tex && isDerivation p.tex) p.tex + ++ lib.optional (p ? texdoc) p.texdoc + ++ lib.optional (p ? texsource) p.texsource + ++ lib.optional (p ? tlpkg) p.tlpkg) + (attrValues texlive.pkgs); + errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname}-${p.tlOutputName} does not have a fixed output hash\n") fods; in runCommand "texlive-test-fixed-hashes" { inherit errorText; passAsFile = [ "errorText" ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix index 6c4c89e888..1421b2a028 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix @@ -13,11 +13,11 @@ let in buildPythonApplication rec { pname = "arandr"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${pname}-${version}.tar.gz"; - sha256 = "135q0llvm077jil2fr92ssw3p095m4r8jfj0lc5rr3m71n4srj6v"; + hash = "sha256-5Mu+Npi7gSs5V3CHAXS+AJS7rrOREFqBH5X0LrGCrgI="; }; preBuild = '' @@ -31,10 +31,10 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ xrandr pygobject3 ]; - meta = { + meta = with lib; { homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.domenkozar ]; + license = licenses.gpl3; + maintainers = with maintainers; [ gepbird ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index c5f44792c3..f78e43dbcc 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.222"; + version = "1.223"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-2HviEt/PJS3QFgGPa8WsUeDhotGaHRLs51LlSimfTYQ="; + sha256 = "sha256-B0wUMyYNpPddrE4feUaHoeTtoJdE+IS7nY8gOvPBYSU="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c index d25eef154b..d485ff604c 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c +++ b/third_party/nixpkgs/pkgs/tools/X11/xkbvalidate/xkbvalidate.c @@ -121,10 +121,10 @@ int main(int argc, char **argv) rdef = malloc(sizeof(struct xkb_rule_names)); - TRY_KEYMAP(model, argv[1], "xkbModel"); - TRY_KEYMAP(layout, argv[2], "layout"); - TRY_KEYMAP(variant, argv[3], "xkbVariant"); - TRY_KEYMAP(options, argv[4], "xkbOptions"); + TRY_KEYMAP(model, argv[1], "xkb.model"); + TRY_KEYMAP(layout, argv[2], "xkb.layout"); + TRY_KEYMAP(variant, argv[3], "xkb.variant"); + TRY_KEYMAP(options, argv[4], "xkb.options"); free_logs(); rdef->model = argv[1]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix index c16da204f2..ac232f917b 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xnee/default.nix @@ -1,13 +1,25 @@ -{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst -, gtk2, libXi, pkg-config, texinfo }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, pkg-config +, gtk2 +, libX11 +, libXext +, libXi +, libXtst +, texinfo +, xorgproto +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.19"; pname = "xnee"; src = fetchurl { - url = "mirror://gnu/xnee/${pname}-${version}.tar.gz"; - sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; + url = "mirror://gnu/xnee/xnee-${finalAttrs.version}.tar.gz"; + hash = "sha256-UqQeXPYvgbej5bWBJOs1ZeHhICir2mP1R/u+DZiiwhI="; }; patches = [ @@ -16,57 +28,67 @@ stdenv.mkDerivation rec { (fetchpatch { name = "fno-common.patch"; url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; - sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + hash = "sha256-Ar5SyVIEp8/knDHm+4f0KWAH+A5gGhXGezEqL7xkQhI="; }) ]; - postPatch = - '' for i in `find cnee/test -name \*.sh` - do - sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' - done + postPatch = '' + for i in `find cnee/test -name \*.sh`; do + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' + done + '' + # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added + # if `sem_init` is part of libc which causes errors like + # `gcc: error: CCC: No such file or directory` during the build. + + '' + substituteInPlace configure* \ + --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' + ''; - # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added - # if `sem_init` is part of libc which causes errors like - # `gcc: error: CCC: No such file or directory` during the build. - substituteInPlace configure \ - --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' - ''; + strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ libX11 xorgproto libXext libXtst gtk2 - libXi - texinfo - ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - configureFlags = + buildInputs = [ + gtk2 + libX11 + libXext + libXi + libXtst + texinfo + xorgproto + ]; + + configureFlags = [ + "--disable-gnome-applet" # Do a static build because `libxnee' doesn't get installed anyway. - [ "--disable-gnome-applet" "--enable-static" ]; + "--enable-static" + ]; - # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that - # lacks libXi. - makeFlags = [ "LDFLAGS=-lXi" ]; + makeFlags = [ + # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that + # lacks libXi. + "LDFLAGS=-lXi" + ]; # XXX: Actually tests require an X server. doCheck = true; meta = { description = "X11 event recording and replay tool"; - - longDescription = - '' Xnee is a suite of programs that can record, replay and distribute - user actions under the X11 environment. Think of it as a robot that - can imitate the job you just did. Xnee can be used to automate - tests, demonstrate programs, distribute actions, record & replay - "macros", retype a file. - ''; - - license = lib.licenses.gpl3Plus; - + longDescription = '' + Xnee is a suite of programs that can record, replay and distribute + user actions under the X11 environment. Think of it as a robot that + can imitate the job you just did. Xnee can be used to automate + tests, demonstrate programs, distribute actions, record & replay + "macros", retype a file. + ''; homepage = "https://www.gnu.org/software/xnee/"; - - maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix index fdb3b7c58a..ec8a2ed459 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq"; }; + patches = [ + ./fix-config_h-includes-should-be-first.patch + ]; + postPatch = '' substituteInPlace configure.ac \ --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])" @@ -59,8 +63,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A command-line tool to print idle time from libXss"; - homepage = "http://taktoa.me/xprintidle-ng/"; - license = lib.licenses.gpl2; + homepage = "https://github.com/taktoa/xprintidle-ng"; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch new file mode 100644 index 0000000000..01b4b5d63b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch @@ -0,0 +1,62 @@ +Fixes the config.h include error during build: + +```console +In file included from src/xprintidle-ng.c:36: +lib/time.h:28:3: error: #error "Please include config.h first." + 28 | #error "Please include config.h first." + | ^~~~~ +``` + +Introduced since gnulib upgrade: +* https://github.com/coreutils/gnulib/commit/8ad7bc6 +* https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00088.html +* https://www.gnu.org/software/gnulib/manual/html_node/Source-changes.html + +The last version of gnulib now checks that config.h is the first include +in every compilation unit. + +This is not the case with the xprintidle-ng source code, so this patch +moves these `config.h` inclusions to be first. + +--- + src/time-format.c | 2 +- + src/xprintidle-ng.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/time-format.c b/src/time-format.c +index 3a46749..4c0a4d2 100644 +--- a/src/time-format.c ++++ b/src/time-format.c +@@ -18,10 +18,10 @@ + // 51 Franklin Street, Fifth Floor + // Boston, MA 02110-1301, USA. + ++#include + #include + #include + #include +-#include + #include "system.h" + #include "xalloc.h" + +diff --git a/src/xprintidle-ng.c b/src/xprintidle-ng.c +index 5156adf..ca69b2d 100644 +--- a/src/xprintidle-ng.c ++++ b/src/xprintidle-ng.c +@@ -28,13 +28,13 @@ + // Eivind Magnus Hvidevold . + // kpowersave is licensed under the GNU GPL, version 2 _only_. + ++#include + #include + #include + #include + #include + #include + #include +-#include + #include "system.h" + #include "errno.h" + #include "error.h" +-- +2.42.0 diff --git a/third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix index a1ce545a5f..53fd1138c2 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xssstate/default.nix @@ -4,29 +4,31 @@ , libX11 , libXScrnSaver }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xssstate"; - # - # Use the date of the last commit, since there were bug fixes after the 1.1 - # release. - # - version = "unstable-2022-09-24"; + version = "1.1-unstable-2022-09-24"; + src = fetchgit { url = "https://git.suckless.org/xssstate/"; rev = "5d8e9b49ce2970f786f1e5aa12bbaae83900453f"; hash = "sha256-Aor12tU1I/qNZCdBhZcvNK1FWFh0HYK8CEI29X5yoeA="; }; - makeFlags = [ "VERSION=${version}" ]; + buildInputs = [ + libX11 + libXScrnSaver + ]; - installFlags = [ "PREFIX=$(out)" ]; - - buildInputs = [ libX11 libXScrnSaver ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${finalAttrs.version}" + ]; meta = with lib; { description = "A simple tool to retrieve the X screensaver state"; license = licenses.mit; maintainers = with maintainers; [ onemoresuza ]; platforms = platforms.linux; + mainProgram = "xssstate"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix index 6351528135..ead37f84f0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/acme-sh/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "acme.sh"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; rev = "refs/tags/${version}"; - hash = "sha256-4Chqdr4a9+T+/o1vCPY5xMREoYl0HxY3OlGRD86ulGs="; + hash = "sha256-ymj97aWWOLen7YEfG72N2nyxlwuB/Su4+pgpWUuckgc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix index 5307b38a10..485146a6ae 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.181"; + version = "3.0.184"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-xjOoWQyQCVoCDJMXboxFAyil7jRCWU6oIEt7gcPkIPo="; + sha256 = "sha256-VqHyTwSSBAWbeWjQc1RU5mWTqIA2CJDcL83ElaS++5E="; }; - vendorHash = "sha256-S8Nthnr3wASvRyZS5UTHILPnUA+FeZJEwIvT0O39U3I="; + vendorHash = "sha256-JrzN9ycc3obxOX8NYM1cQ9AfKKPXffugCsiAxEHVBr0="; subPackages = [ "main" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix b/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix index bbdde0e60f..fbac95d019 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "6.20.0"; + version = "6.21.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7BO/LrZUd/Rkq468YiNVKr/mjLP2WD3JEdhGAP0ZGts="; + hash = "sha256-Bf/G38jzy79W9/l3CzQ2/HkJutXB11Rw76BkUx8C324="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-env/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-env/default.nix index dff3752079..3ec84e80bb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-env/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-env/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-env"; - version = "0.4"; + version = "0.5"; rev = "v${version}"; goPackagePath = "github.com/Droplr/aws-env"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "Droplr"; repo = pname; inherit rev; - sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7"; + sha256 = "sha256-dzXgQW5noWT7u276tlwhvgvu2J8VYrOdW9vidZ3W3t0="; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix index efbbe49a5b..545e22f6b5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix @@ -15,6 +15,9 @@ , tzlocal , nose , mock +, setuptools +, aws-google-auth +, testers , withU2F ? false, python-u2flib-host }: @@ -22,6 +25,8 @@ buildPythonApplication rec { pname = "aws-google-auth"; version = "0.0.38"; + pyproject = true; + # Pypi doesn't ship the tests, so we fetch directly from GitHub # https://github.com/cevoaustralia/aws-google-auth/issues/120 src = fetchFromGitHub { @@ -31,6 +36,10 @@ buildPythonApplication rec { sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 boto3 @@ -55,6 +64,16 @@ buildPythonApplication rec { export HOME=$TMPDIR ''; + # with pyproject the tests aren't attempted + # without pyproject the tests try to access internet + doCheck = false; + + pythonImportsCheck = [ "aws_google_auth" ]; + + passthru.tests.version = testers.testVersion { + package = aws-google-auth; + }; + meta = with lib; { description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On"; homepage = "https://github.com/cevoaustralia/aws-google-auth"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix index 666161f1d3..53b3a8d4a4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-mfa/default.nix @@ -41,6 +41,6 @@ buildPythonApplication rec { description = "Manage AWS MFA Security Credentials"; homepage = "https://github.com/broamski/aws-mfa"; license = licenses.mit; - maintainers = [ maintainers.srapenne ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix index 94d993bd2c..5ff20fd17b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.13.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-QwixApaGUzTmvc9TfFk8bdMU7dxyaeUo5aWucV4tH1c="; + hash = "sha256-KtSmDBr2JRxyBUJ5UWMmnfN87oO1/TiCrtuxA2b9Ph0="; }; - vendorHash = "sha256-/6DCrjOqjbz+olRp7rs8ui4uUrcor0zAc0yOIz+ZcEo="; + vendorHash = "sha256-B7t1syBJjwaTM4Tgj/OhhmHJRAhJ/Ewg+g55AKpdj4c="; nativeBuildInputs = [ makeWrapper ]; @@ -28,6 +28,11 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; + checkFlags = [ + # requires network access + "-skip=TestAWSConsoleUrl|TestAWSFederatedUrl" + ]; + meta = with lib; { homepage = "https://github.com/synfinatic/aws-sso-cli"; description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index e65cac675d..16acc62416 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -3,24 +3,20 @@ , fetchPypi , groff , less +, nix-update-script +, testers +, awscli }: python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.29.57"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; + hash = "sha256-+xME5GiDitxn61yrIkiEByx/xeMeXMrVS2rifIX6Ci8="; }; - # https://github.com/aws/aws-cli/issues/4837 - postPatch = '' - substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.17" "docutils>=0.10" \ - --replace "colorama>=0.2.5,<0.4.5" "colorama>=0.2.5,<0.5" \ - --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" - ''; propagatedBuildInputs = with python3.pkgs; [ botocore @@ -44,10 +40,6 @@ python3.pkgs.buildPythonApplication rec { rm $out/bin/aws.cmd ''; - passthru = { - python = python3; # for aws_shell - }; - doInstallCheck = true; installCheckPhase = '' @@ -59,12 +51,25 @@ python3.pkgs.buildPythonApplication rec { runHook postInstallCheck ''; + passthru = { + python = python3; # for aws_shell + updateScript = nix-update-script { + # Excludes 1.x versions from the Github tags list + extraArgs = [ "--version-regex" "^(1\.(.*))" ]; + }; + tests.version = testers.testVersion { + package = awscli; + command = "aws --version"; + inherit version; + }; + }; + meta = with lib; { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 78aacae846..b59f702701 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , python3 , groff , less , fetchFromGitHub +, installShellFiles , nix-update-script , testers , awscli2 @@ -17,27 +19,36 @@ let hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; }); + urllib3 = prev.urllib3.overridePythonAttrs (prev: { + format = "setuptools"; + src = prev.src.override { + version = "1.26.18"; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); }); }; in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.25"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.33"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-8Euc2yOWv0TRz4SgjRAMdTogGQNE4J/XtadPNe5kKKI="; + hash = "sha256-5ANfMa7b72z5E1EH9+dJ9avLDBnSEFGqvDOFFzLbZcM="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ --replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \ - --replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4' + --replace 'awscrt>=0.16.4,<=0.19.6' 'awscrt>=0.16.4' \ + --replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \ + --replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' substituteInPlace requirements-base.txt \ --replace "wheel==0.38.4" "wheel>=0.38.4" \ @@ -50,6 +61,7 @@ with py.pkgs; buildPythonApplication rec { ''; nativeBuildInputs = [ + installShellFiles flit-core ]; @@ -78,15 +90,10 @@ with py.pkgs; buildPythonApplication rec { ]; postInstall = '' - mkdir -p $out/${python3.sitePackages}/awscli/data - ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index - - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws - - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - + installShellCompletion --cmd aws \ + --bash <(echo "complete -C $out/bin/aws_completer aws") \ + --zsh $out/bin/aws_zsh_completer.sh + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm $out/bin/aws.cmd ''; @@ -127,7 +134,7 @@ with py.pkgs; buildPythonApplication rec { meta = with lib; { description = "Unified tool to manage your AWS services"; - homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; + homepage = "https://docs.aws.amazon.com/cli/latest/userguide/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 4205071c4a..982fc5efa3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,26 +1,22 @@ { lib -, stdenv -, python3 -, fetchPypi +, callPackage , fetchFromGitHub , installShellFiles }: let - version = "2.53.0"; + version = "2.53.1"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-5c2Z0EJnKyLqWiz8/BEFAdy5A0+sBbai7UQ2KPL1jr8="; + hash = "sha256-++JquLva3ij4NDhXnY7tSQMH4HCtJ8DhZIzE0XguInM="; }; # put packages that needs to be overridden in the py package scope - py = import ./python-packages.nix { - inherit stdenv src version python3 fetchPypi; - }; + py = callPackage ./python-packages.nix { inherit src version; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { @@ -29,45 +25,35 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { sourceRoot = "${src.name}/src/azure-cli"; - prePatch = '' - substituteInPlace setup.py \ - --replace "chardet~=3.0.4" "chardet" \ - --replace "javaproperties~=0.5.1" "javaproperties" \ - --replace "scp~=0.13.2" "scp" \ - --replace "fabric~=2.4" "fabric" - - # remove namespace hacks - # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well - sed -i setup.py \ - -e '/urllib3/d' - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with py.pkgs; [ + antlr4-python3-runtime + applicationinsights + argcomplete + asn1crypto azure-appconfiguration azure-batch azure-cli-core azure-cli-telemetry + azure-common + azure-core azure-cosmos azure-data-tables azure-datalake-store - azure-functions-devops-build azure-graphrbac - azure-identity - azure-keyvault azure-keyvault-administration - azure-keyvault-keys azure-keyvault-certificates + azure-keyvault-keys azure-keyvault-secrets azure-loganalytics azure-mgmt-advisor azure-mgmt-apimanagement - azure-mgmt-applicationinsights azure-mgmt-appconfiguration azure-mgmt-appcontainers + azure-mgmt-applicationinsights azure-mgmt-authorization azure-mgmt-batch azure-mgmt-batchai @@ -80,12 +66,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-containerinstance azure-mgmt-containerregistry azure-mgmt-containerservice + azure-mgmt-core azure-mgmt-cosmosdb azure-mgmt-databoxedge - azure-mgmt-datalake-analytics + azure-mgmt-datalake-nspkg azure-mgmt-datalake-store azure-mgmt-datamigration - azure-mgmt-deploymentmanager azure-mgmt-devtestlabs azure-mgmt-dns azure-mgmt-eventgrid @@ -99,14 +85,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-keyvault azure-mgmt-kusto azure-mgmt-loganalytics - azure-mgmt-managedservices azure-mgmt-managementgroups + azure-mgmt-managedservices azure-mgmt-maps azure-mgmt-marketplaceordering azure-mgmt-media azure-mgmt-monitor azure-mgmt-msi - azure-mgmt-network azure-mgmt-netapp azure-mgmt-policyinsights azure-mgmt-privatedns @@ -116,7 +101,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-redhatopenshift azure-mgmt-redis azure-mgmt-relay - azure-mgmt-reservations azure-mgmt-resource azure-mgmt-search azure-mgmt-security @@ -124,51 +108,68 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-servicefabric azure-mgmt-servicefabricmanagedclusters azure-mgmt-servicelinker - azure-mgmt-signalr azure-mgmt-sql + azure-mgmt-signalr azure-mgmt-sqlvirtualmachine azure-mgmt-storage azure-mgmt-synapse azure-mgmt-trafficmanager azure-mgmt-web azure-multiapi-storage - azure-storage-blob + azure-nspkg azure-storage-common + azure-storage-blob azure-synapse-accesscontrol azure-synapse-artifacts azure-synapse-managedprivateendpoints azure-synapse-spark + bcrypt + certifi + cffi chardet colorama cryptography distro fabric - jsmin + humanfriendly + idna + invoke + isodate + javaproperties + jinja2 + jmespath + jsondiff knack - mock + markupsafe + msal-extensions + msal + msrest + msrestazure + oauthlib + packaging paramiko - pydocumentdb + pbr + pkginfo + portalocker + psutil + pycomposefile + pycparser pygithub - pygments + pyjwt pynacl pyopenssl - pytz - pyyaml - psutil + python-dateutil + requests-oauthlib requests scp semver six sshtunnel + tabulate urllib3 - vsts-cd-manager + wcwidth websocket-client xmltodict - javaproperties - jsondiff - # urllib3[secure] - # shell completion - argcomplete ]; postInstall = '' @@ -189,10 +190,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { --set PYTHONPATH $PYTHONPATH ''; - # almost the entire test suite requires an azure account setup and networking - # ensure that the azure namespaces are setup correctly and that azure.cli can be accessed - checkPhase = '' - HOME=$TMPDIR $out/bin/az --help > /dev/null + doInstallCheck = true; + installCheckPhase = '' + export HOME=$TMPDIR + + $out/bin/az --version + $out/bin/az self-test ''; # ensure these namespaces are able to be accessed @@ -202,7 +205,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.cli.telemetry" "azure.cosmos" "azure.datalake.store" - "azure_functions_devops_build" "azure.graphrbac" "azure.keyvault" "azure.loganalytics" @@ -224,10 +226,8 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.containerregistry" "azure.mgmt.containerservice" "azure.mgmt.cosmosdb" - "azure.mgmt.datalake.analytics" "azure.mgmt.datalake.store" "azure.mgmt.datamigration" - "azure.mgmt.deploymentmanager" "azure.mgmt.devtestlabs" "azure.mgmt.dns" "azure.mgmt.eventgrid" @@ -247,7 +247,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.media" "azure.mgmt.monitor" "azure.mgmt.msi" - "azure.mgmt.network" "azure.mgmt.netapp" "azure.mgmt.policyinsights" "azure.mgmt.privatedns" @@ -256,7 +255,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.recoveryservicesbackup" "azure.mgmt.redis" "azure.mgmt.relay" - "azure.mgmt.reservations" "azure.mgmt.resource" "azure.mgmt.search" "azure.mgmt.security" diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index d13dd28230..5cbb6a903d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,6 +1,7 @@ { stdenv , python3 , fetchPypi +, fetchpatch , src , version }: @@ -9,8 +10,7 @@ let buildAzureCliPackage = with py.pkgs; buildPythonPackage; overrideAzureMgmtPackage = package: version: extension: hash: - # check to make sure overriding is even necessary - package.overridePythonAttrs (oldAttrs: rec { + package.overridePythonAttrs (oldAttrs: { inherit version; src = fetchPypi { @@ -28,41 +28,42 @@ let pname = "azure-cli-core"; inherit version src; + patches = [ + (fetchpatch { + name = "fix-python311.patch"; + url = "https://github.com/Azure/azure-cli/commit/a5198b578b17de934e15b1c92e369e45323e9658.patch"; + hash = "sha256-qbyKF6Vvtz8QwY78sG7ptTVcbM2IR+phntOKqsrWetE="; + stripLen = 2; + includes = [ + "azure/cli/core/tests/test_command_registration.py" + "azure/cli/core/tests/test_help.py" + "azure/cli/core/tests/test_parser.py" + ]; + }) + ]; + sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ - adal - antlr4-python3-runtime argcomplete - azure-common azure-cli-telemetry - azure-data-tables - azure-mgmt-appcontainers + azure-common azure-mgmt-core - azure-mgmt-resource - colorama cryptography distro humanfriendly jmespath knack - msal msal-extensions - msrest + msal msrestazure + packaging paramiko pkginfo psutil - pygments pyjwt - pymysql pyopenssl - pyperclip - pysocks - pyyaml requests - six - tabulate ]; nativeCheckInputs = with self; [ pytest ]; @@ -71,8 +72,8 @@ let # ignore tests that does network call, or assume powershell checkPhase = '' - rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' + PYTHONPATH=$PWD:${src}/src/azure-cli-testsdk:$PYTHONPATH HOME=$TMPDIR pytest \ azure/cli/core/tests \ --ignore=azure/cli/core/tests/test_profile.py \ @@ -88,18 +89,17 @@ let azure-cli-telemetry = buildAzureCliPackage { pname = "azure-cli-telemetry"; - version = "1.0.8"; # might be wrong, but doesn't really matter + version = "1.1.0"; inherit src; sourceRoot = "${src.name}/src/azure-cli-telemetry"; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ applicationinsights - knack portalocker ]; - nativeCheckInputs = [ py.pkgs.pytest ]; + nativeCheckInputs = with self; [ pytest ]; # ignore flaky test checkPhase = '' cd azure @@ -111,89 +111,29 @@ let antlr4 = super.pkgs.antlr4_9; }); - azure-batch = overrideAzureMgmtPackage super.azure-batch "14.0.0" "zip" - "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ="; - - azure-data-tables = (overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip" - "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" - "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; - - azure-mgmt-appcontainers = (overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" - "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" - "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; + azure-mgmt-appcontainers = overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" + "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; - azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" - "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8="; - - azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" - "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM="; - - azure-mgmt-extendedlocation = overrideAzureMgmtPackage super.azure-mgmt-extendedlocation "1.0.0b2" "zip" - "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A="; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b4" "zip" "sha512-NW2BNj45lKzBmPXWMuBnVEDG2C6xzo9J/QjcC5fczvyhKBIkhugJVOWdPUsSzyGeQYKdqpRWPOl0yBG/eblHQA=="; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" + "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b10" "zip" "sha256-sM8oZdhv+5WCd4RnMtEmCikTBmzGsap5heKzSbHbRPI="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.4.0" "zip" - "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk="; - - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip" - "sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8="; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip" "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw="; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip" - "sha512-bUFY0+JipVihatMib0Giv7THnv4rRAbT36PhP+5tcsVlBVLmCYqjyp0iWnTfSbvRiljKOjbm3w+xeC0gL/IE7w=="; - - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.0.0" "zip" - "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg="; - - azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" - "sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk="; - - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" - "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; - - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip" - "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; - - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" - "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; - - azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" - "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; - - azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" - "sha256-RuNCInmT/JrKsd2kLy61ZrUiqMlFq50O6lYna0b21zA="; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip" - "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI="; - - azure-mgmt-iothub = (overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" - "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" - "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" + "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "10.0.0b1" "zip" "sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00="; @@ -204,73 +144,20 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip" - "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - - azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" - "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg="; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; - azure-mgmt-network = (overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" - "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-maps = (overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" - "sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" - "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; - - azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" - "sha256-urm9UyocNFV/Wwq5lQ5DHj8Au5boo85m3w9s4q4ZzXM="; - - azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" - "sha256-aLOB9SpN9ENdrK1al+HFmsTJgfZn3MqPnQRFNBfWCtg="; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; - azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { - version = "7.0.0"; - src = old.src.override { - inherit version; - hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; - }; - }); - - azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" - "sha256-tg8W5D97KRWCxfV7rhsIMJbYMD6dmVjiwpInpVzCfEU="; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip" "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; - azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.2.0" "zip" - "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip" + "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - azure-mgmt-redis = (overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip" - "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip" - "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; - - azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip" - "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; - - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "5.0.0" "zip" - "sha512-wMI55Ou96rzUEZIeTDmMfR4KIz3tG98z6A6teJanGPyNgte9tGa0/+2ge0yX10iwRKZyZZPNTReCkcd+IOkS+A=="; - - azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip" - "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; - - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b10" "zip" - "sha256-QHvbO6Toh5QflMIaNYmxXBy0Dmw++RVdim3HEDtLBrQ="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b12" "tar.gz" + "sha256-LJx9cdtqpoHl1pPGYodoA50y8NP4ftbXhY7zohsCPH8="; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip" "sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc="; @@ -278,296 +165,32 @@ let azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip" - "sha256-XO5w+X/joJPDy3DCoZDC35Nrdy6UoJ73496x7Rd8nzI="; - - azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" - "sha256-2fmHzymYuKNU8zGypxCCwEkZPx4c00WBLhS5uCE2Wss="; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.2" "zip" - "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4="; - - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" - "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; - - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" - "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - - azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "6.0.2" "tar.gz" - "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" - "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.3" "zip" + "sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU="; azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" "sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs="; - azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "3.0.0" "zip" - "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; - - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip" - "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; - - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.2.0" "zip" - "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM="; azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip" "sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk="; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" - "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; + azure-storage-common = overrideAzureMgmtPackage super.azure-storage-common "1.4.2" "tar.gz" + "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz" - "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; + azure-keyvault-keys = overrideAzureMgmtPackage super.azure-keyvault-keys "4.8.0b2" "zip" + "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY="; - azure-appconfiguration = super.azure-appconfiguration.overrideAttrs (oldAttrs: rec { - version = "1.1.1"; + azure-mgmt-datalake-store = overrideAzureMgmtPackage super.azure-mgmt-datalake-store "0.5.0" "zip" + "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - extension = "zip"; - }; - }); - - azure-graphrbac = super.azure-graphrbac.overrideAttrs (oldAttrs: rec { - version = "0.60.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4="; - extension = "zip"; - }; - }); - - azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec { - version = "1.4.2"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; - }; - }); - - azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs (oldAttrs: rec { - version = "0.15.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; - extension = "zip"; - }; - propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [ - azure-mgmt-core - ]; - }); - - azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs (oldAttrs: rec { - version = "0.5.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; - extension = "zip"; - }; - }); - - azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs (oldAttrs: rec { - version = "0.4.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4="; - extension = "zip"; - }; - }); - - azure-synapse-spark = super.azure-synapse-spark.overrideAttrs (oldAttrs: rec { - version = "0.2.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI="; - extension = "zip"; - }; - }); - - azure-keyvault = super.azure-keyvault.overrideAttrs (oldAttrs: rec { - version = "1.1.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-N6jl83brWjBPzQZtQUtdk7mH5o+SErDEHvo31Cmq3Uk="; - }; - - propagatedBuildInputs = with self; [ - azure-common - azure-nspkg - msrest - msrestazure - cryptography - ]; - pythonNamespaces = [ "azure" ]; - pythonImportsCheck = [ ]; - }); - - azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs (oldAttrs: rec { - version = "4.3.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; - }; - }); - - azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs (oldAttrs: rec { - version = "4.8.0b2"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY="; - }; - }); - - - # part of azure.mgmt.datalake namespace - azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs (oldAttrs: rec { - version = "0.2.1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-THlg0JT1hH2aRWwYuKPI5gxCjjCAo5BfHJQ9gbpjUaQ="; - extension = "zip"; - }; - - preBuild = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" - ''; - }); - - azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs (oldAttrs: rec { - version = "0.5.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; - extension = "zip"; - }; - - preBuild = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" - ''; - }); - - adal = super.adal.overridePythonAttrs (oldAttrs: rec { - version = "1.2.7"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; - }; - - # sdist doesn't provide tests - doCheck = false; - }); - - msal = super.msal.overridePythonAttrs (oldAttrs: rec { - version = "1.24.0b1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-ze5CqX+m8XH4NUECL2SgNT9EXV4wS/0DgO5XMDHo/Uo="; - }; - }); - - semver = super.semver.overridePythonAttrs (oldAttrs: rec { - version = "2.13.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; - }; - }); - - jsondiff = super.jsondiff.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; - }; - }); - - knack = super.knack.overridePythonAttrs (oldAttrs: rec { - version = "0.11.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ="; - }; - }); - - argcomplete = super.argcomplete.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-bExWPxTwFECq/6Pq4TRBxdsjV7Xuxjmr58CxUzRiff8="; - }; - }); - - sshtunnel = super.sshtunnel.overridePythonAttrs (oldAttrs: rec { - name = "sshtunnel-${version}"; - version = "0.1.5"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-yBP9zajoHDk2/+rEfLac+y0fXnetDeZWxtq1au69kkk="; - }; - }); - - websocket-client = super.websocket-client.overridePythonAttrs (oldAttrs: rec { - version = "1.3.1"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs="; - }; - }); - - azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs (oldAttrs: rec { - version = "23.1.0b2"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI="; - }; - }); + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "23.1.0b2" "zip" + "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI="; }; }; in diff --git a/third_party/nixpkgs/pkgs/tools/admin/cdist/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cdist/default.nix index 115800fcf2..8467605727 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/cdist/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/cdist/default.nix @@ -2,6 +2,7 @@ , buildPythonApplication , fetchFromGitea , pythonImportsCheckHook +, six , sphinxHook , sphinx-rtd-theme }: @@ -21,6 +22,7 @@ buildPythonApplication rec { nativeBuildInputs = [ pythonImportsCheckHook + six sphinxHook sphinx-rtd-theme ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix index 5823d0cbc7..3dd693b13d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/cf-vault/default.nix @@ -1,16 +1,16 @@ {buildGoModule, fetchFromGitHub, lib}: buildGoModule rec { pname = "cf-vault"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = pname; rev = version; - sha256 = "sha256-+6+I69LRCoU35lTrM8cZnzJsHB9SIr6OQKaiRFo7aW4="; + sha256 = "sha256-puuP7L8KJ3MvlWz5tOeov8HZad+Lvo64DqTbaKPfg6o="; }; - vendorHash = "sha256-oNLGHV0NFYAU1pHQWeCmegonkEtMtGts0uWZWPnLVuY="; + vendorHash = "sha256-cnv3vustgougdfU9RlyP4O3e7kx9nNzzJm1Q2d+sCDo="; meta = with lib; { description = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix index 7f716e3b1f..0dca980379 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.13.3"; + version = "2.13.4"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pte2fOIuezFJ1Hz5MgjRDTIAMJ5r+LO1hKHc3sLu0W4="; + sha256 = "sha256-J6sLDalvUl4SgSyr5DK/tW7DyRa/qdKw6zornz1R2ck="; }; CGO_ENABLED = 0; - vendorHash = "sha256-McicBVC2niLvP902monJwPMOrQKSum10zeHNcO32/M8="; + vendorHash = "sha256-BkTC6sqitc1OHdQFlA2BtqxHI31ubBj2GRszs3YlWsA="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index 59260d042f..24e9640bc9 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.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-+ABZafDc2nmHHnJGXj4iCSheuWoksPwDblmdIusUJuo="; + hash = "sha256-qnZLVt9pIrfZSCK0blNp5JHbaC4A8m6YicvL4hs2554="; }; - vendorHash = "sha256-ptgHU/PrLqRG4h3C5x+XUy4+38Yu6h4gTeziaPJ2iWE="; + vendorHash = "sha256-mzrMiycW+kWtooCMWGLOHXPYJQ+y3wLMB2V+f4u4wtY="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 7c56d6952b..8257c7a386 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-ldSF+M6gYKJ6EDJ4jKpPS+XTyybynsRhibNtLG1+DlE="; + hash = "sha256-9+K1d35wghK/j4hp7tGRDvj/5s3wiwj/++wovUf6n4Q="; }; - vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU="; + vendorHash = "sha256-qV2uZX2In+NYpzlQRuTfRtmWhozYwviVaFxMC+4kf7I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 9483d59846..5b7aed1f12 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.19"; + version = "2.9.22"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-7Bmw3rJbb+Ae6gvVROz7hADDrGr8eiZX6g+ZpWSd99k="; + sha256 = "sha256-snQLZ/bHYDdC62Ti1E4zUmBHR8TtrKCx0BC2i6GAfdE="; }; # these tests require network access that we're not going to give them diff --git a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix index b5b6a1fb32..632da8db0a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/drawterm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-08-22"; + version = "unstable-2023-09-03"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c91c6fac9d725716ca6ecc3002053f941137f24f"; - hash = "sha256-oGcKRx1tP2jeshHhaCHPRKmwKQ3WPYK1tHGGt1/3oDU="; + rev = "c4ea4d299aa1bbbcc972c04adf06c18245ce7674"; + hash = "sha256-Tp3yZb1nteOlz/KhydFdjBrj3OrY20s/Ltfk/EBrIyk="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 9a1edeef22..862b68be94 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.74.2"; + version = "1.74.3"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Xssc8T4y8ZaFqOukAJkrKPSUBM0uTlGkI3M92XNLalk="; + sha256 = "sha256-upnwaY++tUg4LcuD/BMSvvM2bo/95OP+SUK/aOiq1Oo="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock index 779d6d32de..78fd051062 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.824.0) - aws-sdk-core (3.181.1) + aws-partitions (1.851.0) + aws-sdk-core (3.186.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (1.6.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -32,11 +32,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.103.0) + excon (0.104.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -66,7 +65,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.216.0) + fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -107,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.49.0) + google-apis-androidpublisher_v3 (0.52.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -122,23 +121,23 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -161,7 +160,7 @@ GEM os (1.1.4) plist (3.7.0) public_suffix (5.0.3) - rake (13.0.6) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -189,13 +188,10 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -214,4 +210,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.19 + 2.4.20 diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix index a28442fd04..033ce2a429 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03dy04n302202rn97cy2r65ybx7ik0s2qqg8s4w3jgi4nvhyy8b4"; + sha256 = "1aj4c8m40kpyy48j5gmr3gnz27sy97zjrdd3xpn6i0ix2m9sq2c5"; type = "gem"; }; - version = "1.824.0"; + version = "1.851.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; + sha256 = "19zl449qzc2ir0yzwhdy82nkm0ycd1822pym6b2i0h1k7zw69may"; type = "gem"; }; - version = "3.181.1"; + version = "3.186.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; type = "gem"; }; - version = "1.71.0"; + version = "1.72.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; type = "gem"; }; - version = "1.134.0"; + version = "1.136.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; babosa = { groups = ["default"]; @@ -178,15 +178,14 @@ version = "0.6.5"; }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; dotenv = { groups = ["default"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15la3ni3fwl8aj8mifn3hkryfjg6z09j4cc8j24rq6kwknlry5ff"; + sha256 = "104vrqqy6bszbhpvabgz9ra7dm6lnb5jwzwqm2fks0ka44spknyl"; type = "gem"; }; - version = "0.103.0"; + version = "0.104.0"; }; 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"]; @@ -368,10 +367,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mqlcnblhs1dp4433skziqissl92frwcbf4bbq1ihvywlbpayfb"; + sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi"; type = "gem"; }; - version = "2.216.0"; + version = "2.217.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wdy5r6rhnj9744fvibkm1npgz3nm7wfcaann1laz45mh499f2g"; + sha256 = "0rxxj033ziwx94xcym2cs76lcqjiyxv5vv52i32s97nkpk6wid6g"; type = "gem"; }; - version = "0.49.0"; + version = "0.52.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4p7fyqlnydjgprawmhc7q6yjfzdjjvhn0hh0j6a9rq9wii2xli"; + sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -433,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj"; + sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; type = "gem"; }; - version = "0.19.0"; + version = "0.29.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -476,10 +475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9"; + sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; type = "gem"; }; - version = "1.44.0"; + version = "1.45.0"; }; googleauth = { dependencies = ["faraday" "jwt" "multi_json" "os" "signet"]; @@ -487,10 +486,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06yg24bdh0daxz3bz7ap90b14j3blli7ywg5q05a5kghs9xa26y1"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; highline = { groups = ["default"]; @@ -658,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; representable = { dependencies = ["declarative" "trailblazer-option" "uber"]; @@ -828,36 +827,15 @@ }; version = "0.1.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; webrick = { groups = ["default"]; @@ -885,10 +863,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; + sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix index 6ec8819e3b..0e4b614891 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.11.13"; + version = "0.12.6"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-S4XouqqIBalXqfznrJ8F2TxU9h+gqObnjRXEQnj67LQ="; + sha256 = "sha256-WecKgLnfasqNp4G9e24EPjSeA9dqiEhl8KjVQ/KbmKk="; }; - vendorHash = "sha256-Y1F+7bJwsUb09xTSRSdfa6bOPMFCkNBaNurrfB9IPCA="; + vendorHash = "sha256-f9KJyMu4WD96IPTWSuGfQDZvayEbZ+1KeQj/99Ck/I4="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json index 1c10e5dcca..eba193fd51 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20230913232318.tar.gz", + "source": "components/google-cloud-sdk-alpha-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2023.09.13" + "build_number": 20231025210228, + "version_string": "2023.10.25" } }, { @@ -258,15 +258,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.39" + "version_string": "0.2.42" } }, { "data": { - "checksum": "6c9c19b295b58635ece35aff414fe5effba058ab1b79a0ddcf0a4050fcd07724", - "contents_checksum": "0070a20c6c7d70c1bd95122cc2433ca1d10d9d04b586ddf2bef062366ff1c553", - "size": 69713997, - "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20230811080439.tar.gz", + "checksum": "47cc151c673943cbfee58321453f85b32d673b3e453724fff31374a8605992b6", + "contents_checksum": "3ff8b9ef0510722872095c6d027b78f45dce430eadf07fc219b7f435c503dcf1", + "size": 70015524, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -290,16 +290,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "1040e5510117e0759085bb099d661462b7ae8dfe48ec919a56e5261d127be25f", - "contents_checksum": "9be893eceb503735424483a74cf5fc9eb6f255975ceff37b9088129a2437a583", - "size": 53541169, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20200717144158.tar.gz", + "checksum": "e99a7d19c60cbab6f5ce8578133e1c30c545e89b6f768b457abd2d84722f9c4d", + "contents_checksum": "348b94e8d769713049f005663b17056668dc4e3429e682a6956dd7f624fccbbf", + "size": 72896092, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -323,16 +323,16 @@ }, "platform_required": false, "version": { - "build_number": 20200717144158, - "version_string": "0.2.4" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "68f89760d225e7d6ba00b8426008e9cec2c4e9f1148437f27030f4d5b963b350", - "contents_checksum": "034002c97e36fa79e64e8c6eeebb45c440a2949d1eca9c6e1e27fe1fd29bded0", - "size": 72519881, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20230811080439.tar.gz", + "checksum": "f9e5e6e59e910787542ed59cd7a31f27774e7795989457689bb974238ea58312", + "contents_checksum": "348b94e8d769713049f005663b17056668dc4e3429e682a6956dd7f624fccbbf", + "size": 72896095, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -356,16 +356,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "b9fe6d9d6fd57590029f97dd94317b778f2a8dfd397bf498d7ad819d85cba0d4", - "contents_checksum": "730ff23fe21ff5025226aeac4a0b9ee89fe812b4cffd42577aa3825edef47692", - "size": 66370717, - "source": "components/google-cloud-sdk-anthoscli-linux-arm-20230811080439.tar.gz", + "checksum": "768b260e7477339405cd191e43b5bcdc96150af0f309b58c24e48827237542be", + "contents_checksum": "d3d2363c63df31848603536b8af09769ce6bb8a0fefbeaefd0336b2362d0ef31", + "size": 67245549, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -389,16 +389,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "212d4c7f6c479a9694b9d0b71f9b70abc099064361189c05820b9ed7a53e33ee", - "contents_checksum": "8af47e00a414f1497aecf06ed2857848beaf39b00f689b14ebaf331155f2f108", - "size": 67584318, - "source": "components/google-cloud-sdk-anthoscli-linux-x86-20230811080439.tar.gz", + "checksum": "390124c5fec46fb6800ca03dd9caf7f75259a6bc28d5841dcc972900cec9a9ba", + "contents_checksum": "bf1c54e0b66c498b1d086940dee6ddd11aaa7ed745c65d03cd98f10ef1c49e83", + "size": 65298977, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -422,16 +422,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "6a11c8d6cb6499df68d4a941ed5b65465a48e854c41c4ec93151e1e503e52b19", - "contents_checksum": "fd772027ab6f5b8a6ef8c4e1490cd815a040c7bb1a4b5934daa2283b6c65326b", - "size": 71743762, - "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20230811080439.tar.gz", + "checksum": "091730628a45921ef9f34db8b9fbc9568007b0a2a771c60ca786fbc45728b884", + "contents_checksum": "b30074343ee0a19121bf1163fccf5223b9e6125e744c00eef5c20977bcd3320a", + "size": 71982294, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -455,16 +455,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "d5da2425be0789881adc1e73320668ef3fa76fa2cc7ea3d3eeccf6eec9bee886", - "contents_checksum": "9e1016c61c5da178fe941a9d2781bf4d885f848ec4d446e1549d91660003e27b", - "size": 69424923, - "source": "components/google-cloud-sdk-anthoscli-windows-x86-20230811080439.tar.gz", + "checksum": "d6f16a6a028d3247de10be2cd63d523b954c4f76347d6a5c88a301c4cd35ddcb", + "contents_checksum": "2ad1786533a5cee19cddf36074f51726748422801d4417cb3793baff40ca9b0d", + "size": 67251009, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -488,16 +488,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { "data": { - "checksum": "1c5fecef505498f91590cdf84d157e86dc268d3c5142661871b8a411235f64a9", - "contents_checksum": "f498e7bdcecc49f2ea9ad3b64a4ab5da1ac8440dd31a7a933cca6a9fd876f09a", - "size": 71860994, - "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20230811080439.tar.gz", + "checksum": "de36bc756712c520d88572641ccd4810acb6d9342b055291a517e32eda2d9e25", + "contents_checksum": "686ac57e568ce4ae5b4ad352c3cc32643762e48d8c6009dae47eebb0fff7ae0d", + "size": 72608049, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -521,8 +521,8 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.2.39" + "build_number": 20231023224440, + "version_string": "0.2.42" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "dfd70f98b0499ffb58073f49ffe1ed4cbf4cc7ce7ea84dd4725d24095f0a5612", - "contents_checksum": "41f8f2f2fd2d7e5669f40b929ee6ca67cd89c522eb52e7fd49c9894322346ad0", - "size": 68235380, - "source": "components/google-cloud-sdk-app-engine-java-20230822145232.tar.gz", + "checksum": "38175db1182e07654ddef6ff8794d3ddf0d830c180920392342ea4ceff027a58", + "contents_checksum": "2fb9f245011b3b51c4173522e015f899dd2d6a4bc54ea12bff941c9265aba2e5", + "size": 129915384, + "source": "components/google-cloud-sdk-app-engine-java-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230822145232, - "version_string": "2.0.17" + "build_number": 20231023224440, + "version_string": "2.0.21" } }, { @@ -1142,10 +1142,10 @@ }, { "data": { - "checksum": "3d9e4e52e403d93571280e57a7043d06a1d6bdf2d148b4680939698e2a061f57", - "contents_checksum": "82f8dec8fd96c0faa5f0714b22c967bfe0e6fa461a8ccd4933cbd92e0b881925", - "size": 8902100, - "source": "components/google-cloud-sdk-app-engine-python-20230626165516.tar.gz", + "checksum": "07c19454806ac60603f18bc9e7eeb56ae6eba1477e25a91fd95682c4011c6207", + "contents_checksum": "71ff9043af9fa982b8dbbc1f8f122d9f981cb5fe168356f4a7f13bf58ae23e25", + "size": 8748068, + "source": "components/google-cloud-sdk-app-engine-python-20231016163610.tar.gz", "type": "tar" }, "dependencies": [ @@ -1164,16 +1164,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230626165516, - "version_string": "1.9.105" + "build_number": 20231016163610, + "version_string": "1.9.107" } }, { "data": { - "checksum": "271b756ecef2be78c223e7ed34237d2db6f1449d5946cfccf500db58c0e1d0de", - "contents_checksum": "afd7dbfe3c0505517cbf411b41a3fa257af853216fa25df8d2105383e6d819bd", - "size": 28667619, - "source": "components/google-cloud-sdk-app-engine-python-extras-20230626165516.tar.gz", + "checksum": "44a183b079e30fc932dbd7ca5b497baa6fa7d080ad78c500da99de6ef9e1a132", + "contents_checksum": "49a80207105a59c3948dd43fda0e28a6f9621265df127c7a3aa9707862ab7bfe", + "size": 33004574, + "source": "components/google-cloud-sdk-app-engine-python-extras-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -1191,8 +1191,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230626165516, - "version_string": "1.9.101" + "build_number": 20231002150006, + "version_string": "1.9.102" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20230913232318.tar.gz", + "source": "components/google-cloud-sdk-beta-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2023.09.13" + "build_number": 20231025210228, + "version_string": "2023.10.25" } }, { @@ -1493,10 +1493,10 @@ }, { "data": { - "checksum": "a35e41c8aee406c280389cbe6a550556f6c1a0421ab9bcb2c894c29bb9d65787", - "contents_checksum": "930007d6d8032253a89e675cb0aeda7a6fbc46222134db70e41807c1c30528a4", - "size": 7015509, - "source": "components/google-cloud-sdk-bigtable-darwin-arm-20230714124024.tar.gz", + "checksum": "5af8d24eb8da1c8229c414e9950bcdc453a9e316742541eefe830afaca8a158e", + "contents_checksum": "e08ae70a70d4da56bae3d13b09b898b865557461f01e7690fd25f82b91890910", + "size": 7097728, + "source": "components/google-cloud-sdk-bigtable-darwin-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1521,7 +1521,7 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, @@ -1561,10 +1561,10 @@ }, { "data": { - "checksum": "1e977db8d695c41a268eac0f3c92f3c937fe79ae6f6dd3a886b9a2890b7d099f", - "contents_checksum": "83072bb22bfb489885e8e4cab0a26d45e697c2325a3359edc83a24f92559476a", - "size": 7252387, - "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20230714124024.tar.gz", + "checksum": "aa2d0f3e322a7912fac2b012fc1c368eaa129905372b82560488ec9b803494d5", + "contents_checksum": "7c84152ea5f2da5f06f9b55b035534d9bd2270c9959ae162c3cb5f8d392d6801", + "size": 7333846, + "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1589,16 +1589,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, { "data": { - "checksum": "1ee3905b685a1ac4a901bf4169b6ce4588cdd4f39022d886ffaf510e385b565f", - "contents_checksum": "622d316c1310f17ae17c9baeeb348ae42d879e043079a0560c5d052c2ee05e61", - "size": 6884139, - "source": "components/google-cloud-sdk-bigtable-linux-arm-20230714124024.tar.gz", + "checksum": "52ea181edb2b8b69fa3ebea25467238facc828dc79d1b22c2aafb79385e0f4e6", + "contents_checksum": "0dc475dc09c285508b6ba21ab40ebabf9151a9e5ecaf05a3754b3283a00df42a", + "size": 7011804, + "source": "components/google-cloud-sdk-bigtable-linux-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1623,16 +1623,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, { "data": { - "checksum": "0584548d7dfd42ed0741189a6401b152ec45477c3ad115030cfa686080007dab", - "contents_checksum": "b72692c84a64003e44640526b14922cdc3921e0dee7c61ac177af3a089b59fb8", - "size": 7284298, - "source": "components/google-cloud-sdk-bigtable-linux-x86-20230714124024.tar.gz", + "checksum": "972efb72c12e9fb15777d2f0b0ee49d34793bd088147eda1599826b261c54f8d", + "contents_checksum": "ea6f11df05804197e9a0f3ad1d52db162b23769aab97b2913248dc42044e2803", + "size": 7255397, + "source": "components/google-cloud-sdk-bigtable-linux-x86-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1657,16 +1657,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, { "data": { - "checksum": "fe8a4153e422519d566434baf63f8848392b18e37e8ea316a9c39eb0b1dcc275", - "contents_checksum": "b95feb3f3aeb74bf87912351a8f9f87226310b62a3696dc5254a3a9c7f160203", - "size": 7371483, - "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20230714124024.tar.gz", + "checksum": "e62748c75c268a9648b26920838b281e50511b7f430dff0eca124f3f5763699e", + "contents_checksum": "19b5048d20242fc730b4544fe0b5ac800c30b02059efb4b26588eb31d1fc482a", + "size": 7454541, + "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1691,16 +1691,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, { "data": { - "checksum": "71167c3a50569dd3ec38c30e2cb710447516e9629d423c8ce8dba94e73e04fdc", - "contents_checksum": "f8c0020a128341d38a1f396d29d8d7a9c9b0d82377a46f44762e5147f00e9ba3", - "size": 7311053, - "source": "components/google-cloud-sdk-bigtable-windows-x86-20230714124024.tar.gz", + "checksum": "e031eb7a2735c0bd2db4d82d8da081a264cbaddc58ed9b84e2b1564994e54643", + "contents_checksum": "7751a9071bb5830f7f3f9dc9a229a268405a1ba76d5bdd19483a8c66089c72eb", + "size": 7288454, + "source": "components/google-cloud-sdk-bigtable-windows-x86-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1725,16 +1725,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, { "data": { - "checksum": "2fa8a1b4ec904525688d25913ad62422d819259cd45a58dc65721d51b1e64641", - "contents_checksum": "f9f218a7c20fb4c451bedfbed361293d026fa79f012895d63d22ae05f1cf20f8", - "size": 7334819, - "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20230714124024.tar.gz", + "checksum": "1f24acd6a6c63ed1c283e7b7bfbda31bc08a86b1241e5ad4f08858df7678d669", + "contents_checksum": "f640127893c4339c4f04791834143af3fe3931ac91877dd73dcb4ee3cecf6d01", + "size": 7451653, + "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -1759,7 +1759,7 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, + "build_number": 20231006153333, "version_string": "" } }, @@ -1793,10 +1793,10 @@ }, { "data": { - "checksum": "69c23ad5967f796b8b568220dcef351f125989cf28635425ed454729d6e5ec45", - "contents_checksum": "6fe6634311749c1081100758f5506aa479afbe28db0989da99a122d577f76080", - "size": 1947, - "source": "components/google-cloud-sdk-bq-nix-20230913232318.tar.gz", + "checksum": "b6a10d752554fb9cf518d697999f49806d1009455c78cc3c6fc67f6d97edf1b9", + "contents_checksum": "da65662d83df53b15ff35bdedace8671669280b875620876181ac0e9665cbc04", + "size": 2019, + "source": "components/google-cloud-sdk-bq-nix-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -1821,7 +1821,7 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, + "build_number": 20231025210228, "version_string": "2.0.98" } }, @@ -1991,7 +1991,7 @@ "core" ], "details": { - "description": "Provides stand-alone Python 3.9.16 installation for UNIX.", + "description": "Provides stand-alone Python 3.9.17 installation for UNIX.", "display_name": "Bundled Python 3.9" }, "id": "bundled-python3-unix", @@ -2009,15 +2009,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.9.16" + "version_string": "3.9.17" } }, { "data": { - "checksum": "103f22feccd078b1f2ce97032347567f60292fd6c2908bd03b50fc87604ceec4", - "contents_checksum": "d180face4e75defdab3f52ee344af5dc842b09df39680f43d558a5670ca770db", - "size": 66719069, - "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20230707144938.tar.gz", + "checksum": "ad591cffcb3cb00ea73e1e8fa13d76d4ebeded14bb7d4d54f4dbd90cff79911c", + "contents_checksum": "d2c4025b7acd5008a935cbd1a71c399d28cb5723065576b1b31f917f10bb0479", + "size": 65481810, + "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -2025,7 +2025,7 @@ "core" ], "details": { - "description": "Provides stand-alone Python 3.9.16 installation for UNIX.", + "description": "Provides stand-alone Python 3.9.17 installation for UNIX.", "display_name": "Bundled Python 3.9" }, "id": "bundled-python3-unix-linux-x86_64", @@ -2042,16 +2042,16 @@ }, "platform_required": false, "version": { - "build_number": 20230707144938, - "version_string": "3.9.16" + "build_number": 20231023224440, + "version_string": "3.9.17" } }, { "data": { - "checksum": "b3395d1c218922c972ec46eb1477f47222dc005f006fc796a4ac4cca5dabce04", - "contents_checksum": "252af0b48981ddc06abc1f34c7eb0e51a29ef6ef33dd31a27024bdf8aa4f8a53", - "size": 8899825, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20230626165516.tar.gz", + "checksum": "f893470fa6f4cabc0bbbd73275b563b9c97682fd199514440c9027b6c5b94b54", + "contents_checksum": "c486cae0284bb1138814cf54bb930441fd39d9ff791366a564d27d6bfac7a789", + "size": 20778243, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20231016163610.tar.gz", "type": "tar" }, "dependencies": [ @@ -2076,16 +2076,16 @@ }, "platform_required": false, "version": { - "build_number": 20230626165516, + "build_number": 20231016163610, "version_string": "3.9.12" } }, { "data": { - "checksum": "2250c30f2799db96a3240e89280150940884e759d05e38b7a9b72a176234d8aa", - "contents_checksum": "4ad346402c3961f786283f93934305fdd98103ffc75207e6c51c0541850b200c", - "size": 22689398, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20230626165516.tar.gz", + "checksum": "cabdb1da4996629632a90399276a75058e46be4a6b92019960c4bdb62efcc4ea", + "contents_checksum": "3bb2ec678153e5bd214be0439970173d86729baaa33f06176bd2ec8435d4304d", + "size": 22193214, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20231016163610.tar.gz", "type": "tar" }, "dependencies": [ @@ -2110,7 +2110,7 @@ }, "platform_required": false, "version": { - "build_number": 20230626165516, + "build_number": 20231016163610, "version_string": "3.9.12" } }, @@ -2148,15 +2148,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.16.1" + "version_string": "0.16.2" } }, { "data": { - "checksum": "d268c4c11ded5035be03a674ac738507254a304794c5df84065c1104f0463b6b", - "contents_checksum": "4358f15359a475b615261666791f922a16f27d1ffe6a93b6ac810bcf84c7d59f", - "size": 11367560, - "source": "components/google-cloud-sdk-cbt-darwin-arm-20230714124024.tar.gz", + "checksum": "4cec674242be0d7a3de6d830325ef93d0b554eeab10431eaf0706199434d937c", + "contents_checksum": "c08a0d1bafbfc51f2aac4555268f1e1dba13f8222454ee8315a7855a114c7216", + "size": 16254518, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2180,8 +2180,8 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { @@ -2219,10 +2219,10 @@ }, { "data": { - "checksum": "6d621cb6bd199b0ba0541ab25bf5e8f53107ed45390fde2e77e807ae8f907aa6", - "contents_checksum": "7f706cdbe7438a25f69934ef7cd36f37bc86c83d3c6a99d554d9c48ba51a232a", - "size": 11758658, - "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20230714124024.tar.gz", + "checksum": "cab9647842e2c6702f739bcf7f4a390098a245f58798035914d47b2e023f5003", + "contents_checksum": "5437ed3b7499b97a8dc71d81f1446b429ca635676fdaada94e5089d181f851f1", + "size": 16717237, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2246,16 +2246,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { "data": { - "checksum": "fb83da9e71c0fff61e6cc794c8a789a3f7625778f50c6fbcdf67a708138e51fe", - "contents_checksum": "f28fe3a5e01caf380632750786b8cf8e22f7018ee08f17ecbf3001b8bf9ecb32", - "size": 11136132, - "source": "components/google-cloud-sdk-cbt-linux-arm-20230714124024.tar.gz", + "checksum": "50481ebc4a0a82e068b9d11e8af938c81dceae23f39a5d7eff888c5d9d29d379", + "contents_checksum": "f1a58b3ed33e5728def81f61e7e28b46239f0a2a0201fc9685d808d11df38f3b", + "size": 15863768, + "source": "components/google-cloud-sdk-cbt-linux-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2279,16 +2279,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { "data": { - "checksum": "7cce7bb82ed260234db4db703bd6a4bd5ace166a50f63a33999aa42394bec424", - "contents_checksum": "e8973fa448bb02a25f135bf0cbcedf158450271d6a68cff36f7ebbcff460404a", - "size": 11659751, - "source": "components/google-cloud-sdk-cbt-linux-x86-20230714124024.tar.gz", + "checksum": "5a5539eab4133fade3206d5f7b546e8d51a5af18c0ac3f0b6ada98249847fa1e", + "contents_checksum": "961c6d25d74bae5b5c00b4e0d48393702c529ac0b1de2b85056f07d63933eb8d", + "size": 16051931, + "source": "components/google-cloud-sdk-cbt-linux-x86-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2312,16 +2312,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { "data": { - "checksum": "d4f4cb28f6b8330601fe3e09436e79582b631a042999c5589f322aa2d8af48e7", - "contents_checksum": "e61bd51a58b99e8cd27f572cc4dada4a30b02e8386678b617e44817cc40356c2", - "size": 11949090, - "source": "components/google-cloud-sdk-cbt-linux-x86_64-20230714124024.tar.gz", + "checksum": "74d5a97a01d246acda0897004a5ece95f9c9ced8aa3c89f0e8cf742edd4284b3", + "contents_checksum": "5fdf279f55e77702b62280f58d19f5eb0adcd5d81e20f76cc7759de07a224ca3", + "size": 16868331, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2345,16 +2345,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { "data": { - "checksum": "b842d826582178802d5fd6554790595c90b7827c772b7dfe7947b72e0d89f65d", - "contents_checksum": "0c6eb856b972e3fd8cc754428b77e1164f11ba8d019c8cf872e965102781b83e", - "size": 11755662, - "source": "components/google-cloud-sdk-cbt-windows-x86-20230714124024.tar.gz", + "checksum": "97b355f30dd40324f7724eb8a1e269d857316796a6d42fdcf3805fce9cefa402", + "contents_checksum": "e824180249e02e5d9c8805faa2cbbc1a237bac7fe53925d6290943234e42cf8c", + "size": 16305542, + "source": "components/google-cloud-sdk-cbt-windows-x86-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2378,16 +2378,16 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { "data": { - "checksum": "469d6731b46bc01777e69fa2c9522dcf5b125061d2ef69d0e5b1bfcf72caf004", - "contents_checksum": "bac89e5c038c0042aa598bd6f51147eada4a060da268d45d4af92a5bfc6239d2", - "size": 11919012, - "source": "components/google-cloud-sdk-cbt-windows-x86_64-20230714124024.tar.gz", + "checksum": "fc7d710003577bf740e4d8dd5f6ad3929620a7f088c1de321a41ff229acb6084", + "contents_checksum": "038673c9ff153e08f9e4cb6af1c7963483796d3f6654e746cb5bf414ff4a63ee", + "size": 16944208, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -2411,8 +2411,8 @@ }, "platform_required": false, "version": { - "build_number": 20230714124024, - "version_string": "0.16.1" + "build_number": 20231006153333, + "version_string": "0.16.2" } }, { @@ -2572,10 +2572,10 @@ }, { "data": { - "checksum": "06725fd7f6569432e58535d7afb888a823371001d3c91ebad8faf84bdefa817b", - "contents_checksum": "52b85660ea488891fa720a8caf8e8695b8231aca89e6a45f3b3676667396cc35", - "size": 44545576, - "source": "components/google-cloud-sdk-cloud-firestore-emulator-20230616150314.tar.gz", + "checksum": "1822e13b021d42edf1ee3d648b00be30960a57d3c74de708a14dd9758bb8f466", + "contents_checksum": "16cc1f413795a2197704184256179a5c65eb11b66d8af59f209bfbda798df11b", + "size": 44883913, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -2592,8 +2592,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230616150314, - "version_string": "1.18.1" + "build_number": 20230915145114, + "version_string": "1.18.2" } }, { @@ -2626,15 +2626,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.4.0" + "version_string": "0.5.0" } }, { "data": { - "checksum": "d41b5b96ea7690595813a23194af46ebcea7e66a65c09636d05df5b709b9ba19", - "contents_checksum": "d7c74ad1c5e11488a3d817d70a8b05f7bf9926dfe9aabedc8e1d1f4ff7d2998a", - "size": 11997608, - "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-arm-20230526134617.tar.gz", + "checksum": "3902d4e218ff13cc8d598d58df4cb6bd3492a94d25f6e9a4b982f41f029b0bbc", + "contents_checksum": "adc46a36ff0d63f4211d4640e4b25ef1685ed100b12a2780ea4e8ce88441a4a2", + "size": 11892176, + "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-arm-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -2658,16 +2658,16 @@ }, "platform_required": false, "version": { - "build_number": 20230526134617, - "version_string": "0.4.0" + "build_number": 20231002150006, + "version_string": "0.5.0" } }, { "data": { - "checksum": "4611d4c7c977729ed6a6e1d0ec913e49dc10413276df20a20262036e0dc779e4", - "contents_checksum": "4194b5f06c95f2ff081b17781456edf92408970e8d053a1c4853c1fa5f9a0750", - "size": 12354577, - "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-x86_64-20230526134617.tar.gz", + "checksum": "ffe39e2e14e5e02607af5d2dc4522f49db3ee93bc37d237aac26621f3ce81080", + "contents_checksum": "2f749a0c99c92b3941dc02d2dfde512c49e0d7c219fdc43d1942332266abad36", + "size": 12269065, + "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -2691,16 +2691,16 @@ }, "platform_required": false, "version": { - "build_number": 20230526134617, - "version_string": "0.4.0" + "build_number": 20231002150006, + "version_string": "0.5.0" } }, { "data": { - "checksum": "f66232a39ff89c2e3a61214588392dc5834da54320d3d0d284a85291aeb451b2", - "contents_checksum": "e9fb09a47f31dfc8023fe6f92b7574851104822808cdf77315662abef24024c0", - "size": 11871678, - "source": "components/google-cloud-sdk-cloud-run-proxy-linux-arm-20230526134617.tar.gz", + "checksum": "1eb797baa16aa3b984f671e1e806aae3379aaf58ac12aeb2f6e9567164525c83", + "contents_checksum": "0a691b80220517b2e5a4ae4501dcff1bebcdedb5903d18ca593774b72c5ed928", + "size": 11807002, + "source": "components/google-cloud-sdk-cloud-run-proxy-linux-arm-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -2724,16 +2724,16 @@ }, "platform_required": false, "version": { - "build_number": 20230526134617, - "version_string": "0.4.0" + "build_number": 20231002150006, + "version_string": "0.5.0" } }, { "data": { - "checksum": "ed57d6387c29c0fdb0d66346a50715625e8a44d6dd7ccebbfe649d108e0eafe9", - "contents_checksum": "d3c6097c6d4db5505daebeb2b77290468670305be01300d3f7161a8728235d94", - "size": 14022178, - "source": "components/google-cloud-sdk-cloud-run-proxy-linux-x86_64-20230526134617.tar.gz", + "checksum": "771d5923d4f99d6c4534b59b7981b0fad1cbeb1d6d1d86d0fcf4903f2fd6ef1f", + "contents_checksum": "7dcff6a313740b3148e3b1c7940f913ed6037d03ec8e7b595f184b92e87a8840", + "size": 13963201, + "source": "components/google-cloud-sdk-cloud-run-proxy-linux-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -2757,16 +2757,16 @@ }, "platform_required": false, "version": { - "build_number": 20230526134617, - "version_string": "0.4.0" + "build_number": 20231002150006, + "version_string": "0.5.0" } }, { "data": { - "checksum": "b929e9ee1748ed6cdc03158c1fe50376e7b965b36c0b954ff3950f7f169a4868", - "contents_checksum": "db29c260ff7bc1db902eb8821451a20f2df2efdf52b5476c14d415faad19c481", - "size": 12550598, - "source": "components/google-cloud-sdk-cloud-run-proxy-windows-x86_64-20230526134617.tar.gz", + "checksum": "26af0634948d3d45dec133ce4fe28182e7598253488f09f147cf6429b0b3080d", + "contents_checksum": "46561d11fbfa6ee88fd2ffdca1823c77ab526c47e94661f35da48f0abc4bb372", + "size": 12475234, + "source": "components/google-cloud-sdk-cloud-run-proxy-windows-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -2790,8 +2790,8 @@ }, "platform_required": false, "version": { - "build_number": 20230526134617, - "version_string": "0.4.0" + "build_number": 20231002150006, + "version_string": "0.5.0" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.9" + "version_string": "1.5.10" } }, { "data": { - "checksum": "d6cb352fe5f3c1651fefa7116f337f8d83576b4525a6fc8971d4799195cad644", - "contents_checksum": "c3a2aaac42475c78d6ee9b133e0b54f735d84f2e2d425c4b6042cddbd9130e43", - "size": 33058208, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230901141909.tar.gz", + "checksum": "7460e9a21137063a8f9f8143f6da86d39d3fde425a956240b695924d45bf3e2f", + "contents_checksum": "3617a6b7497fc5cc13cb5764e374816940474072d2db432342c1bf0f6844f1c5", + "size": 36939704, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230922151743.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.5.9" + "build_number": 20230922151743, + "version_string": "1.5.10" } }, { @@ -3322,10 +3322,10 @@ }, { "data": { - "checksum": "71affe00c517b7244f99d8ebb40b7fc201a5de8a715e5d0ae46b1314af5659e0", - "contents_checksum": "303f5283b0d634c44a293619f08d35aae3aa4c5443dc999c20131b38ec49d813", - "size": 22776383, - "source": "components/google-cloud-sdk-core-20230913232318.tar.gz", + "checksum": "8197db59e523d340b2da73594807ac5a2c0a09d2899fa5adb71cc6dbdb64c63e", + "contents_checksum": "a788f4961a718e4bc4717a5149874353b83ba4ad01f6587725d48bc2e689a07d", + "size": 23032301, + "source": "components/google-cloud-sdk-core-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -3346,16 +3346,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2023.09.13" + "build_number": 20231025210228, + "version_string": "2023.10.25" } }, { "data": { - "checksum": "47b8211d132463492d38a8010faf5d076208e6b3e2d98128da277858bbe60f70", - "contents_checksum": "3650bc34c52406df038cd0b4833d3f0f331a28be5d3f6a5d525f107f27e0e511", - "size": 2324, - "source": "components/google-cloud-sdk-core-nix-20230913232318.tar.gz", + "checksum": "0d68f826ada61d2ab98721bbab6c94132a1c210080fdd85c750073e009ae6d39", + "contents_checksum": "3e23fcf9fd07d22bf46bca03f951e715a328cb8420e09f34ce2e7f5ef401b982", + "size": 2402, + "source": "components/google-cloud-sdk-core-nix-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -3382,16 +3382,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2023.09.13" + "build_number": 20231025210228, + "version_string": "2023.10.25" } }, { "data": { - "checksum": "dad57f6cae8735bb195e3fa6b5163e7ff6a23a0da9d15f134ad1da5bce577956", - "contents_checksum": "4cf8b253ef5723f93895cd9241a7e4e6c31f9973f387f512c7ff94f9435d9be6", - "size": 3199, - "source": "components/google-cloud-sdk-core-win-20230106151201.tar.gz", + "checksum": "0af3f8e9ba07b24f3821758107b18d273edf7fa7703ff4d659b9732e84a73a37", + "contents_checksum": "2ac264344fcf75702a4770bfcba3e6f47573351303cbba558bcde7f8c32cc731", + "size": 3200, + "source": "components/google-cloud-sdk-core-win-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -3415,8 +3415,8 @@ }, "platform_required": false, "version": { - "build_number": 20230106151201, - "version_string": "2023.01.06" + "build_number": 20230915145114, + "version_string": "2023.09.15" } }, { @@ -3907,10 +3907,10 @@ }, { "data": { - "checksum": "467d9055543574a29dc6ec29a04ee451fa29bb16c4ff05e5f52d109a2e95a2eb", - "contents_checksum": "1bc60befc4644930ef06ab113ecdfe5bf1a5bc8c3f2f0060d75bb7a7fa2fc8e2", - "size": 1243682, - "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20230901141909.tar.gz", + "checksum": "535ce4686c07b3bac76f7b107828d4059bf598c92aefac1ebb55d911d90cbc4c", + "contents_checksum": "e3b7aacbdc4d8a5adbf88bee4ac738d9e51755b994a700135dbfd8a758a054c2", + "size": 1243996, + "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -3934,16 +3934,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "488d6cad8a6afef06fd65fa0a215106d1f85e5ee45ceaf42425ddf2c2a1edad6", - "contents_checksum": "243e3cc4226e27d6d33e78b2a8e3df269a203286394a253e6eb23e4c6ae68632", - "size": 1284679, - "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20230901141909.tar.gz", + "checksum": "00972aba9c56aa0bc4916798ab672cc1e6806e76b00783e15b5c5bbc4e804900", + "contents_checksum": "2db99100afdae388afbf96ba0440977d1ab0e9b1fdaa997fac07c5d2c9d6040e", + "size": 1284906, + "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -3967,16 +3967,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "9f1ad3673a407be0318a52fe3fd95e08687e00396afb0415f1f66e37ae5e6572", - "contents_checksum": "f413af6acb2eef1ac3cd0283bc0ad19bcb4de3032e3d28b768c3be4c09ca10ac", - "size": 1215760, - "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20230901141909.tar.gz", + "checksum": "d978d88831992d75a8d1c506c661e3caa702b65acb13bb881f7d2847360836ab", + "contents_checksum": "bc5cd52ce1950d6ac8b24d8f8a00c4bbf7f6af82a908fbe2be630b75ecfc35da", + "size": 1217581, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4000,16 +4000,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "0e59d495794bc4f74f35b4fb0b80bc875285a2a087657cc3bc5d9d402002c170", - "contents_checksum": "60fa0ec3c67be6e5ca3a67abf1f1b165b05cad17687324828a5c83aa472075f1", - "size": 1236402, - "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20230901141909.tar.gz", + "checksum": "5abf460069b1f95004805a1f3469061dc340dda0a44fe89fa969e9693cfdd1c1", + "contents_checksum": "6a50901818b7cd1a27b2229b350f1869edea9c6aa3bf62a526679b81e967e5f0", + "size": 1236281, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4033,16 +4033,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "245d6045703306380b8600cb8f4af83a66274446d63797a4e57e6b467170e5a3", - "contents_checksum": "44e519f2189745eb9a9268361b2cdae8533333a291a5372c44d1eedbc6ee6744", - "size": 1288915, - "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20230901141909.tar.gz", + "checksum": "ec15e4bb7d1a361ae7d931c79626b7a27ded310f118208b5b80e6d54b4f7c793", + "contents_checksum": "3d6e552b35cbf9a7cb8e34026d14de0422241344032487ff418514503c133ad4", + "size": 1289207, + "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4066,16 +4066,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "07949bd0e346aafe389fa1825f54c0a0d9c8d3371a7ef33d33123837988c6118", - "contents_checksum": "6f8d198fc502a73b5b4b36b7dbc826611521d8b223d0cfe5ef568348e1007b10", - "size": 1267859, - "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20230901141909.tar.gz", + "checksum": "98febf85b26c1a33eb215b2af9f3c8bee847ee71c84be463b26b6d0a763f6400", + "contents_checksum": "2e7b929903bc28273be12f0c28dbd68c51315a66600c9751e749ff448d89696f", + "size": 1268435, + "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4099,16 +4099,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "ccf7c11ef2aea6aa0009fcad2db2e1a8dd81c61b54f3f3ea5059ee9e59f9f3ce", - "contents_checksum": "438a33dacd54f38ff6ed00ca7ab7f2c8af26d496ca1709ae54d6b1e51a717a6c", - "size": 1321565, - "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20230901141909.tar.gz", + "checksum": "a5ed8bb33c67304f57f1ab4c1922f0396565e868dd938b49ce9434a87992a5b8", + "contents_checksum": "0c794abb07a045e2c0110bbda9e4033410bb8b7a3d9ddcd329777626ab36d2b3", + "size": 1322057, + "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4132,16 +4132,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, + "build_number": 20231023224440, "version_string": "1.0.0" } }, { "data": { - "checksum": "8062e6600adb95bbb4e40b2862932ac981f396974c09b42ef77b3a6fc9bbf5db", - "contents_checksum": "b783ea64726b9b2746d89ff89bfaf098dc3cf272d3b0b6687444f2c3e7a839cf", - "size": 11660857, - "source": "components/google-cloud-sdk-gcloud-deps-20230707144938.tar.gz", + "checksum": "e6ff194b0ebb57cfca1c65a600e852bd5760a7257afb6240a0ed470ff0965fe0", + "contents_checksum": "25b6e403e06e65b9205d1258a1b9e09e5e84efb20007e5f940b90af41e3e7873", + "size": 12282466, + "source": "components/google-cloud-sdk-gcloud-deps-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -4164,8 +4164,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230707144938, - "version_string": "2023.07.07" + "build_number": 20231025210228, + "version_string": "2023.10.25" } }, { @@ -4401,10 +4401,10 @@ }, { "data": { - "checksum": "62257719f22fc6cf2073c5c2f69ca701619b7e42fc5f4fa057fefc0ccc5c931a", - "contents_checksum": "37f0e75619d403d1513402f1269bb53dacd8a730fa603372b4a08f27d1645708", - "size": 6345856, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20230913232318.tar.gz", + "checksum": "a437611fe8ca14e5fbeada917374b7cd2f7d56ad2212e51b80fcb9e7b036a21a", + "contents_checksum": "4272d2b5be6e3778aaddfdd6a9d555b6dcf31d27428ed7d4aea76e68dfe5f839", + "size": 6464999, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -4429,7 +4429,7 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, + "build_number": 20231023224440, "version_string": "" } }, @@ -4466,15 +4466,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.5.5" + "version_string": "0.5.6" } }, { "data": { - "checksum": "bab3f0cd545b31abac6261077954bd5905a7cf259a818840996018bd6c0d11ec", - "contents_checksum": "fc81a044e880eaf9fead02231085f63bc972e8a69e3460f89a43a6413199cf01", - "size": 7725934, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20230811080439.tar.gz", + "checksum": "748941d0f1088368cddbff04350c1156eb6c0b941fb4a8281f90e715de91600c", + "contents_checksum": "2e92b76de260589610789902d43950f9c23035d9492e9acde1ab81c2ce1b6f86", + "size": 7760852, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4498,16 +4498,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "bfd1096a5cde8dbc2d0855a0ec9d43aad78435bb8a0848508a15b27f822bcb73", - "contents_checksum": "c61ada98109ac205f0f8df472f6c9600e5f04c79966dcd18faa032beecf0f581", - "size": 8102248, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20230811080439.tar.gz", + "checksum": "87e8b9fa1ab657e6f9059b3e73987cdbcafcd0a54a7c0695933a1a630e8c40b6", + "contents_checksum": "e93346a6bed20405a41737b6894e5555fe6e65ff84e0c4dfef1c1ca8fbc8759a", + "size": 8135789, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4531,16 +4531,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "bcba2a7122f04b5c13310423ac01004f022f120ca41c26ae1bea631b5a1c0ddb", - "contents_checksum": "99ee9b34f0272446d3f43daeea0e6bb456df4a0f853d45797ae2283bb1be904f", - "size": 7637527, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20230811080439.tar.gz", + "checksum": "ba39fbdeae5f44a54a83a730d8df93a0b9ce7e18369dabe6f87b023b06b27632", + "contents_checksum": "4fe1de8207994103e77bad7d93ebcc9bffde9cb4fa03fd6d658f009454863ba6", + "size": 7669387, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4564,16 +4564,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "4683c5e88a85f8fb1da0636510121b660b9a05904cae72da7040d36c43147f16", - "contents_checksum": "b7ad73e6ee729be5a121958270136c97c9f9aa4fd8183e700f98bff877325936", - "size": 8151596, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20230811080439.tar.gz", + "checksum": "dde5954dc3e5aeb70dd031d1f9dc06ca91fbfef353786dc7aeaf08fe47b8349e", + "contents_checksum": "23d71fc214901822027f64f6096b3a6559d963432c189b3bacc7ecf5bf36aef6", + "size": 8185793, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4597,16 +4597,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "78610133591f203702d85972496c5171fa87accdd5a9e7100fe57b8cf6f6fd20", - "contents_checksum": "0cf0c81264d321bc616afd7f9bde6aaabf235754bc5e196ee9f6f0d98266cdf9", - "size": 8262835, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20230811080439.tar.gz", + "checksum": "d8d9359bbbb0b8e2761bda8a315a50ad1580450d32e4b31d43da1805c408ec9a", + "contents_checksum": "08767b975276ca0651442a13bb7319c3c065dca875cf416a27251cf2093d576a", + "size": 8298454, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4630,16 +4630,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "8a54b240c23a83e3938b971669047720664c780efc154873d76f1676096fb6fe", - "contents_checksum": "a4d0712ed4600d69f0c47e3ee88158a880997bef9d69a5949816ab827fe33430", - "size": 8254195, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20230811080439.tar.gz", + "checksum": "4e53ce9e76364f936a3730aa26d8396fc905443093bfcba5107e50d999767a28", + "contents_checksum": "e13da874c2f1330b78675428fbf7aead7c0f4a4bb8152c911906659d1e7923bb", + "size": 8294371, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4663,16 +4663,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "3c70264979ffa7857e6e1b43f54adc72b8ac05fc0420f3208210eefab1faeeb0", - "contents_checksum": "b3f80769ff02bd55e86f55ab306a3415152c15f6f6fb4ff03eb43df0a43f8f76", - "size": 8411577, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20230811080439.tar.gz", + "checksum": "72c35b4ec450e1e30e301e681c322bb2ddd8c9158b60f6d7a6c86f5d1d082396", + "contents_checksum": "1a1de077982ffdcb3762e47dea8d515cfe301ec2fab336aa2d3f968a142cff56", + "size": 8448839, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20230915145114.tar.gz", "type": "tar" }, "dependencies": [ @@ -4696,16 +4696,16 @@ }, "platform_required": false, "version": { - "build_number": 20230811080439, - "version_string": "0.5.5" + "build_number": 20230915145114, + "version_string": "0.5.6" } }, { "data": { - "checksum": "51a43ddfdf4e5b6bc8c4355c8cf2583c09495c546536fa3fd44cb0c6a2acb6aa", - "contents_checksum": "687332f3ffdbc2982cdf650f78d172646c2048f63a909715ddf7f907c2a83581", - "size": 11823782, - "source": "components/google-cloud-sdk-gsutil-20230707144938.tar.gz", + "checksum": "b4fc023adfe1710bf0ed63ee39aacbaddf090f97deb9435a6e9a955b72904985", + "contents_checksum": "c995625b17def8c1cdabb251bbd61259dc4b3aabc2d15f0dde5259726581dbe7", + "size": 11833901, + "source": "components/google-cloud-sdk-gsutil-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -4724,16 +4724,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230707144938, - "version_string": "5.25" + "build_number": 20231025210228, + "version_string": "5.27" } }, { "data": { - "checksum": "90c1d15fcc22ac26aab3fe6ce009b2f8feb9a4b2af4a7ff29593f9c3655e8719", - "contents_checksum": "95771fbf06cef5db72c8f52662e6f5707140d72a0eff4b32ed9488605a860f2a", - "size": 1962, - "source": "components/google-cloud-sdk-gsutil-nix-20230913232318.tar.gz", + "checksum": "140a65cc728b7d7f0e0018c85f30ea6e7a0cae5e59af15fa51a6f1156f598ec8", + "contents_checksum": "865d885b3c86680b0f5581236d54916c71c2672b13e32c2c5b1d213429291bdf", + "size": 2035, + "source": "components/google-cloud-sdk-gsutil-nix-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -4758,16 +4758,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "5.25" + "build_number": 20231025210228, + "version_string": "5.27" } }, { "data": { - "checksum": "7a4ad3529975de9195284f0a39143822e7849abcc3a978c278acb4645a85befa", - "contents_checksum": "339ff21beaf5500373e5e45c3c60407fb9b4bc6515408f9d4e95ecc6db4eba03", - "size": 4048, - "source": "components/google-cloud-sdk-gsutil-win-20230913232318.tar.gz", + "checksum": "f44dc54214254bc4c977ac3635113b9299fc7077e2ff2ba649718b0b2b9754ee", + "contents_checksum": "d7ff72a9837188a8f602ba4833ea0f38bb0a55ac160121c59dba0b72fae4064e", + "size": 4125, + "source": "components/google-cloud-sdk-gsutil-win-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -4789,8 +4789,8 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "5.25" + "build_number": 20231025210228, + "version_string": "5.27" } }, { @@ -4880,15 +4880,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.0.0-beta.43" + "version_string": "1.0.0-beta.45" } }, { "data": { - "checksum": "ffbde2072e467345830bed0dda86ec70ff7d40efc5e2b9594993321b36972fe4", - "contents_checksum": "22ef21025037c117ce224207ef739b036b8c3035c160c68349181cbbcb9f52ff", - "size": 15291366, - "source": "components/google-cloud-sdk-kpt-darwin-arm-20230901141909.tar.gz", + "checksum": "165e0d01221c66f8a02ca770a613af9e10ca84c301908cee016c4b9f62228c90", + "contents_checksum": "d69220663dd3189ef2d75698793f173994662ab4a1331f832cce561122dd3347", + "size": 15098362, + "source": "components/google-cloud-sdk-kpt-darwin-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -4912,16 +4912,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.0.0-beta.43" + "build_number": 20231006153333, + "version_string": "1.0.0-beta.45" } }, { "data": { - "checksum": "e2108883bdedcefc84bd4ea393e87c5d83b4c42f62253ff383919021121c6839", - "contents_checksum": "65df48ee9f465ca6e6fc986df92932efa5b842cdd530eb1e84072f44f974f5f9", - "size": 16021339, - "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20230901141909.tar.gz", + "checksum": "8a507cc40d952611f0d3d7ef881cd2564be93a09d91a01c8d9af13a8477eebe8", + "contents_checksum": "bba9c09fe778ebccbeb4c2d77f7fa1a008fc134eebc024d3cfa74ad8737de55d", + "size": 15865808, + "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -4945,16 +4945,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.0.0-beta.43" + "build_number": 20231006153333, + "version_string": "1.0.0-beta.45" } }, { "data": { - "checksum": "8351946591e298682814cc0a6726c73e79ece25e831fbb207d9f964156c9957e", - "contents_checksum": "ccbfbbee4def13de178aad9dfa44eee44ac7147c791fbcaf1950a51d254f63ce", - "size": 13672291, - "source": "components/google-cloud-sdk-kpt-linux-arm-20230901141909.tar.gz", + "checksum": "00242648b8722bdecbbc422dfe5e947a711d14aeb9adb575cb664e07b61a16c0", + "contents_checksum": "b7acebf0b9a28366a0a7ee8f283bb01baa7ba9ab0c85a31d994604c9ee62e587", + "size": 13639470, + "source": "components/google-cloud-sdk-kpt-linux-arm-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -4978,16 +4978,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.0.0-beta.43" + "build_number": 20231006153333, + "version_string": "1.0.0-beta.45" } }, { "data": { - "checksum": "f5736a46e17cf225f10899fb3ffc77f530f138b378023ab5635664fceefbb6b9", - "contents_checksum": "962ef60195fdf21f0be80755e643c74be99aef8fbb3e6df3d2fe41d2a4685f54", - "size": 15262416, - "source": "components/google-cloud-sdk-kpt-linux-x86_64-20230901141909.tar.gz", + "checksum": "d429dbc12345c454e5494e3312bdff83d39ad5793a05423c4ae5fc07a8128aba", + "contents_checksum": "2d9bc0d3ace7952ca0e3e37df2545c0d30734162edd151f7759a75a186134604", + "size": 15103896, + "source": "components/google-cloud-sdk-kpt-linux-x86_64-20231006153333.tar.gz", "type": "tar" }, "dependencies": [ @@ -5011,8 +5011,8 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.0.0-beta.43" + "build_number": 20231006153333, + "version_string": "1.0.0-beta.45" } }, { @@ -6235,15 +6235,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.16.0-rc.2" + "version_string": "1.16.2-rc.2" } }, { "data": { - "checksum": "4c61e344e93450748298b42ad7322ec91fc19968233cba4ce396aec957a0d389", - "contents_checksum": "c8a236fdc75e02e51f4df9944fba64142d65beff2947dd193f46cd4410b77469", - "size": 29348197, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20230901141909.tar.gz", + "checksum": "e985978e6f21b67b026ac23882b40fde32fce195c3618c845dce6e05e145359f", + "contents_checksum": "21fb7c2de16364b3e011aa4364c7b724cd7aacdfa21610ad891c1b8c3a388e02", + "size": 29892791, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -6267,16 +6267,16 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.16.0-rc.2" + "build_number": 20231023224440, + "version_string": "1.16.2-rc.2" } }, { "data": { - "checksum": "4133276f79021f120f771563a1fbac4577752692a52fc9041aca25c45ffa0264", - "contents_checksum": "5f217d14bcb7efb94f509aa05e0e78f0b4679d5660dce82ee7853af2739e40d1", - "size": 30031806, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20230901141909.tar.gz", + "checksum": "413f599d671855ce7bd0002a35b0f6793041282463342206246e42c01fd9c9b8", + "contents_checksum": "ef98a3d5add19c22799e9fe9031487e542f779b31fa604db671775dcd592b739", + "size": 30473701, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -6300,8 +6300,8 @@ }, "platform_required": false, "version": { - "build_number": 20230901141909, - "version_string": "1.16.0-rc.2" + "build_number": 20231023224440, + "version_string": "1.16.2-rc.2" } }, { @@ -6581,10 +6581,10 @@ }, { "data": { - "checksum": "59b34e74c69740814cf35ff34724e4a4890a06719f017be818d6bee201e5ef95", - "contents_checksum": "255c9553769dcf10d63f3cdaa6a8a0a9b1b9c634dbe68d0c0f5a9bfce9f861a3", - "size": 64127564, - "source": "components/google-cloud-sdk-pubsub-emulator-20230728162818.tar.gz", + "checksum": "28574de6bc04f41d2ffc96e94fb00243ae6ec5e6c19524de7c833afd082a0a20", + "contents_checksum": "ec18cbdb02d4f8c9f3abe177bd0f9255eedc1e1d7739121a4ed7a29ce9ff36f4", + "size": 65097027, + "source": "components/google-cloud-sdk-pubsub-emulator-20231016163610.tar.gz", "type": "tar" }, "dependencies": [ @@ -6601,8 +6601,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230728162818, - "version_string": "0.8.6" + "build_number": 20231016163610, + "version_string": "0.8.10" } }, { @@ -6636,15 +6636,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.7.0" + "version_string": "2.7.1" } }, { "data": { - "checksum": "605c6501abdf75e2925eb73cd04767473bb641904c023f3d478050d4890dd97e", - "contents_checksum": "e482ee4870c60c16bb943878b2c866406c7f292351bacabd4ac7e24adf961e0f", - "size": 23587940, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20230913232318.tar.gz", + "checksum": "d82de49ad5de08e99bd6e77ec3dca58b7a48b6d440fffd24a136bc01d3f15c63", + "contents_checksum": "f919555748e2d8c1af435e9a62af9633d5146a251e152d0f077d6f3a5a90d5c5", + "size": 24334283, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -6669,16 +6669,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2.7.0" + "build_number": 20231002150006, + "version_string": "2.7.1" } }, { "data": { - "checksum": "fca11d239902f21eca2c848d6890348ab11735a731caa825a7213c091a1d9a09", - "contents_checksum": "c288f23d050990544470ba5ca77e181eb14ec0a886e6d9dcb1311f8fd6fc7fe4", - "size": 25624859, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20230913232318.tar.gz", + "checksum": "80f62a636612be395d304441b70cb94eb2137a21c5f27363a746fd70f3670565", + "contents_checksum": "e446714207056f4c0a70739472eca48de9a4063c6260a1609c55291a0756f75a", + "size": 26431910, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -6703,16 +6703,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2.7.0" + "build_number": 20231002150006, + "version_string": "2.7.1" } }, { "data": { - "checksum": "630cb3dfaa8dbf06c853ee07782674be6389e1007592e0f6a44feb619b8e40ca", - "contents_checksum": "be2c6e663ecb45790d2d3b9c52a729265d1f0f4106068c78560cc9a77b8a66ba", - "size": 21657598, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20230913232318.tar.gz", + "checksum": "6fd3ecbea23c64ccb1a7a43ba949df0108d5dcb279b8cd1d55a35f54b53bb674", + "contents_checksum": "d38419a04db49b0f30f761ae709c9fa902552871d0aa5522d1777643cc963579", + "size": 22351847, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -6737,16 +6737,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2.7.0" + "build_number": 20231002150006, + "version_string": "2.7.1" } }, { "data": { - "checksum": "63a65c505897d393000f789ab59ab13a51b8efb9db062097150e32a22fa85c31", - "contents_checksum": "73996dd7c5396964494ca45605906ee4e94f61e17a939ee91928f1c2cad8a4ec", - "size": 23697439, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20230913232318.tar.gz", + "checksum": "6ed058de92dfa76751028437b05c76ce17030fc19d4ff7fde5f0d5c915b94110", + "contents_checksum": "c86e65478b18bc05b803e0d4d2c4cf5387b05bd99def05b7017dd74fd478bebc", + "size": 24456326, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -6771,16 +6771,16 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2.7.0" + "build_number": 20231002150006, + "version_string": "2.7.1" } }, { "data": { - "checksum": "f2c263738ce72925f2bb9be94a2f46a913765653d418f33489e97362b75b6d91", - "contents_checksum": "464d83d20aa1b0c6fc2dcefb7b473ae59bfa84153c441b1174bcaf4ea2dd237d", - "size": 24158418, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20230913232318.tar.gz", + "checksum": "c81abe9107f9b03476de18df93b7272bfe4942629e5202eea60611b0294f5883", + "contents_checksum": "027478d2605b71896dfffeb11c85da30e6fa3e6164b55701c5186137047e2771", + "size": 24939189, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20231002150006.tar.gz", "type": "tar" }, "dependencies": [ @@ -6805,8 +6805,8 @@ }, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2.7.0" + "build_number": 20231002150006, + "version_string": "2.7.1" } }, { @@ -6832,15 +6832,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.1.1" + "version_string": "3.1.3" } }, { "data": { - "checksum": "351181fc612520f83a95aa2056d9fb77af708396525831d430613293a3eb44d4", - "contents_checksum": "3ca0009d4be5928013704f2bcc7cac15d40c128fee34161f9e865a696fef948b", - "size": 21914533, - "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20230822145232.tar.gz", + "checksum": "f329d03249adcbd72707b0c723b3229bc3957bc2865ae0c2c13a90339ffed4f0", + "contents_checksum": "280d4a1fac4f797c9ca31c3a60ac377f32633678e92c45cb3d9c52d9ed697b52", + "size": 23033348, + "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20231023224440.tar.gz", "type": "tar" }, "dependencies": [ @@ -6864,8 +6864,8 @@ }, "platform_required": false, "version": { - "build_number": 20230822145232, - "version_string": "3.1.1" + "build_number": 20231023224440, + "version_string": "3.1.3" } }, { @@ -7121,10 +7121,10 @@ }, { "data": { - "checksum": "5c433f56d8ae4bcf2f76cc6dcc92e983cece28215938fa9a07847f79205ad7d1", - "contents_checksum": "e8b398acb9b87974b4725e2ca277f8c899fd5a5f0453a0426dfc4531cd7c3e20", - "size": 38409664, - "source": "components/google-cloud-sdk-tests-20230913232318.tar.gz", + "checksum": "5f1b1acfd653d1c7906dca110f939cf3e3389778ae0d4328c722348e69c3ba58", + "contents_checksum": "7fa3155ffbfc1c7b90d78a1eabb7e722f274149645f0e3979a5493aad1fd9df1", + "size": 50896581, + "source": "components/google-cloud-sdk-tests-20231025210228.tar.gz", "type": "tar" }, "dependencies": [ @@ -7141,8 +7141,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20230913232318, - "version_string": "2023.09.13" + "build_number": 20231025210228, + "version_string": "2023.10.25" } } ], @@ -7161,11 +7161,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20230913232318, + "revision": 20231025210228, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "446.0.1" + "version": "452.0.1" } diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix index 681904e57c..13ba8b8dd6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "446.0.1"; + version = "452.0.1"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-446.0.1-linux-x86_64.tar.gz"; - sha256 = "0d0x0l7g6r3ix9rsxyzw8lf0lmg50cgmrqprrw7vhkpaglxb9lf6"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-x86_64.tar.gz"; + sha256 = "0dj0hzhfvw1p74ja079jmhrhzrbsivgfm0509rxf9xvh1a0kb8zx"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-446.0.1-darwin-x86_64.tar.gz"; - sha256 = "0jnm2md88zcymw3jx07kaszc515hz91l73vfxxf2gdh5cn55k3qr"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-darwin-x86_64.tar.gz"; + sha256 = "0gxz12sblc3slw9rhy0i7x8k61sakr0gwipx75h3cghf72hsx0cn"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-446.0.1-linux-arm.tar.gz"; - sha256 = "13lg232gm3dxnagc76y6h5ini7bx6h6mbp7zrjj7yv523x4pxv0l"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-arm.tar.gz"; + sha256 = "1jcacwqxa5ylffpfp5mr509imay24ddsv43l04fygzahv2sv8a2d"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-446.0.1-darwin-arm.tar.gz"; - sha256 = "15kg43harh96idya93xmlpr9blm6x2nicy18gipy2xa853hknq0i"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-darwin-arm.tar.gz"; + sha256 = "1mpydxqkmfrnqiifgplvc5ghn6rs4981p4pw5zgxip7khw64dfap"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-446.0.1-linux-x86.tar.gz"; - sha256 = "1blm2nf293yd6a16yd29z0xi5gvqh6h0j5734q5fy0ljxfq1xabg"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-452.0.1-linux-x86.tar.gz"; + sha256 = "1whijjp2bn24j78rlfpp01y832fnlgj557v6fim9l78zcavgnahz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index c71f23c978..b65b5700c6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -32,6 +32,7 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}" passAsFile = [ "comps" ]; doInstallCheck = true; + disallowedRequisites = [ google-cloud-sdk ]; installCheckPhase = let compNames = builtins.map (drv: drv.name) comps_; @@ -57,5 +58,5 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}" done # Replace references to the original google-cloud-sdk with this one - find $out/google-cloud-sdk/bin/ -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \; + find $out/google-cloud-sdk -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \; '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix index 7fa7a3b748..65084dcede 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.17.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+XdbHCa7XtngX1v/uH0p7EbQVcZY+vT2ox9saDOKYE0="; + sha256 = "sha256-z8j44WFLzPDpnmQ/vG8DfpjpxnNd942mPUxoXSEJDeI="; }; - vendorHash = "sha256-vHOGnflLC85hrONPPAAuuaPxNkv3t5T616nAnDEZbAY="; + vendorHash = "sha256-cn1rGmjrmPSo6v4TD72I01VbQjwt6dT7ZEijPOjp+kc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix index 4d9734874e..43705fc722 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/hop-cli/default.nix @@ -6,20 +6,21 @@ , stdenv , CoreServices , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.54"; + version = "0.2.60"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-0BIPN4+XYZgUdxygpKpWZq6VkWWNCFD8v5egXOYfC64="; + hash = "sha256-zNAV9WdtRBlCh7Joky5Dl+cw/FpY1m/WJxUoNikmXvQ="; }; - cargoHash = "sha256-KE7AAyArRang/EZrpgv+vlNZaAP/Y2pCltiPMgZ5vFA="; + cargoHash = "sha256-1QD6mEXRw3NCTBKJyVGK3demLKUdE6smELpvdFSJiWY="; nativeBuildInputs = [ pkg-config @@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - CoreServices Security + CoreServices Security SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix index bc38b606b2..95f8a98ed4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix @@ -6,26 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.13.2"; - format = "pyproject"; + version = "1.14.0"; + pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; rev = "refs/tags/v${version}"; - hash = "sha256-dGOB7emhuP+V0pHlSdS1L1OC4jO3jtf5RFOy0UFYiuY="; + hash = "sha256-5TMO1c29ahAQDbAJZb3u2oY0Z8M+6b8hwbNfqMsuPzM="; }; - pythonRelaxDeps = [ - "configobj" - "wcwidth" - "click" - "packaging" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -65,5 +57,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://iredis.io/"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + mainProgram = "iredis"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix index 205a8f42b9..0cb8be3e4d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kics"; - version = "1.7.8"; + version = "1.7.10"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-T4b4PO4NcpsosiyRa/78WJ4yYvc1Ez7t7KIbZzSlQAo="; + hash = "sha256-3guudT+PidrgHcJ6/lA/XWHmZXdvjGOhtpoO+9hkYOY="; }; vendorHash = "sha256-gJu3B30IPp8A/xgtE5fzThQAtnFbbzr8ZwucAsObBxs="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix deleted file mode 100644 index c17f751274..0000000000 --- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "lexicon"; - version = "3.11.7"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "AnalogJ"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-TySgIxBEl2RolndAkEN4vCIDKaI48vrh2ocd+CTn7Ow="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - beautifulsoup4 - cryptography - importlib-metadata - pyyaml - requests - tldextract - ]; - - passthru.optional-dependencies = { - route53 = [ - boto3 - ]; - localzone = [ - localzone - ]; - softlayer = [ - softlayer - ]; - gransy = [ - zeep - ]; - ddns = [ - dnspython - ]; - oci = [ - oci - ]; - full = [ - boto3 - dnspython - localzone - oci - softlayer - zeep - ]; - }; - - nativeCheckInputs = [ - mock - pytestCheckHook - pytest-xdist - vcrpy - ] ++ passthru.optional-dependencies.full; - - disabledTestPaths = [ - # Tests require network access - "lexicon/tests/providers/test_auto.py" - # Tests require an additional setup - "lexicon/tests/providers/test_localzone.py" - ]; - - pythonImportsCheck = [ - "lexicon" - ]; - - meta = with lib; { - description = "Manipulate DNS records of various DNS providers in a standardized way"; - homepage = "https://github.com/AnalogJ/lexicon"; - changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ flyfloh ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index cc5550395f..13589edd6b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.18"; + version = "5.19"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-4F4q+jnypE4I2/5D65UT3NRpdJertSRni8JvHkpTFVI="; + hash = "sha256-Ttw3Hox+GfoI8dE2KpZ2HUTblOPFBUs63IBRI18lAiM="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/package.json b/third_party/nixpkgs/pkgs/tools/admin/lxd/package.json index 7a6a07d011..e30b269605 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/package.json @@ -4,7 +4,7 @@ "author": "Canonical Webteam", "license": "LGPL-3.0-only", "scripts": { - "clean": "rm -rf node_modules yarn-error.log *.log build/ .jekyll-metadata .bundle", + "clean": "rm -rf node_modules yarn-error.log *.log build/ .jekyll-metadata .bundle playwright-report test-results haproxy-local.cfg", "build-html": "cp build/ui/index.html build/index.html", "build": "npx vite build && yarn build-html", "format-js-eslint": "eslint 'src/**/*.{json,jsx,tsx,ts}' 'tests/**/*.ts' --fix", @@ -17,13 +17,14 @@ "hooks-add": "husky install", "hooks-remove": "husky uninstall", "start": "concurrently --kill-others --raw 'vite | grep -v localhost' 'yarn serve'", - "serve": "./entrypoint" - }, + "serve": "./entrypoint", + "test-js": "react-scripts test src/ --watchAll=false"}, "dependencies": { - "@canonical/react-components": "0.42.0", + "@canonical/react-components": "0.47.0", "@monaco-editor/react": "^4.4.6", "@tanstack/react-query": "^4.14.5", "@use-it/event-listener": "^0.1.7", + "axios": "1.3.2", "cytoscape": "3.23.0", "cytoscape-popper": "2.0.0", "formik": "2.2.9", @@ -38,7 +39,7 @@ "react-scripts": "5.0.1", "react-useportal": "^1.0.17", "serve": "14.1.2", - "vanilla-framework": "3.15.1", + "vanilla-framework": "4.3.0", "xterm-addon-fit": "0.6.0", "xterm-for-react": "1.0.4", "yup": "0.32.11" @@ -78,7 +79,7 @@ "sass": "1.57.1", "sass-loader": "13.2.0", "style-loader": "3.3.1", - "stylelint": "14.16.1", + "stylelint": "15.10.1", "stylelint-config-prettier": "9.0.4", "stylelint-config-standard-scss": "6.1.0", "stylelint-order": "5.0.0", diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix index a6d41659a9..b0582ef999 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/ui.nix @@ -6,19 +6,19 @@ mkYarnPackage rec { pname = "lxd-ui"; - version = "unstable-2023-07-03"; + version = "0.2"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; - rev = "c2e819a027d440cbb1cb9d450aad280dde68e231"; - sha256 = "sha256-lEzGACSv6CpxnfkOcsdPrH6KRKDkoKv63m8Gsodk8uc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-DygWNktangFlAqinBm6wWsRLGmX6yjhmRJ2iU0yjcgk="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-SLkgJDb9lwz/ShZh+H4YKAFRc1BdANWI5ndM2O6NzXE="; + sha256 = "sha256-B1SVCViX1LEFoBLMdFk9qaoayku7Y+zU5c4JEJkLmwE="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix index 43e5ad9d65..1d09e02b6b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/oci-cli/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchPypi , python3 }: @@ -10,10 +11,10 @@ let click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "click"; inherit version; hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - sha256 = ""; }; disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix index 4e4bb79c99..77e3e9afab 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "1.7.16"; + version = "1.7.17"; pname = "ossutil"; src = fetchFromGitHub { owner = "aliyun"; repo = "ossutil"; rev = "refs/tags/v${version}"; - hash = "sha256-J6t8QoyCvbGrUX2AkdqugztchP7Cc0jZsrn1+OB2hVY="; + hash = "sha256-5Z0mMgDYexUQAcngeEd0m5J5kRwWTGIS2Q+idBcTV98="; }; - vendorHash = "sha256-oxhi27Zt91S2RwidM+BPati/HWuP8FrZs1X2R2Px5hI="; + vendorHash = "sha256-4a/bNH47sxxwgYYQhHTqyXddJit3VbeM49/4IEfjWsY="; # don't run tests as they require secret access keys that only travis has doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix index 0969acab5e..6e09092874 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/oxidized/default.nix @@ -14,7 +14,7 @@ bundlerApp { description = "A network device configuration backup tool. It's a RANCID replacement!"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski netali ]; + maintainers = with maintainers; [ nicknovitski ] ++ teams.wdz.members; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 3040258c0c..117f02a593 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -9,28 +9,83 @@ , yarn , fixup_yarn_lock , nodejs +, fetchpatch , server-mode ? true }: let pname = "pgadmin"; - version = "7.5"; - yarnSha256 = "sha256-rEKMUZksmR2jPwtXy6drNwAJktK/3Dee6EZVFHPngWs="; + version = "7.7"; + yarnHash = "sha256-8EbbyZHodrYz4a2IYuIWYGutqvrjauSv34o9KFvR/6c="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-o8jPqp4jLF/lZ0frCzPDCSxCy51Nt0mbdeNB44ZwNHI="; + hash = "sha256-+KD05hzghNFpuw2xW3NUVyKwspCUO9fyJgMPzYk1Xt8="; }; # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier - pythonPackages = python3.pkgs.overrideScope (final: prev: rec { }); + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # pgadmin 7.8 is incompatible with Flask >= 2.3 + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + src = oldAttrs.src.override { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + format = "setuptools"; + }); + # downgrade needed for older Flask + httpbin = prev.httpbin.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; + }; + format = "setuptools"; + patches = [ + (fetchpatch { + # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility + # https://github.com/postmanlabs/httpbin/pull/674 + url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; + hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; + }) + ]; + pytestFlagsArray = [ + "test_httpbin.py" + ]; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.brotlipy ]; + }); + # downgrade needed for older httpbin + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = oldAttrs.src.override { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + }; + }); + # Downgrade needed for older Flask + flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { + version = "5.1.2"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; + }; + postPatch = '' + # This should be removed after updating to version 5.3.0. + sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini + ''; + }); + }); offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = yarnSha256; + hash = yarnHash; }; in diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch index 13f7d5069c..ac68eabd41 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch @@ -58,3 +58,31 @@ index 2204ffb..d5fda9f 100644 + +if __name__ == '__main__': + main() + +diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py +index 4c36dd1..a492365 100644 +--- a/web/pgadmin/model/__init__.py ++++ b/web/pgadmin/model/__init__.py +@@ -23,7 +23,6 @@ from flask_sqlalchemy import SQLAlchemy + from sqlalchemy.ext.mutable import MutableDict + import sqlalchemy.types as types + import uuid +-import config + + ########################################################################## + # +@@ -41,10 +40,12 @@ SCHEMA_VERSION = 35 + # + ########################################################################## + ++# hardcode poolsize and max_overflow due to a circular import (config imports model, ++# model now tries to import config) + db = SQLAlchemy( + engine_options={ +- 'pool_size': config.CONFIG_DATABASE_CONNECTION_POOL_SIZE, +- 'max_overflow': config.CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW}) ++ 'pool_size': 5, ++ 'max_overflow': 100}) + + + USER_ID = 'user.id' diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/update.sh index a819c94ebc..90b52f18ad 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/update.sh @@ -104,7 +104,7 @@ cp yarn.lock "$nixpkgs/pkgs/tools/admin/pgadmin/" printf "Done\n" popd -sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$YARN_HASH\"#" ${scriptDir}/default.nix +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$YARN_HASH\"#" ${scriptDir}/default.nix update-source-version pgadmin4 "$newest_version" --print-changes touch $TMPDIR/.done diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock index 04815260d4..8ced96dcb7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -1640,16 +1640,31 @@ rc-resize-observer "^1.3.1" rc-util "^5.33.0" +"@react-dnd/asap@^4.0.0": + version "4.0.1" + resolved "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab" + integrity sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg== + "@react-dnd/asap@^5.0.1": version "5.0.2" resolved "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz#1f81f124c1cd6f39511c11a881cfb0f715343488" integrity sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A== +"@react-dnd/invariant@^2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz#09d2e81cd39e0e767d7da62df9325860f24e517e" + integrity sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw== + "@react-dnd/invariant@^4.0.1": version "4.0.2" resolved "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz#b92edffca10a26466643349fac7cdfb8799769df" integrity sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw== +"@react-dnd/shallowequal@^2.0.0": + version "2.0.0" + resolved "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a" + integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg== + "@react-dnd/shallowequal@^4.0.1": version "4.0.2" resolved "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4" @@ -2635,6 +2650,11 @@ async@^3.2.3: resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + attr-accept@^2.2.2: version "2.2.2" resolved "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" @@ -2665,12 +2685,14 @@ axios-mock-adapter@^1.17.0: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== +axios@^1.4.0: + version "1.4.0" + resolved "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: - follow-redirects "^1.14.0" + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" babel-code-frame@^6.26.0: version "6.26.0" @@ -2906,7 +2928,7 @@ bin-version@^3.0.0: execa "^1.0.0" find-versions "^3.0.0" -"bin-wrapper@^4.0.0", "bin-wrapper@^4.0.1": +bin-wrapper@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605" integrity sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q== @@ -3546,6 +3568,13 @@ colorette@^2.0.14: lodash.memoize "~3.0.3" source-map "~0.5.3" +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + "commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -4211,6 +4240,11 @@ defined@^1.0.0: resolved "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + delegates@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" @@ -4294,6 +4328,15 @@ discontinuous-range@1.0.0: resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== +dnd-core@14.0.1: + version "14.0.1" + resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz#76d000e41c494983210fb20a48b835f81a203c2e" + integrity sha512-+PVS2VPTgKFPYWo3vAFEA8WPbTf7/xo43TifH9G8S1KqnrQu0o77A3unrF5yOugy4mIz7K5wAVFHUcha7wsz6A== + dependencies: + "@react-dnd/asap" "^4.0.0" + "@react-dnd/invariant" "^2.0.0" + redux "^4.1.1" + dnd-core@^16.0.1: version "16.0.1" resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz#a1c213ed08961f6bd1959a28bb76f1a868360d19" @@ -4368,20 +4411,20 @@ domain-browser@^1.2.0: resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -"domhandler@4.3.1", "domhandler@^4.2.0", "domhandler@^4.2.2", "domhandler@^4.3.1": - version "4.3.1" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -"domhandler@^5.0.2", "domhandler@^5.0.3": +"domhandler@5.0.3", "domhandler@^5.0.2", "domhandler@^5.0.3": version "5.0.3" resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== dependencies: domelementtype "^2.3.0" +"domhandler@^4.2.0", "domhandler@^4.3.1": + version "4.3.1" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + domutils@^2.8.0: version "2.8.0" resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" @@ -4391,7 +4434,7 @@ domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" -domutils@^3.0.1: +"domutils@^3.0.1", "domutils@^3.1.0": version "3.1.0" resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== @@ -4571,12 +4614,7 @@ entities@^2.0.0: resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== - -"entities@^4.2.0", "entities@^4.4.0": +"entities@^4.2.0", "entities@^4.4.0", "entities@^4.5.0": version "4.5.0" resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -4948,21 +4986,6 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0: - version "4.1.0" - resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^6.0.0: version "6.1.0" resolved "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20" @@ -5221,7 +5244,7 @@ flat-cache@^3.0.4: resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -"follow-redirects@^1.0.0", "follow-redirects@^1.14.0": +"follow-redirects@^1.0.0", "follow-redirects@^1.15.0": version "1.15.2" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -5241,6 +5264,15 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fraction.js@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" @@ -5385,13 +5417,6 @@ get-stream@^4.0.0: dependencies: pump "^3.0.0" -get-stream@^5.0.0: - version "5.2.0" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - get-stream@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -5726,13 +5751,13 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" -html-dom-parser@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-1.2.0.tgz#8f689b835982ffbf245eda99730e92b8462c111e" - integrity sha512-2HIpFMvvffsXHFUFjso0M9LqM+1Lm22BF+Df2ba+7QHJXjk63pWChEnI6YG27eaWqUdfnh5/Vy+OXrNTtepRsg== +html-dom-parser@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-4.0.0.tgz#dc382fbbc9306f8c9b5aae4e3f2822e113a48709" + integrity sha512-TUa3wIwi80f5NF8CVWzkopBVqVAtlawUzJoLwVLHns0XSJGynss4jiY0mTWpiDOsuyw+afP+ujjMgRh9CoZcXw== dependencies: - domhandler "4.3.1" - htmlparser2 "7.2.0" + domhandler "5.0.3" + htmlparser2 "9.0.0" html-element-map@^1.2.0: version "1.3.1" @@ -5747,15 +5772,15 @@ html-escaper@^2.0.0: resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-react-parser@^1.2.7: - version "1.4.14" - resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-1.4.14.tgz#577b7a90be0c61eebbbc488d914ad08398c79ef5" - integrity sha512-pxhNWGie8Y+DGDpSh8cTa0k3g8PsDcwlfolA+XxYo1AGDeB6e2rdlyv4ptU9bOTiZ2i3fID+6kyqs86MN0FYZQ== +html-react-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-4.2.0.tgz#9168eda80dbfe0335a87fde3fb3ed6c2e91b1188" + integrity sha512-gzU55AS+FI6qD7XaKe5BLuLFM2Xw0/LodfMWZlxV9uOHe7LCD5Lukx/EgYuBI3c0kLu0XlgFXnSzO0qUUn3Vrg== dependencies: - domhandler "4.3.1" - html-dom-parser "1.2.0" + domhandler "5.0.3" + html-dom-parser "4.0.0" react-property "2.0.0" - style-to-js "1.1.1" + style-to-js "1.1.3" html2canvas@^1.0.0-rc.7: version "1.4.1" @@ -5770,15 +5795,15 @@ htmlescape@^1.1.0: resolved "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" integrity sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg== -htmlparser2@7.2.0: - version "7.2.0" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5" - integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog== +htmlparser2@9.0.0: + version "9.0.0" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.0.0.tgz#e431142b7eeb1d91672742dea48af8ac7140cddb" + integrity sha512-uxbSI98wmFT/G4P2zXx4OVx04qWUmyFPrD2/CNepa2Zo3GPNaCaaxElDgwUrwYWkK1nr9fft0Ya8dws8coDLLQ== dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.2" - domutils "^2.8.0" - entities "^3.0.1" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.1.0" + entities "^4.5.0" htmlparser2@^8.0.1: version "8.0.2" @@ -5842,11 +5867,6 @@ https-proxy-agent@^5.0.0: agent-base 6 debug 4 -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - human-signals@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" @@ -5919,17 +5939,6 @@ imagemin-optipng@^8.0.0: is-png "^2.0.0" optipng-bin "^7.0.0" -imagemin-pngquant@^9.0.2: - version "9.0.2" - resolved "https://registry.npmjs.org/imagemin-pngquant/-/imagemin-pngquant-9.0.2.tgz#38155702b0cc4f60f671ba7c2b086ea3805d9567" - integrity sha512-cj//bKo8+Frd/DM8l6Pg9pws1pnDUjgb7ae++sUX1kUVdv2nrngPykhiUOgFeE0LGY/LmUbCf4egCHC4YUcZSg== - dependencies: - execa "^4.0.0" - is-png "^2.0.0" - is-stream "^2.0.0" - ow "^0.17.0" - pngquant-bin "^6.0.0" - imagemin@^8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/imagemin/-/imagemin-8.0.1.tgz#8b29ecb78197d8f0eac6a782f2e6b38fb3780d9e" @@ -6303,11 +6312,6 @@ is-shared-array-buffer@^1.0.2: resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - is-stream@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" @@ -7408,7 +7412,7 @@ miller-rabin@^4.0.0: resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -"mime-types@^2.1.27", "mime-types@~2.1.24", "mime-types@~2.1.34": +"mime-types@^2.1.12", "mime-types@^2.1.27", "mime-types@~2.1.24", "mime-types@~2.1.34": version "2.1.35" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -7420,11 +7424,6 @@ mime@^2.5.2: resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - mimic-fn@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" @@ -7829,13 +7828,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - npm-run-path@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" @@ -7949,13 +7941,6 @@ on-finished@~2.3.0: dependencies: wrappy 1 -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - onetime@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" @@ -8005,13 +7990,6 @@ os-shim@^0.1.3: resolved "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== -ow@^0.17.0: - version "0.17.0" - resolved "https://registry.npmjs.org/ow/-/ow-0.17.0.tgz#4f938999fed6264c9048cd6254356e0f1e7f688c" - integrity sha512-i3keDzDQP5lWIe4oODyDFey1qVrq2hXKTuTH2VpqwpYtzPiKZt2ziRI4NBQmgW40AnV5Euz17OyWweCb+bNEQA== - dependencies: - type-fest "^0.11.0" - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -8212,7 +8190,7 @@ path-exists@^4.0.0: resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== -"path-key@^3.0.0", "path-key@^3.1.0": +path-key@^3.1.0: version "3.1.1" resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== @@ -8332,15 +8310,6 @@ pinkie@^2.0.0: dependencies: find-up "^4.0.0" -pngquant-bin@^6.0.0: - version "6.0.1" - resolved "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-6.0.1.tgz#2b5789ca219eeb4d8509ab1ae082092801b7f07e" - integrity sha512-Q3PUyolfktf+hYio6wsg3SanQzEU/v8aICg/WpzxXcuCMRb7H2Q81okfpcEztbMvw25ILjd3a87doj2N9kvbpQ== - dependencies: - bin-build "^3.0.0" - bin-wrapper "^4.0.1" - execa "^4.0.0" - popper.js@1.16.1-lts: version "1.16.1-lts" resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" @@ -8855,6 +8824,11 @@ proto-list@~1.2.1: resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -9133,6 +9107,17 @@ re-resizable@6.9.6: dependencies: fast-memoize "^2.5.1" +react-arborist@^3.2.0: + version "3.2.0" + resolved "https://registry.npmjs.org/react-arborist/-/react-arborist-3.2.0.tgz#f17d726e7d18fcb1494b83ffadfecc8c9bda5dff" + integrity sha512-sjGL1KIRogwkM5uVifpp01yrfTcIHsm62Kbs78kBbPuksrnJPZ13SAqAqZeXVuyvO0Tbd7odExF/KoHtXHIZaQ== + dependencies: + react-dnd "^14.0.3" + react-dnd-html5-backend "^14.0.1" + react-window "^1.8.6" + redux "^4.1.1" + use-sync-external-store "^1.2.0" + react-aspen@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95" @@ -9154,6 +9139,13 @@ react-checkbox-tree@^1.7.2: nanoid "^3.0.0" prop-types "^15.5.8" +react-dnd-html5-backend@^14.0.1: + version "14.1.0" + resolved "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-14.1.0.tgz#b35a3a0c16dd3a2bfb5eb7ec62cf0c2cace8b62f" + integrity sha512-6ONeqEC3XKVf4eVmMTe0oPds+c5B9Foyj8p/ZKLb7kL2qh9COYxiBHv3szd6gztqi/efkmriywLUVlPotqoJyw== + dependencies: + dnd-core "14.0.1" + react-dnd-html5-backend@^16.0.1: version "16.0.1" resolved "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz#87faef15845d512a23b3c08d29ecfd34871688b6" @@ -9161,6 +9153,17 @@ react-dnd-html5-backend@^16.0.1: dependencies: dnd-core "^16.0.1" +react-dnd@^14.0.3: + version "14.0.5" + resolved "https://registry.npmjs.org/react-dnd/-/react-dnd-14.0.5.tgz#ecf264e220ae62e35634d9b941502f3fca0185ed" + integrity sha512-9i1jSgbyVw0ELlEVt/NkCUkxy1hmhJOkePoCH713u75vzHGyXhPDm28oLfc2NMSBjZRM1Y+wRjHXJT3sPrTy+A== + dependencies: + "@react-dnd/invariant" "^2.0.0" + "@react-dnd/shallowequal" "^2.0.0" + dnd-core "14.0.1" + fast-deep-equal "^3.1.3" + hoist-non-react-statics "^3.3.2" + react-dnd@^16.0.1: version "16.0.1" resolved "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz#2442a3ec67892c60d40a1559eef45498ba26fa37" @@ -9319,7 +9322,7 @@ react-virtualized-auto-sizer@^1.0.6: resolved "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz#d9a907253a7c221c52fa57dc775a6ef40c182645" integrity sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA== -"react-window@^1.3.1", "react-window@^1.8.5": +"react-window@^1.3.1", "react-window@^1.8.5", "react-window@^1.8.6": version "1.8.9" resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.9.tgz#24bc346be73d0468cdf91998aac94e32bc7fa6a8" integrity sha512-+Eqx/fj1Aa5WnhRfj9dJg4VYATGwIUP2ItwItiJ6zboKWA6EX3lYDAXfGF2hyNqplEprhbtjbipiADEcwQ823Q== @@ -9422,7 +9425,7 @@ redent@^4.0.0: indent-string "^5.0.0" strip-indent "^4.0.0" -redux@^4.2.0: +"redux@^4.1.1", "redux@^4.2.0": version "4.2.1" resolved "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== @@ -9851,7 +9854,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -"signal-exit@^3.0.0", "signal-exit@^3.0.2", "signal-exit@^3.0.7": +"signal-exit@^3.0.0", "signal-exit@^3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -10235,11 +10238,6 @@ strip-eof@^1.0.0: resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-final-newline@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" @@ -10277,17 +10275,17 @@ style-loader@^3.3.2: resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff" integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw== -style-to-js@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.1.tgz#417786986cda61d4525c80aed9d1123a6a7af9b8" - integrity sha512-RJ18Z9t2B02sYhZtfWKQq5uplVctgvjTfLWT7+Eb1zjUjIrWzX5SdlkwLGQozrqarTmEzJJ/YmdNJCUNI47elg== +style-to-js@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz#2012d75dc89bf400edc29c545ed61c8626b00184" + integrity sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ== dependencies: - style-to-object "0.3.0" + style-to-object "0.4.1" -style-to-object@0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" - integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== +style-to-object@0.4.1: + version "0.4.1" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz#53cf856f7cf7f172d72939d9679556469ba5de37" + integrity sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw== dependencies: inline-style-parser "0.1.1" @@ -10691,11 +10689,6 @@ tunnel-agent@^0.6.0: dependencies: prelude-ls "^1.2.1" -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -10905,6 +10898,11 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== +use-sync-external-store@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== + "util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index b9c2a46390..c3f78e6083 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.0"; + version = "0.14.3"; src = fetchFromGitHub { owner = "dalance"; repo = "procs"; rev = "v${version}"; - hash = "sha256-DoH9XxPRKGd+tex8MdbtkhM+V8C1wDMv/GZcB4aMCPc="; + hash = "sha256-uVbYYJgxYATEmNrMuxA7RYDJWip/paWDCf5An1VGVDo="; }; - cargoHash = "sha256-B+LpUErsvtLYn+Xvq4KNBpLR9WYe38yMWHUNsd9jIs8="; + cargoHash = "sha256-eaerc6cUF35XYFTNn0upydkOIC9M1BRweknrixIEvuk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index 231ef9daab..299d77ff8a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,160 +1,160 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.78.1"; + version = "3.94.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.78.1-linux-x64.tar.gz"; - sha256 = "10aw5ck6n0yyrclx1739bs62jk15yn21s7a78a4fgg8i4n0fhj28"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-linux-x64.tar.gz"; + sha256 = "1yn97xxqwgrcd5psrrimcz1gjv34s7mri40nwb2mgmqj7xs4hyi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.6.0-linux-amd64.tar.gz"; - sha256 = "09af270dwghp43nfmmqjq161l2ydmpl2gv9hg004aaidsdjzih7l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; + sha256 = "1ppfs7cnhns4lqxj7cs87f78hcvy73r32fa7wxcybl5wnd73g5c6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.1.0-linux-amd64.tar.gz"; - sha256 = "1xvi2frwpfkb7xcmr10asan2p3hcax7ljzdgkkc3fd7igr5ydrr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-amd64.tar.gz"; + sha256 = "0pf1pka8pq4cizlnf5hm5ji1hf5nchkj21mwpi2cxdk2w4ghw0ds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.43.0-linux-amd64.tar.gz"; - sha256 = "0ff2kfjrbfnpf5iy0ss6y3nyp07blc7s8ip0dwyfgl8dlr9rzn8k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-linux-amd64.tar.gz"; + sha256 = "0qi3wp5iy9pym4yqzx1186paz80dv7lppcd0jw4fgpi8lclfygbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.3.0-linux-amd64.tar.gz"; - sha256 = "0ldzkcdrp4njg3ig6a0mgjc1x0qbxbkg6s1c6i30kkaiiz2y2kll"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-linux-amd64.tar.gz"; + sha256 = "06ycizhynnmr9g0awqn9y8jglxl7brxrzibxh9lb55kiy5vl8vry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-amd64.tar.gz"; - sha256 = "0zd8g62i4f39979mmk517dbw86aqizviiclism4pji3xas77p7m0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz"; + sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-amd64.tar.gz"; - sha256 = "0yhzmiiic7nvqcdxfrsbwgxnd1d3fqb1z9zn2j7iavp2clkf67ka"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-linux-amd64.tar.gz"; + sha256 = "112rd5hhmcp2h7r6jzihcb8g1w1r4g1ba1mwk808nwqfgswfi2wf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.48.1-linux-amd64.tar.gz"; - sha256 = "1p485dzi6mbjvy1ikbf0qs2z0c215rj3m54qx4y0rxi8annizmby"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-amd64.tar.gz"; + sha256 = "0slbvp9pg2yrrm5i4z7zhyksn8lmz82xymvwadr69z71h59s3b1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.40.0-linux-amd64.tar.gz"; - sha256 = "088929a1fw35syk47s15wy0rzn46jc87q12n4bg35bzlya4vaf97"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-amd64.tar.gz"; + sha256 = "029xymc6ynb7aq5wdkvksgqhjl9aix5j3rn8dfzlbmrmmz0xyvxr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.10.0-linux-amd64.tar.gz"; - sha256 = "00iv8r8wansaxgaj66mc7myccwa73nwmbl4rzb7qs6b4v111f8iy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-linux-amd64.tar.gz"; + sha256 = "0hk2niplgjhkq7fhkwhhka33cikdami7r6g2f80c7d94g8wpgf5x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.8.0-linux-amd64.tar.gz"; - sha256 = "1ff269vq5hq0587i33k13vr4vy7r4m6zarkkyf1xfi542qzhgjmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-linux-amd64.tar.gz"; + sha256 = "1vn3rayqdg8hff0bcbmzy2nz9pzbki00y729jxdlkv2k4y4raik6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-amd64.tar.gz"; - sha256 = "0drdv78f7xx3fx8xx6iialcy3nkq9z1lkdfj1fbhzaxpa6bmzyjh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-amd64.tar.gz"; + sha256 = "1h7rxzax73hq6dyldb6dqxrjhbddamaljn2h0cabdjlvrvbnkg0l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-amd64.tar.gz"; - sha256 = "0vndpw6xc9iz69rfawkjihxs7gq8mch5z8qi742yicygw5hsmr58"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-amd64.tar.gz"; + sha256 = "0bsbfsc7wxsjyqyz5klxn91hd1lwini4pbpm0lw5pf78af7z8v0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.21.0-linux-amd64.tar.gz"; - sha256 = "0piqhknbirp7xp6y2v76fd4hd4zwd0v6y3sy6rivd6974zhcxlma"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-linux-amd64.tar.gz"; + sha256 = "1r1sfxngwkf89lni0l8zalh2vz5a7m9ap4p15cs4bc98zmkin762"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.1-linux-amd64.tar.gz"; - sha256 = "15p29v8dxhj30h4zhn5vcaxlmrwd9vbls92p0jx4b28s08mbq1z8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-linux-amd64.tar.gz"; + sha256 = "1m44dwr8q8w60s5clm4n1hini1bm5bqc7p7h1gvbh5zg1482hn5q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.4-linux-amd64.tar.gz"; - sha256 = "0arlgmjs1zca1cjcnl8v9lgdsvy12v41f6qpwx4f3f7pi1sg9r3r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-amd64.tar.gz"; + sha256 = "1l3pqshzxscv3pxp5wjyrc83irkhh6g7hbdi51x2jhdywjz5r55m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.62.0-linux-amd64.tar.gz"; - sha256 = "19h7y1klljhz6ipwv5298nm9qli5blw8y8w299kin1427hzhxw86"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1047qlwrv42llknx25r2iqdchparcrc5krpbjcqq194rpzq73m02"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.16.0-linux-amd64.tar.gz"; - sha256 = "04k8a4l249ys0ckrjnprzcwwwa5asg8qnwnwb353rdwcqqq0j2ys"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-amd64.tar.gz"; + sha256 = "0hnaanqg991xy4jmk09rcd5adzx760707133yaax0nx6r1g0lbdc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.1-linux-amd64.tar.gz"; - sha256 = "0hxg4pdls5gwrjf3nvgl9wf5bymx6aj3fknpn8fhxvija2nig800"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-linux-amd64.tar.gz"; + sha256 = "0x22g7rdywxk1crgcf424n6w2h1jslk4fhhh66g642d553jpz1ci"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-amd64.tar.gz"; sha256 = "1xq92rsk7bimkr52c13mjypd0ygs7qc9ijyi2ghnf0585d1z5bk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.1-linux-amd64.tar.gz"; - sha256 = "14hp752d06dwg2yr7hm6dx2y2vi6m7aylxr4kw85zfk6c0zcpf74"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-amd64.tar.gz"; + sha256 = "0f5sii66fffq5qrri8r1a3xzskvj9yx6chr7j2s34kgc11dqrbxc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-amd64.tar.gz"; - sha256 = "1m8gfw7jkxljh1wbqbaj9njkwcj9ii535fillkmn92p049izw0xj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-linux-amd64.tar.gz"; + sha256 = "1r079igvw2cv90sq5c7ldfvyfni3a6vh8bwj9hzbjwmcmpdf2lri"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-amd64.tar.gz"; - sha256 = "1x50ayk6vla5j2b9ld890vsyl2m47k39g5cwwhpvdy3zbsnb39d9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-linux-amd64.tar.gz"; + sha256 = "10llnm73xzm8p2jjiny1zbx9snh633vi8psbaxc2hrjv8ks803i0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; - sha256 = "02ma55cxc8hhcc9lybaz4dn7842jmq5cf01wyjd1xnrchzcska1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-amd64.tar.gz"; + sha256 = "1r4cvln9c9i2xvj8r6bb6l2ccy6457vhdj9ra35yq5zckwf0dri0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-amd64.tar.gz"; + sha256 = "0nl5xyj4jij500vm6na653s8savr2nm0hzx2qn1brgfpxx9j4pvj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-linux-amd64.tar.gz"; - sha256 = "0qqfb0gxqz6rxi5m2q8m2k6s8yfdl9x97p5f3cfchmi2zvwyqysy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-amd64.tar.gz"; + sha256 = "1dx4riyz1p8dz3biqqxkg6zv6y0jzikc20lk3wj7q2ifxy7rigia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-amd64.tar.gz"; - sha256 = "13c7c4ddp07rf6vfca16gax270253l7rd9bb068fgg25d6fcfzgw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-amd64.tar.gz"; + sha256 = "1fmwrw4x88yw490m1csddk2pi6yr8avv3zwyimzsr0ax5k2fdwyr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-amd64.tar.gz"; - sha256 = "1a1l07v0hbay0gxvr05mrknllq6vqkyjbv9486klsdswqr9l4p6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-linux-amd64.tar.gz"; + sha256 = "1v59k0m4rrad5vbd2x4znb985cbwj9py6ki60x1skq704pmcli5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.31.0-linux-amd64.tar.gz"; - sha256 = "1g8lrzjb0qb9lmrwmgpjdjag9wsf50qddj2zq195vj9ds6s29s28"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-linux-amd64.tar.gz"; + sha256 = "1g5rx5vy8miwlz66dwv6nks9jk0pjyxb37w6wgnpcgw02m9famrl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.47.0-linux-amd64.tar.gz"; - sha256 = "1zdfyk7b5vsxh1rv1sgig884q920yyjxf0vjd882m7dpiq8w2hp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-linux-amd64.tar.gz"; + sha256 = "1k3xipaw1nrfc0vms20xcxnaz4f0wni3a3w85lwiyi4vx5pd0kn7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.17.0-linux-amd64.tar.gz"; - sha256 = "03bvzxbvyqlx3y332i2gb8h0rg2n8lrmsq8zfms1l7jgm2283slc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-amd64.tar.gz"; + sha256 = "1knsb0ha7xbgvlna67nhxmmrr6rw3h52va3dh4ra47b7r8ii7dca"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-amd64.tar.gz"; - sha256 = "09rj7mq5rh2mrs4s2ac2w5gwg9vwdbr2jk9qz2r43scrbwzwva9g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-amd64.tar.gz"; + sha256 = "06gvx51nl93rj244yximp6059yiyxh4jcdqqcrjic8r7wabzsiiw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-amd64.tar.gz"; - sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-amd64.tar.gz"; + sha256 = "0b6nd5gk0d2vg6z0ql87zjyvl880h390g767d9vggwzlwljxzhsm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-amd64.tar.gz"; - sha256 = "08i5ja0lmwncfi8c05485sw08b6r9590wvcr342n1mvgljv7mqc0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-amd64.tar.gz"; + sha256 = "0lyx8wjzjhh38lzfdh6d4qns40cj14nrjmrsdiwrfk6h60s0bh1c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-amd64.tar.gz"; - sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-amd64.tar.gz"; + sha256 = "044w1qwjadrz0ylr00qnwppvq6mc8c8z759b0wfn69a2r25az19f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-amd64.tar.gz"; - sha256 = "0sgzzqfq26dykzc4ij98ksnhv92d6c4n74pjwag2pfy78yzrm7rl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-linux-amd64.tar.gz"; + sha256 = "1y8yfzmgxx2x15ljwjyc5kyrkmai1if59hz65avsf67615xisnyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1s6p0jxhiywjyfkmv5w0lz5y3s83330ac8n691vyjglpaamkxi0n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-amd64.tar.gz"; + sha256 = "0xn8vw19dp6hwm8w94p3lnmpy1zhdczxjphjy6m79pv1mszc153f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,156 +163,156 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.78.1-darwin-x64.tar.gz"; - sha256 = "0v7hmaq22drl1zisf0sq8rjk9by345bf6bb6j27c8qh7fvxn2kzk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-darwin-x64.tar.gz"; + sha256 = "0v854xz9imq9kxslvyx3km20jzcia8m6wkq6ga1gxlsrbx3ajgrn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.6.0-darwin-amd64.tar.gz"; - sha256 = "16ygv5n87a9hjrs1jbzf13b8y8h5krpp86w1wl8fpy7ns624wjr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; + sha256 = "1rvrln32jndp1yq05ybqim10m2wh2g9rwa5q5brxsrzn1gfa41jx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.1.0-darwin-amd64.tar.gz"; - sha256 = "0ad8hrv74r6s9bj6rlsgkjjd00h5hqkdb9dafgp7y7avlzc5lxgq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-amd64.tar.gz"; + sha256 = "0i4kjngs8ly5cxikxc1jz2lcma31sx87vbdbny2j7xxz3fqsyi19"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.43.0-darwin-amd64.tar.gz"; - sha256 = "00h0k84pmaxyfqkb3aqvla5pv25x015r3ngb302lfamdq5py6k1g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-darwin-amd64.tar.gz"; + sha256 = "0rrs93qrqz4bs66ydjb2y4jl6l7pdycs4hqpgp110mipn54bkfix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.3.0-darwin-amd64.tar.gz"; - sha256 = "05ac2lrz3vqs280xc2sdksimwwp124zk3r7v5m7w161sfs9fbppb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-darwin-amd64.tar.gz"; + sha256 = "03rvwmslb8z5y0whfw8n9ycdi943kniacw5jxasi4crciz5ynldf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-amd64.tar.gz"; - sha256 = "0k65d3gl29fkb3vf132mwxklz0im8zdmkjgw92npvqan62bvg9gk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-amd64.tar.gz"; - sha256 = "0c8hmkqifms6y5wb5rw2xm2as1zrr91q94ikig9p02qv0g0m63n8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-darwin-amd64.tar.gz"; + sha256 = "08acycw7qz7dz6hb7yrja38gkqb309nbski68g9vpbvgg71b4kkm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.48.1-darwin-amd64.tar.gz"; - sha256 = "177y8gp07wkfc777za1fnyc4z3a3mxn3668h3qgyn6xvg2q9p7by"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-amd64.tar.gz"; + sha256 = "1b01rnms4fzi0w4pmyxjrp06001fz99dpas4r06ri2mm21kdbyvf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.40.0-darwin-amd64.tar.gz"; - sha256 = "04clrzbb2h2d1wwnbz1jyrn79gxjw523ygbr4f2ssr3hlcsagizz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-amd64.tar.gz"; + sha256 = "16zc13z31p92775v3vsn6j6pmz1wcjqb8rhzxpnr03zbqviws7mi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.10.0-darwin-amd64.tar.gz"; - sha256 = "078bzv7jh4xvshcpdqcyn401a46c389d46df7vrs14c4bqblygmi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-darwin-amd64.tar.gz"; + sha256 = "1jdxf418lrh1rzhmkcjpvx1l5pc7gjigyxdxfzf9ig8fxhwrnwhm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.8.0-darwin-amd64.tar.gz"; - sha256 = "1dwka3zpwv1njnqdxpiwl0mwyw68hllb8j17xsyk73j6bb4rzccm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-darwin-amd64.tar.gz"; + sha256 = "0h6lsjh7243792x943900aw714i7nkjcyn8sgcy4y2z2c43ic1pz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "090iifz0psm9iqh4qwvfsl7nrk5v7xqiryqnhibg5m643h1vinqg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-amd64.tar.gz"; + sha256 = "0wyjcpl5iw3f97k0s372lh4xrpdibsrczwdprl55w56wxd7kdjq1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "03r639yn0maqhlxfnmld7hhrms5gnajw9sqgw3k40xj8rfiiw6ar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-amd64.tar.gz"; + sha256 = "1qyb6v3bxg7hsr5viwpc4nzdgq63frjqgxs7kqyg1pp40rcmh2bm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "182q1zkg9n29k9h1ncfr7wv8rfxwdfwj1if0b3gyxzwikybkpnjg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-darwin-amd64.tar.gz"; + sha256 = "0iymy2rjyxya49w7awrjns4pnj4m2m66iqf59f1a6ww4i5qmx5f1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "0x9sgdgna71by09nhd10jb4g3xdfwsbzyndsvsfgj70zqlrg4504"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-darwin-amd64.tar.gz"; + sha256 = "0g8rcdbfbpmsw3wqx9jy5kz6pcmr9im2njisi3rlkkyfazm7fmqd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.4-darwin-amd64.tar.gz"; - sha256 = "09w0a8kryyfkdk9nbhic4ww4c90z3bw0csvb9xc3102pq4w8kvq9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-amd64.tar.gz"; + sha256 = "0xdfxxlfxm44bkljc5c8h3ici7dlkbgbg6z2ns4870p15lhq34n5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.62.0-darwin-amd64.tar.gz"; - sha256 = "0n4qdx3w7m5gljwa9vngjjcfjzddfpplv8hmyvkj0zcflj2dgakn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "159p2fxfhgck431cbzs5ik6s4bprx8jp5nxi28ir52qyfaj3xx6x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.16.0-darwin-amd64.tar.gz"; - sha256 = "018gky56m0s3x9i50w8x90r1nxqhhl82r4hf99q8jzdibrm9xkn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-amd64.tar.gz"; + sha256 = "1547hc9jdg0j6n66sk5j7iid5m5pvkv8q9j09q9vkcrkj3kkjcvb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.1-darwin-amd64.tar.gz"; - sha256 = "1xchg58b01sqqv44zzalk9mwgmkkdadm5mp8mn5v1gr0zc6mc14v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "1kipsvsji6s9j2644ka46rpg4mhscj3hb61b5g3ghfmm66hxijs6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-amd64.tar.gz"; sha256 = "18vqn7cs5l6fyxmplvcmb779sa91ka8vzz40giggdxzsdjjj9dpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.1-darwin-amd64.tar.gz"; - sha256 = "0xcx0lsxxs4v3wjbbdf7sm1x6gi1pihm2gb4a1x1mh7qpnp6jiv4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-amd64.tar.gz"; + sha256 = "19zm781g8ii062dp48wf11pdyrddk10c5rf18xk4bpf2prbg5vsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-amd64.tar.gz"; - sha256 = "13jl22xzifgl4l3kizxdsk2cfqi5vlfngkka05p6d9zh3v5kz2v7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-darwin-amd64.tar.gz"; + sha256 = "1mj438fnidycdbxi168z3bkc8fxpw1fzagssxzwawd2d6faxv919"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-amd64.tar.gz"; - sha256 = "0d4j4njn19kxyxjgaw2m0xxr68s2i90dq1n9yyvk1d6rh6m55hlx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-darwin-amd64.tar.gz"; + sha256 = "087i49sx3cw7vylq01vby1mhblr03ib302yhss7sx944brzc53hv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; - sha256 = "07sav5r6z3xlx953jyv3b3wq7q6nv3sbh44fx753yqfh7ahagpn5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "1w8q091igjzwlqp9ck23jxh87r5cnsg83jwlxr6ynddlp7w2c6yp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "0q54fvqlldzy11833nislmlrcrkz25wsyqvkph41qdm0yv39ycx7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-darwin-amd64.tar.gz"; - sha256 = "11dh5jnpfiah7w1rg99ympm0fin4b2ld6rixggqxq04lqfqh8i2v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "04pgw5plavn4kvkapky26xx4pgdcf0c27il18g7hmfvnmagfcsiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "1g4baplhlgp8mxgb31sw1zinpdzzam7xcnc50i1xhr89i33zxfxy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-amd64.tar.gz"; + sha256 = "0iabnnkywwylqggyn6c2kqj6j4jdy1ms3vwfyvwkr78909f8jzal"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-amd64.tar.gz"; - sha256 = "0xdz6l3d646mmzn9llfw2zpgr8dk2drqkhf8fff9xljy736qc2zn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "1jg3qdm331dvnq2igf6q0xd2ld21jnhm0h756pmxszngadfnmcdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.31.0-darwin-amd64.tar.gz"; - sha256 = "07abpp4xbbx8p9s0bb7vw6h8pdlcr8s2zs9hp55437lymzbwbx39"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-darwin-amd64.tar.gz"; + sha256 = "19pm2qfjmdfz32py93xcmw85byyffgq1xpv6rdk31r25ys9qhdbl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.47.0-darwin-amd64.tar.gz"; - sha256 = "0mzvxhy13a3xvdyqcxdiflps7jaxjsgzgb1gqx6j3w4x1lq886gn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-darwin-amd64.tar.gz"; + sha256 = "19i67kpf5ghw9w5mdww10njz7cf0v7975in0nrp2i6l61p9c9yl1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.17.0-darwin-amd64.tar.gz"; - sha256 = "0y4xpdypr1gsf19lfbb46l74f7mjjshkq13dqv6gh7639b4c55q1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-amd64.tar.gz"; + sha256 = "0xgihb099s99qb5bk6wavwm9227z73jgqrysmvjrqkn83kh7942v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-amd64.tar.gz"; - sha256 = "0bk514dfyz5ky5zhqklxcakrh6sy8axi2ag6lrw878m424hx5drs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-amd64.tar.gz"; + sha256 = "1pm5j9q4kvv70c6paficcfb664df6666mq559zvdklf5ndjpw5z9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "0aicxgwxs7mp9y88m8am0wl34h6llxj4jzww18alawkvxm1msah8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-amd64.tar.gz"; - sha256 = "1vvqcn832snkqkk0d1rgx6wraxxy2j0nss4zjqyin8wvhrd7ddak"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-amd64.tar.gz"; + sha256 = "0pdwgfbvak564n3ic72jzj6nhy04lra1a4a6z5jmknk59d6jvhjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-amd64.tar.gz"; - sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-amd64.tar.gz"; + sha256 = "19wmv952wn2njbd1ppl1lfzf1f47wf11m4qiiqc3wyd1qc33qsn1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-amd64.tar.gz"; - sha256 = "00fbabsijwz6smm1s76vsjvahq5fp8wmjy1zhwxicmvacswcc5jp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "0ghxpf03h1gg1fc0wpzzdij9dydc9knvjyn9xvjhwr7ar3bvswq5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0caqldzki2s6v0mmcwb570f8jkj0l8s5bn718ml1bfqcsxryiw48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-amd64.tar.gz"; + sha256 = "104yaqp0s06zdw43kkh5k81yprdyc8r6l0sxcvqdv9rmr6q3j076"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,156 +321,156 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.78.1-linux-arm64.tar.gz"; - sha256 = "0nahmxqfbdmcv1mzvmrlhrkdh0721i2l3cgi5zbm2dilgxswxhz9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-linux-arm64.tar.gz"; + sha256 = "075pyjjinc77283cqd81745sdjxlcrdn02nx17jis28w4gp7y88n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.6.0-linux-arm64.tar.gz"; - sha256 = "0h582403nz2i61h8rh0yv98846p3al4kgbdcr26gh8xzkgn7b8xx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; + sha256 = "13sng11gimfx237kdkqg41ly66x6ri64ls2wgw4g9jr8r68z3ii5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.1.0-linux-arm64.tar.gz"; - sha256 = "0y3ii17xqdc04iqs5xc81q9zgswd4ilvh93gvlz3nx5mhhvi7ihp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-arm64.tar.gz"; + sha256 = "0y1i2lwvy0wjvngpjf5rscidrlqb3mhhkhqvj227alz3c4xhf091"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.43.0-linux-arm64.tar.gz"; - sha256 = "0wxr64mv51jr22bb3f224vvnysb1sj3bk1ibxs63bq869aw846vr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-linux-arm64.tar.gz"; + sha256 = "1mncqhlr8ga43pkay8cn0nj9b3kzd8jb65wp02gqsgf8adracrks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.3.0-linux-arm64.tar.gz"; - sha256 = "1iwzysb3wqdcx2r4mqif5nbw2wbqc2cly0cpc624p6k2kcmbxijy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-linux-arm64.tar.gz"; + sha256 = "0x6k6ng49nnh72ca1jcqg1nci8i4qhnw90xwgwi0mxc7dndnx73x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-linux-arm64.tar.gz"; - sha256 = "09rm18fndgdna4b5jj300jk0l6bmapcizpnqdb3gcl02q6nd2jiv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz"; + sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-linux-arm64.tar.gz"; - sha256 = "1rgcsb0gbsr0r7rnyrzim92b54ig4vqzprcc7jcb6j5af4xmj2gs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-linux-arm64.tar.gz"; + sha256 = "0l8kqxk85vskg4jw2m9qvqjp9bdlzbllbhzj4q1fifmcwj5ks649"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.48.1-linux-arm64.tar.gz"; - sha256 = "003zcb2hhmzbf69242rahdqvagzyl2xa0fnrs7wnrmi293avjhvx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-arm64.tar.gz"; + sha256 = "0fkjdd51b3pa224ycf9fi1zdcrf6vcbp9vph1rgqynz9ha7axyiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.40.0-linux-arm64.tar.gz"; - sha256 = "051m5mfvxlz1abpcrps293yc71q2pidybf4fslyzw468pipzjja3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-arm64.tar.gz"; + sha256 = "11gx8zlkakfbwf7vc4j29cd0bfakjf6flgp0a05d8ka5kjq3qkcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.10.0-linux-arm64.tar.gz"; - sha256 = "1q8p1jwrj1hpvicj1fvfpanm71ppf5nq166m5njygm97lz6cl5rg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-linux-arm64.tar.gz"; + sha256 = "0gvvzv2qrdma9qah36giwgxgs7vhq86xjmxrsbja2n6jxzdrfszk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.8.0-linux-arm64.tar.gz"; - sha256 = "0ji6gp4f3295mf06n71hm4dhfjxh4jsz9yf5kzqf5sw2vcidgs3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-linux-arm64.tar.gz"; + sha256 = "0v5665apxp9bg8vj73p8bni7dqqa2cqawx4dda9rfv35a63rd89w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-arm64.tar.gz"; - sha256 = "1wavn4szckiranji27h84i9mpb589h87zmp9sakiqgn7c6cdhqpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-arm64.tar.gz"; + sha256 = "0980s2a1c3pkswf8ai91wb526hyghcbzjnykf5ivam4vy0mlc8k5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-linux-arm64.tar.gz"; - sha256 = "05bq68jf75f4fm7qyl2z8xnjy9pyy3r4h8bak064vpygdjq5bhcy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-arm64.tar.gz"; + sha256 = "1h7yh118iqr0bdkkagf3m0yxnphz5na7vyqqmzs7d9y9kcgfg8gi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.21.0-linux-arm64.tar.gz"; - sha256 = "0z3wcn559h6yg5c2imp3vr1dzcy86y0hx47mrz5bl1zj8fm0qmvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-linux-arm64.tar.gz"; + sha256 = "11q7cnncwdmjp8klk74wrnm6674ap5lrdjfq7413ps8rbdjpyvhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.1-linux-arm64.tar.gz"; - sha256 = "150xh5119kqdpn73ac25m9lba8pk0cirxpc3nafbiqqnsrqgxzsp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-linux-arm64.tar.gz"; + sha256 = "1dxam51n9r2nmkw29fdwl5b0664ll2a1qczva0fgh1wpdslisp8s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.4-linux-arm64.tar.gz"; - sha256 = "065g4zrcs94911vpm455gg89y5g0zgd0lbww489wij9qp7fa5l0z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-arm64.tar.gz"; + sha256 = "11dfjx05inx1fdknzli0q7gma4hc1217jmfn4bx9ky635nqh5ckq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.62.0-linux-arm64.tar.gz"; - sha256 = "0vzah0xq5wgc2fhk8503pqds31x9kkb2lg9spk8w5lw59370326s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0w2zwbz9slbwnk2zaw88y5npiqh2b5klw1j33c5wv1lr75fy2192"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.16.0-linux-arm64.tar.gz"; - sha256 = "1cpc9nf6p83v1r9bksrk381x4ndikhm9iraaq0jq8lw1jpksb8vx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-arm64.tar.gz"; + sha256 = "0gwdlk1m4f91fbqnlv3jb83fi66nay261180nr72bk4hc9757y8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.1-linux-arm64.tar.gz"; - sha256 = "1bs437qynd62xwphyz4ks7vavm8ysa6dhrqwxb4yridhwqkwh8l4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-linux-arm64.tar.gz"; + sha256 = "03j4ka8jdyxzkbsd0bgiqnnz1a8472mb0v3mlfnyvi0c6gs4y7cq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-arm64.tar.gz"; sha256 = "17bykmfj9kxw2c94wjxcfakd10apnc88axr3wx2pa2k5idxd3ih0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.1-linux-arm64.tar.gz"; - sha256 = "1q2j996h0zib4mpxbigrmp5ilzl9qy63wxl5i4hfzyspzq2n39zh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-arm64.tar.gz"; + sha256 = "1z67c7jwfs2z2hi0fqsxzsb426iv82n9sv3ik6smhq2agcxlaas2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-linux-arm64.tar.gz"; - sha256 = "1d034j9v47f03kaya07vidksy67wxfhsl3ilgdmz1wffdkwg43wy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-linux-arm64.tar.gz"; + sha256 = "0b81vgi6n1j3gh8kbf3g3fxlix7iyrn08kkrizmpc7bv5wd0i9ry"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-linux-arm64.tar.gz"; - sha256 = "16z5xb56zi975ad8l3wwz7lnc0f22waif6vnrbmd90jcjfx3gf5a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-linux-arm64.tar.gz"; + sha256 = "1wvl8h7wfkr1d7rff8j0n30xdc9yx1q3ps7zm8b485isx8hhq4f4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; - sha256 = "0073vppvkfqz02jwanycy49ria8in7bpikhkqjz84imrprj9l9ic"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-arm64.tar.gz"; + sha256 = "1f1q34hc6bnqq60llm6gvwmkmvgh24hnxys4hwk79l11ryy5d6cz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; - sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-arm64.tar.gz"; + sha256 = "0zns8xk4y992mp354lkp6ff96d4gifsw9cxkg0jla02lpaz2fiyn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-linux-arm64.tar.gz"; - sha256 = "1y5prgh9nq6jb4db5b7a4dpcilq2c9ivfl1b1z59096gx540yqar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0rpgr4ngw6ja6xlfwak8mvx3zbqhbzg474lm8sl5mx80z66r8zlj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-linux-arm64.tar.gz"; - sha256 = "1rhan3mjvs5kqzaklq42gb04jn1bph0bd64w2cwbaw6c34p7c1kp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-arm64.tar.gz"; + sha256 = "0w353wxg947rp7qf47z45glx8qfrxikmk4r6id5bqk03nx1fs4wd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-linux-arm64.tar.gz"; - sha256 = "0x8mgh057ln80rvwxzdis2qd4knasvm2f3f5cniywnb4zz1xygv2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-linux-arm64.tar.gz"; + sha256 = "18wkr5sfa9v8b9b4c3hdgnq8wd8qpykcyqbcmiypykj8y954hxjk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.31.0-linux-arm64.tar.gz"; - sha256 = "0m2j90zkyk11zls1y25hlnkj7abch0hc55cxdz8l3gv9migkcx63"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-linux-arm64.tar.gz"; + sha256 = "0a8vzhiy7jdxyvfmqd6z9n7iqvpdxc51qcwy212r9vy84mqxjsig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.47.0-linux-arm64.tar.gz"; - sha256 = "1dsakh7093zavhayxqyki4dgprk918q6jwx47c9bypsicm5xjc9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-linux-arm64.tar.gz"; + sha256 = "1nv5vd4cv8bfvihv2m316pw39yip7i61xx29lxvyvi5pib2yl0h2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.17.0-linux-arm64.tar.gz"; - sha256 = "00mlkp2g4n94cnlqpfqcqkpi3zpnkb29md01dp93dk940cc4aj0b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-arm64.tar.gz"; + sha256 = "1kqv70w3d84a9a0kj0w2hmd88h50zlfc35xkf57kgd43l948wcin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-linux-arm64.tar.gz"; - sha256 = "01aq3n70sl7s7w98cgbfjkq5xg0jny5pm0cj021cqkrzli4j0biy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-linux-arm64.tar.gz"; + sha256 = "1rlf5gl7a7ym8zl4h0v7i42a9830zi401axw032h0v4q6w4zki3n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-arm64.tar.gz"; - sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-arm64.tar.gz"; + sha256 = "1zizrk7chxjda8lpkgrvs40f3il2z7xl79fcslq129adhqj2af3k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-linux-arm64.tar.gz"; - sha256 = "15a93vb3b3nlk7fyl9qh2jayhv48fk0hja07nvjkz23xfl3zpxdr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-arm64.tar.gz"; + sha256 = "1g5k564z33dr09yqzk5a2g2wblszrbh8hc6gp1a8g0vynq7a9f6r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-arm64.tar.gz"; - sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-arm64.tar.gz"; + sha256 = "0gx4n9palj6yana77hs3aiv96ck4vzvnqblb1h7h9z1jfmdl7m01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-linux-arm64.tar.gz"; - sha256 = "1xsmlza394wc38pyi4zzhfn7mvn4znvv00k9dxm8w3bxnym5gpbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-linux-arm64.tar.gz"; + sha256 = "1qj7640s3kqiz3x30k7dvd4v2anzqm1mb9qf045igmmf2bm6q5fm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.0-linux-arm64.tar.gz"; - sha256 = "1f2hxw5l6v7w9szck4p8dikc68mfdkzcpyz8k9iiaqns8pb258h3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-arm64.tar.gz"; + sha256 = "1ih335b7pdjxqvyabhlf9dxabri5w1kjf2x4c310rjglzvyvavr2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,156 +479,156 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.78.1-darwin-arm64.tar.gz"; - sha256 = "0z8v0v4qxcn0ppz6ifxdwikz3ibrvr42ssbkf3v0g9b2spmb4jq1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-darwin-arm64.tar.gz"; + sha256 = "05yyw5pjbmzgqimcd72xidwzqsvvkj7ayafwy701smmxdpck31b0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.6.0-darwin-arm64.tar.gz"; - sha256 = "1iwax27sz03aa3srjiby7nvn17k2vkb07ahqqsyj930bdy7851zl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; + sha256 = "125l81hghfkj4k4ygspv6fmifrqpn0r14c8pr85fkkninsp71jip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.1.0-darwin-arm64.tar.gz"; - sha256 = "0bh4c28ww1rz1zi23m0bf4y4anii3w2bdwjlmbyqf54jnqgb1pwd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-arm64.tar.gz"; + sha256 = "1lz73k8v5iixivydvfrwr239sw6i5qx4h7qkd0l3hvbih3v97v6a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.43.0-darwin-arm64.tar.gz"; - sha256 = "0j8gd0ng1ncaiwydsgcabdcmc823kfciii0qn5c0rvpc5d1l94y0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-darwin-arm64.tar.gz"; + sha256 = "1prm3b7w0i751rpvwglfkm2wkq24318k2ra8z6rkjsdkcvxa1i5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v4.3.0-darwin-arm64.tar.gz"; - sha256 = "0096hg8k7z0pppcm6ifjq50cjpgahx15v2i1l64ykg6d4z5sqqh3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.2-darwin-arm64.tar.gz"; + sha256 = "10blif15dymdbdr40lazaiq8sncfp0gd9phahzcr2m9fh6rx4lpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.23.0-darwin-arm64.tar.gz"; - sha256 = "0260gpq212dj3c782bdx4fn2c9vk1kv0j42sq037k4ih430wqxwv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz"; + sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.42.0-darwin-arm64.tar.gz"; - sha256 = "06cm6va9bbkcm1sznlkjc95b1n20bsf3yvw1pysh3pwbs1qwd8v3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.8.0-darwin-arm64.tar.gz"; + sha256 = "05ifn20vn66k6sy69l3z1nmnjajfjazlq12cm1vz4apxa8yqxqn4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.48.1-darwin-arm64.tar.gz"; - sha256 = "1xkyvd09y7dbf9928cyzgj37vdfbz4knagi3rbg7gd757xmvqxc7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-arm64.tar.gz"; + sha256 = "1v9xk41876gcsgggr3igjj8n8ff3zd5fvqbp81s7g180z1pgsrkk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.40.0-darwin-arm64.tar.gz"; - sha256 = "06jg96pamb3bvs286nna66a8a2chnnz5vzb00lm1m2rrga5a50hb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-arm64.tar.gz"; + sha256 = "0asaq5gg22jgq5x2bn89m9qn3jm7cmdhkypdl5barkmccvsbpfg0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.10.0-darwin-arm64.tar.gz"; - sha256 = "15vd5mdb76awcxa1s5qw11mbhdy2dpfi5idi2gqsyhr6cqw0360v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.55.0-darwin-arm64.tar.gz"; + sha256 = "1vnh7d4n7sd5bfms9vxgr87k9r1ahchmmfng0wml60jvssjbgiyf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.8.0-darwin-arm64.tar.gz"; - sha256 = "04mk5c1dsn8k7r23vb0dlgg33vnjjgx5xyymsfmar7z8a2w5mjyd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.14.0-darwin-arm64.tar.gz"; + sha256 = "1q5474wibhb0y600mcbw1wa59dadcjj2l6p7ihrv6yvdals39408"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "0m5ikqssgj33is9lxplx8ljlmklh7p173gwfvld8izs37pb1xdyw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-arm64.tar.gz"; + sha256 = "0q4150r8c31c2bxa7hkc820bhrihxwxkjgrmn5wzgjpjbq3aw5ja"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "1f8f2ncbdfxb6spgpzwfypj9vw9r3hcjwdgwg26n6zsfsd5jzfzx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-arm64.tar.gz"; + sha256 = "066w46l9dv02pnq59h632w1f7sjj8qqh6867cb33bbh6if681fpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "1bibn0248jvvd0hkz8msn3qr167i78igdq7z9mm01n54pz8pykxl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.23.0-darwin-arm64.tar.gz"; + sha256 = "1glpfbinny7cm7bk3q5y7g7lyrzmhdlsfjyiaxqwpkwx2960p5iv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.3.1-darwin-arm64.tar.gz"; - sha256 = "1ld4fqixh10d78lmgl6a7p8ji8y8w9dq8g7dd2ks2cxvf4y2hswy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-darwin-arm64.tar.gz"; + sha256 = "0kcivc4bs720s7cdjphjcy1sss7pfsands37c8gikhiq0cnl39mb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.1.4-darwin-arm64.tar.gz"; - sha256 = "0dha6lzil64d5hxbd9ay7gr4xhg25pgvy3q6d24abdpdsiq431j8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-arm64.tar.gz"; + sha256 = "16m568zmhfh9y0ynjs789yiawn22r23i1zz9xsrq1kfx8raq94an"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.62.0-darwin-arm64.tar.gz"; - sha256 = "132vxlm3l8ir5v72b17j60kqx236vcbjp0bfi62w285h78182kvs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "1g2qds6iciclawr343ps693ndnwjnss8pxfb5mxc69gf7qz8j03i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.16.0-darwin-arm64.tar.gz"; - sha256 = "08wnj6yn7rfv5mzwi3hkc622qb1kiz3lpmiy0lj4rrpncf6yldgj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-arm64.tar.gz"; + sha256 = "04svj7zrhwfy5hjccy2dn4a5il793fncj0b83bvkrvh4qcs8c8as"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.2.1-darwin-arm64.tar.gz"; - sha256 = "1i95shv7h73wd1zm8mn3lqpq1sg59cj6d6ha3igprk62wb476407"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "15vh197lvrbb5x08xxkdsgmjaqq9qvvcm4ncj5xjrm4jaczbpd2a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-arm64.tar.gz"; sha256 = "0wcxrcpijn6jzz0l5azfqvh31xzg5q5bvk39iifczimdvw37xnva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.14.1-darwin-arm64.tar.gz"; - sha256 = "1ylkjnrkz343anffssls9qwqp17zwfg5z507bnpblqidavnmzq9d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-arm64.tar.gz"; + sha256 = "0i0lhxzvxvgi695x9g1nnqrzlipsydjsc3xz8zd7n9438pav3cmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.0.3-darwin-arm64.tar.gz"; - sha256 = "12nx3cn38j9agaw4qqp44f5w16954zhlxj3cjn3kna9phc7lza6a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.4-darwin-arm64.tar.gz"; + sha256 = "10phh7s0d83z4n9plh77wqjjr8h5h3zmsjdxk7fj7d72p2awf111"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.4.2-darwin-arm64.tar.gz"; - sha256 = "1dcwi9lnbx7ikj58fzznvz8c7lwnbfcdhw0mlnbldxkxfzba32sp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.5-darwin-arm64.tar.gz"; + sha256 = "08aigahkv3calhcdyws3pm1nac5mdxk81jbys8qxr3c9x3b8wgqz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; - sha256 = "0z0ands2dp6jjy9rbb9rmijlp56m4mrw79f8513kj6nqp1dyalr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-arm64.tar.gz"; + sha256 = "0nx02c9fkfrdmgf9jmlhb0h4whqgx8bw4snhz4m9chxygknyg2s2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "0zpj3qcavx9hby54lbx81sh6fw7gsfjb94jh7xi49n937gra3snc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-darwin-arm64.tar.gz"; - sha256 = "1xl3i1py3m2fr4haww7jzyj064hcdrb86amnhrjs5ccps02r6gk3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "0vq8xvx55avph8fr1jykmilivxpmc8zvckmsia1ammqg867ivrlj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "1cjrj1vl9ljx32j7zss74kqg367zcz6nmisz0am5i040kiqgb7na"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-arm64.tar.gz"; + sha256 = "1bb9a3ppiyd4jrna2z7zdngvlps870r3zhr54b1xzbap1vhdbjhd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.13.2-darwin-arm64.tar.gz"; - sha256 = "1w7g9gc01fpsa41csp5sv6q2w9g4i7gn5b1lnm0dal16169dkpy6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-darwin-arm64.tar.gz"; + sha256 = "08llqzf509ds0nbcllpq5k3zl6l656yxx0bx0z9pibd9iwzjy3wj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.31.0-darwin-arm64.tar.gz"; - sha256 = "0qsj3xmlx3xfk0rfzxyngi8lkbnq2rmw7j33ym3aqcr0k4ji9phf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-darwin-arm64.tar.gz"; + sha256 = "1vk4kdxxx2rk3rhqwgw97xyfl53kxzc209xx8wh1fd3wd676rc2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.47.0-darwin-arm64.tar.gz"; - sha256 = "1p3im8q89gih6j16rv5kf2zb76dlpfcxwgxpqdfh88z9nfpnz5v5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-darwin-arm64.tar.gz"; + sha256 = "1gf4p1x0mxv2zjz266inkz468p125wn68ls08az7naf4qmh4j50w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.17.0-darwin-arm64.tar.gz"; - sha256 = "05c8zdv7f0nlkm3w5z1iavj6i7vp6q4dpi6y3c2wzj63swkxcmqd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-arm64.tar.gz"; + sha256 = "17ngmwyh6z1g6x3lrd77pxa9wwwarh4mqdcq7aiwf57plx4a4l6j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.2-darwin-arm64.tar.gz"; - sha256 = "1baq38wv66ddxxc6m2s7djc6q6lpcg7p0783a22lwchjj18i1g0n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.2-darwin-arm64.tar.gz"; + sha256 = "09agrp3sb7mzhwaja4rvz0p25rpsb2n4v3s2kyzcx3pyfyhigvfn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-arm64.tar.gz"; - sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "0sfbb1m874p04n2qg5w9502r1s2gxdd3lbn9k6xqzdcqi0991vrw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.13.0-darwin-arm64.tar.gz"; - sha256 = "0l5rzcdx9v6h4qb8pk631cb68c2m3rcpia1aq64psb91g8lhrwa3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-arm64.tar.gz"; + sha256 = "0wcahzjwlbzbv94yv10wmvsppjcvax0d57qk4xpfrdig6lj50mms"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-arm64.tar.gz"; - sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-arm64.tar.gz"; + sha256 = "0xlxx5i1ph57vn5q00hv8s0d5vj5jy3hrrkm7qvmjf47d7flqqv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.5.1-darwin-arm64.tar.gz"; - sha256 = "1r25pimq5r8f2r68prb14wk0ppb6ikf9z61lj6x8h5ym1advgirk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0nqyk1jn1d1s5s5kdzfzpqzz44gy6rif0l781jk10fq9lw7bvwld"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.0-darwin-arm64.tar.gz"; - sha256 = "1g82gvaqp1w9hr7ihbip1n7zbb7nh9ifwn4p6wk7y23fn8qh0m66"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-arm64.tar.gz"; + sha256 = "14plg6hinzcn1mnmfzpnl8b63j7zj7bkvy4fil1c3iscqj803ci6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 5dcd156d55..76a5eff297 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,15 +4,30 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "1.92.0"; + version = "2.13.0"; rev = "v${version}"; - hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA="; - vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8="; + hash = "sha256-YyJxACeXyY7hZkTbLXT/ASNWa1uv9h3cvPoItR183fU="; + vendorHash = "sha256-20wHbNE/fenxP9wgTSzAnx6b1UYlw4i1fi6SesTs0sc="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ - "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + "-X github.com/pulumi/${repo}/v2/provider/pkg/version.Version=${version}" ]; + postConfigure = '' + pushd .. + + chmod +w . provider/cmd/${cmdRes} sdk/ + chmod -R +w reports/ versions/ + mkdir bin + ${cmdGen} schema ${version} + + cp bin/schema-full.json provider/cmd/${cmdRes} + cp bin/metadata-compact.json provider/cmd/${cmdRes} + + popd + + VERSION=v${version} go generate cmd/${cmdRes}/main.go + ''; fetchSubmodules = true; __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index 7ef597201b..ef43a41248 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix @@ -8,7 +8,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-6/umLzw7HMplP/cJknBsWmiwAnc+YM4tIz4Zl2QMTOQ="; + vendorHash = "sha256-6JnRPns+qOLXP2RBjsgq4v6nuLn3uX8jF4+uinr2Wt8"; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index 02bb86d0e8..dc1368afe2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -9,7 +9,14 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-3kDWb+1aebV2D+Nm5bkhKrJZMe/lD0ltFQ7p+Bfk644="; + vendorHash = "sha256-gbZoDUJCKb5wcLhJ7DRSGHT3Q0xUlptUeS6Wen4dle0"; + + postPatch = '' + # Gives github.com/pulumi/pulumi/pkg/v3: is replaced in go.mod, but not marked as replaced in vendor/modules.txt etc + substituteInPlace language_test.go \ + --replace "TestLanguage" \ + "SkipTestLanguage" + ''; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index e63e311fab..16610c2f46 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -1,32 +1,22 @@ -{ lib -, buildGoModule +{ buildGoModule , pulumi , python3 }: buildGoModule rec { - inherit (pulumi) version src sdkVendorHash; + inherit (pulumi) version src; pname = "pulumi-language-python"; - sourceRoot = "${src.name}/sdk"; + sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = sdkVendorHash; + vendorHash = "sha256-aLCgAcrgnNH/eYpGkr5Kj4xWjSgP76nz0YoV6998i9M="; postPatch = '' - # Requires network - substituteInPlace python/python_test.go \ - --replace "TestRunningPipInVirtualEnvironment" \ - "SkipTestRunningPipInVirtualEnvironment" - - substituteInPlace python/cmd/pulumi-language-python/main_test.go \ + substituteInPlace main_test.go \ --replace "TestDeterminePulumiPackages" \ "SkipTestDeterminePulumiPackages" ''; - subPackages = [ - "python/cmd/pulumi-language-python" - ]; - ldflags = [ "-s" "-w" @@ -38,8 +28,8 @@ buildGoModule rec { ]; postInstall = '' - cp python/cmd/pulumi-language-python-exec $out/bin - cp python/dist/pulumi-resource-pulumi-python $out/bin - cp python/dist/pulumi-analyzer-policy-python $out/bin + cp ../pulumi-language-python-exec $out/bin + cp ../../dist/pulumi-resource-pulumi-python $out/bin + cp ../../dist/pulumi-analyzer-policy-python $out/bin ''; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix index 4248ae73dd..af704eac19 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-random"; - version = "4.8.2"; + version = "4.14.0"; rev = "v${version}"; - hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY="; - vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs="; + hash = "sha256-1MR7zWNBDbAUoRed7IU80PQxeH18x95MKJKejW5m2Rs="; + vendorHash = "sha256-YDuF89F9+pxVq4TNe5l3JlbcqpnJwSTPAP4TwWTriWA="; cmdGen = "pulumi-tfgen-random"; cmdRes = "pulumi-resource-random"; extraLdflags = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 7f724d8b4c..3aa9e58985 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.72.2"; + version = "3.90.1"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; + sdkVendorHash = lib.fakeHash; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-g/8l/ebtb1Gs6TKtg0joe55TyWj1/SAiA4Ds1NHKLFI="; + hash = "sha256-dAQpQapkdccRr/O8XT8dHrLwPvIPqeV8f3HS+GtK2GM="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-eOxlTsvC/B+YTFlmT7MtiBBSJIntI4vogdiZ1gOkehw="; + vendorHash = "sha256-ijFYlHVH0axDpFoPGvthGVRt8UIUZDsWv3vAOe0U4H4"; sourceRoot = "${src.name}/pkg"; @@ -51,6 +51,25 @@ buildGoModule rec { disabledTests = [ # Flaky test "TestPendingDeleteOrder" + # Tries to clone repo: github.com/pulumi/templates.git + "TestGenerateOnlyProjectCheck" + # Following tests give this error, not quite sure why: + # Error Trace: /build/pulumi/pkg/engine/lifecycletest/update_plan_test.go:273 + # Error: Received unexpected error: + # Unexpected diag message: <{%reset%}>using pulumi-resource-pkgA from $PATH at /build/tmp.bS8caxmTx7/pulumi-resource-pkgA<{%reset%}> + # Test: TestUnplannedDelete + "TestExpectedDelete" + "TestPlannedInputOutputDifferences" + "TestPlannedUpdateChangedStack" + "TestExpectedCreate" + "TestUnplannedDelete" + # Following test gives this error, not sure why: + # --- Expected + # +++ Actual + # @@ -1 +1 @@ + # -gcp + # +aws + "TestPluginMapper_MappedNamesDifferFromPulumiName" ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 75c0e81b49..0c87e74dba 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,18 +8,20 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.72.0"; + version = "0.74.3"; src = fetchFromGitHub { owner = "Qovery"; - repo = pname; + repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-mb1GLhrU+/g0zX2CNkwlJKuLAVDxLWuU9EoYyxXQEWA="; + hash = "sha256-2FgNH8EVIi4ifkURp2Znh8cPpgsW3m9rJGa7bJr86ZI="; }; - vendorHash = "sha256-OexoLqlPBr1JSL63lP172YaGJ0GLlxxsJYdXIGhNqjs="; + vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; postInstall = '' installShellCompletion --cmd ${pname} \ diff --git a/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix b/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix index e164e133f9..32e401ecc4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix @@ -44,5 +44,10 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ ]; + # 2023-08-19, fails to compile with glibc-2.38 because of strlcpy. + # At the time of writing, this was 4 minors behind already and + # the `paths.patch` didn't apply anymore, so this is now considered + # broken until somebody cares enough to fix and upgrade this. + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index aa654d522a..e88f9aee40 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -11,12 +11,12 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3006.3"; + version = "3006.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-flP7zETEn41uZ8sZytoGOADKKe1/Fa+XJSdTGqhW5Cs="; + hash = "sha256-0JeIXDPCz6oMzcYnylcNZ2kMjQN9x4Ab6IeIvMoQNq4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index d92e1e79b3..38fd3fc1e1 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.21.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-VZ3yCgO110t920T0vWP3IwdphlsZrWbJj5nXX70mtJ4="; + sha256 = "sha256-Q65X2lsR5jyWXxxmkvUA0yG4miD+KUSBGRFXvH4KBGY="; }; - vendorHash = "sha256-MVBxtd+MZ6aS/fJn/+/a2jjh1rKjeT5BiHF2mzg95C8="; + vendorHash = "sha256-mZ2XFZS5tqtRUhdo6AOCY4xSaYgxUEy1OFbyzsbCEnU="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix index 125d203514..3450019afa 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-8KhFF/bD//NYRQ7v+ksGAE6bKVu+nE3o3R119XbHVDA="; + hash = "sha256-vuYkUFh9C+D6Sbu/vbEFV57FDVQVSCkvOxdLeDVbe18="; }; - vendorHash = "sha256-xoxSQ9V9i7yxJzn8wAtIAtWlTn4q/UnNqMT93RyBHII="; + vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; ldflags = [ "-s" "-w" 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 45fdbff603..3fc6a6dba7 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.17.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-MzzjrGtqbtZMvfL7dPAsKHF2ZTneSdtDuwHQQcyrQDw="; + hash = "sha256-1AdR0PHAhrMbeCD5zNsU9JoXInQD+qUIYfveBD60wR0="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index 3f6567b09f..ae3de22026 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.92.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-YmzizpcAfE4+Rfq5ydQnDQBo4R+pAyudfi+fqD9EZP0="; + hash = "sha256-jvX7gUQX6yhk9pV2Rh66Gy6XUQN/XY5jxUYs5RfEL7s="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-siOZWhHqNokkYAPwuXQCs4T1yBiEWUTJzhfbH/Z2uBk="; + vendorHash = "sha256-79m0KQ8sLodWY2LMKNdZxKZbiBBOAv6f8eLOKhrCSdU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix index cab4f195dc..bc9b0568cf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-kWdayQRV/VHgvBhGLc67qTXFz6Ufec6h+1ihrIdkCs4="; + sha256 = "sha256-dKVbiqLhcN8QALOyvTIlgsODWOQv6zRBXrRVB6KxpJg="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/triton/default.nix b/third_party/nixpkgs/pkgs/tools/admin/triton/default.nix index d5841e9245..fa08d4e4bf 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/triton/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/triton/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "triton"; - version = "7.15.4"; + version = "7.16.0"; src = fetchFromGitHub { owner = "TritonDataCenter"; repo = "node-triton"; rev = version; - hash = "sha256-RjYJT8Iw9JZzvd2d9zh2CS27qUx12nDi12k+YuTh7tk="; + hash = "sha256-JjQAf1pbNraatWvrfys3ydqk3FPOoJ5XWJH/4qgfINk="; }; - npmDepsHash = "sha256-2ZTTgJ4LzmlfFoNNNPrrmna5pbREshdw5x9w5N7nasc="; + npmDepsHash = "sha256-E5yJwLSNLkK3OfwJrm59C4qfrd2y3nw/45B68MVBqV8="; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 2f6b78bde4..6a0d93483b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -7,19 +7,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.45.1"; + version = "0.47.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sifQHzysuA92wYi1quCPx/ZGLKO4iQLgNe++DNDV8f4="; + hash = "sha256-Ahy6wiBoOwS3MIrAIg2gIk2gkmphkCJUYAUtqVydA2Q="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-eQeyMZvOmYb+4K72wrO/vRf+XTkOP2z+7bmwFMVBxO0="; + vendorHash = "sha256-qG4z52oVa3sgu8QKX8UbHsk/aSfacgZShX298WUu2oU="; subPackages = [ "cmd/trivy" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/try/default.nix b/third_party/nixpkgs/pkgs/tools/admin/try/default.nix index 4ab78210af..697a192d15 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/try/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/try/default.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; meta = with lib;{ - homepage = "https://github/binpash/try"; + homepage = "https://github.com/binpash/try"; description = "Lets you run a command and inspect its effects before changing your live system"; maintainers = with maintainers; [ pasqui23 ]; license = with licenses; [ mit ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix index f1fd58877d..ae04437487 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIMHCal4jt8tMEfx2Lol2/7IK8uROaNC1ABB+0d0YTg="; + sha256 = "sha256-zAvPtTUrSHeIMy9MgJviyMvMJ0Ny5Nkx6oLwWPSc9bE="; }; vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix index 6c9b929049..f4a39b2cbb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix @@ -10,15 +10,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.38"; + version = "3.40"; name = "${pname}-${version}"; executable = fetchurl (if (wine.meta.mainProgram == "wine64") then { url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe"; - sha256 = "RV+j8FQigpwPprR2xuMYpDRMDwugSZD+O2ZmyPZDz54="; + sha256 = "1dxny1qmq4pmdn40j9zk461p3qwwjin5d18ajhczrnqrcr2v1xwi"; } else { url = "https://download.mikrotik.com/winbox/${version}/winbox.exe"; - sha256 = "dh3P+otukhnEpVTqTu16MgIHVnJbzp4Voj+wZ3r5Fxg="; + sha256 = "11vmdkwi38y7wkdkgsqpfs4l2bdaj9yg6c8wlgfzp91227gjn5li"; }); # This is from the winbox AUR package: diff --git a/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/payload-dumper-go/default.nix old mode 100755 new mode 100644 diff --git a/third_party/nixpkgs/pkgs/tools/archivers/peazip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/peazip/default.nix index 3dd74e1e72..b00f7b9d66 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/peazip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/peazip/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.9.0"; + version = "9.4.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-1UavigwVp/Gna2BOUECQrn/VQjov8wDw5EdPWX3mpvM="; + hash = "sha256-to5VhuTomw33WRWrtSIMF/SD+KVXsUKmSrJ84BNatqw="; }; sourceRoot = "${src.name}/peazip-sources"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/tarlz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/tarlz/default.nix index 7f41a05a9a..250b0e05c6 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/tarlz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/tarlz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tarlz"; - version = "0.22"; + version = "0.24"; outputs = [ "out" "man" "info" ]; nativeBuildInputs = [ lzip texinfo ]; @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; - sha256 = "sha256-/M9yJvoktV0ybKsT926jSb7ERsWo33GkbTQwmaBQkdw="; + sha256 = "49838effe95acb29d548b7ef2ddbb4b63face40536df0d9a80a62900c7170576"; }; enableParallelBuilding = true; makeFlags = [ "CXX:=$(CXX)" ]; - doCheck = !stdenv.isDarwin; + + doCheck = false; # system clock issues meta = with lib; { homepage = "https://www.nongnu.org/lzip/${pname}.html"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix index ee1693ee18..07aa89fa5c 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -50,15 +50,17 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ gnustep.make ] ++ lib.optionals stdenv.isDarwin [ xcbuildHook ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + # xcbuild links with clang instead of clang++. + env = lib.optionalAttrs stdenv.isDarwin { + LD_FLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + xcbuildFlags = lib.optionals stdenv.isDarwin [ "-target unar" "-target lsar" "-configuration Release" - "MACOSX_DEPLOYMENT_TARGET=10.12" - # Fix "ld: file not found: /nix/store/*-clang-7.1.0/lib/arc/libarclite_macosx." error - # Disabling ARC may leak memory, however since this program is generally not used for - # long periods of time, it shouldn't be an issue - "CLANG_LINK_OBJC_RUNTIME=NO" + "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 53b4a4bfa9..9350a6fd1e 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "6.2.11"; + version = "6.2.12"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-HFglLjn4UE8dalp2ZIFlqqaE9FahahFrDNsPrKUIQPI="; + hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A="; }; sourceRoot = finalAttrs.src.name; @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; + mainProgram = "unrar"; maintainers = with maintainers; [ ehmry wegank ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix index 440606bdd8..37faff29c7 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix @@ -26,6 +26,8 @@ , extraPatches ? [ ] , pluginOverrides ? { } , disableAllPlugins ? false +, disabledTests ? [] +, extraNativeBuildInputs ? [] # tests , runCommand @@ -52,12 +54,6 @@ python3Packages.buildPythonApplication { patches = extraPatches; - postPatch = '' - # https://github.com/beetbox/beets/pull/4868 - substituteInPlace beets/util/artresizer.py \ - --replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS" - ''; - propagatedBuildInputs = with python3Packages; [ confuse gst-python @@ -76,7 +72,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ gobject-introspection sphinxHook - ]; + ] ++ extraNativeBuildInputs; buildInputs = [ ] ++ (with gst_all_1; [ @@ -93,24 +89,6 @@ python3Packages.buildPythonApplication { cp extra/_beet $out/share/zsh/site-functions/ ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - tmphome="$(mktemp -d)" - - EDITOR="${writeScript "beetconfig.sh" '' - #!${runtimeShell} - cat > "$1" < "$1" < $out/config.yaml + cat << EOF > $out/config.yaml replaygain: backend: gstreamer EOF - echo $out/config.yaml - ${beets}/bin/beet -c $out/config.yaml > /dev/null + ${beets}/bin/beet -c $out/config.yaml > /dev/null ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index 7f5c3bbcea..c78ccced9a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , fetchpatch +, python3Packages }: /* ** To customize the enabled beets plugins, use the pluginOverrides input to the @@ -20,6 +21,7 @@ lib.makeExtensible (self: { beets = self.beets-stable; beets-stable = callPackage ./common.nix rec { + inherit python3Packages; version = "1.6.0"; src = fetchFromGitHub { owner = "beetbox"; @@ -41,27 +43,46 @@ lib.makeExtensible (self: { # https://github.com/beetbox/beets/pull/4839 # The upstream patch does not apply on 1.6.0, as the related code has been refactored since ./patches/fix-embedart-imagick-7.1.1-12.patch + # Pillow 10 compatibility fix, a backport of + # https://github.com/beetbox/beets/pull/4868, which doesn't apply now + ./patches/fix-pillow10-compat.patch + ]; + disabledTests = [ + # This issue is present on this version alone, and can be removed on the + # next stable version version bump. Since this is fixed in branch master, + # we don't have a bug ticket open for this. As of writing, it also seems + # hard to find a patch that can be backported to v1.6.0 that would fix + # the failure, as the master branch has gone through too many changes + # now. + "test_get_single_item_by_path" ]; }; beets-minimal = self.beets.override { disableAllPlugins = true; }; beets-unstable = callPackage ./common.nix { - version = "unstable-2023-07-05"; + inherit python3Packages; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "9481402b3c20739ca0b879d19adbfca22ccd6a44"; - hash = "sha256-AKmozMNVchysoQcUWd90Ic6bQBKQgylVn0E3i85dGb8="; + rev = "6655760732100f5387fad2d2890c015ee5039981"; + hash = "sha256-Nz9BHtacYpJMLmB3f9WFg6GvMa+BuUhiNbJ9cyannek="; }; extraPatches = [ # Bash completion fix for Nix ./patches/unstable-bash-completion-always-print.patch ]; pluginOverrides = { - # unstable has a new plugin, so we register it here. + # unstable has new plugins, so we register them here. limit = { builtin = true; }; + substitute = { builtin = true; }; + advancedrewrite = { builtin = true; }; + autobpm = { builtin = true; }; }; + extraNativeBuildInputs = [ + python3Packages.pydata-sphinx-theme + ]; }; alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch b/third_party/nixpkgs/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch new file mode 100644 index 0000000000..f85eec2015 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch @@ -0,0 +1,13 @@ +diff --git i/beets/util/artresizer.py w/beets/util/artresizer.py +index 8683e228..6f99c79e 100644 +--- i/beets/util/artresizer.py ++++ w/beets/util/artresizer.py +@@ -72,7 +72,7 @@ def pil_resize(maxwidth, path_in, path_out=None, quality=0, max_filesize=0): + try: + im = Image.open(util.syspath(path_in)) + size = maxwidth, maxwidth +- im.thumbnail(size, Image.ANTIALIAS) ++ im.thumbnail(size, Image.Resampling.LANCZOS) + + if quality == 0: + # Use PIL's default quality. diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch b/third_party/nixpkgs/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch index 395f40f92c..96b1751175 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch @@ -1,34 +1,36 @@ -diff --git a/beets/ui/commands.py b/beets/ui/commands.py -index 1377ad0c..e178eeae 100755 ---- a/beets/ui/commands.py -+++ b/beets/ui/commands.py -@@ -1831,20 +1831,6 @@ default_commands.append(config_cmd) +diff --git i/beets/ui/commands.py w/beets/ui/commands.py +index ad4f7821..5077191d 100755 +--- i/beets/ui/commands.py ++++ w/beets/ui/commands.py +@@ -2381,22 +2381,6 @@ default_commands.append(config_cmd) def print_completion(*args): for line in completion_script(default_commands + plugins.commands()): - print_(line, end='') + print_(line, end="") - if not any(os.path.isfile(syspath(p)) for p in BASH_COMPLETION_PATHS): -- log.warning('Warning: Unable to find the bash-completion package. ' -- 'Command line completion might not work.') +- log.warning( +- "Warning: Unable to find the bash-completion package. " +- "Command line completion might not work." +- ) - - -BASH_COMPLETION_PATHS = [ -- b'/etc/bash_completion', -- b'/usr/share/bash-completion/bash_completion', -- b'/usr/local/share/bash-completion/bash_completion', +- b"/etc/bash_completion", +- b"/usr/share/bash-completion/bash_completion", +- b"/usr/local/share/bash-completion/bash_completion", - # SmartOS -- b'/opt/local/share/bash-completion/bash_completion', +- b"/opt/local/share/bash-completion/bash_completion", - # Homebrew (before bash-completion2) -- b'/usr/local/etc/bash_completion', +- b"/usr/local/etc/bash_completion", -] def completion_script(commands): -diff --git a/test/test_ui.py b/test/test_ui.py -index f66917dc..f3d934c6 100644 ---- a/test/test_ui.py -+++ b/test/test_ui.py -@@ -1310,12 +1310,7 @@ class CompletionTest(_common.TestCase, TestHelper): - stdout=subprocess.PIPE, env=env) +diff --git i/test/test_ui.py w/test/test_ui.py +index cae86148..faf266a8 100644 +--- i/test/test_ui.py ++++ w/test/test_ui.py +@@ -1434,12 +1434,7 @@ class CompletionTest(_common.TestCase, TestHelper): + ) # Load bash_completion library. - for path in commands.BASH_COMPLETION_PATHS: @@ -36,8 +38,8 @@ index f66917dc..f3d934c6 100644 - bash_completion = path - break - else: -- self.skipTest('bash-completion script not found') -+ self.skipTest('bash-completion script not found') +- self.skipTest("bash-completion script not found") ++ self.skipTest("bash-completion script not found") try: - with open(util.syspath(bash_completion), 'rb') as f: + with open(util.syspath(bash_completion), "rb") as f: tester.stdin.writelines(f) diff --git a/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix b/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix index 58814cb442..6a2de8379e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "goxlr-utility"; - version = "0.12.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "GoXLR-on-Linux"; repo = "goxlr-utility"; rev = "v${version}"; - hash = "sha256-vvaKCsqncRhag8IrS0AIfNqNHGU2WIvFaYISEVfUB2Y="; + hash = "sha256-QKL2iKfn05P20MwT+RAeVzUUyv6FWtxMWuBI+4MgXlQ="; }; - cargoHash = "sha256-Z57H5YeVYqlOaLRLaizVw8xTLstdjyXutnN7OgaUYOE="; + cargoHash = "sha256-LVObMspxhZkK81BjolTZZwoeMunzVwdEWWJAt/aOjZA="; buildInputs = [ libpulseaudio diff --git a/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix b/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix index 99434f9ca7..68a799a55c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Sapd/HeadsetControl"; license = licenses.gpl3Plus; + mainProgram = "headsetcontrol"; maintainers = with maintainers; [ leixb ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix index 7ea5cf622b..c9dc204ad4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "unstable-2023-05-02"; + version = "unstable-2023-10-13"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "71f38e62cad01c3078555bfe78d0f3a527422d75"; - sha256 = "sha256-2xm0F80cjovy/G9Ytq/iwa1eexZk0mromv6PPuNIT8U="; + rev = "1b07b595b0bfd261c87f4efecd022481ed4a196f"; + sha256 = "sha256-S4UD/J28McnJjFu5FH3ElwzXapceUUezfBCgI91eIi0="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index 5e196a5b55..22925dce99 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -1,35 +1,68 @@ -{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config +{ lib, stdenv, makeWrapper, fetchFromGitHub, which, pkg-config , libjpeg , ocamlPackages -, awscli2, curl, ffmpeg, youtube-dl -, runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ] +, awscli2, bubblewrap, curl, ffmpeg, yt-dlp +, runtimePackages ? [ awscli2 bubblewrap curl ffmpeg yt-dlp ] }: let pname = "liquidsoap"; - version = "2.1.4"; + version = "2.2.2"; in stdenv.mkDerivation { inherit pname version; - src = fetchurl { - url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GQuG7f9U+/HqPcuj6hnBoH5mWEhxSwWgBnkCuLqHTAc="; + src = fetchFromGitHub { + owner = "savonet"; + repo = "liquidsoap"; + rev = "refs/tags/v${version}"; + hash = "sha256-t7rkWHSAd3DaTCXaGfL9NcIQYT+f4Od9D6huuZlwhWk="; }; - postFixup = '' + postPatch = '' + substituteInPlace src/lang/dune \ + --replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + dune build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dune install --prefix "$out" + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + wrapProgram $out/bin/liquidsoap \ --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \ --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; + runHook postFixup + ''; strictDeps = true; - nativeBuildInputs = - [ makeWrapper pkg-config which - ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir - ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + which + ocamlPackages.ocaml + ocamlPackages.dune_3 + ocamlPackages.findlib + ocamlPackages.menhir + ]; buildInputs = [ libjpeg @@ -38,29 +71,36 @@ stdenv.mkDerivation { ocamlPackages.dtools ocamlPackages.duppy ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - (ocamlPackages.camomile.override { version = "1.0.2"; }) ocamlPackages.ocurl + ocamlPackages.cry + ocamlPackages.camomile ocamlPackages.uri - ocamlPackages.sedlex + ocamlPackages.fileutils + ocamlPackages.menhir # liquidsoap-lang + ocamlPackages.menhirLib + ocamlPackages.metadata + ocamlPackages.dune-build-info + ocamlPackages.re + ocamlPackages.sedlex # liquidsoap-lang + ocamlPackages.ppx_string # Recommended dependencies ocamlPackages.ffmpeg # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o ocamlPackages.alsa ocamlPackages.ao ocamlPackages.bjack - ocamlPackages.cry + ocamlPackages.camlimages ocamlPackages.dssi ocamlPackages.faad ocamlPackages.fdkaac ocamlPackages.flac ocamlPackages.frei0r + ocamlPackages.gd4o + ocamlPackages.graphics ocamlPackages.gstreamer + ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa ocamlPackages.lame @@ -72,25 +112,22 @@ stdenv.mkDerivation { ocamlPackages.ogg ocamlPackages.opus ocamlPackages.portaudio + ocamlPackages.posix-time2 ocamlPackages.pulseaudio - ocamlPackages.shine ocamlPackages.samplerate + ocamlPackages.shine ocamlPackages.soundtouch ocamlPackages.speex ocamlPackages.srt ocamlPackages.ssl ocamlPackages.taglib ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 ocamlPackages.tsdl ocamlPackages.tsdl-image ocamlPackages.tsdl-ttf - - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.yaml ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index f6d8369082..f19425201c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${version}" ; - hash = "sha256-176MpooVQrq1dXC62h8Yyyhw6IjCA50tp1J4DQPSePQ="; + hash = "sha256-Qea9zGLJ41D+l8h1Sg/KJI6Ou02jtbRIxYPGoabM8nY="; }; # The upstream download script tries to download the models to the diff --git a/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix b/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix index d753d7bb3e..ec55b78c4f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/piper/default.nix @@ -7,6 +7,7 @@ , pkg-config # runtime +, fmt , onnxruntime , pcaudiolib , piper-phonemize @@ -18,22 +19,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "1.2.0"; + version = "2023.11.14-2"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-3ynWyNcdf1ffU3VoDqrEMrm5Jo5Zc5YJcVqwLreRCsI="; }; - sourceRoot = "${finalAttrs.src.name}/src/cpp"; - nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ + "-DFMT_DIR=${fmt}" + "-DSPDLOG_DIR=${spdlog.src}" + "-DPIPER_PHONEMIZE_DIR=${piper-phonemize}" + ]; + buildInputs = [ onnxruntime pcaudiolib diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index bdd0f58235..f6b1f6d9f6 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.17.4"; + version = "0.19.1"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-yZHdPqvYmlq/ZKeinez4MmO9+jCIl9JAD0t/tc/Uz8c="; + hash = "sha256-GYVr/Wam1IGCSR2vHMAu5Fg/jRB333L6iNjltnRKh4E="; }; postPatch = let @@ -103,7 +103,7 @@ python.pkgs.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/utils/monotonic_align - ${python.pythonForBuild.interpreter} setup.py install --prefix=$out + ${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out ) ''; diff --git a/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix index f8c50fda29..2c2ea77de6 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/video2midi/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, fetchFromGitHub, pythonPackages, opencv4 }: let - opencv3_ = pythonPackages.toPythonModule (opencv3.override { + opencv4_ = pythonPackages.toPythonModule (opencv4.override { inherit pythonPackages; enablePython = true; enableFfmpeg = true; @@ -19,7 +19,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam"; }; - propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; + propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ]; installPhase = '' install -Dm755 v2m.py $out/bin/v2m.py 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 7238a54932..dd928ab3e4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.1"; + version = "0.3.2"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-dUmQNKgH+SIlLhUEiaEGXUHZQDr3fidsAU2vATJiXBU="; + hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch deleted file mode 100644 index 27a6bd0824..0000000000 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/setup.py b/setup.py -index 04eedbc..ee0b495 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,4 +35,9 @@ setup( - "Programming Language :: Python :: 3.10", - ], - keywords="rhasspy wyoming whisper", -+ entry_points={ -+ 'console_scripts': [ -+ 'wyoming-faster-whisper = wyoming_faster_whisper:__main__.run' -+ ] -+ } - ) -diff --git a/wyoming_faster_whisper/__main__.py b/wyoming_faster_whisper/__main__.py -index 8a5039f..bd1e7b6 100755 ---- a/wyoming_faster_whisper/__main__.py -+++ b/wyoming_faster_whisper/__main__.py -@@ -131,8 +131,12 @@ async def main() -> None: - - # ----------------------------------------------------------------------------- - -+def run(): -+ asyncio.run(main()) -+ -+ - if __name__ == "__main__": - try: -- asyncio.run(main()) -+ run() - except KeyboardInterrupt: - pass diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix index 50ec99f6de..e7eecd1835 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -1,21 +1,37 @@ { lib , python3 -, fetchPypi +, fetchFromGitHub +, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + pyproject = true; - src = fetchPypi { - pname = "wyoming_faster_whisper"; - inherit version; - hash = "sha256-wo62m8gIP9hXihkd8j2haVvz3TlJv3m5WWthTPFwesk="; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming-faster-whisper"; + rev = "refs/tags/v${version}"; + hash = "sha256-mKnWab3i6lEnCBbO3ucNmWIxaaWwQagzfDhaD1U3qow="; }; patches = [ - ./faster-whisper-entrypoint.patch + # add wyoming-faster-whisper executable + (fetchpatch { + url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/a5715197abab34253d2864ed8cf406210834b4ec.patch"; + hash = "sha256-a9gmXMngwXo9ZJDbxl/pPzm6WSy5XeGbz/Xncj7bOog="; + }) + + # fix model retrieval on python3.11+ + (fetchpatch { + url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/d5229df2c3af536013bc931c1ed7cc239b618208.patch"; + hash = "sha256-CMpOJ1qSPcdtX2h2ecGmQ/haus/gaSH8r/PCFsMChRY="; + }) + ]; + + nativeBuildInputs = with python3.pkgs; [ + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ @@ -33,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Wyoming Server for Faster Whisper"; - homepage = "https://pypi.org/project/wyoming-faster-whisper/"; + homepage = "https://github.com/rhasspy/wyoming-faster-whisper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/openwakeword.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/openwakeword.nix index d8450dac69..83da563f3b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/openwakeword.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/openwakeword.nix @@ -1,61 +1,51 @@ { lib -, python3 , python3Packages , fetchFromGitHub , fetchpatch }: -python3.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "wyoming-openwakeword"; - version = "1.5.1"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; - repo = "rhasspy3"; - rev = "e16d7d374a64f671db48142c7b635b327660ebcf"; - hash = "sha256-SbWsRmR1hfuU3yJbuu+r7M43ugHeNwLgu5S8MqkbCQA="; + repo = "wyoming-openwakeword"; + rev = "refs/tags/v${version}"; + hash = "sha256-N/EjdNQLsYLpJ4kOxY/z+/dMMmF1PPAIEEzSHfnZWaM="; }; patches = [ (fetchpatch { # import tflite entrypoint from tensorflow - url = "https://github.com/rhasspy/rhasspy3/commit/23b1bc9cf1e9aa78453feb11e27d5dafe26de068.patch"; - hash = "sha256-fjLJ+VI4c8ABBWx1IjZ6nS8MGqdry4rgcThKiaAvz+Q="; + url = "https://github.com/rhasspy/wyoming-openwakeword/commit/8f4ba2750d8c545e77549a7230cdee1301dac09a.patch"; + hash = "sha256-WPvywpGv0sYYVGc7he4bt7APIsa3ziKaWqpFlx3v+V8="; }) (fetchpatch { # add commandline entrypoint - url = "https://github.com/rhasspy/rhasspy3/commit/7662b82cd85e16817a3c6f4153e855bf57436ac3.patch"; - hash = "sha256-41CLkVDSAJJpZ5irwIf/Z4wHoCuKDrqFBAjKCx7ta50="; + url = "https://github.com/rhasspy/wyoming-openwakeword/commit/f40e5635543b2315217538dd89a9fe40fe817cfe.patch"; + hash = "sha256-HNlGqt7bMzwyvhx5Hw7mkTHeQmBpgDCU3pUbZzss1bY="; }) ]; - postPatch = '' - cd programs/wake/openwakeword-lite/server - ''; - nativeBuildInputs = with python3Packages; [ setuptools - wheel ]; propagatedBuildInputs = with python3Packages; [ - tensorflow-bin - webrtc-noise-gain + tensorflow wyoming ]; - passthru.optional-dependencies.webrtc = with python3Packages; [ - webrtc-noise-gain - ]; - pythonImportsCheck = [ "wyoming_openwakeword" ]; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming-openwakeword/blob/v${version}/CHANGELOG.md"; description = "An open source voice assistant toolkit for many human languages"; - homepage = "https://github.com/rhasspy/rhasspy3/commit/fe44635132079db74d0c76c6b3553b842aa1e318"; + homepage = "https://github.com/rhasspy/wyoming-openwakeword"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; mainProgram = "wyoming-openwakeword"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch deleted file mode 100644 index 4f7d09fd40..0000000000 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper-entrypoint.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/setup.py b/setup.py -index 05e42c1..8347acb 100644 ---- a/setup.py -+++ b/setup.py -@@ -41,4 +41,9 @@ setup( - "Programming Language :: Python :: 3.10", - ], - keywords="rhasspy wyoming piper", -+ entry_points={ -+ 'console_scripts': [ -+ 'wyoming-piper = wyoming_piper:__main__.run' -+ ] -+ } - ) -diff --git a/wyoming_piper/__main__.py b/wyoming_piper/__main__.py -index ab1580b..4c0a143 100755 ---- a/wyoming_piper/__main__.py -+++ b/wyoming_piper/__main__.py -@@ -143,8 +143,12 @@ def get_description(voice_info: Dict[str, Any]): - - # ----------------------------------------------------------------------------- - -+def run(): -+ asyncio.run(main()) -+ -+ - if __name__ == "__main__": - try: -- asyncio.run(main()) -+ run() - except KeyboardInterrupt: - pass diff --git a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix index fbc52a88aa..f53f684f6f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/wyoming/piper.nix @@ -1,24 +1,35 @@ { lib -, python3 -, fetchPypi +, python3Packages +, fetchFromGitHub +, fetchpatch }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.3.2"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; - src = fetchPypi { - pname = "wyoming_piper"; - inherit version; - hash = "sha256-WyoHwIF3xC5nOa7iQ8/esfdwahbU6YJzK5G2Vi3mV4M="; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming-piper"; + # https://github.com/rhasspy/wyoming-piper/issues/3 + rev = "560927437c72eca4d334ca503d15863f0b42980d"; + hash = "sha256-Q4S96zs856zXVAGo4mB466an60naHiS2S/qxYxPE4sI="; }; patches = [ - ./piper-entrypoint.patch + (fetchpatch { + # add console script + url = "https://github.com/rhasspy/wyoming-piper/commit/4c27fbd067fd543adede4626fc5868a3f2458734.patch"; + hash = "sha256-YPjDjeY9RLsgCtbBZoNgPyQTv3rbCJGcqTNSSwiqqEE="; + }) ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ wyoming ]; @@ -29,8 +40,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md"; description = "Wyoming Server for Piper"; - homepage = "https://pypi.org/project/wyoming-piper/"; + homepage = "https://github.com/rhasspy/wyoming-openwakeword"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix index b4c8735542..1147895052 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.7"; + version = "1.7.9"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drinKUJAlgY1PEP7NHOFfmvDVib1AFjT8hRktQgxJ4A="; + sha256 = "sha256-7KYbA9qKa1o0ZLb+6S/UgAPT7wpsIugEFzWYB3voqBU="; }; vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index a900df590e..e11f3f1ad4 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { # docs sphinxHook - guzzle_sphinx_theme + guzzle-sphinx-theme # shell completions installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index ed647cc988..24d4e98ed1 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -13,11 +13,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.7.15"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-esTvcybCPTayA9LCSukNc9ba8eGCTyjB883eZYy91II="; + sha256 = "sha256-XbihTQJtoiRRfwjMCP+XEPmbt7//zFPx1fIWOvn92Nc="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index 8fd23c0e62..96eeeb39a9 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -1,7 +1,6 @@ -args @ { +{ lib, stdenv, - llvmPackages_12, # Anything newer than 11 fetchzip, which, attr, @@ -22,19 +21,13 @@ args @ { CoreFoundation, }: -let - # Fails to build with clang-11 on Darwin: - # error: exception specification of overriding function is more lax than base version - stdenv = if args.stdenv.isDarwin then llvmPackages_12.stdenv else args.stdenv; -in - stdenv.mkDerivation rec { - version = "2.7.10"; + version = "2.7.13"; pname = "dar"; src = fetchzip { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-cvEeV4e19gVgz5vctQUgA4Atj37dgFg3iH789DWtVZU="; + sha256 = "sha256-d88BwbovhbAn72y5pVd4No+hVydXbtZYHZpdtpo4RGY="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix index 99bc324558..55abb3462e 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicacy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duplicacy"; - version = "3.1.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "gilbertchen"; repo = "duplicacy"; rev = "v${version}"; - sha256 = "sha256-PYUfECxtUG2WuLmYLtE3Ugcr8GeQMQwQa4uFzcl1RoY="; + hash = "sha256-7LflTRBB4JG84QM46wvSJrP4o3CHV4gnR24RJgDSlDg="; }; - vendorHash = "sha256-90NWpMEUlPo5+G7DnqFrZyTlAYDAFfZrsctNTaWVjX4="; + vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix deleted file mode 100644 index ee30ab3037..0000000000 --- a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, python38, fetchPypi, fetchFromGitHub }: -let - python = python38.override { - self = python; - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - doCheck = false; - }); - tornado = super.tornado_4; - }; - }; - -in -with python.pkgs; buildPythonApplication rec { - pname = "grab-site"; - version = "2.2.7"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "grab-site"; - sha256 = "sha256-tf8GyFjya3+TVc2VjlY6ztfjCJgof6tg4an18pz+Ig8="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' - ''; - - propagatedBuildInputs = [ - click - ludios_wpull - manhole - lmdb - autobahn - fb-re2 - websockets - faust-cchardet - ]; - - checkPhase = '' - export PATH=$PATH:$out/bin - bash ./tests/offline-tests - ''; - - meta = with lib; { - description = "Crawler for web archiving with WARC output"; - homepage = "https://github.com/ArchiveTeam/grab-site"; - license = licenses.mit; - maintainers = with maintainers; [ ivan ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 020902c1a0..3709040490 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ELnop8/f7/4E5FnWwGrPJt3n9YhSG1jei1tAt3zr1KI="; + hash = "sha256-N6mntK1cHkdnIZhU67DOvlwv8XXWx602oD/Pj+NJo9Y="; }; - vendorHash = "sha256-8NTAnkIJkFKyjQL7KBoCqtSBog9Hz1vPBo81u8YcA1A="; + vendorHash = "sha256-eP/T4UzXBLOuK/f3BTz7dGqsSj7r/uTKKQ4H4lCvPC8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix index 016421f113..a1f9365be8 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.25"; + version = "0.3.27"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-DLO0mKQ7Ab+4hwRANnipkaCbS7qldGnfTotAYDy//XU="; + sha256 = "sha256-atQ355w9BRUJKkvuyJupcNexVEnVcYsWRvnNmpBw8OA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index 9a7e4d676a..a3223c04e2 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.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; + hash = "sha256-Qrbg8/f1ne+7c+mnUc/8CoZBjiGLohJXnu0cnc0pT4g="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; + vendorHash = "sha256-Ctg6bln5kzGs7gDLo9zUpsbSybKOtHFuHvHG3cxCfac="; subPackages = [ "cmd/restic" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix index 8738f5dc4e..e2e68109b8 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; preBuild = '' - ${python3Packages.python.pythonForBuild.interpreter} ./setup.py build_cython build_ext --inplace + ${python3Packages.python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace ''; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix b/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix index f7aae8165e..ab46893b0d 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "sigtop"; - version = "0.3.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; rev = "v${version}"; - sha256 = "sha256-U+S+VXRkedq2LkO9Fw/AfNS97GvFEfjD8dq/VMlBOv4="; + sha256 = "sha256-goGvgn1QyWqipcrBvO27BjzFbp7cIPFWzWJaOpp2/1Q="; }; - vendorHash = "sha256-xrJ/KLM/f/HVPL4MJzRc1xDlO4e+Iu2lcPG4GnjFRBo="; + vendorHash = "sha256-K33VZeyOFoLLo64FuYt9bxJvaESSlHEy/2O8kLxxL5U="; makeFlags = [ "PREFIX=\${out}" @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Utility to export messages, attachments and other data from Signal Desktop"; license = licenses.isc; - platforms = platforms.darwin; + platforms = platforms.all; maintainers = with maintainers; [ fricklerhandwerk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index 94cb3790a5..b5cd6b9e50 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,22 +1,34 @@ -{ buildPythonApplication, click, fetchPypi, hypothesis, pytest -, lib, stringcase +{ buildPythonApplication +, click +, fetchPypi +, hypothesis +, lib +, poetry-core +, pytest +, pytestCheckHook +, stringcase }: buildPythonApplication rec { - pname = "zfs-replicate"; - version = "1.2.3"; + pname = "zfs_replicate"; + version = "3.1.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8"; + hash = "sha256-mRINo20/uFlWtP5W7w+D2E9o89hlAsqZmBjuv0qWP9k="; }; postPatch = '' - sed -i setup.cfg \ - -e '/--cov.*/d' + sed -i pyproject.toml -e '/--cov[^"]*/d' ''; + nativeBuildInputs = [ + poetry-core + ]; + nativeCheckInputs = [ + pytestCheckHook hypothesis pytest ]; @@ -26,11 +38,8 @@ buildPythonApplication rec { stringcase ]; - doCheck = true; - - checkPhase = '' - pytest --doctest-modules - ''; + # Current releases do not include tests. + doCheck = false; meta = with lib; { homepage = "https://github.com/alunduil/zfs-replicate"; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 1fa1870345..962ad4b2e0 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome.adwaita-icon-theme iproute2 networkmanager ] + gnome.adwaita-icon-theme networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; @@ -36,6 +36,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + # Don't check for runtime dependency `ip` during the configure + "--disable-runtime-deps-check" (lib.enableFeature withPulseAudio "pulseaudio") ]; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix index 4018d06b74..6b12605531 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8FVXVawmaCgnsexnNRw53tVR2a2fRyDK+h959Ezw7Zg="; + sha256 = "sha256-b+J+8nxFZYJlAKOStpH7ItPqMw7inM5pss17kyX1brg="; }; - vendorHash = "sha256-mudJN7rYWpdv2X4hrYjPBtEILyrdext4q+maDK1dC44="; + vendorHash = "sha256-d0O54KNGLXU8FGr1eSEp30JMWNVo91Le2MI8UnAfTuU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 2381402534..de2399adb5 100644 --- a/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -14,23 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.3.1"; + version = "0.14.0.2"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1lfgqqiyl6isy25wrxzyi3s334ii057g88714igyjjmxh47kygks"; + hash = "sha256-JqDFXf01ZUmeH4LY/ldGTb7xnKiGzm0BqBUii478iw8="; }; patches = [ # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - - # Fixes issue with null dereference in ReadHiddenTags - # Upstream: https://sourceforge.net/p/refind/code/merge-requests/45/ - (fetchpatch { - url = "https://github.com/samueldr/rEFInd/commit/29cd79dedabf84d5ddfe686f5692278cae6cc4d6.patch"; - sha256 = "sha256-/jAmOwvMmFWazyukN+ru1tQDiIBtgGk/e/pczsl1Xc8="; - }) ]; buildInputs = [ gnu-efi ]; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix index de54827071..402e6f4dde 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW="; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ + "-D__THROW=" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix index 963300c9ca..948c514284 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Makefile prefix, otherwise `/usr` prefix is enforced + # https://github.com/Sound-Linux-More/sacd/pull/1 (fetchpatch { - url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch"; + url = "https://github.com/Sound-Linux-More/sacd/commit/a72def4fab234bcd68b444cf7447a8876b4e2ce8.patch"; name = "makefile-prefix.patch"; sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64"; }) diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix index cf3bd1fe6c..f7b90e6e25 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy/default.nix @@ -50,7 +50,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.0.95"; + version = "1.0.96"; src = let @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-Tsi541GAMrWBl5xLo/K+uEyaoaDSWvwp5RMzZ5V6RAU="; + hash = "sha256-eUpxfJQ0u3bpAXTUCKlMO/ViwKcBI59YFKJ3xGzSdcg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix b/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix index 32bae24a6c..b57e3f6806 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - hash = "sha256-dlVTMd8sm84M8JZsCfVR/s4jXMQWmrVj7xwUVDsehQY="; + hash = "sha256-MwXdXT/ZEvTcYV4DjhCUFflrPKBFu0fk5PmaWt4MMOU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix index be456cf594..bfab2dbb94 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl -, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableShared ? true , autoreconfHook , testers }: @@ -47,8 +48,12 @@ in { outputs = [ "bin" "dev" "out" "man" ]; - configureFlags = - lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + configureFlags = lib.concatLists [ + (lib.optional enableStatic "--enable-static") + (lib.optional (!enableShared) "--disable-shared") + ]; + + dontDisableStatic = enableStatic; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix index 4c808acd00..09aab8258a 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "upx"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "upx"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-pHJypO+sK7+ytM7yJxJpfBJHTYpGc9nr/JiFGd7hlJM="; + sha256 = "sha256-PRfIJSjmeXjbslqWnKrHUPdOJfZU08nr4wXoAnP9qm0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 791dda4f11..75b306b368 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -2,7 +2,8 @@ , fixDarwinDylibNames , file , legacySupport ? false -, static ? stdenv.hostPlatform.isStatic +, static ? stdenv.hostPlatform.isStatic # generates static libraries *only* +, enableStatic ? static # these need to be ran on the host, thus disable when cross-compiling , buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform , doCheck ? stdenv.hostPlatform == stdenv.buildPlatform @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.attrsets.mapAttrsToList (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; - BUILD_STATIC = static; + BUILD_STATIC = enableStatic; BUILD_CONTRIB = buildContrib; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix index abb8f695eb..7b652bd68a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; }; + postPatch = '' + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "BIN=$(out)/bin" "MAN=$(out)/share/man/man1" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock index c4dd7f58c7..f43cc63c95 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock @@ -4,27 +4,67 @@ version = 3 [[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", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +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", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "atty" @@ -55,7 +95,7 @@ dependencies = [ "clap", "colored", "either", - "errno", + "errno 0.2.8", "gag", "getset", "itertools", @@ -74,7 +114,7 @@ dependencies = [ "anyhow", "bindgen", "bitfield", - "bitflags", + "bitflags 1.3.2", "byteorder", "chrono", "colored", @@ -92,7 +132,7 @@ name = "bindgen" version = "0.64.0" source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -103,7 +143,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -119,22 +159,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.12.0" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[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 = "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 = "cexpr" @@ -153,24 +196,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", "num-traits", - "time", - "wasm-bindgen", - "winapi", ] [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -178,118 +215,68 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cxx" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-sys", ] [[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 = "errno" @@ -302,6 +289,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -314,12 +311,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filedescriptor" @@ -351,7 +345,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -377,65 +371,29 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[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", -] - -[[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 = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.3", "libc", "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.21", "windows-sys", ] @@ -448,15 +406,6 @@ dependencies = [ "either", ] -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -471,9 +420,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libudev-sys" @@ -486,34 +435,28 @@ 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.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -540,36 +483,20 @@ dependencies = [ "minimal-lexical", ] -[[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" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parse-display" @@ -592,15 +519,15 @@ dependencies = [ "proc-macro2", "quote", "regex", - "regex-syntax", - "syn", + "regex-syntax 0.6.29", + "syn 1.0.109", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "peeking_take_while" @@ -610,9 +537,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro-error" @@ -623,7 +550,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -640,56 +567,65 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[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 = "regex" -version = "1.7.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rpassword" @@ -709,29 +645,36 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", - "errno", + "bitflags 1.3.2", + "errno 0.3.5", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys", ] [[package]] -name = "scratch" -version = "1.0.3" +name = "rustix" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.5", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "strsim" @@ -741,9 +684,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -752,66 +706,45 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", + "rustix 0.38.21", + "windows-sys", ] [[package]] name = "terminal_size" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi", + "syn 2.0.38", ] [[package]] @@ -827,21 +760,21 @@ dependencies = [ [[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-width" -version = "0.1.10" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -849,66 +782,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - [[package]] name = "winapi" version = "0.3.9" @@ -925,15 +798,6 @@ 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" @@ -942,9 +806,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -957,42 +830,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 81152d144a..e6263ca62c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -12,32 +12,29 @@ , lz4 , attr , udev -, valgrind , nixosTests , fuse3 , cargo , rustc -, coreutils , rustPlatform , makeWrapper , fuseSupport ? false }: let - rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe"; -in stdenv.mkDerivation { + version = "1.3.3"; +in +stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2023-06-28"; + inherit version; + src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - inherit rev; - hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I="; + rev = "v${version}"; + hash = "sha256-73vgwgBqyRLQ/Tts7bl6DhZMOs8ndIOiCke5tN89Wps="; }; - # errors on fsck_err function. Maybe miss-detection? - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - nativeBuildInputs = [ pkg-config cargo @@ -71,15 +68,14 @@ in stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - nativeCheckInputs = [ valgrind ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "VERSION=${lib.strings.substring 0 7 rev}" + "VERSION=${version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; - preCheck = lib.optionalString fuseSupport '' + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; @@ -88,11 +84,6 @@ in stdenv.mkDerivation { inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; - postFixup = '' - wrapProgram $out/bin/mount.bcachefs \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ''; - enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix index 64edc17a89..6fbd6b8055 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,42 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse, boost }: +{ lib, buildGoModule, fetchFromGitHub, fuse3, testers, blobfuse }: let - version = "1.3.7"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "Azure"; - repo = "azure-storage-fuse"; - rev = "blobfuse-${version}-Linux"; - sha256 = "sha256-yihIuS4AG489U7eBi/p7H6S7Cg54kkQeNVCexxQZ60A="; + owner = "Azure"; + repo = "azure-storage-fuse"; + rev = "blobfuse2-${version}"; + sha256 = "sha256-+MnqIwLuR+YBTowgIQokV0kFzfYtMBdhd/+m9MOrF1Y="; }; - cpplite = stdenv.mkDerivation rec { - pname = "cpplite"; - inherit version src; - - sourceRoot = "${src.name}/cpplite"; - patches = [ ./install-adls.patch ]; - - cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ]; - - buildInputs = [ curl libuuid gnutls ]; - nativeBuildInputs = [ cmake pkg-config ]; - }; -in stdenv.mkDerivation rec { +in buildGoModule { pname = "blobfuse"; inherit version src; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - "-Wno-error=catch-value" - ]; + vendorHash = "sha256-WfVFV/6Owx51rHXyfMp7CRW7aQ3R5BFyfHronQ58Gik="; - buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fuse3 ]; + + # Many tests depend on network or needs to be configured to pass. See the link below for a starting point + # https://github.com/NixOS/nixpkgs/pull/201196/files#diff-e669dbe391f8856f4564f26023fe147a7b720aeefe6869ab7a218f02a8247302R20 + doCheck = false; + + passthru.tests.version = testers.testVersion { package = blobfuse; }; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; license = licenses.mit; maintainers = with maintainers; [ jbgi ]; platforms = platforms.linux; + mainProgram = "azure-storage-fuse"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 879075101b..6761947367 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.5.2"; + version = "6.6.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-xViy3dQ/V0ei9ctirtPlxQmXA4hkhaSAMQ/tRpjTYQw="; + hash = "sha256-tCZzbclOKwS2mD6ZjE3EJ9wWbWbd6iRsiQ7ZwqRQBE8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 3cbf3704fb..241bf71985 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -165,18 +165,6 @@ let # Watch out for python <> boost compatibility python = python310.override { packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs rec { - version = "1.4.46"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; - }; - disabledTestPaths = [ - "test/aaa_profiling" - "test/ext/mypy" - ]; - }; }; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 3d3c1b54db..a64812e96b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ neon zlib ]; + buildInputs = [ + zlib + ]; patches = [ ./fix-sysconfdir.patch @@ -36,7 +38,10 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--with-neon=${lib.getLib neon}" + ]; meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix index efdb9f3dc1..ba14fcad6c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dduper/default.nix @@ -4,9 +4,8 @@ let btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { - name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/ecc2664c380616ec75cfc1e600b5514cdff5c687/patch/btrfs-progs-v6.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; - sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/1f1d29eff61430e118f88239545a29f0bcf3e15d/patch/btrfs-progs-v6.3.3/0001-Print-csum-for-a-given-file-on-stdout.patch"; + hash = "sha256-bO0t8QePnUbMkQQPesZlBF/khD/H8AaWHr2GkOnT6x8="; }) ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix index e44e961e3a..fd2be83691 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, libgcrypt -, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite -, util-linux }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch2 +, libgcrypt +, pkg-config +, glib +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, sqlite +, util-linux +, testers +, duperemove +}: stdenv.mkDerivation rec { pname = "duperemove"; @@ -13,6 +23,15 @@ stdenv.mkDerivation rec { hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; }; + patches = [ + # Use variable instead of hardcoding pkg-config + # https://github.com/markfasheh/duperemove/pull/315 + (fetchpatch2 { + url = "https://github.com/markfasheh/duperemove/commit/0e1c62d79a9a79d7bb3e80f1bd528dbf7cb75e22.patch"; + hash = "sha256-YMMu6LCkBlipEJALukQMwIMcjQEAG5pjGEGeTW9OEJk="; + }) + ]; + postPatch = '' substituteInPlace util.c --replace \ "lscpu" "${lib.getBin util-linux}/bin/lscpu" @@ -21,7 +40,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=v${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = duperemove; + command = "duperemove --version"; + version = "v${version}"; + }; meta = with lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; @@ -29,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; + mainProgram = "duperemove"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix index 2ca03fa9a7..7ab7d544ab 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dysk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.8.0"; + version = "2.8.2"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-BbL7liiZ1Xcg2Pr2JDnP5DAbjVdDVRs/hndZyIX8jfQ="; + hash = "sha256-h/vdc7ltlXJQi1f013+fNyYB6fc0hTUcx4LN6UySIGM="; }; - cargoHash = "sha256-vMWr3cV1ttjjwBvgQgi3aCpejr/enoYILVhI4wP9wa0="; + cargoHash = "sha256-LC7A+fu4SqfsxT3K9gYJPx8G9h+7kXq0Nq70iSlfygE="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix index 14701a615c..966c396823 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config, perl , gettext, fuse, openssl, tinyxml2 }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { owner = "vgough"; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes a build failure when building with newer versions of clang. + # https://github.com/vgough/encfs/pull/650 + (fetchpatch { + url = "https://github.com/vgough/encfs/commit/406b63bfe234864710d1d23329bf41d48001fbfa.patch"; + hash = "sha256-VunC5ICRJBgCXqkr7ad7DPzweRJr1bdOpo1LKNCs4zY="; + }) + ]; + buildInputs = [ gettext fuse openssl tinyxml2 ]; nativeBuildInputs = [ cmake pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix index 163439c903..b57dcc4b36 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,26 +1,33 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib, libselinux , fuseSupport ? stdenv.isLinux +, selinuxSupport ? false }: stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.7"; + version = "1.7.1"; outputs = [ "out" "man" ]; src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; - hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw="; + hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ util-linux lz4 zlib ] - ++ lib.optionals fuseSupport [ fuse ]; + ++ lib.optionals fuseSupport [ fuse ] + ++ lib.optionals selinuxSupport [ libselinux ]; - configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ]; + configureFlags = [ + "MAX_BLOCK_SIZE=4096" + ] ++ lib.optional fuseSupport "--enable-fuse" + ++ lib.optional selinuxSupport "--with-selinux"; meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; + changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ehmry nikstur ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix index 3310589824..dafdd2c830 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xNspLbm7v4nj82Y4gYqWEBU7cVlFBh3rnqhQ8CXEqrw="; + sha256 = "sha256-2j+N/H+Vdy3Q6Ie2gBGkNKtLjt19RDvm9HZMS5l3L5Y="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix index 4accc34b62..fe72905d0f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf -, cacert, Security, garage, nixosTests }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitea +, fetchpatch +, openssl +, pkg-config +, protobuf +, cacert +, Security +, garage +, nixosTests +}: let generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage { pname = "garage"; @@ -31,8 +42,6 @@ let # on version changes for checking if changes are required here buildFeatures = [ "kubernetes-discovery" - ] ++ - (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "metrics" @@ -41,7 +50,7 @@ let "lmdb" "sqlite" "consul-discovery" - ]); + ]; # To make integration tests pass, we include the optional k2v feature here, # but in buildFeatures only for version 0.8+, where it's enabled by default. @@ -49,13 +58,11 @@ let checkFeatures = [ "k2v" "kubernetes-discovery" - ] ++ - (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "lmdb" "sqlite" - ]); + ]; passthru.tests = nixosTests.garage; @@ -69,27 +76,33 @@ let }; }; in - rec { - # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore - # we have to keep all the numbers in the version to handle major/minor/patch level. - # for <1.0. +rec { + # Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore + # we have to keep all the numbers in the version to handle major/minor/patch level. + # for <1.0. - garage_0_7_3 = generic { - version = "0.7.3"; - sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg="; - cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI="; - eol = true; # Confirmed with upstream maintainers over Matrix. - }; + garage_0_8_4 = generic { + version = "0.8.4"; + sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; + cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; + }; - garage_0_7 = garage_0_7_3; + garage_0_8 = garage_0_8_4; - garage_0_8_4 = generic { - version = "0.8.4"; - sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs="; - cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8="; - }; + garage_0_9_0 = (generic { + version = "0.9.0"; + sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8="; + cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o="; + }).overrideAttrs (oldAttrs: { + patches = oldAttrs.patches or [ ] ++ [ + (fetchpatch { + url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4.patch"; + sha256 = "sha256-q7E6gtPjnj5O/K837LMP6LPEFcgdkifxRFrYzBuqkk0="; + }) + ]; + }); - garage_0_8 = garage_0_8_4; + garage_0_9 = garage_0_9_0; - garage = garage_0_8; - } + garage = garage_0_9; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index 0af1a965fc..b738c30970 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-fMKFQheFlSwz4ik1tgLheZGkS55LHq3nncOmvgY/TqM="; + hash = "sha256-tc3+OHDjsA2OC9YvuOXZMaysKot8O3+qNoymzF2PnwA="; }; - vendorHash = "sha256-bgZgYbQN6Dg4uHp29tazJ9un9fR1o9mYp8R8ZHtAs9Q="; + vendorHash = "sha256-9pVdoeRyhhxOX3jLZVlx+5eHfP5iu0x40wnpV0xq3Z0="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index 431be3b79d..f7e830f321 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "11.0"; + version = "11.1"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI="; + sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ="; }; inherit buildInputs propagatedBuildInputs; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix index 637e24483d..736b370fb7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/littlefs-fuse/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-ybaZbAomrIaEdYfQtbZirkozRarEUxjsf6hgTMu5uIY="; + hash = "sha256-8TrCAByblff2Vkk0MvnIYyAMoFW3s3fm3rLXrEjWoys="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index e2e6e28e3b..6ee1d96eaf 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; + sha256 = "sha256-eENtsN9OqPpUQM+O8tPTBzDk26/F/zc2hZ4ZiXiDp2I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix index d0f57894e0..74d9b1d370 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-hXvA/dqRn5zKVAJ+JjUfIEKsqIhEOTzPEzvJI3cP4NY="; + hash = "sha256-67GaZdmDuUc8ixeRP86xA/+n1PRqwwIEe7JK9OZGUC8="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix index f6a1e0a5c5..0ca64234e5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "2.1.5"; + version = "2.1.6"; src = fetchgit { url = "git://git.infradead.org/mtd-utils.git"; rev = "v${version}"; - sha256 = "sha256-Ph9Xjb2Nyo7l3T1pDgW2gnSJxn0pOC6uvCGUfCh0MXU="; + sha256 = "sha256-NMYzUPt/91lv8f7E1ytX91SqwbBEOtHjCL54EcumcZA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { (enableFeature doCheck "tests") ]; + makeFlags = [ + "AR:=$(AR)" + ]; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix index d4ef2154d8..950d10640b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "3.1.15"; + version = "3.1.18"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2"; - hash = "sha256-2NSlzA/Yaw2Q4BfWTB9GI+jNv72lcPxCOt4RUak9GfU="; + hash = "sha256-htIJ3Hd2pLoXhFFk0uN2pGnO43aiexiuMYmOP0ukFlU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix index 9ce1461ffa..d945a4a400 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = true; + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 7f08c9f716..c1c374ac03 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "squashfuse"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "vasi"; repo = pname; rev = version; - sha256 = "sha256-gK1k1Ooue3HLtBmPFMZdW4h2Ee1Uy4T26EOBeQICQpM="; + sha256 = "sha256-nCdAO5WPYt/aHdNnfkIJqz0T59COgsSGeXho4bFZVTY="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix index 467e24724f..7ed8173d38 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.27"; + version = "4.35"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "9b647d73b34dc2e18ed04bfcf5e260ffb8242dd5"; - hash = "sha256-7I7h6Szb/oXtkypd7Nk4AFrTEsn9Y/1/u+IaL63zRVI="; + rev = "fe18072c9b1a670c06d1819205ad12e08312838f"; + hash = "sha256-eVduJa4ewkVDHkxZkj2GO2uNMcMubyGo+4RkhXb9KFA="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix index 79447e64a7..e927f2daf2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,24 +6,24 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.5.3"; + version = "3.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-YoPi2AtP6qZPMrlxbDAD0sDEKrSBHLLRcHbNLxlXXCk="; + hash = "sha256-mLmjMofdr0U+Bfnkde7lJqPXkd1ICPYdlcsOm2nOcQA="; }; propagatedBuildInputs = with python3Packages; [ + dbus-client-gen + dbus-python-client-gen + justbytes + packaging psutil python-dateutil wcwidth - justbytes - dbus-client-gen - dbus-python-client-gen - packaging ]; nativeCheckInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock index 97a2113871..d3554b3ce1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -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.0.2" @@ -92,9 +77,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" dependencies = [ "anstyle", "bstr", @@ -113,9 +98,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", @@ -128,28 +113,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "bindgen" -version = "0.63.0" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -160,7 +130,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -186,9 +156,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -201,11 +171,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", + "once_cell", "regex-automata", "serde", ] @@ -274,21 +245,22 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" dependencies = [ "anstream", "anstyle", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -313,9 +285,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -373,11 +345,11 @@ dependencies = [ [[package]] name = "devicemapper" -version = "0.33.5" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a9fd602a98d192f7662a1f4c4cf6920a1b454c3a9e724f6490cf8e30910114" +checksum = "9ff98688149bf6128f259f0009f98eb8ad82584aa0aae143081fdfde513d3d13" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "devicemapper-sys", "env_logger", "lazy_static", @@ -391,12 +363,11 @@ dependencies = [ [[package]] name = "devicemapper-sys" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0f9d16560f830ae6e90b769017333c4561d2c84f39e7aa7d935d2e7bcbc4c" +checksum = "734fba4d2e6b551396439ea7dd4f56980b11bb096bbf505d4a259943b228367b" dependencies = [ "bindgen", - "nix 0.26.2", ] [[package]] @@ -423,9 +394,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -474,9 +445,12 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "float-cmp" @@ -603,18 +577,21 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - [[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[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.2" @@ -650,6 +627,26 @@ dependencies = [ "cc", ] +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys", +] + [[package]] name = "iocuddle" version = "0.1.1" @@ -658,11 +655,12 @@ checksum = "d8972d5be69940353d5347a1344cb375d9b457d6809b428b05bb1ca2fb9ce007" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.2", + "io-lifetimes", "rustix", "windows-sys", ] @@ -687,9 +685,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" @@ -714,9 +712,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libblkid-rs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9a402d7e440c9f84431b566cbc523140e9354610a4dca35aa7b927400cb040" +checksum = "0b43fd7c0de11a5209aff91fb625c118fc15173ae3dd0ac11e8f61a1b4d1a863" dependencies = [ "either", "libblkid-rs-sys", @@ -726,9 +724,9 @@ dependencies = [ [[package]] name = "libblkid-rs-sys" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ee2322d6a28f5672b3d8640fb672c9dbe89e6f1135eb0721eb6ba4e7315ac3" +checksum = "163068067b2faf263fb2fc3daff137b45608ee185044ca849dc41438aa38e23a" dependencies = [ "bindgen", "cc", @@ -736,21 +734,22 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libcryptsetup-rs" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54de25d80cf59c099a01fc9939251bbf8021c131adf97beb7d57c094b16ed474" +checksum = "73d2aa26d63e5289d6fac1e7e0be2e248ded9b5dfb3e2c345820d060c537d4b6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "either", "lazy_static", "libc", "libcryptsetup-rs-sys", + "log", "pkg-config", "semver", "serde_json", @@ -759,9 +758,9 @@ dependencies = [ [[package]] name = "libcryptsetup-rs-sys" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb" +checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" dependencies = [ "bindgen", "cc", @@ -827,9 +826,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" @@ -840,7 +839,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loopdev" version = "0.4.0" -source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version#f780d0e873960e0eeb997e2bda106d1e30c3afd0" +source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" dependencies = [ "bindgen", "errno 0.2.8", @@ -868,15 +867,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "mio" version = "0.8.8" @@ -933,9 +923,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -943,23 +933,14 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.18.0" @@ -974,9 +955,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1070,9 +1051,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.32" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1127,26 +1108,20 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.2", ] [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.4", -] +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" @@ -1156,34 +1131,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "retry" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" -dependencies = [ - "rand", -] - -[[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1193,12 +1149,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.4" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ - "bitflags 2.3.3", + "bitflags 1.3.2", "errno 0.3.1", + "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -1218,21 +1175,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" @@ -1247,9 +1207,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -1309,7 +1269,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.5.9" +version = "3.6.2" dependencies = [ "assert_cmd", "assert_matches", @@ -1332,6 +1292,7 @@ dependencies = [ "libblkid-rs", "libc", "libcryptsetup-rs", + "libcryptsetup-rs-sys", "libmount", "libudev", "log", @@ -1344,13 +1305,13 @@ dependencies = [ "rand", "regex", "retry", - "rpassword", "serde", "serde_derive", "serde_json", "sha2", "stratisd_proc_macros", "tempfile", + "termios", "tokio", "uuid", ] @@ -1394,10 +1355,11 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if 1.0.0", "fastrand", "redox_syscall", @@ -1414,6 +1376,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + [[package]] name = "termtree" version = "0.4.1" @@ -1422,12 +1393,11 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "tokio" -version = "1.29.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", - "backtrace", "libc", "mio", "num_cpus", @@ -1463,9 +1433,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "utf8parse" @@ -1475,9 +1445,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ "getrandom", "serde", @@ -1615,9 +1585,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index a9e5e4ca36..707b3ac654 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.9"; + version = "3.6.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-E4bBrbkqEh2twolPIHpHxphMG3bnDj0tjEBUWhrwL+M="; + hash = "sha256-R6Bb6ep5T8ePmxwDTxQyeXcSpp2S1C2zqwxmX2Wt1L8="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "loopdev-0.4.0" = "sha256-nV52zjsg5u6++J8CdN2phii8AwjHg1uap2lt+U8obDQ="; + "loopdev-0.4.0" = "sha256-YS0hqxphxbbImT/mn/XBzkgabK2kbIym5VqG3XDVAx8="; }; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "initrd" ]; - EXECUTABLES_PATHS = lib.makeBinPath ([ + env.EXECUTABLES_PATHS = lib.makeBinPath ([ xfsprogs thin-provisioning-tools ] ++ lib.optionals clevisSupport [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 8f008c3a34..4dc9ca9de6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ # Prevent the unionfs daemon from being killed during # shutdown. See - # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ # for details. ./prevent-kill-on-shutdown.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix index 03adc070c0..f9d586d91d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wipefreespace/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "wipefreespace"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://sourceforge/project/wipefreespace/wipefreespace/${version}/wipefreespace-${version}.tar.gz"; - hash = "sha256-wymV6G4Et5TCoIztZfdb3xuzjdBHFyB5OmI4EcsJKwQ="; + hash = "sha256-Pt6MDQ9wSJbL4tW/qckTpFsvE9FdXIkp/QmnYSlWR/M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix index feb5b23df5..0a4447bacc 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ruby, zfs }: +{ lib, stdenv, fetchFromGitHub, ruby, zfs, makeWrapper }: stdenv.mkDerivation rec { pname = "zfstools"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ruby ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -20,10 +21,10 @@ stdenv.mkDerivation rec { cp -R lib $out/ for f in $out/bin/*; do - substituteInPlace $f --replace "/usr/bin/env ruby" "ruby -I$out/lib" + wrapProgram $f \ + --set RUBYLIB $out/lib \ + --prefix PATH : ${zfs}/bin done - - sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/versions.json b/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/versions.json index cbbf231d3d..07e8a2ded1 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/versions.json +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/optifine/versions.json @@ -1,7 +1,19 @@ { + "optifine_1_20_1": { + "version": "1.20.1_HD_U_I5", + "sha256": "0mykd1lg37p59c168gi6qpykphqmbzdx3bs4sk9d8kg21aw7ijrp" + }, + "optifine_1_19_4": { + "version": "1.19.4_HD_U_I4", + "sha256": "0smgr2mxk8p7v7xzklj34kzqs36bl1kbb94lq41i1ks1wg50n09c" + }, + "optifine_1_19_3": { + "version": "1.19.3_HD_U_I3", + "sha256": "15xgw12sacq6bqssm1szmmg5gac24rsah2plwky67hi67bj894iv" + }, "optifine_1_19_2": { - "version": "1.19.2_HD_U_H9", - "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx" + "version": "1.19.2_HD_U_I2", + "sha256": "0klhhzmr4l5alkyq8q1ishzach2jip5y6d6d4jk9whcbhia33sxg" }, "optifine_1_19_1": { "version": "1.19.1_HD_U_H9", @@ -12,8 +24,8 @@ "sha256": "19zjvwg0sr6279plj5qxj7hdlw9w8q3qd78dg6911m356z6g87ah" }, "optifine_1_18_2": { - "version": "1.18.2_HD_U_H7", - "sha256": "169ajvw3zrb0xrz2h1z3x6vdr4122s8m3rxb461s8y2fk6i4y9kr" + "version": "1.18.2_HD_U_H9", + "sha256": "0lf16i7hjyral3704kzyhbhrc01crbpzaicsl4cyj6qx15z0lwxx" }, "optifine_1_18_1": { "version": "1.18.1_HD_U_H6", @@ -136,7 +148,7 @@ "sha256": "18lzyh639mi7r2hzwnmxv0a6v1ay7dk9bzasvwff82dxq0y9zi7m" }, "optifine-latest": { - "version": "1.19.2_HD_U_H9", - "sha256": "1xyg98i7zar5x3xbgpn2nm48mc3r9q6yqisxnqk3g254ghjcy4xx" + "version": "1.20.1_HD_U_I5", + "sha256": "0mykd1lg37p59c168gi6qpykphqmbzdx3bs4sk9d8kg21aw7ijrp" } } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix index e7ae7c2819..35de292a36 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/adriconf/default.nix @@ -7,7 +7,7 @@ , libGL , atkmm , pcre -, gtkmm3 +, gtkmm4 , pugixml , mesa , pciutils @@ -15,21 +15,30 @@ stdenv.mkDerivation rec { pname = "adriconf"; - version = "2.5.1"; + version = "2.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RhHmrjb5TvJnZ6R0aefqdmwMBpu4iTrxSHru7JAwrgs="; + sha256 = "sha256-GRmra4P30EW9/WrG84HXYC3Rk4RD+BhuWtsSXvY/5Rk="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm libGL atkmm pcre gtkmm3 pugixml mesa pciutils ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml mesa pciutils ]; cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; + postInstall = '' + install -Dm444 ../flatpak/org.freedesktop.adriconf.metainfo.xml \ + -t $out/share/metainfo/ + install -Dm444 ../flatpak/org.freedesktop.adriconf.desktop \ + -t $out/share/applications/ + install -Dm444 ../flatpak/org.freedesktop.adriconf.png \ + -t $out/share/icons/hicolor/256x256/apps/ + ''; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; description = "A GUI tool used to configure open source graphics drivers"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index f060216935..271d5a5754 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText -, libXdmcp, libXau, lib, openssl }: +, libXdmcp, libXau, lib, openssl +, writeScript +}: stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.3.1"; + version = "3.0.2"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-XWsubjdD1tg0o7x/aoAalemAChehWkwh4fkP2WRvhAw="; + hash = "sha256-9+rUhZVwSzAM9Ko6FYyl2OVvsOFBaUCA1PJs9kaLWaE="; }; nativeBuildInputs = [ jam unzip ]; @@ -120,8 +122,22 @@ stdenv.mkDerivation rec { ''; + passthru = { + updateScript = writeScript "update-argyllcms" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of 'Current Version 3.0.1 (19th October 2023)' + new_version="$(curl -s https://www.argyllcms.com/ | + pcregrep -o1 '>Current Version ([0-9.]+) ')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { - homepage = "http://www.argyllcms.com"; + homepage = "https://www.argyllcms.com/"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; maintainers = []; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index 4403ab255d..dd7ebc6f3b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M="; + sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index a03799b5ed..a5968425f5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -4,7 +4,7 @@ , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3, qtbase, qtsvg, boost , zlib, perl, curl -, texLive, texinfo +, texliveSmall, texinfo , darwin }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv zlib perl curl qtbase qtsvg boost - texLive + (texliveSmall.withPackages (ps: with ps; [ epsf cm-super ps.texinfo media9 ocgx2 collection-latexextra ])) (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix index 4f63cf90a3..0a08e0cd31 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "blockhash"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "commonsmachinery"; repo = "blockhash"; rev = "v${version}"; - sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35"; + sha256 = "sha256-QoqFTCfWtXIrFF3Yx4NfOa9cSjHtCSKz3k3i0u9Qx9M="; }; nativeBuildInputs = [ python3 pkg-config wafHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix index 2fffa3bfa9..f47a2aa961 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -13,7 +13,7 @@ , help2man , pkg-config , perl -, texlive +, texliveSmall }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; - nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texlive.combined.scheme-small ]; + nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texliveSmall ]; preConfigure = '' patchShebangs src/embrace diff --git a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix index 08136f57ef..04c245dbd9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix @@ -1,4 +1,5 @@ { lib, python3Packages, fetchFromGitHub +, ffmpeg-full , gtk3 , pango , gobject-introspection @@ -33,6 +34,8 @@ with python3Packages; buildPythonApplication { outputs = [ "out" "man" ]; + makeWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"]; + postInstall = '' mkdir -p $man/share/man/man1 cp man/escrotum.1 $man/share/man/man1/ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix index 6722e1d781..0f2e11ba59 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/fim/default.nix @@ -11,11 +11,11 @@ gcc9Stdenv.mkDerivation rec { pname = "fim"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz"; - sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp"; + sha256 = "sha256-/p7bjeZM46DJOQ9sgtebhkNpBPj2RJYY3dMXhzHnNmg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix index fe678ba067..633c1202fa 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-dOmkNKURYgphbDHOmzcWf9PsIKMkPyN7ve579BE7fR0="; + hash = "sha256-+h7r6uLRw08c1CHRHxGCdkPYqI10i2Q/Oep617rLhx0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock b/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock index bc5b95bc75..ee579a5e97 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/Cargo.lock @@ -10,29 +10,30 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -44,15 +45,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -68,9 +69,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -105,7 +106,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -157,18 +158,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -287,9 +288,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -315,19 +316,9 @@ dependencies = [ "rgb", ] -[[package]] -name = "gifsicle" -version = "1.93.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2c35b9670c2a3313343ce54d00669ca18a8236fe727f52e0cf8c5a77acac07" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "gifski" -version = "1.12.2" +version = "1.13.0" dependencies = [ "clap", "crossbeam-channel", @@ -336,7 +327,6 @@ dependencies = [ "ffmpeg-next", "gif", "gif-dispose", - "gifsicle", "imagequant", "imgref", "lodepng", @@ -347,7 +337,6 @@ dependencies = [ "quick-error", "resize", "rgb", - "scopeguard", "wild", ] @@ -374,12 +363,11 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9427afad20d287aad11e5981db8beb68d0a20e2e4cbd8280e05f95e05b31668a" +checksum = "84d51957ac48371e8e2eaaeb4eba56150ff2109c1c8c200002afb7dd6e2d260f" dependencies = [ "arrayvec", - "num_cpus", "once_cell", "rayon", "rgb", @@ -388,9 +376,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c" +checksum = "90d944e334f00f4449c9640b440a171f816be0152305c12ef90424fc35fd035c" [[package]] name = "lazy_static" @@ -406,9 +394,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -422,9 +410,9 @@ dependencies = [ [[package]] name = "lodepng" -version = "3.8.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c81862c9e16a943631de5160969379758f13fb3c788110db4ab49430b4feab" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -444,9 +432,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -490,9 +478,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -538,9 +526,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -582,9 +570,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -594,9 +582,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -605,9 +593,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "resize" @@ -663,6 +651,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "thread_local" version = "1.1.7" @@ -799,3 +798,23 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix index ed3c332cc4..53180d0094 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - hash = "sha256-KiedPhlPcFkTiZZfOBlTKqtzU2ND1HXdsfhq+F1MtdU="; + hash = "sha256-Ij+bgL935uLCZeh8GQnTFlPIuUloNCn8LUdvMd+6okM="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix index cbaecdf0b8..fdff56a446 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix @@ -17,7 +17,6 @@ , libtiff , ninja , nix-update -, opencv3 , openexr , pkg-config , qtbase @@ -55,11 +54,11 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.6"; + version = "3.3.1"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; - hash = "sha256-asB1YftHfdb7JG87WJ+ggyMCu7qb0f+aCanl5LLi9VE="; + hash = "sha256-d9FRNW/MXM9ZJ1xgIZvGTUPDDnHgTJU0DuWyPkzNAmo="; }; nativeBuildInputs = [ @@ -78,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libtiff libpng - opencv3 openexr graphicsmagick curl diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index f76919b0bc..f0fa45e59e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, texinfo , cairo, gd, libcerf, pango, readline, zlib -, withTeXLive ? false, texlive +, withTeXLive ? false, texliveSmall , withLua ? false, lua , withCaca ? false, libcaca , libX11 ? null @@ -32,7 +32,7 @@ in buildInputs = [ cairo gd libcerf pango readline zlib ] - ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) + ++ lib.optional withTeXLive texliveSmall ++ lib.optional withLua lua ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index 71892916ad..20b296de80 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "8.1.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-xTdrtwSpizqf5tNRX0Q0w10mEk4S0X7cmxHj3Us14kY="; + hash = "sha256-lLESaULvHkWJjbKjjG9VIcVInqsDmY1OAAKfjCFDThQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index 09050275fe..d98ee8733a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-nbSyWcccu07FZbvOESFhlnuxgTNgJ+/6ujVQvEyQGGo="; + sha256 = "sha256-6sjps0wbB0sTaQtehRmz2KBWxqk3pqJmQs9htqxmJwo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index f4fc086d86..105169c5e0 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.3.5"; + version = "11.4.4"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4636"; - sha256 = "x9q7xhBhpWJfS3fbSEZE7ctnv+gL8U2IMy3GLiTEqag="; + rev = "4784"; + sha256 = "GoO32AWu2s/s1IzehPynCJctc1F98dQhz5cQSXQhu2A="; }; nativeBuildInputs = [ @@ -95,6 +95,10 @@ stdenv.mkDerivation { runHook postConfigure ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index a48f18af51..8f4793edb4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "oxipng"; src = fetchCrate { inherit version pname; - hash = "sha256-stTwsU9XK3lF4q2sDgb9A1KG1NnhCfVxYWRiBvlmiqQ="; + hash = "sha256-1OpSweosYiqtLqCcAw1EsAtBAYVc/VH8kRtVSpmTytM="; }; - cargoHash = "sha256-XMIsdv2AHMGs0tDEWe3cfplZU9CbqEkHd7L5eS+V7j0="; + cargoHash = "sha256-kPdAfqMNOoQPSdv+VLRDUr6AXGPy47UnldXwvpwKp6s="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; - meta = with lib; { + meta = { homepage = "https://github.com/shssoichiro/oxipng"; description = "A multithreaded lossless PNG compression optimizer"; - license = licenses.mit; - maintainers = with maintainers; [ dywedir ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dywedir ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index 5e390ce12c..3216790590 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2022-12-07"; + version = "unstable-2023-08-30"; src = fetchfossil { url = "https://pikchr.org/home"; - rev = "21ca6b843d65c404"; - sha256 = "sha256-fp06GqpLa/szRCS54KJ+SkT602oWvK3KyDFFjTmpNfI="; + rev = "d6f80b1ab30654d5"; + sha256 = "sha256-GEH1qFiMYmNFJnZzLG5rxpl+F7OSRMoVcdo94+mvrlY="; }; # can't open generated html files @@ -44,7 +44,6 @@ stdenv.mkDerivation { dontWrapTclBinaries = true; doCheck = true; - checkTarget = "test"; meta = with lib; { description = "A PIC-like markup language for diagrams in technical documentation"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index 9a33e4282b..73fa81ad60 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = with licenses; [ gpl3Plus hpnd bsd2 ]; mainProgram = "pngquant"; - maintainers = [ maintainers.srapenne ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix index c2da0da0b1..7d0b1abae1 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A command-line screen capture utility"; mainProgram = "scrot"; platforms = platforms.linux; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ ]; license = licenses.mitAdvertising; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 1bf20910cf..642a49c39b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = "sdk-${finalAttrs.version}"; - hash = "sha256-abVqLovvcKBJhGhSCbyD5mc1DSfvh4TWssGxi52ukQ8="; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix index 5952bb615e..27ef2edd0f 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-iN6/VO6EMP9wMoTn4t0y1Oq9XP9Q3UcRNCWsMzI4Fn8="; + hash = "sha256-Xy1ID2/M3v9/ZEo8fWEDlJ8+cmgAMdHhs27xDfe8IYQ="; }; - cargoHash = "sha256-Xxb8DeTAmw0Pq4mrLVcpEuzq7/SX+AlUSWoA2dcVQJA="; + cargoHash = "sha256-l3671zvqSM4CY7lOXOur0Q6PBDVf6jXnhZ/8kADWQz4="; buildFeatures = [ "cli" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix index 60e7e7221a..8159831264 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix @@ -24,8 +24,6 @@ , wayland-protocols , enableX11 ? stdenv.isLinux , xorg -, withoutStdRanges ? stdenv.isDarwin -, range-v3 }: stdenv.mkDerivation rec { @@ -69,8 +67,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableX11 [ xorg.libX11 xorg.xcbutilimage - ] ++ lib.optionals withoutStdRanges [ - range-v3 ]; cmakeFlags = lib.optionals (!enableOpencv) [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 1a2e9cb3b1..c16ba635f5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -18,7 +18,6 @@ , libexif , librsvg , poppler -, libgsf , libtiff , fftw , lcms2 @@ -26,7 +25,6 @@ , libimagequant , imagemagick , pango -, orc , matio , cfitsio , libwebp @@ -36,19 +34,23 @@ , openslide , libheif , cgif +, libarchive +, libhwy +, testers +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.14.5"; + version = "8.15.0"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; - rev = "v${version}"; - hash = "sha256-fG3DTP+3pO7sbqR/H9egJHU3cLKPU4Jad6qxcQ9evNw="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WfKq+maLcAXyjk1sq66wSU92ALv4MfRDPKe4Mki0KRQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -76,7 +78,6 @@ stdenv.mkDerivation rec { libexif librsvg poppler - libgsf libtiff fftw lcms2 @@ -84,7 +85,6 @@ stdenv.mkDerivation rec { libimagequant imagemagick pango - orc matio cfitsio libwebp @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { openslide libheif cgif + libarchive + libhwy ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file @@ -109,12 +111,29 @@ stdenv.mkDerivation rec { ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "vips --version"; + }; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v([0-9.]+)" ]; + }; + }; + meta = with lib; { - changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; - homepage = "https://libvips.github.io/libvips/"; + changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; + homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ kovirobi ]; + maintainers = with maintainers; [ kovirobi anthonyroussel ]; + pkgConfigModules = [ "vips" "vips-cpp" ]; platforms = platforms.unix; + mainProgram = "vips"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix index e448160f2a..aba088a112 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix @@ -37,17 +37,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.6.3"; + version = "1.3.7.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-jpKPmUduH3IuUYzBAZJFl/w1FqjGC8sXSTnet8YEZ0I="; + hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E="; }; - outputs = [ "out" "lib" ]; - prePatch = '' mkdir -p external/renderdoc/src @@ -92,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mv $out $lib + # Check that nothing was installed so far + ! test -e $out mkdir -p $out/bin $out/archive-dir cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix index 24d2c9de38..59480657da 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -4,8 +4,8 @@ rec { ESExtractor = fetchFromGitHub { owner = "Igalia"; repo = "ESExtractor"; - rev = "v0.2.5"; - hash = "sha256-A3lyTTarR1ZJrXcrLDR5D7H1kBwJNyrPPjEklRM9YBY="; + rev = "v0.3.3"; + hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ="; }; amber = fetchFromGitHub { @@ -18,8 +18,8 @@ rec { glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "77417d5c9e0a5d4c79ddd0285d530b45f7259f0d"; - hash = "sha256-BNgnhTl7/+nC5D7Jl7QME5+qIbm+I0Wh/tf9F4WhW3U="; + rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"; + hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU="; }; jsoncpp = fetchFromGitHub { @@ -29,45 +29,45 @@ rec { hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI="; }; + nvidia-video-samples = fetchFromGitHub { + owner = "Igalia"; + repo = "vk_video_samples"; + rev = "cts-integration-0.9.9-1"; + hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E="; + }; + spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db"; - hash = "sha256-VOq3r6ZcbDGGxjqC4IoPMGC5n1APUPUAs9xcRzxdyfk="; + rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"; + hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "01828dac778d08f4ebafd2e06bd419f6c84e5984"; - hash = "sha256-i1rDMVpUiNdacDe20DsN67/rzK5V434EzfSv97y+xGU="; - }; - - video-parser = fetchFromGitHub { - owner = "nvpro-samples"; - repo = "vk_video_samples"; - rev = "7d68747d3524842afaf050c5e00a10f5b8c07904"; - hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU="; + rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"; + hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "9fff8b252a3688c0231fa78709084bbe677d3bf7"; - hash = "sha256-KpKsKTY5xCSZ5Y92roa0fq/iqc1hVJNS7l87RFcxyRQ="; + rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"; + hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY="; }; prePatch = '' - mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/spirv-headers external/spirv-tools external/video-parser external/vulkan-docs + mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs cp -r ${ESExtractor} external/ESExtractor/src cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src cp -r ${jsoncpp} external/jsoncpp/src + cp -r ${nvidia-video-samples} external/nvidia-video-samples/src cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-tools} external/spirv-tools/src - cp -r ${video-parser} external/video-parser/src cp -r ${vulkan-docs} external/vulkan-docs/src ''; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 96edbcad83..dae55225a0 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, jq, libX11, libXrandr, libxcb, wayland }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland }: stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "v${version}"; - hash = "sha256-MeW7mmbjgqEvXEnAYzTNu4omC4fqq1fplIVjDpV2LcA="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-rSKPTeTDOz6IeJGRt9aIu1VH8VfVzXNYZfjdiSXEJxg="; }; nativeBuildInputs = [ cmake pkg-config jq ]; - buildInputs = [ vulkan-headers libX11 libXrandr libxcb wayland ]; + buildInputs = [ vulkan-headers vulkan-utility-libraries libX11 libXrandr libxcb wayland ]; # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 072876e46d..ab593a9bc4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -16,23 +16,22 @@ , which , xcbutilkeysyms , xcbutilwm +, valijson , vulkan-headers , vulkan-loader -, symlinkJoin -, vulkan-validation-layers +, vulkan-utility-libraries , writeText }: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; - rev = "v${version}"; - hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA="; - fetchSubmodules = true; + rev = "vulkan-sdk-${version}"; + hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config ]; @@ -45,6 +44,10 @@ stdenv.mkDerivation rec { libXrandr libffi libxcb + valijson + vulkan-headers + vulkan-loader + vulkan-utility-libraries wayland xcbutilkeysyms xcbutilwm @@ -52,27 +55,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" - "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}" - "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${ - symlinkJoin { - name = "vulkan-validation-layers-merged"; - paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; - } - }" - # Hide dev warnings that are useless for packaging - "-Wno-dev" ]; preConfigure = '' - # We need to run this update script which generates some source files, - # Remove the line in it which calls 'git submodule update' though. - # Also patch the scripts in ./scripts - update=update_external_sources.sh - patchShebangs $update patchShebangs scripts/* - sed -i '/^git /d' $update - ./$update - substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; @@ -85,13 +71,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ - ./gtest.patch - ]; - - # Same as vulkan-validation-layers - dontPatchELF = true; - # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch deleted file mode 100644 index cf062a8591..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt -index e7df8ec53d..869bfcb716 100644 ---- a/external/googletest/googlemock/CMakeLists.txt -+++ b/external/googletest/googlemock/CMakeLists.txt -@@ -111,10 +111,10 @@ endif() - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gmock SYSTEM INTERFACE - "$" -- "$/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$") - target_include_directories(gmock_main SYSTEM INTERFACE - "$" -- "$/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$") - endif() - - ######################################################################## -diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt -index abdd98b79a..7ae174d566 100644 ---- a/external/googletest/googletest/CMakeLists.txt -+++ b/external/googletest/googletest/CMakeLists.txt -@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest SYSTEM INTERFACE - "$" -- "$/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$") - target_include_directories(gtest_main SYSTEM INTERFACE - "$" -- "$/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$") - endif() - target_link_libraries(gtest_main PUBLIC gtest) - diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 9327bd9c9d..e148f51d86 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; - rev = "v${version}"; - hash = "sha256-C5FVkI9F/dgIS8qp7VaOn9J2zoNLb1PnmgAemsVO6zM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-IsMxiAR4ak6kC3BNYhtI+JVNkEka4ZceSElxk39THXg="; }; nativeBuildInputs = [ @@ -57,27 +57,19 @@ stdenv.mkDerivation rec { Cocoa ]; - libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; - - patches = [ - # Vulkan-Tools expects to find the MoltenVK ICD and `libMoltenVK.dylib` in its source repo. - # Patch it to use the already-built binaries and ICD in nixpkgs. - ./use-nix-moltenvk.patch - ]; - - # vkcube.app and vkcubepp.app require `ibtool`, but the version in `xib2nib` is not capable of - # building these apps. Build them using `ibtool` from Xcode, but don’t allow any other binaries - # into the sandbox. Note that the CLT are not supported because `ibtool` requires Xcode. - sandboxProfile = lib.optionalString stdenv.isDarwin '' - (allow process-exec - (literal "/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild")) - (allow file-read*) - (deny file-read* (subpath "/usr/local") (with no-log)) - (allow file-write* (subpath "/private/var/folders")) + postPatch = lib.optionalString stdenv.isDarwin '' + # Modify mac_common.cmake to find the ICD where nixpkgs puts it. + substituteInPlace mac_common.cmake \ + --replace MoltenVK/icd/MoltenVK_icd.json MoltenVK_icd.json + # Remove the unconditional check for `ibtool` since the cube demo that needs it won’t be built. + sed -e '/#.*Interface Builder/,/^endif()/d' -i mac_common.cmake + # Install `vulkaninfo` to $out/bin even on Darwin. + substituteInPlace vulkaninfo/CMakeLists.txt \ + --replace 'install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")' 'install(TARGETS vulkaninfo)' ''; + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + dontPatchELF = true; cmakeFlags = [ @@ -91,7 +83,8 @@ stdenv.mkDerivation rec { "-Wno-dev" ] ++ lib.optionals stdenv.isDarwin [ "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" - "-DIBTOOL=/usr/bin/ibtool" + # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. + "-DBUILD_CUBE=OFF" ]; meta = with lib; { @@ -102,7 +95,6 @@ stdenv.mkDerivation rec { use of the Vulkan API. ''; homepage = "https://github.com/KhronosGroup/Vulkan-Tools"; - hydraPlatforms = [ "x86_64-linux" "i686-linux" ]; platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch deleted file mode 100644 index 5d09bff9c9..0000000000 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt -index a2f026e7..327f5dba 100644 ---- a/cube/CMakeLists.txt -+++ b/cube/CMakeLists.txt -@@ -257,14 +257,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcube BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcube BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -@@ -302,14 +295,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcubepp BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcubepp BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake -index 9b823f95..0c43a2c9 100644 ---- a/cube/macOS/cube/cube.cmake -+++ b/cube/macOS/cube/cube.cmake -@@ -72,12 +72,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake -index eae4de3c..e528ae26 100644 ---- a/cube/macOS/cubepp/cubepp.cmake -+++ b/cube/macOS/cubepp/cubepp.cmake -@@ -74,12 +74,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/mac_common.cmake b/mac_common.cmake -index bad3c414..b498906d 100644 ---- a/mac_common.cmake -+++ b/mac_common.cmake -@@ -23,9 +23,8 @@ set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT}) - # MoltenVK JSON File - - execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json) --execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json -- OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) -+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) - - # ~~~ - # Modify the ICD JSON file to adjust the library path. -@@ -36,10 +35,9 @@ execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]* - # ~~~ - add_custom_target(MoltenVK_icd-staging-json ALL - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json -- COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -- VERBATIM -- DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json") -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -+ DEPENDS "${MOLTENVK_DIR}/MoltenVK_icd.json") - set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE) - - find_library(COCOA NAMES Cocoa) -diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt -index d23dcf89..32aa0ebb 100644 ---- a/vulkaninfo/CMakeLists.txt -+++ b/vulkaninfo/CMakeLists.txt -@@ -136,9 +136,5 @@ elseif(APPLE) - add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT) - endif() - --if(APPLE) -- install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo") --else() -- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --endif() -+install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - diff --git a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 56fe4e122e..f936ab83fb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL +{ cmake, fetchFromGitHub, makeWrapper, opencv4, lib, stdenv, ocl-icd, opencl-headers, OpenCL , config , cudaSupport ? config.cudaSupport, cudatoolkit ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opencv3 + opencv4 ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional stdenv.isDarwin OpenCL ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix index b05aa13ea6..9c7093b58f 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wdisplays/default.nix @@ -1,24 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, libepoxy, wayland, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wdisplays"; - version = "unstable-2021-04-03"; + version = "1.1.1"; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 libepoxy wayland ]; src = fetchFromGitHub { - owner = "luispabon"; + owner = "artizirk"; repo = "wdisplays"; - rev = "7f2eac0d2aa81b5f495da7950fd5a94683f7868e"; - sha256 = "sha256-cOF3+T34zPro58maWUouGG+vlLm2C5NfcH7PZhSvApE="; + rev = finalAttrs.version; + sha256 = "sha256-dtvP930ChiDRT60xq6xBDU6k+zHnkrAkxkKz2FxlzRs="; }; - patchPhase = '' - substituteInPlace ./resources/wdisplays.desktop.in --replace "@app_id@" "wdisplays" - ''; - meta = with lib; { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/luispabon/wdisplays"; @@ -27,4 +23,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "wdisplays"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock b/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock deleted file mode 100644 index 437ec68557..0000000000 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/Cargo.lock +++ /dev/null @@ -1,596 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "advancedresearch-tree_mem_sort" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab032c118518f4bd1bd8f9efd22a60a7d153a7eafd2ed9709fc224ce4186094" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" - -[[package]] -name = "bitflags" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[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 = "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 = "dyon" -version = "0.47.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d15155013e10adf698bcad154b122132abede1195ad2a33cc83ecbf6fd96e7" -dependencies = [ - "advancedresearch-tree_mem_sort", - "lazy_static", - "piston_meta", - "range", - "read_color", - "read_token", - "vecmath", -] - -[[package]] -name = "evdev" -version = "0.10.1" -source = "git+https://github.com/valpackett/evdev?branch=uinput#4b905750a2103787e3e84241c60aaa79deb7c20c" -dependencies = [ - "bitflags 0.8.2", - "fixedbitset", - "libc", - "nix 0.9.0", - "num 0.1.42", - "strum", - "strum_macros", -] - -[[package]] -name = "evscript" -version = "0.0.0" -dependencies = [ - "clap", - "dyon", - "evdev", - "nix 0.25.0", - "num 0.4.0", - "rusty-sandbox", - "serde", - "serde_derive", - "toml", -] - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[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.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nix" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" -dependencies = [ - "bitflags 0.9.1", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "nix" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset", - "pin-utils", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint 0.1.44", - "num-complex 0.1.43", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint 0.4.3", - "num-complex 0.4.2", - "num-integer", - "num-iter", - "num-rational 0.4.1", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits", - "rand", - "rustc-serialize", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-complex" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" -dependencies = [ - "num-traits", -] - -[[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-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint 0.4.3", - "num-integer", - "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 = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piston-float" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad78bf43dcf80e8f950c92b84f938a0fc7590b7f6866fbcbeca781609c115590" - -[[package]] -name = "piston_meta" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030240ae8cdfabe396630db10cfa80f6965aa45d4c505dc0890b98ba808e149f" -dependencies = [ - "lazy_static", - "range", - "read_token", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "range" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b851d7223b2adbc5d30dea12eeaf45dd58c81559656e056d31ff7d5407ba6f1" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "read_color" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da" - -[[package]] -name = "read_token" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051fef16f3ac50a9eacfd64de43e909016df6b722d70b2a6e73eb83c1e891638" -dependencies = [ - "range", -] - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rusty-sandbox" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0be1328117ff55cebdb605c82e7356b8d9d19f8bcdb2a615805298973c73e4" -dependencies = [ - "libc", - "unix_socket", -] - -[[package]] -name = "serde" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" - -[[package]] -name = "serde_derive" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strum" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da" - -[[package]] -name = "strum_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8" -dependencies = [ - "quote 0.3.15", - "syn 0.11.11", -] - -[[package]] -name = "syn" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -dependencies = [ - "quote 0.3.15", - "synom", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -dependencies = [ - "proc-macro2", - "quote 1.0.21", - "unicode-ident", -] - -[[package]] -name = "synom" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[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.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" - -[[package]] -name = "unix_socket" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" -dependencies = [ - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "vecmath" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ae1e0d85bca567dee1dcf87fb1ca2e792792f66f87dced8381f99cd91156a" -dependencies = [ - "piston-float", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[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/tools/inputmethods/evscript/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix index aecfaf9492..d1440bea35 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/evscript/default.nix @@ -2,22 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "evscript"; - version = "unstable-2022-11-20"; + version = "0.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "valpackett"; repo = pname; - rev = "ba997c9723a91717c683f08e9957d0ecea3da6cd"; - sha256 = "sha256-wuTPcBUuPK1D4VO8BXexx9AdiPM+X0TkJ3G7b7ofER8="; + rev = version; + hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "evdev-0.10.1" = "sha256-iIzKhlA+7qg+nNwP82OIpoXVUEYU31iSEt1KJA3EewQ="; - }; - }; + cargoHash = "sha256-KcQZnGFtev4ckhtQ7CNB773fAsExZ9EQl9e4Jf4beGo="; meta = with lib; { homepage = "https://codeberg.org/valpackett/evscript"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/evsieve/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/evsieve/default.nix new file mode 100644 index 0000000000..de18668e74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/evsieve/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, libevdev +}: + +rustPlatform.buildRustPackage rec { + pname = "evsieve"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "KarsMulder"; + repo = "evsieve"; + rev = "v${version}"; + hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g="; + }; + + cargoHash = "sha256-Bug25xK3YYQ3YjrUXlgWaVUPn87V3N/8XikqwYL/sUg="; + + buildInputs = [ libevdev ]; + + doCheck = false; # unit tests create uinput devices + + meta = with lib; { + description = "A utility for mapping events from Linux event devices"; + homepage = "https://github.com/KarsMulder/evsieve"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tsowell ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index 136550548e..cedbb1b9f2 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -8,6 +8,7 @@ , extra-cmake-modules , cairo , pango +, expat , fribidi , fmt , wayland @@ -29,6 +30,7 @@ , libdatrie , xcbutilkeysyms , pcre +, xcbutil , xcbutilwm , xcb-imdkit , libxkbfile @@ -43,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.1"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-R8stzpfQttBZFFSu8ikUz/2eL+b98/X672uVFsha9H0="; + hash = "sha256-HclPnxeDtWzlyOEXKgTrypiHVJezuUCBhfUW+9ytPVg="; }; prePatch = '' @@ -63,6 +65,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + expat fmt isocodes cairo @@ -84,6 +87,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon pcre + xcbutil xcbutilwm xcbutilkeysyms xcb-imdkit diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index 0e1a5fa959..7069cfe017 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz"; - sha256 = "sha256-kUelkzVr1zOC4bbNP2EFPnhtygkJnKCFdlHeSkBGLGw="; + sha256 = "sha256-7kKHes8jacDQcOQsngstzTrRoc81ybQoSyrY4s8KPSg="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 4facccf49f..47d7dfad6b 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Zjwt7JHwCfXlY46qRTXSmXI69fANZNI7DY1ixpMEqPM="; + sha256 = "sha256-boIkbtNLPTNXY9e5gdQklhJuDU36ZswOqY2X8nRKqho="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index bcb1a6ac50..50c944f85f 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-XC8NQYVvGhh6GFrKtJi9GeBHxWrtw9DJzeeDvKAQEdk="; + sha256 = "sha256-DrgZlj3SUR1lFVvDXoCKvil22YRW6YJkGwihdGdWaHM="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 264587f3e7..c0bfdc61b3 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-5f75UTGCWsuMdZKhssSpUiVaRR05YY0bumVUNq2wJtY="; + sha256 = "sha256-DtMskuPpiL1GshoUH1dDazvwHDhmr9gb93V3TRIMxxg="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 0dfa9f822a..78e43f7850 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-xVBmFFUnlWqviht/KGFTHCd3xCln/6hyBG72tIHqopc="; }; + outputs = [ "out" "dev" ]; + cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 84d9c398cd..9a1a2c8eca 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3cJLF80oAqGSJvPPyKcHxaWysA9RtWYGgptailYd4dk="; + sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e922bc533c..a532a447a1 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -9,17 +9,18 @@ , libXdmcp , qtbase , qt6 +, wayland }: mkDerivation rec { pname = "fcitx5-qt"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI="; + sha256 = "sha256-qXQ5nvPV5YHD8MFfeqgF8kyk0zf28lWxM8SUo3T6TzA="; }; preConfigure = '' @@ -31,7 +32,7 @@ mkDerivation rec { cmakeFlags = [ # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase}" + "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" "-DENABLE_QT4=0" "-DENABLE_QT6=1" ]; @@ -46,6 +47,7 @@ mkDerivation rec { qtx11extras libxcb libXdmcp + wayland ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 0e62a1ae36..29cbd2e3dc 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-0WcBM6kOKATuh6I8yEzl+HkK5/k4Ku6brZ+s1ncKlpw="; + hash = "sha256-qFojAwwR6lqP7RKSJ3LPAxDEscjKJ6wNZFpdlwz+QzM="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index deef4a8f87..ab71af9574 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.14"; + version = "1.5.15"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-yGlNoY0LiRpI9NdaDezjfsvKbRsay2QQGnqEytEEbZs="; + sha256 = "sha256-WMTm1YNqSsnjOqnoTljE3rZ62pjztUSyRAxXgyN+2Ys="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 19d5b1b969..cb19026173 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.22"; + version = "1.4.23"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-wjWDqhhLqj77IxVpelChOEdUtneaGmL+IK2Sp3eObkA="; + sha256 = "sha256-7bmWyk7A+dXu1jjD5j9P/w88PVqPnNSxE1Kgj+Xpvyg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 30dcfb864c..52b50b7cbb 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.1"; + version = "2.24.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-gG2wuoJoEOsnvcPJkravpsJ746/0r9wAEo2Vft3bEoo="; + hash = "sha256-f/KtHm8R1MJORWKmv487hm80MeX2l0Ybd1ZjKHGFq0A="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix index a0c92765c1..b9517722a0 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-c0AiXr0dqlCNRlZxaEU9Tv7ZwPKajxY+eiI1zCb3hKs="; + hash = "sha256-QgrMkGja8kMhXUE/kvPMq66xv/9tE/mEphlaEyDPHnM="; }; # all the following must be in nativeBuildInputs 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 dde07fc971..b9384469e9 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.74"; + version = "2.76"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "sha256-uBABs2FPvF+HO+VSNvz2F0Bc9Ja8ek1ULiu89/wvTv4="; + sha256 = "sha256-Tb/gQ/2Ul4JzEiLEUPJBj9T6ZAqzMSPdgiofdnDj73Q="; }; patches = [ ./0001-hardcode-name.patch diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index b69db13176..7ef25a43ec 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uydt95mK0395dHvEno2SCnmKMJSkQ4TL7k7gnyoXlO0="; + sha256 = "sha256-EfZ8h65jFVdy/U7I2YDoIMHgnnYpUcrOYUAMCPOmK6U="; }; buildInputs = [ libXi libXrandr libXt libXtst ]; tags = [ "portal,x11" ]; - vendorHash = "sha256-SYh1MhJUrJKguR12L3yyxHoBB6ux6a4TUJyPvoYx7iU="; + vendorHash = "sha256-UX366UWROeorwYV4l1A3R03J10Gm7EajM+wEczIJEJM="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix b/third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix index 053f5b90e8..db11d391d7 100644 --- a/third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "heygpt"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fuyufjh"; repo = pname; rev = "v${version}"; - hash = "sha256-Gtbb0G7tV+cjbq/74dnZKIwWZgNfSJl0My6F4OmAdhU="; + hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM="; }; - cargoSha256 = "sha256-ON6+gU+KsI2QFQjwxPRcbMClaAGrjVJ33mVuf0jSro8="; + cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE="; nativeBuildInputs = [openssl]; diff --git a/third_party/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix b/third_party/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix index bba449acdc..b8624fdc48 100644 --- a/third_party/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix @@ -4,7 +4,7 @@ , semgrep }: let - version = "0.1.7"; + version = "0.1.11"; in python3.pkgs.buildPythonApplication { pname = "open-interpreter"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication { owner = "KillianLucas"; repo = "open-interpreter"; rev = "v${version}"; - hash = "sha256-U+GKvlFY9vkjXaPI0H5RsoMFLlLq1+IuSy/cOj/LNSw="; + hash = "sha256-viUMGUBy5UNWag6P8tXE4TcJIx53Q/tASNV3bmCCK0g="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication { gitpython huggingface-hub inquirer + jinja2 litellm openai # pyreadline3 # this is a windows deps @@ -36,6 +37,7 @@ python3.pkgs.buildPythonApplication { rich six tiktoken + tokenizers tokentrim wget yaspin diff --git a/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix index 945abf1f23..6ec48a78fc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-E/QslRDeifFHlHUELv9rYHjfCAB1yXXiXlWOyPNkfps="; + hash = "sha256-KY8GUUPZyb89b9mGd+EuYP8M7bKxt7oKQfaaX1R4BTE="; }; - cargoHash = "sha256-7TTHBeZ68G6k5eHBL1zDGsYiTyx27fBbN7Rl9AiZTng="; + cargoHash = "sha256-YTLiJ8/aTN3d2xkEqtiyP47KeDK88I2Raix8kmddDNE="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix index 6276d50c73..891bea3fe4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, cmake, pkg-config, perl, go, python3 +, cmake, ninja, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: @@ -9,33 +9,17 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "34.0.1"; + version = "34.0.4"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw="; + hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E="; }; - patches = [ - # Fix building with newer protobuf versions. - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/295ad7d5cb1e3b4c75bd40281d827f9168bbaa57/protobuf-23.patch"; - hash = "sha256-KznGgZdYT6e5wG3gtfJ6i93bYfp/JFygLW/ZzvXUA0Y="; - }) - ]; - - # Fix linking with private abseil-cpp libraries. - postPatch = '' - sed -i '/^find_package(Protobuf REQUIRED)$/i find_package(protobuf CONFIG)' vendor/CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake pkg-config perl go ]; + nativeBuildInputs = [ cmake ninja pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; - # Don't try to fetch any Go modules via the network: - GOFLAGS = [ "-mod=vendor" ]; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix index c9a647d000..793e06fb3d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/archi/default.nix @@ -1,31 +1,33 @@ { lib, stdenv , fetchurl -, fetchzip , autoPatchelfHook , makeWrapper , jdk , libsecret , webkitgtk , wrapGAppsHook +, _7zz +, nixosTests }: stdenv.mkDerivation rec { pname = "Archi"; - version = "4.7.1"; + version = "5.2.0"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz"; - sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchzip { - url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip"; - sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc"; - } - else - throw "Unsupported system"; + src = { + "x86_64-linux" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Linux64-${version}.tgz"; + hash = "sha256-uGW4Wl3E71ZCgWzPHkmXv/PluegDF8C64FUQ7C5/SDA="; + }; + "x86_64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-${version}.dmg"; + hash = "sha256-GI9aIAYwu60RdjN0Y3O94sVMzJR1+nX4txVcvqn1r58="; + }; + "aarch64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg"; + hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system"); buildInputs = [ libsecret @@ -34,7 +36,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook - ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + _7zz + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + + unpackPhase = if stdenv.hostPlatform.isDarwin then '' + 7zz x $src + '' else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -55,6 +65,8 @@ stdenv.mkDerivation rec { mv Archi.app "$out/Applications/" ''; + passthru.tests = { inherit (nixosTests) archi; }; + meta = with lib; { description = "ArchiMate modelling toolkit"; longDescription = '' @@ -65,6 +77,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ earldouglas ]; + maintainers = with maintainers; [ earldouglas paumr ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix index 667e134056..2643cdd474 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "asciinema"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - hash = "sha256-1B2A2lfLeDHgD4tg3M5IIyHxBQ0cHuWDrQ3bUKAIFlc="; + hash = "sha256-UegLwpJ+uc9cW3ozLQJsQBjIGD7+vzzwzQFRV5gmDmI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix index 8d773f62a4..61da92e88d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/atuin/default.nix @@ -4,6 +4,7 @@ , installShellFiles , rustPlatform , libiconv +, AppKit , Security , SystemConfiguration , nixosTests @@ -11,24 +12,24 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "16.0.0"; + version = "17.0.1"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; rev = "v${version}"; - hash = "sha256-Kh6aaWYV+ZG7Asvw5JdGsV+nxD+xvvQab5wLIedcQcQ="; + hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM="; }; # TODO: unify this to one hash because updater do not support this cargoHash = if stdenv.isLinux - then "sha256-Ami88ScGj58jCCat4MMDvjZtV5WglmrlggpQfo+LPjs=" - else "sha256-HQMZ9w1C6go16XGrPNniQZliIQ/5yAp2w/uUwAOQTM0="; + then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs=" + else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv AppKit Security SystemConfiguration ]; postInstall = '' installShellCompletion --cmd atuin \ @@ -44,6 +45,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # tries to make a network access "--skip=registration" + # No such file or directory (os error 2) + "--skip=sync" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix index f83a87a75b..e7f073451b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix @@ -1,28 +1,63 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.4"; + version = "0.2.5"; + pyproject = true; src = fetchFromGitHub { owner = "mkb79"; - repo = pname; + repo = "audible-cli"; rev = "refs/tags/v${version}"; - sha256 = "sha256-umIPHKPfWKlzEVyRKbBqmul/8n13EnpfYXmSQbQtLq8="; + hash = "sha256-YGvnye6YSp/H/2HAw6A8z5VzzCqa3ktJucq+3cXPUpc="; }; - propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + setuptools + ] ++ [ + installShellFiles + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "httpx>=0.20.0,<0.24.0" "httpx" \ - --replace "audible>=0.8.2" "audible" + propagatedBuildInputs = with python3Packages; [ + aiofiles + audible + click + httpx + packaging + pillow + questionary + tabulate + toml + tqdm + ]; + + pythonRelaxDeps = [ + "httpx" + "audible" + ]; + + postInstall = '' + export PATH=$out/bin:$PATH + installShellCompletion --cmd audible \ + --bash <(source utils/code_completion/audible-complete-bash.sh) \ + --fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \ + --zsh <(source utils/code_completion/audible-complete-zsh-fish.sh) ''; + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "audible_cli" + ]; + meta = with lib; { description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mkb79/audible-cli"; + changelog = "https://github.com/mkb79/audible-cli/blob/${src.rev}/CHANGELOG.md"; maintainers = with maintainers; [ jvanbruegge ]; + mainProgram = "audible"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index ee1d307af4..cc196de623 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; + maintainers = with maintainers; [ coroa ]; platforms = platforms.unix; mainProgram = "autorandr"; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index fdcdde0c04..516e35a082 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.222"; + version = "1.223"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-zGd2t2Qtec8Up1SHAizZp8l/fhFpa0Y1UJbB8XanX6Q="; + sha256 = "sha256-T9tj91mLB3PNRmJs75ohGjvBt1C5wotQr++MCdmyWBI="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 69b5c53bd2..aa8e9ac6a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHoo stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.33.1"; + version = "2.33.3"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-vFXpZNvsXpz7saRp6ruhvsP50rmJ2Prr2M78+8oxQ9M="; + sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix index cacebb9399..10aec38343 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/xmlbird.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xmlbird"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz"; - sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04"; + sha256 = "sha256-qygvJC1glSfvwWL7oQPFykgitvnWXwHMhycSjSBGksU="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix index 8cb5d6fcba..db243a185f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix @@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "spacemeowx2"; repo = "blflash"; rev = "v${version}"; - sha256 = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; + hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoSha256 = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; + cargoHash = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; meta = with lib; { description = "An bl602 serial flasher written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix index 8bf9ed26a7..4a0a4fe0a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-I7VQfLCD+nfFllbns7yjYMl9hNwM8AgUbiHte4vMciM="; + hash = "sha256-BxI2Ju1I1IytCjx6vUoIy1jzebSeRmoObDEtN/sBEDg="; }; - cargoHash = "sha256-xtyiJZ9jPP2M0pUpMwQlUa9QgsRhFLqEm+hE3K4WO88="; + cargoHash = "sha256-ZEQsCm13MoFtpIjjtD5UANH5zrPDX4IjEmqJLwnftps="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index 39790d6538..de0fd1a115 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-IqDcE6P4DSH/A4TKzPoLZsO00t0zGPCutM0yVI41nrM="; + hash = "sha256-yZsb/G+8XoJS4Fg6WFuEk1v3Ht5i3G3p+sKi+Z3jeGU="; }; - cargoHash = "sha256-Lo/O/q2kGioWxkRJ/c9jWAHSm2Y839RsK4NM4qP576c="; + cargoHash = "sha256-xHmrFIXXkuhYGApgNoJxcL1Kpf8ellwQgiH8AEZvDRU="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix index 16c858fc58..c90fc3914d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2022-08-03"; - format = "setuptools"; + version = "unstable-2023-08-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; - repo = pname; - rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; + repo = "cc2538-bsl"; + rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; }; patches = [ - # https://github.com/JelmerT/cc2538-bsl/pull/138 (fetchpatch { - name = "clean-up-install-dependencies.patch"; - url = "https://github.com/JelmerT/cc2538-bsl/commit/bf842adf8e99a9eb8528579e5b85e59ee23be08d.patch"; - hash = "sha256-XKQ0kfl8yFrSF5RosHY9OvJR18Fh0dmAN1FlfZ024ME="; + # fix extras specification in setup.py; https://github.com/JelmerT/cc2538-bsl/pull/143 + url = "https://github.com/JelmerT/cc2538-bsl/commit/c70f58ec0222357db8020176711d6d45cf24da35.patch"; + hash = "sha256-Rxm/TRcm87WgRfq60cu0loyrbJmZou09XYR7uhrhhj8="; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix index 55ccb7f774..e7a01795f0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ccal/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "ccal"; version = "2.5.3"; src = fetchurl { - url = "http://ccal.chinesebay.com/ccal/${pname}-${version}.tar.gz"; + url = "https://ccal.chinesebay.com/${pname}-${version}.tar.gz"; sha256 = "sha256-PUy9yfkFzgKrSEBB+79/C3oxmuajUMbBbWNuGlpQ35Y="; }; @@ -25,11 +25,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://ccal.chinesebay.com/ccal.htm"; + homepage = "https://ccal.chinesebay.com/ccal.htm"; description = "Command line Chinese calendar viewer, similar to cal"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ sharzy ]; platforms = lib.platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index 70e6aa04e6..8ac51a4821 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-9aGN3TP4bMz4V0MRrNFxMm16k9RfvU5iDVwe+Ws4Ask="; + sha256 = "sha256-4thb0AFlSYQ90SkdyTSiFUc6vTRpt6KX2nH/thMuv4o="; }; - vendorHash = "sha256-fswT6t2LP6gRmCHrSHVJGdNc6gic3rMSrE+STe5oiyQ="; + vendorHash = "sha256-bfxF0qlEbZDczEuFhckqsG00/IzuM18ut/AQ9EMwdh0="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 9f75753e89..88812357a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.40.0"; + version = "2.40.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-0FzhIsCsOVoQpxpxl83Ei8v8ANbanltLi5nvOt0kWsA="; + hash = "sha256-PtIT2PS88jkX/ERHYKRwhvCnCnlAP0lM0FDv74zi32M="; }; - vendorHash = "sha256-941uw/7NoVnW3Ul5bAJLyvQ+RrNoiUVJHpKlfkiGT8c="; + vendorHash = "sha256-O9Ywq8LunS/0yBX9p9M2mzm+auvX1ynYaAY4EoBaE94="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index f9309ecf81..549cb543af 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, substituteAll, udev, stdenv +{ lib, wrapQtAppsHook, fetchFromGitHub, substituteAll, udev, stdenv , pkg-config, qtbase, cmake, zlib, kmod, libXdmcp, qttools, qtx11extras, libdbusmenu -, withPulseaudio ? stdenv.isLinux, libpulseaudio +, withPulseaudio ? stdenv.isLinux, libpulseaudio, quazip }: -mkDerivation rec { - version = "0.5.0"; +stdenv.mkDerivation rec { + version = "0.6.0"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "sha256-yR1myagAqavAR/7lPdufcrJpPmXW7r4N4pxTMF6NbuE="; + hash = "sha256-G0cvET3wMIi4FlBmaTkdTyYtcdVGzK4X0C2HYZr43eg="; }; buildInputs = [ @@ -22,9 +22,11 @@ mkDerivation rec { qttools qtx11extras libdbusmenu + quazip ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ + wrapQtAppsHook pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix deleted file mode 100644 index 48783fddd6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "cloud-sql-proxy"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "GoogleCloudPlatform"; - repo = "cloud-sql-proxy"; - rev = "v${version}"; - hash = "sha256-4PB9Eaqb8teF+gmiHD2VAIFnxqiK2Nb0u+xSNAM8iMs="; - }; - - subPackages = [ "." ]; - - vendorHash = "sha256-LaI7IdSyB7ETTjqIcIPDf3noEbvwlN3+KqrkSm8B6m8="; - - preCheck = '' - buildFlagsArray+="-short" - ''; - - meta = with lib; { - description = "Utility for ensuring secure connections to Google Cloud SQL instances"; - homepage = "https://github.com/GoogleCloudPlatform/cloud-sql-proxy"; - license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski totoroot ]; - mainProgram = "cloud-sql-proxy"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix index 0ecde80c23..f4d8fa4940 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/codebraid/default.nix @@ -2,15 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "codebraid"; - version = "0.5.0-unstable-2020-08-14"; + version = "0.11.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "gpoore"; repo = pname; - rev = "526a223c4fc32c37d6c5c9133524dfa0e1811ca4"; - sha256 = "0qkqaj49k584qzgx9jlsf5vlv4lq7x403s1kig8v87i0kgh55p56"; + rev = "v${version}"; + hash = "sha256-E9vzGK9ZEVwF+UBpSkdM+hm6vINen/A+LgnnPpc77QQ="; }; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ bespon ]; # unfortunately upstream doesn't contain tests checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 6506101908..14908c0a40 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - hash = "sha256-aMQq44vflpsI66CyaXekMfYh/ssH7UkCX0zsO55st3Y="; + hash = "sha256-uKmiBNwuu3Eduf0v3p2VYYNf6mgxJTBUsYs+tKZQZys="; }; - cargoHash = "sha256-1D87O4fje82Oxyj2Q9kAEey4uEzsNT7kTd8IbNT4WXE="; + cargoHash = "sha256-iBO99kpITVl7ySlXPkEg2YecS1lonVx9CbKt9WI180s="; nativeBuildInputs = [ pkg-config @@ -65,6 +65,18 @@ rustPlatform.buildRustPackage rec { command = "czkawka_cli --version"; }; + postInstall = '' + # Install Icons + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg + + # Install MetaInfo + install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml + + # Install Desktop Entry + install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop + ''; + meta = with lib; { changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix new file mode 100644 index 0000000000..b28f3b08f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/daktilo/default.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, darwin +, unixtools +, pkg-config +, alsa-lib +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "daktilo"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "daktilo"; + rev = "v${version}"; + hash = "sha256-kbJwBOUODtHdngbfa6HbbQJ0kgW6f64c0EG3y8wLymw="; + }; + + cargoHash = "sha256-u9vL2HAUgP43ZDwIEK2u/I+KUEjQsfXda03gnGJ1Krc="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXi + xorg.libXtst + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + unixtools.script + ]; + + postInstall = '' + mkdir -p man completions + + OUT_DIR=man $out/bin/daktilo-mangen + OUT_DIR=completions $out/bin/daktilo-completions + + installManPage man/daktilo.1 + installShellCompletion \ + completions/daktilo.{bash,fish} \ + --zsh completions/_daktilo + + rm $out/bin/daktilo-{completions,mangen} + ''; + + meta = with lib; { + description = "Turn your keyboard into a typewriter"; + homepage = "https://github.com/orhun/daktilo"; + changelog = "https://github.com/orhun/daktilo/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ orhun ]; + mainProgram = "daktilo"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 0b7f78936e..630b06bcfb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , intltool , libxml2 @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.6.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; rev = version; - sha256 = "sha256-0mvkIW0Xsi7co/INmlNeTclBxGoqoJliFanA/RFMaLM="; + sha256 = "sha256-100SITpGbui/gRhFjVZxn6lZRB0najtGHd18oUpByJo="; }; nativeBuildInputs = [ @@ -34,6 +35,14 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + patches = [ + # Upstream commit, fixed the version number in v1.0.0 + (fetchpatch { + url = "https://github.com/ddccontrol/ddccontrol/commit/fc8c5b5d0f2b64b08b95f4a7d8f47f2fd8ceec34.patch"; + hash = "sha256-SB1BaolTNCUYgj38nMg1uLUqOHvnwCr8T3cnfu/7rjI="; + }) + ]; + configureFlags = [ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 0a5bc1cec7..903f923b5d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -4,9 +4,8 @@ , autoreconfHook , pkg-config , glib -, i2c-tools +, jansson , udev -, kmod , libgudev , libusb1 , libdrm @@ -15,23 +14,23 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.4.2"; + version = "2.0.0"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-wGwTZheRHi5pGf6WB9hGd8m/pLOmnlYYrS5dd+QItAQ="; + hash = "sha256-CunFRQHKk3q8CU60TSRnRoCW7+9X1+JpJHm773HhmZs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib - i2c-tools - kmod + jansson libdrm libgudev libusb1 udev + xorg.libXext xorg.libXrandr ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix index 218eed5eb8..b58a7d819b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; + homepage = "https://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix index bf289ff8c7..570882d59a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix @@ -1,25 +1,24 @@ -{lib, stdenv, fetchurl, flex}: +{ lib, stdenv, fetchFromGitHub, flex, autoreconfHook }: stdenv.mkDerivation rec { pname = "detox"; - version = "1.2.0"; + version = "1.4.5"; - src = fetchurl { - url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; - sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; + src = fetchFromGitHub { + owner = "dharple"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q="; }; - buildInputs = [flex]; + nativeBuildInputs = [ flex autoreconfHook ]; hardeningDisable = [ "format" ]; - postInstall = '' - install -m644 safe.tbl $out/share/detox/ - ''; - meta = with lib; { - homepage = "https://detox.sourceforge.net/"; + homepage = "https://github.com/dharple/detox"; description = "Utility designed to clean up filenames"; + changelog = "https://github.com/dharple/detox/blob/v${version}/CHANGELOG.md"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces difficult to work with characters, such as spaces, with standard @@ -29,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "detox"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 2b96647434..8926b97142 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "248"; + version = "251"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Lub+SIr0EyY4YmPsoLXWavXJhcpmK5VRb6eEnozZ0XQ="; + hash = "sha256-7oAFxzLLEds9SI14F88QRhirb/3pjXhmGaW0SWUgpv4="; }; outputs = [ @@ -92,7 +92,6 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch - ./fix-test_fit.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch deleted file mode 100644 index cd275ea9e9..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f1e9fa32c925fe7fb3cd825a02dcff52d305d845 Mon Sep 17 00:00:00 2001 -From: Andrew Marshall -Date: Mon, 28 Aug 2023 19:03:38 -0400 -Subject: [PATCH] Fix test_fit with file 5.45 - -See also 435a8fe9a201a7e74e705e06cc56b66fa6cb4af9. ---- - tests/comparators/test_fit.py | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/tests/comparators/test_fit.py b/tests/comparators/test_fit.py -index d8478c00..47258a3e 100644 ---- a/tests/comparators/test_fit.py -+++ b/tests/comparators/test_fit.py -@@ -27,7 +27,11 @@ - from diffoscope.comparators.utils.specialize import specialize - - from ..utils.data import data, assert_diff, load_fixture --from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least -+from ..utils.tools import ( -+ skip_unless_file_version_is_at_least, -+ skip_unless_tool_is_at_least, -+ skip_unless_tools_exist, -+) - from ..utils.nonexisting import assert_non_existing - - cpio1 = load_fixture("test1.cpio") -@@ -124,19 +128,21 @@ def test_nested_listing(nested_differences): - @skip_unless_tools_exist("cpio") - @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01") - @skip_unless_tools_exist("fdtdump") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_symlink(nested_differences): -- assert nested_differences[1].source1 == "dir/link" -- assert nested_differences[1].comment == "symlink" -- assert_diff(nested_differences[1], "symlink_expected_diff") -+ assert nested_differences[2].source1 == "dir/link" -+ assert nested_differences[2].comment == "symlink" -+ assert_diff(nested_differences[2], "symlink_expected_diff") - - - @skip_unless_tools_exist("cpio") - @skip_unless_tool_is_at_least("dumpimage", dumpimage_version, "2021.01") - @skip_unless_tools_exist("fdtdump") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_compressed_files(nested_differences): -- assert nested_differences[2].source1 == "dir/text" -- assert nested_differences[2].source2 == "dir/text" -- assert_diff(nested_differences[2], "text_ascii_expected_diff") -+ assert nested_differences[3].source1 == "dir/text" -+ assert nested_differences[3].source2 == "dir/text" -+ assert_diff(nested_differences[3], "text_ascii_expected_diff") - - - @skip_unless_tools_exist("cpio") --- -2.41.0 - diff --git a/third_party/nixpkgs/pkgs/tools/misc/domine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/domine/default.nix index cd62b9bd1a..421b49a9d4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/domine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/domine/default.nix @@ -12,6 +12,6 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; - + depsListFile = ./deps.json; vendorHash = "16z3paq1nxlnzs20qlljnwa2ff6xfhdqzcq8d8izkl7w1j4hyxgn"; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/domine/deps.json b/third_party/nixpkgs/pkgs/tools/misc/domine/deps.json new file mode 100644 index 0000000000..baa466f5e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/domine/deps.json @@ -0,0 +1,190 @@ +[ + { + "name": "domine", + "version": "1.1.0+3", + "kind": "root", + "source": "root", + "dependencies": [ + "args", + "dart_openai", + "dio", + "dio_smart_retry", + "tint", + "lints" + ] + }, + { + "name": "lints", + "version": "2.1.1", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "tint", + "version": "2.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dio_smart_retry", + "version": "5.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dio", + "http_parser", + "path" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dio", + "version": "5.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta", + "path" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "dart_openai", + "version": "4.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "meta", + "collection", + "fetch_client" + ] + }, + { + "name": "fetch_client", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "fetch_api", + "http" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "fetch_api", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + } +] diff --git a/third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix index ab7db4a2cb..b8aa6c8809 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dooit/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kraanzu"; repo = "dooit"; rev = "v${version}"; - hash = "sha256-iQAGD6zrBBd4fJONaB7to1OJpAJUO0zeA1xhVQZBkMc="; + hash = "sha256-ZCEBpaQHaFb09MUlN6acYB3LrfX456uRbhVh9YPz7NU="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix index 9e86194598..0c04f70f26 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dynamic-colors/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "dynamic-colors"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix index 1eea3c6994..67b49b299f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/enumer/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "enumer"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "dmarkham"; repo = "enumer"; rev = "refs/tags/v${version}"; - hash = "sha256-+YTsXYWVmJ32V/Eptip3WAiqIYv+6nqbdph0K2XzLdc="; + hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks="; }; - vendorHash = "sha256-+dCitvPz2JUbybXVJxUOo1N6+SUPCSjlacL8bTSlb7w="; + vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA="; meta = with lib; { description = "Go tool to auto generate methods for enums"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix index 938beff335..4446400c2f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sorah/envchain"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix index b3a1be04d9..8cd59df31b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; + mainProgram = "envsubst"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index ceb416c652..f5bd991056 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20230904.0"; + version = "20231107.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-b+NlWekNXbGvhLQlQqFtSSsO99J+ldS6NddlK3lykeA="; + hash = "sha256-84iM987nxNidMObnbY3lt78xRbN9USNtqQzfOzkd17k="; }; # no tests diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index b791cac21b..8639358ebc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, python3 +, python3Packages , fetchFromGitHub , platformio , esptool_3 @@ -8,7 +8,7 @@ }: let - python = python3.override { + python = python3Packages.python.override { packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix {}; }; @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.9.3"; + version = "2023.11.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SyXEiGh1/s9EJ0UPYC8R04JUYkCPhCtNUcGvVCycKGM="; + hash = "sha256-hdSWrKOht1McZxTJtgvy+vqN49bi/P54/D7WDxIRb4w="; }; postPatch = '' @@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec { # - validate_pillow_installed propagatedBuildInputs = with python.pkgs; [ aioesphomeapi + argcomplete click colorama cryptography @@ -72,7 +73,7 @@ python.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ hypothesis mock pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index 19ab5158a6..e2457ad63e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -6,18 +6,29 @@ tcl.mkTclDerivation rec { src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; + hash = "sha256-Safag7C92fRtBKBN7sGcd2e7mjI+QMR4H4nK92C5LDQ="; }; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; - sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b"; + hash = "sha256-yyzE0Jjac5qaj7Svn4VpMiAqSNLYrw7VZbtFqgMVncs="; }) (substituteAll { src = ./fix-cross-compilation.patch; tcl = "${buildPackages.tcl}/bin/tclsh"; }) + # The following patches fix compilation with clang 15+ + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/24/attachment/0001-Add-prototype-to-function-definitions.patch"; + hash = "sha256-X2Vv6VVM3KjmBHo2ukVWe5YTVXRmqe//Kw2kr73OpZs="; + }) + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; + hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; + }) + # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. + ./fix-darwin-clang16.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/fix-darwin-clang16.patch b/third_party/nixpkgs/pkgs/tools/misc/expect/fix-darwin-clang16.patch new file mode 100644 index 0000000000..9454769c99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/fix-darwin-clang16.patch @@ -0,0 +1,31 @@ +diff -ur a/exp_win.c b/exp_win.c +--- a/exp_win.c 2018-02-02 14:15:52.000000000 -0500 ++++ b/exp_win.c 2023-10-10 07:47:33.082690432 -0400 +@@ -39,7 +39,8 @@ + /* Sigh. On AIX 2.3, termios.h exists but does not define TIOCGWINSZ */ + /* Instead, it has to come from ioctl.h. However, As I said above, this */ + /* can't be cavalierly included on all machines, even when it exists. */ +-#if defined(HAVE_TERMIOS) && !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H) ++/* Darwin also has termios.h, but it requires ioctl.h for `ioctl`. */ ++#if defined(HAVE_TERMIOS) && (defined(__APPLE__) || !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H)) + # include + #endif + +diff -ur d/pty_termios.c c/pty_termios.c +--- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 ++++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 +@@ -7,7 +7,13 @@ + + */ + +-#include /* openpty */ ++/* openpty */ ++#ifdef __APPLE__ ++#include ++#else /* pty.h is Linux-specific */ ++#include ++#endif ++ + #include + #include + diff --git a/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix index da47c960ea..adab3390de 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -27,6 +27,7 @@ , xfce , yyjson , zlib +, Apple80211 , AppKit , Cocoa , CoreDisplay @@ -42,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.1.0"; + version = "2.2.3"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-4FkBq7UxwZ2YuC4t/siC3CXqyP3Lff4jW3xheAQ9M6o="; + hash = "sha256-JaD0R1vfHoWMhipMtTW0dlggR7RbD2evHfHrjoZJBmk="; }; nativeBuildInputs = [ @@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.isDarwin [ + Apple80211 AppKit Cocoa CoreDisplay @@ -101,6 +103,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_SYSTEM_YYJSON=YES" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=uninitialized" + ]; + postInstall = '' wrapProgram $out/bin/fastfetch \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index 3966418245..01f35bd8c6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.32.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - hash = "sha256-aNTmx94fWuwwlMckjZMOoU1hqSW+yUTKjobvRTxJX4s="; + hash = "sha256-JgeajCubRz9hR6uvRAw1HXdKa6Ua+l/Im/bYXdx1gL0="; }; - cargoHash = "sha256-MGqQImBEH210IVvjyh/aceQr001T1cMHQfyQI1ZyVw8="; + cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix index 0f78b752de..84da1044f1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -1,20 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, testers, fd }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, rust-jemalloc-sys, testers, fd }: rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.7.0"; + version = "8.7.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - hash = "sha256-y7IrwMLQnvz1PeKt8BE9hbEBwQBiUXM4geYbiTjMymw="; + hash = "sha256-euQiMVPKE1/YG04VKMFUA27OtoGENNhqeE0iiF/X7uc="; }; - cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; + cargoHash = "sha256-doeZTjFPXmxIPYX3IBtetePoNkIHnl6oPJFtXD1tgZY="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ rust-jemalloc-sys ]; + # skip flaky test checkFlags = [ "--skip=test_owner_current_group" diff --git a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix index 368157e964..e3070ab6e5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fedifetcher/default.nix @@ -2,17 +2,18 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "5.0.1"; + version = "7.0.1"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "v${version}"; - hash = "sha256-O7YDxNQel1XFSjGrzdBI4PsejmzPVLvYLNF/vZgdh4w="; + hash = "sha256-/Au6a93na3meb2j0eR8UCCg+TVW/UqWz3/TkASB94Eg="; }; propagatedBuildInputs = with python3.pkgs; [ + defusedxml python-dateutil requests ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index 7caff95237..fe1d957437 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9O+2vCi3CagpIU5pZPA8tLVhyC7KHn93trYdNhsT4n4="; + sha256 = "sha256-iF1E9wBX9UVv/zuCgznXqKLBF+Xk0LqVdJfxFNpmzRI="; }; - cargoHash = "sha256-mRIwmZwO/uqfUJ12ZYKZFPoefvo055Tp+DrfKsoP9q4="; + cargoHash = "sha256-xf4Q6nk2sYuAV+B7dsRF+feiLRKLXDSHnlYmw+o5bNc="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix index 6026f3c7ad..8cff5ccd70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/file/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl, file, zlib, libgnurx }: +{ lib, stdenv, fetchurl, file, zlib, libgnurx +, testers +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "file"; version = "5.45"; src = fetchurl { urls = [ - "https://astron.com/pub/file/${pname}-${version}.tar.gz" - "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" + "https://astron.com/pub/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz" + "https://distfiles.macports.org/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz" ]; hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI="; }; @@ -37,12 +39,15 @@ stdenv.mkDerivation rec { makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; maintainers = with maintainers; [ doronbehar ]; license = licenses.bsd2; + pkgConfigModules = [ "libmagic" ]; platforms = platforms.all; mainProgram = "file"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index f109056cc2..d88b143adc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.1.10"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-6uq5eOHx0P2S3WsN0PooNlGQS2ty7DdPsCEgoQsLmRM="; + hash = "sha256-E3fNU6aHyKMli+A+yiJUY065jchWkkAbumkdY8BaAAE="; }; nativeBuildInputs = [ cmake flex bison ]; @@ -26,16 +26,20 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl libyaml postgresql ] ++ lib.optionals stdenv.isLinux [ systemd ]; - cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" ]; + cmakeFlags = [ + "-DFLB_RELEASE=ON" + "-DFLB_METRICS=ON" + "-DFLB_HTTP_SERVER=ON" + "-DFLB_OUT_PGSQL=ON" + ]; - # _FORTIFY_SOURCE requires compiling with optimization (-O) - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-O" ] - # Workaround build failure on -fno-common toolchains: - # ld: /monkey/mk_tls.h:81: multiple definition of `mk_tls_server_timeout'; - # flb_config.c.o:include/monkey/mk_tls.h:81: first defined here - # TODO: drop when upstream gets a fix for it: - # https://github.com/fluent/fluent-bit/issues/5537 - ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); + env.NIX_CFLAGS_COMPILE = toString ( + # Used by the embedded luajit, but is not predefined on older mac SDKs. + lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" ] + # Assumes GNU version of strerror_r, and the posix version has an + # incompatible return type. + ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ "-Wno-int-conversion" ] + ); outputs = [ "out" "dev" ]; @@ -50,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://fluentbit.io"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.samrose lib.maintainers.fpletz ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix index 96ce250499..4b92e885b6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fsql/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fsql"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "sha256-6KqlpFBaAWrlEjkFQhOEic569+eoYVAsnhMrg8AEPV4="; + sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs="; }; - vendorHash = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; + vendorHash = "sha256-+laTnx6Xkrv3QQel5opqYQSuFmo54UMI2A653xbBWzQ="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix index 33e34e2b63..b52366ab76 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fuc/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fuc"; - version = "1.1.7"; + version = "1.1.9"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; rev = version; - hash = "sha256-Ii0X2QGvUE+wDD7pKN3Mws4VqnwGJFdpjjv3oJRn/pY="; + hash = "sha256-4yksr2gilR7Ec2sRzGsGmOgbRSQJR/5fDofZM4sRxDg="; }; - cargoHash = "sha256-08MQCKfkusnE9fuuJOlKeDESwmf8ajU7qMjujN2o5bU="; + cargoHash = "sha256-U/LABtCtpop+MXAceE93FKtf1FfgLuVIYqqXtd0NckQ="; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix index 7cb9be3ccb..dc000a1129 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fw/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.17.1"; + version = "2.18.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-8Jq7VjTKwq8n9lrwTzazkkrq8/mNacFTwz/M+eAwBWM="; + hash = "sha256-8PcIaSXmk6/p5N6L2/nLrFS6JUZRRJsN2mKQYtevS6s="; }; - cargoHash = "sha256-tIrACx4KRjfxLyxTiP32PpdN8NegaHBIkINsPGgygVQ="; + cargoHash = "sha256-l6mRjVk3qNAxfNqcKGo2dceD2Xb+hk+xMvdh/U1jZXw="; nativeBuildInputs = [ pkg-config @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 0116ee4110..c27e1ff1aa 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -25,16 +25,16 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.42.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-+65R7cbj62UXw3ZYXIK9VcAeGnpP4pLigr21awoPLi4="; + hash = "sha256-YIMtLQzxORWFWCgdnLUQLmmE79aw40LhcxqiHCWjgNk="; }; - vendorHash = "sha256-O6OjBbrVAxDQd27ar2mmFkU1XyVM2C8SJWJ54rgaf2s="; + vendorHash = "sha256-EutNjyW5bvGvMZP9xBrcu91TOAbl9TDZe2+g0/qnuAQ="; CGO_ENABLED = 0; @@ -79,7 +79,10 @@ buildGoModule rec { install -D shell/* -t $out/share/fzf/ install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish mkdir -p $out/share/fish/vendor_conf.d - echo fzf_key_bindings > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + status is-interactive; or exit 0 + fzf_key_bindings + EOF cat <
$BASENAME $SHORTDESC
$BASENAME $SHORTDESC